]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
l10n: zh_CN: for git v2.21.0 l10n round 1~2
[thirdparty/git.git] / po / zh_CN.po
CommitLineData
c04f5ac3
JX
1# Chinese translations for Git package
2# Git 软件包的简体中文翻译.
07432cef 3# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
c04f5ac3 4# This file is distributed under the same license as the Git package.
814ff314 5# Contributors:
31e5e17b 6# - Fangyi Zhou <fangyi.zhou AT yuriko.moe>
c04f5ac3 7# - Jiang Xin <worldhello.net AT gmail.com>
bbdf0acc
JX
8# - Lian Cheng <rhythm.mail AT gmail.com>
9# - Ray Chen <oldsharp AT gmail.com>
c04f5ac3 10# - Riku <lu.riku AT gmail.com>
bbdf0acc
JX
11# - Thynson <lanxingcan AT gmail.com>
12# - ws3389 <willsmith3389 AT gmail.com>
13# - Wang Sheng <wangsheng2008love AT 163.com>
554e8501 14# - 依云 <lilydjwg AT gmail.com>
bbdf0acc 15# - Yichao Yu <yyc1992 AT gmail.com>
c04f5ac3 16# - Zhuang Ya <zhuangya AT me.com>
c04f5ac3 17#
160fb2b2
JX
18# Git glossary for Chinese translators
19#
20# English | Chinese
21# ---------------------------------+--------------------------------------
22# 3-way merge | 三方合并
23# abbreviate | 简写(的 SHA-1 值)
24# alternate object database | 备用对象库
25# amend | 修补
26# ancestor | 祖先,祖先提交
27# annotated tag | 附注标签
28# bare repository | 纯仓库
29# bisect | 二分查找
30# blob object | 数据对象
31# branch | 分支
32# bundle | 包
33# bypass | 绕过
34# cache | 索引(的别称)
35# chain | (提交)链
36# changeset | 变更集
37# checkout | 检出
38# checksum | 校验,校验和
39# cherry-picking | 拣选
40# clean | 干净(的工作区)
41# clone | 克隆
42# commit | 提交
667599e8 43# commit message | 提交说明
160fb2b2
JX
44# commit object | 提交对象
45# commit-ish (also committish) | 提交号
46# conflict | 冲突
47# core Git | 核心 Git 工具
48# DAG | 有向无环图
e640d114 49# dangling object | 悬空对象
160fb2b2
JX
50# detached HEAD | 分离头指针
51# directory | 目录
52# dirty | 脏(的工作区)
755c831b 53# dumb HTTP protocol | 哑 HTTP 协议
160fb2b2
JX
54# evil merge | 坏合并(合并引入了父提交没有的修改)
55# fast-forward | 快进
56# fetch | 获取
57# file system | 文件系统
e397e7e3 58# fork | 派生
160fb2b2
JX
59# Git archive | 仓库(对于 arch 用户)
60# gitfile | gitfile(仓库链接文件)
fd8cb379 61# grafts | (提交)移植
160fb2b2
JX
62# hash | 哈希值
63# HEAD | HEAD(头指针,亦即当前分支)
64# head | 头、分支
65# head ref | 分支
66# header | 头信息
67# hook | 钩子
68# hunk | 补丁片段
69# index | 索引
70# index entry | 索引条目
71# loose object | 松散对象
72# loose refs | 松散引用
73# master | master(默认分支名)
74# merge | 合并
75# object | 对象
76# object database | 对象库
77# object identifier | 对象标识符
78# object name | 对象名称
79# object type | 对象类型
80# octopus | 章鱼式合并(两分支以上的合并)
81# origin | origin(默认的远程名称)
82# pack | 包
83# pack index | 包索引
84# packfile | 包文件
85# parent | 父提交
86# patch | 补丁
87# pathspec | 路径规格
88# pattern | 模式
12e59059 89# pickaxe | 挖掘
160fb2b2
JX
90# plumbing | 管件(Git 底层核心命令的别称)
91# porcelain | 瓷件(Git 上层封装命令的别称)
94550ed3 92# precious-objects repo | 珍品仓库
160fb2b2
JX
93# prune | 清除
94# pull | 拉,拉取
95# push | 推,推送
96# reachable | 可达
97# rebase | 变基
98# ref | 引用
99# reflog | 引用日志
100# refspec | 引用规格
101# remote | 远程,远程仓库
102# remote-tracking branch | 远程跟踪分支
103# replay | 重放
104# repo | 仓库
105# repository | 仓库
106# resolve | (冲突)解决
107# revert | 还原
108# revision | 版本
109# rewind | 回退
110# SCM | 源代码管理(工具)
ee7589bb 111# SHA-1 | SHA-1(安全哈希算法1)
160fb2b2
JX
112# shallow repository | 浅(克隆)仓库
113# signed tag | 签名标签
755c831b 114# smart HTTP protocol | 智能 HTTP 协议
160fb2b2
JX
115# squash | 压缩
116# stage | n. 暂存区(即索引); v. 暂存
a4f16749 117# stash | n. 贮藏区; v. 贮藏
160fb2b2
JX
118# submodule | 子模组
119# symref | 符号引用
933c015e 120# tag | n. 标签; v. 打标签
160fb2b2
JX
121# tag object | 标签对象
122# tagger | 打标签者
123# topic branch | 主题分支
124# track | 跟踪
6937cb4e 125# trailer | 尾部署名
160fb2b2
JX
126# tree | 树(工作区或树对象)
127# tree object | 树对象
128# tree-ish (also treeish) | 树对象(或可以解析为一树对象)
129# unmerged index | 未合并索引
130# unpack | 解包
131# unreachable object | 不可达对象
132# unstage | 取消暂存
133# upstream | 上游
134# upstream branch | 上游分支
135# working tree | 工作区
136#
c04f5ac3
JX
137msgid ""
138msgstr ""
139"Project-Id-Version: Git\n"
140"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
06991777
JX
141"POT-Creation-Date: 2019-02-15 10:09+0800\n"
142"PO-Revision-Date: 2019-02-15 10:26+0800\n"
c04f5ac3 143"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
7aea43ff 144"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
c04f5ac3
JX
145"Language: zh_CN\n"
146"MIME-Version: 1.0\n"
147"Content-Type: text/plain; charset=UTF-8\n"
148"Content-Transfer-Encoding: 8bit\n"
5ae481e0 149"Plural-Forms: nplurals=2; plural=(n != 1);\n"
c04f5ac3 150
06991777 151#: advice.c:101
c04f5ac3 152#, c-format
fd8cb379
JX
153msgid "%shint: %.*s%s\n"
154msgstr "%s提示:%.*s%s\n"
c04f5ac3 155
06991777 156#: advice.c:154
5c57d762
JX
157msgid "Cherry-picking is not possible because you have unmerged files."
158msgstr "无法拣选,因为您有未合并的文件。"
159
06991777 160#: advice.c:156
5c57d762
JX
161msgid "Committing is not possible because you have unmerged files."
162msgstr "无法提交,因为您有未合并的文件。"
163
06991777 164#: advice.c:158
5c57d762
JX
165msgid "Merging is not possible because you have unmerged files."
166msgstr "无法合并,因为您有未合并的文件。"
167
06991777 168#: advice.c:160
5c57d762
JX
169msgid "Pulling is not possible because you have unmerged files."
170msgstr "无法拉取,因为您有未合并的文件。"
171
06991777 172#: advice.c:162
5c57d762
JX
173msgid "Reverting is not possible because you have unmerged files."
174msgstr "无法回退,因为您有未合并的文件。"
175
06991777 176#: advice.c:164
5c57d762
JX
177#, c-format
178msgid "It is not possible to %s because you have unmerged files."
179msgstr "无法 %s,因为您有未合并的文件。"
180
06991777 181#: advice.c:172
c04f5ac3 182msgid ""
6acbf033 183"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 184"as appropriate to mark resolution and make a commit."
c04f5ac3 185msgstr ""
d9d56b23 186"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
220c313c 187"解决方案并提交。"
c04f5ac3 188
06991777 189#: advice.c:180
5c57d762
JX
190msgid "Exiting because of an unresolved conflict."
191msgstr "因为存在未解决的冲突而退出。"
192
06991777 193#: advice.c:185 builtin/merge.c:1290
1b7f4a34
JX
194msgid "You have not concluded your merge (MERGE_HEAD exists)."
195msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
196
06991777 197#: advice.c:187
94550ed3 198msgid "Please, commit your changes before merging."
1b7f4a34
JX
199msgstr "请在合并前先提交您的修改。"
200
06991777 201#: advice.c:188
1b7f4a34
JX
202msgid "Exiting because of unfinished merge."
203msgstr "因为存在未完成的合并而退出。"
204
06991777 205#: advice.c:194
5c57d762
JX
206#, c-format
207msgid ""
208"Note: checking out '%s'.\n"
209"\n"
210"You are in 'detached HEAD' state. You can look around, make experimental\n"
211"changes and commit them, and you can discard any commits you make in this\n"
212"state without impacting any branches by performing another checkout.\n"
213"\n"
214"If you want to create a new branch to retain commits you create, you may\n"
215"do so (now or later) by using -b with the checkout command again. Example:\n"
216"\n"
217" git checkout -b <new-branch-name>\n"
218"\n"
219msgstr ""
220"注意:正在检出 '%s'。\n"
221"\n"
a0b6b246
JX
222"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另"
223"外\n"
5c57d762
JX
224"的检出分支操作丢弃在这个状态下所做的任何提交。\n"
225"\n"
226"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n"
227"参数 -b 来实现(现在或稍后)。例如:\n"
228"\n"
58b6f078 229" git checkout -b <新分支名>\n"
5c57d762
JX
230"\n"
231
06991777
JX
232#: alias.c:50
233msgid "cmdline ends with \\"
234msgstr "命令行以 \\ 结尾"
235
236#: alias.c:51
237msgid "unclosed quote"
238msgstr "未关闭的引号"
239
c1ac5258 240#: apply.c:59
a0b6b246
JX
241#, c-format
242msgid "unrecognized whitespace option '%s'"
243msgstr "未能识别的空白字符选项 '%s'"
ef317cd5 244
c1ac5258 245#: apply.c:75
90314792 246#, c-format
a0b6b246
JX
247msgid "unrecognized whitespace ignore option '%s'"
248msgstr "未能识别的空白字符忽略选项 '%s'"
90314792 249
c1ac5258 250#: apply.c:125
a0b6b246 251msgid "--reject and --3way cannot be used together."
2090d5b4 252msgstr "--reject 和 --3way 不能同时使用。"
ef317cd5 253
c1ac5258 254#: apply.c:127
a0b6b246
JX
255msgid "--cached and --3way cannot be used together."
256msgstr "--cached 和 --3way 不能同时使用。"
ef317cd5 257
c1ac5258 258#: apply.c:130
a0b6b246
JX
259msgid "--3way outside a repository"
260msgstr "--3way 在一个仓库之外"
ef317cd5 261
c1ac5258 262#: apply.c:141
a0b6b246
JX
263msgid "--index outside a repository"
264msgstr "--index 在一个仓库之外"
ef317cd5 265
c1ac5258 266#: apply.c:144
a0b6b246
JX
267msgid "--cached outside a repository"
268msgstr "--cached 在一个仓库之外"
ef317cd5 269
06991777 270#: apply.c:825
a0b6b246
JX
271#, c-format
272msgid "Cannot prepare timestamp regexp %s"
273msgstr "无法准备时间戳正则表达式 %s"
ef317cd5 274
06991777 275#: apply.c:834
a0b6b246
JX
276#, c-format
277msgid "regexec returned %d for input: %s"
278msgstr "regexec 返回 %d,输入为:%s"
ef317cd5 279
06991777 280#: apply.c:908
a0b6b246
JX
281#, c-format
282msgid "unable to find filename in patch at line %d"
283msgstr "不能在补丁的第 %d 行找到文件名"
ef317cd5 284
06991777 285#: apply.c:946
a0b6b246
JX
286#, c-format
287msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
288msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
ef317cd5 289
06991777 290#: apply.c:952
a0b6b246
JX
291#, c-format
292msgid "git apply: bad git-diff - inconsistent new filename on line %d"
293msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
ef317cd5 294
06991777 295#: apply.c:953
a0b6b246
JX
296#, c-format
297msgid "git apply: bad git-diff - inconsistent old filename on line %d"
298msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
ef317cd5 299
06991777 300#: apply.c:958
a0b6b246
JX
301#, c-format
302msgid "git apply: bad git-diff - expected /dev/null on line %d"
303msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
ef317cd5 304
06991777 305#: apply.c:987
a4f16749
JX
306#, c-format
307msgid "invalid mode on line %d: %s"
308msgstr "第 %d 行包含无效文件模式:%s"
309
06991777 310#: apply.c:1306
a4f16749
JX
311#, c-format
312msgid "inconsistent header lines %d and %d"
313msgstr "不一致的文件头,%d 行和 %d 行"
314
06991777 315#: apply.c:1478
a0b6b246
JX
316#, c-format
317msgid "recount: unexpected line: %.*s"
318msgstr "recount:意外的行:%.*s"
ef317cd5 319
06991777 320#: apply.c:1547
a0b6b246
JX
321#, c-format
322msgid "patch fragment without header at line %d: %.*s"
323msgstr "第 %d 行的补丁片段没有头信息:%.*s"
ef317cd5 324
06991777 325#: apply.c:1567
a0b6b246
JX
326#, c-format
327msgid ""
328"git diff header lacks filename information when removing %d leading pathname "
329"component (line %d)"
330msgid_plural ""
331"git diff header lacks filename information when removing %d leading pathname "
332"components (line %d)"
333msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
334msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
ef317cd5 335
06991777 336#: apply.c:1580
a0b6b246
JX
337#, c-format
338msgid "git diff header lacks filename information (line %d)"
339msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
07432cef 340
06991777 341#: apply.c:1768
a0b6b246
JX
342msgid "new file depends on old contents"
343msgstr "新文件依赖旧内容"
5c57d762 344
06991777 345#: apply.c:1770
a0b6b246
JX
346msgid "deleted file still has contents"
347msgstr "删除的文件仍有内容"
5c57d762 348
06991777 349#: apply.c:1804
a0b6b246
JX
350#, c-format
351msgid "corrupt patch at line %d"
352msgstr "补丁在第 %d 行损坏"
5c57d762 353
06991777 354#: apply.c:1841
5c57d762 355#, c-format
a0b6b246
JX
356msgid "new file %s depends on old contents"
357msgstr "新文件 %s 依赖旧内容"
5c57d762 358
06991777 359#: apply.c:1843
5c57d762 360#, c-format
a0b6b246
JX
361msgid "deleted file %s still has contents"
362msgstr "删除的文件 %s 仍有内容"
5c57d762 363
06991777 364#: apply.c:1846
a0b6b246
JX
365#, c-format
366msgid "** warning: file %s becomes empty but is not deleted"
367msgstr "** 警告:文件 %s 成为空文件但并未删除"
ef317cd5 368
06991777 369#: apply.c:1993
5c57d762 370#, c-format
a0b6b246
JX
371msgid "corrupt binary patch at line %d: %.*s"
372msgstr "二进制补丁在第 %d 行损坏:%.*s"
5c57d762 373
06991777 374#: apply.c:2030
5c57d762 375#, c-format
a0b6b246
JX
376msgid "unrecognized binary patch at line %d"
377msgstr "未能识别的二进制补丁位于第 %d 行"
5c57d762 378
06991777 379#: apply.c:2192
5c57d762 380#, c-format
a0b6b246
JX
381msgid "patch with only garbage at line %d"
382msgstr "补丁文件的第 %d 行只有垃圾数据"
5c57d762 383
06991777 384#: apply.c:2278
5c57d762 385#, c-format
a0b6b246
JX
386msgid "unable to read symlink %s"
387msgstr "无法读取符号链接 %s"
5c57d762 388
06991777 389#: apply.c:2282
5c57d762 390#, c-format
a0b6b246
JX
391msgid "unable to open or read %s"
392msgstr "不能打开或读取 %s"
5c57d762 393
06991777 394#: apply.c:2941
5c57d762 395#, c-format
a0b6b246
JX
396msgid "invalid start of line: '%c'"
397msgstr "无效的行首字符:'%c'"
5c57d762 398
06991777 399#: apply.c:3062
5c57d762 400#, c-format
a0b6b246
JX
401msgid "Hunk #%d succeeded at %d (offset %d line)."
402msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
403msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
404msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
5c57d762 405
06991777 406#: apply.c:3074
5c57d762 407#, c-format
a0b6b246
JX
408msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
409msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
5c57d762 410
06991777 411#: apply.c:3080
5c57d762
JX
412#, c-format
413msgid ""
a0b6b246
JX
414"while searching for:\n"
415"%.*s"
5c57d762 416msgstr ""
a0b6b246
JX
417"当查询:\n"
418"%.*s"
5c57d762 419
06991777 420#: apply.c:3102
5c57d762 421#, c-format
a0b6b246
JX
422msgid "missing binary patch data for '%s'"
423msgstr "缺失 '%s' 的二进制补丁数据"
5c57d762 424
06991777 425#: apply.c:3110
5c57d762 426#, c-format
a0b6b246 427msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
29004bbb 428msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
5c57d762 429
06991777 430#: apply.c:3157
5c57d762 431#, c-format
a0b6b246
JX
432msgid "cannot apply binary patch to '%s' without full index line"
433msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
5c57d762 434
06991777 435#: apply.c:3167
5c57d762 436#, c-format
a0b6b246
JX
437msgid ""
438"the patch applies to '%s' (%s), which does not match the current contents."
29004bbb 439msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
5c57d762 440
06991777 441#: apply.c:3175
a0b6b246
JX
442#, c-format
443msgid "the patch applies to an empty '%s' but it is not empty"
29004bbb 444msgstr "补丁应用到空文件 '%s',但其并非空文件"
5c57d762 445
06991777 446#: apply.c:3193
5c57d762 447#, c-format
a0b6b246 448msgid "the necessary postimage %s for '%s' cannot be read"
e640d114 449msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
5c57d762 450
06991777 451#: apply.c:3206
5c57d762 452#, c-format
a0b6b246
JX
453msgid "binary patch does not apply to '%s'"
454msgstr "二进制补丁未应用到 '%s'"
5c57d762 455
06991777 456#: apply.c:3212
5c57d762 457#, c-format
a0b6b246
JX
458msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
459msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
5c57d762 460
06991777 461#: apply.c:3233
276ceeaa 462#, c-format
a0b6b246
JX
463msgid "patch failed: %s:%ld"
464msgstr "打补丁失败:%s:%ld"
276ceeaa 465
4c27fcb5 466#: apply.c:3356
4dcdc3d8 467#, c-format
a0b6b246
JX
468msgid "cannot checkout %s"
469msgstr "不能检出 %s"
4dcdc3d8 470
4c27fcb5 471#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278
4dcdc3d8 472#, c-format
a0b6b246
JX
473msgid "failed to read %s"
474msgstr "无法读取 %s"
4dcdc3d8 475
4c27fcb5 476#: apply.c:3416
4dcdc3d8 477#, c-format
a0b6b246
JX
478msgid "reading from '%s' beyond a symbolic link"
479msgstr "读取位于符号链接中的 '%s'"
4dcdc3d8 480
4c27fcb5 481#: apply.c:3445 apply.c:3688
4dcdc3d8 482#, c-format
a0b6b246
JX
483msgid "path %s has been renamed/deleted"
484msgstr "路径 %s 已经被重命名/删除"
4dcdc3d8 485
4c27fcb5 486#: apply.c:3531 apply.c:3703
4dcdc3d8 487#, c-format
a0b6b246
JX
488msgid "%s: does not exist in index"
489msgstr "%s:不存在于索引中"
4dcdc3d8 490
4c27fcb5 491#: apply.c:3540 apply.c:3711
4dcdc3d8 492#, c-format
a0b6b246
JX
493msgid "%s: does not match index"
494msgstr "%s:和索引不匹配"
4dcdc3d8 495
4c27fcb5 496#: apply.c:3575
a0b6b246
JX
497msgid "repository lacks the necessary blob to fall back on 3-way merge."
498msgstr "仓库缺乏必要的数据对象以进行三方合并。"
4dcdc3d8 499
4c27fcb5 500#: apply.c:3578
4dcdc3d8 501#, c-format
a0b6b246
JX
502msgid "Falling back to three-way merge...\n"
503msgstr "回落到三方合并...\n"
4dcdc3d8 504
4c27fcb5 505#: apply.c:3594 apply.c:3598
4dcdc3d8 506#, c-format
a0b6b246
JX
507msgid "cannot read the current contents of '%s'"
508msgstr "无法读取 '%s' 的当前内容"
276ceeaa 509
4c27fcb5 510#: apply.c:3610
4dcdc3d8 511#, c-format
a0b6b246
JX
512msgid "Failed to fall back on three-way merge...\n"
513msgstr "无法回落到三方合并...\n"
4dcdc3d8 514
4c27fcb5 515#: apply.c:3624
4dcdc3d8 516#, c-format
a0b6b246
JX
517msgid "Applied patch to '%s' with conflicts.\n"
518msgstr "应用补丁到 '%s' 存在冲突。\n"
4dcdc3d8 519
4c27fcb5 520#: apply.c:3629
4dcdc3d8 521#, c-format
a0b6b246
JX
522msgid "Applied patch to '%s' cleanly.\n"
523msgstr "成功应用补丁到 '%s'。\n"
4dcdc3d8 524
4c27fcb5 525#: apply.c:3655
a0b6b246
JX
526msgid "removal patch leaves file contents"
527msgstr "移除补丁仍留下了文件内容"
4dcdc3d8 528
4c27fcb5 529#: apply.c:3728
1003b3a5 530#, c-format
a0b6b246
JX
531msgid "%s: wrong type"
532msgstr "%s:错误类型"
1003b3a5 533
4c27fcb5 534#: apply.c:3730
1003b3a5 535#, c-format
a0b6b246
JX
536msgid "%s has type %o, expected %o"
537msgstr "%s 的类型是 %o,应为 %o"
1003b3a5 538
06991777
JX
539#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846
540#: read-cache.c:1299
4dcdc3d8 541#, c-format
a0b6b246
JX
542msgid "invalid path '%s'"
543msgstr "无效路径 '%s'"
4dcdc3d8 544
4c27fcb5 545#: apply.c:3939
4dcdc3d8 546#, c-format
a0b6b246
JX
547msgid "%s: already exists in index"
548msgstr "%s:已经存在于索引中"
4dcdc3d8 549
4c27fcb5 550#: apply.c:3942
4dcdc3d8 551#, c-format
a0b6b246
JX
552msgid "%s: already exists in working directory"
553msgstr "%s:已经存在于工作区中"
4dcdc3d8 554
4c27fcb5 555#: apply.c:3962
1b7f4a34 556#, c-format
a0b6b246
JX
557msgid "new mode (%o) of %s does not match old mode (%o)"
558msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1b7f4a34 559
4c27fcb5 560#: apply.c:3967
5b04ee3b 561#, c-format
a0b6b246
JX
562msgid "new mode (%o) of %s does not match old mode (%o) of %s"
563msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
5b04ee3b 564
4c27fcb5 565#: apply.c:3987
8ada9598 566#, c-format
a0b6b246
JX
567msgid "affected file '%s' is beyond a symbolic link"
568msgstr "受影响的文件 '%s' 位于符号链接中"
8ada9598 569
4c27fcb5 570#: apply.c:3991
81809b99 571#, c-format
a0b6b246
JX
572msgid "%s: patch does not apply"
573msgstr "%s:补丁未应用"
8ada9598 574
4c27fcb5 575#: apply.c:4006
8ada9598 576#, c-format
a0b6b246 577msgid "Checking patch %s..."
06991777 578msgstr "正在检查补丁 %s..."
8ada9598 579
4c27fcb5 580#: apply.c:4098
a0b6b246
JX
581#, c-format
582msgid "sha1 information is lacking or useless for submodule %s"
583msgstr "子模组 %s 的 sha1 信息缺失或无效"
8ada9598 584
4c27fcb5 585#: apply.c:4105
8ada9598 586#, c-format
a0b6b246 587msgid "mode change for %s, which is not in current HEAD"
31e5e17b 588msgstr "%s 的模式变更,但它不在当前 HEAD 中"
8ada9598 589
4c27fcb5 590#: apply.c:4108
a0b6b246
JX
591#, c-format
592msgid "sha1 information is lacking or useless (%s)."
593msgstr "sha1 信息缺失或无效(%s)。"
6792b93b 594
06991777 595#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143
8ada9598 596#, c-format
a0b6b246
JX
597msgid "make_cache_entry failed for path '%s'"
598msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
8ada9598 599
4c27fcb5 600#: apply.c:4117
a0b6b246
JX
601#, c-format
602msgid "could not add %s to temporary index"
603msgstr "不能在临时索引中添加 %s"
9aeb4c2b 604
4c27fcb5 605#: apply.c:4127
a0b6b246
JX
606#, c-format
607msgid "could not write temporary index to %s"
608msgstr "不能把临时索引写入到 %s"
9aeb4c2b 609
4c27fcb5 610#: apply.c:4265
a0b6b246
JX
611#, c-format
612msgid "unable to remove %s from index"
613msgstr "不能从索引中移除 %s"
8ada9598 614
4c27fcb5 615#: apply.c:4299
8ada9598 616#, c-format
a0b6b246
JX
617msgid "corrupt patch for submodule %s"
618msgstr "子模组 %s 损坏的补丁"
8ada9598 619
4c27fcb5 620#: apply.c:4305
9aeb4c2b 621#, c-format
a0b6b246 622msgid "unable to stat newly created file '%s'"
65e2041e 623msgstr "不能对新建文件 '%s' 调用 stat"
9aeb4c2b 624
4c27fcb5 625#: apply.c:4313
a0b6b246
JX
626#, c-format
627msgid "unable to create backing store for newly created file %s"
628msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 629
4c27fcb5 630#: apply.c:4319 apply.c:4464
81809b99 631#, c-format
a0b6b246
JX
632msgid "unable to add cache entry for %s"
633msgstr "无法为 %s 添加缓存条目"
8ada9598 634
4c27fcb5 635#: apply.c:4362
a0b6b246
JX
636#, c-format
637msgid "failed to write to '%s'"
c1ac5258 638msgstr "写入 '%s' 失败"
8ada9598 639
4c27fcb5 640#: apply.c:4366
220c313c 641#, c-format
a0b6b246
JX
642msgid "closing file '%s'"
643msgstr "关闭文件 '%s'"
220c313c 644
4c27fcb5 645#: apply.c:4436
c04f5ac3 646#, c-format
a0b6b246
JX
647msgid "unable to write file '%s' mode %o"
648msgstr "不能写文件 '%s' 权限 %o"
c04f5ac3 649
4c27fcb5 650#: apply.c:4534
c04f5ac3 651#, c-format
a0b6b246
JX
652msgid "Applied patch %s cleanly."
653msgstr "成功应用补丁 %s。"
c04f5ac3 654
4c27fcb5 655#: apply.c:4542
a0b6b246
JX
656msgid "internal error"
657msgstr "内部错误"
c04f5ac3 658
4c27fcb5 659#: apply.c:4545
5c57d762 660#, c-format
a0b6b246
JX
661msgid "Applying patch %%s with %d reject..."
662msgid_plural "Applying patch %%s with %d rejects..."
663msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
664msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
5c57d762 665
4c27fcb5 666#: apply.c:4556
5c57d762 667#, c-format
a0b6b246
JX
668msgid "truncating .rej filename to %.*s.rej"
669msgstr "截短 .rej 文件名为 %.*s.rej"
5c57d762 670
06991777 671#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118
220c313c 672#, c-format
a0b6b246
JX
673msgid "cannot open %s"
674msgstr "不能打开 %s"
220c313c 675
4c27fcb5 676#: apply.c:4578
220c313c 677#, c-format
a0b6b246
JX
678msgid "Hunk #%d applied cleanly."
679msgstr "第 #%d 个片段成功应用。"
220c313c 680
4c27fcb5 681#: apply.c:4582
5c57d762 682#, c-format
a0b6b246
JX
683msgid "Rejected hunk #%d."
684msgstr "拒绝第 #%d 个片段。"
5c57d762 685
4c27fcb5 686#: apply.c:4692
5c57d762 687#, c-format
a0b6b246
JX
688msgid "Skipped patch '%s'."
689msgstr "略过补丁 '%s'。"
5c57d762 690
4c27fcb5 691#: apply.c:4700
a0b6b246
JX
692msgid "unrecognized input"
693msgstr "未能识别的输入"
5c57d762 694
06991777 695#: apply.c:4720
a0b6b246
JX
696msgid "unable to read index file"
697msgstr "无法读取索引文件"
5c57d762 698
06991777 699#: apply.c:4875
220c313c 700#, c-format
a0b6b246
JX
701msgid "can't open patch '%s': %s"
702msgstr "不能打开补丁 '%s':%s"
220c313c 703
06991777 704#: apply.c:4902
5c57d762 705#, c-format
a0b6b246
JX
706msgid "squelched %d whitespace error"
707msgid_plural "squelched %d whitespace errors"
708msgstr[0] "抑制下仍有 %d 个空白字符误用"
709msgstr[1] "抑制下仍有 %d 个空白字符误用"
5c57d762 710
06991777 711#: apply.c:4908 apply.c:4923
5c57d762 712#, c-format
a0b6b246
JX
713msgid "%d line adds whitespace errors."
714msgid_plural "%d lines add whitespace errors."
a4f16749
JX
715msgstr[0] "%d 行新增了空白字符误用。"
716msgstr[1] "%d 行新增了空白字符误用。"
5c57d762 717
06991777 718#: apply.c:4916
5c57d762 719#, c-format
a0b6b246
JX
720msgid "%d line applied after fixing whitespace errors."
721msgid_plural "%d lines applied after fixing whitespace errors."
722msgstr[0] "修复空白错误后,应用了 %d 行。"
723msgstr[1] "修复空白错误后,应用了 %d 行。"
5c57d762 724
06991777 725#: apply.c:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390
a0b6b246
JX
726msgid "Unable to write new index file"
727msgstr "无法写入新索引文件"
5c57d762 728
06991777
JX
729#: apply.c:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206
730#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263
731#: builtin/pull.c:200 builtin/submodule--helper.c:407
732#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
733#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
734#: builtin/submodule--helper.c:2092 git-add--interactive.perl:197
a0b6b246
JX
735msgid "path"
736msgstr "路径"
5c57d762 737
06991777 738#: apply.c:4960
a0b6b246
JX
739msgid "don't apply changes matching the given path"
740msgstr "不要应用与给出路径向匹配的变更"
5c57d762 741
06991777 742#: apply.c:4963
a0b6b246
JX
743msgid "apply changes matching the given path"
744msgstr "应用与给出路径向匹配的变更"
220c313c 745
06991777 746#: apply.c:4965 builtin/am.c:2212
a0b6b246
JX
747msgid "num"
748msgstr "数字"
220c313c 749
06991777 750#: apply.c:4966
a0b6b246
JX
751msgid "remove <num> leading slashes from traditional diff paths"
752msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
220c313c 753
06991777 754#: apply.c:4969
a0b6b246
JX
755msgid "ignore additions made by the patch"
756msgstr "忽略补丁中的添加的文件"
220c313c 757
06991777 758#: apply.c:4971
a0b6b246
JX
759msgid "instead of applying the patch, output diffstat for the input"
760msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
220c313c 761
06991777 762#: apply.c:4975
a0b6b246
JX
763msgid "show number of added and deleted lines in decimal notation"
764msgstr "以十进制数显示添加和删除的行数"
220c313c 765
06991777 766#: apply.c:4977
a0b6b246
JX
767msgid "instead of applying the patch, output a summary for the input"
768msgstr "不应用补丁,而是显示输入的概要"
220c313c 769
06991777 770#: apply.c:4979
a0b6b246
JX
771msgid "instead of applying the patch, see if the patch is applicable"
772msgstr "不应用补丁,而是查看补丁是否可应用"
220c313c 773
06991777 774#: apply.c:4981
a0b6b246
JX
775msgid "make sure the patch is applicable to the current index"
776msgstr "确认补丁可以应用到当前索引"
276ceeaa 777
06991777 778#: apply.c:4983
c1ac5258
JX
779msgid "mark new files with `git add --intent-to-add`"
780msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
781
06991777 782#: apply.c:4985
a0b6b246
JX
783msgid "apply a patch without touching the working tree"
784msgstr "应用补丁而不修改工作区"
5b04ee3b 785
06991777 786#: apply.c:4987
a0b6b246
JX
787msgid "accept a patch that touches outside the working area"
788msgstr "接受修改工作区之外文件的补丁"
5c57d762 789
06991777 790#: apply.c:4990
a0b6b246
JX
791msgid "also apply the patch (use with --stat/--summary/--check)"
792msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
c04f5ac3 793
06991777 794#: apply.c:4992
a0b6b246
JX
795msgid "attempt three-way merge if a patch does not apply"
796msgstr "如果一个补丁不能应用则尝试三方合并"
c04f5ac3 797
06991777 798#: apply.c:4994
a0b6b246
JX
799msgid "build a temporary index based on embedded index information"
800msgstr "创建一个临时索引基于嵌入的索引信息"
c04f5ac3 801
06991777 802#: apply.c:4997 builtin/checkout-index.c:173 builtin/ls-files.c:524
a0b6b246
JX
803msgid "paths are separated with NUL character"
804msgstr "路径以 NUL 字符分隔"
8ada9598 805
06991777 806#: apply.c:4999
a0b6b246
JX
807msgid "ensure at least <n> lines of context match"
808msgstr "确保至少匹配 <n> 行上下文"
8ada9598 809
06991777 810#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97
4c27fcb5 811#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
06991777 812#: builtin/pack-objects.c:3314 builtin/rebase.c:1065
a0b6b246
JX
813msgid "action"
814msgstr "动作"
8ada9598 815
06991777 816#: apply.c:5001
a0b6b246
JX
817msgid "detect new or modified lines that have whitespace errors"
818msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 819
06991777 820#: apply.c:5004 apply.c:5007
a0b6b246
JX
821msgid "ignore changes in whitespace when finding context"
822msgstr "查找上下文时忽略空白字符的变更"
8ada9598 823
06991777 824#: apply.c:5010
a0b6b246
JX
825msgid "apply the patch in reverse"
826msgstr "反向应用补丁"
8ada9598 827
06991777 828#: apply.c:5012
a0b6b246
JX
829msgid "don't expect at least one line of context"
830msgstr "无需至少一行上下文"
8ada9598 831
06991777 832#: apply.c:5014
a0b6b246
JX
833msgid "leave the rejected hunks in corresponding *.rej files"
834msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 835
06991777 836#: apply.c:5016
a0b6b246
JX
837msgid "allow overlapping hunks"
838msgstr "允许重叠的补丁片段"
8ada9598 839
06991777
JX
840#: apply.c:5017 builtin/add.c:291 builtin/check-ignore.c:22
841#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724
842#: builtin/log.c:2037 builtin/mv.c:123 builtin/read-tree.c:128
843#: builtin/rebase--interactive.c:159
a0b6b246
JX
844msgid "be verbose"
845msgstr "冗长输出"
8ada9598 846
06991777 847#: apply.c:5019
a0b6b246
JX
848msgid "tolerate incorrectly detected missing new-line at the end of file"
849msgstr "允许不正确的文件末尾换行符"
cfff71a9 850
06991777 851#: apply.c:5022
a0b6b246
JX
852msgid "do not trust the line counts in the hunk headers"
853msgstr "不信任补丁片段的头信息中的行号"
6c94aba5 854
06991777 855#: apply.c:5024 builtin/am.c:2200
a0b6b246
JX
856msgid "root"
857msgstr "根目录"
c04f5ac3 858
06991777 859#: apply.c:5025
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
06991777 881#: archive.c:372 builtin/add.c:177 builtin/add.c:515 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
06991777 913#: archive.c:456 builtin/log.c:1549
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
06991777
JX
921#: archive.c:458 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129
922#: builtin/fast-export.c:1091 builtin/fast-export.c:1093 builtin/grep.c:895
923#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
924#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
4c27fcb5 925#: parse-options.h:162
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
06991777
JX
957#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
958#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859
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
06991777
JX
966#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:715
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
1012#: archive-tar.c:458
1013#, c-format
1014msgid "unable to start '%s' filter"
1015msgstr "无法启动 '%s' 过滤器"
1016
1017#: archive-tar.c:461
1018msgid "unable to redirect descriptor"
1019msgstr "无法重定向描述符"
1020
1021#: archive-tar.c:468
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
06991777 1036#: archive-zip.c:474 builtin/pack-objects.c:225 builtin/pack-objects.c:228
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"
1054msgstr "%s 不被允许:%s:%d"
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
06991777 1138#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:237
649900bc 1139#, c-format
a0b6b246
JX
1140msgid "could not create file '%s'"
1141msgstr "不能创建文件 '%s'"
649900bc 1142
06991777 1143#: bisect.c:937 builtin/merge.c:139
649900bc 1144#, c-format
a0b6b246
JX
1145msgid "could not read file '%s'"
1146msgstr "不能读取文件 '%s'"
649900bc 1147
06991777 1148#: bisect.c:967
a0b6b246
JX
1149msgid "reading bisect refs failed"
1150msgstr "读取二分查找引用失败"
649900bc 1151
06991777 1152#: bisect.c:986
649900bc 1153#, c-format
a0b6b246
JX
1154msgid "%s was both %s and %s\n"
1155msgstr "%s 同时为 %s 和 %s\n"
649900bc 1156
06991777 1157#: bisect.c:994
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
06991777 1166#: bisect.c:1013
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#.
06991777 1176#: bisect.c:1019
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
06991777 1183#: blame.c:1792
a4f16749
JX
1184msgid "--contents and --reverse do not blend well."
1185msgstr "--contents 和 --reverse 不能混用。"
1186
06991777 1187#: blame.c:1806
a4f16749
JX
1188msgid "cannot use --contents with final commit object name"
1189msgstr "不能将 --contents 和最终的提交对象名共用"
1190
06991777 1191#: blame.c:1827
a4f16749
JX
1192msgid "--reverse and --first-parent together require specified latest commit"
1193msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
1194
06991777
JX
1195#: blame.c:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993
1196#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936
1197#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407
4c27fcb5 1198#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152
fd8cb379 1199#: builtin/shortlog.c:192
a4f16749
JX
1200msgid "revision walk setup failed"
1201msgstr "版本遍历设置失败"
1202
06991777 1203#: blame.c:1854
a4f16749
JX
1204msgid ""
1205"--reverse --first-parent together require range along first-parent chain"
1206msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
1207
06991777 1208#: blame.c:1865
a4f16749
JX
1209#, c-format
1210msgid "no such path %s in %s"
1211msgstr "在 %2$s 中无此路径 %1$s"
1212
06991777 1213#: blame.c:1876
a4f16749
JX
1214#, c-format
1215msgid "cannot read blob %s for path %s"
1216msgstr "不能为路径 %2$s 读取数据对象 %1$s"
1217
c1ac5258 1218#: branch.c:52
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
c1ac5258 1230#: branch.c:66
649900bc 1231#, c-format
a0b6b246
JX
1232msgid "Not setting branch %s as its own upstream."
1233msgstr "未设置分支 %s 作为它自己的上游。"
649900bc 1234
c1ac5258 1235#: branch.c:92
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
c1ac5258 1240#: branch.c:93
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
c1ac5258 1245#: branch.c:97
649900bc 1246#, c-format
6937cb4e
JX
1247msgid "Branch '%s' set up to track local branch '%s' by rebasing."
1248msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
649900bc 1249
c1ac5258 1250#: branch.c:98
649900bc 1251#, c-format
6937cb4e 1252msgid "Branch '%s' set up to track local branch '%s'."
493a9322 1253msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
649900bc 1254
c1ac5258 1255#: branch.c:103
649900bc 1256#, c-format
6937cb4e
JX
1257msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
1258msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
649900bc 1259
c1ac5258 1260#: branch.c:104
649900bc 1261#, c-format
6937cb4e
JX
1262msgid "Branch '%s' set up to track remote ref '%s'."
1263msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
649900bc 1264
c1ac5258 1265#: branch.c:108
649900bc 1266#, c-format
6937cb4e
JX
1267msgid "Branch '%s' set up to track local ref '%s' by rebasing."
1268msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
649900bc 1269
c1ac5258 1270#: branch.c:109
649900bc 1271#, c-format
6937cb4e
JX
1272msgid "Branch '%s' set up to track local ref '%s'."
1273msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
649900bc 1274
c1ac5258 1275#: branch.c:118
a0b6b246
JX
1276msgid "Unable to write upstream branch configuration"
1277msgstr "无法写入上游分支配置"
649900bc 1278
c1ac5258 1279#: branch.c:155
649900bc 1280#, c-format
a0b6b246
JX
1281msgid "Not tracking: ambiguous information for ref %s"
1282msgstr "未跟踪:引用 %s 有歧义"
649900bc 1283
c1ac5258 1284#: branch.c:188
649900bc 1285#, c-format
a0b6b246
JX
1286msgid "'%s' is not a valid branch name."
1287msgstr "'%s' 不是一个有效的分支名称。"
649900bc 1288
c1ac5258 1289#: branch.c:207
649900bc 1290#, c-format
a0b6b246
JX
1291msgid "A branch named '%s' already exists."
1292msgstr "一个分支名 '%s' 已经存在。"
649900bc 1293
c1ac5258 1294#: branch.c:212
a0b6b246
JX
1295msgid "Cannot force update the current branch."
1296msgstr "无法强制更新当前分支。"
649900bc 1297
c1ac5258 1298#: branch.c:232
649900bc 1299#, c-format
a0b6b246
JX
1300msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1301msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
649900bc 1302
c1ac5258 1303#: branch.c:234
649900bc 1304#, c-format
a0b6b246
JX
1305msgid "the requested upstream branch '%s' does not exist"
1306msgstr "请求的上游分支 '%s' 不存在"
649900bc 1307
c1ac5258 1308#: branch.c:236
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
06991777 1326#: branch.c:280
649900bc 1327#, c-format
a0b6b246
JX
1328msgid "Not a valid object name: '%s'."
1329msgstr "不是一个有效的对象名:'%s'。"
649900bc 1330
06991777 1331#: branch.c:300
649900bc 1332#, c-format
a0b6b246
JX
1333msgid "Ambiguous object name: '%s'."
1334msgstr "歧义的对象名:'%s'。"
649900bc 1335
06991777 1336#: branch.c:305
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
06991777
JX
1361#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2215 sequencer.c:2763
1362#: builtin/commit.c:776
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
06991777 1410#: bundle.c:457 builtin/log.c:193 builtin/log.c:1701 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
06991777
JX
1433#: commit.c:50 sequencer.c:2567 builtin/am.c:355 builtin/am.c:399
1434#: builtin/am.c:1375 builtin/am.c:2019 builtin/replace.c:376
fd8cb379 1435#: builtin/replace.c:448
94550ed3 1436#, c-format
a0b6b246
JX
1437msgid "could not parse %s"
1438msgstr "不能解析 %s"
94550ed3 1439
4c27fcb5 1440#: commit.c:52
a0b6b246
JX
1441#, c-format
1442msgid "%s %s is not a commit!"
31e5e17b 1443msgstr "%s %s 不是一个提交!"
90314792 1444
4c27fcb5 1445#: commit.c:193
fd8cb379
JX
1446msgid ""
1447"Support for <GIT_DIR>/info/grafts is deprecated\n"
1448"and will be removed in a future Git version.\n"
1449"\n"
1450"Please use \"git replace --convert-graft-file\"\n"
1451"to convert the grafts into replace refs.\n"
1452"\n"
1453"Turn this message off by running\n"
1454"\"git config advice.graftFileDeprecated false\""
1455msgstr ""
1456"对 <GIT_DIR>/info/grafts 的支持已被弃用,并将在\n"
1457"未来的Git版本中被移除。\n"
1458"\n"
1459"请使用 \"git replace --convert-graft-file\" 将\n"
1460"grafts 转换为替换引用。\n"
1461"\n"
1462"设置 \"git config advice.graftFileDeprecated false\"\n"
1463"可关闭本消息"
1464
06991777 1465#: commit.c:1122
4c27fcb5
JX
1466#, c-format
1467msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
1468msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
1469
06991777 1470#: commit.c:1125
4c27fcb5
JX
1471#, c-format
1472msgid "Commit %s has a bad GPG signature allegedly by %s."
1473msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
1474
06991777 1475#: commit.c:1128
4c27fcb5
JX
1476#, c-format
1477msgid "Commit %s does not have a GPG signature."
1478msgstr "提交 %s 没有 GPG 签名。"
1479
06991777 1480#: commit.c:1131
4c27fcb5
JX
1481#, c-format
1482msgid "Commit %s has a good GPG signature by %s\n"
1483msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
1484
06991777 1485#: commit.c:1385
90314792 1486msgid ""
a0b6b246
JX
1487"Warning: commit message did not conform to UTF-8.\n"
1488"You may want to amend it after fixing the message, or set the config\n"
1489"variable i18n.commitencoding to the encoding your project uses.\n"
1490msgstr ""
29004bbb 1491"警告:提交说明不符合 UTF-8 字符编码。\n"
a0b6b246 1492"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
29004bbb 1493"设置为您项目所用的字符编码。\n"
90314792 1494
06991777 1495#: commit-graph.c:101
c1ac5258
JX
1496#, c-format
1497msgid "graph file %s is too small"
1498msgstr "图形文件 %s 太小"
1499
06991777 1500#: commit-graph.c:136
c1ac5258
JX
1501#, c-format
1502msgid "graph signature %X does not match signature %X"
1503msgstr "图形签名 %X 和签名 %X 不匹配"
1504
06991777 1505#: commit-graph.c:143
c1ac5258
JX
1506#, c-format
1507msgid "graph version %X does not match version %X"
1508msgstr "图形版本 %X 和版本 %X 不匹配"
1509
06991777 1510#: commit-graph.c:150
c1ac5258
JX
1511#, c-format
1512msgid "hash version %X does not match version %X"
1513msgstr "散列版本 %X 和版本 %X 不匹配"
1514
06991777
JX
1515#: commit-graph.c:173
1516msgid "chunk lookup table entry missing; graph file may be incomplete"
1517msgstr "块查找表条目丢失,图形文件可能不完整"
1518
1519#: commit-graph.c:184
c1ac5258
JX
1520#, c-format
1521msgid "improper chunk offset %08x%08x"
1522msgstr "不正确的块偏移 %08x%08x"
1523
06991777 1524#: commit-graph.c:221
c1ac5258
JX
1525#, c-format
1526msgid "chunk id %08x appears multiple times"
1527msgstr "块 id %08x 出现了多次"
1528
06991777 1529#: commit-graph.c:334
c1ac5258
JX
1530#, c-format
1531msgid "could not find commit %s"
1532msgstr "无法找到提交 %s"
1533
06991777 1534#: commit-graph.c:671 builtin/pack-objects.c:2646
c1ac5258
JX
1535#, c-format
1536msgid "unable to get type of object %s"
1537msgstr "无法获得对象 %s 类型"
1538
06991777
JX
1539#: commit-graph.c:704
1540msgid "Loading known commits in commit graph"
1541msgstr "正在加载提交图中的已知提交"
1542
1543#: commit-graph.c:720
1544msgid "Expanding reachable commits in commit graph"
1545msgstr "正在扩展提交图中的可达提交"
1546
1547#: commit-graph.c:732
1548msgid "Clearing commit marks in commit graph"
1549msgstr "正在清除提交图中的提交标记"
4c27fcb5 1550
06991777 1551#: commit-graph.c:752
4c27fcb5
JX
1552msgid "Computing commit graph generation numbers"
1553msgstr "正在计算提交图世代数字"
1554
06991777
JX
1555#: commit-graph.c:869
1556#, c-format
1557msgid "Finding commits for commit graph in %d pack"
1558msgid_plural "Finding commits for commit graph in %d packs"
1559msgstr[0] "正在 %d 个包中查找提交图的提交"
1560msgstr[1] "正在 %d 个包中查找提交图的提交"
4c27fcb5 1561
06991777 1562#: commit-graph.c:882
c1ac5258
JX
1563#, c-format
1564msgid "error adding pack %s"
1565msgstr "添加包 %s 出错"
1566
06991777 1567#: commit-graph.c:884
c1ac5258
JX
1568#, c-format
1569msgid "error opening index for %s"
1570msgstr "为 %s 打开索引出错"
1571
06991777
JX
1572#: commit-graph.c:898
1573#, c-format
1574msgid "Finding commits for commit graph from %d ref"
1575msgid_plural "Finding commits for commit graph from %d refs"
1576msgstr[0] "正在从 %d 个引用中查找提交图的提交"
1577msgstr[1] "正在从 %d 个引用中查找提交图的提交"
1578
1579#: commit-graph.c:930
1580msgid "Finding commits for commit graph among packed objects"
1581msgstr "正在打包对象中查找提交图的提交"
1582
1583#: commit-graph.c:943
1584msgid "Counting distinct commits in commit graph"
1585msgstr "在提交图中计算不同的提交"
1586
1587#: commit-graph.c:956
fd8cb379
JX
1588#, c-format
1589msgid "the commit graph format cannot write %d commits"
4c27fcb5 1590msgstr "提交图格式不能写入 %d 个提交"
fd8cb379 1591
06991777
JX
1592#: commit-graph.c:965
1593msgid "Finding extra edges in commit graph"
1594msgstr "在提交图中查找额外的边"
1595
1596#: commit-graph.c:989
fd8cb379
JX
1597msgid "too many commits to write graph"
1598msgstr "提交太多不能画图"
1599
06991777 1600#: commit-graph.c:996 midx.c:769
fd8cb379 1601#, c-format
c1ac5258
JX
1602msgid "unable to create leading directories of %s"
1603msgstr "不能为 %s 创建先导目录"
1604
06991777
JX
1605#: commit-graph.c:1036
1606#, c-format
1607msgid "Writing out commit graph in %d pass"
1608msgid_plural "Writing out commit graph in %d passes"
1609msgstr[0] "用 %d 步写出提交图"
1610msgstr[1] "用 %d 步写出提交图"
1611
1612#: commit-graph.c:1109
c1ac5258 1613msgid "the commit-graph file has incorrect checksum and is likely corrupt"
4c27fcb5
JX
1614msgstr "提交图文件的校验码错误,可能已经损坏"
1615
06991777 1616#: commit-graph.c:1153
4c27fcb5
JX
1617msgid "Verifying commits in commit graph"
1618msgstr "校验提交图中的提交"
fd8cb379 1619
06991777 1620#: compat/obstack.c:406 compat/obstack.c:408
a0b6b246
JX
1621msgid "memory exhausted"
1622msgstr "内存耗尽"
90314792 1623
c1ac5258
JX
1624#: config.c:123
1625#, c-format
1626msgid ""
1627"exceeded maximum include depth (%d) while including\n"
1628"\t%s\n"
1629"from\n"
1630"\t%s\n"
1631"This might be due to circular includes."
1632msgstr ""
e640d114 1633"超过了最大包含深度(%1$d),当从\n"
c1ac5258
JX
1634"\t%3$s\n"
1635"包含\n"
1636"\t%2$s\n"
e640d114 1637"这可能是因为循环包含。"
c1ac5258
JX
1638
1639#: config.c:139
1640#, c-format
1641msgid "could not expand include path '%s'"
1642msgstr "无法扩展包含路径 '%s'"
1643
1644#: config.c:150
1645msgid "relative config includes must come from files"
1646msgstr "相对路径的配置文件引用必须来自于文件"
1647
1648#: config.c:190
87cb7997 1649msgid "relative config include conditionals must come from files"
c1ac5258
JX
1650msgstr "相对路径的配置文件条件引用必须来自于文件"
1651
1652#: config.c:348
1653#, c-format
1654msgid "key does not contain a section: %s"
1655msgstr "键名没有包含一个小节名称:%s"
87cb7997 1656
c1ac5258
JX
1657#: config.c:354
1658#, c-format
1659msgid "key does not contain variable name: %s"
1660msgstr "键名没有包含变量名:%s"
1661
06991777 1662#: config.c:378 sequencer.c:2330
c1ac5258
JX
1663#, c-format
1664msgid "invalid key: %s"
1665msgstr "无效键名:%s"
1666
1667#: config.c:384
1668#, c-format
1669msgid "invalid key (newline): %s"
1670msgstr "无效键名(有换行符):%s"
1671
1672#: config.c:420 config.c:432
1673#, c-format
1674msgid "bogus config parameter: %s"
1675msgstr "伪配置参数:%s"
1676
1677#: config.c:467
1678#, c-format
1679msgid "bogus format in %s"
1680msgstr "%s 中格式错误"
1681
1682#: config.c:793
90314792 1683#, c-format
a0b6b246
JX
1684msgid "bad config line %d in blob %s"
1685msgstr "数据对象 %2$s 中错误的配置行 %1$d"
90314792 1686
c1ac5258 1687#: config.c:797
a77c07d9 1688#, c-format
a0b6b246
JX
1689msgid "bad config line %d in file %s"
1690msgstr "文件 %2$s 中错误的配置行 %1$d"
a77c07d9 1691
c1ac5258 1692#: config.c:801
a77c07d9 1693#, c-format
a0b6b246
JX
1694msgid "bad config line %d in standard input"
1695msgstr "标准输入中错误的配置行 %d"
a77c07d9 1696
c1ac5258 1697#: config.c:805
90314792 1698#, c-format
a0b6b246
JX
1699msgid "bad config line %d in submodule-blob %s"
1700msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
90314792 1701
c1ac5258 1702#: config.c:809
90314792 1703#, c-format
a0b6b246
JX
1704msgid "bad config line %d in command line %s"
1705msgstr "命令行 %2$s 中错误的配置行 %1$d"
90314792 1706
c1ac5258 1707#: config.c:813
90314792 1708#, c-format
a0b6b246
JX
1709msgid "bad config line %d in %s"
1710msgstr "在 %2$s 中错误的配置行 %1$d"
220c313c 1711
c1ac5258 1712#: config.c:952
a0b6b246
JX
1713msgid "out of range"
1714msgstr "超出范围"
6c94aba5 1715
c1ac5258 1716#: config.c:952
a0b6b246
JX
1717msgid "invalid unit"
1718msgstr "无效的单位"
6c94aba5 1719
c1ac5258 1720#: config.c:958
6c94aba5 1721#, c-format
a0b6b246
JX
1722msgid "bad numeric config value '%s' for '%s': %s"
1723msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
6c94aba5 1724
c1ac5258 1725#: config.c:963
1b7f4a34 1726#, c-format
a0b6b246
JX
1727msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
1728msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 1729
c1ac5258 1730#: config.c:966
1b7f4a34 1731#, c-format
a0b6b246
JX
1732msgid "bad numeric config value '%s' for '%s' in file %s: %s"
1733msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 1734
c1ac5258 1735#: config.c:969
1b7f4a34 1736#, c-format
a0b6b246
JX
1737msgid "bad numeric config value '%s' for '%s' in standard input: %s"
1738msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
1b7f4a34 1739
c1ac5258 1740#: config.c:972
1b7f4a34 1741#, c-format
a0b6b246
JX
1742msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
1743msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 1744
c1ac5258 1745#: config.c:975
94550ed3 1746#, c-format
a0b6b246
JX
1747msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
1748msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 1749
c1ac5258 1750#: config.c:978
276ceeaa 1751#, c-format
a0b6b246
JX
1752msgid "bad numeric config value '%s' for '%s' in %s: %s"
1753msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 1754
c1ac5258 1755#: config.c:1073
276ceeaa 1756#, c-format
a0b6b246 1757msgid "failed to expand user dir in: '%s'"
c1ac5258 1758msgstr "无法扩展用户目录:'%s'"
94550ed3 1759
c1ac5258 1760#: config.c:1082
5809aa05
JX
1761#, c-format
1762msgid "'%s' for '%s' is not a valid timestamp"
1763msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
1764
c1ac5258
JX
1765#: config.c:1173
1766#, c-format
1767msgid "abbrev length out of range: %d"
1768msgstr "缩写长度超出范围:%d"
1769
1770#: config.c:1187 config.c:1198
3495628d 1771#, c-format
a0b6b246
JX
1772msgid "bad zlib compression level %d"
1773msgstr "错误的 zlib 压缩级别 %d"
3495628d 1774
c1ac5258
JX
1775#: config.c:1290
1776msgid "core.commentChar should only be one character"
1777msgstr "core.commentChar 应该是一个字符"
1778
1779#: config.c:1323
3495628d 1780#, c-format
a0b6b246
JX
1781msgid "invalid mode for object creation: %s"
1782msgstr "无效的对象创建模式:%s"
3495628d 1783
4c27fcb5 1784#: config.c:1395
c1ac5258
JX
1785#, c-format
1786msgid "malformed value for %s"
1787msgstr "%s 的取值格式错误"
1788
4c27fcb5 1789#: config.c:1421
c1ac5258
JX
1790#, c-format
1791msgid "malformed value for %s: %s"
1792msgstr "%s 的取值格式错误:%s"
1793
4c27fcb5 1794#: config.c:1422
c1ac5258
JX
1795msgid "must be one of nothing, matching, simple, upstream or current"
1796msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current"
1797
06991777 1798#: config.c:1481 builtin/pack-objects.c:3394
1a79b2f1
JX
1799#, c-format
1800msgid "bad pack compression level %d"
1801msgstr "错误的打包压缩级别 %d"
1802
4c27fcb5 1803#: config.c:1602
c1ac5258
JX
1804#, c-format
1805msgid "unable to load config blob object '%s'"
1806msgstr "无法从数据对象 '%s' 加载配置"
1807
4c27fcb5 1808#: config.c:1605
c1ac5258
JX
1809#, c-format
1810msgid "reference '%s' does not point to a blob"
1811msgstr "引用 '%s' 没有指向一个数据对象"
1812
4c27fcb5 1813#: config.c:1622
c1ac5258
JX
1814#, c-format
1815msgid "unable to resolve config blob '%s'"
1816msgstr "不能解析配置对象 '%s'"
1817
4c27fcb5 1818#: config.c:1652
c1ac5258
JX
1819#, c-format
1820msgid "failed to parse %s"
1821msgstr "解析 %s 失败"
1822
4c27fcb5 1823#: config.c:1705
a0b6b246
JX
1824msgid "unable to parse command-line config"
1825msgstr "无法解析命令行中的配置"
94550ed3 1826
4c27fcb5 1827#: config.c:2037
a0b6b246
JX
1828msgid "unknown error occurred while reading the configuration files"
1829msgstr "在读取配置文件时遇到未知错误"
94550ed3 1830
4c27fcb5 1831#: config.c:2207
87cb7997
JX
1832#, c-format
1833msgid "Invalid %s: '%s'"
1834msgstr "无效 %s:'%s'"
1835
4c27fcb5 1836#: config.c:2250
87cb7997
JX
1837#, c-format
1838msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
1839msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'"
1840
4c27fcb5 1841#: config.c:2276
87cb7997
JX
1842#, c-format
1843msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
1844msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
1845
4c27fcb5 1846#: config.c:2322
276ceeaa 1847#, c-format
a0b6b246
JX
1848msgid "unable to parse '%s' from command-line config"
1849msgstr "无法解析命令行配置中的 '%s'"
1b7f4a34 1850
4c27fcb5 1851#: config.c:2324
94550ed3 1852#, c-format
a0b6b246
JX
1853msgid "bad config variable '%s' in file '%s' at line %d"
1854msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
94550ed3 1855
4c27fcb5 1856#: config.c:2405
c1ac5258
JX
1857#, c-format
1858msgid "invalid section name '%s'"
1859msgstr "无效的小节名称 '%s'"
1860
4c27fcb5 1861#: config.c:2437
276ceeaa 1862#, c-format
a0b6b246
JX
1863msgid "%s has multiple values"
1864msgstr "%s 有多个取值"
276ceeaa 1865
4c27fcb5 1866#: config.c:2466
c1ac5258
JX
1867#, c-format
1868msgid "failed to write new configuration file %s"
1869msgstr "写入新的配置文件 %s 失败"
1870
06991777 1871#: config.c:2716 config.c:3040
c1ac5258
JX
1872#, c-format
1873msgid "could not lock config file %s"
1874msgstr "不能锁定配置文件 %s"
1875
06991777 1876#: config.c:2727
c1ac5258
JX
1877#, c-format
1878msgid "opening %s"
1879msgstr "打开 %s"
1880
06991777 1881#: config.c:2762 builtin/config.c:328
c1ac5258
JX
1882#, c-format
1883msgid "invalid pattern: %s"
1884msgstr "无效模式:%s"
1885
06991777 1886#: config.c:2787
c1ac5258
JX
1887#, c-format
1888msgid "invalid config file %s"
1889msgstr "无效的配置文件 %s"
1890
06991777 1891#: config.c:2800 config.c:3053
1a79b2f1
JX
1892#, c-format
1893msgid "fstat on %s failed"
65e2041e 1894msgstr "对 %s 调用 fstat 失败"
1a79b2f1 1895
06991777 1896#: config.c:2811
c1ac5258
JX
1897#, c-format
1898msgid "unable to mmap '%s'"
1899msgstr "不能 mmap '%s'"
1900
06991777 1901#: config.c:2820 config.c:3058
c1ac5258
JX
1902#, c-format
1903msgid "chmod on %s failed"
1904msgstr "对 %s 调用 chmod 失败"
1905
06991777 1906#: config.c:2905 config.c:3155
c1ac5258
JX
1907#, c-format
1908msgid "could not write config file %s"
1909msgstr "不能写入配置文件 %s"
1910
06991777 1911#: config.c:2939
94550ed3 1912#, c-format
a0b6b246
JX
1913msgid "could not set '%s' to '%s'"
1914msgstr "不能设置 '%s' 为 '%s'"
94550ed3 1915
06991777 1916#: config.c:2941 builtin/remote.c:782
276ceeaa 1917#, c-format
a0b6b246
JX
1918msgid "could not unset '%s'"
1919msgstr "不能取消设置 '%s'"
276ceeaa 1920
06991777 1921#: config.c:3031
c1ac5258
JX
1922#, c-format
1923msgid "invalid section name: %s"
1924msgstr "无效的小节名称:%s"
1925
06991777 1926#: config.c:3198
c1ac5258
JX
1927#, c-format
1928msgid "missing value for '%s'"
1929msgstr "%s 的取值缺失"
1930
fd8cb379 1931#: connect.c:61
c1ac5258
JX
1932msgid "the remote end hung up upon initial contact"
1933msgstr "远端在初始连接时即挂断"
94550ed3 1934
fd8cb379 1935#: connect.c:63
a0b6b246
JX
1936msgid ""
1937"Could not read from remote repository.\n"
1938"\n"
1939"Please make sure you have the correct access rights\n"
1940"and the repository exists."
1941msgstr ""
1942"无法读取远程仓库。\n"
1943"\n"
1944"请确认您有正确的访问权限并且仓库存在。"
1945
c1ac5258
JX
1946#: connect.c:81
1947#, c-format
1948msgid "server doesn't support '%s'"
1949msgstr "服务器不支持 '%s'"
1950
1951#: connect.c:103
1952#, c-format
1953msgid "server doesn't support feature '%s'"
1954msgstr "服务器不支持特性 '%s'"
1955
1956#: connect.c:114
1957msgid "expected flush after capabilities"
1958msgstr "在能力之后应为一个 flush 包"
1959
1960#: connect.c:233
1961#, c-format
1962msgid "ignoring capabilities after first line '%s'"
e640d114 1963msgstr "忽略第一行 '%s' 之后的能力字段"
c1ac5258
JX
1964
1965#: connect.c:252
1966msgid "protocol error: unexpected capabilities^{}"
1967msgstr "协议错误:意外的 capabilities^{}"
1968
1969#: connect.c:273
1970#, c-format
1971msgid "protocol error: expected shallow sha-1, got '%s'"
1972msgstr "协议错误:预期浅克隆 sha-1,却得到 '%s'"
1973
1974#: connect.c:275
1975msgid "repository on the other end cannot be shallow"
1976msgstr "另一端的仓库不能是浅克隆仓库"
1977
06991777 1978#: connect.c:313
c1ac5258
JX
1979msgid "invalid packet"
1980msgstr "无效数据包"
1981
06991777 1982#: connect.c:333
c1ac5258
JX
1983#, c-format
1984msgid "protocol error: unexpected '%s'"
1985msgstr "协议错误:意外的 '%s'"
1986
06991777 1987#: connect.c:441
c1ac5258
JX
1988#, c-format
1989msgid "invalid ls-refs response: %s"
1990msgstr "无效的 ls-refs 响应:%s"
1991
06991777 1992#: connect.c:445
c1ac5258
JX
1993msgid "expected flush after ref listing"
1994msgstr "在引用列表之后应该有一个 flush 包"
1995
06991777 1996#: connect.c:544
c1ac5258
JX
1997#, c-format
1998msgid "protocol '%s' is not supported"
1999msgstr "不支持 '%s' 协议"
2000
06991777 2001#: connect.c:595
c1ac5258
JX
2002msgid "unable to set SO_KEEPALIVE on socket"
2003msgstr "无法为 socket 设置 SO_KEEPALIVE"
2004
06991777 2005#: connect.c:635 connect.c:698
c1ac5258
JX
2006#, c-format
2007msgid "Looking up %s ... "
2008msgstr "查找 %s ..."
2009
06991777 2010#: connect.c:639
c1ac5258
JX
2011#, c-format
2012msgid "unable to look up %s (port %s) (%s)"
2013msgstr "无法查找 %s(端口 %s)(%s)"
2014
2015#. TRANSLATORS: this is the end of "Looking up %s ... "
06991777 2016#: connect.c:643 connect.c:714
c1ac5258
JX
2017#, c-format
2018msgid ""
2019"done.\n"
2020"Connecting to %s (port %s) ... "
2021msgstr ""
2022"完成。\n"
2023"连接到 %s(端口 %s)... "
2024
06991777 2025#: connect.c:665 connect.c:742
c1ac5258
JX
2026#, c-format
2027msgid ""
2028"unable to connect to %s:\n"
2029"%s"
2030msgstr ""
2031"无法连接到 %s:\n"
2032"%s"
2033
2034#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
06991777 2035#: connect.c:671 connect.c:748
c1ac5258
JX
2036msgid "done."
2037msgstr "完成。"
2038
06991777 2039#: connect.c:702
c1ac5258
JX
2040#, c-format
2041msgid "unable to look up %s (%s)"
2042msgstr "无法查找 %s(%s)"
2043
06991777 2044#: connect.c:708
c1ac5258
JX
2045#, c-format
2046msgid "unknown port %s"
2047msgstr "未知端口 %s"
2048
06991777 2049#: connect.c:845 connect.c:1171
c1ac5258
JX
2050#, c-format
2051msgid "strange hostname '%s' blocked"
2052msgstr "已阻止奇怪的主机名 '%s'"
2053
06991777 2054#: connect.c:847
c1ac5258
JX
2055#, c-format
2056msgid "strange port '%s' blocked"
2057msgstr "已阻止奇怪的端口号 '%s'"
2058
06991777 2059#: connect.c:857
c1ac5258
JX
2060#, c-format
2061msgid "cannot start proxy %s"
2062msgstr "不能启动代理 %s"
2063
06991777 2064#: connect.c:924
c1ac5258
JX
2065msgid "no path specified; see 'git help pull' for valid url syntax"
2066msgstr "未指定路径,执行 'git help pull' 查看有效的 url 语法"
2067
06991777 2068#: connect.c:1119
c1ac5258
JX
2069msgid "ssh variant 'simple' does not support -4"
2070msgstr "ssh 变体 'simple' 不支持 -4"
2071
06991777 2072#: connect.c:1131
c1ac5258
JX
2073msgid "ssh variant 'simple' does not support -6"
2074msgstr "ssh 变体 'simple' 不支持 -6"
2075
06991777 2076#: connect.c:1148
c1ac5258 2077msgid "ssh variant 'simple' does not support setting port"
e640d114 2078msgstr "ssh 变体 'simple' 不支持设置端口"
c1ac5258 2079
06991777 2080#: connect.c:1259
c1ac5258
JX
2081#, c-format
2082msgid "strange pathname '%s' blocked"
2083msgstr "已阻止奇怪的路径名 '%s'"
2084
06991777 2085#: connect.c:1304
c1ac5258
JX
2086msgid "unable to fork"
2087msgstr "无法 fork"
2088
06991777 2089#: connected.c:68 builtin/fsck.c:221 builtin/prune.c:146
a0b6b246 2090msgid "Checking connectivity"
06991777 2091msgstr "正在检查连通性"
a0b6b246 2092
c1ac5258 2093#: connected.c:80
a0b6b246
JX
2094msgid "Could not run 'git rev-list'"
2095msgstr "不能执行 'git rev-list'"
2096
c1ac5258 2097#: connected.c:100
a0b6b246 2098msgid "failed write to rev-list"
c1ac5258 2099msgstr "写入 rev-list 失败"
a0b6b246 2100
c1ac5258 2101#: connected.c:107
a0b6b246 2102msgid "failed to close rev-list's stdin"
c1ac5258
JX
2103msgstr "关闭 rev-list 的标准输入失败"
2104
06991777 2105#: convert.c:193
c1ac5258
JX
2106#, c-format
2107msgid "illegal crlf_action %d"
2108msgstr "非法的 crlf 动作 %d"
a0b6b246 2109
06991777 2110#: convert.c:206
3495628d 2111#, c-format
c1ac5258
JX
2112msgid "CRLF would be replaced by LF in %s"
2113msgstr "%s 中的 CRLF 将被 LF 替换"
31e5e17b 2114
06991777 2115#: convert.c:208
31e5e17b 2116#, c-format
a0b6b246
JX
2117msgid ""
2118"CRLF will be replaced by LF in %s.\n"
c1ac5258 2119"The file will have its original line endings in your working directory"
a0b6b246 2120msgstr ""
c1ac5258 2121"%s 中的 CRLF 将被 LF 替换。<\n"
a0b6b246 2122"在工作区中该文件仍保持原有的换行符。"
3495628d 2123
06991777 2124#: convert.c:216
3495628d 2125#, c-format
31e5e17b
JX
2126msgid "LF would be replaced by CRLF in %s"
2127msgstr "文件 %s 中的 LF 将被 CRLF 替换"
3495628d 2128
06991777 2129#: convert.c:218
276ceeaa 2130#, c-format
a0b6b246
JX
2131msgid ""
2132"LF will be replaced by CRLF in %s.\n"
c1ac5258 2133"The file will have its original line endings in your working directory"
a0b6b246 2134msgstr ""
c1ac5258
JX
2135"%s 中的 LF 将被 CRLF 替换。\n"
2136"在工作区中该文件仍保持原有的换行符"
276ceeaa 2137
06991777 2138#: convert.c:279
fd8cb379
JX
2139#, c-format
2140msgid "BOM is prohibited in '%s' if encoded as %s"
2141msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM"
2142
06991777 2143#: convert.c:286
fd8cb379
JX
2144#, c-format
2145msgid ""
2146"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
2147"tree-encoding."
2148msgstr "文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%s 作为工作区编码。"
2149
06991777 2150#: convert.c:304
fd8cb379
JX
2151#, c-format
2152msgid "BOM is required in '%s' if encoded as %s"
2153msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM"
2154
06991777 2155#: convert.c:306
fd8cb379
JX
2156#, c-format
2157msgid ""
2158"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
2159"%sLE (depending on the byte order) as working-tree-encoding."
2160msgstr ""
2161"文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字"
2162"节序)作为工作区编码。"
2163
06991777 2164#: convert.c:424 convert.c:495
fd8cb379
JX
2165#, c-format
2166msgid "failed to encode '%s' from %s to %s"
2167msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
2168
06991777 2169#: convert.c:467
fd8cb379
JX
2170#, c-format
2171msgid "encoding '%s' from %s to %s and back is not the same"
2172msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
2173
06991777 2174#: convert.c:673
c1ac5258
JX
2175#, c-format
2176msgid "cannot fork to run external filter '%s'"
e640d114 2177msgstr "不能 fork 以执行外部过滤器 '%s'"
c1ac5258 2178
06991777 2179#: convert.c:693
c1ac5258
JX
2180#, c-format
2181msgid "cannot feed the input to external filter '%s'"
e640d114 2182msgstr "不能将输入传递给外部过滤器 '%s'"
c1ac5258 2183
06991777 2184#: convert.c:700
c1ac5258
JX
2185#, c-format
2186msgid "external filter '%s' failed %d"
e640d114 2187msgstr "外部过滤器 '%s' 失败码 %d"
c1ac5258 2188
06991777 2189#: convert.c:735 convert.c:738
c1ac5258
JX
2190#, c-format
2191msgid "read from external filter '%s' failed"
2192msgstr "从外部过滤器 '%s' 读取失败"
2193
06991777 2194#: convert.c:741 convert.c:796
c1ac5258
JX
2195#, c-format
2196msgid "external filter '%s' failed"
2197msgstr "外部过滤器 '%s' 失败"
2198
2199#: convert.c:844
2200msgid "unexpected filter type"
2201msgstr "意外的过滤类型"
2202
2203#: convert.c:855
2204msgid "path name too long for external filter"
2205msgstr "外部过滤器的路径名太长"
2206
2207#: convert.c:929
2208#, c-format
2209msgid ""
2210"external filter '%s' is not available anymore although not all paths have "
2211"been filtered"
2212msgstr "外部过滤器 '%s' 不再可用,但并非所有路径都已过滤"
2213
2214#: convert.c:1228
fd8cb379
JX
2215msgid "true/false are no valid working-tree-encodings"
2216msgstr "true/false 不是有效的工作区编码"
2217
4c27fcb5 2218#: convert.c:1398 convert.c:1432
c1ac5258
JX
2219#, c-format
2220msgid "%s: clean filter '%s' failed"
2221msgstr "%s:clean 过滤器 '%s' 失败"
2222
4c27fcb5 2223#: convert.c:1476
c1ac5258
JX
2224#, c-format
2225msgid "%s: smudge filter %s failed"
2226msgstr "%s:smudge 过滤器 %s 失败"
2227
06991777 2228#: date.c:137
a0b6b246
JX
2229msgid "in the future"
2230msgstr "在将来"
3495628d 2231
06991777 2232#: date.c:143
3495628d 2233#, c-format
a4f16749
JX
2234msgid "%<PRIuMAX> second ago"
2235msgid_plural "%<PRIuMAX> seconds ago"
2236msgstr[0] "%<PRIuMAX> 秒钟前"
2237msgstr[1] "%<PRIuMAX> 秒钟前"
3495628d 2238
06991777 2239#: date.c:150
3495628d 2240#, c-format
a4f16749
JX
2241msgid "%<PRIuMAX> minute ago"
2242msgid_plural "%<PRIuMAX> minutes ago"
2243msgstr[0] "%<PRIuMAX> 分钟前"
2244msgstr[1] "%<PRIuMAX> 分钟前"
3495628d 2245
06991777 2246#: date.c:157
3495628d 2247#, c-format
a4f16749
JX
2248msgid "%<PRIuMAX> hour ago"
2249msgid_plural "%<PRIuMAX> hours ago"
2250msgstr[0] "%<PRIuMAX> 小时前"
2251msgstr[1] "%<PRIuMAX> 小时前"
3495628d 2252
06991777 2253#: date.c:164
3495628d 2254#, c-format
a4f16749
JX
2255msgid "%<PRIuMAX> day ago"
2256msgid_plural "%<PRIuMAX> days ago"
2257msgstr[0] "%<PRIuMAX> 天前"
2258msgstr[1] "%<PRIuMAX> 天前"
3495628d 2259
06991777 2260#: date.c:170
94550ed3 2261#, c-format
a4f16749
JX
2262msgid "%<PRIuMAX> week ago"
2263msgid_plural "%<PRIuMAX> weeks ago"
2264msgstr[0] "%<PRIuMAX> 周前"
2265msgstr[1] "%<PRIuMAX> 周前"
94550ed3 2266
06991777 2267#: date.c:177
3495628d 2268#, c-format
a4f16749
JX
2269msgid "%<PRIuMAX> month ago"
2270msgid_plural "%<PRIuMAX> months ago"
2271msgstr[0] "%<PRIuMAX> 个月前"
2272msgstr[1] "%<PRIuMAX> 个月前"
3495628d 2273
06991777 2274#: date.c:188
3495628d 2275#, c-format
a4f16749
JX
2276msgid "%<PRIuMAX> year"
2277msgid_plural "%<PRIuMAX> years"
2278msgstr[0] "%<PRIuMAX> 年"
2279msgstr[1] "%<PRIuMAX> 年"
3495628d 2280
a0b6b246 2281#. TRANSLATORS: "%s" is "<n> years"
06991777 2282#: date.c:191
94550ed3 2283#, c-format
a4f16749
JX
2284msgid "%s, %<PRIuMAX> month ago"
2285msgid_plural "%s, %<PRIuMAX> months ago"
2286msgstr[0] "%s %<PRIuMAX> 个月前"
2287msgstr[1] "%s %<PRIuMAX> 个月前"
94550ed3 2288
06991777 2289#: date.c:196 date.c:201
94550ed3 2290#, c-format
a4f16749
JX
2291msgid "%<PRIuMAX> year ago"
2292msgid_plural "%<PRIuMAX> years ago"
2293msgstr[0] "%<PRIuMAX> 年前"
2294msgstr[1] "%<PRIuMAX> 年前"
94550ed3 2295
06991777 2296#: delta-islands.c:272
4c27fcb5
JX
2297msgid "Propagating island marks"
2298msgstr "正在传播数据岛标记"
2299
06991777 2300#: delta-islands.c:290
4c27fcb5
JX
2301#, c-format
2302msgid "bad tree object %s"
2303msgstr "坏的树对象 %s"
2304
06991777 2305#: delta-islands.c:334
4c27fcb5
JX
2306#, c-format
2307msgid "failed to load island regex for '%s': %s"
2308msgstr "未能加载 '%s' 的数据岛正则表达式:%s"
2309
06991777 2310#: delta-islands.c:390
4c27fcb5
JX
2311#, c-format
2312msgid "island regex from config has too many capture groups (max=%d)"
2313msgstr "来自 config 的数据岛正则表达式有太多的捕获组(最多 %d 个)"
2314
06991777 2315#: delta-islands.c:466
4c27fcb5
JX
2316#, c-format
2317msgid "Marked %d islands, done.\n"
2318msgstr "已标记 %d 个数据岛,结束。\n"
2319
a0b6b246 2320#: diffcore-order.c:24
cfff71a9 2321#, c-format
a0b6b246 2322msgid "failed to read orderfile '%s'"
c1ac5258 2323msgstr "读取排序文件 '%s' 失败"
cfff71a9 2324
4c27fcb5 2325#: diffcore-rename.c:544
a0b6b246 2326msgid "Performing inexact rename detection"
87cb7997 2327msgstr "正在进行非精确的重命名探测"
cfff71a9 2328
c1ac5258 2329#: diff.c:108
cfff71a9 2330#, c-format
a0b6b246 2331msgid "option '%s' requires a value"
06991777 2332msgstr "选项 '%s' 需要一个值"
cfff71a9 2333
a0b6b246 2334# 译者:注意保持前导空格
c1ac5258 2335#: diff.c:158
a0b6b246
JX
2336#, c-format
2337msgid " Failed to parse dirstat cut-off percentage '%s'\n"
2338msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
cfff71a9 2339
a0b6b246 2340# 译者:注意保持前导空格
c1ac5258 2341#: diff.c:163
a0b6b246
JX
2342#, c-format
2343msgid " Unknown dirstat parameter '%s'\n"
2344msgstr " 未知的 dirstat 参数 '%s'\n"
7aea43ff 2345
c1ac5258 2346#: diff.c:291
6937cb4e 2347msgid ""
c1ac5258
JX
2348"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
2349"'dimmed-zebra', 'plain'"
5809aa05 2350msgstr ""
c1ac5258
JX
2351"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "
2352"'plain'"
2353
06991777 2354#: diff.c:319
c1ac5258 2355#, c-format
06991777
JX
2356msgid ""
2357"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
2358"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
2359msgstr ""
2360"未知的 color-moved-ws 模式 '%s',可能的取值有 'ignore-space-change'、'ignore-"
2361"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
c1ac5258 2362
06991777 2363#: diff.c:327
c1ac5258 2364msgid ""
06991777
JX
2365"color-moved-ws: allow-indentation-change cannot be combined with other "
2366"whitespace modes"
c1ac5258 2367msgstr "color-moved-ws:allow-indentation-change 不能与其它空白字符模式共用"
6937cb4e 2368
06991777 2369#: diff.c:400
7aea43ff 2370#, c-format
a0b6b246
JX
2371msgid "Unknown value for 'diff.submodule' config variable: '%s'"
2372msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
7aea43ff 2373
06991777 2374#: diff.c:460
7aea43ff 2375#, c-format
a0b6b246
JX
2376msgid ""
2377"Found errors in 'diff.dirstat' config variable:\n"
2378"%s"
2379msgstr ""
2380"发现配置变量 'diff.dirstat' 中的错误:\n"
2381"%s"
7aea43ff 2382
06991777 2383#: diff.c:4211
7aea43ff 2384#, c-format
a0b6b246
JX
2385msgid "external diff died, stopping at %s"
2386msgstr "外部 diff 退出,停止在 %s"
7aea43ff 2387
06991777 2388#: diff.c:4553
a0b6b246
JX
2389msgid "--name-only, --name-status, --check and -s are mutually exclusive"
2390msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
2391
06991777 2392#: diff.c:4556
31e5e17b
JX
2393msgid "-G, -S and --find-object are mutually exclusive"
2394msgstr "-G、-S 和 --find-object 是互斥的"
2395
06991777 2396#: diff.c:4634
a0b6b246
JX
2397msgid "--follow requires exactly one pathspec"
2398msgstr "--follow 明确要求只跟一个路径规格"
2399
06991777 2400#: diff.c:4800
7aea43ff 2401#, c-format
a0b6b246
JX
2402msgid ""
2403"Failed to parse --dirstat/-X option parameter:\n"
2404"%s"
2405msgstr ""
2406"无法解析 --dirstat/-X 选项的参数:\n"
2407"%s"
7aea43ff 2408
06991777 2409#: diff.c:4814
7aea43ff 2410#, c-format
a0b6b246
JX
2411msgid "Failed to parse --submodule option parameter: '%s'"
2412msgstr "无法解析 --submodule 选项的参数:'%s'"
7aea43ff 2413
06991777 2414#: diff.c:5900
a0b6b246
JX
2415msgid "inexact rename detection was skipped due to too many files."
2416msgstr "因为文件太多,略过不严格的重命名检查。"
2417
06991777 2418#: diff.c:5903
a0b6b246
JX
2419msgid "only found copies from modified paths due to too many files."
2420msgstr "因为文件太多,只在修改的路径中查找拷贝。"
2421
06991777 2422#: diff.c:5906
7aea43ff 2423#, c-format
a0b6b246
JX
2424msgid ""
2425"you may want to set your %s variable to at least %d and retry the command."
29004bbb 2426msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
7aea43ff 2427
06991777 2428#: dir.c:538
c1ac5258
JX
2429#, c-format
2430msgid "pathspec '%s' did not match any file(s) known to git"
2431msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
2432
06991777 2433#: dir.c:927
c1ac5258
JX
2434#, c-format
2435msgid "cannot use %s as an exclude file"
2436msgstr "不能将 %s 用作排除文件"
2437
06991777 2438#: dir.c:1842
31e5e17b
JX
2439#, c-format
2440msgid "could not open directory '%s'"
2441msgstr "不能打开目录 '%s'"
2442
06991777 2443#: dir.c:2084
a0b6b246
JX
2444msgid "failed to get kernel name and information"
2445msgstr "无法获得内核名称和信息"
7aea43ff 2446
06991777 2447#: dir.c:2208
c1ac5258
JX
2448msgid "untracked cache is disabled on this system or location"
2449msgstr "缓存未跟踪文件在本系统或位置中被禁用"
2450
06991777 2451#: dir.c:3009
c1ac5258
JX
2452#, c-format
2453msgid "index file corrupt in repo %s"
2454msgstr "仓库 %s 中的索引文件损坏"
7aea43ff 2455
06991777 2456#: dir.c:3054 dir.c:3059
87cb7997
JX
2457#, c-format
2458msgid "could not create directories for %s"
2459msgstr "不能为 %s 创建目录"
2460
06991777 2461#: dir.c:3088
1a79b2f1
JX
2462#, c-format
2463msgid "could not migrate git directory from '%s' to '%s'"
2464msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
2465
4c27fcb5 2466#: editor.c:73
5809aa05
JX
2467#, c-format
2468msgid "hint: Waiting for your editor to close the file...%c"
2469msgstr "提示:等待您的编辑器关闭文件...%c"
2470
c1ac5258 2471#: entry.c:178
6937cb4e
JX
2472msgid "Filtering content"
2473msgstr "过滤内容"
2474
4c27fcb5 2475#: entry.c:465
87cb7997
JX
2476#, c-format
2477msgid "could not stat file '%s'"
65e2041e 2478msgstr "不能对文件 '%s' 调用 stat"
87cb7997 2479
c1ac5258
JX
2480#: environment.c:150
2481#, c-format
2482msgid "bad git namespace path \"%s\""
e640d114 2483msgstr "错误的 git 名字空间路径 \"%s\""
c1ac5258
JX
2484
2485#: environment.c:332
2486#, c-format
2487msgid "could not set GIT_DIR to '%s'"
2488msgstr "不能设置 GIT_DIR 为 '%s'"
2489
2490#: exec-cmd.c:361
2491#, c-format
2492msgid "too many args to run %s"
2493msgstr "执行 %s 的参数太多"
2494
31e5e17b
JX
2495#: fetch-object.c:17
2496msgid "Remote with no URL"
2497msgstr "远程未设置 URL"
2498
4c27fcb5 2499#: fetch-pack.c:151
a0b6b246
JX
2500msgid "git fetch-pack: expected shallow list"
2501msgstr "git fetch-pack:应为 shallow 列表"
2502
06991777
JX
2503#: fetch-pack.c:154
2504msgid "git fetch-pack: expected a flush packet after shallow list"
2505msgstr "git fetch-pack:在浅克隆列表之后期望一个 flush 包"
2506
2507#: fetch-pack.c:165
31e5e17b
JX
2508msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
2509msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包"
a0b6b246 2510
06991777 2511#: fetch-pack.c:185
90314792 2512#, c-format
275588f9 2513msgid "git fetch-pack: expected ACK/NAK, got '%s'"
a0b6b246 2514msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
90314792 2515
06991777 2516#: fetch-pack.c:256
a0b6b246
JX
2517msgid "--stateless-rpc requires multi_ack_detailed"
2518msgstr "--stateless-rpc 需要 multi_ack_detailed"
90314792 2519
06991777 2520#: fetch-pack.c:358 fetch-pack.c:1264
90314792 2521#, c-format
a0b6b246
JX
2522msgid "invalid shallow line: %s"
2523msgstr "无效的 shallow 信息:%s"
90314792 2524
06991777 2525#: fetch-pack.c:364 fetch-pack.c:1271
c04f5ac3 2526#, c-format
a0b6b246
JX
2527msgid "invalid unshallow line: %s"
2528msgstr "无效的 unshallow 信息:%s"
c04f5ac3 2529
06991777 2530#: fetch-pack.c:366 fetch-pack.c:1273
a0b6b246
JX
2531#, c-format
2532msgid "object not found: %s"
2533msgstr "对象未找到:%s"
07432cef 2534
06991777 2535#: fetch-pack.c:369 fetch-pack.c:1276
c04f5ac3 2536#, c-format
a0b6b246
JX
2537msgid "error in object: %s"
2538msgstr "对象中出错:%s"
07432cef 2539
06991777 2540#: fetch-pack.c:371 fetch-pack.c:1278
c04f5ac3 2541#, c-format
a0b6b246
JX
2542msgid "no shallow found: %s"
2543msgstr "未发现 shallow:%s"
c04f5ac3 2544
06991777 2545#: fetch-pack.c:374 fetch-pack.c:1282
a0b6b246
JX
2546#, c-format
2547msgid "expected shallow/unshallow, got %s"
2548msgstr "应为 shallow/unshallow,却得到 %s"
07432cef 2549
06991777 2550#: fetch-pack.c:415
a0b6b246
JX
2551#, c-format
2552msgid "got %s %d %s"
2553msgstr "得到 %s %d %s"
1b7f4a34 2554
06991777 2555#: fetch-pack.c:432
1b7f4a34 2556#, c-format
a0b6b246
JX
2557msgid "invalid commit %s"
2558msgstr "无效提交 %s"
1b7f4a34 2559
06991777 2560#: fetch-pack.c:463
a0b6b246
JX
2561msgid "giving up"
2562msgstr "放弃"
814ff314 2563
06991777 2564#: fetch-pack.c:475 progress.c:229
a0b6b246
JX
2565msgid "done"
2566msgstr "完成"
2e8451e8 2567
06991777 2568#: fetch-pack.c:487
2e8451e8 2569#, c-format
a0b6b246
JX
2570msgid "got %s (%d) %s"
2571msgstr "得到 %s (%d) %s"
2e8451e8 2572
06991777 2573#: fetch-pack.c:533
a0b6b246
JX
2574#, c-format
2575msgid "Marking %s as complete"
2576msgstr "标记 %s 为完成"
220c313c 2577
06991777 2578#: fetch-pack.c:740
a0b6b246
JX
2579#, c-format
2580msgid "already have %s (%s)"
29004bbb 2581msgstr "已经有 %s(%s)"
220c313c 2582
06991777 2583#: fetch-pack.c:779
a0b6b246
JX
2584msgid "fetch-pack: unable to fork off sideband demultiplexer"
2585msgstr "fetch-pack:无法派生 sideband 多路输出"
1b7f4a34 2586
06991777 2587#: fetch-pack.c:787
a0b6b246
JX
2588msgid "protocol error: bad pack header"
2589msgstr "协议错误:坏的包头"
814ff314 2590
06991777 2591#: fetch-pack.c:855
a0b6b246
JX
2592#, c-format
2593msgid "fetch-pack: unable to fork off %s"
2594msgstr "fetch-pack:无法派生进程 %s"
5c57d762 2595
06991777 2596#: fetch-pack.c:871
a0b6b246
JX
2597#, c-format
2598msgid "%s failed"
2599msgstr "%s 失败"
14c8bced 2600
06991777 2601#: fetch-pack.c:873
a0b6b246
JX
2602msgid "error in sideband demultiplexer"
2603msgstr "sideband 多路输出出错"
c04f5ac3 2604
06991777 2605#: fetch-pack.c:902
a0b6b246
JX
2606msgid "Server does not support shallow clients"
2607msgstr "服务器不支持 shalllow 客户端"
c04f5ac3 2608
06991777 2609#: fetch-pack.c:906
a0b6b246
JX
2610msgid "Server supports multi_ack_detailed"
2611msgstr "服务器支持 multi_ack_detailed"
c04f5ac3 2612
06991777 2613#: fetch-pack.c:909
a0b6b246
JX
2614msgid "Server supports no-done"
2615msgstr "服务器支持 no-done"
c04f5ac3 2616
06991777 2617#: fetch-pack.c:915
a0b6b246
JX
2618msgid "Server supports multi_ack"
2619msgstr "服务器支持 multi_ack"
c04f5ac3 2620
06991777 2621#: fetch-pack.c:919
a0b6b246
JX
2622msgid "Server supports side-band-64k"
2623msgstr "服务器支持 side-band-64k"
c04f5ac3 2624
06991777 2625#: fetch-pack.c:923
a0b6b246
JX
2626msgid "Server supports side-band"
2627msgstr "服务器支持 side-band"
5c57d762 2628
06991777 2629#: fetch-pack.c:927
a0b6b246
JX
2630msgid "Server supports allow-tip-sha1-in-want"
2631msgstr "服务器支持 allow-tip-sha1-in-want"
c04f5ac3 2632
06991777 2633#: fetch-pack.c:931
a0b6b246
JX
2634msgid "Server supports allow-reachable-sha1-in-want"
2635msgstr "服务器支持 allow-reachable-sha1-in-want"
8ada9598 2636
06991777 2637#: fetch-pack.c:941
a0b6b246
JX
2638msgid "Server supports ofs-delta"
2639msgstr "服务器支持 ofs-delta"
8ada9598 2640
06991777 2641#: fetch-pack.c:947 fetch-pack.c:1140
31e5e17b
JX
2642msgid "Server supports filter"
2643msgstr "服务器支持 filter"
2644
06991777 2645#: fetch-pack.c:955
81809b99 2646#, c-format
a0b6b246
JX
2647msgid "Server version is %.*s"
2648msgstr "服务器版本 %.*s"
8ada9598 2649
06991777 2650#: fetch-pack.c:961
a0b6b246
JX
2651msgid "Server does not support --shallow-since"
2652msgstr "服务器不支持 --shallow-since"
8ada9598 2653
06991777 2654#: fetch-pack.c:965
a0b6b246
JX
2655msgid "Server does not support --shallow-exclude"
2656msgstr "服务器不支持 --shallow-exclude"
c04f5ac3 2657
06991777 2658#: fetch-pack.c:967
a0b6b246
JX
2659msgid "Server does not support --deepen"
2660msgstr "服务器不支持 --deepen"
c04f5ac3 2661
06991777 2662#: fetch-pack.c:984
a0b6b246
JX
2663msgid "no common commits"
2664msgstr "没有共同的提交"
c04f5ac3 2665
06991777 2666#: fetch-pack.c:996 fetch-pack.c:1419
a0b6b246
JX
2667msgid "git fetch-pack: fetch failed."
2668msgstr "git fetch-pack:获取失败。"
c04f5ac3 2669
06991777 2670#: fetch-pack.c:1134
fd8cb379
JX
2671msgid "Server does not support shallow requests"
2672msgstr "服务器不支持 shalllow 请求"
2673
06991777 2674#: fetch-pack.c:1184
c1ac5258
JX
2675#, c-format
2676msgid "error reading section header '%s'"
2677msgstr "读取节标题 '%s' 出错"
2678
06991777 2679#: fetch-pack.c:1190
c1ac5258
JX
2680#, c-format
2681msgid "expected '%s', received '%s'"
2682msgstr "预期 '%s',得到 '%s'"
2683
06991777 2684#: fetch-pack.c:1229
c1ac5258
JX
2685#, c-format
2686msgid "unexpected acknowledgment line: '%s'"
2687msgstr "意外的确认行:'%s'"
2688
06991777 2689#: fetch-pack.c:1234
c1ac5258
JX
2690#, c-format
2691msgid "error processing acks: %d"
2692msgstr "处理 ack 出错:%d"
2693
06991777 2694#: fetch-pack.c:1244
4c27fcb5
JX
2695msgid "expected packfile to be sent after 'ready'"
2696msgstr "预期在 'ready' 之后发送 packfile"
2697
06991777 2698#: fetch-pack.c:1246
4c27fcb5
JX
2699msgid "expected no other sections to be sent after no 'ready'"
2700msgstr "在没有 'ready' 不应该发送其它小节"
2701
06991777 2702#: fetch-pack.c:1287
c1ac5258
JX
2703#, c-format
2704msgid "error processing shallow info: %d"
2705msgstr "处理浅克隆信息出错:%d"
2706
06991777 2707#: fetch-pack.c:1308
c1ac5258
JX
2708#, c-format
2709msgid "expected wanted-ref, got '%s'"
2710msgstr "预期 wanted-ref,得到 '%s'"
2711
06991777 2712#: fetch-pack.c:1318
c1ac5258
JX
2713#, c-format
2714msgid "unexpected wanted-ref: '%s'"
2715msgstr "意外的 wanted-ref:'%s'"
2716
06991777 2717#: fetch-pack.c:1322
c1ac5258
JX
2718#, c-format
2719msgid "error processing wanted refs: %d"
2720msgstr "处理要获取的引用出错:%d"
2721
06991777 2722#: fetch-pack.c:1646
a0b6b246
JX
2723msgid "no matching remote head"
2724msgstr "没有匹配的远程分支"
c04f5ac3 2725
06991777 2726#: fetch-pack.c:1664 builtin/clone.c:671
c1ac5258 2727msgid "remote did not send all necessary objects"
e640d114 2728msgstr "远程没有发送所有必需的对象"
c1ac5258 2729
06991777 2730#: fetch-pack.c:1690
87cb7997
JX
2731#, c-format
2732msgid "no such remote ref %s"
2733msgstr "没有这样的远程引用 %s"
2734
06991777 2735#: fetch-pack.c:1693
87cb7997
JX
2736#, c-format
2737msgid "Server does not allow request for unadvertised object %s"
2738msgstr "服务器不允许请求未公开的对象 %s"
2739
4c27fcb5 2740#: gpg-interface.c:318
a0b6b246
JX
2741msgid "gpg failed to sign the data"
2742msgstr "gpg 无法为数据签名"
c04f5ac3 2743
4c27fcb5 2744#: gpg-interface.c:344
a0b6b246
JX
2745msgid "could not create temporary file"
2746msgstr "不能创建临时文件"
c04f5ac3 2747
4c27fcb5 2748#: gpg-interface.c:347
c04f5ac3 2749#, c-format
a0b6b246
JX
2750msgid "failed writing detached signature to '%s'"
2751msgstr "无法将分离式签名写入 '%s'"
c04f5ac3 2752
a4f16749 2753#: graph.c:97
1a79b2f1
JX
2754#, c-format
2755msgid "ignore invalid color '%.*s' in log.graphColors"
2756msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
2757
4c27fcb5 2758#: grep.c:2113
c04f5ac3 2759#, c-format
a0b6b246
JX
2760msgid "'%s': unable to read %s"
2761msgstr "'%s':无法读取 %s"
c04f5ac3 2762
06991777
JX
2763#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
2764#: builtin/rm.c:135
c04f5ac3 2765#, c-format
a0b6b246 2766msgid "failed to stat '%s'"
65e2041e 2767msgstr "对 '%s' 调用 stat 失败"
c04f5ac3 2768
4c27fcb5 2769#: grep.c:2141
a0b6b246
JX
2770#, c-format
2771msgid "'%s': short read"
2772msgstr "'%s':读取不完整"
5c57d762 2773
fd8cb379
JX
2774#: help.c:23
2775msgid "start a working area (see also: git help tutorial)"
2776msgstr "开始一个工作区(参见:git help tutorial)"
2777
2778#: help.c:24
2779msgid "work on the current change (see also: git help everyday)"
2780msgstr "在当前变更上工作(参见:git help everyday)"
2781
2782#: help.c:25
2783msgid "examine the history and state (see also: git help revisions)"
2784msgstr "检查历史和状态(参见:git help revisions)"
2785
2786#: help.c:26
2787msgid "grow, mark and tweak your common history"
2788msgstr "扩展、标记和调校您的历史记录"
2789
2790#: help.c:27
2791msgid "collaborate (see also: git help workflows)"
2792msgstr "协同(参见:git help workflows)"
2793
2794#: help.c:31
2795msgid "Main Porcelain Commands"
2796msgstr "主要的上层命令"
2797
2798#: help.c:32
2799msgid "Ancillary Commands / Manipulators"
2800msgstr "辅助命令/操作者"
2801
2802#: help.c:33
2803msgid "Ancillary Commands / Interrogators"
2804msgstr "辅助命令/询问者"
2805
2806#: help.c:34
2807msgid "Interacting with Others"
2808msgstr "与其它系统交互"
2809
2810#: help.c:35
2811msgid "Low-level Commands / Manipulators"
2812msgstr "低级命令/操作者"
2813
2814#: help.c:36
2815msgid "Low-level Commands / Interrogators"
2816msgstr "低级命令/询问者"
2817
2818#: help.c:37
2819msgid "Low-level Commands / Synching Repositories"
2820msgstr "低级命令/同步仓库"
2821
2822#: help.c:38
2823msgid "Low-level Commands / Internal Helpers"
2824msgstr "低级命令/内部助手"
2825
06991777 2826#: help.c:298
a0b6b246
JX
2827#, c-format
2828msgid "available git commands in '%s'"
2829msgstr "在 '%s' 下可用的 git 命令"
c04f5ac3 2830
06991777 2831#: help.c:305
a0b6b246
JX
2832msgid "git commands available from elsewhere on your $PATH"
2833msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
5c57d762 2834
06991777 2835#: help.c:314
a0b6b246
JX
2836msgid "These are common Git commands used in various situations:"
2837msgstr "这些是各种场合常见的 Git 命令:"
5c57d762 2838
06991777 2839#: help.c:363 git.c:90
fd8cb379
JX
2840#, c-format
2841msgid "unsupported command listing type '%s'"
2842msgstr "不支持的命令列表类型 '%s'"
2843
06991777 2844#: help.c:410
fd8cb379
JX
2845msgid "The common Git guides are:"
2846msgstr "最常用的 Git 向导有:"
2847
06991777 2848#: help.c:519
4c27fcb5
JX
2849msgid "See 'git help <command>' to read about a specific subcommand"
2850msgstr "执行 'git help <command>' 来查看特定子命令"
2851
06991777 2852#: help.c:524
4c27fcb5
JX
2853msgid "External commands"
2854msgstr "外部命令"
2855
06991777 2856#: help.c:539
4c27fcb5
JX
2857msgid "Command aliases"
2858msgstr "命令别名"
2859
06991777 2860#: help.c:603
c04f5ac3 2861#, c-format
a0b6b246
JX
2862msgid ""
2863"'%s' appears to be a git command, but we were not\n"
2864"able to execute it. Maybe git-%s is broken?"
2865msgstr ""
2866"'%s' 像是一个 git 命令,但却无法运行。\n"
2867"可能是 git-%s 受损?"
c04f5ac3 2868
06991777 2869#: help.c:662
a0b6b246
JX
2870msgid "Uh oh. Your system reports no Git commands at all."
2871msgstr "唉呀,您的系统中未发现 Git 命令。"
c04f5ac3 2872
06991777 2873#: help.c:684
c04f5ac3 2874#, c-format
a4f16749 2875msgid "WARNING: You called a Git command named '%s', which does not exist."
554e8501 2876msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。"
a4f16749 2877
06991777 2878#: help.c:689
a4f16749
JX
2879#, c-format
2880msgid "Continuing under the assumption that you meant '%s'."
554e8501 2881msgstr "假定你想要的是 '%s' 并继续。"
c04f5ac3 2882
06991777 2883#: help.c:694
c04f5ac3 2884#, c-format
a4f16749 2885msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
554e8501 2886msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。"
c04f5ac3 2887
06991777 2888#: help.c:702
c04f5ac3 2889#, c-format
a0b6b246
JX
2890msgid "git: '%s' is not a git command. See 'git --help'."
2891msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
c04f5ac3 2892
06991777 2893#: help.c:706
a4f16749
JX
2894msgid ""
2895"\n"
2896"The most similar command is"
2897msgid_plural ""
2898"\n"
2899"The most similar commands are"
6937cb4e
JX
2900msgstr[0] ""
2901"\n"
2902"最相似的命令是"
2903msgstr[1] ""
2904"\n"
2905"最相似的命令是"
a4f16749 2906
06991777 2907#: help.c:721
a4f16749
JX
2908msgid "git version [<options>]"
2909msgstr "git version [<选项>]"
2910
06991777 2911#: help.c:789
a4f16749
JX
2912#, c-format
2913msgid "%s: %s - %s"
2914msgstr "%s:%s - %s"
2915
06991777 2916#: help.c:793
a0b6b246
JX
2917msgid ""
2918"\n"
2919"Did you mean this?"
2920msgid_plural ""
2921"\n"
2922"Did you mean one of these?"
2923msgstr[0] ""
2924"\n"
2925"您指的是这个么?"
2926msgstr[1] ""
2927"\n"
2928"您指的是这其中的某一个么?"
c04f5ac3 2929
4c27fcb5 2930#: ident.c:345
a0b6b246
JX
2931msgid ""
2932"\n"
2933"*** Please tell me who you are.\n"
2934"\n"
2935"Run\n"
2936"\n"
2937" git config --global user.email \"you@example.com\"\n"
2938" git config --global user.name \"Your Name\"\n"
2939"\n"
2940"to set your account's default identity.\n"
2941"Omit --global to set the identity only in this repository.\n"
2942"\n"
2943msgstr ""
2944"\n"
2945"*** 请告诉我你是谁。\n"
2946"\n"
2947"运行\n"
2948"\n"
2949" git config --global user.email \"you@example.com\"\n"
2950" git config --global user.name \"Your Name\"\n"
2951"\n"
2952"来设置您账号的缺省身份标识。\n"
2953"如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
c04f5ac3 2954
4c27fcb5 2955#: ident.c:369
87cb7997 2956msgid "no email was given and auto-detection is disabled"
65e2041e 2957msgstr "未提供邮件地址且自动探测被禁用"
87cb7997 2958
4c27fcb5 2959#: ident.c:374
87cb7997
JX
2960#, c-format
2961msgid "unable to auto-detect email address (got '%s')"
2962msgstr "无法自动探测邮件地址(得到 '%s')"
2963
4c27fcb5 2964#: ident.c:384
87cb7997
JX
2965msgid "no name was given and auto-detection is disabled"
2966msgstr "未提供姓名且自动探测被禁用"
2967
4c27fcb5 2968#: ident.c:390
87cb7997
JX
2969#, c-format
2970msgid "unable to auto-detect name (got '%s')"
2971msgstr "无法自动探测姓名(得到 '%s')"
2972
4c27fcb5 2973#: ident.c:398
87cb7997
JX
2974#, c-format
2975msgid "empty ident name (for <%s>) not allowed"
2976msgstr "不允许空的姓名(对于 <%s>)"
2977
4c27fcb5 2978#: ident.c:404
87cb7997
JX
2979#, c-format
2980msgid "name consists only of disallowed characters: %s"
2981msgstr "姓名中仅包含禁用字符:%s"
2982
06991777 2983#: ident.c:419 builtin/commit.c:608
87cb7997
JX
2984#, c-format
2985msgid "invalid date format: %s"
2986msgstr "无效的日期格式:%s"
2987
06991777 2988#: list-objects-filter-options.c:36
31e5e17b
JX
2989msgid "multiple filter-specs cannot be combined"
2990msgstr "不能混用多种过滤规格"
5809aa05 2991
4c27fcb5 2992#: list-objects-filter-options.c:58
06991777
JX
2993msgid "expected 'tree:<depth>'"
2994msgstr "期望 'tree:<深度>'"
4c27fcb5 2995
06991777 2996#: list-objects-filter-options.c:152
31e5e17b
JX
2997msgid "cannot change partial clone promisor remote"
2998msgstr "无法修改部分克隆的 promisor 远程仓库"
5809aa05 2999
6937cb4e 3000#: lockfile.c:151
c04f5ac3 3001#, c-format
a0b6b246
JX
3002msgid ""
3003"Unable to create '%s.lock': %s.\n"
3004"\n"
3005"Another git process seems to be running in this repository, e.g.\n"
3006"an editor opened by 'git commit'. Please make sure all processes\n"
3007"are terminated then try again. If it still fails, a git process\n"
3008"may have crashed in this repository earlier:\n"
3009"remove the file manually to continue."
3010msgstr ""
3011"无法创建 '%s.lock':%s。\n"
3012"\n"
3013"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
3014"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
3015"可能之前有一个 git 进程在这个仓库中异常退出:\n"
3016"手动删除这个文件再继续。"
c04f5ac3 3017
6937cb4e 3018#: lockfile.c:159
a0b6b246
JX
3019#, c-format
3020msgid "Unable to create '%s.lock': %s"
3021msgstr "不能创建 '%s.lock':%s"
c04f5ac3 3022
4c27fcb5 3023#: merge.c:41
a0b6b246 3024msgid "failed to read the cache"
c1ac5258 3025msgstr "读取缓存失败"
c04f5ac3 3026
06991777
JX
3027#: merge.c:107 rerere.c:720 builtin/am.c:1884 builtin/am.c:1918
3028#: builtin/checkout.c:416 builtin/checkout.c:745 builtin/clone.c:771
a0b6b246
JX
3029msgid "unable to write new index file"
3030msgstr "无法写新的索引文件"
c04f5ac3 3031
06991777 3032#: merge-recursive.c:332
a0b6b246
JX
3033msgid "(bad commit)\n"
3034msgstr "(坏提交)\n"
c04f5ac3 3035
06991777 3036#: merge-recursive.c:355
a0b6b246 3037#, c-format
fd8cb379 3038msgid "add_cacheinfo failed for path '%s'; merge aborting."
0fcd668f 3039msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。"
c04f5ac3 3040
06991777 3041#: merge-recursive.c:364
fd8cb379
JX
3042#, c-format
3043msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
0fcd668f 3044msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。"
fd8cb379 3045
06991777 3046#: merge-recursive.c:447
a0b6b246 3047msgid "error building trees"
c1ac5258 3048msgstr "创建树出错"
c04f5ac3 3049
06991777 3050#: merge-recursive.c:902
c04f5ac3 3051#, c-format
a0b6b246 3052msgid "failed to create path '%s'%s"
c1ac5258 3053msgstr "创建路径 '%s'%s 失败"
c04f5ac3 3054
06991777 3055#: merge-recursive.c:913
c04f5ac3 3056#, c-format
a0b6b246
JX
3057msgid "Removing %s to make room for subdirectory\n"
3058msgstr "删除 %s 以便为子目录留出空间\n"
c04f5ac3 3059
06991777 3060#: merge-recursive.c:927 merge-recursive.c:946
a0b6b246
JX
3061msgid ": perhaps a D/F conflict?"
3062msgstr ":可能是一个目录/文件冲突?"
c04f5ac3 3063
06991777 3064#: merge-recursive.c:936
c04f5ac3 3065#, c-format
a0b6b246
JX
3066msgid "refusing to lose untracked file at '%s'"
3067msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
c04f5ac3 3068
06991777 3069#: merge-recursive.c:978 builtin/cat-file.c:40
c04f5ac3 3070#, c-format
a0b6b246
JX
3071msgid "cannot read object %s '%s'"
3072msgstr "不能读取对象 %s '%s'"
c04f5ac3 3073
06991777 3074#: merge-recursive.c:980
4dcdc3d8 3075#, c-format
a0b6b246
JX
3076msgid "blob expected for %s '%s'"
3077msgstr "%s '%s' 应为数据对象"
4dcdc3d8 3078
06991777 3079#: merge-recursive.c:1004
4dcdc3d8 3080#, c-format
a0b6b246 3081msgid "failed to open '%s': %s"
c1ac5258 3082msgstr "打开 '%s' 失败:%s"
4dcdc3d8 3083
06991777 3084#: merge-recursive.c:1015
a0b6b246
JX
3085#, c-format
3086msgid "failed to symlink '%s': %s"
c1ac5258 3087msgstr "创建符号链接 '%s' 失败:%s"
c04f5ac3 3088
06991777 3089#: merge-recursive.c:1020
5c57d762 3090#, c-format
a0b6b246
JX
3091msgid "do not know what to do with %06o %s '%s'"
3092msgstr "不知道如何处理 %06o %s '%s'"
5c57d762 3093
06991777 3094#: merge-recursive.c:1211
fd8cb379
JX
3095#, c-format
3096msgid "Failed to merge submodule %s (not checked out)"
3097msgstr "无法合并子模组 %s (没有检出)"
3098
06991777 3099#: merge-recursive.c:1218
fd8cb379
JX
3100#, c-format
3101msgid "Failed to merge submodule %s (commits not present)"
3102msgstr "无法合并子模组 %s(提交不存在)"
3103
06991777 3104#: merge-recursive.c:1225
fd8cb379
JX
3105#, c-format
3106msgid "Failed to merge submodule %s (commits don't follow merge-base)"
3107msgstr "无法合并子模组 %s (提交未跟随合并基线)"
3108
06991777 3109#: merge-recursive.c:1233 merge-recursive.c:1245
fd8cb379
JX
3110#, c-format
3111msgid "Fast-forwarding submodule %s to the following commit:"
3112msgstr "子模组 %s 快进到如下提交:"
3113
06991777 3114#: merge-recursive.c:1236 merge-recursive.c:1248
fd8cb379
JX
3115#, c-format
3116msgid "Fast-forwarding submodule %s"
3117msgstr "快进子模组 %s"
3118
4c27fcb5 3119#: merge-recursive.c:1271
fd8cb379
JX
3120#, c-format
3121msgid "Failed to merge submodule %s (merge following commits not found)"
3122msgstr "无法合并子模组 %s (没发现合并跟随的提交)"
3123
4c27fcb5 3124#: merge-recursive.c:1275
fd8cb379
JX
3125#, c-format
3126msgid "Failed to merge submodule %s (not fast-forward)"
3127msgstr "无法合并子模组 %s(非快进)"
3128
4c27fcb5 3129#: merge-recursive.c:1276
fd8cb379
JX
3130msgid "Found a possible merge resolution for the submodule:\n"
3131msgstr "找到子模组的一个可能的合并方案:\n"
3132
4c27fcb5 3133#: merge-recursive.c:1279
fd8cb379
JX
3134#, c-format
3135msgid ""
3136"If this is correct simply add it to the index for example\n"
3137"by using:\n"
3138"\n"
3139" git update-index --cacheinfo 160000 %s \"%s\"\n"
3140"\n"
3141"which will accept this suggestion.\n"
3142msgstr ""
3143"如果这个正确,将其添加到索引,例如使用命令:\n"
3144"\n"
3145" git update-index --cacheinfo 160000 %s \"%s\"\n"
3146"\n"
3147"以接受此建议。\n"
3148
4c27fcb5 3149#: merge-recursive.c:1288
fd8cb379
JX
3150#, c-format
3151msgid "Failed to merge submodule %s (multiple merges found)"
3152msgstr "无法合并子模组 %s (发现多个合并)"
3153
06991777 3154#: merge-recursive.c:1361
a0b6b246
JX
3155msgid "Failed to execute internal merge"
3156msgstr "无法执行内部合并"
3157
06991777 3158#: merge-recursive.c:1366
5c57d762 3159#, c-format
a0b6b246
JX
3160msgid "Unable to add %s to database"
3161msgstr "不能添加 %s 至对象库"
5c57d762 3162
06991777 3163#: merge-recursive.c:1398
fd8cb379
JX
3164#, c-format
3165msgid "Auto-merging %s"
3166msgstr "自动合并 %s"
3167
06991777 3168#: merge-recursive.c:1419
fd8cb379
JX
3169#, c-format
3170msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
3171msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。"
3172
06991777 3173#: merge-recursive.c:1486
5c57d762
JX
3174#, c-format
3175msgid ""
a0b6b246
JX
3176"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
3177"in tree."
5c57d762 3178msgstr ""
87cb7997
JX
3179"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
3180"本被保留。"
3181
06991777 3182#: merge-recursive.c:1491
87cb7997
JX
3183#, c-format
3184msgid ""
3185"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
3186"left in tree."
3187msgstr ""
3188"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
3189"%7$s 版本被保留。"
c04f5ac3 3190
06991777 3191#: merge-recursive.c:1498
7aea43ff 3192#, c-format
a0b6b246
JX
3193msgid ""
3194"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
3195"in tree at %s."
3196msgstr ""
87cb7997
JX
3197"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
3198"本保留在 %8$s 中。"
7aea43ff 3199
06991777 3200#: merge-recursive.c:1503
87cb7997
JX
3201#, c-format
3202msgid ""
3203"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
3204"left in tree at %s."
3205msgstr ""
3206"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
3207"%7$s 版本保留在 %9$s 中。"
3208
06991777 3209#: merge-recursive.c:1537
a0b6b246
JX
3210msgid "rename"
3211msgstr "重命名"
5b04ee3b 3212
06991777 3213#: merge-recursive.c:1537
a0b6b246
JX
3214msgid "renamed"
3215msgstr "重命名"
5b04ee3b 3216
06991777 3217#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213
fd8cb379
JX
3218#, c-format
3219msgid "Refusing to lose dirty file at %s"
3220msgstr "拒绝丢失脏文件 '%s'"
3221
06991777
JX
3222#: merge-recursive.c:1643
3223#, c-format
3224msgid "Refusing to lose untracked file at %s, even though it's in the way."
3225msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。"
3226
3227#: merge-recursive.c:1706
3228#, c-format
3229msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
3230msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
3231
3232#: merge-recursive.c:1734
5c57d762 3233#, c-format
a0b6b246
JX
3234msgid "%s is a directory in %s adding as %s instead"
3235msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
5c57d762 3236
06991777 3237#: merge-recursive.c:1739
fd8cb379
JX
3238#, c-format
3239msgid "Refusing to lose untracked file at %s; adding as %s instead"
3240msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s"
3241
06991777 3242#: merge-recursive.c:1759
5c57d762
JX
3243#, c-format
3244msgid ""
a0b6b246
JX
3245"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
3246"\"->\"%s\" in \"%s\"%s"
5c57d762 3247msgstr ""
a0b6b246
JX
3248"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
3249"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
5c57d762 3250
06991777 3251#: merge-recursive.c:1764
a0b6b246
JX
3252msgid " (left unresolved)"
3253msgstr "(留下未解决)"
5c57d762 3254
06991777 3255#: merge-recursive.c:1868
5c57d762 3256#, c-format
a0b6b246 3257msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
5c57d762 3258msgstr ""
a0b6b246
JX
3259"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
3260"%5$s"
3495628d 3261
06991777 3262#: merge-recursive.c:2064
fd8cb379
JX
3263#, c-format
3264msgid ""
3265"CONFLICT (directory rename split): Unclear where to place %s because "
3266"directory %s was renamed to multiple other directories, with no destination "
3267"getting a majority of the files."
c1ac5258
JX
3268msgstr ""
3269"冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个"
3270"其它目录,没有目录包含大部分文件。"
fd8cb379 3271
06991777 3272#: merge-recursive.c:2096
fd8cb379
JX
3273#, c-format
3274msgid ""
3275"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
3276"implicit directory rename(s) putting the following path(s) there: %s."
3277msgstr ""
3278"冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放"
3279"在:%s。"
3280
06991777 3281#: merge-recursive.c:2106
fd8cb379
JX
3282#, c-format
3283msgid ""
3284"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
3285"implicit directory renames tried to put these paths there: %s"
3286msgstr ""
3287"冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路"
3288"径放置于此:%s"
3289
06991777 3290#: merge-recursive.c:2198
fd8cb379
JX
3291#, c-format
3292msgid ""
3293"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
3294">%s in %s"
3295msgstr ""
3296"冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 "
3297"%4$s->%5$s"
3298
06991777 3299#: merge-recursive.c:2443
fd8cb379
JX
3300#, c-format
3301msgid ""
3302"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
3303"renamed."
3304msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。"
3305
06991777 3306#: merge-recursive.c:3022
90314792 3307#, c-format
a0b6b246
JX
3308msgid "cannot read object %s"
3309msgstr "不能读取对象 %s"
90314792 3310
06991777 3311#: merge-recursive.c:3025
90314792 3312#, c-format
a0b6b246
JX
3313msgid "object %s is not a blob"
3314msgstr "对象 %s 不是一个数据对象"
90314792 3315
06991777 3316#: merge-recursive.c:3094
a0b6b246
JX
3317msgid "modify"
3318msgstr "修改"
90314792 3319
06991777 3320#: merge-recursive.c:3094
a0b6b246
JX
3321msgid "modified"
3322msgstr "修改"
5b04ee3b 3323
06991777 3324#: merge-recursive.c:3105
a0b6b246
JX
3325msgid "content"
3326msgstr "内容"
5b04ee3b 3327
06991777 3328#: merge-recursive.c:3112
a0b6b246
JX
3329msgid "add/add"
3330msgstr "添加/添加"
3495628d 3331
06991777 3332#: merge-recursive.c:3160
220c313c 3333#, c-format
a0b6b246
JX
3334msgid "Skipped %s (merged same as existing)"
3335msgstr "略过 %s(已经做过相同合并)"
220c313c 3336
06991777 3337#: merge-recursive.c:3182 git-submodule.sh:861
a0b6b246
JX
3338msgid "submodule"
3339msgstr "子模组"
3340
06991777 3341#: merge-recursive.c:3183
220c313c 3342#, c-format
a0b6b246
JX
3343msgid "CONFLICT (%s): Merge conflict in %s"
3344msgstr "冲突(%s):合并冲突于 %s"
220c313c 3345
4c27fcb5 3346#: merge-recursive.c:3216
220c313c 3347#, c-format
06991777
JX
3348msgid "Adding as %s instead"
3349msgstr "而是以 %s 为名添加"
3350
3351#: merge-recursive.c:3319
3352#, c-format
a0b6b246
JX
3353msgid "Removing %s"
3354msgstr "删除 %s"
220c313c 3355
06991777 3356#: merge-recursive.c:3345
a0b6b246
JX
3357msgid "file/directory"
3358msgstr "文件/目录"
220c313c 3359
06991777 3360#: merge-recursive.c:3351
a0b6b246
JX
3361msgid "directory/file"
3362msgstr "目录/文件"
276ceeaa 3363
06991777 3364#: merge-recursive.c:3358
276ceeaa 3365#, c-format
a0b6b246
JX
3366msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
3367msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
276ceeaa 3368
06991777 3369#: merge-recursive.c:3367
276ceeaa 3370#, c-format
a0b6b246
JX
3371msgid "Adding %s"
3372msgstr "添加 %s"
276ceeaa 3373
06991777
JX
3374#: merge-recursive.c:3376
3375#, c-format
3376msgid "CONFLICT (add/add): Merge conflict in %s"
3377msgstr "冲突(add/add):合并冲突于 %s"
3378
3379#: merge-recursive.c:3417
5809aa05 3380#, c-format
c1ac5258
JX
3381msgid ""
3382"Your local changes to the following files would be overwritten by merge:\n"
3383" %s"
3384msgstr ""
3385"您对下列文件的本地修改将被合并操作覆盖:\n"
3386" %s"
5809aa05 3387
06991777 3388#: merge-recursive.c:3428
6937cb4e 3389msgid "Already up to date!"
a0b6b246 3390msgstr "已经是最新的!"
276ceeaa 3391
06991777 3392#: merge-recursive.c:3437
276ceeaa 3393#, c-format
a0b6b246
JX
3394msgid "merging of trees %s and %s failed"
3395msgstr "无法合并树 %s 和 %s"
276ceeaa 3396
06991777 3397#: merge-recursive.c:3536
a0b6b246
JX
3398msgid "Merging:"
3399msgstr "合并:"
5c57d762 3400
06991777 3401#: merge-recursive.c:3549
5c57d762 3402#, c-format
a0b6b246
JX
3403msgid "found %u common ancestor:"
3404msgid_plural "found %u common ancestors:"
3405msgstr[0] "发现 %u 个共同祖先:"
3406msgstr[1] "发现 %u 个共同祖先:"
3407
06991777 3408#: merge-recursive.c:3588
a0b6b246
JX
3409msgid "merge returned no commit"
3410msgstr "合并未返回提交"
3411
06991777 3412#: merge-recursive.c:3654
5c57d762 3413#, c-format
a0b6b246
JX
3414msgid "Could not parse object '%s'"
3415msgstr "不能解析对象 '%s'"
5c57d762 3416
06991777 3417#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850
a0b6b246
JX
3418msgid "Unable to write index."
3419msgstr "不能写入索引。"
3420
4c27fcb5
JX
3421#: midx.c:65
3422#, c-format
3423msgid "multi-pack-index file %s is too small"
3424msgstr "多包索引文件 %s 太小"
3425
3426#: midx.c:81
3427#, c-format
3428msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
3429msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
3430
3431#: midx.c:86
3432#, c-format
3433msgid "multi-pack-index version %d not recognized"
3434msgstr "multi-pack-index 版本 %d 不能被识别"
3435
3436#: midx.c:91
3437#, c-format
3438msgid "hash version %u does not match"
3439msgstr "散列版本 %u 不匹配"
3440
3441#: midx.c:105
3442msgid "invalid chunk offset (too large)"
3443msgstr "无效的块偏移(太大)"
3444
3445#: midx.c:129
3446msgid "terminating multi-pack-index chunk id appears earlier than expected"
3447msgstr "终止多包索引块 id 出现时间早于预期"
3448
3449#: midx.c:142
3450msgid "multi-pack-index missing required pack-name chunk"
3451msgstr "多包索引缺少必需的包名块"
3452
3453#: midx.c:144
3454msgid "multi-pack-index missing required OID fanout chunk"
3455msgstr "多包索引缺少必需的 OID 扇出块"
3456
3457#: midx.c:146
3458msgid "multi-pack-index missing required OID lookup chunk"
3459msgstr "多包索引缺少必需的 OID 查询块"
3460
3461#: midx.c:148
3462msgid "multi-pack-index missing required object offsets chunk"
3463msgstr "多包索引缺少必需的对象偏移块"
3464
3465#: midx.c:162
3466#, c-format
3467msgid "multi-pack-index pack names out of order: '%s' before '%s'"
3468msgstr "多包索引包名无序:'%s' 在 '%s' 之前"
3469
3470#: midx.c:205
3471#, c-format
3472msgid "bad pack-int-id: %u (%u total packs)"
3473msgstr "错的 pack-int-id:%u(共有 %u 个包)"
3474
3475#: midx.c:246
3476msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
3477msgstr "多包索引存储一个64位偏移,但是 off_t 太小"
3478
3479#: midx.c:271
3480msgid "error preparing packfile from multi-pack-index"
3481msgstr "从多包索引准备 packfile 出错"
3482
3483#: midx.c:407
3484#, c-format
3485msgid "failed to add packfile '%s'"
3486msgstr "添加包文件 '%s' 失败"
3487
3488#: midx.c:413
3489#, c-format
3490msgid "failed to open pack-index '%s'"
3491msgstr "打开包索引 '%s' 失败"
3492
3493#: midx.c:507
3494#, c-format
3495msgid "failed to locate object %d in packfile"
3496msgstr "在包文件中定位对象 %d 失败"
3497
3498#: midx.c:943
3499#, c-format
3500msgid "failed to clear multi-pack-index at %s"
3501msgstr "清理位于 %s 的多包索引失败"
3502
3503#: midx.c:981
3504#, c-format
3505msgid ""
3506"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
06991777 3507msgstr "对象ID扇出无序:fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
4c27fcb5
JX
3508
3509#: midx.c:992
3510#, c-format
3511msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
06991777 3512msgstr "对象ID查询无序:oid[%d] = %s >= %s = oid[%d]"
4c27fcb5
JX
3513
3514#: midx.c:996
3515msgid "Verifying object offsets"
3516msgstr "校验对象偏移"
3517
3518#: midx.c:1004
3519#, c-format
3520msgid "failed to load pack entry for oid[%d] = %s"
3521msgstr "为 oid[%d] = %s 加载包条目失败"
3522
3523#: midx.c:1010
3524#, c-format
3525msgid "failed to load pack-index for packfile %s"
3526msgstr "为包文件 %s 加载包索引失败"
3527
3528#: midx.c:1019
3529#, c-format
3530msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
3531msgstr "oid[%d] = %s 错误的对象偏移:%<PRIx64> != %<PRIx64>"
3532
06991777 3533#: name-hash.c:531
4c27fcb5
JX
3534#, c-format
3535msgid "unable to create lazy_dir thread: %s"
3536msgstr "不能创建 lazy_dir 线程:%s"
3537
06991777 3538#: name-hash.c:553
4c27fcb5
JX
3539#, c-format
3540msgid "unable to create lazy_name thread: %s"
3541msgstr "不能创建 lazy_name 线程:%s"
3542
06991777 3543#: name-hash.c:559
4c27fcb5
JX
3544#, c-format
3545msgid "unable to join lazy_name thread: %s"
3546msgstr "不能加入 lasy_name 线程:%s"
3547
06991777 3548#: notes-merge.c:277
5c57d762
JX
3549#, c-format
3550msgid ""
a0b6b246
JX
3551"You have not concluded your previous notes merge (%s exists).\n"
3552"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
3553"commit/abort the previous merge before you start a new notes merge."
5c57d762 3554msgstr ""
29004bbb 3555"您的前一次注释合并尚未结束(存在 %s)。\n"
1a79b2f1
JX
3556"在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
3557"notes merge --abort' 来提交/终止前一次合并。"
5c57d762 3558
06991777 3559#: notes-merge.c:284
a0b6b246
JX
3560#, c-format
3561msgid "You have not concluded your notes merge (%s exists)."
3562msgstr "您尚未结束注释合并(存在 %s)。"
3563
06991777 3564#: notes-utils.c:46
a0b6b246
JX
3565msgid "Cannot commit uninitialized/unreferenced notes tree"
3566msgstr "不能提交未初始化/未引用的注解树"
5c57d762 3567
06991777 3568#: notes-utils.c:105
1b7f4a34 3569#, c-format
a0b6b246
JX
3570msgid "Bad notes.rewriteMode value: '%s'"
3571msgstr "坏的 notes.rewriteMode 值:'%s'"
1b7f4a34 3572
06991777 3573#: notes-utils.c:115
5b04ee3b 3574#, c-format
a0b6b246
JX
3575msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
3576msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
5b04ee3b 3577
a4f16749
JX
3578#. TRANSLATORS: The first %s is the name of
3579#. the environment variable, the second %s is
3580#. its value.
3581#.
06991777 3582#: notes-utils.c:145
5b04ee3b 3583#, c-format
a0b6b246
JX
3584msgid "Bad %s value: '%s'"
3585msgstr "坏的 %s 值:'%s'"
5b04ee3b 3586
c1ac5258
JX
3587#: object.c:54
3588#, c-format
3589msgid "invalid object type \"%s\""
3590msgstr "无效的对象类型 \"%s\""
3591
06991777 3592#: object.c:174
c1ac5258
JX
3593#, c-format
3594msgid "object %s is a %s, not a %s"
3595msgstr "对象 %s 是一个 %s,不是一个 %s"
3596
06991777 3597#: object.c:234
c1ac5258
JX
3598#, c-format
3599msgid "object %s has unknown type id %d"
3600msgstr "对象 %s 有未知的类型 id %d"
3601
06991777 3602#: object.c:247
5b04ee3b 3603#, c-format
a0b6b246
JX
3604msgid "unable to parse object: %s"
3605msgstr "不能解析对象:%s"
5b04ee3b 3606
06991777 3607#: object.c:267 object.c:278
c1ac5258 3608#, c-format
06991777
JX
3609msgid "hash mismatch %s"
3610msgstr "哈希值与 %s 不匹配"
c1ac5258 3611
4c27fcb5 3612#: packfile.c:607
6937cb4e
JX
3613msgid "offset before end of packfile (broken .idx?)"
3614msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
3615
06991777 3616#: packfile.c:1870
6937cb4e
JX
3617#, c-format
3618msgid "offset before start of pack index for %s (corrupt index?)"
3619msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
3620
06991777 3621#: packfile.c:1874
6937cb4e
JX
3622#, c-format
3623msgid "offset beyond end of pack index for %s (truncated index?)"
3624msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
3625
06991777
JX
3626#: parse-options.c:35
3627#, c-format
3628msgid "%s requires a value"
3629msgstr "'%s' 需要一个值"
3630
3631#: parse-options.c:69
3632#, c-format
3633msgid "%s is incompatible with %s"
3634msgstr "%s 与 %s 不兼容"
3635
3636#: parse-options.c:74
3637#, c-format
3638msgid "%s : incompatible with something else"
3639msgstr "%s:和其它的不兼容"
3640
3641#: parse-options.c:88 parse-options.c:92 parse-options.c:260
3642#, c-format
3643msgid "%s takes no value"
3644msgstr "%s 无取值"
3645
3646#: parse-options.c:90
3647#, c-format
3648msgid "%s isn't available"
3649msgstr "%s 不可用"
3650
3651#: parse-options.c:178
3652#, c-format
3653msgid "%s expects a numerical value"
3654msgstr "%s 期望一个数字值"
3655
3656#: parse-options.c:194
3657#, c-format
3658msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
3659msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
3660
3661#: parse-options.c:322
3662#, c-format
3663msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
3664msgstr "模棱两可的选项:%s(可以是 --%s%s 或 --%s%s)"
3665
3666#: parse-options.c:356 parse-options.c:364
3667#, c-format
3668msgid "did you mean `--%s` (with two dashes ?)"
3669msgstr "你的意思是 `--%s`(有两个短线?)"
3670
3671#: parse-options.c:649
3672#, c-format
3673msgid "unknown option `%s'"
3674msgstr "未知选项 `%s'"
3675
3676#: parse-options.c:651
3677#, c-format
3678msgid "unknown switch `%c'"
3679msgstr "未知开关 `%c'"
3680
3681#: parse-options.c:653
3682#, c-format
3683msgid "unknown non-ascii option in string: `%s'"
3684msgstr "字符串中未知的非ascii字符选项:`%s'"
3685
3686#: parse-options.c:675
a0b6b246
JX
3687msgid "..."
3688msgstr "..."
3689
06991777 3690#: parse-options.c:694
5b04ee3b 3691#, c-format
a0b6b246
JX
3692msgid "usage: %s"
3693msgstr "用法:%s"
5b04ee3b 3694
a0b6b246 3695#. TRANSLATORS: the colon here should align with the
a4f16749
JX
3696#. one in "usage: %s" translation.
3697#.
06991777 3698#: parse-options.c:700
5b04ee3b 3699#, c-format
a0b6b246
JX
3700msgid " or: %s"
3701msgstr " 或:%s"
5b04ee3b 3702
a0b6b246 3703# 译者:为保证在输出中对齐,注意调整句中空格!
06991777 3704#: parse-options.c:703
5b04ee3b 3705#, c-format
a0b6b246
JX
3706msgid " %s"
3707msgstr " %s"
5b04ee3b 3708
06991777 3709#: parse-options.c:742
a0b6b246
JX
3710msgid "-NUM"
3711msgstr "-数字"
3712
06991777
JX
3713#: parse-options-cb.c:21
3714#, c-format
3715msgid "option `%s' expects a numerical value"
3716msgstr "选项 `%s' 期望一个数字值"
3717
3718#: parse-options-cb.c:38
fd8cb379
JX
3719#, c-format
3720msgid "malformed expiration date '%s'"
3721msgstr "格式错误的到期时间:'%s'"
3722
06991777
JX
3723#: parse-options-cb.c:51
3724#, c-format
3725msgid "option `%s' expects \"always\", \"auto\", or \"never\""
3726msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
3727
3728#: parse-options-cb.c:110
5b04ee3b 3729#, c-format
a0b6b246 3730msgid "malformed object name '%s'"
fd8cb379 3731msgstr "格式错误的对象名 '%s'"
5b04ee3b 3732
4c27fcb5 3733#: path.c:894
5b04ee3b 3734#, c-format
a0b6b246
JX
3735msgid "Could not make %s writable by group"
3736msgstr "不能设置 %s 为组可写"
3737
06991777 3738#: pathspec.c:128
87cb7997
JX
3739msgid "Escape character '\\' not allowed as last character in attr value"
3740msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
3741
06991777 3742#: pathspec.c:146
87cb7997
JX
3743msgid "Only one 'attr:' specification is allowed."
3744msgstr "只允许一个 'attr:' 规格。"
3745
06991777 3746#: pathspec.c:149
87cb7997
JX
3747msgid "attr spec must not be empty"
3748msgstr "属性规格不能为空"
3749
06991777 3750#: pathspec.c:192
87cb7997
JX
3751#, c-format
3752msgid "invalid attribute name %s"
3753msgstr "无效的属性名 %s"
3754
06991777 3755#: pathspec.c:257
a0b6b246
JX
3756msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
3757msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
3758
06991777 3759#: pathspec.c:264
5b04ee3b 3760msgid ""
a0b6b246
JX
3761"global 'literal' pathspec setting is incompatible with all other global "
3762"pathspec settings"
3763msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
5b04ee3b 3764
06991777 3765#: pathspec.c:304
a0b6b246
JX
3766msgid "invalid parameter for pathspec magic 'prefix'"
3767msgstr "路径规格包含无效的神奇前缀"
3768
06991777 3769#: pathspec.c:325
5b04ee3b 3770#, c-format
a0b6b246
JX
3771msgid "Invalid pathspec magic '%.*s' in '%s'"
3772msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
5b04ee3b 3773
06991777 3774#: pathspec.c:330
5b04ee3b 3775#, c-format
a0b6b246
JX
3776msgid "Missing ')' at the end of pathspec magic in '%s'"
3777msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
5b04ee3b 3778
06991777 3779#: pathspec.c:368
5b04ee3b 3780#, c-format
a0b6b246
JX
3781msgid "Unimplemented pathspec magic '%c' in '%s'"
3782msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
5b04ee3b 3783
06991777 3784#: pathspec.c:427
5b04ee3b 3785#, c-format
a0b6b246
JX
3786msgid "%s: 'literal' and 'glob' are incompatible"
3787msgstr "%s:'literal' 和 'glob' 不兼容"
5b04ee3b 3788
06991777 3789#: pathspec.c:440
5b04ee3b 3790#, c-format
a0b6b246
JX
3791msgid "%s: '%s' is outside repository"
3792msgstr "%s:'%s' 在仓库之外"
5b04ee3b 3793
06991777 3794#: pathspec.c:514
5b04ee3b 3795#, c-format
1a79b2f1
JX
3796msgid "'%s' (mnemonic: '%c')"
3797msgstr "'%s'(助记符:'%c')"
5b04ee3b 3798
06991777 3799#: pathspec.c:524
5b04ee3b 3800#, c-format
a0b6b246
JX
3801msgid "%s: pathspec magic not supported by this command: %s"
3802msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
3803
06991777 3804#: pathspec.c:591
5b04ee3b 3805#, c-format
a0b6b246
JX
3806msgid "pathspec '%s' is beyond a symbolic link"
3807msgstr "路径规格 '%s' 位于符号链接中"
3808
c1ac5258
JX
3809#: pkt-line.c:104
3810msgid "flush packet write failed"
3811msgstr "flush 包写错误"
3812
06991777 3813#: pkt-line.c:144 pkt-line.c:230
c1ac5258
JX
3814msgid "protocol error: impossibly long line"
3815msgstr "协议错误:不可能的长行"
3816
06991777 3817#: pkt-line.c:160 pkt-line.c:162
c1ac5258
JX
3818msgid "packet write with format failed"
3819msgstr "格式化包写入错误"
3820
06991777 3821#: pkt-line.c:194
c1ac5258
JX
3822msgid "packet write failed - data exceeds max packet size"
3823msgstr "写数据包失败:数据超过了包的最大长度"
3824
06991777 3825#: pkt-line.c:201 pkt-line.c:208
c1ac5258
JX
3826msgid "packet write failed"
3827msgstr "数据包写入失败"
3828
06991777 3829#: pkt-line.c:293
c1ac5258
JX
3830msgid "read error"
3831msgstr "读取错误"
3832
06991777 3833#: pkt-line.c:301
c1ac5258
JX
3834msgid "the remote end hung up unexpectedly"
3835msgstr "远端意外挂断了"
3836
06991777 3837#: pkt-line.c:329
c1ac5258
JX
3838#, c-format
3839msgid "protocol error: bad line length character: %.4s"
3840msgstr "协议错误:错误的行长度字符串:%.4s"
3841
06991777 3842#: pkt-line.c:339 pkt-line.c:344
c1ac5258
JX
3843#, c-format
3844msgid "protocol error: bad line length %d"
3845msgstr "协议错误:错误的行长度 %d"
3846
06991777
JX
3847#: pkt-line.c:353
3848#, c-format
3849msgid "remote error: %s"
3850msgstr "远程错误:%s"
3851
3852#: preload-index.c:119
4c27fcb5
JX
3853msgid "Refreshing index"
3854msgstr "正在刷新索引"
3855
06991777 3856#: preload-index.c:138
4c27fcb5
JX
3857#, c-format
3858msgid "unable to create threaded lstat: %s"
3859msgstr "无法创建线程 lstat:%s"
3860
06991777 3861#: pretty.c:963
a0b6b246
JX
3862msgid "unable to parse --pretty format"
3863msgstr "不能解析 --pretty 格式"
3864
4c27fcb5 3865#: range-diff.c:56
c1ac5258
JX
3866msgid "could not start `log`"
3867msgstr "不能启动 `log`"
3868
4c27fcb5 3869#: range-diff.c:59
c1ac5258
JX
3870msgid "could not read `log` output"
3871msgstr "不能读取 `log` 的输出"
3872
06991777 3873#: range-diff.c:74 sequencer.c:4828
c1ac5258
JX
3874#, c-format
3875msgid "could not parse commit '%s'"
3876msgstr "不能解析提交 '%s'"
3877
4c27fcb5 3878#: range-diff.c:224
c1ac5258
JX
3879msgid "failed to generate diff"
3880msgstr "生成 diff 失败"
3881
4c27fcb5 3882#: range-diff.c:455 range-diff.c:457
c1ac5258
JX
3883#, c-format
3884msgid "could not parse log for '%s'"
3885msgstr "不能解析 '%s' 的日志"
3886
06991777
JX
3887#: read-cache.c:673
3888#, c-format
3889msgid "will not add file alias '%s' ('%s' already exists in index)"
3890msgstr "将不会添加文件别名 '%s'('%s' 已经存在于索引中)"
3891
3892#: read-cache.c:689
3893msgid "cannot create an empty blob in the object database"
3894msgstr "不能在对象数据库中创建空的数据对象"
3895
3896#: read-cache.c:710
3897#, c-format
3898msgid "%s: can only add regular files, symbolic links or git-directories"
3899msgstr "%s:只能添加常规文件、符号链接或 git 目录"
3900
3901#: read-cache.c:765
3902#, c-format
3903msgid "unable to index file '%s'"
3904msgstr "无法索引文件 '%s'"
3905
3906#: read-cache.c:784
3907#, c-format
3908msgid "unable to add '%s' to index"
3909msgstr "无法在索引中添加 '%s'"
3910
3911#: read-cache.c:795
3912#, c-format
3913msgid "unable to stat '%s'"
3914msgstr "无法对 %s 执行 stat"
3915
3916#: read-cache.c:1304
3917#, c-format
3918msgid "'%s' appears as both a file and as a directory"
3919msgstr "'%s' 既显示为文件又显示为目录"
3920
3921#: read-cache.c:1489
4c27fcb5
JX
3922msgid "Refresh index"
3923msgstr "刷新索引"
3924
06991777 3925#: read-cache.c:1603
5b04ee3b
JX
3926#, c-format
3927msgid ""
a0b6b246
JX
3928"index.version set, but the value is invalid.\n"
3929"Using version %i"
5b04ee3b 3930msgstr ""
a0b6b246
JX
3931"设置了 index.version,但是取值无效。\n"
3932"使用版本 %i"
5b04ee3b 3933
06991777 3934#: read-cache.c:1613
5b04ee3b
JX
3935#, c-format
3936msgid ""
a0b6b246
JX
3937"GIT_INDEX_VERSION set, but the value is invalid.\n"
3938"Using version %i"
5b04ee3b 3939msgstr ""
a0b6b246
JX
3940"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
3941"使用版本 %i"
5b04ee3b 3942
06991777
JX
3943#: read-cache.c:1684
3944#, c-format
3945msgid "bad signature 0x%08x"
3946msgstr "坏的签名 0x%08x"
3947
3948#: read-cache.c:1687
3949#, c-format
3950msgid "bad index version %d"
3951msgstr "坏的索引版本 %d"
3952
3953#: read-cache.c:1696
3954msgid "bad index file sha1 signature"
3955msgstr "坏的索引文件哈希值签名"
3956
3957#: read-cache.c:1726
3958#, c-format
3959msgid "index uses %.4s extension, which we do not understand"
3960msgstr "索引使用不被支持的 %.4s 扩展"
3961
3962#
3963#: read-cache.c:1728
3964#, c-format
3965msgid "ignoring %.4s extension"
3966msgstr "忽略 %.4s 扩展"
3967
3968#: read-cache.c:1765
3969#, c-format
3970msgid "unknown index entry format 0x%08x"
3971msgstr "未知的索引条目格式 0x%08x"
3972
3973#: read-cache.c:1781
4c27fcb5
JX
3974#, c-format
3975msgid "malformed name field in the index, near path '%s'"
3976msgstr "索引中靠近路径 '%s' 有错误的名称字段"
3977
06991777
JX
3978#: read-cache.c:1836
3979msgid "unordered stage entries in index"
3980msgstr "索引中有未排序的暂存条目"
3981
3982#: read-cache.c:1839
3983#, c-format
3984msgid "multiple stage entries for merged file '%s'"
3985msgstr "合并文件 '%s' 有多个暂存条目"
3986
3987#: read-cache.c:1842
3988#, c-format
3989msgid "unordered stage entries for '%s'"
3990msgstr "'%s' 的未排序暂存条目"
3991
3992#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111
3993#: builtin/add.c:459 builtin/check-ignore.c:178 builtin/checkout.c:294
3994#: builtin/checkout.c:622 builtin/checkout.c:991 builtin/clean.c:955
3995#: builtin/commit.c:344 builtin/diff-tree.c:116 builtin/grep.c:498
3996#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
3997#: builtin/submodule--helper.c:330
4c27fcb5
JX
3998msgid "index file corrupt"
3999msgstr "索引文件损坏"
4000
06991777 4001#: read-cache.c:2090
4c27fcb5
JX
4002#, c-format
4003msgid "unable to create load_cache_entries thread: %s"
4004msgstr "无法创建 load_cache_entries 线程:%s"
4005
06991777 4006#: read-cache.c:2103
4c27fcb5
JX
4007#, c-format
4008msgid "unable to join load_cache_entries thread: %s"
4009msgstr "无法加入 load_cache_entries 线程:%s"
4010
06991777
JX
4011#: read-cache.c:2136
4012#, c-format
4013msgid "%s: index file open failed"
4014msgstr "%s:打开索引文件失败"
4015
4016#: read-cache.c:2140
4017#, c-format
4018msgid "%s: cannot stat the open index"
4019msgstr "%s:不能对打开的索引执行 stat 操作"
4020
4021#: read-cache.c:2144
4022#, c-format
4023msgid "%s: index file smaller than expected"
4024msgstr "%s:索引文件比预期的小"
4025
4026#: read-cache.c:2148
4027#, c-format
4028msgid "%s: unable to map index file"
4029msgstr "%s:无法对索引文件执行 map 操作"
4030
4031#: read-cache.c:2190
4c27fcb5
JX
4032#, c-format
4033msgid "unable to create load_index_extensions thread: %s"
4034msgstr "无法创建 load_index_extensions 线程:%s"
4035
06991777 4036#: read-cache.c:2217
4c27fcb5
JX
4037#, c-format
4038msgid "unable to join load_index_extensions thread: %s"
4039msgstr "无法加入 load_index_extensions 线程:%s"
4040
06991777
JX
4041#: read-cache.c:2239
4042#, c-format
4043msgid "could not freshen shared index '%s'"
4044msgstr "无法刷新共享索引 '%s'"
4045
4046#: read-cache.c:2274
4047#, c-format
4048msgid "broken index, expect %s in %s, got %s"
4049msgstr "损坏的索引,期望在 %2$s 中的 %1$s,得到 %3$s"
4050
4051#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087
a4f16749
JX
4052#, c-format
4053msgid "could not close '%s'"
4054msgstr "不能关闭 '%s'"
4055
06991777 4056#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647
87cb7997 4057#, c-format
60638e98 4058msgid "could not stat '%s'"
65e2041e 4059msgstr "不能对 '%s' 调用 stat"
87cb7997 4060
06991777 4061#: read-cache.c:3057
87cb7997
JX
4062#, c-format
4063msgid "unable to open git dir: %s"
4064msgstr "不能打开 git 目录:%s"
4065
06991777 4066#: read-cache.c:3069
87cb7997
JX
4067#, c-format
4068msgid "unable to unlink: %s"
4069msgstr "无法删除:%s"
4070
06991777
JX
4071#: read-cache.c:3088
4072#, c-format
4073msgid "cannot fix permission bits on '%s'"
4074msgstr "不能修复 '%s' 的权限位"
4075
4076#: read-cache.c:3237
4077#, c-format
4078msgid "%s: cannot drop to stage #0"
4079msgstr "%s:不能落到暂存区 #0"
4080
4c27fcb5
JX
4081#: rebase-interactive.c:10
4082msgid ""
4083"\n"
4084"Commands:\n"
4085"p, pick <commit> = use commit\n"
4086"r, reword <commit> = use commit, but edit the commit message\n"
4087"e, edit <commit> = use commit, but stop for amending\n"
4088"s, squash <commit> = use commit, but meld into previous commit\n"
4089"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
4090"x, exec <command> = run command (the rest of the line) using shell\n"
4091"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
4092"d, drop <commit> = remove commit\n"
4093"l, label <label> = label current HEAD with a name\n"
4094"t, reset <label> = reset HEAD to a label\n"
4095"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
4096". create a merge commit using the original merge commit's\n"
4097". message (or the oneline, if no original merge commit was\n"
4098". specified). Use -c <commit> to reword the commit message.\n"
4099"\n"
4100"These lines can be re-ordered; they are executed from top to bottom.\n"
4101msgstr ""
4102"\n"
4103"命令:\n"
4104"p, pick <提交> = 使用提交\n"
4105"r, reword <提交> = 使用提交,但修改提交说明\n"
4106"e, edit <提交> = 使用提交,进入 shell 以便进行提交修补\n"
4107"s, squash <提交> = 使用提交,但融合到前一个提交\n"
4108"f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
4109"x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
4110"b, break = 在此处停止(使用 'git rebase --continue' 继续变基)\n"
4111"d, drop <提交> = 删除提交\n"
4112"l, label <label> = 为当前 HEAD 打上标记\n"
4113"t, reset <label> = 重置 HEAD 到该标记\n"
4114"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
4115". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
4116". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
4117". -c <提交> 可以编辑提交说明。\n"
4118"\n"
4119"可以对这些行重新排序,将从上至下执行。\n"
4120
4121#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173
4122msgid ""
4123"\n"
4124"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
4125msgstr ""
4126"\n"
4127"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
4128
4129#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177
4130msgid ""
4131"\n"
4132"If you remove a line here THAT COMMIT WILL BE LOST.\n"
4133msgstr ""
4134"\n"
4135"如果您在这里删除一行,对应的提交将会丢失。\n"
4136
4137#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816
4138msgid ""
4139"\n"
4140"You are editing the todo file of an ongoing interactive rebase.\n"
4141"To continue rebase after editing, run:\n"
4142" git rebase --continue\n"
4143"\n"
4144msgstr ""
4145"\n"
4146"您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基,\n"
4147"请执行:\n"
4148" git rebase --continue\n"
4149"\n"
4150
4151#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893
4152msgid ""
4153"\n"
4154"However, if you remove everything, the rebase will be aborted.\n"
4155"\n"
4156msgstr ""
4157"\n"
4158"然而,如果您删除全部内容,变基操作将会终止。\n"
4159"\n"
4160
4161#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900
4162msgid "Note that empty commits are commented out"
4163msgstr "注意空提交已被注释掉"
4164
06991777
JX
4165#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219
4166#: sequencer.c:4569 sequencer.c:4625 sequencer.c:4900
4c27fcb5
JX
4167#, c-format
4168msgid "could not read '%s'."
4169msgstr "不能读取 '%s'。"
4170
c1ac5258
JX
4171#: refs.c:192
4172#, c-format
4173msgid "%s does not point to a valid object!"
4174msgstr "%s 没有指向一个有效的对象!"
4175
4c27fcb5 4176#: refs.c:583
c1ac5258
JX
4177#, c-format
4178msgid "ignoring dangling symref %s"
e640d114 4179msgstr "忽略悬空符号引用 %s"
c1ac5258 4180
06991777 4181#: refs.c:585 ref-filter.c:1976
c1ac5258
JX
4182#, c-format
4183msgid "ignoring broken ref %s"
4184msgstr "忽略损坏的引用 %s"
4185
4c27fcb5 4186#: refs.c:711
c1ac5258
JX
4187#, c-format
4188msgid "could not open '%s' for writing: %s"
4189msgstr "无法为写入打开 '%s':%s"
4190
4c27fcb5 4191#: refs.c:721 refs.c:772
c1ac5258
JX
4192#, c-format
4193msgid "could not read ref '%s'"
4194msgstr "无法读取引用 '%s'"
4195
4c27fcb5 4196#: refs.c:727
c1ac5258
JX
4197#, c-format
4198msgid "ref '%s' already exists"
4199msgstr "引用 '%s' 已经存在"
4200
4c27fcb5 4201#: refs.c:732
c1ac5258
JX
4202#, c-format
4203msgid "unexpected object ID when writing '%s'"
4204msgstr "写入 '%s' 时意外的对象 ID"
4205
06991777
JX
4206#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675
4207#: sequencer.c:2689 sequencer.c:2923 sequencer.c:4789 sequencer.c:4852
c1ac5258
JX
4208#: wrapper.c:656
4209#, c-format
4210msgid "could not write to '%s'"
4211msgstr "不能写入 '%s'"
4212
06991777
JX
4213#: refs.c:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395
4214#: builtin/am.c:713 builtin/rebase.c:575
5b04ee3b 4215#, c-format
fd8cb379 4216msgid "could not open '%s' for writing"
a0b6b246 4217msgstr "无法打开 '%s' 进行写入"
5b04ee3b 4218
4c27fcb5 4219#: refs.c:774
c1ac5258
JX
4220#, c-format
4221msgid "unexpected object ID when deleting '%s'"
4222msgstr "删除 '%s' 时意外的对象 ID"
4223
4c27fcb5 4224#: refs.c:905
c1ac5258
JX
4225#, c-format
4226msgid "log for ref %s has gap after %s"
4227msgstr "引用 %s 的日志在 %s 之后有缺口"
4228
4c27fcb5 4229#: refs.c:911
c1ac5258
JX
4230#, c-format
4231msgid "log for ref %s unexpectedly ended on %s"
4232msgstr "引用 %s 的日志意外终止于 %s "
4233
4c27fcb5 4234#: refs.c:969
c1ac5258
JX
4235#, c-format
4236msgid "log for %s is empty"
4237msgstr "%s 的日志为空"
4238
4c27fcb5 4239#: refs.c:1061
c1ac5258
JX
4240#, c-format
4241msgid "refusing to update ref with bad name '%s'"
4242msgstr "拒绝更新有错误名称 '%s' 的引用"
4243
4c27fcb5 4244#: refs.c:1137
c1ac5258
JX
4245#, c-format
4246msgid "update_ref failed for ref '%s': %s"
4247msgstr "对引用 '%s' 执行 update_ref 失败:%s"
4248
4c27fcb5 4249#: refs.c:1911
c1ac5258
JX
4250#, c-format
4251msgid "multiple updates for ref '%s' not allowed"
4252msgstr "不允许对引用 '%s' 多次更新"
4253
4c27fcb5 4254#: refs.c:1943
60638e98
JX
4255msgid "ref updates forbidden inside quarantine environment"
4256msgstr "在隔离环境中禁止更新引用"
4257
4c27fcb5 4258#: refs.c:2039 refs.c:2069
c1ac5258
JX
4259#, c-format
4260msgid "'%s' exists; cannot create '%s'"
4261msgstr "'%s' 已存在,无法创建 '%s'"
4262
4c27fcb5 4263#: refs.c:2045 refs.c:2080
c1ac5258
JX
4264#, c-format
4265msgid "cannot process '%s' and '%s' at the same time"
4266msgstr "无法同时处理 '%s' 和 '%s'"
4267
4c27fcb5 4268#: refs/files-backend.c:1228
6937cb4e
JX
4269#, c-format
4270msgid "could not remove reference %s"
4271msgstr "无法删除引用 %s"
4272
4c27fcb5 4273#: refs/files-backend.c:1242 refs/packed-backend.c:1532
c1ac5258 4274#: refs/packed-backend.c:1542
5b04ee3b 4275#, c-format
a0b6b246
JX
4276msgid "could not delete reference %s: %s"
4277msgstr "无法删除引用 %s:%s"
5b04ee3b 4278
4c27fcb5 4279#: refs/files-backend.c:1245 refs/packed-backend.c:1545
5b04ee3b 4280#, c-format
a0b6b246
JX
4281msgid "could not delete references: %s"
4282msgstr "无法删除引用:%s"
5b04ee3b 4283
c1ac5258
JX
4284#: refspec.c:137
4285#, c-format
4286msgid "invalid refspec '%s'"
4287msgstr "无效的引用表达式:'%s'"
4288
06991777 4289#: ref-filter.c:39 wt-status.c:1861
87cb7997
JX
4290msgid "gone"
4291msgstr "丢失"
4292
4c27fcb5 4293#: ref-filter.c:40
87cb7997
JX
4294#, c-format
4295msgid "ahead %d"
4296msgstr "领先 %d"
4297
4c27fcb5 4298#: ref-filter.c:41
87cb7997
JX
4299#, c-format
4300msgid "behind %d"
4301msgstr "落后 %d"
4302
4c27fcb5 4303#: ref-filter.c:42
87cb7997
JX
4304#, c-format
4305msgid "ahead %d, behind %d"
4306msgstr "领先 %d,落后 %d"
4307
4c27fcb5 4308#: ref-filter.c:138
5b04ee3b 4309#, c-format
a0b6b246 4310msgid "expected format: %%(color:<color>)"
58b6f078 4311msgstr "期望的格式:%%(color:<颜色>)"
5b04ee3b 4312
4c27fcb5 4313#: ref-filter.c:140
5b04ee3b 4314#, c-format
a0b6b246
JX
4315msgid "unrecognized color: %%(color:%s)"
4316msgstr "未能识别的颜色:%%(color:%s)"
6c94aba5 4317
4c27fcb5 4318#: ref-filter.c:162
a0b6b246 4319#, c-format
87cb7997
JX
4320msgid "Integer value expected refname:lstrip=%s"
4321msgstr "期望整数值 refname:lstrip=%s"
90314792 4322
4c27fcb5 4323#: ref-filter.c:166
87cb7997
JX
4324#, c-format
4325msgid "Integer value expected refname:rstrip=%s"
4326msgstr "期望整数值 refname:rstrip=%s"
4327
4c27fcb5 4328#: ref-filter.c:168
87cb7997
JX
4329#, c-format
4330msgid "unrecognized %%(%s) argument: %s"
4331msgstr "未能识别的 %%(%s) 参数:%s"
4332
4c27fcb5 4333#: ref-filter.c:223
c1ac5258
JX
4334#, c-format
4335msgid "%%(objecttype) does not take arguments"
4336msgstr "%%(objecttype) 不带参数"
4337
06991777
JX
4338#: ref-filter.c:245
4339#, c-format
4340msgid "unrecognized %%(objectsize) argument: %s"
4341msgstr "未能识别的 %%(objectsize) 参数:%s"
4342
4343#: ref-filter.c:253
c1ac5258 4344#, c-format
06991777
JX
4345msgid "%%(deltabase) does not take arguments"
4346msgstr "%%(deltabase) 不带参数"
c1ac5258 4347
06991777 4348#: ref-filter.c:265
90314792 4349#, c-format
a0b6b246
JX
4350msgid "%%(body) does not take arguments"
4351msgstr "%%(body) 不带参数"
90314792 4352
06991777 4353#: ref-filter.c:274
a0b6b246
JX
4354#, c-format
4355msgid "%%(subject) does not take arguments"
4356msgstr "%%(subject) 不带参数"
90314792 4357
06991777 4358#: ref-filter.c:296
1a79b2f1 4359#, c-format
6937cb4e
JX
4360msgid "unknown %%(trailers) argument: %s"
4361msgstr "未知的 %%(trailers) 参数:%s"
1a79b2f1 4362
06991777 4363#: ref-filter.c:325
a0b6b246
JX
4364#, c-format
4365msgid "positive value expected contents:lines=%s"
87cb7997 4366msgstr "期望一个正数 contents:lines=%s"
90314792 4367
06991777 4368#: ref-filter.c:327
a0b6b246
JX
4369#, c-format
4370msgid "unrecognized %%(contents) argument: %s"
4371msgstr "未能识别的 %%(contents) 参数:%s"
90314792 4372
06991777 4373#: ref-filter.c:342
87cb7997
JX
4374#, c-format
4375msgid "positive value expected objectname:short=%s"
4376msgstr "期望一个正数 objectname:short=%s"
4377
06991777 4378#: ref-filter.c:346
a0b6b246
JX
4379#, c-format
4380msgid "unrecognized %%(objectname) argument: %s"
4381msgstr "未能识别的 %%(objectname) 参数:%s"
90314792 4382
06991777 4383#: ref-filter.c:376
a0b6b246
JX
4384#, c-format
4385msgid "expected format: %%(align:<width>,<position>)"
58b6f078 4386msgstr "期望的格式:%%(align:<宽度>,<位置>)"
90314792 4387
06991777 4388#: ref-filter.c:388
5c57d762 4389#, c-format
a0b6b246
JX
4390msgid "unrecognized position:%s"
4391msgstr "未能识别的位置:%s"
5c57d762 4392
06991777 4393#: ref-filter.c:395
1b7f4a34 4394#, c-format
a0b6b246
JX
4395msgid "unrecognized width:%s"
4396msgstr "未能识别的宽度:%s"
1b7f4a34 4397
06991777 4398#: ref-filter.c:404
1b7f4a34 4399#, c-format
a0b6b246
JX
4400msgid "unrecognized %%(align) argument: %s"
4401msgstr "未能识别的 %%(align) 参数:%s"
1b7f4a34 4402
06991777 4403#: ref-filter.c:412
1b7f4a34 4404#, c-format
a0b6b246
JX
4405msgid "positive width expected with the %%(align) atom"
4406msgstr "元素 %%(align) 需要一个正数的宽度"
1b7f4a34 4407
06991777 4408#: ref-filter.c:430
87cb7997
JX
4409#, c-format
4410msgid "unrecognized %%(if) argument: %s"
4411msgstr "未能识别的 %%(if) 参数:%s"
4412
06991777 4413#: ref-filter.c:527
07432cef 4414#, c-format
a0b6b246 4415msgid "malformed field name: %.*s"
fd8cb379 4416msgstr "格式错误的字段名:%.*s"
ef317cd5 4417
06991777 4418#: ref-filter.c:554
a0b6b246
JX
4419#, c-format
4420msgid "unknown field name: %.*s"
4421msgstr "未知的字段名:%.*s"
220c313c 4422
06991777 4423#: ref-filter.c:558
4c27fcb5
JX
4424#, c-format
4425msgid ""
4426"not a git repository, but the field '%.*s' requires access to object data"
4427msgstr "不是一个 git 仓库,但是字段 '%.*s' 需要访问对象数据"
4428
06991777 4429#: ref-filter.c:682
87cb7997
JX
4430#, c-format
4431msgid "format: %%(if) atom used without a %%(then) atom"
4432msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
4433
06991777 4434#: ref-filter.c:745
87cb7997
JX
4435#, c-format
4436msgid "format: %%(then) atom used without an %%(if) atom"
4437msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
4438
06991777 4439#: ref-filter.c:747
87cb7997
JX
4440#, c-format
4441msgid "format: %%(then) atom used more than once"
4442msgstr "格式:%%(then) 元素用了多次"
4443
06991777 4444#: ref-filter.c:749
87cb7997
JX
4445#, c-format
4446msgid "format: %%(then) atom used after %%(else)"
4447msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
4448
06991777 4449#: ref-filter.c:777
87cb7997
JX
4450#, c-format
4451msgid "format: %%(else) atom used without an %%(if) atom"
4452msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
4453
06991777 4454#: ref-filter.c:779
87cb7997
JX
4455#, c-format
4456msgid "format: %%(else) atom used without a %%(then) atom"
4457msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
4458
06991777 4459#: ref-filter.c:781
87cb7997
JX
4460#, c-format
4461msgid "format: %%(else) atom used more than once"
4462msgstr "格式:%%(else) 元素用了多次"
4463
06991777 4464#: ref-filter.c:796
7aea43ff 4465#, c-format
a0b6b246
JX
4466msgid "format: %%(end) atom used without corresponding atom"
4467msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
7aea43ff 4468
06991777 4469#: ref-filter.c:853
7aea43ff 4470#, c-format
a0b6b246 4471msgid "malformed format string %s"
fd8cb379 4472msgstr "错误的格式化字符串 %s"
7aea43ff 4473
06991777 4474#: ref-filter.c:1447
87cb7997
JX
4475#, c-format
4476msgid "(no branch, rebasing %s)"
4477msgstr "(非分支,正变基 %s)"
4478
06991777 4479#: ref-filter.c:1450
fd8cb379
JX
4480#, c-format
4481msgid "(no branch, rebasing detached HEAD %s)"
4482msgstr "(非分支,正变基分离头指针 %s)"
4483
06991777 4484#: ref-filter.c:1453
87cb7997
JX
4485#, c-format
4486msgid "(no branch, bisect started on %s)"
4487msgstr "(非分支,二分查找开始于 %s)"
c04f5ac3 4488
a4f16749
JX
4489#. TRANSLATORS: make sure this matches "HEAD
4490#. detached at " in wt-status.c
4491#.
06991777 4492#: ref-filter.c:1461
c04f5ac3 4493#, c-format
87cb7997
JX
4494msgid "(HEAD detached at %s)"
4495msgstr "(头指针分离于 %s)"
c04f5ac3 4496
a4f16749
JX
4497#. TRANSLATORS: make sure this matches "HEAD
4498#. detached from " in wt-status.c
4499#.
06991777 4500#: ref-filter.c:1468
a0b6b246 4501#, c-format
87cb7997
JX
4502msgid "(HEAD detached from %s)"
4503msgstr "(头指针分离自 %s)"
6792b93b 4504
06991777 4505#: ref-filter.c:1472
87cb7997
JX
4506msgid "(no branch)"
4507msgstr "(非分支)"
4508
06991777 4509#: ref-filter.c:1506 ref-filter.c:1663
a0b6b246
JX
4510#, c-format
4511msgid "missing object %s for %s"
4512msgstr "缺失 %2$s 的对象 %1$s"
c04f5ac3 4513
06991777 4514#: ref-filter.c:1516
a0b6b246
JX
4515#, c-format
4516msgid "parse_object_buffer failed on %s for %s"
4517msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
6792b93b 4518
06991777 4519#: ref-filter.c:1882
a0b6b246
JX
4520#, c-format
4521msgid "malformed object at '%s'"
fd8cb379 4522msgstr "格式错误的对象 '%s'"
c04f5ac3 4523
06991777 4524#: ref-filter.c:1971
a0b6b246
JX
4525#, c-format
4526msgid "ignoring ref with broken name %s"
4527msgstr "忽略带有错误名称 %s 的引用"
c04f5ac3 4528
06991777 4529#: ref-filter.c:2257
a0b6b246
JX
4530#, c-format
4531msgid "format: %%(end) atom missing"
4532msgstr "格式:缺少 %%(end) 元素"
c04f5ac3 4533
06991777
JX
4534#: ref-filter.c:2352
4535#, c-format
4536msgid "option `%s' is incompatible with --merged"
4537msgstr "选项 `%s' 和 --merged 不兼容"
4538
4539#: ref-filter.c:2355
4540#, c-format
4541msgid "option `%s' is incompatible with --no-merged"
4542msgstr "选项 `%s' 和 --no-merged 不兼容"
4543
4544#: ref-filter.c:2365
a0b6b246
JX
4545#, c-format
4546msgid "malformed object name %s"
fd8cb379 4547msgstr "格式错误的对象名 %s"
c04f5ac3 4548
06991777
JX
4549#: ref-filter.c:2370
4550#, c-format
4551msgid "option `%s' must point to a commit"
4552msgstr "选项 `%s' 必须指向一个提交"
4553
4554#: remote.c:363
4555#, c-format
4556msgid "config remote shorthand cannot begin with '/': %s"
4557msgstr "配置的远程名称不能以 '/' 开始:%s"
4558
4559#: remote.c:410
4560msgid "more than one receivepack given, using the first"
4561msgstr "提供了一个以上的 receivepack,使用第一个"
4562
4563#: remote.c:418
4564msgid "more than one uploadpack given, using the first"
4565msgstr "提供了一个以上的 uploadpack,使用第一个"
4566
4567#: remote.c:608
a0b6b246
JX
4568#, c-format
4569msgid "Cannot fetch both %s and %s to %s"
4570msgstr "不能同时获取 %s 和 %s 至 %s"
c04f5ac3 4571
06991777 4572#: remote.c:612
c04f5ac3 4573#, c-format
a0b6b246
JX
4574msgid "%s usually tracks %s, not %s"
4575msgstr "%s 通常跟踪 %s,而非 %s"
c04f5ac3 4576
06991777 4577#: remote.c:616
a0b6b246
JX
4578#, c-format
4579msgid "%s tracks both %s and %s"
4580msgstr "%s 同时跟踪 %s 和 %s"
c04f5ac3 4581
06991777
JX
4582#: remote.c:684
4583#, c-format
4584msgid "key '%s' of pattern had no '*'"
4585msgstr "模式的键 '%s' 没有 '*'"
4586
4587#: remote.c:694
4588#, c-format
4589msgid "value '%s' of pattern has no '*'"
4590msgstr "模式的值 '%s' 没有 '*'"
4591
4592#
4593#: remote.c:1000
4594#, c-format
4595msgid "src refspec %s does not match any"
4596msgstr "源引用表达式 %s 没有匹配"
4597
4598#: remote.c:1005
4599#, c-format
4600msgid "src refspec %s matches more than one"
4601msgstr "源引用表达式 %s 匹配超过一个"
4602
4603#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
4604#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
4605#. the <src>.
4606#.
4607#: remote.c:1020
4608#, c-format
4609msgid ""
4610"The destination you provided is not a full refname (i.e.,\n"
4611"starting with \"refs/\"). We tried to guess what you meant by:\n"
4612"\n"
4613"- Looking for a ref that matches '%s' on the remote side.\n"
4614"- Checking if the <src> being pushed ('%s')\n"
4615" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
4616" refs/{heads,tags}/ prefix on the remote side.\n"
4617"\n"
4618"Neither worked, so we gave up. You must fully qualify the ref."
4619msgstr ""
4620"您提供的目标不是一个完整的引用名称(即以 \"refs/\" 开头)。我们\n"
4621"试着猜测您的想法:\n"
4622"\n"
4623"- 在远端查询和 '%s' 匹配的引用。\n"
4624"- 检查要推送的 <src>('%s')是不是在 \"refs/{heads,tags}/\" 中的\n"
4625" 引用。如果是,我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n"
4626"\n"
4627"都不行,所以我们已放弃。您必须给出完整的引用。"
4628
4629#: remote.c:1040
4630#, c-format
4631msgid ""
4632"The <src> part of the refspec is a commit object.\n"
4633"Did you mean to create a new branch by pushing to\n"
4634"'%s:refs/heads/%s'?"
4635msgstr ""
4636"引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
4637"'%s:refs/heads/%s' 推送么?"
4638
4639#: remote.c:1045
4640#, c-format
4641msgid ""
4642"The <src> part of the refspec is a tag object.\n"
4643"Did you mean to create a new tag by pushing to\n"
4644"'%s:refs/tags/%s'?"
4645msgstr ""
4646"引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
4647"'%s:refs/tags/%s' 推送么?"
4648
4649#: remote.c:1050
4650#, c-format
4651msgid ""
4652"The <src> part of the refspec is a tree object.\n"
4653"Did you mean to tag a new tree by pushing to\n"
4654"'%s:refs/tags/%s'?"
4655msgstr ""
4656"引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
4657"'%s:refs/tags/%s' 推送么?"
4658
4659#: remote.c:1055
4660#, c-format
4661msgid ""
4662"The <src> part of the refspec is a blob object.\n"
4663"Did you mean to tag a new blob by pushing to\n"
4664"'%s:refs/tags/%s'?"
4665msgstr ""
4666"引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
4667"'%s:refs/tags/%s' 推送么?"
4668
4669#: remote.c:1091
4670#, c-format
4671msgid "%s cannot be resolved to branch"
4672msgstr "%s 无法被解析为分支"
4673
4674#: remote.c:1102
4675#, c-format
4676msgid "unable to delete '%s': remote ref does not exist"
4677msgstr "无法删除 '%s':远程分支不存在"
4678
4679#: remote.c:1114
4680#, c-format
4681msgid "dst refspec %s matches more than one"
4682msgstr "目标引用表达式 %s 匹配超过一个"
4683
4684#: remote.c:1121
4685#, c-format
4686msgid "dst ref %s receives from more than one src"
4687msgstr "目标引用 %s 接收超过一个源"
c04f5ac3 4688
06991777 4689#: remote.c:1624 remote.c:1725
a0b6b246
JX
4690msgid "HEAD does not point to a branch"
4691msgstr "HEAD 没有指向一个分支"
c04f5ac3 4692
06991777 4693#: remote.c:1633
a0b6b246
JX
4694#, c-format
4695msgid "no such branch: '%s'"
4696msgstr "没有此分支:'%s'"
c04f5ac3 4697
06991777 4698#: remote.c:1636
a0b6b246
JX
4699#, c-format
4700msgid "no upstream configured for branch '%s'"
4701msgstr "尚未给分支 '%s' 设置上游"
c04f5ac3 4702
06991777 4703#: remote.c:1642
a0b6b246
JX
4704#, c-format
4705msgid "upstream branch '%s' not stored as a remote-tracking branch"
4706msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
c04f5ac3 4707
06991777 4708#: remote.c:1657
a0b6b246
JX
4709#, c-format
4710msgid "push destination '%s' on remote '%s' has no local tracking branch"
4711msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
c04f5ac3 4712
06991777 4713#: remote.c:1669
a0b6b246
JX
4714#, c-format
4715msgid "branch '%s' has no remote for pushing"
4716msgstr "分支 '%s' 没有设置要推送的远程服务器"
cfff71a9 4717
06991777 4718#: remote.c:1679
a0b6b246
JX
4719#, c-format
4720msgid "push refspecs for '%s' do not include '%s'"
4721msgstr "向 '%s' 推送引用规格未包含 '%s'"
cfff71a9 4722
06991777 4723#: remote.c:1692
a0b6b246
JX
4724msgid "push has no destination (push.default is 'nothing')"
4725msgstr "推送无目标(push.default 是 'nothing')"
cfff71a9 4726
06991777 4727#: remote.c:1714
a0b6b246
JX
4728msgid "cannot resolve 'simple' push to a single destination"
4729msgstr "无法解析 'simple' 推送至一个单独的目标"
6c94aba5 4730
06991777
JX
4731#: remote.c:1840
4732#, c-format
4733msgid "couldn't find remote ref %s"
4734msgstr "无法发现远程引用 %s"
4735
4736#: remote.c:1853
4737#, c-format
4738msgid "* Ignoring funny ref '%s' locally"
4739msgstr "* 在本地忽略可笑的引用 '%s'"
4740
4741#: remote.c:1990
a0b6b246
JX
4742#, c-format
4743msgid "Your branch is based on '%s', but the upstream is gone.\n"
4744msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
6c94aba5 4745
06991777 4746#: remote.c:1994
a0b6b246
JX
4747msgid " (use \"git branch --unset-upstream\" to fixup)\n"
4748msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
6c94aba5 4749
06991777 4750#: remote.c:1997
a0b6b246 4751#, c-format
6937cb4e 4752msgid "Your branch is up to date with '%s'.\n"
a0b6b246 4753msgstr "您的分支与上游分支 '%s' 一致。\n"
cfff71a9 4754
06991777 4755#: remote.c:2001
31e5e17b
JX
4756#, c-format
4757msgid "Your branch and '%s' refer to different commits.\n"
4758msgstr "您的分支和 '%s' 指向不同的提交。\n"
4759
06991777 4760#: remote.c:2004
31e5e17b
JX
4761#, c-format
4762msgid " (use \"%s\" for details)\n"
4763msgstr " (使用 \"%s\" 查看详情)\n"
4764
06991777 4765#: remote.c:2008
a0b6b246
JX
4766#, c-format
4767msgid "Your branch is ahead of '%s' by %d commit.\n"
4768msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
4769msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
4770msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
cfff71a9 4771
06991777 4772#: remote.c:2014
a0b6b246
JX
4773msgid " (use \"git push\" to publish your local commits)\n"
4774msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
c04f5ac3 4775
06991777 4776#: remote.c:2017
a0b6b246
JX
4777#, c-format
4778msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
4779msgid_plural ""
4780"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
4781msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
4782msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 4783
a0b6b246 4784# 译者:注意保持前导空格
06991777 4785#: remote.c:2025
a0b6b246
JX
4786msgid " (use \"git pull\" to update your local branch)\n"
4787msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
c04f5ac3 4788
06991777 4789#: remote.c:2028
a0b6b246
JX
4790#, c-format
4791msgid ""
4792"Your branch and '%s' have diverged,\n"
4793"and have %d and %d different commit each, respectively.\n"
4794msgid_plural ""
4795"Your branch and '%s' have diverged,\n"
4796"and have %d and %d different commits each, respectively.\n"
4797msgstr[0] ""
4798"您的分支和 '%s' 出现了偏离,\n"
4799"并且分别有 %d 和 %d 处不同的提交。\n"
4800msgstr[1] ""
4801"您的分支和 '%s' 出现了偏离,\n"
4802"并且分别有 %d 和 %d 处不同的提交。\n"
90314792 4803
a0b6b246 4804# 译者:注意保持前导空格
06991777 4805#: remote.c:2038
a0b6b246
JX
4806msgid " (use \"git pull\" to merge the remote branch into yours)\n"
4807msgstr " (使用 \"git pull\" 来合并远程分支)\n"
90314792 4808
06991777
JX
4809#: remote.c:2221
4810#, c-format
4811msgid "cannot parse expected object name '%s'"
4812msgstr "无法解析期望的对象名 '%s'"
4813
4c27fcb5 4814#: replace-object.c:21
c1ac5258
JX
4815#, c-format
4816msgid "bad replace ref name: %s"
4817msgstr "错误的替换引用名称:%s"
4818
4c27fcb5 4819#: replace-object.c:30
c1ac5258
JX
4820#, c-format
4821msgid "duplicate replace ref: %s"
4822msgstr "重复的替换引用:%s"
4823
4c27fcb5 4824#: replace-object.c:73
c1ac5258
JX
4825#, c-format
4826msgid "replace depth too high for object %s"
4827msgstr "对象 %s 的替换层级太深"
4828
4c27fcb5
JX
4829#: rerere.c:217 rerere.c:226 rerere.c:229
4830msgid "corrupt MERGE_RR"
4831msgstr "损坏的 MERGE_RR"
4832
4833#: rerere.c:264 rerere.c:269
4834msgid "unable to write rerere record"
4835msgstr "无法写入 rerere 记录"
cfff71a9 4836
06991777
JX
4837#: rerere.c:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212
4838#: builtin/fsck.c:314
a0b6b246 4839#, c-format
4c27fcb5
JX
4840msgid "could not write '%s'"
4841msgstr "不能写入 '%s'"
6792b93b 4842
4c27fcb5
JX
4843#: rerere.c:495
4844#, c-format
4845msgid "there were errors while writing '%s' (%s)"
4846msgstr "写入 '%s' (%s) 时出错"
6792b93b 4847
4c27fcb5
JX
4848#: rerere.c:498
4849#, c-format
4850msgid "failed to flush '%s'"
4851msgstr "刷新 '%s' 失败"
5c57d762 4852
4c27fcb5 4853#: rerere.c:503 rerere.c:1039
5809aa05 4854#, c-format
4c27fcb5
JX
4855msgid "could not parse conflict hunks in '%s'"
4856msgstr "不能解析 '%s' 中的冲突块"
5809aa05 4857
4c27fcb5
JX
4858#: rerere.c:684
4859#, c-format
4860msgid "failed utime() on '%s'"
4861msgstr "在 '%s' 上调用 utime() 失败"
31e5e17b 4862
4c27fcb5 4863#: rerere.c:694
87cb7997 4864#, c-format
4c27fcb5
JX
4865msgid "writing '%s' failed"
4866msgstr "写入 '%s' 失败"
87cb7997 4867
4c27fcb5 4868#: rerere.c:714
87cb7997 4869#, c-format
4c27fcb5
JX
4870msgid "Staged '%s' using previous resolution."
4871msgstr "使用之前的解决方案暂存 '%s'。"
87cb7997 4872
4c27fcb5
JX
4873#: rerere.c:753
4874#, c-format
4875msgid "Recorded resolution for '%s'."
4876msgstr "已记录 '%s' 的解决方案。"
6792b93b 4877
4c27fcb5
JX
4878#: rerere.c:788
4879#, c-format
4880msgid "Resolved '%s' using previous resolution."
4881msgstr "使用之前的解决方案解决 '%s'。"
4882
4883#: rerere.c:803
4884#, c-format
4885msgid "cannot unlink stray '%s'"
4886msgstr "不能删除 stray '%s'"
4887
4888#: rerere.c:807
4889#, c-format
4890msgid "Recorded preimage for '%s'"
4891msgstr "为 '%s' 记录 preimage"
4892
06991777
JX
4893#: rerere.c:881 submodule.c:2012 builtin/submodule--helper.c:1417
4894#: builtin/submodule--helper.c:1427
4c27fcb5
JX
4895#, c-format
4896msgid "could not create directory '%s'"
4897msgstr "不能创建目录 '%s'"
4898
4899#: rerere.c:1057
4900#, c-format
4901msgid "failed to update conflicted state in '%s'"
4902msgstr "更新 '%s' 中的冲突状态失败"
4903
4904#: rerere.c:1068 rerere.c:1075
4905#, c-format
4906msgid "no remembered resolution for '%s'"
4907msgstr "没有为 '%s' 记忆的解决方案"
4908
4909#: rerere.c:1077
4910#, c-format
4911msgid "cannot unlink '%s'"
4912msgstr "不能删除 '%s'"
4913
4914#: rerere.c:1087
4915#, c-format
4916msgid "Updated preimage for '%s'"
4917msgstr "已为 '%s' 更新 preimage"
4918
4919#: rerere.c:1096
4920#, c-format
4921msgid "Forgot resolution for '%s'\n"
4922msgstr "忘记 '%s' 的解决方案\n"
4923
4924#: rerere.c:1199
4925msgid "unable to open rr-cache directory"
4926msgstr "不能打开 rr-cache 目录"
4927
06991777 4928#: revision.c:2484
4c27fcb5
JX
4929msgid "your current branch appears to be broken"
4930msgstr "您的当前分支好像被损坏"
4931
06991777 4932#: revision.c:2487
4c27fcb5
JX
4933#, c-format
4934msgid "your current branch '%s' does not have any commits yet"
4935msgstr "您的当前分支 '%s' 尚无任何提交"
4936
06991777 4937#: revision.c:2684
4c27fcb5
JX
4938msgid "--first-parent is incompatible with --bisect"
4939msgstr "--first-parent 与 --bisect 不兼容"
4940
06991777 4941#: run-command.c:742
4c27fcb5
JX
4942msgid "open /dev/null failed"
4943msgstr "不能打开 /dev/null"
4944
06991777 4945#: run-command.c:1231
4c27fcb5
JX
4946#, c-format
4947msgid "cannot create async thread: %s"
4948msgstr "不能创建 async 线程:%s"
4949
06991777 4950#: run-command.c:1295
4c27fcb5
JX
4951#, c-format
4952msgid ""
4953"The '%s' hook was ignored because it's not set as executable.\n"
4954"You can disable this warning with `git config advice.ignoredHook false`."
4955msgstr ""
4956"因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n"
4957"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
4958
06991777 4959#: send-pack.c:141
4c27fcb5
JX
4960msgid "unexpected flush packet while reading remote unpack status"
4961msgstr "读取远程解包状态时收到意外的 flush 包"
4962
06991777 4963#: send-pack.c:143
4c27fcb5
JX
4964#, c-format
4965msgid "unable to parse remote unpack status: %s"
4966msgstr "不能解析远程解包状态:%s"
4967
06991777 4968#: send-pack.c:145
4c27fcb5
JX
4969#, c-format
4970msgid "remote unpack failed: %s"
4971msgstr "远程解包失败:%s"
4972
06991777 4973#: send-pack.c:306
4c27fcb5
JX
4974msgid "failed to sign the push certificate"
4975msgstr "为推送证书签名失败"
4976
06991777 4977#: send-pack.c:420
a0b6b246
JX
4978msgid "the receiving end does not support --signed push"
4979msgstr "接收端不支持签名推送"
6792b93b 4980
06991777 4981#: send-pack.c:422
a0b6b246
JX
4982msgid ""
4983"not sending a push certificate since the receiving end does not support --"
4984"signed push"
4985msgstr "未发送推送证书,因为接收端不支持签名推送"
6792b93b 4986
06991777 4987#: send-pack.c:434
a0b6b246
JX
4988msgid "the receiving end does not support --atomic push"
4989msgstr "接收端不支持原子推送"
6792b93b 4990
06991777 4991#: send-pack.c:439
a0b6b246
JX
4992msgid "the receiving end does not support push options"
4993msgstr "接收端不支持推送选项"
6792b93b 4994
06991777 4995#: sequencer.c:184
31e5e17b
JX
4996#, c-format
4997msgid "invalid commit message cleanup mode '%s'"
4998msgstr "无效的提交信息清理模式 '%s'"
4999
06991777 5000#: sequencer.c:288
fd8cb379
JX
5001#, c-format
5002msgid "could not delete '%s'"
5003msgstr "无法删除 '%s'"
5004
06991777 5005#: sequencer.c:314
a0b6b246
JX
5006msgid "revert"
5007msgstr "还原"
6792b93b 5008
06991777 5009#: sequencer.c:316
a0b6b246
JX
5010msgid "cherry-pick"
5011msgstr "拣选"
5012
06991777 5013#: sequencer.c:318
1a79b2f1
JX
5014msgid "rebase -i"
5015msgstr "rebase -i"
5016
06991777 5017#: sequencer.c:320
1a79b2f1 5018#, c-format
c1ac5258 5019msgid "unknown action: %d"
1a79b2f1
JX
5020msgstr "未知动作:%d"
5021
06991777 5022#: sequencer.c:378
a0b6b246
JX
5023msgid ""
5024"after resolving the conflicts, mark the corrected paths\n"
5025"with 'git add <paths>' or 'git rm <paths>'"
5026msgstr ""
5027"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
5028"命令标记修正后的文件"
5029
06991777 5030#: sequencer.c:381
a0b6b246
JX
5031msgid ""
5032"after resolving the conflicts, mark the corrected paths\n"
5033"with 'git add <paths>' or 'git rm <paths>'\n"
5034"and commit the result with 'git commit'"
5035msgstr ""
5036"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
5037"对修正后的文件做标记,然后用 'git commit' 提交"
1b7f4a34 5038
06991777 5039#: sequencer.c:394 sequencer.c:2671
1b7f4a34 5040#, c-format
a0b6b246
JX
5041msgid "could not lock '%s'"
5042msgstr "不能锁定 '%s'"
1b7f4a34 5043
06991777 5044#: sequencer.c:401
a0b6b246 5045#, c-format
72351d7d 5046msgid "could not write eol to '%s'"
a0b6b246 5047msgstr "不能将换行符写入 '%s'"
1b7f4a34 5048
06991777
JX
5049#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691
5050#: sequencer.c:2931
1b7f4a34 5051#, c-format
31e5e17b
JX
5052msgid "failed to finalize '%s'"
5053msgstr "无法完成 '%s'"
1b7f4a34 5054
06991777
JX
5055#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574
5056#: sequencer.c:2913 sequencer.c:3022 builtin/am.c:245 builtin/commit.c:748
5057#: builtin/merge.c:1085 builtin/rebase.c:154
a0b6b246
JX
5058#, c-format
5059msgid "could not read '%s'"
5060msgstr "不能读取 '%s'"
1b7f4a34 5061
06991777 5062#: sequencer.c:455
63af42fe 5063#, c-format
a0b6b246
JX
5064msgid "your local changes would be overwritten by %s."
5065msgstr "您的本地修改将被%s覆盖。"
63af42fe 5066
06991777 5067#: sequencer.c:459
a0b6b246 5068msgid "commit your changes or stash them to proceed."
a4f16749 5069msgstr "提交您的修改或贮藏后再继续。"
6792b93b 5070
06991777 5071#: sequencer.c:491
a0b6b246
JX
5072#, c-format
5073msgid "%s: fast-forward"
5074msgstr "%s:快进"
6792b93b 5075
1a79b2f1 5076#. TRANSLATORS: %s will be "revert", "cherry-pick" or
a4f16749 5077#. "rebase -i".
1a79b2f1 5078#.
06991777 5079#: sequencer.c:582
a0b6b246
JX
5080#, c-format
5081msgid "%s: Unable to write new index file"
5082msgstr "%s:无法写入新索引文件"
6792b93b 5083
06991777 5084#: sequencer.c:598
5809aa05
JX
5085msgid "unable to update cache tree"
5086msgstr "不能更新缓存树"
6792b93b 5087
06991777 5088#: sequencer.c:612
fd8cb379
JX
5089msgid "could not resolve HEAD commit"
5090msgstr "不能解析 HEAD 提交"
5091
06991777 5092#: sequencer.c:692
4c27fcb5
JX
5093#, c-format
5094msgid "no key present in '%.*s'"
5095msgstr "在 '%.*s' 中没有 key"
5096
06991777 5097#: sequencer.c:703
c1ac5258 5098#, c-format
4c27fcb5
JX
5099msgid "unable to dequote value of '%s'"
5100msgstr "无法为 '%s' 的值去引号"
c1ac5258 5101
06991777
JX
5102#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704
5103#: builtin/am.c:796 builtin/merge.c:1082 builtin/rebase.c:617
c1ac5258 5104#, c-format
4c27fcb5
JX
5105msgid "could not open '%s' for reading"
5106msgstr "无法打开 '%s' 进行读取"
5107
06991777 5108#: sequencer.c:750
4c27fcb5
JX
5109msgid "'GIT_AUTHOR_NAME' already given"
5110msgstr "已经给出 'GIT_AUTHOR_NAME'"
c1ac5258 5111
06991777 5112#: sequencer.c:755
4c27fcb5
JX
5113msgid "'GIT_AUTHOR_EMAIL' already given"
5114msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
5115
06991777 5116#: sequencer.c:760
4c27fcb5
JX
5117msgid "'GIT_AUTHOR_DATE' already given"
5118msgstr "已经给出 'GIT_AUTHOR_DATE'"
5119
06991777 5120#: sequencer.c:764
4c27fcb5
JX
5121#, c-format
5122msgid "unknown variable '%s'"
5123msgstr "未知变量 '%s'"
5124
06991777 5125#: sequencer.c:769
4c27fcb5
JX
5126msgid "missing 'GIT_AUTHOR_NAME'"
5127msgstr "缺少 'GIT_AUTHOR_NAME'"
5128
06991777 5129#: sequencer.c:771
4c27fcb5
JX
5130msgid "missing 'GIT_AUTHOR_EMAIL'"
5131msgstr "缺少 'GIT_AUTHOR_EMAIL'"
5132
06991777 5133#: sequencer.c:773
4c27fcb5
JX
5134msgid "missing 'GIT_AUTHOR_DATE'"
5135msgstr "缺少 'GIT_AUTHOR_DATE'"
5136
06991777 5137#: sequencer.c:833
c1ac5258
JX
5138#, c-format
5139msgid "invalid date format '%s' in '%s'"
5140msgstr "'%2$s' 中无效的日期格式 '%1$s'"
5141
06991777 5142#: sequencer.c:850
63af42fe
JX
5143#, c-format
5144msgid ""
a0b6b246
JX
5145"you have staged changes in your working tree\n"
5146"If these changes are meant to be squashed into the previous commit, run:\n"
5147"\n"
5148" git commit --amend %s\n"
5149"\n"
5150"If they are meant to go into a new commit, run:\n"
5151"\n"
5152" git commit %s\n"
5153"\n"
5154"In both cases, once you're done, continue with:\n"
5155"\n"
5156" git rebase --continue\n"
5157msgstr ""
1a79b2f1
JX
5158"您的工作区中存在已暂存的修改\n"
5159"如果这些修改需要被并入前一个提交,执行:\n"
a0b6b246
JX
5160"\n"
5161" git commit --amend %s\n"
5162"\n"
29004bbb 5163"如果这些修改要形成一个新提交,执行:\n"
a0b6b246
JX
5164"\n"
5165" git commit %s\n"
5166"\n"
5167"无论哪种情况,当您完成提交,继续执行:\n"
5168"\n"
5169" git rebase --continue\n"
6792b93b 5170
06991777 5171#: sequencer.c:945
fd8cb379
JX
5172msgid "writing root commit"
5173msgstr "写根提交"
5174
06991777 5175#: sequencer.c:1155
31e5e17b
JX
5176msgid "'prepare-commit-msg' hook failed"
5177msgstr "'prepare-commit-msg' 钩子失败"
5178
06991777 5179#: sequencer.c:1162
31e5e17b
JX
5180msgid ""
5181"Your name and email address were configured automatically based\n"
5182"on your username and hostname. Please check that they are accurate.\n"
5183"You can suppress this message by setting them explicitly. Run the\n"
5184"following command and follow the instructions in your editor to edit\n"
5185"your configuration file:\n"
5186"\n"
5187" git config --global --edit\n"
5188"\n"
5189"After doing this, you may fix the identity used for this commit with:\n"
5190"\n"
5191" git commit --amend --reset-author\n"
5192msgstr ""
5193"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5194"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
5195"中编辑您的配置文件:\n"
5196"\n"
5197" git config --global --edit\n"
5198"\n"
5199"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5200"\n"
5201" git commit --amend --reset-author\n"
5202
06991777 5203#: sequencer.c:1175
31e5e17b
JX
5204msgid ""
5205"Your name and email address were configured automatically based\n"
5206"on your username and hostname. Please check that they are accurate.\n"
5207"You can suppress this message by setting them explicitly:\n"
5208"\n"
5209" git config --global user.name \"Your Name\"\n"
5210" git config --global user.email you@example.com\n"
5211"\n"
5212"After doing this, you may fix the identity used for this commit with:\n"
5213"\n"
5214" git commit --amend --reset-author\n"
5215msgstr ""
5216"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
5217"与否。您可以对其进行设置以免再出现本提示信息:\n"
5218"\n"
5219" git config --global user.name \"Your Name\"\n"
5220" git config --global user.email you@example.com\n"
5221"\n"
5222"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
5223"\n"
5224" git commit --amend --reset-author\n"
5225
06991777 5226#: sequencer.c:1217
31e5e17b
JX
5227msgid "couldn't look up newly created commit"
5228msgstr "无法找到新创建的提交"
5229
06991777 5230#: sequencer.c:1219
31e5e17b
JX
5231msgid "could not parse newly created commit"
5232msgstr "不能解析新创建的提交"
5233
06991777 5234#: sequencer.c:1265
31e5e17b
JX
5235msgid "unable to resolve HEAD after creating commit"
5236msgstr "创建提交后,不能解析 HEAD"
5237
06991777 5238#: sequencer.c:1267
31e5e17b
JX
5239msgid "detached HEAD"
5240msgstr "分离头指针"
5241
5242# 译者:中文字符串拼接,可删除前导空格
06991777 5243#: sequencer.c:1271
31e5e17b
JX
5244msgid " (root-commit)"
5245msgstr "(根提交)"
5246
06991777 5247#: sequencer.c:1292
31e5e17b
JX
5248msgid "could not parse HEAD"
5249msgstr "不能解析 HEAD"
5250
06991777 5251#: sequencer.c:1294
31e5e17b
JX
5252#, c-format
5253msgid "HEAD %s is not a commit!"
5254msgstr "HEAD %s 不是一个提交!"
5255
06991777 5256#: sequencer.c:1298 builtin/commit.c:1546
31e5e17b
JX
5257msgid "could not parse HEAD commit"
5258msgstr "不能解析 HEAD 提交"
5259
06991777 5260#: sequencer.c:1350 sequencer.c:1964
31e5e17b
JX
5261msgid "unable to parse commit author"
5262msgstr "不能解析提交作者"
5263
06991777 5264#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678
31e5e17b
JX
5265msgid "git write-tree failed to write a tree"
5266msgstr "git write-tree 无法写入树对象"
5267
06991777 5268#: sequencer.c:1377 sequencer.c:1433
31e5e17b
JX
5269#, c-format
5270msgid "unable to read commit message from '%s'"
5271msgstr "不能从 '%s' 读取提交说明"
5272
06991777
JX
5273#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859
5274#: builtin/merge.c:884
31e5e17b 5275msgid "failed to write commit object"
c1ac5258 5276msgstr "写提交对象失败"
31e5e17b 5277
06991777 5278#: sequencer.c:1460
a0b6b246 5279#, c-format
5809aa05
JX
5280msgid "could not parse commit %s"
5281msgstr "不能解析提交 %s"
6792b93b 5282
06991777 5283#: sequencer.c:1465
63af42fe 5284#, c-format
5809aa05
JX
5285msgid "could not parse parent commit %s"
5286msgstr "不能解析父提交 %s"
63af42fe 5287
06991777 5288#: sequencer.c:1565 sequencer.c:1675
c1ac5258
JX
5289#, c-format
5290msgid "unknown command: %d"
5291msgstr "未知命令:%d"
5292
06991777 5293#: sequencer.c:1622 sequencer.c:1647
1a79b2f1
JX
5294#, c-format
5295msgid "This is a combination of %d commits."
5296msgstr "这是一个 %d 个提交的组合。"
5297
06991777 5298#: sequencer.c:1632 sequencer.c:4808
1a79b2f1
JX
5299msgid "need a HEAD to fixup"
5300msgstr "需要一个 HEAD 来修复"
5301
06991777 5302#: sequencer.c:1634 sequencer.c:2958
1a79b2f1
JX
5303msgid "could not read HEAD"
5304msgstr "不能读取 HEAD"
5305
06991777 5306#: sequencer.c:1636
1a79b2f1
JX
5307msgid "could not read HEAD's commit message"
5308msgstr "不能读取 HEAD 的提交说明"
5309
06991777 5310#: sequencer.c:1642
1a79b2f1
JX
5311#, c-format
5312msgid "cannot write '%s'"
5313msgstr "不能写 '%s'"
5314
06991777 5315#: sequencer.c:1649 git-rebase--preserve-merges.sh:441
1a79b2f1
JX
5316msgid "This is the 1st commit message:"
5317msgstr "这是第一个提交说明:"
5318
06991777 5319#: sequencer.c:1657
1a79b2f1
JX
5320#, c-format
5321msgid "could not read commit message of %s"
5322msgstr "不能读取 %s 的提交说明"
5323
06991777 5324#: sequencer.c:1664
1a79b2f1
JX
5325#, c-format
5326msgid "This is the commit message #%d:"
5327msgstr "这是提交说明 #%d:"
5328
06991777 5329#: sequencer.c:1670
1a79b2f1
JX
5330#, c-format
5331msgid "The commit message #%d will be skipped:"
5332msgstr "提交说明 #%d 将被跳过:"
5333
06991777 5334#: sequencer.c:1758
a0b6b246
JX
5335msgid "your index file is unmerged."
5336msgstr "您的索引文件未完成合并。"
6792b93b 5337
06991777 5338#: sequencer.c:1765
fd8cb379
JX
5339msgid "cannot fixup root commit"
5340msgstr "不能修复根提交"
5341
06991777 5342#: sequencer.c:1784
a0b6b246
JX
5343#, c-format
5344msgid "commit %s is a merge but no -m option was given."
5345msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
6792b93b 5346
06991777 5347#: sequencer.c:1792 sequencer.c:1800
a0b6b246
JX
5348#, c-format
5349msgid "commit %s does not have parent %d"
5350msgstr "提交 %s 没有第 %d 个父提交"
5351
06991777 5352#: sequencer.c:1806
1a79b2f1
JX
5353#, c-format
5354msgid "cannot get commit message for %s"
5355msgstr "不能得到 %s 的提交说明"
5356
a0b6b246
JX
5357#. TRANSLATORS: The first %s will be a "todo" command like
5358#. "revert" or "pick", the second %s a SHA1.
06991777 5359#: sequencer.c:1825
a0b6b246
JX
5360#, c-format
5361msgid "%s: cannot parse parent commit %s"
5362msgstr "%s:不能解析父提交 %s"
5363
06991777 5364#: sequencer.c:1890
a0b6b246 5365#, c-format
1a79b2f1
JX
5366msgid "could not rename '%s' to '%s'"
5367msgstr "不能将 '%s' 重命名为 '%s'"
a0b6b246 5368
06991777 5369#: sequencer.c:1945
a0b6b246
JX
5370#, c-format
5371msgid "could not revert %s... %s"
5372msgstr "不能还原 %s... %s"
5373
06991777 5374#: sequencer.c:1946
a0b6b246
JX
5375#, c-format
5376msgid "could not apply %s... %s"
5377msgstr "不能应用 %s... %s"
5378
06991777 5379#: sequencer.c:2005
a0b6b246
JX
5380#, c-format
5381msgid "git %s: failed to read the index"
5382msgstr "git %s:无法读取索引"
5383
06991777 5384#: sequencer.c:2012
a0b6b246
JX
5385#, c-format
5386msgid "git %s: failed to refresh the index"
5387msgstr "git %s:无法刷新索引"
5388
06991777 5389#: sequencer.c:2094
5809aa05
JX
5390#, c-format
5391msgid "%s does not accept arguments: '%s'"
5392msgstr "%s 不接受参数:'%s'"
5393
06991777 5394#: sequencer.c:2103
5809aa05
JX
5395#, c-format
5396msgid "missing arguments for %s"
5397msgstr "缺少 %s 的参数"
5398
06991777 5399#: sequencer.c:2163
a0b6b246
JX
5400#, c-format
5401msgid "invalid line %d: %.*s"
5402msgstr "无效行 %d:%.*s"
5403
06991777 5404#: sequencer.c:2171
1a79b2f1
JX
5405#, c-format
5406msgid "cannot '%s' without a previous commit"
5407msgstr "没有父提交的情况下不能 '%s'"
a0b6b246 5408
06991777 5409#: sequencer.c:2243
1a79b2f1
JX
5410msgid "please fix this using 'git rebase --edit-todo'."
5411msgstr "请用 'git rebase --edit-todo' 来修改。"
5412
06991777 5413#: sequencer.c:2245
a0b6b246
JX
5414#, c-format
5415msgid "unusable instruction sheet: '%s'"
29004bbb 5416msgstr "不可用的指令清单:'%s'"
a0b6b246 5417
06991777 5418#: sequencer.c:2250
1a79b2f1
JX
5419msgid "no commits parsed."
5420msgstr "没有解析提交。"
5421
06991777 5422#: sequencer.c:2261
a0b6b246
JX
5423msgid "cannot cherry-pick during a revert."
5424msgstr "不能在回退中执行拣选。"
5425
06991777 5426#: sequencer.c:2263
a0b6b246
JX
5427msgid "cannot revert during a cherry-pick."
5428msgstr "不能在拣选中执行回退。"
5429
06991777 5430#: sequencer.c:2333
a0b6b246
JX
5431#, c-format
5432msgid "invalid value for %s: %s"
5433msgstr "%s 的值无效:%s"
5434
06991777 5435#: sequencer.c:2420
fd8cb379
JX
5436msgid "unusable squash-onto"
5437msgstr "不可用的 squash-onto"
5438
06991777 5439#: sequencer.c:2436
a0b6b246
JX
5440#, c-format
5441msgid "malformed options sheet: '%s'"
fd8cb379 5442msgstr "格式错误的选项清单:'%s'"
a0b6b246 5443
06991777 5444#: sequencer.c:2518 sequencer.c:4067
c1ac5258
JX
5445msgid "empty commit set passed"
5446msgstr "提供了空的提交集"
5447
06991777 5448#: sequencer.c:2526
a0b6b246
JX
5449msgid "a cherry-pick or revert is already in progress"
5450msgstr "一个拣选或还原操作已在进行"
5451
06991777 5452#: sequencer.c:2527
a0b6b246
JX
5453msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
5454msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
5455
06991777 5456#: sequencer.c:2530
a0b6b246
JX
5457#, c-format
5458msgid "could not create sequencer directory '%s'"
5459msgstr "不能创建序列目录 '%s'"
5460
06991777 5461#: sequencer.c:2544
a0b6b246
JX
5462msgid "could not lock HEAD"
5463msgstr "不能锁定 HEAD"
5464
06991777 5465#: sequencer.c:2599 sequencer.c:3819
a0b6b246
JX
5466msgid "no cherry-pick or revert in progress"
5467msgstr "拣选或还原操作并未进行"
5468
06991777 5469#: sequencer.c:2601
a0b6b246
JX
5470msgid "cannot resolve HEAD"
5471msgstr "不能解析 HEAD"
5472
06991777 5473#: sequencer.c:2603 sequencer.c:2638
a0b6b246
JX
5474msgid "cannot abort from a branch yet to be born"
5475msgstr "不能从尚未建立的分支终止"
5476
06991777 5477#: sequencer.c:2624 builtin/grep.c:732
a0b6b246
JX
5478#, c-format
5479msgid "cannot open '%s'"
5480msgstr "不能打开 '%s'"
5481
06991777 5482#: sequencer.c:2626
a0b6b246
JX
5483#, c-format
5484msgid "cannot read '%s': %s"
5485msgstr "不能读取 '%s':%s"
5486
06991777 5487#: sequencer.c:2627
a0b6b246
JX
5488msgid "unexpected end of file"
5489msgstr "意外的文件结束"
5490
06991777 5491#: sequencer.c:2633
a0b6b246
JX
5492#, c-format
5493msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
5494msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
5495
06991777 5496#: sequencer.c:2644
1a79b2f1
JX
5497msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
5498msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
5499
06991777 5500#: sequencer.c:2750 sequencer.c:3735
31e5e17b
JX
5501#, c-format
5502msgid "could not update %s"
5503msgstr "不能更新 %s"
5504
06991777 5505#: sequencer.c:2788 sequencer.c:3715
1a79b2f1
JX
5506msgid "cannot read HEAD"
5507msgstr "不能读取 HEAD"
5508
06991777 5509#: sequencer.c:2805
c1ac5258
JX
5510#, c-format
5511msgid "unable to copy '%s' to '%s'"
5512msgstr "无法拷贝 '%s' 至 '%s'"
5513
06991777 5514#: sequencer.c:2813
c1ac5258
JX
5515#, c-format
5516msgid ""
5517"You can amend the commit now, with\n"
5518"\n"
5519" git commit --amend %s\n"
5520"\n"
5521"Once you are satisfied with your changes, run\n"
5522"\n"
5523" git rebase --continue\n"
5524msgstr ""
5525"您现在可以修补这个提交,使用\n"
5526"\n"
5527" git commit --amend %s\n"
5528"\n"
5529"当您对变更感到满意,执行\n"
5530"\n"
5531" git rebase --continue\n"
5532
06991777 5533#: sequencer.c:2823
c1ac5258
JX
5534#, c-format
5535msgid "Could not apply %s... %.*s"
5536msgstr "不能应用 %s... %.*s"
5537
06991777 5538#: sequencer.c:2830
c1ac5258
JX
5539#, c-format
5540msgid "Could not merge %.*s"
5541msgstr "不能合并 %.*s"
5542
06991777 5543#: sequencer.c:2844 sequencer.c:2848 builtin/difftool.c:641
1a79b2f1
JX
5544#, c-format
5545msgid "could not copy '%s' to '%s'"
5546msgstr "不能拷贝 '%s' 至 '%s'"
5547
06991777
JX
5548#: sequencer.c:2870 sequencer.c:3293 builtin/rebase.c:424 builtin/rebase.c:1230
5549#: builtin/rebase.c:1591 builtin/rebase.c:1646
1a79b2f1
JX
5550msgid "could not read index"
5551msgstr "不能读取索引"
5552
5553# 译者:注意保持前导空格
06991777 5554#: sequencer.c:2875
1a79b2f1
JX
5555#, c-format
5556msgid ""
5557"execution failed: %s\n"
5558"%sYou can fix the problem, and then run\n"
5559"\n"
5560" git rebase --continue\n"
5561"\n"
5562msgstr ""
5563"执行失败:%s\n"
5564"%s您可以改正该问题,然后运行\n"
5565"\n"
5566" git rebase --continue\n"
5567"\n"
5568
06991777 5569#: sequencer.c:2881
1a79b2f1
JX
5570msgid "and made changes to the index and/or the working tree\n"
5571msgstr "并且修改索引和/或工作区\n"
5572
06991777 5573#: sequencer.c:2887
1a79b2f1
JX
5574#, c-format
5575msgid ""
5576"execution succeeded: %s\n"
5577"but left changes to the index and/or the working tree\n"
5578"Commit or stash your changes, and then run\n"
5579"\n"
5580" git rebase --continue\n"
5581"\n"
5582msgstr ""
5583"执行成功:%s\n"
5584"但是在索引和/或工作区中存在变更\n"
a4f16749 5585"提交或贮藏修改,然后运行\n"
1a79b2f1
JX
5586"\n"
5587" git rebase --continue\n"
5588"\n"
5589
06991777 5590#: sequencer.c:2948
c1ac5258
JX
5591#, c-format
5592msgid "illegal label name: '%.*s'"
5593msgstr "非法的标签名称:'%.*s'"
5594
06991777 5595#: sequencer.c:3002
fd8cb379
JX
5596msgid "writing fake root commit"
5597msgstr "写伪根提交"
5598
06991777 5599#: sequencer.c:3007
fd8cb379
JX
5600msgid "writing squash-onto"
5601msgstr "写入 squash-onto"
5602
06991777 5603#: sequencer.c:3045 builtin/rebase.c:429 builtin/rebase.c:435
fd8cb379
JX
5604#, c-format
5605msgid "failed to find tree of %s"
5606msgstr "无法找到 %s 指向的树。"
5607
06991777 5608#: sequencer.c:3063 builtin/rebase.c:448
fd8cb379
JX
5609msgid "could not write index"
5610msgstr "不能写入索引"
5611
06991777 5612#: sequencer.c:3090
c1ac5258
JX
5613#, c-format
5614msgid "could not resolve '%s'"
5615msgstr "无法解析 '%s'"
5616
06991777 5617#: sequencer.c:3118
fd8cb379
JX
5618msgid "cannot merge without a current revision"
5619msgstr "没有当前版本不能合并"
5620
06991777 5621#: sequencer.c:3140
fd8cb379 5622#, c-format
c1ac5258
JX
5623msgid "unable to parse '%.*s'"
5624msgstr "无法解析 '%.*s'"
5625
06991777 5626#: sequencer.c:3149
c1ac5258
JX
5627#, c-format
5628msgid "nothing to merge: '%.*s'"
5629msgstr "无可用合并:'%.*s'"
5630
06991777 5631#: sequencer.c:3161
c1ac5258
JX
5632msgid "octopus merge cannot be executed on top of a [new root]"
5633msgstr "章鱼合并不能在一个新的根提交上执行"
fd8cb379 5634
06991777 5635#: sequencer.c:3176
fd8cb379
JX
5636#, c-format
5637msgid "could not get commit message of '%s'"
5638msgstr "不能获取 '%s' 的提交说明"
5639
06991777 5640#: sequencer.c:3325
fd8cb379
JX
5641#, c-format
5642msgid "could not even attempt to merge '%.*s'"
5643msgstr "甚至不能尝试合并 '%.*s'"
5644
06991777 5645#: sequencer.c:3341
fd8cb379
JX
5646msgid "merge: Unable to write new index file"
5647msgstr "合并:无法写入新索引文件"
5648
06991777 5649#: sequencer.c:3409 builtin/rebase.c:298
1a79b2f1 5650#, c-format
a4f16749
JX
5651msgid "Applied autostash.\n"
5652msgstr "已应用 autostash。\n"
1a79b2f1 5653
06991777 5654#: sequencer.c:3421
1a79b2f1
JX
5655#, c-format
5656msgid "cannot store %s"
5657msgstr "不能存储 %s"
5658
06991777 5659#: sequencer.c:3424 builtin/rebase.c:314
1a79b2f1
JX
5660#, c-format
5661msgid ""
5662"Applying autostash resulted in conflicts.\n"
5663"Your changes are safe in the stash.\n"
5664"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
5665msgstr ""
5666"应用 autostash 导致冲突。\n"
a4f16749 5667"您的修改安全地保存在贮藏区中。\n"
1a79b2f1
JX
5668"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
5669
06991777 5670#: sequencer.c:3478
4c27fcb5
JX
5671#, c-format
5672msgid "could not checkout %s"
5673msgstr "不能检出 %s"
5674
06991777 5675#: sequencer.c:3492
4c27fcb5
JX
5676#, c-format
5677msgid "%s: not a valid OID"
06991777 5678msgstr "%s:不是一个有效的对象ID"
4c27fcb5 5679
06991777 5680#: sequencer.c:3497 git-rebase--preserve-merges.sh:724
4c27fcb5
JX
5681msgid "could not detach HEAD"
5682msgstr "不能分离头指针"
5683
06991777 5684#: sequencer.c:3512
4c27fcb5
JX
5685#, c-format
5686msgid "Stopped at HEAD\n"
5687msgstr "停止在 HEAD\n"
5688
06991777 5689#: sequencer.c:3514
4c27fcb5
JX
5690#, c-format
5691msgid "Stopped at %s\n"
5692msgstr "停止在 %s\n"
5693
06991777 5694#: sequencer.c:3522
fd8cb379
JX
5695#, c-format
5696msgid ""
5697"Could not execute the todo command\n"
5698"\n"
5699" %.*s\n"
5700"It has been rescheduled; To edit the command before continuing, please\n"
5701"edit the todo list first:\n"
5702"\n"
5703" git rebase --edit-todo\n"
5704" git rebase --continue\n"
5705msgstr ""
5706"无法执行待办命令\n"
5707"\n"
5708" %.*s\n"
5709"已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n"
5710"\n"
5711" git rebase --edit-todo\n"
5712" git rebase --continue\n"
5713
06991777 5714#: sequencer.c:3597
1a79b2f1 5715#, c-format
87cb7997
JX
5716msgid "Stopped at %s... %.*s\n"
5717msgstr "停止在 %s... %.*s\n"
1a79b2f1 5718
06991777 5719#: sequencer.c:3677
1a79b2f1
JX
5720#, c-format
5721msgid "unknown command %d"
5722msgstr "未知命令 %d"
5723
06991777 5724#: sequencer.c:3723
1a79b2f1
JX
5725msgid "could not read orig-head"
5726msgstr "不能读取 orig-head"
5727
06991777 5728#: sequencer.c:3728 sequencer.c:4805
1a79b2f1
JX
5729msgid "could not read 'onto'"
5730msgstr "不能读取 'onto'"
5731
06991777 5732#: sequencer.c:3742
1a79b2f1
JX
5733#, c-format
5734msgid "could not update HEAD to %s"
5735msgstr "不能更新 HEAD 为 %s"
5736
06991777 5737#: sequencer.c:3831
1a79b2f1
JX
5738msgid "cannot rebase: You have unstaged changes."
5739msgstr "不能变基:您有未暂存的变更。"
5740
06991777 5741#: sequencer.c:3840
1a79b2f1
JX
5742msgid "cannot amend non-existing commit"
5743msgstr "不能修补不存在的提交"
5744
06991777 5745#: sequencer.c:3842
1a79b2f1
JX
5746#, c-format
5747msgid "invalid file: '%s'"
5748msgstr "无效文件:'%s'"
5749
06991777 5750#: sequencer.c:3844
1a79b2f1
JX
5751#, c-format
5752msgid "invalid contents: '%s'"
5753msgstr "无效内容:'%s'"
5754
06991777 5755#: sequencer.c:3847
1a79b2f1
JX
5756msgid ""
5757"\n"
5758"You have uncommitted changes in your working tree. Please, commit them\n"
5759"first and then run 'git rebase --continue' again."
87cb7997
JX
5760msgstr ""
5761"\n"
5762"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
1a79b2f1 5763
06991777 5764#: sequencer.c:3883 sequencer.c:3921
fd8cb379
JX
5765#, c-format
5766msgid "could not write file: '%s'"
5767msgstr "不能写入文件:'%s'"
5768
06991777 5769#: sequencer.c:3936
fd8cb379
JX
5770msgid "could not remove CHERRY_PICK_HEAD"
5771msgstr "不能删除 CHERRY_PICK_HEAD"
5772
06991777 5773#: sequencer.c:3943
1a79b2f1
JX
5774msgid "could not commit staged changes."
5775msgstr "不能提交暂存的修改。"
5776
06991777 5777#: sequencer.c:4044
a0b6b246
JX
5778#, c-format
5779msgid "%s: can't cherry-pick a %s"
5780msgstr "%s:不能拣选一个%s"
5781
06991777 5782#: sequencer.c:4048
a0b6b246
JX
5783#, c-format
5784msgid "%s: bad revision"
5785msgstr "%s:错误的版本"
5786
06991777 5787#: sequencer.c:4083
a0b6b246
JX
5788msgid "can't revert as initial commit"
5789msgstr "不能作为初始提交回退"
5790
06991777 5791#: sequencer.c:4529
6937cb4e
JX
5792msgid "make_script: unhandled options"
5793msgstr "make_script:有未能处理的选项"
5794
06991777 5795#: sequencer.c:4532
6937cb4e
JX
5796msgid "make_script: error preparing revisions"
5797msgstr "make_script:准备版本时错误"
5798
06991777 5799#: sequencer.c:4573 sequencer.c:4629 sequencer.c:4904
6937cb4e
JX
5800#, c-format
5801msgid "unusable todo list: '%s'"
5802msgstr "不可用的待办列表:'%s'"
5803
06991777 5804#: sequencer.c:4684
6937cb4e
JX
5805#, c-format
5806msgid ""
5807"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
5808msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
5809
06991777 5810#: sequencer.c:4754
6937cb4e
JX
5811#, c-format
5812msgid ""
5813"Warning: some commits may have been dropped accidentally.\n"
5814"Dropped commits (newer to older):\n"
5815msgstr ""
5816"警告:一些提交可能被意外丢弃。\n"
5817"丢弃的提交(从新到旧):\n"
5818
06991777 5819#: sequencer.c:4761
6937cb4e
JX
5820#, c-format
5821msgid ""
5822"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
5823"\n"
5824"Use 'git config rebase.missingCommitsCheck' to change the level of "
5825"warnings.\n"
5826"The possible behaviours are: ignore, warn, error.\n"
5827"\n"
5828msgstr ""
5829"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
5830"\n"
5831"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
5832"可选值有:ignore、warn、error。\n"
5833"\n"
5834
06991777 5835#: sequencer.c:4774
6937cb4e
JX
5836#, c-format
5837msgid ""
5838"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
5839"continue'.\n"
5840"Or you can abort the rebase with 'git rebase --abort'.\n"
5841msgstr ""
5842"您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n"
5843"或者您可以用 'git rebase --abort' 终止变基。\n"
5844
06991777 5845#: sequencer.c:4912 sequencer.c:4950
4c27fcb5
JX
5846msgid "nothing to do"
5847msgstr "无事可做"
5848
06991777 5849#: sequencer.c:4916
4c27fcb5
JX
5850#, c-format
5851msgid "Rebase %s onto %s (%d command)"
5852msgid_plural "Rebase %s onto %s (%d commands)"
5853msgstr[0] "变基 %s 到 %s(%d 个提交)"
5854msgstr[1] "变基 %s 到 %s(%d 个提交)"
5855
06991777 5856#: sequencer.c:4928
4c27fcb5
JX
5857#, c-format
5858msgid "could not copy '%s' to '%s'."
5859msgstr "不能拷贝 '%s' 至 '%s'。"
5860
06991777 5861#: sequencer.c:4932 sequencer.c:4961
4c27fcb5
JX
5862msgid "could not transform the todo list"
5863msgstr "无法改变待办列表"
5864
06991777 5865#: sequencer.c:4964
4c27fcb5
JX
5866msgid "could not skip unnecessary pick commands"
5867msgstr "无法跳过不必要的拣选"
5868
06991777 5869#: sequencer.c:5047
6937cb4e
JX
5870msgid "the script was already rearranged."
5871msgstr "脚本已经重新编排。"
5872
fd8cb379 5873#: setup.c:123
31e5e17b
JX
5874#, c-format
5875msgid "'%s' is outside repository"
5876msgstr "'%s' 在仓库之外"
5877
fd8cb379 5878#: setup.c:172
a0b6b246 5879#, c-format
6792b93b 5880msgid ""
a0b6b246
JX
5881"%s: no such path in the working tree.\n"
5882"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
5883msgstr ""
5884"%s:工作区中无此路径。\n"
58b6f078 5885"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
6792b93b 5886
fd8cb379 5887#: setup.c:185
90314792 5888#, c-format
a0b6b246
JX
5889msgid ""
5890"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
5891"Use '--' to separate paths from revisions, like this:\n"
5892"'git <command> [<revision>...] -- [<file>...]'"
5893msgstr ""
5894"有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
5895"使用 '--' 来分隔版本和路径,例如:\n"
58b6f078 5896"'git <命令> [<版本>...] -- [<文件>...]'"
6792b93b 5897
fd8cb379 5898#: setup.c:234
31e5e17b
JX
5899#, c-format
5900msgid "option '%s' must come before non-option arguments"
5901msgstr "选项 '%s' 必须在其他非选项参数之前"
5902
fd8cb379 5903#: setup.c:253
a0b6b246
JX
5904#, c-format
5905msgid ""
5906"ambiguous argument '%s': both revision and filename\n"
5907"Use '--' to separate paths from revisions, like this:\n"
5908"'git <command> [<revision>...] -- [<file>...]'"
5909msgstr ""
5910"有歧义的参数 '%s':可同时是版本和文件\n"
5911"使用 '--' 来分隔版本和路径,例如:\n"
58b6f078 5912"'git <命令> [<版本>...] -- [<文件>...]'"
2e8451e8 5913
fd8cb379 5914#: setup.c:389
31e5e17b
JX
5915msgid "unable to set up work tree using invalid config"
5916msgstr "无法使用无效配置来创建工作区"
5917
fd8cb379 5918#: setup.c:393
31e5e17b 5919msgid "this operation must be run in a work tree"
610f8099 5920msgstr "该操作必须在一个工作区中运行"
31e5e17b 5921
4c27fcb5 5922#: setup.c:527
a0b6b246
JX
5923#, c-format
5924msgid "Expected git repo version <= %d, found %d"
5925msgstr "期望 git 仓库版本 <= %d,却得到 %d"
6792b93b 5926
4c27fcb5 5927#: setup.c:535
a0b6b246
JX
5928msgid "unknown repository extensions found:"
5929msgstr "发现未知的仓库扩展:"
2e8451e8 5930
4c27fcb5 5931#: setup.c:554
1003b3a5 5932#, c-format
31e5e17b 5933msgid "error opening '%s'"
c1ac5258 5934msgstr "打开 '%s' 出错"
1003b3a5 5935
4c27fcb5 5936#: setup.c:556
31e5e17b
JX
5937#, c-format
5938msgid "too large to be a .git file: '%s'"
610f8099 5939msgstr "文件太大,无法作为 .git 文件:'%s'"
31e5e17b 5940
4c27fcb5 5941#: setup.c:558
31e5e17b
JX
5942#, c-format
5943msgid "error reading %s"
c1ac5258 5944msgstr "读取 %s 出错"
31e5e17b 5945
4c27fcb5 5946#: setup.c:560
31e5e17b
JX
5947#, c-format
5948msgid "invalid gitfile format: %s"
5949msgstr "无效的 gitfile 格式:%s"
5950
4c27fcb5 5951#: setup.c:562
31e5e17b
JX
5952#, c-format
5953msgid "no path in gitfile: %s"
5954msgstr "在 gitfile 中没有路径:%s"
5955
4c27fcb5 5956#: setup.c:564
31e5e17b
JX
5957#, c-format
5958msgid "not a git repository: %s"
5959msgstr "不是一个 git 仓库:%s"
5960
4c27fcb5 5961#: setup.c:663
31e5e17b
JX
5962#, c-format
5963msgid "'$%s' too big"
5964msgstr "'$%s' 太大"
5965
4c27fcb5 5966#: setup.c:677
31e5e17b
JX
5967#, c-format
5968msgid "not a git repository: '%s'"
5969msgstr "不是一个 git 仓库:'%s'"
5970
4c27fcb5 5971#: setup.c:706 setup.c:708 setup.c:739
31e5e17b
JX
5972#, c-format
5973msgid "cannot chdir to '%s'"
5974msgstr "不能切换目录到 '%s'"
5975
06991777 5976#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824
31e5e17b 5977msgid "cannot come back to cwd"
a0b6b246 5978msgstr "无法返回当前工作目录"
1003b3a5 5979
06991777 5980#: setup.c:838
31e5e17b
JX
5981#, c-format
5982msgid "failed to stat '%*s%s%s'"
c1ac5258 5983msgstr "获取 '%*s%s%s' 状态(stat)失败"
31e5e17b 5984
06991777 5985#: setup.c:1068
a0b6b246
JX
5986msgid "Unable to read current working directory"
5987msgstr "不能读取当前工作目录"
1003b3a5 5988
06991777 5989#: setup.c:1077 setup.c:1083
87cb7997 5990#, c-format
31e5e17b 5991msgid "cannot change to '%s'"
87cb7997
JX
5992msgstr "不能切换到 '%s'"
5993
06991777
JX
5994#: setup.c:1088
5995#, c-format
5996msgid "not a git repository (or any of the parent directories): %s"
5997msgstr "不是一个 git 仓库(或者任何父目录):%s"
5998
5999#: setup.c:1094
a0b6b246
JX
6000#, c-format
6001msgid ""
31e5e17b 6002"not a git repository (or any parent up to mount point %s)\n"
a0b6b246
JX
6003"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
6004msgstr ""
31e5e17b 6005"不是一个 git 仓库(或者直至挂载点 %s 的任何父目录)\n"
a0b6b246 6006"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
1003b3a5 6007
06991777 6008#: setup.c:1204
a0b6b246
JX
6009#, c-format
6010msgid ""
31e5e17b 6011"problem with core.sharedRepository filemode value (0%.3o).\n"
a0b6b246
JX
6012"The owner of files must always have read and write permissions."
6013msgstr ""
31e5e17b 6014"参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n"
a0b6b246 6015"文件属主必须始终拥有读写权限。"
6792b93b 6016
06991777 6017#: setup.c:1247
31e5e17b
JX
6018msgid "open /dev/null or dup failed"
6019msgstr "不能打开或者复制 /dev/null"
6020
06991777 6021#: setup.c:1262
31e5e17b
JX
6022msgid "fork failed"
6023msgstr "fork 失败"
6024
06991777 6025#: setup.c:1267
31e5e17b
JX
6026msgid "setsid failed"
6027msgstr "setsid 失败"
6028
06991777 6029#: sha1-file.c:445
c1ac5258
JX
6030#, c-format
6031msgid "object directory %s does not exist; check .git/objects/info/alternates"
6032msgstr "对象目录 %s 不存在,检查 .git/objects/info/alternates"
6033
06991777 6034#: sha1-file.c:496
c1ac5258
JX
6035#, c-format
6036msgid "unable to normalize alternate object path: %s"
6037msgstr "无法规范化备用对象路径:%s"
6038
06991777 6039#: sha1-file.c:568
c1ac5258
JX
6040#, c-format
6041msgid "%s: ignoring alternate object stores, nesting too deep"
6042msgstr "%s:忽略备用对象库,嵌套太深"
6043
06991777 6044#: sha1-file.c:575
c1ac5258
JX
6045#, c-format
6046msgid "unable to normalize object directory: %s"
6047msgstr "无法规范化对象目录: %s"
6048
06991777 6049#: sha1-file.c:618
c1ac5258
JX
6050msgid "unable to fdopen alternates lockfile"
6051msgstr "无法 fdopen 替换锁文件"
6052
06991777 6053#: sha1-file.c:636
c1ac5258
JX
6054msgid "unable to read alternates file"
6055msgstr "无法读取替代文件"
6056
06991777 6057#: sha1-file.c:643
c1ac5258
JX
6058msgid "unable to move new alternates file into place"
6059msgstr "无法将新的替代文件移动到位"
6060
06991777 6061#: sha1-file.c:678
a0b6b246
JX
6062#, c-format
6063msgid "path '%s' does not exist"
6064msgstr "路径 '%s' 不存在"
6065
06991777 6066#: sha1-file.c:704
a0b6b246
JX
6067#, c-format
6068msgid "reference repository '%s' as a linked checkout is not supported yet."
6069msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
6070
06991777 6071#: sha1-file.c:710
a0b6b246
JX
6072#, c-format
6073msgid "reference repository '%s' is not a local repository."
6074msgstr "参考仓库 '%s' 不是一个本地仓库。"
6075
06991777 6076#: sha1-file.c:716
a0b6b246
JX
6077#, c-format
6078msgid "reference repository '%s' is shallow"
6079msgstr "参考仓库 '%s' 是一个浅克隆"
6080
06991777 6081#: sha1-file.c:724
a0b6b246
JX
6082#, c-format
6083msgid "reference repository '%s' is grafted"
fd8cb379 6084msgstr "参考仓库 '%s' 已被移植"
a0b6b246 6085
06991777 6086#: sha1-file.c:838
c1ac5258
JX
6087#, c-format
6088msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
6089msgstr "尝试 mmap %<PRIuMAX>,超过了最大值 %<PRIuMAX>"
6090
06991777 6091#: sha1-file.c:863
c1ac5258
JX
6092msgid "mmap failed"
6093msgstr "mmap 失败"
6094
06991777 6095#: sha1-file.c:1027
c1ac5258
JX
6096#, c-format
6097msgid "object file %s is empty"
6098msgstr "对象文件 %s 为空"
6099
06991777 6100#: sha1-file.c:1151 sha1-file.c:2288
c1ac5258
JX
6101#, c-format
6102msgid "corrupt loose object '%s'"
6103msgstr "损坏的松散对象 '%s'"
6104
06991777 6105#: sha1-file.c:1153 sha1-file.c:2292
c1ac5258
JX
6106#, c-format
6107msgid "garbage at end of loose object '%s'"
6108msgstr "松散对象 '%s' 后面有垃圾数据"
6109
06991777 6110#: sha1-file.c:1195
c1ac5258
JX
6111msgid "invalid object type"
6112msgstr "无效的对象类型"
6113
06991777 6114#: sha1-file.c:1279
c1ac5258
JX
6115#, c-format
6116msgid "unable to unpack %s header with --allow-unknown-type"
6117msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
6118
06991777 6119#: sha1-file.c:1282
c1ac5258
JX
6120#, c-format
6121msgid "unable to unpack %s header"
6122msgstr "无法解开 %s 头部"
6123
06991777 6124#: sha1-file.c:1288
c1ac5258
JX
6125#, c-format
6126msgid "unable to parse %s header with --allow-unknown-type"
6127msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
6128
06991777 6129#: sha1-file.c:1291
c1ac5258
JX
6130#, c-format
6131msgid "unable to parse %s header"
6132msgstr "无法解析 %s 头部"
6133
06991777 6134#: sha1-file.c:1481
c1ac5258
JX
6135#, c-format
6136msgid "failed to read object %s"
6137msgstr "读取对象 %s 失败"
6138
06991777 6139#: sha1-file.c:1485
c1ac5258
JX
6140#, c-format
6141msgid "replacement %s not found for %s"
6142msgstr "找不到 %2$s 的替代 %1$s"
6143
06991777 6144#: sha1-file.c:1489
c1ac5258
JX
6145#, c-format
6146msgid "loose object %s (stored in %s) is corrupt"
6147msgstr "松散对象 %s(保存在 %s)已损坏"
6148
06991777 6149#: sha1-file.c:1493
c1ac5258
JX
6150#, c-format
6151msgid "packed object %s (stored in %s) is corrupt"
6152msgstr "打包对象 %s(保存在 %s)已损坏"
6153
06991777 6154#: sha1-file.c:1595
c1ac5258 6155#, c-format
06991777
JX
6156msgid "unable to write file %s"
6157msgstr "无法写文件 %s"
c1ac5258 6158
06991777 6159#: sha1-file.c:1602
c1ac5258
JX
6160#, c-format
6161msgid "unable to set permission to '%s'"
6162msgstr "无法为 '%s' 设置权限"
6163
06991777 6164#: sha1-file.c:1609
c1ac5258
JX
6165msgid "file write error"
6166msgstr "文件写错误"
6167
06991777
JX
6168#: sha1-file.c:1628
6169msgid "error when closing loose object file"
6170msgstr "关闭松散对象文件时出错"
c1ac5258 6171
06991777 6172#: sha1-file.c:1693
c1ac5258
JX
6173#, c-format
6174msgid "insufficient permission for adding an object to repository database %s"
6175msgstr "权限不足,无法在仓库对象库 %s 中添加对象"
6176
06991777 6177#: sha1-file.c:1695
c1ac5258
JX
6178msgid "unable to create temporary file"
6179msgstr "无法创建临时文件"
6180
06991777
JX
6181#: sha1-file.c:1719
6182msgid "unable to write loose object file"
6183msgstr "不能写松散对象文件"
c1ac5258 6184
06991777 6185#: sha1-file.c:1725
c1ac5258
JX
6186#, c-format
6187msgid "unable to deflate new object %s (%d)"
6188msgstr "不能压缩新对象 %s(%d)"
6189
06991777 6190#: sha1-file.c:1729
c1ac5258
JX
6191#, c-format
6192msgid "deflateEnd on object %s failed (%d)"
6193msgstr "在对象 %s 上调用 deflateEnd 失败(%d)"
6194
06991777 6195#: sha1-file.c:1733
c1ac5258
JX
6196#, c-format
6197msgid "confused by unstable object source data for %s"
6198msgstr "被 %s 的不稳定对象源数据搞糊涂了"
6199
06991777 6200#: sha1-file.c:1743 builtin/pack-objects.c:919
c1ac5258
JX
6201#, c-format
6202msgid "failed utime() on %s"
6203msgstr "在 %s 上调用 utime() 失败"
6204
06991777 6205#: sha1-file.c:1818
c1ac5258 6206#, c-format
06991777
JX
6207msgid "cannot read object for %s"
6208msgstr "不能读取对象 %s"
c1ac5258 6209
06991777 6210#: sha1-file.c:1858
c1ac5258
JX
6211msgid "corrupt commit"
6212msgstr "损坏的提交"
6213
06991777 6214#: sha1-file.c:1866
c1ac5258
JX
6215msgid "corrupt tag"
6216msgstr "损坏的标签"
6217
06991777 6218#: sha1-file.c:1965
c1ac5258
JX
6219#, c-format
6220msgid "read error while indexing %s"
6221msgstr "索引 %s 时读取错误"
6222
06991777 6223#: sha1-file.c:1968
c1ac5258
JX
6224#, c-format
6225msgid "short read while indexing %s"
6226msgstr "索引 %s 时读入不完整"
6227
06991777 6228#: sha1-file.c:2041 sha1-file.c:2050
c1ac5258
JX
6229#, c-format
6230msgid "%s: failed to insert into database"
6231msgstr "%s:插入数据库失败"
6232
06991777 6233#: sha1-file.c:2056
c1ac5258
JX
6234#, c-format
6235msgid "%s: unsupported file type"
6236msgstr "%s:不支持的文件类型"
6237
06991777 6238#: sha1-file.c:2080
c1ac5258
JX
6239#, c-format
6240msgid "%s is not a valid object"
6241msgstr "%s 不是一个有效的对象"
6242
06991777 6243#: sha1-file.c:2082
c1ac5258
JX
6244#, c-format
6245msgid "%s is not a valid '%s' object"
6246msgstr "%s 不是一个有效的 '%s' 对象"
6247
06991777 6248#: sha1-file.c:2109 builtin/index-pack.c:154
c1ac5258
JX
6249#, c-format
6250msgid "unable to open %s"
6251msgstr "不能打开 %s"
6252
06991777 6253#: sha1-file.c:2299 sha1-file.c:2351
c1ac5258 6254#, c-format
06991777
JX
6255msgid "hash mismatch for %s (expected %s)"
6256msgstr "%s 的哈希值不匹配(预期 %s)"
c1ac5258 6257
06991777 6258#: sha1-file.c:2323
c1ac5258
JX
6259#, c-format
6260msgid "unable to mmap %s"
6261msgstr "不能 mmap %s"
6262
06991777 6263#: sha1-file.c:2328
c1ac5258
JX
6264#, c-format
6265msgid "unable to unpack header of %s"
6266msgstr "无法解压缩 %s 的头部"
6267
06991777 6268#: sha1-file.c:2334
c1ac5258
JX
6269#, c-format
6270msgid "unable to parse header of %s"
6271msgstr "无法解析 %s 的头部"
6272
06991777 6273#: sha1-file.c:2345
c1ac5258
JX
6274#, c-format
6275msgid "unable to unpack contents of %s"
6276msgstr "无法解压缩 %s 的内容"
6277
06991777 6278#: sha1-name.c:448
a0b6b246
JX
6279#, c-format
6280msgid "short SHA1 %s is ambiguous"
29004bbb 6281msgstr "短 SHA1 %s 存在歧义"
a0b6b246 6282
06991777 6283#: sha1-name.c:459
a0b6b246
JX
6284msgid "The candidates are:"
6285msgstr "候选者有:"
6286
06991777 6287#: sha1-name.c:742
a0b6b246
JX
6288msgid ""
6289"Git normally never creates a ref that ends with 40 hex characters\n"
6290"because it will be ignored when you just specify 40-hex. These refs\n"
6291"may be created by mistake. For example,\n"
6292"\n"
6293" git checkout -b $br $(git rev-parse ...)\n"
6294"\n"
6295"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
6296"examine these refs and maybe delete them. Turn this message off by\n"
6297"running \"git config advice.objectNameWarning false\""
6298msgstr ""
6299"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
6300"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
6301"\n"
6302" git checkout -b $br $(git rev-parse ...)\n"
6303"\n"
6304"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
6305"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
6306"命令关闭本消息通知。"
6307
06991777 6308#: submodule.c:114 submodule.c:143
a0b6b246
JX
6309msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
6310msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
6311
06991777 6312#: submodule.c:118 submodule.c:147
a0b6b246
JX
6313#, c-format
6314msgid "Could not find section in .gitmodules where path=%s"
6315msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
6316
06991777 6317#: submodule.c:154
a0b6b246
JX
6318#, c-format
6319msgid "Could not remove .gitmodules entry for %s"
6320msgstr "无法移除 %s 的 .gitmodules 条目"
6321
06991777 6322#: submodule.c:165
a0b6b246
JX
6323msgid "staging updated .gitmodules failed"
6324msgstr "将更新后 .gitmodules 添加暂存区失败"
6325
06991777 6326#: submodule.c:327
a4f16749
JX
6327#, c-format
6328msgid "in unpopulated submodule '%s'"
6329msgstr "位于未检出的子模组 '%s'"
6330
06991777 6331#: submodule.c:358
a4f16749
JX
6332#, c-format
6333msgid "Pathspec '%s' is in submodule '%.*s'"
6334msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
6335
06991777 6336#: submodule.c:906
6937cb4e
JX
6337#, c-format
6338msgid "submodule entry '%s' (%s) is a %s, not a commit"
493a9322 6339msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交"
6937cb4e 6340
06991777 6341#: submodule.c:1143 builtin/branch.c:656 builtin/submodule--helper.c:1989
6937cb4e
JX
6342msgid "Failed to resolve HEAD as a valid ref."
6343msgstr "无法将 HEAD 解析为有效引用。"
6344
06991777
JX
6345#: submodule.c:1477
6346#, c-format
6347msgid "Could not access submodule '%s'"
6348msgstr "无法访问子模组 '%s'"
6349
6350#: submodule.c:1639
1a79b2f1 6351#, c-format
87cb7997 6352msgid "'%s' not recognized as a git repository"
65e2041e 6353msgstr "无法将 '%s' 识别为一个 git 仓库"
1a79b2f1 6354
06991777 6355#: submodule.c:1777
1a79b2f1 6356#, c-format
87cb7997
JX
6357msgid "could not start 'git status' in submodule '%s'"
6358msgstr "无法在子模组 '%s' 中启动 'git status'"
1a79b2f1 6359
06991777 6360#: submodule.c:1790
87cb7997
JX
6361#, c-format
6362msgid "could not run 'git status' in submodule '%s'"
6363msgstr "无法在子模组 '%s' 中执行 'git status'"
6364
06991777
JX
6365#: submodule.c:1805
6366#, c-format
6367msgid "Could not unset core.worktree setting in submodule '%s'"
6368msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
6369
6370#: submodule.c:1895
87cb7997
JX
6371#, c-format
6372msgid "submodule '%s' has dirty index"
6373msgstr "子模组 '%s' 中有脏索引"
6374
06991777 6375#: submodule.c:1947
c1ac5258
JX
6376#, c-format
6377msgid "Submodule '%s' could not be updated."
6378msgstr "子模组 '%s' 无法被更新。"
6379
06991777 6380#: submodule.c:1996
1a79b2f1
JX
6381#, c-format
6382msgid ""
6383"relocate_gitdir for submodule '%s' with more than one worktree not supported"
6384msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
6385
06991777 6386#: submodule.c:2008 submodule.c:2064
1a79b2f1
JX
6387#, c-format
6388msgid "could not lookup name for submodule '%s'"
6389msgstr "不能查询子模组 '%s' 的名称"
6390
06991777 6391#: submodule.c:2015
1a79b2f1
JX
6392#, c-format
6393msgid ""
6394"Migrating git directory of '%s%s' from\n"
6395"'%s' to\n"
6396"'%s'\n"
6397msgstr ""
6398"将 '%s%s' 的 git 目录从\n"
6399"'%s' 迁移至\n"
6400"'%s'\n"
6401
06991777 6402#: submodule.c:2099
1a79b2f1
JX
6403#, c-format
6404msgid "could not recurse into submodule '%s'"
6405msgstr "无法递归进子模组路径 '%s'"
6406
06991777 6407#: submodule.c:2143
87cb7997
JX
6408msgid "could not start ls-files in .."
6409msgstr "无法在 .. 中启动 ls-files"
6410
06991777 6411#: submodule.c:2182
87cb7997
JX
6412#, c-format
6413msgid "ls-tree returned unexpected return code %d"
6414msgstr "ls-tree 返回未知返回值 %d"
6415
4c27fcb5 6416#: submodule-config.c:232
fd8cb379
JX
6417#, c-format
6418msgid "ignoring suspicious submodule name: %s"
6419msgstr "忽略可疑的子模组名称:%s"
6420
4c27fcb5 6421#: submodule-config.c:296
6937cb4e
JX
6422msgid "negative values not allowed for submodule.fetchjobs"
6423msgstr "submodule.fetchjobs 不允许为负值"
6424
4c27fcb5
JX
6425#: submodule-config.c:390
6426#, c-format
6427msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
6428msgstr "忽略可能被解析为命令行选项的 '%s':%s"
6429
6430#: submodule-config.c:479
a0b6b246
JX
6431#, c-format
6432msgid "invalid value for %s"
6433msgstr "%s 的值无效"
6434
4c27fcb5
JX
6435#: submodule-config.c:754
6436#, c-format
6437msgid "Could not update .gitmodules entry %s"
6438msgstr "不能更新 .gitmodules 条目 %s"
6439
6937cb4e 6440#: trailer.c:238
a0b6b246
JX
6441#, c-format
6442msgid "running trailer command '%s' failed"
6443msgstr "执行 trailer 命令 '%s' 失败"
6444
6937cb4e
JX
6445#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
6446#: trailer.c:557
a0b6b246
JX
6447#, c-format
6448msgid "unknown value '%s' for key '%s'"
6449msgstr "键 '%2$s' 的未知取值 '%1$s'"
6450
4c27fcb5 6451#: trailer.c:539 trailer.c:544 builtin/remote.c:295
a0b6b246
JX
6452#, c-format
6453msgid "more than one %s"
6454msgstr "多于一个 %s"
6455
6937cb4e 6456#: trailer.c:730
a0b6b246
JX
6457#, c-format
6458msgid "empty trailer token in trailer '%.*s'"
6459msgstr "签名 '%.*s' 的键为空"
6460
6937cb4e 6461#: trailer.c:750
a0b6b246
JX
6462#, c-format
6463msgid "could not read input file '%s'"
6464msgstr "不能读取输入文件 '%s'"
6465
6937cb4e 6466#: trailer.c:753
a0b6b246
JX
6467msgid "could not read from stdin"
6468msgstr "不能自标准输入读取"
6469
06991777 6470#: trailer.c:1011 wrapper.c:701
a0b6b246
JX
6471#, c-format
6472msgid "could not stat %s"
65e2041e 6473msgstr "不能对 %s 调用 stat"
a0b6b246 6474
4c27fcb5 6475#: trailer.c:1013
a0b6b246
JX
6476#, c-format
6477msgid "file %s is not a regular file"
6478msgstr "文件 %s 不是一个正规文件"
6479
4c27fcb5 6480#: trailer.c:1015
a0b6b246
JX
6481#, c-format
6482msgid "file %s is not writable by user"
6483msgstr "文件 %s 用户不可写"
6484
4c27fcb5 6485#: trailer.c:1027
a0b6b246
JX
6486msgid "could not open temporary file"
6487msgstr "不能打开临时文件"
6488
4c27fcb5 6489#: trailer.c:1067
a0b6b246
JX
6490#, c-format
6491msgid "could not rename temporary file to %s"
6492msgstr "不能重命名临时文件为 %s"
6493
fd8cb379 6494#: transport.c:116
a0b6b246
JX
6495#, c-format
6496msgid "Would set upstream of '%s' to '%s' of '%s'\n"
6497msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
6498
c1ac5258
JX
6499#: transport.c:142
6500#, c-format
6501msgid "could not read bundle '%s'"
6502msgstr "无法读取 bundle '%s'"
6503
fd8cb379 6504#: transport.c:208
a0b6b246
JX
6505#, c-format
6506msgid "transport: invalid depth option '%s'"
6507msgstr "传输:无效的深度选项 '%s'"
6508
06991777 6509#: transport.c:617
fd8cb379
JX
6510msgid "could not parse transport.color.* config"
6511msgstr "不能解析 transport.color.* 配置"
6512
06991777 6513#: transport.c:690
c1ac5258
JX
6514msgid "support for protocol v2 not implemented yet"
6515msgstr "协议 v2 的支持尚未实现"
6516
06991777 6517#: transport.c:817
c1ac5258
JX
6518#, c-format
6519msgid "unknown value for config '%s': %s"
6520msgstr "配置 '%s' 的取值未知:%s"
6521
06991777 6522#: transport.c:883
c1ac5258
JX
6523#, c-format
6524msgid "transport '%s' not allowed"
6525msgstr "传输 '%s' 不允许"
6526
06991777 6527#: transport.c:937
c1ac5258
JX
6528msgid "git-over-rsync is no longer supported"
6529msgstr "不再支持 git-over-rsync"
6530
06991777 6531#: transport.c:1032
a0b6b246
JX
6532#, c-format
6533msgid ""
6534"The following submodule paths contain changes that can\n"
6535"not be found on any remote:\n"
6536msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
6537
06991777 6538#: transport.c:1036
a0b6b246
JX
6539#, c-format
6540msgid ""
6541"\n"
6542"Please try\n"
6543"\n"
6544"\tgit push --recurse-submodules=on-demand\n"
6545"\n"
6546"or cd to the path and use\n"
6547"\n"
6548"\tgit push\n"
6549"\n"
6550"to push them to a remote.\n"
6551"\n"
6552msgstr ""
6553"\n"
6554"请尝试\n"
6555"\n"
6556"\tgit push --recurse-submodules=on-demand\n"
6557"\n"
6558"或者进入到子目录执行\n"
6559"\n"
6560"\tgit push\n"
6561"\n"
6562"以推送至远程。\n"
6563"\n"
6564
06991777 6565#: transport.c:1044
a0b6b246
JX
6566msgid "Aborting."
6567msgstr "正在终止。"
6568
06991777 6569#: transport.c:1184
c1ac5258
JX
6570msgid "failed to push all needed submodules"
6571msgstr "不能推送全部需要的子模组"
6572
06991777 6573#: transport.c:1317 transport-helper.c:643
c1ac5258
JX
6574msgid "operation not supported by protocol"
6575msgstr "协议不支持该操作"
6576
06991777 6577#: transport.c:1421
c1ac5258
JX
6578#, c-format
6579msgid "invalid line while parsing alternate refs: %s"
6580msgstr "解析备用引用时无效的行:%s"
6581
6582#: transport-helper.c:51 transport-helper.c:80
6583msgid "full write to remote helper failed"
6584msgstr "完整写入远程助手失败"
6585
6586#: transport-helper.c:132
6587#, c-format
6588msgid "unable to find remote helper for '%s'"
6589msgstr "无法为 '%s' 找到远程助手"
6590
6591#: transport-helper.c:148 transport-helper.c:557
6592msgid "can't dup helper output fd"
6593msgstr "无法复制助手输出文件句柄"
6594
6595#: transport-helper.c:199
6596#, c-format
6597msgid ""
6598"unknown mandatory capability %s; this remote helper probably needs newer "
6599"version of Git"
6600msgstr "未知的强制能力 %s,该远程助手可能需要新版本的Git"
6601
6602#: transport-helper.c:205
6603msgid "this remote helper should implement refspec capability"
6604msgstr "远程助手需要实现 refspec 能力"
6605
6606#: transport-helper.c:272 transport-helper.c:412
6607#, c-format
6608msgid "%s unexpectedly said: '%s'"
6609msgstr "%s 意外地说:'%s'"
6610
6611#: transport-helper.c:401
6612#, c-format
6613msgid "%s also locked %s"
6614msgstr "%s 也锁定了 %s"
6615
6616#: transport-helper.c:479
6617msgid "couldn't run fast-import"
6618msgstr "不能执行 fast-import"
6619
6620#: transport-helper.c:502
6621msgid "error while running fast-import"
6622msgstr "执行 fast-import 出错"
6623
06991777 6624#: transport-helper.c:531 transport-helper.c:1097
c1ac5258
JX
6625#, c-format
6626msgid "could not read ref %s"
6627msgstr "无法读取引用 %s"
6628
6629#: transport-helper.c:576
6630#, c-format
6631msgid "unknown response to connect: %s"
6632msgstr "连接时未知的响应:%s"
6633
6634#: transport-helper.c:598
6635msgid "setting remote service path not supported by protocol"
6636msgstr "协议不支持设置远程服务路径"
6637
6638#: transport-helper.c:600
6639msgid "invalid remote service path"
6640msgstr "无效的远程服务路径"
6641
6642#: transport-helper.c:646
6643#, c-format
6644msgid "can't connect to subservice %s"
6645msgstr "不能连接到子服务 %s"
6646
06991777 6647#: transport-helper.c:718
c1ac5258
JX
6648#, c-format
6649msgid "expected ok/error, helper said '%s'"
6650msgstr "预期 ok/error,助手说 '%s'"
6651
06991777 6652#: transport-helper.c:771
c1ac5258
JX
6653#, c-format
6654msgid "helper reported unexpected status of %s"
6655msgstr "助手报告 %s 的意外状态"
6656
06991777 6657#: transport-helper.c:832
a0b6b246 6658#, c-format
c1ac5258
JX
6659msgid "helper %s does not support dry-run"
6660msgstr "助手 %s 不支持 dry-run"
a0b6b246 6661
06991777 6662#: transport-helper.c:835
c1ac5258
JX
6663#, c-format
6664msgid "helper %s does not support --signed"
6665msgstr "助手 %s 不支持 --signed"
6666
06991777 6667#: transport-helper.c:838
c1ac5258
JX
6668#, c-format
6669msgid "helper %s does not support --signed=if-asked"
6670msgstr "助手 %s 不支持 --signed=if-asked"
6671
06991777 6672#: transport-helper.c:845
c1ac5258
JX
6673#, c-format
6674msgid "helper %s does not support 'push-option'"
6675msgstr "助手 %s 不支持 'push-option'"
6676
06991777 6677#: transport-helper.c:937
c1ac5258
JX
6678msgid "remote-helper doesn't support push; refspec needed"
6679msgstr "remote-heper 不支持 push,需要引用表达式"
6680
06991777 6681#: transport-helper.c:942
c1ac5258
JX
6682#, c-format
6683msgid "helper %s does not support 'force'"
6684msgstr "助手 %s 不支持 'force'"
6685
06991777 6686#: transport-helper.c:989
c1ac5258
JX
6687msgid "couldn't run fast-export"
6688msgstr "无法执行 fast-export"
6689
06991777 6690#: transport-helper.c:994
c1ac5258
JX
6691msgid "error while running fast-export"
6692msgstr "执行 fast-export 时出错"
6693
06991777 6694#: transport-helper.c:1019
c1ac5258
JX
6695#, c-format
6696msgid ""
6697"No refs in common and none specified; doing nothing.\n"
6698"Perhaps you should specify a branch such as 'master'.\n"
6699msgstr ""
6700"没有共同的引用并且也没有指定,什么也不会做。\n"
6701"可能您应该指定一个分支如 'master'。\n"
6702
06991777 6703#: transport-helper.c:1083
c1ac5258
JX
6704#, c-format
6705msgid "malformed response in ref list: %s"
6706msgstr "引用列表中格式错误的响应:%s"
6707
06991777 6708#: transport-helper.c:1236
c1ac5258
JX
6709#, c-format
6710msgid "read(%s) failed"
6711msgstr "读取(%s)失败"
6712
06991777 6713#: transport-helper.c:1263
c1ac5258
JX
6714#, c-format
6715msgid "write(%s) failed"
6716msgstr "写(%s)失败"
6717
06991777 6718#: transport-helper.c:1312
c1ac5258
JX
6719#, c-format
6720msgid "%s thread failed"
6721msgstr "%s 线程失败"
6722
06991777 6723#: transport-helper.c:1316
c1ac5258
JX
6724#, c-format
6725msgid "%s thread failed to join: %s"
e640d114 6726msgstr "%s 线程等待失败:%s"
c1ac5258 6727
06991777 6728#: transport-helper.c:1335 transport-helper.c:1339
c1ac5258
JX
6729#, c-format
6730msgid "can't start thread for copying data: %s"
6731msgstr "不能启动线程来拷贝数据:%s"
6732
06991777 6733#: transport-helper.c:1376
c1ac5258
JX
6734#, c-format
6735msgid "%s process failed to wait"
6736msgstr "%s 进程等待失败"
6737
06991777 6738#: transport-helper.c:1380
c1ac5258
JX
6739#, c-format
6740msgid "%s process failed"
6741msgstr "%s 进程失败"
6742
06991777 6743#: transport-helper.c:1398 transport-helper.c:1407
c1ac5258
JX
6744msgid "can't start thread for copying data"
6745msgstr "不能启动线程来拷贝数据"
6746
6747#: tree-walk.c:33
a0b6b246
JX
6748msgid "too-short tree object"
6749msgstr "太短的树对象"
6750
c1ac5258 6751#: tree-walk.c:39
a0b6b246 6752msgid "malformed mode in tree entry"
29004bbb 6753msgstr "树对象中的条目模式错误"
a0b6b246 6754
c1ac5258 6755#: tree-walk.c:43
a0b6b246
JX
6756msgid "empty filename in tree entry"
6757msgstr "树对象条目中空的文件名"
6758
06991777 6759#: tree-walk.c:116
a0b6b246
JX
6760msgid "too-short tree file"
6761msgstr "太短的树文件"
6762
06991777 6763#: unpack-trees.c:111
a0b6b246
JX
6764#, c-format
6765msgid ""
6766"Your local changes to the following files would be overwritten by checkout:\n"
6767"%%sPlease commit your changes or stash them before you switch branches."
6768msgstr ""
6769"您对下列文件的本地修改将被检出操作覆盖:\n"
a4f16749 6770"%%s请在切换分支前提交或贮藏您的修改。"
a0b6b246 6771
06991777 6772#: unpack-trees.c:113
a0b6b246
JX
6773#, c-format
6774msgid ""
6775"Your local changes to the following files would be overwritten by checkout:\n"
6776"%%s"
6777msgstr ""
6778"您对下列文件的本地修改将被检出操作覆盖:\n"
6779"%%s"
6780
06991777 6781#: unpack-trees.c:116
a0b6b246
JX
6782#, c-format
6783msgid ""
6784"Your local changes to the following files would be overwritten by merge:\n"
6785"%%sPlease commit your changes or stash them before you merge."
6786msgstr ""
6787"您对下列文件的本地修改将被合并操作覆盖:\n"
a4f16749 6788"%%s请在合并前提交或贮藏您的修改。"
a0b6b246 6789
06991777 6790#: unpack-trees.c:118
a0b6b246
JX
6791#, c-format
6792msgid ""
6793"Your local changes to the following files would be overwritten by merge:\n"
6794"%%s"
6795msgstr ""
6796"您对下列文件的本地修改将被合并操作覆盖:\n"
6797"%%s"
6798
06991777 6799#: unpack-trees.c:121
a0b6b246
JX
6800#, c-format
6801msgid ""
6802"Your local changes to the following files would be overwritten by %s:\n"
6803"%%sPlease commit your changes or stash them before you %s."
6804msgstr ""
6805"您对下列文件的本地修改将被 %s 覆盖:\n"
a4f16749 6806"%%s请在 %s 之前提交或贮藏您的修改。"
6792b93b 6807
06991777 6808#: unpack-trees.c:123
a0b6b246
JX
6809#, c-format
6810msgid ""
6811"Your local changes to the following files would be overwritten by %s:\n"
6812"%%s"
6813msgstr ""
6814"您对下列文件的本地修改将被 %s 覆盖:\n"
6815"%%s"
c04f5ac3 6816
06991777 6817#: unpack-trees.c:128
a0b6b246
JX
6818#, c-format
6819msgid ""
1a79b2f1 6820"Updating the following directories would lose untracked files in them:\n"
a0b6b246
JX
6821"%s"
6822msgstr ""
6823"更新如下目录将会丢失其中未跟踪的文件:\n"
6824"%s"
1b7f4a34 6825
06991777 6826#: unpack-trees.c:132
a0b6b246
JX
6827#, c-format
6828msgid ""
6829"The following untracked working tree files would be removed by checkout:\n"
6830"%%sPlease move or remove them before you switch branches."
6831msgstr ""
6832"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
6833"%%s请在切换分支之前移动或删除。"
2e8451e8 6834
06991777 6835#: unpack-trees.c:134
a0b6b246
JX
6836#, c-format
6837msgid ""
6838"The following untracked working tree files would be removed by checkout:\n"
6839"%%s"
6840msgstr ""
6841"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
6842"%%s"
1003b3a5 6843
06991777 6844#: unpack-trees.c:137
a0b6b246
JX
6845#, c-format
6846msgid ""
6847"The following untracked working tree files would be removed by merge:\n"
6848"%%sPlease move or remove them before you merge."
6849msgstr ""
6850"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
6851"%%s请在合并前移动或删除。"
1003b3a5 6852
06991777 6853#: unpack-trees.c:139
a0b6b246
JX
6854#, c-format
6855msgid ""
6856"The following untracked working tree files would be removed by merge:\n"
6857"%%s"
6858msgstr ""
6859"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
6860"%%s"
c04f5ac3 6861
06991777 6862#: unpack-trees.c:142
a0b6b246
JX
6863#, c-format
6864msgid ""
6865"The following untracked working tree files would be removed by %s:\n"
6866"%%sPlease move or remove them before you %s."
6867msgstr ""
6868"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
6869"%%s请在 %s 前移动或删除。"
c04f5ac3 6870
06991777 6871#: unpack-trees.c:144
a0b6b246
JX
6872#, c-format
6873msgid ""
6874"The following untracked working tree files would be removed by %s:\n"
6875"%%s"
6876msgstr ""
6877"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
6878"%%s"
c04f5ac3 6879
06991777 6880#: unpack-trees.c:150
a0b6b246
JX
6881#, c-format
6882msgid ""
6883"The following untracked working tree files would be overwritten by "
6884"checkout:\n"
6885"%%sPlease move or remove them before you switch branches."
6886msgstr ""
6887"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
6888"%%s请在切换分支前移动或删除。"
c04f5ac3 6889
06991777 6890#: unpack-trees.c:152
1003b3a5 6891#, c-format
4dcdc3d8 6892msgid ""
a0b6b246
JX
6893"The following untracked working tree files would be overwritten by "
6894"checkout:\n"
6895"%%s"
4dcdc3d8 6896msgstr ""
a0b6b246
JX
6897"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
6898"%%s"
1003b3a5 6899
06991777 6900#: unpack-trees.c:155
c04f5ac3 6901#, c-format
a0b6b246
JX
6902msgid ""
6903"The following untracked working tree files would be overwritten by merge:\n"
6904"%%sPlease move or remove them before you merge."
6905msgstr ""
6906"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
6907"%%s请在合并前移动或删除。"
c04f5ac3 6908
06991777 6909#: unpack-trees.c:157
a0b6b246
JX
6910#, c-format
6911msgid ""
6912"The following untracked working tree files would be overwritten by merge:\n"
6913"%%s"
6914msgstr ""
6915"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
6916"%%s"
c04f5ac3 6917
06991777 6918#: unpack-trees.c:160
a0b6b246
JX
6919#, c-format
6920msgid ""
6921"The following untracked working tree files would be overwritten by %s:\n"
6922"%%sPlease move or remove them before you %s."
6923msgstr ""
6924"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
6925"%%s请在 %s 前移动或删除。"
c04f5ac3 6926
06991777 6927#: unpack-trees.c:162
07432cef 6928#, c-format
a0b6b246
JX
6929msgid ""
6930"The following untracked working tree files would be overwritten by %s:\n"
6931"%%s"
6932msgstr ""
6933"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
6934"%%s"
c04f5ac3 6935
06991777 6936#: unpack-trees.c:170
07432cef 6937#, c-format
a0b6b246
JX
6938msgid "Entry '%s' overlaps with '%s'. Cannot bind."
6939msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
c04f5ac3 6940
06991777 6941#: unpack-trees.c:173
07432cef 6942#, c-format
ef317cd5 6943msgid ""
6937cb4e 6944"Cannot update sparse checkout: the following entries are not up to date:\n"
a0b6b246
JX
6945"%s"
6946msgstr ""
6947"无法更新稀疏检出:如下条目不是最新:\n"
6948"%s"
c04f5ac3 6949
06991777 6950#: unpack-trees.c:175
07432cef 6951#, c-format
a0b6b246
JX
6952msgid ""
6953"The following working tree files would be overwritten by sparse checkout "
6954"update:\n"
6955"%s"
6956msgstr ""
6957"工作区中下列文件将被稀疏检出更新所覆盖:\n"
6958"%s"
c04f5ac3 6959
06991777 6960#: unpack-trees.c:177
07432cef 6961#, c-format
a0b6b246
JX
6962msgid ""
6963"The following working tree files would be removed by sparse checkout "
6964"update:\n"
6965"%s"
6966msgstr ""
6967"工作区中下列文件将被稀疏检出更新所删除:\n"
6968"%s"
c04f5ac3 6969
06991777 6970#: unpack-trees.c:179
87cb7997
JX
6971#, c-format
6972msgid ""
6973"Cannot update submodule:\n"
6974"%s"
6975msgstr ""
6976"无法更新子模组:\n"
6977"%s"
6978
06991777 6979#: unpack-trees.c:253
07432cef 6980#, c-format
a0b6b246
JX
6981msgid "Aborting\n"
6982msgstr "终止中\n"
ef317cd5 6983
06991777 6984#: unpack-trees.c:335
a0b6b246
JX
6985msgid "Checking out files"
6986msgstr "正在检出文件"
c04f5ac3 6987
06991777 6988#: unpack-trees.c:367
4c27fcb5
JX
6989msgid ""
6990"the following paths have collided (e.g. case-sensitive paths\n"
6991"on a case-insensitive filesystem) and only one from the same\n"
6992"colliding group is in the working tree:\n"
6993msgstr ""
6994"以下路径发生碰撞(如:在不区分大小写的文件系统上的区分大小写的路径),\n"
6995"并且碰撞组中只有一个文件存在工作区中:\n"
6996
87cb7997 6997#: urlmatch.c:163
a0b6b246
JX
6998msgid "invalid URL scheme name or missing '://' suffix"
6999msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
7000
87cb7997 7001#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
07432cef 7002#, c-format
a0b6b246
JX
7003msgid "invalid %XX escape sequence"
7004msgstr "无效的 %XX 转义序列"
c04f5ac3 7005
87cb7997 7006#: urlmatch.c:215
a0b6b246
JX
7007msgid "missing host and scheme is not 'file:'"
7008msgstr "缺失主机名且 URL 方案不是 'file:'"
c04f5ac3 7009
87cb7997 7010#: urlmatch.c:232
a0b6b246
JX
7011msgid "a 'file:' URL may not have a port number"
7012msgstr "一个 'file:' URL 不应该包含端口号"
94550ed3 7013
87cb7997 7014#: urlmatch.c:247
a0b6b246
JX
7015msgid "invalid characters in host name"
7016msgstr "主机名中包含无效的字符"
90314792 7017
87cb7997 7018#: urlmatch.c:292 urlmatch.c:303
a0b6b246
JX
7019msgid "invalid port number"
7020msgstr "无效的端口号"
c04f5ac3 7021
87cb7997 7022#: urlmatch.c:371
a0b6b246
JX
7023msgid "invalid '..' path segment"
7024msgstr "无效的 '..' 路径片段"
5c0c220c 7025
06991777 7026#: worktree.c:249 builtin/am.c:2094
a77c07d9 7027#, c-format
a0b6b246 7028msgid "failed to read '%s'"
c1ac5258 7029msgstr "读取 '%s' 失败"
ef317cd5 7030
4c27fcb5 7031#: worktree.c:295
31e5e17b
JX
7032#, c-format
7033msgid "'%s' at main working tree is not the repository directory"
7034msgstr "在主工作区的 '%s' 不是仓库目录"
7035
4c27fcb5 7036#: worktree.c:306
31e5e17b
JX
7037#, c-format
7038msgid "'%s' file does not contain absolute path to the working tree location"
7039msgstr "文件 '%s' 不包含工作区的绝对路径"
7040
4c27fcb5 7041#: worktree.c:318
31e5e17b
JX
7042#, c-format
7043msgid "'%s' does not exist"
7044msgstr "'%s' 不存在"
7045
4c27fcb5 7046#: worktree.c:324
31e5e17b
JX
7047#, c-format
7048msgid "'%s' is not a .git file, error code %d"
7049msgstr "'%s' 不是一个 .git 文件,错误码 %d"
7050
4c27fcb5 7051#: worktree.c:332
31e5e17b
JX
7052#, c-format
7053msgid "'%s' does not point back to '%s'"
7054msgstr "'%s' 没有指回到 '%s'"
7055
a4f16749 7056#: wrapper.c:223 wrapper.c:393
c04f5ac3 7057#, c-format
a0b6b246
JX
7058msgid "could not open '%s' for reading and writing"
7059msgstr "无法打开 '%s' 进行读写"
c04f5ac3 7060
a4f16749 7061#: wrapper.c:424 wrapper.c:624
a0b6b246
JX
7062#, c-format
7063msgid "unable to access '%s'"
7064msgstr "不能访问 '%s'"
c04f5ac3 7065
a4f16749 7066#: wrapper.c:632
a0b6b246
JX
7067msgid "unable to get current working directory"
7068msgstr "不能获取当前工作目录"
c04f5ac3 7069
06991777 7070#: wt-status.c:155
a0b6b246
JX
7071msgid "Unmerged paths:"
7072msgstr "未合并的路径:"
7aea43ff 7073
a0b6b246 7074# 译者:注意保持前导空格
06991777 7075#: wt-status.c:182 wt-status.c:209
c04f5ac3 7076#, c-format
a0b6b246
JX
7077msgid " (use \"git reset %s <file>...\" to unstage)"
7078msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
c04f5ac3 7079
a0b6b246 7080# 译者:注意保持前导空格
06991777 7081#: wt-status.c:184 wt-status.c:211
a0b6b246
JX
7082msgid " (use \"git rm --cached <file>...\" to unstage)"
7083msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
c04f5ac3 7084
a0b6b246 7085# 译者:注意保持前导空格
06991777 7086#: wt-status.c:188
a0b6b246
JX
7087msgid " (use \"git add <file>...\" to mark resolution)"
7088msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
8ada9598 7089
a0b6b246 7090# 译者:注意保持前导空格
06991777 7091#: wt-status.c:190 wt-status.c:194
a0b6b246
JX
7092msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
7093msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
8ada9598 7094
a0b6b246 7095# 译者:注意保持前导空格
06991777 7096#: wt-status.c:192
a0b6b246
JX
7097msgid " (use \"git rm <file>...\" to mark resolution)"
7098msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
ef317cd5 7099
06991777 7100#: wt-status.c:203 wt-status.c:1046
a0b6b246
JX
7101msgid "Changes to be committed:"
7102msgstr "要提交的变更:"
ef317cd5 7103
06991777 7104#: wt-status.c:221 wt-status.c:1055
a0b6b246
JX
7105msgid "Changes not staged for commit:"
7106msgstr "尚未暂存以备提交的变更:"
ef317cd5 7107
a0b6b246 7108# 译者:注意保持前导空格
06991777 7109#: wt-status.c:225
a0b6b246
JX
7110msgid " (use \"git add <file>...\" to update what will be committed)"
7111msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
ef317cd5 7112
a0b6b246 7113# 译者:注意保持前导空格
06991777 7114#: wt-status.c:227
a0b6b246
JX
7115msgid " (use \"git add/rm <file>...\" to update what will be committed)"
7116msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
ef317cd5 7117
a0b6b246 7118# 译者:注意保持前导空格
06991777 7119#: wt-status.c:228
a0b6b246
JX
7120msgid ""
7121" (use \"git checkout -- <file>...\" to discard changes in working directory)"
7122msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
ef317cd5 7123
a0b6b246 7124# 译者:注意保持前导空格
06991777 7125#: wt-status.c:230
a0b6b246
JX
7126msgid " (commit or discard the untracked or modified content in submodules)"
7127msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
ef317cd5 7128
a0b6b246 7129# 译者:注意保持前导空格
06991777 7130#: wt-status.c:242
a0b6b246
JX
7131#, c-format
7132msgid " (use \"git %s <file>...\" to include in what will be committed)"
7133msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
ef317cd5 7134
06991777 7135#: wt-status.c:257
a0b6b246
JX
7136msgid "both deleted:"
7137msgstr "双方删除:"
ef317cd5 7138
06991777 7139#: wt-status.c:259
a0b6b246
JX
7140msgid "added by us:"
7141msgstr "由我们添加:"
4dcdc3d8 7142
06991777 7143#: wt-status.c:261
a0b6b246
JX
7144msgid "deleted by them:"
7145msgstr "由他们删除:"
ef317cd5 7146
06991777 7147#: wt-status.c:263
a0b6b246
JX
7148msgid "added by them:"
7149msgstr "由他们添加:"
ef317cd5 7150
06991777 7151#: wt-status.c:265
a0b6b246
JX
7152msgid "deleted by us:"
7153msgstr "由我们删除:"
ef317cd5 7154
06991777 7155#: wt-status.c:267
a0b6b246
JX
7156msgid "both added:"
7157msgstr "双方添加:"
5c57d762 7158
06991777 7159#: wt-status.c:269
a0b6b246
JX
7160msgid "both modified:"
7161msgstr "双方修改:"
5c57d762 7162
06991777 7163#: wt-status.c:279
a0b6b246
JX
7164msgid "new file:"
7165msgstr "新文件:"
8ada9598 7166
06991777 7167#: wt-status.c:281
a0b6b246
JX
7168msgid "copied:"
7169msgstr "拷贝:"
8ada9598 7170
06991777 7171#: wt-status.c:283
a0b6b246
JX
7172msgid "deleted:"
7173msgstr "删除:"
8ada9598 7174
06991777 7175#: wt-status.c:285
a0b6b246
JX
7176msgid "modified:"
7177msgstr "修改:"
8ada9598 7178
06991777 7179#: wt-status.c:287
a0b6b246
JX
7180msgid "renamed:"
7181msgstr "重命名:"
5c57d762 7182
06991777 7183#: wt-status.c:289
a0b6b246
JX
7184msgid "typechange:"
7185msgstr "类型变更:"
8ada9598 7186
06991777 7187#: wt-status.c:291
a0b6b246
JX
7188msgid "unknown:"
7189msgstr "未知:"
8ada9598 7190
06991777 7191#: wt-status.c:293
a0b6b246
JX
7192msgid "unmerged:"
7193msgstr "未合并:"
8ada9598 7194
a0b6b246 7195# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
06991777 7196#: wt-status.c:373
a0b6b246
JX
7197msgid "new commits, "
7198msgstr "新提交, "
8ada9598 7199
a0b6b246 7200# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
06991777 7201#: wt-status.c:375
a0b6b246
JX
7202msgid "modified content, "
7203msgstr "修改的内容, "
1b7f4a34 7204
a0b6b246 7205# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
06991777 7206#: wt-status.c:377
a0b6b246
JX
7207msgid "untracked content, "
7208msgstr "未跟踪的内容, "
1b7f4a34 7209
06991777 7210#: wt-status.c:884
a4f16749
JX
7211#, c-format
7212msgid "Your stash currently has %d entry"
7213msgid_plural "Your stash currently has %d entries"
7214msgstr[0] "您的贮藏区当前有 %d 条记录"
7215msgstr[1] "您的贮藏区当前有 %d 条记录"
7216
06991777 7217#: wt-status.c:916
a0b6b246
JX
7218msgid "Submodules changed but not updated:"
7219msgstr "子模组已修改但尚未更新:"
1b7f4a34 7220
06991777 7221#: wt-status.c:918
a0b6b246
JX
7222msgid "Submodule changes to be committed:"
7223msgstr "要提交的子模组变更:"
1b7f4a34 7224
06991777 7225#: wt-status.c:1000
a0b6b246 7226msgid ""
6937cb4e
JX
7227"Do not modify or remove the line above.\n"
7228"Everything below it will be ignored."
a0b6b246 7229msgstr ""
6937cb4e
JX
7230"不要改动或删除上面的一行。\n"
7231"其下所有内容都将被忽略。"
1b7f4a34 7232
06991777 7233#: wt-status.c:1101
a0b6b246
JX
7234msgid "You have unmerged paths."
7235msgstr "您有尚未合并的路径。"
1b7f4a34 7236
a0b6b246 7237# 译者:注意保持前导空格
06991777 7238#: wt-status.c:1104
a0b6b246
JX
7239msgid " (fix conflicts and run \"git commit\")"
7240msgstr " (解决冲突并运行 \"git commit\")"
1b7f4a34 7241
a0b6b246 7242# 译者:注意保持前导空格
06991777 7243#: wt-status.c:1106
a0b6b246
JX
7244msgid " (use \"git merge --abort\" to abort the merge)"
7245msgstr " (使用 \"git merge --abort\" 终止合并)"
1b7f4a34 7246
06991777 7247#: wt-status.c:1110
a0b6b246
JX
7248msgid "All conflicts fixed but you are still merging."
7249msgstr "所有冲突已解决但您仍处于合并中。"
1b7f4a34 7250
a0b6b246 7251# 译者:注意保持前导空格
06991777 7252#: wt-status.c:1113
a0b6b246
JX
7253msgid " (use \"git commit\" to conclude merge)"
7254msgstr " (使用 \"git commit\" 结束合并)"
1b7f4a34 7255
06991777 7256#: wt-status.c:1122
a0b6b246
JX
7257msgid "You are in the middle of an am session."
7258msgstr "您正处于 am 操作过程中。"
1b7f4a34 7259
06991777 7260#: wt-status.c:1125
a0b6b246
JX
7261msgid "The current patch is empty."
7262msgstr "当前的补丁为空。"
1b7f4a34 7263
a0b6b246 7264# 译者:注意保持前导空格
06991777 7265#: wt-status.c:1129
a0b6b246
JX
7266msgid " (fix conflicts and then run \"git am --continue\")"
7267msgstr " (解决冲突,然后运行 \"git am --continue\")"
1b7f4a34 7268
a0b6b246 7269# 译者:注意保持前导空格
06991777 7270#: wt-status.c:1131
a0b6b246
JX
7271msgid " (use \"git am --skip\" to skip this patch)"
7272msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1b7f4a34 7273
a0b6b246 7274# 译者:注意保持前导空格
06991777 7275#: wt-status.c:1133
a0b6b246
JX
7276msgid " (use \"git am --abort\" to restore the original branch)"
7277msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1b7f4a34 7278
06991777 7279#: wt-status.c:1264
1a79b2f1
JX
7280msgid "git-rebase-todo is missing."
7281msgstr "git-rebase-todo 丢失。"
7282
06991777 7283#: wt-status.c:1266
a0b6b246
JX
7284msgid "No commands done."
7285msgstr "没有命令被执行。"
7286
06991777 7287#: wt-status.c:1269
1b7f4a34 7288#, c-format
a0b6b246
JX
7289msgid "Last command done (%d command done):"
7290msgid_plural "Last commands done (%d commands done):"
7291msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
7292msgstr[1] "最后的命令已完成(%d 条命令被执行):"
1b7f4a34 7293
06991777 7294#: wt-status.c:1280
1b7f4a34 7295#, c-format
a0b6b246
JX
7296msgid " (see more in file %s)"
7297msgstr " (更多参见文件 %s)"
7298
06991777 7299#: wt-status.c:1285
a0b6b246
JX
7300msgid "No commands remaining."
7301msgstr "未剩下任何命令。"
1b7f4a34 7302
06991777 7303#: wt-status.c:1288
1b7f4a34 7304#, c-format
a0b6b246
JX
7305msgid "Next command to do (%d remaining command):"
7306msgid_plural "Next commands to do (%d remaining commands):"
7307msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
7308msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
1b7f4a34 7309
a0b6b246 7310# 译者:注意保持前导空格
06991777 7311#: wt-status.c:1296
a0b6b246
JX
7312msgid " (use \"git rebase --edit-todo\" to view and edit)"
7313msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
1b7f4a34 7314
06991777 7315#: wt-status.c:1308
1b7f4a34 7316#, c-format
a0b6b246
JX
7317msgid "You are currently rebasing branch '%s' on '%s'."
7318msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1b7f4a34 7319
06991777 7320#: wt-status.c:1313
a0b6b246
JX
7321msgid "You are currently rebasing."
7322msgstr "您在执行变基操作。"
1b7f4a34 7323
a0b6b246 7324# 译者:注意保持前导空格
06991777 7325#: wt-status.c:1326
a0b6b246
JX
7326msgid " (fix conflicts and then run \"git rebase --continue\")"
7327msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1b7f4a34 7328
a0b6b246 7329# 译者:注意保持前导空格
06991777 7330#: wt-status.c:1328
a0b6b246
JX
7331msgid " (use \"git rebase --skip\" to skip this patch)"
7332msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
7333
7334# 译者:注意保持前导空格
06991777 7335#: wt-status.c:1330
a0b6b246
JX
7336msgid " (use \"git rebase --abort\" to check out the original branch)"
7337msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
7338
7339# 译者:注意保持前导空格
06991777 7340#: wt-status.c:1337
a0b6b246
JX
7341msgid " (all conflicts fixed: run \"git rebase --continue\")"
7342msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1b7f4a34 7343
06991777 7344#: wt-status.c:1341
a0b6b246 7345#, c-format
1b7f4a34 7346msgid ""
a0b6b246
JX
7347"You are currently splitting a commit while rebasing branch '%s' on '%s'."
7348msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1b7f4a34 7349
06991777 7350#: wt-status.c:1346
a0b6b246
JX
7351msgid "You are currently splitting a commit during a rebase."
7352msgstr "您在执行变基操作时拆分提交。"
1b7f4a34 7353
a0b6b246 7354# 译者:注意保持前导空格
06991777 7355#: wt-status.c:1349
a0b6b246
JX
7356msgid " (Once your working directory is clean, run \"git rebase --continue\")"
7357msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1b7f4a34 7358
06991777 7359#: wt-status.c:1353
a0b6b246
JX
7360#, c-format
7361msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
7362msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1b7f4a34 7363
06991777 7364#: wt-status.c:1358
a0b6b246
JX
7365msgid "You are currently editing a commit during a rebase."
7366msgstr "您在执行变基操作时编辑提交。"
1b7f4a34 7367
a0b6b246 7368# 译者:注意保持前导空格
06991777 7369#: wt-status.c:1361
a0b6b246
JX
7370msgid " (use \"git commit --amend\" to amend the current commit)"
7371msgstr " (使用 \"git commit --amend\" 修补当前提交)"
7372
7373# 译者:注意保持前导空格
06991777 7374#: wt-status.c:1363
a0b6b246
JX
7375msgid ""
7376" (use \"git rebase --continue\" once you are satisfied with your changes)"
7377msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1b7f4a34 7378
06991777 7379#: wt-status.c:1372
1b7f4a34 7380#, c-format
a0b6b246
JX
7381msgid "You are currently cherry-picking commit %s."
7382msgstr "您在执行拣选提交 %s 的操作。"
1b7f4a34 7383
a0b6b246 7384# 译者:注意保持前导空格
06991777 7385#: wt-status.c:1377
a0b6b246
JX
7386msgid " (fix conflicts and run \"git cherry-pick --continue\")"
7387msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1b7f4a34 7388
a0b6b246 7389# 译者:注意保持前导空格
06991777 7390#: wt-status.c:1380
a0b6b246
JX
7391msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
7392msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1b7f4a34 7393
a0b6b246 7394# 译者:注意保持前导空格
06991777 7395#: wt-status.c:1382
a0b6b246
JX
7396msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
7397msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1b7f4a34 7398
06991777 7399#: wt-status.c:1390
1b7f4a34 7400#, c-format
a0b6b246
JX
7401msgid "You are currently reverting commit %s."
7402msgstr "您在执行反转提交 %s 的操作。"
1b7f4a34 7403
a0b6b246 7404# 译者:注意保持前导空格
06991777 7405#: wt-status.c:1395
a0b6b246
JX
7406msgid " (fix conflicts and run \"git revert --continue\")"
7407msgstr " (解决冲突并运行 \"git revert --continue\")"
1b7f4a34 7408
a0b6b246 7409# 译者:注意保持前导空格
06991777 7410#: wt-status.c:1398
a0b6b246
JX
7411msgid " (all conflicts fixed: run \"git revert --continue\")"
7412msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1b7f4a34 7413
a0b6b246 7414# 译者:注意保持前导空格
06991777 7415#: wt-status.c:1400
a0b6b246
JX
7416msgid " (use \"git revert --abort\" to cancel the revert operation)"
7417msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1b7f4a34 7418
06991777 7419#: wt-status.c:1410
1b7f4a34 7420#, c-format
a0b6b246
JX
7421msgid "You are currently bisecting, started from branch '%s'."
7422msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1b7f4a34 7423
06991777 7424#: wt-status.c:1414
a0b6b246
JX
7425msgid "You are currently bisecting."
7426msgstr "您在执行二分查找操作。"
1b7f4a34 7427
a0b6b246 7428# 译者:注意保持前导空格
06991777 7429#: wt-status.c:1417
a0b6b246
JX
7430msgid " (use \"git bisect reset\" to get back to the original branch)"
7431msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1b7f4a34 7432
06991777 7433#: wt-status.c:1617
a0b6b246
JX
7434msgid "On branch "
7435msgstr "位于分支 "
1b7f4a34 7436
06991777 7437#: wt-status.c:1624
a0b6b246
JX
7438msgid "interactive rebase in progress; onto "
7439msgstr "交互式变基操作正在进行中;至 "
1b7f4a34 7440
06991777 7441#: wt-status.c:1626
a0b6b246
JX
7442msgid "rebase in progress; onto "
7443msgstr "变基操作正在进行中;至 "
1b7f4a34 7444
06991777 7445#: wt-status.c:1631
a0b6b246
JX
7446msgid "HEAD detached at "
7447msgstr "头指针分离于 "
1b7f4a34 7448
06991777 7449#: wt-status.c:1633
a0b6b246
JX
7450msgid "HEAD detached from "
7451msgstr "头指针分离自 "
1b7f4a34 7452
06991777 7453#: wt-status.c:1636
a0b6b246
JX
7454msgid "Not currently on any branch."
7455msgstr "当前不在任何分支上。"
1b7f4a34 7456
06991777 7457#: wt-status.c:1653
a0b6b246
JX
7458msgid "Initial commit"
7459msgstr "初始提交"
1b7f4a34 7460
06991777 7461#: wt-status.c:1654
a4f16749
JX
7462msgid "No commits yet"
7463msgstr "尚无提交"
7464
06991777 7465#: wt-status.c:1668
a0b6b246
JX
7466msgid "Untracked files"
7467msgstr "未跟踪的文件"
1b7f4a34 7468
06991777 7469#: wt-status.c:1670
a0b6b246
JX
7470msgid "Ignored files"
7471msgstr "忽略的文件"
1b7f4a34 7472
06991777 7473#: wt-status.c:1674
a0b6b246
JX
7474#, c-format
7475msgid ""
7476"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
7477"may speed it up, but you have to be careful not to forget to add\n"
7478"new files yourself (see 'git help status')."
7479msgstr ""
7480"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
7481"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1b7f4a34 7482
06991777 7483#: wt-status.c:1680
a0b6b246
JX
7484#, c-format
7485msgid "Untracked files not listed%s"
7486msgstr "未跟踪的文件没有列出%s"
1b7f4a34 7487
a0b6b246 7488# 译者:中文字符串拼接,可删除前导空格
06991777 7489#: wt-status.c:1682
a0b6b246
JX
7490msgid " (use -u option to show untracked files)"
7491msgstr "(使用 -u 参数显示未跟踪的文件)"
1b7f4a34 7492
06991777 7493#: wt-status.c:1688
a0b6b246
JX
7494msgid "No changes"
7495msgstr "没有修改"
1b7f4a34 7496
06991777 7497#: wt-status.c:1693
a0b6b246
JX
7498#, c-format
7499msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
7500msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1b7f4a34 7501
06991777 7502#: wt-status.c:1696
a0b6b246
JX
7503#, c-format
7504msgid "no changes added to commit\n"
7505msgstr "修改尚未加入提交\n"
1b7f4a34 7506
06991777 7507#: wt-status.c:1699
a0b6b246
JX
7508#, c-format
7509msgid ""
7510"nothing added to commit but untracked files present (use \"git add\" to "
7511"track)\n"
7512msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1b7f4a34 7513
06991777 7514#: wt-status.c:1702
a0b6b246
JX
7515#, c-format
7516msgid "nothing added to commit but untracked files present\n"
7517msgstr "提交为空,但是存在尚未跟踪的文件\n"
1b7f4a34 7518
a0b6b246 7519# 译者:中文字符串拼接,可删除前导空格
06991777 7520#: wt-status.c:1705
a0b6b246
JX
7521#, c-format
7522msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
7523msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1b7f4a34 7524
06991777 7525#: wt-status.c:1708 wt-status.c:1713
a0b6b246
JX
7526#, c-format
7527msgid "nothing to commit\n"
7528msgstr "无文件要提交\n"
1b7f4a34 7529
a0b6b246 7530# 译者:中文字符串拼接,可删除前导空格
06991777 7531#: wt-status.c:1711
a0b6b246
JX
7532#, c-format
7533msgid "nothing to commit (use -u to show untracked files)\n"
7534msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1b7f4a34 7535
a0b6b246 7536# 译者:中文字符串拼接,可删除前导空格
06991777 7537#: wt-status.c:1715
a0b6b246
JX
7538#, c-format
7539msgid "nothing to commit, working tree clean\n"
7540msgstr "无文件要提交,干净的工作区\n"
7541
06991777 7542#: wt-status.c:1828
a4f16749
JX
7543msgid "No commits yet on "
7544msgstr "尚无提交在 "
1b7f4a34 7545
06991777 7546#: wt-status.c:1832
a0b6b246
JX
7547msgid "HEAD (no branch)"
7548msgstr "HEAD(非分支)"
1b7f4a34 7549
06991777 7550#: wt-status.c:1863
31e5e17b
JX
7551msgid "different"
7552msgstr "不同"
7553
a0b6b246 7554# 译者:注意保持句尾空格
06991777 7555#: wt-status.c:1865 wt-status.c:1873
a0b6b246
JX
7556msgid "behind "
7557msgstr "落后 "
1b7f4a34 7558
06991777 7559#: wt-status.c:1868 wt-status.c:1871
a0b6b246
JX
7560msgid "ahead "
7561msgstr "领先 "
1b7f4a34 7562
a0b6b246 7563#. TRANSLATORS: the action is e.g. "pull with rebase"
06991777 7564#: wt-status.c:2386
a0b6b246
JX
7565#, c-format
7566msgid "cannot %s: You have unstaged changes."
7567msgstr "不能%s:您有未暂存的变更。"
1b7f4a34 7568
06991777 7569#: wt-status.c:2392
a0b6b246 7570msgid "additionally, your index contains uncommitted changes."
29004bbb 7571msgstr "另外,您的索引中包含未提交的变更。"
1b7f4a34 7572
06991777 7573#: wt-status.c:2394
a0b6b246
JX
7574#, c-format
7575msgid "cannot %s: Your index contains uncommitted changes."
7576msgstr "不能%s:您的索引中包含未提交的变更。"
1b7f4a34 7577
06991777 7578#: builtin/add.c:25
a0b6b246
JX
7579msgid "git add [<options>] [--] <pathspec>..."
7580msgstr "git add [<选项>] [--] <路径规格>..."
1b7f4a34 7581
06991777 7582#: builtin/add.c:84
a0b6b246
JX
7583#, c-format
7584msgid "unexpected diff status %c"
7585msgstr "意外的差异状态 %c"
1b7f4a34 7586
06991777 7587#: builtin/add.c:89 builtin/commit.c:285
a0b6b246
JX
7588msgid "updating files failed"
7589msgstr "更新文件失败"
1b7f4a34 7590
06991777 7591#: builtin/add.c:99
a0b6b246
JX
7592#, c-format
7593msgid "remove '%s'\n"
7594msgstr "删除 '%s'\n"
1b7f4a34 7595
06991777 7596#: builtin/add.c:174
a0b6b246
JX
7597msgid "Unstaged changes after refreshing the index:"
7598msgstr "刷新索引之后尚未被暂存的变更:"
1b7f4a34 7599
06991777 7600#: builtin/add.c:234 builtin/rev-parse.c:896
a0b6b246
JX
7601msgid "Could not read the index"
7602msgstr "不能读取索引"
1b7f4a34 7603
06991777 7604#: builtin/add.c:245
a0b6b246
JX
7605#, c-format
7606msgid "Could not open '%s' for writing."
c1ac5258 7607msgstr "无法为写入打开 '%s'。"
1b7f4a34 7608
06991777 7609#: builtin/add.c:249
a0b6b246
JX
7610msgid "Could not write patch"
7611msgstr "不能生成补丁"
1b7f4a34 7612
06991777 7613#: builtin/add.c:252
a0b6b246
JX
7614msgid "editing patch failed"
7615msgstr "编辑补丁失败"
1b7f4a34 7616
06991777 7617#: builtin/add.c:255
1b7f4a34 7618#, c-format
a0b6b246 7619msgid "Could not stat '%s'"
65e2041e 7620msgstr "不能对 '%s' 调用 stat"
1b7f4a34 7621
06991777 7622#: builtin/add.c:257
a0b6b246
JX
7623msgid "Empty patch. Aborted."
7624msgstr "空补丁。异常终止。"
1b7f4a34 7625
06991777 7626#: builtin/add.c:262
a0b6b246
JX
7627#, c-format
7628msgid "Could not apply '%s'"
7629msgstr "不能应用 '%s'"
1b7f4a34 7630
06991777 7631#: builtin/add.c:270
a0b6b246
JX
7632msgid "The following paths are ignored by one of your .gitignore files:\n"
7633msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 7634
06991777
JX
7635#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
7636#: builtin/prune-packed.c:56 builtin/pull.c:214 builtin/push.c:560
7637#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
a0b6b246
JX
7638msgid "dry run"
7639msgstr "演习"
8ada9598 7640
06991777 7641#: builtin/add.c:293
a0b6b246
JX
7642msgid "interactive picking"
7643msgstr "交互式拣选"
8ada9598 7644
06991777 7645#: builtin/add.c:294 builtin/checkout.c:1304 builtin/reset.c:306
a0b6b246
JX
7646msgid "select hunks interactively"
7647msgstr "交互式挑选数据块"
8ada9598 7648
06991777 7649#: builtin/add.c:295
a0b6b246
JX
7650msgid "edit current diff and apply"
7651msgstr "编辑当前差异并应用"
8ada9598 7652
06991777 7653#: builtin/add.c:296
a0b6b246
JX
7654msgid "allow adding otherwise ignored files"
7655msgstr "允许添加忽略的文件"
8ada9598 7656
06991777 7657#: builtin/add.c:297
a0b6b246
JX
7658msgid "update tracked files"
7659msgstr "更新已跟踪的文件"
8ada9598 7660
06991777 7661#: builtin/add.c:298
5809aa05
JX
7662msgid "renormalize EOL of tracked files (implies -u)"
7663msgstr "对已跟踪文件(暗含 -u)重新归一换行符"
7664
06991777 7665#: builtin/add.c:299
a0b6b246
JX
7666msgid "record only the fact that the path will be added later"
7667msgstr "只记录,该路径稍后再添加"
8ada9598 7668
06991777 7669#: builtin/add.c:300
a0b6b246
JX
7670msgid "add changes from all tracked and untracked files"
7671msgstr "添加所有改变的已跟踪文件和未跟踪文件"
8ada9598 7672
06991777 7673#: builtin/add.c:303
a0b6b246
JX
7674msgid "ignore paths removed in the working tree (same as --no-all)"
7675msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
8ada9598 7676
06991777 7677#: builtin/add.c:305
a0b6b246
JX
7678msgid "don't add, only refresh the index"
7679msgstr "不添加,只刷新索引"
8ada9598 7680
06991777 7681#: builtin/add.c:306
a0b6b246
JX
7682msgid "just skip files which cannot be added because of errors"
7683msgstr "跳过因出错不能添加的文件"
8ada9598 7684
06991777 7685#: builtin/add.c:307
a0b6b246
JX
7686msgid "check if - even missing - files are ignored in dry run"
7687msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
8ada9598 7688
06991777 7689#: builtin/add.c:309 builtin/update-index.c:991
a0b6b246
JX
7690msgid "override the executable bit of the listed files"
7691msgstr "覆盖列表里文件的可执行位"
8ada9598 7692
06991777 7693#: builtin/add.c:311
a4f16749
JX
7694msgid "warn when adding an embedded repository"
7695msgstr "创建一个嵌入式仓库时给予警告"
7696
06991777 7697#: builtin/add.c:326
a4f16749
JX
7698#, c-format
7699msgid ""
7700"You've added another git repository inside your current repository.\n"
7701"Clones of the outer repository will not contain the contents of\n"
7702"the embedded repository and will not know how to obtain it.\n"
7703"If you meant to add a submodule, use:\n"
7704"\n"
7705"\tgit submodule add <url> %s\n"
7706"\n"
7707"If you added this path by mistake, you can remove it from the\n"
7708"index with:\n"
7709"\n"
7710"\tgit rm --cached %s\n"
7711"\n"
7712"See \"git help submodule\" for more information."
7713msgstr ""
6937cb4e
JX
7714"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容,并"
7715"且不知道该如何获取它。\n"
a4f16749
JX
7716"如果您要添加一个子模组,使用:\n"
7717"\n"
7718"\tgit submodule add <url> %s\n"
7719"\n"
7720"如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n"
7721"\n"
7722"\tgit rm --cached %s\n"
7723"\n"
7724"参见 \"git help submodule\" 获取更多信息。"
7725
06991777 7726#: builtin/add.c:354
a4f16749
JX
7727#, c-format
7728msgid "adding embedded git repository: %s"
7729msgstr "正在添加嵌入式 git 仓库:%s"
7730
06991777 7731#: builtin/add.c:372
8ada9598 7732#, c-format
a0b6b246
JX
7733msgid "Use -f if you really want to add them.\n"
7734msgstr "使用 -f 参数如果您确实要添加它们。\n"
8ada9598 7735
06991777 7736#: builtin/add.c:380
a0b6b246
JX
7737msgid "adding files failed"
7738msgstr "添加文件失败"
8ada9598 7739
06991777 7740#: builtin/add.c:418
a0b6b246
JX
7741msgid "-A and -u are mutually incompatible"
7742msgstr "-A 和 -u 选项互斥"
8ada9598 7743
06991777 7744#: builtin/add.c:425
a0b6b246
JX
7745msgid "Option --ignore-missing can only be used together with --dry-run"
7746msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 7747
06991777 7748#: builtin/add.c:429
8ada9598 7749#, c-format
a0b6b246
JX
7750msgid "--chmod param '%s' must be either -x or +x"
7751msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
8ada9598 7752
06991777 7753#: builtin/add.c:444
8ada9598 7754#, c-format
a0b6b246
JX
7755msgid "Nothing specified, nothing added.\n"
7756msgstr "没有指定文件,也没有文件被添加。\n"
8ada9598 7757
06991777 7758#: builtin/add.c:445
8ada9598 7759#, c-format
a0b6b246
JX
7760msgid "Maybe you wanted to say 'git add .'?\n"
7761msgstr "也许您想要执行 'git add .'?\n"
8ada9598 7762
06991777 7763#: builtin/am.c:348
a0b6b246
JX
7764msgid "could not parse author script"
7765msgstr "不能解析作者脚本"
8ada9598 7766
06991777 7767#: builtin/am.c:432
81809b99 7768#, c-format
a0b6b246
JX
7769msgid "'%s' was deleted by the applypatch-msg hook"
7770msgstr "'%s' 被 applypatch-msg 钩子删除"
8ada9598 7771
06991777 7772#: builtin/am.c:473
8ada9598 7773#, c-format
a0b6b246
JX
7774msgid "Malformed input line: '%s'."
7775msgstr "非法的输入行:'%s'。"
8ada9598 7776
06991777 7777#: builtin/am.c:510
8ada9598 7778#, c-format
a0b6b246
JX
7779msgid "Failed to copy notes from '%s' to '%s'"
7780msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
8ada9598 7781
06991777 7782#: builtin/am.c:536
a0b6b246
JX
7783msgid "fseek failed"
7784msgstr "fseek 失败"
8ada9598 7785
06991777 7786#: builtin/am.c:724
8ada9598 7787#, c-format
a0b6b246
JX
7788msgid "could not parse patch '%s'"
7789msgstr "无法解析补丁 '%s'"
8ada9598 7790
06991777 7791#: builtin/am.c:789
a0b6b246
JX
7792msgid "Only one StGIT patch series can be applied at once"
7793msgstr "一次只能有一个 StGIT 补丁队列被应用"
7794
06991777 7795#: builtin/am.c:837
a0b6b246
JX
7796msgid "invalid timestamp"
7797msgstr "无效的时间戳"
7798
06991777 7799#: builtin/am.c:842 builtin/am.c:854
a0b6b246
JX
7800msgid "invalid Date line"
7801msgstr "无效的日期行"
8ada9598 7802
06991777 7803#: builtin/am.c:849
a0b6b246
JX
7804msgid "invalid timezone offset"
7805msgstr "无效的时区偏移值"
8ada9598 7806
06991777 7807#: builtin/am.c:942
a0b6b246 7808msgid "Patch format detection failed."
87cb7997 7809msgstr "补丁格式探测失败。"
8ada9598 7810
06991777 7811#: builtin/am.c:947 builtin/clone.c:409
8ada9598 7812#, c-format
a0b6b246 7813msgid "failed to create directory '%s'"
c1ac5258 7814msgstr "创建目录 '%s' 失败"
8ada9598 7815
06991777 7816#: builtin/am.c:952
a0b6b246 7817msgid "Failed to split patches."
c1ac5258 7818msgstr "拆分补丁失败。"
814ff314 7819
06991777 7820#: builtin/am.c:1082 builtin/commit.c:371
a0b6b246
JX
7821msgid "unable to write index file"
7822msgstr "无法写入索引文件"
8ada9598 7823
06991777 7824#: builtin/am.c:1096
8ada9598 7825#, c-format
a0b6b246
JX
7826msgid "When you have resolved this problem, run \"%s --continue\"."
7827msgstr "当您解决这一问题,执行 \"%s --continue\"。"
8ada9598 7828
06991777 7829#: builtin/am.c:1097
81809b99 7830#, c-format
a0b6b246
JX
7831msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
7832msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
8ada9598 7833
06991777 7834#: builtin/am.c:1098
81809b99 7835#, c-format
a0b6b246
JX
7836msgid "To restore the original branch and stop patching, run \"%s --abort\"."
7837msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
8ada9598 7838
06991777 7839#: builtin/am.c:1181
4c27fcb5
JX
7840msgid "Patch sent with format=flowed; space at the end of lines might be lost."
7841msgstr "补丁使用 format=flowed 格式发送,行尾的空格可能会丢失。"
7842
06991777 7843#: builtin/am.c:1209
a4f16749
JX
7844msgid "Patch is empty."
7845msgstr "补丁为空。"
23ff3338 7846
06991777 7847#: builtin/am.c:1275
8ada9598 7848#, c-format
a4f16749
JX
7849msgid "invalid ident line: %.*s"
7850msgstr "无效的身份标识:%.*s"
8ada9598 7851
06991777 7852#: builtin/am.c:1297
8ada9598 7853#, c-format
a0b6b246
JX
7854msgid "unable to parse commit %s"
7855msgstr "不能解析提交 %s"
8ada9598 7856
06991777 7857#: builtin/am.c:1493
a0b6b246
JX
7858msgid "Repository lacks necessary blobs to fall back on 3-way merge."
7859msgstr "仓库缺乏必要的数据对象以进行三方合并。"
814ff314 7860
06991777 7861#: builtin/am.c:1495
a0b6b246
JX
7862msgid "Using index info to reconstruct a base tree..."
7863msgstr "使用索引来重建一个(三方合并的)基础目录树..."
8ada9598 7864
06991777 7865#: builtin/am.c:1514
a0b6b246
JX
7866msgid ""
7867"Did you hand edit your patch?\n"
7868"It does not apply to blobs recorded in its index."
7869msgstr ""
7870"您是否曾手动编辑过您的补丁?\n"
7871"无法应用补丁到索引中的数据对象上。"
23ff3338 7872
06991777 7873#: builtin/am.c:1520
a0b6b246
JX
7874msgid "Falling back to patching base and 3-way merge..."
7875msgstr "回落到基础版本上打补丁及进行三方合并..."
8ada9598 7876
06991777 7877#: builtin/am.c:1546
a0b6b246
JX
7878msgid "Failed to merge in the changes."
7879msgstr "无法合并变更。"
d691f479 7880
06991777 7881#: builtin/am.c:1578
a0b6b246
JX
7882msgid "applying to an empty history"
7883msgstr "正应用到一个空历史上"
8ada9598 7884
06991777 7885#: builtin/am.c:1624 builtin/am.c:1628
8ada9598 7886#, c-format
a0b6b246
JX
7887msgid "cannot resume: %s does not exist."
7888msgstr "无法继续:%s 不存在。"
8ada9598 7889
06991777 7890#: builtin/am.c:1644
a0b6b246
JX
7891msgid "cannot be interactive without stdin connected to a terminal."
7892msgstr "标准输入没有和终端关联,不能进行交互式操作。"
8ada9598 7893
06991777 7894#: builtin/am.c:1649
a0b6b246
JX
7895msgid "Commit Body is:"
7896msgstr "提交内容为:"
8ada9598 7897
a0b6b246
JX
7898# 译者:注意保持句尾空格
7899#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
7900#. in your translation. The program will only accept English
7901#. input at this point.
7902#.
06991777 7903#: builtin/am.c:1659
a0b6b246
JX
7904msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
7905msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
8ada9598 7906
06991777 7907#: builtin/am.c:1709
8ada9598 7908#, c-format
a0b6b246
JX
7909msgid "Dirty index: cannot apply patches (dirty: %s)"
7910msgstr "脏索引:不能应用补丁(脏文件:%s)"
8ada9598 7911
06991777 7912#: builtin/am.c:1749 builtin/am.c:1817
81809b99 7913#, c-format
a0b6b246
JX
7914msgid "Applying: %.*s"
7915msgstr "应用:%.*s"
8ada9598 7916
06991777 7917#: builtin/am.c:1766
a0b6b246
JX
7918msgid "No changes -- Patch already applied."
7919msgstr "没有变更 —— 补丁已经应用过。"
8ada9598 7920
06991777 7921#: builtin/am.c:1772
81809b99 7922#, c-format
a0b6b246
JX
7923msgid "Patch failed at %s %.*s"
7924msgstr "打补丁失败于 %s %.*s"
8ada9598 7925
06991777 7926#: builtin/am.c:1776
31e5e17b
JX
7927msgid "Use 'git am --show-current-patch' to see the failed patch"
7928msgstr "用 'git am --show-current-patch' 命令查看失败的补丁"
8ada9598 7929
06991777 7930#: builtin/am.c:1820
a0b6b246
JX
7931msgid ""
7932"No changes - did you forget to use 'git add'?\n"
7933"If there is nothing left to stage, chances are that something else\n"
7934"already introduced the same changes; you might want to skip this patch."
7935msgstr ""
7936"没有变更 —— 您是不是忘了执行 'git add'?\n"
7937"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
7938"您也许想要跳过这个补丁。"
8ada9598 7939
06991777 7940#: builtin/am.c:1827
a0b6b246
JX
7941msgid ""
7942"You still have unmerged paths in your index.\n"
a4f16749
JX
7943"You should 'git add' each file with resolved conflicts to mark them as "
7944"such.\n"
7945"You might run `git rm` on a file to accept \"deleted by them\" for it."
a0b6b246 7946msgstr ""
a4f16749
JX
7947"在您的索引中仍存在未合并的路径。\n"
7948"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
7949"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
8ada9598 7950
06991777
JX
7951#: builtin/am.c:1934 builtin/am.c:1938 builtin/am.c:1950 builtin/reset.c:329
7952#: builtin/reset.c:337
8ada9598 7953#, c-format
a0b6b246
JX
7954msgid "Could not parse object '%s'."
7955msgstr "不能解析对象 '%s'。"
8ada9598 7956
06991777 7957#: builtin/am.c:1986
a0b6b246 7958msgid "failed to clean index"
c1ac5258 7959msgstr "清空索引失败"
5b04ee3b 7960
06991777 7961#: builtin/am.c:2030
a0b6b246
JX
7962msgid ""
7963"You seem to have moved HEAD since the last 'am' failure.\n"
7964"Not rewinding to ORIG_HEAD"
7965msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
8ada9598 7966
06991777 7967#: builtin/am.c:2123
8ada9598 7968#, c-format
a0b6b246
JX
7969msgid "Invalid value for --patch-format: %s"
7970msgstr "无效的 --patch-format 值:%s"
8ada9598 7971
06991777 7972#: builtin/am.c:2159
a0b6b246
JX
7973msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
7974msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
5b04ee3b 7975
06991777 7976#: builtin/am.c:2160
a0b6b246
JX
7977msgid "git am [<options>] (--continue | --skip | --abort)"
7978msgstr "git am [<选项>] (--continue | --skip | --abort)"
8ada9598 7979
06991777 7980#: builtin/am.c:2166
a0b6b246
JX
7981msgid "run interactively"
7982msgstr "以交互式方式运行"
8ada9598 7983
06991777 7984#: builtin/am.c:2168
a0b6b246
JX
7985msgid "historical option -- no-op"
7986msgstr "老的参数 —— 无作用"
8ada9598 7987
06991777 7988#: builtin/am.c:2170
a0b6b246
JX
7989msgid "allow fall back on 3way merging if needed"
7990msgstr "如果必要,允许使用三方合并。"
8ada9598 7991
06991777 7992#: builtin/am.c:2171 builtin/init-db.c:486 builtin/prune-packed.c:58
4c27fcb5 7993#: builtin/repack.c:306
a0b6b246
JX
7994msgid "be quiet"
7995msgstr "静默模式"
8ada9598 7996
06991777 7997#: builtin/am.c:2173
a0b6b246
JX
7998msgid "add a Signed-off-by line to the commit message"
7999msgstr "在提交说明中添加一个 Signed-off-by 签名"
5c57d762 8000
06991777 8001#: builtin/am.c:2176
a0b6b246
JX
8002msgid "recode into utf8 (default)"
8003msgstr "使用 utf8 字符集(默认)"
5c57d762 8004
06991777 8005#: builtin/am.c:2178
a0b6b246
JX
8006msgid "pass -k flag to git-mailinfo"
8007msgstr "向 git-mailinfo 传递 -k 参数"
5c57d762 8008
06991777 8009#: builtin/am.c:2180
a0b6b246
JX
8010msgid "pass -b flag to git-mailinfo"
8011msgstr "向 git-mailinfo 传递 -b 参数"
5c57d762 8012
06991777 8013#: builtin/am.c:2182
a0b6b246
JX
8014msgid "pass -m flag to git-mailinfo"
8015msgstr "向 git-mailinfo 传递 -m 参数"
5c57d762 8016
06991777 8017#: builtin/am.c:2184
a0b6b246
JX
8018msgid "pass --keep-cr flag to git-mailsplit for mbox format"
8019msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
5c57d762 8020
06991777 8021#: builtin/am.c:2187
a0b6b246
JX
8022msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
8023msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
8ada9598 8024
06991777 8025#: builtin/am.c:2190
a0b6b246
JX
8026msgid "strip everything before a scissors line"
8027msgstr "丢弃裁切线前的所有内容"
8ada9598 8028
06991777
JX
8029#: builtin/am.c:2192 builtin/am.c:2195 builtin/am.c:2198 builtin/am.c:2201
8030#: builtin/am.c:2204 builtin/am.c:2207 builtin/am.c:2210 builtin/am.c:2213
8031#: builtin/am.c:2219
a0b6b246
JX
8032msgid "pass it through git-apply"
8033msgstr "传递给 git-apply"
8ada9598 8034
06991777
JX
8035#: builtin/am.c:2209 builtin/commit.c:1343 builtin/fmt-merge-msg.c:671
8036#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:240
8037#: builtin/pull.c:152 builtin/pull.c:210 builtin/rebase.c:1062
4c27fcb5
JX
8038#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
8039#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386
06991777 8040#: parse-options.h:144 parse-options.h:146 parse-options.h:266
a0b6b246
JX
8041msgid "n"
8042msgstr "n"
8ada9598 8043
06991777 8044#: builtin/am.c:2215 builtin/branch.c:637 builtin/for-each-ref.c:38
4c27fcb5 8045#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39
a0b6b246
JX
8046msgid "format"
8047msgstr "格式"
8ada9598 8048
06991777 8049#: builtin/am.c:2216
a0b6b246
JX
8050msgid "format the patch(es) are in"
8051msgstr "补丁的格式"
8ada9598 8052
06991777 8053#: builtin/am.c:2222
a0b6b246
JX
8054msgid "override error message when patch failure occurs"
8055msgstr "打补丁失败时显示的错误信息"
8ada9598 8056
06991777 8057#: builtin/am.c:2224
a0b6b246
JX
8058msgid "continue applying patches after resolving a conflict"
8059msgstr "冲突解决后继续应用补丁"
814ff314 8060
06991777 8061#: builtin/am.c:2227
a0b6b246
JX
8062msgid "synonyms for --continue"
8063msgstr "和 --continue 同义"
8ada9598 8064
06991777 8065#: builtin/am.c:2230
a0b6b246
JX
8066msgid "skip the current patch"
8067msgstr "跳过当前补丁"
23ff3338 8068
06991777 8069#: builtin/am.c:2233
a0b6b246
JX
8070msgid "restore the original branch and abort the patching operation."
8071msgstr "恢复原始分支并终止打补丁操作。"
8ada9598 8072
06991777 8073#: builtin/am.c:2236
31e5e17b
JX
8074msgid "abort the patching operation but keep HEAD where it is."
8075msgstr "终止补丁操作但保持 HEAD 不变。"
8076
06991777 8077#: builtin/am.c:2239
31e5e17b
JX
8078msgid "show the patch being applied."
8079msgstr "显示正在应用的补丁。"
8080
06991777 8081#: builtin/am.c:2243
a0b6b246
JX
8082msgid "lie about committer date"
8083msgstr "将作者日期作为提交日期"
8ada9598 8084
06991777 8085#: builtin/am.c:2245
a0b6b246
JX
8086msgid "use current timestamp for author date"
8087msgstr "用当前时间作为作者日期"
8ada9598 8088
06991777
JX
8089#: builtin/am.c:2247 builtin/commit.c:1486 builtin/merge.c:274
8090#: builtin/pull.c:185 builtin/rebase.c:1106 builtin/rebase--interactive.c:185
8091#: builtin/revert.c:114 builtin/tag.c:402
a0b6b246
JX
8092msgid "key-id"
8093msgstr "key-id"
8ada9598 8094
06991777 8095#: builtin/am.c:2248 builtin/rebase.c:1107 builtin/rebase--interactive.c:186
a0b6b246
JX
8096msgid "GPG-sign commits"
8097msgstr "使用 GPG 签名提交"
8ada9598 8098
06991777 8099#: builtin/am.c:2251
a0b6b246
JX
8100msgid "(internal use for git-rebase)"
8101msgstr "(内部使用,用于 git-rebase)"
8ada9598 8102
06991777 8103#: builtin/am.c:2269
a0b6b246
JX
8104msgid ""
8105"The -b/--binary option has been a no-op for long time, and\n"
8106"it will be removed. Please do not use it anymore."
8107msgstr ""
8108"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
8109"请不要再使用它了。"
8ada9598 8110
06991777 8111#: builtin/am.c:2276
a0b6b246 8112msgid "failed to read the index"
c1ac5258 8113msgstr "读取索引失败"
8ada9598 8114
06991777 8115#: builtin/am.c:2291
a0b6b246
JX
8116#, c-format
8117msgid "previous rebase directory %s still exists but mbox given."
8118msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
8ada9598 8119
06991777 8120#: builtin/am.c:2315
a0b6b246
JX
8121#, c-format
8122msgid ""
8123"Stray %s directory found.\n"
8124"Use \"git am --abort\" to remove it."
8125msgstr ""
8126"发现了错误的 %s 目录。\n"
8127"使用 \"git am --abort\" 删除它。"
c04f5ac3 8128
06991777 8129#: builtin/am.c:2321
a0b6b246
JX
8130msgid "Resolve operation not in progress, we are not resuming."
8131msgstr "解决操作未进行,我们不会继续。"
c04f5ac3 8132
a0b6b246
JX
8133#: builtin/apply.c:8
8134msgid "git apply [<options>] [<patch>...]"
8135msgstr "git apply [<选项>] [<补丁>...]"
c04f5ac3 8136
c04f5ac3
JX
8137#: builtin/archive.c:17
8138#, c-format
8139msgid "could not create archive file '%s'"
90e6ef53 8140msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
8141
8142#: builtin/archive.c:20
8143msgid "could not redirect output"
195febda 8144msgstr "不能重定向输出"
c04f5ac3
JX
8145
8146#: builtin/archive.c:37
8147msgid "git archive: Remote with no URL"
4375c10e 8148msgstr "git archive:未提供远程 URL"
c04f5ac3 8149
06991777 8150#: builtin/archive.c:61
31e5e17b
JX
8151msgid "git archive: expected ACK/NAK, got a flush packet"
8152msgstr "git archive:期望是 ACK/NAK,却得到 flush 包"
c04f5ac3 8153
06991777 8154#: builtin/archive.c:64
c04f5ac3
JX
8155#, c-format
8156msgid "git archive: NACK %s"
90e6ef53 8157msgstr "git archive:NACK %s"
c04f5ac3 8158
06991777 8159#: builtin/archive.c:65
c04f5ac3 8160msgid "git archive: protocol error"
90e6ef53 8161msgstr "git archive:协议错误"
c04f5ac3 8162
06991777 8163#: builtin/archive.c:69
c04f5ac3 8164msgid "git archive: expected a flush"
31e5e17b 8165msgstr "git archive:应有一个 flush 包"
c04f5ac3 8166
06991777 8167#: builtin/bisect--helper.c:22
ef317cd5 8168msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 8169msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5 8170
06991777 8171#: builtin/bisect--helper.c:23
5809aa05
JX
8172msgid "git bisect--helper --write-terms <bad_term> <good_term>"
8173msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>"
8174
06991777 8175#: builtin/bisect--helper.c:24
5809aa05
JX
8176msgid "git bisect--helper --bisect-clean-state"
8177msgstr "git bisect--helper --bisect-clean-state"
8178
06991777
JX
8179#: builtin/bisect--helper.c:25
8180msgid "git bisect--helper --bisect-reset [<commit>]"
8181msgstr "git bisect--helper --bisect-reset [<提交>]"
8182
8183#: builtin/bisect--helper.c:26
8184msgid ""
8185"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
8186"<bad_term>"
8187msgstr ""
8188"git bisect--helper --bisect-write [--no-log] <状态> <版本> <好-术语> <坏-术语"
8189">"
8190
8191#: builtin/bisect--helper.c:27
8192msgid ""
8193"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
8194"<bad_term>"
8195msgstr ""
8196"git bisect--helper --bisect-check-and-set-terms <命令> <好-术语> <坏-术语>"
8197
8198#: builtin/bisect--helper.c:28
8199msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
8200msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]"
8201
8202#: builtin/bisect--helper.c:29
8203msgid ""
8204"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
8205"term-new]"
8206msgstr ""
8207"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
8208"term-new]"
8209
8210#: builtin/bisect--helper.c:30
8211msgid ""
8212"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
8213"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
8214msgstr ""
8215"git bisect--helper --bisect-start [--term-{old,good}=<术语> --term-{new,bad}"
8216"=<术语>][--no-checkout] [<坏> [<好>...]] [--] [<路径>...]"
8217
8218#: builtin/bisect--helper.c:86
5809aa05
JX
8219#, c-format
8220msgid "'%s' is not a valid term"
8221msgstr "'%s' 不是一个有效的术语"
8222
06991777 8223#: builtin/bisect--helper.c:90
5809aa05
JX
8224#, c-format
8225msgid "can't use the builtin command '%s' as a term"
8226msgstr "不能使用内置命令 '%s' 作为术语"
8227
06991777 8228#: builtin/bisect--helper.c:100
5809aa05
JX
8229#, c-format
8230msgid "can't change the meaning of the term '%s'"
8231msgstr "不能修改术语 '%s' 的含义"
8232
06991777 8233#: builtin/bisect--helper.c:111
5809aa05
JX
8234msgid "please use two different terms"
8235msgstr "请使用两个不同的术语"
8236
06991777 8237#: builtin/bisect--helper.c:118
5809aa05
JX
8238msgid "could not open the file BISECT_TERMS"
8239msgstr "不能打开文件 BISECT_TERMS"
8240
06991777
JX
8241#: builtin/bisect--helper.c:155
8242#, c-format
8243msgid "We are not bisecting.\n"
8244msgstr "我们没有在二分查找。\n"
8245
8246#: builtin/bisect--helper.c:163
8247#, c-format
8248msgid "'%s' is not a valid commit"
8249msgstr "'%s' 不是一个有效的提交"
8250
8251#: builtin/bisect--helper.c:174
8252#, c-format
8253msgid ""
8254"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
8255msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
8256
8257#: builtin/bisect--helper.c:215
8258#, c-format
8259msgid "Bad bisect_write argument: %s"
8260msgstr "坏的 bisect_write 参数:%s"
8261
8262#: builtin/bisect--helper.c:220
8263#, c-format
8264msgid "couldn't get the oid of the rev '%s'"
8265msgstr "无法获取版本 '%s' 的对象ID"
8266
8267#: builtin/bisect--helper.c:232
8268#, c-format
8269msgid "couldn't open the file '%s'"
8270msgstr "无法打开文件 '%s'"
8271
8272#: builtin/bisect--helper.c:258
8273#, c-format
8274msgid "Invalid command: you're currently in a %s/%s bisect"
8275msgstr "无效的命令:您当前正处于一个 %s/%s 二分查找中"
8276
8277#: builtin/bisect--helper.c:285
8278#, c-format
8279msgid ""
8280"You need to give me at least one %s and %s revision.\n"
8281"You can use \"git bisect %s\" and \"git bisect %s\" for that."
8282msgstr ""
8283"您需要给我至少一个 %s 和一个 %s 版本。\n"
8284"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
8285
8286#: builtin/bisect--helper.c:289
8287#, c-format
8288msgid ""
8289"You need to start by \"git bisect start\".\n"
8290"You then need to give me at least one %s and %s revision.\n"
8291"You can use \"git bisect %s\" and \"git bisect %s\" for that."
8292msgstr ""
8293"您需要执行 \"git bisect start\" 来开始。\n"
8294"然后需要提供我至少一个 %s 和一个 %s 版本。\n"
8295"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
8296
8297#: builtin/bisect--helper.c:321
8298#, c-format
8299msgid "bisecting only with a %s commit"
8300msgstr "二分查找只有一个 %s 提交"
8301
8302# 译者:注意保持句尾空格
8303#. TRANSLATORS: Make sure to include [Y] and [n] in your
8304#. translation. The program will only accept English input
8305#. at this point.
8306#.
8307#: builtin/bisect--helper.c:329
8308msgid "Are you sure [Y/n]? "
8309msgstr "您确认么[Y/n]? "
8310
8311#: builtin/bisect--helper.c:376
8312msgid "no terms defined"
8313msgstr "未定义术语"
8314
8315#: builtin/bisect--helper.c:379
8316#, c-format
8317msgid ""
8318"Your current terms are %s for the old state\n"
8319"and %s for the new state.\n"
8320msgstr "您当前针对旧状态的术语是 %s,对新状态的术语是 %s。\n"
8321
8322#: builtin/bisect--helper.c:389
8323#, c-format
8324msgid ""
8325"invalid argument %s for 'git bisect terms'.\n"
8326"Supported options are: --term-good|--term-old and --term-bad|--term-new."
8327msgstr ""
8328"命令 'git bisect terms' 的参数 %s 无效。\n"
8329"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
8330
8331#: builtin/bisect--helper.c:475
8332#, c-format
8333msgid "unrecognized option: '%s'"
8334msgstr "未识别的选项:'%s'"
8335
8336#: builtin/bisect--helper.c:479
8337#, c-format
8338msgid "'%s' does not appear to be a valid revision"
8339msgstr "'%s' 看起来不像是一个有效的版本"
8340
8341#: builtin/bisect--helper.c:511
8342msgid "bad HEAD - I need a HEAD"
8343msgstr "坏的 HEAD - 我需要一个 HEAD"
8344
8345#: builtin/bisect--helper.c:526
8346#, c-format
8347msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
8348msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
8349
8350#: builtin/bisect--helper.c:547
8351msgid "won't bisect on cg-seek'ed tree"
8352msgstr "不会在做了 cg-seek 的树上做二分查找"
8353
8354#: builtin/bisect--helper.c:550
8355msgid "bad HEAD - strange symbolic ref"
8356msgstr "坏的 HEAD - 奇怪的符号引用"
8357
8358#: builtin/bisect--helper.c:627
ef317cd5 8359msgid "perform 'git bisect next'"
07432cef 8360msgstr "执行 'git bisect next'"
ef317cd5 8361
06991777 8362#: builtin/bisect--helper.c:629
5809aa05
JX
8363msgid "write the terms to .git/BISECT_TERMS"
8364msgstr "将术语写入 .git/BISECT_TERMS"
8365
06991777 8366#: builtin/bisect--helper.c:631
5809aa05
JX
8367msgid "cleanup the bisection state"
8368msgstr "清除二分查找状态"
8369
06991777 8370#: builtin/bisect--helper.c:633
5809aa05
JX
8371msgid "check for expected revs"
8372msgstr "检查预期的版本"
8373
06991777
JX
8374#: builtin/bisect--helper.c:635
8375msgid "reset the bisection state"
8376msgstr "清除二分查找状态"
8377
8378#: builtin/bisect--helper.c:637
8379msgid "write out the bisection state in BISECT_LOG"
8380msgstr "将二分查找的状态写入 BISECT_LOG"
8381
8382#: builtin/bisect--helper.c:639
8383msgid "check and set terms in a bisection state"
8384msgstr "在一个二分查找状态中检查和设置术语"
8385
8386#: builtin/bisect--helper.c:641
8387msgid "check whether bad or good terms exist"
8388msgstr "检查坏的或好的术语是否存在"
8389
8390#: builtin/bisect--helper.c:643
8391msgid "print out the bisect terms"
8392msgstr "打印二分查找术语"
8393
8394#: builtin/bisect--helper.c:645
8395msgid "start the bisect session"
8396msgstr "启动二分查找会话"
8397
8398#: builtin/bisect--helper.c:647
ef317cd5 8399msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 8400msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5 8401
06991777
JX
8402#: builtin/bisect--helper.c:649
8403msgid "no log for BISECT_WRITE"
8404msgstr "BISECT_WRITE 无日志"
8405
8406#: builtin/bisect--helper.c:666
5809aa05
JX
8407msgid "--write-terms requires two arguments"
8408msgstr "--write-terms 需要两个参数"
8409
06991777 8410#: builtin/bisect--helper.c:670
5809aa05
JX
8411msgid "--bisect-clean-state requires no arguments"
8412msgstr "--bisect-clean-state 不需要参数"
8413
06991777
JX
8414#: builtin/bisect--helper.c:677
8415msgid "--bisect-reset requires either no argument or a commit"
8416msgstr "--bisect-reset 无需参数或者需要一个提交"
8417
8418#: builtin/bisect--helper.c:681
8419msgid "--bisect-write requires either 4 or 5 arguments"
8420msgstr "--bisect-write 需要 4 或 5 个参数"
8421
8422#: builtin/bisect--helper.c:687
8423msgid "--check-and-set-terms requires 3 arguments"
8424msgstr "--check-and-set-terms 需要 3 个参数"
8425
8426#: builtin/bisect--helper.c:693
8427msgid "--bisect-next-check requires 2 or 3 arguments"
8428msgstr "--bisect-next-check 需要 2 或 3 个参数"
8429
8430#: builtin/bisect--helper.c:699
8431msgid "--bisect-terms requires 0 or 1 argument"
8432msgstr "--bisect-terms 需要 0 或 1 个参数"
8433
c1ac5258 8434#: builtin/blame.c:31
7aea43ff
JX
8435msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
8436msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
ef317cd5 8437
c1ac5258 8438#: builtin/blame.c:36
814ff314
JX
8439msgid "<rev-opts> are documented in git-rev-list(1)"
8440msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
ef317cd5 8441
c1ac5258 8442#: builtin/blame.c:406
fd8cb379
JX
8443#, c-format
8444msgid "expecting a color: %s"
8445msgstr "期望一个颜色:%s"
8446
c1ac5258 8447#: builtin/blame.c:413
fd8cb379
JX
8448msgid "must end with a color"
8449msgstr "必须以一个颜色结尾"
8450
c1ac5258 8451#: builtin/blame.c:700
fd8cb379
JX
8452#, c-format
8453msgid "invalid color '%s' in color.blame.repeatedLines"
8454msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
8455
c1ac5258 8456#: builtin/blame.c:718
fd8cb379
JX
8457msgid "invalid value for blame.coloring"
8458msgstr "设置 blame.coloring 中的无效取值"
8459
4c27fcb5 8460#: builtin/blame.c:793
ef317cd5 8461msgid "Show blame entries as we find them, incrementally"
07432cef 8462msgstr "增量式地显示发现的 blame 条目"
ef317cd5 8463
4c27fcb5 8464#: builtin/blame.c:794
ef317cd5 8465msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 8466msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 8467
4c27fcb5 8468#: builtin/blame.c:795
ef317cd5 8469msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 8470msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 8471
4c27fcb5 8472#: builtin/blame.c:796
ef317cd5 8473msgid "Show work cost statistics"
07432cef 8474msgstr "显示命令消耗统计"
ef317cd5 8475
4c27fcb5 8476#: builtin/blame.c:797
276ceeaa
JX
8477msgid "Force progress reporting"
8478msgstr "强制进度显示"
8479
4c27fcb5 8480#: builtin/blame.c:798
ef317cd5 8481msgid "Show output score for blame entries"
07432cef 8482msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 8483
4c27fcb5 8484#: builtin/blame.c:799
ef317cd5 8485msgid "Show original filename (Default: auto)"
07432cef 8486msgstr "显示原始文件名(默认:自动)"
ef317cd5 8487
4c27fcb5 8488#: builtin/blame.c:800
ef317cd5 8489msgid "Show original linenumber (Default: off)"
07432cef 8490msgstr "显示原始的行号(默认:关闭)"
ef317cd5 8491
4c27fcb5 8492#: builtin/blame.c:801
ef317cd5 8493msgid "Show in a format designed for machine consumption"
07432cef 8494msgstr "显示为一个适合机器读取的格式"
ef317cd5 8495
4c27fcb5 8496#: builtin/blame.c:802
ef317cd5 8497msgid "Show porcelain format with per-line commit information"
07432cef 8498msgstr "为每一行显示机器适用的提交信息"
ef317cd5 8499
4c27fcb5 8500#: builtin/blame.c:803
ef317cd5 8501msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 8502msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 8503
4c27fcb5 8504#: builtin/blame.c:804
ef317cd5 8505msgid "Show raw timestamp (Default: off)"
07432cef 8506msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 8507
4c27fcb5 8508#: builtin/blame.c:805
ef317cd5 8509msgid "Show long commit SHA1 (Default: off)"
4375c10e 8510msgstr "显示长的 SHA1 提交号(默认:关闭)"
ef317cd5 8511
4c27fcb5 8512#: builtin/blame.c:806
ef317cd5 8513msgid "Suppress author name and timestamp (Default: off)"
07432cef 8514msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 8515
4c27fcb5 8516#: builtin/blame.c:807
ef317cd5 8517msgid "Show author email instead of name (Default: off)"
07432cef 8518msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 8519
4c27fcb5 8520#: builtin/blame.c:808
ef317cd5 8521msgid "Ignore whitespace differences"
07432cef 8522msgstr "忽略空白差异"
ef317cd5 8523
4c27fcb5 8524#: builtin/blame.c:809
fd8cb379
JX
8525msgid "color redundant metadata from previous line differently"
8526msgstr "使用颜色间隔输出与前一行不同的重复元信息"
8527
4c27fcb5 8528#: builtin/blame.c:810
fd8cb379
JX
8529msgid "color lines by age"
8530msgstr "依据时间着色"
8531
4c27fcb5 8532#: builtin/blame.c:817
1a79b2f1
JX
8533msgid "Use an experimental heuristic to improve diffs"
8534msgstr "使用一个试验性的启发式算法改进差异显示"
a0b6b246 8535
4c27fcb5 8536#: builtin/blame.c:819
ef317cd5 8537msgid "Spend extra cycles to find better match"
07432cef 8538msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 8539
4c27fcb5 8540#: builtin/blame.c:820
ef317cd5 8541msgid "Use revisions from <file> instead of calling git-rev-list"
d9d56b23 8542msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
ef317cd5 8543
4c27fcb5 8544#: builtin/blame.c:821
ef317cd5 8545msgid "Use <file>'s contents as the final image"
d9d56b23 8546msgstr "使用 <文件> 的内容作为最终的图片"
ef317cd5 8547
4c27fcb5 8548#: builtin/blame.c:822 builtin/blame.c:823
ef317cd5 8549msgid "score"
07432cef 8550msgstr "得分"
ef317cd5 8551
4c27fcb5 8552#: builtin/blame.c:822
ef317cd5 8553msgid "Find line copies within and across files"
07432cef 8554msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 8555
4c27fcb5 8556#: builtin/blame.c:823
ef317cd5 8557msgid "Find line movements within and across files"
07432cef 8558msgstr "找到文件内及跨文件的行移动"
ef317cd5 8559
4c27fcb5 8560#: builtin/blame.c:824
ef317cd5 8561msgid "n,m"
07432cef 8562msgstr "n,m"
ef317cd5 8563
4c27fcb5 8564#: builtin/blame.c:824
ef317cd5 8565msgid "Process only line range n,m, counting from 1"
07432cef 8566msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 8567
06991777 8568#: builtin/blame.c:875
a0b6b246
JX
8569msgid "--progress can't be used with --incremental or porcelain formats"
8570msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
8571
a4f16749
JX
8572#. TRANSLATORS: This string is used to tell us the
8573#. maximum display width for a relative timestamp in
8574#. "git blame" output. For C locale, "4 years, 11
8575#. months ago", which takes 22 places, is the longest
8576#. among various forms of relative timestamps, but
8577#. your language may need more or fewer display
8578#. columns.
8579#.
06991777 8580#: builtin/blame.c:926
6c94aba5
JX
8581msgid "4 years, 11 months ago"
8582msgstr "4 年 11 个月前"
8583
06991777 8584#: builtin/blame.c:1018
a0b6b246
JX
8585#, c-format
8586msgid "file %s has only %lu line"
8587msgid_plural "file %s has only %lu lines"
8588msgstr[0] "文件 %s 只有 %lu 行"
8589msgstr[1] "文件 %s 只有 %lu 行"
8590
06991777 8591#: builtin/blame.c:1064
a4f16749
JX
8592msgid "Blaming lines"
8593msgstr "追踪代码行"
8594
4c27fcb5 8595#: builtin/branch.c:29
814ff314
JX
8596msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
8597msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
ef317cd5 8598
4c27fcb5 8599#: builtin/branch.c:30
814ff314
JX
8600msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
8601msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 8602
4c27fcb5 8603#: builtin/branch.c:31
814ff314
JX
8604msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
8605msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
ef317cd5 8606
4c27fcb5 8607#: builtin/branch.c:32
814ff314
JX
8608msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
8609msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 8610
4c27fcb5 8611#: builtin/branch.c:33
6937cb4e
JX
8612msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
8613msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
8614
4c27fcb5 8615#: builtin/branch.c:34
94550ed3
JX
8616msgid "git branch [<options>] [-r | -a] [--points-at]"
8617msgstr "git branch [<选项>] [-r | -a] [--points-at]"
8618
4c27fcb5 8619#: builtin/branch.c:35
87cb7997
JX
8620msgid "git branch [<options>] [-r | -a] [--format]"
8621msgstr "git branch [<选项>] [-r | -a] [--format]"
8622
90e6ef53 8623# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
c1ac5258 8624#: builtin/branch.c:151
c04f5ac3
JX
8625#, c-format
8626msgid ""
8627"deleting branch '%s' that has been merged to\n"
8628" '%s', but not yet merged to HEAD."
8629msgstr ""
70fc47bf 8630"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
8631" '%s',但未合并到 HEAD。"
8632
90e6ef53 8633# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
c1ac5258 8634#: builtin/branch.c:155
c04f5ac3
JX
8635#, c-format
8636msgid ""
8637"not deleting branch '%s' that is not yet merged to\n"
8638" '%s', even though it is merged to HEAD."
8639msgstr ""
70fc47bf
T
8640"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
8641" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 8642
c1ac5258 8643#: builtin/branch.c:169
07432cef
WS
8644#, c-format
8645msgid "Couldn't look up commit object for '%s'"
8646msgstr "无法查询 '%s' 指向的提交对象"
8647
c1ac5258 8648#: builtin/branch.c:173
07432cef
WS
8649#, c-format
8650msgid ""
8651"The branch '%s' is not fully merged.\n"
8652"If you are sure you want to delete it, run 'git branch -D %s'."
8653msgstr ""
8654"分支 '%s' 没有完全合并。\n"
8655"如果您确认要删除它,执行 'git branch -D %s'。"
8656
c1ac5258 8657#: builtin/branch.c:186
07432cef 8658msgid "Update of config-file failed"
6937cb4e 8659msgstr "更新配置文件失败"
07432cef 8660
c1ac5258 8661#: builtin/branch.c:217
c04f5ac3 8662msgid "cannot use -a with -d"
649900bc 8663msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 8664
c1ac5258 8665#: builtin/branch.c:223
c04f5ac3
JX
8666msgid "Couldn't look up commit object for HEAD"
8667msgstr "无法查询 HEAD 指向的提交对象"
8668
c1ac5258 8669#: builtin/branch.c:237
c04f5ac3 8670#, c-format
5b04ee3b
JX
8671msgid "Cannot delete branch '%s' checked out at '%s'"
8672msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
c04f5ac3 8673
c1ac5258 8674#: builtin/branch.c:252
5ae481e0 8675#, c-format
7aea43ff
JX
8676msgid "remote-tracking branch '%s' not found."
8677msgstr "未能找到远程跟踪分支 '%s'。"
c04f5ac3 8678
c1ac5258 8679#: builtin/branch.c:253
81809b99 8680#, c-format
8ada9598 8681msgid "branch '%s' not found."
81809b99 8682msgstr "分支 '%s' 未发现。"
8ada9598 8683
c1ac5258 8684#: builtin/branch.c:268
81809b99 8685#, c-format
7aea43ff
JX
8686msgid "Error deleting remote-tracking branch '%s'"
8687msgstr "无法删除远程跟踪分支 '%s'"
c04f5ac3 8688
c1ac5258 8689#: builtin/branch.c:269
81809b99 8690#, c-format
8ada9598 8691msgid "Error deleting branch '%s'"
7aea43ff 8692msgstr "无法删除分支 '%s'"
8ada9598 8693
c1ac5258 8694#: builtin/branch.c:276
81809b99 8695#, c-format
7aea43ff
JX
8696msgid "Deleted remote-tracking branch %s (was %s).\n"
8697msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
c04f5ac3 8698
c1ac5258 8699#: builtin/branch.c:277
81809b99 8700#, c-format
8ada9598 8701msgid "Deleted branch %s (was %s).\n"
81809b99 8702msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 8703
c1ac5258 8704#: builtin/branch.c:421 builtin/tag.c:59
6937cb4e
JX
8705msgid "unable to parse format string"
8706msgstr "不能解析格式化字符串"
8707
c1ac5258 8708#: builtin/branch.c:458
5b04ee3b
JX
8709#, c-format
8710msgid "Branch %s is being rebased at %s"
8711msgstr "分支 %s 正被变基到 %s"
8712
c1ac5258 8713#: builtin/branch.c:462
5b04ee3b
JX
8714#, c-format
8715msgid "Branch %s is being bisected at %s"
8716msgstr "分支 %s 正被二分查找于 %s"
8717
c1ac5258 8718#: builtin/branch.c:479
6937cb4e
JX
8719msgid "cannot copy the current branch while not on any."
8720msgstr "无法拷贝当前分支因为不处于任何分支上。"
8721
c1ac5258 8722#: builtin/branch.c:481
c04f5ac3 8723msgid "cannot rename the current branch while not on any."
90e6ef53 8724msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 8725
c1ac5258 8726#: builtin/branch.c:492
c04f5ac3
JX
8727#, c-format
8728msgid "Invalid branch name: '%s'"
8729msgstr "无效的分支名:'%s'"
8730
c1ac5258 8731#: builtin/branch.c:519
c04f5ac3
JX
8732msgid "Branch rename failed"
8733msgstr "分支重命名失败"
8734
c1ac5258 8735#: builtin/branch.c:521
6937cb4e
JX
8736msgid "Branch copy failed"
8737msgstr "分支拷贝失败"
8738
c1ac5258 8739#: builtin/branch.c:525
6937cb4e 8740#, c-format
5809aa05
JX
8741msgid "Created a copy of a misnamed branch '%s'"
8742msgstr "已为错误命名的分支 '%s' 创建了一个副本"
6937cb4e 8743
c1ac5258 8744#: builtin/branch.c:528
c04f5ac3
JX
8745#, c-format
8746msgid "Renamed a misnamed branch '%s' away"
6937cb4e 8747msgstr "已将错误命名的分支 '%s' 重命名"
c04f5ac3 8748
c1ac5258 8749#: builtin/branch.c:534
c04f5ac3
JX
8750#, c-format
8751msgid "Branch renamed to %s, but HEAD is not updated!"
8752msgstr "分支重命名为 %s,但 HEAD 没有更新!"
8753
c1ac5258 8754#: builtin/branch.c:543
c04f5ac3 8755msgid "Branch is renamed, but update of config-file failed"
6937cb4e
JX
8756msgstr "分支被重命名,但更新配置文件失败"
8757
c1ac5258 8758#: builtin/branch.c:545
6937cb4e
JX
8759msgid "Branch is copied, but update of config-file failed"
8760msgstr "分支已拷贝,但更新配置文件失败"
c04f5ac3 8761
c1ac5258 8762#: builtin/branch.c:561
5c57d762
JX
8763#, c-format
8764msgid ""
8765"Please edit the description for the branch\n"
8766" %s\n"
8767"Lines starting with '%c' will be stripped.\n"
8768msgstr ""
8769"请编辑分支的描述\n"
8770" %s\n"
8771"以 '%c' 开头的行将被过滤。\n"
c04f5ac3 8772
4c27fcb5 8773#: builtin/branch.c:594
ef317cd5 8774msgid "Generic options"
07432cef 8775msgstr "通用选项"
c04f5ac3 8776
4c27fcb5 8777#: builtin/branch.c:596
ef317cd5 8778msgid "show hash and subject, give twice for upstream branch"
07432cef 8779msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 8780
4c27fcb5 8781#: builtin/branch.c:597
ef317cd5 8782msgid "suppress informational messages"
07432cef 8783msgstr "不显示信息"
8ada9598 8784
4c27fcb5 8785#: builtin/branch.c:598
ef317cd5 8786msgid "set up tracking mode (see git-pull(1))"
07432cef 8787msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 8788
4c27fcb5 8789#: builtin/branch.c:600
6937cb4e
JX
8790msgid "do not use"
8791msgstr "不要使用"
c04f5ac3 8792
06991777 8793#: builtin/branch.c:602 builtin/rebase--interactive.c:182
5b04ee3b
JX
8794msgid "upstream"
8795msgstr "上游"
8796
4c27fcb5 8797#: builtin/branch.c:602
5b04ee3b
JX
8798msgid "change the upstream info"
8799msgstr "改变上游信息"
8800
4c27fcb5 8801#: builtin/branch.c:603
a0b6b246
JX
8802msgid "Unset the upstream info"
8803msgstr "取消上游信息的设置"
8804
4c27fcb5 8805#: builtin/branch.c:604
ef317cd5 8806msgid "use colored output"
07432cef 8807msgstr "使用彩色输出"
c04f5ac3 8808
4c27fcb5 8809#: builtin/branch.c:605
ef317cd5 8810msgid "act on remote-tracking branches"
07432cef 8811msgstr "作用于远程跟踪分支"
c04f5ac3 8812
4c27fcb5 8813#: builtin/branch.c:607 builtin/branch.c:609
ef317cd5 8814msgid "print only branches that contain the commit"
07432cef 8815msgstr "只打印包含该提交的分支"
c04f5ac3 8816
4c27fcb5 8817#: builtin/branch.c:608 builtin/branch.c:610
87cb7997
JX
8818msgid "print only branches that don't contain the commit"
8819msgstr "只打印不包含该提交的分支"
8820
4c27fcb5 8821#: builtin/branch.c:613
ef317cd5 8822msgid "Specific git-branch actions:"
07432cef 8823msgstr "具体的 git-branch 动作:"
c04f5ac3 8824
4c27fcb5 8825#: builtin/branch.c:614
ef317cd5 8826msgid "list both remote-tracking and local branches"
07432cef 8827msgstr "列出远程跟踪及本地分支"
c04f5ac3 8828
4c27fcb5 8829#: builtin/branch.c:616
ef317cd5 8830msgid "delete fully merged branch"
07432cef 8831msgstr "删除完全合并的分支"
c04f5ac3 8832
4c27fcb5 8833#: builtin/branch.c:617
ef317cd5 8834msgid "delete branch (even if not merged)"
07432cef 8835msgstr "删除分支(即使没有合并)"
c04f5ac3 8836
4c27fcb5 8837#: builtin/branch.c:618
ef317cd5 8838msgid "move/rename a branch and its reflog"
07432cef 8839msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 8840
4c27fcb5 8841#: builtin/branch.c:619
ef317cd5 8842msgid "move/rename a branch, even if target exists"
07432cef 8843msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 8844
4c27fcb5 8845#: builtin/branch.c:620
6937cb4e
JX
8846msgid "copy a branch and its reflog"
8847msgstr "拷贝一个分支和它的引用日志"
8848
4c27fcb5 8849#: builtin/branch.c:621
6937cb4e
JX
8850msgid "copy a branch, even if target exists"
8851msgstr "拷贝一个分支,即使目标已存在"
8852
4c27fcb5 8853#: builtin/branch.c:622
ef317cd5 8854msgid "list branch names"
07432cef 8855msgstr "列出分支名"
c04f5ac3 8856
4c27fcb5 8857#: builtin/branch.c:623
ef317cd5 8858msgid "create the branch's reflog"
07432cef 8859msgstr "创建分支的引用日志"
ef317cd5 8860
4c27fcb5 8861#: builtin/branch.c:625
ef317cd5 8862msgid "edit the description for the branch"
07432cef 8863msgstr "标记分支的描述"
ef317cd5 8864
4c27fcb5 8865#: builtin/branch.c:626
04cb2f28
JX
8866msgid "force creation, move/rename, deletion"
8867msgstr "强制创建、移动/重命名、删除"
ef317cd5 8868
4c27fcb5 8869#: builtin/branch.c:627
94550ed3
JX
8870msgid "print only branches that are merged"
8871msgstr "只打印已经合并的分支"
ef317cd5 8872
4c27fcb5 8873#: builtin/branch.c:628
94550ed3
JX
8874msgid "print only branches that are not merged"
8875msgstr "只打印尚未合并的分支"
ef317cd5 8876
4c27fcb5 8877#: builtin/branch.c:629
ef317cd5 8878msgid "list branches in columns"
07432cef 8879msgstr "以列的方式显示分支"
ef317cd5 8880
4c27fcb5
JX
8881#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
8882#: builtin/tag.c:415
94550ed3
JX
8883msgid "key"
8884msgstr "key"
8885
4c27fcb5
JX
8886#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
8887#: builtin/tag.c:416
94550ed3
JX
8888msgid "field name to sort on"
8889msgstr "排序的字段名"
8890
4c27fcb5 8891#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415
06991777 8892#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
4c27fcb5 8893#: builtin/tag.c:418
94550ed3
JX
8894msgid "object"
8895msgstr "对象"
8896
4c27fcb5 8897#: builtin/branch.c:634
94550ed3
JX
8898msgid "print only branches of the object"
8899msgstr "只打印指向该对象的分支"
8900
4c27fcb5 8901#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425
1a79b2f1
JX
8902msgid "sorting and filtering are case insensitive"
8903msgstr "排序和过滤属于大小写不敏感"
8904
4c27fcb5 8905#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423
a4f16749 8906#: builtin/verify-tag.c:39
87cb7997
JX
8907msgid "format to use for the output"
8908msgstr "输出格式"
8909
06991777 8910#: builtin/branch.c:660 builtin/clone.c:746
c04f5ac3 8911msgid "HEAD not found below refs/heads!"
90e6ef53 8912msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 8913
4c27fcb5 8914#: builtin/branch.c:683
8ada9598 8915msgid "--column and --verbose are incompatible"
81809b99 8916msgstr "--column 和 --verbose 不兼容"
8ada9598 8917
4c27fcb5 8918#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758
a77c07d9
JX
8919msgid "branch name required"
8920msgstr "必须提供分支名"
8921
4c27fcb5 8922#: builtin/branch.c:725
a77c07d9
JX
8923msgid "Cannot give description to detached HEAD"
8924msgstr "不能向分离头指针提供描述"
8925
4c27fcb5 8926#: builtin/branch.c:730
a77c07d9
JX
8927msgid "cannot edit description of more than one branch"
8928msgstr "不能为一个以上的分支编辑描述"
8929
4c27fcb5 8930#: builtin/branch.c:737
a77c07d9
JX
8931#, c-format
8932msgid "No commit on branch '%s' yet."
8933msgstr "分支 '%s' 尚无提交。"
8934
4c27fcb5 8935#: builtin/branch.c:740
a77c07d9
JX
8936#, c-format
8937msgid "No branch named '%s'."
8938msgstr "没有分支 '%s'。"
8939
4c27fcb5 8940#: builtin/branch.c:755
6937cb4e
JX
8941msgid "too many branches for a copy operation"
8942msgstr "为拷贝操作提供了太多的分支名"
a77c07d9 8943
4c27fcb5 8944#: builtin/branch.c:764
6937cb4e
JX
8945msgid "too many arguments for a rename operation"
8946msgstr "为重命名操作提供了太多的参数"
1003b3a5 8947
4c27fcb5 8948#: builtin/branch.c:769
6937cb4e
JX
8949msgid "too many arguments to set new upstream"
8950msgstr "为设置新上游提供了太多的参数"
8951
4c27fcb5 8952#: builtin/branch.c:773
1003b3a5
JX
8953#, c-format
8954msgid ""
8955"could not set upstream of HEAD to %s when it does not point to any branch."
8956msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
8957
06991777 8958#: builtin/branch.c:776 builtin/branch.c:799
1003b3a5
JX
8959#, c-format
8960msgid "no such branch '%s'"
8961msgstr "没有此分支 '%s'"
8962
4c27fcb5 8963#: builtin/branch.c:780
07432cef 8964#, c-format
ef317cd5 8965msgid "branch '%s' does not exist"
07432cef 8966msgstr "分支 '%s' 不存在"
ef317cd5 8967
06991777 8968#: builtin/branch.c:793
6937cb4e
JX
8969msgid "too many arguments to unset upstream"
8970msgstr "为取消上游设置操作提供了太多的参数"
1003b3a5 8971
06991777 8972#: builtin/branch.c:797
1003b3a5
JX
8973msgid "could not unset upstream of HEAD when it does not point to any branch."
8974msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
8975
06991777 8976#: builtin/branch.c:803
ef317cd5
JX
8977#, c-format
8978msgid "Branch '%s' has no upstream information"
07432cef 8979msgstr "分支 '%s' 没有上游信息"
ef317cd5 8980
06991777 8981#: builtin/branch.c:813
c04f5ac3
JX
8982msgid "-a and -r options to 'git branch' do not make sense with a branch name"
8983msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
8984
06991777 8985#: builtin/branch.c:816
ef317cd5 8986msgid ""
6937cb4e
JX
8987"the '--set-upstream' option is no longer supported. Please use '--track' or "
8988"'--set-upstream-to' instead."
ef317cd5 8989msgstr ""
6937cb4e 8990"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
ef317cd5 8991
87cb7997 8992#: builtin/bundle.c:45
c04f5ac3
JX
8993#, c-format
8994msgid "%s is okay\n"
8995msgstr "%s 可以\n"
8996
87cb7997 8997#: builtin/bundle.c:58
c04f5ac3 8998msgid "Need a repository to create a bundle."
160fb2b2 8999msgstr "需要一个仓库来创建包。"
c04f5ac3 9000
87cb7997 9001#: builtin/bundle.c:62
c04f5ac3 9002msgid "Need a repository to unbundle."
160fb2b2 9003msgstr "需要一个仓库来解包。"
c04f5ac3 9004
06991777 9005#: builtin/cat-file.c:593
7aea43ff 9006msgid ""
a0b6b246
JX
9007"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
9008"p | <type> | --textconv | --filters) [--path=<path>] <object>"
275588f9
JX
9009msgstr ""
9010"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
9011"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
ef317cd5 9012
06991777 9013#: builtin/cat-file.c:594
a0b6b246
JX
9014msgid ""
9015"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
9016"filters]"
275588f9
JX
9017msgstr ""
9018"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
9019"filters]"
ef317cd5 9020
06991777 9021#: builtin/cat-file.c:615
4c27fcb5
JX
9022msgid "only one batch option may be specified"
9023msgstr "只能指定一个批处理选项"
9024
06991777 9025#: builtin/cat-file.c:633
ef317cd5 9026msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 9027msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 9028
06991777 9029#: builtin/cat-file.c:634
ef317cd5 9030msgid "show object type"
07432cef 9031msgstr "显示对象类型"
ef317cd5 9032
06991777 9033#: builtin/cat-file.c:635
ef317cd5 9034msgid "show object size"
07432cef 9035msgstr "显示对象大小"
ef317cd5 9036
06991777 9037#: builtin/cat-file.c:637
ef317cd5 9038msgid "exit with zero when there's no error"
07432cef 9039msgstr "当没有错误时退出并返回零"
ef317cd5 9040
06991777 9041#: builtin/cat-file.c:638
ef317cd5 9042msgid "pretty-print object's content"
07432cef 9043msgstr "美观地打印对象的内容"
ef317cd5 9044
06991777 9045#: builtin/cat-file.c:640
ef317cd5 9046msgid "for blob objects, run textconv on object's content"
a0b6b246
JX
9047msgstr "对于数据对象,对其内容做文本转换"
9048
06991777 9049#: builtin/cat-file.c:642
a0b6b246
JX
9050msgid "for blob objects, run filters on object's content"
9051msgstr "对于数据对象,对其内容做过滤"
9052
06991777 9053#: builtin/cat-file.c:643 git-submodule.sh:860
a0b6b246
JX
9054msgid "blob"
9055msgstr "数据对象"
9056
06991777 9057#: builtin/cat-file.c:644
a0b6b246
JX
9058msgid "use a specific path for --textconv/--filters"
9059msgstr "对于 --textconv/--filters 使用一个特定的路径"
ef317cd5 9060
06991777 9061#: builtin/cat-file.c:646
7aea43ff
JX
9062msgid "allow -s and -t to work with broken/corrupt objects"
9063msgstr "允许 -s 和 -t 对损坏的对象生效"
9064
06991777 9065#: builtin/cat-file.c:647
1b7f4a34
JX
9066msgid "buffer --batch output"
9067msgstr "缓冲 --batch 的输出"
9068
06991777 9069#: builtin/cat-file.c:649
ef317cd5 9070msgid "show info and content of objects fed from the standard input"
07432cef 9071msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 9072
06991777 9073#: builtin/cat-file.c:653
ef317cd5 9074msgid "show info about objects fed from the standard input"
07432cef 9075msgstr "显示从标准输入提供的对象的信息"
ef317cd5 9076
06991777 9077#: builtin/cat-file.c:657
7aea43ff
JX
9078msgid "follow in-tree symlinks (used with --batch or --batch-check)"
9079msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
9080
06991777 9081#: builtin/cat-file.c:659
1b7f4a34
JX
9082msgid "show all objects with --batch or --batch-check"
9083msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
9084
06991777 9085#: builtin/cat-file.c:661
c1ac5258
JX
9086msgid "do not order --batch-all-objects output"
9087msgstr "不要对 --batch-all-objects 的输出排序"
9088
06991777 9089#: builtin/check-attr.c:13
814ff314
JX
9090msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
9091msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
ef317cd5 9092
06991777 9093#: builtin/check-attr.c:14
94550ed3
JX
9094msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
9095msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
ef317cd5 9096
06991777 9097#: builtin/check-attr.c:21
ef317cd5 9098msgid "report all attributes set on file"
07432cef 9099msgstr "报告设置在文件上的所有属性"
ef317cd5 9100
06991777 9101#: builtin/check-attr.c:22
ef317cd5 9102msgid "use .gitattributes only from the index"
07432cef 9103msgstr "只使用索引中的 .gitattributes"
ef317cd5 9104
06991777 9105#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
ef317cd5 9106msgid "read file names from stdin"
07432cef 9107msgstr "从标准输入读出文件名"
ef317cd5 9108
06991777 9109#: builtin/check-attr.c:25 builtin/check-ignore.c:27
90314792
JX
9110msgid "terminate input and output records by a NUL character"
9111msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 9112
06991777
JX
9113#: builtin/check-ignore.c:21 builtin/checkout.c:1280 builtin/gc.c:517
9114#: builtin/worktree.c:496
a77c07d9
JX
9115msgid "suppress progress reporting"
9116msgstr "不显示进度报告"
9117
06991777 9118#: builtin/check-ignore.c:29
2e8451e8
JX
9119msgid "show non-matching input paths"
9120msgstr "显示未匹配的输入路径"
9121
06991777 9122#: builtin/check-ignore.c:31
90314792
JX
9123msgid "ignore index when checking"
9124msgstr "检查时忽略索引"
9125
06991777 9126#: builtin/check-ignore.c:160
a77c07d9 9127msgid "cannot specify pathnames with --stdin"
1b7f4a34 9128msgstr "不能同时指定路径及 --stdin 参数"
a77c07d9 9129
06991777 9130#: builtin/check-ignore.c:163
a77c07d9
JX
9131msgid "-z only makes sense with --stdin"
9132msgstr "-z 需要和 --stdin 参数共用才有意义"
9133
06991777 9134#: builtin/check-ignore.c:165
a77c07d9
JX
9135msgid "no path specified"
9136msgstr "未指定路径"
9137
06991777 9138#: builtin/check-ignore.c:169
a77c07d9
JX
9139msgid "--quiet is only valid with a single pathname"
9140msgstr "参数 --quiet 只在提供一个路径名时有效"
9141
06991777 9142#: builtin/check-ignore.c:171
a77c07d9
JX
9143msgid "cannot have both --quiet and --verbose"
9144msgstr "不能同时提供 --quiet 和 --verbose 参数"
9145
06991777 9146#: builtin/check-ignore.c:174
2e8451e8
JX
9147msgid "--non-matching is only valid with --verbose"
9148msgstr "--non-matching 选项只在使用 --verbose 时有效"
9149
a4f16749 9150#: builtin/check-mailmap.c:9
814ff314
JX
9151msgid "git check-mailmap [<options>] <contact>..."
9152msgstr "git check-mailmap [<选项>] <联系地址>..."
2e8451e8 9153
a4f16749 9154#: builtin/check-mailmap.c:14
2e8451e8
JX
9155msgid "also read contacts from stdin"
9156msgstr "还从标准输入读取联系地址"
9157
a4f16749 9158#: builtin/check-mailmap.c:25
2e8451e8
JX
9159#, c-format
9160msgid "unable to parse contact: %s"
9161msgstr "不能解析联系地址:%s"
9162
a4f16749 9163#: builtin/check-mailmap.c:48
2e8451e8
JX
9164msgid "no contacts specified"
9165msgstr "未指定联系地址"
9166
06991777 9167#: builtin/checkout-index.c:131
814ff314
JX
9168msgid "git checkout-index [<options>] [--] [<file>...]"
9169msgstr "git checkout-index [<选项>] [--] [<文件>...]"
ef317cd5 9170
06991777 9171#: builtin/checkout-index.c:148
276ceeaa
JX
9172msgid "stage should be between 1 and 3 or all"
9173msgstr "索引值应该取值 1 到 3 或者 all"
9174
06991777 9175#: builtin/checkout-index.c:164
ef317cd5 9176msgid "check out all files in the index"
07432cef 9177msgstr "检出索引区的所有文件"
ef317cd5 9178
06991777 9179#: builtin/checkout-index.c:165
ef317cd5 9180msgid "force overwrite of existing files"
07432cef 9181msgstr "强制覆盖现有的文件"
ef317cd5 9182
06991777 9183#: builtin/checkout-index.c:167
ef317cd5 9184msgid "no warning for existing files and files not in index"
07432cef 9185msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 9186
06991777 9187#: builtin/checkout-index.c:169
ef317cd5 9188msgid "don't checkout new files"
07432cef 9189msgstr "不检出新文件"
ef317cd5 9190
06991777 9191#: builtin/checkout-index.c:171
ef317cd5 9192msgid "update stat information in the index file"
07432cef 9193msgstr "更新索引中文件的状态信息"
ef317cd5 9194
06991777 9195#: builtin/checkout-index.c:175
ef317cd5 9196msgid "read list of paths from the standard input"
07432cef 9197msgstr "从标准输入读取路径列表"
ef317cd5 9198
06991777 9199#: builtin/checkout-index.c:177
ef317cd5 9200msgid "write the content to temporary files"
07432cef 9201msgstr "将内容写入临时文件"
ef317cd5 9202
06991777
JX
9203#: builtin/checkout-index.c:178 builtin/column.c:31
9204#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
9205#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1857
9206#: builtin/worktree.c:669
ef317cd5 9207msgid "string"
07432cef 9208msgstr "字符串"
ef317cd5 9209
06991777 9210#: builtin/checkout-index.c:179
ef317cd5 9211msgid "when creating files, prepend <string>"
4375c10e 9212msgstr "在创建文件时,在前面加上 <字符串>"
ef317cd5 9213
06991777 9214#: builtin/checkout-index.c:181
ef317cd5 9215msgid "copy out the files from named stage"
07432cef 9216msgstr "从指定暂存区中拷出文件"
ef317cd5 9217
06991777 9218#: builtin/checkout.c:32
814ff314
JX
9219msgid "git checkout [<options>] <branch>"
9220msgstr "git checkout [<选项>] <分支>"
ef317cd5 9221
06991777 9222#: builtin/checkout.c:33
814ff314
JX
9223msgid "git checkout [<options>] [<branch>] -- <file>..."
9224msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
ef317cd5 9225
06991777 9226#: builtin/checkout.c:147 builtin/checkout.c:181
c04f5ac3
JX
9227#, c-format
9228msgid "path '%s' does not have our version"
9229msgstr "路径 '%s' 没有我们的版本"
9230
06991777 9231#: builtin/checkout.c:149 builtin/checkout.c:183
c04f5ac3
JX
9232#, c-format
9233msgid "path '%s' does not have their version"
9234msgstr "路径 '%s' 没有他们的版本"
9235
06991777 9236#: builtin/checkout.c:165
c04f5ac3
JX
9237#, c-format
9238msgid "path '%s' does not have all necessary versions"
e640d114 9239msgstr "路径 '%s' 没有全部必需的版本"
c04f5ac3 9240
06991777 9241#: builtin/checkout.c:210
c04f5ac3
JX
9242#, c-format
9243msgid "path '%s' does not have necessary versions"
e640d114 9244msgstr "路径 '%s' 没有必需的版本"
c04f5ac3 9245
06991777 9246#: builtin/checkout.c:228
c04f5ac3
JX
9247#, c-format
9248msgid "path '%s': cannot merge"
90e6ef53 9249msgstr "path '%s':无法合并"
c04f5ac3 9250
06991777 9251#: builtin/checkout.c:244
c04f5ac3
JX
9252#, c-format
9253msgid "Unable to add merge result for '%s'"
9254msgstr "无法为 '%s' 添加合并结果"
9255
06991777
JX
9256#: builtin/checkout.c:267 builtin/checkout.c:270 builtin/checkout.c:273
9257#: builtin/checkout.c:276
07432cef 9258#, c-format
ef317cd5 9259msgid "'%s' cannot be used with updating paths"
07432cef 9260msgstr "'%s' 不能在更新路径时使用"
ef317cd5 9261
06991777 9262#: builtin/checkout.c:279 builtin/checkout.c:282
07432cef 9263#, c-format
ef317cd5 9264msgid "'%s' cannot be used with %s"
07432cef 9265msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 9266
06991777 9267#: builtin/checkout.c:285
ef317cd5
JX
9268#, c-format
9269msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 9270msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 9271
06991777 9272#: builtin/checkout.c:354 builtin/checkout.c:361
c04f5ac3
JX
9273#, c-format
9274msgid "path '%s' is unmerged"
9275msgstr "路径 '%s' 未合并"
9276
06991777
JX
9277#: builtin/checkout.c:397
9278#, c-format
9279msgid "Recreated %d merge conflict"
9280msgid_plural "Recreated %d merge conflicts"
9281msgstr[0] "重新创建了 %d 个合并冲突"
9282msgstr[1] "重新创建了 %d 个合并冲突"
9283
9284#: builtin/checkout.c:402
9285#, c-format
9286msgid "Updated %d path from %s"
9287msgid_plural "Updated %d paths from %s"
9288msgstr[0] "从 %2$s 更新了 %1$d 个路径"
9289msgstr[1] "从 %2$s 更新了 %1$d 个路径"
9290
9291#: builtin/checkout.c:409
9292#, c-format
9293msgid "Updated %d path from the index"
9294msgid_plural "Updated %d paths from the index"
9295msgstr[0] "从索引区更新了 %d 个路径"
9296msgstr[1] "从索引区更新了 %d 个路径"
9297
9298#: builtin/checkout.c:645
c04f5ac3 9299msgid "you need to resolve your current index first"
90e6ef53 9300msgstr "您需要先解决当前索引的冲突"
c04f5ac3 9301
06991777 9302#: builtin/checkout.c:782
c04f5ac3 9303#, c-format
1b7f4a34
JX
9304msgid "Can not do reflog for '%s': %s\n"
9305msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
c04f5ac3 9306
06991777 9307#: builtin/checkout.c:824
c04f5ac3
JX
9308msgid "HEAD is now at"
9309msgstr "HEAD 目前位于"
9310
06991777 9311#: builtin/checkout.c:828 builtin/clone.c:699
3495628d
JX
9312msgid "unable to update HEAD"
9313msgstr "不能更新 HEAD"
9314
06991777 9315#: builtin/checkout.c:832
c04f5ac3
JX
9316#, c-format
9317msgid "Reset branch '%s'\n"
9318msgstr "重置分支 '%s'\n"
9319
06991777 9320#: builtin/checkout.c:835
c04f5ac3
JX
9321#, c-format
9322msgid "Already on '%s'\n"
9323msgstr "已经位于 '%s'\n"
9324
06991777 9325#: builtin/checkout.c:839
c04f5ac3
JX
9326#, c-format
9327msgid "Switched to and reset branch '%s'\n"
9328msgstr "切换并重置分支 '%s'\n"
9329
06991777 9330#: builtin/checkout.c:841 builtin/checkout.c:1212
c04f5ac3
JX
9331#, c-format
9332msgid "Switched to a new branch '%s'\n"
9333msgstr "切换到一个新分支 '%s'\n"
9334
06991777 9335#: builtin/checkout.c:843
c04f5ac3
JX
9336#, c-format
9337msgid "Switched to branch '%s'\n"
9338msgstr "切换到分支 '%s'\n"
9339
90e6ef53 9340# 译者:注意保持前导空格
06991777 9341#: builtin/checkout.c:894
c04f5ac3
JX
9342#, c-format
9343msgid " ... and %d more.\n"
90e6ef53 9344msgstr " ... 及其它 %d 个。\n"
c04f5ac3 9345
06991777 9346#: builtin/checkout.c:900
c04f5ac3
JX
9347#, c-format
9348msgid ""
9349"Warning: you are leaving %d commit behind, not connected to\n"
9350"any of your branches:\n"
9351"\n"
9352"%s\n"
9353msgid_plural ""
9354"Warning: you are leaving %d commits behind, not connected to\n"
9355"any of your branches:\n"
9356"\n"
9357"%s\n"
9358msgstr[0] ""
9359"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
9360"\n"
9361"%s\n"
5ae481e0
JX
9362msgstr[1] ""
9363"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
9364"\n"
9365"%s\n"
c04f5ac3 9366
06991777 9367#: builtin/checkout.c:919
c04f5ac3
JX
9368#, c-format
9369msgid ""
7aea43ff
JX
9370"If you want to keep it by creating a new branch, this may be a good time\n"
9371"to do so with:\n"
9372"\n"
9373" git branch <new-branch-name> %s\n"
9374"\n"
9375msgid_plural ""
c04f5ac3
JX
9376"If you want to keep them by creating a new branch, this may be a good time\n"
9377"to do so with:\n"
9378"\n"
814ff314 9379" git branch <new-branch-name> %s\n"
c04f5ac3 9380"\n"
7aea43ff
JX
9381msgstr[0] ""
9382"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
9383"如下操作:\n"
9384"\n"
9385" git branch <新分支名> %s\n"
9386"\n"
9387msgstr[1] ""
9388"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
c04f5ac3
JX
9389"如下操作:\n"
9390"\n"
814ff314 9391" git branch <新分支名> %s\n"
c04f5ac3
JX
9392"\n"
9393
06991777 9394#: builtin/checkout.c:951
c04f5ac3
JX
9395msgid "internal error in revision walk"
9396msgstr "在版本遍历时遇到内部错误"
9397
06991777 9398#: builtin/checkout.c:955
c04f5ac3
JX
9399msgid "Previous HEAD position was"
9400msgstr "之前的 HEAD 位置是"
9401
06991777 9402#: builtin/checkout.c:983 builtin/checkout.c:1207
c04f5ac3 9403msgid "You are on a branch yet to be born"
90e6ef53 9404msgstr "您位于一个尚未初始化的分支"
c04f5ac3 9405
06991777 9406#: builtin/checkout.c:1104
90314792
JX
9407#, c-format
9408msgid "only one reference expected, %d given."
a0b6b246 9409msgstr "应只有一个引用,却给出了 %d 个"
90314792 9410
06991777
JX
9411#: builtin/checkout.c:1140
9412#, c-format
9413msgid ""
9414"'%s' could be both a local file and a tracking branch.\n"
9415"Please use -- (and optionally --no-guess) to disambiguate"
9416msgstr ""
9417"'%s' 既可以是一个本地文件,也可以是一个跟踪分支。\n"
9418"请使用 --(和可选的 --no-guess)来消除歧义"
9419
9420#: builtin/checkout.c:1153 builtin/worktree.c:290 builtin/worktree.c:445
c04f5ac3
JX
9421#, c-format
9422msgid "invalid reference: %s"
9423msgstr "无效引用:%s"
9424
06991777 9425#: builtin/checkout.c:1182
c04f5ac3
JX
9426#, c-format
9427msgid "reference is not a tree: %s"
9428msgstr "引用不是一个树:%s"
9429
06991777 9430#: builtin/checkout.c:1221
ef317cd5 9431msgid "paths cannot be used with switching branches"
07432cef 9432msgstr "路径不能和切换分支同时使用"
c04f5ac3 9433
06991777 9434#: builtin/checkout.c:1224 builtin/checkout.c:1228
07432cef 9435#, c-format
ef317cd5 9436msgid "'%s' cannot be used with switching branches"
07432cef 9437msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 9438
06991777
JX
9439#: builtin/checkout.c:1232 builtin/checkout.c:1235 builtin/checkout.c:1240
9440#: builtin/checkout.c:1243
07432cef 9441#, c-format
ef317cd5 9442msgid "'%s' cannot be used with '%s'"
07432cef 9443msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 9444
06991777 9445#: builtin/checkout.c:1248
07432cef 9446#, c-format
ef317cd5 9447msgid "Cannot switch branch to a non-commit '%s'"
07432cef 9448msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 9449
06991777
JX
9450#: builtin/checkout.c:1281 builtin/checkout.c:1283 builtin/clone.c:120
9451#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:489
9452#: builtin/worktree.c:491
ef317cd5 9453msgid "branch"
07432cef 9454msgstr "分支"
c04f5ac3 9455
06991777 9456#: builtin/checkout.c:1282
ef317cd5 9457msgid "create and checkout a new branch"
07432cef 9458msgstr "创建并检出一个新的分支"
c04f5ac3 9459
06991777 9460#: builtin/checkout.c:1284
ef317cd5 9461msgid "create/reset and checkout a branch"
07432cef 9462msgstr "创建/重置并检出一个分支"
c04f5ac3 9463
06991777 9464#: builtin/checkout.c:1285
ef317cd5 9465msgid "create reflog for new branch"
07432cef 9466msgstr "为新的分支创建引用日志"
ef317cd5 9467
06991777 9468#: builtin/checkout.c:1286 builtin/worktree.c:493
5c57d762
JX
9469msgid "detach HEAD at named commit"
9470msgstr "HEAD 从指定的提交分离"
ef317cd5 9471
06991777 9472#: builtin/checkout.c:1287
ef317cd5 9473msgid "set upstream info for new branch"
07432cef 9474msgstr "为新的分支设置上游信息"
ef317cd5 9475
06991777 9476#: builtin/checkout.c:1289
6c94aba5 9477msgid "new-branch"
07432cef 9478msgstr "新分支"
ef317cd5 9479
06991777 9480#: builtin/checkout.c:1289
ef317cd5 9481msgid "new unparented branch"
07432cef 9482msgstr "新的没有父提交的分支"
ef317cd5 9483
06991777 9484#: builtin/checkout.c:1291
ef317cd5 9485msgid "checkout our version for unmerged files"
07432cef 9486msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 9487
06991777 9488#: builtin/checkout.c:1294
ef317cd5 9489msgid "checkout their version for unmerged files"
07432cef 9490msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 9491
06991777 9492#: builtin/checkout.c:1296
ef317cd5 9493msgid "force checkout (throw away local modifications)"
07432cef 9494msgstr "强制检出(丢弃本地修改)"
c04f5ac3 9495
06991777 9496#: builtin/checkout.c:1298
ef317cd5 9497msgid "perform a 3-way merge with the new branch"
160fb2b2 9498msgstr "和新的分支执行三方合并"
ef317cd5 9499
06991777 9500#: builtin/checkout.c:1300 builtin/merge.c:276
ef317cd5 9501msgid "update ignored files (default)"
07432cef 9502msgstr "更新忽略的文件(默认)"
c04f5ac3 9503
06991777 9504#: builtin/checkout.c:1302 builtin/log.c:1586 parse-options.h:272
ef317cd5 9505msgid "style"
07432cef 9506msgstr "风格"
ef317cd5 9507
06991777 9508#: builtin/checkout.c:1303
ef317cd5 9509msgid "conflict style (merge or diff3)"
07432cef 9510msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 9511
06991777 9512#: builtin/checkout.c:1306
4dcdc3d8
JX
9513msgid "do not limit pathspecs to sparse entries only"
9514msgstr "对路径不做稀疏检出的限制"
9515
06991777
JX
9516#: builtin/checkout.c:1308
9517msgid "do not second guess 'git checkout <no-such-branch>'"
9518msgstr "不要二次猜测 'git checkout <无此分支>'"
ef317cd5 9519
06991777 9520#: builtin/checkout.c:1310
7aea43ff
JX
9521msgid "do not check if another worktree is holding the given ref"
9522msgstr "不检查指定的引用是否被其他工作区所占用"
9523
06991777
JX
9524#: builtin/checkout.c:1314 builtin/clone.c:87 builtin/fetch.c:141
9525#: builtin/merge.c:273 builtin/pull.c:130 builtin/push.c:575
fd8cb379 9526#: builtin/send-pack.c:174
94550ed3
JX
9527msgid "force progress reporting"
9528msgstr "强制显示进度报告"
9529
06991777 9530#: builtin/checkout.c:1345
ef317cd5 9531msgid "-b, -B and --orphan are mutually exclusive"
07432cef 9532msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 9533
06991777 9534#: builtin/checkout.c:1362
ef317cd5
JX
9535msgid "--track needs a branch name"
9536msgstr "--track 需要一个分支名"
9537
06991777 9538#: builtin/checkout.c:1367
c1ac5258
JX
9539msgid "missing branch name; try -b"
9540msgstr "缺少分支名,尝试 -b"
ef317cd5 9541
06991777 9542#: builtin/checkout.c:1404
c04f5ac3 9543msgid "invalid path specification"
90e6ef53 9544msgstr "无效的路径规格"
c04f5ac3 9545
06991777 9546#: builtin/checkout.c:1411
07432cef 9547#, c-format
a4f16749
JX
9548msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
9549msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'"
c04f5ac3 9550
06991777 9551#: builtin/checkout.c:1415
07432cef 9552#, c-format
ef317cd5 9553msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 9554msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 9555
06991777 9556#: builtin/checkout.c:1419
c04f5ac3
JX
9557msgid ""
9558"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
9559"checking out of the index."
9560msgstr ""
90e6ef53 9561"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 9562
06991777 9563#: builtin/checkout.c:1439
c1ac5258
JX
9564#, c-format
9565msgid ""
9566"'%s' matched more than one remote tracking branch.\n"
9567"We found %d remotes with a reference that matched. So we fell back\n"
9568"on trying to resolve the argument as a path, but failed there too!\n"
9569"\n"
9570"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
9571"you can do so by fully qualifying the name with the --track option:\n"
9572"\n"
9573" git checkout --track origin/<name>\n"
9574"\n"
9575"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
9576"one remote, e.g. the 'origin' remote, consider setting\n"
9577"checkout.defaultRemote=origin in your config."
9578msgstr ""
9579"'%s' 匹配了一个以上的远程跟踪分支。\n"
9580"我们发现 %d 个远程仓库具有同名分支。所以我们转而尝试将这个参数解析为\n"
9581"路径,但是也失败了!\n"
9582"\n"
9583"如果您想要检出一个远程跟踪分支,例如在远程仓库 'origin' 上的,您可以\n"
9584"使用分支全名和 --track 选项:\n"
9585"\n"
9586" git checkout --track origin/<name>\n"
9587"\n"
9588"如果您总是喜欢使用模糊的简短分支名 <name>,而不喜欢如 'origin' 的远程\n"
9589"仓库名,可以在配置中设置 checkout.defaultRemote=origin。"
9590
06991777 9591#: builtin/clean.c:28
2e8451e8
JX
9592msgid ""
9593"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
9594msgstr ""
9595"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 9596
06991777 9597#: builtin/clean.c:32
07432cef
WS
9598#, c-format
9599msgid "Removing %s\n"
9600msgstr "正删除 %s\n"
9601
06991777 9602#: builtin/clean.c:33
07432cef
WS
9603#, c-format
9604msgid "Would remove %s\n"
9605msgstr "将删除 %s\n"
9606
06991777 9607#: builtin/clean.c:34
07432cef
WS
9608#, c-format
9609msgid "Skipping repository %s\n"
160fb2b2 9610msgstr "忽略仓库 %s\n"
07432cef 9611
06991777 9612#: builtin/clean.c:35
07432cef
WS
9613#, c-format
9614msgid "Would skip repository %s\n"
160fb2b2 9615msgstr "将忽略仓库 %s\n"
07432cef 9616
06991777 9617#: builtin/clean.c:36
07432cef
WS
9618#, c-format
9619msgid "failed to remove %s"
c1ac5258 9620msgstr "删除 %s 失败"
07432cef 9621
06991777 9622#: builtin/clean.c:299 git-add--interactive.perl:579
1a79b2f1 9623#, c-format
2e8451e8
JX
9624msgid ""
9625"Prompt help:\n"
9626"1 - select a numbered item\n"
9627"foo - select item based on unique prefix\n"
1a79b2f1 9628" - (empty) select nothing\n"
2e8451e8
JX
9629msgstr ""
9630"帮助:\n"
9631"1 - 通过编号选择一个选项\n"
1a79b2f1
JX
9632"foo - 通过唯一前缀选择一个选项\n"
9633" - (空)什么也不选择\n"
2e8451e8 9634
06991777 9635#: builtin/clean.c:303 git-add--interactive.perl:588
1a79b2f1 9636#, c-format
2e8451e8
JX
9637msgid ""
9638"Prompt help:\n"
9639"1 - select a single item\n"
9640"3-5 - select a range of items\n"
9641"2-3,6-9 - select multiple ranges\n"
9642"foo - select item based on unique prefix\n"
9643"-... - unselect specified items\n"
9644"* - choose all items\n"
1a79b2f1 9645" - (empty) finish selecting\n"
2e8451e8
JX
9646msgstr ""
9647"帮助:\n"
9648"1 - 选择一个选项\n"
9649"3-5 - 选择一个范围内的所有选项\n"
9650"2-3,6-9 - 选择多个范围内的所有选项\n"
1a79b2f1 9651"foo - 通过唯一前缀选择一个选项\n"
2e8451e8
JX
9652"-... - 反选特定的选项\n"
9653"* - 选择所有选项\n"
1a79b2f1 9654" - (空)结束选择\n"
2e8451e8 9655
06991777 9656#: builtin/clean.c:519 git-add--interactive.perl:554
fd8cb379 9657#: git-add--interactive.perl:559
1a79b2f1
JX
9658#, c-format, perl-format
9659msgid "Huh (%s)?\n"
9660msgstr "嗯(%s)?\n"
2e8451e8 9661
06991777 9662#: builtin/clean.c:661
2e8451e8
JX
9663#, c-format
9664msgid "Input ignore patterns>> "
9665msgstr "输入模版以排除条目>> "
9666
06991777 9667#: builtin/clean.c:698
2e8451e8
JX
9668#, c-format
9669msgid "WARNING: Cannot find items matched by: %s"
9670msgstr "警告:无法找到和 %s 匹配的条目"
9671
06991777 9672#: builtin/clean.c:719
2e8451e8
JX
9673msgid "Select items to delete"
9674msgstr "选择要删除的条目"
9675
814ff314 9676#. TRANSLATORS: Make sure to keep [y/N] as is
06991777 9677#: builtin/clean.c:760
2e8451e8 9678#, c-format
814ff314
JX
9679msgid "Remove %s [y/N]? "
9680msgstr "删除 %s [y/N]?"
2e8451e8 9681
06991777 9682#: builtin/clean.c:785 git-add--interactive.perl:1717
1a79b2f1
JX
9683#, c-format
9684msgid "Bye.\n"
9685msgstr "再见。\n"
2e8451e8 9686
06991777 9687#: builtin/clean.c:793
2e8451e8
JX
9688msgid ""
9689"clean - start cleaning\n"
9690"filter by pattern - exclude items from deletion\n"
9691"select by numbers - select items to be deleted by numbers\n"
9692"ask each - confirm each deletion (like \"rm -i\")\n"
9693"quit - stop cleaning\n"
9694"help - this screen\n"
9695"? - help for prompt selection"
9696msgstr ""
9697"clean - 开始清理\n"
9698"filter by pattern - 通过模版排除要删除的条目\n"
9699"select by numbers - 通过数字选择要删除的条目\n"
9700"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
9701"quit - 停止删除并退出\n"
9702"help - 显示本帮助\n"
9703"? - 显示如何在提示符下选择的帮助"
9704
06991777 9705#: builtin/clean.c:820 git-add--interactive.perl:1793
2e8451e8
JX
9706msgid "*** Commands ***"
9707msgstr "*** 命令 ***"
9708
06991777 9709#: builtin/clean.c:821 git-add--interactive.perl:1790
2e8451e8
JX
9710msgid "What now"
9711msgstr "请选择"
9712
06991777 9713#: builtin/clean.c:829
2e8451e8
JX
9714msgid "Would remove the following item:"
9715msgid_plural "Would remove the following items:"
9716msgstr[0] "将删除如下条目:"
9717msgstr[1] "将删除如下条目:"
9718
06991777 9719#: builtin/clean.c:845
2e8451e8
JX
9720msgid "No more files to clean, exiting."
9721msgstr "没有要清理的文件,退出。"
9722
06991777 9723#: builtin/clean.c:907
ef317cd5 9724msgid "do not print names of files removed"
07432cef 9725msgstr "不打印删除文件的名称"
ef317cd5 9726
06991777 9727#: builtin/clean.c:909
ef317cd5 9728msgid "force"
07432cef 9729msgstr "强制"
ef317cd5 9730
06991777 9731#: builtin/clean.c:910
2e8451e8
JX
9732msgid "interactive cleaning"
9733msgstr "交互式清除"
9734
06991777 9735#: builtin/clean.c:912
ef317cd5 9736msgid "remove whole directories"
07432cef 9737msgstr "删除整个目录"
ef317cd5 9738
06991777
JX
9739#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
9740#: builtin/grep.c:897 builtin/log.c:167 builtin/log.c:169
9741#: builtin/ls-files.c:557 builtin/name-rev.c:415 builtin/name-rev.c:417
4c27fcb5 9742#: builtin/show-ref.c:178
ef317cd5 9743msgid "pattern"
07432cef 9744msgstr "模式"
ef317cd5 9745
06991777 9746#: builtin/clean.c:914
ef317cd5 9747msgid "add <pattern> to ignore rules"
4375c10e 9748msgstr "添加 <模式> 到忽略规则"
ef317cd5 9749
06991777 9750#: builtin/clean.c:915
ef317cd5 9751msgid "remove ignored files, too"
07432cef 9752msgstr "也删除忽略的文件"
ef317cd5 9753
06991777 9754#: builtin/clean.c:917
ef317cd5 9755msgid "remove only ignored files"
07432cef 9756msgstr "只删除忽略的文件"
c04f5ac3 9757
06991777 9758#: builtin/clean.c:935
c04f5ac3 9759msgid "-x and -X cannot be used together"
649900bc 9760msgstr "-x 和 -X 不能同时使用"
c04f5ac3 9761
06991777 9762#: builtin/clean.c:939
c04f5ac3 9763msgid ""
6c94aba5 9764"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 9765"clean"
c04f5ac3 9766msgstr ""
2e8451e8 9767"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 9768
06991777 9769#: builtin/clean.c:942
c04f5ac3 9770msgid ""
6c94aba5 9771"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 9772"refusing to clean"
c04f5ac3 9773msgstr ""
2e8451e8 9774"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 9775
06991777 9776#: builtin/clone.c:44
814ff314 9777msgid "git clone [<options>] [--] <repo> [<dir>]"
160fb2b2 9778msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
ef317cd5 9779
06991777 9780#: builtin/clone.c:89
ef317cd5 9781msgid "don't create a checkout"
07432cef 9782msgstr "不创建一个检出"
ef317cd5 9783
06991777 9784#: builtin/clone.c:90 builtin/clone.c:92 builtin/init-db.c:481
ef317cd5 9785msgid "create a bare repository"
160fb2b2 9786msgstr "创建一个纯仓库"
ef317cd5 9787
06991777 9788#: builtin/clone.c:94
ef317cd5 9789msgid "create a mirror repository (implies bare)"
160fb2b2 9790msgstr "创建一个镜像仓库(也是纯仓库)"
ef317cd5 9791
06991777 9792#: builtin/clone.c:96
ef317cd5 9793msgid "to clone from a local repository"
160fb2b2 9794msgstr "从本地仓库克隆"
ef317cd5 9795
06991777 9796#: builtin/clone.c:98
ef317cd5 9797msgid "don't use local hardlinks, always copy"
07432cef 9798msgstr "不使用本地硬链接,始终复制"
ef317cd5 9799
06991777 9800#: builtin/clone.c:100
ef317cd5 9801msgid "setup as shared repository"
160fb2b2 9802msgstr "设置为共享仓库"
ef317cd5 9803
06991777 9804#: builtin/clone.c:102 builtin/clone.c:106
87cb7997 9805msgid "pathspec"
65e2041e 9806msgstr "路径规格"
87cb7997 9807
06991777 9808#: builtin/clone.c:102 builtin/clone.c:106
ef317cd5 9809msgid "initialize submodules in the clone"
07432cef 9810msgstr "在克隆时初始化子模组"
ef317cd5 9811
06991777 9812#: builtin/clone.c:109
5b04ee3b
JX
9813msgid "number of submodules cloned in parallel"
9814msgstr "并发克隆的子模组的数量"
9815
06991777 9816#: builtin/clone.c:110 builtin/init-db.c:478
ef317cd5 9817msgid "template-directory"
07432cef 9818msgstr "模板目录"
ef317cd5 9819
06991777 9820#: builtin/clone.c:111 builtin/init-db.c:479
ef317cd5 9821msgid "directory from which templates will be used"
07432cef 9822msgstr "模板目录将被使用"
ef317cd5 9823
06991777
JX
9824#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1379
9825#: builtin/submodule--helper.c:1860
ef317cd5 9826msgid "reference repository"
160fb2b2 9827msgstr "参考仓库"
ef317cd5 9828
06991777
JX
9829#: builtin/clone.c:117 builtin/submodule--helper.c:1381
9830#: builtin/submodule--helper.c:1862
7aea43ff 9831msgid "use --reference only while cloning"
160fb2b2 9832msgstr "仅在克隆时参考 --reference 指向的本地仓库"
7aea43ff 9833
06991777
JX
9834#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46
9835#: builtin/pack-objects.c:3303 builtin/repack.c:329
ef317cd5 9836msgid "name"
07432cef 9837msgstr "名称"
ef317cd5 9838
06991777 9839#: builtin/clone.c:119
ef317cd5 9840msgid "use <name> instead of 'origin' to track upstream"
4375c10e 9841msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
ef317cd5 9842
06991777 9843#: builtin/clone.c:121
ef317cd5 9844msgid "checkout <branch> instead of the remote's HEAD"
4375c10e 9845msgstr "检出 <分支> 而不是远程 HEAD"
ef317cd5 9846
06991777 9847#: builtin/clone.c:123
ef317cd5 9848msgid "path to git-upload-pack on the remote"
07432cef 9849msgstr "远程 git-upload-pack 路径"
ef317cd5 9850
06991777
JX
9851#: builtin/clone.c:124 builtin/fetch.c:142 builtin/grep.c:836
9852#: builtin/pull.c:218
ef317cd5 9853msgid "depth"
07432cef 9854msgstr "深度"
ef317cd5 9855
06991777 9856#: builtin/clone.c:125
ef317cd5 9857msgid "create a shallow clone of that depth"
07432cef 9858msgstr "创建一个指定深度的浅克隆"
ef317cd5 9859
06991777 9860#: builtin/clone.c:126 builtin/fetch.c:144 builtin/pack-objects.c:3292
a0b6b246
JX
9861msgid "time"
9862msgstr "时间"
9863
06991777 9864#: builtin/clone.c:127
a0b6b246
JX
9865msgid "create a shallow clone since a specific time"
9866msgstr "从一个特定时间创建一个浅克隆"
9867
06991777
JX
9868#: builtin/clone.c:128 builtin/fetch.c:146 builtin/fetch.c:169
9869#: builtin/rebase.c:1039
a0b6b246
JX
9870msgid "revision"
9871msgstr "版本"
9872
06991777 9873#: builtin/clone.c:129 builtin/fetch.c:147
1a79b2f1
JX
9874msgid "deepen history of shallow clone, excluding rev"
9875msgstr "深化浅克隆的历史,除了特定版本"
a0b6b246 9876
06991777 9877#: builtin/clone.c:131
ef317cd5 9878msgid "clone only one branch, HEAD or --branch"
07432cef 9879msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 9880
06991777 9881#: builtin/clone.c:133
a4f16749
JX
9882msgid "don't clone any tags, and make later fetches not to follow them"
9883msgstr "不要克隆任何标签,并且后续获取操作也不下载它们"
9884
06991777 9885#: builtin/clone.c:135
5b04ee3b
JX
9886msgid "any cloned submodules will be shallow"
9887msgstr "子模组将以浅下载模式克隆"
9888
06991777 9889#: builtin/clone.c:136 builtin/init-db.c:487
ef317cd5 9890msgid "gitdir"
07432cef 9891msgstr "git目录"
ef317cd5 9892
06991777 9893#: builtin/clone.c:137 builtin/init-db.c:488
ef317cd5 9894msgid "separate git dir from working tree"
07432cef 9895msgstr "git目录和工作区分离"
ef317cd5 9896
06991777 9897#: builtin/clone.c:138
ef317cd5 9898msgid "key=value"
07432cef 9899msgstr "key=value"
ef317cd5 9900
06991777 9901#: builtin/clone.c:139
ef317cd5 9902msgid "set config inside the new repository"
160fb2b2 9903msgstr "在新仓库中设置配置信息"
ef317cd5 9904
06991777
JX
9905#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:231
9906#: builtin/push.c:586
276ceeaa
JX
9907msgid "use IPv4 addresses only"
9908msgstr "只使用 IPv4 地址"
9909
06991777
JX
9910#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:234
9911#: builtin/push.c:588
276ceeaa
JX
9912msgid "use IPv6 addresses only"
9913msgstr "只使用 IPv6 地址"
9914
06991777 9915#: builtin/clone.c:280
3495628d
JX
9916msgid ""
9917"No directory name could be guessed.\n"
9918"Please specify a directory on the command line"
9919msgstr ""
9920"无法猜到目录名。\n"
26e4cbec 9921"请在命令行指定一个目录"
3495628d 9922
06991777 9923#: builtin/clone.c:333
cfff71a9 9924#, c-format
a0b6b246
JX
9925msgid "info: Could not add alternate for '%s': %s\n"
9926msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
cfff71a9 9927
06991777 9928#: builtin/clone.c:405
5c57d762
JX
9929#, c-format
9930msgid "failed to open '%s'"
c1ac5258 9931msgstr "打开 '%s' 失败"
5c57d762 9932
06991777 9933#: builtin/clone.c:413
c04f5ac3
JX
9934#, c-format
9935msgid "%s exists and is not a directory"
9936msgstr "%s 存在且不是一个目录"
9937
06991777 9938#: builtin/clone.c:427
c04f5ac3
JX
9939#, c-format
9940msgid "failed to stat %s\n"
65e2041e 9941msgstr "对 %s 调用 stat 失败\n"
c04f5ac3 9942
06991777 9943#: builtin/clone.c:444
4c27fcb5
JX
9944#, c-format
9945msgid "failed to unlink '%s'"
9946msgstr "删除 '%s' 失败"
9947
06991777 9948#: builtin/clone.c:449
c04f5ac3
JX
9949#, c-format
9950msgid "failed to create link '%s'"
c1ac5258 9951msgstr "创建链接 '%s' 失败"
c04f5ac3 9952
06991777 9953#: builtin/clone.c:453
c04f5ac3
JX
9954#, c-format
9955msgid "failed to copy file to '%s'"
c1ac5258 9956msgstr "拷贝文件至 '%s' 失败"
c04f5ac3 9957
06991777 9958#: builtin/clone.c:479
c04f5ac3
JX
9959#, c-format
9960msgid "done.\n"
9961msgstr "完成。\n"
9962
06991777 9963#: builtin/clone.c:493
1003b3a5
JX
9964msgid ""
9965"Clone succeeded, but checkout failed.\n"
9966"You can inspect what was checked out with 'git status'\n"
9967"and retry the checkout with 'git checkout -f HEAD'\n"
9968msgstr ""
9969"克隆成功,但是检出失败。\n"
9970"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
9971"'git checkout -f HEAD' 重试\n"
9972
06991777 9973#: builtin/clone.c:570
c04f5ac3
JX
9974#, c-format
9975msgid "Could not find remote branch %s to clone."
90e6ef53 9976msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 9977
06991777 9978#: builtin/clone.c:687
3495628d
JX
9979#, c-format
9980msgid "unable to update %s"
9981msgstr "不能更新 %s"
9982
06991777 9983#: builtin/clone.c:737
c04f5ac3
JX
9984msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
9985msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
9986
06991777 9987#: builtin/clone.c:768
1003b3a5
JX
9988msgid "unable to checkout working tree"
9989msgstr "不能检出工作区"
9990
06991777 9991#: builtin/clone.c:813
3495628d
JX
9992msgid "unable to write parameters to config file"
9993msgstr "无法将参数写入配置文件"
9994
06991777 9995#: builtin/clone.c:876
04cb2f28
JX
9996msgid "cannot repack to clean up"
9997msgstr "无法执行 repack 来清理"
9998
06991777 9999#: builtin/clone.c:878
04cb2f28
JX
10000msgid "cannot unlink temporary alternates file"
10001msgstr "无法删除临时的 alternates 文件"
10002
06991777 10003#: builtin/clone.c:918 builtin/receive-pack.c:1941
c04f5ac3
JX
10004msgid "Too many arguments."
10005msgstr "太多参数。"
10006
06991777 10007#: builtin/clone.c:922
c04f5ac3 10008msgid "You must specify a repository to clone."
160fb2b2 10009msgstr "您必须指定一个仓库来克隆。"
c04f5ac3 10010
06991777 10011#: builtin/clone.c:935
c04f5ac3
JX
10012#, c-format
10013msgid "--bare and --origin %s options are incompatible."
10014msgstr "--bare 和 --origin %s 选项不兼容。"
10015
06991777 10016#: builtin/clone.c:938
07432cef
WS
10017msgid "--bare and --separate-git-dir are incompatible."
10018msgstr "--bare 和 --separate-git-dir 选项不兼容。"
10019
06991777 10020#: builtin/clone.c:951
c04f5ac3
JX
10021#, c-format
10022msgid "repository '%s' does not exist"
160fb2b2 10023msgstr "仓库 '%s' 不存在"
c04f5ac3 10024
06991777 10025#: builtin/clone.c:957 builtin/fetch.c:1608
cfff71a9
JX
10026#, c-format
10027msgid "depth %s is not a positive number"
10028msgstr "深度 %s 不是一个正数"
10029
06991777 10030#: builtin/clone.c:967
c04f5ac3
JX
10031#, c-format
10032msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 10033msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 10034
06991777 10035#: builtin/clone.c:977
c04f5ac3
JX
10036#, c-format
10037msgid "working tree '%s' already exists."
10038msgstr "工作区 '%s' 已经存在。"
10039
06991777
JX
10040#: builtin/clone.c:992 builtin/clone.c:1013 builtin/difftool.c:272
10041#: builtin/worktree.c:296 builtin/worktree.c:326
5bb01d4f
JX
10042#, c-format
10043msgid "could not create leading directories of '%s'"
10044msgstr "不能为 '%s' 创建先导目录"
10045
06991777 10046#: builtin/clone.c:997
c04f5ac3 10047#, c-format
814ff314
JX
10048msgid "could not create work tree dir '%s'"
10049msgstr "不能创建工作区目录 '%s'"
c04f5ac3 10050
06991777 10051#: builtin/clone.c:1017
c04f5ac3
JX
10052#, c-format
10053msgid "Cloning into bare repository '%s'...\n"
160fb2b2 10054msgstr "克隆到纯仓库 '%s'...\n"
c04f5ac3 10055
06991777 10056#: builtin/clone.c:1019
c04f5ac3
JX
10057#, c-format
10058msgid "Cloning into '%s'...\n"
10059msgstr "正克隆到 '%s'...\n"
10060
06991777 10061#: builtin/clone.c:1043
a0b6b246
JX
10062msgid ""
10063"clone --recursive is not compatible with both --reference and --reference-if-"
10064"able"
10065msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
10066
06991777 10067#: builtin/clone.c:1104
6acbf033 10068msgid "--depth is ignored in local clones; use file:// instead."
a0b6b246
JX
10069msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
10070
06991777 10071#: builtin/clone.c:1106
a0b6b246
JX
10072msgid "--shallow-since is ignored in local clones; use file:// instead."
10073msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
6acbf033 10074
06991777 10075#: builtin/clone.c:1108
a0b6b246
JX
10076msgid "--shallow-exclude is ignored in local clones; use file:// instead."
10077msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
10078
06991777 10079#: builtin/clone.c:1110
31e5e17b
JX
10080msgid "--filter is ignored in local clones; use file:// instead."
10081msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。"
10082
06991777 10083#: builtin/clone.c:1113
6acbf033 10084msgid "source repository is shallow, ignoring --local"
160fb2b2 10085msgstr "源仓库是浅克隆,忽略 --local"
6acbf033 10086
06991777 10087#: builtin/clone.c:1118
6acbf033
JX
10088msgid "--local is ignored"
10089msgstr "--local 被忽略"
10090
06991777 10091#: builtin/clone.c:1192 builtin/clone.c:1200
c04f5ac3
JX
10092#, c-format
10093msgid "Remote branch %s not found in upstream %s"
10094msgstr "远程分支 %s 在上游 %s 未发现"
10095
06991777 10096#: builtin/clone.c:1203
c04f5ac3 10097msgid "You appear to have cloned an empty repository."
160fb2b2 10098msgstr "您似乎克隆了一个空仓库。"
c04f5ac3 10099
a4f16749 10100#: builtin/column.c:10
814ff314
JX
10101msgid "git column [<options>]"
10102msgstr "git column [<选项>]"
ef317cd5 10103
a4f16749 10104#: builtin/column.c:27
ef317cd5 10105msgid "lookup config vars"
07432cef 10106msgstr "查找配置变量"
ef317cd5 10107
a4f16749 10108#: builtin/column.c:28 builtin/column.c:29
ef317cd5 10109msgid "layout to use"
07432cef 10110msgstr "要使用的布局"
ef317cd5 10111
a4f16749 10112#: builtin/column.c:30
ef317cd5 10113msgid "Maximum width"
07432cef 10114msgstr "最大宽度"
ef317cd5 10115
a4f16749 10116#: builtin/column.c:31
ef317cd5 10117msgid "Padding space on left border"
07432cef 10118msgstr "左边框的填充空间"
ef317cd5 10119
a4f16749 10120#: builtin/column.c:32
ef317cd5 10121msgid "Padding space on right border"
07432cef 10122msgstr "右边框的填充空间"
ef317cd5 10123
a4f16749 10124#: builtin/column.c:33
ef317cd5 10125msgid "Padding space between columns"
07432cef 10126msgstr "两列之间的填充空间"
ef317cd5 10127
fd8cb379 10128#: builtin/column.c:51
8ada9598 10129msgid "--command must be the first argument"
81809b99 10130msgstr "--command 必须是第一个参数"
8ada9598 10131
06991777 10132#: builtin/commit.c:41
814ff314 10133msgid "git commit [<options>] [--] <pathspec>..."
160fb2b2 10134msgstr "git commit [<选项>] [--] <路径规格>..."
ef317cd5 10135
06991777 10136#: builtin/commit.c:46
814ff314 10137msgid "git status [<options>] [--] <pathspec>..."
160fb2b2 10138msgstr "git status [<选项>] [--] <路径规格>..."
ef317cd5 10139
06991777 10140#: builtin/commit.c:51
c04f5ac3
JX
10141msgid ""
10142"You asked to amend the most recent commit, but doing so would make\n"
10143"it empty. You can repeat your command with --allow-empty, or you can\n"
10144"remove the commit entirely with \"git reset HEAD^\".\n"
10145msgstr ""
1b150dc9
T
10146"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
10147"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 10148
06991777 10149#: builtin/commit.c:56
c04f5ac3
JX
10150msgid ""
10151"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
10152"If you wish to commit it anyway, use:\n"
10153"\n"
10154" git commit --allow-empty\n"
10155"\n"
c04f5ac3 10156msgstr ""
a9ce4543
T
10157"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
10158"也要提交,使用命令:\n"
c04f5ac3
JX
10159"\n"
10160" git commit --allow-empty\n"
10161"\n"
c04f5ac3 10162
06991777 10163#: builtin/commit.c:63
b1894384
JX
10164msgid "Otherwise, please use 'git reset'\n"
10165msgstr "否则,请使用命令 'git reset'\n"
10166
06991777 10167#: builtin/commit.c:66
b1894384
JX
10168msgid ""
10169"If you wish to skip this commit, use:\n"
10170"\n"
10171" git reset\n"
10172"\n"
10173"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
10174"the remaining commits.\n"
10175msgstr ""
10176"如果您想跳过这个提交,使用命令:\n"
10177"\n"
10178" git reset\n"
10179"\n"
10180"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
10181"操作。\n"
10182
06991777 10183#: builtin/commit.c:312
c04f5ac3 10184msgid "failed to unpack HEAD tree object"
c1ac5258 10185msgstr "解包 HEAD 树对象失败"
c04f5ac3 10186
06991777 10187#: builtin/commit.c:353
c04f5ac3 10188msgid "unable to create temporary index"
90e6ef53 10189msgstr "不能创建临时索引"
c04f5ac3 10190
06991777 10191#: builtin/commit.c:359
c04f5ac3
JX
10192msgid "interactive add failed"
10193msgstr "交互式添加失败"
10194
06991777 10195#: builtin/commit.c:373
220c313c
JX
10196msgid "unable to update temporary index"
10197msgstr "无法更新临时索引"
10198
06991777 10199#: builtin/commit.c:375
220c313c
JX
10200msgid "Failed to update main cache tree"
10201msgstr "不能更新树的主缓存"
10202
06991777 10203#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
c04f5ac3 10204msgid "unable to write new_index file"
90e6ef53 10205msgstr "无法写 new_index 文件"
c04f5ac3 10206
06991777 10207#: builtin/commit.c:452
8ada9598 10208msgid "cannot do a partial commit during a merge."
81809b99 10209msgstr "在合并过程中不能做部分提交。"
c04f5ac3 10210
06991777 10211#: builtin/commit.c:454
8ada9598 10212msgid "cannot do a partial commit during a cherry-pick."
81809b99 10213msgstr "在拣选过程中不能做部分提交。"
8ada9598 10214
06991777 10215#: builtin/commit.c:462
c04f5ac3 10216msgid "cannot read the index"
90e6ef53 10217msgstr "无法读取索引"
c04f5ac3 10218
06991777 10219#: builtin/commit.c:481
c04f5ac3 10220msgid "unable to write temporary index file"
90e6ef53 10221msgstr "无法写临时索引文件"
c04f5ac3 10222
06991777 10223#: builtin/commit.c:579
220c313c
JX
10224#, c-format
10225msgid "commit '%s' lacks author header"
10226msgstr "提交 '%s' 缺少作者信息"
10227
06991777 10228#: builtin/commit.c:581
c04f5ac3 10229#, c-format
220c313c 10230msgid "commit '%s' has malformed author line"
fd8cb379 10231msgstr "提交 '%s' 有格式错误的作者信息"
c04f5ac3 10232
06991777 10233#: builtin/commit.c:600
c04f5ac3 10234msgid "malformed --author parameter"
fd8cb379 10235msgstr "格式错误的 --author 参数"
c04f5ac3 10236
06991777 10237#: builtin/commit.c:652
6acbf033
JX
10238msgid ""
10239"unable to select a comment character that is not used\n"
10240"in the current commit message"
10241msgstr "无法选择一个未被当前提交说明使用的注释字符"
10242
06991777 10243#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1052
c04f5ac3
JX
10244#, c-format
10245msgid "could not lookup commit %s"
10246msgstr "不能查询提交 %s"
10247
06991777 10248#: builtin/commit.c:701 builtin/shortlog.c:319
c04f5ac3
JX
10249#, c-format
10250msgid "(reading log message from standard input)\n"
90e6ef53 10251msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 10252
06991777 10253#: builtin/commit.c:703
c04f5ac3 10254msgid "could not read log from standard input"
90e6ef53 10255msgstr "不能从标准输入中读取日志信息"
c04f5ac3 10256
06991777 10257#: builtin/commit.c:707
c04f5ac3
JX
10258#, c-format
10259msgid "could not read log file '%s'"
90e6ef53 10260msgstr "不能读取日志文件 '%s'"
c04f5ac3 10261
06991777 10262#: builtin/commit.c:736 builtin/commit.c:744
c04f5ac3 10263msgid "could not read SQUASH_MSG"
90e6ef53 10264msgstr "不能读取 SQUASH_MSG"
c04f5ac3 10265
06991777 10266#: builtin/commit.c:741
5b04ee3b
JX
10267msgid "could not read MERGE_MSG"
10268msgstr "不能读取 MERGE_MSG"
10269
06991777 10270#: builtin/commit.c:795
c04f5ac3 10271msgid "could not write commit template"
90e6ef53 10272msgstr "不能写提交模版"
c04f5ac3 10273
06991777 10274#: builtin/commit.c:813
81809b99 10275#, c-format
c04f5ac3
JX
10276msgid ""
10277"\n"
8ada9598 10278"It looks like you may be committing a merge.\n"
c04f5ac3
JX
10279"If this is not correct, please remove the file\n"
10280"\t%s\n"
10281"and try again.\n"
10282msgstr ""
10283"\n"
649900bc 10284"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
10285"\t%s\n"
10286"然后重试。\n"
10287
06991777 10288#: builtin/commit.c:818
81809b99 10289#, c-format
8ada9598
JX
10290msgid ""
10291"\n"
10292"It looks like you may be committing a cherry-pick.\n"
10293"If this is not correct, please remove the file\n"
10294"\t%s\n"
10295"and try again.\n"
10296msgstr ""
10297"\n"
649900bc 10298"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
10299"\t%s\n"
10300"然后重试。\n"
c04f5ac3 10301
06991777 10302#: builtin/commit.c:831
a77c07d9 10303#, c-format
c04f5ac3 10304msgid ""
8ada9598 10305"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 10306"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 10307msgstr ""
a77c07d9 10308"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 10309"说明将会终止提交。\n"
c04f5ac3 10310
06991777 10311#: builtin/commit.c:839
a77c07d9 10312#, c-format
c04f5ac3 10313msgid ""
8ada9598 10314"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 10315"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
10316"An empty message aborts the commit.\n"
10317msgstr ""
a77c07d9
JX
10318"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
10319"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 10320
90e6ef53 10321# 译者:为保证在输出中对齐,注意调整句中空格!
06991777 10322#: builtin/commit.c:856
6acbf033
JX
10323#, c-format
10324msgid "%sAuthor: %.*s <%.*s>"
10325msgstr "%s作者: %.*s <%.*s>"
10326
10327# 译者:为保证在输出中对齐,注意调整句中空格!
06991777 10328#: builtin/commit.c:864
c04f5ac3 10329#, c-format
6acbf033
JX
10330msgid "%sDate: %s"
10331msgstr "%s日期: %s"
c04f5ac3 10332
90e6ef53 10333# 译者:为保证在输出中对齐,注意调整句中空格!
06991777 10334#: builtin/commit.c:871
c04f5ac3 10335#, c-format
6acbf033
JX
10336msgid "%sCommitter: %.*s <%.*s>"
10337msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 10338
06991777 10339#: builtin/commit.c:889
c04f5ac3 10340msgid "Cannot read index"
90e6ef53 10341msgstr "无法读取索引"
c04f5ac3 10342
06991777 10343#: builtin/commit.c:956
c04f5ac3
JX
10344msgid "Error building trees"
10345msgstr "无法创建树对象"
10346
06991777 10347#: builtin/commit.c:970 builtin/tag.c:258
c04f5ac3
JX
10348#, c-format
10349msgid "Please supply the message using either -m or -F option.\n"
07432cef 10350msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 10351
06991777 10352#: builtin/commit.c:1014
c04f5ac3 10353#, c-format
814ff314 10354msgid "--author '%s' is not 'Name <email>' and matches no existing author"
58b6f078 10355msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配"
c04f5ac3 10356
06991777 10357#: builtin/commit.c:1028
5809aa05
JX
10358#, c-format
10359msgid "Invalid ignored mode '%s'"
10360msgstr "无效的忽略模式 '%s'"
10361
06991777 10362#: builtin/commit.c:1042 builtin/commit.c:1279
c04f5ac3
JX
10363#, c-format
10364msgid "Invalid untracked files mode '%s'"
90e6ef53 10365msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 10366
06991777 10367#: builtin/commit.c:1080
2e8451e8
JX
10368msgid "--long and -z are incompatible"
10369msgstr "--long 和 -z 选项不兼容"
10370
06991777 10371#: builtin/commit.c:1113
c04f5ac3
JX
10372msgid "Using both --reset-author and --author does not make sense"
10373msgstr "同时使用 --reset-author 和 --author 没有意义"
10374
06991777 10375#: builtin/commit.c:1122
c04f5ac3 10376msgid "You have nothing to amend."
90e6ef53 10377msgstr "您没有可修补的提交。"
c04f5ac3 10378
06991777 10379#: builtin/commit.c:1125
8ada9598 10380msgid "You are in the middle of a merge -- cannot amend."
81809b99 10381msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 10382
06991777 10383#: builtin/commit.c:1127
8ada9598 10384msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 10385msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 10386
06991777 10387#: builtin/commit.c:1130
c04f5ac3 10388msgid "Options --squash and --fixup cannot be used together"
649900bc 10389msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 10390
06991777 10391#: builtin/commit.c:1140
c04f5ac3
JX
10392msgid "Only one of -c/-C/-F/--fixup can be used."
10393msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
10394
06991777 10395#: builtin/commit.c:1142
31e5e17b
JX
10396msgid "Option -m cannot be combined with -c/-C/-F."
10397msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
c04f5ac3 10398
06991777 10399#: builtin/commit.c:1150
c04f5ac3 10400msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 10401msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 10402
06991777 10403#: builtin/commit.c:1167
c04f5ac3
JX
10404msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
10405msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
10406
06991777 10407#: builtin/commit.c:1169
c04f5ac3
JX
10408msgid "No paths with --include/--only does not make sense."
10409msgstr "参数 --include/--only 不跟路径没有意义。"
10410
06991777 10411#: builtin/commit.c:1183 builtin/tag.c:546
c04f5ac3
JX
10412#, c-format
10413msgid "Invalid cleanup mode %s"
10414msgstr "无效的清理模式 %s"
10415
06991777 10416#: builtin/commit.c:1188
c04f5ac3 10417msgid "Paths with -a does not make sense."
649900bc 10418msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 10419
06991777 10420#: builtin/commit.c:1314 builtin/commit.c:1498
ef317cd5 10421msgid "show status concisely"
07432cef 10422msgstr "以简洁的格式显示状态"
ef317cd5 10423
06991777 10424#: builtin/commit.c:1316 builtin/commit.c:1500
ef317cd5 10425msgid "show branch information"
07432cef 10426msgstr "显示分支信息"
ef317cd5 10427
06991777 10428#: builtin/commit.c:1318
a4f16749
JX
10429msgid "show stash information"
10430msgstr "显示贮藏区信息"
10431
06991777 10432#: builtin/commit.c:1320 builtin/commit.c:1502
31e5e17b
JX
10433msgid "compute full ahead/behind values"
10434msgstr "计算完整的领先/落后值"
10435
06991777 10436#: builtin/commit.c:1322
a0b6b246
JX
10437msgid "version"
10438msgstr "版本"
10439
06991777
JX
10440#: builtin/commit.c:1322 builtin/commit.c:1504 builtin/push.c:561
10441#: builtin/worktree.c:640
ef317cd5 10442msgid "machine-readable output"
07432cef
WS
10443msgstr "机器可读的输出"
10444
06991777 10445#: builtin/commit.c:1325 builtin/commit.c:1506
07432cef
WS
10446msgid "show status in long format (default)"
10447msgstr "以长格式显示状态(默认)"
ef317cd5 10448
06991777 10449#: builtin/commit.c:1328 builtin/commit.c:1509
ef317cd5 10450msgid "terminate entries with NUL"
4375c10e 10451msgstr "条目以 NUL 字符结尾"
ef317cd5 10452
06991777
JX
10453#: builtin/commit.c:1330 builtin/commit.c:1334 builtin/commit.c:1512
10454#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1118
4c27fcb5 10455#: builtin/tag.c:400
ef317cd5 10456msgid "mode"
07432cef 10457msgstr "模式"
ef317cd5 10458
06991777 10459#: builtin/commit.c:1331 builtin/commit.c:1512
ef317cd5 10460msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 10461msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 10462
06991777 10463#: builtin/commit.c:1335
5809aa05
JX
10464msgid ""
10465"show ignored files, optional modes: traditional, matching, no. (Default: "
10466"traditional)"
31e5e17b
JX
10467msgstr ""
10468"显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)"
ef317cd5 10469
06991777 10470#: builtin/commit.c:1337 parse-options.h:164
ef317cd5
JX
10471msgid "when"
10472msgstr "何时"
10473
06991777 10474#: builtin/commit.c:1338
ef317cd5
JX
10475msgid ""
10476"ignore changes to submodules, optional when: all, dirty, untracked. "
10477"(Default: all)"
10478msgstr ""
07432cef 10479"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 10480
06991777 10481#: builtin/commit.c:1340
ef317cd5 10482msgid "list untracked files in columns"
07432cef 10483msgstr "以列的方式显示未跟踪的文件"
ef317cd5 10484
06991777 10485#: builtin/commit.c:1341
fd8cb379
JX
10486msgid "do not detect renames"
10487msgstr "不检测重命名"
10488
06991777 10489#: builtin/commit.c:1343
fd8cb379
JX
10490msgid "detect renames, optionally set similarity index"
10491msgstr "检测重命名,可以设置索引相似度"
10492
06991777 10493#: builtin/commit.c:1363
5809aa05
JX
10494msgid "Unsupported combination of ignored and untracked-files arguments"
10495msgstr "不支持已忽略和未跟踪文件参数的组合"
10496
06991777 10497#: builtin/commit.c:1468
ef317cd5 10498msgid "suppress summary after successful commit"
07432cef 10499msgstr "提交成功后不显示概述信息"
c04f5ac3 10500
06991777 10501#: builtin/commit.c:1469
ef317cd5 10502msgid "show diff in commit message template"
07432cef 10503msgstr "在提交说明模板里显示差异"
c04f5ac3 10504
06991777 10505#: builtin/commit.c:1471
ef317cd5 10506msgid "Commit message options"
07432cef 10507msgstr "提交说明选项"
c04f5ac3 10508
06991777 10509#: builtin/commit.c:1472 builtin/merge.c:264 builtin/tag.c:397
ef317cd5 10510msgid "read message from file"
07432cef 10511msgstr "从文件中读取提交说明"
c04f5ac3 10512
06991777 10513#: builtin/commit.c:1473
ef317cd5 10514msgid "author"
07432cef 10515msgstr "作者"
c04f5ac3 10516
06991777 10517#: builtin/commit.c:1473
ef317cd5 10518msgid "override author for commit"
07432cef 10519msgstr "提交时覆盖作者"
73a60cd2 10520
06991777 10521#: builtin/commit.c:1474 builtin/gc.c:518
ef317cd5 10522msgid "date"
07432cef 10523msgstr "日期"
c04f5ac3 10524
06991777 10525#: builtin/commit.c:1474
ef317cd5 10526msgid "override date for commit"
07432cef 10527msgstr "提交时覆盖日期"
c04f5ac3 10528
06991777
JX
10529#: builtin/commit.c:1475 builtin/merge.c:260 builtin/notes.c:409
10530#: builtin/notes.c:575 builtin/tag.c:395
ef317cd5 10531msgid "message"
07432cef 10532msgstr "说明"
c04f5ac3 10533
06991777 10534#: builtin/commit.c:1475
ef317cd5 10535msgid "commit message"
07432cef 10536msgstr "提交说明"
ef317cd5 10537
06991777
JX
10538#: builtin/commit.c:1476 builtin/commit.c:1477 builtin/commit.c:1478
10539#: builtin/commit.c:1479 parse-options.h:278 ref-filter.h:92
94550ed3
JX
10540msgid "commit"
10541msgstr "提交"
10542
06991777 10543#: builtin/commit.c:1476
ef317cd5 10544msgid "reuse and edit message from specified commit"
07432cef 10545msgstr "重用并编辑指定提交的提交说明"
ef317cd5 10546
06991777 10547#: builtin/commit.c:1477
ef317cd5 10548msgid "reuse message from specified commit"
07432cef 10549msgstr "重用指定提交的提交说明"
ef317cd5 10550
06991777 10551#: builtin/commit.c:1478
ef317cd5 10552msgid "use autosquash formatted message to fixup specified commit"
07432cef 10553msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 10554
06991777 10555#: builtin/commit.c:1479
ef317cd5 10556msgid "use autosquash formatted message to squash specified commit"
07432cef 10557msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 10558
06991777 10559#: builtin/commit.c:1480
ef317cd5 10560msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 10561msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 10562
06991777
JX
10563#: builtin/commit.c:1481 builtin/log.c:1533 builtin/merge.c:277
10564#: builtin/pull.c:156 builtin/revert.c:107
ef317cd5 10565msgid "add Signed-off-by:"
07432cef 10566msgstr "添加 Signed-off-by: 签名"
ef317cd5 10567
06991777 10568#: builtin/commit.c:1482
ef317cd5 10569msgid "use specified template file"
07432cef 10570msgstr "使用指定的模板文件"
ef317cd5 10571
06991777 10572#: builtin/commit.c:1483
ef317cd5 10573msgid "force edit of commit"
07432cef 10574msgstr "强制编辑提交"
ef317cd5 10575
07432cef 10576# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
06991777 10577#: builtin/commit.c:1484
ef317cd5 10578msgid "default"
07432cef 10579msgstr "default"
ef317cd5 10580
06991777 10581#: builtin/commit.c:1484 builtin/tag.c:401
ef317cd5 10582msgid "how to strip spaces and #comments from message"
07432cef 10583msgstr "设置如何删除提交说明里的空格和#注释"
ef317cd5 10584
06991777 10585#: builtin/commit.c:1485
ef317cd5 10586msgid "include status in commit message template"
07432cef 10587msgstr "在提交说明模板里包含状态信息"
ef317cd5 10588
06991777
JX
10589#: builtin/commit.c:1487 builtin/merge.c:275 builtin/pull.c:186
10590#: builtin/revert.c:115
ef317cd5 10591msgid "GPG sign commit"
07432cef 10592msgstr "GPG 提交签名"
ef317cd5 10593
06991777 10594#: builtin/commit.c:1490
ef317cd5 10595msgid "Commit contents options"
07432cef 10596msgstr "提交内容选项"
ef317cd5 10597
06991777 10598#: builtin/commit.c:1491
ef317cd5 10599msgid "commit all changed files"
07432cef 10600msgstr "提交所有改动的文件"
ef317cd5 10601
06991777 10602#: builtin/commit.c:1492
ef317cd5 10603msgid "add specified files to index for commit"
07432cef 10604msgstr "添加指定的文件到索引区等待提交"
ef317cd5 10605
06991777 10606#: builtin/commit.c:1493
ef317cd5 10607msgid "interactively add files"
07432cef 10608msgstr "交互式添加文件"
ef317cd5 10609
06991777 10610#: builtin/commit.c:1494
ef317cd5 10611msgid "interactively add changes"
07432cef 10612msgstr "交互式添加变更"
ef317cd5 10613
06991777 10614#: builtin/commit.c:1495
ef317cd5 10615msgid "commit only specified files"
07432cef 10616msgstr "只提交指定的文件"
ef317cd5 10617
06991777 10618#: builtin/commit.c:1496
5c57d762
JX
10619msgid "bypass pre-commit and commit-msg hooks"
10620msgstr "绕过 pre-commit 和 commit-msg 钩子"
10621
06991777 10622#: builtin/commit.c:1497
ef317cd5 10623msgid "show what would be committed"
07432cef 10624msgstr "显示将要提交的内容"
ef317cd5 10625
06991777 10626#: builtin/commit.c:1510
ef317cd5 10627msgid "amend previous commit"
07432cef 10628msgstr "修改先前的提交"
ef317cd5 10629
06991777 10630#: builtin/commit.c:1511
ef317cd5 10631msgid "bypass post-rewrite hook"
07432cef 10632msgstr "绕过 post-rewrite 钩子"
ef317cd5 10633
06991777 10634#: builtin/commit.c:1516
ef317cd5 10635msgid "ok to record an empty change"
07432cef 10636msgstr "允许一个空提交"
ef317cd5 10637
06991777 10638#: builtin/commit.c:1518
ef317cd5 10639msgid "ok to record a change with an empty message"
07432cef 10640msgstr "允许空的提交说明"
ef317cd5 10641
06991777 10642#: builtin/commit.c:1591
c04f5ac3
JX
10643#, c-format
10644msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 10645msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 10646
06991777 10647#: builtin/commit.c:1598
c04f5ac3 10648msgid "could not read MERGE_MODE"
90e6ef53 10649msgstr "不能读取 MERGE_MODE"
c04f5ac3 10650
06991777 10651#: builtin/commit.c:1617
c04f5ac3
JX
10652#, c-format
10653msgid "could not read commit message: %s"
90e6ef53 10654msgstr "不能读取提交说明:%s"
c04f5ac3 10655
06991777 10656#: builtin/commit.c:1628
c04f5ac3
JX
10657#, c-format
10658msgid "Aborting commit due to empty commit message.\n"
10659msgstr "终止提交因为提交说明为空。\n"
10660
06991777 10661#: builtin/commit.c:1633
6937cb4e
JX
10662#, c-format
10663msgid "Aborting commit; you did not edit the message.\n"
10664msgstr "终止提交;您未更改来自模版的提交说明。\n"
10665
06991777 10666#: builtin/commit.c:1668
c04f5ac3 10667msgid ""
c1ac5258 10668"repository has been updated, but unable to write\n"
220c313c 10669"new_index file. Check that disk is not full and quota is\n"
c04f5ac3
JX
10670"not exceeded, and then \"git reset HEAD\" to recover."
10671msgstr ""
160fb2b2 10672"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
90e6ef53 10673"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 10674
c1ac5258 10675#: builtin/commit-graph.c:10
fd8cb379
JX
10676msgid "git commit-graph [--object-dir <objdir>]"
10677msgstr "git commit-graph [--object-dir <对象目录>]"
10678
c1ac5258 10679#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
fd8cb379
JX
10680msgid "git commit-graph read [--object-dir <objdir>]"
10681msgstr "git commit-graph read [--object-dir <对象目录>]"
10682
c1ac5258
JX
10683#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
10684msgid "git commit-graph verify [--object-dir <objdir>]"
10685msgstr "git commit-graph verify [--object-dir <对象目录>]"
10686
10687#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
fd8cb379 10688msgid ""
c1ac5258
JX
10689"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--"
10690"stdin-packs|--stdin-commits]"
fd8cb379 10691msgstr ""
c1ac5258
JX
10692"git commit-graph write [--object-dir <对象目录>] [--append] [--reachable|--"
10693"stdin-packs|--stdin-commits]"
fd8cb379 10694
4c27fcb5
JX
10695#: builtin/commit-graph.c:48 builtin/commit-graph.c:78
10696#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153
06991777 10697#: builtin/log.c:1553
fd8cb379
JX
10698msgid "dir"
10699msgstr "目录"
10700
4c27fcb5
JX
10701#: builtin/commit-graph.c:49 builtin/commit-graph.c:79
10702#: builtin/commit-graph.c:133 builtin/commit-graph.c:191
fd8cb379
JX
10703msgid "The object directory to store the graph"
10704msgstr "保存图形的对象目录"
10705
4c27fcb5 10706#: builtin/commit-graph.c:135
c1ac5258
JX
10707msgid "start walk at all refs"
10708msgstr "开始遍历所有引用"
10709
4c27fcb5 10710#: builtin/commit-graph.c:137
fd8cb379
JX
10711msgid "scan pack-indexes listed by stdin for commits"
10712msgstr "从标准输入中的包索引文件列表中扫描提交"
10713
4c27fcb5 10714#: builtin/commit-graph.c:139
fd8cb379
JX
10715msgid "start walk at commits listed by stdin"
10716msgstr "从标准输入中的提交开始扫描"
10717
4c27fcb5 10718#: builtin/commit-graph.c:141
fd8cb379
JX
10719msgid "include all commits already in the commit-graph file"
10720msgstr "包含 commit-graph 文件中已有所有提交"
10721
4c27fcb5 10722#: builtin/commit-graph.c:150
c1ac5258
JX
10723msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
10724msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
fd8cb379 10725
4c27fcb5 10726#: builtin/config.c:11
814ff314
JX
10727msgid "git config [<options>]"
10728msgstr "git config [<选项>]"
ef317cd5 10729
4c27fcb5 10730#: builtin/config.c:103
fd8cb379
JX
10731#, c-format
10732msgid "unrecognized --type argument, %s"
10733msgstr "未能识别的 --type 参数,%s"
10734
4c27fcb5 10735#: builtin/config.c:115
c1ac5258
JX
10736msgid "only one type at a time"
10737msgstr "一次只能一个类型"
10738
4c27fcb5 10739#: builtin/config.c:124
ef317cd5 10740msgid "Config file location"
07432cef 10741msgstr "配置文件位置"
ef317cd5 10742
4c27fcb5 10743#: builtin/config.c:125
ef317cd5 10744msgid "use global config file"
07432cef 10745msgstr "使用全局配置文件"
ef317cd5 10746
4c27fcb5 10747#: builtin/config.c:126
ef317cd5 10748msgid "use system config file"
07432cef 10749msgstr "使用系统级配置文件"
ef317cd5 10750
4c27fcb5 10751#: builtin/config.c:127
ef317cd5 10752msgid "use repository config file"
160fb2b2 10753msgstr "使用仓库级配置文件"
ef317cd5 10754
4c27fcb5
JX
10755#: builtin/config.c:128
10756msgid "use per-worktree config file"
10757msgstr "使用工作区级别的配置文件"
10758
10759#: builtin/config.c:129
ef317cd5 10760msgid "use given config file"
07432cef 10761msgstr "使用指定的配置文件"
ef317cd5 10762
4c27fcb5 10763#: builtin/config.c:130
2e8451e8 10764msgid "blob-id"
4375c10e 10765msgstr "数据对象 ID"
2e8451e8 10766
4c27fcb5 10767#: builtin/config.c:130
2e8451e8
JX
10768msgid "read config from given blob object"
10769msgstr "从给定的数据对象读取配置"
10770
4c27fcb5 10771#: builtin/config.c:131
ef317cd5 10772msgid "Action"
07432cef 10773msgstr "操作"
ef317cd5 10774
4c27fcb5 10775#: builtin/config.c:132
ef317cd5 10776msgid "get value: name [value-regex]"
07432cef 10777msgstr "获取值:name [value-regex]"
ef317cd5 10778
4c27fcb5 10779#: builtin/config.c:133
ef317cd5 10780msgid "get all values: key [value-regex]"
07432cef 10781msgstr "获得所有的值:key [value-regex]"
ef317cd5 10782
4c27fcb5 10783#: builtin/config.c:134
ef317cd5 10784msgid "get values for regexp: name-regex [value-regex]"
07432cef 10785msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 10786
4c27fcb5 10787#: builtin/config.c:135
90314792
JX
10788msgid "get value specific for the URL: section[.var] URL"
10789msgstr "获得 URL 取值:section[.var] URL"
10790
4c27fcb5 10791#: builtin/config.c:136
ef317cd5 10792msgid "replace all matching variables: name value [value_regex]"
07432cef 10793msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 10794
4c27fcb5 10795#: builtin/config.c:137
ef317cd5 10796msgid "add a new variable: name value"
07432cef 10797msgstr "添加一个新的变量:name value"
ef317cd5 10798
4c27fcb5 10799#: builtin/config.c:138
ef317cd5 10800msgid "remove a variable: name [value-regex]"
07432cef 10801msgstr "删除一个变量:name [value-regex]"
ef317cd5 10802
4c27fcb5 10803#: builtin/config.c:139
ef317cd5 10804msgid "remove all matches: name [value-regex]"
07432cef 10805msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 10806
4c27fcb5 10807#: builtin/config.c:140
ef317cd5 10808msgid "rename section: old-name new-name"
07432cef 10809msgstr "重命名小节:old-name new-name"
ef317cd5 10810
4c27fcb5 10811#: builtin/config.c:141
ef317cd5 10812msgid "remove a section: name"
07432cef 10813msgstr "删除一个小节:name"
ef317cd5 10814
4c27fcb5 10815#: builtin/config.c:142
ef317cd5 10816msgid "list all"
07432cef 10817msgstr "列出所有"
ef317cd5 10818
4c27fcb5 10819#: builtin/config.c:143
ef317cd5 10820msgid "open an editor"
07432cef 10821msgstr "打开一个编辑器"
ef317cd5 10822
4c27fcb5 10823#: builtin/config.c:144
04cb2f28
JX
10824msgid "find the color configured: slot [default]"
10825msgstr "获得配置的颜色:配置 [默认]"
ef317cd5 10826
4c27fcb5 10827#: builtin/config.c:145
04cb2f28
JX
10828msgid "find the color setting: slot [stdout-is-tty]"
10829msgstr "获得颜色设置:配置 [stdout-is-tty]"
ef317cd5 10830
4c27fcb5 10831#: builtin/config.c:146
ef317cd5 10832msgid "Type"
07432cef 10833msgstr "类型"
ef317cd5 10834
4c27fcb5 10835#: builtin/config.c:147
fd8cb379
JX
10836msgid "value is given this type"
10837msgstr "取值为该类型"
10838
4c27fcb5 10839#: builtin/config.c:148
ef317cd5 10840msgid "value is \"true\" or \"false\""
07432cef 10841msgstr "值是 \"true\" 或 \"false\""
ef317cd5 10842
4c27fcb5 10843#: builtin/config.c:149
ef317cd5 10844msgid "value is decimal number"
07432cef 10845msgstr "值是十进制数"
ef317cd5 10846
4c27fcb5 10847#: builtin/config.c:150
ef317cd5 10848msgid "value is --bool or --int"
07432cef 10849msgstr "值是 --bool or --int"
ef317cd5 10850
4c27fcb5 10851#: builtin/config.c:151
ef317cd5 10852msgid "value is a path (file or directory name)"
07432cef 10853msgstr "值是一个路径(文件或目录名)"
ef317cd5 10854
4c27fcb5 10855#: builtin/config.c:152
5809aa05
JX
10856msgid "value is an expiry date"
10857msgstr "值是一个到期日期"
10858
4c27fcb5 10859#: builtin/config.c:153
ef317cd5 10860msgid "Other"
07432cef 10861msgstr "其它"
ef317cd5 10862
4c27fcb5 10863#: builtin/config.c:154
ef317cd5 10864msgid "terminate values with NUL byte"
4375c10e 10865msgstr "终止值是 NUL 字节"
ef317cd5 10866
4c27fcb5 10867#: builtin/config.c:155
1b7f4a34
JX
10868msgid "show variable names only"
10869msgstr "只显示变量名"
10870
4c27fcb5 10871#: builtin/config.c:156
ef317cd5 10872msgid "respect include directives on lookup"
07432cef 10873msgstr "查询时参照 include 指令递归查找"
ef317cd5 10874
4c27fcb5 10875#: builtin/config.c:157
276ceeaa
JX
10876msgid "show origin of config (file, standard input, blob, command line)"
10877msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
10878
4c27fcb5 10879#: builtin/config.c:158
fd8cb379
JX
10880msgid "value"
10881msgstr "取值"
10882
4c27fcb5 10883#: builtin/config.c:158
fd8cb379
JX
10884msgid "with --get, use default value when missing entry"
10885msgstr "使用 --get 参数,当缺少设置时使用默认值"
10886
06991777 10887#: builtin/config.c:172
c1ac5258
JX
10888#, c-format
10889msgid "wrong number of arguments, should be %d"
10890msgstr "错误的参数个数,应该为 %d 个"
10891
06991777 10892#: builtin/config.c:174
c1ac5258
JX
10893#, c-format
10894msgid "wrong number of arguments, should be from %d to %d"
10895msgstr "错误的参数个数,应该为从 %d 个到 %d 个"
10896
06991777 10897#: builtin/config.c:308
c1ac5258
JX
10898#, c-format
10899msgid "invalid key pattern: %s"
10900msgstr "无效键名模式:%s"
10901
06991777 10902#: builtin/config.c:344
fd8cb379
JX
10903#, c-format
10904msgid "failed to format default config value: %s"
c1ac5258
JX
10905msgstr "格式化默认配置值失败:%s"
10906
06991777 10907#: builtin/config.c:401
c1ac5258
JX
10908#, c-format
10909msgid "cannot parse color '%s'"
10910msgstr "无法解析颜色 '%s'"
fd8cb379 10911
06991777 10912#: builtin/config.c:443
220c313c 10913msgid "unable to parse default color value"
c1ac5258
JX
10914msgstr "无法解析默认颜色值"
10915
06991777 10916#: builtin/config.c:496 builtin/config.c:742
c1ac5258
JX
10917msgid "not in a git directory"
10918msgstr "不在 git 仓库中"
10919
06991777 10920#: builtin/config.c:499
c1ac5258
JX
10921msgid "writing to stdin is not supported"
10922msgstr "不支持写到标准输入"
10923
06991777 10924#: builtin/config.c:502
c1ac5258
JX
10925msgid "writing config blobs is not supported"
10926msgstr "不支持写到配置数据对象"
220c313c 10927
06991777 10928#: builtin/config.c:587
220c313c
JX
10929#, c-format
10930msgid ""
10931"# This is Git's per-user configuration file.\n"
7aea43ff 10932"[user]\n"
220c313c 10933"# Please adapt and uncomment the following lines:\n"
7aea43ff 10934"#\tname = %s\n"
220c313c
JX
10935"#\temail = %s\n"
10936msgstr ""
10937"# This is Git's per-user configuration file.\n"
7aea43ff 10938"[user]\n"
220c313c 10939"# Please adapt and uncomment the following lines:\n"
7aea43ff 10940"#\tname = %s\n"
220c313c
JX
10941"#\temail = %s\n"
10942
06991777 10943#: builtin/config.c:611
c1ac5258
JX
10944msgid "only one config file at a time"
10945msgstr "一次只能有一个配置文件"
10946
06991777 10947#: builtin/config.c:616
a4f16749
JX
10948msgid "--local can only be used inside a git repository"
10949msgstr "--local 只能在一个仓库内使用"
10950
06991777 10951#: builtin/config.c:619
fd8cb379
JX
10952msgid "--blob can only be used inside a git repository"
10953msgstr "--blob 只能在一个仓库内使用"
10954
06991777 10955#: builtin/config.c:638
c1ac5258
JX
10956msgid "$HOME not set"
10957msgstr "$HOME 未设置"
10958
06991777 10959#: builtin/config.c:658
4c27fcb5
JX
10960msgid ""
10961"--worktree cannot be used with multiple working trees unless the config\n"
10962"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
10963"section in \"git help worktree\" for details"
10964msgstr ""
10965"不能和多个工作区一起使用 --worktree,除非启用 worktreeConfig 配置扩展。\n"
10966"详情请阅读“git help worktree”的“CONFIGURATION FILE”小节"
10967
06991777 10968#: builtin/config.c:688
c1ac5258
JX
10969msgid "--get-color and variable type are incoherent"
10970msgstr "--get-color 和变量类型不兼容"
10971
06991777 10972#: builtin/config.c:693
c1ac5258
JX
10973msgid "only one action at a time"
10974msgstr "一次只能有一个动作"
10975
06991777 10976#: builtin/config.c:706
c1ac5258
JX
10977msgid "--name-only is only applicable to --list or --get-regexp"
10978msgstr "--name-only 仅适用于 --list 或 --get-regexp"
10979
06991777 10980#: builtin/config.c:712
c1ac5258
JX
10981msgid ""
10982"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
10983"list"
10984msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
10985
06991777 10986#: builtin/config.c:718
c1ac5258
JX
10987msgid "--default is only applicable to --get"
10988msgstr "--default 仅适用于 --get"
10989
06991777 10990#: builtin/config.c:731
c1ac5258
JX
10991#, c-format
10992msgid "unable to read config file '%s'"
10993msgstr "无法读取配置文件 '%s'"
10994
06991777 10995#: builtin/config.c:734
c1ac5258
JX
10996msgid "error processing config file(s)"
10997msgstr "处理配置文件出错"
10998
06991777 10999#: builtin/config.c:744
c1ac5258
JX
11000msgid "editing stdin is not supported"
11001msgstr "不支持编辑标准输入"
11002
06991777 11003#: builtin/config.c:746
c1ac5258
JX
11004msgid "editing blobs is not supported"
11005msgstr "不支持编辑数据对象"
11006
06991777 11007#: builtin/config.c:760
220c313c
JX
11008#, c-format
11009msgid "cannot create configuration file %s"
11010msgstr "不能创建配置文件 %s"
11011
06991777 11012#: builtin/config.c:773
a0b6b246
JX
11013#, c-format
11014msgid ""
11015"cannot overwrite multiple values with a single value\n"
11016" Use a regexp, --add or --replace-all to change %s."
11017msgstr ""
11018"无法用一个值覆盖多个值\n"
11019" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
11020
06991777 11021#: builtin/config.c:847 builtin/config.c:858
c1ac5258
JX
11022#, c-format
11023msgid "no such section: %s"
11024msgstr "无此小节:%s"
11025
fd8cb379 11026#: builtin/count-objects.c:90
4dcdc3d8
JX
11027msgid "git count-objects [-v] [-H | --human-readable]"
11028msgstr "git count-objects [-v] [-H | --human-readable]"
11029
fd8cb379 11030#: builtin/count-objects.c:100
4dcdc3d8
JX
11031msgid "print sizes in human readable format"
11032msgstr "以用户可读的格式显示大小"
ef317cd5 11033
06991777 11034#: builtin/describe.c:27
814ff314
JX
11035msgid "git describe [<options>] [<commit-ish>...]"
11036msgstr "git describe [<选项>] [<提交号>...]"
ef317cd5 11037
06991777 11038#: builtin/describe.c:28
814ff314
JX
11039msgid "git describe [<options>] --dirty"
11040msgstr "git describe [<选项>] --dirty"
ef317cd5 11041
06991777 11042#: builtin/describe.c:63
87cb7997
JX
11043msgid "head"
11044msgstr "头"
11045
06991777 11046#: builtin/describe.c:63
87cb7997
JX
11047msgid "lightweight"
11048msgstr "轻量级的"
11049
06991777 11050#: builtin/describe.c:63
87cb7997
JX
11051msgid "annotated"
11052msgstr "附注的"
11053
06991777 11054#: builtin/describe.c:273
c04f5ac3
JX
11055#, c-format
11056msgid "annotated tag %s not available"
55a16ee4 11057msgstr "附注标签 %s 无效"
c04f5ac3 11058
06991777 11059#: builtin/describe.c:277
c04f5ac3
JX
11060#, c-format
11061msgid "annotated tag %s has no embedded name"
55a16ee4 11062msgstr "附注标签 %s 没有嵌入名称"
c04f5ac3 11063
06991777 11064#: builtin/describe.c:279
c04f5ac3
JX
11065#, c-format
11066msgid "tag '%s' is really '%s' here"
55a16ee4 11067msgstr "标签 '%s' 的确是在 '%s'"
c04f5ac3 11068
06991777 11069#: builtin/describe.c:323
c04f5ac3
JX
11070#, c-format
11071msgid "no tag exactly matches '%s'"
55a16ee4 11072msgstr "没有标签准确匹配 '%s'"
c04f5ac3 11073
06991777 11074#: builtin/describe.c:325
c04f5ac3 11075#, c-format
5809aa05
JX
11076msgid "No exact match on refs or tags, searching to describe\n"
11077msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n"
c04f5ac3 11078
06991777 11079#: builtin/describe.c:379
c04f5ac3
JX
11080#, c-format
11081msgid "finished search at %s\n"
11082msgstr "完成搜索 %s\n"
11083
06991777 11084#: builtin/describe.c:405
c04f5ac3
JX
11085#, c-format
11086msgid ""
11087"No annotated tags can describe '%s'.\n"
11088"However, there were unannotated tags: try --tags."
11089msgstr ""
55a16ee4
RC
11090"没有附注标签能描述 '%s'。\n"
11091"然而,存在未附注标签:尝试 --tags。"
c04f5ac3 11092
06991777 11093#: builtin/describe.c:409
c04f5ac3
JX
11094#, c-format
11095msgid ""
11096"No tags can describe '%s'.\n"
11097"Try --always, or create some tags."
11098msgstr ""
55a16ee4
RC
11099"没有标签能描述 '%s'。\n"
11100"尝试 --always,或者创建一些标签。"
c04f5ac3 11101
06991777 11102#: builtin/describe.c:439
c04f5ac3
JX
11103#, c-format
11104msgid "traversed %lu commits\n"
11105msgstr "已遍历 %lu 个提交\n"
11106
06991777 11107#: builtin/describe.c:442
c04f5ac3
JX
11108#, c-format
11109msgid ""
11110"more than %i tags found; listed %i most recent\n"
11111"gave up search at %s\n"
11112msgstr ""
55a16ee4 11113"发现多于 %i 个标签,列出最近的 %i 个\n"
90e6ef53 11114"在 %s 放弃搜索\n"
c04f5ac3 11115
06991777 11116#: builtin/describe.c:510
5809aa05
JX
11117#, c-format
11118msgid "describe %s\n"
11119msgstr "描述 %s\n"
11120
06991777 11121#: builtin/describe.c:513 builtin/log.c:516
5809aa05
JX
11122#, c-format
11123msgid "Not a valid object name %s"
11124msgstr "不是一个有效的对象名 %s"
11125
06991777 11126#: builtin/describe.c:521
5809aa05
JX
11127#, c-format
11128msgid "%s is neither a commit nor blob"
11129msgstr "%s 既不是提交也不是数据对象"
11130
06991777 11131#: builtin/describe.c:535
ef317cd5 11132msgid "find the tag that comes after the commit"
55a16ee4 11133msgstr "寻找该提交之后的标签"
ef317cd5 11134
06991777 11135#: builtin/describe.c:536
ef317cd5 11136msgid "debug search strategy on stderr"
07432cef 11137msgstr "在标准错误上调试搜索策略"
ef317cd5 11138
06991777 11139#: builtin/describe.c:537
1003b3a5
JX
11140msgid "use any ref"
11141msgstr "使用任意引用"
11142
06991777 11143#: builtin/describe.c:538
1003b3a5 11144msgid "use any tag, even unannotated"
55a16ee4 11145msgstr "使用任意标签,即使未附带注释"
ef317cd5 11146
06991777 11147#: builtin/describe.c:539
ef317cd5 11148msgid "always use long format"
07432cef 11149msgstr "始终使用长提交号格式"
ef317cd5 11150
06991777 11151#: builtin/describe.c:540
2e8451e8
JX
11152msgid "only follow first parent"
11153msgstr "只跟随第一个父提交"
11154
06991777 11155#: builtin/describe.c:543
ef317cd5 11156msgid "only output exact matches"
07432cef 11157msgstr "只输出精确匹配"
ef317cd5 11158
06991777 11159#: builtin/describe.c:545
ef317cd5 11160msgid "consider <n> most recent tags (default: 10)"
55a16ee4 11161msgstr "考虑最近 <n> 个标签(默认:10)"
ef317cd5 11162
06991777 11163#: builtin/describe.c:547
ef317cd5 11164msgid "only consider tags matching <pattern>"
55a16ee4 11165msgstr "只考虑匹配 <模式> 的标签"
ef317cd5 11166
06991777 11167#: builtin/describe.c:549
87cb7997
JX
11168msgid "do not consider tags matching <pattern>"
11169msgstr "不考虑匹配 <模式> 的标签"
11170
06991777 11171#: builtin/describe.c:551 builtin/name-rev.c:424
ef317cd5 11172msgid "show abbreviated commit object as fallback"
07432cef 11173msgstr "显示简写的提交号作为后备"
ef317cd5 11174
06991777 11175#: builtin/describe.c:552 builtin/describe.c:555
ef317cd5 11176msgid "mark"
07432cef 11177msgstr "标记"
ef317cd5 11178
06991777 11179#: builtin/describe.c:553
ef317cd5 11180msgid "append <mark> on dirty working tree (default: \"-dirty\")"
160fb2b2 11181msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
ef317cd5 11182
06991777 11183#: builtin/describe.c:556
87cb7997
JX
11184msgid "append <mark> on broken working tree (default: \"-broken\")"
11185msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
11186
06991777 11187#: builtin/describe.c:574
c04f5ac3
JX
11188msgid "--long is incompatible with --abbrev=0"
11189msgstr "--long 与 --abbrev=0 不兼容"
11190
06991777 11191#: builtin/describe.c:603
c04f5ac3 11192msgid "No names found, cannot describe anything."
90e6ef53 11193msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 11194
06991777 11195#: builtin/describe.c:654
a8a5406a 11196msgid "--dirty is incompatible with commit-ishes"
87cb7997
JX
11197msgstr "--dirty 与提交号不兼容"
11198
06991777 11199#: builtin/describe.c:656
87cb7997
JX
11200msgid "--broken is incompatible with commit-ishes"
11201msgstr "--broken 与提交号不兼容"
c04f5ac3 11202
06991777 11203#: builtin/diff.c:84
c04f5ac3
JX
11204#, c-format
11205msgid "'%s': not a regular file or symlink"
11206msgstr "'%s':不是一个正规文件或符号链接"
11207
06991777 11208#: builtin/diff.c:235
c04f5ac3
JX
11209#, c-format
11210msgid "invalid option: %s"
11211msgstr "无效选项:%s"
11212
06991777 11213#: builtin/diff.c:364
c04f5ac3 11214msgid "Not a git repository"
160fb2b2 11215msgstr "不是一个 git 仓库"
c04f5ac3 11216
06991777 11217#: builtin/diff.c:408
c04f5ac3
JX
11218#, c-format
11219msgid "invalid object '%s' given."
11220msgstr "提供了无效对象 '%s'。"
11221
06991777 11222#: builtin/diff.c:417
c04f5ac3
JX
11223#, c-format
11224msgid "more than two blobs given: '%s'"
160fb2b2 11225msgstr "提供了超过两个数据对象:'%s'"
c04f5ac3 11226
06991777 11227#: builtin/diff.c:422
c04f5ac3
JX
11228#, c-format
11229msgid "unhandled object '%s' given."
6c94aba5 11230msgstr "无法处理的对象 '%s'。"
c04f5ac3 11231
06991777 11232#: builtin/difftool.c:31
1a79b2f1
JX
11233msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
11234msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
11235
06991777 11236#: builtin/difftool.c:261
1a79b2f1
JX
11237#, c-format
11238msgid "failed: %d"
11239msgstr "失败:%d"
11240
06991777 11241#: builtin/difftool.c:303
87cb7997
JX
11242#, c-format
11243msgid "could not read symlink %s"
11244msgstr "无法读取符号链接 %s"
11245
06991777 11246#: builtin/difftool.c:305
87cb7997
JX
11247#, c-format
11248msgid "could not read symlink file %s"
11249msgstr "无法读取符号链接文件 %s"
11250
06991777 11251#: builtin/difftool.c:313
87cb7997
JX
11252#, c-format
11253msgid "could not read object %s for symlink %s"
11254msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
11255
06991777 11256#: builtin/difftool.c:414
1a79b2f1
JX
11257msgid ""
11258"combined diff formats('-c' and '--cc') are not supported in\n"
11259"directory diff mode('-d' and '--dir-diff')."
87cb7997
JX
11260msgstr ""
11261"不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
11262"cc')。"
1a79b2f1 11263
06991777 11264#: builtin/difftool.c:634
1a79b2f1
JX
11265#, c-format
11266msgid "both files modified: '%s' and '%s'."
11267msgstr "两个文件都被修改:'%s' 和 '%s'。"
11268
06991777 11269#: builtin/difftool.c:636
1a79b2f1
JX
11270msgid "working tree file has been left."
11271msgstr "工作区文件被留了下来。"
11272
06991777 11273#: builtin/difftool.c:647
1a79b2f1
JX
11274#, c-format
11275msgid "temporary files exist in '%s'."
11276msgstr "临时文件存在于 '%s'。"
11277
06991777 11278#: builtin/difftool.c:648
1a79b2f1
JX
11279msgid "you may want to cleanup or recover these."
11280msgstr "您可能想要清理或者恢复它们。"
11281
06991777 11282#: builtin/difftool.c:697
1a79b2f1
JX
11283msgid "use `diff.guitool` instead of `diff.tool`"
11284msgstr "使用 `diff.guitool` 代替 `diff.tool`"
11285
06991777 11286#: builtin/difftool.c:699
1a79b2f1
JX
11287msgid "perform a full-directory diff"
11288msgstr "执行一个全目录差异比较"
11289
06991777 11290#: builtin/difftool.c:701
1a79b2f1
JX
11291msgid "do not prompt before launching a diff tool"
11292msgstr "启动差异比较工具之前不提示"
11293
06991777 11294#: builtin/difftool.c:706
1a79b2f1
JX
11295msgid "use symlinks in dir-diff mode"
11296msgstr "在 dir-diff 模式中使用符号链接"
11297
06991777 11298#: builtin/difftool.c:707
c1ac5258
JX
11299msgid "tool"
11300msgstr "工具"
11301
06991777 11302#: builtin/difftool.c:708
1a79b2f1
JX
11303msgid "use the specified diff tool"
11304msgstr "使用指定的差异比较工具"
11305
06991777 11306#: builtin/difftool.c:710
1a79b2f1
JX
11307msgid "print a list of diff tools that may be used with `--tool`"
11308msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
11309
06991777 11310#: builtin/difftool.c:713
1a79b2f1
JX
11311msgid ""
11312"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
11313"code"
11314msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出"
11315
06991777 11316#: builtin/difftool.c:716
1a79b2f1
JX
11317msgid "specify a custom command for viewing diffs"
11318msgstr "指定一个用于查看差异的自定义命令"
11319
06991777 11320#: builtin/difftool.c:740
1a79b2f1
JX
11321msgid "no <tool> given for --tool=<tool>"
11322msgstr "没有为 --tool=<工具> 参数提供 <工具>"
11323
06991777 11324#: builtin/difftool.c:747
1a79b2f1
JX
11325msgid "no <cmd> given for --extcmd=<cmd>"
11326msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
11327
c1ac5258 11328#: builtin/fast-export.c:29
ef317cd5 11329msgid "git fast-export [rev-list-opts]"
07432cef 11330msgstr "git fast-export [rev-list-opts]"
ef317cd5 11331
06991777 11332#: builtin/fast-export.c:1084
ef317cd5 11333msgid "show progress after <n> objects"
07432cef 11334msgstr "在 <n> 个对象之后显示进度"
ef317cd5 11335
06991777 11336#: builtin/fast-export.c:1086
ef317cd5 11337msgid "select handling of signed tags"
55a16ee4 11338msgstr "选择如何处理签名标签"
ef317cd5 11339
06991777 11340#: builtin/fast-export.c:1089
ef317cd5 11341msgid "select handling of tags that tag filtered objects"
55a16ee4 11342msgstr "选择当标签指向被过滤对象时该标签的处理方式"
ef317cd5 11343
06991777 11344#: builtin/fast-export.c:1092
ef317cd5 11345msgid "Dump marks to this file"
07432cef 11346msgstr "把标记存储到这个文件"
ef317cd5 11347
06991777 11348#: builtin/fast-export.c:1094
ef317cd5 11349msgid "Import marks from this file"
07432cef 11350msgstr "从这个文件导入标记"
ef317cd5 11351
06991777 11352#: builtin/fast-export.c:1096
ef317cd5 11353msgid "Fake a tagger when tags lack one"
55a16ee4 11354msgstr "当标签缺少标记者字段时,假装提供一个"
ef317cd5 11355
06991777 11356#: builtin/fast-export.c:1098
ef317cd5 11357msgid "Output full tree for each commit"
07432cef 11358msgstr "每次提交都输出整个树"
ef317cd5 11359
06991777 11360#: builtin/fast-export.c:1100
ef317cd5 11361msgid "Use the done feature to terminate the stream"
07432cef 11362msgstr "使用 done 功能来终止流"
ef317cd5 11363
06991777 11364#: builtin/fast-export.c:1101
ef317cd5 11365msgid "Skip output of blob data"
07432cef 11366msgstr "跳过数据对象的输出"
ef317cd5 11367
06991777 11368#: builtin/fast-export.c:1102 builtin/log.c:1601
6acbf033 11369msgid "refspec"
160fb2b2 11370msgstr "引用规格"
6acbf033 11371
06991777 11372#: builtin/fast-export.c:1103
6acbf033 11373msgid "Apply refspec to exported refs"
160fb2b2 11374msgstr "对导出的引用应用引用规格"
6acbf033 11375
06991777 11376#: builtin/fast-export.c:1104
220c313c
JX
11377msgid "anonymize output"
11378msgstr "匿名输出"
11379
06991777
JX
11380#: builtin/fast-export.c:1106
11381msgid "Reference parents which are not in fast-export stream by object id"
11382msgstr "引用父对象ID不在 fast-export 流中"
11383
11384#: builtin/fast-export.c:1108
11385msgid "Show original object ids of blobs/commits"
11386msgstr "显示数据对象/提交的原始对象ID"
11387
4c27fcb5 11388#: builtin/fetch.c:28
ef317cd5 11389msgid "git fetch [<options>] [<repository> [<refspec>...]]"
160fb2b2 11390msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
ef317cd5 11391
4c27fcb5 11392#: builtin/fetch.c:29
ef317cd5 11393msgid "git fetch [<options>] <group>"
07432cef 11394msgstr "git fetch [<选项>] <组>"
ef317cd5 11395
4c27fcb5 11396#: builtin/fetch.c:30
ef317cd5 11397msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
160fb2b2 11398msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
ef317cd5 11399
4c27fcb5 11400#: builtin/fetch.c:31
ef317cd5 11401msgid "git fetch --all [<options>]"
07432cef 11402msgstr "git fetch --all [<选项>]"
ef317cd5 11403
06991777 11404#: builtin/fetch.c:115 builtin/pull.c:195
ef317cd5 11405msgid "fetch from all remotes"
07432cef 11406msgstr "从所有的远程抓取"
ef317cd5 11407
06991777 11408#: builtin/fetch.c:117 builtin/pull.c:198
ef317cd5 11409msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 11410msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 11411
06991777 11412#: builtin/fetch.c:119 builtin/pull.c:201
ef317cd5 11413msgid "path to upload pack on remote end"
07432cef 11414msgstr "上传包到远程的路径"
ef317cd5 11415
4c27fcb5
JX
11416#: builtin/fetch.c:120
11417msgid "force overwrite of local reference"
11418msgstr "强制覆盖本地引用"
ef317cd5 11419
4c27fcb5 11420#: builtin/fetch.c:122
ef317cd5 11421msgid "fetch from multiple remotes"
07432cef 11422msgstr "从多个远程抓取"
ef317cd5 11423
06991777 11424#: builtin/fetch.c:124 builtin/pull.c:205
ef317cd5 11425msgid "fetch all tags and associated objects"
55a16ee4 11426msgstr "抓取所有的标签和关联对象"
ef317cd5 11427
4c27fcb5 11428#: builtin/fetch.c:126
ef317cd5 11429msgid "do not fetch all tags (--no-tags)"
55a16ee4 11430msgstr "不抓取任何标签(--no-tags)"
ef317cd5 11431
4c27fcb5 11432#: builtin/fetch.c:128
276ceeaa
JX
11433msgid "number of submodules fetched in parallel"
11434msgstr "子模组获取的并发数"
11435
06991777 11436#: builtin/fetch.c:130 builtin/pull.c:208
ef317cd5 11437msgid "prune remote-tracking branches no longer on remote"
07432cef 11438msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 11439
4c27fcb5 11440#: builtin/fetch.c:132
31e5e17b
JX
11441msgid "prune local tags no longer on remote and clobber changed tags"
11442msgstr "清除远程不存在的本地标签,并且替换变更标签"
11443
07432cef 11444# 译者:可选值,不能翻译
06991777 11445#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:133
ef317cd5 11446msgid "on-demand"
07432cef 11447msgstr "on-demand"
ef317cd5 11448
4c27fcb5 11449#: builtin/fetch.c:134
ef317cd5 11450msgid "control recursive fetching of submodules"
07432cef 11451msgstr "控制子模组的递归抓取"
ef317cd5 11452
06991777 11453#: builtin/fetch.c:138 builtin/pull.c:216
ef317cd5 11454msgid "keep downloaded pack"
07432cef 11455msgstr "保持下载包"
ef317cd5 11456
4c27fcb5 11457#: builtin/fetch.c:140
ef317cd5 11458msgid "allow updating of HEAD ref"
07432cef 11459msgstr "允许更新 HEAD 引用"
ef317cd5 11460
06991777 11461#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:219
ef317cd5 11462msgid "deepen history of shallow clone"
07432cef 11463msgstr "深化浅克隆的历史"
ef317cd5 11464
4c27fcb5 11465#: builtin/fetch.c:145
a0b6b246
JX
11466msgid "deepen history of shallow repository based on time"
11467msgstr "基于时间来深化浅克隆的历史"
11468
06991777 11469#: builtin/fetch.c:151 builtin/pull.c:222
a77c07d9 11470msgid "convert to a complete repository"
160fb2b2 11471msgstr "转换为一个完整的仓库"
a77c07d9 11472
4c27fcb5 11473#: builtin/fetch.c:154
ef317cd5 11474msgid "prepend this to submodule path output"
07432cef 11475msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 11476
4c27fcb5 11477#: builtin/fetch.c:157
a4f16749
JX
11478msgid ""
11479"default for recursive fetching of submodules (lower priority than config "
11480"files)"
11481msgstr "递归获取子模组的缺省值(比配置文件优先级低)"
ef317cd5 11482
06991777 11483#: builtin/fetch.c:161 builtin/pull.c:225
cfff71a9
JX
11484msgid "accept refs that update .git/shallow"
11485msgstr "接受更新 .git/shallow 的引用"
11486
06991777 11487#: builtin/fetch.c:162 builtin/pull.c:227
6acbf033
JX
11488msgid "refmap"
11489msgstr "引用映射"
11490
06991777 11491#: builtin/fetch.c:163 builtin/pull.c:228
6acbf033
JX
11492msgid "specify fetch refmap"
11493msgstr "指定获取操作的引用映射"
11494
06991777 11495#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585
fd8cb379
JX
11496#: builtin/send-pack.c:172
11497msgid "server-specific"
11498msgstr "server-specific"
11499
06991777 11500#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585
fd8cb379
JX
11501#: builtin/send-pack.c:173
11502msgid "option to transmit"
11503msgstr "传输选项"
11504
4c27fcb5 11505#: builtin/fetch.c:170
c1ac5258
JX
11506msgid "report that we have only objects reachable from this object"
11507msgstr "报告我们只拥有从该对象开始可达的对象"
11508
06991777 11509#: builtin/fetch.c:469
c04f5ac3
JX
11510msgid "Couldn't find remote ref HEAD"
11511msgstr "无法发现远程 HEAD 引用"
11512
06991777 11513#: builtin/fetch.c:608
5c57d762
JX
11514#, c-format
11515msgid "configuration fetch.output contains invalid value %s"
11516msgstr "配置变量 fetch.output 包含无效值 %s"
11517
06991777 11518#: builtin/fetch.c:705
c04f5ac3
JX
11519#, c-format
11520msgid "object %s not found"
11521msgstr "对象 %s 未发现"
11522
06991777 11523#: builtin/fetch.c:709
c04f5ac3
JX
11524msgid "[up to date]"
11525msgstr "[最新]"
11526
06991777 11527#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
c04f5ac3
JX
11528msgid "[rejected]"
11529msgstr "[已拒绝]"
11530
06991777 11531#: builtin/fetch.c:723
5c57d762 11532msgid "can't fetch in current branch"
9a4b694c 11533msgstr "当前分支下不能执行获取操作"
5c57d762 11534
06991777 11535#: builtin/fetch.c:733
c04f5ac3 11536msgid "[tag update]"
55a16ee4 11537msgstr "[标签更新]"
c04f5ac3 11538
06991777
JX
11539#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
11540#: builtin/fetch.c:796
5c57d762
JX
11541msgid "unable to update local ref"
11542msgstr "不能更新本地引用"
c04f5ac3 11543
06991777 11544#: builtin/fetch.c:738
4c27fcb5
JX
11545msgid "would clobber existing tag"
11546msgstr "会破坏现有的标签"
11547
06991777 11548#: builtin/fetch.c:760
c04f5ac3 11549msgid "[new tag]"
55a16ee4 11550msgstr "[新标签]"
c04f5ac3 11551
06991777 11552#: builtin/fetch.c:763
c04f5ac3
JX
11553msgid "[new branch]"
11554msgstr "[新分支]"
11555
06991777 11556#: builtin/fetch.c:766
170e9899
JX
11557msgid "[new ref]"
11558msgstr "[新引用]"
11559
06991777 11560#: builtin/fetch.c:796
c04f5ac3
JX
11561msgid "forced update"
11562msgstr "强制更新"
11563
06991777 11564#: builtin/fetch.c:801
5c57d762
JX
11565msgid "non-fast-forward"
11566msgstr "非快进"
c04f5ac3 11567
06991777 11568#: builtin/fetch.c:847
c04f5ac3
JX
11569#, c-format
11570msgid "%s did not send all necessary objects\n"
e640d114 11571msgstr "%s 未发送所有必需的对象\n"
c04f5ac3 11572
06991777 11573#: builtin/fetch.c:868
cfff71a9
JX
11574#, c-format
11575msgid "reject %s because shallow roots are not allowed to be updated"
11576msgstr "拒绝 %s 因为浅克隆不允许被更新"
11577
06991777 11578#: builtin/fetch.c:959 builtin/fetch.c:1081
c04f5ac3
JX
11579#, c-format
11580msgid "From %.*s\n"
11581msgstr "来自 %.*s\n"
11582
06991777 11583#: builtin/fetch.c:970
c04f5ac3
JX
11584#, c-format
11585msgid ""
11586"some local refs could not be updated; try running\n"
11587" 'git remote prune %s' to remove any old, conflicting branches"
11588msgstr ""
11589"一些本地引用不能被更新;尝试运行\n"
11590" 'git remote prune %s' 来删除旧的、有冲突的分支"
11591
90e6ef53 11592# 译者:注意保持前导空格
06991777 11593#: builtin/fetch.c:1051
81809b99 11594#, c-format
8ada9598 11595msgid " (%s will become dangling)"
e640d114 11596msgstr " (%s 将成为悬空状态)"
c04f5ac3 11597
90e6ef53 11598# 译者:注意保持前导空格
06991777 11599#: builtin/fetch.c:1052
81809b99 11600#, c-format
8ada9598 11601msgid " (%s has become dangling)"
e640d114 11602msgstr " (%s 已成为悬空状态)"
c04f5ac3 11603
06991777 11604#: builtin/fetch.c:1084
c04f5ac3
JX
11605msgid "[deleted]"
11606msgstr "[已删除]"
11607
06991777 11608#: builtin/fetch.c:1085 builtin/remote.c:1036
c04f5ac3
JX
11609msgid "(none)"
11610msgstr "(无)"
11611
06991777 11612#: builtin/fetch.c:1108
c04f5ac3
JX
11613#, c-format
11614msgid "Refusing to fetch into current branch %s of non-bare repository"
160fb2b2 11615msgstr "拒绝获取到非纯仓库的当前分支 %s"
c04f5ac3 11616
06991777 11617#: builtin/fetch.c:1127
c04f5ac3
JX
11618#, c-format
11619msgid "Option \"%s\" value \"%s\" is not valid for %s"
11620msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
11621
06991777 11622#: builtin/fetch.c:1130
c04f5ac3
JX
11623#, c-format
11624msgid "Option \"%s\" is ignored for %s\n"
81809b99 11625msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 11626
06991777 11627#: builtin/fetch.c:1434
c04f5ac3
JX
11628#, c-format
11629msgid "Fetching %s\n"
d4a8e00b 11630msgstr "正在获取 %s\n"
c04f5ac3 11631
06991777 11632#: builtin/fetch.c:1436 builtin/remote.c:100
c04f5ac3
JX
11633#, c-format
11634msgid "Could not fetch %s"
11635msgstr "不能获取 %s"
11636
06991777 11637#: builtin/fetch.c:1482
31e5e17b 11638msgid ""
06991777
JX
11639"--filter can only be used with the remote configured in extensions."
11640"partialClone"
11641msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
31e5e17b 11642
06991777 11643#: builtin/fetch.c:1506
c04f5ac3
JX
11644msgid ""
11645"No remote repository specified. Please, specify either a URL or a\n"
11646"remote name from which new revisions should be fetched."
4375c10e 11647msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
c04f5ac3 11648
06991777 11649#: builtin/fetch.c:1543
c04f5ac3 11650msgid "You need to specify a tag name."
55a16ee4 11651msgstr "您需要指定一个标签名称。"
c04f5ac3 11652
06991777 11653#: builtin/fetch.c:1592
a0b6b246
JX
11654msgid "Negative depth in --deepen is not supported"
11655msgstr "--deepen 不支持负数深度"
11656
06991777 11657#: builtin/fetch.c:1594
a0b6b246
JX
11658msgid "--deepen and --depth are mutually exclusive"
11659msgstr "--deepen 和 --depth 是互斥的"
11660
06991777 11661#: builtin/fetch.c:1599
a77c07d9
JX
11662msgid "--depth and --unshallow cannot be used together"
11663msgstr "--depth 和 --unshallow 不能同时使用"
11664
06991777 11665#: builtin/fetch.c:1601
a77c07d9 11666msgid "--unshallow on a complete repository does not make sense"
160fb2b2 11667msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
a77c07d9 11668
06991777 11669#: builtin/fetch.c:1617
c04f5ac3 11670msgid "fetch --all does not take a repository argument"
160fb2b2 11671msgstr "fetch --all 不能带一个仓库参数"
c04f5ac3 11672
06991777 11673#: builtin/fetch.c:1619
c04f5ac3 11674msgid "fetch --all does not make sense with refspecs"
160fb2b2 11675msgstr "fetch --all 带引用规格没有任何意义"
c04f5ac3 11676
06991777 11677#: builtin/fetch.c:1628
c04f5ac3
JX
11678#, c-format
11679msgid "No such remote or remote group: %s"
11680msgstr "没有这样的远程或远程组:%s"
11681
06991777 11682#: builtin/fetch.c:1635
c04f5ac3 11683msgid "Fetching a group and specifying refspecs does not make sense"
160fb2b2 11684msgstr "获取组并指定引用规格没有意义"
c04f5ac3 11685
06991777
JX
11686#: builtin/fetch.c:1651
11687msgid ""
11688"--filter can only be used with the remote configured in extensions."
11689"partialclone"
11690msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
11691
4c27fcb5 11692#: builtin/fmt-merge-msg.c:18
814ff314
JX
11693msgid ""
11694"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
11695msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
c04f5ac3 11696
4c27fcb5 11697#: builtin/fmt-merge-msg.c:672
ef317cd5 11698msgid "populate log with at most <n> entries from shortlog"
07432cef 11699msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 11700
4c27fcb5 11701#: builtin/fmt-merge-msg.c:675
ef317cd5 11702msgid "alias for --log (deprecated)"
07432cef 11703msgstr "参数 --log 的别名(已弃用)"
ef317cd5 11704
4c27fcb5 11705#: builtin/fmt-merge-msg.c:678
ef317cd5 11706msgid "text"
07432cef 11707msgstr "文本"
ef317cd5 11708
4c27fcb5 11709#: builtin/fmt-merge-msg.c:679
ef317cd5 11710msgid "use <text> as start of message"
07432cef 11711msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 11712
4c27fcb5 11713#: builtin/fmt-merge-msg.c:680
ef317cd5 11714msgid "file to read from"
07432cef 11715msgstr "从文件中读取"
ef317cd5 11716
a4f16749 11717#: builtin/for-each-ref.c:10
814ff314
JX
11718msgid "git for-each-ref [<options>] [<pattern>]"
11719msgstr "git for-each-ref [<选项>] [<模式>]"
ef317cd5 11720
a4f16749 11721#: builtin/for-each-ref.c:11
94550ed3
JX
11722msgid "git for-each-ref [--points-at <object>]"
11723msgstr "git for-each-ref [--points-at <对象>]"
11724
a4f16749 11725#: builtin/for-each-ref.c:12
87cb7997
JX
11726msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
11727msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
94550ed3 11728
a4f16749 11729#: builtin/for-each-ref.c:13
87cb7997
JX
11730msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
11731msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
94550ed3 11732
a4f16749 11733#: builtin/for-each-ref.c:28
ef317cd5 11734msgid "quote placeholders suitably for shells"
07432cef 11735msgstr "引用占位符适用于 shells"
ef317cd5 11736
a4f16749 11737#: builtin/for-each-ref.c:30
ef317cd5 11738msgid "quote placeholders suitably for perl"
07432cef 11739msgstr "引用占位符适用于 perl"
ef317cd5 11740
a4f16749 11741#: builtin/for-each-ref.c:32
ef317cd5 11742msgid "quote placeholders suitably for python"
07432cef 11743msgstr "引用占位符适用于 python"
ef317cd5 11744
a4f16749 11745#: builtin/for-each-ref.c:34
04cb2f28
JX
11746msgid "quote placeholders suitably for Tcl"
11747msgstr "引用占位符适用于 Tcl"
ef317cd5 11748
a4f16749 11749#: builtin/for-each-ref.c:37
ef317cd5 11750msgid "show only <n> matched refs"
07432cef 11751msgstr "只显示 <n> 个匹配的引用"
ef317cd5 11752
4c27fcb5 11753#: builtin/for-each-ref.c:39 builtin/tag.c:424
6937cb4e
JX
11754msgid "respect format colors"
11755msgstr "遵照格式中的颜色输出"
11756
11757#: builtin/for-each-ref.c:43
94550ed3
JX
11758msgid "print only refs which points at the given object"
11759msgstr "只打印指向给定对象的引用"
ef317cd5 11760
6937cb4e 11761#: builtin/for-each-ref.c:45
94550ed3
JX
11762msgid "print only refs that are merged"
11763msgstr "只打印已经合并的引用"
11764
6937cb4e 11765#: builtin/for-each-ref.c:46
94550ed3
JX
11766msgid "print only refs that are not merged"
11767msgstr "只打印没有合并的引用"
ef317cd5 11768
6937cb4e 11769#: builtin/for-each-ref.c:47
94550ed3
JX
11770msgid "print only refs which contain the commit"
11771msgstr "只打印包含该提交的引用"
11772
6937cb4e 11773#: builtin/for-each-ref.c:48
87cb7997
JX
11774msgid "print only refs which don't contain the commit"
11775msgstr "只打印不包含该提交的引用"
11776
06991777
JX
11777#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
11778msgid "unknown"
11779msgstr "未知"
11780
11781#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
11782#: builtin/fsck.c:120 builtin/fsck.c:136
11783#, c-format
11784msgid "error in %s %s: %s"
11785msgstr "%s %s 错误:%s"
11786
11787#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
11788#: builtin/fsck.c:131
11789#, c-format
11790msgid "warning in %s %s: %s"
11791msgstr "%s %s 警告:%s"
11792
11793#: builtin/fsck.c:157 builtin/fsck.c:159
11794#, c-format
11795msgid "broken link from %7s %s"
11796msgstr "来自 %7s %s 的损坏的链接"
11797
11798#: builtin/fsck.c:168
11799msgid "wrong object type in link"
11800msgstr "链接中错误的对象类型"
11801
11802#: builtin/fsck.c:184
11803#, c-format
11804msgid ""
11805"broken link from %7s %s\n"
11806" to %7s %s"
11807msgstr ""
11808"损坏的链接来自于 %7s %s\n"
11809" 到 %7s %s"
11810
11811#: builtin/fsck.c:253
11812#, c-format
11813msgid "missing %s %s"
11814msgstr "缺失 %s %s"
11815
11816#: builtin/fsck.c:279
11817#, c-format
11818msgid "unreachable %s %s"
11819msgstr "不可访问 %s %s"
11820
11821#: builtin/fsck.c:298
11822#, c-format
11823msgid "dangling %s %s"
11824msgstr "悬空 %s %s"
11825
11826#: builtin/fsck.c:307
11827msgid "could not create lost-found"
11828msgstr "不能创建 lost-found"
11829
11830#: builtin/fsck.c:318
11831#, c-format
11832msgid "could not finish '%s'"
11833msgstr "不能完成 '%s'"
11834
11835#: builtin/fsck.c:335
11836#, c-format
11837msgid "Checking %s"
11838msgstr "正在检查 %s"
11839
11840#: builtin/fsck.c:353
11841#, c-format
11842msgid "Checking connectivity (%d objects)"
11843msgstr "正在检查连通性(%d 个对象)"
11844
11845#: builtin/fsck.c:372
11846#, c-format
11847msgid "Checking %s %s"
11848msgstr "正在检查 %s %s"
11849
11850#: builtin/fsck.c:376
11851msgid "broken links"
11852msgstr "损坏的链接"
11853
11854#: builtin/fsck.c:385
11855#, c-format
11856msgid "root %s"
11857msgstr "根 %s"
11858
11859#: builtin/fsck.c:393
11860#, c-format
11861msgid "tagged %s %s (%s) in %s"
11862msgstr "标记 %s %s (%s) 于 %s"
11863
11864#: builtin/fsck.c:422
11865#, c-format
11866msgid "%s: object corrupt or missing"
11867msgstr "%s:对象损坏或丢失"
11868
11869#: builtin/fsck.c:447
11870#, c-format
11871msgid "%s: invalid reflog entry %s"
11872msgstr "%s:无效的引用日志条目 %s"
11873
11874#: builtin/fsck.c:461
11875#, c-format
11876msgid "Checking reflog %s->%s"
11877msgstr "正在检查引用日志 %s->%s"
11878
11879#: builtin/fsck.c:495
11880#, c-format
11881msgid "%s: invalid sha1 pointer %s"
11882msgstr "%s:无效的 sha1 指针 %s"
11883
11884#: builtin/fsck.c:502
11885#, c-format
11886msgid "%s: not a commit"
11887msgstr "%s:不是一个提交"
11888
11889#: builtin/fsck.c:557
11890msgid "notice: No default references"
11891msgstr "注意:无默认引用"
11892
11893#: builtin/fsck.c:572
11894#, c-format
11895msgid "%s: object corrupt or missing: %s"
11896msgstr "%s:对象损坏或丢失:%s"
11897
11898#: builtin/fsck.c:585
11899#, c-format
11900msgid "%s: object could not be parsed: %s"
11901msgstr "%s:不能解析对象:%s"
11902
11903#: builtin/fsck.c:605
11904#, c-format
11905msgid "bad sha1 file: %s"
11906msgstr "坏的 sha1 文件:%s"
11907
11908#: builtin/fsck.c:620
11909msgid "Checking object directory"
11910msgstr "正在检查对象目录"
11911
11912#: builtin/fsck.c:623
6c94aba5 11913msgid "Checking object directories"
06991777
JX
11914msgstr "正在检查对象目录"
11915
11916#: builtin/fsck.c:638
11917#, c-format
11918msgid "Checking %s link"
11919msgstr "正在检查 %s 链接"
11920
11921#: builtin/fsck.c:643 builtin/index-pack.c:833
11922#, c-format
11923msgid "invalid %s"
11924msgstr "无效的 %s"
11925
11926#: builtin/fsck.c:650
11927#, c-format
11928msgid "%s points to something strange (%s)"
11929msgstr "%s 指向奇怪的东西(%s)"
11930
11931#: builtin/fsck.c:656
11932#, c-format
11933msgid "%s: detached HEAD points at nothing"
11934msgstr "%s:分离头指针的指向不存在"
11935
11936#: builtin/fsck.c:660
11937#, c-format
11938msgid "notice: %s points to an unborn branch (%s)"
11939msgstr "注意:%s 指向一个尚未诞生的分支(%s)"
11940
11941#: builtin/fsck.c:672
11942msgid "Checking cache tree"
11943msgstr "正在检查缓存树"
11944
11945#: builtin/fsck.c:677
11946#, c-format
11947msgid "%s: invalid sha1 pointer in cache-tree"
11948msgstr "%s:cache-tree 中无效的 sha1 指针"
6c94aba5 11949
06991777
JX
11950#: builtin/fsck.c:688
11951msgid "non-tree in cache-tree"
11952msgstr "cache-tree 中非树对象"
11953
11954#: builtin/fsck.c:719
814ff314
JX
11955msgid "git fsck [<options>] [<object>...]"
11956msgstr "git fsck [<选项>] [<对象>...]"
ef317cd5 11957
06991777 11958#: builtin/fsck.c:725
ef317cd5 11959msgid "show unreachable objects"
07432cef 11960msgstr "显示不可达的对象"
ef317cd5 11961
06991777 11962#: builtin/fsck.c:726
ef317cd5 11963msgid "show dangling objects"
e640d114 11964msgstr "显示悬空的对象"
ef317cd5 11965
06991777 11966#: builtin/fsck.c:727
ef317cd5 11967msgid "report tags"
55a16ee4 11968msgstr "报告标签"
ef317cd5 11969
06991777 11970#: builtin/fsck.c:728
ef317cd5 11971msgid "report root nodes"
07432cef 11972msgstr "报告根节点"
ef317cd5 11973
06991777 11974#: builtin/fsck.c:729
ef317cd5 11975msgid "make index objects head nodes"
07432cef 11976msgstr "将索引亦作为检查的头节点"
ef317cd5 11977
06991777 11978#: builtin/fsck.c:730
ef317cd5 11979msgid "make reflogs head nodes (default)"
07432cef 11980msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 11981
06991777 11982#: builtin/fsck.c:731
ef317cd5 11983msgid "also consider packs and alternate objects"
07432cef 11984msgstr "也考虑包和备用对象"
ef317cd5 11985
06991777 11986#: builtin/fsck.c:732
1b7f4a34
JX
11987msgid "check only connectivity"
11988msgstr "仅检查连通性"
11989
06991777 11990#: builtin/fsck.c:733
ef317cd5 11991msgid "enable more strict checking"
07432cef 11992msgstr "启用更严格的检查"
ef317cd5 11993
06991777 11994#: builtin/fsck.c:735
ef317cd5 11995msgid "write dangling objects in .git/lost-found"
e640d114 11996msgstr "将悬空对象写入 .git/lost-found 中"
ef317cd5 11997
06991777 11998#: builtin/fsck.c:736 builtin/prune.c:110
ef317cd5 11999msgid "show progress"
07432cef 12000msgstr "显示进度"
ef317cd5 12001
06991777 12002#: builtin/fsck.c:737
5c57d762
JX
12003msgid "show verbose names for reachable objects"
12004msgstr "显示可达对象的详细名称"
12005
06991777 12006#: builtin/fsck.c:797
6c94aba5 12007msgid "Checking objects"
06991777
JX
12008msgstr "正在检查对象"
12009
12010#: builtin/fsck.c:825
12011#, c-format
12012msgid "%s: object missing"
12013msgstr "%s:对象缺失"
12014
12015#: builtin/fsck.c:837
12016#, c-format
12017msgid "invalid parameter: expected sha1, got '%s'"
12018msgstr "无效的参数:期望 sha1,得到 '%s'"
6c94aba5 12019
c1ac5258 12020#: builtin/gc.c:34
814ff314
JX
12021msgid "git gc [<options>]"
12022msgstr "git gc [<选项>]"
ef317cd5 12023
c1ac5258 12024#: builtin/gc.c:90
c04f5ac3 12025#, c-format
87cb7997 12026msgid "Failed to fstat %s: %s"
65e2041e 12027msgstr "对 %s 调用 fstat 失败:%s"
c04f5ac3 12028
4c27fcb5 12029#: builtin/gc.c:461 builtin/init-db.c:55
c04f5ac3 12030#, c-format
4c27fcb5
JX
12031msgid "cannot stat '%s'"
12032msgstr "不能对 '%s' 调用 stat"
12033
12034#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510
12035#, c-format
12036msgid "cannot read '%s'"
12037msgstr "不能读取 '%s'"
c04f5ac3 12038
4c27fcb5 12039#: builtin/gc.c:477
94550ed3
JX
12040#, c-format
12041msgid ""
12042"The last gc run reported the following. Please correct the root cause\n"
12043"and remove %s.\n"
12044"Automatic cleanup will not be performed until the file is removed.\n"
12045"\n"
12046"%s"
12047msgstr ""
12048"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
12049"在该文件被删除之前,自动清理将不会执行。\n"
12050"\n"
12051"%s"
12052
4c27fcb5 12053#: builtin/gc.c:519
ef317cd5 12054msgid "prune unreferenced objects"
07432cef 12055msgstr "清除未引用的对象"
ef317cd5 12056
4c27fcb5 12057#: builtin/gc.c:521
ef317cd5 12058msgid "be more thorough (increased runtime)"
07432cef 12059msgstr "更彻底(增加运行时间)"
ef317cd5 12060
4c27fcb5 12061#: builtin/gc.c:522
ef317cd5 12062msgid "enable auto-gc mode"
07432cef 12063msgstr "启用自动垃圾回收模式"
ef317cd5 12064
4c27fcb5 12065#: builtin/gc.c:525
90314792
JX
12066msgid "force running gc even if there may be another gc running"
12067msgstr "强制执行 gc 即使另外一个 gc 正在执行"
12068
4c27fcb5 12069#: builtin/gc.c:528
fd8cb379
JX
12070msgid "repack all other packs except the largest pack"
12071msgstr "除了最大的包之外,对所有其它包文件重新打包"
12072
4c27fcb5 12073#: builtin/gc.c:545
fd8cb379
JX
12074#, c-format
12075msgid "failed to parse gc.logexpiry value %s"
c1ac5258 12076msgstr "解析 gc.logexpiry 的值 %s 失败"
fd8cb379 12077
4c27fcb5 12078#: builtin/gc.c:556
87cb7997 12079#, c-format
fd8cb379 12080msgid "failed to parse prune expiry value %s"
c1ac5258 12081msgstr "解析清除期限值 %s 失败"
87cb7997 12082
4c27fcb5 12083#: builtin/gc.c:576
c04f5ac3 12084#, c-format
6c94aba5 12085msgid "Auto packing the repository in background for optimum performance.\n"
160fb2b2 12086msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6c94aba5 12087
4c27fcb5 12088#: builtin/gc.c:578
6c94aba5
JX
12089#, c-format
12090msgid "Auto packing the repository for optimum performance.\n"
160fb2b2 12091msgstr "自动打包仓库以求最佳性能。\n"
6c94aba5 12092
4c27fcb5 12093#: builtin/gc.c:579
6c94aba5
JX
12094#, c-format
12095msgid "See \"git help gc\" for manual housekeeping.\n"
12096msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 12097
4c27fcb5 12098#: builtin/gc.c:619
90314792
JX
12099#, c-format
12100msgid ""
12101"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
12102msgstr ""
29004bbb 12103"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)"
90314792 12104
06991777 12105#: builtin/gc.c:672
c04f5ac3
JX
12106msgid ""
12107"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 12108msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 12109
06991777 12110#: builtin/grep.c:29
814ff314
JX
12111msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
12112msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
ef317cd5 12113
06991777 12114#: builtin/grep.c:225
c04f5ac3
JX
12115#, c-format
12116msgid "grep: failed to create thread: %s"
90e6ef53 12117msgstr "grep:无法创建线程:%s"
c04f5ac3 12118
06991777 12119#: builtin/grep.c:279
276ceeaa
JX
12120#, c-format
12121msgid "invalid number of threads specified (%d) for %s"
12122msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
12123
a4f16749
JX
12124#. TRANSLATORS: %s is the configuration
12125#. variable for tweaking threads, currently
12126#. grep.threads
12127#.
06991777
JX
12128#: builtin/grep.c:287 builtin/index-pack.c:1506 builtin/index-pack.c:1697
12129#: builtin/pack-objects.c:2717
a4f16749
JX
12130#, c-format
12131msgid "no threads support, ignoring %s"
12132msgstr "没有线程支持,忽略 %s"
12133
06991777 12134#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
c04f5ac3
JX
12135#, c-format
12136msgid "unable to read tree (%s)"
90e6ef53 12137msgstr "无法读取树(%s)"
c04f5ac3 12138
06991777 12139#: builtin/grep.c:646
c04f5ac3
JX
12140#, c-format
12141msgid "unable to grep from object of type %s"
12142msgstr "无法抓取来自于 %s 类型的对象"
12143
06991777 12144#: builtin/grep.c:712
c04f5ac3
JX
12145#, c-format
12146msgid "switch `%c' expects a numerical value"
12147msgstr "开关 `%c' 期望一个数字值"
12148
06991777 12149#: builtin/grep.c:811
ef317cd5 12150msgid "search in index instead of in the work tree"
07432cef 12151msgstr "在索引区搜索而不是在工作区"
ef317cd5 12152
06991777 12153#: builtin/grep.c:813
ef317cd5 12154msgid "find in contents not managed by git"
07432cef 12155msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
12156
12157# 译者:中文字符串拼接,可删除前导空格
06991777 12158#: builtin/grep.c:815
ef317cd5 12159msgid "search in both tracked and untracked files"
07432cef 12160msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 12161
06991777 12162#: builtin/grep.c:817
814ff314
JX
12163msgid "ignore files specified via '.gitignore'"
12164msgstr "忽略 '.gitignore' 包含的文件"
ef317cd5 12165
06991777 12166#: builtin/grep.c:819
87cb7997 12167msgid "recursively search in each submodule"
1a79b2f1
JX
12168msgstr "在每一个子模组中递归搜索"
12169
06991777 12170#: builtin/grep.c:822
ef317cd5 12171msgid "show non-matching lines"
07432cef 12172msgstr "显示未匹配的行"
ef317cd5 12173
06991777 12174#: builtin/grep.c:824
ef317cd5 12175msgid "case insensitive matching"
07432cef 12176msgstr "不区分大小写匹配"
ef317cd5 12177
06991777 12178#: builtin/grep.c:826
ef317cd5 12179msgid "match patterns only at word boundaries"
07432cef 12180msgstr "只在单词边界匹配模式"
ef317cd5 12181
06991777 12182#: builtin/grep.c:828
ef317cd5 12183msgid "process binary files as text"
07432cef 12184msgstr "把二进制文件当做文本处理"
ef317cd5 12185
06991777 12186#: builtin/grep.c:830
ef317cd5 12187msgid "don't match patterns in binary files"
07432cef 12188msgstr "不在二进制文件中匹配模式"
ef317cd5 12189
06991777 12190#: builtin/grep.c:833
90314792
JX
12191msgid "process binary files with textconv filters"
12192msgstr "用 textconv 过滤器处理二进制文件"
12193
06991777 12194#: builtin/grep.c:835
4c27fcb5
JX
12195msgid "search in subdirectories (default)"
12196msgstr "在子目录中寻找(默认)"
12197
06991777 12198#: builtin/grep.c:837
ef317cd5 12199msgid "descend at most <depth> levels"
07432cef 12200msgstr "最多以指定的深度向下寻找"
ef317cd5 12201
06991777 12202#: builtin/grep.c:841
ef317cd5 12203msgid "use extended POSIX regular expressions"
07432cef 12204msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 12205
06991777 12206#: builtin/grep.c:844
ef317cd5 12207msgid "use basic POSIX regular expressions (default)"
07432cef 12208msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 12209
06991777 12210#: builtin/grep.c:847
ef317cd5 12211msgid "interpret patterns as fixed strings"
07432cef 12212msgstr "把模式解析为固定的字符串"
ef317cd5 12213
06991777 12214#: builtin/grep.c:850
ef317cd5 12215msgid "use Perl-compatible regular expressions"
07432cef 12216msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 12217
06991777 12218#: builtin/grep.c:853
ef317cd5 12219msgid "show line numbers"
07432cef 12220msgstr "显示行号"
ef317cd5 12221
06991777 12222#: builtin/grep.c:854
c1ac5258
JX
12223msgid "show column number of first match"
12224msgstr "显示第一个匹配的列号"
12225
06991777 12226#: builtin/grep.c:855
ef317cd5 12227msgid "don't show filenames"
07432cef 12228msgstr "不显示文件名"
ef317cd5 12229
06991777 12230#: builtin/grep.c:856
ef317cd5 12231msgid "show filenames"
07432cef 12232msgstr "显示文件名"
ef317cd5 12233
06991777 12234#: builtin/grep.c:858
ef317cd5 12235msgid "show filenames relative to top directory"
07432cef 12236msgstr "显示相对于顶级目录的文件名"
ef317cd5 12237
06991777 12238#: builtin/grep.c:860
ef317cd5 12239msgid "show only filenames instead of matching lines"
07432cef 12240msgstr "只显示文件名而不显示匹配的行"
ef317cd5 12241
06991777 12242#: builtin/grep.c:862
ef317cd5 12243msgid "synonym for --files-with-matches"
07432cef 12244msgstr "和 --files-with-matches 同义"
ef317cd5 12245
06991777 12246#: builtin/grep.c:865
ef317cd5 12247msgid "show only the names of files without match"
07432cef 12248msgstr "只显示未匹配的文件名"
ef317cd5 12249
06991777 12250#: builtin/grep.c:867
ef317cd5 12251msgid "print NUL after filenames"
07432cef 12252msgstr "在文件名后输出 NUL 字符"
ef317cd5 12253
06991777 12254#: builtin/grep.c:870
c1ac5258
JX
12255msgid "show only matching parts of a line"
12256msgstr "只显示行中的匹配的部分"
12257
06991777 12258#: builtin/grep.c:872
ef317cd5 12259msgid "show the number of matches instead of matching lines"
07432cef 12260msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 12261
06991777 12262#: builtin/grep.c:873
ef317cd5 12263msgid "highlight matches"
07432cef 12264msgstr "高亮显示匹配项"
ef317cd5 12265
06991777 12266#: builtin/grep.c:875
ef317cd5 12267msgid "print empty line between matches from different files"
07432cef 12268msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 12269
06991777 12270#: builtin/grep.c:877
ef317cd5 12271msgid "show filename only once above matches from same file"
07432cef 12272msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 12273
06991777 12274#: builtin/grep.c:880
ef317cd5 12275msgid "show <n> context lines before and after matches"
07432cef 12276msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 12277
06991777 12278#: builtin/grep.c:883
ef317cd5 12279msgid "show <n> context lines before matches"
07432cef 12280msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 12281
06991777 12282#: builtin/grep.c:885
ef317cd5 12283msgid "show <n> context lines after matches"
07432cef 12284msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 12285
06991777 12286#: builtin/grep.c:887
276ceeaa
JX
12287msgid "use <n> worker threads"
12288msgstr "使用 <n> 个工作线程"
12289
06991777 12290#: builtin/grep.c:888
ef317cd5 12291msgid "shortcut for -C NUM"
07432cef 12292msgstr "快捷键 -C 数字"
ef317cd5 12293
06991777 12294#: builtin/grep.c:891
ef317cd5 12295msgid "show a line with the function name before matches"
07432cef 12296msgstr "在匹配的前面显示一行函数名"
ef317cd5 12297
06991777 12298#: builtin/grep.c:893
ef317cd5 12299msgid "show the surrounding function"
07432cef 12300msgstr "显示所在函数的前后内容"
ef317cd5 12301
06991777 12302#: builtin/grep.c:896
ef317cd5 12303msgid "read patterns from file"
07432cef 12304msgstr "从文件读取模式"
ef317cd5 12305
06991777 12306#: builtin/grep.c:898
ef317cd5 12307msgid "match <pattern>"
07432cef 12308msgstr "匹配 <模式>"
ef317cd5 12309
06991777 12310#: builtin/grep.c:900
ef317cd5 12311msgid "combine patterns specified with -e"
07432cef 12312msgstr "组合用 -e 参数设定的模式"
ef317cd5 12313
06991777 12314#: builtin/grep.c:912
ef317cd5 12315msgid "indicate hit with exit status without output"
07432cef 12316msgstr "不输出,而用退出码标识命中状态"
ef317cd5 12317
06991777 12318#: builtin/grep.c:914
ef317cd5 12319msgid "show only matches from files that match all patterns"
07432cef 12320msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 12321
06991777 12322#: builtin/grep.c:916
07432cef
WS
12323msgid "show parse tree for grep expression"
12324msgstr "显示 grep 表达式的解析树"
12325
06991777 12326#: builtin/grep.c:920
ef317cd5 12327msgid "pager"
07432cef 12328msgstr "分页"
ef317cd5 12329
06991777 12330#: builtin/grep.c:920
ef317cd5 12331msgid "show matching files in the pager"
07432cef 12332msgstr "分页显示匹配的文件"
ef317cd5 12333
06991777 12334#: builtin/grep.c:924
ef317cd5 12335msgid "allow calling of grep(1) (ignored by this build)"
07432cef 12336msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 12337
06991777 12338#: builtin/grep.c:988
c1ac5258
JX
12339msgid "no pattern given"
12340msgstr "未提供匹配模式"
c04f5ac3 12341
06991777 12342#: builtin/grep.c:1024
87cb7997
JX
12343msgid "--no-index or --untracked cannot be used with revs"
12344msgstr "--no-index 或 --untracked 不能和版本同时使用"
12345
06991777 12346#: builtin/grep.c:1032
87cb7997
JX
12347#, c-format
12348msgid "unable to resolve revision: %s"
12349msgstr "不能解析版本:%s"
12350
06991777 12351#: builtin/grep.c:1063
4c27fcb5
JX
12352msgid "invalid option combination, ignoring --threads"
12353msgstr "无效的选项组合,忽略 --threads"
276ceeaa 12354
06991777 12355#: builtin/grep.c:1066 builtin/pack-objects.c:3400
a4f16749
JX
12356msgid "no threads support, ignoring --threads"
12357msgstr "没有线程支持,忽略 --threads"
12358
06991777 12359#: builtin/grep.c:1069 builtin/index-pack.c:1503 builtin/pack-objects.c:2714
4c27fcb5
JX
12360#, c-format
12361msgid "invalid number of threads specified (%d)"
12362msgstr "指定的线程数无效(%d)"
12363
06991777 12364#: builtin/grep.c:1092
c04f5ac3
JX
12365msgid "--open-files-in-pager only works on the worktree"
12366msgstr "--open-files-in-pager 仅用于工作区"
12367
06991777 12368#: builtin/grep.c:1115
c1ac5258
JX
12369msgid "option not supported with --recurse-submodules"
12370msgstr "选项不支持和 --recurse-submodules 共用"
c04f5ac3 12371
06991777 12372#: builtin/grep.c:1121
c1ac5258
JX
12373msgid "--cached or --untracked cannot be used with --no-index"
12374msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
c04f5ac3 12375
06991777 12376#: builtin/grep.c:1127
c1ac5258
JX
12377msgid "--[no-]exclude-standard cannot be used for tracked contents"
12378msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
c04f5ac3 12379
06991777 12380#: builtin/grep.c:1135
c1ac5258
JX
12381msgid "both --cached and trees are given"
12382msgstr "同时给出了 --cached 和树对象"
12383
06991777 12384#: builtin/hash-object.c:85
ef317cd5 12385msgid ""
814ff314
JX
12386"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
12387"[--] <file>..."
ef317cd5 12388msgstr ""
814ff314
JX
12389"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
12390"[--] <文件>..."
ef317cd5 12391
06991777 12392#: builtin/hash-object.c:86
94550ed3
JX
12393msgid "git hash-object --stdin-paths"
12394msgstr "git hash-object --stdin-paths"
ef317cd5 12395
06991777 12396#: builtin/hash-object.c:98
ef317cd5 12397msgid "type"
07432cef 12398msgstr "类型"
ef317cd5 12399
06991777 12400#: builtin/hash-object.c:98
ef317cd5 12401msgid "object type"
07432cef 12402msgstr "对象类型"
ef317cd5 12403
06991777 12404#: builtin/hash-object.c:99
ef317cd5 12405msgid "write the object into the object database"
07432cef 12406msgstr "将对象写入对象数据库"
ef317cd5 12407
06991777 12408#: builtin/hash-object.c:101
ef317cd5 12409msgid "read the object from stdin"
07432cef 12410msgstr "从标准输入读取对象"
ef317cd5 12411
06991777 12412#: builtin/hash-object.c:103
ef317cd5 12413msgid "store file as is without filters"
07432cef 12414msgstr "原样存储文件不使用过滤器"
ef317cd5 12415
06991777 12416#: builtin/hash-object.c:104
220c313c
JX
12417msgid ""
12418"just hash any random garbage to create corrupt objects for debugging Git"
12419msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
12420
06991777 12421#: builtin/hash-object.c:105
ef317cd5 12422msgid "process file as it were from this path"
07432cef 12423msgstr "处理文件并假设其来自于此路径"
ef317cd5 12424
c1ac5258 12425#: builtin/help.c:46
ef317cd5 12426msgid "print all available commands"
07432cef 12427msgstr "打印所有可用的命令"
ef317cd5 12428
c1ac5258 12429#: builtin/help.c:47
a0b6b246
JX
12430msgid "exclude guides"
12431msgstr "排除向导"
12432
c1ac5258 12433#: builtin/help.c:48
4dcdc3d8
JX
12434msgid "print list of useful guides"
12435msgstr "显示有用的指南列表"
12436
c1ac5258
JX
12437#: builtin/help.c:49
12438msgid "print all configuration variable names"
12439msgstr "打印所有配置变量名称"
12440
12441#: builtin/help.c:51
ef317cd5 12442msgid "show man page"
07432cef 12443msgstr "显示 man 手册"
ef317cd5 12444
c1ac5258 12445#: builtin/help.c:52
ef317cd5 12446msgid "show manual in web browser"
07432cef 12447msgstr "在 web 浏览器中显示手册"
ef317cd5 12448
c1ac5258 12449#: builtin/help.c:54
ef317cd5 12450msgid "show info page"
07432cef 12451msgstr "显示 info 手册"
ef317cd5 12452
c1ac5258 12453#: builtin/help.c:56
fd8cb379
JX
12454msgid "print command description"
12455msgstr "打印命令描述"
12456
c1ac5258 12457#: builtin/help.c:61
814ff314
JX
12458msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
12459msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
ef317cd5 12460
c1ac5258 12461#: builtin/help.c:73
81809b99 12462#, c-format
8ada9598 12463msgid "unrecognized help format '%s'"
81809b99 12464msgstr "未能识别的帮助格式 '%s'"
8ada9598 12465
c1ac5258 12466#: builtin/help.c:100
8ada9598 12467msgid "Failed to start emacsclient."
81809b99 12468msgstr "无法启动 emacsclient。"
8ada9598 12469
c1ac5258 12470#: builtin/help.c:113
8ada9598 12471msgid "Failed to parse emacsclient version."
81809b99 12472msgstr "无法解析 emacsclient 版本。"
8ada9598 12473
c1ac5258 12474#: builtin/help.c:121
8ada9598
JX
12475#, c-format
12476msgid "emacsclient version '%d' too old (< 22)."
07432cef 12477msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 12478
c1ac5258 12479#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179
81809b99 12480#, c-format
5b04ee3b 12481msgid "failed to exec '%s'"
c1ac5258 12482msgstr "执行 '%s' 失败"
8ada9598 12483
c1ac5258 12484#: builtin/help.c:217
8ada9598
JX
12485#, c-format
12486msgid ""
12487"'%s': path for unsupported man viewer.\n"
12488"Please consider using 'man.<tool>.cmd' instead."
12489msgstr ""
81809b99 12490"'%s':不支持的 man 手册查看器的路径。\n"
d9d56b23 12491"请使用 'man.<工具>.cmd'。"
8ada9598 12492
c1ac5258 12493#: builtin/help.c:229
8ada9598
JX
12494#, c-format
12495msgid ""
12496"'%s': cmd for supported man viewer.\n"
12497"Please consider using 'man.<tool>.path' instead."
12498msgstr ""
81809b99 12499"'%s': 支持的 man 手册查看器命令。\n"
d9d56b23 12500"请使用 'man.<工具>.path'。"
8ada9598 12501
c1ac5258 12502#: builtin/help.c:346
8ada9598
JX
12503#, c-format
12504msgid "'%s': unknown man viewer."
81809b99 12505msgstr "'%s':未知的 man 查看器。"
8ada9598 12506
c1ac5258 12507#: builtin/help.c:363
8ada9598 12508msgid "no man viewer handled the request"
81809b99 12509msgstr "没有 man 查看器处理此请求"
8ada9598 12510
c1ac5258 12511#: builtin/help.c:371
8ada9598 12512msgid "no info viewer handled the request"
81809b99 12513msgstr "没有 info 查看器处理此请求"
8ada9598 12514
06991777 12515#: builtin/help.c:430 builtin/help.c:441 git.c:323
fd8cb379
JX
12516#, c-format
12517msgid "'%s' is aliased to '%s'"
12518msgstr "'%s' 是 '%s' 的别名"
220c313c 12519
06991777 12520#: builtin/help.c:444 git.c:347
4c27fcb5
JX
12521#, c-format
12522msgid "bad alias.%s string: %s"
12523msgstr "坏的 alias.%s 字符串:%s"
12524
12525#: builtin/help.c:473 builtin/help.c:503
fd8cb379
JX
12526#, c-format
12527msgid "usage: %s%s"
12528msgstr "用法:%s%s"
4dcdc3d8 12529
4c27fcb5 12530#: builtin/help.c:487
c1ac5258
JX
12531msgid "'git help config' for more information"
12532msgstr "'git help config' 获取更多信息"
4dcdc3d8 12533
4c27fcb5 12534#: builtin/index-pack.c:184
8ada9598
JX
12535#, c-format
12536msgid "object type mismatch at %s"
81809b99 12537msgstr "%s 的对象类型不匹配"
8ada9598 12538
4c27fcb5 12539#: builtin/index-pack.c:204
6acbf033
JX
12540#, c-format
12541msgid "did not receive expected object %s"
a0b6b246 12542msgstr "未能获取预期的对象 %s"
8ada9598 12543
4c27fcb5 12544#: builtin/index-pack.c:207
6acbf033
JX
12545#, c-format
12546msgid "object %s: expected type %s, found %s"
a0b6b246 12547msgstr "对象 %s:应为类型 %s,却是 %s"
6acbf033 12548
4c27fcb5 12549#: builtin/index-pack.c:249
81809b99 12550#, c-format
8ada9598
JX
12551msgid "cannot fill %d byte"
12552msgid_plural "cannot fill %d bytes"
81809b99 12553msgstr[0] "无法填充 %d 字节"
5ae481e0 12554msgstr[1] "无法填充 %d 字节"
8ada9598 12555
4c27fcb5 12556#: builtin/index-pack.c:259
8ada9598 12557msgid "early EOF"
81809b99 12558msgstr "过早的文件结束符(EOF)"
8ada9598 12559
4c27fcb5 12560#: builtin/index-pack.c:260
8ada9598 12561msgid "read error on input"
81809b99 12562msgstr "输入上的读错误"
8ada9598 12563
4c27fcb5 12564#: builtin/index-pack.c:272
8ada9598 12565msgid "used more bytes than were available"
81809b99 12566msgstr "用掉了超过可用的字节"
8ada9598 12567
06991777 12568#: builtin/index-pack.c:279 builtin/pack-objects.c:599
8ada9598 12569msgid "pack too large for current definition of off_t"
81809b99 12570msgstr "包太大超过了当前 off_t 的定义"
8ada9598 12571
4c27fcb5 12572#: builtin/index-pack.c:282 builtin/unpack-objects.c:94
a0b6b246
JX
12573msgid "pack exceeds maximum allowed size"
12574msgstr "包超过了最大允许值"
12575
06991777 12576#: builtin/index-pack.c:297 builtin/repack.c:250
81809b99 12577#, c-format
8ada9598 12578msgid "unable to create '%s'"
81809b99 12579msgstr "不能创建 '%s'"
8ada9598 12580
4c27fcb5 12581#: builtin/index-pack.c:303
81809b99 12582#, c-format
8ada9598 12583msgid "cannot open packfile '%s'"
81809b99 12584msgstr "无法打开包文件 '%s'"
8ada9598 12585
4c27fcb5 12586#: builtin/index-pack.c:317
8ada9598 12587msgid "pack signature mismatch"
81809b99 12588msgstr "包签名不匹配"
8ada9598 12589
4c27fcb5 12590#: builtin/index-pack.c:319
ef317cd5
JX
12591#, c-format
12592msgid "pack version %<PRIu32> unsupported"
07432cef 12593msgstr "不支持包版本 %<PRIu32>"
ef317cd5 12594
4c27fcb5 12595#: builtin/index-pack.c:337
8ada9598 12596#, c-format
5c57d762
JX
12597msgid "pack has bad object at offset %<PRIuMAX>: %s"
12598msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
8ada9598 12599
4c27fcb5 12600#: builtin/index-pack.c:457
8ada9598
JX
12601#, c-format
12602msgid "inflate returned %d"
81809b99 12603msgstr "解压缩返回 %d"
8ada9598 12604
4c27fcb5 12605#: builtin/index-pack.c:506
8ada9598 12606msgid "offset value overflow for delta base object"
81809b99 12607msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 12608
4c27fcb5 12609#: builtin/index-pack.c:514
8ada9598 12610msgid "delta base offset is out of bound"
81809b99 12611msgstr "delta 基准偏移越界"
8ada9598 12612
4c27fcb5 12613#: builtin/index-pack.c:522
81809b99 12614#, c-format
8ada9598 12615msgid "unknown object type %d"
81809b99 12616msgstr "未知对象类型 %d"
8ada9598 12617
4c27fcb5 12618#: builtin/index-pack.c:553
8ada9598 12619msgid "cannot pread pack file"
81809b99 12620msgstr "无法读取包文件"
8ada9598 12621
4c27fcb5 12622#: builtin/index-pack.c:555
8ada9598 12623#, c-format
5c57d762
JX
12624msgid "premature end of pack file, %<PRIuMAX> byte missing"
12625msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
12626msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
12627msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8ada9598 12628
4c27fcb5 12629#: builtin/index-pack.c:581
8ada9598 12630msgid "serious inflate inconsistency"
81809b99 12631msgstr "解压缩严重的不一致"
8ada9598 12632
4c27fcb5
JX
12633#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755
12634#: builtin/index-pack.c:794 builtin/index-pack.c:803
8ada9598
JX
12635#, c-format
12636msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 12637msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 12638
06991777
JX
12639#: builtin/index-pack.c:729 builtin/pack-objects.c:152
12640#: builtin/pack-objects.c:212 builtin/pack-objects.c:306
6792b93b
JX
12641#, c-format
12642msgid "unable to read %s"
12643msgstr "不能读 %s"
12644
4c27fcb5 12645#: builtin/index-pack.c:792
87cb7997
JX
12646#, c-format
12647msgid "cannot read existing object info %s"
12648msgstr "不能读取现存对象信息 %s"
12649
4c27fcb5 12650#: builtin/index-pack.c:800
6792b93b
JX
12651#, c-format
12652msgid "cannot read existing object %s"
12653msgstr "不能读取现存对象 %s"
12654
4c27fcb5 12655#: builtin/index-pack.c:814
81809b99 12656#, c-format
8ada9598 12657msgid "invalid blob object %s"
160fb2b2 12658msgstr "无效的数据对象 %s"
8ada9598 12659
4c27fcb5 12660#: builtin/index-pack.c:817 builtin/index-pack.c:836
fd8cb379
JX
12661msgid "fsck error in packed object"
12662msgstr "对打包对象 fsck 检查出错"
12663
4c27fcb5 12664#: builtin/index-pack.c:838
8ada9598
JX
12665#, c-format
12666msgid "Not all child objects of %s are reachable"
81809b99 12667msgstr "%s 的所有子对象并非都可达"
8ada9598 12668
4c27fcb5 12669#: builtin/index-pack.c:910 builtin/index-pack.c:941
8ada9598 12670msgid "failed to apply delta"
c1ac5258 12671msgstr "应用 delta 失败"
8ada9598 12672
4c27fcb5 12673#: builtin/index-pack.c:1109
8ada9598 12674msgid "Receiving objects"
81809b99 12675msgstr "接收对象中"
8ada9598 12676
4c27fcb5 12677#: builtin/index-pack.c:1109
8ada9598 12678msgid "Indexing objects"
81809b99 12679msgstr "索引对象中"
8ada9598 12680
4c27fcb5 12681#: builtin/index-pack.c:1143
8ada9598 12682msgid "pack is corrupted (SHA1 mismatch)"
81809b99 12683msgstr "包冲突(SHA1 不匹配)"
8ada9598 12684
4c27fcb5 12685#: builtin/index-pack.c:1148
8ada9598 12686msgid "cannot fstat packfile"
65e2041e 12687msgstr "不能对包文件调用 fstat"
8ada9598 12688
4c27fcb5 12689#: builtin/index-pack.c:1151
8ada9598 12690msgid "pack has junk at the end"
81809b99 12691msgstr "包的结尾有垃圾数据"
8ada9598 12692
4c27fcb5 12693#: builtin/index-pack.c:1163
6792b93b
JX
12694msgid "confusion beyond insanity in parse_pack_objects()"
12695msgstr "parse_pack_objects() 中遇到不可理喻的问题"
12696
4c27fcb5 12697#: builtin/index-pack.c:1186
8ada9598 12698msgid "Resolving deltas"
81809b99 12699msgstr "处理 delta 中"
8ada9598 12700
06991777 12701#: builtin/index-pack.c:1196 builtin/pack-objects.c:2486
07432cef 12702#, c-format
ef317cd5 12703msgid "unable to create thread: %s"
07432cef 12704msgstr "不能创建线程:%s"
ef317cd5 12705
4c27fcb5 12706#: builtin/index-pack.c:1237
8ada9598 12707msgid "confusion beyond insanity"
81809b99 12708msgstr "不可理喻"
8ada9598 12709
4c27fcb5 12710#: builtin/index-pack.c:1243
ef317cd5 12711#, c-format
5b04ee3b
JX
12712msgid "completed with %d local object"
12713msgid_plural "completed with %d local objects"
12714msgstr[0] "完成 %d 个本地对象"
12715msgstr[1] "完成 %d 个本地对象"
ef317cd5 12716
4c27fcb5 12717#: builtin/index-pack.c:1255
ef317cd5
JX
12718#, c-format
12719msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 12720msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 12721
4c27fcb5 12722#: builtin/index-pack.c:1259
8ada9598
JX
12723#, c-format
12724msgid "pack has %d unresolved delta"
12725msgid_plural "pack has %d unresolved deltas"
81809b99 12726msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 12727msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 12728
4c27fcb5 12729#: builtin/index-pack.c:1283
81809b99 12730#, c-format
8ada9598 12731msgid "unable to deflate appended object (%d)"
07432cef 12732msgstr "不能压缩附加对象(%d)"
8ada9598 12733
4c27fcb5 12734#: builtin/index-pack.c:1360
8ada9598
JX
12735#, c-format
12736msgid "local object %s is corrupt"
81809b99 12737msgstr "本地对象 %s 已损坏"
8ada9598 12738
4c27fcb5 12739#: builtin/index-pack.c:1374
31e5e17b
JX
12740#, c-format
12741msgid "packfile name '%s' does not end with '.pack'"
12742msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
8ada9598 12743
4c27fcb5 12744#: builtin/index-pack.c:1399
81809b99 12745#, c-format
31e5e17b
JX
12746msgid "cannot write %s file '%s'"
12747msgstr "无法写入 %s 文件 '%s'"
8ada9598 12748
4c27fcb5 12749#: builtin/index-pack.c:1407
81809b99 12750#, c-format
31e5e17b
JX
12751msgid "cannot close written %s file '%s'"
12752msgstr "无法关闭已写入的 %s 文件 '%s'"
12753
4c27fcb5 12754#: builtin/index-pack.c:1431
31e5e17b
JX
12755msgid "error while closing pack file"
12756msgstr "关闭包文件时出错"
8ada9598 12757
4c27fcb5 12758#: builtin/index-pack.c:1445
8ada9598 12759msgid "cannot store pack file"
81809b99 12760msgstr "无法存储包文件"
8ada9598 12761
4c27fcb5 12762#: builtin/index-pack.c:1453
8ada9598 12763msgid "cannot store index file"
81809b99 12764msgstr "无法存储索引文件"
8ada9598 12765
06991777 12766#: builtin/index-pack.c:1497 builtin/pack-objects.c:2725
07432cef 12767#, c-format
ef317cd5 12768msgid "bad pack.indexversion=%<PRIu32>"
07432cef 12769msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 12770
4c27fcb5 12771#: builtin/index-pack.c:1565
81809b99 12772#, c-format
8ada9598 12773msgid "Cannot open existing pack file '%s'"
81809b99 12774msgstr "无法打开现存包文件 '%s'"
8ada9598 12775
4c27fcb5 12776#: builtin/index-pack.c:1567
81809b99 12777#, c-format
8ada9598 12778msgid "Cannot open existing pack idx file for '%s'"
81809b99 12779msgstr "无法为 %s 打开包索引文件"
8ada9598 12780
4c27fcb5 12781#: builtin/index-pack.c:1615
81809b99 12782#, c-format
8ada9598
JX
12783msgid "non delta: %d object"
12784msgid_plural "non delta: %d objects"
81809b99 12785msgstr[0] "非 delta:%d 个对象"
5ae481e0 12786msgstr[1] "非 delta:%d 个对象"
8ada9598 12787
4c27fcb5 12788#: builtin/index-pack.c:1622
8ada9598
JX
12789#, c-format
12790msgid "chain length = %d: %lu object"
12791msgid_plural "chain length = %d: %lu objects"
81809b99 12792msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 12793msgstr[1] "链长 = %d: %lu 对象"
8ada9598 12794
4c27fcb5 12795#: builtin/index-pack.c:1659
31e5e17b
JX
12796msgid "Cannot come back to cwd"
12797msgstr "无法返回当前工作目录"
5b04ee3b 12798
4c27fcb5
JX
12799#: builtin/index-pack.c:1708 builtin/index-pack.c:1711
12800#: builtin/index-pack.c:1727 builtin/index-pack.c:1731
81809b99 12801#, c-format
8ada9598 12802msgid "bad %s"
81809b99 12803msgstr "错误选项 %s"
8ada9598 12804
4c27fcb5 12805#: builtin/index-pack.c:1747
8ada9598 12806msgid "--fix-thin cannot be used without --stdin"
649900bc 12807msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 12808
4c27fcb5 12809#: builtin/index-pack.c:1749
1a79b2f1
JX
12810msgid "--stdin requires a git repository"
12811msgstr "--stdin 需要一个 git 仓库"
12812
4c27fcb5 12813#: builtin/index-pack.c:1755
8ada9598 12814msgid "--verify with no packfile name given"
dbd6cced 12815msgstr "--verify 没有提供包文件名参数"
8ada9598 12816
4c27fcb5 12817#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580
fd8cb379
JX
12818msgid "fsck error in pack objects"
12819msgstr "在打包对象中 fsck 检查出错"
12820
a4f16749 12821#: builtin/init-db.c:61
c04f5ac3
JX
12822#, c-format
12823msgid "cannot stat template '%s'"
65e2041e 12824msgstr "不能对模版 '%s' 调用 stat"
c04f5ac3 12825
a4f16749 12826#: builtin/init-db.c:66
c04f5ac3
JX
12827#, c-format
12828msgid "cannot opendir '%s'"
12829msgstr "不能打开目录 '%s'"
12830
c1ac5258 12831#: builtin/init-db.c:78
c04f5ac3
JX
12832#, c-format
12833msgid "cannot readlink '%s'"
12834msgstr "不能读取链接 '%s'"
12835
c1ac5258 12836#: builtin/init-db.c:80
c04f5ac3
JX
12837#, c-format
12838msgid "cannot symlink '%s' '%s'"
90e6ef53 12839msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3 12840
c1ac5258 12841#: builtin/init-db.c:86
c04f5ac3
JX
12842#, c-format
12843msgid "cannot copy '%s' to '%s'"
12844msgstr "不能拷贝 '%s' 至 '%s'"
12845
c1ac5258 12846#: builtin/init-db.c:90
c04f5ac3
JX
12847#, c-format
12848msgid "ignoring template %s"
12849msgstr "忽略模版 %s"
12850
c1ac5258 12851#: builtin/init-db.c:121
c04f5ac3 12852#, c-format
fd8cb379
JX
12853msgid "templates not found in %s"
12854msgstr "没有在 %s 中找到模版"
c04f5ac3 12855
c1ac5258 12856#: builtin/init-db.c:136
c04f5ac3 12857#, c-format
5b04ee3b
JX
12858msgid "not copying templates from '%s': %s"
12859msgstr "没有从 '%s' 复制模版:%s"
c04f5ac3 12860
c1ac5258 12861#: builtin/init-db.c:329
c04f5ac3
JX
12862#, c-format
12863msgid "unable to handle file type %d"
12864msgstr "不能处理 %d 类型的文件"
12865
c1ac5258 12866#: builtin/init-db.c:332
c04f5ac3
JX
12867#, c-format
12868msgid "unable to move %s to %s"
12869msgstr "不能移动 %s 至 %s"
12870
c1ac5258 12871#: builtin/init-db.c:349 builtin/init-db.c:352
a0b6b246
JX
12872#, c-format
12873msgid "%s already exists"
12874msgstr "%s 已经存在"
12875
c1ac5258 12876#: builtin/init-db.c:405
c04f5ac3 12877#, c-format
5c57d762
JX
12878msgid "Reinitialized existing shared Git repository in %s%s\n"
12879msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
c04f5ac3 12880
c1ac5258 12881#: builtin/init-db.c:406
5c57d762
JX
12882#, c-format
12883msgid "Reinitialized existing Git repository in %s%s\n"
12884msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
c04f5ac3 12885
c1ac5258 12886#: builtin/init-db.c:410
5c57d762
JX
12887#, c-format
12888msgid "Initialized empty shared Git repository in %s%s\n"
9a4b694c 12889msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
c04f5ac3 12890
c1ac5258 12891#: builtin/init-db.c:411
5c57d762
JX
12892#, c-format
12893msgid "Initialized empty Git repository in %s%s\n"
9a4b694c 12894msgstr "已初始化空的 Git 仓库于 %s%s\n"
c04f5ac3 12895
4c27fcb5 12896#: builtin/init-db.c:460
ef317cd5 12897msgid ""
a77c07d9 12898"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
814ff314 12899"shared[=<permissions>]] [<directory>]"
ef317cd5 12900msgstr ""
07432cef 12901"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
814ff314 12902"[<目录>]"
ef317cd5 12903
4c27fcb5 12904#: builtin/init-db.c:483
ef317cd5 12905msgid "permissions"
07432cef 12906msgstr "权限"
ef317cd5 12907
4c27fcb5 12908#: builtin/init-db.c:484
ef317cd5 12909msgid "specify that the git repository is to be shared amongst several users"
160fb2b2 12910msgstr "指定 git 仓库是多个用户之间共享的"
ef317cd5 12911
4c27fcb5 12912#: builtin/init-db.c:518 builtin/init-db.c:523
c1ac5258
JX
12913#, c-format
12914msgid "cannot mkdir %s"
12915msgstr "不能创建目录 %s"
12916
4c27fcb5 12917#: builtin/init-db.c:527
c04f5ac3
JX
12918#, c-format
12919msgid "cannot chdir to %s"
12920msgstr "不能切换目录到 %s"
12921
4c27fcb5 12922#: builtin/init-db.c:548
c04f5ac3
JX
12923#, c-format
12924msgid ""
12925"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
12926"dir=<directory>)"
1e607449 12927msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
c04f5ac3 12928
4c27fcb5 12929#: builtin/init-db.c:576
c04f5ac3
JX
12930#, c-format
12931msgid "Cannot access work tree '%s'"
12932msgstr "不能访问工作区 '%s'"
12933
220c313c
JX
12934#: builtin/interpret-trailers.c:15
12935msgid ""
276ceeaa
JX
12936"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
12937"<token>[(=|:)<value>])...] [<file>...]"
3495628d
JX
12938msgstr ""
12939"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
12940">])...] [<文件>...]"
276ceeaa 12941
4c27fcb5 12942#: builtin/interpret-trailers.c:94
276ceeaa
JX
12943msgid "edit files in place"
12944msgstr "在原位编辑文件"
220c313c 12945
4c27fcb5 12946#: builtin/interpret-trailers.c:95
220c313c 12947msgid "trim empty trailers"
6937cb4e
JX
12948msgstr "删除空的尾部署名"
12949
4c27fcb5 12950#: builtin/interpret-trailers.c:98
6937cb4e
JX
12951msgid "where to place the new trailer"
12952msgstr "在哪里放置新的尾部署名"
220c313c 12953
4c27fcb5 12954#: builtin/interpret-trailers.c:100
6937cb4e
JX
12955msgid "action if trailer already exists"
12956msgstr "当尾部署名已经存在时所采取的动作"
12957
4c27fcb5 12958#: builtin/interpret-trailers.c:102
6937cb4e
JX
12959msgid "action if trailer is missing"
12960msgstr "当尾部署名缺失时所采取的动作"
12961
4c27fcb5 12962#: builtin/interpret-trailers.c:104
6937cb4e
JX
12963msgid "output only the trailers"
12964msgstr "只输出尾部署名"
12965
4c27fcb5 12966#: builtin/interpret-trailers.c:105
6937cb4e
JX
12967msgid "do not apply config rules"
12968msgstr "不要应用配置规则"
12969
4c27fcb5 12970#: builtin/interpret-trailers.c:106
6937cb4e
JX
12971msgid "join whitespace-continued values"
12972msgstr "连接空白折行的值"
12973
4c27fcb5 12974#: builtin/interpret-trailers.c:107
6937cb4e
JX
12975msgid "set parsing options"
12976msgstr "设置解析选项"
12977
4c27fcb5
JX
12978#: builtin/interpret-trailers.c:109
12979msgid "do not treat --- specially"
12980msgstr "不要对 --- 特殊处理"
12981
12982#: builtin/interpret-trailers.c:110
220c313c 12983msgid "trailer"
6937cb4e 12984msgstr "尾部署名"
220c313c 12985
4c27fcb5 12986#: builtin/interpret-trailers.c:111
220c313c 12987msgid "trailer(s) to add"
6937cb4e 12988msgstr "要添加的尾部署名"
220c313c 12989
4c27fcb5 12990#: builtin/interpret-trailers.c:120
6937cb4e
JX
12991msgid "--trailer with --only-input does not make sense"
12992msgstr "--trailer 和 --only-input 同时使用没有意义"
12993
4c27fcb5 12994#: builtin/interpret-trailers.c:130
276ceeaa
JX
12995msgid "no input file given for in-place editing"
12996msgstr "没有给出要原位编辑的文件"
12997
06991777 12998#: builtin/log.c:55
7aea43ff 12999msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
d9d56b23 13000msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
ef317cd5 13001
06991777 13002#: builtin/log.c:56
814ff314
JX
13003msgid "git show [<options>] <object>..."
13004msgstr "git show [<选项>] <对象>..."
ef317cd5 13005
06991777 13006#: builtin/log.c:100
220c313c
JX
13007#, c-format
13008msgid "invalid --decorate option: %s"
13009msgstr "无效的 --decorate 选项:%s"
13010
06991777 13011#: builtin/log.c:163
ef317cd5 13012msgid "suppress diff output"
07432cef 13013msgstr "不显示差异输出"
ef317cd5 13014
06991777 13015#: builtin/log.c:164
ef317cd5 13016msgid "show source"
07432cef 13017msgstr "显示源"
ef317cd5 13018
06991777 13019#: builtin/log.c:165
07432cef
WS
13020msgid "Use mail map file"
13021msgstr "使用邮件映射文件"
13022
06991777 13023#: builtin/log.c:167
5809aa05
JX
13024msgid "only decorate refs that match <pattern>"
13025msgstr "只修饰与 <模式> 匹配的引用"
13026
06991777 13027#: builtin/log.c:169
5809aa05
JX
13028msgid "do not decorate refs that match <pattern>"
13029msgstr "不修饰和 <模式> 匹配的引用"
13030
06991777 13031#: builtin/log.c:170
ef317cd5 13032msgid "decorate options"
07432cef 13033msgstr "修饰选项"
ef317cd5 13034
06991777 13035#: builtin/log.c:173
220c313c
JX
13036msgid "Process line range n,m in file, counting from 1"
13037msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
13038
06991777 13039#: builtin/log.c:271
c04f5ac3
JX
13040#, c-format
13041msgid "Final output: %d %s\n"
13042msgstr "最终输出:%d %s\n"
13043
06991777 13044#: builtin/log.c:525
220c313c
JX
13045#, c-format
13046msgid "git show %s: bad file"
13047msgstr "git show %s: 损坏的文件"
13048
06991777 13049#: builtin/log.c:540 builtin/log.c:634
c04f5ac3
JX
13050#, c-format
13051msgid "Could not read object %s"
90e6ef53 13052msgstr "不能读取对象 %s"
c04f5ac3 13053
06991777 13054#: builtin/log.c:659
c04f5ac3
JX
13055#, c-format
13056msgid "Unknown type: %d"
13057msgstr "未知类型:%d"
13058
06991777 13059#: builtin/log.c:780
c04f5ac3
JX
13060msgid "format.headers without value"
13061msgstr "format.headers 没有值"
13062
06991777 13063#: builtin/log.c:881
c04f5ac3
JX
13064msgid "name of output directory is too long"
13065msgstr "输出目录名太长"
13066
06991777 13067#: builtin/log.c:897
c04f5ac3
JX
13068#, c-format
13069msgid "Cannot open patch file %s"
13070msgstr "无法打开补丁文件 %s"
13071
06991777 13072#: builtin/log.c:914
c04f5ac3
JX
13073msgid "Need exactly one range."
13074msgstr "只需要一个范围。"
13075
06991777 13076#: builtin/log.c:924
c04f5ac3
JX
13077msgid "Not a range."
13078msgstr "不是一个范围。"
13079
06991777 13080#: builtin/log.c:1047
c04f5ac3
JX
13081msgid "Cover letter needs email format"
13082msgstr "信封需要邮件地址格式"
13083
06991777 13084#: builtin/log.c:1132
c04f5ac3
JX
13085#, c-format
13086msgid "insane in-reply-to: %s"
13087msgstr "不正常的 in-reply-to:%s"
13088
06991777 13089#: builtin/log.c:1159
814ff314
JX
13090msgid "git format-patch [<options>] [<since> | <revision-range>]"
13091msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
ef317cd5 13092
06991777 13093#: builtin/log.c:1217
c04f5ac3
JX
13094msgid "Two output directories?"
13095msgstr "两个输出目录?"
13096
06991777 13097#: builtin/log.c:1324 builtin/log.c:2068 builtin/log.c:2070 builtin/log.c:2082
5b04ee3b
JX
13098#, c-format
13099msgid "Unknown commit %s"
13100msgstr "未知提交 %s"
13101
06991777 13102#: builtin/log.c:1334 builtin/notes.c:897 builtin/tag.c:526
5b04ee3b
JX
13103#, c-format
13104msgid "Failed to resolve '%s' as a valid ref."
13105msgstr "无法解析 '%s' 为一个有效引用。"
13106
06991777 13107#: builtin/log.c:1339
5b04ee3b
JX
13108msgid "Could not find exact merge base."
13109msgstr "不能找到准确的合并基线。"
13110
06991777 13111#: builtin/log.c:1343
5b04ee3b
JX
13112msgid ""
13113"Failed to get upstream, if you want to record base commit automatically,\n"
13114"please use git branch --set-upstream-to to track a remote branch.\n"
13115"Or you could specify base commit by --base=<base-commit-id> manually."
13116msgstr ""
13117"无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
aef18cc6 13118"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
58b6f078 13119"参数 --base=<基线提交> 手动指定一个基线提交。"
5b04ee3b 13120
06991777 13121#: builtin/log.c:1363
5b04ee3b
JX
13122msgid "Failed to find exact merge base"
13123msgstr "无法找到准确的合并基线"
13124
06991777 13125#: builtin/log.c:1374
5b04ee3b
JX
13126msgid "base commit should be the ancestor of revision list"
13127msgstr "基线提交应该是版本列表的祖先"
13128
06991777 13129#: builtin/log.c:1378
5b04ee3b
JX
13130msgid "base commit shouldn't be in revision list"
13131msgstr "基线提交不应该出现在版本列表中"
13132
06991777 13133#: builtin/log.c:1431
5b04ee3b 13134msgid "cannot get patch id"
aef18cc6 13135msgstr "无法得到补丁 id"
5b04ee3b 13136
06991777 13137#: builtin/log.c:1483
4c27fcb5
JX
13138msgid "failed to infer range-diff ranges"
13139msgstr "无法推断 range-diff 范围"
13140
06991777 13141#: builtin/log.c:1528
ef317cd5 13142msgid "use [PATCH n/m] even with a single patch"
07432cef 13143msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 13144
06991777 13145#: builtin/log.c:1531
ef317cd5 13146msgid "use [PATCH] even with multiple patches"
07432cef 13147msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 13148
06991777 13149#: builtin/log.c:1535
ef317cd5 13150msgid "print patches to standard out"
07432cef 13151msgstr "打印补丁到标准输出"
c04f5ac3 13152
06991777 13153#: builtin/log.c:1537
ef317cd5 13154msgid "generate a cover letter"
07432cef 13155msgstr "生成一封附信"
c04f5ac3 13156
06991777 13157#: builtin/log.c:1539
ef317cd5 13158msgid "use simple number sequence for output file names"
07432cef 13159msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 13160
06991777 13161#: builtin/log.c:1540
ef317cd5 13162msgid "sfx"
07432cef 13163msgstr "后缀"
ef317cd5 13164
06991777 13165#: builtin/log.c:1541
ef317cd5 13166msgid "use <sfx> instead of '.patch'"
07432cef 13167msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 13168
06991777 13169#: builtin/log.c:1543
ef317cd5 13170msgid "start numbering patches at <n> instead of 1"
07432cef
WS
13171msgstr "补丁以 <n> 开始编号,而不是1"
13172
06991777 13173#: builtin/log.c:1545
07432cef
WS
13174msgid "mark the series as Nth re-roll"
13175msgstr "标记补丁系列是第几次重制"
ef317cd5 13176
06991777 13177#: builtin/log.c:1547
a0b6b246
JX
13178msgid "Use [RFC PATCH] instead of [PATCH]"
13179msgstr "使用 [RFC PATCH] 代替 [PATCH]"
13180
06991777 13181#: builtin/log.c:1550
ef317cd5 13182msgid "Use [<prefix>] instead of [PATCH]"
07432cef 13183msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 13184
06991777 13185#: builtin/log.c:1553
ef317cd5 13186msgid "store resulting files in <dir>"
d9d56b23 13187msgstr "把结果文件存储在 <目录>"
ef317cd5 13188
06991777 13189#: builtin/log.c:1556
ef317cd5 13190msgid "don't strip/add [PATCH]"
07432cef 13191msgstr "不删除/添加 [PATCH]"
ef317cd5 13192
06991777 13193#: builtin/log.c:1559
ef317cd5 13194msgid "don't output binary diffs"
07432cef 13195msgstr "不输出二进制差异"
ef317cd5 13196
06991777 13197#: builtin/log.c:1561
89f80d72
JX
13198msgid "output all-zero hash in From header"
13199msgstr "在 From 头信息中输出全为零的哈希值"
13200
06991777 13201#: builtin/log.c:1563
ef317cd5 13202msgid "don't include a patch matching a commit upstream"
07432cef 13203msgstr "不包含已在上游提交中的补丁"
ef317cd5 13204
06991777 13205#: builtin/log.c:1565
ef317cd5 13206msgid "show patch format instead of default (patch + stat)"
07432cef 13207msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 13208
06991777 13209#: builtin/log.c:1567
ef317cd5 13210msgid "Messaging"
07432cef 13211msgstr "邮件发送"
ef317cd5 13212
06991777 13213#: builtin/log.c:1568
ef317cd5 13214msgid "header"
07432cef 13215msgstr "header"
ef317cd5 13216
06991777 13217#: builtin/log.c:1569
ef317cd5 13218msgid "add email header"
07432cef 13219msgstr "添加邮件头"
ef317cd5 13220
06991777 13221#: builtin/log.c:1570 builtin/log.c:1572
ef317cd5 13222msgid "email"
07432cef 13223msgstr "邮件地址"
ef317cd5 13224
06991777 13225#: builtin/log.c:1570
ef317cd5 13226msgid "add To: header"
07432cef 13227msgstr "添加收件人"
ef317cd5 13228
06991777 13229#: builtin/log.c:1572
ef317cd5 13230msgid "add Cc: header"
07432cef 13231msgstr "添加抄送"
ef317cd5 13232
06991777 13233#: builtin/log.c:1574
2e8451e8 13234msgid "ident"
d9d56b23 13235msgstr "标识"
2e8451e8 13236
06991777 13237#: builtin/log.c:1575
2e8451e8 13238msgid "set From address to <ident> (or committer ident if absent)"
4375c10e 13239msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
2e8451e8 13240
06991777 13241#: builtin/log.c:1577
ef317cd5 13242msgid "message-id"
d9d56b23 13243msgstr "邮件标识"
ef317cd5 13244
06991777 13245#: builtin/log.c:1578
ef317cd5 13246msgid "make first mail a reply to <message-id>"
d9d56b23 13247msgstr "使第一封邮件作为对 <邮件标识> 的回复"
ef317cd5 13248
06991777 13249#: builtin/log.c:1579 builtin/log.c:1582
ef317cd5 13250msgid "boundary"
07432cef 13251msgstr "边界"
ef317cd5 13252
06991777 13253#: builtin/log.c:1580
ef317cd5 13254msgid "attach the patch"
07432cef 13255msgstr "附件方式添加补丁"
ef317cd5 13256
06991777 13257#: builtin/log.c:1583
ef317cd5 13258msgid "inline the patch"
07432cef 13259msgstr "内联显示补丁"
ef317cd5 13260
06991777 13261#: builtin/log.c:1587
ef317cd5 13262msgid "enable message threading, styles: shallow, deep"
07432cef 13263msgstr "启用邮件线索,风格:浅,深"
ef317cd5 13264
06991777 13265#: builtin/log.c:1589
ef317cd5 13266msgid "signature"
07432cef 13267msgstr "签名"
ef317cd5 13268
06991777 13269#: builtin/log.c:1590
ef317cd5 13270msgid "add a signature"
07432cef 13271msgstr "添加一个签名"
ef317cd5 13272
06991777 13273#: builtin/log.c:1591
5b04ee3b
JX
13274msgid "base-commit"
13275msgstr "基线提交"
13276
06991777 13277#: builtin/log.c:1592
5b04ee3b
JX
13278msgid "add prerequisite tree info to the patch series"
13279msgstr "为补丁列表添加前置树信息"
13280
06991777 13281#: builtin/log.c:1594
6acbf033
JX
13282msgid "add a signature from a file"
13283msgstr "从文件添加一个签名"
13284
06991777 13285#: builtin/log.c:1595
ef317cd5 13286msgid "don't print the patch filenames"
07432cef 13287msgstr "不要打印补丁文件名"
ef317cd5 13288
06991777 13289#: builtin/log.c:1597
6937cb4e
JX
13290msgid "show progress while generating patches"
13291msgstr "在生成补丁时显示进度"
13292
06991777 13293#: builtin/log.c:1598
4c27fcb5
JX
13294msgid "rev"
13295msgstr "版本"
13296
06991777 13297#: builtin/log.c:1599
4c27fcb5
JX
13298msgid "show changes against <rev> in cover letter or single patch"
13299msgstr "在附函或单个补丁中显示和 <rev> 的差异"
13300
06991777 13301#: builtin/log.c:1602
4c27fcb5
JX
13302msgid "show changes against <refspec> in cover letter or single patch"
13303msgstr "在附函或单个补丁中显示和 <refspec> 的差异"
13304
06991777 13305#: builtin/log.c:1604
4c27fcb5
JX
13306msgid "percentage by which creation is weighted"
13307msgstr "创建权重的百分比"
13308
06991777 13309#: builtin/log.c:1679
a4f16749
JX
13310#, c-format
13311msgid "invalid ident line: %s"
13312msgstr "包含无效的身份标识:%s"
13313
06991777 13314#: builtin/log.c:1694
c1ac5258
JX
13315msgid "-n and -k are mutually exclusive"
13316msgstr "-n 和 -k 互斥"
c04f5ac3 13317
06991777 13318#: builtin/log.c:1696
c1ac5258
JX
13319msgid "--subject-prefix/--rfc and -k are mutually exclusive"
13320msgstr "--subject-prefix/--rfc 和 -k 互斥"
c04f5ac3 13321
06991777 13322#: builtin/log.c:1704
c04f5ac3
JX
13323msgid "--name-only does not make sense"
13324msgstr "--name-only 无意义"
13325
06991777 13326#: builtin/log.c:1706
c04f5ac3
JX
13327msgid "--name-status does not make sense"
13328msgstr "--name-status 无意义"
13329
06991777 13330#: builtin/log.c:1708
c04f5ac3
JX
13331msgid "--check does not make sense"
13332msgstr "--check 无意义"
13333
06991777 13334#: builtin/log.c:1740
c04f5ac3
JX
13335msgid "standard output, or directory, which one?"
13336msgstr "标准输出或目录,哪一个?"
13337
06991777 13338#: builtin/log.c:1742
c04f5ac3
JX
13339#, c-format
13340msgid "Could not create directory '%s'"
90e6ef53 13341msgstr "不能创建目录 '%s'"
c04f5ac3 13342
06991777 13343#: builtin/log.c:1829
4c27fcb5
JX
13344msgid "--interdiff requires --cover-letter or single patch"
13345msgstr "--interdiff 需要 --cover-letter 或单一补丁"
13346
06991777 13347#: builtin/log.c:1833
4c27fcb5
JX
13348msgid "Interdiff:"
13349msgstr "版本间差异:"
13350
06991777 13351#: builtin/log.c:1834
4c27fcb5
JX
13352#, c-format
13353msgid "Interdiff against v%d:"
13354msgstr "对 v%d 的版本差异:"
13355
06991777 13356#: builtin/log.c:1840
4c27fcb5
JX
13357msgid "--creation-factor requires --range-diff"
13358msgstr "--creation-factor 需要 --range-diff"
13359
06991777 13360#: builtin/log.c:1844
4c27fcb5
JX
13361msgid "--range-diff requires --cover-letter or single patch"
13362msgstr "--range-diff 需要 --cover-letter 或单一补丁"
13363
06991777 13364#: builtin/log.c:1852
4c27fcb5
JX
13365msgid "Range-diff:"
13366msgstr "范围差异:"
13367
06991777 13368#: builtin/log.c:1853
4c27fcb5
JX
13369#, c-format
13370msgid "Range-diff against v%d:"
13371msgstr "对 v%d 的范围差异:"
13372
06991777 13373#: builtin/log.c:1864
6acbf033
JX
13374#, c-format
13375msgid "unable to read signature file '%s'"
13376msgstr "无法读取签名文件 '%s'"
13377
06991777 13378#: builtin/log.c:1900
6937cb4e
JX
13379msgid "Generating patches"
13380msgstr "生成补丁"
13381
06991777 13382#: builtin/log.c:1944
c04f5ac3
JX
13383msgid "Failed to create output files"
13384msgstr "无法创建输出文件"
13385
06991777 13386#: builtin/log.c:2003
ef317cd5 13387msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 13388msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 13389
06991777 13390#: builtin/log.c:2057
c04f5ac3
JX
13391#, c-format
13392msgid ""
13393"Could not find a tracked remote branch, please specify <upstream> manually.\n"
d9d56b23 13394msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
c04f5ac3 13395
06991777 13396#: builtin/ls-files.c:470
814ff314
JX
13397msgid "git ls-files [<options>] [<file>...]"
13398msgstr "git ls-files [<选项>] [<文件>...]"
ef317cd5 13399
06991777 13400#: builtin/ls-files.c:526
ef317cd5 13401msgid "identify the file status with tags"
07432cef 13402msgstr "用标签标识文件的状态"
ef317cd5 13403
06991777 13404#: builtin/ls-files.c:528
ef317cd5 13405msgid "use lowercase letters for 'assume unchanged' files"
07432cef 13406msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 13407
06991777 13408#: builtin/ls-files.c:530
5809aa05
JX
13409msgid "use lowercase letters for 'fsmonitor clean' files"
13410msgstr "使用小写字母表示 'fsmonitor clean' 文件"
13411
06991777 13412#: builtin/ls-files.c:532
ef317cd5 13413msgid "show cached files in the output (default)"
07432cef 13414msgstr "显示缓存的文件(默认)"
ef317cd5 13415
06991777 13416#: builtin/ls-files.c:534
ef317cd5 13417msgid "show deleted files in the output"
07432cef 13418msgstr "显示已删除的文件"
ef317cd5 13419
06991777 13420#: builtin/ls-files.c:536
ef317cd5 13421msgid "show modified files in the output"
07432cef 13422msgstr "显示已修改的文件"
ef317cd5 13423
06991777 13424#: builtin/ls-files.c:538
ef317cd5 13425msgid "show other files in the output"
07432cef 13426msgstr "显示其它文件"
ef317cd5 13427
06991777 13428#: builtin/ls-files.c:540
ef317cd5 13429msgid "show ignored files in the output"
07432cef 13430msgstr "显示忽略的文件"
ef317cd5 13431
06991777 13432#: builtin/ls-files.c:543
ef317cd5 13433msgid "show staged contents' object name in the output"
07432cef 13434msgstr "显示暂存区内容的对象名称"
ef317cd5 13435
06991777 13436#: builtin/ls-files.c:545
ef317cd5 13437msgid "show files on the filesystem that need to be removed"
07432cef 13438msgstr "显示文件系统需要删除的文件"
ef317cd5 13439
06991777 13440#: builtin/ls-files.c:547
220c313c 13441msgid "show 'other' directories' names only"
07432cef 13442msgstr "只显示“其他”目录的名称"
ef317cd5 13443
06991777 13444#: builtin/ls-files.c:549
276ceeaa
JX
13445msgid "show line endings of files"
13446msgstr "显示文件换行符格式"
13447
06991777 13448#: builtin/ls-files.c:551
ef317cd5 13449msgid "don't show empty directories"
07432cef 13450msgstr "不显示空目录"
ef317cd5 13451
06991777 13452#: builtin/ls-files.c:554
ef317cd5 13453msgid "show unmerged files in the output"
07432cef 13454msgstr "显示未合并的文件"
ef317cd5 13455
06991777 13456#: builtin/ls-files.c:556
ef317cd5 13457msgid "show resolve-undo information"
07432cef 13458msgstr "显示 resolve-undo 信息"
ef317cd5 13459
06991777 13460#: builtin/ls-files.c:558
ef317cd5 13461msgid "skip files matching pattern"
07432cef 13462msgstr "匹配排除文件的模式"
ef317cd5 13463
06991777 13464#: builtin/ls-files.c:561
ef317cd5 13465msgid "exclude patterns are read from <file>"
07432cef 13466msgstr "从 <文件> 中读取排除模式"
ef317cd5 13467
06991777 13468#: builtin/ls-files.c:564
ef317cd5 13469msgid "read additional per-directory exclude patterns in <file>"
07432cef 13470msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 13471
06991777 13472#: builtin/ls-files.c:566
ef317cd5 13473msgid "add the standard git exclusions"
07432cef 13474msgstr "添加标准的 git 排除"
ef317cd5 13475
06991777 13476#: builtin/ls-files.c:570
ef317cd5 13477msgid "make the output relative to the project top directory"
07432cef 13478msgstr "显示相对于顶级目录的文件名"
ef317cd5 13479
06991777 13480#: builtin/ls-files.c:573
a0b6b246
JX
13481msgid "recurse through submodules"
13482msgstr "在子模组中递归"
13483
06991777 13484#: builtin/ls-files.c:575
ef317cd5 13485msgid "if any <file> is not in the index, treat this as an error"
07432cef 13486msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 13487
06991777 13488#: builtin/ls-files.c:576
ef317cd5 13489msgid "tree-ish"
07432cef 13490msgstr "树或提交"
ef317cd5 13491
06991777 13492#: builtin/ls-files.c:577
ef317cd5 13493msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 13494msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5 13495
06991777 13496#: builtin/ls-files.c:579
ef317cd5 13497msgid "show debugging data"
07432cef 13498msgstr "显示调试数据"
ef317cd5 13499
fd8cb379 13500#: builtin/ls-remote.c:9
276ceeaa
JX
13501msgid ""
13502"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
13503" [-q | --quiet] [--exit-code] [--get-url]\n"
13504" [--symref] [<repository> [<refs>...]]"
13505msgstr ""
13506"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
13507" [-q | --quiet] [--exit-code] [--get-url]\n"
13508" [--symref] [<仓库> [<引用>...]]"
13509
fd8cb379 13510#: builtin/ls-remote.c:59
276ceeaa
JX
13511msgid "do not print remote URL"
13512msgstr "不打印远程 URL"
13513
06991777 13514#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1111
276ceeaa
JX
13515msgid "exec"
13516msgstr "exec"
13517
fd8cb379 13518#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
276ceeaa
JX
13519msgid "path of git-upload-pack on the remote host"
13520msgstr "远程主机上的 git-upload-pack 路径"
13521
fd8cb379 13522#: builtin/ls-remote.c:65
276ceeaa
JX
13523msgid "limit to tags"
13524msgstr "仅限于标签"
13525
fd8cb379 13526#: builtin/ls-remote.c:66
276ceeaa
JX
13527msgid "limit to heads"
13528msgstr "仅限于分支"
13529
fd8cb379 13530#: builtin/ls-remote.c:67
276ceeaa
JX
13531msgid "do not show peeled tags"
13532msgstr "不显示已解析的标签"
13533
fd8cb379 13534#: builtin/ls-remote.c:69
276ceeaa
JX
13535msgid "take url.<base>.insteadOf into account"
13536msgstr "参考 url.<base>.insteadOf 设置"
13537
fd8cb379 13538#: builtin/ls-remote.c:73
276ceeaa
JX
13539msgid "exit with exit code 2 if no matching refs are found"
13540msgstr "若未找到匹配的引用则以退出码2退出"
13541
fd8cb379 13542#: builtin/ls-remote.c:76
276ceeaa
JX
13543msgid "show underlying ref in addition to the object pointed by it"
13544msgstr "除了显示指向的对象外,显示指向的引用名"
13545
c1ac5258 13546#: builtin/ls-tree.c:30
ef317cd5 13547msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 13548msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5 13549
c1ac5258 13550#: builtin/ls-tree.c:128
ef317cd5 13551msgid "only show trees"
07432cef 13552msgstr "只显示树"
ef317cd5 13553
c1ac5258 13554#: builtin/ls-tree.c:130
ef317cd5 13555msgid "recurse into subtrees"
07432cef 13556msgstr "递归到子树"
ef317cd5 13557
c1ac5258 13558#: builtin/ls-tree.c:132
ef317cd5 13559msgid "show trees when recursing"
07432cef 13560msgstr "当递归时显示树"
ef317cd5 13561
c1ac5258 13562#: builtin/ls-tree.c:135
ef317cd5 13563msgid "terminate entries with NUL byte"
4375c10e 13564msgstr "条目以 NUL 字符终止"
ef317cd5 13565
c1ac5258 13566#: builtin/ls-tree.c:136
ef317cd5 13567msgid "include object size"
07432cef 13568msgstr "包括对象大小"
ef317cd5 13569
c1ac5258 13570#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
ef317cd5 13571msgid "list only filenames"
07432cef 13572msgstr "只列出文件名"
ef317cd5 13573
c1ac5258 13574#: builtin/ls-tree.c:143
ef317cd5 13575msgid "use full path names"
07432cef 13576msgstr "使用文件的全路径"
ef317cd5 13577
c1ac5258 13578#: builtin/ls-tree.c:145
ef317cd5 13579msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 13580msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5 13581
a4f16749
JX
13582#: builtin/mailsplit.c:241
13583#, c-format
13584msgid "empty mbox: '%s'"
13585msgstr "空的 mbox:'%s'"
13586
06991777 13587#: builtin/merge.c:53
814ff314
JX
13588msgid "git merge [<options>] [<commit>...]"
13589msgstr "git merge [<选项>] [<提交>...]"
ef317cd5 13590
06991777 13591#: builtin/merge.c:54
ef317cd5 13592msgid "git merge --abort"
07432cef 13593msgstr "git merge --abort"
ef317cd5 13594
06991777 13595#: builtin/merge.c:55
1a79b2f1
JX
13596msgid "git merge --continue"
13597msgstr "git merge --continue"
13598
06991777 13599#: builtin/merge.c:112
c04f5ac3
JX
13600msgid "switch `m' requires a value"
13601msgstr "开关 `m' 需要一个值"
13602
06991777
JX
13603#: builtin/merge.c:132
13604#, c-format
13605msgid "option `%s' requires a value"
13606msgstr "选项 `%s' 需要一个值"
13607
13608#: builtin/merge.c:178
c04f5ac3
JX
13609#, c-format
13610msgid "Could not find merge strategy '%s'.\n"
90e6ef53 13611msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 13612
06991777 13613#: builtin/merge.c:179
c04f5ac3
JX
13614#, c-format
13615msgid "Available strategies are:"
13616msgstr "可用的策略有:"
13617
06991777 13618#: builtin/merge.c:184
c04f5ac3
JX
13619#, c-format
13620msgid "Available custom strategies are:"
13621msgstr "可用的自定义策略有:"
13622
06991777 13623#: builtin/merge.c:235 builtin/pull.c:144
ef317cd5 13624msgid "do not show a diffstat at the end of the merge"
07432cef 13625msgstr "在合并的最后不显示差异统计"
ef317cd5 13626
06991777 13627#: builtin/merge.c:238 builtin/pull.c:147
ef317cd5 13628msgid "show a diffstat at the end of the merge"
07432cef 13629msgstr "在合并的最后显示差异统计"
ef317cd5 13630
06991777 13631#: builtin/merge.c:239 builtin/pull.c:150
ef317cd5 13632msgid "(synonym to --stat)"
07432cef 13633msgstr "(和 --stat 同义)"
ef317cd5 13634
06991777 13635#: builtin/merge.c:241 builtin/pull.c:153
ef317cd5 13636msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 13637msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 13638
06991777 13639#: builtin/merge.c:244 builtin/pull.c:159
ef317cd5 13640msgid "create a single commit instead of doing a merge"
07432cef 13641msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 13642
06991777 13643#: builtin/merge.c:246 builtin/pull.c:162
ef317cd5 13644msgid "perform a commit if the merge succeeds (default)"
07432cef 13645msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 13646
06991777 13647#: builtin/merge.c:248 builtin/pull.c:165
ef317cd5 13648msgid "edit message before committing"
07432cef 13649msgstr "在提交前编辑提交说明"
ef317cd5 13650
06991777 13651#: builtin/merge.c:249
ef317cd5 13652msgid "allow fast-forward (default)"
07432cef 13653msgstr "允许快进(默认)"
ef317cd5 13654
06991777 13655#: builtin/merge.c:251 builtin/pull.c:171
ef317cd5 13656msgid "abort if fast-forward is not possible"
07432cef 13657msgstr "如果不能快进就放弃合并"
ef317cd5 13658
06991777 13659#: builtin/merge.c:255 builtin/pull.c:174
5c57d762 13660msgid "verify that the named commit has a valid GPG signature"
1003b3a5
JX
13661msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
13662
06991777
JX
13663#: builtin/merge.c:256 builtin/notes.c:787 builtin/pull.c:178
13664#: builtin/rebase.c:1124 builtin/rebase--interactive.c:188 builtin/revert.c:111
ef317cd5 13665msgid "strategy"
07432cef 13666msgstr "策略"
ef317cd5 13667
06991777 13668#: builtin/merge.c:257 builtin/pull.c:179
ef317cd5 13669msgid "merge strategy to use"
07432cef 13670msgstr "要使用的合并策略"
ef317cd5 13671
06991777 13672#: builtin/merge.c:258 builtin/pull.c:182
ef317cd5 13673msgid "option=value"
07432cef 13674msgstr "option=value"
ef317cd5 13675
06991777 13676#: builtin/merge.c:259 builtin/pull.c:183
ef317cd5 13677msgid "option for selected merge strategy"
07432cef 13678msgstr "所选的合并策略的选项"
ef317cd5 13679
06991777 13680#: builtin/merge.c:261
ef317cd5 13681msgid "merge commit message (for a non-fast-forward merge)"
07432cef 13682msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 13683
06991777 13684#: builtin/merge.c:268
ef317cd5 13685msgid "abort the current in-progress merge"
07432cef 13686msgstr "放弃当前正在进行的合并"
ef317cd5 13687
06991777 13688#: builtin/merge.c:270
1a79b2f1
JX
13689msgid "continue the current in-progress merge"
13690msgstr "继续当前正在进行的合并"
13691
06991777 13692#: builtin/merge.c:272 builtin/pull.c:190
5b04ee3b
JX
13693msgid "allow merging unrelated histories"
13694msgstr "允许合并不相关的历史"
13695
06991777 13696#: builtin/merge.c:278
6937cb4e
JX
13697msgid "verify commit-msg hook"
13698msgstr "校验 commit-msg 钩子"
13699
06991777 13700#: builtin/merge.c:303
c04f5ac3 13701msgid "could not run stash."
a4f16749 13702msgstr "不能运行贮藏。"
c04f5ac3 13703
06991777 13704#: builtin/merge.c:308
c04f5ac3 13705msgid "stash failed"
a4f16749 13706msgstr "贮藏失败"
c04f5ac3 13707
06991777 13708#: builtin/merge.c:313
c04f5ac3
JX
13709#, c-format
13710msgid "not a valid object: %s"
13711msgstr "不是一个有效对象:%s"
13712
06991777 13713#: builtin/merge.c:335 builtin/merge.c:352
c04f5ac3
JX
13714msgid "read-tree failed"
13715msgstr "读取树失败"
13716
90e6ef53 13717# 译者:注意保持前导空格
06991777 13718#: builtin/merge.c:382
c04f5ac3
JX
13719msgid " (nothing to squash)"
13720msgstr " (无可压缩)"
13721
06991777 13722#: builtin/merge.c:393
c04f5ac3
JX
13723#, c-format
13724msgid "Squash commit -- not updating HEAD\n"
13725msgstr "压缩提交 -- 未更新 HEAD\n"
13726
06991777 13727#: builtin/merge.c:443
c04f5ac3
JX
13728#, c-format
13729msgid "No merge message -- not updating HEAD\n"
13730msgstr "无合并信息 -- 未更新 HEAD\n"
13731
06991777 13732#: builtin/merge.c:494
c04f5ac3
JX
13733#, c-format
13734msgid "'%s' does not point to a commit"
13735msgstr "'%s' 没有指向一个提交"
13736
06991777 13737#: builtin/merge.c:581
c04f5ac3
JX
13738#, c-format
13739msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 13740msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 13741
06991777 13742#: builtin/merge.c:702
c04f5ac3 13743msgid "Not handling anything other than two heads merge."
29004bbb 13744msgstr "未处理两个头合并之外的任何操作。"
c04f5ac3 13745
06991777 13746#: builtin/merge.c:716
c04f5ac3
JX
13747#, c-format
13748msgid "Unknown option for merge-recursive: -X%s"
13749msgstr "merge-recursive 的未知选项:-X%s"
13750
06991777 13751#: builtin/merge.c:731
c04f5ac3
JX
13752#, c-format
13753msgid "unable to write %s"
13754msgstr "不能写 %s"
13755
06991777 13756#: builtin/merge.c:783
c04f5ac3
JX
13757#, c-format
13758msgid "Could not read from '%s'"
13759msgstr "不能从 '%s' 读取"
13760
06991777 13761#: builtin/merge.c:792
c04f5ac3
JX
13762#, c-format
13763msgid "Not committing merge; use 'git commit' to complete the merge.\n"
13764msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
13765
06991777 13766#: builtin/merge.c:798
a77c07d9 13767#, c-format
c04f5ac3
JX
13768msgid ""
13769"Please enter a commit message to explain why this merge is necessary,\n"
13770"especially if it merges an updated upstream into a topic branch.\n"
13771"\n"
a77c07d9 13772"Lines starting with '%c' will be ignored, and an empty message aborts\n"
c04f5ac3
JX
13773"the commit.\n"
13774msgstr ""
13775"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
13776"合并到主题分支。\n"
13777"\n"
a77c07d9 13778"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
c04f5ac3 13779
06991777 13780#: builtin/merge.c:834
c04f5ac3
JX
13781msgid "Empty commit message."
13782msgstr "空提交信息。"
13783
06991777 13784#: builtin/merge.c:853
c04f5ac3
JX
13785#, c-format
13786msgid "Wonderful.\n"
13787msgstr "太棒了。\n"
13788
06991777 13789#: builtin/merge.c:906
c04f5ac3
JX
13790#, c-format
13791msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
13792msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
13793
06991777 13794#: builtin/merge.c:945
c04f5ac3 13795msgid "No current branch."
90e6ef53 13796msgstr "没有当前分支。"
c04f5ac3 13797
06991777 13798#: builtin/merge.c:947
c04f5ac3 13799msgid "No remote for the current branch."
160fb2b2 13800msgstr "当前分支没有对应的远程仓库。"
c04f5ac3 13801
06991777 13802#: builtin/merge.c:949
c04f5ac3 13803msgid "No default upstream defined for the current branch."
90e6ef53 13804msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 13805
06991777 13806#: builtin/merge.c:954
170e9899 13807#, c-format
2e8451e8
JX
13808msgid "No remote-tracking branch for %s from %s"
13809msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 13810
06991777 13811#: builtin/merge.c:1011
5c57d762
JX
13812#, c-format
13813msgid "Bad value '%s' in environment '%s'"
9a4b694c 13814msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
5c57d762 13815
06991777 13816#: builtin/merge.c:1114
5c57d762
JX
13817#, c-format
13818msgid "not something we can merge in %s: %s"
13819msgstr "不能在 %s 中合并:%s"
13820
06991777 13821#: builtin/merge.c:1148
5c57d762
JX
13822msgid "not something we can merge"
13823msgstr "不能合并"
13824
06991777 13825#: builtin/merge.c:1251
1a79b2f1
JX
13826msgid "--abort expects no arguments"
13827msgstr "--abort 不带参数"
13828
06991777 13829#: builtin/merge.c:1255
c04f5ac3 13830msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 13831msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 13832
06991777 13833#: builtin/merge.c:1267
1a79b2f1
JX
13834msgid "--continue expects no arguments"
13835msgstr "--continue 不带参数"
13836
06991777 13837#: builtin/merge.c:1271
1a79b2f1
JX
13838msgid "There is no merge in progress (MERGE_HEAD missing)."
13839msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
13840
06991777 13841#: builtin/merge.c:1287
c04f5ac3
JX
13842msgid ""
13843"You have not concluded your merge (MERGE_HEAD exists).\n"
220c313c 13844"Please, commit your changes before you merge."
c04f5ac3
JX
13845msgstr ""
13846"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 13847"请在合并前先提交您的修改。"
c04f5ac3 13848
06991777 13849#: builtin/merge.c:1294
c04f5ac3
JX
13850msgid ""
13851"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
220c313c 13852"Please, commit your changes before you merge."
c04f5ac3
JX
13853msgstr ""
13854"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 13855"请在合并前先提交您的修改。"
c04f5ac3 13856
06991777 13857#: builtin/merge.c:1297
c04f5ac3
JX
13858msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
13859msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
13860
06991777 13861#: builtin/merge.c:1306
c04f5ac3 13862msgid "You cannot combine --squash with --no-ff."
649900bc 13863msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 13864
06991777 13865#: builtin/merge.c:1314
c04f5ac3 13866msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 13867msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 13868
06991777 13869#: builtin/merge.c:1331
c04f5ac3
JX
13870msgid "Squash commit into empty head not supported yet"
13871msgstr "尚不支持到空分支的压缩提交"
13872
06991777 13873#: builtin/merge.c:1333
c04f5ac3
JX
13874msgid "Non-fast-forward commit does not make sense into an empty head"
13875msgstr "到空分支的非快进式提交没有意义"
13876
06991777 13877#: builtin/merge.c:1338
2e8451e8
JX
13878#, c-format
13879msgid "%s - not something we can merge"
13880msgstr "%s - 不能被合并"
13881
06991777 13882#: builtin/merge.c:1340
7aea43ff
JX
13883msgid "Can merge only exactly one commit into empty head"
13884msgstr "只能将一个提交合并到空分支上"
13885
06991777 13886#: builtin/merge.c:1422
5b04ee3b
JX
13887msgid "refusing to merge unrelated histories"
13888msgstr "拒绝合并无关的历史"
13889
06991777 13890#: builtin/merge.c:1431
6937cb4e 13891msgid "Already up to date."
5c57d762
JX
13892msgstr "已经是最新的。"
13893
06991777 13894#: builtin/merge.c:1441
c04f5ac3
JX
13895#, c-format
13896msgid "Updating %s..%s\n"
13897msgstr "更新 %s..%s\n"
13898
06991777 13899#: builtin/merge.c:1483
c04f5ac3
JX
13900#, c-format
13901msgid "Trying really trivial in-index merge...\n"
90e6ef53 13902msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 13903
06991777 13904#: builtin/merge.c:1490
c04f5ac3
JX
13905#, c-format
13906msgid "Nope.\n"
13907msgstr "无。\n"
13908
06991777 13909#: builtin/merge.c:1515
6937cb4e 13910msgid "Already up to date. Yeeah!"
5c57d762
JX
13911msgstr "已经是最新的。耶!"
13912
06991777 13913#: builtin/merge.c:1521
c04f5ac3 13914msgid "Not possible to fast-forward, aborting."
1aabac65 13915msgstr "无法快进,终止。"
c04f5ac3 13916
06991777 13917#: builtin/merge.c:1544 builtin/merge.c:1623
c04f5ac3
JX
13918#, c-format
13919msgid "Rewinding the tree to pristine...\n"
13920msgstr "将树回滚至原始状态...\n"
13921
06991777 13922#: builtin/merge.c:1548
c04f5ac3
JX
13923#, c-format
13924msgid "Trying merge strategy %s...\n"
13925msgstr "尝试合并策略 %s...\n"
13926
06991777 13927#: builtin/merge.c:1614
c04f5ac3
JX
13928#, c-format
13929msgid "No merge strategy handled the merge.\n"
13930msgstr "没有合并策略处理此合并。\n"
13931
06991777 13932#: builtin/merge.c:1616
c04f5ac3
JX
13933#, c-format
13934msgid "Merge with strategy %s failed.\n"
13935msgstr "使用策略 %s 合并失败。\n"
13936
06991777 13937#: builtin/merge.c:1625
c04f5ac3
JX
13938#, c-format
13939msgid "Using the %s to prepare resolving by hand.\n"
13940msgstr "使用 %s 以准备手工解决。\n"
13941
06991777 13942#: builtin/merge.c:1637
c04f5ac3
JX
13943#, c-format
13944msgid "Automatic merge went well; stopped before committing as requested\n"
13945msgstr "自动合并进展顺利,按要求在提交前停止\n"
13946
4c27fcb5 13947#: builtin/merge-base.c:32
814ff314
JX
13948msgid "git merge-base [-a | --all] <commit> <commit>..."
13949msgstr "git merge-base [-a | --all] <提交> <提交>..."
ef317cd5 13950
4c27fcb5 13951#: builtin/merge-base.c:33
814ff314
JX
13952msgid "git merge-base [-a | --all] --octopus <commit>..."
13953msgstr "git merge-base [-a | --all] --octopus <提交>..."
ef317cd5 13954
4c27fcb5 13955#: builtin/merge-base.c:34
ef317cd5 13956msgid "git merge-base --independent <commit>..."
07432cef 13957msgstr "git merge-base --independent <提交>..."
ef317cd5 13958
4c27fcb5 13959#: builtin/merge-base.c:35
ef317cd5 13960msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 13961msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5 13962
4c27fcb5 13963#: builtin/merge-base.c:36
cfff71a9 13964msgid "git merge-base --fork-point <ref> [<commit>]"
d9d56b23 13965msgstr "git merge-base --fork-point <引用> [<提交>]"
cfff71a9 13966
4c27fcb5 13967#: builtin/merge-base.c:153
ef317cd5 13968msgid "output all common ancestors"
07432cef 13969msgstr "输出所有共同的祖先"
ef317cd5 13970
4c27fcb5 13971#: builtin/merge-base.c:155
ef317cd5 13972msgid "find ancestors for a single n-way merge"
07432cef 13973msgstr "查找一个多路合并的祖先提交"
ef317cd5 13974
4c27fcb5 13975#: builtin/merge-base.c:157
ef317cd5 13976msgid "list revs not reachable from others"
07432cef 13977msgstr "显示不能被其他访问到的版本"
ef317cd5 13978
4c27fcb5 13979#: builtin/merge-base.c:159
ef317cd5 13980msgid "is the first one ancestor of the other?"
07432cef 13981msgstr "第一个是其他的祖先提交么?"
ef317cd5 13982
4c27fcb5 13983#: builtin/merge-base.c:161
cfff71a9 13984msgid "find where <commit> forked from reflog of <ref>"
e397e7e3 13985msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
cfff71a9 13986
a4f16749 13987#: builtin/merge-file.c:9
ef317cd5 13988msgid ""
814ff314
JX
13989"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
13990"<orig-file> <file2>"
ef317cd5 13991msgstr ""
814ff314
JX
13992"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
13993"件> <文件2>"
ef317cd5 13994
4c27fcb5 13995#: builtin/merge-file.c:35
ef317cd5 13996msgid "send results to standard output"
07432cef 13997msgstr "将结果发送到标准输出"
ef317cd5 13998
4c27fcb5 13999#: builtin/merge-file.c:36
ef317cd5 14000msgid "use a diff3 based merge"
07432cef 14001msgstr "使用基于 diff3 的合并"
ef317cd5 14002
4c27fcb5 14003#: builtin/merge-file.c:37
ef317cd5 14004msgid "for conflicts, use our version"
07432cef 14005msgstr "如果冲突,使用我们的版本"
ef317cd5 14006
4c27fcb5 14007#: builtin/merge-file.c:39
ef317cd5 14008msgid "for conflicts, use their version"
07432cef 14009msgstr "如果冲突,使用他们的版本"
ef317cd5 14010
4c27fcb5 14011#: builtin/merge-file.c:41
ef317cd5 14012msgid "for conflicts, use a union version"
07432cef 14013msgstr "如果冲突,使用联合版本"
ef317cd5 14014
4c27fcb5 14015#: builtin/merge-file.c:44
ef317cd5 14016msgid "for conflicts, use this marker size"
07432cef 14017msgstr "如果冲突,使用指定长度的标记"
ef317cd5 14018
4c27fcb5 14019#: builtin/merge-file.c:45
ef317cd5 14020msgid "do not warn about conflicts"
07432cef 14021msgstr "不要警告冲突"
ef317cd5 14022
4c27fcb5 14023#: builtin/merge-file.c:47
814ff314
JX
14024msgid "set labels for file1/orig-file/file2"
14025msgstr "为 文件1/初始文件/文件2 设置标签"
c04f5ac3 14026
06991777 14027#: builtin/merge-recursive.c:46
a0b6b246
JX
14028#, c-format
14029msgid "unknown option %s"
14030msgstr "未知选项 %s"
14031
06991777 14032#: builtin/merge-recursive.c:52
a0b6b246
JX
14033#, c-format
14034msgid "could not parse object '%s'"
14035msgstr "不能解析对象 '%s'"
14036
06991777 14037#: builtin/merge-recursive.c:56
a0b6b246
JX
14038#, c-format
14039msgid "cannot handle more than %d base. Ignoring %s."
14040msgid_plural "cannot handle more than %d bases. Ignoring %s."
14041msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
14042msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
14043
06991777 14044#: builtin/merge-recursive.c:64
a0b6b246
JX
14045msgid "not handling anything other than two heads merge."
14046msgstr "不能处理两个头合并之外的任何操作。"
14047
06991777 14048#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
a0b6b246
JX
14049#, c-format
14050msgid "could not resolve ref '%s'"
14051msgstr "无法解析引用 '%s'"
14052
06991777 14053#: builtin/merge-recursive.c:78
a0b6b246
JX
14054#, c-format
14055msgid "Merging %s with %s\n"
14056msgstr "合并 %s 和 %s\n"
14057
c1ac5258 14058#: builtin/mktree.c:66
ef317cd5 14059msgid "git mktree [-z] [--missing] [--batch]"
07432cef 14060msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 14061
c1ac5258 14062#: builtin/mktree.c:154
ef317cd5 14063msgid "input is NUL terminated"
07432cef 14064msgstr "输入以 NUL 字符终止"
c04f5ac3 14065
06991777 14066#: builtin/mktree.c:155 builtin/write-tree.c:26
ef317cd5 14067msgid "allow missing objects"
07432cef 14068msgstr "允许丢失的对象"
c04f5ac3 14069
c1ac5258 14070#: builtin/mktree.c:156
ef317cd5 14071msgid "allow creation of more than one tree"
07432cef 14072msgstr "允许创建一个以上的树"
c04f5ac3 14073
4c27fcb5
JX
14074#: builtin/multi-pack-index.c:8
14075msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
14076msgstr "git multi-pack-index [--object-dir=<目录>] (write|verify)"
14077
14078#: builtin/multi-pack-index.c:21
14079msgid "object directory containing set of packfile and pack-index pairs"
14080msgstr "包含成对包文件和包索引的对象目录"
14081
14082#: builtin/multi-pack-index.c:39
14083msgid "too many arguments"
14084msgstr "太多参数"
14085
14086#: builtin/multi-pack-index.c:48
14087#, c-format
14088msgid "unrecognized verb: %s"
14089msgstr "未能识别的动作:%s"
14090
06991777 14091#: builtin/mv.c:18
814ff314
JX
14092msgid "git mv [<options>] <source>... <destination>"
14093msgstr "git mv [<选项>] <源>... <目标>"
c04f5ac3 14094
06991777 14095#: builtin/mv.c:83
220c313c
JX
14096#, c-format
14097msgid "Directory %s is in index and no submodule?"
14098msgstr "目录 %s 在索引中并且不是子模组?"
14099
06991777 14100#: builtin/mv.c:85
220c313c 14101msgid "Please stage your changes to .gitmodules or stash them to proceed"
a4f16749 14102msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
220c313c 14103
06991777 14104#: builtin/mv.c:103
220c313c
JX
14105#, c-format
14106msgid "%.*s is in index"
14107msgstr "%.*s 在索引中"
14108
06991777 14109#: builtin/mv.c:125
ef317cd5 14110msgid "force move/rename even if target exists"
07432cef 14111msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 14112
06991777 14113#: builtin/mv.c:127
ef317cd5 14114msgid "skip move/rename errors"
07432cef 14115msgstr "跳过移动/重命名错误"
c04f5ac3 14116
06991777 14117#: builtin/mv.c:169
220c313c
JX
14118#, c-format
14119msgid "destination '%s' is not a directory"
14120msgstr "目标 '%s' 不是一个目录"
14121
06991777 14122#: builtin/mv.c:180
c04f5ac3
JX
14123#, c-format
14124msgid "Checking rename of '%s' to '%s'\n"
14125msgstr "检查 '%s' 到 '%s' 的重命名\n"
14126
06991777 14127#: builtin/mv.c:184
c04f5ac3
JX
14128msgid "bad source"
14129msgstr "坏的源"
14130
06991777 14131#: builtin/mv.c:187
c04f5ac3
JX
14132msgid "can not move directory into itself"
14133msgstr "不能将目录移动到自身"
14134
06991777 14135#: builtin/mv.c:190
c04f5ac3
JX
14136msgid "cannot move directory over file"
14137msgstr "不能将目录移动到文件"
14138
06991777 14139#: builtin/mv.c:199
c04f5ac3
JX
14140msgid "source directory is empty"
14141msgstr "源目录为空"
14142
06991777 14143#: builtin/mv.c:224
c04f5ac3
JX
14144msgid "not under version control"
14145msgstr "不在版本控制之下"
14146
06991777 14147#: builtin/mv.c:227
c04f5ac3
JX
14148msgid "destination exists"
14149msgstr "目标已存在"
14150
06991777 14151#: builtin/mv.c:235
c04f5ac3
JX
14152#, c-format
14153msgid "overwriting '%s'"
14154msgstr "覆盖 '%s'"
14155
06991777 14156#: builtin/mv.c:238
c04f5ac3
JX
14157msgid "Cannot overwrite"
14158msgstr "不能覆盖"
14159
06991777 14160#: builtin/mv.c:241
c04f5ac3
JX
14161msgid "multiple sources for the same target"
14162msgstr "同一目标具有多个源"
14163
06991777 14164#: builtin/mv.c:243
cfff71a9
JX
14165msgid "destination directory does not exist"
14166msgstr "目标目录不存在"
14167
06991777 14168#: builtin/mv.c:250
c04f5ac3
JX
14169#, c-format
14170msgid "%s, source=%s, destination=%s"
14171msgstr "%s,源=%s,目标=%s"
14172
06991777 14173#: builtin/mv.c:271
c04f5ac3
JX
14174#, c-format
14175msgid "Renaming %s to %s\n"
14176msgstr "重命名 %s 至 %s\n"
14177
06991777 14178#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:513
c04f5ac3
JX
14179#, c-format
14180msgid "renaming '%s' failed"
14181msgstr "重命名 '%s' 失败"
14182
c1ac5258 14183#: builtin/name-rev.c:355
814ff314
JX
14184msgid "git name-rev [<options>] <commit>..."
14185msgstr "git name-rev [<选项>] <提交>..."
ef317cd5 14186
c1ac5258 14187#: builtin/name-rev.c:356
814ff314
JX
14188msgid "git name-rev [<options>] --all"
14189msgstr "git name-rev [<选项>] --all"
ef317cd5 14190
c1ac5258 14191#: builtin/name-rev.c:357
814ff314
JX
14192msgid "git name-rev [<options>] --stdin"
14193msgstr "git name-rev [<选项>] --stdin"
ef317cd5 14194
c1ac5258 14195#: builtin/name-rev.c:413
ef317cd5 14196msgid "print only names (no SHA-1)"
07432cef 14197msgstr "只打印名称(无 SHA-1)"
ef317cd5 14198
c1ac5258 14199#: builtin/name-rev.c:414
ef317cd5 14200msgid "only use tags to name the commits"
55a16ee4 14201msgstr "只使用标签来命名提交"
ef317cd5 14202
c1ac5258 14203#: builtin/name-rev.c:416
ef317cd5 14204msgid "only use refs matching <pattern>"
07432cef 14205msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 14206
c1ac5258 14207#: builtin/name-rev.c:418
87cb7997
JX
14208msgid "ignore refs matching <pattern>"
14209msgstr "忽略和 <模式> 相匹配的引用"
14210
c1ac5258 14211#: builtin/name-rev.c:420
ef317cd5 14212msgid "list all commits reachable from all refs"
07432cef 14213msgstr "列出可以从所有引用访问的提交"
ef317cd5 14214
c1ac5258 14215#: builtin/name-rev.c:421
ef317cd5 14216msgid "read from stdin"
07432cef 14217msgstr "从标准输入读取"
ef317cd5 14218
c1ac5258 14219#: builtin/name-rev.c:422
90314792
JX
14220msgid "allow to print `undefined` names (default)"
14221msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 14222
c1ac5258 14223#: builtin/name-rev.c:428
2e8451e8 14224msgid "dereference tags in the input (internal use)"
55a16ee4 14225msgstr "反向解析输入中的标签(内部使用)"
2e8451e8 14226
c1ac5258 14227#: builtin/notes.c:28
814ff314 14228msgid "git notes [--ref <notes-ref>] [list [<object>]]"
07432cef 14229msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 14230
c1ac5258 14231#: builtin/notes.c:29
ef317cd5 14232msgid ""
814ff314 14233"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
04cb2f28 14234"| (-c | -C) <object>] [<object>]"
ef317cd5 14235msgstr ""
04cb2f28
JX
14236"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
14237"| (-c | -C) <对象>] [<对象>]"
ef317cd5 14238
c1ac5258 14239#: builtin/notes.c:30
814ff314 14240msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
07432cef 14241msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 14242
c1ac5258 14243#: builtin/notes.c:31
ef317cd5 14244msgid ""
814ff314 14245"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
04cb2f28 14246"(-c | -C) <object>] [<object>]"
ef317cd5 14247msgstr ""
04cb2f28
JX
14248"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
14249"(-c | -C) <对象>] [<对象>]"
ef317cd5 14250
c1ac5258 14251#: builtin/notes.c:32
814ff314 14252msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
04cb2f28 14253msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
ef317cd5 14254
c1ac5258 14255#: builtin/notes.c:33
814ff314 14256msgid "git notes [--ref <notes-ref>] show [<object>]"
07432cef 14257msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 14258
c1ac5258 14259#: builtin/notes.c:34
ef317cd5 14260msgid ""
814ff314 14261"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
07432cef 14262msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 14263
c1ac5258 14264#: builtin/notes.c:35
ef317cd5 14265msgid "git notes merge --commit [-v | -q]"
07432cef 14266msgstr "git notes merge --commit [-v | -q]"
ef317cd5 14267
c1ac5258 14268#: builtin/notes.c:36
ef317cd5 14269msgid "git notes merge --abort [-v | -q]"
07432cef 14270msgstr "git notes merge --abort [-v | -q]"
ef317cd5 14271
c1ac5258 14272#: builtin/notes.c:37
814ff314 14273msgid "git notes [--ref <notes-ref>] remove [<object>...]"
07432cef 14274msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 14275
c1ac5258 14276#: builtin/notes.c:38
5809aa05
JX
14277msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
14278msgstr "git notes [--ref <注解引用>] prune [-n] [-v]"
ef317cd5 14279
c1ac5258 14280#: builtin/notes.c:39
814ff314 14281msgid "git notes [--ref <notes-ref>] get-ref"
07432cef 14282msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 14283
c1ac5258 14284#: builtin/notes.c:44
ef317cd5 14285msgid "git notes [list [<object>]]"
07432cef 14286msgstr "git notes [list [<对象>]]"
ef317cd5 14287
c1ac5258 14288#: builtin/notes.c:49
ef317cd5 14289msgid "git notes add [<options>] [<object>]"
07432cef 14290msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 14291
c1ac5258 14292#: builtin/notes.c:54
ef317cd5 14293msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 14294msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 14295
c1ac5258 14296#: builtin/notes.c:55
ef317cd5 14297msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 14298msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 14299
c1ac5258 14300#: builtin/notes.c:60
ef317cd5 14301msgid "git notes append [<options>] [<object>]"
07432cef 14302msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 14303
c1ac5258 14304#: builtin/notes.c:65
ef317cd5 14305msgid "git notes edit [<object>]"
07432cef 14306msgstr "git notes edit [<对象>]"
ef317cd5 14307
c1ac5258 14308#: builtin/notes.c:70
ef317cd5 14309msgid "git notes show [<object>]"
07432cef 14310msgstr "git notes show [<对象>]"
ef317cd5 14311
c1ac5258 14312#: builtin/notes.c:75
814ff314 14313msgid "git notes merge [<options>] <notes-ref>"
07432cef 14314msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 14315
c1ac5258 14316#: builtin/notes.c:76
ef317cd5 14317msgid "git notes merge --commit [<options>]"
07432cef 14318msgstr "git notes merge --commit [<选项>]"
ef317cd5 14319
c1ac5258 14320#: builtin/notes.c:77
ef317cd5 14321msgid "git notes merge --abort [<options>]"
07432cef 14322msgstr "git notes merge --abort [<选项>]"
ef317cd5 14323
c1ac5258 14324#: builtin/notes.c:82
ef317cd5 14325msgid "git notes remove [<object>]"
07432cef 14326msgstr "git notes remove [<对象>]"
ef317cd5 14327
c1ac5258 14328#: builtin/notes.c:87
ef317cd5 14329msgid "git notes prune [<options>]"
07432cef 14330msgstr "git notes prune [<选项>]"
ef317cd5 14331
c1ac5258 14332#: builtin/notes.c:92
ef317cd5 14333msgid "git notes get-ref"
07432cef 14334msgstr "git notes get-ref"
ef317cd5 14335
c1ac5258 14336#: builtin/notes.c:97
5c57d762
JX
14337msgid "Write/edit the notes for the following object:"
14338msgstr "为下面的对象写/编辑说明:"
14339
c1ac5258 14340#: builtin/notes.c:150
c04f5ac3
JX
14341#, c-format
14342msgid "unable to start 'show' for object '%s'"
14343msgstr "不能为对象 '%s' 开始 'show'"
14344
c1ac5258 14345#: builtin/notes.c:154
a77c07d9
JX
14346msgid "could not read 'show' output"
14347msgstr "不能读取 'show' 的输出"
c04f5ac3 14348
c1ac5258 14349#: builtin/notes.c:162
c04f5ac3
JX
14350#, c-format
14351msgid "failed to finish 'show' for object '%s'"
14352msgstr "无法为对象 '%s' 完成 'show'"
14353
c1ac5258 14354#: builtin/notes.c:197
a0b6b246 14355msgid "please supply the note contents using either -m or -F option"
c04f5ac3
JX
14356msgstr "请通过 -m 或 -F 选项为注解提供内容"
14357
c1ac5258 14358#: builtin/notes.c:206
c04f5ac3
JX
14359msgid "unable to write note object"
14360msgstr "不能写注解对象"
14361
c1ac5258 14362#: builtin/notes.c:208
c04f5ac3 14363#, c-format
a0b6b246 14364msgid "the note contents have been left in %s"
220c313c 14365msgstr "注解内容被留在 %s 中"
c04f5ac3 14366
4c27fcb5 14367#: builtin/notes.c:242 builtin/tag.c:513
c04f5ac3
JX
14368#, c-format
14369msgid "could not open or read '%s'"
14370msgstr "不能打开或读取 '%s'"
14371
4c27fcb5 14372#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
06991777
JX
14373#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
14374#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
a0b6b246
JX
14375#, c-format
14376msgid "failed to resolve '%s' as a valid ref."
14377msgstr "无法解析 '%s' 为一个有效引用。"
14378
4c27fcb5 14379#: builtin/notes.c:265
c04f5ac3 14380#, c-format
a0b6b246 14381msgid "failed to read object '%s'."
c1ac5258 14382msgstr "读取对象 '%s' 失败。"
c04f5ac3 14383
4c27fcb5 14384#: builtin/notes.c:268
6c94aba5 14385#, c-format
a0b6b246
JX
14386msgid "cannot read note data from non-blob object '%s'."
14387msgstr "不能从非数据对象 '%s' 中读取注解数据。"
14388
4c27fcb5 14389#: builtin/notes.c:309
a0b6b246
JX
14390#, c-format
14391msgid "malformed input line: '%s'."
fd8cb379 14392msgstr "格式错误的输入行:'%s'。"
a0b6b246 14393
4c27fcb5 14394#: builtin/notes.c:324
a0b6b246
JX
14395#, c-format
14396msgid "failed to copy notes from '%s' to '%s'"
14397msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
6c94aba5 14398
a4f16749
JX
14399#. TRANSLATORS: the first %s will be replaced by a git
14400#. notes command: 'add', 'merge', 'remove', etc.
14401#.
4c27fcb5 14402#: builtin/notes.c:356
a0b6b246
JX
14403#, c-format
14404msgid "refusing to %s notes in %s (outside of refs/notes/)"
14405msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
14406
06991777
JX
14407#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
14408#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
14409#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
c04f5ac3
JX
14410msgid "too many parameters"
14411msgstr "参数太多"
14412
06991777 14413#: builtin/notes.c:389 builtin/notes.c:678
c04f5ac3 14414#, c-format
a0b6b246 14415msgid "no note found for object %s."
c04f5ac3
JX
14416msgstr "未发现对象 %s 的注解。"
14417
06991777 14418#: builtin/notes.c:410 builtin/notes.c:576
ef317cd5 14419msgid "note contents as a string"
07432cef 14420msgstr "注解内容作为一个字符串"
ef317cd5 14421
06991777 14422#: builtin/notes.c:413 builtin/notes.c:579
ef317cd5 14423msgid "note contents in a file"
07432cef 14424msgstr "注解内容到一个文件中"
ef317cd5 14425
06991777 14426#: builtin/notes.c:416 builtin/notes.c:582
ef317cd5 14427msgid "reuse and edit specified note object"
07432cef 14428msgstr "重用和编辑指定的注解对象"
ef317cd5 14429
06991777 14430#: builtin/notes.c:419 builtin/notes.c:585
ef317cd5 14431msgid "reuse specified note object"
07432cef 14432msgstr "重用指定的注解对象"
ef317cd5 14433
06991777 14434#: builtin/notes.c:422 builtin/notes.c:588
04cb2f28
JX
14435msgid "allow storing empty note"
14436msgstr "允许保存空白注释"
14437
06991777 14438#: builtin/notes.c:423 builtin/notes.c:496
ef317cd5 14439msgid "replace existing notes"
07432cef 14440msgstr "替换已存在的注解"
ef317cd5 14441
4c27fcb5 14442#: builtin/notes.c:448
c04f5ac3
JX
14443#, c-format
14444msgid ""
14445"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
14446"existing notes"
14447msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
14448
06991777 14449#: builtin/notes.c:463 builtin/notes.c:544
c04f5ac3
JX
14450#, c-format
14451msgid "Overwriting existing notes for object %s\n"
14452msgstr "覆盖对象 %s 现存注解\n"
14453
06991777 14454#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
04cb2f28
JX
14455#, c-format
14456msgid "Removing note for object %s\n"
14457msgstr "删除对象 %s 的注解\n"
14458
06991777 14459#: builtin/notes.c:497
ef317cd5 14460msgid "read objects from stdin"
07432cef 14461msgstr "从标准输入读取对象"
ef317cd5 14462
06991777 14463#: builtin/notes.c:499
ef317cd5 14464msgid "load rewriting config for <command> (implies --stdin)"
07432cef 14465msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 14466
06991777 14467#: builtin/notes.c:517
c04f5ac3
JX
14468msgid "too few parameters"
14469msgstr "参数太少"
14470
06991777 14471#: builtin/notes.c:538
c04f5ac3
JX
14472#, c-format
14473msgid ""
14474"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
14475"existing notes"
14476msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
14477
06991777 14478#: builtin/notes.c:550
c04f5ac3 14479#, c-format
a0b6b246 14480msgid "missing notes on source object %s. Cannot copy."
c04f5ac3
JX
14481msgstr "源对象 %s 缺少注解。不能拷贝。"
14482
06991777 14483#: builtin/notes.c:603
ef317cd5
JX
14484#, c-format
14485msgid ""
14486"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
14487"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
14488msgstr ""
14489"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
14490"请换用 'git notes add -f -m/-F/-c/-C'。\n"
14491
06991777 14492#: builtin/notes.c:698
a0b6b246 14493msgid "failed to delete ref NOTES_MERGE_PARTIAL"
c1ac5258 14494msgstr "删除引用 NOTES_MERGE_PARTIAL 失败"
a0b6b246 14495
06991777 14496#: builtin/notes.c:700
a0b6b246 14497msgid "failed to delete ref NOTES_MERGE_REF"
c1ac5258 14498msgstr "删除引用 NOTES_MERGE_REF 失败"
a0b6b246 14499
06991777 14500#: builtin/notes.c:702
a0b6b246 14501msgid "failed to remove 'git notes merge' worktree"
c1ac5258 14502msgstr "删除 'git notes merge' 工作区失败"
a0b6b246 14503
06991777 14504#: builtin/notes.c:722
a0b6b246 14505msgid "failed to read ref NOTES_MERGE_PARTIAL"
c1ac5258 14506msgstr "读取引用 NOTES_MERGE_PARTIAL 失败"
a0b6b246 14507
06991777 14508#: builtin/notes.c:724
a0b6b246
JX
14509msgid "could not find commit from NOTES_MERGE_PARTIAL."
14510msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
14511
06991777 14512#: builtin/notes.c:726
a0b6b246
JX
14513msgid "could not parse commit from NOTES_MERGE_PARTIAL."
14514msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
14515
06991777 14516#: builtin/notes.c:739
a0b6b246 14517msgid "failed to resolve NOTES_MERGE_REF"
c1ac5258 14518msgstr "解析 NOTES_MERGE_REF 失败"
a0b6b246 14519
06991777 14520#: builtin/notes.c:742
a0b6b246
JX
14521msgid "failed to finalize notes merge"
14522msgstr "无法完成注解合并"
14523
06991777 14524#: builtin/notes.c:768
5c57d762
JX
14525#, c-format
14526msgid "unknown notes merge strategy %s"
14527msgstr "未知的注解合并策略 %s"
14528
06991777 14529#: builtin/notes.c:784
ef317cd5 14530msgid "General options"
07432cef 14531msgstr "通用选项"
ef317cd5 14532
06991777 14533#: builtin/notes.c:786
ef317cd5 14534msgid "Merge options"
07432cef 14535msgstr "合并选项"
ef317cd5 14536
06991777 14537#: builtin/notes.c:788
ef317cd5
JX
14538msgid ""
14539"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
14540"cat_sort_uniq)"
07432cef 14541msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 14542
06991777 14543#: builtin/notes.c:790
ef317cd5 14544msgid "Committing unmerged notes"
07432cef 14545msgstr "提交未合并的注解"
ef317cd5 14546
06991777 14547#: builtin/notes.c:792
ef317cd5 14548msgid "finalize notes merge by committing unmerged notes"
07432cef 14549msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 14550
06991777 14551#: builtin/notes.c:794
ef317cd5 14552msgid "Aborting notes merge resolution"
07432cef 14553msgstr "中止注解合并的方案"
ef317cd5 14554
06991777 14555#: builtin/notes.c:796
ef317cd5 14556msgid "abort notes merge"
07432cef 14557msgstr "中止注解合并"
ef317cd5 14558
06991777 14559#: builtin/notes.c:807
5c57d762
JX
14560msgid "cannot mix --commit, --abort or -s/--strategy"
14561msgstr "不能混用 --commit、--abort 或 -s/--strategy"
14562
06991777 14563#: builtin/notes.c:812
a0b6b246 14564msgid "must specify a notes ref to merge"
9a4b694c 14565msgstr "必须指定一个注解引用来合并"
5c57d762 14566
06991777 14567#: builtin/notes.c:836
5c57d762 14568#, c-format
a0b6b246 14569msgid "unknown -s/--strategy: %s"
5c57d762
JX
14570msgstr "未知的 -s/--strategy:%s"
14571
06991777 14572#: builtin/notes.c:873
1b7f4a34 14573#, c-format
a0b6b246
JX
14574msgid "a notes merge into %s is already in-progress at %s"
14575msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
1b7f4a34 14576
06991777 14577#: builtin/notes.c:876
5c57d762 14578#, c-format
a0b6b246
JX
14579msgid "failed to store link to current notes ref (%s)"
14580msgstr "无法存储链接到当前的注解引用(%s)"
5c57d762 14581
06991777 14582#: builtin/notes.c:878
5c57d762
JX
14583#, c-format
14584msgid ""
14585"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
14586"'git notes merge --commit', or abort the merge with 'git notes merge --"
14587"abort'.\n"
a0b6b246
JX
14588msgstr ""
14589"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
14590"交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
5c57d762 14591
06991777 14592#: builtin/notes.c:900
ef317cd5
JX
14593#, c-format
14594msgid "Object %s has no note\n"
14595msgstr "对象 %s 没有注解\n"
14596
06991777 14597#: builtin/notes.c:912
ef317cd5 14598msgid "attempt to remove non-existent note is not an error"
07432cef 14599msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 14600
06991777 14601#: builtin/notes.c:915
ef317cd5 14602msgid "read object names from the standard input"
07432cef 14603msgstr "从标准输入读取对象名称"
ef317cd5 14604
06991777 14605#: builtin/notes.c:954 builtin/prune.c:108 builtin/worktree.c:165
5c57d762
JX
14606msgid "do not remove, show only"
14607msgstr "不删除,只显示"
14608
06991777 14609#: builtin/notes.c:955
5c57d762
JX
14610msgid "report pruned notes"
14611msgstr "报告清除的注解"
14612
06991777 14613#: builtin/notes.c:998
6c94aba5 14614msgid "notes-ref"
07432cef 14615msgstr "注解引用"
ef317cd5 14616
06991777 14617#: builtin/notes.c:999
814ff314 14618msgid "use notes from <notes-ref>"
07432cef 14619msgstr "从 <注解引用> 使用注解"
ef317cd5 14620
06991777 14621#: builtin/notes.c:1034
ef317cd5 14622#, c-format
a0b6b246 14623msgid "unknown subcommand: %s"
ef317cd5
JX
14624msgstr "未知子命令:%s"
14625
4c27fcb5 14626#: builtin/pack-objects.c:51
1b7f4a34
JX
14627msgid ""
14628"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
14629msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
ef317cd5 14630
4c27fcb5 14631#: builtin/pack-objects.c:52
1b7f4a34
JX
14632msgid ""
14633"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
58b6f078 14634msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
ef317cd5 14635
06991777 14636#: builtin/pack-objects.c:423
ef317cd5 14637#, c-format
c1ac5258
JX
14638msgid "bad packed object CRC for %s"
14639msgstr "%s 错的包对象 CRC"
14640
06991777 14641#: builtin/pack-objects.c:434
c1ac5258
JX
14642#, c-format
14643msgid "corrupt packed object for %s"
14644msgstr "%s 损坏的包对象"
14645
06991777 14646#: builtin/pack-objects.c:565
c1ac5258
JX
14647#, c-format
14648msgid "recursive delta detected for object %s"
14649msgstr "发现对象 %s 递归 delta"
14650
06991777 14651#: builtin/pack-objects.c:776
c1ac5258
JX
14652#, c-format
14653msgid "ordered %u objects, expected %<PRIu32>"
14654msgstr "排序了 %u 个对象,预期 %<PRIu32> 个"
14655
06991777 14656#: builtin/pack-objects.c:789
c1ac5258
JX
14657#, c-format
14658msgid "packfile is invalid: %s"
14659msgstr "无效的包文件:%s"
14660
06991777 14661#: builtin/pack-objects.c:793
c1ac5258
JX
14662#, c-format
14663msgid "unable to open packfile for reuse: %s"
14664msgstr "无法为重用打开包文件:%s"
14665
06991777 14666#: builtin/pack-objects.c:797
c1ac5258
JX
14667msgid "unable to seek in reused packfile"
14668msgstr "无法在重用的包文件中查找"
ef317cd5 14669
06991777 14670#: builtin/pack-objects.c:808
c1ac5258
JX
14671msgid "unable to read from reused packfile"
14672msgstr "无法读取索引文件"
14673
06991777 14674#: builtin/pack-objects.c:836
5b04ee3b
JX
14675msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
14676msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
14677
06991777 14678#: builtin/pack-objects.c:849
6c94aba5
JX
14679msgid "Writing objects"
14680msgstr "写入对象中"
14681
06991777 14682#: builtin/pack-objects.c:911 builtin/update-index.c:89
c1ac5258
JX
14683#, c-format
14684msgid "failed to stat %s"
14685msgstr "对 %s 调用 stat 失败"
14686
06991777 14687#: builtin/pack-objects.c:964
c1ac5258
JX
14688#, c-format
14689msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
14690msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
14691
06991777 14692#: builtin/pack-objects.c:1158
6c94aba5
JX
14693msgid "disabling bitmap writing, as some objects are not being packed"
14694msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
14695
06991777 14696#: builtin/pack-objects.c:1586
c1ac5258
JX
14697#, c-format
14698msgid "delta base offset overflow in pack for %s"
14699msgstr "%s 压缩中 delta 基准偏移越界"
14700
06991777 14701#: builtin/pack-objects.c:1595
c1ac5258
JX
14702#, c-format
14703msgid "delta base offset out of bound for %s"
14704msgstr "%s 的 delta 基准偏移越界"
14705
06991777 14706#: builtin/pack-objects.c:1864
fd8cb379
JX
14707msgid "Counting objects"
14708msgstr "对象计数中"
14709
06991777 14710#: builtin/pack-objects.c:1994
fd8cb379
JX
14711#, c-format
14712msgid "unable to get size of %s"
14713msgstr "不能得到 %s 的大小"
14714
06991777 14715#: builtin/pack-objects.c:2009
fd8cb379
JX
14716#, c-format
14717msgid "unable to parse object header of %s"
14718msgstr "无法解析对象 %s 头信息"
14719
06991777
JX
14720#: builtin/pack-objects.c:2079 builtin/pack-objects.c:2095
14721#: builtin/pack-objects.c:2105
c1ac5258
JX
14722#, c-format
14723msgid "object %s cannot be read"
14724msgstr "对象 %s 无法读取"
14725
06991777 14726#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2109
c1ac5258 14727#, c-format
4c27fcb5
JX
14728msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
14729msgstr "对象 %s 不一致的对象长度(%<PRIuMAX> vs %<PRIuMAX>)"
c1ac5258 14730
06991777 14731#: builtin/pack-objects.c:2119
c1ac5258
JX
14732msgid "suboptimal pack - out of memory"
14733msgstr "次优(suboptimal)打包 - 内存不足"
14734
06991777 14735#: builtin/pack-objects.c:2445
c1ac5258
JX
14736#, c-format
14737msgid "Delta compression using up to %d threads"
14738msgstr "使用 %d 个线程进行压缩"
14739
06991777 14740#: builtin/pack-objects.c:2577
c1ac5258
JX
14741#, c-format
14742msgid "unable to pack objects reachable from tag %s"
14743msgstr "无法为标签 %s 压缩对象"
14744
06991777 14745#: builtin/pack-objects.c:2664
6c94aba5
JX
14746msgid "Compressing objects"
14747msgstr "压缩对象中"
14748
06991777 14749#: builtin/pack-objects.c:2670
c1ac5258
JX
14750msgid "inconsistency with delta count"
14751msgstr "不一致的差异计数"
14752
14753#
06991777 14754#: builtin/pack-objects.c:2751
c1ac5258
JX
14755#, c-format
14756msgid ""
14757"expected edge object ID, got garbage:\n"
14758" %s"
14759msgstr ""
14760"预期边界对象(edge object)ID,却得到垃圾数据:\n"
14761" %s"
14762
06991777 14763#: builtin/pack-objects.c:2757
c1ac5258
JX
14764#, c-format
14765msgid ""
14766"expected object ID, got garbage:\n"
14767" %s"
14768msgstr ""
14769"预期对象 ID,却得到垃圾数据:\n"
14770" %s"
14771
06991777 14772#: builtin/pack-objects.c:2855
5809aa05
JX
14773msgid "invalid value for --missing"
14774msgstr "选项 --missing 的值无效"
14775
06991777 14776#: builtin/pack-objects.c:2914 builtin/pack-objects.c:3022
c1ac5258
JX
14777msgid "cannot open pack index"
14778msgstr "无法打开包文件索引"
14779
06991777 14780#: builtin/pack-objects.c:2945
c1ac5258
JX
14781#, c-format
14782msgid "loose object at %s could not be examined"
14783msgstr "无法检查 %s 处的松散对象"
14784
06991777 14785#: builtin/pack-objects.c:3030
c1ac5258
JX
14786msgid "unable to force loose object"
14787msgstr "无法强制松散对象"
14788
4c27fcb5 14789#: builtin/pack-objects.c:3122
c1ac5258
JX
14790#, c-format
14791msgid "not a rev '%s'"
14792msgstr "不是一个版本 '%s'"
14793
4c27fcb5 14794#: builtin/pack-objects.c:3125
c1ac5258
JX
14795#, c-format
14796msgid "bad revision '%s'"
14797msgstr "坏的版本 '%s'"
14798
4c27fcb5 14799#: builtin/pack-objects.c:3150
c1ac5258
JX
14800msgid "unable to add recent objects"
14801msgstr "无法添加最近的对象"
14802
4c27fcb5 14803#: builtin/pack-objects.c:3203
ef317cd5
JX
14804#, c-format
14805msgid "unsupported index version %s"
14806msgstr "不支持的索引版本 %s"
14807
4c27fcb5 14808#: builtin/pack-objects.c:3207
ef317cd5
JX
14809#, c-format
14810msgid "bad index version '%s'"
14811msgstr "坏的索引版本 '%s'"
14812
4c27fcb5 14813#: builtin/pack-objects.c:3237
ef317cd5 14814msgid "do not show progress meter"
07432cef 14815msgstr "不显示进度表"
ef317cd5 14816
4c27fcb5 14817#: builtin/pack-objects.c:3239
ef317cd5 14818msgid "show progress meter"
07432cef 14819msgstr "显示进度表"
ef317cd5 14820
4c27fcb5 14821#: builtin/pack-objects.c:3241
ef317cd5 14822msgid "show progress meter during object writing phase"
07432cef 14823msgstr "在对象写入阶段显示进度表"
ef317cd5 14824
4c27fcb5 14825#: builtin/pack-objects.c:3244
ef317cd5 14826msgid "similar to --all-progress when progress meter is shown"
07432cef 14827msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 14828
4c27fcb5 14829#: builtin/pack-objects.c:3245
c1ac5258
JX
14830msgid "<version>[,<offset>]"
14831msgstr "<版本>[,<偏移>]"
ef317cd5 14832
4c27fcb5 14833#: builtin/pack-objects.c:3246
ef317cd5 14834msgid "write the pack index file in the specified idx format version"
07432cef 14835msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 14836
4c27fcb5 14837#: builtin/pack-objects.c:3249
ef317cd5 14838msgid "maximum size of each output pack file"
07432cef 14839msgstr "每个输出包的最大尺寸"
ef317cd5 14840
4c27fcb5 14841#: builtin/pack-objects.c:3251
ef317cd5 14842msgid "ignore borrowed objects from alternate object store"
160fb2b2 14843msgstr "忽略从备用对象存储里借用对象"
ef317cd5 14844
4c27fcb5 14845#: builtin/pack-objects.c:3253
ef317cd5 14846msgid "ignore packed objects"
07432cef 14847msgstr "忽略包对象"
ef317cd5 14848
4c27fcb5 14849#: builtin/pack-objects.c:3255
ef317cd5 14850msgid "limit pack window by objects"
07432cef 14851msgstr "限制打包窗口的对象数"
ef317cd5 14852
4c27fcb5 14853#: builtin/pack-objects.c:3257
ef317cd5 14854msgid "limit pack window by memory in addition to object limit"
07432cef 14855msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 14856
4c27fcb5 14857#: builtin/pack-objects.c:3259
ef317cd5 14858msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 14859msgstr "打包允许的 delta 链的最大长度"
ef317cd5 14860
4c27fcb5 14861#: builtin/pack-objects.c:3261
ef317cd5 14862msgid "reuse existing deltas"
07432cef 14863msgstr "重用已存在的 deltas"
ef317cd5 14864
4c27fcb5 14865#: builtin/pack-objects.c:3263
ef317cd5 14866msgid "reuse existing objects"
07432cef 14867msgstr "重用已存在的对象"
ef317cd5 14868
4c27fcb5 14869#: builtin/pack-objects.c:3265
ef317cd5 14870msgid "use OFS_DELTA objects"
07432cef 14871msgstr "使用 OFS_DELTA 对象"
ef317cd5 14872
4c27fcb5 14873#: builtin/pack-objects.c:3267
ef317cd5 14874msgid "use threads when searching for best delta matches"
07432cef 14875msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 14876
4c27fcb5 14877#: builtin/pack-objects.c:3269
ef317cd5 14878msgid "do not create an empty pack output"
07432cef 14879msgstr "不创建空的包输出"
ef317cd5 14880
4c27fcb5 14881#: builtin/pack-objects.c:3271
ef317cd5 14882msgid "read revision arguments from standard input"
d9d56b23 14883msgstr "从标准输入读取版本号参数"
ef317cd5 14884
4c27fcb5 14885#: builtin/pack-objects.c:3273
ef317cd5 14886msgid "limit the objects to those that are not yet packed"
07432cef 14887msgstr "限制那些尚未打包的对象"
ef317cd5 14888
4c27fcb5 14889#: builtin/pack-objects.c:3276
ef317cd5 14890msgid "include objects reachable from any reference"
07432cef 14891msgstr "包括可以从任何引用访问到的对象"
ef317cd5 14892
4c27fcb5 14893#: builtin/pack-objects.c:3279
ef317cd5 14894msgid "include objects referred by reflog entries"
07432cef 14895msgstr "包括被引用日志引用到的对象"
ef317cd5 14896
4c27fcb5 14897#: builtin/pack-objects.c:3282
220c313c
JX
14898msgid "include objects referred to by the index"
14899msgstr "包括被索引引用到的对象"
14900
4c27fcb5 14901#: builtin/pack-objects.c:3285
ef317cd5 14902msgid "output pack to stdout"
07432cef 14903msgstr "输出包到标准输出"
ef317cd5 14904
4c27fcb5 14905#: builtin/pack-objects.c:3287
ef317cd5 14906msgid "include tag objects that refer to objects to be packed"
53438e8f 14907msgstr "包括那些引用了待打包对象的标签对象"
ef317cd5 14908
4c27fcb5 14909#: builtin/pack-objects.c:3289
ef317cd5 14910msgid "keep unreachable objects"
07432cef 14911msgstr "维持不可达的对象"
ef317cd5 14912
4c27fcb5 14913#: builtin/pack-objects.c:3291
5c57d762
JX
14914msgid "pack loose unreachable objects"
14915msgstr "打包松散的不可达对象"
14916
4c27fcb5 14917#: builtin/pack-objects.c:3293
ef317cd5 14918msgid "unpack unreachable objects newer than <time>"
07432cef 14919msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 14920
4c27fcb5 14921#: builtin/pack-objects.c:3296
06991777
JX
14922msgid "use the sparse reachability algorithm"
14923msgstr "使用稀疏可达性算法"
14924
14925#: builtin/pack-objects.c:3298
ef317cd5 14926msgid "create thin packs"
07432cef 14927msgstr "创建精简包"
ef317cd5 14928
06991777 14929#: builtin/pack-objects.c:3300
04cb2f28 14930msgid "create packs suitable for shallow fetches"
160fb2b2 14931msgstr "创建适合浅克隆仓库获取的包"
04cb2f28 14932
06991777 14933#: builtin/pack-objects.c:3302
ef317cd5 14934msgid "ignore packs that have companion .keep file"
07432cef 14935msgstr "忽略配有 .keep 文件的包"
ef317cd5 14936
06991777 14937#: builtin/pack-objects.c:3304
fd8cb379
JX
14938msgid "ignore this pack"
14939msgstr "忽略该 pack"
14940
06991777 14941#: builtin/pack-objects.c:3306
ef317cd5 14942msgid "pack compression level"
07432cef 14943msgstr "打包压缩级别"
ef317cd5 14944
06991777 14945#: builtin/pack-objects.c:3308
ef317cd5 14946msgid "do not hide commits by grafts"
fd8cb379 14947msgstr "显示被移植隐藏的提交"
ef317cd5 14948
06991777 14949#: builtin/pack-objects.c:3310
6c94aba5
JX
14950msgid "use a bitmap index if available to speed up counting objects"
14951msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
14952
06991777 14953#: builtin/pack-objects.c:3312
6c94aba5
JX
14954msgid "write a bitmap index together with the pack index"
14955msgstr "在建立包索引的同时创建 bitmap 索引"
14956
06991777 14957#: builtin/pack-objects.c:3315
5809aa05
JX
14958msgid "handling for missing objects"
14959msgstr "处理丢失的对象"
14960
06991777 14961#: builtin/pack-objects.c:3318
31e5e17b
JX
14962msgid "do not pack objects in promisor packfiles"
14963msgstr "不要打包 promisor 包文件中的对象"
14964
06991777 14965#: builtin/pack-objects.c:3320
4c27fcb5
JX
14966msgid "respect islands during delta compression"
14967msgstr "在增量压缩时参考数据岛"
14968
06991777 14969#: builtin/pack-objects.c:3345
fd8cb379
JX
14970#, c-format
14971msgid "delta chain depth %d is too deep, forcing %d"
14972msgstr "增量链深度 %d 太深了,强制为 %d"
14973
06991777 14974#: builtin/pack-objects.c:3350
fd8cb379
JX
14975#, c-format
14976msgid "pack.deltaCacheLimit is too high, forcing %d"
14977msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d"
6c94aba5 14978
06991777 14979#: builtin/pack-objects.c:3404
c1ac5258
JX
14980msgid "--max-pack-size cannot be used to build a pack for transfer"
14981msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
14982
06991777 14983#: builtin/pack-objects.c:3406
c1ac5258 14984msgid "minimum pack size limit is 1 MiB"
e640d114 14985msgstr "最小的包文件大小是 1 MiB"
c1ac5258 14986
06991777 14987#: builtin/pack-objects.c:3411
c1ac5258
JX
14988msgid "--thin cannot be used to build an indexable pack"
14989msgstr "--thin 不能用于创建一个可索引包"
14990
06991777 14991#: builtin/pack-objects.c:3414
c1ac5258
JX
14992msgid "--keep-unreachable and --unpack-unreachable are incompatible"
14993msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
14994
06991777 14995#: builtin/pack-objects.c:3420
c1ac5258 14996msgid "cannot use --filter without --stdout"
e640d114 14997msgstr "不能在没有 --stdout 的情况下使用 --filter"
c1ac5258 14998
06991777 14999#: builtin/pack-objects.c:3479
fd8cb379
JX
15000msgid "Enumerating objects"
15001msgstr "枚举对象"
15002
06991777 15003#: builtin/pack-objects.c:3498
c1ac5258
JX
15004#, c-format
15005msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
15006msgstr "总共 %<PRIu32> (差异 %<PRIu32>),复用 %<PRIu32> (差异 %<PRIu32>)"
15007
fd8cb379 15008#: builtin/pack-refs.c:7
814ff314
JX
15009msgid "git pack-refs [<options>]"
15010msgstr "git pack-refs [<选项>]"
c04f5ac3 15011
fd8cb379 15012#: builtin/pack-refs.c:15
ef317cd5 15013msgid "pack everything"
07432cef 15014msgstr "打包一切"
c04f5ac3 15015
fd8cb379 15016#: builtin/pack-refs.c:16
ef317cd5 15017msgid "prune loose refs (default)"
07432cef 15018msgstr "清除松散的引用(默认)"
c04f5ac3 15019
c1ac5258 15020#: builtin/prune-packed.c:9
814ff314
JX
15021msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
15022msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
6792b93b 15023
c1ac5258 15024#: builtin/prune-packed.c:42
6c94aba5
JX
15025msgid "Removing duplicate objects"
15026msgstr "正在删除重复对象"
15027
c1ac5258 15028#: builtin/prune.c:12
5809aa05
JX
15029msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
15030msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
7ac1c0ad 15031
c1ac5258 15032#: builtin/prune.c:109
1b7f4a34
JX
15033msgid "report pruned objects"
15034msgstr "报告清除的对象"
15035
c1ac5258 15036#: builtin/prune.c:112
1b7f4a34
JX
15037msgid "expire objects older than <time>"
15038msgstr "使早于给定时间的对象过期"
15039
c1ac5258 15040#: builtin/prune.c:114
31e5e17b
JX
15041msgid "limit traversal to objects outside promisor packfiles"
15042msgstr "限制遍历 promisor 包以外的对象"
15043
06991777 15044#: builtin/prune.c:128
94550ed3
JX
15045msgid "cannot prune in a precious-objects repo"
15046msgstr "不能在珍品仓库中执行清理操作"
15047
06991777 15048#: builtin/pull.c:61 builtin/pull.c:63
a0b6b246
JX
15049#, c-format
15050msgid "Invalid value for %s: %s"
15051msgstr "%s 的值无效:%s"
15052
06991777 15053#: builtin/pull.c:83
94550ed3 15054msgid "git pull [<options>] [<repository> [<refspec>...]]"
1b7f4a34
JX
15055msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
15056
06991777 15057#: builtin/pull.c:134
a4f16749
JX
15058msgid "control for recursive fetching of submodules"
15059msgstr "控制子模组的递归获取"
15060
06991777 15061#: builtin/pull.c:138
1b7f4a34
JX
15062msgid "Options related to merging"
15063msgstr "和合并相关的选项"
15064
06991777 15065#: builtin/pull.c:141
1b7f4a34
JX
15066msgid "incorporate changes by rebasing rather than merging"
15067msgstr "使用变基操作取代合并操作以合入修改"
15068
06991777 15069#: builtin/pull.c:168 builtin/rebase--interactive.c:149 builtin/revert.c:123
1b7f4a34
JX
15070msgid "allow fast-forward"
15071msgstr "允许快进式"
15072
06991777 15073#: builtin/pull.c:177
5b04ee3b 15074msgid "automatically stash/stash pop before and after rebase"
554e8501 15075msgstr "变基操作前后执行自动贮藏和弹出贮藏"
5b04ee3b 15076
06991777 15077#: builtin/pull.c:193
1b7f4a34
JX
15078msgid "Options related to fetching"
15079msgstr "和获取相关的参数"
15080
06991777 15081#: builtin/pull.c:203
4c27fcb5
JX
15082msgid "force overwrite of local branch"
15083msgstr "强制覆盖本地分支"
15084
06991777 15085#: builtin/pull.c:211
276ceeaa
JX
15086msgid "number of submodules pulled in parallel"
15087msgstr "并发拉取的子模组的数量"
15088
06991777 15089#: builtin/pull.c:306
1b7f4a34
JX
15090#, c-format
15091msgid "Invalid value for pull.ff: %s"
15092msgstr "pull.ff 的取值无效:%s"
15093
06991777 15094#: builtin/pull.c:422
1b7f4a34
JX
15095msgid ""
15096"There is no candidate for rebasing against among the refs that you just "
15097"fetched."
15098msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
15099
06991777 15100#: builtin/pull.c:424
1b7f4a34
JX
15101msgid ""
15102"There are no candidates for merging among the refs that you just fetched."
15103msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
15104
06991777 15105#: builtin/pull.c:425
1b7f4a34
JX
15106msgid ""
15107"Generally this means that you provided a wildcard refspec which had no\n"
15108"matches on the remote end."
15109msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
15110
06991777 15111#: builtin/pull.c:428
1b7f4a34
JX
15112#, c-format
15113msgid ""
15114"You asked to pull from the remote '%s', but did not specify\n"
15115"a branch. Because this is not the default configured remote\n"
15116"for your current branch, you must specify a branch on the command line."
15117msgstr ""
15118"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
15119"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
15120
06991777 15121#: builtin/pull.c:433 builtin/rebase.c:956 git-parse-remote.sh:73
1b7f4a34
JX
15122msgid "You are not currently on a branch."
15123msgstr "您当前不在一个分支上。"
15124
06991777 15125#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:79
1b7f4a34
JX
15126msgid "Please specify which branch you want to rebase against."
15127msgstr "请指定您要变基到哪一个分支。"
15128
06991777 15129#: builtin/pull.c:437 builtin/pull.c:452 git-parse-remote.sh:82
1b7f4a34
JX
15130msgid "Please specify which branch you want to merge with."
15131msgstr "请指定您要合并哪一个分支。"
15132
06991777 15133#: builtin/pull.c:438 builtin/pull.c:453
1b7f4a34
JX
15134msgid "See git-pull(1) for details."
15135msgstr "详见 git-pull(1)。"
15136
06991777
JX
15137#: builtin/pull.c:440 builtin/pull.c:446 builtin/pull.c:455
15138#: builtin/rebase.c:962 git-parse-remote.sh:64
5b04ee3b
JX
15139msgid "<remote>"
15140msgstr "<远程>"
15141
06991777
JX
15142#: builtin/pull.c:440 builtin/pull.c:455 builtin/pull.c:460
15143#: git-legacy-rebase.sh:564 git-parse-remote.sh:65
5b04ee3b
JX
15144msgid "<branch>"
15145msgstr "<分支>"
15146
06991777 15147#: builtin/pull.c:448 builtin/rebase.c:954 git-parse-remote.sh:75
1b7f4a34
JX
15148msgid "There is no tracking information for the current branch."
15149msgstr "当前分支没有跟踪信息。"
15150
06991777 15151#: builtin/pull.c:457 git-parse-remote.sh:95
1b7f4a34 15152msgid ""
5b04ee3b
JX
15153"If you wish to set tracking information for this branch you can do so with:"
15154msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
7ac1c0ad 15155
06991777 15156#: builtin/pull.c:462
1b7f4a34
JX
15157#, c-format
15158msgid ""
15159"Your configuration specifies to merge with the ref '%s'\n"
15160"from the remote, but no such ref was fetched."
15161msgstr ""
15162"您的配置中指定要合并远程的引用 '%s',\n"
15163"但是没有获取到这个引用。"
7ac1c0ad 15164
06991777 15165#: builtin/pull.c:566
4c27fcb5
JX
15166#, c-format
15167msgid "unable to access commit %s"
15168msgstr "无法访问提交 %s"
15169
06991777 15170#: builtin/pull.c:844
5c57d762
JX
15171msgid "ignoring --verify-signatures for rebase"
15172msgstr "为变基操作忽略 --verify-signatures"
15173
06991777 15174#: builtin/pull.c:892
5b04ee3b
JX
15175msgid "--[no-]autostash option is only valid with --rebase."
15176msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
15177
06991777 15178#: builtin/pull.c:900
1b7f4a34
JX
15179msgid "Updating an unborn branch with changes added to the index."
15180msgstr "更新尚未诞生的分支,变更添加至索引。"
15181
06991777 15182#: builtin/pull.c:904
a0b6b246
JX
15183msgid "pull with rebase"
15184msgstr "变基式拉取"
15185
06991777 15186#: builtin/pull.c:905
a0b6b246 15187msgid "please commit or stash them."
554e8501 15188msgstr "请提交或贮藏它们。"
a0b6b246 15189
06991777 15190#: builtin/pull.c:930
1b7f4a34
JX
15191#, c-format
15192msgid ""
15193"fetch updated the current branch head.\n"
15194"fast-forwarding your working tree from\n"
15195"commit %s."
15196msgstr ""
15197"fetch 更新了当前的分支。快进您的工作区\n"
15198"至提交 %s。"
ef317cd5 15199
06991777 15200#: builtin/pull.c:936
1b7f4a34
JX
15201#, c-format
15202msgid ""
15203"Cannot fast-forward your working tree.\n"
15204"After making sure that you saved anything precious from\n"
15205"$ git diff %s\n"
15206"output, run\n"
15207"$ git reset --hard\n"
15208"to recover."
15209msgstr ""
15210"您当前的工作区无法执行快进操作。\n"
15211"首先执行如下命令:\n"
15212"$ git diff %s\n"
15213"以确认所有有用的数据均已保存。然后执行下面的命令\n"
15214"$ git reset --hard\n"
15215"恢复之前的状态。"
15216
06991777 15217#: builtin/pull.c:951
1b7f4a34
JX
15218msgid "Cannot merge multiple branches into empty head."
15219msgstr "无法将多个分支合并到空分支。"
15220
06991777 15221#: builtin/pull.c:955
1b7f4a34
JX
15222msgid "Cannot rebase onto multiple branches."
15223msgstr "无法变基到多个分支。"
15224
06991777 15225#: builtin/pull.c:962
a4f16749
JX
15226msgid "cannot rebase with locally recorded submodule modifications"
15227msgstr "本地子模组中有修改,无法变基"
15228
fd8cb379 15229#: builtin/push.c:19
ef317cd5 15230msgid "git push [<options>] [<repository> [<refspec>...]]"
160fb2b2 15231msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
7ac1c0ad 15232
fd8cb379 15233#: builtin/push.c:111
c04f5ac3 15234msgid "tag shorthand without <tag>"
55a16ee4 15235msgstr "标签后面未提供 <标签> 参数"
c04f5ac3 15236
fd8cb379 15237#: builtin/push.c:121
c04f5ac3 15238msgid "--delete only accepts plain target ref names"
90e6ef53 15239msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 15240
06991777 15241#: builtin/push.c:167
8ada9598
JX
15242msgid ""
15243"\n"
15244"To choose either option permanently, see push.default in 'git help config'."
15245msgstr ""
81809b99
JX
15246"\n"
15247"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 15248
06991777 15249#: builtin/push.c:170
8ada9598
JX
15250#, c-format
15251msgid ""
15252"The upstream branch of your current branch does not match\n"
15253"the name of your current branch. To push to the upstream branch\n"
15254"on the remote, use\n"
15255"\n"
15256" git push %s HEAD:%s\n"
15257"\n"
15258"To push to the branch of the same name on the remote, use\n"
15259"\n"
4c27fcb5 15260" git push %s HEAD\n"
8ada9598
JX
15261"%s"
15262msgstr ""
4c27fcb5
JX
15263"您当前分支的上游分支和您当前分支名不匹配,为推送到远程的上游分支,\n"
15264"使用\n"
81809b99
JX
15265"\n"
15266" git push %s HEAD:%s\n"
15267"\n"
15268"为推送至远程同名分支,使用\n"
15269"\n"
4c27fcb5 15270" git push %s HEAD\n"
81809b99 15271"%s"
8ada9598 15272
06991777 15273#: builtin/push.c:185
c04f5ac3
JX
15274#, c-format
15275msgid ""
15276"You are not currently on a branch.\n"
15277"To push the history leading to the current (detached HEAD)\n"
15278"state now, use\n"
15279"\n"
15280" git push %s HEAD:<name-of-remote-branch>\n"
15281msgstr ""
15282"您当前不在一个分支上。\n"
90e6ef53 15283"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3 15284"\n"
d9d56b23 15285" git push %s HEAD:<远程分支名字>\n"
c04f5ac3 15286
06991777 15287#: builtin/push.c:199
c04f5ac3
JX
15288#, c-format
15289msgid ""
15290"The current branch %s has no upstream branch.\n"
15291"To push the current branch and set the remote as upstream, use\n"
15292"\n"
15293" git push --set-upstream %s %s\n"
15294msgstr ""
15295"当前分支 %s 没有对应的上游分支。\n"
15296"为推送当前分支并建立与远程上游的跟踪,使用\n"
15297"\n"
15298" git push --set-upstream %s %s\n"
15299
06991777 15300#: builtin/push.c:207
c04f5ac3
JX
15301#, c-format
15302msgid "The current branch %s has multiple upstream branches, refusing to push."
15303msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
15304
06991777 15305#: builtin/push.c:210
73a60cd2
JX
15306#, c-format
15307msgid ""
15308"You are pushing to remote '%s', which is not the upstream of\n"
15309"your current branch '%s', without telling me what to push\n"
15310"to update which remote branch."
15311msgstr ""
15312"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
15313"而没有告诉我要推送什么、更新哪个远程分支。"
15314
06991777 15315#: builtin/push.c:269
c04f5ac3
JX
15316msgid ""
15317"You didn't specify any refspecs to push, and push.default is \"nothing\"."
160fb2b2 15318msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
c04f5ac3 15319
06991777 15320#: builtin/push.c:276
170e9899
JX
15321msgid ""
15322"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
15323"its remote counterpart. Integrate the remote changes (e.g.\n"
15324"'git pull ...') before pushing again.\n"
170e9899
JX
15325"See the 'Note about fast-forwards' in 'git push --help' for details."
15326msgstr ""
eff6d3a9 15327"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 15328"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 15329"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 15330
06991777 15331#: builtin/push.c:282
170e9899
JX
15332msgid ""
15333"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
15334"counterpart. Check out this branch and integrate the remote changes\n"
15335"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
15336"See the 'Note about fast-forwards' in 'git push --help' for details."
15337msgstr ""
eff6d3a9 15338"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 15339"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 15340"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 15341
06991777 15342#: builtin/push.c:288
07432cef 15343msgid ""
a77c07d9
JX
15344"Updates were rejected because the remote contains work that you do\n"
15345"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
15346"to the same ref. You may want to first integrate the remote changes\n"
15347"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
15348"See the 'Note about fast-forwards' in 'git push --help' for details."
15349msgstr ""
160fb2b2
JX
15350"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
15351"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
2e8451e8 15352"(如 'git pull ...')。\n"
a77c07d9
JX
15353"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
15354
06991777 15355#: builtin/push.c:295
a77c07d9 15356msgid "Updates were rejected because the tag already exists in the remote."
55a16ee4 15357msgstr "更新被拒绝,因为该标签在远程已经存在。"
a77c07d9 15358
06991777 15359#: builtin/push.c:298
a77c07d9
JX
15360msgid ""
15361"You cannot update a remote ref that points at a non-commit object,\n"
15362"or update a remote ref to make it point at a non-commit object,\n"
15363"without using the '--force' option.\n"
15364msgstr ""
15365"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
15366"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 15367
06991777 15368#: builtin/push.c:359
c04f5ac3
JX
15369#, c-format
15370msgid "Pushing to %s\n"
15371msgstr "推送到 %s\n"
15372
06991777 15373#: builtin/push.c:364
c04f5ac3
JX
15374#, c-format
15375msgid "failed to push some refs to '%s'"
c1ac5258 15376msgstr "推送一些引用到 '%s' 失败"
c04f5ac3 15377
06991777 15378#: builtin/push.c:398
c04f5ac3
JX
15379#, c-format
15380msgid "bad repository '%s'"
160fb2b2 15381msgstr "坏的仓库 '%s'"
c04f5ac3 15382
06991777 15383#: builtin/push.c:399
c04f5ac3
JX
15384msgid ""
15385"No configured push destination.\n"
15386"Either specify the URL from the command-line or configure a remote "
15387"repository using\n"
15388"\n"
15389" git remote add <name> <url>\n"
15390"\n"
15391"and then push using the remote name\n"
15392"\n"
15393" git push <name>\n"
15394msgstr ""
90e6ef53 15395"没有配置推送目标。\n"
4375c10e 15396"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
c04f5ac3 15397"\n"
d9d56b23 15398" git remote add <名称> <地址>\n"
c04f5ac3 15399"\n"
160fb2b2 15400"然后使用该远程仓库名执行推送\n"
c04f5ac3 15401"\n"
d9d56b23 15402" git push <名称>\n"
c04f5ac3 15403
06991777 15404#: builtin/push.c:554
ef317cd5 15405msgid "repository"
160fb2b2 15406msgstr "仓库"
ef317cd5 15407
06991777 15408#: builtin/push.c:555 builtin/send-pack.c:164
ef317cd5 15409msgid "push all refs"
07432cef 15410msgstr "推送所有引用"
ef317cd5 15411
06991777 15412#: builtin/push.c:556 builtin/send-pack.c:166
ef317cd5 15413msgid "mirror all refs"
07432cef 15414msgstr "镜像所有引用"
ef317cd5 15415
06991777 15416#: builtin/push.c:558
ef317cd5 15417msgid "delete refs"
07432cef 15418msgstr "删除引用"
ef317cd5 15419
06991777 15420#: builtin/push.c:559
ef317cd5 15421msgid "push tags (can't be used with --all or --mirror)"
55a16ee4 15422msgstr "推送标签(不能使用 --all or --mirror)"
ef317cd5 15423
06991777 15424#: builtin/push.c:562 builtin/send-pack.c:167
ef317cd5
JX
15425msgid "force updates"
15426msgstr "强制更新"
15427
06991777 15428#: builtin/push.c:564 builtin/send-pack.c:181
c1ac5258
JX
15429msgid "<refname>:<expect>"
15430msgstr "<引用名>:<期望值>"
90314792 15431
06991777 15432#: builtin/push.c:565 builtin/send-pack.c:182
90314792
JX
15433msgid "require old value of ref to be at this value"
15434msgstr "要求引用旧的取值为设定值"
15435
06991777 15436#: builtin/push.c:568
ef317cd5 15437msgid "control recursive pushing of submodules"
07432cef 15438msgstr "控制子模组的递归推送"
ef317cd5 15439
06991777 15440#: builtin/push.c:570 builtin/send-pack.c:175
ef317cd5 15441msgid "use thin pack"
07432cef 15442msgstr "使用精简打包"
ef317cd5 15443
06991777 15444#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
fd8cb379 15445#: builtin/send-pack.c:162
ef317cd5 15446msgid "receive pack program"
07432cef 15447msgstr "接收包程序"
ef317cd5 15448
06991777 15449#: builtin/push.c:573
ef317cd5 15450msgid "set upstream for git pull/status"
07432cef 15451msgstr "设置 git pull/status 的上游"
ef317cd5 15452
06991777 15453#: builtin/push.c:576
ef317cd5 15454msgid "prune locally removed refs"
07432cef 15455msgstr "清除本地删除的引用"
ef317cd5 15456
06991777 15457#: builtin/push.c:578
a77c07d9
JX
15458msgid "bypass pre-push hook"
15459msgstr "绕过 pre-push 钩子"
15460
06991777 15461#: builtin/push.c:579
1003b3a5 15462msgid "push missing but relevant tags"
55a16ee4 15463msgstr "推送缺失但有关的标签"
1003b3a5 15464
06991777 15465#: builtin/push.c:582 builtin/send-pack.c:169
220c313c
JX
15466msgid "GPG sign the push"
15467msgstr "用 GPG 为推送签名"
15468
06991777 15469#: builtin/push.c:584 builtin/send-pack.c:176
814ff314
JX
15470msgid "request atomic transaction on remote side"
15471msgstr "需要远端支持原子事务"
15472
06991777 15473#: builtin/push.c:602
c04f5ac3
JX
15474msgid "--delete is incompatible with --all, --mirror and --tags"
15475msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
15476
06991777 15477#: builtin/push.c:604
c04f5ac3
JX
15478msgid "--delete doesn't make sense without any refs"
15479msgstr "--delete 未接任何引用没有意义"
15480
06991777 15481#: builtin/push.c:607
fd8cb379
JX
15482msgid "--all and --tags are incompatible"
15483msgstr "--all 和 --tags 不兼容"
15484
06991777 15485#: builtin/push.c:609
fd8cb379
JX
15486msgid "--all can't be combined with refspecs"
15487msgstr "--all 不能和引用规格同时使用"
15488
06991777 15489#: builtin/push.c:613
fd8cb379
JX
15490msgid "--mirror and --tags are incompatible"
15491msgstr "--mirror 和 --tags 不兼容"
15492
06991777 15493#: builtin/push.c:615
fd8cb379
JX
15494msgid "--mirror can't be combined with refspecs"
15495msgstr "--mirror 不能和引用规格同时使用"
15496
06991777 15497#: builtin/push.c:618
fd8cb379
JX
15498msgid "--all and --mirror are incompatible"
15499msgstr "--all 和 --mirror 不兼容"
15500
06991777 15501#: builtin/push.c:637
5c57d762
JX
15502msgid "push options must not have new line characters"
15503msgstr "推送选项不能有换行符"
15504
c1ac5258
JX
15505#: builtin/range-diff.c:8
15506msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
15507msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>"
15508
15509#: builtin/range-diff.c:9
15510msgid "git range-diff [<options>] <old-tip>...<new-tip>"
15511msgstr "git range-diff [<选项>] <old-tip>...<new-tip>"
15512
15513#: builtin/range-diff.c:10
15514msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
15515msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>"
15516
4c27fcb5 15517#: builtin/range-diff.c:21
c1ac5258
JX
15518msgid "Percentage by which creation is weighted"
15519msgstr "创建权重的百分比"
15520
4c27fcb5 15521#: builtin/range-diff.c:23
c1ac5258
JX
15522msgid "use simple diff colors"
15523msgstr "使用简单差异颜色"
15524
4c27fcb5 15525#: builtin/range-diff.c:61 builtin/range-diff.c:65
c1ac5258
JX
15526#, c-format
15527msgid "no .. in range: '%s'"
15528msgstr "没有在范围中使用 ..:'%s'"
15529
4c27fcb5 15530#: builtin/range-diff.c:75
c1ac5258
JX
15531msgid "single arg format must be symmetric range"
15532msgstr "单个参数格式必须是对称范围(即包含...)"
15533
4c27fcb5 15534#: builtin/range-diff.c:90
c1ac5258
JX
15535msgid "need two commit ranges"
15536msgstr "需要两个提交范围"
15537
06991777 15538#: builtin/read-tree.c:41
ef317cd5 15539msgid ""
1b7f4a34 15540"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
ef317cd5
JX
15541"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
15542"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
15543msgstr ""
1b7f4a34 15544"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
07432cef 15545"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
1b7f4a34 15546"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
ef317cd5 15547
06991777 15548#: builtin/read-tree.c:124
ef317cd5 15549msgid "write resulting index to <file>"
d9d56b23 15550msgstr "将索引结果写入 <文件>"
ef317cd5 15551
06991777 15552#: builtin/read-tree.c:127
ef317cd5 15553msgid "only empty the index"
07432cef 15554msgstr "只是清空索引"
ef317cd5 15555
06991777 15556#: builtin/read-tree.c:129
ef317cd5 15557msgid "Merging"
07432cef 15558msgstr "合并"
ef317cd5 15559
06991777 15560#: builtin/read-tree.c:131
ef317cd5 15561msgid "perform a merge in addition to a read"
07432cef 15562msgstr "读取之余再执行一个合并"
ef317cd5 15563
06991777 15564#: builtin/read-tree.c:133
ef317cd5 15565msgid "3-way merge if no file level merging required"
160fb2b2 15566msgstr "如果没有文件级合并需要,执行三方合并"
ef317cd5 15567
06991777 15568#: builtin/read-tree.c:135
ef317cd5 15569msgid "3-way merge in presence of adds and removes"
160fb2b2 15570msgstr "存在添加和删除时,也执行三方合并"
ef317cd5 15571
06991777 15572#: builtin/read-tree.c:137
ef317cd5 15573msgid "same as -m, but discard unmerged entries"
07432cef 15574msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 15575
06991777 15576#: builtin/read-tree.c:138
ef317cd5 15577msgid "<subdirectory>/"
07432cef 15578msgstr "<子目录>/"
ef317cd5 15579
06991777 15580#: builtin/read-tree.c:139
ef317cd5 15581msgid "read the tree into the index under <subdirectory>/"
07432cef 15582msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 15583
06991777 15584#: builtin/read-tree.c:142
ef317cd5 15585msgid "update working tree with merge result"
07432cef 15586msgstr "用合并的结果更新工作区"
ef317cd5 15587
06991777 15588#: builtin/read-tree.c:144
ef317cd5 15589msgid "gitignore"
07432cef 15590msgstr "gitignore"
ef317cd5 15591
06991777 15592#: builtin/read-tree.c:145
ef317cd5 15593msgid "allow explicitly ignored files to be overwritten"
07432cef 15594msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 15595
06991777 15596#: builtin/read-tree.c:148
ef317cd5 15597msgid "don't check the working tree after merging"
07432cef 15598msgstr "合并后不检查工作区"
ef317cd5 15599
06991777 15600#: builtin/read-tree.c:149
ef317cd5 15601msgid "don't update the index or the work tree"
07432cef 15602msgstr "不更新索引区和工作区"
ef317cd5 15603
06991777 15604#: builtin/read-tree.c:151
ef317cd5 15605msgid "skip applying sparse checkout filter"
07432cef 15606msgstr "跳过应用稀疏检出过滤器"
ef317cd5 15607
06991777 15608#: builtin/read-tree.c:153
ef317cd5 15609msgid "debug unpack-trees"
07432cef 15610msgstr "调试 unpack-trees"
ef317cd5 15611
06991777 15612#: builtin/rebase.c:30
4c27fcb5
JX
15613msgid ""
15614"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
15615"[<branch>]"
15616msgstr ""
15617"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] [<上游>] [<分支>]"
15618
06991777 15619#: builtin/rebase.c:32
4c27fcb5
JX
15620msgid ""
15621"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
15622msgstr ""
15623"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]"
15624
06991777 15625#: builtin/rebase.c:34
4c27fcb5
JX
15626msgid "git rebase --continue | --abort | --skip | --edit-todo"
15627msgstr "git rebase --continue | --abort | --skip | --edit-todo"
15628
06991777 15629#: builtin/rebase.c:121 builtin/rebase.c:1437
4c27fcb5
JX
15630#, c-format
15631msgid "%s requires an interactive rebase"
15632msgstr "%s 需要交互式变基"
15633
06991777 15634#: builtin/rebase.c:173
4c27fcb5
JX
15635#, c-format
15636msgid "could not get 'onto': '%s'"
15637msgstr "无法获取 'onto':'%s'"
15638
06991777 15639#: builtin/rebase.c:188
4c27fcb5
JX
15640#, c-format
15641msgid "invalid orig-head: '%s'"
15642msgstr "无效的原始 head:'%s'"
15643
06991777 15644#: builtin/rebase.c:213
4c27fcb5
JX
15645#, c-format
15646msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
15647msgstr "忽略无效的 allow_rerere_autoupdate:'%s'"
15648
06991777 15649#: builtin/rebase.c:289
4c27fcb5
JX
15650#, c-format
15651msgid "Could not read '%s'"
15652msgstr "不能读取 '%s'"
15653
06991777 15654#: builtin/rebase.c:307
4c27fcb5
JX
15655#, c-format
15656msgid "Cannot store %s"
15657msgstr "不能存储 %s"
15658
06991777
JX
15659#: builtin/rebase.c:402
15660msgid "could not determine HEAD revision"
15661msgstr "不能确定 HEAD 版本"
15662
15663#: builtin/rebase.c:522
4c27fcb5
JX
15664msgid ""
15665"Resolve all conflicts manually, mark them as resolved with\n"
15666"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
15667"You can instead skip this commit: run \"git rebase --skip\".\n"
15668"To abort and get back to the state before \"git rebase\", run \"git rebase --"
15669"abort\"."
15670msgstr ""
15671"手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n"
15672"冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n"
15673"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
15674"\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。"
15675
06991777
JX
15676#: builtin/rebase.c:603
15677#, c-format
15678msgid ""
15679"\n"
15680"git encountered an error while preparing the patches to replay\n"
15681"these revisions:\n"
15682"\n"
15683" %s\n"
15684"\n"
15685"As a result, git cannot rebase them."
15686msgstr ""
15687"\n"
15688"在为重放这些版本而准备补丁时,git 遇到了一个错误:\n"
15689"\n"
15690" %s\n"
15691"\n"
15692"因此 git 无法对其变基。"
4c27fcb5 15693
06991777 15694#: builtin/rebase.c:948
4c27fcb5
JX
15695#, c-format
15696msgid ""
15697"%s\n"
15698"Please specify which branch you want to rebase against.\n"
15699"See git-rebase(1) for details.\n"
15700"\n"
15701" git rebase '<branch>'\n"
15702"\n"
15703msgstr ""
15704"%s\n"
15705"请指定您要变基到哪个分支。\n"
15706"详见 git-rebase(1)。\n"
15707"\n"
15708" git rebase '<branch>'\n"
15709"\n"
15710
06991777 15711#: builtin/rebase.c:964
4c27fcb5
JX
15712#, c-format
15713msgid ""
15714"If you wish to set tracking information for this branch you can do so with:\n"
15715"\n"
15716" git branch --set-upstream-to=%s/<branch> %s\n"
15717"\n"
15718msgstr ""
15719"如果您想要为此分支创建跟踪信息,您可以执行:\n"
15720"\n"
15721" git branch --set-upstream-to=%s/<branch> %s\n"
15722"\n"
15723
06991777
JX
15724#: builtin/rebase.c:994
15725msgid "exec commands cannot contain newlines"
15726msgstr "exec 命令不能包含换行符"
15727
15728#: builtin/rebase.c:998
15729msgid "empty exec command"
15730msgstr "空的 exec 命令"
15731
15732#: builtin/rebase.c:1040
4c27fcb5
JX
15733msgid "rebase onto given branch instead of upstream"
15734msgstr "变基到给定的分支而非上游"
15735
06991777 15736#: builtin/rebase.c:1042
4c27fcb5
JX
15737msgid "allow pre-rebase hook to run"
15738msgstr "允许执行 pre-rebase 钩子"
15739
06991777 15740#: builtin/rebase.c:1044
4c27fcb5
JX
15741msgid "be quiet. implies --no-stat"
15742msgstr "安静。暗示 --no-stat"
15743
06991777 15744#: builtin/rebase.c:1047
4c27fcb5
JX
15745msgid "display a diffstat of what changed upstream"
15746msgstr "显示上游变化的 diffstat"
15747
06991777 15748#: builtin/rebase.c:1050
4c27fcb5
JX
15749msgid "do not show diffstat of what changed upstream"
15750msgstr "不显示上游变化的 diffstat"
15751
06991777 15752#: builtin/rebase.c:1053
4c27fcb5
JX
15753msgid "add a Signed-off-by: line to each commit"
15754msgstr "为每一个提交添加一个 Signed-off-by: 签名"
15755
06991777 15756#: builtin/rebase.c:1055 builtin/rebase.c:1059 builtin/rebase.c:1061
4c27fcb5
JX
15757msgid "passed to 'git am'"
15758msgstr "传递给 'git am'"
15759
06991777 15760#: builtin/rebase.c:1063 builtin/rebase.c:1065
4c27fcb5
JX
15761msgid "passed to 'git apply'"
15762msgstr "传递给 'git apply'"
15763
06991777 15764#: builtin/rebase.c:1067 builtin/rebase.c:1070
4c27fcb5
JX
15765msgid "cherry-pick all commits, even if unchanged"
15766msgstr "拣选所有提交,即使未修改"
15767
06991777 15768#: builtin/rebase.c:1072
4c27fcb5
JX
15769msgid "continue"
15770msgstr "继续"
15771
06991777 15772#: builtin/rebase.c:1075
4c27fcb5
JX
15773msgid "skip current patch and continue"
15774msgstr "跳过当前补丁并继续"
15775
15776# 译者:注意保持前导空格
06991777 15777#: builtin/rebase.c:1077
4c27fcb5
JX
15778msgid "abort and check out the original branch"
15779msgstr "终止并检出原有分支"
15780
06991777 15781#: builtin/rebase.c:1080
4c27fcb5
JX
15782msgid "abort but keep HEAD where it is"
15783msgstr "终止但保持 HEAD 不变"
15784
06991777 15785#: builtin/rebase.c:1081
4c27fcb5
JX
15786msgid "edit the todo list during an interactive rebase"
15787msgstr "在交互式变基中编辑待办列表"
15788
06991777 15789#: builtin/rebase.c:1084
4c27fcb5
JX
15790msgid "show the patch file being applied or merged"
15791msgstr "显示正在应用或合并的补丁文件"
15792
06991777 15793#: builtin/rebase.c:1087
4c27fcb5
JX
15794msgid "use merging strategies to rebase"
15795msgstr "使用合并策略进行变基"
15796
06991777 15797#: builtin/rebase.c:1091
4c27fcb5
JX
15798msgid "let the user edit the list of commits to rebase"
15799msgstr "让用户编辑要变基的提交列表"
15800
06991777 15801#: builtin/rebase.c:1095
4c27fcb5
JX
15802msgid "try to recreate merges instead of ignoring them"
15803msgstr "尝试重建合并提交而非忽略它们"
15804
06991777 15805#: builtin/rebase.c:1099
4c27fcb5
JX
15806msgid "allow rerere to update index with resolved conflict"
15807msgstr "允许 rerere 用已解决的冲突更新索引"
15808
06991777 15809#: builtin/rebase.c:1102
4c27fcb5
JX
15810msgid "preserve empty commits during rebase"
15811msgstr "变基时保留空提交"
15812
06991777 15813#: builtin/rebase.c:1104
4c27fcb5
JX
15814msgid "move commits that begin with squash!/fixup! under -i"
15815msgstr "在 -i 交互模式下,移动以 squash!/fixup! 开头的提交"
15816
06991777 15817#: builtin/rebase.c:1110
4c27fcb5
JX
15818msgid "automatically stash/stash pop before and after"
15819msgstr "在操作前后执行自动贮藏和弹出贮藏"
15820
06991777 15821#: builtin/rebase.c:1112
4c27fcb5
JX
15822msgid "add exec lines after each commit of the editable list"
15823msgstr "可编辑列表的每一个提交下面增加一行 exec"
15824
06991777 15825#: builtin/rebase.c:1116
4c27fcb5
JX
15826msgid "allow rebasing commits with empty messages"
15827msgstr "允许针对空提交说明的提交变基"
15828
06991777 15829#: builtin/rebase.c:1119
4c27fcb5
JX
15830msgid "try to rebase merges instead of skipping them"
15831msgstr "尝试对合并提交变基而不是忽略它们"
15832
06991777 15833#: builtin/rebase.c:1122
4c27fcb5
JX
15834msgid "use 'merge-base --fork-point' to refine upstream"
15835msgstr "使用 'merge-base --fork-point' 来优化上游"
15836
06991777 15837#: builtin/rebase.c:1124
4c27fcb5
JX
15838msgid "use the given merge strategy"
15839msgstr "使用给定的合并策略"
15840
06991777 15841#: builtin/rebase.c:1126 builtin/revert.c:112
4c27fcb5
JX
15842msgid "option"
15843msgstr "选项"
15844
06991777 15845#: builtin/rebase.c:1127
4c27fcb5
JX
15846msgid "pass the argument through to the merge strategy"
15847msgstr "将参数传递给合并策略"
15848
06991777 15849#: builtin/rebase.c:1130
4c27fcb5
JX
15850msgid "rebase all reachable commits up to the root(s)"
15851msgstr "将所有可达的提交变基到根提交"
15852
06991777
JX
15853#: builtin/rebase.c:1133 builtin/rebase--interactive.c:198
15854msgid "automatically re-schedule any `exec` that fails"
15855msgstr "自动重新安排任何失败的 `exec`"
15856
15857#: builtin/rebase.c:1149
4c27fcb5
JX
15858#, c-format
15859msgid "could not exec %s"
15860msgstr "不能执行 %s"
15861
06991777 15862#: builtin/rebase.c:1167 git-legacy-rebase.sh:220
4c27fcb5
JX
15863msgid "It looks like 'git am' is in progress. Cannot rebase."
15864msgstr "看起来 'git-am' 正在执行中。无法变基。"
15865
06991777 15866#: builtin/rebase.c:1208 git-legacy-rebase.sh:406
4c27fcb5
JX
15867msgid "No rebase in progress?"
15868msgstr "没有正在进行的变基?"
15869
06991777 15870#: builtin/rebase.c:1212 git-legacy-rebase.sh:417
4c27fcb5
JX
15871msgid "The --edit-todo action can only be used during interactive rebase."
15872msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
15873
06991777 15874#: builtin/rebase.c:1226 git-legacy-rebase.sh:424
4c27fcb5
JX
15875msgid "Cannot read HEAD"
15876msgstr "不能读取 HEAD"
15877
06991777 15878#: builtin/rebase.c:1238 git-legacy-rebase.sh:427
4c27fcb5
JX
15879msgid ""
15880"You must edit all merge conflicts and then\n"
15881"mark them as resolved using git add"
15882msgstr ""
15883"您必须编辑所有的合并冲突,然后通过 git add\n"
15884"命令将它们标记为已解决"
15885
06991777 15886#: builtin/rebase.c:1257
4c27fcb5
JX
15887msgid "could not discard worktree changes"
15888msgstr "无法丢弃工作区变更"
15889
06991777 15890#: builtin/rebase.c:1276
4c27fcb5
JX
15891#, c-format
15892msgid "could not move back to %s"
15893msgstr "无法移回 %s"
15894
06991777 15895#: builtin/rebase.c:1287 builtin/rm.c:369
4c27fcb5
JX
15896#, c-format
15897msgid "could not remove '%s'"
15898msgstr "无法删除 '%s'"
15899
06991777 15900#: builtin/rebase.c:1313
4c27fcb5
JX
15901#, c-format
15902msgid ""
15903"It seems that there is already a %s directory, and\n"
15904"I wonder if you are in the middle of another rebase. If that is the\n"
15905"case, please try\n"
15906"\t%s\n"
15907"If that is not the case, please\n"
15908"\t%s\n"
15909"and run me again. I am stopping in case you still have something\n"
15910"valuable there.\n"
15911msgstr ""
15912"似乎已有一个 %s 目录,我怀疑您正处于另外一个变基操作过程中。\n"
15913"如果是这样,请执行\n"
15914"\t%s\n"
15915"如果不是这样,请执行\n"
15916"\t%s\n"
15917"然后再重新执行。 为避免丢失重要数据,我已经停止当前操作。\n"
15918
06991777 15919#: builtin/rebase.c:1334
4c27fcb5
JX
15920msgid "switch `C' expects a numerical value"
15921msgstr "开关 `C' 期望一个数字值"
15922
06991777 15923#: builtin/rebase.c:1375
4c27fcb5
JX
15924#, c-format
15925msgid "Unknown mode: %s"
15926msgstr "未知模式:%s"
15927
06991777 15928#: builtin/rebase.c:1397
4c27fcb5
JX
15929msgid "--strategy requires --merge or --interactive"
15930msgstr "--strategy 需要 --merge 或 --interactive"
15931
06991777
JX
15932#: builtin/rebase.c:1446
15933msgid "cannot combine am options with either interactive or merge options"
15934msgstr "不能将 am 选项与交互或合并选项组合一起"
4c27fcb5 15935
06991777
JX
15936#: builtin/rebase.c:1465
15937msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
15938msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 组合一起"
4c27fcb5 15939
06991777
JX
15940#: builtin/rebase.c:1469 git-legacy-rebase.sh:544
15941msgid ""
15942"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
15943msgstr ""
15944"错误:不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 组合一起"
4c27fcb5 15945
06991777
JX
15946#: builtin/rebase.c:1475
15947msgid "cannot combine '--rebase-merges' with '--strategy-option'"
15948msgstr "错误:不能将 '--rebase-merges' 和 '--strategy-option' 组合一起"
4c27fcb5 15949
06991777
JX
15950#: builtin/rebase.c:1478
15951msgid "cannot combine '--rebase-merges' with '--strategy'"
15952msgstr "错误:不能将 '--rebase-merges' 和 '--strategy' 组合一起"
4c27fcb5 15953
06991777 15954#: builtin/rebase.c:1502
4c27fcb5
JX
15955#, c-format
15956msgid "invalid upstream '%s'"
15957msgstr "无效的上游 '%s'"
15958
06991777 15959#: builtin/rebase.c:1508
4c27fcb5
JX
15960msgid "Could not create new root commit"
15961msgstr "不能创建新的根提交"
15962
06991777 15963#: builtin/rebase.c:1526
4c27fcb5
JX
15964#, c-format
15965msgid "'%s': need exactly one merge base"
15966msgstr "'%s':只需要一个合并基线"
15967
06991777 15968#: builtin/rebase.c:1533
4c27fcb5
JX
15969#, c-format
15970msgid "Does not point to a valid commit '%s'"
15971msgstr "没有指向一个有效的提交 '%s'"
15972
06991777 15973#: builtin/rebase.c:1558
4c27fcb5
JX
15974#, c-format
15975msgid "fatal: no such branch/commit '%s'"
06991777 15976msgstr "致命错误:无此分支/提交 '%s'"
4c27fcb5 15977
06991777
JX
15978#: builtin/rebase.c:1566 builtin/submodule--helper.c:38
15979#: builtin/submodule--helper.c:1934
4c27fcb5
JX
15980#, c-format
15981msgid "No such ref: %s"
15982msgstr "没有这样的引用:%s"
15983
06991777 15984#: builtin/rebase.c:1578
4c27fcb5
JX
15985msgid "Could not resolve HEAD to a revision"
15986msgstr "无法将 HEAD 解析为一个版本"
15987
06991777 15988#: builtin/rebase.c:1619 git-legacy-rebase.sh:673
4c27fcb5
JX
15989msgid "Cannot autostash"
15990msgstr "无法 autostash"
15991
06991777 15992#: builtin/rebase.c:1622
4c27fcb5
JX
15993#, c-format
15994msgid "Unexpected stash response: '%s'"
15995msgstr "意外的 stash 响应:'%s'"
15996
06991777 15997#: builtin/rebase.c:1628
4c27fcb5
JX
15998#, c-format
15999msgid "Could not create directory for '%s'"
16000msgstr "不能为 '%s' 创建目录"
16001
06991777 16002#: builtin/rebase.c:1631
4c27fcb5
JX
16003#, c-format
16004msgid "Created autostash: %s\n"
16005msgstr "创建了 autostash:%s\n"
16006
06991777 16007#: builtin/rebase.c:1634
4c27fcb5
JX
16008msgid "could not reset --hard"
16009msgstr "无法 reset --hard"
16010
06991777 16011#: builtin/rebase.c:1635 builtin/reset.c:114
4c27fcb5
JX
16012#, c-format
16013msgid "HEAD is now at %s"
16014msgstr "HEAD 现在位于 %s"
16015
06991777 16016#: builtin/rebase.c:1651 git-legacy-rebase.sh:682
4c27fcb5
JX
16017msgid "Please commit or stash them."
16018msgstr "请提交或贮藏修改。"
16019
06991777 16020#: builtin/rebase.c:1678
4c27fcb5
JX
16021#, c-format
16022msgid "could not parse '%s'"
16023msgstr "无法解析 '%s'"
16024
06991777 16025#: builtin/rebase.c:1691
4c27fcb5
JX
16026#, c-format
16027msgid "could not switch to %s"
16028msgstr "无法切换到 %s"
16029
06991777 16030#: builtin/rebase.c:1702 git-legacy-rebase.sh:705
4c27fcb5
JX
16031#, sh-format
16032msgid "HEAD is up to date."
16033msgstr "HEAD 是最新的。"
16034
06991777 16035#: builtin/rebase.c:1704
4c27fcb5
JX
16036#, c-format
16037msgid "Current branch %s is up to date.\n"
16038msgstr "当前分支 %s 是最新的。\n"
16039
06991777 16040#: builtin/rebase.c:1712 git-legacy-rebase.sh:715
4c27fcb5
JX
16041#, sh-format
16042msgid "HEAD is up to date, rebase forced."
16043msgstr "HEAD 是最新的,强制变基。"
16044
06991777 16045#: builtin/rebase.c:1714
4c27fcb5
JX
16046#, c-format
16047msgid "Current branch %s is up to date, rebase forced.\n"
16048msgstr "当前分支 %s 是最新的,强制变基。\n"
16049
06991777 16050#: builtin/rebase.c:1722 git-legacy-rebase.sh:215
4c27fcb5
JX
16051msgid "The pre-rebase hook refused to rebase."
16052msgstr "pre-rebase 钩子拒绝了变基操作。"
16053
06991777 16054#: builtin/rebase.c:1729
4c27fcb5
JX
16055#, c-format
16056msgid "Changes to %s:\n"
16057msgstr "到 %s 的变更:\n"
16058
06991777 16059#: builtin/rebase.c:1732
4c27fcb5
JX
16060#, c-format
16061msgid "Changes from %s to %s:\n"
16062msgstr "从 %s 到 %s 的变更:\n"
16063
06991777 16064#: builtin/rebase.c:1757
4c27fcb5
JX
16065#, c-format
16066msgid "First, rewinding head to replay your work on top of it...\n"
16067msgstr "首先,回退头指针以便在其上重放您的工作...\n"
16068
06991777 16069#: builtin/rebase.c:1765
4c27fcb5
JX
16070msgid "Could not detach HEAD"
16071msgstr "无法分离头指针"
16072
06991777 16073#: builtin/rebase.c:1774
4c27fcb5
JX
16074#, c-format
16075msgid "Fast-forwarded %s to %s.\n"
16076msgstr "快进 %s 到 %s。\n"
16077
06991777 16078#: builtin/rebase--interactive.c:25
4c27fcb5
JX
16079msgid "no HEAD?"
16080msgstr "没有 HEAD?"
16081
06991777 16082#: builtin/rebase--interactive.c:52
4c27fcb5
JX
16083#, c-format
16084msgid "could not create temporary %s"
16085msgstr "无法创建临时的 %s"
16086
06991777 16087#: builtin/rebase--interactive.c:58
4c27fcb5
JX
16088msgid "could not mark as interactive"
16089msgstr "无法标记为交互式"
16090
06991777 16091#: builtin/rebase--interactive.c:102
4c27fcb5
JX
16092#, c-format
16093msgid "could not open %s"
16094msgstr "无法打开 %s"
16095
06991777 16096#: builtin/rebase--interactive.c:115
4c27fcb5
JX
16097msgid "could not generate todo list"
16098msgstr "无法生成待办列表"
16099
06991777 16100#: builtin/rebase--interactive.c:131
4c27fcb5
JX
16101msgid "git rebase--interactive [<options>]"
16102msgstr "git rebase--interactive [<选项>]"
87cb7997 16103
06991777 16104#: builtin/rebase--interactive.c:150
6937cb4e
JX
16105msgid "keep empty commits"
16106msgstr "保持空提交"
16107
06991777 16108#: builtin/rebase--interactive.c:152 builtin/revert.c:125
31e5e17b
JX
16109msgid "allow commits with empty messages"
16110msgstr "允许提交说明为空"
16111
06991777 16112#: builtin/rebase--interactive.c:153
fd8cb379
JX
16113msgid "rebase merge commits"
16114msgstr "对合并提交变基"
16115
06991777 16116#: builtin/rebase--interactive.c:155
fd8cb379
JX
16117msgid "keep original branch points of cousins"
16118msgstr "保持兄弟提交的原始分支点"
16119
06991777 16120#: builtin/rebase--interactive.c:157
4c27fcb5
JX
16121msgid "move commits that begin with squash!/fixup!"
16122msgstr "移动以 squash!/fixup! 开头的提交"
16123
06991777 16124#: builtin/rebase--interactive.c:158
4c27fcb5
JX
16125msgid "sign commits"
16126msgstr "签名提交"
16127
06991777 16128#: builtin/rebase--interactive.c:160
87cb7997
JX
16129msgid "continue rebase"
16130msgstr "继续变基"
16131
06991777 16132#: builtin/rebase--interactive.c:162
4c27fcb5
JX
16133msgid "skip commit"
16134msgstr "跳过提交"
16135
06991777 16136#: builtin/rebase--interactive.c:163
4c27fcb5
JX
16137msgid "edit the todo list"
16138msgstr "变基待办列表"
87cb7997 16139
06991777 16140#: builtin/rebase--interactive.c:165
4c27fcb5
JX
16141msgid "show the current patch"
16142msgstr "显示当前补丁"
6937cb4e 16143
06991777 16144#: builtin/rebase--interactive.c:168
5809aa05
JX
16145msgid "shorten commit ids in the todo list"
16146msgstr "缩短待办列表中的提交号"
6937cb4e 16147
06991777 16148#: builtin/rebase--interactive.c:170
5809aa05
JX
16149msgid "expand commit ids in the todo list"
16150msgstr "扩展待办列表中的提交号"
16151
06991777 16152#: builtin/rebase--interactive.c:172
6937cb4e
JX
16153msgid "check the todo list"
16154msgstr "检查待办列表"
16155
06991777 16156#: builtin/rebase--interactive.c:174
6937cb4e
JX
16157msgid "rearrange fixup/squash lines"
16158msgstr "重新排列 fixup/squash 行"
16159
06991777 16160#: builtin/rebase--interactive.c:176
5809aa05
JX
16161msgid "insert exec commands in todo list"
16162msgstr "在待办列表中插入 exec 执行命令"
16163
06991777 16164#: builtin/rebase--interactive.c:177
4c27fcb5
JX
16165msgid "onto"
16166msgstr "onto"
16167
06991777 16168#: builtin/rebase--interactive.c:179
4c27fcb5
JX
16169msgid "restrict-revision"
16170msgstr "restrict-revision"
16171
06991777 16172#: builtin/rebase--interactive.c:179
4c27fcb5
JX
16173msgid "restrict revision"
16174msgstr "限制版本"
16175
06991777 16176#: builtin/rebase--interactive.c:180
4c27fcb5
JX
16177msgid "squash-onto"
16178msgstr "squash-onto"
16179
06991777 16180#: builtin/rebase--interactive.c:181
4c27fcb5
JX
16181msgid "squash onto"
16182msgstr "squash onto"
16183
06991777 16184#: builtin/rebase--interactive.c:183
4c27fcb5
JX
16185msgid "the upstream commit"
16186msgstr "上游提交"
16187
06991777 16188#: builtin/rebase--interactive.c:184
4c27fcb5
JX
16189msgid "head-name"
16190msgstr "head-name"
16191
06991777 16192#: builtin/rebase--interactive.c:184
4c27fcb5
JX
16193msgid "head name"
16194msgstr "head 名称"
16195
06991777 16196#: builtin/rebase--interactive.c:189
4c27fcb5
JX
16197msgid "rebase strategy"
16198msgstr "变基策略"
16199
06991777 16200#: builtin/rebase--interactive.c:190
4c27fcb5
JX
16201msgid "strategy-opts"
16202msgstr "strategy-opts"
16203
06991777 16204#: builtin/rebase--interactive.c:191
4c27fcb5
JX
16205msgid "strategy options"
16206msgstr "策略选项"
16207
06991777 16208#: builtin/rebase--interactive.c:192
4c27fcb5
JX
16209msgid "switch-to"
16210msgstr "切换到"
16211
06991777 16212#: builtin/rebase--interactive.c:193
4c27fcb5
JX
16213msgid "the branch or commit to checkout"
16214msgstr "要检出的分支或提交"
16215
06991777 16216#: builtin/rebase--interactive.c:194
4c27fcb5
JX
16217msgid "onto-name"
16218msgstr "onto-name"
16219
06991777 16220#: builtin/rebase--interactive.c:194
4c27fcb5
JX
16221msgid "onto name"
16222msgstr "onto name"
16223
06991777 16224#: builtin/rebase--interactive.c:195
4c27fcb5
JX
16225msgid "cmd"
16226msgstr "cmd"
16227
06991777 16228#: builtin/rebase--interactive.c:195
4c27fcb5
JX
16229msgid "the command to run"
16230msgstr "要执行的命令"
16231
06991777 16232#: builtin/rebase--interactive.c:224
fd8cb379
JX
16233msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
16234msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果"
16235
06991777 16236#: builtin/rebase--interactive.c:230
4c27fcb5
JX
16237msgid "a base commit must be provided with --upstream or --onto"
16238msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
16239
16240#: builtin/receive-pack.c:33
5b04ee3b 16241msgid "git receive-pack <git-dir>"
58b6f078 16242msgstr "git receive-pack <仓库目录>"
5b04ee3b 16243
c1ac5258 16244#: builtin/receive-pack.c:830
a0b6b246
JX
16245msgid ""
16246"By default, updating the current branch in a non-bare repository\n"
16247"is denied, because it will make the index and work tree inconsistent\n"
16248"with what you pushed, and will require 'git reset --hard' to match\n"
16249"the work tree to HEAD.\n"
16250"\n"
1a79b2f1
JX
16251"You can set the 'receive.denyCurrentBranch' configuration variable\n"
16252"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
a0b6b246
JX
16253"its current branch; however, this is not recommended unless you\n"
16254"arranged to update its work tree to match what you pushed in some\n"
16255"other way.\n"
16256"\n"
16257"To squelch this message and still keep the default behaviour, set\n"
16258"'receive.denyCurrentBranch' configuration variable to 'refuse'."
16259msgstr ""
16260"默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
16261"不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
16262"\n"
16263"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
16264"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
16265"用某种方式将其工作区更新至您推送的状态。\n"
16266"\n"
16267"若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
16268"配置变量为 'refuse'。"
16269
c1ac5258 16270#: builtin/receive-pack.c:850
a0b6b246
JX
16271msgid ""
16272"By default, deleting the current branch is denied, because the next\n"
16273"'git clone' won't result in any file checked out, causing confusion.\n"
16274"\n"
16275"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
16276"'warn' or 'ignore' in the remote repository to allow deleting the\n"
16277"current branch, with or without a warning message.\n"
16278"\n"
16279"To squelch this message, you can set it to 'refuse'."
16280msgstr ""
16281"默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
29004bbb 16282"导致困惑。\n"
a0b6b246
JX
16283"\n"
16284"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
29004bbb 16285"'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
a0b6b246
JX
16286"\n"
16287"若要屏蔽此信息,您可以设置它为 'refuse'。"
16288
4c27fcb5 16289#: builtin/receive-pack.c:1929
5b04ee3b
JX
16290msgid "quiet"
16291msgstr "静默模式"
16292
4c27fcb5 16293#: builtin/receive-pack.c:1943
5b04ee3b
JX
16294msgid "You must specify a directory."
16295msgstr "您必须指定一个目录。"
16296
06991777
JX
16297#: builtin/reflog.c:17
16298msgid ""
16299"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
16300"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
16301"<refs>..."
16302msgstr ""
16303"git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>] [--"
16304"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引"
16305"用>..."
16306
16307#: builtin/reflog.c:22
16308msgid ""
16309"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
16310"<refs>..."
16311msgstr ""
16312"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引"
16313"用>..."
16314
16315#: builtin/reflog.c:25
16316msgid "git reflog exists <ref>"
16317msgstr "git reflog exists <引用>"
16318
16319#: builtin/reflog.c:567 builtin/reflog.c:572
2e8451e8
JX
16320#, c-format
16321msgid "'%s' is not a valid timestamp"
16322msgstr "'%s' 不是一个有效的时间戳"
16323
06991777
JX
16324#: builtin/reflog.c:605
16325#, c-format
16326msgid "Marking reachable objects..."
16327msgstr "正在标记可达对象..."
16328
16329#: builtin/reflog.c:643
16330#, c-format
16331msgid "%s points nowhere!"
16332msgstr "%s 指向不存在!"
16333
16334#: builtin/reflog.c:695
16335msgid "no reflog specified to delete"
16336msgstr "未指定要删除的引用日志"
16337
16338#: builtin/reflog.c:704
16339#, c-format
16340msgid "not a reflog: %s"
16341msgstr "不是一个引用日志:%s"
16342
16343#: builtin/reflog.c:709
16344#, c-format
16345msgid "no reflog for '%s'"
16346msgstr "没有 '%s' 的引用日志"
16347
16348#: builtin/reflog.c:755
16349#, c-format
16350msgid "invalid ref format: %s"
16351msgstr "无效的引用格式:%s"
16352
16353#: builtin/reflog.c:764
16354msgid "git reflog [ show | expire | delete | exists ]"
16355msgstr "git reflog [ show | expire | delete | exists ]"
16356
4c27fcb5 16357#: builtin/remote.c:16
ef317cd5 16358msgid "git remote [-v | --verbose]"
07432cef 16359msgstr "git remote [-v | --verbose]"
ef317cd5 16360
4c27fcb5 16361#: builtin/remote.c:17
ef317cd5 16362msgid ""
814ff314 16363"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
ef317cd5
JX
16364"mirror=<fetch|push>] <name> <url>"
16365msgstr ""
814ff314 16366"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
d9d56b23 16367"mirror=<fetch|push>] <名称> <地址>"
ef317cd5 16368
4c27fcb5 16369#: builtin/remote.c:18 builtin/remote.c:38
ef317cd5 16370msgid "git remote rename <old> <new>"
07432cef 16371msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 16372
4c27fcb5 16373#: builtin/remote.c:19 builtin/remote.c:43
ef317cd5 16374msgid "git remote remove <name>"
07432cef 16375msgstr "git remote remove <名称>"
ef317cd5 16376
4c27fcb5 16377#: builtin/remote.c:20 builtin/remote.c:48
814ff314
JX
16378msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
16379msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
ef317cd5 16380
4c27fcb5 16381#: builtin/remote.c:21
ef317cd5 16382msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 16383msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 16384
4c27fcb5 16385#: builtin/remote.c:22
ef317cd5 16386msgid "git remote prune [-n | --dry-run] <name>"
07432cef 16387msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 16388
4c27fcb5 16389#: builtin/remote.c:23
ef317cd5
JX
16390msgid ""
16391"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 16392msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 16393
4c27fcb5 16394#: builtin/remote.c:24
ef317cd5 16395msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 16396msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 16397
4c27fcb5 16398#: builtin/remote.c:25 builtin/remote.c:74
94550ed3
JX
16399msgid "git remote get-url [--push] [--all] <name>"
16400msgstr "git remote get-url [--push] [--all] <名称>"
16401
4c27fcb5 16402#: builtin/remote.c:26 builtin/remote.c:79
ef317cd5 16403msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 16404msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 16405
4c27fcb5 16406#: builtin/remote.c:27 builtin/remote.c:80
ef317cd5 16407msgid "git remote set-url --add <name> <newurl>"
07432cef 16408msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 16409
4c27fcb5 16410#: builtin/remote.c:28 builtin/remote.c:81
ef317cd5 16411msgid "git remote set-url --delete <name> <url>"
07432cef 16412msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 16413
4c27fcb5 16414#: builtin/remote.c:33
ef317cd5 16415msgid "git remote add [<options>] <name> <url>"
07432cef 16416msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 16417
4c27fcb5 16418#: builtin/remote.c:53
ef317cd5 16419msgid "git remote set-branches <name> <branch>..."
07432cef 16420msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 16421
4c27fcb5 16422#: builtin/remote.c:54
ef317cd5 16423msgid "git remote set-branches --add <name> <branch>..."
07432cef 16424msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 16425
4c27fcb5 16426#: builtin/remote.c:59
ef317cd5 16427msgid "git remote show [<options>] <name>"
07432cef 16428msgstr "git remote show [<选项>] <名称>"
ef317cd5 16429
4c27fcb5 16430#: builtin/remote.c:64
ef317cd5 16431msgid "git remote prune [<options>] <name>"
07432cef 16432msgstr "git remote prune [<选项>] <名称>"
ef317cd5 16433
4c27fcb5 16434#: builtin/remote.c:69
ef317cd5 16435msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 16436msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 16437
4c27fcb5 16438#: builtin/remote.c:98
81809b99 16439#, c-format
8ada9598 16440msgid "Updating %s"
81809b99 16441msgstr "更新 %s 中"
8ada9598 16442
4c27fcb5 16443#: builtin/remote.c:130
8ada9598
JX
16444msgid ""
16445"--mirror is dangerous and deprecated; please\n"
16446"\t use --mirror=fetch or --mirror=push instead"
16447msgstr ""
81809b99
JX
16448"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
16449"\t 或 --mirror=push"
8ada9598 16450
4c27fcb5 16451#: builtin/remote.c:147
81809b99 16452#, c-format
8ada9598 16453msgid "unknown mirror argument: %s"
81809b99 16454msgstr "未知的镜像参数:%s"
8ada9598 16455
4c27fcb5 16456#: builtin/remote.c:163
ef317cd5 16457msgid "fetch the remote branches"
07432cef 16458msgstr "抓取远程的分支"
ef317cd5 16459
4c27fcb5 16460#: builtin/remote.c:165
ef317cd5 16461msgid "import all tags and associated objects when fetching"
55a16ee4 16462msgstr "抓取时导入所有的标签和关联对象"
ef317cd5 16463
4c27fcb5 16464#: builtin/remote.c:168
ef317cd5 16465msgid "or do not fetch any tag at all (--no-tags)"
55a16ee4 16466msgstr "或不抓取任何标签(--no-tags)"
ef317cd5 16467
4c27fcb5 16468#: builtin/remote.c:170
ef317cd5 16469msgid "branch(es) to track"
07432cef 16470msgstr "跟踪的分支"
ef317cd5 16471
4c27fcb5 16472#: builtin/remote.c:171
ef317cd5 16473msgid "master branch"
07432cef 16474msgstr "主线分支"
ef317cd5 16475
4c27fcb5 16476#: builtin/remote.c:173
ef317cd5 16477msgid "set up remote as a mirror to push to or fetch from"
07432cef 16478msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 16479
4c27fcb5 16480#: builtin/remote.c:185
8ada9598 16481msgid "specifying a master branch makes no sense with --mirror"
81809b99 16482msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 16483
4c27fcb5 16484#: builtin/remote.c:187
8ada9598 16485msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 16486msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 16487
4c27fcb5 16488#: builtin/remote.c:194 builtin/remote.c:636
81809b99 16489#, c-format
8ada9598 16490msgid "remote %s already exists."
81809b99 16491msgstr "远程 %s 已经存在。"
8ada9598 16492
4c27fcb5 16493#: builtin/remote.c:198 builtin/remote.c:640
81809b99 16494#, c-format
8ada9598 16495msgid "'%s' is not a valid remote name"
81809b99 16496msgstr "'%s' 不是一个有效的远程名称"
8ada9598 16497
4c27fcb5 16498#: builtin/remote.c:238
81809b99 16499#, c-format
8ada9598 16500msgid "Could not setup master '%s'"
81809b99 16501msgstr "无法设置 master '%s'"
8ada9598 16502
4c27fcb5 16503#: builtin/remote.c:344
81809b99 16504#, c-format
8ada9598 16505msgid "Could not get fetch map for refspec %s"
160fb2b2 16506msgstr "无法得到引用规格 %s 的获取列表"
8ada9598 16507
4c27fcb5 16508#: builtin/remote.c:443 builtin/remote.c:451
8ada9598 16509msgid "(matching)"
81809b99 16510msgstr "(匹配)"
8ada9598 16511
4c27fcb5 16512#: builtin/remote.c:455
8ada9598 16513msgid "(delete)"
81809b99 16514msgstr "(删除)"
8ada9598 16515
4c27fcb5 16516#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
81809b99 16517#, c-format
4c27fcb5
JX
16518msgid "No such remote: '%s'"
16519msgstr "没有此远程仓库:'%s'"
8ada9598 16520
4c27fcb5 16521#: builtin/remote.c:646
81809b99 16522#, c-format
8ada9598 16523msgid "Could not rename config section '%s' to '%s'"
81809b99 16524msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 16525
4c27fcb5 16526#: builtin/remote.c:666
8ada9598
JX
16527#, c-format
16528msgid ""
d691f479 16529"Not updating non-default fetch refspec\n"
8ada9598
JX
16530"\t%s\n"
16531"\tPlease update the configuration manually if necessary."
16532msgstr ""
160fb2b2 16533"没有更新非默认的获取引用规格\n"
81809b99
JX
16534"\t%s\n"
16535"\t如果必要请手动更新配置。"
8ada9598 16536
4c27fcb5 16537#: builtin/remote.c:702
81809b99 16538#, c-format
8ada9598 16539msgid "deleting '%s' failed"
81809b99 16540msgstr "删除 '%s' 失败"
8ada9598 16541
4c27fcb5 16542#: builtin/remote.c:736
81809b99 16543#, c-format
8ada9598 16544msgid "creating '%s' failed"
81809b99 16545msgstr "创建 '%s' 失败"
8ada9598 16546
4c27fcb5 16547#: builtin/remote.c:802
8ada9598
JX
16548msgid ""
16549"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
16550"to delete it, use:"
16551msgid_plural ""
16552"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
16553"to delete them, use:"
5ae481e0
JX
16554msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
16555msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 16556
4c27fcb5 16557#: builtin/remote.c:816
276ceeaa
JX
16558#, c-format
16559msgid "Could not remove config section '%s'"
16560msgstr "不能移除配置小节 '%s'"
16561
4c27fcb5 16562#: builtin/remote.c:917
8ada9598
JX
16563#, c-format
16564msgid " new (next fetch will store in remotes/%s)"
81809b99 16565msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 16566
4c27fcb5 16567#: builtin/remote.c:920
8ada9598 16568msgid " tracked"
81809b99 16569msgstr " 已跟踪"
8ada9598 16570
4c27fcb5 16571#: builtin/remote.c:922
8ada9598 16572msgid " stale (use 'git remote prune' to remove)"
81809b99 16573msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 16574
4c27fcb5 16575#: builtin/remote.c:924
8ada9598 16576msgid " ???"
81809b99 16577msgstr " ???"
8ada9598 16578
4c27fcb5 16579#: builtin/remote.c:965
8ada9598
JX
16580#, c-format
16581msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 16582msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 16583
4c27fcb5 16584#: builtin/remote.c:974
81809b99 16585#, c-format
276ceeaa
JX
16586msgid "rebases interactively onto remote %s"
16587msgstr "交互式变基到远程 %s"
8ada9598 16588
4c27fcb5 16589#: builtin/remote.c:976
fd8cb379
JX
16590#, c-format
16591msgid "rebases interactively (with merges) onto remote %s"
16592msgstr "交互式变基(含合并提交)到远程 %s"
16593
4c27fcb5 16594#: builtin/remote.c:979
5c57d762
JX
16595#, c-format
16596msgid "rebases onto remote %s"
16597msgstr "变基到远程 %s"
16598
4c27fcb5 16599#: builtin/remote.c:983
81809b99 16600#, c-format
8ada9598 16601msgid " merges with remote %s"
81809b99 16602msgstr " 与远程 %s 合并"
8ada9598 16603
4c27fcb5 16604#: builtin/remote.c:986
81809b99 16605#, c-format
8ada9598 16606msgid "merges with remote %s"
81809b99 16607msgstr "与远程 %s 合并"
8ada9598 16608
4c27fcb5 16609#: builtin/remote.c:989
5c57d762
JX
16610#, c-format
16611msgid "%-*s and with remote %s\n"
16612msgstr "%-*s 以及和远程 %s\n"
8ada9598 16613
4c27fcb5 16614#: builtin/remote.c:1032
8ada9598 16615msgid "create"
81809b99 16616msgstr "创建"
8ada9598 16617
4c27fcb5 16618#: builtin/remote.c:1035
8ada9598 16619msgid "delete"
81809b99 16620msgstr "删除"
8ada9598 16621
4c27fcb5 16622#: builtin/remote.c:1039
8ada9598 16623msgid "up to date"
81809b99 16624msgstr "最新"
8ada9598 16625
4c27fcb5 16626#: builtin/remote.c:1042
8ada9598 16627msgid "fast-forwardable"
81809b99 16628msgstr "可快进"
8ada9598 16629
4c27fcb5 16630#: builtin/remote.c:1045
8ada9598 16631msgid "local out of date"
81809b99 16632msgstr "本地已过时"
8ada9598 16633
4c27fcb5 16634#: builtin/remote.c:1052
8ada9598
JX
16635#, c-format
16636msgid " %-*s forces to %-*s (%s)"
81809b99 16637msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 16638
4c27fcb5 16639#: builtin/remote.c:1055
8ada9598
JX
16640#, c-format
16641msgid " %-*s pushes to %-*s (%s)"
81809b99 16642msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 16643
4c27fcb5 16644#: builtin/remote.c:1059
8ada9598
JX
16645#, c-format
16646msgid " %-*s forces to %s"
81809b99 16647msgstr " %-*s 强制推送至 %s"
8ada9598 16648
4c27fcb5 16649#: builtin/remote.c:1062
8ada9598
JX
16650#, c-format
16651msgid " %-*s pushes to %s"
81809b99 16652msgstr " %-*s 推送至 %s"
8ada9598 16653
4c27fcb5 16654#: builtin/remote.c:1130
ef317cd5 16655msgid "do not query remotes"
07432cef 16656msgstr "不查询远程"
ef317cd5 16657
4c27fcb5 16658#: builtin/remote.c:1157
81809b99 16659#, c-format
8ada9598 16660msgid "* remote %s"
81809b99 16661msgstr "* 远程 %s"
8ada9598 16662
4c27fcb5 16663#: builtin/remote.c:1158
8ada9598
JX
16664#, c-format
16665msgid " Fetch URL: %s"
81809b99 16666msgstr " 获取地址:%s"
8ada9598 16667
4c27fcb5 16668#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
8ada9598 16669msgid "(no URL)"
81809b99 16670msgstr "(无 URL)"
8ada9598 16671
a4f16749
JX
16672#. TRANSLATORS: the colon ':' should align
16673#. with the one in " Fetch URL: %s"
16674#. translation.
16675#.
4c27fcb5 16676#: builtin/remote.c:1173 builtin/remote.c:1175
8ada9598
JX
16677#, c-format
16678msgid " Push URL: %s"
81809b99 16679msgstr " 推送地址:%s"
8ada9598 16680
4c27fcb5 16681#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
81809b99 16682#, c-format
8ada9598 16683msgid " HEAD branch: %s"
4375c10e 16684msgstr " HEAD 分支:%s"
8ada9598 16685
5c57d762 16686# 译者:中文字符串拼接,可删除前导空格
4c27fcb5 16687#: builtin/remote.c:1177
5c57d762
JX
16688msgid "(not queried)"
16689msgstr "(未查询)"
16690
4c27fcb5 16691#: builtin/remote.c:1179
5c57d762
JX
16692msgid "(unknown)"
16693msgstr "(未知)"
16694
4c27fcb5 16695#: builtin/remote.c:1183
8ada9598
JX
16696#, c-format
16697msgid ""
16698" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 16699msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 16700
4c27fcb5 16701#: builtin/remote.c:1195
81809b99 16702#, c-format
8ada9598
JX
16703msgid " Remote branch:%s"
16704msgid_plural " Remote branches:%s"
81809b99 16705msgstr[0] " 远程分支:%s"
5ae481e0 16706msgstr[1] " 远程分支:%s"
8ada9598 16707
81809b99 16708# 译者:中文字符串拼接,可删除前导空格
4c27fcb5 16709#: builtin/remote.c:1198 builtin/remote.c:1224
8ada9598 16710msgid " (status not queried)"
81809b99 16711msgstr "(状态未查询)"
8ada9598 16712
4c27fcb5 16713#: builtin/remote.c:1207
8ada9598
JX
16714msgid " Local branch configured for 'git pull':"
16715msgid_plural " Local branches configured for 'git pull':"
81809b99 16716msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 16717msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 16718
4c27fcb5 16719#: builtin/remote.c:1215
8ada9598 16720msgid " Local refs will be mirrored by 'git push'"
81809b99 16721msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 16722
4c27fcb5 16723#: builtin/remote.c:1221
81809b99 16724#, c-format
8ada9598
JX
16725msgid " Local ref configured for 'git push'%s:"
16726msgid_plural " Local refs configured for 'git push'%s:"
81809b99 16727msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 16728msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 16729
4c27fcb5 16730#: builtin/remote.c:1242
ef317cd5 16731msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 16732msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 16733
4c27fcb5 16734#: builtin/remote.c:1244
ef317cd5 16735msgid "delete refs/remotes/<name>/HEAD"
07432cef 16736msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 16737
4c27fcb5 16738#: builtin/remote.c:1259
8ada9598 16739msgid "Cannot determine remote HEAD"
81809b99 16740msgstr "无法确定远程 HEAD"
8ada9598 16741
4c27fcb5 16742#: builtin/remote.c:1261
8ada9598 16743msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 16744msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 16745
4c27fcb5 16746#: builtin/remote.c:1271
81809b99 16747#, c-format
8ada9598 16748msgid "Could not delete %s"
81809b99 16749msgstr "无法删除 %s"
8ada9598 16750
4c27fcb5 16751#: builtin/remote.c:1279
81809b99 16752#, c-format
8ada9598 16753msgid "Not a valid ref: %s"
81809b99 16754msgstr "不是一个有效引用:%s"
8ada9598 16755
4c27fcb5 16756#: builtin/remote.c:1281
81809b99 16757#, c-format
8ada9598 16758msgid "Could not setup %s"
81809b99 16759msgstr "不能设置 %s"
8ada9598
JX
16760
16761# 译者:注意保持前导空格
4c27fcb5 16762#: builtin/remote.c:1299
81809b99 16763#, c-format
8ada9598 16764msgid " %s will become dangling!"
e640d114 16765msgstr " %s 将成为悬空状态!"
8ada9598
JX
16766
16767# 译者:注意保持前导空格
4c27fcb5 16768#: builtin/remote.c:1300
81809b99 16769#, c-format
8ada9598 16770msgid " %s has become dangling!"
e640d114 16771msgstr " %s 已成为悬空状态!"
8ada9598 16772
4c27fcb5 16773#: builtin/remote.c:1310
81809b99 16774#, c-format
8ada9598 16775msgid "Pruning %s"
81809b99 16776msgstr "修剪 %s"
8ada9598 16777
4c27fcb5 16778#: builtin/remote.c:1311
8ada9598
JX
16779#, c-format
16780msgid "URL: %s"
81809b99 16781msgstr "URL:%s"
8ada9598 16782
4c27fcb5 16783#: builtin/remote.c:1327
8ada9598
JX
16784#, c-format
16785msgid " * [would prune] %s"
81809b99 16786msgstr " * [将删除] %s"
8ada9598 16787
4c27fcb5 16788#: builtin/remote.c:1330
8ada9598
JX
16789#, c-format
16790msgid " * [pruned] %s"
81809b99 16791msgstr " * [已删除] %s"
8ada9598 16792
4c27fcb5 16793#: builtin/remote.c:1375
ef317cd5 16794msgid "prune remotes after fetching"
07432cef 16795msgstr "抓取后清除远程"
ef317cd5 16796
4c27fcb5 16797#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
81809b99 16798#, c-format
8ada9598 16799msgid "No such remote '%s'"
81809b99 16800msgstr "没有此远程 '%s'"
8ada9598 16801
4c27fcb5 16802#: builtin/remote.c:1454
ef317cd5 16803msgid "add branch"
07432cef 16804msgstr "添加分支"
ef317cd5 16805
4c27fcb5 16806#: builtin/remote.c:1461
8ada9598 16807msgid "no remote specified"
81809b99 16808msgstr "未指定远程"
8ada9598 16809
4c27fcb5 16810#: builtin/remote.c:1478
94550ed3
JX
16811msgid "query push URLs rather than fetch URLs"
16812msgstr "查询推送 URL 地址,而非获取 URL 地址"
16813
4c27fcb5 16814#: builtin/remote.c:1480
94550ed3
JX
16815msgid "return all URLs"
16816msgstr "返回所有 URL 地址"
16817
4c27fcb5 16818#: builtin/remote.c:1508
94550ed3
JX
16819#, c-format
16820msgid "no URLs configured for remote '%s'"
16821msgstr "没有给远程仓库 '%s' 设定 URL"
16822
4c27fcb5 16823#: builtin/remote.c:1534
ef317cd5 16824msgid "manipulate push URLs"
07432cef 16825msgstr "操作推送 URLS"
ef317cd5 16826
4c27fcb5 16827#: builtin/remote.c:1536
ef317cd5 16828msgid "add URL"
07432cef 16829msgstr "添加 URL"
ef317cd5 16830
4c27fcb5 16831#: builtin/remote.c:1538
ef317cd5 16832msgid "delete URLs"
07432cef 16833msgstr "删除 URLS"
ef317cd5 16834
4c27fcb5 16835#: builtin/remote.c:1545
8ada9598 16836msgid "--add --delete doesn't make sense"
81809b99 16837msgstr "--add --delete 无意义"
8ada9598 16838
4c27fcb5 16839#: builtin/remote.c:1584
81809b99 16840#, c-format
8ada9598 16841msgid "Invalid old URL pattern: %s"
4375c10e 16842msgstr "无效的旧 URL 匹配模版:%s"
8ada9598 16843
4c27fcb5 16844#: builtin/remote.c:1592
81809b99 16845#, c-format
8ada9598 16846msgid "No such URL found: %s"
4375c10e 16847msgstr "未找到此 URL:%s"
8ada9598 16848
4c27fcb5 16849#: builtin/remote.c:1594
8ada9598 16850msgid "Will not delete all non-push URLs"
4375c10e 16851msgstr "将不会删除所有非推送 URL 地址"
8ada9598 16852
4c27fcb5 16853#: builtin/remote.c:1610
ef317cd5 16854msgid "be verbose; must be placed before a subcommand"
07432cef 16855msgstr "冗长输出;必须置于子命令之前"
ef317cd5 16856
4c27fcb5 16857#: builtin/remote.c:1641
a0b6b246
JX
16858#, c-format
16859msgid "Unknown subcommand: %s"
16860msgstr "未知子命令:%s"
16861
4c27fcb5 16862#: builtin/repack.c:22
814ff314
JX
16863msgid "git repack [<options>]"
16864msgstr "git repack [<选项>]"
90314792 16865
4c27fcb5 16866#: builtin/repack.c:27
1a79b2f1
JX
16867msgid ""
16868"Incremental repacks are incompatible with bitmap indexes. Use\n"
16869"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
16870msgstr ""
16871"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
16872"或禁用 pack.writebitmaps 配置。"
16873
06991777
JX
16874#: builtin/repack.c:200
16875msgid "could not start pack-objects to repack promisor objects"
16876msgstr "无法运行 pack-objects 来重新打包 promisor 对象"
16877
16878#: builtin/repack.c:239 builtin/repack.c:411
16879msgid "repack: Expecting full hex object ID lines only from pack-objects."
16880msgstr "repack:期望来自 pack-objects 的完整十六进制对象ID。"
16881
16882#: builtin/repack.c:256
16883msgid "could not finish pack-objects to repack promisor objects"
16884msgstr "无法结束 pack-objects 来重新打包 promisor 对象"
16885
4c27fcb5 16886#: builtin/repack.c:294
90314792
JX
16887msgid "pack everything in a single pack"
16888msgstr "所有内容打包到一个包文件中"
16889
4c27fcb5 16890#: builtin/repack.c:296
90314792
JX
16891msgid "same as -a, and turn unreachable objects loose"
16892msgstr "和 -a 相同,并将不可达的对象设为松散对象"
16893
4c27fcb5 16894#: builtin/repack.c:299
90314792
JX
16895msgid "remove redundant packs, and run git-prune-packed"
16896msgstr "删除多余的包,运行 git-prune-packed"
16897
4c27fcb5 16898#: builtin/repack.c:301
90314792
JX
16899msgid "pass --no-reuse-delta to git-pack-objects"
16900msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
16901
4c27fcb5 16902#: builtin/repack.c:303
90314792
JX
16903msgid "pass --no-reuse-object to git-pack-objects"
16904msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
16905
4c27fcb5 16906#: builtin/repack.c:305
90314792
JX
16907msgid "do not run git-update-server-info"
16908msgstr "不运行 git-update-server-info"
16909
4c27fcb5 16910#: builtin/repack.c:308
90314792
JX
16911msgid "pass --local to git-pack-objects"
16912msgstr "向 git-pack-objects 传递参数 --local"
16913
4c27fcb5 16914#: builtin/repack.c:310
6c94aba5
JX
16915msgid "write bitmap index"
16916msgstr "写 bitmap 索引"
16917
4c27fcb5
JX
16918#: builtin/repack.c:312
16919msgid "pass --delta-islands to git-pack-objects"
16920msgstr "向 git-pack-objects 传递参数 --delta-islands"
16921
16922#: builtin/repack.c:313
90314792
JX
16923msgid "approxidate"
16924msgstr "近似日期"
16925
4c27fcb5 16926#: builtin/repack.c:314
90314792
JX
16927msgid "with -A, do not loosen objects older than this"
16928msgstr "使用 -A,不要将早于给定时间的对象过期"
16929
4c27fcb5 16930#: builtin/repack.c:316
5c57d762
JX
16931msgid "with -a, repack unreachable objects"
16932msgstr "使用 -a ,重新对不可达对象打包"
16933
4c27fcb5 16934#: builtin/repack.c:318
90314792
JX
16935msgid "size of the window used for delta compression"
16936msgstr "用于增量压缩的窗口值"
16937
4c27fcb5 16938#: builtin/repack.c:319 builtin/repack.c:325
8376b58d
JX
16939msgid "bytes"
16940msgstr "字节"
16941
4c27fcb5 16942#: builtin/repack.c:320
90314792
JX
16943msgid "same as the above, but limit memory size instead of entries count"
16944msgstr "和上面的相似,但限制内存大小而非条目数"
16945
4c27fcb5 16946#: builtin/repack.c:322
90314792
JX
16947msgid "limits the maximum delta depth"
16948msgstr "限制最大增量深度"
16949
4c27fcb5 16950#: builtin/repack.c:324
a4f16749
JX
16951msgid "limits the maximum number of threads"
16952msgstr "限制最大线程数"
16953
4c27fcb5 16954#: builtin/repack.c:326
90314792 16955msgid "maximum size of each packfile"
dbd6cced 16956msgstr "每个包文件的最大尺寸"
90314792 16957
4c27fcb5 16958#: builtin/repack.c:328
6c94aba5
JX
16959msgid "repack objects in packs marked with .keep"
16960msgstr "对标记为 .keep 的包中的对象重新打包"
16961
4c27fcb5 16962#: builtin/repack.c:330
fd8cb379
JX
16963msgid "do not repack this pack"
16964msgstr "不要对该包文件重新打包"
16965
4c27fcb5 16966#: builtin/repack.c:340
94550ed3
JX
16967msgid "cannot delete packs in a precious-objects repo"
16968msgstr "不能删除珍品仓库中的打包文件"
16969
4c27fcb5 16970#: builtin/repack.c:344
5c57d762
JX
16971msgid "--keep-unreachable and -A are incompatible"
16972msgstr "--keep-unreachable 和 -A 不兼容"
16973
06991777
JX
16974#: builtin/repack.c:420
16975msgid "Nothing new to pack."
16976msgstr "没有新的要打包。"
16977
16978#: builtin/repack.c:481
16979#, c-format
16980msgid ""
16981"WARNING: Some packs in use have been renamed by\n"
16982"WARNING: prefixing old- to their name, in order to\n"
16983"WARNING: replace them with the new version of the\n"
16984"WARNING: file. But the operation failed, and the\n"
16985"WARNING: attempt to rename them back to their\n"
16986"WARNING: original names also failed.\n"
16987"WARNING: Please rename them in %s manually:\n"
16988msgstr ""
16989"警告:为了将包文件替换为新版本,一些使用中的包已经\n"
16990"警告:通过添加 old- 前缀的方式重命名。但是操作失败,\n"
16991"警告:并且尝试重命名改回原有文件名的操作也失败。\n"
16992"警告:请手动将 %s 下的这些文件重命名:\n"
16993
16994#: builtin/repack.c:529
90314792 16995#, c-format
5c57d762 16996msgid "failed to remove '%s'"
c1ac5258 16997msgstr "删除 '%s' 失败"
90314792 16998
fd8cb379 16999#: builtin/replace.c:22
ef317cd5 17000msgid "git replace [-f] <object> <replacement>"
07432cef 17001msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 17002
fd8cb379 17003#: builtin/replace.c:23
6acbf033
JX
17004msgid "git replace [-f] --edit <object>"
17005msgstr "git replace [-f] --edit <对象>"
17006
fd8cb379 17007#: builtin/replace.c:24
6acbf033
JX
17008msgid "git replace [-f] --graft <commit> [<parent>...]"
17009msgstr "git replace [-f] --graft <提交> [<父提交>...]"
17010
fd8cb379
JX
17011#: builtin/replace.c:25
17012msgid "git replace [-f] --convert-graft-file"
17013msgstr "git replace [-f] --convert-graft-file"
17014
17015#: builtin/replace.c:26
ef317cd5 17016msgid "git replace -d <object>..."
07432cef 17017msgstr "git replace -d <对象>..."
ef317cd5 17018
fd8cb379 17019#: builtin/replace.c:27
cfff71a9
JX
17020msgid "git replace [--format=<format>] [-l [<pattern>]]"
17021msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 17022
4c27fcb5 17023#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206
6acbf033 17024#, c-format
c1ac5258
JX
17025msgid "failed to resolve '%s' as a valid ref"
17026msgstr "无法将 '%s' 解析为一个有效引用"
17027
17028#: builtin/replace.c:86
17029#, c-format
17030msgid ""
17031"invalid replace format '%s'\n"
17032"valid formats are 'short', 'medium' and 'long'"
17033msgstr ""
17034"无效的替换格式 '%s'\n"
17035"有效的格式有 'short'、'medium' 和 'long'"
17036
17037#: builtin/replace.c:121
17038#, c-format
17039msgid "replace ref '%s' not found"
17040msgstr "未发现替换引用 '%s'"
17041
17042#: builtin/replace.c:137
17043#, c-format
17044msgid "Deleted replace ref '%s'"
e640d114 17045msgstr "已删除替换引用 '%s'"
c1ac5258
JX
17046
17047#: builtin/replace.c:149
17048#, c-format
17049msgid "'%s' is not a valid ref name"
17050msgstr "'%s' 不是一个有效的引用名"
17051
17052#: builtin/replace.c:154
17053#, c-format
17054msgid "replace ref '%s' already exists"
17055msgstr "替换引用 '%s' 已经存在"
17056
17057#: builtin/replace.c:174
17058#, c-format
17059msgid ""
17060"Objects must be of the same type.\n"
17061"'%s' points to a replaced object of type '%s'\n"
17062"while '%s' points to a replacement object of type '%s'."
17063msgstr ""
17064"对象必须属于同一类型。\n"
17065"'%s' 指向 '%s' 类型的替换对象\n"
17066"而 '%s' 指向 '%s' 类型的替换对象。"
17067
17068#: builtin/replace.c:225
17069#, c-format
17070msgid "unable to open %s for writing"
17071msgstr "无法为写入打开 %s"
17072
17073#: builtin/replace.c:238
17074msgid "cat-file reported failure"
17075msgstr "cat-file 报告失败"
17076
17077#: builtin/replace.c:254
17078#, c-format
17079msgid "unable to open %s for reading"
17080msgstr "无法为读取打开 %s"
17081
17082#: builtin/replace.c:268
17083msgid "unable to spawn mktree"
17084msgstr "无法启动 mktree"
17085
17086#: builtin/replace.c:272
17087msgid "unable to read from mktree"
17088msgstr "无法从 mktree 读取"
17089
17090#: builtin/replace.c:281
17091msgid "mktree reported failure"
17092msgstr "mktree 报告失败"
17093
17094#: builtin/replace.c:285
17095msgid "mktree did not return an object name"
17096msgstr "mktree 没有返回一个对象名"
17097
17098#: builtin/replace.c:294
17099#, c-format
17100msgid "unable to fstat %s"
17101msgstr "无法对 %s 执行 fstat"
17102
17103#: builtin/replace.c:299
17104msgid "unable to write object to database"
17105msgstr "无法向数据库写入对象"
17106
17107#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415
17108#: builtin/replace.c:445
17109#, c-format
17110msgid "not a valid object name: '%s'"
6acbf033
JX
17111msgstr "不是一个有效的对象名:'%s'"
17112
c1ac5258
JX
17113#: builtin/replace.c:322
17114#, c-format
17115msgid "unable to get object type for %s"
17116msgstr "无法得到 %s 的对象类型"
17117
17118#: builtin/replace.c:338
17119msgid "editing object file failed"
17120msgstr "编辑对象文件失败"
17121
17122#: builtin/replace.c:347
17123#, c-format
17124msgid "new object is the same as the old one: '%s'"
17125msgstr "新对象和旧对象相同:'%s'"
17126
fd8cb379 17127#: builtin/replace.c:407
6acbf033
JX
17128#, c-format
17129msgid "bad mergetag in commit '%s'"
55a16ee4 17130msgstr "提交 '%s' 中含有损坏的合并标签"
6acbf033 17131
fd8cb379 17132#: builtin/replace.c:409
6acbf033
JX
17133#, c-format
17134msgid "malformed mergetag in commit '%s'"
fd8cb379 17135msgstr "提交 '%s' 中含有格式错误的合并标签"
6acbf033 17136
fd8cb379 17137#: builtin/replace.c:421
6acbf033
JX
17138#, c-format
17139msgid ""
17140"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
17141"instead of --graft"
55a16ee4 17142msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
6acbf033 17143
fd8cb379 17144#: builtin/replace.c:460
6acbf033 17145#, c-format
c1ac5258
JX
17146msgid "the original commit '%s' has a gpg signature"
17147msgstr "原始提交 '%s' 中有一个 gpg 签名"
6acbf033 17148
fd8cb379 17149#: builtin/replace.c:461
6acbf033
JX
17150msgid "the signature will be removed in the replacement commit!"
17151msgstr "在替换的提交中签名将被移除!"
17152
fd8cb379 17153#: builtin/replace.c:471
6acbf033
JX
17154#, c-format
17155msgid "could not write replacement commit for: '%s'"
17156msgstr "不能为 '%s' 写替换提交"
17157
c1ac5258
JX
17158#: builtin/replace.c:479
17159#, c-format
17160msgid "graft for '%s' unnecessary"
17161msgstr "对 '%s' 移植没有必要"
17162
17163#: builtin/replace.c:482
17164#, c-format
17165msgid "new commit is the same as the old one: '%s'"
17166msgstr "新提交和旧的一样:'%s'"
17167
4c27fcb5 17168#: builtin/replace.c:515
fd8cb379
JX
17169#, c-format
17170msgid ""
17171"could not convert the following graft(s):\n"
17172"%s"
17173msgstr ""
17174"不能转换下列移植:\n"
17175"%s"
17176
4c27fcb5 17177#: builtin/replace.c:536
ef317cd5 17178msgid "list replace refs"
07432cef 17179msgstr "列出替换的引用"
ef317cd5 17180
4c27fcb5 17181#: builtin/replace.c:537
ef317cd5 17182msgid "delete replace refs"
07432cef 17183msgstr "删除替换的引用"
ef317cd5 17184
4c27fcb5 17185#: builtin/replace.c:538
6acbf033
JX
17186msgid "edit existing object"
17187msgstr "编辑现存的对象"
17188
4c27fcb5 17189#: builtin/replace.c:539
6acbf033
JX
17190msgid "change a commit's parents"
17191msgstr "修改一个提交的父提交"
17192
4c27fcb5 17193#: builtin/replace.c:540
fd8cb379
JX
17194msgid "convert existing graft file"
17195msgstr "转换现存的移植文件"
17196
4c27fcb5 17197#: builtin/replace.c:541
ef317cd5 17198msgid "replace the ref if it exists"
07432cef 17199msgstr "如果存在则替换引用"
ef317cd5 17200
4c27fcb5 17201#: builtin/replace.c:543
6acbf033
JX
17202msgid "do not pretty-print contents for --edit"
17203msgstr "不要为 --edit 操作美观显示内容"
17204
4c27fcb5 17205#: builtin/replace.c:544
cfff71a9
JX
17206msgid "use this format"
17207msgstr "使用此格式"
17208
4c27fcb5 17209#: builtin/replace.c:557
c1ac5258 17210msgid "--format cannot be used when not listing"
e640d114 17211msgstr "不列出时不能使用 --format"
c1ac5258 17212
4c27fcb5 17213#: builtin/replace.c:565
c1ac5258
JX
17214msgid "-f only makes sense when writing a replacement"
17215msgstr "只有写一个替换时 -f 才有意义"
17216
4c27fcb5 17217#: builtin/replace.c:569
c1ac5258
JX
17218msgid "--raw only makes sense with --edit"
17219msgstr "--raw 只有和 --edit 共用才有意义"
17220
4c27fcb5 17221#: builtin/replace.c:575
c1ac5258
JX
17222msgid "-d needs at least one argument"
17223msgstr "-d 需要至少一个参数"
17224
4c27fcb5 17225#: builtin/replace.c:581
c1ac5258
JX
17226msgid "bad number of arguments"
17227msgstr "错误的参数个数"
17228
4c27fcb5 17229#: builtin/replace.c:587
c1ac5258 17230msgid "-e needs exactly one argument"
e640d114 17231msgstr "-e 需要且仅需要一个参数"
c1ac5258 17232
4c27fcb5 17233#: builtin/replace.c:593
c1ac5258
JX
17234msgid "-g needs at least one argument"
17235msgstr "-g 需要至少一个参数"
17236
4c27fcb5 17237#: builtin/replace.c:599
c1ac5258
JX
17238msgid "--convert-graft-file takes no argument"
17239msgstr "--convert-graft-file 不带参数"
17240
4c27fcb5 17241#: builtin/replace.c:605
c1ac5258
JX
17242msgid "only one pattern can be given with -l"
17243msgstr "只能为 -l 提供一个模式"
17244
a4f16749 17245#: builtin/rerere.c:13
814ff314
JX
17246msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
17247msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
ef317cd5 17248
4c27fcb5 17249#: builtin/rerere.c:60
ef317cd5 17250msgid "register clean resolutions in index"
07432cef 17251msgstr "在索引中注册干净的解决方案"
ef317cd5 17252
4c27fcb5
JX
17253#: builtin/rerere.c:79
17254msgid "'git rerere forget' without paths is deprecated"
17255msgstr "没有路径的 'git rerere forget' 已经过时"
17256
06991777 17257#: builtin/rerere.c:113
4c27fcb5
JX
17258#, c-format
17259msgid "unable to generate diff for '%s'"
17260msgstr "无法为 '%s' 生成差异"
17261
06991777 17262#: builtin/reset.c:32
ef317cd5
JX
17263msgid ""
17264"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 17265msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5 17266
06991777 17267#: builtin/reset.c:33
a0b6b246
JX
17268msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
17269msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
ef317cd5 17270
06991777 17271#: builtin/reset.c:34
07432cef
WS
17272msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
17273msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 17274
06991777 17275#: builtin/reset.c:40
c04f5ac3
JX
17276msgid "mixed"
17277msgstr "混杂"
17278
06991777 17279#: builtin/reset.c:40
c04f5ac3
JX
17280msgid "soft"
17281msgstr "软性"
17282
06991777 17283#: builtin/reset.c:40
c04f5ac3
JX
17284msgid "hard"
17285msgstr "硬性"
17286
06991777 17287#: builtin/reset.c:40
8ada9598
JX
17288msgid "merge"
17289msgstr "合并"
17290
06991777 17291#: builtin/reset.c:40
c04f5ac3
JX
17292msgid "keep"
17293msgstr "保持"
17294
06991777 17295#: builtin/reset.c:81
c04f5ac3
JX
17296msgid "You do not have a valid HEAD."
17297msgstr "您没有一个有效的 HEAD。"
17298
06991777 17299#: builtin/reset.c:83
c04f5ac3
JX
17300msgid "Failed to find tree of HEAD."
17301msgstr "无法找到 HEAD 指向的树。"
17302
06991777 17303#: builtin/reset.c:89
c04f5ac3
JX
17304#, c-format
17305msgid "Failed to find tree of %s."
17306msgstr "无法找到 %s 指向的树。"
17307
90e6ef53 17308# 译者:汉字之间无空格,故删除%s前后空格
06991777 17309#: builtin/reset.c:193
c04f5ac3
JX
17310#, c-format
17311msgid "Cannot do a %s reset in the middle of a merge."
17312msgstr "在合并过程中不能做%s重置操作。"
17313
06991777 17314#: builtin/reset.c:293
ef317cd5 17315msgid "be quiet, only report errors"
07432cef 17316msgstr "安静模式,只报告错误"
ef317cd5 17317
06991777 17318#: builtin/reset.c:295
ef317cd5 17319msgid "reset HEAD and index"
07432cef 17320msgstr "重置 HEAD 和索引"
ef317cd5 17321
06991777 17322#: builtin/reset.c:296
ef317cd5 17323msgid "reset only HEAD"
07432cef 17324msgstr "只重置 HEAD"
ef317cd5 17325
06991777 17326#: builtin/reset.c:298 builtin/reset.c:300
ef317cd5 17327msgid "reset HEAD, index and working tree"
07432cef 17328msgstr "重置 HEAD、索引和工作区"
ef317cd5 17329
06991777 17330#: builtin/reset.c:302
ef317cd5 17331msgid "reset HEAD but keep local changes"
07432cef 17332msgstr "重置 HEAD 但保存本地变更"
ef317cd5 17333
06991777 17334#: builtin/reset.c:308
6c94aba5
JX
17335msgid "record only the fact that removed paths will be added later"
17336msgstr "将删除的路径标记为稍后添加"
17337
06991777 17338#: builtin/reset.c:326
07432cef
WS
17339#, c-format
17340msgid "Failed to resolve '%s' as a valid revision."
17341msgstr "无法将 '%s' 解析为一个有效的版本。"
17342
06991777 17343#: builtin/reset.c:334
07432cef
WS
17344#, c-format
17345msgid "Failed to resolve '%s' as a valid tree."
17346msgstr "无法将 '%s' 解析为一个有效的树对象。"
17347
06991777 17348#: builtin/reset.c:343
c04f5ac3 17349msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 17350msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 17351
06991777 17352#: builtin/reset.c:352
c04f5ac3 17353msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
d9d56b23 17354msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
c04f5ac3 17355
90e6ef53 17356# 译者:汉字之间无空格,故删除%s前后空格
06991777 17357#: builtin/reset.c:354
c04f5ac3
JX
17358#, c-format
17359msgid "Cannot do %s reset with paths."
17360msgstr "不能带路径进行%s重置。"
17361
90e6ef53 17362# 译者:汉字之间无空格,故删除%s前后空格
06991777 17363#: builtin/reset.c:364
c04f5ac3
JX
17364#, c-format
17365msgid "%s reset is not allowed in a bare repository"
160fb2b2 17366msgstr "不能对纯仓库进行%s重置"
c04f5ac3 17367
06991777 17368#: builtin/reset.c:368
6c94aba5
JX
17369msgid "-N can only be used with --mixed"
17370msgstr "-N 只能和 --mixed 同时使用"
17371
06991777 17372#: builtin/reset.c:388
90314792 17373msgid "Unstaged changes after reset:"
160fb2b2 17374msgstr "重置后取消暂存的变更:"
90314792 17375
06991777 17376#: builtin/reset.c:391
4c27fcb5
JX
17377#, c-format
17378msgid ""
17379"\n"
17380"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
17381"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
17382"to make this the default.\n"
17383msgstr ""
17384"\n"
17385"重置后,枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n"
17386"将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n"
17387
06991777 17388#: builtin/reset.c:401
ef317cd5
JX
17389#, c-format
17390msgid "Could not reset index file to revision '%s'."
17391msgstr "不能重置索引文件至版本 '%s'。"
17392
06991777 17393#: builtin/reset.c:405
07432cef
WS
17394msgid "Could not write new index file."
17395msgstr "不能写入新的索引文件。"
17396
06991777 17397#: builtin/rev-list.c:406
31e5e17b
JX
17398msgid "cannot combine --exclude-promisor-objects and --missing"
17399msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
17400
06991777 17401#: builtin/rev-list.c:464
5809aa05
JX
17402msgid "object filtering requires --objects"
17403msgstr "对象过滤需要 --objects"
17404
06991777 17405#: builtin/rev-list.c:467
5809aa05
JX
17406#, c-format
17407msgid "invalid sparse value '%s'"
17408msgstr "无效的稀疏值 '%s'"
17409
06991777 17410#: builtin/rev-list.c:508
1b7f4a34
JX
17411msgid "rev-list does not support display of notes"
17412msgstr "rev-list 不支持显示注解"
17413
06991777 17414#: builtin/rev-list.c:511
5809aa05
JX
17415msgid "cannot combine --use-bitmap-index with object filtering"
17416msgstr "不能将 --use-bitmap-index 和对象过滤组合使用"
17417
06991777 17418#: builtin/rev-parse.c:408
814ff314
JX
17419msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
17420msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
ef317cd5 17421
06991777 17422#: builtin/rev-parse.c:413
ef317cd5 17423msgid "keep the `--` passed as an arg"
07432cef 17424msgstr "保持 `--` 作为一个参数传递"
ef317cd5 17425
06991777 17426#: builtin/rev-parse.c:415
ef317cd5 17427msgid "stop parsing after the first non-option argument"
07432cef 17428msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 17429
06991777 17430#: builtin/rev-parse.c:418
cfff71a9
JX
17431msgid "output in stuck long form"
17432msgstr "以固定长格式输出"
17433
06991777 17434#: builtin/rev-parse.c:551
ef317cd5 17435msgid ""
814ff314 17436"git rev-parse --parseopt [<options>] -- [<args>...]\n"
ef317cd5 17437" or: git rev-parse --sq-quote [<arg>...]\n"
814ff314 17438" or: git rev-parse [<options>] [<arg>...]\n"
ef317cd5
JX
17439"\n"
17440"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
17441msgstr ""
814ff314 17442"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
90314792 17443" 或者:git rev-parse --sq-quote [<参数>...]\n"
814ff314 17444" 或者:git rev-parse [<选项>] [<参数>...]\n"
07432cef
WS
17445"\n"
17446"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5 17447
c1ac5258 17448#: builtin/revert.c:24
814ff314
JX
17449msgid "git revert [<options>] <commit-ish>..."
17450msgstr "git revert [<选项>] <提交号>..."
ef317cd5 17451
c1ac5258 17452#: builtin/revert.c:25
ef317cd5 17453msgid "git revert <subcommand>"
07432cef 17454msgstr "git revert <子命令>"
ef317cd5 17455
c1ac5258 17456#: builtin/revert.c:30
814ff314
JX
17457msgid "git cherry-pick [<options>] <commit-ish>..."
17458msgstr "git cherry-pick [<选项>] <提交号>..."
ef317cd5 17459
c1ac5258 17460#: builtin/revert.c:31
ef317cd5 17461msgid "git cherry-pick <subcommand>"
07432cef 17462msgstr "git cherry-pick <子命令>"
ef317cd5 17463
06991777
JX
17464#: builtin/revert.c:72
17465#, c-format
17466msgid "option `%s' expects a number greater than zero"
17467msgstr "选项 `%s' 期望一个大于零的数字"
17468
17469#: builtin/revert.c:92
ef317cd5
JX
17470#, c-format
17471msgid "%s: %s cannot be used with %s"
17472msgstr "%s:%s 不能和 %s 同时使用"
17473
06991777 17474#: builtin/revert.c:101
ef317cd5 17475msgid "end revert or cherry-pick sequence"
07432cef 17476msgstr "终止反转或拣选操作"
ef317cd5 17477
06991777 17478#: builtin/revert.c:102
ef317cd5 17479msgid "resume revert or cherry-pick sequence"
07432cef 17480msgstr "继续反转或拣选操作"
ef317cd5 17481
06991777 17482#: builtin/revert.c:103
ef317cd5 17483msgid "cancel revert or cherry-pick sequence"
07432cef 17484msgstr "取消反转或拣选操作"
ef317cd5 17485
06991777 17486#: builtin/revert.c:104
ef317cd5 17487msgid "don't automatically commit"
07432cef 17488msgstr "不要自动提交"
ef317cd5 17489
06991777 17490#: builtin/revert.c:105
ef317cd5 17491msgid "edit the commit message"
07432cef 17492msgstr "编辑提交说明"
ef317cd5 17493
06991777 17494#: builtin/revert.c:108
87cb7997 17495msgid "parent-number"
07432cef 17496msgstr "父编号"
ef317cd5 17497
06991777 17498#: builtin/revert.c:109
87cb7997
JX
17499msgid "select mainline parent"
17500msgstr "选择主干父提交编号"
17501
06991777 17502#: builtin/revert.c:111
ef317cd5 17503msgid "merge strategy"
07432cef 17504msgstr "合并策略"
ef317cd5 17505
06991777 17506#: builtin/revert.c:113
ef317cd5 17507msgid "option for merge strategy"
07432cef 17508msgstr "合并策略的选项"
ef317cd5 17509
06991777 17510#: builtin/revert.c:122
ef317cd5 17511msgid "append commit name"
07432cef 17512msgstr "追加提交名称"
ef317cd5 17513
06991777 17514#: builtin/revert.c:124
ef317cd5 17515msgid "preserve initially empty commits"
07432cef 17516msgstr "保留初始化的空提交"
ef317cd5 17517
06991777 17518#: builtin/revert.c:126
ef317cd5 17519msgid "keep redundant, empty commits"
07432cef 17520msgstr "保持多余的、空的提交"
ef317cd5 17521
06991777 17522#: builtin/revert.c:220
c04f5ac3
JX
17523msgid "revert failed"
17524msgstr "还原失败"
17525
06991777 17526#: builtin/revert.c:233
c04f5ac3
JX
17527msgid "cherry-pick failed"
17528msgstr "拣选失败"
17529
06991777 17530#: builtin/rm.c:19
814ff314
JX
17531msgid "git rm [<options>] [--] <file>..."
17532msgstr "git rm [<选项>] [--] <文件>..."
07432cef 17533
06991777 17534#: builtin/rm.c:207
c04f5ac3 17535msgid ""
2e8451e8
JX
17536"the following file has staged content different from both the\n"
17537"file and the HEAD:"
17538msgid_plural ""
17539"the following files have staged content different from both the\n"
17540"file and the HEAD:"
17541msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
17542msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
17543
06991777 17544#: builtin/rm.c:212
2e8451e8
JX
17545msgid ""
17546"\n"
c04f5ac3
JX
17547"(use -f to force removal)"
17548msgstr ""
2e8451e8 17549"\n"
c04f5ac3
JX
17550"(使用 -f 强制删除)"
17551
06991777 17552#: builtin/rm.c:216
2e8451e8
JX
17553msgid "the following file has changes staged in the index:"
17554msgid_plural "the following files have changes staged in the index:"
160fb2b2
JX
17555msgstr[0] "下列文件索引中有变更"
17556msgstr[1] "下列文件索引中有变更"
c04f5ac3 17557
06991777 17558#: builtin/rm.c:220 builtin/rm.c:229
c04f5ac3 17559msgid ""
2e8451e8 17560"\n"
c04f5ac3
JX
17561"(use --cached to keep the file, or -f to force removal)"
17562msgstr ""
2e8451e8
JX
17563"\n"
17564"(使用 --cached 保留本地文件,或用 -f 强制删除)"
17565
06991777 17566#: builtin/rm.c:226
2e8451e8
JX
17567msgid "the following file has local modifications:"
17568msgid_plural "the following files have local modifications:"
17569msgstr[0] "如下文件有本地修改:"
17570msgstr[1] "如下文件有本地修改:"
c04f5ac3 17571
06991777 17572#: builtin/rm.c:242
ef317cd5 17573msgid "do not list removed files"
07432cef 17574msgstr "不列出删除的文件"
ef317cd5 17575
06991777 17576#: builtin/rm.c:243
ef317cd5 17577msgid "only remove from the index"
07432cef 17578msgstr "只从索引区删除"
ef317cd5 17579
06991777 17580#: builtin/rm.c:244
ef317cd5 17581msgid "override the up-to-date check"
07432cef 17582msgstr "忽略文件更新状态检查"
ef317cd5 17583
06991777 17584#: builtin/rm.c:245
ef317cd5 17585msgid "allow recursive removal"
07432cef 17586msgstr "允许递归删除"
ef317cd5 17587
06991777 17588#: builtin/rm.c:247
ef317cd5 17589msgid "exit with a zero status even if nothing matched"
07432cef 17590msgstr "即使没有匹配,也以零状态退出"
ef317cd5 17591
06991777 17592#: builtin/rm.c:289
c1ac5258
JX
17593msgid "please stage your changes to .gitmodules or stash them to proceed"
17594msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
17595
06991777 17596#: builtin/rm.c:307
c04f5ac3
JX
17597#, c-format
17598msgid "not removing '%s' recursively without -r"
17599msgstr "未提供 -r 选项不会递归删除 '%s'"
17600
06991777 17601#: builtin/rm.c:346
c04f5ac3
JX
17602#, c-format
17603msgid "git rm: unable to remove %s"
17604msgstr "git rm:不能删除 %s"
17605
fd8cb379 17606#: builtin/send-pack.c:20
1b7f4a34
JX
17607msgid ""
17608"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
17609"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
17610"[<ref>...]\n"
17611" --all and explicit <ref> specification are mutually exclusive."
17612msgstr ""
17613"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
17614"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
17615" --all 和明确的 <引用> 互斥。"
17616
fd8cb379 17617#: builtin/send-pack.c:163
1b7f4a34
JX
17618msgid "remote name"
17619msgstr "远程名称"
17620
fd8cb379 17621#: builtin/send-pack.c:177
1b7f4a34
JX
17622msgid "use stateless RPC protocol"
17623msgstr "使用无状态的 RPC 协议"
17624
fd8cb379 17625#: builtin/send-pack.c:178
1b7f4a34
JX
17626msgid "read refs from stdin"
17627msgstr "从标准输入读取引用"
17628
fd8cb379 17629#: builtin/send-pack.c:179
1b7f4a34
JX
17630msgid "print status from remote helper"
17631msgstr "打印来自远程 helper 的状态"
17632
fd8cb379
JX
17633#: builtin/serve.c:7
17634msgid "git serve [<options>]"
17635msgstr "git serve [<选项>]"
17636
17637#: builtin/serve.c:17 builtin/upload-pack.c:23
17638msgid "quit after a single request/response exchange"
17639msgstr "在一次单独的请求/响应之后退出"
17640
17641#: builtin/serve.c:19
17642msgid "exit immediately after advertising capabilities"
e640d114 17643msgstr "对能力广告之后立即退出"
fd8cb379 17644
a4f16749 17645#: builtin/shortlog.c:14
fd8cb379
JX
17646msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
17647msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
17648
17649#: builtin/shortlog.c:15
17650msgid "git log --pretty=short | git shortlog [<options>]"
17651msgstr "git log --pretty=short | git shortlog [<选项>]"
ef317cd5 17652
fd8cb379 17653#: builtin/shortlog.c:264
1a79b2f1
JX
17654msgid "Group by committer rather than author"
17655msgstr "按照提交者分组而不是作者"
17656
fd8cb379 17657#: builtin/shortlog.c:266
ef317cd5 17658msgid "sort output according to the number of commits per author"
07432cef 17659msgstr "根据每个作者的提交数量排序"
ef317cd5 17660
fd8cb379 17661#: builtin/shortlog.c:268
ef317cd5 17662msgid "Suppress commit descriptions, only provides commit count"
07432cef 17663msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 17664
fd8cb379 17665#: builtin/shortlog.c:270
ef317cd5 17666msgid "Show the email address of each author"
07432cef 17667msgstr "显示每个作者的电子邮件地址"
ef317cd5 17668
fd8cb379 17669#: builtin/shortlog.c:271
c1ac5258
JX
17670msgid "<w>[,<i1>[,<i2>]]"
17671msgstr "<w>[,<i1>[,<i2>]]"
ef317cd5 17672
fd8cb379 17673#: builtin/shortlog.c:272
ef317cd5 17674msgid "Linewrap output"
07432cef 17675msgstr "折行输出"
ef317cd5 17676
06991777 17677#: builtin/shortlog.c:301
fd8cb379
JX
17678msgid "too many arguments given outside repository"
17679msgstr "仓库外执行提供了太多的参数"
17680
c1ac5258 17681#: builtin/show-branch.c:13
ef317cd5 17682msgid ""
814ff314 17683"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
17684"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
17685"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
17686"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
ef317cd5 17687msgstr ""
814ff314 17688"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
17689"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
17690"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
17691"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
ef317cd5 17692
c1ac5258 17693#: builtin/show-branch.c:17
814ff314 17694msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
58b6f078 17695msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
ef317cd5 17696
c1ac5258 17697#: builtin/show-branch.c:395
a0b6b246
JX
17698#, c-format
17699msgid "ignoring %s; cannot handle more than %d ref"
17700msgid_plural "ignoring %s; cannot handle more than %d refs"
17701msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
17702msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
17703
c1ac5258 17704#: builtin/show-branch.c:549
a0b6b246
JX
17705#, c-format
17706msgid "no matching refs with %s"
17707msgstr "没有和 %s 匹配的引用"
17708
4c27fcb5 17709#: builtin/show-branch.c:646
ef317cd5 17710msgid "show remote-tracking and local branches"
07432cef 17711msgstr "显示远程跟踪的和本地的分支"
ef317cd5 17712
4c27fcb5 17713#: builtin/show-branch.c:648
ef317cd5 17714msgid "show remote-tracking branches"
07432cef 17715msgstr "显示远程跟踪的分支"
ef317cd5 17716
4c27fcb5 17717#: builtin/show-branch.c:650
ef317cd5 17718msgid "color '*!+-' corresponding to the branch"
07432cef 17719msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 17720
4c27fcb5 17721#: builtin/show-branch.c:652
ef317cd5 17722msgid "show <n> more commits after the common ancestor"
07432cef 17723msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 17724
4c27fcb5 17725#: builtin/show-branch.c:654
ef317cd5 17726msgid "synonym to more=-1"
07432cef 17727msgstr "和 more=-1 同义"
ef317cd5 17728
4c27fcb5 17729#: builtin/show-branch.c:655
ef317cd5 17730msgid "suppress naming strings"
07432cef 17731msgstr "不显示字符串命名"
ef317cd5 17732
4c27fcb5 17733#: builtin/show-branch.c:657
ef317cd5 17734msgid "include the current branch"
07432cef 17735msgstr "包括当前分支"
ef317cd5 17736
4c27fcb5 17737#: builtin/show-branch.c:659
ef317cd5 17738msgid "name commits with their object names"
07432cef 17739msgstr "以对象名字命名提交"
ef317cd5 17740
4c27fcb5 17741#: builtin/show-branch.c:661
ef317cd5 17742msgid "show possible merge bases"
07432cef 17743msgstr "显示可能合并的基线"
ef317cd5 17744
4c27fcb5 17745#: builtin/show-branch.c:663
ef317cd5 17746msgid "show refs unreachable from any other ref"
07432cef 17747msgstr "显示没有任何引用的的引用"
ef317cd5 17748
4c27fcb5 17749#: builtin/show-branch.c:665
ef317cd5 17750msgid "show commits in topological order"
07432cef 17751msgstr "以拓扑顺序显示提交"
ef317cd5 17752
4c27fcb5 17753#: builtin/show-branch.c:668
ef317cd5 17754msgid "show only commits not on the first branch"
07432cef 17755msgstr "只显示不在第一个分支上的提交"
ef317cd5 17756
4c27fcb5 17757#: builtin/show-branch.c:670
ef317cd5 17758msgid "show merges reachable from only one tip"
07432cef 17759msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 17760
4c27fcb5 17761#: builtin/show-branch.c:672
2e8451e8
JX
17762msgid "topologically sort, maintaining date order where possible"
17763msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 17764
4c27fcb5 17765#: builtin/show-branch.c:675
ef317cd5 17766msgid "<n>[,<base>]"
07432cef 17767msgstr "<n>[,<base>]"
ef317cd5 17768
4c27fcb5 17769#: builtin/show-branch.c:676
ef317cd5 17770msgid "show <n> most recent ref-log entries starting at base"
58b6f078 17771msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
ef317cd5 17772
4c27fcb5 17773#: builtin/show-branch.c:712
a0b6b246
JX
17774msgid ""
17775"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
17776msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
17777
4c27fcb5 17778#: builtin/show-branch.c:736
a0b6b246
JX
17779msgid "no branches given, and HEAD is not valid"
17780msgstr "未提供分支,且 HEAD 无效"
17781
4c27fcb5 17782#: builtin/show-branch.c:739
a0b6b246
JX
17783msgid "--reflog option needs one branch name"
17784msgstr "选项 --reflog 需要一个分支名"
17785
4c27fcb5 17786#: builtin/show-branch.c:742
a0b6b246
JX
17787#, c-format
17788msgid "only %d entry can be shown at one time."
17789msgid_plural "only %d entries can be shown at one time."
17790msgstr[0] "一次只能显示 %d 个条目。"
17791msgstr[1] "一次只能显示 %d 个条目。"
17792
4c27fcb5 17793#: builtin/show-branch.c:746
a0b6b246
JX
17794#, c-format
17795msgid "no such ref %s"
17796msgstr "无此引用 %s"
17797
4c27fcb5 17798#: builtin/show-branch.c:830
a0b6b246
JX
17799#, c-format
17800msgid "cannot handle more than %d rev."
17801msgid_plural "cannot handle more than %d revs."
17802msgstr[0] "不能处理 %d 个以上的版本。"
17803msgstr[1] "不能处理 %d 个以上的版本。"
17804
4c27fcb5 17805#: builtin/show-branch.c:834
a0b6b246
JX
17806#, c-format
17807msgid "'%s' is not a valid ref."
17808msgstr "'%s' 不是一个有效的引用。"
17809
4c27fcb5 17810#: builtin/show-branch.c:837
a0b6b246
JX
17811#, c-format
17812msgid "cannot find commit %s (%s)"
29004bbb 17813msgstr "不能找到提交 %s(%s)"
a0b6b246 17814
c1ac5258 17815#: builtin/show-ref.c:11
ef317cd5 17816msgid ""
814ff314
JX
17817"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
17818"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
ef317cd5 17819msgstr ""
814ff314
JX
17820"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
17821"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
ef317cd5 17822
c1ac5258 17823#: builtin/show-ref.c:12
94550ed3
JX
17824msgid "git show-ref --exclude-existing[=<pattern>]"
17825msgstr "git show-ref --exclude-existing[=<模式>]"
ef317cd5 17826
4c27fcb5 17827#: builtin/show-ref.c:161
ef317cd5 17828msgid "only show tags (can be combined with heads)"
55a16ee4 17829msgstr "只显示标签(可以和头共用)"
ef317cd5 17830
4c27fcb5 17831#: builtin/show-ref.c:162
ef317cd5 17832msgid "only show heads (can be combined with tags)"
55a16ee4 17833msgstr "只显示头(可以和标签共用)"
ef317cd5 17834
4c27fcb5 17835#: builtin/show-ref.c:163
ef317cd5 17836msgid "stricter reference checking, requires exact ref path"
07432cef 17837msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 17838
4c27fcb5 17839#: builtin/show-ref.c:166 builtin/show-ref.c:168
2e8451e8
JX
17840msgid "show the HEAD reference, even if it would be filtered out"
17841msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 17842
4c27fcb5 17843#: builtin/show-ref.c:170
ef317cd5 17844msgid "dereference tags into object IDs"
4375c10e 17845msgstr "转换标签到对象 ID"
ef317cd5 17846
4c27fcb5 17847#: builtin/show-ref.c:172
ef317cd5 17848msgid "only show SHA1 hash using <n> digits"
07432cef 17849msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
ef317cd5 17850
4c27fcb5 17851#: builtin/show-ref.c:176
ef317cd5 17852msgid "do not print results to stdout (useful with --verify)"
07432cef 17853msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
ef317cd5 17854
4c27fcb5 17855#: builtin/show-ref.c:178
ef317cd5 17856msgid "show refs from stdin that aren't in local repository"
160fb2b2 17857msgstr "显示从标准输入中读入的不在本地仓库中的引用"
ef317cd5 17858
a4f16749 17859#: builtin/stripspace.c:18
94550ed3
JX
17860msgid "git stripspace [-s | --strip-comments]"
17861msgstr "git stripspace [-s | --strip-comments]"
17862
a4f16749 17863#: builtin/stripspace.c:19
94550ed3
JX
17864msgid "git stripspace [-c | --comment-lines]"
17865msgstr "git stripspace [-c | --comment-lines]"
17866
06991777 17867#: builtin/stripspace.c:37
94550ed3
JX
17868msgid "skip and remove all lines starting with comment character"
17869msgstr "跳过和移除所有的注释行"
17870
06991777 17871#: builtin/stripspace.c:40
276ceeaa 17872msgid "prepend comment character and space to each line"
94550ed3
JX
17873msgstr "为每一行的行首添加注释符和空格"
17874
06991777 17875#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
5b04ee3b
JX
17876#, c-format
17877msgid "Expecting a full ref name, got %s"
17878msgstr "期望一个完整的引用名称,却得到 %s"
17879
06991777 17880#: builtin/submodule--helper.c:62
31e5e17b
JX
17881msgid "submodule--helper print-default-remote takes no arguments"
17882msgstr "submodule--helper print-default-remote 不带参数"
17883
06991777 17884#: builtin/submodule--helper.c:100
5b04ee3b
JX
17885#, c-format
17886msgid "cannot strip one component off url '%s'"
17887msgstr "无法从 url '%s' 剥离一个组件"
17888
06991777 17889#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
94550ed3
JX
17890msgid "alternative anchor for relative paths"
17891msgstr "相对路径的替代锚记(anchor)"
17892
06991777 17893#: builtin/submodule--helper.c:413
94550ed3
JX
17894msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
17895msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
17896
06991777
JX
17897#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
17898#: builtin/submodule--helper.c:650
5b04ee3b
JX
17899#, c-format
17900msgid "No url found for submodule path '%s' in .gitmodules"
17901msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
17902
06991777 17903#: builtin/submodule--helper.c:522
c1ac5258
JX
17904#, c-format
17905msgid "Entering '%s'\n"
17906msgstr "进入 '%s'\n"
17907
06991777 17908#: builtin/submodule--helper.c:525
c1ac5258
JX
17909#, c-format
17910msgid ""
17911"run_command returned non-zero status for %s\n"
17912"."
4c27fcb5
JX
17913msgstr ""
17914"对 %s 执行 run_command 返回非零值。\n"
17915"."
c1ac5258 17916
06991777 17917#: builtin/submodule--helper.c:546
c1ac5258
JX
17918#, c-format
17919msgid ""
17920"run_command returned non-zero status while recursing in the nested "
17921"submodules of %s\n"
17922"."
4c27fcb5
JX
17923msgstr ""
17924"在递归 %s 的子模组执行 run_command 时返回非零值。\n"
17925"."
c1ac5258 17926
06991777 17927#: builtin/submodule--helper.c:562
c1ac5258
JX
17928msgid "Suppress output of entering each submodule command"
17929msgstr "阻止进入每一个子模组命令的输出"
17930
06991777 17931#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
c1ac5258
JX
17932msgid "Recurse into nested submodules"
17933msgstr "递归进入嵌套子模组中"
17934
06991777 17935#: builtin/submodule--helper.c:569
c1ac5258
JX
17936msgid "git submodule--helper foreach [--quiet] [--recursive] <command>"
17937msgstr "git submodule--helper foreach [--quiet] [--recursive] <命令>"
17938
06991777 17939#: builtin/submodule--helper.c:596
87cb7997
JX
17940#, c-format
17941msgid ""
4c27fcb5 17942"could not look up configuration '%s'. Assuming this repository is its own "
87cb7997
JX
17943"authoritative upstream."
17944msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
17945
06991777 17946#: builtin/submodule--helper.c:664
5b04ee3b
JX
17947#, c-format
17948msgid "Failed to register url for submodule path '%s'"
17949msgstr "无法为子模组 '%s' 注册 url"
17950
06991777 17951#: builtin/submodule--helper.c:668
5b04ee3b
JX
17952#, c-format
17953msgid "Submodule '%s' (%s) registered for path '%s'\n"
25c75902 17954msgstr "子模组 '%s'(%s)已对路径 '%s' 注册\n"
5b04ee3b
JX
17955
17956#
06991777 17957#: builtin/submodule--helper.c:678
aef18cc6 17958#, c-format
5b04ee3b 17959msgid "warning: command update mode suggested for submodule '%s'\n"
aef18cc6 17960msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
5b04ee3b 17961
06991777 17962#: builtin/submodule--helper.c:685
5b04ee3b
JX
17963#, c-format
17964msgid "Failed to register update mode for submodule path '%s'"
17965msgstr "无法为子模组 '%s' 注册更新模式"
17966
06991777 17967#: builtin/submodule--helper.c:707
5b04ee3b 17968msgid "Suppress output for initializing a submodule"
31e5e17b 17969msgstr "阻止子模组初始化的输出"
5b04ee3b 17970
06991777 17971#: builtin/submodule--helper.c:712
5b04ee3b
JX
17972msgid "git submodule--helper init [<path>]"
17973msgstr "git submodule--helper init [<路径>]"
17974
06991777 17975#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
94550ed3
JX
17976#, c-format
17977msgid "no submodule mapping found in .gitmodules for path '%s'"
17978msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
17979
06991777 17980#: builtin/submodule--helper.c:823
5809aa05
JX
17981#, c-format
17982msgid "could not resolve HEAD ref inside the submodule '%s'"
17983msgstr "无法解析子模组 '%s' 的 HEAD 引用"
17984
06991777 17985#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
5809aa05
JX
17986#, c-format
17987msgid "failed to recurse into submodule '%s'"
c1ac5258 17988msgstr "递归子模组 '%s' 失败"
5809aa05 17989
06991777 17990#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
5809aa05 17991msgid "Suppress submodule status output"
31e5e17b 17992msgstr "阻止子模组状态输出"
5809aa05 17993
06991777 17994#: builtin/submodule--helper.c:875
5809aa05
JX
17995msgid ""
17996"Use commit stored in the index instead of the one stored in the submodule "
17997"HEAD"
17998msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交"
17999
06991777 18000#: builtin/submodule--helper.c:876
5809aa05 18001msgid "recurse into nested submodules"
31e5e17b 18002msgstr "递归进入嵌套子模组中"
5809aa05 18003
06991777 18004#: builtin/submodule--helper.c:881
5809aa05
JX
18005msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
18006msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
18007
06991777 18008#: builtin/submodule--helper.c:905
5809aa05
JX
18009msgid "git submodule--helper name <path>"
18010msgstr "git submodule--helper name <路径>"
18011
06991777 18012#: builtin/submodule--helper.c:969
31e5e17b
JX
18013#, c-format
18014msgid "Synchronizing submodule url for '%s'\n"
18015msgstr "为 '%s' 同步子模组 url\n"
18016
06991777 18017#: builtin/submodule--helper.c:975
31e5e17b
JX
18018#, c-format
18019msgid "failed to register url for submodule path '%s'"
18020msgstr "无法为子模组路径 '%s' 注册 url"
18021
06991777 18022#: builtin/submodule--helper.c:989
31e5e17b
JX
18023#, c-format
18024msgid "failed to get the default remote for submodule '%s'"
18025msgstr "无法得到子模组 '%s' 的默认远程关联"
18026
06991777 18027#: builtin/submodule--helper.c:1000
31e5e17b
JX
18028#, c-format
18029msgid "failed to update remote for submodule '%s'"
18030msgstr "无法为子模组 '%s' 更新远程关联"
18031
06991777 18032#: builtin/submodule--helper.c:1047
31e5e17b
JX
18033msgid "Suppress output of synchronizing submodule url"
18034msgstr "阻止子模组 url 同步的输出"
18035
06991777 18036#: builtin/submodule--helper.c:1054
31e5e17b
JX
18037msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
18038msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
18039
06991777 18040#: builtin/submodule--helper.c:1108
31e5e17b
JX
18041#, c-format
18042msgid ""
18043"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
18044"really want to remove it including all of its history)"
18045msgstr ""
fd8cb379
JX
18046"子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm "
18047"-rf' 命令)"
31e5e17b 18048
06991777 18049#: builtin/submodule--helper.c:1120
31e5e17b
JX
18050#, c-format
18051msgid ""
18052"Submodule work tree '%s' contains local modifications; use '-f' to discard "
18053"them"
18054msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们"
18055
06991777 18056#: builtin/submodule--helper.c:1128
31e5e17b
JX
18057#, c-format
18058msgid "Cleared directory '%s'\n"
18059msgstr "已清除目录 '%s'\n"
18060
06991777 18061#: builtin/submodule--helper.c:1130
31e5e17b
JX
18062#, c-format
18063msgid "Could not remove submodule work tree '%s'\n"
18064msgstr "无法移除子模组工作区 '%s'\n"
18065
06991777 18066#: builtin/submodule--helper.c:1141
31e5e17b
JX
18067#, c-format
18068msgid "could not create empty submodule directory %s"
18069msgstr "不能创建空的子模组目录 %s"
18070
06991777 18071#: builtin/submodule--helper.c:1157
31e5e17b
JX
18072#, c-format
18073msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
18074msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
18075
06991777 18076#: builtin/submodule--helper.c:1186
31e5e17b
JX
18077msgid "Remove submodule working trees even if they contain local changes"
18078msgstr "删除子模组工作区,即使包含本地修改"
18079
06991777 18080#: builtin/submodule--helper.c:1187
31e5e17b
JX
18081msgid "Unregister all submodules"
18082msgstr "将所有子模组取消注册"
18083
06991777 18084#: builtin/submodule--helper.c:1192
31e5e17b
JX
18085msgid ""
18086"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
18087msgstr ""
18088"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
18089
06991777 18090#: builtin/submodule--helper.c:1206
31e5e17b
JX
18091msgid "Use '--all' if you really want to deinitialize all submodules"
18092msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
18093
06991777 18094#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
a0b6b246
JX
18095#, c-format
18096msgid "submodule '%s' cannot add alternate: %s"
18097msgstr "子模组 '%s' 不能添加仓库备选:%s"
18098
06991777 18099#: builtin/submodule--helper.c:1340
a0b6b246
JX
18100#, c-format
18101msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
18102msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
18103
06991777 18104#: builtin/submodule--helper.c:1347
a0b6b246
JX
18105#, c-format
18106msgid "Value '%s' for submodule.alternateLocation is not recognized"
18107msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
18108
06991777 18109#: builtin/submodule--helper.c:1370
94550ed3
JX
18110msgid "where the new submodule will be cloned to"
18111msgstr "新的子模组将要克隆的路径"
18112
06991777 18113#: builtin/submodule--helper.c:1373
94550ed3
JX
18114msgid "name of the new submodule"
18115msgstr "新子模组的名称"
18116
06991777 18117#: builtin/submodule--helper.c:1376
94550ed3
JX
18118msgid "url where to clone the submodule from"
18119msgstr "克隆子模组的 url 地址"
18120
06991777 18121#: builtin/submodule--helper.c:1384
94550ed3
JX
18122msgid "depth for shallow clones"
18123msgstr "浅克隆的深度"
18124
06991777 18125#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1872
a0b6b246 18126msgid "force cloning progress"
29004bbb 18127msgstr "强制显示克隆进度"
a0b6b246 18128
06991777 18129#: builtin/submodule--helper.c:1392
94550ed3
JX
18130msgid ""
18131"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
5b04ee3b 18132"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
5c57d762
JX
18133msgstr ""
18134"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
18135"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
94550ed3 18136
06991777 18137#: builtin/submodule--helper.c:1423
94550ed3
JX
18138#, c-format
18139msgid "clone of '%s' into submodule path '%s' failed"
18140msgstr "无法克隆 '%s' 到子模组路径 '%s'"
18141
06991777 18142#: builtin/submodule--helper.c:1437
94550ed3
JX
18143#, c-format
18144msgid "could not get submodule directory for '%s'"
18145msgstr "无法得到 '%s' 的子模组目录"
18146
06991777 18147#: builtin/submodule--helper.c:1473
4c27fcb5
JX
18148#, c-format
18149msgid "Invalid update mode '%s' for submodule path '%s'"
18150msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效"
18151
06991777 18152#: builtin/submodule--helper.c:1477
4c27fcb5
JX
18153#, c-format
18154msgid "Invalid update mode '%s' configured for submodule path '%s'"
18155msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效"
18156
06991777 18157#: builtin/submodule--helper.c:1570
5b04ee3b
JX
18158#, c-format
18159msgid "Submodule path '%s' not initialized"
18160msgstr "子模组 '%s' 尚未初始化"
18161
06991777 18162#: builtin/submodule--helper.c:1574
5b04ee3b
JX
18163msgid "Maybe you want to use 'update --init'?"
18164msgstr "也许您想要执行 'update --init'?"
18165
06991777 18166#: builtin/submodule--helper.c:1604
5b04ee3b
JX
18167#, c-format
18168msgid "Skipping unmerged submodule %s"
18169msgstr "略过未合并的子模组 %s"
18170
06991777 18171#: builtin/submodule--helper.c:1633
5b04ee3b
JX
18172#, c-format
18173msgid "Skipping submodule '%s'"
18174msgstr "略过子模组 '%s'"
18175
06991777 18176#: builtin/submodule--helper.c:1777
5c57d762
JX
18177#, c-format
18178msgid "Failed to clone '%s'. Retry scheduled"
18179msgstr "克隆 '%s' 失败。按计划重试"
18180
06991777 18181#: builtin/submodule--helper.c:1788
5c57d762
JX
18182#, c-format
18183msgid "Failed to clone '%s' a second time, aborting"
18184msgstr "第二次尝试克隆 '%s' 失败,退出"
18185
06991777 18186#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
5b04ee3b
JX
18187msgid "path into the working tree"
18188msgstr "到工作区的路径"
18189
06991777 18190#: builtin/submodule--helper.c:1854
5b04ee3b
JX
18191msgid "path into the working tree, across nested submodule boundaries"
18192msgstr "工作区中的路径,递归嵌套子模组"
18193
06991777 18194#: builtin/submodule--helper.c:1858
5b04ee3b
JX
18195msgid "rebase, merge, checkout or none"
18196msgstr "rebase、merge、checkout 或 none"
18197
06991777 18198#: builtin/submodule--helper.c:1864
5b04ee3b
JX
18199msgid "Create a shallow clone truncated to the specified number of revisions"
18200msgstr "创建一个指定深度的浅克隆"
18201
06991777 18202#: builtin/submodule--helper.c:1867
5b04ee3b
JX
18203msgid "parallel jobs"
18204msgstr "并发任务"
18205
06991777 18206#: builtin/submodule--helper.c:1869
5c57d762 18207msgid "whether the initial clone should follow the shallow recommendation"
9a4b694c 18208msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
5c57d762 18209
06991777 18210#: builtin/submodule--helper.c:1870
5b04ee3b
JX
18211msgid "don't print cloning progress"
18212msgstr "不要输出克隆进度"
94550ed3 18213
06991777 18214#: builtin/submodule--helper.c:1877
5b04ee3b
JX
18215msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
18216msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
18217
06991777 18218#: builtin/submodule--helper.c:1890
5b04ee3b
JX
18219msgid "bad value for update parameter"
18220msgstr "update 参数取值错误"
18221
06991777 18222#: builtin/submodule--helper.c:1938
5c57d762
JX
18223#, c-format
18224msgid ""
18225"Submodule (%s) branch configured to inherit branch from superproject, but "
18226"the superproject is not on any branch"
18227msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
18228
06991777 18229#: builtin/submodule--helper.c:2061
4c27fcb5
JX
18230#, c-format
18231msgid "could not get a repository handle for submodule '%s'"
18232msgstr "无法获得子模组 '%s' 的仓库句柄"
18233
06991777 18234#: builtin/submodule--helper.c:2094
1a79b2f1
JX
18235msgid "recurse into submodules"
18236msgstr "在子模组中递归"
18237
06991777 18238#: builtin/submodule--helper.c:2100
1a79b2f1
JX
18239msgid "git submodule--helper embed-git-dir [<path>...]"
18240msgstr "git submodule--helper embed-git-dir [<路径>...]"
18241
06991777 18242#: builtin/submodule--helper.c:2156
4c27fcb5
JX
18243msgid "check if it is safe to write to the .gitmodules file"
18244msgstr "检查写入 .gitmodules 文件是否安全"
18245
06991777 18246#: builtin/submodule--helper.c:2161
4c27fcb5
JX
18247msgid "git submodule--helper config name [value]"
18248msgstr "git submodule--helper config name [value]"
18249
06991777 18250#: builtin/submodule--helper.c:2162
4c27fcb5
JX
18251msgid "git submodule--helper config --check-writeable"
18252msgstr "git submodule--helper config --check-writeable"
18253
06991777 18254#: builtin/submodule--helper.c:2179 git-submodule.sh:169
4c27fcb5
JX
18255#, sh-format
18256msgid "please make sure that the .gitmodules file is in the working tree"
18257msgstr "请确认 .gitmodules 文件在工作区里"
18258
06991777 18259#: builtin/submodule--helper.c:2229 git.c:413 git.c:658
1a79b2f1
JX
18260#, c-format
18261msgid "%s doesn't support --super-prefix"
18262msgstr "%s 不支持 --super-prefix"
18263
06991777 18264#: builtin/submodule--helper.c:2235
94550ed3 18265#, c-format
5b04ee3b
JX
18266msgid "'%s' is not a valid submodule--helper subcommand"
18267msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
94550ed3 18268
a4f16749 18269#: builtin/symbolic-ref.c:8
814ff314
JX
18270msgid "git symbolic-ref [<options>] <name> [<ref>]"
18271msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
07432cef 18272
a4f16749 18273#: builtin/symbolic-ref.c:9
814ff314
JX
18274msgid "git symbolic-ref -d [-q] <name>"
18275msgstr "git symbolic-ref -d [-q] <名称>"
ef317cd5 18276
6937cb4e 18277#: builtin/symbolic-ref.c:40
ef317cd5 18278msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
18279msgstr "不显示非符号(分离的)引用的错误信息"
18280
6937cb4e 18281#: builtin/symbolic-ref.c:41
07432cef
WS
18282msgid "delete symbolic ref"
18283msgstr "删除符号引用"
ef317cd5 18284
6937cb4e 18285#: builtin/symbolic-ref.c:42
ef317cd5 18286msgid "shorten ref output"
6937cb4e 18287msgstr "缩短引用输出"
ef317cd5 18288
c1ac5258 18289#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
ef317cd5 18290msgid "reason"
07432cef 18291msgstr "原因"
ef317cd5 18292
c1ac5258 18293#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
ef317cd5 18294msgid "reason of the update"
07432cef 18295msgstr "更新的原因"
ef317cd5 18296
c1ac5258 18297#: builtin/tag.c:25
ef317cd5 18298msgid ""
814ff314
JX
18299"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
18300"[<head>]"
18301msgstr ""
18302"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
ef317cd5 18303
c1ac5258 18304#: builtin/tag.c:26
ef317cd5 18305msgid "git tag -d <tagname>..."
07432cef 18306msgstr "git tag -d <标签名>..."
ef317cd5 18307
c1ac5258 18308#: builtin/tag.c:27
ef317cd5 18309msgid ""
87cb7997
JX
18310"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
18311"points-at <object>]\n"
94550ed3 18312"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
ef317cd5 18313msgstr ""
87cb7997
JX
18314"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
18315"at <对象>]\n"
94550ed3 18316"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
ef317cd5 18317
c1ac5258 18318#: builtin/tag.c:29
1a79b2f1
JX
18319msgid "git tag -v [--format=<format>] <tagname>..."
18320msgstr "git tag -v [--format=<格式>] <标签名>..."
ef317cd5 18321
c1ac5258 18322#: builtin/tag.c:87
c04f5ac3
JX
18323#, c-format
18324msgid "tag '%s' not found."
55a16ee4 18325msgstr "未发现标签 '%s'。"
c04f5ac3 18326
c1ac5258 18327#: builtin/tag.c:103
c04f5ac3
JX
18328#, c-format
18329msgid "Deleted tag '%s' (was %s)\n"
55a16ee4 18330msgstr "已删除标签 '%s'(曾为 %s)\n"
c04f5ac3 18331
c1ac5258 18332#: builtin/tag.c:133
a77c07d9 18333#, c-format
c04f5ac3
JX
18334msgid ""
18335"\n"
6acbf033
JX
18336"Write a message for tag:\n"
18337" %s\n"
a77c07d9 18338"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
18339msgstr ""
18340"\n"
55a16ee4 18341"输入一个标签说明:\n"
6acbf033 18342" %s\n"
a77c07d9 18343"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 18344
c1ac5258 18345#: builtin/tag.c:137
a77c07d9 18346#, c-format
c04f5ac3
JX
18347msgid ""
18348"\n"
6acbf033
JX
18349"Write a message for tag:\n"
18350" %s\n"
a77c07d9 18351"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 18352"want to.\n"
c04f5ac3
JX
18353msgstr ""
18354"\n"
55a16ee4 18355"输入一个标签说明:\n"
6acbf033 18356" %s\n"
a77c07d9 18357"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 18358
c1ac5258 18359#: builtin/tag.c:191
c04f5ac3 18360msgid "unable to sign the tag"
55a16ee4 18361msgstr "无法签署标签"
c04f5ac3 18362
c1ac5258 18363#: builtin/tag.c:193
c04f5ac3 18364msgid "unable to write tag file"
55a16ee4 18365msgstr "无法写标签文件"
c04f5ac3 18366
c1ac5258 18367#: builtin/tag.c:218
c04f5ac3 18368msgid "bad object type."
90e6ef53 18369msgstr "坏的对象类型。"
c04f5ac3 18370
c1ac5258 18371#: builtin/tag.c:267
c04f5ac3 18372msgid "no tag message?"
55a16ee4 18373msgstr "无标签说明?"
c04f5ac3 18374
c1ac5258 18375#: builtin/tag.c:274
c04f5ac3
JX
18376#, c-format
18377msgid "The tag message has been left in %s\n"
55a16ee4 18378msgstr "标签说明被保留在 %s\n"
c04f5ac3 18379
4c27fcb5 18380#: builtin/tag.c:385
ef317cd5 18381msgid "list tag names"
55a16ee4 18382msgstr "列出标签名称"
ef317cd5 18383
4c27fcb5 18384#: builtin/tag.c:387
ef317cd5 18385msgid "print <n> lines of each tag message"
55a16ee4 18386msgstr "每个标签信息打印 <n> 行"
ef317cd5 18387
4c27fcb5 18388#: builtin/tag.c:389
ef317cd5 18389msgid "delete tags"
55a16ee4 18390msgstr "删除标签"
ef317cd5 18391
4c27fcb5 18392#: builtin/tag.c:390
ef317cd5 18393msgid "verify tags"
55a16ee4 18394msgstr "验证标签"
ef317cd5 18395
4c27fcb5 18396#: builtin/tag.c:392
ef317cd5 18397msgid "Tag creation options"
55a16ee4 18398msgstr "标签创建选项"
ef317cd5 18399
4c27fcb5 18400#: builtin/tag.c:394
ef317cd5 18401msgid "annotated tag, needs a message"
55a16ee4 18402msgstr "附注标签,需要一个说明"
ef317cd5 18403
4c27fcb5 18404#: builtin/tag.c:396
ef317cd5 18405msgid "tag message"
55a16ee4 18406msgstr "标签说明"
ef317cd5 18407
4c27fcb5 18408#: builtin/tag.c:398
31e5e17b
JX
18409msgid "force edit of tag message"
18410msgstr "强制编辑标签说明"
18411
4c27fcb5 18412#: builtin/tag.c:399
ef317cd5 18413msgid "annotated and GPG-signed tag"
55a16ee4 18414msgstr "附注并附加 GPG 签名的标签"
ef317cd5 18415
4c27fcb5 18416#: builtin/tag.c:403
ef317cd5 18417msgid "use another key to sign the tag"
55a16ee4 18418msgstr "使用另外的私钥签名该标签"
ef317cd5 18419
4c27fcb5 18420#: builtin/tag.c:404
ef317cd5 18421msgid "replace the tag if exists"
55a16ee4 18422msgstr "如果存在,替换现有的标签"
ef317cd5 18423
4c27fcb5 18424#: builtin/tag.c:405 builtin/update-ref.c:369
03ea3327 18425msgid "create a reflog"
1b7f4a34
JX
18426msgstr "创建引用日志"
18427
4c27fcb5 18428#: builtin/tag.c:407
814ff314 18429msgid "Tag listing options"
55a16ee4 18430msgstr "标签列表选项"
814ff314 18431
4c27fcb5 18432#: builtin/tag.c:408
ef317cd5 18433msgid "show tag list in columns"
55a16ee4 18434msgstr "以列的方式显示标签列表"
ef317cd5 18435
4c27fcb5 18436#: builtin/tag.c:409 builtin/tag.c:411
ef317cd5 18437msgid "print only tags that contain the commit"
87cb7997 18438msgstr "只打印包含该提交的标签"
ef317cd5 18439
4c27fcb5 18440#: builtin/tag.c:410 builtin/tag.c:412
87cb7997
JX
18441msgid "print only tags that don't contain the commit"
18442msgstr "只打印不包含该提交的标签"
18443
4c27fcb5 18444#: builtin/tag.c:413
94550ed3
JX
18445msgid "print only tags that are merged"
18446msgstr "只打印已经合并的标签"
18447
4c27fcb5 18448#: builtin/tag.c:414
94550ed3
JX
18449msgid "print only tags that are not merged"
18450msgstr "只打印尚未合并的标签"
18451
4c27fcb5 18452#: builtin/tag.c:419
ef317cd5 18453msgid "print only tags of the object"
87cb7997 18454msgstr "只打印指向该对象的标签"
ef317cd5 18455
4c27fcb5 18456#: builtin/tag.c:463
8ada9598 18457msgid "--column and -n are incompatible"
81809b99 18458msgstr "--column 和 -n 不兼容"
8ada9598 18459
4c27fcb5 18460#: builtin/tag.c:485
87cb7997
JX
18461msgid "-n option is only allowed in list mode"
18462msgstr "-n 选项只允许用在列表显示模式"
c04f5ac3 18463
4c27fcb5 18464#: builtin/tag.c:487
87cb7997
JX
18465msgid "--contains option is only allowed in list mode"
18466msgstr "--contains 选项只允许用在列表显示模式"
c04f5ac3 18467
4c27fcb5 18468#: builtin/tag.c:489
87cb7997
JX
18469msgid "--no-contains option is only allowed in list mode"
18470msgstr "--no-contains 选项只允许用在列表显示模式"
7ac1c0ad 18471
4c27fcb5 18472#: builtin/tag.c:491
87cb7997
JX
18473msgid "--points-at option is only allowed in list mode"
18474msgstr "--points-at 选项只允许用在列表显示模式"
94550ed3 18475
4c27fcb5 18476#: builtin/tag.c:493
87cb7997
JX
18477msgid "--merged and --no-merged options are only allowed in list mode"
18478msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
18479
4c27fcb5 18480#: builtin/tag.c:504
c04f5ac3
JX
18481msgid "only one -F or -m option is allowed."
18482msgstr "只允许一个 -F 或 -m 选项。"
18483
4c27fcb5 18484#: builtin/tag.c:523
c04f5ac3
JX
18485msgid "too many params"
18486msgstr "太多参数"
18487
4c27fcb5 18488#: builtin/tag.c:529
c04f5ac3
JX
18489#, c-format
18490msgid "'%s' is not a valid tag name."
55a16ee4 18491msgstr "'%s' 不是一个有效的标签名称。"
c04f5ac3 18492
4c27fcb5 18493#: builtin/tag.c:534
c04f5ac3
JX
18494#, c-format
18495msgid "tag '%s' already exists"
55a16ee4 18496msgstr "标签 '%s' 已存在"
c04f5ac3 18497
4c27fcb5 18498#: builtin/tag.c:565
c04f5ac3
JX
18499#, c-format
18500msgid "Updated tag '%s' (was %s)\n"
55a16ee4 18501msgstr "已更新标签 '%s'(曾为 %s)\n"
c04f5ac3 18502
c1ac5258 18503#: builtin/unpack-objects.c:500
6c94aba5
JX
18504msgid "Unpacking objects"
18505msgstr "展开对象中"
18506
06991777 18507#: builtin/update-index.c:83
7aea43ff
JX
18508#, c-format
18509msgid "failed to create directory %s"
c1ac5258 18510msgstr "创建目录 %s 失败"
7aea43ff 18511
06991777 18512#: builtin/update-index.c:99
7aea43ff
JX
18513#, c-format
18514msgid "failed to create file %s"
c1ac5258 18515msgstr "创建文件 %s 失败"
7aea43ff 18516
06991777 18517#: builtin/update-index.c:107
7aea43ff
JX
18518#, c-format
18519msgid "failed to delete file %s"
c1ac5258 18520msgstr "删除文件 %s 失败"
7aea43ff 18521
06991777 18522#: builtin/update-index.c:114 builtin/update-index.c:220
7aea43ff
JX
18523#, c-format
18524msgid "failed to delete directory %s"
c1ac5258 18525msgstr "删除目录 %s 失败"
7aea43ff 18526
06991777 18527#: builtin/update-index.c:139
7aea43ff 18528#, c-format
276ceeaa
JX
18529msgid "Testing mtime in '%s' "
18530msgstr "在 '%s' 中测试 mtime "
7aea43ff 18531
06991777 18532#: builtin/update-index.c:153
7aea43ff
JX
18533msgid "directory stat info does not change after adding a new file"
18534msgstr "添加一个新文件后,目录的状态信息未改变"
18535
06991777 18536#: builtin/update-index.c:166
7aea43ff
JX
18537msgid "directory stat info does not change after adding a new directory"
18538msgstr "添加一个新目录后,目录的状态信息未改变"
18539
06991777 18540#: builtin/update-index.c:179
7aea43ff
JX
18541msgid "directory stat info changes after updating a file"
18542msgstr "更新一个文件后,目录的状态信息被修改"
18543
06991777 18544#: builtin/update-index.c:190
7aea43ff
JX
18545msgid "directory stat info changes after adding a file inside subdirectory"
18546msgstr "在子目录中添加文件后,目录的状态信息被修改"
18547
06991777 18548#: builtin/update-index.c:201
7aea43ff
JX
18549msgid "directory stat info does not change after deleting a file"
18550msgstr "删除一个文件后,目录的状态信息未改变"
18551
06991777 18552#: builtin/update-index.c:214
7aea43ff
JX
18553msgid "directory stat info does not change after deleting a directory"
18554msgstr "删除一个目录后,目录的状态信息未改变"
18555
06991777 18556#: builtin/update-index.c:221
7aea43ff
JX
18557msgid " OK"
18558msgstr " OK"
18559
06991777 18560#: builtin/update-index.c:589
814ff314
JX
18561msgid "git update-index [<options>] [--] [<file>...]"
18562msgstr "git update-index [<选项>] [--] [<文件>...]"
8ada9598 18563
06991777 18564#: builtin/update-index.c:962
ef317cd5 18565msgid "continue refresh even when index needs update"
07432cef 18566msgstr "当索引需要更新时继续刷新"
8ada9598 18567
06991777 18568#: builtin/update-index.c:965
ef317cd5 18569msgid "refresh: ignore submodules"
07432cef 18570msgstr "刷新:忽略子模组"
8ada9598 18571
06991777 18572#: builtin/update-index.c:968
ef317cd5 18573msgid "do not ignore new files"
07432cef 18574msgstr "不忽略新的文件"
8ada9598 18575
06991777 18576#: builtin/update-index.c:970
ef317cd5 18577msgid "let files replace directories and vice-versa"
07432cef 18578msgstr "让文件替换目录(反之亦然)"
ef317cd5 18579
06991777 18580#: builtin/update-index.c:972
ef317cd5 18581msgid "notice files missing from worktree"
07432cef 18582msgstr "通知文件从工作区丢失"
ef317cd5 18583
06991777 18584#: builtin/update-index.c:974
ef317cd5 18585msgid "refresh even if index contains unmerged entries"
07432cef 18586msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 18587
06991777 18588#: builtin/update-index.c:977
ef317cd5 18589msgid "refresh stat information"
07432cef 18590msgstr "刷新统计信息"
ef317cd5 18591
06991777 18592#: builtin/update-index.c:981
ef317cd5 18593msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 18594msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 18595
06991777 18596#: builtin/update-index.c:985
6c94aba5 18597msgid "<mode>,<object>,<path>"
d9d56b23 18598msgstr "<存取模式>,<对象>,<路径>"
ef317cd5 18599
06991777 18600#: builtin/update-index.c:986
ef317cd5 18601msgid "add the specified entry to the index"
07432cef 18602msgstr "添加指定的条目到索引区"
ef317cd5 18603
06991777 18604#: builtin/update-index.c:995
ef317cd5 18605msgid "mark files as \"not changing\""
07432cef 18606msgstr "把文件标记为 \"没有变更\""
ef317cd5 18607
06991777 18608#: builtin/update-index.c:998
ef317cd5 18609msgid "clear assumed-unchanged bit"
07432cef 18610msgstr "清除 assumed-unchanged 位"
ef317cd5 18611
06991777 18612#: builtin/update-index.c:1001
ef317cd5 18613msgid "mark files as \"index-only\""
07432cef 18614msgstr "把文件标记为 \"仅索引\""
ef317cd5 18615
06991777 18616#: builtin/update-index.c:1004
ef317cd5 18617msgid "clear skip-worktree bit"
07432cef 18618msgstr "清除 skip-worktree 位"
ef317cd5 18619
06991777 18620#: builtin/update-index.c:1007
ef317cd5 18621msgid "add to index only; do not add content to object database"
07432cef 18622msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 18623
06991777 18624#: builtin/update-index.c:1009
ef317cd5 18625msgid "remove named paths even if present in worktree"
07432cef 18626msgstr "即使存在工作区里,也删除路径"
ef317cd5 18627
06991777 18628#: builtin/update-index.c:1011
ef317cd5 18629msgid "with --stdin: input lines are terminated by null bytes"
07432cef 18630msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 18631
06991777 18632#: builtin/update-index.c:1013
ef317cd5 18633msgid "read list of paths to be updated from standard input"
07432cef 18634msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 18635
06991777 18636#: builtin/update-index.c:1017
ef317cd5 18637msgid "add entries from standard input to the index"
07432cef 18638msgstr "从标准输入添加条目到索引区"
ef317cd5 18639
06991777 18640#: builtin/update-index.c:1021
ef317cd5 18641msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 18642msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 18643
06991777 18644#: builtin/update-index.c:1025
ef317cd5 18645msgid "only update entries that differ from HEAD"
07432cef 18646msgstr "只更新与 HEAD 不同的条目"
ef317cd5 18647
06991777 18648#: builtin/update-index.c:1029
ef317cd5 18649msgid "ignore files missing from worktree"
07432cef 18650msgstr "忽略工作区丢失的文件"
ef317cd5 18651
06991777 18652#: builtin/update-index.c:1032
ef317cd5 18653msgid "report actions to standard output"
07432cef 18654msgstr "在标准输出显示操作"
ef317cd5 18655
06991777 18656#: builtin/update-index.c:1034
ef317cd5 18657msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 18658msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 18659
06991777 18660#: builtin/update-index.c:1038
ef317cd5 18661msgid "write index in this format"
07432cef 18662msgstr "以这种格式写入索引区"
ef317cd5 18663
06991777 18664#: builtin/update-index.c:1040
6acbf033
JX
18665msgid "enable or disable split index"
18666msgstr "启用或禁用索引拆分"
18667
06991777 18668#: builtin/update-index.c:1042
7aea43ff
JX
18669msgid "enable/disable untracked cache"
18670msgstr "启用/禁用对未跟踪文件的缓存"
18671
06991777 18672#: builtin/update-index.c:1044
276ceeaa
JX
18673msgid "test if the filesystem supports untracked cache"
18674msgstr "测试文件系统是否支持未跟踪文件缓存"
18675
06991777 18676#: builtin/update-index.c:1046
7aea43ff
JX
18677msgid "enable untracked cache without testing the filesystem"
18678msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
18679
06991777 18680#: builtin/update-index.c:1048
5809aa05
JX
18681msgid "write out the index even if is not flagged as changed"
18682msgstr "即使没有被标记为已更改,也要写出索引"
18683
06991777 18684#: builtin/update-index.c:1050
5809aa05
JX
18685msgid "enable or disable file system monitor"
18686msgstr "启用或禁用文件系统监控"
18687
06991777 18688#: builtin/update-index.c:1052
5809aa05
JX
18689msgid "mark files as fsmonitor valid"
18690msgstr "标记文件为 fsmonitor 有效"
18691
06991777 18692#: builtin/update-index.c:1055
5809aa05
JX
18693msgid "clear fsmonitor valid bit"
18694msgstr "清除 fsmonitor 有效位"
18695
06991777 18696#: builtin/update-index.c:1156
87cb7997
JX
18697msgid ""
18698"core.splitIndex is set to false; remove or change it, if you really want to "
18699"enable split index"
18700msgstr ""
18701"core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。"
18702
06991777 18703#: builtin/update-index.c:1165
87cb7997
JX
18704msgid ""
18705"core.splitIndex is set to true; remove or change it, if you really want to "
18706"disable split index"
18707msgstr ""
18708"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。"
18709
06991777 18710#: builtin/update-index.c:1176
a0b6b246
JX
18711msgid ""
18712"core.untrackedCache is set to true; remove or change it, if you really want "
18713"to disable the untracked cache"
275588f9
JX
18714msgstr ""
18715"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
18716"改它。"
a0b6b246 18717
06991777 18718#: builtin/update-index.c:1180
276ceeaa
JX
18719msgid "Untracked cache disabled"
18720msgstr "缓存未跟踪文件被禁用"
18721
06991777 18722#: builtin/update-index.c:1188
a0b6b246
JX
18723msgid ""
18724"core.untrackedCache is set to false; remove or change it, if you really want "
18725"to enable the untracked cache"
275588f9
JX
18726msgstr ""
18727"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
18728"修改它。"
a0b6b246 18729
06991777 18730#: builtin/update-index.c:1192
276ceeaa
JX
18731#, c-format
18732msgid "Untracked cache enabled for '%s'"
18733msgstr "缓存未跟踪文件在 '%s' 启用"
18734
06991777 18735#: builtin/update-index.c:1200
5809aa05 18736msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
31e5e17b 18737msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项"
5809aa05 18738
06991777 18739#: builtin/update-index.c:1204
5809aa05
JX
18740msgid "fsmonitor enabled"
18741msgstr "fsmonitor 被启用"
18742
06991777 18743#: builtin/update-index.c:1207
5809aa05
JX
18744msgid ""
18745"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
31e5e17b 18746msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项"
5809aa05 18747
06991777 18748#: builtin/update-index.c:1211
5809aa05
JX
18749msgid "fsmonitor disabled"
18750msgstr "fsmonitor 被禁用"
18751
a4f16749 18752#: builtin/update-ref.c:10
814ff314
JX
18753msgid "git update-ref [<options>] -d <refname> [<old-val>]"
18754msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
ef317cd5 18755
a4f16749 18756#: builtin/update-ref.c:11
814ff314
JX
18757msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
18758msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
90314792 18759
a4f16749 18760#: builtin/update-ref.c:12
814ff314
JX
18761msgid "git update-ref [<options>] --stdin [-z]"
18762msgstr "git update-ref [<选项>] --stdin [-z]"
ef317cd5 18763
c1ac5258 18764#: builtin/update-ref.c:364
ef317cd5 18765msgid "delete the reference"
07432cef 18766msgstr "删除引用"
ef317cd5 18767
c1ac5258 18768#: builtin/update-ref.c:366
ef317cd5 18769msgid "update <refname> not the one it points to"
07432cef 18770msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 18771
c1ac5258 18772#: builtin/update-ref.c:367
90314792
JX
18773msgid "stdin has NUL-terminated arguments"
18774msgstr "标准输入有以 NUL 字符终止的参数"
18775
c1ac5258 18776#: builtin/update-ref.c:368
90314792
JX
18777msgid "read updates from stdin"
18778msgstr "从标准输入读取更新"
18779
a4f16749 18780#: builtin/update-server-info.c:7
ef317cd5 18781msgid "git update-server-info [--force]"
07432cef 18782msgstr "git update-server-info [--force]"
ef317cd5 18783
a4f16749 18784#: builtin/update-server-info.c:15
ef317cd5 18785msgid "update the info files from scratch"
07432cef 18786msgstr "从头开始更新文件信息"
ef317cd5 18787
fd8cb379
JX
18788#: builtin/upload-pack.c:11
18789msgid "git upload-pack [<options>] <dir>"
18790msgstr "git upload-pack [<选项>] <目录>"
18791
18792#: builtin/upload-pack.c:25
18793msgid "exit immediately after initial ref advertisement"
18794msgstr "在初始的引用广告后立即退出"
18795
18796#: builtin/upload-pack.c:27
18797msgid "do not try <directory>/.git/ if <directory> is no Git directory"
18798msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/"
18799
18800#: builtin/upload-pack.c:29
18801msgid "interrupt transfer after <n> seconds of inactivity"
18802msgstr "不活动 <n> 秒钟后终止传输"
18803
c1ac5258 18804#: builtin/verify-commit.c:20
814ff314
JX
18805msgid "git verify-commit [-v | --verbose] <commit>..."
18806msgstr "git verify-commit [-v | --verbose] <提交>..."
6acbf033 18807
c1ac5258 18808#: builtin/verify-commit.c:76
6acbf033
JX
18809msgid "print commit contents"
18810msgstr "打印提交内容"
18811
c1ac5258 18812#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
1b7f4a34
JX
18813msgid "print raw gpg status output"
18814msgstr "打印原始 gpg 状态输出"
18815
a4f16749 18816#: builtin/verify-pack.c:55
814ff314
JX
18817msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
18818msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
ef317cd5 18819
a4f16749 18820#: builtin/verify-pack.c:65
ef317cd5
JX
18821msgid "verbose"
18822msgstr "冗长输出"
18823
a4f16749 18824#: builtin/verify-pack.c:67
ef317cd5 18825msgid "show statistics only"
07432cef 18826msgstr "只显示统计"
ef317cd5 18827
a4f16749 18828#: builtin/verify-tag.c:19
1a79b2f1
JX
18829msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
18830msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
ef317cd5 18831
a4f16749 18832#: builtin/verify-tag.c:37
ef317cd5 18833msgid "print tag contents"
55a16ee4 18834msgstr "打印标签内容"
ef317cd5 18835
06991777 18836#: builtin/worktree.c:18
31e5e17b
JX
18837msgid "git worktree add [<options>] <path> [<commit-ish>]"
18838msgstr "git worktree add [<选项>] <路径> [<提交>]"
5bb01d4f 18839
06991777 18840#: builtin/worktree.c:19
5c57d762
JX
18841msgid "git worktree list [<options>]"
18842msgstr "git worktree list [<选项>]"
18843
06991777 18844#: builtin/worktree.c:20
5c57d762
JX
18845msgid "git worktree lock [<options>] <path>"
18846msgstr "git worktree lock [<选项>] <路径>"
18847
06991777 18848#: builtin/worktree.c:21
31e5e17b
JX
18849msgid "git worktree move <worktree> <new-path>"
18850msgstr "git worktree move <工作区> <新路径>"
18851
06991777 18852#: builtin/worktree.c:22
5bb01d4f
JX
18853msgid "git worktree prune [<options>]"
18854msgstr "git worktree prune [<选项>]"
18855
06991777 18856#: builtin/worktree.c:23
31e5e17b
JX
18857msgid "git worktree remove [<options>] <worktree>"
18858msgstr "git worktree remove [<选项>] <工作区>"
18859
06991777 18860#: builtin/worktree.c:24
5c57d762
JX
18861msgid "git worktree unlock <path>"
18862msgstr "git worktree unlock <路径>"
94550ed3 18863
06991777 18864#: builtin/worktree.c:61 builtin/worktree.c:888
4c27fcb5
JX
18865#, c-format
18866msgid "failed to delete '%s'"
18867msgstr "删除 '%s' 失败"
18868
06991777 18869#: builtin/worktree.c:80
5bb01d4f
JX
18870#, c-format
18871msgid "Removing worktrees/%s: not a valid directory"
18872msgstr "删除工作区/%s:不是一个有效的目录"
18873
06991777 18874#: builtin/worktree.c:86
5bb01d4f
JX
18875#, c-format
18876msgid "Removing worktrees/%s: gitdir file does not exist"
18877msgstr "删除 worktrees/%s:gitdir 文件不存在"
18878
06991777 18879#: builtin/worktree.c:91 builtin/worktree.c:100
5bb01d4f
JX
18880#, c-format
18881msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
18882msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
18883
06991777 18884#: builtin/worktree.c:110
6937cb4e
JX
18885#, c-format
18886msgid ""
18887"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
18888"%<PRIuMAX>)"
18889msgstr "删除工作树/%s:读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)"
18890
06991777 18891#: builtin/worktree.c:118
5bb01d4f
JX
18892#, c-format
18893msgid "Removing worktrees/%s: invalid gitdir file"
18894msgstr "删除 worktrees/%s:无效的 gitdir 文件"
18895
06991777 18896#: builtin/worktree.c:127
5bb01d4f
JX
18897#, c-format
18898msgid "Removing worktrees/%s: gitdir file points to non-existent location"
18899msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
18900
06991777 18901#: builtin/worktree.c:166
1a79b2f1
JX
18902msgid "report pruned working trees"
18903msgstr "报告清除的工作区"
18904
06991777 18905#: builtin/worktree.c:168
1a79b2f1 18906msgid "expire working trees older than <time>"
58b6f078 18907msgstr "将早于 <时间> 的工作区过期"
1a79b2f1 18908
06991777 18909#: builtin/worktree.c:235
5bb01d4f
JX
18910#, c-format
18911msgid "'%s' already exists"
18912msgstr "'%s' 已经存在"
18913
06991777 18914#: builtin/worktree.c:252
4c27fcb5
JX
18915#, c-format
18916msgid "unable to re-add worktree '%s'"
18917msgstr "无法再次添加工作区 '%s'"
18918
06991777 18919#: builtin/worktree.c:257
4c27fcb5
JX
18920#, c-format
18921msgid ""
18922"'%s' is a missing but locked worktree;\n"
18923"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
18924msgstr ""
18925"'%s' 是一个丢失但锁定的工作区,使用\n"
18926"'add -f -f' 覆盖,或 'unlock' 和 'prune' 或 'remove' 清除"
18927
06991777 18928#: builtin/worktree.c:259
4c27fcb5
JX
18929#, c-format
18930msgid ""
18931"'%s' is a missing but already registered worktree;\n"
18932"use 'add -f' to override, or 'prune' or 'remove' to clear"
18933msgstr ""
18934"'%s' 是一个丢失但已经注册的工作区,使用\n"
18935"'add -f' 覆盖,或 'prune' 或 'remove' 清除"
18936
06991777 18937#: builtin/worktree.c:310
5bb01d4f
JX
18938#, c-format
18939msgid "could not create directory of '%s'"
18940msgstr "不能创建目录 '%s'"
18941
06991777 18942#: builtin/worktree.c:429 builtin/worktree.c:435
fd8cb379
JX
18943#, c-format
18944msgid "Preparing worktree (new branch '%s')"
18945msgstr "准备工作区(新分支 '%s')"
18946
06991777 18947#: builtin/worktree.c:431
fd8cb379
JX
18948#, c-format
18949msgid "Preparing worktree (resetting branch '%s'; was at %s)"
18950msgstr "准备工作区(重置分支 '%s',之前为 %s)"
18951
06991777 18952#: builtin/worktree.c:440
fd8cb379
JX
18953#, c-format
18954msgid "Preparing worktree (checking out '%s')"
18955msgstr "准备工作区(检出 '%s')"
18956
06991777 18957#: builtin/worktree.c:446
5bb01d4f 18958#, c-format
fd8cb379
JX
18959msgid "Preparing worktree (detached HEAD %s)"
18960msgstr "准备工作区(分离头指针 %s)"
5bb01d4f 18961
06991777 18962#: builtin/worktree.c:487
5bb01d4f 18963msgid "checkout <branch> even if already checked out in other worktree"
58b6f078 18964msgstr "检出 <分支>,即使已经被检出到其它工作区"
5bb01d4f 18965
06991777 18966#: builtin/worktree.c:490
5bb01d4f
JX
18967msgid "create a new branch"
18968msgstr "创建一个新分支"
18969
06991777 18970#: builtin/worktree.c:492
5bb01d4f
JX
18971msgid "create or reset a branch"
18972msgstr "创建或重置一个分支"
18973
06991777 18974#: builtin/worktree.c:494
5b04ee3b
JX
18975msgid "populate the new working tree"
18976msgstr "生成新的工作区"
18977
06991777 18978#: builtin/worktree.c:495
60638e98
JX
18979msgid "keep the new working tree locked"
18980msgstr "锁定新工作区"
18981
06991777 18982#: builtin/worktree.c:498
5809aa05
JX
18983msgid "set up tracking mode (see git-branch(1))"
18984msgstr "设置跟踪模式(参见 git-branch(1))"
18985
06991777 18986#: builtin/worktree.c:501
5809aa05
JX
18987msgid "try to match the new branch name with a remote-tracking branch"
18988msgstr "尝试为新分支名匹配一个远程跟踪分支"
18989
06991777 18990#: builtin/worktree.c:509
1b7f4a34
JX
18991msgid "-b, -B, and --detach are mutually exclusive"
18992msgstr "-b、-B 和 --detach 是互斥的"
5bb01d4f 18993
06991777 18994#: builtin/worktree.c:570
5809aa05
JX
18995msgid "--[no-]track can only be used if a new branch is created"
18996msgstr "只能在创建新分支时使用选项 --[no-]track "
18997
06991777 18998#: builtin/worktree.c:670
5c57d762
JX
18999msgid "reason for locking"
19000msgstr "锁定原因"
19001
06991777
JX
19002#: builtin/worktree.c:682 builtin/worktree.c:715 builtin/worktree.c:789
19003#: builtin/worktree.c:916
5c57d762
JX
19004#, c-format
19005msgid "'%s' is not a working tree"
19006msgstr "'%s' 不是一个工作区"
19007
06991777 19008#: builtin/worktree.c:684 builtin/worktree.c:717
5c57d762
JX
19009msgid "The main working tree cannot be locked or unlocked"
19010msgstr "主工作区无法被加锁或解锁"
19011
06991777 19012#: builtin/worktree.c:689
5c57d762
JX
19013#, c-format
19014msgid "'%s' is already locked, reason: %s"
19015msgstr "'%s' 已被锁定,原因:%s"
19016
06991777 19017#: builtin/worktree.c:691
5c57d762
JX
19018#, c-format
19019msgid "'%s' is already locked"
19020msgstr "'%s' 已被锁定"
19021
06991777 19022#: builtin/worktree.c:719
5c57d762
JX
19023#, c-format
19024msgid "'%s' is not locked"
19025msgstr "'%s' 未被锁定"
19026
06991777 19027#: builtin/worktree.c:760
31e5e17b 19028msgid "working trees containing submodules cannot be moved or removed"
610f8099 19029msgstr "不能移动或删除包含子模组的工作区"
31e5e17b 19030
06991777 19031#: builtin/worktree.c:768
4c27fcb5
JX
19032msgid "force move even if worktree is dirty or locked"
19033msgstr "强制移动,即使工作区是脏的或已锁定"
19034
06991777 19035#: builtin/worktree.c:791 builtin/worktree.c:918
31e5e17b
JX
19036#, c-format
19037msgid "'%s' is a main working tree"
19038msgstr "'%s' 是一个主工作区"
19039
06991777 19040#: builtin/worktree.c:796
31e5e17b
JX
19041#, c-format
19042msgid "could not figure out destination name from '%s'"
19043msgstr "无法从 '%s' 算出目标名称"
19044
06991777 19045#: builtin/worktree.c:802
31e5e17b
JX
19046#, c-format
19047msgid "target '%s' already exists"
19048msgstr "目标 '%s' 已存在"
19049
06991777 19050#: builtin/worktree.c:810
31e5e17b 19051#, c-format
4c27fcb5
JX
19052msgid ""
19053"cannot move a locked working tree, lock reason: %s\n"
19054"use 'move -f -f' to override or unlock first"
19055msgstr ""
19056"无法移动一个锁定的工作区,锁定原因:%s\n"
19057"使用 'move -f -f' 覆盖或先解锁"
31e5e17b 19058
06991777 19059#: builtin/worktree.c:812
4c27fcb5
JX
19060msgid ""
19061"cannot move a locked working tree;\n"
19062"use 'move -f -f' to override or unlock first"
19063msgstr ""
19064"无法移动一个锁定的工作区,\n"
19065"使用 'move -f -f' 覆盖或先解锁"
31e5e17b 19066
06991777 19067#: builtin/worktree.c:815
31e5e17b
JX
19068#, c-format
19069msgid "validation failed, cannot move working tree: %s"
19070msgstr "验证失败,无法移动工作区:%s"
19071
06991777 19072#: builtin/worktree.c:820
31e5e17b
JX
19073#, c-format
19074msgid "failed to move '%s' to '%s'"
c1ac5258 19075msgstr "移动 '%s' 到 '%s' 失败"
31e5e17b 19076
06991777 19077#: builtin/worktree.c:868
31e5e17b
JX
19078#, c-format
19079msgid "failed to run 'git status' on '%s'"
c1ac5258 19080msgstr "在 '%s' 中执行 'git status' 失败"
31e5e17b 19081
06991777 19082#: builtin/worktree.c:872
31e5e17b
JX
19083#, c-format
19084msgid "'%s' is dirty, use --force to delete it"
19085msgstr "'%s' 是脏的,使用 --force 删除"
19086
06991777 19087#: builtin/worktree.c:877
31e5e17b
JX
19088#, c-format
19089msgid "failed to run 'git status' on '%s', code %d"
c1ac5258 19090msgstr "在 '%s' 中执行 'git status' 失败,退出码 %d"
31e5e17b 19091
06991777 19092#: builtin/worktree.c:900
4c27fcb5
JX
19093msgid "force removal even if worktree is dirty or locked"
19094msgstr "强制删除,即使工作区是脏的或已锁定"
31e5e17b 19095
06991777 19096#: builtin/worktree.c:923
31e5e17b 19097#, c-format
4c27fcb5
JX
19098msgid ""
19099"cannot remove a locked working tree, lock reason: %s\n"
19100"use 'remove -f -f' to override or unlock first"
19101msgstr ""
19102"无法删除一个锁定的工作区,锁定原因:%s\n"
19103"使用 'remove -f -f' 覆盖或先解锁"
31e5e17b 19104
06991777 19105#: builtin/worktree.c:925
4c27fcb5
JX
19106msgid ""
19107"cannot remove a locked working tree;\n"
19108"use 'remove -f -f' to override or unlock first"
19109msgstr ""
19110"无法删除一个锁定的工作区,\n"
19111"使用 'remove -f -f' 覆盖或先解锁"
31e5e17b 19112
06991777 19113#: builtin/worktree.c:928
31e5e17b
JX
19114#, c-format
19115msgid "validation failed, cannot remove working tree: %s"
19116msgstr "验证失败,无法删除工作区:%s"
19117
06991777 19118#: builtin/write-tree.c:15
ef317cd5 19119msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 19120msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5 19121
06991777 19122#: builtin/write-tree.c:28
ef317cd5 19123msgid "<prefix>/"
07432cef 19124msgstr "<前缀>/"
ef317cd5 19125
06991777 19126#: builtin/write-tree.c:29
ef317cd5 19127msgid "write tree object for a subdirectory <prefix>"
07432cef 19128msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5 19129
06991777 19130#: builtin/write-tree.c:31
ef317cd5 19131msgid "only useful for debugging"
07432cef 19132msgstr "只对调试有用"
ef317cd5 19133
06991777 19134#: credential-cache--daemon.c:223
a0b6b246
JX
19135#, c-format
19136msgid ""
19137"The permissions on your socket directory are too loose; other\n"
19138"users may be able to read your cached credentials. Consider running:\n"
19139"\n"
19140"\tchmod 0700 %s"
19141msgstr ""
1a79b2f1
JX
19142"您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
19143"行:\n"
a0b6b246
JX
19144"\n"
19145"\tchmod 0700 %s"
19146
06991777 19147#: credential-cache--daemon.c:272
220c313c
JX
19148msgid "print debugging messages to stderr"
19149msgstr "调试信息输出到标准错误"
19150
4c27fcb5
JX
19151#: t/helper/test-reach.c:152
19152#, c-format
19153msgid "commit %s is not marked reachable"
19154msgstr "提交 %s 没有标记为可达"
19155
19156#: t/helper/test-reach.c:162
19157msgid "too many commits marked reachable"
19158msgstr "太多提交标记为可达"
19159
fd8cb379 19160#: git.c:27
31e5e17b
JX
19161msgid ""
19162"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
19163" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
fd8cb379
JX
19164" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
19165"bare]\n"
31e5e17b
JX
19166" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
19167" <command> [<args>]"
19168msgstr ""
fd8cb379 19169"git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n"
31e5e17b 19170" [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
fd8cb379
JX
19171" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
19172"bare]\n"
31e5e17b
JX
19173" [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
19174" <命令> [<参数>]"
19175
fd8cb379 19176#: git.c:34
4dcdc3d8 19177msgid ""
220c313c 19178"'git help -a' and 'git help -g' list available subcommands and some\n"
4dcdc3d8
JX
19179"concept guides. See 'git help <command>' or 'git help <concept>'\n"
19180"to read about a specific subcommand or concept."
19181msgstr ""
220c313c
JX
19182"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
19183"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
19184"帮助。"
8ada9598 19185
06991777 19186#: git.c:174
31e5e17b
JX
19187#, c-format
19188msgid "no directory given for --git-dir\n"
19189msgstr "没有为 --git-dir 提供目录\n"
19190
06991777 19191#: git.c:188
31e5e17b
JX
19192#, c-format
19193msgid "no namespace given for --namespace\n"
19194msgstr "没有为 --namespace 提供命名空间\n"
19195
06991777 19196#: git.c:202
31e5e17b
JX
19197#, c-format
19198msgid "no directory given for --work-tree\n"
19199msgstr "没有为 --work-tree 提供目录\n"
19200
06991777 19201#: git.c:216
31e5e17b
JX
19202#, c-format
19203msgid "no prefix given for --super-prefix\n"
19204msgstr "没有为 --super-prefix 提供前缀\n"
19205
06991777 19206#: git.c:238
31e5e17b
JX
19207#, c-format
19208msgid "-c expects a configuration string\n"
19209msgstr "应为 -c 提供一个配置字符串\n"
19210
06991777 19211#: git.c:276
31e5e17b
JX
19212#, c-format
19213msgid "no directory given for -C\n"
19214msgstr "没有为 -C 提供目录\n"
19215
06991777 19216#: git.c:301
31e5e17b
JX
19217#, c-format
19218msgid "unknown option: %s\n"
19219msgstr "未知选项:%s\n"
19220
06991777
JX
19221#: git.c:342
19222#, c-format
19223msgid "while expanding alias '%s': '%s'"
19224msgstr "在扩展别名'%s' 时:'%s'"
19225
19226#: git.c:351
19227#, c-format
19228msgid ""
19229"alias '%s' changes environment variables.\n"
19230"You can use '!git' in the alias to do this"
19231msgstr ""
19232"别名 '%s' 修改环境变量。您可以使用在别名中\n"
19233"使用 '!git'"
19234
19235#: git.c:359
19236#, c-format
19237msgid "empty alias for %s"
19238msgstr "%s 的空别名"
19239
19240#: git.c:362
19241#, c-format
19242msgid "recursive alias: %s"
19243msgstr "别名递归:%s"
19244
19245#: git.c:437
19246msgid "write failure on standard output"
19247msgstr "在标准输出写入失败"
19248
19249#: git.c:439
19250msgid "unknown write failure on standard output"
19251msgstr "到标准输出的未知写入错误"
19252
19253#: git.c:441
19254msgid "close failed on standard output"
19255msgstr "标准输出关闭失败"
19256
19257#: git.c:720
4c27fcb5
JX
19258#, c-format
19259msgid "alias loop detected: expansion of '%s' does not terminate:%s"
19260msgstr "检测到别名循环:'%s'的扩展未终止:%s"
19261
06991777
JX
19262#: git.c:770
19263#, c-format
19264msgid "cannot handle %s as a builtin"
19265msgstr "不能作为内置命令处理 %s"
19266
19267#: git.c:783
19268#, c-format
19269msgid ""
19270"usage: %s\n"
19271"\n"
19272msgstr ""
19273"用法:%s\n"
19274"\n"
19275
19276#: git.c:803
31e5e17b
JX
19277#, c-format
19278msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
19279msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n"
19280
06991777 19281#: git.c:815
31e5e17b
JX
19282#, c-format
19283msgid "failed to run command '%s': %s\n"
c1ac5258 19284msgstr "运行命令 '%s' 失败:%s\n"
31e5e17b 19285
06991777 19286#: http.c:378
60638e98
JX
19287#, c-format
19288msgid "negative value for http.postbuffer; defaulting to %d"
19289msgstr "http.postbuffer 为负值,默认为 %d"
19290
06991777 19291#: http.c:399
a0b6b246 19292msgid "Delegation control is not supported with cURL < 7.22.0"
4c27fcb5 19293msgstr "不支持委托控制,因为 cURL < 7.22.0"
a0b6b246 19294
06991777 19295#: http.c:408
276ceeaa
JX
19296msgid "Public key pinning not supported with cURL < 7.44.0"
19297msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
19298
06991777 19299#: http.c:876
4c27fcb5
JX
19300msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
19301msgstr "不支持 CURLSSLOPT_NO_REVOKE,因为 cURL < 7.44.0"
19302
06991777 19303#: http.c:949
4c27fcb5
JX
19304msgid "Protocol restrictions not supported with cURL < 7.19.4"
19305msgstr "不支持协议限制,因为 cURL < 7.19.4"
19306
06991777 19307#: http.c:1085
4c27fcb5
JX
19308#, c-format
19309msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
19310msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端:"
19311
06991777 19312#: http.c:1092
4c27fcb5
JX
19313#, c-format
19314msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
19315msgstr "无法设置 SSL 后端为 '%s':cURL: cURL 没有使用 SSL 后端构建"
19316
06991777 19317#: http.c:1096
4c27fcb5
JX
19318#, c-format
19319msgid "Could not set SSL backend to '%s': already set"
19320msgstr "无法将 SSL 后端设置为 '%s':已经设置"
19321
06991777 19322#: http.c:1959
1a79b2f1
JX
19323#, c-format
19324msgid ""
19325"unable to update url base from redirection:\n"
19326" asked for: %s\n"
19327" redirect: %s"
19328msgstr ""
19329"不能更新重定向的 url base:\n"
19330" 请求:%s\n"
19331" 重定向:%s"
19332
06991777 19333#: remote-curl.c:455
1a79b2f1
JX
19334#, c-format
19335msgid "redirecting to %s"
19336msgstr "重定向到 %s"
19337
4c27fcb5 19338#: parse-options.h:154
fd8cb379
JX
19339msgid "expiry-date"
19340msgstr "到期时间"
7aea43ff 19341
4c27fcb5 19342#: parse-options.h:169
fd8cb379
JX
19343msgid "no-op (backward compatibility)"
19344msgstr "空操作(向后兼容)"
7aea43ff 19345
06991777 19346#: parse-options.h:259
fd8cb379
JX
19347msgid "be more verbose"
19348msgstr "更加详细"
7aea43ff 19349
06991777 19350#: parse-options.h:261
fd8cb379
JX
19351msgid "be more quiet"
19352msgstr "更加安静"
7aea43ff 19353
06991777 19354#: parse-options.h:267
fd8cb379
JX
19355msgid "use <n> digits to display SHA-1s"
19356msgstr "用 <n> 位数字显示 SHA-1 哈希值"
7aea43ff 19357
fd8cb379 19358#: command-list.h:50
8ada9598 19359msgid "Add file contents to the index"
81809b99 19360msgstr "添加文件内容至索引"
8ada9598 19361
fd8cb379
JX
19362#: command-list.h:51
19363msgid "Apply a series of patches from a mailbox"
19364msgstr "应用邮箱格式的系列补丁"
19365
19366#: command-list.h:52
19367msgid "Annotate file lines with commit information"
19368msgstr "使用提交信息注释文件行"
19369
19370#: command-list.h:53
19371msgid "Apply a patch to files and/or to the index"
19372msgstr "应用一个补丁到文件和/或索引区"
19373
19374#: command-list.h:54
4c27fcb5
JX
19375msgid "Import a GNU Arch repository into Git"
19376msgstr "将一个 GNU Arch 仓库导入到 Git"
fd8cb379
JX
19377
19378#: command-list.h:55
19379msgid "Create an archive of files from a named tree"
19380msgstr "基于一个指定的树创建文件存档"
19381
19382#: command-list.h:56
1b7f4a34
JX
19383msgid "Use binary search to find the commit that introduced a bug"
19384msgstr "通过二分查找定位引入 bug 的提交"
8ada9598 19385
fd8cb379
JX
19386#: command-list.h:57
19387msgid "Show what revision and author last modified each line of a file"
19388msgstr "显示文件每一行最后修改的版本和修改者"
19389
19390#: command-list.h:58
8ada9598 19391msgid "List, create, or delete branches"
81809b99 19392msgstr "列出、创建或删除分支"
8ada9598 19393
fd8cb379
JX
19394#: command-list.h:59
19395msgid "Move objects and refs by archive"
19396msgstr "通过归档移动对象和引用"
19397
19398#: command-list.h:60
19399msgid "Provide content or type and size information for repository objects"
19400msgstr "提供仓库对象的内容、类型或大小"
19401
19402#: command-list.h:61
19403msgid "Display gitattributes information"
19404msgstr "显示 gitattributes 信息"
19405
19406#: command-list.h:62
19407msgid "Debug gitignore / exclude files"
19408msgstr "调试 gitignore / exclude 文件"
19409
19410#: command-list.h:63
19411msgid "Show canonical names and email addresses of contacts"
19412msgstr "显示联系人的规范名称和电子邮件"
19413
19414#: command-list.h:64
5bb01d4f
JX
19415msgid "Switch branches or restore working tree files"
19416msgstr "切换分支或恢复工作区文件"
8ada9598 19417
fd8cb379
JX
19418#: command-list.h:65
19419msgid "Copy files from the index to the working tree"
19420msgstr "从索引拷贝文件到工作区"
19421
19422#: command-list.h:66
19423msgid "Ensures that a reference name is well formed"
19424msgstr "确保引用名称格式正确"
19425
19426#: command-list.h:67
19427msgid "Find commits yet to be applied to upstream"
19428msgstr "查找尚未应用到上游的提交"
19429
19430#: command-list.h:68
19431msgid "Apply the changes introduced by some existing commits"
19432msgstr "应用一些现存提交引入的修改"
19433
19434#: command-list.h:69
19435msgid "Graphical alternative to git-commit"
19436msgstr "git-commit 的图形替代界面"
19437
19438#: command-list.h:70
19439msgid "Remove untracked files from the working tree"
19440msgstr "从工作区中删除未跟踪文件"
19441
19442#: command-list.h:71
8ada9598 19443msgid "Clone a repository into a new directory"
06991777 19444msgstr "克隆仓库到一个新目录"
8ada9598 19445
fd8cb379
JX
19446#: command-list.h:72
19447msgid "Display data in columns"
19448msgstr "以列的方式显示数据"
19449
19450#: command-list.h:73
8ada9598 19451msgid "Record changes to the repository"
160fb2b2 19452msgstr "记录变更到仓库"
8ada9598 19453
fd8cb379 19454#: command-list.h:74
4c27fcb5
JX
19455msgid "Write and verify Git commit-graph files"
19456msgstr "写入和校验 Git 提交图文件"
fd8cb379
JX
19457
19458#: command-list.h:75
19459msgid "Create a new commit object"
19460msgstr "创建一个新的提交对象"
19461
19462#: command-list.h:76
19463msgid "Get and set repository or global options"
19464msgstr "获取和设置仓库或者全局选项"
19465
19466#: command-list.h:77
19467msgid "Count unpacked number of objects and their disk consumption"
19468msgstr "计算未打包对象的数量和磁盘空间占用"
19469
19470#: command-list.h:78
19471msgid "Retrieve and store user credentials"
19472msgstr "检索和存储用户密码"
19473
19474#: command-list.h:79
19475msgid "Helper to temporarily store passwords in memory"
19476msgstr "在内存中临时存储密码的助手"
19477
19478#: command-list.h:80
19479msgid "Helper to store credentials on disk"
19480msgstr "在磁盘存储密码的助手"
19481
19482#: command-list.h:81
19483msgid "Export a single commit to a CVS checkout"
19484msgstr "将一个提交导出到 CVS 检出中"
19485
19486#: command-list.h:82
19487msgid "Salvage your data out of another SCM people love to hate"
19488msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据"
19489
19490#: command-list.h:83
19491msgid "A CVS server emulator for Git"
19492msgstr "Git 的一个 CVS 服务模拟器"
19493
19494#: command-list.h:84
19495msgid "A really simple server for Git repositories"
19496msgstr "一个非常简单的 Git 仓库服务器"
19497
19498#: command-list.h:85
19499msgid "Give an object a human readable name based on an available ref"
19500msgstr "基于一个现存的引用为一个对象起一个可读的名称"
19501
19502#: command-list.h:86
8ada9598 19503msgid "Show changes between commits, commit and working tree, etc"
81809b99 19504msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598 19505
fd8cb379
JX
19506#: command-list.h:87
19507msgid "Compares files in the working tree and the index"
19508msgstr "比较工作区和索引区中的文件"
19509
19510#: command-list.h:88
19511msgid "Compare a tree to the working tree or index"
19512msgstr "将一个树和工作区或索引做比较"
19513
19514#: command-list.h:89
19515msgid "Compares the content and mode of blobs found via two tree objects"
19516msgstr "比较两个树对象的文件内容和模式"
19517
19518#: command-list.h:90
19519msgid "Show changes using common diff tools"
19520msgstr "使用常见的差异工具显示更改"
19521
19522#: command-list.h:91
19523msgid "Git data exporter"
19524msgstr "Git 数据导出器"
19525
19526#: command-list.h:92
19527msgid "Backend for fast Git data importers"
19528msgstr "Git 快速数据导入器后端"
19529
19530#: command-list.h:93
8ada9598 19531msgid "Download objects and refs from another repository"
160fb2b2 19532msgstr "从另外一个仓库下载对象和引用"
8ada9598 19533
fd8cb379
JX
19534#: command-list.h:94
19535msgid "Receive missing objects from another repository"
19536msgstr "从另一个仓库获取缺失的对象"
19537
19538#: command-list.h:95
19539msgid "Rewrite branches"
19540msgstr "重写分支"
19541
19542#: command-list.h:96
19543msgid "Produce a merge commit message"
19544msgstr "生成一个合并提交信息"
19545
19546#: command-list.h:97
19547msgid "Output information on each ref"
19548msgstr "对每一个引用输出信息 "
19549
19550#: command-list.h:98
19551msgid "Prepare patches for e-mail submission"
19552msgstr "准备电子邮件提交的补丁"
19553
19554#: command-list.h:99
19555msgid "Verifies the connectivity and validity of the objects in the database"
19556msgstr "验证仓库中对象的连通性和有效性"
19557
19558#: command-list.h:100
19559msgid "Cleanup unnecessary files and optimize the local repository"
19560msgstr "清除不必要的文件和优化本地仓库"
19561
19562#: command-list.h:101
19563msgid "Extract commit ID from an archive created using git-archive"
19564msgstr "从 git-archive 创建的归档文件中提取提交ID"
19565
19566#: command-list.h:102
8ada9598 19567msgid "Print lines matching a pattern"
81809b99 19568msgstr "输出和模式匹配的行"
8ada9598 19569
fd8cb379
JX
19570#: command-list.h:103
19571msgid "A portable graphical interface to Git"
19572msgstr "一个便携的 Git 图形客户端"
19573
19574#: command-list.h:104
19575msgid "Compute object ID and optionally creates a blob from a file"
19576msgstr "从一个文件计算对象ID,并可以创建 blob 数据对象"
19577
19578#: command-list.h:105
19579msgid "Display help information about Git"
19580msgstr "显示 Git 的帮助信息"
19581
19582#: command-list.h:106
19583msgid "Server side implementation of Git over HTTP"
19584msgstr "Git HTTP 协议的服务端实现"
19585
19586#: command-list.h:107
19587msgid "Download from a remote Git repository via HTTP"
19588msgstr "通过 HTTP 从远程 Git 仓库下载"
19589
19590#: command-list.h:108
19591msgid "Push objects over HTTP/DAV to another repository"
19592msgstr "通过 HTTP/DAV 推送对象另一个仓库"
19593
19594#: command-list.h:109
19595msgid "Send a collection of patches from stdin to an IMAP folder"
19596msgstr "从标准输入将一组补丁发送到IMAP文件夹"
19597
19598#: command-list.h:110
19599msgid "Build pack index file for an existing packed archive"
19600msgstr "从一个现存的包存档文件创建包索引"
19601
19602#: command-list.h:111
a77c07d9 19603msgid "Create an empty Git repository or reinitialize an existing one"
160fb2b2 19604msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
8ada9598 19605
fd8cb379
JX
19606#: command-list.h:112
19607msgid "Instantly browse your working repository in gitweb"
19608msgstr "在 gitweb 中即时浏览您的工作仓库"
19609
19610#: command-list.h:113
19611msgid "add or parse structured information in commit messages"
19612msgstr "添加或解析提交说明中的结构化信息"
19613
19614#: command-list.h:114
19615msgid "The Git repository browser"
19616msgstr "Git 仓库浏览器"
19617
19618#: command-list.h:115
8ada9598 19619msgid "Show commit logs"
81809b99 19620msgstr "显示提交日志"
8ada9598 19621
fd8cb379
JX
19622#: command-list.h:116
19623msgid "Show information about files in the index and the working tree"
19624msgstr "显示索引和工作区中文件的信息"
19625
19626#: command-list.h:117
19627msgid "List references in a remote repository"
19628msgstr "显示一个远程仓库的引用"
19629
19630#: command-list.h:118
19631msgid "List the contents of a tree object"
19632msgstr "显示一个树对象的内容"
19633
19634#: command-list.h:119
19635msgid "Extracts patch and authorship from a single e-mail message"
19636msgstr "从单个电子邮件中提取补丁和作者身份"
19637
19638#: command-list.h:120
19639msgid "Simple UNIX mbox splitter program"
19640msgstr "简单的 UNIX mbox 邮箱切分程序"
19641
19642#: command-list.h:121
8ada9598 19643msgid "Join two or more development histories together"
81809b99 19644msgstr "合并两个或更多开发历史"
8ada9598 19645
fd8cb379
JX
19646#: command-list.h:122
19647msgid "Find as good common ancestors as possible for a merge"
19648msgstr "为了合并查找尽可能好的公共祖先提交"
19649
19650#: command-list.h:123
19651msgid "Run a three-way file merge"
19652msgstr "运行一个三路文件合并"
19653
19654#: command-list.h:124
19655msgid "Run a merge for files needing merging"
19656msgstr "对于需要合并的文件执行合并"
19657
19658#: command-list.h:125
19659msgid "The standard helper program to use with git-merge-index"
19660msgstr "与 git-merge-index 一起使用的标准向导程序"
19661
19662#: command-list.h:126
19663msgid "Run merge conflict resolution tools to resolve merge conflicts"
19664msgstr "运行合并冲突解决工具以解决合并冲突"
19665
19666#: command-list.h:127
19667msgid "Show three-way merge without touching index"
19668msgstr "显示三路合并而不动索引"
19669
19670#: command-list.h:128
4c27fcb5
JX
19671msgid "Write and verify multi-pack-indexes"
19672msgstr "写入和校验多包索引"
19673
19674#: command-list.h:129
fd8cb379
JX
19675msgid "Creates a tag object"
19676msgstr "创建一个标签对象"
19677
4c27fcb5 19678#: command-list.h:130
fd8cb379
JX
19679msgid "Build a tree-object from ls-tree formatted text"
19680msgstr "基于 ls-tree 的格式化文本创建一个树对象"
19681
4c27fcb5 19682#: command-list.h:131
8ada9598 19683msgid "Move or rename a file, a directory, or a symlink"
81809b99 19684msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598 19685
fd8cb379 19686# 查找给定版本的符号名称
4c27fcb5 19687#: command-list.h:132
fd8cb379
JX
19688msgid "Find symbolic names for given revs"
19689msgstr "查找给定版本的符号名称"
19690
4c27fcb5 19691#: command-list.h:133
fd8cb379
JX
19692msgid "Add or inspect object notes"
19693msgstr "添加或检查对象注释"
19694
4c27fcb5 19695#: command-list.h:134
fd8cb379
JX
19696msgid "Import from and submit to Perforce repositories"
19697msgstr "导入和提交到 Perforce 仓库中"
19698
4c27fcb5 19699#: command-list.h:135
fd8cb379
JX
19700msgid "Create a packed archive of objects"
19701msgstr "创建对象的存档包"
19702
4c27fcb5 19703#: command-list.h:136
fd8cb379
JX
19704msgid "Find redundant pack files"
19705msgstr "查找冗余的包文件"
19706
4c27fcb5 19707#: command-list.h:137
fd8cb379
JX
19708msgid "Pack heads and tags for efficient repository access"
19709msgstr "打包头和标签以实现高效的仓库访问"
19710
4c27fcb5 19711#: command-list.h:138
fd8cb379
JX
19712msgid "Routines to help parsing remote repository access parameters"
19713msgstr "帮助解析远程仓库访问参数的例程"
19714
4c27fcb5 19715#: command-list.h:139
fd8cb379
JX
19716msgid "Compute unique ID for a patch"
19717msgstr "计算一个补丁的唯一ID"
19718
4c27fcb5 19719#: command-list.h:140
fd8cb379
JX
19720msgid "Prune all unreachable objects from the object database"
19721msgstr "删除对象库中所有不可达对象"
19722
4c27fcb5 19723#: command-list.h:141
fd8cb379
JX
19724msgid "Remove extra objects that are already in pack files"
19725msgstr "删除已经在包文件中的多余对象"
19726
4c27fcb5 19727#: command-list.h:142
2e8451e8 19728msgid "Fetch from and integrate with another repository or a local branch"
160fb2b2 19729msgstr "获取并整合另外的仓库或一个本地分支"
8ada9598 19730
4c27fcb5 19731#: command-list.h:143
8ada9598 19732msgid "Update remote refs along with associated objects"
81809b99 19733msgstr "更新远程引用和相关的对象"
8ada9598 19734
4c27fcb5 19735#: command-list.h:144
fd8cb379
JX
19736msgid "Applies a quilt patchset onto the current branch"
19737msgstr "将一个 quilt 补丁集应用到当前分支。"
19738
4c27fcb5 19739#: command-list.h:145
c1ac5258
JX
19740msgid "Compare two commit ranges (e.g. two versions of a branch)"
19741msgstr "比较两个提交范围(如一个分支的两个版本)"
19742
4c27fcb5 19743#: command-list.h:146
fd8cb379
JX
19744msgid "Reads tree information into the index"
19745msgstr "将树信息读取到索引"
19746
4c27fcb5 19747#: command-list.h:147
3495628d
JX
19748msgid "Reapply commits on top of another base tip"
19749msgstr "在另一个分支上重新应用提交"
8ada9598 19750
4c27fcb5 19751#: command-list.h:148
fd8cb379
JX
19752msgid "Receive what is pushed into the repository"
19753msgstr "接收推送到仓库中的对象"
19754
4c27fcb5 19755#: command-list.h:149
fd8cb379
JX
19756msgid "Manage reflog information"
19757msgstr "管理 reflog 信息"
19758
4c27fcb5 19759#: command-list.h:150
fd8cb379
JX
19760msgid "Manage set of tracked repositories"
19761msgstr "管理已跟踪仓库"
19762
4c27fcb5 19763#: command-list.h:151
fd8cb379
JX
19764msgid "Pack unpacked objects in a repository"
19765msgstr "打包仓库中未打包对象"
19766
4c27fcb5 19767#: command-list.h:152
fd8cb379
JX
19768msgid "Create, list, delete refs to replace objects"
19769msgstr "创建、列出、删除对象替换引用"
19770
4c27fcb5 19771#: command-list.h:153
fd8cb379
JX
19772msgid "Generates a summary of pending changes"
19773msgstr "生成待定更改的摘要"
19774
4c27fcb5 19775#: command-list.h:154
fd8cb379
JX
19776msgid "Reuse recorded resolution of conflicted merges"
19777msgstr "重用冲突合并的解决方案记录"
19778
4c27fcb5 19779#: command-list.h:155
8ada9598 19780msgid "Reset current HEAD to the specified state"
4375c10e 19781msgstr "重置当前 HEAD 到指定状态"
8ada9598 19782
4c27fcb5 19783#: command-list.h:156
fd8cb379
JX
19784msgid "Revert some existing commits"
19785msgstr "回退一些现存提交"
19786
4c27fcb5 19787#: command-list.h:157
fd8cb379
JX
19788msgid "Lists commit objects in reverse chronological order"
19789msgstr "按时间顺序列出提交对象"
19790
4c27fcb5 19791#: command-list.h:158
fd8cb379
JX
19792msgid "Pick out and massage parameters"
19793msgstr "选出并处理参数"
19794
4c27fcb5 19795#: command-list.h:159
8ada9598 19796msgid "Remove files from the working tree and from the index"
81809b99 19797msgstr "从工作区和索引中删除文件"
8ada9598 19798
4c27fcb5 19799#: command-list.h:160
fd8cb379
JX
19800msgid "Send a collection of patches as emails"
19801msgstr "通过电子邮件发送一组补丁"
19802
4c27fcb5 19803#: command-list.h:161
fd8cb379
JX
19804msgid "Push objects over Git protocol to another repository"
19805msgstr "使用 Git 协议推送对象到另一个仓库"
19806
4c27fcb5 19807#: command-list.h:162
fd8cb379
JX
19808msgid "Restricted login shell for Git-only SSH access"
19809msgstr "只允许 Git SSH 访问的受限登录shell"
19810
4c27fcb5 19811#: command-list.h:163
fd8cb379
JX
19812msgid "Summarize 'git log' output"
19813msgstr "'git log' 输出摘要"
19814
4c27fcb5 19815#: command-list.h:164
8ada9598 19816msgid "Show various types of objects"
81809b99 19817msgstr "显示各种类型的对象"
8ada9598 19818
4c27fcb5 19819#: command-list.h:165
fd8cb379
JX
19820msgid "Show branches and their commits"
19821msgstr "显示分支和提交"
19822
4c27fcb5 19823#: command-list.h:166
fd8cb379
JX
19824msgid "Show packed archive index"
19825msgstr "显示打包归档索引"
19826
4c27fcb5 19827#: command-list.h:167
fd8cb379
JX
19828msgid "List references in a local repository"
19829msgstr "显示本地仓库中的引用"
19830
4c27fcb5 19831#: command-list.h:168
fd8cb379
JX
19832msgid "Git's i18n setup code for shell scripts"
19833msgstr "为 shell 脚本准备的 Git 国际化设置代码"
19834
4c27fcb5 19835#: command-list.h:169
fd8cb379
JX
19836msgid "Common Git shell script setup code"
19837msgstr "常用的 Git shell 脚本设置代码"
19838
4c27fcb5 19839#: command-list.h:170
fd8cb379
JX
19840msgid "Stash the changes in a dirty working directory away"
19841msgstr "贮藏脏工作区中的修改"
19842
4c27fcb5 19843#: command-list.h:171
fd8cb379
JX
19844msgid "Add file contents to the staging area"
19845msgstr "将文件内容添加到索引"
19846
4c27fcb5 19847#: command-list.h:172
8ada9598 19848msgid "Show the working tree status"
81809b99 19849msgstr "显示工作区状态"
8ada9598 19850
4c27fcb5 19851#: command-list.h:173
fd8cb379
JX
19852msgid "Remove unnecessary whitespace"
19853msgstr "删除不必要的空白字符"
19854
4c27fcb5 19855#: command-list.h:174
fd8cb379
JX
19856msgid "Initialize, update or inspect submodules"
19857msgstr "初始化、更新或检查子模组"
19858
4c27fcb5 19859#: command-list.h:175
fd8cb379
JX
19860msgid "Bidirectional operation between a Subversion repository and Git"
19861msgstr "Subersion 仓库和 Git 之间的双向操作"
19862
4c27fcb5 19863#: command-list.h:176
fd8cb379
JX
19864msgid "Read, modify and delete symbolic refs"
19865msgstr "读取、修改和删除符号引用"
19866
4c27fcb5 19867#: command-list.h:177
8ada9598 19868msgid "Create, list, delete or verify a tag object signed with GPG"
4375c10e 19869msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
8ada9598 19870
4c27fcb5 19871#: command-list.h:178
fd8cb379
JX
19872msgid "Creates a temporary file with a blob's contents"
19873msgstr "用 blob 数据对象的内容创建一个临时文件"
220c313c 19874
4c27fcb5 19875#: command-list.h:179
fd8cb379
JX
19876msgid "Unpack objects from a packed archive"
19877msgstr "从打包文件中解压缩对象"
220c313c 19878
4c27fcb5 19879#: command-list.h:180
fd8cb379
JX
19880msgid "Register file contents in the working tree to the index"
19881msgstr "将工作区的文件内容注册到索引"
220c313c 19882
4c27fcb5 19883#: command-list.h:181
fd8cb379
JX
19884msgid "Update the object name stored in a ref safely"
19885msgstr "安全地更新存储于引用中的对象名称"
220c313c 19886
4c27fcb5 19887#: command-list.h:182
fd8cb379
JX
19888msgid "Update auxiliary info file to help dumb servers"
19889msgstr "更新辅助信息文件以帮助哑协议服务"
19890
4c27fcb5 19891#: command-list.h:183
fd8cb379
JX
19892msgid "Send archive back to git-archive"
19893msgstr "将存档发送回 git-archive"
19894
4c27fcb5 19895#: command-list.h:184
fd8cb379
JX
19896msgid "Send objects packed back to git-fetch-pack"
19897msgstr "将对象压缩包发送回 git-fetch-pack"
19898
4c27fcb5 19899#: command-list.h:185
fd8cb379
JX
19900msgid "Show a Git logical variable"
19901msgstr "显示一个Git逻辑变量"
19902
4c27fcb5 19903#: command-list.h:186
fd8cb379
JX
19904msgid "Check the GPG signature of commits"
19905msgstr "检查 GPG 提交签名"
19906
4c27fcb5 19907#: command-list.h:187
fd8cb379
JX
19908msgid "Validate packed Git archive files"
19909msgstr "校验打包的Git存仓文件"
19910
4c27fcb5 19911#: command-list.h:188
fd8cb379
JX
19912msgid "Check the GPG signature of tags"
19913msgstr "检查标签的 GPG 签名"
19914
4c27fcb5 19915#: command-list.h:189
fd8cb379
JX
19916msgid "Git web interface (web frontend to Git repositories)"
19917msgstr "Git web 界面(Git 仓库的 web 前端)"
19918
4c27fcb5 19919#: command-list.h:190
fd8cb379
JX
19920msgid "Show logs with difference each commit introduces"
19921msgstr "显示每一个提交引入的差异日志"
19922
4c27fcb5 19923#: command-list.h:191
fd8cb379
JX
19924msgid "Manage multiple working trees"
19925msgstr "管理多个工作区"
19926
4c27fcb5 19927#: command-list.h:192
fd8cb379
JX
19928msgid "Create a tree object from the current index"
19929msgstr "从当前索引创建一个树对象"
19930
4c27fcb5 19931#: command-list.h:193
fd8cb379
JX
19932msgid "Defining attributes per path"
19933msgstr "定义路径的属性"
19934
4c27fcb5 19935#: command-list.h:194
fd8cb379
JX
19936msgid "Git command-line interface and conventions"
19937msgstr "Git 命令行界面和约定"
19938
4c27fcb5 19939#: command-list.h:195
fd8cb379
JX
19940msgid "A Git core tutorial for developers"
19941msgstr "面向开发人员的 Git 核心教程"
19942
4c27fcb5 19943#: command-list.h:196
fd8cb379
JX
19944msgid "Git for CVS users"
19945msgstr "适合 CVS 用户的 Git 帮助"
19946
4c27fcb5 19947#: command-list.h:197
fd8cb379
JX
19948msgid "Tweaking diff output"
19949msgstr "调整差异输出"
19950
4c27fcb5 19951#: command-list.h:198
fd8cb379
JX
19952msgid "A useful minimum set of commands for Everyday Git"
19953msgstr "每一天 Git 的一组有用的最小命令集合"
19954
4c27fcb5 19955#: command-list.h:199
fd8cb379
JX
19956msgid "A Git Glossary"
19957msgstr "Git 词汇表"
19958
4c27fcb5 19959#: command-list.h:200
fd8cb379
JX
19960msgid "Hooks used by Git"
19961msgstr "Git 使用的钩子"
19962
4c27fcb5 19963#: command-list.h:201
fd8cb379
JX
19964msgid "Specifies intentionally untracked files to ignore"
19965msgstr "忽略指定的未跟踪文件"
19966
4c27fcb5 19967#: command-list.h:202
fd8cb379
JX
19968msgid "Defining submodule properties"
19969msgstr "定义子模组属性"
19970
4c27fcb5 19971#: command-list.h:203
fd8cb379
JX
19972msgid "Git namespaces"
19973msgstr "Git 名字空间"
19974
4c27fcb5 19975#: command-list.h:204
fd8cb379
JX
19976msgid "Git Repository Layout"
19977msgstr "Git 仓库布局"
19978
4c27fcb5 19979#: command-list.h:205
fd8cb379
JX
19980msgid "Specifying revisions and ranges for Git"
19981msgstr "指定 Git 的版本和版本范围"
19982
4c27fcb5 19983#: command-list.h:206
fd8cb379
JX
19984msgid "A tutorial introduction to Git: part two"
19985msgstr "一个 Git 教程:第二部分"
19986
4c27fcb5 19987#: command-list.h:207
fd8cb379
JX
19988msgid "A tutorial introduction to Git"
19989msgstr "一个 Git 教程"
19990
4c27fcb5 19991#: command-list.h:208
fd8cb379
JX
19992msgid "An overview of recommended workflows with Git"
19993msgstr "Git 推荐的工作流概览"
220c313c 19994
06991777
JX
19995#: list-objects-filter-options.h:63
19996msgid "args"
19997msgstr "参数"
19998
19999#: list-objects-filter-options.h:64
20000msgid "object filtering"
20001msgstr "对象过滤"
20002
4c27fcb5 20003#: rerere.h:44
220c313c
JX
20004msgid "update the index with reused conflict resolution if possible"
20005msgstr "如果可能,重用冲突解决更新索引"
20006
5c57d762 20007#: git-bisect.sh:54
b694fbb1
JX
20008msgid "You need to start by \"git bisect start\""
20009msgstr "您需要执行 \"git bisect start\" 来开始"
20010
90e6ef53 20011# 译者:注意保持句尾空格
c04f5ac3
JX
20012#. TRANSLATORS: Make sure to include [Y] and [n] in your
20013#. translation. The program will only accept English input
20014#. at this point.
5c57d762 20015#: git-bisect.sh:60
c04f5ac3
JX
20016msgid "Do you want me to do it for you [Y/n]? "
20017msgstr "您想让我为您这样做么[Y/n]? "
20018
06991777 20019#: git-bisect.sh:101
c04f5ac3
JX
20020#, sh-format
20021msgid "Bad rev input: $arg"
9a4b694c 20022msgstr "坏的输入版本:$arg"
c04f5ac3 20023
06991777 20024#: git-bisect.sh:121
5c57d762
JX
20025#, sh-format
20026msgid "Bad rev input: $bisected_head"
9a4b694c 20027msgstr "坏的输入版本:$bisected_head"
c04f5ac3 20028
06991777 20029#: git-bisect.sh:130
c04f5ac3
JX
20030#, sh-format
20031msgid "Bad rev input: $rev"
9a4b694c 20032msgstr "坏的输入版本:$rev"
c04f5ac3 20033
06991777 20034#: git-bisect.sh:139
1b7f4a34
JX
20035#, sh-format
20036msgid "'git bisect $TERM_BAD' can take only one argument."
20037msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
20038
06991777 20039#: git-bisect.sh:209
c04f5ac3
JX
20040msgid "No logfile given"
20041msgstr "未提供日志文件"
20042
06991777 20043#: git-bisect.sh:210
c04f5ac3
JX
20044#, sh-format
20045msgid "cannot read $file for replaying"
20046msgstr "不能读取 $file 来重放"
20047
06991777 20048#: git-bisect.sh:232
c04f5ac3
JX
20049msgid "?? what are you talking about?"
20050msgstr "?? 您在说什么?"
20051
06991777 20052#: git-bisect.sh:241
5809aa05
JX
20053msgid "bisect run failed: no command provided."
20054msgstr "二分查找运行失败:没有提供命令。"
20055
06991777 20056#: git-bisect.sh:246
b694fbb1
JX
20057#, sh-format
20058msgid "running $command"
20059msgstr "运行 $command"
20060
06991777 20061#: git-bisect.sh:253
b694fbb1
JX
20062#, sh-format
20063msgid ""
20064"bisect run failed:\n"
20065"exit code $res from '$command' is < 0 or >= 128"
20066msgstr ""
20067"二分查找运行失败:\n"
07432cef 20068"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 20069
06991777 20070#: git-bisect.sh:279
b694fbb1
JX
20071msgid "bisect run cannot continue any more"
20072msgstr "二分查找不能继续运行"
20073
06991777 20074#: git-bisect.sh:285
b694fbb1
JX
20075#, sh-format
20076msgid ""
20077"bisect run failed:\n"
20078"'bisect_state $state' exited with error code $res"
20079msgstr ""
20080"二分查找运行失败:\n"
20081"'bisect_state $state' 退出码为 $res"
20082
06991777 20083#: git-bisect.sh:292
b694fbb1
JX
20084msgid "bisect run success"
20085msgstr "二分查找运行成功"
c04f5ac3 20086
06991777
JX
20087#: git-bisect.sh:300
20088msgid "We are not bisecting."
20089msgstr "我们没有在二分查找。"
94550ed3 20090
5c57d762
JX
20091#: git-merge-octopus.sh:46
20092msgid ""
20093"Error: Your local changes to the following files would be overwritten by "
20094"merge"
20095msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
20096
20097#: git-merge-octopus.sh:61
20098msgid "Automated merge did not work."
9a4b694c 20099msgstr "自动合并未生效。"
5c57d762
JX
20100
20101#: git-merge-octopus.sh:62
a0b6b246 20102msgid "Should not be doing an octopus."
5c57d762
JX
20103msgstr "不应该执行章鱼式合并。"
20104
20105#: git-merge-octopus.sh:73
20106#, sh-format
20107msgid "Unable to find common commit with $pretty_name"
20108msgstr "无法找到和 $pretty_name 的基线提交"
20109
20110#: git-merge-octopus.sh:77
20111#, sh-format
6937cb4e 20112msgid "Already up to date with $pretty_name"
5c57d762
JX
20113msgstr "已经和 $pretty_name 保持一致"
20114
20115#: git-merge-octopus.sh:89
20116#, sh-format
20117msgid "Fast-forwarding to: $pretty_name"
20118msgstr "快进至:$pretty_name"
20119
20120#: git-merge-octopus.sh:97
20121#, sh-format
20122msgid "Trying simple merge with $pretty_name"
20123msgstr "尝试和 $pretty_name 的简单合并"
20124
20125#: git-merge-octopus.sh:102
20126msgid "Simple merge did not work, trying automatic merge."
9a4b694c 20127msgstr "简单合并未生效,尝试自动合并。"
5c57d762 20128
06991777 20129#: git-legacy-rebase.sh:445
5c57d762
JX
20130#, sh-format
20131msgid "Could not move back to $head_name"
20132msgstr "无法移回 $head_name"
20133
06991777 20134#: git-legacy-rebase.sh:471
649900bc
JX
20135#, sh-format
20136msgid ""
20137"It seems that there is already a $state_dir_base directory, and\n"
20138"I wonder if you are in the middle of another rebase. If that is the\n"
20139"case, please try\n"
20140"\t$cmd_live_rebase\n"
20141"If that is not the case, please\n"
20142"\t$cmd_clear_stale_rebase\n"
20143"and run me again. I am stopping in case you still have something\n"
20144"valuable there."
20145msgstr ""
98b2761d
JX
20146"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
20147"过程中。 如果是这样,请执行\n"
649900bc
JX
20148"\t$cmd_live_rebase\n"
20149"如果不是这样,请执行\n"
20150"\t$cmd_clear_stale_rebase\n"
98b2761d 20151"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
649900bc 20152
06991777
JX
20153#: git-legacy-rebase.sh:523
20154msgid ""
20155"fatal: cannot combine am options with either interactive or merge options"
20156msgstr "致命错误:不能将 am 选项和交互或合并选项组合一起"
20157
20158#: git-legacy-rebase.sh:530
20159msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
20160msgstr "致命错误:不能将 '--signoff' 和 '--preserve-merges' 组合一起"
20161
20162#: git-legacy-rebase.sh:541
20163msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
20164msgstr "致命错误:不能将 '--preserve-merges' 和 '--rebase-merges' 组合一起"
20165
20166#: git-legacy-rebase.sh:550
20167msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
20168msgstr "致命错误:不能将 '--rebase-merges' 和 '--strategy-option' 组合一起"
20169
20170#: git-legacy-rebase.sh:552
20171msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
20172msgstr "致命错误:不能将 '--rebase-merges' 和 '--strategy' 组合一起"
c1ac5258 20173
06991777 20174#: git-legacy-rebase.sh:578
649900bc 20175#, sh-format
5809aa05
JX
20176msgid "invalid upstream '$upstream_name'"
20177msgstr "无效的上游 '$upstream_name'"
649900bc 20178
06991777 20179#: git-legacy-rebase.sh:602
649900bc
JX
20180#, sh-format
20181msgid "$onto_name: there are more than one merge bases"
20182msgstr "$onto_name: 有一个以上的合并基准"
20183
06991777 20184#: git-legacy-rebase.sh:605 git-legacy-rebase.sh:609
649900bc
JX
20185#, sh-format
20186msgid "$onto_name: there is no merge base"
20187msgstr "$onto_name: 没有合并基准"
20188
06991777 20189#: git-legacy-rebase.sh:614
649900bc
JX
20190#, sh-format
20191msgid "Does not point to a valid commit: $onto_name"
20192msgstr "没有指向一个有效的提交:$onto_name"
20193
06991777 20194#: git-legacy-rebase.sh:640
649900bc 20195#, sh-format
5809aa05 20196msgid "fatal: no such branch/commit '$branch_name'"
06991777 20197msgstr "致命错误:无此分支/提交 '$branch_name'"
649900bc 20198
06991777 20199#: git-legacy-rebase.sh:678
2e8451e8
JX
20200#, sh-format
20201msgid "Created autostash: $stash_abbrev"
20202msgstr "创建了 autostash: $stash_abbrev"
20203
06991777 20204#: git-legacy-rebase.sh:707
649900bc
JX
20205#, sh-format
20206msgid "Current branch $branch_name is up to date."
20207msgstr "当前分支 $branch_name 是最新的。"
20208
06991777 20209#: git-legacy-rebase.sh:717
649900bc
JX
20210#, sh-format
20211msgid "Current branch $branch_name is up to date, rebase forced."
20212msgstr "当前分支 $branch_name 是最新的,强制变基。"
20213
06991777 20214#: git-legacy-rebase.sh:731
4c27fcb5
JX
20215#, sh-format
20216msgid "Changes to $onto:"
20217msgstr "到 $onto 的变更:"
20218
06991777 20219#: git-legacy-rebase.sh:733
649900bc
JX
20220#, sh-format
20221msgid "Changes from $mb to $onto:"
4c27fcb5 20222msgstr "从 $mb 到 $onto 的变更:"
649900bc 20223
06991777 20224#: git-legacy-rebase.sh:743
649900bc
JX
20225#, sh-format
20226msgid "Fast-forwarded $branch_name to $onto_name."
20227msgstr "快进 $branch_name 至 $onto_name。"
20228
06991777
JX
20229#: git-legacy-rebase.sh:757
20230msgid "First, rewinding head to replay your work on top of it..."
20231msgstr "首先,回退分支以便在上面重放您的工作..."
20232
20233#: git-stash.sh:75
c04f5ac3
JX
20234msgid "git stash clear with parameters is unimplemented"
20235msgstr "git stash clear 不支持参数"
20236
06991777 20237#: git-stash.sh:125
c04f5ac3
JX
20238msgid "You do not have the initial commit yet"
20239msgstr "您尚未建立初始提交"
20240
06991777 20241#: git-stash.sh:140
c04f5ac3 20242msgid "Cannot save the current index state"
90e6ef53 20243msgstr "无法保存当前索引状态"
c04f5ac3 20244
06991777 20245#: git-stash.sh:155
a0b6b246
JX
20246msgid "Cannot save the untracked files"
20247msgstr "无法保存未跟踪文件"
20248
06991777 20249#: git-stash.sh:175 git-stash.sh:188
c04f5ac3
JX
20250msgid "Cannot save the current worktree state"
20251msgstr "无法保存当前工作区状态"
20252
06991777 20253#: git-stash.sh:192
c04f5ac3 20254msgid "No changes selected"
90e6ef53 20255msgstr "没有选择变更"
c04f5ac3 20256
06991777 20257#: git-stash.sh:195
c04f5ac3 20258msgid "Cannot remove temporary index (can't happen)"
90e6ef53 20259msgstr "无法删除临时索引(不应发生)"
c04f5ac3 20260
06991777 20261#: git-stash.sh:208
c04f5ac3
JX
20262msgid "Cannot record working tree state"
20263msgstr "不能记录工作区状态"
20264
06991777 20265#: git-stash.sh:246
2e8451e8
JX
20266#, sh-format
20267msgid "Cannot update $ref_stash with $w_commit"
20268msgstr "无法用 $w_commit 更新 $ref_stash"
20269
06991777 20270#: git-stash.sh:298
b694fbb1 20271#, sh-format
5809aa05
JX
20272msgid "error: unknown option for 'stash push': $option"
20273msgstr "错误:'stash push' 的未知选项:$option"
b694fbb1 20274
06991777 20275#: git-stash.sh:312
a0b6b246
JX
20276msgid "Can't use --patch and --include-untracked or --all at the same time"
20277msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
20278
06991777 20279#: git-stash.sh:320
c04f5ac3
JX
20280msgid "No local changes to save"
20281msgstr "没有要保存的本地修改"
20282
06991777 20283#: git-stash.sh:325
c04f5ac3 20284msgid "Cannot initialize stash"
a4f16749 20285msgstr "无法初始化贮藏"
c04f5ac3 20286
06991777 20287#: git-stash.sh:329
c04f5ac3
JX
20288msgid "Cannot save the current status"
20289msgstr "无法保存当前状态"
20290
06991777 20291#: git-stash.sh:330
5c57d762
JX
20292#, sh-format
20293msgid "Saved working directory and index state $stash_msg"
20294msgstr "保存工作目录和索引状态 $stash_msg"
20295
06991777 20296#: git-stash.sh:359
c04f5ac3
JX
20297msgid "Cannot remove worktree changes"
20298msgstr "无法删除工作区变更"
20299
06991777 20300#: git-stash.sh:507
7aea43ff
JX
20301#, sh-format
20302msgid "unknown option: $opt"
20303msgstr "未知选项: $opt"
20304
06991777 20305#: git-stash.sh:520
a4f16749
JX
20306msgid "No stash entries found."
20307msgstr "未发现贮藏条目。"
c04f5ac3 20308
06991777 20309#: git-stash.sh:527
c04f5ac3
JX
20310#, sh-format
20311msgid "Too many revisions specified: $REV"
90e6ef53 20312msgstr "指定了太多的版本:$REV"
c04f5ac3 20313
06991777 20314#: git-stash.sh:542
c04f5ac3 20315#, sh-format
220c313c
JX
20316msgid "$reference is not a valid reference"
20317msgstr "$reference 不是一个有效的引用"
c04f5ac3 20318
06991777 20319#: git-stash.sh:570
c04f5ac3
JX
20320#, sh-format
20321msgid "'$args' is not a stash-like commit"
a4f16749 20322msgstr "'$args' 不是贮藏式提交"
c04f5ac3 20323
06991777 20324#: git-stash.sh:581
c04f5ac3
JX
20325#, sh-format
20326msgid "'$args' is not a stash reference"
a4f16749 20327msgstr "'$args' 不是一个贮藏引用"
c04f5ac3 20328
06991777 20329#: git-stash.sh:589
c04f5ac3 20330msgid "unable to refresh index"
90e6ef53 20331msgstr "无法刷新索引"
c04f5ac3 20332
06991777 20333#: git-stash.sh:593
c04f5ac3 20334msgid "Cannot apply a stash in the middle of a merge"
a4f16749 20335msgstr "无法在合并过程应用贮藏"
c04f5ac3 20336
06991777 20337#: git-stash.sh:601
c04f5ac3 20338msgid "Conflicts in index. Try without --index."
90e6ef53 20339msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3 20340
06991777 20341#: git-stash.sh:603
c04f5ac3 20342msgid "Could not save index tree"
90e6ef53 20343msgstr "不能保存索引树"
c04f5ac3 20344
06991777 20345#: git-stash.sh:612
a4f16749
JX
20346msgid "Could not restore untracked files from stash entry"
20347msgstr "无法从贮藏条目中恢复未跟踪文件"
a0b6b246 20348
06991777 20349#: git-stash.sh:637
c04f5ac3 20350msgid "Cannot unstage modified files"
160fb2b2 20351msgstr "无法将修改的文件取消暂存"
c04f5ac3 20352
06991777 20353#: git-stash.sh:652
b694fbb1 20354msgid "Index was not unstashed."
a4f16749 20355msgstr "索引未从贮藏中恢复。"
b694fbb1 20356
06991777 20357#: git-stash.sh:666
a4f16749
JX
20358msgid "The stash entry is kept in case you need it again."
20359msgstr "贮藏条目被保留以备您再次需要。"
5c57d762 20360
06991777 20361#: git-stash.sh:675
c04f5ac3
JX
20362#, sh-format
20363msgid "Dropped ${REV} ($s)"
20364msgstr "丢弃了 ${REV} ($s)"
20365
06991777 20366#: git-stash.sh:676
c04f5ac3
JX
20367#, sh-format
20368msgid "${REV}: Could not drop stash entry"
a4f16749 20369msgstr "${REV}:无法丢弃贮藏条目"
c04f5ac3 20370
06991777 20371#: git-stash.sh:684
c04f5ac3
JX
20372msgid "No branch name specified"
20373msgstr "未指定分支名"
20374
06991777 20375#: git-stash.sh:763
c04f5ac3
JX
20376msgid "(To restore them type \"git stash apply\")"
20377msgstr "(为恢复数据输入 \"git stash apply\")"
20378
4c27fcb5 20379#: git-submodule.sh:198
2e8451e8
JX
20380msgid "Relative path can only be used from the toplevel of the working tree"
20381msgstr "只能在工作区的顶级目录中使用相对路径"
20382
4c27fcb5 20383#: git-submodule.sh:208
c04f5ac3
JX
20384#, sh-format
20385msgid "repo URL: '$repo' must be absolute or begin with ./|../"
4375c10e 20386msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
c04f5ac3 20387
4c27fcb5 20388#: git-submodule.sh:227
c04f5ac3 20389#, sh-format
170e9899
JX
20390msgid "'$sm_path' already exists in the index"
20391msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 20392
4c27fcb5 20393#: git-submodule.sh:230
1a79b2f1
JX
20394#, sh-format
20395msgid "'$sm_path' already exists in the index and is not a submodule"
20396msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
20397
4c27fcb5 20398#: git-submodule.sh:236
b694fbb1
JX
20399#, sh-format
20400msgid ""
20401"The following path is ignored by one of your .gitignore files:\n"
20402"$sm_path\n"
20403"Use -f if you really want to add it."
20404msgstr ""
20405"以下路径被您的一个 .gitignore 文件所忽略:\n"
20406"$sm_path\n"
20407"如果您确实想添加它,使用 -f 参数。"
20408
4c27fcb5 20409#: git-submodule.sh:259
b694fbb1
JX
20410#, sh-format
20411msgid "Adding existing repo at '$sm_path' to the index"
160fb2b2 20412msgstr "添加位于 '$sm_path' 的现存仓库到索引"
b694fbb1 20413
4c27fcb5 20414#: git-submodule.sh:261
c04f5ac3 20415#, sh-format
170e9899 20416msgid "'$sm_path' already exists and is not a valid git repo"
160fb2b2 20417msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
c04f5ac3 20418
4c27fcb5 20419#: git-submodule.sh:269
07432cef
WS
20420#, sh-format
20421msgid "A git directory for '$sm_name' is found locally with remote(s):"
160fb2b2 20422msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
07432cef 20423
4c27fcb5 20424#: git-submodule.sh:271
07432cef
WS
20425#, sh-format
20426msgid ""
5c57d762
JX
20427"If you want to reuse this local git directory instead of cloning again from\n"
20428" $realrepo\n"
20429"use the '--force' option. If the local git directory is not the correct "
20430"repo\n"
07432cef
WS
20431"or you are unsure what this means choose another name with the '--name' "
20432"option."
5c57d762
JX
20433msgstr ""
20434"如果您想要重用这个本地 git 目录而非重新克隆自\n"
20435" $realrepo\n"
20436"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
20437"或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
07432cef 20438
4c27fcb5 20439#: git-submodule.sh:277
07432cef
WS
20440#, sh-format
20441msgid "Reactivating local git directory for submodule '$sm_name'."
20442msgstr "激活本地 git 目录到子模组 '$sm_name'。"
20443
4c27fcb5 20444#: git-submodule.sh:289
c04f5ac3 20445#, sh-format
170e9899
JX
20446msgid "Unable to checkout submodule '$sm_path'"
20447msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 20448
4c27fcb5 20449#: git-submodule.sh:294
c04f5ac3 20450#, sh-format
170e9899
JX
20451msgid "Failed to add submodule '$sm_path'"
20452msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 20453
4c27fcb5 20454#: git-submodule.sh:303
c04f5ac3 20455#, sh-format
170e9899
JX
20456msgid "Failed to register submodule '$sm_path'"
20457msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 20458
4c27fcb5 20459#: git-submodule.sh:563
c04f5ac3 20460#, sh-format
2e8451e8
JX
20461msgid "Unable to find current revision in submodule path '$displaypath'"
20462msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 20463
4c27fcb5 20464#: git-submodule.sh:573
c04f5ac3 20465#, sh-format
170e9899
JX
20466msgid "Unable to fetch in submodule path '$sm_path'"
20467msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 20468
4c27fcb5 20469#: git-submodule.sh:578
5c57d762
JX
20470#, sh-format
20471msgid ""
20472"Unable to find current ${remote_name}/${branch} revision in submodule path "
20473"'$sm_path'"
9a4b694c 20474msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
5c57d762 20475
4c27fcb5 20476#: git-submodule.sh:596
2e8451e8
JX
20477#, sh-format
20478msgid "Unable to fetch in submodule path '$displaypath'"
20479msgstr "无法在子模组路径 '$displaypath' 中获取"
20480
4c27fcb5 20481#: git-submodule.sh:602
5c57d762
JX
20482#, sh-format
20483msgid ""
20484"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
20485"Direct fetching of that commit failed."
a0b6b246
JX
20486msgstr ""
20487"获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
5c57d762 20488
4c27fcb5 20489#: git-submodule.sh:609
6c94aba5
JX
20490#, sh-format
20491msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
20492msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
20493
4c27fcb5 20494#: git-submodule.sh:610
c04f5ac3 20495#, sh-format
6c94aba5
JX
20496msgid "Submodule path '$displaypath': checked out '$sha1'"
20497msgstr "子模组路径 '$displaypath':检出 '$sha1'"
20498
4c27fcb5 20499#: git-submodule.sh:614
6c94aba5 20500#, sh-format
2e8451e8
JX
20501msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
20502msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 20503
4c27fcb5 20504#: git-submodule.sh:615
c04f5ac3 20505#, sh-format
2e8451e8
JX
20506msgid "Submodule path '$displaypath': rebased into '$sha1'"
20507msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 20508
4c27fcb5 20509#: git-submodule.sh:620
c04f5ac3 20510#, sh-format
2e8451e8
JX
20511msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
20512msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 20513
4c27fcb5 20514#: git-submodule.sh:621
c04f5ac3 20515#, sh-format
2e8451e8
JX
20516msgid "Submodule path '$displaypath': merged in '$sha1'"
20517msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 20518
4c27fcb5 20519#: git-submodule.sh:626
c04f5ac3 20520#, sh-format
5b04ee3b
JX
20521msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
20522msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
c04f5ac3 20523
4c27fcb5 20524#: git-submodule.sh:627
c04f5ac3 20525#, sh-format
5b04ee3b 20526msgid "Submodule path '$displaypath': '$command $sha1'"
aef18cc6 20527msgstr "子模组 '$displaypath':'$command $sha1'"
c04f5ac3 20528
4c27fcb5 20529#: git-submodule.sh:658
2e8451e8
JX
20530#, sh-format
20531msgid "Failed to recurse into submodule path '$displaypath'"
20532msgstr "无法递归进子模组路径 '$displaypath'"
20533
4c27fcb5 20534#: git-submodule.sh:754
649900bc
JX
20535msgid "The --cached option cannot be used with the --files option"
20536msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1 20537
4c27fcb5 20538#: git-submodule.sh:806
b694fbb1
JX
20539#, sh-format
20540msgid "unexpected mode $mod_dst"
20541msgstr "意外的模式 $mod_dst"
c04f5ac3 20542
90e6ef53 20543# 译者:注意保持前导空格
4c27fcb5 20544#: git-submodule.sh:826
c04f5ac3 20545#, sh-format
2e8451e8
JX
20546msgid " Warn: $display_name doesn't contain commit $sha1_src"
20547msgstr " 警告:$display_name 未包含提交 $sha1_src"
c04f5ac3 20548
90e6ef53 20549# 译者:注意保持前导空格
4c27fcb5 20550#: git-submodule.sh:829
c04f5ac3 20551#, sh-format
2e8451e8
JX
20552msgid " Warn: $display_name doesn't contain commit $sha1_dst"
20553msgstr " 警告:$display_name 未包含提交 $sha1_dst"
c04f5ac3 20554
90e6ef53 20555# 译者:注意保持前导空格
4c27fcb5 20556#: git-submodule.sh:832
c04f5ac3 20557#, sh-format
2e8451e8
JX
20558msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
20559msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
c04f5ac3 20560
5b04ee3b
JX
20561#: git-parse-remote.sh:89
20562#, sh-format
20563msgid "See git-${cmd}(1) for details."
20564msgstr "详见 git-${cmd}(1)。"
5c57d762 20565
c1ac5258
JX
20566#: git-rebase--preserve-merges.sh:136
20567#, sh-format
20568msgid "Rebasing ($new_count/$total)"
20569msgstr "变基中($new_count/$total)"
20570
20571#: git-rebase--preserve-merges.sh:152
20572msgid ""
20573"\n"
20574"Commands:\n"
20575"p, pick <commit> = use commit\n"
20576"r, reword <commit> = use commit, but edit the commit message\n"
20577"e, edit <commit> = use commit, but stop for amending\n"
20578"s, squash <commit> = use commit, but meld into previous commit\n"
20579"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
20580"x, exec <commit> = run command (the rest of the line) using shell\n"
20581"d, drop <commit> = remove commit\n"
20582"l, label <label> = label current HEAD with a name\n"
20583"t, reset <label> = reset HEAD to a label\n"
20584"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
20585". create a merge commit using the original merge commit's\n"
20586". message (or the oneline, if no original merge commit was\n"
20587". specified). Use -c <commit> to reword the commit message.\n"
20588"\n"
20589"These lines can be re-ordered; they are executed from top to bottom.\n"
20590msgstr ""
20591"\n"
20592"命令:\n"
20593"p, pick <提交> = 使用提交\n"
20594"r, reword <提交> = 使用提交,但修改提交说明\n"
20595"e, edit <提交> = 使用提交,但停下来修补\n"
20596"s, squash <提交> = 使用提交,但融合到前一个提交\n"
20597"f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
20598"x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
20599"d, drop <提交> = 删除提交\n"
20600"l, label <标签> = 为当前 HEAD 打上标签\n"
20601"t, reset <标签> = 重置 HEAD 到该标签\n"
20602"m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n"
20603". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
20604". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
20605". -c <提交> 可以编辑提交说明。\n"
20606"\n"
20607"可以对这些行重新排序,将从上至下执行。\n"
20608
20609#: git-rebase--preserve-merges.sh:215
5c57d762
JX
20610#, sh-format
20611msgid ""
20612"You can amend the commit now, with\n"
20613"\n"
20614"\tgit commit --amend $gpg_sign_opt_quoted\n"
20615"\n"
20616"Once you are satisfied with your changes, run\n"
20617"\n"
20618"\tgit rebase --continue"
20619msgstr ""
20620"您现在可以修补这个提交,使用\n"
20621"\n"
20622"\tgit commit --amend $gpg_sign_opt_quoted\n"
20623"\n"
9a4b694c 20624"当您对变更感到满意,执行\n"
5c57d762
JX
20625"\n"
20626"\tgit rebase --continue"
20627
c1ac5258 20628#: git-rebase--preserve-merges.sh:240
5c57d762
JX
20629#, sh-format
20630msgid "$sha1: not a commit that can be picked"
20631msgstr "$sha1:不是一个可以被拣选的提交"
20632
c1ac5258 20633#: git-rebase--preserve-merges.sh:279
5c57d762
JX
20634#, sh-format
20635msgid "Invalid commit name: $sha1"
20636msgstr "无效的提交名:$sha1"
20637
c1ac5258 20638#: git-rebase--preserve-merges.sh:309
5c57d762
JX
20639msgid "Cannot write current commit's replacement sha1"
20640msgstr "不能写入当前提交的替代 sha1"
20641
c1ac5258 20642#: git-rebase--preserve-merges.sh:360
5c57d762
JX
20643#, sh-format
20644msgid "Fast-forward to $sha1"
20645msgstr "快进到 $sha1"
20646
c1ac5258 20647#: git-rebase--preserve-merges.sh:362
5c57d762
JX
20648#, sh-format
20649msgid "Cannot fast-forward to $sha1"
20650msgstr "不能快进到 $sha1"
20651
c1ac5258 20652#: git-rebase--preserve-merges.sh:371
5c57d762
JX
20653#, sh-format
20654msgid "Cannot move HEAD to $first_parent"
20655msgstr "不能移动 HEAD 到 $first_parent"
20656
c1ac5258 20657#: git-rebase--preserve-merges.sh:376
5c57d762
JX
20658#, sh-format
20659msgid "Refusing to squash a merge: $sha1"
20660msgstr "拒绝压缩一个合并:$sha1"
20661
c1ac5258 20662#: git-rebase--preserve-merges.sh:394
5c57d762
JX
20663#, sh-format
20664msgid "Error redoing merge $sha1"
20665msgstr "无法重做合并 $sha1"
20666
c1ac5258 20667#: git-rebase--preserve-merges.sh:403
5c57d762
JX
20668#, sh-format
20669msgid "Could not pick $sha1"
20670msgstr "不能拣选 $sha1"
20671
c1ac5258 20672#: git-rebase--preserve-merges.sh:412
5c57d762
JX
20673#, sh-format
20674msgid "This is the commit message #${n}:"
9a4b694c 20675msgstr "这是提交说明 #${n}:"
5c57d762 20676
c1ac5258 20677#: git-rebase--preserve-merges.sh:417
5c57d762
JX
20678#, sh-format
20679msgid "The commit message #${n} will be skipped:"
9a4b694c 20680msgstr "提交说明 #${n} 将被跳过:"
5c57d762 20681
c1ac5258 20682#: git-rebase--preserve-merges.sh:428
5c57d762
JX
20683#, sh-format
20684msgid "This is a combination of $count commit."
20685msgid_plural "This is a combination of $count commits."
20686msgstr[0] "这是一个 $count 个提交的组合。"
20687msgstr[1] "这是一个 $count 个提交的组合。"
20688
c1ac5258 20689#: git-rebase--preserve-merges.sh:437
5c57d762
JX
20690#, sh-format
20691msgid "Cannot write $fixup_msg"
20692msgstr "不能写入 $fixup_msg"
20693
c1ac5258 20694#: git-rebase--preserve-merges.sh:440
5c57d762
JX
20695msgid "This is a combination of 2 commits."
20696msgstr "这是一个 2 个提交的组合。"
20697
c1ac5258
JX
20698#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
20699#: git-rebase--preserve-merges.sh:527
5c57d762
JX
20700#, sh-format
20701msgid "Could not apply $sha1... $rest"
20702msgstr "不能应用 $sha1... $rest"
20703
c1ac5258 20704#: git-rebase--preserve-merges.sh:556
5c57d762
JX
20705#, sh-format
20706msgid ""
20707"Could not amend commit after successfully picking $sha1... $rest\n"
20708"This is most likely due to an empty commit message, or the pre-commit hook\n"
20709"failed. If the pre-commit hook failed, you may need to resolve the issue "
20710"before\n"
20711"you are able to reword the commit."
20712msgstr ""
20713"不能在成功拣选 $sha1... $rest 之后修补提交\n"
20714"这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
20715"钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
20716
c1ac5258 20717#: git-rebase--preserve-merges.sh:571
5c57d762
JX
20718#, sh-format
20719msgid "Stopped at $sha1_abbrev... $rest"
20720msgstr "停止在 $sha1_abbrev... $rest"
20721
c1ac5258 20722#: git-rebase--preserve-merges.sh:586
5c57d762
JX
20723#, sh-format
20724msgid "Cannot '$squash_style' without a previous commit"
9a4b694c 20725msgstr "没有父提交的情况下不能 '$squash_style'"
5c57d762 20726
c1ac5258 20727#: git-rebase--preserve-merges.sh:628
5c57d762
JX
20728#, sh-format
20729msgid "Executing: $rest"
20730msgstr "执行:$rest"
20731
c1ac5258 20732#: git-rebase--preserve-merges.sh:636
5c57d762
JX
20733#, sh-format
20734msgid "Execution failed: $rest"
20735msgstr "执行失败:$rest"
20736
c1ac5258 20737#: git-rebase--preserve-merges.sh:638
5c57d762
JX
20738msgid "and made changes to the index and/or the working tree"
20739msgstr "并且修改索引和/或工作区"
20740
20741# 译者:注意保持前导空格
c1ac5258 20742#: git-rebase--preserve-merges.sh:640
5c57d762
JX
20743msgid ""
20744"You can fix the problem, and then run\n"
20745"\n"
20746"\tgit rebase --continue"
20747msgstr ""
20748"您可以解决这个问题,然后运行\n"
20749"\n"
20750"\tgit rebase --continue"
20751
20752#. TRANSLATORS: after these lines is a command to be issued by the user
c1ac5258 20753#: git-rebase--preserve-merges.sh:653
5c57d762
JX
20754#, sh-format
20755msgid ""
20756"Execution succeeded: $rest\n"
20757"but left changes to the index and/or the working tree\n"
20758"Commit or stash your changes, and then run\n"
20759"\n"
20760"\tgit rebase --continue"
20761msgstr ""
20762"执行成功:$rest\n"
a4f16749 20763"但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n"
5c57d762
JX
20764"\n"
20765"\tgit rebase --continue"
20766
c1ac5258 20767#: git-rebase--preserve-merges.sh:664
5c57d762
JX
20768#, sh-format
20769msgid "Unknown command: $command $sha1 $rest"
20770msgstr "未知命令:$command $sha1 $rest"
20771
c1ac5258 20772#: git-rebase--preserve-merges.sh:665
5c57d762
JX
20773msgid "Please fix this using 'git rebase --edit-todo'."
20774msgstr "要修改请使用命令 'git rebase --edit-todo'。"
20775
c1ac5258 20776#: git-rebase--preserve-merges.sh:700
5c57d762
JX
20777#, sh-format
20778msgid "Successfully rebased and updated $head_name."
9a4b694c 20779msgstr "成功变基并更新 $head_name。"
5c57d762 20780
c1ac5258 20781#: git-rebase--preserve-merges.sh:757
5c57d762
JX
20782msgid "Could not remove CHERRY_PICK_HEAD"
20783msgstr "不能删除 CHERRY_PICK_HEAD"
20784
c1ac5258 20785#: git-rebase--preserve-merges.sh:762
5c57d762
JX
20786#, sh-format
20787msgid ""
20788"You have staged changes in your working tree.\n"
20789"If these changes are meant to be\n"
20790"squashed into the previous commit, run:\n"
20791"\n"
20792" git commit --amend $gpg_sign_opt_quoted\n"
20793"\n"
20794"If they are meant to go into a new commit, run:\n"
20795"\n"
20796" git commit $gpg_sign_opt_quoted\n"
20797"\n"
a0b6b246 20798"In both cases, once you're done, continue with:\n"
5c57d762
JX
20799"\n"
20800" git rebase --continue\n"
20801msgstr ""
20802"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
20803"\n"
20804" git commit --amend $gpg_sign_opt_quoted\n"
20805"\n"
20806"如果这些变更要形成一个新提交,执行:\n"
20807"\n"
20808" git commit $gpg_sign_opt_quoted\n"
20809"\n"
9a4b694c 20810"无论哪种情况,当您完成提交,继续执行:\n"
5c57d762
JX
20811"\n"
20812" git rebase --continue\n"
20813
c1ac5258 20814#: git-rebase--preserve-merges.sh:779
5c57d762 20815msgid "Error trying to find the author identity to amend commit"
9a4b694c 20816msgstr "在修补提交中查找作者信息时遇到错误"
5c57d762 20817
c1ac5258 20818#: git-rebase--preserve-merges.sh:784
5c57d762
JX
20819msgid ""
20820"You have uncommitted changes in your working tree. Please commit them\n"
20821"first and then run 'git rebase --continue' again."
a0b6b246
JX
20822msgstr ""
20823"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
5c57d762 20824
c1ac5258 20825#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793
5c57d762
JX
20826msgid "Could not commit staged changes."
20827msgstr "不能提交暂存的修改。"
20828
4c27fcb5
JX
20829#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
20830msgid "Could not execute editor"
20831msgstr "无法运行编辑器"
20832
20833#: git-rebase--preserve-merges.sh:845
20834#, sh-format
20835msgid "Could not checkout $switch_to"
20836msgstr "不能检出 $switch_to"
20837
20838#: git-rebase--preserve-merges.sh:852
20839msgid "No HEAD?"
20840msgstr "没有 HEAD?"
20841
20842#: git-rebase--preserve-merges.sh:853
20843#, sh-format
20844msgid "Could not create temporary $state_dir"
20845msgstr "不能创建临时 $state_dir"
20846
20847#: git-rebase--preserve-merges.sh:856
20848msgid "Could not mark as interactive"
20849msgstr "不能标记为交互式"
20850
20851#: git-rebase--preserve-merges.sh:888
20852#, sh-format
20853msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
20854msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
20855msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
20856msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
5c57d762 20857
c1ac5258 20858#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
fd8cb379
JX
20859msgid "Could not init rewritten commits"
20860msgstr "不能对重写提交进行初始化"
20861
5c57d762
JX
20862#: git-sh-setup.sh:89 git-sh-setup.sh:94
20863#, sh-format
20864msgid "usage: $dashless $USAGE"
20865msgstr "用法:$dashless $USAGE"
20866
20867#: git-sh-setup.sh:190
20868#, sh-format
20869msgid "Cannot chdir to $cdup, the toplevel of the working tree"
9a4b694c 20870msgstr "不能切换目录到 $cdup,工作区的顶级目录"
5c57d762
JX
20871
20872#: git-sh-setup.sh:199 git-sh-setup.sh:206
20873#, sh-format
20874msgid "fatal: $program_name cannot be used without a working tree."
06991777 20875msgstr "致命错误:$program_name 不能在没有工作区的情况下使用"
5c57d762
JX
20876
20877#: git-sh-setup.sh:220
20878msgid "Cannot rebase: You have unstaged changes."
20879msgstr "不能变基:您有未暂存的变更。"
20880
20881#: git-sh-setup.sh:223
20882msgid "Cannot rewrite branches: You have unstaged changes."
20883msgstr "不能重写分支:您有未暂存的变更。"
20884
a0b6b246
JX
20885#: git-sh-setup.sh:226
20886msgid "Cannot pull with rebase: You have unstaged changes."
20887msgstr "无法通过变基方式拉取:您有未暂存的变更。"
20888
5c57d762
JX
20889#: git-sh-setup.sh:229
20890#, sh-format
20891msgid "Cannot $action: You have unstaged changes."
20892msgstr "不能 $action:您有未暂存的变更。"
20893
20894#: git-sh-setup.sh:242
20895msgid "Cannot rebase: Your index contains uncommitted changes."
20896msgstr "不能变基:您的索引中包含未提交的变更。"
20897
a0b6b246
JX
20898#: git-sh-setup.sh:245
20899msgid "Cannot pull with rebase: Your index contains uncommitted changes."
20900msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
20901
5c57d762
JX
20902#: git-sh-setup.sh:248
20903#, sh-format
20904msgid "Cannot $action: Your index contains uncommitted changes."
20905msgstr "不能 $action:您的索引中包含未提交的变更。"
20906
a0b6b246
JX
20907#: git-sh-setup.sh:252
20908msgid "Additionally, your index contains uncommitted changes."
20909msgstr "而且您的索引中包含未提交的变更。"
20910
5c57d762
JX
20911#: git-sh-setup.sh:372
20912msgid "You need to run this command from the toplevel of the working tree."
20913msgstr "您需要在工作区的顶级目录中运行这个命令。"
20914
20915#: git-sh-setup.sh:377
20916msgid "Unable to determine absolute path of git directory"
20917msgstr "不能确定 git 目录的绝对路径"
a0b6b246 20918
1a79b2f1 20919#. TRANSLATORS: you can adjust this to align "git add -i" status menu
a4f16749 20920#: git-add--interactive.perl:196
1a79b2f1
JX
20921#, perl-format
20922msgid "%12s %12s %s"
20923msgstr "%12s %12s %s"
20924
a4f16749 20925#: git-add--interactive.perl:197
1a79b2f1
JX
20926msgid "staged"
20927msgstr "缓存"
20928
a4f16749 20929#: git-add--interactive.perl:197
1a79b2f1
JX
20930msgid "unstaged"
20931msgstr "未缓存"
20932
fd8cb379 20933#: git-add--interactive.perl:253 git-add--interactive.perl:278
1a79b2f1
JX
20934msgid "binary"
20935msgstr "二进制"
20936
fd8cb379 20937#: git-add--interactive.perl:262 git-add--interactive.perl:316
1a79b2f1
JX
20938msgid "nothing"
20939msgstr "无"
20940
fd8cb379 20941#: git-add--interactive.perl:298 git-add--interactive.perl:313
1a79b2f1
JX
20942msgid "unchanged"
20943msgstr "没有修改"
20944
fd8cb379 20945#: git-add--interactive.perl:609
1a79b2f1
JX
20946#, perl-format
20947msgid "added %d path\n"
20948msgid_plural "added %d paths\n"
20949msgstr[0] "增加了 %d 个路径\n"
20950msgstr[1] "增加了 %d 个路径\n"
20951
fd8cb379 20952#: git-add--interactive.perl:612
1a79b2f1
JX
20953#, perl-format
20954msgid "updated %d path\n"
20955msgid_plural "updated %d paths\n"
20956msgstr[0] "更新了 %d 个路径\n"
20957msgstr[1] "更新了 %d 个路径\n"
20958
fd8cb379 20959#: git-add--interactive.perl:615
1a79b2f1
JX
20960#, perl-format
20961msgid "reverted %d path\n"
20962msgid_plural "reverted %d paths\n"
20963msgstr[0] "还原了 %d 个路径\n"
20964msgstr[1] "还原了 %d 个路径\n"
20965
fd8cb379 20966#: git-add--interactive.perl:618
1a79b2f1
JX
20967#, perl-format
20968msgid "touched %d path\n"
20969msgid_plural "touched %d paths\n"
20970msgstr[0] "触碰了 %d 个路径\n"
20971msgstr[1] "触碰了 %d 个路径\n"
20972
fd8cb379 20973#: git-add--interactive.perl:627
1a79b2f1
JX
20974msgid "Update"
20975msgstr "更新"
20976
fd8cb379 20977#: git-add--interactive.perl:639
1a79b2f1
JX
20978msgid "Revert"
20979msgstr "还原"
20980
fd8cb379 20981#: git-add--interactive.perl:662
1a79b2f1
JX
20982#, perl-format
20983msgid "note: %s is untracked now.\n"
20984msgstr "说明:%s 现已成为未跟踪的。\n"
20985
fd8cb379 20986#: git-add--interactive.perl:673
1a79b2f1
JX
20987msgid "Add untracked"
20988msgstr "添加未跟踪的"
20989
fd8cb379 20990#: git-add--interactive.perl:679
1a79b2f1
JX
20991msgid "No untracked files.\n"
20992msgstr "没有未跟踪的文件。\n"
20993
fd8cb379 20994#: git-add--interactive.perl:1033
1a79b2f1
JX
20995msgid ""
20996"If the patch applies cleanly, the edited hunk will immediately be\n"
20997"marked for staging."
20998msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
20999
fd8cb379 21000#: git-add--interactive.perl:1036
1a79b2f1
JX
21001msgid ""
21002"If the patch applies cleanly, the edited hunk will immediately be\n"
21003"marked for stashing."
a4f16749 21004msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。"
1a79b2f1 21005
fd8cb379 21006#: git-add--interactive.perl:1039
1a79b2f1
JX
21007msgid ""
21008"If the patch applies cleanly, the edited hunk will immediately be\n"
21009"marked for unstaging."
21010msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
21011
fd8cb379 21012#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
1a79b2f1
JX
21013msgid ""
21014"If the patch applies cleanly, the edited hunk will immediately be\n"
21015"marked for applying."
21016msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
21017
fd8cb379 21018#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
1a79b2f1
JX
21019msgid ""
21020"If the patch applies cleanly, the edited hunk will immediately be\n"
21021"marked for discarding."
21022msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
21023
fd8cb379 21024#: git-add--interactive.perl:1085
1a79b2f1
JX
21025#, perl-format
21026msgid "failed to open hunk edit file for writing: %s"
c1ac5258 21027msgstr "为写入打开块编辑文件失败:%s"
1a79b2f1 21028
fd8cb379 21029#: git-add--interactive.perl:1086
1a79b2f1
JX
21030msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
21031msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
21032
fd8cb379 21033#: git-add--interactive.perl:1092
1a79b2f1
JX
21034#, perl-format
21035msgid ""
21036"---\n"
21037"To remove '%s' lines, make them ' ' lines (context).\n"
21038"To remove '%s' lines, delete them.\n"
21039"Lines starting with %s will be removed.\n"
21040msgstr ""
21041"---\n"
21042"要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
21043"要删除 '%s' 开始的行,删除它们。\n"
21044"以 %s 开始的行将被删除。\n"
21045
21046#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
fd8cb379 21047#: git-add--interactive.perl:1100
1a79b2f1
JX
21048msgid ""
21049"If it does not apply cleanly, you will be given an opportunity to\n"
21050"edit again. If all lines of the hunk are removed, then the edit is\n"
21051"aborted and the hunk is left unchanged.\n"
21052msgstr ""
21053"如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
21054"此次编辑被终止,该块不会被修改。\n"
21055
fd8cb379 21056#: git-add--interactive.perl:1114
1a79b2f1
JX
21057#, perl-format
21058msgid "failed to open hunk edit file for reading: %s"
21059msgstr "无法读取块编辑文件:%s"
21060
21061#. TRANSLATORS: do not translate [y/n]
21062#. The program will only accept that input
21063#. at this point.
21064#. Consider translating (saying "no" discards!) as
21065#. (saying "n" for "no" discards!) if the translation
21066#. of the word "no" does not start with n.
fd8cb379 21067#: git-add--interactive.perl:1213
1a79b2f1
JX
21068msgid ""
21069"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
21070msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
21071
fd8cb379 21072#: git-add--interactive.perl:1222
1a79b2f1
JX
21073msgid ""
21074"y - stage this hunk\n"
21075"n - do not stage this hunk\n"
21076"q - quit; do not stage this hunk or any of the remaining ones\n"
21077"a - stage this hunk and all later hunks in the file\n"
21078"d - do not stage this hunk or any of the later hunks in the file"
21079msgstr ""
21080"y - 暂存该块\n"
21081"n - 不要暂存该块\n"
21082"q - 退出。不暂存该块及后面的全部块\n"
21083"a - 暂存该块和本文件中后面的全部块\n"
21084"d - 不暂存该块和本文件中后面的全部块"
21085
fd8cb379 21086#: git-add--interactive.perl:1228
1a79b2f1
JX
21087msgid ""
21088"y - stash this hunk\n"
21089"n - do not stash this hunk\n"
21090"q - quit; do not stash this hunk or any of the remaining ones\n"
21091"a - stash this hunk and all later hunks in the file\n"
21092"d - do not stash this hunk or any of the later hunks in the file"
21093msgstr ""
21094"y - 贮藏该块\n"
21095"n - 不要贮藏该块\n"
21096"q - 退出。不贮藏该块及后面的全部块\n"
21097"a - 贮藏该块和本文件中后面的全部块\n"
21098"d - 不贮藏该块和本文件中后面的全部块"
21099
fd8cb379 21100#: git-add--interactive.perl:1234
1a79b2f1
JX
21101msgid ""
21102"y - unstage this hunk\n"
21103"n - do not unstage this hunk\n"
21104"q - quit; do not unstage this hunk or any of the remaining ones\n"
21105"a - unstage this hunk and all later hunks in the file\n"
21106"d - do not unstage this hunk or any of the later hunks in the file"
21107msgstr ""
21108"y - 不暂存该块\n"
21109"n - 不要不暂存该块\n"
21110"q - 退出。不要不暂存该块及后面的全部块\n"
21111"a - 不暂存该块和本文件中后面的全部块\n"
21112"d - 不要不暂存该块和本文件中后面的全部块"
21113
fd8cb379 21114#: git-add--interactive.perl:1240
1a79b2f1
JX
21115msgid ""
21116"y - apply this hunk to index\n"
21117"n - do not apply this hunk to index\n"
21118"q - quit; do not apply this hunk or any of the remaining ones\n"
21119"a - apply this hunk and all later hunks in the file\n"
21120"d - do not apply this hunk or any of the later hunks in the file"
21121msgstr ""
21122"y - 在索引中应用该块\n"
21123"n - 不要在索引中应用该块\n"
21124"q - 退出。不要应用该块及后面的全部块\n"
21125"a - 应用该块和本文件中后面的全部块\n"
21126"d - 不要应用该块和本文件中后面的全部块"
21127
fd8cb379 21128#: git-add--interactive.perl:1246
1a79b2f1
JX
21129msgid ""
21130"y - discard this hunk from worktree\n"
21131"n - do not discard this hunk from worktree\n"
21132"q - quit; do not discard this hunk or any of the remaining ones\n"
21133"a - discard this hunk and all later hunks in the file\n"
21134"d - do not discard this hunk or any of the later hunks in the file"
21135msgstr ""
21136"y - 在工作区中丢弃该块\n"
21137"n - 不要在工作区中丢弃该块\n"
21138"q - 退出。不要丢弃该块及后面的全部块\n"
21139"a - 丢弃该块和本文件中后面的全部块\n"
21140"d - 不要丢弃该块和本文件中后面的全部块"
21141
fd8cb379 21142#: git-add--interactive.perl:1252
1a79b2f1
JX
21143msgid ""
21144"y - discard this hunk from index and worktree\n"
21145"n - do not discard this hunk from index and worktree\n"
21146"q - quit; do not discard this hunk or any of the remaining ones\n"
21147"a - discard this hunk and all later hunks in the file\n"
21148"d - do not discard this hunk or any of the later hunks in the file"
21149msgstr ""
21150"y - 在索引和工作区中丢弃该块\n"
21151"n - 不要在索引和工作区中丢弃该块\n"
21152"q - 退出。不要丢弃该块及后面的全部块\n"
21153"a - 丢弃该块和本文件中后面的全部块\n"
21154"d - 不要丢弃该块和本文件中后面的全部块"
21155
fd8cb379 21156#: git-add--interactive.perl:1258
1a79b2f1
JX
21157msgid ""
21158"y - apply this hunk to index and worktree\n"
21159"n - do not apply this hunk to index and worktree\n"
21160"q - quit; do not apply this hunk or any of the remaining ones\n"
21161"a - apply this hunk and all later hunks in the file\n"
21162"d - do not apply this hunk or any of the later hunks in the file"
21163msgstr ""
21164"y - 在索引和工作区中应用该块\n"
21165"n - 不要在索引和工作区中应用该块\n"
21166"q - 退出。不要应用该块及后面的全部块\n"
21167"a - 应用该块和本文件中后面的全部块\n"
21168"d - 不要应用该块和本文件中后面的全部块"
21169
fd8cb379 21170#: git-add--interactive.perl:1273
1a79b2f1
JX
21171msgid ""
21172"g - select a hunk to go to\n"
21173"/ - search for a hunk matching the given regex\n"
21174"j - leave this hunk undecided, see next undecided hunk\n"
21175"J - leave this hunk undecided, see next hunk\n"
21176"k - leave this hunk undecided, see previous undecided hunk\n"
21177"K - leave this hunk undecided, see previous hunk\n"
21178"s - split the current hunk into smaller hunks\n"
21179"e - manually edit the current hunk\n"
21180"? - print help\n"
21181msgstr ""
21182"g - 选择跳转到一个块\n"
21183"/ - 查找和给定正则表达式匹配的块\n"
21184"j - 维持该块未决状态,查看下一个未决块\n"
21185"J - 维持该块未决状态,查看下一个块\n"
21186"k - 维持该块未决状态,查看上一个未决块\n"
21187"K - 维持该块未决状态,查看上一个块\n"
21188"s - 拆分当前块为更小的块\n"
21189"e - 手动编辑当前块\n"
21190"? - 显示帮助\n"
21191
fd8cb379 21192#: git-add--interactive.perl:1304
1a79b2f1
JX
21193msgid "The selected hunks do not apply to the index!\n"
21194msgstr "选中的块不能应用到索引!\n"
21195
fd8cb379 21196#: git-add--interactive.perl:1305
1a79b2f1
JX
21197msgid "Apply them to the worktree anyway? "
21198msgstr "无论如何都要应用到工作区么?"
21199
fd8cb379 21200#: git-add--interactive.perl:1308
1a79b2f1
JX
21201msgid "Nothing was applied.\n"
21202msgstr "未应用。\n"
21203
fd8cb379 21204#: git-add--interactive.perl:1319
1a79b2f1
JX
21205#, perl-format
21206msgid "ignoring unmerged: %s\n"
21207msgstr "忽略未合入的:%s\n"
21208
fd8cb379 21209#: git-add--interactive.perl:1328
1a79b2f1
JX
21210msgid "Only binary files changed.\n"
21211msgstr "只有二进制文件被修改。\n"
21212
fd8cb379 21213#: git-add--interactive.perl:1330
1a79b2f1
JX
21214msgid "No changes.\n"
21215msgstr "没有修改。\n"
21216
fd8cb379 21217#: git-add--interactive.perl:1338
1a79b2f1
JX
21218msgid "Patch update"
21219msgstr "补丁更新"
21220
fd8cb379 21221#: git-add--interactive.perl:1390
1a79b2f1 21222#, perl-format
31e5e17b
JX
21223msgid "Stage mode change [y,n,q,a,d%s,?]? "
21224msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 21225
fd8cb379 21226#: git-add--interactive.perl:1391
1a79b2f1 21227#, perl-format
31e5e17b
JX
21228msgid "Stage deletion [y,n,q,a,d%s,?]? "
21229msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
1a79b2f1 21230
fd8cb379 21231#: git-add--interactive.perl:1392
1a79b2f1 21232#, perl-format
31e5e17b
JX
21233msgid "Stage this hunk [y,n,q,a,d%s,?]? "
21234msgstr "暂存该块 [y,n,q,a,d%s,?]? "
1a79b2f1 21235
fd8cb379 21236#: git-add--interactive.perl:1395
1a79b2f1 21237#, perl-format
31e5e17b
JX
21238msgid "Stash mode change [y,n,q,a,d%s,?]? "
21239msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 21240
fd8cb379 21241#: git-add--interactive.perl:1396
1a79b2f1 21242#, perl-format
31e5e17b
JX
21243msgid "Stash deletion [y,n,q,a,d%s,?]? "
21244msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
1a79b2f1 21245
fd8cb379 21246#: git-add--interactive.perl:1397
1a79b2f1 21247#, perl-format
31e5e17b
JX
21248msgid "Stash this hunk [y,n,q,a,d%s,?]? "
21249msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
1a79b2f1 21250
fd8cb379 21251#: git-add--interactive.perl:1400
1a79b2f1 21252#, perl-format
31e5e17b
JX
21253msgid "Unstage mode change [y,n,q,a,d%s,?]? "
21254msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 21255
fd8cb379 21256#: git-add--interactive.perl:1401
1a79b2f1 21257#, perl-format
31e5e17b
JX
21258msgid "Unstage deletion [y,n,q,a,d%s,?]? "
21259msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
1a79b2f1 21260
fd8cb379 21261#: git-add--interactive.perl:1402
1a79b2f1 21262#, perl-format
31e5e17b
JX
21263msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
21264msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
1a79b2f1 21265
fd8cb379 21266#: git-add--interactive.perl:1405
1a79b2f1 21267#, perl-format
31e5e17b
JX
21268msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
21269msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
1a79b2f1 21270
fd8cb379 21271#: git-add--interactive.perl:1406
1a79b2f1 21272#, perl-format
31e5e17b
JX
21273msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
21274msgstr "将删除应用到索引 [y,n,q,a,d%s,?]? "
1a79b2f1 21275
fd8cb379 21276#: git-add--interactive.perl:1407
1a79b2f1 21277#, perl-format
31e5e17b 21278msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
610f8099 21279msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
1a79b2f1 21280
fd8cb379 21281#: git-add--interactive.perl:1410
1a79b2f1 21282#, perl-format
31e5e17b
JX
21283msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
21284msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 21285
fd8cb379 21286#: git-add--interactive.perl:1411
1a79b2f1 21287#, perl-format
31e5e17b
JX
21288msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
21289msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
1a79b2f1 21290
fd8cb379 21291#: git-add--interactive.perl:1412
1a79b2f1 21292#, perl-format
31e5e17b
JX
21293msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
21294msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
1a79b2f1 21295
fd8cb379 21296#: git-add--interactive.perl:1415
1a79b2f1 21297#, perl-format
31e5e17b
JX
21298msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
21299msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 21300
fd8cb379 21301#: git-add--interactive.perl:1416
1a79b2f1 21302#, perl-format
31e5e17b
JX
21303msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
21304msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? "
1a79b2f1 21305
fd8cb379 21306#: git-add--interactive.perl:1417
1a79b2f1 21307#, perl-format
31e5e17b
JX
21308msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
21309msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
1a79b2f1 21310
fd8cb379 21311#: git-add--interactive.perl:1420
1a79b2f1 21312#, perl-format
31e5e17b
JX
21313msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
21314msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
1a79b2f1 21315
fd8cb379 21316#: git-add--interactive.perl:1421
1a79b2f1 21317#, perl-format
31e5e17b
JX
21318msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
21319msgstr "将删除应用到索引和工作区 [y,n,q,a,d%s,?]? "
1a79b2f1 21320
fd8cb379 21321#: git-add--interactive.perl:1422
1a79b2f1 21322#, perl-format
31e5e17b
JX
21323msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
21324msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
21325
fd8cb379 21326#: git-add--interactive.perl:1522
31e5e17b
JX
21327msgid "No other hunks to goto\n"
21328msgstr "没有其它可供跳转的块\n"
1a79b2f1 21329
fd8cb379 21330#: git-add--interactive.perl:1529
1a79b2f1
JX
21331msgid "go to which hunk (<ret> to see more)? "
21332msgstr "跳转到哪个块(<回车> 查看更多)? "
21333
fd8cb379 21334#: git-add--interactive.perl:1531
1a79b2f1
JX
21335msgid "go to which hunk? "
21336msgstr "跳转到哪个块?"
21337
fd8cb379 21338#: git-add--interactive.perl:1540
1a79b2f1
JX
21339#, perl-format
21340msgid "Invalid number: '%s'\n"
21341msgstr "无效数字:'%s'\n"
21342
fd8cb379 21343#: git-add--interactive.perl:1545
1a79b2f1
JX
21344#, perl-format
21345msgid "Sorry, only %d hunk available.\n"
21346msgid_plural "Sorry, only %d hunks available.\n"
21347msgstr[0] "对不起,只有 %d 个可用块。\n"
21348msgstr[1] "对不起,只有 %d 个可用块。\n"
21349
fd8cb379 21350#: git-add--interactive.perl:1571
31e5e17b
JX
21351msgid "No other hunks to search\n"
21352msgstr "没有其它可供查找的块\n"
21353
fd8cb379 21354#: git-add--interactive.perl:1575
1a79b2f1
JX
21355msgid "search for regex? "
21356msgstr "使用正则表达式搜索?"
21357
fd8cb379 21358#: git-add--interactive.perl:1588
1a79b2f1
JX
21359#, perl-format
21360msgid "Malformed search regexp %s: %s\n"
21361msgstr "错误的正则表达式 %s:%s\n"
21362
fd8cb379 21363#: git-add--interactive.perl:1598
1a79b2f1
JX
21364msgid "No hunk matches the given pattern\n"
21365msgstr "没有和给定模式相匹配的快\n"
21366
fd8cb379 21367#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
1a79b2f1
JX
21368msgid "No previous hunk\n"
21369msgstr "没有前一个块\n"
21370
fd8cb379 21371#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
1a79b2f1
JX
21372msgid "No next hunk\n"
21373msgstr "没有下一个块\n"
21374
fd8cb379 21375#: git-add--interactive.perl:1644
31e5e17b
JX
21376msgid "Sorry, cannot split this hunk\n"
21377msgstr "对不起,不能拆分这个块\n"
21378
fd8cb379 21379#: git-add--interactive.perl:1650
1a79b2f1
JX
21380#, perl-format
21381msgid "Split into %d hunk.\n"
21382msgid_plural "Split into %d hunks.\n"
21383msgstr[0] "拆分为 %d 块。\n"
21384msgstr[1] "拆分为 %d 块。\n"
21385
fd8cb379 21386#: git-add--interactive.perl:1660
31e5e17b
JX
21387msgid "Sorry, cannot edit this hunk\n"
21388msgstr "对不起,不能编辑这个块\n"
21389
fd8cb379 21390#: git-add--interactive.perl:1706
1a79b2f1
JX
21391msgid "Review diff"
21392msgstr "检视 diff"
21393
21394#. TRANSLATORS: please do not translate the command names
21395#. 'status', 'update', 'revert', etc.
fd8cb379 21396#: git-add--interactive.perl:1725
1a79b2f1
JX
21397msgid ""
21398"status - show paths with changes\n"
21399"update - add working tree state to the staged set of changes\n"
21400"revert - revert staged set of changes back to the HEAD version\n"
21401"patch - pick hunks and update selectively\n"
87cb7997 21402"diff - view diff between HEAD and index\n"
1a79b2f1
JX
21403"add untracked - add contents of untracked files to the staged set of "
21404"changes\n"
21405msgstr ""
21406"status - 显示含变更的路径\n"
21407"update - 添加工作区状态至暂存列表\n"
21408"revert - 还原修改的暂存集至 HEAD 版本\n"
21409"patch - 挑选块并且有选择地更新\n"
21410"diff - 显示 HEAD 和索引间差异\n"
21411"add untracked - 添加未跟踪文件的内容至暂存列表\n"
21412
fd8cb379
JX
21413#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
21414#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
21415#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
1a79b2f1
JX
21416msgid "missing --"
21417msgstr "缺失 --"
21418
fd8cb379 21419#: git-add--interactive.perl:1763
1a79b2f1
JX
21420#, perl-format
21421msgid "unknown --patch mode: %s"
21422msgstr "未知的 --patch 模式:%s"
21423
fd8cb379 21424#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
1a79b2f1
JX
21425#, perl-format
21426msgid "invalid argument %s, expecting --"
21427msgstr "无效的参数 %s,期望是 --"
21428
4c27fcb5 21429#: git-send-email.perl:138
1a79b2f1
JX
21430msgid "local zone differs from GMT by a non-minute interval\n"
21431msgstr "本地时间和 GMT 有不到一分钟间隔\n"
21432
4c27fcb5 21433#: git-send-email.perl:145 git-send-email.perl:151
1a79b2f1
JX
21434msgid "local time offset greater than or equal to 24 hours\n"
21435msgstr "本地时间偏移量大于等于 24 小时\n"
21436
4c27fcb5 21437#: git-send-email.perl:219 git-send-email.perl:225
1a79b2f1
JX
21438msgid "the editor exited uncleanly, aborting everything"
21439msgstr "编辑器非正常退出,终止所有操作"
21440
4c27fcb5 21441#: git-send-email.perl:302
1a79b2f1
JX
21442#, perl-format
21443msgid ""
21444"'%s' contains an intermediate version of the email you were composing.\n"
21445msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
21446
4c27fcb5 21447#: git-send-email.perl:307
1a79b2f1
JX
21448#, perl-format
21449msgid "'%s.final' contains the composed email.\n"
21450msgstr "'%s.final' 包含编辑的邮件。\n"
21451
4c27fcb5 21452#: git-send-email.perl:326
1a79b2f1
JX
21453msgid "--dump-aliases incompatible with other options\n"
21454msgstr "--dump-aliases 和其它选项不兼容\n"
21455
4c27fcb5 21456#: git-send-email.perl:395 git-send-email.perl:650
1a79b2f1
JX
21457msgid "Cannot run git format-patch from outside a repository\n"
21458msgstr "不能在仓库之外运行 git format-patch\n"
21459
4c27fcb5 21460#: git-send-email.perl:398
31e5e17b
JX
21461msgid ""
21462"`batch-size` and `relogin` must be specified together (via command-line or "
21463"configuration option)\n"
21464msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n"
21465
4c27fcb5 21466#: git-send-email.perl:468
1a79b2f1
JX
21467#, perl-format
21468msgid "Unknown --suppress-cc field: '%s'\n"
21469msgstr "未知的 --suppress-cc 字段:'%s'\n"
21470
4c27fcb5 21471#: git-send-email.perl:497
1a79b2f1
JX
21472#, perl-format
21473msgid "Unknown --confirm setting: '%s'\n"
21474msgstr "未知的 --confirm 设置:'%s'\n"
21475
4c27fcb5 21476#: git-send-email.perl:525
1a79b2f1
JX
21477#, perl-format
21478msgid "warning: sendmail alias with quotes is not supported: %s\n"
21479msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
21480
4c27fcb5 21481#: git-send-email.perl:527
1a79b2f1
JX
21482#, perl-format
21483msgid "warning: `:include:` not supported: %s\n"
21484msgstr "警告:不支持 `:include:`:%s\n"
21485
4c27fcb5 21486#: git-send-email.perl:529
1a79b2f1
JX
21487#, perl-format
21488msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
21489msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
21490
4c27fcb5 21491#: git-send-email.perl:534
1a79b2f1
JX
21492#, perl-format
21493msgid "warning: sendmail line is not recognized: %s\n"
21494msgstr "警告:不能识别的 sendmail 行:%s\n"
21495
4c27fcb5 21496#: git-send-email.perl:616
1a79b2f1
JX
21497#, perl-format
21498msgid ""
21499"File '%s' exists but it could also be the range of commits\n"
21500"to produce patches for. Please disambiguate by...\n"
21501"\n"
21502" * Saying \"./%s\" if you mean a file; or\n"
21503" * Giving --format-patch option if you mean a range.\n"
21504msgstr ""
87cb7997
JX
21505"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
21506"歧义:\n"
1a79b2f1
JX
21507"\n"
21508" * 如果含义为一个文件,使用 \"./%s\",或者\n"
21509" * 如果含义为一个范围,使用 --format-patch 选项。\n"
21510
4c27fcb5 21511#: git-send-email.perl:637
1a79b2f1
JX
21512#, perl-format
21513msgid "Failed to opendir %s: %s"
21514msgstr "无法打开目录 %s: %s"
21515
4c27fcb5 21516#: git-send-email.perl:661
1a79b2f1
JX
21517#, perl-format
21518msgid ""
21519"fatal: %s: %s\n"
21520"warning: no patches were sent\n"
21521msgstr ""
06991777 21522"致命错误:%s:%s\n"
1a79b2f1
JX
21523"警告:补丁未能发送\n"
21524
4c27fcb5 21525#: git-send-email.perl:672
1a79b2f1
JX
21526msgid ""
21527"\n"
21528"No patch files specified!\n"
21529"\n"
87cb7997
JX
21530msgstr ""
21531"\n"
21532"未指定补丁文件!\n"
21533"\n"
1a79b2f1 21534
4c27fcb5 21535#: git-send-email.perl:685
1a79b2f1
JX
21536#, perl-format
21537msgid "No subject line in %s?"
21538msgstr "在 %s 中没有标题行?"
21539
4c27fcb5 21540#: git-send-email.perl:695
1a79b2f1
JX
21541#, perl-format
21542msgid "Failed to open for writing %s: %s"
c1ac5258 21543msgstr "为写入打开 %s 失败: %s"
1a79b2f1 21544
4c27fcb5 21545#: git-send-email.perl:706
1a79b2f1
JX
21546msgid ""
21547"Lines beginning in \"GIT:\" will be removed.\n"
21548"Consider including an overall diffstat or table of contents\n"
21549"for the patch you are writing.\n"
21550"\n"
21551"Clear the body content if you don't wish to send a summary.\n"
21552msgstr ""
21553"以 \"GIT:\" 开头的行将被删除。\n"
21554"考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n"
21555"\n"
21556"如果您不想发送摘要,清除内容。\n"
21557
4c27fcb5 21558#: git-send-email.perl:730
1a79b2f1
JX
21559#, perl-format
21560msgid "Failed to open %s: %s"
21561msgstr "无法打开 %s: %s"
21562
4c27fcb5 21563#: git-send-email.perl:747
31e5e17b
JX
21564#, perl-format
21565msgid "Failed to open %s.final: %s"
21566msgstr "无法打开 %s.final: %s"
1a79b2f1 21567
4c27fcb5 21568#: git-send-email.perl:790
1a79b2f1
JX
21569msgid "Summary email is empty, skipping it\n"
21570msgstr "摘要邮件为空,跳过\n"
21571
21572#. TRANSLATORS: please keep [y/N] as is.
4c27fcb5 21573#: git-send-email.perl:825
1a79b2f1
JX
21574#, perl-format
21575msgid "Are you sure you want to use <%s> [y/N]? "
21576msgstr "您确认要使用 <%s> [y/N]?"
21577
4c27fcb5 21578#: git-send-email.perl:880
1a79b2f1
JX
21579msgid ""
21580"The following files are 8bit, but do not declare a Content-Transfer-"
21581"Encoding.\n"
21582msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
21583
4c27fcb5 21584#: git-send-email.perl:885
1a79b2f1
JX
21585msgid "Which 8bit encoding should I declare [UTF-8]? "
21586msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?"
21587
4c27fcb5 21588#: git-send-email.perl:893
1a79b2f1
JX
21589#, perl-format
21590msgid ""
21591"Refusing to send because the patch\n"
21592"\t%s\n"
21593"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
21594"want to send.\n"
21595msgstr ""
21596"拒绝发送,因为补丁\n"
21597"\t%s\n"
21598"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
21599
4c27fcb5 21600#: git-send-email.perl:912
1a79b2f1
JX
21601msgid "To whom should the emails be sent (if anyone)?"
21602msgstr "邮件将要发送给谁?"
21603
4c27fcb5 21604#: git-send-email.perl:930
1a79b2f1
JX
21605#, perl-format
21606msgid "fatal: alias '%s' expands to itself\n"
06991777 21607msgstr "致命错误:别名 '%s' 扩展为它自己\n"
1a79b2f1 21608
4c27fcb5 21609#: git-send-email.perl:942
1a79b2f1
JX
21610msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
21611msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?"
21612
4c27fcb5 21613#: git-send-email.perl:1000 git-send-email.perl:1008
1a79b2f1
JX
21614#, perl-format
21615msgid "error: unable to extract a valid address from: %s\n"
21616msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
21617
21618#. TRANSLATORS: Make sure to include [q] [d] [e] in your
21619#. translation. The program will only accept English input
21620#. at this point.
4c27fcb5 21621#: git-send-email.perl:1012
1a79b2f1
JX
21622msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
21623msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):"
21624
4c27fcb5 21625#: git-send-email.perl:1329
1a79b2f1
JX
21626#, perl-format
21627msgid "CA path \"%s\" does not exist"
21628msgstr "CA 路径 \"%s\" 不存在"
21629
4c27fcb5 21630#: git-send-email.perl:1412
1a79b2f1
JX
21631msgid ""
21632" The Cc list above has been expanded by additional\n"
21633" addresses found in the patch commit message. By default\n"
21634" send-email prompts before sending whenever this occurs.\n"
21635" This behavior is controlled by the sendemail.confirm\n"
21636" configuration setting.\n"
21637"\n"
21638" For additional information, run 'git send-email --help'.\n"
21639" To retain the current behavior, but squelch this message,\n"
21640" run 'git config --global sendemail.confirm auto'.\n"
21641"\n"
21642msgstr ""
21643" 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n"
21644" 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
21645" sendemail.confirm 配置设置。\n"
21646"\n"
21647" 更多信息,执行 'git send-email --help'。\n"
21648" 要保持当前行为,但不显示此信息,运行 'git config --global\n"
21649" sendemail.confirm auto'。\n"
21650"\n"
21651
fd8cb379 21652#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
1a79b2f1
JX
21653#. translation. The program will only accept English input
21654#. at this point.
4c27fcb5 21655#: git-send-email.perl:1427
fd8cb379
JX
21656msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
21657msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
1a79b2f1 21658
4c27fcb5 21659#: git-send-email.perl:1430
1a79b2f1
JX
21660msgid "Send this email reply required"
21661msgstr "发送要求的邮件回复"
21662
4c27fcb5 21663#: git-send-email.perl:1458
1a79b2f1
JX
21664msgid "The required SMTP server is not properly defined."
21665msgstr "要求的 SMTP 服务器未被正确定义。"
21666
4c27fcb5 21667#: git-send-email.perl:1505
1a79b2f1
JX
21668#, perl-format
21669msgid "Server does not support STARTTLS! %s"
21670msgstr "服务器不支持 STARTTLS!%s"
21671
4c27fcb5 21672#: git-send-email.perl:1510 git-send-email.perl:1514
a4f16749
JX
21673#, perl-format
21674msgid "STARTTLS failed! %s"
21675msgstr "STARTTLS 失败!%s"
21676
4c27fcb5 21677#: git-send-email.perl:1523
1a79b2f1
JX
21678msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
21679msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
21680
4c27fcb5 21681#: git-send-email.perl:1541
1a79b2f1
JX
21682#, perl-format
21683msgid "Failed to send %s\n"
21684msgstr "无法发送 %s\n"
21685
4c27fcb5 21686#: git-send-email.perl:1544
1a79b2f1
JX
21687#, perl-format
21688msgid "Dry-Sent %s\n"
21689msgstr "演习发送 %s\n"
21690
4c27fcb5 21691#: git-send-email.perl:1544
1a79b2f1
JX
21692#, perl-format
21693msgid "Sent %s\n"
21694msgstr "正发送 %s\n"
21695
4c27fcb5 21696#: git-send-email.perl:1546
1a79b2f1
JX
21697msgid "Dry-OK. Log says:\n"
21698msgstr "演习成功。日志说:\n"
21699
4c27fcb5 21700#: git-send-email.perl:1546
1a79b2f1
JX
21701msgid "OK. Log says:\n"
21702msgstr "OK。日志说:\n"
21703
4c27fcb5 21704#: git-send-email.perl:1558
1a79b2f1
JX
21705msgid "Result: "
21706msgstr "结果:"
21707
4c27fcb5 21708#: git-send-email.perl:1561
1a79b2f1
JX
21709msgid "Result: OK\n"
21710msgstr "结果:OK\n"
21711
4c27fcb5 21712#: git-send-email.perl:1579
1a79b2f1
JX
21713#, perl-format
21714msgid "can't open file %s"
21715msgstr "无法打开文件 %s"
21716
4c27fcb5 21717#: git-send-email.perl:1626 git-send-email.perl:1646
1a79b2f1
JX
21718#, perl-format
21719msgid "(mbox) Adding cc: %s from line '%s'\n"
21720msgstr "(mbox) 添加 cc:%s 自行 '%s'\n"
21721
4c27fcb5 21722#: git-send-email.perl:1632
1a79b2f1
JX
21723#, perl-format
21724msgid "(mbox) Adding to: %s from line '%s'\n"
21725msgstr "(mbox) 添加 to:%s 自行 '%s'\n"
21726
4c27fcb5 21727#: git-send-email.perl:1685
1a79b2f1
JX
21728#, perl-format
21729msgid "(non-mbox) Adding cc: %s from line '%s'\n"
21730msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n"
21731
4c27fcb5 21732#: git-send-email.perl:1720
1a79b2f1
JX
21733#, perl-format
21734msgid "(body) Adding cc: %s from line '%s'\n"
21735msgstr "(body) 添加 cc: %s 自行 '%s'\n"
21736
4c27fcb5 21737#: git-send-email.perl:1831
1a79b2f1
JX
21738#, perl-format
21739msgid "(%s) Could not execute '%s'"
21740msgstr "(%s) 不能执行 '%s'"
21741
4c27fcb5 21742#: git-send-email.perl:1838
1a79b2f1
JX
21743#, perl-format
21744msgid "(%s) Adding %s: %s from: '%s'\n"
21745msgstr "(%s) 添加 %s: %s 自:'%s'\n"
21746
4c27fcb5 21747#: git-send-email.perl:1842
1a79b2f1
JX
21748#, perl-format
21749msgid "(%s) failed to close pipe to '%s'"
21750msgstr "(%s) 无法关闭管道至 '%s'"
21751
4c27fcb5 21752#: git-send-email.perl:1872
1a79b2f1
JX
21753msgid "cannot send message as 7bit"
21754msgstr "不能以 7bit 形式发送信息"
21755
4c27fcb5 21756#: git-send-email.perl:1880
1a79b2f1
JX
21757msgid "invalid transfer encoding"
21758msgstr "无效的传送编码"
21759
4c27fcb5 21760#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983
1a79b2f1
JX
21761#, perl-format
21762msgid "unable to open %s: %s\n"
21763msgstr "不能打开 %s:%s\n"
21764
4c27fcb5 21765#: git-send-email.perl:1924
1a79b2f1
JX
21766#, perl-format
21767msgid "%s: patch contains a line longer than 998 characters"
21768msgstr "%s:补丁包含一个超过 998 字符的行"
21769
4c27fcb5 21770#: git-send-email.perl:1941
1a79b2f1
JX
21771#, perl-format
21772msgid "Skipping %s with backup suffix '%s'.\n"
21773msgstr "略过 %s 含备份后缀 '%s'。\n"
21774
21775#. TRANSLATORS: please keep "[y|N]" as is.
4c27fcb5 21776#: git-send-email.perl:1945
1a79b2f1
JX
21777#, perl-format
21778msgid "Do you really want to send %s? [y|N]: "
21779msgstr "您真的要发送 %s?[y|N]:"