]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
Merge branch 'pk/subsub-fetch-fix-take-2' 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 | 数据对象
d9488fea 31# bloom filter | 布隆过滤器
160fb2b2 32# branch | 分支
d9488fea 33# bundle | 归档包
160fb2b2
JX
34# bypass | 绕过
35# cache | 索引(的别称)
36# chain | (提交)链
37# changeset | 变更集
38# checkout | 检出
39# checksum | 校验,校验和
40# cherry-picking | 拣选
41# clean | 干净(的工作区)
42# clone | 克隆
43# commit | 提交
667599e8 44# commit message | 提交说明
160fb2b2
JX
45# commit object | 提交对象
46# commit-ish (also committish) | 提交号
47# conflict | 冲突
48# core Git | 核心 Git 工具
d46c5519 49# cover letter | 附函
160fb2b2 50# DAG | 有向无环图
e640d114 51# dangling object | 悬空对象
160fb2b2
JX
52# detached HEAD | 分离头指针
53# directory | 目录
54# dirty | 脏(的工作区)
755c831b 55# dumb HTTP protocol | 哑 HTTP 协议
160fb2b2
JX
56# evil merge | 坏合并(合并引入了父提交没有的修改)
57# fast-forward | 快进
58# fetch | 获取
59# file system | 文件系统
e397e7e3 60# fork | 派生
160fb2b2
JX
61# Git archive | 仓库(对于 arch 用户)
62# gitfile | gitfile(仓库链接文件)
fd8cb379 63# grafts | (提交)移植
160fb2b2
JX
64# hash | 哈希值
65# HEAD | HEAD(头指针,亦即当前分支)
66# head | 头、分支
67# head ref | 分支
68# header | 头信息
69# hook | 钩子
70# hunk | 补丁片段
71# index | 索引
72# index entry | 索引条目
73# loose object | 松散对象
74# loose refs | 松散引用
75# master | master(默认分支名)
76# merge | 合并
77# object | 对象
78# object database | 对象库
79# object identifier | 对象标识符
80# object name | 对象名称
81# object type | 对象类型
82# octopus | 章鱼式合并(两分支以上的合并)
83# origin | origin(默认的远程名称)
84# pack | 包
85# pack index | 包索引
86# packfile | 包文件
87# parent | 父提交
88# patch | 补丁
89# pathspec | 路径规格
90# pattern | 模式
12e59059 91# pickaxe | 挖掘
160fb2b2
JX
92# plumbing | 管件(Git 底层核心命令的别称)
93# porcelain | 瓷件(Git 上层封装命令的别称)
94550ed3 94# precious-objects repo | 珍品仓库
160fb2b2
JX
95# prune | 清除
96# pull | 拉,拉取
97# push | 推,推送
98# reachable | 可达
99# rebase | 变基
100# ref | 引用
101# reflog | 引用日志
102# refspec | 引用规格
103# remote | 远程,远程仓库
104# remote-tracking branch | 远程跟踪分支
105# replay | 重放
106# repo | 仓库
107# repository | 仓库
108# resolve | (冲突)解决
109# revert | 还原
110# revision | 版本
111# rewind | 回退
112# SCM | 源代码管理(工具)
ee7589bb 113# SHA-1 | SHA-1(安全哈希算法1)
160fb2b2
JX
114# shallow repository | 浅(克隆)仓库
115# signed tag | 签名标签
755c831b 116# smart HTTP protocol | 智能 HTTP 协议
160fb2b2
JX
117# squash | 压缩
118# stage | n. 暂存区(即索引); v. 暂存
a4f16749 119# stash | n. 贮藏区; v. 贮藏
160fb2b2
JX
120# submodule | 子模组
121# symref | 符号引用
933c015e 122# tag | n. 标签; v. 打标签
160fb2b2
JX
123# tag object | 标签对象
124# tagger | 打标签者
125# topic branch | 主题分支
126# track | 跟踪
d13389bf 127# trailer | 尾注
160fb2b2
JX
128# tree | 树(工作区或树对象)
129# tree object | 树对象
130# tree-ish (also treeish) | 树对象(或可以解析为一树对象)
131# unmerged index | 未合并索引
132# unpack | 解包
133# unreachable object | 不可达对象
134# unstage | 取消暂存
135# upstream | 上游
136# upstream branch | 上游分支
137# working tree | 工作区
138#
c04f5ac3
JX
139msgid ""
140msgstr ""
141"Project-Id-Version: Git\n"
142"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
d13389bf
JX
143"POT-Creation-Date: 2020-12-21 07:10+0800\n"
144"PO-Revision-Date: 2020-12-26 21:43+0800\n"
c04f5ac3 145"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
7aea43ff 146"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
c04f5ac3
JX
147"Language: zh_CN\n"
148"MIME-Version: 1.0\n"
149"Content-Type: text/plain; charset=UTF-8\n"
150"Content-Transfer-Encoding: 8bit\n"
5ae481e0 151"Plural-Forms: nplurals=2; plural=(n != 1);\n"
c04f5ac3 152
d13389bf 153#: add-interactive.c:376
ddc12c42
JX
154#, c-format
155msgid "Huh (%s)?"
156msgstr "嗯(%s)?"
157
d13389bf
JX
158#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284
159#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532
160#: builtin/rebase.c:1955
ddc12c42
JX
161msgid "could not read index"
162msgstr "不能读取索引"
163
d13389bf 164#: add-interactive.c:584 git-add--interactive.perl:269
ddc12c42
JX
165#: git-add--interactive.perl:294
166msgid "binary"
167msgstr "二进制"
168
d13389bf 169#: add-interactive.c:642 git-add--interactive.perl:278
ddc12c42
JX
170#: git-add--interactive.perl:332
171msgid "nothing"
172msgstr "无"
173
d13389bf 174#: add-interactive.c:643 git-add--interactive.perl:314
ddc12c42
JX
175#: git-add--interactive.perl:329
176msgid "unchanged"
177msgstr "没有修改"
178
d13389bf 179#: add-interactive.c:680 git-add--interactive.perl:641
ddc12c42
JX
180msgid "Update"
181msgstr "更新"
182
d13389bf 183#: add-interactive.c:697 add-interactive.c:885
ddc12c42
JX
184#, c-format
185msgid "could not stage '%s'"
186msgstr "不能暂存 '%s'"
187
d13389bf 188#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478
ddc12c42
JX
189msgid "could not write index"
190msgstr "不能写入索引"
191
d13389bf 192#: add-interactive.c:706 git-add--interactive.perl:626
ddc12c42
JX
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
d13389bf 199#: add-interactive.c:724 git-add--interactive.perl:676
ddc12c42
JX
200#, c-format, perl-format
201msgid "note: %s is untracked now.\n"
202msgstr "说明:%s 现已成为未跟踪的。\n"
203
d13389bf 204#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295
349ede6a 205#: builtin/reset.c:145
ddc12c42
JX
206#, c-format
207msgid "make_cache_entry failed for path '%s'"
208msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
209
d13389bf 210#: add-interactive.c:759 git-add--interactive.perl:653
ddc12c42
JX
211msgid "Revert"
212msgstr "还原"
213
d13389bf 214#: add-interactive.c:775
ddc12c42
JX
215msgid "Could not parse HEAD^{tree}"
216msgstr "不能解析 HEAD^{tree}"
217
d13389bf 218#: add-interactive.c:813 git-add--interactive.perl:629
ddc12c42
JX
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
d13389bf 225#: add-interactive.c:864 git-add--interactive.perl:693
ddc12c42
JX
226#, c-format
227msgid "No untracked files.\n"
228msgstr "没有未跟踪的文件。\n"
229
d13389bf 230#: add-interactive.c:868 git-add--interactive.perl:687
ddc12c42
JX
231msgid "Add untracked"
232msgstr "添加未跟踪的"
233
d13389bf 234#: add-interactive.c:895 git-add--interactive.perl:623
ddc12c42
JX
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
d13389bf 241#: add-interactive.c:925
ddc12c42
JX
242#, c-format
243msgid "ignoring unmerged: %s"
244msgstr "忽略未合入的:%s"
245
d13389bf 246#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
ddc12c42
JX
247#, c-format
248msgid "Only binary files changed.\n"
249msgstr "只有二进制文件被修改。\n"
250
d13389bf 251#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
ddc12c42
JX
252#, c-format
253msgid "No changes.\n"
254msgstr "没有修改。\n"
255
d13389bf 256#: add-interactive.c:943 git-add--interactive.perl:1379
ddc12c42
JX
257msgid "Patch update"
258msgstr "补丁更新"
259
d13389bf 260#: add-interactive.c:982 git-add--interactive.perl:1792
ddc12c42
JX
261msgid "Review diff"
262msgstr "检视 diff"
263
d13389bf 264#: add-interactive.c:1010
ddc12c42
JX
265msgid "show paths with changes"
266msgstr "显示含变更的路径"
267
d13389bf 268#: add-interactive.c:1012
ddc12c42
JX
269msgid "add working tree state to the staged set of changes"
270msgstr "将工作区状态添加到暂存区修改集中"
271
d13389bf 272#: add-interactive.c:1014
ddc12c42
JX
273msgid "revert staged set of changes back to the HEAD version"
274msgstr "将暂存的修改集恢复为 HEAD 版本"
275
d13389bf 276#: add-interactive.c:1016
ddc12c42
JX
277msgid "pick hunks and update selectively"
278msgstr "挑选数据块并有选择地更新"
279
d13389bf 280#: add-interactive.c:1018
ddc12c42
JX
281msgid "view diff between HEAD and index"
282msgstr "显示 HEAD 和索引的差异"
283
d13389bf 284#: add-interactive.c:1020
ddc12c42
JX
285msgid "add contents of untracked files to the staged set of changes"
286msgstr "将未跟踪文件的内容添加到暂存区修改集中"
287
d13389bf 288#: add-interactive.c:1028 add-interactive.c:1077
ddc12c42
JX
289msgid "Prompt help:"
290msgstr "帮助:"
291
d13389bf 292#: add-interactive.c:1030
ddc12c42
JX
293msgid "select a single item"
294msgstr "选择一个条目"
295
d13389bf 296#: add-interactive.c:1032
ddc12c42
JX
297msgid "select a range of items"
298msgstr "选择一系列条目"
299
d13389bf 300#: add-interactive.c:1034
ddc12c42
JX
301msgid "select multiple ranges"
302msgstr "选择多个范围"
303
d13389bf 304#: add-interactive.c:1036 add-interactive.c:1081
ddc12c42
JX
305msgid "select item based on unique prefix"
306msgstr "基于唯一前缀选择条目"
307
d13389bf 308#: add-interactive.c:1038
ddc12c42
JX
309msgid "unselect specified items"
310msgstr "反选指定的条目"
311
d13389bf 312#: add-interactive.c:1040
ddc12c42
JX
313msgid "choose all items"
314msgstr "选择所有条目"
315
d13389bf 316#: add-interactive.c:1042
ddc12c42
JX
317msgid "(empty) finish selecting"
318msgstr "(空)结束选择"
319
d13389bf 320#: add-interactive.c:1079
ddc12c42
JX
321msgid "select a numbered item"
322msgstr "选择一个编号条目"
323
d13389bf 324#: add-interactive.c:1083
ddc12c42
JX
325msgid "(empty) select nothing"
326msgstr "(空)不选择任何内容"
327
d13389bf 328#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
ddc12c42
JX
329msgid "*** Commands ***"
330msgstr "*** 命令 ***"
331
d13389bf 332#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
ddc12c42
JX
333msgid "What now"
334msgstr "请选择"
335
d13389bf 336#: add-interactive.c:1144 git-add--interactive.perl:213
ddc12c42
JX
337msgid "staged"
338msgstr "缓存"
339
d13389bf 340#: add-interactive.c:1144 git-add--interactive.perl:213
ddc12c42
JX
341msgid "unstaged"
342msgstr "未缓存"
343
d13389bf
JX
344#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
345#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
346#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190
d9488fea
JX
347#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818
348#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
349#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
349ede6a 350#: git-add--interactive.perl:213
ddc12c42
JX
351msgid "path"
352msgstr "路径"
353
d13389bf 354#: add-interactive.c:1151
ddc12c42
JX
355msgid "could not refresh index"
356msgstr "不能刷新索引"
357
d13389bf 358#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
ddc12c42
JX
359#, c-format
360msgid "Bye.\n"
361msgstr "再见。\n"
362
d13389bf 363#: add-patch.c:34 git-add--interactive.perl:1431
2b472aae
JX
364#, c-format, perl-format
365msgid "Stage mode change [y,n,q,a,d%s,?]? "
366msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
ddc12c42 367
d13389bf 368#: add-patch.c:35 git-add--interactive.perl:1432
2b472aae
JX
369#, c-format, perl-format
370msgid "Stage deletion [y,n,q,a,d%s,?]? "
371msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
ddc12c42 372
d13389bf 373#: add-patch.c:36 git-add--interactive.perl:1433
7157c2b5
JX
374#, c-format, perl-format
375msgid "Stage addition [y,n,q,a,d%s,?]? "
376msgstr "暂存添加动作 [y,n,q,a,d%s,?]? "
377
d13389bf 378#: add-patch.c:37 git-add--interactive.perl:1434
2b472aae
JX
379#, c-format, perl-format
380msgid "Stage this hunk [y,n,q,a,d%s,?]? "
381msgstr "暂存该块 [y,n,q,a,d%s,?]? "
382
7157c2b5 383#: add-patch.c:39
2b472aae
JX
384msgid ""
385"If the patch applies cleanly, the edited hunk will immediately be marked for "
386"staging."
387msgstr "如果补丁能正确地应用,编辑块将立即标记为暂存。"
388
7157c2b5 389#: add-patch.c:42
2b472aae
JX
390msgid ""
391"y - stage this hunk\n"
392"n - do not stage this hunk\n"
393"q - quit; do not stage this hunk or any of the remaining ones\n"
394"a - stage this hunk and all later hunks in the file\n"
395"d - do not stage this hunk or any of the later hunks in the file\n"
396msgstr ""
397"y - 暂存该块\n"
398"n - 不要暂存该块\n"
399"q - 退出。不暂存该块及后面的全部块\n"
400"a - 暂存该块和本文件中后面的全部块\n"
401"d - 不暂存该块和本文件中后面的全部块\n"
402
d13389bf 403#: add-patch.c:56 git-add--interactive.perl:1437
2b472aae
JX
404#, c-format, perl-format
405msgid "Stash mode change [y,n,q,a,d%s,?]? "
406msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
407
d13389bf 408#: add-patch.c:57 git-add--interactive.perl:1438
2b472aae
JX
409#, c-format, perl-format
410msgid "Stash deletion [y,n,q,a,d%s,?]? "
411msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
412
d13389bf 413#: add-patch.c:58 git-add--interactive.perl:1439
7157c2b5
JX
414#, c-format, perl-format
415msgid "Stash addition [y,n,q,a,d%s,?]? "
416msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? "
417
d13389bf 418#: add-patch.c:59 git-add--interactive.perl:1440
2b472aae
JX
419#, c-format, perl-format
420msgid "Stash this hunk [y,n,q,a,d%s,?]? "
421msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
422
7157c2b5 423#: add-patch.c:61
2b472aae
JX
424msgid ""
425"If the patch applies cleanly, the edited hunk will immediately be marked for "
426"stashing."
427msgstr "如果补丁能正确地应用,编辑块将立即标记为贮藏。"
428
7157c2b5 429#: add-patch.c:64
2b472aae
JX
430msgid ""
431"y - stash this hunk\n"
432"n - do not stash this hunk\n"
433"q - quit; do not stash this hunk or any of the remaining ones\n"
434"a - stash this hunk and all later hunks in the file\n"
435"d - do not stash this hunk or any of the later hunks in the file\n"
436msgstr ""
437"y - 贮藏该块\n"
438"n - 不要贮藏该块\n"
439"q - 退出。不贮藏该块及后面的全部块\n"
440"a - 贮藏该块和本文件中后面的全部块\n"
441"d - 不贮藏该块和本文件中后面的全部块\n"
442
d13389bf 443#: add-patch.c:80 git-add--interactive.perl:1443
2b472aae
JX
444#, c-format, perl-format
445msgid "Unstage mode change [y,n,q,a,d%s,?]? "
446msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
447
d13389bf 448#: add-patch.c:81 git-add--interactive.perl:1444
2b472aae
JX
449#, c-format, perl-format
450msgid "Unstage deletion [y,n,q,a,d%s,?]? "
451msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
452
d13389bf 453#: add-patch.c:82 git-add--interactive.perl:1445
7157c2b5
JX
454#, c-format, perl-format
455msgid "Unstage addition [y,n,q,a,d%s,?]? "
456msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? "
457
d13389bf 458#: add-patch.c:83 git-add--interactive.perl:1446
2b472aae
JX
459#, c-format, perl-format
460msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
461msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
462
7157c2b5 463#: add-patch.c:85
2b472aae
JX
464msgid ""
465"If the patch applies cleanly, the edited hunk will immediately be marked for "
466"unstaging."
467msgstr "如果补丁能正确地应用,编辑块将立即标记为未暂存。"
468
7157c2b5 469#: add-patch.c:88
2b472aae
JX
470msgid ""
471"y - unstage this hunk\n"
472"n - do not unstage this hunk\n"
473"q - quit; do not unstage this hunk or any of the remaining ones\n"
474"a - unstage this hunk and all later hunks in the file\n"
475"d - do not unstage this hunk or any of the later hunks in the file\n"
476msgstr ""
440e7442
FZ
477"y - 取消暂存该块\n"
478"n - 不要取消暂存该块\n"
479"q - 退出。不要取消暂存该块及后面的全部块\n"
480"a - 取消暂存该块和本文件中后面的全部块\n"
481"d - 不要取消暂存该块和本文件中后面的全部块\n"
2b472aae 482
d13389bf 483#: add-patch.c:103 git-add--interactive.perl:1449
2b472aae
JX
484#, c-format, perl-format
485msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
486msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
487
d13389bf 488#: add-patch.c:104 git-add--interactive.perl:1450
2b472aae
JX
489#, c-format, perl-format
490msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
491msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
492
d13389bf 493#: add-patch.c:105 git-add--interactive.perl:1451
7157c2b5
JX
494#, c-format, perl-format
495msgid "Apply addition to index [y,n,q,a,d%s,?]? "
496msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? "
497
d13389bf 498#: add-patch.c:106 git-add--interactive.perl:1452
2b472aae
JX
499#, c-format, perl-format
500msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
501msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
502
7157c2b5 503#: add-patch.c:108 add-patch.c:176 add-patch.c:221
2b472aae
JX
504msgid ""
505"If the patch applies cleanly, the edited hunk will immediately be marked for "
506"applying."
507msgstr "如果补丁能正确地应用,编辑块将立即标记为应用。"
508
7157c2b5 509#: add-patch.c:111
2b472aae
JX
510msgid ""
511"y - apply this hunk to index\n"
512"n - do not apply this hunk to index\n"
513"q - quit; do not apply this hunk or any of the remaining ones\n"
514"a - apply this hunk and all later hunks in the file\n"
515"d - do not apply this hunk or any of the later hunks in the file\n"
516msgstr ""
517"y - 在索引中应用该块\n"
518"n - 不要在索引中应用该块\n"
519"q - 退出。不要应用该块及后面的全部块\n"
520"a - 应用该块和本文件中后面的全部块\n"
521"d - 不要应用该块和本文件中后面的全部块\n"
522
d13389bf
JX
523#: add-patch.c:126 git-add--interactive.perl:1455
524#: git-add--interactive.perl:1473
2b472aae
JX
525#, c-format, perl-format
526msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
527msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
528
d13389bf
JX
529#: add-patch.c:127 git-add--interactive.perl:1456
530#: git-add--interactive.perl:1474
2b472aae
JX
531#, c-format, perl-format
532msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
533msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
ddc12c42 534
d13389bf
JX
535#: add-patch.c:128 git-add--interactive.perl:1457
536#: git-add--interactive.perl:1475
7157c2b5
JX
537#, c-format, perl-format
538msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
539msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
540
d13389bf
JX
541#: add-patch.c:129 git-add--interactive.perl:1458
542#: git-add--interactive.perl:1476
2b472aae
JX
543#, c-format, perl-format
544msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
545msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
546
7157c2b5 547#: add-patch.c:131 add-patch.c:154 add-patch.c:199
2b472aae
JX
548msgid ""
549"If the patch applies cleanly, the edited hunk will immediately be marked for "
550"discarding."
551msgstr "如果补丁能正确地应用,编辑块将立即标记为丢弃。"
552
7157c2b5 553#: add-patch.c:134 add-patch.c:202
2b472aae
JX
554msgid ""
555"y - discard this hunk from worktree\n"
556"n - do not discard this hunk from worktree\n"
557"q - quit; do not discard this hunk or any of the remaining ones\n"
558"a - discard this hunk and all later hunks in the file\n"
559"d - do not discard this hunk or any of the later hunks in the file\n"
560msgstr ""
561"y - 在工作区中丢弃该块\n"
562"n - 不要在工作区中丢弃该块\n"
563"q - 退出。不要丢弃该块及后面的全部块\n"
564"a - 丢弃该块和本文件中后面的全部块\n"
565"d - 不要丢弃该块和本文件中后面的全部块\n"
566
d13389bf 567#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
2b472aae
JX
568#, c-format, perl-format
569msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
570msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
571
d13389bf 572#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
2b472aae
JX
573#, c-format, perl-format
574msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
7157c2b5 575msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
2b472aae 576
d13389bf 577#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
7157c2b5
JX
578#, c-format, perl-format
579msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
580msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
581
d13389bf 582#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
2b472aae
JX
583#, c-format, perl-format
584msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
585msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
586
7157c2b5 587#: add-patch.c:157
2b472aae
JX
588msgid ""
589"y - discard this hunk from index and worktree\n"
590"n - do not discard this hunk from index and worktree\n"
591"q - quit; do not discard this hunk or any of the remaining ones\n"
592"a - discard this hunk and all later hunks in the file\n"
593"d - do not discard this hunk or any of the later hunks in the file\n"
594msgstr ""
595"y - 在索引和工作区中丢弃该块\n"
596"n - 不要在索引和工作区中丢弃该块\n"
597"q - 退出。不要丢弃该块及后面的全部块\n"
598"a - 丢弃该块和本文件中后面的全部块\n"
599"d - 不要丢弃该块和本文件中后面的全部块\n"
600
d13389bf 601#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
2b472aae
JX
602#, c-format, perl-format
603msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
604msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
605
d13389bf 606#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
2b472aae
JX
607#, c-format, perl-format
608msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
609msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
610
d13389bf 611#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
7157c2b5
JX
612#, c-format, perl-format
613msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
614msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
615
d13389bf 616#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
2b472aae
JX
617#, c-format, perl-format
618msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
619msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
620
7157c2b5 621#: add-patch.c:179
2b472aae
JX
622msgid ""
623"y - apply this hunk to index and worktree\n"
624"n - do not apply this hunk to index and worktree\n"
625"q - quit; do not apply this hunk or any of the remaining ones\n"
626"a - apply this hunk and all later hunks in the file\n"
627"d - do not apply this hunk or any of the later hunks in the file\n"
628msgstr ""
629"y - 在索引和工作区中应用该块\n"
630"n - 不要在索引和工作区中应用该块\n"
631"q - 退出。不要应用该块及后面的全部块\n"
632"a - 应用该块和本文件中后面的全部块\n"
633"d - 不要应用该块和本文件中后面的全部块\n"
634
7157c2b5 635#: add-patch.c:224
2b472aae
JX
636msgid ""
637"y - apply this hunk to worktree\n"
638"n - do not apply this hunk to worktree\n"
639"q - quit; do not apply this hunk or any of the remaining ones\n"
640"a - apply this hunk and all later hunks in the file\n"
641"d - do not apply this hunk or any of the later hunks in the file\n"
642msgstr ""
643"y - 在工作区中应用该块\n"
644"n - 不要在工作区中应用该块\n"
645"q - 退出。不要应用该块及后面的全部块\n"
646"a - 应用该块和本文件中后面的全部块\n"
647"d - 不要应用该块和本文件中后面的全部块\n"
648
d9488fea 649#: add-patch.c:342
ddc12c42
JX
650#, c-format
651msgid "could not parse hunk header '%.*s'"
652msgstr "无法解析数据块头信息 '%.*s'"
653
d9488fea 654#: add-patch.c:361 add-patch.c:365
ddc12c42
JX
655#, c-format
656msgid "could not parse colored hunk header '%.*s'"
657msgstr "无法解析彩色数据块头信息 '%.*s'"
658
d9488fea 659#: add-patch.c:419
ddc12c42
JX
660msgid "could not parse diff"
661msgstr "不能解析差异信息"
662
d9488fea 663#: add-patch.c:438
ddc12c42
JX
664msgid "could not parse colored diff"
665msgstr "不能解析彩色差异信息"
666
d9488fea 667#: add-patch.c:452
2b472aae
JX
668#, c-format
669msgid "failed to run '%s'"
670msgstr "运行 '%s' 失败"
671
d9488fea 672#: add-patch.c:611
2b472aae
JX
673msgid "mismatched output from interactive.diffFilter"
674msgstr "interactive.diffFilter 的输出不匹配"
675
d9488fea 676#: add-patch.c:612
2b472aae
JX
677msgid ""
678"Your filter must maintain a one-to-one correspondence\n"
679"between its input and output lines."
680msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"
681
d13389bf 682#: add-patch.c:790
ddc12c42
JX
683#, c-format
684msgid ""
685"expected context line #%d in\n"
686"%.*s"
687msgstr ""
688"预期上下文行 #%d 于\n"
689"%.*s"
690
d13389bf 691#: add-patch.c:805
ddc12c42
JX
692#, c-format
693msgid ""
694"hunks do not overlap:\n"
695"%.*s\n"
696"\tdoes not end with:\n"
697"%.*s"
698msgstr ""
699"块不重叠:\n"
700"%.*s\n"
701"\t不是结尾于:\n"
702"%.*s"
703
d13389bf 704#: add-patch.c:1081 git-add--interactive.perl:1115
ddc12c42
JX
705msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
706msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
707
d13389bf 708#: add-patch.c:1085
ddc12c42
JX
709#, c-format
710msgid ""
711"---\n"
712"To remove '%c' lines, make them ' ' lines (context).\n"
713"To remove '%c' lines, delete them.\n"
714"Lines starting with %c will be removed.\n"
715msgstr ""
716"---\n"
717"要删除 '%c' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
718"要删除 '%c' 开始的行,删除它们。\n"
719"以 %c 开始的行将被删除。\n"
720
ddc12c42 721#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
d13389bf 722#: add-patch.c:1099 git-add--interactive.perl:1129
ddc12c42
JX
723msgid ""
724"If it does not apply cleanly, you will be given an opportunity to\n"
725"edit again. If all lines of the hunk are removed, then the edit is\n"
726"aborted and the hunk is left unchanged.\n"
727msgstr ""
728"如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
729"此次编辑被终止,该块不会被修改。\n"
730
d13389bf 731#: add-patch.c:1132
ddc12c42
JX
732msgid "could not parse hunk header"
733msgstr "无法解析数据块头信息"
734
d13389bf 735#: add-patch.c:1177
ddc12c42
JX
736msgid "'git apply --cached' failed"
737msgstr "'git apply --cached' 失败"
738
739#. TRANSLATORS: do not translate [y/n]
740#. The program will only accept that input at this point.
741#. Consider translating (saying "no" discards!) as
742#. (saying "n" for "no" discards!) if the translation
743#. of the word "no" does not start with n.
744#.
745#. TRANSLATORS: do not translate [y/n]
746#. The program will only accept that input
747#. at this point.
748#. Consider translating (saying "no" discards!) as
749#. (saying "n" for "no" discards!) if the translation
750#. of the word "no" does not start with n.
d13389bf 751#: add-patch.c:1246 git-add--interactive.perl:1242
ddc12c42
JX
752msgid ""
753"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
754msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
755
d13389bf 756#: add-patch.c:1289
2b472aae
JX
757msgid "The selected hunks do not apply to the index!"
758msgstr "选中的块不能应用到索引!"
759
d13389bf 760#: add-patch.c:1290 git-add--interactive.perl:1346
2b472aae
JX
761msgid "Apply them to the worktree anyway? "
762msgstr "无论如何都要应用到工作区么?"
763
d13389bf 764#: add-patch.c:1297 git-add--interactive.perl:1349
2b472aae
JX
765msgid "Nothing was applied.\n"
766msgstr "未应用。\n"
ddc12c42 767
d13389bf 768#: add-patch.c:1354
ddc12c42
JX
769msgid ""
770"j - leave this hunk undecided, see next undecided hunk\n"
771"J - leave this hunk undecided, see next hunk\n"
772"k - leave this hunk undecided, see previous undecided hunk\n"
773"K - leave this hunk undecided, see previous hunk\n"
774"g - select a hunk to go to\n"
775"/ - search for a hunk matching the given regex\n"
776"s - split the current hunk into smaller hunks\n"
777"e - manually edit the current hunk\n"
778"? - print help\n"
779msgstr ""
780"j - 维持该块未决状态,查看下一个未决块\n"
781"J - 维持该块未决状态,查看下一个块\n"
782"k - 维持该块未决状态,查看上一个未决块\n"
783"K - 维持该块未决状态,查看上一个块\n"
784"g - 选择跳转到一个块\n"
785"/ - 查找和给定正则表达式匹配的块\n"
786"s - 拆分当前块为更小的块\n"
787"e - 手动编辑当前块\n"
788"? - 显示帮助\n"
789
d13389bf 790#: add-patch.c:1516 add-patch.c:1526
ddc12c42
JX
791msgid "No previous hunk"
792msgstr "没有前一个块"
793
d13389bf 794#: add-patch.c:1521 add-patch.c:1531
ddc12c42
JX
795msgid "No next hunk"
796msgstr "没有下一个块"
797
d13389bf 798#: add-patch.c:1537
ddc12c42
JX
799msgid "No other hunks to goto"
800msgstr "没有其它可供跳转的块"
801
d13389bf 802#: add-patch.c:1548 git-add--interactive.perl:1606
ddc12c42
JX
803msgid "go to which hunk (<ret> to see more)? "
804msgstr "跳转到哪个块(<回车> 查看更多)? "
805
d13389bf 806#: add-patch.c:1549 git-add--interactive.perl:1608
ddc12c42
JX
807msgid "go to which hunk? "
808msgstr "跳转到哪个块?"
809
d13389bf 810#: add-patch.c:1560
ddc12c42
JX
811#, c-format
812msgid "Invalid number: '%s'"
813msgstr "无效数字:'%s'"
814
d13389bf 815#: add-patch.c:1565
ddc12c42
JX
816#, c-format
817msgid "Sorry, only %d hunk available."
818msgid_plural "Sorry, only %d hunks available."
819msgstr[0] "对不起,只有 %d 个可用块。"
820msgstr[1] "对不起,只有 %d 个可用块。"
821
d13389bf 822#: add-patch.c:1574
ddc12c42
JX
823msgid "No other hunks to search"
824msgstr "没有其它可供查找的块"
825
d13389bf 826#: add-patch.c:1580 git-add--interactive.perl:1661
ddc12c42
JX
827msgid "search for regex? "
828msgstr "使用正则表达式搜索?"
829
d13389bf 830#: add-patch.c:1595
ddc12c42
JX
831#, c-format
832msgid "Malformed search regexp %s: %s"
833msgstr "错误的正则表达式 %s:%s"
834
d13389bf 835#: add-patch.c:1612
ddc12c42
JX
836msgid "No hunk matches the given pattern"
837msgstr "没有和给定模式相匹配的块"
838
d13389bf 839#: add-patch.c:1619
ddc12c42
JX
840msgid "Sorry, cannot split this hunk"
841msgstr "对不起,不能拆分这个块"
842
d13389bf 843#: add-patch.c:1623
ddc12c42
JX
844#, c-format
845msgid "Split into %d hunks."
846msgstr "拆分为 %d 块。"
847
d13389bf 848#: add-patch.c:1627
ddc12c42
JX
849msgid "Sorry, cannot edit this hunk"
850msgstr "对不起,不能编辑这个块"
851
d13389bf 852#: add-patch.c:1679
2b472aae
JX
853msgid "'git apply' failed"
854msgstr "'git apply' 失败"
855
d13389bf 856#: advice.c:143
349ede6a
JX
857#, c-format
858msgid ""
859"\n"
860"Disable this message with \"git config advice.%s false\""
861msgstr ""
862"\n"
863"使用 \"git config advice.%s false\" 来关闭此消息"
864
d13389bf 865#: advice.c:159
c04f5ac3 866#, c-format
fd8cb379
JX
867msgid "%shint: %.*s%s\n"
868msgstr "%s提示:%.*s%s\n"
c04f5ac3 869
d13389bf 870#: advice.c:250
5c57d762
JX
871msgid "Cherry-picking is not possible because you have unmerged files."
872msgstr "无法拣选,因为您有未合并的文件。"
873
d13389bf 874#: advice.c:252
5c57d762
JX
875msgid "Committing is not possible because you have unmerged files."
876msgstr "无法提交,因为您有未合并的文件。"
877
d13389bf 878#: advice.c:254
5c57d762
JX
879msgid "Merging is not possible because you have unmerged files."
880msgstr "无法合并,因为您有未合并的文件。"
881
d13389bf 882#: advice.c:256
5c57d762
JX
883msgid "Pulling is not possible because you have unmerged files."
884msgstr "无法拉取,因为您有未合并的文件。"
885
d13389bf 886#: advice.c:258
5c57d762
JX
887msgid "Reverting is not possible because you have unmerged files."
888msgstr "无法回退,因为您有未合并的文件。"
889
d13389bf 890#: advice.c:260
5c57d762
JX
891#, c-format
892msgid "It is not possible to %s because you have unmerged files."
893msgstr "无法 %s,因为您有未合并的文件。"
894
d13389bf 895#: advice.c:268
c04f5ac3 896msgid ""
6acbf033 897"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 898"as appropriate to mark resolution and make a commit."
c04f5ac3 899msgstr ""
d9d56b23 900"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
220c313c 901"解决方案并提交。"
c04f5ac3 902
d13389bf 903#: advice.c:276
5c57d762
JX
904msgid "Exiting because of an unresolved conflict."
905msgstr "因为存在未解决的冲突而退出。"
906
d13389bf 907#: advice.c:281 builtin/merge.c:1369
1b7f4a34
JX
908msgid "You have not concluded your merge (MERGE_HEAD exists)."
909msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
910
d13389bf 911#: advice.c:283
94550ed3 912msgid "Please, commit your changes before merging."
1b7f4a34
JX
913msgstr "请在合并前先提交您的修改。"
914
d13389bf 915#: advice.c:284
1b7f4a34
JX
916msgid "Exiting because of unfinished merge."
917msgstr "因为存在未完成的合并而退出。"
918
d13389bf 919#: advice.c:290
5c57d762
JX
920#, c-format
921msgid ""
a6cd2cc4 922"Note: switching to '%s'.\n"
5c57d762
JX
923"\n"
924"You are in 'detached HEAD' state. You can look around, make experimental\n"
925"changes and commit them, and you can discard any commits you make in this\n"
a6cd2cc4 926"state without impacting any branches by switching back to a branch.\n"
5c57d762
JX
927"\n"
928"If you want to create a new branch to retain commits you create, you may\n"
a6cd2cc4 929"do so (now or later) by using -c with the switch command. Example:\n"
5c57d762 930"\n"
a6cd2cc4
JX
931" git switch -c <new-branch-name>\n"
932"\n"
933"Or undo this operation with:\n"
934"\n"
935" git switch -\n"
936"\n"
937"Turn off this advice by setting config variable advice.detachedHead to "
938"false\n"
5c57d762
JX
939"\n"
940msgstr ""
a6cd2cc4
JX
941"注意:正在切换到 '%s'。\n"
942"\n"
943"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以在切换\n"
944"回一个分支时,丢弃在此状态下所做的提交而不对分支造成影响。\n"
5c57d762 945"\n"
a6cd2cc4
JX
946"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在 switch 命令\n"
947"中添加参数 -c 来实现(现在或稍后)。例如:\n"
5c57d762 948"\n"
a6cd2cc4 949" git switch -c <新分支名>\n"
5c57d762 950"\n"
a6cd2cc4
JX
951"或者撤销此操作:\n"
952"\n"
953" git switch -\n"
954"\n"
955"通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n"
5c57d762
JX
956"\n"
957
06991777
JX
958#: alias.c:50
959msgid "cmdline ends with \\"
960msgstr "命令行以 \\ 结尾"
961
962#: alias.c:51
963msgid "unclosed quote"
964msgstr "未关闭的引号"
965
a6cd2cc4 966#: apply.c:69
a0b6b246
JX
967#, c-format
968msgid "unrecognized whitespace option '%s'"
969msgstr "未能识别的空白字符选项 '%s'"
ef317cd5 970
a6cd2cc4 971#: apply.c:85
90314792 972#, c-format
a0b6b246
JX
973msgid "unrecognized whitespace ignore option '%s'"
974msgstr "未能识别的空白字符忽略选项 '%s'"
90314792 975
a6cd2cc4 976#: apply.c:135
a0b6b246 977msgid "--reject and --3way cannot be used together."
2090d5b4 978msgstr "--reject 和 --3way 不能同时使用。"
ef317cd5 979
a6cd2cc4 980#: apply.c:137
a0b6b246
JX
981msgid "--cached and --3way cannot be used together."
982msgstr "--cached 和 --3way 不能同时使用。"
ef317cd5 983
a6cd2cc4 984#: apply.c:140
a0b6b246
JX
985msgid "--3way outside a repository"
986msgstr "--3way 在一个仓库之外"
ef317cd5 987
a6cd2cc4 988#: apply.c:151
a0b6b246
JX
989msgid "--index outside a repository"
990msgstr "--index 在一个仓库之外"
ef317cd5 991
a6cd2cc4 992#: apply.c:154
a0b6b246
JX
993msgid "--cached outside a repository"
994msgstr "--cached 在一个仓库之外"
ef317cd5 995
a6cd2cc4 996#: apply.c:801
a0b6b246
JX
997#, c-format
998msgid "Cannot prepare timestamp regexp %s"
999msgstr "无法准备时间戳正则表达式 %s"
ef317cd5 1000
a6cd2cc4 1001#: apply.c:810
a0b6b246
JX
1002#, c-format
1003msgid "regexec returned %d for input: %s"
1004msgstr "regexec 返回 %d,输入为:%s"
ef317cd5 1005
a6cd2cc4 1006#: apply.c:884
a0b6b246
JX
1007#, c-format
1008msgid "unable to find filename in patch at line %d"
1009msgstr "不能在补丁的第 %d 行找到文件名"
ef317cd5 1010
a6cd2cc4 1011#: apply.c:922
a0b6b246
JX
1012#, c-format
1013msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1014msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
ef317cd5 1015
a6cd2cc4 1016#: apply.c:928
a0b6b246
JX
1017#, c-format
1018msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1019msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
ef317cd5 1020
a6cd2cc4 1021#: apply.c:929
a0b6b246
JX
1022#, c-format
1023msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1024msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
ef317cd5 1025
a6cd2cc4 1026#: apply.c:934
a0b6b246
JX
1027#, c-format
1028msgid "git apply: bad git-diff - expected /dev/null on line %d"
1029msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
ef317cd5 1030
a6cd2cc4 1031#: apply.c:963
a4f16749
JX
1032#, c-format
1033msgid "invalid mode on line %d: %s"
1034msgstr "第 %d 行包含无效文件模式:%s"
1035
a6cd2cc4 1036#: apply.c:1282
a4f16749
JX
1037#, c-format
1038msgid "inconsistent header lines %d and %d"
1039msgstr "不一致的文件头,%d 行和 %d 行"
1040
a5cd71ca 1041#: apply.c:1372
a0b6b246
JX
1042#, c-format
1043msgid ""
1044"git diff header lacks filename information when removing %d leading pathname "
1045"component (line %d)"
1046msgid_plural ""
1047"git diff header lacks filename information when removing %d leading pathname "
1048"components (line %d)"
1049msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1050msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
ef317cd5 1051
a5cd71ca 1052#: apply.c:1385
a0b6b246
JX
1053#, c-format
1054msgid "git diff header lacks filename information (line %d)"
1055msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
07432cef 1056
a5cd71ca
JX
1057#: apply.c:1481
1058#, c-format
1059msgid "recount: unexpected line: %.*s"
1060msgstr "recount:意外的行:%.*s"
1061
1062#: apply.c:1550
1063#, c-format
1064msgid "patch fragment without header at line %d: %.*s"
1065msgstr "第 %d 行的补丁片段没有头信息:%.*s"
1066
1067#: apply.c:1753
a0b6b246
JX
1068msgid "new file depends on old contents"
1069msgstr "新文件依赖旧内容"
5c57d762 1070
a5cd71ca 1071#: apply.c:1755
a0b6b246
JX
1072msgid "deleted file still has contents"
1073msgstr "删除的文件仍有内容"
5c57d762 1074
a5cd71ca 1075#: apply.c:1789
a0b6b246
JX
1076#, c-format
1077msgid "corrupt patch at line %d"
1078msgstr "补丁在第 %d 行损坏"
5c57d762 1079
a5cd71ca 1080#: apply.c:1826
5c57d762 1081#, c-format
a0b6b246
JX
1082msgid "new file %s depends on old contents"
1083msgstr "新文件 %s 依赖旧内容"
5c57d762 1084
a5cd71ca 1085#: apply.c:1828
5c57d762 1086#, c-format
a0b6b246
JX
1087msgid "deleted file %s still has contents"
1088msgstr "删除的文件 %s 仍有内容"
5c57d762 1089
a5cd71ca 1090#: apply.c:1831
a0b6b246
JX
1091#, c-format
1092msgid "** warning: file %s becomes empty but is not deleted"
1093msgstr "** 警告:文件 %s 成为空文件但并未删除"
ef317cd5 1094
a5cd71ca 1095#: apply.c:1978
5c57d762 1096#, c-format
a0b6b246
JX
1097msgid "corrupt binary patch at line %d: %.*s"
1098msgstr "二进制补丁在第 %d 行损坏:%.*s"
5c57d762 1099
a5cd71ca 1100#: apply.c:2015
5c57d762 1101#, c-format
a0b6b246
JX
1102msgid "unrecognized binary patch at line %d"
1103msgstr "未能识别的二进制补丁位于第 %d 行"
5c57d762 1104
a5cd71ca 1105#: apply.c:2177
5c57d762 1106#, c-format
a0b6b246
JX
1107msgid "patch with only garbage at line %d"
1108msgstr "补丁文件的第 %d 行只有垃圾数据"
5c57d762 1109
a5cd71ca 1110#: apply.c:2263
5c57d762 1111#, c-format
a0b6b246
JX
1112msgid "unable to read symlink %s"
1113msgstr "无法读取符号链接 %s"
5c57d762 1114
a5cd71ca 1115#: apply.c:2267
5c57d762 1116#, c-format
a0b6b246
JX
1117msgid "unable to open or read %s"
1118msgstr "不能打开或读取 %s"
5c57d762 1119
ddc12c42 1120#: apply.c:2936
5c57d762 1121#, c-format
a0b6b246
JX
1122msgid "invalid start of line: '%c'"
1123msgstr "无效的行首字符:'%c'"
5c57d762 1124
ddc12c42 1125#: apply.c:3057
5c57d762 1126#, c-format
a0b6b246
JX
1127msgid "Hunk #%d succeeded at %d (offset %d line)."
1128msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1129msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
1130msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
5c57d762 1131
ddc12c42 1132#: apply.c:3069
5c57d762 1133#, c-format
a0b6b246
JX
1134msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1135msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
5c57d762 1136
ddc12c42 1137#: apply.c:3075
5c57d762
JX
1138#, c-format
1139msgid ""
a0b6b246
JX
1140"while searching for:\n"
1141"%.*s"
5c57d762 1142msgstr ""
a0b6b246
JX
1143"当查询:\n"
1144"%.*s"
5c57d762 1145
ddc12c42 1146#: apply.c:3097
5c57d762 1147#, c-format
a0b6b246
JX
1148msgid "missing binary patch data for '%s'"
1149msgstr "缺失 '%s' 的二进制补丁数据"
5c57d762 1150
ddc12c42 1151#: apply.c:3105
5c57d762 1152#, c-format
a0b6b246 1153msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
29004bbb 1154msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
5c57d762 1155
ddc12c42 1156#: apply.c:3152
5c57d762 1157#, c-format
a0b6b246
JX
1158msgid "cannot apply binary patch to '%s' without full index line"
1159msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
5c57d762 1160
2b472aae 1161#: apply.c:3163
5c57d762 1162#, c-format
a0b6b246
JX
1163msgid ""
1164"the patch applies to '%s' (%s), which does not match the current contents."
29004bbb 1165msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
5c57d762 1166
2b472aae 1167#: apply.c:3171
a0b6b246
JX
1168#, c-format
1169msgid "the patch applies to an empty '%s' but it is not empty"
29004bbb 1170msgstr "补丁应用到空文件 '%s',但其并非空文件"
5c57d762 1171
2b472aae 1172#: apply.c:3189
5c57d762 1173#, c-format
a0b6b246 1174msgid "the necessary postimage %s for '%s' cannot be read"
e640d114 1175msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
5c57d762 1176
2b472aae 1177#: apply.c:3202
5c57d762 1178#, c-format
a0b6b246
JX
1179msgid "binary patch does not apply to '%s'"
1180msgstr "二进制补丁未应用到 '%s'"
5c57d762 1181
2b472aae 1182#: apply.c:3209
5c57d762 1183#, c-format
a0b6b246
JX
1184msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1185msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
5c57d762 1186
2b472aae 1187#: apply.c:3230
276ceeaa 1188#, c-format
a0b6b246
JX
1189msgid "patch failed: %s:%ld"
1190msgstr "打补丁失败:%s:%ld"
276ceeaa 1191
2b472aae 1192#: apply.c:3353
4dcdc3d8 1193#, c-format
a0b6b246
JX
1194msgid "cannot checkout %s"
1195msgstr "不能检出 %s"
4dcdc3d8 1196
d13389bf 1197#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308
4dcdc3d8 1198#, c-format
a0b6b246
JX
1199msgid "failed to read %s"
1200msgstr "无法读取 %s"
4dcdc3d8 1201
2b472aae 1202#: apply.c:3413
4dcdc3d8 1203#, c-format
a0b6b246
JX
1204msgid "reading from '%s' beyond a symbolic link"
1205msgstr "读取位于符号链接中的 '%s'"
4dcdc3d8 1206
2b472aae 1207#: apply.c:3442 apply.c:3685
4dcdc3d8 1208#, c-format
a0b6b246
JX
1209msgid "path %s has been renamed/deleted"
1210msgstr "路径 %s 已经被重命名/删除"
4dcdc3d8 1211
2b472aae 1212#: apply.c:3528 apply.c:3700
4dcdc3d8 1213#, c-format
a0b6b246
JX
1214msgid "%s: does not exist in index"
1215msgstr "%s:不存在于索引中"
4dcdc3d8 1216
d13389bf 1217#: apply.c:3537 apply.c:3708 apply.c:3952
4dcdc3d8 1218#, c-format
a0b6b246
JX
1219msgid "%s: does not match index"
1220msgstr "%s:和索引不匹配"
4dcdc3d8 1221
2b472aae 1222#: apply.c:3572
a0b6b246
JX
1223msgid "repository lacks the necessary blob to fall back on 3-way merge."
1224msgstr "仓库缺乏必要的数据对象以进行三方合并。"
4dcdc3d8 1225
2b472aae 1226#: apply.c:3575
4dcdc3d8 1227#, c-format
a0b6b246
JX
1228msgid "Falling back to three-way merge...\n"
1229msgstr "回落到三方合并...\n"
4dcdc3d8 1230
2b472aae 1231#: apply.c:3591 apply.c:3595
4dcdc3d8 1232#, c-format
a0b6b246
JX
1233msgid "cannot read the current contents of '%s'"
1234msgstr "无法读取 '%s' 的当前内容"
276ceeaa 1235
2b472aae 1236#: apply.c:3607
4dcdc3d8 1237#, c-format
a0b6b246
JX
1238msgid "Failed to fall back on three-way merge...\n"
1239msgstr "无法回落到三方合并...\n"
4dcdc3d8 1240
2b472aae 1241#: apply.c:3621
4dcdc3d8 1242#, c-format
a0b6b246
JX
1243msgid "Applied patch to '%s' with conflicts.\n"
1244msgstr "应用补丁到 '%s' 存在冲突。\n"
4dcdc3d8 1245
2b472aae 1246#: apply.c:3626
4dcdc3d8 1247#, c-format
a0b6b246
JX
1248msgid "Applied patch to '%s' cleanly.\n"
1249msgstr "成功应用补丁到 '%s'。\n"
4dcdc3d8 1250
2b472aae 1251#: apply.c:3652
a0b6b246
JX
1252msgid "removal patch leaves file contents"
1253msgstr "移除补丁仍留下了文件内容"
4dcdc3d8 1254
2b472aae 1255#: apply.c:3725
1003b3a5 1256#, c-format
a0b6b246
JX
1257msgid "%s: wrong type"
1258msgstr "%s:错误类型"
1003b3a5 1259
2b472aae 1260#: apply.c:3727
1003b3a5 1261#, c-format
a0b6b246
JX
1262msgid "%s has type %o, expected %o"
1263msgstr "%s 的类型是 %o,应为 %o"
1003b3a5 1264
d9488fea
JX
1265#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858
1266#: read-cache.c:1313
4dcdc3d8 1267#, c-format
a0b6b246
JX
1268msgid "invalid path '%s'"
1269msgstr "无效路径 '%s'"
4dcdc3d8 1270
d9488fea 1271#: apply.c:3950
4dcdc3d8 1272#, c-format
a0b6b246
JX
1273msgid "%s: already exists in index"
1274msgstr "%s:已经存在于索引中"
4dcdc3d8 1275
d13389bf 1276#: apply.c:3954
4dcdc3d8 1277#, c-format
a0b6b246
JX
1278msgid "%s: already exists in working directory"
1279msgstr "%s:已经存在于工作区中"
4dcdc3d8 1280
d13389bf 1281#: apply.c:3974
1b7f4a34 1282#, c-format
a0b6b246
JX
1283msgid "new mode (%o) of %s does not match old mode (%o)"
1284msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1b7f4a34 1285
d13389bf 1286#: apply.c:3979
5b04ee3b 1287#, c-format
a0b6b246
JX
1288msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1289msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
5b04ee3b 1290
d13389bf 1291#: apply.c:3999
8ada9598 1292#, c-format
a0b6b246
JX
1293msgid "affected file '%s' is beyond a symbolic link"
1294msgstr "受影响的文件 '%s' 位于符号链接中"
8ada9598 1295
d13389bf 1296#: apply.c:4003
81809b99 1297#, c-format
a0b6b246
JX
1298msgid "%s: patch does not apply"
1299msgstr "%s:补丁未应用"
8ada9598 1300
d13389bf 1301#: apply.c:4018
8ada9598 1302#, c-format
a0b6b246 1303msgid "Checking patch %s..."
06991777 1304msgstr "正在检查补丁 %s..."
8ada9598 1305
d13389bf 1306#: apply.c:4110
a0b6b246
JX
1307#, c-format
1308msgid "sha1 information is lacking or useless for submodule %s"
1309msgstr "子模组 %s 的 sha1 信息缺失或无效"
8ada9598 1310
d13389bf 1311#: apply.c:4117
8ada9598 1312#, c-format
a0b6b246 1313msgid "mode change for %s, which is not in current HEAD"
31e5e17b 1314msgstr "%s 的模式变更,但它不在当前 HEAD 中"
8ada9598 1315
d13389bf 1316#: apply.c:4120
a0b6b246
JX
1317#, c-format
1318msgid "sha1 information is lacking or useless (%s)."
1319msgstr "sha1 信息缺失或无效(%s)。"
6792b93b 1320
d13389bf 1321#: apply.c:4129
a0b6b246
JX
1322#, c-format
1323msgid "could not add %s to temporary index"
1324msgstr "不能在临时索引中添加 %s"
9aeb4c2b 1325
d13389bf 1326#: apply.c:4139
a0b6b246
JX
1327#, c-format
1328msgid "could not write temporary index to %s"
1329msgstr "不能把临时索引写入到 %s"
9aeb4c2b 1330
d13389bf 1331#: apply.c:4277
a0b6b246
JX
1332#, c-format
1333msgid "unable to remove %s from index"
1334msgstr "不能从索引中移除 %s"
8ada9598 1335
d13389bf 1336#: apply.c:4311
8ada9598 1337#, c-format
a0b6b246
JX
1338msgid "corrupt patch for submodule %s"
1339msgstr "子模组 %s 损坏的补丁"
8ada9598 1340
d13389bf 1341#: apply.c:4317
9aeb4c2b 1342#, c-format
a0b6b246 1343msgid "unable to stat newly created file '%s'"
65e2041e 1344msgstr "不能对新建文件 '%s' 调用 stat"
9aeb4c2b 1345
d13389bf 1346#: apply.c:4325
a0b6b246
JX
1347#, c-format
1348msgid "unable to create backing store for newly created file %s"
1349msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 1350
d13389bf 1351#: apply.c:4331 apply.c:4476
81809b99 1352#, c-format
a0b6b246
JX
1353msgid "unable to add cache entry for %s"
1354msgstr "无法为 %s 添加缓存条目"
8ada9598 1355
d13389bf 1356#: apply.c:4374 builtin/bisect--helper.c:524
a0b6b246
JX
1357#, c-format
1358msgid "failed to write to '%s'"
c1ac5258 1359msgstr "写入 '%s' 失败"
8ada9598 1360
d13389bf 1361#: apply.c:4378
220c313c 1362#, c-format
a0b6b246
JX
1363msgid "closing file '%s'"
1364msgstr "关闭文件 '%s'"
220c313c 1365
d13389bf 1366#: apply.c:4448
c04f5ac3 1367#, c-format
a0b6b246
JX
1368msgid "unable to write file '%s' mode %o"
1369msgstr "不能写文件 '%s' 权限 %o"
c04f5ac3 1370
d13389bf 1371#: apply.c:4546
c04f5ac3 1372#, c-format
a0b6b246
JX
1373msgid "Applied patch %s cleanly."
1374msgstr "成功应用补丁 %s。"
c04f5ac3 1375
d13389bf 1376#: apply.c:4554
a0b6b246
JX
1377msgid "internal error"
1378msgstr "内部错误"
c04f5ac3 1379
d13389bf 1380#: apply.c:4557
5c57d762 1381#, c-format
a0b6b246
JX
1382msgid "Applying patch %%s with %d reject..."
1383msgid_plural "Applying patch %%s with %d rejects..."
1384msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1385msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
5c57d762 1386
d13389bf 1387#: apply.c:4568
5c57d762 1388#, c-format
a0b6b246
JX
1389msgid "truncating .rej filename to %.*s.rej"
1390msgstr "截短 .rej 文件名为 %.*s.rej"
5c57d762 1391
d13389bf 1392#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228
220c313c 1393#, c-format
a0b6b246
JX
1394msgid "cannot open %s"
1395msgstr "不能打开 %s"
220c313c 1396
d13389bf 1397#: apply.c:4590
220c313c 1398#, c-format
a0b6b246
JX
1399msgid "Hunk #%d applied cleanly."
1400msgstr "第 #%d 个片段成功应用。"
220c313c 1401
d13389bf 1402#: apply.c:4594
5c57d762 1403#, c-format
a0b6b246
JX
1404msgid "Rejected hunk #%d."
1405msgstr "拒绝第 #%d 个片段。"
5c57d762 1406
d13389bf 1407#: apply.c:4718
5c57d762 1408#, c-format
a0b6b246
JX
1409msgid "Skipped patch '%s'."
1410msgstr "略过补丁 '%s'。"
5c57d762 1411
d13389bf 1412#: apply.c:4726
a0b6b246
JX
1413msgid "unrecognized input"
1414msgstr "未能识别的输入"
5c57d762 1415
d13389bf 1416#: apply.c:4746
a0b6b246
JX
1417msgid "unable to read index file"
1418msgstr "无法读取索引文件"
5c57d762 1419
d13389bf 1420#: apply.c:4903
220c313c 1421#, c-format
a0b6b246
JX
1422msgid "can't open patch '%s': %s"
1423msgstr "不能打开补丁 '%s':%s"
220c313c 1424
d13389bf 1425#: apply.c:4930
5c57d762 1426#, c-format
a0b6b246
JX
1427msgid "squelched %d whitespace error"
1428msgid_plural "squelched %d whitespace errors"
1429msgstr[0] "抑制下仍有 %d 个空白字符误用"
1430msgstr[1] "抑制下仍有 %d 个空白字符误用"
5c57d762 1431
d13389bf 1432#: apply.c:4936 apply.c:4951
5c57d762 1433#, c-format
a0b6b246
JX
1434msgid "%d line adds whitespace errors."
1435msgid_plural "%d lines add whitespace errors."
a4f16749
JX
1436msgstr[0] "%d 行新增了空白字符误用。"
1437msgstr[1] "%d 行新增了空白字符误用。"
5c57d762 1438
d13389bf 1439#: apply.c:4944
5c57d762 1440#, c-format
a0b6b246
JX
1441msgid "%d line applied after fixing whitespace errors."
1442msgid_plural "%d lines applied after fixing whitespace errors."
1443msgstr[0] "修复空白错误后,应用了 %d 行。"
1444msgstr[1] "修复空白错误后,应用了 %d 行。"
5c57d762 1445
d13389bf 1446#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406
a0b6b246
JX
1447msgid "Unable to write new index file"
1448msgstr "无法写入新索引文件"
5c57d762 1449
d13389bf 1450#: apply.c:4988
a0b6b246
JX
1451msgid "don't apply changes matching the given path"
1452msgstr "不要应用与给出路径向匹配的变更"
5c57d762 1453
d13389bf 1454#: apply.c:4991
a0b6b246
JX
1455msgid "apply changes matching the given path"
1456msgstr "应用与给出路径向匹配的变更"
220c313c 1457
d13389bf 1458#: apply.c:4993 builtin/am.c:2266
a0b6b246
JX
1459msgid "num"
1460msgstr "数字"
220c313c 1461
d13389bf 1462#: apply.c:4994
a0b6b246
JX
1463msgid "remove <num> leading slashes from traditional diff paths"
1464msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
220c313c 1465
d13389bf 1466#: apply.c:4997
a0b6b246
JX
1467msgid "ignore additions made by the patch"
1468msgstr "忽略补丁中的添加的文件"
220c313c 1469
d13389bf 1470#: apply.c:4999
a0b6b246
JX
1471msgid "instead of applying the patch, output diffstat for the input"
1472msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
220c313c 1473
d13389bf 1474#: apply.c:5003
a0b6b246
JX
1475msgid "show number of added and deleted lines in decimal notation"
1476msgstr "以十进制数显示添加和删除的行数"
220c313c 1477
d13389bf 1478#: apply.c:5005
a0b6b246
JX
1479msgid "instead of applying the patch, output a summary for the input"
1480msgstr "不应用补丁,而是显示输入的概要"
220c313c 1481
d13389bf 1482#: apply.c:5007
a0b6b246
JX
1483msgid "instead of applying the patch, see if the patch is applicable"
1484msgstr "不应用补丁,而是查看补丁是否可应用"
220c313c 1485
d13389bf 1486#: apply.c:5009
a0b6b246
JX
1487msgid "make sure the patch is applicable to the current index"
1488msgstr "确认补丁可以应用到当前索引"
276ceeaa 1489
d13389bf 1490#: apply.c:5011
c1ac5258
JX
1491msgid "mark new files with `git add --intent-to-add`"
1492msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
1493
d13389bf 1494#: apply.c:5013
a0b6b246
JX
1495msgid "apply a patch without touching the working tree"
1496msgstr "应用补丁而不修改工作区"
5b04ee3b 1497
d13389bf 1498#: apply.c:5015
a0b6b246
JX
1499msgid "accept a patch that touches outside the working area"
1500msgstr "接受修改工作区之外文件的补丁"
5c57d762 1501
d13389bf 1502#: apply.c:5018
a0b6b246
JX
1503msgid "also apply the patch (use with --stat/--summary/--check)"
1504msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
c04f5ac3 1505
d13389bf 1506#: apply.c:5020
a0b6b246
JX
1507msgid "attempt three-way merge if a patch does not apply"
1508msgstr "如果一个补丁不能应用则尝试三方合并"
c04f5ac3 1509
d13389bf 1510#: apply.c:5022
a0b6b246
JX
1511msgid "build a temporary index based on embedded index information"
1512msgstr "创建一个临时索引基于嵌入的索引信息"
c04f5ac3 1513
d13389bf 1514#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525
a0b6b246
JX
1515msgid "paths are separated with NUL character"
1516msgstr "路径以 NUL 字符分隔"
8ada9598 1517
d13389bf 1518#: apply.c:5027
a0b6b246
JX
1519msgid "ensure at least <n> lines of context match"
1520msgstr "确保至少匹配 <n> 行上下文"
8ada9598 1521
d13389bf 1522#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
a6cd2cc4 1523#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
d13389bf 1524#: builtin/pack-objects.c:3562 builtin/rebase.c:1346
a0b6b246
JX
1525msgid "action"
1526msgstr "动作"
8ada9598 1527
d13389bf 1528#: apply.c:5029
a0b6b246
JX
1529msgid "detect new or modified lines that have whitespace errors"
1530msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 1531
d13389bf 1532#: apply.c:5032 apply.c:5035
a0b6b246
JX
1533msgid "ignore changes in whitespace when finding context"
1534msgstr "查找上下文时忽略空白字符的变更"
8ada9598 1535
d13389bf 1536#: apply.c:5038
a0b6b246
JX
1537msgid "apply the patch in reverse"
1538msgstr "反向应用补丁"
8ada9598 1539
d13389bf 1540#: apply.c:5040
a0b6b246
JX
1541msgid "don't expect at least one line of context"
1542msgstr "无需至少一行上下文"
8ada9598 1543
d13389bf 1544#: apply.c:5042
a0b6b246
JX
1545msgid "leave the rejected hunks in corresponding *.rej files"
1546msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 1547
d13389bf 1548#: apply.c:5044
a0b6b246
JX
1549msgid "allow overlapping hunks"
1550msgstr "允许重叠的补丁片段"
8ada9598 1551
d13389bf 1552#: apply.c:5045 builtin/add.c:329 builtin/check-ignore.c:22
d9488fea 1553#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775
d13389bf 1554#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128
a0b6b246
JX
1555msgid "be verbose"
1556msgstr "冗长输出"
8ada9598 1557
d13389bf 1558#: apply.c:5047
a0b6b246
JX
1559msgid "tolerate incorrectly detected missing new-line at the end of file"
1560msgstr "允许不正确的文件末尾换行符"
cfff71a9 1561
d13389bf 1562#: apply.c:5050
a0b6b246
JX
1563msgid "do not trust the line counts in the hunk headers"
1564msgstr "不信任补丁片段的头信息中的行号"
6c94aba5 1565
d13389bf 1566#: apply.c:5052 builtin/am.c:2254
a0b6b246
JX
1567msgid "root"
1568msgstr "根目录"
c04f5ac3 1569
d13389bf 1570#: apply.c:5053
a0b6b246
JX
1571msgid "prepend <root> to all filenames"
1572msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 1573
d9488fea 1574#: archive-tar.c:125 archive-zip.c:345
349ede6a
JX
1575#, c-format
1576msgid "cannot stream blob %s"
1577msgstr "不能打开数据对象 %s"
1578
d9488fea 1579#: archive-tar.c:265 archive-zip.c:358
349ede6a
JX
1580#, c-format
1581msgid "unsupported file mode: 0%o (SHA1: %s)"
1582msgstr "不支持的文件模式:0%o (SHA1: %s)"
1583
d13389bf 1584#: archive-tar.c:450
349ede6a
JX
1585#, c-format
1586msgid "unable to start '%s' filter"
1587msgstr "无法启动 '%s' 过滤器"
1588
d13389bf 1589#: archive-tar.c:453
349ede6a
JX
1590msgid "unable to redirect descriptor"
1591msgstr "无法重定向描述符"
1592
d13389bf 1593#: archive-tar.c:460
349ede6a
JX
1594#, c-format
1595msgid "'%s' filter reported error"
1596msgstr "'%s' 过滤器报告了错误"
1597
d9488fea 1598#: archive-zip.c:318
349ede6a
JX
1599#, c-format
1600msgid "path is not valid UTF-8: %s"
1601msgstr "路径不是有效的 UTF-8:%s"
1602
d9488fea 1603#: archive-zip.c:322
349ede6a
JX
1604#, c-format
1605msgid "path too long (%d chars, SHA1: %s): %s"
1606msgstr "路径太长(%d 字符,SHA1:%s):%s"
1607
d9488fea 1608#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
349ede6a
JX
1609#, c-format
1610msgid "deflate error (%d)"
1611msgstr "压缩错误 (%d)"
1612
d9488fea 1613#: archive-zip.c:603
349ede6a
JX
1614#, c-format
1615msgid "timestamp too large for this system: %<PRIuMAX>"
1616msgstr "对于本系统时间戳太大:%<PRIuMAX>"
1617
c1ac5258 1618#: archive.c:14
a0b6b246 1619msgid "git archive [<options>] <tree-ish> [<path>...]"
ddc12c42 1620msgstr "git archive [<选项>] <树对象> [<路径>...]"
07432cef 1621
c1ac5258 1622#: archive.c:15
a0b6b246
JX
1623msgid "git archive --list"
1624msgstr "git archive --list"
1625
c1ac5258 1626#: archive.c:16
c04f5ac3 1627msgid ""
a0b6b246 1628"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
c04f5ac3 1629msgstr ""
ddc12c42 1630"git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]"
6acbf033 1631
c1ac5258 1632#: archive.c:17
a0b6b246
JX
1633msgid "git archive --remote <repo> [--exec <cmd>] --list"
1634msgstr "git archive --remote <仓库> [--exec <命令>] --list"
6acbf033 1635
d9488fea
JX
1636#: archive.c:192
1637#, c-format
1638msgid "cannot read %s"
1639msgstr "不能读取 %s"
1640
d13389bf
JX
1641#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886
1642#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786
1643#: builtin/merge.c:1138
d9488fea
JX
1644#, c-format
1645msgid "could not read '%s'"
1646msgstr "不能读取 '%s'"
1647
1648#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315
c04f5ac3 1649#, c-format
a0b6b246
JX
1650msgid "pathspec '%s' did not match any files"
1651msgstr "路径规格 '%s' 未匹配任何文件"
c04f5ac3 1652
d9488fea 1653#: archive.c:454
06991777
JX
1654#, c-format
1655msgid "no such ref: %.*s"
1656msgstr "无此引用:%.*s"
1657
d9488fea 1658#: archive.c:460
06991777
JX
1659#, c-format
1660msgid "not a valid object name: %s"
1661msgstr "不是一个有效的对象名:%s"
1662
d9488fea 1663#: archive.c:473
06991777
JX
1664#, c-format
1665msgid "not a tree object: %s"
1666msgstr "不是一个树对象:%s"
1667
d9488fea 1668#: archive.c:485
06991777
JX
1669msgid "current working directory is untracked"
1670msgstr "当前工作目录未被跟踪"
1671
d9488fea
JX
1672#: archive.c:526
1673#, c-format
1674msgid "File not found: %s"
1675msgstr "文件未找到:%s"
1676
1677#: archive.c:528
1678#, c-format
1679msgid "Not a regular file: %s"
1680msgstr "不是一个常规文件:%s"
1681
d13389bf 1682#: archive.c:555
a0b6b246
JX
1683msgid "fmt"
1684msgstr "格式"
07432cef 1685
d13389bf 1686#: archive.c:555
a0b6b246
JX
1687msgid "archive format"
1688msgstr "归档格式"
7aea43ff 1689
d13389bf 1690#: archive.c:556 builtin/log.c:1765
a0b6b246
JX
1691msgid "prefix"
1692msgstr "前缀"
7aea43ff 1693
d13389bf 1694#: archive.c:557
a0b6b246
JX
1695msgid "prepend prefix to each pathname in the archive"
1696msgstr "为归档中每个路径名加上前缀"
c04f5ac3 1697
d13389bf
JX
1698#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890
1699#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135
1700#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
1701#: builtin/fast-export.c:1213 builtin/grep.c:919 builtin/hash-object.c:105
d9488fea
JX
1702#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412
1703#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
a0b6b246
JX
1704msgid "file"
1705msgstr "文件"
a77c07d9 1706
d13389bf 1707#: archive.c:559
d9488fea
JX
1708msgid "add untracked file to archive"
1709msgstr "将未跟踪文件添加到归档"
1710
d13389bf 1711#: archive.c:562 builtin/archive.c:90
a0b6b246
JX
1712msgid "write the archive to this file"
1713msgstr "归档写入此文件"
a77c07d9 1714
d13389bf 1715#: archive.c:564
a0b6b246
JX
1716msgid "read .gitattributes in working directory"
1717msgstr "读取工作区中的 .gitattributes"
7ac1c0ad 1718
d13389bf 1719#: archive.c:565
a0b6b246
JX
1720msgid "report archived files on stderr"
1721msgstr "在标准错误上报告归档文件"
7ac1c0ad 1722
d13389bf
JX
1723#: archive.c:567
1724msgid "set compression level"
1725msgstr "设置压缩级别"
8ada9598 1726
d13389bf 1727#: archive.c:570
a0b6b246
JX
1728msgid "list supported archive formats"
1729msgstr "列出支持的归档格式"
a77c07d9 1730
d13389bf 1731#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
d9488fea 1732#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
a0b6b246
JX
1733msgid "repo"
1734msgstr "仓库"
c04f5ac3 1735
d13389bf 1736#: archive.c:573 builtin/archive.c:92
a0b6b246
JX
1737msgid "retrieve the archive from remote repository <repo>"
1738msgstr "从远程仓库(<仓库>)提取归档文件"
8ada9598 1739
d13389bf 1740#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
06991777 1741#: builtin/notes.c:498
a0b6b246
JX
1742msgid "command"
1743msgstr "命令"
1744
d13389bf 1745#: archive.c:575 builtin/archive.c:94
a0b6b246
JX
1746msgid "path to the remote git-upload-archive command"
1747msgstr "远程 git-upload-archive 命令的路径"
1748
d13389bf 1749#: archive.c:582
a0b6b246
JX
1750msgid "Unexpected option --remote"
1751msgstr "未知参数 --remote"
1752
d13389bf 1753#: archive.c:584
a0b6b246
JX
1754msgid "Option --exec can only be used together with --remote"
1755msgstr "选项 --exec 只能和 --remote 同时使用"
1756
d13389bf 1757#: archive.c:586
a0b6b246
JX
1758msgid "Unexpected option --output"
1759msgstr "未知参数 --output"
1760
d13389bf 1761#: archive.c:588
d9488fea
JX
1762msgid "Options --add-file and --remote cannot be used together"
1763msgstr "选项 --add-file 和 --remote 不能同时使用"
1764
d13389bf 1765#: archive.c:610
a0b6b246
JX
1766#, c-format
1767msgid "Unknown archive format '%s'"
1768msgstr "未知归档格式 '%s'"
1769
d13389bf 1770#: archive.c:619
8ada9598 1771#, c-format
a0b6b246
JX
1772msgid "Argument not supported for format '%s': -%d"
1773msgstr "参数不支持此格式 '%s':-%d"
1774
d13389bf 1775#: attr.c:202
87cb7997
JX
1776#, c-format
1777msgid "%.*s is not a valid attribute name"
1778msgstr "%.*s 不是一个有效的属性名"
1779
d13389bf 1780#: attr.c:359
06991777
JX
1781#, c-format
1782msgid "%s not allowed: %s:%d"
5b533632 1783msgstr "不允许 %s:%s:%d"
06991777 1784
d13389bf 1785#: attr.c:399
8ada9598 1786msgid ""
a0b6b246
JX
1787"Negative patterns are ignored in git attributes\n"
1788"Use '\\!' for literal leading exclamation."
8ada9598 1789msgstr ""
a0b6b246
JX
1790"负值模版在 git attributes 中被忽略\n"
1791"当字符串确实要以感叹号开始时,使用 '\\!'。"
8ada9598 1792
d13389bf 1793#: bisect.c:489
8ada9598 1794#, c-format
a0b6b246
JX
1795msgid "Badly quoted content in file '%s': %s"
1796msgstr "文件 '%s' 包含错误的引用格式:%s"
8ada9598 1797
d13389bf 1798#: bisect.c:699
a0b6b246
JX
1799#, c-format
1800msgid "We cannot bisect more!\n"
1801msgstr "我们无法进行更多的二分查找!\n"
8ada9598 1802
d13389bf 1803#: bisect.c:766
2e8451e8 1804#, c-format
a0b6b246
JX
1805msgid "Not a valid commit name %s"
1806msgstr "不是一个有效的提交名 %s"
2e8451e8 1807
d13389bf 1808#: bisect.c:791
5b04ee3b
JX
1809#, c-format
1810msgid ""
a0b6b246
JX
1811"The merge base %s is bad.\n"
1812"This means the bug has been fixed between %s and [%s].\n"
5b04ee3b 1813msgstr ""
a0b6b246
JX
1814"合并基线 %s 是坏的。\n"
1815"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
5b04ee3b 1816
d13389bf 1817#: bisect.c:796
5b04ee3b 1818#, c-format
a0b6b246
JX
1819msgid ""
1820"The merge base %s is new.\n"
1821"The property has changed between %s and [%s].\n"
1822msgstr ""
1823"合并基线 %s 是新的。\n"
1824"介于 %s 和 [%s] 之间的属性已经被修改。\n"
5b04ee3b 1825
d13389bf 1826#: bisect.c:801
a0b6b246
JX
1827#, c-format
1828msgid ""
1829"The merge base %s is %s.\n"
1830"This means the first '%s' commit is between %s and [%s].\n"
1831msgstr ""
1832"合并基线 %s 是 %s。\n"
1833"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
07432cef 1834
d13389bf 1835#: bisect.c:809
a0b6b246
JX
1836#, c-format
1837msgid ""
1a79b2f1 1838"Some %s revs are not ancestors of the %s rev.\n"
a0b6b246
JX
1839"git bisect cannot work properly in this case.\n"
1840"Maybe you mistook %s and %s revs?\n"
1841msgstr ""
1842"一些 %s 版本不是 %s 版本的祖先。\n"
1843"这种情况下 git 二分查找无法正常工作。\n"
1844"您可能弄错了 %s 和 %s 版本?\n"
07432cef 1845
d13389bf 1846#: bisect.c:822
a0b6b246
JX
1847#, c-format
1848msgid ""
1849"the merge base between %s and [%s] must be skipped.\n"
1850"So we cannot be sure the first %s commit is between %s and %s.\n"
1851"We continue anyway."
1852msgstr ""
1853"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1854"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1855"我们仍旧继续。"
649900bc 1856
d13389bf 1857#: bisect.c:861
649900bc 1858#, c-format
a0b6b246
JX
1859msgid "Bisecting: a merge base must be tested\n"
1860msgstr "二分查找中:合并基线必须是经过测试的\n"
649900bc 1861
d13389bf 1862#: bisect.c:911
a0b6b246
JX
1863#, c-format
1864msgid "a %s revision is needed"
1865msgstr "需要一个 %s 版本"
649900bc 1866
d13389bf 1867#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255
649900bc 1868#, c-format
a0b6b246
JX
1869msgid "could not create file '%s'"
1870msgstr "不能创建文件 '%s'"
649900bc 1871
d13389bf 1872#: bisect.c:987 builtin/merge.c:152
649900bc 1873#, c-format
a0b6b246
JX
1874msgid "could not read file '%s'"
1875msgstr "不能读取文件 '%s'"
649900bc 1876
d13389bf 1877#: bisect.c:1027
a0b6b246
JX
1878msgid "reading bisect refs failed"
1879msgstr "读取二分查找引用失败"
649900bc 1880
d13389bf 1881#: bisect.c:1057
649900bc 1882#, c-format
a0b6b246
JX
1883msgid "%s was both %s and %s\n"
1884msgstr "%s 同时为 %s 和 %s\n"
649900bc 1885
d13389bf 1886#: bisect.c:1066
649900bc 1887#, c-format
a0b6b246
JX
1888msgid ""
1889"No testable commit found.\n"
1890"Maybe you started with bad path parameters?\n"
1891msgstr ""
1892"没有发现可测试的提交。\n"
1893"可能您在运行时使用了错误的路径参数?\n"
649900bc 1894
d13389bf 1895#: bisect.c:1095
649900bc 1896#, c-format
a0b6b246
JX
1897msgid "(roughly %d step)"
1898msgid_plural "(roughly %d steps)"
1899msgstr[0] "(大概 %d 步)"
1900msgstr[1] "(大概 %d 步)"
649900bc 1901
a4f16749
JX
1902#. TRANSLATORS: the last %s will be replaced with "(roughly %d
1903#. steps)" translation.
1904#.
d13389bf 1905#: bisect.c:1101
649900bc 1906#, c-format
a0b6b246
JX
1907msgid "Bisecting: %d revision left to test after this %s\n"
1908msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1909msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1910msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
649900bc 1911
d13389bf 1912#: blame.c:2777
a4f16749
JX
1913msgid "--contents and --reverse do not blend well."
1914msgstr "--contents 和 --reverse 不能混用。"
1915
d13389bf 1916#: blame.c:2791
a4f16749
JX
1917msgid "cannot use --contents with final commit object name"
1918msgstr "不能将 --contents 和最终的提交对象名共用"
1919
d13389bf 1920#: blame.c:2812
a4f16749
JX
1921msgid "--reverse and --first-parent together require specified latest commit"
1922msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
1923
d13389bf
JX
1924#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138
1925#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409
1926#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336
1927#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395
1928#: builtin/shortlog.c:267
a4f16749
JX
1929msgid "revision walk setup failed"
1930msgstr "版本遍历设置失败"
1931
d13389bf 1932#: blame.c:2839
a4f16749
JX
1933msgid ""
1934"--reverse --first-parent together require range along first-parent chain"
1935msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
1936
d13389bf 1937#: blame.c:2850
a4f16749
JX
1938#, c-format
1939msgid "no such path %s in %s"
1940msgstr "在 %2$s 中无此路径 %1$s"
1941
d13389bf 1942#: blame.c:2861
a4f16749
JX
1943#, c-format
1944msgid "cannot read blob %s for path %s"
1945msgstr "不能为路径 %2$s 读取数据对象 %1$s"
1946
d46c5519 1947#: branch.c:53
649900bc 1948#, c-format
a0b6b246
JX
1949msgid ""
1950"\n"
1951"After fixing the error cause you may try to fix up\n"
1952"the remote tracking information by invoking\n"
1953"\"git branch --set-upstream-to=%s%s%s\"."
1954msgstr ""
1955"\n"
1956"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1957"\"git branch --set-upstream-to=%s%s%s\" 。"
649900bc 1958
d46c5519 1959#: branch.c:67
649900bc 1960#, c-format
a0b6b246
JX
1961msgid "Not setting branch %s as its own upstream."
1962msgstr "未设置分支 %s 作为它自己的上游。"
649900bc 1963
d46c5519 1964#: branch.c:93
649900bc 1965#, c-format
6937cb4e
JX
1966msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
1967msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 1968
d46c5519 1969#: branch.c:94
649900bc 1970#, c-format
6937cb4e
JX
1971msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
1972msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 1973
d46c5519 1974#: branch.c:98
649900bc 1975#, c-format
6937cb4e
JX
1976msgid "Branch '%s' set up to track local branch '%s' by rebasing."
1977msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
649900bc 1978
d46c5519 1979#: branch.c:99
649900bc 1980#, c-format
6937cb4e 1981msgid "Branch '%s' set up to track local branch '%s'."
493a9322 1982msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
649900bc 1983
d46c5519 1984#: branch.c:104
649900bc 1985#, c-format
6937cb4e
JX
1986msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
1987msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
649900bc 1988
d46c5519 1989#: branch.c:105
649900bc 1990#, c-format
6937cb4e
JX
1991msgid "Branch '%s' set up to track remote ref '%s'."
1992msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
649900bc 1993
d46c5519 1994#: branch.c:109
649900bc 1995#, c-format
6937cb4e
JX
1996msgid "Branch '%s' set up to track local ref '%s' by rebasing."
1997msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
649900bc 1998
d46c5519 1999#: branch.c:110
649900bc 2000#, c-format
6937cb4e
JX
2001msgid "Branch '%s' set up to track local ref '%s'."
2002msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
649900bc 2003
d46c5519 2004#: branch.c:119
a0b6b246
JX
2005msgid "Unable to write upstream branch configuration"
2006msgstr "无法写入上游分支配置"
649900bc 2007
d46c5519 2008#: branch.c:156
649900bc 2009#, c-format
a0b6b246
JX
2010msgid "Not tracking: ambiguous information for ref %s"
2011msgstr "未跟踪:引用 %s 有歧义"
649900bc 2012
d46c5519 2013#: branch.c:189
649900bc 2014#, c-format
a0b6b246
JX
2015msgid "'%s' is not a valid branch name."
2016msgstr "'%s' 不是一个有效的分支名称。"
649900bc 2017
d46c5519 2018#: branch.c:208
649900bc 2019#, c-format
a0b6b246
JX
2020msgid "A branch named '%s' already exists."
2021msgstr "一个分支名 '%s' 已经存在。"
649900bc 2022
d46c5519 2023#: branch.c:213
a0b6b246
JX
2024msgid "Cannot force update the current branch."
2025msgstr "无法强制更新当前分支。"
649900bc 2026
d46c5519 2027#: branch.c:233
649900bc 2028#, c-format
a0b6b246
JX
2029msgid "Cannot setup tracking information; starting point '%s' is not a branch."
2030msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
649900bc 2031
d46c5519 2032#: branch.c:235
649900bc 2033#, c-format
a0b6b246
JX
2034msgid "the requested upstream branch '%s' does not exist"
2035msgstr "请求的上游分支 '%s' 不存在"
649900bc 2036
d46c5519 2037#: branch.c:237
a0b6b246
JX
2038msgid ""
2039"\n"
2040"If you are planning on basing your work on an upstream\n"
2041"branch that already exists at the remote, you may need to\n"
2042"run \"git fetch\" to retrieve it.\n"
2043"\n"
2044"If you are planning to push out a new local branch that\n"
2045"will track its remote counterpart, you may want to use\n"
2046"\"git push -u\" to set the upstream config as you push."
2047msgstr ""
2048"\n"
2049"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
2050"您可能需要执行 \"git fetch\" 来获取分支。\n"
2051"\n"
2052"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
2053"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
649900bc 2054
d46c5519 2055#: branch.c:281
649900bc 2056#, c-format
a0b6b246
JX
2057msgid "Not a valid object name: '%s'."
2058msgstr "不是一个有效的对象名:'%s'。"
649900bc 2059
d46c5519 2060#: branch.c:301
649900bc 2061#, c-format
a0b6b246
JX
2062msgid "Ambiguous object name: '%s'."
2063msgstr "歧义的对象名:'%s'。"
649900bc 2064
d46c5519 2065#: branch.c:306
649900bc 2066#, c-format
a0b6b246
JX
2067msgid "Not a valid branch point: '%s'."
2068msgstr "无效的分支点:'%s'。"
649900bc 2069
349ede6a 2070#: branch.c:365
649900bc 2071#, c-format
a0b6b246
JX
2072msgid "'%s' is already checked out at '%s'"
2073msgstr "'%s' 已经检出到 '%s'"
649900bc 2074
349ede6a 2075#: branch.c:388
a0b6b246
JX
2076#, c-format
2077msgid "HEAD of working tree %s is not updated"
2078msgstr "工作区 %s 的 HEAD 指向没有被更新"
649900bc 2079
d9488fea
JX
2080#: bundle.c:41
2081#, c-format
2082msgid "unrecognized bundle hash algorithm: %s"
2083msgstr "未能识别的归档包哈希算法:%s"
2084
2085#: bundle.c:45
649900bc 2086#, c-format
d9488fea
JX
2087msgid "unknown capability '%s'"
2088msgstr "未知能力 '%s'"
649900bc 2089
d9488fea
JX
2090#: bundle.c:71
2091#, c-format
2092msgid "'%s' does not look like a v2 or v3 bundle file"
2093msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件"
7157c2b5 2094
d9488fea 2095#: bundle.c:110
a0b6b246
JX
2096#, c-format
2097msgid "unrecognized header: %s%s (%d)"
2098msgstr "未能识别的包头:%s%s (%d)"
649900bc 2099
d13389bf 2100#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176
349ede6a 2101#: builtin/commit.c:814
649900bc 2102#, c-format
a0b6b246
JX
2103msgid "could not open '%s'"
2104msgstr "不能打开 '%s'"
649900bc 2105
d9488fea 2106#: bundle.c:189
a0b6b246
JX
2107msgid "Repository lacks these prerequisite commits:"
2108msgstr "仓库中缺少这些必备的提交:"
649900bc 2109
d9488fea 2110#: bundle.c:192
a6cd2cc4 2111msgid "need a repository to verify a bundle"
d9488fea 2112msgstr "需要一个仓库来校验一个归档包"
a6cd2cc4 2113
d9488fea 2114#: bundle.c:243
2e8451e8 2115#, c-format
a0b6b246
JX
2116msgid "The bundle contains this ref:"
2117msgid_plural "The bundle contains these %d refs:"
d9488fea
JX
2118msgstr[0] "这个归档包中含有这个引用:"
2119msgstr[1] "这个归档包中含有 %d 个引用:"
2e8451e8 2120
d9488fea 2121#: bundle.c:250
a0b6b246 2122msgid "The bundle records a complete history."
d9488fea 2123msgstr "这个归档包记录一个完整历史。"
2e8451e8 2124
d9488fea 2125#: bundle.c:252
2e8451e8 2126#, c-format
a0b6b246
JX
2127msgid "The bundle requires this ref:"
2128msgid_plural "The bundle requires these %d refs:"
d9488fea
JX
2129msgstr[0] "这个归档包需要这个引用:"
2130msgstr[1] "这个归档包需要 %d 个引用:"
2e8451e8 2131
d9488fea 2132#: bundle.c:319
4c27fcb5 2133msgid "unable to dup bundle descriptor"
d9488fea 2134msgstr "无法复制归档包描述符"
4c27fcb5 2135
d9488fea 2136#: bundle.c:326
a0b6b246
JX
2137msgid "Could not spawn pack-objects"
2138msgstr "不能生成 pack-objects 进程"
1003b3a5 2139
d9488fea 2140#: bundle.c:337
a0b6b246
JX
2141msgid "pack-objects died"
2142msgstr "pack-objects 终止"
8ada9598 2143
d9488fea 2144#: bundle.c:379
a0b6b246
JX
2145msgid "rev-list died"
2146msgstr "rev-list 终止"
2147
d9488fea 2148#: bundle.c:428
81809b99 2149#, c-format
a0b6b246
JX
2150msgid "ref '%s' is excluded by the rev-list options"
2151msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 2152
d9488fea
JX
2153#: bundle.c:498
2154#, c-format
2155msgid "unsupported bundle version %d"
2156msgstr "不支持的归档包版本 %d"
2157
2158#: bundle.c:500
2159#, c-format
2160msgid "cannot write bundle version %d with algorithm %s"
2161msgstr "不能写入,归档包版本 %d 不支持算法 %s"
2162
d13389bf 2163#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408
81809b99 2164#, c-format
a0b6b246
JX
2165msgid "unrecognized argument: %s"
2166msgstr "未能识别的参数:%s"
8ada9598 2167
d9488fea 2168#: bundle.c:530
a0b6b246 2169msgid "Refusing to create empty bundle."
d9488fea 2170msgstr "不能创建空的归档包。"
a0b6b246 2171
d9488fea 2172#: bundle.c:540
81809b99 2173#, c-format
a0b6b246
JX
2174msgid "cannot create '%s'"
2175msgstr "不能创建 '%s'"
8ada9598 2176
d9488fea 2177#: bundle.c:565
a0b6b246
JX
2178msgid "index-pack died"
2179msgstr "index-pack 终止"
63af42fe 2180
2b472aae 2181#: color.c:329
94550ed3 2182#, c-format
a0b6b246
JX
2183msgid "invalid color value: %.*s"
2184msgstr "无效的颜色值:%.*s"
94550ed3 2185
d13389bf 2186#: commit-graph.c:188 midx.c:47
d9488fea
JX
2187msgid "invalid hash version"
2188msgstr "无效的哈希版本"
2189
2190#: commit-graph.c:246
d46c5519
JX
2191msgid "commit-graph file is too small"
2192msgstr "提交图形文件太小"
c1ac5258 2193
d9488fea 2194#: commit-graph.c:311
c1ac5258 2195#, c-format
d46c5519
JX
2196msgid "commit-graph signature %X does not match signature %X"
2197msgstr "提交图形签名 %X 和签名 %X 不匹配"
c1ac5258 2198
d9488fea 2199#: commit-graph.c:318
c1ac5258 2200#, c-format
d46c5519
JX
2201msgid "commit-graph version %X does not match version %X"
2202msgstr "提交图形版本 %X 和版本 %X 不匹配"
c1ac5258 2203
d9488fea 2204#: commit-graph.c:325
c1ac5258 2205#, c-format
d46c5519
JX
2206msgid "commit-graph hash version %X does not match version %X"
2207msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
c1ac5258 2208
d9488fea
JX
2209#: commit-graph.c:342
2210#, c-format
2211msgid "commit-graph file is too small to hold %u chunks"
2212msgstr "提交图形文件太小,容不下 %u 个块"
06991777 2213
d9488fea 2214#: commit-graph.c:361
c1ac5258 2215#, c-format
d46c5519
JX
2216msgid "commit-graph improper chunk offset %08x%08x"
2217msgstr "提交图形不正确的块偏移 %08x%08x"
c1ac5258 2218
d9488fea 2219#: commit-graph.c:433
c1ac5258 2220#, c-format
d46c5519
JX
2221msgid "commit-graph chunk id %08x appears multiple times"
2222msgstr "提交图形块 id %08x 出现了多次"
c1ac5258 2223
d9488fea 2224#: commit-graph.c:499
a6cd2cc4
JX
2225msgid "commit-graph has no base graphs chunk"
2226msgstr "提交图形没有基础图形块"
2227
d9488fea 2228#: commit-graph.c:509
a6cd2cc4
JX
2229msgid "commit-graph chain does not match"
2230msgstr "提交图形链不匹配"
2231
d9488fea 2232#: commit-graph.c:557
a6cd2cc4
JX
2233#, c-format
2234msgid "invalid commit-graph chain: line '%s' not a hash"
2235msgstr "无效的提交图形链:行 '%s' 不是一个哈希值"
2236
d9488fea 2237#: commit-graph.c:581
a6cd2cc4
JX
2238msgid "unable to find all commit-graph files"
2239msgstr "无法找到所有提交图形文件"
2240
d9488fea 2241#: commit-graph.c:721 commit-graph.c:785
a6cd2cc4
JX
2242msgid "invalid commit position. commit-graph is likely corrupt"
2243msgstr "无效的提交位置。提交图形可能已损坏"
2244
d9488fea 2245#: commit-graph.c:742
c1ac5258
JX
2246#, c-format
2247msgid "could not find commit %s"
2248msgstr "无法找到提交 %s"
2249
d13389bf 2250#: commit-graph.c:1036 builtin/am.c:1292
a5cd71ca
JX
2251#, c-format
2252msgid "unable to parse commit %s"
2253msgstr "不能解析提交 %s"
2254
d13389bf 2255#: commit-graph.c:1252 builtin/pack-objects.c:2864
c1ac5258
JX
2256#, c-format
2257msgid "unable to get type of object %s"
2258msgstr "无法获得对象 %s 类型"
2259
d13389bf 2260#: commit-graph.c:1283
06991777
JX
2261msgid "Loading known commits in commit graph"
2262msgstr "正在加载提交图中的已知提交"
2263
d13389bf 2264#: commit-graph.c:1300
06991777
JX
2265msgid "Expanding reachable commits in commit graph"
2266msgstr "正在扩展提交图中的可达提交"
2267
d13389bf 2268#: commit-graph.c:1320
06991777
JX
2269msgid "Clearing commit marks in commit graph"
2270msgstr "正在清除提交图中的提交标记"
4c27fcb5 2271
d13389bf 2272#: commit-graph.c:1339
4c27fcb5
JX
2273msgid "Computing commit graph generation numbers"
2274msgstr "正在计算提交图世代数字"
2275
d13389bf 2276#: commit-graph.c:1406
349ede6a 2277msgid "Computing commit changed paths Bloom filters"
d9488fea 2278msgstr "计算提交变更路径的布隆过滤器"
349ede6a 2279
d13389bf 2280#: commit-graph.c:1483
7157c2b5
JX
2281msgid "Collecting referenced commits"
2282msgstr "正在收集引用的提交"
2283
d13389bf 2284#: commit-graph.c:1508
06991777
JX
2285#, c-format
2286msgid "Finding commits for commit graph in %d pack"
2287msgid_plural "Finding commits for commit graph in %d packs"
2288msgstr[0] "正在 %d 个包中查找提交图的提交"
2289msgstr[1] "正在 %d 个包中查找提交图的提交"
4c27fcb5 2290
d13389bf 2291#: commit-graph.c:1521
c1ac5258
JX
2292#, c-format
2293msgid "error adding pack %s"
2294msgstr "添加包 %s 出错"
2295
d13389bf 2296#: commit-graph.c:1525
c1ac5258
JX
2297#, c-format
2298msgid "error opening index for %s"
2299msgstr "为 %s 打开索引出错"
2300
d13389bf 2301#: commit-graph.c:1562
06991777
JX
2302msgid "Finding commits for commit graph among packed objects"
2303msgstr "正在打包对象中查找提交图的提交"
2304
d13389bf 2305#: commit-graph.c:1580
06991777 2306msgid "Finding extra edges in commit graph"
8e4e0555 2307msgstr "正在查找提交图中额外的边"
06991777 2308
d13389bf 2309#: commit-graph.c:1628
a6cd2cc4
JX
2310msgid "failed to write correct number of base graph ids"
2311msgstr "无法写入正确数量的基础图形 ID"
fd8cb379 2312
d13389bf 2313#: commit-graph.c:1670 midx.c:819
fd8cb379 2314#, c-format
c1ac5258
JX
2315msgid "unable to create leading directories of %s"
2316msgstr "不能为 %s 创建先导目录"
2317
d13389bf 2318#: commit-graph.c:1683
349ede6a
JX
2319msgid "unable to create temporary graph layer"
2320msgstr "无法创建临时图层"
2321
d13389bf 2322#: commit-graph.c:1688
a6cd2cc4 2323#, c-format
349ede6a
JX
2324msgid "unable to adjust shared permissions for '%s'"
2325msgstr "无法为 '%s' 调整共享权限"
a6cd2cc4 2326
d13389bf 2327#: commit-graph.c:1758
06991777
JX
2328#, c-format
2329msgid "Writing out commit graph in %d pass"
2330msgid_plural "Writing out commit graph in %d passes"
8e4e0555
FZ
2331msgstr[0] "正在用 %d 步写出提交图"
2332msgstr[1] "正在用 %d 步写出提交图"
06991777 2333
d13389bf 2334#: commit-graph.c:1803
a6cd2cc4
JX
2335msgid "unable to open commit-graph chain file"
2336msgstr "无法打开提交图形链文件"
2337
d13389bf 2338#: commit-graph.c:1819
a6cd2cc4
JX
2339msgid "failed to rename base commit-graph file"
2340msgstr "无法重命名基础提交图形文件"
2341
d13389bf 2342#: commit-graph.c:1839
a6cd2cc4
JX
2343msgid "failed to rename temporary commit-graph file"
2344msgstr "无法重命名临时提交图形文件"
2345
d13389bf 2346#: commit-graph.c:1965
a6cd2cc4
JX
2347msgid "Scanning merged commits"
2348msgstr "正在扫描合并提交"
2349
d13389bf 2350#: commit-graph.c:2009
a6cd2cc4
JX
2351msgid "Merging commit-graph"
2352msgstr "正在合并提交图形"
2353
d13389bf
JX
2354#: commit-graph.c:2115
2355msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
2356msgstr "正尝试写提交图,但是 'core.commitGraph' 被禁用"
a6cd2cc4 2357
d13389bf 2358#: commit-graph.c:2214
a6cd2cc4
JX
2359msgid "too many commits to write graph"
2360msgstr "提交太多不能画图"
2361
d13389bf 2362#: commit-graph.c:2307
c1ac5258 2363msgid "the commit-graph file has incorrect checksum and is likely corrupt"
4c27fcb5
JX
2364msgstr "提交图文件的校验码错误,可能已经损坏"
2365
d13389bf 2366#: commit-graph.c:2317
d46c5519
JX
2367#, c-format
2368msgid "commit-graph has incorrect OID order: %s then %s"
5b533632 2369msgstr "提交图形的对象 ID 顺序不正确:%s 然后 %s"
d46c5519 2370
d13389bf 2371#: commit-graph.c:2327 commit-graph.c:2342
d46c5519
JX
2372#, c-format
2373msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2374msgstr "提交图形有不正确的扇出值:fanout[%d] = %u != %u"
2375
d13389bf 2376#: commit-graph.c:2334
d46c5519
JX
2377#, c-format
2378msgid "failed to parse commit %s from commit-graph"
2379msgstr "无法从提交图形中解析提交 %s"
2380
d13389bf 2381#: commit-graph.c:2352
4c27fcb5 2382msgid "Verifying commits in commit graph"
8e4e0555 2383msgstr "正在校验提交图中的提交"
fd8cb379 2384
d13389bf 2385#: commit-graph.c:2367
d46c5519
JX
2386#, c-format
2387msgid "failed to parse commit %s from object database for commit-graph"
2388msgstr "无法从提交图形的对象库中解析提交 %s"
2389
d13389bf 2390#: commit-graph.c:2374
d46c5519
JX
2391#, c-format
2392msgid "root tree OID for commit %s in commit-graph is %s != %s"
5b533632 2393msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
d46c5519 2394
d13389bf 2395#: commit-graph.c:2384
d46c5519
JX
2396#, c-format
2397msgid "commit-graph parent list for commit %s is too long"
2398msgstr "提交 %s 的提交图形父提交列表太长了"
2399
d13389bf 2400#: commit-graph.c:2393
d46c5519
JX
2401#, c-format
2402msgid "commit-graph parent for %s is %s != %s"
2403msgstr "%s 的提交图形父提交是 %s != %s"
2404
d13389bf 2405#: commit-graph.c:2407
d46c5519
JX
2406#, c-format
2407msgid "commit-graph parent list for commit %s terminates early"
2408msgstr "提交 %s 的提交图形父提交列表过早终止"
2409
d13389bf 2410#: commit-graph.c:2412
d46c5519
JX
2411#, c-format
2412msgid ""
2413"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2414msgstr "提交图形中提交 %s 的世代号是零,但其它地方非零"
2415
d13389bf 2416#: commit-graph.c:2416
d46c5519
JX
2417#, c-format
2418msgid ""
2419"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2420msgstr "提交图形中提交 %s 的世代号非零,但其它地方是零"
2421
d13389bf 2422#: commit-graph.c:2432
d46c5519
JX
2423#, c-format
2424msgid "commit-graph generation for commit %s is %u != %u"
2425msgstr "提交图形中的提交 %s 的世代号是 %u != %u"
2426
d13389bf 2427#: commit-graph.c:2438
d46c5519
JX
2428#, c-format
2429msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2430msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
2431
d13389bf
JX
2432#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403
2433#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
349ede6a
JX
2434#, c-format
2435msgid "could not parse %s"
2436msgstr "不能解析 %s"
2437
2438#: commit.c:54
2439#, c-format
2440msgid "%s %s is not a commit!"
2441msgstr "%s %s 不是一个提交!"
2442
2443#: commit.c:194
2444msgid ""
2445"Support for <GIT_DIR>/info/grafts is deprecated\n"
2446"and will be removed in a future Git version.\n"
2447"\n"
2448"Please use \"git replace --convert-graft-file\"\n"
2449"to convert the grafts into replace refs.\n"
2450"\n"
2451"Turn this message off by running\n"
2452"\"git config advice.graftFileDeprecated false\""
2453msgstr ""
2454"对 <GIT_DIR>/info/grafts 的支持已过时,并将在\n"
2455"未来的Git版本中被移除。\n"
2456"\n"
2457"请使用 \"git replace --convert-graft-file\" 将\n"
2458"grafts 转换为替换引用。\n"
2459"\n"
2460"设置 \"git config advice.graftFileDeprecated false\"\n"
2461"可关闭本消息"
2462
7157c2b5 2463#: commit.c:1172
349ede6a
JX
2464#, c-format
2465msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2466msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
2467
7157c2b5 2468#: commit.c:1176
349ede6a
JX
2469#, c-format
2470msgid "Commit %s has a bad GPG signature allegedly by %s."
2471msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
2472
7157c2b5 2473#: commit.c:1179
349ede6a
JX
2474#, c-format
2475msgid "Commit %s does not have a GPG signature."
2476msgstr "提交 %s 没有 GPG 签名。"
2477
7157c2b5 2478#: commit.c:1182
349ede6a
JX
2479#, c-format
2480msgid "Commit %s has a good GPG signature by %s\n"
2481msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
2482
7157c2b5 2483#: commit.c:1436
349ede6a
JX
2484msgid ""
2485"Warning: commit message did not conform to UTF-8.\n"
2486"You may want to amend it after fixing the message, or set the config\n"
2487"variable i18n.commitencoding to the encoding your project uses.\n"
2488msgstr ""
2489"警告:提交说明不符合 UTF-8 字符编码。\n"
2490"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
2491"设置为您项目所用的字符编码。\n"
2492
06991777 2493#: compat/obstack.c:406 compat/obstack.c:408
a0b6b246
JX
2494msgid "memory exhausted"
2495msgstr "内存耗尽"
90314792 2496
349ede6a 2497#: config.c:125
c1ac5258
JX
2498#, c-format
2499msgid ""
2500"exceeded maximum include depth (%d) while including\n"
2501"\t%s\n"
2502"from\n"
2503"\t%s\n"
2504"This might be due to circular includes."
2505msgstr ""
e640d114 2506"超过了最大包含深度(%1$d),当从\n"
c1ac5258
JX
2507"\t%3$s\n"
2508"包含\n"
2509"\t%2$s\n"
e640d114 2510"这可能是因为循环包含。"
c1ac5258 2511
349ede6a 2512#: config.c:141
c1ac5258
JX
2513#, c-format
2514msgid "could not expand include path '%s'"
2515msgstr "无法扩展包含路径 '%s'"
2516
349ede6a 2517#: config.c:152
c1ac5258
JX
2518msgid "relative config includes must come from files"
2519msgstr "相对路径的配置文件引用必须来自于文件"
2520
349ede6a 2521#: config.c:198
87cb7997 2522msgid "relative config include conditionals must come from files"
c1ac5258
JX
2523msgstr "相对路径的配置文件条件引用必须来自于文件"
2524
349ede6a 2525#: config.c:378
c1ac5258
JX
2526#, c-format
2527msgid "key does not contain a section: %s"
2528msgstr "键名没有包含一个小节名称:%s"
87cb7997 2529
349ede6a 2530#: config.c:384
c1ac5258
JX
2531#, c-format
2532msgid "key does not contain variable name: %s"
2533msgstr "键名没有包含变量名:%s"
2534
d13389bf 2535#: config.c:408 sequencer.c:2580
c1ac5258
JX
2536#, c-format
2537msgid "invalid key: %s"
2538msgstr "无效键名:%s"
2539
349ede6a 2540#: config.c:414
c1ac5258
JX
2541#, c-format
2542msgid "invalid key (newline): %s"
2543msgstr "无效键名(有换行符):%s"
2544
349ede6a 2545#: config.c:450 config.c:462
c1ac5258
JX
2546#, c-format
2547msgid "bogus config parameter: %s"
2548msgstr "伪配置参数:%s"
2549
349ede6a 2550#: config.c:497
c1ac5258
JX
2551#, c-format
2552msgid "bogus format in %s"
2553msgstr "%s 中格式错误"
2554
349ede6a 2555#: config.c:836
90314792 2556#, c-format
a0b6b246
JX
2557msgid "bad config line %d in blob %s"
2558msgstr "数据对象 %2$s 中错误的配置行 %1$d"
90314792 2559
349ede6a 2560#: config.c:840
a77c07d9 2561#, c-format
a0b6b246
JX
2562msgid "bad config line %d in file %s"
2563msgstr "文件 %2$s 中错误的配置行 %1$d"
a77c07d9 2564
349ede6a 2565#: config.c:844
a77c07d9 2566#, c-format
a0b6b246
JX
2567msgid "bad config line %d in standard input"
2568msgstr "标准输入中错误的配置行 %d"
a77c07d9 2569
349ede6a 2570#: config.c:848
90314792 2571#, c-format
a0b6b246
JX
2572msgid "bad config line %d in submodule-blob %s"
2573msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
90314792 2574
349ede6a 2575#: config.c:852
90314792 2576#, c-format
a0b6b246
JX
2577msgid "bad config line %d in command line %s"
2578msgstr "命令行 %2$s 中错误的配置行 %1$d"
90314792 2579
349ede6a 2580#: config.c:856
90314792 2581#, c-format
a0b6b246
JX
2582msgid "bad config line %d in %s"
2583msgstr "在 %2$s 中错误的配置行 %1$d"
220c313c 2584
349ede6a 2585#: config.c:993
a0b6b246
JX
2586msgid "out of range"
2587msgstr "超出范围"
6c94aba5 2588
349ede6a 2589#: config.c:993
a0b6b246
JX
2590msgid "invalid unit"
2591msgstr "无效的单位"
6c94aba5 2592
349ede6a 2593#: config.c:994
6c94aba5 2594#, c-format
a0b6b246
JX
2595msgid "bad numeric config value '%s' for '%s': %s"
2596msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
6c94aba5 2597
349ede6a 2598#: config.c:1013
1b7f4a34 2599#, c-format
a0b6b246
JX
2600msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
2601msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 2602
349ede6a 2603#: config.c:1016
1b7f4a34 2604#, c-format
a0b6b246
JX
2605msgid "bad numeric config value '%s' for '%s' in file %s: %s"
2606msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 2607
349ede6a 2608#: config.c:1019
1b7f4a34 2609#, c-format
a0b6b246
JX
2610msgid "bad numeric config value '%s' for '%s' in standard input: %s"
2611msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
1b7f4a34 2612
349ede6a 2613#: config.c:1022
1b7f4a34 2614#, c-format
a0b6b246
JX
2615msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
2616msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 2617
349ede6a 2618#: config.c:1025
94550ed3 2619#, c-format
a0b6b246
JX
2620msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
2621msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 2622
349ede6a 2623#: config.c:1028
276ceeaa 2624#, c-format
a0b6b246
JX
2625msgid "bad numeric config value '%s' for '%s' in %s: %s"
2626msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 2627
349ede6a 2628#: config.c:1123
276ceeaa 2629#, c-format
a0b6b246 2630msgid "failed to expand user dir in: '%s'"
c1ac5258 2631msgstr "无法扩展用户目录:'%s'"
94550ed3 2632
349ede6a 2633#: config.c:1132
5809aa05
JX
2634#, c-format
2635msgid "'%s' for '%s' is not a valid timestamp"
2636msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
2637
349ede6a 2638#: config.c:1223
c1ac5258
JX
2639#, c-format
2640msgid "abbrev length out of range: %d"
2641msgstr "缩写长度超出范围:%d"
2642
349ede6a 2643#: config.c:1237 config.c:1248
3495628d 2644#, c-format
a0b6b246
JX
2645msgid "bad zlib compression level %d"
2646msgstr "错误的 zlib 压缩级别 %d"
3495628d 2647
349ede6a 2648#: config.c:1340
c1ac5258
JX
2649msgid "core.commentChar should only be one character"
2650msgstr "core.commentChar 应该是一个字符"
2651
349ede6a 2652#: config.c:1373
3495628d 2653#, c-format
a0b6b246
JX
2654msgid "invalid mode for object creation: %s"
2655msgstr "无效的对象创建模式:%s"
3495628d 2656
349ede6a 2657#: config.c:1445
c1ac5258
JX
2658#, c-format
2659msgid "malformed value for %s"
2660msgstr "%s 的取值格式错误"
2661
349ede6a 2662#: config.c:1471
c1ac5258
JX
2663#, c-format
2664msgid "malformed value for %s: %s"
2665msgstr "%s 的取值格式错误:%s"
2666
349ede6a 2667#: config.c:1472
c1ac5258
JX
2668msgid "must be one of nothing, matching, simple, upstream or current"
2669msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current"
2670
d9488fea 2671#: config.c:1533 builtin/pack-objects.c:3649
1a79b2f1
JX
2672#, c-format
2673msgid "bad pack compression level %d"
2674msgstr "错误的打包压缩级别 %d"
2675
349ede6a 2676#: config.c:1655
c1ac5258
JX
2677#, c-format
2678msgid "unable to load config blob object '%s'"
2679msgstr "无法从数据对象 '%s' 加载配置"
2680
349ede6a 2681#: config.c:1658
c1ac5258
JX
2682#, c-format
2683msgid "reference '%s' does not point to a blob"
2684msgstr "引用 '%s' 没有指向一个数据对象"
2685
349ede6a 2686#: config.c:1675
c1ac5258
JX
2687#, c-format
2688msgid "unable to resolve config blob '%s'"
2689msgstr "不能解析配置对象 '%s'"
2690
349ede6a 2691#: config.c:1705
c1ac5258
JX
2692#, c-format
2693msgid "failed to parse %s"
2694msgstr "解析 %s 失败"
2695
349ede6a 2696#: config.c:1759
a0b6b246
JX
2697msgid "unable to parse command-line config"
2698msgstr "无法解析命令行中的配置"
94550ed3 2699
d9488fea 2700#: config.c:2122
a0b6b246
JX
2701msgid "unknown error occurred while reading the configuration files"
2702msgstr "在读取配置文件时遇到未知错误"
94550ed3 2703
d9488fea 2704#: config.c:2296
87cb7997
JX
2705#, c-format
2706msgid "Invalid %s: '%s'"
2707msgstr "无效 %s:'%s'"
2708
d9488fea 2709#: config.c:2341
87cb7997
JX
2710#, c-format
2711msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2712msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
2713
d9488fea 2714#: config.c:2387
276ceeaa 2715#, c-format
a0b6b246
JX
2716msgid "unable to parse '%s' from command-line config"
2717msgstr "无法解析命令行配置中的 '%s'"
1b7f4a34 2718
d9488fea 2719#: config.c:2389
94550ed3 2720#, c-format
a0b6b246
JX
2721msgid "bad config variable '%s' in file '%s' at line %d"
2722msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
94550ed3 2723
d13389bf 2724#: config.c:2473
c1ac5258
JX
2725#, c-format
2726msgid "invalid section name '%s'"
2727msgstr "无效的小节名称 '%s'"
2728
d13389bf 2729#: config.c:2505
276ceeaa 2730#, c-format
a0b6b246
JX
2731msgid "%s has multiple values"
2732msgstr "%s 有多个取值"
276ceeaa 2733
d13389bf 2734#: config.c:2534
c1ac5258
JX
2735#, c-format
2736msgid "failed to write new configuration file %s"
2737msgstr "写入新的配置文件 %s 失败"
2738
d13389bf 2739#: config.c:2786 config.c:3112
c1ac5258
JX
2740#, c-format
2741msgid "could not lock config file %s"
2742msgstr "不能锁定配置文件 %s"
2743
d13389bf 2744#: config.c:2797
c1ac5258
JX
2745#, c-format
2746msgid "opening %s"
2747msgstr "打开 %s"
2748
d13389bf 2749#: config.c:2834 builtin/config.c:361
c1ac5258
JX
2750#, c-format
2751msgid "invalid pattern: %s"
2752msgstr "无效模式:%s"
2753
d13389bf 2754#: config.c:2859
c1ac5258
JX
2755#, c-format
2756msgid "invalid config file %s"
2757msgstr "无效的配置文件 %s"
2758
d13389bf 2759#: config.c:2872 config.c:3125
1a79b2f1
JX
2760#, c-format
2761msgid "fstat on %s failed"
65e2041e 2762msgstr "对 %s 调用 fstat 失败"
1a79b2f1 2763
d13389bf 2764#: config.c:2883
c1ac5258
JX
2765#, c-format
2766msgid "unable to mmap '%s'"
2767msgstr "不能 mmap '%s'"
2768
d13389bf 2769#: config.c:2892 config.c:3130
c1ac5258
JX
2770#, c-format
2771msgid "chmod on %s failed"
2772msgstr "对 %s 调用 chmod 失败"
2773
d13389bf 2774#: config.c:2977 config.c:3227
c1ac5258
JX
2775#, c-format
2776msgid "could not write config file %s"
2777msgstr "不能写入配置文件 %s"
2778
d13389bf 2779#: config.c:3011
94550ed3 2780#, c-format
a0b6b246
JX
2781msgid "could not set '%s' to '%s'"
2782msgstr "不能设置 '%s' 为 '%s'"
94550ed3 2783
d13389bf 2784#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
276ceeaa 2785#, c-format
a0b6b246
JX
2786msgid "could not unset '%s'"
2787msgstr "不能取消设置 '%s'"
276ceeaa 2788
d13389bf 2789#: config.c:3103
c1ac5258
JX
2790#, c-format
2791msgid "invalid section name: %s"
2792msgstr "无效的小节名称:%s"
2793
d13389bf 2794#: config.c:3270
c1ac5258
JX
2795#, c-format
2796msgid "missing value for '%s'"
2797msgstr "%s 的取值缺失"
2798
fd8cb379 2799#: connect.c:61
c1ac5258
JX
2800msgid "the remote end hung up upon initial contact"
2801msgstr "远端在初始连接时即挂断"
94550ed3 2802
fd8cb379 2803#: connect.c:63
a0b6b246
JX
2804msgid ""
2805"Could not read from remote repository.\n"
2806"\n"
2807"Please make sure you have the correct access rights\n"
2808"and the repository exists."
2809msgstr ""
2810"无法读取远程仓库。\n"
2811"\n"
2812"请确认您有正确的访问权限并且仓库存在。"
2813
c1ac5258
JX
2814#: connect.c:81
2815#, c-format
2816msgid "server doesn't support '%s'"
2817msgstr "服务器不支持 '%s'"
2818
7157c2b5 2819#: connect.c:118
c1ac5258
JX
2820#, c-format
2821msgid "server doesn't support feature '%s'"
2822msgstr "服务器不支持特性 '%s'"
2823
7157c2b5 2824#: connect.c:129
c1ac5258
JX
2825msgid "expected flush after capabilities"
2826msgstr "在能力之后应为一个 flush 包"
2827
7157c2b5 2828#: connect.c:263
c1ac5258
JX
2829#, c-format
2830msgid "ignoring capabilities after first line '%s'"
e640d114 2831msgstr "忽略第一行 '%s' 之后的能力字段"
c1ac5258 2832
7157c2b5 2833#: connect.c:284
c1ac5258
JX
2834msgid "protocol error: unexpected capabilities^{}"
2835msgstr "协议错误:意外的 capabilities^{}"
2836
7157c2b5 2837#: connect.c:306
c1ac5258
JX
2838#, c-format
2839msgid "protocol error: expected shallow sha-1, got '%s'"
2840msgstr "协议错误:预期浅克隆 sha-1,却得到 '%s'"
2841
7157c2b5 2842#: connect.c:308
c1ac5258
JX
2843msgid "repository on the other end cannot be shallow"
2844msgstr "另一端的仓库不能是浅克隆仓库"
2845
7157c2b5 2846#: connect.c:347
c1ac5258
JX
2847msgid "invalid packet"
2848msgstr "无效数据包"
2849
7157c2b5 2850#: connect.c:367
c1ac5258
JX
2851#, c-format
2852msgid "protocol error: unexpected '%s'"
2853msgstr "协议错误:意外的 '%s'"
2854
7157c2b5
JX
2855#: connect.c:473
2856#, c-format
2857msgid "unknown object format '%s' specified by server"
2858msgstr "服务器给出未知的对象格式 '%s'"
2859
2860#: connect.c:500
c1ac5258
JX
2861#, c-format
2862msgid "invalid ls-refs response: %s"
2863msgstr "无效的 ls-refs 响应:%s"
2864
7157c2b5 2865#: connect.c:504
c1ac5258
JX
2866msgid "expected flush after ref listing"
2867msgstr "在引用列表之后应该有一个 flush 包"
2868
7157c2b5
JX
2869#: connect.c:507
2870msgid "expected response end packet after ref listing"
2871msgstr "在引用列表之后应该有响应结束包"
2872
2873#: connect.c:640
c1ac5258
JX
2874#, c-format
2875msgid "protocol '%s' is not supported"
2876msgstr "不支持 '%s' 协议"
2877
7157c2b5 2878#: connect.c:691
c1ac5258
JX
2879msgid "unable to set SO_KEEPALIVE on socket"
2880msgstr "无法为 socket 设置 SO_KEEPALIVE"
2881
7157c2b5 2882#: connect.c:731 connect.c:794
c1ac5258
JX
2883#, c-format
2884msgid "Looking up %s ... "
2885msgstr "查找 %s ..."
2886
7157c2b5 2887#: connect.c:735
c1ac5258
JX
2888#, c-format
2889msgid "unable to look up %s (port %s) (%s)"
2890msgstr "无法查找 %s(端口 %s)(%s)"
2891
2892#. TRANSLATORS: this is the end of "Looking up %s ... "
7157c2b5 2893#: connect.c:739 connect.c:810
c1ac5258
JX
2894#, c-format
2895msgid ""
2896"done.\n"
2897"Connecting to %s (port %s) ... "
2898msgstr ""
2899"完成。\n"
2900"连接到 %s(端口 %s)... "
2901
7157c2b5 2902#: connect.c:761 connect.c:838
c1ac5258
JX
2903#, c-format
2904msgid ""
2905"unable to connect to %s:\n"
2906"%s"
2907msgstr ""
2908"无法连接到 %s:\n"
2909"%s"
2910
2911#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
7157c2b5 2912#: connect.c:767 connect.c:844
c1ac5258
JX
2913msgid "done."
2914msgstr "完成。"
2915
7157c2b5 2916#: connect.c:798
c1ac5258
JX
2917#, c-format
2918msgid "unable to look up %s (%s)"
2919msgstr "无法查找 %s(%s)"
2920
7157c2b5 2921#: connect.c:804
c1ac5258
JX
2922#, c-format
2923msgid "unknown port %s"
2924msgstr "未知端口 %s"
2925
7157c2b5 2926#: connect.c:941 connect.c:1271
c1ac5258
JX
2927#, c-format
2928msgid "strange hostname '%s' blocked"
2929msgstr "已阻止奇怪的主机名 '%s'"
2930
7157c2b5 2931#: connect.c:943
c1ac5258
JX
2932#, c-format
2933msgid "strange port '%s' blocked"
2934msgstr "已阻止奇怪的端口号 '%s'"
2935
7157c2b5 2936#: connect.c:953
c1ac5258
JX
2937#, c-format
2938msgid "cannot start proxy %s"
2939msgstr "不能启动代理 %s"
2940
7157c2b5 2941#: connect.c:1024
c1ac5258
JX
2942msgid "no path specified; see 'git help pull' for valid url syntax"
2943msgstr "未指定路径,执行 'git help pull' 查看有效的 url 语法"
2944
7157c2b5 2945#: connect.c:1219
c1ac5258
JX
2946msgid "ssh variant 'simple' does not support -4"
2947msgstr "ssh 变体 'simple' 不支持 -4"
2948
7157c2b5 2949#: connect.c:1231
c1ac5258
JX
2950msgid "ssh variant 'simple' does not support -6"
2951msgstr "ssh 变体 'simple' 不支持 -6"
2952
7157c2b5 2953#: connect.c:1248
c1ac5258 2954msgid "ssh variant 'simple' does not support setting port"
e640d114 2955msgstr "ssh 变体 'simple' 不支持设置端口"
c1ac5258 2956
7157c2b5 2957#: connect.c:1360
c1ac5258
JX
2958#, c-format
2959msgid "strange pathname '%s' blocked"
2960msgstr "已阻止奇怪的路径名 '%s'"
2961
d9488fea 2962#: connect.c:1408
c1ac5258
JX
2963msgid "unable to fork"
2964msgstr "无法 fork"
2965
d9488fea 2966#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45
a0b6b246 2967msgid "Checking connectivity"
06991777 2968msgstr "正在检查连通性"
a0b6b246 2969
d9488fea 2970#: connected.c:120
a0b6b246
JX
2971msgid "Could not run 'git rev-list'"
2972msgstr "不能执行 'git rev-list'"
2973
d9488fea 2974#: connected.c:144
a0b6b246 2975msgid "failed write to rev-list"
c1ac5258 2976msgstr "写入 rev-list 失败"
a0b6b246 2977
d9488fea 2978#: connected.c:149
a0b6b246 2979msgid "failed to close rev-list's stdin"
c1ac5258
JX
2980msgstr "关闭 rev-list 的标准输入失败"
2981
a5cd71ca 2982#: convert.c:194
c1ac5258
JX
2983#, c-format
2984msgid "illegal crlf_action %d"
2985msgstr "非法的 crlf 动作 %d"
a0b6b246 2986
a5cd71ca 2987#: convert.c:207
3495628d 2988#, c-format
c1ac5258
JX
2989msgid "CRLF would be replaced by LF in %s"
2990msgstr "%s 中的 CRLF 将被 LF 替换"
31e5e17b 2991
a5cd71ca 2992#: convert.c:209
31e5e17b 2993#, c-format
a0b6b246
JX
2994msgid ""
2995"CRLF will be replaced by LF in %s.\n"
c1ac5258 2996"The file will have its original line endings in your working directory"
a0b6b246 2997msgstr ""
c1ac5258 2998"%s 中的 CRLF 将被 LF 替换。<\n"
a0b6b246 2999"在工作区中该文件仍保持原有的换行符。"
3495628d 3000
a5cd71ca 3001#: convert.c:217
3495628d 3002#, c-format
31e5e17b
JX
3003msgid "LF would be replaced by CRLF in %s"
3004msgstr "文件 %s 中的 LF 将被 CRLF 替换"
3495628d 3005
a5cd71ca 3006#: convert.c:219
276ceeaa 3007#, c-format
a0b6b246
JX
3008msgid ""
3009"LF will be replaced by CRLF in %s.\n"
c1ac5258 3010"The file will have its original line endings in your working directory"
a0b6b246 3011msgstr ""
c1ac5258
JX
3012"%s 中的 LF 将被 CRLF 替换。\n"
3013"在工作区中该文件仍保持原有的换行符"
276ceeaa 3014
ddc12c42 3015#: convert.c:284
fd8cb379
JX
3016#, c-format
3017msgid "BOM is prohibited in '%s' if encoded as %s"
3018msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM"
3019
ddc12c42 3020#: convert.c:291
fd8cb379
JX
3021#, c-format
3022msgid ""
ddc12c42
JX
3023"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
3024"working-tree-encoding."
2b472aae
JX
3025msgstr ""
3026"文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%.*s 作为工作区编码。"
fd8cb379 3027
ddc12c42 3028#: convert.c:304
fd8cb379
JX
3029#, c-format
3030msgid "BOM is required in '%s' if encoded as %s"
3031msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM"
3032
ddc12c42 3033#: convert.c:306
fd8cb379
JX
3034#, c-format
3035msgid ""
3036"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
3037"%sLE (depending on the byte order) as working-tree-encoding."
3038msgstr ""
3039"文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字"
3040"节序)作为工作区编码。"
3041
ddc12c42 3042#: convert.c:419 convert.c:490
fd8cb379
JX
3043#, c-format
3044msgid "failed to encode '%s' from %s to %s"
3045msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
3046
ddc12c42 3047#: convert.c:462
fd8cb379
JX
3048#, c-format
3049msgid "encoding '%s' from %s to %s and back is not the same"
3050msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
3051
d9488fea 3052#: convert.c:665
c1ac5258
JX
3053#, c-format
3054msgid "cannot fork to run external filter '%s'"
e640d114 3055msgstr "不能 fork 以执行外部过滤器 '%s'"
c1ac5258 3056
d9488fea 3057#: convert.c:685
c1ac5258
JX
3058#, c-format
3059msgid "cannot feed the input to external filter '%s'"
e640d114 3060msgstr "不能将输入传递给外部过滤器 '%s'"
c1ac5258 3061
d9488fea 3062#: convert.c:692
c1ac5258
JX
3063#, c-format
3064msgid "external filter '%s' failed %d"
e640d114 3065msgstr "外部过滤器 '%s' 失败码 %d"
c1ac5258 3066
d9488fea 3067#: convert.c:727 convert.c:730
c1ac5258
JX
3068#, c-format
3069msgid "read from external filter '%s' failed"
3070msgstr "从外部过滤器 '%s' 读取失败"
3071
d9488fea 3072#: convert.c:733 convert.c:788
c1ac5258
JX
3073#, c-format
3074msgid "external filter '%s' failed"
3075msgstr "外部过滤器 '%s' 失败"
3076
d9488fea 3077#: convert.c:837
c1ac5258
JX
3078msgid "unexpected filter type"
3079msgstr "意外的过滤类型"
3080
d9488fea 3081#: convert.c:848
c1ac5258
JX
3082msgid "path name too long for external filter"
3083msgstr "外部过滤器的路径名太长"
3084
d9488fea 3085#: convert.c:940
c1ac5258
JX
3086#, c-format
3087msgid ""
3088"external filter '%s' is not available anymore although not all paths have "
3089"been filtered"
3090msgstr "外部过滤器 '%s' 不再可用,但并非所有路径都已过滤"
3091
d9488fea 3092#: convert.c:1240
fd8cb379
JX
3093msgid "true/false are no valid working-tree-encodings"
3094msgstr "true/false 不是有效的工作区编码"
3095
d9488fea 3096#: convert.c:1428 convert.c:1462
c1ac5258
JX
3097#, c-format
3098msgid "%s: clean filter '%s' failed"
3099msgstr "%s:clean 过滤器 '%s' 失败"
3100
d9488fea 3101#: convert.c:1508
c1ac5258
JX
3102#, c-format
3103msgid "%s: smudge filter %s failed"
3104msgstr "%s:smudge 过滤器 %s 失败"
3105
349ede6a
JX
3106#: credential.c:96
3107#, c-format
3108msgid "skipping credential lookup for key: credential.%s"
3109msgstr "跳过凭据查询:credential.%s"
3110
3111#: credential.c:112
3112msgid "refusing to work with credential missing host field"
3113msgstr "拒绝使用缺少主机字段的凭据"
3114
3115#: credential.c:114
3116msgid "refusing to work with credential missing protocol field"
3117msgstr "拒绝使用缺少协议字段的凭据"
3118
d9488fea 3119#: credential.c:394
349ede6a
JX
3120#, c-format
3121msgid "url contains a newline in its %s component: %s"
3122msgstr "URL 的 %s 组件中包含换行符:%s"
3123
d9488fea 3124#: credential.c:438
349ede6a
JX
3125#, c-format
3126msgid "url has no scheme: %s"
3127msgstr "URL 没有 scheme:%s"
3128
d9488fea 3129#: credential.c:511
349ede6a
JX
3130#, c-format
3131msgid "credential url cannot be parsed: %s"
3132msgstr "不能解析凭据 URL:%s"
3133
a5cd71ca 3134#: date.c:138
a0b6b246
JX
3135msgid "in the future"
3136msgstr "在将来"
3495628d 3137
a5cd71ca 3138#: date.c:144
3495628d 3139#, c-format
a4f16749
JX
3140msgid "%<PRIuMAX> second ago"
3141msgid_plural "%<PRIuMAX> seconds ago"
3142msgstr[0] "%<PRIuMAX> 秒钟前"
3143msgstr[1] "%<PRIuMAX> 秒钟前"
3495628d 3144
a5cd71ca 3145#: date.c:151
3495628d 3146#, c-format
a4f16749
JX
3147msgid "%<PRIuMAX> minute ago"
3148msgid_plural "%<PRIuMAX> minutes ago"
3149msgstr[0] "%<PRIuMAX> 分钟前"
3150msgstr[1] "%<PRIuMAX> 分钟前"
3495628d 3151
a5cd71ca 3152#: date.c:158
3495628d 3153#, c-format
a4f16749
JX
3154msgid "%<PRIuMAX> hour ago"
3155msgid_plural "%<PRIuMAX> hours ago"
3156msgstr[0] "%<PRIuMAX> 小时前"
3157msgstr[1] "%<PRIuMAX> 小时前"
3495628d 3158
a5cd71ca 3159#: date.c:165
3495628d 3160#, c-format
a4f16749
JX
3161msgid "%<PRIuMAX> day ago"
3162msgid_plural "%<PRIuMAX> days ago"
3163msgstr[0] "%<PRIuMAX> 天前"
3164msgstr[1] "%<PRIuMAX> 天前"
3495628d 3165
a5cd71ca 3166#: date.c:171
94550ed3 3167#, c-format
a4f16749
JX
3168msgid "%<PRIuMAX> week ago"
3169msgid_plural "%<PRIuMAX> weeks ago"
3170msgstr[0] "%<PRIuMAX> 周前"
3171msgstr[1] "%<PRIuMAX> 周前"
94550ed3 3172
a5cd71ca 3173#: date.c:178
3495628d 3174#, c-format
a4f16749
JX
3175msgid "%<PRIuMAX> month ago"
3176msgid_plural "%<PRIuMAX> months ago"
3177msgstr[0] "%<PRIuMAX> 个月前"
3178msgstr[1] "%<PRIuMAX> 个月前"
3495628d 3179
a5cd71ca 3180#: date.c:189
3495628d 3181#, c-format
a4f16749
JX
3182msgid "%<PRIuMAX> year"
3183msgid_plural "%<PRIuMAX> years"
3184msgstr[0] "%<PRIuMAX> 年"
3185msgstr[1] "%<PRIuMAX> 年"
3495628d 3186
a0b6b246 3187#. TRANSLATORS: "%s" is "<n> years"
a5cd71ca 3188#: date.c:192
94550ed3 3189#, c-format
a4f16749
JX
3190msgid "%s, %<PRIuMAX> month ago"
3191msgid_plural "%s, %<PRIuMAX> months ago"
3192msgstr[0] "%s %<PRIuMAX> 个月前"
3193msgstr[1] "%s %<PRIuMAX> 个月前"
94550ed3 3194
a5cd71ca 3195#: date.c:197 date.c:202
94550ed3 3196#, c-format
a4f16749
JX
3197msgid "%<PRIuMAX> year ago"
3198msgid_plural "%<PRIuMAX> years ago"
3199msgstr[0] "%<PRIuMAX> 年前"
3200msgstr[1] "%<PRIuMAX> 年前"
94550ed3 3201
06991777 3202#: delta-islands.c:272
4c27fcb5
JX
3203msgid "Propagating island marks"
3204msgstr "正在传播数据岛标记"
3205
06991777 3206#: delta-islands.c:290
4c27fcb5
JX
3207#, c-format
3208msgid "bad tree object %s"
3209msgstr "坏的树对象 %s"
3210
06991777 3211#: delta-islands.c:334
4c27fcb5
JX
3212#, c-format
3213msgid "failed to load island regex for '%s': %s"
3214msgstr "未能加载 '%s' 的数据岛正则表达式:%s"
3215
06991777 3216#: delta-islands.c:390
4c27fcb5
JX
3217#, c-format
3218msgid "island regex from config has too many capture groups (max=%d)"
3219msgstr "来自 config 的数据岛正则表达式有太多的捕获组(最多 %d 个)"
3220
a6cd2cc4 3221#: delta-islands.c:467
4c27fcb5
JX
3222#, c-format
3223msgid "Marked %d islands, done.\n"
3224msgstr "已标记 %d 个数据岛,结束。\n"
3225
d13389bf
JX
3226#: diff-lib.c:534
3227msgid "--merge-base does not work with ranges"
3228msgstr "--merge-base 不适用于范围"
3229
3230#: diff-lib.c:536
3231msgid "--merge-base only works with commits"
3232msgstr "--merge-base 仅适用于提交"
3233
3234#: diff-lib.c:553
3235msgid "unable to get HEAD"
3236msgstr "不能解析 HEAD"
3237
3238#: diff-lib.c:560
3239msgid "no merge base found"
3240msgstr "未找到合并基线"
3241
3242#: diff-lib.c:562
3243msgid "multiple merge bases found"
3244msgstr "找到了多条合并基线"
3245
d46c5519
JX
3246#: diff-no-index.c:238
3247msgid "git diff --no-index [<options>] <path> <path>"
3248msgstr "git diff --no-index [<选项>] <路径> <路径>"
3249
3250#: diff-no-index.c:263
3251msgid ""
3252"Not a git repository. Use --no-index to compare two paths outside a working "
3253"tree"
d9488fea 3254msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径"
cfff71a9 3255
a0b6b246 3256# 译者:注意保持前导空格
7157c2b5 3257#: diff.c:156
a0b6b246
JX
3258#, c-format
3259msgid " Failed to parse dirstat cut-off percentage '%s'\n"
3260msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
cfff71a9 3261
a0b6b246 3262# 译者:注意保持前导空格
7157c2b5 3263#: diff.c:161
a0b6b246
JX
3264#, c-format
3265msgid " Unknown dirstat parameter '%s'\n"
3266msgstr " 未知的 dirstat 参数 '%s'\n"
7aea43ff 3267
7157c2b5 3268#: diff.c:297
6937cb4e 3269msgid ""
c1ac5258
JX
3270"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
3271"'dimmed-zebra', 'plain'"
5809aa05 3272msgstr ""
c1ac5258
JX
3273"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "
3274"'plain'"
3275
7157c2b5 3276#: diff.c:325
c1ac5258 3277#, c-format
06991777
JX
3278msgid ""
3279"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
3280"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
3281msgstr ""
3282"未知的 color-moved-ws 模式 '%s',可能的取值有 'ignore-space-change'、'ignore-"
3283"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
c1ac5258 3284
7157c2b5 3285#: diff.c:333
c1ac5258 3286msgid ""
06991777
JX
3287"color-moved-ws: allow-indentation-change cannot be combined with other "
3288"whitespace modes"
c1ac5258 3289msgstr "color-moved-ws:allow-indentation-change 不能与其它空白字符模式共用"
6937cb4e 3290
7157c2b5 3291#: diff.c:410
7aea43ff 3292#, c-format
a0b6b246
JX
3293msgid "Unknown value for 'diff.submodule' config variable: '%s'"
3294msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
7aea43ff 3295
7157c2b5 3296#: diff.c:470
7aea43ff 3297#, c-format
a0b6b246
JX
3298msgid ""
3299"Found errors in 'diff.dirstat' config variable:\n"
3300"%s"
3301msgstr ""
3302"发现配置变量 'diff.dirstat' 中的错误:\n"
3303"%s"
7aea43ff 3304
d13389bf 3305#: diff.c:4276
7aea43ff 3306#, c-format
a0b6b246
JX
3307msgid "external diff died, stopping at %s"
3308msgstr "外部 diff 退出,停止在 %s"
7aea43ff 3309
d13389bf 3310#: diff.c:4625
a0b6b246
JX
3311msgid "--name-only, --name-status, --check and -s are mutually exclusive"
3312msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
3313
d13389bf 3314#: diff.c:4628
31e5e17b
JX
3315msgid "-G, -S and --find-object are mutually exclusive"
3316msgstr "-G、-S 和 --find-object 是互斥的"
3317
d13389bf 3318#: diff.c:4707
a0b6b246
JX
3319msgid "--follow requires exactly one pathspec"
3320msgstr "--follow 明确要求只跟一个路径规格"
3321
d13389bf 3322#: diff.c:4755
d46c5519
JX
3323#, c-format
3324msgid "invalid --stat value: %s"
3325msgstr "无效的 --stat 值:%s"
3326
d13389bf 3327#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303
d9488fea 3328#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
d46c5519
JX
3329#, c-format
3330msgid "%s expects a numerical value"
3331msgstr "%s 期望一个数字值"
3332
d13389bf 3333#: diff.c:4792
7aea43ff 3334#, c-format
a0b6b246
JX
3335msgid ""
3336"Failed to parse --dirstat/-X option parameter:\n"
3337"%s"
3338msgstr ""
3339"无法解析 --dirstat/-X 选项的参数:\n"
3340"%s"
7aea43ff 3341
d13389bf 3342#: diff.c:4877
d46c5519
JX
3343#, c-format
3344msgid "unknown change class '%c' in --diff-filter=%s"
3345msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
3346
d13389bf 3347#: diff.c:4901
d46c5519
JX
3348#, c-format
3349msgid "unknown value after ws-error-highlight=%.*s"
3350msgstr "ws-error-highlight=%.*s 之后未知的值"
3351
d13389bf 3352#: diff.c:4915
7aea43ff 3353#, c-format
d46c5519
JX
3354msgid "unable to resolve '%s'"
3355msgstr "不能解析 '%s'"
3356
d13389bf 3357#: diff.c:4965 diff.c:4971
d46c5519
JX
3358#, c-format
3359msgid "%s expects <n>/<m> form"
3360msgstr "%s 期望 <n>/<m> 格式"
3361
d13389bf 3362#: diff.c:4983
d46c5519
JX
3363#, c-format
3364msgid "%s expects a character, got '%s'"
3365msgstr "%s 期望一个字符,得到 '%s'"
3366
d13389bf 3367#: diff.c:5004
d46c5519
JX
3368#, c-format
3369msgid "bad --color-moved argument: %s"
3370msgstr "坏的 --color-moved 参数:%s"
3371
d13389bf 3372#: diff.c:5023
d46c5519
JX
3373#, c-format
3374msgid "invalid mode '%s' in --color-moved-ws"
3375msgstr "--color-moved-ws 中的无效模式 '%s' "
3376
d13389bf 3377#: diff.c:5063
d46c5519
JX
3378msgid ""
3379"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3380"\"histogram\""
3381msgstr ""
3382"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3383
d13389bf 3384#: diff.c:5099 diff.c:5119
d46c5519
JX
3385#, c-format
3386msgid "invalid argument to %s"
3387msgstr "%s 的参数无效"
3388
d13389bf
JX
3389#: diff.c:5223
3390#, c-format
3391msgid "invalid regex given to -I: '%s'"
3392msgstr "选项 -I 的正则表达式无效:'%s'"
3393
3394#: diff.c:5272
d46c5519
JX
3395#, c-format
3396msgid "failed to parse --submodule option parameter: '%s'"
a0b6b246 3397msgstr "无法解析 --submodule 选项的参数:'%s'"
7aea43ff 3398
d13389bf 3399#: diff.c:5328
d46c5519
JX
3400#, c-format
3401msgid "bad --word-diff argument: %s"
3402msgstr "坏的 --word-diff 参数:%s"
3403
d13389bf 3404#: diff.c:5351
d46c5519
JX
3405msgid "Diff output format options"
3406msgstr "差异输出格式化选项"
3407
d13389bf 3408#: diff.c:5353 diff.c:5359
d46c5519
JX
3409msgid "generate patch"
3410msgstr "生成补丁"
3411
d13389bf 3412#: diff.c:5356 builtin/log.c:178
d46c5519
JX
3413msgid "suppress diff output"
3414msgstr "不显示差异输出"
3415
d13389bf 3416#: diff.c:5361 diff.c:5475 diff.c:5482
d46c5519
JX
3417msgid "<n>"
3418msgstr "<n>"
3419
d13389bf 3420#: diff.c:5362 diff.c:5365
d46c5519
JX
3421msgid "generate diffs with <n> lines context"
3422msgstr "生成含 <n> 行上下文的差异"
3423
d13389bf 3424#: diff.c:5367
d46c5519
JX
3425msgid "generate the diff in raw format"
3426msgstr "生成原始格式的差异"
3427
d13389bf 3428#: diff.c:5370
d46c5519
JX
3429msgid "synonym for '-p --raw'"
3430msgstr "和 '-p --raw' 同义"
3431
d13389bf 3432#: diff.c:5374
d46c5519
JX
3433msgid "synonym for '-p --stat'"
3434msgstr "和 '-p --stat' 同义"
3435
d13389bf 3436#: diff.c:5378
d46c5519
JX
3437msgid "machine friendly --stat"
3438msgstr "机器友好的 --stat"
3439
d13389bf 3440#: diff.c:5381
d46c5519
JX
3441msgid "output only the last line of --stat"
3442msgstr "只输出 --stat 的最后一行"
3443
d13389bf 3444#: diff.c:5383 diff.c:5391
d46c5519
JX
3445msgid "<param1,param2>..."
3446msgstr "<参数1,参数2>..."
3447
d13389bf 3448#: diff.c:5384
d46c5519
JX
3449msgid ""
3450"output the distribution of relative amount of changes for each sub-directory"
3451msgstr "输出每个子目录相对变更的分布"
3452
d13389bf 3453#: diff.c:5388
d46c5519
JX
3454msgid "synonym for --dirstat=cumulative"
3455msgstr "和 --dirstat=cumulative 同义"
3456
d13389bf 3457#: diff.c:5392
d46c5519
JX
3458msgid "synonym for --dirstat=files,param1,param2..."
3459msgstr "是 --dirstat=files,param1,param2... 的同义词"
3460
d13389bf 3461#: diff.c:5396
d46c5519
JX
3462msgid "warn if changes introduce conflict markers or whitespace errors"
3463msgstr "如果变更中引入冲突定界符或空白错误,给出警告"
3464
d13389bf 3465#: diff.c:5399
d46c5519
JX
3466msgid "condensed summary such as creations, renames and mode changes"
3467msgstr "精简摘要,例如创建、重命名和模式变更"
3468
d13389bf 3469#: diff.c:5402
d46c5519
JX
3470msgid "show only names of changed files"
3471msgstr "只显示变更文件的文件名"
3472
d13389bf 3473#: diff.c:5405
d46c5519
JX
3474msgid "show only names and status of changed files"
3475msgstr "只显示变更文件的文件名和状态"
3476
d13389bf 3477#: diff.c:5407
d46c5519
JX
3478msgid "<width>[,<name-width>[,<count>]]"
3479msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
3480
d13389bf 3481#: diff.c:5408
d46c5519 3482msgid "generate diffstat"
5b533632 3483msgstr "生成差异统计(diffstat)"
d46c5519 3484
d13389bf 3485#: diff.c:5410 diff.c:5413 diff.c:5416
d46c5519
JX
3486msgid "<width>"
3487msgstr "<宽度>"
3488
d13389bf 3489#: diff.c:5411
d46c5519
JX
3490msgid "generate diffstat with a given width"
3491msgstr "使用给定的长度生成差异统计"
3492
d13389bf 3493#: diff.c:5414
d46c5519
JX
3494msgid "generate diffstat with a given name width"
3495msgstr "使用给定的文件名长度生成差异统计"
3496
d13389bf 3497#: diff.c:5417
d46c5519
JX
3498msgid "generate diffstat with a given graph width"
3499msgstr "使用给定的图形长度生成差异统计"
3500
d13389bf 3501#: diff.c:5419
d46c5519
JX
3502msgid "<count>"
3503msgstr "<次数>"
3504
d13389bf 3505#: diff.c:5420
d46c5519
JX
3506msgid "generate diffstat with limited lines"
3507msgstr "生成有限行数的差异统计"
3508
d13389bf 3509#: diff.c:5423
d46c5519
JX
3510msgid "generate compact summary in diffstat"
3511msgstr "生成差异统计的简洁摘要"
3512
d13389bf 3513#: diff.c:5426
d46c5519
JX
3514msgid "output a binary diff that can be applied"
3515msgstr "输出一个可以应用的二进制差异"
3516
d13389bf 3517#: diff.c:5429
d46c5519
JX
3518msgid "show full pre- and post-image object names on the \"index\" lines"
3519msgstr "在 \"index\" 行显示完整的前后对象名称"
3520
d13389bf 3521#: diff.c:5431
d46c5519
JX
3522msgid "show colored diff"
3523msgstr "显示带颜色的差异"
3524
d13389bf 3525#: diff.c:5432
d46c5519
JX
3526msgid "<kind>"
3527msgstr "<类型>"
3528
d13389bf 3529#: diff.c:5433
d46c5519
JX
3530msgid ""
3531"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3532"diff"
3533msgstr "对于差异中的上下文、旧的和新的行,加亮显示错误的空白字符"
3534
d13389bf 3535#: diff.c:5436
d46c5519
JX
3536msgid ""
3537"do not munge pathnames and use NULs as output field terminators in --raw or "
3538"--numstat"
3539msgstr ""
3540"在 --raw 或者 --numstat 中,不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
3541"符"
3542
d13389bf 3543#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554
d46c5519
JX
3544msgid "<prefix>"
3545msgstr "<前缀>"
3546
d13389bf 3547#: diff.c:5440
d46c5519
JX
3548msgid "show the given source prefix instead of \"a/\""
3549msgstr "显示给定的源前缀取代 \"a/\""
3550
d13389bf 3551#: diff.c:5443
d46c5519
JX
3552msgid "show the given destination prefix instead of \"b/\""
3553msgstr "显示给定的目标前缀取代 \"b/\""
3554
d13389bf 3555#: diff.c:5446
d46c5519
JX
3556msgid "prepend an additional prefix to every line of output"
3557msgstr "输出的每一行附加前缀"
3558
d13389bf 3559#: diff.c:5449
d46c5519
JX
3560msgid "do not show any source or destination prefix"
3561msgstr "不显示任何源和目标前缀"
3562
d13389bf 3563#: diff.c:5452
d46c5519
JX
3564msgid "show context between diff hunks up to the specified number of lines"
3565msgstr "显示指定行数的差异块间的上下文"
3566
d13389bf 3567#: diff.c:5456 diff.c:5461 diff.c:5466
d46c5519
JX
3568msgid "<char>"
3569msgstr "<字符>"
3570
d13389bf 3571#: diff.c:5457
d46c5519
JX
3572msgid "specify the character to indicate a new line instead of '+'"
3573msgstr "指定一个字符取代 '+' 来表示新的一行"
3574
d13389bf 3575#: diff.c:5462
d46c5519
JX
3576msgid "specify the character to indicate an old line instead of '-'"
3577msgstr "指定一个字符取代 '-' 来表示旧的一行"
3578
d13389bf 3579#: diff.c:5467
d46c5519
JX
3580msgid "specify the character to indicate a context instead of ' '"
3581msgstr "指定一个字符取代 ' ' 来表示一行上下文"
3582
d13389bf 3583#: diff.c:5470
d46c5519
JX
3584msgid "Diff rename options"
3585msgstr "差异重命名选项"
3586
d13389bf 3587#: diff.c:5471
d46c5519
JX
3588msgid "<n>[/<m>]"
3589msgstr "<n>[/<m>]"
3590
d13389bf 3591#: diff.c:5472
d46c5519 3592msgid "break complete rewrite changes into pairs of delete and create"
5b533632 3593msgstr "将完全重写的变更打破为成对的删除和创建"
d46c5519 3594
d13389bf 3595#: diff.c:5476
d46c5519
JX
3596msgid "detect renames"
3597msgstr "检测重命名"
3598
d13389bf 3599#: diff.c:5480
d46c5519
JX
3600msgid "omit the preimage for deletes"
3601msgstr "省略删除操作的差异输出"
3602
d13389bf 3603#: diff.c:5483
d46c5519
JX
3604msgid "detect copies"
3605msgstr "检测拷贝"
3606
d13389bf 3607#: diff.c:5487
d46c5519
JX
3608msgid "use unmodified files as source to find copies"
3609msgstr "使用未修改的文件做为发现拷贝的源"
3610
d13389bf 3611#: diff.c:5489
d46c5519
JX
3612msgid "disable rename detection"
3613msgstr "禁用重命名探测"
3614
d13389bf 3615#: diff.c:5492
d46c5519
JX
3616msgid "use empty blobs as rename source"
3617msgstr "使用空的数据对象做为重命名的源"
3618
d13389bf 3619#: diff.c:5494
d46c5519
JX
3620msgid "continue listing the history of a file beyond renames"
3621msgstr "继续列出文件重命名以外的历史记录"
3622
d13389bf 3623#: diff.c:5497
d46c5519
JX
3624msgid ""
3625"prevent rename/copy detection if the number of rename/copy targets exceeds "
3626"given limit"
3627msgstr "如果重命名/拷贝目标超过给定的限制,禁止重命名/拷贝检测"
3628
d13389bf 3629#: diff.c:5499
d46c5519
JX
3630msgid "Diff algorithm options"
3631msgstr "差异算法选项"
3632
d13389bf 3633#: diff.c:5501
d46c5519
JX
3634msgid "produce the smallest possible diff"
3635msgstr "生成尽可能小的差异"
3636
d13389bf 3637#: diff.c:5504
d46c5519
JX
3638msgid "ignore whitespace when comparing lines"
3639msgstr "行比较时忽略空白字符"
3640
d13389bf 3641#: diff.c:5507
d46c5519
JX
3642msgid "ignore changes in amount of whitespace"
3643msgstr "忽略空白字符的变更"
3644
d13389bf 3645#: diff.c:5510
d46c5519
JX
3646msgid "ignore changes in whitespace at EOL"
3647msgstr "忽略行尾的空白字符变更"
3648
d13389bf 3649#: diff.c:5513
d46c5519
JX
3650msgid "ignore carrier-return at the end of line"
3651msgstr "忽略行尾的回车符(CR)"
3652
d13389bf 3653#: diff.c:5516
d46c5519
JX
3654msgid "ignore changes whose lines are all blank"
3655msgstr "忽略整行都是空白的变更"
3656
d13389bf
JX
3657#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588
3658msgid "<regex>"
3659msgstr "<正则>"
3660
3661#: diff.c:5519
3662msgid "ignore changes whose all lines match <regex>"
3663msgstr "忽略所有行都和正则表达式匹配的变更"
3664
3665#: diff.c:5522
d46c5519
JX
3666msgid "heuristic to shift diff hunk boundaries for easy reading"
3667msgstr "启发式转换差异边界以便阅读"
3668
d13389bf 3669#: diff.c:5525
d46c5519
JX
3670msgid "generate diff using the \"patience diff\" algorithm"
3671msgstr "使用 \"patience diff\" 算法生成差异"
3672
d13389bf 3673#: diff.c:5529
d46c5519
JX
3674msgid "generate diff using the \"histogram diff\" algorithm"
3675msgstr "使用 \"histogram diff\" 算法生成差异"
3676
d13389bf 3677#: diff.c:5531
d46c5519
JX
3678msgid "<algorithm>"
3679msgstr "<算法>"
3680
d13389bf 3681#: diff.c:5532
d46c5519
JX
3682msgid "choose a diff algorithm"
3683msgstr "选择一个差异算法"
3684
d13389bf 3685#: diff.c:5534
d46c5519
JX
3686msgid "<text>"
3687msgstr "<文本>"
3688
d13389bf 3689#: diff.c:5535
d46c5519 3690msgid "generate diff using the \"anchored diff\" algorithm"
5b533632 3691msgstr "使用 \"anchored diff\" 算法生成差异"
d46c5519 3692
d13389bf 3693#: diff.c:5537 diff.c:5546 diff.c:5549
d46c5519
JX
3694msgid "<mode>"
3695msgstr "<模式>"
3696
d13389bf 3697#: diff.c:5538
d46c5519
JX
3698msgid "show word diff, using <mode> to delimit changed words"
3699msgstr "显示单词差异,使用 <模式> 分隔变更的单词"
3700
d13389bf 3701#: diff.c:5541
d46c5519
JX
3702msgid "use <regex> to decide what a word is"
3703msgstr "使用 <正则表达式> 确定何为一个词"
3704
d13389bf 3705#: diff.c:5544
d46c5519
JX
3706msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3707msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
3708
d13389bf 3709#: diff.c:5547
d46c5519
JX
3710msgid "moved lines of code are colored differently"
3711msgstr "移动的代码行用不同方式着色"
3712
d13389bf 3713#: diff.c:5550
d46c5519
JX
3714msgid "how white spaces are ignored in --color-moved"
3715msgstr "在 --color-moved 下如何忽略空白字符"
3716
d13389bf 3717#: diff.c:5553
d46c5519
JX
3718msgid "Other diff options"
3719msgstr "其它差异选项"
3720
d13389bf 3721#: diff.c:5555
d46c5519
JX
3722msgid "when run from subdir, exclude changes outside and show relative paths"
3723msgstr "当从子目录运行,排除目录之外的变更并显示相对路径"
3724
d13389bf 3725#: diff.c:5559
d46c5519
JX
3726msgid "treat all files as text"
3727msgstr "把所有文件当做文本处理"
3728
d13389bf 3729#: diff.c:5561
d46c5519
JX
3730msgid "swap two inputs, reverse the diff"
3731msgstr "交换两个输入,反转差异"
3732
d13389bf 3733#: diff.c:5563
d46c5519
JX
3734msgid "exit with 1 if there were differences, 0 otherwise"
3735msgstr "有差异时退出码为 1,否则为 0"
3736
d13389bf 3737#: diff.c:5565
d46c5519
JX
3738msgid "disable all output of the program"
3739msgstr "禁用本程序的所有输出"
3740
d13389bf 3741#: diff.c:5567
d46c5519
JX
3742msgid "allow an external diff helper to be executed"
3743msgstr "允许执行一个外置的差异助手"
3744
d13389bf 3745#: diff.c:5569
d46c5519
JX
3746msgid "run external text conversion filters when comparing binary files"
3747msgstr "当比较二进制文件时,运行外部的文本转换过滤器"
3748
d13389bf 3749#: diff.c:5571
d46c5519
JX
3750msgid "<when>"
3751msgstr "<何时>"
3752
d13389bf 3753#: diff.c:5572
d46c5519
JX
3754msgid "ignore changes to submodules in the diff generation"
3755msgstr "在生成差异时,忽略子模组的更改"
3756
d13389bf 3757#: diff.c:5575
d46c5519
JX
3758msgid "<format>"
3759msgstr "<格式>"
3760
d13389bf 3761#: diff.c:5576
d46c5519
JX
3762msgid "specify how differences in submodules are shown"
3763msgstr "指定子模组的差异如何显示"
3764
d13389bf 3765#: diff.c:5580
d46c5519
JX
3766msgid "hide 'git add -N' entries from the index"
3767msgstr "隐藏索引中 'git add -N' 条目"
3768
d13389bf 3769#: diff.c:5583
d46c5519
JX
3770msgid "treat 'git add -N' entries as real in the index"
3771msgstr "将索引中 'git add -N' 条目当做真实的"
3772
d13389bf 3773#: diff.c:5585
d46c5519
JX
3774msgid "<string>"
3775msgstr "<字符串>"
3776
d13389bf 3777#: diff.c:5586
d46c5519
JX
3778msgid ""
3779"look for differences that change the number of occurrences of the specified "
3780"string"
3781msgstr "查找改变了指定字符串出现次数的差异"
3782
d13389bf 3783#: diff.c:5589
d46c5519
JX
3784msgid ""
3785"look for differences that change the number of occurrences of the specified "
3786"regex"
3787msgstr "查找改变指定正则匹配出现次数的差异"
3788
d13389bf 3789#: diff.c:5592
d46c5519
JX
3790msgid "show all changes in the changeset with -S or -G"
3791msgstr "显示使用 -S 或 -G 的变更集的所有变更"
3792
d13389bf 3793#: diff.c:5595
d46c5519
JX
3794msgid "treat <string> in -S as extended POSIX regular expression"
3795msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
3796
d13389bf 3797#: diff.c:5598
d46c5519
JX
3798msgid "control the order in which files appear in the output"
3799msgstr "控制输出中的文件显示顺序"
3800
d13389bf 3801#: diff.c:5599
d46c5519 3802msgid "<object-id>"
5b533632 3803msgstr "<对象 ID>"
d46c5519 3804
d13389bf 3805#: diff.c:5600
d46c5519
JX
3806msgid ""
3807"look for differences that change the number of occurrences of the specified "
3808"object"
3809msgstr "查找改变指定对象出现次数的差异"
3810
d13389bf 3811#: diff.c:5602
d46c5519
JX
3812msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3813msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
3814
d13389bf 3815#: diff.c:5603
d46c5519
JX
3816msgid "select files by diff type"
3817msgstr "通过差异类型选择文件"
3818
d13389bf 3819#: diff.c:5605
d46c5519
JX
3820msgid "<file>"
3821msgstr "<文件>"
3822
d13389bf 3823#: diff.c:5606
d46c5519
JX
3824msgid "Output to a specific file"
3825msgstr "输出到一个指定的文件"
3826
d13389bf 3827#: diff.c:6263
a0b6b246
JX
3828msgid "inexact rename detection was skipped due to too many files."
3829msgstr "因为文件太多,略过不严格的重命名检查。"
3830
d13389bf 3831#: diff.c:6266
a0b6b246
JX
3832msgid "only found copies from modified paths due to too many files."
3833msgstr "因为文件太多,只在修改的路径中查找拷贝。"
3834
d13389bf 3835#: diff.c:6269
7aea43ff 3836#, c-format
a0b6b246
JX
3837msgid ""
3838"you may want to set your %s variable to at least %d and retry the command."
29004bbb 3839msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
7aea43ff 3840
349ede6a
JX
3841#: diffcore-order.c:24
3842#, c-format
3843msgid "failed to read orderfile '%s'"
3844msgstr "读取排序文件 '%s' 失败"
3845
3846#: diffcore-rename.c:592
3847msgid "Performing inexact rename detection"
3848msgstr "正在进行非精确的重命名探测"
3849
d9488fea 3850#: dir.c:578
c1ac5258
JX
3851#, c-format
3852msgid "pathspec '%s' did not match any file(s) known to git"
3853msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
3854
d9488fea 3855#: dir.c:718 dir.c:747 dir.c:760
ddc12c42
JX
3856#, c-format
3857msgid "unrecognized pattern: '%s'"
3858msgstr "未识别的模式:'%s'"
3859
d9488fea 3860#: dir.c:777 dir.c:791
ddc12c42
JX
3861#, c-format
3862msgid "unrecognized negative pattern: '%s'"
3863msgstr "未识别的反向模式:'%s'"
3864
d9488fea 3865#: dir.c:809
ddc12c42
JX
3866#, c-format
3867msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
3868msgstr "您的 sparse-checkout 文件可能有问题:重复的模式 '%s'"
3869
d9488fea 3870#: dir.c:819
ddc12c42
JX
3871msgid "disabling cone pattern matching"
3872msgstr "禁止 cone 模式匹配"
3873
d9488fea 3874#: dir.c:1198
c1ac5258
JX
3875#, c-format
3876msgid "cannot use %s as an exclude file"
3877msgstr "不能将 %s 用作排除文件"
3878
d9488fea 3879#: dir.c:2305
31e5e17b
JX
3880#, c-format
3881msgid "could not open directory '%s'"
3882msgstr "不能打开目录 '%s'"
3883
d9488fea 3884#: dir.c:2605
a0b6b246
JX
3885msgid "failed to get kernel name and information"
3886msgstr "无法获得内核名称和信息"
7aea43ff 3887
d9488fea 3888#: dir.c:2729
c1ac5258
JX
3889msgid "untracked cache is disabled on this system or location"
3890msgstr "缓存未跟踪文件在本系统或位置中被禁用"
3891
d9488fea 3892#: dir.c:3520
c1ac5258
JX
3893#, c-format
3894msgid "index file corrupt in repo %s"
3895msgstr "仓库 %s 中的索引文件损坏"
7aea43ff 3896
d9488fea 3897#: dir.c:3565 dir.c:3570
87cb7997
JX
3898#, c-format
3899msgid "could not create directories for %s"
3900msgstr "不能为 %s 创建目录"
3901
d9488fea 3902#: dir.c:3599
1a79b2f1
JX
3903#, c-format
3904msgid "could not migrate git directory from '%s' to '%s'"
3905msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
3906
349ede6a 3907#: editor.c:74
5809aa05
JX
3908#, c-format
3909msgid "hint: Waiting for your editor to close the file...%c"
3910msgstr "提示:等待您的编辑器关闭文件...%c"
3911
7157c2b5 3912#: entry.c:177
6937cb4e
JX
3913msgid "Filtering content"
3914msgstr "过滤内容"
3915
7157c2b5 3916#: entry.c:478
87cb7997
JX
3917#, c-format
3918msgid "could not stat file '%s'"
65e2041e 3919msgstr "不能对文件 '%s' 调用 stat"
87cb7997 3920
349ede6a 3921#: environment.c:150
c1ac5258
JX
3922#, c-format
3923msgid "bad git namespace path \"%s\""
e640d114 3924msgstr "错误的 git 名字空间路径 \"%s\""
c1ac5258 3925
349ede6a 3926#: environment.c:337
c1ac5258
JX
3927#, c-format
3928msgid "could not set GIT_DIR to '%s'"
3929msgstr "不能设置 GIT_DIR 为 '%s'"
3930
d46c5519 3931#: exec-cmd.c:363
c1ac5258
JX
3932#, c-format
3933msgid "too many args to run %s"
3934msgstr "执行 %s 的参数太多"
3935
d13389bf 3936#: fetch-pack.c:177
a0b6b246
JX
3937msgid "git fetch-pack: expected shallow list"
3938msgstr "git fetch-pack:应为 shallow 列表"
3939
d13389bf 3940#: fetch-pack.c:180
06991777
JX
3941msgid "git fetch-pack: expected a flush packet after shallow list"
3942msgstr "git fetch-pack:在浅克隆列表之后期望一个 flush 包"
3943
d13389bf 3944#: fetch-pack.c:191
31e5e17b
JX
3945msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
3946msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包"
a0b6b246 3947
d13389bf 3948#: fetch-pack.c:211
90314792 3949#, c-format
275588f9 3950msgid "git fetch-pack: expected ACK/NAK, got '%s'"
a0b6b246 3951msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
90314792 3952
d13389bf 3953#: fetch-pack.c:222
d46c5519
JX
3954msgid "unable to write to remote"
3955msgstr "无法写到远程"
3956
d13389bf 3957#: fetch-pack.c:283
a0b6b246
JX
3958msgid "--stateless-rpc requires multi_ack_detailed"
3959msgstr "--stateless-rpc 需要 multi_ack_detailed"
90314792 3960
d13389bf 3961#: fetch-pack.c:378 fetch-pack.c:1406
90314792 3962#, c-format
a0b6b246
JX
3963msgid "invalid shallow line: %s"
3964msgstr "无效的 shallow 信息:%s"
90314792 3965
d13389bf 3966#: fetch-pack.c:384 fetch-pack.c:1412
c04f5ac3 3967#, c-format
a0b6b246
JX
3968msgid "invalid unshallow line: %s"
3969msgstr "无效的 unshallow 信息:%s"
c04f5ac3 3970
d13389bf 3971#: fetch-pack.c:386 fetch-pack.c:1414
a0b6b246
JX
3972#, c-format
3973msgid "object not found: %s"
3974msgstr "对象未找到:%s"
07432cef 3975
d13389bf 3976#: fetch-pack.c:389 fetch-pack.c:1417
c04f5ac3 3977#, c-format
a0b6b246
JX
3978msgid "error in object: %s"
3979msgstr "对象中出错:%s"
07432cef 3980
d13389bf 3981#: fetch-pack.c:391 fetch-pack.c:1419
c04f5ac3 3982#, c-format
a0b6b246
JX
3983msgid "no shallow found: %s"
3984msgstr "未发现 shallow:%s"
c04f5ac3 3985
d13389bf 3986#: fetch-pack.c:394 fetch-pack.c:1423
a0b6b246
JX
3987#, c-format
3988msgid "expected shallow/unshallow, got %s"
3989msgstr "应为 shallow/unshallow,却得到 %s"
07432cef 3990
d13389bf 3991#: fetch-pack.c:434
a0b6b246
JX
3992#, c-format
3993msgid "got %s %d %s"
3994msgstr "得到 %s %d %s"
1b7f4a34 3995
d13389bf 3996#: fetch-pack.c:451
1b7f4a34 3997#, c-format
a0b6b246
JX
3998msgid "invalid commit %s"
3999msgstr "无效提交 %s"
1b7f4a34 4000
d13389bf 4001#: fetch-pack.c:482
a0b6b246
JX
4002msgid "giving up"
4003msgstr "放弃"
814ff314 4004
d13389bf 4005#: fetch-pack.c:495 progress.c:339
a0b6b246
JX
4006msgid "done"
4007msgstr "完成"
2e8451e8 4008
d13389bf 4009#: fetch-pack.c:507
2e8451e8 4010#, c-format
a0b6b246
JX
4011msgid "got %s (%d) %s"
4012msgstr "得到 %s (%d) %s"
2e8451e8 4013
d13389bf 4014#: fetch-pack.c:543
a0b6b246
JX
4015#, c-format
4016msgid "Marking %s as complete"
4017msgstr "标记 %s 为完成"
220c313c 4018
d13389bf 4019#: fetch-pack.c:758
a0b6b246
JX
4020#, c-format
4021msgid "already have %s (%s)"
29004bbb 4022msgstr "已经有 %s(%s)"
220c313c 4023
d13389bf 4024#: fetch-pack.c:827
a0b6b246
JX
4025msgid "fetch-pack: unable to fork off sideband demultiplexer"
4026msgstr "fetch-pack:无法派生 sideband 多路输出"
1b7f4a34 4027
d13389bf 4028#: fetch-pack.c:835
a0b6b246
JX
4029msgid "protocol error: bad pack header"
4030msgstr "协议错误:坏的包头"
814ff314 4031
d13389bf 4032#: fetch-pack.c:919
a0b6b246
JX
4033#, c-format
4034msgid "fetch-pack: unable to fork off %s"
4035msgstr "fetch-pack:无法派生进程 %s"
5c57d762 4036
d13389bf 4037#: fetch-pack.c:937
a0b6b246
JX
4038#, c-format
4039msgid "%s failed"
4040msgstr "%s 失败"
14c8bced 4041
d13389bf 4042#: fetch-pack.c:939
a0b6b246
JX
4043msgid "error in sideband demultiplexer"
4044msgstr "sideband 多路输出出错"
c04f5ac3 4045
d13389bf 4046#: fetch-pack.c:982
81809b99 4047#, c-format
a0b6b246
JX
4048msgid "Server version is %.*s"
4049msgstr "服务器版本 %.*s"
8ada9598 4050
d13389bf
JX
4051#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005
4052#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021
4053#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037
4054#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059
a6cd2cc4
JX
4055#, c-format
4056msgid "Server supports %s"
4057msgstr "服务器支持 %s"
4058
d13389bf 4059#: fetch-pack.c:992
a6cd2cc4
JX
4060msgid "Server does not support shallow clients"
4061msgstr "服务器不支持 shalllow 客户端"
4062
d13389bf 4063#: fetch-pack.c:1052
a0b6b246
JX
4064msgid "Server does not support --shallow-since"
4065msgstr "服务器不支持 --shallow-since"
8ada9598 4066
d13389bf 4067#: fetch-pack.c:1057
a0b6b246
JX
4068msgid "Server does not support --shallow-exclude"
4069msgstr "服务器不支持 --shallow-exclude"
c04f5ac3 4070
d13389bf 4071#: fetch-pack.c:1061
a0b6b246
JX
4072msgid "Server does not support --deepen"
4073msgstr "服务器不支持 --deepen"
c04f5ac3 4074
d13389bf 4075#: fetch-pack.c:1063
7157c2b5
JX
4076msgid "Server does not support this repository's object format"
4077msgstr "服务器不支持这个仓库的对象格式"
4078
d13389bf 4079#: fetch-pack.c:1076
a0b6b246
JX
4080msgid "no common commits"
4081msgstr "没有共同的提交"
c04f5ac3 4082
d13389bf 4083#: fetch-pack.c:1088 fetch-pack.c:1628
a0b6b246
JX
4084msgid "git fetch-pack: fetch failed."
4085msgstr "git fetch-pack:获取失败。"
c04f5ac3 4086
d13389bf 4087#: fetch-pack.c:1214
7157c2b5
JX
4088#, c-format
4089msgid "mismatched algorithms: client %s; server %s"
4090msgstr "不匹配的算法:客户端 %s,服务端 %s"
4091
d13389bf 4092#: fetch-pack.c:1218
7157c2b5
JX
4093#, c-format
4094msgid "the server does not support algorithm '%s'"
4095msgstr "服务器不支持算法 '%s'"
4096
d13389bf 4097#: fetch-pack.c:1238
fd8cb379
JX
4098msgid "Server does not support shallow requests"
4099msgstr "服务器不支持 shalllow 请求"
4100
d13389bf 4101#: fetch-pack.c:1245
a6cd2cc4
JX
4102msgid "Server supports filter"
4103msgstr "服务器支持 filter"
4104
d13389bf 4105#: fetch-pack.c:1284
d46c5519
JX
4106msgid "unable to write request to remote"
4107msgstr "无法将请求写到远程"
4108
d13389bf 4109#: fetch-pack.c:1302
c1ac5258
JX
4110#, c-format
4111msgid "error reading section header '%s'"
4112msgstr "读取节标题 '%s' 出错"
4113
d13389bf 4114#: fetch-pack.c:1308
c1ac5258
JX
4115#, c-format
4116msgid "expected '%s', received '%s'"
4117msgstr "预期 '%s',得到 '%s'"
4118
d13389bf 4119#: fetch-pack.c:1369
c1ac5258
JX
4120#, c-format
4121msgid "unexpected acknowledgment line: '%s'"
4122msgstr "意外的确认行:'%s'"
4123
d13389bf 4124#: fetch-pack.c:1374
c1ac5258
JX
4125#, c-format
4126msgid "error processing acks: %d"
4127msgstr "处理 ack 出错:%d"
4128
d13389bf 4129#: fetch-pack.c:1384
4c27fcb5
JX
4130msgid "expected packfile to be sent after 'ready'"
4131msgstr "预期在 'ready' 之后发送 packfile"
4132
d13389bf 4133#: fetch-pack.c:1386
4c27fcb5
JX
4134msgid "expected no other sections to be sent after no 'ready'"
4135msgstr "在没有 'ready' 不应该发送其它小节"
4136
d13389bf 4137#: fetch-pack.c:1428
c1ac5258
JX
4138#, c-format
4139msgid "error processing shallow info: %d"
4140msgstr "处理浅克隆信息出错:%d"
4141
d13389bf 4142#: fetch-pack.c:1475
c1ac5258
JX
4143#, c-format
4144msgid "expected wanted-ref, got '%s'"
4145msgstr "预期 wanted-ref,得到 '%s'"
4146
d13389bf 4147#: fetch-pack.c:1480
c1ac5258
JX
4148#, c-format
4149msgid "unexpected wanted-ref: '%s'"
4150msgstr "意外的 wanted-ref:'%s'"
4151
d13389bf 4152#: fetch-pack.c:1485
c1ac5258
JX
4153#, c-format
4154msgid "error processing wanted refs: %d"
4155msgstr "处理要获取的引用出错:%d"
4156
d13389bf 4157#: fetch-pack.c:1515
7157c2b5
JX
4158msgid "git fetch-pack: expected response end packet"
4159msgstr "git fetch-pack:预期响应结束包"
4160
d13389bf 4161#: fetch-pack.c:1897
a0b6b246
JX
4162msgid "no matching remote head"
4163msgstr "没有匹配的远程分支"
c04f5ac3 4164
d13389bf 4165#: fetch-pack.c:1920 builtin/clone.c:693
c1ac5258 4166msgid "remote did not send all necessary objects"
e640d114 4167msgstr "远程没有发送所有必需的对象"
c1ac5258 4168
d13389bf 4169#: fetch-pack.c:1947
87cb7997
JX
4170#, c-format
4171msgid "no such remote ref %s"
4172msgstr "没有这样的远程引用 %s"
4173
d13389bf 4174#: fetch-pack.c:1950
87cb7997
JX
4175#, c-format
4176msgid "Server does not allow request for unadvertised object %s"
4177msgstr "服务器不允许请求未公开的对象 %s"
4178
349ede6a 4179#: gpg-interface.c:272
a0b6b246
JX
4180msgid "could not create temporary file"
4181msgstr "不能创建临时文件"
c04f5ac3 4182
349ede6a 4183#: gpg-interface.c:275
c04f5ac3 4184#, c-format
a0b6b246
JX
4185msgid "failed writing detached signature to '%s'"
4186msgstr "无法将分离式签名写入 '%s'"
c04f5ac3 4187
349ede6a
JX
4188#: gpg-interface.c:457
4189msgid "gpg failed to sign the data"
4190msgstr "gpg 数据签名失败"
4191
ddc12c42 4192#: graph.c:98
1a79b2f1
JX
4193#, c-format
4194msgid "ignore invalid color '%.*s' in log.graphColors"
4195msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
4196
d13389bf 4197#: grep.c:640
a5cd71ca
JX
4198msgid ""
4199"given pattern contains NULL byte (via -f <file>). This is only supported "
4200"with -P under PCRE v2"
4201msgstr ""
ddc12c42
JX
4202"给定的模式包含 NULL 字符(通过 -f <文件> 参数)。只有 PCRE v2 下的 -P 支持此"
4203"功能"
a5cd71ca 4204
d13389bf 4205#: grep.c:2100
c04f5ac3 4206#, c-format
a0b6b246
JX
4207msgid "'%s': unable to read %s"
4208msgstr "'%s':无法读取 %s"
c04f5ac3 4209
d13389bf 4210#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89
06991777 4211#: builtin/rm.c:135
c04f5ac3 4212#, c-format
a0b6b246 4213msgid "failed to stat '%s'"
65e2041e 4214msgstr "对 '%s' 调用 stat 失败"
c04f5ac3 4215
d13389bf 4216#: grep.c:2128
a0b6b246
JX
4217#, c-format
4218msgid "'%s': short read"
4219msgstr "'%s':读取不完整"
5c57d762 4220
fd8cb379
JX
4221#: help.c:23
4222msgid "start a working area (see also: git help tutorial)"
4223msgstr "开始一个工作区(参见:git help tutorial)"
4224
4225#: help.c:24
4226msgid "work on the current change (see also: git help everyday)"
4227msgstr "在当前变更上工作(参见:git help everyday)"
4228
4229#: help.c:25
4230msgid "examine the history and state (see also: git help revisions)"
4231msgstr "检查历史和状态(参见:git help revisions)"
4232
4233#: help.c:26
4234msgid "grow, mark and tweak your common history"
4235msgstr "扩展、标记和调校您的历史记录"
4236
4237#: help.c:27
4238msgid "collaborate (see also: git help workflows)"
4239msgstr "协同(参见:git help workflows)"
4240
4241#: help.c:31
4242msgid "Main Porcelain Commands"
4243msgstr "主要的上层命令"
4244
4245#: help.c:32
4246msgid "Ancillary Commands / Manipulators"
4247msgstr "辅助命令/操作者"
4248
4249#: help.c:33
4250msgid "Ancillary Commands / Interrogators"
4251msgstr "辅助命令/询问者"
4252
4253#: help.c:34
4254msgid "Interacting with Others"
4255msgstr "与其它系统交互"
4256
4257#: help.c:35
4258msgid "Low-level Commands / Manipulators"
4259msgstr "低级命令/操作者"
4260
4261#: help.c:36
4262msgid "Low-level Commands / Interrogators"
4263msgstr "低级命令/询问者"
4264
4265#: help.c:37
ddc12c42 4266msgid "Low-level Commands / Syncing Repositories"
fd8cb379
JX
4267msgstr "低级命令/同步仓库"
4268
4269#: help.c:38
4270msgid "Low-level Commands / Internal Helpers"
4271msgstr "低级命令/内部助手"
4272
d9488fea 4273#: help.c:300
a0b6b246
JX
4274#, c-format
4275msgid "available git commands in '%s'"
4276msgstr "在 '%s' 下可用的 git 命令"
c04f5ac3 4277
d9488fea 4278#: help.c:307
a0b6b246
JX
4279msgid "git commands available from elsewhere on your $PATH"
4280msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
5c57d762 4281
d9488fea 4282#: help.c:316
a0b6b246
JX
4283msgid "These are common Git commands used in various situations:"
4284msgstr "这些是各种场合常见的 Git 命令:"
5c57d762 4285
d9488fea 4286#: help.c:365 git.c:99
fd8cb379
JX
4287#, c-format
4288msgid "unsupported command listing type '%s'"
4289msgstr "不支持的命令列表类型 '%s'"
4290
d9488fea
JX
4291#: help.c:405
4292msgid "The Git concept guides are:"
4293msgstr "Git 概念向导有:"
fd8cb379 4294
d9488fea 4295#: help.c:429
4c27fcb5
JX
4296msgid "See 'git help <command>' to read about a specific subcommand"
4297msgstr "执行 'git help <command>' 来查看特定子命令"
4298
d9488fea 4299#: help.c:434
4c27fcb5
JX
4300msgid "External commands"
4301msgstr "外部命令"
4302
d9488fea 4303#: help.c:449
4c27fcb5
JX
4304msgid "Command aliases"
4305msgstr "命令别名"
4306
d13389bf 4307#: help.c:527
c04f5ac3 4308#, c-format
a0b6b246
JX
4309msgid ""
4310"'%s' appears to be a git command, but we were not\n"
4311"able to execute it. Maybe git-%s is broken?"
4312msgstr ""
4313"'%s' 像是一个 git 命令,但却无法运行。\n"
4314"可能是 git-%s 受损?"
c04f5ac3 4315
d13389bf
JX
4316#: help.c:543 help.c:631
4317#, c-format
4318msgid "git: '%s' is not a git command. See 'git --help'."
4319msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
4320
4321#: help.c:591
a0b6b246
JX
4322msgid "Uh oh. Your system reports no Git commands at all."
4323msgstr "唉呀,您的系统中未发现 Git 命令。"
c04f5ac3 4324
d13389bf 4325#: help.c:613
c04f5ac3 4326#, c-format
a4f16749 4327msgid "WARNING: You called a Git command named '%s', which does not exist."
554e8501 4328msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。"
a4f16749 4329
d13389bf 4330#: help.c:618
a4f16749
JX
4331#, c-format
4332msgid "Continuing under the assumption that you meant '%s'."
554e8501 4333msgstr "假定你想要的是 '%s' 并继续。"
c04f5ac3 4334
d13389bf 4335#: help.c:623
c04f5ac3 4336#, c-format
a4f16749 4337msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
554e8501 4338msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。"
c04f5ac3 4339
d13389bf 4340#: help.c:635
a4f16749
JX
4341msgid ""
4342"\n"
4343"The most similar command is"
4344msgid_plural ""
4345"\n"
4346"The most similar commands are"
6937cb4e
JX
4347msgstr[0] ""
4348"\n"
4349"最相似的命令是"
4350msgstr[1] ""
4351"\n"
4352"最相似的命令是"
a4f16749 4353
d13389bf 4354#: help.c:675
a4f16749
JX
4355msgid "git version [<options>]"
4356msgstr "git version [<选项>]"
4357
d13389bf 4358#: help.c:730
a4f16749
JX
4359#, c-format
4360msgid "%s: %s - %s"
4361msgstr "%s:%s - %s"
4362
d13389bf 4363#: help.c:734
a0b6b246
JX
4364msgid ""
4365"\n"
4366"Did you mean this?"
4367msgid_plural ""
4368"\n"
4369"Did you mean one of these?"
4370msgstr[0] ""
4371"\n"
4372"您指的是这个么?"
4373msgstr[1] ""
4374"\n"
4375"您指的是这其中的某一个么?"
c04f5ac3 4376
d9488fea
JX
4377#: ident.c:353
4378msgid "Author identity unknown\n"
4379msgstr "作者身份未知\n"
4380
4381#: ident.c:356
4382msgid "Committer identity unknown\n"
4383msgstr "提交者身份未知\n"
4384
4385#: ident.c:362
a0b6b246
JX
4386msgid ""
4387"\n"
4388"*** Please tell me who you are.\n"
4389"\n"
4390"Run\n"
4391"\n"
4392" git config --global user.email \"you@example.com\"\n"
4393" git config --global user.name \"Your Name\"\n"
4394"\n"
4395"to set your account's default identity.\n"
4396"Omit --global to set the identity only in this repository.\n"
4397"\n"
4398msgstr ""
4399"\n"
4400"*** 请告诉我你是谁。\n"
4401"\n"
4402"运行\n"
4403"\n"
4404" git config --global user.email \"you@example.com\"\n"
4405" git config --global user.name \"Your Name\"\n"
4406"\n"
4407"来设置您账号的缺省身份标识。\n"
4408"如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
c04f5ac3 4409
d9488fea 4410#: ident.c:397
87cb7997 4411msgid "no email was given and auto-detection is disabled"
65e2041e 4412msgstr "未提供邮件地址且自动探测被禁用"
87cb7997 4413
d9488fea 4414#: ident.c:402
87cb7997
JX
4415#, c-format
4416msgid "unable to auto-detect email address (got '%s')"
4417msgstr "无法自动探测邮件地址(得到 '%s')"
4418
d9488fea 4419#: ident.c:419
87cb7997
JX
4420msgid "no name was given and auto-detection is disabled"
4421msgstr "未提供姓名且自动探测被禁用"
4422
d9488fea 4423#: ident.c:425
87cb7997
JX
4424#, c-format
4425msgid "unable to auto-detect name (got '%s')"
4426msgstr "无法自动探测姓名(得到 '%s')"
4427
d9488fea 4428#: ident.c:433
87cb7997
JX
4429#, c-format
4430msgid "empty ident name (for <%s>) not allowed"
4431msgstr "不允许空的姓名(对于 <%s>)"
4432
d9488fea 4433#: ident.c:439
87cb7997
JX
4434#, c-format
4435msgid "name consists only of disallowed characters: %s"
4436msgstr "姓名中仅包含禁用字符:%s"
4437
d9488fea 4438#: ident.c:454 builtin/commit.c:634
87cb7997
JX
4439#, c-format
4440msgid "invalid date format: %s"
4441msgstr "无效的日期格式:%s"
4442
d9488fea 4443#: list-objects-filter-options.c:81
06991777
JX
4444msgid "expected 'tree:<depth>'"
4445msgstr "期望 'tree:<深度>'"
4c27fcb5 4446
d9488fea 4447#: list-objects-filter-options.c:96
d46c5519
JX
4448msgid "sparse:path filters support has been dropped"
4449msgstr "sparse:path 过滤器支持已被删除"
4450
d9488fea 4451#: list-objects-filter-options.c:109
a6cd2cc4
JX
4452#, c-format
4453msgid "invalid filter-spec '%s'"
4454msgstr "无效的过滤器表达式 '%s'"
4455
d9488fea 4456#: list-objects-filter-options.c:125
a5cd71ca
JX
4457#, c-format
4458msgid "must escape char in sub-filter-spec: '%c'"
4459msgstr "必须对 sub-filter-spec 中的字符进行转义:'%c'"
4460
d9488fea 4461#: list-objects-filter-options.c:167
a5cd71ca
JX
4462msgid "expected something after combine:"
4463msgstr "期望在组合后有一些东西:"
4464
d9488fea 4465#: list-objects-filter-options.c:249
a5cd71ca
JX
4466msgid "multiple filter-specs cannot be combined"
4467msgstr "不能混用多种过滤规格"
5809aa05 4468
d9488fea 4469#: list-objects-filter-options.c:361
7157c2b5
JX
4470msgid "unable to upgrade repository format to support partial clone"
4471msgstr "无法升级仓库格式以支持部分克隆"
4472
349ede6a
JX
4473#: list-objects-filter.c:492
4474#, c-format
4475msgid "unable to access sparse blob in '%s'"
4476msgstr "不能访问 '%s' 中的稀疏数据对象"
4477
4478#: list-objects-filter.c:495
4479#, c-format
4480msgid "unable to parse sparse filter data in %s"
4481msgstr "无法解析 %s 中的稀疏过滤器数据"
4482
4483#: list-objects.c:127
4484#, c-format
4485msgid "entry '%s' in tree %s has tree mode, but is not a tree"
4486msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式,但不是一个树对象"
4487
4488#: list-objects.c:140
4489#, c-format
4490msgid "entry '%s' in tree %s has blob mode, but is not a blob"
4491msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式,但不是一个数据对象"
4492
4493#: list-objects.c:375
4494#, c-format
4495msgid "unable to load root tree for commit %s"
4496msgstr "无法为提交 %s 加载根树"
4497
4498#: lockfile.c:152
c04f5ac3 4499#, c-format
a0b6b246
JX
4500msgid ""
4501"Unable to create '%s.lock': %s.\n"
4502"\n"
4503"Another git process seems to be running in this repository, e.g.\n"
4504"an editor opened by 'git commit'. Please make sure all processes\n"
4505"are terminated then try again. If it still fails, a git process\n"
4506"may have crashed in this repository earlier:\n"
4507"remove the file manually to continue."
4508msgstr ""
4509"无法创建 '%s.lock':%s。\n"
4510"\n"
4511"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
4512"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
4513"可能之前有一个 git 进程在这个仓库中异常退出:\n"
4514"手动删除这个文件再继续。"
c04f5ac3 4515
349ede6a 4516#: lockfile.c:160
a0b6b246
JX
4517#, c-format
4518msgid "Unable to create '%s.lock': %s"
4519msgstr "不能创建 '%s.lock':%s"
c04f5ac3 4520
349ede6a
JX
4521#: ls-refs.c:109
4522msgid "expected flush after ls-refs arguments"
4523msgstr "在 ls-refs 参数后应该有一个 flush 包"
c04f5ac3 4524
d13389bf
JX
4525#: merge-ort-wrappers.c:13 merge-recursive.c:3672
4526#, c-format
4527msgid ""
4528"Your local changes to the following files would be overwritten by merge:\n"
4529" %s"
4530msgstr ""
4531"您对下列文件的本地修改将被合并操作覆盖:\n"
4532" %s"
4533
4534#: merge-ort-wrappers.c:33 merge-recursive.c:3436
4535#, c-format
4536msgid "Already up to date!"
4537msgstr "已经是最新的!"
4538
2b472aae 4539#: merge-recursive.c:356
a0b6b246
JX
4540msgid "(bad commit)\n"
4541msgstr "(坏提交)\n"
c04f5ac3 4542
2b472aae 4543#: merge-recursive.c:379
a0b6b246 4544#, c-format
fd8cb379 4545msgid "add_cacheinfo failed for path '%s'; merge aborting."
0fcd668f 4546msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。"
c04f5ac3 4547
2b472aae 4548#: merge-recursive.c:388
fd8cb379
JX
4549#, c-format
4550msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
0fcd668f 4551msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。"
fd8cb379 4552
2b472aae 4553#: merge-recursive.c:874
c04f5ac3 4554#, c-format
a0b6b246 4555msgid "failed to create path '%s'%s"
c1ac5258 4556msgstr "创建路径 '%s'%s 失败"
c04f5ac3 4557
2b472aae 4558#: merge-recursive.c:885
c04f5ac3 4559#, c-format
a0b6b246
JX
4560msgid "Removing %s to make room for subdirectory\n"
4561msgstr "删除 %s 以便为子目录留出空间\n"
c04f5ac3 4562
2b472aae 4563#: merge-recursive.c:899 merge-recursive.c:918
a0b6b246
JX
4564msgid ": perhaps a D/F conflict?"
4565msgstr ":可能是一个目录/文件冲突?"
c04f5ac3 4566
2b472aae 4567#: merge-recursive.c:908
c04f5ac3 4568#, c-format
a0b6b246
JX
4569msgid "refusing to lose untracked file at '%s'"
4570msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
c04f5ac3 4571
2b472aae 4572#: merge-recursive.c:949 builtin/cat-file.c:41
c04f5ac3 4573#, c-format
a0b6b246
JX
4574msgid "cannot read object %s '%s'"
4575msgstr "不能读取对象 %s '%s'"
c04f5ac3 4576
2b472aae 4577#: merge-recursive.c:954
4dcdc3d8 4578#, c-format
a0b6b246
JX
4579msgid "blob expected for %s '%s'"
4580msgstr "%s '%s' 应为数据对象"
4dcdc3d8 4581
2b472aae 4582#: merge-recursive.c:979
4dcdc3d8 4583#, c-format
a0b6b246 4584msgid "failed to open '%s': %s"
c1ac5258 4585msgstr "打开 '%s' 失败:%s"
4dcdc3d8 4586
2b472aae 4587#: merge-recursive.c:990
a0b6b246
JX
4588#, c-format
4589msgid "failed to symlink '%s': %s"
c1ac5258 4590msgstr "创建符号链接 '%s' 失败:%s"
c04f5ac3 4591
2b472aae 4592#: merge-recursive.c:995
5c57d762 4593#, c-format
a0b6b246
JX
4594msgid "do not know what to do with %06o %s '%s'"
4595msgstr "不知道如何处理 %06o %s '%s'"
5c57d762 4596
2b472aae 4597#: merge-recursive.c:1191
fd8cb379
JX
4598#, c-format
4599msgid "Failed to merge submodule %s (not checked out)"
4600msgstr "无法合并子模组 %s (没有检出)"
4601
2b472aae 4602#: merge-recursive.c:1198
fd8cb379
JX
4603#, c-format
4604msgid "Failed to merge submodule %s (commits not present)"
4605msgstr "无法合并子模组 %s(提交不存在)"
4606
2b472aae 4607#: merge-recursive.c:1205
fd8cb379
JX
4608#, c-format
4609msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4610msgstr "无法合并子模组 %s (提交未跟随合并基线)"
4611
2b472aae 4612#: merge-recursive.c:1213 merge-recursive.c:1225
fd8cb379
JX
4613#, c-format
4614msgid "Fast-forwarding submodule %s to the following commit:"
4615msgstr "子模组 %s 快进到如下提交:"
4616
2b472aae 4617#: merge-recursive.c:1216 merge-recursive.c:1228
fd8cb379
JX
4618#, c-format
4619msgid "Fast-forwarding submodule %s"
4620msgstr "快进子模组 %s"
4621
2b472aae 4622#: merge-recursive.c:1251
fd8cb379
JX
4623#, c-format
4624msgid "Failed to merge submodule %s (merge following commits not found)"
4625msgstr "无法合并子模组 %s (没发现合并跟随的提交)"
4626
2b472aae 4627#: merge-recursive.c:1255
fd8cb379
JX
4628#, c-format
4629msgid "Failed to merge submodule %s (not fast-forward)"
4630msgstr "无法合并子模组 %s(非快进)"
4631
2b472aae 4632#: merge-recursive.c:1256
fd8cb379
JX
4633msgid "Found a possible merge resolution for the submodule:\n"
4634msgstr "找到子模组的一个可能的合并方案:\n"
4635
2b472aae 4636#: merge-recursive.c:1259
fd8cb379
JX
4637#, c-format
4638msgid ""
4639"If this is correct simply add it to the index for example\n"
4640"by using:\n"
4641"\n"
4642" git update-index --cacheinfo 160000 %s \"%s\"\n"
4643"\n"
4644"which will accept this suggestion.\n"
4645msgstr ""
4646"如果这个正确,将其添加到索引,例如使用命令:\n"
4647"\n"
4648" git update-index --cacheinfo 160000 %s \"%s\"\n"
4649"\n"
4650"以接受此建议。\n"
4651
2b472aae 4652#: merge-recursive.c:1268
fd8cb379
JX
4653#, c-format
4654msgid "Failed to merge submodule %s (multiple merges found)"
4655msgstr "无法合并子模组 %s (发现多个合并)"
4656
2b472aae 4657#: merge-recursive.c:1341
a0b6b246
JX
4658msgid "Failed to execute internal merge"
4659msgstr "无法执行内部合并"
4660
2b472aae 4661#: merge-recursive.c:1346
5c57d762 4662#, c-format
a0b6b246
JX
4663msgid "Unable to add %s to database"
4664msgstr "不能添加 %s 至对象库"
5c57d762 4665
2b472aae 4666#: merge-recursive.c:1378
fd8cb379
JX
4667#, c-format
4668msgid "Auto-merging %s"
4669msgstr "自动合并 %s"
4670
2b472aae 4671#: merge-recursive.c:1402
fd8cb379
JX
4672#, c-format
4673msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
4674msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。"
4675
2b472aae 4676#: merge-recursive.c:1474
5c57d762
JX
4677#, c-format
4678msgid ""
a0b6b246
JX
4679"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4680"in tree."
5c57d762 4681msgstr ""
87cb7997
JX
4682"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
4683"本被保留。"
4684
2b472aae 4685#: merge-recursive.c:1479
87cb7997
JX
4686#, c-format
4687msgid ""
4688"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4689"left in tree."
4690msgstr ""
4691"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
4692"%7$s 版本被保留。"
c04f5ac3 4693
2b472aae 4694#: merge-recursive.c:1486
7aea43ff 4695#, c-format
a0b6b246
JX
4696msgid ""
4697"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4698"in tree at %s."
4699msgstr ""
87cb7997
JX
4700"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
4701"本保留在 %8$s 中。"
7aea43ff 4702
2b472aae 4703#: merge-recursive.c:1491
87cb7997
JX
4704#, c-format
4705msgid ""
4706"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4707"left in tree at %s."
4708msgstr ""
4709"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
4710"%7$s 版本保留在 %9$s 中。"
4711
2b472aae 4712#: merge-recursive.c:1526
a0b6b246
JX
4713msgid "rename"
4714msgstr "重命名"
5b04ee3b 4715
2b472aae 4716#: merge-recursive.c:1526
a0b6b246
JX
4717msgid "renamed"
4718msgstr "重命名"
5b04ee3b 4719
349ede6a 4720#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
fd8cb379
JX
4721#, c-format
4722msgid "Refusing to lose dirty file at %s"
4723msgstr "拒绝丢失脏文件 '%s'"
4724
2b472aae 4725#: merge-recursive.c:1587
06991777
JX
4726#, c-format
4727msgid "Refusing to lose untracked file at %s, even though it's in the way."
4728msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。"
4729
2b472aae 4730#: merge-recursive.c:1645
06991777
JX
4731#, c-format
4732msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
4733msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
4734
2b472aae 4735#: merge-recursive.c:1676
5c57d762 4736#, c-format
a0b6b246
JX
4737msgid "%s is a directory in %s adding as %s instead"
4738msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
5c57d762 4739
2b472aae 4740#: merge-recursive.c:1681
fd8cb379
JX
4741#, c-format
4742msgid "Refusing to lose untracked file at %s; adding as %s instead"
4743msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s"
4744
2b472aae 4745#: merge-recursive.c:1708
5c57d762
JX
4746#, c-format
4747msgid ""
a0b6b246
JX
4748"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
4749"\"->\"%s\" in \"%s\"%s"
5c57d762 4750msgstr ""
a0b6b246
JX
4751"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
4752"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
5c57d762 4753
2b472aae 4754#: merge-recursive.c:1713
a0b6b246
JX
4755msgid " (left unresolved)"
4756msgstr "(留下未解决)"
5c57d762 4757
349ede6a 4758#: merge-recursive.c:1805
5c57d762 4759#, c-format
a0b6b246 4760msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
5c57d762 4761msgstr ""
a0b6b246
JX
4762"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
4763"%5$s"
3495628d 4764
349ede6a 4765#: merge-recursive.c:2068
fd8cb379
JX
4766#, c-format
4767msgid ""
4768"CONFLICT (directory rename split): Unclear where to place %s because "
4769"directory %s was renamed to multiple other directories, with no destination "
4770"getting a majority of the files."
c1ac5258
JX
4771msgstr ""
4772"冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个"
4773"其它目录,没有目录包含大部分文件。"
fd8cb379 4774
349ede6a 4775#: merge-recursive.c:2100
fd8cb379
JX
4776#, c-format
4777msgid ""
4778"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
4779"implicit directory rename(s) putting the following path(s) there: %s."
4780msgstr ""
4781"冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放"
4782"在:%s。"
4783
349ede6a 4784#: merge-recursive.c:2110
fd8cb379
JX
4785#, c-format
4786msgid ""
4787"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
4788"implicit directory renames tried to put these paths there: %s"
4789msgstr ""
4790"冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路"
4791"径放置于此:%s"
4792
349ede6a 4793#: merge-recursive.c:2202
fd8cb379
JX
4794#, c-format
4795msgid ""
4796"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
4797">%s in %s"
4798msgstr ""
4799"冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 "
4800"%4$s->%5$s"
4801
349ede6a 4802#: merge-recursive.c:2447
fd8cb379
JX
4803#, c-format
4804msgid ""
4805"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4806"renamed."
4807msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。"
4808
349ede6a 4809#: merge-recursive.c:2973
90314792 4810#, c-format
a0b6b246
JX
4811msgid "cannot read object %s"
4812msgstr "不能读取对象 %s"
90314792 4813
349ede6a 4814#: merge-recursive.c:2976
90314792 4815#, c-format
a0b6b246
JX
4816msgid "object %s is not a blob"
4817msgstr "对象 %s 不是一个数据对象"
90314792 4818
349ede6a 4819#: merge-recursive.c:3040
a0b6b246
JX
4820msgid "modify"
4821msgstr "修改"
90314792 4822
349ede6a 4823#: merge-recursive.c:3040
a0b6b246
JX
4824msgid "modified"
4825msgstr "修改"
5b04ee3b 4826
349ede6a 4827#: merge-recursive.c:3052
a0b6b246
JX
4828msgid "content"
4829msgstr "内容"
5b04ee3b 4830
349ede6a 4831#: merge-recursive.c:3056
a0b6b246
JX
4832msgid "add/add"
4833msgstr "添加/添加"
3495628d 4834
349ede6a 4835#: merge-recursive.c:3079
220c313c 4836#, c-format
a0b6b246
JX
4837msgid "Skipped %s (merged same as existing)"
4838msgstr "略过 %s(已经做过相同合并)"
220c313c 4839
d9488fea 4840#: merge-recursive.c:3101
a0b6b246
JX
4841msgid "submodule"
4842msgstr "子模组"
4843
349ede6a 4844#: merge-recursive.c:3102
220c313c 4845#, c-format
a0b6b246
JX
4846msgid "CONFLICT (%s): Merge conflict in %s"
4847msgstr "冲突(%s):合并冲突于 %s"
220c313c 4848
349ede6a 4849#: merge-recursive.c:3132
220c313c 4850#, c-format
06991777
JX
4851msgid "Adding as %s instead"
4852msgstr "而是以 %s 为名添加"
4853
349ede6a 4854#: merge-recursive.c:3215
06991777 4855#, c-format
d46c5519
JX
4856msgid ""
4857"Path updated: %s added in %s inside a directory that was renamed in %s; "
4858"moving it to %s."
4859msgstr ""
5b533632 4860"路径已更新:%s 添加到 %s,位于一个被重命名到 %s 的目录中,将其移动到 %s。"
220c313c 4861
349ede6a 4862#: merge-recursive.c:3218
d46c5519
JX
4863#, c-format
4864msgid ""
4865"CONFLICT (file location): %s added in %s inside a directory that was renamed "
4866"in %s, suggesting it should perhaps be moved to %s."
4867msgstr ""
4868"冲突(文件位置):%s 添加到 %s,位于一个被重命名为 %s 的目录中,建议将其移动"
4869"到 %s。"
4870
349ede6a 4871#: merge-recursive.c:3222
d46c5519
JX
4872#, c-format
4873msgid ""
4874"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
4875"%s; moving it to %s."
4876msgstr ""
5b533632
FZ
4877"路径已更新:%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,将其移"
4878"动到 %5$s。"
d46c5519 4879
349ede6a 4880#: merge-recursive.c:3225
d46c5519
JX
4881#, c-format
4882msgid ""
4883"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
4884"was renamed in %s, suggesting it should perhaps be moved to %s."
4885msgstr ""
5b533632 4886"冲突(文件位置):%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,"
d46c5519
JX
4887"建议将其移动到 %5$s。"
4888
349ede6a 4889#: merge-recursive.c:3339
d46c5519
JX
4890#, c-format
4891msgid "Removing %s"
4892msgstr "删除 %s"
4893
349ede6a 4894#: merge-recursive.c:3362
d46c5519
JX
4895msgid "file/directory"
4896msgstr "文件/目录"
220c313c 4897
349ede6a 4898#: merge-recursive.c:3367
a0b6b246
JX
4899msgid "directory/file"
4900msgstr "目录/文件"
276ceeaa 4901
349ede6a 4902#: merge-recursive.c:3374
276ceeaa 4903#, c-format
a0b6b246
JX
4904msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
4905msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
276ceeaa 4906
349ede6a 4907#: merge-recursive.c:3383
276ceeaa 4908#, c-format
a0b6b246
JX
4909msgid "Adding %s"
4910msgstr "添加 %s"
276ceeaa 4911
349ede6a 4912#: merge-recursive.c:3392
06991777
JX
4913#, c-format
4914msgid "CONFLICT (add/add): Merge conflict in %s"
4915msgstr "冲突(add/add):合并冲突于 %s"
4916
349ede6a 4917#: merge-recursive.c:3445
276ceeaa 4918#, c-format
a0b6b246
JX
4919msgid "merging of trees %s and %s failed"
4920msgstr "无法合并树 %s 和 %s"
276ceeaa 4921
d9488fea 4922#: merge-recursive.c:3550
a0b6b246
JX
4923msgid "Merging:"
4924msgstr "合并:"
5c57d762 4925
d9488fea 4926#: merge-recursive.c:3563
5c57d762 4927#, c-format
a0b6b246
JX
4928msgid "found %u common ancestor:"
4929msgid_plural "found %u common ancestors:"
4930msgstr[0] "发现 %u 个共同祖先:"
4931msgstr[1] "发现 %u 个共同祖先:"
4932
d9488fea 4933#: merge-recursive.c:3613
a0b6b246
JX
4934msgid "merge returned no commit"
4935msgstr "合并未返回提交"
4936
d9488fea 4937#: merge-recursive.c:3769
5c57d762 4938#, c-format
a0b6b246
JX
4939msgid "Could not parse object '%s'"
4940msgstr "不能解析对象 '%s'"
5c57d762 4941
d13389bf 4942#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895
a0b6b246
JX
4943msgid "Unable to write index."
4944msgstr "不能写入索引。"
4945
349ede6a
JX
4946#: merge.c:41
4947msgid "failed to read the cache"
4948msgstr "读取缓存失败"
4949
d13389bf
JX
4950#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917
4951#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817
349ede6a
JX
4952#: builtin/stash.c:265
4953msgid "unable to write new index file"
4954msgstr "无法写新的索引文件"
4955
d13389bf 4956#: midx.c:80
4c27fcb5
JX
4957#, c-format
4958msgid "multi-pack-index file %s is too small"
4959msgstr "多包索引文件 %s 太小"
4960
d13389bf 4961#: midx.c:96
4c27fcb5
JX
4962#, c-format
4963msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
4964msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
4965
d13389bf 4966#: midx.c:101
4c27fcb5
JX
4967#, c-format
4968msgid "multi-pack-index version %d not recognized"
4969msgstr "multi-pack-index 版本 %d 不能被识别"
4970
d13389bf 4971#: midx.c:106
4c27fcb5 4972#, c-format
d9488fea
JX
4973msgid "multi-pack-index hash version %u does not match version %u"
4974msgstr "多包索引哈希版本 %u 和版本 %u 不匹配"
4c27fcb5 4975
d13389bf 4976#: midx.c:123
4c27fcb5
JX
4977msgid "invalid chunk offset (too large)"
4978msgstr "无效的块偏移(太大)"
4979
d13389bf 4980#: midx.c:147
4c27fcb5
JX
4981msgid "terminating multi-pack-index chunk id appears earlier than expected"
4982msgstr "终止多包索引块 id 出现时间早于预期"
4983
d13389bf 4984#: midx.c:160
4c27fcb5
JX
4985msgid "multi-pack-index missing required pack-name chunk"
4986msgstr "多包索引缺少必需的包名块"
4987
d13389bf 4988#: midx.c:162
4c27fcb5 4989msgid "multi-pack-index missing required OID fanout chunk"
5b533632 4990msgstr "多包索引缺少必需的对象 ID 扇出块"
4c27fcb5 4991
d13389bf 4992#: midx.c:164
4c27fcb5 4993msgid "multi-pack-index missing required OID lookup chunk"
5b533632 4994msgstr "多包索引缺少必需的对象 ID 查询块"
4c27fcb5 4995
d13389bf 4996#: midx.c:166
4c27fcb5
JX
4997msgid "multi-pack-index missing required object offsets chunk"
4998msgstr "多包索引缺少必需的对象偏移块"
4999
d13389bf 5000#: midx.c:180
4c27fcb5
JX
5001#, c-format
5002msgid "multi-pack-index pack names out of order: '%s' before '%s'"
5003msgstr "多包索引包名无序:'%s' 在 '%s' 之前"
5004
d13389bf 5005#: midx.c:223
4c27fcb5
JX
5006#, c-format
5007msgid "bad pack-int-id: %u (%u total packs)"
5008msgstr "错的 pack-int-id:%u(共有 %u 个包)"
5009
d13389bf 5010#: midx.c:273
4c27fcb5
JX
5011msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
5012msgstr "多包索引存储一个64位偏移,但是 off_t 太小"
5013
d13389bf 5014#: midx.c:480
4c27fcb5
JX
5015#, c-format
5016msgid "failed to add packfile '%s'"
5017msgstr "添加包文件 '%s' 失败"
5018
d13389bf 5019#: midx.c:486
4c27fcb5
JX
5020#, c-format
5021msgid "failed to open pack-index '%s'"
5022msgstr "打开包索引 '%s' 失败"
5023
d13389bf 5024#: midx.c:546
4c27fcb5
JX
5025#, c-format
5026msgid "failed to locate object %d in packfile"
5027msgstr "在包文件中定位对象 %d 失败"
5028
d13389bf 5029#: midx.c:846
ddc12c42
JX
5030msgid "Adding packfiles to multi-pack-index"
5031msgstr "添加包文件到多包索引"
5032
d13389bf 5033#: midx.c:879
a6cd2cc4
JX
5034#, c-format
5035msgid "did not see pack-file %s to drop"
5036msgstr "没有看到要丢弃的包文件 %s"
5037
d13389bf 5038#: midx.c:931
349ede6a
JX
5039msgid "no pack files to index."
5040msgstr "没有要索引的包文件。"
5041
d13389bf 5042#: midx.c:982
ddc12c42
JX
5043msgid "Writing chunks to multi-pack-index"
5044msgstr "写入块到多包索引"
5045
d13389bf 5046#: midx.c:1060
4c27fcb5
JX
5047#, c-format
5048msgid "failed to clear multi-pack-index at %s"
5049msgstr "清理位于 %s 的多包索引失败"
5050
d13389bf 5051#: midx.c:1116
d9488fea
JX
5052msgid "multi-pack-index file exists, but failed to parse"
5053msgstr "多包索引文件存在,但无法解析"
5054
d13389bf 5055#: midx.c:1124
d46c5519
JX
5056msgid "Looking for referenced packfiles"
5057msgstr "正在查找引用的包文件"
5058
d13389bf 5059#: midx.c:1139
4c27fcb5
JX
5060#, c-format
5061msgid ""
5062"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
5b533632 5063msgstr "对象 ID 扇出无序:fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
4c27fcb5 5064
d13389bf 5065#: midx.c:1144
349ede6a
JX
5066msgid "the midx contains no oid"
5067msgstr "midx 不包含 oid"
5068
d13389bf 5069#: midx.c:1153
ddc12c42
JX
5070msgid "Verifying OID order in multi-pack-index"
5071msgstr "校验多包索引中的 OID 顺序"
d46c5519 5072
d13389bf 5073#: midx.c:1162
4c27fcb5
JX
5074#, c-format
5075msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
5b533632 5076msgstr "对象 ID 查询无序:oid[%d] = %s >= %s = oid[%d]"
4c27fcb5 5077
d13389bf 5078#: midx.c:1182
d46c5519
JX
5079msgid "Sorting objects by packfile"
5080msgstr "通过包文件为对象排序"
5081
d13389bf 5082#: midx.c:1189
4c27fcb5
JX
5083msgid "Verifying object offsets"
5084msgstr "校验对象偏移"
5085
d13389bf 5086#: midx.c:1205
4c27fcb5
JX
5087#, c-format
5088msgid "failed to load pack entry for oid[%d] = %s"
5089msgstr "为 oid[%d] = %s 加载包条目失败"
5090
d13389bf 5091#: midx.c:1211
4c27fcb5
JX
5092#, c-format
5093msgid "failed to load pack-index for packfile %s"
5094msgstr "为包文件 %s 加载包索引失败"
5095
d13389bf 5096#: midx.c:1220
4c27fcb5
JX
5097#, c-format
5098msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
5099msgstr "oid[%d] = %s 错误的对象偏移:%<PRIx64> != %<PRIx64>"
5100
d13389bf 5101#: midx.c:1245
ddc12c42
JX
5102msgid "Counting referenced objects"
5103msgstr "正在对引用对象计数"
5104
d13389bf 5105#: midx.c:1255
ddc12c42
JX
5106msgid "Finding and deleting unreferenced packfiles"
5107msgstr "正在查找和删除未引用的包文件"
5108
d13389bf 5109#: midx.c:1446
a6cd2cc4
JX
5110msgid "could not start pack-objects"
5111msgstr "不能开始 pack-objects"
5112
d13389bf 5113#: midx.c:1466
a6cd2cc4
JX
5114msgid "could not finish pack-objects"
5115msgstr "不能结束 pack-objects"
5116
a5cd71ca 5117#: name-hash.c:537
4c27fcb5
JX
5118#, c-format
5119msgid "unable to create lazy_dir thread: %s"
5120msgstr "不能创建 lazy_dir 线程:%s"
5121
a5cd71ca 5122#: name-hash.c:559
4c27fcb5
JX
5123#, c-format
5124msgid "unable to create lazy_name thread: %s"
5125msgstr "不能创建 lazy_name 线程:%s"
5126
a5cd71ca 5127#: name-hash.c:565
4c27fcb5
JX
5128#, c-format
5129msgid "unable to join lazy_name thread: %s"
5130msgstr "不能加入 lasy_name 线程:%s"
5131
06991777 5132#: notes-merge.c:277
5c57d762
JX
5133#, c-format
5134msgid ""
a0b6b246
JX
5135"You have not concluded your previous notes merge (%s exists).\n"
5136"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
5137"commit/abort the previous merge before you start a new notes merge."
5c57d762 5138msgstr ""
29004bbb 5139"您的前一次注释合并尚未结束(存在 %s)。\n"
1a79b2f1
JX
5140"在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
5141"notes merge --abort' 来提交/终止前一次合并。"
5c57d762 5142
06991777 5143#: notes-merge.c:284
a0b6b246
JX
5144#, c-format
5145msgid "You have not concluded your notes merge (%s exists)."
5146msgstr "您尚未结束注释合并(存在 %s)。"
5147
06991777 5148#: notes-utils.c:46
a0b6b246
JX
5149msgid "Cannot commit uninitialized/unreferenced notes tree"
5150msgstr "不能提交未初始化/未引用的注解树"
5c57d762 5151
06991777 5152#: notes-utils.c:105
1b7f4a34 5153#, c-format
a0b6b246
JX
5154msgid "Bad notes.rewriteMode value: '%s'"
5155msgstr "坏的 notes.rewriteMode 值:'%s'"
1b7f4a34 5156
06991777 5157#: notes-utils.c:115
5b04ee3b 5158#, c-format
a0b6b246
JX
5159msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
5160msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
5b04ee3b 5161
a4f16749
JX
5162#. TRANSLATORS: The first %s is the name of
5163#. the environment variable, the second %s is
5164#. its value.
5165#.
06991777 5166#: notes-utils.c:145
5b04ee3b 5167#, c-format
a0b6b246
JX
5168msgid "Bad %s value: '%s'"
5169msgstr "坏的 %s 值:'%s'"
5b04ee3b 5170
a5cd71ca 5171#: object.c:53
c1ac5258
JX
5172#, c-format
5173msgid "invalid object type \"%s\""
5174msgstr "无效的对象类型 \"%s\""
5175
a5cd71ca 5176#: object.c:173
c1ac5258
JX
5177#, c-format
5178msgid "object %s is a %s, not a %s"
5179msgstr "对象 %s 是一个 %s,不是一个 %s"
5180
a5cd71ca 5181#: object.c:233
c1ac5258
JX
5182#, c-format
5183msgid "object %s has unknown type id %d"
5184msgstr "对象 %s 有未知的类型 id %d"
5185
a5cd71ca 5186#: object.c:246
5b04ee3b 5187#, c-format
a0b6b246
JX
5188msgid "unable to parse object: %s"
5189msgstr "不能解析对象:%s"
5b04ee3b 5190
2b472aae 5191#: object.c:266 object.c:278
c1ac5258 5192#, c-format
06991777
JX
5193msgid "hash mismatch %s"
5194msgstr "哈希值与 %s 不匹配"
c1ac5258 5195
d9488fea 5196#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216
349ede6a
JX
5197#, c-format
5198msgid "unable to get size of %s"
5199msgstr "无法得到 %s 的大小"
5200
d13389bf 5201#: packfile.c:615
6937cb4e
JX
5202msgid "offset before end of packfile (broken .idx?)"
5203msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
5204
d13389bf 5205#: packfile.c:1907
6937cb4e
JX
5206#, c-format
5207msgid "offset before start of pack index for %s (corrupt index?)"
5208msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
5209
d13389bf 5210#: packfile.c:1911
6937cb4e
JX
5211#, c-format
5212msgid "offset beyond end of pack index for %s (truncated index?)"
5213msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
5214
349ede6a 5215#: parse-options-cb.c:20 parse-options-cb.c:24
2b472aae 5216#, c-format
349ede6a
JX
5217msgid "option `%s' expects a numerical value"
5218msgstr "选项 `%s' 期望一个数字值"
5219
5220#: parse-options-cb.c:41
5221#, c-format
5222msgid "malformed expiration date '%s'"
5223msgstr "格式错误的到期时间:'%s'"
5224
5225#: parse-options-cb.c:54
5226#, c-format
5227msgid "option `%s' expects \"always\", \"auto\", or \"never\""
5228msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
5229
d9488fea 5230#: parse-options-cb.c:132 parse-options-cb.c:149
349ede6a
JX
5231#, c-format
5232msgid "malformed object name '%s'"
5233msgstr "格式错误的对象名 '%s'"
2b472aae 5234
d46c5519 5235#: parse-options.c:38
06991777
JX
5236#, c-format
5237msgid "%s requires a value"
8e4e0555 5238msgstr "%s 需要一个值"
06991777 5239
d46c5519 5240#: parse-options.c:73
06991777
JX
5241#, c-format
5242msgid "%s is incompatible with %s"
5243msgstr "%s 与 %s 不兼容"
5244
d46c5519 5245#: parse-options.c:78
06991777
JX
5246#, c-format
5247msgid "%s : incompatible with something else"
5248msgstr "%s:和其它的不兼容"
5249
2b472aae 5250#: parse-options.c:92 parse-options.c:96 parse-options.c:317
06991777
JX
5251#, c-format
5252msgid "%s takes no value"
8e4e0555 5253msgstr "%s 不取值"
06991777 5254
d46c5519 5255#: parse-options.c:94
06991777
JX
5256#, c-format
5257msgid "%s isn't available"
5258msgstr "%s 不可用"
5259
2b472aae 5260#: parse-options.c:217
06991777
JX
5261#, c-format
5262msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
5263msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
5264
2b472aae 5265#: parse-options.c:386
06991777
JX
5266#, c-format
5267msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
8e4e0555 5268msgstr "有歧义的选项:%s(可以是 --%s%s 或 --%s%s)"
06991777 5269
2b472aae 5270#: parse-options.c:420 parse-options.c:428
06991777 5271#, c-format
2b472aae
JX
5272msgid "did you mean `--%s` (with two dashes)?"
5273msgstr "你的意思是 `--%s`(有两个短线)?"
06991777 5274
d9488fea 5275#: parse-options.c:666 parse-options.c:971
349ede6a
JX
5276#, c-format
5277msgid "alias of --%s"
5278msgstr "--%s 的别名"
5279
d9488fea 5280#: parse-options.c:862
06991777
JX
5281#, c-format
5282msgid "unknown option `%s'"
5283msgstr "未知选项 `%s'"
5284
d9488fea 5285#: parse-options.c:864
06991777
JX
5286#, c-format
5287msgid "unknown switch `%c'"
5288msgstr "未知开关 `%c'"
5289
d9488fea 5290#: parse-options.c:866
06991777
JX
5291#, c-format
5292msgid "unknown non-ascii option in string: `%s'"
5b533632 5293msgstr "字符串中未知的非 ascii 字符选项:`%s'"
06991777 5294
d9488fea 5295#: parse-options.c:890
a0b6b246
JX
5296msgid "..."
5297msgstr "..."
5298
d9488fea 5299#: parse-options.c:909
5b04ee3b 5300#, c-format
a0b6b246
JX
5301msgid "usage: %s"
5302msgstr "用法:%s"
5b04ee3b 5303
a0b6b246 5304#. TRANSLATORS: the colon here should align with the
a4f16749
JX
5305#. one in "usage: %s" translation.
5306#.
d9488fea 5307#: parse-options.c:915
5b04ee3b 5308#, c-format
a0b6b246
JX
5309msgid " or: %s"
5310msgstr " 或:%s"
5b04ee3b 5311
a0b6b246 5312# 译者:为保证在输出中对齐,注意调整句中空格!
d9488fea 5313#: parse-options.c:918
5b04ee3b 5314#, c-format
a0b6b246
JX
5315msgid " %s"
5316msgstr " %s"
5b04ee3b 5317
d9488fea 5318#: parse-options.c:957
a0b6b246
JX
5319msgid "-NUM"
5320msgstr "-数字"
5321
ddc12c42 5322#: path.c:915
5b04ee3b 5323#, c-format
a0b6b246
JX
5324msgid "Could not make %s writable by group"
5325msgstr "不能设置 %s 为组可写"
5326
ddc12c42 5327#: pathspec.c:130
87cb7997
JX
5328msgid "Escape character '\\' not allowed as last character in attr value"
5329msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
5330
ddc12c42 5331#: pathspec.c:148
87cb7997
JX
5332msgid "Only one 'attr:' specification is allowed."
5333msgstr "只允许一个 'attr:' 规格。"
5334
ddc12c42 5335#: pathspec.c:151
87cb7997
JX
5336msgid "attr spec must not be empty"
5337msgstr "属性规格不能为空"
5338
ddc12c42 5339#: pathspec.c:194
87cb7997
JX
5340#, c-format
5341msgid "invalid attribute name %s"
5342msgstr "无效的属性名 %s"
5343
ddc12c42 5344#: pathspec.c:259
a0b6b246
JX
5345msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
5346msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
5347
ddc12c42 5348#: pathspec.c:266
5b04ee3b 5349msgid ""
a0b6b246
JX
5350"global 'literal' pathspec setting is incompatible with all other global "
5351"pathspec settings"
5352msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
5b04ee3b 5353
ddc12c42 5354#: pathspec.c:306
a0b6b246
JX
5355msgid "invalid parameter for pathspec magic 'prefix'"
5356msgstr "路径规格包含无效的神奇前缀"
5357
ddc12c42 5358#: pathspec.c:327
5b04ee3b 5359#, c-format
a0b6b246
JX
5360msgid "Invalid pathspec magic '%.*s' in '%s'"
5361msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
5b04ee3b 5362
ddc12c42 5363#: pathspec.c:332
5b04ee3b 5364#, c-format
a0b6b246
JX
5365msgid "Missing ')' at the end of pathspec magic in '%s'"
5366msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
5b04ee3b 5367
ddc12c42 5368#: pathspec.c:370
5b04ee3b 5369#, c-format
a0b6b246
JX
5370msgid "Unimplemented pathspec magic '%c' in '%s'"
5371msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
5b04ee3b 5372
ddc12c42 5373#: pathspec.c:429
5b04ee3b 5374#, c-format
a0b6b246
JX
5375msgid "%s: 'literal' and 'glob' are incompatible"
5376msgstr "%s:'literal' 和 'glob' 不兼容"
5b04ee3b 5377
349ede6a 5378#: pathspec.c:445
5b04ee3b 5379#, c-format
2b472aae 5380msgid "%s: '%s' is outside repository at '%s'"
440e7442 5381msgstr "%s:'%s' 在位于 '%s' 的仓库之外"
5b04ee3b 5382
349ede6a 5383#: pathspec.c:521
5b04ee3b 5384#, c-format
1a79b2f1
JX
5385msgid "'%s' (mnemonic: '%c')"
5386msgstr "'%s'(助记符:'%c')"
5b04ee3b 5387
349ede6a 5388#: pathspec.c:531
5b04ee3b 5389#, c-format
a0b6b246
JX
5390msgid "%s: pathspec magic not supported by this command: %s"
5391msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
5392
349ede6a 5393#: pathspec.c:598
5b04ee3b 5394#, c-format
a0b6b246
JX
5395msgid "pathspec '%s' is beyond a symbolic link"
5396msgstr "路径规格 '%s' 位于符号链接中"
5397
349ede6a 5398#: pathspec.c:643
ddc12c42
JX
5399#, c-format
5400msgid "line is badly quoted: %s"
5401msgstr "行被错误地引用:%s"
5402
d46c5519
JX
5403#: pkt-line.c:92
5404msgid "unable to write flush packet"
5405msgstr "无法写 flush 包"
5406
5407#: pkt-line.c:99
5408msgid "unable to write delim packet"
5409msgstr "无法写 delim 包"
5410
5411#: pkt-line.c:106
7157c2b5
JX
5412msgid "unable to write stateless separator packet"
5413msgstr "无法写入无状态分隔符数据包"
5414
5415#: pkt-line.c:113
c1ac5258
JX
5416msgid "flush packet write failed"
5417msgstr "flush 包写错误"
5418
7157c2b5 5419#: pkt-line.c:153 pkt-line.c:239
c1ac5258
JX
5420msgid "protocol error: impossibly long line"
5421msgstr "协议错误:不可能的长行"
5422
7157c2b5 5423#: pkt-line.c:169 pkt-line.c:171
c1ac5258
JX
5424msgid "packet write with format failed"
5425msgstr "格式化包写入错误"
5426
7157c2b5 5427#: pkt-line.c:203
c1ac5258
JX
5428msgid "packet write failed - data exceeds max packet size"
5429msgstr "写数据包失败:数据超过了包的最大长度"
5430
7157c2b5 5431#: pkt-line.c:210 pkt-line.c:217
c1ac5258
JX
5432msgid "packet write failed"
5433msgstr "数据包写入失败"
5434
7157c2b5 5435#: pkt-line.c:302
c1ac5258
JX
5436msgid "read error"
5437msgstr "读取错误"
5438
7157c2b5 5439#: pkt-line.c:310
c1ac5258
JX
5440msgid "the remote end hung up unexpectedly"
5441msgstr "远端意外挂断了"
5442
7157c2b5 5443#: pkt-line.c:338
c1ac5258
JX
5444#, c-format
5445msgid "protocol error: bad line length character: %.4s"
5446msgstr "协议错误:错误的行长度字符串:%.4s"
5447
7157c2b5 5448#: pkt-line.c:352 pkt-line.c:357
c1ac5258
JX
5449#, c-format
5450msgid "protocol error: bad line length %d"
5451msgstr "协议错误:错误的行长度 %d"
5452
d13389bf 5453#: pkt-line.c:373 sideband.c:165
06991777
JX
5454#, c-format
5455msgid "remote error: %s"
5456msgstr "远程错误:%s"
5457
5458#: preload-index.c:119
4c27fcb5
JX
5459msgid "Refreshing index"
5460msgstr "正在刷新索引"
5461
06991777 5462#: preload-index.c:138
4c27fcb5
JX
5463#, c-format
5464msgid "unable to create threaded lstat: %s"
5465msgstr "无法创建线程 lstat:%s"
5466
d9488fea 5467#: pretty.c:983
a0b6b246
JX
5468msgid "unable to parse --pretty format"
5469msgstr "不能解析 --pretty 格式"
5470
d9488fea
JX
5471#: promisor-remote.c:30
5472msgid "promisor-remote: unable to fork off fetch subprocess"
5473msgstr "promisor-remote:无法派生 fetch 子进程"
5474
5475#: promisor-remote.c:35 promisor-remote.c:37
5476msgid "promisor-remote: could not write to fetch subprocess"
5477msgstr "promisor-remote:无法向 fetch 子进程写入"
a5cd71ca 5478
d9488fea
JX
5479#: promisor-remote.c:41
5480msgid "promisor-remote: could not close stdin to fetch subprocess"
5481msgstr "promisor-remote:无法关闭至 fetch 子进程的标准输入"
5482
5483#: promisor-remote.c:53
a5cd71ca
JX
5484#, c-format
5485msgid "promisor remote name cannot begin with '/': %s"
5486msgstr "promisor 远程名称不能以 '/' 开始:%s"
5487
349ede6a
JX
5488#: prune-packed.c:35
5489msgid "Removing duplicate objects"
5490msgstr "正在删除重复对象"
5491
5492#: range-diff.c:77
c1ac5258
JX
5493msgid "could not start `log`"
5494msgstr "不能启动 `log`"
5495
349ede6a 5496#: range-diff.c:79
c1ac5258
JX
5497msgid "could not read `log` output"
5498msgstr "不能读取 `log` 的输出"
5499
d13389bf 5500#: range-diff.c:98 sequencer.c:5310
c1ac5258
JX
5501#, c-format
5502msgid "could not parse commit '%s'"
5503msgstr "不能解析提交 '%s'"
5504
349ede6a
JX
5505#: range-diff.c:112
5506#, c-format
5507msgid ""
5508"could not parse first line of `log` output: did not start with 'commit ': "
5509"'%s'"
5510msgstr "无法解析 `log` 输出的首行:不是以 'commit ' 开头:'%s'"
5511
5512#: range-diff.c:137
a6cd2cc4
JX
5513#, c-format
5514msgid "could not parse git header '%.*s'"
5515msgstr "无法解析 git 头 '%.*s'"
5516
d13389bf 5517#: range-diff.c:299
c1ac5258
JX
5518msgid "failed to generate diff"
5519msgstr "生成 diff 失败"
5520
d13389bf 5521#: range-diff.c:532 range-diff.c:534
c1ac5258
JX
5522#, c-format
5523msgid "could not parse log for '%s'"
5524msgstr "不能解析 '%s' 的日志"
5525
d9488fea 5526#: read-cache.c:682
06991777
JX
5527#, c-format
5528msgid "will not add file alias '%s' ('%s' already exists in index)"
5529msgstr "将不会添加文件别名 '%s'('%s' 已经存在于索引中)"
5530
d9488fea 5531#: read-cache.c:698
06991777
JX
5532msgid "cannot create an empty blob in the object database"
5533msgstr "不能在对象数据库中创建空的数据对象"
5534
d9488fea 5535#: read-cache.c:720
06991777
JX
5536#, c-format
5537msgid "%s: can only add regular files, symbolic links or git-directories"
5538msgstr "%s:只能添加常规文件、符号链接或 git 目录"
5539
d9488fea 5540#: read-cache.c:725
d46c5519
JX
5541#, c-format
5542msgid "'%s' does not have a commit checked out"
5543msgstr "'%s' 没有检出一个提交"
5544
d9488fea 5545#: read-cache.c:777
06991777
JX
5546#, c-format
5547msgid "unable to index file '%s'"
5548msgstr "无法索引文件 '%s'"
5549
d9488fea 5550#: read-cache.c:796
06991777
JX
5551#, c-format
5552msgid "unable to add '%s' to index"
5553msgstr "无法在索引中添加 '%s'"
5554
d9488fea 5555#: read-cache.c:807
06991777
JX
5556#, c-format
5557msgid "unable to stat '%s'"
5558msgstr "无法对 %s 执行 stat"
5559
d9488fea 5560#: read-cache.c:1318
06991777
JX
5561#, c-format
5562msgid "'%s' appears as both a file and as a directory"
5b533632 5563msgstr "'%s' 看起来既是文件又是目录"
06991777 5564
d9488fea 5565#: read-cache.c:1524
4c27fcb5
JX
5566msgid "Refresh index"
5567msgstr "刷新索引"
5568
d9488fea 5569#: read-cache.c:1639
5b04ee3b
JX
5570#, c-format
5571msgid ""
a0b6b246
JX
5572"index.version set, but the value is invalid.\n"
5573"Using version %i"
5b04ee3b 5574msgstr ""
a0b6b246
JX
5575"设置了 index.version,但是取值无效。\n"
5576"使用版本 %i"
5b04ee3b 5577
d9488fea 5578#: read-cache.c:1649
5b04ee3b
JX
5579#, c-format
5580msgid ""
a0b6b246
JX
5581"GIT_INDEX_VERSION set, but the value is invalid.\n"
5582"Using version %i"
5b04ee3b 5583msgstr ""
a0b6b246
JX
5584"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
5585"使用版本 %i"
5b04ee3b 5586
d9488fea 5587#: read-cache.c:1705
06991777
JX
5588#, c-format
5589msgid "bad signature 0x%08x"
5590msgstr "坏的签名 0x%08x"
5591
d9488fea 5592#: read-cache.c:1708
06991777
JX
5593#, c-format
5594msgid "bad index version %d"
5595msgstr "坏的索引版本 %d"
5596
d9488fea 5597#: read-cache.c:1717
06991777 5598msgid "bad index file sha1 signature"
5b533632 5599msgstr "坏的索引文件 sha1 签名"
06991777 5600
d9488fea 5601#: read-cache.c:1747
06991777
JX
5602#, c-format
5603msgid "index uses %.4s extension, which we do not understand"
5604msgstr "索引使用不被支持的 %.4s 扩展"
5605
5606#
d9488fea 5607#: read-cache.c:1749
06991777
JX
5608#, c-format
5609msgid "ignoring %.4s extension"
5610msgstr "忽略 %.4s 扩展"
5611
d9488fea 5612#: read-cache.c:1786
06991777
JX
5613#, c-format
5614msgid "unknown index entry format 0x%08x"
5615msgstr "未知的索引条目格式 0x%08x"
5616
d9488fea 5617#: read-cache.c:1802
4c27fcb5
JX
5618#, c-format
5619msgid "malformed name field in the index, near path '%s'"
5620msgstr "索引中靠近路径 '%s' 有错误的名称字段"
5621
d9488fea 5622#: read-cache.c:1859
06991777
JX
5623msgid "unordered stage entries in index"
5624msgstr "索引中有未排序的暂存条目"
5625
d9488fea 5626#: read-cache.c:1862
06991777
JX
5627#, c-format
5628msgid "multiple stage entries for merged file '%s'"
5629msgstr "合并文件 '%s' 有多个暂存条目"
5630
d9488fea 5631#: read-cache.c:1865
06991777
JX
5632#, c-format
5633msgid "unordered stage entries for '%s'"
5634msgstr "'%s' 的未排序暂存条目"
5635
d9488fea
JX
5636#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111
5637#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181
d13389bf
JX
5638#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991
5639#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507
d9488fea 5640#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290
2b472aae 5641#: builtin/submodule--helper.c:332
4c27fcb5
JX
5642msgid "index file corrupt"
5643msgstr "索引文件损坏"
5644
d9488fea 5645#: read-cache.c:2115
4c27fcb5
JX
5646#, c-format
5647msgid "unable to create load_cache_entries thread: %s"
5648msgstr "无法创建 load_cache_entries 线程:%s"
5649
d9488fea 5650#: read-cache.c:2128
4c27fcb5
JX
5651#, c-format
5652msgid "unable to join load_cache_entries thread: %s"
5653msgstr "无法加入 load_cache_entries 线程:%s"
5654
d9488fea 5655#: read-cache.c:2161
06991777
JX
5656#, c-format
5657msgid "%s: index file open failed"
5658msgstr "%s:打开索引文件失败"
5659
d9488fea 5660#: read-cache.c:2165
06991777
JX
5661#, c-format
5662msgid "%s: cannot stat the open index"
5663msgstr "%s:不能对打开的索引执行 stat 操作"
5664
d9488fea 5665#: read-cache.c:2169
06991777
JX
5666#, c-format
5667msgid "%s: index file smaller than expected"
5668msgstr "%s:索引文件比预期的小"
5669
d9488fea 5670#: read-cache.c:2173
06991777
JX
5671#, c-format
5672msgid "%s: unable to map index file"
5673msgstr "%s:无法对索引文件执行 map 操作"
5674
d9488fea 5675#: read-cache.c:2215
4c27fcb5
JX
5676#, c-format
5677msgid "unable to create load_index_extensions thread: %s"
5678msgstr "无法创建 load_index_extensions 线程:%s"
5679
d9488fea 5680#: read-cache.c:2242
4c27fcb5
JX
5681#, c-format
5682msgid "unable to join load_index_extensions thread: %s"
5683msgstr "无法加入 load_index_extensions 线程:%s"
5684
d9488fea 5685#: read-cache.c:2274
06991777
JX
5686#, c-format
5687msgid "could not freshen shared index '%s'"
5688msgstr "无法刷新共享索引 '%s'"
5689
d9488fea 5690#: read-cache.c:2321
06991777
JX
5691#, c-format
5692msgid "broken index, expect %s in %s, got %s"
5693msgstr "损坏的索引,期望在 %2$s 中的 %1$s,得到 %3$s"
5694
d13389bf 5695#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140
a4f16749
JX
5696#, c-format
5697msgid "could not close '%s'"
5698msgstr "不能关闭 '%s'"
5699
d13389bf 5700#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231
87cb7997 5701#, c-format
60638e98 5702msgid "could not stat '%s'"
65e2041e 5703msgstr "不能对 '%s' 调用 stat"
87cb7997 5704
d9488fea 5705#: read-cache.c:3133
87cb7997
JX
5706#, c-format
5707msgid "unable to open git dir: %s"
5708msgstr "不能打开 git 目录:%s"
5709
d9488fea 5710#: read-cache.c:3145
87cb7997
JX
5711#, c-format
5712msgid "unable to unlink: %s"
5713msgstr "无法删除:%s"
5714
d9488fea 5715#: read-cache.c:3170
06991777
JX
5716#, c-format
5717msgid "cannot fix permission bits on '%s'"
5718msgstr "不能修复 '%s' 的权限位"
5719
d9488fea 5720#: read-cache.c:3319
06991777
JX
5721#, c-format
5722msgid "%s: cannot drop to stage #0"
5723msgstr "%s:不能落到暂存区 #0"
5724
2b472aae
JX
5725#: rebase-interactive.c:11
5726msgid ""
5727"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
5728"continue'.\n"
5729"Or you can abort the rebase with 'git rebase --abort'.\n"
5730msgstr ""
5731"您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n"
5732"或者您可以用 'git rebase --abort' 终止变基。\n"
5733
5734#: rebase-interactive.c:33
d46c5519
JX
5735#, c-format
5736msgid ""
5737"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
5738msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
5739
2b472aae 5740#: rebase-interactive.c:42
4c27fcb5
JX
5741msgid ""
5742"\n"
5743"Commands:\n"
5744"p, pick <commit> = use commit\n"
5745"r, reword <commit> = use commit, but edit the commit message\n"
5746"e, edit <commit> = use commit, but stop for amending\n"
5747"s, squash <commit> = use commit, but meld into previous commit\n"
5748"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
5749"x, exec <command> = run command (the rest of the line) using shell\n"
5750"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
5751"d, drop <commit> = remove commit\n"
5752"l, label <label> = label current HEAD with a name\n"
5753"t, reset <label> = reset HEAD to a label\n"
5754"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
5755". create a merge commit using the original merge commit's\n"
5756". message (or the oneline, if no original merge commit was\n"
5757". specified). Use -c <commit> to reword the commit message.\n"
5758"\n"
5759"These lines can be re-ordered; they are executed from top to bottom.\n"
5760msgstr ""
5761"\n"
5762"命令:\n"
5763"p, pick <提交> = 使用提交\n"
5764"r, reword <提交> = 使用提交,但修改提交说明\n"
5765"e, edit <提交> = 使用提交,进入 shell 以便进行提交修补\n"
5766"s, squash <提交> = 使用提交,但融合到前一个提交\n"
5767"f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
5768"x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
5769"b, break = 在此处停止(使用 'git rebase --continue' 继续变基)\n"
5770"d, drop <提交> = 删除提交\n"
5771"l, label <label> = 为当前 HEAD 打上标记\n"
5772"t, reset <label> = 重置 HEAD 到该标记\n"
5773"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
5774". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
5775". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
5776". -c <提交> 可以编辑提交说明。\n"
5777"\n"
5778"可以对这些行重新排序,将从上至下执行。\n"
5779
2b472aae 5780#: rebase-interactive.c:63
d46c5519
JX
5781#, c-format
5782msgid "Rebase %s onto %s (%d command)"
5783msgid_plural "Rebase %s onto %s (%d commands)"
5784msgstr[0] "变基 %s 到 %s(%d 个提交)"
5785msgstr[1] "变基 %s 到 %s(%d 个提交)"
5786
d9488fea 5787#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218
4c27fcb5
JX
5788msgid ""
5789"\n"
5790"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
5791msgstr ""
5792"\n"
5793"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
5794
d9488fea 5795#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
4c27fcb5
JX
5796msgid ""
5797"\n"
5798"If you remove a line here THAT COMMIT WILL BE LOST.\n"
5799msgstr ""
5800"\n"
5801"如果您在这里删除一行,对应的提交将会丢失。\n"
5802
d9488fea 5803#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
4c27fcb5
JX
5804msgid ""
5805"\n"
5806"You are editing the todo file of an ongoing interactive rebase.\n"
5807"To continue rebase after editing, run:\n"
5808" git rebase --continue\n"
5809"\n"
5810msgstr ""
5811"\n"
5812"您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基,\n"
5813"请执行:\n"
5814" git rebase --continue\n"
5815"\n"
5816
d9488fea 5817#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938
4c27fcb5
JX
5818msgid ""
5819"\n"
5820"However, if you remove everything, the rebase will be aborted.\n"
5821"\n"
5822msgstr ""
5823"\n"
5824"然而,如果您删除全部内容,变基操作将会终止。\n"
5825"\n"
5826
d13389bf
JX
5827#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607
5828#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270
4c27fcb5 5829#, c-format
d46c5519
JX
5830msgid "could not write '%s'"
5831msgstr "不能写入 '%s'"
5832
d13389bf
JX
5833#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228
5834#: builtin/rebase.c:252
d46c5519 5835#, c-format
2b472aae
JX
5836msgid "could not write '%s'."
5837msgstr "不能写入 '%s'。"
d46c5519 5838
2b472aae 5839#: rebase-interactive.c:193
d46c5519
JX
5840#, c-format
5841msgid ""
5842"Warning: some commits may have been dropped accidentally.\n"
5843"Dropped commits (newer to older):\n"
5844msgstr ""
5845"警告:一些提交可能被意外丢弃。\n"
5846"丢弃的提交(从新到旧):\n"
5847
2b472aae 5848#: rebase-interactive.c:200
d46c5519
JX
5849#, c-format
5850msgid ""
5851"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
5852"\n"
5853"Use 'git config rebase.missingCommitsCheck' to change the level of "
5854"warnings.\n"
5855"The possible behaviours are: ignore, warn, error.\n"
5856"\n"
5857msgstr ""
5858"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
5859"\n"
5860"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
5861"可选值有:ignore、warn、error。\n"
5862"\n"
4c27fcb5 5863
d13389bf
JX
5864#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394
5865#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239
5866#: builtin/rebase.c:264
2b472aae
JX
5867#, c-format
5868msgid "could not read '%s'."
5869msgstr "不能读取 '%s'。"
5870
d9488fea 5871#: ref-filter.c:42 wt-status.c:1973
349ede6a
JX
5872msgid "gone"
5873msgstr "丢失"
c1ac5258 5874
349ede6a 5875#: ref-filter.c:43
c1ac5258 5876#, c-format
349ede6a
JX
5877msgid "ahead %d"
5878msgstr "领先 %d"
c1ac5258 5879
349ede6a 5880#: ref-filter.c:44
c1ac5258 5881#, c-format
349ede6a
JX
5882msgid "behind %d"
5883msgstr "落后 %d"
c1ac5258 5884
349ede6a 5885#: ref-filter.c:45
c1ac5258 5886#, c-format
349ede6a
JX
5887msgid "ahead %d, behind %d"
5888msgstr "领先 %d,落后 %d"
c1ac5258 5889
d9488fea 5890#: ref-filter.c:169
c1ac5258 5891#, c-format
349ede6a
JX
5892msgid "expected format: %%(color:<color>)"
5893msgstr "期望的格式:%%(color:<颜色>)"
c1ac5258 5894
d9488fea 5895#: ref-filter.c:171
c1ac5258 5896#, c-format
349ede6a
JX
5897msgid "unrecognized color: %%(color:%s)"
5898msgstr "未能识别的颜色:%%(color:%s)"
c1ac5258 5899
d9488fea 5900#: ref-filter.c:193
c1ac5258 5901#, c-format
349ede6a
JX
5902msgid "Integer value expected refname:lstrip=%s"
5903msgstr "期望整数值 refname:lstrip=%s"
c1ac5258 5904
d9488fea 5905#: ref-filter.c:197
c1ac5258 5906#, c-format
349ede6a
JX
5907msgid "Integer value expected refname:rstrip=%s"
5908msgstr "期望整数值 refname:rstrip=%s"
c1ac5258 5909
d9488fea 5910#: ref-filter.c:199
5b04ee3b 5911#, c-format
349ede6a
JX
5912msgid "unrecognized %%(%s) argument: %s"
5913msgstr "未能识别的 %%(%s) 参数:%s"
5b04ee3b 5914
d9488fea 5915#: ref-filter.c:254
c1ac5258 5916#, c-format
349ede6a
JX
5917msgid "%%(objecttype) does not take arguments"
5918msgstr "%%(objecttype) 不带参数"
c1ac5258 5919
d9488fea 5920#: ref-filter.c:276
c1ac5258 5921#, c-format
349ede6a
JX
5922msgid "unrecognized %%(objectsize) argument: %s"
5923msgstr "未能识别的 %%(objectsize) 参数:%s"
c1ac5258 5924
d9488fea 5925#: ref-filter.c:284
c1ac5258 5926#, c-format
349ede6a
JX
5927msgid "%%(deltabase) does not take arguments"
5928msgstr "%%(deltabase) 不带参数"
c1ac5258 5929
d9488fea 5930#: ref-filter.c:296
c1ac5258 5931#, c-format
349ede6a
JX
5932msgid "%%(body) does not take arguments"
5933msgstr "%%(body) 不带参数"
c1ac5258 5934
d9488fea 5935#: ref-filter.c:309
c1ac5258 5936#, c-format
d9488fea
JX
5937msgid "unrecognized %%(subject) argument: %s"
5938msgstr "未能识别的 %%(subject) 参数:%s"
c1ac5258 5939
d9488fea 5940#: ref-filter.c:330
1a79b2f1 5941#, c-format
6937cb4e
JX
5942msgid "unknown %%(trailers) argument: %s"
5943msgstr "未知的 %%(trailers) 参数:%s"
1a79b2f1 5944
d9488fea 5945#: ref-filter.c:363
a0b6b246
JX
5946#, c-format
5947msgid "positive value expected contents:lines=%s"
87cb7997 5948msgstr "期望一个正数 contents:lines=%s"
90314792 5949
d9488fea 5950#: ref-filter.c:365
a0b6b246
JX
5951#, c-format
5952msgid "unrecognized %%(contents) argument: %s"
5953msgstr "未能识别的 %%(contents) 参数:%s"
90314792 5954
d9488fea
JX
5955#: ref-filter.c:380
5956#, c-format
5957msgid "positive value expected '%s' in %%(%s)"
5958msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数"
5959
5960#: ref-filter.c:384
87cb7997 5961#, c-format
d9488fea
JX
5962msgid "unrecognized argument '%s' in %%(%s)"
5963msgstr "未能识别 %%(%2$s) 中的参数 '%1$s'"
87cb7997 5964
d9488fea 5965#: ref-filter.c:398
a0b6b246 5966#, c-format
d9488fea
JX
5967msgid "unrecognized email option: %s"
5968msgstr "未识别的邮件选项:%s"
90314792 5969
d9488fea 5970#: ref-filter.c:428
a0b6b246
JX
5971#, c-format
5972msgid "expected format: %%(align:<width>,<position>)"
58b6f078 5973msgstr "期望的格式:%%(align:<宽度>,<位置>)"
90314792 5974
d9488fea 5975#: ref-filter.c:440
5c57d762 5976#, c-format
a0b6b246
JX
5977msgid "unrecognized position:%s"
5978msgstr "未能识别的位置:%s"
5c57d762 5979
d9488fea 5980#: ref-filter.c:447
1b7f4a34 5981#, c-format
a0b6b246
JX
5982msgid "unrecognized width:%s"
5983msgstr "未能识别的宽度:%s"
1b7f4a34 5984
d9488fea 5985#: ref-filter.c:456
1b7f4a34 5986#, c-format
a0b6b246
JX
5987msgid "unrecognized %%(align) argument: %s"
5988msgstr "未能识别的 %%(align) 参数:%s"
1b7f4a34 5989
d9488fea 5990#: ref-filter.c:464
1b7f4a34 5991#, c-format
a0b6b246
JX
5992msgid "positive width expected with the %%(align) atom"
5993msgstr "元素 %%(align) 需要一个正数的宽度"
1b7f4a34 5994
d9488fea 5995#: ref-filter.c:482
87cb7997
JX
5996#, c-format
5997msgid "unrecognized %%(if) argument: %s"
5998msgstr "未能识别的 %%(if) 参数:%s"
5999
d9488fea 6000#: ref-filter.c:584
07432cef 6001#, c-format
a0b6b246 6002msgid "malformed field name: %.*s"
fd8cb379 6003msgstr "格式错误的字段名:%.*s"
ef317cd5 6004
d9488fea 6005#: ref-filter.c:611
a0b6b246
JX
6006#, c-format
6007msgid "unknown field name: %.*s"
6008msgstr "未知的字段名:%.*s"
220c313c 6009
d9488fea 6010#: ref-filter.c:615
4c27fcb5
JX
6011#, c-format
6012msgid ""
6013"not a git repository, but the field '%.*s' requires access to object data"
d9488fea 6014msgstr "不是 git 仓库,但是字段 '%.*s' 需要访问对象数据"
4c27fcb5 6015
d9488fea 6016#: ref-filter.c:739
87cb7997
JX
6017#, c-format
6018msgid "format: %%(if) atom used without a %%(then) atom"
6019msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
6020
d9488fea 6021#: ref-filter.c:802
87cb7997
JX
6022#, c-format
6023msgid "format: %%(then) atom used without an %%(if) atom"
6024msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
6025
d9488fea 6026#: ref-filter.c:804
87cb7997
JX
6027#, c-format
6028msgid "format: %%(then) atom used more than once"
6029msgstr "格式:%%(then) 元素用了多次"
6030
d9488fea 6031#: ref-filter.c:806
87cb7997
JX
6032#, c-format
6033msgid "format: %%(then) atom used after %%(else)"
6034msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
6035
d9488fea 6036#: ref-filter.c:834
87cb7997
JX
6037#, c-format
6038msgid "format: %%(else) atom used without an %%(if) atom"
6039msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
6040
d9488fea 6041#: ref-filter.c:836
87cb7997
JX
6042#, c-format
6043msgid "format: %%(else) atom used without a %%(then) atom"
6044msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
6045
d9488fea 6046#: ref-filter.c:838
87cb7997
JX
6047#, c-format
6048msgid "format: %%(else) atom used more than once"
6049msgstr "格式:%%(else) 元素用了多次"
6050
d9488fea 6051#: ref-filter.c:853
7aea43ff 6052#, c-format
a0b6b246
JX
6053msgid "format: %%(end) atom used without corresponding atom"
6054msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
7aea43ff 6055
d9488fea 6056#: ref-filter.c:910
7aea43ff 6057#, c-format
a0b6b246 6058msgid "malformed format string %s"
fd8cb379 6059msgstr "错误的格式化字符串 %s"
7aea43ff 6060
d13389bf 6061#: ref-filter.c:1549
87cb7997 6062#, c-format
a6cd2cc4
JX
6063msgid "no branch, rebasing %s"
6064msgstr "非分支,正变基 %s"
c04f5ac3 6065
d13389bf 6066#: ref-filter.c:1552
c04f5ac3 6067#, c-format
a6cd2cc4
JX
6068msgid "no branch, rebasing detached HEAD %s"
6069msgstr "非分支,正变基分离头指针 %s"
c04f5ac3 6070
d13389bf 6071#: ref-filter.c:1555
a0b6b246 6072#, c-format
a6cd2cc4
JX
6073msgid "no branch, bisect started on %s"
6074msgstr "非分支,二分查找开始于 %s"
6792b93b 6075
d13389bf 6076#: ref-filter.c:1565
a6cd2cc4
JX
6077msgid "no branch"
6078msgstr "非分支"
87cb7997 6079
d13389bf 6080#: ref-filter.c:1599 ref-filter.c:1808
a0b6b246
JX
6081#, c-format
6082msgid "missing object %s for %s"
6083msgstr "缺失 %2$s 的对象 %1$s"
c04f5ac3 6084
d13389bf 6085#: ref-filter.c:1609
a0b6b246
JX
6086#, c-format
6087msgid "parse_object_buffer failed on %s for %s"
6088msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
6792b93b 6089
d13389bf 6090#: ref-filter.c:2062
a0b6b246
JX
6091#, c-format
6092msgid "malformed object at '%s'"
fd8cb379 6093msgstr "格式错误的对象 '%s'"
c04f5ac3 6094
d13389bf 6095#: ref-filter.c:2151
a0b6b246
JX
6096#, c-format
6097msgid "ignoring ref with broken name %s"
6098msgstr "忽略带有错误名称 %s 的引用"
c04f5ac3 6099
d13389bf 6100#: ref-filter.c:2156 refs.c:676
349ede6a
JX
6101#, c-format
6102msgid "ignoring broken ref %s"
6103msgstr "忽略损坏的引用 %s"
6104
d13389bf 6105#: ref-filter.c:2472
a0b6b246
JX
6106#, c-format
6107msgid "format: %%(end) atom missing"
6108msgstr "格式:缺少 %%(end) 元素"
c04f5ac3 6109
d13389bf 6110#: ref-filter.c:2571
a0b6b246
JX
6111#, c-format
6112msgid "malformed object name %s"
fd8cb379 6113msgstr "格式错误的对象名 %s"
c04f5ac3 6114
d13389bf 6115#: ref-filter.c:2576
06991777
JX
6116#, c-format
6117msgid "option `%s' must point to a commit"
6118msgstr "选项 `%s' 必须指向一个提交"
6119
7157c2b5 6120#: refs.c:264
349ede6a
JX
6121#, c-format
6122msgid "%s does not point to a valid object!"
6123msgstr "%s 没有指向一个有效的对象!"
6124
d13389bf
JX
6125#: refs.c:566
6126#, c-format
6127msgid ""
6128"Using '%s' as the name for the initial branch. This default branch name\n"
6129"is subject to change. To configure the initial branch name to use in all\n"
6130"of your new repositories, which will suppress this warning, call:\n"
6131"\n"
6132"\tgit config --global init.defaultBranch <name>\n"
6133"\n"
6134"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
6135"'development'. The just-created branch can be renamed via this command:\n"
6136"\n"
6137"\tgit branch -m <name>\n"
6138msgstr ""
6139"使用 '%s' 作为初始分支的名称。这个默认分支名称可能会更改。要在新仓库中\n"
6140"配置使用初始分支名,并消除这条警告,请执行:\n"
6141"\n"
6142"\tgit config --global init.defaultBranch <名称>\n"
6143"\n"
6144"除了 'master' 之外,通常选定的名字有 'main'、'trunk' 和 'development'。\n"
6145"可以通过以下命令重命名刚创建的分支:\n"
6146"\n"
6147"\tgit branch -m <name>\n"
6148
6149#: refs.c:588
7157c2b5
JX
6150#, c-format
6151msgid "could not retrieve `%s`"
6152msgstr "无法获取 `%s`"
6153
d13389bf 6154#: refs.c:598
7157c2b5
JX
6155#, c-format
6156msgid "invalid branch name: %s = %s"
6157msgstr "无效的分支名:%s = %s"
6158
d13389bf 6159#: refs.c:674
349ede6a
JX
6160#, c-format
6161msgid "ignoring dangling symref %s"
6162msgstr "忽略悬空符号引用 %s"
6163
d13389bf 6164#: refs.c:911
349ede6a
JX
6165#, c-format
6166msgid "log for ref %s has gap after %s"
6167msgstr "引用 %s 的日志在 %s 之后有缺口"
6168
d13389bf 6169#: refs.c:917
349ede6a
JX
6170#, c-format
6171msgid "log for ref %s unexpectedly ended on %s"
6172msgstr "引用 %s 的日志意外终止于 %s "
6173
d13389bf 6174#: refs.c:976
349ede6a
JX
6175#, c-format
6176msgid "log for %s is empty"
6177msgstr "%s 的日志为空"
6178
d13389bf 6179#: refs.c:1068
349ede6a
JX
6180#, c-format
6181msgid "refusing to update ref with bad name '%s'"
6182msgstr "拒绝更新有错误名称 '%s' 的引用"
6183
d13389bf 6184#: refs.c:1139
349ede6a
JX
6185#, c-format
6186msgid "update_ref failed for ref '%s': %s"
6187msgstr "对引用 '%s' 执行 update_ref 失败:%s"
6188
d13389bf 6189#: refs.c:1963
349ede6a
JX
6190#, c-format
6191msgid "multiple updates for ref '%s' not allowed"
6192msgstr "不允许对引用 '%s' 多次更新"
6193
d13389bf 6194#: refs.c:2043
349ede6a
JX
6195msgid "ref updates forbidden inside quarantine environment"
6196msgstr "在隔离环境中禁止更新引用"
6197
d13389bf 6198#: refs.c:2054
7157c2b5
JX
6199msgid "ref updates aborted by hook"
6200msgstr "引用更新被钩子中止"
6201
d13389bf 6202#: refs.c:2154 refs.c:2184
349ede6a
JX
6203#, c-format
6204msgid "'%s' exists; cannot create '%s'"
6205msgstr "'%s' 已存在,无法创建 '%s'"
6206
d13389bf 6207#: refs.c:2160 refs.c:2195
349ede6a
JX
6208#, c-format
6209msgid "cannot process '%s' and '%s' at the same time"
6210msgstr "无法同时处理 '%s' 和 '%s'"
6211
d9488fea 6212#: refs/files-backend.c:1228
349ede6a
JX
6213#, c-format
6214msgid "could not remove reference %s"
6215msgstr "无法删除引用 %s"
6216
d9488fea
JX
6217#: refs/files-backend.c:1242 refs/packed-backend.c:1542
6218#: refs/packed-backend.c:1552
349ede6a
JX
6219#, c-format
6220msgid "could not delete reference %s: %s"
6221msgstr "无法删除引用 %s:%s"
6222
d9488fea 6223#: refs/files-backend.c:1245 refs/packed-backend.c:1555
349ede6a
JX
6224#, c-format
6225msgid "could not delete references: %s"
6226msgstr "无法删除引用:%s"
6227
d13389bf 6228#: refspec.c:170
349ede6a
JX
6229#, c-format
6230msgid "invalid refspec '%s'"
6231msgstr "无效的引用表达式:'%s'"
6232
d9488fea 6233#: remote.c:351
06991777
JX
6234#, c-format
6235msgid "config remote shorthand cannot begin with '/': %s"
5b533632 6236msgstr "配置的远程短名称不能以 '/' 开始:%s"
06991777 6237
d9488fea 6238#: remote.c:399
06991777
JX
6239msgid "more than one receivepack given, using the first"
6240msgstr "提供了一个以上的 receivepack,使用第一个"
6241
d9488fea 6242#: remote.c:407
06991777
JX
6243msgid "more than one uploadpack given, using the first"
6244msgstr "提供了一个以上的 uploadpack,使用第一个"
6245
d9488fea 6246#: remote.c:590
a0b6b246
JX
6247#, c-format
6248msgid "Cannot fetch both %s and %s to %s"
6249msgstr "不能同时获取 %s 和 %s 至 %s"
c04f5ac3 6250
d9488fea 6251#: remote.c:594
c04f5ac3 6252#, c-format
a0b6b246
JX
6253msgid "%s usually tracks %s, not %s"
6254msgstr "%s 通常跟踪 %s,而非 %s"
c04f5ac3 6255
d9488fea 6256#: remote.c:598
a0b6b246
JX
6257#, c-format
6258msgid "%s tracks both %s and %s"
6259msgstr "%s 同时跟踪 %s 和 %s"
c04f5ac3 6260
d9488fea 6261#: remote.c:666
06991777
JX
6262#, c-format
6263msgid "key '%s' of pattern had no '*'"
6264msgstr "模式的键 '%s' 没有 '*'"
6265
d9488fea 6266#: remote.c:676
06991777
JX
6267#, c-format
6268msgid "value '%s' of pattern has no '*'"
6269msgstr "模式的值 '%s' 没有 '*'"
6270
d9488fea 6271#: remote.c:1073
06991777
JX
6272#, c-format
6273msgid "src refspec %s does not match any"
6274msgstr "源引用表达式 %s 没有匹配"
6275
d9488fea 6276#: remote.c:1078
06991777
JX
6277#, c-format
6278msgid "src refspec %s matches more than one"
6279msgstr "源引用表达式 %s 匹配超过一个"
6280
6281#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
6282#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
6283#. the <src>.
6284#.
d9488fea 6285#: remote.c:1093
06991777
JX
6286#, c-format
6287msgid ""
6288"The destination you provided is not a full refname (i.e.,\n"
6289"starting with \"refs/\"). We tried to guess what you meant by:\n"
6290"\n"
6291"- Looking for a ref that matches '%s' on the remote side.\n"
6292"- Checking if the <src> being pushed ('%s')\n"
6293" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
6294" refs/{heads,tags}/ prefix on the remote side.\n"
6295"\n"
6296"Neither worked, so we gave up. You must fully qualify the ref."
6297msgstr ""
6298"您提供的目标不是一个完整的引用名称(即以 \"refs/\" 开头)。我们\n"
6299"试着猜测您的想法:\n"
6300"\n"
6301"- 在远端查询和 '%s' 匹配的引用。\n"
6302"- 检查要推送的 <src>('%s')是不是在 \"refs/{heads,tags}/\" 中的\n"
6303" 引用。如果是,我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n"
6304"\n"
6305"都不行,所以我们已放弃。您必须给出完整的引用。"
6306
d9488fea 6307#: remote.c:1113
06991777
JX
6308#, c-format
6309msgid ""
6310"The <src> part of the refspec is a commit object.\n"
6311"Did you mean to create a new branch by pushing to\n"
6312"'%s:refs/heads/%s'?"
6313msgstr ""
6314"引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
6315"'%s:refs/heads/%s' 推送么?"
6316
d9488fea 6317#: remote.c:1118
06991777
JX
6318#, c-format
6319msgid ""
6320"The <src> part of the refspec is a tag object.\n"
6321"Did you mean to create a new tag by pushing to\n"
6322"'%s:refs/tags/%s'?"
6323msgstr ""
6324"引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
6325"'%s:refs/tags/%s' 推送么?"
6326
d9488fea 6327#: remote.c:1123
06991777
JX
6328#, c-format
6329msgid ""
6330"The <src> part of the refspec is a tree object.\n"
6331"Did you mean to tag a new tree by pushing to\n"
6332"'%s:refs/tags/%s'?"
6333msgstr ""
6334"引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
6335"'%s:refs/tags/%s' 推送么?"
6336
d9488fea 6337#: remote.c:1128
06991777
JX
6338#, c-format
6339msgid ""
6340"The <src> part of the refspec is a blob object.\n"
6341"Did you mean to tag a new blob by pushing to\n"
6342"'%s:refs/tags/%s'?"
6343msgstr ""
6344"引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
6345"'%s:refs/tags/%s' 推送么?"
6346
d9488fea 6347#: remote.c:1164
06991777
JX
6348#, c-format
6349msgid "%s cannot be resolved to branch"
6350msgstr "%s 无法被解析为分支"
6351
d9488fea 6352#: remote.c:1175
06991777
JX
6353#, c-format
6354msgid "unable to delete '%s': remote ref does not exist"
8e4e0555 6355msgstr "无法删除 '%s':远程引用不存在"
06991777 6356
d9488fea 6357#: remote.c:1187
06991777
JX
6358#, c-format
6359msgid "dst refspec %s matches more than one"
6360msgstr "目标引用表达式 %s 匹配超过一个"
6361
d9488fea 6362#: remote.c:1194
06991777
JX
6363#, c-format
6364msgid "dst ref %s receives from more than one src"
6365msgstr "目标引用 %s 接收超过一个源"
c04f5ac3 6366
d13389bf 6367#: remote.c:1714 remote.c:1815
a0b6b246
JX
6368msgid "HEAD does not point to a branch"
6369msgstr "HEAD 没有指向一个分支"
c04f5ac3 6370
d13389bf 6371#: remote.c:1723
a0b6b246
JX
6372#, c-format
6373msgid "no such branch: '%s'"
6374msgstr "没有此分支:'%s'"
c04f5ac3 6375
d13389bf 6376#: remote.c:1726
a0b6b246
JX
6377#, c-format
6378msgid "no upstream configured for branch '%s'"
6379msgstr "尚未给分支 '%s' 设置上游"
c04f5ac3 6380
d13389bf 6381#: remote.c:1732
a0b6b246
JX
6382#, c-format
6383msgid "upstream branch '%s' not stored as a remote-tracking branch"
6384msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
c04f5ac3 6385
d13389bf 6386#: remote.c:1747
a0b6b246
JX
6387#, c-format
6388msgid "push destination '%s' on remote '%s' has no local tracking branch"
6389msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
c04f5ac3 6390
d13389bf 6391#: remote.c:1759
a0b6b246
JX
6392#, c-format
6393msgid "branch '%s' has no remote for pushing"
6394msgstr "分支 '%s' 没有设置要推送的远程服务器"
cfff71a9 6395
d13389bf 6396#: remote.c:1769
a0b6b246
JX
6397#, c-format
6398msgid "push refspecs for '%s' do not include '%s'"
6399msgstr "向 '%s' 推送引用规格未包含 '%s'"
cfff71a9 6400
d13389bf 6401#: remote.c:1782
a0b6b246
JX
6402msgid "push has no destination (push.default is 'nothing')"
6403msgstr "推送无目标(push.default 是 'nothing')"
cfff71a9 6404
d13389bf 6405#: remote.c:1804
a0b6b246
JX
6406msgid "cannot resolve 'simple' push to a single destination"
6407msgstr "无法解析 'simple' 推送至一个单独的目标"
6c94aba5 6408
d13389bf 6409#: remote.c:1933
06991777
JX
6410#, c-format
6411msgid "couldn't find remote ref %s"
8e4e0555 6412msgstr "无法找到远程引用 %s"
06991777 6413
d13389bf 6414#: remote.c:1946
06991777
JX
6415#, c-format
6416msgid "* Ignoring funny ref '%s' locally"
6417msgstr "* 在本地忽略可笑的引用 '%s'"
6418
d13389bf 6419#: remote.c:2109
a0b6b246
JX
6420#, c-format
6421msgid "Your branch is based on '%s', but the upstream is gone.\n"
6422msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
6c94aba5 6423
d13389bf 6424#: remote.c:2113
a0b6b246
JX
6425msgid " (use \"git branch --unset-upstream\" to fixup)\n"
6426msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
6c94aba5 6427
d13389bf 6428#: remote.c:2116
a0b6b246 6429#, c-format
6937cb4e 6430msgid "Your branch is up to date with '%s'.\n"
a0b6b246 6431msgstr "您的分支与上游分支 '%s' 一致。\n"
cfff71a9 6432
d13389bf 6433#: remote.c:2120
31e5e17b
JX
6434#, c-format
6435msgid "Your branch and '%s' refer to different commits.\n"
6436msgstr "您的分支和 '%s' 指向不同的提交。\n"
6437
d13389bf 6438#: remote.c:2123
31e5e17b
JX
6439#, c-format
6440msgid " (use \"%s\" for details)\n"
6441msgstr " (使用 \"%s\" 查看详情)\n"
6442
d13389bf 6443#: remote.c:2127
a0b6b246
JX
6444#, c-format
6445msgid "Your branch is ahead of '%s' by %d commit.\n"
6446msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
6447msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
6448msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
cfff71a9 6449
d13389bf 6450#: remote.c:2133
a0b6b246
JX
6451msgid " (use \"git push\" to publish your local commits)\n"
6452msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
c04f5ac3 6453
d13389bf 6454#: remote.c:2136
a0b6b246
JX
6455#, c-format
6456msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
6457msgid_plural ""
6458"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
6459msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
6460msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 6461
a0b6b246 6462# 译者:注意保持前导空格
d13389bf 6463#: remote.c:2144
a0b6b246
JX
6464msgid " (use \"git pull\" to update your local branch)\n"
6465msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
c04f5ac3 6466
d13389bf 6467#: remote.c:2147
a0b6b246
JX
6468#, c-format
6469msgid ""
6470"Your branch and '%s' have diverged,\n"
6471"and have %d and %d different commit each, respectively.\n"
6472msgid_plural ""
6473"Your branch and '%s' have diverged,\n"
6474"and have %d and %d different commits each, respectively.\n"
6475msgstr[0] ""
6476"您的分支和 '%s' 出现了偏离,\n"
6477"并且分别有 %d 和 %d 处不同的提交。\n"
6478msgstr[1] ""
6479"您的分支和 '%s' 出现了偏离,\n"
6480"并且分别有 %d 和 %d 处不同的提交。\n"
90314792 6481
a0b6b246 6482# 译者:注意保持前导空格
d13389bf 6483#: remote.c:2157
a0b6b246
JX
6484msgid " (use \"git pull\" to merge the remote branch into yours)\n"
6485msgstr " (使用 \"git pull\" 来合并远程分支)\n"
90314792 6486
d13389bf 6487#: remote.c:2349
06991777
JX
6488#, c-format
6489msgid "cannot parse expected object name '%s'"
6490msgstr "无法解析期望的对象名 '%s'"
6491
4c27fcb5 6492#: replace-object.c:21
c1ac5258
JX
6493#, c-format
6494msgid "bad replace ref name: %s"
6495msgstr "错误的替换引用名称:%s"
6496
4c27fcb5 6497#: replace-object.c:30
c1ac5258
JX
6498#, c-format
6499msgid "duplicate replace ref: %s"
6500msgstr "重复的替换引用:%s"
6501
2b472aae 6502#: replace-object.c:82
c1ac5258
JX
6503#, c-format
6504msgid "replace depth too high for object %s"
6505msgstr "对象 %s 的替换层级太深"
6506
4c27fcb5
JX
6507#: rerere.c:217 rerere.c:226 rerere.c:229
6508msgid "corrupt MERGE_RR"
6509msgstr "损坏的 MERGE_RR"
6510
6511#: rerere.c:264 rerere.c:269
6512msgid "unable to write rerere record"
6513msgstr "无法写入 rerere 记录"
cfff71a9 6514
4c27fcb5
JX
6515#: rerere.c:495
6516#, c-format
6517msgid "there were errors while writing '%s' (%s)"
6518msgstr "写入 '%s' (%s) 时出错"
6792b93b 6519
4c27fcb5
JX
6520#: rerere.c:498
6521#, c-format
6522msgid "failed to flush '%s'"
6523msgstr "刷新 '%s' 失败"
5c57d762 6524
4c27fcb5 6525#: rerere.c:503 rerere.c:1039
5809aa05 6526#, c-format
4c27fcb5
JX
6527msgid "could not parse conflict hunks in '%s'"
6528msgstr "不能解析 '%s' 中的冲突块"
5809aa05 6529
4c27fcb5
JX
6530#: rerere.c:684
6531#, c-format
6532msgid "failed utime() on '%s'"
6533msgstr "在 '%s' 上调用 utime() 失败"
31e5e17b 6534
4c27fcb5 6535#: rerere.c:694
87cb7997 6536#, c-format
4c27fcb5
JX
6537msgid "writing '%s' failed"
6538msgstr "写入 '%s' 失败"
87cb7997 6539
4c27fcb5 6540#: rerere.c:714
87cb7997 6541#, c-format
4c27fcb5
JX
6542msgid "Staged '%s' using previous resolution."
6543msgstr "使用之前的解决方案暂存 '%s'。"
87cb7997 6544
4c27fcb5
JX
6545#: rerere.c:753
6546#, c-format
6547msgid "Recorded resolution for '%s'."
6548msgstr "已记录 '%s' 的解决方案。"
6792b93b 6549
4c27fcb5
JX
6550#: rerere.c:788
6551#, c-format
6552msgid "Resolved '%s' using previous resolution."
6553msgstr "使用之前的解决方案解决 '%s'。"
6554
6555#: rerere.c:803
6556#, c-format
6557msgid "cannot unlink stray '%s'"
6558msgstr "不能删除 stray '%s'"
6559
6560#: rerere.c:807
6561#, c-format
6562msgid "Recorded preimage for '%s'"
6563msgstr "为 '%s' 记录 preimage"
6564
d13389bf 6565#: rerere.c:881 submodule.c:2082 builtin/log.c:1992
d9488fea 6566#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
4c27fcb5
JX
6567#, c-format
6568msgid "could not create directory '%s'"
6569msgstr "不能创建目录 '%s'"
6570
6571#: rerere.c:1057
6572#, c-format
6573msgid "failed to update conflicted state in '%s'"
6574msgstr "更新 '%s' 中的冲突状态失败"
6575
6576#: rerere.c:1068 rerere.c:1075
6577#, c-format
6578msgid "no remembered resolution for '%s'"
6579msgstr "没有为 '%s' 记忆的解决方案"
6580
6581#: rerere.c:1077
6582#, c-format
6583msgid "cannot unlink '%s'"
6584msgstr "不能删除 '%s'"
6585
6586#: rerere.c:1087
6587#, c-format
6588msgid "Updated preimage for '%s'"
6589msgstr "已为 '%s' 更新 preimage"
6590
6591#: rerere.c:1096
6592#, c-format
6593msgid "Forgot resolution for '%s'\n"
6594msgstr "忘记 '%s' 的解决方案\n"
6595
6596#: rerere.c:1199
6597msgid "unable to open rr-cache directory"
6598msgstr "不能打开 rr-cache 目录"
6599
349ede6a
JX
6600#: reset.c:42
6601msgid "could not determine HEAD revision"
6602msgstr "不能确定 HEAD 版本"
6603
d13389bf 6604#: reset.c:70 reset.c:76 sequencer.c:3460
349ede6a
JX
6605#, c-format
6606msgid "failed to find tree of %s"
6607msgstr "无法找到 %s 指向的树。"
6608
d13389bf 6609#: revision.c:2336
d9488fea
JX
6610msgid "--unpacked=<packfile> no longer supported"
6611msgstr "不再支持 --unpacked=<packfile>"
6612
d13389bf 6613#: revision.c:2356
d9488fea
JX
6614#, c-format
6615msgid "unknown value for --diff-merges: %s"
6616msgstr "未知的 --diff-merges 取值:%s"
6617
d13389bf 6618#: revision.c:2694
4c27fcb5
JX
6619msgid "your current branch appears to be broken"
6620msgstr "您的当前分支好像被损坏"
6621
d13389bf 6622#: revision.c:2697
4c27fcb5
JX
6623#, c-format
6624msgid "your current branch '%s' does not have any commits yet"
6625msgstr "您的当前分支 '%s' 尚无任何提交"
6626
d13389bf 6627#: revision.c:2907
d46c5519
JX
6628msgid "-L does not yet support diff formats besides -p and -s"
6629msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
6630
d13389bf 6631#: run-command.c:764
4c27fcb5
JX
6632msgid "open /dev/null failed"
6633msgstr "不能打开 /dev/null"
6634
d13389bf 6635#: run-command.c:1271
4c27fcb5
JX
6636#, c-format
6637msgid "cannot create async thread: %s"
6638msgstr "不能创建 async 线程:%s"
6639
d13389bf 6640#: run-command.c:1335
4c27fcb5
JX
6641#, c-format
6642msgid ""
6643"The '%s' hook was ignored because it's not set as executable.\n"
6644"You can disable this warning with `git config advice.ignoredHook false`."
6645msgstr ""
6646"因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n"
6647"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
6648
d13389bf 6649#: send-pack.c:146
4c27fcb5
JX
6650msgid "unexpected flush packet while reading remote unpack status"
6651msgstr "读取远程解包状态时收到意外的 flush 包"
6652
d13389bf 6653#: send-pack.c:148
4c27fcb5
JX
6654#, c-format
6655msgid "unable to parse remote unpack status: %s"
6656msgstr "不能解析远程解包状态:%s"
6657
d13389bf 6658#: send-pack.c:150
4c27fcb5
JX
6659#, c-format
6660msgid "remote unpack failed: %s"
6661msgstr "远程解包失败:%s"
6662
d13389bf 6663#: send-pack.c:374
4c27fcb5
JX
6664msgid "failed to sign the push certificate"
6665msgstr "为推送证书签名失败"
6666
d13389bf 6667#: send-pack.c:467
7157c2b5
JX
6668msgid "the receiving end does not support this repository's hash algorithm"
6669msgstr "接收端不支持这个仓库的哈希算法"
6670
d13389bf 6671#: send-pack.c:476
a0b6b246
JX
6672msgid "the receiving end does not support --signed push"
6673msgstr "接收端不支持签名推送"
6792b93b 6674
d13389bf 6675#: send-pack.c:478
a0b6b246
JX
6676msgid ""
6677"not sending a push certificate since the receiving end does not support --"
6678"signed push"
6679msgstr "未发送推送证书,因为接收端不支持签名推送"
6792b93b 6680
d13389bf 6681#: send-pack.c:490
a0b6b246
JX
6682msgid "the receiving end does not support --atomic push"
6683msgstr "接收端不支持原子推送"
6792b93b 6684
d13389bf 6685#: send-pack.c:495
a0b6b246
JX
6686msgid "the receiving end does not support push options"
6687msgstr "接收端不支持推送选项"
6792b93b 6688
d13389bf 6689#: sequencer.c:195
31e5e17b
JX
6690#, c-format
6691msgid "invalid commit message cleanup mode '%s'"
6692msgstr "无效的提交信息清理模式 '%s'"
6693
d13389bf 6694#: sequencer.c:323
fd8cb379
JX
6695#, c-format
6696msgid "could not delete '%s'"
6697msgstr "无法删除 '%s'"
6698
d13389bf 6699#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385
a6cd2cc4
JX
6700#, c-format
6701msgid "could not remove '%s'"
6702msgstr "无法删除 '%s'"
6703
d13389bf 6704#: sequencer.c:353
a0b6b246
JX
6705msgid "revert"
6706msgstr "还原"
6792b93b 6707
d13389bf 6708#: sequencer.c:355
a0b6b246
JX
6709msgid "cherry-pick"
6710msgstr "拣选"
6711
d13389bf 6712#: sequencer.c:357
2b472aae
JX
6713msgid "rebase"
6714msgstr "变基"
6715
d13389bf 6716#: sequencer.c:359
1a79b2f1 6717#, c-format
c1ac5258 6718msgid "unknown action: %d"
1a79b2f1
JX
6719msgstr "未知动作:%d"
6720
d13389bf 6721#: sequencer.c:418
a0b6b246
JX
6722msgid ""
6723"after resolving the conflicts, mark the corrected paths\n"
6724"with 'git add <paths>' or 'git rm <paths>'"
6725msgstr ""
6726"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
6727"命令标记修正后的文件"
6728
d13389bf 6729#: sequencer.c:421
a0b6b246
JX
6730msgid ""
6731"after resolving the conflicts, mark the corrected paths\n"
6732"with 'git add <paths>' or 'git rm <paths>'\n"
6733"and commit the result with 'git commit'"
6734msgstr ""
6735"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
6736"对修正后的文件做标记,然后用 'git commit' 提交"
1b7f4a34 6737
d13389bf 6738#: sequencer.c:434 sequencer.c:3062
1b7f4a34 6739#, c-format
a0b6b246
JX
6740msgid "could not lock '%s'"
6741msgstr "不能锁定 '%s'"
1b7f4a34 6742
d13389bf
JX
6743#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080
6744#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631
d9488fea
JX
6745#, c-format
6746msgid "could not write to '%s'"
6747msgstr "不能写入 '%s'"
6748
d13389bf 6749#: sequencer.c:441
a0b6b246 6750#, c-format
72351d7d 6751msgid "could not write eol to '%s'"
a0b6b246 6752msgstr "不能将换行符写入 '%s'"
1b7f4a34 6753
d13389bf
JX
6754#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082
6755#: sequencer.c:3345
1b7f4a34 6756#, c-format
31e5e17b
JX
6757msgid "failed to finalize '%s'"
6758msgstr "无法完成 '%s'"
1b7f4a34 6759
d13389bf 6760#: sequencer.c:485
63af42fe 6761#, c-format
a0b6b246
JX
6762msgid "your local changes would be overwritten by %s."
6763msgstr "您的本地修改将被%s覆盖。"
63af42fe 6764
d13389bf 6765#: sequencer.c:489
a0b6b246 6766msgid "commit your changes or stash them to proceed."
a4f16749 6767msgstr "提交您的修改或贮藏后再继续。"
6792b93b 6768
d13389bf 6769#: sequencer.c:521
a0b6b246
JX
6770#, c-format
6771msgid "%s: fast-forward"
6772msgstr "%s:快进"
6792b93b 6773
d13389bf 6774#: sequencer.c:560 builtin/tag.c:566
d46c5519
JX
6775#, c-format
6776msgid "Invalid cleanup mode %s"
6777msgstr "无效的清理模式 %s"
6778
1a79b2f1 6779#. TRANSLATORS: %s will be "revert", "cherry-pick" or
2b472aae 6780#. "rebase".
1a79b2f1 6781#.
d13389bf 6782#: sequencer.c:670
a0b6b246
JX
6783#, c-format
6784msgid "%s: Unable to write new index file"
6785msgstr "%s:无法写入新索引文件"
6792b93b 6786
d13389bf 6787#: sequencer.c:687
5809aa05
JX
6788msgid "unable to update cache tree"
6789msgstr "不能更新缓存树"
6792b93b 6790
d13389bf 6791#: sequencer.c:701
fd8cb379
JX
6792msgid "could not resolve HEAD commit"
6793msgstr "不能解析 HEAD 提交"
6794
d13389bf 6795#: sequencer.c:781
4c27fcb5
JX
6796#, c-format
6797msgid "no key present in '%.*s'"
6798msgstr "在 '%.*s' 中没有 key"
6799
d13389bf 6800#: sequencer.c:792
c1ac5258 6801#, c-format
4c27fcb5
JX
6802msgid "unable to dequote value of '%s'"
6803msgstr "无法为 '%s' 的值去引号"
c1ac5258 6804
d13389bf
JX
6805#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710
6806#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908
c1ac5258 6807#, c-format
4c27fcb5
JX
6808msgid "could not open '%s' for reading"
6809msgstr "无法打开 '%s' 进行读取"
6810
d13389bf 6811#: sequencer.c:839
4c27fcb5
JX
6812msgid "'GIT_AUTHOR_NAME' already given"
6813msgstr "已经给出 'GIT_AUTHOR_NAME'"
c1ac5258 6814
d13389bf 6815#: sequencer.c:844
4c27fcb5
JX
6816msgid "'GIT_AUTHOR_EMAIL' already given"
6817msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
6818
d13389bf 6819#: sequencer.c:849
4c27fcb5
JX
6820msgid "'GIT_AUTHOR_DATE' already given"
6821msgstr "已经给出 'GIT_AUTHOR_DATE'"
6822
d13389bf 6823#: sequencer.c:853
4c27fcb5
JX
6824#, c-format
6825msgid "unknown variable '%s'"
6826msgstr "未知变量 '%s'"
6827
d13389bf 6828#: sequencer.c:858
4c27fcb5
JX
6829msgid "missing 'GIT_AUTHOR_NAME'"
6830msgstr "缺少 'GIT_AUTHOR_NAME'"
6831
d13389bf 6832#: sequencer.c:860
4c27fcb5
JX
6833msgid "missing 'GIT_AUTHOR_EMAIL'"
6834msgstr "缺少 'GIT_AUTHOR_EMAIL'"
6835
d13389bf 6836#: sequencer.c:862
4c27fcb5
JX
6837msgid "missing 'GIT_AUTHOR_DATE'"
6838msgstr "缺少 'GIT_AUTHOR_DATE'"
6839
d13389bf 6840#: sequencer.c:927
63af42fe
JX
6841#, c-format
6842msgid ""
a0b6b246
JX
6843"you have staged changes in your working tree\n"
6844"If these changes are meant to be squashed into the previous commit, run:\n"
6845"\n"
6846" git commit --amend %s\n"
6847"\n"
6848"If they are meant to go into a new commit, run:\n"
6849"\n"
6850" git commit %s\n"
6851"\n"
6852"In both cases, once you're done, continue with:\n"
6853"\n"
6854" git rebase --continue\n"
6855msgstr ""
1a79b2f1
JX
6856"您的工作区中存在已暂存的修改\n"
6857"如果这些修改需要被并入前一个提交,执行:\n"
a0b6b246
JX
6858"\n"
6859" git commit --amend %s\n"
6860"\n"
29004bbb 6861"如果这些修改要形成一个新提交,执行:\n"
a0b6b246
JX
6862"\n"
6863" git commit %s\n"
6864"\n"
6865"无论哪种情况,当您完成提交,继续执行:\n"
6866"\n"
6867" git rebase --continue\n"
6792b93b 6868
d13389bf 6869#: sequencer.c:1208
31e5e17b
JX
6870msgid "'prepare-commit-msg' hook failed"
6871msgstr "'prepare-commit-msg' 钩子失败"
6872
d13389bf 6873#: sequencer.c:1214
31e5e17b
JX
6874msgid ""
6875"Your name and email address were configured automatically based\n"
6876"on your username and hostname. Please check that they are accurate.\n"
6877"You can suppress this message by setting them explicitly. Run the\n"
6878"following command and follow the instructions in your editor to edit\n"
6879"your configuration file:\n"
6880"\n"
6881" git config --global --edit\n"
6882"\n"
6883"After doing this, you may fix the identity used for this commit with:\n"
6884"\n"
6885" git commit --amend --reset-author\n"
6886msgstr ""
6887"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6888"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
6889"中编辑您的配置文件:\n"
6890"\n"
6891" git config --global --edit\n"
6892"\n"
6893"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6894"\n"
6895" git commit --amend --reset-author\n"
6896
d13389bf 6897#: sequencer.c:1227
31e5e17b
JX
6898msgid ""
6899"Your name and email address were configured automatically based\n"
6900"on your username and hostname. Please check that they are accurate.\n"
6901"You can suppress this message by setting them explicitly:\n"
6902"\n"
6903" git config --global user.name \"Your Name\"\n"
6904" git config --global user.email you@example.com\n"
6905"\n"
6906"After doing this, you may fix the identity used for this commit with:\n"
6907"\n"
6908" git commit --amend --reset-author\n"
6909msgstr ""
6910"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6911"与否。您可以对其进行设置以免再出现本提示信息:\n"
6912"\n"
6913" git config --global user.name \"Your Name\"\n"
6914" git config --global user.email you@example.com\n"
6915"\n"
6916"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6917"\n"
6918" git commit --amend --reset-author\n"
6919
d13389bf 6920#: sequencer.c:1269
31e5e17b
JX
6921msgid "couldn't look up newly created commit"
6922msgstr "无法找到新创建的提交"
6923
d13389bf 6924#: sequencer.c:1271
31e5e17b
JX
6925msgid "could not parse newly created commit"
6926msgstr "不能解析新创建的提交"
6927
d13389bf 6928#: sequencer.c:1317
31e5e17b
JX
6929msgid "unable to resolve HEAD after creating commit"
6930msgstr "创建提交后,不能解析 HEAD"
6931
d13389bf 6932#: sequencer.c:1319
31e5e17b
JX
6933msgid "detached HEAD"
6934msgstr "分离头指针"
6935
6936# 译者:中文字符串拼接,可删除前导空格
d13389bf 6937#: sequencer.c:1323
31e5e17b
JX
6938msgid " (root-commit)"
6939msgstr "(根提交)"
6940
d13389bf 6941#: sequencer.c:1344
31e5e17b
JX
6942msgid "could not parse HEAD"
6943msgstr "不能解析 HEAD"
6944
d13389bf 6945#: sequencer.c:1346
31e5e17b
JX
6946#, c-format
6947msgid "HEAD %s is not a commit!"
6948msgstr "HEAD %s 不是一个提交!"
6949
d13389bf 6950#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577
31e5e17b
JX
6951msgid "could not parse HEAD commit"
6952msgstr "不能解析 HEAD 提交"
6953
d13389bf 6954#: sequencer.c:1403 sequencer.c:2100
31e5e17b
JX
6955msgid "unable to parse commit author"
6956msgstr "不能解析提交作者"
6957
d13389bf 6958#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701
31e5e17b
JX
6959msgid "git write-tree failed to write a tree"
6960msgstr "git write-tree 无法写入树对象"
6961
d13389bf 6962#: sequencer.c:1447 sequencer.c:1565
31e5e17b
JX
6963#, c-format
6964msgid "unable to read commit message from '%s'"
6965msgstr "不能从 '%s' 读取提交说明"
6966
d13389bf 6967#: sequencer.c:1476 sequencer.c:1508
d9488fea
JX
6968#, c-format
6969msgid "invalid author identity '%s'"
6970msgstr "无效的作者身份 '%s'"
6971
d13389bf 6972#: sequencer.c:1482
d9488fea
JX
6973msgid "corrupt author: missing date information"
6974msgstr "损坏的作者:缺失日期信息"
6975
d13389bf
JX
6976#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904
6977#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78
31e5e17b 6978msgid "failed to write commit object"
c1ac5258 6979msgstr "写提交对象失败"
31e5e17b 6980
d13389bf 6981#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198
349ede6a
JX
6982#, c-format
6983msgid "could not update %s"
6984msgstr "不能更新 %s"
6985
d13389bf 6986#: sequencer.c:1597
a0b6b246 6987#, c-format
5809aa05
JX
6988msgid "could not parse commit %s"
6989msgstr "不能解析提交 %s"
6792b93b 6990
d13389bf 6991#: sequencer.c:1602
63af42fe 6992#, c-format
5809aa05
JX
6993msgid "could not parse parent commit %s"
6994msgstr "不能解析父提交 %s"
63af42fe 6995
d13389bf 6996#: sequencer.c:1685 sequencer.c:1796
c1ac5258
JX
6997#, c-format
6998msgid "unknown command: %d"
6999msgstr "未知命令:%d"
7000
d13389bf 7001#: sequencer.c:1743 sequencer.c:1768
1a79b2f1
JX
7002#, c-format
7003msgid "This is a combination of %d commits."
7004msgstr "这是一个 %d 个提交的组合。"
7005
d13389bf 7006#: sequencer.c:1753
1a79b2f1
JX
7007msgid "need a HEAD to fixup"
7008msgstr "需要一个 HEAD 来修复"
7009
d13389bf 7010#: sequencer.c:1755 sequencer.c:3372
1a79b2f1
JX
7011msgid "could not read HEAD"
7012msgstr "不能读取 HEAD"
7013
d13389bf 7014#: sequencer.c:1757
1a79b2f1
JX
7015msgid "could not read HEAD's commit message"
7016msgstr "不能读取 HEAD 的提交说明"
7017
d13389bf 7018#: sequencer.c:1763
1a79b2f1
JX
7019#, c-format
7020msgid "cannot write '%s'"
7021msgstr "不能写 '%s'"
7022
d13389bf 7023#: sequencer.c:1770 git-rebase--preserve-merges.sh:486
1a79b2f1
JX
7024msgid "This is the 1st commit message:"
7025msgstr "这是第一个提交说明:"
7026
d13389bf 7027#: sequencer.c:1778
1a79b2f1
JX
7028#, c-format
7029msgid "could not read commit message of %s"
7030msgstr "不能读取 %s 的提交说明"
7031
d13389bf 7032#: sequencer.c:1785
1a79b2f1
JX
7033#, c-format
7034msgid "This is the commit message #%d:"
7035msgstr "这是提交说明 #%d:"
7036
d13389bf 7037#: sequencer.c:1791
1a79b2f1
JX
7038#, c-format
7039msgid "The commit message #%d will be skipped:"
7040msgstr "提交说明 #%d 将被跳过:"
7041
d13389bf 7042#: sequencer.c:1879
a0b6b246
JX
7043msgid "your index file is unmerged."
7044msgstr "您的索引文件未完成合并。"
6792b93b 7045
d13389bf 7046#: sequencer.c:1886
fd8cb379
JX
7047msgid "cannot fixup root commit"
7048msgstr "不能修复根提交"
7049
d13389bf 7050#: sequencer.c:1905
a0b6b246
JX
7051#, c-format
7052msgid "commit %s is a merge but no -m option was given."
7053msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
6792b93b 7054
d13389bf 7055#: sequencer.c:1913 sequencer.c:1921
a0b6b246
JX
7056#, c-format
7057msgid "commit %s does not have parent %d"
7058msgstr "提交 %s 没有第 %d 个父提交"
7059
d13389bf 7060#: sequencer.c:1927
1a79b2f1
JX
7061#, c-format
7062msgid "cannot get commit message for %s"
7063msgstr "不能得到 %s 的提交说明"
7064
a0b6b246
JX
7065#. TRANSLATORS: The first %s will be a "todo" command like
7066#. "revert" or "pick", the second %s a SHA1.
d13389bf 7067#: sequencer.c:1946
a0b6b246
JX
7068#, c-format
7069msgid "%s: cannot parse parent commit %s"
7070msgstr "%s:不能解析父提交 %s"
7071
d13389bf 7072#: sequencer.c:2011
a0b6b246 7073#, c-format
1a79b2f1
JX
7074msgid "could not rename '%s' to '%s'"
7075msgstr "不能将 '%s' 重命名为 '%s'"
a0b6b246 7076
d13389bf 7077#: sequencer.c:2071
a0b6b246
JX
7078#, c-format
7079msgid "could not revert %s... %s"
7080msgstr "不能还原 %s... %s"
7081
d13389bf 7082#: sequencer.c:2072
a0b6b246
JX
7083#, c-format
7084msgid "could not apply %s... %s"
7085msgstr "不能应用 %s... %s"
7086
d13389bf 7087#: sequencer.c:2092
2b472aae
JX
7088#, c-format
7089msgid "dropping %s %s -- patch contents already upstream\n"
7090msgstr "丢弃 %s %s -- 补丁内容已在上游\n"
7091
d13389bf 7092#: sequencer.c:2150
a0b6b246
JX
7093#, c-format
7094msgid "git %s: failed to read the index"
7095msgstr "git %s:无法读取索引"
7096
d13389bf 7097#: sequencer.c:2157
a0b6b246
JX
7098#, c-format
7099msgid "git %s: failed to refresh the index"
7100msgstr "git %s:无法刷新索引"
7101
d13389bf 7102#: sequencer.c:2234
5809aa05
JX
7103#, c-format
7104msgid "%s does not accept arguments: '%s'"
7105msgstr "%s 不接受参数:'%s'"
7106
d13389bf 7107#: sequencer.c:2243
5809aa05
JX
7108#, c-format
7109msgid "missing arguments for %s"
7110msgstr "缺少 %s 的参数"
7111
d13389bf 7112#: sequencer.c:2274
d46c5519 7113#, c-format
2b472aae
JX
7114msgid "could not parse '%s'"
7115msgstr "无法解析 '%s'"
d46c5519 7116
d13389bf 7117#: sequencer.c:2335
a0b6b246
JX
7118#, c-format
7119msgid "invalid line %d: %.*s"
7120msgstr "无效行 %d:%.*s"
7121
d13389bf 7122#: sequencer.c:2346
1a79b2f1
JX
7123#, c-format
7124msgid "cannot '%s' without a previous commit"
7125msgstr "没有父提交的情况下不能 '%s'"
a0b6b246 7126
d13389bf 7127#: sequencer.c:2432
a6cd2cc4
JX
7128msgid "cancelling a cherry picking in progress"
7129msgstr "正在取消一个进行中的拣选"
7130
d13389bf 7131#: sequencer.c:2441
a6cd2cc4
JX
7132msgid "cancelling a revert in progress"
7133msgstr "正在取消一个进行中的还原"
7134
d13389bf 7135#: sequencer.c:2485
1a79b2f1
JX
7136msgid "please fix this using 'git rebase --edit-todo'."
7137msgstr "请用 'git rebase --edit-todo' 来修改。"
7138
d13389bf 7139#: sequencer.c:2487
a0b6b246
JX
7140#, c-format
7141msgid "unusable instruction sheet: '%s'"
29004bbb 7142msgstr "不可用的指令清单:'%s'"
a0b6b246 7143
d13389bf 7144#: sequencer.c:2492
1a79b2f1
JX
7145msgid "no commits parsed."
7146msgstr "没有解析提交。"
7147
d13389bf 7148#: sequencer.c:2503
a0b6b246
JX
7149msgid "cannot cherry-pick during a revert."
7150msgstr "不能在回退中执行拣选。"
7151
d13389bf 7152#: sequencer.c:2505
a0b6b246
JX
7153msgid "cannot revert during a cherry-pick."
7154msgstr "不能在拣选中执行回退。"
7155
d13389bf 7156#: sequencer.c:2583
a0b6b246
JX
7157#, c-format
7158msgid "invalid value for %s: %s"
7159msgstr "%s 的值无效:%s"
7160
d13389bf 7161#: sequencer.c:2690
fd8cb379
JX
7162msgid "unusable squash-onto"
7163msgstr "不可用的 squash-onto"
7164
d13389bf 7165#: sequencer.c:2710
a0b6b246
JX
7166#, c-format
7167msgid "malformed options sheet: '%s'"
fd8cb379 7168msgstr "格式错误的选项清单:'%s'"
a0b6b246 7169
d13389bf 7170#: sequencer.c:2803 sequencer.c:4636
c1ac5258
JX
7171msgid "empty commit set passed"
7172msgstr "提供了空的提交集"
7173
d13389bf 7174#: sequencer.c:2820
a6cd2cc4
JX
7175msgid "revert is already in progress"
7176msgstr "一个还原操作已在进行"
a0b6b246 7177
d13389bf 7178#: sequencer.c:2822
a6cd2cc4
JX
7179#, c-format
7180msgid "try \"git revert (--continue | %s--abort | --quit)\""
7181msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
7182
d13389bf 7183#: sequencer.c:2825
a6cd2cc4
JX
7184msgid "cherry-pick is already in progress"
7185msgstr "拣选操作已在进行"
7186
d13389bf 7187#: sequencer.c:2827
a6cd2cc4
JX
7188#, c-format
7189msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
7190msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
a0b6b246 7191
d13389bf 7192#: sequencer.c:2841
a0b6b246
JX
7193#, c-format
7194msgid "could not create sequencer directory '%s'"
7195msgstr "不能创建序列目录 '%s'"
7196
d13389bf 7197#: sequencer.c:2856
a0b6b246
JX
7198msgid "could not lock HEAD"
7199msgstr "不能锁定 HEAD"
7200
d13389bf 7201#: sequencer.c:2916 sequencer.c:4371
a0b6b246
JX
7202msgid "no cherry-pick or revert in progress"
7203msgstr "拣选或还原操作并未进行"
7204
d13389bf 7205#: sequencer.c:2918 sequencer.c:2929
a0b6b246
JX
7206msgid "cannot resolve HEAD"
7207msgstr "不能解析 HEAD"
7208
d13389bf 7209#: sequencer.c:2920 sequencer.c:2964
a0b6b246
JX
7210msgid "cannot abort from a branch yet to be born"
7211msgstr "不能从尚未建立的分支终止"
7212
d13389bf 7213#: sequencer.c:2950 builtin/grep.c:756
a0b6b246
JX
7214#, c-format
7215msgid "cannot open '%s'"
7216msgstr "不能打开 '%s'"
7217
d13389bf 7218#: sequencer.c:2952
a0b6b246
JX
7219#, c-format
7220msgid "cannot read '%s': %s"
7221msgstr "不能读取 '%s':%s"
7222
d13389bf 7223#: sequencer.c:2953
a0b6b246
JX
7224msgid "unexpected end of file"
7225msgstr "意外的文件结束"
7226
d13389bf 7227#: sequencer.c:2959
a0b6b246
JX
7228#, c-format
7229msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
7230msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
7231
d13389bf 7232#: sequencer.c:2970
1a79b2f1
JX
7233msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
7234msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
7235
d13389bf 7236#: sequencer.c:3011
a6cd2cc4
JX
7237msgid "no revert in progress"
7238msgstr "没有正在进行的还原"
7239
d13389bf 7240#: sequencer.c:3020
a6cd2cc4
JX
7241msgid "no cherry-pick in progress"
7242msgstr "没有正在进行的拣选"
7243
d13389bf 7244#: sequencer.c:3030
a6cd2cc4
JX
7245msgid "failed to skip the commit"
7246msgstr "无法跳过这个提交"
7247
d13389bf 7248#: sequencer.c:3037
a6cd2cc4
JX
7249msgid "there is nothing to skip"
7250msgstr "没有要跳过的"
7251
d13389bf 7252#: sequencer.c:3040
a6cd2cc4
JX
7253#, c-format
7254msgid ""
7255"have you committed already?\n"
7256"try \"git %s --continue\""
7257msgstr ""
7258"您已经提交了么?\n"
7259"试试 \"git %s --continue\""
7260
d13389bf 7261#: sequencer.c:3202 sequencer.c:4263
1a79b2f1
JX
7262msgid "cannot read HEAD"
7263msgstr "不能读取 HEAD"
7264
d13389bf 7265#: sequencer.c:3219
c1ac5258
JX
7266#, c-format
7267msgid "unable to copy '%s' to '%s'"
7268msgstr "无法拷贝 '%s' 至 '%s'"
7269
d13389bf 7270#: sequencer.c:3227
c1ac5258
JX
7271#, c-format
7272msgid ""
7273"You can amend the commit now, with\n"
7274"\n"
7275" git commit --amend %s\n"
7276"\n"
7277"Once you are satisfied with your changes, run\n"
7278"\n"
7279" git rebase --continue\n"
7280msgstr ""
7281"您现在可以修补这个提交,使用\n"
7282"\n"
7283" git commit --amend %s\n"
7284"\n"
7285"当您对变更感到满意,执行\n"
7286"\n"
7287" git rebase --continue\n"
7288
d13389bf 7289#: sequencer.c:3237
c1ac5258
JX
7290#, c-format
7291msgid "Could not apply %s... %.*s"
7292msgstr "不能应用 %s... %.*s"
7293
d13389bf 7294#: sequencer.c:3244
c1ac5258
JX
7295#, c-format
7296msgid "Could not merge %.*s"
7297msgstr "不能合并 %.*s"
7298
d13389bf 7299#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640
1a79b2f1
JX
7300#, c-format
7301msgid "could not copy '%s' to '%s'"
7302msgstr "不能拷贝 '%s' 至 '%s'"
7303
d13389bf 7304#: sequencer.c:3274
349ede6a
JX
7305#, c-format
7306msgid "Executing: %s\n"
7307msgstr "正在执行:%s\n"
7308
1a79b2f1 7309# 译者:注意保持前导空格
d13389bf 7310#: sequencer.c:3289
1a79b2f1
JX
7311#, c-format
7312msgid ""
7313"execution failed: %s\n"
7314"%sYou can fix the problem, and then run\n"
7315"\n"
7316" git rebase --continue\n"
7317"\n"
7318msgstr ""
7319"执行失败:%s\n"
7320"%s您可以改正该问题,然后运行\n"
7321"\n"
7322" git rebase --continue\n"
7323"\n"
7324
d13389bf 7325#: sequencer.c:3295
1a79b2f1
JX
7326msgid "and made changes to the index and/or the working tree\n"
7327msgstr "并且修改索引和/或工作区\n"
7328
d13389bf 7329#: sequencer.c:3301
1a79b2f1
JX
7330#, c-format
7331msgid ""
7332"execution succeeded: %s\n"
7333"but left changes to the index and/or the working tree\n"
7334"Commit or stash your changes, and then run\n"
7335"\n"
7336" git rebase --continue\n"
7337"\n"
7338msgstr ""
7339"执行成功:%s\n"
7340"但是在索引和/或工作区中存在变更\n"
a4f16749 7341"提交或贮藏修改,然后运行\n"
1a79b2f1
JX
7342"\n"
7343" git rebase --continue\n"
7344"\n"
7345
d13389bf 7346#: sequencer.c:3362
c1ac5258
JX
7347#, c-format
7348msgid "illegal label name: '%.*s'"
7349msgstr "非法的标签名称:'%.*s'"
7350
d13389bf 7351#: sequencer.c:3416
fd8cb379
JX
7352msgid "writing fake root commit"
7353msgstr "写伪根提交"
7354
d13389bf 7355#: sequencer.c:3421
fd8cb379
JX
7356msgid "writing squash-onto"
7357msgstr "写入 squash-onto"
7358
d13389bf 7359#: sequencer.c:3505
c1ac5258
JX
7360#, c-format
7361msgid "could not resolve '%s'"
7362msgstr "无法解析 '%s'"
7363
d13389bf 7364#: sequencer.c:3538
fd8cb379
JX
7365msgid "cannot merge without a current revision"
7366msgstr "没有当前版本不能合并"
7367
d13389bf 7368#: sequencer.c:3560
fd8cb379 7369#, c-format
c1ac5258
JX
7370msgid "unable to parse '%.*s'"
7371msgstr "无法解析 '%.*s'"
7372
d13389bf 7373#: sequencer.c:3569
c1ac5258
JX
7374#, c-format
7375msgid "nothing to merge: '%.*s'"
7376msgstr "无可用合并:'%.*s'"
7377
d13389bf 7378#: sequencer.c:3581
c1ac5258
JX
7379msgid "octopus merge cannot be executed on top of a [new root]"
7380msgstr "章鱼合并不能在一个新的根提交上执行"
fd8cb379 7381
d13389bf 7382#: sequencer.c:3597
fd8cb379
JX
7383#, c-format
7384msgid "could not get commit message of '%s'"
7385msgstr "不能获取 '%s' 的提交说明"
7386
d13389bf 7387#: sequencer.c:3780
fd8cb379
JX
7388#, c-format
7389msgid "could not even attempt to merge '%.*s'"
7390msgstr "甚至不能尝试合并 '%.*s'"
7391
d13389bf 7392#: sequencer.c:3796
fd8cb379
JX
7393msgid "merge: Unable to write new index file"
7394msgstr "合并:无法写入新索引文件"
7395
d13389bf 7396#: sequencer.c:3870
349ede6a
JX
7397msgid "Cannot autostash"
7398msgstr "无法 autostash"
7399
d13389bf 7400#: sequencer.c:3873
1a79b2f1 7401#, c-format
349ede6a
JX
7402msgid "Unexpected stash response: '%s'"
7403msgstr "意外的 stash 响应:'%s'"
1a79b2f1 7404
d13389bf 7405#: sequencer.c:3879
1a79b2f1 7406#, c-format
349ede6a
JX
7407msgid "Could not create directory for '%s'"
7408msgstr "不能为 '%s' 创建目录"
7409
d13389bf 7410#: sequencer.c:3882
349ede6a
JX
7411#, c-format
7412msgid "Created autostash: %s\n"
7413msgstr "创建了 autostash:%s\n"
7414
d13389bf 7415#: sequencer.c:3886
349ede6a
JX
7416msgid "could not reset --hard"
7417msgstr "无法 reset --hard"
7418
d13389bf 7419#: sequencer.c:3911
349ede6a
JX
7420#, c-format
7421msgid "Applied autostash.\n"
7422msgstr "已应用 autostash。\n"
7423
d13389bf 7424#: sequencer.c:3923
349ede6a
JX
7425#, c-format
7426msgid "cannot store %s"
1a79b2f1
JX
7427msgstr "不能存储 %s"
7428
d13389bf 7429#: sequencer.c:3926
1a79b2f1
JX
7430#, c-format
7431msgid ""
349ede6a 7432"%s\n"
1a79b2f1
JX
7433"Your changes are safe in the stash.\n"
7434"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
7435msgstr ""
349ede6a
JX
7436"%s\n"
7437"您的修改在贮藏区中很安全。\n"
1a79b2f1
JX
7438"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
7439
d13389bf 7440#: sequencer.c:3931
349ede6a
JX
7441msgid "Applying autostash resulted in conflicts."
7442msgstr "应用自动贮藏导致冲突。"
7443
d13389bf 7444#: sequencer.c:3932
349ede6a
JX
7445msgid "Autostash exists; creating a new stash entry."
7446msgstr "自动贮藏已经存在;正在创建一个新的贮藏条目。"
7447
d13389bf 7448#: sequencer.c:4025 git-rebase--preserve-merges.sh:769
4c27fcb5
JX
7449msgid "could not detach HEAD"
7450msgstr "不能分离头指针"
7451
d13389bf 7452#: sequencer.c:4040
4c27fcb5
JX
7453#, c-format
7454msgid "Stopped at HEAD\n"
7455msgstr "停止在 HEAD\n"
7456
d13389bf 7457#: sequencer.c:4042
4c27fcb5
JX
7458#, c-format
7459msgid "Stopped at %s\n"
7460msgstr "停止在 %s\n"
7461
d13389bf 7462#: sequencer.c:4050
fd8cb379
JX
7463#, c-format
7464msgid ""
7465"Could not execute the todo command\n"
7466"\n"
7467" %.*s\n"
7468"It has been rescheduled; To edit the command before continuing, please\n"
7469"edit the todo list first:\n"
7470"\n"
7471" git rebase --edit-todo\n"
7472" git rebase --continue\n"
7473msgstr ""
7474"无法执行待办命令\n"
7475"\n"
7476" %.*s\n"
7477"已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n"
7478"\n"
7479" git rebase --edit-todo\n"
7480" git rebase --continue\n"
7481
d13389bf 7482#: sequencer.c:4096
349ede6a
JX
7483#, c-format
7484msgid "Rebasing (%d/%d)%s"
7485msgstr "正在变基(%d/%d)%s"
7486
d13389bf 7487#: sequencer.c:4141
1a79b2f1 7488#, c-format
87cb7997
JX
7489msgid "Stopped at %s... %.*s\n"
7490msgstr "停止在 %s... %.*s\n"
1a79b2f1 7491
d13389bf 7492#: sequencer.c:4212
1a79b2f1
JX
7493#, c-format
7494msgid "unknown command %d"
7495msgstr "未知命令 %d"
7496
d13389bf 7497#: sequencer.c:4271
1a79b2f1
JX
7498msgid "could not read orig-head"
7499msgstr "不能读取 orig-head"
7500
d13389bf 7501#: sequencer.c:4276
1a79b2f1
JX
7502msgid "could not read 'onto'"
7503msgstr "不能读取 'onto'"
7504
d13389bf 7505#: sequencer.c:4290
1a79b2f1
JX
7506#, c-format
7507msgid "could not update HEAD to %s"
7508msgstr "不能更新 HEAD 为 %s"
7509
d13389bf 7510#: sequencer.c:4350
349ede6a
JX
7511#, c-format
7512msgid "Successfully rebased and updated %s.\n"
7513msgstr "成功变基并更新 %s。\n"
7514
d13389bf 7515#: sequencer.c:4383
1a79b2f1
JX
7516msgid "cannot rebase: You have unstaged changes."
7517msgstr "不能变基:您有未暂存的变更。"
7518
d13389bf 7519#: sequencer.c:4392
1a79b2f1
JX
7520msgid "cannot amend non-existing commit"
7521msgstr "不能修补不存在的提交"
7522
d13389bf 7523#: sequencer.c:4394
1a79b2f1
JX
7524#, c-format
7525msgid "invalid file: '%s'"
7526msgstr "无效文件:'%s'"
7527
d13389bf 7528#: sequencer.c:4396
1a79b2f1
JX
7529#, c-format
7530msgid "invalid contents: '%s'"
7531msgstr "无效内容:'%s'"
7532
d13389bf 7533#: sequencer.c:4399
1a79b2f1
JX
7534msgid ""
7535"\n"
7536"You have uncommitted changes in your working tree. Please, commit them\n"
7537"first and then run 'git rebase --continue' again."
87cb7997
JX
7538msgstr ""
7539"\n"
7540"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
1a79b2f1 7541
d13389bf 7542#: sequencer.c:4435 sequencer.c:4474
fd8cb379
JX
7543#, c-format
7544msgid "could not write file: '%s'"
7545msgstr "不能写入文件:'%s'"
7546
d13389bf 7547#: sequencer.c:4490
fd8cb379
JX
7548msgid "could not remove CHERRY_PICK_HEAD"
7549msgstr "不能删除 CHERRY_PICK_HEAD"
7550
d13389bf 7551#: sequencer.c:4497
1a79b2f1
JX
7552msgid "could not commit staged changes."
7553msgstr "不能提交暂存的修改。"
7554
d13389bf 7555#: sequencer.c:4613
a0b6b246
JX
7556#, c-format
7557msgid "%s: can't cherry-pick a %s"
7558msgstr "%s:不能拣选一个%s"
7559
d13389bf 7560#: sequencer.c:4617
a0b6b246
JX
7561#, c-format
7562msgid "%s: bad revision"
7563msgstr "%s:错误的版本"
7564
d13389bf 7565#: sequencer.c:4652
a0b6b246
JX
7566msgid "can't revert as initial commit"
7567msgstr "不能作为初始提交回退"
7568
d13389bf 7569#: sequencer.c:5129
6937cb4e
JX
7570msgid "make_script: unhandled options"
7571msgstr "make_script:有未能处理的选项"
7572
d13389bf 7573#: sequencer.c:5132
6937cb4e
JX
7574msgid "make_script: error preparing revisions"
7575msgstr "make_script:准备版本时错误"
7576
d13389bf 7577#: sequencer.c:5374 sequencer.c:5391
4c27fcb5
JX
7578msgid "nothing to do"
7579msgstr "无事可做"
7580
d13389bf 7581#: sequencer.c:5410
4c27fcb5
JX
7582msgid "could not skip unnecessary pick commands"
7583msgstr "无法跳过不必要的拣选"
7584
d13389bf 7585#: sequencer.c:5504
6937cb4e
JX
7586msgid "the script was already rearranged."
7587msgstr "脚本已经重新编排。"
7588
349ede6a 7589#: setup.c:133
31e5e17b 7590#, c-format
2b472aae 7591msgid "'%s' is outside repository at '%s'"
440e7442 7592msgstr "'%s' 在位于 '%s' 的仓库之外"
31e5e17b 7593
349ede6a 7594#: setup.c:185
a0b6b246 7595#, c-format
6792b93b 7596msgid ""
a0b6b246
JX
7597"%s: no such path in the working tree.\n"
7598"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
7599msgstr ""
7600"%s:工作区中无此路径。\n"
58b6f078 7601"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
6792b93b 7602
349ede6a 7603#: setup.c:198
90314792 7604#, c-format
a0b6b246
JX
7605msgid ""
7606"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
7607"Use '--' to separate paths from revisions, like this:\n"
7608"'git <command> [<revision>...] -- [<file>...]'"
7609msgstr ""
7610"有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
7611"使用 '--' 来分隔版本和路径,例如:\n"
58b6f078 7612"'git <命令> [<版本>...] -- [<文件>...]'"
6792b93b 7613
349ede6a 7614#: setup.c:264
31e5e17b
JX
7615#, c-format
7616msgid "option '%s' must come before non-option arguments"
7617msgstr "选项 '%s' 必须在其他非选项参数之前"
7618
349ede6a 7619#: setup.c:283
a0b6b246
JX
7620#, c-format
7621msgid ""
7622"ambiguous argument '%s': both revision and filename\n"
7623"Use '--' to separate paths from revisions, like this:\n"
7624"'git <command> [<revision>...] -- [<file>...]'"
7625msgstr ""
7626"有歧义的参数 '%s':可同时是版本和文件\n"
7627"使用 '--' 来分隔版本和路径,例如:\n"
58b6f078 7628"'git <命令> [<版本>...] -- [<文件>...]'"
2e8451e8 7629
349ede6a 7630#: setup.c:419
31e5e17b
JX
7631msgid "unable to set up work tree using invalid config"
7632msgstr "无法使用无效配置来创建工作区"
7633
349ede6a 7634#: setup.c:423
31e5e17b 7635msgid "this operation must be run in a work tree"
610f8099 7636msgstr "该操作必须在一个工作区中运行"
31e5e17b 7637
d9488fea 7638#: setup.c:661
a0b6b246
JX
7639#, c-format
7640msgid "Expected git repo version <= %d, found %d"
7641msgstr "期望 git 仓库版本 <= %d,却得到 %d"
6792b93b 7642
d9488fea 7643#: setup.c:669
a0b6b246
JX
7644msgid "unknown repository extensions found:"
7645msgstr "发现未知的仓库扩展:"
2e8451e8 7646
d9488fea
JX
7647#: setup.c:681
7648msgid "repo version is 0, but v1-only extensions found:"
7649msgstr "仓库的版本是 0,但是发现仅用于 v1 的扩展:"
7650
7651#: setup.c:700
1003b3a5 7652#, c-format
31e5e17b 7653msgid "error opening '%s'"
c1ac5258 7654msgstr "打开 '%s' 出错"
1003b3a5 7655
d9488fea 7656#: setup.c:702
31e5e17b
JX
7657#, c-format
7658msgid "too large to be a .git file: '%s'"
610f8099 7659msgstr "文件太大,无法作为 .git 文件:'%s'"
31e5e17b 7660
d9488fea 7661#: setup.c:704
31e5e17b
JX
7662#, c-format
7663msgid "error reading %s"
c1ac5258 7664msgstr "读取 %s 出错"
31e5e17b 7665
d9488fea 7666#: setup.c:706
31e5e17b
JX
7667#, c-format
7668msgid "invalid gitfile format: %s"
7669msgstr "无效的 gitfile 格式:%s"
7670
d9488fea 7671#: setup.c:708
31e5e17b
JX
7672#, c-format
7673msgid "no path in gitfile: %s"
7674msgstr "在 gitfile 中没有路径:%s"
7675
d9488fea 7676#: setup.c:710
31e5e17b
JX
7677#, c-format
7678msgid "not a git repository: %s"
d9488fea 7679msgstr "不是 git 仓库:%s"
31e5e17b 7680
d9488fea 7681#: setup.c:812
31e5e17b
JX
7682#, c-format
7683msgid "'$%s' too big"
7684msgstr "'$%s' 太大"
7685
d9488fea 7686#: setup.c:826
31e5e17b
JX
7687#, c-format
7688msgid "not a git repository: '%s'"
d9488fea 7689msgstr "不是 git 仓库:'%s'"
31e5e17b 7690
d9488fea 7691#: setup.c:855 setup.c:857 setup.c:888
31e5e17b
JX
7692#, c-format
7693msgid "cannot chdir to '%s'"
7694msgstr "不能切换目录到 '%s'"
7695
d9488fea 7696#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
31e5e17b 7697msgid "cannot come back to cwd"
a0b6b246 7698msgstr "无法返回当前工作目录"
1003b3a5 7699
d9488fea 7700#: setup.c:987
31e5e17b
JX
7701#, c-format
7702msgid "failed to stat '%*s%s%s'"
c1ac5258 7703msgstr "获取 '%*s%s%s' 状态(stat)失败"
31e5e17b 7704
d9488fea 7705#: setup.c:1225
a0b6b246
JX
7706msgid "Unable to read current working directory"
7707msgstr "不能读取当前工作目录"
1003b3a5 7708
d9488fea 7709#: setup.c:1234 setup.c:1240
87cb7997 7710#, c-format
31e5e17b 7711msgid "cannot change to '%s'"
87cb7997
JX
7712msgstr "不能切换到 '%s'"
7713
d9488fea 7714#: setup.c:1245
06991777
JX
7715#, c-format
7716msgid "not a git repository (or any of the parent directories): %s"
d9488fea 7717msgstr "不是 git 仓库(或者任何父目录):%s"
06991777 7718
d9488fea 7719#: setup.c:1251
a0b6b246
JX
7720#, c-format
7721msgid ""
31e5e17b 7722"not a git repository (or any parent up to mount point %s)\n"
a0b6b246
JX
7723"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
7724msgstr ""
d9488fea 7725"不是 git 仓库(或者直至挂载点 %s 的任何父目录)\n"
a0b6b246 7726"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
1003b3a5 7727
d9488fea 7728#: setup.c:1362
a0b6b246
JX
7729#, c-format
7730msgid ""
31e5e17b 7731"problem with core.sharedRepository filemode value (0%.3o).\n"
a0b6b246
JX
7732"The owner of files must always have read and write permissions."
7733msgstr ""
31e5e17b 7734"参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n"
a0b6b246 7735"文件属主必须始终拥有读写权限。"
6792b93b 7736
d9488fea 7737#: setup.c:1409
31e5e17b
JX
7738msgid "open /dev/null or dup failed"
7739msgstr "不能打开或者复制 /dev/null"
7740
d9488fea 7741#: setup.c:1424
31e5e17b
JX
7742msgid "fork failed"
7743msgstr "fork 失败"
7744
d9488fea 7745#: setup.c:1429
31e5e17b
JX
7746msgid "setsid failed"
7747msgstr "setsid 失败"
7748
d13389bf 7749#: sha1-file.c:480
c1ac5258
JX
7750#, c-format
7751msgid "object directory %s does not exist; check .git/objects/info/alternates"
7752msgstr "对象目录 %s 不存在,检查 .git/objects/info/alternates"
7753
d13389bf 7754#: sha1-file.c:531
c1ac5258
JX
7755#, c-format
7756msgid "unable to normalize alternate object path: %s"
7757msgstr "无法规范化备用对象路径:%s"
7758
d13389bf 7759#: sha1-file.c:603
c1ac5258
JX
7760#, c-format
7761msgid "%s: ignoring alternate object stores, nesting too deep"
7762msgstr "%s:忽略备用对象库,嵌套太深"
7763
d13389bf 7764#: sha1-file.c:610
c1ac5258
JX
7765#, c-format
7766msgid "unable to normalize object directory: %s"
7767msgstr "无法规范化对象目录: %s"
7768
d13389bf 7769#: sha1-file.c:653
c1ac5258
JX
7770msgid "unable to fdopen alternates lockfile"
7771msgstr "无法 fdopen 替换锁文件"
7772
d13389bf 7773#: sha1-file.c:671
c1ac5258
JX
7774msgid "unable to read alternates file"
7775msgstr "无法读取替代文件"
7776
d13389bf 7777#: sha1-file.c:678
c1ac5258
JX
7778msgid "unable to move new alternates file into place"
7779msgstr "无法将新的替代文件移动到位"
7780
d13389bf 7781#: sha1-file.c:713
a0b6b246
JX
7782#, c-format
7783msgid "path '%s' does not exist"
7784msgstr "路径 '%s' 不存在"
7785
d13389bf 7786#: sha1-file.c:734
a0b6b246
JX
7787#, c-format
7788msgid "reference repository '%s' as a linked checkout is not supported yet."
7789msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
7790
d13389bf 7791#: sha1-file.c:740
a0b6b246
JX
7792#, c-format
7793msgid "reference repository '%s' is not a local repository."
7794msgstr "参考仓库 '%s' 不是一个本地仓库。"
7795
d13389bf 7796#: sha1-file.c:746
a0b6b246
JX
7797#, c-format
7798msgid "reference repository '%s' is shallow"
7799msgstr "参考仓库 '%s' 是一个浅克隆"
7800
d13389bf 7801#: sha1-file.c:754
a0b6b246
JX
7802#, c-format
7803msgid "reference repository '%s' is grafted"
fd8cb379 7804msgstr "参考仓库 '%s' 已被移植"
a0b6b246 7805
d13389bf 7806#: sha1-file.c:814
a6cd2cc4
JX
7807#, c-format
7808msgid "invalid line while parsing alternate refs: %s"
7809msgstr "解析备用引用时无效的行:%s"
7810
d13389bf 7811#: sha1-file.c:964
c1ac5258
JX
7812#, c-format
7813msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
7814msgstr "尝试 mmap %<PRIuMAX>,超过了最大值 %<PRIuMAX>"
7815
d13389bf 7816#: sha1-file.c:985
c1ac5258
JX
7817msgid "mmap failed"
7818msgstr "mmap 失败"
7819
d13389bf 7820#: sha1-file.c:1149
c1ac5258
JX
7821#, c-format
7822msgid "object file %s is empty"
7823msgstr "对象文件 %s 为空"
7824
d13389bf 7825#: sha1-file.c:1284 sha1-file.c:2477
c1ac5258
JX
7826#, c-format
7827msgid "corrupt loose object '%s'"
7828msgstr "损坏的松散对象 '%s'"
7829
d13389bf 7830#: sha1-file.c:1286 sha1-file.c:2481
c1ac5258
JX
7831#, c-format
7832msgid "garbage at end of loose object '%s'"
7833msgstr "松散对象 '%s' 后面有垃圾数据"
7834
d13389bf 7835#: sha1-file.c:1328
c1ac5258
JX
7836msgid "invalid object type"
7837msgstr "无效的对象类型"
7838
d13389bf 7839#: sha1-file.c:1412
c1ac5258
JX
7840#, c-format
7841msgid "unable to unpack %s header with --allow-unknown-type"
7842msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
7843
d13389bf 7844#: sha1-file.c:1415
c1ac5258
JX
7845#, c-format
7846msgid "unable to unpack %s header"
7847msgstr "无法解开 %s 头部"
7848
d13389bf 7849#: sha1-file.c:1421
c1ac5258
JX
7850#, c-format
7851msgid "unable to parse %s header with --allow-unknown-type"
7852msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
7853
d13389bf 7854#: sha1-file.c:1424
c1ac5258
JX
7855#, c-format
7856msgid "unable to parse %s header"
7857msgstr "无法解析 %s 头部"
7858
d13389bf 7859#: sha1-file.c:1651
c1ac5258
JX
7860#, c-format
7861msgid "failed to read object %s"
7862msgstr "读取对象 %s 失败"
7863
d13389bf 7864#: sha1-file.c:1655
c1ac5258
JX
7865#, c-format
7866msgid "replacement %s not found for %s"
7867msgstr "找不到 %2$s 的替代 %1$s"
7868
d13389bf 7869#: sha1-file.c:1659
c1ac5258
JX
7870#, c-format
7871msgid "loose object %s (stored in %s) is corrupt"
7872msgstr "松散对象 %s(保存在 %s)已损坏"
7873
d13389bf 7874#: sha1-file.c:1663
c1ac5258
JX
7875#, c-format
7876msgid "packed object %s (stored in %s) is corrupt"
7877msgstr "打包对象 %s(保存在 %s)已损坏"
7878
d13389bf 7879#: sha1-file.c:1768
c1ac5258 7880#, c-format
06991777
JX
7881msgid "unable to write file %s"
7882msgstr "无法写文件 %s"
c1ac5258 7883
d13389bf 7884#: sha1-file.c:1775
c1ac5258
JX
7885#, c-format
7886msgid "unable to set permission to '%s'"
7887msgstr "无法为 '%s' 设置权限"
7888
d13389bf 7889#: sha1-file.c:1782
c1ac5258
JX
7890msgid "file write error"
7891msgstr "文件写错误"
7892
d13389bf 7893#: sha1-file.c:1802
06991777
JX
7894msgid "error when closing loose object file"
7895msgstr "关闭松散对象文件时出错"
c1ac5258 7896
d13389bf 7897#: sha1-file.c:1867
c1ac5258
JX
7898#, c-format
7899msgid "insufficient permission for adding an object to repository database %s"
7900msgstr "权限不足,无法在仓库对象库 %s 中添加对象"
7901
d13389bf 7902#: sha1-file.c:1869
c1ac5258
JX
7903msgid "unable to create temporary file"
7904msgstr "无法创建临时文件"
7905
d13389bf 7906#: sha1-file.c:1893
06991777
JX
7907msgid "unable to write loose object file"
7908msgstr "不能写松散对象文件"
c1ac5258 7909
d13389bf 7910#: sha1-file.c:1899
c1ac5258
JX
7911#, c-format
7912msgid "unable to deflate new object %s (%d)"
7913msgstr "不能压缩新对象 %s(%d)"
7914
d13389bf 7915#: sha1-file.c:1903
c1ac5258
JX
7916#, c-format
7917msgid "deflateEnd on object %s failed (%d)"
7918msgstr "在对象 %s 上调用 deflateEnd 失败(%d)"
7919
d13389bf 7920#: sha1-file.c:1907
c1ac5258
JX
7921#, c-format
7922msgid "confused by unstable object source data for %s"
7923msgstr "被 %s 的不稳定对象源数据搞糊涂了"
7924
d13389bf 7925#: sha1-file.c:1917 builtin/pack-objects.c:1086
c1ac5258
JX
7926#, c-format
7927msgid "failed utime() on %s"
7928msgstr "在 %s 上调用 utime() 失败"
7929
d13389bf 7930#: sha1-file.c:1994
c1ac5258 7931#, c-format
06991777
JX
7932msgid "cannot read object for %s"
7933msgstr "不能读取对象 %s"
c1ac5258 7934
d13389bf 7935#: sha1-file.c:2045
c1ac5258
JX
7936msgid "corrupt commit"
7937msgstr "损坏的提交"
7938
d13389bf 7939#: sha1-file.c:2053
c1ac5258
JX
7940msgid "corrupt tag"
7941msgstr "损坏的标签"
7942
d13389bf 7943#: sha1-file.c:2153
c1ac5258
JX
7944#, c-format
7945msgid "read error while indexing %s"
7946msgstr "索引 %s 时读取错误"
7947
d13389bf 7948#: sha1-file.c:2156
c1ac5258
JX
7949#, c-format
7950msgid "short read while indexing %s"
7951msgstr "索引 %s 时读入不完整"
7952
d13389bf 7953#: sha1-file.c:2229 sha1-file.c:2239
c1ac5258
JX
7954#, c-format
7955msgid "%s: failed to insert into database"
7956msgstr "%s:插入数据库失败"
7957
d13389bf 7958#: sha1-file.c:2245
c1ac5258
JX
7959#, c-format
7960msgid "%s: unsupported file type"
7961msgstr "%s:不支持的文件类型"
7962
d13389bf 7963#: sha1-file.c:2269
c1ac5258
JX
7964#, c-format
7965msgid "%s is not a valid object"
7966msgstr "%s 不是一个有效的对象"
7967
d13389bf 7968#: sha1-file.c:2271
c1ac5258
JX
7969#, c-format
7970msgid "%s is not a valid '%s' object"
7971msgstr "%s 不是一个有效的 '%s' 对象"
7972
d13389bf 7973#: sha1-file.c:2298 builtin/index-pack.c:192
c1ac5258
JX
7974#, c-format
7975msgid "unable to open %s"
7976msgstr "不能打开 %s"
7977
d13389bf 7978#: sha1-file.c:2488 sha1-file.c:2541
c1ac5258 7979#, c-format
06991777
JX
7980msgid "hash mismatch for %s (expected %s)"
7981msgstr "%s 的哈希值不匹配(预期 %s)"
c1ac5258 7982
d13389bf 7983#: sha1-file.c:2512
c1ac5258
JX
7984#, c-format
7985msgid "unable to mmap %s"
7986msgstr "不能 mmap %s"
7987
d13389bf 7988#: sha1-file.c:2517
c1ac5258
JX
7989#, c-format
7990msgid "unable to unpack header of %s"
7991msgstr "无法解压缩 %s 的头部"
7992
d13389bf 7993#: sha1-file.c:2523
c1ac5258
JX
7994#, c-format
7995msgid "unable to parse header of %s"
7996msgstr "无法解析 %s 的头部"
7997
d13389bf 7998#: sha1-file.c:2534
c1ac5258
JX
7999#, c-format
8000msgid "unable to unpack contents of %s"
8001msgstr "无法解压缩 %s 的内容"
8002
2b472aae 8003#: sha1-name.c:486
a0b6b246
JX
8004#, c-format
8005msgid "short SHA1 %s is ambiguous"
29004bbb 8006msgstr "短 SHA1 %s 存在歧义"
a0b6b246 8007
2b472aae 8008#: sha1-name.c:497
a0b6b246
JX
8009msgid "The candidates are:"
8010msgstr "候选者有:"
8011
2b472aae 8012#: sha1-name.c:796
a0b6b246
JX
8013msgid ""
8014"Git normally never creates a ref that ends with 40 hex characters\n"
8015"because it will be ignored when you just specify 40-hex. These refs\n"
8016"may be created by mistake. For example,\n"
8017"\n"
a6cd2cc4 8018" git switch -c $br $(git rev-parse ...)\n"
a0b6b246
JX
8019"\n"
8020"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
8021"examine these refs and maybe delete them. Turn this message off by\n"
8022"running \"git config advice.objectNameWarning false\""
8023msgstr ""
a6cd2cc4
JX
8024"Git 通常不会创建一个以40个十六进制字符结尾的引用,因为当您只提供40\n"
8025"个十六进制字符时将被忽略。这些引用可能被错误地创建。例如:\n"
a0b6b246 8026"\n"
a6cd2cc4 8027" git switch -c $br $(git rev-parse ...)\n"
a0b6b246 8028"\n"
a6cd2cc4
JX
8029"当 \"$br\" 某种原因空白时,一个40位十六进制的引用将被创建。请检查这些\n"
8030"引用,可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
8031"false\" 命令关闭本消息通知。"
8032
2b472aae
JX
8033#: sha1-name.c:916
8034#, c-format
8035msgid "log for '%.*s' only goes back to %s"
8036msgstr "'%.*s' 的日志仅能回到 %s"
8037
8038#: sha1-name.c:924
8039#, c-format
8040msgid "log for '%.*s' only has %d entries"
8041msgstr "'%.*s' 的日志仅有 %d 个条目"
8042
d9488fea 8043#: sha1-name.c:1702
2b472aae
JX
8044#, c-format
8045msgid "path '%s' exists on disk, but not in '%.*s'"
8046msgstr "路径 '%s' 在磁盘上,但是不在 '%.*s' 中"
8047
d9488fea 8048#: sha1-name.c:1708
2b472aae
JX
8049#, c-format
8050msgid ""
8051"path '%s' exists, but not '%s'\n"
8052"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
8053msgstr ""
440e7442 8054"路径 '%s' 存在,而 '%s' 不存在\n"
2b472aae
JX
8055"提示:您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'?"
8056
d9488fea 8057#: sha1-name.c:1717
2b472aae
JX
8058#, c-format
8059msgid "path '%s' does not exist in '%.*s'"
8060msgstr "路径 '%s' 不在 '%.*s' 中"
8061
d9488fea 8062#: sha1-name.c:1745
2b472aae
JX
8063#, c-format
8064msgid ""
8065"path '%s' is in the index, but not at stage %d\n"
8066"hint: Did you mean ':%d:%s'?"
8067msgstr ""
8068"路径 '%s' 在索引中,但不在暂存区 %d 中\n"
8069"提示:您的意思是 ':%d:%s'?"
8070
d9488fea 8071#: sha1-name.c:1761
2b472aae
JX
8072#, c-format
8073msgid ""
8074"path '%s' is in the index, but not '%s'\n"
8075"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
8076msgstr ""
440e7442 8077"路径 '%s' 在索引中,但 '%s' 不在\n"
2b472aae
JX
8078"提示:您的意思是 ':%d:%s' 亦即 ':%d:./%s'?"
8079
d9488fea 8080#: sha1-name.c:1769
2b472aae
JX
8081#, c-format
8082msgid "path '%s' exists on disk, but not in the index"
440e7442 8083msgstr "路径 '%s' 在磁盘上,但不在索引里"
2b472aae 8084
d9488fea 8085#: sha1-name.c:1771
2b472aae
JX
8086#, c-format
8087msgid "path '%s' does not exist (neither on disk nor in the index)"
440e7442 8088msgstr "路径 '%s' 不存在(既不在磁盘上,也不在索引中)"
2b472aae 8089
d9488fea 8090#: sha1-name.c:1784
2b472aae
JX
8091msgid "relative path syntax can't be used outside working tree"
8092msgstr "不能在工作区之外使用相对路径语法"
8093
d9488fea 8094#: sha1-name.c:1922
2b472aae
JX
8095#, c-format
8096msgid "invalid object name '%.*s'."
8097msgstr "无效的对象名 '%.*s'。"
8098
a6cd2cc4 8099#. TRANSLATORS: IEC 80000-13:2008 gibibyte
7157c2b5 8100#: strbuf.c:848
a6cd2cc4
JX
8101#, c-format
8102msgid "%u.%2.2u GiB"
8103msgstr "%u.%2.2u GiB"
8104
8105#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
7157c2b5 8106#: strbuf.c:850
a6cd2cc4
JX
8107#, c-format
8108msgid "%u.%2.2u GiB/s"
8109msgstr "%u.%2.2u GiB/s"
8110
8111#. TRANSLATORS: IEC 80000-13:2008 mebibyte
7157c2b5 8112#: strbuf.c:858
a6cd2cc4
JX
8113#, c-format
8114msgid "%u.%2.2u MiB"
8115msgstr "%u.%2.2u MiB"
8116
8117#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
7157c2b5 8118#: strbuf.c:860
a6cd2cc4
JX
8119#, c-format
8120msgid "%u.%2.2u MiB/s"
8121msgstr "%u.%2.2u MiB/s"
8122
8123#. TRANSLATORS: IEC 80000-13:2008 kibibyte
7157c2b5 8124#: strbuf.c:867
a6cd2cc4
JX
8125#, c-format
8126msgid "%u.%2.2u KiB"
8127msgstr "%u.%2.2u KiB"
8128
8129#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
7157c2b5 8130#: strbuf.c:869
a6cd2cc4
JX
8131#, c-format
8132msgid "%u.%2.2u KiB/s"
8133msgstr "%u.%2.2u KiB/s"
8134
8135#. TRANSLATORS: IEC 80000-13:2008 byte
7157c2b5 8136#: strbuf.c:875
a6cd2cc4
JX
8137#, c-format
8138msgid "%u byte"
8139msgid_plural "%u bytes"
8140msgstr[0] "%u 字节"
8141msgstr[1] "%u 字节"
8142
8143#. TRANSLATORS: IEC 80000-13:2008 byte/second
7157c2b5 8144#: strbuf.c:877
a6cd2cc4
JX
8145#, c-format
8146msgid "%u byte/s"
8147msgid_plural "%u bytes/s"
8148msgstr[0] "%u 字节/秒"
8149msgstr[1] "%u 字节/秒"
a0b6b246 8150
d13389bf
JX
8151#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
8152#: builtin/rebase.c:864
d9488fea
JX
8153#, c-format
8154msgid "could not open '%s' for writing"
8155msgstr "无法打开 '%s' 进行写入"
8156
7157c2b5 8157#: strbuf.c:1175
ddc12c42
JX
8158#, c-format
8159msgid "could not edit '%s'"
8160msgstr "不能编辑 '%s'"
8161
349ede6a
JX
8162#: submodule-config.c:237
8163#, c-format
8164msgid "ignoring suspicious submodule name: %s"
8165msgstr "忽略可疑的子模组名称:%s"
8166
8167#: submodule-config.c:304
8168msgid "negative values not allowed for submodule.fetchjobs"
8169msgstr "submodule.fetchjobs 不允许为负值"
8170
8171#: submodule-config.c:402
8172#, c-format
8173msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
8174msgstr "忽略可能被解析为命令行选项的 '%s':%s"
8175
8176#: submodule-config.c:499
8177#, c-format
8178msgid "invalid value for %s"
8179msgstr "%s 的值无效"
8180
8181#: submodule-config.c:766
8182#, c-format
8183msgid "Could not update .gitmodules entry %s"
8184msgstr "不能更新 .gitmodules 条目 %s"
8185
06991777 8186#: submodule.c:114 submodule.c:143
a0b6b246
JX
8187msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
8188msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
8189
06991777 8190#: submodule.c:118 submodule.c:147
a0b6b246
JX
8191#, c-format
8192msgid "Could not find section in .gitmodules where path=%s"
8193msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
8194
06991777 8195#: submodule.c:154
a0b6b246
JX
8196#, c-format
8197msgid "Could not remove .gitmodules entry for %s"
8198msgstr "无法移除 %s 的 .gitmodules 条目"
8199
06991777 8200#: submodule.c:165
a0b6b246
JX
8201msgid "staging updated .gitmodules failed"
8202msgstr "将更新后 .gitmodules 添加暂存区失败"
8203
06991777 8204#: submodule.c:327
a4f16749
JX
8205#, c-format
8206msgid "in unpopulated submodule '%s'"
8207msgstr "位于未检出的子模组 '%s'"
8208
06991777 8209#: submodule.c:358
a4f16749
JX
8210#, c-format
8211msgid "Pathspec '%s' is in submodule '%.*s'"
8212msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
8213
2b472aae
JX
8214#: submodule.c:434
8215#, c-format
8216msgid "bad --ignore-submodules argument: %s"
8217msgstr "坏的 --ignore-submodules 参数:%s"
8218
d9488fea 8219#: submodule.c:816
2b472aae
JX
8220#, c-format
8221msgid ""
8222"Submodule in commit %s at path: '%s' collides with a submodule named the "
8223"same. Skipping it."
440e7442 8224msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。"
2b472aae 8225
d9488fea 8226#: submodule.c:919
6937cb4e
JX
8227#, c-format
8228msgid "submodule entry '%s' (%s) is a %s, not a commit"
493a9322 8229msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交"
6937cb4e 8230
d9488fea 8231#: submodule.c:1004
2b472aae
JX
8232#, c-format
8233msgid ""
8234"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
8235"submodule %s"
440e7442 8236msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes -n 1'"
2b472aae 8237
d9488fea 8238#: submodule.c:1127
2b472aae
JX
8239#, c-format
8240msgid "process for submodule '%s' failed"
440e7442 8241msgstr "处理子模组 '%s' 失败"
2b472aae 8242
d13389bf 8243#: submodule.c:1156 builtin/branch.c:680 builtin/submodule--helper.c:2469
6937cb4e
JX
8244msgid "Failed to resolve HEAD as a valid ref."
8245msgstr "无法将 HEAD 解析为有效引用。"
8246
d9488fea 8247#: submodule.c:1167
06991777 8248#, c-format
2b472aae
JX
8249msgid "Pushing submodule '%s'\n"
8250msgstr "正在推送子模组 '%s'\n"
06991777 8251
d9488fea 8252#: submodule.c:1170
2b472aae
JX
8253#, c-format
8254msgid "Unable to push submodule '%s'\n"
8255msgstr "无法推送子模组 '%s'\n"
8256
d9488fea 8257#: submodule.c:1462
2b472aae
JX
8258#, c-format
8259msgid "Fetching submodule %s%s\n"
8260msgstr "正在获取子模组 %s%s\n"
8261
d9488fea 8262#: submodule.c:1492
2b472aae
JX
8263#, c-format
8264msgid "Could not access submodule '%s'\n"
8265msgstr "无法访问子模组 '%s'\n"
8266
d9488fea 8267#: submodule.c:1646
2b472aae
JX
8268#, c-format
8269msgid ""
8270"Errors during submodule fetch:\n"
8271"%s"
8272msgstr ""
8273"获取子模组时的错误:\n"
8274"%s"
8275
d9488fea 8276#: submodule.c:1671
1a79b2f1 8277#, c-format
87cb7997 8278msgid "'%s' not recognized as a git repository"
d9488fea 8279msgstr "无法将 '%s' 识别为 git 仓库"
1a79b2f1 8280
d9488fea 8281#: submodule.c:1688
2b472aae
JX
8282#, c-format
8283msgid "Could not run 'git status --porcelain=2' in submodule %s"
8284msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'"
8285
d9488fea 8286#: submodule.c:1729
2b472aae
JX
8287#, c-format
8288msgid "'git status --porcelain=2' failed in submodule %s"
8289msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败"
8290
d9488fea 8291#: submodule.c:1804
1a79b2f1 8292#, c-format
87cb7997
JX
8293msgid "could not start 'git status' in submodule '%s'"
8294msgstr "无法在子模组 '%s' 中启动 'git status'"
1a79b2f1 8295
d9488fea 8296#: submodule.c:1817
87cb7997
JX
8297#, c-format
8298msgid "could not run 'git status' in submodule '%s'"
8299msgstr "无法在子模组 '%s' 中执行 'git status'"
8300
d9488fea 8301#: submodule.c:1832
06991777
JX
8302#, c-format
8303msgid "Could not unset core.worktree setting in submodule '%s'"
8304msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
8305
d9488fea 8306#: submodule.c:1859 submodule.c:2169
2b472aae
JX
8307#, c-format
8308msgid "could not recurse into submodule '%s'"
8309msgstr "无法递归进子模组路径 '%s'"
8310
d9488fea 8311#: submodule.c:1880
2b472aae
JX
8312msgid "could not reset submodule index"
8313msgstr "无法重置子模组索引"
8314
d9488fea 8315#: submodule.c:1922
87cb7997
JX
8316#, c-format
8317msgid "submodule '%s' has dirty index"
8318msgstr "子模组 '%s' 中有脏索引"
8319
d9488fea 8320#: submodule.c:1974
c1ac5258
JX
8321#, c-format
8322msgid "Submodule '%s' could not be updated."
8323msgstr "子模组 '%s' 无法被更新。"
8324
d9488fea 8325#: submodule.c:2042
ddc12c42
JX
8326#, c-format
8327msgid "submodule git dir '%s' is inside git dir '%.*s'"
8328msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中"
8329
d9488fea 8330#: submodule.c:2063
1a79b2f1
JX
8331#, c-format
8332msgid ""
8333"relocate_gitdir for submodule '%s' with more than one worktree not supported"
8334msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
8335
d9488fea 8336#: submodule.c:2075 submodule.c:2134
1a79b2f1
JX
8337#, c-format
8338msgid "could not lookup name for submodule '%s'"
8339msgstr "不能查询子模组 '%s' 的名称"
8340
d9488fea 8341#: submodule.c:2079
ddc12c42
JX
8342#, c-format
8343msgid "refusing to move '%s' into an existing git dir"
8344msgstr "禁止移动 '%s' 到现存 git 目录中"
8345
d9488fea 8346#: submodule.c:2086
1a79b2f1
JX
8347#, c-format
8348msgid ""
8349"Migrating git directory of '%s%s' from\n"
8350"'%s' to\n"
8351"'%s'\n"
8352msgstr ""
8353"将 '%s%s' 的 git 目录从\n"
8354"'%s' 迁移至\n"
8355"'%s'\n"
8356
d9488fea 8357#: submodule.c:2214
87cb7997
JX
8358msgid "could not start ls-files in .."
8359msgstr "无法在 .. 中启动 ls-files"
8360
d9488fea 8361#: submodule.c:2254
87cb7997
JX
8362#, c-format
8363msgid "ls-tree returned unexpected return code %d"
8364msgstr "ls-tree 返回未知返回值 %d"
8365
d9488fea 8366#: trailer.c:236
a0b6b246
JX
8367#, c-format
8368msgid "running trailer command '%s' failed"
8369msgstr "执行 trailer 命令 '%s' 失败"
8370
d9488fea
JX
8371#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551
8372#: trailer.c:555
a0b6b246
JX
8373#, c-format
8374msgid "unknown value '%s' for key '%s'"
8375msgstr "键 '%2$s' 的未知取值 '%1$s'"
8376
d13389bf 8377#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
a0b6b246
JX
8378#, c-format
8379msgid "more than one %s"
8380msgstr "多于一个 %s"
8381
d9488fea 8382#: trailer.c:728
a0b6b246
JX
8383#, c-format
8384msgid "empty trailer token in trailer '%.*s'"
d13389bf 8385msgstr "尾注 '%.*s' 的键为空"
a0b6b246 8386
d9488fea 8387#: trailer.c:748
a0b6b246
JX
8388#, c-format
8389msgid "could not read input file '%s'"
8390msgstr "不能读取输入文件 '%s'"
8391
d9488fea 8392#: trailer.c:751
a0b6b246
JX
8393msgid "could not read from stdin"
8394msgstr "不能自标准输入读取"
8395
d9488fea 8396#: trailer.c:1009 wrapper.c:676
a0b6b246
JX
8397#, c-format
8398msgid "could not stat %s"
65e2041e 8399msgstr "不能对 %s 调用 stat"
a0b6b246 8400
d9488fea 8401#: trailer.c:1011
a0b6b246
JX
8402#, c-format
8403msgid "file %s is not a regular file"
8404msgstr "文件 %s 不是一个正规文件"
8405
d9488fea 8406#: trailer.c:1013
a0b6b246
JX
8407#, c-format
8408msgid "file %s is not writable by user"
8409msgstr "文件 %s 用户不可写"
8410
d9488fea 8411#: trailer.c:1025
a0b6b246
JX
8412msgid "could not open temporary file"
8413msgstr "不能打开临时文件"
8414
d9488fea 8415#: trailer.c:1065
a0b6b246
JX
8416#, c-format
8417msgid "could not rename temporary file to %s"
8418msgstr "不能重命名临时文件为 %s"
8419
7157c2b5 8420#: transport-helper.c:62 transport-helper.c:91
c1ac5258
JX
8421msgid "full write to remote helper failed"
8422msgstr "完整写入远程助手失败"
8423
7157c2b5 8424#: transport-helper.c:145
c1ac5258
JX
8425#, c-format
8426msgid "unable to find remote helper for '%s'"
8427msgstr "无法为 '%s' 找到远程助手"
8428
7157c2b5 8429#: transport-helper.c:161 transport-helper.c:575
c1ac5258
JX
8430msgid "can't dup helper output fd"
8431msgstr "无法复制助手输出文件句柄"
8432
7157c2b5 8433#: transport-helper.c:214
c1ac5258
JX
8434#, c-format
8435msgid ""
8436"unknown mandatory capability %s; this remote helper probably needs newer "
8437"version of Git"
8438msgstr "未知的强制能力 %s,该远程助手可能需要新版本的Git"
8439
7157c2b5 8440#: transport-helper.c:220
c1ac5258
JX
8441msgid "this remote helper should implement refspec capability"
8442msgstr "远程助手需要实现 refspec 能力"
8443
7157c2b5 8444#: transport-helper.c:287 transport-helper.c:429
c1ac5258
JX
8445#, c-format
8446msgid "%s unexpectedly said: '%s'"
8447msgstr "%s 意外地说:'%s'"
8448
7157c2b5 8449#: transport-helper.c:417
c1ac5258
JX
8450#, c-format
8451msgid "%s also locked %s"
8452msgstr "%s 也锁定了 %s"
8453
7157c2b5 8454#: transport-helper.c:497
c1ac5258
JX
8455msgid "couldn't run fast-import"
8456msgstr "不能执行 fast-import"
8457
7157c2b5 8458#: transport-helper.c:520
c1ac5258
JX
8459msgid "error while running fast-import"
8460msgstr "执行 fast-import 出错"
8461
d13389bf 8462#: transport-helper.c:549 transport-helper.c:1236
c1ac5258
JX
8463#, c-format
8464msgid "could not read ref %s"
8465msgstr "无法读取引用 %s"
8466
7157c2b5 8467#: transport-helper.c:594
c1ac5258
JX
8468#, c-format
8469msgid "unknown response to connect: %s"
8470msgstr "连接时未知的响应:%s"
8471
7157c2b5 8472#: transport-helper.c:616
c1ac5258
JX
8473msgid "setting remote service path not supported by protocol"
8474msgstr "协议不支持设置远程服务路径"
8475
7157c2b5 8476#: transport-helper.c:618
c1ac5258
JX
8477msgid "invalid remote service path"
8478msgstr "无效的远程服务路径"
8479
d13389bf 8480#: transport-helper.c:661 transport.c:1446
349ede6a
JX
8481msgid "operation not supported by protocol"
8482msgstr "协议不支持该操作"
8483
7157c2b5 8484#: transport-helper.c:664
c1ac5258
JX
8485#, c-format
8486msgid "can't connect to subservice %s"
8487msgstr "不能连接到子服务 %s"
8488
d9488fea
JX
8489#: transport-helper.c:745
8490msgid "'option' without a matching 'ok/error' directive"
8491msgstr "'option' 缺乏一个匹配的 'ok/error' 指令"
8492
8493#: transport-helper.c:788
c1ac5258
JX
8494#, c-format
8495msgid "expected ok/error, helper said '%s'"
8496msgstr "预期 ok/error,助手说 '%s'"
8497
d13389bf 8498#: transport-helper.c:845
c1ac5258
JX
8499#, c-format
8500msgid "helper reported unexpected status of %s"
8501msgstr "助手报告 %s 的意外状态"
8502
d13389bf 8503#: transport-helper.c:928
a0b6b246 8504#, c-format
c1ac5258
JX
8505msgid "helper %s does not support dry-run"
8506msgstr "助手 %s 不支持 dry-run"
a0b6b246 8507
d13389bf 8508#: transport-helper.c:931
c1ac5258
JX
8509#, c-format
8510msgid "helper %s does not support --signed"
8511msgstr "助手 %s 不支持 --signed"
8512
d13389bf 8513#: transport-helper.c:934
c1ac5258
JX
8514#, c-format
8515msgid "helper %s does not support --signed=if-asked"
8516msgstr "助手 %s 不支持 --signed=if-asked"
8517
d13389bf 8518#: transport-helper.c:939
a5cd71ca
JX
8519#, c-format
8520msgid "helper %s does not support --atomic"
8521msgstr "助手 %s 不支持 --atomic"
8522
d13389bf
JX
8523#: transport-helper.c:943
8524#, c-format
8525msgid "helper %s does not support --%s"
8526msgstr "助手 %s 不支持 --%s"
8527
8528#: transport-helper.c:950
c1ac5258
JX
8529#, c-format
8530msgid "helper %s does not support 'push-option'"
8531msgstr "助手 %s 不支持 'push-option'"
8532
d13389bf 8533#: transport-helper.c:1050
c1ac5258
JX
8534msgid "remote-helper doesn't support push; refspec needed"
8535msgstr "remote-heper 不支持 push,需要引用表达式"
8536
d13389bf 8537#: transport-helper.c:1055
c1ac5258
JX
8538#, c-format
8539msgid "helper %s does not support 'force'"
8540msgstr "助手 %s 不支持 'force'"
8541
d13389bf 8542#: transport-helper.c:1102
c1ac5258
JX
8543msgid "couldn't run fast-export"
8544msgstr "无法执行 fast-export"
8545
d13389bf 8546#: transport-helper.c:1107
c1ac5258
JX
8547msgid "error while running fast-export"
8548msgstr "执行 fast-export 时出错"
8549
d13389bf 8550#: transport-helper.c:1132
c1ac5258
JX
8551#, c-format
8552msgid ""
8553"No refs in common and none specified; doing nothing.\n"
7157c2b5 8554"Perhaps you should specify a branch.\n"
c1ac5258
JX
8555msgstr ""
8556"没有共同的引用并且也没有指定,什么也不会做。\n"
7157c2b5
JX
8557"也许您应该指定一个分支。\n"
8558
d13389bf 8559#: transport-helper.c:1213
7157c2b5
JX
8560#, c-format
8561msgid "unsupported object format '%s'"
8562msgstr "不支持的对象格式 '%s'"
c1ac5258 8563
d13389bf 8564#: transport-helper.c:1222
c1ac5258
JX
8565#, c-format
8566msgid "malformed response in ref list: %s"
8567msgstr "引用列表中格式错误的响应:%s"
8568
d13389bf 8569#: transport-helper.c:1374
c1ac5258
JX
8570#, c-format
8571msgid "read(%s) failed"
8572msgstr "读取(%s)失败"
8573
d13389bf 8574#: transport-helper.c:1401
c1ac5258
JX
8575#, c-format
8576msgid "write(%s) failed"
8577msgstr "写(%s)失败"
8578
d13389bf 8579#: transport-helper.c:1450
c1ac5258
JX
8580#, c-format
8581msgid "%s thread failed"
8582msgstr "%s 线程失败"
8583
d13389bf 8584#: transport-helper.c:1454
c1ac5258
JX
8585#, c-format
8586msgid "%s thread failed to join: %s"
e640d114 8587msgstr "%s 线程等待失败:%s"
c1ac5258 8588
d13389bf 8589#: transport-helper.c:1473 transport-helper.c:1477
c1ac5258
JX
8590#, c-format
8591msgid "can't start thread for copying data: %s"
8592msgstr "不能启动线程来拷贝数据:%s"
8593
d13389bf 8594#: transport-helper.c:1514
c1ac5258
JX
8595#, c-format
8596msgid "%s process failed to wait"
8597msgstr "%s 进程等待失败"
8598
d13389bf 8599#: transport-helper.c:1518
c1ac5258
JX
8600#, c-format
8601msgid "%s process failed"
8602msgstr "%s 进程失败"
8603
d13389bf 8604#: transport-helper.c:1536 transport-helper.c:1545
c1ac5258
JX
8605msgid "can't start thread for copying data"
8606msgstr "不能启动线程来拷贝数据"
8607
349ede6a
JX
8608#: transport.c:116
8609#, c-format
8610msgid "Would set upstream of '%s' to '%s' of '%s'\n"
8611msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
8612
8613#: transport.c:145
8614#, c-format
8615msgid "could not read bundle '%s'"
d9488fea 8616msgstr "无法读取归档包 '%s'"
349ede6a 8617
7157c2b5 8618#: transport.c:220
349ede6a
JX
8619#, c-format
8620msgid "transport: invalid depth option '%s'"
8621msgstr "传输:无效的深度选项 '%s'"
8622
d9488fea 8623#: transport.c:269
349ede6a
JX
8624msgid "see protocol.version in 'git help config' for more details"
8625msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
8626
d9488fea 8627#: transport.c:270
349ede6a
JX
8628msgid "server options require protocol version 2 or later"
8629msgstr "服务端选项需要版本 2 协议或更高"
8630
d13389bf 8631#: transport.c:727
349ede6a
JX
8632msgid "could not parse transport.color.* config"
8633msgstr "不能解析 transport.color.* 配置"
8634
d13389bf 8635#: transport.c:802
349ede6a
JX
8636msgid "support for protocol v2 not implemented yet"
8637msgstr "协议 v2 的支持尚未实现"
8638
d13389bf 8639#: transport.c:936
349ede6a
JX
8640#, c-format
8641msgid "unknown value for config '%s': %s"
8642msgstr "配置 '%s' 的取值未知:%s"
8643
d13389bf 8644#: transport.c:1002
349ede6a
JX
8645#, c-format
8646msgid "transport '%s' not allowed"
8647msgstr "传输 '%s' 不允许"
8648
d13389bf 8649#: transport.c:1055
349ede6a
JX
8650msgid "git-over-rsync is no longer supported"
8651msgstr "不再支持 git-over-rsync"
8652
d13389bf 8653#: transport.c:1157
349ede6a
JX
8654#, c-format
8655msgid ""
8656"The following submodule paths contain changes that can\n"
8657"not be found on any remote:\n"
8658msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
8659
d13389bf 8660#: transport.c:1161
349ede6a
JX
8661#, c-format
8662msgid ""
8663"\n"
8664"Please try\n"
8665"\n"
8666"\tgit push --recurse-submodules=on-demand\n"
8667"\n"
8668"or cd to the path and use\n"
8669"\n"
8670"\tgit push\n"
8671"\n"
8672"to push them to a remote.\n"
8673"\n"
8674msgstr ""
8675"\n"
8676"请尝试\n"
8677"\n"
8678"\tgit push --recurse-submodules=on-demand\n"
8679"\n"
8680"或者进入到子目录执行\n"
8681"\n"
8682"\tgit push\n"
8683"\n"
8684"以推送至远程。\n"
8685"\n"
8686
d13389bf 8687#: transport.c:1169
349ede6a
JX
8688msgid "Aborting."
8689msgstr "正在终止。"
8690
d13389bf 8691#: transport.c:1315
349ede6a
JX
8692msgid "failed to push all needed submodules"
8693msgstr "不能推送全部需要的子模组"
8694
2b472aae 8695#: tree-walk.c:32
a0b6b246
JX
8696msgid "too-short tree object"
8697msgstr "太短的树对象"
8698
2b472aae 8699#: tree-walk.c:38
a0b6b246 8700msgid "malformed mode in tree entry"
29004bbb 8701msgstr "树对象中的条目模式错误"
a0b6b246 8702
2b472aae 8703#: tree-walk.c:42
a0b6b246
JX
8704msgid "empty filename in tree entry"
8705msgstr "树对象条目中空的文件名"
8706
2b472aae 8707#: tree-walk.c:117
a0b6b246
JX
8708msgid "too-short tree file"
8709msgstr "太短的树文件"
8710
349ede6a 8711#: unpack-trees.c:113
a0b6b246
JX
8712#, c-format
8713msgid ""
8714"Your local changes to the following files would be overwritten by checkout:\n"
8715"%%sPlease commit your changes or stash them before you switch branches."
8716msgstr ""
8717"您对下列文件的本地修改将被检出操作覆盖:\n"
a4f16749 8718"%%s请在切换分支前提交或贮藏您的修改。"
a0b6b246 8719
349ede6a 8720#: unpack-trees.c:115
a0b6b246
JX
8721#, c-format
8722msgid ""
8723"Your local changes to the following files would be overwritten by checkout:\n"
8724"%%s"
8725msgstr ""
8726"您对下列文件的本地修改将被检出操作覆盖:\n"
8727"%%s"
8728
349ede6a 8729#: unpack-trees.c:118
a0b6b246
JX
8730#, c-format
8731msgid ""
8732"Your local changes to the following files would be overwritten by merge:\n"
8733"%%sPlease commit your changes or stash them before you merge."
8734msgstr ""
8735"您对下列文件的本地修改将被合并操作覆盖:\n"
a4f16749 8736"%%s请在合并前提交或贮藏您的修改。"
a0b6b246 8737
349ede6a 8738#: unpack-trees.c:120
a0b6b246
JX
8739#, c-format
8740msgid ""
8741"Your local changes to the following files would be overwritten by merge:\n"
8742"%%s"
8743msgstr ""
8744"您对下列文件的本地修改将被合并操作覆盖:\n"
8745"%%s"
8746
349ede6a 8747#: unpack-trees.c:123
a0b6b246
JX
8748#, c-format
8749msgid ""
8750"Your local changes to the following files would be overwritten by %s:\n"
8751"%%sPlease commit your changes or stash them before you %s."
8752msgstr ""
8753"您对下列文件的本地修改将被 %s 覆盖:\n"
a4f16749 8754"%%s请在 %s 之前提交或贮藏您的修改。"
6792b93b 8755
349ede6a 8756#: unpack-trees.c:125
a0b6b246
JX
8757#, c-format
8758msgid ""
8759"Your local changes to the following files would be overwritten by %s:\n"
8760"%%s"
8761msgstr ""
8762"您对下列文件的本地修改将被 %s 覆盖:\n"
8763"%%s"
c04f5ac3 8764
349ede6a 8765#: unpack-trees.c:130
a0b6b246
JX
8766#, c-format
8767msgid ""
1a79b2f1 8768"Updating the following directories would lose untracked files in them:\n"
a0b6b246
JX
8769"%s"
8770msgstr ""
8771"更新如下目录将会丢失其中未跟踪的文件:\n"
8772"%s"
1b7f4a34 8773
349ede6a 8774#: unpack-trees.c:134
a0b6b246
JX
8775#, c-format
8776msgid ""
8777"The following untracked working tree files would be removed by checkout:\n"
8778"%%sPlease move or remove them before you switch branches."
8779msgstr ""
8780"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
8781"%%s请在切换分支之前移动或删除。"
2e8451e8 8782
349ede6a 8783#: unpack-trees.c:136
a0b6b246
JX
8784#, c-format
8785msgid ""
8786"The following untracked working tree files would be removed by checkout:\n"
8787"%%s"
8788msgstr ""
8789"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
8790"%%s"
1003b3a5 8791
349ede6a 8792#: unpack-trees.c:139
a0b6b246
JX
8793#, c-format
8794msgid ""
8795"The following untracked working tree files would be removed by merge:\n"
8796"%%sPlease move or remove them before you merge."
8797msgstr ""
8798"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
8799"%%s请在合并前移动或删除。"
1003b3a5 8800
349ede6a 8801#: unpack-trees.c:141
a0b6b246
JX
8802#, c-format
8803msgid ""
8804"The following untracked working tree files would be removed by merge:\n"
8805"%%s"
8806msgstr ""
8807"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
8808"%%s"
c04f5ac3 8809
349ede6a 8810#: unpack-trees.c:144
a0b6b246
JX
8811#, c-format
8812msgid ""
8813"The following untracked working tree files would be removed by %s:\n"
8814"%%sPlease move or remove them before you %s."
8815msgstr ""
8816"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
8817"%%s请在 %s 前移动或删除。"
c04f5ac3 8818
349ede6a 8819#: unpack-trees.c:146
a0b6b246
JX
8820#, c-format
8821msgid ""
8822"The following untracked working tree files would be removed by %s:\n"
8823"%%s"
8824msgstr ""
8825"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
8826"%%s"
c04f5ac3 8827
349ede6a 8828#: unpack-trees.c:152
a0b6b246
JX
8829#, c-format
8830msgid ""
8831"The following untracked working tree files would be overwritten by "
8832"checkout:\n"
8833"%%sPlease move or remove them before you switch branches."
8834msgstr ""
8835"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
8836"%%s请在切换分支前移动或删除。"
c04f5ac3 8837
349ede6a 8838#: unpack-trees.c:154
1003b3a5 8839#, c-format
4dcdc3d8 8840msgid ""
a0b6b246
JX
8841"The following untracked working tree files would be overwritten by "
8842"checkout:\n"
8843"%%s"
4dcdc3d8 8844msgstr ""
a0b6b246
JX
8845"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
8846"%%s"
1003b3a5 8847
349ede6a 8848#: unpack-trees.c:157
c04f5ac3 8849#, c-format
a0b6b246
JX
8850msgid ""
8851"The following untracked working tree files would be overwritten by merge:\n"
8852"%%sPlease move or remove them before you merge."
8853msgstr ""
8854"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
8855"%%s请在合并前移动或删除。"
c04f5ac3 8856
349ede6a 8857#: unpack-trees.c:159
a0b6b246
JX
8858#, c-format
8859msgid ""
8860"The following untracked working tree files would be overwritten by merge:\n"
8861"%%s"
8862msgstr ""
8863"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
8864"%%s"
c04f5ac3 8865
349ede6a 8866#: unpack-trees.c:162
a0b6b246
JX
8867#, c-format
8868msgid ""
8869"The following untracked working tree files would be overwritten by %s:\n"
8870"%%sPlease move or remove them before you %s."
8871msgstr ""
8872"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
8873"%%s请在 %s 前移动或删除。"
c04f5ac3 8874
349ede6a 8875#: unpack-trees.c:164
07432cef 8876#, c-format
a0b6b246
JX
8877msgid ""
8878"The following untracked working tree files would be overwritten by %s:\n"
8879"%%s"
8880msgstr ""
8881"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
8882"%%s"
c04f5ac3 8883
349ede6a 8884#: unpack-trees.c:172
07432cef 8885#, c-format
a0b6b246
JX
8886msgid "Entry '%s' overlaps with '%s'. Cannot bind."
8887msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
c04f5ac3 8888
349ede6a 8889#: unpack-trees.c:175
07432cef 8890#, c-format
ef317cd5 8891msgid ""
349ede6a 8892"Cannot update submodule:\n"
a0b6b246
JX
8893"%s"
8894msgstr ""
349ede6a 8895"无法更新子模组:\n"
a0b6b246 8896"%s"
c04f5ac3 8897
349ede6a 8898#: unpack-trees.c:178
07432cef 8899#, c-format
a0b6b246 8900msgid ""
349ede6a
JX
8901"The following paths are not up to date and were left despite sparse "
8902"patterns:\n"
a0b6b246
JX
8903"%s"
8904msgstr ""
349ede6a 8905"尽管存在稀疏检出模板,以下路径不是最新,因而保留:\n"
a0b6b246 8906"%s"
c04f5ac3 8907
349ede6a 8908#: unpack-trees.c:180
07432cef 8909#, c-format
a0b6b246 8910msgid ""
349ede6a 8911"The following paths are unmerged and were left despite sparse patterns:\n"
a0b6b246
JX
8912"%s"
8913msgstr ""
349ede6a 8914"尽管存在稀疏检出模板,以下路径处于未合并状态,因而保留:\n"
a0b6b246 8915"%s"
c04f5ac3 8916
349ede6a 8917#: unpack-trees.c:182
87cb7997
JX
8918#, c-format
8919msgid ""
349ede6a
JX
8920"The following paths were already present and thus not updated despite sparse "
8921"patterns:\n"
87cb7997
JX
8922"%s"
8923msgstr ""
349ede6a 8924"尽管存在稀疏检出模板,以下路径已经存在,因而未更新:\n"
87cb7997
JX
8925"%s"
8926
349ede6a 8927#: unpack-trees.c:262
07432cef 8928#, c-format
a0b6b246 8929msgid "Aborting\n"
a6cd2cc4 8930msgstr "正在终止\n"
ef317cd5 8931
349ede6a
JX
8932#: unpack-trees.c:289
8933#, c-format
8934msgid ""
8935"After fixing the above paths, you may want to run `git sparse-checkout "
8936"reapply`.\n"
8937msgstr "在修复上述路径之后,你可能要执行 `git sparse-checkout reapply`。\n"
8938
8939#: unpack-trees.c:350
a6cd2cc4
JX
8940msgid "Updating files"
8941msgstr "正在更新文件"
c04f5ac3 8942
349ede6a 8943#: unpack-trees.c:382
4c27fcb5
JX
8944msgid ""
8945"the following paths have collided (e.g. case-sensitive paths\n"
8946"on a case-insensitive filesystem) and only one from the same\n"
8947"colliding group is in the working tree:\n"
8948msgstr ""
8949"以下路径发生碰撞(如:在不区分大小写的文件系统上的区分大小写的路径),\n"
8950"并且碰撞组中只有一个文件存在工作区中:\n"
8951
349ede6a 8952#: unpack-trees.c:1498
ddc12c42
JX
8953msgid "Updating index flags"
8954msgstr "正在更新索引标志"
8955
d13389bf 8956#: upload-pack.c:1550
349ede6a
JX
8957msgid "expected flush after fetch arguments"
8958msgstr "在 fetch 参数之后应该有一个 flush 包"
8959
87cb7997 8960#: urlmatch.c:163
a0b6b246
JX
8961msgid "invalid URL scheme name or missing '://' suffix"
8962msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
8963
87cb7997 8964#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
07432cef 8965#, c-format
a0b6b246
JX
8966msgid "invalid %XX escape sequence"
8967msgstr "无效的 %XX 转义序列"
c04f5ac3 8968
87cb7997 8969#: urlmatch.c:215
a0b6b246
JX
8970msgid "missing host and scheme is not 'file:'"
8971msgstr "缺失主机名且 URL 方案不是 'file:'"
c04f5ac3 8972
87cb7997 8973#: urlmatch.c:232
a0b6b246
JX
8974msgid "a 'file:' URL may not have a port number"
8975msgstr "一个 'file:' URL 不应该包含端口号"
94550ed3 8976
87cb7997 8977#: urlmatch.c:247
a0b6b246
JX
8978msgid "invalid characters in host name"
8979msgstr "主机名中包含无效的字符"
90314792 8980
87cb7997 8981#: urlmatch.c:292 urlmatch.c:303
a0b6b246
JX
8982msgid "invalid port number"
8983msgstr "无效的端口号"
c04f5ac3 8984
87cb7997 8985#: urlmatch.c:371
a0b6b246
JX
8986msgid "invalid '..' path segment"
8987msgstr "无效的 '..' 路径片段"
5c0c220c 8988
2b472aae
JX
8989#: walker.c:170
8990msgid "Fetching objects"
8991msgstr "正在获取对象"
8992
d13389bf 8993#: worktree.c:236 builtin/am.c:2103
a77c07d9 8994#, c-format
a0b6b246 8995msgid "failed to read '%s'"
c1ac5258 8996msgstr "读取 '%s' 失败"
ef317cd5 8997
d9488fea 8998#: worktree.c:283
31e5e17b
JX
8999#, c-format
9000msgid "'%s' at main working tree is not the repository directory"
9001msgstr "在主工作区的 '%s' 不是仓库目录"
9002
d9488fea 9003#: worktree.c:294
31e5e17b
JX
9004#, c-format
9005msgid "'%s' file does not contain absolute path to the working tree location"
9006msgstr "文件 '%s' 不包含工作区的绝对路径"
9007
d9488fea 9008#: worktree.c:306
31e5e17b
JX
9009#, c-format
9010msgid "'%s' does not exist"
9011msgstr "'%s' 不存在"
9012
d9488fea 9013#: worktree.c:312
31e5e17b
JX
9014#, c-format
9015msgid "'%s' is not a .git file, error code %d"
9016msgstr "'%s' 不是一个 .git 文件,错误码 %d"
9017
d9488fea 9018#: worktree.c:321
31e5e17b
JX
9019#, c-format
9020msgid "'%s' does not point back to '%s'"
9021msgstr "'%s' 没有指回到 '%s'"
9022
d9488fea
JX
9023#: worktree.c:587
9024msgid "not a directory"
9025msgstr "不是一个目录"
9026
9027#: worktree.c:596
9028msgid ".git is not a file"
9029msgstr ".git 不是一个文件"
9030
9031#: worktree.c:598
9032msgid ".git file broken"
9033msgstr ".git 文件损坏"
9034
9035#: worktree.c:600
9036msgid ".git file incorrect"
9037msgstr ".git 文件不正确"
9038
9039#: worktree.c:670
9040msgid "not a valid path"
9041msgstr "不是一个有效的路径"
9042
9043#: worktree.c:676
9044msgid "unable to locate repository; .git is not a file"
9045msgstr "无法定位仓库,.git 不是一个文件"
9046
9047#: worktree.c:679
9048msgid "unable to locate repository; .git file broken"
9049msgstr "无法定位仓库,.git 文件损坏"
9050
9051#: worktree.c:685
9052msgid "gitdir unreadable"
9053msgstr "gitdir 不可读"
9054
9055#: worktree.c:689
9056msgid "gitdir incorrect"
9057msgstr "gitdir 不正确"
9058
9059#: wrapper.c:197 wrapper.c:367
c04f5ac3 9060#, c-format
a0b6b246
JX
9061msgid "could not open '%s' for reading and writing"
9062msgstr "无法打开 '%s' 进行读写"
c04f5ac3 9063
d9488fea 9064#: wrapper.c:398 wrapper.c:599
a0b6b246
JX
9065#, c-format
9066msgid "unable to access '%s'"
9067msgstr "不能访问 '%s'"
c04f5ac3 9068
d9488fea 9069#: wrapper.c:607
a0b6b246
JX
9070msgid "unable to get current working directory"
9071msgstr "不能获取当前工作目录"
c04f5ac3 9072
a6cd2cc4 9073#: wt-status.c:158
a0b6b246
JX
9074msgid "Unmerged paths:"
9075msgstr "未合并的路径:"
7aea43ff 9076
a0b6b246 9077# 译者:注意保持前导空格
a6cd2cc4
JX
9078#: wt-status.c:187 wt-status.c:219
9079msgid " (use \"git restore --staged <file>...\" to unstage)"
9080msgstr " (使用 \"git restore --staged <文件>...\" 以取消暂存)"
9081
9082# 译者:注意保持前导空格
9083#: wt-status.c:190 wt-status.c:222
c04f5ac3 9084#, c-format
a6cd2cc4
JX
9085msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
9086msgstr " (使用 \"git restore --source=%s --staged <文件>...\" 以取消暂存)"
c04f5ac3 9087
a0b6b246 9088# 译者:注意保持前导空格
a6cd2cc4 9089#: wt-status.c:193 wt-status.c:225
a0b6b246
JX
9090msgid " (use \"git rm --cached <file>...\" to unstage)"
9091msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
c04f5ac3 9092
a0b6b246 9093# 译者:注意保持前导空格
a6cd2cc4 9094#: wt-status.c:197
a0b6b246
JX
9095msgid " (use \"git add <file>...\" to mark resolution)"
9096msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
8ada9598 9097
a0b6b246 9098# 译者:注意保持前导空格
a6cd2cc4 9099#: wt-status.c:199 wt-status.c:203
a0b6b246
JX
9100msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
9101msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
8ada9598 9102
a0b6b246 9103# 译者:注意保持前导空格
a6cd2cc4 9104#: wt-status.c:201
a0b6b246
JX
9105msgid " (use \"git rm <file>...\" to mark resolution)"
9106msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
ef317cd5 9107
d9488fea 9108#: wt-status.c:211 wt-status.c:1070
a0b6b246
JX
9109msgid "Changes to be committed:"
9110msgstr "要提交的变更:"
ef317cd5 9111
d9488fea 9112#: wt-status.c:234 wt-status.c:1079
a0b6b246
JX
9113msgid "Changes not staged for commit:"
9114msgstr "尚未暂存以备提交的变更:"
ef317cd5 9115
a0b6b246 9116# 译者:注意保持前导空格
a6cd2cc4 9117#: wt-status.c:238
a0b6b246
JX
9118msgid " (use \"git add <file>...\" to update what will be committed)"
9119msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
ef317cd5 9120
a0b6b246 9121# 译者:注意保持前导空格
a6cd2cc4 9122#: wt-status.c:240
a0b6b246
JX
9123msgid " (use \"git add/rm <file>...\" to update what will be committed)"
9124msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
ef317cd5 9125
a0b6b246 9126# 译者:注意保持前导空格
a6cd2cc4 9127#: wt-status.c:241
a0b6b246 9128msgid ""
a6cd2cc4
JX
9129" (use \"git restore <file>...\" to discard changes in working directory)"
9130msgstr " (使用 \"git restore <文件>...\" 丢弃工作区的改动)"
ef317cd5 9131
a0b6b246 9132# 译者:注意保持前导空格
a6cd2cc4 9133#: wt-status.c:243
a0b6b246
JX
9134msgid " (commit or discard the untracked or modified content in submodules)"
9135msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
ef317cd5 9136
a0b6b246 9137# 译者:注意保持前导空格
a6cd2cc4 9138#: wt-status.c:254
a0b6b246
JX
9139#, c-format
9140msgid " (use \"git %s <file>...\" to include in what will be committed)"
9141msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
ef317cd5 9142
d9488fea 9143#: wt-status.c:266
a0b6b246
JX
9144msgid "both deleted:"
9145msgstr "双方删除:"
ef317cd5 9146
d9488fea 9147#: wt-status.c:268
a0b6b246
JX
9148msgid "added by us:"
9149msgstr "由我们添加:"
4dcdc3d8 9150
d9488fea 9151#: wt-status.c:270
a0b6b246
JX
9152msgid "deleted by them:"
9153msgstr "由他们删除:"
ef317cd5 9154
d9488fea 9155#: wt-status.c:272
a0b6b246
JX
9156msgid "added by them:"
9157msgstr "由他们添加:"
ef317cd5 9158
d9488fea 9159#: wt-status.c:274
a0b6b246
JX
9160msgid "deleted by us:"
9161msgstr "由我们删除:"
ef317cd5 9162
d9488fea 9163#: wt-status.c:276
a0b6b246
JX
9164msgid "both added:"
9165msgstr "双方添加:"
5c57d762 9166
d9488fea 9167#: wt-status.c:278
a0b6b246
JX
9168msgid "both modified:"
9169msgstr "双方修改:"
5c57d762 9170
d9488fea 9171#: wt-status.c:288
a0b6b246
JX
9172msgid "new file:"
9173msgstr "新文件:"
8ada9598 9174
d9488fea 9175#: wt-status.c:290
a0b6b246
JX
9176msgid "copied:"
9177msgstr "拷贝:"
8ada9598 9178
d9488fea 9179#: wt-status.c:292
a0b6b246
JX
9180msgid "deleted:"
9181msgstr "删除:"
8ada9598 9182
d9488fea 9183#: wt-status.c:294
a0b6b246
JX
9184msgid "modified:"
9185msgstr "修改:"
8ada9598 9186
d9488fea 9187#: wt-status.c:296
a0b6b246
JX
9188msgid "renamed:"
9189msgstr "重命名:"
5c57d762 9190
d9488fea 9191#: wt-status.c:298
a0b6b246
JX
9192msgid "typechange:"
9193msgstr "类型变更:"
8ada9598 9194
d9488fea 9195#: wt-status.c:300
a0b6b246
JX
9196msgid "unknown:"
9197msgstr "未知:"
8ada9598 9198
d9488fea 9199#: wt-status.c:302
a0b6b246
JX
9200msgid "unmerged:"
9201msgstr "未合并:"
8ada9598 9202
a0b6b246 9203# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
d9488fea 9204#: wt-status.c:382
a0b6b246
JX
9205msgid "new commits, "
9206msgstr "新提交, "
8ada9598 9207
a0b6b246 9208# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
d9488fea 9209#: wt-status.c:384
a0b6b246
JX
9210msgid "modified content, "
9211msgstr "修改的内容, "
1b7f4a34 9212
a0b6b246 9213# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
d9488fea 9214#: wt-status.c:386
a0b6b246
JX
9215msgid "untracked content, "
9216msgstr "未跟踪的内容, "
1b7f4a34 9217
d9488fea 9218#: wt-status.c:903
a4f16749
JX
9219#, c-format
9220msgid "Your stash currently has %d entry"
9221msgid_plural "Your stash currently has %d entries"
9222msgstr[0] "您的贮藏区当前有 %d 条记录"
9223msgstr[1] "您的贮藏区当前有 %d 条记录"
9224
d9488fea 9225#: wt-status.c:934
a0b6b246
JX
9226msgid "Submodules changed but not updated:"
9227msgstr "子模组已修改但尚未更新:"
1b7f4a34 9228
d9488fea 9229#: wt-status.c:936
a0b6b246
JX
9230msgid "Submodule changes to be committed:"
9231msgstr "要提交的子模组变更:"
1b7f4a34 9232
d9488fea 9233#: wt-status.c:1018
a0b6b246 9234msgid ""
6937cb4e
JX
9235"Do not modify or remove the line above.\n"
9236"Everything below it will be ignored."
a0b6b246 9237msgstr ""
6937cb4e
JX
9238"不要改动或删除上面的一行。\n"
9239"其下所有内容都将被忽略。"
1b7f4a34 9240
d9488fea 9241#: wt-status.c:1110
a6cd2cc4
JX
9242#, c-format
9243msgid ""
9244"\n"
9245"It took %.2f seconds to compute the branch ahead/behind values.\n"
9246"You can use '--no-ahead-behind' to avoid this.\n"
9247msgstr ""
9248"\n"
9249"花了 %.2f 秒才计算出分支的领先/落后范围。\n"
9250"为避免,您可以使用 '--no-ahead-behind'。\n"
9251
d9488fea 9252#: wt-status.c:1140
a0b6b246
JX
9253msgid "You have unmerged paths."
9254msgstr "您有尚未合并的路径。"
1b7f4a34 9255
a0b6b246 9256# 译者:注意保持前导空格
d9488fea 9257#: wt-status.c:1143
a0b6b246
JX
9258msgid " (fix conflicts and run \"git commit\")"
9259msgstr " (解决冲突并运行 \"git commit\")"
1b7f4a34 9260
a0b6b246 9261# 译者:注意保持前导空格
d9488fea 9262#: wt-status.c:1145
a0b6b246
JX
9263msgid " (use \"git merge --abort\" to abort the merge)"
9264msgstr " (使用 \"git merge --abort\" 终止合并)"
1b7f4a34 9265
d9488fea 9266#: wt-status.c:1149
a0b6b246
JX
9267msgid "All conflicts fixed but you are still merging."
9268msgstr "所有冲突已解决但您仍处于合并中。"
1b7f4a34 9269
a0b6b246 9270# 译者:注意保持前导空格
d9488fea 9271#: wt-status.c:1152
a0b6b246
JX
9272msgid " (use \"git commit\" to conclude merge)"
9273msgstr " (使用 \"git commit\" 结束合并)"
1b7f4a34 9274
d9488fea 9275#: wt-status.c:1161
a0b6b246
JX
9276msgid "You are in the middle of an am session."
9277msgstr "您正处于 am 操作过程中。"
1b7f4a34 9278
d9488fea 9279#: wt-status.c:1164
a0b6b246
JX
9280msgid "The current patch is empty."
9281msgstr "当前的补丁为空。"
1b7f4a34 9282
a0b6b246 9283# 译者:注意保持前导空格
d9488fea 9284#: wt-status.c:1168
a0b6b246
JX
9285msgid " (fix conflicts and then run \"git am --continue\")"
9286msgstr " (解决冲突,然后运行 \"git am --continue\")"
1b7f4a34 9287
a0b6b246 9288# 译者:注意保持前导空格
d9488fea 9289#: wt-status.c:1170
a0b6b246
JX
9290msgid " (use \"git am --skip\" to skip this patch)"
9291msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1b7f4a34 9292
a0b6b246 9293# 译者:注意保持前导空格
d9488fea 9294#: wt-status.c:1172
a0b6b246
JX
9295msgid " (use \"git am --abort\" to restore the original branch)"
9296msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1b7f4a34 9297
d9488fea 9298#: wt-status.c:1305
1a79b2f1
JX
9299msgid "git-rebase-todo is missing."
9300msgstr "git-rebase-todo 丢失。"
9301
d9488fea 9302#: wt-status.c:1307
a0b6b246
JX
9303msgid "No commands done."
9304msgstr "没有命令被执行。"
9305
d9488fea 9306#: wt-status.c:1310
1b7f4a34 9307#, c-format
a0b6b246
JX
9308msgid "Last command done (%d command done):"
9309msgid_plural "Last commands done (%d commands done):"
9310msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
9311msgstr[1] "最后的命令已完成(%d 条命令被执行):"
1b7f4a34 9312
d9488fea 9313#: wt-status.c:1321
1b7f4a34 9314#, c-format
a0b6b246
JX
9315msgid " (see more in file %s)"
9316msgstr " (更多参见文件 %s)"
9317
d9488fea 9318#: wt-status.c:1326
a0b6b246
JX
9319msgid "No commands remaining."
9320msgstr "未剩下任何命令。"
1b7f4a34 9321
d9488fea 9322#: wt-status.c:1329
1b7f4a34 9323#, c-format
a0b6b246
JX
9324msgid "Next command to do (%d remaining command):"
9325msgid_plural "Next commands to do (%d remaining commands):"
9326msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
9327msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
1b7f4a34 9328
a0b6b246 9329# 译者:注意保持前导空格
d9488fea 9330#: wt-status.c:1337
a0b6b246
JX
9331msgid " (use \"git rebase --edit-todo\" to view and edit)"
9332msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
1b7f4a34 9333
d9488fea 9334#: wt-status.c:1349
1b7f4a34 9335#, c-format
a0b6b246
JX
9336msgid "You are currently rebasing branch '%s' on '%s'."
9337msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1b7f4a34 9338
d9488fea 9339#: wt-status.c:1354
a0b6b246
JX
9340msgid "You are currently rebasing."
9341msgstr "您在执行变基操作。"
1b7f4a34 9342
a0b6b246 9343# 译者:注意保持前导空格
d9488fea 9344#: wt-status.c:1367
a0b6b246
JX
9345msgid " (fix conflicts and then run \"git rebase --continue\")"
9346msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1b7f4a34 9347
a0b6b246 9348# 译者:注意保持前导空格
d9488fea 9349#: wt-status.c:1369
a0b6b246
JX
9350msgid " (use \"git rebase --skip\" to skip this patch)"
9351msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
9352
9353# 译者:注意保持前导空格
d9488fea 9354#: wt-status.c:1371
a0b6b246
JX
9355msgid " (use \"git rebase --abort\" to check out the original branch)"
9356msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
9357
9358# 译者:注意保持前导空格
d9488fea 9359#: wt-status.c:1378
a0b6b246
JX
9360msgid " (all conflicts fixed: run \"git rebase --continue\")"
9361msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1b7f4a34 9362
d9488fea 9363#: wt-status.c:1382
a0b6b246 9364#, c-format
1b7f4a34 9365msgid ""
a0b6b246
JX
9366"You are currently splitting a commit while rebasing branch '%s' on '%s'."
9367msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1b7f4a34 9368
d9488fea 9369#: wt-status.c:1387
a0b6b246
JX
9370msgid "You are currently splitting a commit during a rebase."
9371msgstr "您在执行变基操作时拆分提交。"
1b7f4a34 9372
a0b6b246 9373# 译者:注意保持前导空格
d9488fea 9374#: wt-status.c:1390
a0b6b246
JX
9375msgid " (Once your working directory is clean, run \"git rebase --continue\")"
9376msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1b7f4a34 9377
d9488fea 9378#: wt-status.c:1394
a0b6b246
JX
9379#, c-format
9380msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
9381msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1b7f4a34 9382
d9488fea 9383#: wt-status.c:1399
a0b6b246
JX
9384msgid "You are currently editing a commit during a rebase."
9385msgstr "您在执行变基操作时编辑提交。"
1b7f4a34 9386
a0b6b246 9387# 译者:注意保持前导空格
d9488fea 9388#: wt-status.c:1402
a0b6b246
JX
9389msgid " (use \"git commit --amend\" to amend the current commit)"
9390msgstr " (使用 \"git commit --amend\" 修补当前提交)"
9391
9392# 译者:注意保持前导空格
d9488fea 9393#: wt-status.c:1404
a0b6b246
JX
9394msgid ""
9395" (use \"git rebase --continue\" once you are satisfied with your changes)"
9396msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1b7f4a34 9397
d9488fea 9398#: wt-status.c:1415
d46c5519
JX
9399msgid "Cherry-pick currently in progress."
9400msgstr "拣选操作正在进行中。"
9401
d9488fea 9402#: wt-status.c:1418
1b7f4a34 9403#, c-format
a0b6b246
JX
9404msgid "You are currently cherry-picking commit %s."
9405msgstr "您在执行拣选提交 %s 的操作。"
1b7f4a34 9406
a0b6b246 9407# 译者:注意保持前导空格
d9488fea 9408#: wt-status.c:1425
a0b6b246
JX
9409msgid " (fix conflicts and run \"git cherry-pick --continue\")"
9410msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1b7f4a34 9411
a0b6b246 9412# 译者:注意保持前导空格
d9488fea 9413#: wt-status.c:1428
d46c5519
JX
9414msgid " (run \"git cherry-pick --continue\" to continue)"
9415msgstr " (执行 \"git cherry-pick --continue\" 以继续)"
9416
9417# 译者:注意保持前导空格
d9488fea 9418#: wt-status.c:1431
a0b6b246
JX
9419msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
9420msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1b7f4a34 9421
a0b6b246 9422# 译者:注意保持前导空格
d9488fea 9423#: wt-status.c:1433
a5cd71ca
JX
9424msgid " (use \"git cherry-pick --skip\" to skip this patch)"
9425msgstr " (使用 \"git cherry-pick --skip\" 跳过此补丁)"
9426
9427# 译者:注意保持前导空格
d9488fea 9428#: wt-status.c:1435
a0b6b246
JX
9429msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
9430msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1b7f4a34 9431
d9488fea 9432#: wt-status.c:1445
d46c5519
JX
9433msgid "Revert currently in progress."
9434msgstr "还原操作正在行中。"
9435
d9488fea 9436#: wt-status.c:1448
1b7f4a34 9437#, c-format
a0b6b246
JX
9438msgid "You are currently reverting commit %s."
9439msgstr "您在执行反转提交 %s 的操作。"
1b7f4a34 9440
a0b6b246 9441# 译者:注意保持前导空格
d9488fea 9442#: wt-status.c:1454
a0b6b246 9443msgid " (fix conflicts and run \"git revert --continue\")"
5b533632 9444msgstr " (解决冲突并执行 \"git revert --continue\")"
1b7f4a34 9445
a0b6b246 9446# 译者:注意保持前导空格
d9488fea 9447#: wt-status.c:1457
d46c5519 9448msgid " (run \"git revert --continue\" to continue)"
5b533632 9449msgstr " (执行 \"git revert --continue\" 以继续)"
d46c5519
JX
9450
9451# 译者:注意保持前导空格
d9488fea 9452#: wt-status.c:1460
a0b6b246 9453msgid " (all conflicts fixed: run \"git revert --continue\")"
5b533632 9454msgstr " (所有冲突已解决:执行 \"git revert --continue\")"
1b7f4a34 9455
a0b6b246 9456# 译者:注意保持前导空格
d9488fea 9457#: wt-status.c:1462
a5cd71ca
JX
9458msgid " (use \"git revert --skip\" to skip this patch)"
9459msgstr " (使用 \"git revert --skip\" 跳过此补丁)"
9460
9461# 译者:注意保持前导空格
d9488fea 9462#: wt-status.c:1464
a0b6b246
JX
9463msgid " (use \"git revert --abort\" to cancel the revert operation)"
9464msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1b7f4a34 9465
d9488fea 9466#: wt-status.c:1474
1b7f4a34 9467#, c-format
a0b6b246
JX
9468msgid "You are currently bisecting, started from branch '%s'."
9469msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1b7f4a34 9470
d9488fea 9471#: wt-status.c:1478
a0b6b246
JX
9472msgid "You are currently bisecting."
9473msgstr "您在执行二分查找操作。"
1b7f4a34 9474
a0b6b246 9475# 译者:注意保持前导空格
d9488fea 9476#: wt-status.c:1481
a0b6b246
JX
9477msgid " (use \"git bisect reset\" to get back to the original branch)"
9478msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1b7f4a34 9479
d9488fea 9480#: wt-status.c:1492
7157c2b5
JX
9481#, c-format
9482msgid "You are in a sparse checkout with %d%% of tracked files present."
9483msgstr "您处于稀疏签出状态,包含 %d%% 的跟踪文件"
9484
d9488fea 9485#: wt-status.c:1731
a0b6b246
JX
9486msgid "On branch "
9487msgstr "位于分支 "
1b7f4a34 9488
d9488fea 9489#: wt-status.c:1738
a0b6b246
JX
9490msgid "interactive rebase in progress; onto "
9491msgstr "交互式变基操作正在进行中;至 "
1b7f4a34 9492
d9488fea 9493#: wt-status.c:1740
a0b6b246
JX
9494msgid "rebase in progress; onto "
9495msgstr "变基操作正在进行中;至 "
1b7f4a34 9496
d9488fea 9497#: wt-status.c:1750
a0b6b246
JX
9498msgid "Not currently on any branch."
9499msgstr "当前不在任何分支上。"
1b7f4a34 9500
d9488fea 9501#: wt-status.c:1767
a0b6b246
JX
9502msgid "Initial commit"
9503msgstr "初始提交"
1b7f4a34 9504
d9488fea 9505#: wt-status.c:1768
a4f16749
JX
9506msgid "No commits yet"
9507msgstr "尚无提交"
9508
d9488fea 9509#: wt-status.c:1782
a0b6b246
JX
9510msgid "Untracked files"
9511msgstr "未跟踪的文件"
1b7f4a34 9512
d9488fea 9513#: wt-status.c:1784
a0b6b246
JX
9514msgid "Ignored files"
9515msgstr "忽略的文件"
1b7f4a34 9516
d9488fea 9517#: wt-status.c:1788
a0b6b246
JX
9518#, c-format
9519msgid ""
9520"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
9521"may speed it up, but you have to be careful not to forget to add\n"
9522"new files yourself (see 'git help status')."
9523msgstr ""
9524"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
9525"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1b7f4a34 9526
d9488fea 9527#: wt-status.c:1794
a0b6b246
JX
9528#, c-format
9529msgid "Untracked files not listed%s"
9530msgstr "未跟踪的文件没有列出%s"
1b7f4a34 9531
a0b6b246 9532# 译者:中文字符串拼接,可删除前导空格
d9488fea 9533#: wt-status.c:1796
a0b6b246
JX
9534msgid " (use -u option to show untracked files)"
9535msgstr "(使用 -u 参数显示未跟踪的文件)"
1b7f4a34 9536
d9488fea 9537#: wt-status.c:1802
a0b6b246
JX
9538msgid "No changes"
9539msgstr "没有修改"
1b7f4a34 9540
d9488fea 9541#: wt-status.c:1807
a0b6b246
JX
9542#, c-format
9543msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
9544msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1b7f4a34 9545
d9488fea 9546#: wt-status.c:1811
a0b6b246
JX
9547#, c-format
9548msgid "no changes added to commit\n"
9549msgstr "修改尚未加入提交\n"
1b7f4a34 9550
7157c2b5 9551#: wt-status.c:1815
a0b6b246
JX
9552#, c-format
9553msgid ""
9554"nothing added to commit but untracked files present (use \"git add\" to "
9555"track)\n"
9556msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1b7f4a34 9557
d9488fea 9558#: wt-status.c:1819
a0b6b246
JX
9559#, c-format
9560msgid "nothing added to commit but untracked files present\n"
9561msgstr "提交为空,但是存在尚未跟踪的文件\n"
1b7f4a34 9562
a0b6b246 9563# 译者:中文字符串拼接,可删除前导空格
d9488fea 9564#: wt-status.c:1823
a0b6b246
JX
9565#, c-format
9566msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
9567msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1b7f4a34 9568
d9488fea 9569#: wt-status.c:1827 wt-status.c:1833
a0b6b246
JX
9570#, c-format
9571msgid "nothing to commit\n"
9572msgstr "无文件要提交\n"
1b7f4a34 9573
a0b6b246 9574# 译者:中文字符串拼接,可删除前导空格
d9488fea 9575#: wt-status.c:1830
a0b6b246
JX
9576#, c-format
9577msgid "nothing to commit (use -u to show untracked files)\n"
9578msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1b7f4a34 9579
a0b6b246 9580# 译者:中文字符串拼接,可删除前导空格
d9488fea 9581#: wt-status.c:1835
a0b6b246
JX
9582#, c-format
9583msgid "nothing to commit, working tree clean\n"
9584msgstr "无文件要提交,干净的工作区\n"
9585
d9488fea 9586#: wt-status.c:1940
a4f16749
JX
9587msgid "No commits yet on "
9588msgstr "尚无提交在 "
1b7f4a34 9589
d9488fea 9590#: wt-status.c:1944
a0b6b246
JX
9591msgid "HEAD (no branch)"
9592msgstr "HEAD(非分支)"
1b7f4a34 9593
d9488fea 9594#: wt-status.c:1975
31e5e17b
JX
9595msgid "different"
9596msgstr "不同"
9597
a0b6b246 9598# 译者:注意保持句尾空格
d9488fea 9599#: wt-status.c:1977 wt-status.c:1985
a0b6b246
JX
9600msgid "behind "
9601msgstr "落后 "
1b7f4a34 9602
d9488fea 9603#: wt-status.c:1980 wt-status.c:1983
a0b6b246
JX
9604msgid "ahead "
9605msgstr "领先 "
1b7f4a34 9606
a0b6b246 9607#. TRANSLATORS: the action is e.g. "pull with rebase"
d9488fea 9608#: wt-status.c:2505
a0b6b246
JX
9609#, c-format
9610msgid "cannot %s: You have unstaged changes."
9611msgstr "不能%s:您有未暂存的变更。"
1b7f4a34 9612
d9488fea 9613#: wt-status.c:2511
a0b6b246 9614msgid "additionally, your index contains uncommitted changes."
29004bbb 9615msgstr "另外,您的索引中包含未提交的变更。"
1b7f4a34 9616
d9488fea 9617#: wt-status.c:2513
a0b6b246
JX
9618#, c-format
9619msgid "cannot %s: Your index contains uncommitted changes."
9620msgstr "不能%s:您的索引中包含未提交的变更。"
1b7f4a34 9621
d13389bf 9622#: compat/precompose_utf8.c:58 builtin/clone.c:457
a5cd71ca
JX
9623#, c-format
9624msgid "failed to unlink '%s'"
9625msgstr "删除 '%s' 失败"
9626
ddc12c42 9627#: builtin/add.c:26
a0b6b246
JX
9628msgid "git add [<options>] [--] <pathspec>..."
9629msgstr "git add [<选项>] [--] <路径规格>..."
1b7f4a34 9630
2b472aae 9631#: builtin/add.c:88
a0b6b246
JX
9632#, c-format
9633msgid "unexpected diff status %c"
9634msgstr "意外的差异状态 %c"
1b7f4a34 9635
349ede6a 9636#: builtin/add.c:93 builtin/commit.c:285
a0b6b246
JX
9637msgid "updating files failed"
9638msgstr "更新文件失败"
1b7f4a34 9639
2b472aae 9640#: builtin/add.c:103
a0b6b246
JX
9641#, c-format
9642msgid "remove '%s'\n"
9643msgstr "删除 '%s'\n"
1b7f4a34 9644
2b472aae 9645#: builtin/add.c:178
a0b6b246
JX
9646msgid "Unstaged changes after refreshing the index:"
9647msgstr "刷新索引之后尚未被暂存的变更:"
1b7f4a34 9648
d13389bf 9649#: builtin/add.c:272 builtin/rev-parse.c:908
a0b6b246
JX
9650msgid "Could not read the index"
9651msgstr "不能读取索引"
1b7f4a34 9652
d9488fea 9653#: builtin/add.c:283
a0b6b246
JX
9654#, c-format
9655msgid "Could not open '%s' for writing."
c1ac5258 9656msgstr "无法为写入打开 '%s'。"
1b7f4a34 9657
d9488fea 9658#: builtin/add.c:287
a0b6b246
JX
9659msgid "Could not write patch"
9660msgstr "不能生成补丁"
1b7f4a34 9661
d9488fea 9662#: builtin/add.c:290
a0b6b246
JX
9663msgid "editing patch failed"
9664msgstr "编辑补丁失败"
1b7f4a34 9665
d9488fea 9666#: builtin/add.c:293
1b7f4a34 9667#, c-format
a0b6b246 9668msgid "Could not stat '%s'"
65e2041e 9669msgstr "不能对 '%s' 调用 stat"
1b7f4a34 9670
d9488fea 9671#: builtin/add.c:295
a0b6b246
JX
9672msgid "Empty patch. Aborted."
9673msgstr "空补丁。异常终止。"
1b7f4a34 9674
d9488fea 9675#: builtin/add.c:300
a0b6b246
JX
9676#, c-format
9677msgid "Could not apply '%s'"
9678msgstr "不能应用 '%s'"
1b7f4a34 9679
d9488fea 9680#: builtin/add.c:308
a0b6b246
JX
9681msgid "The following paths are ignored by one of your .gitignore files:\n"
9682msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 9683
d9488fea 9684#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124
d13389bf
JX
9685#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
9686#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
a0b6b246
JX
9687msgid "dry run"
9688msgstr "演习"
8ada9598 9689
d9488fea 9690#: builtin/add.c:331
a0b6b246
JX
9691msgid "interactive picking"
9692msgstr "交互式拣选"
8ada9598 9693
d13389bf 9694#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308
a0b6b246
JX
9695msgid "select hunks interactively"
9696msgstr "交互式挑选数据块"
8ada9598 9697
d9488fea 9698#: builtin/add.c:333
a0b6b246
JX
9699msgid "edit current diff and apply"
9700msgstr "编辑当前差异并应用"
8ada9598 9701
d9488fea 9702#: builtin/add.c:334
a0b6b246
JX
9703msgid "allow adding otherwise ignored files"
9704msgstr "允许添加忽略的文件"
8ada9598 9705
d9488fea 9706#: builtin/add.c:335
a0b6b246
JX
9707msgid "update tracked files"
9708msgstr "更新已跟踪的文件"
8ada9598 9709
d9488fea 9710#: builtin/add.c:336
5809aa05
JX
9711msgid "renormalize EOL of tracked files (implies -u)"
9712msgstr "对已跟踪文件(暗含 -u)重新归一换行符"
9713
d9488fea 9714#: builtin/add.c:337
a0b6b246
JX
9715msgid "record only the fact that the path will be added later"
9716msgstr "只记录,该路径稍后再添加"
8ada9598 9717
d9488fea 9718#: builtin/add.c:338
a0b6b246
JX
9719msgid "add changes from all tracked and untracked files"
9720msgstr "添加所有改变的已跟踪文件和未跟踪文件"
8ada9598 9721
d9488fea 9722#: builtin/add.c:341
a0b6b246
JX
9723msgid "ignore paths removed in the working tree (same as --no-all)"
9724msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
8ada9598 9725
d9488fea 9726#: builtin/add.c:343
a0b6b246
JX
9727msgid "don't add, only refresh the index"
9728msgstr "不添加,只刷新索引"
8ada9598 9729
d9488fea 9730#: builtin/add.c:344
a0b6b246
JX
9731msgid "just skip files which cannot be added because of errors"
9732msgstr "跳过因出错不能添加的文件"
8ada9598 9733
d9488fea 9734#: builtin/add.c:345
a0b6b246
JX
9735msgid "check if - even missing - files are ignored in dry run"
9736msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
8ada9598 9737
d9488fea 9738#: builtin/add.c:347 builtin/update-index.c:1004
a0b6b246
JX
9739msgid "override the executable bit of the listed files"
9740msgstr "覆盖列表里文件的可执行位"
8ada9598 9741
d9488fea 9742#: builtin/add.c:349
a4f16749
JX
9743msgid "warn when adding an embedded repository"
9744msgstr "创建一个嵌入式仓库时给予警告"
9745
d9488fea 9746#: builtin/add.c:351
2b472aae
JX
9747msgid "backend for `git stash -p`"
9748msgstr "`git stash -p` 的后端"
9749
d9488fea 9750#: builtin/add.c:369
a4f16749
JX
9751#, c-format
9752msgid ""
9753"You've added another git repository inside your current repository.\n"
9754"Clones of the outer repository will not contain the contents of\n"
9755"the embedded repository and will not know how to obtain it.\n"
9756"If you meant to add a submodule, use:\n"
9757"\n"
9758"\tgit submodule add <url> %s\n"
9759"\n"
9760"If you added this path by mistake, you can remove it from the\n"
9761"index with:\n"
9762"\n"
9763"\tgit rm --cached %s\n"
9764"\n"
9765"See \"git help submodule\" for more information."
9766msgstr ""
ddc12c42
JX
9767"您在当前仓库中添加了另一个Git仓库。克隆外层的仓库将不包含嵌入仓库的\n"
9768"内容,并且不知道该如何获取它。如果您要添加一个子模组,使用:\n"
a4f16749
JX
9769"\n"
9770"\tgit submodule add <url> %s\n"
9771"\n"
9772"如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n"
9773"\n"
9774"\tgit rm --cached %s\n"
9775"\n"
9776"参见 \"git help submodule\" 获取更多信息。"
9777
d9488fea 9778#: builtin/add.c:397
a4f16749
JX
9779#, c-format
9780msgid "adding embedded git repository: %s"
9781msgstr "正在添加嵌入式 git 仓库:%s"
9782
d9488fea 9783#: builtin/add.c:416
2b472aae
JX
9784msgid ""
9785"Use -f if you really want to add them.\n"
9786"Turn this message off by running\n"
9787"\"git config advice.addIgnoredFile false\""
9788msgstr ""
440e7442 9789"如果您确实要添加它们,使用 -f 参数。\n"
2b472aae
JX
9790"运行下面的命令来关闭本消息\n"
9791"\"git config advice.addIgnoredFile false\""
8ada9598 9792
d9488fea 9793#: builtin/add.c:425
a0b6b246
JX
9794msgid "adding files failed"
9795msgstr "添加文件失败"
8ada9598 9796
d9488fea 9797#: builtin/add.c:453 builtin/commit.c:345
ddc12c42
JX
9798msgid "--pathspec-from-file is incompatible with --interactive/--patch"
9799msgstr "--pathspec-from-file 与 --interactive/--patch 不兼容"
9800
d9488fea 9801#: builtin/add.c:470
ddc12c42
JX
9802msgid "--pathspec-from-file is incompatible with --edit"
9803msgstr "--pathspec-from-file 与 --edit 不兼容"
9804
d9488fea 9805#: builtin/add.c:482
a0b6b246
JX
9806msgid "-A and -u are mutually incompatible"
9807msgstr "-A 和 -u 选项互斥"
8ada9598 9808
d9488fea 9809#: builtin/add.c:485
a0b6b246
JX
9810msgid "Option --ignore-missing can only be used together with --dry-run"
9811msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 9812
d9488fea 9813#: builtin/add.c:489
8ada9598 9814#, c-format
a0b6b246
JX
9815msgid "--chmod param '%s' must be either -x or +x"
9816msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
8ada9598 9817
d13389bf
JX
9818#: builtin/add.c:507 builtin/checkout.c:1715 builtin/commit.c:351
9819#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502
ddc12c42
JX
9820msgid "--pathspec-from-file is incompatible with pathspec arguments"
9821msgstr "--pathspec-from-file 与路径表达式参数不兼容"
9822
d13389bf
JX
9823#: builtin/add.c:514 builtin/checkout.c:1727 builtin/commit.c:357
9824#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508
ddc12c42
JX
9825msgid "--pathspec-file-nul requires --pathspec-from-file"
9826msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
9827
d9488fea 9828#: builtin/add.c:518
8ada9598 9829#, c-format
a0b6b246
JX
9830msgid "Nothing specified, nothing added.\n"
9831msgstr "没有指定文件,也没有文件被添加。\n"
8ada9598 9832
d9488fea 9833#: builtin/add.c:520
2b472aae
JX
9834msgid ""
9835"Maybe you wanted to say 'git add .'?\n"
9836"Turn this message off by running\n"
9837"\"git config advice.addEmptyPathspec false\""
9838msgstr ""
9839"也许您想要执行 'git add .'?\n"
9840"运行下面的命令来关闭本消息\n"
9841"\"git config advice.addEmptyPathspec false\""
8ada9598 9842
d13389bf 9843#: builtin/am.c:352
a0b6b246
JX
9844msgid "could not parse author script"
9845msgstr "不能解析作者脚本"
8ada9598 9846
d13389bf 9847#: builtin/am.c:436
81809b99 9848#, c-format
a0b6b246
JX
9849msgid "'%s' was deleted by the applypatch-msg hook"
9850msgstr "'%s' 被 applypatch-msg 钩子删除"
8ada9598 9851
d13389bf 9852#: builtin/am.c:478
8ada9598 9853#, c-format
a0b6b246
JX
9854msgid "Malformed input line: '%s'."
9855msgstr "非法的输入行:'%s'。"
8ada9598 9856
d13389bf 9857#: builtin/am.c:516
8ada9598 9858#, c-format
a0b6b246
JX
9859msgid "Failed to copy notes from '%s' to '%s'"
9860msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
8ada9598 9861
d13389bf 9862#: builtin/am.c:542
a0b6b246
JX
9863msgid "fseek failed"
9864msgstr "fseek 失败"
8ada9598 9865
d13389bf 9866#: builtin/am.c:730
8ada9598 9867#, c-format
a0b6b246
JX
9868msgid "could not parse patch '%s'"
9869msgstr "无法解析补丁 '%s'"
8ada9598 9870
d13389bf 9871#: builtin/am.c:795
a0b6b246
JX
9872msgid "Only one StGIT patch series can be applied at once"
9873msgstr "一次只能有一个 StGIT 补丁队列被应用"
9874
d13389bf 9875#: builtin/am.c:843
a0b6b246
JX
9876msgid "invalid timestamp"
9877msgstr "无效的时间戳"
9878
d13389bf 9879#: builtin/am.c:848 builtin/am.c:860
a0b6b246
JX
9880msgid "invalid Date line"
9881msgstr "无效的日期行"
8ada9598 9882
d13389bf 9883#: builtin/am.c:855
a0b6b246
JX
9884msgid "invalid timezone offset"
9885msgstr "无效的时区偏移值"
8ada9598 9886
d13389bf 9887#: builtin/am.c:948
a0b6b246 9888msgid "Patch format detection failed."
87cb7997 9889msgstr "补丁格式探测失败。"
8ada9598 9890
d13389bf 9891#: builtin/am.c:953 builtin/clone.c:410
8ada9598 9892#, c-format
a0b6b246 9893msgid "failed to create directory '%s'"
c1ac5258 9894msgstr "创建目录 '%s' 失败"
8ada9598 9895
d13389bf 9896#: builtin/am.c:958
a0b6b246 9897msgid "Failed to split patches."
c1ac5258 9898msgstr "拆分补丁失败。"
814ff314 9899
d13389bf 9900#: builtin/am.c:1089
8ada9598 9901#, c-format
a0b6b246
JX
9902msgid "When you have resolved this problem, run \"%s --continue\"."
9903msgstr "当您解决这一问题,执行 \"%s --continue\"。"
8ada9598 9904
d13389bf 9905#: builtin/am.c:1090
81809b99 9906#, c-format
a0b6b246
JX
9907msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
9908msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
8ada9598 9909
d13389bf 9910#: builtin/am.c:1091
81809b99 9911#, c-format
a0b6b246
JX
9912msgid "To restore the original branch and stop patching, run \"%s --abort\"."
9913msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
8ada9598 9914
d13389bf 9915#: builtin/am.c:1174
4c27fcb5
JX
9916msgid "Patch sent with format=flowed; space at the end of lines might be lost."
9917msgstr "补丁使用 format=flowed 格式发送,行尾的空格可能会丢失。"
9918
d13389bf 9919#: builtin/am.c:1202
a4f16749
JX
9920msgid "Patch is empty."
9921msgstr "补丁为空。"
23ff3338 9922
d13389bf 9923#: builtin/am.c:1267
a5cd71ca
JX
9924#, c-format
9925msgid "missing author line in commit %s"
9926msgstr "在提交 %s 中缺失作者行"
9927
d13389bf 9928#: builtin/am.c:1270
8ada9598 9929#, c-format
a4f16749
JX
9930msgid "invalid ident line: %.*s"
9931msgstr "无效的身份标识:%.*s"
8ada9598 9932
d13389bf 9933#: builtin/am.c:1489
a0b6b246
JX
9934msgid "Repository lacks necessary blobs to fall back on 3-way merge."
9935msgstr "仓库缺乏必要的数据对象以进行三方合并。"
814ff314 9936
d13389bf 9937#: builtin/am.c:1491
a0b6b246
JX
9938msgid "Using index info to reconstruct a base tree..."
9939msgstr "使用索引来重建一个(三方合并的)基础目录树..."
8ada9598 9940
d13389bf 9941#: builtin/am.c:1510
a0b6b246
JX
9942msgid ""
9943"Did you hand edit your patch?\n"
9944"It does not apply to blobs recorded in its index."
9945msgstr ""
9946"您是否曾手动编辑过您的补丁?\n"
9947"无法应用补丁到索引中的数据对象上。"
23ff3338 9948
d13389bf 9949#: builtin/am.c:1516
a0b6b246
JX
9950msgid "Falling back to patching base and 3-way merge..."
9951msgstr "回落到基础版本上打补丁及进行三方合并..."
8ada9598 9952
d13389bf 9953#: builtin/am.c:1542
a0b6b246
JX
9954msgid "Failed to merge in the changes."
9955msgstr "无法合并变更。"
d691f479 9956
d13389bf 9957#: builtin/am.c:1574
a0b6b246
JX
9958msgid "applying to an empty history"
9959msgstr "正应用到一个空历史上"
8ada9598 9960
d13389bf 9961#: builtin/am.c:1626 builtin/am.c:1630
8ada9598 9962#, c-format
a0b6b246
JX
9963msgid "cannot resume: %s does not exist."
9964msgstr "无法继续:%s 不存在。"
8ada9598 9965
d13389bf 9966#: builtin/am.c:1648
a0b6b246
JX
9967msgid "Commit Body is:"
9968msgstr "提交内容为:"
8ada9598 9969
a0b6b246
JX
9970# 译者:注意保持句尾空格
9971#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9972#. in your translation. The program will only accept English
9973#. input at this point.
9974#.
d13389bf 9975#: builtin/am.c:1658
a6cd2cc4 9976#, c-format
a0b6b246
JX
9977msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
9978msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
8ada9598 9979
d13389bf 9980#: builtin/am.c:1704 builtin/commit.c:395
a5cd71ca
JX
9981msgid "unable to write index file"
9982msgstr "无法写入索引文件"
9983
d13389bf 9984#: builtin/am.c:1708
8ada9598 9985#, c-format
a0b6b246
JX
9986msgid "Dirty index: cannot apply patches (dirty: %s)"
9987msgstr "脏索引:不能应用补丁(脏文件:%s)"
8ada9598 9988
d13389bf 9989#: builtin/am.c:1748 builtin/am.c:1816
81809b99 9990#, c-format
a0b6b246
JX
9991msgid "Applying: %.*s"
9992msgstr "应用:%.*s"
8ada9598 9993
d13389bf 9994#: builtin/am.c:1765
a0b6b246
JX
9995msgid "No changes -- Patch already applied."
9996msgstr "没有变更 —— 补丁已经应用过。"
8ada9598 9997
d13389bf 9998#: builtin/am.c:1771
81809b99 9999#, c-format
a0b6b246
JX
10000msgid "Patch failed at %s %.*s"
10001msgstr "打补丁失败于 %s %.*s"
8ada9598 10002
d13389bf 10003#: builtin/am.c:1775
2b472aae
JX
10004msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
10005msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁"
8ada9598 10006
d13389bf 10007#: builtin/am.c:1819
a0b6b246
JX
10008msgid ""
10009"No changes - did you forget to use 'git add'?\n"
10010"If there is nothing left to stage, chances are that something else\n"
10011"already introduced the same changes; you might want to skip this patch."
10012msgstr ""
10013"没有变更 —— 您是不是忘了执行 'git add'?\n"
10014"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
10015"您也许想要跳过这个补丁。"
8ada9598 10016
d13389bf 10017#: builtin/am.c:1826
a0b6b246
JX
10018msgid ""
10019"You still have unmerged paths in your index.\n"
a4f16749
JX
10020"You should 'git add' each file with resolved conflicts to mark them as "
10021"such.\n"
10022"You might run `git rm` on a file to accept \"deleted by them\" for it."
a0b6b246 10023msgstr ""
a4f16749
JX
10024"在您的索引中仍存在未合并的路径。\n"
10025"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
10026"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
8ada9598 10027
d13389bf 10028#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347
349ede6a 10029#: builtin/reset.c:355
8ada9598 10030#, c-format
a0b6b246
JX
10031msgid "Could not parse object '%s'."
10032msgstr "不能解析对象 '%s'。"
8ada9598 10033
d13389bf 10034#: builtin/am.c:1985
a0b6b246 10035msgid "failed to clean index"
c1ac5258 10036msgstr "清空索引失败"
5b04ee3b 10037
d13389bf 10038#: builtin/am.c:2029
a0b6b246
JX
10039msgid ""
10040"You seem to have moved HEAD since the last 'am' failure.\n"
10041"Not rewinding to ORIG_HEAD"
10042msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
8ada9598 10043
d13389bf 10044#: builtin/am.c:2136
8ada9598 10045#, c-format
a0b6b246
JX
10046msgid "Invalid value for --patch-format: %s"
10047msgstr "无效的 --patch-format 值:%s"
8ada9598 10048
d13389bf 10049#: builtin/am.c:2178
2b472aae
JX
10050#, c-format
10051msgid "Invalid value for --show-current-patch: %s"
10052msgstr "无效的 --show-current-patch 值:%s"
10053
d13389bf 10054#: builtin/am.c:2182
2b472aae
JX
10055#, c-format
10056msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
10057msgstr "--show-current-patch=%s 和 --show-current-patch=%s 不兼容"
10058
d13389bf 10059#: builtin/am.c:2213
a0b6b246
JX
10060msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
10061msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
5b04ee3b 10062
d13389bf 10063#: builtin/am.c:2214
a0b6b246
JX
10064msgid "git am [<options>] (--continue | --skip | --abort)"
10065msgstr "git am [<选项>] (--continue | --skip | --abort)"
8ada9598 10066
d13389bf 10067#: builtin/am.c:2220
a0b6b246
JX
10068msgid "run interactively"
10069msgstr "以交互式方式运行"
8ada9598 10070
d13389bf 10071#: builtin/am.c:2222
a0b6b246
JX
10072msgid "historical option -- no-op"
10073msgstr "老的参数 —— 无作用"
8ada9598 10074
d13389bf 10075#: builtin/am.c:2224
a0b6b246
JX
10076msgid "allow fall back on 3way merging if needed"
10077msgstr "如果必要,允许使用三方合并。"
8ada9598 10078
d13389bf
JX
10079#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
10080#: builtin/repack.c:335 builtin/stash.c:815
a0b6b246
JX
10081msgid "be quiet"
10082msgstr "静默模式"
8ada9598 10083
d13389bf
JX
10084#: builtin/am.c:2227
10085msgid "add a Signed-off-by trailer to the commit message"
10086msgstr "在提交说明中添加 Signed-off-by 尾注"
5c57d762 10087
d13389bf 10088#: builtin/am.c:2230
a0b6b246
JX
10089msgid "recode into utf8 (default)"
10090msgstr "使用 utf8 字符集(默认)"
5c57d762 10091
d13389bf 10092#: builtin/am.c:2232
a0b6b246
JX
10093msgid "pass -k flag to git-mailinfo"
10094msgstr "向 git-mailinfo 传递 -k 参数"
5c57d762 10095
d13389bf 10096#: builtin/am.c:2234
a0b6b246
JX
10097msgid "pass -b flag to git-mailinfo"
10098msgstr "向 git-mailinfo 传递 -b 参数"
5c57d762 10099
d13389bf 10100#: builtin/am.c:2236
a0b6b246
JX
10101msgid "pass -m flag to git-mailinfo"
10102msgstr "向 git-mailinfo 传递 -m 参数"
5c57d762 10103
d13389bf 10104#: builtin/am.c:2238
a0b6b246
JX
10105msgid "pass --keep-cr flag to git-mailsplit for mbox format"
10106msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
5c57d762 10107
d13389bf 10108#: builtin/am.c:2241
a0b6b246
JX
10109msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
10110msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
8ada9598 10111
d13389bf 10112#: builtin/am.c:2244
a0b6b246
JX
10113msgid "strip everything before a scissors line"
10114msgstr "丢弃裁切线前的所有内容"
8ada9598 10115
d13389bf
JX
10116#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
10117#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
10118#: builtin/am.c:2273
a0b6b246
JX
10119msgid "pass it through git-apply"
10120msgstr "传递给 git-apply"
8ada9598 10121
d13389bf
JX
10122#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
10123#: builtin/fmt-merge-msg.c:20 builtin/grep.c:903 builtin/merge.c:260
349ede6a 10124#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
d13389bf
JX
10125#: builtin/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350
10126#: builtin/repack.c:352 builtin/show-branch.c:650 builtin/show-ref.c:172
349ede6a
JX
10127#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175
10128#: parse-options.h:316
a0b6b246
JX
10129msgid "n"
10130msgstr "n"
8ada9598 10131
d13389bf 10132#: builtin/am.c:2269 builtin/branch.c:661 builtin/bugreport.c:136
d9488fea
JX
10133#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438
10134#: builtin/verify-tag.c:38
a0b6b246
JX
10135msgid "format"
10136msgstr "格式"
8ada9598 10137
d13389bf 10138#: builtin/am.c:2270
a0b6b246
JX
10139msgid "format the patch(es) are in"
10140msgstr "补丁的格式"
8ada9598 10141
d13389bf 10142#: builtin/am.c:2276
a0b6b246
JX
10143msgid "override error message when patch failure occurs"
10144msgstr "打补丁失败时显示的错误信息"
8ada9598 10145
d13389bf 10146#: builtin/am.c:2278
a0b6b246
JX
10147msgid "continue applying patches after resolving a conflict"
10148msgstr "冲突解决后继续应用补丁"
814ff314 10149
d13389bf 10150#: builtin/am.c:2281
a0b6b246
JX
10151msgid "synonyms for --continue"
10152msgstr "和 --continue 同义"
8ada9598 10153
d13389bf 10154#: builtin/am.c:2284
a0b6b246
JX
10155msgid "skip the current patch"
10156msgstr "跳过当前补丁"
23ff3338 10157
d13389bf 10158#: builtin/am.c:2287
a0b6b246
JX
10159msgid "restore the original branch and abort the patching operation."
10160msgstr "恢复原始分支并终止打补丁操作。"
8ada9598 10161
d13389bf 10162#: builtin/am.c:2290
31e5e17b
JX
10163msgid "abort the patching operation but keep HEAD where it is."
10164msgstr "终止补丁操作但保持 HEAD 不变。"
10165
d13389bf 10166#: builtin/am.c:2294
2b472aae
JX
10167msgid "show the patch being applied"
10168msgstr "显示正在应用的补丁"
31e5e17b 10169
d13389bf 10170#: builtin/am.c:2299
a0b6b246
JX
10171msgid "lie about committer date"
10172msgstr "将作者日期作为提交日期"
8ada9598 10173
d13389bf 10174#: builtin/am.c:2301
a0b6b246
JX
10175msgid "use current timestamp for author date"
10176msgstr "用当前时间作为作者日期"
8ada9598 10177
d13389bf
JX
10178#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
10179#: builtin/merge.c:297 builtin/pull.c:175 builtin/rebase.c:536
10180#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419
a0b6b246
JX
10181msgid "key-id"
10182msgstr "key-id"
8ada9598 10183
d13389bf 10184#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395
a0b6b246
JX
10185msgid "GPG-sign commits"
10186msgstr "使用 GPG 签名提交"
8ada9598 10187
d13389bf 10188#: builtin/am.c:2307
a0b6b246
JX
10189msgid "(internal use for git-rebase)"
10190msgstr "(内部使用,用于 git-rebase)"
8ada9598 10191
d13389bf 10192#: builtin/am.c:2325
a0b6b246
JX
10193msgid ""
10194"The -b/--binary option has been a no-op for long time, and\n"
10195"it will be removed. Please do not use it anymore."
10196msgstr ""
10197"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
10198"请不要再使用它了。"
8ada9598 10199
d13389bf 10200#: builtin/am.c:2332
a0b6b246 10201msgid "failed to read the index"
c1ac5258 10202msgstr "读取索引失败"
8ada9598 10203
d13389bf 10204#: builtin/am.c:2347
a0b6b246
JX
10205#, c-format
10206msgid "previous rebase directory %s still exists but mbox given."
10207msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
8ada9598 10208
d13389bf 10209#: builtin/am.c:2371
a0b6b246
JX
10210#, c-format
10211msgid ""
10212"Stray %s directory found.\n"
10213"Use \"git am --abort\" to remove it."
10214msgstr ""
10215"发现了错误的 %s 目录。\n"
10216"使用 \"git am --abort\" 删除它。"
c04f5ac3 10217
d13389bf 10218#: builtin/am.c:2377
a0b6b246
JX
10219msgid "Resolve operation not in progress, we are not resuming."
10220msgstr "解决操作未进行,我们不会继续。"
c04f5ac3 10221
d13389bf 10222#: builtin/am.c:2387
a6cd2cc4
JX
10223msgid "interactive mode requires patches on the command line"
10224msgstr "交互式模式需要命令行上提供补丁"
10225
a0b6b246
JX
10226#: builtin/apply.c:8
10227msgid "git apply [<options>] [<patch>...]"
10228msgstr "git apply [<选项>] [<补丁>...]"
c04f5ac3 10229
c04f5ac3
JX
10230#: builtin/archive.c:17
10231#, c-format
10232msgid "could not create archive file '%s'"
90e6ef53 10233msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
10234
10235#: builtin/archive.c:20
10236msgid "could not redirect output"
195febda 10237msgstr "不能重定向输出"
c04f5ac3
JX
10238
10239#: builtin/archive.c:37
10240msgid "git archive: Remote with no URL"
4375c10e 10241msgstr "git archive:未提供远程 URL"
c04f5ac3 10242
06991777 10243#: builtin/archive.c:61
31e5e17b
JX
10244msgid "git archive: expected ACK/NAK, got a flush packet"
10245msgstr "git archive:期望是 ACK/NAK,却得到 flush 包"
c04f5ac3 10246
06991777 10247#: builtin/archive.c:64
c04f5ac3
JX
10248#, c-format
10249msgid "git archive: NACK %s"
90e6ef53 10250msgstr "git archive:NACK %s"
c04f5ac3 10251
06991777 10252#: builtin/archive.c:65
c04f5ac3 10253msgid "git archive: protocol error"
90e6ef53 10254msgstr "git archive:协议错误"
c04f5ac3 10255
06991777 10256#: builtin/archive.c:69
c04f5ac3 10257msgid "git archive: expected a flush"
31e5e17b 10258msgstr "git archive:应有一个 flush 包"
c04f5ac3 10259
06991777 10260#: builtin/bisect--helper.c:23
06991777
JX
10261msgid "git bisect--helper --bisect-reset [<commit>]"
10262msgstr "git bisect--helper --bisect-reset [<提交>]"
10263
d13389bf 10264#: builtin/bisect--helper.c:24
06991777
JX
10265msgid ""
10266"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
10267"<bad_term>"
10268msgstr ""
10269"git bisect--helper --bisect-write [--no-log] <状态> <版本> <好-术语> <坏-术语"
10270">"
10271
d13389bf 10272#: builtin/bisect--helper.c:25
06991777
JX
10273msgid ""
10274"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
10275"<bad_term>"
10276msgstr ""
10277"git bisect--helper --bisect-check-and-set-terms <命令> <好-术语> <坏-术语>"
10278
d13389bf 10279#: builtin/bisect--helper.c:26
06991777
JX
10280msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
10281msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]"
10282
d13389bf 10283#: builtin/bisect--helper.c:27
06991777
JX
10284msgid ""
10285"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
10286"term-new]"
10287msgstr ""
10288"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
10289"term-new]"
10290
d13389bf 10291#: builtin/bisect--helper.c:28
06991777 10292msgid ""
d9488fea
JX
10293"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
10294"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
10295"[<paths>...]"
06991777 10296msgstr ""
d9488fea
JX
10297"git bisect--helper --bisect-start [--term-{new,bad}=<术语> --term-{old,good}"
10298"=<术语>] [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径>...]"
10299
d13389bf 10300#: builtin/bisect--helper.c:30
d9488fea
JX
10301msgid "git bisect--helper --bisect-next"
10302msgstr "git bisect--helper --bisect-next"
10303
d13389bf 10304#: builtin/bisect--helper.c:31
d9488fea
JX
10305msgid "git bisect--helper --bisect-auto-next"
10306msgstr "git bisect--helper --bisect-auto-next"
06991777 10307
d13389bf
JX
10308#: builtin/bisect--helper.c:32
10309msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
10310msgstr "git bisect--helper --bisect-state (bad|new) [<版本>]"
10311
10312#: builtin/bisect--helper.c:33
10313msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
10314msgstr "git bisect--helper --bisect-state (good|old) [<版本>...]"
d9488fea 10315
d13389bf 10316#: builtin/bisect--helper.c:108
d9488fea
JX
10317#, c-format
10318msgid "cannot open file '%s' in mode '%s'"
10319msgstr "不能以 '%2$s' 模式打开文件 '%1$s'"
10320
d13389bf 10321#: builtin/bisect--helper.c:115
d9488fea
JX
10322#, c-format
10323msgid "could not write to file '%s'"
10324msgstr "不能写入文件 '%s'"
10325
d13389bf 10326#: builtin/bisect--helper.c:154
5809aa05
JX
10327#, c-format
10328msgid "'%s' is not a valid term"
10329msgstr "'%s' 不是一个有效的术语"
10330
d13389bf 10331#: builtin/bisect--helper.c:158
5809aa05
JX
10332#, c-format
10333msgid "can't use the builtin command '%s' as a term"
10334msgstr "不能使用内置命令 '%s' 作为术语"
10335
d13389bf 10336#: builtin/bisect--helper.c:168
5809aa05
JX
10337#, c-format
10338msgid "can't change the meaning of the term '%s'"
10339msgstr "不能修改术语 '%s' 的含义"
10340
d13389bf 10341#: builtin/bisect--helper.c:178
5809aa05
JX
10342msgid "please use two different terms"
10343msgstr "请使用两个不同的术语"
10344
d13389bf 10345#: builtin/bisect--helper.c:194
06991777
JX
10346#, c-format
10347msgid "We are not bisecting.\n"
10348msgstr "我们没有在二分查找。\n"
10349
d13389bf 10350#: builtin/bisect--helper.c:202
06991777
JX
10351#, c-format
10352msgid "'%s' is not a valid commit"
10353msgstr "'%s' 不是一个有效的提交"
10354
d13389bf 10355#: builtin/bisect--helper.c:211
06991777
JX
10356#, c-format
10357msgid ""
10358"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
10359msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
10360
d13389bf 10361#: builtin/bisect--helper.c:255
06991777
JX
10362#, c-format
10363msgid "Bad bisect_write argument: %s"
10364msgstr "坏的 bisect_write 参数:%s"
10365
d13389bf 10366#: builtin/bisect--helper.c:260
06991777
JX
10367#, c-format
10368msgid "couldn't get the oid of the rev '%s'"
5b533632 10369msgstr "无法获取版本 '%s' 的对象 ID"
06991777 10370
d13389bf 10371#: builtin/bisect--helper.c:272
06991777
JX
10372#, c-format
10373msgid "couldn't open the file '%s'"
10374msgstr "无法打开文件 '%s'"
10375
d13389bf 10376#: builtin/bisect--helper.c:298
06991777
JX
10377#, c-format
10378msgid "Invalid command: you're currently in a %s/%s bisect"
10379msgstr "无效的命令:您当前正处于一个 %s/%s 二分查找中"
10380
d13389bf 10381#: builtin/bisect--helper.c:325
06991777
JX
10382#, c-format
10383msgid ""
10384"You need to give me at least one %s and %s revision.\n"
10385"You can use \"git bisect %s\" and \"git bisect %s\" for that."
10386msgstr ""
10387"您需要给我至少一个 %s 和一个 %s 版本。\n"
10388"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
10389
d13389bf 10390#: builtin/bisect--helper.c:329
06991777
JX
10391#, c-format
10392msgid ""
10393"You need to start by \"git bisect start\".\n"
10394"You then need to give me at least one %s and %s revision.\n"
10395"You can use \"git bisect %s\" and \"git bisect %s\" for that."
10396msgstr ""
10397"您需要执行 \"git bisect start\" 来开始。\n"
10398"然后需要提供我至少一个 %s 和一个 %s 版本。\n"
10399"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
10400
d13389bf 10401#: builtin/bisect--helper.c:349
06991777
JX
10402#, c-format
10403msgid "bisecting only with a %s commit"
5b533632 10404msgstr "在只有一个 %s 提交的情况下二分查找"
06991777
JX
10405
10406# 译者:注意保持句尾空格
10407#. TRANSLATORS: Make sure to include [Y] and [n] in your
10408#. translation. The program will only accept English input
10409#. at this point.
10410#.
d13389bf 10411#: builtin/bisect--helper.c:357
06991777
JX
10412msgid "Are you sure [Y/n]? "
10413msgstr "您确认么[Y/n]? "
10414
d13389bf 10415#: builtin/bisect--helper.c:418
06991777
JX
10416msgid "no terms defined"
10417msgstr "未定义术语"
10418
d13389bf 10419#: builtin/bisect--helper.c:421
06991777
JX
10420#, c-format
10421msgid ""
10422"Your current terms are %s for the old state\n"
10423"and %s for the new state.\n"
10424msgstr "您当前针对旧状态的术语是 %s,对新状态的术语是 %s。\n"
10425
d13389bf 10426#: builtin/bisect--helper.c:431
06991777
JX
10427#, c-format
10428msgid ""
10429"invalid argument %s for 'git bisect terms'.\n"
10430"Supported options are: --term-good|--term-old and --term-bad|--term-new."
10431msgstr ""
10432"命令 'git bisect terms' 的参数 %s 无效。\n"
10433"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
10434
d13389bf 10435#: builtin/bisect--helper.c:498
d9488fea
JX
10436msgid "revision walk setup failed\n"
10437msgstr "版本遍历设置失败\n"
10438
d13389bf 10439#: builtin/bisect--helper.c:520
d9488fea
JX
10440#, c-format
10441msgid "could not open '%s' for appending"
10442msgstr "无法打开 '%s' 进行追加"
10443
d13389bf 10444#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652
7157c2b5
JX
10445msgid "'' is not a valid term"
10446msgstr "'' 不是一个有效的术语"
10447
d13389bf 10448#: builtin/bisect--helper.c:662
06991777
JX
10449#, c-format
10450msgid "unrecognized option: '%s'"
10451msgstr "未识别的选项:'%s'"
10452
d13389bf 10453#: builtin/bisect--helper.c:666
06991777
JX
10454#, c-format
10455msgid "'%s' does not appear to be a valid revision"
8e4e0555 10456msgstr "'%s' 看起来不是一个有效的版本"
06991777 10457
d13389bf 10458#: builtin/bisect--helper.c:697
06991777
JX
10459msgid "bad HEAD - I need a HEAD"
10460msgstr "坏的 HEAD - 我需要一个 HEAD"
10461
d13389bf 10462#: builtin/bisect--helper.c:712
06991777
JX
10463#, c-format
10464msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
10465msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
10466
d13389bf 10467#: builtin/bisect--helper.c:733
06991777
JX
10468msgid "won't bisect on cg-seek'ed tree"
10469msgstr "不会在做了 cg-seek 的树上做二分查找"
10470
d13389bf 10471#: builtin/bisect--helper.c:736
06991777
JX
10472msgid "bad HEAD - strange symbolic ref"
10473msgstr "坏的 HEAD - 奇怪的符号引用"
10474
d13389bf 10475#: builtin/bisect--helper.c:756
a6cd2cc4
JX
10476#, c-format
10477msgid "invalid ref: '%s'"
10478msgstr "无效的引用:'%s'"
10479
d13389bf 10480#: builtin/bisect--helper.c:814
d9488fea
JX
10481msgid "You need to start by \"git bisect start\"\n"
10482msgstr "您需要执行 \"git bisect start\" 来开始\n"
10483
10484# 译者:注意保持句尾空格
10485#. TRANSLATORS: Make sure to include [Y] and [n] in your
10486#. translation. The program will only accept English input
10487#. at this point.
10488#.
d13389bf 10489#: builtin/bisect--helper.c:825
d9488fea
JX
10490msgid "Do you want me to do it for you [Y/n]? "
10491msgstr "您想让我为您这样做么[Y/n]? "
10492
d13389bf
JX
10493#: builtin/bisect--helper.c:843
10494msgid "Please call `--bisect-state` with at least one argument"
10495msgstr "请使用至少一个参数调用 `--bisect-state`"
ef317cd5 10496
d13389bf
JX
10497#: builtin/bisect--helper.c:856
10498#, c-format
10499msgid "'git bisect %s' can take only one argument."
10500msgstr "'git bisect %s' 只能带一个参数。"
5809aa05 10501
d13389bf
JX
10502#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879
10503#, c-format
10504msgid "Bad rev input: %s"
10505msgstr "坏的版本输入:%s"
5809aa05 10506
d13389bf 10507#: builtin/bisect--helper.c:924
06991777
JX
10508msgid "reset the bisection state"
10509msgstr "清除二分查找状态"
10510
d13389bf 10511#: builtin/bisect--helper.c:926
06991777
JX
10512msgid "write out the bisection state in BISECT_LOG"
10513msgstr "将二分查找的状态写入 BISECT_LOG"
10514
d13389bf 10515#: builtin/bisect--helper.c:928
06991777
JX
10516msgid "check and set terms in a bisection state"
10517msgstr "在一个二分查找状态中检查和设置术语"
10518
d13389bf 10519#: builtin/bisect--helper.c:930
06991777
JX
10520msgid "check whether bad or good terms exist"
10521msgstr "检查坏的或好的术语是否存在"
10522
d13389bf 10523#: builtin/bisect--helper.c:932
06991777
JX
10524msgid "print out the bisect terms"
10525msgstr "打印二分查找术语"
10526
d13389bf 10527#: builtin/bisect--helper.c:934
06991777 10528msgid "start the bisect session"
5b533632 10529msgstr "启动二分查找过程"
06991777 10530
d13389bf 10531#: builtin/bisect--helper.c:936
d9488fea
JX
10532msgid "find the next bisection commit"
10533msgstr "查询下一个二分查找提交"
10534
d13389bf 10535#: builtin/bisect--helper.c:938
d9488fea
JX
10536msgid "verify the next bisection state then checkout the next bisection commit"
10537msgstr "校验下一个二分查找状态然后检出下一个二分查找提交"
ef317cd5 10538
d13389bf
JX
10539#: builtin/bisect--helper.c:940
10540msgid "mark the state of ref (or refs)"
10541msgstr "标记引用的状态"
d9488fea 10542
d13389bf 10543#: builtin/bisect--helper.c:942
06991777
JX
10544msgid "no log for BISECT_WRITE"
10545msgstr "BISECT_WRITE 无日志"
10546
d13389bf 10547#: builtin/bisect--helper.c:957
06991777
JX
10548msgid "--bisect-reset requires either no argument or a commit"
10549msgstr "--bisect-reset 无需参数或者需要一个提交"
10550
d13389bf 10551#: builtin/bisect--helper.c:961
06991777
JX
10552msgid "--bisect-write requires either 4 or 5 arguments"
10553msgstr "--bisect-write 需要 4 或 5 个参数"
10554
d13389bf 10555#: builtin/bisect--helper.c:967
06991777
JX
10556msgid "--check-and-set-terms requires 3 arguments"
10557msgstr "--check-and-set-terms 需要 3 个参数"
10558
d13389bf 10559#: builtin/bisect--helper.c:973
06991777
JX
10560msgid "--bisect-next-check requires 2 or 3 arguments"
10561msgstr "--bisect-next-check 需要 2 或 3 个参数"
10562
d13389bf 10563#: builtin/bisect--helper.c:979
06991777
JX
10564msgid "--bisect-terms requires 0 or 1 argument"
10565msgstr "--bisect-terms 需要 0 或 1 个参数"
10566
d13389bf 10567#: builtin/bisect--helper.c:988
d9488fea
JX
10568msgid "--bisect-next requires 0 arguments"
10569msgstr "--bisect-next 需要 0 个参数"
10570
d13389bf 10571#: builtin/bisect--helper.c:994
d9488fea
JX
10572msgid "--bisect-auto-next requires 0 arguments"
10573msgstr "--bisect-auto-next 需要 0 个参数"
10574
d9488fea 10575#: builtin/blame.c:32
7aea43ff
JX
10576msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
10577msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
ef317cd5 10578
d9488fea 10579#: builtin/blame.c:37
814ff314
JX
10580msgid "<rev-opts> are documented in git-rev-list(1)"
10581msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
ef317cd5 10582
d9488fea 10583#: builtin/blame.c:410
fd8cb379
JX
10584#, c-format
10585msgid "expecting a color: %s"
10586msgstr "期望一个颜色:%s"
10587
d9488fea 10588#: builtin/blame.c:417
fd8cb379
JX
10589msgid "must end with a color"
10590msgstr "必须以一个颜色结尾"
10591
d9488fea 10592#: builtin/blame.c:730
fd8cb379
JX
10593#, c-format
10594msgid "invalid color '%s' in color.blame.repeatedLines"
10595msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
10596
d9488fea 10597#: builtin/blame.c:748
fd8cb379
JX
10598msgid "invalid value for blame.coloring"
10599msgstr "设置 blame.coloring 中的无效取值"
10600
d13389bf 10601#: builtin/blame.c:847
a6cd2cc4
JX
10602#, c-format
10603msgid "cannot find revision %s to ignore"
10604msgstr "不能找到要忽略的版本 %s"
10605
d13389bf 10606#: builtin/blame.c:869
ef317cd5 10607msgid "Show blame entries as we find them, incrementally"
07432cef 10608msgstr "增量式地显示发现的 blame 条目"
ef317cd5 10609
d13389bf 10610#: builtin/blame.c:870
d9488fea
JX
10611msgid "Do not show object names of boundary commits (Default: off)"
10612msgstr "不显示边界提交的对象名(默认:关闭)"
ef317cd5 10613
d13389bf 10614#: builtin/blame.c:871
ef317cd5 10615msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 10616msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 10617
d13389bf 10618#: builtin/blame.c:872
ef317cd5 10619msgid "Show work cost statistics"
07432cef 10620msgstr "显示命令消耗统计"
ef317cd5 10621
d13389bf 10622#: builtin/blame.c:873
276ceeaa
JX
10623msgid "Force progress reporting"
10624msgstr "强制进度显示"
10625
d13389bf 10626#: builtin/blame.c:874
ef317cd5 10627msgid "Show output score for blame entries"
07432cef 10628msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 10629
d13389bf 10630#: builtin/blame.c:875
ef317cd5 10631msgid "Show original filename (Default: auto)"
07432cef 10632msgstr "显示原始文件名(默认:自动)"
ef317cd5 10633
d13389bf 10634#: builtin/blame.c:876
ef317cd5 10635msgid "Show original linenumber (Default: off)"
07432cef 10636msgstr "显示原始的行号(默认:关闭)"
ef317cd5 10637
d13389bf 10638#: builtin/blame.c:877
ef317cd5 10639msgid "Show in a format designed for machine consumption"
07432cef 10640msgstr "显示为一个适合机器读取的格式"
ef317cd5 10641
d13389bf 10642#: builtin/blame.c:878
ef317cd5 10643msgid "Show porcelain format with per-line commit information"
07432cef 10644msgstr "为每一行显示机器适用的提交信息"
ef317cd5 10645
d13389bf 10646#: builtin/blame.c:879
ef317cd5 10647msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 10648msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 10649
d13389bf 10650#: builtin/blame.c:880
ef317cd5 10651msgid "Show raw timestamp (Default: off)"
07432cef 10652msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 10653
d13389bf 10654#: builtin/blame.c:881
ef317cd5 10655msgid "Show long commit SHA1 (Default: off)"
4375c10e 10656msgstr "显示长的 SHA1 提交号(默认:关闭)"
ef317cd5 10657
d13389bf 10658#: builtin/blame.c:882
ef317cd5 10659msgid "Suppress author name and timestamp (Default: off)"
07432cef 10660msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 10661
d13389bf 10662#: builtin/blame.c:883
ef317cd5 10663msgid "Show author email instead of name (Default: off)"
07432cef 10664msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 10665
d13389bf 10666#: builtin/blame.c:884
ef317cd5 10667msgid "Ignore whitespace differences"
07432cef 10668msgstr "忽略空白差异"
ef317cd5 10669
d13389bf 10670#: builtin/blame.c:885 builtin/log.c:1813
a6cd2cc4
JX
10671msgid "rev"
10672msgstr "版本"
10673
d13389bf 10674#: builtin/blame.c:885
a6cd2cc4
JX
10675msgid "Ignore <rev> when blaming"
10676msgstr "在执行 blame 操作时忽略 <版本>"
10677
d13389bf 10678#: builtin/blame.c:886
a6cd2cc4
JX
10679msgid "Ignore revisions from <file>"
10680msgstr "忽略来自 <文件> 中的版本"
10681
d13389bf 10682#: builtin/blame.c:887
fd8cb379
JX
10683msgid "color redundant metadata from previous line differently"
10684msgstr "使用颜色间隔输出与前一行不同的重复元信息"
10685
d13389bf 10686#: builtin/blame.c:888
fd8cb379
JX
10687msgid "color lines by age"
10688msgstr "依据时间着色"
10689
d13389bf 10690#: builtin/blame.c:889
ef317cd5 10691msgid "Spend extra cycles to find better match"
07432cef 10692msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 10693
d13389bf 10694#: builtin/blame.c:890
ef317cd5 10695msgid "Use revisions from <file> instead of calling git-rev-list"
d9d56b23 10696msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
ef317cd5 10697
d13389bf 10698#: builtin/blame.c:891
ef317cd5 10699msgid "Use <file>'s contents as the final image"
d9d56b23 10700msgstr "使用 <文件> 的内容作为最终的图片"
ef317cd5 10701
d13389bf 10702#: builtin/blame.c:892 builtin/blame.c:893
ef317cd5 10703msgid "score"
07432cef 10704msgstr "得分"
ef317cd5 10705
d13389bf 10706#: builtin/blame.c:892
ef317cd5 10707msgid "Find line copies within and across files"
07432cef 10708msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 10709
d13389bf 10710#: builtin/blame.c:893
ef317cd5 10711msgid "Find line movements within and across files"
07432cef 10712msgstr "找到文件内及跨文件的行移动"
ef317cd5 10713
d13389bf
JX
10714#: builtin/blame.c:894
10715msgid "range"
10716msgstr "范围"
ef317cd5 10717
d13389bf
JX
10718#: builtin/blame.c:895
10719msgid "Process only line range <start>,<end> or function :<funcname>"
10720msgstr "只处理在 <开始>,<结束> 范围内的行,或者函数:<函数名>"
ef317cd5 10721
d13389bf 10722#: builtin/blame.c:947
a0b6b246
JX
10723msgid "--progress can't be used with --incremental or porcelain formats"
10724msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
10725
a4f16749
JX
10726#. TRANSLATORS: This string is used to tell us the
10727#. maximum display width for a relative timestamp in
10728#. "git blame" output. For C locale, "4 years, 11
10729#. months ago", which takes 22 places, is the longest
10730#. among various forms of relative timestamps, but
10731#. your language may need more or fewer display
10732#. columns.
10733#.
d13389bf 10734#: builtin/blame.c:998
6c94aba5
JX
10735msgid "4 years, 11 months ago"
10736msgstr "4 年 11 个月前"
10737
d13389bf 10738#: builtin/blame.c:1114
a0b6b246
JX
10739#, c-format
10740msgid "file %s has only %lu line"
10741msgid_plural "file %s has only %lu lines"
10742msgstr[0] "文件 %s 只有 %lu 行"
10743msgstr[1] "文件 %s 只有 %lu 行"
10744
d13389bf 10745#: builtin/blame.c:1159
a4f16749
JX
10746msgid "Blaming lines"
10747msgstr "追踪代码行"
10748
4c27fcb5 10749#: builtin/branch.c:29
d9488fea
JX
10750msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
10751msgstr "git branch [<选项>] [-r | -a] [--merged] [--no-merged]"
ef317cd5 10752
4c27fcb5 10753#: builtin/branch.c:30
814ff314
JX
10754msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
10755msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 10756
4c27fcb5 10757#: builtin/branch.c:31
814ff314
JX
10758msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
10759msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
ef317cd5 10760
4c27fcb5 10761#: builtin/branch.c:32
814ff314
JX
10762msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
10763msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 10764
4c27fcb5 10765#: builtin/branch.c:33
6937cb4e
JX
10766msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
10767msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
10768
4c27fcb5 10769#: builtin/branch.c:34
94550ed3
JX
10770msgid "git branch [<options>] [-r | -a] [--points-at]"
10771msgstr "git branch [<选项>] [-r | -a] [--points-at]"
10772
4c27fcb5 10773#: builtin/branch.c:35
87cb7997
JX
10774msgid "git branch [<options>] [-r | -a] [--format]"
10775msgstr "git branch [<选项>] [-r | -a] [--format]"
10776
90e6ef53 10777# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
a6cd2cc4 10778#: builtin/branch.c:154
c04f5ac3
JX
10779#, c-format
10780msgid ""
10781"deleting branch '%s' that has been merged to\n"
10782" '%s', but not yet merged to HEAD."
10783msgstr ""
70fc47bf 10784"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
10785" '%s',但未合并到 HEAD。"
10786
90e6ef53 10787# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
a6cd2cc4 10788#: builtin/branch.c:158
c04f5ac3
JX
10789#, c-format
10790msgid ""
10791"not deleting branch '%s' that is not yet merged to\n"
10792" '%s', even though it is merged to HEAD."
10793msgstr ""
70fc47bf
T
10794"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
10795" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 10796
a6cd2cc4 10797#: builtin/branch.c:172
07432cef
WS
10798#, c-format
10799msgid "Couldn't look up commit object for '%s'"
10800msgstr "无法查询 '%s' 指向的提交对象"
10801
a6cd2cc4 10802#: builtin/branch.c:176
07432cef
WS
10803#, c-format
10804msgid ""
10805"The branch '%s' is not fully merged.\n"
10806"If you are sure you want to delete it, run 'git branch -D %s'."
10807msgstr ""
10808"分支 '%s' 没有完全合并。\n"
10809"如果您确认要删除它,执行 'git branch -D %s'。"
10810
a6cd2cc4 10811#: builtin/branch.c:189
07432cef 10812msgid "Update of config-file failed"
6937cb4e 10813msgstr "更新配置文件失败"
07432cef 10814
a6cd2cc4 10815#: builtin/branch.c:220
c04f5ac3 10816msgid "cannot use -a with -d"
649900bc 10817msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 10818
a6cd2cc4 10819#: builtin/branch.c:226
c04f5ac3
JX
10820msgid "Couldn't look up commit object for HEAD"
10821msgstr "无法查询 HEAD 指向的提交对象"
10822
a6cd2cc4 10823#: builtin/branch.c:240
c04f5ac3 10824#, c-format
5b04ee3b
JX
10825msgid "Cannot delete branch '%s' checked out at '%s'"
10826msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
c04f5ac3 10827
a6cd2cc4 10828#: builtin/branch.c:255
5ae481e0 10829#, c-format
7aea43ff
JX
10830msgid "remote-tracking branch '%s' not found."
10831msgstr "未能找到远程跟踪分支 '%s'。"
c04f5ac3 10832
a6cd2cc4 10833#: builtin/branch.c:256
81809b99 10834#, c-format
8ada9598 10835msgid "branch '%s' not found."
81809b99 10836msgstr "分支 '%s' 未发现。"
8ada9598 10837
a6cd2cc4 10838#: builtin/branch.c:271
81809b99 10839#, c-format
7aea43ff
JX
10840msgid "Error deleting remote-tracking branch '%s'"
10841msgstr "无法删除远程跟踪分支 '%s'"
c04f5ac3 10842
a6cd2cc4 10843#: builtin/branch.c:272
81809b99 10844#, c-format
8ada9598 10845msgid "Error deleting branch '%s'"
7aea43ff 10846msgstr "无法删除分支 '%s'"
8ada9598 10847
a6cd2cc4 10848#: builtin/branch.c:279
81809b99 10849#, c-format
7aea43ff
JX
10850msgid "Deleted remote-tracking branch %s (was %s).\n"
10851msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
c04f5ac3 10852
a6cd2cc4 10853#: builtin/branch.c:280
81809b99 10854#, c-format
8ada9598 10855msgid "Deleted branch %s (was %s).\n"
81809b99 10856msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 10857
a6cd2cc4 10858#: builtin/branch.c:429 builtin/tag.c:61
6937cb4e
JX
10859msgid "unable to parse format string"
10860msgstr "不能解析格式化字符串"
10861
a6cd2cc4 10862#: builtin/branch.c:460
d46c5519
JX
10863msgid "could not resolve HEAD"
10864msgstr "不能解析 HEAD 提交"
10865
a6cd2cc4 10866#: builtin/branch.c:466
5b04ee3b 10867#, c-format
d46c5519
JX
10868msgid "HEAD (%s) points outside of refs/heads/"
10869msgstr "HEAD (%s) 指向 refs/heads/ 之外"
10870
a6cd2cc4 10871#: builtin/branch.c:481
d46c5519 10872#, c-format
5b04ee3b
JX
10873msgid "Branch %s is being rebased at %s"
10874msgstr "分支 %s 正被变基到 %s"
10875
a6cd2cc4 10876#: builtin/branch.c:485
5b04ee3b
JX
10877#, c-format
10878msgid "Branch %s is being bisected at %s"
10879msgstr "分支 %s 正被二分查找于 %s"
10880
a6cd2cc4 10881#: builtin/branch.c:502
6937cb4e
JX
10882msgid "cannot copy the current branch while not on any."
10883msgstr "无法拷贝当前分支因为不处于任何分支上。"
10884
a6cd2cc4 10885#: builtin/branch.c:504
c04f5ac3 10886msgid "cannot rename the current branch while not on any."
90e6ef53 10887msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 10888
a6cd2cc4 10889#: builtin/branch.c:515
c04f5ac3
JX
10890#, c-format
10891msgid "Invalid branch name: '%s'"
10892msgstr "无效的分支名:'%s'"
10893
d13389bf 10894#: builtin/branch.c:544
c04f5ac3
JX
10895msgid "Branch rename failed"
10896msgstr "分支重命名失败"
10897
d13389bf 10898#: builtin/branch.c:546
6937cb4e
JX
10899msgid "Branch copy failed"
10900msgstr "分支拷贝失败"
10901
d13389bf 10902#: builtin/branch.c:550
6937cb4e 10903#, c-format
5809aa05
JX
10904msgid "Created a copy of a misnamed branch '%s'"
10905msgstr "已为错误命名的分支 '%s' 创建了一个副本"
6937cb4e 10906
d13389bf 10907#: builtin/branch.c:553
c04f5ac3
JX
10908#, c-format
10909msgid "Renamed a misnamed branch '%s' away"
6937cb4e 10910msgstr "已将错误命名的分支 '%s' 重命名"
c04f5ac3 10911
d13389bf 10912#: builtin/branch.c:559
c04f5ac3
JX
10913#, c-format
10914msgid "Branch renamed to %s, but HEAD is not updated!"
10915msgstr "分支重命名为 %s,但 HEAD 没有更新!"
10916
d13389bf 10917#: builtin/branch.c:568
c04f5ac3 10918msgid "Branch is renamed, but update of config-file failed"
6937cb4e
JX
10919msgstr "分支被重命名,但更新配置文件失败"
10920
d13389bf 10921#: builtin/branch.c:570
6937cb4e
JX
10922msgid "Branch is copied, but update of config-file failed"
10923msgstr "分支已拷贝,但更新配置文件失败"
c04f5ac3 10924
d13389bf 10925#: builtin/branch.c:586
5c57d762
JX
10926#, c-format
10927msgid ""
10928"Please edit the description for the branch\n"
10929" %s\n"
10930"Lines starting with '%c' will be stripped.\n"
10931msgstr ""
10932"请编辑分支的描述\n"
10933" %s\n"
10934"以 '%c' 开头的行将被过滤。\n"
c04f5ac3 10935
d13389bf 10936#: builtin/branch.c:620
ef317cd5 10937msgid "Generic options"
07432cef 10938msgstr "通用选项"
c04f5ac3 10939
d13389bf 10940#: builtin/branch.c:622
ef317cd5 10941msgid "show hash and subject, give twice for upstream branch"
07432cef 10942msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 10943
d13389bf 10944#: builtin/branch.c:623
ef317cd5 10945msgid "suppress informational messages"
07432cef 10946msgstr "不显示信息"
8ada9598 10947
d13389bf 10948#: builtin/branch.c:624
ef317cd5 10949msgid "set up tracking mode (see git-pull(1))"
07432cef 10950msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 10951
d13389bf 10952#: builtin/branch.c:626
6937cb4e
JX
10953msgid "do not use"
10954msgstr "不要使用"
c04f5ac3 10955
d13389bf 10956#: builtin/branch.c:628 builtin/rebase.c:532
5b04ee3b
JX
10957msgid "upstream"
10958msgstr "上游"
10959
d13389bf 10960#: builtin/branch.c:628
5b04ee3b
JX
10961msgid "change the upstream info"
10962msgstr "改变上游信息"
10963
d13389bf 10964#: builtin/branch.c:629
ddc12c42 10965msgid "unset the upstream info"
a0b6b246
JX
10966msgstr "取消上游信息的设置"
10967
d13389bf 10968#: builtin/branch.c:630
ef317cd5 10969msgid "use colored output"
07432cef 10970msgstr "使用彩色输出"
c04f5ac3 10971
d13389bf 10972#: builtin/branch.c:631
ef317cd5 10973msgid "act on remote-tracking branches"
07432cef 10974msgstr "作用于远程跟踪分支"
c04f5ac3 10975
d13389bf 10976#: builtin/branch.c:633 builtin/branch.c:635
ef317cd5 10977msgid "print only branches that contain the commit"
07432cef 10978msgstr "只打印包含该提交的分支"
c04f5ac3 10979
d13389bf 10980#: builtin/branch.c:634 builtin/branch.c:636
87cb7997
JX
10981msgid "print only branches that don't contain the commit"
10982msgstr "只打印不包含该提交的分支"
10983
d13389bf 10984#: builtin/branch.c:639
ef317cd5 10985msgid "Specific git-branch actions:"
07432cef 10986msgstr "具体的 git-branch 动作:"
c04f5ac3 10987
d13389bf 10988#: builtin/branch.c:640
ef317cd5 10989msgid "list both remote-tracking and local branches"
07432cef 10990msgstr "列出远程跟踪及本地分支"
c04f5ac3 10991
d13389bf 10992#: builtin/branch.c:642
ef317cd5 10993msgid "delete fully merged branch"
07432cef 10994msgstr "删除完全合并的分支"
c04f5ac3 10995
d13389bf 10996#: builtin/branch.c:643
ef317cd5 10997msgid "delete branch (even if not merged)"
07432cef 10998msgstr "删除分支(即使没有合并)"
c04f5ac3 10999
d13389bf 11000#: builtin/branch.c:644
ef317cd5 11001msgid "move/rename a branch and its reflog"
07432cef 11002msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 11003
d13389bf 11004#: builtin/branch.c:645
ef317cd5 11005msgid "move/rename a branch, even if target exists"
07432cef 11006msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 11007
d13389bf 11008#: builtin/branch.c:646
6937cb4e
JX
11009msgid "copy a branch and its reflog"
11010msgstr "拷贝一个分支和它的引用日志"
11011
d13389bf 11012#: builtin/branch.c:647
6937cb4e
JX
11013msgid "copy a branch, even if target exists"
11014msgstr "拷贝一个分支,即使目标已存在"
11015
d13389bf 11016#: builtin/branch.c:648
ef317cd5 11017msgid "list branch names"
07432cef 11018msgstr "列出分支名"
c04f5ac3 11019
d13389bf 11020#: builtin/branch.c:649
d46c5519
JX
11021msgid "show current branch name"
11022msgstr "显示当前分支名"
11023
d13389bf 11024#: builtin/branch.c:650
ef317cd5 11025msgid "create the branch's reflog"
07432cef 11026msgstr "创建分支的引用日志"
ef317cd5 11027
d13389bf 11028#: builtin/branch.c:652
ef317cd5 11029msgid "edit the description for the branch"
07432cef 11030msgstr "标记分支的描述"
ef317cd5 11031
d13389bf 11032#: builtin/branch.c:653
04cb2f28
JX
11033msgid "force creation, move/rename, deletion"
11034msgstr "强制创建、移动/重命名、删除"
ef317cd5 11035
d13389bf 11036#: builtin/branch.c:654
94550ed3
JX
11037msgid "print only branches that are merged"
11038msgstr "只打印已经合并的分支"
ef317cd5 11039
d13389bf 11040#: builtin/branch.c:655
94550ed3
JX
11041msgid "print only branches that are not merged"
11042msgstr "只打印尚未合并的分支"
ef317cd5 11043
d13389bf 11044#: builtin/branch.c:656
ef317cd5 11045msgid "list branches in columns"
07432cef 11046msgstr "以列的方式显示分支"
ef317cd5 11047
d13389bf 11048#: builtin/branch.c:658 builtin/for-each-ref.c:42 builtin/notes.c:415
06991777 11049#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
349ede6a 11050#: builtin/tag.c:434
94550ed3
JX
11051msgid "object"
11052msgstr "对象"
11053
d13389bf 11054#: builtin/branch.c:659
94550ed3
JX
11055msgid "print only branches of the object"
11056msgstr "只打印指向该对象的分支"
11057
d13389bf 11058#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:441
1a79b2f1
JX
11059msgid "sorting and filtering are case insensitive"
11060msgstr "排序和过滤属于大小写不敏感"
11061
d13389bf 11062#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:439
a6cd2cc4 11063#: builtin/verify-tag.c:38
87cb7997
JX
11064msgid "format to use for the output"
11065msgstr "输出格式"
11066
d13389bf 11067#: builtin/branch.c:684 builtin/clone.c:790
c04f5ac3 11068msgid "HEAD not found below refs/heads!"
90e6ef53 11069msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 11070
d13389bf 11071#: builtin/branch.c:708
8ada9598 11072msgid "--column and --verbose are incompatible"
81809b99 11073msgstr "--column 和 --verbose 不兼容"
8ada9598 11074
d13389bf 11075#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
a77c07d9
JX
11076msgid "branch name required"
11077msgstr "必须提供分支名"
11078
d13389bf 11079#: builtin/branch.c:753
a77c07d9
JX
11080msgid "Cannot give description to detached HEAD"
11081msgstr "不能向分离头指针提供描述"
11082
d13389bf 11083#: builtin/branch.c:758
a77c07d9
JX
11084msgid "cannot edit description of more than one branch"
11085msgstr "不能为一个以上的分支编辑描述"
11086
d13389bf 11087#: builtin/branch.c:765
a77c07d9
JX
11088#, c-format
11089msgid "No commit on branch '%s' yet."
11090msgstr "分支 '%s' 尚无提交。"
11091
d13389bf 11092#: builtin/branch.c:768
a77c07d9
JX
11093#, c-format
11094msgid "No branch named '%s'."
11095msgstr "没有分支 '%s'。"
11096
d13389bf 11097#: builtin/branch.c:783
6937cb4e
JX
11098msgid "too many branches for a copy operation"
11099msgstr "为拷贝操作提供了太多的分支名"
a77c07d9 11100
d13389bf 11101#: builtin/branch.c:792
6937cb4e
JX
11102msgid "too many arguments for a rename operation"
11103msgstr "为重命名操作提供了太多的参数"
1003b3a5 11104
d13389bf 11105#: builtin/branch.c:797
6937cb4e
JX
11106msgid "too many arguments to set new upstream"
11107msgstr "为设置新上游提供了太多的参数"
11108
d13389bf 11109#: builtin/branch.c:801
1003b3a5
JX
11110#, c-format
11111msgid ""
11112"could not set upstream of HEAD to %s when it does not point to any branch."
11113msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
11114
d13389bf 11115#: builtin/branch.c:804 builtin/branch.c:827
1003b3a5
JX
11116#, c-format
11117msgid "no such branch '%s'"
11118msgstr "没有此分支 '%s'"
11119
d13389bf 11120#: builtin/branch.c:808
07432cef 11121#, c-format
ef317cd5 11122msgid "branch '%s' does not exist"
07432cef 11123msgstr "分支 '%s' 不存在"
ef317cd5 11124
d13389bf 11125#: builtin/branch.c:821
6937cb4e
JX
11126msgid "too many arguments to unset upstream"
11127msgstr "为取消上游设置操作提供了太多的参数"
1003b3a5 11128
d13389bf 11129#: builtin/branch.c:825
1003b3a5
JX
11130msgid "could not unset upstream of HEAD when it does not point to any branch."
11131msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
11132
d13389bf 11133#: builtin/branch.c:831
ef317cd5
JX
11134#, c-format
11135msgid "Branch '%s' has no upstream information"
07432cef 11136msgstr "分支 '%s' 没有上游信息"
ef317cd5 11137
d13389bf 11138#: builtin/branch.c:841
a6cd2cc4
JX
11139msgid ""
11140"The -a, and -r, options to 'git branch' do not take a branch name.\n"
11141"Did you mean to use: -a|-r --list <pattern>?"
11142msgstr ""
11143"'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
11144"您是否想要使用:-a|-r --list <模式>?"
c04f5ac3 11145
d13389bf 11146#: builtin/branch.c:845
ddc12c42
JX
11147msgid ""
11148"the '--set-upstream' option is no longer supported. Please use '--track' or "
11149"'--set-upstream-to' instead."
11150msgstr ""
11151"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
11152
d9488fea
JX
11153#: builtin/bugreport.c:15
11154msgid "git version:\n"
11155msgstr "git 版本:\n"
11156
11157#: builtin/bugreport.c:21
11158#, c-format
11159msgid "uname() failed with error '%s' (%d)\n"
11160msgstr "uname() 失败,错误为 '%s'(%d)\n"
11161
11162#: builtin/bugreport.c:31
11163msgid "compiler info: "
11164msgstr "编译器信息:"
11165
11166#: builtin/bugreport.c:34
11167msgid "libc info: "
11168msgstr "libc 信息:"
11169
11170#: builtin/bugreport.c:80
11171msgid "not run from a git repository - no hooks to show\n"
11172msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n"
11173
11174#: builtin/bugreport.c:90
11175msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
11176msgstr "git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>]"
11177
11178#: builtin/bugreport.c:97
11179msgid ""
11180"Thank you for filling out a Git bug report!\n"
11181"Please answer the following questions to help us understand your issue.\n"
11182"\n"
11183"What did you do before the bug happened? (Steps to reproduce your issue)\n"
11184"\n"
11185"What did you expect to happen? (Expected behavior)\n"
11186"\n"
11187"What happened instead? (Actual behavior)\n"
11188"\n"
11189"What's different between what you expected and what actually happened?\n"
11190"\n"
11191"Anything else you want to add:\n"
11192"\n"
11193"Please review the rest of the bug report below.\n"
11194"You can delete any lines you don't wish to share.\n"
11195msgstr ""
11196"感谢您填写 Git 错误报告!\n"
11197"请填写以下问卷,以帮助我们了解您的问题。\n"
11198"\n"
11199"在错误发生之前,您做了什么?(重现问题的步骤)\n"
11200"\n"
11201"您期望发生什么?(预期行为)\n"
11202"\n"
11203"实际发生了什么?(实际行为)\n"
11204"\n"
11205"您所期望的与实际发生的有什么不同?\n"
11206"\n"
11207"您想要补充的其它内容:\n"
11208"\n"
11209"请检查下面错误报告中余下的内容。\n"
11210"您可以删除任何您不想共享的内容。\n"
11211
d13389bf 11212#: builtin/bugreport.c:135
d9488fea
JX
11213msgid "specify a destination for the bugreport file"
11214msgstr "指定错误报告文件的目标位置"
11215
d13389bf 11216#: builtin/bugreport.c:137
d9488fea
JX
11217msgid "specify a strftime format suffix for the filename"
11218msgstr "指定文件的 strftime 格式后缀"
11219
d13389bf 11220#: builtin/bugreport.c:159
d9488fea
JX
11221#, c-format
11222msgid "could not create leading directories for '%s'"
11223msgstr "不能为 '%s' 创建先导目录"
11224
d13389bf 11225#: builtin/bugreport.c:166
d9488fea
JX
11226msgid "System Info"
11227msgstr "系统信息"
11228
d13389bf 11229#: builtin/bugreport.c:169
d9488fea
JX
11230msgid "Enabled Hooks"
11231msgstr "启用的钩子"
11232
d13389bf 11233#: builtin/bugreport.c:176
d9488fea
JX
11234#, c-format
11235msgid "couldn't create a new file at '%s'"
11236msgstr "不能在 '%s' 创建新文件"
11237
d13389bf 11238#: builtin/bugreport.c:179
d9488fea
JX
11239#, c-format
11240msgid "unable to write to %s"
11241msgstr "无法写入 %s"
11242
d13389bf 11243#: builtin/bugreport.c:189
d9488fea
JX
11244#, c-format
11245msgid "Created new report at '%s'.\n"
11246msgstr "在 '%s' 创建了新报告。\n"
11247
ddc12c42
JX
11248#: builtin/bundle.c:15 builtin/bundle.c:23
11249msgid "git bundle create [<options>] <file> <git-rev-list args>"
11250msgstr "git bundle create [<选项>] <文件> <git-rev-list 参数>"
11251
11252#: builtin/bundle.c:16 builtin/bundle.c:28
11253msgid "git bundle verify [<options>] <file>"
11254msgstr "git bundle verify [<选项>] <文件>"
11255
11256#: builtin/bundle.c:17 builtin/bundle.c:33
11257msgid "git bundle list-heads <file> [<refname>...]"
11258msgstr "git bundle list-heads <文件> [<引用名>...]"
11259
11260#: builtin/bundle.c:18 builtin/bundle.c:38
11261msgid "git bundle unbundle <file> [<refname>...]"
11262msgstr "git bundle unbundle <文件> [<引用名>...]"
11263
d9488fea 11264#: builtin/bundle.c:67 builtin/pack-objects.c:3480
ddc12c42
JX
11265msgid "do not show progress meter"
11266msgstr "不显示进度表"
11267
d9488fea 11268#: builtin/bundle.c:69 builtin/pack-objects.c:3482
ddc12c42
JX
11269msgid "show progress meter"
11270msgstr "显示进度表"
11271
d9488fea 11272#: builtin/bundle.c:71 builtin/pack-objects.c:3484
ddc12c42
JX
11273msgid "show progress meter during object writing phase"
11274msgstr "在对象写入阶段显示进度表"
11275
d9488fea 11276#: builtin/bundle.c:74 builtin/pack-objects.c:3487
ddc12c42
JX
11277msgid "similar to --all-progress when progress meter is shown"
11278msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 11279
d9488fea
JX
11280#: builtin/bundle.c:76
11281msgid "specify bundle format version"
11282msgstr "指定归档包的格式版本"
11283
11284#: builtin/bundle.c:96
ddc12c42 11285msgid "Need a repository to create a bundle."
d9488fea 11286msgstr "需要一个仓库来创建归档包。"
ddc12c42 11287
d9488fea 11288#: builtin/bundle.c:107
ddc12c42 11289msgid "do not show bundle details"
d9488fea 11290msgstr "不显示归档包的细节"
ddc12c42 11291
d9488fea 11292#: builtin/bundle.c:122
c04f5ac3
JX
11293#, c-format
11294msgid "%s is okay\n"
11295msgstr "%s 可以\n"
11296
d9488fea 11297#: builtin/bundle.c:163
c04f5ac3 11298msgid "Need a repository to unbundle."
d9488fea 11299msgstr "需要一个仓库来解开归档包。"
c04f5ac3 11300
d13389bf 11301#: builtin/bundle.c:171 builtin/remote.c:1700
ddc12c42
JX
11302msgid "be verbose; must be placed before a subcommand"
11303msgstr "冗长输出;必须置于子命令之前"
11304
d13389bf 11305#: builtin/bundle.c:193 builtin/remote.c:1731
ddc12c42
JX
11306#, c-format
11307msgid "Unknown subcommand: %s"
11308msgstr "未知子命令:%s"
11309
349ede6a 11310#: builtin/cat-file.c:598
7aea43ff 11311msgid ""
a0b6b246
JX
11312"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
11313"p | <type> | --textconv | --filters) [--path=<path>] <object>"
275588f9
JX
11314msgstr ""
11315"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
11316"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
ef317cd5 11317
349ede6a 11318#: builtin/cat-file.c:599
a0b6b246 11319msgid ""
7157c2b5
JX
11320"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
11321"symlinks] [--textconv | --filters]"
d9488fea
JX
11322msgstr ""
11323"git cat-file (--batch[=<格式>] | --batch-check[=<格式>]) [--follow-symlinks] "
11324"[--textconv | --filters]"
ef317cd5 11325
349ede6a 11326#: builtin/cat-file.c:620
4c27fcb5
JX
11327msgid "only one batch option may be specified"
11328msgstr "只能指定一个批处理选项"
11329
349ede6a 11330#: builtin/cat-file.c:638
ef317cd5 11331msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 11332msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 11333
349ede6a 11334#: builtin/cat-file.c:639
ef317cd5 11335msgid "show object type"
07432cef 11336msgstr "显示对象类型"
ef317cd5 11337
349ede6a 11338#: builtin/cat-file.c:640
ef317cd5 11339msgid "show object size"
07432cef 11340msgstr "显示对象大小"
ef317cd5 11341
349ede6a 11342#: builtin/cat-file.c:642
ef317cd5 11343msgid "exit with zero when there's no error"
07432cef 11344msgstr "当没有错误时退出并返回零"
ef317cd5 11345
349ede6a 11346#: builtin/cat-file.c:643
ef317cd5 11347msgid "pretty-print object's content"
07432cef 11348msgstr "美观地打印对象的内容"
ef317cd5 11349
349ede6a 11350#: builtin/cat-file.c:645
ef317cd5 11351msgid "for blob objects, run textconv on object's content"
a0b6b246
JX
11352msgstr "对于数据对象,对其内容做文本转换"
11353
349ede6a 11354#: builtin/cat-file.c:647
a0b6b246
JX
11355msgid "for blob objects, run filters on object's content"
11356msgstr "对于数据对象,对其内容做过滤"
11357
d9488fea 11358#: builtin/cat-file.c:648
a0b6b246
JX
11359msgid "blob"
11360msgstr "数据对象"
11361
349ede6a 11362#: builtin/cat-file.c:649
a0b6b246
JX
11363msgid "use a specific path for --textconv/--filters"
11364msgstr "对于 --textconv/--filters 使用一个特定的路径"
ef317cd5 11365
349ede6a 11366#: builtin/cat-file.c:651
7aea43ff
JX
11367msgid "allow -s and -t to work with broken/corrupt objects"
11368msgstr "允许 -s 和 -t 对损坏的对象生效"
11369
349ede6a 11370#: builtin/cat-file.c:652
1b7f4a34
JX
11371msgid "buffer --batch output"
11372msgstr "缓冲 --batch 的输出"
11373
349ede6a 11374#: builtin/cat-file.c:654
ef317cd5 11375msgid "show info and content of objects fed from the standard input"
07432cef 11376msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 11377
349ede6a 11378#: builtin/cat-file.c:658
ef317cd5 11379msgid "show info about objects fed from the standard input"
07432cef 11380msgstr "显示从标准输入提供的对象的信息"
ef317cd5 11381
349ede6a 11382#: builtin/cat-file.c:662
7aea43ff
JX
11383msgid "follow in-tree symlinks (used with --batch or --batch-check)"
11384msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
11385
349ede6a 11386#: builtin/cat-file.c:664
1b7f4a34
JX
11387msgid "show all objects with --batch or --batch-check"
11388msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
11389
349ede6a 11390#: builtin/cat-file.c:666
c1ac5258
JX
11391msgid "do not order --batch-all-objects output"
11392msgstr "不要对 --batch-all-objects 的输出排序"
11393
06991777 11394#: builtin/check-attr.c:13
814ff314
JX
11395msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
11396msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
ef317cd5 11397
06991777 11398#: builtin/check-attr.c:14
94550ed3
JX
11399msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
11400msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
ef317cd5 11401
06991777 11402#: builtin/check-attr.c:21
ef317cd5 11403msgid "report all attributes set on file"
07432cef 11404msgstr "报告设置在文件上的所有属性"
ef317cd5 11405
06991777 11406#: builtin/check-attr.c:22
ef317cd5 11407msgid "use .gitattributes only from the index"
07432cef 11408msgstr "只使用索引中的 .gitattributes"
ef317cd5 11409
06991777 11410#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
ef317cd5 11411msgid "read file names from stdin"
07432cef 11412msgstr "从标准输入读出文件名"
ef317cd5 11413
06991777 11414#: builtin/check-attr.c:25 builtin/check-ignore.c:27
90314792
JX
11415msgid "terminate input and output records by a NUL character"
11416msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 11417
d13389bf 11418#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541
7157c2b5 11419#: builtin/worktree.c:561
a77c07d9
JX
11420msgid "suppress progress reporting"
11421msgstr "不显示进度报告"
11422
06991777 11423#: builtin/check-ignore.c:29
2e8451e8
JX
11424msgid "show non-matching input paths"
11425msgstr "显示未匹配的输入路径"
11426
06991777 11427#: builtin/check-ignore.c:31
90314792
JX
11428msgid "ignore index when checking"
11429msgstr "检查时忽略索引"
11430
2b472aae 11431#: builtin/check-ignore.c:163
a77c07d9 11432msgid "cannot specify pathnames with --stdin"
1b7f4a34 11433msgstr "不能同时指定路径及 --stdin 参数"
a77c07d9 11434
2b472aae 11435#: builtin/check-ignore.c:166
a77c07d9
JX
11436msgid "-z only makes sense with --stdin"
11437msgstr "-z 需要和 --stdin 参数共用才有意义"
11438
2b472aae 11439#: builtin/check-ignore.c:168
a77c07d9
JX
11440msgid "no path specified"
11441msgstr "未指定路径"
11442
2b472aae 11443#: builtin/check-ignore.c:172
a77c07d9
JX
11444msgid "--quiet is only valid with a single pathname"
11445msgstr "参数 --quiet 只在提供一个路径名时有效"
11446
2b472aae 11447#: builtin/check-ignore.c:174
a77c07d9
JX
11448msgid "cannot have both --quiet and --verbose"
11449msgstr "不能同时提供 --quiet 和 --verbose 参数"
11450
2b472aae 11451#: builtin/check-ignore.c:177
2e8451e8
JX
11452msgid "--non-matching is only valid with --verbose"
11453msgstr "--non-matching 选项只在使用 --verbose 时有效"
11454
a4f16749 11455#: builtin/check-mailmap.c:9
814ff314
JX
11456msgid "git check-mailmap [<options>] <contact>..."
11457msgstr "git check-mailmap [<选项>] <联系地址>..."
2e8451e8 11458
a4f16749 11459#: builtin/check-mailmap.c:14
2e8451e8
JX
11460msgid "also read contacts from stdin"
11461msgstr "还从标准输入读取联系地址"
11462
a4f16749 11463#: builtin/check-mailmap.c:25
2e8451e8
JX
11464#, c-format
11465msgid "unable to parse contact: %s"
11466msgstr "不能解析联系地址:%s"
11467
a4f16749 11468#: builtin/check-mailmap.c:48
2e8451e8
JX
11469msgid "no contacts specified"
11470msgstr "未指定联系地址"
11471
d13389bf 11472#: builtin/checkout-index.c:139
814ff314
JX
11473msgid "git checkout-index [<options>] [--] [<file>...]"
11474msgstr "git checkout-index [<选项>] [--] [<文件>...]"
ef317cd5 11475
d13389bf 11476#: builtin/checkout-index.c:156
276ceeaa
JX
11477msgid "stage should be between 1 and 3 or all"
11478msgstr "索引值应该取值 1 到 3 或者 all"
11479
d13389bf 11480#: builtin/checkout-index.c:173
ef317cd5 11481msgid "check out all files in the index"
07432cef 11482msgstr "检出索引区的所有文件"
ef317cd5 11483
d13389bf 11484#: builtin/checkout-index.c:174
ef317cd5 11485msgid "force overwrite of existing files"
07432cef 11486msgstr "强制覆盖现有的文件"
ef317cd5 11487
d13389bf 11488#: builtin/checkout-index.c:176
ef317cd5 11489msgid "no warning for existing files and files not in index"
07432cef 11490msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 11491
d13389bf 11492#: builtin/checkout-index.c:178
ef317cd5 11493msgid "don't checkout new files"
07432cef 11494msgstr "不检出新文件"
ef317cd5 11495
d13389bf 11496#: builtin/checkout-index.c:180
ef317cd5 11497msgid "update stat information in the index file"
07432cef 11498msgstr "更新索引中文件的状态信息"
ef317cd5 11499
d13389bf 11500#: builtin/checkout-index.c:184
ef317cd5 11501msgid "read list of paths from the standard input"
07432cef 11502msgstr "从标准输入读取路径列表"
ef317cd5 11503
d13389bf 11504#: builtin/checkout-index.c:186
ef317cd5 11505msgid "write the content to temporary files"
07432cef 11506msgstr "将内容写入临时文件"
ef317cd5 11507
d13389bf 11508#: builtin/checkout-index.c:187 builtin/column.c:31
d9488fea
JX
11509#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827
11510#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333
d13389bf 11511#: builtin/worktree.c:757
ef317cd5 11512msgid "string"
07432cef 11513msgstr "字符串"
ef317cd5 11514
d13389bf 11515#: builtin/checkout-index.c:188
ef317cd5 11516msgid "when creating files, prepend <string>"
4375c10e 11517msgstr "在创建文件时,在前面加上 <字符串>"
ef317cd5 11518
d13389bf 11519#: builtin/checkout-index.c:190
ef317cd5 11520msgid "copy out the files from named stage"
07432cef 11521msgstr "从指定暂存区中拷出文件"
ef317cd5 11522
a6cd2cc4 11523#: builtin/checkout.c:31
814ff314
JX
11524msgid "git checkout [<options>] <branch>"
11525msgstr "git checkout [<选项>] <分支>"
ef317cd5 11526
a6cd2cc4 11527#: builtin/checkout.c:32
814ff314
JX
11528msgid "git checkout [<options>] [<branch>] -- <file>..."
11529msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
ef317cd5 11530
a6cd2cc4
JX
11531#: builtin/checkout.c:37
11532msgid "git switch [<options>] [<branch>]"
11533msgstr "git switch [<选项>] [<分支>]"
11534
11535#: builtin/checkout.c:42
11536msgid "git restore [<options>] [--source=<branch>] <file>..."
11537msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
11538
349ede6a 11539#: builtin/checkout.c:188 builtin/checkout.c:227
c04f5ac3
JX
11540#, c-format
11541msgid "path '%s' does not have our version"
11542msgstr "路径 '%s' 没有我们的版本"
11543
349ede6a 11544#: builtin/checkout.c:190 builtin/checkout.c:229
c04f5ac3
JX
11545#, c-format
11546msgid "path '%s' does not have their version"
11547msgstr "路径 '%s' 没有他们的版本"
11548
349ede6a 11549#: builtin/checkout.c:206
c04f5ac3
JX
11550#, c-format
11551msgid "path '%s' does not have all necessary versions"
e640d114 11552msgstr "路径 '%s' 没有全部必需的版本"
c04f5ac3 11553
d9488fea 11554#: builtin/checkout.c:258
c04f5ac3
JX
11555#, c-format
11556msgid "path '%s' does not have necessary versions"
e640d114 11557msgstr "路径 '%s' 没有必需的版本"
c04f5ac3 11558
d9488fea 11559#: builtin/checkout.c:275
c04f5ac3
JX
11560#, c-format
11561msgid "path '%s': cannot merge"
90e6ef53 11562msgstr "path '%s':无法合并"
c04f5ac3 11563
d9488fea 11564#: builtin/checkout.c:291
c04f5ac3
JX
11565#, c-format
11566msgid "Unable to add merge result for '%s'"
11567msgstr "无法为 '%s' 添加合并结果"
11568
d9488fea 11569#: builtin/checkout.c:396
a6cd2cc4
JX
11570#, c-format
11571msgid "Recreated %d merge conflict"
11572msgid_plural "Recreated %d merge conflicts"
11573msgstr[0] "重新创建了 %d 个合并冲突"
11574msgstr[1] "重新创建了 %d 个合并冲突"
11575
d9488fea 11576#: builtin/checkout.c:401
a6cd2cc4
JX
11577#, c-format
11578msgid "Updated %d path from %s"
11579msgid_plural "Updated %d paths from %s"
11580msgstr[0] "从 %2$s 更新了 %1$d 个路径"
11581msgstr[1] "从 %2$s 更新了 %1$d 个路径"
11582
d9488fea 11583#: builtin/checkout.c:408
a6cd2cc4
JX
11584#, c-format
11585msgid "Updated %d path from the index"
11586msgid_plural "Updated %d paths from the index"
11587msgstr[0] "从索引区更新了 %d 个路径"
11588msgstr[1] "从索引区更新了 %d 个路径"
11589
d9488fea
JX
11590#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437
11591#: builtin/checkout.c:441
07432cef 11592#, c-format
ef317cd5 11593msgid "'%s' cannot be used with updating paths"
07432cef 11594msgstr "'%s' 不能在更新路径时使用"
ef317cd5 11595
d9488fea 11596#: builtin/checkout.c:444 builtin/checkout.c:447
07432cef 11597#, c-format
ef317cd5 11598msgid "'%s' cannot be used with %s"
07432cef 11599msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 11600
d9488fea 11601#: builtin/checkout.c:451
ef317cd5
JX
11602#, c-format
11603msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 11604msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 11605
d9488fea 11606#: builtin/checkout.c:455
c04f5ac3 11607#, c-format
a6cd2cc4
JX
11608msgid "neither '%s' or '%s' is specified"
11609msgstr "'%s' 或 '%s' 都没有指定"
c04f5ac3 11610
d9488fea 11611#: builtin/checkout.c:459
06991777 11612#, c-format
a6cd2cc4
JX
11613msgid "'%s' must be used when '%s' is not specified"
11614msgstr "未指定 '%2$s' 时,必须使用 '%1$s'"
06991777 11615
d9488fea 11616#: builtin/checkout.c:464 builtin/checkout.c:469
06991777 11617#, c-format
a6cd2cc4
JX
11618msgid "'%s' or '%s' cannot be used with %s"
11619msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
06991777 11620
d13389bf 11621#: builtin/checkout.c:541 builtin/checkout.c:548
06991777 11622#, c-format
a6cd2cc4
JX
11623msgid "path '%s' is unmerged"
11624msgstr "路径 '%s' 未合并"
06991777 11625
d13389bf 11626#: builtin/checkout.c:716
c04f5ac3 11627msgid "you need to resolve your current index first"
90e6ef53 11628msgstr "您需要先解决当前索引的冲突"
c04f5ac3 11629
d13389bf 11630#: builtin/checkout.c:770
d46c5519
JX
11631#, c-format
11632msgid ""
11633"cannot continue with staged changes in the following files:\n"
11634"%s"
11635msgstr ""
11636"不能继续,下列文件有暂存的修改:\n"
11637"%s"
11638
d13389bf 11639#: builtin/checkout.c:866
c04f5ac3 11640#, c-format
1b7f4a34
JX
11641msgid "Can not do reflog for '%s': %s\n"
11642msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
c04f5ac3 11643
d13389bf 11644#: builtin/checkout.c:908
c04f5ac3
JX
11645msgid "HEAD is now at"
11646msgstr "HEAD 目前位于"
11647
d13389bf 11648#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
3495628d
JX
11649msgid "unable to update HEAD"
11650msgstr "不能更新 HEAD"
11651
d13389bf 11652#: builtin/checkout.c:916
c04f5ac3
JX
11653#, c-format
11654msgid "Reset branch '%s'\n"
11655msgstr "重置分支 '%s'\n"
11656
d13389bf 11657#: builtin/checkout.c:919
c04f5ac3
JX
11658#, c-format
11659msgid "Already on '%s'\n"
11660msgstr "已经位于 '%s'\n"
11661
d13389bf 11662#: builtin/checkout.c:923
c04f5ac3
JX
11663#, c-format
11664msgid "Switched to and reset branch '%s'\n"
11665msgstr "切换并重置分支 '%s'\n"
11666
d13389bf 11667#: builtin/checkout.c:925 builtin/checkout.c:1356
c04f5ac3
JX
11668#, c-format
11669msgid "Switched to a new branch '%s'\n"
11670msgstr "切换到一个新分支 '%s'\n"
11671
d13389bf 11672#: builtin/checkout.c:927
c04f5ac3
JX
11673#, c-format
11674msgid "Switched to branch '%s'\n"
11675msgstr "切换到分支 '%s'\n"
11676
90e6ef53 11677# 译者:注意保持前导空格
d13389bf 11678#: builtin/checkout.c:978
c04f5ac3
JX
11679#, c-format
11680msgid " ... and %d more.\n"
90e6ef53 11681msgstr " ... 及其它 %d 个。\n"
c04f5ac3 11682
d13389bf 11683#: builtin/checkout.c:984
c04f5ac3
JX
11684#, c-format
11685msgid ""
11686"Warning: you are leaving %d commit behind, not connected to\n"
11687"any of your branches:\n"
11688"\n"
11689"%s\n"
11690msgid_plural ""
11691"Warning: you are leaving %d commits behind, not connected to\n"
11692"any of your branches:\n"
11693"\n"
11694"%s\n"
11695msgstr[0] ""
11696"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
11697"\n"
11698"%s\n"
5ae481e0
JX
11699msgstr[1] ""
11700"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
11701"\n"
11702"%s\n"
c04f5ac3 11703
d13389bf 11704#: builtin/checkout.c:1003
c04f5ac3
JX
11705#, c-format
11706msgid ""
7aea43ff
JX
11707"If you want to keep it by creating a new branch, this may be a good time\n"
11708"to do so with:\n"
11709"\n"
11710" git branch <new-branch-name> %s\n"
11711"\n"
11712msgid_plural ""
c04f5ac3
JX
11713"If you want to keep them by creating a new branch, this may be a good time\n"
11714"to do so with:\n"
11715"\n"
814ff314 11716" git branch <new-branch-name> %s\n"
c04f5ac3 11717"\n"
7aea43ff
JX
11718msgstr[0] ""
11719"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
11720"如下操作:\n"
11721"\n"
11722" git branch <新分支名> %s\n"
11723"\n"
11724msgstr[1] ""
11725"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
c04f5ac3
JX
11726"如下操作:\n"
11727"\n"
814ff314 11728" git branch <新分支名> %s\n"
c04f5ac3
JX
11729"\n"
11730
d13389bf 11731#: builtin/checkout.c:1038
c04f5ac3
JX
11732msgid "internal error in revision walk"
11733msgstr "在版本遍历时遇到内部错误"
11734
d13389bf 11735#: builtin/checkout.c:1042
c04f5ac3
JX
11736msgid "Previous HEAD position was"
11737msgstr "之前的 HEAD 位置是"
11738
d13389bf 11739#: builtin/checkout.c:1082 builtin/checkout.c:1351
c04f5ac3 11740msgid "You are on a branch yet to be born"
90e6ef53 11741msgstr "您位于一个尚未初始化的分支"
c04f5ac3 11742
d13389bf 11743#: builtin/checkout.c:1164
06991777
JX
11744#, c-format
11745msgid ""
11746"'%s' could be both a local file and a tracking branch.\n"
11747"Please use -- (and optionally --no-guess) to disambiguate"
11748msgstr ""
11749"'%s' 既可以是一个本地文件,也可以是一个跟踪分支。\n"
11750"请使用 --(和可选的 --no-guess)来消除歧义"
11751
d13389bf 11752#: builtin/checkout.c:1171
2b472aae
JX
11753msgid ""
11754"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
11755"you can do so by fully qualifying the name with the --track option:\n"
11756"\n"
11757" git checkout --track origin/<name>\n"
11758"\n"
11759"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
11760"one remote, e.g. the 'origin' remote, consider setting\n"
11761"checkout.defaultRemote=origin in your config."
11762msgstr ""
11763"如果您想要检出一个远程跟踪分支,例如在 'origin' 上的,您可以使用分支\n"
11764"全名和 --track 选项:\n"
11765"\n"
440e7442 11766" git checkout --track origin/<名称>\n"
2b472aae 11767"\n"
440e7442 11768"如果您总是喜欢使用模糊的简短分支名 <名称>,而不喜欢如 'origin' 的远程\n"
2b472aae
JX
11769"名称,可以在配置中设置 checkout.defaultRemote=origin。"
11770
d13389bf 11771#: builtin/checkout.c:1181
2b472aae
JX
11772#, c-format
11773msgid "'%s' matched multiple (%d) remote tracking branches"
440e7442 11774msgstr "'%s' 匹配多个(%d 个)远程跟踪分支"
2b472aae 11775
d13389bf 11776#: builtin/checkout.c:1247
2b472aae 11777msgid "only one reference expected"
440e7442 11778msgstr "只期望一个引用"
2b472aae 11779
d13389bf 11780#: builtin/checkout.c:1264
2b472aae
JX
11781#, c-format
11782msgid "only one reference expected, %d given."
11783msgstr "应只有一个引用,却给出了 %d 个"
11784
d13389bf 11785#: builtin/checkout.c:1310 builtin/worktree.c:342 builtin/worktree.c:510
c04f5ac3
JX
11786#, c-format
11787msgid "invalid reference: %s"
11788msgstr "无效引用:%s"
11789
d13389bf 11790#: builtin/checkout.c:1323 builtin/checkout.c:1689
c04f5ac3
JX
11791#, c-format
11792msgid "reference is not a tree: %s"
11793msgstr "引用不是一个树:%s"
11794
d13389bf 11795#: builtin/checkout.c:1370
a6cd2cc4
JX
11796#, c-format
11797msgid "a branch is expected, got tag '%s'"
11798msgstr "期望一个分支,得到标签 '%s'"
11799
d13389bf 11800#: builtin/checkout.c:1372
a6cd2cc4
JX
11801#, c-format
11802msgid "a branch is expected, got remote branch '%s'"
11803msgstr "期望一个分支,得到远程分支 '%s'"
11804
d13389bf 11805#: builtin/checkout.c:1373 builtin/checkout.c:1381
a6cd2cc4
JX
11806#, c-format
11807msgid "a branch is expected, got '%s'"
11808msgstr "期望一个分支,得到 '%s'"
11809
d13389bf 11810#: builtin/checkout.c:1376
a6cd2cc4
JX
11811#, c-format
11812msgid "a branch is expected, got commit '%s'"
11813msgstr "期望一个分支,得到提交 '%s'"
11814
d13389bf 11815#: builtin/checkout.c:1392
a6cd2cc4
JX
11816msgid ""
11817"cannot switch branch while merging\n"
11818"Consider \"git merge --quit\" or \"git worktree add\"."
11819msgstr ""
11820"不能在合并时切换分支\n"
11821"考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
11822
d13389bf 11823#: builtin/checkout.c:1396
a6cd2cc4
JX
11824msgid ""
11825"cannot switch branch in the middle of an am session\n"
11826"Consider \"git am --quit\" or \"git worktree add\"."
11827msgstr ""
11828"不能在一个 am 会话期间切换分支\n"
11829"考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
11830
d13389bf 11831#: builtin/checkout.c:1400
a6cd2cc4
JX
11832msgid ""
11833"cannot switch branch while rebasing\n"
11834"Consider \"git rebase --quit\" or \"git worktree add\"."
11835msgstr ""
11836"不能在变基时切换分支\n"
11837"考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
11838
d13389bf 11839#: builtin/checkout.c:1404
a6cd2cc4
JX
11840msgid ""
11841"cannot switch branch while cherry-picking\n"
11842"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
11843msgstr ""
11844"不能在拣选时切换分支\n"
11845"考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
11846
d13389bf 11847#: builtin/checkout.c:1408
a6cd2cc4
JX
11848msgid ""
11849"cannot switch branch while reverting\n"
11850"Consider \"git revert --quit\" or \"git worktree add\"."
11851msgstr ""
11852"不能在还原时切换分支\n"
11853"考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
11854
d13389bf 11855#: builtin/checkout.c:1412
a6cd2cc4
JX
11856msgid "you are switching branch while bisecting"
11857msgstr "您在执行二分查找时切换分支"
11858
d13389bf 11859#: builtin/checkout.c:1419
ef317cd5 11860msgid "paths cannot be used with switching branches"
07432cef 11861msgstr "路径不能和切换分支同时使用"
c04f5ac3 11862
d13389bf 11863#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430
07432cef 11864#, c-format
ef317cd5 11865msgid "'%s' cannot be used with switching branches"
07432cef 11866msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 11867
d13389bf
JX
11868#: builtin/checkout.c:1434 builtin/checkout.c:1437 builtin/checkout.c:1440
11869#: builtin/checkout.c:1445 builtin/checkout.c:1450
07432cef 11870#, c-format
ef317cd5 11871msgid "'%s' cannot be used with '%s'"
07432cef 11872msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 11873
d13389bf 11874#: builtin/checkout.c:1447
a6cd2cc4
JX
11875#, c-format
11876msgid "'%s' cannot take <start-point>"
11877msgstr "'%s' 不带 <起始点>"
11878
d13389bf 11879#: builtin/checkout.c:1455
07432cef 11880#, c-format
ef317cd5 11881msgid "Cannot switch branch to a non-commit '%s'"
07432cef 11882msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 11883
d13389bf 11884#: builtin/checkout.c:1462
a6cd2cc4
JX
11885msgid "missing branch or commit argument"
11886msgstr "缺少分支或提交参数"
c04f5ac3 11887
d13389bf
JX
11888#: builtin/checkout.c:1504 builtin/clone.c:92 builtin/commit-graph.c:84
11889#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296
11890#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:575
11891#: builtin/send-pack.c:198
a6cd2cc4
JX
11892msgid "force progress reporting"
11893msgstr "强制显示进度报告"
c04f5ac3 11894
d13389bf 11895#: builtin/checkout.c:1505
a6cd2cc4
JX
11896msgid "perform a 3-way merge with the new branch"
11897msgstr "和新的分支执行三方合并"
c04f5ac3 11898
d13389bf 11899#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322
a6cd2cc4
JX
11900msgid "style"
11901msgstr "风格"
ef317cd5 11902
d13389bf 11903#: builtin/checkout.c:1507
a6cd2cc4
JX
11904msgid "conflict style (merge or diff3)"
11905msgstr "冲突输出风格(merge 或 diff3)"
11906
d13389bf 11907#: builtin/checkout.c:1519 builtin/worktree.c:558
5c57d762
JX
11908msgid "detach HEAD at named commit"
11909msgstr "HEAD 从指定的提交分离"
ef317cd5 11910
d13389bf 11911#: builtin/checkout.c:1520
ef317cd5 11912msgid "set upstream info for new branch"
07432cef 11913msgstr "为新的分支设置上游信息"
ef317cd5 11914
d13389bf 11915#: builtin/checkout.c:1522
a6cd2cc4
JX
11916msgid "force checkout (throw away local modifications)"
11917msgstr "强制检出(丢弃本地修改)"
11918
d13389bf 11919#: builtin/checkout.c:1524
6c94aba5 11920msgid "new-branch"
07432cef 11921msgstr "新分支"
ef317cd5 11922
d13389bf 11923#: builtin/checkout.c:1524
ef317cd5 11924msgid "new unparented branch"
07432cef 11925msgstr "新的没有父提交的分支"
ef317cd5 11926
d13389bf 11927#: builtin/checkout.c:1526 builtin/merge.c:300
a6cd2cc4
JX
11928msgid "update ignored files (default)"
11929msgstr "更新忽略的文件(默认)"
11930
d13389bf 11931#: builtin/checkout.c:1529
a6cd2cc4
JX
11932msgid "do not check if another worktree is holding the given ref"
11933msgstr "不检查指定的引用是否被其他工作区所占用"
11934
d13389bf 11935#: builtin/checkout.c:1542
ef317cd5 11936msgid "checkout our version for unmerged files"
07432cef 11937msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 11938
d13389bf 11939#: builtin/checkout.c:1545
ef317cd5 11940msgid "checkout their version for unmerged files"
07432cef 11941msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 11942
d13389bf 11943#: builtin/checkout.c:1549
4dcdc3d8
JX
11944msgid "do not limit pathspecs to sparse entries only"
11945msgstr "对路径不做稀疏检出的限制"
11946
d13389bf 11947#: builtin/checkout.c:1604
349ede6a
JX
11948#, c-format
11949msgid "-%c, -%c and --orphan are mutually exclusive"
11950msgstr "-%c、-%c 和 --orphan 是互斥的"
ef317cd5 11951
d13389bf 11952#: builtin/checkout.c:1608
d46c5519
JX
11953msgid "-p and --overlay are mutually exclusive"
11954msgstr "-p 和 --overlay 互斥"
11955
d13389bf 11956#: builtin/checkout.c:1645
ef317cd5
JX
11957msgid "--track needs a branch name"
11958msgstr "--track 需要一个分支名"
11959
d13389bf 11960#: builtin/checkout.c:1650
349ede6a
JX
11961#, c-format
11962msgid "missing branch name; try -%c"
11963msgstr "缺少分支名,尝试 -%c"
ef317cd5 11964
d13389bf 11965#: builtin/checkout.c:1682
a6cd2cc4
JX
11966#, c-format
11967msgid "could not resolve %s"
11968msgstr "无法解析 %s"
11969
d13389bf 11970#: builtin/checkout.c:1698
c04f5ac3 11971msgid "invalid path specification"
90e6ef53 11972msgstr "无效的路径规格"
c04f5ac3 11973
d13389bf 11974#: builtin/checkout.c:1705
07432cef 11975#, c-format
a4f16749
JX
11976msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
11977msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'"
c04f5ac3 11978
d13389bf 11979#: builtin/checkout.c:1709
07432cef 11980#, c-format
ef317cd5 11981msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 11982msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 11983
d13389bf 11984#: builtin/checkout.c:1718
ddc12c42
JX
11985msgid "--pathspec-from-file is incompatible with --detach"
11986msgstr "--pathspec-from-file 与 --detach 不兼容"
11987
d13389bf 11988#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499
ddc12c42
JX
11989msgid "--pathspec-from-file is incompatible with --patch"
11990msgstr "--pathspec-from-file 与 --patch 不兼容"
11991
d13389bf 11992#: builtin/checkout.c:1734
c04f5ac3
JX
11993msgid ""
11994"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
11995"checking out of the index."
11996msgstr ""
90e6ef53 11997"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 11998
d13389bf 11999#: builtin/checkout.c:1739
ddc12c42
JX
12000msgid "you must specify path(s) to restore"
12001msgstr "您必须指定一个要恢复的路径"
12002
d13389bf
JX
12003#: builtin/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816
12004#: builtin/checkout.c:1818 builtin/clone.c:122 builtin/remote.c:170
d9488fea 12005#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554
7157c2b5 12006#: builtin/worktree.c:556
a6cd2cc4
JX
12007msgid "branch"
12008msgstr "分支"
12009
d13389bf 12010#: builtin/checkout.c:1766
a6cd2cc4
JX
12011msgid "create and checkout a new branch"
12012msgstr "创建并检出一个新的分支"
12013
d13389bf 12014#: builtin/checkout.c:1768
a6cd2cc4
JX
12015msgid "create/reset and checkout a branch"
12016msgstr "创建/重置并检出一个分支"
12017
d13389bf 12018#: builtin/checkout.c:1769
a6cd2cc4
JX
12019msgid "create reflog for new branch"
12020msgstr "为新的分支创建引用日志"
12021
d13389bf 12022#: builtin/checkout.c:1771
a6cd2cc4
JX
12023msgid "second guess 'git checkout <no-such-branch>' (default)"
12024msgstr "二次猜测 'git checkout <无此分支>'(默认)"
12025
d13389bf 12026#: builtin/checkout.c:1772
a6cd2cc4
JX
12027msgid "use overlay mode (default)"
12028msgstr "使用叠加模式(默认)"
12029
d13389bf 12030#: builtin/checkout.c:1817
a6cd2cc4
JX
12031msgid "create and switch to a new branch"
12032msgstr "创建并切换一个新分支"
12033
d13389bf 12034#: builtin/checkout.c:1819
a6cd2cc4
JX
12035msgid "create/reset and switch to a branch"
12036msgstr "创建/重置并切换一个分支"
12037
d13389bf 12038#: builtin/checkout.c:1821
a6cd2cc4
JX
12039msgid "second guess 'git switch <no-such-branch>'"
12040msgstr "二次猜测 'git switch <无此分支>'"
12041
d13389bf 12042#: builtin/checkout.c:1823
a6cd2cc4
JX
12043msgid "throw away local modifications"
12044msgstr "丢弃本地修改"
12045
d13389bf 12046#: builtin/checkout.c:1857
a6cd2cc4
JX
12047msgid "which tree-ish to checkout from"
12048msgstr "要检出哪一个树"
12049
d13389bf 12050#: builtin/checkout.c:1859
a6cd2cc4
JX
12051msgid "restore the index"
12052msgstr "恢复索引"
12053
d13389bf 12054#: builtin/checkout.c:1861
a6cd2cc4
JX
12055msgid "restore the working tree (default)"
12056msgstr "恢复工作区(默认)"
12057
d13389bf 12058#: builtin/checkout.c:1863
a6cd2cc4
JX
12059msgid "ignore unmerged entries"
12060msgstr "忽略未合并条目"
12061
d13389bf 12062#: builtin/checkout.c:1864
a6cd2cc4
JX
12063msgid "use overlay mode"
12064msgstr "使用叠加模式"
12065
349ede6a 12066#: builtin/clean.c:29
2e8451e8
JX
12067msgid ""
12068"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
12069msgstr ""
12070"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 12071
349ede6a 12072#: builtin/clean.c:33
07432cef
WS
12073#, c-format
12074msgid "Removing %s\n"
12075msgstr "正删除 %s\n"
12076
349ede6a 12077#: builtin/clean.c:34
07432cef
WS
12078#, c-format
12079msgid "Would remove %s\n"
12080msgstr "将删除 %s\n"
12081
349ede6a 12082#: builtin/clean.c:35
07432cef
WS
12083#, c-format
12084msgid "Skipping repository %s\n"
160fb2b2 12085msgstr "忽略仓库 %s\n"
07432cef 12086
349ede6a 12087#: builtin/clean.c:36
07432cef
WS
12088#, c-format
12089msgid "Would skip repository %s\n"
160fb2b2 12090msgstr "将忽略仓库 %s\n"
07432cef 12091
349ede6a 12092#: builtin/clean.c:37
07432cef
WS
12093#, c-format
12094msgid "failed to remove %s"
c1ac5258 12095msgstr "删除 %s 失败"
07432cef 12096
349ede6a 12097#: builtin/clean.c:38
a6cd2cc4
JX
12098#, c-format
12099msgid "could not lstat %s\n"
12100msgstr "不能对 %s 调用 lstat\n"
12101
d13389bf 12102#: builtin/clean.c:302 git-add--interactive.perl:593
1a79b2f1 12103#, c-format
2e8451e8
JX
12104msgid ""
12105"Prompt help:\n"
12106"1 - select a numbered item\n"
12107"foo - select item based on unique prefix\n"
1a79b2f1 12108" - (empty) select nothing\n"
2e8451e8
JX
12109msgstr ""
12110"帮助:\n"
12111"1 - 通过编号选择一个选项\n"
1a79b2f1
JX
12112"foo - 通过唯一前缀选择一个选项\n"
12113" - (空)什么也不选择\n"
2e8451e8 12114
d13389bf 12115#: builtin/clean.c:306 git-add--interactive.perl:602
1a79b2f1 12116#, c-format
2e8451e8
JX
12117msgid ""
12118"Prompt help:\n"
12119"1 - select a single item\n"
12120"3-5 - select a range of items\n"
12121"2-3,6-9 - select multiple ranges\n"
12122"foo - select item based on unique prefix\n"
12123"-... - unselect specified items\n"
12124"* - choose all items\n"
1a79b2f1 12125" - (empty) finish selecting\n"
2e8451e8
JX
12126msgstr ""
12127"帮助:\n"
12128"1 - 选择一个选项\n"
12129"3-5 - 选择一个范围内的所有选项\n"
12130"2-3,6-9 - 选择多个范围内的所有选项\n"
1a79b2f1 12131"foo - 通过唯一前缀选择一个选项\n"
2e8451e8
JX
12132"-... - 反选特定的选项\n"
12133"* - 选择所有选项\n"
1a79b2f1 12134" - (空)结束选择\n"
2e8451e8 12135
d13389bf
JX
12136#: builtin/clean.c:521 git-add--interactive.perl:568
12137#: git-add--interactive.perl:573
1a79b2f1
JX
12138#, c-format, perl-format
12139msgid "Huh (%s)?\n"
12140msgstr "嗯(%s)?\n"
2e8451e8 12141
349ede6a 12142#: builtin/clean.c:661
2e8451e8
JX
12143#, c-format
12144msgid "Input ignore patterns>> "
12145msgstr "输入模版以排除条目>> "
12146
349ede6a 12147#: builtin/clean.c:696
2e8451e8
JX
12148#, c-format
12149msgid "WARNING: Cannot find items matched by: %s"
12150msgstr "警告:无法找到和 %s 匹配的条目"
12151
349ede6a 12152#: builtin/clean.c:717
2e8451e8
JX
12153msgid "Select items to delete"
12154msgstr "选择要删除的条目"
12155
814ff314 12156#. TRANSLATORS: Make sure to keep [y/N] as is
349ede6a 12157#: builtin/clean.c:758
2e8451e8 12158#, c-format
814ff314
JX
12159msgid "Remove %s [y/N]? "
12160msgstr "删除 %s [y/N]?"
2e8451e8 12161
349ede6a 12162#: builtin/clean.c:789
2e8451e8
JX
12163msgid ""
12164"clean - start cleaning\n"
12165"filter by pattern - exclude items from deletion\n"
12166"select by numbers - select items to be deleted by numbers\n"
12167"ask each - confirm each deletion (like \"rm -i\")\n"
12168"quit - stop cleaning\n"
12169"help - this screen\n"
12170"? - help for prompt selection"
12171msgstr ""
12172"clean - 开始清理\n"
12173"filter by pattern - 通过模版排除要删除的条目\n"
12174"select by numbers - 通过数字选择要删除的条目\n"
12175"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
12176"quit - 停止删除并退出\n"
12177"help - 显示本帮助\n"
12178"? - 显示如何在提示符下选择的帮助"
12179
349ede6a 12180#: builtin/clean.c:825
2e8451e8
JX
12181msgid "Would remove the following item:"
12182msgid_plural "Would remove the following items:"
12183msgstr[0] "将删除如下条目:"
12184msgstr[1] "将删除如下条目:"
12185
349ede6a 12186#: builtin/clean.c:841
2e8451e8
JX
12187msgid "No more files to clean, exiting."
12188msgstr "没有要清理的文件,退出。"
12189
349ede6a 12190#: builtin/clean.c:903
ef317cd5 12191msgid "do not print names of files removed"
07432cef 12192msgstr "不打印删除文件的名称"
ef317cd5 12193
349ede6a 12194#: builtin/clean.c:905
ef317cd5 12195msgid "force"
07432cef 12196msgstr "强制"
ef317cd5 12197
349ede6a 12198#: builtin/clean.c:906
2e8451e8
JX
12199msgid "interactive cleaning"
12200msgstr "交互式清除"
12201
349ede6a 12202#: builtin/clean.c:908
ef317cd5 12203msgid "remove whole directories"
07432cef 12204msgstr "删除整个目录"
ef317cd5 12205
349ede6a 12206#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
d13389bf 12207#: builtin/grep.c:921 builtin/log.c:183 builtin/log.c:185
349ede6a 12208#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528
d46c5519 12209#: builtin/show-ref.c:179
ef317cd5 12210msgid "pattern"
07432cef 12211msgstr "模式"
ef317cd5 12212
349ede6a 12213#: builtin/clean.c:910
ef317cd5 12214msgid "add <pattern> to ignore rules"
4375c10e 12215msgstr "添加 <模式> 到忽略规则"
ef317cd5 12216
349ede6a 12217#: builtin/clean.c:911
ef317cd5 12218msgid "remove ignored files, too"
07432cef 12219msgstr "也删除忽略的文件"
ef317cd5 12220
349ede6a 12221#: builtin/clean.c:913
ef317cd5 12222msgid "remove only ignored files"
07432cef 12223msgstr "只删除忽略的文件"
c04f5ac3 12224
7157c2b5 12225#: builtin/clean.c:929
c04f5ac3 12226msgid ""
6c94aba5 12227"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 12228"clean"
c04f5ac3 12229msgstr ""
2e8451e8 12230"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 12231
7157c2b5 12232#: builtin/clean.c:932
c04f5ac3 12233msgid ""
6c94aba5 12234"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 12235"refusing to clean"
c04f5ac3 12236msgstr ""
2e8451e8 12237"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 12238
7157c2b5
JX
12239#: builtin/clean.c:944
12240msgid "-x and -X cannot be used together"
12241msgstr "-x 和 -X 不能同时使用"
12242
a5cd71ca 12243#: builtin/clone.c:45
814ff314 12244msgid "git clone [<options>] [--] <repo> [<dir>]"
160fb2b2 12245msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
ef317cd5 12246
d13389bf 12247#: builtin/clone.c:94
ef317cd5 12248msgid "don't create a checkout"
07432cef 12249msgstr "不创建一个检出"
ef317cd5 12250
d13389bf 12251#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555
ef317cd5 12252msgid "create a bare repository"
160fb2b2 12253msgstr "创建一个纯仓库"
ef317cd5 12254
d13389bf 12255#: builtin/clone.c:99
ef317cd5 12256msgid "create a mirror repository (implies bare)"
160fb2b2 12257msgstr "创建一个镜像仓库(也是纯仓库)"
ef317cd5 12258
d13389bf 12259#: builtin/clone.c:101
ef317cd5 12260msgid "to clone from a local repository"
160fb2b2 12261msgstr "从本地仓库克隆"
ef317cd5 12262
d13389bf 12263#: builtin/clone.c:103
ef317cd5 12264msgid "don't use local hardlinks, always copy"
07432cef 12265msgstr "不使用本地硬链接,始终复制"
ef317cd5 12266
d13389bf 12267#: builtin/clone.c:105
ef317cd5 12268msgid "setup as shared repository"
160fb2b2 12269msgstr "设置为共享仓库"
ef317cd5 12270
d13389bf 12271#: builtin/clone.c:107
87cb7997 12272msgid "pathspec"
65e2041e 12273msgstr "路径规格"
87cb7997 12274
d13389bf 12275#: builtin/clone.c:107
ef317cd5 12276msgid "initialize submodules in the clone"
07432cef 12277msgstr "在克隆时初始化子模组"
ef317cd5 12278
d13389bf 12279#: builtin/clone.c:111
5b04ee3b
JX
12280msgid "number of submodules cloned in parallel"
12281msgstr "并发克隆的子模组的数量"
12282
d13389bf 12283#: builtin/clone.c:112 builtin/init-db.c:552
ef317cd5 12284msgid "template-directory"
07432cef 12285msgstr "模板目录"
ef317cd5 12286
d13389bf 12287#: builtin/clone.c:113 builtin/init-db.c:553
ef317cd5 12288msgid "directory from which templates will be used"
07432cef 12289msgstr "模板目录将被使用"
ef317cd5 12290
d13389bf 12291#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
d9488fea 12292#: builtin/submodule--helper.c:2336
ef317cd5 12293msgid "reference repository"
160fb2b2 12294msgstr "参考仓库"
ef317cd5 12295
d13389bf 12296#: builtin/clone.c:119 builtin/submodule--helper.c:1833
d9488fea 12297#: builtin/submodule--helper.c:2338
7aea43ff 12298msgid "use --reference only while cloning"
160fb2b2 12299msgstr "仅在克隆时参考 --reference 指向的本地仓库"
7aea43ff 12300
d13389bf
JX
12301#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
12302#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358
ef317cd5 12303msgid "name"
07432cef 12304msgstr "名称"
ef317cd5 12305
d13389bf 12306#: builtin/clone.c:121
ef317cd5 12307msgid "use <name> instead of 'origin' to track upstream"
4375c10e 12308msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
ef317cd5 12309
d13389bf 12310#: builtin/clone.c:123
ef317cd5 12311msgid "checkout <branch> instead of the remote's HEAD"
4375c10e 12312msgstr "检出 <分支> 而不是远程 HEAD"
ef317cd5 12313
d13389bf 12314#: builtin/clone.c:125
ef317cd5 12315msgid "path to git-upload-pack on the remote"
07432cef 12316msgstr "远程 git-upload-pack 路径"
ef317cd5 12317
d13389bf 12318#: builtin/clone.c:126 builtin/fetch.c:173 builtin/grep.c:860
349ede6a 12319#: builtin/pull.c:208
ef317cd5 12320msgid "depth"
07432cef 12321msgstr "深度"
ef317cd5 12322
d13389bf 12323#: builtin/clone.c:127
ef317cd5 12324msgid "create a shallow clone of that depth"
07432cef 12325msgstr "创建一个指定深度的浅克隆"
ef317cd5 12326
d13389bf 12327#: builtin/clone.c:128 builtin/fetch.c:175 builtin/pack-objects.c:3535
349ede6a 12328#: builtin/pull.c:211
a0b6b246
JX
12329msgid "time"
12330msgstr "时间"
12331
d13389bf 12332#: builtin/clone.c:129
a0b6b246
JX
12333msgid "create a shallow clone since a specific time"
12334msgstr "从一个特定时间创建一个浅克隆"
12335
d13389bf
JX
12336#: builtin/clone.c:130 builtin/fetch.c:177 builtin/fetch.c:200
12337#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317
a0b6b246
JX
12338msgid "revision"
12339msgstr "版本"
12340
d13389bf 12341#: builtin/clone.c:131 builtin/fetch.c:178 builtin/pull.c:215
1a79b2f1
JX
12342msgid "deepen history of shallow clone, excluding rev"
12343msgstr "深化浅克隆的历史,除了特定版本"
a0b6b246 12344
d13389bf 12345#: builtin/clone.c:133 builtin/submodule--helper.c:1843
d9488fea 12346#: builtin/submodule--helper.c:2352
ef317cd5 12347msgid "clone only one branch, HEAD or --branch"
07432cef 12348msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 12349
d13389bf 12350#: builtin/clone.c:135
a4f16749
JX
12351msgid "don't clone any tags, and make later fetches not to follow them"
12352msgstr "不要克隆任何标签,并且后续获取操作也不下载它们"
12353
d13389bf 12354#: builtin/clone.c:137
5b04ee3b
JX
12355msgid "any cloned submodules will be shallow"
12356msgstr "子模组将以浅下载模式克隆"
12357
d13389bf 12358#: builtin/clone.c:138 builtin/init-db.c:561
ef317cd5 12359msgid "gitdir"
07432cef 12360msgstr "git目录"
ef317cd5 12361
d13389bf 12362#: builtin/clone.c:139 builtin/init-db.c:562
ef317cd5 12363msgid "separate git dir from working tree"
07432cef 12364msgstr "git目录和工作区分离"
ef317cd5 12365
d13389bf 12366#: builtin/clone.c:140
ef317cd5 12367msgid "key=value"
07432cef 12368msgstr "key=value"
ef317cd5 12369
d13389bf 12370#: builtin/clone.c:141
ef317cd5 12371msgid "set config inside the new repository"
160fb2b2 12372msgstr "在新仓库中设置配置信息"
ef317cd5 12373
d13389bf
JX
12374#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76
12375#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
d46c5519
JX
12376msgid "server-specific"
12377msgstr "server-specific"
12378
d13389bf
JX
12379#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76
12380#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
d46c5519
JX
12381msgid "option to transmit"
12382msgstr "传输选项"
12383
d13389bf
JX
12384#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234
12385#: builtin/push.c:585
276ceeaa
JX
12386msgid "use IPv4 addresses only"
12387msgstr "只使用 IPv4 地址"
12388
d13389bf
JX
12389#: builtin/clone.c:146 builtin/fetch.c:198 builtin/pull.c:237
12390#: builtin/push.c:587
276ceeaa
JX
12391msgid "use IPv6 addresses only"
12392msgstr "只使用 IPv6 地址"
12393
d13389bf 12394#: builtin/clone.c:150
a6cd2cc4
JX
12395msgid "any cloned submodules will use their remote-tracking branch"
12396msgstr "任何克隆的子模组将使用它们的远程跟踪分支"
12397
d13389bf 12398#: builtin/clone.c:152
ddc12c42
JX
12399msgid "initialize sparse-checkout file to include only files at root"
12400msgstr "初始化稀疏检出文件,只包含根目录文件"
12401
d13389bf 12402#: builtin/clone.c:288
3495628d
JX
12403msgid ""
12404"No directory name could be guessed.\n"
12405"Please specify a directory on the command line"
12406msgstr ""
12407"无法猜到目录名。\n"
26e4cbec 12408"请在命令行指定一个目录"
3495628d 12409
d13389bf 12410#: builtin/clone.c:341
cfff71a9 12411#, c-format
a0b6b246
JX
12412msgid "info: Could not add alternate for '%s': %s\n"
12413msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
cfff71a9 12414
d13389bf 12415#: builtin/clone.c:414
c04f5ac3
JX
12416#, c-format
12417msgid "%s exists and is not a directory"
12418msgstr "%s 存在且不是一个目录"
12419
d13389bf 12420#: builtin/clone.c:432
c04f5ac3 12421#, c-format
a6cd2cc4
JX
12422msgid "failed to start iterator over '%s'"
12423msgstr "无法在 '%s' 上启动迭代器"
c04f5ac3 12424
d13389bf 12425#: builtin/clone.c:463
c04f5ac3
JX
12426#, c-format
12427msgid "failed to create link '%s'"
c1ac5258 12428msgstr "创建链接 '%s' 失败"
c04f5ac3 12429
d13389bf 12430#: builtin/clone.c:467
c04f5ac3
JX
12431#, c-format
12432msgid "failed to copy file to '%s'"
c1ac5258 12433msgstr "拷贝文件至 '%s' 失败"
c04f5ac3 12434
d13389bf 12435#: builtin/clone.c:472
a6cd2cc4
JX
12436#, c-format
12437msgid "failed to iterate over '%s'"
12438msgstr "无法在 '%s' 上迭代"
12439
d13389bf 12440#: builtin/clone.c:499
c04f5ac3
JX
12441#, c-format
12442msgid "done.\n"
12443msgstr "完成。\n"
12444
d13389bf 12445#: builtin/clone.c:513
1003b3a5
JX
12446msgid ""
12447"Clone succeeded, but checkout failed.\n"
12448"You can inspect what was checked out with 'git status'\n"
a6cd2cc4 12449"and retry with 'git restore --source=HEAD :/'\n"
1003b3a5
JX
12450msgstr ""
12451"克隆成功,但是检出失败。\n"
12452"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
a6cd2cc4 12453"'git restore --source=HEAD :/' 重试\n"
1003b3a5 12454
d13389bf 12455#: builtin/clone.c:590
c04f5ac3
JX
12456#, c-format
12457msgid "Could not find remote branch %s to clone."
90e6ef53 12458msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 12459
d13389bf 12460#: builtin/clone.c:709
3495628d
JX
12461#, c-format
12462msgid "unable to update %s"
12463msgstr "不能更新 %s"
12464
d13389bf 12465#: builtin/clone.c:757
ddc12c42
JX
12466msgid "failed to initialize sparse-checkout"
12467msgstr "无法初始化稀疏检出"
12468
d13389bf 12469#: builtin/clone.c:780
c04f5ac3
JX
12470msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
12471msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
12472
d13389bf 12473#: builtin/clone.c:812
1003b3a5
JX
12474msgid "unable to checkout working tree"
12475msgstr "不能检出工作区"
12476
d13389bf 12477#: builtin/clone.c:887
3495628d
JX
12478msgid "unable to write parameters to config file"
12479msgstr "无法将参数写入配置文件"
12480
d13389bf 12481#: builtin/clone.c:950
04cb2f28
JX
12482msgid "cannot repack to clean up"
12483msgstr "无法执行 repack 来清理"
12484
d13389bf 12485#: builtin/clone.c:952
04cb2f28
JX
12486msgid "cannot unlink temporary alternates file"
12487msgstr "无法删除临时的 alternates 文件"
12488
d13389bf 12489#: builtin/clone.c:992 builtin/receive-pack.c:2493
c04f5ac3
JX
12490msgid "Too many arguments."
12491msgstr "太多参数。"
12492
d13389bf 12493#: builtin/clone.c:996
c04f5ac3 12494msgid "You must specify a repository to clone."
160fb2b2 12495msgstr "您必须指定一个仓库来克隆。"
c04f5ac3 12496
d13389bf 12497#: builtin/clone.c:1009
c04f5ac3
JX
12498#, c-format
12499msgid "--bare and --origin %s options are incompatible."
12500msgstr "--bare 和 --origin %s 选项不兼容。"
12501
d13389bf 12502#: builtin/clone.c:1012
07432cef
WS
12503msgid "--bare and --separate-git-dir are incompatible."
12504msgstr "--bare 和 --separate-git-dir 选项不兼容。"
12505
d13389bf 12506#: builtin/clone.c:1025
c04f5ac3
JX
12507#, c-format
12508msgid "repository '%s' does not exist"
160fb2b2 12509msgstr "仓库 '%s' 不存在"
c04f5ac3 12510
d13389bf 12511#: builtin/clone.c:1029 builtin/fetch.c:1841
cfff71a9
JX
12512#, c-format
12513msgid "depth %s is not a positive number"
12514msgstr "深度 %s 不是一个正数"
12515
d13389bf 12516#: builtin/clone.c:1039
c04f5ac3
JX
12517#, c-format
12518msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 12519msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 12520
d13389bf 12521#: builtin/clone.c:1045
d9488fea
JX
12522#, c-format
12523msgid "repository path '%s' already exists and is not an empty directory."
12524msgstr "仓库路径 '%s' 已经存在,并且不是一个空目录。"
12525
d13389bf 12526#: builtin/clone.c:1059
c04f5ac3
JX
12527#, c-format
12528msgid "working tree '%s' already exists."
12529msgstr "工作区 '%s' 已经存在。"
12530
d13389bf
JX
12531#: builtin/clone.c:1074 builtin/clone.c:1095 builtin/difftool.c:271
12532#: builtin/log.c:1987 builtin/worktree.c:354 builtin/worktree.c:386
5bb01d4f
JX
12533#, c-format
12534msgid "could not create leading directories of '%s'"
12535msgstr "不能为 '%s' 创建先导目录"
12536
d13389bf 12537#: builtin/clone.c:1079
c04f5ac3 12538#, c-format
814ff314
JX
12539msgid "could not create work tree dir '%s'"
12540msgstr "不能创建工作区目录 '%s'"
c04f5ac3 12541
d13389bf 12542#: builtin/clone.c:1099
c04f5ac3
JX
12543#, c-format
12544msgid "Cloning into bare repository '%s'...\n"
160fb2b2 12545msgstr "克隆到纯仓库 '%s'...\n"
c04f5ac3 12546
d13389bf 12547#: builtin/clone.c:1101
c04f5ac3
JX
12548#, c-format
12549msgid "Cloning into '%s'...\n"
12550msgstr "正克隆到 '%s'...\n"
12551
d13389bf 12552#: builtin/clone.c:1125
a0b6b246
JX
12553msgid ""
12554"clone --recursive is not compatible with both --reference and --reference-if-"
12555"able"
12556msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
12557
d13389bf
JX
12558#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705
12559#, c-format
12560msgid "'%s' is not a valid remote name"
12561msgstr "'%s' 不是一个有效的远程名称"
12562
12563#: builtin/clone.c:1210
6acbf033 12564msgid "--depth is ignored in local clones; use file:// instead."
a0b6b246
JX
12565msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
12566
d13389bf 12567#: builtin/clone.c:1212
a0b6b246
JX
12568msgid "--shallow-since is ignored in local clones; use file:// instead."
12569msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
6acbf033 12570
d13389bf 12571#: builtin/clone.c:1214
a0b6b246
JX
12572msgid "--shallow-exclude is ignored in local clones; use file:// instead."
12573msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
12574
d13389bf 12575#: builtin/clone.c:1216
31e5e17b
JX
12576msgid "--filter is ignored in local clones; use file:// instead."
12577msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。"
12578
d13389bf 12579#: builtin/clone.c:1219
6acbf033 12580msgid "source repository is shallow, ignoring --local"
160fb2b2 12581msgstr "源仓库是浅克隆,忽略 --local"
6acbf033 12582
d13389bf 12583#: builtin/clone.c:1224
6acbf033
JX
12584msgid "--local is ignored"
12585msgstr "--local 被忽略"
12586
d13389bf 12587#: builtin/clone.c:1311 builtin/clone.c:1319
c04f5ac3
JX
12588#, c-format
12589msgid "Remote branch %s not found in upstream %s"
12590msgstr "远程分支 %s 在上游 %s 未发现"
12591
d13389bf 12592#: builtin/clone.c:1322
c04f5ac3 12593msgid "You appear to have cloned an empty repository."
160fb2b2 12594msgstr "您似乎克隆了一个空仓库。"
c04f5ac3 12595
a4f16749 12596#: builtin/column.c:10
814ff314
JX
12597msgid "git column [<options>]"
12598msgstr "git column [<选项>]"
ef317cd5 12599
a4f16749 12600#: builtin/column.c:27
ef317cd5 12601msgid "lookup config vars"
07432cef 12602msgstr "查找配置变量"
ef317cd5 12603
a4f16749 12604#: builtin/column.c:28 builtin/column.c:29
ef317cd5 12605msgid "layout to use"
07432cef 12606msgstr "要使用的布局"
ef317cd5 12607
a4f16749 12608#: builtin/column.c:30
ef317cd5 12609msgid "Maximum width"
07432cef 12610msgstr "最大宽度"
ef317cd5 12611
a4f16749 12612#: builtin/column.c:31
ef317cd5 12613msgid "Padding space on left border"
07432cef 12614msgstr "左边框的填充空间"
ef317cd5 12615
a4f16749 12616#: builtin/column.c:32
ef317cd5 12617msgid "Padding space on right border"
07432cef 12618msgstr "右边框的填充空间"
ef317cd5 12619
a4f16749 12620#: builtin/column.c:33
ef317cd5 12621msgid "Padding space between columns"
07432cef 12622msgstr "两列之间的填充空间"
ef317cd5 12623
fd8cb379 12624#: builtin/column.c:51
8ada9598 12625msgid "--command must be the first argument"
81809b99 12626msgstr "--command 必须是第一个参数"
8ada9598 12627
d9488fea 12628#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
349ede6a
JX
12629msgid ""
12630"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
12631msgstr ""
12632"git commit-graph verify [--object-dir <对象目录>] [--shallow] [--"
12633"[no-]progress]"
12634
d9488fea 12635#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
349ede6a
JX
12636msgid ""
12637"git commit-graph write [--object-dir <objdir>] [--append] [--"
12638"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
d9488fea 12639"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
349ede6a
JX
12640msgstr ""
12641"git commit-graph write [--object-dir <对象目录>] [--append] [--split[=<策略"
12642">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--"
d9488fea 12643"[no-]max-new-filters <n>] [--[no-]progress] <切分选项>"
349ede6a 12644
d9488fea 12645#: builtin/commit-graph.c:64
349ede6a
JX
12646#, c-format
12647msgid "could not find object directory matching %s"
12648msgstr "无法找到和 %s 匹配的对象目录"
12649
d9488fea 12650#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
d13389bf 12651#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1769
349ede6a
JX
12652msgid "dir"
12653msgstr "目录"
12654
d9488fea
JX
12655#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
12656#: builtin/commit-graph.c:317
349ede6a
JX
12657msgid "The object directory to store the graph"
12658msgstr "保存图形的对象目录"
12659
d9488fea 12660#: builtin/commit-graph.c:83
349ede6a
JX
12661msgid "if the commit-graph is split, only verify the tip file"
12662msgstr "如果提交图形被拆分,只验证头一个文件"
12663
d9488fea 12664#: builtin/commit-graph.c:106
349ede6a
JX
12665#, c-format
12666msgid "Could not open commit-graph '%s'"
12667msgstr "无法打开提交图形 '%s'"
12668
d9488fea 12669#: builtin/commit-graph.c:142
349ede6a
JX
12670#, c-format
12671msgid "unrecognized --split argument, %s"
12672msgstr "未能识别的 --split 参数,%s"
12673
d9488fea 12674#: builtin/commit-graph.c:155
7157c2b5
JX
12675#, c-format
12676msgid "unexpected non-hex object ID: %s"
12677msgstr "意外的非十六进制对象 ID:%s"
12678
d9488fea 12679#: builtin/commit-graph.c:160
7157c2b5
JX
12680#, c-format
12681msgid "invalid object: %s"
12682msgstr "无效对象:%s"
12683
d9488fea 12684#: builtin/commit-graph.c:213
349ede6a
JX
12685msgid "start walk at all refs"
12686msgstr "开始遍历所有引用"
12687
d9488fea 12688#: builtin/commit-graph.c:215
349ede6a
JX
12689msgid "scan pack-indexes listed by stdin for commits"
12690msgstr "从标准输入中的包索引文件列表中扫描提交"
12691
d9488fea 12692#: builtin/commit-graph.c:217
349ede6a
JX
12693msgid "start walk at commits listed by stdin"
12694msgstr "从标准输入中的提交开始扫描"
12695
d9488fea 12696#: builtin/commit-graph.c:219
349ede6a
JX
12697msgid "include all commits already in the commit-graph file"
12698msgstr "包含 commit-graph 文件中已有所有提交"
12699
d9488fea 12700#: builtin/commit-graph.c:221
349ede6a
JX
12701msgid "enable computation for changed paths"
12702msgstr "启用变更路径的计算"
12703
d9488fea 12704#: builtin/commit-graph.c:224
349ede6a
JX
12705msgid "allow writing an incremental commit-graph file"
12706msgstr "允许写一个增量提交图形文件"
12707
d9488fea 12708#: builtin/commit-graph.c:228
349ede6a
JX
12709msgid "maximum number of commits in a non-base split commit-graph"
12710msgstr "在非基本拆分提交图形中的最大提交数"
12711
d9488fea 12712#: builtin/commit-graph.c:230
349ede6a
JX
12713msgid "maximum ratio between two levels of a split commit-graph"
12714msgstr "一个拆分提交图形的两个级别之间的最大比率"
12715
d9488fea 12716#: builtin/commit-graph.c:232
349ede6a
JX
12717msgid "only expire files older than a given date-time"
12718msgstr "只让早于给定时间的文件过期"
12719
d9488fea
JX
12720#: builtin/commit-graph.c:234
12721msgid "maximum number of changed-path Bloom filters to compute"
12722msgstr "要计算的变更路径布隆过滤器的最大数"
12723
12724#: builtin/commit-graph.c:255
349ede6a
JX
12725msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
12726msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
12727
d9488fea 12728#: builtin/commit-graph.c:287
7157c2b5
JX
12729msgid "Collecting commits from input"
12730msgstr "正从标准输入收集提交"
349ede6a 12731
d46c5519
JX
12732#: builtin/commit-tree.c:18
12733msgid ""
12734"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
12735"<file>)...] <tree>"
12736msgstr ""
12737"git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件"
12738">)...] <树>"
12739
12740#: builtin/commit-tree.c:31
12741#, c-format
12742msgid "duplicate parent %s ignored"
12743msgstr "忽略重复的父提交 %s"
12744
d13389bf 12745#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555
d46c5519
JX
12746#, c-format
12747msgid "not a valid object name %s"
12748msgstr "不是一个有效的对象名 %s"
12749
12750#: builtin/commit-tree.c:93
12751#, c-format
12752msgid "git commit-tree: failed to open '%s'"
12753msgstr "git commit-tree:无法打开 '%s'"
12754
12755#: builtin/commit-tree.c:96
12756#, c-format
12757msgid "git commit-tree: failed to read '%s'"
12758msgstr "git commit-tree:无法读取 '%s'"
12759
12760#: builtin/commit-tree.c:98
12761#, c-format
12762msgid "git commit-tree: failed to close '%s'"
12763msgstr "git commit-tree:无法关闭 '%s'"
12764
12765#: builtin/commit-tree.c:111
12766msgid "parent"
12767msgstr "父提交"
12768
12769#: builtin/commit-tree.c:112
12770msgid "id of a parent commit object"
5b533632 12771msgstr "父提交对象 ID"
d46c5519 12772
d13389bf
JX
12773#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:281
12774#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470
349ede6a 12775#: builtin/tag.c:413
d46c5519
JX
12776msgid "message"
12777msgstr "说明"
12778
d9488fea 12779#: builtin/commit-tree.c:115 builtin/commit.c:1504
d46c5519
JX
12780msgid "commit message"
12781msgstr "提交说明"
12782
12783#: builtin/commit-tree.c:118
12784msgid "read commit log message from file"
12785msgstr "从文件中读取提交说明"
12786
d13389bf 12787#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:298
349ede6a 12788#: builtin/pull.c:176 builtin/revert.c:118
d46c5519
JX
12789msgid "GPG sign commit"
12790msgstr "GPG 提交签名"
12791
12792#: builtin/commit-tree.c:133
12793msgid "must give exactly one tree"
12794msgstr "必须精确地提供一个树"
12795
12796#: builtin/commit-tree.c:140
12797msgid "git commit-tree: failed to read"
12798msgstr "git commit-tree:读取失败"
12799
06991777 12800#: builtin/commit.c:41
814ff314 12801msgid "git commit [<options>] [--] <pathspec>..."
160fb2b2 12802msgstr "git commit [<选项>] [--] <路径规格>..."
ef317cd5 12803
06991777 12804#: builtin/commit.c:46
814ff314 12805msgid "git status [<options>] [--] <pathspec>..."
160fb2b2 12806msgstr "git status [<选项>] [--] <路径规格>..."
ef317cd5 12807
06991777 12808#: builtin/commit.c:51
c04f5ac3
JX
12809msgid ""
12810"You asked to amend the most recent commit, but doing so would make\n"
12811"it empty. You can repeat your command with --allow-empty, or you can\n"
12812"remove the commit entirely with \"git reset HEAD^\".\n"
12813msgstr ""
1b150dc9
T
12814"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
12815"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 12816
06991777 12817#: builtin/commit.c:56
c04f5ac3
JX
12818msgid ""
12819"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
12820"If you wish to commit it anyway, use:\n"
12821"\n"
12822" git commit --allow-empty\n"
12823"\n"
c04f5ac3 12824msgstr ""
a9ce4543
T
12825"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
12826"也要提交,使用命令:\n"
c04f5ac3
JX
12827"\n"
12828" git commit --allow-empty\n"
12829"\n"
c04f5ac3 12830
06991777 12831#: builtin/commit.c:63
349ede6a
JX
12832msgid "Otherwise, please use 'git rebase --skip'\n"
12833msgstr "否则,请使用 'git rebase --skip'\n"
12834
12835#: builtin/commit.c:66
a6cd2cc4
JX
12836msgid "Otherwise, please use 'git cherry-pick --skip'\n"
12837msgstr "否则,请使用 'git cherry-pick --skip'\n"
b1894384 12838
349ede6a 12839#: builtin/commit.c:69
b1894384 12840msgid ""
a6cd2cc4
JX
12841"and then use:\n"
12842"\n"
12843" git cherry-pick --continue\n"
12844"\n"
12845"to resume cherry-picking the remaining commits.\n"
b1894384
JX
12846"If you wish to skip this commit, use:\n"
12847"\n"
a6cd2cc4 12848" git cherry-pick --skip\n"
b1894384 12849"\n"
b1894384 12850msgstr ""
a6cd2cc4
JX
12851"然后使用:\n"
12852"\n"
12853" git cherry-pick --continue\n"
b1894384 12854"\n"
a6cd2cc4
JX
12855"来继续拣选剩余提交。如果您想跳过此提交,使用:\n"
12856"\n"
12857" git cherry-pick --skip\n"
b1894384 12858"\n"
b1894384 12859
349ede6a 12860#: builtin/commit.c:312
c04f5ac3 12861msgid "failed to unpack HEAD tree object"
c1ac5258 12862msgstr "解包 HEAD 树对象失败"
c04f5ac3 12863
349ede6a 12864#: builtin/commit.c:348
ddc12c42
JX
12865msgid "--pathspec-from-file with -a does not make sense"
12866msgstr "--pathspec-from-file 和 -a 在一起没有意义"
12867
349ede6a 12868#: builtin/commit.c:361
ddc12c42
JX
12869msgid "No paths with --include/--only does not make sense."
12870msgstr "参数 --include/--only 不跟路径没有意义。"
12871
349ede6a 12872#: builtin/commit.c:373
c04f5ac3 12873msgid "unable to create temporary index"
90e6ef53 12874msgstr "不能创建临时索引"
c04f5ac3 12875
349ede6a 12876#: builtin/commit.c:382
c04f5ac3
JX
12877msgid "interactive add failed"
12878msgstr "交互式添加失败"
12879
349ede6a 12880#: builtin/commit.c:397
220c313c
JX
12881msgid "unable to update temporary index"
12882msgstr "无法更新临时索引"
12883
349ede6a 12884#: builtin/commit.c:399
220c313c
JX
12885msgid "Failed to update main cache tree"
12886msgstr "不能更新树的主缓存"
12887
349ede6a 12888#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
c04f5ac3 12889msgid "unable to write new_index file"
90e6ef53 12890msgstr "无法写 new_index 文件"
c04f5ac3 12891
349ede6a 12892#: builtin/commit.c:476
8ada9598 12893msgid "cannot do a partial commit during a merge."
81809b99 12894msgstr "在合并过程中不能做部分提交。"
c04f5ac3 12895
349ede6a 12896#: builtin/commit.c:478
8ada9598 12897msgid "cannot do a partial commit during a cherry-pick."
81809b99 12898msgstr "在拣选过程中不能做部分提交。"
8ada9598 12899
349ede6a
JX
12900#: builtin/commit.c:480
12901msgid "cannot do a partial commit during a rebase."
12902msgstr "在变基过程中不能做部分提交。"
12903
12904#: builtin/commit.c:488
c04f5ac3 12905msgid "cannot read the index"
90e6ef53 12906msgstr "无法读取索引"
c04f5ac3 12907
349ede6a 12908#: builtin/commit.c:507
c04f5ac3 12909msgid "unable to write temporary index file"
90e6ef53 12910msgstr "无法写临时索引文件"
c04f5ac3 12911
349ede6a 12912#: builtin/commit.c:605
220c313c
JX
12913#, c-format
12914msgid "commit '%s' lacks author header"
12915msgstr "提交 '%s' 缺少作者信息"
12916
349ede6a 12917#: builtin/commit.c:607
c04f5ac3 12918#, c-format
220c313c 12919msgid "commit '%s' has malformed author line"
fd8cb379 12920msgstr "提交 '%s' 有格式错误的作者信息"
c04f5ac3 12921
349ede6a 12922#: builtin/commit.c:626
c04f5ac3 12923msgid "malformed --author parameter"
fd8cb379 12924msgstr "格式错误的 --author 参数"
c04f5ac3 12925
349ede6a 12926#: builtin/commit.c:679
6acbf033
JX
12927msgid ""
12928"unable to select a comment character that is not used\n"
12929"in the current commit message"
12930msgstr "无法选择一个未被当前提交说明使用的注释字符"
12931
d9488fea 12932#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097
c04f5ac3
JX
12933#, c-format
12934msgid "could not lookup commit %s"
12935msgstr "不能查询提交 %s"
12936
d13389bf 12937#: builtin/commit.c:729 builtin/shortlog.c:425
c04f5ac3
JX
12938#, c-format
12939msgid "(reading log message from standard input)\n"
90e6ef53 12940msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 12941
349ede6a 12942#: builtin/commit.c:731
c04f5ac3 12943msgid "could not read log from standard input"
90e6ef53 12944msgstr "不能从标准输入中读取日志信息"
c04f5ac3 12945
349ede6a 12946#: builtin/commit.c:735
c04f5ac3
JX
12947#, c-format
12948msgid "could not read log file '%s'"
90e6ef53 12949msgstr "不能读取日志文件 '%s'"
c04f5ac3 12950
349ede6a 12951#: builtin/commit.c:766 builtin/commit.c:782
c04f5ac3 12952msgid "could not read SQUASH_MSG"
90e6ef53 12953msgstr "不能读取 SQUASH_MSG"
c04f5ac3 12954
349ede6a 12955#: builtin/commit.c:773
5b04ee3b
JX
12956msgid "could not read MERGE_MSG"
12957msgstr "不能读取 MERGE_MSG"
12958
349ede6a 12959#: builtin/commit.c:833
c04f5ac3 12960msgid "could not write commit template"
90e6ef53 12961msgstr "不能写提交模版"
c04f5ac3 12962
d9488fea 12963#: builtin/commit.c:853
c04f5ac3
JX
12964msgid ""
12965"\n"
8ada9598 12966"It looks like you may be committing a merge.\n"
d9488fea
JX
12967"If this is not correct, please run\n"
12968"\tgit update-ref -d MERGE_HEAD\n"
c04f5ac3
JX
12969"and try again.\n"
12970msgstr ""
12971"\n"
d9488fea
JX
12972"似乎您正在做一个合并提交。如果不对,请运行\n"
12973"\tgit update-ref -d MERGE_HEAD\n"
c04f5ac3
JX
12974"然后重试。\n"
12975
d9488fea 12976#: builtin/commit.c:858
8ada9598
JX
12977msgid ""
12978"\n"
12979"It looks like you may be committing a cherry-pick.\n"
d9488fea
JX
12980"If this is not correct, please run\n"
12981"\tgit update-ref -d CHERRY_PICK_HEAD\n"
8ada9598
JX
12982"and try again.\n"
12983msgstr ""
12984"\n"
d9488fea
JX
12985"似乎您正在做一个拣选提交。如果不对,请运行\n"
12986"\tgit update-ref -d CHERRY_PICK_HEAD\n"
8ada9598 12987"然后重试。\n"
c04f5ac3 12988
d9488fea 12989#: builtin/commit.c:868
a77c07d9 12990#, c-format
c04f5ac3 12991msgid ""
8ada9598 12992"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 12993"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 12994msgstr ""
a77c07d9 12995"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 12996"说明将会终止提交。\n"
c04f5ac3 12997
d9488fea 12998#: builtin/commit.c:876
a77c07d9 12999#, c-format
c04f5ac3 13000msgid ""
8ada9598 13001"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 13002"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
13003"An empty message aborts the commit.\n"
13004msgstr ""
a77c07d9
JX
13005"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
13006"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 13007
90e6ef53 13008# 译者:为保证在输出中对齐,注意调整句中空格!
d9488fea 13009#: builtin/commit.c:893
6acbf033
JX
13010#, c-format
13011msgid "%sAuthor: %.*s <%.*s>"
13012msgstr "%s作者: %.*s <%.*s>"
13013
13014# 译者:为保证在输出中对齐,注意调整句中空格!
d9488fea 13015#: builtin/commit.c:901
c04f5ac3 13016#, c-format
6acbf033
JX
13017msgid "%sDate: %s"
13018msgstr "%s日期: %s"
c04f5ac3 13019
90e6ef53 13020# 译者:为保证在输出中对齐,注意调整句中空格!
d9488fea 13021#: builtin/commit.c:908
c04f5ac3 13022#, c-format
6acbf033
JX
13023msgid "%sCommitter: %.*s <%.*s>"
13024msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 13025
d9488fea 13026#: builtin/commit.c:926
c04f5ac3 13027msgid "Cannot read index"
90e6ef53 13028msgstr "无法读取索引"
c04f5ac3 13029
d9488fea 13030#: builtin/commit.c:997
c04f5ac3
JX
13031msgid "Error building trees"
13032msgstr "无法创建树对象"
13033
d9488fea 13034#: builtin/commit.c:1011 builtin/tag.c:276
c04f5ac3
JX
13035#, c-format
13036msgid "Please supply the message using either -m or -F option.\n"
07432cef 13037msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 13038
d9488fea 13039#: builtin/commit.c:1055
c04f5ac3 13040#, c-format
814ff314 13041msgid "--author '%s' is not 'Name <email>' and matches no existing author"
58b6f078 13042msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配"
c04f5ac3 13043
d9488fea 13044#: builtin/commit.c:1069
5809aa05
JX
13045#, c-format
13046msgid "Invalid ignored mode '%s'"
13047msgstr "无效的忽略模式 '%s'"
13048
d9488fea 13049#: builtin/commit.c:1087 builtin/commit.c:1331
c04f5ac3
JX
13050#, c-format
13051msgid "Invalid untracked files mode '%s'"
90e6ef53 13052msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 13053
d9488fea 13054#: builtin/commit.c:1127
2e8451e8
JX
13055msgid "--long and -z are incompatible"
13056msgstr "--long 和 -z 选项不兼容"
13057
d9488fea 13058#: builtin/commit.c:1171
c04f5ac3
JX
13059msgid "Using both --reset-author and --author does not make sense"
13060msgstr "同时使用 --reset-author 和 --author 没有意义"
13061
d9488fea 13062#: builtin/commit.c:1180
c04f5ac3 13063msgid "You have nothing to amend."
90e6ef53 13064msgstr "您没有可修补的提交。"
c04f5ac3 13065
d9488fea 13066#: builtin/commit.c:1183
8ada9598 13067msgid "You are in the middle of a merge -- cannot amend."
81809b99 13068msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 13069
d9488fea 13070#: builtin/commit.c:1185
8ada9598 13071msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 13072msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 13073
d9488fea 13074#: builtin/commit.c:1187
349ede6a
JX
13075msgid "You are in the middle of a rebase -- cannot amend."
13076msgstr "您正处于一个变基过程中 -- 无法修补提交。"
13077
d9488fea 13078#: builtin/commit.c:1190
c04f5ac3 13079msgid "Options --squash and --fixup cannot be used together"
649900bc 13080msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 13081
d9488fea 13082#: builtin/commit.c:1200
c04f5ac3
JX
13083msgid "Only one of -c/-C/-F/--fixup can be used."
13084msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
13085
d9488fea 13086#: builtin/commit.c:1202
31e5e17b
JX
13087msgid "Option -m cannot be combined with -c/-C/-F."
13088msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
c04f5ac3 13089
d9488fea 13090#: builtin/commit.c:1211
c04f5ac3 13091msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 13092msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 13093
d9488fea 13094#: builtin/commit.c:1229
c04f5ac3
JX
13095msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
13096msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
13097
d9488fea 13098#: builtin/commit.c:1235
c04f5ac3 13099#, c-format
d46c5519
JX
13100msgid "paths '%s ...' with -a does not make sense"
13101msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"
c04f5ac3 13102
d9488fea 13103#: builtin/commit.c:1366 builtin/commit.c:1527
ef317cd5 13104msgid "show status concisely"
07432cef 13105msgstr "以简洁的格式显示状态"
ef317cd5 13106
d9488fea 13107#: builtin/commit.c:1368 builtin/commit.c:1529
ef317cd5 13108msgid "show branch information"
07432cef 13109msgstr "显示分支信息"
ef317cd5 13110
d9488fea 13111#: builtin/commit.c:1370
a4f16749
JX
13112msgid "show stash information"
13113msgstr "显示贮藏区信息"
13114
d9488fea 13115#: builtin/commit.c:1372 builtin/commit.c:1531
31e5e17b
JX
13116msgid "compute full ahead/behind values"
13117msgstr "计算完整的领先/落后值"
13118
d9488fea 13119#: builtin/commit.c:1374
a0b6b246
JX
13120msgid "version"
13121msgstr "版本"
13122
d13389bf
JX
13123#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
13124#: builtin/worktree.c:725
ef317cd5 13125msgid "machine-readable output"
07432cef
WS
13126msgstr "机器可读的输出"
13127
d9488fea 13128#: builtin/commit.c:1377 builtin/commit.c:1535
07432cef
WS
13129msgid "show status in long format (default)"
13130msgstr "以长格式显示状态(默认)"
ef317cd5 13131
d9488fea 13132#: builtin/commit.c:1380 builtin/commit.c:1538
ef317cd5 13133msgid "terminate entries with NUL"
4375c10e 13134msgstr "条目以 NUL 字符结尾"
ef317cd5 13135
d9488fea 13136#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
d13389bf
JX
13137#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
13138#: builtin/fast-export.c:1204 builtin/rebase.c:1406 parse-options.h:336
ef317cd5 13139msgid "mode"
07432cef 13140msgstr "模式"
ef317cd5 13141
d9488fea 13142#: builtin/commit.c:1383 builtin/commit.c:1541
ef317cd5 13143msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 13144msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 13145
d9488fea 13146#: builtin/commit.c:1387
5809aa05
JX
13147msgid ""
13148"show ignored files, optional modes: traditional, matching, no. (Default: "
13149"traditional)"
31e5e17b
JX
13150msgstr ""
13151"显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)"
ef317cd5 13152
d9488fea 13153#: builtin/commit.c:1389 parse-options.h:192
ef317cd5
JX
13154msgid "when"
13155msgstr "何时"
13156
d9488fea 13157#: builtin/commit.c:1390
ef317cd5
JX
13158msgid ""
13159"ignore changes to submodules, optional when: all, dirty, untracked. "
13160"(Default: all)"
13161msgstr ""
07432cef 13162"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 13163
d9488fea 13164#: builtin/commit.c:1392
ef317cd5 13165msgid "list untracked files in columns"
07432cef 13166msgstr "以列的方式显示未跟踪的文件"
ef317cd5 13167
d9488fea 13168#: builtin/commit.c:1393
fd8cb379
JX
13169msgid "do not detect renames"
13170msgstr "不检测重命名"
13171
d9488fea 13172#: builtin/commit.c:1395
fd8cb379
JX
13173msgid "detect renames, optionally set similarity index"
13174msgstr "检测重命名,可以设置索引相似度"
13175
d9488fea 13176#: builtin/commit.c:1415
5809aa05
JX
13177msgid "Unsupported combination of ignored and untracked-files arguments"
13178msgstr "不支持已忽略和未跟踪文件参数的组合"
13179
d9488fea 13180#: builtin/commit.c:1497
ef317cd5 13181msgid "suppress summary after successful commit"
07432cef 13182msgstr "提交成功后不显示概述信息"
c04f5ac3 13183
d9488fea 13184#: builtin/commit.c:1498
ef317cd5 13185msgid "show diff in commit message template"
07432cef 13186msgstr "在提交说明模板里显示差异"
c04f5ac3 13187
d9488fea 13188#: builtin/commit.c:1500
ef317cd5 13189msgid "Commit message options"
07432cef 13190msgstr "提交说明选项"
c04f5ac3 13191
d13389bf 13192#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415
ef317cd5 13193msgid "read message from file"
07432cef 13194msgstr "从文件中读取提交说明"
c04f5ac3 13195
d9488fea 13196#: builtin/commit.c:1502
ef317cd5 13197msgid "author"
07432cef 13198msgstr "作者"
c04f5ac3 13199
d9488fea 13200#: builtin/commit.c:1502
ef317cd5 13201msgid "override author for commit"
07432cef 13202msgstr "提交时覆盖作者"
73a60cd2 13203
d13389bf 13204#: builtin/commit.c:1503 builtin/gc.c:542
ef317cd5 13205msgid "date"
07432cef 13206msgstr "日期"
c04f5ac3 13207
d9488fea 13208#: builtin/commit.c:1503
ef317cd5 13209msgid "override date for commit"
07432cef 13210msgstr "提交时覆盖日期"
c04f5ac3 13211
d9488fea
JX
13212#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
13213#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87
94550ed3
JX
13214msgid "commit"
13215msgstr "提交"
13216
d9488fea 13217#: builtin/commit.c:1505
ef317cd5 13218msgid "reuse and edit message from specified commit"
07432cef 13219msgstr "重用并编辑指定提交的提交说明"
ef317cd5 13220
d9488fea 13221#: builtin/commit.c:1506
ef317cd5 13222msgid "reuse message from specified commit"
07432cef 13223msgstr "重用指定提交的提交说明"
ef317cd5 13224
d9488fea 13225#: builtin/commit.c:1507
ef317cd5 13226msgid "use autosquash formatted message to fixup specified commit"
07432cef 13227msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 13228
d9488fea 13229#: builtin/commit.c:1508
ef317cd5 13230msgid "use autosquash formatted message to squash specified commit"
07432cef 13231msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 13232
d9488fea 13233#: builtin/commit.c:1509
ef317cd5 13234msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 13235msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 13236
d13389bf 13237#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301
349ede6a 13238#: builtin/pull.c:145 builtin/revert.c:110
d13389bf
JX
13239msgid "add a Signed-off-by trailer"
13240msgstr "添加 Signed-off-by 尾注"
ef317cd5 13241
d9488fea 13242#: builtin/commit.c:1511
ef317cd5 13243msgid "use specified template file"
07432cef 13244msgstr "使用指定的模板文件"
ef317cd5 13245
d9488fea 13246#: builtin/commit.c:1512
ef317cd5 13247msgid "force edit of commit"
07432cef 13248msgstr "强制编辑提交"
ef317cd5 13249
d9488fea 13250#: builtin/commit.c:1514
ef317cd5 13251msgid "include status in commit message template"
07432cef 13252msgstr "在提交说明模板里包含状态信息"
ef317cd5 13253
d9488fea 13254#: builtin/commit.c:1519
ef317cd5 13255msgid "Commit contents options"
07432cef 13256msgstr "提交内容选项"
ef317cd5 13257
d9488fea 13258#: builtin/commit.c:1520
ef317cd5 13259msgid "commit all changed files"
07432cef 13260msgstr "提交所有改动的文件"
ef317cd5 13261
d9488fea 13262#: builtin/commit.c:1521
ef317cd5 13263msgid "add specified files to index for commit"
07432cef 13264msgstr "添加指定的文件到索引区等待提交"
ef317cd5 13265
d9488fea 13266#: builtin/commit.c:1522
ef317cd5 13267msgid "interactively add files"
07432cef 13268msgstr "交互式添加文件"
ef317cd5 13269
d9488fea 13270#: builtin/commit.c:1523
ef317cd5 13271msgid "interactively add changes"
07432cef 13272msgstr "交互式添加变更"
ef317cd5 13273
d9488fea 13274#: builtin/commit.c:1524
ef317cd5 13275msgid "commit only specified files"
07432cef 13276msgstr "只提交指定的文件"
ef317cd5 13277
d9488fea 13278#: builtin/commit.c:1525
5c57d762
JX
13279msgid "bypass pre-commit and commit-msg hooks"
13280msgstr "绕过 pre-commit 和 commit-msg 钩子"
13281
d9488fea 13282#: builtin/commit.c:1526
ef317cd5 13283msgid "show what would be committed"
07432cef 13284msgstr "显示将要提交的内容"
ef317cd5 13285
d9488fea 13286#: builtin/commit.c:1539
ef317cd5 13287msgid "amend previous commit"
07432cef 13288msgstr "修改先前的提交"
ef317cd5 13289
d9488fea 13290#: builtin/commit.c:1540
ef317cd5 13291msgid "bypass post-rewrite hook"
07432cef 13292msgstr "绕过 post-rewrite 钩子"
ef317cd5 13293
d9488fea 13294#: builtin/commit.c:1547
ef317cd5 13295msgid "ok to record an empty change"
07432cef 13296msgstr "允许一个空提交"
ef317cd5 13297
d9488fea 13298#: builtin/commit.c:1549
ef317cd5 13299msgid "ok to record a change with an empty message"
07432cef 13300msgstr "允许空的提交说明"
ef317cd5 13301
d9488fea 13302#: builtin/commit.c:1622
c04f5ac3
JX
13303#, c-format
13304msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 13305msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 13306
d9488fea 13307#: builtin/commit.c:1629
c04f5ac3 13308msgid "could not read MERGE_MODE"
90e6ef53 13309msgstr "不能读取 MERGE_MODE"
c04f5ac3 13310
d9488fea 13311#: builtin/commit.c:1650
c04f5ac3
JX
13312#, c-format
13313msgid "could not read commit message: %s"
90e6ef53 13314msgstr "不能读取提交说明:%s"
c04f5ac3 13315
d9488fea 13316#: builtin/commit.c:1657
c04f5ac3
JX
13317#, c-format
13318msgid "Aborting commit due to empty commit message.\n"
13319msgstr "终止提交因为提交说明为空。\n"
13320
d9488fea 13321#: builtin/commit.c:1662
6937cb4e
JX
13322#, c-format
13323msgid "Aborting commit; you did not edit the message.\n"
13324msgstr "终止提交;您未更改来自模版的提交说明。\n"
13325
d9488fea 13326#: builtin/commit.c:1696
c04f5ac3 13327msgid ""
c1ac5258 13328"repository has been updated, but unable to write\n"
220c313c 13329"new_index file. Check that disk is not full and quota is\n"
a6cd2cc4 13330"not exceeded, and then \"git restore --staged :/\" to recover."
c04f5ac3 13331msgstr ""
a6cd2cc4
JX
13332"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满或\n"
13333"磁盘配额已耗尽,然后执行 \"git restore --staged :/\" 恢复。"
c04f5ac3 13334
4c27fcb5 13335#: builtin/config.c:11
814ff314
JX
13336msgid "git config [<options>]"
13337msgstr "git config [<选项>]"
ef317cd5 13338
d13389bf 13339#: builtin/config.c:109 builtin/env--helper.c:27
fd8cb379
JX
13340#, c-format
13341msgid "unrecognized --type argument, %s"
13342msgstr "未能识别的 --type 参数,%s"
13343
d13389bf 13344#: builtin/config.c:121
c1ac5258
JX
13345msgid "only one type at a time"
13346msgstr "一次只能一个类型"
13347
d13389bf 13348#: builtin/config.c:130
ef317cd5 13349msgid "Config file location"
07432cef 13350msgstr "配置文件位置"
ef317cd5 13351
d13389bf 13352#: builtin/config.c:131
ef317cd5 13353msgid "use global config file"
07432cef 13354msgstr "使用全局配置文件"
ef317cd5 13355
d13389bf 13356#: builtin/config.c:132
ef317cd5 13357msgid "use system config file"
07432cef 13358msgstr "使用系统级配置文件"
ef317cd5 13359
d13389bf 13360#: builtin/config.c:133
ef317cd5 13361msgid "use repository config file"
160fb2b2 13362msgstr "使用仓库级配置文件"
ef317cd5 13363
d13389bf 13364#: builtin/config.c:134
4c27fcb5
JX
13365msgid "use per-worktree config file"
13366msgstr "使用工作区级别的配置文件"
13367
d13389bf 13368#: builtin/config.c:135
ef317cd5 13369msgid "use given config file"
07432cef 13370msgstr "使用指定的配置文件"
ef317cd5 13371
d13389bf 13372#: builtin/config.c:136
2e8451e8 13373msgid "blob-id"
4375c10e 13374msgstr "数据对象 ID"
2e8451e8 13375
d13389bf 13376#: builtin/config.c:136
2e8451e8
JX
13377msgid "read config from given blob object"
13378msgstr "从给定的数据对象读取配置"
13379
d13389bf 13380#: builtin/config.c:137
ef317cd5 13381msgid "Action"
07432cef 13382msgstr "操作"
ef317cd5 13383
d9488fea 13384#: builtin/config.c:138
d13389bf
JX
13385msgid "get value: name [value-pattern]"
13386msgstr "获取值:名称 [值模式]"
ef317cd5 13387
d9488fea 13388#: builtin/config.c:139
d13389bf
JX
13389msgid "get all values: key [value-pattern]"
13390msgstr "获得所有的值:键 [值模式]"
90314792 13391
d9488fea 13392#: builtin/config.c:140
d13389bf
JX
13393msgid "get values for regexp: name-regex [value-pattern]"
13394msgstr "根据正则表达式获得值:名称正则 [值模式]"
ef317cd5 13395
d9488fea 13396#: builtin/config.c:141
d13389bf
JX
13397msgid "get value specific for the URL: section[.var] URL"
13398msgstr "获得 URL 取值:section[.var] URL"
ef317cd5 13399
d9488fea 13400#: builtin/config.c:142
d13389bf
JX
13401msgid "replace all matching variables: name value [value-pattern]"
13402msgstr "替换所有匹配的变量:名称 值 [值模式]"
ef317cd5 13403
d9488fea 13404#: builtin/config.c:143
d13389bf
JX
13405msgid "add a new variable: name value"
13406msgstr "添加一个新的变量:名称 值"
ef317cd5 13407
d9488fea 13408#: builtin/config.c:144
d13389bf
JX
13409msgid "remove a variable: name [value-pattern]"
13410msgstr "删除一个变量:名称 [值模式]"
13411
13412#: builtin/config.c:145
13413msgid "remove all matches: name [value-pattern]"
13414msgstr "删除所有匹配项:名称 [值模式]"
13415
13416#: builtin/config.c:146
ef317cd5 13417msgid "rename section: old-name new-name"
07432cef 13418msgstr "重命名小节:old-name new-name"
ef317cd5 13419
d13389bf 13420#: builtin/config.c:147
ef317cd5 13421msgid "remove a section: name"
07432cef 13422msgstr "删除一个小节:name"
ef317cd5 13423
d13389bf 13424#: builtin/config.c:148
ef317cd5 13425msgid "list all"
07432cef 13426msgstr "列出所有"
ef317cd5 13427
d13389bf
JX
13428#: builtin/config.c:149
13429msgid "use string equality when comparing values to 'value-pattern'"
13430msgstr "在比较值与 '值模式' 时,使用字符串字面比较"
13431
13432#: builtin/config.c:150
ef317cd5 13433msgid "open an editor"
07432cef 13434msgstr "打开一个编辑器"
ef317cd5 13435
d13389bf 13436#: builtin/config.c:151
04cb2f28
JX
13437msgid "find the color configured: slot [default]"
13438msgstr "获得配置的颜色:配置 [默认]"
ef317cd5 13439
d13389bf 13440#: builtin/config.c:152
04cb2f28
JX
13441msgid "find the color setting: slot [stdout-is-tty]"
13442msgstr "获得颜色设置:配置 [stdout-is-tty]"
ef317cd5 13443
d13389bf 13444#: builtin/config.c:153
ef317cd5 13445msgid "Type"
07432cef 13446msgstr "类型"
ef317cd5 13447
d13389bf 13448#: builtin/config.c:154 builtin/env--helper.c:43
fd8cb379
JX
13449msgid "value is given this type"
13450msgstr "取值为该类型"
13451
d13389bf 13452#: builtin/config.c:155
ef317cd5 13453msgid "value is \"true\" or \"false\""
07432cef 13454msgstr "值是 \"true\" 或 \"false\""
ef317cd5 13455
d13389bf 13456#: builtin/config.c:156
ef317cd5 13457msgid "value is decimal number"
07432cef 13458msgstr "值是十进制数"
ef317cd5 13459
d13389bf 13460#: builtin/config.c:157
ef317cd5 13461msgid "value is --bool or --int"
d9488fea 13462msgstr "值是 --bool 或 --int"
ef317cd5 13463
d13389bf 13464#: builtin/config.c:158
d9488fea
JX
13465msgid "value is --bool or string"
13466msgstr "值是 --bool 或字符串"
13467
d13389bf 13468#: builtin/config.c:159
ef317cd5 13469msgid "value is a path (file or directory name)"
07432cef 13470msgstr "值是一个路径(文件或目录名)"
ef317cd5 13471
d13389bf 13472#: builtin/config.c:160
5809aa05
JX
13473msgid "value is an expiry date"
13474msgstr "值是一个到期日期"
13475
d13389bf 13476#: builtin/config.c:161
ef317cd5 13477msgid "Other"
07432cef 13478msgstr "其它"
ef317cd5 13479
d13389bf 13480#: builtin/config.c:162
ef317cd5 13481msgid "terminate values with NUL byte"
4375c10e 13482msgstr "终止值是 NUL 字节"
ef317cd5 13483
d13389bf 13484#: builtin/config.c:163
1b7f4a34
JX
13485msgid "show variable names only"
13486msgstr "只显示变量名"
13487
d13389bf 13488#: builtin/config.c:164
ef317cd5 13489msgid "respect include directives on lookup"
07432cef 13490msgstr "查询时参照 include 指令递归查找"
ef317cd5 13491
d13389bf 13492#: builtin/config.c:165
276ceeaa
JX
13493msgid "show origin of config (file, standard input, blob, command line)"
13494msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
13495
d13389bf 13496#: builtin/config.c:166
2b472aae 13497msgid "show scope of config (worktree, local, global, system, command)"
440e7442 13498msgstr "显示配置的作用域(工作区、本地、全局、系统、命令)"
2b472aae 13499
d13389bf 13500#: builtin/config.c:167 builtin/env--helper.c:45
fd8cb379
JX
13501msgid "value"
13502msgstr "取值"
13503
d13389bf 13504#: builtin/config.c:167
fd8cb379
JX
13505msgid "with --get, use default value when missing entry"
13506msgstr "使用 --get 参数,当缺少设置时使用默认值"
13507
d13389bf 13508#: builtin/config.c:181
c1ac5258
JX
13509#, c-format
13510msgid "wrong number of arguments, should be %d"
13511msgstr "错误的参数个数,应该为 %d 个"
13512
d13389bf 13513#: builtin/config.c:183
c1ac5258
JX
13514#, c-format
13515msgid "wrong number of arguments, should be from %d to %d"
13516msgstr "错误的参数个数,应该为从 %d 个到 %d 个"
13517
d13389bf 13518#: builtin/config.c:339
c1ac5258
JX
13519#, c-format
13520msgid "invalid key pattern: %s"
13521msgstr "无效键名模式:%s"
13522
d13389bf 13523#: builtin/config.c:377
fd8cb379
JX
13524#, c-format
13525msgid "failed to format default config value: %s"
c1ac5258
JX
13526msgstr "格式化默认配置值失败:%s"
13527
d13389bf 13528#: builtin/config.c:441
c1ac5258
JX
13529#, c-format
13530msgid "cannot parse color '%s'"
13531msgstr "无法解析颜色 '%s'"
fd8cb379 13532
d13389bf 13533#: builtin/config.c:483
220c313c 13534msgid "unable to parse default color value"
c1ac5258
JX
13535msgstr "无法解析默认颜色值"
13536
d13389bf 13537#: builtin/config.c:536 builtin/config.c:833
c1ac5258
JX
13538msgid "not in a git directory"
13539msgstr "不在 git 仓库中"
13540
d13389bf 13541#: builtin/config.c:539
c1ac5258
JX
13542msgid "writing to stdin is not supported"
13543msgstr "不支持写到标准输入"
13544
d13389bf 13545#: builtin/config.c:542
c1ac5258
JX
13546msgid "writing config blobs is not supported"
13547msgstr "不支持写到配置数据对象"
220c313c 13548
d13389bf 13549#: builtin/config.c:627
220c313c
JX
13550#, c-format
13551msgid ""
13552"# This is Git's per-user configuration file.\n"
7aea43ff 13553"[user]\n"
220c313c 13554"# Please adapt and uncomment the following lines:\n"
7aea43ff 13555"#\tname = %s\n"
220c313c
JX
13556"#\temail = %s\n"
13557msgstr ""
13558"# This is Git's per-user configuration file.\n"
7aea43ff 13559"[user]\n"
220c313c 13560"# Please adapt and uncomment the following lines:\n"
7aea43ff 13561"#\tname = %s\n"
220c313c
JX
13562"#\temail = %s\n"
13563
d13389bf 13564#: builtin/config.c:652
c1ac5258
JX
13565msgid "only one config file at a time"
13566msgstr "一次只能有一个配置文件"
13567
d13389bf 13568#: builtin/config.c:658
a4f16749 13569msgid "--local can only be used inside a git repository"
d9488fea 13570msgstr "--local 只能在 git 仓库内使用"
a4f16749 13571
d13389bf 13572#: builtin/config.c:660
fd8cb379 13573msgid "--blob can only be used inside a git repository"
d9488fea
JX
13574msgstr "--blob 只能在 git 仓库内使用"
13575
d13389bf 13576#: builtin/config.c:662
d9488fea
JX
13577msgid "--worktree can only be used inside a git repository"
13578msgstr "--worktree 只能在 git 仓库内使用"
fd8cb379 13579
d13389bf 13580#: builtin/config.c:684
c1ac5258
JX
13581msgid "$HOME not set"
13582msgstr "$HOME 未设置"
13583
d13389bf 13584#: builtin/config.c:708
4c27fcb5
JX
13585msgid ""
13586"--worktree cannot be used with multiple working trees unless the config\n"
13587"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
13588"section in \"git help worktree\" for details"
13589msgstr ""
13590"不能和多个工作区一起使用 --worktree,除非启用 worktreeConfig 配置扩展。\n"
13591"详情请阅读“git help worktree”的“CONFIGURATION FILE”小节"
13592
d13389bf 13593#: builtin/config.c:743
c1ac5258
JX
13594msgid "--get-color and variable type are incoherent"
13595msgstr "--get-color 和变量类型不兼容"
13596
d13389bf 13597#: builtin/config.c:748
c1ac5258
JX
13598msgid "only one action at a time"
13599msgstr "一次只能有一个动作"
13600
d13389bf 13601#: builtin/config.c:761
c1ac5258
JX
13602msgid "--name-only is only applicable to --list or --get-regexp"
13603msgstr "--name-only 仅适用于 --list 或 --get-regexp"
13604
d13389bf 13605#: builtin/config.c:767
c1ac5258
JX
13606msgid ""
13607"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
13608"list"
13609msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
13610
d13389bf 13611#: builtin/config.c:773
c1ac5258
JX
13612msgid "--default is only applicable to --get"
13613msgstr "--default 仅适用于 --get"
13614
d13389bf
JX
13615#: builtin/config.c:806
13616msgid "--fixed-value only applies with 'value-pattern'"
13617msgstr "--fixed-value 仅适用于有 '值模式'"
13618
13619#: builtin/config.c:822
c1ac5258
JX
13620#, c-format
13621msgid "unable to read config file '%s'"
13622msgstr "无法读取配置文件 '%s'"
13623
d13389bf 13624#: builtin/config.c:825
c1ac5258
JX
13625msgid "error processing config file(s)"
13626msgstr "处理配置文件出错"
13627
d13389bf 13628#: builtin/config.c:835
c1ac5258
JX
13629msgid "editing stdin is not supported"
13630msgstr "不支持编辑标准输入"
13631
d13389bf 13632#: builtin/config.c:837
c1ac5258
JX
13633msgid "editing blobs is not supported"
13634msgstr "不支持编辑数据对象"
13635
d13389bf 13636#: builtin/config.c:851
220c313c
JX
13637#, c-format
13638msgid "cannot create configuration file %s"
13639msgstr "不能创建配置文件 %s"
13640
d13389bf 13641#: builtin/config.c:864
a0b6b246
JX
13642#, c-format
13643msgid ""
13644"cannot overwrite multiple values with a single value\n"
13645" Use a regexp, --add or --replace-all to change %s."
13646msgstr ""
13647"无法用一个值覆盖多个值\n"
13648" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
13649
d13389bf 13650#: builtin/config.c:943 builtin/config.c:954
c1ac5258
JX
13651#, c-format
13652msgid "no such section: %s"
13653msgstr "无此小节:%s"
13654
fd8cb379 13655#: builtin/count-objects.c:90
4dcdc3d8
JX
13656msgid "git count-objects [-v] [-H | --human-readable]"
13657msgstr "git count-objects [-v] [-H | --human-readable]"
13658
fd8cb379 13659#: builtin/count-objects.c:100
4dcdc3d8
JX
13660msgid "print sizes in human readable format"
13661msgstr "以用户可读的格式显示大小"
ef317cd5 13662
d9488fea
JX
13663#: builtin/credential-cache--daemon.c:226
13664#, c-format
13665msgid ""
13666"The permissions on your socket directory are too loose; other\n"
13667"users may be able to read your cached credentials. Consider running:\n"
13668"\n"
13669"\tchmod 0700 %s"
13670msgstr ""
13671"您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
13672"行:\n"
13673"\n"
13674"\tchmod 0700 %s"
13675
13676#: builtin/credential-cache--daemon.c:275
13677msgid "print debugging messages to stderr"
13678msgstr "输出调试信息到标准错误"
13679
13680#: builtin/credential-cache--daemon.c:315
13681msgid "credential-cache--daemon unavailable; no unix socket support"
13682msgstr "credential-cache--daemon 不可用,不支持 unix 套接字"
13683
13684#: builtin/credential-cache.c:154
13685msgid "credential-cache unavailable; no unix socket support"
13686msgstr "credential-cache 不可用,不支持 unix 套接字"
13687
d13389bf
JX
13688#: builtin/credential-store.c:66
13689#, c-format
13690msgid "unable to get credential storage lock in %d ms"
13691msgstr "无法在 %d ms 获得凭证存储锁"
13692
a5cd71ca 13693#: builtin/describe.c:26
814ff314
JX
13694msgid "git describe [<options>] [<commit-ish>...]"
13695msgstr "git describe [<选项>] [<提交号>...]"
ef317cd5 13696
a5cd71ca 13697#: builtin/describe.c:27
814ff314
JX
13698msgid "git describe [<options>] --dirty"
13699msgstr "git describe [<选项>] --dirty"
ef317cd5 13700
349ede6a 13701#: builtin/describe.c:63
87cb7997
JX
13702msgid "head"
13703msgstr "头"
13704
349ede6a 13705#: builtin/describe.c:63
87cb7997
JX
13706msgid "lightweight"
13707msgstr "轻量级的"
13708
349ede6a 13709#: builtin/describe.c:63
87cb7997
JX
13710msgid "annotated"
13711msgstr "附注的"
13712
349ede6a 13713#: builtin/describe.c:277
c04f5ac3
JX
13714#, c-format
13715msgid "annotated tag %s not available"
55a16ee4 13716msgstr "附注标签 %s 无效"
c04f5ac3 13717
a5cd71ca 13718#: builtin/describe.c:281
c04f5ac3 13719#, c-format
349ede6a
JX
13720msgid "tag '%s' is externally known as '%s'"
13721msgstr "标签 '%s' 在外部被认为是 '%s'"
c04f5ac3 13722
349ede6a 13723#: builtin/describe.c:328
c04f5ac3
JX
13724#, c-format
13725msgid "no tag exactly matches '%s'"
55a16ee4 13726msgstr "没有标签准确匹配 '%s'"
c04f5ac3 13727
349ede6a 13728#: builtin/describe.c:330
c04f5ac3 13729#, c-format
5809aa05
JX
13730msgid "No exact match on refs or tags, searching to describe\n"
13731msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n"
c04f5ac3 13732
349ede6a 13733#: builtin/describe.c:397
c04f5ac3
JX
13734#, c-format
13735msgid "finished search at %s\n"
13736msgstr "完成搜索 %s\n"
13737
349ede6a 13738#: builtin/describe.c:424
c04f5ac3
JX
13739#, c-format
13740msgid ""
13741"No annotated tags can describe '%s'.\n"
13742"However, there were unannotated tags: try --tags."
13743msgstr ""
55a16ee4
RC
13744"没有附注标签能描述 '%s'。\n"
13745"然而,存在未附注标签:尝试 --tags。"
c04f5ac3 13746
349ede6a 13747#: builtin/describe.c:428
c04f5ac3
JX
13748#, c-format
13749msgid ""
13750"No tags can describe '%s'.\n"
13751"Try --always, or create some tags."
13752msgstr ""
55a16ee4
RC
13753"没有标签能描述 '%s'。\n"
13754"尝试 --always,或者创建一些标签。"
c04f5ac3 13755
349ede6a 13756#: builtin/describe.c:458
c04f5ac3
JX
13757#, c-format
13758msgid "traversed %lu commits\n"
13759msgstr "已遍历 %lu 个提交\n"
13760
349ede6a 13761#: builtin/describe.c:461
c04f5ac3
JX
13762#, c-format
13763msgid ""
13764"more than %i tags found; listed %i most recent\n"
13765"gave up search at %s\n"
13766msgstr ""
55a16ee4 13767"发现多于 %i 个标签,列出最近的 %i 个\n"
90e6ef53 13768"在 %s 放弃搜索\n"
c04f5ac3 13769
349ede6a 13770#: builtin/describe.c:529
5809aa05
JX
13771#, c-format
13772msgid "describe %s\n"
13773msgstr "描述 %s\n"
13774
349ede6a 13775#: builtin/describe.c:532
5809aa05
JX
13776#, c-format
13777msgid "Not a valid object name %s"
13778msgstr "不是一个有效的对象名 %s"
13779
349ede6a 13780#: builtin/describe.c:540
5809aa05
JX
13781#, c-format
13782msgid "%s is neither a commit nor blob"
13783msgstr "%s 既不是提交也不是数据对象"
13784
349ede6a 13785#: builtin/describe.c:554
ef317cd5 13786msgid "find the tag that comes after the commit"
55a16ee4 13787msgstr "寻找该提交之后的标签"
ef317cd5 13788
349ede6a 13789#: builtin/describe.c:555
ef317cd5 13790msgid "debug search strategy on stderr"
07432cef 13791msgstr "在标准错误上调试搜索策略"
ef317cd5 13792
349ede6a 13793#: builtin/describe.c:556
1003b3a5
JX
13794msgid "use any ref"
13795msgstr "使用任意引用"
13796
349ede6a 13797#: builtin/describe.c:557
1003b3a5 13798msgid "use any tag, even unannotated"
55a16ee4 13799msgstr "使用任意标签,即使未附带注释"
ef317cd5 13800
349ede6a 13801#: builtin/describe.c:558
ef317cd5 13802msgid "always use long format"
07432cef 13803msgstr "始终使用长提交号格式"
ef317cd5 13804
349ede6a 13805#: builtin/describe.c:559
2e8451e8
JX
13806msgid "only follow first parent"
13807msgstr "只跟随第一个父提交"
13808
349ede6a 13809#: builtin/describe.c:562
ef317cd5 13810msgid "only output exact matches"
07432cef 13811msgstr "只输出精确匹配"
ef317cd5 13812
349ede6a 13813#: builtin/describe.c:564
ef317cd5 13814msgid "consider <n> most recent tags (default: 10)"
55a16ee4 13815msgstr "考虑最近 <n> 个标签(默认:10)"
ef317cd5 13816
349ede6a 13817#: builtin/describe.c:566
ef317cd5 13818msgid "only consider tags matching <pattern>"
55a16ee4 13819msgstr "只考虑匹配 <模式> 的标签"
ef317cd5 13820
349ede6a 13821#: builtin/describe.c:568
87cb7997
JX
13822msgid "do not consider tags matching <pattern>"
13823msgstr "不考虑匹配 <模式> 的标签"
13824
349ede6a 13825#: builtin/describe.c:570 builtin/name-rev.c:535
ef317cd5 13826msgid "show abbreviated commit object as fallback"
07432cef 13827msgstr "显示简写的提交号作为后备"
ef317cd5 13828
349ede6a 13829#: builtin/describe.c:571 builtin/describe.c:574
ef317cd5 13830msgid "mark"
07432cef 13831msgstr "标记"
ef317cd5 13832
349ede6a 13833#: builtin/describe.c:572
ef317cd5 13834msgid "append <mark> on dirty working tree (default: \"-dirty\")"
160fb2b2 13835msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
ef317cd5 13836
349ede6a 13837#: builtin/describe.c:575
87cb7997
JX
13838msgid "append <mark> on broken working tree (default: \"-broken\")"
13839msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
13840
349ede6a 13841#: builtin/describe.c:593
c04f5ac3
JX
13842msgid "--long is incompatible with --abbrev=0"
13843msgstr "--long 与 --abbrev=0 不兼容"
13844
349ede6a 13845#: builtin/describe.c:622
c04f5ac3 13846msgid "No names found, cannot describe anything."
90e6ef53 13847msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 13848
349ede6a 13849#: builtin/describe.c:673
a8a5406a 13850msgid "--dirty is incompatible with commit-ishes"
87cb7997
JX
13851msgstr "--dirty 与提交号不兼容"
13852
349ede6a 13853#: builtin/describe.c:675
87cb7997
JX
13854msgid "--broken is incompatible with commit-ishes"
13855msgstr "--broken 与提交号不兼容"
c04f5ac3 13856
d13389bf
JX
13857#: builtin/diff-tree.c:155
13858msgid "--stdin and --merge-base are mutually exclusive"
13859msgstr "--stdin 和 --merge-base 是互斥的"
13860
13861#: builtin/diff-tree.c:157
13862msgid "--merge-base only works with two commits"
13863msgstr "--merge-base 仅适用于两个提交"
13864
7157c2b5 13865#: builtin/diff.c:91
c04f5ac3
JX
13866#, c-format
13867msgid "'%s': not a regular file or symlink"
13868msgstr "'%s':不是一个正规文件或符号链接"
13869
d13389bf 13870#: builtin/diff.c:258
c04f5ac3
JX
13871#, c-format
13872msgid "invalid option: %s"
13873msgstr "无效选项:%s"
13874
d13389bf 13875#: builtin/diff.c:375
7157c2b5
JX
13876#, c-format
13877msgid "%s...%s: no merge base"
13878msgstr "%s...%s:无合并基线"
13879
d13389bf 13880#: builtin/diff.c:485
c04f5ac3 13881msgid "Not a git repository"
d9488fea 13882msgstr "不是 git 仓库"
c04f5ac3 13883
d13389bf 13884#: builtin/diff.c:530 builtin/grep.c:681
c04f5ac3
JX
13885#, c-format
13886msgid "invalid object '%s' given."
13887msgstr "提供了无效对象 '%s'。"
13888
d13389bf 13889#: builtin/diff.c:541
c04f5ac3
JX
13890#, c-format
13891msgid "more than two blobs given: '%s'"
160fb2b2 13892msgstr "提供了超过两个数据对象:'%s'"
c04f5ac3 13893
d13389bf 13894#: builtin/diff.c:546
c04f5ac3
JX
13895#, c-format
13896msgid "unhandled object '%s' given."
6c94aba5 13897msgstr "无法处理的对象 '%s'。"
c04f5ac3 13898
d13389bf 13899#: builtin/diff.c:580
7157c2b5
JX
13900#, c-format
13901msgid "%s...%s: multiple merge bases, using %s"
13902msgstr "%s...%s:多条合并基线,使用 %s"
13903
d46c5519 13904#: builtin/difftool.c:30
1a79b2f1
JX
13905msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
13906msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
13907
a5cd71ca 13908#: builtin/difftool.c:260
1a79b2f1
JX
13909#, c-format
13910msgid "failed: %d"
13911msgstr "失败:%d"
13912
a5cd71ca 13913#: builtin/difftool.c:302
87cb7997
JX
13914#, c-format
13915msgid "could not read symlink %s"
13916msgstr "无法读取符号链接 %s"
13917
a5cd71ca 13918#: builtin/difftool.c:304
87cb7997
JX
13919#, c-format
13920msgid "could not read symlink file %s"
13921msgstr "无法读取符号链接文件 %s"
13922
a5cd71ca 13923#: builtin/difftool.c:312
87cb7997
JX
13924#, c-format
13925msgid "could not read object %s for symlink %s"
13926msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
13927
d13389bf 13928#: builtin/difftool.c:412
1a79b2f1
JX
13929msgid ""
13930"combined diff formats('-c' and '--cc') are not supported in\n"
13931"directory diff mode('-d' and '--dir-diff')."
87cb7997
JX
13932msgstr ""
13933"不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
13934"cc')。"
1a79b2f1 13935
d13389bf 13936#: builtin/difftool.c:633
1a79b2f1
JX
13937#, c-format
13938msgid "both files modified: '%s' and '%s'."
13939msgstr "两个文件都被修改:'%s' 和 '%s'。"
13940
d13389bf 13941#: builtin/difftool.c:635
1a79b2f1
JX
13942msgid "working tree file has been left."
13943msgstr "工作区文件被留了下来。"
13944
d13389bf 13945#: builtin/difftool.c:646
1a79b2f1
JX
13946#, c-format
13947msgid "temporary files exist in '%s'."
13948msgstr "临时文件存在于 '%s'。"
13949
d13389bf 13950#: builtin/difftool.c:647
1a79b2f1
JX
13951msgid "you may want to cleanup or recover these."
13952msgstr "您可能想要清理或者恢复它们。"
13953
d13389bf 13954#: builtin/difftool.c:696
1a79b2f1
JX
13955msgid "use `diff.guitool` instead of `diff.tool`"
13956msgstr "使用 `diff.guitool` 代替 `diff.tool`"
13957
d13389bf 13958#: builtin/difftool.c:698
1a79b2f1
JX
13959msgid "perform a full-directory diff"
13960msgstr "执行一个全目录差异比较"
13961
d13389bf 13962#: builtin/difftool.c:700
1a79b2f1
JX
13963msgid "do not prompt before launching a diff tool"
13964msgstr "启动差异比较工具之前不提示"
13965
d13389bf 13966#: builtin/difftool.c:705
1a79b2f1
JX
13967msgid "use symlinks in dir-diff mode"
13968msgstr "在 dir-diff 模式中使用符号链接"
13969
d13389bf 13970#: builtin/difftool.c:706
c1ac5258
JX
13971msgid "tool"
13972msgstr "工具"
13973
d13389bf 13974#: builtin/difftool.c:707
1a79b2f1
JX
13975msgid "use the specified diff tool"
13976msgstr "使用指定的差异比较工具"
13977
d13389bf 13978#: builtin/difftool.c:709
1a79b2f1
JX
13979msgid "print a list of diff tools that may be used with `--tool`"
13980msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
13981
d13389bf 13982#: builtin/difftool.c:712
1a79b2f1
JX
13983msgid ""
13984"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
13985"code"
13986msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出"
13987
d13389bf 13988#: builtin/difftool.c:715
1a79b2f1
JX
13989msgid "specify a custom command for viewing diffs"
13990msgstr "指定一个用于查看差异的自定义命令"
13991
d13389bf 13992#: builtin/difftool.c:716
d46c5519
JX
13993msgid "passed to `diff`"
13994msgstr "传递给 `diff`"
13995
d13389bf 13996#: builtin/difftool.c:731
d46c5519
JX
13997msgid "difftool requires worktree or --no-index"
13998msgstr "difftool 要求工作区或者 --no-index"
13999
d13389bf 14000#: builtin/difftool.c:738
d46c5519
JX
14001msgid "--dir-diff is incompatible with --no-index"
14002msgstr "--dir-diff 和 --no-index 不兼容"
14003
d13389bf 14004#: builtin/difftool.c:741
d46c5519
JX
14005msgid "--gui, --tool and --extcmd are mutually exclusive"
14006msgstr "--gui、--tool 和 --extcmd 互斥"
14007
d13389bf 14008#: builtin/difftool.c:749
1a79b2f1
JX
14009msgid "no <tool> given for --tool=<tool>"
14010msgstr "没有为 --tool=<工具> 参数提供 <工具>"
14011
d13389bf 14012#: builtin/difftool.c:756
1a79b2f1
JX
14013msgid "no <cmd> given for --extcmd=<cmd>"
14014msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
14015
a6cd2cc4
JX
14016#: builtin/env--helper.c:6
14017msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
14018msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>"
14019
d9488fea 14020#: builtin/env--helper.c:42 builtin/hash-object.c:98
a6cd2cc4
JX
14021msgid "type"
14022msgstr "类型"
14023
d9488fea 14024#: builtin/env--helper.c:46
a6cd2cc4
JX
14025msgid "default for git_env_*(...) to fall back on"
14026msgstr "git_env_*(...) 的默认值"
14027
d9488fea 14028#: builtin/env--helper.c:48
a6cd2cc4
JX
14029msgid "be quiet only use git_env_*() value as exit code"
14030msgstr "安静模式,只使用 git_env_*() 的值作为退出码"
14031
d9488fea 14032#: builtin/env--helper.c:67
a6cd2cc4
JX
14033#, c-format
14034msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
14035msgstr "选项 `--default' 和 `type=bool` 期望一个布尔值,不是 `%s`"
14036
d9488fea 14037#: builtin/env--helper.c:82
a6cd2cc4
JX
14038#, c-format
14039msgid ""
14040"option `--default' expects an unsigned long value with `--type=ulong`, not `"
14041"%s`"
14042msgstr "选项 `--default' 和 `type=ulong` 期望一个无符号长整型,不是 `%s`"
14043
c1ac5258 14044#: builtin/fast-export.c:29
ef317cd5 14045msgid "git fast-export [rev-list-opts]"
07432cef 14046msgstr "git fast-export [rev-list-opts]"
ef317cd5 14047
7157c2b5 14048#: builtin/fast-export.c:868
a5cd71ca
JX
14049msgid "Error: Cannot export nested tags unless --mark-tags is specified."
14050msgstr "错误:除非指定 --mark-tags,否则无法导出嵌套标签。"
14051
d13389bf 14052#: builtin/fast-export.c:1177
7157c2b5
JX
14053msgid "--anonymize-map token cannot be empty"
14054msgstr "--anonymize-map 取值不能为空"
14055
d13389bf 14056#: builtin/fast-export.c:1197
ef317cd5 14057msgid "show progress after <n> objects"
07432cef 14058msgstr "在 <n> 个对象之后显示进度"
ef317cd5 14059
d13389bf 14060#: builtin/fast-export.c:1199
ef317cd5 14061msgid "select handling of signed tags"
55a16ee4 14062msgstr "选择如何处理签名标签"
ef317cd5 14063
d13389bf 14064#: builtin/fast-export.c:1202
ef317cd5 14065msgid "select handling of tags that tag filtered objects"
55a16ee4 14066msgstr "选择当标签指向被过滤对象时该标签的处理方式"
ef317cd5 14067
d13389bf 14068#: builtin/fast-export.c:1205
a6cd2cc4
JX
14069msgid "select handling of commit messages in an alternate encoding"
14070msgstr "选择使用备用编码处理提交说明"
14071
d13389bf 14072#: builtin/fast-export.c:1208
ef317cd5 14073msgid "Dump marks to this file"
07432cef 14074msgstr "把标记存储到这个文件"
ef317cd5 14075
d13389bf 14076#: builtin/fast-export.c:1210
ef317cd5 14077msgid "Import marks from this file"
07432cef 14078msgstr "从这个文件导入标记"
ef317cd5 14079
d13389bf 14080#: builtin/fast-export.c:1214
a5cd71ca
JX
14081msgid "Import marks from this file if it exists"
14082msgstr "从该文件导入标记(如果存在的话)"
14083
d13389bf 14084#: builtin/fast-export.c:1216
ef317cd5 14085msgid "Fake a tagger when tags lack one"
55a16ee4 14086msgstr "当标签缺少标记者字段时,假装提供一个"
ef317cd5 14087
d13389bf 14088#: builtin/fast-export.c:1218
ef317cd5 14089msgid "Output full tree for each commit"
07432cef 14090msgstr "每次提交都输出整个树"
ef317cd5 14091
d13389bf 14092#: builtin/fast-export.c:1220
ef317cd5 14093msgid "Use the done feature to terminate the stream"
07432cef 14094msgstr "使用 done 功能来终止流"
ef317cd5 14095
d13389bf 14096#: builtin/fast-export.c:1221
ef317cd5 14097msgid "Skip output of blob data"
07432cef 14098msgstr "跳过数据对象的输出"
ef317cd5 14099
d13389bf 14100#: builtin/fast-export.c:1222 builtin/log.c:1816
6acbf033 14101msgid "refspec"
160fb2b2 14102msgstr "引用规格"
6acbf033 14103
d13389bf 14104#: builtin/fast-export.c:1223
6acbf033 14105msgid "Apply refspec to exported refs"
160fb2b2 14106msgstr "对导出的引用应用引用规格"
6acbf033 14107
d13389bf 14108#: builtin/fast-export.c:1224
220c313c
JX
14109msgid "anonymize output"
14110msgstr "匿名输出"
14111
d13389bf 14112#: builtin/fast-export.c:1225
7157c2b5
JX
14113msgid "from:to"
14114msgstr "from:to"
14115
d13389bf 14116#: builtin/fast-export.c:1226
7157c2b5
JX
14117msgid "convert <from> to <to> in anonymized output"
14118msgstr "在匿名输出中将 <from> 转换为 <to>"
14119
d13389bf 14120#: builtin/fast-export.c:1229
06991777 14121msgid "Reference parents which are not in fast-export stream by object id"
5b533632 14122msgstr "引用父对象 ID 不在 fast-export 流中"
06991777 14123
d13389bf 14124#: builtin/fast-export.c:1231
06991777 14125msgid "Show original object ids of blobs/commits"
5b533632 14126msgstr "显示数据对象/提交的原始对象 ID"
06991777 14127
d13389bf 14128#: builtin/fast-export.c:1233
a5cd71ca
JX
14129msgid "Label tags with mark ids"
14130msgstr "对带有标记 ID 的标签做标记"
14131
d13389bf 14132#: builtin/fast-export.c:1256
7157c2b5
JX
14133msgid "--anonymize-map without --anonymize does not make sense"
14134msgstr "--anonymize-map 而没有 --anonymize 没有意义"
14135
d13389bf 14136#: builtin/fast-export.c:1271
a5cd71ca
JX
14137msgid "Cannot pass both --import-marks and --import-marks-if-exists"
14138msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists"
14139
d13389bf 14140#: builtin/fast-import.c:3088
d9488fea
JX
14141#, c-format
14142msgid "Missing from marks for submodule '%s'"
14143msgstr "子模组 '%s' 缺少 from 标记"
14144
d13389bf 14145#: builtin/fast-import.c:3090
d9488fea
JX
14146#, c-format
14147msgid "Missing to marks for submodule '%s'"
14148msgstr "子模组 '%s' 缺少 to 标记"
14149
d13389bf 14150#: builtin/fast-import.c:3225
d9488fea
JX
14151#, c-format
14152msgid "Expected 'mark' command, got %s"
14153msgstr "预期 'mark' 命令,得到 %s"
14154
d13389bf 14155#: builtin/fast-import.c:3230
d9488fea
JX
14156#, c-format
14157msgid "Expected 'to' command, got %s"
14158msgstr "预期 'to' 命令,得到 %s"
14159
d13389bf 14160#: builtin/fast-import.c:3322
d9488fea
JX
14161msgid "Expected format name:filename for submodule rewrite option"
14162msgstr "子模组重写选项的预期格式为 name:filename"
14163
d13389bf 14164#: builtin/fast-import.c:3377
d9488fea
JX
14165#, c-format
14166msgid "feature '%s' forbidden in input without --allow-unsafe-features"
14167msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'"
14168
14169#: builtin/fetch-pack.c:241
7157c2b5
JX
14170#, c-format
14171msgid "Lockfile created but not reported: %s"
14172msgstr "Lockfile 已创建但未报告:%s"
14173
349ede6a 14174#: builtin/fetch.c:35
ef317cd5 14175msgid "git fetch [<options>] [<repository> [<refspec>...]]"
160fb2b2 14176msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
ef317cd5 14177
349ede6a 14178#: builtin/fetch.c:36
ef317cd5 14179msgid "git fetch [<options>] <group>"
07432cef 14180msgstr "git fetch [<选项>] <组>"
ef317cd5 14181
349ede6a 14182#: builtin/fetch.c:37
ef317cd5 14183msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
160fb2b2 14184msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
ef317cd5 14185
349ede6a 14186#: builtin/fetch.c:38
ef317cd5 14187msgid "git fetch --all [<options>]"
07432cef 14188msgstr "git fetch --all [<选项>]"
ef317cd5 14189
d9488fea 14190#: builtin/fetch.c:119
a5cd71ca
JX
14191msgid "fetch.parallel cannot be negative"
14192msgstr "fetch.parallel 不能为负数"
14193
d9488fea 14194#: builtin/fetch.c:142 builtin/pull.c:185
ef317cd5 14195msgid "fetch from all remotes"
07432cef 14196msgstr "从所有的远程抓取"
ef317cd5 14197
d9488fea 14198#: builtin/fetch.c:144 builtin/pull.c:245
a5cd71ca
JX
14199msgid "set upstream for git pull/fetch"
14200msgstr "为 git pull/fetch 设置上游"
14201
d9488fea 14202#: builtin/fetch.c:146 builtin/pull.c:188
ef317cd5 14203msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 14204msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 14205
d9488fea 14206#: builtin/fetch.c:148 builtin/pull.c:191
ef317cd5 14207msgid "path to upload pack on remote end"
07432cef 14208msgstr "上传包到远程的路径"
ef317cd5 14209
d9488fea 14210#: builtin/fetch.c:149
4c27fcb5
JX
14211msgid "force overwrite of local reference"
14212msgstr "强制覆盖本地引用"
ef317cd5 14213
d9488fea 14214#: builtin/fetch.c:151
ef317cd5 14215msgid "fetch from multiple remotes"
07432cef 14216msgstr "从多个远程抓取"
ef317cd5 14217
d9488fea 14218#: builtin/fetch.c:153 builtin/pull.c:195
ef317cd5 14219msgid "fetch all tags and associated objects"
55a16ee4 14220msgstr "抓取所有的标签和关联对象"
ef317cd5 14221
d9488fea 14222#: builtin/fetch.c:155
ef317cd5 14223msgid "do not fetch all tags (--no-tags)"
55a16ee4 14224msgstr "不抓取任何标签(--no-tags)"
ef317cd5 14225
d9488fea 14226#: builtin/fetch.c:157
276ceeaa
JX
14227msgid "number of submodules fetched in parallel"
14228msgstr "子模组获取的并发数"
14229
d9488fea 14230#: builtin/fetch.c:159 builtin/pull.c:198
ef317cd5 14231msgid "prune remote-tracking branches no longer on remote"
07432cef 14232msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 14233
d9488fea 14234#: builtin/fetch.c:161
31e5e17b
JX
14235msgid "prune local tags no longer on remote and clobber changed tags"
14236msgstr "清除远程不存在的本地标签,并且替换变更标签"
14237
07432cef 14238# 译者:可选值,不能翻译
d9488fea 14239#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122
ef317cd5 14240msgid "on-demand"
07432cef 14241msgstr "on-demand"
ef317cd5 14242
d9488fea 14243#: builtin/fetch.c:163
ef317cd5 14244msgid "control recursive fetching of submodules"
07432cef 14245msgstr "控制子模组的递归抓取"
ef317cd5 14246
d9488fea
JX
14247#: builtin/fetch.c:168
14248msgid "write fetched references to the FETCH_HEAD file"
14249msgstr "将获取到的引用写入 FETCH_HEAD 文件"
14250
14251#: builtin/fetch.c:169 builtin/pull.c:206
ef317cd5 14252msgid "keep downloaded pack"
07432cef 14253msgstr "保持下载包"
ef317cd5 14254
d9488fea 14255#: builtin/fetch.c:171
ef317cd5 14256msgid "allow updating of HEAD ref"
07432cef 14257msgstr "允许更新 HEAD 引用"
ef317cd5 14258
d9488fea 14259#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209
349ede6a 14260#: builtin/pull.c:218
ef317cd5 14261msgid "deepen history of shallow clone"
07432cef 14262msgstr "深化浅克隆的历史"
ef317cd5 14263
d9488fea 14264#: builtin/fetch.c:176 builtin/pull.c:212
a0b6b246
JX
14265msgid "deepen history of shallow repository based on time"
14266msgstr "基于时间来深化浅克隆的历史"
14267
d9488fea 14268#: builtin/fetch.c:182 builtin/pull.c:221
a77c07d9 14269msgid "convert to a complete repository"
160fb2b2 14270msgstr "转换为一个完整的仓库"
a77c07d9 14271
d9488fea 14272#: builtin/fetch.c:185
ef317cd5 14273msgid "prepend this to submodule path output"
07432cef 14274msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 14275
d9488fea 14276#: builtin/fetch.c:188
a4f16749
JX
14277msgid ""
14278"default for recursive fetching of submodules (lower priority than config "
14279"files)"
14280msgstr "递归获取子模组的缺省值(比配置文件优先级低)"
ef317cd5 14281
d9488fea 14282#: builtin/fetch.c:192 builtin/pull.c:224
cfff71a9
JX
14283msgid "accept refs that update .git/shallow"
14284msgstr "接受更新 .git/shallow 的引用"
14285
d9488fea 14286#: builtin/fetch.c:193 builtin/pull.c:226
6acbf033
JX
14287msgid "refmap"
14288msgstr "引用映射"
14289
d9488fea 14290#: builtin/fetch.c:194 builtin/pull.c:227
6acbf033
JX
14291msgid "specify fetch refmap"
14292msgstr "指定获取操作的引用映射"
14293
d9488fea 14294#: builtin/fetch.c:201 builtin/pull.c:240
c1ac5258
JX
14295msgid "report that we have only objects reachable from this object"
14296msgstr "报告我们只拥有从该对象开始可达的对象"
14297
d9488fea
JX
14298#: builtin/fetch.c:204 builtin/fetch.c:206
14299msgid "run 'maintenance --auto' after fetching"
14300msgstr "获取后执行 'maintenance --auto'"
a6cd2cc4 14301
d9488fea 14302#: builtin/fetch.c:208 builtin/pull.c:243
a6cd2cc4
JX
14303msgid "check for forced-updates on all updated branches"
14304msgstr "在所有更新分支上检查强制更新"
14305
d9488fea 14306#: builtin/fetch.c:210
ddc12c42
JX
14307msgid "write the commit-graph after fetching"
14308msgstr "抓取后写提交图"
14309
d9488fea
JX
14310#: builtin/fetch.c:212
14311msgid "accept refspecs from stdin"
14312msgstr "从标准输入获取引用表达式"
14313
14314#: builtin/fetch.c:523
c04f5ac3
JX
14315msgid "Couldn't find remote ref HEAD"
14316msgstr "无法发现远程 HEAD 引用"
14317
d9488fea 14318#: builtin/fetch.c:677
5c57d762
JX
14319#, c-format
14320msgid "configuration fetch.output contains invalid value %s"
14321msgstr "配置变量 fetch.output 包含无效值 %s"
14322
d9488fea 14323#: builtin/fetch.c:775
c04f5ac3
JX
14324#, c-format
14325msgid "object %s not found"
14326msgstr "对象 %s 未发现"
14327
d9488fea 14328#: builtin/fetch.c:779
c04f5ac3
JX
14329msgid "[up to date]"
14330msgstr "[最新]"
14331
d9488fea 14332#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880
c04f5ac3
JX
14333msgid "[rejected]"
14334msgstr "[已拒绝]"
14335
d9488fea 14336#: builtin/fetch.c:793
5c57d762 14337msgid "can't fetch in current branch"
9a4b694c 14338msgstr "当前分支下不能执行获取操作"
5c57d762 14339
d9488fea 14340#: builtin/fetch.c:803
c04f5ac3 14341msgid "[tag update]"
55a16ee4 14342msgstr "[标签更新]"
c04f5ac3 14343
d9488fea
JX
14344#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863
14345#: builtin/fetch.c:875
5c57d762
JX
14346msgid "unable to update local ref"
14347msgstr "不能更新本地引用"
c04f5ac3 14348
d9488fea 14349#: builtin/fetch.c:808
4c27fcb5
JX
14350msgid "would clobber existing tag"
14351msgstr "会破坏现有的标签"
14352
d9488fea 14353#: builtin/fetch.c:830
c04f5ac3 14354msgid "[new tag]"
55a16ee4 14355msgstr "[新标签]"
c04f5ac3 14356
d9488fea 14357#: builtin/fetch.c:833
c04f5ac3
JX
14358msgid "[new branch]"
14359msgstr "[新分支]"
14360
d9488fea 14361#: builtin/fetch.c:836
170e9899
JX
14362msgid "[new ref]"
14363msgstr "[新引用]"
14364
d9488fea 14365#: builtin/fetch.c:875
c04f5ac3
JX
14366msgid "forced update"
14367msgstr "强制更新"
14368
d9488fea 14369#: builtin/fetch.c:880
5c57d762
JX
14370msgid "non-fast-forward"
14371msgstr "非快进"
c04f5ac3 14372
d9488fea 14373#: builtin/fetch.c:901
a6cd2cc4
JX
14374msgid ""
14375"Fetch normally indicates which branches had a forced update,\n"
14376"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
14377"flag or run 'git config fetch.showForcedUpdates true'."
14378msgstr ""
14379"获取操作通常显示哪些分支发生了强制更新,但该检查已被禁用。\n"
14380"要重新启用,请使用 '--show-forced-updates' 选项或运行\n"
14381"'git config fetch.showForcedUpdates true'。"
14382
d9488fea 14383#: builtin/fetch.c:905
a6cd2cc4
JX
14384#, c-format
14385msgid ""
14386"It took %.2f seconds to check forced updates. You can use\n"
14387"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
14388"false'\n"
14389" to avoid this check.\n"
14390msgstr ""
14391"花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n"
14392"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n"
14393
d9488fea 14394#: builtin/fetch.c:939
c04f5ac3
JX
14395#, c-format
14396msgid "%s did not send all necessary objects\n"
e640d114 14397msgstr "%s 未发送所有必需的对象\n"
c04f5ac3 14398
d9488fea 14399#: builtin/fetch.c:960
cfff71a9
JX
14400#, c-format
14401msgid "reject %s because shallow roots are not allowed to be updated"
14402msgstr "拒绝 %s 因为浅克隆不允许被更新"
14403
d9488fea 14404#: builtin/fetch.c:1053 builtin/fetch.c:1191
c04f5ac3
JX
14405#, c-format
14406msgid "From %.*s\n"
14407msgstr "来自 %.*s\n"
14408
d9488fea 14409#: builtin/fetch.c:1064
c04f5ac3
JX
14410#, c-format
14411msgid ""
14412"some local refs could not be updated; try running\n"
14413" 'git remote prune %s' to remove any old, conflicting branches"
14414msgstr ""
14415"一些本地引用不能被更新;尝试运行\n"
14416" 'git remote prune %s' 来删除旧的、有冲突的分支"
14417
90e6ef53 14418# 译者:注意保持前导空格
d9488fea 14419#: builtin/fetch.c:1161
81809b99 14420#, c-format
8ada9598 14421msgid " (%s will become dangling)"
e640d114 14422msgstr " (%s 将成为悬空状态)"
c04f5ac3 14423
90e6ef53 14424# 译者:注意保持前导空格
d9488fea 14425#: builtin/fetch.c:1162
81809b99 14426#, c-format
8ada9598 14427msgid " (%s has become dangling)"
e640d114 14428msgstr " (%s 已成为悬空状态)"
c04f5ac3 14429
d9488fea 14430#: builtin/fetch.c:1194
c04f5ac3
JX
14431msgid "[deleted]"
14432msgstr "[已删除]"
14433
d13389bf 14434#: builtin/fetch.c:1195 builtin/remote.c:1118
c04f5ac3
JX
14435msgid "(none)"
14436msgstr "(无)"
14437
d9488fea 14438#: builtin/fetch.c:1218
c04f5ac3
JX
14439#, c-format
14440msgid "Refusing to fetch into current branch %s of non-bare repository"
160fb2b2 14441msgstr "拒绝获取到非纯仓库的当前分支 %s"
c04f5ac3 14442
d9488fea 14443#: builtin/fetch.c:1237
c04f5ac3
JX
14444#, c-format
14445msgid "Option \"%s\" value \"%s\" is not valid for %s"
14446msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
14447
d9488fea 14448#: builtin/fetch.c:1240
c04f5ac3
JX
14449#, c-format
14450msgid "Option \"%s\" is ignored for %s\n"
81809b99 14451msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 14452
d9488fea 14453#: builtin/fetch.c:1448
ddc12c42 14454msgid "multiple branches detected, incompatible with --set-upstream"
a5cd71ca
JX
14455msgstr "检测到多分支,和 --set-upstream 不兼容"
14456
d9488fea 14457#: builtin/fetch.c:1463
a5cd71ca
JX
14458msgid "not setting upstream for a remote remote-tracking branch"
14459msgstr "没有为一个远程跟踪分支设置上游"
14460
d9488fea 14461#: builtin/fetch.c:1465
a5cd71ca
JX
14462msgid "not setting upstream for a remote tag"
14463msgstr "没有为一个远程标签设置上游"
14464
d9488fea 14465#: builtin/fetch.c:1467
a5cd71ca
JX
14466msgid "unknown branch type"
14467msgstr "未知的分支类型"
14468
d9488fea 14469#: builtin/fetch.c:1469
a5cd71ca
JX
14470msgid ""
14471"no source branch found.\n"
14472"you need to specify exactly one branch with the --set-upstream option."
14473msgstr ""
14474"未发现源分支。\n"
14475"您需要使用 --set-upstream 选项指定一个分支。"
14476
d9488fea 14477#: builtin/fetch.c:1598 builtin/fetch.c:1661
c04f5ac3
JX
14478#, c-format
14479msgid "Fetching %s\n"
d4a8e00b 14480msgstr "正在获取 %s\n"
c04f5ac3 14481
d9488fea 14482#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101
c04f5ac3
JX
14483#, c-format
14484msgid "Could not fetch %s"
14485msgstr "不能获取 %s"
14486
d9488fea 14487#: builtin/fetch.c:1620
a5cd71ca
JX
14488#, c-format
14489msgid "could not fetch '%s' (exit code: %d)\n"
14490msgstr "无法获取 '%s'(退出码:%d)\n"
31e5e17b 14491
d9488fea 14492#: builtin/fetch.c:1724
c04f5ac3
JX
14493msgid ""
14494"No remote repository specified. Please, specify either a URL or a\n"
14495"remote name from which new revisions should be fetched."
4375c10e 14496msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
c04f5ac3 14497
d9488fea 14498#: builtin/fetch.c:1760
c04f5ac3 14499msgid "You need to specify a tag name."
55a16ee4 14500msgstr "您需要指定一个标签名称。"
c04f5ac3 14501
d9488fea 14502#: builtin/fetch.c:1825
a0b6b246
JX
14503msgid "Negative depth in --deepen is not supported"
14504msgstr "--deepen 不支持负数深度"
14505
d9488fea 14506#: builtin/fetch.c:1827
a0b6b246
JX
14507msgid "--deepen and --depth are mutually exclusive"
14508msgstr "--deepen 和 --depth 是互斥的"
14509
d9488fea 14510#: builtin/fetch.c:1832
a77c07d9
JX
14511msgid "--depth and --unshallow cannot be used together"
14512msgstr "--depth 和 --unshallow 不能同时使用"
14513
d9488fea 14514#: builtin/fetch.c:1834
a77c07d9 14515msgid "--unshallow on a complete repository does not make sense"
160fb2b2 14516msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
a77c07d9 14517
d9488fea 14518#: builtin/fetch.c:1851
c04f5ac3 14519msgid "fetch --all does not take a repository argument"
160fb2b2 14520msgstr "fetch --all 不能带一个仓库参数"
c04f5ac3 14521
d9488fea 14522#: builtin/fetch.c:1853
c04f5ac3 14523msgid "fetch --all does not make sense with refspecs"
160fb2b2 14524msgstr "fetch --all 带引用规格没有任何意义"
c04f5ac3 14525
d9488fea 14526#: builtin/fetch.c:1862
c04f5ac3
JX
14527#, c-format
14528msgid "No such remote or remote group: %s"
14529msgstr "没有这样的远程或远程组:%s"
14530
d9488fea 14531#: builtin/fetch.c:1869
c04f5ac3 14532msgid "Fetching a group and specifying refspecs does not make sense"
160fb2b2 14533msgstr "获取组并指定引用规格没有意义"
c04f5ac3 14534
d9488fea 14535#: builtin/fetch.c:1887
06991777
JX
14536msgid ""
14537"--filter can only be used with the remote configured in extensions."
14538"partialclone"
14539msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
14540
d9488fea
JX
14541#: builtin/fetch.c:1891
14542msgid "--stdin can only be used when fetching from one remote"
14543msgstr "--stdin 仅在从一个远程仓库获取的时候可用"
14544
349ede6a 14545#: builtin/fmt-merge-msg.c:7
814ff314
JX
14546msgid ""
14547"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
14548msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
c04f5ac3 14549
349ede6a 14550#: builtin/fmt-merge-msg.c:18
ef317cd5 14551msgid "populate log with at most <n> entries from shortlog"
07432cef 14552msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 14553
349ede6a 14554#: builtin/fmt-merge-msg.c:21
ef317cd5 14555msgid "alias for --log (deprecated)"
07432cef 14556msgstr "参数 --log 的别名(已弃用)"
ef317cd5 14557
349ede6a 14558#: builtin/fmt-merge-msg.c:24
ef317cd5 14559msgid "text"
07432cef 14560msgstr "文本"
ef317cd5 14561
349ede6a 14562#: builtin/fmt-merge-msg.c:25
ef317cd5 14563msgid "use <text> as start of message"
07432cef 14564msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 14565
349ede6a 14566#: builtin/fmt-merge-msg.c:26
ef317cd5 14567msgid "file to read from"
07432cef 14568msgstr "从文件中读取"
ef317cd5 14569
a4f16749 14570#: builtin/for-each-ref.c:10
814ff314
JX
14571msgid "git for-each-ref [<options>] [<pattern>]"
14572msgstr "git for-each-ref [<选项>] [<模式>]"
ef317cd5 14573
a4f16749 14574#: builtin/for-each-ref.c:11
94550ed3
JX
14575msgid "git for-each-ref [--points-at <object>]"
14576msgstr "git for-each-ref [--points-at <对象>]"
14577
a4f16749 14578#: builtin/for-each-ref.c:12
d9488fea
JX
14579msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
14580msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]"
94550ed3 14581
a4f16749 14582#: builtin/for-each-ref.c:13
87cb7997
JX
14583msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
14584msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
94550ed3 14585
a4f16749 14586#: builtin/for-each-ref.c:28
ef317cd5 14587msgid "quote placeholders suitably for shells"
07432cef 14588msgstr "引用占位符适用于 shells"
ef317cd5 14589
a4f16749 14590#: builtin/for-each-ref.c:30
ef317cd5 14591msgid "quote placeholders suitably for perl"
07432cef 14592msgstr "引用占位符适用于 perl"
ef317cd5 14593
a4f16749 14594#: builtin/for-each-ref.c:32
ef317cd5 14595msgid "quote placeholders suitably for python"
07432cef 14596msgstr "引用占位符适用于 python"
ef317cd5 14597
a4f16749 14598#: builtin/for-each-ref.c:34
04cb2f28
JX
14599msgid "quote placeholders suitably for Tcl"
14600msgstr "引用占位符适用于 Tcl"
ef317cd5 14601
a4f16749 14602#: builtin/for-each-ref.c:37
ef317cd5 14603msgid "show only <n> matched refs"
07432cef 14604msgstr "只显示 <n> 个匹配的引用"
ef317cd5 14605
349ede6a 14606#: builtin/for-each-ref.c:39 builtin/tag.c:440
6937cb4e
JX
14607msgid "respect format colors"
14608msgstr "遵照格式中的颜色输出"
14609
d46c5519 14610#: builtin/for-each-ref.c:42
94550ed3
JX
14611msgid "print only refs which points at the given object"
14612msgstr "只打印指向给定对象的引用"
ef317cd5 14613
d46c5519 14614#: builtin/for-each-ref.c:44
94550ed3
JX
14615msgid "print only refs that are merged"
14616msgstr "只打印已经合并的引用"
14617
d46c5519 14618#: builtin/for-each-ref.c:45
94550ed3
JX
14619msgid "print only refs that are not merged"
14620msgstr "只打印没有合并的引用"
ef317cd5 14621
d46c5519 14622#: builtin/for-each-ref.c:46
94550ed3
JX
14623msgid "print only refs which contain the commit"
14624msgstr "只打印包含该提交的引用"
14625
d46c5519 14626#: builtin/for-each-ref.c:47
87cb7997
JX
14627msgid "print only refs which don't contain the commit"
14628msgstr "只打印不包含该提交的引用"
14629
d13389bf
JX
14630#: builtin/for-each-repo.c:9
14631msgid "git for-each-repo --config=<config> <command-args>"
14632msgstr "git for-each-repo --config=<配置> <命令参数>"
14633
14634#: builtin/for-each-repo.c:37
14635msgid "config"
14636msgstr "配置"
14637
14638#: builtin/for-each-repo.c:38
14639msgid "config key storing a list of repository paths"
14640msgstr "存储着仓库路径列表的配置项键名"
14641
14642#: builtin/for-each-repo.c:46
14643msgid "missing --config=<config>"
14644msgstr "缺少 --config=<配置>"
14645
349ede6a 14646#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149
06991777
JX
14647msgid "unknown"
14648msgstr "未知"
14649
14650#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
349ede6a 14651#: builtin/fsck.c:101 builtin/fsck.c:121
06991777
JX
14652#, c-format
14653msgid "error in %s %s: %s"
14654msgstr "%s %s 错误:%s"
14655
14656#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
349ede6a 14657#: builtin/fsck.c:115
06991777
JX
14658#, c-format
14659msgid "warning in %s %s: %s"
14660msgstr "%s %s 警告:%s"
14661
349ede6a 14662#: builtin/fsck.c:144 builtin/fsck.c:147
06991777
JX
14663#, c-format
14664msgid "broken link from %7s %s"
14665msgstr "来自 %7s %s 的损坏的链接"
14666
349ede6a 14667#: builtin/fsck.c:156
06991777
JX
14668msgid "wrong object type in link"
14669msgstr "链接中错误的对象类型"
14670
349ede6a 14671#: builtin/fsck.c:172
06991777
JX
14672#, c-format
14673msgid ""
14674"broken link from %7s %s\n"
14675" to %7s %s"
14676msgstr ""
14677"损坏的链接来自于 %7s %s\n"
14678" 到 %7s %s"
14679
349ede6a 14680#: builtin/fsck.c:283
06991777
JX
14681#, c-format
14682msgid "missing %s %s"
14683msgstr "缺失 %s %s"
14684
349ede6a 14685#: builtin/fsck.c:310
06991777
JX
14686#, c-format
14687msgid "unreachable %s %s"
5b533632 14688msgstr "不可达 %s %s"
06991777 14689
349ede6a 14690#: builtin/fsck.c:330
06991777
JX
14691#, c-format
14692msgid "dangling %s %s"
14693msgstr "悬空 %s %s"
14694
349ede6a 14695#: builtin/fsck.c:340
06991777
JX
14696msgid "could not create lost-found"
14697msgstr "不能创建 lost-found"
14698
349ede6a 14699#: builtin/fsck.c:351
06991777
JX
14700#, c-format
14701msgid "could not finish '%s'"
14702msgstr "不能完成 '%s'"
14703
349ede6a 14704#: builtin/fsck.c:368
06991777
JX
14705#, c-format
14706msgid "Checking %s"
14707msgstr "正在检查 %s"
14708
349ede6a 14709#: builtin/fsck.c:406
06991777
JX
14710#, c-format
14711msgid "Checking connectivity (%d objects)"
14712msgstr "正在检查连通性(%d 个对象)"
14713
349ede6a 14714#: builtin/fsck.c:425
06991777
JX
14715#, c-format
14716msgid "Checking %s %s"
14717msgstr "正在检查 %s %s"
14718
349ede6a 14719#: builtin/fsck.c:430
06991777
JX
14720msgid "broken links"
14721msgstr "损坏的链接"
14722
349ede6a 14723#: builtin/fsck.c:439
06991777
JX
14724#, c-format
14725msgid "root %s"
14726msgstr "根 %s"
14727
349ede6a 14728#: builtin/fsck.c:447
06991777
JX
14729#, c-format
14730msgid "tagged %s %s (%s) in %s"
14731msgstr "标记 %s %s (%s) 于 %s"
14732
349ede6a 14733#: builtin/fsck.c:476
06991777
JX
14734#, c-format
14735msgid "%s: object corrupt or missing"
14736msgstr "%s:对象损坏或丢失"
14737
349ede6a 14738#: builtin/fsck.c:501
06991777
JX
14739#, c-format
14740msgid "%s: invalid reflog entry %s"
14741msgstr "%s:无效的引用日志条目 %s"
14742
349ede6a 14743#: builtin/fsck.c:515
06991777
JX
14744#, c-format
14745msgid "Checking reflog %s->%s"
14746msgstr "正在检查引用日志 %s->%s"
14747
349ede6a 14748#: builtin/fsck.c:549
06991777
JX
14749#, c-format
14750msgid "%s: invalid sha1 pointer %s"
14751msgstr "%s:无效的 sha1 指针 %s"
14752
349ede6a 14753#: builtin/fsck.c:556
06991777
JX
14754#, c-format
14755msgid "%s: not a commit"
14756msgstr "%s:不是一个提交"
14757
349ede6a 14758#: builtin/fsck.c:610
06991777
JX
14759msgid "notice: No default references"
14760msgstr "注意:无默认引用"
14761
349ede6a 14762#: builtin/fsck.c:625
06991777
JX
14763#, c-format
14764msgid "%s: object corrupt or missing: %s"
14765msgstr "%s:对象损坏或丢失:%s"
14766
349ede6a 14767#: builtin/fsck.c:638
06991777
JX
14768#, c-format
14769msgid "%s: object could not be parsed: %s"
14770msgstr "%s:不能解析对象:%s"
14771
349ede6a 14772#: builtin/fsck.c:658
06991777
JX
14773#, c-format
14774msgid "bad sha1 file: %s"
14775msgstr "坏的 sha1 文件:%s"
14776
349ede6a 14777#: builtin/fsck.c:673
06991777
JX
14778msgid "Checking object directory"
14779msgstr "正在检查对象目录"
14780
349ede6a 14781#: builtin/fsck.c:676
6c94aba5 14782msgid "Checking object directories"
06991777
JX
14783msgstr "正在检查对象目录"
14784
349ede6a 14785#: builtin/fsck.c:691
06991777
JX
14786#, c-format
14787msgid "Checking %s link"
14788msgstr "正在检查 %s 链接"
14789
d9488fea 14790#: builtin/fsck.c:696 builtin/index-pack.c:865
06991777
JX
14791#, c-format
14792msgid "invalid %s"
14793msgstr "无效的 %s"
14794
349ede6a 14795#: builtin/fsck.c:703
06991777
JX
14796#, c-format
14797msgid "%s points to something strange (%s)"
14798msgstr "%s 指向奇怪的东西(%s)"
14799
349ede6a 14800#: builtin/fsck.c:709
06991777
JX
14801#, c-format
14802msgid "%s: detached HEAD points at nothing"
14803msgstr "%s:分离头指针的指向不存在"
14804
349ede6a 14805#: builtin/fsck.c:713
06991777
JX
14806#, c-format
14807msgid "notice: %s points to an unborn branch (%s)"
14808msgstr "注意:%s 指向一个尚未诞生的分支(%s)"
14809
349ede6a 14810#: builtin/fsck.c:725
06991777
JX
14811msgid "Checking cache tree"
14812msgstr "正在检查缓存树"
14813
349ede6a 14814#: builtin/fsck.c:730
06991777
JX
14815#, c-format
14816msgid "%s: invalid sha1 pointer in cache-tree"
14817msgstr "%s:cache-tree 中无效的 sha1 指针"
6c94aba5 14818
349ede6a 14819#: builtin/fsck.c:739
06991777
JX
14820msgid "non-tree in cache-tree"
14821msgstr "cache-tree 中非树对象"
14822
349ede6a 14823#: builtin/fsck.c:770
814ff314
JX
14824msgid "git fsck [<options>] [<object>...]"
14825msgstr "git fsck [<选项>] [<对象>...]"
ef317cd5 14826
349ede6a 14827#: builtin/fsck.c:776
ef317cd5 14828msgid "show unreachable objects"
07432cef 14829msgstr "显示不可达的对象"
ef317cd5 14830
349ede6a 14831#: builtin/fsck.c:777
ef317cd5 14832msgid "show dangling objects"
e640d114 14833msgstr "显示悬空的对象"
ef317cd5 14834
349ede6a 14835#: builtin/fsck.c:778
ef317cd5 14836msgid "report tags"
55a16ee4 14837msgstr "报告标签"
ef317cd5 14838
349ede6a 14839#: builtin/fsck.c:779
ef317cd5 14840msgid "report root nodes"
07432cef 14841msgstr "报告根节点"
ef317cd5 14842
349ede6a 14843#: builtin/fsck.c:780
ef317cd5 14844msgid "make index objects head nodes"
07432cef 14845msgstr "将索引亦作为检查的头节点"
ef317cd5 14846
349ede6a 14847#: builtin/fsck.c:781
ef317cd5 14848msgid "make reflogs head nodes (default)"
07432cef 14849msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 14850
349ede6a 14851#: builtin/fsck.c:782
ef317cd5 14852msgid "also consider packs and alternate objects"
07432cef 14853msgstr "也考虑包和备用对象"
ef317cd5 14854
349ede6a 14855#: builtin/fsck.c:783
1b7f4a34
JX
14856msgid "check only connectivity"
14857msgstr "仅检查连通性"
14858
349ede6a 14859#: builtin/fsck.c:784
ef317cd5 14860msgid "enable more strict checking"
07432cef 14861msgstr "启用更严格的检查"
ef317cd5 14862
349ede6a 14863#: builtin/fsck.c:786
ef317cd5 14864msgid "write dangling objects in .git/lost-found"
e640d114 14865msgstr "将悬空对象写入 .git/lost-found 中"
ef317cd5 14866
349ede6a 14867#: builtin/fsck.c:787 builtin/prune.c:134
ef317cd5 14868msgid "show progress"
07432cef 14869msgstr "显示进度"
ef317cd5 14870
349ede6a 14871#: builtin/fsck.c:788
5c57d762
JX
14872msgid "show verbose names for reachable objects"
14873msgstr "显示可达对象的详细名称"
14874
d9488fea 14875#: builtin/fsck.c:847 builtin/index-pack.c:261
6c94aba5 14876msgid "Checking objects"
06991777
JX
14877msgstr "正在检查对象"
14878
349ede6a 14879#: builtin/fsck.c:875
06991777
JX
14880#, c-format
14881msgid "%s: object missing"
14882msgstr "%s:对象缺失"
14883
349ede6a 14884#: builtin/fsck.c:886
06991777
JX
14885#, c-format
14886msgid "invalid parameter: expected sha1, got '%s'"
14887msgstr "无效的参数:期望 sha1,得到 '%s'"
6c94aba5 14888
d13389bf 14889#: builtin/gc.c:39
814ff314
JX
14890msgid "git gc [<options>]"
14891msgstr "git gc [<选项>]"
ef317cd5 14892
d13389bf 14893#: builtin/gc.c:94
c04f5ac3 14894#, c-format
87cb7997 14895msgid "Failed to fstat %s: %s"
65e2041e 14896msgstr "对 %s 调用 fstat 失败:%s"
c04f5ac3 14897
d13389bf 14898#: builtin/gc.c:130
d46c5519
JX
14899#, c-format
14900msgid "failed to parse '%s' value '%s'"
14901msgstr "无法解析 '%s' 值 '%s'"
14902
d13389bf 14903#: builtin/gc.c:479 builtin/init-db.c:58
c04f5ac3 14904#, c-format
4c27fcb5
JX
14905msgid "cannot stat '%s'"
14906msgstr "不能对 '%s' 调用 stat"
14907
d13389bf 14908#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530
4c27fcb5
JX
14909#, c-format
14910msgid "cannot read '%s'"
14911msgstr "不能读取 '%s'"
c04f5ac3 14912
d13389bf 14913#: builtin/gc.c:495
94550ed3
JX
14914#, c-format
14915msgid ""
14916"The last gc run reported the following. Please correct the root cause\n"
14917"and remove %s.\n"
14918"Automatic cleanup will not be performed until the file is removed.\n"
14919"\n"
14920"%s"
14921msgstr ""
14922"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
14923"在该文件被删除之前,自动清理将不会执行。\n"
14924"\n"
14925"%s"
14926
d13389bf 14927#: builtin/gc.c:543
ef317cd5 14928msgid "prune unreferenced objects"
07432cef 14929msgstr "清除未引用的对象"
ef317cd5 14930
d13389bf 14931#: builtin/gc.c:545
ef317cd5 14932msgid "be more thorough (increased runtime)"
07432cef 14933msgstr "更彻底(增加运行时间)"
ef317cd5 14934
d13389bf 14935#: builtin/gc.c:546
ef317cd5 14936msgid "enable auto-gc mode"
07432cef 14937msgstr "启用自动垃圾回收模式"
ef317cd5 14938
d13389bf 14939#: builtin/gc.c:549
90314792
JX
14940msgid "force running gc even if there may be another gc running"
14941msgstr "强制执行 gc 即使另外一个 gc 正在执行"
14942
d13389bf 14943#: builtin/gc.c:552
fd8cb379
JX
14944msgid "repack all other packs except the largest pack"
14945msgstr "除了最大的包之外,对所有其它包文件重新打包"
14946
d13389bf 14947#: builtin/gc.c:569
fd8cb379
JX
14948#, c-format
14949msgid "failed to parse gc.logexpiry value %s"
c1ac5258 14950msgstr "解析 gc.logexpiry 的值 %s 失败"
fd8cb379 14951
d13389bf 14952#: builtin/gc.c:580
87cb7997 14953#, c-format
fd8cb379 14954msgid "failed to parse prune expiry value %s"
c1ac5258 14955msgstr "解析清除期限值 %s 失败"
87cb7997 14956
d13389bf 14957#: builtin/gc.c:600
c04f5ac3 14958#, c-format
6c94aba5 14959msgid "Auto packing the repository in background for optimum performance.\n"
160fb2b2 14960msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6c94aba5 14961
d13389bf 14962#: builtin/gc.c:602
6c94aba5
JX
14963#, c-format
14964msgid "Auto packing the repository for optimum performance.\n"
160fb2b2 14965msgstr "自动打包仓库以求最佳性能。\n"
6c94aba5 14966
d13389bf 14967#: builtin/gc.c:603
6c94aba5
JX
14968#, c-format
14969msgid "See \"git help gc\" for manual housekeeping.\n"
14970msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 14971
d13389bf 14972#: builtin/gc.c:643
90314792
JX
14973#, c-format
14974msgid ""
14975"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
14976msgstr ""
29004bbb 14977"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)"
90314792 14978
d13389bf 14979#: builtin/gc.c:698
c04f5ac3
JX
14980msgid ""
14981"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 14982msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 14983
d13389bf
JX
14984#: builtin/gc.c:708
14985msgid ""
14986"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
14987msgstr ""
14988"git maintenance run [--auto] [--[no-]quiet] [--task=<任务>] [--schedule]"
14989
14990#: builtin/gc.c:738
14991msgid "--no-schedule is not allowed"
14992msgstr "--no-schedule 不被允许"
14993
14994#: builtin/gc.c:743
14995#, c-format
14996msgid "unrecognized --schedule argument '%s'"
14997msgstr "无法识别的 --schedule 参数 '%s'"
d9488fea 14998
d13389bf 14999#: builtin/gc.c:862
d9488fea
JX
15000msgid "failed to write commit-graph"
15001msgstr "无法写入提交图"
15002
d13389bf
JX
15003#: builtin/gc.c:901
15004msgid "failed to fill remotes"
15005msgstr "无法填充远程仓库"
15006
15007#: builtin/gc.c:1024
15008msgid "failed to start 'git pack-objects' process"
15009msgstr "无法启动 'git pack-objects' 进程"
15010
15011#: builtin/gc.c:1041
15012msgid "failed to finish 'git pack-objects' process"
15013msgstr "无法完成 'git pack-objects' 进程"
15014
15015#: builtin/gc.c:1093
15016msgid "failed to write multi-pack-index"
15017msgstr "无法写入多包索引"
15018
15019#: builtin/gc.c:1111
15020msgid "'git multi-pack-index expire' failed"
15021msgstr "'git multi-pack-index expire' 失败"
15022
15023#: builtin/gc.c:1172
15024msgid "'git multi-pack-index repack' failed"
15025msgstr "'git multi-pack-index repack' 失败"
15026
15027#: builtin/gc.c:1181
15028msgid ""
15029"skipping incremental-repack task because core.multiPackIndex is disabled"
15030msgstr "跳过增量重新打包任务,因为 core.multiPackIndex 被禁用"
15031
15032#: builtin/gc.c:1279
d9488fea
JX
15033#, c-format
15034msgid "lock file '%s' exists, skipping maintenance"
15035msgstr "锁文件 '%s' 已存在,跳过维护"
15036
d13389bf 15037#: builtin/gc.c:1309
d9488fea
JX
15038#, c-format
15039msgid "task '%s' failed"
15040msgstr "任务 '%s' 失败"
15041
d13389bf 15042#: builtin/gc.c:1389
d9488fea
JX
15043#, c-format
15044msgid "'%s' is not a valid task"
15045msgstr "'%s' 不是一个有效的任务"
15046
d13389bf 15047#: builtin/gc.c:1394
d9488fea
JX
15048#, c-format
15049msgid "task '%s' cannot be selected multiple times"
15050msgstr "任务 '%s' 不能被多次选择"
15051
d13389bf 15052#: builtin/gc.c:1409
d9488fea
JX
15053msgid "run tasks based on the state of the repository"
15054msgstr "基于仓库状态来运行任务"
15055
d13389bf
JX
15056#: builtin/gc.c:1410
15057msgid "frequency"
15058msgstr "频率"
15059
15060#: builtin/gc.c:1411
15061msgid "run tasks based on frequency"
15062msgstr "基于频率运行任务"
15063
15064#: builtin/gc.c:1414
d9488fea
JX
15065msgid "do not report progress or other information over stderr"
15066msgstr "不通过标准错误报告进度或其它信息"
15067
d13389bf 15068#: builtin/gc.c:1415
d9488fea
JX
15069msgid "task"
15070msgstr "任务"
15071
d13389bf 15072#: builtin/gc.c:1416
d9488fea
JX
15073msgid "run a specific task"
15074msgstr "运行一个特定的任务"
15075
d13389bf
JX
15076#: builtin/gc.c:1433
15077msgid "use at most one of --auto and --schedule=<frequency>"
15078msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一"
15079
15080#: builtin/gc.c:1467
15081msgid "failed to run 'git config'"
15082msgstr "无法运行 'git config'"
15083
15084#: builtin/gc.c:1512
15085msgid "another process is scheduling background maintenance"
15086msgstr "另外一个进程正运行于后台维护"
d9488fea 15087
d13389bf
JX
15088#: builtin/gc.c:1525
15089msgid "failed to run 'crontab -l'; your system might not support 'cron'"
15090msgstr "无法执行 'crontab -l',您的系统可能不支持 'cron'"
15091
15092#: builtin/gc.c:1544
15093msgid "failed to run 'crontab'; your system might not support 'cron'"
15094msgstr "无法运行 'crontab',您的系统可能不支持 'cron'"
15095
15096#: builtin/gc.c:1550
15097msgid "failed to open stdin of 'crontab'"
15098msgstr "无法打开 'crontab' 的标准输入"
15099
15100#: builtin/gc.c:1592
15101msgid "'crontab' died"
15102msgstr "'crontab' 终止"
15103
15104#: builtin/gc.c:1605
15105msgid "failed to add repo to global config"
15106msgstr "无法将仓库添加到全局配置"
15107
15108#: builtin/gc.c:1615
15109msgid "git maintenance <subcommand> [<options>]"
15110msgstr "git maintenance <子命令> [<选项>]"
15111
15112#: builtin/gc.c:1634
d9488fea
JX
15113#, c-format
15114msgid "invalid subcommand: %s"
15115msgstr "无效子命令:%s"
15116
2b472aae 15117#: builtin/grep.c:30
814ff314
JX
15118msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
15119msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
ef317cd5 15120
06991777 15121#: builtin/grep.c:225
c04f5ac3
JX
15122#, c-format
15123msgid "grep: failed to create thread: %s"
90e6ef53 15124msgstr "grep:无法创建线程:%s"
c04f5ac3 15125
06991777 15126#: builtin/grep.c:279
276ceeaa
JX
15127#, c-format
15128msgid "invalid number of threads specified (%d) for %s"
15129msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
15130
a4f16749
JX
15131#. TRANSLATORS: %s is the configuration
15132#. variable for tweaking threads, currently
15133#. grep.threads
15134#.
d9488fea
JX
15135#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766
15136#: builtin/pack-objects.c:2936
a4f16749
JX
15137#, c-format
15138msgid "no threads support, ignoring %s"
15139msgstr "没有线程支持,忽略 %s"
15140
349ede6a 15141#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640
c04f5ac3
JX
15142#, c-format
15143msgid "unable to read tree (%s)"
90e6ef53 15144msgstr "无法读取树(%s)"
c04f5ac3 15145
349ede6a 15146#: builtin/grep.c:655
c04f5ac3
JX
15147#, c-format
15148msgid "unable to grep from object of type %s"
15149msgstr "无法抓取来自于 %s 类型的对象"
15150
d13389bf 15151#: builtin/grep.c:736
c04f5ac3
JX
15152#, c-format
15153msgid "switch `%c' expects a numerical value"
15154msgstr "开关 `%c' 期望一个数字值"
15155
d13389bf 15156#: builtin/grep.c:835
ef317cd5 15157msgid "search in index instead of in the work tree"
07432cef 15158msgstr "在索引区搜索而不是在工作区"
ef317cd5 15159
d13389bf 15160#: builtin/grep.c:837
ef317cd5 15161msgid "find in contents not managed by git"
07432cef 15162msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
15163
15164# 译者:中文字符串拼接,可删除前导空格
d13389bf 15165#: builtin/grep.c:839
ef317cd5 15166msgid "search in both tracked and untracked files"
07432cef 15167msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 15168
d13389bf 15169#: builtin/grep.c:841
814ff314
JX
15170msgid "ignore files specified via '.gitignore'"
15171msgstr "忽略 '.gitignore' 包含的文件"
ef317cd5 15172
d13389bf 15173#: builtin/grep.c:843
87cb7997 15174msgid "recursively search in each submodule"
1a79b2f1
JX
15175msgstr "在每一个子模组中递归搜索"
15176
d13389bf 15177#: builtin/grep.c:846
ef317cd5 15178msgid "show non-matching lines"
07432cef 15179msgstr "显示未匹配的行"
ef317cd5 15180
d13389bf 15181#: builtin/grep.c:848
ef317cd5 15182msgid "case insensitive matching"
07432cef 15183msgstr "不区分大小写匹配"
ef317cd5 15184
d13389bf 15185#: builtin/grep.c:850
ef317cd5 15186msgid "match patterns only at word boundaries"
07432cef 15187msgstr "只在单词边界匹配模式"
ef317cd5 15188
d13389bf 15189#: builtin/grep.c:852
ef317cd5 15190msgid "process binary files as text"
07432cef 15191msgstr "把二进制文件当做文本处理"
ef317cd5 15192
d13389bf 15193#: builtin/grep.c:854
ef317cd5 15194msgid "don't match patterns in binary files"
07432cef 15195msgstr "不在二进制文件中匹配模式"
ef317cd5 15196
d13389bf 15197#: builtin/grep.c:857
90314792
JX
15198msgid "process binary files with textconv filters"
15199msgstr "用 textconv 过滤器处理二进制文件"
15200
d13389bf 15201#: builtin/grep.c:859
4c27fcb5
JX
15202msgid "search in subdirectories (default)"
15203msgstr "在子目录中寻找(默认)"
15204
d13389bf 15205#: builtin/grep.c:861
ef317cd5 15206msgid "descend at most <depth> levels"
07432cef 15207msgstr "最多以指定的深度向下寻找"
ef317cd5 15208
d13389bf 15209#: builtin/grep.c:865
ef317cd5 15210msgid "use extended POSIX regular expressions"
07432cef 15211msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 15212
d13389bf 15213#: builtin/grep.c:868
ef317cd5 15214msgid "use basic POSIX regular expressions (default)"
07432cef 15215msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 15216
d13389bf 15217#: builtin/grep.c:871
ef317cd5 15218msgid "interpret patterns as fixed strings"
07432cef 15219msgstr "把模式解析为固定的字符串"
ef317cd5 15220
d13389bf 15221#: builtin/grep.c:874
ef317cd5 15222msgid "use Perl-compatible regular expressions"
07432cef 15223msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 15224
d13389bf 15225#: builtin/grep.c:877
ef317cd5 15226msgid "show line numbers"
07432cef 15227msgstr "显示行号"
ef317cd5 15228
d13389bf 15229#: builtin/grep.c:878
c1ac5258
JX
15230msgid "show column number of first match"
15231msgstr "显示第一个匹配的列号"
15232
d13389bf 15233#: builtin/grep.c:879
ef317cd5 15234msgid "don't show filenames"
07432cef 15235msgstr "不显示文件名"
ef317cd5 15236
d13389bf 15237#: builtin/grep.c:880
ef317cd5 15238msgid "show filenames"
07432cef 15239msgstr "显示文件名"
ef317cd5 15240
d13389bf 15241#: builtin/grep.c:882
ef317cd5 15242msgid "show filenames relative to top directory"
07432cef 15243msgstr "显示相对于顶级目录的文件名"
ef317cd5 15244
d13389bf 15245#: builtin/grep.c:884
ef317cd5 15246msgid "show only filenames instead of matching lines"
07432cef 15247msgstr "只显示文件名而不显示匹配的行"
ef317cd5 15248
d13389bf 15249#: builtin/grep.c:886
ef317cd5 15250msgid "synonym for --files-with-matches"
07432cef 15251msgstr "和 --files-with-matches 同义"
ef317cd5 15252
d13389bf 15253#: builtin/grep.c:889
ef317cd5 15254msgid "show only the names of files without match"
07432cef 15255msgstr "只显示未匹配的文件名"
ef317cd5 15256
d13389bf 15257#: builtin/grep.c:891
ef317cd5 15258msgid "print NUL after filenames"
07432cef 15259msgstr "在文件名后输出 NUL 字符"
ef317cd5 15260
d13389bf 15261#: builtin/grep.c:894
c1ac5258
JX
15262msgid "show only matching parts of a line"
15263msgstr "只显示行中的匹配的部分"
15264
d13389bf 15265#: builtin/grep.c:896
ef317cd5 15266msgid "show the number of matches instead of matching lines"
07432cef 15267msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 15268
d13389bf 15269#: builtin/grep.c:897
ef317cd5 15270msgid "highlight matches"
07432cef 15271msgstr "高亮显示匹配项"
ef317cd5 15272
d13389bf 15273#: builtin/grep.c:899
ef317cd5 15274msgid "print empty line between matches from different files"
07432cef 15275msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 15276
d13389bf 15277#: builtin/grep.c:901
ef317cd5 15278msgid "show filename only once above matches from same file"
07432cef 15279msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 15280
d13389bf 15281#: builtin/grep.c:904
ef317cd5 15282msgid "show <n> context lines before and after matches"
07432cef 15283msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 15284
d13389bf 15285#: builtin/grep.c:907
ef317cd5 15286msgid "show <n> context lines before matches"
07432cef 15287msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 15288
d13389bf 15289#: builtin/grep.c:909
ef317cd5 15290msgid "show <n> context lines after matches"
07432cef 15291msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 15292
d13389bf 15293#: builtin/grep.c:911
276ceeaa
JX
15294msgid "use <n> worker threads"
15295msgstr "使用 <n> 个工作线程"
15296
d13389bf 15297#: builtin/grep.c:912
ef317cd5 15298msgid "shortcut for -C NUM"
07432cef 15299msgstr "快捷键 -C 数字"
ef317cd5 15300
d13389bf 15301#: builtin/grep.c:915
ef317cd5 15302msgid "show a line with the function name before matches"
07432cef 15303msgstr "在匹配的前面显示一行函数名"
ef317cd5 15304
d13389bf 15305#: builtin/grep.c:917
ef317cd5 15306msgid "show the surrounding function"
07432cef 15307msgstr "显示所在函数的前后内容"
ef317cd5 15308
d13389bf 15309#: builtin/grep.c:920
ef317cd5 15310msgid "read patterns from file"
07432cef 15311msgstr "从文件读取模式"
ef317cd5 15312
d13389bf 15313#: builtin/grep.c:922
ef317cd5 15314msgid "match <pattern>"
07432cef 15315msgstr "匹配 <模式>"
ef317cd5 15316
d13389bf 15317#: builtin/grep.c:924
ef317cd5 15318msgid "combine patterns specified with -e"
07432cef 15319msgstr "组合用 -e 参数设定的模式"
ef317cd5 15320
d13389bf 15321#: builtin/grep.c:936
ef317cd5 15322msgid "indicate hit with exit status without output"
07432cef 15323msgstr "不输出,而用退出码标识命中状态"
ef317cd5 15324
d13389bf 15325#: builtin/grep.c:938
ef317cd5 15326msgid "show only matches from files that match all patterns"
07432cef 15327msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 15328
d13389bf 15329#: builtin/grep.c:940
07432cef
WS
15330msgid "show parse tree for grep expression"
15331msgstr "显示 grep 表达式的解析树"
15332
d13389bf 15333#: builtin/grep.c:944
ef317cd5 15334msgid "pager"
07432cef 15335msgstr "分页"
ef317cd5 15336
d13389bf 15337#: builtin/grep.c:944
ef317cd5 15338msgid "show matching files in the pager"
07432cef 15339msgstr "分页显示匹配的文件"
ef317cd5 15340
d13389bf 15341#: builtin/grep.c:948
ef317cd5 15342msgid "allow calling of grep(1) (ignored by this build)"
07432cef 15343msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 15344
d13389bf 15345#: builtin/grep.c:1014
c1ac5258
JX
15346msgid "no pattern given"
15347msgstr "未提供匹配模式"
c04f5ac3 15348
d13389bf 15349#: builtin/grep.c:1050
87cb7997
JX
15350msgid "--no-index or --untracked cannot be used with revs"
15351msgstr "--no-index 或 --untracked 不能和版本同时使用"
15352
d13389bf 15353#: builtin/grep.c:1058
87cb7997
JX
15354#, c-format
15355msgid "unable to resolve revision: %s"
15356msgstr "不能解析版本:%s"
15357
d13389bf 15358#: builtin/grep.c:1088
2b472aae
JX
15359msgid "--untracked not supported with --recurse-submodules"
15360msgstr "--untracked 不支持和 --recurse-submodules 共用"
15361
d13389bf 15362#: builtin/grep.c:1092
4c27fcb5
JX
15363msgid "invalid option combination, ignoring --threads"
15364msgstr "无效的选项组合,忽略 --threads"
276ceeaa 15365
d13389bf 15366#: builtin/grep.c:1095 builtin/pack-objects.c:3655
a4f16749
JX
15367msgid "no threads support, ignoring --threads"
15368msgstr "没有线程支持,忽略 --threads"
15369
d13389bf 15370#: builtin/grep.c:1098 builtin/index-pack.c:1573 builtin/pack-objects.c:2933
4c27fcb5
JX
15371#, c-format
15372msgid "invalid number of threads specified (%d)"
15373msgstr "指定的线程数无效(%d)"
15374
d13389bf 15375#: builtin/grep.c:1132
c04f5ac3
JX
15376msgid "--open-files-in-pager only works on the worktree"
15377msgstr "--open-files-in-pager 仅用于工作区"
15378
d13389bf 15379#: builtin/grep.c:1158
c1ac5258
JX
15380msgid "--cached or --untracked cannot be used with --no-index"
15381msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
c04f5ac3 15382
d13389bf 15383#: builtin/grep.c:1164
c1ac5258
JX
15384msgid "--[no-]exclude-standard cannot be used for tracked contents"
15385msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
c04f5ac3 15386
d13389bf 15387#: builtin/grep.c:1172
c1ac5258
JX
15388msgid "both --cached and trees are given"
15389msgstr "同时给出了 --cached 和树对象"
15390
06991777 15391#: builtin/hash-object.c:85
ef317cd5 15392msgid ""
814ff314
JX
15393"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
15394"[--] <file>..."
ef317cd5 15395msgstr ""
814ff314
JX
15396"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
15397"[--] <文件>..."
ef317cd5 15398
06991777 15399#: builtin/hash-object.c:86
94550ed3
JX
15400msgid "git hash-object --stdin-paths"
15401msgstr "git hash-object --stdin-paths"
ef317cd5 15402
06991777 15403#: builtin/hash-object.c:98
ef317cd5 15404msgid "object type"
07432cef 15405msgstr "对象类型"
ef317cd5 15406
06991777 15407#: builtin/hash-object.c:99
ef317cd5 15408msgid "write the object into the object database"
07432cef 15409msgstr "将对象写入对象数据库"
ef317cd5 15410
06991777 15411#: builtin/hash-object.c:101
ef317cd5 15412msgid "read the object from stdin"
07432cef 15413msgstr "从标准输入读取对象"
ef317cd5 15414
06991777 15415#: builtin/hash-object.c:103
ef317cd5 15416msgid "store file as is without filters"
07432cef 15417msgstr "原样存储文件不使用过滤器"
ef317cd5 15418
06991777 15419#: builtin/hash-object.c:104
220c313c
JX
15420msgid ""
15421"just hash any random garbage to create corrupt objects for debugging Git"
15422msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
15423
06991777 15424#: builtin/hash-object.c:105
ef317cd5 15425msgid "process file as it were from this path"
07432cef 15426msgstr "处理文件并假设其来自于此路径"
ef317cd5 15427
349ede6a 15428#: builtin/help.c:47
ef317cd5 15429msgid "print all available commands"
07432cef 15430msgstr "打印所有可用的命令"
ef317cd5 15431
349ede6a 15432#: builtin/help.c:48
a0b6b246
JX
15433msgid "exclude guides"
15434msgstr "排除向导"
15435
349ede6a 15436#: builtin/help.c:49
4dcdc3d8
JX
15437msgid "print list of useful guides"
15438msgstr "显示有用的指南列表"
15439
349ede6a 15440#: builtin/help.c:50
c1ac5258
JX
15441msgid "print all configuration variable names"
15442msgstr "打印所有配置变量名称"
15443
349ede6a 15444#: builtin/help.c:52
ef317cd5 15445msgid "show man page"
07432cef 15446msgstr "显示 man 手册"
ef317cd5 15447
349ede6a 15448#: builtin/help.c:53
ef317cd5 15449msgid "show manual in web browser"
07432cef 15450msgstr "在 web 浏览器中显示手册"
ef317cd5 15451
349ede6a 15452#: builtin/help.c:55
ef317cd5 15453msgid "show info page"
07432cef 15454msgstr "显示 info 手册"
ef317cd5 15455
349ede6a 15456#: builtin/help.c:57
fd8cb379
JX
15457msgid "print command description"
15458msgstr "打印命令描述"
15459
349ede6a 15460#: builtin/help.c:62
814ff314
JX
15461msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
15462msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
ef317cd5 15463
349ede6a 15464#: builtin/help.c:163
81809b99 15465#, c-format
8ada9598 15466msgid "unrecognized help format '%s'"
81809b99 15467msgstr "未能识别的帮助格式 '%s'"
8ada9598 15468
349ede6a 15469#: builtin/help.c:190
8ada9598 15470msgid "Failed to start emacsclient."
81809b99 15471msgstr "无法启动 emacsclient。"
8ada9598 15472
349ede6a 15473#: builtin/help.c:203
8ada9598 15474msgid "Failed to parse emacsclient version."
81809b99 15475msgstr "无法解析 emacsclient 版本。"
8ada9598 15476
349ede6a 15477#: builtin/help.c:211
8ada9598
JX
15478#, c-format
15479msgid "emacsclient version '%d' too old (< 22)."
07432cef 15480msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 15481
349ede6a 15482#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
81809b99 15483#, c-format
5b04ee3b 15484msgid "failed to exec '%s'"
c1ac5258 15485msgstr "执行 '%s' 失败"
8ada9598 15486
349ede6a 15487#: builtin/help.c:307
8ada9598
JX
15488#, c-format
15489msgid ""
15490"'%s': path for unsupported man viewer.\n"
15491"Please consider using 'man.<tool>.cmd' instead."
15492msgstr ""
81809b99 15493"'%s':不支持的 man 手册查看器的路径。\n"
d9d56b23 15494"请使用 'man.<工具>.cmd'。"
8ada9598 15495
349ede6a 15496#: builtin/help.c:319
8ada9598
JX
15497#, c-format
15498msgid ""
15499"'%s': cmd for supported man viewer.\n"
15500"Please consider using 'man.<tool>.path' instead."
15501msgstr ""
81809b99 15502"'%s': 支持的 man 手册查看器命令。\n"
d9d56b23 15503"请使用 'man.<工具>.path'。"
8ada9598 15504
349ede6a 15505#: builtin/help.c:436
8ada9598
JX
15506#, c-format
15507msgid "'%s': unknown man viewer."
81809b99 15508msgstr "'%s':未知的 man 查看器。"
8ada9598 15509
349ede6a 15510#: builtin/help.c:453
8ada9598 15511msgid "no man viewer handled the request"
81809b99 15512msgstr "没有 man 查看器处理此请求"
8ada9598 15513
349ede6a 15514#: builtin/help.c:461
8ada9598 15515msgid "no info viewer handled the request"
81809b99 15516msgstr "没有 info 查看器处理此请求"
8ada9598 15517
349ede6a 15518#: builtin/help.c:520 builtin/help.c:531 git.c:337
fd8cb379
JX
15519#, c-format
15520msgid "'%s' is aliased to '%s'"
15521msgstr "'%s' 是 '%s' 的别名"
220c313c 15522
d9488fea 15523#: builtin/help.c:534 git.c:369
4c27fcb5
JX
15524#, c-format
15525msgid "bad alias.%s string: %s"
15526msgstr "坏的 alias.%s 字符串:%s"
15527
349ede6a 15528#: builtin/help.c:563 builtin/help.c:593
fd8cb379
JX
15529#, c-format
15530msgid "usage: %s%s"
15531msgstr "用法:%s%s"
4dcdc3d8 15532
349ede6a 15533#: builtin/help.c:577
c1ac5258
JX
15534msgid "'git help config' for more information"
15535msgstr "'git help config' 获取更多信息"
4dcdc3d8 15536
d9488fea 15537#: builtin/index-pack.c:221
8ada9598
JX
15538#, c-format
15539msgid "object type mismatch at %s"
81809b99 15540msgstr "%s 的对象类型不匹配"
8ada9598 15541
d9488fea 15542#: builtin/index-pack.c:241
6acbf033
JX
15543#, c-format
15544msgid "did not receive expected object %s"
a0b6b246 15545msgstr "未能获取预期的对象 %s"
8ada9598 15546
d9488fea 15547#: builtin/index-pack.c:244
6acbf033
JX
15548#, c-format
15549msgid "object %s: expected type %s, found %s"
a0b6b246 15550msgstr "对象 %s:应为类型 %s,却是 %s"
6acbf033 15551
d9488fea 15552#: builtin/index-pack.c:294
81809b99 15553#, c-format
8ada9598
JX
15554msgid "cannot fill %d byte"
15555msgid_plural "cannot fill %d bytes"
81809b99 15556msgstr[0] "无法填充 %d 字节"
5ae481e0 15557msgstr[1] "无法填充 %d 字节"
8ada9598 15558
d9488fea 15559#: builtin/index-pack.c:304
8ada9598 15560msgid "early EOF"
81809b99 15561msgstr "过早的文件结束符(EOF)"
8ada9598 15562
d9488fea 15563#: builtin/index-pack.c:305
8ada9598 15564msgid "read error on input"
81809b99 15565msgstr "输入上的读错误"
8ada9598 15566
d9488fea 15567#: builtin/index-pack.c:317
8ada9598 15568msgid "used more bytes than were available"
81809b99 15569msgstr "用掉了超过可用的字节"
8ada9598 15570
d9488fea 15571#: builtin/index-pack.c:324 builtin/pack-objects.c:619
8ada9598 15572msgid "pack too large for current definition of off_t"
81809b99 15573msgstr "包太大超过了当前 off_t 的定义"
8ada9598 15574
d9488fea 15575#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
a0b6b246
JX
15576msgid "pack exceeds maximum allowed size"
15577msgstr "包超过了最大允许值"
15578
d13389bf 15579#: builtin/index-pack.c:342 builtin/repack.c:286
349ede6a
JX
15580#, c-format
15581msgid "unable to create '%s'"
15582msgstr "不能创建 '%s'"
15583
d9488fea 15584#: builtin/index-pack.c:348
81809b99 15585#, c-format
8ada9598 15586msgid "cannot open packfile '%s'"
81809b99 15587msgstr "无法打开包文件 '%s'"
8ada9598 15588
d9488fea 15589#: builtin/index-pack.c:362
8ada9598 15590msgid "pack signature mismatch"
81809b99 15591msgstr "包签名不匹配"
8ada9598 15592
d9488fea 15593#: builtin/index-pack.c:364
ef317cd5
JX
15594#, c-format
15595msgid "pack version %<PRIu32> unsupported"
07432cef 15596msgstr "不支持包版本 %<PRIu32>"
ef317cd5 15597
d9488fea 15598#: builtin/index-pack.c:382
8ada9598 15599#, c-format
5c57d762
JX
15600msgid "pack has bad object at offset %<PRIuMAX>: %s"
15601msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
8ada9598 15602
d9488fea 15603#: builtin/index-pack.c:488
8ada9598
JX
15604#, c-format
15605msgid "inflate returned %d"
81809b99 15606msgstr "解压缩返回 %d"
8ada9598 15607
d9488fea 15608#: builtin/index-pack.c:537
8ada9598 15609msgid "offset value overflow for delta base object"
81809b99 15610msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 15611
d9488fea 15612#: builtin/index-pack.c:545
8ada9598 15613msgid "delta base offset is out of bound"
81809b99 15614msgstr "delta 基准偏移越界"
8ada9598 15615
d9488fea 15616#: builtin/index-pack.c:553
81809b99 15617#, c-format
8ada9598 15618msgid "unknown object type %d"
81809b99 15619msgstr "未知对象类型 %d"
8ada9598 15620
d9488fea 15621#: builtin/index-pack.c:584
8ada9598 15622msgid "cannot pread pack file"
81809b99 15623msgstr "无法读取包文件"
8ada9598 15624
d9488fea 15625#: builtin/index-pack.c:586
8ada9598 15626#, c-format
5c57d762
JX
15627msgid "premature end of pack file, %<PRIuMAX> byte missing"
15628msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
15629msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
15630msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8ada9598 15631
d9488fea 15632#: builtin/index-pack.c:612
8ada9598 15633msgid "serious inflate inconsistency"
81809b99 15634msgstr "解压缩严重的不一致"
8ada9598 15635
d9488fea
JX
15636#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787
15637#: builtin/index-pack.c:826 builtin/index-pack.c:835
8ada9598
JX
15638#, c-format
15639msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 15640msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 15641
d9488fea
JX
15642#: builtin/index-pack.c:760 builtin/pack-objects.c:171
15643#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
6792b93b
JX
15644#, c-format
15645msgid "unable to read %s"
15646msgstr "不能读 %s"
15647
d9488fea 15648#: builtin/index-pack.c:824
87cb7997
JX
15649#, c-format
15650msgid "cannot read existing object info %s"
15651msgstr "不能读取现存对象信息 %s"
15652
d9488fea 15653#: builtin/index-pack.c:832
6792b93b
JX
15654#, c-format
15655msgid "cannot read existing object %s"
15656msgstr "不能读取现存对象 %s"
15657
d9488fea 15658#: builtin/index-pack.c:846
81809b99 15659#, c-format
8ada9598 15660msgid "invalid blob object %s"
160fb2b2 15661msgstr "无效的数据对象 %s"
8ada9598 15662
d9488fea 15663#: builtin/index-pack.c:849 builtin/index-pack.c:868
fd8cb379
JX
15664msgid "fsck error in packed object"
15665msgstr "对打包对象 fsck 检查出错"
15666
d9488fea 15667#: builtin/index-pack.c:870
8ada9598
JX
15668#, c-format
15669msgid "Not all child objects of %s are reachable"
81809b99 15670msgstr "%s 的所有子对象并非都可达"
8ada9598 15671
d9488fea 15672#: builtin/index-pack.c:931 builtin/index-pack.c:978
8ada9598 15673msgid "failed to apply delta"
c1ac5258 15674msgstr "应用 delta 失败"
8ada9598 15675
d9488fea 15676#: builtin/index-pack.c:1161
8ada9598 15677msgid "Receiving objects"
81809b99 15678msgstr "接收对象中"
8ada9598 15679
d9488fea 15680#: builtin/index-pack.c:1161
8ada9598 15681msgid "Indexing objects"
81809b99 15682msgstr "索引对象中"
8ada9598 15683
d9488fea 15684#: builtin/index-pack.c:1195
8ada9598 15685msgid "pack is corrupted (SHA1 mismatch)"
81809b99 15686msgstr "包冲突(SHA1 不匹配)"
8ada9598 15687
d9488fea 15688#: builtin/index-pack.c:1200
8ada9598 15689msgid "cannot fstat packfile"
65e2041e 15690msgstr "不能对包文件调用 fstat"
8ada9598 15691
d9488fea 15692#: builtin/index-pack.c:1203
8ada9598 15693msgid "pack has junk at the end"
81809b99 15694msgstr "包的结尾有垃圾数据"
8ada9598 15695
d9488fea 15696#: builtin/index-pack.c:1215
6792b93b
JX
15697msgid "confusion beyond insanity in parse_pack_objects()"
15698msgstr "parse_pack_objects() 中遇到不可理喻的问题"
15699
d9488fea 15700#: builtin/index-pack.c:1238
8ada9598 15701msgid "Resolving deltas"
81809b99 15702msgstr "处理 delta 中"
8ada9598 15703
d9488fea 15704#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697
07432cef 15705#, c-format
ef317cd5 15706msgid "unable to create thread: %s"
07432cef 15707msgstr "不能创建线程:%s"
ef317cd5 15708
d9488fea 15709#: builtin/index-pack.c:1282
8ada9598 15710msgid "confusion beyond insanity"
81809b99 15711msgstr "不可理喻"
8ada9598 15712
d9488fea 15713#: builtin/index-pack.c:1288
ef317cd5 15714#, c-format
5b04ee3b
JX
15715msgid "completed with %d local object"
15716msgid_plural "completed with %d local objects"
15717msgstr[0] "完成 %d 个本地对象"
15718msgstr[1] "完成 %d 个本地对象"
ef317cd5 15719
d9488fea 15720#: builtin/index-pack.c:1300
ef317cd5
JX
15721#, c-format
15722msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 15723msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 15724
d9488fea 15725#: builtin/index-pack.c:1304
8ada9598
JX
15726#, c-format
15727msgid "pack has %d unresolved delta"
15728msgid_plural "pack has %d unresolved deltas"
81809b99 15729msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 15730msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 15731
d9488fea 15732#: builtin/index-pack.c:1328
81809b99 15733#, c-format
8ada9598 15734msgid "unable to deflate appended object (%d)"
07432cef 15735msgstr "不能压缩附加对象(%d)"
8ada9598 15736
d9488fea 15737#: builtin/index-pack.c:1424
8ada9598
JX
15738#, c-format
15739msgid "local object %s is corrupt"
81809b99 15740msgstr "本地对象 %s 已损坏"
8ada9598 15741
d9488fea 15742#: builtin/index-pack.c:1444
31e5e17b
JX
15743#, c-format
15744msgid "packfile name '%s' does not end with '.pack'"
15745msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
8ada9598 15746
d9488fea 15747#: builtin/index-pack.c:1469
81809b99 15748#, c-format
31e5e17b
JX
15749msgid "cannot write %s file '%s'"
15750msgstr "无法写入 %s 文件 '%s'"
8ada9598 15751
d9488fea 15752#: builtin/index-pack.c:1477
81809b99 15753#, c-format
31e5e17b
JX
15754msgid "cannot close written %s file '%s'"
15755msgstr "无法关闭已写入的 %s 文件 '%s'"
15756
d9488fea 15757#: builtin/index-pack.c:1501
31e5e17b
JX
15758msgid "error while closing pack file"
15759msgstr "关闭包文件时出错"
8ada9598 15760
d9488fea 15761#: builtin/index-pack.c:1515
8ada9598 15762msgid "cannot store pack file"
81809b99 15763msgstr "无法存储包文件"
8ada9598 15764
d9488fea 15765#: builtin/index-pack.c:1523
8ada9598 15766msgid "cannot store index file"
81809b99 15767msgstr "无法存储索引文件"
8ada9598 15768
d9488fea 15769#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944
07432cef 15770#, c-format
ef317cd5 15771msgid "bad pack.indexversion=%<PRIu32>"
07432cef 15772msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 15773
d9488fea 15774#: builtin/index-pack.c:1631
81809b99 15775#, c-format
8ada9598 15776msgid "Cannot open existing pack file '%s'"
81809b99 15777msgstr "无法打开现存包文件 '%s'"
8ada9598 15778
d9488fea 15779#: builtin/index-pack.c:1633
81809b99 15780#, c-format
8ada9598 15781msgid "Cannot open existing pack idx file for '%s'"
81809b99 15782msgstr "无法为 %s 打开包索引文件"
8ada9598 15783
d9488fea 15784#: builtin/index-pack.c:1681
81809b99 15785#, c-format
8ada9598
JX
15786msgid "non delta: %d object"
15787msgid_plural "non delta: %d objects"
81809b99 15788msgstr[0] "非 delta:%d 个对象"
5ae481e0 15789msgstr[1] "非 delta:%d 个对象"
8ada9598 15790
d9488fea 15791#: builtin/index-pack.c:1688
8ada9598
JX
15792#, c-format
15793msgid "chain length = %d: %lu object"
15794msgid_plural "chain length = %d: %lu objects"
81809b99 15795msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 15796msgstr[1] "链长 = %d: %lu 对象"
8ada9598 15797
d9488fea 15798#: builtin/index-pack.c:1728
31e5e17b
JX
15799msgid "Cannot come back to cwd"
15800msgstr "无法返回当前工作目录"
5b04ee3b 15801
d9488fea
JX
15802#: builtin/index-pack.c:1777 builtin/index-pack.c:1780
15803#: builtin/index-pack.c:1796 builtin/index-pack.c:1800
81809b99 15804#, c-format
8ada9598 15805msgid "bad %s"
81809b99 15806msgstr "错误选项 %s"
8ada9598 15807
d13389bf 15808#: builtin/index-pack.c:1806 builtin/init-db.c:392 builtin/init-db.c:625
7157c2b5
JX
15809#, c-format
15810msgid "unknown hash algorithm '%s'"
15811msgstr "未知的哈希算法 '%s'"
15812
d9488fea 15813#: builtin/index-pack.c:1821
8ada9598 15814msgid "--fix-thin cannot be used without --stdin"
649900bc 15815msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 15816
d9488fea 15817#: builtin/index-pack.c:1823
1a79b2f1 15818msgid "--stdin requires a git repository"
d9488fea 15819msgstr "--stdin 需要 git 仓库"
1a79b2f1 15820
d9488fea 15821#: builtin/index-pack.c:1825
7157c2b5
JX
15822msgid "--object-format cannot be used with --stdin"
15823msgstr "--object-format 不能和 --stdin 同时使用"
15824
d9488fea 15825#: builtin/index-pack.c:1831
8ada9598 15826msgid "--verify with no packfile name given"
dbd6cced 15827msgstr "--verify 没有提供包文件名参数"
8ada9598 15828
d9488fea 15829#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582
fd8cb379
JX
15830msgid "fsck error in pack objects"
15831msgstr "在打包对象中 fsck 检查出错"
15832
d9488fea 15833#: builtin/init-db.c:64
c04f5ac3
JX
15834#, c-format
15835msgid "cannot stat template '%s'"
65e2041e 15836msgstr "不能对模版 '%s' 调用 stat"
c04f5ac3 15837
d9488fea 15838#: builtin/init-db.c:69
c04f5ac3
JX
15839#, c-format
15840msgid "cannot opendir '%s'"
15841msgstr "不能打开目录 '%s'"
15842
d9488fea 15843#: builtin/init-db.c:81
c04f5ac3
JX
15844#, c-format
15845msgid "cannot readlink '%s'"
15846msgstr "不能读取链接 '%s'"
15847
d9488fea 15848#: builtin/init-db.c:83
c04f5ac3
JX
15849#, c-format
15850msgid "cannot symlink '%s' '%s'"
90e6ef53 15851msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3 15852
d9488fea 15853#: builtin/init-db.c:89
c04f5ac3
JX
15854#, c-format
15855msgid "cannot copy '%s' to '%s'"
15856msgstr "不能拷贝 '%s' 至 '%s'"
15857
d9488fea 15858#: builtin/init-db.c:93
c04f5ac3
JX
15859#, c-format
15860msgid "ignoring template %s"
15861msgstr "忽略模版 %s"
15862
d9488fea 15863#: builtin/init-db.c:124
c04f5ac3 15864#, c-format
fd8cb379
JX
15865msgid "templates not found in %s"
15866msgstr "没有在 %s 中找到模版"
c04f5ac3 15867
d9488fea 15868#: builtin/init-db.c:139
c04f5ac3 15869#, c-format
5b04ee3b
JX
15870msgid "not copying templates from '%s': %s"
15871msgstr "没有从 '%s' 复制模版:%s"
c04f5ac3 15872
d13389bf 15873#: builtin/init-db.c:275
7157c2b5
JX
15874#, c-format
15875msgid "invalid initial branch name: '%s'"
15876msgstr "无效的初始分支名:'%s'"
15877
d13389bf 15878#: builtin/init-db.c:367
c04f5ac3
JX
15879#, c-format
15880msgid "unable to handle file type %d"
15881msgstr "不能处理 %d 类型的文件"
15882
d13389bf 15883#: builtin/init-db.c:370
c04f5ac3
JX
15884#, c-format
15885msgid "unable to move %s to %s"
15886msgstr "不能移动 %s 至 %s"
15887
d13389bf 15888#: builtin/init-db.c:386
349ede6a
JX
15889msgid "attempt to reinitialize repository with different hash"
15890msgstr "尝试用不同的哈希算法重新初始化仓库"
15891
d13389bf 15892#: builtin/init-db.c:410 builtin/init-db.c:413
a0b6b246
JX
15893#, c-format
15894msgid "%s already exists"
15895msgstr "%s 已经存在"
15896
d13389bf 15897#: builtin/init-db.c:445
7157c2b5
JX
15898#, c-format
15899msgid "re-init: ignored --initial-branch=%s"
15900msgstr "re-init:已忽略 --initial-branch=%s"
15901
d13389bf 15902#: builtin/init-db.c:476
c04f5ac3 15903#, c-format
5c57d762
JX
15904msgid "Reinitialized existing shared Git repository in %s%s\n"
15905msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
c04f5ac3 15906
d13389bf 15907#: builtin/init-db.c:477
5c57d762
JX
15908#, c-format
15909msgid "Reinitialized existing Git repository in %s%s\n"
15910msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
c04f5ac3 15911
d13389bf 15912#: builtin/init-db.c:481
5c57d762
JX
15913#, c-format
15914msgid "Initialized empty shared Git repository in %s%s\n"
9a4b694c 15915msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
c04f5ac3 15916
d13389bf 15917#: builtin/init-db.c:482
5c57d762
JX
15918#, c-format
15919msgid "Initialized empty Git repository in %s%s\n"
9a4b694c 15920msgstr "已初始化空的 Git 仓库于 %s%s\n"
c04f5ac3 15921
d13389bf 15922#: builtin/init-db.c:531
ef317cd5 15923msgid ""
a77c07d9 15924"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
814ff314 15925"shared[=<permissions>]] [<directory>]"
ef317cd5 15926msgstr ""
07432cef 15927"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
814ff314 15928"[<目录>]"
ef317cd5 15929
d13389bf 15930#: builtin/init-db.c:557
ef317cd5 15931msgid "permissions"
07432cef 15932msgstr "权限"
ef317cd5 15933
d13389bf 15934#: builtin/init-db.c:558
ef317cd5 15935msgid "specify that the git repository is to be shared amongst several users"
160fb2b2 15936msgstr "指定 git 仓库是多个用户之间共享的"
ef317cd5 15937
d13389bf 15938#: builtin/init-db.c:564
7157c2b5
JX
15939msgid "override the name of the initial branch"
15940msgstr "覆盖初始分支名称"
15941
d13389bf 15942#: builtin/init-db.c:565 builtin/verify-pack.c:74
349ede6a
JX
15943msgid "hash"
15944msgstr "hash"
15945
d13389bf 15946#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75
349ede6a
JX
15947msgid "specify the hash algorithm to use"
15948msgstr "指定要使用的哈希算法"
15949
d13389bf 15950#: builtin/init-db.c:573
d9488fea
JX
15951msgid "--separate-git-dir and --bare are mutually exclusive"
15952msgstr "--separate-git-dir 和 --bare 是互斥的"
15953
d13389bf 15954#: builtin/init-db.c:602 builtin/init-db.c:607
c1ac5258
JX
15955#, c-format
15956msgid "cannot mkdir %s"
15957msgstr "不能创建目录 %s"
15958
d13389bf 15959#: builtin/init-db.c:611 builtin/init-db.c:666
c04f5ac3
JX
15960#, c-format
15961msgid "cannot chdir to %s"
15962msgstr "不能切换目录到 %s"
15963
d13389bf 15964#: builtin/init-db.c:638
c04f5ac3
JX
15965#, c-format
15966msgid ""
15967"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
15968"dir=<directory>)"
1e607449 15969msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
c04f5ac3 15970
d13389bf 15971#: builtin/init-db.c:690
c04f5ac3
JX
15972#, c-format
15973msgid "Cannot access work tree '%s'"
15974msgstr "不能访问工作区 '%s'"
15975
d13389bf 15976#: builtin/init-db.c:695
d9488fea
JX
15977msgid "--separate-git-dir incompatible with bare repository"
15978msgstr "--separate-git-dir 不能用于纯仓库"
15979
a6cd2cc4 15980#: builtin/interpret-trailers.c:16
220c313c 15981msgid ""
276ceeaa
JX
15982"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
15983"<token>[(=|:)<value>])...] [<file>...]"
3495628d
JX
15984msgstr ""
15985"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
15986">])...] [<文件>...]"
276ceeaa 15987
a6cd2cc4 15988#: builtin/interpret-trailers.c:95
276ceeaa
JX
15989msgid "edit files in place"
15990msgstr "在原位编辑文件"
220c313c 15991
a6cd2cc4 15992#: builtin/interpret-trailers.c:96
220c313c 15993msgid "trim empty trailers"
d13389bf 15994msgstr "删除空的尾注"
6937cb4e 15995
a6cd2cc4 15996#: builtin/interpret-trailers.c:99
6937cb4e 15997msgid "where to place the new trailer"
d13389bf 15998msgstr "在哪里放置新的尾注"
220c313c 15999
a6cd2cc4 16000#: builtin/interpret-trailers.c:101
6937cb4e 16001msgid "action if trailer already exists"
d13389bf 16002msgstr "当尾注已经存在时所采取的动作"
6937cb4e 16003
a6cd2cc4 16004#: builtin/interpret-trailers.c:103
6937cb4e 16005msgid "action if trailer is missing"
d13389bf 16006msgstr "当尾注缺失时所采取的动作"
6937cb4e 16007
a6cd2cc4 16008#: builtin/interpret-trailers.c:105
6937cb4e 16009msgid "output only the trailers"
d13389bf 16010msgstr "只输出尾注"
6937cb4e 16011
a6cd2cc4 16012#: builtin/interpret-trailers.c:106
6937cb4e
JX
16013msgid "do not apply config rules"
16014msgstr "不要应用配置规则"
16015
a6cd2cc4 16016#: builtin/interpret-trailers.c:107
6937cb4e
JX
16017msgid "join whitespace-continued values"
16018msgstr "连接空白折行的值"
16019
a6cd2cc4 16020#: builtin/interpret-trailers.c:108
6937cb4e
JX
16021msgid "set parsing options"
16022msgstr "设置解析选项"
16023
a6cd2cc4 16024#: builtin/interpret-trailers.c:110
4c27fcb5
JX
16025msgid "do not treat --- specially"
16026msgstr "不要对 --- 特殊处理"
16027
a6cd2cc4 16028#: builtin/interpret-trailers.c:111
220c313c 16029msgid "trailer"
d13389bf 16030msgstr "尾注"
220c313c 16031
a6cd2cc4 16032#: builtin/interpret-trailers.c:112
220c313c 16033msgid "trailer(s) to add"
d13389bf 16034msgstr "要添加的尾注"
220c313c 16035
a6cd2cc4 16036#: builtin/interpret-trailers.c:123
6937cb4e
JX
16037msgid "--trailer with --only-input does not make sense"
16038msgstr "--trailer 和 --only-input 同时使用没有意义"
16039
a6cd2cc4 16040#: builtin/interpret-trailers.c:133
276ceeaa
JX
16041msgid "no input file given for in-place editing"
16042msgstr "没有给出要原位编辑的文件"
16043
d13389bf 16044#: builtin/log.c:58
7aea43ff 16045msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
d9d56b23 16046msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
ef317cd5 16047
d13389bf 16048#: builtin/log.c:59
814ff314
JX
16049msgid "git show [<options>] <object>..."
16050msgstr "git show [<选项>] <对象>..."
ef317cd5 16051
d13389bf 16052#: builtin/log.c:112
220c313c
JX
16053#, c-format
16054msgid "invalid --decorate option: %s"
16055msgstr "无效的 --decorate 选项:%s"
16056
d13389bf 16057#: builtin/log.c:179
ef317cd5 16058msgid "show source"
07432cef 16059msgstr "显示源"
ef317cd5 16060
d13389bf 16061#: builtin/log.c:180
07432cef
WS
16062msgid "Use mail map file"
16063msgstr "使用邮件映射文件"
16064
d13389bf 16065#: builtin/log.c:183
5809aa05
JX
16066msgid "only decorate refs that match <pattern>"
16067msgstr "只修饰与 <模式> 匹配的引用"
16068
d13389bf 16069#: builtin/log.c:185
5809aa05
JX
16070msgid "do not decorate refs that match <pattern>"
16071msgstr "不修饰和 <模式> 匹配的引用"
16072
d13389bf 16073#: builtin/log.c:186
ef317cd5 16074msgid "decorate options"
07432cef 16075msgstr "修饰选项"
ef317cd5 16076
d13389bf
JX
16077#: builtin/log.c:189
16078msgid ""
16079"Trace the evolution of line range <start>,<end> or function :<funcname> in "
16080"<file>"
16081msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数名> 的演变"
16082
16083#: builtin/log.c:212
16084msgid "-L<range>:<file> cannot be used with pathspec"
16085msgstr "-L<范围>:<文件> 不能和路径表达式共用"
220c313c 16086
d13389bf 16087#: builtin/log.c:302
c04f5ac3
JX
16088#, c-format
16089msgid "Final output: %d %s\n"
16090msgstr "最终输出:%d %s\n"
16091
d13389bf 16092#: builtin/log.c:564
220c313c
JX
16093#, c-format
16094msgid "git show %s: bad file"
16095msgstr "git show %s: 损坏的文件"
16096
d13389bf 16097#: builtin/log.c:579 builtin/log.c:674
c04f5ac3 16098#, c-format
d46c5519 16099msgid "could not read object %s"
90e6ef53 16100msgstr "不能读取对象 %s"
c04f5ac3 16101
d13389bf 16102#: builtin/log.c:699
c04f5ac3 16103#, c-format
d46c5519 16104msgid "unknown type: %d"
c04f5ac3
JX
16105msgstr "未知类型:%d"
16106
d13389bf 16107#: builtin/log.c:848
ddc12c42
JX
16108#, c-format
16109msgid "%s: invalid cover from description mode"
16110msgstr "%s:从描述生成附函的模式无效"
16111
d13389bf 16112#: builtin/log.c:855
c04f5ac3
JX
16113msgid "format.headers without value"
16114msgstr "format.headers 没有值"
16115
d13389bf 16116#: builtin/log.c:984
c04f5ac3 16117#, c-format
d46c5519 16118msgid "cannot open patch file %s"
c04f5ac3
JX
16119msgstr "无法打开补丁文件 %s"
16120
d13389bf 16121#: builtin/log.c:1001
d46c5519
JX
16122msgid "need exactly one range"
16123msgstr "只需要一个范围"
c04f5ac3 16124
d13389bf 16125#: builtin/log.c:1011
d46c5519
JX
16126msgid "not a range"
16127msgstr "不是一个范围"
c04f5ac3 16128
d13389bf 16129#: builtin/log.c:1175
d46c5519
JX
16130msgid "cover letter needs email format"
16131msgstr "附函需要邮件地址格式"
c04f5ac3 16132
d13389bf 16133#: builtin/log.c:1181
d46c5519
JX
16134msgid "failed to create cover-letter file"
16135msgstr "无法创建附函文件"
16136
d13389bf 16137#: builtin/log.c:1262
c04f5ac3
JX
16138#, c-format
16139msgid "insane in-reply-to: %s"
16140msgstr "不正常的 in-reply-to:%s"
16141
d13389bf 16142#: builtin/log.c:1289
814ff314
JX
16143msgid "git format-patch [<options>] [<since> | <revision-range>]"
16144msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
ef317cd5 16145
d13389bf 16146#: builtin/log.c:1347
d46c5519 16147msgid "two output directories?"
c04f5ac3
JX
16148msgstr "两个输出目录?"
16149
d13389bf 16150#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332
5b04ee3b 16151#, c-format
d46c5519 16152msgid "unknown commit %s"
5b04ee3b
JX
16153msgstr "未知提交 %s"
16154
d13389bf 16155#: builtin/log.c:1509 builtin/replace.c:58 builtin/replace.c:207
d46c5519 16156#: builtin/replace.c:210
5b04ee3b 16157#, c-format
d46c5519
JX
16158msgid "failed to resolve '%s' as a valid ref"
16159msgstr "无法将 '%s' 解析为一个有效引用"
5b04ee3b 16160
d13389bf 16161#: builtin/log.c:1518
d46c5519
JX
16162msgid "could not find exact merge base"
16163msgstr "不能找到准确的合并基线"
5b04ee3b 16164
d13389bf 16165#: builtin/log.c:1528
5b04ee3b 16166msgid ""
d46c5519 16167"failed to get upstream, if you want to record base commit automatically,\n"
5b04ee3b 16168"please use git branch --set-upstream-to to track a remote branch.\n"
d46c5519 16169"Or you could specify base commit by --base=<base-commit-id> manually"
5b04ee3b
JX
16170msgstr ""
16171"无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
aef18cc6 16172"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
d46c5519 16173"参数 --base=<基线提交> 手动指定一个基线提交"
5b04ee3b 16174
d13389bf 16175#: builtin/log.c:1551
d46c5519 16176msgid "failed to find exact merge base"
5b04ee3b
JX
16177msgstr "无法找到准确的合并基线"
16178
d13389bf 16179#: builtin/log.c:1568
5b04ee3b
JX
16180msgid "base commit should be the ancestor of revision list"
16181msgstr "基线提交应该是版本列表的祖先"
16182
d13389bf 16183#: builtin/log.c:1578
5b04ee3b
JX
16184msgid "base commit shouldn't be in revision list"
16185msgstr "基线提交不应该出现在版本列表中"
16186
d13389bf 16187#: builtin/log.c:1636
5b04ee3b 16188msgid "cannot get patch id"
aef18cc6 16189msgstr "无法得到补丁 id"
5b04ee3b 16190
d13389bf 16191#: builtin/log.c:1693
d9488fea
JX
16192msgid "failed to infer range-diff origin of current series"
16193msgstr "无法推断当前系列的 range-diff 起始"
16194
d13389bf 16195#: builtin/log.c:1695
d9488fea
JX
16196#, c-format
16197msgid "using '%s' as range-diff origin of current series"
16198msgstr "使用 '%s' 作为当前系列的 range-diff 源"
4c27fcb5 16199
d13389bf 16200#: builtin/log.c:1739
ef317cd5 16201msgid "use [PATCH n/m] even with a single patch"
07432cef 16202msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 16203
d13389bf 16204#: builtin/log.c:1742
ef317cd5 16205msgid "use [PATCH] even with multiple patches"
07432cef 16206msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 16207
d13389bf 16208#: builtin/log.c:1746
ef317cd5 16209msgid "print patches to standard out"
07432cef 16210msgstr "打印补丁到标准输出"
c04f5ac3 16211
d13389bf 16212#: builtin/log.c:1748
ef317cd5 16213msgid "generate a cover letter"
d46c5519 16214msgstr "生成一封附函"
c04f5ac3 16215
d13389bf 16216#: builtin/log.c:1750
ef317cd5 16217msgid "use simple number sequence for output file names"
07432cef 16218msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 16219
d13389bf 16220#: builtin/log.c:1751
ef317cd5 16221msgid "sfx"
07432cef 16222msgstr "后缀"
ef317cd5 16223
d13389bf 16224#: builtin/log.c:1752
ef317cd5 16225msgid "use <sfx> instead of '.patch'"
07432cef 16226msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 16227
d13389bf 16228#: builtin/log.c:1754
ef317cd5 16229msgid "start numbering patches at <n> instead of 1"
07432cef
WS
16230msgstr "补丁以 <n> 开始编号,而不是1"
16231
d13389bf 16232#: builtin/log.c:1756
07432cef
WS
16233msgid "mark the series as Nth re-roll"
16234msgstr "标记补丁系列是第几次重制"
ef317cd5 16235
d13389bf
JX
16236#: builtin/log.c:1758
16237msgid "max length of output filename"
16238msgstr "输出文件名的最大长度"
16239
16240#: builtin/log.c:1760
a0b6b246
JX
16241msgid "Use [RFC PATCH] instead of [PATCH]"
16242msgstr "使用 [RFC PATCH] 代替 [PATCH]"
16243
d13389bf 16244#: builtin/log.c:1763
ddc12c42
JX
16245msgid "cover-from-description-mode"
16246msgstr "从分支描述获取附函的模式"
16247
d13389bf 16248#: builtin/log.c:1764
ddc12c42
JX
16249msgid "generate parts of a cover letter based on a branch's description"
16250msgstr "基于一个分支描述生成部分附函"
16251
d13389bf 16252#: builtin/log.c:1766
ef317cd5 16253msgid "Use [<prefix>] instead of [PATCH]"
07432cef 16254msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 16255
d13389bf 16256#: builtin/log.c:1769
ef317cd5 16257msgid "store resulting files in <dir>"
d9d56b23 16258msgstr "把结果文件存储在 <目录>"
ef317cd5 16259
d13389bf 16260#: builtin/log.c:1772
ef317cd5 16261msgid "don't strip/add [PATCH]"
07432cef 16262msgstr "不删除/添加 [PATCH]"
ef317cd5 16263
d13389bf 16264#: builtin/log.c:1775
ef317cd5 16265msgid "don't output binary diffs"
07432cef 16266msgstr "不输出二进制差异"
ef317cd5 16267
d13389bf 16268#: builtin/log.c:1777
89f80d72
JX
16269msgid "output all-zero hash in From header"
16270msgstr "在 From 头信息中输出全为零的哈希值"
16271
d13389bf 16272#: builtin/log.c:1779
ef317cd5 16273msgid "don't include a patch matching a commit upstream"
07432cef 16274msgstr "不包含已在上游提交中的补丁"
ef317cd5 16275
d13389bf 16276#: builtin/log.c:1781
ef317cd5 16277msgid "show patch format instead of default (patch + stat)"
07432cef 16278msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 16279
d13389bf 16280#: builtin/log.c:1783
ef317cd5 16281msgid "Messaging"
07432cef 16282msgstr "邮件发送"
ef317cd5 16283
d13389bf 16284#: builtin/log.c:1784
ef317cd5 16285msgid "header"
07432cef 16286msgstr "header"
ef317cd5 16287
d13389bf 16288#: builtin/log.c:1785
ef317cd5 16289msgid "add email header"
07432cef 16290msgstr "添加邮件头"
ef317cd5 16291
d13389bf 16292#: builtin/log.c:1786 builtin/log.c:1787
ef317cd5 16293msgid "email"
07432cef 16294msgstr "邮件地址"
ef317cd5 16295
d13389bf 16296#: builtin/log.c:1786
ef317cd5 16297msgid "add To: header"
07432cef 16298msgstr "添加收件人"
ef317cd5 16299
d13389bf 16300#: builtin/log.c:1787
ef317cd5 16301msgid "add Cc: header"
07432cef 16302msgstr "添加抄送"
ef317cd5 16303
d13389bf 16304#: builtin/log.c:1788
2e8451e8 16305msgid "ident"
d9d56b23 16306msgstr "标识"
2e8451e8 16307
d13389bf 16308#: builtin/log.c:1789
2e8451e8 16309msgid "set From address to <ident> (or committer ident if absent)"
4375c10e 16310msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
2e8451e8 16311
d13389bf 16312#: builtin/log.c:1791
ef317cd5 16313msgid "message-id"
d9d56b23 16314msgstr "邮件标识"
ef317cd5 16315
d13389bf 16316#: builtin/log.c:1792
ef317cd5 16317msgid "make first mail a reply to <message-id>"
d9d56b23 16318msgstr "使第一封邮件作为对 <邮件标识> 的回复"
ef317cd5 16319
d13389bf 16320#: builtin/log.c:1793 builtin/log.c:1796
ef317cd5 16321msgid "boundary"
07432cef 16322msgstr "边界"
ef317cd5 16323
d13389bf 16324#: builtin/log.c:1794
ef317cd5 16325msgid "attach the patch"
07432cef 16326msgstr "附件方式添加补丁"
ef317cd5 16327
d13389bf 16328#: builtin/log.c:1797
ef317cd5 16329msgid "inline the patch"
07432cef 16330msgstr "内联显示补丁"
ef317cd5 16331
d13389bf 16332#: builtin/log.c:1801
ef317cd5 16333msgid "enable message threading, styles: shallow, deep"
07432cef 16334msgstr "启用邮件线索,风格:浅,深"
ef317cd5 16335
d13389bf 16336#: builtin/log.c:1803
ef317cd5 16337msgid "signature"
07432cef 16338msgstr "签名"
ef317cd5 16339
d13389bf 16340#: builtin/log.c:1804
ef317cd5 16341msgid "add a signature"
07432cef 16342msgstr "添加一个签名"
ef317cd5 16343
d13389bf 16344#: builtin/log.c:1805
5b04ee3b
JX
16345msgid "base-commit"
16346msgstr "基线提交"
16347
d13389bf 16348#: builtin/log.c:1806
5b04ee3b
JX
16349msgid "add prerequisite tree info to the patch series"
16350msgstr "为补丁列表添加前置树信息"
16351
d13389bf 16352#: builtin/log.c:1809
6acbf033
JX
16353msgid "add a signature from a file"
16354msgstr "从文件添加一个签名"
16355
d13389bf 16356#: builtin/log.c:1810
ef317cd5 16357msgid "don't print the patch filenames"
07432cef 16358msgstr "不要打印补丁文件名"
ef317cd5 16359
d13389bf 16360#: builtin/log.c:1812
6937cb4e
JX
16361msgid "show progress while generating patches"
16362msgstr "在生成补丁时显示进度"
16363
d13389bf 16364#: builtin/log.c:1814
4c27fcb5
JX
16365msgid "show changes against <rev> in cover letter or single patch"
16366msgstr "在附函或单个补丁中显示和 <rev> 的差异"
16367
d13389bf 16368#: builtin/log.c:1817
4c27fcb5
JX
16369msgid "show changes against <refspec> in cover letter or single patch"
16370msgstr "在附函或单个补丁中显示和 <refspec> 的差异"
16371
d13389bf 16372#: builtin/log.c:1819
4c27fcb5
JX
16373msgid "percentage by which creation is weighted"
16374msgstr "创建权重的百分比"
16375
d13389bf 16376#: builtin/log.c:1905
a4f16749
JX
16377#, c-format
16378msgid "invalid ident line: %s"
16379msgstr "包含无效的身份标识:%s"
16380
d13389bf 16381#: builtin/log.c:1920
c1ac5258
JX
16382msgid "-n and -k are mutually exclusive"
16383msgstr "-n 和 -k 互斥"
c04f5ac3 16384
d13389bf 16385#: builtin/log.c:1922
c1ac5258
JX
16386msgid "--subject-prefix/--rfc and -k are mutually exclusive"
16387msgstr "--subject-prefix/--rfc 和 -k 互斥"
c04f5ac3 16388
d13389bf 16389#: builtin/log.c:1930
c04f5ac3
JX
16390msgid "--name-only does not make sense"
16391msgstr "--name-only 无意义"
16392
d13389bf 16393#: builtin/log.c:1932
c04f5ac3
JX
16394msgid "--name-status does not make sense"
16395msgstr "--name-status 无意义"
16396
d13389bf 16397#: builtin/log.c:1934
c04f5ac3
JX
16398msgid "--check does not make sense"
16399msgstr "--check 无意义"
16400
d13389bf
JX
16401#: builtin/log.c:1956
16402msgid "--stdout, --output, and --output-directory are mutually exclusive"
16403msgstr "--stdout、--output 和 --output-directory 是互斥的"
c04f5ac3 16404
d13389bf 16405#: builtin/log.c:2079
4c27fcb5
JX
16406msgid "--interdiff requires --cover-letter or single patch"
16407msgstr "--interdiff 需要 --cover-letter 或单一补丁"
16408
d13389bf 16409#: builtin/log.c:2083
4c27fcb5
JX
16410msgid "Interdiff:"
16411msgstr "版本间差异:"
16412
d13389bf 16413#: builtin/log.c:2084
4c27fcb5
JX
16414#, c-format
16415msgid "Interdiff against v%d:"
16416msgstr "对 v%d 的版本差异:"
16417
d13389bf 16418#: builtin/log.c:2090
4c27fcb5
JX
16419msgid "--creation-factor requires --range-diff"
16420msgstr "--creation-factor 需要 --range-diff"
16421
d13389bf 16422#: builtin/log.c:2094
4c27fcb5
JX
16423msgid "--range-diff requires --cover-letter or single patch"
16424msgstr "--range-diff 需要 --cover-letter 或单一补丁"
16425
d13389bf 16426#: builtin/log.c:2102
4c27fcb5
JX
16427msgid "Range-diff:"
16428msgstr "范围差异:"
16429
d13389bf 16430#: builtin/log.c:2103
4c27fcb5
JX
16431#, c-format
16432msgid "Range-diff against v%d:"
16433msgstr "对 v%d 的范围差异:"
16434
d13389bf 16435#: builtin/log.c:2114
6acbf033
JX
16436#, c-format
16437msgid "unable to read signature file '%s'"
16438msgstr "无法读取签名文件 '%s'"
16439
d13389bf 16440#: builtin/log.c:2150
6937cb4e
JX
16441msgid "Generating patches"
16442msgstr "生成补丁"
16443
d13389bf 16444#: builtin/log.c:2194
d46c5519 16445msgid "failed to create output files"
c04f5ac3
JX
16446msgstr "无法创建输出文件"
16447
d13389bf 16448#: builtin/log.c:2253
ef317cd5 16449msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 16450msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 16451
d13389bf 16452#: builtin/log.c:2307
c04f5ac3
JX
16453#, c-format
16454msgid ""
16455"Could not find a tracked remote branch, please specify <upstream> manually.\n"
d9d56b23 16456msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
c04f5ac3 16457
349ede6a 16458#: builtin/ls-files.c:471
814ff314
JX
16459msgid "git ls-files [<options>] [<file>...]"
16460msgstr "git ls-files [<选项>] [<文件>...]"
ef317cd5 16461
349ede6a 16462#: builtin/ls-files.c:527
ef317cd5 16463msgid "identify the file status with tags"
07432cef 16464msgstr "用标签标识文件的状态"
ef317cd5 16465
349ede6a 16466#: builtin/ls-files.c:529
ef317cd5 16467msgid "use lowercase letters for 'assume unchanged' files"
07432cef 16468msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 16469
349ede6a 16470#: builtin/ls-files.c:531
5809aa05
JX
16471msgid "use lowercase letters for 'fsmonitor clean' files"
16472msgstr "使用小写字母表示 'fsmonitor clean' 文件"
16473
349ede6a 16474#: builtin/ls-files.c:533
ef317cd5 16475msgid "show cached files in the output (default)"
07432cef 16476msgstr "显示缓存的文件(默认)"
ef317cd5 16477
349ede6a 16478#: builtin/ls-files.c:535
ef317cd5 16479msgid "show deleted files in the output"
07432cef 16480msgstr "显示已删除的文件"
ef317cd5 16481
349ede6a 16482#: builtin/ls-files.c:537
ef317cd5 16483msgid "show modified files in the output"
07432cef 16484msgstr "显示已修改的文件"
ef317cd5 16485
349ede6a 16486#: builtin/ls-files.c:539
ef317cd5 16487msgid "show other files in the output"
07432cef 16488msgstr "显示其它文件"
ef317cd5 16489
349ede6a 16490#: builtin/ls-files.c:541
ef317cd5 16491msgid "show ignored files in the output"
07432cef 16492msgstr "显示忽略的文件"
ef317cd5 16493
349ede6a 16494#: builtin/ls-files.c:544
ef317cd5 16495msgid "show staged contents' object name in the output"
07432cef 16496msgstr "显示暂存区内容的对象名称"
ef317cd5 16497
349ede6a 16498#: builtin/ls-files.c:546
ef317cd5 16499msgid "show files on the filesystem that need to be removed"
07432cef 16500msgstr "显示文件系统需要删除的文件"
ef317cd5 16501
349ede6a 16502#: builtin/ls-files.c:548
220c313c 16503msgid "show 'other' directories' names only"
07432cef 16504msgstr "只显示“其他”目录的名称"
ef317cd5 16505
349ede6a 16506#: builtin/ls-files.c:550
276ceeaa
JX
16507msgid "show line endings of files"
16508msgstr "显示文件换行符格式"
16509
349ede6a 16510#: builtin/ls-files.c:552
ef317cd5 16511msgid "don't show empty directories"
07432cef 16512msgstr "不显示空目录"
ef317cd5 16513
349ede6a 16514#: builtin/ls-files.c:555
ef317cd5 16515msgid "show unmerged files in the output"
07432cef 16516msgstr "显示未合并的文件"
ef317cd5 16517
349ede6a 16518#: builtin/ls-files.c:557
ef317cd5 16519msgid "show resolve-undo information"
07432cef 16520msgstr "显示 resolve-undo 信息"
ef317cd5 16521
349ede6a 16522#: builtin/ls-files.c:559
ef317cd5 16523msgid "skip files matching pattern"
d9488fea 16524msgstr "跳过和模式匹配的文件"
ef317cd5 16525
349ede6a 16526#: builtin/ls-files.c:562
ef317cd5 16527msgid "exclude patterns are read from <file>"
07432cef 16528msgstr "从 <文件> 中读取排除模式"
ef317cd5 16529
349ede6a 16530#: builtin/ls-files.c:565
ef317cd5 16531msgid "read additional per-directory exclude patterns in <file>"
07432cef 16532msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 16533
349ede6a 16534#: builtin/ls-files.c:567
ef317cd5 16535msgid "add the standard git exclusions"
07432cef 16536msgstr "添加标准的 git 排除"
ef317cd5 16537
349ede6a 16538#: builtin/ls-files.c:571
ef317cd5 16539msgid "make the output relative to the project top directory"
07432cef 16540msgstr "显示相对于顶级目录的文件名"
ef317cd5 16541
349ede6a 16542#: builtin/ls-files.c:574
a0b6b246
JX
16543msgid "recurse through submodules"
16544msgstr "在子模组中递归"
16545
349ede6a 16546#: builtin/ls-files.c:576
ef317cd5 16547msgid "if any <file> is not in the index, treat this as an error"
07432cef 16548msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 16549
349ede6a 16550#: builtin/ls-files.c:577
ef317cd5 16551msgid "tree-ish"
ddc12c42 16552msgstr "树对象"
ef317cd5 16553
349ede6a 16554#: builtin/ls-files.c:578
ef317cd5 16555msgid "pretend that paths removed since <tree-ish> are still present"
ddc12c42 16556msgstr "假装自从 <树对象> 之后删除的路径仍然存在"
ef317cd5 16557
349ede6a 16558#: builtin/ls-files.c:580
ef317cd5 16559msgid "show debugging data"
07432cef 16560msgstr "显示调试数据"
ef317cd5 16561
fd8cb379 16562#: builtin/ls-remote.c:9
276ceeaa
JX
16563msgid ""
16564"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
16565" [-q | --quiet] [--exit-code] [--get-url]\n"
16566" [--symref] [<repository> [<refs>...]]"
16567msgstr ""
16568"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
16569" [-q | --quiet] [--exit-code] [--get-url]\n"
16570" [--symref] [<仓库> [<引用>...]]"
16571
fd8cb379 16572#: builtin/ls-remote.c:59
276ceeaa
JX
16573msgid "do not print remote URL"
16574msgstr "不打印远程 URL"
16575
d13389bf 16576#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398
276ceeaa
JX
16577msgid "exec"
16578msgstr "exec"
16579
fd8cb379 16580#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
276ceeaa
JX
16581msgid "path of git-upload-pack on the remote host"
16582msgstr "远程主机上的 git-upload-pack 路径"
16583
fd8cb379 16584#: builtin/ls-remote.c:65
276ceeaa
JX
16585msgid "limit to tags"
16586msgstr "仅限于标签"
16587
fd8cb379 16588#: builtin/ls-remote.c:66
276ceeaa
JX
16589msgid "limit to heads"
16590msgstr "仅限于分支"
16591
fd8cb379 16592#: builtin/ls-remote.c:67
276ceeaa
JX
16593msgid "do not show peeled tags"
16594msgstr "不显示已解析的标签"
16595
fd8cb379 16596#: builtin/ls-remote.c:69
276ceeaa
JX
16597msgid "take url.<base>.insteadOf into account"
16598msgstr "参考 url.<base>.insteadOf 设置"
16599
d46c5519 16600#: builtin/ls-remote.c:72
276ceeaa
JX
16601msgid "exit with exit code 2 if no matching refs are found"
16602msgstr "若未找到匹配的引用则以退出码2退出"
16603
d46c5519 16604#: builtin/ls-remote.c:75
276ceeaa
JX
16605msgid "show underlying ref in addition to the object pointed by it"
16606msgstr "除了显示指向的对象外,显示指向的引用名"
16607
c1ac5258 16608#: builtin/ls-tree.c:30
ef317cd5 16609msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
ddc12c42 16610msgstr "git ls-tree [<选项>] <树对象> [<路径>...]"
ef317cd5 16611
c1ac5258 16612#: builtin/ls-tree.c:128
ef317cd5 16613msgid "only show trees"
07432cef 16614msgstr "只显示树"
ef317cd5 16615
c1ac5258 16616#: builtin/ls-tree.c:130
ef317cd5 16617msgid "recurse into subtrees"
07432cef 16618msgstr "递归到子树"
ef317cd5 16619
c1ac5258 16620#: builtin/ls-tree.c:132
ef317cd5 16621msgid "show trees when recursing"
07432cef 16622msgstr "当递归时显示树"
ef317cd5 16623
c1ac5258 16624#: builtin/ls-tree.c:135
ef317cd5 16625msgid "terminate entries with NUL byte"
4375c10e 16626msgstr "条目以 NUL 字符终止"
ef317cd5 16627
c1ac5258 16628#: builtin/ls-tree.c:136
ef317cd5 16629msgid "include object size"
07432cef 16630msgstr "包括对象大小"
ef317cd5 16631
c1ac5258 16632#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
ef317cd5 16633msgid "list only filenames"
07432cef 16634msgstr "只列出文件名"
ef317cd5 16635
c1ac5258 16636#: builtin/ls-tree.c:143
ef317cd5 16637msgid "use full path names"
07432cef 16638msgstr "使用文件的全路径"
ef317cd5 16639
c1ac5258 16640#: builtin/ls-tree.c:145
ef317cd5 16641msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 16642msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5 16643
a4f16749
JX
16644#: builtin/mailsplit.c:241
16645#, c-format
16646msgid "empty mbox: '%s'"
16647msgstr "空的 mbox:'%s'"
16648
349ede6a
JX
16649#: builtin/merge-base.c:32
16650msgid "git merge-base [-a | --all] <commit> <commit>..."
16651msgstr "git merge-base [-a | --all] <提交> <提交>..."
16652
16653#: builtin/merge-base.c:33
16654msgid "git merge-base [-a | --all] --octopus <commit>..."
16655msgstr "git merge-base [-a | --all] --octopus <提交>..."
16656
16657#: builtin/merge-base.c:34
16658msgid "git merge-base --independent <commit>..."
16659msgstr "git merge-base --independent <提交>..."
16660
16661#: builtin/merge-base.c:35
16662msgid "git merge-base --is-ancestor <commit> <commit>"
16663msgstr "git merge-base --is-ancestor <提交> <提交>"
16664
16665#: builtin/merge-base.c:36
16666msgid "git merge-base --fork-point <ref> [<commit>]"
16667msgstr "git merge-base --fork-point <引用> [<提交>]"
16668
16669#: builtin/merge-base.c:143
16670msgid "output all common ancestors"
16671msgstr "输出所有共同的祖先"
16672
16673#: builtin/merge-base.c:145
16674msgid "find ancestors for a single n-way merge"
16675msgstr "查找一个多路合并的祖先提交"
16676
16677#: builtin/merge-base.c:147
16678msgid "list revs not reachable from others"
16679msgstr "显示不能被其他访问到的版本"
16680
16681#: builtin/merge-base.c:149
16682msgid "is the first one ancestor of the other?"
16683msgstr "第一个是其他的祖先提交么?"
16684
16685#: builtin/merge-base.c:151
16686msgid "find where <commit> forked from reflog of <ref>"
16687msgstr "根据 <引用> 的引用日志查找 <提交> 的分叉点"
16688
16689#: builtin/merge-file.c:9
16690msgid ""
16691"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
16692"<orig-file> <file2>"
16693msgstr ""
16694"git merge-file [<选项>] [-L <名字1> [-L <初始名字> [-L <名字2>]]] <文件1> <初"
16695"始文件> <文件2>"
16696
16697#: builtin/merge-file.c:35
16698msgid "send results to standard output"
16699msgstr "将结果发送到标准输出"
16700
16701#: builtin/merge-file.c:36
16702msgid "use a diff3 based merge"
16703msgstr "使用基于 diff3 的合并"
16704
16705#: builtin/merge-file.c:37
16706msgid "for conflicts, use our version"
16707msgstr "如果冲突,使用我们的版本"
16708
16709#: builtin/merge-file.c:39
16710msgid "for conflicts, use their version"
16711msgstr "如果冲突,使用他们的版本"
16712
16713#: builtin/merge-file.c:41
16714msgid "for conflicts, use a union version"
16715msgstr "如果冲突,使用联合版本"
16716
16717#: builtin/merge-file.c:44
16718msgid "for conflicts, use this marker size"
16719msgstr "如果冲突,使用指定长度的标记"
16720
16721#: builtin/merge-file.c:45
16722msgid "do not warn about conflicts"
16723msgstr "不要警告冲突"
16724
16725#: builtin/merge-file.c:47
16726msgid "set labels for file1/orig-file/file2"
16727msgstr "为 文件1/初始文件/文件2 设置标签"
16728
16729#: builtin/merge-recursive.c:47
16730#, c-format
16731msgid "unknown option %s"
16732msgstr "未知选项 %s"
16733
16734#: builtin/merge-recursive.c:53
16735#, c-format
16736msgid "could not parse object '%s'"
16737msgstr "不能解析对象 '%s'"
16738
16739#: builtin/merge-recursive.c:57
16740#, c-format
16741msgid "cannot handle more than %d base. Ignoring %s."
16742msgid_plural "cannot handle more than %d bases. Ignoring %s."
16743msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
16744msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
16745
16746#: builtin/merge-recursive.c:65
16747msgid "not handling anything other than two heads merge."
16748msgstr "不能处理两个头合并之外的任何操作。"
16749
16750#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
16751#, c-format
16752msgid "could not resolve ref '%s'"
16753msgstr "无法解析引用 '%s'"
16754
16755#: builtin/merge-recursive.c:82
16756#, c-format
16757msgid "Merging %s with %s\n"
16758msgstr "合并 %s 和 %s\n"
16759
d13389bf 16760#: builtin/merge.c:57
814ff314
JX
16761msgid "git merge [<options>] [<commit>...]"
16762msgstr "git merge [<选项>] [<提交>...]"
ef317cd5 16763
d13389bf 16764#: builtin/merge.c:58
ef317cd5 16765msgid "git merge --abort"
07432cef 16766msgstr "git merge --abort"
ef317cd5 16767
d13389bf 16768#: builtin/merge.c:59
1a79b2f1
JX
16769msgid "git merge --continue"
16770msgstr "git merge --continue"
16771
d13389bf 16772#: builtin/merge.c:122
c04f5ac3
JX
16773msgid "switch `m' requires a value"
16774msgstr "开关 `m' 需要一个值"
16775
d13389bf 16776#: builtin/merge.c:145
06991777
JX
16777#, c-format
16778msgid "option `%s' requires a value"
16779msgstr "选项 `%s' 需要一个值"
16780
d13389bf 16781#: builtin/merge.c:198
c04f5ac3
JX
16782#, c-format
16783msgid "Could not find merge strategy '%s'.\n"
90e6ef53 16784msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 16785
d13389bf 16786#: builtin/merge.c:199
c04f5ac3
JX
16787#, c-format
16788msgid "Available strategies are:"
16789msgstr "可用的策略有:"
16790
d13389bf 16791#: builtin/merge.c:204
c04f5ac3
JX
16792#, c-format
16793msgid "Available custom strategies are:"
16794msgstr "可用的自定义策略有:"
16795
d13389bf 16796#: builtin/merge.c:255 builtin/pull.c:133
ef317cd5 16797msgid "do not show a diffstat at the end of the merge"
07432cef 16798msgstr "在合并的最后不显示差异统计"
ef317cd5 16799
d13389bf 16800#: builtin/merge.c:258 builtin/pull.c:136
ef317cd5 16801msgid "show a diffstat at the end of the merge"
07432cef 16802msgstr "在合并的最后显示差异统计"
ef317cd5 16803
d13389bf 16804#: builtin/merge.c:259 builtin/pull.c:139
ef317cd5 16805msgid "(synonym to --stat)"
07432cef 16806msgstr "(和 --stat 同义)"
ef317cd5 16807
d13389bf 16808#: builtin/merge.c:261 builtin/pull.c:142
ef317cd5 16809msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 16810msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 16811
d13389bf 16812#: builtin/merge.c:264 builtin/pull.c:148
ef317cd5 16813msgid "create a single commit instead of doing a merge"
07432cef 16814msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 16815
d13389bf 16816#: builtin/merge.c:266 builtin/pull.c:151
ef317cd5 16817msgid "perform a commit if the merge succeeds (default)"
07432cef 16818msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 16819
d13389bf 16820#: builtin/merge.c:268 builtin/pull.c:154
ef317cd5 16821msgid "edit message before committing"
07432cef 16822msgstr "在提交前编辑提交说明"
ef317cd5 16823
d13389bf 16824#: builtin/merge.c:270
ef317cd5 16825msgid "allow fast-forward (default)"
07432cef 16826msgstr "允许快进(默认)"
ef317cd5 16827
d13389bf 16828#: builtin/merge.c:272 builtin/pull.c:161
ef317cd5 16829msgid "abort if fast-forward is not possible"
07432cef 16830msgstr "如果不能快进就放弃合并"
ef317cd5 16831
d13389bf 16832#: builtin/merge.c:276 builtin/pull.c:164
5c57d762 16833msgid "verify that the named commit has a valid GPG signature"
1003b3a5
JX
16834msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
16835
d13389bf
JX
16836#: builtin/merge.c:277 builtin/notes.c:787 builtin/pull.c:168
16837#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114
ef317cd5 16838msgid "strategy"
07432cef 16839msgstr "策略"
ef317cd5 16840
d13389bf 16841#: builtin/merge.c:278 builtin/pull.c:169
ef317cd5 16842msgid "merge strategy to use"
07432cef 16843msgstr "要使用的合并策略"
ef317cd5 16844
d13389bf 16845#: builtin/merge.c:279 builtin/pull.c:172
ef317cd5 16846msgid "option=value"
07432cef 16847msgstr "option=value"
ef317cd5 16848
d13389bf 16849#: builtin/merge.c:280 builtin/pull.c:173
ef317cd5 16850msgid "option for selected merge strategy"
07432cef 16851msgstr "所选的合并策略的选项"
ef317cd5 16852
d13389bf 16853#: builtin/merge.c:282
ef317cd5 16854msgid "merge commit message (for a non-fast-forward merge)"
07432cef 16855msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 16856
d13389bf 16857#: builtin/merge.c:289
ef317cd5 16858msgid "abort the current in-progress merge"
07432cef 16859msgstr "放弃当前正在进行的合并"
ef317cd5 16860
a6cd2cc4 16861#
d13389bf 16862#: builtin/merge.c:291
a6cd2cc4
JX
16863msgid "--abort but leave index and working tree alone"
16864msgstr "--abort,但是保留索引和工作区"
16865
d13389bf 16866#: builtin/merge.c:293
1a79b2f1
JX
16867msgid "continue the current in-progress merge"
16868msgstr "继续当前正在进行的合并"
16869
d13389bf 16870#: builtin/merge.c:295 builtin/pull.c:180
5b04ee3b
JX
16871msgid "allow merging unrelated histories"
16872msgstr "允许合并不相关的历史"
16873
d13389bf 16874#: builtin/merge.c:302
a5cd71ca
JX
16875msgid "bypass pre-merge-commit and commit-msg hooks"
16876msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"
6937cb4e 16877
d13389bf 16878#: builtin/merge.c:319
c04f5ac3 16879msgid "could not run stash."
a4f16749 16880msgstr "不能运行贮藏。"
c04f5ac3 16881
d13389bf 16882#: builtin/merge.c:324
c04f5ac3 16883msgid "stash failed"
a4f16749 16884msgstr "贮藏失败"
c04f5ac3 16885
d13389bf 16886#: builtin/merge.c:329
c04f5ac3
JX
16887#, c-format
16888msgid "not a valid object: %s"
16889msgstr "不是一个有效对象:%s"
16890
d13389bf 16891#: builtin/merge.c:351 builtin/merge.c:368
c04f5ac3
JX
16892msgid "read-tree failed"
16893msgstr "读取树失败"
16894
90e6ef53 16895# 译者:注意保持前导空格
d13389bf 16896#: builtin/merge.c:398
c04f5ac3
JX
16897msgid " (nothing to squash)"
16898msgstr " (无可压缩)"
16899
d13389bf 16900#: builtin/merge.c:409
c04f5ac3
JX
16901#, c-format
16902msgid "Squash commit -- not updating HEAD\n"
16903msgstr "压缩提交 -- 未更新 HEAD\n"
16904
d13389bf 16905#: builtin/merge.c:459
c04f5ac3
JX
16906#, c-format
16907msgid "No merge message -- not updating HEAD\n"
16908msgstr "无合并信息 -- 未更新 HEAD\n"
16909
d13389bf 16910#: builtin/merge.c:510
c04f5ac3
JX
16911#, c-format
16912msgid "'%s' does not point to a commit"
16913msgstr "'%s' 没有指向一个提交"
16914
d13389bf 16915#: builtin/merge.c:597
c04f5ac3
JX
16916#, c-format
16917msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 16918msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 16919
d13389bf 16920#: builtin/merge.c:723
c04f5ac3 16921msgid "Not handling anything other than two heads merge."
29004bbb 16922msgstr "未处理两个头合并之外的任何操作。"
c04f5ac3 16923
d13389bf 16924#: builtin/merge.c:736
c04f5ac3
JX
16925#, c-format
16926msgid "Unknown option for merge-recursive: -X%s"
16927msgstr "merge-recursive 的未知选项:-X%s"
16928
d13389bf 16929#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209
c04f5ac3
JX
16930#, c-format
16931msgid "unable to write %s"
16932msgstr "不能写 %s"
16933
d13389bf 16934#: builtin/merge.c:807
c04f5ac3
JX
16935#, c-format
16936msgid "Could not read from '%s'"
16937msgstr "不能从 '%s' 读取"
16938
d13389bf 16939#: builtin/merge.c:816
c04f5ac3
JX
16940#, c-format
16941msgid "Not committing merge; use 'git commit' to complete the merge.\n"
16942msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
16943
d13389bf 16944#: builtin/merge.c:822
c04f5ac3
JX
16945msgid ""
16946"Please enter a commit message to explain why this merge is necessary,\n"
16947"especially if it merges an updated upstream into a topic branch.\n"
16948"\n"
c04f5ac3
JX
16949msgstr ""
16950"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
16951"合并到主题分支。\n"
16952"\n"
c04f5ac3 16953
d13389bf 16954#: builtin/merge.c:827
d46c5519 16955msgid "An empty message aborts the commit.\n"
5b533632 16956msgstr "空的提交说明会终止提交。\n"
d46c5519 16957
d13389bf 16958#: builtin/merge.c:830
d46c5519
JX
16959#, c-format
16960msgid ""
16961"Lines starting with '%c' will be ignored, and an empty message aborts\n"
16962"the commit.\n"
5b533632 16963msgstr "以 '%c' 开始的行将被忽略,而空的提交说明将终止提交。\n"
d46c5519 16964
d13389bf 16965#: builtin/merge.c:883
c04f5ac3
JX
16966msgid "Empty commit message."
16967msgstr "空提交信息。"
16968
d13389bf 16969#: builtin/merge.c:898
c04f5ac3
JX
16970#, c-format
16971msgid "Wonderful.\n"
16972msgstr "太棒了。\n"
16973
d13389bf 16974#: builtin/merge.c:959
c04f5ac3
JX
16975#, c-format
16976msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
16977msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
16978
d13389bf 16979#: builtin/merge.c:998
c04f5ac3 16980msgid "No current branch."
90e6ef53 16981msgstr "没有当前分支。"
c04f5ac3 16982
d13389bf 16983#: builtin/merge.c:1000
c04f5ac3 16984msgid "No remote for the current branch."
160fb2b2 16985msgstr "当前分支没有对应的远程仓库。"
c04f5ac3 16986
d13389bf 16987#: builtin/merge.c:1002
c04f5ac3 16988msgid "No default upstream defined for the current branch."
90e6ef53 16989msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 16990
d13389bf 16991#: builtin/merge.c:1007
170e9899 16992#, c-format
2e8451e8
JX
16993msgid "No remote-tracking branch for %s from %s"
16994msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 16995
d13389bf 16996#: builtin/merge.c:1064
5c57d762
JX
16997#, c-format
16998msgid "Bad value '%s' in environment '%s'"
9a4b694c 16999msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
5c57d762 17000
d13389bf 17001#: builtin/merge.c:1167
5c57d762
JX
17002#, c-format
17003msgid "not something we can merge in %s: %s"
17004msgstr "不能在 %s 中合并:%s"
17005
d13389bf 17006#: builtin/merge.c:1201
5c57d762
JX
17007msgid "not something we can merge"
17008msgstr "不能合并"
17009
d13389bf 17010#: builtin/merge.c:1311
1a79b2f1
JX
17011msgid "--abort expects no arguments"
17012msgstr "--abort 不带参数"
17013
d13389bf 17014#: builtin/merge.c:1315
c04f5ac3 17015msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 17016msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 17017
d13389bf 17018#: builtin/merge.c:1333
a6cd2cc4
JX
17019msgid "--quit expects no arguments"
17020msgstr "--quit 不带参数"
17021
d13389bf 17022#: builtin/merge.c:1346
1a79b2f1
JX
17023msgid "--continue expects no arguments"
17024msgstr "--continue 不带参数"
17025
d13389bf 17026#: builtin/merge.c:1350
1a79b2f1
JX
17027msgid "There is no merge in progress (MERGE_HEAD missing)."
17028msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
17029
d13389bf 17030#: builtin/merge.c:1366
c04f5ac3
JX
17031msgid ""
17032"You have not concluded your merge (MERGE_HEAD exists).\n"
220c313c 17033"Please, commit your changes before you merge."
c04f5ac3
JX
17034msgstr ""
17035"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 17036"请在合并前先提交您的修改。"
c04f5ac3 17037
d13389bf 17038#: builtin/merge.c:1373
c04f5ac3
JX
17039msgid ""
17040"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
220c313c 17041"Please, commit your changes before you merge."
c04f5ac3
JX
17042msgstr ""
17043"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 17044"请在合并前先提交您的修改。"
c04f5ac3 17045
d13389bf 17046#: builtin/merge.c:1376
c04f5ac3
JX
17047msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
17048msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
17049
d13389bf 17050#: builtin/merge.c:1390
c04f5ac3 17051msgid "You cannot combine --squash with --no-ff."
a6cd2cc4 17052msgstr "您不能将 --squash 和 --no-ff 组合使用。"
c04f5ac3 17053
d13389bf 17054#: builtin/merge.c:1392
a6cd2cc4
JX
17055msgid "You cannot combine --squash with --commit."
17056msgstr "您不能将 --squash 和 --commit 组合使用。"
17057
d13389bf 17058#: builtin/merge.c:1408
c04f5ac3 17059msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 17060msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 17061
d13389bf 17062#: builtin/merge.c:1425
c04f5ac3
JX
17063msgid "Squash commit into empty head not supported yet"
17064msgstr "尚不支持到空分支的压缩提交"
17065
d13389bf 17066#: builtin/merge.c:1427
c04f5ac3
JX
17067msgid "Non-fast-forward commit does not make sense into an empty head"
17068msgstr "到空分支的非快进式提交没有意义"
17069
d13389bf 17070#: builtin/merge.c:1432
2e8451e8
JX
17071#, c-format
17072msgid "%s - not something we can merge"
17073msgstr "%s - 不能被合并"
17074
d13389bf 17075#: builtin/merge.c:1434
7aea43ff
JX
17076msgid "Can merge only exactly one commit into empty head"
17077msgstr "只能将一个提交合并到空分支上"
17078
d13389bf 17079#: builtin/merge.c:1515
5b04ee3b
JX
17080msgid "refusing to merge unrelated histories"
17081msgstr "拒绝合并无关的历史"
17082
d13389bf 17083#: builtin/merge.c:1524
6937cb4e 17084msgid "Already up to date."
5c57d762
JX
17085msgstr "已经是最新的。"
17086
d13389bf 17087#: builtin/merge.c:1534
c04f5ac3
JX
17088#, c-format
17089msgid "Updating %s..%s\n"
17090msgstr "更新 %s..%s\n"
17091
d13389bf 17092#: builtin/merge.c:1580
c04f5ac3
JX
17093#, c-format
17094msgid "Trying really trivial in-index merge...\n"
90e6ef53 17095msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 17096
d13389bf 17097#: builtin/merge.c:1587
c04f5ac3
JX
17098#, c-format
17099msgid "Nope.\n"
17100msgstr "无。\n"
17101
d13389bf 17102#: builtin/merge.c:1612
6937cb4e 17103msgid "Already up to date. Yeeah!"
5c57d762
JX
17104msgstr "已经是最新的。耶!"
17105
d13389bf 17106#: builtin/merge.c:1618
c04f5ac3 17107msgid "Not possible to fast-forward, aborting."
1aabac65 17108msgstr "无法快进,终止。"
c04f5ac3 17109
d13389bf 17110#: builtin/merge.c:1646 builtin/merge.c:1711
c04f5ac3
JX
17111#, c-format
17112msgid "Rewinding the tree to pristine...\n"
17113msgstr "将树回滚至原始状态...\n"
17114
d13389bf 17115#: builtin/merge.c:1650
c04f5ac3
JX
17116#, c-format
17117msgid "Trying merge strategy %s...\n"
17118msgstr "尝试合并策略 %s...\n"
17119
d13389bf 17120#: builtin/merge.c:1702
c04f5ac3
JX
17121#, c-format
17122msgid "No merge strategy handled the merge.\n"
17123msgstr "没有合并策略处理此合并。\n"
17124
d13389bf 17125#: builtin/merge.c:1704
c04f5ac3
JX
17126#, c-format
17127msgid "Merge with strategy %s failed.\n"
17128msgstr "使用策略 %s 合并失败。\n"
17129
d13389bf 17130#: builtin/merge.c:1713
c04f5ac3
JX
17131#, c-format
17132msgid "Using the %s to prepare resolving by hand.\n"
17133msgstr "使用 %s 以准备手工解决。\n"
17134
d13389bf 17135#: builtin/merge.c:1727
c04f5ac3
JX
17136#, c-format
17137msgid "Automatic merge went well; stopped before committing as requested\n"
17138msgstr "自动合并进展顺利,按要求在提交前停止\n"
17139
349ede6a
JX
17140#: builtin/mktree.c:66
17141msgid "git mktree [-z] [--missing] [--batch]"
17142msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 17143
c1ac5258 17144#: builtin/mktree.c:154
ef317cd5 17145msgid "input is NUL terminated"
07432cef 17146msgstr "输入以 NUL 字符终止"
c04f5ac3 17147
06991777 17148#: builtin/mktree.c:155 builtin/write-tree.c:26
ef317cd5 17149msgid "allow missing objects"
07432cef 17150msgstr "允许丢失的对象"
c04f5ac3 17151
c1ac5258 17152#: builtin/mktree.c:156
ef317cd5 17153msgid "allow creation of more than one tree"
07432cef 17154msgstr "允许创建一个以上的树"
c04f5ac3 17155
d46c5519 17156#: builtin/multi-pack-index.c:9
a6cd2cc4 17157msgid ""
ddc12c42
JX
17158"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
17159"size=<size>)"
2b472aae
JX
17160msgstr ""
17161"git multi-pack-index [<选项>] (write|verify|expire|repack --batch-size=<大小"
17162">)"
4c27fcb5 17163
ddc12c42 17164#: builtin/multi-pack-index.c:26
4c27fcb5
JX
17165msgid "object directory containing set of packfile and pack-index pairs"
17166msgstr "包含成对包文件和包索引的对象目录"
17167
ddc12c42 17168#: builtin/multi-pack-index.c:29
a6cd2cc4
JX
17169msgid ""
17170"during repack, collect pack-files of smaller size into a batch that is "
17171"larger than this size"
17172msgstr "在 repack 期间,将较小尺寸的包文件收集到大于此大小的批次中"
17173
349ede6a 17174#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25
4c27fcb5
JX
17175msgid "too many arguments"
17176msgstr "太多参数"
17177
ddc12c42 17178#: builtin/multi-pack-index.c:60
a6cd2cc4
JX
17179msgid "--batch-size option is only for 'repack' subcommand"
17180msgstr "--batch-size 选项仅用于 'repack' 子命令"
17181
ddc12c42 17182#: builtin/multi-pack-index.c:69
4c27fcb5 17183#, c-format
a6cd2cc4
JX
17184msgid "unrecognized subcommand: %s"
17185msgstr "未识别的子命令:%s"
4c27fcb5 17186
06991777 17187#: builtin/mv.c:18
814ff314
JX
17188msgid "git mv [<options>] <source>... <destination>"
17189msgstr "git mv [<选项>] <源>... <目标>"
c04f5ac3 17190
06991777 17191#: builtin/mv.c:83
220c313c
JX
17192#, c-format
17193msgid "Directory %s is in index and no submodule?"
17194msgstr "目录 %s 在索引中并且不是子模组?"
17195
06991777 17196#: builtin/mv.c:85
220c313c 17197msgid "Please stage your changes to .gitmodules or stash them to proceed"
a4f16749 17198msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
220c313c 17199
06991777 17200#: builtin/mv.c:103
220c313c
JX
17201#, c-format
17202msgid "%.*s is in index"
17203msgstr "%.*s 在索引中"
17204
06991777 17205#: builtin/mv.c:125
ef317cd5 17206msgid "force move/rename even if target exists"
07432cef 17207msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 17208
06991777 17209#: builtin/mv.c:127
ef317cd5 17210msgid "skip move/rename errors"
07432cef 17211msgstr "跳过移动/重命名错误"
c04f5ac3 17212
d9488fea 17213#: builtin/mv.c:170
220c313c
JX
17214#, c-format
17215msgid "destination '%s' is not a directory"
17216msgstr "目标 '%s' 不是一个目录"
17217
d9488fea 17218#: builtin/mv.c:181
c04f5ac3
JX
17219#, c-format
17220msgid "Checking rename of '%s' to '%s'\n"
17221msgstr "检查 '%s' 到 '%s' 的重命名\n"
17222
d9488fea 17223#: builtin/mv.c:185
c04f5ac3
JX
17224msgid "bad source"
17225msgstr "坏的源"
17226
d9488fea 17227#: builtin/mv.c:188
c04f5ac3
JX
17228msgid "can not move directory into itself"
17229msgstr "不能将目录移动到自身"
17230
d9488fea 17231#: builtin/mv.c:191
c04f5ac3
JX
17232msgid "cannot move directory over file"
17233msgstr "不能将目录移动到文件"
17234
d9488fea 17235#: builtin/mv.c:200
c04f5ac3
JX
17236msgid "source directory is empty"
17237msgstr "源目录为空"
17238
d9488fea 17239#: builtin/mv.c:225
c04f5ac3
JX
17240msgid "not under version control"
17241msgstr "不在版本控制之下"
17242
06991777 17243#: builtin/mv.c:227
d9488fea
JX
17244msgid "conflicted"
17245msgstr "冲突"
17246
17247#: builtin/mv.c:230
c04f5ac3
JX
17248msgid "destination exists"
17249msgstr "目标已存在"
17250
d9488fea 17251#: builtin/mv.c:238
c04f5ac3
JX
17252#, c-format
17253msgid "overwriting '%s'"
17254msgstr "覆盖 '%s'"
17255
d9488fea 17256#: builtin/mv.c:241
c04f5ac3
JX
17257msgid "Cannot overwrite"
17258msgstr "不能覆盖"
17259
d9488fea 17260#: builtin/mv.c:244
c04f5ac3
JX
17261msgid "multiple sources for the same target"
17262msgstr "同一目标具有多个源"
17263
d9488fea 17264#: builtin/mv.c:246
cfff71a9
JX
17265msgid "destination directory does not exist"
17266msgstr "目标目录不存在"
17267
d9488fea 17268#: builtin/mv.c:253
c04f5ac3
JX
17269#, c-format
17270msgid "%s, source=%s, destination=%s"
17271msgstr "%s,源=%s,目标=%s"
17272
d9488fea 17273#: builtin/mv.c:274
c04f5ac3
JX
17274#, c-format
17275msgid "Renaming %s to %s\n"
17276msgstr "重命名 %s 至 %s\n"
17277
d13389bf 17278#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484
c04f5ac3
JX
17279#, c-format
17280msgid "renaming '%s' failed"
17281msgstr "重命名 '%s' 失败"
17282
2b472aae 17283#: builtin/name-rev.c:465
814ff314
JX
17284msgid "git name-rev [<options>] <commit>..."
17285msgstr "git name-rev [<选项>] <提交>..."
ef317cd5 17286
2b472aae 17287#: builtin/name-rev.c:466
814ff314
JX
17288msgid "git name-rev [<options>] --all"
17289msgstr "git name-rev [<选项>] --all"
ef317cd5 17290
2b472aae 17291#: builtin/name-rev.c:467
814ff314
JX
17292msgid "git name-rev [<options>] --stdin"
17293msgstr "git name-rev [<选项>] --stdin"
ef317cd5 17294
2b472aae 17295#: builtin/name-rev.c:524
d9488fea
JX
17296msgid "print only ref-based names (no object names)"
17297msgstr "只打印基于引用的名称(非对象名)"
ef317cd5 17298
2b472aae 17299#: builtin/name-rev.c:525
ef317cd5 17300msgid "only use tags to name the commits"
55a16ee4 17301msgstr "只使用标签来命名提交"
ef317cd5 17302
2b472aae 17303#: builtin/name-rev.c:527
ef317cd5 17304msgid "only use refs matching <pattern>"
07432cef 17305msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 17306
2b472aae 17307#: builtin/name-rev.c:529
87cb7997
JX
17308msgid "ignore refs matching <pattern>"
17309msgstr "忽略和 <模式> 相匹配的引用"
17310
2b472aae 17311#: builtin/name-rev.c:531
ef317cd5 17312msgid "list all commits reachable from all refs"
07432cef 17313msgstr "列出可以从所有引用访问的提交"
ef317cd5 17314
2b472aae 17315#: builtin/name-rev.c:532
ef317cd5 17316msgid "read from stdin"
07432cef 17317msgstr "从标准输入读取"
ef317cd5 17318
2b472aae 17319#: builtin/name-rev.c:533
90314792
JX
17320msgid "allow to print `undefined` names (default)"
17321msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 17322
2b472aae 17323#: builtin/name-rev.c:539
2e8451e8 17324msgid "dereference tags in the input (internal use)"
55a16ee4 17325msgstr "反向解析输入中的标签(内部使用)"
2e8451e8 17326
c1ac5258 17327#: builtin/notes.c:28
814ff314 17328msgid "git notes [--ref <notes-ref>] [list [<object>]]"
07432cef 17329msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 17330
c1ac5258 17331#: builtin/notes.c:29
ef317cd5 17332msgid ""
814ff314 17333"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
04cb2f28 17334"| (-c | -C) <object>] [<object>]"
ef317cd5 17335msgstr ""
04cb2f28
JX
17336"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
17337"| (-c | -C) <对象>] [<对象>]"
ef317cd5 17338
c1ac5258 17339#: builtin/notes.c:30
814ff314 17340msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
07432cef 17341msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 17342
c1ac5258 17343#: builtin/notes.c:31
ef317cd5 17344msgid ""
814ff314 17345"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
04cb2f28 17346"(-c | -C) <object>] [<object>]"
ef317cd5 17347msgstr ""
04cb2f28
JX
17348"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
17349"(-c | -C) <对象>] [<对象>]"
ef317cd5 17350
c1ac5258 17351#: builtin/notes.c:32
814ff314 17352msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
04cb2f28 17353msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
ef317cd5 17354
c1ac5258 17355#: builtin/notes.c:33
814ff314 17356msgid "git notes [--ref <notes-ref>] show [<object>]"
07432cef 17357msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 17358
c1ac5258 17359#: builtin/notes.c:34
ef317cd5 17360msgid ""
814ff314 17361"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
07432cef 17362msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 17363
c1ac5258 17364#: builtin/notes.c:35
ef317cd5 17365msgid "git notes merge --commit [-v | -q]"
07432cef 17366msgstr "git notes merge --commit [-v | -q]"
ef317cd5 17367
c1ac5258 17368#: builtin/notes.c:36
ef317cd5 17369msgid "git notes merge --abort [-v | -q]"
07432cef 17370msgstr "git notes merge --abort [-v | -q]"
ef317cd5 17371
c1ac5258 17372#: builtin/notes.c:37
814ff314 17373msgid "git notes [--ref <notes-ref>] remove [<object>...]"
07432cef 17374msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 17375
c1ac5258 17376#: builtin/notes.c:38
5809aa05
JX
17377msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
17378msgstr "git notes [--ref <注解引用>] prune [-n] [-v]"
ef317cd5 17379
c1ac5258 17380#: builtin/notes.c:39
814ff314 17381msgid "git notes [--ref <notes-ref>] get-ref"
07432cef 17382msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 17383
c1ac5258 17384#: builtin/notes.c:44
ef317cd5 17385msgid "git notes [list [<object>]]"
07432cef 17386msgstr "git notes [list [<对象>]]"
ef317cd5 17387
c1ac5258 17388#: builtin/notes.c:49
ef317cd5 17389msgid "git notes add [<options>] [<object>]"
07432cef 17390msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 17391
c1ac5258 17392#: builtin/notes.c:54
ef317cd5 17393msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 17394msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 17395
c1ac5258 17396#: builtin/notes.c:55
ef317cd5 17397msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 17398msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 17399
c1ac5258 17400#: builtin/notes.c:60
ef317cd5 17401msgid "git notes append [<options>] [<object>]"
07432cef 17402msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 17403
c1ac5258 17404#: builtin/notes.c:65
ef317cd5 17405msgid "git notes edit [<object>]"
07432cef 17406msgstr "git notes edit [<对象>]"
ef317cd5 17407
c1ac5258 17408#: builtin/notes.c:70
ef317cd5 17409msgid "git notes show [<object>]"
07432cef 17410msgstr "git notes show [<对象>]"
ef317cd5 17411
c1ac5258 17412#: builtin/notes.c:75
814ff314 17413msgid "git notes merge [<options>] <notes-ref>"
07432cef 17414msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 17415
c1ac5258 17416#: builtin/notes.c:76
ef317cd5 17417msgid "git notes merge --commit [<options>]"
07432cef 17418msgstr "git notes merge --commit [<选项>]"
ef317cd5 17419
c1ac5258 17420#: builtin/notes.c:77
ef317cd5 17421msgid "git notes merge --abort [<options>]"
07432cef 17422msgstr "git notes merge --abort [<选项>]"
ef317cd5 17423
c1ac5258 17424#: builtin/notes.c:82
ef317cd5 17425msgid "git notes remove [<object>]"
07432cef 17426msgstr "git notes remove [<对象>]"
ef317cd5 17427
c1ac5258 17428#: builtin/notes.c:87
ef317cd5 17429msgid "git notes prune [<options>]"
07432cef 17430msgstr "git notes prune [<选项>]"
ef317cd5 17431
c1ac5258 17432#: builtin/notes.c:92
ef317cd5 17433msgid "git notes get-ref"
07432cef 17434msgstr "git notes get-ref"
ef317cd5 17435
c1ac5258 17436#: builtin/notes.c:97
5c57d762
JX
17437msgid "Write/edit the notes for the following object:"
17438msgstr "为下面的对象写/编辑说明:"
17439
c1ac5258 17440#: builtin/notes.c:150
c04f5ac3
JX
17441#, c-format
17442msgid "unable to start 'show' for object '%s'"
17443msgstr "不能为对象 '%s' 开始 'show'"
17444
c1ac5258 17445#: builtin/notes.c:154
a77c07d9
JX
17446msgid "could not read 'show' output"
17447msgstr "不能读取 'show' 的输出"
c04f5ac3 17448
c1ac5258 17449#: builtin/notes.c:162
c04f5ac3
JX
17450#, c-format
17451msgid "failed to finish 'show' for object '%s'"
17452msgstr "无法为对象 '%s' 完成 'show'"
17453
c1ac5258 17454#: builtin/notes.c:197
a0b6b246 17455msgid "please supply the note contents using either -m or -F option"
c04f5ac3
JX
17456msgstr "请通过 -m 或 -F 选项为注解提供内容"
17457
c1ac5258 17458#: builtin/notes.c:206
c04f5ac3
JX
17459msgid "unable to write note object"
17460msgstr "不能写注解对象"
17461
c1ac5258 17462#: builtin/notes.c:208
c04f5ac3 17463#, c-format
a0b6b246 17464msgid "the note contents have been left in %s"
220c313c 17465msgstr "注解内容被留在 %s 中"
c04f5ac3 17466
349ede6a 17467#: builtin/notes.c:242 builtin/tag.c:533
c04f5ac3
JX
17468#, c-format
17469msgid "could not open or read '%s'"
17470msgstr "不能打开或读取 '%s'"
17471
4c27fcb5 17472#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
06991777
JX
17473#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
17474#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
a0b6b246
JX
17475#, c-format
17476msgid "failed to resolve '%s' as a valid ref."
17477msgstr "无法解析 '%s' 为一个有效引用。"
17478
4c27fcb5 17479#: builtin/notes.c:265
c04f5ac3 17480#, c-format
a0b6b246 17481msgid "failed to read object '%s'."
c1ac5258 17482msgstr "读取对象 '%s' 失败。"
c04f5ac3 17483
4c27fcb5 17484#: builtin/notes.c:268
6c94aba5 17485#, c-format
a0b6b246
JX
17486msgid "cannot read note data from non-blob object '%s'."
17487msgstr "不能从非数据对象 '%s' 中读取注解数据。"
17488
4c27fcb5 17489#: builtin/notes.c:309
a0b6b246
JX
17490#, c-format
17491msgid "malformed input line: '%s'."
fd8cb379 17492msgstr "格式错误的输入行:'%s'。"
a0b6b246 17493
4c27fcb5 17494#: builtin/notes.c:324
a0b6b246
JX
17495#, c-format
17496msgid "failed to copy notes from '%s' to '%s'"
17497msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
6c94aba5 17498
a4f16749
JX
17499#. TRANSLATORS: the first %s will be replaced by a git
17500#. notes command: 'add', 'merge', 'remove', etc.
17501#.
4c27fcb5 17502#: builtin/notes.c:356
a0b6b246
JX
17503#, c-format
17504msgid "refusing to %s notes in %s (outside of refs/notes/)"
17505msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
17506
06991777
JX
17507#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
17508#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
17509#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
c04f5ac3
JX
17510msgid "too many parameters"
17511msgstr "参数太多"
17512
06991777 17513#: builtin/notes.c:389 builtin/notes.c:678
c04f5ac3 17514#, c-format
a0b6b246 17515msgid "no note found for object %s."
c04f5ac3
JX
17516msgstr "未发现对象 %s 的注解。"
17517
06991777 17518#: builtin/notes.c:410 builtin/notes.c:576
ef317cd5 17519msgid "note contents as a string"
07432cef 17520msgstr "注解内容作为一个字符串"
ef317cd5 17521
06991777 17522#: builtin/notes.c:413 builtin/notes.c:579
ef317cd5 17523msgid "note contents in a file"
07432cef 17524msgstr "注解内容到一个文件中"
ef317cd5 17525
06991777 17526#: builtin/notes.c:416 builtin/notes.c:582
ef317cd5 17527msgid "reuse and edit specified note object"
07432cef 17528msgstr "重用和编辑指定的注解对象"
ef317cd5 17529
06991777 17530#: builtin/notes.c:419 builtin/notes.c:585
ef317cd5 17531msgid "reuse specified note object"
07432cef 17532msgstr "重用指定的注解对象"
ef317cd5 17533
06991777 17534#: builtin/notes.c:422 builtin/notes.c:588
04cb2f28
JX
17535msgid "allow storing empty note"
17536msgstr "允许保存空白注释"
17537
06991777 17538#: builtin/notes.c:423 builtin/notes.c:496
ef317cd5 17539msgid "replace existing notes"
07432cef 17540msgstr "替换已存在的注解"
ef317cd5 17541
4c27fcb5 17542#: builtin/notes.c:448
c04f5ac3
JX
17543#, c-format
17544msgid ""
17545"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
17546"existing notes"
17547msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
17548
06991777 17549#: builtin/notes.c:463 builtin/notes.c:544
c04f5ac3
JX
17550#, c-format
17551msgid "Overwriting existing notes for object %s\n"
17552msgstr "覆盖对象 %s 现存注解\n"
17553
06991777 17554#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
04cb2f28
JX
17555#, c-format
17556msgid "Removing note for object %s\n"
17557msgstr "删除对象 %s 的注解\n"
17558
06991777 17559#: builtin/notes.c:497
ef317cd5 17560msgid "read objects from stdin"
07432cef 17561msgstr "从标准输入读取对象"
ef317cd5 17562
06991777 17563#: builtin/notes.c:499
ef317cd5 17564msgid "load rewriting config for <command> (implies --stdin)"
07432cef 17565msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 17566
06991777 17567#: builtin/notes.c:517
c04f5ac3
JX
17568msgid "too few parameters"
17569msgstr "参数太少"
17570
06991777 17571#: builtin/notes.c:538
c04f5ac3
JX
17572#, c-format
17573msgid ""
17574"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
17575"existing notes"
17576msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
17577
06991777 17578#: builtin/notes.c:550
c04f5ac3 17579#, c-format
a0b6b246 17580msgid "missing notes on source object %s. Cannot copy."
c04f5ac3
JX
17581msgstr "源对象 %s 缺少注解。不能拷贝。"
17582
06991777 17583#: builtin/notes.c:603
ef317cd5
JX
17584#, c-format
17585msgid ""
17586"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
17587"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
17588msgstr ""
17589"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
17590"请换用 'git notes add -f -m/-F/-c/-C'。\n"
17591
06991777 17592#: builtin/notes.c:698
a0b6b246 17593msgid "failed to delete ref NOTES_MERGE_PARTIAL"
c1ac5258 17594msgstr "删除引用 NOTES_MERGE_PARTIAL 失败"
a0b6b246 17595
06991777 17596#: builtin/notes.c:700
a0b6b246 17597msgid "failed to delete ref NOTES_MERGE_REF"
c1ac5258 17598msgstr "删除引用 NOTES_MERGE_REF 失败"
a0b6b246 17599
06991777 17600#: builtin/notes.c:702
a0b6b246 17601msgid "failed to remove 'git notes merge' worktree"
c1ac5258 17602msgstr "删除 'git notes merge' 工作区失败"
a0b6b246 17603
06991777 17604#: builtin/notes.c:722
a0b6b246 17605msgid "failed to read ref NOTES_MERGE_PARTIAL"
c1ac5258 17606msgstr "读取引用 NOTES_MERGE_PARTIAL 失败"
a0b6b246 17607
06991777 17608#: builtin/notes.c:724
a0b6b246
JX
17609msgid "could not find commit from NOTES_MERGE_PARTIAL."
17610msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
17611
06991777 17612#: builtin/notes.c:726
a0b6b246
JX
17613msgid "could not parse commit from NOTES_MERGE_PARTIAL."
17614msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
17615
06991777 17616#: builtin/notes.c:739
a0b6b246 17617msgid "failed to resolve NOTES_MERGE_REF"
c1ac5258 17618msgstr "解析 NOTES_MERGE_REF 失败"
a0b6b246 17619
06991777 17620#: builtin/notes.c:742
a0b6b246
JX
17621msgid "failed to finalize notes merge"
17622msgstr "无法完成注解合并"
17623
06991777 17624#: builtin/notes.c:768
5c57d762
JX
17625#, c-format
17626msgid "unknown notes merge strategy %s"
17627msgstr "未知的注解合并策略 %s"
17628
06991777 17629#: builtin/notes.c:784
ef317cd5 17630msgid "General options"
07432cef 17631msgstr "通用选项"
ef317cd5 17632
06991777 17633#: builtin/notes.c:786
ef317cd5 17634msgid "Merge options"
07432cef 17635msgstr "合并选项"
ef317cd5 17636
06991777 17637#: builtin/notes.c:788
ef317cd5
JX
17638msgid ""
17639"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
17640"cat_sort_uniq)"
07432cef 17641msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 17642
06991777 17643#: builtin/notes.c:790
ef317cd5 17644msgid "Committing unmerged notes"
07432cef 17645msgstr "提交未合并的注解"
ef317cd5 17646
06991777 17647#: builtin/notes.c:792
ef317cd5 17648msgid "finalize notes merge by committing unmerged notes"
07432cef 17649msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 17650
06991777 17651#: builtin/notes.c:794
ef317cd5 17652msgid "Aborting notes merge resolution"
07432cef 17653msgstr "中止注解合并的方案"
ef317cd5 17654
06991777 17655#: builtin/notes.c:796
ef317cd5 17656msgid "abort notes merge"
07432cef 17657msgstr "中止注解合并"
ef317cd5 17658
06991777 17659#: builtin/notes.c:807
5c57d762
JX
17660msgid "cannot mix --commit, --abort or -s/--strategy"
17661msgstr "不能混用 --commit、--abort 或 -s/--strategy"
17662
06991777 17663#: builtin/notes.c:812
a0b6b246 17664msgid "must specify a notes ref to merge"
9a4b694c 17665msgstr "必须指定一个注解引用来合并"
5c57d762 17666
06991777 17667#: builtin/notes.c:836
5c57d762 17668#, c-format
a0b6b246 17669msgid "unknown -s/--strategy: %s"
5c57d762
JX
17670msgstr "未知的 -s/--strategy:%s"
17671
06991777 17672#: builtin/notes.c:873
1b7f4a34 17673#, c-format
a0b6b246
JX
17674msgid "a notes merge into %s is already in-progress at %s"
17675msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
1b7f4a34 17676
06991777 17677#: builtin/notes.c:876
5c57d762 17678#, c-format
a0b6b246
JX
17679msgid "failed to store link to current notes ref (%s)"
17680msgstr "无法存储链接到当前的注解引用(%s)"
5c57d762 17681
06991777 17682#: builtin/notes.c:878
5c57d762
JX
17683#, c-format
17684msgid ""
17685"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
17686"'git notes merge --commit', or abort the merge with 'git notes merge --"
17687"abort'.\n"
a0b6b246
JX
17688msgstr ""
17689"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
17690"交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
5c57d762 17691
349ede6a 17692#: builtin/notes.c:897 builtin/tag.c:546
d46c5519
JX
17693#, c-format
17694msgid "Failed to resolve '%s' as a valid ref."
17695msgstr "无法解析 '%s' 为一个有效引用。"
17696
06991777 17697#: builtin/notes.c:900
ef317cd5
JX
17698#, c-format
17699msgid "Object %s has no note\n"
17700msgstr "对象 %s 没有注解\n"
17701
06991777 17702#: builtin/notes.c:912
ef317cd5 17703msgid "attempt to remove non-existent note is not an error"
07432cef 17704msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 17705
06991777 17706#: builtin/notes.c:915
ef317cd5 17707msgid "read object names from the standard input"
07432cef 17708msgstr "从标准输入读取对象名称"
ef317cd5 17709
7157c2b5 17710#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220
5c57d762
JX
17711msgid "do not remove, show only"
17712msgstr "不删除,只显示"
17713
06991777 17714#: builtin/notes.c:955
5c57d762
JX
17715msgid "report pruned notes"
17716msgstr "报告清除的注解"
17717
06991777 17718#: builtin/notes.c:998
6c94aba5 17719msgid "notes-ref"
07432cef 17720msgstr "注解引用"
ef317cd5 17721
06991777 17722#: builtin/notes.c:999
814ff314 17723msgid "use notes from <notes-ref>"
07432cef 17724msgstr "从 <注解引用> 使用注解"
ef317cd5 17725
d13389bf 17726#: builtin/notes.c:1034 builtin/stash.c:1604
ef317cd5 17727#, c-format
a0b6b246 17728msgid "unknown subcommand: %s"
ef317cd5
JX
17729msgstr "未知子命令:%s"
17730
d9488fea 17731#: builtin/pack-objects.c:54
1b7f4a34
JX
17732msgid ""
17733"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
17734msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
ef317cd5 17735
d9488fea 17736#: builtin/pack-objects.c:55
1b7f4a34
JX
17737msgid ""
17738"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
58b6f078 17739msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
ef317cd5 17740
d9488fea 17741#: builtin/pack-objects.c:443
ef317cd5 17742#, c-format
c1ac5258
JX
17743msgid "bad packed object CRC for %s"
17744msgstr "%s 错的包对象 CRC"
17745
d9488fea 17746#: builtin/pack-objects.c:454
c1ac5258
JX
17747#, c-format
17748msgid "corrupt packed object for %s"
17749msgstr "%s 损坏的包对象"
17750
d9488fea 17751#: builtin/pack-objects.c:585
c1ac5258
JX
17752#, c-format
17753msgid "recursive delta detected for object %s"
17754msgstr "发现对象 %s 递归 delta"
17755
d9488fea 17756#: builtin/pack-objects.c:796
c1ac5258
JX
17757#, c-format
17758msgid "ordered %u objects, expected %<PRIu32>"
17759msgstr "排序了 %u 个对象,预期 %<PRIu32> 个"
17760
d9488fea 17761#: builtin/pack-objects.c:1004
5b04ee3b
JX
17762msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
17763msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
17764
d9488fea 17765#: builtin/pack-objects.c:1017
6c94aba5
JX
17766msgid "Writing objects"
17767msgstr "写入对象中"
17768
d9488fea 17769#: builtin/pack-objects.c:1078 builtin/update-index.c:90
c1ac5258
JX
17770#, c-format
17771msgid "failed to stat %s"
17772msgstr "对 %s 调用 stat 失败"
17773
d9488fea 17774#: builtin/pack-objects.c:1131
c1ac5258
JX
17775#, c-format
17776msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
17777msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
17778
d9488fea 17779#: builtin/pack-objects.c:1348
6c94aba5
JX
17780msgid "disabling bitmap writing, as some objects are not being packed"
17781msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
17782
d9488fea 17783#: builtin/pack-objects.c:1796
c1ac5258
JX
17784#, c-format
17785msgid "delta base offset overflow in pack for %s"
17786msgstr "%s 压缩中 delta 基准偏移越界"
17787
d9488fea 17788#: builtin/pack-objects.c:1805
c1ac5258
JX
17789#, c-format
17790msgid "delta base offset out of bound for %s"
17791msgstr "%s 的 delta 基准偏移越界"
17792
d9488fea 17793#: builtin/pack-objects.c:2086
fd8cb379
JX
17794msgid "Counting objects"
17795msgstr "对象计数中"
17796
d9488fea 17797#: builtin/pack-objects.c:2231
fd8cb379
JX
17798#, c-format
17799msgid "unable to parse object header of %s"
17800msgstr "无法解析对象 %s 头信息"
17801
d9488fea
JX
17802#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317
17803#: builtin/pack-objects.c:2327
c1ac5258
JX
17804#, c-format
17805msgid "object %s cannot be read"
17806msgstr "对象 %s 无法读取"
17807
d9488fea 17808#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331
c1ac5258 17809#, c-format
4c27fcb5
JX
17810msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
17811msgstr "对象 %s 不一致的对象长度(%<PRIuMAX> vs %<PRIuMAX>)"
c1ac5258 17812
d9488fea 17813#: builtin/pack-objects.c:2341
c1ac5258
JX
17814msgid "suboptimal pack - out of memory"
17815msgstr "次优(suboptimal)打包 - 内存不足"
17816
d9488fea 17817#: builtin/pack-objects.c:2656
c1ac5258
JX
17818#, c-format
17819msgid "Delta compression using up to %d threads"
17820msgstr "使用 %d 个线程进行压缩"
17821
d9488fea 17822#: builtin/pack-objects.c:2795
c1ac5258
JX
17823#, c-format
17824msgid "unable to pack objects reachable from tag %s"
17825msgstr "无法为标签 %s 压缩对象"
17826
d9488fea 17827#: builtin/pack-objects.c:2883
6c94aba5
JX
17828msgid "Compressing objects"
17829msgstr "压缩对象中"
17830
d9488fea 17831#: builtin/pack-objects.c:2889
c1ac5258
JX
17832msgid "inconsistency with delta count"
17833msgstr "不一致的差异计数"
17834
d9488fea 17835#: builtin/pack-objects.c:2961
7157c2b5
JX
17836#, c-format
17837msgid ""
17838"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
17839"hash> <uri>' (got '%s')"
d9488fea
JX
17840msgstr ""
17841"uploadpack.blobpackfileuri 的取值必须是 '<object-hash> <pack-hash> <uri>' 格"
17842"式(得到 '%s')"
7157c2b5 17843
d9488fea 17844#: builtin/pack-objects.c:2964
7157c2b5
JX
17845#, c-format
17846msgid ""
17847"object already configured in another uploadpack.blobpackfileuri (got '%s')"
17848msgstr "对象已经在另外的 uploadpack.blobpackfileuri 中配置(得到 '%s')"
17849
d9488fea 17850#: builtin/pack-objects.c:2993
c1ac5258
JX
17851#, c-format
17852msgid ""
17853"expected edge object ID, got garbage:\n"
17854" %s"
17855msgstr ""
17856"预期边界对象(edge object)ID,却得到垃圾数据:\n"
17857" %s"
17858
d9488fea 17859#: builtin/pack-objects.c:2999
c1ac5258
JX
17860#, c-format
17861msgid ""
17862"expected object ID, got garbage:\n"
17863" %s"
17864msgstr ""
17865"预期对象 ID,却得到垃圾数据:\n"
17866" %s"
17867
d9488fea 17868#: builtin/pack-objects.c:3097
5809aa05
JX
17869msgid "invalid value for --missing"
17870msgstr "选项 --missing 的值无效"
17871
d9488fea 17872#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264
c1ac5258
JX
17873msgid "cannot open pack index"
17874msgstr "无法打开包文件索引"
17875
d9488fea 17876#: builtin/pack-objects.c:3187
c1ac5258
JX
17877#, c-format
17878msgid "loose object at %s could not be examined"
17879msgstr "无法检查 %s 处的松散对象"
17880
d9488fea 17881#: builtin/pack-objects.c:3272
c1ac5258
JX
17882msgid "unable to force loose object"
17883msgstr "无法强制松散对象"
17884
d9488fea 17885#: builtin/pack-objects.c:3365
c1ac5258
JX
17886#, c-format
17887msgid "not a rev '%s'"
17888msgstr "不是一个版本 '%s'"
17889
d9488fea 17890#: builtin/pack-objects.c:3368
c1ac5258
JX
17891#, c-format
17892msgid "bad revision '%s'"
17893msgstr "坏的版本 '%s'"
17894
d9488fea 17895#: builtin/pack-objects.c:3393
c1ac5258
JX
17896msgid "unable to add recent objects"
17897msgstr "无法添加最近的对象"
17898
d9488fea 17899#: builtin/pack-objects.c:3446
ef317cd5
JX
17900#, c-format
17901msgid "unsupported index version %s"
17902msgstr "不支持的索引版本 %s"
17903
d9488fea 17904#: builtin/pack-objects.c:3450
ef317cd5
JX
17905#, c-format
17906msgid "bad index version '%s'"
17907msgstr "坏的索引版本 '%s'"
17908
d9488fea 17909#: builtin/pack-objects.c:3488
c1ac5258
JX
17910msgid "<version>[,<offset>]"
17911msgstr "<版本>[,<偏移>]"
ef317cd5 17912
d9488fea 17913#: builtin/pack-objects.c:3489
ef317cd5 17914msgid "write the pack index file in the specified idx format version"
07432cef 17915msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 17916
d9488fea 17917#: builtin/pack-objects.c:3492
ef317cd5 17918msgid "maximum size of each output pack file"
07432cef 17919msgstr "每个输出包的最大尺寸"
ef317cd5 17920
d9488fea 17921#: builtin/pack-objects.c:3494
ef317cd5 17922msgid "ignore borrowed objects from alternate object store"
160fb2b2 17923msgstr "忽略从备用对象存储里借用对象"
ef317cd5 17924
d9488fea 17925#: builtin/pack-objects.c:3496
ef317cd5 17926msgid "ignore packed objects"
07432cef 17927msgstr "忽略包对象"
ef317cd5 17928
d9488fea 17929#: builtin/pack-objects.c:3498
ef317cd5 17930msgid "limit pack window by objects"
07432cef 17931msgstr "限制打包窗口的对象数"
ef317cd5 17932
d9488fea 17933#: builtin/pack-objects.c:3500
ef317cd5 17934msgid "limit pack window by memory in addition to object limit"
07432cef 17935msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 17936
d9488fea 17937#: builtin/pack-objects.c:3502
ef317cd5 17938msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 17939msgstr "打包允许的 delta 链的最大长度"
ef317cd5 17940
d9488fea 17941#: builtin/pack-objects.c:3504
ef317cd5 17942msgid "reuse existing deltas"
07432cef 17943msgstr "重用已存在的 deltas"
ef317cd5 17944
d9488fea 17945#: builtin/pack-objects.c:3506
ef317cd5 17946msgid "reuse existing objects"
07432cef 17947msgstr "重用已存在的对象"
ef317cd5 17948
d9488fea 17949#: builtin/pack-objects.c:3508
ef317cd5 17950msgid "use OFS_DELTA objects"
07432cef 17951msgstr "使用 OFS_DELTA 对象"
ef317cd5 17952
d9488fea 17953#: builtin/pack-objects.c:3510
ef317cd5 17954msgid "use threads when searching for best delta matches"
07432cef 17955msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 17956
d9488fea 17957#: builtin/pack-objects.c:3512
ef317cd5 17958msgid "do not create an empty pack output"
07432cef 17959msgstr "不创建空的包输出"
ef317cd5 17960
d9488fea 17961#: builtin/pack-objects.c:3514
ef317cd5 17962msgid "read revision arguments from standard input"
d9d56b23 17963msgstr "从标准输入读取版本号参数"
ef317cd5 17964
d9488fea 17965#: builtin/pack-objects.c:3516
ef317cd5 17966msgid "limit the objects to those that are not yet packed"
07432cef 17967msgstr "限制那些尚未打包的对象"
ef317cd5 17968
d9488fea 17969#: builtin/pack-objects.c:3519
ef317cd5 17970msgid "include objects reachable from any reference"
07432cef 17971msgstr "包括可以从任何引用访问到的对象"
ef317cd5 17972
d9488fea 17973#: builtin/pack-objects.c:3522
ef317cd5 17974msgid "include objects referred by reflog entries"
07432cef 17975msgstr "包括被引用日志引用到的对象"
ef317cd5 17976
d9488fea 17977#: builtin/pack-objects.c:3525
220c313c
JX
17978msgid "include objects referred to by the index"
17979msgstr "包括被索引引用到的对象"
17980
d9488fea 17981#: builtin/pack-objects.c:3528
ef317cd5 17982msgid "output pack to stdout"
07432cef 17983msgstr "输出包到标准输出"
ef317cd5 17984
d9488fea 17985#: builtin/pack-objects.c:3530
ef317cd5 17986msgid "include tag objects that refer to objects to be packed"
53438e8f 17987msgstr "包括那些引用了待打包对象的标签对象"
ef317cd5 17988
d9488fea 17989#: builtin/pack-objects.c:3532
ef317cd5 17990msgid "keep unreachable objects"
07432cef 17991msgstr "维持不可达的对象"
ef317cd5 17992
d9488fea 17993#: builtin/pack-objects.c:3534
5c57d762
JX
17994msgid "pack loose unreachable objects"
17995msgstr "打包松散的不可达对象"
17996
d9488fea 17997#: builtin/pack-objects.c:3536
ef317cd5 17998msgid "unpack unreachable objects newer than <time>"
07432cef 17999msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 18000
d9488fea 18001#: builtin/pack-objects.c:3539
06991777
JX
18002msgid "use the sparse reachability algorithm"
18003msgstr "使用稀疏可达性算法"
18004
d9488fea 18005#: builtin/pack-objects.c:3541
ef317cd5 18006msgid "create thin packs"
07432cef 18007msgstr "创建精简包"
ef317cd5 18008
d9488fea 18009#: builtin/pack-objects.c:3543
04cb2f28 18010msgid "create packs suitable for shallow fetches"
160fb2b2 18011msgstr "创建适合浅克隆仓库获取的包"
04cb2f28 18012
d9488fea 18013#: builtin/pack-objects.c:3545
ef317cd5 18014msgid "ignore packs that have companion .keep file"
07432cef 18015msgstr "忽略配有 .keep 文件的包"
ef317cd5 18016
d9488fea 18017#: builtin/pack-objects.c:3547
fd8cb379
JX
18018msgid "ignore this pack"
18019msgstr "忽略该 pack"
18020
d9488fea 18021#: builtin/pack-objects.c:3549
ef317cd5 18022msgid "pack compression level"
07432cef 18023msgstr "打包压缩级别"
ef317cd5 18024
d9488fea 18025#: builtin/pack-objects.c:3551
ef317cd5 18026msgid "do not hide commits by grafts"
fd8cb379 18027msgstr "显示被移植隐藏的提交"
ef317cd5 18028
d9488fea 18029#: builtin/pack-objects.c:3553
6c94aba5
JX
18030msgid "use a bitmap index if available to speed up counting objects"
18031msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
18032
d9488fea 18033#: builtin/pack-objects.c:3555
6c94aba5
JX
18034msgid "write a bitmap index together with the pack index"
18035msgstr "在建立包索引的同时创建 bitmap 索引"
18036
d9488fea 18037#: builtin/pack-objects.c:3559
a6cd2cc4
JX
18038msgid "write a bitmap index if possible"
18039msgstr "如果可能,写 bitmap 索引"
18040
d9488fea 18041#: builtin/pack-objects.c:3563
5809aa05
JX
18042msgid "handling for missing objects"
18043msgstr "处理丢失的对象"
18044
d9488fea 18045#: builtin/pack-objects.c:3566
31e5e17b
JX
18046msgid "do not pack objects in promisor packfiles"
18047msgstr "不要打包 promisor 包文件中的对象"
18048
d9488fea 18049#: builtin/pack-objects.c:3568
4c27fcb5
JX
18050msgid "respect islands during delta compression"
18051msgstr "在增量压缩时参考数据岛"
18052
d9488fea 18053#: builtin/pack-objects.c:3570
7157c2b5
JX
18054msgid "protocol"
18055msgstr "协议"
18056
d9488fea 18057#: builtin/pack-objects.c:3571
7157c2b5
JX
18058msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
18059msgstr "使用此协议排除任何已配置的 uploadpack.blobpackfileuri"
18060
d9488fea 18061#: builtin/pack-objects.c:3600
fd8cb379
JX
18062#, c-format
18063msgid "delta chain depth %d is too deep, forcing %d"
18064msgstr "增量链深度 %d 太深了,强制为 %d"
18065
d9488fea 18066#: builtin/pack-objects.c:3605
fd8cb379
JX
18067#, c-format
18068msgid "pack.deltaCacheLimit is too high, forcing %d"
18069msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d"
6c94aba5 18070
d9488fea 18071#: builtin/pack-objects.c:3659
c1ac5258
JX
18072msgid "--max-pack-size cannot be used to build a pack for transfer"
18073msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
18074
d9488fea 18075#: builtin/pack-objects.c:3661
c1ac5258 18076msgid "minimum pack size limit is 1 MiB"
e640d114 18077msgstr "最小的包文件大小是 1 MiB"
c1ac5258 18078
d9488fea 18079#: builtin/pack-objects.c:3666
c1ac5258
JX
18080msgid "--thin cannot be used to build an indexable pack"
18081msgstr "--thin 不能用于创建一个可索引包"
18082
d9488fea 18083#: builtin/pack-objects.c:3669
c1ac5258
JX
18084msgid "--keep-unreachable and --unpack-unreachable are incompatible"
18085msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
18086
d9488fea 18087#: builtin/pack-objects.c:3675
c1ac5258 18088msgid "cannot use --filter without --stdout"
e640d114 18089msgstr "不能在没有 --stdout 的情况下使用 --filter"
c1ac5258 18090
d9488fea 18091#: builtin/pack-objects.c:3735
fd8cb379 18092msgid "Enumerating objects"
d9488fea 18093msgstr "枚举对象中"
fd8cb379 18094
d9488fea 18095#: builtin/pack-objects.c:3766
c1ac5258 18096#, c-format
2b472aae
JX
18097msgid ""
18098"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
18099"reused %<PRIu32>"
18100msgstr ""
18101"总共 %<PRIu32>(差异 %<PRIu32>),复用 %<PRIu32>(差异 %<PRIu32>),包复用 "
18102"%<PRIu32>"
c1ac5258 18103
d46c5519 18104#: builtin/pack-refs.c:8
814ff314
JX
18105msgid "git pack-refs [<options>]"
18106msgstr "git pack-refs [<选项>]"
c04f5ac3 18107
d46c5519 18108#: builtin/pack-refs.c:16
ef317cd5 18109msgid "pack everything"
07432cef 18110msgstr "打包一切"
c04f5ac3 18111
d46c5519 18112#: builtin/pack-refs.c:17
ef317cd5 18113msgid "prune loose refs (default)"
07432cef 18114msgstr "清除松散的引用(默认)"
c04f5ac3 18115
349ede6a 18116#: builtin/prune-packed.c:6
814ff314
JX
18117msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
18118msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
6792b93b 18119
349ede6a 18120#: builtin/prune.c:14
5809aa05
JX
18121msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
18122msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
7ac1c0ad 18123
349ede6a 18124#: builtin/prune.c:133
1b7f4a34
JX
18125msgid "report pruned objects"
18126msgstr "报告清除的对象"
18127
349ede6a 18128#: builtin/prune.c:136
1b7f4a34
JX
18129msgid "expire objects older than <time>"
18130msgstr "使早于给定时间的对象过期"
18131
349ede6a 18132#: builtin/prune.c:138
31e5e17b
JX
18133msgid "limit traversal to objects outside promisor packfiles"
18134msgstr "限制遍历 promisor 包以外的对象"
18135
349ede6a 18136#: builtin/prune.c:152
94550ed3
JX
18137msgid "cannot prune in a precious-objects repo"
18138msgstr "不能在珍品仓库中执行清理操作"
18139
2b472aae 18140#: builtin/pull.c:45 builtin/pull.c:47
a0b6b246
JX
18141#, c-format
18142msgid "Invalid value for %s: %s"
18143msgstr "%s 的值无效:%s"
18144
2b472aae 18145#: builtin/pull.c:67
94550ed3 18146msgid "git pull [<options>] [<repository> [<refspec>...]]"
1b7f4a34
JX
18147msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
18148
349ede6a 18149#: builtin/pull.c:123
a4f16749
JX
18150msgid "control for recursive fetching of submodules"
18151msgstr "控制子模组的递归获取"
18152
349ede6a 18153#: builtin/pull.c:127
1b7f4a34
JX
18154msgid "Options related to merging"
18155msgstr "和合并相关的选项"
18156
349ede6a 18157#: builtin/pull.c:130
1b7f4a34
JX
18158msgid "incorporate changes by rebasing rather than merging"
18159msgstr "使用变基操作取代合并操作以合入修改"
18160
d13389bf 18161#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126
1b7f4a34
JX
18162msgid "allow fast-forward"
18163msgstr "允许快进式"
18164
349ede6a
JX
18165#: builtin/pull.c:167 parse-options.h:339
18166msgid "automatically stash/stash pop before and after"
18167msgstr "在操作前后执行自动贮藏和弹出贮藏"
5b04ee3b 18168
349ede6a 18169#: builtin/pull.c:183
1b7f4a34
JX
18170msgid "Options related to fetching"
18171msgstr "和获取相关的参数"
18172
349ede6a 18173#: builtin/pull.c:193
4c27fcb5
JX
18174msgid "force overwrite of local branch"
18175msgstr "强制覆盖本地分支"
18176
349ede6a 18177#: builtin/pull.c:201
276ceeaa
JX
18178msgid "number of submodules pulled in parallel"
18179msgstr "并发拉取的子模组的数量"
18180
349ede6a 18181#: builtin/pull.c:317
1b7f4a34
JX
18182#, c-format
18183msgid "Invalid value for pull.ff: %s"
18184msgstr "pull.ff 的取值无效:%s"
18185
d9488fea 18186#: builtin/pull.c:348
349ede6a
JX
18187msgid ""
18188"Pulling without specifying how to reconcile divergent branches is\n"
18189"discouraged. You can squelch this message by running one of the following\n"
18190"commands sometime before your next pull:\n"
18191"\n"
18192" git config pull.rebase false # merge (the default strategy)\n"
18193" git config pull.rebase true # rebase\n"
18194" git config pull.ff only # fast-forward only\n"
18195"\n"
18196"You can replace \"git config\" with \"git config --global\" to set a "
18197"default\n"
18198"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
18199"or --ff-only on the command line to override the configured default per\n"
18200"invocation.\n"
18201msgstr ""
18202"不建议在没有为偏离分支指定合并策略时执行 pull 操作。 您可以在执行下一次\n"
18203"pull 操作之前执行下面一条命令来抑制本消息:\n"
18204"\n"
18205" git config pull.rebase false # 合并(缺省策略)\n"
18206" git config pull.rebase true # 变基\n"
18207" git config pull.ff only # 仅快进\n"
18208"\n"
18209"您可以将 \"git config\" 替换为 \"git config --global\" 以便为所有仓库设置\n"
18210"缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase,\n"
18211"或者 --ff-only 参数覆盖缺省设置。\n"
18212
d9488fea 18213#: builtin/pull.c:458
1b7f4a34
JX
18214msgid ""
18215"There is no candidate for rebasing against among the refs that you just "
18216"fetched."
18217msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
18218
d9488fea 18219#: builtin/pull.c:460
1b7f4a34
JX
18220msgid ""
18221"There are no candidates for merging among the refs that you just fetched."
18222msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
18223
d9488fea 18224#: builtin/pull.c:461
1b7f4a34
JX
18225msgid ""
18226"Generally this means that you provided a wildcard refspec which had no\n"
18227"matches on the remote end."
18228msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
18229
d9488fea 18230#: builtin/pull.c:464
1b7f4a34
JX
18231#, c-format
18232msgid ""
18233"You asked to pull from the remote '%s', but did not specify\n"
18234"a branch. Because this is not the default configured remote\n"
18235"for your current branch, you must specify a branch on the command line."
18236msgstr ""
18237"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
18238"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
18239
d13389bf 18240#: builtin/pull.c:469 builtin/rebase.c:1246
1b7f4a34
JX
18241msgid "You are not currently on a branch."
18242msgstr "您当前不在一个分支上。"
18243
d13389bf 18244#: builtin/pull.c:471 builtin/pull.c:486
1b7f4a34
JX
18245msgid "Please specify which branch you want to rebase against."
18246msgstr "请指定您要变基到哪一个分支。"
18247
d13389bf 18248#: builtin/pull.c:473 builtin/pull.c:488
1b7f4a34
JX
18249msgid "Please specify which branch you want to merge with."
18250msgstr "请指定您要合并哪一个分支。"
18251
d9488fea 18252#: builtin/pull.c:474 builtin/pull.c:489
1b7f4a34
JX
18253msgid "See git-pull(1) for details."
18254msgstr "详见 git-pull(1)。"
18255
d9488fea 18256#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491
d13389bf 18257#: builtin/rebase.c:1252
5b04ee3b
JX
18258msgid "<remote>"
18259msgstr "<远程>"
18260
d9488fea 18261#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496
5b04ee3b
JX
18262msgid "<branch>"
18263msgstr "<分支>"
18264
d13389bf 18265#: builtin/pull.c:484 builtin/rebase.c:1244
1b7f4a34
JX
18266msgid "There is no tracking information for the current branch."
18267msgstr "当前分支没有跟踪信息。"
18268
d13389bf 18269#: builtin/pull.c:493
1b7f4a34 18270msgid ""
5b04ee3b
JX
18271"If you wish to set tracking information for this branch you can do so with:"
18272msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
7ac1c0ad 18273
d9488fea 18274#: builtin/pull.c:498
1b7f4a34
JX
18275#, c-format
18276msgid ""
18277"Your configuration specifies to merge with the ref '%s'\n"
18278"from the remote, but no such ref was fetched."
18279msgstr ""
18280"您的配置中指定要合并远程的引用 '%s',\n"
18281"但是没有获取到这个引用。"
7ac1c0ad 18282
d9488fea 18283#: builtin/pull.c:609
4c27fcb5
JX
18284#, c-format
18285msgid "unable to access commit %s"
18286msgstr "无法访问提交 %s"
18287
d13389bf 18288#: builtin/pull.c:915
5c57d762
JX
18289msgid "ignoring --verify-signatures for rebase"
18290msgstr "为变基操作忽略 --verify-signatures"
18291
d13389bf 18292#: builtin/pull.c:972
1b7f4a34
JX
18293msgid "Updating an unborn branch with changes added to the index."
18294msgstr "更新尚未诞生的分支,变更添加至索引。"
18295
d13389bf 18296#: builtin/pull.c:976
a0b6b246
JX
18297msgid "pull with rebase"
18298msgstr "变基式拉取"
18299
d13389bf 18300#: builtin/pull.c:977
a0b6b246 18301msgid "please commit or stash them."
554e8501 18302msgstr "请提交或贮藏它们。"
a0b6b246 18303
d13389bf 18304#: builtin/pull.c:1002
1b7f4a34
JX
18305#, c-format
18306msgid ""
18307"fetch updated the current branch head.\n"
18308"fast-forwarding your working tree from\n"
18309"commit %s."
18310msgstr ""
18311"fetch 更新了当前的分支。快进您的工作区\n"
18312"至提交 %s。"
ef317cd5 18313
d13389bf 18314#: builtin/pull.c:1008
1b7f4a34
JX
18315#, c-format
18316msgid ""
18317"Cannot fast-forward your working tree.\n"
18318"After making sure that you saved anything precious from\n"
18319"$ git diff %s\n"
18320"output, run\n"
18321"$ git reset --hard\n"
18322"to recover."
18323msgstr ""
18324"您当前的工作区无法执行快进操作。\n"
18325"首先执行如下命令:\n"
18326"$ git diff %s\n"
18327"以确认所有有用的数据均已保存。然后执行下面的命令\n"
18328"$ git reset --hard\n"
18329"恢复之前的状态。"
18330
d13389bf 18331#: builtin/pull.c:1023
1b7f4a34
JX
18332msgid "Cannot merge multiple branches into empty head."
18333msgstr "无法将多个分支合并到空分支。"
18334
d13389bf 18335#: builtin/pull.c:1027
1b7f4a34
JX
18336msgid "Cannot rebase onto multiple branches."
18337msgstr "无法变基到多个分支。"
18338
d13389bf 18339#: builtin/pull.c:1041
a4f16749
JX
18340msgid "cannot rebase with locally recorded submodule modifications"
18341msgstr "本地子模组中有修改,无法变基"
18342
fd8cb379 18343#: builtin/push.c:19
ef317cd5 18344msgid "git push [<options>] [<repository> [<refspec>...]]"
160fb2b2 18345msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
7ac1c0ad 18346
d9488fea 18347#: builtin/push.c:111
c04f5ac3 18348msgid "tag shorthand without <tag>"
55a16ee4 18349msgstr "标签后面未提供 <标签> 参数"
c04f5ac3 18350
d9488fea 18351#: builtin/push.c:119
c04f5ac3 18352msgid "--delete only accepts plain target ref names"
90e6ef53 18353msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 18354
d9488fea 18355#: builtin/push.c:164
8ada9598
JX
18356msgid ""
18357"\n"
18358"To choose either option permanently, see push.default in 'git help config'."
18359msgstr ""
81809b99
JX
18360"\n"
18361"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 18362
d9488fea 18363#: builtin/push.c:167
8ada9598
JX
18364#, c-format
18365msgid ""
18366"The upstream branch of your current branch does not match\n"
18367"the name of your current branch. To push to the upstream branch\n"
18368"on the remote, use\n"
18369"\n"
18370" git push %s HEAD:%s\n"
18371"\n"
18372"To push to the branch of the same name on the remote, use\n"
18373"\n"
4c27fcb5 18374" git push %s HEAD\n"
8ada9598
JX
18375"%s"
18376msgstr ""
4c27fcb5
JX
18377"您当前分支的上游分支和您当前分支名不匹配,为推送到远程的上游分支,\n"
18378"使用\n"
81809b99
JX
18379"\n"
18380" git push %s HEAD:%s\n"
18381"\n"
18382"为推送至远程同名分支,使用\n"
18383"\n"
4c27fcb5 18384" git push %s HEAD\n"
81809b99 18385"%s"
8ada9598 18386
d9488fea 18387#: builtin/push.c:182
c04f5ac3
JX
18388#, c-format
18389msgid ""
18390"You are not currently on a branch.\n"
18391"To push the history leading to the current (detached HEAD)\n"
18392"state now, use\n"
18393"\n"
18394" git push %s HEAD:<name-of-remote-branch>\n"
18395msgstr ""
18396"您当前不在一个分支上。\n"
90e6ef53 18397"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3 18398"\n"
d9d56b23 18399" git push %s HEAD:<远程分支名字>\n"
c04f5ac3 18400
d9488fea 18401#: builtin/push.c:194
c04f5ac3
JX
18402#, c-format
18403msgid ""
18404"The current branch %s has no upstream branch.\n"
18405"To push the current branch and set the remote as upstream, use\n"
18406"\n"
18407" git push --set-upstream %s %s\n"
18408msgstr ""
18409"当前分支 %s 没有对应的上游分支。\n"
18410"为推送当前分支并建立与远程上游的跟踪,使用\n"
18411"\n"
18412" git push --set-upstream %s %s\n"
18413
d9488fea 18414#: builtin/push.c:202
c04f5ac3
JX
18415#, c-format
18416msgid "The current branch %s has multiple upstream branches, refusing to push."
18417msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
18418
d9488fea 18419#: builtin/push.c:205
73a60cd2
JX
18420#, c-format
18421msgid ""
18422"You are pushing to remote '%s', which is not the upstream of\n"
18423"your current branch '%s', without telling me what to push\n"
18424"to update which remote branch."
18425msgstr ""
18426"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
18427"而没有告诉我要推送什么、更新哪个远程分支。"
18428
d9488fea 18429#: builtin/push.c:260
c04f5ac3
JX
18430msgid ""
18431"You didn't specify any refspecs to push, and push.default is \"nothing\"."
160fb2b2 18432msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
c04f5ac3 18433
d9488fea 18434#: builtin/push.c:267
170e9899
JX
18435msgid ""
18436"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
18437"its remote counterpart. Integrate the remote changes (e.g.\n"
18438"'git pull ...') before pushing again.\n"
170e9899
JX
18439"See the 'Note about fast-forwards' in 'git push --help' for details."
18440msgstr ""
eff6d3a9 18441"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 18442"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 18443"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 18444
d9488fea 18445#: builtin/push.c:273
170e9899
JX
18446msgid ""
18447"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
18448"counterpart. Check out this branch and integrate the remote changes\n"
18449"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
18450"See the 'Note about fast-forwards' in 'git push --help' for details."
18451msgstr ""
eff6d3a9 18452"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 18453"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 18454"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 18455
d9488fea 18456#: builtin/push.c:279
07432cef 18457msgid ""
a77c07d9
JX
18458"Updates were rejected because the remote contains work that you do\n"
18459"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
18460"to the same ref. You may want to first integrate the remote changes\n"
18461"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
18462"See the 'Note about fast-forwards' in 'git push --help' for details."
18463msgstr ""
160fb2b2
JX
18464"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
18465"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
2e8451e8 18466"(如 'git pull ...')。\n"
a77c07d9
JX
18467"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
18468
d9488fea 18469#: builtin/push.c:286
a77c07d9 18470msgid "Updates were rejected because the tag already exists in the remote."
55a16ee4 18471msgstr "更新被拒绝,因为该标签在远程已经存在。"
a77c07d9 18472
d9488fea 18473#: builtin/push.c:289
a77c07d9
JX
18474msgid ""
18475"You cannot update a remote ref that points at a non-commit object,\n"
18476"or update a remote ref to make it point at a non-commit object,\n"
18477"without using the '--force' option.\n"
18478msgstr ""
18479"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
18480"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 18481
d13389bf
JX
18482#: builtin/push.c:294
18483msgid ""
18484"Updates were rejected because the tip of the remote-tracking\n"
18485"branch has been updated since the last checkout. You may want\n"
18486"to integrate those changes locally (e.g., 'git pull ...')\n"
18487"before forcing an update.\n"
18488msgstr ""
18489"更新被拒绝,因为远程跟踪分支的最新提交自从上次检出之后已被更新。\n"
18490"在强制更新前,您可能想将这些变更整合到本地(如 'git pull ...')。\n"
18491
18492#: builtin/push.c:364
c04f5ac3
JX
18493#, c-format
18494msgid "Pushing to %s\n"
18495msgstr "推送到 %s\n"
18496
d13389bf 18497#: builtin/push.c:371
c04f5ac3
JX
18498#, c-format
18499msgid "failed to push some refs to '%s'"
c1ac5258 18500msgstr "推送一些引用到 '%s' 失败"
c04f5ac3 18501
d13389bf 18502#: builtin/push.c:553
ef317cd5 18503msgid "repository"
160fb2b2 18504msgstr "仓库"
ef317cd5 18505
d13389bf 18506#: builtin/push.c:554 builtin/send-pack.c:189
ef317cd5 18507msgid "push all refs"
07432cef 18508msgstr "推送所有引用"
ef317cd5 18509
d13389bf 18510#: builtin/push.c:555 builtin/send-pack.c:191
ef317cd5 18511msgid "mirror all refs"
07432cef 18512msgstr "镜像所有引用"
ef317cd5 18513
d13389bf 18514#: builtin/push.c:557
ef317cd5 18515msgid "delete refs"
07432cef 18516msgstr "删除引用"
ef317cd5 18517
d13389bf 18518#: builtin/push.c:558
ef317cd5 18519msgid "push tags (can't be used with --all or --mirror)"
55a16ee4 18520msgstr "推送标签(不能使用 --all or --mirror)"
ef317cd5 18521
d13389bf 18522#: builtin/push.c:561 builtin/send-pack.c:192
ef317cd5
JX
18523msgid "force updates"
18524msgstr "强制更新"
18525
d13389bf 18526#: builtin/push.c:562 builtin/send-pack.c:204
c1ac5258
JX
18527msgid "<refname>:<expect>"
18528msgstr "<引用名>:<期望值>"
90314792 18529
d13389bf 18530#: builtin/push.c:563 builtin/send-pack.c:205
90314792
JX
18531msgid "require old value of ref to be at this value"
18532msgstr "要求引用旧的取值为设定值"
18533
d13389bf
JX
18534#: builtin/push.c:566 builtin/send-pack.c:208
18535msgid "require remote updates to be integrated locally"
18536msgstr "要求远程更新在本地被整合"
18537
18538#: builtin/push.c:569
ef317cd5 18539msgid "control recursive pushing of submodules"
07432cef 18540msgstr "控制子模组的递归推送"
ef317cd5 18541
d13389bf 18542#: builtin/push.c:570 builtin/send-pack.c:199
ef317cd5 18543msgid "use thin pack"
07432cef 18544msgstr "使用精简打包"
ef317cd5 18545
d13389bf
JX
18546#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
18547#: builtin/send-pack.c:187
ef317cd5 18548msgid "receive pack program"
07432cef 18549msgstr "接收包程序"
ef317cd5 18550
d13389bf 18551#: builtin/push.c:573
ef317cd5 18552msgid "set upstream for git pull/status"
07432cef 18553msgstr "设置 git pull/status 的上游"
ef317cd5 18554
d13389bf 18555#: builtin/push.c:576
ef317cd5 18556msgid "prune locally removed refs"
07432cef 18557msgstr "清除本地删除的引用"
ef317cd5 18558
d13389bf 18559#: builtin/push.c:578
a77c07d9
JX
18560msgid "bypass pre-push hook"
18561msgstr "绕过 pre-push 钩子"
18562
d13389bf 18563#: builtin/push.c:579
1003b3a5 18564msgid "push missing but relevant tags"
55a16ee4 18565msgstr "推送缺失但有关的标签"
1003b3a5 18566
d13389bf 18567#: builtin/push.c:581 builtin/send-pack.c:193
220c313c
JX
18568msgid "GPG sign the push"
18569msgstr "用 GPG 为推送签名"
18570
d13389bf 18571#: builtin/push.c:583 builtin/send-pack.c:200
814ff314
JX
18572msgid "request atomic transaction on remote side"
18573msgstr "需要远端支持原子事务"
18574
d13389bf 18575#: builtin/push.c:601
c04f5ac3
JX
18576msgid "--delete is incompatible with --all, --mirror and --tags"
18577msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
18578
d13389bf 18579#: builtin/push.c:603
c04f5ac3
JX
18580msgid "--delete doesn't make sense without any refs"
18581msgstr "--delete 未接任何引用没有意义"
18582
d13389bf 18583#: builtin/push.c:623
a5cd71ca
JX
18584#, c-format
18585msgid "bad repository '%s'"
18586msgstr "坏的仓库 '%s'"
18587
d13389bf 18588#: builtin/push.c:624
a5cd71ca
JX
18589msgid ""
18590"No configured push destination.\n"
18591"Either specify the URL from the command-line or configure a remote "
18592"repository using\n"
18593"\n"
18594" git remote add <name> <url>\n"
18595"\n"
18596"and then push using the remote name\n"
18597"\n"
18598" git push <name>\n"
18599msgstr ""
18600"没有配置推送目标。\n"
18601"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
18602"\n"
18603" git remote add <名称> <地址>\n"
18604"\n"
18605"然后使用该远程仓库名执行推送\n"
18606"\n"
18607" git push <名称>\n"
18608
d13389bf 18609#: builtin/push.c:639
fd8cb379
JX
18610msgid "--all and --tags are incompatible"
18611msgstr "--all 和 --tags 不兼容"
18612
d13389bf 18613#: builtin/push.c:641
fd8cb379
JX
18614msgid "--all can't be combined with refspecs"
18615msgstr "--all 不能和引用规格同时使用"
18616
d13389bf 18617#: builtin/push.c:645
fd8cb379
JX
18618msgid "--mirror and --tags are incompatible"
18619msgstr "--mirror 和 --tags 不兼容"
18620
d13389bf 18621#: builtin/push.c:647
fd8cb379
JX
18622msgid "--mirror can't be combined with refspecs"
18623msgstr "--mirror 不能和引用规格同时使用"
18624
d13389bf 18625#: builtin/push.c:650
fd8cb379
JX
18626msgid "--all and --mirror are incompatible"
18627msgstr "--all 和 --mirror 不兼容"
18628
d13389bf 18629#: builtin/push.c:657
5c57d762
JX
18630msgid "push options must not have new line characters"
18631msgstr "推送选项不能有换行符"
18632
c1ac5258
JX
18633#: builtin/range-diff.c:8
18634msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
18635msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>"
18636
18637#: builtin/range-diff.c:9
18638msgid "git range-diff [<options>] <old-tip>...<new-tip>"
18639msgstr "git range-diff [<选项>] <old-tip>...<new-tip>"
18640
18641#: builtin/range-diff.c:10
18642msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
18643msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>"
18644
ddc12c42 18645#: builtin/range-diff.c:22
c1ac5258
JX
18646msgid "Percentage by which creation is weighted"
18647msgstr "创建权重的百分比"
18648
ddc12c42 18649#: builtin/range-diff.c:24
c1ac5258
JX
18650msgid "use simple diff colors"
18651msgstr "使用简单差异颜色"
18652
ddc12c42
JX
18653#: builtin/range-diff.c:26
18654msgid "notes"
18655msgstr "注解"
18656
18657#: builtin/range-diff.c:26
18658msgid "passed to 'git log'"
18659msgstr "传递给 'git log'"
18660
18661#: builtin/range-diff.c:50 builtin/range-diff.c:54
c1ac5258
JX
18662#, c-format
18663msgid "no .. in range: '%s'"
18664msgstr "没有在范围中使用 ..:'%s'"
18665
ddc12c42 18666#: builtin/range-diff.c:64
c1ac5258
JX
18667msgid "single arg format must be symmetric range"
18668msgstr "单个参数格式必须是对称范围(即包含...)"
18669
ddc12c42 18670#: builtin/range-diff.c:79
c1ac5258
JX
18671msgid "need two commit ranges"
18672msgstr "需要两个提交范围"
18673
06991777 18674#: builtin/read-tree.c:41
ef317cd5 18675msgid ""
1b7f4a34 18676"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
ef317cd5
JX
18677"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
18678"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
18679msgstr ""
1b7f4a34 18680"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
07432cef 18681"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
1b7f4a34 18682"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
ef317cd5 18683
06991777 18684#: builtin/read-tree.c:124
ef317cd5 18685msgid "write resulting index to <file>"
d9d56b23 18686msgstr "将索引结果写入 <文件>"
ef317cd5 18687
06991777 18688#: builtin/read-tree.c:127
ef317cd5 18689msgid "only empty the index"
07432cef 18690msgstr "只是清空索引"
ef317cd5 18691
06991777 18692#: builtin/read-tree.c:129
ef317cd5 18693msgid "Merging"
07432cef 18694msgstr "合并"
ef317cd5 18695
06991777 18696#: builtin/read-tree.c:131
ef317cd5 18697msgid "perform a merge in addition to a read"
07432cef 18698msgstr "读取之余再执行一个合并"
ef317cd5 18699
06991777 18700#: builtin/read-tree.c:133
ef317cd5 18701msgid "3-way merge if no file level merging required"
160fb2b2 18702msgstr "如果没有文件级合并需要,执行三方合并"
ef317cd5 18703
06991777 18704#: builtin/read-tree.c:135
ef317cd5 18705msgid "3-way merge in presence of adds and removes"
160fb2b2 18706msgstr "存在添加和删除时,也执行三方合并"
ef317cd5 18707
06991777 18708#: builtin/read-tree.c:137
ef317cd5 18709msgid "same as -m, but discard unmerged entries"
07432cef 18710msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 18711
06991777 18712#: builtin/read-tree.c:138
ef317cd5 18713msgid "<subdirectory>/"
07432cef 18714msgstr "<子目录>/"
ef317cd5 18715
06991777 18716#: builtin/read-tree.c:139
ef317cd5 18717msgid "read the tree into the index under <subdirectory>/"
07432cef 18718msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 18719
06991777 18720#: builtin/read-tree.c:142
ef317cd5 18721msgid "update working tree with merge result"
07432cef 18722msgstr "用合并的结果更新工作区"
ef317cd5 18723
06991777 18724#: builtin/read-tree.c:144
ef317cd5 18725msgid "gitignore"
07432cef 18726msgstr "gitignore"
ef317cd5 18727
06991777 18728#: builtin/read-tree.c:145
ef317cd5 18729msgid "allow explicitly ignored files to be overwritten"
07432cef 18730msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 18731
06991777 18732#: builtin/read-tree.c:148
ef317cd5 18733msgid "don't check the working tree after merging"
07432cef 18734msgstr "合并后不检查工作区"
ef317cd5 18735
06991777 18736#: builtin/read-tree.c:149
ef317cd5 18737msgid "don't update the index or the work tree"
07432cef 18738msgstr "不更新索引区和工作区"
ef317cd5 18739
06991777 18740#: builtin/read-tree.c:151
ef317cd5 18741msgid "skip applying sparse checkout filter"
07432cef 18742msgstr "跳过应用稀疏检出过滤器"
ef317cd5 18743
06991777 18744#: builtin/read-tree.c:153
ef317cd5 18745msgid "debug unpack-trees"
07432cef 18746msgstr "调试 unpack-trees"
ef317cd5 18747
d46c5519
JX
18748#: builtin/read-tree.c:157
18749msgid "suppress feedback messages"
18750msgstr "抑制反馈信息"
18751
ddc12c42
JX
18752#: builtin/read-tree.c:188
18753msgid "You need to resolve your current index first"
18754msgstr "您需要先解决当前索引的冲突"
18755
349ede6a 18756#: builtin/rebase.c:35
4c27fcb5 18757msgid ""
a5cd71ca
JX
18758"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
18759"[<upstream> [<branch>]]"
ddc12c42
JX
18760msgstr ""
18761"git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<"
18762"上游> [<分支>]]"
4c27fcb5 18763
349ede6a 18764#: builtin/rebase.c:37
4c27fcb5
JX
18765msgid ""
18766"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
18767msgstr ""
18768"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]"
18769
349ede6a 18770#: builtin/rebase.c:39
4c27fcb5
JX
18771msgid "git rebase --continue | --abort | --skip | --edit-todo"
18772msgstr "git rebase --continue | --abort | --skip | --edit-todo"
18773
d13389bf 18774#: builtin/rebase.c:193 builtin/rebase.c:217 builtin/rebase.c:244
d46c5519
JX
18775#, c-format
18776msgid "unusable todo list: '%s'"
18777msgstr "不可用的待办列表:'%s'"
18778
d13389bf 18779#: builtin/rebase.c:310
d46c5519
JX
18780#, c-format
18781msgid "could not create temporary %s"
18782msgstr "无法创建临时的 %s"
18783
d13389bf 18784#: builtin/rebase.c:316
d46c5519
JX
18785msgid "could not mark as interactive"
18786msgstr "无法标记为交互式"
18787
d13389bf 18788#: builtin/rebase.c:369
d46c5519
JX
18789msgid "could not generate todo list"
18790msgstr "无法生成待办列表"
18791
d13389bf 18792#: builtin/rebase.c:411
d46c5519
JX
18793msgid "a base commit must be provided with --upstream or --onto"
18794msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
18795
d13389bf 18796#: builtin/rebase.c:480
d46c5519
JX
18797msgid "git rebase--interactive [<options>]"
18798msgstr "git rebase--interactive [<选项>]"
18799
d13389bf 18800#: builtin/rebase.c:493 builtin/rebase.c:1388
349ede6a
JX
18801msgid "keep commits which start empty"
18802msgstr "保留初始为空的提交"
d46c5519 18803
d13389bf 18804#: builtin/rebase.c:497 builtin/revert.c:128
d46c5519
JX
18805msgid "allow commits with empty messages"
18806msgstr "允许提交说明为空"
18807
d13389bf 18808#: builtin/rebase.c:499
d46c5519
JX
18809msgid "rebase merge commits"
18810msgstr "对合并提交变基"
18811
d13389bf 18812#: builtin/rebase.c:501
d46c5519
JX
18813msgid "keep original branch points of cousins"
18814msgstr "保持兄弟提交的原始分支点"
18815
d13389bf 18816#: builtin/rebase.c:503
d46c5519
JX
18817msgid "move commits that begin with squash!/fixup!"
18818msgstr "移动以 squash!/fixup! 开头的提交"
18819
d13389bf 18820#: builtin/rebase.c:504
d46c5519
JX
18821msgid "sign commits"
18822msgstr "签名提交"
18823
d13389bf 18824#: builtin/rebase.c:506 builtin/rebase.c:1327
d46c5519 18825msgid "display a diffstat of what changed upstream"
5b533632 18826msgstr "显示上游变化的差异统计"
d46c5519 18827
d13389bf 18828#: builtin/rebase.c:508
d46c5519
JX
18829msgid "continue rebase"
18830msgstr "继续变基"
18831
d13389bf 18832#: builtin/rebase.c:510
d46c5519
JX
18833msgid "skip commit"
18834msgstr "跳过提交"
18835
d13389bf 18836#: builtin/rebase.c:511
d46c5519
JX
18837msgid "edit the todo list"
18838msgstr "变基待办列表"
18839
d13389bf 18840#: builtin/rebase.c:513
d46c5519
JX
18841msgid "show the current patch"
18842msgstr "显示当前补丁"
18843
d13389bf 18844#: builtin/rebase.c:516
d46c5519
JX
18845msgid "shorten commit ids in the todo list"
18846msgstr "缩短待办列表中的提交号"
18847
d13389bf 18848#: builtin/rebase.c:518
d46c5519
JX
18849msgid "expand commit ids in the todo list"
18850msgstr "扩展待办列表中的提交号"
18851
d13389bf 18852#: builtin/rebase.c:520
d46c5519
JX
18853msgid "check the todo list"
18854msgstr "检查待办列表"
18855
d13389bf 18856#: builtin/rebase.c:522
d46c5519
JX
18857msgid "rearrange fixup/squash lines"
18858msgstr "重新排列 fixup/squash 行"
18859
d13389bf 18860#: builtin/rebase.c:524
d46c5519
JX
18861msgid "insert exec commands in todo list"
18862msgstr "在待办列表中插入 exec 执行命令"
18863
d13389bf 18864#: builtin/rebase.c:525
d46c5519
JX
18865msgid "onto"
18866msgstr "onto"
18867
d13389bf 18868#: builtin/rebase.c:528
d46c5519
JX
18869msgid "restrict-revision"
18870msgstr "restrict-revision"
18871
d13389bf 18872#: builtin/rebase.c:528
d46c5519
JX
18873msgid "restrict revision"
18874msgstr "限制版本"
18875
d13389bf 18876#: builtin/rebase.c:530
d46c5519
JX
18877msgid "squash-onto"
18878msgstr "squash-onto"
18879
d13389bf 18880#: builtin/rebase.c:531
d46c5519
JX
18881msgid "squash onto"
18882msgstr "squash onto"
18883
d13389bf 18884#: builtin/rebase.c:533
d46c5519
JX
18885msgid "the upstream commit"
18886msgstr "上游提交"
18887
d13389bf 18888#: builtin/rebase.c:535
d46c5519
JX
18889msgid "head-name"
18890msgstr "head-name"
18891
d13389bf 18892#: builtin/rebase.c:535
d46c5519
JX
18893msgid "head name"
18894msgstr "head 名称"
18895
d13389bf 18896#: builtin/rebase.c:540
d46c5519
JX
18897msgid "rebase strategy"
18898msgstr "变基策略"
18899
d13389bf 18900#: builtin/rebase.c:541
d46c5519
JX
18901msgid "strategy-opts"
18902msgstr "strategy-opts"
18903
d13389bf 18904#: builtin/rebase.c:542
d46c5519
JX
18905msgid "strategy options"
18906msgstr "策略选项"
18907
d13389bf 18908#: builtin/rebase.c:543
d46c5519
JX
18909msgid "switch-to"
18910msgstr "切换到"
18911
d13389bf 18912#: builtin/rebase.c:544
d46c5519
JX
18913msgid "the branch or commit to checkout"
18914msgstr "要检出的分支或提交"
18915
d13389bf 18916#: builtin/rebase.c:545
d46c5519
JX
18917msgid "onto-name"
18918msgstr "onto-name"
18919
d13389bf 18920#: builtin/rebase.c:545
d46c5519
JX
18921msgid "onto name"
18922msgstr "onto name"
18923
d13389bf 18924#: builtin/rebase.c:546
d46c5519
JX
18925msgid "cmd"
18926msgstr "cmd"
18927
d13389bf 18928#: builtin/rebase.c:546
d46c5519
JX
18929msgid "the command to run"
18930msgstr "要执行的命令"
18931
d13389bf 18932#: builtin/rebase.c:549 builtin/rebase.c:1421
d46c5519
JX
18933msgid "automatically re-schedule any `exec` that fails"
18934msgstr "自动重新安排任何失败的 `exec`"
18935
d13389bf 18936#: builtin/rebase.c:565
d46c5519
JX
18937msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
18938msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果"
18939
d13389bf 18940#: builtin/rebase.c:581
4c27fcb5 18941#, c-format
349ede6a
JX
18942msgid "%s requires the merge backend"
18943msgstr "%s 需要合并后端"
4c27fcb5 18944
d13389bf 18945#: builtin/rebase.c:624
4c27fcb5
JX
18946#, c-format
18947msgid "could not get 'onto': '%s'"
18948msgstr "无法获取 'onto':'%s'"
18949
d13389bf 18950#: builtin/rebase.c:641
4c27fcb5
JX
18951#, c-format
18952msgid "invalid orig-head: '%s'"
18953msgstr "无效的原始 head:'%s'"
18954
d13389bf 18955#: builtin/rebase.c:666
4c27fcb5
JX
18956#, c-format
18957msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
18958msgstr "忽略无效的 allow_rerere_autoupdate:'%s'"
18959
d13389bf 18960#: builtin/rebase.c:811 git-rebase--preserve-merges.sh:81
4c27fcb5
JX
18961msgid ""
18962"Resolve all conflicts manually, mark them as resolved with\n"
18963"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
18964"You can instead skip this commit: run \"git rebase --skip\".\n"
18965"To abort and get back to the state before \"git rebase\", run \"git rebase --"
18966"abort\"."
18967msgstr ""
18968"手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n"
18969"冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n"
18970"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
18971"\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。"
18972
d13389bf 18973#: builtin/rebase.c:894
06991777
JX
18974#, c-format
18975msgid ""
18976"\n"
18977"git encountered an error while preparing the patches to replay\n"
18978"these revisions:\n"
18979"\n"
18980" %s\n"
18981"\n"
18982"As a result, git cannot rebase them."
18983msgstr ""
18984"\n"
18985"在为重放这些版本而准备补丁时,git 遇到了一个错误:\n"
18986"\n"
18987" %s\n"
18988"\n"
18989"因此 git 无法对其变基。"
4c27fcb5 18990
d13389bf 18991#: builtin/rebase.c:1220
2b472aae
JX
18992#, c-format
18993msgid ""
18994"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
18995"\"."
440e7442 18996msgstr "无法识别的空类型 '%s';有效值有 \"drop\"、\"keep\" 和 \"ask\"。"
2b472aae 18997
d13389bf 18998#: builtin/rebase.c:1238
4c27fcb5
JX
18999#, c-format
19000msgid ""
19001"%s\n"
19002"Please specify which branch you want to rebase against.\n"
19003"See git-rebase(1) for details.\n"
19004"\n"
19005" git rebase '<branch>'\n"
19006"\n"
19007msgstr ""
19008"%s\n"
19009"请指定您要变基到哪个分支。\n"
19010"详见 git-rebase(1)。\n"
19011"\n"
19012" git rebase '<branch>'\n"
19013"\n"
19014
d13389bf 19015#: builtin/rebase.c:1254
4c27fcb5
JX
19016#, c-format
19017msgid ""
19018"If you wish to set tracking information for this branch you can do so with:\n"
19019"\n"
19020" git branch --set-upstream-to=%s/<branch> %s\n"
19021"\n"
19022msgstr ""
19023"如果您想要为此分支创建跟踪信息,您可以执行:\n"
19024"\n"
19025" git branch --set-upstream-to=%s/<branch> %s\n"
19026"\n"
19027
d13389bf 19028#: builtin/rebase.c:1284
06991777
JX
19029msgid "exec commands cannot contain newlines"
19030msgstr "exec 命令不能包含换行符"
19031
d13389bf 19032#: builtin/rebase.c:1288
06991777
JX
19033msgid "empty exec command"
19034msgstr "空的 exec 命令"
19035
d13389bf 19036#: builtin/rebase.c:1318
4c27fcb5
JX
19037msgid "rebase onto given branch instead of upstream"
19038msgstr "变基到给定的分支而非上游"
19039
d13389bf 19040#: builtin/rebase.c:1320
a5cd71ca
JX
19041msgid "use the merge-base of upstream and branch as the current base"
19042msgstr "使用上游和分支的合并基线做为当前基线"
19043
d13389bf 19044#: builtin/rebase.c:1322
4c27fcb5
JX
19045msgid "allow pre-rebase hook to run"
19046msgstr "允许执行 pre-rebase 钩子"
19047
d13389bf 19048#: builtin/rebase.c:1324
4c27fcb5
JX
19049msgid "be quiet. implies --no-stat"
19050msgstr "安静。暗示 --no-stat"
19051
d13389bf 19052#: builtin/rebase.c:1330
4c27fcb5 19053msgid "do not show diffstat of what changed upstream"
5b533632 19054msgstr "不显示上游变化的差异统计"
4c27fcb5 19055
d13389bf
JX
19056#: builtin/rebase.c:1333
19057msgid "add a Signed-off-by trailer to each commit"
19058msgstr "为每一个提交添加 Signed-off-by 尾注"
4c27fcb5 19059
d13389bf 19060#: builtin/rebase.c:1336
d9488fea
JX
19061msgid "make committer date match author date"
19062msgstr "使提交者日期和作者日期一致"
19063
d13389bf 19064#: builtin/rebase.c:1338
d9488fea
JX
19065msgid "ignore author date and use current date"
19066msgstr "忽略作者日期,使用当前日期"
19067
d13389bf 19068#: builtin/rebase.c:1340
d9488fea
JX
19069msgid "synonym of --reset-author-date"
19070msgstr "--reset-author-date 的同义词"
4c27fcb5 19071
d13389bf 19072#: builtin/rebase.c:1342 builtin/rebase.c:1346
4c27fcb5
JX
19073msgid "passed to 'git apply'"
19074msgstr "传递给 'git apply'"
19075
d13389bf 19076#: builtin/rebase.c:1344
d9488fea
JX
19077msgid "ignore changes in whitespace"
19078msgstr "忽略空白字符的变更"
19079
d13389bf 19080#: builtin/rebase.c:1348 builtin/rebase.c:1351
4c27fcb5
JX
19081msgid "cherry-pick all commits, even if unchanged"
19082msgstr "拣选所有提交,即使未修改"
19083
d13389bf 19084#: builtin/rebase.c:1353
4c27fcb5
JX
19085msgid "continue"
19086msgstr "继续"
19087
d13389bf 19088#: builtin/rebase.c:1356
4c27fcb5
JX
19089msgid "skip current patch and continue"
19090msgstr "跳过当前补丁并继续"
19091
19092# 译者:注意保持前导空格
d13389bf 19093#: builtin/rebase.c:1358
4c27fcb5
JX
19094msgid "abort and check out the original branch"
19095msgstr "终止并检出原有分支"
19096
d13389bf 19097#: builtin/rebase.c:1361
4c27fcb5
JX
19098msgid "abort but keep HEAD where it is"
19099msgstr "终止但保持 HEAD 不变"
19100
d13389bf 19101#: builtin/rebase.c:1362
4c27fcb5
JX
19102msgid "edit the todo list during an interactive rebase"
19103msgstr "在交互式变基中编辑待办列表"
19104
d13389bf 19105#: builtin/rebase.c:1365
4c27fcb5
JX
19106msgid "show the patch file being applied or merged"
19107msgstr "显示正在应用或合并的补丁文件"
19108
d13389bf 19109#: builtin/rebase.c:1368
2b472aae
JX
19110msgid "use apply strategies to rebase"
19111msgstr "使用应用策略进行变基"
19112
d13389bf 19113#: builtin/rebase.c:1372
4c27fcb5
JX
19114msgid "use merging strategies to rebase"
19115msgstr "使用合并策略进行变基"
19116
d13389bf 19117#: builtin/rebase.c:1376
4c27fcb5
JX
19118msgid "let the user edit the list of commits to rebase"
19119msgstr "让用户编辑要变基的提交列表"
19120
d13389bf 19121#: builtin/rebase.c:1380
d46c5519
JX
19122msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
19123msgstr "(已弃用)尝试重建合并提交而非忽略它们"
4c27fcb5 19124
d13389bf 19125#: builtin/rebase.c:1385
2b472aae 19126msgid "how to handle commits that become empty"
440e7442 19127msgstr "如何处理成为空提交的提交"
4c27fcb5 19128
d13389bf 19129#: builtin/rebase.c:1392
4c27fcb5
JX
19130msgid "move commits that begin with squash!/fixup! under -i"
19131msgstr "在 -i 交互模式下,移动以 squash!/fixup! 开头的提交"
19132
d13389bf 19133#: builtin/rebase.c:1399
4c27fcb5
JX
19134msgid "add exec lines after each commit of the editable list"
19135msgstr "可编辑列表的每一个提交下面增加一行 exec"
19136
d13389bf 19137#: builtin/rebase.c:1403
4c27fcb5
JX
19138msgid "allow rebasing commits with empty messages"
19139msgstr "允许针对空提交说明的提交变基"
19140
d13389bf 19141#: builtin/rebase.c:1407
4c27fcb5
JX
19142msgid "try to rebase merges instead of skipping them"
19143msgstr "尝试对合并提交变基而不是忽略它们"
19144
d13389bf 19145#: builtin/rebase.c:1410
4c27fcb5
JX
19146msgid "use 'merge-base --fork-point' to refine upstream"
19147msgstr "使用 'merge-base --fork-point' 来优化上游"
19148
d13389bf 19149#: builtin/rebase.c:1412
4c27fcb5
JX
19150msgid "use the given merge strategy"
19151msgstr "使用给定的合并策略"
19152
d13389bf 19153#: builtin/rebase.c:1414 builtin/revert.c:115
4c27fcb5
JX
19154msgid "option"
19155msgstr "选项"
19156
d13389bf 19157#: builtin/rebase.c:1415
4c27fcb5
JX
19158msgid "pass the argument through to the merge strategy"
19159msgstr "将参数传递给合并策略"
19160
d13389bf 19161#: builtin/rebase.c:1418
4c27fcb5
JX
19162msgid "rebase all reachable commits up to the root(s)"
19163msgstr "将所有可达的提交变基到根提交"
19164
d13389bf 19165#: builtin/rebase.c:1423
349ede6a
JX
19166msgid "apply all changes, even those already present upstream"
19167msgstr "应用所有更改,甚至那些已在上游存在的"
19168
d13389bf 19169#: builtin/rebase.c:1440
d46c5519
JX
19170msgid ""
19171"the rebase.useBuiltin support has been removed!\n"
19172"See its entry in 'git help config' for details."
19173msgstr ""
19174"对 rebase.useBuiltin 的支持已被删除!\n"
19175"详见 'git help config' 中的条目。"
4c27fcb5 19176
d13389bf 19177#: builtin/rebase.c:1446
4c27fcb5
JX
19178msgid "It looks like 'git am' is in progress. Cannot rebase."
19179msgstr "看起来 'git-am' 正在执行中。无法变基。"
19180
d13389bf 19181#: builtin/rebase.c:1487
d46c5519
JX
19182msgid ""
19183"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
19184msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。"
19185
d13389bf 19186#: builtin/rebase.c:1492
a5cd71ca
JX
19187msgid "cannot combine '--keep-base' with '--onto'"
19188msgstr "不能将 '--keep-base' 和 '--onto' 组合使用"
19189
d13389bf 19190#: builtin/rebase.c:1494
a5cd71ca
JX
19191msgid "cannot combine '--keep-base' with '--root'"
19192msgstr "不能将 '--keep-base' 和 '--root' 组合使用"
19193
d13389bf 19194#: builtin/rebase.c:1498
349ede6a
JX
19195msgid "cannot combine '--root' with '--fork-point'"
19196msgstr "不能将 '--root' 和 '--fork-point' 组合使用"
19197
d13389bf 19198#: builtin/rebase.c:1501
4c27fcb5
JX
19199msgid "No rebase in progress?"
19200msgstr "没有正在进行的变基?"
19201
d13389bf 19202#: builtin/rebase.c:1505
4c27fcb5
JX
19203msgid "The --edit-todo action can only be used during interactive rebase."
19204msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
19205
d13389bf 19206#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123
4c27fcb5
JX
19207msgid "Cannot read HEAD"
19208msgstr "不能读取 HEAD"
19209
d13389bf 19210#: builtin/rebase.c:1540
4c27fcb5
JX
19211msgid ""
19212"You must edit all merge conflicts and then\n"
19213"mark them as resolved using git add"
19214msgstr ""
19215"您必须编辑所有的合并冲突,然后通过 git add\n"
19216"命令将它们标记为已解决"
19217
d13389bf 19218#: builtin/rebase.c:1559
4c27fcb5
JX
19219msgid "could not discard worktree changes"
19220msgstr "无法丢弃工作区变更"
19221
d13389bf 19222#: builtin/rebase.c:1578
4c27fcb5
JX
19223#, c-format
19224msgid "could not move back to %s"
19225msgstr "无法移回 %s"
19226
d13389bf 19227#: builtin/rebase.c:1624
4c27fcb5
JX
19228#, c-format
19229msgid ""
19230"It seems that there is already a %s directory, and\n"
19231"I wonder if you are in the middle of another rebase. If that is the\n"
19232"case, please try\n"
19233"\t%s\n"
19234"If that is not the case, please\n"
19235"\t%s\n"
19236"and run me again. I am stopping in case you still have something\n"
19237"valuable there.\n"
19238msgstr ""
19239"似乎已有一个 %s 目录,我怀疑您正处于另外一个变基操作过程中。\n"
19240"如果是这样,请执行\n"
19241"\t%s\n"
19242"如果不是这样,请执行\n"
19243"\t%s\n"
19244"然后再重新执行。 为避免丢失重要数据,我已经停止当前操作。\n"
19245
d13389bf 19246#: builtin/rebase.c:1652
4c27fcb5
JX
19247msgid "switch `C' expects a numerical value"
19248msgstr "开关 `C' 期望一个数字值"
19249
d13389bf 19250#: builtin/rebase.c:1694
4c27fcb5
JX
19251#, c-format
19252msgid "Unknown mode: %s"
19253msgstr "未知模式:%s"
19254
d13389bf 19255#: builtin/rebase.c:1733
4c27fcb5
JX
19256msgid "--strategy requires --merge or --interactive"
19257msgstr "--strategy 需要 --merge 或 --interactive"
19258
d13389bf 19259#: builtin/rebase.c:1763
2b472aae
JX
19260msgid "cannot combine apply options with merge options"
19261msgstr "不能组合使用应用选项和合并选项"
19262
d13389bf 19263#: builtin/rebase.c:1776
2b472aae
JX
19264#, c-format
19265msgid "Unknown rebase backend: %s"
19266msgstr "未知的变基后端:%s"
19267
d13389bf 19268#: builtin/rebase.c:1806
a6cd2cc4
JX
19269msgid "--reschedule-failed-exec requires --exec or --interactive"
19270msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
19271
d13389bf 19272#: builtin/rebase.c:1826
06991777 19273msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
5b533632 19274msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"
4c27fcb5 19275
d13389bf 19276#: builtin/rebase.c:1830
06991777
JX
19277msgid ""
19278"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
19279msgstr ""
5b533632 19280"错误:不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"
4c27fcb5 19281
d13389bf 19282#: builtin/rebase.c:1854
4c27fcb5
JX
19283#, c-format
19284msgid "invalid upstream '%s'"
19285msgstr "无效的上游 '%s'"
19286
d13389bf 19287#: builtin/rebase.c:1860
4c27fcb5
JX
19288msgid "Could not create new root commit"
19289msgstr "不能创建新的根提交"
19290
d13389bf 19291#: builtin/rebase.c:1886
a5cd71ca
JX
19292#, c-format
19293msgid "'%s': need exactly one merge base with branch"
19294msgstr "'%s':只需要与分支的一个合并基线"
19295
d13389bf 19296#: builtin/rebase.c:1889
4c27fcb5
JX
19297#, c-format
19298msgid "'%s': need exactly one merge base"
19299msgstr "'%s':只需要一个合并基线"
19300
d13389bf 19301#: builtin/rebase.c:1897
4c27fcb5
JX
19302#, c-format
19303msgid "Does not point to a valid commit '%s'"
19304msgstr "没有指向一个有效的提交 '%s'"
19305
d13389bf 19306#: builtin/rebase.c:1923
4c27fcb5
JX
19307#, c-format
19308msgid "fatal: no such branch/commit '%s'"
06991777 19309msgstr "致命错误:无此分支/提交 '%s'"
4c27fcb5 19310
d13389bf 19311#: builtin/rebase.c:1931 builtin/submodule--helper.c:40
d9488fea 19312#: builtin/submodule--helper.c:2414
4c27fcb5
JX
19313#, c-format
19314msgid "No such ref: %s"
19315msgstr "没有这样的引用:%s"
19316
d13389bf 19317#: builtin/rebase.c:1942
4c27fcb5
JX
19318msgid "Could not resolve HEAD to a revision"
19319msgstr "无法将 HEAD 解析为一个版本"
19320
d13389bf 19321#: builtin/rebase.c:1963
4c27fcb5
JX
19322msgid "Please commit or stash them."
19323msgstr "请提交或贮藏修改。"
19324
d13389bf 19325#: builtin/rebase.c:1999
4c27fcb5
JX
19326#, c-format
19327msgid "could not switch to %s"
19328msgstr "无法切换到 %s"
19329
d13389bf 19330#: builtin/rebase.c:2010
4c27fcb5
JX
19331msgid "HEAD is up to date."
19332msgstr "HEAD 是最新的。"
19333
d13389bf 19334#: builtin/rebase.c:2012
4c27fcb5
JX
19335#, c-format
19336msgid "Current branch %s is up to date.\n"
19337msgstr "当前分支 %s 是最新的。\n"
19338
d13389bf 19339#: builtin/rebase.c:2020
4c27fcb5
JX
19340msgid "HEAD is up to date, rebase forced."
19341msgstr "HEAD 是最新的,强制变基。"
19342
d13389bf 19343#: builtin/rebase.c:2022
4c27fcb5
JX
19344#, c-format
19345msgid "Current branch %s is up to date, rebase forced.\n"
19346msgstr "当前分支 %s 是最新的,强制变基。\n"
19347
d13389bf 19348#: builtin/rebase.c:2030
4c27fcb5
JX
19349msgid "The pre-rebase hook refused to rebase."
19350msgstr "pre-rebase 钩子拒绝了变基操作。"
19351
d13389bf 19352#: builtin/rebase.c:2037
4c27fcb5
JX
19353#, c-format
19354msgid "Changes to %s:\n"
19355msgstr "到 %s 的变更:\n"
19356
d13389bf 19357#: builtin/rebase.c:2040
4c27fcb5
JX
19358#, c-format
19359msgid "Changes from %s to %s:\n"
19360msgstr "从 %s 到 %s 的变更:\n"
19361
d13389bf 19362#: builtin/rebase.c:2065
4c27fcb5
JX
19363#, c-format
19364msgid "First, rewinding head to replay your work on top of it...\n"
19365msgstr "首先,回退头指针以便在其上重放您的工作...\n"
19366
d13389bf 19367#: builtin/rebase.c:2074
4c27fcb5
JX
19368msgid "Could not detach HEAD"
19369msgstr "无法分离头指针"
19370
d13389bf 19371#: builtin/rebase.c:2083
4c27fcb5
JX
19372#, c-format
19373msgid "Fast-forwarded %s to %s.\n"
19374msgstr "快进 %s 到 %s。\n"
19375
349ede6a 19376#: builtin/receive-pack.c:34
5b04ee3b 19377msgid "git receive-pack <git-dir>"
58b6f078 19378msgstr "git receive-pack <仓库目录>"
5b04ee3b 19379
d13389bf 19380#: builtin/receive-pack.c:1276
a0b6b246
JX
19381msgid ""
19382"By default, updating the current branch in a non-bare repository\n"
19383"is denied, because it will make the index and work tree inconsistent\n"
19384"with what you pushed, and will require 'git reset --hard' to match\n"
19385"the work tree to HEAD.\n"
19386"\n"
1a79b2f1
JX
19387"You can set the 'receive.denyCurrentBranch' configuration variable\n"
19388"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
a0b6b246
JX
19389"its current branch; however, this is not recommended unless you\n"
19390"arranged to update its work tree to match what you pushed in some\n"
19391"other way.\n"
19392"\n"
19393"To squelch this message and still keep the default behaviour, set\n"
19394"'receive.denyCurrentBranch' configuration variable to 'refuse'."
19395msgstr ""
19396"默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
19397"不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
19398"\n"
19399"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
19400"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
19401"用某种方式将其工作区更新至您推送的状态。\n"
19402"\n"
19403"若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
19404"配置变量为 'refuse'。"
19405
d13389bf 19406#: builtin/receive-pack.c:1296
a0b6b246
JX
19407msgid ""
19408"By default, deleting the current branch is denied, because the next\n"
19409"'git clone' won't result in any file checked out, causing confusion.\n"
19410"\n"
19411"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
19412"'warn' or 'ignore' in the remote repository to allow deleting the\n"
19413"current branch, with or without a warning message.\n"
19414"\n"
19415"To squelch this message, you can set it to 'refuse'."
19416msgstr ""
19417"默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
29004bbb 19418"导致困惑。\n"
a0b6b246
JX
19419"\n"
19420"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
29004bbb 19421"'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
a0b6b246
JX
19422"\n"
19423"若要屏蔽此信息,您可以设置它为 'refuse'。"
19424
d13389bf 19425#: builtin/receive-pack.c:2481
5b04ee3b
JX
19426msgid "quiet"
19427msgstr "静默模式"
19428
d13389bf 19429#: builtin/receive-pack.c:2495
5b04ee3b
JX
19430msgid "You must specify a directory."
19431msgstr "您必须指定一个目录。"
19432
06991777
JX
19433#: builtin/reflog.c:17
19434msgid ""
19435"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
19436"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
19437"<refs>..."
19438msgstr ""
19439"git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>] [--"
19440"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引"
19441"用>..."
19442
19443#: builtin/reflog.c:22
19444msgid ""
19445"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
19446"<refs>..."
19447msgstr ""
19448"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引"
19449"用>..."
19450
19451#: builtin/reflog.c:25
19452msgid "git reflog exists <ref>"
19453msgstr "git reflog exists <引用>"
19454
2b472aae 19455#: builtin/reflog.c:568 builtin/reflog.c:573
2e8451e8
JX
19456#, c-format
19457msgid "'%s' is not a valid timestamp"
19458msgstr "'%s' 不是一个有效的时间戳"
19459
2b472aae 19460#: builtin/reflog.c:606
06991777
JX
19461#, c-format
19462msgid "Marking reachable objects..."
19463msgstr "正在标记可达对象..."
19464
2b472aae 19465#: builtin/reflog.c:644
06991777
JX
19466#, c-format
19467msgid "%s points nowhere!"
19468msgstr "%s 指向不存在!"
19469
2b472aae 19470#: builtin/reflog.c:696
06991777
JX
19471msgid "no reflog specified to delete"
19472msgstr "未指定要删除的引用日志"
19473
2b472aae 19474#: builtin/reflog.c:705
06991777
JX
19475#, c-format
19476msgid "not a reflog: %s"
19477msgstr "不是一个引用日志:%s"
19478
2b472aae 19479#: builtin/reflog.c:710
06991777
JX
19480#, c-format
19481msgid "no reflog for '%s'"
19482msgstr "没有 '%s' 的引用日志"
19483
2b472aae 19484#: builtin/reflog.c:756
06991777
JX
19485#, c-format
19486msgid "invalid ref format: %s"
19487msgstr "无效的引用格式:%s"
19488
2b472aae 19489#: builtin/reflog.c:765
06991777
JX
19490msgid "git reflog [ show | expire | delete | exists ]"
19491msgstr "git reflog [ show | expire | delete | exists ]"
19492
2b472aae 19493#: builtin/remote.c:17
ef317cd5 19494msgid "git remote [-v | --verbose]"
07432cef 19495msgstr "git remote [-v | --verbose]"
ef317cd5 19496
2b472aae 19497#: builtin/remote.c:18
ef317cd5 19498msgid ""
814ff314 19499"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
ef317cd5
JX
19500"mirror=<fetch|push>] <name> <url>"
19501msgstr ""
814ff314 19502"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
d9d56b23 19503"mirror=<fetch|push>] <名称> <地址>"
ef317cd5 19504
2b472aae 19505#: builtin/remote.c:19 builtin/remote.c:39
ef317cd5 19506msgid "git remote rename <old> <new>"
07432cef 19507msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 19508
2b472aae 19509#: builtin/remote.c:20 builtin/remote.c:44
ef317cd5 19510msgid "git remote remove <name>"
07432cef 19511msgstr "git remote remove <名称>"
ef317cd5 19512
2b472aae 19513#: builtin/remote.c:21 builtin/remote.c:49
814ff314
JX
19514msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
19515msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
ef317cd5 19516
2b472aae 19517#: builtin/remote.c:22
ef317cd5 19518msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 19519msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 19520
2b472aae 19521#: builtin/remote.c:23
ef317cd5 19522msgid "git remote prune [-n | --dry-run] <name>"
07432cef 19523msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 19524
2b472aae 19525#: builtin/remote.c:24
ef317cd5
JX
19526msgid ""
19527"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 19528msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 19529
2b472aae 19530#: builtin/remote.c:25
ef317cd5 19531msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 19532msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 19533
2b472aae 19534#: builtin/remote.c:26 builtin/remote.c:75
94550ed3
JX
19535msgid "git remote get-url [--push] [--all] <name>"
19536msgstr "git remote get-url [--push] [--all] <名称>"
19537
2b472aae 19538#: builtin/remote.c:27 builtin/remote.c:80
ef317cd5 19539msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 19540msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 19541
2b472aae 19542#: builtin/remote.c:28 builtin/remote.c:81
ef317cd5 19543msgid "git remote set-url --add <name> <newurl>"
07432cef 19544msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 19545
2b472aae 19546#: builtin/remote.c:29 builtin/remote.c:82
ef317cd5 19547msgid "git remote set-url --delete <name> <url>"
07432cef 19548msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 19549
2b472aae 19550#: builtin/remote.c:34
ef317cd5 19551msgid "git remote add [<options>] <name> <url>"
07432cef 19552msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 19553
2b472aae 19554#: builtin/remote.c:54
ef317cd5 19555msgid "git remote set-branches <name> <branch>..."
07432cef 19556msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 19557
2b472aae 19558#: builtin/remote.c:55
ef317cd5 19559msgid "git remote set-branches --add <name> <branch>..."
07432cef 19560msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 19561
2b472aae 19562#: builtin/remote.c:60
ef317cd5 19563msgid "git remote show [<options>] <name>"
07432cef 19564msgstr "git remote show [<选项>] <名称>"
ef317cd5 19565
2b472aae 19566#: builtin/remote.c:65
ef317cd5 19567msgid "git remote prune [<options>] <name>"
07432cef 19568msgstr "git remote prune [<选项>] <名称>"
ef317cd5 19569
2b472aae 19570#: builtin/remote.c:70
ef317cd5 19571msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 19572msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 19573
2b472aae 19574#: builtin/remote.c:99
81809b99 19575#, c-format
8ada9598 19576msgid "Updating %s"
81809b99 19577msgstr "更新 %s 中"
8ada9598 19578
2b472aae 19579#: builtin/remote.c:131
8ada9598
JX
19580msgid ""
19581"--mirror is dangerous and deprecated; please\n"
19582"\t use --mirror=fetch or --mirror=push instead"
19583msgstr ""
81809b99
JX
19584"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
19585"\t 或 --mirror=push"
8ada9598 19586
2b472aae 19587#: builtin/remote.c:148
81809b99 19588#, c-format
8ada9598 19589msgid "unknown mirror argument: %s"
81809b99 19590msgstr "未知的镜像参数:%s"
8ada9598 19591
2b472aae 19592#: builtin/remote.c:164
ef317cd5 19593msgid "fetch the remote branches"
07432cef 19594msgstr "抓取远程的分支"
ef317cd5 19595
2b472aae 19596#: builtin/remote.c:166
ef317cd5 19597msgid "import all tags and associated objects when fetching"
55a16ee4 19598msgstr "抓取时导入所有的标签和关联对象"
ef317cd5 19599
2b472aae 19600#: builtin/remote.c:169
ef317cd5 19601msgid "or do not fetch any tag at all (--no-tags)"
55a16ee4 19602msgstr "或不抓取任何标签(--no-tags)"
ef317cd5 19603
2b472aae 19604#: builtin/remote.c:171
ef317cd5 19605msgid "branch(es) to track"
07432cef 19606msgstr "跟踪的分支"
ef317cd5 19607
2b472aae 19608#: builtin/remote.c:172
ef317cd5 19609msgid "master branch"
07432cef 19610msgstr "主线分支"
ef317cd5 19611
2b472aae 19612#: builtin/remote.c:174
ef317cd5 19613msgid "set up remote as a mirror to push to or fetch from"
07432cef 19614msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 19615
2b472aae 19616#: builtin/remote.c:186
8ada9598 19617msgid "specifying a master branch makes no sense with --mirror"
81809b99 19618msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 19619
2b472aae 19620#: builtin/remote.c:188
8ada9598 19621msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 19622msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 19623
d13389bf 19624#: builtin/remote.c:195 builtin/remote.c:700
81809b99 19625#, c-format
8ada9598 19626msgid "remote %s already exists."
81809b99 19627msgstr "远程 %s 已经存在。"
8ada9598 19628
d13389bf 19629#: builtin/remote.c:240
81809b99 19630#, c-format
8ada9598 19631msgid "Could not setup master '%s'"
81809b99 19632msgstr "无法设置 master '%s'"
8ada9598 19633
d13389bf 19634#: builtin/remote.c:355
81809b99 19635#, c-format
8ada9598 19636msgid "Could not get fetch map for refspec %s"
160fb2b2 19637msgstr "无法得到引用规格 %s 的获取列表"
8ada9598 19638
d13389bf 19639#: builtin/remote.c:454 builtin/remote.c:462
8ada9598 19640msgid "(matching)"
81809b99 19641msgstr "(匹配)"
8ada9598 19642
d13389bf 19643#: builtin/remote.c:466
8ada9598 19644msgid "(delete)"
81809b99 19645msgstr "(删除)"
8ada9598 19646
d13389bf 19647#: builtin/remote.c:655
2b472aae
JX
19648#, c-format
19649msgid "could not set '%s'"
19650msgstr "不能设置 '%s'"
19651
d13389bf 19652#: builtin/remote.c:660
2b472aae
JX
19653#, c-format
19654msgid ""
19655"The %s configuration remote.pushDefault in:\n"
19656"\t%s:%d\n"
19657"now names the non-existent remote '%s'"
19658msgstr ""
19659"配置(%s)remote.pushDefault 位于:\n"
19660"\t%s:%d\n"
19661"现在在为不存在的远程名 '%s' 命名"
19662
d13389bf 19663#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
81809b99 19664#, c-format
4c27fcb5
JX
19665msgid "No such remote: '%s'"
19666msgstr "没有此远程仓库:'%s'"
8ada9598 19667
d13389bf 19668#: builtin/remote.c:710
81809b99 19669#, c-format
8ada9598 19670msgid "Could not rename config section '%s' to '%s'"
81809b99 19671msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 19672
d13389bf 19673#: builtin/remote.c:730
8ada9598
JX
19674#, c-format
19675msgid ""
d691f479 19676"Not updating non-default fetch refspec\n"
8ada9598
JX
19677"\t%s\n"
19678"\tPlease update the configuration manually if necessary."
19679msgstr ""
160fb2b2 19680"没有更新非默认的获取引用规格\n"
81809b99
JX
19681"\t%s\n"
19682"\t如果必要请手动更新配置。"
8ada9598 19683
d13389bf 19684#: builtin/remote.c:770
81809b99 19685#, c-format
8ada9598 19686msgid "deleting '%s' failed"
81809b99 19687msgstr "删除 '%s' 失败"
8ada9598 19688
d13389bf 19689#: builtin/remote.c:804
81809b99 19690#, c-format
8ada9598 19691msgid "creating '%s' failed"
81809b99 19692msgstr "创建 '%s' 失败"
8ada9598 19693
d13389bf 19694#: builtin/remote.c:882
8ada9598
JX
19695msgid ""
19696"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
19697"to delete it, use:"
19698msgid_plural ""
19699"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
19700"to delete them, use:"
5ae481e0
JX
19701msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
19702msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 19703
d13389bf 19704#: builtin/remote.c:896
276ceeaa
JX
19705#, c-format
19706msgid "Could not remove config section '%s'"
19707msgstr "不能移除配置小节 '%s'"
19708
d13389bf 19709#: builtin/remote.c:999
8ada9598
JX
19710#, c-format
19711msgid " new (next fetch will store in remotes/%s)"
81809b99 19712msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 19713
d13389bf 19714#: builtin/remote.c:1002
8ada9598 19715msgid " tracked"
81809b99 19716msgstr " 已跟踪"
8ada9598 19717
d13389bf 19718#: builtin/remote.c:1004
8ada9598 19719msgid " stale (use 'git remote prune' to remove)"
81809b99 19720msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 19721
d13389bf 19722#: builtin/remote.c:1006
8ada9598 19723msgid " ???"
81809b99 19724msgstr " ???"
8ada9598 19725
d13389bf 19726#: builtin/remote.c:1047
8ada9598
JX
19727#, c-format
19728msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 19729msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 19730
d13389bf 19731#: builtin/remote.c:1056
81809b99 19732#, c-format
276ceeaa
JX
19733msgid "rebases interactively onto remote %s"
19734msgstr "交互式变基到远程 %s"
8ada9598 19735
d13389bf 19736#: builtin/remote.c:1058
fd8cb379
JX
19737#, c-format
19738msgid "rebases interactively (with merges) onto remote %s"
19739msgstr "交互式变基(含合并提交)到远程 %s"
19740
d13389bf 19741#: builtin/remote.c:1061
5c57d762
JX
19742#, c-format
19743msgid "rebases onto remote %s"
19744msgstr "变基到远程 %s"
19745
d13389bf 19746#: builtin/remote.c:1065
81809b99 19747#, c-format
8ada9598 19748msgid " merges with remote %s"
81809b99 19749msgstr " 与远程 %s 合并"
8ada9598 19750
d13389bf 19751#: builtin/remote.c:1068
81809b99 19752#, c-format
8ada9598 19753msgid "merges with remote %s"
81809b99 19754msgstr "与远程 %s 合并"
8ada9598 19755
d13389bf 19756#: builtin/remote.c:1071
5c57d762
JX
19757#, c-format
19758msgid "%-*s and with remote %s\n"
19759msgstr "%-*s 以及和远程 %s\n"
8ada9598 19760
d13389bf 19761#: builtin/remote.c:1114
8ada9598 19762msgid "create"
81809b99 19763msgstr "创建"
8ada9598 19764
d13389bf 19765#: builtin/remote.c:1117
8ada9598 19766msgid "delete"
81809b99 19767msgstr "删除"
8ada9598 19768
d13389bf 19769#: builtin/remote.c:1121
8ada9598 19770msgid "up to date"
81809b99 19771msgstr "最新"
8ada9598 19772
d13389bf 19773#: builtin/remote.c:1124
8ada9598 19774msgid "fast-forwardable"
81809b99 19775msgstr "可快进"
8ada9598 19776
d13389bf 19777#: builtin/remote.c:1127
8ada9598 19778msgid "local out of date"
81809b99 19779msgstr "本地已过时"
8ada9598 19780
d13389bf 19781#: builtin/remote.c:1134
8ada9598
JX
19782#, c-format
19783msgid " %-*s forces to %-*s (%s)"
81809b99 19784msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 19785
d13389bf 19786#: builtin/remote.c:1137
8ada9598
JX
19787#, c-format
19788msgid " %-*s pushes to %-*s (%s)"
81809b99 19789msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 19790
d13389bf 19791#: builtin/remote.c:1141
8ada9598
JX
19792#, c-format
19793msgid " %-*s forces to %s"
81809b99 19794msgstr " %-*s 强制推送至 %s"
8ada9598 19795
d13389bf 19796#: builtin/remote.c:1144
8ada9598
JX
19797#, c-format
19798msgid " %-*s pushes to %s"
81809b99 19799msgstr " %-*s 推送至 %s"
8ada9598 19800
d13389bf 19801#: builtin/remote.c:1212
ef317cd5 19802msgid "do not query remotes"
07432cef 19803msgstr "不查询远程"
ef317cd5 19804
d13389bf 19805#: builtin/remote.c:1239
81809b99 19806#, c-format
8ada9598 19807msgid "* remote %s"
81809b99 19808msgstr "* 远程 %s"
8ada9598 19809
d13389bf 19810#: builtin/remote.c:1240
8ada9598
JX
19811#, c-format
19812msgid " Fetch URL: %s"
81809b99 19813msgstr " 获取地址:%s"
8ada9598 19814
d13389bf 19815#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
8ada9598 19816msgid "(no URL)"
81809b99 19817msgstr "(无 URL)"
8ada9598 19818
a4f16749
JX
19819#. TRANSLATORS: the colon ':' should align
19820#. with the one in " Fetch URL: %s"
19821#. translation.
19822#.
d13389bf 19823#: builtin/remote.c:1255 builtin/remote.c:1257
8ada9598
JX
19824#, c-format
19825msgid " Push URL: %s"
81809b99 19826msgstr " 推送地址:%s"
8ada9598 19827
d13389bf 19828#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
81809b99 19829#, c-format
8ada9598 19830msgid " HEAD branch: %s"
4375c10e 19831msgstr " HEAD 分支:%s"
8ada9598 19832
5c57d762 19833# 译者:中文字符串拼接,可删除前导空格
d13389bf 19834#: builtin/remote.c:1259
5c57d762
JX
19835msgid "(not queried)"
19836msgstr "(未查询)"
19837
d13389bf 19838#: builtin/remote.c:1261
5c57d762
JX
19839msgid "(unknown)"
19840msgstr "(未知)"
19841
d13389bf 19842#: builtin/remote.c:1265
8ada9598
JX
19843#, c-format
19844msgid ""
19845" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 19846msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 19847
d13389bf 19848#: builtin/remote.c:1277
81809b99 19849#, c-format
8ada9598
JX
19850msgid " Remote branch:%s"
19851msgid_plural " Remote branches:%s"
81809b99 19852msgstr[0] " 远程分支:%s"
5ae481e0 19853msgstr[1] " 远程分支:%s"
8ada9598 19854
81809b99 19855# 译者:中文字符串拼接,可删除前导空格
d13389bf 19856#: builtin/remote.c:1280 builtin/remote.c:1306
8ada9598 19857msgid " (status not queried)"
81809b99 19858msgstr "(状态未查询)"
8ada9598 19859
d13389bf 19860#: builtin/remote.c:1289
8ada9598
JX
19861msgid " Local branch configured for 'git pull':"
19862msgid_plural " Local branches configured for 'git pull':"
81809b99 19863msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 19864msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 19865
d13389bf 19866#: builtin/remote.c:1297
8ada9598 19867msgid " Local refs will be mirrored by 'git push'"
81809b99 19868msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 19869
d13389bf 19870#: builtin/remote.c:1303
81809b99 19871#, c-format
8ada9598
JX
19872msgid " Local ref configured for 'git push'%s:"
19873msgid_plural " Local refs configured for 'git push'%s:"
81809b99 19874msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 19875msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 19876
d13389bf 19877#: builtin/remote.c:1324
ef317cd5 19878msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 19879msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 19880
d13389bf 19881#: builtin/remote.c:1326
ef317cd5 19882msgid "delete refs/remotes/<name>/HEAD"
07432cef 19883msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 19884
d13389bf 19885#: builtin/remote.c:1341
8ada9598 19886msgid "Cannot determine remote HEAD"
81809b99 19887msgstr "无法确定远程 HEAD"
8ada9598 19888
d13389bf 19889#: builtin/remote.c:1343
8ada9598 19890msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 19891msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 19892
d13389bf 19893#: builtin/remote.c:1353
81809b99 19894#, c-format
8ada9598 19895msgid "Could not delete %s"
81809b99 19896msgstr "无法删除 %s"
8ada9598 19897
d13389bf 19898#: builtin/remote.c:1361
81809b99 19899#, c-format
8ada9598 19900msgid "Not a valid ref: %s"
81809b99 19901msgstr "不是一个有效引用:%s"
8ada9598 19902
d13389bf 19903#: builtin/remote.c:1363
81809b99 19904#, c-format
8ada9598 19905msgid "Could not setup %s"
81809b99 19906msgstr "不能设置 %s"
8ada9598
JX
19907
19908# 译者:注意保持前导空格
d13389bf 19909#: builtin/remote.c:1381
81809b99 19910#, c-format
8ada9598 19911msgid " %s will become dangling!"
e640d114 19912msgstr " %s 将成为悬空状态!"
8ada9598
JX
19913
19914# 译者:注意保持前导空格
d13389bf 19915#: builtin/remote.c:1382
81809b99 19916#, c-format
8ada9598 19917msgid " %s has become dangling!"
e640d114 19918msgstr " %s 已成为悬空状态!"
8ada9598 19919
d13389bf 19920#: builtin/remote.c:1392
81809b99 19921#, c-format
8ada9598 19922msgid "Pruning %s"
81809b99 19923msgstr "修剪 %s"
8ada9598 19924
d13389bf 19925#: builtin/remote.c:1393
8ada9598
JX
19926#, c-format
19927msgid "URL: %s"
81809b99 19928msgstr "URL:%s"
8ada9598 19929
d13389bf 19930#: builtin/remote.c:1409
8ada9598
JX
19931#, c-format
19932msgid " * [would prune] %s"
81809b99 19933msgstr " * [将删除] %s"
8ada9598 19934
d13389bf 19935#: builtin/remote.c:1412
8ada9598
JX
19936#, c-format
19937msgid " * [pruned] %s"
81809b99 19938msgstr " * [已删除] %s"
8ada9598 19939
d13389bf 19940#: builtin/remote.c:1457
ef317cd5 19941msgid "prune remotes after fetching"
07432cef 19942msgstr "抓取后清除远程"
ef317cd5 19943
d13389bf 19944#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
81809b99 19945#, c-format
8ada9598 19946msgid "No such remote '%s'"
81809b99 19947msgstr "没有此远程 '%s'"
8ada9598 19948
d13389bf 19949#: builtin/remote.c:1539
ef317cd5 19950msgid "add branch"
07432cef 19951msgstr "添加分支"
ef317cd5 19952
d13389bf 19953#: builtin/remote.c:1546
8ada9598 19954msgid "no remote specified"
81809b99 19955msgstr "未指定远程"
8ada9598 19956
d13389bf 19957#: builtin/remote.c:1563
94550ed3
JX
19958msgid "query push URLs rather than fetch URLs"
19959msgstr "查询推送 URL 地址,而非获取 URL 地址"
19960
d13389bf 19961#: builtin/remote.c:1565
94550ed3
JX
19962msgid "return all URLs"
19963msgstr "返回所有 URL 地址"
19964
d13389bf 19965#: builtin/remote.c:1595
94550ed3
JX
19966#, c-format
19967msgid "no URLs configured for remote '%s'"
19968msgstr "没有给远程仓库 '%s' 设定 URL"
19969
d13389bf 19970#: builtin/remote.c:1621
ef317cd5 19971msgid "manipulate push URLs"
07432cef 19972msgstr "操作推送 URLS"
ef317cd5 19973
d13389bf 19974#: builtin/remote.c:1623
ef317cd5 19975msgid "add URL"
07432cef 19976msgstr "添加 URL"
ef317cd5 19977
d13389bf 19978#: builtin/remote.c:1625
ef317cd5 19979msgid "delete URLs"
07432cef 19980msgstr "删除 URLS"
ef317cd5 19981
d13389bf 19982#: builtin/remote.c:1632
8ada9598 19983msgid "--add --delete doesn't make sense"
81809b99 19984msgstr "--add --delete 无意义"
8ada9598 19985
d13389bf 19986#: builtin/remote.c:1673
81809b99 19987#, c-format
8ada9598 19988msgid "Invalid old URL pattern: %s"
4375c10e 19989msgstr "无效的旧 URL 匹配模版:%s"
8ada9598 19990
d13389bf 19991#: builtin/remote.c:1681
81809b99 19992#, c-format
8ada9598 19993msgid "No such URL found: %s"
4375c10e 19994msgstr "未找到此 URL:%s"
8ada9598 19995
d13389bf 19996#: builtin/remote.c:1683
8ada9598 19997msgid "Will not delete all non-push URLs"
4375c10e 19998msgstr "将不会删除所有非推送 URL 地址"
8ada9598 19999
349ede6a 20000#: builtin/repack.c:25
814ff314
JX
20001msgid "git repack [<options>]"
20002msgstr "git repack [<选项>]"
90314792 20003
349ede6a 20004#: builtin/repack.c:30
1a79b2f1
JX
20005msgid ""
20006"Incremental repacks are incompatible with bitmap indexes. Use\n"
20007"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
20008msgstr ""
20009"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
20010"或禁用 pack.writebitmaps 配置。"
20011
d9488fea 20012#: builtin/repack.c:197
06991777 20013msgid "could not start pack-objects to repack promisor objects"
5b533632 20014msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
06991777 20015
d13389bf 20016#: builtin/repack.c:268 builtin/repack.c:447
06991777 20017msgid "repack: Expecting full hex object ID lines only from pack-objects."
5b533632 20018msgstr "repack:期望来自 pack-objects 的完整十六进制对象 ID。"
06991777 20019
d13389bf 20020#: builtin/repack.c:295
06991777 20021msgid "could not finish pack-objects to repack promisor objects"
5b533632 20022msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
06991777 20023
d13389bf 20024#: builtin/repack.c:323
90314792
JX
20025msgid "pack everything in a single pack"
20026msgstr "所有内容打包到一个包文件中"
20027
d13389bf 20028#: builtin/repack.c:325
90314792
JX
20029msgid "same as -a, and turn unreachable objects loose"
20030msgstr "和 -a 相同,并将不可达的对象设为松散对象"
20031
d13389bf 20032#: builtin/repack.c:328
90314792
JX
20033msgid "remove redundant packs, and run git-prune-packed"
20034msgstr "删除多余的包,运行 git-prune-packed"
20035
d13389bf 20036#: builtin/repack.c:330
90314792
JX
20037msgid "pass --no-reuse-delta to git-pack-objects"
20038msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
20039
d13389bf 20040#: builtin/repack.c:332
90314792
JX
20041msgid "pass --no-reuse-object to git-pack-objects"
20042msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
20043
d13389bf 20044#: builtin/repack.c:334
90314792
JX
20045msgid "do not run git-update-server-info"
20046msgstr "不运行 git-update-server-info"
20047
d13389bf 20048#: builtin/repack.c:337
90314792
JX
20049msgid "pass --local to git-pack-objects"
20050msgstr "向 git-pack-objects 传递参数 --local"
20051
d13389bf 20052#: builtin/repack.c:339
6c94aba5
JX
20053msgid "write bitmap index"
20054msgstr "写 bitmap 索引"
20055
d13389bf 20056#: builtin/repack.c:341
4c27fcb5
JX
20057msgid "pass --delta-islands to git-pack-objects"
20058msgstr "向 git-pack-objects 传递参数 --delta-islands"
20059
d13389bf 20060#: builtin/repack.c:342
90314792
JX
20061msgid "approxidate"
20062msgstr "近似日期"
20063
d13389bf 20064#: builtin/repack.c:343
90314792
JX
20065msgid "with -A, do not loosen objects older than this"
20066msgstr "使用 -A,不要将早于给定时间的对象过期"
20067
d13389bf 20068#: builtin/repack.c:345
5c57d762
JX
20069msgid "with -a, repack unreachable objects"
20070msgstr "使用 -a ,重新对不可达对象打包"
20071
d13389bf 20072#: builtin/repack.c:347
90314792
JX
20073msgid "size of the window used for delta compression"
20074msgstr "用于增量压缩的窗口值"
20075
d13389bf 20076#: builtin/repack.c:348 builtin/repack.c:354
8376b58d
JX
20077msgid "bytes"
20078msgstr "字节"
20079
d13389bf 20080#: builtin/repack.c:349
90314792
JX
20081msgid "same as the above, but limit memory size instead of entries count"
20082msgstr "和上面的相似,但限制内存大小而非条目数"
20083
d13389bf 20084#: builtin/repack.c:351
90314792
JX
20085msgid "limits the maximum delta depth"
20086msgstr "限制最大增量深度"
20087
d13389bf 20088#: builtin/repack.c:353
a4f16749
JX
20089msgid "limits the maximum number of threads"
20090msgstr "限制最大线程数"
20091
d13389bf 20092#: builtin/repack.c:355
90314792 20093msgid "maximum size of each packfile"
dbd6cced 20094msgstr "每个包文件的最大尺寸"
90314792 20095
d13389bf 20096#: builtin/repack.c:357
6c94aba5
JX
20097msgid "repack objects in packs marked with .keep"
20098msgstr "对标记为 .keep 的包中的对象重新打包"
20099
d13389bf 20100#: builtin/repack.c:359
fd8cb379
JX
20101msgid "do not repack this pack"
20102msgstr "不要对该包文件重新打包"
20103
d13389bf 20104#: builtin/repack.c:369
94550ed3
JX
20105msgid "cannot delete packs in a precious-objects repo"
20106msgstr "不能删除珍品仓库中的打包文件"
20107
d13389bf 20108#: builtin/repack.c:373
5c57d762
JX
20109msgid "--keep-unreachable and -A are incompatible"
20110msgstr "--keep-unreachable 和 -A 不兼容"
20111
d13389bf 20112#: builtin/repack.c:456
06991777
JX
20113msgid "Nothing new to pack."
20114msgstr "没有新的要打包。"
20115
d9488fea 20116#: builtin/repack.c:486
06991777 20117#, c-format
d13389bf
JX
20118msgid "missing required file: %s"
20119msgstr "缺少需要的文件:%s"
06991777 20120
d13389bf 20121#: builtin/repack.c:488
90314792 20122#, c-format
d13389bf
JX
20123msgid "could not unlink: %s"
20124msgstr "不能删除:%s"
90314792 20125
fd8cb379 20126#: builtin/replace.c:22
ef317cd5 20127msgid "git replace [-f] <object> <replacement>"
07432cef 20128msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 20129
fd8cb379 20130#: builtin/replace.c:23
6acbf033
JX
20131msgid "git replace [-f] --edit <object>"
20132msgstr "git replace [-f] --edit <对象>"
20133
fd8cb379 20134#: builtin/replace.c:24
6acbf033
JX
20135msgid "git replace [-f] --graft <commit> [<parent>...]"
20136msgstr "git replace [-f] --graft <提交> [<父提交>...]"
20137
fd8cb379
JX
20138#: builtin/replace.c:25
20139msgid "git replace [-f] --convert-graft-file"
20140msgstr "git replace [-f] --convert-graft-file"
20141
20142#: builtin/replace.c:26
ef317cd5 20143msgid "git replace -d <object>..."
07432cef 20144msgstr "git replace -d <对象>..."
ef317cd5 20145
fd8cb379 20146#: builtin/replace.c:27
cfff71a9
JX
20147msgid "git replace [--format=<format>] [-l [<pattern>]]"
20148msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 20149
d46c5519 20150#: builtin/replace.c:90
c1ac5258
JX
20151#, c-format
20152msgid ""
20153"invalid replace format '%s'\n"
20154"valid formats are 'short', 'medium' and 'long'"
20155msgstr ""
20156"无效的替换格式 '%s'\n"
20157"有效的格式有 'short'、'medium' 和 'long'"
20158
d46c5519 20159#: builtin/replace.c:125
c1ac5258
JX
20160#, c-format
20161msgid "replace ref '%s' not found"
20162msgstr "未发现替换引用 '%s'"
20163
d46c5519 20164#: builtin/replace.c:141
c1ac5258
JX
20165#, c-format
20166msgid "Deleted replace ref '%s'"
e640d114 20167msgstr "已删除替换引用 '%s'"
c1ac5258 20168
d46c5519 20169#: builtin/replace.c:153
c1ac5258
JX
20170#, c-format
20171msgid "'%s' is not a valid ref name"
20172msgstr "'%s' 不是一个有效的引用名"
20173
d46c5519 20174#: builtin/replace.c:158
c1ac5258
JX
20175#, c-format
20176msgid "replace ref '%s' already exists"
20177msgstr "替换引用 '%s' 已经存在"
20178
d46c5519 20179#: builtin/replace.c:178
c1ac5258
JX
20180#, c-format
20181msgid ""
20182"Objects must be of the same type.\n"
20183"'%s' points to a replaced object of type '%s'\n"
20184"while '%s' points to a replacement object of type '%s'."
20185msgstr ""
20186"对象必须属于同一类型。\n"
20187"'%s' 指向 '%s' 类型的替换对象\n"
20188"而 '%s' 指向 '%s' 类型的替换对象。"
20189
d46c5519 20190#: builtin/replace.c:229
c1ac5258
JX
20191#, c-format
20192msgid "unable to open %s for writing"
20193msgstr "无法为写入打开 %s"
20194
d46c5519 20195#: builtin/replace.c:242
c1ac5258
JX
20196msgid "cat-file reported failure"
20197msgstr "cat-file 报告失败"
20198
d46c5519 20199#: builtin/replace.c:258
c1ac5258
JX
20200#, c-format
20201msgid "unable to open %s for reading"
20202msgstr "无法为读取打开 %s"
20203
d46c5519 20204#: builtin/replace.c:272
c1ac5258
JX
20205msgid "unable to spawn mktree"
20206msgstr "无法启动 mktree"
20207
d46c5519 20208#: builtin/replace.c:276
c1ac5258
JX
20209msgid "unable to read from mktree"
20210msgstr "无法从 mktree 读取"
20211
d46c5519 20212#: builtin/replace.c:285
c1ac5258
JX
20213msgid "mktree reported failure"
20214msgstr "mktree 报告失败"
20215
d46c5519 20216#: builtin/replace.c:289
c1ac5258
JX
20217msgid "mktree did not return an object name"
20218msgstr "mktree 没有返回一个对象名"
20219
d46c5519 20220#: builtin/replace.c:298
c1ac5258
JX
20221#, c-format
20222msgid "unable to fstat %s"
20223msgstr "无法对 %s 执行 fstat"
20224
d46c5519 20225#: builtin/replace.c:303
c1ac5258
JX
20226msgid "unable to write object to database"
20227msgstr "无法向数据库写入对象"
20228
2b472aae
JX
20229#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
20230#: builtin/replace.c:454
c1ac5258
JX
20231#, c-format
20232msgid "not a valid object name: '%s'"
6acbf033
JX
20233msgstr "不是一个有效的对象名:'%s'"
20234
d46c5519 20235#: builtin/replace.c:326
c1ac5258
JX
20236#, c-format
20237msgid "unable to get object type for %s"
20238msgstr "无法得到 %s 的对象类型"
20239
d46c5519 20240#: builtin/replace.c:342
c1ac5258
JX
20241msgid "editing object file failed"
20242msgstr "编辑对象文件失败"
20243
d46c5519 20244#: builtin/replace.c:351
c1ac5258
JX
20245#, c-format
20246msgid "new object is the same as the old one: '%s'"
20247msgstr "新对象和旧对象相同:'%s'"
20248
a5cd71ca 20249#: builtin/replace.c:384
d46c5519
JX
20250#, c-format
20251msgid "could not parse %s as a commit"
20252msgstr "无法将 %s 解析为一个提交"
20253
2b472aae 20254#: builtin/replace.c:416
6acbf033
JX
20255#, c-format
20256msgid "bad mergetag in commit '%s'"
55a16ee4 20257msgstr "提交 '%s' 中含有损坏的合并标签"
6acbf033 20258
2b472aae 20259#: builtin/replace.c:418
6acbf033
JX
20260#, c-format
20261msgid "malformed mergetag in commit '%s'"
fd8cb379 20262msgstr "提交 '%s' 中含有格式错误的合并标签"
6acbf033 20263
2b472aae 20264#: builtin/replace.c:430
6acbf033
JX
20265#, c-format
20266msgid ""
20267"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
20268"instead of --graft"
55a16ee4 20269msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
6acbf033 20270
2b472aae 20271#: builtin/replace.c:469
6acbf033 20272#, c-format
c1ac5258
JX
20273msgid "the original commit '%s' has a gpg signature"
20274msgstr "原始提交 '%s' 中有一个 gpg 签名"
6acbf033 20275
2b472aae 20276#: builtin/replace.c:470
6acbf033
JX
20277msgid "the signature will be removed in the replacement commit!"
20278msgstr "在替换的提交中签名将被移除!"
20279
2b472aae 20280#: builtin/replace.c:480
6acbf033
JX
20281#, c-format
20282msgid "could not write replacement commit for: '%s'"
20283msgstr "不能为 '%s' 写替换提交"
20284
2b472aae 20285#: builtin/replace.c:488
c1ac5258
JX
20286#, c-format
20287msgid "graft for '%s' unnecessary"
20288msgstr "对 '%s' 移植没有必要"
20289
2b472aae 20290#: builtin/replace.c:492
c1ac5258
JX
20291#, c-format
20292msgid "new commit is the same as the old one: '%s'"
20293msgstr "新提交和旧的一样:'%s'"
20294
2b472aae 20295#: builtin/replace.c:527
fd8cb379
JX
20296#, c-format
20297msgid ""
20298"could not convert the following graft(s):\n"
20299"%s"
20300msgstr ""
20301"不能转换下列移植:\n"
20302"%s"
20303
2b472aae 20304#: builtin/replace.c:548
ef317cd5 20305msgid "list replace refs"
07432cef 20306msgstr "列出替换的引用"
ef317cd5 20307
2b472aae 20308#: builtin/replace.c:549
ef317cd5 20309msgid "delete replace refs"
07432cef 20310msgstr "删除替换的引用"
ef317cd5 20311
2b472aae 20312#: builtin/replace.c:550
6acbf033
JX
20313msgid "edit existing object"
20314msgstr "编辑现存的对象"
20315
2b472aae 20316#: builtin/replace.c:551
6acbf033
JX
20317msgid "change a commit's parents"
20318msgstr "修改一个提交的父提交"
20319
2b472aae 20320#: builtin/replace.c:552
fd8cb379
JX
20321msgid "convert existing graft file"
20322msgstr "转换现存的移植文件"
20323
2b472aae 20324#: builtin/replace.c:553
ef317cd5 20325msgid "replace the ref if it exists"
07432cef 20326msgstr "如果存在则替换引用"
ef317cd5 20327
2b472aae 20328#: builtin/replace.c:555
6acbf033
JX
20329msgid "do not pretty-print contents for --edit"
20330msgstr "不要为 --edit 操作美观显示内容"
20331
2b472aae 20332#: builtin/replace.c:556
cfff71a9
JX
20333msgid "use this format"
20334msgstr "使用此格式"
20335
2b472aae 20336#: builtin/replace.c:569
c1ac5258 20337msgid "--format cannot be used when not listing"
e640d114 20338msgstr "不列出时不能使用 --format"
c1ac5258 20339
2b472aae 20340#: builtin/replace.c:577
c1ac5258
JX
20341msgid "-f only makes sense when writing a replacement"
20342msgstr "只有写一个替换时 -f 才有意义"
20343
2b472aae 20344#: builtin/replace.c:581
c1ac5258
JX
20345msgid "--raw only makes sense with --edit"
20346msgstr "--raw 只有和 --edit 共用才有意义"
20347
2b472aae 20348#: builtin/replace.c:587
c1ac5258
JX
20349msgid "-d needs at least one argument"
20350msgstr "-d 需要至少一个参数"
20351
2b472aae 20352#: builtin/replace.c:593
c1ac5258
JX
20353msgid "bad number of arguments"
20354msgstr "错误的参数个数"
20355
2b472aae 20356#: builtin/replace.c:599
c1ac5258 20357msgid "-e needs exactly one argument"
e640d114 20358msgstr "-e 需要且仅需要一个参数"
c1ac5258 20359
2b472aae 20360#: builtin/replace.c:605
c1ac5258
JX
20361msgid "-g needs at least one argument"
20362msgstr "-g 需要至少一个参数"
20363
2b472aae 20364#: builtin/replace.c:611
c1ac5258
JX
20365msgid "--convert-graft-file takes no argument"
20366msgstr "--convert-graft-file 不带参数"
20367
2b472aae 20368#: builtin/replace.c:617
c1ac5258
JX
20369msgid "only one pattern can be given with -l"
20370msgstr "只能为 -l 提供一个模式"
20371
a4f16749 20372#: builtin/rerere.c:13
814ff314
JX
20373msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
20374msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
ef317cd5 20375
4c27fcb5 20376#: builtin/rerere.c:60
ef317cd5 20377msgid "register clean resolutions in index"
07432cef 20378msgstr "在索引中注册干净的解决方案"
ef317cd5 20379
4c27fcb5
JX
20380#: builtin/rerere.c:79
20381msgid "'git rerere forget' without paths is deprecated"
20382msgstr "没有路径的 'git rerere forget' 已经过时"
20383
06991777 20384#: builtin/rerere.c:113
4c27fcb5
JX
20385#, c-format
20386msgid "unable to generate diff for '%s'"
20387msgstr "无法为 '%s' 生成差异"
20388
06991777 20389#: builtin/reset.c:32
ef317cd5
JX
20390msgid ""
20391"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 20392msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5 20393
06991777 20394#: builtin/reset.c:33
ddc12c42
JX
20395msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
20396msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..."
ef317cd5 20397
06991777 20398#: builtin/reset.c:34
ddc12c42
JX
20399msgid ""
20400"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
2b472aae 20401msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]"
ef317cd5 20402
ddc12c42
JX
20403#: builtin/reset.c:35
20404msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
20405msgstr "git reset --patch [<树对象>] [--] [<路径表达式>...]"
20406
20407#: builtin/reset.c:41
c04f5ac3
JX
20408msgid "mixed"
20409msgstr "混杂"
20410
ddc12c42 20411#: builtin/reset.c:41
c04f5ac3
JX
20412msgid "soft"
20413msgstr "软性"
20414
ddc12c42 20415#: builtin/reset.c:41
c04f5ac3
JX
20416msgid "hard"
20417msgstr "硬性"
20418
ddc12c42 20419#: builtin/reset.c:41
8ada9598
JX
20420msgid "merge"
20421msgstr "合并"
20422
ddc12c42 20423#: builtin/reset.c:41
c04f5ac3
JX
20424msgid "keep"
20425msgstr "保持"
20426
349ede6a 20427#: builtin/reset.c:83
c04f5ac3
JX
20428msgid "You do not have a valid HEAD."
20429msgstr "您没有一个有效的 HEAD。"
20430
349ede6a 20431#: builtin/reset.c:85
c04f5ac3
JX
20432msgid "Failed to find tree of HEAD."
20433msgstr "无法找到 HEAD 指向的树。"
20434
349ede6a 20435#: builtin/reset.c:91
c04f5ac3
JX
20436#, c-format
20437msgid "Failed to find tree of %s."
20438msgstr "无法找到 %s 指向的树。"
20439
349ede6a 20440#: builtin/reset.c:116
a5cd71ca
JX
20441#, c-format
20442msgid "HEAD is now at %s"
20443msgstr "HEAD 现在位于 %s"
20444
90e6ef53 20445# 译者:汉字之间无空格,故删除%s前后空格
349ede6a 20446#: builtin/reset.c:195
c04f5ac3
JX
20447#, c-format
20448msgid "Cannot do a %s reset in the middle of a merge."
20449msgstr "在合并过程中不能做%s重置操作。"
20450
d13389bf
JX
20451#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:594
20452#: builtin/stash.c:618
ef317cd5 20453msgid "be quiet, only report errors"
07432cef 20454msgstr "安静模式,只报告错误"
ef317cd5 20455
349ede6a 20456#: builtin/reset.c:297
ef317cd5 20457msgid "reset HEAD and index"
07432cef 20458msgstr "重置 HEAD 和索引"
ef317cd5 20459
349ede6a 20460#: builtin/reset.c:298
ef317cd5 20461msgid "reset only HEAD"
07432cef 20462msgstr "只重置 HEAD"
ef317cd5 20463
349ede6a 20464#: builtin/reset.c:300 builtin/reset.c:302
ef317cd5 20465msgid "reset HEAD, index and working tree"
07432cef 20466msgstr "重置 HEAD、索引和工作区"
ef317cd5 20467
349ede6a 20468#: builtin/reset.c:304
ef317cd5 20469msgid "reset HEAD but keep local changes"
07432cef 20470msgstr "重置 HEAD 但保存本地变更"
ef317cd5 20471
349ede6a 20472#: builtin/reset.c:310
6c94aba5
JX
20473msgid "record only the fact that removed paths will be added later"
20474msgstr "将删除的路径标记为稍后添加"
20475
349ede6a 20476#: builtin/reset.c:344
07432cef
WS
20477#, c-format
20478msgid "Failed to resolve '%s' as a valid revision."
20479msgstr "无法将 '%s' 解析为一个有效的版本。"
20480
349ede6a 20481#: builtin/reset.c:352
07432cef
WS
20482#, c-format
20483msgid "Failed to resolve '%s' as a valid tree."
20484msgstr "无法将 '%s' 解析为一个有效的树对象。"
20485
349ede6a 20486#: builtin/reset.c:361
c04f5ac3 20487msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 20488msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 20489
349ede6a 20490#: builtin/reset.c:371
c04f5ac3 20491msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
d9d56b23 20492msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
c04f5ac3 20493
90e6ef53 20494# 译者:汉字之间无空格,故删除%s前后空格
349ede6a 20495#: builtin/reset.c:373
c04f5ac3
JX
20496#, c-format
20497msgid "Cannot do %s reset with paths."
20498msgstr "不能带路径进行%s重置。"
20499
90e6ef53 20500# 译者:汉字之间无空格,故删除%s前后空格
349ede6a 20501#: builtin/reset.c:388
c04f5ac3
JX
20502#, c-format
20503msgid "%s reset is not allowed in a bare repository"
160fb2b2 20504msgstr "不能对纯仓库进行%s重置"
c04f5ac3 20505
349ede6a 20506#: builtin/reset.c:392
6c94aba5
JX
20507msgid "-N can only be used with --mixed"
20508msgstr "-N 只能和 --mixed 同时使用"
20509
349ede6a 20510#: builtin/reset.c:413
90314792 20511msgid "Unstaged changes after reset:"
160fb2b2 20512msgstr "重置后取消暂存的变更:"
90314792 20513
349ede6a 20514#: builtin/reset.c:416
4c27fcb5
JX
20515#, c-format
20516msgid ""
20517"\n"
20518"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
20519"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
20520"to make this the default.\n"
20521msgstr ""
20522"\n"
20523"重置后,枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n"
20524"将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n"
20525
349ede6a 20526#: builtin/reset.c:434
ef317cd5
JX
20527#, c-format
20528msgid "Could not reset index file to revision '%s'."
20529msgstr "不能重置索引文件至版本 '%s'。"
20530
349ede6a 20531#: builtin/reset.c:439
07432cef
WS
20532msgid "Could not write new index file."
20533msgstr "不能写入新的索引文件。"
20534
2b472aae 20535#: builtin/rev-list.c:499
31e5e17b
JX
20536msgid "cannot combine --exclude-promisor-objects and --missing"
20537msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
20538
2b472aae 20539#: builtin/rev-list.c:560
5809aa05
JX
20540msgid "object filtering requires --objects"
20541msgstr "对象过滤需要 --objects"
20542
2b472aae 20543#: builtin/rev-list.c:610
1b7f4a34
JX
20544msgid "rev-list does not support display of notes"
20545msgstr "rev-list 不支持显示注解"
20546
2b472aae
JX
20547#: builtin/rev-list.c:615
20548msgid "marked counting is incompatible with --objects"
20549msgstr "标记计数和 --objects 不兼容"
5809aa05 20550
349ede6a 20551#: builtin/rev-parse.c:409
814ff314
JX
20552msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
20553msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
ef317cd5 20554
349ede6a 20555#: builtin/rev-parse.c:414
ef317cd5 20556msgid "keep the `--` passed as an arg"
07432cef 20557msgstr "保持 `--` 作为一个参数传递"
ef317cd5 20558
349ede6a 20559#: builtin/rev-parse.c:416
ef317cd5 20560msgid "stop parsing after the first non-option argument"
07432cef 20561msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 20562
349ede6a 20563#: builtin/rev-parse.c:419
cfff71a9
JX
20564msgid "output in stuck long form"
20565msgstr "以固定长格式输出"
20566
349ede6a 20567#: builtin/rev-parse.c:552
ef317cd5 20568msgid ""
814ff314 20569"git rev-parse --parseopt [<options>] -- [<args>...]\n"
ef317cd5 20570" or: git rev-parse --sq-quote [<arg>...]\n"
814ff314 20571" or: git rev-parse [<options>] [<arg>...]\n"
ef317cd5
JX
20572"\n"
20573"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
20574msgstr ""
814ff314 20575"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
90314792 20576" 或者:git rev-parse --sq-quote [<参数>...]\n"
814ff314 20577" 或者:git rev-parse [<选项>] [<参数>...]\n"
07432cef
WS
20578"\n"
20579"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5 20580
c1ac5258 20581#: builtin/revert.c:24
814ff314
JX
20582msgid "git revert [<options>] <commit-ish>..."
20583msgstr "git revert [<选项>] <提交号>..."
ef317cd5 20584
c1ac5258 20585#: builtin/revert.c:25
ef317cd5 20586msgid "git revert <subcommand>"
07432cef 20587msgstr "git revert <子命令>"
ef317cd5 20588
c1ac5258 20589#: builtin/revert.c:30
814ff314
JX
20590msgid "git cherry-pick [<options>] <commit-ish>..."
20591msgstr "git cherry-pick [<选项>] <提交号>..."
ef317cd5 20592
c1ac5258 20593#: builtin/revert.c:31
ef317cd5 20594msgid "git cherry-pick <subcommand>"
07432cef 20595msgstr "git cherry-pick <子命令>"
ef317cd5 20596
06991777
JX
20597#: builtin/revert.c:72
20598#, c-format
20599msgid "option `%s' expects a number greater than zero"
20600msgstr "选项 `%s' 期望一个大于零的数字"
20601
20602#: builtin/revert.c:92
ef317cd5
JX
20603#, c-format
20604msgid "%s: %s cannot be used with %s"
20605msgstr "%s:%s 不能和 %s 同时使用"
20606
d46c5519 20607#: builtin/revert.c:102
ef317cd5 20608msgid "end revert or cherry-pick sequence"
07432cef 20609msgstr "终止反转或拣选操作"
ef317cd5 20610
d46c5519 20611#: builtin/revert.c:103
ef317cd5 20612msgid "resume revert or cherry-pick sequence"
07432cef 20613msgstr "继续反转或拣选操作"
ef317cd5 20614
d46c5519 20615#: builtin/revert.c:104
ef317cd5 20616msgid "cancel revert or cherry-pick sequence"
07432cef 20617msgstr "取消反转或拣选操作"
ef317cd5 20618
a6cd2cc4
JX
20619#: builtin/revert.c:105
20620msgid "skip current commit and continue"
20621msgstr "跳过当前提交并继续"
20622
20623#: builtin/revert.c:107
ef317cd5 20624msgid "don't automatically commit"
07432cef 20625msgstr "不要自动提交"
ef317cd5 20626
a6cd2cc4 20627#: builtin/revert.c:108
ef317cd5 20628msgid "edit the commit message"
07432cef 20629msgstr "编辑提交说明"
ef317cd5 20630
a6cd2cc4 20631#: builtin/revert.c:111
87cb7997 20632msgid "parent-number"
07432cef 20633msgstr "父编号"
ef317cd5 20634
a6cd2cc4 20635#: builtin/revert.c:112
87cb7997
JX
20636msgid "select mainline parent"
20637msgstr "选择主干父提交编号"
20638
a6cd2cc4 20639#: builtin/revert.c:114
ef317cd5 20640msgid "merge strategy"
07432cef 20641msgstr "合并策略"
ef317cd5 20642
a6cd2cc4 20643#: builtin/revert.c:116
ef317cd5 20644msgid "option for merge strategy"
07432cef 20645msgstr "合并策略的选项"
ef317cd5 20646
a6cd2cc4 20647#: builtin/revert.c:125
ef317cd5 20648msgid "append commit name"
07432cef 20649msgstr "追加提交名称"
ef317cd5 20650
a6cd2cc4 20651#: builtin/revert.c:127
ef317cd5 20652msgid "preserve initially empty commits"
07432cef 20653msgstr "保留初始化的空提交"
ef317cd5 20654
a6cd2cc4 20655#: builtin/revert.c:129
ef317cd5 20656msgid "keep redundant, empty commits"
07432cef 20657msgstr "保持多余的、空的提交"
ef317cd5 20658
d13389bf 20659#: builtin/revert.c:239
c04f5ac3
JX
20660msgid "revert failed"
20661msgstr "还原失败"
20662
d13389bf 20663#: builtin/revert.c:252
c04f5ac3
JX
20664msgid "cherry-pick failed"
20665msgstr "拣选失败"
20666
06991777 20667#: builtin/rm.c:19
814ff314
JX
20668msgid "git rm [<options>] [--] <file>..."
20669msgstr "git rm [<选项>] [--] <文件>..."
07432cef 20670
06991777 20671#: builtin/rm.c:207
c04f5ac3 20672msgid ""
2e8451e8
JX
20673"the following file has staged content different from both the\n"
20674"file and the HEAD:"
20675msgid_plural ""
20676"the following files have staged content different from both the\n"
20677"file and the HEAD:"
20678msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
20679msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
20680
06991777 20681#: builtin/rm.c:212
2e8451e8
JX
20682msgid ""
20683"\n"
c04f5ac3
JX
20684"(use -f to force removal)"
20685msgstr ""
2e8451e8 20686"\n"
c04f5ac3
JX
20687"(使用 -f 强制删除)"
20688
06991777 20689#: builtin/rm.c:216
2e8451e8
JX
20690msgid "the following file has changes staged in the index:"
20691msgid_plural "the following files have changes staged in the index:"
160fb2b2
JX
20692msgstr[0] "下列文件索引中有变更"
20693msgstr[1] "下列文件索引中有变更"
c04f5ac3 20694
06991777 20695#: builtin/rm.c:220 builtin/rm.c:229
c04f5ac3 20696msgid ""
2e8451e8 20697"\n"
c04f5ac3
JX
20698"(use --cached to keep the file, or -f to force removal)"
20699msgstr ""
2e8451e8
JX
20700"\n"
20701"(使用 --cached 保留本地文件,或用 -f 强制删除)"
20702
06991777 20703#: builtin/rm.c:226
2e8451e8
JX
20704msgid "the following file has local modifications:"
20705msgid_plural "the following files have local modifications:"
20706msgstr[0] "如下文件有本地修改:"
20707msgstr[1] "如下文件有本地修改:"
c04f5ac3 20708
2b472aae 20709#: builtin/rm.c:243
ef317cd5 20710msgid "do not list removed files"
07432cef 20711msgstr "不列出删除的文件"
ef317cd5 20712
2b472aae 20713#: builtin/rm.c:244
ef317cd5 20714msgid "only remove from the index"
07432cef 20715msgstr "只从索引区删除"
ef317cd5 20716
2b472aae 20717#: builtin/rm.c:245
ef317cd5 20718msgid "override the up-to-date check"
07432cef 20719msgstr "忽略文件更新状态检查"
ef317cd5 20720
2b472aae 20721#: builtin/rm.c:246
ef317cd5 20722msgid "allow recursive removal"
07432cef 20723msgstr "允许递归删除"
ef317cd5 20724
2b472aae 20725#: builtin/rm.c:248
ef317cd5 20726msgid "exit with a zero status even if nothing matched"
07432cef 20727msgstr "即使没有匹配,也以零状态退出"
ef317cd5 20728
2b472aae
JX
20729#: builtin/rm.c:282
20730msgid "No pathspec was given. Which files should I remove?"
440e7442 20731msgstr "没有提供路径规格。我应该删除哪些文件?"
2b472aae
JX
20732
20733#: builtin/rm.c:305
c1ac5258
JX
20734msgid "please stage your changes to .gitmodules or stash them to proceed"
20735msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
20736
2b472aae 20737#: builtin/rm.c:323
c04f5ac3
JX
20738#, c-format
20739msgid "not removing '%s' recursively without -r"
20740msgstr "未提供 -r 选项不会递归删除 '%s'"
20741
2b472aae 20742#: builtin/rm.c:362
c04f5ac3
JX
20743#, c-format
20744msgid "git rm: unable to remove %s"
20745msgstr "git rm:不能删除 %s"
20746
fd8cb379 20747#: builtin/send-pack.c:20
1b7f4a34
JX
20748msgid ""
20749"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
20750"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
20751"[<ref>...]\n"
20752" --all and explicit <ref> specification are mutually exclusive."
20753msgstr ""
20754"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
20755"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
20756" --all 和明确的 <引用> 互斥。"
20757
d13389bf 20758#: builtin/send-pack.c:188
1b7f4a34
JX
20759msgid "remote name"
20760msgstr "远程名称"
20761
d13389bf 20762#: builtin/send-pack.c:201
1b7f4a34
JX
20763msgid "use stateless RPC protocol"
20764msgstr "使用无状态的 RPC 协议"
20765
d13389bf 20766#: builtin/send-pack.c:202
1b7f4a34
JX
20767msgid "read refs from stdin"
20768msgstr "从标准输入读取引用"
20769
d13389bf 20770#: builtin/send-pack.c:203
1b7f4a34
JX
20771msgid "print status from remote helper"
20772msgstr "打印来自远程 helper 的状态"
20773
d13389bf 20774#: builtin/shortlog.c:16
fd8cb379
JX
20775msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
20776msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
20777
d13389bf 20778#: builtin/shortlog.c:17
fd8cb379
JX
20779msgid "git log --pretty=short | git shortlog [<options>]"
20780msgstr "git log --pretty=short | git shortlog [<选项>]"
ef317cd5 20781
d13389bf 20782#: builtin/shortlog.c:135
d9488fea
JX
20783msgid "using multiple --group options with stdin is not supported"
20784msgstr "不支持和标准输入一起使用多个 --group 选项"
20785
d13389bf 20786#: builtin/shortlog.c:145
d9488fea
JX
20787msgid "using --group=trailer with stdin is not supported"
20788msgstr "不支持和标准输入一起使用 --group=trailer"
20789
d13389bf 20790#: builtin/shortlog.c:335
d9488fea
JX
20791#, c-format
20792msgid "unknown group type: %s"
20793msgstr "未知分组类型:%s"
20794
d13389bf 20795#: builtin/shortlog.c:363
1a79b2f1
JX
20796msgid "Group by committer rather than author"
20797msgstr "按照提交者分组而不是作者"
20798
d13389bf 20799#: builtin/shortlog.c:366
ef317cd5 20800msgid "sort output according to the number of commits per author"
07432cef 20801msgstr "根据每个作者的提交数量排序"
ef317cd5 20802
d13389bf 20803#: builtin/shortlog.c:368
ef317cd5 20804msgid "Suppress commit descriptions, only provides commit count"
07432cef 20805msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 20806
d13389bf 20807#: builtin/shortlog.c:370
ef317cd5 20808msgid "Show the email address of each author"
07432cef 20809msgstr "显示每个作者的电子邮件地址"
ef317cd5 20810
d13389bf 20811#: builtin/shortlog.c:371
c1ac5258
JX
20812msgid "<w>[,<i1>[,<i2>]]"
20813msgstr "<w>[,<i1>[,<i2>]]"
ef317cd5 20814
d13389bf 20815#: builtin/shortlog.c:372
ef317cd5 20816msgid "Linewrap output"
07432cef 20817msgstr "折行输出"
ef317cd5 20818
d13389bf 20819#: builtin/shortlog.c:374
d9488fea
JX
20820msgid "field"
20821msgstr "字段"
20822
d13389bf 20823#: builtin/shortlog.c:375
d9488fea
JX
20824msgid "Group by field"
20825msgstr "按字段分组"
20826
d13389bf 20827#: builtin/shortlog.c:403
fd8cb379
JX
20828msgid "too many arguments given outside repository"
20829msgstr "仓库外执行提供了太多的参数"
20830
c1ac5258 20831#: builtin/show-branch.c:13
ef317cd5 20832msgid ""
814ff314 20833"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
20834"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
20835"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
20836"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
ef317cd5 20837msgstr ""
814ff314 20838"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
20839"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
20840"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
20841"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
ef317cd5 20842
c1ac5258 20843#: builtin/show-branch.c:17
814ff314 20844msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
58b6f078 20845msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
ef317cd5 20846
c1ac5258 20847#: builtin/show-branch.c:395
a0b6b246
JX
20848#, c-format
20849msgid "ignoring %s; cannot handle more than %d ref"
20850msgid_plural "ignoring %s; cannot handle more than %d refs"
20851msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
20852msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
20853
a6cd2cc4 20854#: builtin/show-branch.c:548
a0b6b246
JX
20855#, c-format
20856msgid "no matching refs with %s"
20857msgstr "没有和 %s 匹配的引用"
20858
a6cd2cc4 20859#: builtin/show-branch.c:645
ef317cd5 20860msgid "show remote-tracking and local branches"
07432cef 20861msgstr "显示远程跟踪的和本地的分支"
ef317cd5 20862
a6cd2cc4 20863#: builtin/show-branch.c:647
ef317cd5 20864msgid "show remote-tracking branches"
07432cef 20865msgstr "显示远程跟踪的分支"
ef317cd5 20866
a6cd2cc4 20867#: builtin/show-branch.c:649
ef317cd5 20868msgid "color '*!+-' corresponding to the branch"
07432cef 20869msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 20870
a6cd2cc4 20871#: builtin/show-branch.c:651
ef317cd5 20872msgid "show <n> more commits after the common ancestor"
07432cef 20873msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 20874
a6cd2cc4 20875#: builtin/show-branch.c:653
ef317cd5 20876msgid "synonym to more=-1"
07432cef 20877msgstr "和 more=-1 同义"
ef317cd5 20878
a6cd2cc4 20879#: builtin/show-branch.c:654
ef317cd5 20880msgid "suppress naming strings"
07432cef 20881msgstr "不显示字符串命名"
ef317cd5 20882
a6cd2cc4 20883#: builtin/show-branch.c:656
ef317cd5 20884msgid "include the current branch"
07432cef 20885msgstr "包括当前分支"
ef317cd5 20886
a6cd2cc4 20887#: builtin/show-branch.c:658
ef317cd5 20888msgid "name commits with their object names"
07432cef 20889msgstr "以对象名字命名提交"
ef317cd5 20890
a6cd2cc4 20891#: builtin/show-branch.c:660
ef317cd5 20892msgid "show possible merge bases"
07432cef 20893msgstr "显示可能合并的基线"
ef317cd5 20894
a6cd2cc4 20895#: builtin/show-branch.c:662
ef317cd5 20896msgid "show refs unreachable from any other ref"
07432cef 20897msgstr "显示没有任何引用的的引用"
ef317cd5 20898
a6cd2cc4 20899#: builtin/show-branch.c:664
ef317cd5 20900msgid "show commits in topological order"
07432cef 20901msgstr "以拓扑顺序显示提交"
ef317cd5 20902
a6cd2cc4 20903#: builtin/show-branch.c:667
ef317cd5 20904msgid "show only commits not on the first branch"
07432cef 20905msgstr "只显示不在第一个分支上的提交"
ef317cd5 20906
a6cd2cc4 20907#: builtin/show-branch.c:669
ef317cd5 20908msgid "show merges reachable from only one tip"
07432cef 20909msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 20910
a6cd2cc4 20911#: builtin/show-branch.c:671
2e8451e8
JX
20912msgid "topologically sort, maintaining date order where possible"
20913msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 20914
a6cd2cc4 20915#: builtin/show-branch.c:674
ef317cd5 20916msgid "<n>[,<base>]"
07432cef 20917msgstr "<n>[,<base>]"
ef317cd5 20918
a6cd2cc4 20919#: builtin/show-branch.c:675
ef317cd5 20920msgid "show <n> most recent ref-log entries starting at base"
58b6f078 20921msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
ef317cd5 20922
a6cd2cc4 20923#: builtin/show-branch.c:711
a0b6b246
JX
20924msgid ""
20925"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
20926msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
20927
a6cd2cc4 20928#: builtin/show-branch.c:735
a0b6b246
JX
20929msgid "no branches given, and HEAD is not valid"
20930msgstr "未提供分支,且 HEAD 无效"
20931
a6cd2cc4 20932#: builtin/show-branch.c:738
a0b6b246
JX
20933msgid "--reflog option needs one branch name"
20934msgstr "选项 --reflog 需要一个分支名"
20935
a6cd2cc4 20936#: builtin/show-branch.c:741
a0b6b246
JX
20937#, c-format
20938msgid "only %d entry can be shown at one time."
20939msgid_plural "only %d entries can be shown at one time."
20940msgstr[0] "一次只能显示 %d 个条目。"
20941msgstr[1] "一次只能显示 %d 个条目。"
20942
a6cd2cc4 20943#: builtin/show-branch.c:745
a0b6b246
JX
20944#, c-format
20945msgid "no such ref %s"
20946msgstr "无此引用 %s"
20947
a6cd2cc4 20948#: builtin/show-branch.c:831
a0b6b246
JX
20949#, c-format
20950msgid "cannot handle more than %d rev."
20951msgid_plural "cannot handle more than %d revs."
20952msgstr[0] "不能处理 %d 个以上的版本。"
20953msgstr[1] "不能处理 %d 个以上的版本。"
20954
a6cd2cc4 20955#: builtin/show-branch.c:835
a0b6b246
JX
20956#, c-format
20957msgid "'%s' is not a valid ref."
20958msgstr "'%s' 不是一个有效的引用。"
20959
a6cd2cc4 20960#: builtin/show-branch.c:838
a0b6b246
JX
20961#, c-format
20962msgid "cannot find commit %s (%s)"
29004bbb 20963msgstr "不能找到提交 %s(%s)"
a0b6b246 20964
7157c2b5
JX
20965#: builtin/show-index.c:21
20966msgid "hash-algorithm"
20967msgstr "哈希算法"
20968
20969#: builtin/show-index.c:31
20970msgid "Unknown hash algorithm"
20971msgstr "未知的哈希算法"
20972
d46c5519 20973#: builtin/show-ref.c:12
ef317cd5 20974msgid ""
814ff314
JX
20975"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
20976"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
ef317cd5 20977msgstr ""
814ff314
JX
20978"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
20979"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
ef317cd5 20980
d46c5519 20981#: builtin/show-ref.c:13
94550ed3
JX
20982msgid "git show-ref --exclude-existing[=<pattern>]"
20983msgstr "git show-ref --exclude-existing[=<模式>]"
ef317cd5 20984
d46c5519 20985#: builtin/show-ref.c:162
ef317cd5 20986msgid "only show tags (can be combined with heads)"
55a16ee4 20987msgstr "只显示标签(可以和头共用)"
ef317cd5 20988
d46c5519 20989#: builtin/show-ref.c:163
ef317cd5 20990msgid "only show heads (can be combined with tags)"
55a16ee4 20991msgstr "只显示头(可以和标签共用)"
ef317cd5 20992
d46c5519 20993#: builtin/show-ref.c:164
ef317cd5 20994msgid "stricter reference checking, requires exact ref path"
07432cef 20995msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 20996
d46c5519 20997#: builtin/show-ref.c:167 builtin/show-ref.c:169
2e8451e8
JX
20998msgid "show the HEAD reference, even if it would be filtered out"
20999msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 21000
d46c5519 21001#: builtin/show-ref.c:171
ef317cd5 21002msgid "dereference tags into object IDs"
4375c10e 21003msgstr "转换标签到对象 ID"
ef317cd5 21004
d46c5519
JX
21005#: builtin/show-ref.c:173
21006msgid "only show SHA1 hash using <n> digits"
21007msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
21008
21009#: builtin/show-ref.c:177
21010msgid "do not print results to stdout (useful with --verify)"
21011msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
21012
21013#: builtin/show-ref.c:179
21014msgid "show refs from stdin that aren't in local repository"
21015msgstr "显示从标准输入中读入的不在本地仓库中的引用"
21016
2b472aae 21017#: builtin/sparse-checkout.c:21
349ede6a
JX
21018msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
21019msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <选项>"
ddc12c42 21020
d9488fea
JX
21021#: builtin/sparse-checkout.c:50
21022msgid "git sparse-checkout list"
21023msgstr "git sparse-checkout list"
21024
21025#: builtin/sparse-checkout.c:76
ddc12c42
JX
21026msgid "this worktree is not sparse (sparse-checkout file may not exist)"
21027msgstr "本工作区不是稀疏模式(稀疏检出文件可能不存在)"
21028
d9488fea 21029#: builtin/sparse-checkout.c:228
2b472aae
JX
21030msgid "failed to create directory for sparse-checkout file"
21031msgstr "无法为稀疏检出文件创建目录"
21032
d9488fea 21033#: builtin/sparse-checkout.c:269
7157c2b5
JX
21034msgid "unable to upgrade repository format to enable worktreeConfig"
21035msgstr "无法升级仓库格式以启用 worktreeConfig"
21036
d9488fea 21037#: builtin/sparse-checkout.c:271
ddc12c42
JX
21038msgid "failed to set extensions.worktreeConfig setting"
21039msgstr "无法设置 extensions.worktreeConfig"
21040
d9488fea 21041#: builtin/sparse-checkout.c:288
ddc12c42
JX
21042msgid "git sparse-checkout init [--cone]"
21043msgstr "git sparse-checkout init [--cone]"
21044
d9488fea 21045#: builtin/sparse-checkout.c:307
ddc12c42
JX
21046msgid "initialize the sparse-checkout in cone mode"
21047msgstr "初始化稀疏检出为 cone 模式"
21048
d9488fea 21049#: builtin/sparse-checkout.c:344
ddc12c42
JX
21050#, c-format
21051msgid "failed to open '%s'"
21052msgstr "无法打开 '%s'"
21053
d9488fea 21054#: builtin/sparse-checkout.c:401
2b472aae
JX
21055#, c-format
21056msgid "could not normalize path %s"
21057msgstr "无法规范化路径 %s"
21058
d9488fea 21059#: builtin/sparse-checkout.c:413
2b472aae
JX
21060msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
21061msgstr "git sparse-checkout (set|add) (--stdin | <模式>)"
21062
d9488fea 21063#: builtin/sparse-checkout.c:438
2b472aae
JX
21064#, c-format
21065msgid "unable to unquote C-style string '%s'"
440e7442 21066msgstr "无法为 C 语言风格的字符串 '%s' 去引号"
2b472aae 21067
d9488fea 21068#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516
2b472aae
JX
21069msgid "unable to load existing sparse-checkout patterns"
21070msgstr "无法加载现存的稀疏检出模式"
ddc12c42 21071
d9488fea 21072#: builtin/sparse-checkout.c:561
ddc12c42
JX
21073msgid "read patterns from standard in"
21074msgstr "从标准输入读取模式"
21075
d9488fea
JX
21076#: builtin/sparse-checkout.c:576
21077msgid "git sparse-checkout reapply"
21078msgstr "git sparse-checkout reapply"
21079
21080#: builtin/sparse-checkout.c:595
21081msgid "git sparse-checkout disable"
21082msgstr "git sparse-checkout disable"
21083
21084#: builtin/sparse-checkout.c:623
ddc12c42
JX
21085msgid "error while refreshing working directory"
21086msgstr "刷新工作目录时出错"
21087
2b472aae 21088#: builtin/stash.c:22 builtin/stash.c:38
d46c5519
JX
21089msgid "git stash list [<options>]"
21090msgstr "git stash list [<选项>]"
21091
2b472aae 21092#: builtin/stash.c:23 builtin/stash.c:43
d46c5519
JX
21093msgid "git stash show [<options>] [<stash>]"
21094msgstr "git stash show [<选项>] [<stash>]"
21095
2b472aae 21096#: builtin/stash.c:24 builtin/stash.c:48
d46c5519
JX
21097msgid "git stash drop [-q|--quiet] [<stash>]"
21098msgstr "git stash drop [-q|--quiet] [<stash>]"
21099
21100#: builtin/stash.c:25
21101msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
21102msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
21103
2b472aae 21104#: builtin/stash.c:26 builtin/stash.c:63
d46c5519
JX
21105msgid "git stash branch <branchname> [<stash>]"
21106msgstr "git stash branch <分支名> [<stash>]"
21107
2b472aae 21108#: builtin/stash.c:27 builtin/stash.c:68
d46c5519
JX
21109msgid "git stash clear"
21110msgstr "git stash clear"
21111
2b472aae 21112#: builtin/stash.c:28
d46c5519
JX
21113msgid ""
21114"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
21115" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
2b472aae 21116" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
d46c5519
JX
21117" [--] [<pathspec>...]]"
21118msgstr ""
21119"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
21120" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
2b472aae 21121" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
d46c5519
JX
21122" [--] [<路径规格>...]]"
21123
2b472aae 21124#: builtin/stash.c:32 builtin/stash.c:85
d46c5519
JX
21125msgid ""
21126"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
21127" [-u|--include-untracked] [-a|--all] [<message>]"
21128msgstr ""
21129"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
21130" [-u|--include-untracked] [-a|--all] [<消息>]"
21131
2b472aae 21132#: builtin/stash.c:53
d46c5519
JX
21133msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
21134msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
21135
2b472aae 21136#: builtin/stash.c:58
d46c5519
JX
21137msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
21138msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
21139
2b472aae 21140#: builtin/stash.c:73
d46c5519
JX
21141msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
21142msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>"
21143
2b472aae
JX
21144#: builtin/stash.c:78
21145msgid ""
21146"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
21147" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
21148" [--] [<pathspec>...]]"
21149msgstr ""
21150"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
21151" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
21152" [--] [<路径规格>...]]"
21153
21154#: builtin/stash.c:128
d46c5519
JX
21155#, c-format
21156msgid "'%s' is not a stash-like commit"
21157msgstr "'%s' 不像是一个贮藏提交"
21158
2b472aae 21159#: builtin/stash.c:148
d46c5519
JX
21160#, c-format
21161msgid "Too many revisions specified:%s"
21162msgstr "指定了太多的版本:%s"
21163
349ede6a 21164#: builtin/stash.c:162
d46c5519
JX
21165msgid "No stash entries found."
21166msgstr "未发现贮藏条目。"
21167
2b472aae 21168#: builtin/stash.c:176
d46c5519
JX
21169#, c-format
21170msgid "%s is not a valid reference"
21171msgstr "%s 不是一个有效的引用名"
21172
349ede6a 21173#: builtin/stash.c:225
d46c5519
JX
21174msgid "git stash clear with parameters is unimplemented"
21175msgstr "git stash clear 不支持参数"
21176
2b472aae 21177#: builtin/stash.c:404
d46c5519 21178msgid "cannot apply a stash in the middle of a merge"
349ede6a 21179msgstr "无法在合并过程中应用贮藏"
d46c5519 21180
2b472aae 21181#: builtin/stash.c:415
d46c5519
JX
21182#, c-format
21183msgid "could not generate diff %s^!."
21184msgstr "无法生成差异 %s^!."
21185
2b472aae 21186#: builtin/stash.c:422
d13389bf 21187msgid "conflicts in index. Try without --index."
d46c5519
JX
21188msgstr "索引中有冲突。尝试不用 --index。"
21189
2b472aae 21190#: builtin/stash.c:428
d46c5519
JX
21191msgid "could not save index tree"
21192msgstr "不能保存索引树"
21193
2b472aae 21194#: builtin/stash.c:437
d46c5519
JX
21195msgid "could not restore untracked files from stash"
21196msgstr "无法从贮藏条目中恢复未跟踪文件"
21197
2b472aae 21198#: builtin/stash.c:451
d46c5519
JX
21199#, c-format
21200msgid "Merging %s with %s"
21201msgstr "正在合并 %s 和 %s"
21202
349ede6a 21203#: builtin/stash.c:461
d46c5519
JX
21204msgid "Index was not unstashed."
21205msgstr "索引未从贮藏中恢复。"
21206
d13389bf 21207#: builtin/stash.c:522 builtin/stash.c:620
d46c5519
JX
21208msgid "attempt to recreate the index"
21209msgstr "尝试重建索引"
21210
d13389bf 21211#: builtin/stash.c:566
d46c5519
JX
21212#, c-format
21213msgid "Dropped %s (%s)"
21214msgstr "丢弃了 %s(%s)"
21215
d13389bf 21216#: builtin/stash.c:569
d46c5519
JX
21217#, c-format
21218msgid "%s: Could not drop stash entry"
21219msgstr "%s:无法丢弃贮藏条目"
21220
d13389bf 21221#: builtin/stash.c:582
d46c5519
JX
21222#, c-format
21223msgid "'%s' is not a stash reference"
21224msgstr "'%s' 不是一个贮藏引用"
21225
d13389bf 21226#: builtin/stash.c:632
d46c5519
JX
21227msgid "The stash entry is kept in case you need it again."
21228msgstr "贮藏条目被保留以备您再次需要。"
21229
d13389bf 21230#: builtin/stash.c:655
d46c5519
JX
21231msgid "No branch name specified"
21232msgstr "未指定分支名"
21233
d13389bf 21234#: builtin/stash.c:799 builtin/stash.c:836
d46c5519
JX
21235#, c-format
21236msgid "Cannot update %s with %s"
21237msgstr "无法用 %2$s 更新 %1$s"
21238
d13389bf 21239#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536
d46c5519
JX
21240msgid "stash message"
21241msgstr "贮藏说明"
21242
d13389bf 21243#: builtin/stash.c:827
d46c5519
JX
21244msgid "\"git stash store\" requires one <commit> argument"
21245msgstr "\"git stash store\" 需要一个 <提交> 参数"
21246
d13389bf 21247#: builtin/stash.c:1042
d46c5519
JX
21248msgid "No changes selected"
21249msgstr "没有选择变更"
21250
d13389bf 21251#: builtin/stash.c:1142
d46c5519
JX
21252msgid "You do not have the initial commit yet"
21253msgstr "您尚未建立初始提交"
21254
d13389bf 21255#: builtin/stash.c:1169
d46c5519
JX
21256msgid "Cannot save the current index state"
21257msgstr "无法保存当前索引状态"
21258
d13389bf 21259#: builtin/stash.c:1178
d46c5519
JX
21260msgid "Cannot save the untracked files"
21261msgstr "无法保存未跟踪文件"
21262
d13389bf 21263#: builtin/stash.c:1189 builtin/stash.c:1198
d46c5519
JX
21264msgid "Cannot save the current worktree state"
21265msgstr "无法保存当前工作区状态"
21266
d13389bf 21267#: builtin/stash.c:1226
d46c5519
JX
21268msgid "Cannot record working tree state"
21269msgstr "不能记录工作区状态"
21270
d13389bf 21271#: builtin/stash.c:1275
d46c5519
JX
21272msgid "Can't use --patch and --include-untracked or --all at the same time"
21273msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
21274
d13389bf 21275#: builtin/stash.c:1291
d46c5519
JX
21276msgid "Did you forget to 'git add'?"
21277msgstr "您是否忘了执行 'git add'?"
21278
d13389bf 21279#: builtin/stash.c:1306
d46c5519
JX
21280msgid "No local changes to save"
21281msgstr "没有要保存的本地修改"
21282
d13389bf 21283#: builtin/stash.c:1313
d46c5519
JX
21284msgid "Cannot initialize stash"
21285msgstr "无法初始化贮藏"
21286
d13389bf 21287#: builtin/stash.c:1328
d46c5519
JX
21288msgid "Cannot save the current status"
21289msgstr "无法保存当前状态"
21290
d13389bf 21291#: builtin/stash.c:1333
d46c5519
JX
21292#, c-format
21293msgid "Saved working directory and index state %s"
21294msgstr "保存工作目录和索引状态 %s"
21295
d13389bf 21296#: builtin/stash.c:1423
d46c5519
JX
21297msgid "Cannot remove worktree changes"
21298msgstr "无法删除工作区变更"
21299
d13389bf 21300#: builtin/stash.c:1462 builtin/stash.c:1527
d46c5519
JX
21301msgid "keep index"
21302msgstr "保持索引"
21303
d13389bf 21304#: builtin/stash.c:1464 builtin/stash.c:1529
d46c5519
JX
21305msgid "stash in patch mode"
21306msgstr "以补丁模式贮藏"
21307
d13389bf 21308#: builtin/stash.c:1465 builtin/stash.c:1530
d46c5519
JX
21309msgid "quiet mode"
21310msgstr "静默模式"
21311
d13389bf 21312#: builtin/stash.c:1467 builtin/stash.c:1532
d46c5519
JX
21313msgid "include untracked files in stash"
21314msgstr "贮藏中包含未跟踪文件"
ef317cd5 21315
d13389bf 21316#: builtin/stash.c:1469 builtin/stash.c:1534
d46c5519
JX
21317msgid "include ignore files"
21318msgstr "包含忽略的文件"
ef317cd5 21319
d13389bf 21320#: builtin/stash.c:1569
349ede6a
JX
21321msgid ""
21322"the stash.useBuiltin support has been removed!\n"
21323"See its entry in 'git help config' for details."
21324msgstr ""
21325"对 stash.useBuiltin 的支持已被删除!\n"
21326"详见 'git help config' 中的条目。"
ef317cd5 21327
a4f16749 21328#: builtin/stripspace.c:18
94550ed3
JX
21329msgid "git stripspace [-s | --strip-comments]"
21330msgstr "git stripspace [-s | --strip-comments]"
21331
a4f16749 21332#: builtin/stripspace.c:19
94550ed3
JX
21333msgid "git stripspace [-c | --comment-lines]"
21334msgstr "git stripspace [-c | --comment-lines]"
21335
06991777 21336#: builtin/stripspace.c:37
94550ed3
JX
21337msgid "skip and remove all lines starting with comment character"
21338msgstr "跳过和移除所有的注释行"
21339
06991777 21340#: builtin/stripspace.c:40
276ceeaa 21341msgid "prepend comment character and space to each line"
94550ed3
JX
21342msgstr "为每一行的行首添加注释符和空格"
21343
d9488fea 21344#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
5b04ee3b
JX
21345#, c-format
21346msgid "Expecting a full ref name, got %s"
21347msgstr "期望一个完整的引用名称,却得到 %s"
21348
ddc12c42 21349#: builtin/submodule--helper.c:64
31e5e17b
JX
21350msgid "submodule--helper print-default-remote takes no arguments"
21351msgstr "submodule--helper print-default-remote 不带参数"
21352
ddc12c42 21353#: builtin/submodule--helper.c:102
5b04ee3b
JX
21354#, c-format
21355msgid "cannot strip one component off url '%s'"
21356msgstr "无法从 url '%s' 剥离一个组件"
21357
d9488fea 21358#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
94550ed3
JX
21359msgid "alternative anchor for relative paths"
21360msgstr "相对路径的替代锚记(anchor)"
21361
ddc12c42 21362#: builtin/submodule--helper.c:415
94550ed3
JX
21363msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
21364msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
21365
d9488fea
JX
21366#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
21367#: builtin/submodule--helper.c:652
5b04ee3b
JX
21368#, c-format
21369msgid "No url found for submodule path '%s' in .gitmodules"
21370msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
21371
ddc12c42 21372#: builtin/submodule--helper.c:524
c1ac5258
JX
21373#, c-format
21374msgid "Entering '%s'\n"
21375msgstr "进入 '%s'\n"
21376
ddc12c42 21377#: builtin/submodule--helper.c:527
c1ac5258
JX
21378#, c-format
21379msgid ""
21380"run_command returned non-zero status for %s\n"
21381"."
4c27fcb5
JX
21382msgstr ""
21383"对 %s 执行 run_command 返回非零值。\n"
21384"."
c1ac5258 21385
ddc12c42 21386#: builtin/submodule--helper.c:549
c1ac5258
JX
21387#, c-format
21388msgid ""
21389"run_command returned non-zero status while recursing in the nested "
21390"submodules of %s\n"
21391"."
4c27fcb5
JX
21392msgstr ""
21393"在递归 %s 的子模组执行 run_command 时返回非零值。\n"
21394"."
c1ac5258 21395
ddc12c42 21396#: builtin/submodule--helper.c:565
c1ac5258
JX
21397msgid "Suppress output of entering each submodule command"
21398msgstr "阻止进入每一个子模组命令的输出"
21399
d9488fea 21400#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487
c1ac5258
JX
21401msgid "Recurse into nested submodules"
21402msgstr "递归进入嵌套子模组中"
21403
ddc12c42 21404#: builtin/submodule--helper.c:572
d46c5519
JX
21405msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
21406msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
c1ac5258 21407
ddc12c42 21408#: builtin/submodule--helper.c:599
87cb7997
JX
21409#, c-format
21410msgid ""
4c27fcb5 21411"could not look up configuration '%s'. Assuming this repository is its own "
87cb7997
JX
21412"authoritative upstream."
21413msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
21414
d9488fea 21415#: builtin/submodule--helper.c:666
5b04ee3b
JX
21416#, c-format
21417msgid "Failed to register url for submodule path '%s'"
21418msgstr "无法为子模组 '%s' 注册 url"
21419
d9488fea 21420#: builtin/submodule--helper.c:670
5b04ee3b
JX
21421#, c-format
21422msgid "Submodule '%s' (%s) registered for path '%s'\n"
25c75902 21423msgstr "子模组 '%s'(%s)已对路径 '%s' 注册\n"
5b04ee3b 21424
d9488fea 21425#: builtin/submodule--helper.c:680
aef18cc6 21426#, c-format
5b04ee3b 21427msgid "warning: command update mode suggested for submodule '%s'\n"
aef18cc6 21428msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
5b04ee3b 21429
d9488fea 21430#: builtin/submodule--helper.c:687
5b04ee3b
JX
21431#, c-format
21432msgid "Failed to register update mode for submodule path '%s'"
21433msgstr "无法为子模组 '%s' 注册更新模式"
21434
d9488fea 21435#: builtin/submodule--helper.c:709
5b04ee3b 21436msgid "Suppress output for initializing a submodule"
31e5e17b 21437msgstr "阻止子模组初始化的输出"
5b04ee3b 21438
d9488fea 21439#: builtin/submodule--helper.c:714
d46c5519
JX
21440msgid "git submodule--helper init [<options>] [<path>]"
21441msgstr "git submodule--helper init [<选项>] [<路径>]"
5b04ee3b 21442
d9488fea 21443#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
94550ed3
JX
21444#, c-format
21445msgid "no submodule mapping found in .gitmodules for path '%s'"
21446msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
21447
d9488fea 21448#: builtin/submodule--helper.c:835
5809aa05
JX
21449#, c-format
21450msgid "could not resolve HEAD ref inside the submodule '%s'"
21451msgstr "无法解析子模组 '%s' 的 HEAD 引用"
21452
d9488fea 21453#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
5809aa05
JX
21454#, c-format
21455msgid "failed to recurse into submodule '%s'"
c1ac5258 21456msgstr "递归子模组 '%s' 失败"
5809aa05 21457
d9488fea 21458#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
5809aa05 21459msgid "Suppress submodule status output"
31e5e17b 21460msgstr "阻止子模组状态输出"
5809aa05 21461
d9488fea 21462#: builtin/submodule--helper.c:887
5809aa05
JX
21463msgid ""
21464"Use commit stored in the index instead of the one stored in the submodule "
21465"HEAD"
21466msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交"
21467
d9488fea 21468#: builtin/submodule--helper.c:888
5809aa05 21469msgid "recurse into nested submodules"
31e5e17b 21470msgstr "递归进入嵌套子模组中"
5809aa05 21471
d9488fea 21472#: builtin/submodule--helper.c:893
5809aa05
JX
21473msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
21474msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
21475
d9488fea 21476#: builtin/submodule--helper.c:917
5809aa05
JX
21477msgid "git submodule--helper name <path>"
21478msgstr "git submodule--helper name <路径>"
21479
d9488fea
JX
21480#: builtin/submodule--helper.c:989
21481#, c-format
21482msgid "* %s %s(blob)->%s(submodule)"
21483msgstr "* %s %s(数据对象)->%s(子模组)"
21484
21485#: builtin/submodule--helper.c:992
21486#, c-format
21487msgid "* %s %s(submodule)->%s(blob)"
21488msgstr "* %s %s(子模组)->%s(数据对象)"
21489
21490#: builtin/submodule--helper.c:1005
21491#, c-format
21492msgid "%s"
21493msgstr "%s"
21494
21495#: builtin/submodule--helper.c:1055
21496#, c-format
21497msgid "couldn't hash object from '%s'"
21498msgstr "不能从 '%s' 创建哈希对象"
21499
21500#: builtin/submodule--helper.c:1059
21501#, c-format
21502msgid "unexpected mode %o\n"
21503msgstr "意外的模式 %o\n"
21504
21505#: builtin/submodule--helper.c:1300
21506msgid "use the commit stored in the index instead of the submodule HEAD"
21507msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交"
21508
21509#: builtin/submodule--helper.c:1302
21510msgid "to compare the commit in the index with that in the submodule HEAD"
21511msgstr "比较存储在索引和子模组 HEAD 中的提交"
21512
21513#: builtin/submodule--helper.c:1304
21514msgid "skip submodules with 'ignore_config' value set to 'all'"
21515msgstr "跳过设置了 'ignore_config' 为 'all' 的子模组"
21516
21517#: builtin/submodule--helper.c:1306
21518msgid "limit the summary size"
21519msgstr "限制总结的大小"
21520
21521#: builtin/submodule--helper.c:1311
21522msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
21523msgstr "git submodule--helper summary [<选项>] [<提交>] [--] [<路径>]"
21524
21525#: builtin/submodule--helper.c:1335
21526msgid "could not fetch a revision for HEAD"
21527msgstr "不能为 HEAD 获取一个版本"
21528
21529#: builtin/submodule--helper.c:1340
21530msgid "--cached and --files are mutually exclusive"
21531msgstr "--cached 和 --files 是互斥的"
21532
21533#: builtin/submodule--helper.c:1407
31e5e17b
JX
21534#, c-format
21535msgid "Synchronizing submodule url for '%s'\n"
21536msgstr "为 '%s' 同步子模组 url\n"
21537
d9488fea 21538#: builtin/submodule--helper.c:1413
31e5e17b
JX
21539#, c-format
21540msgid "failed to register url for submodule path '%s'"
21541msgstr "无法为子模组路径 '%s' 注册 url"
21542
d9488fea 21543#: builtin/submodule--helper.c:1427
31e5e17b
JX
21544#, c-format
21545msgid "failed to get the default remote for submodule '%s'"
21546msgstr "无法得到子模组 '%s' 的默认远程关联"
21547
d9488fea 21548#: builtin/submodule--helper.c:1438
31e5e17b
JX
21549#, c-format
21550msgid "failed to update remote for submodule '%s'"
21551msgstr "无法为子模组 '%s' 更新远程关联"
21552
d9488fea 21553#: builtin/submodule--helper.c:1485
31e5e17b
JX
21554msgid "Suppress output of synchronizing submodule url"
21555msgstr "阻止子模组 url 同步的输出"
21556
d9488fea 21557#: builtin/submodule--helper.c:1492
31e5e17b
JX
21558msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
21559msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
21560
d9488fea 21561#: builtin/submodule--helper.c:1546
31e5e17b
JX
21562#, c-format
21563msgid ""
21564"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
21565"really want to remove it including all of its history)"
21566msgstr ""
fd8cb379
JX
21567"子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm "
21568"-rf' 命令)"
31e5e17b 21569
d9488fea 21570#: builtin/submodule--helper.c:1558
31e5e17b
JX
21571#, c-format
21572msgid ""
21573"Submodule work tree '%s' contains local modifications; use '-f' to discard "
21574"them"
21575msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们"
21576
d9488fea 21577#: builtin/submodule--helper.c:1566
31e5e17b
JX
21578#, c-format
21579msgid "Cleared directory '%s'\n"
21580msgstr "已清除目录 '%s'\n"
21581
d9488fea 21582#: builtin/submodule--helper.c:1568
31e5e17b
JX
21583#, c-format
21584msgid "Could not remove submodule work tree '%s'\n"
21585msgstr "无法移除子模组工作区 '%s'\n"
21586
d9488fea 21587#: builtin/submodule--helper.c:1579
31e5e17b
JX
21588#, c-format
21589msgid "could not create empty submodule directory %s"
21590msgstr "不能创建空的子模组目录 %s"
21591
d9488fea 21592#: builtin/submodule--helper.c:1595
31e5e17b
JX
21593#, c-format
21594msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
21595msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
21596
d9488fea 21597#: builtin/submodule--helper.c:1624
31e5e17b
JX
21598msgid "Remove submodule working trees even if they contain local changes"
21599msgstr "删除子模组工作区,即使包含本地修改"
21600
d9488fea 21601#: builtin/submodule--helper.c:1625
31e5e17b
JX
21602msgid "Unregister all submodules"
21603msgstr "将所有子模组取消注册"
21604
d9488fea 21605#: builtin/submodule--helper.c:1630
31e5e17b
JX
21606msgid ""
21607"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
21608msgstr ""
21609"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
21610
d9488fea 21611#: builtin/submodule--helper.c:1644
31e5e17b
JX
21612msgid "Use '--all' if you really want to deinitialize all submodules"
21613msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
21614
d9488fea 21615#: builtin/submodule--helper.c:1713
ddc12c42
JX
21616msgid ""
21617"An alternate computed from a superproject's alternate is invalid.\n"
21618"To allow Git to clone without an alternate in such a case, set\n"
21619"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
21620"'--reference-if-able' instead of '--reference'."
21621msgstr ""
21622"从一个父项目的备用仓库中计算出的备用仓库无效。\n"
21623"此场景下,设置 submodule.alternateErrorStrategy 为 'info',以允许\n"
21624"Git 不使用备用仓库克隆,或者等效地使用 '--reference-if-able' 而非\n"
21625"'--reference' 来克隆。"
21626
d9488fea 21627#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
a0b6b246
JX
21628#, c-format
21629msgid "submodule '%s' cannot add alternate: %s"
21630msgstr "子模组 '%s' 不能添加仓库备选:%s"
21631
d9488fea 21632#: builtin/submodule--helper.c:1791
a0b6b246
JX
21633#, c-format
21634msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
21635msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
21636
d9488fea 21637#: builtin/submodule--helper.c:1798
a0b6b246
JX
21638#, c-format
21639msgid "Value '%s' for submodule.alternateLocation is not recognized"
21640msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
21641
d9488fea 21642#: builtin/submodule--helper.c:1822
94550ed3
JX
21643msgid "where the new submodule will be cloned to"
21644msgstr "新的子模组将要克隆的路径"
21645
d9488fea 21646#: builtin/submodule--helper.c:1825
94550ed3
JX
21647msgid "name of the new submodule"
21648msgstr "新子模组的名称"
21649
d9488fea 21650#: builtin/submodule--helper.c:1828
94550ed3
JX
21651msgid "url where to clone the submodule from"
21652msgstr "克隆子模组的 url 地址"
21653
d9488fea 21654#: builtin/submodule--helper.c:1836
94550ed3
JX
21655msgid "depth for shallow clones"
21656msgstr "浅克隆的深度"
21657
d9488fea 21658#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
a0b6b246 21659msgid "force cloning progress"
29004bbb 21660msgstr "强制显示克隆进度"
a0b6b246 21661
d9488fea 21662#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
ddc12c42
JX
21663msgid "disallow cloning into non-empty directory"
21664msgstr "不允许克隆到一个非空目录"
21665
d9488fea 21666#: builtin/submodule--helper.c:1848
94550ed3
JX
21667msgid ""
21668"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
2b472aae
JX
21669"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
21670"<url> --path <path>"
5c57d762
JX
21671msgstr ""
21672"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
2b472aae 21673"[--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>"
94550ed3 21674
d9488fea 21675#: builtin/submodule--helper.c:1873
ddc12c42
JX
21676#, c-format
21677msgid "refusing to create/use '%s' in another submodule's git dir"
21678msgstr "拒绝在另一个子模组的 git dir 中创建/使用 '%s'"
21679
d9488fea 21680#: builtin/submodule--helper.c:1884
94550ed3
JX
21681#, c-format
21682msgid "clone of '%s' into submodule path '%s' failed"
21683msgstr "无法克隆 '%s' 到子模组路径 '%s'"
21684
d9488fea 21685#: builtin/submodule--helper.c:1888
ddc12c42
JX
21686#, c-format
21687msgid "directory not empty: '%s'"
21688msgstr "目录非空:'%s'"
21689
d9488fea 21690#: builtin/submodule--helper.c:1900
94550ed3
JX
21691#, c-format
21692msgid "could not get submodule directory for '%s'"
21693msgstr "无法得到 '%s' 的子模组目录"
21694
d9488fea 21695#: builtin/submodule--helper.c:1936
4c27fcb5
JX
21696#, c-format
21697msgid "Invalid update mode '%s' for submodule path '%s'"
21698msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效"
21699
d9488fea 21700#: builtin/submodule--helper.c:1940
4c27fcb5
JX
21701#, c-format
21702msgid "Invalid update mode '%s' configured for submodule path '%s'"
21703msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效"
21704
d9488fea 21705#: builtin/submodule--helper.c:2041
5b04ee3b
JX
21706#, c-format
21707msgid "Submodule path '%s' not initialized"
21708msgstr "子模组 '%s' 尚未初始化"
21709
d9488fea 21710#: builtin/submodule--helper.c:2045
5b04ee3b
JX
21711msgid "Maybe you want to use 'update --init'?"
21712msgstr "也许您想要执行 'update --init'?"
21713
d9488fea 21714#: builtin/submodule--helper.c:2075
5b04ee3b
JX
21715#, c-format
21716msgid "Skipping unmerged submodule %s"
21717msgstr "略过未合并的子模组 %s"
21718
d9488fea 21719#: builtin/submodule--helper.c:2104
5b04ee3b
JX
21720#, c-format
21721msgid "Skipping submodule '%s'"
21722msgstr "略过子模组 '%s'"
21723
d9488fea 21724#: builtin/submodule--helper.c:2254
5c57d762
JX
21725#, c-format
21726msgid "Failed to clone '%s'. Retry scheduled"
21727msgstr "克隆 '%s' 失败。按计划重试"
21728
d9488fea 21729#: builtin/submodule--helper.c:2265
5c57d762
JX
21730#, c-format
21731msgid "Failed to clone '%s' a second time, aborting"
21732msgstr "第二次尝试克隆 '%s' 失败,退出"
21733
d9488fea 21734#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
5b04ee3b
JX
21735msgid "path into the working tree"
21736msgstr "到工作区的路径"
21737
d9488fea 21738#: builtin/submodule--helper.c:2330
5b04ee3b
JX
21739msgid "path into the working tree, across nested submodule boundaries"
21740msgstr "工作区中的路径,递归嵌套子模组"
21741
d9488fea 21742#: builtin/submodule--helper.c:2334
5b04ee3b
JX
21743msgid "rebase, merge, checkout or none"
21744msgstr "rebase、merge、checkout 或 none"
21745
d9488fea 21746#: builtin/submodule--helper.c:2340
5b04ee3b
JX
21747msgid "Create a shallow clone truncated to the specified number of revisions"
21748msgstr "创建一个指定深度的浅克隆"
21749
d9488fea 21750#: builtin/submodule--helper.c:2343
5b04ee3b
JX
21751msgid "parallel jobs"
21752msgstr "并发任务"
21753
d9488fea 21754#: builtin/submodule--helper.c:2345
5c57d762 21755msgid "whether the initial clone should follow the shallow recommendation"
9a4b694c 21756msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
5c57d762 21757
d9488fea 21758#: builtin/submodule--helper.c:2346
5b04ee3b
JX
21759msgid "don't print cloning progress"
21760msgstr "不要输出克隆进度"
94550ed3 21761
d9488fea 21762#: builtin/submodule--helper.c:2357
a5cd71ca
JX
21763msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
21764msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]"
5b04ee3b 21765
d9488fea 21766#: builtin/submodule--helper.c:2370
5b04ee3b
JX
21767msgid "bad value for update parameter"
21768msgstr "update 参数取值错误"
21769
d9488fea 21770#: builtin/submodule--helper.c:2418
5c57d762
JX
21771#, c-format
21772msgid ""
21773"Submodule (%s) branch configured to inherit branch from superproject, but "
21774"the superproject is not on any branch"
21775msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
21776
d9488fea 21777#: builtin/submodule--helper.c:2541
4c27fcb5
JX
21778#, c-format
21779msgid "could not get a repository handle for submodule '%s'"
21780msgstr "无法获得子模组 '%s' 的仓库句柄"
21781
d9488fea 21782#: builtin/submodule--helper.c:2574
1a79b2f1
JX
21783msgid "recurse into submodules"
21784msgstr "在子模组中递归"
21785
d9488fea 21786#: builtin/submodule--helper.c:2580
d46c5519
JX
21787msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
21788msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
1a79b2f1 21789
d9488fea 21790#: builtin/submodule--helper.c:2636
4c27fcb5
JX
21791msgid "check if it is safe to write to the .gitmodules file"
21792msgstr "检查写入 .gitmodules 文件是否安全"
21793
d9488fea 21794#: builtin/submodule--helper.c:2639
d46c5519
JX
21795msgid "unset the config in the .gitmodules file"
21796msgstr "取消 .gitmodules 文件中的设置"
21797
d9488fea 21798#: builtin/submodule--helper.c:2644
d46c5519
JX
21799msgid "git submodule--helper config <name> [<value>]"
21800msgstr "git submodule--helper config <名称> [<值>]"
4c27fcb5 21801
d9488fea 21802#: builtin/submodule--helper.c:2645
d46c5519
JX
21803msgid "git submodule--helper config --unset <name>"
21804msgstr "git submodule--helper config --unset <名称>"
21805
d9488fea 21806#: builtin/submodule--helper.c:2646
4c27fcb5
JX
21807msgid "git submodule--helper config --check-writeable"
21808msgstr "git submodule--helper config --check-writeable"
21809
d13389bf 21810#: builtin/submodule--helper.c:2665 git-submodule.sh:150
4c27fcb5
JX
21811#, sh-format
21812msgid "please make sure that the .gitmodules file is in the working tree"
21813msgstr "请确认 .gitmodules 文件在工作区里"
21814
d9488fea 21815#: builtin/submodule--helper.c:2681
349ede6a
JX
21816msgid "Suppress output for setting url of a submodule"
21817msgstr "阻止设置子模组 URL 的输出"
21818
d9488fea 21819#: builtin/submodule--helper.c:2685
349ede6a
JX
21820msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
21821msgstr "git submodule--helper set-url [--quiet] <路径> <新地址>"
21822
d9488fea 21823#: builtin/submodule--helper.c:2718
7157c2b5
JX
21824msgid "set the default tracking branch to master"
21825msgstr "设置默认跟踪分支为 master"
21826
d9488fea 21827#: builtin/submodule--helper.c:2720
7157c2b5
JX
21828msgid "set the default tracking branch"
21829msgstr "设置默认跟踪分支"
21830
d9488fea 21831#: builtin/submodule--helper.c:2724
7157c2b5
JX
21832msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
21833msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <路径>"
21834
d9488fea 21835#: builtin/submodule--helper.c:2725
7157c2b5
JX
21836msgid ""
21837"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
d9488fea
JX
21838msgstr ""
21839"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <分支> <路径>"
7157c2b5 21840
d9488fea 21841#: builtin/submodule--helper.c:2732
7157c2b5
JX
21842msgid "--branch or --default required"
21843msgstr "需要 --branch 或 --default"
21844
d9488fea 21845#: builtin/submodule--helper.c:2735
7157c2b5
JX
21846msgid "--branch and --default are mutually exclusive"
21847msgstr "--branch 和 --default 是互斥的"
21848
d13389bf 21849#: builtin/submodule--helper.c:2792 git.c:438 git.c:711
1a79b2f1
JX
21850#, c-format
21851msgid "%s doesn't support --super-prefix"
21852msgstr "%s 不支持 --super-prefix"
21853
d9488fea 21854#: builtin/submodule--helper.c:2798
94550ed3 21855#, c-format
5b04ee3b
JX
21856msgid "'%s' is not a valid submodule--helper subcommand"
21857msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
94550ed3 21858
a4f16749 21859#: builtin/symbolic-ref.c:8
814ff314
JX
21860msgid "git symbolic-ref [<options>] <name> [<ref>]"
21861msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
07432cef 21862
a4f16749 21863#: builtin/symbolic-ref.c:9
814ff314
JX
21864msgid "git symbolic-ref -d [-q] <name>"
21865msgstr "git symbolic-ref -d [-q] <名称>"
ef317cd5 21866
6937cb4e 21867#: builtin/symbolic-ref.c:40
ef317cd5 21868msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
21869msgstr "不显示非符号(分离的)引用的错误信息"
21870
6937cb4e 21871#: builtin/symbolic-ref.c:41
07432cef
WS
21872msgid "delete symbolic ref"
21873msgstr "删除符号引用"
ef317cd5 21874
6937cb4e 21875#: builtin/symbolic-ref.c:42
ef317cd5 21876msgid "shorten ref output"
6937cb4e 21877msgstr "缩短引用输出"
ef317cd5 21878
d13389bf 21879#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
ef317cd5 21880msgid "reason"
07432cef 21881msgstr "原因"
ef317cd5 21882
d13389bf 21883#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
ef317cd5 21884msgid "reason of the update"
07432cef 21885msgstr "更新的原因"
ef317cd5 21886
c1ac5258 21887#: builtin/tag.c:25
ef317cd5 21888msgid ""
d46c5519
JX
21889"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
21890"\t\t<tagname> [<head>]"
814ff314 21891msgstr ""
d46c5519
JX
21892"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n"
21893"\t\t<标签名> [<头>]"
ef317cd5 21894
d46c5519 21895#: builtin/tag.c:27
ef317cd5 21896msgid "git tag -d <tagname>..."
07432cef 21897msgstr "git tag -d <标签名>..."
ef317cd5 21898
d46c5519 21899#: builtin/tag.c:28
ef317cd5 21900msgid ""
87cb7997
JX
21901"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
21902"points-at <object>]\n"
d9488fea
JX
21903"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
21904"[<pattern>...]"
ef317cd5 21905msgstr ""
87cb7997
JX
21906"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
21907"at <对象>]\n"
d9488fea 21908"\t\t[--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]"
ef317cd5 21909
d46c5519 21910#: builtin/tag.c:30
1a79b2f1
JX
21911msgid "git tag -v [--format=<format>] <tagname>..."
21912msgstr "git tag -v [--format=<格式>] <标签名>..."
ef317cd5 21913
a6cd2cc4 21914#: builtin/tag.c:89
c04f5ac3
JX
21915#, c-format
21916msgid "tag '%s' not found."
55a16ee4 21917msgstr "未发现标签 '%s'。"
c04f5ac3 21918
a6cd2cc4 21919#: builtin/tag.c:105
c04f5ac3
JX
21920#, c-format
21921msgid "Deleted tag '%s' (was %s)\n"
55a16ee4 21922msgstr "已删除标签 '%s'(曾为 %s)\n"
c04f5ac3 21923
a6cd2cc4 21924#: builtin/tag.c:135
a77c07d9 21925#, c-format
c04f5ac3
JX
21926msgid ""
21927"\n"
6acbf033
JX
21928"Write a message for tag:\n"
21929" %s\n"
a77c07d9 21930"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
21931msgstr ""
21932"\n"
55a16ee4 21933"输入一个标签说明:\n"
6acbf033 21934" %s\n"
a77c07d9 21935"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 21936
a6cd2cc4 21937#: builtin/tag.c:139
a77c07d9 21938#, c-format
c04f5ac3
JX
21939msgid ""
21940"\n"
6acbf033
JX
21941"Write a message for tag:\n"
21942" %s\n"
a77c07d9 21943"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 21944"want to.\n"
c04f5ac3
JX
21945msgstr ""
21946"\n"
55a16ee4 21947"输入一个标签说明:\n"
6acbf033 21948" %s\n"
a77c07d9 21949"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 21950
a6cd2cc4 21951#: builtin/tag.c:198
c04f5ac3 21952msgid "unable to sign the tag"
55a16ee4 21953msgstr "无法签署标签"
c04f5ac3 21954
a6cd2cc4 21955#: builtin/tag.c:200
c04f5ac3 21956msgid "unable to write tag file"
55a16ee4 21957msgstr "无法写标签文件"
c04f5ac3 21958
a6cd2cc4 21959#: builtin/tag.c:216
d46c5519
JX
21960#, c-format
21961msgid ""
21962"You have created a nested tag. The object referred to by your new tag is\n"
21963"already a tag. If you meant to tag the object that it points to, use:\n"
21964"\n"
21965"\tgit tag -f %s %s^{}"
21966msgstr ""
21967"您创建了一个嵌套的标签。您的新标签指向的对象已经是一个标签。如果您想要\n"
21968"对其指向的目标创建标签,使用:\n"
21969"\n"
21970"\tgit tag -f %s %s^{}"
21971
a6cd2cc4 21972#: builtin/tag.c:232
c04f5ac3 21973msgid "bad object type."
90e6ef53 21974msgstr "坏的对象类型。"
c04f5ac3 21975
349ede6a 21976#: builtin/tag.c:285
c04f5ac3 21977msgid "no tag message?"
55a16ee4 21978msgstr "无标签说明?"
c04f5ac3 21979
349ede6a 21980#: builtin/tag.c:292
c04f5ac3
JX
21981#, c-format
21982msgid "The tag message has been left in %s\n"
55a16ee4 21983msgstr "标签说明被保留在 %s\n"
c04f5ac3 21984
349ede6a 21985#: builtin/tag.c:403
ef317cd5 21986msgid "list tag names"
55a16ee4 21987msgstr "列出标签名称"
ef317cd5 21988
349ede6a 21989#: builtin/tag.c:405
ef317cd5 21990msgid "print <n> lines of each tag message"
55a16ee4 21991msgstr "每个标签信息打印 <n> 行"
ef317cd5 21992
349ede6a 21993#: builtin/tag.c:407
ef317cd5 21994msgid "delete tags"
55a16ee4 21995msgstr "删除标签"
ef317cd5 21996
349ede6a 21997#: builtin/tag.c:408
ef317cd5 21998msgid "verify tags"
55a16ee4 21999msgstr "验证标签"
ef317cd5 22000
349ede6a 22001#: builtin/tag.c:410
ef317cd5 22002msgid "Tag creation options"
55a16ee4 22003msgstr "标签创建选项"
ef317cd5 22004
349ede6a 22005#: builtin/tag.c:412
ef317cd5 22006msgid "annotated tag, needs a message"
55a16ee4 22007msgstr "附注标签,需要一个说明"
ef317cd5 22008
349ede6a 22009#: builtin/tag.c:414
ef317cd5 22010msgid "tag message"
55a16ee4 22011msgstr "标签说明"
ef317cd5 22012
349ede6a 22013#: builtin/tag.c:416
31e5e17b
JX
22014msgid "force edit of tag message"
22015msgstr "强制编辑标签说明"
22016
349ede6a 22017#: builtin/tag.c:417
ef317cd5 22018msgid "annotated and GPG-signed tag"
55a16ee4 22019msgstr "附注并附加 GPG 签名的标签"
ef317cd5 22020
349ede6a 22021#: builtin/tag.c:420
ef317cd5 22022msgid "use another key to sign the tag"
55a16ee4 22023msgstr "使用另外的私钥签名该标签"
ef317cd5 22024
349ede6a 22025#: builtin/tag.c:421
ef317cd5 22026msgid "replace the tag if exists"
55a16ee4 22027msgstr "如果存在,替换现有的标签"
ef317cd5 22028
d13389bf 22029#: builtin/tag.c:422 builtin/update-ref.c:505
03ea3327 22030msgid "create a reflog"
1b7f4a34
JX
22031msgstr "创建引用日志"
22032
349ede6a 22033#: builtin/tag.c:424
814ff314 22034msgid "Tag listing options"
55a16ee4 22035msgstr "标签列表选项"
814ff314 22036
349ede6a 22037#: builtin/tag.c:425
ef317cd5 22038msgid "show tag list in columns"
55a16ee4 22039msgstr "以列的方式显示标签列表"
ef317cd5 22040
349ede6a 22041#: builtin/tag.c:426 builtin/tag.c:428
ef317cd5 22042msgid "print only tags that contain the commit"
87cb7997 22043msgstr "只打印包含该提交的标签"
ef317cd5 22044
349ede6a 22045#: builtin/tag.c:427 builtin/tag.c:429
87cb7997
JX
22046msgid "print only tags that don't contain the commit"
22047msgstr "只打印不包含该提交的标签"
22048
349ede6a 22049#: builtin/tag.c:430
94550ed3
JX
22050msgid "print only tags that are merged"
22051msgstr "只打印已经合并的标签"
22052
349ede6a 22053#: builtin/tag.c:431
94550ed3
JX
22054msgid "print only tags that are not merged"
22055msgstr "只打印尚未合并的标签"
22056
349ede6a 22057#: builtin/tag.c:435
ef317cd5 22058msgid "print only tags of the object"
87cb7997 22059msgstr "只打印指向该对象的标签"
ef317cd5 22060
349ede6a 22061#: builtin/tag.c:483
8ada9598 22062msgid "--column and -n are incompatible"
81809b99 22063msgstr "--column 和 -n 不兼容"
8ada9598 22064
349ede6a 22065#: builtin/tag.c:505
87cb7997
JX
22066msgid "-n option is only allowed in list mode"
22067msgstr "-n 选项只允许用在列表显示模式"
c04f5ac3 22068
349ede6a 22069#: builtin/tag.c:507
87cb7997
JX
22070msgid "--contains option is only allowed in list mode"
22071msgstr "--contains 选项只允许用在列表显示模式"
c04f5ac3 22072
349ede6a 22073#: builtin/tag.c:509
87cb7997
JX
22074msgid "--no-contains option is only allowed in list mode"
22075msgstr "--no-contains 选项只允许用在列表显示模式"
7ac1c0ad 22076
349ede6a 22077#: builtin/tag.c:511
87cb7997
JX
22078msgid "--points-at option is only allowed in list mode"
22079msgstr "--points-at 选项只允许用在列表显示模式"
94550ed3 22080
349ede6a 22081#: builtin/tag.c:513
87cb7997
JX
22082msgid "--merged and --no-merged options are only allowed in list mode"
22083msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
22084
349ede6a 22085#: builtin/tag.c:524
c04f5ac3
JX
22086msgid "only one -F or -m option is allowed."
22087msgstr "只允许一个 -F 或 -m 选项。"
22088
349ede6a 22089#: builtin/tag.c:543
c04f5ac3
JX
22090msgid "too many params"
22091msgstr "太多参数"
22092
349ede6a 22093#: builtin/tag.c:549
c04f5ac3
JX
22094#, c-format
22095msgid "'%s' is not a valid tag name."
55a16ee4 22096msgstr "'%s' 不是一个有效的标签名称。"
c04f5ac3 22097
349ede6a 22098#: builtin/tag.c:554
c04f5ac3
JX
22099#, c-format
22100msgid "tag '%s' already exists"
55a16ee4 22101msgstr "标签 '%s' 已存在"
c04f5ac3 22102
349ede6a 22103#: builtin/tag.c:585
c04f5ac3
JX
22104#, c-format
22105msgid "Updated tag '%s' (was %s)\n"
55a16ee4 22106msgstr "已更新标签 '%s'(曾为 %s)\n"
c04f5ac3 22107
2b472aae 22108#: builtin/unpack-objects.c:502
6c94aba5
JX
22109msgid "Unpacking objects"
22110msgstr "展开对象中"
22111
ddc12c42 22112#: builtin/update-index.c:84
7aea43ff
JX
22113#, c-format
22114msgid "failed to create directory %s"
c1ac5258 22115msgstr "创建目录 %s 失败"
7aea43ff 22116
ddc12c42 22117#: builtin/update-index.c:100
7aea43ff
JX
22118#, c-format
22119msgid "failed to create file %s"
c1ac5258 22120msgstr "创建文件 %s 失败"
7aea43ff 22121
ddc12c42 22122#: builtin/update-index.c:108
7aea43ff
JX
22123#, c-format
22124msgid "failed to delete file %s"
c1ac5258 22125msgstr "删除文件 %s 失败"
7aea43ff 22126
ddc12c42 22127#: builtin/update-index.c:115 builtin/update-index.c:221
7aea43ff
JX
22128#, c-format
22129msgid "failed to delete directory %s"
c1ac5258 22130msgstr "删除目录 %s 失败"
7aea43ff 22131
ddc12c42 22132#: builtin/update-index.c:140
7aea43ff 22133#, c-format
276ceeaa
JX
22134msgid "Testing mtime in '%s' "
22135msgstr "在 '%s' 中测试 mtime "
7aea43ff 22136
ddc12c42 22137#: builtin/update-index.c:154
7aea43ff
JX
22138msgid "directory stat info does not change after adding a new file"
22139msgstr "添加一个新文件后,目录的状态信息未改变"
22140
ddc12c42 22141#: builtin/update-index.c:167
7aea43ff
JX
22142msgid "directory stat info does not change after adding a new directory"
22143msgstr "添加一个新目录后,目录的状态信息未改变"
22144
ddc12c42 22145#: builtin/update-index.c:180
7aea43ff
JX
22146msgid "directory stat info changes after updating a file"
22147msgstr "更新一个文件后,目录的状态信息被修改"
22148
ddc12c42 22149#: builtin/update-index.c:191
7aea43ff
JX
22150msgid "directory stat info changes after adding a file inside subdirectory"
22151msgstr "在子目录中添加文件后,目录的状态信息被修改"
22152
ddc12c42 22153#: builtin/update-index.c:202
7aea43ff
JX
22154msgid "directory stat info does not change after deleting a file"
22155msgstr "删除一个文件后,目录的状态信息未改变"
22156
ddc12c42 22157#: builtin/update-index.c:215
7aea43ff
JX
22158msgid "directory stat info does not change after deleting a directory"
22159msgstr "删除一个目录后,目录的状态信息未改变"
22160
ddc12c42 22161#: builtin/update-index.c:222
7aea43ff
JX
22162msgid " OK"
22163msgstr " OK"
22164
ddc12c42 22165#: builtin/update-index.c:591
814ff314
JX
22166msgid "git update-index [<options>] [--] [<file>...]"
22167msgstr "git update-index [<选项>] [--] [<文件>...]"
8ada9598 22168
ddc12c42 22169#: builtin/update-index.c:974
ef317cd5 22170msgid "continue refresh even when index needs update"
07432cef 22171msgstr "当索引需要更新时继续刷新"
8ada9598 22172
ddc12c42 22173#: builtin/update-index.c:977
ef317cd5 22174msgid "refresh: ignore submodules"
07432cef 22175msgstr "刷新:忽略子模组"
8ada9598 22176
ddc12c42 22177#: builtin/update-index.c:980
ef317cd5 22178msgid "do not ignore new files"
07432cef 22179msgstr "不忽略新的文件"
8ada9598 22180
ddc12c42 22181#: builtin/update-index.c:982
ef317cd5 22182msgid "let files replace directories and vice-versa"
07432cef 22183msgstr "让文件替换目录(反之亦然)"
ef317cd5 22184
ddc12c42 22185#: builtin/update-index.c:984
ef317cd5 22186msgid "notice files missing from worktree"
07432cef 22187msgstr "通知文件从工作区丢失"
ef317cd5 22188
ddc12c42 22189#: builtin/update-index.c:986
ef317cd5 22190msgid "refresh even if index contains unmerged entries"
07432cef 22191msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 22192
ddc12c42 22193#: builtin/update-index.c:989
ef317cd5 22194msgid "refresh stat information"
07432cef 22195msgstr "刷新统计信息"
ef317cd5 22196
ddc12c42 22197#: builtin/update-index.c:993
ef317cd5 22198msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 22199msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 22200
ddc12c42 22201#: builtin/update-index.c:997
6c94aba5 22202msgid "<mode>,<object>,<path>"
d9d56b23 22203msgstr "<存取模式>,<对象>,<路径>"
ef317cd5 22204
ddc12c42 22205#: builtin/update-index.c:998
ef317cd5 22206msgid "add the specified entry to the index"
07432cef 22207msgstr "添加指定的条目到索引区"
ef317cd5 22208
ddc12c42 22209#: builtin/update-index.c:1008
ef317cd5 22210msgid "mark files as \"not changing\""
07432cef 22211msgstr "把文件标记为 \"没有变更\""
ef317cd5 22212
ddc12c42 22213#: builtin/update-index.c:1011
ef317cd5 22214msgid "clear assumed-unchanged bit"
07432cef 22215msgstr "清除 assumed-unchanged 位"
ef317cd5 22216
ddc12c42 22217#: builtin/update-index.c:1014
ef317cd5 22218msgid "mark files as \"index-only\""
07432cef 22219msgstr "把文件标记为 \"仅索引\""
ef317cd5 22220
ddc12c42 22221#: builtin/update-index.c:1017
ef317cd5 22222msgid "clear skip-worktree bit"
07432cef 22223msgstr "清除 skip-worktree 位"
ef317cd5 22224
ddc12c42
JX
22225#: builtin/update-index.c:1020
22226msgid "do not touch index-only entries"
22227msgstr "不要触碰仅索引条目"
22228
22229#: builtin/update-index.c:1022
ef317cd5 22230msgid "add to index only; do not add content to object database"
07432cef 22231msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 22232
ddc12c42 22233#: builtin/update-index.c:1024
ef317cd5 22234msgid "remove named paths even if present in worktree"
07432cef 22235msgstr "即使存在工作区里,也删除路径"
ef317cd5 22236
ddc12c42 22237#: builtin/update-index.c:1026
ef317cd5 22238msgid "with --stdin: input lines are terminated by null bytes"
07432cef 22239msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 22240
ddc12c42 22241#: builtin/update-index.c:1028
ef317cd5 22242msgid "read list of paths to be updated from standard input"
07432cef 22243msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 22244
ddc12c42 22245#: builtin/update-index.c:1032
ef317cd5 22246msgid "add entries from standard input to the index"
07432cef 22247msgstr "从标准输入添加条目到索引区"
ef317cd5 22248
ddc12c42 22249#: builtin/update-index.c:1036
ef317cd5 22250msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 22251msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 22252
ddc12c42 22253#: builtin/update-index.c:1040
ef317cd5 22254msgid "only update entries that differ from HEAD"
07432cef 22255msgstr "只更新与 HEAD 不同的条目"
ef317cd5 22256
ddc12c42 22257#: builtin/update-index.c:1044
ef317cd5 22258msgid "ignore files missing from worktree"
07432cef 22259msgstr "忽略工作区丢失的文件"
ef317cd5 22260
ddc12c42 22261#: builtin/update-index.c:1047
ef317cd5 22262msgid "report actions to standard output"
07432cef 22263msgstr "在标准输出显示操作"
ef317cd5 22264
ddc12c42 22265#: builtin/update-index.c:1049
ef317cd5 22266msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 22267msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 22268
ddc12c42 22269#: builtin/update-index.c:1053
ef317cd5 22270msgid "write index in this format"
07432cef 22271msgstr "以这种格式写入索引区"
ef317cd5 22272
ddc12c42 22273#: builtin/update-index.c:1055
6acbf033
JX
22274msgid "enable or disable split index"
22275msgstr "启用或禁用索引拆分"
22276
ddc12c42 22277#: builtin/update-index.c:1057
7aea43ff
JX
22278msgid "enable/disable untracked cache"
22279msgstr "启用/禁用对未跟踪文件的缓存"
22280
ddc12c42 22281#: builtin/update-index.c:1059
276ceeaa
JX
22282msgid "test if the filesystem supports untracked cache"
22283msgstr "测试文件系统是否支持未跟踪文件缓存"
22284
ddc12c42 22285#: builtin/update-index.c:1061
7aea43ff
JX
22286msgid "enable untracked cache without testing the filesystem"
22287msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
22288
ddc12c42 22289#: builtin/update-index.c:1063
5809aa05
JX
22290msgid "write out the index even if is not flagged as changed"
22291msgstr "即使没有被标记为已更改,也要写出索引"
22292
ddc12c42 22293#: builtin/update-index.c:1065
5809aa05
JX
22294msgid "enable or disable file system monitor"
22295msgstr "启用或禁用文件系统监控"
22296
ddc12c42 22297#: builtin/update-index.c:1067
5809aa05
JX
22298msgid "mark files as fsmonitor valid"
22299msgstr "标记文件为 fsmonitor 有效"
22300
ddc12c42 22301#: builtin/update-index.c:1070
5809aa05
JX
22302msgid "clear fsmonitor valid bit"
22303msgstr "清除 fsmonitor 有效位"
22304
ddc12c42 22305#: builtin/update-index.c:1173
87cb7997
JX
22306msgid ""
22307"core.splitIndex is set to false; remove or change it, if you really want to "
22308"enable split index"
22309msgstr ""
22310"core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。"
22311
ddc12c42 22312#: builtin/update-index.c:1182
87cb7997
JX
22313msgid ""
22314"core.splitIndex is set to true; remove or change it, if you really want to "
22315"disable split index"
22316msgstr ""
22317"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。"
22318
ddc12c42 22319#: builtin/update-index.c:1194
a0b6b246
JX
22320msgid ""
22321"core.untrackedCache is set to true; remove or change it, if you really want "
22322"to disable the untracked cache"
275588f9
JX
22323msgstr ""
22324"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
22325"改它。"
a0b6b246 22326
ddc12c42 22327#: builtin/update-index.c:1198
276ceeaa
JX
22328msgid "Untracked cache disabled"
22329msgstr "缓存未跟踪文件被禁用"
22330
ddc12c42 22331#: builtin/update-index.c:1206
a0b6b246
JX
22332msgid ""
22333"core.untrackedCache is set to false; remove or change it, if you really want "
22334"to enable the untracked cache"
275588f9
JX
22335msgstr ""
22336"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
22337"修改它。"
a0b6b246 22338
ddc12c42 22339#: builtin/update-index.c:1210
276ceeaa
JX
22340#, c-format
22341msgid "Untracked cache enabled for '%s'"
22342msgstr "缓存未跟踪文件在 '%s' 启用"
22343
ddc12c42 22344#: builtin/update-index.c:1218
5809aa05 22345msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
31e5e17b 22346msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项"
5809aa05 22347
ddc12c42 22348#: builtin/update-index.c:1222
5809aa05
JX
22349msgid "fsmonitor enabled"
22350msgstr "fsmonitor 被启用"
22351
ddc12c42 22352#: builtin/update-index.c:1225
5809aa05
JX
22353msgid ""
22354"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
31e5e17b 22355msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项"
5809aa05 22356
ddc12c42 22357#: builtin/update-index.c:1229
5809aa05
JX
22358msgid "fsmonitor disabled"
22359msgstr "fsmonitor 被禁用"
22360
a4f16749 22361#: builtin/update-ref.c:10
814ff314
JX
22362msgid "git update-ref [<options>] -d <refname> [<old-val>]"
22363msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
ef317cd5 22364
a4f16749 22365#: builtin/update-ref.c:11
814ff314
JX
22366msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
22367msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
90314792 22368
a4f16749 22369#: builtin/update-ref.c:12
814ff314
JX
22370msgid "git update-ref [<options>] --stdin [-z]"
22371msgstr "git update-ref [<选项>] --stdin [-z]"
ef317cd5 22372
d13389bf 22373#: builtin/update-ref.c:500
ef317cd5 22374msgid "delete the reference"
07432cef 22375msgstr "删除引用"
ef317cd5 22376
d13389bf 22377#: builtin/update-ref.c:502
ef317cd5 22378msgid "update <refname> not the one it points to"
07432cef 22379msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 22380
d13389bf 22381#: builtin/update-ref.c:503
90314792
JX
22382msgid "stdin has NUL-terminated arguments"
22383msgstr "标准输入有以 NUL 字符终止的参数"
22384
d13389bf 22385#: builtin/update-ref.c:504
90314792
JX
22386msgid "read updates from stdin"
22387msgstr "从标准输入读取更新"
22388
a4f16749 22389#: builtin/update-server-info.c:7
ef317cd5 22390msgid "git update-server-info [--force]"
07432cef 22391msgstr "git update-server-info [--force]"
ef317cd5 22392
a4f16749 22393#: builtin/update-server-info.c:15
ef317cd5 22394msgid "update the info files from scratch"
07432cef 22395msgstr "从头开始更新文件信息"
ef317cd5 22396
fd8cb379
JX
22397#: builtin/upload-pack.c:11
22398msgid "git upload-pack [<options>] <dir>"
22399msgstr "git upload-pack [<选项>] <目录>"
22400
d46c5519
JX
22401#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
22402msgid "quit after a single request/response exchange"
22403msgstr "在一次单独的请求/响应之后退出"
22404
fd8cb379
JX
22405#: builtin/upload-pack.c:25
22406msgid "exit immediately after initial ref advertisement"
22407msgstr "在初始的引用广告后立即退出"
22408
22409#: builtin/upload-pack.c:27
22410msgid "do not try <directory>/.git/ if <directory> is no Git directory"
22411msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/"
22412
22413#: builtin/upload-pack.c:29
22414msgid "interrupt transfer after <n> seconds of inactivity"
22415msgstr "不活动 <n> 秒钟后终止传输"
22416
a6cd2cc4 22417#: builtin/verify-commit.c:19
814ff314
JX
22418msgid "git verify-commit [-v | --verbose] <commit>..."
22419msgstr "git verify-commit [-v | --verbose] <提交>..."
6acbf033 22420
a6cd2cc4 22421#: builtin/verify-commit.c:68
6acbf033
JX
22422msgid "print commit contents"
22423msgstr "打印提交内容"
22424
a6cd2cc4 22425#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
1b7f4a34
JX
22426msgid "print raw gpg status output"
22427msgstr "打印原始 gpg 状态输出"
22428
d9488fea 22429#: builtin/verify-pack.c:59
814ff314
JX
22430msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
22431msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
ef317cd5 22432
d9488fea 22433#: builtin/verify-pack.c:70
ef317cd5
JX
22434msgid "verbose"
22435msgstr "冗长输出"
22436
d9488fea 22437#: builtin/verify-pack.c:72
ef317cd5 22438msgid "show statistics only"
07432cef 22439msgstr "只显示统计"
ef317cd5 22440
a6cd2cc4 22441#: builtin/verify-tag.c:18
1a79b2f1
JX
22442msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
22443msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
ef317cd5 22444
a6cd2cc4 22445#: builtin/verify-tag.c:36
ef317cd5 22446msgid "print tag contents"
55a16ee4 22447msgstr "打印标签内容"
ef317cd5 22448
a5cd71ca 22449#: builtin/worktree.c:17
31e5e17b
JX
22450msgid "git worktree add [<options>] <path> [<commit-ish>]"
22451msgstr "git worktree add [<选项>] <路径> [<提交>]"
5bb01d4f 22452
a5cd71ca 22453#: builtin/worktree.c:18
5c57d762
JX
22454msgid "git worktree list [<options>]"
22455msgstr "git worktree list [<选项>]"
22456
a5cd71ca 22457#: builtin/worktree.c:19
5c57d762
JX
22458msgid "git worktree lock [<options>] <path>"
22459msgstr "git worktree lock [<选项>] <路径>"
22460
a5cd71ca 22461#: builtin/worktree.c:20
31e5e17b
JX
22462msgid "git worktree move <worktree> <new-path>"
22463msgstr "git worktree move <工作区> <新路径>"
22464
a5cd71ca 22465#: builtin/worktree.c:21
5bb01d4f
JX
22466msgid "git worktree prune [<options>]"
22467msgstr "git worktree prune [<选项>]"
22468
a5cd71ca 22469#: builtin/worktree.c:22
31e5e17b
JX
22470msgid "git worktree remove [<options>] <worktree>"
22471msgstr "git worktree remove [<选项>] <工作区>"
22472
a5cd71ca 22473#: builtin/worktree.c:23
5c57d762
JX
22474msgid "git worktree unlock <path>"
22475msgstr "git worktree unlock <路径>"
94550ed3 22476
d13389bf 22477#: builtin/worktree.c:60 builtin/worktree.c:973
4c27fcb5
JX
22478#, c-format
22479msgid "failed to delete '%s'"
22480msgstr "删除 '%s' 失败"
22481
a5cd71ca 22482#: builtin/worktree.c:85
7157c2b5
JX
22483msgid "not a valid directory"
22484msgstr "不是一个有效的目录"
5bb01d4f 22485
7157c2b5
JX
22486#: builtin/worktree.c:91
22487msgid "gitdir file does not exist"
22488msgstr "gitdir 文件不存在"
5bb01d4f 22489
7157c2b5 22490#: builtin/worktree.c:96 builtin/worktree.c:105
6937cb4e 22491#, c-format
7157c2b5
JX
22492msgid "unable to read gitdir file (%s)"
22493msgstr "无法读取 gitdir 文件(%s)"
6937cb4e 22494
7157c2b5 22495#: builtin/worktree.c:115
5bb01d4f 22496#, c-format
7157c2b5
JX
22497msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
22498msgstr "读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)"
22499
22500#: builtin/worktree.c:123
22501msgid "invalid gitdir file"
22502msgstr "无效的 gitdir 文件"
5bb01d4f 22503
7157c2b5
JX
22504#: builtin/worktree.c:131
22505msgid "gitdir file points to non-existent location"
22506msgstr "gitdir 文件指向一个不存在的位置"
22507
22508#: builtin/worktree.c:146
5bb01d4f 22509#, c-format
7157c2b5
JX
22510msgid "Removing %s/%s: %s"
22511msgstr "删除 %s/%s: %s"
5bb01d4f 22512
7157c2b5 22513#: builtin/worktree.c:221
1a79b2f1
JX
22514msgid "report pruned working trees"
22515msgstr "报告清除的工作区"
22516
7157c2b5 22517#: builtin/worktree.c:223
1a79b2f1 22518msgid "expire working trees older than <time>"
58b6f078 22519msgstr "将早于 <时间> 的工作区过期"
1a79b2f1 22520
7157c2b5 22521#: builtin/worktree.c:293
5bb01d4f
JX
22522#, c-format
22523msgid "'%s' already exists"
22524msgstr "'%s' 已经存在"
22525
7157c2b5 22526#: builtin/worktree.c:302
4c27fcb5 22527#, c-format
7157c2b5
JX
22528msgid "unusable worktree destination '%s'"
22529msgstr "无法使用的工作区目标 '%s'"
4c27fcb5 22530
7157c2b5 22531#: builtin/worktree.c:307
4c27fcb5
JX
22532#, c-format
22533msgid ""
22534"'%s' is a missing but locked worktree;\n"
7157c2b5 22535"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
4c27fcb5 22536msgstr ""
7157c2b5
JX
22537"'%s' 是一个丢失但锁定的工作区,\n"
22538"使用 '%s -f -f' 覆盖,或用 'unlock' 和 'prune' 或 'remove' 清除"
4c27fcb5 22539
7157c2b5 22540#: builtin/worktree.c:309
4c27fcb5
JX
22541#, c-format
22542msgid ""
22543"'%s' is a missing but already registered worktree;\n"
7157c2b5 22544"use '%s -f' to override, or 'prune' or 'remove' to clear"
4c27fcb5 22545msgstr ""
7157c2b5
JX
22546"'%s' 是一个丢失但已经注册的工作区,\n"
22547"使用 '%s -f' 覆盖,或用 'prune' 或 'remove' 清除"
4c27fcb5 22548
7157c2b5 22549#: builtin/worktree.c:360
5bb01d4f
JX
22550#, c-format
22551msgid "could not create directory of '%s'"
22552msgstr "不能创建目录 '%s'"
22553
7157c2b5 22554#: builtin/worktree.c:494 builtin/worktree.c:500
fd8cb379
JX
22555#, c-format
22556msgid "Preparing worktree (new branch '%s')"
22557msgstr "准备工作区(新分支 '%s')"
22558
7157c2b5 22559#: builtin/worktree.c:496
fd8cb379
JX
22560#, c-format
22561msgid "Preparing worktree (resetting branch '%s'; was at %s)"
22562msgstr "准备工作区(重置分支 '%s',之前为 %s)"
22563
7157c2b5 22564#: builtin/worktree.c:505
fd8cb379
JX
22565#, c-format
22566msgid "Preparing worktree (checking out '%s')"
22567msgstr "准备工作区(检出 '%s')"
22568
7157c2b5 22569#: builtin/worktree.c:511
5bb01d4f 22570#, c-format
fd8cb379
JX
22571msgid "Preparing worktree (detached HEAD %s)"
22572msgstr "准备工作区(分离头指针 %s)"
5bb01d4f 22573
7157c2b5 22574#: builtin/worktree.c:552
5bb01d4f 22575msgid "checkout <branch> even if already checked out in other worktree"
58b6f078 22576msgstr "检出 <分支>,即使已经被检出到其它工作区"
5bb01d4f 22577
7157c2b5 22578#: builtin/worktree.c:555
5bb01d4f
JX
22579msgid "create a new branch"
22580msgstr "创建一个新分支"
22581
7157c2b5 22582#: builtin/worktree.c:557
5bb01d4f
JX
22583msgid "create or reset a branch"
22584msgstr "创建或重置一个分支"
22585
7157c2b5 22586#: builtin/worktree.c:559
5b04ee3b
JX
22587msgid "populate the new working tree"
22588msgstr "生成新的工作区"
22589
7157c2b5 22590#: builtin/worktree.c:560
60638e98
JX
22591msgid "keep the new working tree locked"
22592msgstr "锁定新工作区"
22593
7157c2b5 22594#: builtin/worktree.c:563
5809aa05
JX
22595msgid "set up tracking mode (see git-branch(1))"
22596msgstr "设置跟踪模式(参见 git-branch(1))"
22597
7157c2b5 22598#: builtin/worktree.c:566
5809aa05
JX
22599msgid "try to match the new branch name with a remote-tracking branch"
22600msgstr "尝试为新分支名匹配一个远程跟踪分支"
22601
7157c2b5 22602#: builtin/worktree.c:574
1b7f4a34
JX
22603msgid "-b, -B, and --detach are mutually exclusive"
22604msgstr "-b、-B 和 --detach 是互斥的"
5bb01d4f 22605
7157c2b5 22606#: builtin/worktree.c:635
5809aa05
JX
22607msgid "--[no-]track can only be used if a new branch is created"
22608msgstr "只能在创建新分支时使用选项 --[no-]track "
22609
d13389bf 22610#: builtin/worktree.c:758
5c57d762
JX
22611msgid "reason for locking"
22612msgstr "锁定原因"
22613
d13389bf
JX
22614#: builtin/worktree.c:770 builtin/worktree.c:803 builtin/worktree.c:877
22615#: builtin/worktree.c:1001
5c57d762
JX
22616#, c-format
22617msgid "'%s' is not a working tree"
22618msgstr "'%s' 不是一个工作区"
22619
d13389bf 22620#: builtin/worktree.c:772 builtin/worktree.c:805
5c57d762
JX
22621msgid "The main working tree cannot be locked or unlocked"
22622msgstr "主工作区无法被加锁或解锁"
22623
d13389bf 22624#: builtin/worktree.c:777
5c57d762
JX
22625#, c-format
22626msgid "'%s' is already locked, reason: %s"
22627msgstr "'%s' 已被锁定,原因:%s"
22628
d13389bf 22629#: builtin/worktree.c:779
5c57d762
JX
22630#, c-format
22631msgid "'%s' is already locked"
22632msgstr "'%s' 已被锁定"
22633
d13389bf 22634#: builtin/worktree.c:807
5c57d762
JX
22635#, c-format
22636msgid "'%s' is not locked"
22637msgstr "'%s' 未被锁定"
22638
d13389bf 22639#: builtin/worktree.c:848
31e5e17b 22640msgid "working trees containing submodules cannot be moved or removed"
610f8099 22641msgstr "不能移动或删除包含子模组的工作区"
31e5e17b 22642
d13389bf 22643#: builtin/worktree.c:856
4c27fcb5
JX
22644msgid "force move even if worktree is dirty or locked"
22645msgstr "强制移动,即使工作区是脏的或已锁定"
22646
d13389bf 22647#: builtin/worktree.c:879 builtin/worktree.c:1003
31e5e17b
JX
22648#, c-format
22649msgid "'%s' is a main working tree"
22650msgstr "'%s' 是一个主工作区"
22651
d13389bf 22652#: builtin/worktree.c:884
31e5e17b
JX
22653#, c-format
22654msgid "could not figure out destination name from '%s'"
22655msgstr "无法从 '%s' 算出目标名称"
22656
d13389bf 22657#: builtin/worktree.c:897
31e5e17b 22658#, c-format
4c27fcb5
JX
22659msgid ""
22660"cannot move a locked working tree, lock reason: %s\n"
22661"use 'move -f -f' to override or unlock first"
22662msgstr ""
22663"无法移动一个锁定的工作区,锁定原因:%s\n"
22664"使用 'move -f -f' 覆盖或先解锁"
31e5e17b 22665
d13389bf 22666#: builtin/worktree.c:899
4c27fcb5
JX
22667msgid ""
22668"cannot move a locked working tree;\n"
22669"use 'move -f -f' to override or unlock first"
22670msgstr ""
22671"无法移动一个锁定的工作区,\n"
22672"使用 'move -f -f' 覆盖或先解锁"
31e5e17b 22673
d13389bf 22674#: builtin/worktree.c:902
31e5e17b
JX
22675#, c-format
22676msgid "validation failed, cannot move working tree: %s"
22677msgstr "验证失败,无法移动工作区:%s"
22678
d13389bf 22679#: builtin/worktree.c:907
31e5e17b
JX
22680#, c-format
22681msgid "failed to move '%s' to '%s'"
c1ac5258 22682msgstr "移动 '%s' 到 '%s' 失败"
31e5e17b 22683
d13389bf 22684#: builtin/worktree.c:953
31e5e17b
JX
22685#, c-format
22686msgid "failed to run 'git status' on '%s'"
c1ac5258 22687msgstr "在 '%s' 中执行 'git status' 失败"
31e5e17b 22688
d13389bf 22689#: builtin/worktree.c:957
31e5e17b 22690#, c-format
a5cd71ca
JX
22691msgid "'%s' contains modified or untracked files, use --force to delete it"
22692msgstr "'%s' 包含修改或未跟踪的文件,使用 --force 删除"
31e5e17b 22693
d13389bf 22694#: builtin/worktree.c:962
31e5e17b
JX
22695#, c-format
22696msgid "failed to run 'git status' on '%s', code %d"
c1ac5258 22697msgstr "在 '%s' 中执行 'git status' 失败,退出码 %d"
31e5e17b 22698
d13389bf 22699#: builtin/worktree.c:985
4c27fcb5
JX
22700msgid "force removal even if worktree is dirty or locked"
22701msgstr "强制删除,即使工作区是脏的或已锁定"
31e5e17b 22702
d13389bf 22703#: builtin/worktree.c:1008
31e5e17b 22704#, c-format
4c27fcb5
JX
22705msgid ""
22706"cannot remove a locked working tree, lock reason: %s\n"
22707"use 'remove -f -f' to override or unlock first"
22708msgstr ""
22709"无法删除一个锁定的工作区,锁定原因:%s\n"
22710"使用 'remove -f -f' 覆盖或先解锁"
31e5e17b 22711
d13389bf 22712#: builtin/worktree.c:1010
4c27fcb5
JX
22713msgid ""
22714"cannot remove a locked working tree;\n"
22715"use 'remove -f -f' to override or unlock first"
22716msgstr ""
22717"无法删除一个锁定的工作区,\n"
22718"使用 'remove -f -f' 覆盖或先解锁"
31e5e17b 22719
d13389bf 22720#: builtin/worktree.c:1013
31e5e17b
JX
22721#, c-format
22722msgid "validation failed, cannot remove working tree: %s"
22723msgstr "验证失败,无法删除工作区:%s"
22724
d13389bf 22725#: builtin/worktree.c:1037
d9488fea
JX
22726#, c-format
22727msgid "repair: %s: %s"
22728msgstr "修理:%s:%s"
22729
d13389bf 22730#: builtin/worktree.c:1040
d9488fea
JX
22731#, c-format
22732msgid "error: %s: %s"
22733msgstr "错误:%s:%s"
22734
06991777 22735#: builtin/write-tree.c:15
ef317cd5 22736msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 22737msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5 22738
06991777 22739#: builtin/write-tree.c:28
ef317cd5 22740msgid "<prefix>/"
07432cef 22741msgstr "<前缀>/"
ef317cd5 22742
06991777 22743#: builtin/write-tree.c:29
ef317cd5 22744msgid "write tree object for a subdirectory <prefix>"
07432cef 22745msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5 22746
06991777 22747#: builtin/write-tree.c:31
ef317cd5 22748msgid "only useful for debugging"
07432cef 22749msgstr "只对调试有用"
ef317cd5 22750
d9488fea 22751#: http-fetch.c:114
7157c2b5
JX
22752#, c-format
22753msgid "argument to --packfile must be a valid hash (got '%s')"
22754msgstr "--packfile 的参数必须是有效的哈希值(得到 '%s')"
22755
d9488fea
JX
22756#: http-fetch.c:122
22757msgid "not a git repository"
22758msgstr "不是 git 仓库"
220c313c 22759
d13389bf
JX
22760#: t/helper/test-fast-rebase.c:141
22761msgid "unhandled options"
22762msgstr "未处理的选项"
22763
22764#: t/helper/test-fast-rebase.c:146
22765msgid "error preparing revisions"
22766msgstr "准备版本时错误"
22767
d9488fea 22768#: t/helper/test-reach.c:154
4c27fcb5
JX
22769#, c-format
22770msgid "commit %s is not marked reachable"
22771msgstr "提交 %s 没有标记为可达"
22772
d9488fea 22773#: t/helper/test-reach.c:164
4c27fcb5
JX
22774msgid "too many commits marked reachable"
22775msgstr "太多提交标记为可达"
22776
d46c5519
JX
22777#: t/helper/test-serve-v2.c:7
22778msgid "test-tool serve-v2 [<options>]"
22779msgstr "test-tool serve-v2 [<选项>]"
22780
22781#: t/helper/test-serve-v2.c:19
22782msgid "exit immediately after advertising capabilities"
22783msgstr "对能力广告之后立即退出"
22784
349ede6a 22785#: git.c:28
31e5e17b
JX
22786msgid ""
22787"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
22788" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
fd8cb379
JX
22789" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
22790"bare]\n"
31e5e17b
JX
22791" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
22792" <command> [<args>]"
22793msgstr ""
fd8cb379 22794"git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n"
31e5e17b 22795" [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
fd8cb379
JX
22796" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
22797"bare]\n"
31e5e17b
JX
22798" [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
22799" <命令> [<参数>]"
22800
349ede6a 22801#: git.c:35
4dcdc3d8 22802msgid ""
220c313c 22803"'git help -a' and 'git help -g' list available subcommands and some\n"
4dcdc3d8 22804"concept guides. See 'git help <command>' or 'git help <concept>'\n"
a6cd2cc4
JX
22805"to read about a specific subcommand or concept.\n"
22806"See 'git help git' for an overview of the system."
4dcdc3d8 22807msgstr ""
220c313c
JX
22808"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
22809"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
a6cd2cc4
JX
22810"帮助。\n"
22811"有关系统的概述,查看 'git help git'。"
8ada9598 22812
349ede6a 22813#: git.c:187
31e5e17b
JX
22814#, c-format
22815msgid "no directory given for --git-dir\n"
22816msgstr "没有为 --git-dir 提供目录\n"
22817
349ede6a 22818#: git.c:201
31e5e17b
JX
22819#, c-format
22820msgid "no namespace given for --namespace\n"
22821msgstr "没有为 --namespace 提供命名空间\n"
22822
349ede6a 22823#: git.c:215
31e5e17b
JX
22824#, c-format
22825msgid "no directory given for --work-tree\n"
22826msgstr "没有为 --work-tree 提供目录\n"
22827
349ede6a 22828#: git.c:229
31e5e17b
JX
22829#, c-format
22830msgid "no prefix given for --super-prefix\n"
22831msgstr "没有为 --super-prefix 提供前缀\n"
22832
349ede6a 22833#: git.c:251
31e5e17b
JX
22834#, c-format
22835msgid "-c expects a configuration string\n"
22836msgstr "应为 -c 提供一个配置字符串\n"
22837
349ede6a 22838#: git.c:289
31e5e17b
JX
22839#, c-format
22840msgid "no directory given for -C\n"
22841msgstr "没有为 -C 提供目录\n"
22842
349ede6a 22843#: git.c:315
31e5e17b
JX
22844#, c-format
22845msgid "unknown option: %s\n"
22846msgstr "未知选项:%s\n"
22847
d9488fea 22848#: git.c:364
06991777
JX
22849#, c-format
22850msgid "while expanding alias '%s': '%s'"
5b533632 22851msgstr "在扩展别名 '%s' 时:'%s'"
06991777 22852
d9488fea 22853#: git.c:373
06991777
JX
22854#, c-format
22855msgid ""
22856"alias '%s' changes environment variables.\n"
22857"You can use '!git' in the alias to do this"
22858msgstr ""
22859"别名 '%s' 修改环境变量。您可以使用在别名中\n"
22860"使用 '!git'"
22861
d9488fea 22862#: git.c:380
06991777
JX
22863#, c-format
22864msgid "empty alias for %s"
22865msgstr "%s 的空别名"
22866
d9488fea 22867#: git.c:383
06991777
JX
22868#, c-format
22869msgid "recursive alias: %s"
5b533632 22870msgstr "递归的别名:%s"
06991777 22871
d9488fea 22872#: git.c:465
06991777
JX
22873msgid "write failure on standard output"
22874msgstr "在标准输出写入失败"
22875
d9488fea 22876#: git.c:467
06991777
JX
22877msgid "unknown write failure on standard output"
22878msgstr "到标准输出的未知写入错误"
22879
d9488fea 22880#: git.c:469
06991777
JX
22881msgid "close failed on standard output"
22882msgstr "标准输出关闭失败"
22883
d13389bf 22884#: git.c:820
4c27fcb5
JX
22885#, c-format
22886msgid "alias loop detected: expansion of '%s' does not terminate:%s"
22887msgstr "检测到别名循环:'%s'的扩展未终止:%s"
22888
d13389bf 22889#: git.c:870
06991777
JX
22890#, c-format
22891msgid "cannot handle %s as a builtin"
22892msgstr "不能作为内置命令处理 %s"
22893
d13389bf 22894#: git.c:883
06991777
JX
22895#, c-format
22896msgid ""
22897"usage: %s\n"
22898"\n"
22899msgstr ""
22900"用法:%s\n"
22901"\n"
22902
d13389bf 22903#: git.c:903
31e5e17b
JX
22904#, c-format
22905msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
22906msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n"
22907
d13389bf 22908#: git.c:915
31e5e17b
JX
22909#, c-format
22910msgid "failed to run command '%s': %s\n"
c1ac5258 22911msgstr "运行命令 '%s' 失败:%s\n"
31e5e17b 22912
349ede6a 22913#: http.c:399
60638e98
JX
22914#, c-format
22915msgid "negative value for http.postbuffer; defaulting to %d"
22916msgstr "http.postbuffer 为负值,默认为 %d"
22917
349ede6a 22918#: http.c:420
a0b6b246 22919msgid "Delegation control is not supported with cURL < 7.22.0"
4c27fcb5 22920msgstr "不支持委托控制,因为 cURL < 7.22.0"
a0b6b246 22921
349ede6a 22922#: http.c:429
276ceeaa
JX
22923msgid "Public key pinning not supported with cURL < 7.44.0"
22924msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
22925
7157c2b5 22926#: http.c:910
4c27fcb5
JX
22927msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
22928msgstr "不支持 CURLSSLOPT_NO_REVOKE,因为 cURL < 7.44.0"
22929
7157c2b5 22930#: http.c:989
4c27fcb5
JX
22931msgid "Protocol restrictions not supported with cURL < 7.19.4"
22932msgstr "不支持协议限制,因为 cURL < 7.19.4"
22933
7157c2b5 22934#: http.c:1132
4c27fcb5
JX
22935#, c-format
22936msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
22937msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端:"
22938
7157c2b5 22939#: http.c:1139
4c27fcb5
JX
22940#, c-format
22941msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
22942msgstr "无法设置 SSL 后端为 '%s':cURL: cURL 没有使用 SSL 后端构建"
22943
7157c2b5 22944#: http.c:1143
4c27fcb5
JX
22945#, c-format
22946msgid "Could not set SSL backend to '%s': already set"
22947msgstr "无法将 SSL 后端设置为 '%s':已经设置"
22948
7157c2b5 22949#: http.c:2025
1a79b2f1
JX
22950#, c-format
22951msgid ""
22952"unable to update url base from redirection:\n"
22953" asked for: %s\n"
22954" redirect: %s"
22955msgstr ""
22956"不能更新重定向的 url base:\n"
22957" 请求:%s\n"
22958" 重定向:%s"
22959
d13389bf 22960#: remote-curl.c:183
d46c5519
JX
22961#, c-format
22962msgid "invalid quoting in push-option value: '%s'"
5b533632 22963msgstr "在 push-option 取值中无效的引号:'%s'"
d46c5519 22964
d13389bf 22965#: remote-curl.c:307
d46c5519
JX
22966#, c-format
22967msgid "%sinfo/refs not valid: is this a git repository?"
d9488fea 22968msgstr "%sinfo/refs 无效:这是 git 仓库么?"
d46c5519 22969
d13389bf 22970#: remote-curl.c:408
d46c5519
JX
22971msgid "invalid server response; expected service, got flush packet"
22972msgstr "无效的服务端响应。预期服务,得到 flush 包"
22973
d13389bf 22974#: remote-curl.c:439
d46c5519
JX
22975#, c-format
22976msgid "invalid server response; got '%s'"
22977msgstr "无效的服务端响应,得到 '%s'"
22978
d13389bf 22979#: remote-curl.c:499
d46c5519
JX
22980#, c-format
22981msgid "repository '%s' not found"
22982msgstr "仓库 '%s' 未找到"
22983
d13389bf 22984#: remote-curl.c:503
d46c5519
JX
22985#, c-format
22986msgid "Authentication failed for '%s'"
22987msgstr "'%s' 鉴权失败"
22988
d13389bf 22989#: remote-curl.c:507
d46c5519
JX
22990#, c-format
22991msgid "unable to access '%s': %s"
22992msgstr "无法访问 '%s':%s"
22993
d13389bf 22994#: remote-curl.c:513
1a79b2f1
JX
22995#, c-format
22996msgid "redirecting to %s"
22997msgstr "重定向到 %s"
22998
d13389bf 22999#: remote-curl.c:642
d46c5519 23000msgid "shouldn't have EOF when not gentle on EOF"
5b533632 23001msgstr "当没有设置温和处理文件结束符(EOF)时,不应该有文件结束符"
d46c5519 23002
d13389bf 23003#: remote-curl.c:654
7157c2b5
JX
23004msgid "remote server sent stateless separator"
23005msgstr "远程服务器发送了无状态分隔符"
23006
d13389bf 23007#: remote-curl.c:724
d46c5519
JX
23008msgid "unable to rewind rpc post data - try increasing http.postBuffer"
23009msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
23010
d13389bf 23011#: remote-curl.c:754
7157c2b5
JX
23012#, c-format
23013msgid "remote-curl: bad line length character: %.4s"
23014msgstr "remote-curl:错误的行宽字符:%.4s"
23015
d13389bf 23016#: remote-curl.c:756
7157c2b5
JX
23017msgid "remote-curl: unexpected response end packet"
23018msgstr "remote-curl:意外响应结束包"
23019
d13389bf 23020#: remote-curl.c:832
d46c5519
JX
23021#, c-format
23022msgid "RPC failed; %s"
23023msgstr "RPC 失败。%s"
23024
d13389bf 23025#: remote-curl.c:872
d46c5519
JX
23026msgid "cannot handle pushes this big"
23027msgstr "不能处理这么大的推送"
23028
d13389bf 23029#: remote-curl.c:987
d46c5519
JX
23030#, c-format
23031msgid "cannot deflate request; zlib deflate error %d"
23032msgstr "不能压缩请求,zlib 压缩错误 %d"
23033
d13389bf 23034#: remote-curl.c:991
d46c5519
JX
23035#, c-format
23036msgid "cannot deflate request; zlib end error %d"
23037msgstr "不能压缩请求,zlib 结束错误 %d"
23038
d13389bf 23039#: remote-curl.c:1041
7157c2b5
JX
23040#, c-format
23041msgid "%d bytes of length header were received"
23042msgstr "收到了 %d 字节长度的头信息"
23043
d13389bf 23044#: remote-curl.c:1043
7157c2b5
JX
23045#, c-format
23046msgid "%d bytes of body are still expected"
23047msgstr "预期仍然需要 %d 个字节的正文"
23048
d13389bf 23049#: remote-curl.c:1132
d46c5519
JX
23050msgid "dumb http transport does not support shallow capabilities"
23051msgstr "哑 http 传输不支持 shalllow 能力"
23052
d13389bf 23053#: remote-curl.c:1147
d46c5519
JX
23054msgid "fetch failed."
23055msgstr "获取失败。"
23056
d13389bf 23057#: remote-curl.c:1193
d46c5519
JX
23058msgid "cannot fetch by sha1 over smart http"
23059msgstr "无法通过智能 HTTP 获取 sha1"
23060
d13389bf 23061#: remote-curl.c:1237 remote-curl.c:1243
d46c5519
JX
23062#, c-format
23063msgid "protocol error: expected sha/ref, got '%s'"
23064msgstr "协议错误:期望 sha/ref,却得到 '%s'"
23065
d13389bf 23066#: remote-curl.c:1255 remote-curl.c:1373
d46c5519
JX
23067#, c-format
23068msgid "http transport does not support %s"
23069msgstr "http 传输协议不支持 %s"
23070
d13389bf 23071#: remote-curl.c:1291
d46c5519
JX
23072msgid "git-http-push failed"
23073msgstr "git-http-push 失败"
23074
d13389bf 23075#: remote-curl.c:1479
d46c5519
JX
23076msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
23077msgstr "remote-curl:用法:git remote-curl <远程> [<url>]"
23078
d13389bf 23079#: remote-curl.c:1511
d46c5519
JX
23080msgid "remote-curl: error reading command stream from git"
23081msgstr "remote-curl:错误读取来自 git 的命令流"
23082
d13389bf 23083#: remote-curl.c:1518
d46c5519
JX
23084msgid "remote-curl: fetch attempted without a local repo"
23085msgstr "remote-curl:尝试没有本地仓库下获取"
23086
d13389bf 23087#: remote-curl.c:1559
d46c5519
JX
23088#, c-format
23089msgid "remote-curl: unknown command '%s' from git"
23090msgstr "remote-curl:未知的来自 git 的命令 '%s'"
23091
349ede6a
JX
23092#: compat/compiler.h:26
23093msgid "no compiler information available\n"
23094msgstr "编译器信息不可用\n"
23095
23096#: compat/compiler.h:38
23097msgid "no libc information available\n"
23098msgstr "libc 信息不可用\n"
23099
d9488fea 23100#: list-objects-filter-options.h:91
d46c5519
JX
23101msgid "args"
23102msgstr "参数"
23103
d9488fea 23104#: list-objects-filter-options.h:92
d46c5519
JX
23105msgid "object filtering"
23106msgstr "对象过滤"
23107
ddc12c42 23108#: parse-options.h:183
fd8cb379
JX
23109msgid "expiry-date"
23110msgstr "到期时间"
7aea43ff 23111
ddc12c42 23112#: parse-options.h:197
fd8cb379
JX
23113msgid "no-op (backward compatibility)"
23114msgstr "空操作(向后兼容)"
7aea43ff 23115
ddc12c42 23116#: parse-options.h:309
fd8cb379
JX
23117msgid "be more verbose"
23118msgstr "更加详细"
7aea43ff 23119
ddc12c42 23120#: parse-options.h:311
fd8cb379
JX
23121msgid "be more quiet"
23122msgstr "更加安静"
7aea43ff 23123
ddc12c42 23124#: parse-options.h:317
d9488fea
JX
23125msgid "use <n> digits to display object names"
23126msgstr "用 <n> 位数字显示对象名"
7aea43ff 23127
ddc12c42 23128#: parse-options.h:336
d46c5519
JX
23129msgid "how to strip spaces and #comments from message"
23130msgstr "设置如何删除提交说明里的空格和#注释"
23131
ddc12c42
JX
23132#: parse-options.h:337
23133msgid "read pathspec from file"
23134msgstr "从文件读取路径表达式"
23135
23136#: parse-options.h:338
23137msgid ""
23138"with --pathspec-from-file, pathspec elements are separated with NUL character"
23139msgstr "使用 --pathspec-from-file,路径表达式用空字符分隔"
23140
d9488fea 23141#: ref-filter.h:96
d46c5519
JX
23142msgid "key"
23143msgstr "key"
23144
d9488fea 23145#: ref-filter.h:96
d46c5519
JX
23146msgid "field name to sort on"
23147msgstr "排序的字段名"
23148
23149#: rerere.h:44
23150msgid "update the index with reused conflict resolution if possible"
23151msgstr "如果可能,重用冲突解决更新索引"
23152
349ede6a 23153#: wt-status.h:80
a6cd2cc4
JX
23154msgid "HEAD detached at "
23155msgstr "头指针分离于 "
23156
349ede6a 23157#: wt-status.h:81
a6cd2cc4
JX
23158msgid "HEAD detached from "
23159msgstr "头指针分离自 "
23160
fd8cb379 23161#: command-list.h:50
8ada9598 23162msgid "Add file contents to the index"
81809b99 23163msgstr "添加文件内容至索引"
8ada9598 23164
fd8cb379
JX
23165#: command-list.h:51
23166msgid "Apply a series of patches from a mailbox"
23167msgstr "应用邮箱格式的系列补丁"
23168
23169#: command-list.h:52
23170msgid "Annotate file lines with commit information"
23171msgstr "使用提交信息注释文件行"
23172
23173#: command-list.h:53
23174msgid "Apply a patch to files and/or to the index"
23175msgstr "应用一个补丁到文件和/或索引区"
23176
23177#: command-list.h:54
4c27fcb5
JX
23178msgid "Import a GNU Arch repository into Git"
23179msgstr "将一个 GNU Arch 仓库导入到 Git"
fd8cb379
JX
23180
23181#: command-list.h:55
23182msgid "Create an archive of files from a named tree"
23183msgstr "基于一个指定的树创建文件存档"
23184
23185#: command-list.h:56
1b7f4a34
JX
23186msgid "Use binary search to find the commit that introduced a bug"
23187msgstr "通过二分查找定位引入 bug 的提交"
8ada9598 23188
fd8cb379
JX
23189#: command-list.h:57
23190msgid "Show what revision and author last modified each line of a file"
23191msgstr "显示文件每一行最后修改的版本和修改者"
23192
23193#: command-list.h:58
8ada9598 23194msgid "List, create, or delete branches"
81809b99 23195msgstr "列出、创建或删除分支"
8ada9598 23196
fd8cb379 23197#: command-list.h:59
349ede6a
JX
23198msgid "Collect information for user to file a bug report"
23199msgstr "收集信息以供用户提交错误报告"
23200
23201#: command-list.h:60
fd8cb379
JX
23202msgid "Move objects and refs by archive"
23203msgstr "通过归档移动对象和引用"
23204
349ede6a 23205#: command-list.h:61
fd8cb379
JX
23206msgid "Provide content or type and size information for repository objects"
23207msgstr "提供仓库对象的内容、类型或大小"
23208
349ede6a 23209#: command-list.h:62
fd8cb379
JX
23210msgid "Display gitattributes information"
23211msgstr "显示 gitattributes 信息"
23212
349ede6a 23213#: command-list.h:63
fd8cb379
JX
23214msgid "Debug gitignore / exclude files"
23215msgstr "调试 gitignore / exclude 文件"
23216
349ede6a 23217#: command-list.h:64
fd8cb379
JX
23218msgid "Show canonical names and email addresses of contacts"
23219msgstr "显示联系人的规范名称和电子邮件"
23220
349ede6a 23221#: command-list.h:65
5bb01d4f
JX
23222msgid "Switch branches or restore working tree files"
23223msgstr "切换分支或恢复工作区文件"
8ada9598 23224
349ede6a 23225#: command-list.h:66
fd8cb379
JX
23226msgid "Copy files from the index to the working tree"
23227msgstr "从索引拷贝文件到工作区"
23228
349ede6a 23229#: command-list.h:67
fd8cb379
JX
23230msgid "Ensures that a reference name is well formed"
23231msgstr "确保引用名称格式正确"
23232
349ede6a 23233#: command-list.h:68
fd8cb379
JX
23234msgid "Find commits yet to be applied to upstream"
23235msgstr "查找尚未应用到上游的提交"
23236
349ede6a 23237#: command-list.h:69
fd8cb379
JX
23238msgid "Apply the changes introduced by some existing commits"
23239msgstr "应用一些现存提交引入的修改"
23240
349ede6a 23241#: command-list.h:70
fd8cb379
JX
23242msgid "Graphical alternative to git-commit"
23243msgstr "git-commit 的图形替代界面"
23244
349ede6a 23245#: command-list.h:71
fd8cb379
JX
23246msgid "Remove untracked files from the working tree"
23247msgstr "从工作区中删除未跟踪文件"
23248
349ede6a 23249#: command-list.h:72
8ada9598 23250msgid "Clone a repository into a new directory"
06991777 23251msgstr "克隆仓库到一个新目录"
8ada9598 23252
349ede6a 23253#: command-list.h:73
fd8cb379
JX
23254msgid "Display data in columns"
23255msgstr "以列的方式显示数据"
23256
349ede6a 23257#: command-list.h:74
8ada9598 23258msgid "Record changes to the repository"
160fb2b2 23259msgstr "记录变更到仓库"
8ada9598 23260
349ede6a 23261#: command-list.h:75
4c27fcb5
JX
23262msgid "Write and verify Git commit-graph files"
23263msgstr "写入和校验 Git 提交图文件"
fd8cb379 23264
349ede6a 23265#: command-list.h:76
fd8cb379
JX
23266msgid "Create a new commit object"
23267msgstr "创建一个新的提交对象"
23268
349ede6a 23269#: command-list.h:77
fd8cb379
JX
23270msgid "Get and set repository or global options"
23271msgstr "获取和设置仓库或者全局选项"
23272
349ede6a 23273#: command-list.h:78
fd8cb379
JX
23274msgid "Count unpacked number of objects and their disk consumption"
23275msgstr "计算未打包对象的数量和磁盘空间占用"
23276
349ede6a 23277#: command-list.h:79
fd8cb379
JX
23278msgid "Retrieve and store user credentials"
23279msgstr "检索和存储用户密码"
23280
349ede6a 23281#: command-list.h:80
fd8cb379
JX
23282msgid "Helper to temporarily store passwords in memory"
23283msgstr "在内存中临时存储密码的助手"
23284
349ede6a 23285#: command-list.h:81
fd8cb379
JX
23286msgid "Helper to store credentials on disk"
23287msgstr "在磁盘存储密码的助手"
23288
349ede6a 23289#: command-list.h:82
fd8cb379
JX
23290msgid "Export a single commit to a CVS checkout"
23291msgstr "将一个提交导出到 CVS 检出中"
23292
349ede6a 23293#: command-list.h:83
fd8cb379
JX
23294msgid "Salvage your data out of another SCM people love to hate"
23295msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据"
23296
349ede6a 23297#: command-list.h:84
fd8cb379
JX
23298msgid "A CVS server emulator for Git"
23299msgstr "Git 的一个 CVS 服务模拟器"
23300
349ede6a 23301#: command-list.h:85
fd8cb379
JX
23302msgid "A really simple server for Git repositories"
23303msgstr "一个非常简单的 Git 仓库服务器"
23304
349ede6a 23305#: command-list.h:86
fd8cb379
JX
23306msgid "Give an object a human readable name based on an available ref"
23307msgstr "基于一个现存的引用为一个对象起一个可读的名称"
23308
349ede6a 23309#: command-list.h:87
8ada9598 23310msgid "Show changes between commits, commit and working tree, etc"
81809b99 23311msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598 23312
349ede6a 23313#: command-list.h:88
fd8cb379
JX
23314msgid "Compares files in the working tree and the index"
23315msgstr "比较工作区和索引区中的文件"
23316
349ede6a 23317#: command-list.h:89
fd8cb379
JX
23318msgid "Compare a tree to the working tree or index"
23319msgstr "将一个树和工作区或索引做比较"
23320
349ede6a 23321#: command-list.h:90
fd8cb379
JX
23322msgid "Compares the content and mode of blobs found via two tree objects"
23323msgstr "比较两个树对象的文件内容和模式"
23324
349ede6a 23325#: command-list.h:91
fd8cb379
JX
23326msgid "Show changes using common diff tools"
23327msgstr "使用常见的差异工具显示更改"
23328
349ede6a 23329#: command-list.h:92
fd8cb379
JX
23330msgid "Git data exporter"
23331msgstr "Git 数据导出器"
23332
349ede6a 23333#: command-list.h:93
fd8cb379
JX
23334msgid "Backend for fast Git data importers"
23335msgstr "Git 快速数据导入器后端"
23336
349ede6a 23337#: command-list.h:94
8ada9598 23338msgid "Download objects and refs from another repository"
160fb2b2 23339msgstr "从另外一个仓库下载对象和引用"
8ada9598 23340
349ede6a 23341#: command-list.h:95
fd8cb379
JX
23342msgid "Receive missing objects from another repository"
23343msgstr "从另一个仓库获取缺失的对象"
23344
349ede6a 23345#: command-list.h:96
fd8cb379
JX
23346msgid "Rewrite branches"
23347msgstr "重写分支"
23348
349ede6a 23349#: command-list.h:97
fd8cb379
JX
23350msgid "Produce a merge commit message"
23351msgstr "生成一个合并提交信息"
23352
349ede6a 23353#: command-list.h:98
fd8cb379
JX
23354msgid "Output information on each ref"
23355msgstr "对每一个引用输出信息 "
23356
349ede6a 23357#: command-list.h:99
d13389bf
JX
23358msgid "Run a Git command on a list of repositories"
23359msgstr "在一个仓库列表上运行 Git 命令"
23360
23361#: command-list.h:100
fd8cb379
JX
23362msgid "Prepare patches for e-mail submission"
23363msgstr "准备电子邮件提交的补丁"
23364
d13389bf 23365#: command-list.h:101
fd8cb379
JX
23366msgid "Verifies the connectivity and validity of the objects in the database"
23367msgstr "验证仓库中对象的连通性和有效性"
23368
d13389bf 23369#: command-list.h:102
fd8cb379
JX
23370msgid "Cleanup unnecessary files and optimize the local repository"
23371msgstr "清除不必要的文件和优化本地仓库"
23372
d13389bf 23373#: command-list.h:103
fd8cb379 23374msgid "Extract commit ID from an archive created using git-archive"
5b533632 23375msgstr "从 git-archive 创建的归档文件中提取提交 ID"
fd8cb379 23376
d13389bf 23377#: command-list.h:104
8ada9598 23378msgid "Print lines matching a pattern"
81809b99 23379msgstr "输出和模式匹配的行"
8ada9598 23380
d13389bf 23381#: command-list.h:105
fd8cb379
JX
23382msgid "A portable graphical interface to Git"
23383msgstr "一个便携的 Git 图形客户端"
23384
d13389bf 23385#: command-list.h:106
fd8cb379 23386msgid "Compute object ID and optionally creates a blob from a file"
5b533632 23387msgstr "从一个文件计算对象 ID,并可以创建 blob 数据对象"
fd8cb379 23388
d13389bf 23389#: command-list.h:107
fd8cb379
JX
23390msgid "Display help information about Git"
23391msgstr "显示 Git 的帮助信息"
23392
d13389bf 23393#: command-list.h:108
fd8cb379
JX
23394msgid "Server side implementation of Git over HTTP"
23395msgstr "Git HTTP 协议的服务端实现"
23396
d13389bf 23397#: command-list.h:109
fd8cb379
JX
23398msgid "Download from a remote Git repository via HTTP"
23399msgstr "通过 HTTP 从远程 Git 仓库下载"
23400
d13389bf 23401#: command-list.h:110
fd8cb379
JX
23402msgid "Push objects over HTTP/DAV to another repository"
23403msgstr "通过 HTTP/DAV 推送对象另一个仓库"
23404
d13389bf 23405#: command-list.h:111
fd8cb379
JX
23406msgid "Send a collection of patches from stdin to an IMAP folder"
23407msgstr "从标准输入将一组补丁发送到IMAP文件夹"
23408
d13389bf 23409#: command-list.h:112
fd8cb379
JX
23410msgid "Build pack index file for an existing packed archive"
23411msgstr "从一个现存的包存档文件创建包索引"
23412
d13389bf 23413#: command-list.h:113
a77c07d9 23414msgid "Create an empty Git repository or reinitialize an existing one"
160fb2b2 23415msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
8ada9598 23416
d13389bf 23417#: command-list.h:114
fd8cb379
JX
23418msgid "Instantly browse your working repository in gitweb"
23419msgstr "在 gitweb 中即时浏览您的工作仓库"
23420
d13389bf 23421#: command-list.h:115
d46c5519 23422msgid "Add or parse structured information in commit messages"
fd8cb379
JX
23423msgstr "添加或解析提交说明中的结构化信息"
23424
d13389bf 23425#: command-list.h:116
fd8cb379
JX
23426msgid "The Git repository browser"
23427msgstr "Git 仓库浏览器"
23428
d13389bf 23429#: command-list.h:117
8ada9598 23430msgid "Show commit logs"
81809b99 23431msgstr "显示提交日志"
8ada9598 23432
d13389bf 23433#: command-list.h:118
fd8cb379
JX
23434msgid "Show information about files in the index and the working tree"
23435msgstr "显示索引和工作区中文件的信息"
23436
d13389bf 23437#: command-list.h:119
fd8cb379
JX
23438msgid "List references in a remote repository"
23439msgstr "显示一个远程仓库的引用"
23440
d13389bf 23441#: command-list.h:120
fd8cb379
JX
23442msgid "List the contents of a tree object"
23443msgstr "显示一个树对象的内容"
23444
d13389bf 23445#: command-list.h:121
fd8cb379
JX
23446msgid "Extracts patch and authorship from a single e-mail message"
23447msgstr "从单个电子邮件中提取补丁和作者身份"
23448
d13389bf 23449#: command-list.h:122
fd8cb379
JX
23450msgid "Simple UNIX mbox splitter program"
23451msgstr "简单的 UNIX mbox 邮箱切分程序"
23452
d13389bf 23453#: command-list.h:123
d9488fea
JX
23454msgid "Run tasks to optimize Git repository data"
23455msgstr "运行任务以优化仓库数据"
23456
d13389bf 23457#: command-list.h:124
8ada9598 23458msgid "Join two or more development histories together"
81809b99 23459msgstr "合并两个或更多开发历史"
8ada9598 23460
d13389bf 23461#: command-list.h:125
fd8cb379
JX
23462msgid "Find as good common ancestors as possible for a merge"
23463msgstr "为了合并查找尽可能好的公共祖先提交"
23464
d13389bf 23465#: command-list.h:126
fd8cb379
JX
23466msgid "Run a three-way file merge"
23467msgstr "运行一个三路文件合并"
23468
d13389bf 23469#: command-list.h:127
fd8cb379
JX
23470msgid "Run a merge for files needing merging"
23471msgstr "对于需要合并的文件执行合并"
23472
d13389bf 23473#: command-list.h:128
fd8cb379
JX
23474msgid "The standard helper program to use with git-merge-index"
23475msgstr "与 git-merge-index 一起使用的标准向导程序"
23476
d13389bf 23477#: command-list.h:129
fd8cb379
JX
23478msgid "Run merge conflict resolution tools to resolve merge conflicts"
23479msgstr "运行合并冲突解决工具以解决合并冲突"
23480
d13389bf 23481#: command-list.h:130
fd8cb379
JX
23482msgid "Show three-way merge without touching index"
23483msgstr "显示三路合并而不动索引"
23484
d13389bf 23485#: command-list.h:131
4c27fcb5
JX
23486msgid "Write and verify multi-pack-indexes"
23487msgstr "写入和校验多包索引"
23488
d13389bf 23489#: command-list.h:132
fd8cb379
JX
23490msgid "Creates a tag object"
23491msgstr "创建一个标签对象"
23492
d13389bf 23493#: command-list.h:133
fd8cb379
JX
23494msgid "Build a tree-object from ls-tree formatted text"
23495msgstr "基于 ls-tree 的格式化文本创建一个树对象"
23496
d13389bf 23497#: command-list.h:134
8ada9598 23498msgid "Move or rename a file, a directory, or a symlink"
81809b99 23499msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598 23500
fd8cb379 23501# 查找给定版本的符号名称
d13389bf 23502#: command-list.h:135
fd8cb379
JX
23503msgid "Find symbolic names for given revs"
23504msgstr "查找给定版本的符号名称"
23505
d13389bf 23506#: command-list.h:136
fd8cb379
JX
23507msgid "Add or inspect object notes"
23508msgstr "添加或检查对象注释"
23509
d13389bf 23510#: command-list.h:137
fd8cb379
JX
23511msgid "Import from and submit to Perforce repositories"
23512msgstr "导入和提交到 Perforce 仓库中"
23513
d13389bf 23514#: command-list.h:138
fd8cb379
JX
23515msgid "Create a packed archive of objects"
23516msgstr "创建对象的存档包"
23517
d13389bf 23518#: command-list.h:139
fd8cb379
JX
23519msgid "Find redundant pack files"
23520msgstr "查找冗余的包文件"
23521
d13389bf 23522#: command-list.h:140
fd8cb379
JX
23523msgid "Pack heads and tags for efficient repository access"
23524msgstr "打包头和标签以实现高效的仓库访问"
23525
d9488fea 23526#: command-list.h:141
fd8cb379 23527msgid "Compute unique ID for a patch"
5b533632 23528msgstr "计算一个补丁的唯一 ID"
fd8cb379 23529
d9488fea 23530#: command-list.h:142
fd8cb379
JX
23531msgid "Prune all unreachable objects from the object database"
23532msgstr "删除对象库中所有不可达对象"
23533
d9488fea 23534#: command-list.h:143
fd8cb379
JX
23535msgid "Remove extra objects that are already in pack files"
23536msgstr "删除已经在包文件中的多余对象"
23537
d9488fea 23538#: command-list.h:144
2e8451e8 23539msgid "Fetch from and integrate with another repository or a local branch"
160fb2b2 23540msgstr "获取并整合另外的仓库或一个本地分支"
8ada9598 23541
d9488fea 23542#: command-list.h:145
8ada9598 23543msgid "Update remote refs along with associated objects"
81809b99 23544msgstr "更新远程引用和相关的对象"
8ada9598 23545
d9488fea 23546#: command-list.h:146
fd8cb379
JX
23547msgid "Applies a quilt patchset onto the current branch"
23548msgstr "将一个 quilt 补丁集应用到当前分支。"
23549
d9488fea 23550#: command-list.h:147
c1ac5258
JX
23551msgid "Compare two commit ranges (e.g. two versions of a branch)"
23552msgstr "比较两个提交范围(如一个分支的两个版本)"
23553
d9488fea 23554#: command-list.h:148
fd8cb379
JX
23555msgid "Reads tree information into the index"
23556msgstr "将树信息读取到索引"
23557
d9488fea 23558#: command-list.h:149
3495628d
JX
23559msgid "Reapply commits on top of another base tip"
23560msgstr "在另一个分支上重新应用提交"
8ada9598 23561
d9488fea 23562#: command-list.h:150
fd8cb379
JX
23563msgid "Receive what is pushed into the repository"
23564msgstr "接收推送到仓库中的对象"
23565
d9488fea 23566#: command-list.h:151
fd8cb379
JX
23567msgid "Manage reflog information"
23568msgstr "管理 reflog 信息"
23569
d9488fea 23570#: command-list.h:152
fd8cb379
JX
23571msgid "Manage set of tracked repositories"
23572msgstr "管理已跟踪仓库"
23573
d9488fea 23574#: command-list.h:153
fd8cb379
JX
23575msgid "Pack unpacked objects in a repository"
23576msgstr "打包仓库中未打包对象"
23577
d9488fea 23578#: command-list.h:154
fd8cb379
JX
23579msgid "Create, list, delete refs to replace objects"
23580msgstr "创建、列出、删除对象替换引用"
23581
d9488fea 23582#: command-list.h:155
fd8cb379
JX
23583msgid "Generates a summary of pending changes"
23584msgstr "生成待定更改的摘要"
23585
d9488fea 23586#: command-list.h:156
fd8cb379
JX
23587msgid "Reuse recorded resolution of conflicted merges"
23588msgstr "重用冲突合并的解决方案记录"
23589
d9488fea 23590#: command-list.h:157
8ada9598 23591msgid "Reset current HEAD to the specified state"
4375c10e 23592msgstr "重置当前 HEAD 到指定状态"
8ada9598 23593
d9488fea 23594#: command-list.h:158
a6cd2cc4
JX
23595msgid "Restore working tree files"
23596msgstr "恢复工作区文件"
23597
d9488fea 23598#: command-list.h:159
fd8cb379
JX
23599msgid "Revert some existing commits"
23600msgstr "回退一些现存提交"
23601
d9488fea 23602#: command-list.h:160
fd8cb379
JX
23603msgid "Lists commit objects in reverse chronological order"
23604msgstr "按时间顺序列出提交对象"
23605
d9488fea 23606#: command-list.h:161
fd8cb379
JX
23607msgid "Pick out and massage parameters"
23608msgstr "选出并处理参数"
23609
d9488fea 23610#: command-list.h:162
8ada9598 23611msgid "Remove files from the working tree and from the index"
81809b99 23612msgstr "从工作区和索引中删除文件"
8ada9598 23613
d9488fea 23614#: command-list.h:163
fd8cb379
JX
23615msgid "Send a collection of patches as emails"
23616msgstr "通过电子邮件发送一组补丁"
23617
d9488fea 23618#: command-list.h:164
fd8cb379
JX
23619msgid "Push objects over Git protocol to another repository"
23620msgstr "使用 Git 协议推送对象到另一个仓库"
23621
d9488fea 23622#: command-list.h:165
fd8cb379
JX
23623msgid "Restricted login shell for Git-only SSH access"
23624msgstr "只允许 Git SSH 访问的受限登录shell"
23625
d9488fea 23626#: command-list.h:166
fd8cb379
JX
23627msgid "Summarize 'git log' output"
23628msgstr "'git log' 输出摘要"
23629
d9488fea 23630#: command-list.h:167
8ada9598 23631msgid "Show various types of objects"
81809b99 23632msgstr "显示各种类型的对象"
8ada9598 23633
d9488fea 23634#: command-list.h:168
fd8cb379
JX
23635msgid "Show branches and their commits"
23636msgstr "显示分支和提交"
23637
d9488fea 23638#: command-list.h:169
fd8cb379
JX
23639msgid "Show packed archive index"
23640msgstr "显示打包归档索引"
23641
d9488fea 23642#: command-list.h:170
fd8cb379
JX
23643msgid "List references in a local repository"
23644msgstr "显示本地仓库中的引用"
23645
d9488fea 23646#: command-list.h:171
fd8cb379
JX
23647msgid "Git's i18n setup code for shell scripts"
23648msgstr "为 shell 脚本准备的 Git 国际化设置代码"
23649
d9488fea 23650#: command-list.h:172
fd8cb379
JX
23651msgid "Common Git shell script setup code"
23652msgstr "常用的 Git shell 脚本设置代码"
23653
d9488fea 23654#: command-list.h:173
ddc12c42
JX
23655msgid "Initialize and modify the sparse-checkout"
23656msgstr "初始化及修改稀疏检出"
23657
d9488fea 23658#: command-list.h:174
fd8cb379
JX
23659msgid "Stash the changes in a dirty working directory away"
23660msgstr "贮藏脏工作区中的修改"
23661
d9488fea 23662#: command-list.h:175
fd8cb379
JX
23663msgid "Add file contents to the staging area"
23664msgstr "将文件内容添加到索引"
23665
d9488fea 23666#: command-list.h:176
8ada9598 23667msgid "Show the working tree status"
81809b99 23668msgstr "显示工作区状态"
8ada9598 23669
d9488fea 23670#: command-list.h:177
fd8cb379
JX
23671msgid "Remove unnecessary whitespace"
23672msgstr "删除不必要的空白字符"
23673
d9488fea 23674#: command-list.h:178
fd8cb379
JX
23675msgid "Initialize, update or inspect submodules"
23676msgstr "初始化、更新或检查子模组"
23677
d9488fea 23678#: command-list.h:179
fd8cb379
JX
23679msgid "Bidirectional operation between a Subversion repository and Git"
23680msgstr "Subersion 仓库和 Git 之间的双向操作"
23681
d9488fea 23682#: command-list.h:180
a6cd2cc4
JX
23683msgid "Switch branches"
23684msgstr "切换分支"
23685
d9488fea 23686#: command-list.h:181
fd8cb379
JX
23687msgid "Read, modify and delete symbolic refs"
23688msgstr "读取、修改和删除符号引用"
23689
d9488fea 23690#: command-list.h:182
8ada9598 23691msgid "Create, list, delete or verify a tag object signed with GPG"
4375c10e 23692msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
8ada9598 23693
d9488fea 23694#: command-list.h:183
fd8cb379
JX
23695msgid "Creates a temporary file with a blob's contents"
23696msgstr "用 blob 数据对象的内容创建一个临时文件"
220c313c 23697
d9488fea 23698#: command-list.h:184
fd8cb379
JX
23699msgid "Unpack objects from a packed archive"
23700msgstr "从打包文件中解压缩对象"
220c313c 23701
d9488fea 23702#: command-list.h:185
fd8cb379
JX
23703msgid "Register file contents in the working tree to the index"
23704msgstr "将工作区的文件内容注册到索引"
220c313c 23705
d9488fea 23706#: command-list.h:186
fd8cb379
JX
23707msgid "Update the object name stored in a ref safely"
23708msgstr "安全地更新存储于引用中的对象名称"
220c313c 23709
d9488fea 23710#: command-list.h:187
fd8cb379
JX
23711msgid "Update auxiliary info file to help dumb servers"
23712msgstr "更新辅助信息文件以帮助哑协议服务"
23713
d9488fea 23714#: command-list.h:188
fd8cb379
JX
23715msgid "Send archive back to git-archive"
23716msgstr "将存档发送回 git-archive"
23717
d9488fea 23718#: command-list.h:189
fd8cb379
JX
23719msgid "Send objects packed back to git-fetch-pack"
23720msgstr "将对象压缩包发送回 git-fetch-pack"
23721
d9488fea 23722#: command-list.h:190
fd8cb379
JX
23723msgid "Show a Git logical variable"
23724msgstr "显示一个Git逻辑变量"
23725
d9488fea 23726#: command-list.h:191
fd8cb379
JX
23727msgid "Check the GPG signature of commits"
23728msgstr "检查 GPG 提交签名"
23729
d9488fea 23730#: command-list.h:192
fd8cb379
JX
23731msgid "Validate packed Git archive files"
23732msgstr "校验打包的Git存仓文件"
23733
d9488fea 23734#: command-list.h:193
fd8cb379
JX
23735msgid "Check the GPG signature of tags"
23736msgstr "检查标签的 GPG 签名"
23737
d9488fea 23738#: command-list.h:194
fd8cb379
JX
23739msgid "Git web interface (web frontend to Git repositories)"
23740msgstr "Git web 界面(Git 仓库的 web 前端)"
23741
d9488fea 23742#: command-list.h:195
fd8cb379
JX
23743msgid "Show logs with difference each commit introduces"
23744msgstr "显示每一个提交引入的差异日志"
23745
d9488fea 23746#: command-list.h:196
fd8cb379
JX
23747msgid "Manage multiple working trees"
23748msgstr "管理多个工作区"
23749
d9488fea 23750#: command-list.h:197
fd8cb379
JX
23751msgid "Create a tree object from the current index"
23752msgstr "从当前索引创建一个树对象"
23753
d9488fea 23754#: command-list.h:198
fd8cb379
JX
23755msgid "Defining attributes per path"
23756msgstr "定义路径的属性"
23757
d9488fea 23758#: command-list.h:199
fd8cb379
JX
23759msgid "Git command-line interface and conventions"
23760msgstr "Git 命令行界面和约定"
23761
d9488fea 23762#: command-list.h:200
fd8cb379
JX
23763msgid "A Git core tutorial for developers"
23764msgstr "面向开发人员的 Git 核心教程"
23765
d9488fea
JX
23766#: command-list.h:201
23767msgid "Providing usernames and passwords to Git"
23768msgstr "为 Git 提供用户名和口令"
23769
23770#: command-list.h:202
fd8cb379
JX
23771msgid "Git for CVS users"
23772msgstr "适合 CVS 用户的 Git 帮助"
23773
d9488fea 23774#: command-list.h:203
fd8cb379
JX
23775msgid "Tweaking diff output"
23776msgstr "调整差异输出"
23777
d9488fea 23778#: command-list.h:204
fd8cb379
JX
23779msgid "A useful minimum set of commands for Everyday Git"
23780msgstr "每一天 Git 的一组有用的最小命令集合"
23781
d9488fea 23782#: command-list.h:205
349ede6a
JX
23783msgid "Frequently asked questions about using Git"
23784msgstr "关于使用 Git 的常见问题"
23785
d9488fea 23786#: command-list.h:206
fd8cb379
JX
23787msgid "A Git Glossary"
23788msgstr "Git 词汇表"
23789
d9488fea 23790#: command-list.h:207
fd8cb379
JX
23791msgid "Hooks used by Git"
23792msgstr "Git 使用的钩子"
23793
d9488fea 23794#: command-list.h:208
fd8cb379
JX
23795msgid "Specifies intentionally untracked files to ignore"
23796msgstr "忽略指定的未跟踪文件"
23797
d9488fea 23798#: command-list.h:209
fd8cb379
JX
23799msgid "Defining submodule properties"
23800msgstr "定义子模组属性"
23801
d9488fea 23802#: command-list.h:210
fd8cb379
JX
23803msgid "Git namespaces"
23804msgstr "Git 名字空间"
23805
d9488fea
JX
23806#: command-list.h:211
23807msgid "Helper programs to interact with remote repositories"
23808msgstr "与远程仓库交互的助手程序"
23809
23810#: command-list.h:212
fd8cb379
JX
23811msgid "Git Repository Layout"
23812msgstr "Git 仓库布局"
23813
d9488fea 23814#: command-list.h:213
fd8cb379
JX
23815msgid "Specifying revisions and ranges for Git"
23816msgstr "指定 Git 的版本和版本范围"
23817
d9488fea 23818#: command-list.h:214
ddc12c42
JX
23819msgid "Mounting one repository inside another"
23820msgstr "将一个仓库安装到另外一个仓库中"
23821
d9488fea 23822#: command-list.h:215
fd8cb379
JX
23823msgid "A tutorial introduction to Git: part two"
23824msgstr "一个 Git 教程:第二部分"
23825
d9488fea 23826#: command-list.h:216
fd8cb379
JX
23827msgid "A tutorial introduction to Git"
23828msgstr "一个 Git 教程"
23829
d9488fea 23830#: command-list.h:217
fd8cb379
JX
23831msgid "An overview of recommended workflows with Git"
23832msgstr "Git 推荐的工作流概览"
220c313c 23833
d13389bf 23834#: git-bisect.sh:48
c04f5ac3
JX
23835#, sh-format
23836msgid "Bad rev input: $arg"
9a4b694c 23837msgstr "坏的输入版本:$arg"
c04f5ac3 23838
d13389bf 23839#: git-bisect.sh:82
c04f5ac3
JX
23840msgid "No logfile given"
23841msgstr "未提供日志文件"
23842
d13389bf 23843#: git-bisect.sh:83
c04f5ac3
JX
23844#, sh-format
23845msgid "cannot read $file for replaying"
23846msgstr "不能读取 $file 来重放"
23847
d13389bf 23848#: git-bisect.sh:105
c04f5ac3
JX
23849msgid "?? what are you talking about?"
23850msgstr "?? 您在说什么?"
23851
d13389bf 23852#: git-bisect.sh:115
5809aa05
JX
23853msgid "bisect run failed: no command provided."
23854msgstr "二分查找运行失败:没有提供命令。"
23855
d13389bf 23856#: git-bisect.sh:120
b694fbb1
JX
23857#, sh-format
23858msgid "running $command"
23859msgstr "运行 $command"
23860
d13389bf 23861#: git-bisect.sh:127
b694fbb1
JX
23862#, sh-format
23863msgid ""
23864"bisect run failed:\n"
23865"exit code $res from '$command' is < 0 or >= 128"
23866msgstr ""
23867"二分查找运行失败:\n"
07432cef 23868"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 23869
d13389bf 23870#: git-bisect.sh:152
b694fbb1
JX
23871msgid "bisect run cannot continue any more"
23872msgstr "二分查找不能继续运行"
23873
d13389bf 23874#: git-bisect.sh:158
b694fbb1
JX
23875#, sh-format
23876msgid ""
23877"bisect run failed:\n"
d13389bf 23878"'bisect-state $state' exited with error code $res"
b694fbb1
JX
23879msgstr ""
23880"二分查找运行失败:\n"
d13389bf 23881"'bisect-state $state' 退出码为 $res"
b694fbb1 23882
d13389bf 23883#: git-bisect.sh:165
b694fbb1
JX
23884msgid "bisect run success"
23885msgstr "二分查找运行成功"
c04f5ac3 23886
d13389bf 23887#: git-bisect.sh:173
06991777
JX
23888msgid "We are not bisecting."
23889msgstr "我们没有在二分查找。"
94550ed3 23890
5c57d762
JX
23891#: git-merge-octopus.sh:46
23892msgid ""
23893"Error: Your local changes to the following files would be overwritten by "
23894"merge"
23895msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
23896
23897#: git-merge-octopus.sh:61
23898msgid "Automated merge did not work."
9a4b694c 23899msgstr "自动合并未生效。"
5c57d762
JX
23900
23901#: git-merge-octopus.sh:62
a0b6b246 23902msgid "Should not be doing an octopus."
5c57d762
JX
23903msgstr "不应该执行章鱼式合并。"
23904
23905#: git-merge-octopus.sh:73
23906#, sh-format
23907msgid "Unable to find common commit with $pretty_name"
23908msgstr "无法找到和 $pretty_name 的基线提交"
23909
23910#: git-merge-octopus.sh:77
23911#, sh-format
6937cb4e 23912msgid "Already up to date with $pretty_name"
5c57d762
JX
23913msgstr "已经和 $pretty_name 保持一致"
23914
23915#: git-merge-octopus.sh:89
23916#, sh-format
23917msgid "Fast-forwarding to: $pretty_name"
23918msgstr "快进至:$pretty_name"
23919
23920#: git-merge-octopus.sh:97
23921#, sh-format
23922msgid "Trying simple merge with $pretty_name"
23923msgstr "尝试和 $pretty_name 的简单合并"
23924
23925#: git-merge-octopus.sh:102
23926msgid "Simple merge did not work, trying automatic merge."
9a4b694c 23927msgstr "简单合并未生效,尝试自动合并。"
5c57d762 23928
d13389bf 23929#: git-submodule.sh:179
2e8451e8
JX
23930msgid "Relative path can only be used from the toplevel of the working tree"
23931msgstr "只能在工作区的顶级目录中使用相对路径"
23932
d13389bf 23933#: git-submodule.sh:189
c04f5ac3
JX
23934#, sh-format
23935msgid "repo URL: '$repo' must be absolute or begin with ./|../"
4375c10e 23936msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
c04f5ac3 23937
d13389bf 23938#: git-submodule.sh:208
c04f5ac3 23939#, sh-format
170e9899
JX
23940msgid "'$sm_path' already exists in the index"
23941msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 23942
d13389bf 23943#: git-submodule.sh:211
1a79b2f1
JX
23944#, sh-format
23945msgid "'$sm_path' already exists in the index and is not a submodule"
23946msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
23947
d13389bf 23948#: git-submodule.sh:218
d46c5519
JX
23949#, sh-format
23950msgid "'$sm_path' does not have a commit checked out"
5b533632 23951msgstr "'$sm_path' 没有检出的提交"
d46c5519 23952
d13389bf 23953#: git-submodule.sh:249
b694fbb1
JX
23954#, sh-format
23955msgid "Adding existing repo at '$sm_path' to the index"
160fb2b2 23956msgstr "添加位于 '$sm_path' 的现存仓库到索引"
b694fbb1 23957
d13389bf 23958#: git-submodule.sh:251
c04f5ac3 23959#, sh-format
170e9899 23960msgid "'$sm_path' already exists and is not a valid git repo"
160fb2b2 23961msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
c04f5ac3 23962
d13389bf 23963#: git-submodule.sh:259
07432cef
WS
23964#, sh-format
23965msgid "A git directory for '$sm_name' is found locally with remote(s):"
160fb2b2 23966msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
07432cef 23967
d13389bf 23968#: git-submodule.sh:261
07432cef
WS
23969#, sh-format
23970msgid ""
5c57d762
JX
23971"If you want to reuse this local git directory instead of cloning again from\n"
23972" $realrepo\n"
23973"use the '--force' option. If the local git directory is not the correct "
23974"repo\n"
07432cef
WS
23975"or you are unsure what this means choose another name with the '--name' "
23976"option."
5c57d762
JX
23977msgstr ""
23978"如果您想要重用这个本地 git 目录而非重新克隆自\n"
23979" $realrepo\n"
23980"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
23981"或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
07432cef 23982
d13389bf 23983#: git-submodule.sh:267
07432cef
WS
23984#, sh-format
23985msgid "Reactivating local git directory for submodule '$sm_name'."
23986msgstr "激活本地 git 目录到子模组 '$sm_name'。"
23987
d13389bf 23988#: git-submodule.sh:279
c04f5ac3 23989#, sh-format
170e9899
JX
23990msgid "Unable to checkout submodule '$sm_path'"
23991msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 23992
d13389bf 23993#: git-submodule.sh:284
c04f5ac3 23994#, sh-format
170e9899
JX
23995msgid "Failed to add submodule '$sm_path'"
23996msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 23997
d13389bf 23998#: git-submodule.sh:293
c04f5ac3 23999#, sh-format
170e9899
JX
24000msgid "Failed to register submodule '$sm_path'"
24001msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 24002
d13389bf 24003#: git-submodule.sh:568
c04f5ac3 24004#, sh-format
2e8451e8
JX
24005msgid "Unable to find current revision in submodule path '$displaypath'"
24006msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 24007
d13389bf 24008#: git-submodule.sh:578
c04f5ac3 24009#, sh-format
170e9899
JX
24010msgid "Unable to fetch in submodule path '$sm_path'"
24011msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 24012
d13389bf 24013#: git-submodule.sh:583
5c57d762
JX
24014#, sh-format
24015msgid ""
24016"Unable to find current ${remote_name}/${branch} revision in submodule path "
24017"'$sm_path'"
9a4b694c 24018msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
5c57d762 24019
d13389bf 24020#: git-submodule.sh:601
2e8451e8 24021#, sh-format
d46c5519
JX
24022msgid ""
24023"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
24024"$sha1:"
24025msgstr "无法在子模组路径 '$displaypath' 中获取,尝试直接获取 $sha1:"
2e8451e8 24026
d13389bf 24027#: git-submodule.sh:607
5c57d762
JX
24028#, sh-format
24029msgid ""
24030"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
24031"Direct fetching of that commit failed."
a0b6b246
JX
24032msgstr ""
24033"获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
5c57d762 24034
d13389bf 24035#: git-submodule.sh:614
6c94aba5
JX
24036#, sh-format
24037msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
24038msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
24039
d13389bf 24040#: git-submodule.sh:615
c04f5ac3 24041#, sh-format
6c94aba5
JX
24042msgid "Submodule path '$displaypath': checked out '$sha1'"
24043msgstr "子模组路径 '$displaypath':检出 '$sha1'"
24044
d13389bf 24045#: git-submodule.sh:619
6c94aba5 24046#, sh-format
2e8451e8
JX
24047msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
24048msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 24049
d13389bf 24050#: git-submodule.sh:620
c04f5ac3 24051#, sh-format
2e8451e8
JX
24052msgid "Submodule path '$displaypath': rebased into '$sha1'"
24053msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 24054
d13389bf 24055#: git-submodule.sh:625
c04f5ac3 24056#, sh-format
2e8451e8
JX
24057msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
24058msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 24059
d13389bf 24060#: git-submodule.sh:626
c04f5ac3 24061#, sh-format
2e8451e8
JX
24062msgid "Submodule path '$displaypath': merged in '$sha1'"
24063msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 24064
d13389bf 24065#: git-submodule.sh:631
c04f5ac3 24066#, sh-format
5b04ee3b
JX
24067msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
24068msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
c04f5ac3 24069
d13389bf 24070#: git-submodule.sh:632
c04f5ac3 24071#, sh-format
5b04ee3b 24072msgid "Submodule path '$displaypath': '$command $sha1'"
aef18cc6 24073msgstr "子模组 '$displaypath':'$command $sha1'"
c04f5ac3 24074
d13389bf 24075#: git-submodule.sh:663
2e8451e8
JX
24076#, sh-format
24077msgid "Failed to recurse into submodule path '$displaypath'"
24078msgstr "无法递归进子模组路径 '$displaypath'"
24079
a6cd2cc4
JX
24080#: git-rebase--preserve-merges.sh:109
24081msgid "Applied autostash."
24082msgstr "已应用 autostash。"
24083
24084#: git-rebase--preserve-merges.sh:112
24085#, sh-format
24086msgid "Cannot store $stash_sha1"
24087msgstr "不能存储 $stash_sha1"
24088
349ede6a
JX
24089#: git-rebase--preserve-merges.sh:113
24090msgid ""
24091"Applying autostash resulted in conflicts.\n"
24092"Your changes are safe in the stash.\n"
24093"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
24094msgstr ""
24095"应用 autostash 导致了冲突。\n"
24096"您的修改安全地保存在贮藏区中。\n"
24097"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
24098
a6cd2cc4 24099#: git-rebase--preserve-merges.sh:191
c1ac5258
JX
24100#, sh-format
24101msgid "Rebasing ($new_count/$total)"
24102msgstr "变基中($new_count/$total)"
24103
d9488fea 24104#: git-rebase--preserve-merges.sh:197
c1ac5258
JX
24105msgid ""
24106"\n"
24107"Commands:\n"
24108"p, pick <commit> = use commit\n"
24109"r, reword <commit> = use commit, but edit the commit message\n"
24110"e, edit <commit> = use commit, but stop for amending\n"
24111"s, squash <commit> = use commit, but meld into previous commit\n"
24112"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
24113"x, exec <commit> = run command (the rest of the line) using shell\n"
24114"d, drop <commit> = remove commit\n"
24115"l, label <label> = label current HEAD with a name\n"
24116"t, reset <label> = reset HEAD to a label\n"
24117"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
24118". create a merge commit using the original merge commit's\n"
24119". message (or the oneline, if no original merge commit was\n"
24120". specified). Use -c <commit> to reword the commit message.\n"
24121"\n"
24122"These lines can be re-ordered; they are executed from top to bottom.\n"
24123msgstr ""
24124"\n"
24125"命令:\n"
24126"p, pick <提交> = 使用提交\n"
24127"r, reword <提交> = 使用提交,但修改提交说明\n"
24128"e, edit <提交> = 使用提交,但停下来修补\n"
24129"s, squash <提交> = 使用提交,但融合到前一个提交\n"
24130"f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
24131"x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
24132"d, drop <提交> = 删除提交\n"
24133"l, label <标签> = 为当前 HEAD 打上标签\n"
24134"t, reset <标签> = 重置 HEAD 到该标签\n"
24135"m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n"
24136". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
24137". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
24138". -c <提交> 可以编辑提交说明。\n"
24139"\n"
24140"可以对这些行重新排序,将从上至下执行。\n"
24141
d9488fea 24142#: git-rebase--preserve-merges.sh:260
5c57d762
JX
24143#, sh-format
24144msgid ""
24145"You can amend the commit now, with\n"
24146"\n"
24147"\tgit commit --amend $gpg_sign_opt_quoted\n"
24148"\n"
24149"Once you are satisfied with your changes, run\n"
24150"\n"
24151"\tgit rebase --continue"
24152msgstr ""
24153"您现在可以修补这个提交,使用\n"
24154"\n"
24155"\tgit commit --amend $gpg_sign_opt_quoted\n"
24156"\n"
9a4b694c 24157"当您对变更感到满意,执行\n"
5c57d762
JX
24158"\n"
24159"\tgit rebase --continue"
24160
d9488fea 24161#: git-rebase--preserve-merges.sh:285
5c57d762
JX
24162#, sh-format
24163msgid "$sha1: not a commit that can be picked"
24164msgstr "$sha1:不是一个可以被拣选的提交"
24165
d9488fea 24166#: git-rebase--preserve-merges.sh:324
5c57d762
JX
24167#, sh-format
24168msgid "Invalid commit name: $sha1"
24169msgstr "无效的提交名:$sha1"
24170
d9488fea 24171#: git-rebase--preserve-merges.sh:354
5c57d762
JX
24172msgid "Cannot write current commit's replacement sha1"
24173msgstr "不能写入当前提交的替代 sha1"
24174
d9488fea 24175#: git-rebase--preserve-merges.sh:405
5c57d762
JX
24176#, sh-format
24177msgid "Fast-forward to $sha1"
24178msgstr "快进到 $sha1"
24179
d9488fea 24180#: git-rebase--preserve-merges.sh:407
5c57d762
JX
24181#, sh-format
24182msgid "Cannot fast-forward to $sha1"
24183msgstr "不能快进到 $sha1"
24184
d9488fea 24185#: git-rebase--preserve-merges.sh:416
5c57d762
JX
24186#, sh-format
24187msgid "Cannot move HEAD to $first_parent"
24188msgstr "不能移动 HEAD 到 $first_parent"
24189
d9488fea 24190#: git-rebase--preserve-merges.sh:421
5c57d762
JX
24191#, sh-format
24192msgid "Refusing to squash a merge: $sha1"
24193msgstr "拒绝压缩一个合并:$sha1"
24194
d9488fea 24195#: git-rebase--preserve-merges.sh:439
5c57d762
JX
24196#, sh-format
24197msgid "Error redoing merge $sha1"
24198msgstr "无法重做合并 $sha1"
24199
d9488fea 24200#: git-rebase--preserve-merges.sh:448
5c57d762
JX
24201#, sh-format
24202msgid "Could not pick $sha1"
24203msgstr "不能拣选 $sha1"
24204
d9488fea 24205#: git-rebase--preserve-merges.sh:457
5c57d762
JX
24206#, sh-format
24207msgid "This is the commit message #${n}:"
9a4b694c 24208msgstr "这是提交说明 #${n}:"
5c57d762 24209
d9488fea 24210#: git-rebase--preserve-merges.sh:462
5c57d762
JX
24211#, sh-format
24212msgid "The commit message #${n} will be skipped:"
9a4b694c 24213msgstr "提交说明 #${n} 将被跳过:"
5c57d762 24214
d9488fea 24215#: git-rebase--preserve-merges.sh:473
5c57d762
JX
24216#, sh-format
24217msgid "This is a combination of $count commit."
24218msgid_plural "This is a combination of $count commits."
24219msgstr[0] "这是一个 $count 个提交的组合。"
24220msgstr[1] "这是一个 $count 个提交的组合。"
24221
d9488fea 24222#: git-rebase--preserve-merges.sh:482
5c57d762
JX
24223#, sh-format
24224msgid "Cannot write $fixup_msg"
24225msgstr "不能写入 $fixup_msg"
24226
d9488fea 24227#: git-rebase--preserve-merges.sh:485
5c57d762
JX
24228msgid "This is a combination of 2 commits."
24229msgstr "这是一个 2 个提交的组合。"
24230
d9488fea
JX
24231#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
24232#: git-rebase--preserve-merges.sh:572
5c57d762
JX
24233#, sh-format
24234msgid "Could not apply $sha1... $rest"
24235msgstr "不能应用 $sha1... $rest"
24236
d9488fea 24237#: git-rebase--preserve-merges.sh:601
5c57d762
JX
24238#, sh-format
24239msgid ""
24240"Could not amend commit after successfully picking $sha1... $rest\n"
24241"This is most likely due to an empty commit message, or the pre-commit hook\n"
24242"failed. If the pre-commit hook failed, you may need to resolve the issue "
24243"before\n"
24244"you are able to reword the commit."
24245msgstr ""
24246"不能在成功拣选 $sha1... $rest 之后修补提交\n"
24247"这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
24248"钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
24249
d9488fea 24250#: git-rebase--preserve-merges.sh:616
5c57d762
JX
24251#, sh-format
24252msgid "Stopped at $sha1_abbrev... $rest"
24253msgstr "停止在 $sha1_abbrev... $rest"
24254
d9488fea 24255#: git-rebase--preserve-merges.sh:631
5c57d762
JX
24256#, sh-format
24257msgid "Cannot '$squash_style' without a previous commit"
9a4b694c 24258msgstr "没有父提交的情况下不能 '$squash_style'"
5c57d762 24259
d9488fea 24260#: git-rebase--preserve-merges.sh:673
5c57d762
JX
24261#, sh-format
24262msgid "Executing: $rest"
24263msgstr "执行:$rest"
24264
d9488fea 24265#: git-rebase--preserve-merges.sh:681
5c57d762
JX
24266#, sh-format
24267msgid "Execution failed: $rest"
24268msgstr "执行失败:$rest"
24269
d9488fea 24270#: git-rebase--preserve-merges.sh:683
5c57d762
JX
24271msgid "and made changes to the index and/or the working tree"
24272msgstr "并且修改索引和/或工作区"
24273
24274# 译者:注意保持前导空格
d9488fea 24275#: git-rebase--preserve-merges.sh:685
5c57d762
JX
24276msgid ""
24277"You can fix the problem, and then run\n"
24278"\n"
24279"\tgit rebase --continue"
24280msgstr ""
24281"您可以解决这个问题,然后运行\n"
24282"\n"
24283"\tgit rebase --continue"
24284
24285#. TRANSLATORS: after these lines is a command to be issued by the user
d9488fea 24286#: git-rebase--preserve-merges.sh:698
5c57d762
JX
24287#, sh-format
24288msgid ""
24289"Execution succeeded: $rest\n"
24290"but left changes to the index and/or the working tree\n"
24291"Commit or stash your changes, and then run\n"
24292"\n"
24293"\tgit rebase --continue"
24294msgstr ""
24295"执行成功:$rest\n"
a4f16749 24296"但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n"
5c57d762
JX
24297"\n"
24298"\tgit rebase --continue"
24299
d9488fea 24300#: git-rebase--preserve-merges.sh:709
5c57d762
JX
24301#, sh-format
24302msgid "Unknown command: $command $sha1 $rest"
24303msgstr "未知命令:$command $sha1 $rest"
24304
d9488fea 24305#: git-rebase--preserve-merges.sh:710
5c57d762
JX
24306msgid "Please fix this using 'git rebase --edit-todo'."
24307msgstr "要修改请使用命令 'git rebase --edit-todo'。"
24308
d9488fea 24309#: git-rebase--preserve-merges.sh:745
5c57d762
JX
24310#, sh-format
24311msgid "Successfully rebased and updated $head_name."
9a4b694c 24312msgstr "成功变基并更新 $head_name。"
5c57d762 24313
d9488fea 24314#: git-rebase--preserve-merges.sh:802
5c57d762
JX
24315msgid "Could not remove CHERRY_PICK_HEAD"
24316msgstr "不能删除 CHERRY_PICK_HEAD"
24317
d9488fea 24318#: git-rebase--preserve-merges.sh:807
5c57d762
JX
24319#, sh-format
24320msgid ""
24321"You have staged changes in your working tree.\n"
24322"If these changes are meant to be\n"
24323"squashed into the previous commit, run:\n"
24324"\n"
24325" git commit --amend $gpg_sign_opt_quoted\n"
24326"\n"
24327"If they are meant to go into a new commit, run:\n"
24328"\n"
24329" git commit $gpg_sign_opt_quoted\n"
24330"\n"
a0b6b246 24331"In both cases, once you're done, continue with:\n"
5c57d762
JX
24332"\n"
24333" git rebase --continue\n"
24334msgstr ""
24335"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
24336"\n"
24337" git commit --amend $gpg_sign_opt_quoted\n"
24338"\n"
24339"如果这些变更要形成一个新提交,执行:\n"
24340"\n"
24341" git commit $gpg_sign_opt_quoted\n"
24342"\n"
9a4b694c 24343"无论哪种情况,当您完成提交,继续执行:\n"
5c57d762
JX
24344"\n"
24345" git rebase --continue\n"
24346
d9488fea 24347#: git-rebase--preserve-merges.sh:824
5c57d762 24348msgid "Error trying to find the author identity to amend commit"
9a4b694c 24349msgstr "在修补提交中查找作者信息时遇到错误"
5c57d762 24350
d9488fea 24351#: git-rebase--preserve-merges.sh:829
5c57d762
JX
24352msgid ""
24353"You have uncommitted changes in your working tree. Please commit them\n"
24354"first and then run 'git rebase --continue' again."
a0b6b246
JX
24355msgstr ""
24356"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
5c57d762 24357
d9488fea 24358#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
5c57d762
JX
24359msgid "Could not commit staged changes."
24360msgstr "不能提交暂存的修改。"
24361
d9488fea 24362#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
4c27fcb5
JX
24363msgid "Could not execute editor"
24364msgstr "无法运行编辑器"
24365
d9488fea 24366#: git-rebase--preserve-merges.sh:890
4c27fcb5
JX
24367#, sh-format
24368msgid "Could not checkout $switch_to"
24369msgstr "不能检出 $switch_to"
24370
d9488fea 24371#: git-rebase--preserve-merges.sh:897
4c27fcb5
JX
24372msgid "No HEAD?"
24373msgstr "没有 HEAD?"
24374
d9488fea 24375#: git-rebase--preserve-merges.sh:898
4c27fcb5
JX
24376#, sh-format
24377msgid "Could not create temporary $state_dir"
24378msgstr "不能创建临时 $state_dir"
24379
d9488fea 24380#: git-rebase--preserve-merges.sh:901
4c27fcb5
JX
24381msgid "Could not mark as interactive"
24382msgstr "不能标记为交互式"
24383
d9488fea 24384#: git-rebase--preserve-merges.sh:933
4c27fcb5
JX
24385#, sh-format
24386msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
24387msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
24388msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
24389msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
5c57d762 24390
d9488fea 24391#: git-rebase--preserve-merges.sh:945
2b472aae
JX
24392msgid "Note that empty commits are commented out"
24393msgstr "注意空提交已被注释掉"
24394
d9488fea 24395#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
fd8cb379
JX
24396msgid "Could not init rewritten commits"
24397msgstr "不能对重写提交进行初始化"
24398
5c57d762
JX
24399#: git-sh-setup.sh:89 git-sh-setup.sh:94
24400#, sh-format
24401msgid "usage: $dashless $USAGE"
24402msgstr "用法:$dashless $USAGE"
24403
d46c5519 24404#: git-sh-setup.sh:191
5c57d762
JX
24405#, sh-format
24406msgid "Cannot chdir to $cdup, the toplevel of the working tree"
9a4b694c 24407msgstr "不能切换目录到 $cdup,工作区的顶级目录"
5c57d762 24408
d46c5519 24409#: git-sh-setup.sh:200 git-sh-setup.sh:207
5c57d762
JX
24410#, sh-format
24411msgid "fatal: $program_name cannot be used without a working tree."
06991777 24412msgstr "致命错误:$program_name 不能在没有工作区的情况下使用"
5c57d762 24413
d46c5519 24414#: git-sh-setup.sh:221
5c57d762
JX
24415msgid "Cannot rebase: You have unstaged changes."
24416msgstr "不能变基:您有未暂存的变更。"
24417
d46c5519 24418#: git-sh-setup.sh:224
5c57d762
JX
24419msgid "Cannot rewrite branches: You have unstaged changes."
24420msgstr "不能重写分支:您有未暂存的变更。"
24421
d46c5519 24422#: git-sh-setup.sh:227
a0b6b246
JX
24423msgid "Cannot pull with rebase: You have unstaged changes."
24424msgstr "无法通过变基方式拉取:您有未暂存的变更。"
24425
d46c5519 24426#: git-sh-setup.sh:230
5c57d762
JX
24427#, sh-format
24428msgid "Cannot $action: You have unstaged changes."
24429msgstr "不能 $action:您有未暂存的变更。"
24430
d46c5519 24431#: git-sh-setup.sh:243
5c57d762
JX
24432msgid "Cannot rebase: Your index contains uncommitted changes."
24433msgstr "不能变基:您的索引中包含未提交的变更。"
24434
d46c5519 24435#: git-sh-setup.sh:246
a0b6b246
JX
24436msgid "Cannot pull with rebase: Your index contains uncommitted changes."
24437msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
24438
d46c5519 24439#: git-sh-setup.sh:249
5c57d762
JX
24440#, sh-format
24441msgid "Cannot $action: Your index contains uncommitted changes."
24442msgstr "不能 $action:您的索引中包含未提交的变更。"
24443
d46c5519 24444#: git-sh-setup.sh:253
a0b6b246
JX
24445msgid "Additionally, your index contains uncommitted changes."
24446msgstr "而且您的索引中包含未提交的变更。"
24447
d46c5519 24448#: git-sh-setup.sh:373
5c57d762
JX
24449msgid "You need to run this command from the toplevel of the working tree."
24450msgstr "您需要在工作区的顶级目录中运行这个命令。"
24451
d46c5519 24452#: git-sh-setup.sh:378
5c57d762
JX
24453msgid "Unable to determine absolute path of git directory"
24454msgstr "不能确定 git 目录的绝对路径"
a0b6b246 24455
1a79b2f1 24456#. TRANSLATORS: you can adjust this to align "git add -i" status menu
ddc12c42 24457#: git-add--interactive.perl:212
1a79b2f1
JX
24458#, perl-format
24459msgid "%12s %12s %s"
24460msgstr "%12s %12s %s"
24461
d13389bf 24462#: git-add--interactive.perl:632
1a79b2f1
JX
24463#, perl-format
24464msgid "touched %d path\n"
24465msgid_plural "touched %d paths\n"
24466msgstr[0] "触碰了 %d 个路径\n"
24467msgstr[1] "触碰了 %d 个路径\n"
24468
d13389bf 24469#: git-add--interactive.perl:1056
1a79b2f1
JX
24470msgid ""
24471"If the patch applies cleanly, the edited hunk will immediately be\n"
24472"marked for staging."
24473msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
24474
d13389bf 24475#: git-add--interactive.perl:1059
1a79b2f1
JX
24476msgid ""
24477"If the patch applies cleanly, the edited hunk will immediately be\n"
24478"marked for stashing."
a4f16749 24479msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。"
1a79b2f1 24480
d13389bf 24481#: git-add--interactive.perl:1062
1a79b2f1
JX
24482msgid ""
24483"If the patch applies cleanly, the edited hunk will immediately be\n"
24484"marked for unstaging."
24485msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
24486
d13389bf
JX
24487#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
24488#: git-add--interactive.perl:1080
1a79b2f1
JX
24489msgid ""
24490"If the patch applies cleanly, the edited hunk will immediately be\n"
24491"marked for applying."
24492msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
24493
d13389bf
JX
24494#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
24495#: git-add--interactive.perl:1077
1a79b2f1
JX
24496msgid ""
24497"If the patch applies cleanly, the edited hunk will immediately be\n"
24498"marked for discarding."
24499msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
24500
d13389bf 24501#: git-add--interactive.perl:1114
1a79b2f1
JX
24502#, perl-format
24503msgid "failed to open hunk edit file for writing: %s"
c1ac5258 24504msgstr "为写入打开块编辑文件失败:%s"
1a79b2f1 24505
d13389bf 24506#: git-add--interactive.perl:1121
1a79b2f1
JX
24507#, perl-format
24508msgid ""
24509"---\n"
24510"To remove '%s' lines, make them ' ' lines (context).\n"
24511"To remove '%s' lines, delete them.\n"
24512"Lines starting with %s will be removed.\n"
24513msgstr ""
24514"---\n"
24515"要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
24516"要删除 '%s' 开始的行,删除它们。\n"
24517"以 %s 开始的行将被删除。\n"
24518
d13389bf 24519#: git-add--interactive.perl:1143
1a79b2f1
JX
24520#, perl-format
24521msgid "failed to open hunk edit file for reading: %s"
24522msgstr "无法读取块编辑文件:%s"
24523
d13389bf 24524#: git-add--interactive.perl:1251
1a79b2f1
JX
24525msgid ""
24526"y - stage this hunk\n"
24527"n - do not stage this hunk\n"
24528"q - quit; do not stage this hunk or any of the remaining ones\n"
24529"a - stage this hunk and all later hunks in the file\n"
24530"d - do not stage this hunk or any of the later hunks in the file"
24531msgstr ""
24532"y - 暂存该块\n"
24533"n - 不要暂存该块\n"
24534"q - 退出。不暂存该块及后面的全部块\n"
24535"a - 暂存该块和本文件中后面的全部块\n"
24536"d - 不暂存该块和本文件中后面的全部块"
24537
d13389bf 24538#: git-add--interactive.perl:1257
1a79b2f1
JX
24539msgid ""
24540"y - stash this hunk\n"
24541"n - do not stash this hunk\n"
24542"q - quit; do not stash this hunk or any of the remaining ones\n"
24543"a - stash this hunk and all later hunks in the file\n"
24544"d - do not stash this hunk or any of the later hunks in the file"
24545msgstr ""
24546"y - 贮藏该块\n"
24547"n - 不要贮藏该块\n"
24548"q - 退出。不贮藏该块及后面的全部块\n"
24549"a - 贮藏该块和本文件中后面的全部块\n"
24550"d - 不贮藏该块和本文件中后面的全部块"
24551
d13389bf 24552#: git-add--interactive.perl:1263
1a79b2f1
JX
24553msgid ""
24554"y - unstage this hunk\n"
24555"n - do not unstage this hunk\n"
24556"q - quit; do not unstage this hunk or any of the remaining ones\n"
24557"a - unstage this hunk and all later hunks in the file\n"
24558"d - do not unstage this hunk or any of the later hunks in the file"
24559msgstr ""
24560"y - 不暂存该块\n"
24561"n - 不要不暂存该块\n"
24562"q - 退出。不要不暂存该块及后面的全部块\n"
24563"a - 不暂存该块和本文件中后面的全部块\n"
24564"d - 不要不暂存该块和本文件中后面的全部块"
24565
d13389bf 24566#: git-add--interactive.perl:1269
1a79b2f1
JX
24567msgid ""
24568"y - apply this hunk to index\n"
24569"n - do not apply this hunk to index\n"
24570"q - quit; do not apply this hunk or any of the remaining ones\n"
24571"a - apply this hunk and all later hunks in the file\n"
24572"d - do not apply this hunk or any of the later hunks in the file"
24573msgstr ""
24574"y - 在索引中应用该块\n"
24575"n - 不要在索引中应用该块\n"
24576"q - 退出。不要应用该块及后面的全部块\n"
24577"a - 应用该块和本文件中后面的全部块\n"
24578"d - 不要应用该块和本文件中后面的全部块"
24579
d13389bf 24580#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
1a79b2f1
JX
24581msgid ""
24582"y - discard this hunk from worktree\n"
24583"n - do not discard this hunk from worktree\n"
24584"q - quit; do not discard this hunk or any of the remaining ones\n"
24585"a - discard this hunk and all later hunks in the file\n"
24586"d - do not discard this hunk or any of the later hunks in the file"
24587msgstr ""
24588"y - 在工作区中丢弃该块\n"
24589"n - 不要在工作区中丢弃该块\n"
24590"q - 退出。不要丢弃该块及后面的全部块\n"
24591"a - 丢弃该块和本文件中后面的全部块\n"
24592"d - 不要丢弃该块和本文件中后面的全部块"
24593
d13389bf 24594#: git-add--interactive.perl:1281
1a79b2f1
JX
24595msgid ""
24596"y - discard this hunk from index and worktree\n"
24597"n - do not discard this hunk from index and worktree\n"
24598"q - quit; do not discard this hunk or any of the remaining ones\n"
24599"a - discard this hunk and all later hunks in the file\n"
24600"d - do not discard this hunk or any of the later hunks in the file"
24601msgstr ""
24602"y - 在索引和工作区中丢弃该块\n"
24603"n - 不要在索引和工作区中丢弃该块\n"
24604"q - 退出。不要丢弃该块及后面的全部块\n"
24605"a - 丢弃该块和本文件中后面的全部块\n"
24606"d - 不要丢弃该块和本文件中后面的全部块"
24607
d13389bf 24608#: git-add--interactive.perl:1287
1a79b2f1
JX
24609msgid ""
24610"y - apply this hunk to index and worktree\n"
24611"n - do not apply this hunk to index and worktree\n"
24612"q - quit; do not apply this hunk or any of the remaining ones\n"
24613"a - apply this hunk and all later hunks in the file\n"
24614"d - do not apply this hunk or any of the later hunks in the file"
24615msgstr ""
24616"y - 在索引和工作区中应用该块\n"
24617"n - 不要在索引和工作区中应用该块\n"
24618"q - 退出。不要应用该块及后面的全部块\n"
24619"a - 应用该块和本文件中后面的全部块\n"
24620"d - 不要应用该块和本文件中后面的全部块"
24621
d13389bf 24622#: git-add--interactive.perl:1299
a6cd2cc4
JX
24623msgid ""
24624"y - apply this hunk to worktree\n"
24625"n - do not apply this hunk to worktree\n"
24626"q - quit; do not apply this hunk or any of the remaining ones\n"
24627"a - apply this hunk and all later hunks in the file\n"
24628"d - do not apply this hunk or any of the later hunks in the file"
24629msgstr ""
24630"y - 在工作区中应用该块\n"
24631"n - 不要在工作区中应用该块\n"
24632"q - 退出。不要应用该块及后面的全部块\n"
24633"a - 应用该块和本文件中后面的全部块\n"
24634"d - 不要应用该块和本文件中后面的全部块"
24635
d13389bf 24636#: git-add--interactive.perl:1314
1a79b2f1
JX
24637msgid ""
24638"g - select a hunk to go to\n"
24639"/ - search for a hunk matching the given regex\n"
24640"j - leave this hunk undecided, see next undecided hunk\n"
24641"J - leave this hunk undecided, see next hunk\n"
24642"k - leave this hunk undecided, see previous undecided hunk\n"
24643"K - leave this hunk undecided, see previous hunk\n"
24644"s - split the current hunk into smaller hunks\n"
24645"e - manually edit the current hunk\n"
24646"? - print help\n"
24647msgstr ""
24648"g - 选择跳转到一个块\n"
24649"/ - 查找和给定正则表达式匹配的块\n"
24650"j - 维持该块未决状态,查看下一个未决块\n"
24651"J - 维持该块未决状态,查看下一个块\n"
24652"k - 维持该块未决状态,查看上一个未决块\n"
24653"K - 维持该块未决状态,查看上一个块\n"
24654"s - 拆分当前块为更小的块\n"
24655"e - 手动编辑当前块\n"
24656"? - 显示帮助\n"
24657
d13389bf 24658#: git-add--interactive.perl:1345
1a79b2f1
JX
24659msgid "The selected hunks do not apply to the index!\n"
24660msgstr "选中的块不能应用到索引!\n"
24661
d13389bf 24662#: git-add--interactive.perl:1360
1a79b2f1
JX
24663#, perl-format
24664msgid "ignoring unmerged: %s\n"
24665msgstr "忽略未合入的:%s\n"
24666
d13389bf 24667#: git-add--interactive.perl:1479
a6cd2cc4
JX
24668#, perl-format
24669msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
24670msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
24671
d13389bf 24672#: git-add--interactive.perl:1480
a6cd2cc4
JX
24673#, perl-format
24674msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
24675msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
24676
d13389bf 24677#: git-add--interactive.perl:1481
7157c2b5
JX
24678#, perl-format
24679msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
24680msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? "
24681
d13389bf 24682#: git-add--interactive.perl:1482
a6cd2cc4
JX
24683#, perl-format
24684msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
24685msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
24686
d13389bf 24687#: git-add--interactive.perl:1599
31e5e17b
JX
24688msgid "No other hunks to goto\n"
24689msgstr "没有其它可供跳转的块\n"
1a79b2f1 24690
d13389bf 24691#: git-add--interactive.perl:1617
1a79b2f1
JX
24692#, perl-format
24693msgid "Invalid number: '%s'\n"
24694msgstr "无效数字:'%s'\n"
24695
d13389bf 24696#: git-add--interactive.perl:1622
1a79b2f1
JX
24697#, perl-format
24698msgid "Sorry, only %d hunk available.\n"
24699msgid_plural "Sorry, only %d hunks available.\n"
24700msgstr[0] "对不起,只有 %d 个可用块。\n"
24701msgstr[1] "对不起,只有 %d 个可用块。\n"
24702
d13389bf 24703#: git-add--interactive.perl:1657
31e5e17b
JX
24704msgid "No other hunks to search\n"
24705msgstr "没有其它可供查找的块\n"
24706
d13389bf 24707#: git-add--interactive.perl:1674
1a79b2f1
JX
24708#, perl-format
24709msgid "Malformed search regexp %s: %s\n"
24710msgstr "错误的正则表达式 %s:%s\n"
24711
d13389bf 24712#: git-add--interactive.perl:1684
1a79b2f1 24713msgid "No hunk matches the given pattern\n"
ddc12c42 24714msgstr "没有和给定模式相匹配的块\n"
1a79b2f1 24715
d13389bf 24716#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
1a79b2f1
JX
24717msgid "No previous hunk\n"
24718msgstr "没有前一个块\n"
24719
d13389bf 24720#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
1a79b2f1
JX
24721msgid "No next hunk\n"
24722msgstr "没有下一个块\n"
24723
d13389bf 24724#: git-add--interactive.perl:1730
31e5e17b
JX
24725msgid "Sorry, cannot split this hunk\n"
24726msgstr "对不起,不能拆分这个块\n"
24727
d13389bf 24728#: git-add--interactive.perl:1736
1a79b2f1
JX
24729#, perl-format
24730msgid "Split into %d hunk.\n"
24731msgid_plural "Split into %d hunks.\n"
24732msgstr[0] "拆分为 %d 块。\n"
24733msgstr[1] "拆分为 %d 块。\n"
24734
d13389bf 24735#: git-add--interactive.perl:1746
31e5e17b
JX
24736msgid "Sorry, cannot edit this hunk\n"
24737msgstr "对不起,不能编辑这个块\n"
24738
1a79b2f1
JX
24739#. TRANSLATORS: please do not translate the command names
24740#. 'status', 'update', 'revert', etc.
d13389bf 24741#: git-add--interactive.perl:1811
1a79b2f1
JX
24742msgid ""
24743"status - show paths with changes\n"
24744"update - add working tree state to the staged set of changes\n"
24745"revert - revert staged set of changes back to the HEAD version\n"
24746"patch - pick hunks and update selectively\n"
87cb7997 24747"diff - view diff between HEAD and index\n"
1a79b2f1
JX
24748"add untracked - add contents of untracked files to the staged set of "
24749"changes\n"
24750msgstr ""
24751"status - 显示含变更的路径\n"
24752"update - 添加工作区状态至暂存列表\n"
24753"revert - 还原修改的暂存集至 HEAD 版本\n"
24754"patch - 挑选块并且有选择地更新\n"
24755"diff - 显示 HEAD 和索引间差异\n"
24756"add untracked - 添加未跟踪文件的内容至暂存列表\n"
24757
d13389bf
JX
24758#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
24759#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
24760#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
24761#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
1a79b2f1
JX
24762msgid "missing --"
24763msgstr "缺失 --"
24764
d13389bf 24765#: git-add--interactive.perl:1866
1a79b2f1
JX
24766#, perl-format
24767msgid "unknown --patch mode: %s"
24768msgstr "未知的 --patch 模式:%s"
24769
d13389bf 24770#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
1a79b2f1
JX
24771#, perl-format
24772msgid "invalid argument %s, expecting --"
24773msgstr "无效的参数 %s,期望是 --"
24774
4c27fcb5 24775#: git-send-email.perl:138
1a79b2f1
JX
24776msgid "local zone differs from GMT by a non-minute interval\n"
24777msgstr "本地时间和 GMT 有不到一分钟间隔\n"
24778
4c27fcb5 24779#: git-send-email.perl:145 git-send-email.perl:151
1a79b2f1
JX
24780msgid "local time offset greater than or equal to 24 hours\n"
24781msgstr "本地时间偏移量大于等于 24 小时\n"
24782
a6cd2cc4 24783#: git-send-email.perl:223 git-send-email.perl:229
1a79b2f1
JX
24784msgid "the editor exited uncleanly, aborting everything"
24785msgstr "编辑器非正常退出,终止所有操作"
24786
d9488fea 24787#: git-send-email.perl:312
1a79b2f1
JX
24788#, perl-format
24789msgid ""
24790"'%s' contains an intermediate version of the email you were composing.\n"
24791msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
24792
d9488fea 24793#: git-send-email.perl:317
1a79b2f1
JX
24794#, perl-format
24795msgid "'%s.final' contains the composed email.\n"
24796msgstr "'%s.final' 包含编辑的邮件。\n"
24797
d9488fea 24798#: git-send-email.perl:410
1a79b2f1
JX
24799msgid "--dump-aliases incompatible with other options\n"
24800msgstr "--dump-aliases 和其它选项不兼容\n"
24801
d9488fea
JX
24802#: git-send-email.perl:484
24803msgid ""
24804"fatal: found configuration options for 'sendmail'\n"
24805"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
24806"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
24807msgstr ""
24808"致命错误:发现 'sendmail' 配置选项\n"
24809"git-send-email 通过 sendemail.* 选项进行设置,注意字母 'e'。\n"
24810"设置 sendemail.forbidSendmailVariables 为 false 来禁用这项检查。\n"
24811
24812#: git-send-email.perl:489 git-send-email.perl:691
1a79b2f1
JX
24813msgid "Cannot run git format-patch from outside a repository\n"
24814msgstr "不能在仓库之外运行 git format-patch\n"
24815
d9488fea 24816#: git-send-email.perl:492
31e5e17b
JX
24817msgid ""
24818"`batch-size` and `relogin` must be specified together (via command-line or "
24819"configuration option)\n"
24820msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n"
24821
d9488fea 24822#: git-send-email.perl:505
1a79b2f1
JX
24823#, perl-format
24824msgid "Unknown --suppress-cc field: '%s'\n"
24825msgstr "未知的 --suppress-cc 字段:'%s'\n"
24826
d9488fea 24827#: git-send-email.perl:536
1a79b2f1
JX
24828#, perl-format
24829msgid "Unknown --confirm setting: '%s'\n"
24830msgstr "未知的 --confirm 设置:'%s'\n"
24831
d9488fea 24832#: git-send-email.perl:564
1a79b2f1
JX
24833#, perl-format
24834msgid "warning: sendmail alias with quotes is not supported: %s\n"
24835msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
24836
d9488fea 24837#: git-send-email.perl:566
1a79b2f1
JX
24838#, perl-format
24839msgid "warning: `:include:` not supported: %s\n"
24840msgstr "警告:不支持 `:include:`:%s\n"
24841
d9488fea 24842#: git-send-email.perl:568
1a79b2f1
JX
24843#, perl-format
24844msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
24845msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
24846
d9488fea 24847#: git-send-email.perl:573
1a79b2f1
JX
24848#, perl-format
24849msgid "warning: sendmail line is not recognized: %s\n"
24850msgstr "警告:不能识别的 sendmail 行:%s\n"
24851
d9488fea 24852#: git-send-email.perl:657
1a79b2f1
JX
24853#, perl-format
24854msgid ""
24855"File '%s' exists but it could also be the range of commits\n"
24856"to produce patches for. Please disambiguate by...\n"
24857"\n"
24858" * Saying \"./%s\" if you mean a file; or\n"
24859" * Giving --format-patch option if you mean a range.\n"
24860msgstr ""
87cb7997
JX
24861"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
24862"歧义:\n"
1a79b2f1
JX
24863"\n"
24864" * 如果含义为一个文件,使用 \"./%s\",或者\n"
24865" * 如果含义为一个范围,使用 --format-patch 选项。\n"
24866
d9488fea 24867#: git-send-email.perl:678
1a79b2f1
JX
24868#, perl-format
24869msgid "Failed to opendir %s: %s"
24870msgstr "无法打开目录 %s: %s"
24871
d9488fea 24872#: git-send-email.perl:702
1a79b2f1
JX
24873#, perl-format
24874msgid ""
24875"fatal: %s: %s\n"
24876"warning: no patches were sent\n"
24877msgstr ""
06991777 24878"致命错误:%s:%s\n"
1a79b2f1
JX
24879"警告:补丁未能发送\n"
24880
d9488fea 24881#: git-send-email.perl:713
1a79b2f1
JX
24882msgid ""
24883"\n"
24884"No patch files specified!\n"
24885"\n"
87cb7997
JX
24886msgstr ""
24887"\n"
24888"未指定补丁文件!\n"
24889"\n"
1a79b2f1 24890
d9488fea 24891#: git-send-email.perl:726
1a79b2f1
JX
24892#, perl-format
24893msgid "No subject line in %s?"
24894msgstr "在 %s 中没有标题行?"
24895
d9488fea 24896#: git-send-email.perl:736
1a79b2f1
JX
24897#, perl-format
24898msgid "Failed to open for writing %s: %s"
c1ac5258 24899msgstr "为写入打开 %s 失败: %s"
1a79b2f1 24900
d9488fea 24901#: git-send-email.perl:747
1a79b2f1
JX
24902msgid ""
24903"Lines beginning in \"GIT:\" will be removed.\n"
24904"Consider including an overall diffstat or table of contents\n"
24905"for the patch you are writing.\n"
24906"\n"
24907"Clear the body content if you don't wish to send a summary.\n"
24908msgstr ""
24909"以 \"GIT:\" 开头的行将被删除。\n"
5b533632 24910"考虑包含一个整体的差异统计或者您正在写的补丁的目录。\n"
1a79b2f1
JX
24911"\n"
24912"如果您不想发送摘要,清除内容。\n"
24913
d9488fea 24914#: git-send-email.perl:771
1a79b2f1
JX
24915#, perl-format
24916msgid "Failed to open %s: %s"
24917msgstr "无法打开 %s: %s"
24918
d9488fea 24919#: git-send-email.perl:788
31e5e17b
JX
24920#, perl-format
24921msgid "Failed to open %s.final: %s"
24922msgstr "无法打开 %s.final: %s"
1a79b2f1 24923
d9488fea 24924#: git-send-email.perl:831
1a79b2f1
JX
24925msgid "Summary email is empty, skipping it\n"
24926msgstr "摘要邮件为空,跳过\n"
24927
24928#. TRANSLATORS: please keep [y/N] as is.
d9488fea 24929#: git-send-email.perl:866
1a79b2f1
JX
24930#, perl-format
24931msgid "Are you sure you want to use <%s> [y/N]? "
24932msgstr "您确认要使用 <%s> [y/N]?"
24933
d9488fea 24934#: git-send-email.perl:921
1a79b2f1
JX
24935msgid ""
24936"The following files are 8bit, but do not declare a Content-Transfer-"
24937"Encoding.\n"
24938msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
24939
d9488fea 24940#: git-send-email.perl:926
1a79b2f1
JX
24941msgid "Which 8bit encoding should I declare [UTF-8]? "
24942msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?"
24943
d9488fea 24944#: git-send-email.perl:934
1a79b2f1
JX
24945#, perl-format
24946msgid ""
24947"Refusing to send because the patch\n"
24948"\t%s\n"
24949"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
24950"want to send.\n"
24951msgstr ""
24952"拒绝发送,因为补丁\n"
24953"\t%s\n"
24954"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
24955
d9488fea 24956#: git-send-email.perl:953
1a79b2f1
JX
24957msgid "To whom should the emails be sent (if anyone)?"
24958msgstr "邮件将要发送给谁?"
24959
d9488fea 24960#: git-send-email.perl:971
1a79b2f1
JX
24961#, perl-format
24962msgid "fatal: alias '%s' expands to itself\n"
06991777 24963msgstr "致命错误:别名 '%s' 扩展为它自己\n"
1a79b2f1 24964
d9488fea 24965#: git-send-email.perl:983
1a79b2f1
JX
24966msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
24967msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?"
24968
d9488fea 24969#: git-send-email.perl:1041 git-send-email.perl:1049
1a79b2f1
JX
24970#, perl-format
24971msgid "error: unable to extract a valid address from: %s\n"
24972msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
24973
24974#. TRANSLATORS: Make sure to include [q] [d] [e] in your
24975#. translation. The program will only accept English input
24976#. at this point.
d9488fea 24977#: git-send-email.perl:1053
1a79b2f1
JX
24978msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
24979msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):"
24980
d9488fea 24981#: git-send-email.perl:1370
1a79b2f1
JX
24982#, perl-format
24983msgid "CA path \"%s\" does not exist"
24984msgstr "CA 路径 \"%s\" 不存在"
24985
d9488fea 24986#: git-send-email.perl:1453
1a79b2f1
JX
24987msgid ""
24988" The Cc list above has been expanded by additional\n"
24989" addresses found in the patch commit message. By default\n"
24990" send-email prompts before sending whenever this occurs.\n"
24991" This behavior is controlled by the sendemail.confirm\n"
24992" configuration setting.\n"
24993"\n"
24994" For additional information, run 'git send-email --help'.\n"
24995" To retain the current behavior, but squelch this message,\n"
24996" run 'git config --global sendemail.confirm auto'.\n"
24997"\n"
24998msgstr ""
24999" 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n"
25000" 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
25001" sendemail.confirm 配置设置。\n"
25002"\n"
25003" 更多信息,执行 'git send-email --help'。\n"
25004" 要保持当前行为,但不显示此信息,运行 'git config --global\n"
25005" sendemail.confirm auto'。\n"
25006"\n"
25007
fd8cb379 25008#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
1a79b2f1
JX
25009#. translation. The program will only accept English input
25010#. at this point.
d9488fea 25011#: git-send-email.perl:1468
fd8cb379
JX
25012msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
25013msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
1a79b2f1 25014
d9488fea 25015#: git-send-email.perl:1471
1a79b2f1
JX
25016msgid "Send this email reply required"
25017msgstr "发送要求的邮件回复"
25018
d9488fea 25019#: git-send-email.perl:1499
1a79b2f1
JX
25020msgid "The required SMTP server is not properly defined."
25021msgstr "要求的 SMTP 服务器未被正确定义。"
25022
d9488fea 25023#: git-send-email.perl:1546
1a79b2f1
JX
25024#, perl-format
25025msgid "Server does not support STARTTLS! %s"
25026msgstr "服务器不支持 STARTTLS!%s"
25027
d9488fea 25028#: git-send-email.perl:1551 git-send-email.perl:1555
a4f16749
JX
25029#, perl-format
25030msgid "STARTTLS failed! %s"
25031msgstr "STARTTLS 失败!%s"
25032
d9488fea 25033#: git-send-email.perl:1564
1a79b2f1
JX
25034msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
25035msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
25036
d9488fea 25037#: git-send-email.perl:1582
1a79b2f1
JX
25038#, perl-format
25039msgid "Failed to send %s\n"
25040msgstr "无法发送 %s\n"
25041
d9488fea 25042#: git-send-email.perl:1585
1a79b2f1
JX
25043#, perl-format
25044msgid "Dry-Sent %s\n"
25045msgstr "演习发送 %s\n"
25046
d9488fea 25047#: git-send-email.perl:1585
1a79b2f1
JX
25048#, perl-format
25049msgid "Sent %s\n"
25050msgstr "正发送 %s\n"
25051
d9488fea 25052#: git-send-email.perl:1587
1a79b2f1
JX
25053msgid "Dry-OK. Log says:\n"
25054msgstr "演习成功。日志说:\n"
25055
d9488fea 25056#: git-send-email.perl:1587
1a79b2f1
JX
25057msgid "OK. Log says:\n"
25058msgstr "OK。日志说:\n"
25059
d9488fea 25060#: git-send-email.perl:1599
1a79b2f1
JX
25061msgid "Result: "
25062msgstr "结果:"
25063
d9488fea 25064#: git-send-email.perl:1602
1a79b2f1
JX
25065msgid "Result: OK\n"
25066msgstr "结果:OK\n"
25067
d9488fea 25068#: git-send-email.perl:1620
1a79b2f1
JX
25069#, perl-format
25070msgid "can't open file %s"
25071msgstr "无法打开文件 %s"
25072
d9488fea 25073#: git-send-email.perl:1667 git-send-email.perl:1687
1a79b2f1
JX
25074#, perl-format
25075msgid "(mbox) Adding cc: %s from line '%s'\n"
25076msgstr "(mbox) 添加 cc:%s 自行 '%s'\n"
25077
d9488fea 25078#: git-send-email.perl:1673
1a79b2f1
JX
25079#, perl-format
25080msgid "(mbox) Adding to: %s from line '%s'\n"
25081msgstr "(mbox) 添加 to:%s 自行 '%s'\n"
25082
d9488fea 25083#: git-send-email.perl:1730
1a79b2f1
JX
25084#, perl-format
25085msgid "(non-mbox) Adding cc: %s from line '%s'\n"
25086msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n"
25087
d9488fea 25088#: git-send-email.perl:1765
1a79b2f1
JX
25089#, perl-format
25090msgid "(body) Adding cc: %s from line '%s'\n"
25091msgstr "(body) 添加 cc: %s 自行 '%s'\n"
25092
d9488fea 25093#: git-send-email.perl:1876
1a79b2f1
JX
25094#, perl-format
25095msgid "(%s) Could not execute '%s'"
25096msgstr "(%s) 不能执行 '%s'"
25097
d9488fea 25098#: git-send-email.perl:1883
1a79b2f1
JX
25099#, perl-format
25100msgid "(%s) Adding %s: %s from: '%s'\n"
25101msgstr "(%s) 添加 %s: %s 自:'%s'\n"
25102
d9488fea 25103#: git-send-email.perl:1887
1a79b2f1
JX
25104#, perl-format
25105msgid "(%s) failed to close pipe to '%s'"
25106msgstr "(%s) 无法关闭管道至 '%s'"
25107
d9488fea 25108#: git-send-email.perl:1917
1a79b2f1
JX
25109msgid "cannot send message as 7bit"
25110msgstr "不能以 7bit 形式发送信息"
25111
d9488fea 25112#: git-send-email.perl:1925
1a79b2f1
JX
25113msgid "invalid transfer encoding"
25114msgstr "无效的传送编码"
25115
d9488fea 25116#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028
1a79b2f1
JX
25117#, perl-format
25118msgid "unable to open %s: %s\n"
25119msgstr "不能打开 %s:%s\n"
25120
d9488fea 25121#: git-send-email.perl:1969
1a79b2f1
JX
25122#, perl-format
25123msgid "%s: patch contains a line longer than 998 characters"
25124msgstr "%s:补丁包含一个超过 998 字符的行"
25125
d9488fea 25126#: git-send-email.perl:1986
1a79b2f1
JX
25127#, perl-format
25128msgid "Skipping %s with backup suffix '%s'.\n"
25129msgstr "略过 %s 含备份后缀 '%s'。\n"
25130
25131#. TRANSLATORS: please keep "[y|N]" as is.
d9488fea 25132#: git-send-email.perl:1990
1a79b2f1
JX
25133#, perl-format
25134msgid "Do you really want to send %s? [y|N]: "
25135msgstr "您真的要发送 %s?[y|N]:"