]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
l10n: zh_CN: for git v2.22.0 l10n round 1~3
[thirdparty/git.git] / po / zh_CN.po
CommitLineData
c04f5ac3
JX
1# Chinese translations for Git package
2# Git 软件包的简体中文翻译.
07432cef 3# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
c04f5ac3 4# This file is distributed under the same license as the Git package.
814ff314 5# Contributors:
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 工具
d46c5519 48# cover letter | 附函
160fb2b2 49# DAG | 有向无环图
e640d114 50# dangling object | 悬空对象
160fb2b2
JX
51# detached HEAD | 分离头指针
52# directory | 目录
53# dirty | 脏(的工作区)
755c831b 54# dumb HTTP protocol | 哑 HTTP 协议
160fb2b2
JX
55# evil merge | 坏合并(合并引入了父提交没有的修改)
56# fast-forward | 快进
57# fetch | 获取
58# file system | 文件系统
e397e7e3 59# fork | 派生
160fb2b2
JX
60# Git archive | 仓库(对于 arch 用户)
61# gitfile | gitfile(仓库链接文件)
fd8cb379 62# grafts | (提交)移植
160fb2b2
JX
63# hash | 哈希值
64# HEAD | HEAD(头指针,亦即当前分支)
65# head | 头、分支
66# head ref | 分支
67# header | 头信息
68# hook | 钩子
69# hunk | 补丁片段
70# index | 索引
71# index entry | 索引条目
72# loose object | 松散对象
73# loose refs | 松散引用
74# master | master(默认分支名)
75# merge | 合并
76# object | 对象
77# object database | 对象库
78# object identifier | 对象标识符
79# object name | 对象名称
80# object type | 对象类型
81# octopus | 章鱼式合并(两分支以上的合并)
82# origin | origin(默认的远程名称)
83# pack | 包
84# pack index | 包索引
85# packfile | 包文件
86# parent | 父提交
87# patch | 补丁
88# pathspec | 路径规格
89# pattern | 模式
12e59059 90# pickaxe | 挖掘
160fb2b2
JX
91# plumbing | 管件(Git 底层核心命令的别称)
92# porcelain | 瓷件(Git 上层封装命令的别称)
94550ed3 93# precious-objects repo | 珍品仓库
160fb2b2
JX
94# prune | 清除
95# pull | 拉,拉取
96# push | 推,推送
97# reachable | 可达
98# rebase | 变基
99# ref | 引用
100# reflog | 引用日志
101# refspec | 引用规格
102# remote | 远程,远程仓库
103# remote-tracking branch | 远程跟踪分支
104# replay | 重放
105# repo | 仓库
106# repository | 仓库
107# resolve | (冲突)解决
108# revert | 还原
109# revision | 版本
110# rewind | 回退
111# SCM | 源代码管理(工具)
ee7589bb 112# SHA-1 | SHA-1(安全哈希算法1)
160fb2b2
JX
113# shallow repository | 浅(克隆)仓库
114# signed tag | 签名标签
755c831b 115# smart HTTP protocol | 智能 HTTP 协议
160fb2b2
JX
116# squash | 压缩
117# stage | n. 暂存区(即索引); v. 暂存
a4f16749 118# stash | n. 贮藏区; v. 贮藏
160fb2b2
JX
119# submodule | 子模组
120# symref | 符号引用
933c015e 121# tag | n. 标签; v. 打标签
160fb2b2
JX
122# tag object | 标签对象
123# tagger | 打标签者
124# topic branch | 主题分支
125# track | 跟踪
6937cb4e 126# trailer | 尾部署名
160fb2b2
JX
127# tree | 树(工作区或树对象)
128# tree object | 树对象
129# tree-ish (also treeish) | 树对象(或可以解析为一树对象)
130# unmerged index | 未合并索引
131# unpack | 解包
132# unreachable object | 不可达对象
133# unstage | 取消暂存
134# upstream | 上游
135# upstream branch | 上游分支
136# working tree | 工作区
137#
c04f5ac3
JX
138msgid ""
139msgstr ""
140"Project-Id-Version: Git\n"
141"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
d46c5519
JX
142"POT-Creation-Date: 2019-06-04 08:24+0800\n"
143"PO-Revision-Date: 2019-06-04 09:04+0800\n"
c04f5ac3 144"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
7aea43ff 145"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
c04f5ac3
JX
146"Language: zh_CN\n"
147"MIME-Version: 1.0\n"
148"Content-Type: text/plain; charset=UTF-8\n"
149"Content-Transfer-Encoding: 8bit\n"
5ae481e0 150"Plural-Forms: nplurals=2; plural=(n != 1);\n"
c04f5ac3 151
d46c5519 152#: advice.c:103
c04f5ac3 153#, c-format
fd8cb379
JX
154msgid "%shint: %.*s%s\n"
155msgstr "%s提示:%.*s%s\n"
c04f5ac3 156
d46c5519 157#: advice.c:156
5c57d762
JX
158msgid "Cherry-picking is not possible because you have unmerged files."
159msgstr "无法拣选,因为您有未合并的文件。"
160
d46c5519 161#: advice.c:158
5c57d762
JX
162msgid "Committing is not possible because you have unmerged files."
163msgstr "无法提交,因为您有未合并的文件。"
164
d46c5519 165#: advice.c:160
5c57d762
JX
166msgid "Merging is not possible because you have unmerged files."
167msgstr "无法合并,因为您有未合并的文件。"
168
d46c5519 169#: advice.c:162
5c57d762
JX
170msgid "Pulling is not possible because you have unmerged files."
171msgstr "无法拉取,因为您有未合并的文件。"
172
d46c5519 173#: advice.c:164
5c57d762
JX
174msgid "Reverting is not possible because you have unmerged files."
175msgstr "无法回退,因为您有未合并的文件。"
176
d46c5519 177#: advice.c:166
5c57d762
JX
178#, c-format
179msgid "It is not possible to %s because you have unmerged files."
180msgstr "无法 %s,因为您有未合并的文件。"
181
d46c5519 182#: advice.c:174
c04f5ac3 183msgid ""
6acbf033 184"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 185"as appropriate to mark resolution and make a commit."
c04f5ac3 186msgstr ""
d9d56b23 187"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
220c313c 188"解决方案并提交。"
c04f5ac3 189
d46c5519 190#: advice.c:182
5c57d762
JX
191msgid "Exiting because of an unresolved conflict."
192msgstr "因为存在未解决的冲突而退出。"
193
d46c5519 194#: advice.c:187 builtin/merge.c:1320
1b7f4a34
JX
195msgid "You have not concluded your merge (MERGE_HEAD exists)."
196msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
197
d46c5519 198#: advice.c:189
94550ed3 199msgid "Please, commit your changes before merging."
1b7f4a34
JX
200msgstr "请在合并前先提交您的修改。"
201
d46c5519 202#: advice.c:190
1b7f4a34
JX
203msgid "Exiting because of unfinished merge."
204msgstr "因为存在未完成的合并而退出。"
205
d46c5519 206#: advice.c:196
5c57d762
JX
207#, c-format
208msgid ""
209"Note: checking out '%s'.\n"
210"\n"
211"You are in 'detached HEAD' state. You can look around, make experimental\n"
212"changes and commit them, and you can discard any commits you make in this\n"
213"state without impacting any branches by performing another checkout.\n"
214"\n"
215"If you want to create a new branch to retain commits you create, you may\n"
216"do so (now or later) by using -b with the checkout command again. Example:\n"
217"\n"
218" git checkout -b <new-branch-name>\n"
219"\n"
220msgstr ""
221"注意:正在检出 '%s'。\n"
222"\n"
a0b6b246
JX
223"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另"
224"外\n"
5c57d762
JX
225"的检出分支操作丢弃在这个状态下所做的任何提交。\n"
226"\n"
227"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n"
228"参数 -b 来实现(现在或稍后)。例如:\n"
229"\n"
58b6f078 230" git checkout -b <新分支名>\n"
5c57d762
JX
231"\n"
232
06991777
JX
233#: alias.c:50
234msgid "cmdline ends with \\"
235msgstr "命令行以 \\ 结尾"
236
237#: alias.c:51
238msgid "unclosed quote"
239msgstr "未关闭的引号"
240
d46c5519 241#: apply.c:63
a0b6b246
JX
242#, c-format
243msgid "unrecognized whitespace option '%s'"
244msgstr "未能识别的空白字符选项 '%s'"
ef317cd5 245
d46c5519 246#: apply.c:79
90314792 247#, c-format
a0b6b246
JX
248msgid "unrecognized whitespace ignore option '%s'"
249msgstr "未能识别的空白字符忽略选项 '%s'"
90314792 250
d46c5519 251#: apply.c:129
a0b6b246 252msgid "--reject and --3way cannot be used together."
2090d5b4 253msgstr "--reject 和 --3way 不能同时使用。"
ef317cd5 254
d46c5519 255#: apply.c:131
a0b6b246
JX
256msgid "--cached and --3way cannot be used together."
257msgstr "--cached 和 --3way 不能同时使用。"
ef317cd5 258
d46c5519 259#: apply.c:134
a0b6b246
JX
260msgid "--3way outside a repository"
261msgstr "--3way 在一个仓库之外"
ef317cd5 262
d46c5519 263#: apply.c:145
a0b6b246
JX
264msgid "--index outside a repository"
265msgstr "--index 在一个仓库之外"
ef317cd5 266
d46c5519 267#: apply.c:148
a0b6b246
JX
268msgid "--cached outside a repository"
269msgstr "--cached 在一个仓库之外"
ef317cd5 270
d46c5519 271#: apply.c:829
a0b6b246
JX
272#, c-format
273msgid "Cannot prepare timestamp regexp %s"
274msgstr "无法准备时间戳正则表达式 %s"
ef317cd5 275
d46c5519 276#: apply.c:838
a0b6b246
JX
277#, c-format
278msgid "regexec returned %d for input: %s"
279msgstr "regexec 返回 %d,输入为:%s"
ef317cd5 280
d46c5519 281#: apply.c:912
a0b6b246
JX
282#, c-format
283msgid "unable to find filename in patch at line %d"
284msgstr "不能在补丁的第 %d 行找到文件名"
ef317cd5 285
d46c5519 286#: apply.c:950
a0b6b246
JX
287#, c-format
288msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
289msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
ef317cd5 290
d46c5519 291#: apply.c:956
a0b6b246
JX
292#, c-format
293msgid "git apply: bad git-diff - inconsistent new filename on line %d"
294msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
ef317cd5 295
d46c5519 296#: apply.c:957
a0b6b246
JX
297#, c-format
298msgid "git apply: bad git-diff - inconsistent old filename on line %d"
299msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
ef317cd5 300
d46c5519 301#: apply.c:962
a0b6b246
JX
302#, c-format
303msgid "git apply: bad git-diff - expected /dev/null on line %d"
304msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
ef317cd5 305
d46c5519 306#: apply.c:991
a4f16749
JX
307#, c-format
308msgid "invalid mode on line %d: %s"
309msgstr "第 %d 行包含无效文件模式:%s"
310
d46c5519 311#: apply.c:1310
a4f16749
JX
312#, c-format
313msgid "inconsistent header lines %d and %d"
314msgstr "不一致的文件头,%d 行和 %d 行"
315
d46c5519 316#: apply.c:1482
a0b6b246
JX
317#, c-format
318msgid "recount: unexpected line: %.*s"
319msgstr "recount:意外的行:%.*s"
ef317cd5 320
d46c5519 321#: apply.c:1551
a0b6b246
JX
322#, c-format
323msgid "patch fragment without header at line %d: %.*s"
324msgstr "第 %d 行的补丁片段没有头信息:%.*s"
ef317cd5 325
d46c5519 326#: apply.c:1571
a0b6b246
JX
327#, c-format
328msgid ""
329"git diff header lacks filename information when removing %d leading pathname "
330"component (line %d)"
331msgid_plural ""
332"git diff header lacks filename information when removing %d leading pathname "
333"components (line %d)"
334msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
335msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
ef317cd5 336
d46c5519 337#: apply.c:1584
a0b6b246
JX
338#, c-format
339msgid "git diff header lacks filename information (line %d)"
340msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
07432cef 341
d46c5519 342#: apply.c:1772
a0b6b246
JX
343msgid "new file depends on old contents"
344msgstr "新文件依赖旧内容"
5c57d762 345
d46c5519 346#: apply.c:1774
a0b6b246
JX
347msgid "deleted file still has contents"
348msgstr "删除的文件仍有内容"
5c57d762 349
d46c5519 350#: apply.c:1808
a0b6b246
JX
351#, c-format
352msgid "corrupt patch at line %d"
353msgstr "补丁在第 %d 行损坏"
5c57d762 354
d46c5519 355#: apply.c:1845
5c57d762 356#, c-format
a0b6b246
JX
357msgid "new file %s depends on old contents"
358msgstr "新文件 %s 依赖旧内容"
5c57d762 359
d46c5519 360#: apply.c:1847
5c57d762 361#, c-format
a0b6b246
JX
362msgid "deleted file %s still has contents"
363msgstr "删除的文件 %s 仍有内容"
5c57d762 364
d46c5519 365#: apply.c:1850
a0b6b246
JX
366#, c-format
367msgid "** warning: file %s becomes empty but is not deleted"
368msgstr "** 警告:文件 %s 成为空文件但并未删除"
ef317cd5 369
d46c5519 370#: apply.c:1997
5c57d762 371#, c-format
a0b6b246
JX
372msgid "corrupt binary patch at line %d: %.*s"
373msgstr "二进制补丁在第 %d 行损坏:%.*s"
5c57d762 374
d46c5519 375#: apply.c:2034
5c57d762 376#, c-format
a0b6b246
JX
377msgid "unrecognized binary patch at line %d"
378msgstr "未能识别的二进制补丁位于第 %d 行"
5c57d762 379
d46c5519 380#: apply.c:2196
5c57d762 381#, c-format
a0b6b246
JX
382msgid "patch with only garbage at line %d"
383msgstr "补丁文件的第 %d 行只有垃圾数据"
5c57d762 384
d46c5519 385#: apply.c:2282
5c57d762 386#, c-format
a0b6b246
JX
387msgid "unable to read symlink %s"
388msgstr "无法读取符号链接 %s"
5c57d762 389
d46c5519 390#: apply.c:2286
5c57d762 391#, c-format
a0b6b246
JX
392msgid "unable to open or read %s"
393msgstr "不能打开或读取 %s"
5c57d762 394
d46c5519 395#: apply.c:2945
5c57d762 396#, c-format
a0b6b246
JX
397msgid "invalid start of line: '%c'"
398msgstr "无效的行首字符:'%c'"
5c57d762 399
d46c5519 400#: apply.c:3066
5c57d762 401#, c-format
a0b6b246
JX
402msgid "Hunk #%d succeeded at %d (offset %d line)."
403msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
404msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
405msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
5c57d762 406
d46c5519 407#: apply.c:3078
5c57d762 408#, c-format
a0b6b246
JX
409msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
410msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
5c57d762 411
d46c5519 412#: apply.c:3084
5c57d762
JX
413#, c-format
414msgid ""
a0b6b246
JX
415"while searching for:\n"
416"%.*s"
5c57d762 417msgstr ""
a0b6b246
JX
418"当查询:\n"
419"%.*s"
5c57d762 420
d46c5519 421#: apply.c:3106
5c57d762 422#, c-format
a0b6b246
JX
423msgid "missing binary patch data for '%s'"
424msgstr "缺失 '%s' 的二进制补丁数据"
5c57d762 425
d46c5519 426#: apply.c:3114
5c57d762 427#, c-format
a0b6b246 428msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
29004bbb 429msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
5c57d762 430
d46c5519 431#: apply.c:3161
5c57d762 432#, c-format
a0b6b246
JX
433msgid "cannot apply binary patch to '%s' without full index line"
434msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
5c57d762 435
d46c5519 436#: apply.c:3171
5c57d762 437#, c-format
a0b6b246
JX
438msgid ""
439"the patch applies to '%s' (%s), which does not match the current contents."
29004bbb 440msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
5c57d762 441
d46c5519 442#: apply.c:3179
a0b6b246
JX
443#, c-format
444msgid "the patch applies to an empty '%s' but it is not empty"
29004bbb 445msgstr "补丁应用到空文件 '%s',但其并非空文件"
5c57d762 446
d46c5519 447#: apply.c:3197
5c57d762 448#, c-format
a0b6b246 449msgid "the necessary postimage %s for '%s' cannot be read"
e640d114 450msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
5c57d762 451
d46c5519 452#: apply.c:3210
5c57d762 453#, c-format
a0b6b246
JX
454msgid "binary patch does not apply to '%s'"
455msgstr "二进制补丁未应用到 '%s'"
5c57d762 456
d46c5519 457#: apply.c:3216
5c57d762 458#, c-format
a0b6b246
JX
459msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
460msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
5c57d762 461
d46c5519 462#: apply.c:3237
276ceeaa 463#, c-format
a0b6b246
JX
464msgid "patch failed: %s:%ld"
465msgstr "打补丁失败:%s:%ld"
276ceeaa 466
d46c5519 467#: apply.c:3360
4dcdc3d8 468#, c-format
a0b6b246
JX
469msgid "cannot checkout %s"
470msgstr "不能检出 %s"
4dcdc3d8 471
d46c5519 472#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279
4dcdc3d8 473#, c-format
a0b6b246
JX
474msgid "failed to read %s"
475msgstr "无法读取 %s"
4dcdc3d8 476
d46c5519 477#: apply.c:3420
4dcdc3d8 478#, c-format
a0b6b246
JX
479msgid "reading from '%s' beyond a symbolic link"
480msgstr "读取位于符号链接中的 '%s'"
4dcdc3d8 481
d46c5519 482#: apply.c:3449 apply.c:3692
4dcdc3d8 483#, c-format
a0b6b246
JX
484msgid "path %s has been renamed/deleted"
485msgstr "路径 %s 已经被重命名/删除"
4dcdc3d8 486
d46c5519 487#: apply.c:3535 apply.c:3707
4dcdc3d8 488#, c-format
a0b6b246
JX
489msgid "%s: does not exist in index"
490msgstr "%s:不存在于索引中"
4dcdc3d8 491
d46c5519 492#: apply.c:3544 apply.c:3715
4dcdc3d8 493#, c-format
a0b6b246
JX
494msgid "%s: does not match index"
495msgstr "%s:和索引不匹配"
4dcdc3d8 496
d46c5519 497#: apply.c:3579
a0b6b246
JX
498msgid "repository lacks the necessary blob to fall back on 3-way merge."
499msgstr "仓库缺乏必要的数据对象以进行三方合并。"
4dcdc3d8 500
d46c5519 501#: apply.c:3582
4dcdc3d8 502#, c-format
a0b6b246
JX
503msgid "Falling back to three-way merge...\n"
504msgstr "回落到三方合并...\n"
4dcdc3d8 505
d46c5519 506#: apply.c:3598 apply.c:3602
4dcdc3d8 507#, c-format
a0b6b246
JX
508msgid "cannot read the current contents of '%s'"
509msgstr "无法读取 '%s' 的当前内容"
276ceeaa 510
d46c5519 511#: apply.c:3614
4dcdc3d8 512#, c-format
a0b6b246
JX
513msgid "Failed to fall back on three-way merge...\n"
514msgstr "无法回落到三方合并...\n"
4dcdc3d8 515
d46c5519 516#: apply.c:3628
4dcdc3d8 517#, c-format
a0b6b246
JX
518msgid "Applied patch to '%s' with conflicts.\n"
519msgstr "应用补丁到 '%s' 存在冲突。\n"
4dcdc3d8 520
d46c5519 521#: apply.c:3633
4dcdc3d8 522#, c-format
a0b6b246
JX
523msgid "Applied patch to '%s' cleanly.\n"
524msgstr "成功应用补丁到 '%s'。\n"
4dcdc3d8 525
d46c5519 526#: apply.c:3659
a0b6b246
JX
527msgid "removal patch leaves file contents"
528msgstr "移除补丁仍留下了文件内容"
4dcdc3d8 529
d46c5519 530#: apply.c:3732
1003b3a5 531#, c-format
a0b6b246
JX
532msgid "%s: wrong type"
533msgstr "%s:错误类型"
1003b3a5 534
d46c5519 535#: apply.c:3734
1003b3a5 536#, c-format
a0b6b246
JX
537msgid "%s has type %o, expected %o"
538msgstr "%s 的类型是 %o,应为 %o"
1003b3a5 539
d46c5519
JX
540#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856
541#: read-cache.c:1309
4dcdc3d8 542#, c-format
a0b6b246
JX
543msgid "invalid path '%s'"
544msgstr "无效路径 '%s'"
4dcdc3d8 545
d46c5519 546#: apply.c:3943
4dcdc3d8 547#, c-format
a0b6b246
JX
548msgid "%s: already exists in index"
549msgstr "%s:已经存在于索引中"
4dcdc3d8 550
d46c5519 551#: apply.c:3946
4dcdc3d8 552#, c-format
a0b6b246
JX
553msgid "%s: already exists in working directory"
554msgstr "%s:已经存在于工作区中"
4dcdc3d8 555
d46c5519 556#: apply.c:3966
1b7f4a34 557#, c-format
a0b6b246
JX
558msgid "new mode (%o) of %s does not match old mode (%o)"
559msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1b7f4a34 560
d46c5519 561#: apply.c:3971
5b04ee3b 562#, c-format
a0b6b246
JX
563msgid "new mode (%o) of %s does not match old mode (%o) of %s"
564msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
5b04ee3b 565
d46c5519 566#: apply.c:3991
8ada9598 567#, c-format
a0b6b246
JX
568msgid "affected file '%s' is beyond a symbolic link"
569msgstr "受影响的文件 '%s' 位于符号链接中"
8ada9598 570
d46c5519 571#: apply.c:3995
81809b99 572#, c-format
a0b6b246
JX
573msgid "%s: patch does not apply"
574msgstr "%s:补丁未应用"
8ada9598 575
d46c5519 576#: apply.c:4010
8ada9598 577#, c-format
a0b6b246 578msgid "Checking patch %s..."
06991777 579msgstr "正在检查补丁 %s..."
8ada9598 580
d46c5519 581#: apply.c:4102
a0b6b246
JX
582#, c-format
583msgid "sha1 information is lacking or useless for submodule %s"
584msgstr "子模组 %s 的 sha1 信息缺失或无效"
8ada9598 585
d46c5519 586#: apply.c:4109
8ada9598 587#, c-format
a0b6b246 588msgid "mode change for %s, which is not in current HEAD"
31e5e17b 589msgstr "%s 的模式变更,但它不在当前 HEAD 中"
8ada9598 590
d46c5519 591#: apply.c:4112
a0b6b246
JX
592#, c-format
593msgid "sha1 information is lacking or useless (%s)."
594msgstr "sha1 信息缺失或无效(%s)。"
6792b93b 595
d46c5519 596#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143
8ada9598 597#, c-format
a0b6b246
JX
598msgid "make_cache_entry failed for path '%s'"
599msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
8ada9598 600
d46c5519 601#: apply.c:4121
a0b6b246
JX
602#, c-format
603msgid "could not add %s to temporary index"
604msgstr "不能在临时索引中添加 %s"
9aeb4c2b 605
d46c5519 606#: apply.c:4131
a0b6b246
JX
607#, c-format
608msgid "could not write temporary index to %s"
609msgstr "不能把临时索引写入到 %s"
9aeb4c2b 610
d46c5519 611#: apply.c:4269
a0b6b246
JX
612#, c-format
613msgid "unable to remove %s from index"
614msgstr "不能从索引中移除 %s"
8ada9598 615
d46c5519 616#: apply.c:4303
8ada9598 617#, c-format
a0b6b246
JX
618msgid "corrupt patch for submodule %s"
619msgstr "子模组 %s 损坏的补丁"
8ada9598 620
d46c5519 621#: apply.c:4309
9aeb4c2b 622#, c-format
a0b6b246 623msgid "unable to stat newly created file '%s'"
65e2041e 624msgstr "不能对新建文件 '%s' 调用 stat"
9aeb4c2b 625
d46c5519 626#: apply.c:4317
a0b6b246
JX
627#, c-format
628msgid "unable to create backing store for newly created file %s"
629msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 630
d46c5519 631#: apply.c:4323 apply.c:4468
81809b99 632#, c-format
a0b6b246
JX
633msgid "unable to add cache entry for %s"
634msgstr "无法为 %s 添加缓存条目"
8ada9598 635
d46c5519 636#: apply.c:4366
a0b6b246
JX
637#, c-format
638msgid "failed to write to '%s'"
c1ac5258 639msgstr "写入 '%s' 失败"
8ada9598 640
d46c5519 641#: apply.c:4370
220c313c 642#, c-format
a0b6b246
JX
643msgid "closing file '%s'"
644msgstr "关闭文件 '%s'"
220c313c 645
d46c5519 646#: apply.c:4440
c04f5ac3 647#, c-format
a0b6b246
JX
648msgid "unable to write file '%s' mode %o"
649msgstr "不能写文件 '%s' 权限 %o"
c04f5ac3 650
d46c5519 651#: apply.c:4538
c04f5ac3 652#, c-format
a0b6b246
JX
653msgid "Applied patch %s cleanly."
654msgstr "成功应用补丁 %s。"
c04f5ac3 655
d46c5519 656#: apply.c:4546
a0b6b246
JX
657msgid "internal error"
658msgstr "内部错误"
c04f5ac3 659
d46c5519 660#: apply.c:4549
5c57d762 661#, c-format
a0b6b246
JX
662msgid "Applying patch %%s with %d reject..."
663msgid_plural "Applying patch %%s with %d rejects..."
664msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
665msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
5c57d762 666
d46c5519 667#: apply.c:4560
5c57d762 668#, c-format
a0b6b246
JX
669msgid "truncating .rej filename to %.*s.rej"
670msgstr "截短 .rej 文件名为 %.*s.rej"
5c57d762 671
d46c5519 672#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118
220c313c 673#, c-format
a0b6b246
JX
674msgid "cannot open %s"
675msgstr "不能打开 %s"
220c313c 676
d46c5519 677#: apply.c:4582
220c313c 678#, c-format
a0b6b246
JX
679msgid "Hunk #%d applied cleanly."
680msgstr "第 #%d 个片段成功应用。"
220c313c 681
d46c5519 682#: apply.c:4586
5c57d762 683#, c-format
a0b6b246
JX
684msgid "Rejected hunk #%d."
685msgstr "拒绝第 #%d 个片段。"
5c57d762 686
d46c5519 687#: apply.c:4696
5c57d762 688#, c-format
a0b6b246
JX
689msgid "Skipped patch '%s'."
690msgstr "略过补丁 '%s'。"
5c57d762 691
d46c5519 692#: apply.c:4704
a0b6b246
JX
693msgid "unrecognized input"
694msgstr "未能识别的输入"
5c57d762 695
d46c5519 696#: apply.c:4724
a0b6b246
JX
697msgid "unable to read index file"
698msgstr "无法读取索引文件"
5c57d762 699
d46c5519 700#: apply.c:4879
220c313c 701#, c-format
a0b6b246
JX
702msgid "can't open patch '%s': %s"
703msgstr "不能打开补丁 '%s':%s"
220c313c 704
d46c5519 705#: apply.c:4906
5c57d762 706#, c-format
a0b6b246
JX
707msgid "squelched %d whitespace error"
708msgid_plural "squelched %d whitespace errors"
709msgstr[0] "抑制下仍有 %d 个空白字符误用"
710msgstr[1] "抑制下仍有 %d 个空白字符误用"
5c57d762 711
d46c5519 712#: apply.c:4912 apply.c:4927
5c57d762 713#, c-format
a0b6b246
JX
714msgid "%d line adds whitespace errors."
715msgid_plural "%d lines add whitespace errors."
a4f16749
JX
716msgstr[0] "%d 行新增了空白字符误用。"
717msgstr[1] "%d 行新增了空白字符误用。"
5c57d762 718
d46c5519 719#: apply.c:4920
5c57d762 720#, c-format
a0b6b246
JX
721msgid "%d line applied after fixing whitespace errors."
722msgid_plural "%d lines applied after fixing whitespace errors."
723msgstr[0] "修复空白错误后,应用了 %d 行。"
724msgstr[1] "修复空白错误后,应用了 %d 行。"
5c57d762 725
d46c5519 726#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
a0b6b246
JX
727msgid "Unable to write new index file"
728msgstr "无法写入新索引文件"
5c57d762 729
d46c5519
JX
730#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213
731#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271
732#: builtin/pull.c:207 builtin/submodule--helper.c:407
06991777 733#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
d46c5519
JX
734#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852
735#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197
a0b6b246
JX
736msgid "path"
737msgstr "路径"
5c57d762 738
d46c5519 739#: apply.c:4964
a0b6b246
JX
740msgid "don't apply changes matching the given path"
741msgstr "不要应用与给出路径向匹配的变更"
5c57d762 742
d46c5519 743#: apply.c:4967
a0b6b246
JX
744msgid "apply changes matching the given path"
745msgstr "应用与给出路径向匹配的变更"
220c313c 746
d46c5519 747#: apply.c:4969 builtin/am.c:2219
a0b6b246
JX
748msgid "num"
749msgstr "数字"
220c313c 750
d46c5519 751#: apply.c:4970
a0b6b246
JX
752msgid "remove <num> leading slashes from traditional diff paths"
753msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
220c313c 754
d46c5519 755#: apply.c:4973
a0b6b246
JX
756msgid "ignore additions made by the patch"
757msgstr "忽略补丁中的添加的文件"
220c313c 758
d46c5519 759#: apply.c:4975
a0b6b246
JX
760msgid "instead of applying the patch, output diffstat for the input"
761msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
220c313c 762
d46c5519 763#: apply.c:4979
a0b6b246
JX
764msgid "show number of added and deleted lines in decimal notation"
765msgstr "以十进制数显示添加和删除的行数"
220c313c 766
d46c5519 767#: apply.c:4981
a0b6b246
JX
768msgid "instead of applying the patch, output a summary for the input"
769msgstr "不应用补丁,而是显示输入的概要"
220c313c 770
d46c5519 771#: apply.c:4983
a0b6b246
JX
772msgid "instead of applying the patch, see if the patch is applicable"
773msgstr "不应用补丁,而是查看补丁是否可应用"
220c313c 774
d46c5519 775#: apply.c:4985
a0b6b246
JX
776msgid "make sure the patch is applicable to the current index"
777msgstr "确认补丁可以应用到当前索引"
276ceeaa 778
d46c5519 779#: apply.c:4987
c1ac5258
JX
780msgid "mark new files with `git add --intent-to-add`"
781msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
782
d46c5519 783#: apply.c:4989
a0b6b246
JX
784msgid "apply a patch without touching the working tree"
785msgstr "应用补丁而不修改工作区"
5b04ee3b 786
d46c5519 787#: apply.c:4991
a0b6b246
JX
788msgid "accept a patch that touches outside the working area"
789msgstr "接受修改工作区之外文件的补丁"
5c57d762 790
d46c5519 791#: apply.c:4994
a0b6b246
JX
792msgid "also apply the patch (use with --stat/--summary/--check)"
793msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
c04f5ac3 794
d46c5519 795#: apply.c:4996
a0b6b246
JX
796msgid "attempt three-way merge if a patch does not apply"
797msgstr "如果一个补丁不能应用则尝试三方合并"
c04f5ac3 798
d46c5519 799#: apply.c:4998
a0b6b246
JX
800msgid "build a temporary index based on embedded index information"
801msgstr "创建一个临时索引基于嵌入的索引信息"
c04f5ac3 802
d46c5519 803#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524
a0b6b246
JX
804msgid "paths are separated with NUL character"
805msgstr "路径以 NUL 字符分隔"
8ada9598 806
d46c5519 807#: apply.c:5003
a0b6b246
JX
808msgid "ensure at least <n> lines of context match"
809msgstr "确保至少匹配 <n> 行上下文"
8ada9598 810
d46c5519 811#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97
4c27fcb5 812#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
d46c5519 813#: builtin/pack-objects.c:3317 builtin/rebase.c:1415
a0b6b246
JX
814msgid "action"
815msgstr "动作"
8ada9598 816
d46c5519 817#: apply.c:5005
a0b6b246
JX
818msgid "detect new or modified lines that have whitespace errors"
819msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 820
d46c5519 821#: apply.c:5008 apply.c:5011
a0b6b246
JX
822msgid "ignore changes in whitespace when finding context"
823msgstr "查找上下文时忽略空白字符的变更"
8ada9598 824
d46c5519 825#: apply.c:5014
a0b6b246
JX
826msgid "apply the patch in reverse"
827msgstr "反向应用补丁"
8ada9598 828
d46c5519 829#: apply.c:5016
a0b6b246
JX
830msgid "don't expect at least one line of context"
831msgstr "无需至少一行上下文"
8ada9598 832
d46c5519 833#: apply.c:5018
a0b6b246
JX
834msgid "leave the rejected hunks in corresponding *.rej files"
835msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 836
d46c5519 837#: apply.c:5020
a0b6b246
JX
838msgid "allow overlapping hunks"
839msgstr "允许重叠的补丁片段"
8ada9598 840
d46c5519
JX
841#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22
842#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786
843#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128
a0b6b246
JX
844msgid "be verbose"
845msgstr "冗长输出"
8ada9598 846
d46c5519 847#: apply.c:5023
a0b6b246
JX
848msgid "tolerate incorrectly detected missing new-line at the end of file"
849msgstr "允许不正确的文件末尾换行符"
cfff71a9 850
d46c5519 851#: apply.c:5026
a0b6b246
JX
852msgid "do not trust the line counts in the hunk headers"
853msgstr "不信任补丁片段的头信息中的行号"
6c94aba5 854
d46c5519 855#: apply.c:5028 builtin/am.c:2207
a0b6b246
JX
856msgid "root"
857msgstr "根目录"
c04f5ac3 858
d46c5519 859#: apply.c:5029
a0b6b246
JX
860msgid "prepend <root> to all filenames"
861msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 862
c1ac5258 863#: archive.c:14
a0b6b246
JX
864msgid "git archive [<options>] <tree-ish> [<path>...]"
865msgstr "git archive [<选项>] <树或提交> [<路径>...]"
07432cef 866
c1ac5258 867#: archive.c:15
a0b6b246
JX
868msgid "git archive --list"
869msgstr "git archive --list"
870
c1ac5258 871#: archive.c:16
c04f5ac3 872msgid ""
a0b6b246 873"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
c04f5ac3 874msgstr ""
a0b6b246 875"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
6acbf033 876
c1ac5258 877#: archive.c:17
a0b6b246
JX
878msgid "git archive --remote <repo> [--exec <cmd>] --list"
879msgstr "git archive --remote <仓库> [--exec <命令>] --list"
6acbf033 880
d46c5519 881#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
c04f5ac3 882#, c-format
a0b6b246
JX
883msgid "pathspec '%s' did not match any files"
884msgstr "路径规格 '%s' 未匹配任何文件"
c04f5ac3 885
06991777
JX
886#: archive.c:396
887#, c-format
888msgid "no such ref: %.*s"
889msgstr "无此引用:%.*s"
890
891#: archive.c:401
892#, c-format
893msgid "not a valid object name: %s"
894msgstr "不是一个有效的对象名:%s"
895
896#: archive.c:414
897#, c-format
898msgid "not a tree object: %s"
899msgstr "不是一个树对象:%s"
900
901#: archive.c:424
902msgid "current working directory is untracked"
903msgstr "当前工作目录未被跟踪"
904
905#: archive.c:455
a0b6b246
JX
906msgid "fmt"
907msgstr "格式"
07432cef 908
06991777 909#: archive.c:455
a0b6b246
JX
910msgid "archive format"
911msgstr "归档格式"
7aea43ff 912
d46c5519 913#: archive.c:456 builtin/log.c:1557
a0b6b246
JX
914msgid "prefix"
915msgstr "前缀"
7aea43ff 916
06991777 917#: archive.c:457
a0b6b246
JX
918msgid "prepend prefix to each pathname in the archive"
919msgstr "为归档中每个路径名加上前缀"
c04f5ac3 920
d46c5519
JX
921#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822
922#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091
923#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105
924#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
925#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
a0b6b246
JX
926msgid "file"
927msgstr "文件"
a77c07d9 928
06991777 929#: archive.c:459 builtin/archive.c:90
a0b6b246
JX
930msgid "write the archive to this file"
931msgstr "归档写入此文件"
a77c07d9 932
06991777 933#: archive.c:461
a0b6b246
JX
934msgid "read .gitattributes in working directory"
935msgstr "读取工作区中的 .gitattributes"
7ac1c0ad 936
06991777 937#: archive.c:462
a0b6b246
JX
938msgid "report archived files on stderr"
939msgstr "在标准错误上报告归档文件"
7ac1c0ad 940
06991777 941#: archive.c:463
a0b6b246
JX
942msgid "store only"
943msgstr "只存储"
7ac1c0ad 944
06991777 945#: archive.c:464
a0b6b246
JX
946msgid "compress faster"
947msgstr "压缩速度更快"
8ada9598 948
06991777 949#: archive.c:472
a0b6b246
JX
950msgid "compress better"
951msgstr "压缩效果更好"
8ada9598 952
06991777 953#: archive.c:475
a0b6b246
JX
954msgid "list supported archive formats"
955msgstr "列出支持的归档格式"
a77c07d9 956
d46c5519
JX
957#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113
958#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858
a0b6b246
JX
959msgid "repo"
960msgstr "仓库"
c04f5ac3 961
06991777 962#: archive.c:478 builtin/archive.c:92
a0b6b246
JX
963msgid "retrieve the archive from remote repository <repo>"
964msgstr "从远程仓库(<仓库>)提取归档文件"
8ada9598 965
d46c5519 966#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707
06991777 967#: builtin/notes.c:498
a0b6b246
JX
968msgid "command"
969msgstr "命令"
970
06991777 971#: archive.c:480 builtin/archive.c:94
a0b6b246
JX
972msgid "path to the remote git-upload-archive command"
973msgstr "远程 git-upload-archive 命令的路径"
974
06991777 975#: archive.c:487
a0b6b246
JX
976msgid "Unexpected option --remote"
977msgstr "未知参数 --remote"
978
06991777 979#: archive.c:489
a0b6b246
JX
980msgid "Option --exec can only be used together with --remote"
981msgstr "选项 --exec 只能和 --remote 同时使用"
982
06991777 983#: archive.c:491
a0b6b246
JX
984msgid "Unexpected option --output"
985msgstr "未知参数 --output"
986
06991777 987#: archive.c:513
a0b6b246
JX
988#, c-format
989msgid "Unknown archive format '%s'"
990msgstr "未知归档格式 '%s'"
991
06991777 992#: archive.c:520
8ada9598 993#, c-format
a0b6b246
JX
994msgid "Argument not supported for format '%s': -%d"
995msgstr "参数不支持此格式 '%s':-%d"
996
4c27fcb5 997#: archive-tar.c:125 archive-zip.c:345
c1ac5258
JX
998#, c-format
999msgid "cannot stream blob %s"
e640d114 1000msgstr "不能打开数据对象 %s"
c1ac5258 1001
4c27fcb5 1002#: archive-tar.c:260 archive-zip.c:363
c1ac5258
JX
1003#, c-format
1004msgid "unsupported file mode: 0%o (SHA1: %s)"
e640d114 1005msgstr "不支持的文件模式:0%o (SHA1: %s)"
c1ac5258 1006
4c27fcb5 1007#: archive-tar.c:287 archive-zip.c:353
c1ac5258
JX
1008#, c-format
1009msgid "cannot read %s"
1010msgstr "不能读取 %s"
1011
d46c5519 1012#: archive-tar.c:459
c1ac5258
JX
1013#, c-format
1014msgid "unable to start '%s' filter"
1015msgstr "无法启动 '%s' 过滤器"
1016
d46c5519 1017#: archive-tar.c:462
c1ac5258
JX
1018msgid "unable to redirect descriptor"
1019msgstr "无法重定向描述符"
1020
d46c5519 1021#: archive-tar.c:469
c1ac5258
JX
1022#, c-format
1023msgid "'%s' filter reported error"
e640d114 1024msgstr "'%s' 过滤器报告了错误"
c1ac5258 1025
4c27fcb5 1026#: archive-zip.c:314
c1ac5258
JX
1027#, c-format
1028msgid "path is not valid UTF-8: %s"
1029msgstr "路径不是有效的 UTF-8:%s"
1030
4c27fcb5 1031#: archive-zip.c:318
c1ac5258
JX
1032#, c-format
1033msgid "path too long (%d chars, SHA1: %s): %s"
1034msgstr "路径太长(%d 字符,SHA1:%s):%s"
1035
d46c5519 1036#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
c1ac5258
JX
1037#, c-format
1038msgid "deflate error (%d)"
1039msgstr "压缩错误 (%d)"
1040
4c27fcb5 1041#: archive-zip.c:609
c1ac5258
JX
1042#, c-format
1043msgid "timestamp too large for this system: %<PRIuMAX>"
e640d114 1044msgstr "对于本系统时间戳太大:%<PRIuMAX>"
c1ac5258 1045
06991777 1046#: attr.c:211
87cb7997
JX
1047#, c-format
1048msgid "%.*s is not a valid attribute name"
1049msgstr "%.*s 不是一个有效的属性名"
1050
06991777
JX
1051#: attr.c:368
1052#, c-format
1053msgid "%s not allowed: %s:%d"
8e4e0555 1054msgstr "不允许 %s :%s:%d"
06991777
JX
1055
1056#: attr.c:408
8ada9598 1057msgid ""
a0b6b246
JX
1058"Negative patterns are ignored in git attributes\n"
1059"Use '\\!' for literal leading exclamation."
8ada9598 1060msgstr ""
a0b6b246
JX
1061"负值模版在 git attributes 中被忽略\n"
1062"当字符串确实要以感叹号开始时,使用 '\\!'。"
8ada9598 1063
4c27fcb5 1064#: bisect.c:468
8ada9598 1065#, c-format
a0b6b246
JX
1066msgid "Badly quoted content in file '%s': %s"
1067msgstr "文件 '%s' 包含错误的引用格式:%s"
8ada9598 1068
06991777 1069#: bisect.c:678
a0b6b246
JX
1070#, c-format
1071msgid "We cannot bisect more!\n"
1072msgstr "我们无法进行更多的二分查找!\n"
8ada9598 1073
06991777 1074#: bisect.c:733
2e8451e8 1075#, c-format
a0b6b246
JX
1076msgid "Not a valid commit name %s"
1077msgstr "不是一个有效的提交名 %s"
2e8451e8 1078
06991777 1079#: bisect.c:758
5b04ee3b
JX
1080#, c-format
1081msgid ""
a0b6b246
JX
1082"The merge base %s is bad.\n"
1083"This means the bug has been fixed between %s and [%s].\n"
5b04ee3b 1084msgstr ""
a0b6b246
JX
1085"合并基线 %s 是坏的。\n"
1086"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
5b04ee3b 1087
06991777 1088#: bisect.c:763
5b04ee3b 1089#, c-format
a0b6b246
JX
1090msgid ""
1091"The merge base %s is new.\n"
1092"The property has changed between %s and [%s].\n"
1093msgstr ""
1094"合并基线 %s 是新的。\n"
1095"介于 %s 和 [%s] 之间的属性已经被修改。\n"
5b04ee3b 1096
06991777 1097#: bisect.c:768
a0b6b246
JX
1098#, c-format
1099msgid ""
1100"The merge base %s is %s.\n"
1101"This means the first '%s' commit is between %s and [%s].\n"
1102msgstr ""
1103"合并基线 %s 是 %s。\n"
1104"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
07432cef 1105
06991777 1106#: bisect.c:776
a0b6b246
JX
1107#, c-format
1108msgid ""
1a79b2f1 1109"Some %s revs are not ancestors of the %s rev.\n"
a0b6b246
JX
1110"git bisect cannot work properly in this case.\n"
1111"Maybe you mistook %s and %s revs?\n"
1112msgstr ""
1113"一些 %s 版本不是 %s 版本的祖先。\n"
1114"这种情况下 git 二分查找无法正常工作。\n"
1115"您可能弄错了 %s 和 %s 版本?\n"
07432cef 1116
06991777 1117#: bisect.c:789
a0b6b246
JX
1118#, c-format
1119msgid ""
1120"the merge base between %s and [%s] must be skipped.\n"
1121"So we cannot be sure the first %s commit is between %s and %s.\n"
1122"We continue anyway."
1123msgstr ""
1124"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1125"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1126"我们仍旧继续。"
649900bc 1127
06991777 1128#: bisect.c:822
649900bc 1129#, c-format
a0b6b246
JX
1130msgid "Bisecting: a merge base must be tested\n"
1131msgstr "二分查找中:合并基线必须是经过测试的\n"
649900bc 1132
06991777 1133#: bisect.c:865
a0b6b246
JX
1134#, c-format
1135msgid "a %s revision is needed"
1136msgstr "需要一个 %s 版本"
649900bc 1137
d46c5519 1138#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248
649900bc 1139#, c-format
a0b6b246
JX
1140msgid "could not create file '%s'"
1141msgstr "不能创建文件 '%s'"
649900bc 1142
d46c5519 1143#: bisect.c:928 builtin/merge.c:146
649900bc 1144#, c-format
a0b6b246
JX
1145msgid "could not read file '%s'"
1146msgstr "不能读取文件 '%s'"
649900bc 1147
d46c5519 1148#: bisect.c:958
a0b6b246
JX
1149msgid "reading bisect refs failed"
1150msgstr "读取二分查找引用失败"
649900bc 1151
d46c5519 1152#: bisect.c:977
649900bc 1153#, c-format
a0b6b246
JX
1154msgid "%s was both %s and %s\n"
1155msgstr "%s 同时为 %s 和 %s\n"
649900bc 1156
d46c5519 1157#: bisect.c:985
649900bc 1158#, c-format
a0b6b246
JX
1159msgid ""
1160"No testable commit found.\n"
1161"Maybe you started with bad path parameters?\n"
1162msgstr ""
1163"没有发现可测试的提交。\n"
1164"可能您在运行时使用了错误的路径参数?\n"
649900bc 1165
d46c5519 1166#: bisect.c:1004
649900bc 1167#, c-format
a0b6b246
JX
1168msgid "(roughly %d step)"
1169msgid_plural "(roughly %d steps)"
1170msgstr[0] "(大概 %d 步)"
1171msgstr[1] "(大概 %d 步)"
649900bc 1172
a4f16749
JX
1173#. TRANSLATORS: the last %s will be replaced with "(roughly %d
1174#. steps)" translation.
1175#.
d46c5519 1176#: bisect.c:1010
649900bc 1177#, c-format
a0b6b246
JX
1178msgid "Bisecting: %d revision left to test after this %s\n"
1179msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1180msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1181msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
649900bc 1182
d46c5519 1183#: blame.c:1794
a4f16749
JX
1184msgid "--contents and --reverse do not blend well."
1185msgstr "--contents 和 --reverse 不能混用。"
1186
d46c5519 1187#: blame.c:1808
a4f16749
JX
1188msgid "cannot use --contents with final commit object name"
1189msgstr "不能将 --contents 和最终的提交对象名共用"
1190
d46c5519 1191#: blame.c:1829
a4f16749
JX
1192msgid "--reverse and --first-parent together require specified latest commit"
1193msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
1194
d46c5519
JX
1195#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030
1196#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940
1197#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415
1198#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155
fd8cb379 1199#: builtin/shortlog.c:192
a4f16749
JX
1200msgid "revision walk setup failed"
1201msgstr "版本遍历设置失败"
1202
d46c5519 1203#: blame.c:1856
a4f16749
JX
1204msgid ""
1205"--reverse --first-parent together require range along first-parent chain"
1206msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
1207
d46c5519 1208#: blame.c:1867
a4f16749
JX
1209#, c-format
1210msgid "no such path %s in %s"
1211msgstr "在 %2$s 中无此路径 %1$s"
1212
d46c5519 1213#: blame.c:1878
a4f16749
JX
1214#, c-format
1215msgid "cannot read blob %s for path %s"
1216msgstr "不能为路径 %2$s 读取数据对象 %1$s"
1217
d46c5519 1218#: branch.c:53
649900bc 1219#, c-format
a0b6b246
JX
1220msgid ""
1221"\n"
1222"After fixing the error cause you may try to fix up\n"
1223"the remote tracking information by invoking\n"
1224"\"git branch --set-upstream-to=%s%s%s\"."
1225msgstr ""
1226"\n"
1227"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1228"\"git branch --set-upstream-to=%s%s%s\" 。"
649900bc 1229
d46c5519 1230#: branch.c:67
649900bc 1231#, c-format
a0b6b246
JX
1232msgid "Not setting branch %s as its own upstream."
1233msgstr "未设置分支 %s 作为它自己的上游。"
649900bc 1234
d46c5519 1235#: branch.c:93
649900bc 1236#, c-format
6937cb4e
JX
1237msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
1238msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 1239
d46c5519 1240#: branch.c:94
649900bc 1241#, c-format
6937cb4e
JX
1242msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
1243msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 1244
d46c5519 1245#: branch.c:98
649900bc 1246#, c-format
6937cb4e
JX
1247msgid "Branch '%s' set up to track local branch '%s' by rebasing."
1248msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
649900bc 1249
d46c5519 1250#: branch.c:99
649900bc 1251#, c-format
6937cb4e 1252msgid "Branch '%s' set up to track local branch '%s'."
493a9322 1253msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
649900bc 1254
d46c5519 1255#: branch.c:104
649900bc 1256#, c-format
6937cb4e
JX
1257msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
1258msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
649900bc 1259
d46c5519 1260#: branch.c:105
649900bc 1261#, c-format
6937cb4e
JX
1262msgid "Branch '%s' set up to track remote ref '%s'."
1263msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
649900bc 1264
d46c5519 1265#: branch.c:109
649900bc 1266#, c-format
6937cb4e
JX
1267msgid "Branch '%s' set up to track local ref '%s' by rebasing."
1268msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
649900bc 1269
d46c5519 1270#: branch.c:110
649900bc 1271#, c-format
6937cb4e
JX
1272msgid "Branch '%s' set up to track local ref '%s'."
1273msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
649900bc 1274
d46c5519 1275#: branch.c:119
a0b6b246
JX
1276msgid "Unable to write upstream branch configuration"
1277msgstr "无法写入上游分支配置"
649900bc 1278
d46c5519 1279#: branch.c:156
649900bc 1280#, c-format
a0b6b246
JX
1281msgid "Not tracking: ambiguous information for ref %s"
1282msgstr "未跟踪:引用 %s 有歧义"
649900bc 1283
d46c5519 1284#: branch.c:189
649900bc 1285#, c-format
a0b6b246
JX
1286msgid "'%s' is not a valid branch name."
1287msgstr "'%s' 不是一个有效的分支名称。"
649900bc 1288
d46c5519 1289#: branch.c:208
649900bc 1290#, c-format
a0b6b246
JX
1291msgid "A branch named '%s' already exists."
1292msgstr "一个分支名 '%s' 已经存在。"
649900bc 1293
d46c5519 1294#: branch.c:213
a0b6b246
JX
1295msgid "Cannot force update the current branch."
1296msgstr "无法强制更新当前分支。"
649900bc 1297
d46c5519 1298#: branch.c:233
649900bc 1299#, c-format
a0b6b246
JX
1300msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1301msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
649900bc 1302
d46c5519 1303#: branch.c:235
649900bc 1304#, c-format
a0b6b246
JX
1305msgid "the requested upstream branch '%s' does not exist"
1306msgstr "请求的上游分支 '%s' 不存在"
649900bc 1307
d46c5519 1308#: branch.c:237
a0b6b246
JX
1309msgid ""
1310"\n"
1311"If you are planning on basing your work on an upstream\n"
1312"branch that already exists at the remote, you may need to\n"
1313"run \"git fetch\" to retrieve it.\n"
1314"\n"
1315"If you are planning to push out a new local branch that\n"
1316"will track its remote counterpart, you may want to use\n"
1317"\"git push -u\" to set the upstream config as you push."
1318msgstr ""
1319"\n"
1320"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
1321"您可能需要执行 \"git fetch\" 来获取分支。\n"
1322"\n"
1323"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
1324"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
649900bc 1325
d46c5519 1326#: branch.c:281
649900bc 1327#, c-format
a0b6b246
JX
1328msgid "Not a valid object name: '%s'."
1329msgstr "不是一个有效的对象名:'%s'。"
649900bc 1330
d46c5519 1331#: branch.c:301
649900bc 1332#, c-format
a0b6b246
JX
1333msgid "Ambiguous object name: '%s'."
1334msgstr "歧义的对象名:'%s'。"
649900bc 1335
d46c5519 1336#: branch.c:306
649900bc 1337#, c-format
a0b6b246
JX
1338msgid "Not a valid branch point: '%s'."
1339msgstr "无效的分支点:'%s'。"
649900bc 1340
06991777 1341#: branch.c:359
649900bc 1342#, c-format
a0b6b246
JX
1343msgid "'%s' is already checked out at '%s'"
1344msgstr "'%s' 已经检出到 '%s'"
649900bc 1345
06991777 1346#: branch.c:382
a0b6b246
JX
1347#, c-format
1348msgid "HEAD of working tree %s is not updated"
1349msgstr "工作区 %s 的 HEAD 指向没有被更新"
649900bc 1350
c1ac5258 1351#: bundle.c:36
649900bc 1352#, c-format
a0b6b246
JX
1353msgid "'%s' does not look like a v2 bundle file"
1354msgstr "'%s' 不像是一个 v2 版本的包文件"
649900bc 1355
c1ac5258 1356#: bundle.c:64
a0b6b246
JX
1357#, c-format
1358msgid "unrecognized header: %s%s (%d)"
1359msgstr "未能识别的包头:%s%s (%d)"
649900bc 1360
d46c5519
JX
1361#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916
1362#: builtin/commit.c:788
649900bc 1363#, c-format
a0b6b246
JX
1364msgid "could not open '%s'"
1365msgstr "不能打开 '%s'"
649900bc 1366
06991777 1367#: bundle.c:143
a0b6b246
JX
1368msgid "Repository lacks these prerequisite commits:"
1369msgstr "仓库中缺少这些必备的提交:"
649900bc 1370
06991777 1371#: bundle.c:194
2e8451e8 1372#, c-format
a0b6b246
JX
1373msgid "The bundle contains this ref:"
1374msgid_plural "The bundle contains these %d refs:"
1375msgstr[0] "这个包中含有这个引用:"
1376msgstr[1] "这个包中含有 %d 个引用:"
2e8451e8 1377
06991777 1378#: bundle.c:201
a0b6b246
JX
1379msgid "The bundle records a complete history."
1380msgstr "这个包记录一个完整历史。"
2e8451e8 1381
06991777 1382#: bundle.c:203
2e8451e8 1383#, c-format
a0b6b246
JX
1384msgid "The bundle requires this ref:"
1385msgid_plural "The bundle requires these %d refs:"
1386msgstr[0] "这个包需要这个引用:"
1387msgstr[1] "这个包需要 %d 个引用:"
2e8451e8 1388
06991777 1389#: bundle.c:269
4c27fcb5
JX
1390msgid "unable to dup bundle descriptor"
1391msgstr "无法复制 bundle 描述符"
1392
06991777 1393#: bundle.c:276
a0b6b246
JX
1394msgid "Could not spawn pack-objects"
1395msgstr "不能生成 pack-objects 进程"
1003b3a5 1396
06991777 1397#: bundle.c:287
a0b6b246
JX
1398msgid "pack-objects died"
1399msgstr "pack-objects 终止"
8ada9598 1400
06991777 1401#: bundle.c:329
a0b6b246
JX
1402msgid "rev-list died"
1403msgstr "rev-list 终止"
1404
06991777 1405#: bundle.c:378
81809b99 1406#, c-format
a0b6b246
JX
1407msgid "ref '%s' is excluded by the rev-list options"
1408msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 1409
d46c5519 1410#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306
81809b99 1411#, c-format
a0b6b246
JX
1412msgid "unrecognized argument: %s"
1413msgstr "未能识别的参数:%s"
8ada9598 1414
06991777 1415#: bundle.c:465
a0b6b246
JX
1416msgid "Refusing to create empty bundle."
1417msgstr "不能创建空包。"
1418
06991777 1419#: bundle.c:475
81809b99 1420#, c-format
a0b6b246
JX
1421msgid "cannot create '%s'"
1422msgstr "不能创建 '%s'"
8ada9598 1423
06991777 1424#: bundle.c:500
a0b6b246
JX
1425msgid "index-pack died"
1426msgstr "index-pack 终止"
63af42fe 1427
31e5e17b 1428#: color.c:296
94550ed3 1429#, c-format
a0b6b246
JX
1430msgid "invalid color value: %.*s"
1431msgstr "无效的颜色值:%.*s"
94550ed3 1432
d46c5519
JX
1433#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399
1434#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455
94550ed3 1435#, c-format
a0b6b246
JX
1436msgid "could not parse %s"
1437msgstr "不能解析 %s"
94550ed3 1438
4c27fcb5 1439#: commit.c:52
a0b6b246
JX
1440#, c-format
1441msgid "%s %s is not a commit!"
31e5e17b 1442msgstr "%s %s 不是一个提交!"
90314792 1443
4c27fcb5 1444#: commit.c:193
fd8cb379
JX
1445msgid ""
1446"Support for <GIT_DIR>/info/grafts is deprecated\n"
1447"and will be removed in a future Git version.\n"
1448"\n"
1449"Please use \"git replace --convert-graft-file\"\n"
1450"to convert the grafts into replace refs.\n"
1451"\n"
1452"Turn this message off by running\n"
1453"\"git config advice.graftFileDeprecated false\""
1454msgstr ""
1455"对 <GIT_DIR>/info/grafts 的支持已被弃用,并将在\n"
1456"未来的Git版本中被移除。\n"
1457"\n"
1458"请使用 \"git replace --convert-graft-file\" 将\n"
1459"grafts 转换为替换引用。\n"
1460"\n"
1461"设置 \"git config advice.graftFileDeprecated false\"\n"
1462"可关闭本消息"
1463
d46c5519 1464#: commit.c:1128
4c27fcb5
JX
1465#, c-format
1466msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
1467msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
1468
d46c5519 1469#: commit.c:1131
4c27fcb5
JX
1470#, c-format
1471msgid "Commit %s has a bad GPG signature allegedly by %s."
1472msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
1473
d46c5519 1474#: commit.c:1134
4c27fcb5
JX
1475#, c-format
1476msgid "Commit %s does not have a GPG signature."
1477msgstr "提交 %s 没有 GPG 签名。"
1478
d46c5519 1479#: commit.c:1137
4c27fcb5
JX
1480#, c-format
1481msgid "Commit %s has a good GPG signature by %s\n"
1482msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
1483
d46c5519 1484#: commit.c:1391
90314792 1485msgid ""
a0b6b246
JX
1486"Warning: commit message did not conform to UTF-8.\n"
1487"You may want to amend it after fixing the message, or set the config\n"
1488"variable i18n.commitencoding to the encoding your project uses.\n"
1489msgstr ""
29004bbb 1490"警告:提交说明不符合 UTF-8 字符编码。\n"
a0b6b246 1491"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
29004bbb 1492"设置为您项目所用的字符编码。\n"
90314792 1493
d46c5519
JX
1494#: commit-graph.c:105
1495msgid "commit-graph file is too small"
1496msgstr "提交图形文件太小"
c1ac5258 1497
d46c5519 1498#: commit-graph.c:170
c1ac5258 1499#, c-format
d46c5519
JX
1500msgid "commit-graph signature %X does not match signature %X"
1501msgstr "提交图形签名 %X 和签名 %X 不匹配"
c1ac5258 1502
d46c5519 1503#: commit-graph.c:177
c1ac5258 1504#, c-format
d46c5519
JX
1505msgid "commit-graph version %X does not match version %X"
1506msgstr "提交图形版本 %X 和版本 %X 不匹配"
c1ac5258 1507
d46c5519 1508#: commit-graph.c:184
c1ac5258 1509#, c-format
d46c5519
JX
1510msgid "commit-graph hash version %X does not match version %X"
1511msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
c1ac5258 1512
d46c5519
JX
1513#: commit-graph.c:207
1514msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
1515msgstr "提交图形块查找表条目丢失,文件可能不完整"
06991777 1516
d46c5519 1517#: commit-graph.c:218
c1ac5258 1518#, c-format
d46c5519
JX
1519msgid "commit-graph improper chunk offset %08x%08x"
1520msgstr "提交图形不正确的块偏移 %08x%08x"
c1ac5258 1521
d46c5519 1522#: commit-graph.c:255
c1ac5258 1523#, c-format
d46c5519
JX
1524msgid "commit-graph chunk id %08x appears multiple times"
1525msgstr "提交图形块 id %08x 出现了多次"
c1ac5258 1526
d46c5519 1527#: commit-graph.c:390
c1ac5258
JX
1528#, c-format
1529msgid "could not find commit %s"
1530msgstr "无法找到提交 %s"
1531
d46c5519 1532#: commit-graph.c:732 builtin/pack-objects.c:2649
c1ac5258
JX
1533#, c-format
1534msgid "unable to get type of object %s"
1535msgstr "无法获得对象 %s 类型"
1536
d46c5519 1537#: commit-graph.c:765
06991777
JX
1538msgid "Loading known commits in commit graph"
1539msgstr "正在加载提交图中的已知提交"
1540
d46c5519 1541#: commit-graph.c:781
06991777
JX
1542msgid "Expanding reachable commits in commit graph"
1543msgstr "正在扩展提交图中的可达提交"
1544
d46c5519 1545#: commit-graph.c:793
06991777
JX
1546msgid "Clearing commit marks in commit graph"
1547msgstr "正在清除提交图中的提交标记"
4c27fcb5 1548
d46c5519 1549#: commit-graph.c:813
4c27fcb5
JX
1550msgid "Computing commit graph generation numbers"
1551msgstr "正在计算提交图世代数字"
1552
d46c5519 1553#: commit-graph.c:930
06991777
JX
1554#, c-format
1555msgid "Finding commits for commit graph in %d pack"
1556msgid_plural "Finding commits for commit graph in %d packs"
1557msgstr[0] "正在 %d 个包中查找提交图的提交"
1558msgstr[1] "正在 %d 个包中查找提交图的提交"
4c27fcb5 1559
d46c5519 1560#: commit-graph.c:943
c1ac5258
JX
1561#, c-format
1562msgid "error adding pack %s"
1563msgstr "添加包 %s 出错"
1564
d46c5519 1565#: commit-graph.c:945
c1ac5258
JX
1566#, c-format
1567msgid "error opening index for %s"
1568msgstr "为 %s 打开索引出错"
1569
d46c5519 1570#: commit-graph.c:959
06991777
JX
1571#, c-format
1572msgid "Finding commits for commit graph from %d ref"
1573msgid_plural "Finding commits for commit graph from %d refs"
1574msgstr[0] "正在从 %d 个引用中查找提交图的提交"
1575msgstr[1] "正在从 %d 个引用中查找提交图的提交"
1576
d46c5519 1577#: commit-graph.c:991
06991777
JX
1578msgid "Finding commits for commit graph among packed objects"
1579msgstr "正在打包对象中查找提交图的提交"
1580
d46c5519 1581#: commit-graph.c:1004
06991777 1582msgid "Counting distinct commits in commit graph"
8e4e0555 1583msgstr "正在计算提交图中不同的提交"
06991777 1584
d46c5519 1585#: commit-graph.c:1017
fd8cb379
JX
1586#, c-format
1587msgid "the commit graph format cannot write %d commits"
4c27fcb5 1588msgstr "提交图格式不能写入 %d 个提交"
fd8cb379 1589
d46c5519 1590#: commit-graph.c:1026
06991777 1591msgid "Finding extra edges in commit graph"
8e4e0555 1592msgstr "正在查找提交图中额外的边"
06991777 1593
d46c5519 1594#: commit-graph.c:1050
fd8cb379
JX
1595msgid "too many commits to write graph"
1596msgstr "提交太多不能画图"
1597
d46c5519 1598#: commit-graph.c:1057 midx.c:819
fd8cb379 1599#, c-format
c1ac5258
JX
1600msgid "unable to create leading directories of %s"
1601msgstr "不能为 %s 创建先导目录"
1602
d46c5519 1603#: commit-graph.c:1097
06991777
JX
1604#, c-format
1605msgid "Writing out commit graph in %d pass"
1606msgid_plural "Writing out commit graph in %d passes"
8e4e0555
FZ
1607msgstr[0] "正在用 %d 步写出提交图"
1608msgstr[1] "正在用 %d 步写出提交图"
06991777 1609
d46c5519 1610#: commit-graph.c:1162
c1ac5258 1611msgid "the commit-graph file has incorrect checksum and is likely corrupt"
4c27fcb5
JX
1612msgstr "提交图文件的校验码错误,可能已经损坏"
1613
d46c5519
JX
1614#: commit-graph.c:1172
1615#, c-format
1616msgid "commit-graph has incorrect OID order: %s then %s"
1617msgstr "提交图形的 OID 顺序不正确:%s 然后 %s"
1618
1619#: commit-graph.c:1182 commit-graph.c:1197
1620#, c-format
1621msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
1622msgstr "提交图形有不正确的扇出值:fanout[%d] = %u != %u"
1623
1624#: commit-graph.c:1189
1625#, c-format
1626msgid "failed to parse commit %s from commit-graph"
1627msgstr "无法从提交图形中解析提交 %s"
1628
1629#: commit-graph.c:1206
4c27fcb5 1630msgid "Verifying commits in commit graph"
8e4e0555 1631msgstr "正在校验提交图中的提交"
fd8cb379 1632
d46c5519
JX
1633#: commit-graph.c:1219
1634#, c-format
1635msgid "failed to parse commit %s from object database for commit-graph"
1636msgstr "无法从提交图形的对象库中解析提交 %s"
1637
1638#: commit-graph.c:1226
1639#, c-format
1640msgid "root tree OID for commit %s in commit-graph is %s != %s"
1641msgstr "提交图形中的提交 %s 的根树 OID 是 %s != %s"
1642
1643#: commit-graph.c:1236
1644#, c-format
1645msgid "commit-graph parent list for commit %s is too long"
1646msgstr "提交 %s 的提交图形父提交列表太长了"
1647
1648#: commit-graph.c:1242
1649#, c-format
1650msgid "commit-graph parent for %s is %s != %s"
1651msgstr "%s 的提交图形父提交是 %s != %s"
1652
1653#: commit-graph.c:1255
1654#, c-format
1655msgid "commit-graph parent list for commit %s terminates early"
1656msgstr "提交 %s 的提交图形父提交列表过早终止"
1657
1658#: commit-graph.c:1260
1659#, c-format
1660msgid ""
1661"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
1662msgstr "提交图形中提交 %s 的世代号是零,但其它地方非零"
1663
1664#: commit-graph.c:1264
1665#, c-format
1666msgid ""
1667"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
1668msgstr "提交图形中提交 %s 的世代号非零,但其它地方是零"
1669
1670#: commit-graph.c:1279
1671#, c-format
1672msgid "commit-graph generation for commit %s is %u != %u"
1673msgstr "提交图形中的提交 %s 的世代号是 %u != %u"
1674
1675#: commit-graph.c:1285
1676#, c-format
1677msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
1678msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
1679
06991777 1680#: compat/obstack.c:406 compat/obstack.c:408
a0b6b246
JX
1681msgid "memory exhausted"
1682msgstr "内存耗尽"
90314792 1683
c1ac5258
JX
1684#: config.c:123
1685#, c-format
1686msgid ""
1687"exceeded maximum include depth (%d) while including\n"
1688"\t%s\n"
1689"from\n"
1690"\t%s\n"
1691"This might be due to circular includes."
1692msgstr ""
e640d114 1693"超过了最大包含深度(%1$d),当从\n"
c1ac5258
JX
1694"\t%3$s\n"
1695"包含\n"
1696"\t%2$s\n"
e640d114 1697"这可能是因为循环包含。"
c1ac5258
JX
1698
1699#: config.c:139
1700#, c-format
1701msgid "could not expand include path '%s'"
1702msgstr "无法扩展包含路径 '%s'"
1703
1704#: config.c:150
1705msgid "relative config includes must come from files"
1706msgstr "相对路径的配置文件引用必须来自于文件"
1707
1708#: config.c:190
87cb7997 1709msgid "relative config include conditionals must come from files"
c1ac5258
JX
1710msgstr "相对路径的配置文件条件引用必须来自于文件"
1711
1712#: config.c:348
1713#, c-format
1714msgid "key does not contain a section: %s"
1715msgstr "键名没有包含一个小节名称:%s"
87cb7997 1716
c1ac5258
JX
1717#: config.c:354
1718#, c-format
1719msgid "key does not contain variable name: %s"
1720msgstr "键名没有包含变量名:%s"
1721
d46c5519 1722#: config.c:378 sequencer.c:2459
c1ac5258
JX
1723#, c-format
1724msgid "invalid key: %s"
1725msgstr "无效键名:%s"
1726
1727#: config.c:384
1728#, c-format
1729msgid "invalid key (newline): %s"
1730msgstr "无效键名(有换行符):%s"
1731
1732#: config.c:420 config.c:432
1733#, c-format
1734msgid "bogus config parameter: %s"
1735msgstr "伪配置参数:%s"
1736
1737#: config.c:467
1738#, c-format
1739msgid "bogus format in %s"
1740msgstr "%s 中格式错误"
1741
1742#: config.c:793
90314792 1743#, c-format
a0b6b246
JX
1744msgid "bad config line %d in blob %s"
1745msgstr "数据对象 %2$s 中错误的配置行 %1$d"
90314792 1746
c1ac5258 1747#: config.c:797
a77c07d9 1748#, c-format
a0b6b246
JX
1749msgid "bad config line %d in file %s"
1750msgstr "文件 %2$s 中错误的配置行 %1$d"
a77c07d9 1751
c1ac5258 1752#: config.c:801
a77c07d9 1753#, c-format
a0b6b246
JX
1754msgid "bad config line %d in standard input"
1755msgstr "标准输入中错误的配置行 %d"
a77c07d9 1756
c1ac5258 1757#: config.c:805
90314792 1758#, c-format
a0b6b246
JX
1759msgid "bad config line %d in submodule-blob %s"
1760msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
90314792 1761
c1ac5258 1762#: config.c:809
90314792 1763#, c-format
a0b6b246
JX
1764msgid "bad config line %d in command line %s"
1765msgstr "命令行 %2$s 中错误的配置行 %1$d"
90314792 1766
c1ac5258 1767#: config.c:813
90314792 1768#, c-format
a0b6b246
JX
1769msgid "bad config line %d in %s"
1770msgstr "在 %2$s 中错误的配置行 %1$d"
220c313c 1771
c1ac5258 1772#: config.c:952
a0b6b246
JX
1773msgid "out of range"
1774msgstr "超出范围"
6c94aba5 1775
c1ac5258 1776#: config.c:952
a0b6b246
JX
1777msgid "invalid unit"
1778msgstr "无效的单位"
6c94aba5 1779
c1ac5258 1780#: config.c:958
6c94aba5 1781#, c-format
a0b6b246
JX
1782msgid "bad numeric config value '%s' for '%s': %s"
1783msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
6c94aba5 1784
c1ac5258 1785#: config.c:963
1b7f4a34 1786#, c-format
a0b6b246
JX
1787msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
1788msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 1789
c1ac5258 1790#: config.c:966
1b7f4a34 1791#, c-format
a0b6b246
JX
1792msgid "bad numeric config value '%s' for '%s' in file %s: %s"
1793msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 1794
c1ac5258 1795#: config.c:969
1b7f4a34 1796#, c-format
a0b6b246
JX
1797msgid "bad numeric config value '%s' for '%s' in standard input: %s"
1798msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
1b7f4a34 1799
c1ac5258 1800#: config.c:972
1b7f4a34 1801#, c-format
a0b6b246
JX
1802msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
1803msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 1804
c1ac5258 1805#: config.c:975
94550ed3 1806#, c-format
a0b6b246
JX
1807msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
1808msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 1809
c1ac5258 1810#: config.c:978
276ceeaa 1811#, c-format
a0b6b246
JX
1812msgid "bad numeric config value '%s' for '%s' in %s: %s"
1813msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 1814
c1ac5258 1815#: config.c:1073
276ceeaa 1816#, c-format
a0b6b246 1817msgid "failed to expand user dir in: '%s'"
c1ac5258 1818msgstr "无法扩展用户目录:'%s'"
94550ed3 1819
c1ac5258 1820#: config.c:1082
5809aa05
JX
1821#, c-format
1822msgid "'%s' for '%s' is not a valid timestamp"
1823msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
1824
c1ac5258
JX
1825#: config.c:1173
1826#, c-format
1827msgid "abbrev length out of range: %d"
1828msgstr "缩写长度超出范围:%d"
1829
1830#: config.c:1187 config.c:1198
3495628d 1831#, c-format
a0b6b246
JX
1832msgid "bad zlib compression level %d"
1833msgstr "错误的 zlib 压缩级别 %d"
3495628d 1834
c1ac5258
JX
1835#: config.c:1290
1836msgid "core.commentChar should only be one character"
1837msgstr "core.commentChar 应该是一个字符"
1838
1839#: config.c:1323
3495628d 1840#, c-format
a0b6b246
JX
1841msgid "invalid mode for object creation: %s"
1842msgstr "无效的对象创建模式:%s"
3495628d 1843
4c27fcb5 1844#: config.c:1395
c1ac5258
JX
1845#, c-format
1846msgid "malformed value for %s"
1847msgstr "%s 的取值格式错误"
1848
4c27fcb5 1849#: config.c:1421
c1ac5258
JX
1850#, c-format
1851msgid "malformed value for %s: %s"
1852msgstr "%s 的取值格式错误:%s"
1853
4c27fcb5 1854#: config.c:1422
c1ac5258
JX
1855msgid "must be one of nothing, matching, simple, upstream or current"
1856msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current"
1857
d46c5519 1858#: config.c:1483 builtin/pack-objects.c:3397
1a79b2f1
JX
1859#, c-format
1860msgid "bad pack compression level %d"
1861msgstr "错误的打包压缩级别 %d"
1862
d46c5519 1863#: config.c:1604
c1ac5258
JX
1864#, c-format
1865msgid "unable to load config blob object '%s'"
1866msgstr "无法从数据对象 '%s' 加载配置"
1867
d46c5519 1868#: config.c:1607
c1ac5258
JX
1869#, c-format
1870msgid "reference '%s' does not point to a blob"
1871msgstr "引用 '%s' 没有指向一个数据对象"
1872
d46c5519 1873#: config.c:1624
c1ac5258
JX
1874#, c-format
1875msgid "unable to resolve config blob '%s'"
1876msgstr "不能解析配置对象 '%s'"
1877
d46c5519 1878#: config.c:1654
c1ac5258
JX
1879#, c-format
1880msgid "failed to parse %s"
1881msgstr "解析 %s 失败"
1882
d46c5519 1883#: config.c:1710
a0b6b246
JX
1884msgid "unable to parse command-line config"
1885msgstr "无法解析命令行中的配置"
94550ed3 1886
d46c5519 1887#: config.c:2059
a0b6b246
JX
1888msgid "unknown error occurred while reading the configuration files"
1889msgstr "在读取配置文件时遇到未知错误"
94550ed3 1890
d46c5519 1891#: config.c:2229
87cb7997
JX
1892#, c-format
1893msgid "Invalid %s: '%s'"
1894msgstr "无效 %s:'%s'"
1895
d46c5519 1896#: config.c:2272
87cb7997
JX
1897#, c-format
1898msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
1899msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'"
1900
d46c5519 1901#: config.c:2298
87cb7997
JX
1902#, c-format
1903msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
1904msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
1905
d46c5519 1906#: config.c:2344
276ceeaa 1907#, c-format
a0b6b246
JX
1908msgid "unable to parse '%s' from command-line config"
1909msgstr "无法解析命令行配置中的 '%s'"
1b7f4a34 1910
d46c5519 1911#: config.c:2346
94550ed3 1912#, c-format
a0b6b246
JX
1913msgid "bad config variable '%s' in file '%s' at line %d"
1914msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
94550ed3 1915
d46c5519 1916#: config.c:2427
c1ac5258
JX
1917#, c-format
1918msgid "invalid section name '%s'"
1919msgstr "无效的小节名称 '%s'"
1920
d46c5519 1921#: config.c:2459
276ceeaa 1922#, c-format
a0b6b246
JX
1923msgid "%s has multiple values"
1924msgstr "%s 有多个取值"
276ceeaa 1925
d46c5519 1926#: config.c:2488
c1ac5258
JX
1927#, c-format
1928msgid "failed to write new configuration file %s"
1929msgstr "写入新的配置文件 %s 失败"
1930
d46c5519 1931#: config.c:2740 config.c:3064
c1ac5258
JX
1932#, c-format
1933msgid "could not lock config file %s"
1934msgstr "不能锁定配置文件 %s"
1935
d46c5519 1936#: config.c:2751
c1ac5258
JX
1937#, c-format
1938msgid "opening %s"
1939msgstr "打开 %s"
1940
d46c5519 1941#: config.c:2786 builtin/config.c:328
c1ac5258
JX
1942#, c-format
1943msgid "invalid pattern: %s"
1944msgstr "无效模式:%s"
1945
d46c5519 1946#: config.c:2811
c1ac5258
JX
1947#, c-format
1948msgid "invalid config file %s"
1949msgstr "无效的配置文件 %s"
1950
d46c5519 1951#: config.c:2824 config.c:3077
1a79b2f1
JX
1952#, c-format
1953msgid "fstat on %s failed"
65e2041e 1954msgstr "对 %s 调用 fstat 失败"
1a79b2f1 1955
d46c5519 1956#: config.c:2835
c1ac5258
JX
1957#, c-format
1958msgid "unable to mmap '%s'"
1959msgstr "不能 mmap '%s'"
1960
d46c5519 1961#: config.c:2844 config.c:3082
c1ac5258
JX
1962#, c-format
1963msgid "chmod on %s failed"
1964msgstr "对 %s 调用 chmod 失败"
1965
d46c5519 1966#: config.c:2929 config.c:3179
c1ac5258
JX
1967#, c-format
1968msgid "could not write config file %s"
1969msgstr "不能写入配置文件 %s"
1970
d46c5519 1971#: config.c:2963
94550ed3 1972#, c-format
a0b6b246
JX
1973msgid "could not set '%s' to '%s'"
1974msgstr "不能设置 '%s' 为 '%s'"
94550ed3 1975
d46c5519 1976#: config.c:2965 builtin/remote.c:782
276ceeaa 1977#, c-format
a0b6b246
JX
1978msgid "could not unset '%s'"
1979msgstr "不能取消设置 '%s'"
276ceeaa 1980
d46c5519 1981#: config.c:3055
c1ac5258
JX
1982#, c-format
1983msgid "invalid section name: %s"
1984msgstr "无效的小节名称:%s"
1985
d46c5519 1986#: config.c:3222
c1ac5258
JX
1987#, c-format
1988msgid "missing value for '%s'"
1989msgstr "%s 的取值缺失"
1990
fd8cb379 1991#: connect.c:61
c1ac5258
JX
1992msgid "the remote end hung up upon initial contact"
1993msgstr "远端在初始连接时即挂断"
94550ed3 1994
fd8cb379 1995#: connect.c:63
a0b6b246
JX
1996msgid ""
1997"Could not read from remote repository.\n"
1998"\n"
1999"Please make sure you have the correct access rights\n"
2000"and the repository exists."
2001msgstr ""
2002"无法读取远程仓库。\n"
2003"\n"
2004"请确认您有正确的访问权限并且仓库存在。"
2005
c1ac5258
JX
2006#: connect.c:81
2007#, c-format
2008msgid "server doesn't support '%s'"
2009msgstr "服务器不支持 '%s'"
2010
2011#: connect.c:103
2012#, c-format
2013msgid "server doesn't support feature '%s'"
2014msgstr "服务器不支持特性 '%s'"
2015
2016#: connect.c:114
2017msgid "expected flush after capabilities"
2018msgstr "在能力之后应为一个 flush 包"
2019
2020#: connect.c:233
2021#, c-format
2022msgid "ignoring capabilities after first line '%s'"
e640d114 2023msgstr "忽略第一行 '%s' 之后的能力字段"
c1ac5258
JX
2024
2025#: connect.c:252
2026msgid "protocol error: unexpected capabilities^{}"
2027msgstr "协议错误:意外的 capabilities^{}"
2028
2029#: connect.c:273
2030#, c-format
2031msgid "protocol error: expected shallow sha-1, got '%s'"
2032msgstr "协议错误:预期浅克隆 sha-1,却得到 '%s'"
2033
2034#: connect.c:275
2035msgid "repository on the other end cannot be shallow"
2036msgstr "另一端的仓库不能是浅克隆仓库"
2037
06991777 2038#: connect.c:313
c1ac5258
JX
2039msgid "invalid packet"
2040msgstr "无效数据包"
2041
06991777 2042#: connect.c:333
c1ac5258
JX
2043#, c-format
2044msgid "protocol error: unexpected '%s'"
2045msgstr "协议错误:意外的 '%s'"
2046
06991777 2047#: connect.c:441
c1ac5258
JX
2048#, c-format
2049msgid "invalid ls-refs response: %s"
2050msgstr "无效的 ls-refs 响应:%s"
2051
06991777 2052#: connect.c:445
c1ac5258
JX
2053msgid "expected flush after ref listing"
2054msgstr "在引用列表之后应该有一个 flush 包"
2055
06991777 2056#: connect.c:544
c1ac5258
JX
2057#, c-format
2058msgid "protocol '%s' is not supported"
2059msgstr "不支持 '%s' 协议"
2060
06991777 2061#: connect.c:595
c1ac5258
JX
2062msgid "unable to set SO_KEEPALIVE on socket"
2063msgstr "无法为 socket 设置 SO_KEEPALIVE"
2064
06991777 2065#: connect.c:635 connect.c:698
c1ac5258
JX
2066#, c-format
2067msgid "Looking up %s ... "
2068msgstr "查找 %s ..."
2069
06991777 2070#: connect.c:639
c1ac5258
JX
2071#, c-format
2072msgid "unable to look up %s (port %s) (%s)"
2073msgstr "无法查找 %s(端口 %s)(%s)"
2074
2075#. TRANSLATORS: this is the end of "Looking up %s ... "
06991777 2076#: connect.c:643 connect.c:714
c1ac5258
JX
2077#, c-format
2078msgid ""
2079"done.\n"
2080"Connecting to %s (port %s) ... "
2081msgstr ""
2082"完成。\n"
2083"连接到 %s(端口 %s)... "
2084
06991777 2085#: connect.c:665 connect.c:742
c1ac5258
JX
2086#, c-format
2087msgid ""
2088"unable to connect to %s:\n"
2089"%s"
2090msgstr ""
2091"无法连接到 %s:\n"
2092"%s"
2093
2094#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
06991777 2095#: connect.c:671 connect.c:748
c1ac5258
JX
2096msgid "done."
2097msgstr "完成。"
2098
06991777 2099#: connect.c:702
c1ac5258
JX
2100#, c-format
2101msgid "unable to look up %s (%s)"
2102msgstr "无法查找 %s(%s)"
2103
06991777 2104#: connect.c:708
c1ac5258
JX
2105#, c-format
2106msgid "unknown port %s"
2107msgstr "未知端口 %s"
2108
06991777 2109#: connect.c:845 connect.c:1171
c1ac5258
JX
2110#, c-format
2111msgid "strange hostname '%s' blocked"
2112msgstr "已阻止奇怪的主机名 '%s'"
2113
06991777 2114#: connect.c:847
c1ac5258
JX
2115#, c-format
2116msgid "strange port '%s' blocked"
2117msgstr "已阻止奇怪的端口号 '%s'"
2118
06991777 2119#: connect.c:857
c1ac5258
JX
2120#, c-format
2121msgid "cannot start proxy %s"
2122msgstr "不能启动代理 %s"
2123
06991777 2124#: connect.c:924
c1ac5258
JX
2125msgid "no path specified; see 'git help pull' for valid url syntax"
2126msgstr "未指定路径,执行 'git help pull' 查看有效的 url 语法"
2127
06991777 2128#: connect.c:1119
c1ac5258
JX
2129msgid "ssh variant 'simple' does not support -4"
2130msgstr "ssh 变体 'simple' 不支持 -4"
2131
06991777 2132#: connect.c:1131
c1ac5258
JX
2133msgid "ssh variant 'simple' does not support -6"
2134msgstr "ssh 变体 'simple' 不支持 -6"
2135
06991777 2136#: connect.c:1148
c1ac5258 2137msgid "ssh variant 'simple' does not support setting port"
e640d114 2138msgstr "ssh 变体 'simple' 不支持设置端口"
c1ac5258 2139
d46c5519 2140#: connect.c:1260
c1ac5258
JX
2141#, c-format
2142msgid "strange pathname '%s' blocked"
2143msgstr "已阻止奇怪的路径名 '%s'"
2144
d46c5519 2145#: connect.c:1307
c1ac5258
JX
2146msgid "unable to fork"
2147msgstr "无法 fork"
2148
d46c5519 2149#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43
a0b6b246 2150msgid "Checking connectivity"
06991777 2151msgstr "正在检查连通性"
a0b6b246 2152
d46c5519 2153#: connected.c:97
a0b6b246
JX
2154msgid "Could not run 'git rev-list'"
2155msgstr "不能执行 'git rev-list'"
2156
d46c5519 2157#: connected.c:117
a0b6b246 2158msgid "failed write to rev-list"
c1ac5258 2159msgstr "写入 rev-list 失败"
a0b6b246 2160
d46c5519 2161#: connected.c:124
a0b6b246 2162msgid "failed to close rev-list's stdin"
c1ac5258
JX
2163msgstr "关闭 rev-list 的标准输入失败"
2164
06991777 2165#: convert.c:193
c1ac5258
JX
2166#, c-format
2167msgid "illegal crlf_action %d"
2168msgstr "非法的 crlf 动作 %d"
a0b6b246 2169
06991777 2170#: convert.c:206
3495628d 2171#, c-format
c1ac5258
JX
2172msgid "CRLF would be replaced by LF in %s"
2173msgstr "%s 中的 CRLF 将被 LF 替换"
31e5e17b 2174
06991777 2175#: convert.c:208
31e5e17b 2176#, c-format
a0b6b246
JX
2177msgid ""
2178"CRLF will be replaced by LF in %s.\n"
c1ac5258 2179"The file will have its original line endings in your working directory"
a0b6b246 2180msgstr ""
c1ac5258 2181"%s 中的 CRLF 将被 LF 替换。<\n"
a0b6b246 2182"在工作区中该文件仍保持原有的换行符。"
3495628d 2183
06991777 2184#: convert.c:216
3495628d 2185#, c-format
31e5e17b
JX
2186msgid "LF would be replaced by CRLF in %s"
2187msgstr "文件 %s 中的 LF 将被 CRLF 替换"
3495628d 2188
06991777 2189#: convert.c:218
276ceeaa 2190#, c-format
a0b6b246
JX
2191msgid ""
2192"LF will be replaced by CRLF in %s.\n"
c1ac5258 2193"The file will have its original line endings in your working directory"
a0b6b246 2194msgstr ""
c1ac5258
JX
2195"%s 中的 LF 将被 CRLF 替换。\n"
2196"在工作区中该文件仍保持原有的换行符"
276ceeaa 2197
06991777 2198#: convert.c:279
fd8cb379
JX
2199#, c-format
2200msgid "BOM is prohibited in '%s' if encoded as %s"
2201msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM"
2202
06991777 2203#: convert.c:286
fd8cb379
JX
2204#, c-format
2205msgid ""
2206"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
2207"tree-encoding."
2208msgstr "文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%s 作为工作区编码。"
2209
06991777 2210#: convert.c:304
fd8cb379
JX
2211#, c-format
2212msgid "BOM is required in '%s' if encoded as %s"
2213msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM"
2214
06991777 2215#: convert.c:306
fd8cb379
JX
2216#, c-format
2217msgid ""
2218"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
2219"%sLE (depending on the byte order) as working-tree-encoding."
2220msgstr ""
2221"文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字"
2222"节序)作为工作区编码。"
2223
06991777 2224#: convert.c:424 convert.c:495
fd8cb379
JX
2225#, c-format
2226msgid "failed to encode '%s' from %s to %s"
2227msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
2228
06991777 2229#: convert.c:467
fd8cb379
JX
2230#, c-format
2231msgid "encoding '%s' from %s to %s and back is not the same"
2232msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
2233
06991777 2234#: convert.c:673
c1ac5258
JX
2235#, c-format
2236msgid "cannot fork to run external filter '%s'"
e640d114 2237msgstr "不能 fork 以执行外部过滤器 '%s'"
c1ac5258 2238
06991777 2239#: convert.c:693
c1ac5258
JX
2240#, c-format
2241msgid "cannot feed the input to external filter '%s'"
e640d114 2242msgstr "不能将输入传递给外部过滤器 '%s'"
c1ac5258 2243
06991777 2244#: convert.c:700
c1ac5258
JX
2245#, c-format
2246msgid "external filter '%s' failed %d"
e640d114 2247msgstr "外部过滤器 '%s' 失败码 %d"
c1ac5258 2248
06991777 2249#: convert.c:735 convert.c:738
c1ac5258
JX
2250#, c-format
2251msgid "read from external filter '%s' failed"
2252msgstr "从外部过滤器 '%s' 读取失败"
2253
06991777 2254#: convert.c:741 convert.c:796
c1ac5258
JX
2255#, c-format
2256msgid "external filter '%s' failed"
2257msgstr "外部过滤器 '%s' 失败"
2258
2259#: convert.c:844
2260msgid "unexpected filter type"
2261msgstr "意外的过滤类型"
2262
2263#: convert.c:855
2264msgid "path name too long for external filter"
2265msgstr "外部过滤器的路径名太长"
2266
2267#: convert.c:929
2268#, c-format
2269msgid ""
2270"external filter '%s' is not available anymore although not all paths have "
2271"been filtered"
2272msgstr "外部过滤器 '%s' 不再可用,但并非所有路径都已过滤"
2273
2274#: convert.c:1228
fd8cb379
JX
2275msgid "true/false are no valid working-tree-encodings"
2276msgstr "true/false 不是有效的工作区编码"
2277
4c27fcb5 2278#: convert.c:1398 convert.c:1432
c1ac5258
JX
2279#, c-format
2280msgid "%s: clean filter '%s' failed"
2281msgstr "%s:clean 过滤器 '%s' 失败"
2282
4c27fcb5 2283#: convert.c:1476
c1ac5258
JX
2284#, c-format
2285msgid "%s: smudge filter %s failed"
2286msgstr "%s:smudge 过滤器 %s 失败"
2287
06991777 2288#: date.c:137
a0b6b246
JX
2289msgid "in the future"
2290msgstr "在将来"
3495628d 2291
06991777 2292#: date.c:143
3495628d 2293#, c-format
a4f16749
JX
2294msgid "%<PRIuMAX> second ago"
2295msgid_plural "%<PRIuMAX> seconds ago"
2296msgstr[0] "%<PRIuMAX> 秒钟前"
2297msgstr[1] "%<PRIuMAX> 秒钟前"
3495628d 2298
06991777 2299#: date.c:150
3495628d 2300#, c-format
a4f16749
JX
2301msgid "%<PRIuMAX> minute ago"
2302msgid_plural "%<PRIuMAX> minutes ago"
2303msgstr[0] "%<PRIuMAX> 分钟前"
2304msgstr[1] "%<PRIuMAX> 分钟前"
3495628d 2305
06991777 2306#: date.c:157
3495628d 2307#, c-format
a4f16749
JX
2308msgid "%<PRIuMAX> hour ago"
2309msgid_plural "%<PRIuMAX> hours ago"
2310msgstr[0] "%<PRIuMAX> 小时前"
2311msgstr[1] "%<PRIuMAX> 小时前"
3495628d 2312
06991777 2313#: date.c:164
3495628d 2314#, c-format
a4f16749
JX
2315msgid "%<PRIuMAX> day ago"
2316msgid_plural "%<PRIuMAX> days ago"
2317msgstr[0] "%<PRIuMAX> 天前"
2318msgstr[1] "%<PRIuMAX> 天前"
3495628d 2319
06991777 2320#: date.c:170
94550ed3 2321#, c-format
a4f16749
JX
2322msgid "%<PRIuMAX> week ago"
2323msgid_plural "%<PRIuMAX> weeks ago"
2324msgstr[0] "%<PRIuMAX> 周前"
2325msgstr[1] "%<PRIuMAX> 周前"
94550ed3 2326
06991777 2327#: date.c:177
3495628d 2328#, c-format
a4f16749
JX
2329msgid "%<PRIuMAX> month ago"
2330msgid_plural "%<PRIuMAX> months ago"
2331msgstr[0] "%<PRIuMAX> 个月前"
2332msgstr[1] "%<PRIuMAX> 个月前"
3495628d 2333
06991777 2334#: date.c:188
3495628d 2335#, c-format
a4f16749
JX
2336msgid "%<PRIuMAX> year"
2337msgid_plural "%<PRIuMAX> years"
2338msgstr[0] "%<PRIuMAX> 年"
2339msgstr[1] "%<PRIuMAX> 年"
3495628d 2340
a0b6b246 2341#. TRANSLATORS: "%s" is "<n> years"
06991777 2342#: date.c:191
94550ed3 2343#, c-format
a4f16749
JX
2344msgid "%s, %<PRIuMAX> month ago"
2345msgid_plural "%s, %<PRIuMAX> months ago"
2346msgstr[0] "%s %<PRIuMAX> 个月前"
2347msgstr[1] "%s %<PRIuMAX> 个月前"
94550ed3 2348
06991777 2349#: date.c:196 date.c:201
94550ed3 2350#, c-format
a4f16749
JX
2351msgid "%<PRIuMAX> year ago"
2352msgid_plural "%<PRIuMAX> years ago"
2353msgstr[0] "%<PRIuMAX> 年前"
2354msgstr[1] "%<PRIuMAX> 年前"
94550ed3 2355
06991777 2356#: delta-islands.c:272
4c27fcb5
JX
2357msgid "Propagating island marks"
2358msgstr "正在传播数据岛标记"
2359
06991777 2360#: delta-islands.c:290
4c27fcb5
JX
2361#, c-format
2362msgid "bad tree object %s"
2363msgstr "坏的树对象 %s"
2364
06991777 2365#: delta-islands.c:334
4c27fcb5
JX
2366#, c-format
2367msgid "failed to load island regex for '%s': %s"
2368msgstr "未能加载 '%s' 的数据岛正则表达式:%s"
2369
06991777 2370#: delta-islands.c:390
4c27fcb5
JX
2371#, c-format
2372msgid "island regex from config has too many capture groups (max=%d)"
2373msgstr "来自 config 的数据岛正则表达式有太多的捕获组(最多 %d 个)"
2374
06991777 2375#: delta-islands.c:466
4c27fcb5
JX
2376#, c-format
2377msgid "Marked %d islands, done.\n"
2378msgstr "已标记 %d 个数据岛,结束。\n"
2379
a0b6b246 2380#: diffcore-order.c:24
cfff71a9 2381#, c-format
a0b6b246 2382msgid "failed to read orderfile '%s'"
c1ac5258 2383msgstr "读取排序文件 '%s' 失败"
cfff71a9 2384
4c27fcb5 2385#: diffcore-rename.c:544
a0b6b246 2386msgid "Performing inexact rename detection"
87cb7997 2387msgstr "正在进行非精确的重命名探测"
cfff71a9 2388
d46c5519
JX
2389#: diff-no-index.c:238
2390msgid "git diff --no-index [<options>] <path> <path>"
2391msgstr "git diff --no-index [<选项>] <路径> <路径>"
2392
2393#: diff-no-index.c:263
2394msgid ""
2395"Not a git repository. Use --no-index to compare two paths outside a working "
2396"tree"
2397msgstr "不是一个 git 仓库。使用 --no-index 比较工作区之外的两个路径"
cfff71a9 2398
a0b6b246 2399# 译者:注意保持前导空格
d46c5519 2400#: diff.c:155
a0b6b246
JX
2401#, c-format
2402msgid " Failed to parse dirstat cut-off percentage '%s'\n"
2403msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
cfff71a9 2404
a0b6b246 2405# 译者:注意保持前导空格
d46c5519 2406#: diff.c:160
a0b6b246
JX
2407#, c-format
2408msgid " Unknown dirstat parameter '%s'\n"
2409msgstr " 未知的 dirstat 参数 '%s'\n"
7aea43ff 2410
d46c5519 2411#: diff.c:296
6937cb4e 2412msgid ""
c1ac5258
JX
2413"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
2414"'dimmed-zebra', 'plain'"
5809aa05 2415msgstr ""
c1ac5258
JX
2416"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "
2417"'plain'"
2418
d46c5519 2419#: diff.c:324
c1ac5258 2420#, c-format
06991777
JX
2421msgid ""
2422"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
2423"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
2424msgstr ""
2425"未知的 color-moved-ws 模式 '%s',可能的取值有 'ignore-space-change'、'ignore-"
2426"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
c1ac5258 2427
d46c5519 2428#: diff.c:332
c1ac5258 2429msgid ""
06991777
JX
2430"color-moved-ws: allow-indentation-change cannot be combined with other "
2431"whitespace modes"
c1ac5258 2432msgstr "color-moved-ws:allow-indentation-change 不能与其它空白字符模式共用"
6937cb4e 2433
d46c5519 2434#: diff.c:405
7aea43ff 2435#, c-format
a0b6b246
JX
2436msgid "Unknown value for 'diff.submodule' config variable: '%s'"
2437msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
7aea43ff 2438
d46c5519 2439#: diff.c:465
7aea43ff 2440#, c-format
a0b6b246
JX
2441msgid ""
2442"Found errors in 'diff.dirstat' config variable:\n"
2443"%s"
2444msgstr ""
2445"发现配置变量 'diff.dirstat' 中的错误:\n"
2446"%s"
7aea43ff 2447
d46c5519 2448#: diff.c:4210
7aea43ff 2449#, c-format
a0b6b246
JX
2450msgid "external diff died, stopping at %s"
2451msgstr "外部 diff 退出,停止在 %s"
7aea43ff 2452
d46c5519 2453#: diff.c:4555
a0b6b246
JX
2454msgid "--name-only, --name-status, --check and -s are mutually exclusive"
2455msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
2456
d46c5519 2457#: diff.c:4558
31e5e17b
JX
2458msgid "-G, -S and --find-object are mutually exclusive"
2459msgstr "-G、-S 和 --find-object 是互斥的"
2460
d46c5519 2461#: diff.c:4636
a0b6b246
JX
2462msgid "--follow requires exactly one pathspec"
2463msgstr "--follow 明确要求只跟一个路径规格"
2464
d46c5519
JX
2465#: diff.c:4684
2466#, c-format
2467msgid "invalid --stat value: %s"
2468msgstr "无效的 --stat 值:%s"
2469
2470#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217
2471#: parse-options.c:199 parse-options.c:203
2472#, c-format
2473msgid "%s expects a numerical value"
2474msgstr "%s 期望一个数字值"
2475
2476#: diff.c:4721
7aea43ff 2477#, c-format
a0b6b246
JX
2478msgid ""
2479"Failed to parse --dirstat/-X option parameter:\n"
2480"%s"
2481msgstr ""
2482"无法解析 --dirstat/-X 选项的参数:\n"
2483"%s"
7aea43ff 2484
d46c5519
JX
2485#: diff.c:4806
2486#, c-format
2487msgid "unknown change class '%c' in --diff-filter=%s"
2488msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
2489
2490#: diff.c:4830
2491#, c-format
2492msgid "unknown value after ws-error-highlight=%.*s"
2493msgstr "ws-error-highlight=%.*s 之后未知的值"
2494
2495#: diff.c:4844
7aea43ff 2496#, c-format
d46c5519
JX
2497msgid "unable to resolve '%s'"
2498msgstr "不能解析 '%s'"
2499
2500#: diff.c:4894 diff.c:4900
2501#, c-format
2502msgid "%s expects <n>/<m> form"
2503msgstr "%s 期望 <n>/<m> 格式"
2504
2505#: diff.c:4912
2506#, c-format
2507msgid "%s expects a character, got '%s'"
2508msgstr "%s 期望一个字符,得到 '%s'"
2509
2510#: diff.c:4933
2511#, c-format
2512msgid "bad --color-moved argument: %s"
2513msgstr "坏的 --color-moved 参数:%s"
2514
2515#: diff.c:4952
2516#, c-format
2517msgid "invalid mode '%s' in --color-moved-ws"
2518msgstr "--color-moved-ws 中的无效模式 '%s' "
2519
2520#: diff.c:4992
2521msgid ""
2522"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
2523"\"histogram\""
2524msgstr ""
2525"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
2526
2527#: diff.c:5028 diff.c:5048
2528#, c-format
2529msgid "invalid argument to %s"
2530msgstr "%s 的参数无效"
2531
2532#: diff.c:5186
2533#, c-format
2534msgid "failed to parse --submodule option parameter: '%s'"
a0b6b246 2535msgstr "无法解析 --submodule 选项的参数:'%s'"
7aea43ff 2536
d46c5519
JX
2537#: diff.c:5242
2538#, c-format
2539msgid "bad --word-diff argument: %s"
2540msgstr "坏的 --word-diff 参数:%s"
2541
2542#: diff.c:5265
2543msgid "Diff output format options"
2544msgstr "差异输出格式化选项"
2545
2546#: diff.c:5267 diff.c:5273
2547msgid "generate patch"
2548msgstr "生成补丁"
2549
2550#: diff.c:5270 builtin/log.c:167
2551msgid "suppress diff output"
2552msgstr "不显示差异输出"
2553
2554#: diff.c:5275 diff.c:5389 diff.c:5396
2555msgid "<n>"
2556msgstr "<n>"
2557
2558#: diff.c:5276 diff.c:5279
2559msgid "generate diffs with <n> lines context"
2560msgstr "生成含 <n> 行上下文的差异"
2561
2562#: diff.c:5281
2563msgid "generate the diff in raw format"
2564msgstr "生成原始格式的差异"
2565
2566#: diff.c:5284
2567msgid "synonym for '-p --raw'"
2568msgstr "和 '-p --raw' 同义"
2569
2570#: diff.c:5288
2571msgid "synonym for '-p --stat'"
2572msgstr "和 '-p --stat' 同义"
2573
2574#: diff.c:5292
2575msgid "machine friendly --stat"
2576msgstr "机器友好的 --stat"
2577
2578#: diff.c:5295
2579msgid "output only the last line of --stat"
2580msgstr "只输出 --stat 的最后一行"
2581
2582#: diff.c:5297 diff.c:5305
2583msgid "<param1,param2>..."
2584msgstr "<参数1,参数2>..."
2585
2586#: diff.c:5298
2587msgid ""
2588"output the distribution of relative amount of changes for each sub-directory"
2589msgstr "输出每个子目录相对变更的分布"
2590
2591#: diff.c:5302
2592msgid "synonym for --dirstat=cumulative"
2593msgstr "和 --dirstat=cumulative 同义"
2594
2595#: diff.c:5306
2596msgid "synonym for --dirstat=files,param1,param2..."
2597msgstr "是 --dirstat=files,param1,param2... 的同义词"
2598
2599#: diff.c:5310
2600msgid "warn if changes introduce conflict markers or whitespace errors"
2601msgstr "如果变更中引入冲突定界符或空白错误,给出警告"
2602
2603#: diff.c:5313
2604msgid "condensed summary such as creations, renames and mode changes"
2605msgstr "精简摘要,例如创建、重命名和模式变更"
2606
2607#: diff.c:5316
2608msgid "show only names of changed files"
2609msgstr "只显示变更文件的文件名"
2610
2611#: diff.c:5319
2612msgid "show only names and status of changed files"
2613msgstr "只显示变更文件的文件名和状态"
2614
2615#: diff.c:5321
2616msgid "<width>[,<name-width>[,<count>]]"
2617msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
2618
2619#: diff.c:5322
2620msgid "generate diffstat"
2621msgstr "生成 diffstat"
2622
2623#: diff.c:5324 diff.c:5327 diff.c:5330
2624msgid "<width>"
2625msgstr "<宽度>"
2626
2627#: diff.c:5325
2628msgid "generate diffstat with a given width"
2629msgstr "使用给定的长度生成差异统计"
2630
2631#: diff.c:5328
2632msgid "generate diffstat with a given name width"
2633msgstr "使用给定的文件名长度生成差异统计"
2634
2635#: diff.c:5331
2636msgid "generate diffstat with a given graph width"
2637msgstr "使用给定的图形长度生成差异统计"
2638
2639#: diff.c:5333
2640msgid "<count>"
2641msgstr "<次数>"
2642
2643#: diff.c:5334
2644msgid "generate diffstat with limited lines"
2645msgstr "生成有限行数的差异统计"
2646
2647#: diff.c:5337
2648msgid "generate compact summary in diffstat"
2649msgstr "生成差异统计的简洁摘要"
2650
2651#: diff.c:5340
2652msgid "output a binary diff that can be applied"
2653msgstr "输出一个可以应用的二进制差异"
2654
2655#: diff.c:5343
2656msgid "show full pre- and post-image object names on the \"index\" lines"
2657msgstr "在 \"index\" 行显示完整的前后对象名称"
2658
2659#: diff.c:5345
2660msgid "show colored diff"
2661msgstr "显示带颜色的差异"
2662
2663#: diff.c:5346
2664msgid "<kind>"
2665msgstr "<类型>"
2666
2667#: diff.c:5347
2668msgid ""
2669"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
2670"diff"
2671msgstr "对于差异中的上下文、旧的和新的行,加亮显示错误的空白字符"
2672
2673#: diff.c:5350
2674msgid ""
2675"do not munge pathnames and use NULs as output field terminators in --raw or "
2676"--numstat"
2677msgstr ""
2678"在 --raw 或者 --numstat 中,不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
2679"符"
2680
2681#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465
2682msgid "<prefix>"
2683msgstr "<前缀>"
2684
2685#: diff.c:5354
2686msgid "show the given source prefix instead of \"a/\""
2687msgstr "显示给定的源前缀取代 \"a/\""
2688
2689#: diff.c:5357
2690msgid "show the given destination prefix instead of \"b/\""
2691msgstr "显示给定的目标前缀取代 \"b/\""
2692
2693#: diff.c:5360
2694msgid "prepend an additional prefix to every line of output"
2695msgstr "输出的每一行附加前缀"
2696
2697#: diff.c:5363
2698msgid "do not show any source or destination prefix"
2699msgstr "不显示任何源和目标前缀"
2700
2701#: diff.c:5366
2702msgid "show context between diff hunks up to the specified number of lines"
2703msgstr "显示指定行数的差异块间的上下文"
2704
2705#: diff.c:5370 diff.c:5375 diff.c:5380
2706msgid "<char>"
2707msgstr "<字符>"
2708
2709#: diff.c:5371
2710msgid "specify the character to indicate a new line instead of '+'"
2711msgstr "指定一个字符取代 '+' 来表示新的一行"
2712
2713#: diff.c:5376
2714msgid "specify the character to indicate an old line instead of '-'"
2715msgstr "指定一个字符取代 '-' 来表示旧的一行"
2716
2717#: diff.c:5381
2718msgid "specify the character to indicate a context instead of ' '"
2719msgstr "指定一个字符取代 ' ' 来表示一行上下文"
2720
2721#: diff.c:5384
2722msgid "Diff rename options"
2723msgstr "差异重命名选项"
2724
2725#: diff.c:5385
2726msgid "<n>[/<m>]"
2727msgstr "<n>[/<m>]"
2728
2729#: diff.c:5386
2730msgid "break complete rewrite changes into pairs of delete and create"
2731msgstr "打破完全重写变更为成对的删除和创建"
2732
2733#: diff.c:5390
2734msgid "detect renames"
2735msgstr "检测重命名"
2736
2737#: diff.c:5394
2738msgid "omit the preimage for deletes"
2739msgstr "省略删除操作的差异输出"
2740
2741#: diff.c:5397
2742msgid "detect copies"
2743msgstr "检测拷贝"
2744
2745#: diff.c:5401
2746msgid "use unmodified files as source to find copies"
2747msgstr "使用未修改的文件做为发现拷贝的源"
2748
2749#: diff.c:5403
2750msgid "disable rename detection"
2751msgstr "禁用重命名探测"
2752
2753#: diff.c:5406
2754msgid "use empty blobs as rename source"
2755msgstr "使用空的数据对象做为重命名的源"
2756
2757#: diff.c:5408
2758msgid "continue listing the history of a file beyond renames"
2759msgstr "继续列出文件重命名以外的历史记录"
2760
2761#: diff.c:5411
2762msgid ""
2763"prevent rename/copy detection if the number of rename/copy targets exceeds "
2764"given limit"
2765msgstr "如果重命名/拷贝目标超过给定的限制,禁止重命名/拷贝检测"
2766
2767#: diff.c:5413
2768msgid "Diff algorithm options"
2769msgstr "差异算法选项"
2770
2771#: diff.c:5415
2772msgid "produce the smallest possible diff"
2773msgstr "生成尽可能小的差异"
2774
2775#: diff.c:5418
2776msgid "ignore whitespace when comparing lines"
2777msgstr "行比较时忽略空白字符"
2778
2779#: diff.c:5421
2780msgid "ignore changes in amount of whitespace"
2781msgstr "忽略空白字符的变更"
2782
2783#: diff.c:5424
2784msgid "ignore changes in whitespace at EOL"
2785msgstr "忽略行尾的空白字符变更"
2786
2787#: diff.c:5427
2788msgid "ignore carrier-return at the end of line"
2789msgstr "忽略行尾的回车符(CR)"
2790
2791#: diff.c:5430
2792msgid "ignore changes whose lines are all blank"
2793msgstr "忽略整行都是空白的变更"
2794
2795#: diff.c:5433
2796msgid "heuristic to shift diff hunk boundaries for easy reading"
2797msgstr "启发式转换差异边界以便阅读"
2798
2799#: diff.c:5436
2800msgid "generate diff using the \"patience diff\" algorithm"
2801msgstr "使用 \"patience diff\" 算法生成差异"
2802
2803#: diff.c:5440
2804msgid "generate diff using the \"histogram diff\" algorithm"
2805msgstr "使用 \"histogram diff\" 算法生成差异"
2806
2807#: diff.c:5442
2808msgid "<algorithm>"
2809msgstr "<算法>"
2810
2811#: diff.c:5443
2812msgid "choose a diff algorithm"
2813msgstr "选择一个差异算法"
2814
2815#: diff.c:5445
2816msgid "<text>"
2817msgstr "<文本>"
2818
2819#: diff.c:5446
2820msgid "generate diff using the \"anchored diff\" algorithm"
2821msgstr "使用“锚定差异算法生成差异"
2822
2823#: diff.c:5448 diff.c:5457 diff.c:5460
2824msgid "<mode>"
2825msgstr "<模式>"
2826
2827#: diff.c:5449
2828msgid "show word diff, using <mode> to delimit changed words"
2829msgstr "显示单词差异,使用 <模式> 分隔变更的单词"
2830
2831#: diff.c:5451 diff.c:5454 diff.c:5499
2832msgid "<regex>"
2833msgstr "<正则>"
2834
2835#: diff.c:5452
2836msgid "use <regex> to decide what a word is"
2837msgstr "使用 <正则表达式> 确定何为一个词"
2838
2839#: diff.c:5455
2840msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
2841msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
2842
2843#: diff.c:5458
2844msgid "moved lines of code are colored differently"
2845msgstr "移动的代码行用不同方式着色"
2846
2847#: diff.c:5461
2848msgid "how white spaces are ignored in --color-moved"
2849msgstr "在 --color-moved 下如何忽略空白字符"
2850
2851#: diff.c:5464
2852msgid "Other diff options"
2853msgstr "其它差异选项"
2854
2855#: diff.c:5466
2856msgid "when run from subdir, exclude changes outside and show relative paths"
2857msgstr "当从子目录运行,排除目录之外的变更并显示相对路径"
2858
2859#: diff.c:5470
2860msgid "treat all files as text"
2861msgstr "把所有文件当做文本处理"
2862
2863#: diff.c:5472
2864msgid "swap two inputs, reverse the diff"
2865msgstr "交换两个输入,反转差异"
2866
2867#: diff.c:5474
2868msgid "exit with 1 if there were differences, 0 otherwise"
2869msgstr "有差异时退出码为 1,否则为 0"
2870
2871#: diff.c:5476
2872msgid "disable all output of the program"
2873msgstr "禁用本程序的所有输出"
2874
2875#: diff.c:5478
2876msgid "allow an external diff helper to be executed"
2877msgstr "允许执行一个外置的差异助手"
2878
2879#: diff.c:5480
2880msgid "run external text conversion filters when comparing binary files"
2881msgstr "当比较二进制文件时,运行外部的文本转换过滤器"
2882
2883#: diff.c:5482
2884msgid "<when>"
2885msgstr "<何时>"
2886
2887#: diff.c:5483
2888msgid "ignore changes to submodules in the diff generation"
2889msgstr "在生成差异时,忽略子模组的更改"
2890
2891#: diff.c:5486
2892msgid "<format>"
2893msgstr "<格式>"
2894
2895#: diff.c:5487
2896msgid "specify how differences in submodules are shown"
2897msgstr "指定子模组的差异如何显示"
2898
2899#: diff.c:5491
2900msgid "hide 'git add -N' entries from the index"
2901msgstr "隐藏索引中 'git add -N' 条目"
2902
2903#: diff.c:5494
2904msgid "treat 'git add -N' entries as real in the index"
2905msgstr "将索引中 'git add -N' 条目当做真实的"
2906
2907#: diff.c:5496
2908msgid "<string>"
2909msgstr "<字符串>"
2910
2911#: diff.c:5497
2912msgid ""
2913"look for differences that change the number of occurrences of the specified "
2914"string"
2915msgstr "查找改变了指定字符串出现次数的差异"
2916
2917#: diff.c:5500
2918msgid ""
2919"look for differences that change the number of occurrences of the specified "
2920"regex"
2921msgstr "查找改变指定正则匹配出现次数的差异"
2922
2923#: diff.c:5503
2924msgid "show all changes in the changeset with -S or -G"
2925msgstr "显示使用 -S 或 -G 的变更集的所有变更"
2926
2927#: diff.c:5506
2928msgid "treat <string> in -S as extended POSIX regular expression"
2929msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
2930
2931#: diff.c:5509
2932msgid "control the order in which files appear in the output"
2933msgstr "控制输出中的文件显示顺序"
2934
2935#: diff.c:5510
2936msgid "<object-id>"
2937msgstr "<对象ID>"
2938
2939#: diff.c:5511
2940msgid ""
2941"look for differences that change the number of occurrences of the specified "
2942"object"
2943msgstr "查找改变指定对象出现次数的差异"
2944
2945#: diff.c:5513
2946msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
2947msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
2948
2949#: diff.c:5514
2950msgid "select files by diff type"
2951msgstr "通过差异类型选择文件"
2952
2953#: diff.c:5516
2954msgid "<file>"
2955msgstr "<文件>"
2956
2957#: diff.c:5517
2958msgid "Output to a specific file"
2959msgstr "输出到一个指定的文件"
2960
2961#: diff.c:6150
a0b6b246
JX
2962msgid "inexact rename detection was skipped due to too many files."
2963msgstr "因为文件太多,略过不严格的重命名检查。"
2964
d46c5519 2965#: diff.c:6153
a0b6b246
JX
2966msgid "only found copies from modified paths due to too many files."
2967msgstr "因为文件太多,只在修改的路径中查找拷贝。"
2968
d46c5519 2969#: diff.c:6156
7aea43ff 2970#, c-format
a0b6b246
JX
2971msgid ""
2972"you may want to set your %s variable to at least %d and retry the command."
29004bbb 2973msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
7aea43ff 2974
d46c5519 2975#: dir.c:537
c1ac5258
JX
2976#, c-format
2977msgid "pathspec '%s' did not match any file(s) known to git"
2978msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
2979
d46c5519 2980#: dir.c:926
c1ac5258
JX
2981#, c-format
2982msgid "cannot use %s as an exclude file"
2983msgstr "不能将 %s 用作排除文件"
2984
d46c5519 2985#: dir.c:1843
31e5e17b
JX
2986#, c-format
2987msgid "could not open directory '%s'"
2988msgstr "不能打开目录 '%s'"
2989
d46c5519 2990#: dir.c:2085
a0b6b246
JX
2991msgid "failed to get kernel name and information"
2992msgstr "无法获得内核名称和信息"
7aea43ff 2993
d46c5519 2994#: dir.c:2209
c1ac5258
JX
2995msgid "untracked cache is disabled on this system or location"
2996msgstr "缓存未跟踪文件在本系统或位置中被禁用"
2997
d46c5519 2998#: dir.c:3013
c1ac5258
JX
2999#, c-format
3000msgid "index file corrupt in repo %s"
3001msgstr "仓库 %s 中的索引文件损坏"
7aea43ff 3002
d46c5519 3003#: dir.c:3058 dir.c:3063
87cb7997
JX
3004#, c-format
3005msgid "could not create directories for %s"
3006msgstr "不能为 %s 创建目录"
3007
d46c5519 3008#: dir.c:3092
1a79b2f1
JX
3009#, c-format
3010msgid "could not migrate git directory from '%s' to '%s'"
3011msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
3012
4c27fcb5 3013#: editor.c:73
5809aa05
JX
3014#, c-format
3015msgid "hint: Waiting for your editor to close the file...%c"
3016msgstr "提示:等待您的编辑器关闭文件...%c"
3017
c1ac5258 3018#: entry.c:178
6937cb4e
JX
3019msgid "Filtering content"
3020msgstr "过滤内容"
3021
d46c5519 3022#: entry.c:476
87cb7997
JX
3023#, c-format
3024msgid "could not stat file '%s'"
65e2041e 3025msgstr "不能对文件 '%s' 调用 stat"
87cb7997 3026
c1ac5258
JX
3027#: environment.c:150
3028#, c-format
3029msgid "bad git namespace path \"%s\""
e640d114 3030msgstr "错误的 git 名字空间路径 \"%s\""
c1ac5258
JX
3031
3032#: environment.c:332
3033#, c-format
3034msgid "could not set GIT_DIR to '%s'"
3035msgstr "不能设置 GIT_DIR 为 '%s'"
3036
d46c5519 3037#: exec-cmd.c:363
c1ac5258
JX
3038#, c-format
3039msgid "too many args to run %s"
3040msgstr "执行 %s 的参数太多"
3041
31e5e17b
JX
3042#: fetch-object.c:17
3043msgid "Remote with no URL"
3044msgstr "远程未设置 URL"
3045
4c27fcb5 3046#: fetch-pack.c:151
a0b6b246
JX
3047msgid "git fetch-pack: expected shallow list"
3048msgstr "git fetch-pack:应为 shallow 列表"
3049
06991777
JX
3050#: fetch-pack.c:154
3051msgid "git fetch-pack: expected a flush packet after shallow list"
3052msgstr "git fetch-pack:在浅克隆列表之后期望一个 flush 包"
3053
3054#: fetch-pack.c:165
31e5e17b
JX
3055msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
3056msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包"
a0b6b246 3057
06991777 3058#: fetch-pack.c:185
90314792 3059#, c-format
275588f9 3060msgid "git fetch-pack: expected ACK/NAK, got '%s'"
a0b6b246 3061msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
90314792 3062
d46c5519
JX
3063#: fetch-pack.c:196
3064msgid "unable to write to remote"
3065msgstr "无法写到远程"
3066
3067#: fetch-pack.c:258
a0b6b246
JX
3068msgid "--stateless-rpc requires multi_ack_detailed"
3069msgstr "--stateless-rpc 需要 multi_ack_detailed"
90314792 3070
d46c5519 3071#: fetch-pack.c:360 fetch-pack.c:1271
90314792 3072#, c-format
a0b6b246
JX
3073msgid "invalid shallow line: %s"
3074msgstr "无效的 shallow 信息:%s"
90314792 3075
d46c5519 3076#: fetch-pack.c:366 fetch-pack.c:1277
c04f5ac3 3077#, c-format
a0b6b246
JX
3078msgid "invalid unshallow line: %s"
3079msgstr "无效的 unshallow 信息:%s"
c04f5ac3 3080
d46c5519 3081#: fetch-pack.c:368 fetch-pack.c:1279
a0b6b246
JX
3082#, c-format
3083msgid "object not found: %s"
3084msgstr "对象未找到:%s"
07432cef 3085
d46c5519 3086#: fetch-pack.c:371 fetch-pack.c:1282
c04f5ac3 3087#, c-format
a0b6b246
JX
3088msgid "error in object: %s"
3089msgstr "对象中出错:%s"
07432cef 3090
d46c5519 3091#: fetch-pack.c:373 fetch-pack.c:1284
c04f5ac3 3092#, c-format
a0b6b246
JX
3093msgid "no shallow found: %s"
3094msgstr "未发现 shallow:%s"
c04f5ac3 3095
d46c5519 3096#: fetch-pack.c:376 fetch-pack.c:1288
a0b6b246
JX
3097#, c-format
3098msgid "expected shallow/unshallow, got %s"
3099msgstr "应为 shallow/unshallow,却得到 %s"
07432cef 3100
d46c5519 3101#: fetch-pack.c:417
a0b6b246
JX
3102#, c-format
3103msgid "got %s %d %s"
3104msgstr "得到 %s %d %s"
1b7f4a34 3105
d46c5519 3106#: fetch-pack.c:434
1b7f4a34 3107#, c-format
a0b6b246
JX
3108msgid "invalid commit %s"
3109msgstr "无效提交 %s"
1b7f4a34 3110
d46c5519 3111#: fetch-pack.c:465
a0b6b246
JX
3112msgid "giving up"
3113msgstr "放弃"
814ff314 3114
d46c5519 3115#: fetch-pack.c:477 progress.c:284
a0b6b246
JX
3116msgid "done"
3117msgstr "完成"
2e8451e8 3118
d46c5519 3119#: fetch-pack.c:489
2e8451e8 3120#, c-format
a0b6b246
JX
3121msgid "got %s (%d) %s"
3122msgstr "得到 %s (%d) %s"
2e8451e8 3123
d46c5519 3124#: fetch-pack.c:535
a0b6b246
JX
3125#, c-format
3126msgid "Marking %s as complete"
3127msgstr "标记 %s 为完成"
220c313c 3128
d46c5519 3129#: fetch-pack.c:744
a0b6b246
JX
3130#, c-format
3131msgid "already have %s (%s)"
29004bbb 3132msgstr "已经有 %s(%s)"
220c313c 3133
d46c5519 3134#: fetch-pack.c:783
a0b6b246
JX
3135msgid "fetch-pack: unable to fork off sideband demultiplexer"
3136msgstr "fetch-pack:无法派生 sideband 多路输出"
1b7f4a34 3137
d46c5519 3138#: fetch-pack.c:791
a0b6b246
JX
3139msgid "protocol error: bad pack header"
3140msgstr "协议错误:坏的包头"
814ff314 3141
d46c5519 3142#: fetch-pack.c:859
a0b6b246
JX
3143#, c-format
3144msgid "fetch-pack: unable to fork off %s"
3145msgstr "fetch-pack:无法派生进程 %s"
5c57d762 3146
d46c5519 3147#: fetch-pack.c:875
a0b6b246
JX
3148#, c-format
3149msgid "%s failed"
3150msgstr "%s 失败"
14c8bced 3151
d46c5519 3152#: fetch-pack.c:877
a0b6b246
JX
3153msgid "error in sideband demultiplexer"
3154msgstr "sideband 多路输出出错"
c04f5ac3 3155
d46c5519 3156#: fetch-pack.c:906
a0b6b246
JX
3157msgid "Server does not support shallow clients"
3158msgstr "服务器不支持 shalllow 客户端"
c04f5ac3 3159
d46c5519 3160#: fetch-pack.c:910
a0b6b246
JX
3161msgid "Server supports multi_ack_detailed"
3162msgstr "服务器支持 multi_ack_detailed"
c04f5ac3 3163
d46c5519 3164#: fetch-pack.c:913
a0b6b246
JX
3165msgid "Server supports no-done"
3166msgstr "服务器支持 no-done"
c04f5ac3 3167
d46c5519 3168#: fetch-pack.c:919
a0b6b246
JX
3169msgid "Server supports multi_ack"
3170msgstr "服务器支持 multi_ack"
c04f5ac3 3171
d46c5519 3172#: fetch-pack.c:923
a0b6b246
JX
3173msgid "Server supports side-band-64k"
3174msgstr "服务器支持 side-band-64k"
c04f5ac3 3175
d46c5519 3176#: fetch-pack.c:927
a0b6b246
JX
3177msgid "Server supports side-band"
3178msgstr "服务器支持 side-band"
5c57d762 3179
d46c5519 3180#: fetch-pack.c:931
a0b6b246
JX
3181msgid "Server supports allow-tip-sha1-in-want"
3182msgstr "服务器支持 allow-tip-sha1-in-want"
c04f5ac3 3183
d46c5519 3184#: fetch-pack.c:935
a0b6b246
JX
3185msgid "Server supports allow-reachable-sha1-in-want"
3186msgstr "服务器支持 allow-reachable-sha1-in-want"
8ada9598 3187
d46c5519 3188#: fetch-pack.c:945
a0b6b246
JX
3189msgid "Server supports ofs-delta"
3190msgstr "服务器支持 ofs-delta"
8ada9598 3191
d46c5519 3192#: fetch-pack.c:951 fetch-pack.c:1144
31e5e17b
JX
3193msgid "Server supports filter"
3194msgstr "服务器支持 filter"
3195
d46c5519 3196#: fetch-pack.c:959
81809b99 3197#, c-format
a0b6b246
JX
3198msgid "Server version is %.*s"
3199msgstr "服务器版本 %.*s"
8ada9598 3200
d46c5519 3201#: fetch-pack.c:965
a0b6b246
JX
3202msgid "Server does not support --shallow-since"
3203msgstr "服务器不支持 --shallow-since"
8ada9598 3204
d46c5519 3205#: fetch-pack.c:969
a0b6b246
JX
3206msgid "Server does not support --shallow-exclude"
3207msgstr "服务器不支持 --shallow-exclude"
c04f5ac3 3208
d46c5519 3209#: fetch-pack.c:971
a0b6b246
JX
3210msgid "Server does not support --deepen"
3211msgstr "服务器不支持 --deepen"
c04f5ac3 3212
d46c5519 3213#: fetch-pack.c:988
a0b6b246
JX
3214msgid "no common commits"
3215msgstr "没有共同的提交"
c04f5ac3 3216
d46c5519 3217#: fetch-pack.c:1000 fetch-pack.c:1449
a0b6b246
JX
3218msgid "git fetch-pack: fetch failed."
3219msgstr "git fetch-pack:获取失败。"
c04f5ac3 3220
d46c5519 3221#: fetch-pack.c:1138
fd8cb379
JX
3222msgid "Server does not support shallow requests"
3223msgstr "服务器不支持 shalllow 请求"
3224
d46c5519
JX
3225#: fetch-pack.c:1171
3226msgid "unable to write request to remote"
3227msgstr "无法将请求写到远程"
3228
3229#: fetch-pack.c:1189
c1ac5258
JX
3230#, c-format
3231msgid "error reading section header '%s'"
3232msgstr "读取节标题 '%s' 出错"
3233
d46c5519 3234#: fetch-pack.c:1195
c1ac5258
JX
3235#, c-format
3236msgid "expected '%s', received '%s'"
3237msgstr "预期 '%s',得到 '%s'"
3238
d46c5519 3239#: fetch-pack.c:1234
c1ac5258
JX
3240#, c-format
3241msgid "unexpected acknowledgment line: '%s'"
3242msgstr "意外的确认行:'%s'"
3243
d46c5519 3244#: fetch-pack.c:1239
c1ac5258
JX
3245#, c-format
3246msgid "error processing acks: %d"
3247msgstr "处理 ack 出错:%d"
3248
d46c5519 3249#: fetch-pack.c:1249
4c27fcb5
JX
3250msgid "expected packfile to be sent after 'ready'"
3251msgstr "预期在 'ready' 之后发送 packfile"
3252
d46c5519 3253#: fetch-pack.c:1251
4c27fcb5
JX
3254msgid "expected no other sections to be sent after no 'ready'"
3255msgstr "在没有 'ready' 不应该发送其它小节"
3256
d46c5519 3257#: fetch-pack.c:1293
c1ac5258
JX
3258#, c-format
3259msgid "error processing shallow info: %d"
3260msgstr "处理浅克隆信息出错:%d"
3261
d46c5519 3262#: fetch-pack.c:1340
c1ac5258
JX
3263#, c-format
3264msgid "expected wanted-ref, got '%s'"
3265msgstr "预期 wanted-ref,得到 '%s'"
3266
d46c5519 3267#: fetch-pack.c:1345
c1ac5258
JX
3268#, c-format
3269msgid "unexpected wanted-ref: '%s'"
3270msgstr "意外的 wanted-ref:'%s'"
3271
d46c5519 3272#: fetch-pack.c:1350
c1ac5258
JX
3273#, c-format
3274msgid "error processing wanted refs: %d"
3275msgstr "处理要获取的引用出错:%d"
3276
d46c5519 3277#: fetch-pack.c:1676
a0b6b246
JX
3278msgid "no matching remote head"
3279msgstr "没有匹配的远程分支"
c04f5ac3 3280
d46c5519 3281#: fetch-pack.c:1699 builtin/clone.c:673
c1ac5258 3282msgid "remote did not send all necessary objects"
e640d114 3283msgstr "远程没有发送所有必需的对象"
c1ac5258 3284
d46c5519 3285#: fetch-pack.c:1726
87cb7997
JX
3286#, c-format
3287msgid "no such remote ref %s"
3288msgstr "没有这样的远程引用 %s"
3289
d46c5519 3290#: fetch-pack.c:1729
87cb7997
JX
3291#, c-format
3292msgid "Server does not allow request for unadvertised object %s"
3293msgstr "服务器不允许请求未公开的对象 %s"
3294
4c27fcb5 3295#: gpg-interface.c:318
a0b6b246
JX
3296msgid "gpg failed to sign the data"
3297msgstr "gpg 无法为数据签名"
c04f5ac3 3298
4c27fcb5 3299#: gpg-interface.c:344
a0b6b246
JX
3300msgid "could not create temporary file"
3301msgstr "不能创建临时文件"
c04f5ac3 3302
4c27fcb5 3303#: gpg-interface.c:347
c04f5ac3 3304#, c-format
a0b6b246
JX
3305msgid "failed writing detached signature to '%s'"
3306msgstr "无法将分离式签名写入 '%s'"
c04f5ac3 3307
a4f16749 3308#: graph.c:97
1a79b2f1
JX
3309#, c-format
3310msgid "ignore invalid color '%.*s' in log.graphColors"
3311msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
3312
4c27fcb5 3313#: grep.c:2113
c04f5ac3 3314#, c-format
a0b6b246
JX
3315msgid "'%s': unable to read %s"
3316msgstr "'%s':无法读取 %s"
c04f5ac3 3317
06991777
JX
3318#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
3319#: builtin/rm.c:135
c04f5ac3 3320#, c-format
a0b6b246 3321msgid "failed to stat '%s'"
65e2041e 3322msgstr "对 '%s' 调用 stat 失败"
c04f5ac3 3323
4c27fcb5 3324#: grep.c:2141
a0b6b246
JX
3325#, c-format
3326msgid "'%s': short read"
3327msgstr "'%s':读取不完整"
5c57d762 3328
fd8cb379
JX
3329#: help.c:23
3330msgid "start a working area (see also: git help tutorial)"
3331msgstr "开始一个工作区(参见:git help tutorial)"
3332
3333#: help.c:24
3334msgid "work on the current change (see also: git help everyday)"
3335msgstr "在当前变更上工作(参见:git help everyday)"
3336
3337#: help.c:25
3338msgid "examine the history and state (see also: git help revisions)"
3339msgstr "检查历史和状态(参见:git help revisions)"
3340
3341#: help.c:26
3342msgid "grow, mark and tweak your common history"
3343msgstr "扩展、标记和调校您的历史记录"
3344
3345#: help.c:27
3346msgid "collaborate (see also: git help workflows)"
3347msgstr "协同(参见:git help workflows)"
3348
3349#: help.c:31
3350msgid "Main Porcelain Commands"
3351msgstr "主要的上层命令"
3352
3353#: help.c:32
3354msgid "Ancillary Commands / Manipulators"
3355msgstr "辅助命令/操作者"
3356
3357#: help.c:33
3358msgid "Ancillary Commands / Interrogators"
3359msgstr "辅助命令/询问者"
3360
3361#: help.c:34
3362msgid "Interacting with Others"
3363msgstr "与其它系统交互"
3364
3365#: help.c:35
3366msgid "Low-level Commands / Manipulators"
3367msgstr "低级命令/操作者"
3368
3369#: help.c:36
3370msgid "Low-level Commands / Interrogators"
3371msgstr "低级命令/询问者"
3372
3373#: help.c:37
3374msgid "Low-level Commands / Synching Repositories"
3375msgstr "低级命令/同步仓库"
3376
3377#: help.c:38
3378msgid "Low-level Commands / Internal Helpers"
3379msgstr "低级命令/内部助手"
3380
06991777 3381#: help.c:298
a0b6b246
JX
3382#, c-format
3383msgid "available git commands in '%s'"
3384msgstr "在 '%s' 下可用的 git 命令"
c04f5ac3 3385
06991777 3386#: help.c:305
a0b6b246
JX
3387msgid "git commands available from elsewhere on your $PATH"
3388msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
5c57d762 3389
06991777 3390#: help.c:314
a0b6b246
JX
3391msgid "These are common Git commands used in various situations:"
3392msgstr "这些是各种场合常见的 Git 命令:"
5c57d762 3393
d46c5519 3394#: help.c:363 git.c:97
fd8cb379
JX
3395#, c-format
3396msgid "unsupported command listing type '%s'"
3397msgstr "不支持的命令列表类型 '%s'"
3398
d46c5519 3399#: help.c:403
fd8cb379
JX
3400msgid "The common Git guides are:"
3401msgstr "最常用的 Git 向导有:"
3402
d46c5519 3403#: help.c:512
4c27fcb5
JX
3404msgid "See 'git help <command>' to read about a specific subcommand"
3405msgstr "执行 'git help <command>' 来查看特定子命令"
3406
d46c5519 3407#: help.c:517
4c27fcb5
JX
3408msgid "External commands"
3409msgstr "外部命令"
3410
d46c5519 3411#: help.c:532
4c27fcb5
JX
3412msgid "Command aliases"
3413msgstr "命令别名"
3414
d46c5519 3415#: help.c:596
c04f5ac3 3416#, c-format
a0b6b246
JX
3417msgid ""
3418"'%s' appears to be a git command, but we were not\n"
3419"able to execute it. Maybe git-%s is broken?"
3420msgstr ""
3421"'%s' 像是一个 git 命令,但却无法运行。\n"
3422"可能是 git-%s 受损?"
c04f5ac3 3423
d46c5519 3424#: help.c:655
a0b6b246
JX
3425msgid "Uh oh. Your system reports no Git commands at all."
3426msgstr "唉呀,您的系统中未发现 Git 命令。"
c04f5ac3 3427
d46c5519 3428#: help.c:677
c04f5ac3 3429#, c-format
a4f16749 3430msgid "WARNING: You called a Git command named '%s', which does not exist."
554e8501 3431msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。"
a4f16749 3432
d46c5519 3433#: help.c:682
a4f16749
JX
3434#, c-format
3435msgid "Continuing under the assumption that you meant '%s'."
554e8501 3436msgstr "假定你想要的是 '%s' 并继续。"
c04f5ac3 3437
d46c5519 3438#: help.c:687
c04f5ac3 3439#, c-format
a4f16749 3440msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
554e8501 3441msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。"
c04f5ac3 3442
d46c5519 3443#: help.c:695
c04f5ac3 3444#, c-format
a0b6b246
JX
3445msgid "git: '%s' is not a git command. See 'git --help'."
3446msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
c04f5ac3 3447
d46c5519 3448#: help.c:699
a4f16749
JX
3449msgid ""
3450"\n"
3451"The most similar command is"
3452msgid_plural ""
3453"\n"
3454"The most similar commands are"
6937cb4e
JX
3455msgstr[0] ""
3456"\n"
3457"最相似的命令是"
3458msgstr[1] ""
3459"\n"
3460"最相似的命令是"
a4f16749 3461
d46c5519 3462#: help.c:714
a4f16749
JX
3463msgid "git version [<options>]"
3464msgstr "git version [<选项>]"
3465
d46c5519 3466#: help.c:782
a4f16749
JX
3467#, c-format
3468msgid "%s: %s - %s"
3469msgstr "%s:%s - %s"
3470
d46c5519 3471#: help.c:786
a0b6b246
JX
3472msgid ""
3473"\n"
3474"Did you mean this?"
3475msgid_plural ""
3476"\n"
3477"Did you mean one of these?"
3478msgstr[0] ""
3479"\n"
3480"您指的是这个么?"
3481msgstr[1] ""
3482"\n"
3483"您指的是这其中的某一个么?"
c04f5ac3 3484
d46c5519 3485#: ident.c:349
a0b6b246
JX
3486msgid ""
3487"\n"
3488"*** Please tell me who you are.\n"
3489"\n"
3490"Run\n"
3491"\n"
3492" git config --global user.email \"you@example.com\"\n"
3493" git config --global user.name \"Your Name\"\n"
3494"\n"
3495"to set your account's default identity.\n"
3496"Omit --global to set the identity only in this repository.\n"
3497"\n"
3498msgstr ""
3499"\n"
3500"*** 请告诉我你是谁。\n"
3501"\n"
3502"运行\n"
3503"\n"
3504" git config --global user.email \"you@example.com\"\n"
3505" git config --global user.name \"Your Name\"\n"
3506"\n"
3507"来设置您账号的缺省身份标识。\n"
3508"如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
c04f5ac3 3509
d46c5519 3510#: ident.c:379
87cb7997 3511msgid "no email was given and auto-detection is disabled"
65e2041e 3512msgstr "未提供邮件地址且自动探测被禁用"
87cb7997 3513
d46c5519 3514#: ident.c:384
87cb7997
JX
3515#, c-format
3516msgid "unable to auto-detect email address (got '%s')"
3517msgstr "无法自动探测邮件地址(得到 '%s')"
3518
d46c5519 3519#: ident.c:401
87cb7997
JX
3520msgid "no name was given and auto-detection is disabled"
3521msgstr "未提供姓名且自动探测被禁用"
3522
d46c5519 3523#: ident.c:407
87cb7997
JX
3524#, c-format
3525msgid "unable to auto-detect name (got '%s')"
3526msgstr "无法自动探测姓名(得到 '%s')"
3527
d46c5519 3528#: ident.c:415
87cb7997
JX
3529#, c-format
3530msgid "empty ident name (for <%s>) not allowed"
3531msgstr "不允许空的姓名(对于 <%s>)"
3532
d46c5519 3533#: ident.c:421
87cb7997
JX
3534#, c-format
3535msgid "name consists only of disallowed characters: %s"
3536msgstr "姓名中仅包含禁用字符:%s"
3537
d46c5519 3538#: ident.c:436 builtin/commit.c:608
87cb7997
JX
3539#, c-format
3540msgid "invalid date format: %s"
3541msgstr "无效的日期格式:%s"
3542
d46c5519
JX
3543#: list-objects.c:129
3544#, c-format
3545msgid "entry '%s' in tree %s has tree mode, but is not a tree"
3546msgstr "树 %2$s 中的条目 '%1$s' 具有树的属性,但不是一个树对象"
3547
3548#: list-objects.c:142
3549#, c-format
3550msgid "entry '%s' in tree %s has blob mode, but is not a blob"
3551msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的属性,但不是一个数据对象"
3552
3553#: list-objects.c:378
3554#, c-format
3555msgid "unable to load root tree for commit %s"
3556msgstr "无法为提交 %s 加载根树"
3557
06991777 3558#: list-objects-filter-options.c:36
31e5e17b
JX
3559msgid "multiple filter-specs cannot be combined"
3560msgstr "不能混用多种过滤规格"
5809aa05 3561
4c27fcb5 3562#: list-objects-filter-options.c:58
06991777
JX
3563msgid "expected 'tree:<depth>'"
3564msgstr "期望 'tree:<深度>'"
4c27fcb5 3565
d46c5519
JX
3566#: list-objects-filter-options.c:84
3567msgid "sparse:path filters support has been dropped"
3568msgstr "sparse:path 过滤器支持已被删除"
3569
3570#: list-objects-filter-options.c:158
31e5e17b
JX
3571msgid "cannot change partial clone promisor remote"
3572msgstr "无法修改部分克隆的 promisor 远程仓库"
5809aa05 3573
6937cb4e 3574#: lockfile.c:151
c04f5ac3 3575#, c-format
a0b6b246
JX
3576msgid ""
3577"Unable to create '%s.lock': %s.\n"
3578"\n"
3579"Another git process seems to be running in this repository, e.g.\n"
3580"an editor opened by 'git commit'. Please make sure all processes\n"
3581"are terminated then try again. If it still fails, a git process\n"
3582"may have crashed in this repository earlier:\n"
3583"remove the file manually to continue."
3584msgstr ""
3585"无法创建 '%s.lock':%s。\n"
3586"\n"
3587"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
3588"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
3589"可能之前有一个 git 进程在这个仓库中异常退出:\n"
3590"手动删除这个文件再继续。"
c04f5ac3 3591
6937cb4e 3592#: lockfile.c:159
a0b6b246
JX
3593#, c-format
3594msgid "Unable to create '%s.lock': %s"
3595msgstr "不能创建 '%s.lock':%s"
c04f5ac3 3596
4c27fcb5 3597#: merge.c:41
a0b6b246 3598msgid "failed to read the cache"
c1ac5258 3599msgstr "读取缓存失败"
c04f5ac3 3600
d46c5519
JX
3601#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921
3602#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773
3603#: builtin/stash.c:264
a0b6b246
JX
3604msgid "unable to write new index file"
3605msgstr "无法写新的索引文件"
c04f5ac3 3606
d46c5519 3607#: merge-recursive.c:322
a0b6b246
JX
3608msgid "(bad commit)\n"
3609msgstr "(坏提交)\n"
c04f5ac3 3610
d46c5519 3611#: merge-recursive.c:345
a0b6b246 3612#, c-format
fd8cb379 3613msgid "add_cacheinfo failed for path '%s'; merge aborting."
0fcd668f 3614msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。"
c04f5ac3 3615
d46c5519 3616#: merge-recursive.c:354
fd8cb379
JX
3617#, c-format
3618msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
0fcd668f 3619msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。"
fd8cb379 3620
d46c5519 3621#: merge-recursive.c:437
a0b6b246 3622msgid "error building trees"
c1ac5258 3623msgstr "创建树出错"
c04f5ac3 3624
d46c5519 3625#: merge-recursive.c:861
c04f5ac3 3626#, c-format
a0b6b246 3627msgid "failed to create path '%s'%s"
c1ac5258 3628msgstr "创建路径 '%s'%s 失败"
c04f5ac3 3629
d46c5519 3630#: merge-recursive.c:872
c04f5ac3 3631#, c-format
a0b6b246
JX
3632msgid "Removing %s to make room for subdirectory\n"
3633msgstr "删除 %s 以便为子目录留出空间\n"
c04f5ac3 3634
d46c5519 3635#: merge-recursive.c:886 merge-recursive.c:905
a0b6b246
JX
3636msgid ": perhaps a D/F conflict?"
3637msgstr ":可能是一个目录/文件冲突?"
c04f5ac3 3638
d46c5519 3639#: merge-recursive.c:895
c04f5ac3 3640#, c-format
a0b6b246
JX
3641msgid "refusing to lose untracked file at '%s'"
3642msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
c04f5ac3 3643
d46c5519 3644#: merge-recursive.c:936 builtin/cat-file.c:40
c04f5ac3 3645#, c-format
a0b6b246
JX
3646msgid "cannot read object %s '%s'"
3647msgstr "不能读取对象 %s '%s'"
c04f5ac3 3648
d46c5519 3649#: merge-recursive.c:939
4dcdc3d8 3650#, c-format
a0b6b246
JX
3651msgid "blob expected for %s '%s'"
3652msgstr "%s '%s' 应为数据对象"
4dcdc3d8 3653
d46c5519 3654#: merge-recursive.c:963
4dcdc3d8 3655#, c-format
a0b6b246 3656msgid "failed to open '%s': %s"
c1ac5258 3657msgstr "打开 '%s' 失败:%s"
4dcdc3d8 3658
d46c5519 3659#: merge-recursive.c:974
a0b6b246
JX
3660#, c-format
3661msgid "failed to symlink '%s': %s"
c1ac5258 3662msgstr "创建符号链接 '%s' 失败:%s"
c04f5ac3 3663
d46c5519 3664#: merge-recursive.c:979
5c57d762 3665#, c-format
a0b6b246
JX
3666msgid "do not know what to do with %06o %s '%s'"
3667msgstr "不知道如何处理 %06o %s '%s'"
5c57d762 3668
d46c5519 3669#: merge-recursive.c:1175
fd8cb379
JX
3670#, c-format
3671msgid "Failed to merge submodule %s (not checked out)"
3672msgstr "无法合并子模组 %s (没有检出)"
3673
d46c5519 3674#: merge-recursive.c:1182
fd8cb379
JX
3675#, c-format
3676msgid "Failed to merge submodule %s (commits not present)"
3677msgstr "无法合并子模组 %s(提交不存在)"
3678
d46c5519 3679#: merge-recursive.c:1189
fd8cb379
JX
3680#, c-format
3681msgid "Failed to merge submodule %s (commits don't follow merge-base)"
3682msgstr "无法合并子模组 %s (提交未跟随合并基线)"
3683
d46c5519 3684#: merge-recursive.c:1197 merge-recursive.c:1209
fd8cb379
JX
3685#, c-format
3686msgid "Fast-forwarding submodule %s to the following commit:"
3687msgstr "子模组 %s 快进到如下提交:"
3688
d46c5519 3689#: merge-recursive.c:1200 merge-recursive.c:1212
fd8cb379
JX
3690#, c-format
3691msgid "Fast-forwarding submodule %s"
3692msgstr "快进子模组 %s"
3693
d46c5519 3694#: merge-recursive.c:1235
fd8cb379
JX
3695#, c-format
3696msgid "Failed to merge submodule %s (merge following commits not found)"
3697msgstr "无法合并子模组 %s (没发现合并跟随的提交)"
3698
d46c5519 3699#: merge-recursive.c:1239
fd8cb379
JX
3700#, c-format
3701msgid "Failed to merge submodule %s (not fast-forward)"
3702msgstr "无法合并子模组 %s(非快进)"
3703
d46c5519 3704#: merge-recursive.c:1240
fd8cb379
JX
3705msgid "Found a possible merge resolution for the submodule:\n"
3706msgstr "找到子模组的一个可能的合并方案:\n"
3707
d46c5519 3708#: merge-recursive.c:1243
fd8cb379
JX
3709#, c-format
3710msgid ""
3711"If this is correct simply add it to the index for example\n"
3712"by using:\n"
3713"\n"
3714" git update-index --cacheinfo 160000 %s \"%s\"\n"
3715"\n"
3716"which will accept this suggestion.\n"
3717msgstr ""
3718"如果这个正确,将其添加到索引,例如使用命令:\n"
3719"\n"
3720" git update-index --cacheinfo 160000 %s \"%s\"\n"
3721"\n"
3722"以接受此建议。\n"
3723
d46c5519 3724#: merge-recursive.c:1252
fd8cb379
JX
3725#, c-format
3726msgid "Failed to merge submodule %s (multiple merges found)"
3727msgstr "无法合并子模组 %s (发现多个合并)"
3728
d46c5519 3729#: merge-recursive.c:1325
a0b6b246
JX
3730msgid "Failed to execute internal merge"
3731msgstr "无法执行内部合并"
3732
d46c5519 3733#: merge-recursive.c:1330
5c57d762 3734#, c-format
a0b6b246
JX
3735msgid "Unable to add %s to database"
3736msgstr "不能添加 %s 至对象库"
5c57d762 3737
d46c5519 3738#: merge-recursive.c:1362
fd8cb379
JX
3739#, c-format
3740msgid "Auto-merging %s"
3741msgstr "自动合并 %s"
3742
d46c5519 3743#: merge-recursive.c:1385
fd8cb379
JX
3744#, c-format
3745msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
3746msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。"
3747
d46c5519 3748#: merge-recursive.c:1457
5c57d762
JX
3749#, c-format
3750msgid ""
a0b6b246
JX
3751"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
3752"in tree."
5c57d762 3753msgstr ""
87cb7997
JX
3754"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
3755"本被保留。"
3756
d46c5519 3757#: merge-recursive.c:1462
87cb7997
JX
3758#, c-format
3759msgid ""
3760"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
3761"left in tree."
3762msgstr ""
3763"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
3764"%7$s 版本被保留。"
c04f5ac3 3765
d46c5519 3766#: merge-recursive.c:1469
7aea43ff 3767#, c-format
a0b6b246
JX
3768msgid ""
3769"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
3770"in tree at %s."
3771msgstr ""
87cb7997
JX
3772"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
3773"本保留在 %8$s 中。"
7aea43ff 3774
d46c5519 3775#: merge-recursive.c:1474
87cb7997
JX
3776#, c-format
3777msgid ""
3778"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
3779"left in tree at %s."
3780msgstr ""
3781"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
3782"%7$s 版本保留在 %9$s 中。"
3783
d46c5519 3784#: merge-recursive.c:1509
a0b6b246
JX
3785msgid "rename"
3786msgstr "重命名"
5b04ee3b 3787
d46c5519 3788#: merge-recursive.c:1509
a0b6b246
JX
3789msgid "renamed"
3790msgstr "重命名"
5b04ee3b 3791
d46c5519 3792#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085
fd8cb379
JX
3793#, c-format
3794msgid "Refusing to lose dirty file at %s"
3795msgstr "拒绝丢失脏文件 '%s'"
3796
d46c5519 3797#: merge-recursive.c:1599
06991777
JX
3798#, c-format
3799msgid "Refusing to lose untracked file at %s, even though it's in the way."
3800msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。"
3801
d46c5519 3802#: merge-recursive.c:1657
06991777
JX
3803#, c-format
3804msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
3805msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
3806
d46c5519 3807#: merge-recursive.c:1687
5c57d762 3808#, c-format
a0b6b246
JX
3809msgid "%s is a directory in %s adding as %s instead"
3810msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
5c57d762 3811
d46c5519 3812#: merge-recursive.c:1692
fd8cb379
JX
3813#, c-format
3814msgid "Refusing to lose untracked file at %s; adding as %s instead"
3815msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s"
3816
d46c5519 3817#: merge-recursive.c:1711
5c57d762
JX
3818#, c-format
3819msgid ""
a0b6b246
JX
3820"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
3821"\"->\"%s\" in \"%s\"%s"
5c57d762 3822msgstr ""
a0b6b246
JX
3823"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
3824"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
5c57d762 3825
d46c5519 3826#: merge-recursive.c:1716
a0b6b246
JX
3827msgid " (left unresolved)"
3828msgstr "(留下未解决)"
5c57d762 3829
d46c5519 3830#: merge-recursive.c:1825
5c57d762 3831#, c-format
a0b6b246 3832msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
5c57d762 3833msgstr ""
a0b6b246
JX
3834"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
3835"%5$s"
3495628d 3836
d46c5519 3837#: merge-recursive.c:2030
fd8cb379
JX
3838#, c-format
3839msgid ""
3840"CONFLICT (directory rename split): Unclear where to place %s because "
3841"directory %s was renamed to multiple other directories, with no destination "
3842"getting a majority of the files."
c1ac5258
JX
3843msgstr ""
3844"冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个"
3845"其它目录,没有目录包含大部分文件。"
fd8cb379 3846
d46c5519 3847#: merge-recursive.c:2062
fd8cb379
JX
3848#, c-format
3849msgid ""
3850"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
3851"implicit directory rename(s) putting the following path(s) there: %s."
3852msgstr ""
3853"冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放"
3854"在:%s。"
3855
d46c5519 3856#: merge-recursive.c:2072
fd8cb379
JX
3857#, c-format
3858msgid ""
3859"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
3860"implicit directory renames tried to put these paths there: %s"
3861msgstr ""
3862"冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路"
3863"径放置于此:%s"
3864
d46c5519 3865#: merge-recursive.c:2164
fd8cb379
JX
3866#, c-format
3867msgid ""
3868"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
3869">%s in %s"
3870msgstr ""
3871"冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 "
3872"%4$s->%5$s"
3873
d46c5519 3874#: merge-recursive.c:2408
fd8cb379
JX
3875#, c-format
3876msgid ""
3877"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
3878"renamed."
3879msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。"
3880
d46c5519 3881#: merge-recursive.c:2929
90314792 3882#, c-format
a0b6b246
JX
3883msgid "cannot read object %s"
3884msgstr "不能读取对象 %s"
90314792 3885
d46c5519 3886#: merge-recursive.c:2932
90314792 3887#, c-format
a0b6b246
JX
3888msgid "object %s is not a blob"
3889msgstr "对象 %s 不是一个数据对象"
90314792 3890
d46c5519 3891#: merge-recursive.c:2996
a0b6b246
JX
3892msgid "modify"
3893msgstr "修改"
90314792 3894
d46c5519 3895#: merge-recursive.c:2996
a0b6b246
JX
3896msgid "modified"
3897msgstr "修改"
5b04ee3b 3898
d46c5519 3899#: merge-recursive.c:3008
a0b6b246
JX
3900msgid "content"
3901msgstr "内容"
5b04ee3b 3902
d46c5519 3903#: merge-recursive.c:3012
a0b6b246
JX
3904msgid "add/add"
3905msgstr "添加/添加"
3495628d 3906
d46c5519 3907#: merge-recursive.c:3035
220c313c 3908#, c-format
a0b6b246
JX
3909msgid "Skipped %s (merged same as existing)"
3910msgstr "略过 %s(已经做过相同合并)"
220c313c 3911
d46c5519 3912#: merge-recursive.c:3057 git-submodule.sh:937
a0b6b246
JX
3913msgid "submodule"
3914msgstr "子模组"
3915
d46c5519 3916#: merge-recursive.c:3058
220c313c 3917#, c-format
a0b6b246
JX
3918msgid "CONFLICT (%s): Merge conflict in %s"
3919msgstr "冲突(%s):合并冲突于 %s"
220c313c 3920
d46c5519 3921#: merge-recursive.c:3088
220c313c 3922#, c-format
06991777
JX
3923msgid "Adding as %s instead"
3924msgstr "而是以 %s 为名添加"
3925
d46c5519 3926#: merge-recursive.c:3170
06991777 3927#, c-format
d46c5519
JX
3928msgid ""
3929"Path updated: %s added in %s inside a directory that was renamed in %s; "
3930"moving it to %s."
3931msgstr ""
3932"路径更新:%s 添加到 %s,位于一个被重命名到 %s 的目录中,将其移动到 %s。"
220c313c 3933
d46c5519
JX
3934#: merge-recursive.c:3173
3935#, c-format
3936msgid ""
3937"CONFLICT (file location): %s added in %s inside a directory that was renamed "
3938"in %s, suggesting it should perhaps be moved to %s."
3939msgstr ""
3940"冲突(文件位置):%s 添加到 %s,位于一个被重命名为 %s 的目录中,建议将其移动"
3941"到 %s。"
3942
3943#: merge-recursive.c:3177
3944#, c-format
3945msgid ""
3946"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
3947"%s; moving it to %s."
3948msgstr ""
3949"路径更新:%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,将其移动"
3950"到 %5$s。"
3951
3952#: merge-recursive.c:3180
3953#, c-format
3954msgid ""
3955"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
3956"was renamed in %s, suggesting it should perhaps be moved to %s."
3957msgstr ""
3958"冲突(文件未知):%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,"
3959"建议将其移动到 %5$s。"
3960
3961#: merge-recursive.c:3294
3962#, c-format
3963msgid "Removing %s"
3964msgstr "删除 %s"
3965
3966#: merge-recursive.c:3317
3967msgid "file/directory"
3968msgstr "文件/目录"
220c313c 3969
d46c5519 3970#: merge-recursive.c:3322
a0b6b246
JX
3971msgid "directory/file"
3972msgstr "目录/文件"
276ceeaa 3973
d46c5519 3974#: merge-recursive.c:3329
276ceeaa 3975#, c-format
a0b6b246
JX
3976msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
3977msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
276ceeaa 3978
d46c5519 3979#: merge-recursive.c:3338
276ceeaa 3980#, c-format
a0b6b246
JX
3981msgid "Adding %s"
3982msgstr "添加 %s"
276ceeaa 3983
d46c5519 3984#: merge-recursive.c:3347
06991777
JX
3985#, c-format
3986msgid "CONFLICT (add/add): Merge conflict in %s"
3987msgstr "冲突(add/add):合并冲突于 %s"
3988
d46c5519 3989#: merge-recursive.c:3385
5809aa05 3990#, c-format
c1ac5258
JX
3991msgid ""
3992"Your local changes to the following files would be overwritten by merge:\n"
3993" %s"
3994msgstr ""
3995"您对下列文件的本地修改将被合并操作覆盖:\n"
3996" %s"
5809aa05 3997
d46c5519 3998#: merge-recursive.c:3396
6937cb4e 3999msgid "Already up to date!"
a0b6b246 4000msgstr "已经是最新的!"
276ceeaa 4001
d46c5519 4002#: merge-recursive.c:3405
276ceeaa 4003#, c-format
a0b6b246
JX
4004msgid "merging of trees %s and %s failed"
4005msgstr "无法合并树 %s 和 %s"
276ceeaa 4006
d46c5519 4007#: merge-recursive.c:3504
a0b6b246
JX
4008msgid "Merging:"
4009msgstr "合并:"
5c57d762 4010
d46c5519 4011#: merge-recursive.c:3517
5c57d762 4012#, c-format
a0b6b246
JX
4013msgid "found %u common ancestor:"
4014msgid_plural "found %u common ancestors:"
4015msgstr[0] "发现 %u 个共同祖先:"
4016msgstr[1] "发现 %u 个共同祖先:"
4017
d46c5519 4018#: merge-recursive.c:3556
a0b6b246
JX
4019msgid "merge returned no commit"
4020msgstr "合并未返回提交"
4021
d46c5519 4022#: merge-recursive.c:3622
5c57d762 4023#, c-format
a0b6b246
JX
4024msgid "Could not parse object '%s'"
4025msgstr "不能解析对象 '%s'"
5c57d762 4026
d46c5519 4027#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873
a0b6b246
JX
4028msgid "Unable to write index."
4029msgstr "不能写入索引。"
4030
d46c5519 4031#: midx.c:66
4c27fcb5
JX
4032#, c-format
4033msgid "multi-pack-index file %s is too small"
4034msgstr "多包索引文件 %s 太小"
4035
d46c5519 4036#: midx.c:82
4c27fcb5
JX
4037#, c-format
4038msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
4039msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
4040
d46c5519 4041#: midx.c:87
4c27fcb5
JX
4042#, c-format
4043msgid "multi-pack-index version %d not recognized"
4044msgstr "multi-pack-index 版本 %d 不能被识别"
4045
d46c5519 4046#: midx.c:92
4c27fcb5
JX
4047#, c-format
4048msgid "hash version %u does not match"
4049msgstr "散列版本 %u 不匹配"
4050
d46c5519 4051#: midx.c:106
4c27fcb5
JX
4052msgid "invalid chunk offset (too large)"
4053msgstr "无效的块偏移(太大)"
4054
d46c5519 4055#: midx.c:130
4c27fcb5
JX
4056msgid "terminating multi-pack-index chunk id appears earlier than expected"
4057msgstr "终止多包索引块 id 出现时间早于预期"
4058
d46c5519 4059#: midx.c:143
4c27fcb5
JX
4060msgid "multi-pack-index missing required pack-name chunk"
4061msgstr "多包索引缺少必需的包名块"
4062
d46c5519 4063#: midx.c:145
4c27fcb5
JX
4064msgid "multi-pack-index missing required OID fanout chunk"
4065msgstr "多包索引缺少必需的 OID 扇出块"
4066
d46c5519 4067#: midx.c:147
4c27fcb5
JX
4068msgid "multi-pack-index missing required OID lookup chunk"
4069msgstr "多包索引缺少必需的 OID 查询块"
4070
d46c5519 4071#: midx.c:149
4c27fcb5
JX
4072msgid "multi-pack-index missing required object offsets chunk"
4073msgstr "多包索引缺少必需的对象偏移块"
4074
d46c5519 4075#: midx.c:163
4c27fcb5
JX
4076#, c-format
4077msgid "multi-pack-index pack names out of order: '%s' before '%s'"
4078msgstr "多包索引包名无序:'%s' 在 '%s' 之前"
4079
d46c5519 4080#: midx.c:208
4c27fcb5
JX
4081#, c-format
4082msgid "bad pack-int-id: %u (%u total packs)"
4083msgstr "错的 pack-int-id:%u(共有 %u 个包)"
4084
d46c5519 4085#: midx.c:258
4c27fcb5
JX
4086msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
4087msgstr "多包索引存储一个64位偏移,但是 off_t 太小"
4088
d46c5519 4089#: midx.c:286
4c27fcb5
JX
4090msgid "error preparing packfile from multi-pack-index"
4091msgstr "从多包索引准备 packfile 出错"
4092
d46c5519 4093#: midx.c:457
4c27fcb5
JX
4094#, c-format
4095msgid "failed to add packfile '%s'"
4096msgstr "添加包文件 '%s' 失败"
4097
d46c5519 4098#: midx.c:463
4c27fcb5
JX
4099#, c-format
4100msgid "failed to open pack-index '%s'"
4101msgstr "打开包索引 '%s' 失败"
4102
d46c5519 4103#: midx.c:557
4c27fcb5
JX
4104#, c-format
4105msgid "failed to locate object %d in packfile"
4106msgstr "在包文件中定位对象 %d 失败"
4107
d46c5519 4108#: midx.c:993
4c27fcb5
JX
4109#, c-format
4110msgid "failed to clear multi-pack-index at %s"
4111msgstr "清理位于 %s 的多包索引失败"
4112
d46c5519
JX
4113#: midx.c:1048
4114msgid "Looking for referenced packfiles"
4115msgstr "正在查找引用的包文件"
4116
4117#: midx.c:1063
4c27fcb5
JX
4118#, c-format
4119msgid ""
4120"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
06991777 4121msgstr "对象ID扇出无序:fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
4c27fcb5 4122
d46c5519
JX
4123#: midx.c:1067
4124msgid "Verifying OID order in MIDX"
4125msgstr "正在校验 MIDX 中的 OID 顺序"
4126
4127#: midx.c:1076
4c27fcb5
JX
4128#, c-format
4129msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
06991777 4130msgstr "对象ID查询无序:oid[%d] = %s >= %s = oid[%d]"
4c27fcb5 4131
d46c5519
JX
4132#: midx.c:1095
4133msgid "Sorting objects by packfile"
4134msgstr "通过包文件为对象排序"
4135
4136#: midx.c:1101
4c27fcb5
JX
4137msgid "Verifying object offsets"
4138msgstr "校验对象偏移"
4139
d46c5519 4140#: midx.c:1117
4c27fcb5
JX
4141#, c-format
4142msgid "failed to load pack entry for oid[%d] = %s"
4143msgstr "为 oid[%d] = %s 加载包条目失败"
4144
d46c5519 4145#: midx.c:1123
4c27fcb5
JX
4146#, c-format
4147msgid "failed to load pack-index for packfile %s"
4148msgstr "为包文件 %s 加载包索引失败"
4149
d46c5519 4150#: midx.c:1132
4c27fcb5
JX
4151#, c-format
4152msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
4153msgstr "oid[%d] = %s 错误的对象偏移:%<PRIx64> != %<PRIx64>"
4154
06991777 4155#: name-hash.c:531
4c27fcb5
JX
4156#, c-format
4157msgid "unable to create lazy_dir thread: %s"
4158msgstr "不能创建 lazy_dir 线程:%s"
4159
06991777 4160#: name-hash.c:553
4c27fcb5
JX
4161#, c-format
4162msgid "unable to create lazy_name thread: %s"
4163msgstr "不能创建 lazy_name 线程:%s"
4164
06991777 4165#: name-hash.c:559
4c27fcb5
JX
4166#, c-format
4167msgid "unable to join lazy_name thread: %s"
4168msgstr "不能加入 lasy_name 线程:%s"
4169
06991777 4170#: notes-merge.c:277
5c57d762
JX
4171#, c-format
4172msgid ""
a0b6b246
JX
4173"You have not concluded your previous notes merge (%s exists).\n"
4174"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
4175"commit/abort the previous merge before you start a new notes merge."
5c57d762 4176msgstr ""
29004bbb 4177"您的前一次注释合并尚未结束(存在 %s)。\n"
1a79b2f1
JX
4178"在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
4179"notes merge --abort' 来提交/终止前一次合并。"
5c57d762 4180
06991777 4181#: notes-merge.c:284
a0b6b246
JX
4182#, c-format
4183msgid "You have not concluded your notes merge (%s exists)."
4184msgstr "您尚未结束注释合并(存在 %s)。"
4185
06991777 4186#: notes-utils.c:46
a0b6b246
JX
4187msgid "Cannot commit uninitialized/unreferenced notes tree"
4188msgstr "不能提交未初始化/未引用的注解树"
5c57d762 4189
06991777 4190#: notes-utils.c:105
1b7f4a34 4191#, c-format
a0b6b246
JX
4192msgid "Bad notes.rewriteMode value: '%s'"
4193msgstr "坏的 notes.rewriteMode 值:'%s'"
1b7f4a34 4194
06991777 4195#: notes-utils.c:115
5b04ee3b 4196#, c-format
a0b6b246
JX
4197msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
4198msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
5b04ee3b 4199
a4f16749
JX
4200#. TRANSLATORS: The first %s is the name of
4201#. the environment variable, the second %s is
4202#. its value.
4203#.
06991777 4204#: notes-utils.c:145
5b04ee3b 4205#, c-format
a0b6b246
JX
4206msgid "Bad %s value: '%s'"
4207msgstr "坏的 %s 值:'%s'"
5b04ee3b 4208
c1ac5258
JX
4209#: object.c:54
4210#, c-format
4211msgid "invalid object type \"%s\""
4212msgstr "无效的对象类型 \"%s\""
4213
06991777 4214#: object.c:174
c1ac5258
JX
4215#, c-format
4216msgid "object %s is a %s, not a %s"
4217msgstr "对象 %s 是一个 %s,不是一个 %s"
4218
06991777 4219#: object.c:234
c1ac5258
JX
4220#, c-format
4221msgid "object %s has unknown type id %d"
4222msgstr "对象 %s 有未知的类型 id %d"
4223
06991777 4224#: object.c:247
5b04ee3b 4225#, c-format
a0b6b246
JX
4226msgid "unable to parse object: %s"
4227msgstr "不能解析对象:%s"
5b04ee3b 4228
06991777 4229#: object.c:267 object.c:278
c1ac5258 4230#, c-format
06991777
JX
4231msgid "hash mismatch %s"
4232msgstr "哈希值与 %s 不匹配"
c1ac5258 4233
d46c5519 4234#: packfile.c:617
6937cb4e
JX
4235msgid "offset before end of packfile (broken .idx?)"
4236msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
4237
d46c5519 4238#: packfile.c:1868
6937cb4e
JX
4239#, c-format
4240msgid "offset before start of pack index for %s (corrupt index?)"
4241msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
4242
d46c5519 4243#: packfile.c:1872
6937cb4e
JX
4244#, c-format
4245msgid "offset beyond end of pack index for %s (truncated index?)"
4246msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
4247
d46c5519 4248#: parse-options.c:38
06991777
JX
4249#, c-format
4250msgid "%s requires a value"
8e4e0555 4251msgstr "%s 需要一个值"
06991777 4252
d46c5519 4253#: parse-options.c:73
06991777
JX
4254#, c-format
4255msgid "%s is incompatible with %s"
4256msgstr "%s 与 %s 不兼容"
4257
d46c5519 4258#: parse-options.c:78
06991777
JX
4259#, c-format
4260msgid "%s : incompatible with something else"
4261msgstr "%s:和其它的不兼容"
4262
d46c5519 4263#: parse-options.c:92 parse-options.c:96 parse-options.c:319
06991777
JX
4264#, c-format
4265msgid "%s takes no value"
8e4e0555 4266msgstr "%s 不取值"
06991777 4267
d46c5519 4268#: parse-options.c:94
06991777
JX
4269#, c-format
4270msgid "%s isn't available"
4271msgstr "%s 不可用"
4272
d46c5519 4273#: parse-options.c:219
06991777
JX
4274#, c-format
4275msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
4276msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
4277
d46c5519 4278#: parse-options.c:389
06991777
JX
4279#, c-format
4280msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
8e4e0555 4281msgstr "有歧义的选项:%s(可以是 --%s%s 或 --%s%s)"
06991777 4282
d46c5519 4283#: parse-options.c:423 parse-options.c:431
06991777
JX
4284#, c-format
4285msgid "did you mean `--%s` (with two dashes ?)"
4286msgstr "你的意思是 `--%s`(有两个短线?)"
4287
d46c5519 4288#: parse-options.c:859
06991777
JX
4289#, c-format
4290msgid "unknown option `%s'"
4291msgstr "未知选项 `%s'"
4292
d46c5519 4293#: parse-options.c:861
06991777
JX
4294#, c-format
4295msgid "unknown switch `%c'"
4296msgstr "未知开关 `%c'"
4297
d46c5519 4298#: parse-options.c:863
06991777
JX
4299#, c-format
4300msgid "unknown non-ascii option in string: `%s'"
4301msgstr "字符串中未知的非ascii字符选项:`%s'"
4302
d46c5519 4303#: parse-options.c:887
a0b6b246
JX
4304msgid "..."
4305msgstr "..."
4306
d46c5519 4307#: parse-options.c:906
5b04ee3b 4308#, c-format
a0b6b246
JX
4309msgid "usage: %s"
4310msgstr "用法:%s"
5b04ee3b 4311
a0b6b246 4312#. TRANSLATORS: the colon here should align with the
a4f16749
JX
4313#. one in "usage: %s" translation.
4314#.
d46c5519 4315#: parse-options.c:912
5b04ee3b 4316#, c-format
a0b6b246
JX
4317msgid " or: %s"
4318msgstr " 或:%s"
5b04ee3b 4319
a0b6b246 4320# 译者:为保证在输出中对齐,注意调整句中空格!
d46c5519 4321#: parse-options.c:915
5b04ee3b 4322#, c-format
a0b6b246
JX
4323msgid " %s"
4324msgstr " %s"
5b04ee3b 4325
d46c5519 4326#: parse-options.c:954
a0b6b246
JX
4327msgid "-NUM"
4328msgstr "-数字"
4329
d46c5519
JX
4330#: parse-options.c:968
4331#, c-format
4332msgid "alias of --%s"
4333msgstr "--%s 的别名"
4334
4335#: parse-options-cb.c:20 parse-options-cb.c:24
06991777
JX
4336#, c-format
4337msgid "option `%s' expects a numerical value"
4338msgstr "选项 `%s' 期望一个数字值"
4339
d46c5519 4340#: parse-options-cb.c:41
fd8cb379
JX
4341#, c-format
4342msgid "malformed expiration date '%s'"
4343msgstr "格式错误的到期时间:'%s'"
4344
d46c5519 4345#: parse-options-cb.c:54
06991777
JX
4346#, c-format
4347msgid "option `%s' expects \"always\", \"auto\", or \"never\""
4348msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
4349
d46c5519 4350#: parse-options-cb.c:130 parse-options-cb.c:147
5b04ee3b 4351#, c-format
a0b6b246 4352msgid "malformed object name '%s'"
fd8cb379 4353msgstr "格式错误的对象名 '%s'"
5b04ee3b 4354
d46c5519 4355#: path.c:897
5b04ee3b 4356#, c-format
a0b6b246
JX
4357msgid "Could not make %s writable by group"
4358msgstr "不能设置 %s 为组可写"
4359
06991777 4360#: pathspec.c:128
87cb7997
JX
4361msgid "Escape character '\\' not allowed as last character in attr value"
4362msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
4363
06991777 4364#: pathspec.c:146
87cb7997
JX
4365msgid "Only one 'attr:' specification is allowed."
4366msgstr "只允许一个 'attr:' 规格。"
4367
06991777 4368#: pathspec.c:149
87cb7997
JX
4369msgid "attr spec must not be empty"
4370msgstr "属性规格不能为空"
4371
06991777 4372#: pathspec.c:192
87cb7997
JX
4373#, c-format
4374msgid "invalid attribute name %s"
4375msgstr "无效的属性名 %s"
4376
06991777 4377#: pathspec.c:257
a0b6b246
JX
4378msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
4379msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
4380
06991777 4381#: pathspec.c:264
5b04ee3b 4382msgid ""
a0b6b246
JX
4383"global 'literal' pathspec setting is incompatible with all other global "
4384"pathspec settings"
4385msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
5b04ee3b 4386
06991777 4387#: pathspec.c:304
a0b6b246
JX
4388msgid "invalid parameter for pathspec magic 'prefix'"
4389msgstr "路径规格包含无效的神奇前缀"
4390
06991777 4391#: pathspec.c:325
5b04ee3b 4392#, c-format
a0b6b246
JX
4393msgid "Invalid pathspec magic '%.*s' in '%s'"
4394msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
5b04ee3b 4395
06991777 4396#: pathspec.c:330
5b04ee3b 4397#, c-format
a0b6b246
JX
4398msgid "Missing ')' at the end of pathspec magic in '%s'"
4399msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
5b04ee3b 4400
06991777 4401#: pathspec.c:368
5b04ee3b 4402#, c-format
a0b6b246
JX
4403msgid "Unimplemented pathspec magic '%c' in '%s'"
4404msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
5b04ee3b 4405
06991777 4406#: pathspec.c:427
5b04ee3b 4407#, c-format
a0b6b246
JX
4408msgid "%s: 'literal' and 'glob' are incompatible"
4409msgstr "%s:'literal' 和 'glob' 不兼容"
5b04ee3b 4410
06991777 4411#: pathspec.c:440
5b04ee3b 4412#, c-format
a0b6b246
JX
4413msgid "%s: '%s' is outside repository"
4414msgstr "%s:'%s' 在仓库之外"
5b04ee3b 4415
06991777 4416#: pathspec.c:514
5b04ee3b 4417#, c-format
1a79b2f1
JX
4418msgid "'%s' (mnemonic: '%c')"
4419msgstr "'%s'(助记符:'%c')"
5b04ee3b 4420
06991777 4421#: pathspec.c:524
5b04ee3b 4422#, c-format
a0b6b246
JX
4423msgid "%s: pathspec magic not supported by this command: %s"
4424msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
4425
06991777 4426#: pathspec.c:591
5b04ee3b 4427#, c-format
a0b6b246
JX
4428msgid "pathspec '%s' is beyond a symbolic link"
4429msgstr "路径规格 '%s' 位于符号链接中"
4430
d46c5519
JX
4431#: pkt-line.c:92
4432msgid "unable to write flush packet"
4433msgstr "无法写 flush 包"
4434
4435#: pkt-line.c:99
4436msgid "unable to write delim packet"
4437msgstr "无法写 delim 包"
4438
4439#: pkt-line.c:106
c1ac5258
JX
4440msgid "flush packet write failed"
4441msgstr "flush 包写错误"
4442
d46c5519 4443#: pkt-line.c:146 pkt-line.c:232
c1ac5258
JX
4444msgid "protocol error: impossibly long line"
4445msgstr "协议错误:不可能的长行"
4446
d46c5519 4447#: pkt-line.c:162 pkt-line.c:164
c1ac5258
JX
4448msgid "packet write with format failed"
4449msgstr "格式化包写入错误"
4450
d46c5519 4451#: pkt-line.c:196
c1ac5258
JX
4452msgid "packet write failed - data exceeds max packet size"
4453msgstr "写数据包失败:数据超过了包的最大长度"
4454
d46c5519 4455#: pkt-line.c:203 pkt-line.c:210
c1ac5258
JX
4456msgid "packet write failed"
4457msgstr "数据包写入失败"
4458
d46c5519 4459#: pkt-line.c:295
c1ac5258
JX
4460msgid "read error"
4461msgstr "读取错误"
4462
d46c5519 4463#: pkt-line.c:303
c1ac5258
JX
4464msgid "the remote end hung up unexpectedly"
4465msgstr "远端意外挂断了"
4466
d46c5519 4467#: pkt-line.c:331
c1ac5258
JX
4468#, c-format
4469msgid "protocol error: bad line length character: %.4s"
4470msgstr "协议错误:错误的行长度字符串:%.4s"
4471
d46c5519 4472#: pkt-line.c:341 pkt-line.c:346
c1ac5258
JX
4473#, c-format
4474msgid "protocol error: bad line length %d"
4475msgstr "协议错误:错误的行长度 %d"
4476
d46c5519 4477#: pkt-line.c:362
06991777
JX
4478#, c-format
4479msgid "remote error: %s"
4480msgstr "远程错误:%s"
4481
4482#: preload-index.c:119
4c27fcb5
JX
4483msgid "Refreshing index"
4484msgstr "正在刷新索引"
4485
06991777 4486#: preload-index.c:138
4c27fcb5
JX
4487#, c-format
4488msgid "unable to create threaded lstat: %s"
4489msgstr "无法创建线程 lstat:%s"
4490
d46c5519 4491#: pretty.c:966
a0b6b246
JX
4492msgid "unable to parse --pretty format"
4493msgstr "不能解析 --pretty 格式"
4494
4c27fcb5 4495#: range-diff.c:56
c1ac5258
JX
4496msgid "could not start `log`"
4497msgstr "不能启动 `log`"
4498
4c27fcb5 4499#: range-diff.c:59
c1ac5258
JX
4500msgid "could not read `log` output"
4501msgstr "不能读取 `log` 的输出"
4502
d46c5519 4503#: range-diff.c:74 sequencer.c:4897
c1ac5258
JX
4504#, c-format
4505msgid "could not parse commit '%s'"
4506msgstr "不能解析提交 '%s'"
4507
4c27fcb5 4508#: range-diff.c:224
c1ac5258
JX
4509msgid "failed to generate diff"
4510msgstr "生成 diff 失败"
4511
4c27fcb5 4512#: range-diff.c:455 range-diff.c:457
c1ac5258
JX
4513#, c-format
4514msgid "could not parse log for '%s'"
4515msgstr "不能解析 '%s' 的日志"
4516
d46c5519 4517#: read-cache.c:680
06991777
JX
4518#, c-format
4519msgid "will not add file alias '%s' ('%s' already exists in index)"
4520msgstr "将不会添加文件别名 '%s'('%s' 已经存在于索引中)"
4521
d46c5519 4522#: read-cache.c:696
06991777
JX
4523msgid "cannot create an empty blob in the object database"
4524msgstr "不能在对象数据库中创建空的数据对象"
4525
d46c5519 4526#: read-cache.c:718
06991777
JX
4527#, c-format
4528msgid "%s: can only add regular files, symbolic links or git-directories"
4529msgstr "%s:只能添加常规文件、符号链接或 git 目录"
4530
d46c5519
JX
4531#: read-cache.c:723
4532#, c-format
4533msgid "'%s' does not have a commit checked out"
4534msgstr "'%s' 没有检出一个提交"
4535
4536#: read-cache.c:775
06991777
JX
4537#, c-format
4538msgid "unable to index file '%s'"
4539msgstr "无法索引文件 '%s'"
4540
d46c5519 4541#: read-cache.c:794
06991777
JX
4542#, c-format
4543msgid "unable to add '%s' to index"
4544msgstr "无法在索引中添加 '%s'"
4545
d46c5519 4546#: read-cache.c:805
06991777
JX
4547#, c-format
4548msgid "unable to stat '%s'"
4549msgstr "无法对 %s 执行 stat"
4550
d46c5519 4551#: read-cache.c:1314
06991777
JX
4552#, c-format
4553msgid "'%s' appears as both a file and as a directory"
4554msgstr "'%s' 既显示为文件又显示为目录"
4555
d46c5519 4556#: read-cache.c:1499
4c27fcb5
JX
4557msgid "Refresh index"
4558msgstr "刷新索引"
4559
d46c5519 4560#: read-cache.c:1613
5b04ee3b
JX
4561#, c-format
4562msgid ""
a0b6b246
JX
4563"index.version set, but the value is invalid.\n"
4564"Using version %i"
5b04ee3b 4565msgstr ""
a0b6b246
JX
4566"设置了 index.version,但是取值无效。\n"
4567"使用版本 %i"
5b04ee3b 4568
d46c5519 4569#: read-cache.c:1623
5b04ee3b
JX
4570#, c-format
4571msgid ""
a0b6b246
JX
4572"GIT_INDEX_VERSION set, but the value is invalid.\n"
4573"Using version %i"
5b04ee3b 4574msgstr ""
a0b6b246
JX
4575"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
4576"使用版本 %i"
5b04ee3b 4577
d46c5519 4578#: read-cache.c:1679
06991777
JX
4579#, c-format
4580msgid "bad signature 0x%08x"
4581msgstr "坏的签名 0x%08x"
4582
d46c5519 4583#: read-cache.c:1682
06991777
JX
4584#, c-format
4585msgid "bad index version %d"
4586msgstr "坏的索引版本 %d"
4587
d46c5519 4588#: read-cache.c:1691
06991777
JX
4589msgid "bad index file sha1 signature"
4590msgstr "坏的索引文件哈希值签名"
4591
d46c5519 4592#: read-cache.c:1721
06991777
JX
4593#, c-format
4594msgid "index uses %.4s extension, which we do not understand"
4595msgstr "索引使用不被支持的 %.4s 扩展"
4596
4597#
d46c5519 4598#: read-cache.c:1723
06991777
JX
4599#, c-format
4600msgid "ignoring %.4s extension"
4601msgstr "忽略 %.4s 扩展"
4602
d46c5519 4603#: read-cache.c:1760
06991777
JX
4604#, c-format
4605msgid "unknown index entry format 0x%08x"
4606msgstr "未知的索引条目格式 0x%08x"
4607
d46c5519 4608#: read-cache.c:1776
4c27fcb5
JX
4609#, c-format
4610msgid "malformed name field in the index, near path '%s'"
4611msgstr "索引中靠近路径 '%s' 有错误的名称字段"
4612
d46c5519 4613#: read-cache.c:1833
06991777
JX
4614msgid "unordered stage entries in index"
4615msgstr "索引中有未排序的暂存条目"
4616
d46c5519 4617#: read-cache.c:1836
06991777
JX
4618#, c-format
4619msgid "multiple stage entries for merged file '%s'"
4620msgstr "合并文件 '%s' 有多个暂存条目"
4621
d46c5519 4622#: read-cache.c:1839
06991777
JX
4623#, c-format
4624msgid "unordered stage entries for '%s'"
4625msgstr "'%s' 的未排序暂存条目"
4626
d46c5519
JX
4627#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
4628#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358
4629#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955
4630#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498
06991777
JX
4631#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
4632#: builtin/submodule--helper.c:330
4c27fcb5
JX
4633msgid "index file corrupt"
4634msgstr "索引文件损坏"
4635
d46c5519 4636#: read-cache.c:2087
4c27fcb5
JX
4637#, c-format
4638msgid "unable to create load_cache_entries thread: %s"
4639msgstr "无法创建 load_cache_entries 线程:%s"
4640
d46c5519 4641#: read-cache.c:2100
4c27fcb5
JX
4642#, c-format
4643msgid "unable to join load_cache_entries thread: %s"
4644msgstr "无法加入 load_cache_entries 线程:%s"
4645
d46c5519 4646#: read-cache.c:2133
06991777
JX
4647#, c-format
4648msgid "%s: index file open failed"
4649msgstr "%s:打开索引文件失败"
4650
d46c5519 4651#: read-cache.c:2137
06991777
JX
4652#, c-format
4653msgid "%s: cannot stat the open index"
4654msgstr "%s:不能对打开的索引执行 stat 操作"
4655
d46c5519 4656#: read-cache.c:2141
06991777
JX
4657#, c-format
4658msgid "%s: index file smaller than expected"
4659msgstr "%s:索引文件比预期的小"
4660
d46c5519 4661#: read-cache.c:2145
06991777
JX
4662#, c-format
4663msgid "%s: unable to map index file"
4664msgstr "%s:无法对索引文件执行 map 操作"
4665
d46c5519 4666#: read-cache.c:2187
4c27fcb5
JX
4667#, c-format
4668msgid "unable to create load_index_extensions thread: %s"
4669msgstr "无法创建 load_index_extensions 线程:%s"
4670
d46c5519 4671#: read-cache.c:2214
4c27fcb5
JX
4672#, c-format
4673msgid "unable to join load_index_extensions thread: %s"
4674msgstr "无法加入 load_index_extensions 线程:%s"
4675
d46c5519 4676#: read-cache.c:2246
06991777
JX
4677#, c-format
4678msgid "could not freshen shared index '%s'"
4679msgstr "无法刷新共享索引 '%s'"
4680
d46c5519 4681#: read-cache.c:2293
06991777
JX
4682#, c-format
4683msgid "broken index, expect %s in %s, got %s"
4684msgstr "损坏的索引,期望在 %2$s 中的 %1$s,得到 %3$s"
4685
d46c5519 4686#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117
a4f16749
JX
4687#, c-format
4688msgid "could not close '%s'"
4689msgstr "不能关闭 '%s'"
4690
d46c5519 4691#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807
87cb7997 4692#, c-format
60638e98 4693msgid "could not stat '%s'"
65e2041e 4694msgstr "不能对 '%s' 调用 stat"
87cb7997 4695
d46c5519 4696#: read-cache.c:3105
87cb7997
JX
4697#, c-format
4698msgid "unable to open git dir: %s"
4699msgstr "不能打开 git 目录:%s"
4700
d46c5519 4701#: read-cache.c:3117
87cb7997
JX
4702#, c-format
4703msgid "unable to unlink: %s"
4704msgstr "无法删除:%s"
4705
d46c5519 4706#: read-cache.c:3142
06991777
JX
4707#, c-format
4708msgid "cannot fix permission bits on '%s'"
4709msgstr "不能修复 '%s' 的权限位"
4710
d46c5519 4711#: read-cache.c:3291
06991777
JX
4712#, c-format
4713msgid "%s: cannot drop to stage #0"
4714msgstr "%s:不能落到暂存区 #0"
4715
d46c5519
JX
4716#: rebase-interactive.c:26
4717#, c-format
4718msgid ""
4719"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
4720msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
4721
4722#: rebase-interactive.c:35
4c27fcb5
JX
4723msgid ""
4724"\n"
4725"Commands:\n"
4726"p, pick <commit> = use commit\n"
4727"r, reword <commit> = use commit, but edit the commit message\n"
4728"e, edit <commit> = use commit, but stop for amending\n"
4729"s, squash <commit> = use commit, but meld into previous commit\n"
4730"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
4731"x, exec <command> = run command (the rest of the line) using shell\n"
4732"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
4733"d, drop <commit> = remove commit\n"
4734"l, label <label> = label current HEAD with a name\n"
4735"t, reset <label> = reset HEAD to a label\n"
4736"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
4737". create a merge commit using the original merge commit's\n"
4738". message (or the oneline, if no original merge commit was\n"
4739". specified). Use -c <commit> to reword the commit message.\n"
4740"\n"
4741"These lines can be re-ordered; they are executed from top to bottom.\n"
4742msgstr ""
4743"\n"
4744"命令:\n"
4745"p, pick <提交> = 使用提交\n"
4746"r, reword <提交> = 使用提交,但修改提交说明\n"
4747"e, edit <提交> = 使用提交,进入 shell 以便进行提交修补\n"
4748"s, squash <提交> = 使用提交,但融合到前一个提交\n"
4749"f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
4750"x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
4751"b, break = 在此处停止(使用 'git rebase --continue' 继续变基)\n"
4752"d, drop <提交> = 删除提交\n"
4753"l, label <label> = 为当前 HEAD 打上标记\n"
4754"t, reset <label> = 重置 HEAD 到该标记\n"
4755"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
4756". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
4757". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
4758". -c <提交> 可以编辑提交说明。\n"
4759"\n"
4760"可以对这些行重新排序,将从上至下执行。\n"
4761
d46c5519
JX
4762#: rebase-interactive.c:56
4763#, c-format
4764msgid "Rebase %s onto %s (%d command)"
4765msgid_plural "Rebase %s onto %s (%d commands)"
4766msgstr[0] "变基 %s 到 %s(%d 个提交)"
4767msgstr[1] "变基 %s 到 %s(%d 个提交)"
4768
4769#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173
4c27fcb5
JX
4770msgid ""
4771"\n"
4772"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
4773msgstr ""
4774"\n"
4775"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
4776
d46c5519 4777#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177
4c27fcb5
JX
4778msgid ""
4779"\n"
4780"If you remove a line here THAT COMMIT WILL BE LOST.\n"
4781msgstr ""
4782"\n"
4783"如果您在这里删除一行,对应的提交将会丢失。\n"
4784
d46c5519 4785#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816
4c27fcb5
JX
4786msgid ""
4787"\n"
4788"You are editing the todo file of an ongoing interactive rebase.\n"
4789"To continue rebase after editing, run:\n"
4790" git rebase --continue\n"
4791"\n"
4792msgstr ""
4793"\n"
4794"您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基,\n"
4795"请执行:\n"
4796" git rebase --continue\n"
4797"\n"
4798
d46c5519 4799#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893
4c27fcb5
JX
4800msgid ""
4801"\n"
4802"However, if you remove everything, the rebase will be aborted.\n"
4803"\n"
4804msgstr ""
4805"\n"
4806"然而,如果您删除全部内容,变基操作将会终止。\n"
4807"\n"
4808
d46c5519 4809#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900
4c27fcb5
JX
4810msgid "Note that empty commits are commented out"
4811msgstr "注意空提交已被注释掉"
4812
d46c5519
JX
4813#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339
4814#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235
4c27fcb5 4815#, c-format
d46c5519
JX
4816msgid "could not write '%s'"
4817msgstr "不能写入 '%s'"
4818
4819#: rebase-interactive.c:108
4820#, c-format
4821msgid "could not copy '%s' to '%s'."
4822msgstr "不能拷贝 '%s' 至 '%s'。"
4823
4824#: rebase-interactive.c:173
4825#, c-format
4826msgid ""
4827"Warning: some commits may have been dropped accidentally.\n"
4828"Dropped commits (newer to older):\n"
4829msgstr ""
4830"警告:一些提交可能被意外丢弃。\n"
4831"丢弃的提交(从新到旧):\n"
4832
4833#: rebase-interactive.c:180
4834#, c-format
4835msgid ""
4836"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
4837"\n"
4838"Use 'git config rebase.missingCommitsCheck' to change the level of "
4839"warnings.\n"
4840"The possible behaviours are: ignore, warn, error.\n"
4841"\n"
4842msgstr ""
4843"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
4844"\n"
4845"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
4846"可选值有:ignore、warn、error。\n"
4847"\n"
4c27fcb5 4848
c1ac5258
JX
4849#: refs.c:192
4850#, c-format
4851msgid "%s does not point to a valid object!"
4852msgstr "%s 没有指向一个有效的对象!"
4853
d46c5519 4854#: refs.c:597
c1ac5258
JX
4855#, c-format
4856msgid "ignoring dangling symref %s"
e640d114 4857msgstr "忽略悬空符号引用 %s"
c1ac5258 4858
d46c5519 4859#: refs.c:599 ref-filter.c:1982
c1ac5258
JX
4860#, c-format
4861msgid "ignoring broken ref %s"
4862msgstr "忽略损坏的引用 %s"
4863
d46c5519 4864#: refs.c:734
c1ac5258
JX
4865#, c-format
4866msgid "could not open '%s' for writing: %s"
4867msgstr "无法为写入打开 '%s':%s"
4868
d46c5519 4869#: refs.c:744 refs.c:795
c1ac5258
JX
4870#, c-format
4871msgid "could not read ref '%s'"
4872msgstr "无法读取引用 '%s'"
4873
d46c5519 4874#: refs.c:750
c1ac5258
JX
4875#, c-format
4876msgid "ref '%s' already exists"
4877msgstr "引用 '%s' 已经存在"
4878
d46c5519 4879#: refs.c:755
c1ac5258
JX
4880#, c-format
4881msgid "unexpected object ID when writing '%s'"
4882msgstr "写入 '%s' 时意外的对象 ID"
4883
d46c5519
JX
4884#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805
4885#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656
c1ac5258
JX
4886#, c-format
4887msgid "could not write to '%s'"
4888msgstr "不能写入 '%s'"
4889
d46c5519 4890#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 builtin/rebase.c:993
5b04ee3b 4891#, c-format
fd8cb379 4892msgid "could not open '%s' for writing"
a0b6b246 4893msgstr "无法打开 '%s' 进行写入"
5b04ee3b 4894
d46c5519 4895#: refs.c:797
c1ac5258
JX
4896#, c-format
4897msgid "unexpected object ID when deleting '%s'"
4898msgstr "删除 '%s' 时意外的对象 ID"
4899
d46c5519 4900#: refs.c:928
c1ac5258
JX
4901#, c-format
4902msgid "log for ref %s has gap after %s"
4903msgstr "引用 %s 的日志在 %s 之后有缺口"
4904
d46c5519 4905#: refs.c:934
c1ac5258
JX
4906#, c-format
4907msgid "log for ref %s unexpectedly ended on %s"
4908msgstr "引用 %s 的日志意外终止于 %s "
4909
d46c5519 4910#: refs.c:993
c1ac5258
JX
4911#, c-format
4912msgid "log for %s is empty"
4913msgstr "%s 的日志为空"
4914
d46c5519 4915#: refs.c:1085
c1ac5258
JX
4916#, c-format
4917msgid "refusing to update ref with bad name '%s'"
4918msgstr "拒绝更新有错误名称 '%s' 的引用"
4919
d46c5519 4920#: refs.c:1161
c1ac5258
JX
4921#, c-format
4922msgid "update_ref failed for ref '%s': %s"
4923msgstr "对引用 '%s' 执行 update_ref 失败:%s"
4924
d46c5519 4925#: refs.c:1942
c1ac5258
JX
4926#, c-format
4927msgid "multiple updates for ref '%s' not allowed"
4928msgstr "不允许对引用 '%s' 多次更新"
4929
d46c5519 4930#: refs.c:1974
60638e98
JX
4931msgid "ref updates forbidden inside quarantine environment"
4932msgstr "在隔离环境中禁止更新引用"
4933
d46c5519 4934#: refs.c:2070 refs.c:2100
c1ac5258
JX
4935#, c-format
4936msgid "'%s' exists; cannot create '%s'"
4937msgstr "'%s' 已存在,无法创建 '%s'"
4938
d46c5519 4939#: refs.c:2076 refs.c:2111
c1ac5258
JX
4940#, c-format
4941msgid "cannot process '%s' and '%s' at the same time"
4942msgstr "无法同时处理 '%s' 和 '%s'"
4943
d46c5519 4944#: refs/files-backend.c:1234
6937cb4e
JX
4945#, c-format
4946msgid "could not remove reference %s"
4947msgstr "无法删除引用 %s"
4948
d46c5519 4949#: refs/files-backend.c:1248 refs/packed-backend.c:1532
c1ac5258 4950#: refs/packed-backend.c:1542
5b04ee3b 4951#, c-format
a0b6b246
JX
4952msgid "could not delete reference %s: %s"
4953msgstr "无法删除引用 %s:%s"
5b04ee3b 4954
d46c5519 4955#: refs/files-backend.c:1251 refs/packed-backend.c:1545
5b04ee3b 4956#, c-format
a0b6b246
JX
4957msgid "could not delete references: %s"
4958msgstr "无法删除引用:%s"
5b04ee3b 4959
c1ac5258
JX
4960#: refspec.c:137
4961#, c-format
4962msgid "invalid refspec '%s'"
4963msgstr "无效的引用表达式:'%s'"
4964
d46c5519 4965#: ref-filter.c:39 wt-status.c:1909
87cb7997
JX
4966msgid "gone"
4967msgstr "丢失"
4968
4c27fcb5 4969#: ref-filter.c:40
87cb7997
JX
4970#, c-format
4971msgid "ahead %d"
4972msgstr "领先 %d"
4973
4c27fcb5 4974#: ref-filter.c:41
87cb7997
JX
4975#, c-format
4976msgid "behind %d"
4977msgstr "落后 %d"
4978
4c27fcb5 4979#: ref-filter.c:42
87cb7997
JX
4980#, c-format
4981msgid "ahead %d, behind %d"
4982msgstr "领先 %d,落后 %d"
4983
4c27fcb5 4984#: ref-filter.c:138
5b04ee3b 4985#, c-format
a0b6b246 4986msgid "expected format: %%(color:<color>)"
58b6f078 4987msgstr "期望的格式:%%(color:<颜色>)"
5b04ee3b 4988
4c27fcb5 4989#: ref-filter.c:140
5b04ee3b 4990#, c-format
a0b6b246
JX
4991msgid "unrecognized color: %%(color:%s)"
4992msgstr "未能识别的颜色:%%(color:%s)"
6c94aba5 4993
4c27fcb5 4994#: ref-filter.c:162
a0b6b246 4995#, c-format
87cb7997
JX
4996msgid "Integer value expected refname:lstrip=%s"
4997msgstr "期望整数值 refname:lstrip=%s"
90314792 4998
4c27fcb5 4999#: ref-filter.c:166
87cb7997
JX
5000#, c-format
5001msgid "Integer value expected refname:rstrip=%s"
5002msgstr "期望整数值 refname:rstrip=%s"
5003
4c27fcb5 5004#: ref-filter.c:168
87cb7997
JX
5005#, c-format
5006msgid "unrecognized %%(%s) argument: %s"
5007msgstr "未能识别的 %%(%s) 参数:%s"
5008
4c27fcb5 5009#: ref-filter.c:223
c1ac5258
JX
5010#, c-format
5011msgid "%%(objecttype) does not take arguments"
5012msgstr "%%(objecttype) 不带参数"
5013
06991777
JX
5014#: ref-filter.c:245
5015#, c-format
5016msgid "unrecognized %%(objectsize) argument: %s"
5017msgstr "未能识别的 %%(objectsize) 参数:%s"
5018
5019#: ref-filter.c:253
c1ac5258 5020#, c-format
06991777
JX
5021msgid "%%(deltabase) does not take arguments"
5022msgstr "%%(deltabase) 不带参数"
c1ac5258 5023
06991777 5024#: ref-filter.c:265
90314792 5025#, c-format
a0b6b246
JX
5026msgid "%%(body) does not take arguments"
5027msgstr "%%(body) 不带参数"
90314792 5028
06991777 5029#: ref-filter.c:274
a0b6b246
JX
5030#, c-format
5031msgid "%%(subject) does not take arguments"
5032msgstr "%%(subject) 不带参数"
90314792 5033
06991777 5034#: ref-filter.c:296
1a79b2f1 5035#, c-format
6937cb4e
JX
5036msgid "unknown %%(trailers) argument: %s"
5037msgstr "未知的 %%(trailers) 参数:%s"
1a79b2f1 5038
06991777 5039#: ref-filter.c:325
a0b6b246
JX
5040#, c-format
5041msgid "positive value expected contents:lines=%s"
87cb7997 5042msgstr "期望一个正数 contents:lines=%s"
90314792 5043
06991777 5044#: ref-filter.c:327
a0b6b246
JX
5045#, c-format
5046msgid "unrecognized %%(contents) argument: %s"
5047msgstr "未能识别的 %%(contents) 参数:%s"
90314792 5048
06991777 5049#: ref-filter.c:342
87cb7997
JX
5050#, c-format
5051msgid "positive value expected objectname:short=%s"
5052msgstr "期望一个正数 objectname:short=%s"
5053
06991777 5054#: ref-filter.c:346
a0b6b246
JX
5055#, c-format
5056msgid "unrecognized %%(objectname) argument: %s"
5057msgstr "未能识别的 %%(objectname) 参数:%s"
90314792 5058
06991777 5059#: ref-filter.c:376
a0b6b246
JX
5060#, c-format
5061msgid "expected format: %%(align:<width>,<position>)"
58b6f078 5062msgstr "期望的格式:%%(align:<宽度>,<位置>)"
90314792 5063
06991777 5064#: ref-filter.c:388
5c57d762 5065#, c-format
a0b6b246
JX
5066msgid "unrecognized position:%s"
5067msgstr "未能识别的位置:%s"
5c57d762 5068
06991777 5069#: ref-filter.c:395
1b7f4a34 5070#, c-format
a0b6b246
JX
5071msgid "unrecognized width:%s"
5072msgstr "未能识别的宽度:%s"
1b7f4a34 5073
06991777 5074#: ref-filter.c:404
1b7f4a34 5075#, c-format
a0b6b246
JX
5076msgid "unrecognized %%(align) argument: %s"
5077msgstr "未能识别的 %%(align) 参数:%s"
1b7f4a34 5078
06991777 5079#: ref-filter.c:412
1b7f4a34 5080#, c-format
a0b6b246
JX
5081msgid "positive width expected with the %%(align) atom"
5082msgstr "元素 %%(align) 需要一个正数的宽度"
1b7f4a34 5083
06991777 5084#: ref-filter.c:430
87cb7997
JX
5085#, c-format
5086msgid "unrecognized %%(if) argument: %s"
5087msgstr "未能识别的 %%(if) 参数:%s"
5088
d46c5519 5089#: ref-filter.c:531
07432cef 5090#, c-format
a0b6b246 5091msgid "malformed field name: %.*s"
fd8cb379 5092msgstr "格式错误的字段名:%.*s"
ef317cd5 5093
d46c5519 5094#: ref-filter.c:558
a0b6b246
JX
5095#, c-format
5096msgid "unknown field name: %.*s"
5097msgstr "未知的字段名:%.*s"
220c313c 5098
d46c5519 5099#: ref-filter.c:562
4c27fcb5
JX
5100#, c-format
5101msgid ""
5102"not a git repository, but the field '%.*s' requires access to object data"
5103msgstr "不是一个 git 仓库,但是字段 '%.*s' 需要访问对象数据"
5104
d46c5519 5105#: ref-filter.c:686
87cb7997
JX
5106#, c-format
5107msgid "format: %%(if) atom used without a %%(then) atom"
5108msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
5109
d46c5519 5110#: ref-filter.c:749
87cb7997
JX
5111#, c-format
5112msgid "format: %%(then) atom used without an %%(if) atom"
5113msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
5114
d46c5519 5115#: ref-filter.c:751
87cb7997
JX
5116#, c-format
5117msgid "format: %%(then) atom used more than once"
5118msgstr "格式:%%(then) 元素用了多次"
5119
d46c5519 5120#: ref-filter.c:753
87cb7997
JX
5121#, c-format
5122msgid "format: %%(then) atom used after %%(else)"
5123msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
5124
d46c5519 5125#: ref-filter.c:781
87cb7997
JX
5126#, c-format
5127msgid "format: %%(else) atom used without an %%(if) atom"
5128msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
5129
d46c5519 5130#: ref-filter.c:783
87cb7997
JX
5131#, c-format
5132msgid "format: %%(else) atom used without a %%(then) atom"
5133msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
5134
d46c5519 5135#: ref-filter.c:785
87cb7997
JX
5136#, c-format
5137msgid "format: %%(else) atom used more than once"
5138msgstr "格式:%%(else) 元素用了多次"
5139
d46c5519 5140#: ref-filter.c:800
7aea43ff 5141#, c-format
a0b6b246
JX
5142msgid "format: %%(end) atom used without corresponding atom"
5143msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
7aea43ff 5144
d46c5519 5145#: ref-filter.c:857
7aea43ff 5146#, c-format
a0b6b246 5147msgid "malformed format string %s"
fd8cb379 5148msgstr "错误的格式化字符串 %s"
7aea43ff 5149
d46c5519 5150#: ref-filter.c:1453
87cb7997
JX
5151#, c-format
5152msgid "(no branch, rebasing %s)"
5153msgstr "(非分支,正变基 %s)"
5154
d46c5519 5155#: ref-filter.c:1456
fd8cb379
JX
5156#, c-format
5157msgid "(no branch, rebasing detached HEAD %s)"
5158msgstr "(非分支,正变基分离头指针 %s)"
5159
d46c5519 5160#: ref-filter.c:1459
87cb7997
JX
5161#, c-format
5162msgid "(no branch, bisect started on %s)"
5163msgstr "(非分支,二分查找开始于 %s)"
c04f5ac3 5164
a4f16749
JX
5165#. TRANSLATORS: make sure this matches "HEAD
5166#. detached at " in wt-status.c
5167#.
d46c5519 5168#: ref-filter.c:1467
c04f5ac3 5169#, c-format
87cb7997
JX
5170msgid "(HEAD detached at %s)"
5171msgstr "(头指针分离于 %s)"
c04f5ac3 5172
a4f16749
JX
5173#. TRANSLATORS: make sure this matches "HEAD
5174#. detached from " in wt-status.c
5175#.
d46c5519 5176#: ref-filter.c:1474
a0b6b246 5177#, c-format
87cb7997
JX
5178msgid "(HEAD detached from %s)"
5179msgstr "(头指针分离自 %s)"
6792b93b 5180
d46c5519 5181#: ref-filter.c:1478
87cb7997
JX
5182msgid "(no branch)"
5183msgstr "(非分支)"
5184
d46c5519 5185#: ref-filter.c:1512 ref-filter.c:1669
a0b6b246
JX
5186#, c-format
5187msgid "missing object %s for %s"
5188msgstr "缺失 %2$s 的对象 %1$s"
c04f5ac3 5189
d46c5519 5190#: ref-filter.c:1522
a0b6b246
JX
5191#, c-format
5192msgid "parse_object_buffer failed on %s for %s"
5193msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
6792b93b 5194
d46c5519 5195#: ref-filter.c:1888
a0b6b246
JX
5196#, c-format
5197msgid "malformed object at '%s'"
fd8cb379 5198msgstr "格式错误的对象 '%s'"
c04f5ac3 5199
d46c5519 5200#: ref-filter.c:1977
a0b6b246
JX
5201#, c-format
5202msgid "ignoring ref with broken name %s"
5203msgstr "忽略带有错误名称 %s 的引用"
c04f5ac3 5204
d46c5519 5205#: ref-filter.c:2263
a0b6b246
JX
5206#, c-format
5207msgid "format: %%(end) atom missing"
5208msgstr "格式:缺少 %%(end) 元素"
c04f5ac3 5209
d46c5519 5210#: ref-filter.c:2363
06991777
JX
5211#, c-format
5212msgid "option `%s' is incompatible with --merged"
5213msgstr "选项 `%s' 和 --merged 不兼容"
5214
d46c5519 5215#: ref-filter.c:2366
06991777
JX
5216#, c-format
5217msgid "option `%s' is incompatible with --no-merged"
5218msgstr "选项 `%s' 和 --no-merged 不兼容"
5219
d46c5519 5220#: ref-filter.c:2376
a0b6b246
JX
5221#, c-format
5222msgid "malformed object name %s"
fd8cb379 5223msgstr "格式错误的对象名 %s"
c04f5ac3 5224
d46c5519 5225#: ref-filter.c:2381
06991777
JX
5226#, c-format
5227msgid "option `%s' must point to a commit"
5228msgstr "选项 `%s' 必须指向一个提交"
5229
5230#: remote.c:363
5231#, c-format
5232msgid "config remote shorthand cannot begin with '/': %s"
5233msgstr "配置的远程名称不能以 '/' 开始:%s"
5234
5235#: remote.c:410
5236msgid "more than one receivepack given, using the first"
5237msgstr "提供了一个以上的 receivepack,使用第一个"
5238
5239#: remote.c:418
5240msgid "more than one uploadpack given, using the first"
5241msgstr "提供了一个以上的 uploadpack,使用第一个"
5242
5243#: remote.c:608
a0b6b246
JX
5244#, c-format
5245msgid "Cannot fetch both %s and %s to %s"
5246msgstr "不能同时获取 %s 和 %s 至 %s"
c04f5ac3 5247
06991777 5248#: remote.c:612
c04f5ac3 5249#, c-format
a0b6b246
JX
5250msgid "%s usually tracks %s, not %s"
5251msgstr "%s 通常跟踪 %s,而非 %s"
c04f5ac3 5252
06991777 5253#: remote.c:616
a0b6b246
JX
5254#, c-format
5255msgid "%s tracks both %s and %s"
5256msgstr "%s 同时跟踪 %s 和 %s"
c04f5ac3 5257
06991777
JX
5258#: remote.c:684
5259#, c-format
5260msgid "key '%s' of pattern had no '*'"
5261msgstr "模式的键 '%s' 没有 '*'"
5262
5263#: remote.c:694
5264#, c-format
5265msgid "value '%s' of pattern has no '*'"
5266msgstr "模式的值 '%s' 没有 '*'"
5267
06991777
JX
5268#: remote.c:1000
5269#, c-format
5270msgid "src refspec %s does not match any"
5271msgstr "源引用表达式 %s 没有匹配"
5272
5273#: remote.c:1005
5274#, c-format
5275msgid "src refspec %s matches more than one"
5276msgstr "源引用表达式 %s 匹配超过一个"
5277
5278#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
5279#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
5280#. the <src>.
5281#.
5282#: remote.c:1020
5283#, c-format
5284msgid ""
5285"The destination you provided is not a full refname (i.e.,\n"
5286"starting with \"refs/\"). We tried to guess what you meant by:\n"
5287"\n"
5288"- Looking for a ref that matches '%s' on the remote side.\n"
5289"- Checking if the <src> being pushed ('%s')\n"
5290" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
5291" refs/{heads,tags}/ prefix on the remote side.\n"
5292"\n"
5293"Neither worked, so we gave up. You must fully qualify the ref."
5294msgstr ""
5295"您提供的目标不是一个完整的引用名称(即以 \"refs/\" 开头)。我们\n"
5296"试着猜测您的想法:\n"
5297"\n"
5298"- 在远端查询和 '%s' 匹配的引用。\n"
5299"- 检查要推送的 <src>('%s')是不是在 \"refs/{heads,tags}/\" 中的\n"
5300" 引用。如果是,我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n"
5301"\n"
5302"都不行,所以我们已放弃。您必须给出完整的引用。"
5303
5304#: remote.c:1040
5305#, c-format
5306msgid ""
5307"The <src> part of the refspec is a commit object.\n"
5308"Did you mean to create a new branch by pushing to\n"
5309"'%s:refs/heads/%s'?"
5310msgstr ""
5311"引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
5312"'%s:refs/heads/%s' 推送么?"
5313
5314#: remote.c:1045
5315#, c-format
5316msgid ""
5317"The <src> part of the refspec is a tag object.\n"
5318"Did you mean to create a new tag by pushing to\n"
5319"'%s:refs/tags/%s'?"
5320msgstr ""
5321"引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
5322"'%s:refs/tags/%s' 推送么?"
5323
5324#: remote.c:1050
5325#, c-format
5326msgid ""
5327"The <src> part of the refspec is a tree object.\n"
5328"Did you mean to tag a new tree by pushing to\n"
5329"'%s:refs/tags/%s'?"
5330msgstr ""
5331"引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
5332"'%s:refs/tags/%s' 推送么?"
5333
5334#: remote.c:1055
5335#, c-format
5336msgid ""
5337"The <src> part of the refspec is a blob object.\n"
5338"Did you mean to tag a new blob by pushing to\n"
5339"'%s:refs/tags/%s'?"
5340msgstr ""
5341"引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
5342"'%s:refs/tags/%s' 推送么?"
5343
5344#: remote.c:1091
5345#, c-format
5346msgid "%s cannot be resolved to branch"
5347msgstr "%s 无法被解析为分支"
5348
5349#: remote.c:1102
5350#, c-format
5351msgid "unable to delete '%s': remote ref does not exist"
8e4e0555 5352msgstr "无法删除 '%s':远程引用不存在"
06991777
JX
5353
5354#: remote.c:1114
5355#, c-format
5356msgid "dst refspec %s matches more than one"
5357msgstr "目标引用表达式 %s 匹配超过一个"
5358
5359#: remote.c:1121
5360#, c-format
5361msgid "dst ref %s receives from more than one src"
5362msgstr "目标引用 %s 接收超过一个源"
c04f5ac3 5363
06991777 5364#: remote.c:1624 remote.c:1725
a0b6b246
JX
5365msgid "HEAD does not point to a branch"
5366msgstr "HEAD 没有指向一个分支"
c04f5ac3 5367
06991777 5368#: remote.c:1633
a0b6b246
JX
5369#, c-format
5370msgid "no such branch: '%s'"
5371msgstr "没有此分支:'%s'"
c04f5ac3 5372
06991777 5373#: remote.c:1636
a0b6b246
JX
5374#, c-format
5375msgid "no upstream configured for branch '%s'"
5376msgstr "尚未给分支 '%s' 设置上游"
c04f5ac3 5377
06991777 5378#: remote.c:1642
a0b6b246
JX
5379#, c-format
5380msgid "upstream branch '%s' not stored as a remote-tracking branch"
5381msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
c04f5ac3 5382
06991777 5383#: remote.c:1657
a0b6b246
JX
5384#, c-format
5385msgid "push destination '%s' on remote '%s' has no local tracking branch"
5386msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
c04f5ac3 5387
06991777 5388#: remote.c:1669
a0b6b246
JX
5389#, c-format
5390msgid "branch '%s' has no remote for pushing"
5391msgstr "分支 '%s' 没有设置要推送的远程服务器"
cfff71a9 5392
06991777 5393#: remote.c:1679
a0b6b246
JX
5394#, c-format
5395msgid "push refspecs for '%s' do not include '%s'"
5396msgstr "向 '%s' 推送引用规格未包含 '%s'"
cfff71a9 5397
06991777 5398#: remote.c:1692
a0b6b246
JX
5399msgid "push has no destination (push.default is 'nothing')"
5400msgstr "推送无目标(push.default 是 'nothing')"
cfff71a9 5401
06991777 5402#: remote.c:1714
a0b6b246
JX
5403msgid "cannot resolve 'simple' push to a single destination"
5404msgstr "无法解析 'simple' 推送至一个单独的目标"
6c94aba5 5405
06991777
JX
5406#: remote.c:1840
5407#, c-format
5408msgid "couldn't find remote ref %s"
8e4e0555 5409msgstr "无法找到远程引用 %s"
06991777
JX
5410
5411#: remote.c:1853
5412#, c-format
5413msgid "* Ignoring funny ref '%s' locally"
5414msgstr "* 在本地忽略可笑的引用 '%s'"
5415
d46c5519 5416#: remote.c:2016
a0b6b246
JX
5417#, c-format
5418msgid "Your branch is based on '%s', but the upstream is gone.\n"
5419msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
6c94aba5 5420
d46c5519 5421#: remote.c:2020
a0b6b246
JX
5422msgid " (use \"git branch --unset-upstream\" to fixup)\n"
5423msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
6c94aba5 5424
d46c5519 5425#: remote.c:2023
a0b6b246 5426#, c-format
6937cb4e 5427msgid "Your branch is up to date with '%s'.\n"
a0b6b246 5428msgstr "您的分支与上游分支 '%s' 一致。\n"
cfff71a9 5429
d46c5519 5430#: remote.c:2027
31e5e17b
JX
5431#, c-format
5432msgid "Your branch and '%s' refer to different commits.\n"
5433msgstr "您的分支和 '%s' 指向不同的提交。\n"
5434
d46c5519 5435#: remote.c:2030
31e5e17b
JX
5436#, c-format
5437msgid " (use \"%s\" for details)\n"
5438msgstr " (使用 \"%s\" 查看详情)\n"
5439
d46c5519 5440#: remote.c:2034
a0b6b246
JX
5441#, c-format
5442msgid "Your branch is ahead of '%s' by %d commit.\n"
5443msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
5444msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
5445msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
cfff71a9 5446
d46c5519 5447#: remote.c:2040
a0b6b246
JX
5448msgid " (use \"git push\" to publish your local commits)\n"
5449msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
c04f5ac3 5450
d46c5519 5451#: remote.c:2043
a0b6b246
JX
5452#, c-format
5453msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
5454msgid_plural ""
5455"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
5456msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
5457msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 5458
a0b6b246 5459# 译者:注意保持前导空格
d46c5519 5460#: remote.c:2051
a0b6b246
JX
5461msgid " (use \"git pull\" to update your local branch)\n"
5462msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
c04f5ac3 5463
d46c5519 5464#: remote.c:2054
a0b6b246
JX
5465#, c-format
5466msgid ""
5467"Your branch and '%s' have diverged,\n"
5468"and have %d and %d different commit each, respectively.\n"
5469msgid_plural ""
5470"Your branch and '%s' have diverged,\n"
5471"and have %d and %d different commits each, respectively.\n"
5472msgstr[0] ""
5473"您的分支和 '%s' 出现了偏离,\n"
5474"并且分别有 %d 和 %d 处不同的提交。\n"
5475msgstr[1] ""
5476"您的分支和 '%s' 出现了偏离,\n"
5477"并且分别有 %d 和 %d 处不同的提交。\n"
90314792 5478
a0b6b246 5479# 译者:注意保持前导空格
d46c5519 5480#: remote.c:2064
a0b6b246
JX
5481msgid " (use \"git pull\" to merge the remote branch into yours)\n"
5482msgstr " (使用 \"git pull\" 来合并远程分支)\n"
90314792 5483
d46c5519 5484#: remote.c:2247
06991777
JX
5485#, c-format
5486msgid "cannot parse expected object name '%s'"
5487msgstr "无法解析期望的对象名 '%s'"
5488
4c27fcb5 5489#: replace-object.c:21
c1ac5258
JX
5490#, c-format
5491msgid "bad replace ref name: %s"
5492msgstr "错误的替换引用名称:%s"
5493
4c27fcb5 5494#: replace-object.c:30
c1ac5258
JX
5495#, c-format
5496msgid "duplicate replace ref: %s"
5497msgstr "重复的替换引用:%s"
5498
4c27fcb5 5499#: replace-object.c:73
c1ac5258
JX
5500#, c-format
5501msgid "replace depth too high for object %s"
5502msgstr "对象 %s 的替换层级太深"
5503
4c27fcb5
JX
5504#: rerere.c:217 rerere.c:226 rerere.c:229
5505msgid "corrupt MERGE_RR"
5506msgstr "损坏的 MERGE_RR"
5507
5508#: rerere.c:264 rerere.c:269
5509msgid "unable to write rerere record"
5510msgstr "无法写入 rerere 记录"
cfff71a9 5511
4c27fcb5
JX
5512#: rerere.c:495
5513#, c-format
5514msgid "there were errors while writing '%s' (%s)"
5515msgstr "写入 '%s' (%s) 时出错"
6792b93b 5516
4c27fcb5
JX
5517#: rerere.c:498
5518#, c-format
5519msgid "failed to flush '%s'"
5520msgstr "刷新 '%s' 失败"
5c57d762 5521
4c27fcb5 5522#: rerere.c:503 rerere.c:1039
5809aa05 5523#, c-format
4c27fcb5
JX
5524msgid "could not parse conflict hunks in '%s'"
5525msgstr "不能解析 '%s' 中的冲突块"
5809aa05 5526
4c27fcb5
JX
5527#: rerere.c:684
5528#, c-format
5529msgid "failed utime() on '%s'"
5530msgstr "在 '%s' 上调用 utime() 失败"
31e5e17b 5531
4c27fcb5 5532#: rerere.c:694
87cb7997 5533#, c-format
4c27fcb5
JX
5534msgid "writing '%s' failed"
5535msgstr "写入 '%s' 失败"
87cb7997 5536
4c27fcb5 5537#: rerere.c:714
87cb7997 5538#, c-format
4c27fcb5
JX
5539msgid "Staged '%s' using previous resolution."
5540msgstr "使用之前的解决方案暂存 '%s'。"
87cb7997 5541
4c27fcb5
JX
5542#: rerere.c:753
5543#, c-format
5544msgid "Recorded resolution for '%s'."
5545msgstr "已记录 '%s' 的解决方案。"
6792b93b 5546
4c27fcb5
JX
5547#: rerere.c:788
5548#, c-format
5549msgid "Resolved '%s' using previous resolution."
5550msgstr "使用之前的解决方案解决 '%s'。"
5551
5552#: rerere.c:803
5553#, c-format
5554msgid "cannot unlink stray '%s'"
5555msgstr "不能删除 stray '%s'"
5556
5557#: rerere.c:807
5558#, c-format
5559msgid "Recorded preimage for '%s'"
5560msgstr "为 '%s' 记录 preimage"
5561
d46c5519
JX
5562#: rerere.c:881 submodule.c:2024 builtin/log.c:1750
5563#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427
4c27fcb5
JX
5564#, c-format
5565msgid "could not create directory '%s'"
5566msgstr "不能创建目录 '%s'"
5567
5568#: rerere.c:1057
5569#, c-format
5570msgid "failed to update conflicted state in '%s'"
5571msgstr "更新 '%s' 中的冲突状态失败"
5572
5573#: rerere.c:1068 rerere.c:1075
5574#, c-format
5575msgid "no remembered resolution for '%s'"
5576msgstr "没有为 '%s' 记忆的解决方案"
5577
5578#: rerere.c:1077
5579#, c-format
5580msgid "cannot unlink '%s'"
5581msgstr "不能删除 '%s'"
5582
5583#: rerere.c:1087
5584#, c-format
5585msgid "Updated preimage for '%s'"
5586msgstr "已为 '%s' 更新 preimage"
5587
5588#: rerere.c:1096
5589#, c-format
5590msgid "Forgot resolution for '%s'\n"
5591msgstr "忘记 '%s' 的解决方案\n"
5592
5593#: rerere.c:1199
5594msgid "unable to open rr-cache directory"
5595msgstr "不能打开 rr-cache 目录"
5596
d46c5519 5597#: revision.c:2476
4c27fcb5
JX
5598msgid "your current branch appears to be broken"
5599msgstr "您的当前分支好像被损坏"
5600
d46c5519 5601#: revision.c:2479
4c27fcb5
JX
5602#, c-format
5603msgid "your current branch '%s' does not have any commits yet"
5604msgstr "您的当前分支 '%s' 尚无任何提交"
5605
d46c5519 5606#: revision.c:2679
4c27fcb5
JX
5607msgid "--first-parent is incompatible with --bisect"
5608msgstr "--first-parent 与 --bisect 不兼容"
5609
d46c5519
JX
5610#: revision.c:2683
5611msgid "-L does not yet support diff formats besides -p and -s"
5612msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
5613
5614#: run-command.c:763
4c27fcb5
JX
5615msgid "open /dev/null failed"
5616msgstr "不能打开 /dev/null"
5617
d46c5519 5618#: run-command.c:1269
4c27fcb5
JX
5619#, c-format
5620msgid "cannot create async thread: %s"
5621msgstr "不能创建 async 线程:%s"
5622
d46c5519 5623#: run-command.c:1333
4c27fcb5
JX
5624#, c-format
5625msgid ""
5626"The '%s' hook was ignored because it's not set as executable.\n"
5627"You can disable this warning with `git config advice.ignoredHook false`."
5628msgstr ""
5629"因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n"
5630"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
5631
06991777 5632#: send-pack.c:141
4c27fcb5
JX
5633msgid "unexpected flush packet while reading remote unpack status"
5634msgstr "读取远程解包状态时收到意外的 flush 包"
5635
06991777 5636#: send-pack.c:143
4c27fcb5
JX
5637#, c-format
5638msgid "unable to parse remote unpack status: %s"
5639msgstr "不能解析远程解包状态:%s"
5640
06991777 5641#: send-pack.c:145
4c27fcb5
JX
5642#, c-format
5643msgid "remote unpack failed: %s"
5644msgstr "远程解包失败:%s"
5645
06991777 5646#: send-pack.c:306
4c27fcb5
JX
5647msgid "failed to sign the push certificate"
5648msgstr "为推送证书签名失败"
5649
06991777 5650#: send-pack.c:420
a0b6b246
JX
5651msgid "the receiving end does not support --signed push"
5652msgstr "接收端不支持签名推送"
6792b93b 5653
06991777 5654#: send-pack.c:422
a0b6b246
JX
5655msgid ""
5656"not sending a push certificate since the receiving end does not support --"
5657"signed push"
5658msgstr "未发送推送证书,因为接收端不支持签名推送"
6792b93b 5659
06991777 5660#: send-pack.c:434
a0b6b246
JX
5661msgid "the receiving end does not support --atomic push"
5662msgstr "接收端不支持原子推送"
6792b93b 5663
06991777 5664#: send-pack.c:439
a0b6b246
JX
5665msgid "the receiving end does not support push options"
5666msgstr "接收端不支持推送选项"
6792b93b 5667
d46c5519 5668#: sequencer.c:187
31e5e17b
JX
5669#, c-format
5670msgid "invalid commit message cleanup mode '%s'"
5671msgstr "无效的提交信息清理模式 '%s'"
5672
d46c5519 5673#: sequencer.c:292
fd8cb379
JX
5674#, c-format
5675msgid "could not delete '%s'"
5676msgstr "无法删除 '%s'"
5677
d46c5519 5678#: sequencer.c:318
a0b6b246
JX
5679msgid "revert"
5680msgstr "还原"
6792b93b 5681
d46c5519 5682#: sequencer.c:320
a0b6b246
JX
5683msgid "cherry-pick"
5684msgstr "拣选"
5685
d46c5519 5686#: sequencer.c:322
1a79b2f1
JX
5687msgid "rebase -i"
5688msgstr "rebase -i"
5689
d46c5519 5690#: sequencer.c:324
1a79b2f1 5691#, c-format
c1ac5258 5692msgid "unknown action: %d"
1a79b2f1
JX
5693msgstr "未知动作:%d"
5694
d46c5519 5695#: sequencer.c:382
a0b6b246
JX
5696msgid ""
5697"after resolving the conflicts, mark the corrected paths\n"
5698"with 'git add <paths>' or 'git rm <paths>'"
5699msgstr ""
5700"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
5701"命令标记修正后的文件"
5702
d46c5519 5703#: sequencer.c:385
a0b6b246
JX
5704msgid ""
5705"after resolving the conflicts, mark the corrected paths\n"
5706"with 'git add <paths>' or 'git rm <paths>'\n"
5707"and commit the result with 'git commit'"
5708msgstr ""
5709"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
5710"对修正后的文件做标记,然后用 'git commit' 提交"
1b7f4a34 5711
d46c5519 5712#: sequencer.c:398 sequencer.c:2801
1b7f4a34 5713#, c-format
a0b6b246
JX
5714msgid "could not lock '%s'"
5715msgstr "不能锁定 '%s'"
1b7f4a34 5716
d46c5519 5717#: sequencer.c:405
a0b6b246 5718#, c-format
72351d7d 5719msgid "could not write eol to '%s'"
a0b6b246 5720msgstr "不能将换行符写入 '%s'"
1b7f4a34 5721
d46c5519
JX
5722#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821
5723#: sequencer.c:3084
1b7f4a34 5724#, c-format
31e5e17b
JX
5725msgid "failed to finalize '%s'"
5726msgstr "无法完成 '%s'"
1b7f4a34 5727
d46c5519
JX
5728#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704
5729#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760
5730#: builtin/merge.c:1115 builtin/rebase.c:567
a0b6b246
JX
5731#, c-format
5732msgid "could not read '%s'"
5733msgstr "不能读取 '%s'"
1b7f4a34 5734
d46c5519 5735#: sequencer.c:459
63af42fe 5736#, c-format
a0b6b246
JX
5737msgid "your local changes would be overwritten by %s."
5738msgstr "您的本地修改将被%s覆盖。"
63af42fe 5739
d46c5519 5740#: sequencer.c:463
a0b6b246 5741msgid "commit your changes or stash them to proceed."
a4f16749 5742msgstr "提交您的修改或贮藏后再继续。"
6792b93b 5743
d46c5519 5744#: sequencer.c:495
a0b6b246
JX
5745#, c-format
5746msgid "%s: fast-forward"
5747msgstr "%s:快进"
6792b93b 5748
d46c5519
JX
5749#: sequencer.c:534 builtin/tag.c:555
5750#, c-format
5751msgid "Invalid cleanup mode %s"
5752msgstr "无效的清理模式 %s"
5753
1a79b2f1 5754#. TRANSLATORS: %s will be "revert", "cherry-pick" or
a4f16749 5755#. "rebase -i".
1a79b2f1 5756#.
d46c5519 5757#: sequencer.c:629
a0b6b246
JX
5758#, c-format
5759msgid "%s: Unable to write new index file"
5760msgstr "%s:无法写入新索引文件"
6792b93b 5761
d46c5519 5762#: sequencer.c:646
5809aa05
JX
5763msgid "unable to update cache tree"
5764msgstr "不能更新缓存树"
6792b93b 5765
d46c5519 5766#: sequencer.c:660
fd8cb379
JX
5767msgid "could not resolve HEAD commit"
5768msgstr "不能解析 HEAD 提交"
5769
d46c5519 5770#: sequencer.c:740
4c27fcb5
JX
5771#, c-format
5772msgid "no key present in '%.*s'"
5773msgstr "在 '%.*s' 中没有 key"
5774
d46c5519 5775#: sequencer.c:751
c1ac5258 5776#, c-format
4c27fcb5
JX
5777msgid "unable to dequote value of '%s'"
5778msgstr "无法为 '%s' 的值去引号"
c1ac5258 5779
d46c5519
JX
5780#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706
5781#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035
c1ac5258 5782#, c-format
4c27fcb5
JX
5783msgid "could not open '%s' for reading"
5784msgstr "无法打开 '%s' 进行读取"
5785
d46c5519 5786#: sequencer.c:798
4c27fcb5
JX
5787msgid "'GIT_AUTHOR_NAME' already given"
5788msgstr "已经给出 'GIT_AUTHOR_NAME'"
c1ac5258 5789
d46c5519 5790#: sequencer.c:803
4c27fcb5
JX
5791msgid "'GIT_AUTHOR_EMAIL' already given"
5792msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
5793
d46c5519 5794#: sequencer.c:808
4c27fcb5
JX
5795msgid "'GIT_AUTHOR_DATE' already given"
5796msgstr "已经给出 'GIT_AUTHOR_DATE'"
5797
d46c5519 5798#: sequencer.c:812
4c27fcb5
JX
5799#, c-format
5800msgid "unknown variable '%s'"
5801msgstr "未知变量 '%s'"
5802
d46c5519 5803#: sequencer.c:817
4c27fcb5
JX
5804msgid "missing 'GIT_AUTHOR_NAME'"
5805msgstr "缺少 'GIT_AUTHOR_NAME'"
5806
d46c5519 5807#: sequencer.c:819
4c27fcb5
JX
5808msgid "missing 'GIT_AUTHOR_EMAIL'"
5809msgstr "缺少 'GIT_AUTHOR_EMAIL'"
5810
d46c5519 5811#: sequencer.c:821
4c27fcb5
JX
5812msgid "missing 'GIT_AUTHOR_DATE'"
5813msgstr "缺少 'GIT_AUTHOR_DATE'"
5814
d46c5519 5815#: sequencer.c:881
c1ac5258
JX
5816#, c-format
5817msgid "invalid date format '%s' in '%s'"
5818msgstr "'%2$s' 中无效的日期格式 '%1$s'"
5819
d46c5519 5820#: sequencer.c:898
63af42fe
JX
5821#, c-format
5822msgid ""
a0b6b246
JX
5823"you have staged changes in your working tree\n"
5824"If these changes are meant to be squashed into the previous commit, run:\n"
5825"\n"
5826" git commit --amend %s\n"
5827"\n"
5828"If they are meant to go into a new commit, run:\n"
5829"\n"
5830" git commit %s\n"
5831"\n"
5832"In both cases, once you're done, continue with:\n"
5833"\n"
5834" git rebase --continue\n"
5835msgstr ""
1a79b2f1
JX
5836"您的工作区中存在已暂存的修改\n"
5837"如果这些修改需要被并入前一个提交,执行:\n"
a0b6b246
JX
5838"\n"
5839" git commit --amend %s\n"
5840"\n"
29004bbb 5841"如果这些修改要形成一个新提交,执行:\n"
a0b6b246
JX
5842"\n"
5843" git commit %s\n"
5844"\n"
5845"无论哪种情况,当您完成提交,继续执行:\n"
5846"\n"
5847" git rebase --continue\n"
6792b93b 5848
d46c5519 5849#: sequencer.c:992
fd8cb379
JX
5850msgid "writing root commit"
5851msgstr "写根提交"
5852
d46c5519 5853#: sequencer.c:1213
31e5e17b
JX
5854msgid "'prepare-commit-msg' hook failed"
5855msgstr "'prepare-commit-msg' 钩子失败"
5856
d46c5519 5857#: sequencer.c:1220
31e5e17b
JX
5858msgid ""
5859"Your name and email address were configured automatically based\n"
5860"on your username and hostname. Please check that they are accurate.\n"
5861"You can suppress this message by setting them explicitly. Run the\n"
5862"following command and follow the instructions in your editor to edit\n"
5863"your configuration file:\n"
5864"\n"
5865" git config --global --edit\n"
5866"\n"
5867"After doing this, you may fix the identity used for this commit with:\n"
5868"\n"
5869" git commit --amend --reset-author\n"
5870msgstr ""
5871"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5872"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
5873"中编辑您的配置文件:\n"
5874"\n"
5875" git config --global --edit\n"
5876"\n"
5877"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5878"\n"
5879" git commit --amend --reset-author\n"
5880
d46c5519 5881#: sequencer.c:1233
31e5e17b
JX
5882msgid ""
5883"Your name and email address were configured automatically based\n"
5884"on your username and hostname. Please check that they are accurate.\n"
5885"You can suppress this message by setting them explicitly:\n"
5886"\n"
5887" git config --global user.name \"Your Name\"\n"
5888" git config --global user.email you@example.com\n"
5889"\n"
5890"After doing this, you may fix the identity used for this commit with:\n"
5891"\n"
5892" git commit --amend --reset-author\n"
5893msgstr ""
5894"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5895"与否。您可以对其进行设置以免再出现本提示信息:\n"
5896"\n"
5897" git config --global user.name \"Your Name\"\n"
5898" git config --global user.email you@example.com\n"
5899"\n"
5900"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5901"\n"
5902" git commit --amend --reset-author\n"
5903
d46c5519 5904#: sequencer.c:1275
31e5e17b
JX
5905msgid "couldn't look up newly created commit"
5906msgstr "无法找到新创建的提交"
5907
d46c5519 5908#: sequencer.c:1277
31e5e17b
JX
5909msgid "could not parse newly created commit"
5910msgstr "不能解析新创建的提交"
5911
d46c5519 5912#: sequencer.c:1323
31e5e17b
JX
5913msgid "unable to resolve HEAD after creating commit"
5914msgstr "创建提交后,不能解析 HEAD"
5915
d46c5519 5916#: sequencer.c:1325
31e5e17b
JX
5917msgid "detached HEAD"
5918msgstr "分离头指针"
5919
5920# 译者:中文字符串拼接,可删除前导空格
d46c5519 5921#: sequencer.c:1329
31e5e17b
JX
5922msgid " (root-commit)"
5923msgstr "(根提交)"
5924
d46c5519 5925#: sequencer.c:1350
31e5e17b
JX
5926msgid "could not parse HEAD"
5927msgstr "不能解析 HEAD"
5928
d46c5519 5929#: sequencer.c:1352
31e5e17b
JX
5930#, c-format
5931msgid "HEAD %s is not a commit!"
5932msgstr "HEAD %s 不是一个提交!"
5933
d46c5519 5934#: sequencer.c:1356 builtin/commit.c:1551
31e5e17b
JX
5935msgid "could not parse HEAD commit"
5936msgstr "不能解析 HEAD 提交"
5937
d46c5519 5938#: sequencer.c:1408 sequencer.c:2001
31e5e17b
JX
5939msgid "unable to parse commit author"
5940msgstr "不能解析提交作者"
5941
d46c5519 5942#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688
31e5e17b
JX
5943msgid "git write-tree failed to write a tree"
5944msgstr "git write-tree 无法写入树对象"
5945
d46c5519 5946#: sequencer.c:1435 sequencer.c:1496
31e5e17b
JX
5947#, c-format
5948msgid "unable to read commit message from '%s'"
5949msgstr "不能从 '%s' 读取提交说明"
5950
d46c5519
JX
5951#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882
5952#: builtin/merge.c:906
31e5e17b 5953msgid "failed to write commit object"
c1ac5258 5954msgstr "写提交对象失败"
31e5e17b 5955
d46c5519 5956#: sequencer.c:1523
a0b6b246 5957#, c-format
5809aa05
JX
5958msgid "could not parse commit %s"
5959msgstr "不能解析提交 %s"
6792b93b 5960
d46c5519 5961#: sequencer.c:1528
63af42fe 5962#, c-format
5809aa05
JX
5963msgid "could not parse parent commit %s"
5964msgstr "不能解析父提交 %s"
63af42fe 5965
d46c5519 5966#: sequencer.c:1602 sequencer.c:1712
c1ac5258
JX
5967#, c-format
5968msgid "unknown command: %d"
5969msgstr "未知命令:%d"
5970
d46c5519 5971#: sequencer.c:1659 sequencer.c:1684
1a79b2f1
JX
5972#, c-format
5973msgid "This is a combination of %d commits."
5974msgstr "这是一个 %d 个提交的组合。"
5975
d46c5519 5976#: sequencer.c:1669
1a79b2f1
JX
5977msgid "need a HEAD to fixup"
5978msgstr "需要一个 HEAD 来修复"
5979
d46c5519 5980#: sequencer.c:1671 sequencer.c:3111
1a79b2f1
JX
5981msgid "could not read HEAD"
5982msgstr "不能读取 HEAD"
5983
d46c5519 5984#: sequencer.c:1673
1a79b2f1
JX
5985msgid "could not read HEAD's commit message"
5986msgstr "不能读取 HEAD 的提交说明"
5987
d46c5519 5988#: sequencer.c:1679
1a79b2f1
JX
5989#, c-format
5990msgid "cannot write '%s'"
5991msgstr "不能写 '%s'"
5992
d46c5519 5993#: sequencer.c:1686 git-rebase--preserve-merges.sh:441
1a79b2f1
JX
5994msgid "This is the 1st commit message:"
5995msgstr "这是第一个提交说明:"
5996
d46c5519 5997#: sequencer.c:1694
1a79b2f1
JX
5998#, c-format
5999msgid "could not read commit message of %s"
6000msgstr "不能读取 %s 的提交说明"
6001
d46c5519 6002#: sequencer.c:1701
1a79b2f1
JX
6003#, c-format
6004msgid "This is the commit message #%d:"
6005msgstr "这是提交说明 #%d:"
6006
d46c5519 6007#: sequencer.c:1707
1a79b2f1
JX
6008#, c-format
6009msgid "The commit message #%d will be skipped:"
6010msgstr "提交说明 #%d 将被跳过:"
6011
d46c5519 6012#: sequencer.c:1795
a0b6b246
JX
6013msgid "your index file is unmerged."
6014msgstr "您的索引文件未完成合并。"
6792b93b 6015
d46c5519 6016#: sequencer.c:1802
fd8cb379
JX
6017msgid "cannot fixup root commit"
6018msgstr "不能修复根提交"
6019
d46c5519 6020#: sequencer.c:1821
a0b6b246
JX
6021#, c-format
6022msgid "commit %s is a merge but no -m option was given."
6023msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
6792b93b 6024
d46c5519 6025#: sequencer.c:1829 sequencer.c:1837
a0b6b246
JX
6026#, c-format
6027msgid "commit %s does not have parent %d"
6028msgstr "提交 %s 没有第 %d 个父提交"
6029
d46c5519 6030#: sequencer.c:1843
1a79b2f1
JX
6031#, c-format
6032msgid "cannot get commit message for %s"
6033msgstr "不能得到 %s 的提交说明"
6034
a0b6b246
JX
6035#. TRANSLATORS: The first %s will be a "todo" command like
6036#. "revert" or "pick", the second %s a SHA1.
d46c5519 6037#: sequencer.c:1862
a0b6b246
JX
6038#, c-format
6039msgid "%s: cannot parse parent commit %s"
6040msgstr "%s:不能解析父提交 %s"
6041
d46c5519 6042#: sequencer.c:1927
a0b6b246 6043#, c-format
1a79b2f1
JX
6044msgid "could not rename '%s' to '%s'"
6045msgstr "不能将 '%s' 重命名为 '%s'"
a0b6b246 6046
d46c5519 6047#: sequencer.c:1982
a0b6b246
JX
6048#, c-format
6049msgid "could not revert %s... %s"
6050msgstr "不能还原 %s... %s"
6051
d46c5519 6052#: sequencer.c:1983
a0b6b246
JX
6053#, c-format
6054msgid "could not apply %s... %s"
6055msgstr "不能应用 %s... %s"
6056
d46c5519 6057#: sequencer.c:2042
a0b6b246
JX
6058#, c-format
6059msgid "git %s: failed to read the index"
6060msgstr "git %s:无法读取索引"
6061
d46c5519 6062#: sequencer.c:2049
a0b6b246
JX
6063#, c-format
6064msgid "git %s: failed to refresh the index"
6065msgstr "git %s:无法刷新索引"
6066
d46c5519 6067#: sequencer.c:2118
5809aa05
JX
6068#, c-format
6069msgid "%s does not accept arguments: '%s'"
6070msgstr "%s 不接受参数:'%s'"
6071
d46c5519 6072#: sequencer.c:2127
5809aa05
JX
6073#, c-format
6074msgid "missing arguments for %s"
6075msgstr "缺少 %s 的参数"
6076
d46c5519
JX
6077#: sequencer.c:2164
6078#, c-format
6079msgid "could not parse '%.*s'"
6080msgstr "无法解析 '%.*s'"
6081
6082#: sequencer.c:2226
a0b6b246
JX
6083#, c-format
6084msgid "invalid line %d: %.*s"
6085msgstr "无效行 %d:%.*s"
6086
d46c5519 6087#: sequencer.c:2237
1a79b2f1
JX
6088#, c-format
6089msgid "cannot '%s' without a previous commit"
6090msgstr "没有父提交的情况下不能 '%s'"
a0b6b246 6091
d46c5519
JX
6092#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178
6093#: builtin/rebase.c:204 builtin/rebase.c:229
6094#, c-format
6095msgid "could not read '%s'."
6096msgstr "不能读取 '%s'。"
6097
6098#: sequencer.c:2360
1a79b2f1
JX
6099msgid "please fix this using 'git rebase --edit-todo'."
6100msgstr "请用 'git rebase --edit-todo' 来修改。"
6101
d46c5519 6102#: sequencer.c:2362
a0b6b246
JX
6103#, c-format
6104msgid "unusable instruction sheet: '%s'"
29004bbb 6105msgstr "不可用的指令清单:'%s'"
a0b6b246 6106
d46c5519 6107#: sequencer.c:2367
1a79b2f1
JX
6108msgid "no commits parsed."
6109msgstr "没有解析提交。"
6110
d46c5519 6111#: sequencer.c:2378
a0b6b246
JX
6112msgid "cannot cherry-pick during a revert."
6113msgstr "不能在回退中执行拣选。"
6114
d46c5519 6115#: sequencer.c:2380
a0b6b246
JX
6116msgid "cannot revert during a cherry-pick."
6117msgstr "不能在拣选中执行回退。"
6118
d46c5519 6119#: sequencer.c:2462
a0b6b246
JX
6120#, c-format
6121msgid "invalid value for %s: %s"
6122msgstr "%s 的值无效:%s"
6123
d46c5519 6124#: sequencer.c:2549
fd8cb379
JX
6125msgid "unusable squash-onto"
6126msgstr "不可用的 squash-onto"
6127
d46c5519 6128#: sequencer.c:2565
a0b6b246
JX
6129#, c-format
6130msgid "malformed options sheet: '%s'"
fd8cb379 6131msgstr "格式错误的选项清单:'%s'"
a0b6b246 6132
d46c5519 6133#: sequencer.c:2648 sequencer.c:4227
c1ac5258
JX
6134msgid "empty commit set passed"
6135msgstr "提供了空的提交集"
6136
d46c5519 6137#: sequencer.c:2656
a0b6b246
JX
6138msgid "a cherry-pick or revert is already in progress"
6139msgstr "一个拣选或还原操作已在进行"
6140
d46c5519 6141#: sequencer.c:2657
a0b6b246
JX
6142msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
6143msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
6144
d46c5519 6145#: sequencer.c:2660
a0b6b246
JX
6146#, c-format
6147msgid "could not create sequencer directory '%s'"
6148msgstr "不能创建序列目录 '%s'"
6149
d46c5519 6150#: sequencer.c:2674
a0b6b246
JX
6151msgid "could not lock HEAD"
6152msgstr "不能锁定 HEAD"
6153
d46c5519 6154#: sequencer.c:2729 sequencer.c:3979
a0b6b246
JX
6155msgid "no cherry-pick or revert in progress"
6156msgstr "拣选或还原操作并未进行"
6157
d46c5519 6158#: sequencer.c:2731
a0b6b246
JX
6159msgid "cannot resolve HEAD"
6160msgstr "不能解析 HEAD"
6161
d46c5519 6162#: sequencer.c:2733 sequencer.c:2768
a0b6b246
JX
6163msgid "cannot abort from a branch yet to be born"
6164msgstr "不能从尚未建立的分支终止"
6165
d46c5519 6166#: sequencer.c:2754 builtin/grep.c:732
a0b6b246
JX
6167#, c-format
6168msgid "cannot open '%s'"
6169msgstr "不能打开 '%s'"
6170
d46c5519 6171#: sequencer.c:2756
a0b6b246
JX
6172#, c-format
6173msgid "cannot read '%s': %s"
6174msgstr "不能读取 '%s':%s"
6175
d46c5519 6176#: sequencer.c:2757
a0b6b246
JX
6177msgid "unexpected end of file"
6178msgstr "意外的文件结束"
6179
d46c5519 6180#: sequencer.c:2763
a0b6b246
JX
6181#, c-format
6182msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
6183msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
6184
d46c5519 6185#: sequencer.c:2774
1a79b2f1
JX
6186msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
6187msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
6188
d46c5519 6189#: sequencer.c:2903 sequencer.c:3894
31e5e17b
JX
6190#, c-format
6191msgid "could not update %s"
6192msgstr "不能更新 %s"
6193
d46c5519 6194#: sequencer.c:2941 sequencer.c:3874
1a79b2f1
JX
6195msgid "cannot read HEAD"
6196msgstr "不能读取 HEAD"
6197
d46c5519 6198#: sequencer.c:2958
c1ac5258
JX
6199#, c-format
6200msgid "unable to copy '%s' to '%s'"
6201msgstr "无法拷贝 '%s' 至 '%s'"
6202
d46c5519 6203#: sequencer.c:2966
c1ac5258
JX
6204#, c-format
6205msgid ""
6206"You can amend the commit now, with\n"
6207"\n"
6208" git commit --amend %s\n"
6209"\n"
6210"Once you are satisfied with your changes, run\n"
6211"\n"
6212" git rebase --continue\n"
6213msgstr ""
6214"您现在可以修补这个提交,使用\n"
6215"\n"
6216" git commit --amend %s\n"
6217"\n"
6218"当您对变更感到满意,执行\n"
6219"\n"
6220" git rebase --continue\n"
6221
d46c5519 6222#: sequencer.c:2976
c1ac5258
JX
6223#, c-format
6224msgid "Could not apply %s... %.*s"
6225msgstr "不能应用 %s... %.*s"
6226
d46c5519 6227#: sequencer.c:2983
c1ac5258
JX
6228#, c-format
6229msgid "Could not merge %.*s"
6230msgstr "不能合并 %.*s"
6231
d46c5519 6232#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633
1a79b2f1
JX
6233#, c-format
6234msgid "could not copy '%s' to '%s'"
6235msgstr "不能拷贝 '%s' 至 '%s'"
6236
d46c5519
JX
6237#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 builtin/rebase.c:1580
6238#: builtin/rebase.c:1940 builtin/rebase.c:1995
1a79b2f1
JX
6239msgid "could not read index"
6240msgstr "不能读取索引"
6241
6242# 译者:注意保持前导空格
d46c5519 6243#: sequencer.c:3028
1a79b2f1
JX
6244#, c-format
6245msgid ""
6246"execution failed: %s\n"
6247"%sYou can fix the problem, and then run\n"
6248"\n"
6249" git rebase --continue\n"
6250"\n"
6251msgstr ""
6252"执行失败:%s\n"
6253"%s您可以改正该问题,然后运行\n"
6254"\n"
6255" git rebase --continue\n"
6256"\n"
6257
d46c5519 6258#: sequencer.c:3034
1a79b2f1
JX
6259msgid "and made changes to the index and/or the working tree\n"
6260msgstr "并且修改索引和/或工作区\n"
6261
d46c5519 6262#: sequencer.c:3040
1a79b2f1
JX
6263#, c-format
6264msgid ""
6265"execution succeeded: %s\n"
6266"but left changes to the index and/or the working tree\n"
6267"Commit or stash your changes, and then run\n"
6268"\n"
6269" git rebase --continue\n"
6270"\n"
6271msgstr ""
6272"执行成功:%s\n"
6273"但是在索引和/或工作区中存在变更\n"
a4f16749 6274"提交或贮藏修改,然后运行\n"
1a79b2f1
JX
6275"\n"
6276" git rebase --continue\n"
6277"\n"
6278
d46c5519 6279#: sequencer.c:3101
c1ac5258
JX
6280#, c-format
6281msgid "illegal label name: '%.*s'"
6282msgstr "非法的标签名称:'%.*s'"
6283
d46c5519 6284#: sequencer.c:3155
fd8cb379
JX
6285msgid "writing fake root commit"
6286msgstr "写伪根提交"
6287
d46c5519 6288#: sequencer.c:3160
fd8cb379
JX
6289msgid "writing squash-onto"
6290msgstr "写入 squash-onto"
6291
d46c5519 6292#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850
fd8cb379
JX
6293#, c-format
6294msgid "failed to find tree of %s"
6295msgstr "无法找到 %s 指向的树。"
6296
d46c5519 6297#: sequencer.c:3216 builtin/rebase.c:863
fd8cb379
JX
6298msgid "could not write index"
6299msgstr "不能写入索引"
6300
d46c5519 6301#: sequencer.c:3243
c1ac5258
JX
6302#, c-format
6303msgid "could not resolve '%s'"
6304msgstr "无法解析 '%s'"
6305
d46c5519 6306#: sequencer.c:3271
fd8cb379
JX
6307msgid "cannot merge without a current revision"
6308msgstr "没有当前版本不能合并"
6309
d46c5519 6310#: sequencer.c:3293
fd8cb379 6311#, c-format
c1ac5258
JX
6312msgid "unable to parse '%.*s'"
6313msgstr "无法解析 '%.*s'"
6314
d46c5519 6315#: sequencer.c:3302
c1ac5258
JX
6316#, c-format
6317msgid "nothing to merge: '%.*s'"
6318msgstr "无可用合并:'%.*s'"
6319
d46c5519 6320#: sequencer.c:3314
c1ac5258
JX
6321msgid "octopus merge cannot be executed on top of a [new root]"
6322msgstr "章鱼合并不能在一个新的根提交上执行"
fd8cb379 6323
d46c5519 6324#: sequencer.c:3329
fd8cb379
JX
6325#, c-format
6326msgid "could not get commit message of '%s'"
6327msgstr "不能获取 '%s' 的提交说明"
6328
d46c5519 6329#: sequencer.c:3478
fd8cb379
JX
6330#, c-format
6331msgid "could not even attempt to merge '%.*s'"
6332msgstr "甚至不能尝试合并 '%.*s'"
6333
d46c5519 6334#: sequencer.c:3494
fd8cb379
JX
6335msgid "merge: Unable to write new index file"
6336msgstr "合并:无法写入新索引文件"
6337
d46c5519 6338#: sequencer.c:3562 builtin/rebase.c:711
1a79b2f1 6339#, c-format
a4f16749
JX
6340msgid "Applied autostash.\n"
6341msgstr "已应用 autostash。\n"
1a79b2f1 6342
d46c5519 6343#: sequencer.c:3574
1a79b2f1
JX
6344#, c-format
6345msgid "cannot store %s"
6346msgstr "不能存储 %s"
6347
d46c5519 6348#: sequencer.c:3577 builtin/rebase.c:727
1a79b2f1
JX
6349#, c-format
6350msgid ""
6351"Applying autostash resulted in conflicts.\n"
6352"Your changes are safe in the stash.\n"
6353"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
6354msgstr ""
6355"应用 autostash 导致冲突。\n"
a4f16749 6356"您的修改安全地保存在贮藏区中。\n"
1a79b2f1
JX
6357"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
6358
d46c5519 6359#: sequencer.c:3638
4c27fcb5
JX
6360#, c-format
6361msgid "could not checkout %s"
6362msgstr "不能检出 %s"
6363
d46c5519 6364#: sequencer.c:3652
4c27fcb5
JX
6365#, c-format
6366msgid "%s: not a valid OID"
06991777 6367msgstr "%s:不是一个有效的对象ID"
4c27fcb5 6368
d46c5519 6369#: sequencer.c:3657 git-rebase--preserve-merges.sh:724
4c27fcb5
JX
6370msgid "could not detach HEAD"
6371msgstr "不能分离头指针"
6372
d46c5519 6373#: sequencer.c:3672
4c27fcb5
JX
6374#, c-format
6375msgid "Stopped at HEAD\n"
6376msgstr "停止在 HEAD\n"
6377
d46c5519 6378#: sequencer.c:3674
4c27fcb5
JX
6379#, c-format
6380msgid "Stopped at %s\n"
6381msgstr "停止在 %s\n"
6382
d46c5519 6383#: sequencer.c:3682
fd8cb379
JX
6384#, c-format
6385msgid ""
6386"Could not execute the todo command\n"
6387"\n"
6388" %.*s\n"
6389"It has been rescheduled; To edit the command before continuing, please\n"
6390"edit the todo list first:\n"
6391"\n"
6392" git rebase --edit-todo\n"
6393" git rebase --continue\n"
6394msgstr ""
6395"无法执行待办命令\n"
6396"\n"
6397" %.*s\n"
6398"已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n"
6399"\n"
6400" git rebase --edit-todo\n"
6401" git rebase --continue\n"
6402
d46c5519 6403#: sequencer.c:3759
1a79b2f1 6404#, c-format
87cb7997
JX
6405msgid "Stopped at %s... %.*s\n"
6406msgstr "停止在 %s... %.*s\n"
1a79b2f1 6407
d46c5519 6408#: sequencer.c:3837
1a79b2f1
JX
6409#, c-format
6410msgid "unknown command %d"
6411msgstr "未知命令 %d"
6412
d46c5519 6413#: sequencer.c:3882
1a79b2f1
JX
6414msgid "could not read orig-head"
6415msgstr "不能读取 orig-head"
6416
d46c5519 6417#: sequencer.c:3887
1a79b2f1
JX
6418msgid "could not read 'onto'"
6419msgstr "不能读取 'onto'"
6420
d46c5519 6421#: sequencer.c:3901
1a79b2f1
JX
6422#, c-format
6423msgid "could not update HEAD to %s"
6424msgstr "不能更新 HEAD 为 %s"
6425
d46c5519 6426#: sequencer.c:3991
1a79b2f1
JX
6427msgid "cannot rebase: You have unstaged changes."
6428msgstr "不能变基:您有未暂存的变更。"
6429
d46c5519 6430#: sequencer.c:4000
1a79b2f1
JX
6431msgid "cannot amend non-existing commit"
6432msgstr "不能修补不存在的提交"
6433
d46c5519 6434#: sequencer.c:4002
1a79b2f1
JX
6435#, c-format
6436msgid "invalid file: '%s'"
6437msgstr "无效文件:'%s'"
6438
d46c5519 6439#: sequencer.c:4004
1a79b2f1
JX
6440#, c-format
6441msgid "invalid contents: '%s'"
6442msgstr "无效内容:'%s'"
6443
d46c5519 6444#: sequencer.c:4007
1a79b2f1
JX
6445msgid ""
6446"\n"
6447"You have uncommitted changes in your working tree. Please, commit them\n"
6448"first and then run 'git rebase --continue' again."
87cb7997
JX
6449msgstr ""
6450"\n"
6451"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
1a79b2f1 6452
d46c5519 6453#: sequencer.c:4043 sequencer.c:4081
fd8cb379
JX
6454#, c-format
6455msgid "could not write file: '%s'"
6456msgstr "不能写入文件:'%s'"
6457
d46c5519 6458#: sequencer.c:4096
fd8cb379
JX
6459msgid "could not remove CHERRY_PICK_HEAD"
6460msgstr "不能删除 CHERRY_PICK_HEAD"
6461
d46c5519 6462#: sequencer.c:4103
1a79b2f1
JX
6463msgid "could not commit staged changes."
6464msgstr "不能提交暂存的修改。"
6465
d46c5519 6466#: sequencer.c:4204
a0b6b246
JX
6467#, c-format
6468msgid "%s: can't cherry-pick a %s"
6469msgstr "%s:不能拣选一个%s"
6470
d46c5519 6471#: sequencer.c:4208
a0b6b246
JX
6472#, c-format
6473msgid "%s: bad revision"
6474msgstr "%s:错误的版本"
6475
d46c5519 6476#: sequencer.c:4243
a0b6b246
JX
6477msgid "can't revert as initial commit"
6478msgstr "不能作为初始提交回退"
6479
d46c5519 6480#: sequencer.c:4686
6937cb4e
JX
6481msgid "make_script: unhandled options"
6482msgstr "make_script:有未能处理的选项"
6483
d46c5519 6484#: sequencer.c:4689
6937cb4e
JX
6485msgid "make_script: error preparing revisions"
6486msgstr "make_script:准备版本时错误"
6487
d46c5519 6488#: sequencer.c:4847
6937cb4e
JX
6489msgid ""
6490"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
6491"continue'.\n"
6492"Or you can abort the rebase with 'git rebase --abort'.\n"
6493msgstr ""
6494"您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n"
6495"或者您可以用 'git rebase --abort' 终止变基。\n"
6496
d46c5519 6497#: sequencer.c:4959 sequencer.c:4976
4c27fcb5
JX
6498msgid "nothing to do"
6499msgstr "无事可做"
6500
d46c5519 6501#: sequencer.c:4990
4c27fcb5
JX
6502msgid "could not skip unnecessary pick commands"
6503msgstr "无法跳过不必要的拣选"
6504
d46c5519 6505#: sequencer.c:5073
6937cb4e
JX
6506msgid "the script was already rearranged."
6507msgstr "脚本已经重新编排。"
6508
fd8cb379 6509#: setup.c:123
31e5e17b
JX
6510#, c-format
6511msgid "'%s' is outside repository"
6512msgstr "'%s' 在仓库之外"
6513
d46c5519 6514#: setup.c:173
a0b6b246 6515#, c-format
6792b93b 6516msgid ""
a0b6b246
JX
6517"%s: no such path in the working tree.\n"
6518"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
6519msgstr ""
6520"%s:工作区中无此路径。\n"
58b6f078 6521"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
6792b93b 6522
d46c5519 6523#: setup.c:186
90314792 6524#, c-format
a0b6b246
JX
6525msgid ""
6526"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
6527"Use '--' to separate paths from revisions, like this:\n"
6528"'git <command> [<revision>...] -- [<file>...]'"
6529msgstr ""
6530"有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
6531"使用 '--' 来分隔版本和路径,例如:\n"
58b6f078 6532"'git <命令> [<版本>...] -- [<文件>...]'"
6792b93b 6533
d46c5519 6534#: setup.c:235
31e5e17b
JX
6535#, c-format
6536msgid "option '%s' must come before non-option arguments"
6537msgstr "选项 '%s' 必须在其他非选项参数之前"
6538
d46c5519 6539#: setup.c:254
a0b6b246
JX
6540#, c-format
6541msgid ""
6542"ambiguous argument '%s': both revision and filename\n"
6543"Use '--' to separate paths from revisions, like this:\n"
6544"'git <command> [<revision>...] -- [<file>...]'"
6545msgstr ""
6546"有歧义的参数 '%s':可同时是版本和文件\n"
6547"使用 '--' 来分隔版本和路径,例如:\n"
58b6f078 6548"'git <命令> [<版本>...] -- [<文件>...]'"
2e8451e8 6549
d46c5519 6550#: setup.c:390
31e5e17b
JX
6551msgid "unable to set up work tree using invalid config"
6552msgstr "无法使用无效配置来创建工作区"
6553
d46c5519 6554#: setup.c:394
31e5e17b 6555msgid "this operation must be run in a work tree"
610f8099 6556msgstr "该操作必须在一个工作区中运行"
31e5e17b 6557
d46c5519 6558#: setup.c:540
a0b6b246
JX
6559#, c-format
6560msgid "Expected git repo version <= %d, found %d"
6561msgstr "期望 git 仓库版本 <= %d,却得到 %d"
6792b93b 6562
d46c5519 6563#: setup.c:548
a0b6b246
JX
6564msgid "unknown repository extensions found:"
6565msgstr "发现未知的仓库扩展:"
2e8451e8 6566
d46c5519 6567#: setup.c:567
1003b3a5 6568#, c-format
31e5e17b 6569msgid "error opening '%s'"
c1ac5258 6570msgstr "打开 '%s' 出错"
1003b3a5 6571
d46c5519 6572#: setup.c:569
31e5e17b
JX
6573#, c-format
6574msgid "too large to be a .git file: '%s'"
610f8099 6575msgstr "文件太大,无法作为 .git 文件:'%s'"
31e5e17b 6576
d46c5519 6577#: setup.c:571
31e5e17b
JX
6578#, c-format
6579msgid "error reading %s"
c1ac5258 6580msgstr "读取 %s 出错"
31e5e17b 6581
d46c5519 6582#: setup.c:573
31e5e17b
JX
6583#, c-format
6584msgid "invalid gitfile format: %s"
6585msgstr "无效的 gitfile 格式:%s"
6586
d46c5519 6587#: setup.c:575
31e5e17b
JX
6588#, c-format
6589msgid "no path in gitfile: %s"
6590msgstr "在 gitfile 中没有路径:%s"
6591
d46c5519 6592#: setup.c:577
31e5e17b
JX
6593#, c-format
6594msgid "not a git repository: %s"
6595msgstr "不是一个 git 仓库:%s"
6596
d46c5519 6597#: setup.c:676
31e5e17b
JX
6598#, c-format
6599msgid "'$%s' too big"
6600msgstr "'$%s' 太大"
6601
d46c5519 6602#: setup.c:690
31e5e17b
JX
6603#, c-format
6604msgid "not a git repository: '%s'"
6605msgstr "不是一个 git 仓库:'%s'"
6606
d46c5519 6607#: setup.c:719 setup.c:721 setup.c:752
31e5e17b
JX
6608#, c-format
6609msgid "cannot chdir to '%s'"
6610msgstr "不能切换目录到 '%s'"
6611
d46c5519 6612#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
31e5e17b 6613msgid "cannot come back to cwd"
a0b6b246 6614msgstr "无法返回当前工作目录"
1003b3a5 6615
d46c5519 6616#: setup.c:851
31e5e17b
JX
6617#, c-format
6618msgid "failed to stat '%*s%s%s'"
c1ac5258 6619msgstr "获取 '%*s%s%s' 状态(stat)失败"
31e5e17b 6620
d46c5519 6621#: setup.c:1083
a0b6b246
JX
6622msgid "Unable to read current working directory"
6623msgstr "不能读取当前工作目录"
1003b3a5 6624
d46c5519 6625#: setup.c:1092 setup.c:1098
87cb7997 6626#, c-format
31e5e17b 6627msgid "cannot change to '%s'"
87cb7997
JX
6628msgstr "不能切换到 '%s'"
6629
d46c5519 6630#: setup.c:1103
06991777
JX
6631#, c-format
6632msgid "not a git repository (or any of the parent directories): %s"
6633msgstr "不是一个 git 仓库(或者任何父目录):%s"
6634
d46c5519 6635#: setup.c:1109
a0b6b246
JX
6636#, c-format
6637msgid ""
31e5e17b 6638"not a git repository (or any parent up to mount point %s)\n"
a0b6b246
JX
6639"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
6640msgstr ""
31e5e17b 6641"不是一个 git 仓库(或者直至挂载点 %s 的任何父目录)\n"
a0b6b246 6642"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
1003b3a5 6643
d46c5519 6644#: setup.c:1220
a0b6b246
JX
6645#, c-format
6646msgid ""
31e5e17b 6647"problem with core.sharedRepository filemode value (0%.3o).\n"
a0b6b246
JX
6648"The owner of files must always have read and write permissions."
6649msgstr ""
31e5e17b 6650"参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n"
a0b6b246 6651"文件属主必须始终拥有读写权限。"
6792b93b 6652
d46c5519 6653#: setup.c:1264
31e5e17b
JX
6654msgid "open /dev/null or dup failed"
6655msgstr "不能打开或者复制 /dev/null"
6656
d46c5519 6657#: setup.c:1279
31e5e17b
JX
6658msgid "fork failed"
6659msgstr "fork 失败"
6660
d46c5519 6661#: setup.c:1284
31e5e17b
JX
6662msgid "setsid failed"
6663msgstr "setsid 失败"
6664
d46c5519 6665#: sha1-file.c:453
c1ac5258
JX
6666#, c-format
6667msgid "object directory %s does not exist; check .git/objects/info/alternates"
6668msgstr "对象目录 %s 不存在,检查 .git/objects/info/alternates"
6669
d46c5519 6670#: sha1-file.c:504
c1ac5258
JX
6671#, c-format
6672msgid "unable to normalize alternate object path: %s"
6673msgstr "无法规范化备用对象路径:%s"
6674
d46c5519 6675#: sha1-file.c:576
c1ac5258
JX
6676#, c-format
6677msgid "%s: ignoring alternate object stores, nesting too deep"
6678msgstr "%s:忽略备用对象库,嵌套太深"
6679
d46c5519 6680#: sha1-file.c:583
c1ac5258
JX
6681#, c-format
6682msgid "unable to normalize object directory: %s"
6683msgstr "无法规范化对象目录: %s"
6684
d46c5519 6685#: sha1-file.c:626
c1ac5258
JX
6686msgid "unable to fdopen alternates lockfile"
6687msgstr "无法 fdopen 替换锁文件"
6688
d46c5519 6689#: sha1-file.c:644
c1ac5258
JX
6690msgid "unable to read alternates file"
6691msgstr "无法读取替代文件"
6692
d46c5519 6693#: sha1-file.c:651
c1ac5258
JX
6694msgid "unable to move new alternates file into place"
6695msgstr "无法将新的替代文件移动到位"
6696
d46c5519 6697#: sha1-file.c:686
a0b6b246
JX
6698#, c-format
6699msgid "path '%s' does not exist"
6700msgstr "路径 '%s' 不存在"
6701
d46c5519 6702#: sha1-file.c:712
a0b6b246
JX
6703#, c-format
6704msgid "reference repository '%s' as a linked checkout is not supported yet."
6705msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
6706
d46c5519 6707#: sha1-file.c:718
a0b6b246
JX
6708#, c-format
6709msgid "reference repository '%s' is not a local repository."
6710msgstr "参考仓库 '%s' 不是一个本地仓库。"
6711
d46c5519 6712#: sha1-file.c:724
a0b6b246
JX
6713#, c-format
6714msgid "reference repository '%s' is shallow"
6715msgstr "参考仓库 '%s' 是一个浅克隆"
6716
d46c5519 6717#: sha1-file.c:732
a0b6b246
JX
6718#, c-format
6719msgid "reference repository '%s' is grafted"
fd8cb379 6720msgstr "参考仓库 '%s' 已被移植"
a0b6b246 6721
d46c5519 6722#: sha1-file.c:846
c1ac5258
JX
6723#, c-format
6724msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
6725msgstr "尝试 mmap %<PRIuMAX>,超过了最大值 %<PRIuMAX>"
6726
d46c5519 6727#: sha1-file.c:871
c1ac5258
JX
6728msgid "mmap failed"
6729msgstr "mmap 失败"
6730
d46c5519 6731#: sha1-file.c:1035
c1ac5258
JX
6732#, c-format
6733msgid "object file %s is empty"
6734msgstr "对象文件 %s 为空"
6735
d46c5519 6736#: sha1-file.c:1159 sha1-file.c:2297
c1ac5258
JX
6737#, c-format
6738msgid "corrupt loose object '%s'"
6739msgstr "损坏的松散对象 '%s'"
6740
d46c5519 6741#: sha1-file.c:1161 sha1-file.c:2301
c1ac5258
JX
6742#, c-format
6743msgid "garbage at end of loose object '%s'"
6744msgstr "松散对象 '%s' 后面有垃圾数据"
6745
d46c5519 6746#: sha1-file.c:1203
c1ac5258
JX
6747msgid "invalid object type"
6748msgstr "无效的对象类型"
6749
d46c5519 6750#: sha1-file.c:1287
c1ac5258
JX
6751#, c-format
6752msgid "unable to unpack %s header with --allow-unknown-type"
6753msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
6754
d46c5519 6755#: sha1-file.c:1290
c1ac5258
JX
6756#, c-format
6757msgid "unable to unpack %s header"
6758msgstr "无法解开 %s 头部"
6759
d46c5519 6760#: sha1-file.c:1296
c1ac5258
JX
6761#, c-format
6762msgid "unable to parse %s header with --allow-unknown-type"
6763msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
6764
d46c5519 6765#: sha1-file.c:1299
c1ac5258
JX
6766#, c-format
6767msgid "unable to parse %s header"
6768msgstr "无法解析 %s 头部"
6769
d46c5519 6770#: sha1-file.c:1490
c1ac5258
JX
6771#, c-format
6772msgid "failed to read object %s"
6773msgstr "读取对象 %s 失败"
6774
d46c5519 6775#: sha1-file.c:1494
c1ac5258
JX
6776#, c-format
6777msgid "replacement %s not found for %s"
6778msgstr "找不到 %2$s 的替代 %1$s"
6779
d46c5519 6780#: sha1-file.c:1498
c1ac5258
JX
6781#, c-format
6782msgid "loose object %s (stored in %s) is corrupt"
6783msgstr "松散对象 %s(保存在 %s)已损坏"
6784
d46c5519 6785#: sha1-file.c:1502
c1ac5258
JX
6786#, c-format
6787msgid "packed object %s (stored in %s) is corrupt"
6788msgstr "打包对象 %s(保存在 %s)已损坏"
6789
d46c5519 6790#: sha1-file.c:1604
c1ac5258 6791#, c-format
06991777
JX
6792msgid "unable to write file %s"
6793msgstr "无法写文件 %s"
c1ac5258 6794
d46c5519 6795#: sha1-file.c:1611
c1ac5258
JX
6796#, c-format
6797msgid "unable to set permission to '%s'"
6798msgstr "无法为 '%s' 设置权限"
6799
d46c5519 6800#: sha1-file.c:1618
c1ac5258
JX
6801msgid "file write error"
6802msgstr "文件写错误"
6803
d46c5519 6804#: sha1-file.c:1637
06991777
JX
6805msgid "error when closing loose object file"
6806msgstr "关闭松散对象文件时出错"
c1ac5258 6807
d46c5519 6808#: sha1-file.c:1702
c1ac5258
JX
6809#, c-format
6810msgid "insufficient permission for adding an object to repository database %s"
6811msgstr "权限不足,无法在仓库对象库 %s 中添加对象"
6812
d46c5519 6813#: sha1-file.c:1704
c1ac5258
JX
6814msgid "unable to create temporary file"
6815msgstr "无法创建临时文件"
6816
d46c5519 6817#: sha1-file.c:1728
06991777
JX
6818msgid "unable to write loose object file"
6819msgstr "不能写松散对象文件"
c1ac5258 6820
d46c5519 6821#: sha1-file.c:1734
c1ac5258
JX
6822#, c-format
6823msgid "unable to deflate new object %s (%d)"
6824msgstr "不能压缩新对象 %s(%d)"
6825
d46c5519 6826#: sha1-file.c:1738
c1ac5258
JX
6827#, c-format
6828msgid "deflateEnd on object %s failed (%d)"
6829msgstr "在对象 %s 上调用 deflateEnd 失败(%d)"
6830
d46c5519 6831#: sha1-file.c:1742
c1ac5258
JX
6832#, c-format
6833msgid "confused by unstable object source data for %s"
6834msgstr "被 %s 的不稳定对象源数据搞糊涂了"
6835
d46c5519 6836#: sha1-file.c:1752 builtin/pack-objects.c:920
c1ac5258
JX
6837#, c-format
6838msgid "failed utime() on %s"
6839msgstr "在 %s 上调用 utime() 失败"
6840
d46c5519 6841#: sha1-file.c:1827
c1ac5258 6842#, c-format
06991777
JX
6843msgid "cannot read object for %s"
6844msgstr "不能读取对象 %s"
c1ac5258 6845
d46c5519 6846#: sha1-file.c:1867
c1ac5258
JX
6847msgid "corrupt commit"
6848msgstr "损坏的提交"
6849
d46c5519 6850#: sha1-file.c:1875
c1ac5258
JX
6851msgid "corrupt tag"
6852msgstr "损坏的标签"
6853
d46c5519 6854#: sha1-file.c:1974
c1ac5258
JX
6855#, c-format
6856msgid "read error while indexing %s"
6857msgstr "索引 %s 时读取错误"
6858
d46c5519 6859#: sha1-file.c:1977
c1ac5258
JX
6860#, c-format
6861msgid "short read while indexing %s"
6862msgstr "索引 %s 时读入不完整"
6863
d46c5519 6864#: sha1-file.c:2050 sha1-file.c:2059
c1ac5258
JX
6865#, c-format
6866msgid "%s: failed to insert into database"
6867msgstr "%s:插入数据库失败"
6868
d46c5519 6869#: sha1-file.c:2065
c1ac5258
JX
6870#, c-format
6871msgid "%s: unsupported file type"
6872msgstr "%s:不支持的文件类型"
6873
d46c5519 6874#: sha1-file.c:2089
c1ac5258
JX
6875#, c-format
6876msgid "%s is not a valid object"
6877msgstr "%s 不是一个有效的对象"
6878
d46c5519 6879#: sha1-file.c:2091
c1ac5258
JX
6880#, c-format
6881msgid "%s is not a valid '%s' object"
6882msgstr "%s 不是一个有效的 '%s' 对象"
6883
d46c5519 6884#: sha1-file.c:2118 builtin/index-pack.c:154
c1ac5258
JX
6885#, c-format
6886msgid "unable to open %s"
6887msgstr "不能打开 %s"
6888
d46c5519 6889#: sha1-file.c:2308 sha1-file.c:2360
c1ac5258 6890#, c-format
06991777
JX
6891msgid "hash mismatch for %s (expected %s)"
6892msgstr "%s 的哈希值不匹配(预期 %s)"
c1ac5258 6893
d46c5519 6894#: sha1-file.c:2332
c1ac5258
JX
6895#, c-format
6896msgid "unable to mmap %s"
6897msgstr "不能 mmap %s"
6898
d46c5519 6899#: sha1-file.c:2337
c1ac5258
JX
6900#, c-format
6901msgid "unable to unpack header of %s"
6902msgstr "无法解压缩 %s 的头部"
6903
d46c5519 6904#: sha1-file.c:2343
c1ac5258
JX
6905#, c-format
6906msgid "unable to parse header of %s"
6907msgstr "无法解析 %s 的头部"
6908
d46c5519 6909#: sha1-file.c:2354
c1ac5258
JX
6910#, c-format
6911msgid "unable to unpack contents of %s"
6912msgstr "无法解压缩 %s 的内容"
6913
d46c5519 6914#: sha1-name.c:490
a0b6b246
JX
6915#, c-format
6916msgid "short SHA1 %s is ambiguous"
29004bbb 6917msgstr "短 SHA1 %s 存在歧义"
a0b6b246 6918
d46c5519 6919#: sha1-name.c:501
a0b6b246
JX
6920msgid "The candidates are:"
6921msgstr "候选者有:"
6922
d46c5519 6923#: sha1-name.c:800
a0b6b246
JX
6924msgid ""
6925"Git normally never creates a ref that ends with 40 hex characters\n"
6926"because it will be ignored when you just specify 40-hex. These refs\n"
6927"may be created by mistake. For example,\n"
6928"\n"
6929" git checkout -b $br $(git rev-parse ...)\n"
6930"\n"
6931"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
6932"examine these refs and maybe delete them. Turn this message off by\n"
6933"running \"git config advice.objectNameWarning false\""
6934msgstr ""
6935"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
6936"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
6937"\n"
6938" git checkout -b $br $(git rev-parse ...)\n"
6939"\n"
6940"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
6941"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
6942"命令关闭本消息通知。"
6943
06991777 6944#: submodule.c:114 submodule.c:143
a0b6b246
JX
6945msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
6946msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
6947
06991777 6948#: submodule.c:118 submodule.c:147
a0b6b246
JX
6949#, c-format
6950msgid "Could not find section in .gitmodules where path=%s"
6951msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
6952
06991777 6953#: submodule.c:154
a0b6b246
JX
6954#, c-format
6955msgid "Could not remove .gitmodules entry for %s"
6956msgstr "无法移除 %s 的 .gitmodules 条目"
6957
06991777 6958#: submodule.c:165
a0b6b246
JX
6959msgid "staging updated .gitmodules failed"
6960msgstr "将更新后 .gitmodules 添加暂存区失败"
6961
06991777 6962#: submodule.c:327
a4f16749
JX
6963#, c-format
6964msgid "in unpopulated submodule '%s'"
6965msgstr "位于未检出的子模组 '%s'"
6966
06991777 6967#: submodule.c:358
a4f16749
JX
6968#, c-format
6969msgid "Pathspec '%s' is in submodule '%.*s'"
6970msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
6971
d46c5519 6972#: submodule.c:910
6937cb4e
JX
6973#, c-format
6974msgid "submodule entry '%s' (%s) is a %s, not a commit"
493a9322 6975msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交"
6937cb4e 6976
d46c5519 6977#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988
6937cb4e
JX
6978msgid "Failed to resolve HEAD as a valid ref."
6979msgstr "无法将 HEAD 解析为有效引用。"
6980
d46c5519 6981#: submodule.c:1481
06991777
JX
6982#, c-format
6983msgid "Could not access submodule '%s'"
6984msgstr "无法访问子模组 '%s'"
6985
d46c5519 6986#: submodule.c:1651
1a79b2f1 6987#, c-format
87cb7997 6988msgid "'%s' not recognized as a git repository"
65e2041e 6989msgstr "无法将 '%s' 识别为一个 git 仓库"
1a79b2f1 6990
d46c5519 6991#: submodule.c:1789
1a79b2f1 6992#, c-format
87cb7997
JX
6993msgid "could not start 'git status' in submodule '%s'"
6994msgstr "无法在子模组 '%s' 中启动 'git status'"
1a79b2f1 6995
d46c5519 6996#: submodule.c:1802
87cb7997
JX
6997#, c-format
6998msgid "could not run 'git status' in submodule '%s'"
6999msgstr "无法在子模组 '%s' 中执行 'git status'"
7000
d46c5519 7001#: submodule.c:1817
06991777
JX
7002#, c-format
7003msgid "Could not unset core.worktree setting in submodule '%s'"
7004msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
7005
d46c5519 7006#: submodule.c:1907
87cb7997
JX
7007#, c-format
7008msgid "submodule '%s' has dirty index"
7009msgstr "子模组 '%s' 中有脏索引"
7010
d46c5519 7011#: submodule.c:1959
c1ac5258
JX
7012#, c-format
7013msgid "Submodule '%s' could not be updated."
7014msgstr "子模组 '%s' 无法被更新。"
7015
d46c5519 7016#: submodule.c:2008
1a79b2f1
JX
7017#, c-format
7018msgid ""
7019"relocate_gitdir for submodule '%s' with more than one worktree not supported"
7020msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
7021
d46c5519 7022#: submodule.c:2020 submodule.c:2076
1a79b2f1
JX
7023#, c-format
7024msgid "could not lookup name for submodule '%s'"
7025msgstr "不能查询子模组 '%s' 的名称"
7026
d46c5519 7027#: submodule.c:2027
1a79b2f1
JX
7028#, c-format
7029msgid ""
7030"Migrating git directory of '%s%s' from\n"
7031"'%s' to\n"
7032"'%s'\n"
7033msgstr ""
7034"将 '%s%s' 的 git 目录从\n"
7035"'%s' 迁移至\n"
7036"'%s'\n"
7037
d46c5519 7038#: submodule.c:2111
1a79b2f1
JX
7039#, c-format
7040msgid "could not recurse into submodule '%s'"
7041msgstr "无法递归进子模组路径 '%s'"
7042
d46c5519 7043#: submodule.c:2155
87cb7997
JX
7044msgid "could not start ls-files in .."
7045msgstr "无法在 .. 中启动 ls-files"
7046
d46c5519 7047#: submodule.c:2194
87cb7997
JX
7048#, c-format
7049msgid "ls-tree returned unexpected return code %d"
7050msgstr "ls-tree 返回未知返回值 %d"
7051
4c27fcb5 7052#: submodule-config.c:232
fd8cb379
JX
7053#, c-format
7054msgid "ignoring suspicious submodule name: %s"
7055msgstr "忽略可疑的子模组名称:%s"
7056
d46c5519 7057#: submodule-config.c:299
6937cb4e
JX
7058msgid "negative values not allowed for submodule.fetchjobs"
7059msgstr "submodule.fetchjobs 不允许为负值"
7060
d46c5519 7061#: submodule-config.c:397
4c27fcb5
JX
7062#, c-format
7063msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
7064msgstr "忽略可能被解析为命令行选项的 '%s':%s"
7065
d46c5519 7066#: submodule-config.c:486
a0b6b246
JX
7067#, c-format
7068msgid "invalid value for %s"
7069msgstr "%s 的值无效"
7070
d46c5519 7071#: submodule-config.c:755
4c27fcb5
JX
7072#, c-format
7073msgid "Could not update .gitmodules entry %s"
7074msgstr "不能更新 .gitmodules 条目 %s"
7075
6937cb4e 7076#: trailer.c:238
a0b6b246
JX
7077#, c-format
7078msgid "running trailer command '%s' failed"
7079msgstr "执行 trailer 命令 '%s' 失败"
7080
6937cb4e
JX
7081#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
7082#: trailer.c:557
a0b6b246
JX
7083#, c-format
7084msgid "unknown value '%s' for key '%s'"
7085msgstr "键 '%2$s' 的未知取值 '%1$s'"
7086
4c27fcb5 7087#: trailer.c:539 trailer.c:544 builtin/remote.c:295
a0b6b246
JX
7088#, c-format
7089msgid "more than one %s"
7090msgstr "多于一个 %s"
7091
6937cb4e 7092#: trailer.c:730
a0b6b246
JX
7093#, c-format
7094msgid "empty trailer token in trailer '%.*s'"
7095msgstr "签名 '%.*s' 的键为空"
7096
6937cb4e 7097#: trailer.c:750
a0b6b246
JX
7098#, c-format
7099msgid "could not read input file '%s'"
7100msgstr "不能读取输入文件 '%s'"
7101
6937cb4e 7102#: trailer.c:753
a0b6b246
JX
7103msgid "could not read from stdin"
7104msgstr "不能自标准输入读取"
7105
06991777 7106#: trailer.c:1011 wrapper.c:701
a0b6b246
JX
7107#, c-format
7108msgid "could not stat %s"
65e2041e 7109msgstr "不能对 %s 调用 stat"
a0b6b246 7110
4c27fcb5 7111#: trailer.c:1013
a0b6b246
JX
7112#, c-format
7113msgid "file %s is not a regular file"
7114msgstr "文件 %s 不是一个正规文件"
7115
4c27fcb5 7116#: trailer.c:1015
a0b6b246
JX
7117#, c-format
7118msgid "file %s is not writable by user"
7119msgstr "文件 %s 用户不可写"
7120
4c27fcb5 7121#: trailer.c:1027
a0b6b246
JX
7122msgid "could not open temporary file"
7123msgstr "不能打开临时文件"
7124
4c27fcb5 7125#: trailer.c:1067
a0b6b246
JX
7126#, c-format
7127msgid "could not rename temporary file to %s"
7128msgstr "不能重命名临时文件为 %s"
7129
fd8cb379 7130#: transport.c:116
a0b6b246
JX
7131#, c-format
7132msgid "Would set upstream of '%s' to '%s' of '%s'\n"
7133msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
7134
c1ac5258
JX
7135#: transport.c:142
7136#, c-format
7137msgid "could not read bundle '%s'"
7138msgstr "无法读取 bundle '%s'"
7139
fd8cb379 7140#: transport.c:208
a0b6b246
JX
7141#, c-format
7142msgid "transport: invalid depth option '%s'"
7143msgstr "传输:无效的深度选项 '%s'"
7144
d46c5519
JX
7145#: transport.c:259
7146msgid "see protocol.version in 'git help config' for more details"
7147msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
7148
7149#: transport.c:260
7150msgid "server options require protocol version 2 or later"
7151msgstr "服务端选项需要版本 2 协议或更高"
7152
7153#: transport.c:625
fd8cb379
JX
7154msgid "could not parse transport.color.* config"
7155msgstr "不能解析 transport.color.* 配置"
7156
d46c5519 7157#: transport.c:698
c1ac5258
JX
7158msgid "support for protocol v2 not implemented yet"
7159msgstr "协议 v2 的支持尚未实现"
7160
d46c5519 7161#: transport.c:825
c1ac5258
JX
7162#, c-format
7163msgid "unknown value for config '%s': %s"
7164msgstr "配置 '%s' 的取值未知:%s"
7165
d46c5519 7166#: transport.c:891
c1ac5258
JX
7167#, c-format
7168msgid "transport '%s' not allowed"
7169msgstr "传输 '%s' 不允许"
7170
d46c5519 7171#: transport.c:945
c1ac5258
JX
7172msgid "git-over-rsync is no longer supported"
7173msgstr "不再支持 git-over-rsync"
7174
d46c5519 7175#: transport.c:1040
a0b6b246
JX
7176#, c-format
7177msgid ""
7178"The following submodule paths contain changes that can\n"
7179"not be found on any remote:\n"
7180msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
7181
d46c5519 7182#: transport.c:1044
a0b6b246
JX
7183#, c-format
7184msgid ""
7185"\n"
7186"Please try\n"
7187"\n"
7188"\tgit push --recurse-submodules=on-demand\n"
7189"\n"
7190"or cd to the path and use\n"
7191"\n"
7192"\tgit push\n"
7193"\n"
7194"to push them to a remote.\n"
7195"\n"
7196msgstr ""
7197"\n"
7198"请尝试\n"
7199"\n"
7200"\tgit push --recurse-submodules=on-demand\n"
7201"\n"
7202"或者进入到子目录执行\n"
7203"\n"
7204"\tgit push\n"
7205"\n"
7206"以推送至远程。\n"
7207"\n"
7208
d46c5519 7209#: transport.c:1052
a0b6b246
JX
7210msgid "Aborting."
7211msgstr "正在终止。"
7212
d46c5519 7213#: transport.c:1193
c1ac5258
JX
7214msgid "failed to push all needed submodules"
7215msgstr "不能推送全部需要的子模组"
7216
d46c5519 7217#: transport.c:1326 transport-helper.c:645
c1ac5258
JX
7218msgid "operation not supported by protocol"
7219msgstr "协议不支持该操作"
7220
d46c5519 7221#: transport.c:1430
c1ac5258
JX
7222#, c-format
7223msgid "invalid line while parsing alternate refs: %s"
7224msgstr "解析备用引用时无效的行:%s"
7225
7226#: transport-helper.c:51 transport-helper.c:80
7227msgid "full write to remote helper failed"
7228msgstr "完整写入远程助手失败"
7229
d46c5519 7230#: transport-helper.c:134
c1ac5258
JX
7231#, c-format
7232msgid "unable to find remote helper for '%s'"
7233msgstr "无法为 '%s' 找到远程助手"
7234
d46c5519 7235#: transport-helper.c:150 transport-helper.c:559
c1ac5258
JX
7236msgid "can't dup helper output fd"
7237msgstr "无法复制助手输出文件句柄"
7238
d46c5519 7239#: transport-helper.c:201
c1ac5258
JX
7240#, c-format
7241msgid ""
7242"unknown mandatory capability %s; this remote helper probably needs newer "
7243"version of Git"
7244msgstr "未知的强制能力 %s,该远程助手可能需要新版本的Git"
7245
d46c5519 7246#: transport-helper.c:207
c1ac5258
JX
7247msgid "this remote helper should implement refspec capability"
7248msgstr "远程助手需要实现 refspec 能力"
7249
d46c5519 7250#: transport-helper.c:274 transport-helper.c:414
c1ac5258
JX
7251#, c-format
7252msgid "%s unexpectedly said: '%s'"
7253msgstr "%s 意外地说:'%s'"
7254
d46c5519 7255#: transport-helper.c:403
c1ac5258
JX
7256#, c-format
7257msgid "%s also locked %s"
7258msgstr "%s 也锁定了 %s"
7259
d46c5519 7260#: transport-helper.c:481
c1ac5258
JX
7261msgid "couldn't run fast-import"
7262msgstr "不能执行 fast-import"
7263
d46c5519 7264#: transport-helper.c:504
c1ac5258
JX
7265msgid "error while running fast-import"
7266msgstr "执行 fast-import 出错"
7267
d46c5519 7268#: transport-helper.c:533 transport-helper.c:1099
c1ac5258
JX
7269#, c-format
7270msgid "could not read ref %s"
7271msgstr "无法读取引用 %s"
7272
d46c5519 7273#: transport-helper.c:578
c1ac5258
JX
7274#, c-format
7275msgid "unknown response to connect: %s"
7276msgstr "连接时未知的响应:%s"
7277
d46c5519 7278#: transport-helper.c:600
c1ac5258
JX
7279msgid "setting remote service path not supported by protocol"
7280msgstr "协议不支持设置远程服务路径"
7281
d46c5519 7282#: transport-helper.c:602
c1ac5258
JX
7283msgid "invalid remote service path"
7284msgstr "无效的远程服务路径"
7285
d46c5519 7286#: transport-helper.c:648
c1ac5258
JX
7287#, c-format
7288msgid "can't connect to subservice %s"
7289msgstr "不能连接到子服务 %s"
7290
d46c5519 7291#: transport-helper.c:720
c1ac5258
JX
7292#, c-format
7293msgid "expected ok/error, helper said '%s'"
7294msgstr "预期 ok/error,助手说 '%s'"
7295
d46c5519 7296#: transport-helper.c:773
c1ac5258
JX
7297#, c-format
7298msgid "helper reported unexpected status of %s"
7299msgstr "助手报告 %s 的意外状态"
7300
d46c5519 7301#: transport-helper.c:834
a0b6b246 7302#, c-format
c1ac5258
JX
7303msgid "helper %s does not support dry-run"
7304msgstr "助手 %s 不支持 dry-run"
a0b6b246 7305
d46c5519 7306#: transport-helper.c:837
c1ac5258
JX
7307#, c-format
7308msgid "helper %s does not support --signed"
7309msgstr "助手 %s 不支持 --signed"
7310
d46c5519 7311#: transport-helper.c:840
c1ac5258
JX
7312#, c-format
7313msgid "helper %s does not support --signed=if-asked"
7314msgstr "助手 %s 不支持 --signed=if-asked"
7315
d46c5519 7316#: transport-helper.c:847
c1ac5258
JX
7317#, c-format
7318msgid "helper %s does not support 'push-option'"
7319msgstr "助手 %s 不支持 'push-option'"
7320
d46c5519 7321#: transport-helper.c:939
c1ac5258
JX
7322msgid "remote-helper doesn't support push; refspec needed"
7323msgstr "remote-heper 不支持 push,需要引用表达式"
7324
d46c5519 7325#: transport-helper.c:944
c1ac5258
JX
7326#, c-format
7327msgid "helper %s does not support 'force'"
7328msgstr "助手 %s 不支持 'force'"
7329
d46c5519 7330#: transport-helper.c:991
c1ac5258
JX
7331msgid "couldn't run fast-export"
7332msgstr "无法执行 fast-export"
7333
d46c5519 7334#: transport-helper.c:996
c1ac5258
JX
7335msgid "error while running fast-export"
7336msgstr "执行 fast-export 时出错"
7337
d46c5519 7338#: transport-helper.c:1021
c1ac5258
JX
7339#, c-format
7340msgid ""
7341"No refs in common and none specified; doing nothing.\n"
7342"Perhaps you should specify a branch such as 'master'.\n"
7343msgstr ""
7344"没有共同的引用并且也没有指定,什么也不会做。\n"
7345"可能您应该指定一个分支如 'master'。\n"
7346
d46c5519 7347#: transport-helper.c:1085
c1ac5258
JX
7348#, c-format
7349msgid "malformed response in ref list: %s"
7350msgstr "引用列表中格式错误的响应:%s"
7351
d46c5519 7352#: transport-helper.c:1238
c1ac5258
JX
7353#, c-format
7354msgid "read(%s) failed"
7355msgstr "读取(%s)失败"
7356
d46c5519 7357#: transport-helper.c:1265
c1ac5258
JX
7358#, c-format
7359msgid "write(%s) failed"
7360msgstr "写(%s)失败"
7361
d46c5519 7362#: transport-helper.c:1314
c1ac5258
JX
7363#, c-format
7364msgid "%s thread failed"
7365msgstr "%s 线程失败"
7366
d46c5519 7367#: transport-helper.c:1318
c1ac5258
JX
7368#, c-format
7369msgid "%s thread failed to join: %s"
e640d114 7370msgstr "%s 线程等待失败:%s"
c1ac5258 7371
d46c5519 7372#: transport-helper.c:1337 transport-helper.c:1341
c1ac5258
JX
7373#, c-format
7374msgid "can't start thread for copying data: %s"
7375msgstr "不能启动线程来拷贝数据:%s"
7376
d46c5519 7377#: transport-helper.c:1378
c1ac5258
JX
7378#, c-format
7379msgid "%s process failed to wait"
7380msgstr "%s 进程等待失败"
7381
d46c5519 7382#: transport-helper.c:1382
c1ac5258
JX
7383#, c-format
7384msgid "%s process failed"
7385msgstr "%s 进程失败"
7386
d46c5519 7387#: transport-helper.c:1400 transport-helper.c:1409
c1ac5258
JX
7388msgid "can't start thread for copying data"
7389msgstr "不能启动线程来拷贝数据"
7390
7391#: tree-walk.c:33
a0b6b246
JX
7392msgid "too-short tree object"
7393msgstr "太短的树对象"
7394
c1ac5258 7395#: tree-walk.c:39
a0b6b246 7396msgid "malformed mode in tree entry"
29004bbb 7397msgstr "树对象中的条目模式错误"
a0b6b246 7398
c1ac5258 7399#: tree-walk.c:43
a0b6b246
JX
7400msgid "empty filename in tree entry"
7401msgstr "树对象条目中空的文件名"
7402
06991777 7403#: tree-walk.c:116
a0b6b246
JX
7404msgid "too-short tree file"
7405msgstr "太短的树文件"
7406
06991777 7407#: unpack-trees.c:111
a0b6b246
JX
7408#, c-format
7409msgid ""
7410"Your local changes to the following files would be overwritten by checkout:\n"
7411"%%sPlease commit your changes or stash them before you switch branches."
7412msgstr ""
7413"您对下列文件的本地修改将被检出操作覆盖:\n"
a4f16749 7414"%%s请在切换分支前提交或贮藏您的修改。"
a0b6b246 7415
06991777 7416#: unpack-trees.c:113
a0b6b246
JX
7417#, c-format
7418msgid ""
7419"Your local changes to the following files would be overwritten by checkout:\n"
7420"%%s"
7421msgstr ""
7422"您对下列文件的本地修改将被检出操作覆盖:\n"
7423"%%s"
7424
06991777 7425#: unpack-trees.c:116
a0b6b246
JX
7426#, c-format
7427msgid ""
7428"Your local changes to the following files would be overwritten by merge:\n"
7429"%%sPlease commit your changes or stash them before you merge."
7430msgstr ""
7431"您对下列文件的本地修改将被合并操作覆盖:\n"
a4f16749 7432"%%s请在合并前提交或贮藏您的修改。"
a0b6b246 7433
06991777 7434#: unpack-trees.c:118
a0b6b246
JX
7435#, c-format
7436msgid ""
7437"Your local changes to the following files would be overwritten by merge:\n"
7438"%%s"
7439msgstr ""
7440"您对下列文件的本地修改将被合并操作覆盖:\n"
7441"%%s"
7442
06991777 7443#: unpack-trees.c:121
a0b6b246
JX
7444#, c-format
7445msgid ""
7446"Your local changes to the following files would be overwritten by %s:\n"
7447"%%sPlease commit your changes or stash them before you %s."
7448msgstr ""
7449"您对下列文件的本地修改将被 %s 覆盖:\n"
a4f16749 7450"%%s请在 %s 之前提交或贮藏您的修改。"
6792b93b 7451
06991777 7452#: unpack-trees.c:123
a0b6b246
JX
7453#, c-format
7454msgid ""
7455"Your local changes to the following files would be overwritten by %s:\n"
7456"%%s"
7457msgstr ""
7458"您对下列文件的本地修改将被 %s 覆盖:\n"
7459"%%s"
c04f5ac3 7460
06991777 7461#: unpack-trees.c:128
a0b6b246
JX
7462#, c-format
7463msgid ""
1a79b2f1 7464"Updating the following directories would lose untracked files in them:\n"
a0b6b246
JX
7465"%s"
7466msgstr ""
7467"更新如下目录将会丢失其中未跟踪的文件:\n"
7468"%s"
1b7f4a34 7469
06991777 7470#: unpack-trees.c:132
a0b6b246
JX
7471#, c-format
7472msgid ""
7473"The following untracked working tree files would be removed by checkout:\n"
7474"%%sPlease move or remove them before you switch branches."
7475msgstr ""
7476"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
7477"%%s请在切换分支之前移动或删除。"
2e8451e8 7478
06991777 7479#: unpack-trees.c:134
a0b6b246
JX
7480#, c-format
7481msgid ""
7482"The following untracked working tree files would be removed by checkout:\n"
7483"%%s"
7484msgstr ""
7485"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
7486"%%s"
1003b3a5 7487
06991777 7488#: unpack-trees.c:137
a0b6b246
JX
7489#, c-format
7490msgid ""
7491"The following untracked working tree files would be removed by merge:\n"
7492"%%sPlease move or remove them before you merge."
7493msgstr ""
7494"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
7495"%%s请在合并前移动或删除。"
1003b3a5 7496
06991777 7497#: unpack-trees.c:139
a0b6b246
JX
7498#, c-format
7499msgid ""
7500"The following untracked working tree files would be removed by merge:\n"
7501"%%s"
7502msgstr ""
7503"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
7504"%%s"
c04f5ac3 7505
06991777 7506#: unpack-trees.c:142
a0b6b246
JX
7507#, c-format
7508msgid ""
7509"The following untracked working tree files would be removed by %s:\n"
7510"%%sPlease move or remove them before you %s."
7511msgstr ""
7512"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
7513"%%s请在 %s 前移动或删除。"
c04f5ac3 7514
06991777 7515#: unpack-trees.c:144
a0b6b246
JX
7516#, c-format
7517msgid ""
7518"The following untracked working tree files would be removed by %s:\n"
7519"%%s"
7520msgstr ""
7521"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
7522"%%s"
c04f5ac3 7523
06991777 7524#: unpack-trees.c:150
a0b6b246
JX
7525#, c-format
7526msgid ""
7527"The following untracked working tree files would be overwritten by "
7528"checkout:\n"
7529"%%sPlease move or remove them before you switch branches."
7530msgstr ""
7531"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
7532"%%s请在切换分支前移动或删除。"
c04f5ac3 7533
06991777 7534#: unpack-trees.c:152
1003b3a5 7535#, c-format
4dcdc3d8 7536msgid ""
a0b6b246
JX
7537"The following untracked working tree files would be overwritten by "
7538"checkout:\n"
7539"%%s"
4dcdc3d8 7540msgstr ""
a0b6b246
JX
7541"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
7542"%%s"
1003b3a5 7543
06991777 7544#: unpack-trees.c:155
c04f5ac3 7545#, c-format
a0b6b246
JX
7546msgid ""
7547"The following untracked working tree files would be overwritten by merge:\n"
7548"%%sPlease move or remove them before you merge."
7549msgstr ""
7550"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
7551"%%s请在合并前移动或删除。"
c04f5ac3 7552
06991777 7553#: unpack-trees.c:157
a0b6b246
JX
7554#, c-format
7555msgid ""
7556"The following untracked working tree files would be overwritten by merge:\n"
7557"%%s"
7558msgstr ""
7559"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
7560"%%s"
c04f5ac3 7561
06991777 7562#: unpack-trees.c:160
a0b6b246
JX
7563#, c-format
7564msgid ""
7565"The following untracked working tree files would be overwritten by %s:\n"
7566"%%sPlease move or remove them before you %s."
7567msgstr ""
7568"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
7569"%%s请在 %s 前移动或删除。"
c04f5ac3 7570
06991777 7571#: unpack-trees.c:162
07432cef 7572#, c-format
a0b6b246
JX
7573msgid ""
7574"The following untracked working tree files would be overwritten by %s:\n"
7575"%%s"
7576msgstr ""
7577"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
7578"%%s"
c04f5ac3 7579
06991777 7580#: unpack-trees.c:170
07432cef 7581#, c-format
a0b6b246
JX
7582msgid "Entry '%s' overlaps with '%s'. Cannot bind."
7583msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
c04f5ac3 7584
06991777 7585#: unpack-trees.c:173
07432cef 7586#, c-format
ef317cd5 7587msgid ""
6937cb4e 7588"Cannot update sparse checkout: the following entries are not up to date:\n"
a0b6b246
JX
7589"%s"
7590msgstr ""
7591"无法更新稀疏检出:如下条目不是最新:\n"
7592"%s"
c04f5ac3 7593
06991777 7594#: unpack-trees.c:175
07432cef 7595#, c-format
a0b6b246
JX
7596msgid ""
7597"The following working tree files would be overwritten by sparse checkout "
7598"update:\n"
7599"%s"
7600msgstr ""
7601"工作区中下列文件将被稀疏检出更新所覆盖:\n"
7602"%s"
c04f5ac3 7603
06991777 7604#: unpack-trees.c:177
07432cef 7605#, c-format
a0b6b246
JX
7606msgid ""
7607"The following working tree files would be removed by sparse checkout "
7608"update:\n"
7609"%s"
7610msgstr ""
7611"工作区中下列文件将被稀疏检出更新所删除:\n"
7612"%s"
c04f5ac3 7613
06991777 7614#: unpack-trees.c:179
87cb7997
JX
7615#, c-format
7616msgid ""
7617"Cannot update submodule:\n"
7618"%s"
7619msgstr ""
7620"无法更新子模组:\n"
7621"%s"
7622
d46c5519 7623#: unpack-trees.c:256
07432cef 7624#, c-format
a0b6b246
JX
7625msgid "Aborting\n"
7626msgstr "终止中\n"
ef317cd5 7627
d46c5519 7628#: unpack-trees.c:318
a0b6b246
JX
7629msgid "Checking out files"
7630msgstr "正在检出文件"
c04f5ac3 7631
d46c5519 7632#: unpack-trees.c:350
4c27fcb5
JX
7633msgid ""
7634"the following paths have collided (e.g. case-sensitive paths\n"
7635"on a case-insensitive filesystem) and only one from the same\n"
7636"colliding group is in the working tree:\n"
7637msgstr ""
7638"以下路径发生碰撞(如:在不区分大小写的文件系统上的区分大小写的路径),\n"
7639"并且碰撞组中只有一个文件存在工作区中:\n"
7640
87cb7997 7641#: urlmatch.c:163
a0b6b246
JX
7642msgid "invalid URL scheme name or missing '://' suffix"
7643msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
7644
87cb7997 7645#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
07432cef 7646#, c-format
a0b6b246
JX
7647msgid "invalid %XX escape sequence"
7648msgstr "无效的 %XX 转义序列"
c04f5ac3 7649
87cb7997 7650#: urlmatch.c:215
a0b6b246
JX
7651msgid "missing host and scheme is not 'file:'"
7652msgstr "缺失主机名且 URL 方案不是 'file:'"
c04f5ac3 7653
87cb7997 7654#: urlmatch.c:232
a0b6b246
JX
7655msgid "a 'file:' URL may not have a port number"
7656msgstr "一个 'file:' URL 不应该包含端口号"
94550ed3 7657
87cb7997 7658#: urlmatch.c:247
a0b6b246
JX
7659msgid "invalid characters in host name"
7660msgstr "主机名中包含无效的字符"
90314792 7661
87cb7997 7662#: urlmatch.c:292 urlmatch.c:303
a0b6b246
JX
7663msgid "invalid port number"
7664msgstr "无效的端口号"
c04f5ac3 7665
87cb7997 7666#: urlmatch.c:371
a0b6b246
JX
7667msgid "invalid '..' path segment"
7668msgstr "无效的 '..' 路径片段"
5c0c220c 7669
d46c5519 7670#: worktree.c:255 builtin/am.c:2097
a77c07d9 7671#, c-format
a0b6b246 7672msgid "failed to read '%s'"
c1ac5258 7673msgstr "读取 '%s' 失败"
ef317cd5 7674
d46c5519 7675#: worktree.c:301
31e5e17b
JX
7676#, c-format
7677msgid "'%s' at main working tree is not the repository directory"
7678msgstr "在主工作区的 '%s' 不是仓库目录"
7679
d46c5519 7680#: worktree.c:312
31e5e17b
JX
7681#, c-format
7682msgid "'%s' file does not contain absolute path to the working tree location"
7683msgstr "文件 '%s' 不包含工作区的绝对路径"
7684
d46c5519 7685#: worktree.c:324
31e5e17b
JX
7686#, c-format
7687msgid "'%s' does not exist"
7688msgstr "'%s' 不存在"
7689
d46c5519 7690#: worktree.c:330
31e5e17b
JX
7691#, c-format
7692msgid "'%s' is not a .git file, error code %d"
7693msgstr "'%s' 不是一个 .git 文件,错误码 %d"
7694
d46c5519 7695#: worktree.c:338
31e5e17b
JX
7696#, c-format
7697msgid "'%s' does not point back to '%s'"
7698msgstr "'%s' 没有指回到 '%s'"
7699
a4f16749 7700#: wrapper.c:223 wrapper.c:393
c04f5ac3 7701#, c-format
a0b6b246
JX
7702msgid "could not open '%s' for reading and writing"
7703msgstr "无法打开 '%s' 进行读写"
c04f5ac3 7704
a4f16749 7705#: wrapper.c:424 wrapper.c:624
a0b6b246
JX
7706#, c-format
7707msgid "unable to access '%s'"
7708msgstr "不能访问 '%s'"
c04f5ac3 7709
a4f16749 7710#: wrapper.c:632
a0b6b246
JX
7711msgid "unable to get current working directory"
7712msgstr "不能获取当前工作目录"
c04f5ac3 7713
d46c5519 7714#: wt-status.c:156
a0b6b246
JX
7715msgid "Unmerged paths:"
7716msgstr "未合并的路径:"
7aea43ff 7717
a0b6b246 7718# 译者:注意保持前导空格
d46c5519 7719#: wt-status.c:183 wt-status.c:210
c04f5ac3 7720#, c-format
a0b6b246
JX
7721msgid " (use \"git reset %s <file>...\" to unstage)"
7722msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
c04f5ac3 7723
a0b6b246 7724# 译者:注意保持前导空格
d46c5519 7725#: wt-status.c:185 wt-status.c:212
a0b6b246
JX
7726msgid " (use \"git rm --cached <file>...\" to unstage)"
7727msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
c04f5ac3 7728
a0b6b246 7729# 译者:注意保持前导空格
d46c5519 7730#: wt-status.c:189
a0b6b246
JX
7731msgid " (use \"git add <file>...\" to mark resolution)"
7732msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
8ada9598 7733
a0b6b246 7734# 译者:注意保持前导空格
d46c5519 7735#: wt-status.c:191 wt-status.c:195
a0b6b246
JX
7736msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
7737msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
8ada9598 7738
a0b6b246 7739# 译者:注意保持前导空格
d46c5519 7740#: wt-status.c:193
a0b6b246
JX
7741msgid " (use \"git rm <file>...\" to mark resolution)"
7742msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
ef317cd5 7743
d46c5519 7744#: wt-status.c:204 wt-status.c:1064
a0b6b246
JX
7745msgid "Changes to be committed:"
7746msgstr "要提交的变更:"
ef317cd5 7747
d46c5519 7748#: wt-status.c:222 wt-status.c:1073
a0b6b246
JX
7749msgid "Changes not staged for commit:"
7750msgstr "尚未暂存以备提交的变更:"
ef317cd5 7751
a0b6b246 7752# 译者:注意保持前导空格
d46c5519 7753#: wt-status.c:226
a0b6b246
JX
7754msgid " (use \"git add <file>...\" to update what will be committed)"
7755msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
ef317cd5 7756
a0b6b246 7757# 译者:注意保持前导空格
d46c5519 7758#: wt-status.c:228
a0b6b246
JX
7759msgid " (use \"git add/rm <file>...\" to update what will be committed)"
7760msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
ef317cd5 7761
a0b6b246 7762# 译者:注意保持前导空格
d46c5519 7763#: wt-status.c:229
a0b6b246
JX
7764msgid ""
7765" (use \"git checkout -- <file>...\" to discard changes in working directory)"
7766msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
ef317cd5 7767
a0b6b246 7768# 译者:注意保持前导空格
d46c5519 7769#: wt-status.c:231
a0b6b246
JX
7770msgid " (commit or discard the untracked or modified content in submodules)"
7771msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
ef317cd5 7772
a0b6b246 7773# 译者:注意保持前导空格
d46c5519 7774#: wt-status.c:243
a0b6b246
JX
7775#, c-format
7776msgid " (use \"git %s <file>...\" to include in what will be committed)"
7777msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
ef317cd5 7778
d46c5519 7779#: wt-status.c:258
a0b6b246
JX
7780msgid "both deleted:"
7781msgstr "双方删除:"
ef317cd5 7782
d46c5519 7783#: wt-status.c:260
a0b6b246
JX
7784msgid "added by us:"
7785msgstr "由我们添加:"
4dcdc3d8 7786
d46c5519 7787#: wt-status.c:262
a0b6b246
JX
7788msgid "deleted by them:"
7789msgstr "由他们删除:"
ef317cd5 7790
d46c5519 7791#: wt-status.c:264
a0b6b246
JX
7792msgid "added by them:"
7793msgstr "由他们添加:"
ef317cd5 7794
d46c5519 7795#: wt-status.c:266
a0b6b246
JX
7796msgid "deleted by us:"
7797msgstr "由我们删除:"
ef317cd5 7798
d46c5519 7799#: wt-status.c:268
a0b6b246
JX
7800msgid "both added:"
7801msgstr "双方添加:"
5c57d762 7802
d46c5519 7803#: wt-status.c:270
a0b6b246
JX
7804msgid "both modified:"
7805msgstr "双方修改:"
5c57d762 7806
d46c5519 7807#: wt-status.c:280
a0b6b246
JX
7808msgid "new file:"
7809msgstr "新文件:"
8ada9598 7810
d46c5519 7811#: wt-status.c:282
a0b6b246
JX
7812msgid "copied:"
7813msgstr "拷贝:"
8ada9598 7814
d46c5519 7815#: wt-status.c:284
a0b6b246
JX
7816msgid "deleted:"
7817msgstr "删除:"
8ada9598 7818
d46c5519 7819#: wt-status.c:286
a0b6b246
JX
7820msgid "modified:"
7821msgstr "修改:"
8ada9598 7822
d46c5519 7823#: wt-status.c:288
a0b6b246
JX
7824msgid "renamed:"
7825msgstr "重命名:"
5c57d762 7826
d46c5519 7827#: wt-status.c:290
a0b6b246
JX
7828msgid "typechange:"
7829msgstr "类型变更:"
8ada9598 7830
d46c5519 7831#: wt-status.c:292
a0b6b246
JX
7832msgid "unknown:"
7833msgstr "未知:"
8ada9598 7834
d46c5519 7835#: wt-status.c:294
a0b6b246
JX
7836msgid "unmerged:"
7837msgstr "未合并:"
8ada9598 7838
a0b6b246 7839# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
d46c5519 7840#: wt-status.c:374
a0b6b246
JX
7841msgid "new commits, "
7842msgstr "新提交, "
8ada9598 7843
a0b6b246 7844# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
d46c5519 7845#: wt-status.c:376
a0b6b246
JX
7846msgid "modified content, "
7847msgstr "修改的内容, "
1b7f4a34 7848
a0b6b246 7849# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
d46c5519 7850#: wt-status.c:378
a0b6b246
JX
7851msgid "untracked content, "
7852msgstr "未跟踪的内容, "
1b7f4a34 7853
d46c5519 7854#: wt-status.c:896
a4f16749
JX
7855#, c-format
7856msgid "Your stash currently has %d entry"
7857msgid_plural "Your stash currently has %d entries"
7858msgstr[0] "您的贮藏区当前有 %d 条记录"
7859msgstr[1] "您的贮藏区当前有 %d 条记录"
7860
d46c5519 7861#: wt-status.c:928
a0b6b246
JX
7862msgid "Submodules changed but not updated:"
7863msgstr "子模组已修改但尚未更新:"
1b7f4a34 7864
d46c5519 7865#: wt-status.c:930
a0b6b246
JX
7866msgid "Submodule changes to be committed:"
7867msgstr "要提交的子模组变更:"
1b7f4a34 7868
d46c5519 7869#: wt-status.c:1012
a0b6b246 7870msgid ""
6937cb4e
JX
7871"Do not modify or remove the line above.\n"
7872"Everything below it will be ignored."
a0b6b246 7873msgstr ""
6937cb4e
JX
7874"不要改动或删除上面的一行。\n"
7875"其下所有内容都将被忽略。"
1b7f4a34 7876
d46c5519 7877#: wt-status.c:1119
a0b6b246
JX
7878msgid "You have unmerged paths."
7879msgstr "您有尚未合并的路径。"
1b7f4a34 7880
a0b6b246 7881# 译者:注意保持前导空格
d46c5519 7882#: wt-status.c:1122
a0b6b246
JX
7883msgid " (fix conflicts and run \"git commit\")"
7884msgstr " (解决冲突并运行 \"git commit\")"
1b7f4a34 7885
a0b6b246 7886# 译者:注意保持前导空格
d46c5519 7887#: wt-status.c:1124
a0b6b246
JX
7888msgid " (use \"git merge --abort\" to abort the merge)"
7889msgstr " (使用 \"git merge --abort\" 终止合并)"
1b7f4a34 7890
d46c5519 7891#: wt-status.c:1128
a0b6b246
JX
7892msgid "All conflicts fixed but you are still merging."
7893msgstr "所有冲突已解决但您仍处于合并中。"
1b7f4a34 7894
a0b6b246 7895# 译者:注意保持前导空格
d46c5519 7896#: wt-status.c:1131
a0b6b246
JX
7897msgid " (use \"git commit\" to conclude merge)"
7898msgstr " (使用 \"git commit\" 结束合并)"
1b7f4a34 7899
d46c5519 7900#: wt-status.c:1140
a0b6b246
JX
7901msgid "You are in the middle of an am session."
7902msgstr "您正处于 am 操作过程中。"
1b7f4a34 7903
d46c5519 7904#: wt-status.c:1143
a0b6b246
JX
7905msgid "The current patch is empty."
7906msgstr "当前的补丁为空。"
1b7f4a34 7907
a0b6b246 7908# 译者:注意保持前导空格
d46c5519 7909#: wt-status.c:1147
a0b6b246
JX
7910msgid " (fix conflicts and then run \"git am --continue\")"
7911msgstr " (解决冲突,然后运行 \"git am --continue\")"
1b7f4a34 7912
a0b6b246 7913# 译者:注意保持前导空格
d46c5519 7914#: wt-status.c:1149
a0b6b246
JX
7915msgid " (use \"git am --skip\" to skip this patch)"
7916msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1b7f4a34 7917
a0b6b246 7918# 译者:注意保持前导空格
d46c5519 7919#: wt-status.c:1151
a0b6b246
JX
7920msgid " (use \"git am --abort\" to restore the original branch)"
7921msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1b7f4a34 7922
d46c5519 7923#: wt-status.c:1284
1a79b2f1
JX
7924msgid "git-rebase-todo is missing."
7925msgstr "git-rebase-todo 丢失。"
7926
d46c5519 7927#: wt-status.c:1286
a0b6b246
JX
7928msgid "No commands done."
7929msgstr "没有命令被执行。"
7930
d46c5519 7931#: wt-status.c:1289
1b7f4a34 7932#, c-format
a0b6b246
JX
7933msgid "Last command done (%d command done):"
7934msgid_plural "Last commands done (%d commands done):"
7935msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
7936msgstr[1] "最后的命令已完成(%d 条命令被执行):"
1b7f4a34 7937
d46c5519 7938#: wt-status.c:1300
1b7f4a34 7939#, c-format
a0b6b246
JX
7940msgid " (see more in file %s)"
7941msgstr " (更多参见文件 %s)"
7942
d46c5519 7943#: wt-status.c:1305
a0b6b246
JX
7944msgid "No commands remaining."
7945msgstr "未剩下任何命令。"
1b7f4a34 7946
d46c5519 7947#: wt-status.c:1308
1b7f4a34 7948#, c-format
a0b6b246
JX
7949msgid "Next command to do (%d remaining command):"
7950msgid_plural "Next commands to do (%d remaining commands):"
7951msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
7952msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
1b7f4a34 7953
a0b6b246 7954# 译者:注意保持前导空格
d46c5519 7955#: wt-status.c:1316
a0b6b246
JX
7956msgid " (use \"git rebase --edit-todo\" to view and edit)"
7957msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
1b7f4a34 7958
d46c5519 7959#: wt-status.c:1328
1b7f4a34 7960#, c-format
a0b6b246
JX
7961msgid "You are currently rebasing branch '%s' on '%s'."
7962msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1b7f4a34 7963
d46c5519 7964#: wt-status.c:1333
a0b6b246
JX
7965msgid "You are currently rebasing."
7966msgstr "您在执行变基操作。"
1b7f4a34 7967
a0b6b246 7968# 译者:注意保持前导空格
d46c5519 7969#: wt-status.c:1346
a0b6b246
JX
7970msgid " (fix conflicts and then run \"git rebase --continue\")"
7971msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1b7f4a34 7972
a0b6b246 7973# 译者:注意保持前导空格
d46c5519 7974#: wt-status.c:1348
a0b6b246
JX
7975msgid " (use \"git rebase --skip\" to skip this patch)"
7976msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
7977
7978# 译者:注意保持前导空格
d46c5519 7979#: wt-status.c:1350
a0b6b246
JX
7980msgid " (use \"git rebase --abort\" to check out the original branch)"
7981msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
7982
7983# 译者:注意保持前导空格
d46c5519 7984#: wt-status.c:1357
a0b6b246
JX
7985msgid " (all conflicts fixed: run \"git rebase --continue\")"
7986msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1b7f4a34 7987
d46c5519 7988#: wt-status.c:1361
a0b6b246 7989#, c-format
1b7f4a34 7990msgid ""
a0b6b246
JX
7991"You are currently splitting a commit while rebasing branch '%s' on '%s'."
7992msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1b7f4a34 7993
d46c5519 7994#: wt-status.c:1366
a0b6b246
JX
7995msgid "You are currently splitting a commit during a rebase."
7996msgstr "您在执行变基操作时拆分提交。"
1b7f4a34 7997
a0b6b246 7998# 译者:注意保持前导空格
d46c5519 7999#: wt-status.c:1369
a0b6b246
JX
8000msgid " (Once your working directory is clean, run \"git rebase --continue\")"
8001msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1b7f4a34 8002
d46c5519 8003#: wt-status.c:1373
a0b6b246
JX
8004#, c-format
8005msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
8006msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1b7f4a34 8007
d46c5519 8008#: wt-status.c:1378
a0b6b246
JX
8009msgid "You are currently editing a commit during a rebase."
8010msgstr "您在执行变基操作时编辑提交。"
1b7f4a34 8011
a0b6b246 8012# 译者:注意保持前导空格
d46c5519 8013#: wt-status.c:1381
a0b6b246
JX
8014msgid " (use \"git commit --amend\" to amend the current commit)"
8015msgstr " (使用 \"git commit --amend\" 修补当前提交)"
8016
8017# 译者:注意保持前导空格
d46c5519 8018#: wt-status.c:1383
a0b6b246
JX
8019msgid ""
8020" (use \"git rebase --continue\" once you are satisfied with your changes)"
8021msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1b7f4a34 8022
d46c5519
JX
8023#: wt-status.c:1394
8024msgid "Cherry-pick currently in progress."
8025msgstr "拣选操作正在进行中。"
8026
8027#: wt-status.c:1397
1b7f4a34 8028#, c-format
a0b6b246
JX
8029msgid "You are currently cherry-picking commit %s."
8030msgstr "您在执行拣选提交 %s 的操作。"
1b7f4a34 8031
a0b6b246 8032# 译者:注意保持前导空格
d46c5519 8033#: wt-status.c:1404
a0b6b246
JX
8034msgid " (fix conflicts and run \"git cherry-pick --continue\")"
8035msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1b7f4a34 8036
a0b6b246 8037# 译者:注意保持前导空格
d46c5519
JX
8038#: wt-status.c:1407
8039msgid " (run \"git cherry-pick --continue\" to continue)"
8040msgstr " (执行 \"git cherry-pick --continue\" 以继续)"
8041
8042# 译者:注意保持前导空格
8043#: wt-status.c:1410
a0b6b246
JX
8044msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
8045msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1b7f4a34 8046
a0b6b246 8047# 译者:注意保持前导空格
d46c5519 8048#: wt-status.c:1412
a0b6b246
JX
8049msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
8050msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1b7f4a34 8051
d46c5519
JX
8052#: wt-status.c:1422
8053msgid "Revert currently in progress."
8054msgstr "还原操作正在行中。"
8055
8056#: wt-status.c:1425
1b7f4a34 8057#, c-format
a0b6b246
JX
8058msgid "You are currently reverting commit %s."
8059msgstr "您在执行反转提交 %s 的操作。"
1b7f4a34 8060
a0b6b246 8061# 译者:注意保持前导空格
d46c5519 8062#: wt-status.c:1431
a0b6b246
JX
8063msgid " (fix conflicts and run \"git revert --continue\")"
8064msgstr " (解决冲突并运行 \"git revert --continue\")"
1b7f4a34 8065
a0b6b246 8066# 译者:注意保持前导空格
d46c5519
JX
8067#: wt-status.c:1434
8068msgid " (run \"git revert --continue\" to continue)"
8069msgstr " (运行 \"git revert --continue\" 以继续)"
8070
8071# 译者:注意保持前导空格
8072#: wt-status.c:1437
a0b6b246
JX
8073msgid " (all conflicts fixed: run \"git revert --continue\")"
8074msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1b7f4a34 8075
a0b6b246 8076# 译者:注意保持前导空格
d46c5519 8077#: wt-status.c:1439
a0b6b246
JX
8078msgid " (use \"git revert --abort\" to cancel the revert operation)"
8079msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1b7f4a34 8080
d46c5519 8081#: wt-status.c:1449
1b7f4a34 8082#, c-format
a0b6b246
JX
8083msgid "You are currently bisecting, started from branch '%s'."
8084msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1b7f4a34 8085
d46c5519 8086#: wt-status.c:1453
a0b6b246
JX
8087msgid "You are currently bisecting."
8088msgstr "您在执行二分查找操作。"
1b7f4a34 8089
a0b6b246 8090# 译者:注意保持前导空格
d46c5519 8091#: wt-status.c:1456
a0b6b246
JX
8092msgid " (use \"git bisect reset\" to get back to the original branch)"
8093msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1b7f4a34 8094
d46c5519 8095#: wt-status.c:1665
a0b6b246
JX
8096msgid "On branch "
8097msgstr "位于分支 "
1b7f4a34 8098
d46c5519 8099#: wt-status.c:1672
a0b6b246
JX
8100msgid "interactive rebase in progress; onto "
8101msgstr "交互式变基操作正在进行中;至 "
1b7f4a34 8102
d46c5519 8103#: wt-status.c:1674
a0b6b246
JX
8104msgid "rebase in progress; onto "
8105msgstr "变基操作正在进行中;至 "
1b7f4a34 8106
d46c5519 8107#: wt-status.c:1679
a0b6b246
JX
8108msgid "HEAD detached at "
8109msgstr "头指针分离于 "
1b7f4a34 8110
d46c5519 8111#: wt-status.c:1681
a0b6b246
JX
8112msgid "HEAD detached from "
8113msgstr "头指针分离自 "
1b7f4a34 8114
d46c5519 8115#: wt-status.c:1684
a0b6b246
JX
8116msgid "Not currently on any branch."
8117msgstr "当前不在任何分支上。"
1b7f4a34 8118
d46c5519 8119#: wt-status.c:1701
a0b6b246
JX
8120msgid "Initial commit"
8121msgstr "初始提交"
1b7f4a34 8122
d46c5519 8123#: wt-status.c:1702
a4f16749
JX
8124msgid "No commits yet"
8125msgstr "尚无提交"
8126
d46c5519 8127#: wt-status.c:1716
a0b6b246
JX
8128msgid "Untracked files"
8129msgstr "未跟踪的文件"
1b7f4a34 8130
d46c5519 8131#: wt-status.c:1718
a0b6b246
JX
8132msgid "Ignored files"
8133msgstr "忽略的文件"
1b7f4a34 8134
d46c5519 8135#: wt-status.c:1722
a0b6b246
JX
8136#, c-format
8137msgid ""
8138"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
8139"may speed it up, but you have to be careful not to forget to add\n"
8140"new files yourself (see 'git help status')."
8141msgstr ""
8142"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
8143"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1b7f4a34 8144
d46c5519 8145#: wt-status.c:1728
a0b6b246
JX
8146#, c-format
8147msgid "Untracked files not listed%s"
8148msgstr "未跟踪的文件没有列出%s"
1b7f4a34 8149
a0b6b246 8150# 译者:中文字符串拼接,可删除前导空格
d46c5519 8151#: wt-status.c:1730
a0b6b246
JX
8152msgid " (use -u option to show untracked files)"
8153msgstr "(使用 -u 参数显示未跟踪的文件)"
1b7f4a34 8154
d46c5519 8155#: wt-status.c:1736
a0b6b246
JX
8156msgid "No changes"
8157msgstr "没有修改"
1b7f4a34 8158
d46c5519 8159#: wt-status.c:1741
a0b6b246
JX
8160#, c-format
8161msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
8162msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1b7f4a34 8163
d46c5519 8164#: wt-status.c:1744
a0b6b246
JX
8165#, c-format
8166msgid "no changes added to commit\n"
8167msgstr "修改尚未加入提交\n"
1b7f4a34 8168
d46c5519 8169#: wt-status.c:1747
a0b6b246
JX
8170#, c-format
8171msgid ""
8172"nothing added to commit but untracked files present (use \"git add\" to "
8173"track)\n"
8174msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1b7f4a34 8175
d46c5519 8176#: wt-status.c:1750
a0b6b246
JX
8177#, c-format
8178msgid "nothing added to commit but untracked files present\n"
8179msgstr "提交为空,但是存在尚未跟踪的文件\n"
1b7f4a34 8180
a0b6b246 8181# 译者:中文字符串拼接,可删除前导空格
d46c5519 8182#: wt-status.c:1753
a0b6b246
JX
8183#, c-format
8184msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
8185msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1b7f4a34 8186
d46c5519 8187#: wt-status.c:1756 wt-status.c:1761
a0b6b246
JX
8188#, c-format
8189msgid "nothing to commit\n"
8190msgstr "无文件要提交\n"
1b7f4a34 8191
a0b6b246 8192# 译者:中文字符串拼接,可删除前导空格
d46c5519 8193#: wt-status.c:1759
a0b6b246
JX
8194#, c-format
8195msgid "nothing to commit (use -u to show untracked files)\n"
8196msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1b7f4a34 8197
a0b6b246 8198# 译者:中文字符串拼接,可删除前导空格
d46c5519 8199#: wt-status.c:1763
a0b6b246
JX
8200#, c-format
8201msgid "nothing to commit, working tree clean\n"
8202msgstr "无文件要提交,干净的工作区\n"
8203
d46c5519 8204#: wt-status.c:1876
a4f16749
JX
8205msgid "No commits yet on "
8206msgstr "尚无提交在 "
1b7f4a34 8207
d46c5519 8208#: wt-status.c:1880
a0b6b246
JX
8209msgid "HEAD (no branch)"
8210msgstr "HEAD(非分支)"
1b7f4a34 8211
d46c5519 8212#: wt-status.c:1911
31e5e17b
JX
8213msgid "different"
8214msgstr "不同"
8215
a0b6b246 8216# 译者:注意保持句尾空格
d46c5519 8217#: wt-status.c:1913 wt-status.c:1921
a0b6b246
JX
8218msgid "behind "
8219msgstr "落后 "
1b7f4a34 8220
d46c5519 8221#: wt-status.c:1916 wt-status.c:1919
a0b6b246
JX
8222msgid "ahead "
8223msgstr "领先 "
1b7f4a34 8224
a0b6b246 8225#. TRANSLATORS: the action is e.g. "pull with rebase"
d46c5519 8226#: wt-status.c:2443
a0b6b246
JX
8227#, c-format
8228msgid "cannot %s: You have unstaged changes."
8229msgstr "不能%s:您有未暂存的变更。"
1b7f4a34 8230
d46c5519 8231#: wt-status.c:2449
a0b6b246 8232msgid "additionally, your index contains uncommitted changes."
29004bbb 8233msgstr "另外,您的索引中包含未提交的变更。"
1b7f4a34 8234
d46c5519 8235#: wt-status.c:2451
a0b6b246
JX
8236#, c-format
8237msgid "cannot %s: Your index contains uncommitted changes."
8238msgstr "不能%s:您的索引中包含未提交的变更。"
1b7f4a34 8239
06991777 8240#: builtin/add.c:25
a0b6b246
JX
8241msgid "git add [<options>] [--] <pathspec>..."
8242msgstr "git add [<选项>] [--] <路径规格>..."
1b7f4a34 8243
06991777 8244#: builtin/add.c:84
a0b6b246
JX
8245#, c-format
8246msgid "unexpected diff status %c"
8247msgstr "意外的差异状态 %c"
1b7f4a34 8248
06991777 8249#: builtin/add.c:89 builtin/commit.c:285
a0b6b246
JX
8250msgid "updating files failed"
8251msgstr "更新文件失败"
1b7f4a34 8252
06991777 8253#: builtin/add.c:99
a0b6b246
JX
8254#, c-format
8255msgid "remove '%s'\n"
8256msgstr "删除 '%s'\n"
1b7f4a34 8257
06991777 8258#: builtin/add.c:174
a0b6b246
JX
8259msgid "Unstaged changes after refreshing the index:"
8260msgstr "刷新索引之后尚未被暂存的变更:"
1b7f4a34 8261
06991777 8262#: builtin/add.c:234 builtin/rev-parse.c:896
a0b6b246
JX
8263msgid "Could not read the index"
8264msgstr "不能读取索引"
1b7f4a34 8265
06991777 8266#: builtin/add.c:245
a0b6b246
JX
8267#, c-format
8268msgid "Could not open '%s' for writing."
c1ac5258 8269msgstr "无法为写入打开 '%s'。"
1b7f4a34 8270
06991777 8271#: builtin/add.c:249
a0b6b246
JX
8272msgid "Could not write patch"
8273msgstr "不能生成补丁"
1b7f4a34 8274
06991777 8275#: builtin/add.c:252
a0b6b246
JX
8276msgid "editing patch failed"
8277msgstr "编辑补丁失败"
1b7f4a34 8278
06991777 8279#: builtin/add.c:255
1b7f4a34 8280#, c-format
a0b6b246 8281msgid "Could not stat '%s'"
65e2041e 8282msgstr "不能对 '%s' 调用 stat"
1b7f4a34 8283
06991777 8284#: builtin/add.c:257
a0b6b246
JX
8285msgid "Empty patch. Aborted."
8286msgstr "空补丁。异常终止。"
1b7f4a34 8287
06991777 8288#: builtin/add.c:262
a0b6b246
JX
8289#, c-format
8290msgid "Could not apply '%s'"
8291msgstr "不能应用 '%s'"
1b7f4a34 8292
06991777 8293#: builtin/add.c:270
a0b6b246
JX
8294msgid "The following paths are ignored by one of your .gitignore files:\n"
8295msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 8296
06991777 8297#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
d46c5519 8298#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560
06991777 8299#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
a0b6b246
JX
8300msgid "dry run"
8301msgstr "演习"
8ada9598 8302
06991777 8303#: builtin/add.c:293
a0b6b246
JX
8304msgid "interactive picking"
8305msgstr "交互式拣选"
8ada9598 8306
d46c5519 8307#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306
a0b6b246
JX
8308msgid "select hunks interactively"
8309msgstr "交互式挑选数据块"
8ada9598 8310
06991777 8311#: builtin/add.c:295
a0b6b246
JX
8312msgid "edit current diff and apply"
8313msgstr "编辑当前差异并应用"
8ada9598 8314
06991777 8315#: builtin/add.c:296
a0b6b246
JX
8316msgid "allow adding otherwise ignored files"
8317msgstr "允许添加忽略的文件"
8ada9598 8318
06991777 8319#: builtin/add.c:297
a0b6b246
JX
8320msgid "update tracked files"
8321msgstr "更新已跟踪的文件"
8ada9598 8322
06991777 8323#: builtin/add.c:298
5809aa05
JX
8324msgid "renormalize EOL of tracked files (implies -u)"
8325msgstr "对已跟踪文件(暗含 -u)重新归一换行符"
8326
06991777 8327#: builtin/add.c:299
a0b6b246
JX
8328msgid "record only the fact that the path will be added later"
8329msgstr "只记录,该路径稍后再添加"
8ada9598 8330
06991777 8331#: builtin/add.c:300
a0b6b246
JX
8332msgid "add changes from all tracked and untracked files"
8333msgstr "添加所有改变的已跟踪文件和未跟踪文件"
8ada9598 8334
06991777 8335#: builtin/add.c:303
a0b6b246
JX
8336msgid "ignore paths removed in the working tree (same as --no-all)"
8337msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
8ada9598 8338
06991777 8339#: builtin/add.c:305
a0b6b246
JX
8340msgid "don't add, only refresh the index"
8341msgstr "不添加,只刷新索引"
8ada9598 8342
06991777 8343#: builtin/add.c:306
a0b6b246
JX
8344msgid "just skip files which cannot be added because of errors"
8345msgstr "跳过因出错不能添加的文件"
8ada9598 8346
06991777 8347#: builtin/add.c:307
a0b6b246
JX
8348msgid "check if - even missing - files are ignored in dry run"
8349msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
8ada9598 8350
d46c5519 8351#: builtin/add.c:309 builtin/update-index.c:1001
a0b6b246
JX
8352msgid "override the executable bit of the listed files"
8353msgstr "覆盖列表里文件的可执行位"
8ada9598 8354
06991777 8355#: builtin/add.c:311
a4f16749
JX
8356msgid "warn when adding an embedded repository"
8357msgstr "创建一个嵌入式仓库时给予警告"
8358
06991777 8359#: builtin/add.c:326
a4f16749
JX
8360#, c-format
8361msgid ""
8362"You've added another git repository inside your current repository.\n"
8363"Clones of the outer repository will not contain the contents of\n"
8364"the embedded repository and will not know how to obtain it.\n"
8365"If you meant to add a submodule, use:\n"
8366"\n"
8367"\tgit submodule add <url> %s\n"
8368"\n"
8369"If you added this path by mistake, you can remove it from the\n"
8370"index with:\n"
8371"\n"
8372"\tgit rm --cached %s\n"
8373"\n"
8374"See \"git help submodule\" for more information."
8375msgstr ""
6937cb4e
JX
8376"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容,并"
8377"且不知道该如何获取它。\n"
a4f16749
JX
8378"如果您要添加一个子模组,使用:\n"
8379"\n"
8380"\tgit submodule add <url> %s\n"
8381"\n"
8382"如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n"
8383"\n"
8384"\tgit rm --cached %s\n"
8385"\n"
8386"参见 \"git help submodule\" 获取更多信息。"
8387
06991777 8388#: builtin/add.c:354
a4f16749
JX
8389#, c-format
8390msgid "adding embedded git repository: %s"
8391msgstr "正在添加嵌入式 git 仓库:%s"
8392
06991777 8393#: builtin/add.c:372
8ada9598 8394#, c-format
a0b6b246
JX
8395msgid "Use -f if you really want to add them.\n"
8396msgstr "使用 -f 参数如果您确实要添加它们。\n"
8ada9598 8397
d46c5519 8398#: builtin/add.c:379
a0b6b246
JX
8399msgid "adding files failed"
8400msgstr "添加文件失败"
8ada9598 8401
d46c5519 8402#: builtin/add.c:419
a0b6b246
JX
8403msgid "-A and -u are mutually incompatible"
8404msgstr "-A 和 -u 选项互斥"
8ada9598 8405
d46c5519 8406#: builtin/add.c:426
a0b6b246
JX
8407msgid "Option --ignore-missing can only be used together with --dry-run"
8408msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 8409
d46c5519 8410#: builtin/add.c:430
8ada9598 8411#, c-format
a0b6b246
JX
8412msgid "--chmod param '%s' must be either -x or +x"
8413msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
8ada9598 8414
d46c5519 8415#: builtin/add.c:445
8ada9598 8416#, c-format
a0b6b246
JX
8417msgid "Nothing specified, nothing added.\n"
8418msgstr "没有指定文件,也没有文件被添加。\n"
8ada9598 8419
d46c5519 8420#: builtin/add.c:446
8ada9598 8421#, c-format
a0b6b246
JX
8422msgid "Maybe you wanted to say 'git add .'?\n"
8423msgstr "也许您想要执行 'git add .'?\n"
8ada9598 8424
06991777 8425#: builtin/am.c:348
a0b6b246
JX
8426msgid "could not parse author script"
8427msgstr "不能解析作者脚本"
8ada9598 8428
06991777 8429#: builtin/am.c:432
81809b99 8430#, c-format
a0b6b246
JX
8431msgid "'%s' was deleted by the applypatch-msg hook"
8432msgstr "'%s' 被 applypatch-msg 钩子删除"
8ada9598 8433
d46c5519 8434#: builtin/am.c:474
8ada9598 8435#, c-format
a0b6b246
JX
8436msgid "Malformed input line: '%s'."
8437msgstr "非法的输入行:'%s'。"
8ada9598 8438
d46c5519 8439#: builtin/am.c:512
8ada9598 8440#, c-format
a0b6b246
JX
8441msgid "Failed to copy notes from '%s' to '%s'"
8442msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
8ada9598 8443
d46c5519 8444#: builtin/am.c:538
a0b6b246
JX
8445msgid "fseek failed"
8446msgstr "fseek 失败"
8ada9598 8447
d46c5519 8448#: builtin/am.c:726
8ada9598 8449#, c-format
a0b6b246
JX
8450msgid "could not parse patch '%s'"
8451msgstr "无法解析补丁 '%s'"
8ada9598 8452
d46c5519 8453#: builtin/am.c:791
a0b6b246
JX
8454msgid "Only one StGIT patch series can be applied at once"
8455msgstr "一次只能有一个 StGIT 补丁队列被应用"
8456
d46c5519 8457#: builtin/am.c:839
a0b6b246
JX
8458msgid "invalid timestamp"
8459msgstr "无效的时间戳"
8460
d46c5519 8461#: builtin/am.c:844 builtin/am.c:856
a0b6b246
JX
8462msgid "invalid Date line"
8463msgstr "无效的日期行"
8ada9598 8464
d46c5519 8465#: builtin/am.c:851
a0b6b246
JX
8466msgid "invalid timezone offset"
8467msgstr "无效的时区偏移值"
8ada9598 8468
d46c5519 8469#: builtin/am.c:944
a0b6b246 8470msgid "Patch format detection failed."
87cb7997 8471msgstr "补丁格式探测失败。"
8ada9598 8472
d46c5519 8473#: builtin/am.c:949 builtin/clone.c:409
8ada9598 8474#, c-format
a0b6b246 8475msgid "failed to create directory '%s'"
c1ac5258 8476msgstr "创建目录 '%s' 失败"
8ada9598 8477
d46c5519 8478#: builtin/am.c:954
a0b6b246 8479msgid "Failed to split patches."
c1ac5258 8480msgstr "拆分补丁失败。"
814ff314 8481
d46c5519 8482#: builtin/am.c:1084 builtin/commit.c:371
a0b6b246
JX
8483msgid "unable to write index file"
8484msgstr "无法写入索引文件"
8ada9598 8485
d46c5519 8486#: builtin/am.c:1098
8ada9598 8487#, c-format
a0b6b246
JX
8488msgid "When you have resolved this problem, run \"%s --continue\"."
8489msgstr "当您解决这一问题,执行 \"%s --continue\"。"
8ada9598 8490
d46c5519 8491#: builtin/am.c:1099
81809b99 8492#, c-format
a0b6b246
JX
8493msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
8494msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
8ada9598 8495
d46c5519 8496#: builtin/am.c:1100
81809b99 8497#, c-format
a0b6b246
JX
8498msgid "To restore the original branch and stop patching, run \"%s --abort\"."
8499msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
8ada9598 8500
d46c5519 8501#: builtin/am.c:1183
4c27fcb5
JX
8502msgid "Patch sent with format=flowed; space at the end of lines might be lost."
8503msgstr "补丁使用 format=flowed 格式发送,行尾的空格可能会丢失。"
8504
d46c5519 8505#: builtin/am.c:1211
a4f16749
JX
8506msgid "Patch is empty."
8507msgstr "补丁为空。"
23ff3338 8508
d46c5519 8509#: builtin/am.c:1277
8ada9598 8510#, c-format
a4f16749
JX
8511msgid "invalid ident line: %.*s"
8512msgstr "无效的身份标识:%.*s"
8ada9598 8513
d46c5519 8514#: builtin/am.c:1299
8ada9598 8515#, c-format
a0b6b246
JX
8516msgid "unable to parse commit %s"
8517msgstr "不能解析提交 %s"
8ada9598 8518
d46c5519 8519#: builtin/am.c:1495
a0b6b246
JX
8520msgid "Repository lacks necessary blobs to fall back on 3-way merge."
8521msgstr "仓库缺乏必要的数据对象以进行三方合并。"
814ff314 8522
d46c5519 8523#: builtin/am.c:1497
a0b6b246
JX
8524msgid "Using index info to reconstruct a base tree..."
8525msgstr "使用索引来重建一个(三方合并的)基础目录树..."
8ada9598 8526
d46c5519 8527#: builtin/am.c:1516
a0b6b246
JX
8528msgid ""
8529"Did you hand edit your patch?\n"
8530"It does not apply to blobs recorded in its index."
8531msgstr ""
8532"您是否曾手动编辑过您的补丁?\n"
8533"无法应用补丁到索引中的数据对象上。"
23ff3338 8534
d46c5519 8535#: builtin/am.c:1522
a0b6b246
JX
8536msgid "Falling back to patching base and 3-way merge..."
8537msgstr "回落到基础版本上打补丁及进行三方合并..."
8ada9598 8538
d46c5519 8539#: builtin/am.c:1548
a0b6b246
JX
8540msgid "Failed to merge in the changes."
8541msgstr "无法合并变更。"
d691f479 8542
d46c5519 8543#: builtin/am.c:1580
a0b6b246
JX
8544msgid "applying to an empty history"
8545msgstr "正应用到一个空历史上"
8ada9598 8546
d46c5519 8547#: builtin/am.c:1627 builtin/am.c:1631
8ada9598 8548#, c-format
a0b6b246
JX
8549msgid "cannot resume: %s does not exist."
8550msgstr "无法继续:%s 不存在。"
8ada9598 8551
d46c5519 8552#: builtin/am.c:1647
a0b6b246
JX
8553msgid "cannot be interactive without stdin connected to a terminal."
8554msgstr "标准输入没有和终端关联,不能进行交互式操作。"
8ada9598 8555
d46c5519 8556#: builtin/am.c:1652
a0b6b246
JX
8557msgid "Commit Body is:"
8558msgstr "提交内容为:"
8ada9598 8559
a0b6b246
JX
8560# 译者:注意保持句尾空格
8561#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
8562#. in your translation. The program will only accept English
8563#. input at this point.
8564#.
d46c5519 8565#: builtin/am.c:1662
a0b6b246
JX
8566msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
8567msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
8ada9598 8568
d46c5519 8569#: builtin/am.c:1712
8ada9598 8570#, c-format
a0b6b246
JX
8571msgid "Dirty index: cannot apply patches (dirty: %s)"
8572msgstr "脏索引:不能应用补丁(脏文件:%s)"
8ada9598 8573
d46c5519 8574#: builtin/am.c:1752 builtin/am.c:1820
81809b99 8575#, c-format
a0b6b246
JX
8576msgid "Applying: %.*s"
8577msgstr "应用:%.*s"
8ada9598 8578
d46c5519 8579#: builtin/am.c:1769
a0b6b246
JX
8580msgid "No changes -- Patch already applied."
8581msgstr "没有变更 —— 补丁已经应用过。"
8ada9598 8582
d46c5519 8583#: builtin/am.c:1775
81809b99 8584#, c-format
a0b6b246
JX
8585msgid "Patch failed at %s %.*s"
8586msgstr "打补丁失败于 %s %.*s"
8ada9598 8587
d46c5519 8588#: builtin/am.c:1779
31e5e17b
JX
8589msgid "Use 'git am --show-current-patch' to see the failed patch"
8590msgstr "用 'git am --show-current-patch' 命令查看失败的补丁"
8ada9598 8591
d46c5519 8592#: builtin/am.c:1823
a0b6b246
JX
8593msgid ""
8594"No changes - did you forget to use 'git add'?\n"
8595"If there is nothing left to stage, chances are that something else\n"
8596"already introduced the same changes; you might want to skip this patch."
8597msgstr ""
8598"没有变更 —— 您是不是忘了执行 'git add'?\n"
8599"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
8600"您也许想要跳过这个补丁。"
8ada9598 8601
d46c5519 8602#: builtin/am.c:1830
a0b6b246
JX
8603msgid ""
8604"You still have unmerged paths in your index.\n"
a4f16749
JX
8605"You should 'git add' each file with resolved conflicts to mark them as "
8606"such.\n"
8607"You might run `git rm` on a file to accept \"deleted by them\" for it."
a0b6b246 8608msgstr ""
a4f16749
JX
8609"在您的索引中仍存在未合并的路径。\n"
8610"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
8611"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
8ada9598 8612
d46c5519 8613#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329
06991777 8614#: builtin/reset.c:337
8ada9598 8615#, c-format
a0b6b246
JX
8616msgid "Could not parse object '%s'."
8617msgstr "不能解析对象 '%s'。"
8ada9598 8618
d46c5519 8619#: builtin/am.c:1989
a0b6b246 8620msgid "failed to clean index"
c1ac5258 8621msgstr "清空索引失败"
5b04ee3b 8622
d46c5519 8623#: builtin/am.c:2033
a0b6b246
JX
8624msgid ""
8625"You seem to have moved HEAD since the last 'am' failure.\n"
8626"Not rewinding to ORIG_HEAD"
8627msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
8ada9598 8628
d46c5519 8629#: builtin/am.c:2130
8ada9598 8630#, c-format
a0b6b246
JX
8631msgid "Invalid value for --patch-format: %s"
8632msgstr "无效的 --patch-format 值:%s"
8ada9598 8633
d46c5519 8634#: builtin/am.c:2166
a0b6b246
JX
8635msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
8636msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
5b04ee3b 8637
d46c5519 8638#: builtin/am.c:2167
a0b6b246
JX
8639msgid "git am [<options>] (--continue | --skip | --abort)"
8640msgstr "git am [<选项>] (--continue | --skip | --abort)"
8ada9598 8641
d46c5519 8642#: builtin/am.c:2173
a0b6b246
JX
8643msgid "run interactively"
8644msgstr "以交互式方式运行"
8ada9598 8645
d46c5519 8646#: builtin/am.c:2175
a0b6b246
JX
8647msgid "historical option -- no-op"
8648msgstr "老的参数 —— 无作用"
8ada9598 8649
d46c5519 8650#: builtin/am.c:2177
a0b6b246
JX
8651msgid "allow fall back on 3way merging if needed"
8652msgstr "如果必要,允许使用三方合并。"
8ada9598 8653
d46c5519
JX
8654#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58
8655#: builtin/repack.c:306 builtin/stash.c:805
a0b6b246
JX
8656msgid "be quiet"
8657msgstr "静默模式"
8ada9598 8658
d46c5519 8659#: builtin/am.c:2180
a0b6b246
JX
8660msgid "add a Signed-off-by line to the commit message"
8661msgstr "在提交说明中添加一个 Signed-off-by 签名"
5c57d762 8662
d46c5519 8663#: builtin/am.c:2183
a0b6b246
JX
8664msgid "recode into utf8 (default)"
8665msgstr "使用 utf8 字符集(默认)"
5c57d762 8666
d46c5519 8667#: builtin/am.c:2185
a0b6b246
JX
8668msgid "pass -k flag to git-mailinfo"
8669msgstr "向 git-mailinfo 传递 -k 参数"
5c57d762 8670
d46c5519 8671#: builtin/am.c:2187
a0b6b246
JX
8672msgid "pass -b flag to git-mailinfo"
8673msgstr "向 git-mailinfo 传递 -b 参数"
5c57d762 8674
d46c5519 8675#: builtin/am.c:2189
a0b6b246
JX
8676msgid "pass -m flag to git-mailinfo"
8677msgstr "向 git-mailinfo 传递 -m 参数"
5c57d762 8678
d46c5519 8679#: builtin/am.c:2191
a0b6b246
JX
8680msgid "pass --keep-cr flag to git-mailsplit for mbox format"
8681msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
5c57d762 8682
d46c5519 8683#: builtin/am.c:2194
a0b6b246
JX
8684msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
8685msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
8ada9598 8686
d46c5519 8687#: builtin/am.c:2197
a0b6b246
JX
8688msgid "strip everything before a scissors line"
8689msgstr "丢弃裁切线前的所有内容"
8ada9598 8690
d46c5519
JX
8691#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208
8692#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220
8693#: builtin/am.c:2226
a0b6b246
JX
8694msgid "pass it through git-apply"
8695msgstr "传递给 git-apply"
8ada9598 8696
d46c5519
JX
8697#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671
8698#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247
8699#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412
4c27fcb5 8700#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
d46c5519
JX
8701#: builtin/show-branch.c:651 builtin/show-ref.c:172 builtin/tag.c:397
8702#: parse-options.h:141 parse-options.h:162 parse-options.h:311
a0b6b246
JX
8703msgid "n"
8704msgstr "n"
8ada9598 8705
d46c5519
JX
8706#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38
8707#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39
a0b6b246
JX
8708msgid "format"
8709msgstr "格式"
8ada9598 8710
d46c5519 8711#: builtin/am.c:2223
a0b6b246
JX
8712msgid "format the patch(es) are in"
8713msgstr "补丁的格式"
8ada9598 8714
d46c5519 8715#: builtin/am.c:2229
a0b6b246
JX
8716msgid "override error message when patch failure occurs"
8717msgstr "打补丁失败时显示的错误信息"
8ada9598 8718
d46c5519 8719#: builtin/am.c:2231
a0b6b246
JX
8720msgid "continue applying patches after resolving a conflict"
8721msgstr "冲突解决后继续应用补丁"
814ff314 8722
d46c5519 8723#: builtin/am.c:2234
a0b6b246
JX
8724msgid "synonyms for --continue"
8725msgstr "和 --continue 同义"
8ada9598 8726
d46c5519 8727#: builtin/am.c:2237
a0b6b246
JX
8728msgid "skip the current patch"
8729msgstr "跳过当前补丁"
23ff3338 8730
d46c5519 8731#: builtin/am.c:2240
a0b6b246
JX
8732msgid "restore the original branch and abort the patching operation."
8733msgstr "恢复原始分支并终止打补丁操作。"
8ada9598 8734
d46c5519 8735#: builtin/am.c:2243
31e5e17b
JX
8736msgid "abort the patching operation but keep HEAD where it is."
8737msgstr "终止补丁操作但保持 HEAD 不变。"
8738
d46c5519 8739#: builtin/am.c:2246
31e5e17b
JX
8740msgid "show the patch being applied."
8741msgstr "显示正在应用的补丁。"
8742
d46c5519 8743#: builtin/am.c:2250
a0b6b246
JX
8744msgid "lie about committer date"
8745msgstr "将作者日期作为提交日期"
8ada9598 8746
d46c5519 8747#: builtin/am.c:2252
a0b6b246
JX
8748msgid "use current timestamp for author date"
8749msgstr "用当前时间作为作者日期"
8ada9598 8750
d46c5519
JX
8751#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491
8752#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489
8753#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412
a0b6b246
JX
8754msgid "key-id"
8755msgstr "key-id"
8ada9598 8756
d46c5519 8757#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454
a0b6b246
JX
8758msgid "GPG-sign commits"
8759msgstr "使用 GPG 签名提交"
8ada9598 8760
d46c5519 8761#: builtin/am.c:2258
a0b6b246
JX
8762msgid "(internal use for git-rebase)"
8763msgstr "(内部使用,用于 git-rebase)"
8ada9598 8764
d46c5519 8765#: builtin/am.c:2276
a0b6b246
JX
8766msgid ""
8767"The -b/--binary option has been a no-op for long time, and\n"
8768"it will be removed. Please do not use it anymore."
8769msgstr ""
8770"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
8771"请不要再使用它了。"
8ada9598 8772
d46c5519 8773#: builtin/am.c:2283
a0b6b246 8774msgid "failed to read the index"
c1ac5258 8775msgstr "读取索引失败"
8ada9598 8776
d46c5519 8777#: builtin/am.c:2298
a0b6b246
JX
8778#, c-format
8779msgid "previous rebase directory %s still exists but mbox given."
8780msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
8ada9598 8781
d46c5519 8782#: builtin/am.c:2322
a0b6b246
JX
8783#, c-format
8784msgid ""
8785"Stray %s directory found.\n"
8786"Use \"git am --abort\" to remove it."
8787msgstr ""
8788"发现了错误的 %s 目录。\n"
8789"使用 \"git am --abort\" 删除它。"
c04f5ac3 8790
d46c5519 8791#: builtin/am.c:2328
a0b6b246
JX
8792msgid "Resolve operation not in progress, we are not resuming."
8793msgstr "解决操作未进行,我们不会继续。"
c04f5ac3 8794
a0b6b246
JX
8795#: builtin/apply.c:8
8796msgid "git apply [<options>] [<patch>...]"
8797msgstr "git apply [<选项>] [<补丁>...]"
c04f5ac3 8798
c04f5ac3
JX
8799#: builtin/archive.c:17
8800#, c-format
8801msgid "could not create archive file '%s'"
90e6ef53 8802msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
8803
8804#: builtin/archive.c:20
8805msgid "could not redirect output"
195febda 8806msgstr "不能重定向输出"
c04f5ac3
JX
8807
8808#: builtin/archive.c:37
8809msgid "git archive: Remote with no URL"
4375c10e 8810msgstr "git archive:未提供远程 URL"
c04f5ac3 8811
06991777 8812#: builtin/archive.c:61
31e5e17b
JX
8813msgid "git archive: expected ACK/NAK, got a flush packet"
8814msgstr "git archive:期望是 ACK/NAK,却得到 flush 包"
c04f5ac3 8815
06991777 8816#: builtin/archive.c:64
c04f5ac3
JX
8817#, c-format
8818msgid "git archive: NACK %s"
90e6ef53 8819msgstr "git archive:NACK %s"
c04f5ac3 8820
06991777 8821#: builtin/archive.c:65
c04f5ac3 8822msgid "git archive: protocol error"
90e6ef53 8823msgstr "git archive:协议错误"
c04f5ac3 8824
06991777 8825#: builtin/archive.c:69
c04f5ac3 8826msgid "git archive: expected a flush"
31e5e17b 8827msgstr "git archive:应有一个 flush 包"
c04f5ac3 8828
06991777 8829#: builtin/bisect--helper.c:22
ef317cd5 8830msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 8831msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5 8832
06991777 8833#: builtin/bisect--helper.c:23
5809aa05
JX
8834msgid "git bisect--helper --write-terms <bad_term> <good_term>"
8835msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>"
8836
06991777 8837#: builtin/bisect--helper.c:24
5809aa05
JX
8838msgid "git bisect--helper --bisect-clean-state"
8839msgstr "git bisect--helper --bisect-clean-state"
8840
06991777
JX
8841#: builtin/bisect--helper.c:25
8842msgid "git bisect--helper --bisect-reset [<commit>]"
8843msgstr "git bisect--helper --bisect-reset [<提交>]"
8844
8845#: builtin/bisect--helper.c:26
8846msgid ""
8847"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
8848"<bad_term>"
8849msgstr ""
8850"git bisect--helper --bisect-write [--no-log] <状态> <版本> <好-术语> <坏-术语"
8851">"
8852
8853#: builtin/bisect--helper.c:27
8854msgid ""
8855"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
8856"<bad_term>"
8857msgstr ""
8858"git bisect--helper --bisect-check-and-set-terms <命令> <好-术语> <坏-术语>"
8859
8860#: builtin/bisect--helper.c:28
8861msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
8862msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]"
8863
8864#: builtin/bisect--helper.c:29
8865msgid ""
8866"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
8867"term-new]"
8868msgstr ""
8869"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
8870"term-new]"
8871
8872#: builtin/bisect--helper.c:30
8873msgid ""
8874"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
8875"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
8876msgstr ""
8877"git bisect--helper --bisect-start [--term-{old,good}=<术语> --term-{new,bad}"
8878"=<术语>][--no-checkout] [<坏> [<好>...]] [--] [<路径>...]"
8879
8880#: builtin/bisect--helper.c:86
5809aa05
JX
8881#, c-format
8882msgid "'%s' is not a valid term"
8883msgstr "'%s' 不是一个有效的术语"
8884
06991777 8885#: builtin/bisect--helper.c:90
5809aa05
JX
8886#, c-format
8887msgid "can't use the builtin command '%s' as a term"
8888msgstr "不能使用内置命令 '%s' 作为术语"
8889
06991777 8890#: builtin/bisect--helper.c:100
5809aa05
JX
8891#, c-format
8892msgid "can't change the meaning of the term '%s'"
8893msgstr "不能修改术语 '%s' 的含义"
8894
06991777 8895#: builtin/bisect--helper.c:111
5809aa05
JX
8896msgid "please use two different terms"
8897msgstr "请使用两个不同的术语"
8898
06991777 8899#: builtin/bisect--helper.c:118
5809aa05
JX
8900msgid "could not open the file BISECT_TERMS"
8901msgstr "不能打开文件 BISECT_TERMS"
8902
06991777
JX
8903#: builtin/bisect--helper.c:155
8904#, c-format
8905msgid "We are not bisecting.\n"
8906msgstr "我们没有在二分查找。\n"
8907
8908#: builtin/bisect--helper.c:163
8909#, c-format
8910msgid "'%s' is not a valid commit"
8911msgstr "'%s' 不是一个有效的提交"
8912
8913#: builtin/bisect--helper.c:174
8914#, c-format
8915msgid ""
8916"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
8917msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
8918
8919#: builtin/bisect--helper.c:215
8920#, c-format
8921msgid "Bad bisect_write argument: %s"
8922msgstr "坏的 bisect_write 参数:%s"
8923
8924#: builtin/bisect--helper.c:220
8925#, c-format
8926msgid "couldn't get the oid of the rev '%s'"
8927msgstr "无法获取版本 '%s' 的对象ID"
8928
8929#: builtin/bisect--helper.c:232
8930#, c-format
8931msgid "couldn't open the file '%s'"
8932msgstr "无法打开文件 '%s'"
8933
8934#: builtin/bisect--helper.c:258
8935#, c-format
8936msgid "Invalid command: you're currently in a %s/%s bisect"
8937msgstr "无效的命令:您当前正处于一个 %s/%s 二分查找中"
8938
8939#: builtin/bisect--helper.c:285
8940#, c-format
8941msgid ""
8942"You need to give me at least one %s and %s revision.\n"
8943"You can use \"git bisect %s\" and \"git bisect %s\" for that."
8944msgstr ""
8945"您需要给我至少一个 %s 和一个 %s 版本。\n"
8946"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
8947
8948#: builtin/bisect--helper.c:289
8949#, c-format
8950msgid ""
8951"You need to start by \"git bisect start\".\n"
8952"You then need to give me at least one %s and %s revision.\n"
8953"You can use \"git bisect %s\" and \"git bisect %s\" for that."
8954msgstr ""
8955"您需要执行 \"git bisect start\" 来开始。\n"
8956"然后需要提供我至少一个 %s 和一个 %s 版本。\n"
8957"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
8958
8959#: builtin/bisect--helper.c:321
8960#, c-format
8961msgid "bisecting only with a %s commit"
8962msgstr "二分查找只有一个 %s 提交"
8963
8964# 译者:注意保持句尾空格
8965#. TRANSLATORS: Make sure to include [Y] and [n] in your
8966#. translation. The program will only accept English input
8967#. at this point.
8968#.
8969#: builtin/bisect--helper.c:329
8970msgid "Are you sure [Y/n]? "
8971msgstr "您确认么[Y/n]? "
8972
8973#: builtin/bisect--helper.c:376
8974msgid "no terms defined"
8975msgstr "未定义术语"
8976
8977#: builtin/bisect--helper.c:379
8978#, c-format
8979msgid ""
8980"Your current terms are %s for the old state\n"
8981"and %s for the new state.\n"
8982msgstr "您当前针对旧状态的术语是 %s,对新状态的术语是 %s。\n"
8983
8984#: builtin/bisect--helper.c:389
8985#, c-format
8986msgid ""
8987"invalid argument %s for 'git bisect terms'.\n"
8988"Supported options are: --term-good|--term-old and --term-bad|--term-new."
8989msgstr ""
8990"命令 'git bisect terms' 的参数 %s 无效。\n"
8991"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
8992
8993#: builtin/bisect--helper.c:475
8994#, c-format
8995msgid "unrecognized option: '%s'"
8996msgstr "未识别的选项:'%s'"
8997
8998#: builtin/bisect--helper.c:479
8999#, c-format
9000msgid "'%s' does not appear to be a valid revision"
8e4e0555 9001msgstr "'%s' 看起来不是一个有效的版本"
06991777
JX
9002
9003#: builtin/bisect--helper.c:511
9004msgid "bad HEAD - I need a HEAD"
9005msgstr "坏的 HEAD - 我需要一个 HEAD"
9006
9007#: builtin/bisect--helper.c:526
9008#, c-format
9009msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
9010msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
9011
9012#: builtin/bisect--helper.c:547
9013msgid "won't bisect on cg-seek'ed tree"
9014msgstr "不会在做了 cg-seek 的树上做二分查找"
9015
9016#: builtin/bisect--helper.c:550
9017msgid "bad HEAD - strange symbolic ref"
9018msgstr "坏的 HEAD - 奇怪的符号引用"
9019
9020#: builtin/bisect--helper.c:627
ef317cd5 9021msgid "perform 'git bisect next'"
07432cef 9022msgstr "执行 'git bisect next'"
ef317cd5 9023
06991777 9024#: builtin/bisect--helper.c:629
5809aa05
JX
9025msgid "write the terms to .git/BISECT_TERMS"
9026msgstr "将术语写入 .git/BISECT_TERMS"
9027
06991777 9028#: builtin/bisect--helper.c:631
5809aa05
JX
9029msgid "cleanup the bisection state"
9030msgstr "清除二分查找状态"
9031
06991777 9032#: builtin/bisect--helper.c:633
5809aa05
JX
9033msgid "check for expected revs"
9034msgstr "检查预期的版本"
9035
06991777
JX
9036#: builtin/bisect--helper.c:635
9037msgid "reset the bisection state"
9038msgstr "清除二分查找状态"
9039
9040#: builtin/bisect--helper.c:637
9041msgid "write out the bisection state in BISECT_LOG"
9042msgstr "将二分查找的状态写入 BISECT_LOG"
9043
9044#: builtin/bisect--helper.c:639
9045msgid "check and set terms in a bisection state"
9046msgstr "在一个二分查找状态中检查和设置术语"
9047
9048#: builtin/bisect--helper.c:641
9049msgid "check whether bad or good terms exist"
9050msgstr "检查坏的或好的术语是否存在"
9051
9052#: builtin/bisect--helper.c:643
9053msgid "print out the bisect terms"
9054msgstr "打印二分查找术语"
9055
9056#: builtin/bisect--helper.c:645
9057msgid "start the bisect session"
9058msgstr "启动二分查找会话"
9059
9060#: builtin/bisect--helper.c:647
ef317cd5 9061msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 9062msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5 9063
06991777
JX
9064#: builtin/bisect--helper.c:649
9065msgid "no log for BISECT_WRITE"
9066msgstr "BISECT_WRITE 无日志"
9067
9068#: builtin/bisect--helper.c:666
5809aa05
JX
9069msgid "--write-terms requires two arguments"
9070msgstr "--write-terms 需要两个参数"
9071
06991777 9072#: builtin/bisect--helper.c:670
5809aa05 9073msgid "--bisect-clean-state requires no arguments"
8e4e0555 9074msgstr "--bisect-clean-state 不带参数"
5809aa05 9075
06991777
JX
9076#: builtin/bisect--helper.c:677
9077msgid "--bisect-reset requires either no argument or a commit"
9078msgstr "--bisect-reset 无需参数或者需要一个提交"
9079
9080#: builtin/bisect--helper.c:681
9081msgid "--bisect-write requires either 4 or 5 arguments"
9082msgstr "--bisect-write 需要 4 或 5 个参数"
9083
9084#: builtin/bisect--helper.c:687
9085msgid "--check-and-set-terms requires 3 arguments"
9086msgstr "--check-and-set-terms 需要 3 个参数"
9087
9088#: builtin/bisect--helper.c:693
9089msgid "--bisect-next-check requires 2 or 3 arguments"
9090msgstr "--bisect-next-check 需要 2 或 3 个参数"
9091
9092#: builtin/bisect--helper.c:699
9093msgid "--bisect-terms requires 0 or 1 argument"
9094msgstr "--bisect-terms 需要 0 或 1 个参数"
9095
d46c5519 9096#: builtin/blame.c:32
7aea43ff
JX
9097msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
9098msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
ef317cd5 9099
d46c5519 9100#: builtin/blame.c:37
814ff314
JX
9101msgid "<rev-opts> are documented in git-rev-list(1)"
9102msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
ef317cd5 9103
d46c5519 9104#: builtin/blame.c:407
fd8cb379
JX
9105#, c-format
9106msgid "expecting a color: %s"
9107msgstr "期望一个颜色:%s"
9108
d46c5519 9109#: builtin/blame.c:414
fd8cb379
JX
9110msgid "must end with a color"
9111msgstr "必须以一个颜色结尾"
9112
d46c5519 9113#: builtin/blame.c:701
fd8cb379
JX
9114#, c-format
9115msgid "invalid color '%s' in color.blame.repeatedLines"
9116msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
9117
d46c5519 9118#: builtin/blame.c:719
fd8cb379
JX
9119msgid "invalid value for blame.coloring"
9120msgstr "设置 blame.coloring 中的无效取值"
9121
d46c5519 9122#: builtin/blame.c:794
ef317cd5 9123msgid "Show blame entries as we find them, incrementally"
07432cef 9124msgstr "增量式地显示发现的 blame 条目"
ef317cd5 9125
d46c5519 9126#: builtin/blame.c:795
ef317cd5 9127msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 9128msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 9129
d46c5519 9130#: builtin/blame.c:796
ef317cd5 9131msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 9132msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 9133
d46c5519 9134#: builtin/blame.c:797
ef317cd5 9135msgid "Show work cost statistics"
07432cef 9136msgstr "显示命令消耗统计"
ef317cd5 9137
d46c5519 9138#: builtin/blame.c:798
276ceeaa
JX
9139msgid "Force progress reporting"
9140msgstr "强制进度显示"
9141
d46c5519 9142#: builtin/blame.c:799
ef317cd5 9143msgid "Show output score for blame entries"
07432cef 9144msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 9145
d46c5519 9146#: builtin/blame.c:800
ef317cd5 9147msgid "Show original filename (Default: auto)"
07432cef 9148msgstr "显示原始文件名(默认:自动)"
ef317cd5 9149
d46c5519 9150#: builtin/blame.c:801
ef317cd5 9151msgid "Show original linenumber (Default: off)"
07432cef 9152msgstr "显示原始的行号(默认:关闭)"
ef317cd5 9153
d46c5519 9154#: builtin/blame.c:802
ef317cd5 9155msgid "Show in a format designed for machine consumption"
07432cef 9156msgstr "显示为一个适合机器读取的格式"
ef317cd5 9157
d46c5519 9158#: builtin/blame.c:803
ef317cd5 9159msgid "Show porcelain format with per-line commit information"
07432cef 9160msgstr "为每一行显示机器适用的提交信息"
ef317cd5 9161
d46c5519 9162#: builtin/blame.c:804
ef317cd5 9163msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 9164msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 9165
d46c5519 9166#: builtin/blame.c:805
ef317cd5 9167msgid "Show raw timestamp (Default: off)"
07432cef 9168msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 9169
d46c5519 9170#: builtin/blame.c:806
ef317cd5 9171msgid "Show long commit SHA1 (Default: off)"
4375c10e 9172msgstr "显示长的 SHA1 提交号(默认:关闭)"
ef317cd5 9173
d46c5519 9174#: builtin/blame.c:807
ef317cd5 9175msgid "Suppress author name and timestamp (Default: off)"
07432cef 9176msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 9177
d46c5519 9178#: builtin/blame.c:808
ef317cd5 9179msgid "Show author email instead of name (Default: off)"
07432cef 9180msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 9181
d46c5519 9182#: builtin/blame.c:809
ef317cd5 9183msgid "Ignore whitespace differences"
07432cef 9184msgstr "忽略空白差异"
ef317cd5 9185
d46c5519 9186#: builtin/blame.c:810
fd8cb379
JX
9187msgid "color redundant metadata from previous line differently"
9188msgstr "使用颜色间隔输出与前一行不同的重复元信息"
9189
d46c5519 9190#: builtin/blame.c:811
fd8cb379
JX
9191msgid "color lines by age"
9192msgstr "依据时间着色"
9193
d46c5519 9194#: builtin/blame.c:818
1a79b2f1
JX
9195msgid "Use an experimental heuristic to improve diffs"
9196msgstr "使用一个试验性的启发式算法改进差异显示"
a0b6b246 9197
d46c5519 9198#: builtin/blame.c:820
ef317cd5 9199msgid "Spend extra cycles to find better match"
07432cef 9200msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 9201
d46c5519 9202#: builtin/blame.c:821
ef317cd5 9203msgid "Use revisions from <file> instead of calling git-rev-list"
d9d56b23 9204msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
ef317cd5 9205
d46c5519 9206#: builtin/blame.c:822
ef317cd5 9207msgid "Use <file>'s contents as the final image"
d9d56b23 9208msgstr "使用 <文件> 的内容作为最终的图片"
ef317cd5 9209
d46c5519 9210#: builtin/blame.c:823 builtin/blame.c:824
ef317cd5 9211msgid "score"
07432cef 9212msgstr "得分"
ef317cd5 9213
d46c5519 9214#: builtin/blame.c:823
ef317cd5 9215msgid "Find line copies within and across files"
07432cef 9216msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 9217
d46c5519 9218#: builtin/blame.c:824
ef317cd5 9219msgid "Find line movements within and across files"
07432cef 9220msgstr "找到文件内及跨文件的行移动"
ef317cd5 9221
d46c5519 9222#: builtin/blame.c:825
ef317cd5 9223msgid "n,m"
07432cef 9224msgstr "n,m"
ef317cd5 9225
d46c5519 9226#: builtin/blame.c:825
ef317cd5 9227msgid "Process only line range n,m, counting from 1"
07432cef 9228msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 9229
d46c5519 9230#: builtin/blame.c:876
a0b6b246
JX
9231msgid "--progress can't be used with --incremental or porcelain formats"
9232msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
9233
a4f16749
JX
9234#. TRANSLATORS: This string is used to tell us the
9235#. maximum display width for a relative timestamp in
9236#. "git blame" output. For C locale, "4 years, 11
9237#. months ago", which takes 22 places, is the longest
9238#. among various forms of relative timestamps, but
9239#. your language may need more or fewer display
9240#. columns.
9241#.
d46c5519 9242#: builtin/blame.c:927
6c94aba5
JX
9243msgid "4 years, 11 months ago"
9244msgstr "4 年 11 个月前"
9245
d46c5519 9246#: builtin/blame.c:1031
a0b6b246
JX
9247#, c-format
9248msgid "file %s has only %lu line"
9249msgid_plural "file %s has only %lu lines"
9250msgstr[0] "文件 %s 只有 %lu 行"
9251msgstr[1] "文件 %s 只有 %lu 行"
9252
d46c5519 9253#: builtin/blame.c:1077
a4f16749
JX
9254msgid "Blaming lines"
9255msgstr "追踪代码行"
9256
4c27fcb5 9257#: builtin/branch.c:29
814ff314
JX
9258msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
9259msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
ef317cd5 9260
4c27fcb5 9261#: builtin/branch.c:30
814ff314
JX
9262msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
9263msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 9264
4c27fcb5 9265#: builtin/branch.c:31
814ff314
JX
9266msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
9267msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
ef317cd5 9268
4c27fcb5 9269#: builtin/branch.c:32
814ff314
JX
9270msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
9271msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 9272
4c27fcb5 9273#: builtin/branch.c:33
6937cb4e
JX
9274msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
9275msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
9276
4c27fcb5 9277#: builtin/branch.c:34
94550ed3
JX
9278msgid "git branch [<options>] [-r | -a] [--points-at]"
9279msgstr "git branch [<选项>] [-r | -a] [--points-at]"
9280
4c27fcb5 9281#: builtin/branch.c:35
87cb7997
JX
9282msgid "git branch [<options>] [-r | -a] [--format]"
9283msgstr "git branch [<选项>] [-r | -a] [--format]"
9284
90e6ef53 9285# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
c1ac5258 9286#: builtin/branch.c:151
c04f5ac3
JX
9287#, c-format
9288msgid ""
9289"deleting branch '%s' that has been merged to\n"
9290" '%s', but not yet merged to HEAD."
9291msgstr ""
70fc47bf 9292"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
9293" '%s',但未合并到 HEAD。"
9294
90e6ef53 9295# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
c1ac5258 9296#: builtin/branch.c:155
c04f5ac3
JX
9297#, c-format
9298msgid ""
9299"not deleting branch '%s' that is not yet merged to\n"
9300" '%s', even though it is merged to HEAD."
9301msgstr ""
70fc47bf
T
9302"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
9303" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 9304
c1ac5258 9305#: builtin/branch.c:169
07432cef
WS
9306#, c-format
9307msgid "Couldn't look up commit object for '%s'"
9308msgstr "无法查询 '%s' 指向的提交对象"
9309
c1ac5258 9310#: builtin/branch.c:173
07432cef
WS
9311#, c-format
9312msgid ""
9313"The branch '%s' is not fully merged.\n"
9314"If you are sure you want to delete it, run 'git branch -D %s'."
9315msgstr ""
9316"分支 '%s' 没有完全合并。\n"
9317"如果您确认要删除它,执行 'git branch -D %s'。"
9318
c1ac5258 9319#: builtin/branch.c:186
07432cef 9320msgid "Update of config-file failed"
6937cb4e 9321msgstr "更新配置文件失败"
07432cef 9322
c1ac5258 9323#: builtin/branch.c:217
c04f5ac3 9324msgid "cannot use -a with -d"
649900bc 9325msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 9326
c1ac5258 9327#: builtin/branch.c:223
c04f5ac3
JX
9328msgid "Couldn't look up commit object for HEAD"
9329msgstr "无法查询 HEAD 指向的提交对象"
9330
c1ac5258 9331#: builtin/branch.c:237
c04f5ac3 9332#, c-format
5b04ee3b
JX
9333msgid "Cannot delete branch '%s' checked out at '%s'"
9334msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
c04f5ac3 9335
c1ac5258 9336#: builtin/branch.c:252
5ae481e0 9337#, c-format
7aea43ff
JX
9338msgid "remote-tracking branch '%s' not found."
9339msgstr "未能找到远程跟踪分支 '%s'。"
c04f5ac3 9340
c1ac5258 9341#: builtin/branch.c:253
81809b99 9342#, c-format
8ada9598 9343msgid "branch '%s' not found."
81809b99 9344msgstr "分支 '%s' 未发现。"
8ada9598 9345
c1ac5258 9346#: builtin/branch.c:268
81809b99 9347#, c-format
7aea43ff
JX
9348msgid "Error deleting remote-tracking branch '%s'"
9349msgstr "无法删除远程跟踪分支 '%s'"
c04f5ac3 9350
c1ac5258 9351#: builtin/branch.c:269
81809b99 9352#, c-format
8ada9598 9353msgid "Error deleting branch '%s'"
7aea43ff 9354msgstr "无法删除分支 '%s'"
8ada9598 9355
c1ac5258 9356#: builtin/branch.c:276
81809b99 9357#, c-format
7aea43ff
JX
9358msgid "Deleted remote-tracking branch %s (was %s).\n"
9359msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
c04f5ac3 9360
c1ac5258 9361#: builtin/branch.c:277
81809b99 9362#, c-format
8ada9598 9363msgid "Deleted branch %s (was %s).\n"
81809b99 9364msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 9365
d46c5519 9366#: builtin/branch.c:421 builtin/tag.c:60
6937cb4e
JX
9367msgid "unable to parse format string"
9368msgstr "不能解析格式化字符串"
9369
d46c5519
JX
9370#: builtin/branch.c:452
9371msgid "could not resolve HEAD"
9372msgstr "不能解析 HEAD 提交"
9373
c1ac5258 9374#: builtin/branch.c:458
5b04ee3b 9375#, c-format
d46c5519
JX
9376msgid "HEAD (%s) points outside of refs/heads/"
9377msgstr "HEAD (%s) 指向 refs/heads/ 之外"
9378
9379#: builtin/branch.c:473
9380#, c-format
5b04ee3b
JX
9381msgid "Branch %s is being rebased at %s"
9382msgstr "分支 %s 正被变基到 %s"
9383
d46c5519 9384#: builtin/branch.c:477
5b04ee3b
JX
9385#, c-format
9386msgid "Branch %s is being bisected at %s"
9387msgstr "分支 %s 正被二分查找于 %s"
9388
d46c5519 9389#: builtin/branch.c:494
6937cb4e
JX
9390msgid "cannot copy the current branch while not on any."
9391msgstr "无法拷贝当前分支因为不处于任何分支上。"
9392
d46c5519 9393#: builtin/branch.c:496
c04f5ac3 9394msgid "cannot rename the current branch while not on any."
90e6ef53 9395msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 9396
d46c5519 9397#: builtin/branch.c:507
c04f5ac3
JX
9398#, c-format
9399msgid "Invalid branch name: '%s'"
9400msgstr "无效的分支名:'%s'"
9401
d46c5519 9402#: builtin/branch.c:534
c04f5ac3
JX
9403msgid "Branch rename failed"
9404msgstr "分支重命名失败"
9405
d46c5519 9406#: builtin/branch.c:536
6937cb4e
JX
9407msgid "Branch copy failed"
9408msgstr "分支拷贝失败"
9409
d46c5519 9410#: builtin/branch.c:540
6937cb4e 9411#, c-format
5809aa05
JX
9412msgid "Created a copy of a misnamed branch '%s'"
9413msgstr "已为错误命名的分支 '%s' 创建了一个副本"
6937cb4e 9414
d46c5519 9415#: builtin/branch.c:543
c04f5ac3
JX
9416#, c-format
9417msgid "Renamed a misnamed branch '%s' away"
6937cb4e 9418msgstr "已将错误命名的分支 '%s' 重命名"
c04f5ac3 9419
d46c5519 9420#: builtin/branch.c:549
c04f5ac3
JX
9421#, c-format
9422msgid "Branch renamed to %s, but HEAD is not updated!"
9423msgstr "分支重命名为 %s,但 HEAD 没有更新!"
9424
d46c5519 9425#: builtin/branch.c:558
c04f5ac3 9426msgid "Branch is renamed, but update of config-file failed"
6937cb4e
JX
9427msgstr "分支被重命名,但更新配置文件失败"
9428
d46c5519 9429#: builtin/branch.c:560
6937cb4e
JX
9430msgid "Branch is copied, but update of config-file failed"
9431msgstr "分支已拷贝,但更新配置文件失败"
c04f5ac3 9432
d46c5519 9433#: builtin/branch.c:576
5c57d762
JX
9434#, c-format
9435msgid ""
9436"Please edit the description for the branch\n"
9437" %s\n"
9438"Lines starting with '%c' will be stripped.\n"
9439msgstr ""
9440"请编辑分支的描述\n"
9441" %s\n"
9442"以 '%c' 开头的行将被过滤。\n"
c04f5ac3 9443
d46c5519 9444#: builtin/branch.c:610
ef317cd5 9445msgid "Generic options"
07432cef 9446msgstr "通用选项"
c04f5ac3 9447
d46c5519 9448#: builtin/branch.c:612
ef317cd5 9449msgid "show hash and subject, give twice for upstream branch"
07432cef 9450msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 9451
d46c5519 9452#: builtin/branch.c:613
ef317cd5 9453msgid "suppress informational messages"
07432cef 9454msgstr "不显示信息"
8ada9598 9455
d46c5519 9456#: builtin/branch.c:614
ef317cd5 9457msgid "set up tracking mode (see git-pull(1))"
07432cef 9458msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 9459
d46c5519 9460#: builtin/branch.c:616
6937cb4e
JX
9461msgid "do not use"
9462msgstr "不要使用"
c04f5ac3 9463
d46c5519 9464#: builtin/branch.c:618 builtin/rebase.c:485
5b04ee3b
JX
9465msgid "upstream"
9466msgstr "上游"
9467
d46c5519 9468#: builtin/branch.c:618
5b04ee3b
JX
9469msgid "change the upstream info"
9470msgstr "改变上游信息"
9471
d46c5519 9472#: builtin/branch.c:619
a0b6b246
JX
9473msgid "Unset the upstream info"
9474msgstr "取消上游信息的设置"
9475
d46c5519 9476#: builtin/branch.c:620
ef317cd5 9477msgid "use colored output"
07432cef 9478msgstr "使用彩色输出"
c04f5ac3 9479
d46c5519 9480#: builtin/branch.c:621
ef317cd5 9481msgid "act on remote-tracking branches"
07432cef 9482msgstr "作用于远程跟踪分支"
c04f5ac3 9483
d46c5519 9484#: builtin/branch.c:623 builtin/branch.c:625
ef317cd5 9485msgid "print only branches that contain the commit"
07432cef 9486msgstr "只打印包含该提交的分支"
c04f5ac3 9487
d46c5519 9488#: builtin/branch.c:624 builtin/branch.c:626
87cb7997
JX
9489msgid "print only branches that don't contain the commit"
9490msgstr "只打印不包含该提交的分支"
9491
d46c5519 9492#: builtin/branch.c:629
ef317cd5 9493msgid "Specific git-branch actions:"
07432cef 9494msgstr "具体的 git-branch 动作:"
c04f5ac3 9495
d46c5519 9496#: builtin/branch.c:630
ef317cd5 9497msgid "list both remote-tracking and local branches"
07432cef 9498msgstr "列出远程跟踪及本地分支"
c04f5ac3 9499
d46c5519 9500#: builtin/branch.c:632
ef317cd5 9501msgid "delete fully merged branch"
07432cef 9502msgstr "删除完全合并的分支"
c04f5ac3 9503
d46c5519 9504#: builtin/branch.c:633
ef317cd5 9505msgid "delete branch (even if not merged)"
07432cef 9506msgstr "删除分支(即使没有合并)"
c04f5ac3 9507
d46c5519 9508#: builtin/branch.c:634
ef317cd5 9509msgid "move/rename a branch and its reflog"
07432cef 9510msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 9511
d46c5519 9512#: builtin/branch.c:635
ef317cd5 9513msgid "move/rename a branch, even if target exists"
07432cef 9514msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 9515
d46c5519 9516#: builtin/branch.c:636
6937cb4e
JX
9517msgid "copy a branch and its reflog"
9518msgstr "拷贝一个分支和它的引用日志"
9519
d46c5519 9520#: builtin/branch.c:637
6937cb4e
JX
9521msgid "copy a branch, even if target exists"
9522msgstr "拷贝一个分支,即使目标已存在"
9523
d46c5519 9524#: builtin/branch.c:638
ef317cd5 9525msgid "list branch names"
07432cef 9526msgstr "列出分支名"
c04f5ac3 9527
d46c5519
JX
9528#: builtin/branch.c:639
9529msgid "show current branch name"
9530msgstr "显示当前分支名"
9531
9532#: builtin/branch.c:640
ef317cd5 9533msgid "create the branch's reflog"
07432cef 9534msgstr "创建分支的引用日志"
ef317cd5 9535
d46c5519 9536#: builtin/branch.c:642
ef317cd5 9537msgid "edit the description for the branch"
07432cef 9538msgstr "标记分支的描述"
ef317cd5 9539
d46c5519 9540#: builtin/branch.c:643
04cb2f28
JX
9541msgid "force creation, move/rename, deletion"
9542msgstr "强制创建、移动/重命名、删除"
ef317cd5 9543
d46c5519 9544#: builtin/branch.c:644
94550ed3
JX
9545msgid "print only branches that are merged"
9546msgstr "只打印已经合并的分支"
ef317cd5 9547
d46c5519 9548#: builtin/branch.c:645
94550ed3
JX
9549msgid "print only branches that are not merged"
9550msgstr "只打印尚未合并的分支"
ef317cd5 9551
d46c5519 9552#: builtin/branch.c:646
ef317cd5 9553msgid "list branches in columns"
07432cef 9554msgstr "以列的方式显示分支"
ef317cd5 9555
d46c5519 9556#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415
06991777 9557#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
d46c5519 9558#: builtin/tag.c:427
94550ed3
JX
9559msgid "object"
9560msgstr "对象"
9561
d46c5519 9562#: builtin/branch.c:650
94550ed3
JX
9563msgid "print only branches of the object"
9564msgstr "只打印指向该对象的分支"
9565
d46c5519 9566#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434
1a79b2f1
JX
9567msgid "sorting and filtering are case insensitive"
9568msgstr "排序和过滤属于大小写不敏感"
9569
d46c5519 9570#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432
a4f16749 9571#: builtin/verify-tag.c:39
87cb7997
JX
9572msgid "format to use for the output"
9573msgstr "输出格式"
9574
d46c5519 9575#: builtin/branch.c:676 builtin/clone.c:748
c04f5ac3 9576msgid "HEAD not found below refs/heads!"
90e6ef53 9577msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 9578
d46c5519 9579#: builtin/branch.c:700
8ada9598 9580msgid "--column and --verbose are incompatible"
81809b99 9581msgstr "--column 和 --verbose 不兼容"
8ada9598 9582
d46c5519 9583#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778
a77c07d9
JX
9584msgid "branch name required"
9585msgstr "必须提供分支名"
9586
d46c5519 9587#: builtin/branch.c:745
a77c07d9
JX
9588msgid "Cannot give description to detached HEAD"
9589msgstr "不能向分离头指针提供描述"
9590
d46c5519 9591#: builtin/branch.c:750
a77c07d9
JX
9592msgid "cannot edit description of more than one branch"
9593msgstr "不能为一个以上的分支编辑描述"
9594
d46c5519 9595#: builtin/branch.c:757
a77c07d9
JX
9596#, c-format
9597msgid "No commit on branch '%s' yet."
9598msgstr "分支 '%s' 尚无提交。"
9599
d46c5519 9600#: builtin/branch.c:760
a77c07d9
JX
9601#, c-format
9602msgid "No branch named '%s'."
9603msgstr "没有分支 '%s'。"
9604
d46c5519 9605#: builtin/branch.c:775
6937cb4e
JX
9606msgid "too many branches for a copy operation"
9607msgstr "为拷贝操作提供了太多的分支名"
a77c07d9 9608
d46c5519 9609#: builtin/branch.c:784
6937cb4e
JX
9610msgid "too many arguments for a rename operation"
9611msgstr "为重命名操作提供了太多的参数"
1003b3a5 9612
d46c5519 9613#: builtin/branch.c:789
6937cb4e
JX
9614msgid "too many arguments to set new upstream"
9615msgstr "为设置新上游提供了太多的参数"
9616
d46c5519 9617#: builtin/branch.c:793
1003b3a5
JX
9618#, c-format
9619msgid ""
9620"could not set upstream of HEAD to %s when it does not point to any branch."
9621msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
9622
d46c5519 9623#: builtin/branch.c:796 builtin/branch.c:819
1003b3a5
JX
9624#, c-format
9625msgid "no such branch '%s'"
9626msgstr "没有此分支 '%s'"
9627
d46c5519 9628#: builtin/branch.c:800
07432cef 9629#, c-format
ef317cd5 9630msgid "branch '%s' does not exist"
07432cef 9631msgstr "分支 '%s' 不存在"
ef317cd5 9632
d46c5519 9633#: builtin/branch.c:813
6937cb4e
JX
9634msgid "too many arguments to unset upstream"
9635msgstr "为取消上游设置操作提供了太多的参数"
1003b3a5 9636
d46c5519 9637#: builtin/branch.c:817
1003b3a5
JX
9638msgid "could not unset upstream of HEAD when it does not point to any branch."
9639msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
9640
d46c5519 9641#: builtin/branch.c:823
ef317cd5
JX
9642#, c-format
9643msgid "Branch '%s' has no upstream information"
07432cef 9644msgstr "分支 '%s' 没有上游信息"
ef317cd5 9645
d46c5519 9646#: builtin/branch.c:833
c04f5ac3
JX
9647msgid "-a and -r options to 'git branch' do not make sense with a branch name"
9648msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
9649
d46c5519 9650#: builtin/branch.c:836
ef317cd5 9651msgid ""
6937cb4e
JX
9652"the '--set-upstream' option is no longer supported. Please use '--track' or "
9653"'--set-upstream-to' instead."
ef317cd5 9654msgstr ""
6937cb4e 9655"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
ef317cd5 9656
87cb7997 9657#: builtin/bundle.c:45
c04f5ac3
JX
9658#, c-format
9659msgid "%s is okay\n"
9660msgstr "%s 可以\n"
9661
87cb7997 9662#: builtin/bundle.c:58
c04f5ac3 9663msgid "Need a repository to create a bundle."
160fb2b2 9664msgstr "需要一个仓库来创建包。"
c04f5ac3 9665
87cb7997 9666#: builtin/bundle.c:62
c04f5ac3 9667msgid "Need a repository to unbundle."
160fb2b2 9668msgstr "需要一个仓库来解包。"
c04f5ac3 9669
06991777 9670#: builtin/cat-file.c:593
7aea43ff 9671msgid ""
a0b6b246
JX
9672"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
9673"p | <type> | --textconv | --filters) [--path=<path>] <object>"
275588f9
JX
9674msgstr ""
9675"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
9676"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
ef317cd5 9677
06991777 9678#: builtin/cat-file.c:594
a0b6b246
JX
9679msgid ""
9680"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
9681"filters]"
275588f9
JX
9682msgstr ""
9683"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
9684"filters]"
ef317cd5 9685
06991777 9686#: builtin/cat-file.c:615
4c27fcb5
JX
9687msgid "only one batch option may be specified"
9688msgstr "只能指定一个批处理选项"
9689
06991777 9690#: builtin/cat-file.c:633
ef317cd5 9691msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 9692msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 9693
06991777 9694#: builtin/cat-file.c:634
ef317cd5 9695msgid "show object type"
07432cef 9696msgstr "显示对象类型"
ef317cd5 9697
06991777 9698#: builtin/cat-file.c:635
ef317cd5 9699msgid "show object size"
07432cef 9700msgstr "显示对象大小"
ef317cd5 9701
06991777 9702#: builtin/cat-file.c:637
ef317cd5 9703msgid "exit with zero when there's no error"
07432cef 9704msgstr "当没有错误时退出并返回零"
ef317cd5 9705
06991777 9706#: builtin/cat-file.c:638
ef317cd5 9707msgid "pretty-print object's content"
07432cef 9708msgstr "美观地打印对象的内容"
ef317cd5 9709
06991777 9710#: builtin/cat-file.c:640
ef317cd5 9711msgid "for blob objects, run textconv on object's content"
a0b6b246
JX
9712msgstr "对于数据对象,对其内容做文本转换"
9713
06991777 9714#: builtin/cat-file.c:642
a0b6b246
JX
9715msgid "for blob objects, run filters on object's content"
9716msgstr "对于数据对象,对其内容做过滤"
9717
d46c5519 9718#: builtin/cat-file.c:643 git-submodule.sh:936
a0b6b246
JX
9719msgid "blob"
9720msgstr "数据对象"
9721
06991777 9722#: builtin/cat-file.c:644
a0b6b246
JX
9723msgid "use a specific path for --textconv/--filters"
9724msgstr "对于 --textconv/--filters 使用一个特定的路径"
ef317cd5 9725
06991777 9726#: builtin/cat-file.c:646
7aea43ff
JX
9727msgid "allow -s and -t to work with broken/corrupt objects"
9728msgstr "允许 -s 和 -t 对损坏的对象生效"
9729
06991777 9730#: builtin/cat-file.c:647
1b7f4a34
JX
9731msgid "buffer --batch output"
9732msgstr "缓冲 --batch 的输出"
9733
06991777 9734#: builtin/cat-file.c:649
ef317cd5 9735msgid "show info and content of objects fed from the standard input"
07432cef 9736msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 9737
06991777 9738#: builtin/cat-file.c:653
ef317cd5 9739msgid "show info about objects fed from the standard input"
07432cef 9740msgstr "显示从标准输入提供的对象的信息"
ef317cd5 9741
06991777 9742#: builtin/cat-file.c:657
7aea43ff
JX
9743msgid "follow in-tree symlinks (used with --batch or --batch-check)"
9744msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
9745
06991777 9746#: builtin/cat-file.c:659
1b7f4a34
JX
9747msgid "show all objects with --batch or --batch-check"
9748msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
9749
06991777 9750#: builtin/cat-file.c:661
c1ac5258
JX
9751msgid "do not order --batch-all-objects output"
9752msgstr "不要对 --batch-all-objects 的输出排序"
9753
06991777 9754#: builtin/check-attr.c:13
814ff314
JX
9755msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
9756msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
ef317cd5 9757
06991777 9758#: builtin/check-attr.c:14
94550ed3
JX
9759msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
9760msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
ef317cd5 9761
06991777 9762#: builtin/check-attr.c:21
ef317cd5 9763msgid "report all attributes set on file"
07432cef 9764msgstr "报告设置在文件上的所有属性"
ef317cd5 9765
06991777 9766#: builtin/check-attr.c:22
ef317cd5 9767msgid "use .gitattributes only from the index"
07432cef 9768msgstr "只使用索引中的 .gitattributes"
ef317cd5 9769
06991777 9770#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
ef317cd5 9771msgid "read file names from stdin"
07432cef 9772msgstr "从标准输入读出文件名"
ef317cd5 9773
06991777 9774#: builtin/check-attr.c:25 builtin/check-ignore.c:27
90314792
JX
9775msgid "terminate input and output records by a NUL character"
9776msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 9777
d46c5519
JX
9778#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538
9779#: builtin/worktree.c:499
a77c07d9
JX
9780msgid "suppress progress reporting"
9781msgstr "不显示进度报告"
9782
06991777 9783#: builtin/check-ignore.c:29
2e8451e8
JX
9784msgid "show non-matching input paths"
9785msgstr "显示未匹配的输入路径"
9786
06991777 9787#: builtin/check-ignore.c:31
90314792
JX
9788msgid "ignore index when checking"
9789msgstr "检查时忽略索引"
9790
06991777 9791#: builtin/check-ignore.c:160
a77c07d9 9792msgid "cannot specify pathnames with --stdin"
1b7f4a34 9793msgstr "不能同时指定路径及 --stdin 参数"
a77c07d9 9794
06991777 9795#: builtin/check-ignore.c:163
a77c07d9
JX
9796msgid "-z only makes sense with --stdin"
9797msgstr "-z 需要和 --stdin 参数共用才有意义"
9798
06991777 9799#: builtin/check-ignore.c:165
a77c07d9
JX
9800msgid "no path specified"
9801msgstr "未指定路径"
9802
06991777 9803#: builtin/check-ignore.c:169
a77c07d9
JX
9804msgid "--quiet is only valid with a single pathname"
9805msgstr "参数 --quiet 只在提供一个路径名时有效"
9806
06991777 9807#: builtin/check-ignore.c:171
a77c07d9
JX
9808msgid "cannot have both --quiet and --verbose"
9809msgstr "不能同时提供 --quiet 和 --verbose 参数"
9810
06991777 9811#: builtin/check-ignore.c:174
2e8451e8
JX
9812msgid "--non-matching is only valid with --verbose"
9813msgstr "--non-matching 选项只在使用 --verbose 时有效"
9814
a4f16749 9815#: builtin/check-mailmap.c:9
814ff314
JX
9816msgid "git check-mailmap [<options>] <contact>..."
9817msgstr "git check-mailmap [<选项>] <联系地址>..."
2e8451e8 9818
a4f16749 9819#: builtin/check-mailmap.c:14
2e8451e8
JX
9820msgid "also read contacts from stdin"
9821msgstr "还从标准输入读取联系地址"
9822
a4f16749 9823#: builtin/check-mailmap.c:25
2e8451e8
JX
9824#, c-format
9825msgid "unable to parse contact: %s"
9826msgstr "不能解析联系地址:%s"
9827
a4f16749 9828#: builtin/check-mailmap.c:48
2e8451e8
JX
9829msgid "no contacts specified"
9830msgstr "未指定联系地址"
9831
06991777 9832#: builtin/checkout-index.c:131
814ff314
JX
9833msgid "git checkout-index [<options>] [--] [<file>...]"
9834msgstr "git checkout-index [<选项>] [--] [<文件>...]"
ef317cd5 9835
06991777 9836#: builtin/checkout-index.c:148
276ceeaa
JX
9837msgid "stage should be between 1 and 3 or all"
9838msgstr "索引值应该取值 1 到 3 或者 all"
9839
06991777 9840#: builtin/checkout-index.c:164
ef317cd5 9841msgid "check out all files in the index"
07432cef 9842msgstr "检出索引区的所有文件"
ef317cd5 9843
06991777 9844#: builtin/checkout-index.c:165
ef317cd5 9845msgid "force overwrite of existing files"
07432cef 9846msgstr "强制覆盖现有的文件"
ef317cd5 9847
06991777 9848#: builtin/checkout-index.c:167
ef317cd5 9849msgid "no warning for existing files and files not in index"
07432cef 9850msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 9851
06991777 9852#: builtin/checkout-index.c:169
ef317cd5 9853msgid "don't checkout new files"
07432cef 9854msgstr "不检出新文件"
ef317cd5 9855
06991777 9856#: builtin/checkout-index.c:171
ef317cd5 9857msgid "update stat information in the index file"
07432cef 9858msgstr "更新索引中文件的状态信息"
ef317cd5 9859
06991777 9860#: builtin/checkout-index.c:175
ef317cd5 9861msgid "read list of paths from the standard input"
07432cef 9862msgstr "从标准输入读取路径列表"
ef317cd5 9863
06991777 9864#: builtin/checkout-index.c:177
ef317cd5 9865msgid "write the content to temporary files"
07432cef 9866msgstr "将内容写入临时文件"
ef317cd5 9867
06991777
JX
9868#: builtin/checkout-index.c:178 builtin/column.c:31
9869#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
d46c5519
JX
9870#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856
9871#: builtin/worktree.c:672
ef317cd5 9872msgid "string"
07432cef 9873msgstr "字符串"
ef317cd5 9874
06991777 9875#: builtin/checkout-index.c:179
ef317cd5 9876msgid "when creating files, prepend <string>"
4375c10e 9877msgstr "在创建文件时,在前面加上 <字符串>"
ef317cd5 9878
06991777 9879#: builtin/checkout-index.c:181
ef317cd5 9880msgid "copy out the files from named stage"
07432cef 9881msgstr "从指定暂存区中拷出文件"
ef317cd5 9882
06991777 9883#: builtin/checkout.c:32
814ff314
JX
9884msgid "git checkout [<options>] <branch>"
9885msgstr "git checkout [<选项>] <分支>"
ef317cd5 9886
06991777 9887#: builtin/checkout.c:33
814ff314
JX
9888msgid "git checkout [<options>] [<branch>] -- <file>..."
9889msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
ef317cd5 9890
d46c5519 9891#: builtin/checkout.c:151 builtin/checkout.c:190
c04f5ac3
JX
9892#, c-format
9893msgid "path '%s' does not have our version"
9894msgstr "路径 '%s' 没有我们的版本"
9895
d46c5519 9896#: builtin/checkout.c:153 builtin/checkout.c:192
c04f5ac3
JX
9897#, c-format
9898msgid "path '%s' does not have their version"
9899msgstr "路径 '%s' 没有他们的版本"
9900
d46c5519 9901#: builtin/checkout.c:169
c04f5ac3
JX
9902#, c-format
9903msgid "path '%s' does not have all necessary versions"
e640d114 9904msgstr "路径 '%s' 没有全部必需的版本"
c04f5ac3 9905
d46c5519 9906#: builtin/checkout.c:219
c04f5ac3
JX
9907#, c-format
9908msgid "path '%s' does not have necessary versions"
e640d114 9909msgstr "路径 '%s' 没有必需的版本"
c04f5ac3 9910
d46c5519 9911#: builtin/checkout.c:237
c04f5ac3
JX
9912#, c-format
9913msgid "path '%s': cannot merge"
90e6ef53 9914msgstr "path '%s':无法合并"
c04f5ac3 9915
d46c5519 9916#: builtin/checkout.c:253
c04f5ac3
JX
9917#, c-format
9918msgid "Unable to add merge result for '%s'"
9919msgstr "无法为 '%s' 添加合并结果"
9920
d46c5519
JX
9921#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337
9922#: builtin/checkout.c:340
07432cef 9923#, c-format
ef317cd5 9924msgid "'%s' cannot be used with updating paths"
07432cef 9925msgstr "'%s' 不能在更新路径时使用"
ef317cd5 9926
d46c5519 9927#: builtin/checkout.c:343 builtin/checkout.c:346
07432cef 9928#, c-format
ef317cd5 9929msgid "'%s' cannot be used with %s"
07432cef 9930msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 9931
d46c5519 9932#: builtin/checkout.c:349
ef317cd5
JX
9933#, c-format
9934msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 9935msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 9936
d46c5519 9937#: builtin/checkout.c:396 builtin/checkout.c:403
c04f5ac3
JX
9938#, c-format
9939msgid "path '%s' is unmerged"
9940msgstr "路径 '%s' 未合并"
9941
d46c5519 9942#: builtin/checkout.c:442
06991777
JX
9943#, c-format
9944msgid "Recreated %d merge conflict"
9945msgid_plural "Recreated %d merge conflicts"
9946msgstr[0] "重新创建了 %d 个合并冲突"
9947msgstr[1] "重新创建了 %d 个合并冲突"
9948
d46c5519 9949#: builtin/checkout.c:447
06991777
JX
9950#, c-format
9951msgid "Updated %d path from %s"
9952msgid_plural "Updated %d paths from %s"
9953msgstr[0] "从 %2$s 更新了 %1$d 个路径"
9954msgstr[1] "从 %2$s 更新了 %1$d 个路径"
9955
d46c5519 9956#: builtin/checkout.c:454
06991777
JX
9957#, c-format
9958msgid "Updated %d path from the index"
9959msgid_plural "Updated %d paths from the index"
9960msgstr[0] "从索引区更新了 %d 个路径"
9961msgstr[1] "从索引区更新了 %d 个路径"
9962
d46c5519 9963#: builtin/checkout.c:695
c04f5ac3 9964msgid "you need to resolve your current index first"
90e6ef53 9965msgstr "您需要先解决当前索引的冲突"
c04f5ac3 9966
d46c5519
JX
9967#: builtin/checkout.c:744
9968#, c-format
9969msgid ""
9970"cannot continue with staged changes in the following files:\n"
9971"%s"
9972msgstr ""
9973"不能继续,下列文件有暂存的修改:\n"
9974"%s"
9975
9976#: builtin/checkout.c:751
9977#, c-format
9978msgid "staged changes in the following files may be lost: %s"
9979msgstr "下列文件暂存的修改可能会丢失:%s"
9980
9981#: builtin/checkout.c:848
c04f5ac3 9982#, c-format
1b7f4a34
JX
9983msgid "Can not do reflog for '%s': %s\n"
9984msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
c04f5ac3 9985
d46c5519 9986#: builtin/checkout.c:890
c04f5ac3
JX
9987msgid "HEAD is now at"
9988msgstr "HEAD 目前位于"
9989
d46c5519 9990#: builtin/checkout.c:894 builtin/clone.c:701
3495628d
JX
9991msgid "unable to update HEAD"
9992msgstr "不能更新 HEAD"
9993
d46c5519 9994#: builtin/checkout.c:898
c04f5ac3
JX
9995#, c-format
9996msgid "Reset branch '%s'\n"
9997msgstr "重置分支 '%s'\n"
9998
d46c5519 9999#: builtin/checkout.c:901
c04f5ac3
JX
10000#, c-format
10001msgid "Already on '%s'\n"
10002msgstr "已经位于 '%s'\n"
10003
d46c5519 10004#: builtin/checkout.c:905
c04f5ac3
JX
10005#, c-format
10006msgid "Switched to and reset branch '%s'\n"
10007msgstr "切换并重置分支 '%s'\n"
10008
d46c5519 10009#: builtin/checkout.c:907 builtin/checkout.c:1283
c04f5ac3
JX
10010#, c-format
10011msgid "Switched to a new branch '%s'\n"
10012msgstr "切换到一个新分支 '%s'\n"
10013
d46c5519 10014#: builtin/checkout.c:909
c04f5ac3
JX
10015#, c-format
10016msgid "Switched to branch '%s'\n"
10017msgstr "切换到分支 '%s'\n"
10018
90e6ef53 10019# 译者:注意保持前导空格
d46c5519 10020#: builtin/checkout.c:960
c04f5ac3
JX
10021#, c-format
10022msgid " ... and %d more.\n"
90e6ef53 10023msgstr " ... 及其它 %d 个。\n"
c04f5ac3 10024
d46c5519 10025#: builtin/checkout.c:966
c04f5ac3
JX
10026#, c-format
10027msgid ""
10028"Warning: you are leaving %d commit behind, not connected to\n"
10029"any of your branches:\n"
10030"\n"
10031"%s\n"
10032msgid_plural ""
10033"Warning: you are leaving %d commits behind, not connected to\n"
10034"any of your branches:\n"
10035"\n"
10036"%s\n"
10037msgstr[0] ""
10038"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
10039"\n"
10040"%s\n"
5ae481e0
JX
10041msgstr[1] ""
10042"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
10043"\n"
10044"%s\n"
c04f5ac3 10045
d46c5519 10046#: builtin/checkout.c:985
c04f5ac3
JX
10047#, c-format
10048msgid ""
7aea43ff
JX
10049"If you want to keep it by creating a new branch, this may be a good time\n"
10050"to do so with:\n"
10051"\n"
10052" git branch <new-branch-name> %s\n"
10053"\n"
10054msgid_plural ""
c04f5ac3
JX
10055"If you want to keep them by creating a new branch, this may be a good time\n"
10056"to do so with:\n"
10057"\n"
814ff314 10058" git branch <new-branch-name> %s\n"
c04f5ac3 10059"\n"
7aea43ff
JX
10060msgstr[0] ""
10061"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
10062"如下操作:\n"
10063"\n"
10064" git branch <新分支名> %s\n"
10065"\n"
10066msgstr[1] ""
10067"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
c04f5ac3
JX
10068"如下操作:\n"
10069"\n"
814ff314 10070" git branch <新分支名> %s\n"
c04f5ac3
JX
10071"\n"
10072
d46c5519 10073#: builtin/checkout.c:1017
c04f5ac3
JX
10074msgid "internal error in revision walk"
10075msgstr "在版本遍历时遇到内部错误"
10076
d46c5519 10077#: builtin/checkout.c:1021
c04f5ac3
JX
10078msgid "Previous HEAD position was"
10079msgstr "之前的 HEAD 位置是"
10080
d46c5519 10081#: builtin/checkout.c:1052 builtin/checkout.c:1278
c04f5ac3 10082msgid "You are on a branch yet to be born"
90e6ef53 10083msgstr "您位于一个尚未初始化的分支"
c04f5ac3 10084
d46c5519 10085#: builtin/checkout.c:1173
90314792
JX
10086#, c-format
10087msgid "only one reference expected, %d given."
a0b6b246 10088msgstr "应只有一个引用,却给出了 %d 个"
90314792 10089
d46c5519 10090#: builtin/checkout.c:1209
06991777
JX
10091#, c-format
10092msgid ""
10093"'%s' could be both a local file and a tracking branch.\n"
10094"Please use -- (and optionally --no-guess) to disambiguate"
10095msgstr ""
10096"'%s' 既可以是一个本地文件,也可以是一个跟踪分支。\n"
10097"请使用 --(和可选的 --no-guess)来消除歧义"
10098
d46c5519 10099#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448
c04f5ac3
JX
10100#, c-format
10101msgid "invalid reference: %s"
10102msgstr "无效引用:%s"
10103
d46c5519 10104#: builtin/checkout.c:1251
c04f5ac3
JX
10105#, c-format
10106msgid "reference is not a tree: %s"
10107msgstr "引用不是一个树:%s"
10108
d46c5519 10109#: builtin/checkout.c:1292
ef317cd5 10110msgid "paths cannot be used with switching branches"
07432cef 10111msgstr "路径不能和切换分支同时使用"
c04f5ac3 10112
d46c5519 10113#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303
07432cef 10114#, c-format
ef317cd5 10115msgid "'%s' cannot be used with switching branches"
07432cef 10116msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 10117
d46c5519
JX
10118#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315
10119#: builtin/checkout.c:1318
07432cef 10120#, c-format
ef317cd5 10121msgid "'%s' cannot be used with '%s'"
07432cef 10122msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 10123
d46c5519 10124#: builtin/checkout.c:1323
07432cef 10125#, c-format
ef317cd5 10126msgid "Cannot switch branch to a non-commit '%s'"
07432cef 10127msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 10128
d46c5519
JX
10129#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:118
10130#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492
10131#: builtin/worktree.c:494
ef317cd5 10132msgid "branch"
07432cef 10133msgstr "分支"
c04f5ac3 10134
d46c5519 10135#: builtin/checkout.c:1357
ef317cd5 10136msgid "create and checkout a new branch"
07432cef 10137msgstr "创建并检出一个新的分支"
c04f5ac3 10138
d46c5519 10139#: builtin/checkout.c:1359
ef317cd5 10140msgid "create/reset and checkout a branch"
07432cef 10141msgstr "创建/重置并检出一个分支"
c04f5ac3 10142
d46c5519 10143#: builtin/checkout.c:1360
ef317cd5 10144msgid "create reflog for new branch"
07432cef 10145msgstr "为新的分支创建引用日志"
ef317cd5 10146
d46c5519 10147#: builtin/checkout.c:1361 builtin/worktree.c:496
5c57d762
JX
10148msgid "detach HEAD at named commit"
10149msgstr "HEAD 从指定的提交分离"
ef317cd5 10150
d46c5519 10151#: builtin/checkout.c:1362
ef317cd5 10152msgid "set upstream info for new branch"
07432cef 10153msgstr "为新的分支设置上游信息"
ef317cd5 10154
d46c5519 10155#: builtin/checkout.c:1364
6c94aba5 10156msgid "new-branch"
07432cef 10157msgstr "新分支"
ef317cd5 10158
d46c5519 10159#: builtin/checkout.c:1364
ef317cd5 10160msgid "new unparented branch"
07432cef 10161msgstr "新的没有父提交的分支"
ef317cd5 10162
d46c5519 10163#: builtin/checkout.c:1366
ef317cd5 10164msgid "checkout our version for unmerged files"
07432cef 10165msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 10166
d46c5519 10167#: builtin/checkout.c:1369
ef317cd5 10168msgid "checkout their version for unmerged files"
07432cef 10169msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 10170
d46c5519 10171#: builtin/checkout.c:1371
ef317cd5 10172msgid "force checkout (throw away local modifications)"
07432cef 10173msgstr "强制检出(丢弃本地修改)"
c04f5ac3 10174
d46c5519 10175#: builtin/checkout.c:1373
ef317cd5 10176msgid "perform a 3-way merge with the new branch"
160fb2b2 10177msgstr "和新的分支执行三方合并"
ef317cd5 10178
d46c5519 10179#: builtin/checkout.c:1375 builtin/merge.c:284
ef317cd5 10180msgid "update ignored files (default)"
07432cef 10181msgstr "更新忽略的文件(默认)"
c04f5ac3 10182
d46c5519 10183#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317
ef317cd5 10184msgid "style"
07432cef 10185msgstr "风格"
ef317cd5 10186
d46c5519 10187#: builtin/checkout.c:1378
ef317cd5 10188msgid "conflict style (merge or diff3)"
07432cef 10189msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 10190
d46c5519 10191#: builtin/checkout.c:1381
4dcdc3d8
JX
10192msgid "do not limit pathspecs to sparse entries only"
10193msgstr "对路径不做稀疏检出的限制"
10194
d46c5519 10195#: builtin/checkout.c:1383
06991777
JX
10196msgid "do not second guess 'git checkout <no-such-branch>'"
10197msgstr "不要二次猜测 'git checkout <无此分支>'"
ef317cd5 10198
d46c5519 10199#: builtin/checkout.c:1385
7aea43ff
JX
10200msgid "do not check if another worktree is holding the given ref"
10201msgstr "不检查指定的引用是否被其他工作区所占用"
10202
d46c5519
JX
10203#: builtin/checkout.c:1389 builtin/clone.c:88 builtin/fetch.c:141
10204#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575
fd8cb379 10205#: builtin/send-pack.c:174
94550ed3
JX
10206msgid "force progress reporting"
10207msgstr "强制显示进度报告"
10208
d46c5519
JX
10209#: builtin/checkout.c:1390
10210msgid "use overlay mode (default)"
10211msgstr "使用叠加模式(默认)"
10212
10213#: builtin/checkout.c:1422
ef317cd5 10214msgid "-b, -B and --orphan are mutually exclusive"
07432cef 10215msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 10216
d46c5519
JX
10217#: builtin/checkout.c:1425
10218msgid "-p and --overlay are mutually exclusive"
10219msgstr "-p 和 --overlay 互斥"
10220
10221#: builtin/checkout.c:1442
ef317cd5
JX
10222msgid "--track needs a branch name"
10223msgstr "--track 需要一个分支名"
10224
d46c5519 10225#: builtin/checkout.c:1447
c1ac5258
JX
10226msgid "missing branch name; try -b"
10227msgstr "缺少分支名,尝试 -b"
ef317cd5 10228
d46c5519 10229#: builtin/checkout.c:1484
c04f5ac3 10230msgid "invalid path specification"
90e6ef53 10231msgstr "无效的路径规格"
c04f5ac3 10232
d46c5519 10233#: builtin/checkout.c:1491
07432cef 10234#, c-format
a4f16749
JX
10235msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
10236msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'"
c04f5ac3 10237
d46c5519 10238#: builtin/checkout.c:1495
07432cef 10239#, c-format
ef317cd5 10240msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 10241msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 10242
d46c5519 10243#: builtin/checkout.c:1499
c04f5ac3
JX
10244msgid ""
10245"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
10246"checking out of the index."
10247msgstr ""
90e6ef53 10248"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 10249
d46c5519 10250#: builtin/checkout.c:1519
c1ac5258
JX
10251#, c-format
10252msgid ""
10253"'%s' matched more than one remote tracking branch.\n"
10254"We found %d remotes with a reference that matched. So we fell back\n"
10255"on trying to resolve the argument as a path, but failed there too!\n"
10256"\n"
10257"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
10258"you can do so by fully qualifying the name with the --track option:\n"
10259"\n"
10260" git checkout --track origin/<name>\n"
10261"\n"
10262"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
10263"one remote, e.g. the 'origin' remote, consider setting\n"
10264"checkout.defaultRemote=origin in your config."
10265msgstr ""
10266"'%s' 匹配了一个以上的远程跟踪分支。\n"
10267"我们发现 %d 个远程仓库具有同名分支。所以我们转而尝试将这个参数解析为\n"
10268"路径,但是也失败了!\n"
10269"\n"
10270"如果您想要检出一个远程跟踪分支,例如在远程仓库 'origin' 上的,您可以\n"
10271"使用分支全名和 --track 选项:\n"
10272"\n"
10273" git checkout --track origin/<name>\n"
10274"\n"
10275"如果您总是喜欢使用模糊的简短分支名 <name>,而不喜欢如 'origin' 的远程\n"
10276"仓库名,可以在配置中设置 checkout.defaultRemote=origin。"
10277
06991777 10278#: builtin/clean.c:28
2e8451e8
JX
10279msgid ""
10280"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
10281msgstr ""
10282"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 10283
06991777 10284#: builtin/clean.c:32
07432cef
WS
10285#, c-format
10286msgid "Removing %s\n"
10287msgstr "正删除 %s\n"
10288
06991777 10289#: builtin/clean.c:33
07432cef
WS
10290#, c-format
10291msgid "Would remove %s\n"
10292msgstr "将删除 %s\n"
10293
06991777 10294#: builtin/clean.c:34
07432cef
WS
10295#, c-format
10296msgid "Skipping repository %s\n"
160fb2b2 10297msgstr "忽略仓库 %s\n"
07432cef 10298
06991777 10299#: builtin/clean.c:35
07432cef
WS
10300#, c-format
10301msgid "Would skip repository %s\n"
160fb2b2 10302msgstr "将忽略仓库 %s\n"
07432cef 10303
06991777 10304#: builtin/clean.c:36
07432cef
WS
10305#, c-format
10306msgid "failed to remove %s"
c1ac5258 10307msgstr "删除 %s 失败"
07432cef 10308
06991777 10309#: builtin/clean.c:299 git-add--interactive.perl:579
1a79b2f1 10310#, c-format
2e8451e8
JX
10311msgid ""
10312"Prompt help:\n"
10313"1 - select a numbered item\n"
10314"foo - select item based on unique prefix\n"
1a79b2f1 10315" - (empty) select nothing\n"
2e8451e8
JX
10316msgstr ""
10317"帮助:\n"
10318"1 - 通过编号选择一个选项\n"
1a79b2f1
JX
10319"foo - 通过唯一前缀选择一个选项\n"
10320" - (空)什么也不选择\n"
2e8451e8 10321
06991777 10322#: builtin/clean.c:303 git-add--interactive.perl:588
1a79b2f1 10323#, c-format
2e8451e8
JX
10324msgid ""
10325"Prompt help:\n"
10326"1 - select a single item\n"
10327"3-5 - select a range of items\n"
10328"2-3,6-9 - select multiple ranges\n"
10329"foo - select item based on unique prefix\n"
10330"-... - unselect specified items\n"
10331"* - choose all items\n"
1a79b2f1 10332" - (empty) finish selecting\n"
2e8451e8
JX
10333msgstr ""
10334"帮助:\n"
10335"1 - 选择一个选项\n"
10336"3-5 - 选择一个范围内的所有选项\n"
10337"2-3,6-9 - 选择多个范围内的所有选项\n"
1a79b2f1 10338"foo - 通过唯一前缀选择一个选项\n"
2e8451e8
JX
10339"-... - 反选特定的选项\n"
10340"* - 选择所有选项\n"
1a79b2f1 10341" - (空)结束选择\n"
2e8451e8 10342
06991777 10343#: builtin/clean.c:519 git-add--interactive.perl:554
fd8cb379 10344#: git-add--interactive.perl:559
1a79b2f1
JX
10345#, c-format, perl-format
10346msgid "Huh (%s)?\n"
10347msgstr "嗯(%s)?\n"
2e8451e8 10348
06991777 10349#: builtin/clean.c:661
2e8451e8
JX
10350#, c-format
10351msgid "Input ignore patterns>> "
10352msgstr "输入模版以排除条目>> "
10353
06991777 10354#: builtin/clean.c:698
2e8451e8
JX
10355#, c-format
10356msgid "WARNING: Cannot find items matched by: %s"
10357msgstr "警告:无法找到和 %s 匹配的条目"
10358
06991777 10359#: builtin/clean.c:719
2e8451e8
JX
10360msgid "Select items to delete"
10361msgstr "选择要删除的条目"
10362
814ff314 10363#. TRANSLATORS: Make sure to keep [y/N] as is
06991777 10364#: builtin/clean.c:760
2e8451e8 10365#, c-format
814ff314
JX
10366msgid "Remove %s [y/N]? "
10367msgstr "删除 %s [y/N]?"
2e8451e8 10368
06991777 10369#: builtin/clean.c:785 git-add--interactive.perl:1717
1a79b2f1
JX
10370#, c-format
10371msgid "Bye.\n"
10372msgstr "再见。\n"
2e8451e8 10373
06991777 10374#: builtin/clean.c:793
2e8451e8
JX
10375msgid ""
10376"clean - start cleaning\n"
10377"filter by pattern - exclude items from deletion\n"
10378"select by numbers - select items to be deleted by numbers\n"
10379"ask each - confirm each deletion (like \"rm -i\")\n"
10380"quit - stop cleaning\n"
10381"help - this screen\n"
10382"? - help for prompt selection"
10383msgstr ""
10384"clean - 开始清理\n"
10385"filter by pattern - 通过模版排除要删除的条目\n"
10386"select by numbers - 通过数字选择要删除的条目\n"
10387"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
10388"quit - 停止删除并退出\n"
10389"help - 显示本帮助\n"
10390"? - 显示如何在提示符下选择的帮助"
10391
06991777 10392#: builtin/clean.c:820 git-add--interactive.perl:1793
2e8451e8
JX
10393msgid "*** Commands ***"
10394msgstr "*** 命令 ***"
10395
06991777 10396#: builtin/clean.c:821 git-add--interactive.perl:1790
2e8451e8
JX
10397msgid "What now"
10398msgstr "请选择"
10399
06991777 10400#: builtin/clean.c:829
2e8451e8
JX
10401msgid "Would remove the following item:"
10402msgid_plural "Would remove the following items:"
10403msgstr[0] "将删除如下条目:"
10404msgstr[1] "将删除如下条目:"
10405
06991777 10406#: builtin/clean.c:845
2e8451e8
JX
10407msgid "No more files to clean, exiting."
10408msgstr "没有要清理的文件,退出。"
10409
06991777 10410#: builtin/clean.c:907
ef317cd5 10411msgid "do not print names of files removed"
07432cef 10412msgstr "不打印删除文件的名称"
ef317cd5 10413
06991777 10414#: builtin/clean.c:909
ef317cd5 10415msgid "force"
07432cef 10416msgstr "强制"
ef317cd5 10417
06991777 10418#: builtin/clean.c:910
2e8451e8
JX
10419msgid "interactive cleaning"
10420msgstr "交互式清除"
10421
06991777 10422#: builtin/clean.c:912
ef317cd5 10423msgid "remove whole directories"
07432cef 10424msgstr "删除整个目录"
ef317cd5 10425
06991777 10426#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
d46c5519
JX
10427#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173
10428#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
10429#: builtin/show-ref.c:179
ef317cd5 10430msgid "pattern"
07432cef 10431msgstr "模式"
ef317cd5 10432
06991777 10433#: builtin/clean.c:914
ef317cd5 10434msgid "add <pattern> to ignore rules"
4375c10e 10435msgstr "添加 <模式> 到忽略规则"
ef317cd5 10436
06991777 10437#: builtin/clean.c:915
ef317cd5 10438msgid "remove ignored files, too"
07432cef 10439msgstr "也删除忽略的文件"
ef317cd5 10440
06991777 10441#: builtin/clean.c:917
ef317cd5 10442msgid "remove only ignored files"
07432cef 10443msgstr "只删除忽略的文件"
c04f5ac3 10444
06991777 10445#: builtin/clean.c:935
c04f5ac3 10446msgid "-x and -X cannot be used together"
649900bc 10447msgstr "-x 和 -X 不能同时使用"
c04f5ac3 10448
06991777 10449#: builtin/clean.c:939
c04f5ac3 10450msgid ""
6c94aba5 10451"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 10452"clean"
c04f5ac3 10453msgstr ""
2e8451e8 10454"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 10455
06991777 10456#: builtin/clean.c:942
c04f5ac3 10457msgid ""
6c94aba5 10458"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 10459"refusing to clean"
c04f5ac3 10460msgstr ""
2e8451e8 10461"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 10462
06991777 10463#: builtin/clone.c:44
814ff314 10464msgid "git clone [<options>] [--] <repo> [<dir>]"
160fb2b2 10465msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
ef317cd5 10466
d46c5519 10467#: builtin/clone.c:90
ef317cd5 10468msgid "don't create a checkout"
07432cef 10469msgstr "不创建一个检出"
ef317cd5 10470
d46c5519 10471#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489
ef317cd5 10472msgid "create a bare repository"
160fb2b2 10473msgstr "创建一个纯仓库"
ef317cd5 10474
d46c5519 10475#: builtin/clone.c:95
ef317cd5 10476msgid "create a mirror repository (implies bare)"
160fb2b2 10477msgstr "创建一个镜像仓库(也是纯仓库)"
ef317cd5 10478
d46c5519 10479#: builtin/clone.c:97
ef317cd5 10480msgid "to clone from a local repository"
160fb2b2 10481msgstr "从本地仓库克隆"
ef317cd5 10482
d46c5519 10483#: builtin/clone.c:99
ef317cd5 10484msgid "don't use local hardlinks, always copy"
07432cef 10485msgstr "不使用本地硬链接,始终复制"
ef317cd5 10486
d46c5519 10487#: builtin/clone.c:101
ef317cd5 10488msgid "setup as shared repository"
160fb2b2 10489msgstr "设置为共享仓库"
ef317cd5 10490
d46c5519 10491#: builtin/clone.c:104
87cb7997 10492msgid "pathspec"
65e2041e 10493msgstr "路径规格"
87cb7997 10494
d46c5519 10495#: builtin/clone.c:104
ef317cd5 10496msgid "initialize submodules in the clone"
07432cef 10497msgstr "在克隆时初始化子模组"
ef317cd5 10498
d46c5519 10499#: builtin/clone.c:107
5b04ee3b
JX
10500msgid "number of submodules cloned in parallel"
10501msgstr "并发克隆的子模组的数量"
10502
d46c5519 10503#: builtin/clone.c:108 builtin/init-db.c:486
ef317cd5 10504msgid "template-directory"
07432cef 10505msgstr "模板目录"
ef317cd5 10506
d46c5519 10507#: builtin/clone.c:109 builtin/init-db.c:487
ef317cd5 10508msgid "directory from which templates will be used"
07432cef 10509msgstr "模板目录将被使用"
ef317cd5 10510
d46c5519
JX
10511#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379
10512#: builtin/submodule--helper.c:1859
ef317cd5 10513msgid "reference repository"
160fb2b2 10514msgstr "参考仓库"
ef317cd5 10515
d46c5519
JX
10516#: builtin/clone.c:115 builtin/submodule--helper.c:1381
10517#: builtin/submodule--helper.c:1861
7aea43ff 10518msgid "use --reference only while cloning"
160fb2b2 10519msgstr "仅在克隆时参考 --reference 指向的本地仓库"
7aea43ff 10520
d46c5519
JX
10521#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46
10522#: builtin/pack-objects.c:3306 builtin/repack.c:329
ef317cd5 10523msgid "name"
07432cef 10524msgstr "名称"
ef317cd5 10525
d46c5519 10526#: builtin/clone.c:117
ef317cd5 10527msgid "use <name> instead of 'origin' to track upstream"
4375c10e 10528msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
ef317cd5 10529
d46c5519 10530#: builtin/clone.c:119
ef317cd5 10531msgid "checkout <branch> instead of the remote's HEAD"
4375c10e 10532msgstr "检出 <分支> 而不是远程 HEAD"
ef317cd5 10533
d46c5519 10534#: builtin/clone.c:121
ef317cd5 10535msgid "path to git-upload-pack on the remote"
07432cef 10536msgstr "远程 git-upload-pack 路径"
ef317cd5 10537
d46c5519
JX
10538#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836
10539#: builtin/pull.c:225
ef317cd5 10540msgid "depth"
07432cef 10541msgstr "深度"
ef317cd5 10542
d46c5519 10543#: builtin/clone.c:123
ef317cd5 10544msgid "create a shallow clone of that depth"
07432cef 10545msgstr "创建一个指定深度的浅克隆"
ef317cd5 10546
d46c5519 10547#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295
a0b6b246
JX
10548msgid "time"
10549msgstr "时间"
10550
d46c5519 10551#: builtin/clone.c:125
a0b6b246
JX
10552msgid "create a shallow clone since a specific time"
10553msgstr "从一个特定时间创建一个浅克隆"
10554
d46c5519
JX
10555#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169
10556#: builtin/rebase.c:1389
a0b6b246
JX
10557msgid "revision"
10558msgstr "版本"
10559
d46c5519 10560#: builtin/clone.c:127 builtin/fetch.c:147
1a79b2f1
JX
10561msgid "deepen history of shallow clone, excluding rev"
10562msgstr "深化浅克隆的历史,除了特定版本"
a0b6b246 10563
d46c5519 10564#: builtin/clone.c:129
ef317cd5 10565msgid "clone only one branch, HEAD or --branch"
07432cef 10566msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 10567
d46c5519 10568#: builtin/clone.c:131
a4f16749
JX
10569msgid "don't clone any tags, and make later fetches not to follow them"
10570msgstr "不要克隆任何标签,并且后续获取操作也不下载它们"
10571
d46c5519 10572#: builtin/clone.c:133
5b04ee3b
JX
10573msgid "any cloned submodules will be shallow"
10574msgstr "子模组将以浅下载模式克隆"
10575
d46c5519 10576#: builtin/clone.c:134 builtin/init-db.c:495
ef317cd5 10577msgid "gitdir"
07432cef 10578msgstr "git目录"
ef317cd5 10579
d46c5519 10580#: builtin/clone.c:135 builtin/init-db.c:496
ef317cd5 10581msgid "separate git dir from working tree"
07432cef 10582msgstr "git目录和工作区分离"
ef317cd5 10583
d46c5519 10584#: builtin/clone.c:136
ef317cd5 10585msgid "key=value"
07432cef 10586msgstr "key=value"
ef317cd5 10587
d46c5519 10588#: builtin/clone.c:137
ef317cd5 10589msgid "set config inside the new repository"
160fb2b2 10590msgstr "在新仓库中设置配置信息"
ef317cd5 10591
d46c5519
JX
10592#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
10593#: builtin/push.c:585 builtin/send-pack.c:172
10594msgid "server-specific"
10595msgstr "server-specific"
10596
10597#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
10598#: builtin/push.c:585 builtin/send-pack.c:173
10599msgid "option to transmit"
10600msgstr "传输选项"
10601
10602#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238
06991777 10603#: builtin/push.c:586
276ceeaa
JX
10604msgid "use IPv4 addresses only"
10605msgstr "只使用 IPv4 地址"
10606
d46c5519 10607#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241
06991777 10608#: builtin/push.c:588
276ceeaa
JX
10609msgid "use IPv6 addresses only"
10610msgstr "只使用 IPv6 地址"
10611
06991777 10612#: builtin/clone.c:280
3495628d
JX
10613msgid ""
10614"No directory name could be guessed.\n"
10615"Please specify a directory on the command line"
10616msgstr ""
10617"无法猜到目录名。\n"
26e4cbec 10618"请在命令行指定一个目录"
3495628d 10619
06991777 10620#: builtin/clone.c:333
cfff71a9 10621#, c-format
a0b6b246
JX
10622msgid "info: Could not add alternate for '%s': %s\n"
10623msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
cfff71a9 10624
06991777 10625#: builtin/clone.c:405
5c57d762
JX
10626#, c-format
10627msgid "failed to open '%s'"
c1ac5258 10628msgstr "打开 '%s' 失败"
5c57d762 10629
06991777 10630#: builtin/clone.c:413
c04f5ac3
JX
10631#, c-format
10632msgid "%s exists and is not a directory"
10633msgstr "%s 存在且不是一个目录"
10634
06991777 10635#: builtin/clone.c:427
c04f5ac3
JX
10636#, c-format
10637msgid "failed to stat %s\n"
65e2041e 10638msgstr "对 %s 调用 stat 失败\n"
c04f5ac3 10639
06991777 10640#: builtin/clone.c:444
4c27fcb5
JX
10641#, c-format
10642msgid "failed to unlink '%s'"
10643msgstr "删除 '%s' 失败"
10644
06991777 10645#: builtin/clone.c:449
c04f5ac3
JX
10646#, c-format
10647msgid "failed to create link '%s'"
c1ac5258 10648msgstr "创建链接 '%s' 失败"
c04f5ac3 10649
06991777 10650#: builtin/clone.c:453
c04f5ac3
JX
10651#, c-format
10652msgid "failed to copy file to '%s'"
c1ac5258 10653msgstr "拷贝文件至 '%s' 失败"
c04f5ac3 10654
06991777 10655#: builtin/clone.c:479
c04f5ac3
JX
10656#, c-format
10657msgid "done.\n"
10658msgstr "完成。\n"
10659
06991777 10660#: builtin/clone.c:493
1003b3a5
JX
10661msgid ""
10662"Clone succeeded, but checkout failed.\n"
10663"You can inspect what was checked out with 'git status'\n"
10664"and retry the checkout with 'git checkout -f HEAD'\n"
10665msgstr ""
10666"克隆成功,但是检出失败。\n"
10667"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
10668"'git checkout -f HEAD' 重试\n"
10669
06991777 10670#: builtin/clone.c:570
c04f5ac3
JX
10671#, c-format
10672msgid "Could not find remote branch %s to clone."
90e6ef53 10673msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 10674
d46c5519 10675#: builtin/clone.c:689
3495628d
JX
10676#, c-format
10677msgid "unable to update %s"
10678msgstr "不能更新 %s"
10679
d46c5519 10680#: builtin/clone.c:739
c04f5ac3
JX
10681msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
10682msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
10683
d46c5519 10684#: builtin/clone.c:770
1003b3a5
JX
10685msgid "unable to checkout working tree"
10686msgstr "不能检出工作区"
10687
d46c5519 10688#: builtin/clone.c:815
3495628d
JX
10689msgid "unable to write parameters to config file"
10690msgstr "无法将参数写入配置文件"
10691
d46c5519 10692#: builtin/clone.c:878
04cb2f28
JX
10693msgid "cannot repack to clean up"
10694msgstr "无法执行 repack 来清理"
10695
d46c5519 10696#: builtin/clone.c:880
04cb2f28
JX
10697msgid "cannot unlink temporary alternates file"
10698msgstr "无法删除临时的 alternates 文件"
10699
d46c5519 10700#: builtin/clone.c:920 builtin/receive-pack.c:1952
c04f5ac3
JX
10701msgid "Too many arguments."
10702msgstr "太多参数。"
10703
d46c5519 10704#: builtin/clone.c:924
c04f5ac3 10705msgid "You must specify a repository to clone."
160fb2b2 10706msgstr "您必须指定一个仓库来克隆。"
c04f5ac3 10707
d46c5519 10708#: builtin/clone.c:937
c04f5ac3
JX
10709#, c-format
10710msgid "--bare and --origin %s options are incompatible."
10711msgstr "--bare 和 --origin %s 选项不兼容。"
10712
d46c5519 10713#: builtin/clone.c:940
07432cef
WS
10714msgid "--bare and --separate-git-dir are incompatible."
10715msgstr "--bare 和 --separate-git-dir 选项不兼容。"
10716
d46c5519 10717#: builtin/clone.c:953
c04f5ac3
JX
10718#, c-format
10719msgid "repository '%s' does not exist"
160fb2b2 10720msgstr "仓库 '%s' 不存在"
c04f5ac3 10721
d46c5519 10722#: builtin/clone.c:959 builtin/fetch.c:1610
cfff71a9
JX
10723#, c-format
10724msgid "depth %s is not a positive number"
10725msgstr "深度 %s 不是一个正数"
10726
d46c5519 10727#: builtin/clone.c:969
c04f5ac3
JX
10728#, c-format
10729msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 10730msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 10731
d46c5519 10732#: builtin/clone.c:979
c04f5ac3
JX
10733#, c-format
10734msgid "working tree '%s' already exists."
10735msgstr "工作区 '%s' 已经存在。"
10736
d46c5519
JX
10737#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264
10738#: builtin/worktree.c:296 builtin/worktree.c:328
5bb01d4f
JX
10739#, c-format
10740msgid "could not create leading directories of '%s'"
10741msgstr "不能为 '%s' 创建先导目录"
10742
d46c5519 10743#: builtin/clone.c:999
c04f5ac3 10744#, c-format
814ff314
JX
10745msgid "could not create work tree dir '%s'"
10746msgstr "不能创建工作区目录 '%s'"
c04f5ac3 10747
d46c5519 10748#: builtin/clone.c:1019
c04f5ac3
JX
10749#, c-format
10750msgid "Cloning into bare repository '%s'...\n"
160fb2b2 10751msgstr "克隆到纯仓库 '%s'...\n"
c04f5ac3 10752
d46c5519 10753#: builtin/clone.c:1021
c04f5ac3
JX
10754#, c-format
10755msgid "Cloning into '%s'...\n"
10756msgstr "正克隆到 '%s'...\n"
10757
d46c5519 10758#: builtin/clone.c:1045
a0b6b246
JX
10759msgid ""
10760"clone --recursive is not compatible with both --reference and --reference-if-"
10761"able"
10762msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
10763
d46c5519 10764#: builtin/clone.c:1106
6acbf033 10765msgid "--depth is ignored in local clones; use file:// instead."
a0b6b246
JX
10766msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
10767
d46c5519 10768#: builtin/clone.c:1108
a0b6b246
JX
10769msgid "--shallow-since is ignored in local clones; use file:// instead."
10770msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
6acbf033 10771
d46c5519 10772#: builtin/clone.c:1110
a0b6b246
JX
10773msgid "--shallow-exclude is ignored in local clones; use file:// instead."
10774msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
10775
d46c5519 10776#: builtin/clone.c:1112
31e5e17b
JX
10777msgid "--filter is ignored in local clones; use file:// instead."
10778msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。"
10779
d46c5519 10780#: builtin/clone.c:1115
6acbf033 10781msgid "source repository is shallow, ignoring --local"
160fb2b2 10782msgstr "源仓库是浅克隆,忽略 --local"
6acbf033 10783
d46c5519 10784#: builtin/clone.c:1120
6acbf033
JX
10785msgid "--local is ignored"
10786msgstr "--local 被忽略"
10787
d46c5519 10788#: builtin/clone.c:1197 builtin/clone.c:1205
c04f5ac3
JX
10789#, c-format
10790msgid "Remote branch %s not found in upstream %s"
10791msgstr "远程分支 %s 在上游 %s 未发现"
10792
d46c5519 10793#: builtin/clone.c:1208
c04f5ac3 10794msgid "You appear to have cloned an empty repository."
160fb2b2 10795msgstr "您似乎克隆了一个空仓库。"
c04f5ac3 10796
a4f16749 10797#: builtin/column.c:10
814ff314
JX
10798msgid "git column [<options>]"
10799msgstr "git column [<选项>]"
ef317cd5 10800
a4f16749 10801#: builtin/column.c:27
ef317cd5 10802msgid "lookup config vars"
07432cef 10803msgstr "查找配置变量"
ef317cd5 10804
a4f16749 10805#: builtin/column.c:28 builtin/column.c:29
ef317cd5 10806msgid "layout to use"
07432cef 10807msgstr "要使用的布局"
ef317cd5 10808
a4f16749 10809#: builtin/column.c:30
ef317cd5 10810msgid "Maximum width"
07432cef 10811msgstr "最大宽度"
ef317cd5 10812
a4f16749 10813#: builtin/column.c:31
ef317cd5 10814msgid "Padding space on left border"
07432cef 10815msgstr "左边框的填充空间"
ef317cd5 10816
a4f16749 10817#: builtin/column.c:32
ef317cd5 10818msgid "Padding space on right border"
07432cef 10819msgstr "右边框的填充空间"
ef317cd5 10820
a4f16749 10821#: builtin/column.c:33
ef317cd5 10822msgid "Padding space between columns"
07432cef 10823msgstr "两列之间的填充空间"
ef317cd5 10824
fd8cb379 10825#: builtin/column.c:51
8ada9598 10826msgid "--command must be the first argument"
81809b99 10827msgstr "--command 必须是第一个参数"
8ada9598 10828
d46c5519
JX
10829#: builtin/commit-tree.c:18
10830msgid ""
10831"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
10832"<file>)...] <tree>"
10833msgstr ""
10834"git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件"
10835">)...] <树>"
10836
10837#: builtin/commit-tree.c:31
10838#, c-format
10839msgid "duplicate parent %s ignored"
10840msgstr "忽略重复的父提交 %s"
10841
10842#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520
10843#, c-format
10844msgid "not a valid object name %s"
10845msgstr "不是一个有效的对象名 %s"
10846
10847#: builtin/commit-tree.c:93
10848#, c-format
10849msgid "git commit-tree: failed to open '%s'"
10850msgstr "git commit-tree:无法打开 '%s'"
10851
10852#: builtin/commit-tree.c:96
10853#, c-format
10854msgid "git commit-tree: failed to read '%s'"
10855msgstr "git commit-tree:无法读取 '%s'"
10856
10857#: builtin/commit-tree.c:98
10858#, c-format
10859msgid "git commit-tree: failed to close '%s'"
10860msgstr "git commit-tree:无法关闭 '%s'"
10861
10862#: builtin/commit-tree.c:111
10863msgid "parent"
10864msgstr "父提交"
10865
10866#: builtin/commit-tree.c:112
10867msgid "id of a parent commit object"
10868msgstr "父提交对象ID"
10869
10870#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268
10871#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473
10872#: builtin/tag.c:406
10873msgid "message"
10874msgstr "说明"
10875
10876#: builtin/commit-tree.c:115 builtin/commit.c:1480
10877msgid "commit message"
10878msgstr "提交说明"
10879
10880#: builtin/commit-tree.c:118
10881msgid "read commit log message from file"
10882msgstr "从文件中读取提交说明"
10883
10884#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283
10885#: builtin/pull.c:193 builtin/revert.c:117
10886msgid "GPG sign commit"
10887msgstr "GPG 提交签名"
10888
10889#: builtin/commit-tree.c:133
10890msgid "must give exactly one tree"
10891msgstr "必须精确地提供一个树"
10892
10893#: builtin/commit-tree.c:140
10894msgid "git commit-tree: failed to read"
10895msgstr "git commit-tree:读取失败"
10896
06991777 10897#: builtin/commit.c:41
814ff314 10898msgid "git commit [<options>] [--] <pathspec>..."
160fb2b2 10899msgstr "git commit [<选项>] [--] <路径规格>..."
ef317cd5 10900
06991777 10901#: builtin/commit.c:46
814ff314 10902msgid "git status [<options>] [--] <pathspec>..."
160fb2b2 10903msgstr "git status [<选项>] [--] <路径规格>..."
ef317cd5 10904
06991777 10905#: builtin/commit.c:51
c04f5ac3
JX
10906msgid ""
10907"You asked to amend the most recent commit, but doing so would make\n"
10908"it empty. You can repeat your command with --allow-empty, or you can\n"
10909"remove the commit entirely with \"git reset HEAD^\".\n"
10910msgstr ""
1b150dc9
T
10911"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
10912"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 10913
06991777 10914#: builtin/commit.c:56
c04f5ac3
JX
10915msgid ""
10916"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
10917"If you wish to commit it anyway, use:\n"
10918"\n"
10919" git commit --allow-empty\n"
10920"\n"
c04f5ac3 10921msgstr ""
a9ce4543
T
10922"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
10923"也要提交,使用命令:\n"
c04f5ac3
JX
10924"\n"
10925" git commit --allow-empty\n"
10926"\n"
c04f5ac3 10927
06991777 10928#: builtin/commit.c:63
b1894384
JX
10929msgid "Otherwise, please use 'git reset'\n"
10930msgstr "否则,请使用命令 'git reset'\n"
10931
06991777 10932#: builtin/commit.c:66
b1894384
JX
10933msgid ""
10934"If you wish to skip this commit, use:\n"
10935"\n"
10936" git reset\n"
10937"\n"
10938"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
10939"the remaining commits.\n"
10940msgstr ""
10941"如果您想跳过这个提交,使用命令:\n"
10942"\n"
10943" git reset\n"
10944"\n"
10945"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
10946"操作。\n"
10947
06991777 10948#: builtin/commit.c:312
c04f5ac3 10949msgid "failed to unpack HEAD tree object"
c1ac5258 10950msgstr "解包 HEAD 树对象失败"
c04f5ac3 10951
06991777 10952#: builtin/commit.c:353
c04f5ac3 10953msgid "unable to create temporary index"
90e6ef53 10954msgstr "不能创建临时索引"
c04f5ac3 10955
06991777 10956#: builtin/commit.c:359
c04f5ac3
JX
10957msgid "interactive add failed"
10958msgstr "交互式添加失败"
10959
06991777 10960#: builtin/commit.c:373
220c313c
JX
10961msgid "unable to update temporary index"
10962msgstr "无法更新临时索引"
10963
06991777 10964#: builtin/commit.c:375
220c313c
JX
10965msgid "Failed to update main cache tree"
10966msgstr "不能更新树的主缓存"
10967
06991777 10968#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
c04f5ac3 10969msgid "unable to write new_index file"
90e6ef53 10970msgstr "无法写 new_index 文件"
c04f5ac3 10971
06991777 10972#: builtin/commit.c:452
8ada9598 10973msgid "cannot do a partial commit during a merge."
81809b99 10974msgstr "在合并过程中不能做部分提交。"
c04f5ac3 10975
06991777 10976#: builtin/commit.c:454
8ada9598 10977msgid "cannot do a partial commit during a cherry-pick."
81809b99 10978msgstr "在拣选过程中不能做部分提交。"
8ada9598 10979
06991777 10980#: builtin/commit.c:462
c04f5ac3 10981msgid "cannot read the index"
90e6ef53 10982msgstr "无法读取索引"
c04f5ac3 10983
06991777 10984#: builtin/commit.c:481
c04f5ac3 10985msgid "unable to write temporary index file"
90e6ef53 10986msgstr "无法写临时索引文件"
c04f5ac3 10987
06991777 10988#: builtin/commit.c:579
220c313c
JX
10989#, c-format
10990msgid "commit '%s' lacks author header"
10991msgstr "提交 '%s' 缺少作者信息"
10992
06991777 10993#: builtin/commit.c:581
c04f5ac3 10994#, c-format
220c313c 10995msgid "commit '%s' has malformed author line"
fd8cb379 10996msgstr "提交 '%s' 有格式错误的作者信息"
c04f5ac3 10997
06991777 10998#: builtin/commit.c:600
c04f5ac3 10999msgid "malformed --author parameter"
fd8cb379 11000msgstr "格式错误的 --author 参数"
c04f5ac3 11001
d46c5519 11002#: builtin/commit.c:653
6acbf033
JX
11003msgid ""
11004"unable to select a comment character that is not used\n"
11005"in the current commit message"
11006msgstr "无法选择一个未被当前提交说明使用的注释字符"
11007
d46c5519 11008#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069
c04f5ac3
JX
11009#, c-format
11010msgid "could not lookup commit %s"
11011msgstr "不能查询提交 %s"
11012
d46c5519 11013#: builtin/commit.c:703 builtin/shortlog.c:319
c04f5ac3
JX
11014#, c-format
11015msgid "(reading log message from standard input)\n"
90e6ef53 11016msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 11017
d46c5519 11018#: builtin/commit.c:705
c04f5ac3 11019msgid "could not read log from standard input"
90e6ef53 11020msgstr "不能从标准输入中读取日志信息"
c04f5ac3 11021
d46c5519 11022#: builtin/commit.c:709
c04f5ac3
JX
11023#, c-format
11024msgid "could not read log file '%s'"
90e6ef53 11025msgstr "不能读取日志文件 '%s'"
c04f5ac3 11026
d46c5519 11027#: builtin/commit.c:740 builtin/commit.c:756
c04f5ac3 11028msgid "could not read SQUASH_MSG"
90e6ef53 11029msgstr "不能读取 SQUASH_MSG"
c04f5ac3 11030
d46c5519 11031#: builtin/commit.c:747
5b04ee3b
JX
11032msgid "could not read MERGE_MSG"
11033msgstr "不能读取 MERGE_MSG"
11034
d46c5519 11035#: builtin/commit.c:807
c04f5ac3 11036msgid "could not write commit template"
90e6ef53 11037msgstr "不能写提交模版"
c04f5ac3 11038
d46c5519 11039#: builtin/commit.c:826
81809b99 11040#, c-format
c04f5ac3
JX
11041msgid ""
11042"\n"
8ada9598 11043"It looks like you may be committing a merge.\n"
c04f5ac3
JX
11044"If this is not correct, please remove the file\n"
11045"\t%s\n"
11046"and try again.\n"
11047msgstr ""
11048"\n"
649900bc 11049"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
11050"\t%s\n"
11051"然后重试。\n"
11052
d46c5519 11053#: builtin/commit.c:831
81809b99 11054#, c-format
8ada9598
JX
11055msgid ""
11056"\n"
11057"It looks like you may be committing a cherry-pick.\n"
11058"If this is not correct, please remove the file\n"
11059"\t%s\n"
11060"and try again.\n"
11061msgstr ""
11062"\n"
649900bc 11063"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
11064"\t%s\n"
11065"然后重试。\n"
c04f5ac3 11066
d46c5519 11067#: builtin/commit.c:844
a77c07d9 11068#, c-format
c04f5ac3 11069msgid ""
8ada9598 11070"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 11071"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 11072msgstr ""
a77c07d9 11073"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 11074"说明将会终止提交。\n"
c04f5ac3 11075
d46c5519 11076#: builtin/commit.c:852
a77c07d9 11077#, c-format
c04f5ac3 11078msgid ""
8ada9598 11079"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 11080"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
11081"An empty message aborts the commit.\n"
11082msgstr ""
a77c07d9
JX
11083"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
11084"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 11085
90e6ef53 11086# 译者:为保证在输出中对齐,注意调整句中空格!
d46c5519 11087#: builtin/commit.c:869
6acbf033
JX
11088#, c-format
11089msgid "%sAuthor: %.*s <%.*s>"
11090msgstr "%s作者: %.*s <%.*s>"
11091
11092# 译者:为保证在输出中对齐,注意调整句中空格!
d46c5519 11093#: builtin/commit.c:877
c04f5ac3 11094#, c-format
6acbf033
JX
11095msgid "%sDate: %s"
11096msgstr "%s日期: %s"
c04f5ac3 11097
90e6ef53 11098# 译者:为保证在输出中对齐,注意调整句中空格!
d46c5519 11099#: builtin/commit.c:884
c04f5ac3 11100#, c-format
6acbf033
JX
11101msgid "%sCommitter: %.*s <%.*s>"
11102msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 11103
d46c5519 11104#: builtin/commit.c:902
c04f5ac3 11105msgid "Cannot read index"
90e6ef53 11106msgstr "无法读取索引"
c04f5ac3 11107
d46c5519 11108#: builtin/commit.c:969
c04f5ac3
JX
11109msgid "Error building trees"
11110msgstr "无法创建树对象"
11111
d46c5519 11112#: builtin/commit.c:983 builtin/tag.c:269
c04f5ac3
JX
11113#, c-format
11114msgid "Please supply the message using either -m or -F option.\n"
07432cef 11115msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 11116
d46c5519 11117#: builtin/commit.c:1027
c04f5ac3 11118#, c-format
814ff314 11119msgid "--author '%s' is not 'Name <email>' and matches no existing author"
58b6f078 11120msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配"
c04f5ac3 11121
d46c5519 11122#: builtin/commit.c:1041
5809aa05
JX
11123#, c-format
11124msgid "Invalid ignored mode '%s'"
11125msgstr "无效的忽略模式 '%s'"
11126
d46c5519 11127#: builtin/commit.c:1059 builtin/commit.c:1284
c04f5ac3
JX
11128#, c-format
11129msgid "Invalid untracked files mode '%s'"
90e6ef53 11130msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 11131
d46c5519 11132#: builtin/commit.c:1097
2e8451e8
JX
11133msgid "--long and -z are incompatible"
11134msgstr "--long 和 -z 选项不兼容"
11135
d46c5519 11136#: builtin/commit.c:1130
c04f5ac3
JX
11137msgid "Using both --reset-author and --author does not make sense"
11138msgstr "同时使用 --reset-author 和 --author 没有意义"
11139
d46c5519 11140#: builtin/commit.c:1139
c04f5ac3 11141msgid "You have nothing to amend."
90e6ef53 11142msgstr "您没有可修补的提交。"
c04f5ac3 11143
d46c5519 11144#: builtin/commit.c:1142
8ada9598 11145msgid "You are in the middle of a merge -- cannot amend."
81809b99 11146msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 11147
d46c5519 11148#: builtin/commit.c:1144
8ada9598 11149msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 11150msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 11151
d46c5519 11152#: builtin/commit.c:1147
c04f5ac3 11153msgid "Options --squash and --fixup cannot be used together"
649900bc 11154msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 11155
d46c5519 11156#: builtin/commit.c:1157
c04f5ac3
JX
11157msgid "Only one of -c/-C/-F/--fixup can be used."
11158msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
11159
d46c5519 11160#: builtin/commit.c:1159
31e5e17b
JX
11161msgid "Option -m cannot be combined with -c/-C/-F."
11162msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
c04f5ac3 11163
d46c5519 11164#: builtin/commit.c:1167
c04f5ac3 11165msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 11166msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 11167
d46c5519 11168#: builtin/commit.c:1184
c04f5ac3
JX
11169msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
11170msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
11171
d46c5519 11172#: builtin/commit.c:1186
c04f5ac3
JX
11173msgid "No paths with --include/--only does not make sense."
11174msgstr "参数 --include/--only 不跟路径没有意义。"
11175
d46c5519 11176#: builtin/commit.c:1192
c04f5ac3 11177#, c-format
d46c5519
JX
11178msgid "paths '%s ...' with -a does not make sense"
11179msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"
c04f5ac3 11180
d46c5519 11181#: builtin/commit.c:1319 builtin/commit.c:1503
ef317cd5 11182msgid "show status concisely"
07432cef 11183msgstr "以简洁的格式显示状态"
ef317cd5 11184
d46c5519 11185#: builtin/commit.c:1321 builtin/commit.c:1505
ef317cd5 11186msgid "show branch information"
07432cef 11187msgstr "显示分支信息"
ef317cd5 11188
d46c5519 11189#: builtin/commit.c:1323
a4f16749
JX
11190msgid "show stash information"
11191msgstr "显示贮藏区信息"
11192
d46c5519 11193#: builtin/commit.c:1325 builtin/commit.c:1507
31e5e17b
JX
11194msgid "compute full ahead/behind values"
11195msgstr "计算完整的领先/落后值"
11196
d46c5519 11197#: builtin/commit.c:1327
a0b6b246
JX
11198msgid "version"
11199msgstr "版本"
11200
d46c5519
JX
11201#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561
11202#: builtin/worktree.c:643
ef317cd5 11203msgid "machine-readable output"
07432cef
WS
11204msgstr "机器可读的输出"
11205
d46c5519 11206#: builtin/commit.c:1330 builtin/commit.c:1511
07432cef
WS
11207msgid "show status in long format (default)"
11208msgstr "以长格式显示状态(默认)"
ef317cd5 11209
d46c5519 11210#: builtin/commit.c:1333 builtin/commit.c:1514
ef317cd5 11211msgid "terminate entries with NUL"
4375c10e 11212msgstr "条目以 NUL 字符结尾"
ef317cd5 11213
d46c5519
JX
11214#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517
11215#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465
11216#: parse-options.h:331
ef317cd5 11217msgid "mode"
07432cef 11218msgstr "模式"
ef317cd5 11219
d46c5519 11220#: builtin/commit.c:1336 builtin/commit.c:1517
ef317cd5 11221msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 11222msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 11223
d46c5519 11224#: builtin/commit.c:1340
5809aa05
JX
11225msgid ""
11226"show ignored files, optional modes: traditional, matching, no. (Default: "
11227"traditional)"
31e5e17b
JX
11228msgstr ""
11229"显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)"
ef317cd5 11230
d46c5519 11231#: builtin/commit.c:1342 parse-options.h:179
ef317cd5
JX
11232msgid "when"
11233msgstr "何时"
11234
d46c5519 11235#: builtin/commit.c:1343
ef317cd5
JX
11236msgid ""
11237"ignore changes to submodules, optional when: all, dirty, untracked. "
11238"(Default: all)"
11239msgstr ""
07432cef 11240"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 11241
d46c5519 11242#: builtin/commit.c:1345
ef317cd5 11243msgid "list untracked files in columns"
07432cef 11244msgstr "以列的方式显示未跟踪的文件"
ef317cd5 11245
d46c5519 11246#: builtin/commit.c:1346
fd8cb379
JX
11247msgid "do not detect renames"
11248msgstr "不检测重命名"
11249
d46c5519 11250#: builtin/commit.c:1348
fd8cb379
JX
11251msgid "detect renames, optionally set similarity index"
11252msgstr "检测重命名,可以设置索引相似度"
11253
d46c5519 11254#: builtin/commit.c:1368
5809aa05
JX
11255msgid "Unsupported combination of ignored and untracked-files arguments"
11256msgstr "不支持已忽略和未跟踪文件参数的组合"
11257
d46c5519 11258#: builtin/commit.c:1473
ef317cd5 11259msgid "suppress summary after successful commit"
07432cef 11260msgstr "提交成功后不显示概述信息"
c04f5ac3 11261
d46c5519 11262#: builtin/commit.c:1474
ef317cd5 11263msgid "show diff in commit message template"
07432cef 11264msgstr "在提交说明模板里显示差异"
c04f5ac3 11265
d46c5519 11266#: builtin/commit.c:1476
ef317cd5 11267msgid "Commit message options"
07432cef 11268msgstr "提交说明选项"
c04f5ac3 11269
d46c5519 11270#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408
ef317cd5 11271msgid "read message from file"
07432cef 11272msgstr "从文件中读取提交说明"
c04f5ac3 11273
d46c5519 11274#: builtin/commit.c:1478
ef317cd5 11275msgid "author"
07432cef 11276msgstr "作者"
c04f5ac3 11277
d46c5519 11278#: builtin/commit.c:1478
ef317cd5 11279msgid "override author for commit"
07432cef 11280msgstr "提交时覆盖作者"
73a60cd2 11281
d46c5519 11282#: builtin/commit.c:1479 builtin/gc.c:539
ef317cd5 11283msgid "date"
07432cef 11284msgstr "日期"
c04f5ac3 11285
d46c5519 11286#: builtin/commit.c:1479
ef317cd5 11287msgid "override date for commit"
07432cef 11288msgstr "提交时覆盖日期"
c04f5ac3 11289
d46c5519
JX
11290#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483
11291#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92
94550ed3
JX
11292msgid "commit"
11293msgstr "提交"
11294
d46c5519 11295#: builtin/commit.c:1481
ef317cd5 11296msgid "reuse and edit message from specified commit"
07432cef 11297msgstr "重用并编辑指定提交的提交说明"
ef317cd5 11298
d46c5519 11299#: builtin/commit.c:1482
ef317cd5 11300msgid "reuse message from specified commit"
07432cef 11301msgstr "重用指定提交的提交说明"
ef317cd5 11302
d46c5519 11303#: builtin/commit.c:1483
ef317cd5 11304msgid "use autosquash formatted message to fixup specified commit"
07432cef 11305msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 11306
d46c5519 11307#: builtin/commit.c:1484
ef317cd5 11308msgid "use autosquash formatted message to squash specified commit"
07432cef 11309msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 11310
d46c5519 11311#: builtin/commit.c:1485
ef317cd5 11312msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 11313msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 11314
d46c5519
JX
11315#: builtin/commit.c:1486 builtin/log.c:1541 builtin/merge.c:285
11316#: builtin/pull.c:162 builtin/revert.c:109
ef317cd5 11317msgid "add Signed-off-by:"
07432cef 11318msgstr "添加 Signed-off-by: 签名"
ef317cd5 11319
d46c5519 11320#: builtin/commit.c:1487
ef317cd5 11321msgid "use specified template file"
07432cef 11322msgstr "使用指定的模板文件"
ef317cd5 11323
d46c5519 11324#: builtin/commit.c:1488
ef317cd5 11325msgid "force edit of commit"
07432cef 11326msgstr "强制编辑提交"
ef317cd5 11327
d46c5519 11328#: builtin/commit.c:1490
ef317cd5 11329msgid "include status in commit message template"
07432cef 11330msgstr "在提交说明模板里包含状态信息"
ef317cd5 11331
d46c5519 11332#: builtin/commit.c:1495
ef317cd5 11333msgid "Commit contents options"
07432cef 11334msgstr "提交内容选项"
ef317cd5 11335
d46c5519 11336#: builtin/commit.c:1496
ef317cd5 11337msgid "commit all changed files"
07432cef 11338msgstr "提交所有改动的文件"
ef317cd5 11339
d46c5519 11340#: builtin/commit.c:1497
ef317cd5 11341msgid "add specified files to index for commit"
07432cef 11342msgstr "添加指定的文件到索引区等待提交"
ef317cd5 11343
d46c5519 11344#: builtin/commit.c:1498
ef317cd5 11345msgid "interactively add files"
07432cef 11346msgstr "交互式添加文件"
ef317cd5 11347
d46c5519 11348#: builtin/commit.c:1499
ef317cd5 11349msgid "interactively add changes"
07432cef 11350msgstr "交互式添加变更"
ef317cd5 11351
d46c5519 11352#: builtin/commit.c:1500
ef317cd5 11353msgid "commit only specified files"
07432cef 11354msgstr "只提交指定的文件"
ef317cd5 11355
d46c5519 11356#: builtin/commit.c:1501
5c57d762
JX
11357msgid "bypass pre-commit and commit-msg hooks"
11358msgstr "绕过 pre-commit 和 commit-msg 钩子"
11359
d46c5519 11360#: builtin/commit.c:1502
ef317cd5 11361msgid "show what would be committed"
07432cef 11362msgstr "显示将要提交的内容"
ef317cd5 11363
d46c5519 11364#: builtin/commit.c:1515
ef317cd5 11365msgid "amend previous commit"
07432cef 11366msgstr "修改先前的提交"
ef317cd5 11367
d46c5519 11368#: builtin/commit.c:1516
ef317cd5 11369msgid "bypass post-rewrite hook"
07432cef 11370msgstr "绕过 post-rewrite 钩子"
ef317cd5 11371
d46c5519 11372#: builtin/commit.c:1521
ef317cd5 11373msgid "ok to record an empty change"
07432cef 11374msgstr "允许一个空提交"
ef317cd5 11375
d46c5519 11376#: builtin/commit.c:1523
ef317cd5 11377msgid "ok to record a change with an empty message"
07432cef 11378msgstr "允许空的提交说明"
ef317cd5 11379
d46c5519 11380#: builtin/commit.c:1596
c04f5ac3
JX
11381#, c-format
11382msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 11383msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 11384
d46c5519 11385#: builtin/commit.c:1603
c04f5ac3 11386msgid "could not read MERGE_MODE"
90e6ef53 11387msgstr "不能读取 MERGE_MODE"
c04f5ac3 11388
d46c5519 11389#: builtin/commit.c:1622
c04f5ac3
JX
11390#, c-format
11391msgid "could not read commit message: %s"
90e6ef53 11392msgstr "不能读取提交说明:%s"
c04f5ac3 11393
d46c5519 11394#: builtin/commit.c:1629
c04f5ac3
JX
11395#, c-format
11396msgid "Aborting commit due to empty commit message.\n"
11397msgstr "终止提交因为提交说明为空。\n"
11398
d46c5519 11399#: builtin/commit.c:1634
6937cb4e
JX
11400#, c-format
11401msgid "Aborting commit; you did not edit the message.\n"
11402msgstr "终止提交;您未更改来自模版的提交说明。\n"
11403
06991777 11404#: builtin/commit.c:1668
c04f5ac3 11405msgid ""
c1ac5258 11406"repository has been updated, but unable to write\n"
220c313c 11407"new_index file. Check that disk is not full and quota is\n"
c04f5ac3
JX
11408"not exceeded, and then \"git reset HEAD\" to recover."
11409msgstr ""
160fb2b2 11410"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
90e6ef53 11411"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 11412
c1ac5258 11413#: builtin/commit-graph.c:10
fd8cb379
JX
11414msgid "git commit-graph [--object-dir <objdir>]"
11415msgstr "git commit-graph [--object-dir <对象目录>]"
11416
c1ac5258 11417#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
fd8cb379
JX
11418msgid "git commit-graph read [--object-dir <objdir>]"
11419msgstr "git commit-graph read [--object-dir <对象目录>]"
11420
c1ac5258
JX
11421#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
11422msgid "git commit-graph verify [--object-dir <objdir>]"
11423msgstr "git commit-graph verify [--object-dir <对象目录>]"
11424
11425#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
fd8cb379 11426msgid ""
c1ac5258
JX
11427"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
11428"stdin-packs|--stdin-commits]"
fd8cb379 11429msgstr ""
c1ac5258
JX
11430"git commit-graph write [--object-dir <对象目录>] [--append] [--reachable|--"
11431"stdin-packs|--stdin-commits]"
fd8cb379 11432
d46c5519
JX
11433#: builtin/commit-graph.c:51 builtin/commit-graph.c:89
11434#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153
11435#: builtin/log.c:1561
fd8cb379
JX
11436msgid "dir"
11437msgstr "目录"
11438
d46c5519
JX
11439#: builtin/commit-graph.c:52 builtin/commit-graph.c:90
11440#: builtin/commit-graph.c:148 builtin/commit-graph.c:206
fd8cb379
JX
11441msgid "The object directory to store the graph"
11442msgstr "保存图形的对象目录"
11443
d46c5519
JX
11444#: builtin/commit-graph.c:68 builtin/commit-graph.c:105
11445#, c-format
11446msgid "Could not open commit-graph '%s'"
11447msgstr "无法打开提交图形 '%s'"
11448
11449#: builtin/commit-graph.c:150
c1ac5258
JX
11450msgid "start walk at all refs"
11451msgstr "开始遍历所有引用"
11452
d46c5519 11453#: builtin/commit-graph.c:152
fd8cb379
JX
11454msgid "scan pack-indexes listed by stdin for commits"
11455msgstr "从标准输入中的包索引文件列表中扫描提交"
11456
d46c5519 11457#: builtin/commit-graph.c:154
fd8cb379
JX
11458msgid "start walk at commits listed by stdin"
11459msgstr "从标准输入中的提交开始扫描"
11460
d46c5519 11461#: builtin/commit-graph.c:156
fd8cb379
JX
11462msgid "include all commits already in the commit-graph file"
11463msgstr "包含 commit-graph 文件中已有所有提交"
11464
d46c5519 11465#: builtin/commit-graph.c:165
c1ac5258
JX
11466msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
11467msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
fd8cb379 11468
4c27fcb5 11469#: builtin/config.c:11
814ff314
JX
11470msgid "git config [<options>]"
11471msgstr "git config [<选项>]"
ef317cd5 11472
4c27fcb5 11473#: builtin/config.c:103
fd8cb379
JX
11474#, c-format
11475msgid "unrecognized --type argument, %s"
11476msgstr "未能识别的 --type 参数,%s"
11477
4c27fcb5 11478#: builtin/config.c:115
c1ac5258
JX
11479msgid "only one type at a time"
11480msgstr "一次只能一个类型"
11481
4c27fcb5 11482#: builtin/config.c:124
ef317cd5 11483msgid "Config file location"
07432cef 11484msgstr "配置文件位置"
ef317cd5 11485
4c27fcb5 11486#: builtin/config.c:125
ef317cd5 11487msgid "use global config file"
07432cef 11488msgstr "使用全局配置文件"
ef317cd5 11489
4c27fcb5 11490#: builtin/config.c:126
ef317cd5 11491msgid "use system config file"
07432cef 11492msgstr "使用系统级配置文件"
ef317cd5 11493
4c27fcb5 11494#: builtin/config.c:127
ef317cd5 11495msgid "use repository config file"
160fb2b2 11496msgstr "使用仓库级配置文件"
ef317cd5 11497
4c27fcb5
JX
11498#: builtin/config.c:128
11499msgid "use per-worktree config file"
11500msgstr "使用工作区级别的配置文件"
11501
11502#: builtin/config.c:129
ef317cd5 11503msgid "use given config file"
07432cef 11504msgstr "使用指定的配置文件"
ef317cd5 11505
4c27fcb5 11506#: builtin/config.c:130
2e8451e8 11507msgid "blob-id"
4375c10e 11508msgstr "数据对象 ID"
2e8451e8 11509
4c27fcb5 11510#: builtin/config.c:130
2e8451e8
JX
11511msgid "read config from given blob object"
11512msgstr "从给定的数据对象读取配置"
11513
4c27fcb5 11514#: builtin/config.c:131
ef317cd5 11515msgid "Action"
07432cef 11516msgstr "操作"
ef317cd5 11517
4c27fcb5 11518#: builtin/config.c:132
ef317cd5 11519msgid "get value: name [value-regex]"
07432cef 11520msgstr "获取值:name [value-regex]"
ef317cd5 11521
4c27fcb5 11522#: builtin/config.c:133
ef317cd5 11523msgid "get all values: key [value-regex]"
07432cef 11524msgstr "获得所有的值:key [value-regex]"
ef317cd5 11525
4c27fcb5 11526#: builtin/config.c:134
ef317cd5 11527msgid "get values for regexp: name-regex [value-regex]"
07432cef 11528msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 11529
4c27fcb5 11530#: builtin/config.c:135
90314792
JX
11531msgid "get value specific for the URL: section[.var] URL"
11532msgstr "获得 URL 取值:section[.var] URL"
11533
4c27fcb5 11534#: builtin/config.c:136
ef317cd5 11535msgid "replace all matching variables: name value [value_regex]"
07432cef 11536msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 11537
4c27fcb5 11538#: builtin/config.c:137
ef317cd5 11539msgid "add a new variable: name value"
07432cef 11540msgstr "添加一个新的变量:name value"
ef317cd5 11541
4c27fcb5 11542#: builtin/config.c:138
ef317cd5 11543msgid "remove a variable: name [value-regex]"
07432cef 11544msgstr "删除一个变量:name [value-regex]"
ef317cd5 11545
4c27fcb5 11546#: builtin/config.c:139
ef317cd5 11547msgid "remove all matches: name [value-regex]"
07432cef 11548msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 11549
4c27fcb5 11550#: builtin/config.c:140
ef317cd5 11551msgid "rename section: old-name new-name"
07432cef 11552msgstr "重命名小节:old-name new-name"
ef317cd5 11553
4c27fcb5 11554#: builtin/config.c:141
ef317cd5 11555msgid "remove a section: name"
07432cef 11556msgstr "删除一个小节:name"
ef317cd5 11557
4c27fcb5 11558#: builtin/config.c:142
ef317cd5 11559msgid "list all"
07432cef 11560msgstr "列出所有"
ef317cd5 11561
4c27fcb5 11562#: builtin/config.c:143
ef317cd5 11563msgid "open an editor"
07432cef 11564msgstr "打开一个编辑器"
ef317cd5 11565
4c27fcb5 11566#: builtin/config.c:144
04cb2f28
JX
11567msgid "find the color configured: slot [default]"
11568msgstr "获得配置的颜色:配置 [默认]"
ef317cd5 11569
4c27fcb5 11570#: builtin/config.c:145
04cb2f28
JX
11571msgid "find the color setting: slot [stdout-is-tty]"
11572msgstr "获得颜色设置:配置 [stdout-is-tty]"
ef317cd5 11573
4c27fcb5 11574#: builtin/config.c:146
ef317cd5 11575msgid "Type"
07432cef 11576msgstr "类型"
ef317cd5 11577
4c27fcb5 11578#: builtin/config.c:147
fd8cb379
JX
11579msgid "value is given this type"
11580msgstr "取值为该类型"
11581
4c27fcb5 11582#: builtin/config.c:148
ef317cd5 11583msgid "value is \"true\" or \"false\""
07432cef 11584msgstr "值是 \"true\" 或 \"false\""
ef317cd5 11585
4c27fcb5 11586#: builtin/config.c:149
ef317cd5 11587msgid "value is decimal number"
07432cef 11588msgstr "值是十进制数"
ef317cd5 11589
4c27fcb5 11590#: builtin/config.c:150
ef317cd5 11591msgid "value is --bool or --int"
07432cef 11592msgstr "值是 --bool or --int"
ef317cd5 11593
4c27fcb5 11594#: builtin/config.c:151
ef317cd5 11595msgid "value is a path (file or directory name)"
07432cef 11596msgstr "值是一个路径(文件或目录名)"
ef317cd5 11597
4c27fcb5 11598#: builtin/config.c:152
5809aa05
JX
11599msgid "value is an expiry date"
11600msgstr "值是一个到期日期"
11601
4c27fcb5 11602#: builtin/config.c:153
ef317cd5 11603msgid "Other"
07432cef 11604msgstr "其它"
ef317cd5 11605
4c27fcb5 11606#: builtin/config.c:154
ef317cd5 11607msgid "terminate values with NUL byte"
4375c10e 11608msgstr "终止值是 NUL 字节"
ef317cd5 11609
4c27fcb5 11610#: builtin/config.c:155
1b7f4a34
JX
11611msgid "show variable names only"
11612msgstr "只显示变量名"
11613
4c27fcb5 11614#: builtin/config.c:156
ef317cd5 11615msgid "respect include directives on lookup"
07432cef 11616msgstr "查询时参照 include 指令递归查找"
ef317cd5 11617
4c27fcb5 11618#: builtin/config.c:157
276ceeaa
JX
11619msgid "show origin of config (file, standard input, blob, command line)"
11620msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
11621
4c27fcb5 11622#: builtin/config.c:158
fd8cb379
JX
11623msgid "value"
11624msgstr "取值"
11625
4c27fcb5 11626#: builtin/config.c:158
fd8cb379
JX
11627msgid "with --get, use default value when missing entry"
11628msgstr "使用 --get 参数,当缺少设置时使用默认值"
11629
06991777 11630#: builtin/config.c:172
c1ac5258
JX
11631#, c-format
11632msgid "wrong number of arguments, should be %d"
11633msgstr "错误的参数个数,应该为 %d 个"
11634
06991777 11635#: builtin/config.c:174
c1ac5258
JX
11636#, c-format
11637msgid "wrong number of arguments, should be from %d to %d"
11638msgstr "错误的参数个数,应该为从 %d 个到 %d 个"
11639
06991777 11640#: builtin/config.c:308
c1ac5258
JX
11641#, c-format
11642msgid "invalid key pattern: %s"
11643msgstr "无效键名模式:%s"
11644
06991777 11645#: builtin/config.c:344
fd8cb379
JX
11646#, c-format
11647msgid "failed to format default config value: %s"
c1ac5258
JX
11648msgstr "格式化默认配置值失败:%s"
11649
06991777 11650#: builtin/config.c:401
c1ac5258
JX
11651#, c-format
11652msgid "cannot parse color '%s'"
11653msgstr "无法解析颜色 '%s'"
fd8cb379 11654
06991777 11655#: builtin/config.c:443
220c313c 11656msgid "unable to parse default color value"
c1ac5258
JX
11657msgstr "无法解析默认颜色值"
11658
06991777 11659#: builtin/config.c:496 builtin/config.c:742
c1ac5258
JX
11660msgid "not in a git directory"
11661msgstr "不在 git 仓库中"
11662
06991777 11663#: builtin/config.c:499
c1ac5258
JX
11664msgid "writing to stdin is not supported"
11665msgstr "不支持写到标准输入"
11666
06991777 11667#: builtin/config.c:502
c1ac5258
JX
11668msgid "writing config blobs is not supported"
11669msgstr "不支持写到配置数据对象"
220c313c 11670
06991777 11671#: builtin/config.c:587
220c313c
JX
11672#, c-format
11673msgid ""
11674"# This is Git's per-user configuration file.\n"
7aea43ff 11675"[user]\n"
220c313c 11676"# Please adapt and uncomment the following lines:\n"
7aea43ff 11677"#\tname = %s\n"
220c313c
JX
11678"#\temail = %s\n"
11679msgstr ""
11680"# This is Git's per-user configuration file.\n"
7aea43ff 11681"[user]\n"
220c313c 11682"# Please adapt and uncomment the following lines:\n"
7aea43ff 11683"#\tname = %s\n"
220c313c
JX
11684"#\temail = %s\n"
11685
06991777 11686#: builtin/config.c:611
c1ac5258
JX
11687msgid "only one config file at a time"
11688msgstr "一次只能有一个配置文件"
11689
06991777 11690#: builtin/config.c:616
a4f16749
JX
11691msgid "--local can only be used inside a git repository"
11692msgstr "--local 只能在一个仓库内使用"
11693
06991777 11694#: builtin/config.c:619
fd8cb379
JX
11695msgid "--blob can only be used inside a git repository"
11696msgstr "--blob 只能在一个仓库内使用"
11697
06991777 11698#: builtin/config.c:638
c1ac5258
JX
11699msgid "$HOME not set"
11700msgstr "$HOME 未设置"
11701
06991777 11702#: builtin/config.c:658
4c27fcb5
JX
11703msgid ""
11704"--worktree cannot be used with multiple working trees unless the config\n"
11705"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
11706"section in \"git help worktree\" for details"
11707msgstr ""
11708"不能和多个工作区一起使用 --worktree,除非启用 worktreeConfig 配置扩展。\n"
11709"详情请阅读“git help worktree”的“CONFIGURATION FILE”小节"
11710
06991777 11711#: builtin/config.c:688
c1ac5258
JX
11712msgid "--get-color and variable type are incoherent"
11713msgstr "--get-color 和变量类型不兼容"
11714
06991777 11715#: builtin/config.c:693
c1ac5258
JX
11716msgid "only one action at a time"
11717msgstr "一次只能有一个动作"
11718
06991777 11719#: builtin/config.c:706
c1ac5258
JX
11720msgid "--name-only is only applicable to --list or --get-regexp"
11721msgstr "--name-only 仅适用于 --list 或 --get-regexp"
11722
06991777 11723#: builtin/config.c:712
c1ac5258
JX
11724msgid ""
11725"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
11726"list"
11727msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
11728
06991777 11729#: builtin/config.c:718
c1ac5258
JX
11730msgid "--default is only applicable to --get"
11731msgstr "--default 仅适用于 --get"
11732
06991777 11733#: builtin/config.c:731
c1ac5258
JX
11734#, c-format
11735msgid "unable to read config file '%s'"
11736msgstr "无法读取配置文件 '%s'"
11737
06991777 11738#: builtin/config.c:734
c1ac5258
JX
11739msgid "error processing config file(s)"
11740msgstr "处理配置文件出错"
11741
06991777 11742#: builtin/config.c:744
c1ac5258
JX
11743msgid "editing stdin is not supported"
11744msgstr "不支持编辑标准输入"
11745
06991777 11746#: builtin/config.c:746
c1ac5258
JX
11747msgid "editing blobs is not supported"
11748msgstr "不支持编辑数据对象"
11749
06991777 11750#: builtin/config.c:760
220c313c
JX
11751#, c-format
11752msgid "cannot create configuration file %s"
11753msgstr "不能创建配置文件 %s"
11754
06991777 11755#: builtin/config.c:773
a0b6b246
JX
11756#, c-format
11757msgid ""
11758"cannot overwrite multiple values with a single value\n"
11759" Use a regexp, --add or --replace-all to change %s."
11760msgstr ""
11761"无法用一个值覆盖多个值\n"
11762" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
11763
06991777 11764#: builtin/config.c:847 builtin/config.c:858
c1ac5258
JX
11765#, c-format
11766msgid "no such section: %s"
11767msgstr "无此小节:%s"
11768
fd8cb379 11769#: builtin/count-objects.c:90
4dcdc3d8
JX
11770msgid "git count-objects [-v] [-H | --human-readable]"
11771msgstr "git count-objects [-v] [-H | --human-readable]"
11772
fd8cb379 11773#: builtin/count-objects.c:100
4dcdc3d8
JX
11774msgid "print sizes in human readable format"
11775msgstr "以用户可读的格式显示大小"
ef317cd5 11776
06991777 11777#: builtin/describe.c:27
814ff314
JX
11778msgid "git describe [<options>] [<commit-ish>...]"
11779msgstr "git describe [<选项>] [<提交号>...]"
ef317cd5 11780
06991777 11781#: builtin/describe.c:28
814ff314
JX
11782msgid "git describe [<options>] --dirty"
11783msgstr "git describe [<选项>] --dirty"
ef317cd5 11784
06991777 11785#: builtin/describe.c:63
87cb7997
JX
11786msgid "head"
11787msgstr "头"
11788
06991777 11789#: builtin/describe.c:63
87cb7997
JX
11790msgid "lightweight"
11791msgstr "轻量级的"
11792
06991777 11793#: builtin/describe.c:63
87cb7997
JX
11794msgid "annotated"
11795msgstr "附注的"
11796
06991777 11797#: builtin/describe.c:273
c04f5ac3
JX
11798#, c-format
11799msgid "annotated tag %s not available"
55a16ee4 11800msgstr "附注标签 %s 无效"
c04f5ac3 11801
06991777 11802#: builtin/describe.c:277
c04f5ac3
JX
11803#, c-format
11804msgid "annotated tag %s has no embedded name"
55a16ee4 11805msgstr "附注标签 %s 没有嵌入名称"
c04f5ac3 11806
06991777 11807#: builtin/describe.c:279
c04f5ac3
JX
11808#, c-format
11809msgid "tag '%s' is really '%s' here"
55a16ee4 11810msgstr "标签 '%s' 的确是在 '%s'"
c04f5ac3 11811
06991777 11812#: builtin/describe.c:323
c04f5ac3
JX
11813#, c-format
11814msgid "no tag exactly matches '%s'"
55a16ee4 11815msgstr "没有标签准确匹配 '%s'"
c04f5ac3 11816
06991777 11817#: builtin/describe.c:325
c04f5ac3 11818#, c-format
5809aa05
JX
11819msgid "No exact match on refs or tags, searching to describe\n"
11820msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n"
c04f5ac3 11821
06991777 11822#: builtin/describe.c:379
c04f5ac3
JX
11823#, c-format
11824msgid "finished search at %s\n"
11825msgstr "完成搜索 %s\n"
11826
06991777 11827#: builtin/describe.c:405
c04f5ac3
JX
11828#, c-format
11829msgid ""
11830"No annotated tags can describe '%s'.\n"
11831"However, there were unannotated tags: try --tags."
11832msgstr ""
55a16ee4
RC
11833"没有附注标签能描述 '%s'。\n"
11834"然而,存在未附注标签:尝试 --tags。"
c04f5ac3 11835
06991777 11836#: builtin/describe.c:409
c04f5ac3
JX
11837#, c-format
11838msgid ""
11839"No tags can describe '%s'.\n"
11840"Try --always, or create some tags."
11841msgstr ""
55a16ee4
RC
11842"没有标签能描述 '%s'。\n"
11843"尝试 --always,或者创建一些标签。"
c04f5ac3 11844
06991777 11845#: builtin/describe.c:439
c04f5ac3
JX
11846#, c-format
11847msgid "traversed %lu commits\n"
11848msgstr "已遍历 %lu 个提交\n"
11849
06991777 11850#: builtin/describe.c:442
c04f5ac3
JX
11851#, c-format
11852msgid ""
11853"more than %i tags found; listed %i most recent\n"
11854"gave up search at %s\n"
11855msgstr ""
55a16ee4 11856"发现多于 %i 个标签,列出最近的 %i 个\n"
90e6ef53 11857"在 %s 放弃搜索\n"
c04f5ac3 11858
06991777 11859#: builtin/describe.c:510
5809aa05
JX
11860#, c-format
11861msgid "describe %s\n"
11862msgstr "描述 %s\n"
11863
d46c5519 11864#: builtin/describe.c:513
5809aa05
JX
11865#, c-format
11866msgid "Not a valid object name %s"
11867msgstr "不是一个有效的对象名 %s"
11868
06991777 11869#: builtin/describe.c:521
5809aa05
JX
11870#, c-format
11871msgid "%s is neither a commit nor blob"
11872msgstr "%s 既不是提交也不是数据对象"
11873
06991777 11874#: builtin/describe.c:535
ef317cd5 11875msgid "find the tag that comes after the commit"
55a16ee4 11876msgstr "寻找该提交之后的标签"
ef317cd5 11877
06991777 11878#: builtin/describe.c:536
ef317cd5 11879msgid "debug search strategy on stderr"
07432cef 11880msgstr "在标准错误上调试搜索策略"
ef317cd5 11881
06991777 11882#: builtin/describe.c:537
1003b3a5
JX
11883msgid "use any ref"
11884msgstr "使用任意引用"
11885
06991777 11886#: builtin/describe.c:538
1003b3a5 11887msgid "use any tag, even unannotated"
55a16ee4 11888msgstr "使用任意标签,即使未附带注释"
ef317cd5 11889
06991777 11890#: builtin/describe.c:539
ef317cd5 11891msgid "always use long format"
07432cef 11892msgstr "始终使用长提交号格式"
ef317cd5 11893
06991777 11894#: builtin/describe.c:540
2e8451e8
JX
11895msgid "only follow first parent"
11896msgstr "只跟随第一个父提交"
11897
06991777 11898#: builtin/describe.c:543
ef317cd5 11899msgid "only output exact matches"
07432cef 11900msgstr "只输出精确匹配"
ef317cd5 11901
06991777 11902#: builtin/describe.c:545
ef317cd5 11903msgid "consider <n> most recent tags (default: 10)"
55a16ee4 11904msgstr "考虑最近 <n> 个标签(默认:10)"
ef317cd5 11905
06991777 11906#: builtin/describe.c:547
ef317cd5 11907msgid "only consider tags matching <pattern>"
55a16ee4 11908msgstr "只考虑匹配 <模式> 的标签"
ef317cd5 11909
06991777 11910#: builtin/describe.c:549
87cb7997
JX
11911msgid "do not consider tags matching <pattern>"
11912msgstr "不考虑匹配 <模式> 的标签"
11913
d46c5519 11914#: builtin/describe.c:551 builtin/name-rev.c:426
ef317cd5 11915msgid "show abbreviated commit object as fallback"
07432cef 11916msgstr "显示简写的提交号作为后备"
ef317cd5 11917
06991777 11918#: builtin/describe.c:552 builtin/describe.c:555
ef317cd5 11919msgid "mark"
07432cef 11920msgstr "标记"
ef317cd5 11921
06991777 11922#: builtin/describe.c:553
ef317cd5 11923msgid "append <mark> on dirty working tree (default: \"-dirty\")"
160fb2b2 11924msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
ef317cd5 11925
06991777 11926#: builtin/describe.c:556
87cb7997
JX
11927msgid "append <mark> on broken working tree (default: \"-broken\")"
11928msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
11929
06991777 11930#: builtin/describe.c:574
c04f5ac3
JX
11931msgid "--long is incompatible with --abbrev=0"
11932msgstr "--long 与 --abbrev=0 不兼容"
11933
06991777 11934#: builtin/describe.c:603
c04f5ac3 11935msgid "No names found, cannot describe anything."
90e6ef53 11936msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 11937
06991777 11938#: builtin/describe.c:654
a8a5406a 11939msgid "--dirty is incompatible with commit-ishes"
87cb7997
JX
11940msgstr "--dirty 与提交号不兼容"
11941
06991777 11942#: builtin/describe.c:656
87cb7997
JX
11943msgid "--broken is incompatible with commit-ishes"
11944msgstr "--broken 与提交号不兼容"
c04f5ac3 11945
06991777 11946#: builtin/diff.c:84
c04f5ac3
JX
11947#, c-format
11948msgid "'%s': not a regular file or symlink"
11949msgstr "'%s':不是一个正规文件或符号链接"
11950
06991777 11951#: builtin/diff.c:235
c04f5ac3
JX
11952#, c-format
11953msgid "invalid option: %s"
11954msgstr "无效选项:%s"
11955
d46c5519 11956#: builtin/diff.c:350
c04f5ac3 11957msgid "Not a git repository"
160fb2b2 11958msgstr "不是一个 git 仓库"
c04f5ac3 11959
d46c5519 11960#: builtin/diff.c:394
c04f5ac3
JX
11961#, c-format
11962msgid "invalid object '%s' given."
11963msgstr "提供了无效对象 '%s'。"
11964
d46c5519 11965#: builtin/diff.c:403
c04f5ac3
JX
11966#, c-format
11967msgid "more than two blobs given: '%s'"
160fb2b2 11968msgstr "提供了超过两个数据对象:'%s'"
c04f5ac3 11969
d46c5519 11970#: builtin/diff.c:408
c04f5ac3
JX
11971#, c-format
11972msgid "unhandled object '%s' given."
6c94aba5 11973msgstr "无法处理的对象 '%s'。"
c04f5ac3 11974
d46c5519 11975#: builtin/difftool.c:30
1a79b2f1
JX
11976msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
11977msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
11978
d46c5519 11979#: builtin/difftool.c:253
1a79b2f1
JX
11980#, c-format
11981msgid "failed: %d"
11982msgstr "失败:%d"
11983
d46c5519 11984#: builtin/difftool.c:295
87cb7997
JX
11985#, c-format
11986msgid "could not read symlink %s"
11987msgstr "无法读取符号链接 %s"
11988
d46c5519 11989#: builtin/difftool.c:297
87cb7997
JX
11990#, c-format
11991msgid "could not read symlink file %s"
11992msgstr "无法读取符号链接文件 %s"
11993
d46c5519 11994#: builtin/difftool.c:305
87cb7997
JX
11995#, c-format
11996msgid "could not read object %s for symlink %s"
11997msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
11998
d46c5519 11999#: builtin/difftool.c:406
1a79b2f1
JX
12000msgid ""
12001"combined diff formats('-c' and '--cc') are not supported in\n"
12002"directory diff mode('-d' and '--dir-diff')."
87cb7997
JX
12003msgstr ""
12004"不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
12005"cc')。"
1a79b2f1 12006
d46c5519 12007#: builtin/difftool.c:626
1a79b2f1
JX
12008#, c-format
12009msgid "both files modified: '%s' and '%s'."
12010msgstr "两个文件都被修改:'%s' 和 '%s'。"
12011
d46c5519 12012#: builtin/difftool.c:628
1a79b2f1
JX
12013msgid "working tree file has been left."
12014msgstr "工作区文件被留了下来。"
12015
d46c5519 12016#: builtin/difftool.c:639
1a79b2f1
JX
12017#, c-format
12018msgid "temporary files exist in '%s'."
12019msgstr "临时文件存在于 '%s'。"
12020
d46c5519 12021#: builtin/difftool.c:640
1a79b2f1
JX
12022msgid "you may want to cleanup or recover these."
12023msgstr "您可能想要清理或者恢复它们。"
12024
d46c5519 12025#: builtin/difftool.c:689
1a79b2f1
JX
12026msgid "use `diff.guitool` instead of `diff.tool`"
12027msgstr "使用 `diff.guitool` 代替 `diff.tool`"
12028
d46c5519 12029#: builtin/difftool.c:691
1a79b2f1
JX
12030msgid "perform a full-directory diff"
12031msgstr "执行一个全目录差异比较"
12032
d46c5519 12033#: builtin/difftool.c:693
1a79b2f1
JX
12034msgid "do not prompt before launching a diff tool"
12035msgstr "启动差异比较工具之前不提示"
12036
d46c5519 12037#: builtin/difftool.c:698
1a79b2f1
JX
12038msgid "use symlinks in dir-diff mode"
12039msgstr "在 dir-diff 模式中使用符号链接"
12040
d46c5519 12041#: builtin/difftool.c:699
c1ac5258
JX
12042msgid "tool"
12043msgstr "工具"
12044
d46c5519 12045#: builtin/difftool.c:700
1a79b2f1
JX
12046msgid "use the specified diff tool"
12047msgstr "使用指定的差异比较工具"
12048
d46c5519 12049#: builtin/difftool.c:702
1a79b2f1
JX
12050msgid "print a list of diff tools that may be used with `--tool`"
12051msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
12052
d46c5519 12053#: builtin/difftool.c:705
1a79b2f1
JX
12054msgid ""
12055"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
12056"code"
12057msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出"
12058
d46c5519 12059#: builtin/difftool.c:708
1a79b2f1
JX
12060msgid "specify a custom command for viewing diffs"
12061msgstr "指定一个用于查看差异的自定义命令"
12062
d46c5519
JX
12063#: builtin/difftool.c:709
12064msgid "passed to `diff`"
12065msgstr "传递给 `diff`"
12066
12067#: builtin/difftool.c:724
12068msgid "difftool requires worktree or --no-index"
12069msgstr "difftool 要求工作区或者 --no-index"
12070
12071#: builtin/difftool.c:731
12072msgid "--dir-diff is incompatible with --no-index"
12073msgstr "--dir-diff 和 --no-index 不兼容"
12074
12075#: builtin/difftool.c:734
12076msgid "--gui, --tool and --extcmd are mutually exclusive"
12077msgstr "--gui、--tool 和 --extcmd 互斥"
12078
12079#: builtin/difftool.c:742
1a79b2f1
JX
12080msgid "no <tool> given for --tool=<tool>"
12081msgstr "没有为 --tool=<工具> 参数提供 <工具>"
12082
d46c5519 12083#: builtin/difftool.c:749
1a79b2f1
JX
12084msgid "no <cmd> given for --extcmd=<cmd>"
12085msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
12086
c1ac5258 12087#: builtin/fast-export.c:29
ef317cd5 12088msgid "git fast-export [rev-list-opts]"
07432cef 12089msgstr "git fast-export [rev-list-opts]"
ef317cd5 12090
06991777 12091#: builtin/fast-export.c:1084
ef317cd5 12092msgid "show progress after <n> objects"
07432cef 12093msgstr "在 <n> 个对象之后显示进度"
ef317cd5 12094
06991777 12095#: builtin/fast-export.c:1086
ef317cd5 12096msgid "select handling of signed tags"
55a16ee4 12097msgstr "选择如何处理签名标签"
ef317cd5 12098
06991777 12099#: builtin/fast-export.c:1089
ef317cd5 12100msgid "select handling of tags that tag filtered objects"
55a16ee4 12101msgstr "选择当标签指向被过滤对象时该标签的处理方式"
ef317cd5 12102
06991777 12103#: builtin/fast-export.c:1092
ef317cd5 12104msgid "Dump marks to this file"
07432cef 12105msgstr "把标记存储到这个文件"
ef317cd5 12106
06991777 12107#: builtin/fast-export.c:1094
ef317cd5 12108msgid "Import marks from this file"
07432cef 12109msgstr "从这个文件导入标记"
ef317cd5 12110
06991777 12111#: builtin/fast-export.c:1096
ef317cd5 12112msgid "Fake a tagger when tags lack one"
55a16ee4 12113msgstr "当标签缺少标记者字段时,假装提供一个"
ef317cd5 12114
06991777 12115#: builtin/fast-export.c:1098
ef317cd5 12116msgid "Output full tree for each commit"
07432cef 12117msgstr "每次提交都输出整个树"
ef317cd5 12118
06991777 12119#: builtin/fast-export.c:1100
ef317cd5 12120msgid "Use the done feature to terminate the stream"
07432cef 12121msgstr "使用 done 功能来终止流"
ef317cd5 12122
06991777 12123#: builtin/fast-export.c:1101
ef317cd5 12124msgid "Skip output of blob data"
07432cef 12125msgstr "跳过数据对象的输出"
ef317cd5 12126
d46c5519 12127#: builtin/fast-export.c:1102 builtin/log.c:1609
6acbf033 12128msgid "refspec"
160fb2b2 12129msgstr "引用规格"
6acbf033 12130
06991777 12131#: builtin/fast-export.c:1103
6acbf033 12132msgid "Apply refspec to exported refs"
160fb2b2 12133msgstr "对导出的引用应用引用规格"
6acbf033 12134
06991777 12135#: builtin/fast-export.c:1104
220c313c
JX
12136msgid "anonymize output"
12137msgstr "匿名输出"
12138
06991777
JX
12139#: builtin/fast-export.c:1106
12140msgid "Reference parents which are not in fast-export stream by object id"
12141msgstr "引用父对象ID不在 fast-export 流中"
12142
12143#: builtin/fast-export.c:1108
12144msgid "Show original object ids of blobs/commits"
12145msgstr "显示数据对象/提交的原始对象ID"
12146
4c27fcb5 12147#: builtin/fetch.c:28
ef317cd5 12148msgid "git fetch [<options>] [<repository> [<refspec>...]]"
160fb2b2 12149msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
ef317cd5 12150
4c27fcb5 12151#: builtin/fetch.c:29
ef317cd5 12152msgid "git fetch [<options>] <group>"
07432cef 12153msgstr "git fetch [<选项>] <组>"
ef317cd5 12154
4c27fcb5 12155#: builtin/fetch.c:30
ef317cd5 12156msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
160fb2b2 12157msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
ef317cd5 12158
4c27fcb5 12159#: builtin/fetch.c:31
ef317cd5 12160msgid "git fetch --all [<options>]"
07432cef 12161msgstr "git fetch --all [<选项>]"
ef317cd5 12162
d46c5519 12163#: builtin/fetch.c:115 builtin/pull.c:202
ef317cd5 12164msgid "fetch from all remotes"
07432cef 12165msgstr "从所有的远程抓取"
ef317cd5 12166
d46c5519 12167#: builtin/fetch.c:117 builtin/pull.c:205
ef317cd5 12168msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 12169msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 12170
d46c5519 12171#: builtin/fetch.c:119 builtin/pull.c:208
ef317cd5 12172msgid "path to upload pack on remote end"
07432cef 12173msgstr "上传包到远程的路径"
ef317cd5 12174
4c27fcb5
JX
12175#: builtin/fetch.c:120
12176msgid "force overwrite of local reference"
12177msgstr "强制覆盖本地引用"
ef317cd5 12178
4c27fcb5 12179#: builtin/fetch.c:122
ef317cd5 12180msgid "fetch from multiple remotes"
07432cef 12181msgstr "从多个远程抓取"
ef317cd5 12182
d46c5519 12183#: builtin/fetch.c:124 builtin/pull.c:212
ef317cd5 12184msgid "fetch all tags and associated objects"
55a16ee4 12185msgstr "抓取所有的标签和关联对象"
ef317cd5 12186
4c27fcb5 12187#: builtin/fetch.c:126
ef317cd5 12188msgid "do not fetch all tags (--no-tags)"
55a16ee4 12189msgstr "不抓取任何标签(--no-tags)"
ef317cd5 12190
4c27fcb5 12191#: builtin/fetch.c:128
276ceeaa
JX
12192msgid "number of submodules fetched in parallel"
12193msgstr "子模组获取的并发数"
12194
d46c5519 12195#: builtin/fetch.c:130 builtin/pull.c:215
ef317cd5 12196msgid "prune remote-tracking branches no longer on remote"
07432cef 12197msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 12198
4c27fcb5 12199#: builtin/fetch.c:132
31e5e17b
JX
12200msgid "prune local tags no longer on remote and clobber changed tags"
12201msgstr "清除远程不存在的本地标签,并且替换变更标签"
12202
07432cef 12203# 译者:可选值,不能翻译
d46c5519 12204#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139
ef317cd5 12205msgid "on-demand"
07432cef 12206msgstr "on-demand"
ef317cd5 12207
4c27fcb5 12208#: builtin/fetch.c:134
ef317cd5 12209msgid "control recursive fetching of submodules"
07432cef 12210msgstr "控制子模组的递归抓取"
ef317cd5 12211
d46c5519 12212#: builtin/fetch.c:138 builtin/pull.c:223
ef317cd5 12213msgid "keep downloaded pack"
07432cef 12214msgstr "保持下载包"
ef317cd5 12215
4c27fcb5 12216#: builtin/fetch.c:140
ef317cd5 12217msgid "allow updating of HEAD ref"
07432cef 12218msgstr "允许更新 HEAD 引用"
ef317cd5 12219
d46c5519 12220#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226
ef317cd5 12221msgid "deepen history of shallow clone"
07432cef 12222msgstr "深化浅克隆的历史"
ef317cd5 12223
4c27fcb5 12224#: builtin/fetch.c:145
a0b6b246
JX
12225msgid "deepen history of shallow repository based on time"
12226msgstr "基于时间来深化浅克隆的历史"
12227
d46c5519 12228#: builtin/fetch.c:151 builtin/pull.c:229
a77c07d9 12229msgid "convert to a complete repository"
160fb2b2 12230msgstr "转换为一个完整的仓库"
a77c07d9 12231
4c27fcb5 12232#: builtin/fetch.c:154
ef317cd5 12233msgid "prepend this to submodule path output"
07432cef 12234msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 12235
4c27fcb5 12236#: builtin/fetch.c:157
a4f16749
JX
12237msgid ""
12238"default for recursive fetching of submodules (lower priority than config "
12239"files)"
12240msgstr "递归获取子模组的缺省值(比配置文件优先级低)"
ef317cd5 12241
d46c5519 12242#: builtin/fetch.c:161 builtin/pull.c:232
cfff71a9
JX
12243msgid "accept refs that update .git/shallow"
12244msgstr "接受更新 .git/shallow 的引用"
12245
d46c5519 12246#: builtin/fetch.c:162 builtin/pull.c:234
6acbf033
JX
12247msgid "refmap"
12248msgstr "引用映射"
12249
d46c5519 12250#: builtin/fetch.c:163 builtin/pull.c:235
6acbf033
JX
12251msgid "specify fetch refmap"
12252msgstr "指定获取操作的引用映射"
12253
4c27fcb5 12254#: builtin/fetch.c:170
c1ac5258
JX
12255msgid "report that we have only objects reachable from this object"
12256msgstr "报告我们只拥有从该对象开始可达的对象"
12257
06991777 12258#: builtin/fetch.c:469
c04f5ac3
JX
12259msgid "Couldn't find remote ref HEAD"
12260msgstr "无法发现远程 HEAD 引用"
12261
06991777 12262#: builtin/fetch.c:608
5c57d762
JX
12263#, c-format
12264msgid "configuration fetch.output contains invalid value %s"
12265msgstr "配置变量 fetch.output 包含无效值 %s"
12266
06991777 12267#: builtin/fetch.c:705
c04f5ac3
JX
12268#, c-format
12269msgid "object %s not found"
12270msgstr "对象 %s 未发现"
12271
06991777 12272#: builtin/fetch.c:709
c04f5ac3
JX
12273msgid "[up to date]"
12274msgstr "[最新]"
12275
06991777 12276#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
c04f5ac3
JX
12277msgid "[rejected]"
12278msgstr "[已拒绝]"
12279
06991777 12280#: builtin/fetch.c:723
5c57d762 12281msgid "can't fetch in current branch"
9a4b694c 12282msgstr "当前分支下不能执行获取操作"
5c57d762 12283
06991777 12284#: builtin/fetch.c:733
c04f5ac3 12285msgid "[tag update]"
55a16ee4 12286msgstr "[标签更新]"
c04f5ac3 12287
06991777
JX
12288#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
12289#: builtin/fetch.c:796
5c57d762
JX
12290msgid "unable to update local ref"
12291msgstr "不能更新本地引用"
c04f5ac3 12292
06991777 12293#: builtin/fetch.c:738
4c27fcb5
JX
12294msgid "would clobber existing tag"
12295msgstr "会破坏现有的标签"
12296
06991777 12297#: builtin/fetch.c:760
c04f5ac3 12298msgid "[new tag]"
55a16ee4 12299msgstr "[新标签]"
c04f5ac3 12300
06991777 12301#: builtin/fetch.c:763
c04f5ac3
JX
12302msgid "[new branch]"
12303msgstr "[新分支]"
12304
06991777 12305#: builtin/fetch.c:766
170e9899
JX
12306msgid "[new ref]"
12307msgstr "[新引用]"
12308
06991777 12309#: builtin/fetch.c:796
c04f5ac3
JX
12310msgid "forced update"
12311msgstr "强制更新"
12312
06991777 12313#: builtin/fetch.c:801
5c57d762
JX
12314msgid "non-fast-forward"
12315msgstr "非快进"
c04f5ac3 12316
06991777 12317#: builtin/fetch.c:847
c04f5ac3
JX
12318#, c-format
12319msgid "%s did not send all necessary objects\n"
e640d114 12320msgstr "%s 未发送所有必需的对象\n"
c04f5ac3 12321
06991777 12322#: builtin/fetch.c:868
cfff71a9
JX
12323#, c-format
12324msgid "reject %s because shallow roots are not allowed to be updated"
12325msgstr "拒绝 %s 因为浅克隆不允许被更新"
12326
06991777 12327#: builtin/fetch.c:959 builtin/fetch.c:1081
c04f5ac3
JX
12328#, c-format
12329msgid "From %.*s\n"
12330msgstr "来自 %.*s\n"
12331
06991777 12332#: builtin/fetch.c:970
c04f5ac3
JX
12333#, c-format
12334msgid ""
12335"some local refs could not be updated; try running\n"
12336" 'git remote prune %s' to remove any old, conflicting branches"
12337msgstr ""
12338"一些本地引用不能被更新;尝试运行\n"
12339" 'git remote prune %s' 来删除旧的、有冲突的分支"
12340
90e6ef53 12341# 译者:注意保持前导空格
06991777 12342#: builtin/fetch.c:1051
81809b99 12343#, c-format
8ada9598 12344msgid " (%s will become dangling)"
e640d114 12345msgstr " (%s 将成为悬空状态)"
c04f5ac3 12346
90e6ef53 12347# 译者:注意保持前导空格
06991777 12348#: builtin/fetch.c:1052
81809b99 12349#, c-format
8ada9598 12350msgid " (%s has become dangling)"
e640d114 12351msgstr " (%s 已成为悬空状态)"
c04f5ac3 12352
06991777 12353#: builtin/fetch.c:1084
c04f5ac3
JX
12354msgid "[deleted]"
12355msgstr "[已删除]"
12356
06991777 12357#: builtin/fetch.c:1085 builtin/remote.c:1036
c04f5ac3
JX
12358msgid "(none)"
12359msgstr "(无)"
12360
06991777 12361#: builtin/fetch.c:1108
c04f5ac3
JX
12362#, c-format
12363msgid "Refusing to fetch into current branch %s of non-bare repository"
160fb2b2 12364msgstr "拒绝获取到非纯仓库的当前分支 %s"
c04f5ac3 12365
06991777 12366#: builtin/fetch.c:1127
c04f5ac3
JX
12367#, c-format
12368msgid "Option \"%s\" value \"%s\" is not valid for %s"
12369msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
12370
06991777 12371#: builtin/fetch.c:1130
c04f5ac3
JX
12372#, c-format
12373msgid "Option \"%s\" is ignored for %s\n"
81809b99 12374msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 12375
06991777 12376#: builtin/fetch.c:1434
c04f5ac3
JX
12377#, c-format
12378msgid "Fetching %s\n"
d4a8e00b 12379msgstr "正在获取 %s\n"
c04f5ac3 12380
06991777 12381#: builtin/fetch.c:1436 builtin/remote.c:100
c04f5ac3
JX
12382#, c-format
12383msgid "Could not fetch %s"
12384msgstr "不能获取 %s"
12385
06991777 12386#: builtin/fetch.c:1482
31e5e17b 12387msgid ""
06991777
JX
12388"--filter can only be used with the remote configured in extensions."
12389"partialClone"
12390msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
31e5e17b 12391
06991777 12392#: builtin/fetch.c:1506
c04f5ac3
JX
12393msgid ""
12394"No remote repository specified. Please, specify either a URL or a\n"
12395"remote name from which new revisions should be fetched."
4375c10e 12396msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
c04f5ac3 12397
06991777 12398#: builtin/fetch.c:1543
c04f5ac3 12399msgid "You need to specify a tag name."
55a16ee4 12400msgstr "您需要指定一个标签名称。"
c04f5ac3 12401
d46c5519 12402#: builtin/fetch.c:1594
a0b6b246
JX
12403msgid "Negative depth in --deepen is not supported"
12404msgstr "--deepen 不支持负数深度"
12405
d46c5519 12406#: builtin/fetch.c:1596
a0b6b246
JX
12407msgid "--deepen and --depth are mutually exclusive"
12408msgstr "--deepen 和 --depth 是互斥的"
12409
d46c5519 12410#: builtin/fetch.c:1601
a77c07d9
JX
12411msgid "--depth and --unshallow cannot be used together"
12412msgstr "--depth 和 --unshallow 不能同时使用"
12413
d46c5519 12414#: builtin/fetch.c:1603
a77c07d9 12415msgid "--unshallow on a complete repository does not make sense"
160fb2b2 12416msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
a77c07d9 12417
d46c5519 12418#: builtin/fetch.c:1619
c04f5ac3 12419msgid "fetch --all does not take a repository argument"
160fb2b2 12420msgstr "fetch --all 不能带一个仓库参数"
c04f5ac3 12421
d46c5519 12422#: builtin/fetch.c:1621
c04f5ac3 12423msgid "fetch --all does not make sense with refspecs"
160fb2b2 12424msgstr "fetch --all 带引用规格没有任何意义"
c04f5ac3 12425
d46c5519 12426#: builtin/fetch.c:1630
c04f5ac3
JX
12427#, c-format
12428msgid "No such remote or remote group: %s"
12429msgstr "没有这样的远程或远程组:%s"
12430
d46c5519 12431#: builtin/fetch.c:1637
c04f5ac3 12432msgid "Fetching a group and specifying refspecs does not make sense"
160fb2b2 12433msgstr "获取组并指定引用规格没有意义"
c04f5ac3 12434
d46c5519 12435#: builtin/fetch.c:1653
06991777
JX
12436msgid ""
12437"--filter can only be used with the remote configured in extensions."
12438"partialclone"
12439msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
12440
4c27fcb5 12441#: builtin/fmt-merge-msg.c:18
814ff314
JX
12442msgid ""
12443"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
12444msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
c04f5ac3 12445
4c27fcb5 12446#: builtin/fmt-merge-msg.c:672
ef317cd5 12447msgid "populate log with at most <n> entries from shortlog"
07432cef 12448msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 12449
4c27fcb5 12450#: builtin/fmt-merge-msg.c:675
ef317cd5 12451msgid "alias for --log (deprecated)"
07432cef 12452msgstr "参数 --log 的别名(已弃用)"
ef317cd5 12453
4c27fcb5 12454#: builtin/fmt-merge-msg.c:678
ef317cd5 12455msgid "text"
07432cef 12456msgstr "文本"
ef317cd5 12457
4c27fcb5 12458#: builtin/fmt-merge-msg.c:679
ef317cd5 12459msgid "use <text> as start of message"
07432cef 12460msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 12461
4c27fcb5 12462#: builtin/fmt-merge-msg.c:680
ef317cd5 12463msgid "file to read from"
07432cef 12464msgstr "从文件中读取"
ef317cd5 12465
a4f16749 12466#: builtin/for-each-ref.c:10
814ff314
JX
12467msgid "git for-each-ref [<options>] [<pattern>]"
12468msgstr "git for-each-ref [<选项>] [<模式>]"
ef317cd5 12469
a4f16749 12470#: builtin/for-each-ref.c:11
94550ed3
JX
12471msgid "git for-each-ref [--points-at <object>]"
12472msgstr "git for-each-ref [--points-at <对象>]"
12473
a4f16749 12474#: builtin/for-each-ref.c:12
87cb7997
JX
12475msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
12476msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
94550ed3 12477
a4f16749 12478#: builtin/for-each-ref.c:13
87cb7997
JX
12479msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
12480msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
94550ed3 12481
a4f16749 12482#: builtin/for-each-ref.c:28
ef317cd5 12483msgid "quote placeholders suitably for shells"
07432cef 12484msgstr "引用占位符适用于 shells"
ef317cd5 12485
a4f16749 12486#: builtin/for-each-ref.c:30
ef317cd5 12487msgid "quote placeholders suitably for perl"
07432cef 12488msgstr "引用占位符适用于 perl"
ef317cd5 12489
a4f16749 12490#: builtin/for-each-ref.c:32
ef317cd5 12491msgid "quote placeholders suitably for python"
07432cef 12492msgstr "引用占位符适用于 python"
ef317cd5 12493
a4f16749 12494#: builtin/for-each-ref.c:34
04cb2f28
JX
12495msgid "quote placeholders suitably for Tcl"
12496msgstr "引用占位符适用于 Tcl"
ef317cd5 12497
a4f16749 12498#: builtin/for-each-ref.c:37
ef317cd5 12499msgid "show only <n> matched refs"
07432cef 12500msgstr "只显示 <n> 个匹配的引用"
ef317cd5 12501
d46c5519 12502#: builtin/for-each-ref.c:39 builtin/tag.c:433
6937cb4e
JX
12503msgid "respect format colors"
12504msgstr "遵照格式中的颜色输出"
12505
d46c5519 12506#: builtin/for-each-ref.c:42
94550ed3
JX
12507msgid "print only refs which points at the given object"
12508msgstr "只打印指向给定对象的引用"
ef317cd5 12509
d46c5519 12510#: builtin/for-each-ref.c:44
94550ed3
JX
12511msgid "print only refs that are merged"
12512msgstr "只打印已经合并的引用"
12513
d46c5519 12514#: builtin/for-each-ref.c:45
94550ed3
JX
12515msgid "print only refs that are not merged"
12516msgstr "只打印没有合并的引用"
ef317cd5 12517
d46c5519 12518#: builtin/for-each-ref.c:46
94550ed3
JX
12519msgid "print only refs which contain the commit"
12520msgstr "只打印包含该提交的引用"
12521
d46c5519 12522#: builtin/for-each-ref.c:47
87cb7997
JX
12523msgid "print only refs which don't contain the commit"
12524msgstr "只打印不包含该提交的引用"
12525
06991777
JX
12526#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
12527msgid "unknown"
12528msgstr "未知"
12529
12530#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
12531#: builtin/fsck.c:120 builtin/fsck.c:136
12532#, c-format
12533msgid "error in %s %s: %s"
12534msgstr "%s %s 错误:%s"
12535
12536#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
12537#: builtin/fsck.c:131
12538#, c-format
12539msgid "warning in %s %s: %s"
12540msgstr "%s %s 警告:%s"
12541
12542#: builtin/fsck.c:157 builtin/fsck.c:159
12543#, c-format
12544msgid "broken link from %7s %s"
12545msgstr "来自 %7s %s 的损坏的链接"
12546
12547#: builtin/fsck.c:168
12548msgid "wrong object type in link"
12549msgstr "链接中错误的对象类型"
12550
12551#: builtin/fsck.c:184
12552#, c-format
12553msgid ""
12554"broken link from %7s %s\n"
12555" to %7s %s"
12556msgstr ""
12557"损坏的链接来自于 %7s %s\n"
12558" 到 %7s %s"
12559
d46c5519 12560#: builtin/fsck.c:295
06991777
JX
12561#, c-format
12562msgid "missing %s %s"
12563msgstr "缺失 %s %s"
12564
d46c5519 12565#: builtin/fsck.c:321
06991777
JX
12566#, c-format
12567msgid "unreachable %s %s"
12568msgstr "不可访问 %s %s"
12569
d46c5519 12570#: builtin/fsck.c:340
06991777
JX
12571#, c-format
12572msgid "dangling %s %s"
12573msgstr "悬空 %s %s"
12574
d46c5519 12575#: builtin/fsck.c:349
06991777
JX
12576msgid "could not create lost-found"
12577msgstr "不能创建 lost-found"
12578
d46c5519 12579#: builtin/fsck.c:360
06991777
JX
12580#, c-format
12581msgid "could not finish '%s'"
12582msgstr "不能完成 '%s'"
12583
d46c5519 12584#: builtin/fsck.c:377
06991777
JX
12585#, c-format
12586msgid "Checking %s"
12587msgstr "正在检查 %s"
12588
d46c5519 12589#: builtin/fsck.c:415
06991777
JX
12590#, c-format
12591msgid "Checking connectivity (%d objects)"
12592msgstr "正在检查连通性(%d 个对象)"
12593
d46c5519 12594#: builtin/fsck.c:434
06991777
JX
12595#, c-format
12596msgid "Checking %s %s"
12597msgstr "正在检查 %s %s"
12598
d46c5519 12599#: builtin/fsck.c:438
06991777
JX
12600msgid "broken links"
12601msgstr "损坏的链接"
12602
d46c5519 12603#: builtin/fsck.c:447
06991777
JX
12604#, c-format
12605msgid "root %s"
12606msgstr "根 %s"
12607
d46c5519 12608#: builtin/fsck.c:455
06991777
JX
12609#, c-format
12610msgid "tagged %s %s (%s) in %s"
12611msgstr "标记 %s %s (%s) 于 %s"
12612
d46c5519 12613#: builtin/fsck.c:484
06991777
JX
12614#, c-format
12615msgid "%s: object corrupt or missing"
12616msgstr "%s:对象损坏或丢失"
12617
d46c5519 12618#: builtin/fsck.c:509
06991777
JX
12619#, c-format
12620msgid "%s: invalid reflog entry %s"
12621msgstr "%s:无效的引用日志条目 %s"
12622
d46c5519 12623#: builtin/fsck.c:523
06991777
JX
12624#, c-format
12625msgid "Checking reflog %s->%s"
12626msgstr "正在检查引用日志 %s->%s"
12627
d46c5519 12628#: builtin/fsck.c:557
06991777
JX
12629#, c-format
12630msgid "%s: invalid sha1 pointer %s"
12631msgstr "%s:无效的 sha1 指针 %s"
12632
d46c5519 12633#: builtin/fsck.c:564
06991777
JX
12634#, c-format
12635msgid "%s: not a commit"
12636msgstr "%s:不是一个提交"
12637
d46c5519 12638#: builtin/fsck.c:619
06991777
JX
12639msgid "notice: No default references"
12640msgstr "注意:无默认引用"
12641
d46c5519 12642#: builtin/fsck.c:634
06991777
JX
12643#, c-format
12644msgid "%s: object corrupt or missing: %s"
12645msgstr "%s:对象损坏或丢失:%s"
12646
d46c5519 12647#: builtin/fsck.c:647
06991777
JX
12648#, c-format
12649msgid "%s: object could not be parsed: %s"
12650msgstr "%s:不能解析对象:%s"
12651
d46c5519 12652#: builtin/fsck.c:667
06991777
JX
12653#, c-format
12654msgid "bad sha1 file: %s"
12655msgstr "坏的 sha1 文件:%s"
12656
d46c5519 12657#: builtin/fsck.c:682
06991777
JX
12658msgid "Checking object directory"
12659msgstr "正在检查对象目录"
12660
d46c5519 12661#: builtin/fsck.c:685
6c94aba5 12662msgid "Checking object directories"
06991777
JX
12663msgstr "正在检查对象目录"
12664
d46c5519 12665#: builtin/fsck.c:700
06991777
JX
12666#, c-format
12667msgid "Checking %s link"
12668msgstr "正在检查 %s 链接"
12669
d46c5519 12670#: builtin/fsck.c:705 builtin/index-pack.c:841
06991777
JX
12671#, c-format
12672msgid "invalid %s"
12673msgstr "无效的 %s"
12674
d46c5519 12675#: builtin/fsck.c:712
06991777
JX
12676#, c-format
12677msgid "%s points to something strange (%s)"
12678msgstr "%s 指向奇怪的东西(%s)"
12679
d46c5519 12680#: builtin/fsck.c:718
06991777
JX
12681#, c-format
12682msgid "%s: detached HEAD points at nothing"
12683msgstr "%s:分离头指针的指向不存在"
12684
d46c5519 12685#: builtin/fsck.c:722
06991777
JX
12686#, c-format
12687msgid "notice: %s points to an unborn branch (%s)"
12688msgstr "注意:%s 指向一个尚未诞生的分支(%s)"
12689
d46c5519 12690#: builtin/fsck.c:734
06991777
JX
12691msgid "Checking cache tree"
12692msgstr "正在检查缓存树"
12693
d46c5519 12694#: builtin/fsck.c:739
06991777
JX
12695#, c-format
12696msgid "%s: invalid sha1 pointer in cache-tree"
12697msgstr "%s:cache-tree 中无效的 sha1 指针"
6c94aba5 12698
d46c5519 12699#: builtin/fsck.c:750
06991777
JX
12700msgid "non-tree in cache-tree"
12701msgstr "cache-tree 中非树对象"
12702
d46c5519 12703#: builtin/fsck.c:781
814ff314
JX
12704msgid "git fsck [<options>] [<object>...]"
12705msgstr "git fsck [<选项>] [<对象>...]"
ef317cd5 12706
d46c5519 12707#: builtin/fsck.c:787
ef317cd5 12708msgid "show unreachable objects"
07432cef 12709msgstr "显示不可达的对象"
ef317cd5 12710
d46c5519 12711#: builtin/fsck.c:788
ef317cd5 12712msgid "show dangling objects"
e640d114 12713msgstr "显示悬空的对象"
ef317cd5 12714
d46c5519 12715#: builtin/fsck.c:789
ef317cd5 12716msgid "report tags"
55a16ee4 12717msgstr "报告标签"
ef317cd5 12718
d46c5519 12719#: builtin/fsck.c:790
ef317cd5 12720msgid "report root nodes"
07432cef 12721msgstr "报告根节点"
ef317cd5 12722
d46c5519 12723#: builtin/fsck.c:791
ef317cd5 12724msgid "make index objects head nodes"
07432cef 12725msgstr "将索引亦作为检查的头节点"
ef317cd5 12726
d46c5519 12727#: builtin/fsck.c:792
ef317cd5 12728msgid "make reflogs head nodes (default)"
07432cef 12729msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 12730
d46c5519 12731#: builtin/fsck.c:793
ef317cd5 12732msgid "also consider packs and alternate objects"
07432cef 12733msgstr "也考虑包和备用对象"
ef317cd5 12734
d46c5519 12735#: builtin/fsck.c:794
1b7f4a34
JX
12736msgid "check only connectivity"
12737msgstr "仅检查连通性"
12738
d46c5519 12739#: builtin/fsck.c:795
ef317cd5 12740msgid "enable more strict checking"
07432cef 12741msgstr "启用更严格的检查"
ef317cd5 12742
d46c5519 12743#: builtin/fsck.c:797
ef317cd5 12744msgid "write dangling objects in .git/lost-found"
e640d114 12745msgstr "将悬空对象写入 .git/lost-found 中"
ef317cd5 12746
d46c5519 12747#: builtin/fsck.c:798 builtin/prune.c:132
ef317cd5 12748msgid "show progress"
07432cef 12749msgstr "显示进度"
ef317cd5 12750
d46c5519 12751#: builtin/fsck.c:799
5c57d762
JX
12752msgid "show verbose names for reachable objects"
12753msgstr "显示可达对象的详细名称"
12754
d46c5519 12755#: builtin/fsck.c:859 builtin/index-pack.c:224
6c94aba5 12756msgid "Checking objects"
06991777
JX
12757msgstr "正在检查对象"
12758
d46c5519 12759#: builtin/fsck.c:887
06991777
JX
12760#, c-format
12761msgid "%s: object missing"
12762msgstr "%s:对象缺失"
12763
d46c5519 12764#: builtin/fsck.c:899
06991777
JX
12765#, c-format
12766msgid "invalid parameter: expected sha1, got '%s'"
12767msgstr "无效的参数:期望 sha1,得到 '%s'"
6c94aba5 12768
c1ac5258 12769#: builtin/gc.c:34
814ff314
JX
12770msgid "git gc [<options>]"
12771msgstr "git gc [<选项>]"
ef317cd5 12772
c1ac5258 12773#: builtin/gc.c:90
c04f5ac3 12774#, c-format
87cb7997 12775msgid "Failed to fstat %s: %s"
65e2041e 12776msgstr "对 %s 调用 fstat 失败:%s"
c04f5ac3 12777
d46c5519
JX
12778#: builtin/gc.c:126
12779#, c-format
12780msgid "failed to parse '%s' value '%s'"
12781msgstr "无法解析 '%s' 值 '%s'"
12782
12783#: builtin/gc.c:476 builtin/init-db.c:55
c04f5ac3 12784#, c-format
4c27fcb5
JX
12785msgid "cannot stat '%s'"
12786msgstr "不能对 '%s' 调用 stat"
12787
d46c5519 12788#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519
4c27fcb5
JX
12789#, c-format
12790msgid "cannot read '%s'"
12791msgstr "不能读取 '%s'"
c04f5ac3 12792
d46c5519 12793#: builtin/gc.c:492
94550ed3
JX
12794#, c-format
12795msgid ""
12796"The last gc run reported the following. Please correct the root cause\n"
12797"and remove %s.\n"
12798"Automatic cleanup will not be performed until the file is removed.\n"
12799"\n"
12800"%s"
12801msgstr ""
12802"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
12803"在该文件被删除之前,自动清理将不会执行。\n"
12804"\n"
12805"%s"
12806
d46c5519 12807#: builtin/gc.c:540
ef317cd5 12808msgid "prune unreferenced objects"
07432cef 12809msgstr "清除未引用的对象"
ef317cd5 12810
d46c5519 12811#: builtin/gc.c:542
ef317cd5 12812msgid "be more thorough (increased runtime)"
07432cef 12813msgstr "更彻底(增加运行时间)"
ef317cd5 12814
d46c5519 12815#: builtin/gc.c:543
ef317cd5 12816msgid "enable auto-gc mode"
07432cef 12817msgstr "启用自动垃圾回收模式"
ef317cd5 12818
d46c5519 12819#: builtin/gc.c:546
90314792
JX
12820msgid "force running gc even if there may be another gc running"
12821msgstr "强制执行 gc 即使另外一个 gc 正在执行"
12822
d46c5519 12823#: builtin/gc.c:549
fd8cb379
JX
12824msgid "repack all other packs except the largest pack"
12825msgstr "除了最大的包之外,对所有其它包文件重新打包"
12826
d46c5519 12827#: builtin/gc.c:566
fd8cb379
JX
12828#, c-format
12829msgid "failed to parse gc.logexpiry value %s"
c1ac5258 12830msgstr "解析 gc.logexpiry 的值 %s 失败"
fd8cb379 12831
d46c5519 12832#: builtin/gc.c:577
87cb7997 12833#, c-format
fd8cb379 12834msgid "failed to parse prune expiry value %s"
c1ac5258 12835msgstr "解析清除期限值 %s 失败"
87cb7997 12836
d46c5519 12837#: builtin/gc.c:597
c04f5ac3 12838#, c-format
6c94aba5 12839msgid "Auto packing the repository in background for optimum performance.\n"
160fb2b2 12840msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6c94aba5 12841
d46c5519 12842#: builtin/gc.c:599
6c94aba5
JX
12843#, c-format
12844msgid "Auto packing the repository for optimum performance.\n"
160fb2b2 12845msgstr "自动打包仓库以求最佳性能。\n"
6c94aba5 12846
d46c5519 12847#: builtin/gc.c:600
6c94aba5
JX
12848#, c-format
12849msgid "See \"git help gc\" for manual housekeeping.\n"
12850msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 12851
d46c5519 12852#: builtin/gc.c:640
90314792
JX
12853#, c-format
12854msgid ""
12855"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
12856msgstr ""
29004bbb 12857"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)"
90314792 12858
d46c5519 12859#: builtin/gc.c:693
c04f5ac3
JX
12860msgid ""
12861"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 12862msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 12863
06991777 12864#: builtin/grep.c:29
814ff314
JX
12865msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
12866msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
ef317cd5 12867
06991777 12868#: builtin/grep.c:225
c04f5ac3
JX
12869#, c-format
12870msgid "grep: failed to create thread: %s"
90e6ef53 12871msgstr "grep:无法创建线程:%s"
c04f5ac3 12872
06991777 12873#: builtin/grep.c:279
276ceeaa
JX
12874#, c-format
12875msgid "invalid number of threads specified (%d) for %s"
12876msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
12877
a4f16749
JX
12878#. TRANSLATORS: %s is the configuration
12879#. variable for tweaking threads, currently
12880#. grep.threads
12881#.
d46c5519
JX
12882#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705
12883#: builtin/pack-objects.c:2720
a4f16749
JX
12884#, c-format
12885msgid "no threads support, ignoring %s"
12886msgstr "没有线程支持,忽略 %s"
12887
06991777 12888#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
c04f5ac3
JX
12889#, c-format
12890msgid "unable to read tree (%s)"
90e6ef53 12891msgstr "无法读取树(%s)"
c04f5ac3 12892
06991777 12893#: builtin/grep.c:646
c04f5ac3
JX
12894#, c-format
12895msgid "unable to grep from object of type %s"
12896msgstr "无法抓取来自于 %s 类型的对象"
12897
06991777 12898#: builtin/grep.c:712
c04f5ac3
JX
12899#, c-format
12900msgid "switch `%c' expects a numerical value"
12901msgstr "开关 `%c' 期望一个数字值"
12902
06991777 12903#: builtin/grep.c:811
ef317cd5 12904msgid "search in index instead of in the work tree"
07432cef 12905msgstr "在索引区搜索而不是在工作区"
ef317cd5 12906
06991777 12907#: builtin/grep.c:813
ef317cd5 12908msgid "find in contents not managed by git"
07432cef 12909msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
12910
12911# 译者:中文字符串拼接,可删除前导空格
06991777 12912#: builtin/grep.c:815
ef317cd5 12913msgid "search in both tracked and untracked files"
07432cef 12914msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 12915
06991777 12916#: builtin/grep.c:817
814ff314
JX
12917msgid "ignore files specified via '.gitignore'"
12918msgstr "忽略 '.gitignore' 包含的文件"
ef317cd5 12919
06991777 12920#: builtin/grep.c:819
87cb7997 12921msgid "recursively search in each submodule"
1a79b2f1
JX
12922msgstr "在每一个子模组中递归搜索"
12923
06991777 12924#: builtin/grep.c:822
ef317cd5 12925msgid "show non-matching lines"
07432cef 12926msgstr "显示未匹配的行"
ef317cd5 12927
06991777 12928#: builtin/grep.c:824
ef317cd5 12929msgid "case insensitive matching"
07432cef 12930msgstr "不区分大小写匹配"
ef317cd5 12931
06991777 12932#: builtin/grep.c:826
ef317cd5 12933msgid "match patterns only at word boundaries"
07432cef 12934msgstr "只在单词边界匹配模式"
ef317cd5 12935
06991777 12936#: builtin/grep.c:828
ef317cd5 12937msgid "process binary files as text"
07432cef 12938msgstr "把二进制文件当做文本处理"
ef317cd5 12939
06991777 12940#: builtin/grep.c:830
ef317cd5 12941msgid "don't match patterns in binary files"
07432cef 12942msgstr "不在二进制文件中匹配模式"
ef317cd5 12943
06991777 12944#: builtin/grep.c:833
90314792
JX
12945msgid "process binary files with textconv filters"
12946msgstr "用 textconv 过滤器处理二进制文件"
12947
06991777 12948#: builtin/grep.c:835
4c27fcb5
JX
12949msgid "search in subdirectories (default)"
12950msgstr "在子目录中寻找(默认)"
12951
06991777 12952#: builtin/grep.c:837
ef317cd5 12953msgid "descend at most <depth> levels"
07432cef 12954msgstr "最多以指定的深度向下寻找"
ef317cd5 12955
06991777 12956#: builtin/grep.c:841
ef317cd5 12957msgid "use extended POSIX regular expressions"
07432cef 12958msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 12959
06991777 12960#: builtin/grep.c:844
ef317cd5 12961msgid "use basic POSIX regular expressions (default)"
07432cef 12962msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 12963
06991777 12964#: builtin/grep.c:847
ef317cd5 12965msgid "interpret patterns as fixed strings"
07432cef 12966msgstr "把模式解析为固定的字符串"
ef317cd5 12967
06991777 12968#: builtin/grep.c:850
ef317cd5 12969msgid "use Perl-compatible regular expressions"
07432cef 12970msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 12971
06991777 12972#: builtin/grep.c:853
ef317cd5 12973msgid "show line numbers"
07432cef 12974msgstr "显示行号"
ef317cd5 12975
06991777 12976#: builtin/grep.c:854
c1ac5258
JX
12977msgid "show column number of first match"
12978msgstr "显示第一个匹配的列号"
12979
06991777 12980#: builtin/grep.c:855
ef317cd5 12981msgid "don't show filenames"
07432cef 12982msgstr "不显示文件名"
ef317cd5 12983
06991777 12984#: builtin/grep.c:856
ef317cd5 12985msgid "show filenames"
07432cef 12986msgstr "显示文件名"
ef317cd5 12987
06991777 12988#: builtin/grep.c:858
ef317cd5 12989msgid "show filenames relative to top directory"
07432cef 12990msgstr "显示相对于顶级目录的文件名"
ef317cd5 12991
06991777 12992#: builtin/grep.c:860
ef317cd5 12993msgid "show only filenames instead of matching lines"
07432cef 12994msgstr "只显示文件名而不显示匹配的行"
ef317cd5 12995
06991777 12996#: builtin/grep.c:862
ef317cd5 12997msgid "synonym for --files-with-matches"
07432cef 12998msgstr "和 --files-with-matches 同义"
ef317cd5 12999
06991777 13000#: builtin/grep.c:865
ef317cd5 13001msgid "show only the names of files without match"
07432cef 13002msgstr "只显示未匹配的文件名"
ef317cd5 13003
06991777 13004#: builtin/grep.c:867
ef317cd5 13005msgid "print NUL after filenames"
07432cef 13006msgstr "在文件名后输出 NUL 字符"
ef317cd5 13007
06991777 13008#: builtin/grep.c:870
c1ac5258
JX
13009msgid "show only matching parts of a line"
13010msgstr "只显示行中的匹配的部分"
13011
06991777 13012#: builtin/grep.c:872
ef317cd5 13013msgid "show the number of matches instead of matching lines"
07432cef 13014msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 13015
06991777 13016#: builtin/grep.c:873
ef317cd5 13017msgid "highlight matches"
07432cef 13018msgstr "高亮显示匹配项"
ef317cd5 13019
06991777 13020#: builtin/grep.c:875
ef317cd5 13021msgid "print empty line between matches from different files"
07432cef 13022msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 13023
06991777 13024#: builtin/grep.c:877
ef317cd5 13025msgid "show filename only once above matches from same file"
07432cef 13026msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 13027
06991777 13028#: builtin/grep.c:880
ef317cd5 13029msgid "show <n> context lines before and after matches"
07432cef 13030msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 13031
06991777 13032#: builtin/grep.c:883
ef317cd5 13033msgid "show <n> context lines before matches"
07432cef 13034msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 13035
06991777 13036#: builtin/grep.c:885
ef317cd5 13037msgid "show <n> context lines after matches"
07432cef 13038msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 13039
06991777 13040#: builtin/grep.c:887
276ceeaa
JX
13041msgid "use <n> worker threads"
13042msgstr "使用 <n> 个工作线程"
13043
06991777 13044#: builtin/grep.c:888
ef317cd5 13045msgid "shortcut for -C NUM"
07432cef 13046msgstr "快捷键 -C 数字"
ef317cd5 13047
06991777 13048#: builtin/grep.c:891
ef317cd5 13049msgid "show a line with the function name before matches"
07432cef 13050msgstr "在匹配的前面显示一行函数名"
ef317cd5 13051
06991777 13052#: builtin/grep.c:893
ef317cd5 13053msgid "show the surrounding function"
07432cef 13054msgstr "显示所在函数的前后内容"
ef317cd5 13055
06991777 13056#: builtin/grep.c:896
ef317cd5 13057msgid "read patterns from file"
07432cef 13058msgstr "从文件读取模式"
ef317cd5 13059
06991777 13060#: builtin/grep.c:898
ef317cd5 13061msgid "match <pattern>"
07432cef 13062msgstr "匹配 <模式>"
ef317cd5 13063
06991777 13064#: builtin/grep.c:900
ef317cd5 13065msgid "combine patterns specified with -e"
07432cef 13066msgstr "组合用 -e 参数设定的模式"
ef317cd5 13067
06991777 13068#: builtin/grep.c:912
ef317cd5 13069msgid "indicate hit with exit status without output"
07432cef 13070msgstr "不输出,而用退出码标识命中状态"
ef317cd5 13071
06991777 13072#: builtin/grep.c:914
ef317cd5 13073msgid "show only matches from files that match all patterns"
07432cef 13074msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 13075
06991777 13076#: builtin/grep.c:916
07432cef
WS
13077msgid "show parse tree for grep expression"
13078msgstr "显示 grep 表达式的解析树"
13079
06991777 13080#: builtin/grep.c:920
ef317cd5 13081msgid "pager"
07432cef 13082msgstr "分页"
ef317cd5 13083
06991777 13084#: builtin/grep.c:920
ef317cd5 13085msgid "show matching files in the pager"
07432cef 13086msgstr "分页显示匹配的文件"
ef317cd5 13087
06991777 13088#: builtin/grep.c:924
ef317cd5 13089msgid "allow calling of grep(1) (ignored by this build)"
07432cef 13090msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 13091
06991777 13092#: builtin/grep.c:988
c1ac5258
JX
13093msgid "no pattern given"
13094msgstr "未提供匹配模式"
c04f5ac3 13095
06991777 13096#: builtin/grep.c:1024
87cb7997
JX
13097msgid "--no-index or --untracked cannot be used with revs"
13098msgstr "--no-index 或 --untracked 不能和版本同时使用"
13099
06991777 13100#: builtin/grep.c:1032
87cb7997
JX
13101#, c-format
13102msgid "unable to resolve revision: %s"
13103msgstr "不能解析版本:%s"
13104
06991777 13105#: builtin/grep.c:1063
4c27fcb5
JX
13106msgid "invalid option combination, ignoring --threads"
13107msgstr "无效的选项组合,忽略 --threads"
276ceeaa 13108
d46c5519 13109#: builtin/grep.c:1066 builtin/pack-objects.c:3403
a4f16749
JX
13110msgid "no threads support, ignoring --threads"
13111msgstr "没有线程支持,忽略 --threads"
13112
d46c5519 13113#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717
4c27fcb5
JX
13114#, c-format
13115msgid "invalid number of threads specified (%d)"
13116msgstr "指定的线程数无效(%d)"
13117
06991777 13118#: builtin/grep.c:1092
c04f5ac3
JX
13119msgid "--open-files-in-pager only works on the worktree"
13120msgstr "--open-files-in-pager 仅用于工作区"
13121
06991777 13122#: builtin/grep.c:1115
c1ac5258
JX
13123msgid "option not supported with --recurse-submodules"
13124msgstr "选项不支持和 --recurse-submodules 共用"
c04f5ac3 13125
06991777 13126#: builtin/grep.c:1121
c1ac5258
JX
13127msgid "--cached or --untracked cannot be used with --no-index"
13128msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
c04f5ac3 13129
06991777 13130#: builtin/grep.c:1127
c1ac5258
JX
13131msgid "--[no-]exclude-standard cannot be used for tracked contents"
13132msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
c04f5ac3 13133
06991777 13134#: builtin/grep.c:1135
c1ac5258
JX
13135msgid "both --cached and trees are given"
13136msgstr "同时给出了 --cached 和树对象"
13137
06991777 13138#: builtin/hash-object.c:85
ef317cd5 13139msgid ""
814ff314
JX
13140"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
13141"[--] <file>..."
ef317cd5 13142msgstr ""
814ff314
JX
13143"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
13144"[--] <文件>..."
ef317cd5 13145
06991777 13146#: builtin/hash-object.c:86
94550ed3
JX
13147msgid "git hash-object --stdin-paths"
13148msgstr "git hash-object --stdin-paths"
ef317cd5 13149
06991777 13150#: builtin/hash-object.c:98
ef317cd5 13151msgid "type"
07432cef 13152msgstr "类型"
ef317cd5 13153
06991777 13154#: builtin/hash-object.c:98
ef317cd5 13155msgid "object type"
07432cef 13156msgstr "对象类型"
ef317cd5 13157
06991777 13158#: builtin/hash-object.c:99
ef317cd5 13159msgid "write the object into the object database"
07432cef 13160msgstr "将对象写入对象数据库"
ef317cd5 13161
06991777 13162#: builtin/hash-object.c:101
ef317cd5 13163msgid "read the object from stdin"
07432cef 13164msgstr "从标准输入读取对象"
ef317cd5 13165
06991777 13166#: builtin/hash-object.c:103
ef317cd5 13167msgid "store file as is without filters"
07432cef 13168msgstr "原样存储文件不使用过滤器"
ef317cd5 13169
06991777 13170#: builtin/hash-object.c:104
220c313c
JX
13171msgid ""
13172"just hash any random garbage to create corrupt objects for debugging Git"
13173msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
13174
06991777 13175#: builtin/hash-object.c:105
ef317cd5 13176msgid "process file as it were from this path"
07432cef 13177msgstr "处理文件并假设其来自于此路径"
ef317cd5 13178
c1ac5258 13179#: builtin/help.c:46
ef317cd5 13180msgid "print all available commands"
07432cef 13181msgstr "打印所有可用的命令"
ef317cd5 13182
c1ac5258 13183#: builtin/help.c:47
a0b6b246
JX
13184msgid "exclude guides"
13185msgstr "排除向导"
13186
c1ac5258 13187#: builtin/help.c:48
4dcdc3d8
JX
13188msgid "print list of useful guides"
13189msgstr "显示有用的指南列表"
13190
c1ac5258
JX
13191#: builtin/help.c:49
13192msgid "print all configuration variable names"
13193msgstr "打印所有配置变量名称"
13194
13195#: builtin/help.c:51
ef317cd5 13196msgid "show man page"
07432cef 13197msgstr "显示 man 手册"
ef317cd5 13198
c1ac5258 13199#: builtin/help.c:52
ef317cd5 13200msgid "show manual in web browser"
07432cef 13201msgstr "在 web 浏览器中显示手册"
ef317cd5 13202
c1ac5258 13203#: builtin/help.c:54
ef317cd5 13204msgid "show info page"
07432cef 13205msgstr "显示 info 手册"
ef317cd5 13206
c1ac5258 13207#: builtin/help.c:56
fd8cb379
JX
13208msgid "print command description"
13209msgstr "打印命令描述"
13210
c1ac5258 13211#: builtin/help.c:61
814ff314
JX
13212msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
13213msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
ef317cd5 13214
d46c5519 13215#: builtin/help.c:77
81809b99 13216#, c-format
8ada9598 13217msgid "unrecognized help format '%s'"
81809b99 13218msgstr "未能识别的帮助格式 '%s'"
8ada9598 13219
d46c5519 13220#: builtin/help.c:104
8ada9598 13221msgid "Failed to start emacsclient."
81809b99 13222msgstr "无法启动 emacsclient。"
8ada9598 13223
d46c5519 13224#: builtin/help.c:117
8ada9598 13225msgid "Failed to parse emacsclient version."
81809b99 13226msgstr "无法解析 emacsclient 版本。"
8ada9598 13227
d46c5519 13228#: builtin/help.c:125
8ada9598
JX
13229#, c-format
13230msgid "emacsclient version '%d' too old (< 22)."
07432cef 13231msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 13232
d46c5519 13233#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
81809b99 13234#, c-format
5b04ee3b 13235msgid "failed to exec '%s'"
c1ac5258 13236msgstr "执行 '%s' 失败"
8ada9598 13237
d46c5519 13238#: builtin/help.c:221
8ada9598
JX
13239#, c-format
13240msgid ""
13241"'%s': path for unsupported man viewer.\n"
13242"Please consider using 'man.<tool>.cmd' instead."
13243msgstr ""
81809b99 13244"'%s':不支持的 man 手册查看器的路径。\n"
d9d56b23 13245"请使用 'man.<工具>.cmd'。"
8ada9598 13246
d46c5519 13247#: builtin/help.c:233
8ada9598
JX
13248#, c-format
13249msgid ""
13250"'%s': cmd for supported man viewer.\n"
13251"Please consider using 'man.<tool>.path' instead."
13252msgstr ""
81809b99 13253"'%s': 支持的 man 手册查看器命令。\n"
d9d56b23 13254"请使用 'man.<工具>.path'。"
8ada9598 13255
d46c5519 13256#: builtin/help.c:350
8ada9598
JX
13257#, c-format
13258msgid "'%s': unknown man viewer."
81809b99 13259msgstr "'%s':未知的 man 查看器。"
8ada9598 13260
d46c5519 13261#: builtin/help.c:367
8ada9598 13262msgid "no man viewer handled the request"
81809b99 13263msgstr "没有 man 查看器处理此请求"
8ada9598 13264
d46c5519 13265#: builtin/help.c:375
8ada9598 13266msgid "no info viewer handled the request"
81809b99 13267msgstr "没有 info 查看器处理此请求"
8ada9598 13268
d46c5519 13269#: builtin/help.c:434 builtin/help.c:445 git.c:335
fd8cb379
JX
13270#, c-format
13271msgid "'%s' is aliased to '%s'"
13272msgstr "'%s' 是 '%s' 的别名"
220c313c 13273
d46c5519 13274#: builtin/help.c:448 git.c:364
4c27fcb5
JX
13275#, c-format
13276msgid "bad alias.%s string: %s"
13277msgstr "坏的 alias.%s 字符串:%s"
13278
d46c5519 13279#: builtin/help.c:477 builtin/help.c:507
fd8cb379
JX
13280#, c-format
13281msgid "usage: %s%s"
13282msgstr "用法:%s%s"
4dcdc3d8 13283
d46c5519 13284#: builtin/help.c:491
c1ac5258
JX
13285msgid "'git help config' for more information"
13286msgstr "'git help config' 获取更多信息"
4dcdc3d8 13287
4c27fcb5 13288#: builtin/index-pack.c:184
8ada9598
JX
13289#, c-format
13290msgid "object type mismatch at %s"
81809b99 13291msgstr "%s 的对象类型不匹配"
8ada9598 13292
4c27fcb5 13293#: builtin/index-pack.c:204
6acbf033
JX
13294#, c-format
13295msgid "did not receive expected object %s"
a0b6b246 13296msgstr "未能获取预期的对象 %s"
8ada9598 13297
4c27fcb5 13298#: builtin/index-pack.c:207
6acbf033
JX
13299#, c-format
13300msgid "object %s: expected type %s, found %s"
a0b6b246 13301msgstr "对象 %s:应为类型 %s,却是 %s"
6acbf033 13302
d46c5519 13303#: builtin/index-pack.c:257
81809b99 13304#, c-format
8ada9598
JX
13305msgid "cannot fill %d byte"
13306msgid_plural "cannot fill %d bytes"
81809b99 13307msgstr[0] "无法填充 %d 字节"
5ae481e0 13308msgstr[1] "无法填充 %d 字节"
8ada9598 13309
d46c5519 13310#: builtin/index-pack.c:267
8ada9598 13311msgid "early EOF"
81809b99 13312msgstr "过早的文件结束符(EOF)"
8ada9598 13313
d46c5519 13314#: builtin/index-pack.c:268
8ada9598 13315msgid "read error on input"
81809b99 13316msgstr "输入上的读错误"
8ada9598 13317
d46c5519 13318#: builtin/index-pack.c:280
8ada9598 13319msgid "used more bytes than were available"
81809b99 13320msgstr "用掉了超过可用的字节"
8ada9598 13321
d46c5519 13322#: builtin/index-pack.c:287 builtin/pack-objects.c:600
8ada9598 13323msgid "pack too large for current definition of off_t"
81809b99 13324msgstr "包太大超过了当前 off_t 的定义"
8ada9598 13325
d46c5519 13326#: builtin/index-pack.c:290 builtin/unpack-objects.c:94
a0b6b246
JX
13327msgid "pack exceeds maximum allowed size"
13328msgstr "包超过了最大允许值"
13329
d46c5519 13330#: builtin/index-pack.c:305 builtin/repack.c:250
81809b99 13331#, c-format
8ada9598 13332msgid "unable to create '%s'"
81809b99 13333msgstr "不能创建 '%s'"
8ada9598 13334
d46c5519 13335#: builtin/index-pack.c:311
81809b99 13336#, c-format
8ada9598 13337msgid "cannot open packfile '%s'"
81809b99 13338msgstr "无法打开包文件 '%s'"
8ada9598 13339
d46c5519 13340#: builtin/index-pack.c:325
8ada9598 13341msgid "pack signature mismatch"
81809b99 13342msgstr "包签名不匹配"
8ada9598 13343
d46c5519 13344#: builtin/index-pack.c:327
ef317cd5
JX
13345#, c-format
13346msgid "pack version %<PRIu32> unsupported"
07432cef 13347msgstr "不支持包版本 %<PRIu32>"
ef317cd5 13348
d46c5519 13349#: builtin/index-pack.c:345
8ada9598 13350#, c-format
5c57d762
JX
13351msgid "pack has bad object at offset %<PRIuMAX>: %s"
13352msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
8ada9598 13353
d46c5519 13354#: builtin/index-pack.c:465
8ada9598
JX
13355#, c-format
13356msgid "inflate returned %d"
81809b99 13357msgstr "解压缩返回 %d"
8ada9598 13358
d46c5519 13359#: builtin/index-pack.c:514
8ada9598 13360msgid "offset value overflow for delta base object"
81809b99 13361msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 13362
d46c5519 13363#: builtin/index-pack.c:522
8ada9598 13364msgid "delta base offset is out of bound"
81809b99 13365msgstr "delta 基准偏移越界"
8ada9598 13366
d46c5519 13367#: builtin/index-pack.c:530
81809b99 13368#, c-format
8ada9598 13369msgid "unknown object type %d"
81809b99 13370msgstr "未知对象类型 %d"
8ada9598 13371
d46c5519 13372#: builtin/index-pack.c:561
8ada9598 13373msgid "cannot pread pack file"
81809b99 13374msgstr "无法读取包文件"
8ada9598 13375
d46c5519 13376#: builtin/index-pack.c:563
8ada9598 13377#, c-format
5c57d762
JX
13378msgid "premature end of pack file, %<PRIuMAX> byte missing"
13379msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
13380msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
13381msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8ada9598 13382
d46c5519 13383#: builtin/index-pack.c:589
8ada9598 13384msgid "serious inflate inconsistency"
81809b99 13385msgstr "解压缩严重的不一致"
8ada9598 13386
d46c5519
JX
13387#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763
13388#: builtin/index-pack.c:802 builtin/index-pack.c:811
8ada9598
JX
13389#, c-format
13390msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 13391msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 13392
d46c5519
JX
13393#: builtin/index-pack.c:737 builtin/pack-objects.c:153
13394#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
6792b93b
JX
13395#, c-format
13396msgid "unable to read %s"
13397msgstr "不能读 %s"
13398
d46c5519 13399#: builtin/index-pack.c:800
87cb7997
JX
13400#, c-format
13401msgid "cannot read existing object info %s"
13402msgstr "不能读取现存对象信息 %s"
13403
d46c5519 13404#: builtin/index-pack.c:808
6792b93b
JX
13405#, c-format
13406msgid "cannot read existing object %s"
13407msgstr "不能读取现存对象 %s"
13408
d46c5519 13409#: builtin/index-pack.c:822
81809b99 13410#, c-format
8ada9598 13411msgid "invalid blob object %s"
160fb2b2 13412msgstr "无效的数据对象 %s"
8ada9598 13413
d46c5519 13414#: builtin/index-pack.c:825 builtin/index-pack.c:844
fd8cb379
JX
13415msgid "fsck error in packed object"
13416msgstr "对打包对象 fsck 检查出错"
13417
d46c5519 13418#: builtin/index-pack.c:846
8ada9598
JX
13419#, c-format
13420msgid "Not all child objects of %s are reachable"
81809b99 13421msgstr "%s 的所有子对象并非都可达"
8ada9598 13422
d46c5519 13423#: builtin/index-pack.c:918 builtin/index-pack.c:949
8ada9598 13424msgid "failed to apply delta"
c1ac5258 13425msgstr "应用 delta 失败"
8ada9598 13426
d46c5519 13427#: builtin/index-pack.c:1117
8ada9598 13428msgid "Receiving objects"
81809b99 13429msgstr "接收对象中"
8ada9598 13430
d46c5519 13431#: builtin/index-pack.c:1117
8ada9598 13432msgid "Indexing objects"
81809b99 13433msgstr "索引对象中"
8ada9598 13434
d46c5519 13435#: builtin/index-pack.c:1151
8ada9598 13436msgid "pack is corrupted (SHA1 mismatch)"
81809b99 13437msgstr "包冲突(SHA1 不匹配)"
8ada9598 13438
d46c5519 13439#: builtin/index-pack.c:1156
8ada9598 13440msgid "cannot fstat packfile"
65e2041e 13441msgstr "不能对包文件调用 fstat"
8ada9598 13442
d46c5519 13443#: builtin/index-pack.c:1159
8ada9598 13444msgid "pack has junk at the end"
81809b99 13445msgstr "包的结尾有垃圾数据"
8ada9598 13446
d46c5519 13447#: builtin/index-pack.c:1171
6792b93b
JX
13448msgid "confusion beyond insanity in parse_pack_objects()"
13449msgstr "parse_pack_objects() 中遇到不可理喻的问题"
13450
d46c5519 13451#: builtin/index-pack.c:1194
8ada9598 13452msgid "Resolving deltas"
81809b99 13453msgstr "处理 delta 中"
8ada9598 13454
d46c5519 13455#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489
07432cef 13456#, c-format
ef317cd5 13457msgid "unable to create thread: %s"
07432cef 13458msgstr "不能创建线程:%s"
ef317cd5 13459
d46c5519 13460#: builtin/index-pack.c:1245
8ada9598 13461msgid "confusion beyond insanity"
81809b99 13462msgstr "不可理喻"
8ada9598 13463
d46c5519 13464#: builtin/index-pack.c:1251
ef317cd5 13465#, c-format
5b04ee3b
JX
13466msgid "completed with %d local object"
13467msgid_plural "completed with %d local objects"
13468msgstr[0] "完成 %d 个本地对象"
13469msgstr[1] "完成 %d 个本地对象"
ef317cd5 13470
d46c5519 13471#: builtin/index-pack.c:1263
ef317cd5
JX
13472#, c-format
13473msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 13474msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 13475
d46c5519 13476#: builtin/index-pack.c:1267
8ada9598
JX
13477#, c-format
13478msgid "pack has %d unresolved delta"
13479msgid_plural "pack has %d unresolved deltas"
81809b99 13480msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 13481msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 13482
d46c5519 13483#: builtin/index-pack.c:1291
81809b99 13484#, c-format
8ada9598 13485msgid "unable to deflate appended object (%d)"
07432cef 13486msgstr "不能压缩附加对象(%d)"
8ada9598 13487
d46c5519 13488#: builtin/index-pack.c:1368
8ada9598
JX
13489#, c-format
13490msgid "local object %s is corrupt"
81809b99 13491msgstr "本地对象 %s 已损坏"
8ada9598 13492
d46c5519 13493#: builtin/index-pack.c:1382
31e5e17b
JX
13494#, c-format
13495msgid "packfile name '%s' does not end with '.pack'"
13496msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
8ada9598 13497
d46c5519 13498#: builtin/index-pack.c:1407
81809b99 13499#, c-format
31e5e17b
JX
13500msgid "cannot write %s file '%s'"
13501msgstr "无法写入 %s 文件 '%s'"
8ada9598 13502
d46c5519 13503#: builtin/index-pack.c:1415
81809b99 13504#, c-format
31e5e17b
JX
13505msgid "cannot close written %s file '%s'"
13506msgstr "无法关闭已写入的 %s 文件 '%s'"
13507
d46c5519 13508#: builtin/index-pack.c:1439
31e5e17b
JX
13509msgid "error while closing pack file"
13510msgstr "关闭包文件时出错"
8ada9598 13511
d46c5519 13512#: builtin/index-pack.c:1453
8ada9598 13513msgid "cannot store pack file"
81809b99 13514msgstr "无法存储包文件"
8ada9598 13515
d46c5519 13516#: builtin/index-pack.c:1461
8ada9598 13517msgid "cannot store index file"
81809b99 13518msgstr "无法存储索引文件"
8ada9598 13519
d46c5519 13520#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728
07432cef 13521#, c-format
ef317cd5 13522msgid "bad pack.indexversion=%<PRIu32>"
07432cef 13523msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 13524
d46c5519 13525#: builtin/index-pack.c:1573
81809b99 13526#, c-format
8ada9598 13527msgid "Cannot open existing pack file '%s'"
81809b99 13528msgstr "无法打开现存包文件 '%s'"
8ada9598 13529
d46c5519 13530#: builtin/index-pack.c:1575
81809b99 13531#, c-format
8ada9598 13532msgid "Cannot open existing pack idx file for '%s'"
81809b99 13533msgstr "无法为 %s 打开包索引文件"
8ada9598 13534
d46c5519 13535#: builtin/index-pack.c:1623
81809b99 13536#, c-format
8ada9598
JX
13537msgid "non delta: %d object"
13538msgid_plural "non delta: %d objects"
81809b99 13539msgstr[0] "非 delta:%d 个对象"
5ae481e0 13540msgstr[1] "非 delta:%d 个对象"
8ada9598 13541
d46c5519 13542#: builtin/index-pack.c:1630
8ada9598
JX
13543#, c-format
13544msgid "chain length = %d: %lu object"
13545msgid_plural "chain length = %d: %lu objects"
81809b99 13546msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 13547msgstr[1] "链长 = %d: %lu 对象"
8ada9598 13548
d46c5519 13549#: builtin/index-pack.c:1667
31e5e17b
JX
13550msgid "Cannot come back to cwd"
13551msgstr "无法返回当前工作目录"
5b04ee3b 13552
d46c5519
JX
13553#: builtin/index-pack.c:1716 builtin/index-pack.c:1719
13554#: builtin/index-pack.c:1735 builtin/index-pack.c:1739
81809b99 13555#, c-format
8ada9598 13556msgid "bad %s"
81809b99 13557msgstr "错误选项 %s"
8ada9598 13558
d46c5519 13559#: builtin/index-pack.c:1755
8ada9598 13560msgid "--fix-thin cannot be used without --stdin"
649900bc 13561msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 13562
d46c5519 13563#: builtin/index-pack.c:1757
1a79b2f1
JX
13564msgid "--stdin requires a git repository"
13565msgstr "--stdin 需要一个 git 仓库"
13566
d46c5519 13567#: builtin/index-pack.c:1763
8ada9598 13568msgid "--verify with no packfile name given"
dbd6cced 13569msgstr "--verify 没有提供包文件名参数"
8ada9598 13570
d46c5519 13571#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580
fd8cb379
JX
13572msgid "fsck error in pack objects"
13573msgstr "在打包对象中 fsck 检查出错"
13574
a4f16749 13575#: builtin/init-db.c:61
c04f5ac3
JX
13576#, c-format
13577msgid "cannot stat template '%s'"
65e2041e 13578msgstr "不能对模版 '%s' 调用 stat"
c04f5ac3 13579
a4f16749 13580#: builtin/init-db.c:66
c04f5ac3
JX
13581#, c-format
13582msgid "cannot opendir '%s'"
13583msgstr "不能打开目录 '%s'"
13584
c1ac5258 13585#: builtin/init-db.c:78
c04f5ac3
JX
13586#, c-format
13587msgid "cannot readlink '%s'"
13588msgstr "不能读取链接 '%s'"
13589
c1ac5258 13590#: builtin/init-db.c:80
c04f5ac3
JX
13591#, c-format
13592msgid "cannot symlink '%s' '%s'"
90e6ef53 13593msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3 13594
c1ac5258 13595#: builtin/init-db.c:86
c04f5ac3
JX
13596#, c-format
13597msgid "cannot copy '%s' to '%s'"
13598msgstr "不能拷贝 '%s' 至 '%s'"
13599
c1ac5258 13600#: builtin/init-db.c:90
c04f5ac3
JX
13601#, c-format
13602msgid "ignoring template %s"
13603msgstr "忽略模版 %s"
13604
c1ac5258 13605#: builtin/init-db.c:121
c04f5ac3 13606#, c-format
fd8cb379
JX
13607msgid "templates not found in %s"
13608msgstr "没有在 %s 中找到模版"
c04f5ac3 13609
c1ac5258 13610#: builtin/init-db.c:136
c04f5ac3 13611#, c-format
5b04ee3b
JX
13612msgid "not copying templates from '%s': %s"
13613msgstr "没有从 '%s' 复制模版:%s"
c04f5ac3 13614
d46c5519 13615#: builtin/init-db.c:334
c04f5ac3
JX
13616#, c-format
13617msgid "unable to handle file type %d"
13618msgstr "不能处理 %d 类型的文件"
13619
d46c5519 13620#: builtin/init-db.c:337
c04f5ac3
JX
13621#, c-format
13622msgid "unable to move %s to %s"
13623msgstr "不能移动 %s 至 %s"
13624
d46c5519 13625#: builtin/init-db.c:354 builtin/init-db.c:357
a0b6b246
JX
13626#, c-format
13627msgid "%s already exists"
13628msgstr "%s 已经存在"
13629
d46c5519 13630#: builtin/init-db.c:413
c04f5ac3 13631#, c-format
5c57d762
JX
13632msgid "Reinitialized existing shared Git repository in %s%s\n"
13633msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
c04f5ac3 13634
d46c5519 13635#: builtin/init-db.c:414
5c57d762
JX
13636#, c-format
13637msgid "Reinitialized existing Git repository in %s%s\n"
13638msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
c04f5ac3 13639
d46c5519 13640#: builtin/init-db.c:418
5c57d762
JX
13641#, c-format
13642msgid "Initialized empty shared Git repository in %s%s\n"
9a4b694c 13643msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
c04f5ac3 13644
d46c5519 13645#: builtin/init-db.c:419
5c57d762
JX
13646#, c-format
13647msgid "Initialized empty Git repository in %s%s\n"
9a4b694c 13648msgstr "已初始化空的 Git 仓库于 %s%s\n"
c04f5ac3 13649
d46c5519 13650#: builtin/init-db.c:468
ef317cd5 13651msgid ""
a77c07d9 13652"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
814ff314 13653"shared[=<permissions>]] [<directory>]"
ef317cd5 13654msgstr ""
07432cef 13655"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
814ff314 13656"[<目录>]"
ef317cd5 13657
d46c5519 13658#: builtin/init-db.c:491
ef317cd5 13659msgid "permissions"
07432cef 13660msgstr "权限"
ef317cd5 13661
d46c5519 13662#: builtin/init-db.c:492
ef317cd5 13663msgid "specify that the git repository is to be shared amongst several users"
160fb2b2 13664msgstr "指定 git 仓库是多个用户之间共享的"
ef317cd5 13665
d46c5519 13666#: builtin/init-db.c:526 builtin/init-db.c:531
c1ac5258
JX
13667#, c-format
13668msgid "cannot mkdir %s"
13669msgstr "不能创建目录 %s"
13670
d46c5519 13671#: builtin/init-db.c:535
c04f5ac3
JX
13672#, c-format
13673msgid "cannot chdir to %s"
13674msgstr "不能切换目录到 %s"
13675
d46c5519 13676#: builtin/init-db.c:556
c04f5ac3
JX
13677#, c-format
13678msgid ""
13679"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
13680"dir=<directory>)"
1e607449 13681msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
c04f5ac3 13682
d46c5519 13683#: builtin/init-db.c:584
c04f5ac3
JX
13684#, c-format
13685msgid "Cannot access work tree '%s'"
13686msgstr "不能访问工作区 '%s'"
13687
220c313c
JX
13688#: builtin/interpret-trailers.c:15
13689msgid ""
276ceeaa
JX
13690"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
13691"<token>[(=|:)<value>])...] [<file>...]"
3495628d
JX
13692msgstr ""
13693"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
13694">])...] [<文件>...]"
276ceeaa 13695
4c27fcb5 13696#: builtin/interpret-trailers.c:94
276ceeaa
JX
13697msgid "edit files in place"
13698msgstr "在原位编辑文件"
220c313c 13699
4c27fcb5 13700#: builtin/interpret-trailers.c:95
220c313c 13701msgid "trim empty trailers"
6937cb4e
JX
13702msgstr "删除空的尾部署名"
13703
4c27fcb5 13704#: builtin/interpret-trailers.c:98
6937cb4e
JX
13705msgid "where to place the new trailer"
13706msgstr "在哪里放置新的尾部署名"
220c313c 13707
4c27fcb5 13708#: builtin/interpret-trailers.c:100
6937cb4e
JX
13709msgid "action if trailer already exists"
13710msgstr "当尾部署名已经存在时所采取的动作"
13711
4c27fcb5 13712#: builtin/interpret-trailers.c:102
6937cb4e
JX
13713msgid "action if trailer is missing"
13714msgstr "当尾部署名缺失时所采取的动作"
13715
4c27fcb5 13716#: builtin/interpret-trailers.c:104
6937cb4e
JX
13717msgid "output only the trailers"
13718msgstr "只输出尾部署名"
13719
4c27fcb5 13720#: builtin/interpret-trailers.c:105
6937cb4e
JX
13721msgid "do not apply config rules"
13722msgstr "不要应用配置规则"
13723
4c27fcb5 13724#: builtin/interpret-trailers.c:106
6937cb4e
JX
13725msgid "join whitespace-continued values"
13726msgstr "连接空白折行的值"
13727
4c27fcb5 13728#: builtin/interpret-trailers.c:107
6937cb4e
JX
13729msgid "set parsing options"
13730msgstr "设置解析选项"
13731
4c27fcb5
JX
13732#: builtin/interpret-trailers.c:109
13733msgid "do not treat --- specially"
13734msgstr "不要对 --- 特殊处理"
13735
13736#: builtin/interpret-trailers.c:110
220c313c 13737msgid "trailer"
6937cb4e 13738msgstr "尾部署名"
220c313c 13739
4c27fcb5 13740#: builtin/interpret-trailers.c:111
220c313c 13741msgid "trailer(s) to add"
6937cb4e 13742msgstr "要添加的尾部署名"
220c313c 13743
4c27fcb5 13744#: builtin/interpret-trailers.c:120
6937cb4e
JX
13745msgid "--trailer with --only-input does not make sense"
13746msgstr "--trailer 和 --only-input 同时使用没有意义"
13747
4c27fcb5 13748#: builtin/interpret-trailers.c:130
276ceeaa
JX
13749msgid "no input file given for in-place editing"
13750msgstr "没有给出要原位编辑的文件"
13751
06991777 13752#: builtin/log.c:55
7aea43ff 13753msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
d9d56b23 13754msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
ef317cd5 13755
06991777 13756#: builtin/log.c:56
814ff314
JX
13757msgid "git show [<options>] <object>..."
13758msgstr "git show [<选项>] <对象>..."
ef317cd5 13759
d46c5519 13760#: builtin/log.c:104
220c313c
JX
13761#, c-format
13762msgid "invalid --decorate option: %s"
13763msgstr "无效的 --decorate 选项:%s"
13764
d46c5519 13765#: builtin/log.c:168
ef317cd5 13766msgid "show source"
07432cef 13767msgstr "显示源"
ef317cd5 13768
d46c5519 13769#: builtin/log.c:169
07432cef
WS
13770msgid "Use mail map file"
13771msgstr "使用邮件映射文件"
13772
d46c5519 13773#: builtin/log.c:171
5809aa05
JX
13774msgid "only decorate refs that match <pattern>"
13775msgstr "只修饰与 <模式> 匹配的引用"
13776
d46c5519 13777#: builtin/log.c:173
5809aa05
JX
13778msgid "do not decorate refs that match <pattern>"
13779msgstr "不修饰和 <模式> 匹配的引用"
13780
d46c5519 13781#: builtin/log.c:174
ef317cd5 13782msgid "decorate options"
07432cef 13783msgstr "修饰选项"
ef317cd5 13784
d46c5519 13785#: builtin/log.c:177
220c313c
JX
13786msgid "Process line range n,m in file, counting from 1"
13787msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
13788
d46c5519 13789#: builtin/log.c:275
c04f5ac3
JX
13790#, c-format
13791msgid "Final output: %d %s\n"
13792msgstr "最终输出:%d %s\n"
13793
d46c5519 13794#: builtin/log.c:529
220c313c
JX
13795#, c-format
13796msgid "git show %s: bad file"
13797msgstr "git show %s: 损坏的文件"
13798
d46c5519 13799#: builtin/log.c:544 builtin/log.c:638
c04f5ac3 13800#, c-format
d46c5519 13801msgid "could not read object %s"
90e6ef53 13802msgstr "不能读取对象 %s"
c04f5ac3 13803
d46c5519 13804#: builtin/log.c:663
c04f5ac3 13805#, c-format
d46c5519 13806msgid "unknown type: %d"
c04f5ac3
JX
13807msgstr "未知类型:%d"
13808
d46c5519 13809#: builtin/log.c:784
c04f5ac3
JX
13810msgid "format.headers without value"
13811msgstr "format.headers 没有值"
13812
d46c5519 13813#: builtin/log.c:885
c04f5ac3
JX
13814msgid "name of output directory is too long"
13815msgstr "输出目录名太长"
13816
d46c5519 13817#: builtin/log.c:901
c04f5ac3 13818#, c-format
d46c5519 13819msgid "cannot open patch file %s"
c04f5ac3
JX
13820msgstr "无法打开补丁文件 %s"
13821
d46c5519
JX
13822#: builtin/log.c:918
13823msgid "need exactly one range"
13824msgstr "只需要一个范围"
c04f5ac3 13825
d46c5519
JX
13826#: builtin/log.c:928
13827msgid "not a range"
13828msgstr "不是一个范围"
c04f5ac3 13829
d46c5519
JX
13830#: builtin/log.c:1051
13831msgid "cover letter needs email format"
13832msgstr "附函需要邮件地址格式"
c04f5ac3 13833
d46c5519
JX
13834#: builtin/log.c:1057
13835msgid "failed to create cover-letter file"
13836msgstr "无法创建附函文件"
13837
13838#: builtin/log.c:1136
c04f5ac3
JX
13839#, c-format
13840msgid "insane in-reply-to: %s"
13841msgstr "不正常的 in-reply-to:%s"
13842
d46c5519 13843#: builtin/log.c:1163
814ff314
JX
13844msgid "git format-patch [<options>] [<since> | <revision-range>]"
13845msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
ef317cd5 13846
d46c5519
JX
13847#: builtin/log.c:1221
13848msgid "two output directories?"
c04f5ac3
JX
13849msgstr "两个输出目录?"
13850
d46c5519 13851#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090
5b04ee3b 13852#, c-format
d46c5519 13853msgid "unknown commit %s"
5b04ee3b
JX
13854msgstr "未知提交 %s"
13855
d46c5519
JX
13856#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207
13857#: builtin/replace.c:210
5b04ee3b 13858#, c-format
d46c5519
JX
13859msgid "failed to resolve '%s' as a valid ref"
13860msgstr "无法将 '%s' 解析为一个有效引用"
5b04ee3b 13861
d46c5519
JX
13862#: builtin/log.c:1347
13863msgid "could not find exact merge base"
13864msgstr "不能找到准确的合并基线"
5b04ee3b 13865
d46c5519 13866#: builtin/log.c:1351
5b04ee3b 13867msgid ""
d46c5519 13868"failed to get upstream, if you want to record base commit automatically,\n"
5b04ee3b 13869"please use git branch --set-upstream-to to track a remote branch.\n"
d46c5519 13870"Or you could specify base commit by --base=<base-commit-id> manually"
5b04ee3b
JX
13871msgstr ""
13872"无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
aef18cc6 13873"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
d46c5519 13874"参数 --base=<基线提交> 手动指定一个基线提交"
5b04ee3b 13875
d46c5519
JX
13876#: builtin/log.c:1371
13877msgid "failed to find exact merge base"
5b04ee3b
JX
13878msgstr "无法找到准确的合并基线"
13879
d46c5519 13880#: builtin/log.c:1382
5b04ee3b
JX
13881msgid "base commit should be the ancestor of revision list"
13882msgstr "基线提交应该是版本列表的祖先"
13883
d46c5519 13884#: builtin/log.c:1386
5b04ee3b
JX
13885msgid "base commit shouldn't be in revision list"
13886msgstr "基线提交不应该出现在版本列表中"
13887
d46c5519 13888#: builtin/log.c:1439
5b04ee3b 13889msgid "cannot get patch id"
aef18cc6 13890msgstr "无法得到补丁 id"
5b04ee3b 13891
d46c5519 13892#: builtin/log.c:1491
4c27fcb5
JX
13893msgid "failed to infer range-diff ranges"
13894msgstr "无法推断 range-diff 范围"
13895
d46c5519 13896#: builtin/log.c:1536
ef317cd5 13897msgid "use [PATCH n/m] even with a single patch"
07432cef 13898msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 13899
d46c5519 13900#: builtin/log.c:1539
ef317cd5 13901msgid "use [PATCH] even with multiple patches"
07432cef 13902msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 13903
d46c5519 13904#: builtin/log.c:1543
ef317cd5 13905msgid "print patches to standard out"
07432cef 13906msgstr "打印补丁到标准输出"
c04f5ac3 13907
d46c5519 13908#: builtin/log.c:1545
ef317cd5 13909msgid "generate a cover letter"
d46c5519 13910msgstr "生成一封附函"
c04f5ac3 13911
d46c5519 13912#: builtin/log.c:1547
ef317cd5 13913msgid "use simple number sequence for output file names"
07432cef 13914msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 13915
d46c5519 13916#: builtin/log.c:1548
ef317cd5 13917msgid "sfx"
07432cef 13918msgstr "后缀"
ef317cd5 13919
d46c5519 13920#: builtin/log.c:1549
ef317cd5 13921msgid "use <sfx> instead of '.patch'"
07432cef 13922msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 13923
d46c5519 13924#: builtin/log.c:1551
ef317cd5 13925msgid "start numbering patches at <n> instead of 1"
07432cef
WS
13926msgstr "补丁以 <n> 开始编号,而不是1"
13927
d46c5519 13928#: builtin/log.c:1553
07432cef
WS
13929msgid "mark the series as Nth re-roll"
13930msgstr "标记补丁系列是第几次重制"
ef317cd5 13931
d46c5519 13932#: builtin/log.c:1555
a0b6b246
JX
13933msgid "Use [RFC PATCH] instead of [PATCH]"
13934msgstr "使用 [RFC PATCH] 代替 [PATCH]"
13935
d46c5519 13936#: builtin/log.c:1558
ef317cd5 13937msgid "Use [<prefix>] instead of [PATCH]"
07432cef 13938msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 13939
d46c5519 13940#: builtin/log.c:1561
ef317cd5 13941msgid "store resulting files in <dir>"
d9d56b23 13942msgstr "把结果文件存储在 <目录>"
ef317cd5 13943
d46c5519 13944#: builtin/log.c:1564
ef317cd5 13945msgid "don't strip/add [PATCH]"
07432cef 13946msgstr "不删除/添加 [PATCH]"
ef317cd5 13947
d46c5519 13948#: builtin/log.c:1567
ef317cd5 13949msgid "don't output binary diffs"
07432cef 13950msgstr "不输出二进制差异"
ef317cd5 13951
d46c5519 13952#: builtin/log.c:1569
89f80d72
JX
13953msgid "output all-zero hash in From header"
13954msgstr "在 From 头信息中输出全为零的哈希值"
13955
d46c5519 13956#: builtin/log.c:1571
ef317cd5 13957msgid "don't include a patch matching a commit upstream"
07432cef 13958msgstr "不包含已在上游提交中的补丁"
ef317cd5 13959
d46c5519 13960#: builtin/log.c:1573
ef317cd5 13961msgid "show patch format instead of default (patch + stat)"
07432cef 13962msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 13963
d46c5519 13964#: builtin/log.c:1575
ef317cd5 13965msgid "Messaging"
07432cef 13966msgstr "邮件发送"
ef317cd5 13967
d46c5519 13968#: builtin/log.c:1576
ef317cd5 13969msgid "header"
07432cef 13970msgstr "header"
ef317cd5 13971
d46c5519 13972#: builtin/log.c:1577
ef317cd5 13973msgid "add email header"
07432cef 13974msgstr "添加邮件头"
ef317cd5 13975
d46c5519 13976#: builtin/log.c:1578 builtin/log.c:1580
ef317cd5 13977msgid "email"
07432cef 13978msgstr "邮件地址"
ef317cd5 13979
d46c5519 13980#: builtin/log.c:1578
ef317cd5 13981msgid "add To: header"
07432cef 13982msgstr "添加收件人"
ef317cd5 13983
d46c5519 13984#: builtin/log.c:1580
ef317cd5 13985msgid "add Cc: header"
07432cef 13986msgstr "添加抄送"
ef317cd5 13987
d46c5519 13988#: builtin/log.c:1582
2e8451e8 13989msgid "ident"
d9d56b23 13990msgstr "标识"
2e8451e8 13991
d46c5519 13992#: builtin/log.c:1583
2e8451e8 13993msgid "set From address to <ident> (or committer ident if absent)"
4375c10e 13994msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
2e8451e8 13995
d46c5519 13996#: builtin/log.c:1585
ef317cd5 13997msgid "message-id"
d9d56b23 13998msgstr "邮件标识"
ef317cd5 13999
d46c5519 14000#: builtin/log.c:1586
ef317cd5 14001msgid "make first mail a reply to <message-id>"
d9d56b23 14002msgstr "使第一封邮件作为对 <邮件标识> 的回复"
ef317cd5 14003
d46c5519 14004#: builtin/log.c:1587 builtin/log.c:1590
ef317cd5 14005msgid "boundary"
07432cef 14006msgstr "边界"
ef317cd5 14007
d46c5519 14008#: builtin/log.c:1588
ef317cd5 14009msgid "attach the patch"
07432cef 14010msgstr "附件方式添加补丁"
ef317cd5 14011
d46c5519 14012#: builtin/log.c:1591
ef317cd5 14013msgid "inline the patch"
07432cef 14014msgstr "内联显示补丁"
ef317cd5 14015
d46c5519 14016#: builtin/log.c:1595
ef317cd5 14017msgid "enable message threading, styles: shallow, deep"
07432cef 14018msgstr "启用邮件线索,风格:浅,深"
ef317cd5 14019
d46c5519 14020#: builtin/log.c:1597
ef317cd5 14021msgid "signature"
07432cef 14022msgstr "签名"
ef317cd5 14023
d46c5519 14024#: builtin/log.c:1598
ef317cd5 14025msgid "add a signature"
07432cef 14026msgstr "添加一个签名"
ef317cd5 14027
d46c5519 14028#: builtin/log.c:1599
5b04ee3b
JX
14029msgid "base-commit"
14030msgstr "基线提交"
14031
d46c5519 14032#: builtin/log.c:1600
5b04ee3b
JX
14033msgid "add prerequisite tree info to the patch series"
14034msgstr "为补丁列表添加前置树信息"
14035
d46c5519 14036#: builtin/log.c:1602
6acbf033
JX
14037msgid "add a signature from a file"
14038msgstr "从文件添加一个签名"
14039
d46c5519 14040#: builtin/log.c:1603
ef317cd5 14041msgid "don't print the patch filenames"
07432cef 14042msgstr "不要打印补丁文件名"
ef317cd5 14043
d46c5519 14044#: builtin/log.c:1605
6937cb4e
JX
14045msgid "show progress while generating patches"
14046msgstr "在生成补丁时显示进度"
14047
d46c5519 14048#: builtin/log.c:1606
4c27fcb5
JX
14049msgid "rev"
14050msgstr "版本"
14051
d46c5519 14052#: builtin/log.c:1607
4c27fcb5
JX
14053msgid "show changes against <rev> in cover letter or single patch"
14054msgstr "在附函或单个补丁中显示和 <rev> 的差异"
14055
d46c5519 14056#: builtin/log.c:1610
4c27fcb5
JX
14057msgid "show changes against <refspec> in cover letter or single patch"
14058msgstr "在附函或单个补丁中显示和 <refspec> 的差异"
14059
d46c5519 14060#: builtin/log.c:1612
4c27fcb5
JX
14061msgid "percentage by which creation is weighted"
14062msgstr "创建权重的百分比"
14063
d46c5519 14064#: builtin/log.c:1687
a4f16749
JX
14065#, c-format
14066msgid "invalid ident line: %s"
14067msgstr "包含无效的身份标识:%s"
14068
d46c5519 14069#: builtin/log.c:1702
c1ac5258
JX
14070msgid "-n and -k are mutually exclusive"
14071msgstr "-n 和 -k 互斥"
c04f5ac3 14072
d46c5519 14073#: builtin/log.c:1704
c1ac5258
JX
14074msgid "--subject-prefix/--rfc and -k are mutually exclusive"
14075msgstr "--subject-prefix/--rfc 和 -k 互斥"
c04f5ac3 14076
d46c5519 14077#: builtin/log.c:1712
c04f5ac3
JX
14078msgid "--name-only does not make sense"
14079msgstr "--name-only 无意义"
14080
d46c5519 14081#: builtin/log.c:1714
c04f5ac3
JX
14082msgid "--name-status does not make sense"
14083msgstr "--name-status 无意义"
14084
d46c5519 14085#: builtin/log.c:1716
c04f5ac3
JX
14086msgid "--check does not make sense"
14087msgstr "--check 无意义"
14088
d46c5519 14089#: builtin/log.c:1748
c04f5ac3
JX
14090msgid "standard output, or directory, which one?"
14091msgstr "标准输出或目录,哪一个?"
14092
d46c5519 14093#: builtin/log.c:1837
4c27fcb5
JX
14094msgid "--interdiff requires --cover-letter or single patch"
14095msgstr "--interdiff 需要 --cover-letter 或单一补丁"
14096
d46c5519 14097#: builtin/log.c:1841
4c27fcb5
JX
14098msgid "Interdiff:"
14099msgstr "版本间差异:"
14100
d46c5519 14101#: builtin/log.c:1842
4c27fcb5
JX
14102#, c-format
14103msgid "Interdiff against v%d:"
14104msgstr "对 v%d 的版本差异:"
14105
d46c5519 14106#: builtin/log.c:1848
4c27fcb5
JX
14107msgid "--creation-factor requires --range-diff"
14108msgstr "--creation-factor 需要 --range-diff"
14109
d46c5519 14110#: builtin/log.c:1852
4c27fcb5
JX
14111msgid "--range-diff requires --cover-letter or single patch"
14112msgstr "--range-diff 需要 --cover-letter 或单一补丁"
14113
d46c5519 14114#: builtin/log.c:1860
4c27fcb5
JX
14115msgid "Range-diff:"
14116msgstr "范围差异:"
14117
d46c5519 14118#: builtin/log.c:1861
4c27fcb5
JX
14119#, c-format
14120msgid "Range-diff against v%d:"
14121msgstr "对 v%d 的范围差异:"
14122
d46c5519 14123#: builtin/log.c:1872
6acbf033
JX
14124#, c-format
14125msgid "unable to read signature file '%s'"
14126msgstr "无法读取签名文件 '%s'"
14127
d46c5519 14128#: builtin/log.c:1908
6937cb4e
JX
14129msgid "Generating patches"
14130msgstr "生成补丁"
14131
d46c5519
JX
14132#: builtin/log.c:1952
14133msgid "failed to create output files"
c04f5ac3
JX
14134msgstr "无法创建输出文件"
14135
d46c5519 14136#: builtin/log.c:2011
ef317cd5 14137msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 14138msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 14139
d46c5519 14140#: builtin/log.c:2065
c04f5ac3
JX
14141#, c-format
14142msgid ""
14143"Could not find a tracked remote branch, please specify <upstream> manually.\n"
d9d56b23 14144msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
c04f5ac3 14145
06991777 14146#: builtin/ls-files.c:470
814ff314
JX
14147msgid "git ls-files [<options>] [<file>...]"
14148msgstr "git ls-files [<选项>] [<文件>...]"
ef317cd5 14149
06991777 14150#: builtin/ls-files.c:526
ef317cd5 14151msgid "identify the file status with tags"
07432cef 14152msgstr "用标签标识文件的状态"
ef317cd5 14153
06991777 14154#: builtin/ls-files.c:528
ef317cd5 14155msgid "use lowercase letters for 'assume unchanged' files"
07432cef 14156msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 14157
06991777 14158#: builtin/ls-files.c:530
5809aa05
JX
14159msgid "use lowercase letters for 'fsmonitor clean' files"
14160msgstr "使用小写字母表示 'fsmonitor clean' 文件"
14161
06991777 14162#: builtin/ls-files.c:532
ef317cd5 14163msgid "show cached files in the output (default)"
07432cef 14164msgstr "显示缓存的文件(默认)"
ef317cd5 14165
06991777 14166#: builtin/ls-files.c:534
ef317cd5 14167msgid "show deleted files in the output"
07432cef 14168msgstr "显示已删除的文件"
ef317cd5 14169
06991777 14170#: builtin/ls-files.c:536
ef317cd5 14171msgid "show modified files in the output"
07432cef 14172msgstr "显示已修改的文件"
ef317cd5 14173
06991777 14174#: builtin/ls-files.c:538
ef317cd5 14175msgid "show other files in the output"
07432cef 14176msgstr "显示其它文件"
ef317cd5 14177
06991777 14178#: builtin/ls-files.c:540
ef317cd5 14179msgid "show ignored files in the output"
07432cef 14180msgstr "显示忽略的文件"
ef317cd5 14181
06991777 14182#: builtin/ls-files.c:543
ef317cd5 14183msgid "show staged contents' object name in the output"
07432cef 14184msgstr "显示暂存区内容的对象名称"
ef317cd5 14185
06991777 14186#: builtin/ls-files.c:545
ef317cd5 14187msgid "show files on the filesystem that need to be removed"
07432cef 14188msgstr "显示文件系统需要删除的文件"
ef317cd5 14189
06991777 14190#: builtin/ls-files.c:547
220c313c 14191msgid "show 'other' directories' names only"
07432cef 14192msgstr "只显示“其他”目录的名称"
ef317cd5 14193
06991777 14194#: builtin/ls-files.c:549
276ceeaa
JX
14195msgid "show line endings of files"
14196msgstr "显示文件换行符格式"
14197
06991777 14198#: builtin/ls-files.c:551
ef317cd5 14199msgid "don't show empty directories"
07432cef 14200msgstr "不显示空目录"
ef317cd5 14201
06991777 14202#: builtin/ls-files.c:554
ef317cd5 14203msgid "show unmerged files in the output"
07432cef 14204msgstr "显示未合并的文件"
ef317cd5 14205
06991777 14206#: builtin/ls-files.c:556
ef317cd5 14207msgid "show resolve-undo information"
07432cef 14208msgstr "显示 resolve-undo 信息"
ef317cd5 14209
06991777 14210#: builtin/ls-files.c:558
ef317cd5 14211msgid "skip files matching pattern"
07432cef 14212msgstr "匹配排除文件的模式"
ef317cd5 14213
06991777 14214#: builtin/ls-files.c:561
ef317cd5 14215msgid "exclude patterns are read from <file>"
07432cef 14216msgstr "从 <文件> 中读取排除模式"
ef317cd5 14217
06991777 14218#: builtin/ls-files.c:564
ef317cd5 14219msgid "read additional per-directory exclude patterns in <file>"
07432cef 14220msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 14221
06991777 14222#: builtin/ls-files.c:566
ef317cd5 14223msgid "add the standard git exclusions"
07432cef 14224msgstr "添加标准的 git 排除"
ef317cd5 14225
06991777 14226#: builtin/ls-files.c:570
ef317cd5 14227msgid "make the output relative to the project top directory"
07432cef 14228msgstr "显示相对于顶级目录的文件名"
ef317cd5 14229
06991777 14230#: builtin/ls-files.c:573
a0b6b246
JX
14231msgid "recurse through submodules"
14232msgstr "在子模组中递归"
14233
06991777 14234#: builtin/ls-files.c:575
ef317cd5 14235msgid "if any <file> is not in the index, treat this as an error"
07432cef 14236msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 14237
06991777 14238#: builtin/ls-files.c:576
ef317cd5 14239msgid "tree-ish"
07432cef 14240msgstr "树或提交"
ef317cd5 14241
06991777 14242#: builtin/ls-files.c:577
ef317cd5 14243msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 14244msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5 14245
06991777 14246#: builtin/ls-files.c:579
ef317cd5 14247msgid "show debugging data"
07432cef 14248msgstr "显示调试数据"
ef317cd5 14249
fd8cb379 14250#: builtin/ls-remote.c:9
276ceeaa
JX
14251msgid ""
14252"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
14253" [-q | --quiet] [--exit-code] [--get-url]\n"
14254" [--symref] [<repository> [<refs>...]]"
14255msgstr ""
14256"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
14257" [-q | --quiet] [--exit-code] [--get-url]\n"
14258" [--symref] [<仓库> [<引用>...]]"
14259
fd8cb379 14260#: builtin/ls-remote.c:59
276ceeaa
JX
14261msgid "do not print remote URL"
14262msgstr "不打印远程 URL"
14263
d46c5519 14264#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458
276ceeaa
JX
14265msgid "exec"
14266msgstr "exec"
14267
fd8cb379 14268#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
276ceeaa
JX
14269msgid "path of git-upload-pack on the remote host"
14270msgstr "远程主机上的 git-upload-pack 路径"
14271
fd8cb379 14272#: builtin/ls-remote.c:65
276ceeaa
JX
14273msgid "limit to tags"
14274msgstr "仅限于标签"
14275
fd8cb379 14276#: builtin/ls-remote.c:66
276ceeaa
JX
14277msgid "limit to heads"
14278msgstr "仅限于分支"
14279
fd8cb379 14280#: builtin/ls-remote.c:67
276ceeaa
JX
14281msgid "do not show peeled tags"
14282msgstr "不显示已解析的标签"
14283
fd8cb379 14284#: builtin/ls-remote.c:69
276ceeaa
JX
14285msgid "take url.<base>.insteadOf into account"
14286msgstr "参考 url.<base>.insteadOf 设置"
14287
d46c5519 14288#: builtin/ls-remote.c:72
276ceeaa
JX
14289msgid "exit with exit code 2 if no matching refs are found"
14290msgstr "若未找到匹配的引用则以退出码2退出"
14291
d46c5519 14292#: builtin/ls-remote.c:75
276ceeaa
JX
14293msgid "show underlying ref in addition to the object pointed by it"
14294msgstr "除了显示指向的对象外,显示指向的引用名"
14295
c1ac5258 14296#: builtin/ls-tree.c:30
ef317cd5 14297msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 14298msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5 14299
c1ac5258 14300#: builtin/ls-tree.c:128
ef317cd5 14301msgid "only show trees"
07432cef 14302msgstr "只显示树"
ef317cd5 14303
c1ac5258 14304#: builtin/ls-tree.c:130
ef317cd5 14305msgid "recurse into subtrees"
07432cef 14306msgstr "递归到子树"
ef317cd5 14307
c1ac5258 14308#: builtin/ls-tree.c:132
ef317cd5 14309msgid "show trees when recursing"
07432cef 14310msgstr "当递归时显示树"
ef317cd5 14311
c1ac5258 14312#: builtin/ls-tree.c:135
ef317cd5 14313msgid "terminate entries with NUL byte"
4375c10e 14314msgstr "条目以 NUL 字符终止"
ef317cd5 14315
c1ac5258 14316#: builtin/ls-tree.c:136
ef317cd5 14317msgid "include object size"
07432cef 14318msgstr "包括对象大小"
ef317cd5 14319
c1ac5258 14320#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
ef317cd5 14321msgid "list only filenames"
07432cef 14322msgstr "只列出文件名"
ef317cd5 14323
c1ac5258 14324#: builtin/ls-tree.c:143
ef317cd5 14325msgid "use full path names"
07432cef 14326msgstr "使用文件的全路径"
ef317cd5 14327
c1ac5258 14328#: builtin/ls-tree.c:145
ef317cd5 14329msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 14330msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5 14331
a4f16749
JX
14332#: builtin/mailsplit.c:241
14333#, c-format
14334msgid "empty mbox: '%s'"
14335msgstr "空的 mbox:'%s'"
14336
d46c5519 14337#: builtin/merge.c:54
814ff314
JX
14338msgid "git merge [<options>] [<commit>...]"
14339msgstr "git merge [<选项>] [<提交>...]"
ef317cd5 14340
d46c5519 14341#: builtin/merge.c:55
ef317cd5 14342msgid "git merge --abort"
07432cef 14343msgstr "git merge --abort"
ef317cd5 14344
d46c5519 14345#: builtin/merge.c:56
1a79b2f1
JX
14346msgid "git merge --continue"
14347msgstr "git merge --continue"
14348
d46c5519 14349#: builtin/merge.c:116
c04f5ac3
JX
14350msgid "switch `m' requires a value"
14351msgstr "开关 `m' 需要一个值"
14352
d46c5519 14353#: builtin/merge.c:139
06991777
JX
14354#, c-format
14355msgid "option `%s' requires a value"
14356msgstr "选项 `%s' 需要一个值"
14357
d46c5519 14358#: builtin/merge.c:185
c04f5ac3
JX
14359#, c-format
14360msgid "Could not find merge strategy '%s'.\n"
90e6ef53 14361msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 14362
d46c5519 14363#: builtin/merge.c:186
c04f5ac3
JX
14364#, c-format
14365msgid "Available strategies are:"
14366msgstr "可用的策略有:"
14367
d46c5519 14368#: builtin/merge.c:191
c04f5ac3
JX
14369#, c-format
14370msgid "Available custom strategies are:"
14371msgstr "可用的自定义策略有:"
14372
d46c5519 14373#: builtin/merge.c:242 builtin/pull.c:150
ef317cd5 14374msgid "do not show a diffstat at the end of the merge"
07432cef 14375msgstr "在合并的最后不显示差异统计"
ef317cd5 14376
d46c5519 14377#: builtin/merge.c:245 builtin/pull.c:153
ef317cd5 14378msgid "show a diffstat at the end of the merge"
07432cef 14379msgstr "在合并的最后显示差异统计"
ef317cd5 14380
d46c5519 14381#: builtin/merge.c:246 builtin/pull.c:156
ef317cd5 14382msgid "(synonym to --stat)"
07432cef 14383msgstr "(和 --stat 同义)"
ef317cd5 14384
d46c5519 14385#: builtin/merge.c:248 builtin/pull.c:159
ef317cd5 14386msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 14387msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 14388
d46c5519 14389#: builtin/merge.c:251 builtin/pull.c:165
ef317cd5 14390msgid "create a single commit instead of doing a merge"
07432cef 14391msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 14392
d46c5519 14393#: builtin/merge.c:253 builtin/pull.c:168
ef317cd5 14394msgid "perform a commit if the merge succeeds (default)"
07432cef 14395msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 14396
d46c5519 14397#: builtin/merge.c:255 builtin/pull.c:171
ef317cd5 14398msgid "edit message before committing"
07432cef 14399msgstr "在提交前编辑提交说明"
ef317cd5 14400
d46c5519 14401#: builtin/merge.c:257
ef317cd5 14402msgid "allow fast-forward (default)"
07432cef 14403msgstr "允许快进(默认)"
ef317cd5 14404
d46c5519 14405#: builtin/merge.c:259 builtin/pull.c:178
ef317cd5 14406msgid "abort if fast-forward is not possible"
07432cef 14407msgstr "如果不能快进就放弃合并"
ef317cd5 14408
d46c5519 14409#: builtin/merge.c:263 builtin/pull.c:181
5c57d762 14410msgid "verify that the named commit has a valid GPG signature"
1003b3a5
JX
14411msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
14412
d46c5519
JX
14413#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185
14414#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113
ef317cd5 14415msgid "strategy"
07432cef 14416msgstr "策略"
ef317cd5 14417
d46c5519 14418#: builtin/merge.c:265 builtin/pull.c:186
ef317cd5 14419msgid "merge strategy to use"
07432cef 14420msgstr "要使用的合并策略"
ef317cd5 14421
d46c5519 14422#: builtin/merge.c:266 builtin/pull.c:189
ef317cd5 14423msgid "option=value"
07432cef 14424msgstr "option=value"
ef317cd5 14425
d46c5519 14426#: builtin/merge.c:267 builtin/pull.c:190
ef317cd5 14427msgid "option for selected merge strategy"
07432cef 14428msgstr "所选的合并策略的选项"
ef317cd5 14429
d46c5519 14430#: builtin/merge.c:269
ef317cd5 14431msgid "merge commit message (for a non-fast-forward merge)"
07432cef 14432msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 14433
d46c5519 14434#: builtin/merge.c:276
ef317cd5 14435msgid "abort the current in-progress merge"
07432cef 14436msgstr "放弃当前正在进行的合并"
ef317cd5 14437
d46c5519 14438#: builtin/merge.c:278
1a79b2f1
JX
14439msgid "continue the current in-progress merge"
14440msgstr "继续当前正在进行的合并"
14441
d46c5519 14442#: builtin/merge.c:280 builtin/pull.c:197
5b04ee3b
JX
14443msgid "allow merging unrelated histories"
14444msgstr "允许合并不相关的历史"
14445
d46c5519 14446#: builtin/merge.c:286
6937cb4e
JX
14447msgid "verify commit-msg hook"
14448msgstr "校验 commit-msg 钩子"
14449
d46c5519 14450#: builtin/merge.c:311
c04f5ac3 14451msgid "could not run stash."
a4f16749 14452msgstr "不能运行贮藏。"
c04f5ac3 14453
d46c5519 14454#: builtin/merge.c:316
c04f5ac3 14455msgid "stash failed"
a4f16749 14456msgstr "贮藏失败"
c04f5ac3 14457
d46c5519 14458#: builtin/merge.c:321
c04f5ac3
JX
14459#, c-format
14460msgid "not a valid object: %s"
14461msgstr "不是一个有效对象:%s"
14462
d46c5519 14463#: builtin/merge.c:343 builtin/merge.c:360
c04f5ac3
JX
14464msgid "read-tree failed"
14465msgstr "读取树失败"
14466
90e6ef53 14467# 译者:注意保持前导空格
d46c5519 14468#: builtin/merge.c:390
c04f5ac3
JX
14469msgid " (nothing to squash)"
14470msgstr " (无可压缩)"
14471
d46c5519 14472#: builtin/merge.c:401
c04f5ac3
JX
14473#, c-format
14474msgid "Squash commit -- not updating HEAD\n"
14475msgstr "压缩提交 -- 未更新 HEAD\n"
14476
d46c5519 14477#: builtin/merge.c:451
c04f5ac3
JX
14478#, c-format
14479msgid "No merge message -- not updating HEAD\n"
14480msgstr "无合并信息 -- 未更新 HEAD\n"
14481
d46c5519 14482#: builtin/merge.c:502
c04f5ac3
JX
14483#, c-format
14484msgid "'%s' does not point to a commit"
14485msgstr "'%s' 没有指向一个提交"
14486
d46c5519 14487#: builtin/merge.c:589
c04f5ac3
JX
14488#, c-format
14489msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 14490msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 14491
d46c5519 14492#: builtin/merge.c:712
c04f5ac3 14493msgid "Not handling anything other than two heads merge."
29004bbb 14494msgstr "未处理两个头合并之外的任何操作。"
c04f5ac3 14495
d46c5519 14496#: builtin/merge.c:726
c04f5ac3
JX
14497#, c-format
14498msgid "Unknown option for merge-recursive: -X%s"
14499msgstr "merge-recursive 的未知选项:-X%s"
14500
d46c5519 14501#: builtin/merge.c:741
c04f5ac3
JX
14502#, c-format
14503msgid "unable to write %s"
14504msgstr "不能写 %s"
14505
d46c5519 14506#: builtin/merge.c:793
c04f5ac3
JX
14507#, c-format
14508msgid "Could not read from '%s'"
14509msgstr "不能从 '%s' 读取"
14510
d46c5519 14511#: builtin/merge.c:802
c04f5ac3
JX
14512#, c-format
14513msgid "Not committing merge; use 'git commit' to complete the merge.\n"
14514msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
14515
d46c5519 14516#: builtin/merge.c:808
c04f5ac3
JX
14517msgid ""
14518"Please enter a commit message to explain why this merge is necessary,\n"
14519"especially if it merges an updated upstream into a topic branch.\n"
14520"\n"
c04f5ac3
JX
14521msgstr ""
14522"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
14523"合并到主题分支。\n"
14524"\n"
c04f5ac3 14525
d46c5519
JX
14526#: builtin/merge.c:813
14527msgid "An empty message aborts the commit.\n"
14528msgstr "一个空的说明终止提交。\n"
14529
14530#: builtin/merge.c:816
14531#, c-format
14532msgid ""
14533"Lines starting with '%c' will be ignored, and an empty message aborts\n"
14534"the commit.\n"
14535msgstr "以 '%c' 开始的行将被忽略,而一个空的提交说明将终止提交。\n"
14536
14537#: builtin/merge.c:857
c04f5ac3
JX
14538msgid "Empty commit message."
14539msgstr "空提交信息。"
14540
d46c5519 14541#: builtin/merge.c:876
c04f5ac3
JX
14542#, c-format
14543msgid "Wonderful.\n"
14544msgstr "太棒了。\n"
14545
d46c5519 14546#: builtin/merge.c:936
c04f5ac3
JX
14547#, c-format
14548msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
14549msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
14550
d46c5519 14551#: builtin/merge.c:975
c04f5ac3 14552msgid "No current branch."
90e6ef53 14553msgstr "没有当前分支。"
c04f5ac3 14554
d46c5519 14555#: builtin/merge.c:977
c04f5ac3 14556msgid "No remote for the current branch."
160fb2b2 14557msgstr "当前分支没有对应的远程仓库。"
c04f5ac3 14558
d46c5519 14559#: builtin/merge.c:979
c04f5ac3 14560msgid "No default upstream defined for the current branch."
90e6ef53 14561msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 14562
d46c5519 14563#: builtin/merge.c:984
170e9899 14564#, c-format
2e8451e8
JX
14565msgid "No remote-tracking branch for %s from %s"
14566msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 14567
d46c5519 14568#: builtin/merge.c:1041
5c57d762
JX
14569#, c-format
14570msgid "Bad value '%s' in environment '%s'"
9a4b694c 14571msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
5c57d762 14572
d46c5519 14573#: builtin/merge.c:1144
5c57d762
JX
14574#, c-format
14575msgid "not something we can merge in %s: %s"
14576msgstr "不能在 %s 中合并:%s"
14577
d46c5519 14578#: builtin/merge.c:1178
5c57d762
JX
14579msgid "not something we can merge"
14580msgstr "不能合并"
14581
d46c5519 14582#: builtin/merge.c:1281
1a79b2f1
JX
14583msgid "--abort expects no arguments"
14584msgstr "--abort 不带参数"
14585
d46c5519 14586#: builtin/merge.c:1285
c04f5ac3 14587msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 14588msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 14589
d46c5519 14590#: builtin/merge.c:1297
1a79b2f1
JX
14591msgid "--continue expects no arguments"
14592msgstr "--continue 不带参数"
14593
d46c5519 14594#: builtin/merge.c:1301
1a79b2f1
JX
14595msgid "There is no merge in progress (MERGE_HEAD missing)."
14596msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
14597
d46c5519 14598#: builtin/merge.c:1317
c04f5ac3
JX
14599msgid ""
14600"You have not concluded your merge (MERGE_HEAD exists).\n"
220c313c 14601"Please, commit your changes before you merge."
c04f5ac3
JX
14602msgstr ""
14603"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 14604"请在合并前先提交您的修改。"
c04f5ac3 14605
d46c5519 14606#: builtin/merge.c:1324
c04f5ac3
JX
14607msgid ""
14608"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
220c313c 14609"Please, commit your changes before you merge."
c04f5ac3
JX
14610msgstr ""
14611"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 14612"请在合并前先提交您的修改。"
c04f5ac3 14613
d46c5519 14614#: builtin/merge.c:1327
c04f5ac3
JX
14615msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
14616msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
14617
d46c5519 14618#: builtin/merge.c:1341
c04f5ac3 14619msgid "You cannot combine --squash with --no-ff."
649900bc 14620msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 14621
d46c5519 14622#: builtin/merge.c:1349
c04f5ac3 14623msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 14624msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 14625
d46c5519 14626#: builtin/merge.c:1366
c04f5ac3
JX
14627msgid "Squash commit into empty head not supported yet"
14628msgstr "尚不支持到空分支的压缩提交"
14629
d46c5519 14630#: builtin/merge.c:1368
c04f5ac3
JX
14631msgid "Non-fast-forward commit does not make sense into an empty head"
14632msgstr "到空分支的非快进式提交没有意义"
14633
d46c5519 14634#: builtin/merge.c:1373
2e8451e8
JX
14635#, c-format
14636msgid "%s - not something we can merge"
14637msgstr "%s - 不能被合并"
14638
d46c5519 14639#: builtin/merge.c:1375
7aea43ff
JX
14640msgid "Can merge only exactly one commit into empty head"
14641msgstr "只能将一个提交合并到空分支上"
14642
d46c5519 14643#: builtin/merge.c:1454
5b04ee3b
JX
14644msgid "refusing to merge unrelated histories"
14645msgstr "拒绝合并无关的历史"
14646
d46c5519 14647#: builtin/merge.c:1463
6937cb4e 14648msgid "Already up to date."
5c57d762
JX
14649msgstr "已经是最新的。"
14650
d46c5519 14651#: builtin/merge.c:1473
c04f5ac3
JX
14652#, c-format
14653msgid "Updating %s..%s\n"
14654msgstr "更新 %s..%s\n"
14655
d46c5519 14656#: builtin/merge.c:1515
c04f5ac3
JX
14657#, c-format
14658msgid "Trying really trivial in-index merge...\n"
90e6ef53 14659msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 14660
d46c5519 14661#: builtin/merge.c:1522
c04f5ac3
JX
14662#, c-format
14663msgid "Nope.\n"
14664msgstr "无。\n"
14665
d46c5519 14666#: builtin/merge.c:1547
6937cb4e 14667msgid "Already up to date. Yeeah!"
5c57d762
JX
14668msgstr "已经是最新的。耶!"
14669
d46c5519 14670#: builtin/merge.c:1553
c04f5ac3 14671msgid "Not possible to fast-forward, aborting."
1aabac65 14672msgstr "无法快进,终止。"
c04f5ac3 14673
d46c5519 14674#: builtin/merge.c:1576 builtin/merge.c:1655
c04f5ac3
JX
14675#, c-format
14676msgid "Rewinding the tree to pristine...\n"
14677msgstr "将树回滚至原始状态...\n"
14678
d46c5519 14679#: builtin/merge.c:1580
c04f5ac3
JX
14680#, c-format
14681msgid "Trying merge strategy %s...\n"
14682msgstr "尝试合并策略 %s...\n"
14683
d46c5519 14684#: builtin/merge.c:1646
c04f5ac3
JX
14685#, c-format
14686msgid "No merge strategy handled the merge.\n"
14687msgstr "没有合并策略处理此合并。\n"
14688
d46c5519 14689#: builtin/merge.c:1648
c04f5ac3
JX
14690#, c-format
14691msgid "Merge with strategy %s failed.\n"
14692msgstr "使用策略 %s 合并失败。\n"
14693
d46c5519 14694#: builtin/merge.c:1657
c04f5ac3
JX
14695#, c-format
14696msgid "Using the %s to prepare resolving by hand.\n"
14697msgstr "使用 %s 以准备手工解决。\n"
14698
d46c5519 14699#: builtin/merge.c:1669
c04f5ac3
JX
14700#, c-format
14701msgid "Automatic merge went well; stopped before committing as requested\n"
14702msgstr "自动合并进展顺利,按要求在提交前停止\n"
14703
4c27fcb5 14704#: builtin/merge-base.c:32
814ff314
JX
14705msgid "git merge-base [-a | --all] <commit> <commit>..."
14706msgstr "git merge-base [-a | --all] <提交> <提交>..."
ef317cd5 14707
4c27fcb5 14708#: builtin/merge-base.c:33
814ff314
JX
14709msgid "git merge-base [-a | --all] --octopus <commit>..."
14710msgstr "git merge-base [-a | --all] --octopus <提交>..."
ef317cd5 14711
4c27fcb5 14712#: builtin/merge-base.c:34
ef317cd5 14713msgid "git merge-base --independent <commit>..."
07432cef 14714msgstr "git merge-base --independent <提交>..."
ef317cd5 14715
4c27fcb5 14716#: builtin/merge-base.c:35
ef317cd5 14717msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 14718msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5 14719
4c27fcb5 14720#: builtin/merge-base.c:36
cfff71a9 14721msgid "git merge-base --fork-point <ref> [<commit>]"
d9d56b23 14722msgstr "git merge-base --fork-point <引用> [<提交>]"
cfff71a9 14723
4c27fcb5 14724#: builtin/merge-base.c:153
ef317cd5 14725msgid "output all common ancestors"
07432cef 14726msgstr "输出所有共同的祖先"
ef317cd5 14727
4c27fcb5 14728#: builtin/merge-base.c:155
ef317cd5 14729msgid "find ancestors for a single n-way merge"
07432cef 14730msgstr "查找一个多路合并的祖先提交"
ef317cd5 14731
4c27fcb5 14732#: builtin/merge-base.c:157
ef317cd5 14733msgid "list revs not reachable from others"
07432cef 14734msgstr "显示不能被其他访问到的版本"
ef317cd5 14735
4c27fcb5 14736#: builtin/merge-base.c:159
ef317cd5 14737msgid "is the first one ancestor of the other?"
07432cef 14738msgstr "第一个是其他的祖先提交么?"
ef317cd5 14739
4c27fcb5 14740#: builtin/merge-base.c:161
cfff71a9 14741msgid "find where <commit> forked from reflog of <ref>"
e397e7e3 14742msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
cfff71a9 14743
a4f16749 14744#: builtin/merge-file.c:9
ef317cd5 14745msgid ""
814ff314
JX
14746"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
14747"<orig-file> <file2>"
ef317cd5 14748msgstr ""
814ff314
JX
14749"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
14750"件> <文件2>"
ef317cd5 14751
4c27fcb5 14752#: builtin/merge-file.c:35
ef317cd5 14753msgid "send results to standard output"
07432cef 14754msgstr "将结果发送到标准输出"
ef317cd5 14755
4c27fcb5 14756#: builtin/merge-file.c:36
ef317cd5 14757msgid "use a diff3 based merge"
07432cef 14758msgstr "使用基于 diff3 的合并"
ef317cd5 14759
4c27fcb5 14760#: builtin/merge-file.c:37
ef317cd5 14761msgid "for conflicts, use our version"
07432cef 14762msgstr "如果冲突,使用我们的版本"
ef317cd5 14763
4c27fcb5 14764#: builtin/merge-file.c:39
ef317cd5 14765msgid "for conflicts, use their version"
07432cef 14766msgstr "如果冲突,使用他们的版本"
ef317cd5 14767
4c27fcb5 14768#: builtin/merge-file.c:41
ef317cd5 14769msgid "for conflicts, use a union version"
07432cef 14770msgstr "如果冲突,使用联合版本"
ef317cd5 14771
4c27fcb5 14772#: builtin/merge-file.c:44
ef317cd5 14773msgid "for conflicts, use this marker size"
07432cef 14774msgstr "如果冲突,使用指定长度的标记"
ef317cd5 14775
4c27fcb5 14776#: builtin/merge-file.c:45
ef317cd5 14777msgid "do not warn about conflicts"
07432cef 14778msgstr "不要警告冲突"
ef317cd5 14779
4c27fcb5 14780#: builtin/merge-file.c:47
814ff314
JX
14781msgid "set labels for file1/orig-file/file2"
14782msgstr "为 文件1/初始文件/文件2 设置标签"
c04f5ac3 14783
06991777 14784#: builtin/merge-recursive.c:46
a0b6b246
JX
14785#, c-format
14786msgid "unknown option %s"
14787msgstr "未知选项 %s"
14788
06991777 14789#: builtin/merge-recursive.c:52
a0b6b246
JX
14790#, c-format
14791msgid "could not parse object '%s'"
14792msgstr "不能解析对象 '%s'"
14793
06991777 14794#: builtin/merge-recursive.c:56
a0b6b246
JX
14795#, c-format
14796msgid "cannot handle more than %d base. Ignoring %s."
14797msgid_plural "cannot handle more than %d bases. Ignoring %s."
14798msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
14799msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
14800
06991777 14801#: builtin/merge-recursive.c:64
a0b6b246
JX
14802msgid "not handling anything other than two heads merge."
14803msgstr "不能处理两个头合并之外的任何操作。"
14804
06991777 14805#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
a0b6b246
JX
14806#, c-format
14807msgid "could not resolve ref '%s'"
14808msgstr "无法解析引用 '%s'"
14809
06991777 14810#: builtin/merge-recursive.c:78
a0b6b246
JX
14811#, c-format
14812msgid "Merging %s with %s\n"
14813msgstr "合并 %s 和 %s\n"
14814
c1ac5258 14815#: builtin/mktree.c:66
ef317cd5 14816msgid "git mktree [-z] [--missing] [--batch]"
07432cef 14817msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 14818
c1ac5258 14819#: builtin/mktree.c:154
ef317cd5 14820msgid "input is NUL terminated"
07432cef 14821msgstr "输入以 NUL 字符终止"
c04f5ac3 14822
06991777 14823#: builtin/mktree.c:155 builtin/write-tree.c:26
ef317cd5 14824msgid "allow missing objects"
07432cef 14825msgstr "允许丢失的对象"
c04f5ac3 14826
c1ac5258 14827#: builtin/mktree.c:156
ef317cd5 14828msgid "allow creation of more than one tree"
07432cef 14829msgstr "允许创建一个以上的树"
c04f5ac3 14830
d46c5519 14831#: builtin/multi-pack-index.c:9
4c27fcb5
JX
14832msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
14833msgstr "git multi-pack-index [--object-dir=<目录>] (write|verify)"
14834
d46c5519 14835#: builtin/multi-pack-index.c:22
4c27fcb5
JX
14836msgid "object directory containing set of packfile and pack-index pairs"
14837msgstr "包含成对包文件和包索引的对象目录"
14838
d46c5519 14839#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67
4c27fcb5
JX
14840msgid "too many arguments"
14841msgstr "太多参数"
14842
d46c5519 14843#: builtin/multi-pack-index.c:51
4c27fcb5
JX
14844#, c-format
14845msgid "unrecognized verb: %s"
14846msgstr "未能识别的动作:%s"
14847
06991777 14848#: builtin/mv.c:18
814ff314
JX
14849msgid "git mv [<options>] <source>... <destination>"
14850msgstr "git mv [<选项>] <源>... <目标>"
c04f5ac3 14851
06991777 14852#: builtin/mv.c:83
220c313c
JX
14853#, c-format
14854msgid "Directory %s is in index and no submodule?"
14855msgstr "目录 %s 在索引中并且不是子模组?"
14856
06991777 14857#: builtin/mv.c:85
220c313c 14858msgid "Please stage your changes to .gitmodules or stash them to proceed"
a4f16749 14859msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
220c313c 14860
06991777 14861#: builtin/mv.c:103
220c313c
JX
14862#, c-format
14863msgid "%.*s is in index"
14864msgstr "%.*s 在索引中"
14865
06991777 14866#: builtin/mv.c:125
ef317cd5 14867msgid "force move/rename even if target exists"
07432cef 14868msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 14869
06991777 14870#: builtin/mv.c:127
ef317cd5 14871msgid "skip move/rename errors"
07432cef 14872msgstr "跳过移动/重命名错误"
c04f5ac3 14873
06991777 14874#: builtin/mv.c:169
220c313c
JX
14875#, c-format
14876msgid "destination '%s' is not a directory"
14877msgstr "目标 '%s' 不是一个目录"
14878
06991777 14879#: builtin/mv.c:180
c04f5ac3
JX
14880#, c-format
14881msgid "Checking rename of '%s' to '%s'\n"
14882msgstr "检查 '%s' 到 '%s' 的重命名\n"
14883
06991777 14884#: builtin/mv.c:184
c04f5ac3
JX
14885msgid "bad source"
14886msgstr "坏的源"
14887
06991777 14888#: builtin/mv.c:187
c04f5ac3
JX
14889msgid "can not move directory into itself"
14890msgstr "不能将目录移动到自身"
14891
06991777 14892#: builtin/mv.c:190
c04f5ac3
JX
14893msgid "cannot move directory over file"
14894msgstr "不能将目录移动到文件"
14895
06991777 14896#: builtin/mv.c:199
c04f5ac3
JX
14897msgid "source directory is empty"
14898msgstr "源目录为空"
14899
06991777 14900#: builtin/mv.c:224
c04f5ac3
JX
14901msgid "not under version control"
14902msgstr "不在版本控制之下"
14903
06991777 14904#: builtin/mv.c:227
c04f5ac3
JX
14905msgid "destination exists"
14906msgstr "目标已存在"
14907
06991777 14908#: builtin/mv.c:235
c04f5ac3
JX
14909#, c-format
14910msgid "overwriting '%s'"
14911msgstr "覆盖 '%s'"
14912
06991777 14913#: builtin/mv.c:238
c04f5ac3
JX
14914msgid "Cannot overwrite"
14915msgstr "不能覆盖"
14916
06991777 14917#: builtin/mv.c:241
c04f5ac3
JX
14918msgid "multiple sources for the same target"
14919msgstr "同一目标具有多个源"
14920
06991777 14921#: builtin/mv.c:243
cfff71a9
JX
14922msgid "destination directory does not exist"
14923msgstr "目标目录不存在"
14924
06991777 14925#: builtin/mv.c:250
c04f5ac3
JX
14926#, c-format
14927msgid "%s, source=%s, destination=%s"
14928msgstr "%s,源=%s,目标=%s"
14929
06991777 14930#: builtin/mv.c:271
c04f5ac3
JX
14931#, c-format
14932msgid "Renaming %s to %s\n"
14933msgstr "重命名 %s 至 %s\n"
14934
d46c5519 14935#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516
c04f5ac3
JX
14936#, c-format
14937msgid "renaming '%s' failed"
14938msgstr "重命名 '%s' 失败"
14939
c1ac5258 14940#: builtin/name-rev.c:355
814ff314
JX
14941msgid "git name-rev [<options>] <commit>..."
14942msgstr "git name-rev [<选项>] <提交>..."
ef317cd5 14943
c1ac5258 14944#: builtin/name-rev.c:356
814ff314
JX
14945msgid "git name-rev [<options>] --all"
14946msgstr "git name-rev [<选项>] --all"
ef317cd5 14947
c1ac5258 14948#: builtin/name-rev.c:357
814ff314
JX
14949msgid "git name-rev [<options>] --stdin"
14950msgstr "git name-rev [<选项>] --stdin"
ef317cd5 14951
d46c5519 14952#: builtin/name-rev.c:415
ef317cd5 14953msgid "print only names (no SHA-1)"
07432cef 14954msgstr "只打印名称(无 SHA-1)"
ef317cd5 14955
d46c5519 14956#: builtin/name-rev.c:416
ef317cd5 14957msgid "only use tags to name the commits"
55a16ee4 14958msgstr "只使用标签来命名提交"
ef317cd5 14959
d46c5519 14960#: builtin/name-rev.c:418
ef317cd5 14961msgid "only use refs matching <pattern>"
07432cef 14962msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 14963
d46c5519 14964#: builtin/name-rev.c:420
87cb7997
JX
14965msgid "ignore refs matching <pattern>"
14966msgstr "忽略和 <模式> 相匹配的引用"
14967
d46c5519 14968#: builtin/name-rev.c:422
ef317cd5 14969msgid "list all commits reachable from all refs"
07432cef 14970msgstr "列出可以从所有引用访问的提交"
ef317cd5 14971
d46c5519 14972#: builtin/name-rev.c:423
ef317cd5 14973msgid "read from stdin"
07432cef 14974msgstr "从标准输入读取"
ef317cd5 14975
d46c5519 14976#: builtin/name-rev.c:424
90314792
JX
14977msgid "allow to print `undefined` names (default)"
14978msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 14979
d46c5519 14980#: builtin/name-rev.c:430
2e8451e8 14981msgid "dereference tags in the input (internal use)"
55a16ee4 14982msgstr "反向解析输入中的标签(内部使用)"
2e8451e8 14983
c1ac5258 14984#: builtin/notes.c:28
814ff314 14985msgid "git notes [--ref <notes-ref>] [list [<object>]]"
07432cef 14986msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 14987
c1ac5258 14988#: builtin/notes.c:29
ef317cd5 14989msgid ""
814ff314 14990"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
04cb2f28 14991"| (-c | -C) <object>] [<object>]"
ef317cd5 14992msgstr ""
04cb2f28
JX
14993"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
14994"| (-c | -C) <对象>] [<对象>]"
ef317cd5 14995
c1ac5258 14996#: builtin/notes.c:30
814ff314 14997msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
07432cef 14998msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 14999
c1ac5258 15000#: builtin/notes.c:31
ef317cd5 15001msgid ""
814ff314 15002"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
04cb2f28 15003"(-c | -C) <object>] [<object>]"
ef317cd5 15004msgstr ""
04cb2f28
JX
15005"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
15006"(-c | -C) <对象>] [<对象>]"
ef317cd5 15007
c1ac5258 15008#: builtin/notes.c:32
814ff314 15009msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
04cb2f28 15010msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
ef317cd5 15011
c1ac5258 15012#: builtin/notes.c:33
814ff314 15013msgid "git notes [--ref <notes-ref>] show [<object>]"
07432cef 15014msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 15015
c1ac5258 15016#: builtin/notes.c:34
ef317cd5 15017msgid ""
814ff314 15018"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
07432cef 15019msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 15020
c1ac5258 15021#: builtin/notes.c:35
ef317cd5 15022msgid "git notes merge --commit [-v | -q]"
07432cef 15023msgstr "git notes merge --commit [-v | -q]"
ef317cd5 15024
c1ac5258 15025#: builtin/notes.c:36
ef317cd5 15026msgid "git notes merge --abort [-v | -q]"
07432cef 15027msgstr "git notes merge --abort [-v | -q]"
ef317cd5 15028
c1ac5258 15029#: builtin/notes.c:37
814ff314 15030msgid "git notes [--ref <notes-ref>] remove [<object>...]"
07432cef 15031msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 15032
c1ac5258 15033#: builtin/notes.c:38
5809aa05
JX
15034msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
15035msgstr "git notes [--ref <注解引用>] prune [-n] [-v]"
ef317cd5 15036
c1ac5258 15037#: builtin/notes.c:39
814ff314 15038msgid "git notes [--ref <notes-ref>] get-ref"
07432cef 15039msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 15040
c1ac5258 15041#: builtin/notes.c:44
ef317cd5 15042msgid "git notes [list [<object>]]"
07432cef 15043msgstr "git notes [list [<对象>]]"
ef317cd5 15044
c1ac5258 15045#: builtin/notes.c:49
ef317cd5 15046msgid "git notes add [<options>] [<object>]"
07432cef 15047msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 15048
c1ac5258 15049#: builtin/notes.c:54
ef317cd5 15050msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 15051msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 15052
c1ac5258 15053#: builtin/notes.c:55
ef317cd5 15054msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 15055msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 15056
c1ac5258 15057#: builtin/notes.c:60
ef317cd5 15058msgid "git notes append [<options>] [<object>]"
07432cef 15059msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 15060
c1ac5258 15061#: builtin/notes.c:65
ef317cd5 15062msgid "git notes edit [<object>]"
07432cef 15063msgstr "git notes edit [<对象>]"
ef317cd5 15064
c1ac5258 15065#: builtin/notes.c:70
ef317cd5 15066msgid "git notes show [<object>]"
07432cef 15067msgstr "git notes show [<对象>]"
ef317cd5 15068
c1ac5258 15069#: builtin/notes.c:75
814ff314 15070msgid "git notes merge [<options>] <notes-ref>"
07432cef 15071msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 15072
c1ac5258 15073#: builtin/notes.c:76
ef317cd5 15074msgid "git notes merge --commit [<options>]"
07432cef 15075msgstr "git notes merge --commit [<选项>]"
ef317cd5 15076
c1ac5258 15077#: builtin/notes.c:77
ef317cd5 15078msgid "git notes merge --abort [<options>]"
07432cef 15079msgstr "git notes merge --abort [<选项>]"
ef317cd5 15080
c1ac5258 15081#: builtin/notes.c:82
ef317cd5 15082msgid "git notes remove [<object>]"
07432cef 15083msgstr "git notes remove [<对象>]"
ef317cd5 15084
c1ac5258 15085#: builtin/notes.c:87
ef317cd5 15086msgid "git notes prune [<options>]"
07432cef 15087msgstr "git notes prune [<选项>]"
ef317cd5 15088
c1ac5258 15089#: builtin/notes.c:92
ef317cd5 15090msgid "git notes get-ref"
07432cef 15091msgstr "git notes get-ref"
ef317cd5 15092
c1ac5258 15093#: builtin/notes.c:97
5c57d762
JX
15094msgid "Write/edit the notes for the following object:"
15095msgstr "为下面的对象写/编辑说明:"
15096
c1ac5258 15097#: builtin/notes.c:150
c04f5ac3
JX
15098#, c-format
15099msgid "unable to start 'show' for object '%s'"
15100msgstr "不能为对象 '%s' 开始 'show'"
15101
c1ac5258 15102#: builtin/notes.c:154
a77c07d9
JX
15103msgid "could not read 'show' output"
15104msgstr "不能读取 'show' 的输出"
c04f5ac3 15105
c1ac5258 15106#: builtin/notes.c:162
c04f5ac3
JX
15107#, c-format
15108msgid "failed to finish 'show' for object '%s'"
15109msgstr "无法为对象 '%s' 完成 'show'"
15110
c1ac5258 15111#: builtin/notes.c:197
a0b6b246 15112msgid "please supply the note contents using either -m or -F option"
c04f5ac3
JX
15113msgstr "请通过 -m 或 -F 选项为注解提供内容"
15114
c1ac5258 15115#: builtin/notes.c:206
c04f5ac3
JX
15116msgid "unable to write note object"
15117msgstr "不能写注解对象"
15118
c1ac5258 15119#: builtin/notes.c:208
c04f5ac3 15120#, c-format
a0b6b246 15121msgid "the note contents have been left in %s"
220c313c 15122msgstr "注解内容被留在 %s 中"
c04f5ac3 15123
d46c5519 15124#: builtin/notes.c:242 builtin/tag.c:522
c04f5ac3
JX
15125#, c-format
15126msgid "could not open or read '%s'"
15127msgstr "不能打开或读取 '%s'"
15128
4c27fcb5 15129#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
06991777
JX
15130#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
15131#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
a0b6b246
JX
15132#, c-format
15133msgid "failed to resolve '%s' as a valid ref."
15134msgstr "无法解析 '%s' 为一个有效引用。"
15135
4c27fcb5 15136#: builtin/notes.c:265
c04f5ac3 15137#, c-format
a0b6b246 15138msgid "failed to read object '%s'."
c1ac5258 15139msgstr "读取对象 '%s' 失败。"
c04f5ac3 15140
4c27fcb5 15141#: builtin/notes.c:268
6c94aba5 15142#, c-format
a0b6b246
JX
15143msgid "cannot read note data from non-blob object '%s'."
15144msgstr "不能从非数据对象 '%s' 中读取注解数据。"
15145
4c27fcb5 15146#: builtin/notes.c:309
a0b6b246
JX
15147#, c-format
15148msgid "malformed input line: '%s'."
fd8cb379 15149msgstr "格式错误的输入行:'%s'。"
a0b6b246 15150
4c27fcb5 15151#: builtin/notes.c:324
a0b6b246
JX
15152#, c-format
15153msgid "failed to copy notes from '%s' to '%s'"
15154msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
6c94aba5 15155
a4f16749
JX
15156#. TRANSLATORS: the first %s will be replaced by a git
15157#. notes command: 'add', 'merge', 'remove', etc.
15158#.
4c27fcb5 15159#: builtin/notes.c:356
a0b6b246
JX
15160#, c-format
15161msgid "refusing to %s notes in %s (outside of refs/notes/)"
15162msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
15163
06991777
JX
15164#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
15165#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
15166#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
c04f5ac3
JX
15167msgid "too many parameters"
15168msgstr "参数太多"
15169
06991777 15170#: builtin/notes.c:389 builtin/notes.c:678
c04f5ac3 15171#, c-format
a0b6b246 15172msgid "no note found for object %s."
c04f5ac3
JX
15173msgstr "未发现对象 %s 的注解。"
15174
06991777 15175#: builtin/notes.c:410 builtin/notes.c:576
ef317cd5 15176msgid "note contents as a string"
07432cef 15177msgstr "注解内容作为一个字符串"
ef317cd5 15178
06991777 15179#: builtin/notes.c:413 builtin/notes.c:579
ef317cd5 15180msgid "note contents in a file"
07432cef 15181msgstr "注解内容到一个文件中"
ef317cd5 15182
06991777 15183#: builtin/notes.c:416 builtin/notes.c:582
ef317cd5 15184msgid "reuse and edit specified note object"
07432cef 15185msgstr "重用和编辑指定的注解对象"
ef317cd5 15186
06991777 15187#: builtin/notes.c:419 builtin/notes.c:585
ef317cd5 15188msgid "reuse specified note object"
07432cef 15189msgstr "重用指定的注解对象"
ef317cd5 15190
06991777 15191#: builtin/notes.c:422 builtin/notes.c:588
04cb2f28
JX
15192msgid "allow storing empty note"
15193msgstr "允许保存空白注释"
15194
06991777 15195#: builtin/notes.c:423 builtin/notes.c:496
ef317cd5 15196msgid "replace existing notes"
07432cef 15197msgstr "替换已存在的注解"
ef317cd5 15198
4c27fcb5 15199#: builtin/notes.c:448
c04f5ac3
JX
15200#, c-format
15201msgid ""
15202"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
15203"existing notes"
15204msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
15205
06991777 15206#: builtin/notes.c:463 builtin/notes.c:544
c04f5ac3
JX
15207#, c-format
15208msgid "Overwriting existing notes for object %s\n"
15209msgstr "覆盖对象 %s 现存注解\n"
15210
06991777 15211#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
04cb2f28
JX
15212#, c-format
15213msgid "Removing note for object %s\n"
15214msgstr "删除对象 %s 的注解\n"
15215
06991777 15216#: builtin/notes.c:497
ef317cd5 15217msgid "read objects from stdin"
07432cef 15218msgstr "从标准输入读取对象"
ef317cd5 15219
06991777 15220#: builtin/notes.c:499
ef317cd5 15221msgid "load rewriting config for <command> (implies --stdin)"
07432cef 15222msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 15223
06991777 15224#: builtin/notes.c:517
c04f5ac3
JX
15225msgid "too few parameters"
15226msgstr "参数太少"
15227
06991777 15228#: builtin/notes.c:538
c04f5ac3
JX
15229#, c-format
15230msgid ""
15231"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
15232"existing notes"
15233msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
15234
06991777 15235#: builtin/notes.c:550
c04f5ac3 15236#, c-format
a0b6b246 15237msgid "missing notes on source object %s. Cannot copy."
c04f5ac3
JX
15238msgstr "源对象 %s 缺少注解。不能拷贝。"
15239
06991777 15240#: builtin/notes.c:603
ef317cd5
JX
15241#, c-format
15242msgid ""
15243"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
15244"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
15245msgstr ""
15246"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
15247"请换用 'git notes add -f -m/-F/-c/-C'。\n"
15248
06991777 15249#: builtin/notes.c:698
a0b6b246 15250msgid "failed to delete ref NOTES_MERGE_PARTIAL"
c1ac5258 15251msgstr "删除引用 NOTES_MERGE_PARTIAL 失败"
a0b6b246 15252
06991777 15253#: builtin/notes.c:700
a0b6b246 15254msgid "failed to delete ref NOTES_MERGE_REF"
c1ac5258 15255msgstr "删除引用 NOTES_MERGE_REF 失败"
a0b6b246 15256
06991777 15257#: builtin/notes.c:702
a0b6b246 15258msgid "failed to remove 'git notes merge' worktree"
c1ac5258 15259msgstr "删除 'git notes merge' 工作区失败"
a0b6b246 15260
06991777 15261#: builtin/notes.c:722
a0b6b246 15262msgid "failed to read ref NOTES_MERGE_PARTIAL"
c1ac5258 15263msgstr "读取引用 NOTES_MERGE_PARTIAL 失败"
a0b6b246 15264
06991777 15265#: builtin/notes.c:724
a0b6b246
JX
15266msgid "could not find commit from NOTES_MERGE_PARTIAL."
15267msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
15268
06991777 15269#: builtin/notes.c:726
a0b6b246
JX
15270msgid "could not parse commit from NOTES_MERGE_PARTIAL."
15271msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
15272
06991777 15273#: builtin/notes.c:739
a0b6b246 15274msgid "failed to resolve NOTES_MERGE_REF"
c1ac5258 15275msgstr "解析 NOTES_MERGE_REF 失败"
a0b6b246 15276
06991777 15277#: builtin/notes.c:742
a0b6b246
JX
15278msgid "failed to finalize notes merge"
15279msgstr "无法完成注解合并"
15280
06991777 15281#: builtin/notes.c:768
5c57d762
JX
15282#, c-format
15283msgid "unknown notes merge strategy %s"
15284msgstr "未知的注解合并策略 %s"
15285
06991777 15286#: builtin/notes.c:784
ef317cd5 15287msgid "General options"
07432cef 15288msgstr "通用选项"
ef317cd5 15289
06991777 15290#: builtin/notes.c:786
ef317cd5 15291msgid "Merge options"
07432cef 15292msgstr "合并选项"
ef317cd5 15293
06991777 15294#: builtin/notes.c:788
ef317cd5
JX
15295msgid ""
15296"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
15297"cat_sort_uniq)"
07432cef 15298msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 15299
06991777 15300#: builtin/notes.c:790
ef317cd5 15301msgid "Committing unmerged notes"
07432cef 15302msgstr "提交未合并的注解"
ef317cd5 15303
06991777 15304#: builtin/notes.c:792
ef317cd5 15305msgid "finalize notes merge by committing unmerged notes"
07432cef 15306msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 15307
06991777 15308#: builtin/notes.c:794
ef317cd5 15309msgid "Aborting notes merge resolution"
07432cef 15310msgstr "中止注解合并的方案"
ef317cd5 15311
06991777 15312#: builtin/notes.c:796
ef317cd5 15313msgid "abort notes merge"
07432cef 15314msgstr "中止注解合并"
ef317cd5 15315
06991777 15316#: builtin/notes.c:807
5c57d762
JX
15317msgid "cannot mix --commit, --abort or -s/--strategy"
15318msgstr "不能混用 --commit、--abort 或 -s/--strategy"
15319
06991777 15320#: builtin/notes.c:812
a0b6b246 15321msgid "must specify a notes ref to merge"
9a4b694c 15322msgstr "必须指定一个注解引用来合并"
5c57d762 15323
06991777 15324#: builtin/notes.c:836
5c57d762 15325#, c-format
a0b6b246 15326msgid "unknown -s/--strategy: %s"
5c57d762
JX
15327msgstr "未知的 -s/--strategy:%s"
15328
06991777 15329#: builtin/notes.c:873
1b7f4a34 15330#, c-format
a0b6b246
JX
15331msgid "a notes merge into %s is already in-progress at %s"
15332msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
1b7f4a34 15333
06991777 15334#: builtin/notes.c:876
5c57d762 15335#, c-format
a0b6b246
JX
15336msgid "failed to store link to current notes ref (%s)"
15337msgstr "无法存储链接到当前的注解引用(%s)"
5c57d762 15338
06991777 15339#: builtin/notes.c:878
5c57d762
JX
15340#, c-format
15341msgid ""
15342"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
15343"'git notes merge --commit', or abort the merge with 'git notes merge --"
15344"abort'.\n"
a0b6b246
JX
15345msgstr ""
15346"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
15347"交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
5c57d762 15348
d46c5519
JX
15349#: builtin/notes.c:897 builtin/tag.c:535
15350#, c-format
15351msgid "Failed to resolve '%s' as a valid ref."
15352msgstr "无法解析 '%s' 为一个有效引用。"
15353
06991777 15354#: builtin/notes.c:900
ef317cd5
JX
15355#, c-format
15356msgid "Object %s has no note\n"
15357msgstr "对象 %s 没有注解\n"
15358
06991777 15359#: builtin/notes.c:912
ef317cd5 15360msgid "attempt to remove non-existent note is not an error"
07432cef 15361msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 15362
06991777 15363#: builtin/notes.c:915
ef317cd5 15364msgid "read object names from the standard input"
07432cef 15365msgstr "从标准输入读取对象名称"
ef317cd5 15366
d46c5519 15367#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
5c57d762
JX
15368msgid "do not remove, show only"
15369msgstr "不删除,只显示"
15370
06991777 15371#: builtin/notes.c:955
5c57d762
JX
15372msgid "report pruned notes"
15373msgstr "报告清除的注解"
15374
06991777 15375#: builtin/notes.c:998
6c94aba5 15376msgid "notes-ref"
07432cef 15377msgstr "注解引用"
ef317cd5 15378
06991777 15379#: builtin/notes.c:999
814ff314 15380msgid "use notes from <notes-ref>"
07432cef 15381msgstr "从 <注解引用> 使用注解"
ef317cd5 15382
d46c5519 15383#: builtin/notes.c:1034 builtin/stash.c:1611
ef317cd5 15384#, c-format
a0b6b246 15385msgid "unknown subcommand: %s"
ef317cd5
JX
15386msgstr "未知子命令:%s"
15387
d46c5519 15388#: builtin/pack-objects.c:52
1b7f4a34
JX
15389msgid ""
15390"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
15391msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
ef317cd5 15392
d46c5519 15393#: builtin/pack-objects.c:53
1b7f4a34
JX
15394msgid ""
15395"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
58b6f078 15396msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
ef317cd5 15397
d46c5519 15398#: builtin/pack-objects.c:424
ef317cd5 15399#, c-format
c1ac5258
JX
15400msgid "bad packed object CRC for %s"
15401msgstr "%s 错的包对象 CRC"
15402
d46c5519 15403#: builtin/pack-objects.c:435
c1ac5258
JX
15404#, c-format
15405msgid "corrupt packed object for %s"
15406msgstr "%s 损坏的包对象"
15407
d46c5519 15408#: builtin/pack-objects.c:566
c1ac5258
JX
15409#, c-format
15410msgid "recursive delta detected for object %s"
15411msgstr "发现对象 %s 递归 delta"
15412
d46c5519 15413#: builtin/pack-objects.c:777
c1ac5258
JX
15414#, c-format
15415msgid "ordered %u objects, expected %<PRIu32>"
15416msgstr "排序了 %u 个对象,预期 %<PRIu32> 个"
15417
d46c5519 15418#: builtin/pack-objects.c:790
c1ac5258
JX
15419#, c-format
15420msgid "packfile is invalid: %s"
15421msgstr "无效的包文件:%s"
15422
d46c5519 15423#: builtin/pack-objects.c:794
c1ac5258
JX
15424#, c-format
15425msgid "unable to open packfile for reuse: %s"
15426msgstr "无法为重用打开包文件:%s"
15427
d46c5519 15428#: builtin/pack-objects.c:798
c1ac5258
JX
15429msgid "unable to seek in reused packfile"
15430msgstr "无法在重用的包文件中查找"
ef317cd5 15431
d46c5519 15432#: builtin/pack-objects.c:809
c1ac5258
JX
15433msgid "unable to read from reused packfile"
15434msgstr "无法读取索引文件"
15435
d46c5519 15436#: builtin/pack-objects.c:837
5b04ee3b
JX
15437msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
15438msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
15439
d46c5519 15440#: builtin/pack-objects.c:850
6c94aba5
JX
15441msgid "Writing objects"
15442msgstr "写入对象中"
15443
d46c5519 15444#: builtin/pack-objects.c:912 builtin/update-index.c:89
c1ac5258
JX
15445#, c-format
15446msgid "failed to stat %s"
15447msgstr "对 %s 调用 stat 失败"
15448
d46c5519 15449#: builtin/pack-objects.c:965
c1ac5258
JX
15450#, c-format
15451msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
15452msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
15453
d46c5519 15454#: builtin/pack-objects.c:1161
6c94aba5
JX
15455msgid "disabling bitmap writing, as some objects are not being packed"
15456msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
15457
d46c5519 15458#: builtin/pack-objects.c:1589
c1ac5258
JX
15459#, c-format
15460msgid "delta base offset overflow in pack for %s"
15461msgstr "%s 压缩中 delta 基准偏移越界"
15462
d46c5519 15463#: builtin/pack-objects.c:1598
c1ac5258
JX
15464#, c-format
15465msgid "delta base offset out of bound for %s"
15466msgstr "%s 的 delta 基准偏移越界"
15467
d46c5519 15468#: builtin/pack-objects.c:1867
fd8cb379
JX
15469msgid "Counting objects"
15470msgstr "对象计数中"
15471
d46c5519 15472#: builtin/pack-objects.c:1997
fd8cb379
JX
15473#, c-format
15474msgid "unable to get size of %s"
15475msgstr "不能得到 %s 的大小"
15476
d46c5519 15477#: builtin/pack-objects.c:2012
fd8cb379
JX
15478#, c-format
15479msgid "unable to parse object header of %s"
15480msgstr "无法解析对象 %s 头信息"
15481
d46c5519
JX
15482#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098
15483#: builtin/pack-objects.c:2108
c1ac5258
JX
15484#, c-format
15485msgid "object %s cannot be read"
15486msgstr "对象 %s 无法读取"
15487
d46c5519 15488#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112
c1ac5258 15489#, c-format
4c27fcb5
JX
15490msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
15491msgstr "对象 %s 不一致的对象长度(%<PRIuMAX> vs %<PRIuMAX>)"
c1ac5258 15492
d46c5519 15493#: builtin/pack-objects.c:2122
c1ac5258
JX
15494msgid "suboptimal pack - out of memory"
15495msgstr "次优(suboptimal)打包 - 内存不足"
15496
d46c5519 15497#: builtin/pack-objects.c:2448
c1ac5258
JX
15498#, c-format
15499msgid "Delta compression using up to %d threads"
15500msgstr "使用 %d 个线程进行压缩"
15501
d46c5519 15502#: builtin/pack-objects.c:2580
c1ac5258
JX
15503#, c-format
15504msgid "unable to pack objects reachable from tag %s"
15505msgstr "无法为标签 %s 压缩对象"
15506
d46c5519 15507#: builtin/pack-objects.c:2667
6c94aba5
JX
15508msgid "Compressing objects"
15509msgstr "压缩对象中"
15510
d46c5519 15511#: builtin/pack-objects.c:2673
c1ac5258
JX
15512msgid "inconsistency with delta count"
15513msgstr "不一致的差异计数"
15514
d46c5519 15515#: builtin/pack-objects.c:2754
c1ac5258
JX
15516#, c-format
15517msgid ""
15518"expected edge object ID, got garbage:\n"
15519" %s"
15520msgstr ""
15521"预期边界对象(edge object)ID,却得到垃圾数据:\n"
15522" %s"
15523
d46c5519 15524#: builtin/pack-objects.c:2760
c1ac5258
JX
15525#, c-format
15526msgid ""
15527"expected object ID, got garbage:\n"
15528" %s"
15529msgstr ""
15530"预期对象 ID,却得到垃圾数据:\n"
15531" %s"
15532
d46c5519 15533#: builtin/pack-objects.c:2858
5809aa05
JX
15534msgid "invalid value for --missing"
15535msgstr "选项 --missing 的值无效"
15536
d46c5519 15537#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025
c1ac5258
JX
15538msgid "cannot open pack index"
15539msgstr "无法打开包文件索引"
15540
d46c5519 15541#: builtin/pack-objects.c:2948
c1ac5258
JX
15542#, c-format
15543msgid "loose object at %s could not be examined"
15544msgstr "无法检查 %s 处的松散对象"
15545
d46c5519 15546#: builtin/pack-objects.c:3033
c1ac5258
JX
15547msgid "unable to force loose object"
15548msgstr "无法强制松散对象"
15549
d46c5519 15550#: builtin/pack-objects.c:3125
c1ac5258
JX
15551#, c-format
15552msgid "not a rev '%s'"
15553msgstr "不是一个版本 '%s'"
15554
d46c5519 15555#: builtin/pack-objects.c:3128
c1ac5258
JX
15556#, c-format
15557msgid "bad revision '%s'"
15558msgstr "坏的版本 '%s'"
15559
d46c5519 15560#: builtin/pack-objects.c:3153
c1ac5258
JX
15561msgid "unable to add recent objects"
15562msgstr "无法添加最近的对象"
15563
d46c5519 15564#: builtin/pack-objects.c:3206
ef317cd5
JX
15565#, c-format
15566msgid "unsupported index version %s"
15567msgstr "不支持的索引版本 %s"
15568
d46c5519 15569#: builtin/pack-objects.c:3210
ef317cd5
JX
15570#, c-format
15571msgid "bad index version '%s'"
15572msgstr "坏的索引版本 '%s'"
15573
d46c5519 15574#: builtin/pack-objects.c:3240
ef317cd5 15575msgid "do not show progress meter"
07432cef 15576msgstr "不显示进度表"
ef317cd5 15577
d46c5519 15578#: builtin/pack-objects.c:3242
ef317cd5 15579msgid "show progress meter"
07432cef 15580msgstr "显示进度表"
ef317cd5 15581
d46c5519 15582#: builtin/pack-objects.c:3244
ef317cd5 15583msgid "show progress meter during object writing phase"
07432cef 15584msgstr "在对象写入阶段显示进度表"
ef317cd5 15585
d46c5519 15586#: builtin/pack-objects.c:3247
ef317cd5 15587msgid "similar to --all-progress when progress meter is shown"
07432cef 15588msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 15589
d46c5519 15590#: builtin/pack-objects.c:3248
c1ac5258
JX
15591msgid "<version>[,<offset>]"
15592msgstr "<版本>[,<偏移>]"
ef317cd5 15593
d46c5519 15594#: builtin/pack-objects.c:3249
ef317cd5 15595msgid "write the pack index file in the specified idx format version"
07432cef 15596msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 15597
d46c5519 15598#: builtin/pack-objects.c:3252
ef317cd5 15599msgid "maximum size of each output pack file"
07432cef 15600msgstr "每个输出包的最大尺寸"
ef317cd5 15601
d46c5519 15602#: builtin/pack-objects.c:3254
ef317cd5 15603msgid "ignore borrowed objects from alternate object store"
160fb2b2 15604msgstr "忽略从备用对象存储里借用对象"
ef317cd5 15605
d46c5519 15606#: builtin/pack-objects.c:3256
ef317cd5 15607msgid "ignore packed objects"
07432cef 15608msgstr "忽略包对象"
ef317cd5 15609
d46c5519 15610#: builtin/pack-objects.c:3258
ef317cd5 15611msgid "limit pack window by objects"
07432cef 15612msgstr "限制打包窗口的对象数"
ef317cd5 15613
d46c5519 15614#: builtin/pack-objects.c:3260
ef317cd5 15615msgid "limit pack window by memory in addition to object limit"
07432cef 15616msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 15617
d46c5519 15618#: builtin/pack-objects.c:3262
ef317cd5 15619msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 15620msgstr "打包允许的 delta 链的最大长度"
ef317cd5 15621
d46c5519 15622#: builtin/pack-objects.c:3264
ef317cd5 15623msgid "reuse existing deltas"
07432cef 15624msgstr "重用已存在的 deltas"
ef317cd5 15625
d46c5519 15626#: builtin/pack-objects.c:3266
ef317cd5 15627msgid "reuse existing objects"
07432cef 15628msgstr "重用已存在的对象"
ef317cd5 15629
d46c5519 15630#: builtin/pack-objects.c:3268
ef317cd5 15631msgid "use OFS_DELTA objects"
07432cef 15632msgstr "使用 OFS_DELTA 对象"
ef317cd5 15633
d46c5519 15634#: builtin/pack-objects.c:3270
ef317cd5 15635msgid "use threads when searching for best delta matches"
07432cef 15636msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 15637
d46c5519 15638#: builtin/pack-objects.c:3272
ef317cd5 15639msgid "do not create an empty pack output"
07432cef 15640msgstr "不创建空的包输出"
ef317cd5 15641
d46c5519 15642#: builtin/pack-objects.c:3274
ef317cd5 15643msgid "read revision arguments from standard input"
d9d56b23 15644msgstr "从标准输入读取版本号参数"
ef317cd5 15645
d46c5519 15646#: builtin/pack-objects.c:3276
ef317cd5 15647msgid "limit the objects to those that are not yet packed"
07432cef 15648msgstr "限制那些尚未打包的对象"
ef317cd5 15649
d46c5519 15650#: builtin/pack-objects.c:3279
ef317cd5 15651msgid "include objects reachable from any reference"
07432cef 15652msgstr "包括可以从任何引用访问到的对象"
ef317cd5 15653
d46c5519 15654#: builtin/pack-objects.c:3282
ef317cd5 15655msgid "include objects referred by reflog entries"
07432cef 15656msgstr "包括被引用日志引用到的对象"
ef317cd5 15657
d46c5519 15658#: builtin/pack-objects.c:3285
220c313c
JX
15659msgid "include objects referred to by the index"
15660msgstr "包括被索引引用到的对象"
15661
d46c5519 15662#: builtin/pack-objects.c:3288
ef317cd5 15663msgid "output pack to stdout"
07432cef 15664msgstr "输出包到标准输出"
ef317cd5 15665
d46c5519 15666#: builtin/pack-objects.c:3290
ef317cd5 15667msgid "include tag objects that refer to objects to be packed"
53438e8f 15668msgstr "包括那些引用了待打包对象的标签对象"
ef317cd5 15669
d46c5519 15670#: builtin/pack-objects.c:3292
ef317cd5 15671msgid "keep unreachable objects"
07432cef 15672msgstr "维持不可达的对象"
ef317cd5 15673
d46c5519 15674#: builtin/pack-objects.c:3294
5c57d762
JX
15675msgid "pack loose unreachable objects"
15676msgstr "打包松散的不可达对象"
15677
d46c5519 15678#: builtin/pack-objects.c:3296
ef317cd5 15679msgid "unpack unreachable objects newer than <time>"
07432cef 15680msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 15681
d46c5519 15682#: builtin/pack-objects.c:3299
06991777
JX
15683msgid "use the sparse reachability algorithm"
15684msgstr "使用稀疏可达性算法"
15685
d46c5519 15686#: builtin/pack-objects.c:3301
ef317cd5 15687msgid "create thin packs"
07432cef 15688msgstr "创建精简包"
ef317cd5 15689
d46c5519 15690#: builtin/pack-objects.c:3303
04cb2f28 15691msgid "create packs suitable for shallow fetches"
160fb2b2 15692msgstr "创建适合浅克隆仓库获取的包"
04cb2f28 15693
d46c5519 15694#: builtin/pack-objects.c:3305
ef317cd5 15695msgid "ignore packs that have companion .keep file"
07432cef 15696msgstr "忽略配有 .keep 文件的包"
ef317cd5 15697
d46c5519 15698#: builtin/pack-objects.c:3307
fd8cb379
JX
15699msgid "ignore this pack"
15700msgstr "忽略该 pack"
15701
d46c5519 15702#: builtin/pack-objects.c:3309
ef317cd5 15703msgid "pack compression level"
07432cef 15704msgstr "打包压缩级别"
ef317cd5 15705
d46c5519 15706#: builtin/pack-objects.c:3311
ef317cd5 15707msgid "do not hide commits by grafts"
fd8cb379 15708msgstr "显示被移植隐藏的提交"
ef317cd5 15709
d46c5519 15710#: builtin/pack-objects.c:3313
6c94aba5
JX
15711msgid "use a bitmap index if available to speed up counting objects"
15712msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
15713
d46c5519 15714#: builtin/pack-objects.c:3315
6c94aba5
JX
15715msgid "write a bitmap index together with the pack index"
15716msgstr "在建立包索引的同时创建 bitmap 索引"
15717
d46c5519 15718#: builtin/pack-objects.c:3318
5809aa05
JX
15719msgid "handling for missing objects"
15720msgstr "处理丢失的对象"
15721
d46c5519 15722#: builtin/pack-objects.c:3321
31e5e17b
JX
15723msgid "do not pack objects in promisor packfiles"
15724msgstr "不要打包 promisor 包文件中的对象"
15725
d46c5519 15726#: builtin/pack-objects.c:3323
4c27fcb5
JX
15727msgid "respect islands during delta compression"
15728msgstr "在增量压缩时参考数据岛"
15729
d46c5519 15730#: builtin/pack-objects.c:3348
fd8cb379
JX
15731#, c-format
15732msgid "delta chain depth %d is too deep, forcing %d"
15733msgstr "增量链深度 %d 太深了,强制为 %d"
15734
d46c5519 15735#: builtin/pack-objects.c:3353
fd8cb379
JX
15736#, c-format
15737msgid "pack.deltaCacheLimit is too high, forcing %d"
15738msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d"
6c94aba5 15739
d46c5519 15740#: builtin/pack-objects.c:3407
c1ac5258
JX
15741msgid "--max-pack-size cannot be used to build a pack for transfer"
15742msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
15743
d46c5519 15744#: builtin/pack-objects.c:3409
c1ac5258 15745msgid "minimum pack size limit is 1 MiB"
e640d114 15746msgstr "最小的包文件大小是 1 MiB"
c1ac5258 15747
d46c5519 15748#: builtin/pack-objects.c:3414
c1ac5258
JX
15749msgid "--thin cannot be used to build an indexable pack"
15750msgstr "--thin 不能用于创建一个可索引包"
15751
d46c5519 15752#: builtin/pack-objects.c:3417
c1ac5258
JX
15753msgid "--keep-unreachable and --unpack-unreachable are incompatible"
15754msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
15755
d46c5519 15756#: builtin/pack-objects.c:3423
c1ac5258 15757msgid "cannot use --filter without --stdout"
e640d114 15758msgstr "不能在没有 --stdout 的情况下使用 --filter"
c1ac5258 15759
d46c5519 15760#: builtin/pack-objects.c:3484
fd8cb379
JX
15761msgid "Enumerating objects"
15762msgstr "枚举对象"
15763
d46c5519 15764#: builtin/pack-objects.c:3514
c1ac5258
JX
15765#, c-format
15766msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
15767msgstr "总共 %<PRIu32> (差异 %<PRIu32>),复用 %<PRIu32> (差异 %<PRIu32>)"
15768
d46c5519 15769#: builtin/pack-refs.c:8
814ff314
JX
15770msgid "git pack-refs [<options>]"
15771msgstr "git pack-refs [<选项>]"
c04f5ac3 15772
d46c5519 15773#: builtin/pack-refs.c:16
ef317cd5 15774msgid "pack everything"
07432cef 15775msgstr "打包一切"
c04f5ac3 15776
d46c5519 15777#: builtin/pack-refs.c:17
ef317cd5 15778msgid "prune loose refs (default)"
07432cef 15779msgstr "清除松散的引用(默认)"
c04f5ac3 15780
c1ac5258 15781#: builtin/prune-packed.c:9
814ff314
JX
15782msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
15783msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
6792b93b 15784
c1ac5258 15785#: builtin/prune-packed.c:42
6c94aba5
JX
15786msgid "Removing duplicate objects"
15787msgstr "正在删除重复对象"
15788
c1ac5258 15789#: builtin/prune.c:12
5809aa05
JX
15790msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
15791msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
7ac1c0ad 15792
d46c5519 15793#: builtin/prune.c:131
1b7f4a34
JX
15794msgid "report pruned objects"
15795msgstr "报告清除的对象"
15796
d46c5519 15797#: builtin/prune.c:134
1b7f4a34
JX
15798msgid "expire objects older than <time>"
15799msgstr "使早于给定时间的对象过期"
15800
d46c5519 15801#: builtin/prune.c:136
31e5e17b
JX
15802msgid "limit traversal to objects outside promisor packfiles"
15803msgstr "限制遍历 promisor 包以外的对象"
15804
d46c5519 15805#: builtin/prune.c:150
94550ed3
JX
15806msgid "cannot prune in a precious-objects repo"
15807msgstr "不能在珍品仓库中执行清理操作"
15808
d46c5519 15809#: builtin/pull.c:66 builtin/pull.c:68
a0b6b246
JX
15810#, c-format
15811msgid "Invalid value for %s: %s"
15812msgstr "%s 的值无效:%s"
15813
d46c5519 15814#: builtin/pull.c:88
94550ed3 15815msgid "git pull [<options>] [<repository> [<refspec>...]]"
1b7f4a34
JX
15816msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
15817
d46c5519 15818#: builtin/pull.c:140
a4f16749
JX
15819msgid "control for recursive fetching of submodules"
15820msgstr "控制子模组的递归获取"
15821
d46c5519 15822#: builtin/pull.c:144
1b7f4a34
JX
15823msgid "Options related to merging"
15824msgstr "和合并相关的选项"
15825
d46c5519 15826#: builtin/pull.c:147
1b7f4a34
JX
15827msgid "incorporate changes by rebasing rather than merging"
15828msgstr "使用变基操作取代合并操作以合入修改"
15829
d46c5519 15830#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125
1b7f4a34
JX
15831msgid "allow fast-forward"
15832msgstr "允许快进式"
15833
d46c5519 15834#: builtin/pull.c:184
5b04ee3b 15835msgid "automatically stash/stash pop before and after rebase"
554e8501 15836msgstr "变基操作前后执行自动贮藏和弹出贮藏"
5b04ee3b 15837
d46c5519 15838#: builtin/pull.c:200
1b7f4a34
JX
15839msgid "Options related to fetching"
15840msgstr "和获取相关的参数"
15841
d46c5519 15842#: builtin/pull.c:210
4c27fcb5
JX
15843msgid "force overwrite of local branch"
15844msgstr "强制覆盖本地分支"
15845
d46c5519 15846#: builtin/pull.c:218
276ceeaa
JX
15847msgid "number of submodules pulled in parallel"
15848msgstr "并发拉取的子模组的数量"
15849
d46c5519 15850#: builtin/pull.c:313
1b7f4a34
JX
15851#, c-format
15852msgid "Invalid value for pull.ff: %s"
15853msgstr "pull.ff 的取值无效:%s"
15854
d46c5519 15855#: builtin/pull.c:430
1b7f4a34
JX
15856msgid ""
15857"There is no candidate for rebasing against among the refs that you just "
15858"fetched."
15859msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
15860
d46c5519 15861#: builtin/pull.c:432
1b7f4a34
JX
15862msgid ""
15863"There are no candidates for merging among the refs that you just fetched."
15864msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
15865
d46c5519 15866#: builtin/pull.c:433
1b7f4a34
JX
15867msgid ""
15868"Generally this means that you provided a wildcard refspec which had no\n"
15869"matches on the remote end."
15870msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
15871
d46c5519 15872#: builtin/pull.c:436
1b7f4a34
JX
15873#, c-format
15874msgid ""
15875"You asked to pull from the remote '%s', but did not specify\n"
15876"a branch. Because this is not the default configured remote\n"
15877"for your current branch, you must specify a branch on the command line."
15878msgstr ""
15879"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
15880"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
15881
d46c5519 15882#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73
1b7f4a34
JX
15883msgid "You are not currently on a branch."
15884msgstr "您当前不在一个分支上。"
15885
d46c5519 15886#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79
1b7f4a34
JX
15887msgid "Please specify which branch you want to rebase against."
15888msgstr "请指定您要变基到哪一个分支。"
15889
d46c5519 15890#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82
1b7f4a34
JX
15891msgid "Please specify which branch you want to merge with."
15892msgstr "请指定您要合并哪一个分支。"
15893
d46c5519 15894#: builtin/pull.c:446 builtin/pull.c:461
1b7f4a34
JX
15895msgid "See git-pull(1) for details."
15896msgstr "详见 git-pull(1)。"
15897
d46c5519
JX
15898#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463
15899#: builtin/rebase.c:1327 git-parse-remote.sh:64
5b04ee3b
JX
15900msgid "<remote>"
15901msgstr "<远程>"
15902
d46c5519
JX
15903#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468
15904#: git-parse-remote.sh:65
5b04ee3b
JX
15905msgid "<branch>"
15906msgstr "<分支>"
15907
d46c5519 15908#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75
1b7f4a34
JX
15909msgid "There is no tracking information for the current branch."
15910msgstr "当前分支没有跟踪信息。"
15911
d46c5519 15912#: builtin/pull.c:465 git-parse-remote.sh:95
1b7f4a34 15913msgid ""
5b04ee3b
JX
15914"If you wish to set tracking information for this branch you can do so with:"
15915msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
7ac1c0ad 15916
d46c5519 15917#: builtin/pull.c:470
1b7f4a34
JX
15918#, c-format
15919msgid ""
15920"Your configuration specifies to merge with the ref '%s'\n"
15921"from the remote, but no such ref was fetched."
15922msgstr ""
15923"您的配置中指定要合并远程的引用 '%s',\n"
15924"但是没有获取到这个引用。"
7ac1c0ad 15925
d46c5519 15926#: builtin/pull.c:574
4c27fcb5
JX
15927#, c-format
15928msgid "unable to access commit %s"
15929msgstr "无法访问提交 %s"
15930
d46c5519 15931#: builtin/pull.c:854
5c57d762
JX
15932msgid "ignoring --verify-signatures for rebase"
15933msgstr "为变基操作忽略 --verify-signatures"
15934
d46c5519 15935#: builtin/pull.c:909
5b04ee3b
JX
15936msgid "--[no-]autostash option is only valid with --rebase."
15937msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
15938
d46c5519 15939#: builtin/pull.c:917
1b7f4a34
JX
15940msgid "Updating an unborn branch with changes added to the index."
15941msgstr "更新尚未诞生的分支,变更添加至索引。"
15942
d46c5519 15943#: builtin/pull.c:921
a0b6b246
JX
15944msgid "pull with rebase"
15945msgstr "变基式拉取"
15946
d46c5519 15947#: builtin/pull.c:922
a0b6b246 15948msgid "please commit or stash them."
554e8501 15949msgstr "请提交或贮藏它们。"
a0b6b246 15950
d46c5519 15951#: builtin/pull.c:947
1b7f4a34
JX
15952#, c-format
15953msgid ""
15954"fetch updated the current branch head.\n"
15955"fast-forwarding your working tree from\n"
15956"commit %s."
15957msgstr ""
15958"fetch 更新了当前的分支。快进您的工作区\n"
15959"至提交 %s。"
ef317cd5 15960
d46c5519 15961#: builtin/pull.c:953
1b7f4a34
JX
15962#, c-format
15963msgid ""
15964"Cannot fast-forward your working tree.\n"
15965"After making sure that you saved anything precious from\n"
15966"$ git diff %s\n"
15967"output, run\n"
15968"$ git reset --hard\n"
15969"to recover."
15970msgstr ""
15971"您当前的工作区无法执行快进操作。\n"
15972"首先执行如下命令:\n"
15973"$ git diff %s\n"
15974"以确认所有有用的数据均已保存。然后执行下面的命令\n"
15975"$ git reset --hard\n"
15976"恢复之前的状态。"
15977
d46c5519 15978#: builtin/pull.c:968
1b7f4a34
JX
15979msgid "Cannot merge multiple branches into empty head."
15980msgstr "无法将多个分支合并到空分支。"
15981
d46c5519 15982#: builtin/pull.c:972
1b7f4a34
JX
15983msgid "Cannot rebase onto multiple branches."
15984msgstr "无法变基到多个分支。"
15985
d46c5519 15986#: builtin/pull.c:979
a4f16749
JX
15987msgid "cannot rebase with locally recorded submodule modifications"
15988msgstr "本地子模组中有修改,无法变基"
15989
fd8cb379 15990#: builtin/push.c:19
ef317cd5 15991msgid "git push [<options>] [<repository> [<refspec>...]]"
160fb2b2 15992msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
7ac1c0ad 15993
fd8cb379 15994#: builtin/push.c:111
c04f5ac3 15995msgid "tag shorthand without <tag>"
55a16ee4 15996msgstr "标签后面未提供 <标签> 参数"
c04f5ac3 15997
fd8cb379 15998#: builtin/push.c:121
c04f5ac3 15999msgid "--delete only accepts plain target ref names"
90e6ef53 16000msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 16001
06991777 16002#: builtin/push.c:167
8ada9598
JX
16003msgid ""
16004"\n"
16005"To choose either option permanently, see push.default in 'git help config'."
16006msgstr ""
81809b99
JX
16007"\n"
16008"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 16009
06991777 16010#: builtin/push.c:170
8ada9598
JX
16011#, c-format
16012msgid ""
16013"The upstream branch of your current branch does not match\n"
16014"the name of your current branch. To push to the upstream branch\n"
16015"on the remote, use\n"
16016"\n"
16017" git push %s HEAD:%s\n"
16018"\n"
16019"To push to the branch of the same name on the remote, use\n"
16020"\n"
4c27fcb5 16021" git push %s HEAD\n"
8ada9598
JX
16022"%s"
16023msgstr ""
4c27fcb5
JX
16024"您当前分支的上游分支和您当前分支名不匹配,为推送到远程的上游分支,\n"
16025"使用\n"
81809b99
JX
16026"\n"
16027" git push %s HEAD:%s\n"
16028"\n"
16029"为推送至远程同名分支,使用\n"
16030"\n"
4c27fcb5 16031" git push %s HEAD\n"
81809b99 16032"%s"
8ada9598 16033
06991777 16034#: builtin/push.c:185
c04f5ac3
JX
16035#, c-format
16036msgid ""
16037"You are not currently on a branch.\n"
16038"To push the history leading to the current (detached HEAD)\n"
16039"state now, use\n"
16040"\n"
16041" git push %s HEAD:<name-of-remote-branch>\n"
16042msgstr ""
16043"您当前不在一个分支上。\n"
90e6ef53 16044"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3 16045"\n"
d9d56b23 16046" git push %s HEAD:<远程分支名字>\n"
c04f5ac3 16047
06991777 16048#: builtin/push.c:199
c04f5ac3
JX
16049#, c-format
16050msgid ""
16051"The current branch %s has no upstream branch.\n"
16052"To push the current branch and set the remote as upstream, use\n"
16053"\n"
16054" git push --set-upstream %s %s\n"
16055msgstr ""
16056"当前分支 %s 没有对应的上游分支。\n"
16057"为推送当前分支并建立与远程上游的跟踪,使用\n"
16058"\n"
16059" git push --set-upstream %s %s\n"
16060
06991777 16061#: builtin/push.c:207
c04f5ac3
JX
16062#, c-format
16063msgid "The current branch %s has multiple upstream branches, refusing to push."
16064msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
16065
06991777 16066#: builtin/push.c:210
73a60cd2
JX
16067#, c-format
16068msgid ""
16069"You are pushing to remote '%s', which is not the upstream of\n"
16070"your current branch '%s', without telling me what to push\n"
16071"to update which remote branch."
16072msgstr ""
16073"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
16074"而没有告诉我要推送什么、更新哪个远程分支。"
16075
06991777 16076#: builtin/push.c:269
c04f5ac3
JX
16077msgid ""
16078"You didn't specify any refspecs to push, and push.default is \"nothing\"."
160fb2b2 16079msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
c04f5ac3 16080
06991777 16081#: builtin/push.c:276
170e9899
JX
16082msgid ""
16083"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
16084"its remote counterpart. Integrate the remote changes (e.g.\n"
16085"'git pull ...') before pushing again.\n"
170e9899
JX
16086"See the 'Note about fast-forwards' in 'git push --help' for details."
16087msgstr ""
eff6d3a9 16088"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 16089"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 16090"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 16091
06991777 16092#: builtin/push.c:282
170e9899
JX
16093msgid ""
16094"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
16095"counterpart. Check out this branch and integrate the remote changes\n"
16096"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
16097"See the 'Note about fast-forwards' in 'git push --help' for details."
16098msgstr ""
eff6d3a9 16099"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 16100"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 16101"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 16102
06991777 16103#: builtin/push.c:288
07432cef 16104msgid ""
a77c07d9
JX
16105"Updates were rejected because the remote contains work that you do\n"
16106"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
16107"to the same ref. You may want to first integrate the remote changes\n"
16108"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
16109"See the 'Note about fast-forwards' in 'git push --help' for details."
16110msgstr ""
160fb2b2
JX
16111"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
16112"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
2e8451e8 16113"(如 'git pull ...')。\n"
a77c07d9
JX
16114"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
16115
06991777 16116#: builtin/push.c:295
a77c07d9 16117msgid "Updates were rejected because the tag already exists in the remote."
55a16ee4 16118msgstr "更新被拒绝,因为该标签在远程已经存在。"
a77c07d9 16119
06991777 16120#: builtin/push.c:298
a77c07d9
JX
16121msgid ""
16122"You cannot update a remote ref that points at a non-commit object,\n"
16123"or update a remote ref to make it point at a non-commit object,\n"
16124"without using the '--force' option.\n"
16125msgstr ""
16126"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
16127"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 16128
06991777 16129#: builtin/push.c:359
c04f5ac3
JX
16130#, c-format
16131msgid "Pushing to %s\n"
16132msgstr "推送到 %s\n"
16133
06991777 16134#: builtin/push.c:364
c04f5ac3
JX
16135#, c-format
16136msgid "failed to push some refs to '%s'"
c1ac5258 16137msgstr "推送一些引用到 '%s' 失败"
c04f5ac3 16138
06991777 16139#: builtin/push.c:398
c04f5ac3
JX
16140#, c-format
16141msgid "bad repository '%s'"
160fb2b2 16142msgstr "坏的仓库 '%s'"
c04f5ac3 16143
06991777 16144#: builtin/push.c:399
c04f5ac3
JX
16145msgid ""
16146"No configured push destination.\n"
16147"Either specify the URL from the command-line or configure a remote "
16148"repository using\n"
16149"\n"
16150" git remote add <name> <url>\n"
16151"\n"
16152"and then push using the remote name\n"
16153"\n"
16154" git push <name>\n"
16155msgstr ""
90e6ef53 16156"没有配置推送目标。\n"
4375c10e 16157"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
c04f5ac3 16158"\n"
d9d56b23 16159" git remote add <名称> <地址>\n"
c04f5ac3 16160"\n"
160fb2b2 16161"然后使用该远程仓库名执行推送\n"
c04f5ac3 16162"\n"
d9d56b23 16163" git push <名称>\n"
c04f5ac3 16164
06991777 16165#: builtin/push.c:554
ef317cd5 16166msgid "repository"
160fb2b2 16167msgstr "仓库"
ef317cd5 16168
06991777 16169#: builtin/push.c:555 builtin/send-pack.c:164
ef317cd5 16170msgid "push all refs"
07432cef 16171msgstr "推送所有引用"
ef317cd5 16172
06991777 16173#: builtin/push.c:556 builtin/send-pack.c:166
ef317cd5 16174msgid "mirror all refs"
07432cef 16175msgstr "镜像所有引用"
ef317cd5 16176
06991777 16177#: builtin/push.c:558
ef317cd5 16178msgid "delete refs"
07432cef 16179msgstr "删除引用"
ef317cd5 16180
06991777 16181#: builtin/push.c:559
ef317cd5 16182msgid "push tags (can't be used with --all or --mirror)"
55a16ee4 16183msgstr "推送标签(不能使用 --all or --mirror)"
ef317cd5 16184
06991777 16185#: builtin/push.c:562 builtin/send-pack.c:167
ef317cd5
JX
16186msgid "force updates"
16187msgstr "强制更新"
16188
06991777 16189#: builtin/push.c:564 builtin/send-pack.c:181
c1ac5258
JX
16190msgid "<refname>:<expect>"
16191msgstr "<引用名>:<期望值>"
90314792 16192
06991777 16193#: builtin/push.c:565 builtin/send-pack.c:182
90314792
JX
16194msgid "require old value of ref to be at this value"
16195msgstr "要求引用旧的取值为设定值"
16196
06991777 16197#: builtin/push.c:568
ef317cd5 16198msgid "control recursive pushing of submodules"
07432cef 16199msgstr "控制子模组的递归推送"
ef317cd5 16200
06991777 16201#: builtin/push.c:570 builtin/send-pack.c:175
ef317cd5 16202msgid "use thin pack"
07432cef 16203msgstr "使用精简打包"
ef317cd5 16204
06991777 16205#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
fd8cb379 16206#: builtin/send-pack.c:162
ef317cd5 16207msgid "receive pack program"
07432cef 16208msgstr "接收包程序"
ef317cd5 16209
06991777 16210#: builtin/push.c:573
ef317cd5 16211msgid "set upstream for git pull/status"
07432cef 16212msgstr "设置 git pull/status 的上游"
ef317cd5 16213
06991777 16214#: builtin/push.c:576
ef317cd5 16215msgid "prune locally removed refs"
07432cef 16216msgstr "清除本地删除的引用"
ef317cd5 16217
06991777 16218#: builtin/push.c:578
a77c07d9
JX
16219msgid "bypass pre-push hook"
16220msgstr "绕过 pre-push 钩子"
16221
06991777 16222#: builtin/push.c:579
1003b3a5 16223msgid "push missing but relevant tags"
55a16ee4 16224msgstr "推送缺失但有关的标签"
1003b3a5 16225
06991777 16226#: builtin/push.c:582 builtin/send-pack.c:169
220c313c
JX
16227msgid "GPG sign the push"
16228msgstr "用 GPG 为推送签名"
16229
06991777 16230#: builtin/push.c:584 builtin/send-pack.c:176
814ff314
JX
16231msgid "request atomic transaction on remote side"
16232msgstr "需要远端支持原子事务"
16233
06991777 16234#: builtin/push.c:602
c04f5ac3
JX
16235msgid "--delete is incompatible with --all, --mirror and --tags"
16236msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
16237
06991777 16238#: builtin/push.c:604
c04f5ac3
JX
16239msgid "--delete doesn't make sense without any refs"
16240msgstr "--delete 未接任何引用没有意义"
16241
06991777 16242#: builtin/push.c:607
fd8cb379
JX
16243msgid "--all and --tags are incompatible"
16244msgstr "--all 和 --tags 不兼容"
16245
06991777 16246#: builtin/push.c:609
fd8cb379
JX
16247msgid "--all can't be combined with refspecs"
16248msgstr "--all 不能和引用规格同时使用"
16249
06991777 16250#: builtin/push.c:613
fd8cb379
JX
16251msgid "--mirror and --tags are incompatible"
16252msgstr "--mirror 和 --tags 不兼容"
16253
06991777 16254#: builtin/push.c:615
fd8cb379
JX
16255msgid "--mirror can't be combined with refspecs"
16256msgstr "--mirror 不能和引用规格同时使用"
16257
06991777 16258#: builtin/push.c:618
fd8cb379
JX
16259msgid "--all and --mirror are incompatible"
16260msgstr "--all 和 --mirror 不兼容"
16261
06991777 16262#: builtin/push.c:637
5c57d762
JX
16263msgid "push options must not have new line characters"
16264msgstr "推送选项不能有换行符"
16265
c1ac5258
JX
16266#: builtin/range-diff.c:8
16267msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
16268msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>"
16269
16270#: builtin/range-diff.c:9
16271msgid "git range-diff [<options>] <old-tip>...<new-tip>"
16272msgstr "git range-diff [<选项>] <old-tip>...<new-tip>"
16273
16274#: builtin/range-diff.c:10
16275msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
16276msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>"
16277
4c27fcb5 16278#: builtin/range-diff.c:21
c1ac5258
JX
16279msgid "Percentage by which creation is weighted"
16280msgstr "创建权重的百分比"
16281
4c27fcb5 16282#: builtin/range-diff.c:23
c1ac5258
JX
16283msgid "use simple diff colors"
16284msgstr "使用简单差异颜色"
16285
d46c5519 16286#: builtin/range-diff.c:46 builtin/range-diff.c:50
c1ac5258
JX
16287#, c-format
16288msgid "no .. in range: '%s'"
16289msgstr "没有在范围中使用 ..:'%s'"
16290
d46c5519 16291#: builtin/range-diff.c:60
c1ac5258
JX
16292msgid "single arg format must be symmetric range"
16293msgstr "单个参数格式必须是对称范围(即包含...)"
16294
d46c5519 16295#: builtin/range-diff.c:75
c1ac5258
JX
16296msgid "need two commit ranges"
16297msgstr "需要两个提交范围"
16298
06991777 16299#: builtin/read-tree.c:41
ef317cd5 16300msgid ""
1b7f4a34 16301"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
ef317cd5
JX
16302"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
16303"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
16304msgstr ""
1b7f4a34 16305"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
07432cef 16306"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
1b7f4a34 16307"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
ef317cd5 16308
06991777 16309#: builtin/read-tree.c:124
ef317cd5 16310msgid "write resulting index to <file>"
d9d56b23 16311msgstr "将索引结果写入 <文件>"
ef317cd5 16312
06991777 16313#: builtin/read-tree.c:127
ef317cd5 16314msgid "only empty the index"
07432cef 16315msgstr "只是清空索引"
ef317cd5 16316
06991777 16317#: builtin/read-tree.c:129
ef317cd5 16318msgid "Merging"
07432cef 16319msgstr "合并"
ef317cd5 16320
06991777 16321#: builtin/read-tree.c:131
ef317cd5 16322msgid "perform a merge in addition to a read"
07432cef 16323msgstr "读取之余再执行一个合并"
ef317cd5 16324
06991777 16325#: builtin/read-tree.c:133
ef317cd5 16326msgid "3-way merge if no file level merging required"
160fb2b2 16327msgstr "如果没有文件级合并需要,执行三方合并"
ef317cd5 16328
06991777 16329#: builtin/read-tree.c:135
ef317cd5 16330msgid "3-way merge in presence of adds and removes"
160fb2b2 16331msgstr "存在添加和删除时,也执行三方合并"
ef317cd5 16332
06991777 16333#: builtin/read-tree.c:137
ef317cd5 16334msgid "same as -m, but discard unmerged entries"
07432cef 16335msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 16336
06991777 16337#: builtin/read-tree.c:138
ef317cd5 16338msgid "<subdirectory>/"
07432cef 16339msgstr "<子目录>/"
ef317cd5 16340
06991777 16341#: builtin/read-tree.c:139
ef317cd5 16342msgid "read the tree into the index under <subdirectory>/"
07432cef 16343msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 16344
06991777 16345#: builtin/read-tree.c:142
ef317cd5 16346msgid "update working tree with merge result"
07432cef 16347msgstr "用合并的结果更新工作区"
ef317cd5 16348
06991777 16349#: builtin/read-tree.c:144
ef317cd5 16350msgid "gitignore"
07432cef 16351msgstr "gitignore"
ef317cd5 16352
06991777 16353#: builtin/read-tree.c:145
ef317cd5 16354msgid "allow explicitly ignored files to be overwritten"
07432cef 16355msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 16356
06991777 16357#: builtin/read-tree.c:148
ef317cd5 16358msgid "don't check the working tree after merging"
07432cef 16359msgstr "合并后不检查工作区"
ef317cd5 16360
06991777 16361#: builtin/read-tree.c:149
ef317cd5 16362msgid "don't update the index or the work tree"
07432cef 16363msgstr "不更新索引区和工作区"
ef317cd5 16364
06991777 16365#: builtin/read-tree.c:151
ef317cd5 16366msgid "skip applying sparse checkout filter"
07432cef 16367msgstr "跳过应用稀疏检出过滤器"
ef317cd5 16368
06991777 16369#: builtin/read-tree.c:153
ef317cd5 16370msgid "debug unpack-trees"
07432cef 16371msgstr "调试 unpack-trees"
ef317cd5 16372
d46c5519
JX
16373#: builtin/read-tree.c:157
16374msgid "suppress feedback messages"
16375msgstr "抑制反馈信息"
16376
16377#: builtin/rebase.c:32
4c27fcb5
JX
16378msgid ""
16379"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
16380"[<branch>]"
16381msgstr ""
16382"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] [<上游>] [<分支>]"
16383
d46c5519 16384#: builtin/rebase.c:34
4c27fcb5
JX
16385msgid ""
16386"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
16387msgstr ""
16388"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]"
16389
d46c5519 16390#: builtin/rebase.c:36
4c27fcb5
JX
16391msgid "git rebase --continue | --abort | --skip | --edit-todo"
16392msgstr "git rebase --continue | --abort | --skip | --edit-todo"
16393
d46c5519
JX
16394#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
16395#, c-format
16396msgid "unusable todo list: '%s'"
16397msgstr "不可用的待办列表:'%s'"
16398
16399#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
16400#, c-format
16401msgid "could not write '%s'."
16402msgstr "不能写入 '%s'。"
16403
16404#: builtin/rebase.c:252
16405msgid "no HEAD?"
16406msgstr "没有 HEAD?"
16407
16408#: builtin/rebase.c:279
16409#, c-format
16410msgid "could not create temporary %s"
16411msgstr "无法创建临时的 %s"
16412
16413#: builtin/rebase.c:285
16414msgid "could not mark as interactive"
16415msgstr "无法标记为交互式"
16416
16417#: builtin/rebase.c:343
16418msgid "could not generate todo list"
16419msgstr "无法生成待办列表"
16420
16421#: builtin/rebase.c:382
16422msgid "a base commit must be provided with --upstream or --onto"
16423msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
16424
16425#: builtin/rebase.c:437
16426msgid "git rebase--interactive [<options>]"
16427msgstr "git rebase--interactive [<选项>]"
16428
16429#: builtin/rebase.c:449
16430msgid "keep empty commits"
16431msgstr "保持空提交"
16432
16433#: builtin/rebase.c:451 builtin/revert.c:127
16434msgid "allow commits with empty messages"
16435msgstr "允许提交说明为空"
16436
16437#: builtin/rebase.c:452
16438msgid "rebase merge commits"
16439msgstr "对合并提交变基"
16440
16441#: builtin/rebase.c:454
16442msgid "keep original branch points of cousins"
16443msgstr "保持兄弟提交的原始分支点"
16444
16445#: builtin/rebase.c:456
16446msgid "move commits that begin with squash!/fixup!"
16447msgstr "移动以 squash!/fixup! 开头的提交"
16448
16449#: builtin/rebase.c:457
16450msgid "sign commits"
16451msgstr "签名提交"
16452
16453#: builtin/rebase.c:459 builtin/rebase.c:1397
16454msgid "display a diffstat of what changed upstream"
16455msgstr "显示上游变化的 diffstat"
16456
16457#: builtin/rebase.c:461
16458msgid "continue rebase"
16459msgstr "继续变基"
16460
16461#: builtin/rebase.c:463
16462msgid "skip commit"
16463msgstr "跳过提交"
16464
16465#: builtin/rebase.c:464
16466msgid "edit the todo list"
16467msgstr "变基待办列表"
16468
16469#: builtin/rebase.c:466
16470msgid "show the current patch"
16471msgstr "显示当前补丁"
16472
16473#: builtin/rebase.c:469
16474msgid "shorten commit ids in the todo list"
16475msgstr "缩短待办列表中的提交号"
16476
16477#: builtin/rebase.c:471
16478msgid "expand commit ids in the todo list"
16479msgstr "扩展待办列表中的提交号"
16480
16481#: builtin/rebase.c:473
16482msgid "check the todo list"
16483msgstr "检查待办列表"
16484
16485#: builtin/rebase.c:475
16486msgid "rearrange fixup/squash lines"
16487msgstr "重新排列 fixup/squash 行"
16488
16489#: builtin/rebase.c:477
16490msgid "insert exec commands in todo list"
16491msgstr "在待办列表中插入 exec 执行命令"
16492
16493#: builtin/rebase.c:478
16494msgid "onto"
16495msgstr "onto"
16496
16497#: builtin/rebase.c:481
16498msgid "restrict-revision"
16499msgstr "restrict-revision"
16500
16501#: builtin/rebase.c:481
16502msgid "restrict revision"
16503msgstr "限制版本"
16504
16505#: builtin/rebase.c:483
16506msgid "squash-onto"
16507msgstr "squash-onto"
16508
16509#: builtin/rebase.c:484
16510msgid "squash onto"
16511msgstr "squash onto"
16512
16513#: builtin/rebase.c:486
16514msgid "the upstream commit"
16515msgstr "上游提交"
16516
16517#: builtin/rebase.c:488
16518msgid "head-name"
16519msgstr "head-name"
16520
16521#: builtin/rebase.c:488
16522msgid "head name"
16523msgstr "head 名称"
16524
16525#: builtin/rebase.c:493
16526msgid "rebase strategy"
16527msgstr "变基策略"
16528
16529#: builtin/rebase.c:494
16530msgid "strategy-opts"
16531msgstr "strategy-opts"
16532
16533#: builtin/rebase.c:495
16534msgid "strategy options"
16535msgstr "策略选项"
16536
16537#: builtin/rebase.c:496
16538msgid "switch-to"
16539msgstr "切换到"
16540
16541#: builtin/rebase.c:497
16542msgid "the branch or commit to checkout"
16543msgstr "要检出的分支或提交"
16544
16545#: builtin/rebase.c:498
16546msgid "onto-name"
16547msgstr "onto-name"
16548
16549#: builtin/rebase.c:498
16550msgid "onto name"
16551msgstr "onto name"
16552
16553#: builtin/rebase.c:499
16554msgid "cmd"
16555msgstr "cmd"
16556
16557#: builtin/rebase.c:499
16558msgid "the command to run"
16559msgstr "要执行的命令"
16560
16561#: builtin/rebase.c:502 builtin/rebase.c:1480
16562msgid "automatically re-schedule any `exec` that fails"
16563msgstr "自动重新安排任何失败的 `exec`"
16564
16565#: builtin/rebase.c:518
16566msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
16567msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果"
16568
16569#: builtin/rebase.c:534 builtin/rebase.c:1787
4c27fcb5
JX
16570#, c-format
16571msgid "%s requires an interactive rebase"
16572msgstr "%s 需要交互式变基"
16573
d46c5519 16574#: builtin/rebase.c:586
4c27fcb5
JX
16575#, c-format
16576msgid "could not get 'onto': '%s'"
16577msgstr "无法获取 'onto':'%s'"
16578
d46c5519 16579#: builtin/rebase.c:601
4c27fcb5
JX
16580#, c-format
16581msgid "invalid orig-head: '%s'"
16582msgstr "无效的原始 head:'%s'"
16583
d46c5519 16584#: builtin/rebase.c:626
4c27fcb5
JX
16585#, c-format
16586msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
16587msgstr "忽略无效的 allow_rerere_autoupdate:'%s'"
16588
d46c5519 16589#: builtin/rebase.c:702
4c27fcb5
JX
16590#, c-format
16591msgid "Could not read '%s'"
16592msgstr "不能读取 '%s'"
16593
d46c5519 16594#: builtin/rebase.c:720
4c27fcb5
JX
16595#, c-format
16596msgid "Cannot store %s"
16597msgstr "不能存储 %s"
16598
d46c5519 16599#: builtin/rebase.c:817
06991777
JX
16600msgid "could not determine HEAD revision"
16601msgstr "不能确定 HEAD 版本"
16602
d46c5519 16603#: builtin/rebase.c:940
4c27fcb5
JX
16604msgid ""
16605"Resolve all conflicts manually, mark them as resolved with\n"
16606"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
16607"You can instead skip this commit: run \"git rebase --skip\".\n"
16608"To abort and get back to the state before \"git rebase\", run \"git rebase --"
16609"abort\"."
16610msgstr ""
16611"手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n"
16612"冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n"
16613"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
16614"\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。"
16615
d46c5519 16616#: builtin/rebase.c:1021
06991777
JX
16617#, c-format
16618msgid ""
16619"\n"
16620"git encountered an error while preparing the patches to replay\n"
16621"these revisions:\n"
16622"\n"
16623" %s\n"
16624"\n"
16625"As a result, git cannot rebase them."
16626msgstr ""
16627"\n"
16628"在为重放这些版本而准备补丁时,git 遇到了一个错误:\n"
16629"\n"
16630" %s\n"
16631"\n"
16632"因此 git 无法对其变基。"
4c27fcb5 16633
d46c5519 16634#: builtin/rebase.c:1313
4c27fcb5
JX
16635#, c-format
16636msgid ""
16637"%s\n"
16638"Please specify which branch you want to rebase against.\n"
16639"See git-rebase(1) for details.\n"
16640"\n"
16641" git rebase '<branch>'\n"
16642"\n"
16643msgstr ""
16644"%s\n"
16645"请指定您要变基到哪个分支。\n"
16646"详见 git-rebase(1)。\n"
16647"\n"
16648" git rebase '<branch>'\n"
16649"\n"
16650
d46c5519 16651#: builtin/rebase.c:1329
4c27fcb5
JX
16652#, c-format
16653msgid ""
16654"If you wish to set tracking information for this branch you can do so with:\n"
16655"\n"
16656" git branch --set-upstream-to=%s/<branch> %s\n"
16657"\n"
16658msgstr ""
16659"如果您想要为此分支创建跟踪信息,您可以执行:\n"
16660"\n"
16661" git branch --set-upstream-to=%s/<branch> %s\n"
16662"\n"
16663
d46c5519 16664#: builtin/rebase.c:1359
06991777
JX
16665msgid "exec commands cannot contain newlines"
16666msgstr "exec 命令不能包含换行符"
16667
d46c5519 16668#: builtin/rebase.c:1363
06991777
JX
16669msgid "empty exec command"
16670msgstr "空的 exec 命令"
16671
d46c5519 16672#: builtin/rebase.c:1390
4c27fcb5
JX
16673msgid "rebase onto given branch instead of upstream"
16674msgstr "变基到给定的分支而非上游"
16675
d46c5519 16676#: builtin/rebase.c:1392
4c27fcb5
JX
16677msgid "allow pre-rebase hook to run"
16678msgstr "允许执行 pre-rebase 钩子"
16679
d46c5519 16680#: builtin/rebase.c:1394
4c27fcb5
JX
16681msgid "be quiet. implies --no-stat"
16682msgstr "安静。暗示 --no-stat"
16683
d46c5519 16684#: builtin/rebase.c:1400
4c27fcb5
JX
16685msgid "do not show diffstat of what changed upstream"
16686msgstr "不显示上游变化的 diffstat"
16687
d46c5519 16688#: builtin/rebase.c:1403
4c27fcb5
JX
16689msgid "add a Signed-off-by: line to each commit"
16690msgstr "为每一个提交添加一个 Signed-off-by: 签名"
16691
d46c5519 16692#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411
4c27fcb5
JX
16693msgid "passed to 'git am'"
16694msgstr "传递给 'git am'"
16695
d46c5519 16696#: builtin/rebase.c:1413 builtin/rebase.c:1415
4c27fcb5
JX
16697msgid "passed to 'git apply'"
16698msgstr "传递给 'git apply'"
16699
d46c5519 16700#: builtin/rebase.c:1417 builtin/rebase.c:1420
4c27fcb5
JX
16701msgid "cherry-pick all commits, even if unchanged"
16702msgstr "拣选所有提交,即使未修改"
16703
d46c5519 16704#: builtin/rebase.c:1422
4c27fcb5
JX
16705msgid "continue"
16706msgstr "继续"
16707
d46c5519 16708#: builtin/rebase.c:1425
4c27fcb5
JX
16709msgid "skip current patch and continue"
16710msgstr "跳过当前补丁并继续"
16711
16712# 译者:注意保持前导空格
d46c5519 16713#: builtin/rebase.c:1427
4c27fcb5
JX
16714msgid "abort and check out the original branch"
16715msgstr "终止并检出原有分支"
16716
d46c5519 16717#: builtin/rebase.c:1430
4c27fcb5
JX
16718msgid "abort but keep HEAD where it is"
16719msgstr "终止但保持 HEAD 不变"
16720
d46c5519 16721#: builtin/rebase.c:1431
4c27fcb5
JX
16722msgid "edit the todo list during an interactive rebase"
16723msgstr "在交互式变基中编辑待办列表"
16724
d46c5519 16725#: builtin/rebase.c:1434
4c27fcb5
JX
16726msgid "show the patch file being applied or merged"
16727msgstr "显示正在应用或合并的补丁文件"
16728
d46c5519 16729#: builtin/rebase.c:1437
4c27fcb5
JX
16730msgid "use merging strategies to rebase"
16731msgstr "使用合并策略进行变基"
16732
d46c5519 16733#: builtin/rebase.c:1441
4c27fcb5
JX
16734msgid "let the user edit the list of commits to rebase"
16735msgstr "让用户编辑要变基的提交列表"
16736
d46c5519
JX
16737#: builtin/rebase.c:1445
16738msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
16739msgstr "(已弃用)尝试重建合并提交而非忽略它们"
4c27fcb5 16740
d46c5519 16741#: builtin/rebase.c:1449
4c27fcb5
JX
16742msgid "preserve empty commits during rebase"
16743msgstr "变基时保留空提交"
16744
d46c5519 16745#: builtin/rebase.c:1451
4c27fcb5
JX
16746msgid "move commits that begin with squash!/fixup! under -i"
16747msgstr "在 -i 交互模式下,移动以 squash!/fixup! 开头的提交"
16748
d46c5519 16749#: builtin/rebase.c:1457
4c27fcb5
JX
16750msgid "automatically stash/stash pop before and after"
16751msgstr "在操作前后执行自动贮藏和弹出贮藏"
16752
d46c5519 16753#: builtin/rebase.c:1459
4c27fcb5
JX
16754msgid "add exec lines after each commit of the editable list"
16755msgstr "可编辑列表的每一个提交下面增加一行 exec"
16756
d46c5519 16757#: builtin/rebase.c:1463
4c27fcb5
JX
16758msgid "allow rebasing commits with empty messages"
16759msgstr "允许针对空提交说明的提交变基"
16760
d46c5519 16761#: builtin/rebase.c:1466
4c27fcb5
JX
16762msgid "try to rebase merges instead of skipping them"
16763msgstr "尝试对合并提交变基而不是忽略它们"
16764
d46c5519 16765#: builtin/rebase.c:1469
4c27fcb5
JX
16766msgid "use 'merge-base --fork-point' to refine upstream"
16767msgstr "使用 'merge-base --fork-point' 来优化上游"
16768
d46c5519 16769#: builtin/rebase.c:1471
4c27fcb5
JX
16770msgid "use the given merge strategy"
16771msgstr "使用给定的合并策略"
16772
d46c5519 16773#: builtin/rebase.c:1473 builtin/revert.c:114
4c27fcb5
JX
16774msgid "option"
16775msgstr "选项"
16776
d46c5519 16777#: builtin/rebase.c:1474
4c27fcb5
JX
16778msgid "pass the argument through to the merge strategy"
16779msgstr "将参数传递给合并策略"
16780
d46c5519 16781#: builtin/rebase.c:1477
4c27fcb5
JX
16782msgid "rebase all reachable commits up to the root(s)"
16783msgstr "将所有可达的提交变基到根提交"
16784
d46c5519
JX
16785#: builtin/rebase.c:1498
16786msgid ""
16787"the rebase.useBuiltin support has been removed!\n"
16788"See its entry in 'git help config' for details."
16789msgstr ""
16790"对 rebase.useBuiltin 的支持已被删除!\n"
16791"详见 'git help config' 中的条目。"
4c27fcb5 16792
d46c5519 16793#: builtin/rebase.c:1504
4c27fcb5
JX
16794msgid "It looks like 'git am' is in progress. Cannot rebase."
16795msgstr "看起来 'git-am' 正在执行中。无法变基。"
16796
d46c5519
JX
16797#: builtin/rebase.c:1545
16798msgid ""
16799"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
16800msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。"
16801
16802#: builtin/rebase.c:1549
4c27fcb5
JX
16803msgid "No rebase in progress?"
16804msgstr "没有正在进行的变基?"
16805
d46c5519 16806#: builtin/rebase.c:1553
4c27fcb5
JX
16807msgid "The --edit-todo action can only be used during interactive rebase."
16808msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
16809
d46c5519 16810#: builtin/rebase.c:1576
4c27fcb5
JX
16811msgid "Cannot read HEAD"
16812msgstr "不能读取 HEAD"
16813
d46c5519 16814#: builtin/rebase.c:1588
4c27fcb5
JX
16815msgid ""
16816"You must edit all merge conflicts and then\n"
16817"mark them as resolved using git add"
16818msgstr ""
16819"您必须编辑所有的合并冲突,然后通过 git add\n"
16820"命令将它们标记为已解决"
16821
d46c5519 16822#: builtin/rebase.c:1607
4c27fcb5
JX
16823msgid "could not discard worktree changes"
16824msgstr "无法丢弃工作区变更"
16825
d46c5519 16826#: builtin/rebase.c:1626
4c27fcb5
JX
16827#, c-format
16828msgid "could not move back to %s"
16829msgstr "无法移回 %s"
16830
d46c5519 16831#: builtin/rebase.c:1637 builtin/rm.c:369
4c27fcb5
JX
16832#, c-format
16833msgid "could not remove '%s'"
16834msgstr "无法删除 '%s'"
16835
d46c5519 16836#: builtin/rebase.c:1663
4c27fcb5
JX
16837#, c-format
16838msgid ""
16839"It seems that there is already a %s directory, and\n"
16840"I wonder if you are in the middle of another rebase. If that is the\n"
16841"case, please try\n"
16842"\t%s\n"
16843"If that is not the case, please\n"
16844"\t%s\n"
16845"and run me again. I am stopping in case you still have something\n"
16846"valuable there.\n"
16847msgstr ""
16848"似乎已有一个 %s 目录,我怀疑您正处于另外一个变基操作过程中。\n"
16849"如果是这样,请执行\n"
16850"\t%s\n"
16851"如果不是这样,请执行\n"
16852"\t%s\n"
16853"然后再重新执行。 为避免丢失重要数据,我已经停止当前操作。\n"
16854
d46c5519 16855#: builtin/rebase.c:1684
4c27fcb5
JX
16856msgid "switch `C' expects a numerical value"
16857msgstr "开关 `C' 期望一个数字值"
16858
d46c5519 16859#: builtin/rebase.c:1725
4c27fcb5
JX
16860#, c-format
16861msgid "Unknown mode: %s"
16862msgstr "未知模式:%s"
16863
d46c5519 16864#: builtin/rebase.c:1747
4c27fcb5
JX
16865msgid "--strategy requires --merge or --interactive"
16866msgstr "--strategy 需要 --merge 或 --interactive"
16867
d46c5519 16868#: builtin/rebase.c:1796
06991777
JX
16869msgid "cannot combine am options with either interactive or merge options"
16870msgstr "不能将 am 选项与交互或合并选项组合一起"
4c27fcb5 16871
d46c5519 16872#: builtin/rebase.c:1815
06991777
JX
16873msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
16874msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 组合一起"
4c27fcb5 16875
d46c5519 16876#: builtin/rebase.c:1819
06991777
JX
16877msgid ""
16878"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
16879msgstr ""
16880"错误:不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 组合一起"
4c27fcb5 16881
d46c5519 16882#: builtin/rebase.c:1825
06991777 16883msgid "cannot combine '--rebase-merges' with '--strategy-option'"
8e4e0555 16884msgstr "不能将 '--rebase-merges' 和 '--strategy-option' 组合一起"
4c27fcb5 16885
d46c5519 16886#: builtin/rebase.c:1828
06991777 16887msgid "cannot combine '--rebase-merges' with '--strategy'"
8e4e0555 16888msgstr "不能将 '--rebase-merges' 和 '--strategy' 组合一起"
4c27fcb5 16889
d46c5519 16890#: builtin/rebase.c:1852
4c27fcb5
JX
16891#, c-format
16892msgid "invalid upstream '%s'"
16893msgstr "无效的上游 '%s'"
16894
d46c5519 16895#: builtin/rebase.c:1858
4c27fcb5
JX
16896msgid "Could not create new root commit"
16897msgstr "不能创建新的根提交"
16898
d46c5519 16899#: builtin/rebase.c:1876
4c27fcb5
JX
16900#, c-format
16901msgid "'%s': need exactly one merge base"
16902msgstr "'%s':只需要一个合并基线"
16903
d46c5519 16904#: builtin/rebase.c:1883
4c27fcb5
JX
16905#, c-format
16906msgid "Does not point to a valid commit '%s'"
16907msgstr "没有指向一个有效的提交 '%s'"
16908
d46c5519 16909#: builtin/rebase.c:1908
4c27fcb5
JX
16910#, c-format
16911msgid "fatal: no such branch/commit '%s'"
06991777 16912msgstr "致命错误:无此分支/提交 '%s'"
4c27fcb5 16913
d46c5519
JX
16914#: builtin/rebase.c:1916 builtin/submodule--helper.c:38
16915#: builtin/submodule--helper.c:1933
4c27fcb5
JX
16916#, c-format
16917msgid "No such ref: %s"
16918msgstr "没有这样的引用:%s"
16919
d46c5519 16920#: builtin/rebase.c:1927
4c27fcb5
JX
16921msgid "Could not resolve HEAD to a revision"
16922msgstr "无法将 HEAD 解析为一个版本"
16923
d46c5519 16924#: builtin/rebase.c:1968
4c27fcb5
JX
16925msgid "Cannot autostash"
16926msgstr "无法 autostash"
16927
d46c5519 16928#: builtin/rebase.c:1971
4c27fcb5
JX
16929#, c-format
16930msgid "Unexpected stash response: '%s'"
16931msgstr "意外的 stash 响应:'%s'"
16932
d46c5519 16933#: builtin/rebase.c:1977
4c27fcb5
JX
16934#, c-format
16935msgid "Could not create directory for '%s'"
16936msgstr "不能为 '%s' 创建目录"
16937
d46c5519 16938#: builtin/rebase.c:1980
4c27fcb5
JX
16939#, c-format
16940msgid "Created autostash: %s\n"
16941msgstr "创建了 autostash:%s\n"
16942
d46c5519 16943#: builtin/rebase.c:1983
4c27fcb5
JX
16944msgid "could not reset --hard"
16945msgstr "无法 reset --hard"
16946
d46c5519 16947#: builtin/rebase.c:1984 builtin/reset.c:114
4c27fcb5
JX
16948#, c-format
16949msgid "HEAD is now at %s"
16950msgstr "HEAD 现在位于 %s"
16951
d46c5519 16952#: builtin/rebase.c:2000
4c27fcb5
JX
16953msgid "Please commit or stash them."
16954msgstr "请提交或贮藏修改。"
16955
d46c5519 16956#: builtin/rebase.c:2027
4c27fcb5
JX
16957#, c-format
16958msgid "could not parse '%s'"
16959msgstr "无法解析 '%s'"
16960
d46c5519 16961#: builtin/rebase.c:2040
4c27fcb5
JX
16962#, c-format
16963msgid "could not switch to %s"
16964msgstr "无法切换到 %s"
16965
d46c5519 16966#: builtin/rebase.c:2051
4c27fcb5
JX
16967msgid "HEAD is up to date."
16968msgstr "HEAD 是最新的。"
16969
d46c5519 16970#: builtin/rebase.c:2053
4c27fcb5
JX
16971#, c-format
16972msgid "Current branch %s is up to date.\n"
16973msgstr "当前分支 %s 是最新的。\n"
16974
d46c5519 16975#: builtin/rebase.c:2061
4c27fcb5
JX
16976msgid "HEAD is up to date, rebase forced."
16977msgstr "HEAD 是最新的,强制变基。"
16978
d46c5519 16979#: builtin/rebase.c:2063
4c27fcb5
JX
16980#, c-format
16981msgid "Current branch %s is up to date, rebase forced.\n"
16982msgstr "当前分支 %s 是最新的,强制变基。\n"
16983
d46c5519 16984#: builtin/rebase.c:2071
4c27fcb5
JX
16985msgid "The pre-rebase hook refused to rebase."
16986msgstr "pre-rebase 钩子拒绝了变基操作。"
16987
d46c5519 16988#: builtin/rebase.c:2078
4c27fcb5
JX
16989#, c-format
16990msgid "Changes to %s:\n"
16991msgstr "到 %s 的变更:\n"
16992
d46c5519 16993#: builtin/rebase.c:2081
4c27fcb5
JX
16994#, c-format
16995msgid "Changes from %s to %s:\n"
16996msgstr "从 %s 到 %s 的变更:\n"
16997
d46c5519 16998#: builtin/rebase.c:2106
4c27fcb5
JX
16999#, c-format
17000msgid "First, rewinding head to replay your work on top of it...\n"
17001msgstr "首先,回退头指针以便在其上重放您的工作...\n"
17002
d46c5519 17003#: builtin/rebase.c:2115
4c27fcb5
JX
17004msgid "Could not detach HEAD"
17005msgstr "无法分离头指针"
17006
d46c5519 17007#: builtin/rebase.c:2124
4c27fcb5
JX
17008#, c-format
17009msgid "Fast-forwarded %s to %s.\n"
17010msgstr "快进 %s 到 %s。\n"
17011
4c27fcb5 17012#: builtin/receive-pack.c:33
5b04ee3b 17013msgid "git receive-pack <git-dir>"
58b6f078 17014msgstr "git receive-pack <仓库目录>"
5b04ee3b 17015
d46c5519 17016#: builtin/receive-pack.c:833
a0b6b246
JX
17017msgid ""
17018"By default, updating the current branch in a non-bare repository\n"
17019"is denied, because it will make the index and work tree inconsistent\n"
17020"with what you pushed, and will require 'git reset --hard' to match\n"
17021"the work tree to HEAD.\n"
17022"\n"
1a79b2f1
JX
17023"You can set the 'receive.denyCurrentBranch' configuration variable\n"
17024"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
a0b6b246
JX
17025"its current branch; however, this is not recommended unless you\n"
17026"arranged to update its work tree to match what you pushed in some\n"
17027"other way.\n"
17028"\n"
17029"To squelch this message and still keep the default behaviour, set\n"
17030"'receive.denyCurrentBranch' configuration variable to 'refuse'."
17031msgstr ""
17032"默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
17033"不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
17034"\n"
17035"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
17036"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
17037"用某种方式将其工作区更新至您推送的状态。\n"
17038"\n"
17039"若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
17040"配置变量为 'refuse'。"
17041
d46c5519 17042#: builtin/receive-pack.c:853
a0b6b246
JX
17043msgid ""
17044"By default, deleting the current branch is denied, because the next\n"
17045"'git clone' won't result in any file checked out, causing confusion.\n"
17046"\n"
17047"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
17048"'warn' or 'ignore' in the remote repository to allow deleting the\n"
17049"current branch, with or without a warning message.\n"
17050"\n"
17051"To squelch this message, you can set it to 'refuse'."
17052msgstr ""
17053"默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
29004bbb 17054"导致困惑。\n"
a0b6b246
JX
17055"\n"
17056"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
29004bbb 17057"'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
a0b6b246
JX
17058"\n"
17059"若要屏蔽此信息,您可以设置它为 'refuse'。"
17060
d46c5519 17061#: builtin/receive-pack.c:1940
5b04ee3b
JX
17062msgid "quiet"
17063msgstr "静默模式"
17064
d46c5519 17065#: builtin/receive-pack.c:1954
5b04ee3b
JX
17066msgid "You must specify a directory."
17067msgstr "您必须指定一个目录。"
17068
06991777
JX
17069#: builtin/reflog.c:17
17070msgid ""
17071"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
17072"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
17073"<refs>..."
17074msgstr ""
17075"git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>] [--"
17076"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引"
17077"用>..."
17078
17079#: builtin/reflog.c:22
17080msgid ""
17081"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
17082"<refs>..."
17083msgstr ""
17084"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引"
17085"用>..."
17086
17087#: builtin/reflog.c:25
17088msgid "git reflog exists <ref>"
17089msgstr "git reflog exists <引用>"
17090
17091#: builtin/reflog.c:567 builtin/reflog.c:572
2e8451e8
JX
17092#, c-format
17093msgid "'%s' is not a valid timestamp"
17094msgstr "'%s' 不是一个有效的时间戳"
17095
06991777
JX
17096#: builtin/reflog.c:605
17097#, c-format
17098msgid "Marking reachable objects..."
17099msgstr "正在标记可达对象..."
17100
17101#: builtin/reflog.c:643
17102#, c-format
17103msgid "%s points nowhere!"
17104msgstr "%s 指向不存在!"
17105
17106#: builtin/reflog.c:695
17107msgid "no reflog specified to delete"
17108msgstr "未指定要删除的引用日志"
17109
17110#: builtin/reflog.c:704
17111#, c-format
17112msgid "not a reflog: %s"
17113msgstr "不是一个引用日志:%s"
17114
17115#: builtin/reflog.c:709
17116#, c-format
17117msgid "no reflog for '%s'"
17118msgstr "没有 '%s' 的引用日志"
17119
17120#: builtin/reflog.c:755
17121#, c-format
17122msgid "invalid ref format: %s"
17123msgstr "无效的引用格式:%s"
17124
17125#: builtin/reflog.c:764
17126msgid "git reflog [ show | expire | delete | exists ]"
17127msgstr "git reflog [ show | expire | delete | exists ]"
17128
4c27fcb5 17129#: builtin/remote.c:16
ef317cd5 17130msgid "git remote [-v | --verbose]"
07432cef 17131msgstr "git remote [-v | --verbose]"
ef317cd5 17132
4c27fcb5 17133#: builtin/remote.c:17
ef317cd5 17134msgid ""
814ff314 17135"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
ef317cd5
JX
17136"mirror=<fetch|push>] <name> <url>"
17137msgstr ""
814ff314 17138"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
d9d56b23 17139"mirror=<fetch|push>] <名称> <地址>"
ef317cd5 17140
4c27fcb5 17141#: builtin/remote.c:18 builtin/remote.c:38
ef317cd5 17142msgid "git remote rename <old> <new>"
07432cef 17143msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 17144
4c27fcb5 17145#: builtin/remote.c:19 builtin/remote.c:43
ef317cd5 17146msgid "git remote remove <name>"
07432cef 17147msgstr "git remote remove <名称>"
ef317cd5 17148
4c27fcb5 17149#: builtin/remote.c:20 builtin/remote.c:48
814ff314
JX
17150msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
17151msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
ef317cd5 17152
4c27fcb5 17153#: builtin/remote.c:21
ef317cd5 17154msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 17155msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 17156
4c27fcb5 17157#: builtin/remote.c:22
ef317cd5 17158msgid "git remote prune [-n | --dry-run] <name>"
07432cef 17159msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 17160
4c27fcb5 17161#: builtin/remote.c:23
ef317cd5
JX
17162msgid ""
17163"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 17164msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 17165
4c27fcb5 17166#: builtin/remote.c:24
ef317cd5 17167msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 17168msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 17169
4c27fcb5 17170#: builtin/remote.c:25 builtin/remote.c:74
94550ed3
JX
17171msgid "git remote get-url [--push] [--all] <name>"
17172msgstr "git remote get-url [--push] [--all] <名称>"
17173
4c27fcb5 17174#: builtin/remote.c:26 builtin/remote.c:79
ef317cd5 17175msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 17176msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 17177
4c27fcb5 17178#: builtin/remote.c:27 builtin/remote.c:80
ef317cd5 17179msgid "git remote set-url --add <name> <newurl>"
07432cef 17180msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 17181
4c27fcb5 17182#: builtin/remote.c:28 builtin/remote.c:81
ef317cd5 17183msgid "git remote set-url --delete <name> <url>"
07432cef 17184msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 17185
4c27fcb5 17186#: builtin/remote.c:33
ef317cd5 17187msgid "git remote add [<options>] <name> <url>"
07432cef 17188msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 17189
4c27fcb5 17190#: builtin/remote.c:53
ef317cd5 17191msgid "git remote set-branches <name> <branch>..."
07432cef 17192msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 17193
4c27fcb5 17194#: builtin/remote.c:54
ef317cd5 17195msgid "git remote set-branches --add <name> <branch>..."
07432cef 17196msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 17197
4c27fcb5 17198#: builtin/remote.c:59
ef317cd5 17199msgid "git remote show [<options>] <name>"
07432cef 17200msgstr "git remote show [<选项>] <名称>"
ef317cd5 17201
4c27fcb5 17202#: builtin/remote.c:64
ef317cd5 17203msgid "git remote prune [<options>] <name>"
07432cef 17204msgstr "git remote prune [<选项>] <名称>"
ef317cd5 17205
4c27fcb5 17206#: builtin/remote.c:69
ef317cd5 17207msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 17208msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 17209
4c27fcb5 17210#: builtin/remote.c:98
81809b99 17211#, c-format
8ada9598 17212msgid "Updating %s"
81809b99 17213msgstr "更新 %s 中"
8ada9598 17214
4c27fcb5 17215#: builtin/remote.c:130
8ada9598
JX
17216msgid ""
17217"--mirror is dangerous and deprecated; please\n"
17218"\t use --mirror=fetch or --mirror=push instead"
17219msgstr ""
81809b99
JX
17220"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
17221"\t 或 --mirror=push"
8ada9598 17222
4c27fcb5 17223#: builtin/remote.c:147
81809b99 17224#, c-format
8ada9598 17225msgid "unknown mirror argument: %s"
81809b99 17226msgstr "未知的镜像参数:%s"
8ada9598 17227
4c27fcb5 17228#: builtin/remote.c:163
ef317cd5 17229msgid "fetch the remote branches"
07432cef 17230msgstr "抓取远程的分支"
ef317cd5 17231
4c27fcb5 17232#: builtin/remote.c:165
ef317cd5 17233msgid "import all tags and associated objects when fetching"
55a16ee4 17234msgstr "抓取时导入所有的标签和关联对象"
ef317cd5 17235
4c27fcb5 17236#: builtin/remote.c:168
ef317cd5 17237msgid "or do not fetch any tag at all (--no-tags)"
55a16ee4 17238msgstr "或不抓取任何标签(--no-tags)"
ef317cd5 17239
4c27fcb5 17240#: builtin/remote.c:170
ef317cd5 17241msgid "branch(es) to track"
07432cef 17242msgstr "跟踪的分支"
ef317cd5 17243
4c27fcb5 17244#: builtin/remote.c:171
ef317cd5 17245msgid "master branch"
07432cef 17246msgstr "主线分支"
ef317cd5 17247
4c27fcb5 17248#: builtin/remote.c:173
ef317cd5 17249msgid "set up remote as a mirror to push to or fetch from"
07432cef 17250msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 17251
4c27fcb5 17252#: builtin/remote.c:185
8ada9598 17253msgid "specifying a master branch makes no sense with --mirror"
81809b99 17254msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 17255
4c27fcb5 17256#: builtin/remote.c:187
8ada9598 17257msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 17258msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 17259
4c27fcb5 17260#: builtin/remote.c:194 builtin/remote.c:636
81809b99 17261#, c-format
8ada9598 17262msgid "remote %s already exists."
81809b99 17263msgstr "远程 %s 已经存在。"
8ada9598 17264
4c27fcb5 17265#: builtin/remote.c:198 builtin/remote.c:640
81809b99 17266#, c-format
8ada9598 17267msgid "'%s' is not a valid remote name"
81809b99 17268msgstr "'%s' 不是一个有效的远程名称"
8ada9598 17269
4c27fcb5 17270#: builtin/remote.c:238
81809b99 17271#, c-format
8ada9598 17272msgid "Could not setup master '%s'"
81809b99 17273msgstr "无法设置 master '%s'"
8ada9598 17274
4c27fcb5 17275#: builtin/remote.c:344
81809b99 17276#, c-format
8ada9598 17277msgid "Could not get fetch map for refspec %s"
160fb2b2 17278msgstr "无法得到引用规格 %s 的获取列表"
8ada9598 17279
4c27fcb5 17280#: builtin/remote.c:443 builtin/remote.c:451
8ada9598 17281msgid "(matching)"
81809b99 17282msgstr "(匹配)"
8ada9598 17283
4c27fcb5 17284#: builtin/remote.c:455
8ada9598 17285msgid "(delete)"
81809b99 17286msgstr "(删除)"
8ada9598 17287
4c27fcb5 17288#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
81809b99 17289#, c-format
4c27fcb5
JX
17290msgid "No such remote: '%s'"
17291msgstr "没有此远程仓库:'%s'"
8ada9598 17292
4c27fcb5 17293#: builtin/remote.c:646
81809b99 17294#, c-format
8ada9598 17295msgid "Could not rename config section '%s' to '%s'"
81809b99 17296msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 17297
4c27fcb5 17298#: builtin/remote.c:666
8ada9598
JX
17299#, c-format
17300msgid ""
d691f479 17301"Not updating non-default fetch refspec\n"
8ada9598
JX
17302"\t%s\n"
17303"\tPlease update the configuration manually if necessary."
17304msgstr ""
160fb2b2 17305"没有更新非默认的获取引用规格\n"
81809b99
JX
17306"\t%s\n"
17307"\t如果必要请手动更新配置。"
8ada9598 17308
4c27fcb5 17309#: builtin/remote.c:702
81809b99 17310#, c-format
8ada9598 17311msgid "deleting '%s' failed"
81809b99 17312msgstr "删除 '%s' 失败"
8ada9598 17313
4c27fcb5 17314#: builtin/remote.c:736
81809b99 17315#, c-format
8ada9598 17316msgid "creating '%s' failed"
81809b99 17317msgstr "创建 '%s' 失败"
8ada9598 17318
4c27fcb5 17319#: builtin/remote.c:802
8ada9598
JX
17320msgid ""
17321"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
17322"to delete it, use:"
17323msgid_plural ""
17324"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
17325"to delete them, use:"
5ae481e0
JX
17326msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
17327msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 17328
4c27fcb5 17329#: builtin/remote.c:816
276ceeaa
JX
17330#, c-format
17331msgid "Could not remove config section '%s'"
17332msgstr "不能移除配置小节 '%s'"
17333
4c27fcb5 17334#: builtin/remote.c:917
8ada9598
JX
17335#, c-format
17336msgid " new (next fetch will store in remotes/%s)"
81809b99 17337msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 17338
4c27fcb5 17339#: builtin/remote.c:920
8ada9598 17340msgid " tracked"
81809b99 17341msgstr " 已跟踪"
8ada9598 17342
4c27fcb5 17343#: builtin/remote.c:922
8ada9598 17344msgid " stale (use 'git remote prune' to remove)"
81809b99 17345msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 17346
4c27fcb5 17347#: builtin/remote.c:924
8ada9598 17348msgid " ???"
81809b99 17349msgstr " ???"
8ada9598 17350
4c27fcb5 17351#: builtin/remote.c:965
8ada9598
JX
17352#, c-format
17353msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 17354msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 17355
4c27fcb5 17356#: builtin/remote.c:974
81809b99 17357#, c-format
276ceeaa
JX
17358msgid "rebases interactively onto remote %s"
17359msgstr "交互式变基到远程 %s"
8ada9598 17360
4c27fcb5 17361#: builtin/remote.c:976
fd8cb379
JX
17362#, c-format
17363msgid "rebases interactively (with merges) onto remote %s"
17364msgstr "交互式变基(含合并提交)到远程 %s"
17365
4c27fcb5 17366#: builtin/remote.c:979
5c57d762
JX
17367#, c-format
17368msgid "rebases onto remote %s"
17369msgstr "变基到远程 %s"
17370
4c27fcb5 17371#: builtin/remote.c:983
81809b99 17372#, c-format
8ada9598 17373msgid " merges with remote %s"
81809b99 17374msgstr " 与远程 %s 合并"
8ada9598 17375
4c27fcb5 17376#: builtin/remote.c:986
81809b99 17377#, c-format
8ada9598 17378msgid "merges with remote %s"
81809b99 17379msgstr "与远程 %s 合并"
8ada9598 17380
4c27fcb5 17381#: builtin/remote.c:989
5c57d762
JX
17382#, c-format
17383msgid "%-*s and with remote %s\n"
17384msgstr "%-*s 以及和远程 %s\n"
8ada9598 17385
4c27fcb5 17386#: builtin/remote.c:1032
8ada9598 17387msgid "create"
81809b99 17388msgstr "创建"
8ada9598 17389
4c27fcb5 17390#: builtin/remote.c:1035
8ada9598 17391msgid "delete"
81809b99 17392msgstr "删除"
8ada9598 17393
4c27fcb5 17394#: builtin/remote.c:1039
8ada9598 17395msgid "up to date"
81809b99 17396msgstr "最新"
8ada9598 17397
4c27fcb5 17398#: builtin/remote.c:1042
8ada9598 17399msgid "fast-forwardable"
81809b99 17400msgstr "可快进"
8ada9598 17401
4c27fcb5 17402#: builtin/remote.c:1045
8ada9598 17403msgid "local out of date"
81809b99 17404msgstr "本地已过时"
8ada9598 17405
4c27fcb5 17406#: builtin/remote.c:1052
8ada9598
JX
17407#, c-format
17408msgid " %-*s forces to %-*s (%s)"
81809b99 17409msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 17410
4c27fcb5 17411#: builtin/remote.c:1055
8ada9598
JX
17412#, c-format
17413msgid " %-*s pushes to %-*s (%s)"
81809b99 17414msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 17415
4c27fcb5 17416#: builtin/remote.c:1059
8ada9598
JX
17417#, c-format
17418msgid " %-*s forces to %s"
81809b99 17419msgstr " %-*s 强制推送至 %s"
8ada9598 17420
4c27fcb5 17421#: builtin/remote.c:1062
8ada9598
JX
17422#, c-format
17423msgid " %-*s pushes to %s"
81809b99 17424msgstr " %-*s 推送至 %s"
8ada9598 17425
4c27fcb5 17426#: builtin/remote.c:1130
ef317cd5 17427msgid "do not query remotes"
07432cef 17428msgstr "不查询远程"
ef317cd5 17429
4c27fcb5 17430#: builtin/remote.c:1157
81809b99 17431#, c-format
8ada9598 17432msgid "* remote %s"
81809b99 17433msgstr "* 远程 %s"
8ada9598 17434
4c27fcb5 17435#: builtin/remote.c:1158
8ada9598
JX
17436#, c-format
17437msgid " Fetch URL: %s"
81809b99 17438msgstr " 获取地址:%s"
8ada9598 17439
4c27fcb5 17440#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
8ada9598 17441msgid "(no URL)"
81809b99 17442msgstr "(无 URL)"
8ada9598 17443
a4f16749
JX
17444#. TRANSLATORS: the colon ':' should align
17445#. with the one in " Fetch URL: %s"
17446#. translation.
17447#.
4c27fcb5 17448#: builtin/remote.c:1173 builtin/remote.c:1175
8ada9598
JX
17449#, c-format
17450msgid " Push URL: %s"
81809b99 17451msgstr " 推送地址:%s"
8ada9598 17452
4c27fcb5 17453#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
81809b99 17454#, c-format
8ada9598 17455msgid " HEAD branch: %s"
4375c10e 17456msgstr " HEAD 分支:%s"
8ada9598 17457
5c57d762 17458# 译者:中文字符串拼接,可删除前导空格
4c27fcb5 17459#: builtin/remote.c:1177
5c57d762
JX
17460msgid "(not queried)"
17461msgstr "(未查询)"
17462
4c27fcb5 17463#: builtin/remote.c:1179
5c57d762
JX
17464msgid "(unknown)"
17465msgstr "(未知)"
17466
4c27fcb5 17467#: builtin/remote.c:1183
8ada9598
JX
17468#, c-format
17469msgid ""
17470" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 17471msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 17472
4c27fcb5 17473#: builtin/remote.c:1195
81809b99 17474#, c-format
8ada9598
JX
17475msgid " Remote branch:%s"
17476msgid_plural " Remote branches:%s"
81809b99 17477msgstr[0] " 远程分支:%s"
5ae481e0 17478msgstr[1] " 远程分支:%s"
8ada9598 17479
81809b99 17480# 译者:中文字符串拼接,可删除前导空格
4c27fcb5 17481#: builtin/remote.c:1198 builtin/remote.c:1224
8ada9598 17482msgid " (status not queried)"
81809b99 17483msgstr "(状态未查询)"
8ada9598 17484
4c27fcb5 17485#: builtin/remote.c:1207
8ada9598
JX
17486msgid " Local branch configured for 'git pull':"
17487msgid_plural " Local branches configured for 'git pull':"
81809b99 17488msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 17489msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 17490
4c27fcb5 17491#: builtin/remote.c:1215
8ada9598 17492msgid " Local refs will be mirrored by 'git push'"
81809b99 17493msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 17494
4c27fcb5 17495#: builtin/remote.c:1221
81809b99 17496#, c-format
8ada9598
JX
17497msgid " Local ref configured for 'git push'%s:"
17498msgid_plural " Local refs configured for 'git push'%s:"
81809b99 17499msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 17500msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 17501
4c27fcb5 17502#: builtin/remote.c:1242
ef317cd5 17503msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 17504msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 17505
4c27fcb5 17506#: builtin/remote.c:1244
ef317cd5 17507msgid "delete refs/remotes/<name>/HEAD"
07432cef 17508msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 17509
4c27fcb5 17510#: builtin/remote.c:1259
8ada9598 17511msgid "Cannot determine remote HEAD"
81809b99 17512msgstr "无法确定远程 HEAD"
8ada9598 17513
4c27fcb5 17514#: builtin/remote.c:1261
8ada9598 17515msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 17516msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 17517
4c27fcb5 17518#: builtin/remote.c:1271
81809b99 17519#, c-format
8ada9598 17520msgid "Could not delete %s"
81809b99 17521msgstr "无法删除 %s"
8ada9598 17522
4c27fcb5 17523#: builtin/remote.c:1279
81809b99 17524#, c-format
8ada9598 17525msgid "Not a valid ref: %s"
81809b99 17526msgstr "不是一个有效引用:%s"
8ada9598 17527
4c27fcb5 17528#: builtin/remote.c:1281
81809b99 17529#, c-format
8ada9598 17530msgid "Could not setup %s"
81809b99 17531msgstr "不能设置 %s"
8ada9598
JX
17532
17533# 译者:注意保持前导空格
4c27fcb5 17534#: builtin/remote.c:1299
81809b99 17535#, c-format
8ada9598 17536msgid " %s will become dangling!"
e640d114 17537msgstr " %s 将成为悬空状态!"
8ada9598
JX
17538
17539# 译者:注意保持前导空格
4c27fcb5 17540#: builtin/remote.c:1300
81809b99 17541#, c-format
8ada9598 17542msgid " %s has become dangling!"
e640d114 17543msgstr " %s 已成为悬空状态!"
8ada9598 17544
4c27fcb5 17545#: builtin/remote.c:1310
81809b99 17546#, c-format
8ada9598 17547msgid "Pruning %s"
81809b99 17548msgstr "修剪 %s"
8ada9598 17549
4c27fcb5 17550#: builtin/remote.c:1311
8ada9598
JX
17551#, c-format
17552msgid "URL: %s"
81809b99 17553msgstr "URL:%s"
8ada9598 17554
4c27fcb5 17555#: builtin/remote.c:1327
8ada9598
JX
17556#, c-format
17557msgid " * [would prune] %s"
81809b99 17558msgstr " * [将删除] %s"
8ada9598 17559
4c27fcb5 17560#: builtin/remote.c:1330
8ada9598
JX
17561#, c-format
17562msgid " * [pruned] %s"
81809b99 17563msgstr " * [已删除] %s"
8ada9598 17564
4c27fcb5 17565#: builtin/remote.c:1375
ef317cd5 17566msgid "prune remotes after fetching"
07432cef 17567msgstr "抓取后清除远程"
ef317cd5 17568
4c27fcb5 17569#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
81809b99 17570#, c-format
8ada9598 17571msgid "No such remote '%s'"
81809b99 17572msgstr "没有此远程 '%s'"
8ada9598 17573
4c27fcb5 17574#: builtin/remote.c:1454
ef317cd5 17575msgid "add branch"
07432cef 17576msgstr "添加分支"
ef317cd5 17577
4c27fcb5 17578#: builtin/remote.c:1461
8ada9598 17579msgid "no remote specified"
81809b99 17580msgstr "未指定远程"
8ada9598 17581
4c27fcb5 17582#: builtin/remote.c:1478
94550ed3
JX
17583msgid "query push URLs rather than fetch URLs"
17584msgstr "查询推送 URL 地址,而非获取 URL 地址"
17585
4c27fcb5 17586#: builtin/remote.c:1480
94550ed3
JX
17587msgid "return all URLs"
17588msgstr "返回所有 URL 地址"
17589
4c27fcb5 17590#: builtin/remote.c:1508
94550ed3
JX
17591#, c-format
17592msgid "no URLs configured for remote '%s'"
17593msgstr "没有给远程仓库 '%s' 设定 URL"
17594
4c27fcb5 17595#: builtin/remote.c:1534
ef317cd5 17596msgid "manipulate push URLs"
07432cef 17597msgstr "操作推送 URLS"
ef317cd5 17598
4c27fcb5 17599#: builtin/remote.c:1536
ef317cd5 17600msgid "add URL"
07432cef 17601msgstr "添加 URL"
ef317cd5 17602
4c27fcb5 17603#: builtin/remote.c:1538
ef317cd5 17604msgid "delete URLs"
07432cef 17605msgstr "删除 URLS"
ef317cd5 17606
4c27fcb5 17607#: builtin/remote.c:1545
8ada9598 17608msgid "--add --delete doesn't make sense"
81809b99 17609msgstr "--add --delete 无意义"
8ada9598 17610
4c27fcb5 17611#: builtin/remote.c:1584
81809b99 17612#, c-format
8ada9598 17613msgid "Invalid old URL pattern: %s"
4375c10e 17614msgstr "无效的旧 URL 匹配模版:%s"
8ada9598 17615
4c27fcb5 17616#: builtin/remote.c:1592
81809b99 17617#, c-format
8ada9598 17618msgid "No such URL found: %s"
4375c10e 17619msgstr "未找到此 URL:%s"
8ada9598 17620
4c27fcb5 17621#: builtin/remote.c:1594
8ada9598 17622msgid "Will not delete all non-push URLs"
4375c10e 17623msgstr "将不会删除所有非推送 URL 地址"
8ada9598 17624
4c27fcb5 17625#: builtin/remote.c:1610
ef317cd5 17626msgid "be verbose; must be placed before a subcommand"
07432cef 17627msgstr "冗长输出;必须置于子命令之前"
ef317cd5 17628
4c27fcb5 17629#: builtin/remote.c:1641
a0b6b246
JX
17630#, c-format
17631msgid "Unknown subcommand: %s"
17632msgstr "未知子命令:%s"
17633
4c27fcb5 17634#: builtin/repack.c:22
814ff314
JX
17635msgid "git repack [<options>]"
17636msgstr "git repack [<选项>]"
90314792 17637
4c27fcb5 17638#: builtin/repack.c:27
1a79b2f1
JX
17639msgid ""
17640"Incremental repacks are incompatible with bitmap indexes. Use\n"
17641"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
17642msgstr ""
17643"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
17644"或禁用 pack.writebitmaps 配置。"
17645
06991777
JX
17646#: builtin/repack.c:200
17647msgid "could not start pack-objects to repack promisor objects"
17648msgstr "无法运行 pack-objects 来重新打包 promisor 对象"
17649
d46c5519 17650#: builtin/repack.c:239 builtin/repack.c:414
06991777
JX
17651msgid "repack: Expecting full hex object ID lines only from pack-objects."
17652msgstr "repack:期望来自 pack-objects 的完整十六进制对象ID。"
17653
17654#: builtin/repack.c:256
17655msgid "could not finish pack-objects to repack promisor objects"
17656msgstr "无法结束 pack-objects 来重新打包 promisor 对象"
17657
4c27fcb5 17658#: builtin/repack.c:294
90314792
JX
17659msgid "pack everything in a single pack"
17660msgstr "所有内容打包到一个包文件中"
17661
4c27fcb5 17662#: builtin/repack.c:296
90314792
JX
17663msgid "same as -a, and turn unreachable objects loose"
17664msgstr "和 -a 相同,并将不可达的对象设为松散对象"
17665
4c27fcb5 17666#: builtin/repack.c:299
90314792
JX
17667msgid "remove redundant packs, and run git-prune-packed"
17668msgstr "删除多余的包,运行 git-prune-packed"
17669
4c27fcb5 17670#: builtin/repack.c:301
90314792
JX
17671msgid "pass --no-reuse-delta to git-pack-objects"
17672msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
17673
4c27fcb5 17674#: builtin/repack.c:303
90314792
JX
17675msgid "pass --no-reuse-object to git-pack-objects"
17676msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
17677
4c27fcb5 17678#: builtin/repack.c:305
90314792
JX
17679msgid "do not run git-update-server-info"
17680msgstr "不运行 git-update-server-info"
17681
4c27fcb5 17682#: builtin/repack.c:308
90314792
JX
17683msgid "pass --local to git-pack-objects"
17684msgstr "向 git-pack-objects 传递参数 --local"
17685
4c27fcb5 17686#: builtin/repack.c:310
6c94aba5
JX
17687msgid "write bitmap index"
17688msgstr "写 bitmap 索引"
17689
4c27fcb5
JX
17690#: builtin/repack.c:312
17691msgid "pass --delta-islands to git-pack-objects"
17692msgstr "向 git-pack-objects 传递参数 --delta-islands"
17693
17694#: builtin/repack.c:313
90314792
JX
17695msgid "approxidate"
17696msgstr "近似日期"
17697
4c27fcb5 17698#: builtin/repack.c:314
90314792
JX
17699msgid "with -A, do not loosen objects older than this"
17700msgstr "使用 -A,不要将早于给定时间的对象过期"
17701
4c27fcb5 17702#: builtin/repack.c:316
5c57d762
JX
17703msgid "with -a, repack unreachable objects"
17704msgstr "使用 -a ,重新对不可达对象打包"
17705
4c27fcb5 17706#: builtin/repack.c:318
90314792
JX
17707msgid "size of the window used for delta compression"
17708msgstr "用于增量压缩的窗口值"
17709
4c27fcb5 17710#: builtin/repack.c:319 builtin/repack.c:325
8376b58d
JX
17711msgid "bytes"
17712msgstr "字节"
17713
4c27fcb5 17714#: builtin/repack.c:320
90314792
JX
17715msgid "same as the above, but limit memory size instead of entries count"
17716msgstr "和上面的相似,但限制内存大小而非条目数"
17717
4c27fcb5 17718#: builtin/repack.c:322
90314792
JX
17719msgid "limits the maximum delta depth"
17720msgstr "限制最大增量深度"
17721
4c27fcb5 17722#: builtin/repack.c:324
a4f16749
JX
17723msgid "limits the maximum number of threads"
17724msgstr "限制最大线程数"
17725
4c27fcb5 17726#: builtin/repack.c:326
90314792 17727msgid "maximum size of each packfile"
dbd6cced 17728msgstr "每个包文件的最大尺寸"
90314792 17729
4c27fcb5 17730#: builtin/repack.c:328
6c94aba5
JX
17731msgid "repack objects in packs marked with .keep"
17732msgstr "对标记为 .keep 的包中的对象重新打包"
17733
4c27fcb5 17734#: builtin/repack.c:330
fd8cb379
JX
17735msgid "do not repack this pack"
17736msgstr "不要对该包文件重新打包"
17737
4c27fcb5 17738#: builtin/repack.c:340
94550ed3
JX
17739msgid "cannot delete packs in a precious-objects repo"
17740msgstr "不能删除珍品仓库中的打包文件"
17741
4c27fcb5 17742#: builtin/repack.c:344
5c57d762
JX
17743msgid "--keep-unreachable and -A are incompatible"
17744msgstr "--keep-unreachable 和 -A 不兼容"
17745
d46c5519 17746#: builtin/repack.c:423
06991777
JX
17747msgid "Nothing new to pack."
17748msgstr "没有新的要打包。"
17749
d46c5519 17750#: builtin/repack.c:484
06991777
JX
17751#, c-format
17752msgid ""
17753"WARNING: Some packs in use have been renamed by\n"
17754"WARNING: prefixing old- to their name, in order to\n"
17755"WARNING: replace them with the new version of the\n"
17756"WARNING: file. But the operation failed, and the\n"
17757"WARNING: attempt to rename them back to their\n"
17758"WARNING: original names also failed.\n"
17759"WARNING: Please rename them in %s manually:\n"
17760msgstr ""
17761"警告:为了将包文件替换为新版本,一些使用中的包已经\n"
17762"警告:通过添加 old- 前缀的方式重命名。但是操作失败,\n"
17763"警告:并且尝试重命名改回原有文件名的操作也失败。\n"
17764"警告:请手动将 %s 下的这些文件重命名:\n"
17765
d46c5519 17766#: builtin/repack.c:532
90314792 17767#, c-format
5c57d762 17768msgid "failed to remove '%s'"
c1ac5258 17769msgstr "删除 '%s' 失败"
90314792 17770
fd8cb379 17771#: builtin/replace.c:22
ef317cd5 17772msgid "git replace [-f] <object> <replacement>"
07432cef 17773msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 17774
fd8cb379 17775#: builtin/replace.c:23
6acbf033
JX
17776msgid "git replace [-f] --edit <object>"
17777msgstr "git replace [-f] --edit <对象>"
17778
fd8cb379 17779#: builtin/replace.c:24
6acbf033
JX
17780msgid "git replace [-f] --graft <commit> [<parent>...]"
17781msgstr "git replace [-f] --graft <提交> [<父提交>...]"
17782
fd8cb379
JX
17783#: builtin/replace.c:25
17784msgid "git replace [-f] --convert-graft-file"
17785msgstr "git replace [-f] --convert-graft-file"
17786
17787#: builtin/replace.c:26
ef317cd5 17788msgid "git replace -d <object>..."
07432cef 17789msgstr "git replace -d <对象>..."
ef317cd5 17790
fd8cb379 17791#: builtin/replace.c:27
cfff71a9
JX
17792msgid "git replace [--format=<format>] [-l [<pattern>]]"
17793msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 17794
d46c5519 17795#: builtin/replace.c:90
c1ac5258
JX
17796#, c-format
17797msgid ""
17798"invalid replace format '%s'\n"
17799"valid formats are 'short', 'medium' and 'long'"
17800msgstr ""
17801"无效的替换格式 '%s'\n"
17802"有效的格式有 'short'、'medium' 和 'long'"
17803
d46c5519 17804#: builtin/replace.c:125
c1ac5258
JX
17805#, c-format
17806msgid "replace ref '%s' not found"
17807msgstr "未发现替换引用 '%s'"
17808
d46c5519 17809#: builtin/replace.c:141
c1ac5258
JX
17810#, c-format
17811msgid "Deleted replace ref '%s'"
e640d114 17812msgstr "已删除替换引用 '%s'"
c1ac5258 17813
d46c5519 17814#: builtin/replace.c:153
c1ac5258
JX
17815#, c-format
17816msgid "'%s' is not a valid ref name"
17817msgstr "'%s' 不是一个有效的引用名"
17818
d46c5519 17819#: builtin/replace.c:158
c1ac5258
JX
17820#, c-format
17821msgid "replace ref '%s' already exists"
17822msgstr "替换引用 '%s' 已经存在"
17823
d46c5519 17824#: builtin/replace.c:178
c1ac5258
JX
17825#, c-format
17826msgid ""
17827"Objects must be of the same type.\n"
17828"'%s' points to a replaced object of type '%s'\n"
17829"while '%s' points to a replacement object of type '%s'."
17830msgstr ""
17831"对象必须属于同一类型。\n"
17832"'%s' 指向 '%s' 类型的替换对象\n"
17833"而 '%s' 指向 '%s' 类型的替换对象。"
17834
d46c5519 17835#: builtin/replace.c:229
c1ac5258
JX
17836#, c-format
17837msgid "unable to open %s for writing"
17838msgstr "无法为写入打开 %s"
17839
d46c5519 17840#: builtin/replace.c:242
c1ac5258
JX
17841msgid "cat-file reported failure"
17842msgstr "cat-file 报告失败"
17843
d46c5519 17844#: builtin/replace.c:258
c1ac5258
JX
17845#, c-format
17846msgid "unable to open %s for reading"
17847msgstr "无法为读取打开 %s"
17848
d46c5519 17849#: builtin/replace.c:272
c1ac5258
JX
17850msgid "unable to spawn mktree"
17851msgstr "无法启动 mktree"
17852
d46c5519 17853#: builtin/replace.c:276
c1ac5258
JX
17854msgid "unable to read from mktree"
17855msgstr "无法从 mktree 读取"
17856
d46c5519 17857#: builtin/replace.c:285
c1ac5258
JX
17858msgid "mktree reported failure"
17859msgstr "mktree 报告失败"
17860
d46c5519 17861#: builtin/replace.c:289
c1ac5258
JX
17862msgid "mktree did not return an object name"
17863msgstr "mktree 没有返回一个对象名"
17864
d46c5519 17865#: builtin/replace.c:298
c1ac5258
JX
17866#, c-format
17867msgid "unable to fstat %s"
17868msgstr "无法对 %s 执行 fstat"
17869
d46c5519 17870#: builtin/replace.c:303
c1ac5258
JX
17871msgid "unable to write object to database"
17872msgstr "无法向数据库写入对象"
17873
d46c5519
JX
17874#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
17875#: builtin/replace.c:452
c1ac5258
JX
17876#, c-format
17877msgid "not a valid object name: '%s'"
6acbf033
JX
17878msgstr "不是一个有效的对象名:'%s'"
17879
d46c5519 17880#: builtin/replace.c:326
c1ac5258
JX
17881#, c-format
17882msgid "unable to get object type for %s"
17883msgstr "无法得到 %s 的对象类型"
17884
d46c5519 17885#: builtin/replace.c:342
c1ac5258
JX
17886msgid "editing object file failed"
17887msgstr "编辑对象文件失败"
17888
d46c5519 17889#: builtin/replace.c:351
c1ac5258
JX
17890#, c-format
17891msgid "new object is the same as the old one: '%s'"
17892msgstr "新对象和旧对象相同:'%s'"
17893
d46c5519
JX
17894#: builtin/replace.c:383
17895#, c-format
17896msgid "could not parse %s as a commit"
17897msgstr "无法将 %s 解析为一个提交"
17898
17899#: builtin/replace.c:414
6acbf033
JX
17900#, c-format
17901msgid "bad mergetag in commit '%s'"
55a16ee4 17902msgstr "提交 '%s' 中含有损坏的合并标签"
6acbf033 17903
d46c5519 17904#: builtin/replace.c:416
6acbf033
JX
17905#, c-format
17906msgid "malformed mergetag in commit '%s'"
fd8cb379 17907msgstr "提交 '%s' 中含有格式错误的合并标签"
6acbf033 17908
d46c5519 17909#: builtin/replace.c:428
6acbf033
JX
17910#, c-format
17911msgid ""
17912"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
17913"instead of --graft"
55a16ee4 17914msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
6acbf033 17915
d46c5519 17916#: builtin/replace.c:467
6acbf033 17917#, c-format
c1ac5258
JX
17918msgid "the original commit '%s' has a gpg signature"
17919msgstr "原始提交 '%s' 中有一个 gpg 签名"
6acbf033 17920
d46c5519 17921#: builtin/replace.c:468
6acbf033
JX
17922msgid "the signature will be removed in the replacement commit!"
17923msgstr "在替换的提交中签名将被移除!"
17924
d46c5519 17925#: builtin/replace.c:478
6acbf033
JX
17926#, c-format
17927msgid "could not write replacement commit for: '%s'"
17928msgstr "不能为 '%s' 写替换提交"
17929
d46c5519 17930#: builtin/replace.c:486
c1ac5258
JX
17931#, c-format
17932msgid "graft for '%s' unnecessary"
17933msgstr "对 '%s' 移植没有必要"
17934
d46c5519 17935#: builtin/replace.c:490
c1ac5258
JX
17936#, c-format
17937msgid "new commit is the same as the old one: '%s'"
17938msgstr "新提交和旧的一样:'%s'"
17939
d46c5519 17940#: builtin/replace.c:525
fd8cb379
JX
17941#, c-format
17942msgid ""
17943"could not convert the following graft(s):\n"
17944"%s"
17945msgstr ""
17946"不能转换下列移植:\n"
17947"%s"
17948
d46c5519 17949#: builtin/replace.c:546
ef317cd5 17950msgid "list replace refs"
07432cef 17951msgstr "列出替换的引用"
ef317cd5 17952
d46c5519 17953#: builtin/replace.c:547
ef317cd5 17954msgid "delete replace refs"
07432cef 17955msgstr "删除替换的引用"
ef317cd5 17956
d46c5519 17957#: builtin/replace.c:548
6acbf033
JX
17958msgid "edit existing object"
17959msgstr "编辑现存的对象"
17960
d46c5519 17961#: builtin/replace.c:549
6acbf033
JX
17962msgid "change a commit's parents"
17963msgstr "修改一个提交的父提交"
17964
d46c5519 17965#: builtin/replace.c:550
fd8cb379
JX
17966msgid "convert existing graft file"
17967msgstr "转换现存的移植文件"
17968
d46c5519 17969#: builtin/replace.c:551
ef317cd5 17970msgid "replace the ref if it exists"
07432cef 17971msgstr "如果存在则替换引用"
ef317cd5 17972
d46c5519 17973#: builtin/replace.c:553
6acbf033
JX
17974msgid "do not pretty-print contents for --edit"
17975msgstr "不要为 --edit 操作美观显示内容"
17976
d46c5519 17977#: builtin/replace.c:554
cfff71a9
JX
17978msgid "use this format"
17979msgstr "使用此格式"
17980
d46c5519 17981#: builtin/replace.c:567
c1ac5258 17982msgid "--format cannot be used when not listing"
e640d114 17983msgstr "不列出时不能使用 --format"
c1ac5258 17984
d46c5519 17985#: builtin/replace.c:575
c1ac5258
JX
17986msgid "-f only makes sense when writing a replacement"
17987msgstr "只有写一个替换时 -f 才有意义"
17988
d46c5519 17989#: builtin/replace.c:579
c1ac5258
JX
17990msgid "--raw only makes sense with --edit"
17991msgstr "--raw 只有和 --edit 共用才有意义"
17992
d46c5519 17993#: builtin/replace.c:585
c1ac5258
JX
17994msgid "-d needs at least one argument"
17995msgstr "-d 需要至少一个参数"
17996
d46c5519 17997#: builtin/replace.c:591
c1ac5258
JX
17998msgid "bad number of arguments"
17999msgstr "错误的参数个数"
18000
d46c5519 18001#: builtin/replace.c:597
c1ac5258 18002msgid "-e needs exactly one argument"
e640d114 18003msgstr "-e 需要且仅需要一个参数"
c1ac5258 18004
d46c5519 18005#: builtin/replace.c:603
c1ac5258
JX
18006msgid "-g needs at least one argument"
18007msgstr "-g 需要至少一个参数"
18008
d46c5519 18009#: builtin/replace.c:609
c1ac5258
JX
18010msgid "--convert-graft-file takes no argument"
18011msgstr "--convert-graft-file 不带参数"
18012
d46c5519 18013#: builtin/replace.c:615
c1ac5258
JX
18014msgid "only one pattern can be given with -l"
18015msgstr "只能为 -l 提供一个模式"
18016
a4f16749 18017#: builtin/rerere.c:13
814ff314
JX
18018msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
18019msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
ef317cd5 18020
4c27fcb5 18021#: builtin/rerere.c:60
ef317cd5 18022msgid "register clean resolutions in index"
07432cef 18023msgstr "在索引中注册干净的解决方案"
ef317cd5 18024
4c27fcb5
JX
18025#: builtin/rerere.c:79
18026msgid "'git rerere forget' without paths is deprecated"
18027msgstr "没有路径的 'git rerere forget' 已经过时"
18028
06991777 18029#: builtin/rerere.c:113
4c27fcb5
JX
18030#, c-format
18031msgid "unable to generate diff for '%s'"
18032msgstr "无法为 '%s' 生成差异"
18033
06991777 18034#: builtin/reset.c:32
ef317cd5
JX
18035msgid ""
18036"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 18037msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5 18038
06991777 18039#: builtin/reset.c:33
a0b6b246
JX
18040msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
18041msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
ef317cd5 18042
06991777 18043#: builtin/reset.c:34
07432cef
WS
18044msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
18045msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 18046
06991777 18047#: builtin/reset.c:40
c04f5ac3
JX
18048msgid "mixed"
18049msgstr "混杂"
18050
06991777 18051#: builtin/reset.c:40
c04f5ac3
JX
18052msgid "soft"
18053msgstr "软性"
18054
06991777 18055#: builtin/reset.c:40
c04f5ac3
JX
18056msgid "hard"
18057msgstr "硬性"
18058
06991777 18059#: builtin/reset.c:40
8ada9598
JX
18060msgid "merge"
18061msgstr "合并"
18062
06991777 18063#: builtin/reset.c:40
c04f5ac3
JX
18064msgid "keep"
18065msgstr "保持"
18066
06991777 18067#: builtin/reset.c:81
c04f5ac3
JX
18068msgid "You do not have a valid HEAD."
18069msgstr "您没有一个有效的 HEAD。"
18070
06991777 18071#: builtin/reset.c:83
c04f5ac3
JX
18072msgid "Failed to find tree of HEAD."
18073msgstr "无法找到 HEAD 指向的树。"
18074
06991777 18075#: builtin/reset.c:89
c04f5ac3
JX
18076#, c-format
18077msgid "Failed to find tree of %s."
18078msgstr "无法找到 %s 指向的树。"
18079
90e6ef53 18080# 译者:汉字之间无空格,故删除%s前后空格
06991777 18081#: builtin/reset.c:193
c04f5ac3
JX
18082#, c-format
18083msgid "Cannot do a %s reset in the middle of a merge."
18084msgstr "在合并过程中不能做%s重置操作。"
18085
d46c5519
JX
18086#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
18087#: builtin/stash.c:613
ef317cd5 18088msgid "be quiet, only report errors"
07432cef 18089msgstr "安静模式,只报告错误"
ef317cd5 18090
06991777 18091#: builtin/reset.c:295
ef317cd5 18092msgid "reset HEAD and index"
07432cef 18093msgstr "重置 HEAD 和索引"
ef317cd5 18094
06991777 18095#: builtin/reset.c:296
ef317cd5 18096msgid "reset only HEAD"
07432cef 18097msgstr "只重置 HEAD"
ef317cd5 18098
06991777 18099#: builtin/reset.c:298 builtin/reset.c:300
ef317cd5 18100msgid "reset HEAD, index and working tree"
07432cef 18101msgstr "重置 HEAD、索引和工作区"
ef317cd5 18102
06991777 18103#: builtin/reset.c:302
ef317cd5 18104msgid "reset HEAD but keep local changes"
07432cef 18105msgstr "重置 HEAD 但保存本地变更"
ef317cd5 18106
06991777 18107#: builtin/reset.c:308
6c94aba5
JX
18108msgid "record only the fact that removed paths will be added later"
18109msgstr "将删除的路径标记为稍后添加"
18110
06991777 18111#: builtin/reset.c:326
07432cef
WS
18112#, c-format
18113msgid "Failed to resolve '%s' as a valid revision."
18114msgstr "无法将 '%s' 解析为一个有效的版本。"
18115
06991777 18116#: builtin/reset.c:334
07432cef
WS
18117#, c-format
18118msgid "Failed to resolve '%s' as a valid tree."
18119msgstr "无法将 '%s' 解析为一个有效的树对象。"
18120
06991777 18121#: builtin/reset.c:343
c04f5ac3 18122msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 18123msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 18124
d46c5519 18125#: builtin/reset.c:353
c04f5ac3 18126msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
d9d56b23 18127msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
c04f5ac3 18128
90e6ef53 18129# 译者:汉字之间无空格,故删除%s前后空格
d46c5519 18130#: builtin/reset.c:355
c04f5ac3
JX
18131#, c-format
18132msgid "Cannot do %s reset with paths."
18133msgstr "不能带路径进行%s重置。"
18134
90e6ef53 18135# 译者:汉字之间无空格,故删除%s前后空格
d46c5519 18136#: builtin/reset.c:370
c04f5ac3
JX
18137#, c-format
18138msgid "%s reset is not allowed in a bare repository"
160fb2b2 18139msgstr "不能对纯仓库进行%s重置"
c04f5ac3 18140
d46c5519 18141#: builtin/reset.c:374
6c94aba5
JX
18142msgid "-N can only be used with --mixed"
18143msgstr "-N 只能和 --mixed 同时使用"
18144
d46c5519 18145#: builtin/reset.c:395
90314792 18146msgid "Unstaged changes after reset:"
160fb2b2 18147msgstr "重置后取消暂存的变更:"
90314792 18148
d46c5519 18149#: builtin/reset.c:398
4c27fcb5
JX
18150#, c-format
18151msgid ""
18152"\n"
18153"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
18154"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
18155"to make this the default.\n"
18156msgstr ""
18157"\n"
18158"重置后,枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n"
18159"将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n"
18160
d46c5519 18161#: builtin/reset.c:408
ef317cd5
JX
18162#, c-format
18163msgid "Could not reset index file to revision '%s'."
18164msgstr "不能重置索引文件至版本 '%s'。"
18165
d46c5519 18166#: builtin/reset.c:412
07432cef
WS
18167msgid "Could not write new index file."
18168msgstr "不能写入新的索引文件。"
18169
d46c5519 18170#: builtin/rev-list.c:405
31e5e17b
JX
18171msgid "cannot combine --exclude-promisor-objects and --missing"
18172msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
18173
d46c5519 18174#: builtin/rev-list.c:466
5809aa05
JX
18175msgid "object filtering requires --objects"
18176msgstr "对象过滤需要 --objects"
18177
d46c5519 18178#: builtin/rev-list.c:469
5809aa05
JX
18179#, c-format
18180msgid "invalid sparse value '%s'"
18181msgstr "无效的稀疏值 '%s'"
18182
d46c5519 18183#: builtin/rev-list.c:510
1b7f4a34
JX
18184msgid "rev-list does not support display of notes"
18185msgstr "rev-list 不支持显示注解"
18186
d46c5519 18187#: builtin/rev-list.c:513
5809aa05
JX
18188msgid "cannot combine --use-bitmap-index with object filtering"
18189msgstr "不能将 --use-bitmap-index 和对象过滤组合使用"
18190
06991777 18191#: builtin/rev-parse.c:408
814ff314
JX
18192msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
18193msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
ef317cd5 18194
06991777 18195#: builtin/rev-parse.c:413
ef317cd5 18196msgid "keep the `--` passed as an arg"
07432cef 18197msgstr "保持 `--` 作为一个参数传递"
ef317cd5 18198
06991777 18199#: builtin/rev-parse.c:415
ef317cd5 18200msgid "stop parsing after the first non-option argument"
07432cef 18201msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 18202
06991777 18203#: builtin/rev-parse.c:418
cfff71a9
JX
18204msgid "output in stuck long form"
18205msgstr "以固定长格式输出"
18206
06991777 18207#: builtin/rev-parse.c:551
ef317cd5 18208msgid ""
814ff314 18209"git rev-parse --parseopt [<options>] -- [<args>...]\n"
ef317cd5 18210" or: git rev-parse --sq-quote [<arg>...]\n"
814ff314 18211" or: git rev-parse [<options>] [<arg>...]\n"
ef317cd5
JX
18212"\n"
18213"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
18214msgstr ""
814ff314 18215"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
90314792 18216" 或者:git rev-parse --sq-quote [<参数>...]\n"
814ff314 18217" 或者:git rev-parse [<选项>] [<参数>...]\n"
07432cef
WS
18218"\n"
18219"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5 18220
c1ac5258 18221#: builtin/revert.c:24
814ff314
JX
18222msgid "git revert [<options>] <commit-ish>..."
18223msgstr "git revert [<选项>] <提交号>..."
ef317cd5 18224
c1ac5258 18225#: builtin/revert.c:25
ef317cd5 18226msgid "git revert <subcommand>"
07432cef 18227msgstr "git revert <子命令>"
ef317cd5 18228
c1ac5258 18229#: builtin/revert.c:30
814ff314
JX
18230msgid "git cherry-pick [<options>] <commit-ish>..."
18231msgstr "git cherry-pick [<选项>] <提交号>..."
ef317cd5 18232
c1ac5258 18233#: builtin/revert.c:31
ef317cd5 18234msgid "git cherry-pick <subcommand>"
07432cef 18235msgstr "git cherry-pick <子命令>"
ef317cd5 18236
06991777
JX
18237#: builtin/revert.c:72
18238#, c-format
18239msgid "option `%s' expects a number greater than zero"
18240msgstr "选项 `%s' 期望一个大于零的数字"
18241
18242#: builtin/revert.c:92
ef317cd5
JX
18243#, c-format
18244msgid "%s: %s cannot be used with %s"
18245msgstr "%s:%s 不能和 %s 同时使用"
18246
d46c5519 18247#: builtin/revert.c:102
ef317cd5 18248msgid "end revert or cherry-pick sequence"
07432cef 18249msgstr "终止反转或拣选操作"
ef317cd5 18250
d46c5519 18251#: builtin/revert.c:103
ef317cd5 18252msgid "resume revert or cherry-pick sequence"
07432cef 18253msgstr "继续反转或拣选操作"
ef317cd5 18254
d46c5519 18255#: builtin/revert.c:104
ef317cd5 18256msgid "cancel revert or cherry-pick sequence"
07432cef 18257msgstr "取消反转或拣选操作"
ef317cd5 18258
d46c5519 18259#: builtin/revert.c:106
ef317cd5 18260msgid "don't automatically commit"
07432cef 18261msgstr "不要自动提交"
ef317cd5 18262
d46c5519 18263#: builtin/revert.c:107
ef317cd5 18264msgid "edit the commit message"
07432cef 18265msgstr "编辑提交说明"
ef317cd5 18266
d46c5519 18267#: builtin/revert.c:110
87cb7997 18268msgid "parent-number"
07432cef 18269msgstr "父编号"
ef317cd5 18270
d46c5519 18271#: builtin/revert.c:111
87cb7997
JX
18272msgid "select mainline parent"
18273msgstr "选择主干父提交编号"
18274
d46c5519 18275#: builtin/revert.c:113
ef317cd5 18276msgid "merge strategy"
07432cef 18277msgstr "合并策略"
ef317cd5 18278
d46c5519 18279#: builtin/revert.c:115
ef317cd5 18280msgid "option for merge strategy"
07432cef 18281msgstr "合并策略的选项"
ef317cd5 18282
d46c5519 18283#: builtin/revert.c:124
ef317cd5 18284msgid "append commit name"
07432cef 18285msgstr "追加提交名称"
ef317cd5 18286
d46c5519 18287#: builtin/revert.c:126
ef317cd5 18288msgid "preserve initially empty commits"
07432cef 18289msgstr "保留初始化的空提交"
ef317cd5 18290
d46c5519 18291#: builtin/revert.c:128
ef317cd5 18292msgid "keep redundant, empty commits"
07432cef 18293msgstr "保持多余的、空的提交"
ef317cd5 18294
d46c5519 18295#: builtin/revert.c:227
c04f5ac3
JX
18296msgid "revert failed"
18297msgstr "还原失败"
18298
d46c5519 18299#: builtin/revert.c:240
c04f5ac3
JX
18300msgid "cherry-pick failed"
18301msgstr "拣选失败"
18302
06991777 18303#: builtin/rm.c:19
814ff314
JX
18304msgid "git rm [<options>] [--] <file>..."
18305msgstr "git rm [<选项>] [--] <文件>..."
07432cef 18306
06991777 18307#: builtin/rm.c:207
c04f5ac3 18308msgid ""
2e8451e8
JX
18309"the following file has staged content different from both the\n"
18310"file and the HEAD:"
18311msgid_plural ""
18312"the following files have staged content different from both the\n"
18313"file and the HEAD:"
18314msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
18315msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
18316
06991777 18317#: builtin/rm.c:212
2e8451e8
JX
18318msgid ""
18319"\n"
c04f5ac3
JX
18320"(use -f to force removal)"
18321msgstr ""
2e8451e8 18322"\n"
c04f5ac3
JX
18323"(使用 -f 强制删除)"
18324
06991777 18325#: builtin/rm.c:216
2e8451e8
JX
18326msgid "the following file has changes staged in the index:"
18327msgid_plural "the following files have changes staged in the index:"
160fb2b2
JX
18328msgstr[0] "下列文件索引中有变更"
18329msgstr[1] "下列文件索引中有变更"
c04f5ac3 18330
06991777 18331#: builtin/rm.c:220 builtin/rm.c:229
c04f5ac3 18332msgid ""
2e8451e8 18333"\n"
c04f5ac3
JX
18334"(use --cached to keep the file, or -f to force removal)"
18335msgstr ""
2e8451e8
JX
18336"\n"
18337"(使用 --cached 保留本地文件,或用 -f 强制删除)"
18338
06991777 18339#: builtin/rm.c:226
2e8451e8
JX
18340msgid "the following file has local modifications:"
18341msgid_plural "the following files have local modifications:"
18342msgstr[0] "如下文件有本地修改:"
18343msgstr[1] "如下文件有本地修改:"
c04f5ac3 18344
06991777 18345#: builtin/rm.c:242
ef317cd5 18346msgid "do not list removed files"
07432cef 18347msgstr "不列出删除的文件"
ef317cd5 18348
06991777 18349#: builtin/rm.c:243
ef317cd5 18350msgid "only remove from the index"
07432cef 18351msgstr "只从索引区删除"
ef317cd5 18352
06991777 18353#: builtin/rm.c:244
ef317cd5 18354msgid "override the up-to-date check"
07432cef 18355msgstr "忽略文件更新状态检查"
ef317cd5 18356
06991777 18357#: builtin/rm.c:245
ef317cd5 18358msgid "allow recursive removal"
07432cef 18359msgstr "允许递归删除"
ef317cd5 18360
06991777 18361#: builtin/rm.c:247
ef317cd5 18362msgid "exit with a zero status even if nothing matched"
07432cef 18363msgstr "即使没有匹配,也以零状态退出"
ef317cd5 18364
06991777 18365#: builtin/rm.c:289
c1ac5258
JX
18366msgid "please stage your changes to .gitmodules or stash them to proceed"
18367msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
18368
06991777 18369#: builtin/rm.c:307
c04f5ac3
JX
18370#, c-format
18371msgid "not removing '%s' recursively without -r"
18372msgstr "未提供 -r 选项不会递归删除 '%s'"
18373
06991777 18374#: builtin/rm.c:346
c04f5ac3
JX
18375#, c-format
18376msgid "git rm: unable to remove %s"
18377msgstr "git rm:不能删除 %s"
18378
fd8cb379 18379#: builtin/send-pack.c:20
1b7f4a34
JX
18380msgid ""
18381"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
18382"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
18383"[<ref>...]\n"
18384" --all and explicit <ref> specification are mutually exclusive."
18385msgstr ""
18386"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
18387"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
18388" --all 和明确的 <引用> 互斥。"
18389
fd8cb379 18390#: builtin/send-pack.c:163
1b7f4a34
JX
18391msgid "remote name"
18392msgstr "远程名称"
18393
fd8cb379 18394#: builtin/send-pack.c:177
1b7f4a34
JX
18395msgid "use stateless RPC protocol"
18396msgstr "使用无状态的 RPC 协议"
18397
fd8cb379 18398#: builtin/send-pack.c:178
1b7f4a34
JX
18399msgid "read refs from stdin"
18400msgstr "从标准输入读取引用"
18401
fd8cb379 18402#: builtin/send-pack.c:179
1b7f4a34
JX
18403msgid "print status from remote helper"
18404msgstr "打印来自远程 helper 的状态"
18405
a4f16749 18406#: builtin/shortlog.c:14
fd8cb379
JX
18407msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
18408msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
18409
18410#: builtin/shortlog.c:15
18411msgid "git log --pretty=short | git shortlog [<options>]"
18412msgstr "git log --pretty=short | git shortlog [<选项>]"
ef317cd5 18413
fd8cb379 18414#: builtin/shortlog.c:264
1a79b2f1
JX
18415msgid "Group by committer rather than author"
18416msgstr "按照提交者分组而不是作者"
18417
fd8cb379 18418#: builtin/shortlog.c:266
ef317cd5 18419msgid "sort output according to the number of commits per author"
07432cef 18420msgstr "根据每个作者的提交数量排序"
ef317cd5 18421
fd8cb379 18422#: builtin/shortlog.c:268
ef317cd5 18423msgid "Suppress commit descriptions, only provides commit count"
07432cef 18424msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 18425
fd8cb379 18426#: builtin/shortlog.c:270
ef317cd5 18427msgid "Show the email address of each author"
07432cef 18428msgstr "显示每个作者的电子邮件地址"
ef317cd5 18429
fd8cb379 18430#: builtin/shortlog.c:271
c1ac5258
JX
18431msgid "<w>[,<i1>[,<i2>]]"
18432msgstr "<w>[,<i1>[,<i2>]]"
ef317cd5 18433
fd8cb379 18434#: builtin/shortlog.c:272
ef317cd5 18435msgid "Linewrap output"
07432cef 18436msgstr "折行输出"
ef317cd5 18437
06991777 18438#: builtin/shortlog.c:301
fd8cb379
JX
18439msgid "too many arguments given outside repository"
18440msgstr "仓库外执行提供了太多的参数"
18441
c1ac5258 18442#: builtin/show-branch.c:13
ef317cd5 18443msgid ""
814ff314 18444"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
18445"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
18446"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
18447"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
ef317cd5 18448msgstr ""
814ff314 18449"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
18450"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
18451"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
18452"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
ef317cd5 18453
c1ac5258 18454#: builtin/show-branch.c:17
814ff314 18455msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
58b6f078 18456msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
ef317cd5 18457
c1ac5258 18458#: builtin/show-branch.c:395
a0b6b246
JX
18459#, c-format
18460msgid "ignoring %s; cannot handle more than %d ref"
18461msgid_plural "ignoring %s; cannot handle more than %d refs"
18462msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
18463msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
18464
c1ac5258 18465#: builtin/show-branch.c:549
a0b6b246
JX
18466#, c-format
18467msgid "no matching refs with %s"
18468msgstr "没有和 %s 匹配的引用"
18469
4c27fcb5 18470#: builtin/show-branch.c:646
ef317cd5 18471msgid "show remote-tracking and local branches"
07432cef 18472msgstr "显示远程跟踪的和本地的分支"
ef317cd5 18473
4c27fcb5 18474#: builtin/show-branch.c:648
ef317cd5 18475msgid "show remote-tracking branches"
07432cef 18476msgstr "显示远程跟踪的分支"
ef317cd5 18477
4c27fcb5 18478#: builtin/show-branch.c:650
ef317cd5 18479msgid "color '*!+-' corresponding to the branch"
07432cef 18480msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 18481
4c27fcb5 18482#: builtin/show-branch.c:652
ef317cd5 18483msgid "show <n> more commits after the common ancestor"
07432cef 18484msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 18485
4c27fcb5 18486#: builtin/show-branch.c:654
ef317cd5 18487msgid "synonym to more=-1"
07432cef 18488msgstr "和 more=-1 同义"
ef317cd5 18489
4c27fcb5 18490#: builtin/show-branch.c:655
ef317cd5 18491msgid "suppress naming strings"
07432cef 18492msgstr "不显示字符串命名"
ef317cd5 18493
4c27fcb5 18494#: builtin/show-branch.c:657
ef317cd5 18495msgid "include the current branch"
07432cef 18496msgstr "包括当前分支"
ef317cd5 18497
4c27fcb5 18498#: builtin/show-branch.c:659
ef317cd5 18499msgid "name commits with their object names"
07432cef 18500msgstr "以对象名字命名提交"
ef317cd5 18501
4c27fcb5 18502#: builtin/show-branch.c:661
ef317cd5 18503msgid "show possible merge bases"
07432cef 18504msgstr "显示可能合并的基线"
ef317cd5 18505
4c27fcb5 18506#: builtin/show-branch.c:663
ef317cd5 18507msgid "show refs unreachable from any other ref"
07432cef 18508msgstr "显示没有任何引用的的引用"
ef317cd5 18509
4c27fcb5 18510#: builtin/show-branch.c:665
ef317cd5 18511msgid "show commits in topological order"
07432cef 18512msgstr "以拓扑顺序显示提交"
ef317cd5 18513
4c27fcb5 18514#: builtin/show-branch.c:668
ef317cd5 18515msgid "show only commits not on the first branch"
07432cef 18516msgstr "只显示不在第一个分支上的提交"
ef317cd5 18517
4c27fcb5 18518#: builtin/show-branch.c:670
ef317cd5 18519msgid "show merges reachable from only one tip"
07432cef 18520msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 18521
4c27fcb5 18522#: builtin/show-branch.c:672
2e8451e8
JX
18523msgid "topologically sort, maintaining date order where possible"
18524msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 18525
4c27fcb5 18526#: builtin/show-branch.c:675
ef317cd5 18527msgid "<n>[,<base>]"
07432cef 18528msgstr "<n>[,<base>]"
ef317cd5 18529
4c27fcb5 18530#: builtin/show-branch.c:676
ef317cd5 18531msgid "show <n> most recent ref-log entries starting at base"
58b6f078 18532msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
ef317cd5 18533
4c27fcb5 18534#: builtin/show-branch.c:712
a0b6b246
JX
18535msgid ""
18536"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
18537msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
18538
4c27fcb5 18539#: builtin/show-branch.c:736
a0b6b246
JX
18540msgid "no branches given, and HEAD is not valid"
18541msgstr "未提供分支,且 HEAD 无效"
18542
4c27fcb5 18543#: builtin/show-branch.c:739
a0b6b246
JX
18544msgid "--reflog option needs one branch name"
18545msgstr "选项 --reflog 需要一个分支名"
18546
4c27fcb5 18547#: builtin/show-branch.c:742
a0b6b246
JX
18548#, c-format
18549msgid "only %d entry can be shown at one time."
18550msgid_plural "only %d entries can be shown at one time."
18551msgstr[0] "一次只能显示 %d 个条目。"
18552msgstr[1] "一次只能显示 %d 个条目。"
18553
4c27fcb5 18554#: builtin/show-branch.c:746
a0b6b246
JX
18555#, c-format
18556msgid "no such ref %s"
18557msgstr "无此引用 %s"
18558
d46c5519 18559#: builtin/show-branch.c:832
a0b6b246
JX
18560#, c-format
18561msgid "cannot handle more than %d rev."
18562msgid_plural "cannot handle more than %d revs."
18563msgstr[0] "不能处理 %d 个以上的版本。"
18564msgstr[1] "不能处理 %d 个以上的版本。"
18565
d46c5519 18566#: builtin/show-branch.c:836
a0b6b246
JX
18567#, c-format
18568msgid "'%s' is not a valid ref."
18569msgstr "'%s' 不是一个有效的引用。"
18570
d46c5519 18571#: builtin/show-branch.c:839
a0b6b246
JX
18572#, c-format
18573msgid "cannot find commit %s (%s)"
29004bbb 18574msgstr "不能找到提交 %s(%s)"
a0b6b246 18575
d46c5519 18576#: builtin/show-ref.c:12
ef317cd5 18577msgid ""
814ff314
JX
18578"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
18579"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
ef317cd5 18580msgstr ""
814ff314
JX
18581"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
18582"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
ef317cd5 18583
d46c5519 18584#: builtin/show-ref.c:13
94550ed3
JX
18585msgid "git show-ref --exclude-existing[=<pattern>]"
18586msgstr "git show-ref --exclude-existing[=<模式>]"
ef317cd5 18587
d46c5519 18588#: builtin/show-ref.c:162
ef317cd5 18589msgid "only show tags (can be combined with heads)"
55a16ee4 18590msgstr "只显示标签(可以和头共用)"
ef317cd5 18591
d46c5519 18592#: builtin/show-ref.c:163
ef317cd5 18593msgid "only show heads (can be combined with tags)"
55a16ee4 18594msgstr "只显示头(可以和标签共用)"
ef317cd5 18595
d46c5519 18596#: builtin/show-ref.c:164
ef317cd5 18597msgid "stricter reference checking, requires exact ref path"
07432cef 18598msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 18599
d46c5519 18600#: builtin/show-ref.c:167 builtin/show-ref.c:169
2e8451e8
JX
18601msgid "show the HEAD reference, even if it would be filtered out"
18602msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 18603
d46c5519 18604#: builtin/show-ref.c:171
ef317cd5 18605msgid "dereference tags into object IDs"
4375c10e 18606msgstr "转换标签到对象 ID"
ef317cd5 18607
d46c5519
JX
18608#: builtin/show-ref.c:173
18609msgid "only show SHA1 hash using <n> digits"
18610msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
18611
18612#: builtin/show-ref.c:177
18613msgid "do not print results to stdout (useful with --verify)"
18614msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
18615
18616#: builtin/show-ref.c:179
18617msgid "show refs from stdin that aren't in local repository"
18618msgstr "显示从标准输入中读入的不在本地仓库中的引用"
18619
18620#: builtin/stash.c:22 builtin/stash.c:37
18621msgid "git stash list [<options>]"
18622msgstr "git stash list [<选项>]"
18623
18624#: builtin/stash.c:23 builtin/stash.c:42
18625msgid "git stash show [<options>] [<stash>]"
18626msgstr "git stash show [<选项>] [<stash>]"
18627
18628#: builtin/stash.c:24 builtin/stash.c:47
18629msgid "git stash drop [-q|--quiet] [<stash>]"
18630msgstr "git stash drop [-q|--quiet] [<stash>]"
18631
18632#: builtin/stash.c:25
18633msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
18634msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
18635
18636#: builtin/stash.c:26 builtin/stash.c:62
18637msgid "git stash branch <branchname> [<stash>]"
18638msgstr "git stash branch <分支名> [<stash>]"
18639
18640#: builtin/stash.c:27 builtin/stash.c:67
18641msgid "git stash clear"
18642msgstr "git stash clear"
18643
18644#: builtin/stash.c:28 builtin/stash.c:77
18645msgid ""
18646"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
18647" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
18648" [--] [<pathspec>...]]"
18649msgstr ""
18650"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
18651" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
18652" [--] [<路径规格>...]]"
18653
18654#: builtin/stash.c:31 builtin/stash.c:84
18655msgid ""
18656"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
18657" [-u|--include-untracked] [-a|--all] [<message>]"
18658msgstr ""
18659"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
18660" [-u|--include-untracked] [-a|--all] [<消息>]"
18661
18662#: builtin/stash.c:52
18663msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
18664msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
18665
18666#: builtin/stash.c:57
18667msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
18668msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
18669
18670#: builtin/stash.c:72
18671msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
18672msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>"
18673
18674#: builtin/stash.c:127
18675#, c-format
18676msgid "'%s' is not a stash-like commit"
18677msgstr "'%s' 不像是一个贮藏提交"
18678
18679#: builtin/stash.c:147
18680#, c-format
18681msgid "Too many revisions specified:%s"
18682msgstr "指定了太多的版本:%s"
18683
18684#: builtin/stash.c:161 git-legacy-stash.sh:548
18685msgid "No stash entries found."
18686msgstr "未发现贮藏条目。"
18687
18688#: builtin/stash.c:175
18689#, c-format
18690msgid "%s is not a valid reference"
18691msgstr "%s 不是一个有效的引用名"
18692
18693#: builtin/stash.c:224 git-legacy-stash.sh:75
18694msgid "git stash clear with parameters is unimplemented"
18695msgstr "git stash clear 不支持参数"
18696
18697#: builtin/stash.c:403
18698msgid "cannot apply a stash in the middle of a merge"
18699msgstr "无法在合并过程应用贮藏"
18700
18701#: builtin/stash.c:414
18702#, c-format
18703msgid "could not generate diff %s^!."
18704msgstr "无法生成差异 %s^!."
18705
18706#: builtin/stash.c:421
18707msgid "conflicts in index.Try without --index."
18708msgstr "索引中有冲突。尝试不用 --index。"
18709
18710#: builtin/stash.c:427
18711msgid "could not save index tree"
18712msgstr "不能保存索引树"
18713
18714#: builtin/stash.c:434
18715msgid "could not restore untracked files from stash"
18716msgstr "无法从贮藏条目中恢复未跟踪文件"
18717
18718#: builtin/stash.c:448
18719#, c-format
18720msgid "Merging %s with %s"
18721msgstr "正在合并 %s 和 %s"
18722
18723#: builtin/stash.c:458 git-legacy-stash.sh:680
18724msgid "Index was not unstashed."
18725msgstr "索引未从贮藏中恢复。"
18726
18727#: builtin/stash.c:516 builtin/stash.c:615
18728msgid "attempt to recreate the index"
18729msgstr "尝试重建索引"
18730
18731#: builtin/stash.c:549
18732#, c-format
18733msgid "Dropped %s (%s)"
18734msgstr "丢弃了 %s(%s)"
18735
18736#: builtin/stash.c:552
18737#, c-format
18738msgid "%s: Could not drop stash entry"
18739msgstr "%s:无法丢弃贮藏条目"
18740
18741#: builtin/stash.c:577
18742#, c-format
18743msgid "'%s' is not a stash reference"
18744msgstr "'%s' 不是一个贮藏引用"
18745
18746#: builtin/stash.c:627 git-legacy-stash.sh:694
18747msgid "The stash entry is kept in case you need it again."
18748msgstr "贮藏条目被保留以备您再次需要。"
18749
18750#: builtin/stash.c:650 git-legacy-stash.sh:712
18751msgid "No branch name specified"
18752msgstr "未指定分支名"
18753
18754#: builtin/stash.c:789 builtin/stash.c:826
18755#, c-format
18756msgid "Cannot update %s with %s"
18757msgstr "无法用 %2$s 更新 %1$s"
18758
18759#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510
18760msgid "stash message"
18761msgstr "贮藏说明"
18762
18763#: builtin/stash.c:817
18764msgid "\"git stash store\" requires one <commit> argument"
18765msgstr "\"git stash store\" 需要一个 <提交> 参数"
18766
18767#: builtin/stash.c:1039 git-legacy-stash.sh:217
18768msgid "No changes selected"
18769msgstr "没有选择变更"
18770
18771#: builtin/stash.c:1135 git-legacy-stash.sh:150
18772msgid "You do not have the initial commit yet"
18773msgstr "您尚未建立初始提交"
18774
18775#: builtin/stash.c:1162 git-legacy-stash.sh:165
18776msgid "Cannot save the current index state"
18777msgstr "无法保存当前索引状态"
18778
18779#: builtin/stash.c:1171 git-legacy-stash.sh:180
18780msgid "Cannot save the untracked files"
18781msgstr "无法保存未跟踪文件"
18782
18783#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200
18784#: git-legacy-stash.sh:213
18785msgid "Cannot save the current worktree state"
18786msgstr "无法保存当前工作区状态"
18787
18788#: builtin/stash.c:1219 git-legacy-stash.sh:233
18789msgid "Cannot record working tree state"
18790msgstr "不能记录工作区状态"
18791
18792#: builtin/stash.c:1268 git-legacy-stash.sh:337
18793msgid "Can't use --patch and --include-untracked or --all at the same time"
18794msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
18795
18796#: builtin/stash.c:1284
18797msgid "Did you forget to 'git add'?"
18798msgstr "您是否忘了执行 'git add'?"
18799
18800#: builtin/stash.c:1299 git-legacy-stash.sh:345
18801msgid "No local changes to save"
18802msgstr "没有要保存的本地修改"
18803
18804#: builtin/stash.c:1306 git-legacy-stash.sh:350
18805msgid "Cannot initialize stash"
18806msgstr "无法初始化贮藏"
18807
18808#: builtin/stash.c:1321 git-legacy-stash.sh:354
18809msgid "Cannot save the current status"
18810msgstr "无法保存当前状态"
18811
18812#: builtin/stash.c:1326
18813#, c-format
18814msgid "Saved working directory and index state %s"
18815msgstr "保存工作目录和索引状态 %s"
18816
18817#: builtin/stash.c:1430 git-legacy-stash.sh:384
18818msgid "Cannot remove worktree changes"
18819msgstr "无法删除工作区变更"
18820
18821#: builtin/stash.c:1465 builtin/stash.c:1501
18822msgid "keep index"
18823msgstr "保持索引"
18824
18825#: builtin/stash.c:1467 builtin/stash.c:1503
18826msgid "stash in patch mode"
18827msgstr "以补丁模式贮藏"
18828
18829#: builtin/stash.c:1468 builtin/stash.c:1504
18830msgid "quiet mode"
18831msgstr "静默模式"
18832
18833#: builtin/stash.c:1470 builtin/stash.c:1506
18834msgid "include untracked files in stash"
18835msgstr "贮藏中包含未跟踪文件"
ef317cd5 18836
d46c5519
JX
18837#: builtin/stash.c:1472 builtin/stash.c:1508
18838msgid "include ignore files"
18839msgstr "包含忽略的文件"
ef317cd5 18840
d46c5519
JX
18841#: builtin/stash.c:1568
18842#, c-format
18843msgid "could not exec %s"
18844msgstr "不能执行 %s"
ef317cd5 18845
a4f16749 18846#: builtin/stripspace.c:18
94550ed3
JX
18847msgid "git stripspace [-s | --strip-comments]"
18848msgstr "git stripspace [-s | --strip-comments]"
18849
a4f16749 18850#: builtin/stripspace.c:19
94550ed3
JX
18851msgid "git stripspace [-c | --comment-lines]"
18852msgstr "git stripspace [-c | --comment-lines]"
18853
06991777 18854#: builtin/stripspace.c:37
94550ed3
JX
18855msgid "skip and remove all lines starting with comment character"
18856msgstr "跳过和移除所有的注释行"
18857
06991777 18858#: builtin/stripspace.c:40
276ceeaa 18859msgid "prepend comment character and space to each line"
94550ed3
JX
18860msgstr "为每一行的行首添加注释符和空格"
18861
d46c5519 18862#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942
5b04ee3b
JX
18863#, c-format
18864msgid "Expecting a full ref name, got %s"
18865msgstr "期望一个完整的引用名称,却得到 %s"
18866
06991777 18867#: builtin/submodule--helper.c:62
31e5e17b
JX
18868msgid "submodule--helper print-default-remote takes no arguments"
18869msgstr "submodule--helper print-default-remote 不带参数"
18870
06991777 18871#: builtin/submodule--helper.c:100
5b04ee3b
JX
18872#, c-format
18873msgid "cannot strip one component off url '%s'"
18874msgstr "无法从 url '%s' 剥离一个组件"
18875
06991777 18876#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
94550ed3
JX
18877msgid "alternative anchor for relative paths"
18878msgstr "相对路径的替代锚记(anchor)"
18879
06991777 18880#: builtin/submodule--helper.c:413
94550ed3
JX
18881msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
18882msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
18883
06991777
JX
18884#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
18885#: builtin/submodule--helper.c:650
5b04ee3b
JX
18886#, c-format
18887msgid "No url found for submodule path '%s' in .gitmodules"
18888msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
18889
06991777 18890#: builtin/submodule--helper.c:522
c1ac5258
JX
18891#, c-format
18892msgid "Entering '%s'\n"
18893msgstr "进入 '%s'\n"
18894
06991777 18895#: builtin/submodule--helper.c:525
c1ac5258
JX
18896#, c-format
18897msgid ""
18898"run_command returned non-zero status for %s\n"
18899"."
4c27fcb5
JX
18900msgstr ""
18901"对 %s 执行 run_command 返回非零值。\n"
18902"."
c1ac5258 18903
06991777 18904#: builtin/submodule--helper.c:546
c1ac5258
JX
18905#, c-format
18906msgid ""
18907"run_command returned non-zero status while recursing in the nested "
18908"submodules of %s\n"
18909"."
4c27fcb5
JX
18910msgstr ""
18911"在递归 %s 的子模组执行 run_command 时返回非零值。\n"
18912"."
c1ac5258 18913
06991777 18914#: builtin/submodule--helper.c:562
c1ac5258
JX
18915msgid "Suppress output of entering each submodule command"
18916msgstr "阻止进入每一个子模组命令的输出"
18917
06991777 18918#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
c1ac5258
JX
18919msgid "Recurse into nested submodules"
18920msgstr "递归进入嵌套子模组中"
18921
06991777 18922#: builtin/submodule--helper.c:569
d46c5519
JX
18923msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
18924msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
c1ac5258 18925
06991777 18926#: builtin/submodule--helper.c:596
87cb7997
JX
18927#, c-format
18928msgid ""
4c27fcb5 18929"could not look up configuration '%s'. Assuming this repository is its own "
87cb7997
JX
18930"authoritative upstream."
18931msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
18932
06991777 18933#: builtin/submodule--helper.c:664
5b04ee3b
JX
18934#, c-format
18935msgid "Failed to register url for submodule path '%s'"
18936msgstr "无法为子模组 '%s' 注册 url"
18937
06991777 18938#: builtin/submodule--helper.c:668
5b04ee3b
JX
18939#, c-format
18940msgid "Submodule '%s' (%s) registered for path '%s'\n"
25c75902 18941msgstr "子模组 '%s'(%s)已对路径 '%s' 注册\n"
5b04ee3b 18942
06991777 18943#: builtin/submodule--helper.c:678
aef18cc6 18944#, c-format
5b04ee3b 18945msgid "warning: command update mode suggested for submodule '%s'\n"
aef18cc6 18946msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
5b04ee3b 18947
06991777 18948#: builtin/submodule--helper.c:685
5b04ee3b
JX
18949#, c-format
18950msgid "Failed to register update mode for submodule path '%s'"
18951msgstr "无法为子模组 '%s' 注册更新模式"
18952
06991777 18953#: builtin/submodule--helper.c:707
5b04ee3b 18954msgid "Suppress output for initializing a submodule"
31e5e17b 18955msgstr "阻止子模组初始化的输出"
5b04ee3b 18956
06991777 18957#: builtin/submodule--helper.c:712
d46c5519
JX
18958msgid "git submodule--helper init [<options>] [<path>]"
18959msgstr "git submodule--helper init [<选项>] [<路径>]"
5b04ee3b 18960
06991777 18961#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
94550ed3
JX
18962#, c-format
18963msgid "no submodule mapping found in .gitmodules for path '%s'"
18964msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
18965
06991777 18966#: builtin/submodule--helper.c:823
5809aa05
JX
18967#, c-format
18968msgid "could not resolve HEAD ref inside the submodule '%s'"
18969msgstr "无法解析子模组 '%s' 的 HEAD 引用"
18970
06991777 18971#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
5809aa05
JX
18972#, c-format
18973msgid "failed to recurse into submodule '%s'"
c1ac5258 18974msgstr "递归子模组 '%s' 失败"
5809aa05 18975
06991777 18976#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
5809aa05 18977msgid "Suppress submodule status output"
31e5e17b 18978msgstr "阻止子模组状态输出"
5809aa05 18979
06991777 18980#: builtin/submodule--helper.c:875
5809aa05
JX
18981msgid ""
18982"Use commit stored in the index instead of the one stored in the submodule "
18983"HEAD"
18984msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交"
18985
06991777 18986#: builtin/submodule--helper.c:876
5809aa05 18987msgid "recurse into nested submodules"
31e5e17b 18988msgstr "递归进入嵌套子模组中"
5809aa05 18989
06991777 18990#: builtin/submodule--helper.c:881
5809aa05
JX
18991msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
18992msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
18993
06991777 18994#: builtin/submodule--helper.c:905
5809aa05
JX
18995msgid "git submodule--helper name <path>"
18996msgstr "git submodule--helper name <路径>"
18997
06991777 18998#: builtin/submodule--helper.c:969
31e5e17b
JX
18999#, c-format
19000msgid "Synchronizing submodule url for '%s'\n"
19001msgstr "为 '%s' 同步子模组 url\n"
19002
06991777 19003#: builtin/submodule--helper.c:975
31e5e17b
JX
19004#, c-format
19005msgid "failed to register url for submodule path '%s'"
19006msgstr "无法为子模组路径 '%s' 注册 url"
19007
06991777 19008#: builtin/submodule--helper.c:989
31e5e17b
JX
19009#, c-format
19010msgid "failed to get the default remote for submodule '%s'"
19011msgstr "无法得到子模组 '%s' 的默认远程关联"
19012
06991777 19013#: builtin/submodule--helper.c:1000
31e5e17b
JX
19014#, c-format
19015msgid "failed to update remote for submodule '%s'"
19016msgstr "无法为子模组 '%s' 更新远程关联"
19017
06991777 19018#: builtin/submodule--helper.c:1047
31e5e17b
JX
19019msgid "Suppress output of synchronizing submodule url"
19020msgstr "阻止子模组 url 同步的输出"
19021
06991777 19022#: builtin/submodule--helper.c:1054
31e5e17b
JX
19023msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
19024msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
19025
06991777 19026#: builtin/submodule--helper.c:1108
31e5e17b
JX
19027#, c-format
19028msgid ""
19029"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
19030"really want to remove it including all of its history)"
19031msgstr ""
fd8cb379
JX
19032"子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm "
19033"-rf' 命令)"
31e5e17b 19034
06991777 19035#: builtin/submodule--helper.c:1120
31e5e17b
JX
19036#, c-format
19037msgid ""
19038"Submodule work tree '%s' contains local modifications; use '-f' to discard "
19039"them"
19040msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们"
19041
06991777 19042#: builtin/submodule--helper.c:1128
31e5e17b
JX
19043#, c-format
19044msgid "Cleared directory '%s'\n"
19045msgstr "已清除目录 '%s'\n"
19046
06991777 19047#: builtin/submodule--helper.c:1130
31e5e17b
JX
19048#, c-format
19049msgid "Could not remove submodule work tree '%s'\n"
19050msgstr "无法移除子模组工作区 '%s'\n"
19051
06991777 19052#: builtin/submodule--helper.c:1141
31e5e17b
JX
19053#, c-format
19054msgid "could not create empty submodule directory %s"
19055msgstr "不能创建空的子模组目录 %s"
19056
06991777 19057#: builtin/submodule--helper.c:1157
31e5e17b
JX
19058#, c-format
19059msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
19060msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
19061
06991777 19062#: builtin/submodule--helper.c:1186
31e5e17b
JX
19063msgid "Remove submodule working trees even if they contain local changes"
19064msgstr "删除子模组工作区,即使包含本地修改"
19065
06991777 19066#: builtin/submodule--helper.c:1187
31e5e17b
JX
19067msgid "Unregister all submodules"
19068msgstr "将所有子模组取消注册"
19069
06991777 19070#: builtin/submodule--helper.c:1192
31e5e17b
JX
19071msgid ""
19072"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
19073msgstr ""
19074"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
19075
06991777 19076#: builtin/submodule--helper.c:1206
31e5e17b
JX
19077msgid "Use '--all' if you really want to deinitialize all submodules"
19078msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
19079
06991777 19080#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
a0b6b246
JX
19081#, c-format
19082msgid "submodule '%s' cannot add alternate: %s"
19083msgstr "子模组 '%s' 不能添加仓库备选:%s"
19084
06991777 19085#: builtin/submodule--helper.c:1340
a0b6b246
JX
19086#, c-format
19087msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
19088msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
19089
06991777 19090#: builtin/submodule--helper.c:1347
a0b6b246
JX
19091#, c-format
19092msgid "Value '%s' for submodule.alternateLocation is not recognized"
19093msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
19094
06991777 19095#: builtin/submodule--helper.c:1370
94550ed3
JX
19096msgid "where the new submodule will be cloned to"
19097msgstr "新的子模组将要克隆的路径"
19098
06991777 19099#: builtin/submodule--helper.c:1373
94550ed3
JX
19100msgid "name of the new submodule"
19101msgstr "新子模组的名称"
19102
06991777 19103#: builtin/submodule--helper.c:1376
94550ed3
JX
19104msgid "url where to clone the submodule from"
19105msgstr "克隆子模组的 url 地址"
19106
06991777 19107#: builtin/submodule--helper.c:1384
94550ed3
JX
19108msgid "depth for shallow clones"
19109msgstr "浅克隆的深度"
19110
d46c5519 19111#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871
a0b6b246 19112msgid "force cloning progress"
29004bbb 19113msgstr "强制显示克隆进度"
a0b6b246 19114
06991777 19115#: builtin/submodule--helper.c:1392
94550ed3
JX
19116msgid ""
19117"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
5b04ee3b 19118"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
5c57d762
JX
19119msgstr ""
19120"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
19121"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
94550ed3 19122
06991777 19123#: builtin/submodule--helper.c:1423
94550ed3
JX
19124#, c-format
19125msgid "clone of '%s' into submodule path '%s' failed"
19126msgstr "无法克隆 '%s' 到子模组路径 '%s'"
19127
06991777 19128#: builtin/submodule--helper.c:1437
94550ed3
JX
19129#, c-format
19130msgid "could not get submodule directory for '%s'"
19131msgstr "无法得到 '%s' 的子模组目录"
19132
06991777 19133#: builtin/submodule--helper.c:1473
4c27fcb5
JX
19134#, c-format
19135msgid "Invalid update mode '%s' for submodule path '%s'"
19136msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效"
19137
06991777 19138#: builtin/submodule--helper.c:1477
4c27fcb5
JX
19139#, c-format
19140msgid "Invalid update mode '%s' configured for submodule path '%s'"
19141msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效"
19142
06991777 19143#: builtin/submodule--helper.c:1570
5b04ee3b
JX
19144#, c-format
19145msgid "Submodule path '%s' not initialized"
19146msgstr "子模组 '%s' 尚未初始化"
19147
06991777 19148#: builtin/submodule--helper.c:1574
5b04ee3b
JX
19149msgid "Maybe you want to use 'update --init'?"
19150msgstr "也许您想要执行 'update --init'?"
19151
06991777 19152#: builtin/submodule--helper.c:1604
5b04ee3b
JX
19153#, c-format
19154msgid "Skipping unmerged submodule %s"
19155msgstr "略过未合并的子模组 %s"
19156
06991777 19157#: builtin/submodule--helper.c:1633
5b04ee3b
JX
19158#, c-format
19159msgid "Skipping submodule '%s'"
19160msgstr "略过子模组 '%s'"
19161
06991777 19162#: builtin/submodule--helper.c:1777
5c57d762
JX
19163#, c-format
19164msgid "Failed to clone '%s'. Retry scheduled"
19165msgstr "克隆 '%s' 失败。按计划重试"
19166
06991777 19167#: builtin/submodule--helper.c:1788
5c57d762
JX
19168#, c-format
19169msgid "Failed to clone '%s' a second time, aborting"
19170msgstr "第二次尝试克隆 '%s' 失败,退出"
19171
d46c5519 19172#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092
5b04ee3b
JX
19173msgid "path into the working tree"
19174msgstr "到工作区的路径"
19175
d46c5519 19176#: builtin/submodule--helper.c:1853
5b04ee3b
JX
19177msgid "path into the working tree, across nested submodule boundaries"
19178msgstr "工作区中的路径,递归嵌套子模组"
19179
d46c5519 19180#: builtin/submodule--helper.c:1857
5b04ee3b
JX
19181msgid "rebase, merge, checkout or none"
19182msgstr "rebase、merge、checkout 或 none"
19183
d46c5519 19184#: builtin/submodule--helper.c:1863
5b04ee3b
JX
19185msgid "Create a shallow clone truncated to the specified number of revisions"
19186msgstr "创建一个指定深度的浅克隆"
19187
d46c5519 19188#: builtin/submodule--helper.c:1866
5b04ee3b
JX
19189msgid "parallel jobs"
19190msgstr "并发任务"
19191
d46c5519 19192#: builtin/submodule--helper.c:1868
5c57d762 19193msgid "whether the initial clone should follow the shallow recommendation"
9a4b694c 19194msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
5c57d762 19195
d46c5519 19196#: builtin/submodule--helper.c:1869
5b04ee3b
JX
19197msgid "don't print cloning progress"
19198msgstr "不要输出克隆进度"
94550ed3 19199
d46c5519 19200#: builtin/submodule--helper.c:1876
5b04ee3b
JX
19201msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
19202msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
19203
d46c5519 19204#: builtin/submodule--helper.c:1889
5b04ee3b
JX
19205msgid "bad value for update parameter"
19206msgstr "update 参数取值错误"
19207
d46c5519 19208#: builtin/submodule--helper.c:1937
5c57d762
JX
19209#, c-format
19210msgid ""
19211"Submodule (%s) branch configured to inherit branch from superproject, but "
19212"the superproject is not on any branch"
19213msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
19214
d46c5519 19215#: builtin/submodule--helper.c:2060
4c27fcb5
JX
19216#, c-format
19217msgid "could not get a repository handle for submodule '%s'"
19218msgstr "无法获得子模组 '%s' 的仓库句柄"
19219
d46c5519 19220#: builtin/submodule--helper.c:2093
1a79b2f1
JX
19221msgid "recurse into submodules"
19222msgstr "在子模组中递归"
19223
d46c5519
JX
19224#: builtin/submodule--helper.c:2099
19225msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
19226msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
1a79b2f1 19227
06991777 19228#: builtin/submodule--helper.c:2156
4c27fcb5
JX
19229msgid "check if it is safe to write to the .gitmodules file"
19230msgstr "检查写入 .gitmodules 文件是否安全"
19231
d46c5519
JX
19232#: builtin/submodule--helper.c:2159
19233msgid "unset the config in the .gitmodules file"
19234msgstr "取消 .gitmodules 文件中的设置"
19235
19236#: builtin/submodule--helper.c:2164
19237msgid "git submodule--helper config <name> [<value>]"
19238msgstr "git submodule--helper config <名称> [<值>]"
4c27fcb5 19239
d46c5519
JX
19240#: builtin/submodule--helper.c:2165
19241msgid "git submodule--helper config --unset <name>"
19242msgstr "git submodule--helper config --unset <名称>"
19243
19244#: builtin/submodule--helper.c:2166
4c27fcb5
JX
19245msgid "git submodule--helper config --check-writeable"
19246msgstr "git submodule--helper config --check-writeable"
19247
d46c5519 19248#: builtin/submodule--helper.c:2185 git-submodule.sh:171
4c27fcb5
JX
19249#, sh-format
19250msgid "please make sure that the .gitmodules file is in the working tree"
19251msgstr "请确认 .gitmodules 文件在工作区里"
19252
d46c5519 19253#: builtin/submodule--helper.c:2235 git.c:433 git.c:685
1a79b2f1
JX
19254#, c-format
19255msgid "%s doesn't support --super-prefix"
19256msgstr "%s 不支持 --super-prefix"
19257
d46c5519 19258#: builtin/submodule--helper.c:2241
94550ed3 19259#, c-format
5b04ee3b
JX
19260msgid "'%s' is not a valid submodule--helper subcommand"
19261msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
94550ed3 19262
a4f16749 19263#: builtin/symbolic-ref.c:8
814ff314
JX
19264msgid "git symbolic-ref [<options>] <name> [<ref>]"
19265msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
07432cef 19266
a4f16749 19267#: builtin/symbolic-ref.c:9
814ff314
JX
19268msgid "git symbolic-ref -d [-q] <name>"
19269msgstr "git symbolic-ref -d [-q] <名称>"
ef317cd5 19270
6937cb4e 19271#: builtin/symbolic-ref.c:40
ef317cd5 19272msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
19273msgstr "不显示非符号(分离的)引用的错误信息"
19274
6937cb4e 19275#: builtin/symbolic-ref.c:41
07432cef
WS
19276msgid "delete symbolic ref"
19277msgstr "删除符号引用"
ef317cd5 19278
6937cb4e 19279#: builtin/symbolic-ref.c:42
ef317cd5 19280msgid "shorten ref output"
6937cb4e 19281msgstr "缩短引用输出"
ef317cd5 19282
c1ac5258 19283#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
ef317cd5 19284msgid "reason"
07432cef 19285msgstr "原因"
ef317cd5 19286
c1ac5258 19287#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
ef317cd5 19288msgid "reason of the update"
07432cef 19289msgstr "更新的原因"
ef317cd5 19290
c1ac5258 19291#: builtin/tag.c:25
ef317cd5 19292msgid ""
d46c5519
JX
19293"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
19294"\t\t<tagname> [<head>]"
814ff314 19295msgstr ""
d46c5519
JX
19296"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n"
19297"\t\t<标签名> [<头>]"
ef317cd5 19298
d46c5519 19299#: builtin/tag.c:27
ef317cd5 19300msgid "git tag -d <tagname>..."
07432cef 19301msgstr "git tag -d <标签名>..."
ef317cd5 19302
d46c5519 19303#: builtin/tag.c:28
ef317cd5 19304msgid ""
87cb7997
JX
19305"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
19306"points-at <object>]\n"
94550ed3 19307"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
ef317cd5 19308msgstr ""
87cb7997
JX
19309"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
19310"at <对象>]\n"
94550ed3 19311"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
ef317cd5 19312
d46c5519 19313#: builtin/tag.c:30
1a79b2f1
JX
19314msgid "git tag -v [--format=<format>] <tagname>..."
19315msgstr "git tag -v [--format=<格式>] <标签名>..."
ef317cd5 19316
d46c5519 19317#: builtin/tag.c:88
c04f5ac3
JX
19318#, c-format
19319msgid "tag '%s' not found."
55a16ee4 19320msgstr "未发现标签 '%s'。"
c04f5ac3 19321
d46c5519 19322#: builtin/tag.c:104
c04f5ac3
JX
19323#, c-format
19324msgid "Deleted tag '%s' (was %s)\n"
55a16ee4 19325msgstr "已删除标签 '%s'(曾为 %s)\n"
c04f5ac3 19326
d46c5519 19327#: builtin/tag.c:134
a77c07d9 19328#, c-format
c04f5ac3
JX
19329msgid ""
19330"\n"
6acbf033
JX
19331"Write a message for tag:\n"
19332" %s\n"
a77c07d9 19333"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
19334msgstr ""
19335"\n"
55a16ee4 19336"输入一个标签说明:\n"
6acbf033 19337" %s\n"
a77c07d9 19338"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 19339
d46c5519 19340#: builtin/tag.c:138
a77c07d9 19341#, c-format
c04f5ac3
JX
19342msgid ""
19343"\n"
6acbf033
JX
19344"Write a message for tag:\n"
19345" %s\n"
a77c07d9 19346"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 19347"want to.\n"
c04f5ac3
JX
19348msgstr ""
19349"\n"
55a16ee4 19350"输入一个标签说明:\n"
6acbf033 19351" %s\n"
a77c07d9 19352"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 19353
d46c5519 19354#: builtin/tag.c:192
c04f5ac3 19355msgid "unable to sign the tag"
55a16ee4 19356msgstr "无法签署标签"
c04f5ac3 19357
d46c5519 19358#: builtin/tag.c:194
c04f5ac3 19359msgid "unable to write tag file"
55a16ee4 19360msgstr "无法写标签文件"
c04f5ac3 19361
d46c5519
JX
19362#: builtin/tag.c:210
19363#, c-format
19364msgid ""
19365"You have created a nested tag. The object referred to by your new tag is\n"
19366"already a tag. If you meant to tag the object that it points to, use:\n"
19367"\n"
19368"\tgit tag -f %s %s^{}"
19369msgstr ""
19370"您创建了一个嵌套的标签。您的新标签指向的对象已经是一个标签。如果您想要\n"
19371"对其指向的目标创建标签,使用:\n"
19372"\n"
19373"\tgit tag -f %s %s^{}"
19374
19375#: builtin/tag.c:226
c04f5ac3 19376msgid "bad object type."
90e6ef53 19377msgstr "坏的对象类型。"
c04f5ac3 19378
d46c5519 19379#: builtin/tag.c:278
c04f5ac3 19380msgid "no tag message?"
55a16ee4 19381msgstr "无标签说明?"
c04f5ac3 19382
d46c5519 19383#: builtin/tag.c:285
c04f5ac3
JX
19384#, c-format
19385msgid "The tag message has been left in %s\n"
55a16ee4 19386msgstr "标签说明被保留在 %s\n"
c04f5ac3 19387
d46c5519 19388#: builtin/tag.c:396
ef317cd5 19389msgid "list tag names"
55a16ee4 19390msgstr "列出标签名称"
ef317cd5 19391
d46c5519 19392#: builtin/tag.c:398
ef317cd5 19393msgid "print <n> lines of each tag message"
55a16ee4 19394msgstr "每个标签信息打印 <n> 行"
ef317cd5 19395
d46c5519 19396#: builtin/tag.c:400
ef317cd5 19397msgid "delete tags"
55a16ee4 19398msgstr "删除标签"
ef317cd5 19399
d46c5519 19400#: builtin/tag.c:401
ef317cd5 19401msgid "verify tags"
55a16ee4 19402msgstr "验证标签"
ef317cd5 19403
d46c5519 19404#: builtin/tag.c:403
ef317cd5 19405msgid "Tag creation options"
55a16ee4 19406msgstr "标签创建选项"
ef317cd5 19407
d46c5519 19408#: builtin/tag.c:405
ef317cd5 19409msgid "annotated tag, needs a message"
55a16ee4 19410msgstr "附注标签,需要一个说明"
ef317cd5 19411
d46c5519 19412#: builtin/tag.c:407
ef317cd5 19413msgid "tag message"
55a16ee4 19414msgstr "标签说明"
ef317cd5 19415
d46c5519 19416#: builtin/tag.c:409
31e5e17b
JX
19417msgid "force edit of tag message"
19418msgstr "强制编辑标签说明"
19419
d46c5519 19420#: builtin/tag.c:410
ef317cd5 19421msgid "annotated and GPG-signed tag"
55a16ee4 19422msgstr "附注并附加 GPG 签名的标签"
ef317cd5 19423
d46c5519 19424#: builtin/tag.c:413
ef317cd5 19425msgid "use another key to sign the tag"
55a16ee4 19426msgstr "使用另外的私钥签名该标签"
ef317cd5 19427
d46c5519 19428#: builtin/tag.c:414
ef317cd5 19429msgid "replace the tag if exists"
55a16ee4 19430msgstr "如果存在,替换现有的标签"
ef317cd5 19431
d46c5519 19432#: builtin/tag.c:415 builtin/update-ref.c:369
03ea3327 19433msgid "create a reflog"
1b7f4a34
JX
19434msgstr "创建引用日志"
19435
d46c5519 19436#: builtin/tag.c:417
814ff314 19437msgid "Tag listing options"
55a16ee4 19438msgstr "标签列表选项"
814ff314 19439
d46c5519 19440#: builtin/tag.c:418
ef317cd5 19441msgid "show tag list in columns"
55a16ee4 19442msgstr "以列的方式显示标签列表"
ef317cd5 19443
d46c5519 19444#: builtin/tag.c:419 builtin/tag.c:421
ef317cd5 19445msgid "print only tags that contain the commit"
87cb7997 19446msgstr "只打印包含该提交的标签"
ef317cd5 19447
d46c5519 19448#: builtin/tag.c:420 builtin/tag.c:422
87cb7997
JX
19449msgid "print only tags that don't contain the commit"
19450msgstr "只打印不包含该提交的标签"
19451
d46c5519 19452#: builtin/tag.c:423
94550ed3
JX
19453msgid "print only tags that are merged"
19454msgstr "只打印已经合并的标签"
19455
d46c5519 19456#: builtin/tag.c:424
94550ed3
JX
19457msgid "print only tags that are not merged"
19458msgstr "只打印尚未合并的标签"
19459
d46c5519 19460#: builtin/tag.c:428
ef317cd5 19461msgid "print only tags of the object"
87cb7997 19462msgstr "只打印指向该对象的标签"
ef317cd5 19463
d46c5519 19464#: builtin/tag.c:472
8ada9598 19465msgid "--column and -n are incompatible"
81809b99 19466msgstr "--column 和 -n 不兼容"
8ada9598 19467
d46c5519 19468#: builtin/tag.c:494
87cb7997
JX
19469msgid "-n option is only allowed in list mode"
19470msgstr "-n 选项只允许用在列表显示模式"
c04f5ac3 19471
d46c5519 19472#: builtin/tag.c:496
87cb7997
JX
19473msgid "--contains option is only allowed in list mode"
19474msgstr "--contains 选项只允许用在列表显示模式"
c04f5ac3 19475
d46c5519 19476#: builtin/tag.c:498
87cb7997
JX
19477msgid "--no-contains option is only allowed in list mode"
19478msgstr "--no-contains 选项只允许用在列表显示模式"
7ac1c0ad 19479
d46c5519 19480#: builtin/tag.c:500
87cb7997
JX
19481msgid "--points-at option is only allowed in list mode"
19482msgstr "--points-at 选项只允许用在列表显示模式"
94550ed3 19483
d46c5519 19484#: builtin/tag.c:502
87cb7997
JX
19485msgid "--merged and --no-merged options are only allowed in list mode"
19486msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
19487
d46c5519 19488#: builtin/tag.c:513
c04f5ac3
JX
19489msgid "only one -F or -m option is allowed."
19490msgstr "只允许一个 -F 或 -m 选项。"
19491
d46c5519 19492#: builtin/tag.c:532
c04f5ac3
JX
19493msgid "too many params"
19494msgstr "太多参数"
19495
d46c5519 19496#: builtin/tag.c:538
c04f5ac3
JX
19497#, c-format
19498msgid "'%s' is not a valid tag name."
55a16ee4 19499msgstr "'%s' 不是一个有效的标签名称。"
c04f5ac3 19500
d46c5519 19501#: builtin/tag.c:543
c04f5ac3
JX
19502#, c-format
19503msgid "tag '%s' already exists"
55a16ee4 19504msgstr "标签 '%s' 已存在"
c04f5ac3 19505
d46c5519 19506#: builtin/tag.c:574
c04f5ac3
JX
19507#, c-format
19508msgid "Updated tag '%s' (was %s)\n"
55a16ee4 19509msgstr "已更新标签 '%s'(曾为 %s)\n"
c04f5ac3 19510
c1ac5258 19511#: builtin/unpack-objects.c:500
6c94aba5
JX
19512msgid "Unpacking objects"
19513msgstr "展开对象中"
19514
06991777 19515#: builtin/update-index.c:83
7aea43ff
JX
19516#, c-format
19517msgid "failed to create directory %s"
c1ac5258 19518msgstr "创建目录 %s 失败"
7aea43ff 19519
06991777 19520#: builtin/update-index.c:99
7aea43ff
JX
19521#, c-format
19522msgid "failed to create file %s"
c1ac5258 19523msgstr "创建文件 %s 失败"
7aea43ff 19524
06991777 19525#: builtin/update-index.c:107
7aea43ff
JX
19526#, c-format
19527msgid "failed to delete file %s"
c1ac5258 19528msgstr "删除文件 %s 失败"
7aea43ff 19529
06991777 19530#: builtin/update-index.c:114 builtin/update-index.c:220
7aea43ff
JX
19531#, c-format
19532msgid "failed to delete directory %s"
c1ac5258 19533msgstr "删除目录 %s 失败"
7aea43ff 19534
06991777 19535#: builtin/update-index.c:139
7aea43ff 19536#, c-format
276ceeaa
JX
19537msgid "Testing mtime in '%s' "
19538msgstr "在 '%s' 中测试 mtime "
7aea43ff 19539
06991777 19540#: builtin/update-index.c:153
7aea43ff
JX
19541msgid "directory stat info does not change after adding a new file"
19542msgstr "添加一个新文件后,目录的状态信息未改变"
19543
06991777 19544#: builtin/update-index.c:166
7aea43ff
JX
19545msgid "directory stat info does not change after adding a new directory"
19546msgstr "添加一个新目录后,目录的状态信息未改变"
19547
06991777 19548#: builtin/update-index.c:179
7aea43ff
JX
19549msgid "directory stat info changes after updating a file"
19550msgstr "更新一个文件后,目录的状态信息被修改"
19551
06991777 19552#: builtin/update-index.c:190
7aea43ff
JX
19553msgid "directory stat info changes after adding a file inside subdirectory"
19554msgstr "在子目录中添加文件后,目录的状态信息被修改"
19555
06991777 19556#: builtin/update-index.c:201
7aea43ff
JX
19557msgid "directory stat info does not change after deleting a file"
19558msgstr "删除一个文件后,目录的状态信息未改变"
19559
06991777 19560#: builtin/update-index.c:214
7aea43ff
JX
19561msgid "directory stat info does not change after deleting a directory"
19562msgstr "删除一个目录后,目录的状态信息未改变"
19563
06991777 19564#: builtin/update-index.c:221
7aea43ff
JX
19565msgid " OK"
19566msgstr " OK"
19567
06991777 19568#: builtin/update-index.c:589
814ff314
JX
19569msgid "git update-index [<options>] [--] [<file>...]"
19570msgstr "git update-index [<选项>] [--] [<文件>...]"
8ada9598 19571
d46c5519 19572#: builtin/update-index.c:971
ef317cd5 19573msgid "continue refresh even when index needs update"
07432cef 19574msgstr "当索引需要更新时继续刷新"
8ada9598 19575
d46c5519 19576#: builtin/update-index.c:974
ef317cd5 19577msgid "refresh: ignore submodules"
07432cef 19578msgstr "刷新:忽略子模组"
8ada9598 19579
d46c5519 19580#: builtin/update-index.c:977
ef317cd5 19581msgid "do not ignore new files"
07432cef 19582msgstr "不忽略新的文件"
8ada9598 19583
d46c5519 19584#: builtin/update-index.c:979
ef317cd5 19585msgid "let files replace directories and vice-versa"
07432cef 19586msgstr "让文件替换目录(反之亦然)"
ef317cd5 19587
d46c5519 19588#: builtin/update-index.c:981
ef317cd5 19589msgid "notice files missing from worktree"
07432cef 19590msgstr "通知文件从工作区丢失"
ef317cd5 19591
d46c5519 19592#: builtin/update-index.c:983
ef317cd5 19593msgid "refresh even if index contains unmerged entries"
07432cef 19594msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 19595
d46c5519 19596#: builtin/update-index.c:986
ef317cd5 19597msgid "refresh stat information"
07432cef 19598msgstr "刷新统计信息"
ef317cd5 19599
d46c5519 19600#: builtin/update-index.c:990
ef317cd5 19601msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 19602msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 19603
d46c5519 19604#: builtin/update-index.c:994
6c94aba5 19605msgid "<mode>,<object>,<path>"
d9d56b23 19606msgstr "<存取模式>,<对象>,<路径>"
ef317cd5 19607
d46c5519 19608#: builtin/update-index.c:995
ef317cd5 19609msgid "add the specified entry to the index"
07432cef 19610msgstr "添加指定的条目到索引区"
ef317cd5 19611
d46c5519 19612#: builtin/update-index.c:1005
ef317cd5 19613msgid "mark files as \"not changing\""
07432cef 19614msgstr "把文件标记为 \"没有变更\""
ef317cd5 19615
d46c5519 19616#: builtin/update-index.c:1008
ef317cd5 19617msgid "clear assumed-unchanged bit"
07432cef 19618msgstr "清除 assumed-unchanged 位"
ef317cd5 19619
d46c5519 19620#: builtin/update-index.c:1011
ef317cd5 19621msgid "mark files as \"index-only\""
07432cef 19622msgstr "把文件标记为 \"仅索引\""
ef317cd5 19623
d46c5519 19624#: builtin/update-index.c:1014
ef317cd5 19625msgid "clear skip-worktree bit"
07432cef 19626msgstr "清除 skip-worktree 位"
ef317cd5 19627
d46c5519 19628#: builtin/update-index.c:1017
ef317cd5 19629msgid "add to index only; do not add content to object database"
07432cef 19630msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 19631
d46c5519 19632#: builtin/update-index.c:1019
ef317cd5 19633msgid "remove named paths even if present in worktree"
07432cef 19634msgstr "即使存在工作区里,也删除路径"
ef317cd5 19635
d46c5519 19636#: builtin/update-index.c:1021
ef317cd5 19637msgid "with --stdin: input lines are terminated by null bytes"
07432cef 19638msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 19639
d46c5519 19640#: builtin/update-index.c:1023
ef317cd5 19641msgid "read list of paths to be updated from standard input"
07432cef 19642msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 19643
d46c5519 19644#: builtin/update-index.c:1027
ef317cd5 19645msgid "add entries from standard input to the index"
07432cef 19646msgstr "从标准输入添加条目到索引区"
ef317cd5 19647
d46c5519 19648#: builtin/update-index.c:1031
ef317cd5 19649msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 19650msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 19651
d46c5519 19652#: builtin/update-index.c:1035
ef317cd5 19653msgid "only update entries that differ from HEAD"
07432cef 19654msgstr "只更新与 HEAD 不同的条目"
ef317cd5 19655
d46c5519 19656#: builtin/update-index.c:1039
ef317cd5 19657msgid "ignore files missing from worktree"
07432cef 19658msgstr "忽略工作区丢失的文件"
ef317cd5 19659
d46c5519 19660#: builtin/update-index.c:1042
ef317cd5 19661msgid "report actions to standard output"
07432cef 19662msgstr "在标准输出显示操作"
ef317cd5 19663
d46c5519 19664#: builtin/update-index.c:1044
ef317cd5 19665msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 19666msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 19667
d46c5519 19668#: builtin/update-index.c:1048
ef317cd5 19669msgid "write index in this format"
07432cef 19670msgstr "以这种格式写入索引区"
ef317cd5 19671
d46c5519 19672#: builtin/update-index.c:1050
6acbf033
JX
19673msgid "enable or disable split index"
19674msgstr "启用或禁用索引拆分"
19675
d46c5519 19676#: builtin/update-index.c:1052
7aea43ff
JX
19677msgid "enable/disable untracked cache"
19678msgstr "启用/禁用对未跟踪文件的缓存"
19679
d46c5519 19680#: builtin/update-index.c:1054
276ceeaa
JX
19681msgid "test if the filesystem supports untracked cache"
19682msgstr "测试文件系统是否支持未跟踪文件缓存"
19683
d46c5519 19684#: builtin/update-index.c:1056
7aea43ff
JX
19685msgid "enable untracked cache without testing the filesystem"
19686msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
19687
d46c5519 19688#: builtin/update-index.c:1058
5809aa05
JX
19689msgid "write out the index even if is not flagged as changed"
19690msgstr "即使没有被标记为已更改,也要写出索引"
19691
d46c5519 19692#: builtin/update-index.c:1060
5809aa05
JX
19693msgid "enable or disable file system monitor"
19694msgstr "启用或禁用文件系统监控"
19695
d46c5519 19696#: builtin/update-index.c:1062
5809aa05
JX
19697msgid "mark files as fsmonitor valid"
19698msgstr "标记文件为 fsmonitor 有效"
19699
d46c5519 19700#: builtin/update-index.c:1065
5809aa05
JX
19701msgid "clear fsmonitor valid bit"
19702msgstr "清除 fsmonitor 有效位"
19703
d46c5519 19704#: builtin/update-index.c:1168
87cb7997
JX
19705msgid ""
19706"core.splitIndex is set to false; remove or change it, if you really want to "
19707"enable split index"
19708msgstr ""
19709"core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。"
19710
d46c5519 19711#: builtin/update-index.c:1177
87cb7997
JX
19712msgid ""
19713"core.splitIndex is set to true; remove or change it, if you really want to "
19714"disable split index"
19715msgstr ""
19716"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。"
19717
d46c5519 19718#: builtin/update-index.c:1188
a0b6b246
JX
19719msgid ""
19720"core.untrackedCache is set to true; remove or change it, if you really want "
19721"to disable the untracked cache"
275588f9
JX
19722msgstr ""
19723"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
19724"改它。"
a0b6b246 19725
d46c5519 19726#: builtin/update-index.c:1192
276ceeaa
JX
19727msgid "Untracked cache disabled"
19728msgstr "缓存未跟踪文件被禁用"
19729
d46c5519 19730#: builtin/update-index.c:1200
a0b6b246
JX
19731msgid ""
19732"core.untrackedCache is set to false; remove or change it, if you really want "
19733"to enable the untracked cache"
275588f9
JX
19734msgstr ""
19735"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
19736"修改它。"
a0b6b246 19737
d46c5519 19738#: builtin/update-index.c:1204
276ceeaa
JX
19739#, c-format
19740msgid "Untracked cache enabled for '%s'"
19741msgstr "缓存未跟踪文件在 '%s' 启用"
19742
d46c5519 19743#: builtin/update-index.c:1212
5809aa05 19744msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
31e5e17b 19745msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项"
5809aa05 19746
d46c5519 19747#: builtin/update-index.c:1216
5809aa05
JX
19748msgid "fsmonitor enabled"
19749msgstr "fsmonitor 被启用"
19750
d46c5519 19751#: builtin/update-index.c:1219
5809aa05
JX
19752msgid ""
19753"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
31e5e17b 19754msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项"
5809aa05 19755
d46c5519 19756#: builtin/update-index.c:1223
5809aa05
JX
19757msgid "fsmonitor disabled"
19758msgstr "fsmonitor 被禁用"
19759
a4f16749 19760#: builtin/update-ref.c:10
814ff314
JX
19761msgid "git update-ref [<options>] -d <refname> [<old-val>]"
19762msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
ef317cd5 19763
a4f16749 19764#: builtin/update-ref.c:11
814ff314
JX
19765msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
19766msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
90314792 19767
a4f16749 19768#: builtin/update-ref.c:12
814ff314
JX
19769msgid "git update-ref [<options>] --stdin [-z]"
19770msgstr "git update-ref [<选项>] --stdin [-z]"
ef317cd5 19771
c1ac5258 19772#: builtin/update-ref.c:364
ef317cd5 19773msgid "delete the reference"
07432cef 19774msgstr "删除引用"
ef317cd5 19775
c1ac5258 19776#: builtin/update-ref.c:366
ef317cd5 19777msgid "update <refname> not the one it points to"
07432cef 19778msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 19779
c1ac5258 19780#: builtin/update-ref.c:367
90314792
JX
19781msgid "stdin has NUL-terminated arguments"
19782msgstr "标准输入有以 NUL 字符终止的参数"
19783
c1ac5258 19784#: builtin/update-ref.c:368
90314792
JX
19785msgid "read updates from stdin"
19786msgstr "从标准输入读取更新"
19787
a4f16749 19788#: builtin/update-server-info.c:7
ef317cd5 19789msgid "git update-server-info [--force]"
07432cef 19790msgstr "git update-server-info [--force]"
ef317cd5 19791
a4f16749 19792#: builtin/update-server-info.c:15
ef317cd5 19793msgid "update the info files from scratch"
07432cef 19794msgstr "从头开始更新文件信息"
ef317cd5 19795
fd8cb379
JX
19796#: builtin/upload-pack.c:11
19797msgid "git upload-pack [<options>] <dir>"
19798msgstr "git upload-pack [<选项>] <目录>"
19799
d46c5519
JX
19800#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
19801msgid "quit after a single request/response exchange"
19802msgstr "在一次单独的请求/响应之后退出"
19803
fd8cb379
JX
19804#: builtin/upload-pack.c:25
19805msgid "exit immediately after initial ref advertisement"
19806msgstr "在初始的引用广告后立即退出"
19807
19808#: builtin/upload-pack.c:27
19809msgid "do not try <directory>/.git/ if <directory> is no Git directory"
19810msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/"
19811
19812#: builtin/upload-pack.c:29
19813msgid "interrupt transfer after <n> seconds of inactivity"
19814msgstr "不活动 <n> 秒钟后终止传输"
19815
c1ac5258 19816#: builtin/verify-commit.c:20
814ff314
JX
19817msgid "git verify-commit [-v | --verbose] <commit>..."
19818msgstr "git verify-commit [-v | --verbose] <提交>..."
6acbf033 19819
c1ac5258 19820#: builtin/verify-commit.c:76
6acbf033
JX
19821msgid "print commit contents"
19822msgstr "打印提交内容"
19823
c1ac5258 19824#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
1b7f4a34
JX
19825msgid "print raw gpg status output"
19826msgstr "打印原始 gpg 状态输出"
19827
a4f16749 19828#: builtin/verify-pack.c:55
814ff314
JX
19829msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
19830msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
ef317cd5 19831
a4f16749 19832#: builtin/verify-pack.c:65
ef317cd5
JX
19833msgid "verbose"
19834msgstr "冗长输出"
19835
a4f16749 19836#: builtin/verify-pack.c:67
ef317cd5 19837msgid "show statistics only"
07432cef 19838msgstr "只显示统计"
ef317cd5 19839
a4f16749 19840#: builtin/verify-tag.c:19
1a79b2f1
JX
19841msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
19842msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
ef317cd5 19843
a4f16749 19844#: builtin/verify-tag.c:37
ef317cd5 19845msgid "print tag contents"
55a16ee4 19846msgstr "打印标签内容"
ef317cd5 19847
06991777 19848#: builtin/worktree.c:18
31e5e17b
JX
19849msgid "git worktree add [<options>] <path> [<commit-ish>]"
19850msgstr "git worktree add [<选项>] <路径> [<提交>]"
5bb01d4f 19851
06991777 19852#: builtin/worktree.c:19
5c57d762
JX
19853msgid "git worktree list [<options>]"
19854msgstr "git worktree list [<选项>]"
19855
06991777 19856#: builtin/worktree.c:20
5c57d762
JX
19857msgid "git worktree lock [<options>] <path>"
19858msgstr "git worktree lock [<选项>] <路径>"
19859
06991777 19860#: builtin/worktree.c:21
31e5e17b
JX
19861msgid "git worktree move <worktree> <new-path>"
19862msgstr "git worktree move <工作区> <新路径>"
19863
06991777 19864#: builtin/worktree.c:22
5bb01d4f
JX
19865msgid "git worktree prune [<options>]"
19866msgstr "git worktree prune [<选项>]"
19867
06991777 19868#: builtin/worktree.c:23
31e5e17b
JX
19869msgid "git worktree remove [<options>] <worktree>"
19870msgstr "git worktree remove [<选项>] <工作区>"
19871
06991777 19872#: builtin/worktree.c:24
5c57d762
JX
19873msgid "git worktree unlock <path>"
19874msgstr "git worktree unlock <路径>"
94550ed3 19875
d46c5519 19876#: builtin/worktree.c:61 builtin/worktree.c:891
4c27fcb5
JX
19877#, c-format
19878msgid "failed to delete '%s'"
19879msgstr "删除 '%s' 失败"
19880
06991777 19881#: builtin/worktree.c:80
5bb01d4f
JX
19882#, c-format
19883msgid "Removing worktrees/%s: not a valid directory"
19884msgstr "删除工作区/%s:不是一个有效的目录"
19885
06991777 19886#: builtin/worktree.c:86
5bb01d4f
JX
19887#, c-format
19888msgid "Removing worktrees/%s: gitdir file does not exist"
19889msgstr "删除 worktrees/%s:gitdir 文件不存在"
19890
06991777 19891#: builtin/worktree.c:91 builtin/worktree.c:100
5bb01d4f
JX
19892#, c-format
19893msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
19894msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
19895
06991777 19896#: builtin/worktree.c:110
6937cb4e
JX
19897#, c-format
19898msgid ""
19899"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
19900"%<PRIuMAX>)"
19901msgstr "删除工作树/%s:读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)"
19902
06991777 19903#: builtin/worktree.c:118
5bb01d4f
JX
19904#, c-format
19905msgid "Removing worktrees/%s: invalid gitdir file"
19906msgstr "删除 worktrees/%s:无效的 gitdir 文件"
19907
06991777 19908#: builtin/worktree.c:127
5bb01d4f
JX
19909#, c-format
19910msgid "Removing worktrees/%s: gitdir file points to non-existent location"
19911msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
19912
06991777 19913#: builtin/worktree.c:166
1a79b2f1
JX
19914msgid "report pruned working trees"
19915msgstr "报告清除的工作区"
19916
06991777 19917#: builtin/worktree.c:168
1a79b2f1 19918msgid "expire working trees older than <time>"
58b6f078 19919msgstr "将早于 <时间> 的工作区过期"
1a79b2f1 19920
06991777 19921#: builtin/worktree.c:235
5bb01d4f
JX
19922#, c-format
19923msgid "'%s' already exists"
19924msgstr "'%s' 已经存在"
19925
06991777 19926#: builtin/worktree.c:252
4c27fcb5
JX
19927#, c-format
19928msgid "unable to re-add worktree '%s'"
19929msgstr "无法再次添加工作区 '%s'"
19930
06991777 19931#: builtin/worktree.c:257
4c27fcb5
JX
19932#, c-format
19933msgid ""
19934"'%s' is a missing but locked worktree;\n"
19935"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
19936msgstr ""
19937"'%s' 是一个丢失但锁定的工作区,使用\n"
19938"'add -f -f' 覆盖,或 'unlock' 和 'prune' 或 'remove' 清除"
19939
06991777 19940#: builtin/worktree.c:259
4c27fcb5
JX
19941#, c-format
19942msgid ""
19943"'%s' is a missing but already registered worktree;\n"
19944"use 'add -f' to override, or 'prune' or 'remove' to clear"
19945msgstr ""
19946"'%s' 是一个丢失但已经注册的工作区,使用\n"
19947"'add -f' 覆盖,或 'prune' 或 'remove' 清除"
19948
d46c5519 19949#: builtin/worktree.c:302
5bb01d4f
JX
19950#, c-format
19951msgid "could not create directory of '%s'"
19952msgstr "不能创建目录 '%s'"
19953
d46c5519 19954#: builtin/worktree.c:432 builtin/worktree.c:438
fd8cb379
JX
19955#, c-format
19956msgid "Preparing worktree (new branch '%s')"
19957msgstr "准备工作区(新分支 '%s')"
19958
d46c5519 19959#: builtin/worktree.c:434
fd8cb379
JX
19960#, c-format
19961msgid "Preparing worktree (resetting branch '%s'; was at %s)"
19962msgstr "准备工作区(重置分支 '%s',之前为 %s)"
19963
d46c5519 19964#: builtin/worktree.c:443
fd8cb379
JX
19965#, c-format
19966msgid "Preparing worktree (checking out '%s')"
19967msgstr "准备工作区(检出 '%s')"
19968
d46c5519 19969#: builtin/worktree.c:449
5bb01d4f 19970#, c-format
fd8cb379
JX
19971msgid "Preparing worktree (detached HEAD %s)"
19972msgstr "准备工作区(分离头指针 %s)"
5bb01d4f 19973
d46c5519 19974#: builtin/worktree.c:490
5bb01d4f 19975msgid "checkout <branch> even if already checked out in other worktree"
58b6f078 19976msgstr "检出 <分支>,即使已经被检出到其它工作区"
5bb01d4f 19977
d46c5519 19978#: builtin/worktree.c:493
5bb01d4f
JX
19979msgid "create a new branch"
19980msgstr "创建一个新分支"
19981
d46c5519 19982#: builtin/worktree.c:495
5bb01d4f
JX
19983msgid "create or reset a branch"
19984msgstr "创建或重置一个分支"
19985
d46c5519 19986#: builtin/worktree.c:497
5b04ee3b
JX
19987msgid "populate the new working tree"
19988msgstr "生成新的工作区"
19989
d46c5519 19990#: builtin/worktree.c:498
60638e98
JX
19991msgid "keep the new working tree locked"
19992msgstr "锁定新工作区"
19993
d46c5519 19994#: builtin/worktree.c:501
5809aa05
JX
19995msgid "set up tracking mode (see git-branch(1))"
19996msgstr "设置跟踪模式(参见 git-branch(1))"
19997
d46c5519 19998#: builtin/worktree.c:504
5809aa05
JX
19999msgid "try to match the new branch name with a remote-tracking branch"
20000msgstr "尝试为新分支名匹配一个远程跟踪分支"
20001
d46c5519 20002#: builtin/worktree.c:512
1b7f4a34
JX
20003msgid "-b, -B, and --detach are mutually exclusive"
20004msgstr "-b、-B 和 --detach 是互斥的"
5bb01d4f 20005
d46c5519 20006#: builtin/worktree.c:573
5809aa05
JX
20007msgid "--[no-]track can only be used if a new branch is created"
20008msgstr "只能在创建新分支时使用选项 --[no-]track "
20009
d46c5519 20010#: builtin/worktree.c:673
5c57d762
JX
20011msgid "reason for locking"
20012msgstr "锁定原因"
20013
d46c5519
JX
20014#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
20015#: builtin/worktree.c:919
5c57d762
JX
20016#, c-format
20017msgid "'%s' is not a working tree"
20018msgstr "'%s' 不是一个工作区"
20019
d46c5519 20020#: builtin/worktree.c:687 builtin/worktree.c:720
5c57d762
JX
20021msgid "The main working tree cannot be locked or unlocked"
20022msgstr "主工作区无法被加锁或解锁"
20023
d46c5519 20024#: builtin/worktree.c:692
5c57d762
JX
20025#, c-format
20026msgid "'%s' is already locked, reason: %s"
20027msgstr "'%s' 已被锁定,原因:%s"
20028
d46c5519 20029#: builtin/worktree.c:694
5c57d762
JX
20030#, c-format
20031msgid "'%s' is already locked"
20032msgstr "'%s' 已被锁定"
20033
d46c5519 20034#: builtin/worktree.c:722
5c57d762
JX
20035#, c-format
20036msgid "'%s' is not locked"
20037msgstr "'%s' 未被锁定"
20038
d46c5519 20039#: builtin/worktree.c:763
31e5e17b 20040msgid "working trees containing submodules cannot be moved or removed"
610f8099 20041msgstr "不能移动或删除包含子模组的工作区"
31e5e17b 20042
d46c5519 20043#: builtin/worktree.c:771
4c27fcb5
JX
20044msgid "force move even if worktree is dirty or locked"
20045msgstr "强制移动,即使工作区是脏的或已锁定"
20046
d46c5519 20047#: builtin/worktree.c:794 builtin/worktree.c:921
31e5e17b
JX
20048#, c-format
20049msgid "'%s' is a main working tree"
20050msgstr "'%s' 是一个主工作区"
20051
d46c5519 20052#: builtin/worktree.c:799
31e5e17b
JX
20053#, c-format
20054msgid "could not figure out destination name from '%s'"
20055msgstr "无法从 '%s' 算出目标名称"
20056
d46c5519 20057#: builtin/worktree.c:805
31e5e17b
JX
20058#, c-format
20059msgid "target '%s' already exists"
20060msgstr "目标 '%s' 已存在"
20061
d46c5519 20062#: builtin/worktree.c:813
31e5e17b 20063#, c-format
4c27fcb5
JX
20064msgid ""
20065"cannot move a locked working tree, lock reason: %s\n"
20066"use 'move -f -f' to override or unlock first"
20067msgstr ""
20068"无法移动一个锁定的工作区,锁定原因:%s\n"
20069"使用 'move -f -f' 覆盖或先解锁"
31e5e17b 20070
d46c5519 20071#: builtin/worktree.c:815
4c27fcb5
JX
20072msgid ""
20073"cannot move a locked working tree;\n"
20074"use 'move -f -f' to override or unlock first"
20075msgstr ""
20076"无法移动一个锁定的工作区,\n"
20077"使用 'move -f -f' 覆盖或先解锁"
31e5e17b 20078
d46c5519 20079#: builtin/worktree.c:818
31e5e17b
JX
20080#, c-format
20081msgid "validation failed, cannot move working tree: %s"
20082msgstr "验证失败,无法移动工作区:%s"
20083
d46c5519 20084#: builtin/worktree.c:823
31e5e17b
JX
20085#, c-format
20086msgid "failed to move '%s' to '%s'"
c1ac5258 20087msgstr "移动 '%s' 到 '%s' 失败"
31e5e17b 20088
d46c5519 20089#: builtin/worktree.c:871
31e5e17b
JX
20090#, c-format
20091msgid "failed to run 'git status' on '%s'"
c1ac5258 20092msgstr "在 '%s' 中执行 'git status' 失败"
31e5e17b 20093
d46c5519 20094#: builtin/worktree.c:875
31e5e17b
JX
20095#, c-format
20096msgid "'%s' is dirty, use --force to delete it"
20097msgstr "'%s' 是脏的,使用 --force 删除"
20098
d46c5519 20099#: builtin/worktree.c:880
31e5e17b
JX
20100#, c-format
20101msgid "failed to run 'git status' on '%s', code %d"
c1ac5258 20102msgstr "在 '%s' 中执行 'git status' 失败,退出码 %d"
31e5e17b 20103
d46c5519 20104#: builtin/worktree.c:903
4c27fcb5
JX
20105msgid "force removal even if worktree is dirty or locked"
20106msgstr "强制删除,即使工作区是脏的或已锁定"
31e5e17b 20107
d46c5519 20108#: builtin/worktree.c:926
31e5e17b 20109#, c-format
4c27fcb5
JX
20110msgid ""
20111"cannot remove a locked working tree, lock reason: %s\n"
20112"use 'remove -f -f' to override or unlock first"
20113msgstr ""
20114"无法删除一个锁定的工作区,锁定原因:%s\n"
20115"使用 'remove -f -f' 覆盖或先解锁"
31e5e17b 20116
d46c5519 20117#: builtin/worktree.c:928
4c27fcb5
JX
20118msgid ""
20119"cannot remove a locked working tree;\n"
20120"use 'remove -f -f' to override or unlock first"
20121msgstr ""
20122"无法删除一个锁定的工作区,\n"
20123"使用 'remove -f -f' 覆盖或先解锁"
31e5e17b 20124
d46c5519 20125#: builtin/worktree.c:931
31e5e17b
JX
20126#, c-format
20127msgid "validation failed, cannot remove working tree: %s"
20128msgstr "验证失败,无法删除工作区:%s"
20129
06991777 20130#: builtin/write-tree.c:15
ef317cd5 20131msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 20132msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5 20133
06991777 20134#: builtin/write-tree.c:28
ef317cd5 20135msgid "<prefix>/"
07432cef 20136msgstr "<前缀>/"
ef317cd5 20137
06991777 20138#: builtin/write-tree.c:29
ef317cd5 20139msgid "write tree object for a subdirectory <prefix>"
07432cef 20140msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5 20141
06991777 20142#: builtin/write-tree.c:31
ef317cd5 20143msgid "only useful for debugging"
07432cef 20144msgstr "只对调试有用"
ef317cd5 20145
06991777 20146#: credential-cache--daemon.c:223
a0b6b246
JX
20147#, c-format
20148msgid ""
20149"The permissions on your socket directory are too loose; other\n"
20150"users may be able to read your cached credentials. Consider running:\n"
20151"\n"
20152"\tchmod 0700 %s"
20153msgstr ""
1a79b2f1
JX
20154"您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
20155"行:\n"
a0b6b246
JX
20156"\n"
20157"\tchmod 0700 %s"
20158
06991777 20159#: credential-cache--daemon.c:272
220c313c
JX
20160msgid "print debugging messages to stderr"
20161msgstr "调试信息输出到标准错误"
20162
4c27fcb5
JX
20163#: t/helper/test-reach.c:152
20164#, c-format
20165msgid "commit %s is not marked reachable"
20166msgstr "提交 %s 没有标记为可达"
20167
20168#: t/helper/test-reach.c:162
20169msgid "too many commits marked reachable"
20170msgstr "太多提交标记为可达"
20171
d46c5519
JX
20172#: t/helper/test-serve-v2.c:7
20173msgid "test-tool serve-v2 [<options>]"
20174msgstr "test-tool serve-v2 [<选项>]"
20175
20176#: t/helper/test-serve-v2.c:19
20177msgid "exit immediately after advertising capabilities"
20178msgstr "对能力广告之后立即退出"
20179
fd8cb379 20180#: git.c:27
31e5e17b
JX
20181msgid ""
20182"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
20183" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
fd8cb379
JX
20184" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
20185"bare]\n"
31e5e17b
JX
20186" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
20187" <command> [<args>]"
20188msgstr ""
fd8cb379 20189"git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n"
31e5e17b 20190" [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
fd8cb379
JX
20191" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
20192"bare]\n"
31e5e17b
JX
20193" [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
20194" <命令> [<参数>]"
20195
fd8cb379 20196#: git.c:34
4dcdc3d8 20197msgid ""
220c313c 20198"'git help -a' and 'git help -g' list available subcommands and some\n"
4dcdc3d8
JX
20199"concept guides. See 'git help <command>' or 'git help <concept>'\n"
20200"to read about a specific subcommand or concept."
20201msgstr ""
220c313c
JX
20202"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
20203"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
20204"帮助。"
8ada9598 20205
d46c5519 20206#: git.c:185
31e5e17b
JX
20207#, c-format
20208msgid "no directory given for --git-dir\n"
20209msgstr "没有为 --git-dir 提供目录\n"
20210
d46c5519 20211#: git.c:199
31e5e17b
JX
20212#, c-format
20213msgid "no namespace given for --namespace\n"
20214msgstr "没有为 --namespace 提供命名空间\n"
20215
d46c5519 20216#: git.c:213
31e5e17b
JX
20217#, c-format
20218msgid "no directory given for --work-tree\n"
20219msgstr "没有为 --work-tree 提供目录\n"
20220
d46c5519 20221#: git.c:227
31e5e17b
JX
20222#, c-format
20223msgid "no prefix given for --super-prefix\n"
20224msgstr "没有为 --super-prefix 提供前缀\n"
20225
d46c5519 20226#: git.c:249
31e5e17b
JX
20227#, c-format
20228msgid "-c expects a configuration string\n"
20229msgstr "应为 -c 提供一个配置字符串\n"
20230
d46c5519 20231#: git.c:287
31e5e17b
JX
20232#, c-format
20233msgid "no directory given for -C\n"
20234msgstr "没有为 -C 提供目录\n"
20235
d46c5519 20236#: git.c:313
31e5e17b
JX
20237#, c-format
20238msgid "unknown option: %s\n"
20239msgstr "未知选项:%s\n"
20240
d46c5519 20241#: git.c:359
06991777
JX
20242#, c-format
20243msgid "while expanding alias '%s': '%s'"
20244msgstr "在扩展别名'%s' 时:'%s'"
20245
d46c5519 20246#: git.c:368
06991777
JX
20247#, c-format
20248msgid ""
20249"alias '%s' changes environment variables.\n"
20250"You can use '!git' in the alias to do this"
20251msgstr ""
20252"别名 '%s' 修改环境变量。您可以使用在别名中\n"
20253"使用 '!git'"
20254
d46c5519 20255#: git.c:376
06991777
JX
20256#, c-format
20257msgid "empty alias for %s"
20258msgstr "%s 的空别名"
20259
d46c5519 20260#: git.c:379
06991777
JX
20261#, c-format
20262msgid "recursive alias: %s"
20263msgstr "别名递归:%s"
20264
d46c5519 20265#: git.c:459
06991777
JX
20266msgid "write failure on standard output"
20267msgstr "在标准输出写入失败"
20268
d46c5519 20269#: git.c:461
06991777
JX
20270msgid "unknown write failure on standard output"
20271msgstr "到标准输出的未知写入错误"
20272
d46c5519 20273#: git.c:463
06991777
JX
20274msgid "close failed on standard output"
20275msgstr "标准输出关闭失败"
20276
d46c5519 20277#: git.c:797
4c27fcb5
JX
20278#, c-format
20279msgid "alias loop detected: expansion of '%s' does not terminate:%s"
20280msgstr "检测到别名循环:'%s'的扩展未终止:%s"
20281
d46c5519 20282#: git.c:847
06991777
JX
20283#, c-format
20284msgid "cannot handle %s as a builtin"
20285msgstr "不能作为内置命令处理 %s"
20286
d46c5519 20287#: git.c:860
06991777
JX
20288#, c-format
20289msgid ""
20290"usage: %s\n"
20291"\n"
20292msgstr ""
20293"用法:%s\n"
20294"\n"
20295
d46c5519 20296#: git.c:880
31e5e17b
JX
20297#, c-format
20298msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
20299msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n"
20300
d46c5519 20301#: git.c:892
31e5e17b
JX
20302#, c-format
20303msgid "failed to run command '%s': %s\n"
c1ac5258 20304msgstr "运行命令 '%s' 失败:%s\n"
31e5e17b 20305
06991777 20306#: http.c:378
60638e98
JX
20307#, c-format
20308msgid "negative value for http.postbuffer; defaulting to %d"
20309msgstr "http.postbuffer 为负值,默认为 %d"
20310
06991777 20311#: http.c:399
a0b6b246 20312msgid "Delegation control is not supported with cURL < 7.22.0"
4c27fcb5 20313msgstr "不支持委托控制,因为 cURL < 7.22.0"
a0b6b246 20314
06991777 20315#: http.c:408
276ceeaa
JX
20316msgid "Public key pinning not supported with cURL < 7.44.0"
20317msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
20318
06991777 20319#: http.c:876
4c27fcb5
JX
20320msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
20321msgstr "不支持 CURLSSLOPT_NO_REVOKE,因为 cURL < 7.44.0"
20322
06991777 20323#: http.c:949
4c27fcb5
JX
20324msgid "Protocol restrictions not supported with cURL < 7.19.4"
20325msgstr "不支持协议限制,因为 cURL < 7.19.4"
20326
06991777 20327#: http.c:1085
4c27fcb5
JX
20328#, c-format
20329msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
20330msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端:"
20331
06991777 20332#: http.c:1092
4c27fcb5
JX
20333#, c-format
20334msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
20335msgstr "无法设置 SSL 后端为 '%s':cURL: cURL 没有使用 SSL 后端构建"
20336
06991777 20337#: http.c:1096
4c27fcb5
JX
20338#, c-format
20339msgid "Could not set SSL backend to '%s': already set"
20340msgstr "无法将 SSL 后端设置为 '%s':已经设置"
20341
d46c5519 20342#: http.c:1965
1a79b2f1
JX
20343#, c-format
20344msgid ""
20345"unable to update url base from redirection:\n"
20346" asked for: %s\n"
20347" redirect: %s"
20348msgstr ""
20349"不能更新重定向的 url base:\n"
20350" 请求:%s\n"
20351" 重定向:%s"
20352
d46c5519
JX
20353#: remote-curl.c:157
20354#, c-format
20355msgid "invalid quoting in push-option value: '%s'"
20356msgstr "在 push-option 取值中无效的引用:'%s'"
20357
20358#: remote-curl.c:254
20359#, c-format
20360msgid "%sinfo/refs not valid: is this a git repository?"
20361msgstr "%sinfo/refs 无效:这是一个 git 仓库么?"
20362
20363#: remote-curl.c:355
20364msgid "invalid server response; expected service, got flush packet"
20365msgstr "无效的服务端响应。预期服务,得到 flush 包"
20366
20367#: remote-curl.c:386
20368#, c-format
20369msgid "invalid server response; got '%s'"
20370msgstr "无效的服务端响应,得到 '%s'"
20371
20372#: remote-curl.c:446
20373#, c-format
20374msgid "repository '%s' not found"
20375msgstr "仓库 '%s' 未找到"
20376
20377#: remote-curl.c:450
20378#, c-format
20379msgid "Authentication failed for '%s'"
20380msgstr "'%s' 鉴权失败"
20381
20382#: remote-curl.c:454
20383#, c-format
20384msgid "unable to access '%s': %s"
20385msgstr "无法访问 '%s':%s"
20386
20387#: remote-curl.c:460
1a79b2f1
JX
20388#, c-format
20389msgid "redirecting to %s"
20390msgstr "重定向到 %s"
20391
d46c5519
JX
20392#: remote-curl.c:584
20393msgid "shouldn't have EOF when not gentle on EOF"
20394msgstr "当没有设置温和处理 EOF 时,不应该有 EOF"
20395
20396#: remote-curl.c:664
20397msgid "unable to rewind rpc post data - try increasing http.postBuffer"
20398msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
20399
20400#: remote-curl.c:724
20401#, c-format
20402msgid "RPC failed; %s"
20403msgstr "RPC 失败。%s"
20404
20405#: remote-curl.c:764
20406msgid "cannot handle pushes this big"
20407msgstr "不能处理这么大的推送"
20408
20409#: remote-curl.c:879
20410#, c-format
20411msgid "cannot deflate request; zlib deflate error %d"
20412msgstr "不能压缩请求,zlib 压缩错误 %d"
20413
20414#: remote-curl.c:883
20415#, c-format
20416msgid "cannot deflate request; zlib end error %d"
20417msgstr "不能压缩请求,zlib 结束错误 %d"
20418
20419#: remote-curl.c:1014
20420msgid "dumb http transport does not support shallow capabilities"
20421msgstr "哑 http 传输不支持 shalllow 能力"
20422
20423#: remote-curl.c:1028
20424msgid "fetch failed."
20425msgstr "获取失败。"
20426
20427#: remote-curl.c:1076
20428msgid "cannot fetch by sha1 over smart http"
20429msgstr "无法通过智能 HTTP 获取 sha1"
20430
20431#: remote-curl.c:1120 remote-curl.c:1126
20432#, c-format
20433msgid "protocol error: expected sha/ref, got '%s'"
20434msgstr "协议错误:期望 sha/ref,却得到 '%s'"
20435
20436#: remote-curl.c:1138 remote-curl.c:1252
20437#, c-format
20438msgid "http transport does not support %s"
20439msgstr "http 传输协议不支持 %s"
20440
20441#: remote-curl.c:1174
20442msgid "git-http-push failed"
20443msgstr "git-http-push 失败"
20444
20445#: remote-curl.c:1360
20446msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
20447msgstr "remote-curl:用法:git remote-curl <远程> [<url>]"
20448
20449#: remote-curl.c:1392
20450msgid "remote-curl: error reading command stream from git"
20451msgstr "remote-curl:错误读取来自 git 的命令流"
20452
20453#: remote-curl.c:1399
20454msgid "remote-curl: fetch attempted without a local repo"
20455msgstr "remote-curl:尝试没有本地仓库下获取"
20456
20457#: remote-curl.c:1439
20458#, c-format
20459msgid "remote-curl: unknown command '%s' from git"
20460msgstr "remote-curl:未知的来自 git 的命令 '%s'"
20461
20462#: list-objects-filter-options.h:61
20463msgid "args"
20464msgstr "参数"
20465
20466#: list-objects-filter-options.h:62
20467msgid "object filtering"
20468msgstr "对象过滤"
20469
20470#: parse-options.h:170
fd8cb379
JX
20471msgid "expiry-date"
20472msgstr "到期时间"
7aea43ff 20473
d46c5519 20474#: parse-options.h:184
fd8cb379
JX
20475msgid "no-op (backward compatibility)"
20476msgstr "空操作(向后兼容)"
7aea43ff 20477
d46c5519 20478#: parse-options.h:304
fd8cb379
JX
20479msgid "be more verbose"
20480msgstr "更加详细"
7aea43ff 20481
d46c5519 20482#: parse-options.h:306
fd8cb379
JX
20483msgid "be more quiet"
20484msgstr "更加安静"
7aea43ff 20485
d46c5519 20486#: parse-options.h:312
fd8cb379
JX
20487msgid "use <n> digits to display SHA-1s"
20488msgstr "用 <n> 位数字显示 SHA-1 哈希值"
7aea43ff 20489
d46c5519
JX
20490#: parse-options.h:331
20491msgid "how to strip spaces and #comments from message"
20492msgstr "设置如何删除提交说明里的空格和#注释"
20493
20494#: ref-filter.h:101
20495msgid "key"
20496msgstr "key"
20497
20498#: ref-filter.h:101
20499msgid "field name to sort on"
20500msgstr "排序的字段名"
20501
20502#: rerere.h:44
20503msgid "update the index with reused conflict resolution if possible"
20504msgstr "如果可能,重用冲突解决更新索引"
20505
fd8cb379 20506#: command-list.h:50
8ada9598 20507msgid "Add file contents to the index"
81809b99 20508msgstr "添加文件内容至索引"
8ada9598 20509
fd8cb379
JX
20510#: command-list.h:51
20511msgid "Apply a series of patches from a mailbox"
20512msgstr "应用邮箱格式的系列补丁"
20513
20514#: command-list.h:52
20515msgid "Annotate file lines with commit information"
20516msgstr "使用提交信息注释文件行"
20517
20518#: command-list.h:53
20519msgid "Apply a patch to files and/or to the index"
20520msgstr "应用一个补丁到文件和/或索引区"
20521
20522#: command-list.h:54
4c27fcb5
JX
20523msgid "Import a GNU Arch repository into Git"
20524msgstr "将一个 GNU Arch 仓库导入到 Git"
fd8cb379
JX
20525
20526#: command-list.h:55
20527msgid "Create an archive of files from a named tree"
20528msgstr "基于一个指定的树创建文件存档"
20529
20530#: command-list.h:56
1b7f4a34
JX
20531msgid "Use binary search to find the commit that introduced a bug"
20532msgstr "通过二分查找定位引入 bug 的提交"
8ada9598 20533
fd8cb379
JX
20534#: command-list.h:57
20535msgid "Show what revision and author last modified each line of a file"
20536msgstr "显示文件每一行最后修改的版本和修改者"
20537
20538#: command-list.h:58
8ada9598 20539msgid "List, create, or delete branches"
81809b99 20540msgstr "列出、创建或删除分支"
8ada9598 20541
fd8cb379
JX
20542#: command-list.h:59
20543msgid "Move objects and refs by archive"
20544msgstr "通过归档移动对象和引用"
20545
20546#: command-list.h:60
20547msgid "Provide content or type and size information for repository objects"
20548msgstr "提供仓库对象的内容、类型或大小"
20549
20550#: command-list.h:61
20551msgid "Display gitattributes information"
20552msgstr "显示 gitattributes 信息"
20553
20554#: command-list.h:62
20555msgid "Debug gitignore / exclude files"
20556msgstr "调试 gitignore / exclude 文件"
20557
20558#: command-list.h:63
20559msgid "Show canonical names and email addresses of contacts"
20560msgstr "显示联系人的规范名称和电子邮件"
20561
20562#: command-list.h:64
5bb01d4f
JX
20563msgid "Switch branches or restore working tree files"
20564msgstr "切换分支或恢复工作区文件"
8ada9598 20565
fd8cb379
JX
20566#: command-list.h:65
20567msgid "Copy files from the index to the working tree"
20568msgstr "从索引拷贝文件到工作区"
20569
20570#: command-list.h:66
20571msgid "Ensures that a reference name is well formed"
20572msgstr "确保引用名称格式正确"
20573
20574#: command-list.h:67
20575msgid "Find commits yet to be applied to upstream"
20576msgstr "查找尚未应用到上游的提交"
20577
20578#: command-list.h:68
20579msgid "Apply the changes introduced by some existing commits"
20580msgstr "应用一些现存提交引入的修改"
20581
20582#: command-list.h:69
20583msgid "Graphical alternative to git-commit"
20584msgstr "git-commit 的图形替代界面"
20585
20586#: command-list.h:70
20587msgid "Remove untracked files from the working tree"
20588msgstr "从工作区中删除未跟踪文件"
20589
20590#: command-list.h:71
8ada9598 20591msgid "Clone a repository into a new directory"
06991777 20592msgstr "克隆仓库到一个新目录"
8ada9598 20593
fd8cb379
JX
20594#: command-list.h:72
20595msgid "Display data in columns"
20596msgstr "以列的方式显示数据"
20597
20598#: command-list.h:73
8ada9598 20599msgid "Record changes to the repository"
160fb2b2 20600msgstr "记录变更到仓库"
8ada9598 20601
fd8cb379 20602#: command-list.h:74
4c27fcb5
JX
20603msgid "Write and verify Git commit-graph files"
20604msgstr "写入和校验 Git 提交图文件"
fd8cb379
JX
20605
20606#: command-list.h:75
20607msgid "Create a new commit object"
20608msgstr "创建一个新的提交对象"
20609
20610#: command-list.h:76
20611msgid "Get and set repository or global options"
20612msgstr "获取和设置仓库或者全局选项"
20613
20614#: command-list.h:77
20615msgid "Count unpacked number of objects and their disk consumption"
20616msgstr "计算未打包对象的数量和磁盘空间占用"
20617
20618#: command-list.h:78
20619msgid "Retrieve and store user credentials"
20620msgstr "检索和存储用户密码"
20621
20622#: command-list.h:79
20623msgid "Helper to temporarily store passwords in memory"
20624msgstr "在内存中临时存储密码的助手"
20625
20626#: command-list.h:80
20627msgid "Helper to store credentials on disk"
20628msgstr "在磁盘存储密码的助手"
20629
20630#: command-list.h:81
20631msgid "Export a single commit to a CVS checkout"
20632msgstr "将一个提交导出到 CVS 检出中"
20633
20634#: command-list.h:82
20635msgid "Salvage your data out of another SCM people love to hate"
20636msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据"
20637
20638#: command-list.h:83
20639msgid "A CVS server emulator for Git"
20640msgstr "Git 的一个 CVS 服务模拟器"
20641
20642#: command-list.h:84
20643msgid "A really simple server for Git repositories"
20644msgstr "一个非常简单的 Git 仓库服务器"
20645
20646#: command-list.h:85
20647msgid "Give an object a human readable name based on an available ref"
20648msgstr "基于一个现存的引用为一个对象起一个可读的名称"
20649
20650#: command-list.h:86
8ada9598 20651msgid "Show changes between commits, commit and working tree, etc"
81809b99 20652msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598 20653
fd8cb379
JX
20654#: command-list.h:87
20655msgid "Compares files in the working tree and the index"
20656msgstr "比较工作区和索引区中的文件"
20657
20658#: command-list.h:88
20659msgid "Compare a tree to the working tree or index"
20660msgstr "将一个树和工作区或索引做比较"
20661
20662#: command-list.h:89
20663msgid "Compares the content and mode of blobs found via two tree objects"
20664msgstr "比较两个树对象的文件内容和模式"
20665
20666#: command-list.h:90
20667msgid "Show changes using common diff tools"
20668msgstr "使用常见的差异工具显示更改"
20669
20670#: command-list.h:91
20671msgid "Git data exporter"
20672msgstr "Git 数据导出器"
20673
20674#: command-list.h:92
20675msgid "Backend for fast Git data importers"
20676msgstr "Git 快速数据导入器后端"
20677
20678#: command-list.h:93
8ada9598 20679msgid "Download objects and refs from another repository"
160fb2b2 20680msgstr "从另外一个仓库下载对象和引用"
8ada9598 20681
fd8cb379
JX
20682#: command-list.h:94
20683msgid "Receive missing objects from another repository"
20684msgstr "从另一个仓库获取缺失的对象"
20685
20686#: command-list.h:95
20687msgid "Rewrite branches"
20688msgstr "重写分支"
20689
20690#: command-list.h:96
20691msgid "Produce a merge commit message"
20692msgstr "生成一个合并提交信息"
20693
20694#: command-list.h:97
20695msgid "Output information on each ref"
20696msgstr "对每一个引用输出信息 "
20697
20698#: command-list.h:98
20699msgid "Prepare patches for e-mail submission"
20700msgstr "准备电子邮件提交的补丁"
20701
20702#: command-list.h:99
20703msgid "Verifies the connectivity and validity of the objects in the database"
20704msgstr "验证仓库中对象的连通性和有效性"
20705
20706#: command-list.h:100
20707msgid "Cleanup unnecessary files and optimize the local repository"
20708msgstr "清除不必要的文件和优化本地仓库"
20709
20710#: command-list.h:101
20711msgid "Extract commit ID from an archive created using git-archive"
20712msgstr "从 git-archive 创建的归档文件中提取提交ID"
20713
20714#: command-list.h:102
8ada9598 20715msgid "Print lines matching a pattern"
81809b99 20716msgstr "输出和模式匹配的行"
8ada9598 20717
fd8cb379
JX
20718#: command-list.h:103
20719msgid "A portable graphical interface to Git"
20720msgstr "一个便携的 Git 图形客户端"
20721
20722#: command-list.h:104
20723msgid "Compute object ID and optionally creates a blob from a file"
20724msgstr "从一个文件计算对象ID,并可以创建 blob 数据对象"
20725
20726#: command-list.h:105
20727msgid "Display help information about Git"
20728msgstr "显示 Git 的帮助信息"
20729
20730#: command-list.h:106
20731msgid "Server side implementation of Git over HTTP"
20732msgstr "Git HTTP 协议的服务端实现"
20733
20734#: command-list.h:107
20735msgid "Download from a remote Git repository via HTTP"
20736msgstr "通过 HTTP 从远程 Git 仓库下载"
20737
20738#: command-list.h:108
20739msgid "Push objects over HTTP/DAV to another repository"
20740msgstr "通过 HTTP/DAV 推送对象另一个仓库"
20741
20742#: command-list.h:109
20743msgid "Send a collection of patches from stdin to an IMAP folder"
20744msgstr "从标准输入将一组补丁发送到IMAP文件夹"
20745
20746#: command-list.h:110
20747msgid "Build pack index file for an existing packed archive"
20748msgstr "从一个现存的包存档文件创建包索引"
20749
20750#: command-list.h:111
a77c07d9 20751msgid "Create an empty Git repository or reinitialize an existing one"
160fb2b2 20752msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
8ada9598 20753
fd8cb379
JX
20754#: command-list.h:112
20755msgid "Instantly browse your working repository in gitweb"
20756msgstr "在 gitweb 中即时浏览您的工作仓库"
20757
20758#: command-list.h:113
d46c5519 20759msgid "Add or parse structured information in commit messages"
fd8cb379
JX
20760msgstr "添加或解析提交说明中的结构化信息"
20761
20762#: command-list.h:114
20763msgid "The Git repository browser"
20764msgstr "Git 仓库浏览器"
20765
20766#: command-list.h:115
8ada9598 20767msgid "Show commit logs"
81809b99 20768msgstr "显示提交日志"
8ada9598 20769
fd8cb379
JX
20770#: command-list.h:116
20771msgid "Show information about files in the index and the working tree"
20772msgstr "显示索引和工作区中文件的信息"
20773
20774#: command-list.h:117
20775msgid "List references in a remote repository"
20776msgstr "显示一个远程仓库的引用"
20777
20778#: command-list.h:118
20779msgid "List the contents of a tree object"
20780msgstr "显示一个树对象的内容"
20781
20782#: command-list.h:119
20783msgid "Extracts patch and authorship from a single e-mail message"
20784msgstr "从单个电子邮件中提取补丁和作者身份"
20785
20786#: command-list.h:120
20787msgid "Simple UNIX mbox splitter program"
20788msgstr "简单的 UNIX mbox 邮箱切分程序"
20789
20790#: command-list.h:121
8ada9598 20791msgid "Join two or more development histories together"
81809b99 20792msgstr "合并两个或更多开发历史"
8ada9598 20793
fd8cb379
JX
20794#: command-list.h:122
20795msgid "Find as good common ancestors as possible for a merge"
20796msgstr "为了合并查找尽可能好的公共祖先提交"
20797
20798#: command-list.h:123
20799msgid "Run a three-way file merge"
20800msgstr "运行一个三路文件合并"
20801
20802#: command-list.h:124
20803msgid "Run a merge for files needing merging"
20804msgstr "对于需要合并的文件执行合并"
20805
20806#: command-list.h:125
20807msgid "The standard helper program to use with git-merge-index"
20808msgstr "与 git-merge-index 一起使用的标准向导程序"
20809
20810#: command-list.h:126
20811msgid "Run merge conflict resolution tools to resolve merge conflicts"
20812msgstr "运行合并冲突解决工具以解决合并冲突"
20813
20814#: command-list.h:127
20815msgid "Show three-way merge without touching index"
20816msgstr "显示三路合并而不动索引"
20817
20818#: command-list.h:128
4c27fcb5
JX
20819msgid "Write and verify multi-pack-indexes"
20820msgstr "写入和校验多包索引"
20821
20822#: command-list.h:129
fd8cb379
JX
20823msgid "Creates a tag object"
20824msgstr "创建一个标签对象"
20825
4c27fcb5 20826#: command-list.h:130
fd8cb379
JX
20827msgid "Build a tree-object from ls-tree formatted text"
20828msgstr "基于 ls-tree 的格式化文本创建一个树对象"
20829
4c27fcb5 20830#: command-list.h:131
8ada9598 20831msgid "Move or rename a file, a directory, or a symlink"
81809b99 20832msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598 20833
fd8cb379 20834# 查找给定版本的符号名称
4c27fcb5 20835#: command-list.h:132
fd8cb379
JX
20836msgid "Find symbolic names for given revs"
20837msgstr "查找给定版本的符号名称"
20838
4c27fcb5 20839#: command-list.h:133
fd8cb379
JX
20840msgid "Add or inspect object notes"
20841msgstr "添加或检查对象注释"
20842
4c27fcb5 20843#: command-list.h:134
fd8cb379
JX
20844msgid "Import from and submit to Perforce repositories"
20845msgstr "导入和提交到 Perforce 仓库中"
20846
4c27fcb5 20847#: command-list.h:135
fd8cb379
JX
20848msgid "Create a packed archive of objects"
20849msgstr "创建对象的存档包"
20850
4c27fcb5 20851#: command-list.h:136
fd8cb379
JX
20852msgid "Find redundant pack files"
20853msgstr "查找冗余的包文件"
20854
4c27fcb5 20855#: command-list.h:137
fd8cb379
JX
20856msgid "Pack heads and tags for efficient repository access"
20857msgstr "打包头和标签以实现高效的仓库访问"
20858
4c27fcb5 20859#: command-list.h:138
fd8cb379
JX
20860msgid "Routines to help parsing remote repository access parameters"
20861msgstr "帮助解析远程仓库访问参数的例程"
20862
4c27fcb5 20863#: command-list.h:139
fd8cb379
JX
20864msgid "Compute unique ID for a patch"
20865msgstr "计算一个补丁的唯一ID"
20866
4c27fcb5 20867#: command-list.h:140
fd8cb379
JX
20868msgid "Prune all unreachable objects from the object database"
20869msgstr "删除对象库中所有不可达对象"
20870
4c27fcb5 20871#: command-list.h:141
fd8cb379
JX
20872msgid "Remove extra objects that are already in pack files"
20873msgstr "删除已经在包文件中的多余对象"
20874
4c27fcb5 20875#: command-list.h:142
2e8451e8 20876msgid "Fetch from and integrate with another repository or a local branch"
160fb2b2 20877msgstr "获取并整合另外的仓库或一个本地分支"
8ada9598 20878
4c27fcb5 20879#: command-list.h:143
8ada9598 20880msgid "Update remote refs along with associated objects"
81809b99 20881msgstr "更新远程引用和相关的对象"
8ada9598 20882
4c27fcb5 20883#: command-list.h:144
fd8cb379
JX
20884msgid "Applies a quilt patchset onto the current branch"
20885msgstr "将一个 quilt 补丁集应用到当前分支。"
20886
4c27fcb5 20887#: command-list.h:145
c1ac5258
JX
20888msgid "Compare two commit ranges (e.g. two versions of a branch)"
20889msgstr "比较两个提交范围(如一个分支的两个版本)"
20890
4c27fcb5 20891#: command-list.h:146
fd8cb379
JX
20892msgid "Reads tree information into the index"
20893msgstr "将树信息读取到索引"
20894
4c27fcb5 20895#: command-list.h:147
3495628d
JX
20896msgid "Reapply commits on top of another base tip"
20897msgstr "在另一个分支上重新应用提交"
8ada9598 20898
4c27fcb5 20899#: command-list.h:148
fd8cb379
JX
20900msgid "Receive what is pushed into the repository"
20901msgstr "接收推送到仓库中的对象"
20902
4c27fcb5 20903#: command-list.h:149
fd8cb379
JX
20904msgid "Manage reflog information"
20905msgstr "管理 reflog 信息"
20906
4c27fcb5 20907#: command-list.h:150
fd8cb379
JX
20908msgid "Manage set of tracked repositories"
20909msgstr "管理已跟踪仓库"
20910
4c27fcb5 20911#: command-list.h:151
fd8cb379
JX
20912msgid "Pack unpacked objects in a repository"
20913msgstr "打包仓库中未打包对象"
20914
4c27fcb5 20915#: command-list.h:152
fd8cb379
JX
20916msgid "Create, list, delete refs to replace objects"
20917msgstr "创建、列出、删除对象替换引用"
20918
4c27fcb5 20919#: command-list.h:153
fd8cb379
JX
20920msgid "Generates a summary of pending changes"
20921msgstr "生成待定更改的摘要"
20922
4c27fcb5 20923#: command-list.h:154
fd8cb379
JX
20924msgid "Reuse recorded resolution of conflicted merges"
20925msgstr "重用冲突合并的解决方案记录"
20926
4c27fcb5 20927#: command-list.h:155
8ada9598 20928msgid "Reset current HEAD to the specified state"
4375c10e 20929msgstr "重置当前 HEAD 到指定状态"
8ada9598 20930
4c27fcb5 20931#: command-list.h:156
fd8cb379
JX
20932msgid "Revert some existing commits"
20933msgstr "回退一些现存提交"
20934
4c27fcb5 20935#: command-list.h:157
fd8cb379
JX
20936msgid "Lists commit objects in reverse chronological order"
20937msgstr "按时间顺序列出提交对象"
20938
4c27fcb5 20939#: command-list.h:158
fd8cb379
JX
20940msgid "Pick out and massage parameters"
20941msgstr "选出并处理参数"
20942
4c27fcb5 20943#: command-list.h:159
8ada9598 20944msgid "Remove files from the working tree and from the index"
81809b99 20945msgstr "从工作区和索引中删除文件"
8ada9598 20946
4c27fcb5 20947#: command-list.h:160
fd8cb379
JX
20948msgid "Send a collection of patches as emails"
20949msgstr "通过电子邮件发送一组补丁"
20950
4c27fcb5 20951#: command-list.h:161
fd8cb379
JX
20952msgid "Push objects over Git protocol to another repository"
20953msgstr "使用 Git 协议推送对象到另一个仓库"
20954
4c27fcb5 20955#: command-list.h:162
fd8cb379
JX
20956msgid "Restricted login shell for Git-only SSH access"
20957msgstr "只允许 Git SSH 访问的受限登录shell"
20958
4c27fcb5 20959#: command-list.h:163
fd8cb379
JX
20960msgid "Summarize 'git log' output"
20961msgstr "'git log' 输出摘要"
20962
4c27fcb5 20963#: command-list.h:164
8ada9598 20964msgid "Show various types of objects"
81809b99 20965msgstr "显示各种类型的对象"
8ada9598 20966
4c27fcb5 20967#: command-list.h:165
fd8cb379
JX
20968msgid "Show branches and their commits"
20969msgstr "显示分支和提交"
20970
4c27fcb5 20971#: command-list.h:166
fd8cb379
JX
20972msgid "Show packed archive index"
20973msgstr "显示打包归档索引"
20974
4c27fcb5 20975#: command-list.h:167
fd8cb379
JX
20976msgid "List references in a local repository"
20977msgstr "显示本地仓库中的引用"
20978
4c27fcb5 20979#: command-list.h:168
fd8cb379
JX
20980msgid "Git's i18n setup code for shell scripts"
20981msgstr "为 shell 脚本准备的 Git 国际化设置代码"
20982
4c27fcb5 20983#: command-list.h:169
fd8cb379
JX
20984msgid "Common Git shell script setup code"
20985msgstr "常用的 Git shell 脚本设置代码"
20986
4c27fcb5 20987#: command-list.h:170
fd8cb379
JX
20988msgid "Stash the changes in a dirty working directory away"
20989msgstr "贮藏脏工作区中的修改"
20990
4c27fcb5 20991#: command-list.h:171
fd8cb379
JX
20992msgid "Add file contents to the staging area"
20993msgstr "将文件内容添加到索引"
20994
4c27fcb5 20995#: command-list.h:172
8ada9598 20996msgid "Show the working tree status"
81809b99 20997msgstr "显示工作区状态"
8ada9598 20998
4c27fcb5 20999#: command-list.h:173
fd8cb379
JX
21000msgid "Remove unnecessary whitespace"
21001msgstr "删除不必要的空白字符"
21002
4c27fcb5 21003#: command-list.h:174
fd8cb379
JX
21004msgid "Initialize, update or inspect submodules"
21005msgstr "初始化、更新或检查子模组"
21006
4c27fcb5 21007#: command-list.h:175
fd8cb379
JX
21008msgid "Bidirectional operation between a Subversion repository and Git"
21009msgstr "Subersion 仓库和 Git 之间的双向操作"
21010
4c27fcb5 21011#: command-list.h:176
fd8cb379
JX
21012msgid "Read, modify and delete symbolic refs"
21013msgstr "读取、修改和删除符号引用"
21014
4c27fcb5 21015#: command-list.h:177
8ada9598 21016msgid "Create, list, delete or verify a tag object signed with GPG"
4375c10e 21017msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
8ada9598 21018
4c27fcb5 21019#: command-list.h:178
fd8cb379
JX
21020msgid "Creates a temporary file with a blob's contents"
21021msgstr "用 blob 数据对象的内容创建一个临时文件"
220c313c 21022
4c27fcb5 21023#: command-list.h:179
fd8cb379
JX
21024msgid "Unpack objects from a packed archive"
21025msgstr "从打包文件中解压缩对象"
220c313c 21026
4c27fcb5 21027#: command-list.h:180
fd8cb379
JX
21028msgid "Register file contents in the working tree to the index"
21029msgstr "将工作区的文件内容注册到索引"
220c313c 21030
4c27fcb5 21031#: command-list.h:181
fd8cb379
JX
21032msgid "Update the object name stored in a ref safely"
21033msgstr "安全地更新存储于引用中的对象名称"
220c313c 21034
4c27fcb5 21035#: command-list.h:182
fd8cb379
JX
21036msgid "Update auxiliary info file to help dumb servers"
21037msgstr "更新辅助信息文件以帮助哑协议服务"
21038
4c27fcb5 21039#: command-list.h:183
fd8cb379
JX
21040msgid "Send archive back to git-archive"
21041msgstr "将存档发送回 git-archive"
21042
4c27fcb5 21043#: command-list.h:184
fd8cb379
JX
21044msgid "Send objects packed back to git-fetch-pack"
21045msgstr "将对象压缩包发送回 git-fetch-pack"
21046
4c27fcb5 21047#: command-list.h:185
fd8cb379
JX
21048msgid "Show a Git logical variable"
21049msgstr "显示一个Git逻辑变量"
21050
4c27fcb5 21051#: command-list.h:186
fd8cb379
JX
21052msgid "Check the GPG signature of commits"
21053msgstr "检查 GPG 提交签名"
21054
4c27fcb5 21055#: command-list.h:187
fd8cb379
JX
21056msgid "Validate packed Git archive files"
21057msgstr "校验打包的Git存仓文件"
21058
4c27fcb5 21059#: command-list.h:188
fd8cb379
JX
21060msgid "Check the GPG signature of tags"
21061msgstr "检查标签的 GPG 签名"
21062
4c27fcb5 21063#: command-list.h:189
fd8cb379
JX
21064msgid "Git web interface (web frontend to Git repositories)"
21065msgstr "Git web 界面(Git 仓库的 web 前端)"
21066
4c27fcb5 21067#: command-list.h:190
fd8cb379
JX
21068msgid "Show logs with difference each commit introduces"
21069msgstr "显示每一个提交引入的差异日志"
21070
4c27fcb5 21071#: command-list.h:191
fd8cb379
JX
21072msgid "Manage multiple working trees"
21073msgstr "管理多个工作区"
21074
4c27fcb5 21075#: command-list.h:192
fd8cb379
JX
21076msgid "Create a tree object from the current index"
21077msgstr "从当前索引创建一个树对象"
21078
4c27fcb5 21079#: command-list.h:193
fd8cb379
JX
21080msgid "Defining attributes per path"
21081msgstr "定义路径的属性"
21082
4c27fcb5 21083#: command-list.h:194
fd8cb379
JX
21084msgid "Git command-line interface and conventions"
21085msgstr "Git 命令行界面和约定"
21086
4c27fcb5 21087#: command-list.h:195
fd8cb379
JX
21088msgid "A Git core tutorial for developers"
21089msgstr "面向开发人员的 Git 核心教程"
21090
4c27fcb5 21091#: command-list.h:196
fd8cb379
JX
21092msgid "Git for CVS users"
21093msgstr "适合 CVS 用户的 Git 帮助"
21094
4c27fcb5 21095#: command-list.h:197
fd8cb379
JX
21096msgid "Tweaking diff output"
21097msgstr "调整差异输出"
21098
4c27fcb5 21099#: command-list.h:198
fd8cb379
JX
21100msgid "A useful minimum set of commands for Everyday Git"
21101msgstr "每一天 Git 的一组有用的最小命令集合"
21102
4c27fcb5 21103#: command-list.h:199
fd8cb379
JX
21104msgid "A Git Glossary"
21105msgstr "Git 词汇表"
21106
4c27fcb5 21107#: command-list.h:200
fd8cb379
JX
21108msgid "Hooks used by Git"
21109msgstr "Git 使用的钩子"
21110
4c27fcb5 21111#: command-list.h:201
fd8cb379
JX
21112msgid "Specifies intentionally untracked files to ignore"
21113msgstr "忽略指定的未跟踪文件"
21114
4c27fcb5 21115#: command-list.h:202
fd8cb379
JX
21116msgid "Defining submodule properties"
21117msgstr "定义子模组属性"
21118
4c27fcb5 21119#: command-list.h:203
fd8cb379
JX
21120msgid "Git namespaces"
21121msgstr "Git 名字空间"
21122
4c27fcb5 21123#: command-list.h:204
fd8cb379
JX
21124msgid "Git Repository Layout"
21125msgstr "Git 仓库布局"
21126
4c27fcb5 21127#: command-list.h:205
fd8cb379
JX
21128msgid "Specifying revisions and ranges for Git"
21129msgstr "指定 Git 的版本和版本范围"
21130
4c27fcb5 21131#: command-list.h:206
fd8cb379
JX
21132msgid "A tutorial introduction to Git: part two"
21133msgstr "一个 Git 教程:第二部分"
21134
4c27fcb5 21135#: command-list.h:207
fd8cb379
JX
21136msgid "A tutorial introduction to Git"
21137msgstr "一个 Git 教程"
21138
4c27fcb5 21139#: command-list.h:208
fd8cb379
JX
21140msgid "An overview of recommended workflows with Git"
21141msgstr "Git 推荐的工作流概览"
220c313c 21142
5c57d762 21143#: git-bisect.sh:54
b694fbb1
JX
21144msgid "You need to start by \"git bisect start\""
21145msgstr "您需要执行 \"git bisect start\" 来开始"
21146
90e6ef53 21147# 译者:注意保持句尾空格
c04f5ac3
JX
21148#. TRANSLATORS: Make sure to include [Y] and [n] in your
21149#. translation. The program will only accept English input
21150#. at this point.
5c57d762 21151#: git-bisect.sh:60
c04f5ac3
JX
21152msgid "Do you want me to do it for you [Y/n]? "
21153msgstr "您想让我为您这样做么[Y/n]? "
21154
06991777 21155#: git-bisect.sh:101
c04f5ac3
JX
21156#, sh-format
21157msgid "Bad rev input: $arg"
9a4b694c 21158msgstr "坏的输入版本:$arg"
c04f5ac3 21159
06991777 21160#: git-bisect.sh:121
5c57d762
JX
21161#, sh-format
21162msgid "Bad rev input: $bisected_head"
9a4b694c 21163msgstr "坏的输入版本:$bisected_head"
c04f5ac3 21164
06991777 21165#: git-bisect.sh:130
c04f5ac3
JX
21166#, sh-format
21167msgid "Bad rev input: $rev"
9a4b694c 21168msgstr "坏的输入版本:$rev"
c04f5ac3 21169
06991777 21170#: git-bisect.sh:139
1b7f4a34
JX
21171#, sh-format
21172msgid "'git bisect $TERM_BAD' can take only one argument."
21173msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
21174
06991777 21175#: git-bisect.sh:209
c04f5ac3
JX
21176msgid "No logfile given"
21177msgstr "未提供日志文件"
21178
06991777 21179#: git-bisect.sh:210
c04f5ac3
JX
21180#, sh-format
21181msgid "cannot read $file for replaying"
21182msgstr "不能读取 $file 来重放"
21183
06991777 21184#: git-bisect.sh:232
c04f5ac3
JX
21185msgid "?? what are you talking about?"
21186msgstr "?? 您在说什么?"
21187
06991777 21188#: git-bisect.sh:241
5809aa05
JX
21189msgid "bisect run failed: no command provided."
21190msgstr "二分查找运行失败:没有提供命令。"
21191
06991777 21192#: git-bisect.sh:246
b694fbb1
JX
21193#, sh-format
21194msgid "running $command"
21195msgstr "运行 $command"
21196
06991777 21197#: git-bisect.sh:253
b694fbb1
JX
21198#, sh-format
21199msgid ""
21200"bisect run failed:\n"
21201"exit code $res from '$command' is < 0 or >= 128"
21202msgstr ""
21203"二分查找运行失败:\n"
07432cef 21204"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 21205
06991777 21206#: git-bisect.sh:279
b694fbb1
JX
21207msgid "bisect run cannot continue any more"
21208msgstr "二分查找不能继续运行"
21209
06991777 21210#: git-bisect.sh:285
b694fbb1
JX
21211#, sh-format
21212msgid ""
21213"bisect run failed:\n"
21214"'bisect_state $state' exited with error code $res"
21215msgstr ""
21216"二分查找运行失败:\n"
21217"'bisect_state $state' 退出码为 $res"
21218
06991777 21219#: git-bisect.sh:292
b694fbb1
JX
21220msgid "bisect run success"
21221msgstr "二分查找运行成功"
c04f5ac3 21222
06991777
JX
21223#: git-bisect.sh:300
21224msgid "We are not bisecting."
21225msgstr "我们没有在二分查找。"
94550ed3 21226
5c57d762
JX
21227#: git-merge-octopus.sh:46
21228msgid ""
21229"Error: Your local changes to the following files would be overwritten by "
21230"merge"
21231msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
21232
21233#: git-merge-octopus.sh:61
21234msgid "Automated merge did not work."
9a4b694c 21235msgstr "自动合并未生效。"
5c57d762
JX
21236
21237#: git-merge-octopus.sh:62
a0b6b246 21238msgid "Should not be doing an octopus."
5c57d762
JX
21239msgstr "不应该执行章鱼式合并。"
21240
21241#: git-merge-octopus.sh:73
21242#, sh-format
21243msgid "Unable to find common commit with $pretty_name"
21244msgstr "无法找到和 $pretty_name 的基线提交"
21245
21246#: git-merge-octopus.sh:77
21247#, sh-format
6937cb4e 21248msgid "Already up to date with $pretty_name"
5c57d762
JX
21249msgstr "已经和 $pretty_name 保持一致"
21250
21251#: git-merge-octopus.sh:89
21252#, sh-format
21253msgid "Fast-forwarding to: $pretty_name"
21254msgstr "快进至:$pretty_name"
21255
21256#: git-merge-octopus.sh:97
21257#, sh-format
21258msgid "Trying simple merge with $pretty_name"
21259msgstr "尝试和 $pretty_name 的简单合并"
21260
21261#: git-merge-octopus.sh:102
21262msgid "Simple merge did not work, trying automatic merge."
9a4b694c 21263msgstr "简单合并未生效,尝试自动合并。"
5c57d762 21264
d46c5519 21265#: git-legacy-stash.sh:220
c04f5ac3 21266msgid "Cannot remove temporary index (can't happen)"
90e6ef53 21267msgstr "无法删除临时索引(不应发生)"
c04f5ac3 21268
d46c5519 21269#: git-legacy-stash.sh:271
2e8451e8
JX
21270#, sh-format
21271msgid "Cannot update $ref_stash with $w_commit"
21272msgstr "无法用 $w_commit 更新 $ref_stash"
21273
d46c5519 21274#: git-legacy-stash.sh:323
b694fbb1 21275#, sh-format
5809aa05
JX
21276msgid "error: unknown option for 'stash push': $option"
21277msgstr "错误:'stash push' 的未知选项:$option"
b694fbb1 21278
d46c5519 21279#: git-legacy-stash.sh:355
5c57d762
JX
21280#, sh-format
21281msgid "Saved working directory and index state $stash_msg"
21282msgstr "保存工作目录和索引状态 $stash_msg"
21283
d46c5519 21284#: git-legacy-stash.sh:535
7aea43ff
JX
21285#, sh-format
21286msgid "unknown option: $opt"
21287msgstr "未知选项: $opt"
21288
d46c5519 21289#: git-legacy-stash.sh:555
c04f5ac3
JX
21290#, sh-format
21291msgid "Too many revisions specified: $REV"
90e6ef53 21292msgstr "指定了太多的版本:$REV"
c04f5ac3 21293
d46c5519 21294#: git-legacy-stash.sh:570
c04f5ac3 21295#, sh-format
220c313c
JX
21296msgid "$reference is not a valid reference"
21297msgstr "$reference 不是一个有效的引用"
c04f5ac3 21298
d46c5519 21299#: git-legacy-stash.sh:598
c04f5ac3
JX
21300#, sh-format
21301msgid "'$args' is not a stash-like commit"
a4f16749 21302msgstr "'$args' 不是贮藏式提交"
c04f5ac3 21303
d46c5519 21304#: git-legacy-stash.sh:609
c04f5ac3
JX
21305#, sh-format
21306msgid "'$args' is not a stash reference"
a4f16749 21307msgstr "'$args' 不是一个贮藏引用"
c04f5ac3 21308
d46c5519 21309#: git-legacy-stash.sh:617
c04f5ac3 21310msgid "unable to refresh index"
90e6ef53 21311msgstr "无法刷新索引"
c04f5ac3 21312
d46c5519 21313#: git-legacy-stash.sh:621
c04f5ac3 21314msgid "Cannot apply a stash in the middle of a merge"
a4f16749 21315msgstr "无法在合并过程应用贮藏"
c04f5ac3 21316
d46c5519 21317#: git-legacy-stash.sh:629
c04f5ac3 21318msgid "Conflicts in index. Try without --index."
90e6ef53 21319msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3 21320
d46c5519 21321#: git-legacy-stash.sh:631
c04f5ac3 21322msgid "Could not save index tree"
90e6ef53 21323msgstr "不能保存索引树"
c04f5ac3 21324
d46c5519 21325#: git-legacy-stash.sh:640
a4f16749
JX
21326msgid "Could not restore untracked files from stash entry"
21327msgstr "无法从贮藏条目中恢复未跟踪文件"
a0b6b246 21328
d46c5519 21329#: git-legacy-stash.sh:665
c04f5ac3 21330msgid "Cannot unstage modified files"
160fb2b2 21331msgstr "无法将修改的文件取消暂存"
c04f5ac3 21332
d46c5519 21333#: git-legacy-stash.sh:703
c04f5ac3
JX
21334#, sh-format
21335msgid "Dropped ${REV} ($s)"
21336msgstr "丢弃了 ${REV} ($s)"
21337
d46c5519 21338#: git-legacy-stash.sh:704
c04f5ac3
JX
21339#, sh-format
21340msgid "${REV}: Could not drop stash entry"
a4f16749 21341msgstr "${REV}:无法丢弃贮藏条目"
c04f5ac3 21342
d46c5519 21343#: git-legacy-stash.sh:791
c04f5ac3
JX
21344msgid "(To restore them type \"git stash apply\")"
21345msgstr "(为恢复数据输入 \"git stash apply\")"
21346
d46c5519 21347#: git-submodule.sh:200
2e8451e8
JX
21348msgid "Relative path can only be used from the toplevel of the working tree"
21349msgstr "只能在工作区的顶级目录中使用相对路径"
21350
d46c5519 21351#: git-submodule.sh:210
c04f5ac3
JX
21352#, sh-format
21353msgid "repo URL: '$repo' must be absolute or begin with ./|../"
4375c10e 21354msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
c04f5ac3 21355
d46c5519 21356#: git-submodule.sh:229
c04f5ac3 21357#, sh-format
170e9899
JX
21358msgid "'$sm_path' already exists in the index"
21359msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 21360
d46c5519 21361#: git-submodule.sh:232
1a79b2f1
JX
21362#, sh-format
21363msgid "'$sm_path' already exists in the index and is not a submodule"
21364msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
21365
d46c5519
JX
21366#: git-submodule.sh:239
21367#, sh-format
21368msgid "'$sm_path' does not have a commit checked out"
21369msgstr "'$sm_path' 没有检出一个提交"
21370
21371#: git-submodule.sh:245
b694fbb1
JX
21372#, sh-format
21373msgid ""
21374"The following path is ignored by one of your .gitignore files:\n"
21375"$sm_path\n"
21376"Use -f if you really want to add it."
21377msgstr ""
21378"以下路径被您的一个 .gitignore 文件所忽略:\n"
21379"$sm_path\n"
21380"如果您确实想添加它,使用 -f 参数。"
21381
d46c5519 21382#: git-submodule.sh:268
b694fbb1
JX
21383#, sh-format
21384msgid "Adding existing repo at '$sm_path' to the index"
160fb2b2 21385msgstr "添加位于 '$sm_path' 的现存仓库到索引"
b694fbb1 21386
d46c5519 21387#: git-submodule.sh:270
c04f5ac3 21388#, sh-format
170e9899 21389msgid "'$sm_path' already exists and is not a valid git repo"
160fb2b2 21390msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
c04f5ac3 21391
d46c5519 21392#: git-submodule.sh:278
07432cef
WS
21393#, sh-format
21394msgid "A git directory for '$sm_name' is found locally with remote(s):"
160fb2b2 21395msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
07432cef 21396
d46c5519 21397#: git-submodule.sh:280
07432cef
WS
21398#, sh-format
21399msgid ""
5c57d762
JX
21400"If you want to reuse this local git directory instead of cloning again from\n"
21401" $realrepo\n"
21402"use the '--force' option. If the local git directory is not the correct "
21403"repo\n"
07432cef
WS
21404"or you are unsure what this means choose another name with the '--name' "
21405"option."
5c57d762
JX
21406msgstr ""
21407"如果您想要重用这个本地 git 目录而非重新克隆自\n"
21408" $realrepo\n"
21409"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
21410"或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
07432cef 21411
d46c5519 21412#: git-submodule.sh:286
07432cef
WS
21413#, sh-format
21414msgid "Reactivating local git directory for submodule '$sm_name'."
21415msgstr "激活本地 git 目录到子模组 '$sm_name'。"
21416
d46c5519 21417#: git-submodule.sh:298
c04f5ac3 21418#, sh-format
170e9899
JX
21419msgid "Unable to checkout submodule '$sm_path'"
21420msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 21421
d46c5519 21422#: git-submodule.sh:303
c04f5ac3 21423#, sh-format
170e9899
JX
21424msgid "Failed to add submodule '$sm_path'"
21425msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 21426
d46c5519 21427#: git-submodule.sh:312
c04f5ac3 21428#, sh-format
170e9899
JX
21429msgid "Failed to register submodule '$sm_path'"
21430msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 21431
d46c5519 21432#: git-submodule.sh:573
c04f5ac3 21433#, sh-format
2e8451e8
JX
21434msgid "Unable to find current revision in submodule path '$displaypath'"
21435msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 21436
d46c5519 21437#: git-submodule.sh:583
c04f5ac3 21438#, sh-format
170e9899
JX
21439msgid "Unable to fetch in submodule path '$sm_path'"
21440msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 21441
d46c5519 21442#: git-submodule.sh:588
5c57d762
JX
21443#, sh-format
21444msgid ""
21445"Unable to find current ${remote_name}/${branch} revision in submodule path "
21446"'$sm_path'"
9a4b694c 21447msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
5c57d762 21448
d46c5519 21449#: git-submodule.sh:606
2e8451e8 21450#, sh-format
d46c5519
JX
21451msgid ""
21452"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
21453"$sha1:"
21454msgstr "无法在子模组路径 '$displaypath' 中获取,尝试直接获取 $sha1:"
2e8451e8 21455
d46c5519 21456#: git-submodule.sh:612
5c57d762
JX
21457#, sh-format
21458msgid ""
21459"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
21460"Direct fetching of that commit failed."
a0b6b246
JX
21461msgstr ""
21462"获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
5c57d762 21463
d46c5519 21464#: git-submodule.sh:619
6c94aba5
JX
21465#, sh-format
21466msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
21467msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
21468
d46c5519 21469#: git-submodule.sh:620
c04f5ac3 21470#, sh-format
6c94aba5
JX
21471msgid "Submodule path '$displaypath': checked out '$sha1'"
21472msgstr "子模组路径 '$displaypath':检出 '$sha1'"
21473
d46c5519 21474#: git-submodule.sh:624
6c94aba5 21475#, sh-format
2e8451e8
JX
21476msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
21477msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 21478
d46c5519 21479#: git-submodule.sh:625
c04f5ac3 21480#, sh-format
2e8451e8
JX
21481msgid "Submodule path '$displaypath': rebased into '$sha1'"
21482msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 21483
d46c5519 21484#: git-submodule.sh:630
c04f5ac3 21485#, sh-format
2e8451e8
JX
21486msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
21487msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 21488
d46c5519 21489#: git-submodule.sh:631
c04f5ac3 21490#, sh-format
2e8451e8
JX
21491msgid "Submodule path '$displaypath': merged in '$sha1'"
21492msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 21493
d46c5519 21494#: git-submodule.sh:636
c04f5ac3 21495#, sh-format
5b04ee3b
JX
21496msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
21497msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
c04f5ac3 21498
d46c5519 21499#: git-submodule.sh:637
c04f5ac3 21500#, sh-format
5b04ee3b 21501msgid "Submodule path '$displaypath': '$command $sha1'"
aef18cc6 21502msgstr "子模组 '$displaypath':'$command $sha1'"
c04f5ac3 21503
d46c5519 21504#: git-submodule.sh:668
2e8451e8
JX
21505#, sh-format
21506msgid "Failed to recurse into submodule path '$displaypath'"
21507msgstr "无法递归进子模组路径 '$displaypath'"
21508
d46c5519 21509#: git-submodule.sh:830
649900bc
JX
21510msgid "The --cached option cannot be used with the --files option"
21511msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1 21512
d46c5519 21513#: git-submodule.sh:882
b694fbb1
JX
21514#, sh-format
21515msgid "unexpected mode $mod_dst"
21516msgstr "意外的模式 $mod_dst"
c04f5ac3 21517
90e6ef53 21518# 译者:注意保持前导空格
d46c5519 21519#: git-submodule.sh:902
c04f5ac3 21520#, sh-format
2e8451e8
JX
21521msgid " Warn: $display_name doesn't contain commit $sha1_src"
21522msgstr " 警告:$display_name 未包含提交 $sha1_src"
c04f5ac3 21523
90e6ef53 21524# 译者:注意保持前导空格
d46c5519 21525#: git-submodule.sh:905
c04f5ac3 21526#, sh-format
2e8451e8
JX
21527msgid " Warn: $display_name doesn't contain commit $sha1_dst"
21528msgstr " 警告:$display_name 未包含提交 $sha1_dst"
c04f5ac3 21529
90e6ef53 21530# 译者:注意保持前导空格
d46c5519 21531#: git-submodule.sh:908
c04f5ac3 21532#, sh-format
2e8451e8
JX
21533msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
21534msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
c04f5ac3 21535
5b04ee3b
JX
21536#: git-parse-remote.sh:89
21537#, sh-format
21538msgid "See git-${cmd}(1) for details."
21539msgstr "详见 git-${cmd}(1)。"
5c57d762 21540
c1ac5258
JX
21541#: git-rebase--preserve-merges.sh:136
21542#, sh-format
21543msgid "Rebasing ($new_count/$total)"
21544msgstr "变基中($new_count/$total)"
21545
21546#: git-rebase--preserve-merges.sh:152
21547msgid ""
21548"\n"
21549"Commands:\n"
21550"p, pick <commit> = use commit\n"
21551"r, reword <commit> = use commit, but edit the commit message\n"
21552"e, edit <commit> = use commit, but stop for amending\n"
21553"s, squash <commit> = use commit, but meld into previous commit\n"
21554"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
21555"x, exec <commit> = run command (the rest of the line) using shell\n"
21556"d, drop <commit> = remove commit\n"
21557"l, label <label> = label current HEAD with a name\n"
21558"t, reset <label> = reset HEAD to a label\n"
21559"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
21560". create a merge commit using the original merge commit's\n"
21561". message (or the oneline, if no original merge commit was\n"
21562". specified). Use -c <commit> to reword the commit message.\n"
21563"\n"
21564"These lines can be re-ordered; they are executed from top to bottom.\n"
21565msgstr ""
21566"\n"
21567"命令:\n"
21568"p, pick <提交> = 使用提交\n"
21569"r, reword <提交> = 使用提交,但修改提交说明\n"
21570"e, edit <提交> = 使用提交,但停下来修补\n"
21571"s, squash <提交> = 使用提交,但融合到前一个提交\n"
21572"f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
21573"x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
21574"d, drop <提交> = 删除提交\n"
21575"l, label <标签> = 为当前 HEAD 打上标签\n"
21576"t, reset <标签> = 重置 HEAD 到该标签\n"
21577"m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n"
21578". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
21579". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
21580". -c <提交> 可以编辑提交说明。\n"
21581"\n"
21582"可以对这些行重新排序,将从上至下执行。\n"
21583
21584#: git-rebase--preserve-merges.sh:215
5c57d762
JX
21585#, sh-format
21586msgid ""
21587"You can amend the commit now, with\n"
21588"\n"
21589"\tgit commit --amend $gpg_sign_opt_quoted\n"
21590"\n"
21591"Once you are satisfied with your changes, run\n"
21592"\n"
21593"\tgit rebase --continue"
21594msgstr ""
21595"您现在可以修补这个提交,使用\n"
21596"\n"
21597"\tgit commit --amend $gpg_sign_opt_quoted\n"
21598"\n"
9a4b694c 21599"当您对变更感到满意,执行\n"
5c57d762
JX
21600"\n"
21601"\tgit rebase --continue"
21602
c1ac5258 21603#: git-rebase--preserve-merges.sh:240
5c57d762
JX
21604#, sh-format
21605msgid "$sha1: not a commit that can be picked"
21606msgstr "$sha1:不是一个可以被拣选的提交"
21607
c1ac5258 21608#: git-rebase--preserve-merges.sh:279
5c57d762
JX
21609#, sh-format
21610msgid "Invalid commit name: $sha1"
21611msgstr "无效的提交名:$sha1"
21612
c1ac5258 21613#: git-rebase--preserve-merges.sh:309
5c57d762
JX
21614msgid "Cannot write current commit's replacement sha1"
21615msgstr "不能写入当前提交的替代 sha1"
21616
c1ac5258 21617#: git-rebase--preserve-merges.sh:360
5c57d762
JX
21618#, sh-format
21619msgid "Fast-forward to $sha1"
21620msgstr "快进到 $sha1"
21621
c1ac5258 21622#: git-rebase--preserve-merges.sh:362
5c57d762
JX
21623#, sh-format
21624msgid "Cannot fast-forward to $sha1"
21625msgstr "不能快进到 $sha1"
21626
c1ac5258 21627#: git-rebase--preserve-merges.sh:371
5c57d762
JX
21628#, sh-format
21629msgid "Cannot move HEAD to $first_parent"
21630msgstr "不能移动 HEAD 到 $first_parent"
21631
c1ac5258 21632#: git-rebase--preserve-merges.sh:376
5c57d762
JX
21633#, sh-format
21634msgid "Refusing to squash a merge: $sha1"
21635msgstr "拒绝压缩一个合并:$sha1"
21636
c1ac5258 21637#: git-rebase--preserve-merges.sh:394
5c57d762
JX
21638#, sh-format
21639msgid "Error redoing merge $sha1"
21640msgstr "无法重做合并 $sha1"
21641
c1ac5258 21642#: git-rebase--preserve-merges.sh:403
5c57d762
JX
21643#, sh-format
21644msgid "Could not pick $sha1"
21645msgstr "不能拣选 $sha1"
21646
c1ac5258 21647#: git-rebase--preserve-merges.sh:412
5c57d762
JX
21648#, sh-format
21649msgid "This is the commit message #${n}:"
9a4b694c 21650msgstr "这是提交说明 #${n}:"
5c57d762 21651
c1ac5258 21652#: git-rebase--preserve-merges.sh:417
5c57d762
JX
21653#, sh-format
21654msgid "The commit message #${n} will be skipped:"
9a4b694c 21655msgstr "提交说明 #${n} 将被跳过:"
5c57d762 21656
c1ac5258 21657#: git-rebase--preserve-merges.sh:428
5c57d762
JX
21658#, sh-format
21659msgid "This is a combination of $count commit."
21660msgid_plural "This is a combination of $count commits."
21661msgstr[0] "这是一个 $count 个提交的组合。"
21662msgstr[1] "这是一个 $count 个提交的组合。"
21663
c1ac5258 21664#: git-rebase--preserve-merges.sh:437
5c57d762
JX
21665#, sh-format
21666msgid "Cannot write $fixup_msg"
21667msgstr "不能写入 $fixup_msg"
21668
c1ac5258 21669#: git-rebase--preserve-merges.sh:440
5c57d762
JX
21670msgid "This is a combination of 2 commits."
21671msgstr "这是一个 2 个提交的组合。"
21672
c1ac5258
JX
21673#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
21674#: git-rebase--preserve-merges.sh:527
5c57d762
JX
21675#, sh-format
21676msgid "Could not apply $sha1... $rest"
21677msgstr "不能应用 $sha1... $rest"
21678
c1ac5258 21679#: git-rebase--preserve-merges.sh:556
5c57d762
JX
21680#, sh-format
21681msgid ""
21682"Could not amend commit after successfully picking $sha1... $rest\n"
21683"This is most likely due to an empty commit message, or the pre-commit hook\n"
21684"failed. If the pre-commit hook failed, you may need to resolve the issue "
21685"before\n"
21686"you are able to reword the commit."
21687msgstr ""
21688"不能在成功拣选 $sha1... $rest 之后修补提交\n"
21689"这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
21690"钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
21691
c1ac5258 21692#: git-rebase--preserve-merges.sh:571
5c57d762
JX
21693#, sh-format
21694msgid "Stopped at $sha1_abbrev... $rest"
21695msgstr "停止在 $sha1_abbrev... $rest"
21696
c1ac5258 21697#: git-rebase--preserve-merges.sh:586
5c57d762
JX
21698#, sh-format
21699msgid "Cannot '$squash_style' without a previous commit"
9a4b694c 21700msgstr "没有父提交的情况下不能 '$squash_style'"
5c57d762 21701
c1ac5258 21702#: git-rebase--preserve-merges.sh:628
5c57d762
JX
21703#, sh-format
21704msgid "Executing: $rest"
21705msgstr "执行:$rest"
21706
c1ac5258 21707#: git-rebase--preserve-merges.sh:636
5c57d762
JX
21708#, sh-format
21709msgid "Execution failed: $rest"
21710msgstr "执行失败:$rest"
21711
c1ac5258 21712#: git-rebase--preserve-merges.sh:638
5c57d762
JX
21713msgid "and made changes to the index and/or the working tree"
21714msgstr "并且修改索引和/或工作区"
21715
21716# 译者:注意保持前导空格
c1ac5258 21717#: git-rebase--preserve-merges.sh:640
5c57d762
JX
21718msgid ""
21719"You can fix the problem, and then run\n"
21720"\n"
21721"\tgit rebase --continue"
21722msgstr ""
21723"您可以解决这个问题,然后运行\n"
21724"\n"
21725"\tgit rebase --continue"
21726
21727#. TRANSLATORS: after these lines is a command to be issued by the user
c1ac5258 21728#: git-rebase--preserve-merges.sh:653
5c57d762
JX
21729#, sh-format
21730msgid ""
21731"Execution succeeded: $rest\n"
21732"but left changes to the index and/or the working tree\n"
21733"Commit or stash your changes, and then run\n"
21734"\n"
21735"\tgit rebase --continue"
21736msgstr ""
21737"执行成功:$rest\n"
a4f16749 21738"但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n"
5c57d762
JX
21739"\n"
21740"\tgit rebase --continue"
21741
c1ac5258 21742#: git-rebase--preserve-merges.sh:664
5c57d762
JX
21743#, sh-format
21744msgid "Unknown command: $command $sha1 $rest"
21745msgstr "未知命令:$command $sha1 $rest"
21746
c1ac5258 21747#: git-rebase--preserve-merges.sh:665
5c57d762
JX
21748msgid "Please fix this using 'git rebase --edit-todo'."
21749msgstr "要修改请使用命令 'git rebase --edit-todo'。"
21750
c1ac5258 21751#: git-rebase--preserve-merges.sh:700
5c57d762
JX
21752#, sh-format
21753msgid "Successfully rebased and updated $head_name."
9a4b694c 21754msgstr "成功变基并更新 $head_name。"
5c57d762 21755
c1ac5258 21756#: git-rebase--preserve-merges.sh:757
5c57d762
JX
21757msgid "Could not remove CHERRY_PICK_HEAD"
21758msgstr "不能删除 CHERRY_PICK_HEAD"
21759
c1ac5258 21760#: git-rebase--preserve-merges.sh:762
5c57d762
JX
21761#, sh-format
21762msgid ""
21763"You have staged changes in your working tree.\n"
21764"If these changes are meant to be\n"
21765"squashed into the previous commit, run:\n"
21766"\n"
21767" git commit --amend $gpg_sign_opt_quoted\n"
21768"\n"
21769"If they are meant to go into a new commit, run:\n"
21770"\n"
21771" git commit $gpg_sign_opt_quoted\n"
21772"\n"
a0b6b246 21773"In both cases, once you're done, continue with:\n"
5c57d762
JX
21774"\n"
21775" git rebase --continue\n"
21776msgstr ""
21777"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
21778"\n"
21779" git commit --amend $gpg_sign_opt_quoted\n"
21780"\n"
21781"如果这些变更要形成一个新提交,执行:\n"
21782"\n"
21783" git commit $gpg_sign_opt_quoted\n"
21784"\n"
9a4b694c 21785"无论哪种情况,当您完成提交,继续执行:\n"
5c57d762
JX
21786"\n"
21787" git rebase --continue\n"
21788
c1ac5258 21789#: git-rebase--preserve-merges.sh:779
5c57d762 21790msgid "Error trying to find the author identity to amend commit"
9a4b694c 21791msgstr "在修补提交中查找作者信息时遇到错误"
5c57d762 21792
c1ac5258 21793#: git-rebase--preserve-merges.sh:784
5c57d762
JX
21794msgid ""
21795"You have uncommitted changes in your working tree. Please commit them\n"
21796"first and then run 'git rebase --continue' again."
a0b6b246
JX
21797msgstr ""
21798"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
5c57d762 21799
c1ac5258 21800#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
5c57d762
JX
21801msgid "Could not commit staged changes."
21802msgstr "不能提交暂存的修改。"
21803
4c27fcb5
JX
21804#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
21805msgid "Could not execute editor"
21806msgstr "无法运行编辑器"
21807
21808#: git-rebase--preserve-merges.sh:845
21809#, sh-format
21810msgid "Could not checkout $switch_to"
21811msgstr "不能检出 $switch_to"
21812
21813#: git-rebase--preserve-merges.sh:852
21814msgid "No HEAD?"
21815msgstr "没有 HEAD?"
21816
21817#: git-rebase--preserve-merges.sh:853
21818#, sh-format
21819msgid "Could not create temporary $state_dir"
21820msgstr "不能创建临时 $state_dir"
21821
21822#: git-rebase--preserve-merges.sh:856
21823msgid "Could not mark as interactive"
21824msgstr "不能标记为交互式"
21825
21826#: git-rebase--preserve-merges.sh:888
21827#, sh-format
21828msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
21829msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
21830msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
21831msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
5c57d762 21832
c1ac5258 21833#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
fd8cb379
JX
21834msgid "Could not init rewritten commits"
21835msgstr "不能对重写提交进行初始化"
21836
5c57d762
JX
21837#: git-sh-setup.sh:89 git-sh-setup.sh:94
21838#, sh-format
21839msgid "usage: $dashless $USAGE"
21840msgstr "用法:$dashless $USAGE"
21841
d46c5519 21842#: git-sh-setup.sh:191
5c57d762
JX
21843#, sh-format
21844msgid "Cannot chdir to $cdup, the toplevel of the working tree"
9a4b694c 21845msgstr "不能切换目录到 $cdup,工作区的顶级目录"
5c57d762 21846
d46c5519 21847#: git-sh-setup.sh:200 git-sh-setup.sh:207
5c57d762
JX
21848#, sh-format
21849msgid "fatal: $program_name cannot be used without a working tree."
06991777 21850msgstr "致命错误:$program_name 不能在没有工作区的情况下使用"
5c57d762 21851
d46c5519 21852#: git-sh-setup.sh:221
5c57d762
JX
21853msgid "Cannot rebase: You have unstaged changes."
21854msgstr "不能变基:您有未暂存的变更。"
21855
d46c5519 21856#: git-sh-setup.sh:224
5c57d762
JX
21857msgid "Cannot rewrite branches: You have unstaged changes."
21858msgstr "不能重写分支:您有未暂存的变更。"
21859
d46c5519 21860#: git-sh-setup.sh:227
a0b6b246
JX
21861msgid "Cannot pull with rebase: You have unstaged changes."
21862msgstr "无法通过变基方式拉取:您有未暂存的变更。"
21863
d46c5519 21864#: git-sh-setup.sh:230
5c57d762
JX
21865#, sh-format
21866msgid "Cannot $action: You have unstaged changes."
21867msgstr "不能 $action:您有未暂存的变更。"
21868
d46c5519 21869#: git-sh-setup.sh:243
5c57d762
JX
21870msgid "Cannot rebase: Your index contains uncommitted changes."
21871msgstr "不能变基:您的索引中包含未提交的变更。"
21872
d46c5519 21873#: git-sh-setup.sh:246
a0b6b246
JX
21874msgid "Cannot pull with rebase: Your index contains uncommitted changes."
21875msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
21876
d46c5519 21877#: git-sh-setup.sh:249
5c57d762
JX
21878#, sh-format
21879msgid "Cannot $action: Your index contains uncommitted changes."
21880msgstr "不能 $action:您的索引中包含未提交的变更。"
21881
d46c5519 21882#: git-sh-setup.sh:253
a0b6b246
JX
21883msgid "Additionally, your index contains uncommitted changes."
21884msgstr "而且您的索引中包含未提交的变更。"
21885
d46c5519 21886#: git-sh-setup.sh:373
5c57d762
JX
21887msgid "You need to run this command from the toplevel of the working tree."
21888msgstr "您需要在工作区的顶级目录中运行这个命令。"
21889
d46c5519 21890#: git-sh-setup.sh:378
5c57d762
JX
21891msgid "Unable to determine absolute path of git directory"
21892msgstr "不能确定 git 目录的绝对路径"
a0b6b246 21893
1a79b2f1 21894#. TRANSLATORS: you can adjust this to align "git add -i" status menu
a4f16749 21895#: git-add--interactive.perl:196
1a79b2f1
JX
21896#, perl-format
21897msgid "%12s %12s %s"
21898msgstr "%12s %12s %s"
21899
a4f16749 21900#: git-add--interactive.perl:197
1a79b2f1
JX
21901msgid "staged"
21902msgstr "缓存"
21903
a4f16749 21904#: git-add--interactive.perl:197
1a79b2f1
JX
21905msgid "unstaged"
21906msgstr "未缓存"
21907
fd8cb379 21908#: git-add--interactive.perl:253 git-add--interactive.perl:278
1a79b2f1
JX
21909msgid "binary"
21910msgstr "二进制"
21911
fd8cb379 21912#: git-add--interactive.perl:262 git-add--interactive.perl:316
1a79b2f1
JX
21913msgid "nothing"
21914msgstr "无"
21915
fd8cb379 21916#: git-add--interactive.perl:298 git-add--interactive.perl:313
1a79b2f1
JX
21917msgid "unchanged"
21918msgstr "没有修改"
21919
fd8cb379 21920#: git-add--interactive.perl:609
1a79b2f1
JX
21921#, perl-format
21922msgid "added %d path\n"
21923msgid_plural "added %d paths\n"
21924msgstr[0] "增加了 %d 个路径\n"
21925msgstr[1] "增加了 %d 个路径\n"
21926
fd8cb379 21927#: git-add--interactive.perl:612
1a79b2f1
JX
21928#, perl-format
21929msgid "updated %d path\n"
21930msgid_plural "updated %d paths\n"
21931msgstr[0] "更新了 %d 个路径\n"
21932msgstr[1] "更新了 %d 个路径\n"
21933
fd8cb379 21934#: git-add--interactive.perl:615
1a79b2f1
JX
21935#, perl-format
21936msgid "reverted %d path\n"
21937msgid_plural "reverted %d paths\n"
21938msgstr[0] "还原了 %d 个路径\n"
21939msgstr[1] "还原了 %d 个路径\n"
21940
fd8cb379 21941#: git-add--interactive.perl:618
1a79b2f1
JX
21942#, perl-format
21943msgid "touched %d path\n"
21944msgid_plural "touched %d paths\n"
21945msgstr[0] "触碰了 %d 个路径\n"
21946msgstr[1] "触碰了 %d 个路径\n"
21947
fd8cb379 21948#: git-add--interactive.perl:627
1a79b2f1
JX
21949msgid "Update"
21950msgstr "更新"
21951
fd8cb379 21952#: git-add--interactive.perl:639
1a79b2f1
JX
21953msgid "Revert"
21954msgstr "还原"
21955
fd8cb379 21956#: git-add--interactive.perl:662
1a79b2f1
JX
21957#, perl-format
21958msgid "note: %s is untracked now.\n"
21959msgstr "说明:%s 现已成为未跟踪的。\n"
21960
fd8cb379 21961#: git-add--interactive.perl:673
1a79b2f1
JX
21962msgid "Add untracked"
21963msgstr "添加未跟踪的"
21964
fd8cb379 21965#: git-add--interactive.perl:679
1a79b2f1
JX
21966msgid "No untracked files.\n"
21967msgstr "没有未跟踪的文件。\n"
21968
fd8cb379 21969#: git-add--interactive.perl:1033
1a79b2f1
JX
21970msgid ""
21971"If the patch applies cleanly, the edited hunk will immediately be\n"
21972"marked for staging."
21973msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
21974
fd8cb379 21975#: git-add--interactive.perl:1036
1a79b2f1
JX
21976msgid ""
21977"If the patch applies cleanly, the edited hunk will immediately be\n"
21978"marked for stashing."
a4f16749 21979msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。"
1a79b2f1 21980
fd8cb379 21981#: git-add--interactive.perl:1039
1a79b2f1
JX
21982msgid ""
21983"If the patch applies cleanly, the edited hunk will immediately be\n"
21984"marked for unstaging."
21985msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
21986
fd8cb379 21987#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
1a79b2f1
JX
21988msgid ""
21989"If the patch applies cleanly, the edited hunk will immediately be\n"
21990"marked for applying."
21991msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
21992
fd8cb379 21993#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
1a79b2f1
JX
21994msgid ""
21995"If the patch applies cleanly, the edited hunk will immediately be\n"
21996"marked for discarding."
21997msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
21998
fd8cb379 21999#: git-add--interactive.perl:1085
1a79b2f1
JX
22000#, perl-format
22001msgid "failed to open hunk edit file for writing: %s"
c1ac5258 22002msgstr "为写入打开块编辑文件失败:%s"
1a79b2f1 22003
fd8cb379 22004#: git-add--interactive.perl:1086
1a79b2f1
JX
22005msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
22006msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
22007
fd8cb379 22008#: git-add--interactive.perl:1092
1a79b2f1
JX
22009#, perl-format
22010msgid ""
22011"---\n"
22012"To remove '%s' lines, make them ' ' lines (context).\n"
22013"To remove '%s' lines, delete them.\n"
22014"Lines starting with %s will be removed.\n"
22015msgstr ""
22016"---\n"
22017"要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
22018"要删除 '%s' 开始的行,删除它们。\n"
22019"以 %s 开始的行将被删除。\n"
22020
22021#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
fd8cb379 22022#: git-add--interactive.perl:1100
1a79b2f1
JX
22023msgid ""
22024"If it does not apply cleanly, you will be given an opportunity to\n"
22025"edit again. If all lines of the hunk are removed, then the edit is\n"
22026"aborted and the hunk is left unchanged.\n"
22027msgstr ""
22028"如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
22029"此次编辑被终止,该块不会被修改。\n"
22030
fd8cb379 22031#: git-add--interactive.perl:1114
1a79b2f1
JX
22032#, perl-format
22033msgid "failed to open hunk edit file for reading: %s"
22034msgstr "无法读取块编辑文件:%s"
22035
22036#. TRANSLATORS: do not translate [y/n]
22037#. The program will only accept that input
22038#. at this point.
22039#. Consider translating (saying "no" discards!) as
22040#. (saying "n" for "no" discards!) if the translation
22041#. of the word "no" does not start with n.
fd8cb379 22042#: git-add--interactive.perl:1213
1a79b2f1
JX
22043msgid ""
22044"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
22045msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
22046
fd8cb379 22047#: git-add--interactive.perl:1222
1a79b2f1
JX
22048msgid ""
22049"y - stage this hunk\n"
22050"n - do not stage this hunk\n"
22051"q - quit; do not stage this hunk or any of the remaining ones\n"
22052"a - stage this hunk and all later hunks in the file\n"
22053"d - do not stage this hunk or any of the later hunks in the file"
22054msgstr ""
22055"y - 暂存该块\n"
22056"n - 不要暂存该块\n"
22057"q - 退出。不暂存该块及后面的全部块\n"
22058"a - 暂存该块和本文件中后面的全部块\n"
22059"d - 不暂存该块和本文件中后面的全部块"
22060
fd8cb379 22061#: git-add--interactive.perl:1228
1a79b2f1
JX
22062msgid ""
22063"y - stash this hunk\n"
22064"n - do not stash this hunk\n"
22065"q - quit; do not stash this hunk or any of the remaining ones\n"
22066"a - stash this hunk and all later hunks in the file\n"
22067"d - do not stash this hunk or any of the later hunks in the file"
22068msgstr ""
22069"y - 贮藏该块\n"
22070"n - 不要贮藏该块\n"
22071"q - 退出。不贮藏该块及后面的全部块\n"
22072"a - 贮藏该块和本文件中后面的全部块\n"
22073"d - 不贮藏该块和本文件中后面的全部块"
22074
fd8cb379 22075#: git-add--interactive.perl:1234
1a79b2f1
JX
22076msgid ""
22077"y - unstage this hunk\n"
22078"n - do not unstage this hunk\n"
22079"q - quit; do not unstage this hunk or any of the remaining ones\n"
22080"a - unstage this hunk and all later hunks in the file\n"
22081"d - do not unstage this hunk or any of the later hunks in the file"
22082msgstr ""
22083"y - 不暂存该块\n"
22084"n - 不要不暂存该块\n"
22085"q - 退出。不要不暂存该块及后面的全部块\n"
22086"a - 不暂存该块和本文件中后面的全部块\n"
22087"d - 不要不暂存该块和本文件中后面的全部块"
22088
fd8cb379 22089#: git-add--interactive.perl:1240
1a79b2f1
JX
22090msgid ""
22091"y - apply this hunk to index\n"
22092"n - do not apply this hunk to index\n"
22093"q - quit; do not apply this hunk or any of the remaining ones\n"
22094"a - apply this hunk and all later hunks in the file\n"
22095"d - do not apply this hunk or any of the later hunks in the file"
22096msgstr ""
22097"y - 在索引中应用该块\n"
22098"n - 不要在索引中应用该块\n"
22099"q - 退出。不要应用该块及后面的全部块\n"
22100"a - 应用该块和本文件中后面的全部块\n"
22101"d - 不要应用该块和本文件中后面的全部块"
22102
fd8cb379 22103#: git-add--interactive.perl:1246
1a79b2f1
JX
22104msgid ""
22105"y - discard this hunk from worktree\n"
22106"n - do not discard this hunk from worktree\n"
22107"q - quit; do not discard this hunk or any of the remaining ones\n"
22108"a - discard this hunk and all later hunks in the file\n"
22109"d - do not discard this hunk or any of the later hunks in the file"
22110msgstr ""
22111"y - 在工作区中丢弃该块\n"
22112"n - 不要在工作区中丢弃该块\n"
22113"q - 退出。不要丢弃该块及后面的全部块\n"
22114"a - 丢弃该块和本文件中后面的全部块\n"
22115"d - 不要丢弃该块和本文件中后面的全部块"
22116
fd8cb379 22117#: git-add--interactive.perl:1252
1a79b2f1
JX
22118msgid ""
22119"y - discard this hunk from index and worktree\n"
22120"n - do not discard this hunk from index and worktree\n"
22121"q - quit; do not discard this hunk or any of the remaining ones\n"
22122"a - discard this hunk and all later hunks in the file\n"
22123"d - do not discard this hunk or any of the later hunks in the file"
22124msgstr ""
22125"y - 在索引和工作区中丢弃该块\n"
22126"n - 不要在索引和工作区中丢弃该块\n"
22127"q - 退出。不要丢弃该块及后面的全部块\n"
22128"a - 丢弃该块和本文件中后面的全部块\n"
22129"d - 不要丢弃该块和本文件中后面的全部块"
22130
fd8cb379 22131#: git-add--interactive.perl:1258
1a79b2f1
JX
22132msgid ""
22133"y - apply this hunk to index and worktree\n"
22134"n - do not apply this hunk to index and worktree\n"
22135"q - quit; do not apply this hunk or any of the remaining ones\n"
22136"a - apply this hunk and all later hunks in the file\n"
22137"d - do not apply this hunk or any of the later hunks in the file"
22138msgstr ""
22139"y - 在索引和工作区中应用该块\n"
22140"n - 不要在索引和工作区中应用该块\n"
22141"q - 退出。不要应用该块及后面的全部块\n"
22142"a - 应用该块和本文件中后面的全部块\n"
22143"d - 不要应用该块和本文件中后面的全部块"
22144
fd8cb379 22145#: git-add--interactive.perl:1273
1a79b2f1
JX
22146msgid ""
22147"g - select a hunk to go to\n"
22148"/ - search for a hunk matching the given regex\n"
22149"j - leave this hunk undecided, see next undecided hunk\n"
22150"J - leave this hunk undecided, see next hunk\n"
22151"k - leave this hunk undecided, see previous undecided hunk\n"
22152"K - leave this hunk undecided, see previous hunk\n"
22153"s - split the current hunk into smaller hunks\n"
22154"e - manually edit the current hunk\n"
22155"? - print help\n"
22156msgstr ""
22157"g - 选择跳转到一个块\n"
22158"/ - 查找和给定正则表达式匹配的块\n"
22159"j - 维持该块未决状态,查看下一个未决块\n"
22160"J - 维持该块未决状态,查看下一个块\n"
22161"k - 维持该块未决状态,查看上一个未决块\n"
22162"K - 维持该块未决状态,查看上一个块\n"
22163"s - 拆分当前块为更小的块\n"
22164"e - 手动编辑当前块\n"
22165"? - 显示帮助\n"
22166
fd8cb379 22167#: git-add--interactive.perl:1304
1a79b2f1
JX
22168msgid "The selected hunks do not apply to the index!\n"
22169msgstr "选中的块不能应用到索引!\n"
22170
fd8cb379 22171#: git-add--interactive.perl:1305
1a79b2f1
JX
22172msgid "Apply them to the worktree anyway? "
22173msgstr "无论如何都要应用到工作区么?"
22174
fd8cb379 22175#: git-add--interactive.perl:1308
1a79b2f1
JX
22176msgid "Nothing was applied.\n"
22177msgstr "未应用。\n"
22178
fd8cb379 22179#: git-add--interactive.perl:1319
1a79b2f1
JX
22180#, perl-format
22181msgid "ignoring unmerged: %s\n"
22182msgstr "忽略未合入的:%s\n"
22183
fd8cb379 22184#: git-add--interactive.perl:1328
1a79b2f1
JX
22185msgid "Only binary files changed.\n"
22186msgstr "只有二进制文件被修改。\n"
22187
fd8cb379 22188#: git-add--interactive.perl:1330
1a79b2f1
JX
22189msgid "No changes.\n"
22190msgstr "没有修改。\n"
22191
fd8cb379 22192#: git-add--interactive.perl:1338
1a79b2f1
JX
22193msgid "Patch update"
22194msgstr "补丁更新"
22195
fd8cb379 22196#: git-add--interactive.perl:1390
1a79b2f1 22197#, perl-format
31e5e17b
JX
22198msgid "Stage mode change [y,n,q,a,d%s,?]? "
22199msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 22200
fd8cb379 22201#: git-add--interactive.perl:1391
1a79b2f1 22202#, perl-format
31e5e17b
JX
22203msgid "Stage deletion [y,n,q,a,d%s,?]? "
22204msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
1a79b2f1 22205
fd8cb379 22206#: git-add--interactive.perl:1392
1a79b2f1 22207#, perl-format
31e5e17b
JX
22208msgid "Stage this hunk [y,n,q,a,d%s,?]? "
22209msgstr "暂存该块 [y,n,q,a,d%s,?]? "
1a79b2f1 22210
fd8cb379 22211#: git-add--interactive.perl:1395
1a79b2f1 22212#, perl-format
31e5e17b
JX
22213msgid "Stash mode change [y,n,q,a,d%s,?]? "
22214msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 22215
fd8cb379 22216#: git-add--interactive.perl:1396
1a79b2f1 22217#, perl-format
31e5e17b
JX
22218msgid "Stash deletion [y,n,q,a,d%s,?]? "
22219msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
1a79b2f1 22220
fd8cb379 22221#: git-add--interactive.perl:1397
1a79b2f1 22222#, perl-format
31e5e17b
JX
22223msgid "Stash this hunk [y,n,q,a,d%s,?]? "
22224msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
1a79b2f1 22225
fd8cb379 22226#: git-add--interactive.perl:1400
1a79b2f1 22227#, perl-format
31e5e17b
JX
22228msgid "Unstage mode change [y,n,q,a,d%s,?]? "
22229msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 22230
fd8cb379 22231#: git-add--interactive.perl:1401
1a79b2f1 22232#, perl-format
31e5e17b
JX
22233msgid "Unstage deletion [y,n,q,a,d%s,?]? "
22234msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
1a79b2f1 22235
fd8cb379 22236#: git-add--interactive.perl:1402
1a79b2f1 22237#, perl-format
31e5e17b
JX
22238msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
22239msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
1a79b2f1 22240
fd8cb379 22241#: git-add--interactive.perl:1405
1a79b2f1 22242#, perl-format
31e5e17b
JX
22243msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
22244msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
1a79b2f1 22245
fd8cb379 22246#: git-add--interactive.perl:1406
1a79b2f1 22247#, perl-format
31e5e17b
JX
22248msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
22249msgstr "将删除应用到索引 [y,n,q,a,d%s,?]? "
1a79b2f1 22250
fd8cb379 22251#: git-add--interactive.perl:1407
1a79b2f1 22252#, perl-format
31e5e17b 22253msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
610f8099 22254msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
1a79b2f1 22255
fd8cb379 22256#: git-add--interactive.perl:1410
1a79b2f1 22257#, perl-format
31e5e17b
JX
22258msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
22259msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 22260
fd8cb379 22261#: git-add--interactive.perl:1411
1a79b2f1 22262#, perl-format
31e5e17b
JX
22263msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
22264msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
1a79b2f1 22265
fd8cb379 22266#: git-add--interactive.perl:1412
1a79b2f1 22267#, perl-format
31e5e17b
JX
22268msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
22269msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
1a79b2f1 22270
fd8cb379 22271#: git-add--interactive.perl:1415
1a79b2f1 22272#, perl-format
31e5e17b
JX
22273msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
22274msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 22275
fd8cb379 22276#: git-add--interactive.perl:1416
1a79b2f1 22277#, perl-format
31e5e17b
JX
22278msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
22279msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? "
1a79b2f1 22280
fd8cb379 22281#: git-add--interactive.perl:1417
1a79b2f1 22282#, perl-format
31e5e17b
JX
22283msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
22284msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
1a79b2f1 22285
fd8cb379 22286#: git-add--interactive.perl:1420
1a79b2f1 22287#, perl-format
31e5e17b
JX
22288msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
22289msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
1a79b2f1 22290
fd8cb379 22291#: git-add--interactive.perl:1421
1a79b2f1 22292#, perl-format
31e5e17b
JX
22293msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
22294msgstr "将删除应用到索引和工作区 [y,n,q,a,d%s,?]? "
1a79b2f1 22295
fd8cb379 22296#: git-add--interactive.perl:1422
1a79b2f1 22297#, perl-format
31e5e17b
JX
22298msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
22299msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
22300
fd8cb379 22301#: git-add--interactive.perl:1522
31e5e17b
JX
22302msgid "No other hunks to goto\n"
22303msgstr "没有其它可供跳转的块\n"
1a79b2f1 22304
fd8cb379 22305#: git-add--interactive.perl:1529
1a79b2f1
JX
22306msgid "go to which hunk (<ret> to see more)? "
22307msgstr "跳转到哪个块(<回车> 查看更多)? "
22308
fd8cb379 22309#: git-add--interactive.perl:1531
1a79b2f1
JX
22310msgid "go to which hunk? "
22311msgstr "跳转到哪个块?"
22312
fd8cb379 22313#: git-add--interactive.perl:1540
1a79b2f1
JX
22314#, perl-format
22315msgid "Invalid number: '%s'\n"
22316msgstr "无效数字:'%s'\n"
22317
fd8cb379 22318#: git-add--interactive.perl:1545
1a79b2f1
JX
22319#, perl-format
22320msgid "Sorry, only %d hunk available.\n"
22321msgid_plural "Sorry, only %d hunks available.\n"
22322msgstr[0] "对不起,只有 %d 个可用块。\n"
22323msgstr[1] "对不起,只有 %d 个可用块。\n"
22324
fd8cb379 22325#: git-add--interactive.perl:1571
31e5e17b
JX
22326msgid "No other hunks to search\n"
22327msgstr "没有其它可供查找的块\n"
22328
fd8cb379 22329#: git-add--interactive.perl:1575
1a79b2f1
JX
22330msgid "search for regex? "
22331msgstr "使用正则表达式搜索?"
22332
fd8cb379 22333#: git-add--interactive.perl:1588
1a79b2f1
JX
22334#, perl-format
22335msgid "Malformed search regexp %s: %s\n"
22336msgstr "错误的正则表达式 %s:%s\n"
22337
fd8cb379 22338#: git-add--interactive.perl:1598
1a79b2f1
JX
22339msgid "No hunk matches the given pattern\n"
22340msgstr "没有和给定模式相匹配的快\n"
22341
fd8cb379 22342#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
1a79b2f1
JX
22343msgid "No previous hunk\n"
22344msgstr "没有前一个块\n"
22345
fd8cb379 22346#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
1a79b2f1
JX
22347msgid "No next hunk\n"
22348msgstr "没有下一个块\n"
22349
fd8cb379 22350#: git-add--interactive.perl:1644
31e5e17b
JX
22351msgid "Sorry, cannot split this hunk\n"
22352msgstr "对不起,不能拆分这个块\n"
22353
fd8cb379 22354#: git-add--interactive.perl:1650
1a79b2f1
JX
22355#, perl-format
22356msgid "Split into %d hunk.\n"
22357msgid_plural "Split into %d hunks.\n"
22358msgstr[0] "拆分为 %d 块。\n"
22359msgstr[1] "拆分为 %d 块。\n"
22360
fd8cb379 22361#: git-add--interactive.perl:1660
31e5e17b
JX
22362msgid "Sorry, cannot edit this hunk\n"
22363msgstr "对不起,不能编辑这个块\n"
22364
fd8cb379 22365#: git-add--interactive.perl:1706
1a79b2f1
JX
22366msgid "Review diff"
22367msgstr "检视 diff"
22368
22369#. TRANSLATORS: please do not translate the command names
22370#. 'status', 'update', 'revert', etc.
fd8cb379 22371#: git-add--interactive.perl:1725
1a79b2f1
JX
22372msgid ""
22373"status - show paths with changes\n"
22374"update - add working tree state to the staged set of changes\n"
22375"revert - revert staged set of changes back to the HEAD version\n"
22376"patch - pick hunks and update selectively\n"
87cb7997 22377"diff - view diff between HEAD and index\n"
1a79b2f1
JX
22378"add untracked - add contents of untracked files to the staged set of "
22379"changes\n"
22380msgstr ""
22381"status - 显示含变更的路径\n"
22382"update - 添加工作区状态至暂存列表\n"
22383"revert - 还原修改的暂存集至 HEAD 版本\n"
22384"patch - 挑选块并且有选择地更新\n"
22385"diff - 显示 HEAD 和索引间差异\n"
22386"add untracked - 添加未跟踪文件的内容至暂存列表\n"
22387
fd8cb379
JX
22388#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
22389#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
22390#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
1a79b2f1
JX
22391msgid "missing --"
22392msgstr "缺失 --"
22393
fd8cb379 22394#: git-add--interactive.perl:1763
1a79b2f1
JX
22395#, perl-format
22396msgid "unknown --patch mode: %s"
22397msgstr "未知的 --patch 模式:%s"
22398
fd8cb379 22399#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
1a79b2f1
JX
22400#, perl-format
22401msgid "invalid argument %s, expecting --"
22402msgstr "无效的参数 %s,期望是 --"
22403
4c27fcb5 22404#: git-send-email.perl:138
1a79b2f1
JX
22405msgid "local zone differs from GMT by a non-minute interval\n"
22406msgstr "本地时间和 GMT 有不到一分钟间隔\n"
22407
4c27fcb5 22408#: git-send-email.perl:145 git-send-email.perl:151
1a79b2f1
JX
22409msgid "local time offset greater than or equal to 24 hours\n"
22410msgstr "本地时间偏移量大于等于 24 小时\n"
22411
4c27fcb5 22412#: git-send-email.perl:219 git-send-email.perl:225
1a79b2f1
JX
22413msgid "the editor exited uncleanly, aborting everything"
22414msgstr "编辑器非正常退出,终止所有操作"
22415
4c27fcb5 22416#: git-send-email.perl:302
1a79b2f1
JX
22417#, perl-format
22418msgid ""
22419"'%s' contains an intermediate version of the email you were composing.\n"
22420msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
22421
4c27fcb5 22422#: git-send-email.perl:307
1a79b2f1
JX
22423#, perl-format
22424msgid "'%s.final' contains the composed email.\n"
22425msgstr "'%s.final' 包含编辑的邮件。\n"
22426
4c27fcb5 22427#: git-send-email.perl:326
1a79b2f1
JX
22428msgid "--dump-aliases incompatible with other options\n"
22429msgstr "--dump-aliases 和其它选项不兼容\n"
22430
d46c5519 22431#: git-send-email.perl:395 git-send-email.perl:656
1a79b2f1
JX
22432msgid "Cannot run git format-patch from outside a repository\n"
22433msgstr "不能在仓库之外运行 git format-patch\n"
22434
4c27fcb5 22435#: git-send-email.perl:398
31e5e17b
JX
22436msgid ""
22437"`batch-size` and `relogin` must be specified together (via command-line or "
22438"configuration option)\n"
22439msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n"
22440
d46c5519 22441#: git-send-email.perl:470
1a79b2f1
JX
22442#, perl-format
22443msgid "Unknown --suppress-cc field: '%s'\n"
22444msgstr "未知的 --suppress-cc 字段:'%s'\n"
22445
d46c5519 22446#: git-send-email.perl:501
1a79b2f1
JX
22447#, perl-format
22448msgid "Unknown --confirm setting: '%s'\n"
22449msgstr "未知的 --confirm 设置:'%s'\n"
22450
d46c5519 22451#: git-send-email.perl:529
1a79b2f1
JX
22452#, perl-format
22453msgid "warning: sendmail alias with quotes is not supported: %s\n"
22454msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
22455
d46c5519 22456#: git-send-email.perl:531
1a79b2f1
JX
22457#, perl-format
22458msgid "warning: `:include:` not supported: %s\n"
22459msgstr "警告:不支持 `:include:`:%s\n"
22460
d46c5519 22461#: git-send-email.perl:533
1a79b2f1
JX
22462#, perl-format
22463msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
22464msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
22465
d46c5519 22466#: git-send-email.perl:538
1a79b2f1
JX
22467#, perl-format
22468msgid "warning: sendmail line is not recognized: %s\n"
22469msgstr "警告:不能识别的 sendmail 行:%s\n"
22470
d46c5519 22471#: git-send-email.perl:622
1a79b2f1
JX
22472#, perl-format
22473msgid ""
22474"File '%s' exists but it could also be the range of commits\n"
22475"to produce patches for. Please disambiguate by...\n"
22476"\n"
22477" * Saying \"./%s\" if you mean a file; or\n"
22478" * Giving --format-patch option if you mean a range.\n"
22479msgstr ""
87cb7997
JX
22480"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
22481"歧义:\n"
1a79b2f1
JX
22482"\n"
22483" * 如果含义为一个文件,使用 \"./%s\",或者\n"
22484" * 如果含义为一个范围,使用 --format-patch 选项。\n"
22485
d46c5519 22486#: git-send-email.perl:643
1a79b2f1
JX
22487#, perl-format
22488msgid "Failed to opendir %s: %s"
22489msgstr "无法打开目录 %s: %s"
22490
d46c5519 22491#: git-send-email.perl:667
1a79b2f1
JX
22492#, perl-format
22493msgid ""
22494"fatal: %s: %s\n"
22495"warning: no patches were sent\n"
22496msgstr ""
06991777 22497"致命错误:%s:%s\n"
1a79b2f1
JX
22498"警告:补丁未能发送\n"
22499
d46c5519 22500#: git-send-email.perl:678
1a79b2f1
JX
22501msgid ""
22502"\n"
22503"No patch files specified!\n"
22504"\n"
87cb7997
JX
22505msgstr ""
22506"\n"
22507"未指定补丁文件!\n"
22508"\n"
1a79b2f1 22509
d46c5519 22510#: git-send-email.perl:691
1a79b2f1
JX
22511#, perl-format
22512msgid "No subject line in %s?"
22513msgstr "在 %s 中没有标题行?"
22514
d46c5519 22515#: git-send-email.perl:701
1a79b2f1
JX
22516#, perl-format
22517msgid "Failed to open for writing %s: %s"
c1ac5258 22518msgstr "为写入打开 %s 失败: %s"
1a79b2f1 22519
d46c5519 22520#: git-send-email.perl:712
1a79b2f1
JX
22521msgid ""
22522"Lines beginning in \"GIT:\" will be removed.\n"
22523"Consider including an overall diffstat or table of contents\n"
22524"for the patch you are writing.\n"
22525"\n"
22526"Clear the body content if you don't wish to send a summary.\n"
22527msgstr ""
22528"以 \"GIT:\" 开头的行将被删除。\n"
22529"考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n"
22530"\n"
22531"如果您不想发送摘要,清除内容。\n"
22532
d46c5519 22533#: git-send-email.perl:736
1a79b2f1
JX
22534#, perl-format
22535msgid "Failed to open %s: %s"
22536msgstr "无法打开 %s: %s"
22537
d46c5519 22538#: git-send-email.perl:753
31e5e17b
JX
22539#, perl-format
22540msgid "Failed to open %s.final: %s"
22541msgstr "无法打开 %s.final: %s"
1a79b2f1 22542
d46c5519 22543#: git-send-email.perl:796
1a79b2f1
JX
22544msgid "Summary email is empty, skipping it\n"
22545msgstr "摘要邮件为空,跳过\n"
22546
22547#. TRANSLATORS: please keep [y/N] as is.
d46c5519 22548#: git-send-email.perl:831
1a79b2f1
JX
22549#, perl-format
22550msgid "Are you sure you want to use <%s> [y/N]? "
22551msgstr "您确认要使用 <%s> [y/N]?"
22552
d46c5519 22553#: git-send-email.perl:886
1a79b2f1
JX
22554msgid ""
22555"The following files are 8bit, but do not declare a Content-Transfer-"
22556"Encoding.\n"
22557msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
22558
d46c5519 22559#: git-send-email.perl:891
1a79b2f1
JX
22560msgid "Which 8bit encoding should I declare [UTF-8]? "
22561msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?"
22562
d46c5519 22563#: git-send-email.perl:899
1a79b2f1
JX
22564#, perl-format
22565msgid ""
22566"Refusing to send because the patch\n"
22567"\t%s\n"
22568"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
22569"want to send.\n"
22570msgstr ""
22571"拒绝发送,因为补丁\n"
22572"\t%s\n"
22573"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
22574
d46c5519 22575#: git-send-email.perl:918
1a79b2f1
JX
22576msgid "To whom should the emails be sent (if anyone)?"
22577msgstr "邮件将要发送给谁?"
22578
d46c5519 22579#: git-send-email.perl:936
1a79b2f1
JX
22580#, perl-format
22581msgid "fatal: alias '%s' expands to itself\n"
06991777 22582msgstr "致命错误:别名 '%s' 扩展为它自己\n"
1a79b2f1 22583
d46c5519 22584#: git-send-email.perl:948
1a79b2f1
JX
22585msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
22586msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?"
22587
d46c5519 22588#: git-send-email.perl:1006 git-send-email.perl:1014
1a79b2f1
JX
22589#, perl-format
22590msgid "error: unable to extract a valid address from: %s\n"
22591msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
22592
22593#. TRANSLATORS: Make sure to include [q] [d] [e] in your
22594#. translation. The program will only accept English input
22595#. at this point.
d46c5519 22596#: git-send-email.perl:1018
1a79b2f1
JX
22597msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
22598msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):"
22599
d46c5519 22600#: git-send-email.perl:1335
1a79b2f1
JX
22601#, perl-format
22602msgid "CA path \"%s\" does not exist"
22603msgstr "CA 路径 \"%s\" 不存在"
22604
d46c5519 22605#: git-send-email.perl:1418
1a79b2f1
JX
22606msgid ""
22607" The Cc list above has been expanded by additional\n"
22608" addresses found in the patch commit message. By default\n"
22609" send-email prompts before sending whenever this occurs.\n"
22610" This behavior is controlled by the sendemail.confirm\n"
22611" configuration setting.\n"
22612"\n"
22613" For additional information, run 'git send-email --help'.\n"
22614" To retain the current behavior, but squelch this message,\n"
22615" run 'git config --global sendemail.confirm auto'.\n"
22616"\n"
22617msgstr ""
22618" 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n"
22619" 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
22620" sendemail.confirm 配置设置。\n"
22621"\n"
22622" 更多信息,执行 'git send-email --help'。\n"
22623" 要保持当前行为,但不显示此信息,运行 'git config --global\n"
22624" sendemail.confirm auto'。\n"
22625"\n"
22626
fd8cb379 22627#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
1a79b2f1
JX
22628#. translation. The program will only accept English input
22629#. at this point.
d46c5519 22630#: git-send-email.perl:1433
fd8cb379
JX
22631msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
22632msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
1a79b2f1 22633
d46c5519 22634#: git-send-email.perl:1436
1a79b2f1
JX
22635msgid "Send this email reply required"
22636msgstr "发送要求的邮件回复"
22637
d46c5519 22638#: git-send-email.perl:1464
1a79b2f1
JX
22639msgid "The required SMTP server is not properly defined."
22640msgstr "要求的 SMTP 服务器未被正确定义。"
22641
d46c5519 22642#: git-send-email.perl:1511
1a79b2f1
JX
22643#, perl-format
22644msgid "Server does not support STARTTLS! %s"
22645msgstr "服务器不支持 STARTTLS!%s"
22646
d46c5519 22647#: git-send-email.perl:1516 git-send-email.perl:1520
a4f16749
JX
22648#, perl-format
22649msgid "STARTTLS failed! %s"
22650msgstr "STARTTLS 失败!%s"
22651
d46c5519 22652#: git-send-email.perl:1529
1a79b2f1
JX
22653msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
22654msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
22655
d46c5519 22656#: git-send-email.perl:1547
1a79b2f1
JX
22657#, perl-format
22658msgid "Failed to send %s\n"
22659msgstr "无法发送 %s\n"
22660
d46c5519 22661#: git-send-email.perl:1550
1a79b2f1
JX
22662#, perl-format
22663msgid "Dry-Sent %s\n"
22664msgstr "演习发送 %s\n"
22665
d46c5519 22666#: git-send-email.perl:1550
1a79b2f1
JX
22667#, perl-format
22668msgid "Sent %s\n"
22669msgstr "正发送 %s\n"
22670
d46c5519 22671#: git-send-email.perl:1552
1a79b2f1
JX
22672msgid "Dry-OK. Log says:\n"
22673msgstr "演习成功。日志说:\n"
22674
d46c5519 22675#: git-send-email.perl:1552
1a79b2f1
JX
22676msgid "OK. Log says:\n"
22677msgstr "OK。日志说:\n"
22678
d46c5519 22679#: git-send-email.perl:1564
1a79b2f1
JX
22680msgid "Result: "
22681msgstr "结果:"
22682
d46c5519 22683#: git-send-email.perl:1567
1a79b2f1
JX
22684msgid "Result: OK\n"
22685msgstr "结果:OK\n"
22686
d46c5519 22687#: git-send-email.perl:1585
1a79b2f1
JX
22688#, perl-format
22689msgid "can't open file %s"
22690msgstr "无法打开文件 %s"
22691
d46c5519 22692#: git-send-email.perl:1632 git-send-email.perl:1652
1a79b2f1
JX
22693#, perl-format
22694msgid "(mbox) Adding cc: %s from line '%s'\n"
22695msgstr "(mbox) 添加 cc:%s 自行 '%s'\n"
22696
d46c5519 22697#: git-send-email.perl:1638
1a79b2f1
JX
22698#, perl-format
22699msgid "(mbox) Adding to: %s from line '%s'\n"
22700msgstr "(mbox) 添加 to:%s 自行 '%s'\n"
22701
d46c5519 22702#: git-send-email.perl:1691
1a79b2f1
JX
22703#, perl-format
22704msgid "(non-mbox) Adding cc: %s from line '%s'\n"
22705msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n"
22706
d46c5519 22707#: git-send-email.perl:1726
1a79b2f1
JX
22708#, perl-format
22709msgid "(body) Adding cc: %s from line '%s'\n"
22710msgstr "(body) 添加 cc: %s 自行 '%s'\n"
22711
d46c5519 22712#: git-send-email.perl:1837
1a79b2f1
JX
22713#, perl-format
22714msgid "(%s) Could not execute '%s'"
22715msgstr "(%s) 不能执行 '%s'"
22716
d46c5519 22717#: git-send-email.perl:1844
1a79b2f1
JX
22718#, perl-format
22719msgid "(%s) Adding %s: %s from: '%s'\n"
22720msgstr "(%s) 添加 %s: %s 自:'%s'\n"
22721
d46c5519 22722#: git-send-email.perl:1848
1a79b2f1
JX
22723#, perl-format
22724msgid "(%s) failed to close pipe to '%s'"
22725msgstr "(%s) 无法关闭管道至 '%s'"
22726
d46c5519 22727#: git-send-email.perl:1878
1a79b2f1
JX
22728msgid "cannot send message as 7bit"
22729msgstr "不能以 7bit 形式发送信息"
22730
d46c5519 22731#: git-send-email.perl:1886
1a79b2f1
JX
22732msgid "invalid transfer encoding"
22733msgstr "无效的传送编码"
22734
d46c5519 22735#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989
1a79b2f1
JX
22736#, perl-format
22737msgid "unable to open %s: %s\n"
22738msgstr "不能打开 %s:%s\n"
22739
d46c5519 22740#: git-send-email.perl:1930
1a79b2f1
JX
22741#, perl-format
22742msgid "%s: patch contains a line longer than 998 characters"
22743msgstr "%s:补丁包含一个超过 998 字符的行"
22744
d46c5519 22745#: git-send-email.perl:1947
1a79b2f1
JX
22746#, perl-format
22747msgid "Skipping %s with backup suffix '%s'.\n"
22748msgstr "略过 %s 含备份后缀 '%s'。\n"
22749
22750#. TRANSLATORS: please keep "[y|N]" as is.
d46c5519 22751#: git-send-email.perl:1951
1a79b2f1
JX
22752#, perl-format
22753msgid "Do you really want to send %s? [y|N]: "
22754msgstr "您真的要发送 %s?[y|N]:"