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