l10n: zh_CN: for git v2.24.0 l10n round 1~2
[thirdparty/git.git] / po / zh_CN.po
CommitLineData
c04f5ac3
JX
1# Chinese translations for Git package
2# Git 软件包的简体中文翻译.
07432cef 3# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
c04f5ac3 4# This file is distributed under the same license as the Git package.
814ff314 5# Contributors:
5b533632 6# - Fangyi Zhou <me AT fangyi.io>
c04f5ac3 7# - Jiang Xin <worldhello.net AT gmail.com>
bbdf0acc
JX
8# - Lian Cheng <rhythm.mail AT gmail.com>
9# - Ray Chen <oldsharp AT gmail.com>
c04f5ac3 10# - Riku <lu.riku AT gmail.com>
bbdf0acc
JX
11# - Thynson <lanxingcan AT gmail.com>
12# - ws3389 <willsmith3389 AT gmail.com>
13# - Wang Sheng <wangsheng2008love AT 163.com>
554e8501 14# - 依云 <lilydjwg AT gmail.com>
bbdf0acc 15# - Yichao Yu <yyc1992 AT gmail.com>
c04f5ac3 16# - Zhuang Ya <zhuangya AT me.com>
c04f5ac3 17#
160fb2b2
JX
18# Git glossary for Chinese translators
19#
20# English | Chinese
21# ---------------------------------+--------------------------------------
22# 3-way merge | 三方合并
23# abbreviate | 简写(的 SHA-1 值)
24# alternate object database | 备用对象库
25# amend | 修补
26# ancestor | 祖先,祖先提交
27# annotated tag | 附注标签
28# bare repository | 纯仓库
29# bisect | 二分查找
30# blob object | 数据对象
31# branch | 分支
32# bundle | 包
33# bypass | 绕过
34# cache | 索引(的别称)
35# chain | (提交)链
36# changeset | 变更集
37# checkout | 检出
38# checksum | 校验,校验和
39# cherry-picking | 拣选
40# clean | 干净(的工作区)
41# clone | 克隆
42# commit | 提交
667599e8 43# commit message | 提交说明
160fb2b2
JX
44# commit object | 提交对象
45# commit-ish (also committish) | 提交号
46# conflict | 冲突
47# core Git | 核心 Git 工具
d46c5519 48# cover letter | 附函
160fb2b2 49# DAG | 有向无环图
e640d114 50# dangling object | 悬空对象
160fb2b2
JX
51# detached HEAD | 分离头指针
52# directory | 目录
53# dirty | 脏(的工作区)
755c831b 54# dumb HTTP protocol | 哑 HTTP 协议
160fb2b2
JX
55# evil merge | 坏合并(合并引入了父提交没有的修改)
56# fast-forward | 快进
57# fetch | 获取
58# file system | 文件系统
e397e7e3 59# fork | 派生
160fb2b2
JX
60# Git archive | 仓库(对于 arch 用户)
61# gitfile | gitfile(仓库链接文件)
fd8cb379 62# grafts | (提交)移植
160fb2b2
JX
63# hash | 哈希值
64# HEAD | HEAD(头指针,亦即当前分支)
65# head | 头、分支
66# head ref | 分支
67# header | 头信息
68# hook | 钩子
69# hunk | 补丁片段
70# index | 索引
71# index entry | 索引条目
72# loose object | 松散对象
73# loose refs | 松散引用
74# master | master(默认分支名)
75# merge | 合并
76# object | 对象
77# object database | 对象库
78# object identifier | 对象标识符
79# object name | 对象名称
80# object type | 对象类型
81# octopus | 章鱼式合并(两分支以上的合并)
82# origin | origin(默认的远程名称)
83# pack | 包
84# pack index | 包索引
85# packfile | 包文件
86# parent | 父提交
87# patch | 补丁
88# pathspec | 路径规格
89# pattern | 模式
12e59059 90# pickaxe | 挖掘
160fb2b2
JX
91# plumbing | 管件(Git 底层核心命令的别称)
92# porcelain | 瓷件(Git 上层封装命令的别称)
94550ed3 93# precious-objects repo | 珍品仓库
160fb2b2
JX
94# prune | 清除
95# pull | 拉,拉取
96# push | 推,推送
97# reachable | 可达
98# rebase | 变基
99# ref | 引用
100# reflog | 引用日志
101# refspec | 引用规格
102# remote | 远程,远程仓库
103# remote-tracking branch | 远程跟踪分支
104# replay | 重放
105# repo | 仓库
106# repository | 仓库
107# resolve | (冲突)解决
108# revert | 还原
109# revision | 版本
110# rewind | 回退
111# SCM | 源代码管理(工具)
ee7589bb 112# SHA-1 | SHA-1(安全哈希算法1)
160fb2b2
JX
113# shallow repository | 浅(克隆)仓库
114# signed tag | 签名标签
755c831b 115# smart HTTP protocol | 智能 HTTP 协议
160fb2b2
JX
116# squash | 压缩
117# stage | n. 暂存区(即索引); v. 暂存
a4f16749 118# stash | n. 贮藏区; v. 贮藏
160fb2b2
JX
119# submodule | 子模组
120# symref | 符号引用
933c015e 121# tag | n. 标签; v. 打标签
160fb2b2
JX
122# tag object | 标签对象
123# tagger | 打标签者
124# topic branch | 主题分支
125# track | 跟踪
6937cb4e 126# trailer | 尾部署名
160fb2b2
JX
127# tree | 树(工作区或树对象)
128# tree object | 树对象
129# tree-ish (also treeish) | 树对象(或可以解析为一树对象)
130# unmerged index | 未合并索引
131# unpack | 解包
132# unreachable object | 不可达对象
133# unstage | 取消暂存
134# upstream | 上游
135# upstream branch | 上游分支
136# working tree | 工作区
137#
c04f5ac3
JX
138msgid ""
139msgstr ""
140"Project-Id-Version: Git\n"
141"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
a5cd71ca
JX
142"POT-Creation-Date: 2019-10-28 13:19+0800\n"
143"PO-Revision-Date: 2019-10-30 14:58+0800\n"
c04f5ac3 144"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
7aea43ff 145"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
c04f5ac3
JX
146"Language: zh_CN\n"
147"MIME-Version: 1.0\n"
148"Content-Type: text/plain; charset=UTF-8\n"
149"Content-Transfer-Encoding: 8bit\n"
5ae481e0 150"Plural-Forms: nplurals=2; plural=(n != 1);\n"
c04f5ac3 151
a6cd2cc4 152#: advice.c:109
c04f5ac3 153#, c-format
fd8cb379
JX
154msgid "%shint: %.*s%s\n"
155msgstr "%s提示:%.*s%s\n"
c04f5ac3 156
a6cd2cc4 157#: advice.c:162
5c57d762
JX
158msgid "Cherry-picking is not possible because you have unmerged files."
159msgstr "无法拣选,因为您有未合并的文件。"
160
a6cd2cc4 161#: advice.c:164
5c57d762
JX
162msgid "Committing is not possible because you have unmerged files."
163msgstr "无法提交,因为您有未合并的文件。"
164
a6cd2cc4 165#: advice.c:166
5c57d762
JX
166msgid "Merging is not possible because you have unmerged files."
167msgstr "无法合并,因为您有未合并的文件。"
168
a6cd2cc4 169#: advice.c:168
5c57d762
JX
170msgid "Pulling is not possible because you have unmerged files."
171msgstr "无法拉取,因为您有未合并的文件。"
172
a6cd2cc4 173#: advice.c:170
5c57d762
JX
174msgid "Reverting is not possible because you have unmerged files."
175msgstr "无法回退,因为您有未合并的文件。"
176
a6cd2cc4 177#: advice.c:172
5c57d762
JX
178#, c-format
179msgid "It is not possible to %s because you have unmerged files."
180msgstr "无法 %s,因为您有未合并的文件。"
181
a6cd2cc4 182#: advice.c:180
c04f5ac3 183msgid ""
6acbf033 184"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 185"as appropriate to mark resolution and make a commit."
c04f5ac3 186msgstr ""
d9d56b23 187"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
220c313c 188"解决方案并提交。"
c04f5ac3 189
a6cd2cc4 190#: advice.c:188
5c57d762
JX
191msgid "Exiting because of an unresolved conflict."
192msgstr "因为存在未解决的冲突而退出。"
193
a5cd71ca 194#: advice.c:193 builtin/merge.c:1332
1b7f4a34
JX
195msgid "You have not concluded your merge (MERGE_HEAD exists)."
196msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
197
a6cd2cc4 198#: advice.c:195
94550ed3 199msgid "Please, commit your changes before merging."
1b7f4a34
JX
200msgstr "请在合并前先提交您的修改。"
201
a6cd2cc4 202#: advice.c:196
1b7f4a34
JX
203msgid "Exiting because of unfinished merge."
204msgstr "因为存在未完成的合并而退出。"
205
a6cd2cc4 206#: advice.c:202
5c57d762
JX
207#, c-format
208msgid ""
a6cd2cc4 209"Note: switching to '%s'.\n"
5c57d762
JX
210"\n"
211"You are in 'detached HEAD' state. You can look around, make experimental\n"
212"changes and commit them, and you can discard any commits you make in this\n"
a6cd2cc4 213"state without impacting any branches by switching back to a branch.\n"
5c57d762
JX
214"\n"
215"If you want to create a new branch to retain commits you create, you may\n"
a6cd2cc4 216"do so (now or later) by using -c with the switch command. Example:\n"
5c57d762 217"\n"
a6cd2cc4
JX
218" git switch -c <new-branch-name>\n"
219"\n"
220"Or undo this operation with:\n"
221"\n"
222" git switch -\n"
223"\n"
224"Turn off this advice by setting config variable advice.detachedHead to "
225"false\n"
5c57d762
JX
226"\n"
227msgstr ""
a6cd2cc4
JX
228"注意:正在切换到 '%s'。\n"
229"\n"
230"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以在切换\n"
231"回一个分支时,丢弃在此状态下所做的提交而不对分支造成影响。\n"
5c57d762 232"\n"
a6cd2cc4
JX
233"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在 switch 命令\n"
234"中添加参数 -c 来实现(现在或稍后)。例如:\n"
5c57d762 235"\n"
a6cd2cc4 236" git switch -c <新分支名>\n"
5c57d762 237"\n"
a6cd2cc4
JX
238"或者撤销此操作:\n"
239"\n"
240" git switch -\n"
241"\n"
242"通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n"
5c57d762
JX
243"\n"
244
06991777
JX
245#: alias.c:50
246msgid "cmdline ends with \\"
247msgstr "命令行以 \\ 结尾"
248
249#: alias.c:51
250msgid "unclosed quote"
251msgstr "未关闭的引号"
252
a6cd2cc4 253#: apply.c:69
a0b6b246
JX
254#, c-format
255msgid "unrecognized whitespace option '%s'"
256msgstr "未能识别的空白字符选项 '%s'"
ef317cd5 257
a6cd2cc4 258#: apply.c:85
90314792 259#, c-format
a0b6b246
JX
260msgid "unrecognized whitespace ignore option '%s'"
261msgstr "未能识别的空白字符忽略选项 '%s'"
90314792 262
a6cd2cc4 263#: apply.c:135
a0b6b246 264msgid "--reject and --3way cannot be used together."
2090d5b4 265msgstr "--reject 和 --3way 不能同时使用。"
ef317cd5 266
a6cd2cc4 267#: apply.c:137
a0b6b246
JX
268msgid "--cached and --3way cannot be used together."
269msgstr "--cached 和 --3way 不能同时使用。"
ef317cd5 270
a6cd2cc4 271#: apply.c:140
a0b6b246
JX
272msgid "--3way outside a repository"
273msgstr "--3way 在一个仓库之外"
ef317cd5 274
a6cd2cc4 275#: apply.c:151
a0b6b246
JX
276msgid "--index outside a repository"
277msgstr "--index 在一个仓库之外"
ef317cd5 278
a6cd2cc4 279#: apply.c:154
a0b6b246
JX
280msgid "--cached outside a repository"
281msgstr "--cached 在一个仓库之外"
ef317cd5 282
a6cd2cc4 283#: apply.c:801
a0b6b246
JX
284#, c-format
285msgid "Cannot prepare timestamp regexp %s"
286msgstr "无法准备时间戳正则表达式 %s"
ef317cd5 287
a6cd2cc4 288#: apply.c:810
a0b6b246
JX
289#, c-format
290msgid "regexec returned %d for input: %s"
291msgstr "regexec 返回 %d,输入为:%s"
ef317cd5 292
a6cd2cc4 293#: apply.c:884
a0b6b246
JX
294#, c-format
295msgid "unable to find filename in patch at line %d"
296msgstr "不能在补丁的第 %d 行找到文件名"
ef317cd5 297
a6cd2cc4 298#: apply.c:922
a0b6b246
JX
299#, c-format
300msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
301msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
ef317cd5 302
a6cd2cc4 303#: apply.c:928
a0b6b246
JX
304#, c-format
305msgid "git apply: bad git-diff - inconsistent new filename on line %d"
306msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
ef317cd5 307
a6cd2cc4 308#: apply.c:929
a0b6b246
JX
309#, c-format
310msgid "git apply: bad git-diff - inconsistent old filename on line %d"
311msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
ef317cd5 312
a6cd2cc4 313#: apply.c:934
a0b6b246
JX
314#, c-format
315msgid "git apply: bad git-diff - expected /dev/null on line %d"
316msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
ef317cd5 317
a6cd2cc4 318#: apply.c:963
a4f16749
JX
319#, c-format
320msgid "invalid mode on line %d: %s"
321msgstr "第 %d 行包含无效文件模式:%s"
322
a6cd2cc4 323#: apply.c:1282
a4f16749
JX
324#, c-format
325msgid "inconsistent header lines %d and %d"
326msgstr "不一致的文件头,%d 行和 %d 行"
327
a5cd71ca 328#: apply.c:1372
a0b6b246
JX
329#, c-format
330msgid ""
331"git diff header lacks filename information when removing %d leading pathname "
332"component (line %d)"
333msgid_plural ""
334"git diff header lacks filename information when removing %d leading pathname "
335"components (line %d)"
336msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
337msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
ef317cd5 338
a5cd71ca 339#: apply.c:1385
a0b6b246
JX
340#, c-format
341msgid "git diff header lacks filename information (line %d)"
342msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
07432cef 343
a5cd71ca
JX
344#: apply.c:1481
345#, c-format
346msgid "recount: unexpected line: %.*s"
347msgstr "recount:意外的行:%.*s"
348
349#: apply.c:1550
350#, c-format
351msgid "patch fragment without header at line %d: %.*s"
352msgstr "第 %d 行的补丁片段没有头信息:%.*s"
353
354#: apply.c:1753
a0b6b246
JX
355msgid "new file depends on old contents"
356msgstr "新文件依赖旧内容"
5c57d762 357
a5cd71ca 358#: apply.c:1755
a0b6b246
JX
359msgid "deleted file still has contents"
360msgstr "删除的文件仍有内容"
5c57d762 361
a5cd71ca 362#: apply.c:1789
a0b6b246
JX
363#, c-format
364msgid "corrupt patch at line %d"
365msgstr "补丁在第 %d 行损坏"
5c57d762 366
a5cd71ca 367#: apply.c:1826
5c57d762 368#, c-format
a0b6b246
JX
369msgid "new file %s depends on old contents"
370msgstr "新文件 %s 依赖旧内容"
5c57d762 371
a5cd71ca 372#: apply.c:1828
5c57d762 373#, c-format
a0b6b246
JX
374msgid "deleted file %s still has contents"
375msgstr "删除的文件 %s 仍有内容"
5c57d762 376
a5cd71ca 377#: apply.c:1831
a0b6b246
JX
378#, c-format
379msgid "** warning: file %s becomes empty but is not deleted"
380msgstr "** 警告:文件 %s 成为空文件但并未删除"
ef317cd5 381
a5cd71ca 382#: apply.c:1978
5c57d762 383#, c-format
a0b6b246
JX
384msgid "corrupt binary patch at line %d: %.*s"
385msgstr "二进制补丁在第 %d 行损坏:%.*s"
5c57d762 386
a5cd71ca 387#: apply.c:2015
5c57d762 388#, c-format
a0b6b246
JX
389msgid "unrecognized binary patch at line %d"
390msgstr "未能识别的二进制补丁位于第 %d 行"
5c57d762 391
a5cd71ca 392#: apply.c:2177
5c57d762 393#, c-format
a0b6b246
JX
394msgid "patch with only garbage at line %d"
395msgstr "补丁文件的第 %d 行只有垃圾数据"
5c57d762 396
a5cd71ca 397#: apply.c:2263
5c57d762 398#, c-format
a0b6b246
JX
399msgid "unable to read symlink %s"
400msgstr "无法读取符号链接 %s"
5c57d762 401
a5cd71ca 402#: apply.c:2267
5c57d762 403#, c-format
a0b6b246
JX
404msgid "unable to open or read %s"
405msgstr "不能打开或读取 %s"
5c57d762 406
a5cd71ca 407#: apply.c:2926
5c57d762 408#, c-format
a0b6b246
JX
409msgid "invalid start of line: '%c'"
410msgstr "无效的行首字符:'%c'"
5c57d762 411
a5cd71ca 412#: apply.c:3047
5c57d762 413#, c-format
a0b6b246
JX
414msgid "Hunk #%d succeeded at %d (offset %d line)."
415msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
416msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
417msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
5c57d762 418
a5cd71ca 419#: apply.c:3059
5c57d762 420#, c-format
a0b6b246
JX
421msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
422msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
5c57d762 423
a5cd71ca 424#: apply.c:3065
5c57d762
JX
425#, c-format
426msgid ""
a0b6b246
JX
427"while searching for:\n"
428"%.*s"
5c57d762 429msgstr ""
a0b6b246
JX
430"当查询:\n"
431"%.*s"
5c57d762 432
a5cd71ca 433#: apply.c:3087
5c57d762 434#, c-format
a0b6b246
JX
435msgid "missing binary patch data for '%s'"
436msgstr "缺失 '%s' 的二进制补丁数据"
5c57d762 437
a5cd71ca 438#: apply.c:3095
5c57d762 439#, c-format
a0b6b246 440msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
29004bbb 441msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
5c57d762 442
a5cd71ca 443#: apply.c:3142
5c57d762 444#, c-format
a0b6b246
JX
445msgid "cannot apply binary patch to '%s' without full index line"
446msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
5c57d762 447
a5cd71ca 448#: apply.c:3152
5c57d762 449#, c-format
a0b6b246
JX
450msgid ""
451"the patch applies to '%s' (%s), which does not match the current contents."
29004bbb 452msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
5c57d762 453
a5cd71ca 454#: apply.c:3160
a0b6b246
JX
455#, c-format
456msgid "the patch applies to an empty '%s' but it is not empty"
29004bbb 457msgstr "补丁应用到空文件 '%s',但其并非空文件"
5c57d762 458
a5cd71ca 459#: apply.c:3178
5c57d762 460#, c-format
a0b6b246 461msgid "the necessary postimage %s for '%s' cannot be read"
e640d114 462msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
5c57d762 463
a5cd71ca 464#: apply.c:3191
5c57d762 465#, c-format
a0b6b246
JX
466msgid "binary patch does not apply to '%s'"
467msgstr "二进制补丁未应用到 '%s'"
5c57d762 468
a5cd71ca 469#: apply.c:3197
5c57d762 470#, c-format
a0b6b246
JX
471msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
472msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
5c57d762 473
a5cd71ca 474#: apply.c:3218
276ceeaa 475#, c-format
a0b6b246
JX
476msgid "patch failed: %s:%ld"
477msgstr "打补丁失败:%s:%ld"
276ceeaa 478
a5cd71ca 479#: apply.c:3341
4dcdc3d8 480#, c-format
a0b6b246
JX
481msgid "cannot checkout %s"
482msgstr "不能检出 %s"
4dcdc3d8 483
a5cd71ca 484#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280
4dcdc3d8 485#, c-format
a0b6b246
JX
486msgid "failed to read %s"
487msgstr "无法读取 %s"
4dcdc3d8 488
a5cd71ca 489#: apply.c:3401
4dcdc3d8 490#, c-format
a0b6b246
JX
491msgid "reading from '%s' beyond a symbolic link"
492msgstr "读取位于符号链接中的 '%s'"
4dcdc3d8 493
a5cd71ca 494#: apply.c:3430 apply.c:3673
4dcdc3d8 495#, c-format
a0b6b246
JX
496msgid "path %s has been renamed/deleted"
497msgstr "路径 %s 已经被重命名/删除"
4dcdc3d8 498
a5cd71ca 499#: apply.c:3516 apply.c:3688
4dcdc3d8 500#, c-format
a0b6b246
JX
501msgid "%s: does not exist in index"
502msgstr "%s:不存在于索引中"
4dcdc3d8 503
a5cd71ca 504#: apply.c:3525 apply.c:3696
4dcdc3d8 505#, c-format
a0b6b246
JX
506msgid "%s: does not match index"
507msgstr "%s:和索引不匹配"
4dcdc3d8 508
a5cd71ca 509#: apply.c:3560
a0b6b246
JX
510msgid "repository lacks the necessary blob to fall back on 3-way merge."
511msgstr "仓库缺乏必要的数据对象以进行三方合并。"
4dcdc3d8 512
a5cd71ca 513#: apply.c:3563
4dcdc3d8 514#, c-format
a0b6b246
JX
515msgid "Falling back to three-way merge...\n"
516msgstr "回落到三方合并...\n"
4dcdc3d8 517
a5cd71ca 518#: apply.c:3579 apply.c:3583
4dcdc3d8 519#, c-format
a0b6b246
JX
520msgid "cannot read the current contents of '%s'"
521msgstr "无法读取 '%s' 的当前内容"
276ceeaa 522
a5cd71ca 523#: apply.c:3595
4dcdc3d8 524#, c-format
a0b6b246
JX
525msgid "Failed to fall back on three-way merge...\n"
526msgstr "无法回落到三方合并...\n"
4dcdc3d8 527
a5cd71ca 528#: apply.c:3609
4dcdc3d8 529#, c-format
a0b6b246
JX
530msgid "Applied patch to '%s' with conflicts.\n"
531msgstr "应用补丁到 '%s' 存在冲突。\n"
4dcdc3d8 532
a5cd71ca 533#: apply.c:3614
4dcdc3d8 534#, c-format
a0b6b246
JX
535msgid "Applied patch to '%s' cleanly.\n"
536msgstr "成功应用补丁到 '%s'。\n"
4dcdc3d8 537
a5cd71ca 538#: apply.c:3640
a0b6b246
JX
539msgid "removal patch leaves file contents"
540msgstr "移除补丁仍留下了文件内容"
4dcdc3d8 541
a5cd71ca 542#: apply.c:3713
1003b3a5 543#, c-format
a0b6b246
JX
544msgid "%s: wrong type"
545msgstr "%s:错误类型"
1003b3a5 546
a5cd71ca 547#: apply.c:3715
1003b3a5 548#, c-format
a0b6b246
JX
549msgid "%s has type %o, expected %o"
550msgstr "%s 的类型是 %o,应为 %o"
1003b3a5 551
a5cd71ca 552#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856
d46c5519 553#: read-cache.c:1309
4dcdc3d8 554#, c-format
a0b6b246
JX
555msgid "invalid path '%s'"
556msgstr "无效路径 '%s'"
4dcdc3d8 557
a5cd71ca 558#: apply.c:3924
4dcdc3d8 559#, c-format
a0b6b246
JX
560msgid "%s: already exists in index"
561msgstr "%s:已经存在于索引中"
4dcdc3d8 562
a5cd71ca 563#: apply.c:3927
4dcdc3d8 564#, c-format
a0b6b246
JX
565msgid "%s: already exists in working directory"
566msgstr "%s:已经存在于工作区中"
4dcdc3d8 567
a5cd71ca 568#: apply.c:3947
1b7f4a34 569#, c-format
a0b6b246
JX
570msgid "new mode (%o) of %s does not match old mode (%o)"
571msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1b7f4a34 572
a5cd71ca 573#: apply.c:3952
5b04ee3b 574#, c-format
a0b6b246
JX
575msgid "new mode (%o) of %s does not match old mode (%o) of %s"
576msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
5b04ee3b 577
a5cd71ca 578#: apply.c:3972
8ada9598 579#, c-format
a0b6b246
JX
580msgid "affected file '%s' is beyond a symbolic link"
581msgstr "受影响的文件 '%s' 位于符号链接中"
8ada9598 582
a5cd71ca 583#: apply.c:3976
81809b99 584#, c-format
a0b6b246
JX
585msgid "%s: patch does not apply"
586msgstr "%s:补丁未应用"
8ada9598 587
a5cd71ca 588#: apply.c:3991
8ada9598 589#, c-format
a0b6b246 590msgid "Checking patch %s..."
06991777 591msgstr "正在检查补丁 %s..."
8ada9598 592
a5cd71ca 593#: apply.c:4083
a0b6b246
JX
594#, c-format
595msgid "sha1 information is lacking or useless for submodule %s"
596msgstr "子模组 %s 的 sha1 信息缺失或无效"
8ada9598 597
a5cd71ca 598#: apply.c:4090
8ada9598 599#, c-format
a0b6b246 600msgid "mode change for %s, which is not in current HEAD"
31e5e17b 601msgstr "%s 的模式变更,但它不在当前 HEAD 中"
8ada9598 602
a5cd71ca 603#: apply.c:4093
a0b6b246
JX
604#, c-format
605msgid "sha1 information is lacking or useless (%s)."
606msgstr "sha1 信息缺失或无效(%s)。"
6792b93b 607
a5cd71ca 608#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143
8ada9598 609#, c-format
a0b6b246
JX
610msgid "make_cache_entry failed for path '%s'"
611msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
8ada9598 612
a5cd71ca 613#: apply.c:4102
a0b6b246
JX
614#, c-format
615msgid "could not add %s to temporary index"
616msgstr "不能在临时索引中添加 %s"
9aeb4c2b 617
a5cd71ca 618#: apply.c:4112
a0b6b246
JX
619#, c-format
620msgid "could not write temporary index to %s"
621msgstr "不能把临时索引写入到 %s"
9aeb4c2b 622
a5cd71ca 623#: apply.c:4250
a0b6b246
JX
624#, c-format
625msgid "unable to remove %s from index"
626msgstr "不能从索引中移除 %s"
8ada9598 627
a5cd71ca 628#: apply.c:4284
8ada9598 629#, c-format
a0b6b246
JX
630msgid "corrupt patch for submodule %s"
631msgstr "子模组 %s 损坏的补丁"
8ada9598 632
a5cd71ca 633#: apply.c:4290
9aeb4c2b 634#, c-format
a0b6b246 635msgid "unable to stat newly created file '%s'"
65e2041e 636msgstr "不能对新建文件 '%s' 调用 stat"
9aeb4c2b 637
a5cd71ca 638#: apply.c:4298
a0b6b246
JX
639#, c-format
640msgid "unable to create backing store for newly created file %s"
641msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 642
a5cd71ca 643#: apply.c:4304 apply.c:4449
81809b99 644#, c-format
a0b6b246
JX
645msgid "unable to add cache entry for %s"
646msgstr "无法为 %s 添加缓存条目"
8ada9598 647
a5cd71ca 648#: apply.c:4347
a0b6b246
JX
649#, c-format
650msgid "failed to write to '%s'"
c1ac5258 651msgstr "写入 '%s' 失败"
8ada9598 652
a5cd71ca 653#: apply.c:4351
220c313c 654#, c-format
a0b6b246
JX
655msgid "closing file '%s'"
656msgstr "关闭文件 '%s'"
220c313c 657
a5cd71ca 658#: apply.c:4421
c04f5ac3 659#, c-format
a0b6b246
JX
660msgid "unable to write file '%s' mode %o"
661msgstr "不能写文件 '%s' 权限 %o"
c04f5ac3 662
a5cd71ca 663#: apply.c:4519
c04f5ac3 664#, c-format
a0b6b246
JX
665msgid "Applied patch %s cleanly."
666msgstr "成功应用补丁 %s。"
c04f5ac3 667
a5cd71ca 668#: apply.c:4527
a0b6b246
JX
669msgid "internal error"
670msgstr "内部错误"
c04f5ac3 671
a5cd71ca 672#: apply.c:4530
5c57d762 673#, c-format
a0b6b246
JX
674msgid "Applying patch %%s with %d reject..."
675msgid_plural "Applying patch %%s with %d rejects..."
676msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
677msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
5c57d762 678
a5cd71ca 679#: apply.c:4541
5c57d762 680#, c-format
a0b6b246
JX
681msgid "truncating .rej filename to %.*s.rej"
682msgstr "截短 .rej 文件名为 %.*s.rej"
5c57d762 683
a5cd71ca 684#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194
220c313c 685#, c-format
a0b6b246
JX
686msgid "cannot open %s"
687msgstr "不能打开 %s"
220c313c 688
a5cd71ca 689#: apply.c:4563
220c313c 690#, c-format
a0b6b246
JX
691msgid "Hunk #%d applied cleanly."
692msgstr "第 #%d 个片段成功应用。"
220c313c 693
a5cd71ca 694#: apply.c:4567
5c57d762 695#, c-format
a0b6b246
JX
696msgid "Rejected hunk #%d."
697msgstr "拒绝第 #%d 个片段。"
5c57d762 698
a5cd71ca 699#: apply.c:4686
5c57d762 700#, c-format
a0b6b246
JX
701msgid "Skipped patch '%s'."
702msgstr "略过补丁 '%s'。"
5c57d762 703
a5cd71ca 704#: apply.c:4694
a0b6b246
JX
705msgid "unrecognized input"
706msgstr "未能识别的输入"
5c57d762 707
a5cd71ca 708#: apply.c:4714
a0b6b246
JX
709msgid "unable to read index file"
710msgstr "无法读取索引文件"
5c57d762 711
a5cd71ca 712#: apply.c:4871
220c313c 713#, c-format
a0b6b246
JX
714msgid "can't open patch '%s': %s"
715msgstr "不能打开补丁 '%s':%s"
220c313c 716
a5cd71ca 717#: apply.c:4898
5c57d762 718#, c-format
a0b6b246
JX
719msgid "squelched %d whitespace error"
720msgid_plural "squelched %d whitespace errors"
721msgstr[0] "抑制下仍有 %d 个空白字符误用"
722msgstr[1] "抑制下仍有 %d 个空白字符误用"
5c57d762 723
a5cd71ca 724#: apply.c:4904 apply.c:4919
5c57d762 725#, c-format
a0b6b246
JX
726msgid "%d line adds whitespace errors."
727msgid_plural "%d lines add whitespace errors."
a4f16749
JX
728msgstr[0] "%d 行新增了空白字符误用。"
729msgstr[1] "%d 行新增了空白字符误用。"
5c57d762 730
a5cd71ca 731#: apply.c:4912
5c57d762 732#, c-format
a0b6b246
JX
733msgid "%d line applied after fixing whitespace errors."
734msgid_plural "%d lines applied after fixing whitespace errors."
735msgstr[0] "修复空白错误后,应用了 %d 行。"
736msgstr[1] "修复空白错误后,应用了 %d 行。"
5c57d762 737
a5cd71ca 738#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
a0b6b246
JX
739msgid "Unable to write new index file"
740msgstr "无法写入新索引文件"
5c57d762 741
a5cd71ca
JX
742#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200
743#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273
744#: builtin/pull.c:209 builtin/submodule--helper.c:407
a6cd2cc4
JX
745#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
746#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
747#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
a0b6b246
JX
748msgid "path"
749msgstr "路径"
5c57d762 750
a5cd71ca 751#: apply.c:4956
a0b6b246
JX
752msgid "don't apply changes matching the given path"
753msgstr "不要应用与给出路径向匹配的变更"
5c57d762 754
a5cd71ca 755#: apply.c:4959
a0b6b246
JX
756msgid "apply changes matching the given path"
757msgstr "应用与给出路径向匹配的变更"
220c313c 758
a5cd71ca 759#: apply.c:4961 builtin/am.c:2206
a0b6b246
JX
760msgid "num"
761msgstr "数字"
220c313c 762
a5cd71ca 763#: apply.c:4962
a0b6b246
JX
764msgid "remove <num> leading slashes from traditional diff paths"
765msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
220c313c 766
a5cd71ca 767#: apply.c:4965
a0b6b246
JX
768msgid "ignore additions made by the patch"
769msgstr "忽略补丁中的添加的文件"
220c313c 770
a5cd71ca 771#: apply.c:4967
a0b6b246
JX
772msgid "instead of applying the patch, output diffstat for the input"
773msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
220c313c 774
a5cd71ca 775#: apply.c:4971
a0b6b246
JX
776msgid "show number of added and deleted lines in decimal notation"
777msgstr "以十进制数显示添加和删除的行数"
220c313c 778
a5cd71ca 779#: apply.c:4973
a0b6b246
JX
780msgid "instead of applying the patch, output a summary for the input"
781msgstr "不应用补丁,而是显示输入的概要"
220c313c 782
a5cd71ca 783#: apply.c:4975
a0b6b246
JX
784msgid "instead of applying the patch, see if the patch is applicable"
785msgstr "不应用补丁,而是查看补丁是否可应用"
220c313c 786
a5cd71ca 787#: apply.c:4977
a0b6b246
JX
788msgid "make sure the patch is applicable to the current index"
789msgstr "确认补丁可以应用到当前索引"
276ceeaa 790
a5cd71ca 791#: apply.c:4979
c1ac5258
JX
792msgid "mark new files with `git add --intent-to-add`"
793msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
794
a5cd71ca 795#: apply.c:4981
a0b6b246
JX
796msgid "apply a patch without touching the working tree"
797msgstr "应用补丁而不修改工作区"
5b04ee3b 798
a5cd71ca 799#: apply.c:4983
a0b6b246
JX
800msgid "accept a patch that touches outside the working area"
801msgstr "接受修改工作区之外文件的补丁"
5c57d762 802
a5cd71ca 803#: apply.c:4986
a0b6b246
JX
804msgid "also apply the patch (use with --stat/--summary/--check)"
805msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
c04f5ac3 806
a5cd71ca 807#: apply.c:4988
a0b6b246
JX
808msgid "attempt three-way merge if a patch does not apply"
809msgstr "如果一个补丁不能应用则尝试三方合并"
c04f5ac3 810
a5cd71ca 811#: apply.c:4990
a0b6b246
JX
812msgid "build a temporary index based on embedded index information"
813msgstr "创建一个临时索引基于嵌入的索引信息"
c04f5ac3 814
a5cd71ca 815#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524
a0b6b246
JX
816msgid "paths are separated with NUL character"
817msgstr "路径以 NUL 字符分隔"
8ada9598 818
a5cd71ca 819#: apply.c:4995
a0b6b246
JX
820msgid "ensure at least <n> lines of context match"
821msgstr "确保至少匹配 <n> 行上下文"
8ada9598 822
a5cd71ca 823#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98
a6cd2cc4 824#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
a5cd71ca 825#: builtin/pack-objects.c:3310 builtin/rebase.c:1445
a0b6b246
JX
826msgid "action"
827msgstr "动作"
8ada9598 828
a5cd71ca 829#: apply.c:4997
a0b6b246
JX
830msgid "detect new or modified lines that have whitespace errors"
831msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 832
a5cd71ca 833#: apply.c:5000 apply.c:5003
a0b6b246
JX
834msgid "ignore changes in whitespace when finding context"
835msgstr "查找上下文时忽略空白字符的变更"
8ada9598 836
a5cd71ca 837#: apply.c:5006
a0b6b246
JX
838msgid "apply the patch in reverse"
839msgstr "反向应用补丁"
8ada9598 840
a5cd71ca 841#: apply.c:5008
a0b6b246
JX
842msgid "don't expect at least one line of context"
843msgstr "无需至少一行上下文"
8ada9598 844
a5cd71ca 845#: apply.c:5010
a0b6b246
JX
846msgid "leave the rejected hunks in corresponding *.rej files"
847msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 848
a5cd71ca 849#: apply.c:5012
a0b6b246
JX
850msgid "allow overlapping hunks"
851msgstr "允许重叠的补丁片段"
8ada9598 852
a5cd71ca 853#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22
a6cd2cc4 854#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
a5cd71ca 855#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128
a0b6b246
JX
856msgid "be verbose"
857msgstr "冗长输出"
8ada9598 858
a5cd71ca 859#: apply.c:5015
a0b6b246
JX
860msgid "tolerate incorrectly detected missing new-line at the end of file"
861msgstr "允许不正确的文件末尾换行符"
cfff71a9 862
a5cd71ca 863#: apply.c:5018
a0b6b246
JX
864msgid "do not trust the line counts in the hunk headers"
865msgstr "不信任补丁片段的头信息中的行号"
6c94aba5 866
a5cd71ca 867#: apply.c:5020 builtin/am.c:2194
a0b6b246
JX
868msgid "root"
869msgstr "根目录"
c04f5ac3 870
a5cd71ca 871#: apply.c:5021
a0b6b246
JX
872msgid "prepend <root> to all filenames"
873msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 874
c1ac5258 875#: archive.c:14
a0b6b246
JX
876msgid "git archive [<options>] <tree-ish> [<path>...]"
877msgstr "git archive [<选项>] <树或提交> [<路径>...]"
07432cef 878
c1ac5258 879#: archive.c:15
a0b6b246
JX
880msgid "git archive --list"
881msgstr "git archive --list"
882
c1ac5258 883#: archive.c:16
c04f5ac3 884msgid ""
a0b6b246 885"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
c04f5ac3 886msgstr ""
a0b6b246 887"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
6acbf033 888
c1ac5258 889#: archive.c:17
a0b6b246
JX
890msgid "git archive --remote <repo> [--exec <cmd>] --list"
891msgstr "git archive --remote <仓库> [--exec <命令>] --list"
6acbf033 892
d46c5519 893#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
c04f5ac3 894#, c-format
a0b6b246
JX
895msgid "pathspec '%s' did not match any files"
896msgstr "路径规格 '%s' 未匹配任何文件"
c04f5ac3 897
06991777
JX
898#: archive.c:396
899#, c-format
900msgid "no such ref: %.*s"
901msgstr "无此引用:%.*s"
902
903#: archive.c:401
904#, c-format
905msgid "not a valid object name: %s"
906msgstr "不是一个有效的对象名:%s"
907
908#: archive.c:414
909#, c-format
910msgid "not a tree object: %s"
911msgstr "不是一个树对象:%s"
912
a6cd2cc4 913#: archive.c:426
06991777
JX
914msgid "current working directory is untracked"
915msgstr "当前工作目录未被跟踪"
916
a6cd2cc4 917#: archive.c:457
a0b6b246
JX
918msgid "fmt"
919msgstr "格式"
07432cef 920
a6cd2cc4 921#: archive.c:457
a0b6b246
JX
922msgid "archive format"
923msgstr "归档格式"
7aea43ff 924
a5cd71ca 925#: archive.c:458 builtin/log.c:1581
a0b6b246
JX
926msgid "prefix"
927msgstr "前缀"
7aea43ff 928
a6cd2cc4 929#: archive.c:459
a0b6b246
JX
930msgid "prepend prefix to each pathname in the archive"
931msgstr "为归档中每个路径名加上前缀"
c04f5ac3 932
a5cd71ca
JX
933#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874
934#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
935#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
936#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
937#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
938#: parse-options.h:186
a0b6b246
JX
939msgid "file"
940msgstr "文件"
a77c07d9 941
a6cd2cc4 942#: archive.c:461 builtin/archive.c:90
a0b6b246
JX
943msgid "write the archive to this file"
944msgstr "归档写入此文件"
a77c07d9 945
a6cd2cc4 946#: archive.c:463
a0b6b246
JX
947msgid "read .gitattributes in working directory"
948msgstr "读取工作区中的 .gitattributes"
7ac1c0ad 949
a6cd2cc4 950#: archive.c:464
a0b6b246
JX
951msgid "report archived files on stderr"
952msgstr "在标准错误上报告归档文件"
7ac1c0ad 953
a6cd2cc4 954#: archive.c:465
a0b6b246
JX
955msgid "store only"
956msgstr "只存储"
7ac1c0ad 957
a6cd2cc4 958#: archive.c:466
a0b6b246
JX
959msgid "compress faster"
960msgstr "压缩速度更快"
8ada9598 961
a6cd2cc4 962#: archive.c:474
a0b6b246
JX
963msgid "compress better"
964msgstr "压缩效果更好"
8ada9598 965
a6cd2cc4 966#: archive.c:477
a0b6b246
JX
967msgid "list supported archive formats"
968msgstr "列出支持的归档格式"
a77c07d9 969
a5cd71ca 970#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
a6cd2cc4 971#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
a0b6b246
JX
972msgid "repo"
973msgstr "仓库"
c04f5ac3 974
a6cd2cc4 975#: archive.c:480 builtin/archive.c:92
a0b6b246
JX
976msgid "retrieve the archive from remote repository <repo>"
977msgstr "从远程仓库(<仓库>)提取归档文件"
8ada9598 978
a5cd71ca 979#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
06991777 980#: builtin/notes.c:498
a0b6b246
JX
981msgid "command"
982msgstr "命令"
983
a6cd2cc4 984#: archive.c:482 builtin/archive.c:94
a0b6b246
JX
985msgid "path to the remote git-upload-archive command"
986msgstr "远程 git-upload-archive 命令的路径"
987
a6cd2cc4 988#: archive.c:489
a0b6b246
JX
989msgid "Unexpected option --remote"
990msgstr "未知参数 --remote"
991
a6cd2cc4 992#: archive.c:491
a0b6b246
JX
993msgid "Option --exec can only be used together with --remote"
994msgstr "选项 --exec 只能和 --remote 同时使用"
995
a6cd2cc4 996#: archive.c:493
a0b6b246
JX
997msgid "Unexpected option --output"
998msgstr "未知参数 --output"
999
a6cd2cc4 1000#: archive.c:515
a0b6b246
JX
1001#, c-format
1002msgid "Unknown archive format '%s'"
1003msgstr "未知归档格式 '%s'"
1004
a6cd2cc4 1005#: archive.c:522
8ada9598 1006#, c-format
a0b6b246
JX
1007msgid "Argument not supported for format '%s': -%d"
1008msgstr "参数不支持此格式 '%s':-%d"
1009
4c27fcb5 1010#: archive-tar.c:125 archive-zip.c:345
c1ac5258
JX
1011#, c-format
1012msgid "cannot stream blob %s"
e640d114 1013msgstr "不能打开数据对象 %s"
c1ac5258 1014
a5cd71ca 1015#: archive-tar.c:266 archive-zip.c:363
c1ac5258
JX
1016#, c-format
1017msgid "unsupported file mode: 0%o (SHA1: %s)"
e640d114 1018msgstr "不支持的文件模式:0%o (SHA1: %s)"
c1ac5258 1019
a5cd71ca 1020#: archive-tar.c:293 archive-zip.c:353
c1ac5258
JX
1021#, c-format
1022msgid "cannot read %s"
1023msgstr "不能读取 %s"
1024
a5cd71ca 1025#: archive-tar.c:465
c1ac5258
JX
1026#, c-format
1027msgid "unable to start '%s' filter"
1028msgstr "无法启动 '%s' 过滤器"
1029
a5cd71ca 1030#: archive-tar.c:468
c1ac5258
JX
1031msgid "unable to redirect descriptor"
1032msgstr "无法重定向描述符"
1033
a5cd71ca 1034#: archive-tar.c:475
c1ac5258
JX
1035#, c-format
1036msgid "'%s' filter reported error"
e640d114 1037msgstr "'%s' 过滤器报告了错误"
c1ac5258 1038
4c27fcb5 1039#: archive-zip.c:314
c1ac5258
JX
1040#, c-format
1041msgid "path is not valid UTF-8: %s"
1042msgstr "路径不是有效的 UTF-8:%s"
1043
4c27fcb5 1044#: archive-zip.c:318
c1ac5258
JX
1045#, c-format
1046msgid "path too long (%d chars, SHA1: %s): %s"
1047msgstr "路径太长(%d 字符,SHA1:%s):%s"
1048
a6cd2cc4 1049#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
c1ac5258
JX
1050#, c-format
1051msgid "deflate error (%d)"
1052msgstr "压缩错误 (%d)"
1053
4c27fcb5 1054#: archive-zip.c:609
c1ac5258
JX
1055#, c-format
1056msgid "timestamp too large for this system: %<PRIuMAX>"
e640d114 1057msgstr "对于本系统时间戳太大:%<PRIuMAX>"
c1ac5258 1058
a5cd71ca 1059#: attr.c:213
87cb7997
JX
1060#, c-format
1061msgid "%.*s is not a valid attribute name"
1062msgstr "%.*s 不是一个有效的属性名"
1063
a5cd71ca 1064#: attr.c:370
06991777
JX
1065#, c-format
1066msgid "%s not allowed: %s:%d"
5b533632 1067msgstr "不允许 %s:%s:%d"
06991777 1068
a5cd71ca 1069#: attr.c:410
8ada9598 1070msgid ""
a0b6b246
JX
1071"Negative patterns are ignored in git attributes\n"
1072"Use '\\!' for literal leading exclamation."
8ada9598 1073msgstr ""
a0b6b246
JX
1074"负值模版在 git attributes 中被忽略\n"
1075"当字符串确实要以感叹号开始时,使用 '\\!'。"
8ada9598 1076
4c27fcb5 1077#: bisect.c:468
8ada9598 1078#, c-format
a0b6b246
JX
1079msgid "Badly quoted content in file '%s': %s"
1080msgstr "文件 '%s' 包含错误的引用格式:%s"
8ada9598 1081
06991777 1082#: bisect.c:678
a0b6b246
JX
1083#, c-format
1084msgid "We cannot bisect more!\n"
1085msgstr "我们无法进行更多的二分查找!\n"
8ada9598 1086
06991777 1087#: bisect.c:733
2e8451e8 1088#, c-format
a0b6b246
JX
1089msgid "Not a valid commit name %s"
1090msgstr "不是一个有效的提交名 %s"
2e8451e8 1091
06991777 1092#: bisect.c:758
5b04ee3b
JX
1093#, c-format
1094msgid ""
a0b6b246
JX
1095"The merge base %s is bad.\n"
1096"This means the bug has been fixed between %s and [%s].\n"
5b04ee3b 1097msgstr ""
a0b6b246
JX
1098"合并基线 %s 是坏的。\n"
1099"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
5b04ee3b 1100
06991777 1101#: bisect.c:763
5b04ee3b 1102#, c-format
a0b6b246
JX
1103msgid ""
1104"The merge base %s is new.\n"
1105"The property has changed between %s and [%s].\n"
1106msgstr ""
1107"合并基线 %s 是新的。\n"
1108"介于 %s 和 [%s] 之间的属性已经被修改。\n"
5b04ee3b 1109
06991777 1110#: bisect.c:768
a0b6b246
JX
1111#, c-format
1112msgid ""
1113"The merge base %s is %s.\n"
1114"This means the first '%s' commit is between %s and [%s].\n"
1115msgstr ""
1116"合并基线 %s 是 %s。\n"
1117"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
07432cef 1118
06991777 1119#: bisect.c:776
a0b6b246
JX
1120#, c-format
1121msgid ""
1a79b2f1 1122"Some %s revs are not ancestors of the %s rev.\n"
a0b6b246
JX
1123"git bisect cannot work properly in this case.\n"
1124"Maybe you mistook %s and %s revs?\n"
1125msgstr ""
1126"一些 %s 版本不是 %s 版本的祖先。\n"
1127"这种情况下 git 二分查找无法正常工作。\n"
1128"您可能弄错了 %s 和 %s 版本?\n"
07432cef 1129
06991777 1130#: bisect.c:789
a0b6b246
JX
1131#, c-format
1132msgid ""
1133"the merge base between %s and [%s] must be skipped.\n"
1134"So we cannot be sure the first %s commit is between %s and %s.\n"
1135"We continue anyway."
1136msgstr ""
1137"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1138"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1139"我们仍旧继续。"
649900bc 1140
06991777 1141#: bisect.c:822
649900bc 1142#, c-format
a0b6b246
JX
1143msgid "Bisecting: a merge base must be tested\n"
1144msgstr "二分查找中:合并基线必须是经过测试的\n"
649900bc 1145
06991777 1146#: bisect.c:865
a0b6b246
JX
1147#, c-format
1148msgid "a %s revision is needed"
1149msgstr "需要一个 %s 版本"
649900bc 1150
a6cd2cc4 1151#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
649900bc 1152#, c-format
a0b6b246
JX
1153msgid "could not create file '%s'"
1154msgstr "不能创建文件 '%s'"
649900bc 1155
a6cd2cc4 1156#: bisect.c:928 builtin/merge.c:148
649900bc 1157#, c-format
a0b6b246
JX
1158msgid "could not read file '%s'"
1159msgstr "不能读取文件 '%s'"
649900bc 1160
d46c5519 1161#: bisect.c:958
a0b6b246
JX
1162msgid "reading bisect refs failed"
1163msgstr "读取二分查找引用失败"
649900bc 1164
d46c5519 1165#: bisect.c:977
649900bc 1166#, c-format
a0b6b246
JX
1167msgid "%s was both %s and %s\n"
1168msgstr "%s 同时为 %s 和 %s\n"
649900bc 1169
d46c5519 1170#: bisect.c:985
649900bc 1171#, c-format
a0b6b246
JX
1172msgid ""
1173"No testable commit found.\n"
1174"Maybe you started with bad path parameters?\n"
1175msgstr ""
1176"没有发现可测试的提交。\n"
1177"可能您在运行时使用了错误的路径参数?\n"
649900bc 1178
d46c5519 1179#: bisect.c:1004
649900bc 1180#, c-format
a0b6b246
JX
1181msgid "(roughly %d step)"
1182msgid_plural "(roughly %d steps)"
1183msgstr[0] "(大概 %d 步)"
1184msgstr[1] "(大概 %d 步)"
649900bc 1185
a4f16749
JX
1186#. TRANSLATORS: the last %s will be replaced with "(roughly %d
1187#. steps)" translation.
1188#.
d46c5519 1189#: bisect.c:1010
649900bc 1190#, c-format
a0b6b246
JX
1191msgid "Bisecting: %d revision left to test after this %s\n"
1192msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1193msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1194msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
649900bc 1195
a5cd71ca 1196#: blame.c:2700
a4f16749
JX
1197msgid "--contents and --reverse do not blend well."
1198msgstr "--contents 和 --reverse 不能混用。"
1199
a5cd71ca 1200#: blame.c:2714
a4f16749
JX
1201msgid "cannot use --contents with final commit object name"
1202msgstr "不能将 --contents 和最终的提交对象名共用"
1203
a5cd71ca 1204#: blame.c:2735
a4f16749
JX
1205msgid "--reverse and --first-parent together require specified latest commit"
1206msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
1207
a5cd71ca
JX
1208#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971
1209#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964
1210#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
1211#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
fd8cb379 1212#: builtin/shortlog.c:192
a4f16749
JX
1213msgid "revision walk setup failed"
1214msgstr "版本遍历设置失败"
1215
a5cd71ca 1216#: blame.c:2762
a4f16749
JX
1217msgid ""
1218"--reverse --first-parent together require range along first-parent chain"
1219msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
1220
a5cd71ca 1221#: blame.c:2773
a4f16749
JX
1222#, c-format
1223msgid "no such path %s in %s"
1224msgstr "在 %2$s 中无此路径 %1$s"
1225
a5cd71ca 1226#: blame.c:2784
a4f16749
JX
1227#, c-format
1228msgid "cannot read blob %s for path %s"
1229msgstr "不能为路径 %2$s 读取数据对象 %1$s"
1230
d46c5519 1231#: branch.c:53
649900bc 1232#, c-format
a0b6b246
JX
1233msgid ""
1234"\n"
1235"After fixing the error cause you may try to fix up\n"
1236"the remote tracking information by invoking\n"
1237"\"git branch --set-upstream-to=%s%s%s\"."
1238msgstr ""
1239"\n"
1240"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1241"\"git branch --set-upstream-to=%s%s%s\" 。"
649900bc 1242
d46c5519 1243#: branch.c:67
649900bc 1244#, c-format
a0b6b246
JX
1245msgid "Not setting branch %s as its own upstream."
1246msgstr "未设置分支 %s 作为它自己的上游。"
649900bc 1247
d46c5519 1248#: branch.c:93
649900bc 1249#, c-format
6937cb4e
JX
1250msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
1251msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 1252
d46c5519 1253#: branch.c:94
649900bc 1254#, c-format
6937cb4e
JX
1255msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
1256msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 1257
d46c5519 1258#: branch.c:98
649900bc 1259#, c-format
6937cb4e
JX
1260msgid "Branch '%s' set up to track local branch '%s' by rebasing."
1261msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
649900bc 1262
d46c5519 1263#: branch.c:99
649900bc 1264#, c-format
6937cb4e 1265msgid "Branch '%s' set up to track local branch '%s'."
493a9322 1266msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
649900bc 1267
d46c5519 1268#: branch.c:104
649900bc 1269#, c-format
6937cb4e
JX
1270msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
1271msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
649900bc 1272
d46c5519 1273#: branch.c:105
649900bc 1274#, c-format
6937cb4e
JX
1275msgid "Branch '%s' set up to track remote ref '%s'."
1276msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
649900bc 1277
d46c5519 1278#: branch.c:109
649900bc 1279#, c-format
6937cb4e
JX
1280msgid "Branch '%s' set up to track local ref '%s' by rebasing."
1281msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
649900bc 1282
d46c5519 1283#: branch.c:110
649900bc 1284#, c-format
6937cb4e
JX
1285msgid "Branch '%s' set up to track local ref '%s'."
1286msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
649900bc 1287
d46c5519 1288#: branch.c:119
a0b6b246
JX
1289msgid "Unable to write upstream branch configuration"
1290msgstr "无法写入上游分支配置"
649900bc 1291
d46c5519 1292#: branch.c:156
649900bc 1293#, c-format
a0b6b246
JX
1294msgid "Not tracking: ambiguous information for ref %s"
1295msgstr "未跟踪:引用 %s 有歧义"
649900bc 1296
d46c5519 1297#: branch.c:189
649900bc 1298#, c-format
a0b6b246
JX
1299msgid "'%s' is not a valid branch name."
1300msgstr "'%s' 不是一个有效的分支名称。"
649900bc 1301
d46c5519 1302#: branch.c:208
649900bc 1303#, c-format
a0b6b246
JX
1304msgid "A branch named '%s' already exists."
1305msgstr "一个分支名 '%s' 已经存在。"
649900bc 1306
d46c5519 1307#: branch.c:213
a0b6b246
JX
1308msgid "Cannot force update the current branch."
1309msgstr "无法强制更新当前分支。"
649900bc 1310
d46c5519 1311#: branch.c:233
649900bc 1312#, c-format
a0b6b246
JX
1313msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1314msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
649900bc 1315
d46c5519 1316#: branch.c:235
649900bc 1317#, c-format
a0b6b246
JX
1318msgid "the requested upstream branch '%s' does not exist"
1319msgstr "请求的上游分支 '%s' 不存在"
649900bc 1320
d46c5519 1321#: branch.c:237
a0b6b246
JX
1322msgid ""
1323"\n"
1324"If you are planning on basing your work on an upstream\n"
1325"branch that already exists at the remote, you may need to\n"
1326"run \"git fetch\" to retrieve it.\n"
1327"\n"
1328"If you are planning to push out a new local branch that\n"
1329"will track its remote counterpart, you may want to use\n"
1330"\"git push -u\" to set the upstream config as you push."
1331msgstr ""
1332"\n"
1333"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
1334"您可能需要执行 \"git fetch\" 来获取分支。\n"
1335"\n"
1336"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
1337"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
649900bc 1338
d46c5519 1339#: branch.c:281
649900bc 1340#, c-format
a0b6b246
JX
1341msgid "Not a valid object name: '%s'."
1342msgstr "不是一个有效的对象名:'%s'。"
649900bc 1343
d46c5519 1344#: branch.c:301
649900bc 1345#, c-format
a0b6b246
JX
1346msgid "Ambiguous object name: '%s'."
1347msgstr "歧义的对象名:'%s'。"
649900bc 1348
d46c5519 1349#: branch.c:306
649900bc 1350#, c-format
a0b6b246
JX
1351msgid "Not a valid branch point: '%s'."
1352msgstr "无效的分支点:'%s'。"
649900bc 1353
a6cd2cc4 1354#: branch.c:364
649900bc 1355#, c-format
a0b6b246
JX
1356msgid "'%s' is already checked out at '%s'"
1357msgstr "'%s' 已经检出到 '%s'"
649900bc 1358
a6cd2cc4 1359#: branch.c:387
a0b6b246
JX
1360#, c-format
1361msgid "HEAD of working tree %s is not updated"
1362msgstr "工作区 %s 的 HEAD 指向没有被更新"
649900bc 1363
c1ac5258 1364#: bundle.c:36
649900bc 1365#, c-format
a0b6b246
JX
1366msgid "'%s' does not look like a v2 bundle file"
1367msgstr "'%s' 不像是一个 v2 版本的包文件"
649900bc 1368
c1ac5258 1369#: bundle.c:64
a0b6b246
JX
1370#, c-format
1371msgid "unrecognized header: %s%s (%d)"
1372msgstr "未能识别的包头:%s%s (%d)"
649900bc 1373
a5cd71ca 1374#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962
a6cd2cc4 1375#: builtin/commit.c:791
649900bc 1376#, c-format
a0b6b246
JX
1377msgid "could not open '%s'"
1378msgstr "不能打开 '%s'"
649900bc 1379
06991777 1380#: bundle.c:143
a0b6b246
JX
1381msgid "Repository lacks these prerequisite commits:"
1382msgstr "仓库中缺少这些必备的提交:"
649900bc 1383
a6cd2cc4
JX
1384#: bundle.c:146
1385msgid "need a repository to verify a bundle"
1386msgstr "需要一个仓库来校验一个包"
1387
1388#: bundle.c:197
2e8451e8 1389#, c-format
a0b6b246
JX
1390msgid "The bundle contains this ref:"
1391msgid_plural "The bundle contains these %d refs:"
1392msgstr[0] "这个包中含有这个引用:"
1393msgstr[1] "这个包中含有 %d 个引用:"
2e8451e8 1394
a6cd2cc4 1395#: bundle.c:204
a0b6b246
JX
1396msgid "The bundle records a complete history."
1397msgstr "这个包记录一个完整历史。"
2e8451e8 1398
a6cd2cc4 1399#: bundle.c:206
2e8451e8 1400#, c-format
a0b6b246
JX
1401msgid "The bundle requires this ref:"
1402msgid_plural "The bundle requires these %d refs:"
1403msgstr[0] "这个包需要这个引用:"
1404msgstr[1] "这个包需要 %d 个引用:"
2e8451e8 1405
a6cd2cc4 1406#: bundle.c:272
4c27fcb5
JX
1407msgid "unable to dup bundle descriptor"
1408msgstr "无法复制 bundle 描述符"
1409
a6cd2cc4 1410#: bundle.c:279
a0b6b246
JX
1411msgid "Could not spawn pack-objects"
1412msgstr "不能生成 pack-objects 进程"
1003b3a5 1413
a6cd2cc4 1414#: bundle.c:290
a0b6b246
JX
1415msgid "pack-objects died"
1416msgstr "pack-objects 终止"
8ada9598 1417
a6cd2cc4 1418#: bundle.c:332
a0b6b246
JX
1419msgid "rev-list died"
1420msgstr "rev-list 终止"
1421
a6cd2cc4 1422#: bundle.c:381
81809b99 1423#, c-format
a0b6b246
JX
1424msgid "ref '%s' is excluded by the rev-list options"
1425msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 1426
a5cd71ca 1427#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306
81809b99 1428#, c-format
a0b6b246
JX
1429msgid "unrecognized argument: %s"
1430msgstr "未能识别的参数:%s"
8ada9598 1431
a6cd2cc4 1432#: bundle.c:468
a0b6b246
JX
1433msgid "Refusing to create empty bundle."
1434msgstr "不能创建空包。"
1435
a6cd2cc4 1436#: bundle.c:478
81809b99 1437#, c-format
a0b6b246
JX
1438msgid "cannot create '%s'"
1439msgstr "不能创建 '%s'"
8ada9598 1440
a6cd2cc4 1441#: bundle.c:503
a0b6b246
JX
1442msgid "index-pack died"
1443msgstr "index-pack 终止"
63af42fe 1444
31e5e17b 1445#: color.c:296
94550ed3 1446#, c-format
a0b6b246
JX
1447msgid "invalid color value: %.*s"
1448msgstr "无效的颜色值:%.*s"
94550ed3 1449
a5cd71ca
JX
1450#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398
1451#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
94550ed3 1452#, c-format
a0b6b246
JX
1453msgid "could not parse %s"
1454msgstr "不能解析 %s"
94550ed3 1455
4c27fcb5 1456#: commit.c:52
a0b6b246
JX
1457#, c-format
1458msgid "%s %s is not a commit!"
31e5e17b 1459msgstr "%s %s 不是一个提交!"
90314792 1460
a6cd2cc4 1461#: commit.c:192
fd8cb379
JX
1462msgid ""
1463"Support for <GIT_DIR>/info/grafts is deprecated\n"
1464"and will be removed in a future Git version.\n"
1465"\n"
1466"Please use \"git replace --convert-graft-file\"\n"
1467"to convert the grafts into replace refs.\n"
1468"\n"
1469"Turn this message off by running\n"
1470"\"git config advice.graftFileDeprecated false\""
1471msgstr ""
1472"对 <GIT_DIR>/info/grafts 的支持已被弃用,并将在\n"
1473"未来的Git版本中被移除。\n"
1474"\n"
1475"请使用 \"git replace --convert-graft-file\" 将\n"
1476"grafts 转换为替换引用。\n"
1477"\n"
1478"设置 \"git config advice.graftFileDeprecated false\"\n"
1479"可关闭本消息"
1480
a5cd71ca 1481#: commit.c:1128
4c27fcb5
JX
1482#, c-format
1483msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
1484msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
1485
a5cd71ca 1486#: commit.c:1131
4c27fcb5
JX
1487#, c-format
1488msgid "Commit %s has a bad GPG signature allegedly by %s."
1489msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
1490
a5cd71ca 1491#: commit.c:1134
4c27fcb5
JX
1492#, c-format
1493msgid "Commit %s does not have a GPG signature."
1494msgstr "提交 %s 没有 GPG 签名。"
1495
a5cd71ca 1496#: commit.c:1137
4c27fcb5
JX
1497#, c-format
1498msgid "Commit %s has a good GPG signature by %s\n"
1499msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
1500
a5cd71ca 1501#: commit.c:1391
90314792 1502msgid ""
a0b6b246
JX
1503"Warning: commit message did not conform to UTF-8.\n"
1504"You may want to amend it after fixing the message, or set the config\n"
1505"variable i18n.commitencoding to the encoding your project uses.\n"
1506msgstr ""
29004bbb 1507"警告:提交说明不符合 UTF-8 字符编码。\n"
a0b6b246 1508"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
29004bbb 1509"设置为您项目所用的字符编码。\n"
90314792 1510
a6cd2cc4 1511#: commit-graph.c:127
d46c5519
JX
1512msgid "commit-graph file is too small"
1513msgstr "提交图形文件太小"
c1ac5258 1514
a6cd2cc4 1515#: commit-graph.c:192
c1ac5258 1516#, c-format
d46c5519
JX
1517msgid "commit-graph signature %X does not match signature %X"
1518msgstr "提交图形签名 %X 和签名 %X 不匹配"
c1ac5258 1519
a6cd2cc4 1520#: commit-graph.c:199
c1ac5258 1521#, c-format
d46c5519
JX
1522msgid "commit-graph version %X does not match version %X"
1523msgstr "提交图形版本 %X 和版本 %X 不匹配"
c1ac5258 1524
a6cd2cc4 1525#: commit-graph.c:206
c1ac5258 1526#, c-format
d46c5519
JX
1527msgid "commit-graph hash version %X does not match version %X"
1528msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
c1ac5258 1529
a6cd2cc4 1530#: commit-graph.c:229
d46c5519
JX
1531msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
1532msgstr "提交图形块查找表条目丢失,文件可能不完整"
06991777 1533
a6cd2cc4 1534#: commit-graph.c:240
c1ac5258 1535#, c-format
d46c5519
JX
1536msgid "commit-graph improper chunk offset %08x%08x"
1537msgstr "提交图形不正确的块偏移 %08x%08x"
c1ac5258 1538
a6cd2cc4 1539#: commit-graph.c:283
c1ac5258 1540#, c-format
d46c5519
JX
1541msgid "commit-graph chunk id %08x appears multiple times"
1542msgstr "提交图形块 id %08x 出现了多次"
c1ac5258 1543
a6cd2cc4
JX
1544#: commit-graph.c:347
1545msgid "commit-graph has no base graphs chunk"
1546msgstr "提交图形没有基础图形块"
1547
1548#: commit-graph.c:357
1549msgid "commit-graph chain does not match"
1550msgstr "提交图形链不匹配"
1551
1552#: commit-graph.c:404
1553#, c-format
1554msgid "invalid commit-graph chain: line '%s' not a hash"
1555msgstr "无效的提交图形链:行 '%s' 不是一个哈希值"
1556
1557#: commit-graph.c:430
1558msgid "unable to find all commit-graph files"
1559msgstr "无法找到所有提交图形文件"
1560
a5cd71ca 1561#: commit-graph.c:561 commit-graph.c:621
a6cd2cc4
JX
1562msgid "invalid commit position. commit-graph is likely corrupt"
1563msgstr "无效的提交位置。提交图形可能已损坏"
1564
a5cd71ca 1565#: commit-graph.c:582
c1ac5258
JX
1566#, c-format
1567msgid "could not find commit %s"
1568msgstr "无法找到提交 %s"
1569
a5cd71ca
JX
1570#: commit-graph.c:855 builtin/am.c:1287
1571#, c-format
1572msgid "unable to parse commit %s"
1573msgstr "不能解析提交 %s"
1574
1575#: commit-graph.c:859
1576#, c-format
1577msgid "unable to get tree for %s"
1578msgstr "无法得到 %s 的树对象"
1579
1580#: commit-graph.c:1017 builtin/pack-objects.c:2641
c1ac5258
JX
1581#, c-format
1582msgid "unable to get type of object %s"
1583msgstr "无法获得对象 %s 类型"
1584
a5cd71ca 1585#: commit-graph.c:1049
06991777
JX
1586msgid "Loading known commits in commit graph"
1587msgstr "正在加载提交图中的已知提交"
1588
a5cd71ca 1589#: commit-graph.c:1066
06991777
JX
1590msgid "Expanding reachable commits in commit graph"
1591msgstr "正在扩展提交图中的可达提交"
1592
a5cd71ca 1593#: commit-graph.c:1085
06991777
JX
1594msgid "Clearing commit marks in commit graph"
1595msgstr "正在清除提交图中的提交标记"
4c27fcb5 1596
a5cd71ca 1597#: commit-graph.c:1104
4c27fcb5
JX
1598msgid "Computing commit graph generation numbers"
1599msgstr "正在计算提交图世代数字"
1600
a5cd71ca 1601#: commit-graph.c:1179
06991777
JX
1602#, c-format
1603msgid "Finding commits for commit graph in %d pack"
1604msgid_plural "Finding commits for commit graph in %d packs"
1605msgstr[0] "正在 %d 个包中查找提交图的提交"
1606msgstr[1] "正在 %d 个包中查找提交图的提交"
4c27fcb5 1607
a5cd71ca 1608#: commit-graph.c:1192
c1ac5258
JX
1609#, c-format
1610msgid "error adding pack %s"
1611msgstr "添加包 %s 出错"
1612
a5cd71ca 1613#: commit-graph.c:1196
c1ac5258
JX
1614#, c-format
1615msgid "error opening index for %s"
1616msgstr "为 %s 打开索引出错"
1617
a5cd71ca 1618#: commit-graph.c:1220
06991777
JX
1619#, c-format
1620msgid "Finding commits for commit graph from %d ref"
1621msgid_plural "Finding commits for commit graph from %d refs"
1622msgstr[0] "正在从 %d 个引用中查找提交图的提交"
1623msgstr[1] "正在从 %d 个引用中查找提交图的提交"
1624
a5cd71ca
JX
1625#: commit-graph.c:1240
1626#, c-format
1627msgid "invalid commit object id: %s"
1628msgstr "无效的提交对象 ID:%s"
1629
1630#: commit-graph.c:1255
06991777
JX
1631msgid "Finding commits for commit graph among packed objects"
1632msgstr "正在打包对象中查找提交图的提交"
1633
a5cd71ca 1634#: commit-graph.c:1270
06991777 1635msgid "Counting distinct commits in commit graph"
8e4e0555 1636msgstr "正在计算提交图中不同的提交"
06991777 1637
a5cd71ca 1638#: commit-graph.c:1300
06991777 1639msgid "Finding extra edges in commit graph"
8e4e0555 1640msgstr "正在查找提交图中额外的边"
06991777 1641
a5cd71ca 1642#: commit-graph.c:1346
a6cd2cc4
JX
1643msgid "failed to write correct number of base graph ids"
1644msgstr "无法写入正确数量的基础图形 ID"
fd8cb379 1645
a5cd71ca 1646#: commit-graph.c:1379 midx.c:810
fd8cb379 1647#, c-format
c1ac5258
JX
1648msgid "unable to create leading directories of %s"
1649msgstr "不能为 %s 创建先导目录"
1650
a5cd71ca 1651#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241
a6cd2cc4
JX
1652#, c-format
1653msgid "unable to create '%s'"
1654msgstr "不能创建 '%s'"
1655
a5cd71ca 1656#: commit-graph.c:1451
06991777
JX
1657#, c-format
1658msgid "Writing out commit graph in %d pass"
1659msgid_plural "Writing out commit graph in %d passes"
8e4e0555
FZ
1660msgstr[0] "正在用 %d 步写出提交图"
1661msgstr[1] "正在用 %d 步写出提交图"
06991777 1662
a5cd71ca 1663#: commit-graph.c:1492
a6cd2cc4
JX
1664msgid "unable to open commit-graph chain file"
1665msgstr "无法打开提交图形链文件"
1666
a5cd71ca 1667#: commit-graph.c:1504
a6cd2cc4
JX
1668msgid "failed to rename base commit-graph file"
1669msgstr "无法重命名基础提交图形文件"
1670
a5cd71ca 1671#: commit-graph.c:1524
a6cd2cc4
JX
1672msgid "failed to rename temporary commit-graph file"
1673msgstr "无法重命名临时提交图形文件"
1674
a5cd71ca 1675#: commit-graph.c:1635
a6cd2cc4
JX
1676msgid "Scanning merged commits"
1677msgstr "正在扫描合并提交"
1678
a5cd71ca 1679#: commit-graph.c:1646
a6cd2cc4
JX
1680#, c-format
1681msgid "unexpected duplicate commit id %s"
1682msgstr "意外的重复提交 ID %s"
1683
a5cd71ca 1684#: commit-graph.c:1670
a6cd2cc4
JX
1685msgid "Merging commit-graph"
1686msgstr "正在合并提交图形"
1687
a5cd71ca 1688#: commit-graph.c:1860
a6cd2cc4
JX
1689#, c-format
1690msgid "the commit graph format cannot write %d commits"
1691msgstr "提交图格式不能写入 %d 个提交"
1692
a5cd71ca 1693#: commit-graph.c:1871
a6cd2cc4
JX
1694msgid "too many commits to write graph"
1695msgstr "提交太多不能画图"
1696
a5cd71ca 1697#: commit-graph.c:1961
c1ac5258 1698msgid "the commit-graph file has incorrect checksum and is likely corrupt"
4c27fcb5
JX
1699msgstr "提交图文件的校验码错误,可能已经损坏"
1700
a5cd71ca 1701#: commit-graph.c:1971
d46c5519
JX
1702#, c-format
1703msgid "commit-graph has incorrect OID order: %s then %s"
5b533632 1704msgstr "提交图形的对象 ID 顺序不正确:%s 然后 %s"
d46c5519 1705
a5cd71ca 1706#: commit-graph.c:1981 commit-graph.c:1996
d46c5519
JX
1707#, c-format
1708msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
1709msgstr "提交图形有不正确的扇出值:fanout[%d] = %u != %u"
1710
a5cd71ca 1711#: commit-graph.c:1988
d46c5519
JX
1712#, c-format
1713msgid "failed to parse commit %s from commit-graph"
1714msgstr "无法从提交图形中解析提交 %s"
1715
a5cd71ca 1716#: commit-graph.c:2006
4c27fcb5 1717msgid "Verifying commits in commit graph"
8e4e0555 1718msgstr "正在校验提交图中的提交"
fd8cb379 1719
a5cd71ca 1720#: commit-graph.c:2020
d46c5519
JX
1721#, c-format
1722msgid "failed to parse commit %s from object database for commit-graph"
1723msgstr "无法从提交图形的对象库中解析提交 %s"
1724
a5cd71ca 1725#: commit-graph.c:2027
d46c5519
JX
1726#, c-format
1727msgid "root tree OID for commit %s in commit-graph is %s != %s"
5b533632 1728msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
d46c5519 1729
a5cd71ca 1730#: commit-graph.c:2037
d46c5519
JX
1731#, c-format
1732msgid "commit-graph parent list for commit %s is too long"
1733msgstr "提交 %s 的提交图形父提交列表太长了"
1734
a5cd71ca 1735#: commit-graph.c:2046
d46c5519
JX
1736#, c-format
1737msgid "commit-graph parent for %s is %s != %s"
1738msgstr "%s 的提交图形父提交是 %s != %s"
1739
a5cd71ca 1740#: commit-graph.c:2059
d46c5519
JX
1741#, c-format
1742msgid "commit-graph parent list for commit %s terminates early"
1743msgstr "提交 %s 的提交图形父提交列表过早终止"
1744
a5cd71ca 1745#: commit-graph.c:2064
d46c5519
JX
1746#, c-format
1747msgid ""
1748"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
1749msgstr "提交图形中提交 %s 的世代号是零,但其它地方非零"
1750
a5cd71ca 1751#: commit-graph.c:2068
d46c5519
JX
1752#, c-format
1753msgid ""
1754"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
1755msgstr "提交图形中提交 %s 的世代号非零,但其它地方是零"
1756
a5cd71ca 1757#: commit-graph.c:2083
d46c5519
JX
1758#, c-format
1759msgid "commit-graph generation for commit %s is %u != %u"
1760msgstr "提交图形中的提交 %s 的世代号是 %u != %u"
1761
a5cd71ca 1762#: commit-graph.c:2089
d46c5519
JX
1763#, c-format
1764msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
1765msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
1766
06991777 1767#: compat/obstack.c:406 compat/obstack.c:408
a0b6b246
JX
1768msgid "memory exhausted"
1769msgstr "内存耗尽"
90314792 1770
a6cd2cc4 1771#: config.c:124
c1ac5258
JX
1772#, c-format
1773msgid ""
1774"exceeded maximum include depth (%d) while including\n"
1775"\t%s\n"
1776"from\n"
1777"\t%s\n"
1778"This might be due to circular includes."
1779msgstr ""
e640d114 1780"超过了最大包含深度(%1$d),当从\n"
c1ac5258
JX
1781"\t%3$s\n"
1782"包含\n"
1783"\t%2$s\n"
e640d114 1784"这可能是因为循环包含。"
c1ac5258 1785
a6cd2cc4 1786#: config.c:140
c1ac5258
JX
1787#, c-format
1788msgid "could not expand include path '%s'"
1789msgstr "无法扩展包含路径 '%s'"
1790
a6cd2cc4 1791#: config.c:151
c1ac5258
JX
1792msgid "relative config includes must come from files"
1793msgstr "相对路径的配置文件引用必须来自于文件"
1794
a6cd2cc4 1795#: config.c:197
87cb7997 1796msgid "relative config include conditionals must come from files"
c1ac5258
JX
1797msgstr "相对路径的配置文件条件引用必须来自于文件"
1798
a6cd2cc4 1799#: config.c:376
c1ac5258
JX
1800#, c-format
1801msgid "key does not contain a section: %s"
1802msgstr "键名没有包含一个小节名称:%s"
87cb7997 1803
a6cd2cc4 1804#: config.c:382
c1ac5258
JX
1805#, c-format
1806msgid "key does not contain variable name: %s"
1807msgstr "键名没有包含变量名:%s"
1808
a5cd71ca 1809#: config.c:406 sequencer.c:2401
c1ac5258
JX
1810#, c-format
1811msgid "invalid key: %s"
1812msgstr "无效键名:%s"
1813
a6cd2cc4 1814#: config.c:412
c1ac5258
JX
1815#, c-format
1816msgid "invalid key (newline): %s"
1817msgstr "无效键名(有换行符):%s"
1818
a6cd2cc4 1819#: config.c:448 config.c:460
c1ac5258
JX
1820#, c-format
1821msgid "bogus config parameter: %s"
1822msgstr "伪配置参数:%s"
1823
a6cd2cc4 1824#: config.c:495
c1ac5258
JX
1825#, c-format
1826msgid "bogus format in %s"
1827msgstr "%s 中格式错误"
1828
a6cd2cc4 1829#: config.c:821
90314792 1830#, c-format
a0b6b246
JX
1831msgid "bad config line %d in blob %s"
1832msgstr "数据对象 %2$s 中错误的配置行 %1$d"
90314792 1833
a6cd2cc4 1834#: config.c:825
a77c07d9 1835#, c-format
a0b6b246
JX
1836msgid "bad config line %d in file %s"
1837msgstr "文件 %2$s 中错误的配置行 %1$d"
a77c07d9 1838
a6cd2cc4 1839#: config.c:829
a77c07d9 1840#, c-format
a0b6b246
JX
1841msgid "bad config line %d in standard input"
1842msgstr "标准输入中错误的配置行 %d"
a77c07d9 1843
a6cd2cc4 1844#: config.c:833
90314792 1845#, c-format
a0b6b246
JX
1846msgid "bad config line %d in submodule-blob %s"
1847msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
90314792 1848
a6cd2cc4 1849#: config.c:837
90314792 1850#, c-format
a0b6b246
JX
1851msgid "bad config line %d in command line %s"
1852msgstr "命令行 %2$s 中错误的配置行 %1$d"
90314792 1853
a6cd2cc4 1854#: config.c:841
90314792 1855#, c-format
a0b6b246
JX
1856msgid "bad config line %d in %s"
1857msgstr "在 %2$s 中错误的配置行 %1$d"
220c313c 1858
a6cd2cc4 1859#: config.c:978
a0b6b246
JX
1860msgid "out of range"
1861msgstr "超出范围"
6c94aba5 1862
a6cd2cc4 1863#: config.c:978
a0b6b246
JX
1864msgid "invalid unit"
1865msgstr "无效的单位"
6c94aba5 1866
a6cd2cc4 1867#: config.c:979
6c94aba5 1868#, c-format
a0b6b246
JX
1869msgid "bad numeric config value '%s' for '%s': %s"
1870msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
6c94aba5 1871
a6cd2cc4 1872#: config.c:998
1b7f4a34 1873#, c-format
a0b6b246
JX
1874msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
1875msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 1876
a6cd2cc4 1877#: config.c:1001
1b7f4a34 1878#, c-format
a0b6b246
JX
1879msgid "bad numeric config value '%s' for '%s' in file %s: %s"
1880msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 1881
a6cd2cc4 1882#: config.c:1004
1b7f4a34 1883#, c-format
a0b6b246
JX
1884msgid "bad numeric config value '%s' for '%s' in standard input: %s"
1885msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
1b7f4a34 1886
a6cd2cc4 1887#: config.c:1007
1b7f4a34 1888#, c-format
a0b6b246
JX
1889msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
1890msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 1891
a6cd2cc4 1892#: config.c:1010
94550ed3 1893#, c-format
a0b6b246
JX
1894msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
1895msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 1896
a6cd2cc4 1897#: config.c:1013
276ceeaa 1898#, c-format
a0b6b246
JX
1899msgid "bad numeric config value '%s' for '%s' in %s: %s"
1900msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 1901
a6cd2cc4 1902#: config.c:1108
276ceeaa 1903#, c-format
a0b6b246 1904msgid "failed to expand user dir in: '%s'"
c1ac5258 1905msgstr "无法扩展用户目录:'%s'"
94550ed3 1906
a6cd2cc4 1907#: config.c:1117
5809aa05
JX
1908#, c-format
1909msgid "'%s' for '%s' is not a valid timestamp"
1910msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
1911
a6cd2cc4 1912#: config.c:1208
c1ac5258
JX
1913#, c-format
1914msgid "abbrev length out of range: %d"
1915msgstr "缩写长度超出范围:%d"
1916
a6cd2cc4 1917#: config.c:1222 config.c:1233
3495628d 1918#, c-format
a0b6b246
JX
1919msgid "bad zlib compression level %d"
1920msgstr "错误的 zlib 压缩级别 %d"
3495628d 1921
a6cd2cc4 1922#: config.c:1325
c1ac5258
JX
1923msgid "core.commentChar should only be one character"
1924msgstr "core.commentChar 应该是一个字符"
1925
a6cd2cc4 1926#: config.c:1358
3495628d 1927#, c-format
a0b6b246
JX
1928msgid "invalid mode for object creation: %s"
1929msgstr "无效的对象创建模式:%s"
3495628d 1930
a5cd71ca 1931#: config.c:1425
c1ac5258
JX
1932#, c-format
1933msgid "malformed value for %s"
1934msgstr "%s 的取值格式错误"
1935
a5cd71ca 1936#: config.c:1451
c1ac5258
JX
1937#, c-format
1938msgid "malformed value for %s: %s"
1939msgstr "%s 的取值格式错误:%s"
1940
a5cd71ca 1941#: config.c:1452
c1ac5258
JX
1942msgid "must be one of nothing, matching, simple, upstream or current"
1943msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current"
1944
a5cd71ca 1945#: config.c:1513 builtin/pack-objects.c:3394
1a79b2f1
JX
1946#, c-format
1947msgid "bad pack compression level %d"
1948msgstr "错误的打包压缩级别 %d"
1949
a5cd71ca 1950#: config.c:1634
c1ac5258
JX
1951#, c-format
1952msgid "unable to load config blob object '%s'"
1953msgstr "无法从数据对象 '%s' 加载配置"
1954
a5cd71ca 1955#: config.c:1637
c1ac5258
JX
1956#, c-format
1957msgid "reference '%s' does not point to a blob"
1958msgstr "引用 '%s' 没有指向一个数据对象"
1959
a5cd71ca 1960#: config.c:1654
c1ac5258
JX
1961#, c-format
1962msgid "unable to resolve config blob '%s'"
1963msgstr "不能解析配置对象 '%s'"
1964
a5cd71ca 1965#: config.c:1684
c1ac5258
JX
1966#, c-format
1967msgid "failed to parse %s"
1968msgstr "解析 %s 失败"
1969
a5cd71ca 1970#: config.c:1740
a0b6b246
JX
1971msgid "unable to parse command-line config"
1972msgstr "无法解析命令行中的配置"
94550ed3 1973
a5cd71ca 1974#: config.c:2091
a0b6b246
JX
1975msgid "unknown error occurred while reading the configuration files"
1976msgstr "在读取配置文件时遇到未知错误"
94550ed3 1977
a5cd71ca 1978#: config.c:2261
87cb7997
JX
1979#, c-format
1980msgid "Invalid %s: '%s'"
1981msgstr "无效 %s:'%s'"
1982
a5cd71ca 1983#: config.c:2306
87cb7997
JX
1984#, c-format
1985msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
1986msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
1987
a5cd71ca 1988#: config.c:2352
276ceeaa 1989#, c-format
a0b6b246
JX
1990msgid "unable to parse '%s' from command-line config"
1991msgstr "无法解析命令行配置中的 '%s'"
1b7f4a34 1992
a5cd71ca 1993#: config.c:2354
94550ed3 1994#, c-format
a0b6b246
JX
1995msgid "bad config variable '%s' in file '%s' at line %d"
1996msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
94550ed3 1997
a5cd71ca 1998#: config.c:2435
c1ac5258
JX
1999#, c-format
2000msgid "invalid section name '%s'"
2001msgstr "无效的小节名称 '%s'"
2002
a5cd71ca 2003#: config.c:2467
276ceeaa 2004#, c-format
a0b6b246
JX
2005msgid "%s has multiple values"
2006msgstr "%s 有多个取值"
276ceeaa 2007
a5cd71ca 2008#: config.c:2496
c1ac5258
JX
2009#, c-format
2010msgid "failed to write new configuration file %s"
2011msgstr "写入新的配置文件 %s 失败"
2012
a5cd71ca 2013#: config.c:2748 config.c:3072
c1ac5258
JX
2014#, c-format
2015msgid "could not lock config file %s"
2016msgstr "不能锁定配置文件 %s"
2017
a5cd71ca 2018#: config.c:2759
c1ac5258
JX
2019#, c-format
2020msgid "opening %s"
2021msgstr "打开 %s"
2022
a5cd71ca 2023#: config.c:2794 builtin/config.c:328
c1ac5258
JX
2024#, c-format
2025msgid "invalid pattern: %s"
2026msgstr "无效模式:%s"
2027
a5cd71ca 2028#: config.c:2819
c1ac5258
JX
2029#, c-format
2030msgid "invalid config file %s"
2031msgstr "无效的配置文件 %s"
2032
a5cd71ca 2033#: config.c:2832 config.c:3085
1a79b2f1
JX
2034#, c-format
2035msgid "fstat on %s failed"
65e2041e 2036msgstr "对 %s 调用 fstat 失败"
1a79b2f1 2037
a5cd71ca 2038#: config.c:2843
c1ac5258
JX
2039#, c-format
2040msgid "unable to mmap '%s'"
2041msgstr "不能 mmap '%s'"
2042
a5cd71ca 2043#: config.c:2852 config.c:3090
c1ac5258
JX
2044#, c-format
2045msgid "chmod on %s failed"
2046msgstr "对 %s 调用 chmod 失败"
2047
a5cd71ca 2048#: config.c:2937 config.c:3187
c1ac5258
JX
2049#, c-format
2050msgid "could not write config file %s"
2051msgstr "不能写入配置文件 %s"
2052
a5cd71ca 2053#: config.c:2971
94550ed3 2054#, c-format
a0b6b246
JX
2055msgid "could not set '%s' to '%s'"
2056msgstr "不能设置 '%s' 为 '%s'"
94550ed3 2057
a5cd71ca 2058#: config.c:2973 builtin/remote.c:782
276ceeaa 2059#, c-format
a0b6b246
JX
2060msgid "could not unset '%s'"
2061msgstr "不能取消设置 '%s'"
276ceeaa 2062
a5cd71ca 2063#: config.c:3063
c1ac5258
JX
2064#, c-format
2065msgid "invalid section name: %s"
2066msgstr "无效的小节名称:%s"
2067
a5cd71ca 2068#: config.c:3230
c1ac5258
JX
2069#, c-format
2070msgid "missing value for '%s'"
2071msgstr "%s 的取值缺失"
2072
fd8cb379 2073#: connect.c:61
c1ac5258
JX
2074msgid "the remote end hung up upon initial contact"
2075msgstr "远端在初始连接时即挂断"
94550ed3 2076
fd8cb379 2077#: connect.c:63
a0b6b246
JX
2078msgid ""
2079"Could not read from remote repository.\n"
2080"\n"
2081"Please make sure you have the correct access rights\n"
2082"and the repository exists."
2083msgstr ""
2084"无法读取远程仓库。\n"
2085"\n"
2086"请确认您有正确的访问权限并且仓库存在。"
2087
c1ac5258
JX
2088#: connect.c:81
2089#, c-format
2090msgid "server doesn't support '%s'"
2091msgstr "服务器不支持 '%s'"
2092
2093#: connect.c:103
2094#, c-format
2095msgid "server doesn't support feature '%s'"
2096msgstr "服务器不支持特性 '%s'"
2097
2098#: connect.c:114
2099msgid "expected flush after capabilities"
2100msgstr "在能力之后应为一个 flush 包"
2101
2102#: connect.c:233
2103#, c-format
2104msgid "ignoring capabilities after first line '%s'"
e640d114 2105msgstr "忽略第一行 '%s' 之后的能力字段"
c1ac5258
JX
2106
2107#: connect.c:252
2108msgid "protocol error: unexpected capabilities^{}"
2109msgstr "协议错误:意外的 capabilities^{}"
2110
2111#: connect.c:273
2112#, c-format
2113msgid "protocol error: expected shallow sha-1, got '%s'"
2114msgstr "协议错误:预期浅克隆 sha-1,却得到 '%s'"
2115
2116#: connect.c:275
2117msgid "repository on the other end cannot be shallow"
2118msgstr "另一端的仓库不能是浅克隆仓库"
2119
06991777 2120#: connect.c:313
c1ac5258
JX
2121msgid "invalid packet"
2122msgstr "无效数据包"
2123
06991777 2124#: connect.c:333
c1ac5258
JX
2125#, c-format
2126msgid "protocol error: unexpected '%s'"
2127msgstr "协议错误:意外的 '%s'"
2128
06991777 2129#: connect.c:441
c1ac5258
JX
2130#, c-format
2131msgid "invalid ls-refs response: %s"
2132msgstr "无效的 ls-refs 响应:%s"
2133
06991777 2134#: connect.c:445
c1ac5258
JX
2135msgid "expected flush after ref listing"
2136msgstr "在引用列表之后应该有一个 flush 包"
2137
06991777 2138#: connect.c:544
c1ac5258
JX
2139#, c-format
2140msgid "protocol '%s' is not supported"
2141msgstr "不支持 '%s' 协议"
2142
06991777 2143#: connect.c:595
c1ac5258
JX
2144msgid "unable to set SO_KEEPALIVE on socket"
2145msgstr "无法为 socket 设置 SO_KEEPALIVE"
2146
06991777 2147#: connect.c:635 connect.c:698
c1ac5258
JX
2148#, c-format
2149msgid "Looking up %s ... "
2150msgstr "查找 %s ..."
2151
06991777 2152#: connect.c:639
c1ac5258
JX
2153#, c-format
2154msgid "unable to look up %s (port %s) (%s)"
2155msgstr "无法查找 %s(端口 %s)(%s)"
2156
2157#. TRANSLATORS: this is the end of "Looking up %s ... "
06991777 2158#: connect.c:643 connect.c:714
c1ac5258
JX
2159#, c-format
2160msgid ""
2161"done.\n"
2162"Connecting to %s (port %s) ... "
2163msgstr ""
2164"完成。\n"
2165"连接到 %s(端口 %s)... "
2166
06991777 2167#: connect.c:665 connect.c:742
c1ac5258
JX
2168#, c-format
2169msgid ""
2170"unable to connect to %s:\n"
2171"%s"
2172msgstr ""
2173"无法连接到 %s:\n"
2174"%s"
2175
2176#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
06991777 2177#: connect.c:671 connect.c:748
c1ac5258
JX
2178msgid "done."
2179msgstr "完成。"
2180
06991777 2181#: connect.c:702
c1ac5258
JX
2182#, c-format
2183msgid "unable to look up %s (%s)"
2184msgstr "无法查找 %s(%s)"
2185
06991777 2186#: connect.c:708
c1ac5258
JX
2187#, c-format
2188msgid "unknown port %s"
2189msgstr "未知端口 %s"
2190
a5cd71ca 2191#: connect.c:845 connect.c:1175
c1ac5258
JX
2192#, c-format
2193msgid "strange hostname '%s' blocked"
2194msgstr "已阻止奇怪的主机名 '%s'"
2195
06991777 2196#: connect.c:847
c1ac5258
JX
2197#, c-format
2198msgid "strange port '%s' blocked"
2199msgstr "已阻止奇怪的端口号 '%s'"
2200
06991777 2201#: connect.c:857
c1ac5258
JX
2202#, c-format
2203msgid "cannot start proxy %s"
2204msgstr "不能启动代理 %s"
2205
a5cd71ca 2206#: connect.c:928
c1ac5258
JX
2207msgid "no path specified; see 'git help pull' for valid url syntax"
2208msgstr "未指定路径,执行 'git help pull' 查看有效的 url 语法"
2209
a5cd71ca 2210#: connect.c:1123
c1ac5258
JX
2211msgid "ssh variant 'simple' does not support -4"
2212msgstr "ssh 变体 'simple' 不支持 -4"
2213
a5cd71ca 2214#: connect.c:1135
c1ac5258
JX
2215msgid "ssh variant 'simple' does not support -6"
2216msgstr "ssh 变体 'simple' 不支持 -6"
2217
a5cd71ca 2218#: connect.c:1152
c1ac5258 2219msgid "ssh variant 'simple' does not support setting port"
e640d114 2220msgstr "ssh 变体 'simple' 不支持设置端口"
c1ac5258 2221
a5cd71ca 2222#: connect.c:1264
c1ac5258
JX
2223#, c-format
2224msgid "strange pathname '%s' blocked"
2225msgstr "已阻止奇怪的路径名 '%s'"
2226
a5cd71ca 2227#: connect.c:1311
c1ac5258
JX
2228msgid "unable to fork"
2229msgstr "无法 fork"
2230
a5cd71ca 2231#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43
a0b6b246 2232msgid "Checking connectivity"
06991777 2233msgstr "正在检查连通性"
a0b6b246 2234
a5cd71ca 2235#: connected.c:100
a0b6b246
JX
2236msgid "Could not run 'git rev-list'"
2237msgstr "不能执行 'git rev-list'"
2238
a5cd71ca 2239#: connected.c:120
a0b6b246 2240msgid "failed write to rev-list"
c1ac5258 2241msgstr "写入 rev-list 失败"
a0b6b246 2242
a5cd71ca 2243#: connected.c:127
a0b6b246 2244msgid "failed to close rev-list's stdin"
c1ac5258
JX
2245msgstr "关闭 rev-list 的标准输入失败"
2246
a5cd71ca 2247#: convert.c:194
c1ac5258
JX
2248#, c-format
2249msgid "illegal crlf_action %d"
2250msgstr "非法的 crlf 动作 %d"
a0b6b246 2251
a5cd71ca 2252#: convert.c:207
3495628d 2253#, c-format
c1ac5258
JX
2254msgid "CRLF would be replaced by LF in %s"
2255msgstr "%s 中的 CRLF 将被 LF 替换"
31e5e17b 2256
a5cd71ca 2257#: convert.c:209
31e5e17b 2258#, c-format
a0b6b246
JX
2259msgid ""
2260"CRLF will be replaced by LF in %s.\n"
c1ac5258 2261"The file will have its original line endings in your working directory"
a0b6b246 2262msgstr ""
c1ac5258 2263"%s 中的 CRLF 将被 LF 替换。<\n"
a0b6b246 2264"在工作区中该文件仍保持原有的换行符。"
3495628d 2265
a5cd71ca 2266#: convert.c:217
3495628d 2267#, c-format
31e5e17b
JX
2268msgid "LF would be replaced by CRLF in %s"
2269msgstr "文件 %s 中的 LF 将被 CRLF 替换"
3495628d 2270
a5cd71ca 2271#: convert.c:219
276ceeaa 2272#, c-format
a0b6b246
JX
2273msgid ""
2274"LF will be replaced by CRLF in %s.\n"
c1ac5258 2275"The file will have its original line endings in your working directory"
a0b6b246 2276msgstr ""
c1ac5258
JX
2277"%s 中的 LF 将被 CRLF 替换。\n"
2278"在工作区中该文件仍保持原有的换行符"
276ceeaa 2279
a5cd71ca 2280#: convert.c:280
fd8cb379
JX
2281#, c-format
2282msgid "BOM is prohibited in '%s' if encoded as %s"
2283msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM"
2284
a5cd71ca 2285#: convert.c:287
fd8cb379
JX
2286#, c-format
2287msgid ""
2288"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
2289"tree-encoding."
2290msgstr "文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%s 作为工作区编码。"
2291
a5cd71ca 2292#: convert.c:305
fd8cb379
JX
2293#, c-format
2294msgid "BOM is required in '%s' if encoded as %s"
2295msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM"
2296
a5cd71ca 2297#: convert.c:307
fd8cb379
JX
2298#, c-format
2299msgid ""
2300"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
2301"%sLE (depending on the byte order) as working-tree-encoding."
2302msgstr ""
2303"文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字"
2304"节序)作为工作区编码。"
2305
a5cd71ca 2306#: convert.c:425 convert.c:496
fd8cb379
JX
2307#, c-format
2308msgid "failed to encode '%s' from %s to %s"
2309msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
2310
a5cd71ca 2311#: convert.c:468
fd8cb379
JX
2312#, c-format
2313msgid "encoding '%s' from %s to %s and back is not the same"
2314msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
2315
a5cd71ca 2316#: convert.c:674
c1ac5258
JX
2317#, c-format
2318msgid "cannot fork to run external filter '%s'"
e640d114 2319msgstr "不能 fork 以执行外部过滤器 '%s'"
c1ac5258 2320
a5cd71ca 2321#: convert.c:694
c1ac5258
JX
2322#, c-format
2323msgid "cannot feed the input to external filter '%s'"
e640d114 2324msgstr "不能将输入传递给外部过滤器 '%s'"
c1ac5258 2325
a5cd71ca 2326#: convert.c:701
c1ac5258
JX
2327#, c-format
2328msgid "external filter '%s' failed %d"
e640d114 2329msgstr "外部过滤器 '%s' 失败码 %d"
c1ac5258 2330
a5cd71ca 2331#: convert.c:736 convert.c:739
c1ac5258
JX
2332#, c-format
2333msgid "read from external filter '%s' failed"
2334msgstr "从外部过滤器 '%s' 读取失败"
2335
a5cd71ca 2336#: convert.c:742 convert.c:797
c1ac5258
JX
2337#, c-format
2338msgid "external filter '%s' failed"
2339msgstr "外部过滤器 '%s' 失败"
2340
a5cd71ca 2341#: convert.c:845
c1ac5258
JX
2342msgid "unexpected filter type"
2343msgstr "意外的过滤类型"
2344
a5cd71ca 2345#: convert.c:856
c1ac5258
JX
2346msgid "path name too long for external filter"
2347msgstr "外部过滤器的路径名太长"
2348
a5cd71ca 2349#: convert.c:930
c1ac5258
JX
2350#, c-format
2351msgid ""
2352"external filter '%s' is not available anymore although not all paths have "
2353"been filtered"
2354msgstr "外部过滤器 '%s' 不再可用,但并非所有路径都已过滤"
2355
a5cd71ca 2356#: convert.c:1229
fd8cb379
JX
2357msgid "true/false are no valid working-tree-encodings"
2358msgstr "true/false 不是有效的工作区编码"
2359
a5cd71ca 2360#: convert.c:1417 convert.c:1451
c1ac5258
JX
2361#, c-format
2362msgid "%s: clean filter '%s' failed"
2363msgstr "%s:clean 过滤器 '%s' 失败"
2364
a5cd71ca 2365#: convert.c:1495
c1ac5258
JX
2366#, c-format
2367msgid "%s: smudge filter %s failed"
2368msgstr "%s:smudge 过滤器 %s 失败"
2369
a5cd71ca 2370#: date.c:138
a0b6b246
JX
2371msgid "in the future"
2372msgstr "在将来"
3495628d 2373
a5cd71ca 2374#: date.c:144
3495628d 2375#, c-format
a4f16749
JX
2376msgid "%<PRIuMAX> second ago"
2377msgid_plural "%<PRIuMAX> seconds ago"
2378msgstr[0] "%<PRIuMAX> 秒钟前"
2379msgstr[1] "%<PRIuMAX> 秒钟前"
3495628d 2380
a5cd71ca 2381#: date.c:151
3495628d 2382#, c-format
a4f16749
JX
2383msgid "%<PRIuMAX> minute ago"
2384msgid_plural "%<PRIuMAX> minutes ago"
2385msgstr[0] "%<PRIuMAX> 分钟前"
2386msgstr[1] "%<PRIuMAX> 分钟前"
3495628d 2387
a5cd71ca 2388#: date.c:158
3495628d 2389#, c-format
a4f16749
JX
2390msgid "%<PRIuMAX> hour ago"
2391msgid_plural "%<PRIuMAX> hours ago"
2392msgstr[0] "%<PRIuMAX> 小时前"
2393msgstr[1] "%<PRIuMAX> 小时前"
3495628d 2394
a5cd71ca 2395#: date.c:165
3495628d 2396#, c-format
a4f16749
JX
2397msgid "%<PRIuMAX> day ago"
2398msgid_plural "%<PRIuMAX> days ago"
2399msgstr[0] "%<PRIuMAX> 天前"
2400msgstr[1] "%<PRIuMAX> 天前"
3495628d 2401
a5cd71ca 2402#: date.c:171
94550ed3 2403#, c-format
a4f16749
JX
2404msgid "%<PRIuMAX> week ago"
2405msgid_plural "%<PRIuMAX> weeks ago"
2406msgstr[0] "%<PRIuMAX> 周前"
2407msgstr[1] "%<PRIuMAX> 周前"
94550ed3 2408
a5cd71ca 2409#: date.c:178
3495628d 2410#, c-format
a4f16749
JX
2411msgid "%<PRIuMAX> month ago"
2412msgid_plural "%<PRIuMAX> months ago"
2413msgstr[0] "%<PRIuMAX> 个月前"
2414msgstr[1] "%<PRIuMAX> 个月前"
3495628d 2415
a5cd71ca 2416#: date.c:189
3495628d 2417#, c-format
a4f16749
JX
2418msgid "%<PRIuMAX> year"
2419msgid_plural "%<PRIuMAX> years"
2420msgstr[0] "%<PRIuMAX> 年"
2421msgstr[1] "%<PRIuMAX> 年"
3495628d 2422
a0b6b246 2423#. TRANSLATORS: "%s" is "<n> years"
a5cd71ca 2424#: date.c:192
94550ed3 2425#, c-format
a4f16749
JX
2426msgid "%s, %<PRIuMAX> month ago"
2427msgid_plural "%s, %<PRIuMAX> months ago"
2428msgstr[0] "%s %<PRIuMAX> 个月前"
2429msgstr[1] "%s %<PRIuMAX> 个月前"
94550ed3 2430
a5cd71ca 2431#: date.c:197 date.c:202
94550ed3 2432#, c-format
a4f16749
JX
2433msgid "%<PRIuMAX> year ago"
2434msgid_plural "%<PRIuMAX> years ago"
2435msgstr[0] "%<PRIuMAX> 年前"
2436msgstr[1] "%<PRIuMAX> 年前"
94550ed3 2437
06991777 2438#: delta-islands.c:272
4c27fcb5
JX
2439msgid "Propagating island marks"
2440msgstr "正在传播数据岛标记"
2441
06991777 2442#: delta-islands.c:290
4c27fcb5
JX
2443#, c-format
2444msgid "bad tree object %s"
2445msgstr "坏的树对象 %s"
2446
06991777 2447#: delta-islands.c:334
4c27fcb5
JX
2448#, c-format
2449msgid "failed to load island regex for '%s': %s"
2450msgstr "未能加载 '%s' 的数据岛正则表达式:%s"
2451
06991777 2452#: delta-islands.c:390
4c27fcb5
JX
2453#, c-format
2454msgid "island regex from config has too many capture groups (max=%d)"
2455msgstr "来自 config 的数据岛正则表达式有太多的捕获组(最多 %d 个)"
2456
a6cd2cc4 2457#: delta-islands.c:467
4c27fcb5
JX
2458#, c-format
2459msgid "Marked %d islands, done.\n"
2460msgstr "已标记 %d 个数据岛,结束。\n"
2461
a0b6b246 2462#: diffcore-order.c:24
cfff71a9 2463#, c-format
a0b6b246 2464msgid "failed to read orderfile '%s'"
c1ac5258 2465msgstr "读取排序文件 '%s' 失败"
cfff71a9 2466
a5cd71ca 2467#: diffcore-rename.c:543
a0b6b246 2468msgid "Performing inexact rename detection"
87cb7997 2469msgstr "正在进行非精确的重命名探测"
cfff71a9 2470
d46c5519
JX
2471#: diff-no-index.c:238
2472msgid "git diff --no-index [<options>] <path> <path>"
2473msgstr "git diff --no-index [<选项>] <路径> <路径>"
2474
2475#: diff-no-index.c:263
2476msgid ""
2477"Not a git repository. Use --no-index to compare two paths outside a working "
2478"tree"
2479msgstr "不是一个 git 仓库。使用 --no-index 比较工作区之外的两个路径"
cfff71a9 2480
a0b6b246 2481# 译者:注意保持前导空格
d46c5519 2482#: diff.c:155
a0b6b246
JX
2483#, c-format
2484msgid " Failed to parse dirstat cut-off percentage '%s'\n"
2485msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
cfff71a9 2486
a0b6b246 2487# 译者:注意保持前导空格
d46c5519 2488#: diff.c:160
a0b6b246
JX
2489#, c-format
2490msgid " Unknown dirstat parameter '%s'\n"
2491msgstr " 未知的 dirstat 参数 '%s'\n"
7aea43ff 2492
d46c5519 2493#: diff.c:296
6937cb4e 2494msgid ""
c1ac5258
JX
2495"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
2496"'dimmed-zebra', 'plain'"
5809aa05 2497msgstr ""
c1ac5258
JX
2498"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "
2499"'plain'"
2500
d46c5519 2501#: diff.c:324
c1ac5258 2502#, c-format
06991777
JX
2503msgid ""
2504"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
2505"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
2506msgstr ""
2507"未知的 color-moved-ws 模式 '%s',可能的取值有 'ignore-space-change'、'ignore-"
2508"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
c1ac5258 2509
d46c5519 2510#: diff.c:332
c1ac5258 2511msgid ""
06991777
JX
2512"color-moved-ws: allow-indentation-change cannot be combined with other "
2513"whitespace modes"
c1ac5258 2514msgstr "color-moved-ws:allow-indentation-change 不能与其它空白字符模式共用"
6937cb4e 2515
d46c5519 2516#: diff.c:405
7aea43ff 2517#, c-format
a0b6b246
JX
2518msgid "Unknown value for 'diff.submodule' config variable: '%s'"
2519msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
7aea43ff 2520
d46c5519 2521#: diff.c:465
7aea43ff 2522#, c-format
a0b6b246
JX
2523msgid ""
2524"Found errors in 'diff.dirstat' config variable:\n"
2525"%s"
2526msgstr ""
2527"发现配置变量 'diff.dirstat' 中的错误:\n"
2528"%s"
7aea43ff 2529
a5cd71ca 2530#: diff.c:4218
7aea43ff 2531#, c-format
a0b6b246
JX
2532msgid "external diff died, stopping at %s"
2533msgstr "外部 diff 退出,停止在 %s"
7aea43ff 2534
a5cd71ca 2535#: diff.c:4563
a0b6b246
JX
2536msgid "--name-only, --name-status, --check and -s are mutually exclusive"
2537msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
2538
a5cd71ca 2539#: diff.c:4566
31e5e17b
JX
2540msgid "-G, -S and --find-object are mutually exclusive"
2541msgstr "-G、-S 和 --find-object 是互斥的"
2542
a5cd71ca 2543#: diff.c:4644
a0b6b246
JX
2544msgid "--follow requires exactly one pathspec"
2545msgstr "--follow 明确要求只跟一个路径规格"
2546
a5cd71ca 2547#: diff.c:4692
d46c5519
JX
2548#, c-format
2549msgid "invalid --stat value: %s"
2550msgstr "无效的 --stat 值:%s"
2551
a5cd71ca 2552#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225
d46c5519
JX
2553#: parse-options.c:199 parse-options.c:203
2554#, c-format
2555msgid "%s expects a numerical value"
2556msgstr "%s 期望一个数字值"
2557
a5cd71ca 2558#: diff.c:4729
7aea43ff 2559#, c-format
a0b6b246
JX
2560msgid ""
2561"Failed to parse --dirstat/-X option parameter:\n"
2562"%s"
2563msgstr ""
2564"无法解析 --dirstat/-X 选项的参数:\n"
2565"%s"
7aea43ff 2566
a5cd71ca 2567#: diff.c:4814
d46c5519
JX
2568#, c-format
2569msgid "unknown change class '%c' in --diff-filter=%s"
2570msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
2571
a5cd71ca 2572#: diff.c:4838
d46c5519
JX
2573#, c-format
2574msgid "unknown value after ws-error-highlight=%.*s"
2575msgstr "ws-error-highlight=%.*s 之后未知的值"
2576
a5cd71ca 2577#: diff.c:4852
7aea43ff 2578#, c-format
d46c5519
JX
2579msgid "unable to resolve '%s'"
2580msgstr "不能解析 '%s'"
2581
a5cd71ca 2582#: diff.c:4902 diff.c:4908
d46c5519
JX
2583#, c-format
2584msgid "%s expects <n>/<m> form"
2585msgstr "%s 期望 <n>/<m> 格式"
2586
a5cd71ca 2587#: diff.c:4920
d46c5519
JX
2588#, c-format
2589msgid "%s expects a character, got '%s'"
2590msgstr "%s 期望一个字符,得到 '%s'"
2591
a5cd71ca 2592#: diff.c:4941
d46c5519
JX
2593#, c-format
2594msgid "bad --color-moved argument: %s"
2595msgstr "坏的 --color-moved 参数:%s"
2596
a5cd71ca 2597#: diff.c:4960
d46c5519
JX
2598#, c-format
2599msgid "invalid mode '%s' in --color-moved-ws"
2600msgstr "--color-moved-ws 中的无效模式 '%s' "
2601
a5cd71ca 2602#: diff.c:5000
d46c5519
JX
2603msgid ""
2604"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
2605"\"histogram\""
2606msgstr ""
2607"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
2608
a5cd71ca 2609#: diff.c:5036 diff.c:5056
d46c5519
JX
2610#, c-format
2611msgid "invalid argument to %s"
2612msgstr "%s 的参数无效"
2613
a5cd71ca 2614#: diff.c:5194
d46c5519
JX
2615#, c-format
2616msgid "failed to parse --submodule option parameter: '%s'"
a0b6b246 2617msgstr "无法解析 --submodule 选项的参数:'%s'"
7aea43ff 2618
a5cd71ca 2619#: diff.c:5250
d46c5519
JX
2620#, c-format
2621msgid "bad --word-diff argument: %s"
2622msgstr "坏的 --word-diff 参数:%s"
2623
a5cd71ca 2624#: diff.c:5273
d46c5519
JX
2625msgid "Diff output format options"
2626msgstr "差异输出格式化选项"
2627
a5cd71ca 2628#: diff.c:5275 diff.c:5281
d46c5519
JX
2629msgid "generate patch"
2630msgstr "生成补丁"
2631
a5cd71ca 2632#: diff.c:5278 builtin/log.c:172
d46c5519
JX
2633msgid "suppress diff output"
2634msgstr "不显示差异输出"
2635
a5cd71ca 2636#: diff.c:5283 diff.c:5397 diff.c:5404
d46c5519
JX
2637msgid "<n>"
2638msgstr "<n>"
2639
a5cd71ca 2640#: diff.c:5284 diff.c:5287
d46c5519
JX
2641msgid "generate diffs with <n> lines context"
2642msgstr "生成含 <n> 行上下文的差异"
2643
a5cd71ca 2644#: diff.c:5289
d46c5519
JX
2645msgid "generate the diff in raw format"
2646msgstr "生成原始格式的差异"
2647
a5cd71ca 2648#: diff.c:5292
d46c5519
JX
2649msgid "synonym for '-p --raw'"
2650msgstr "和 '-p --raw' 同义"
2651
a5cd71ca 2652#: diff.c:5296
d46c5519
JX
2653msgid "synonym for '-p --stat'"
2654msgstr "和 '-p --stat' 同义"
2655
a5cd71ca 2656#: diff.c:5300
d46c5519
JX
2657msgid "machine friendly --stat"
2658msgstr "机器友好的 --stat"
2659
a5cd71ca 2660#: diff.c:5303
d46c5519
JX
2661msgid "output only the last line of --stat"
2662msgstr "只输出 --stat 的最后一行"
2663
a5cd71ca 2664#: diff.c:5305 diff.c:5313
d46c5519
JX
2665msgid "<param1,param2>..."
2666msgstr "<参数1,参数2>..."
2667
a5cd71ca 2668#: diff.c:5306
d46c5519
JX
2669msgid ""
2670"output the distribution of relative amount of changes for each sub-directory"
2671msgstr "输出每个子目录相对变更的分布"
2672
a5cd71ca 2673#: diff.c:5310
d46c5519
JX
2674msgid "synonym for --dirstat=cumulative"
2675msgstr "和 --dirstat=cumulative 同义"
2676
a5cd71ca 2677#: diff.c:5314
d46c5519
JX
2678msgid "synonym for --dirstat=files,param1,param2..."
2679msgstr "是 --dirstat=files,param1,param2... 的同义词"
2680
a5cd71ca 2681#: diff.c:5318
d46c5519
JX
2682msgid "warn if changes introduce conflict markers or whitespace errors"
2683msgstr "如果变更中引入冲突定界符或空白错误,给出警告"
2684
a5cd71ca 2685#: diff.c:5321
d46c5519
JX
2686msgid "condensed summary such as creations, renames and mode changes"
2687msgstr "精简摘要,例如创建、重命名和模式变更"
2688
a5cd71ca 2689#: diff.c:5324
d46c5519
JX
2690msgid "show only names of changed files"
2691msgstr "只显示变更文件的文件名"
2692
a5cd71ca 2693#: diff.c:5327
d46c5519
JX
2694msgid "show only names and status of changed files"
2695msgstr "只显示变更文件的文件名和状态"
2696
a5cd71ca 2697#: diff.c:5329
d46c5519
JX
2698msgid "<width>[,<name-width>[,<count>]]"
2699msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
2700
a5cd71ca 2701#: diff.c:5330
d46c5519 2702msgid "generate diffstat"
5b533632 2703msgstr "生成差异统计(diffstat)"
d46c5519 2704
a5cd71ca 2705#: diff.c:5332 diff.c:5335 diff.c:5338
d46c5519
JX
2706msgid "<width>"
2707msgstr "<宽度>"
2708
a5cd71ca 2709#: diff.c:5333
d46c5519
JX
2710msgid "generate diffstat with a given width"
2711msgstr "使用给定的长度生成差异统计"
2712
a5cd71ca 2713#: diff.c:5336
d46c5519
JX
2714msgid "generate diffstat with a given name width"
2715msgstr "使用给定的文件名长度生成差异统计"
2716
a5cd71ca 2717#: diff.c:5339
d46c5519
JX
2718msgid "generate diffstat with a given graph width"
2719msgstr "使用给定的图形长度生成差异统计"
2720
a5cd71ca 2721#: diff.c:5341
d46c5519
JX
2722msgid "<count>"
2723msgstr "<次数>"
2724
a5cd71ca 2725#: diff.c:5342
d46c5519
JX
2726msgid "generate diffstat with limited lines"
2727msgstr "生成有限行数的差异统计"
2728
a5cd71ca 2729#: diff.c:5345
d46c5519
JX
2730msgid "generate compact summary in diffstat"
2731msgstr "生成差异统计的简洁摘要"
2732
a5cd71ca 2733#: diff.c:5348
d46c5519
JX
2734msgid "output a binary diff that can be applied"
2735msgstr "输出一个可以应用的二进制差异"
2736
a5cd71ca 2737#: diff.c:5351
d46c5519
JX
2738msgid "show full pre- and post-image object names on the \"index\" lines"
2739msgstr "在 \"index\" 行显示完整的前后对象名称"
2740
a5cd71ca 2741#: diff.c:5353
d46c5519
JX
2742msgid "show colored diff"
2743msgstr "显示带颜色的差异"
2744
a5cd71ca 2745#: diff.c:5354
d46c5519
JX
2746msgid "<kind>"
2747msgstr "<类型>"
2748
a5cd71ca 2749#: diff.c:5355
d46c5519
JX
2750msgid ""
2751"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
2752"diff"
2753msgstr "对于差异中的上下文、旧的和新的行,加亮显示错误的空白字符"
2754
a5cd71ca 2755#: diff.c:5358
d46c5519
JX
2756msgid ""
2757"do not munge pathnames and use NULs as output field terminators in --raw or "
2758"--numstat"
2759msgstr ""
2760"在 --raw 或者 --numstat 中,不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
2761"符"
2762
a5cd71ca 2763#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473
d46c5519
JX
2764msgid "<prefix>"
2765msgstr "<前缀>"
2766
a5cd71ca 2767#: diff.c:5362
d46c5519
JX
2768msgid "show the given source prefix instead of \"a/\""
2769msgstr "显示给定的源前缀取代 \"a/\""
2770
a5cd71ca 2771#: diff.c:5365
d46c5519
JX
2772msgid "show the given destination prefix instead of \"b/\""
2773msgstr "显示给定的目标前缀取代 \"b/\""
2774
a5cd71ca 2775#: diff.c:5368
d46c5519
JX
2776msgid "prepend an additional prefix to every line of output"
2777msgstr "输出的每一行附加前缀"
2778
a5cd71ca 2779#: diff.c:5371
d46c5519
JX
2780msgid "do not show any source or destination prefix"
2781msgstr "不显示任何源和目标前缀"
2782
a5cd71ca 2783#: diff.c:5374
d46c5519
JX
2784msgid "show context between diff hunks up to the specified number of lines"
2785msgstr "显示指定行数的差异块间的上下文"
2786
a5cd71ca 2787#: diff.c:5378 diff.c:5383 diff.c:5388
d46c5519
JX
2788msgid "<char>"
2789msgstr "<字符>"
2790
a5cd71ca 2791#: diff.c:5379
d46c5519
JX
2792msgid "specify the character to indicate a new line instead of '+'"
2793msgstr "指定一个字符取代 '+' 来表示新的一行"
2794
a5cd71ca 2795#: diff.c:5384
d46c5519
JX
2796msgid "specify the character to indicate an old line instead of '-'"
2797msgstr "指定一个字符取代 '-' 来表示旧的一行"
2798
a5cd71ca 2799#: diff.c:5389
d46c5519
JX
2800msgid "specify the character to indicate a context instead of ' '"
2801msgstr "指定一个字符取代 ' ' 来表示一行上下文"
2802
a5cd71ca 2803#: diff.c:5392
d46c5519
JX
2804msgid "Diff rename options"
2805msgstr "差异重命名选项"
2806
a5cd71ca 2807#: diff.c:5393
d46c5519
JX
2808msgid "<n>[/<m>]"
2809msgstr "<n>[/<m>]"
2810
a5cd71ca 2811#: diff.c:5394
d46c5519 2812msgid "break complete rewrite changes into pairs of delete and create"
5b533632 2813msgstr "将完全重写的变更打破为成对的删除和创建"
d46c5519 2814
a5cd71ca 2815#: diff.c:5398
d46c5519
JX
2816msgid "detect renames"
2817msgstr "检测重命名"
2818
a5cd71ca 2819#: diff.c:5402
d46c5519
JX
2820msgid "omit the preimage for deletes"
2821msgstr "省略删除操作的差异输出"
2822
a5cd71ca 2823#: diff.c:5405
d46c5519
JX
2824msgid "detect copies"
2825msgstr "检测拷贝"
2826
a5cd71ca 2827#: diff.c:5409
d46c5519
JX
2828msgid "use unmodified files as source to find copies"
2829msgstr "使用未修改的文件做为发现拷贝的源"
2830
a5cd71ca 2831#: diff.c:5411
d46c5519
JX
2832msgid "disable rename detection"
2833msgstr "禁用重命名探测"
2834
a5cd71ca 2835#: diff.c:5414
d46c5519
JX
2836msgid "use empty blobs as rename source"
2837msgstr "使用空的数据对象做为重命名的源"
2838
a5cd71ca 2839#: diff.c:5416
d46c5519
JX
2840msgid "continue listing the history of a file beyond renames"
2841msgstr "继续列出文件重命名以外的历史记录"
2842
a5cd71ca 2843#: diff.c:5419
d46c5519
JX
2844msgid ""
2845"prevent rename/copy detection if the number of rename/copy targets exceeds "
2846"given limit"
2847msgstr "如果重命名/拷贝目标超过给定的限制,禁止重命名/拷贝检测"
2848
a5cd71ca 2849#: diff.c:5421
d46c5519
JX
2850msgid "Diff algorithm options"
2851msgstr "差异算法选项"
2852
a5cd71ca 2853#: diff.c:5423
d46c5519
JX
2854msgid "produce the smallest possible diff"
2855msgstr "生成尽可能小的差异"
2856
a5cd71ca 2857#: diff.c:5426
d46c5519
JX
2858msgid "ignore whitespace when comparing lines"
2859msgstr "行比较时忽略空白字符"
2860
a5cd71ca 2861#: diff.c:5429
d46c5519
JX
2862msgid "ignore changes in amount of whitespace"
2863msgstr "忽略空白字符的变更"
2864
a5cd71ca 2865#: diff.c:5432
d46c5519
JX
2866msgid "ignore changes in whitespace at EOL"
2867msgstr "忽略行尾的空白字符变更"
2868
a5cd71ca 2869#: diff.c:5435
d46c5519
JX
2870msgid "ignore carrier-return at the end of line"
2871msgstr "忽略行尾的回车符(CR)"
2872
a5cd71ca 2873#: diff.c:5438
d46c5519
JX
2874msgid "ignore changes whose lines are all blank"
2875msgstr "忽略整行都是空白的变更"
2876
a5cd71ca 2877#: diff.c:5441
d46c5519
JX
2878msgid "heuristic to shift diff hunk boundaries for easy reading"
2879msgstr "启发式转换差异边界以便阅读"
2880
a5cd71ca 2881#: diff.c:5444
d46c5519
JX
2882msgid "generate diff using the \"patience diff\" algorithm"
2883msgstr "使用 \"patience diff\" 算法生成差异"
2884
a5cd71ca 2885#: diff.c:5448
d46c5519
JX
2886msgid "generate diff using the \"histogram diff\" algorithm"
2887msgstr "使用 \"histogram diff\" 算法生成差异"
2888
a5cd71ca 2889#: diff.c:5450
d46c5519
JX
2890msgid "<algorithm>"
2891msgstr "<算法>"
2892
a5cd71ca 2893#: diff.c:5451
d46c5519
JX
2894msgid "choose a diff algorithm"
2895msgstr "选择一个差异算法"
2896
a5cd71ca 2897#: diff.c:5453
d46c5519
JX
2898msgid "<text>"
2899msgstr "<文本>"
2900
a5cd71ca 2901#: diff.c:5454
d46c5519 2902msgid "generate diff using the \"anchored diff\" algorithm"
5b533632 2903msgstr "使用 \"anchored diff\" 算法生成差异"
d46c5519 2904
a5cd71ca 2905#: diff.c:5456 diff.c:5465 diff.c:5468
d46c5519
JX
2906msgid "<mode>"
2907msgstr "<模式>"
2908
a5cd71ca 2909#: diff.c:5457
d46c5519
JX
2910msgid "show word diff, using <mode> to delimit changed words"
2911msgstr "显示单词差异,使用 <模式> 分隔变更的单词"
2912
a5cd71ca 2913#: diff.c:5459 diff.c:5462 diff.c:5507
d46c5519
JX
2914msgid "<regex>"
2915msgstr "<正则>"
2916
a5cd71ca 2917#: diff.c:5460
d46c5519
JX
2918msgid "use <regex> to decide what a word is"
2919msgstr "使用 <正则表达式> 确定何为一个词"
2920
a5cd71ca 2921#: diff.c:5463
d46c5519
JX
2922msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
2923msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
2924
a5cd71ca 2925#: diff.c:5466
d46c5519
JX
2926msgid "moved lines of code are colored differently"
2927msgstr "移动的代码行用不同方式着色"
2928
a5cd71ca 2929#: diff.c:5469
d46c5519
JX
2930msgid "how white spaces are ignored in --color-moved"
2931msgstr "在 --color-moved 下如何忽略空白字符"
2932
a5cd71ca 2933#: diff.c:5472
d46c5519
JX
2934msgid "Other diff options"
2935msgstr "其它差异选项"
2936
a5cd71ca 2937#: diff.c:5474
d46c5519
JX
2938msgid "when run from subdir, exclude changes outside and show relative paths"
2939msgstr "当从子目录运行,排除目录之外的变更并显示相对路径"
2940
a5cd71ca 2941#: diff.c:5478
d46c5519
JX
2942msgid "treat all files as text"
2943msgstr "把所有文件当做文本处理"
2944
a5cd71ca 2945#: diff.c:5480
d46c5519
JX
2946msgid "swap two inputs, reverse the diff"
2947msgstr "交换两个输入,反转差异"
2948
a5cd71ca 2949#: diff.c:5482
d46c5519
JX
2950msgid "exit with 1 if there were differences, 0 otherwise"
2951msgstr "有差异时退出码为 1,否则为 0"
2952
a5cd71ca 2953#: diff.c:5484
d46c5519
JX
2954msgid "disable all output of the program"
2955msgstr "禁用本程序的所有输出"
2956
a5cd71ca 2957#: diff.c:5486
d46c5519
JX
2958msgid "allow an external diff helper to be executed"
2959msgstr "允许执行一个外置的差异助手"
2960
a5cd71ca 2961#: diff.c:5488
d46c5519
JX
2962msgid "run external text conversion filters when comparing binary files"
2963msgstr "当比较二进制文件时,运行外部的文本转换过滤器"
2964
a5cd71ca 2965#: diff.c:5490
d46c5519
JX
2966msgid "<when>"
2967msgstr "<何时>"
2968
a5cd71ca 2969#: diff.c:5491
d46c5519
JX
2970msgid "ignore changes to submodules in the diff generation"
2971msgstr "在生成差异时,忽略子模组的更改"
2972
a5cd71ca 2973#: diff.c:5494
d46c5519
JX
2974msgid "<format>"
2975msgstr "<格式>"
2976
a5cd71ca 2977#: diff.c:5495
d46c5519
JX
2978msgid "specify how differences in submodules are shown"
2979msgstr "指定子模组的差异如何显示"
2980
a5cd71ca 2981#: diff.c:5499
d46c5519
JX
2982msgid "hide 'git add -N' entries from the index"
2983msgstr "隐藏索引中 'git add -N' 条目"
2984
a5cd71ca 2985#: diff.c:5502
d46c5519
JX
2986msgid "treat 'git add -N' entries as real in the index"
2987msgstr "将索引中 'git add -N' 条目当做真实的"
2988
a5cd71ca 2989#: diff.c:5504
d46c5519
JX
2990msgid "<string>"
2991msgstr "<字符串>"
2992
a5cd71ca 2993#: diff.c:5505
d46c5519
JX
2994msgid ""
2995"look for differences that change the number of occurrences of the specified "
2996"string"
2997msgstr "查找改变了指定字符串出现次数的差异"
2998
a5cd71ca 2999#: diff.c:5508
d46c5519
JX
3000msgid ""
3001"look for differences that change the number of occurrences of the specified "
3002"regex"
3003msgstr "查找改变指定正则匹配出现次数的差异"
3004
a5cd71ca 3005#: diff.c:5511
d46c5519
JX
3006msgid "show all changes in the changeset with -S or -G"
3007msgstr "显示使用 -S 或 -G 的变更集的所有变更"
3008
a5cd71ca 3009#: diff.c:5514
d46c5519
JX
3010msgid "treat <string> in -S as extended POSIX regular expression"
3011msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
3012
a5cd71ca 3013#: diff.c:5517
d46c5519
JX
3014msgid "control the order in which files appear in the output"
3015msgstr "控制输出中的文件显示顺序"
3016
a5cd71ca 3017#: diff.c:5518
d46c5519 3018msgid "<object-id>"
5b533632 3019msgstr "<对象 ID>"
d46c5519 3020
a5cd71ca 3021#: diff.c:5519