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