]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
l10n: sv.po: Update Swedish translation(3608t0f0u)
[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 | 有向无环图
49# dangling object | 摇摆对象
50# detached HEAD | 分离头指针
51# directory | 目录
52# dirty | 脏(的工作区)
755c831b 53# dumb HTTP protocol | 哑 HTTP 协议
160fb2b2
JX
54# evil merge | 坏合并(合并引入了父提交没有的修改)
55# fast-forward | 快进
56# fetch | 获取
57# file system | 文件系统
e397e7e3 58# fork | 派生
160fb2b2
JX
59# Git archive | 仓库(对于 arch 用户)
60# gitfile | gitfile(仓库链接文件)
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"
fd8cb379
JX
141"POT-Creation-Date: 2018-06-16 22:06+0800\n"
142"PO-Revision-Date: 2018-06-18 00:28+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
fd8cb379 151#: advice.c:92
c04f5ac3 152#, c-format
fd8cb379
JX
153msgid "%shint: %.*s%s\n"
154msgstr "%s提示:%.*s%s\n"
c04f5ac3 155
fd8cb379 156#: advice.c:137
5c57d762
JX
157msgid "Cherry-picking is not possible because you have unmerged files."
158msgstr "无法拣选,因为您有未合并的文件。"
159
fd8cb379 160#: advice.c:139
5c57d762
JX
161msgid "Committing is not possible because you have unmerged files."
162msgstr "无法提交,因为您有未合并的文件。"
163
fd8cb379 164#: advice.c:141
5c57d762
JX
165msgid "Merging is not possible because you have unmerged files."
166msgstr "无法合并,因为您有未合并的文件。"
167
fd8cb379 168#: advice.c:143
5c57d762
JX
169msgid "Pulling is not possible because you have unmerged files."
170msgstr "无法拉取,因为您有未合并的文件。"
171
fd8cb379 172#: advice.c:145
5c57d762
JX
173msgid "Reverting is not possible because you have unmerged files."
174msgstr "无法回退,因为您有未合并的文件。"
175
fd8cb379 176#: advice.c:147
5c57d762
JX
177#, c-format
178msgid "It is not possible to %s because you have unmerged files."
179msgstr "无法 %s,因为您有未合并的文件。"
180
fd8cb379 181#: advice.c:155
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
fd8cb379 189#: advice.c:163
5c57d762
JX
190msgid "Exiting because of an unresolved conflict."
191msgstr "因为存在未解决的冲突而退出。"
192
fd8cb379 193#: advice.c:168 builtin/merge.c:1250
1b7f4a34
JX
194msgid "You have not concluded your merge (MERGE_HEAD exists)."
195msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
196
fd8cb379 197#: advice.c:170
94550ed3 198msgid "Please, commit your changes before merging."
1b7f4a34
JX
199msgstr "请在合并前先提交您的修改。"
200
fd8cb379 201#: advice.c:171
1b7f4a34
JX
202msgid "Exiting because of unfinished merge."
203msgstr "因为存在未完成的合并而退出。"
204
fd8cb379 205#: advice.c:177
5c57d762
JX
206#, c-format
207msgid ""
208"Note: checking out '%s'.\n"
209"\n"
210"You are in 'detached HEAD' state. You can look around, make experimental\n"
211"changes and commit them, and you can discard any commits you make in this\n"
212"state without impacting any branches by performing another checkout.\n"
213"\n"
214"If you want to create a new branch to retain commits you create, you may\n"
215"do so (now or later) by using -b with the checkout command again. Example:\n"
216"\n"
217" git checkout -b <new-branch-name>\n"
218"\n"
219msgstr ""
220"注意:正在检出 '%s'。\n"
221"\n"
a0b6b246
JX
222"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另"
223"外\n"
5c57d762
JX
224"的检出分支操作丢弃在这个状态下所做的任何提交。\n"
225"\n"
226"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n"
227"参数 -b 来实现(现在或稍后)。例如:\n"
228"\n"
58b6f078 229" git checkout -b <新分支名>\n"
5c57d762
JX
230"\n"
231
a4f16749 232#: apply.c:58
a0b6b246
JX
233#, c-format
234msgid "unrecognized whitespace option '%s'"
235msgstr "未能识别的空白字符选项 '%s'"
ef317cd5 236
a4f16749 237#: apply.c:74
90314792 238#, c-format
a0b6b246
JX
239msgid "unrecognized whitespace ignore option '%s'"
240msgstr "未能识别的空白字符忽略选项 '%s'"
90314792 241
5809aa05 242#: apply.c:122
a0b6b246 243msgid "--reject and --3way cannot be used together."
2090d5b4 244msgstr "--reject 和 --3way 不能同时使用。"
ef317cd5 245
5809aa05 246#: apply.c:124
a0b6b246
JX
247msgid "--cached and --3way cannot be used together."
248msgstr "--cached 和 --3way 不能同时使用。"
ef317cd5 249
5809aa05 250#: apply.c:127
a0b6b246
JX
251msgid "--3way outside a repository"
252msgstr "--3way 在一个仓库之外"
ef317cd5 253
5809aa05 254#: apply.c:138
a0b6b246
JX
255msgid "--index outside a repository"
256msgstr "--index 在一个仓库之外"
ef317cd5 257
5809aa05 258#: apply.c:141
a0b6b246
JX
259msgid "--cached outside a repository"
260msgstr "--cached 在一个仓库之外"
ef317cd5 261
5809aa05 262#: apply.c:821
a0b6b246
JX
263#, c-format
264msgid "Cannot prepare timestamp regexp %s"
265msgstr "无法准备时间戳正则表达式 %s"
ef317cd5 266
5809aa05 267#: apply.c:830
a0b6b246
JX
268#, c-format
269msgid "regexec returned %d for input: %s"
270msgstr "regexec 返回 %d,输入为:%s"
ef317cd5 271
5809aa05 272#: apply.c:904
a0b6b246
JX
273#, c-format
274msgid "unable to find filename in patch at line %d"
275msgstr "不能在补丁的第 %d 行找到文件名"
ef317cd5 276
5809aa05 277#: apply.c:942
a0b6b246
JX
278#, c-format
279msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
280msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
ef317cd5 281
5809aa05 282#: apply.c:948
a0b6b246
JX
283#, c-format
284msgid "git apply: bad git-diff - inconsistent new filename on line %d"
285msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
ef317cd5 286
5809aa05 287#: apply.c:949
a0b6b246
JX
288#, c-format
289msgid "git apply: bad git-diff - inconsistent old filename on line %d"
290msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
ef317cd5 291
5809aa05 292#: apply.c:954
a0b6b246
JX
293#, c-format
294msgid "git apply: bad git-diff - expected /dev/null on line %d"
295msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
ef317cd5 296
5809aa05 297#: apply.c:983
a4f16749
JX
298#, c-format
299msgid "invalid mode on line %d: %s"
300msgstr "第 %d 行包含无效文件模式:%s"
301
5809aa05 302#: apply.c:1301
a4f16749
JX
303#, c-format
304msgid "inconsistent header lines %d and %d"
305msgstr "不一致的文件头,%d 行和 %d 行"
306
5809aa05 307#: apply.c:1473
a0b6b246
JX
308#, c-format
309msgid "recount: unexpected line: %.*s"
310msgstr "recount:意外的行:%.*s"
ef317cd5 311
5809aa05 312#: apply.c:1542
a0b6b246
JX
313#, c-format
314msgid "patch fragment without header at line %d: %.*s"
315msgstr "第 %d 行的补丁片段没有头信息:%.*s"
ef317cd5 316
5809aa05 317#: apply.c:1562
a0b6b246
JX
318#, c-format
319msgid ""
320"git diff header lacks filename information when removing %d leading pathname "
321"component (line %d)"
322msgid_plural ""
323"git diff header lacks filename information when removing %d leading pathname "
324"components (line %d)"
325msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
326msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
ef317cd5 327
5809aa05 328#: apply.c:1575
a0b6b246
JX
329#, c-format
330msgid "git diff header lacks filename information (line %d)"
331msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
07432cef 332
5809aa05 333#: apply.c:1763
a0b6b246
JX
334msgid "new file depends on old contents"
335msgstr "新文件依赖旧内容"
5c57d762 336
5809aa05 337#: apply.c:1765
a0b6b246
JX
338msgid "deleted file still has contents"
339msgstr "删除的文件仍有内容"
5c57d762 340
5809aa05 341#: apply.c:1799
a0b6b246
JX
342#, c-format
343msgid "corrupt patch at line %d"
344msgstr "补丁在第 %d 行损坏"
5c57d762 345
5809aa05 346#: apply.c:1836
5c57d762 347#, c-format
a0b6b246
JX
348msgid "new file %s depends on old contents"
349msgstr "新文件 %s 依赖旧内容"
5c57d762 350
5809aa05 351#: apply.c:1838
5c57d762 352#, c-format
a0b6b246
JX
353msgid "deleted file %s still has contents"
354msgstr "删除的文件 %s 仍有内容"
5c57d762 355
5809aa05 356#: apply.c:1841
a0b6b246
JX
357#, c-format
358msgid "** warning: file %s becomes empty but is not deleted"
359msgstr "** 警告:文件 %s 成为空文件但并未删除"
ef317cd5 360
5809aa05 361#: apply.c:1988
5c57d762 362#, c-format
a0b6b246
JX
363msgid "corrupt binary patch at line %d: %.*s"
364msgstr "二进制补丁在第 %d 行损坏:%.*s"
5c57d762 365
5809aa05 366#: apply.c:2025
5c57d762 367#, c-format
a0b6b246
JX
368msgid "unrecognized binary patch at line %d"
369msgstr "未能识别的二进制补丁位于第 %d 行"
5c57d762 370
5809aa05 371#: apply.c:2185
5c57d762 372#, c-format
a0b6b246
JX
373msgid "patch with only garbage at line %d"
374msgstr "补丁文件的第 %d 行只有垃圾数据"
5c57d762 375
5809aa05 376#: apply.c:2271
5c57d762 377#, c-format
a0b6b246
JX
378msgid "unable to read symlink %s"
379msgstr "无法读取符号链接 %s"
5c57d762 380
5809aa05 381#: apply.c:2275
5c57d762 382#, c-format
a0b6b246
JX
383msgid "unable to open or read %s"
384msgstr "不能打开或读取 %s"
5c57d762 385
5809aa05 386#: apply.c:2934
5c57d762 387#, c-format
a0b6b246
JX
388msgid "invalid start of line: '%c'"
389msgstr "无效的行首字符:'%c'"
5c57d762 390
5809aa05 391#: apply.c:3055
5c57d762 392#, c-format
a0b6b246
JX
393msgid "Hunk #%d succeeded at %d (offset %d line)."
394msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
395msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
396msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
5c57d762 397
5809aa05 398#: apply.c:3067
5c57d762 399#, c-format
a0b6b246
JX
400msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
401msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
5c57d762 402
5809aa05 403#: apply.c:3073
5c57d762
JX
404#, c-format
405msgid ""
a0b6b246
JX
406"while searching for:\n"
407"%.*s"
5c57d762 408msgstr ""
a0b6b246
JX
409"当查询:\n"
410"%.*s"
5c57d762 411
5809aa05 412#: apply.c:3095
5c57d762 413#, c-format
a0b6b246
JX
414msgid "missing binary patch data for '%s'"
415msgstr "缺失 '%s' 的二进制补丁数据"
5c57d762 416
5809aa05 417#: apply.c:3103
5c57d762 418#, c-format
a0b6b246 419msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
29004bbb 420msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
5c57d762 421
5809aa05 422#: apply.c:3149
5c57d762 423#, c-format
a0b6b246
JX
424msgid "cannot apply binary patch to '%s' without full index line"
425msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
5c57d762 426
5809aa05 427#: apply.c:3159
5c57d762 428#, c-format
a0b6b246
JX
429msgid ""
430"the patch applies to '%s' (%s), which does not match the current contents."
29004bbb 431msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
5c57d762 432
5809aa05 433#: apply.c:3167
a0b6b246
JX
434#, c-format
435msgid "the patch applies to an empty '%s' but it is not empty"
29004bbb 436msgstr "补丁应用到空文件 '%s',但其并非空文件"
5c57d762 437
5809aa05 438#: apply.c:3185
5c57d762 439#, c-format
a0b6b246
JX
440msgid "the necessary postimage %s for '%s' cannot be read"
441msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"
5c57d762 442
5809aa05 443#: apply.c:3198
5c57d762 444#, c-format
a0b6b246
JX
445msgid "binary patch does not apply to '%s'"
446msgstr "二进制补丁未应用到 '%s'"
5c57d762 447
5809aa05 448#: apply.c:3204
5c57d762 449#, c-format
a0b6b246
JX
450msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
451msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
5c57d762 452
5809aa05 453#: apply.c:3225
276ceeaa 454#, c-format
a0b6b246
JX
455msgid "patch failed: %s:%ld"
456msgstr "打补丁失败:%s:%ld"
276ceeaa 457
5809aa05 458#: apply.c:3347
4dcdc3d8 459#, c-format
a0b6b246
JX
460msgid "cannot checkout %s"
461msgstr "不能检出 %s"
4dcdc3d8 462
fd8cb379 463#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278
4dcdc3d8 464#, c-format
a0b6b246
JX
465msgid "failed to read %s"
466msgstr "无法读取 %s"
4dcdc3d8 467
5809aa05 468#: apply.c:3404
4dcdc3d8 469#, c-format
a0b6b246
JX
470msgid "reading from '%s' beyond a symbolic link"
471msgstr "读取位于符号链接中的 '%s'"
4dcdc3d8 472
5809aa05 473#: apply.c:3433 apply.c:3673
4dcdc3d8 474#, c-format
a0b6b246
JX
475msgid "path %s has been renamed/deleted"
476msgstr "路径 %s 已经被重命名/删除"
4dcdc3d8 477
5809aa05 478#: apply.c:3516 apply.c:3687
4dcdc3d8 479#, c-format
a0b6b246
JX
480msgid "%s: does not exist in index"
481msgstr "%s:不存在于索引中"
4dcdc3d8 482
5809aa05 483#: apply.c:3525 apply.c:3695
4dcdc3d8 484#, c-format
a0b6b246
JX
485msgid "%s: does not match index"
486msgstr "%s:和索引不匹配"
4dcdc3d8 487
5809aa05 488#: apply.c:3560
a0b6b246
JX
489msgid "repository lacks the necessary blob to fall back on 3-way merge."
490msgstr "仓库缺乏必要的数据对象以进行三方合并。"
4dcdc3d8 491
5809aa05 492#: apply.c:3563
4dcdc3d8 493#, c-format
a0b6b246
JX
494msgid "Falling back to three-way merge...\n"
495msgstr "回落到三方合并...\n"
4dcdc3d8 496
5809aa05 497#: apply.c:3579 apply.c:3583
4dcdc3d8 498#, c-format
a0b6b246
JX
499msgid "cannot read the current contents of '%s'"
500msgstr "无法读取 '%s' 的当前内容"
276ceeaa 501
5809aa05 502#: apply.c:3595
4dcdc3d8 503#, c-format
a0b6b246
JX
504msgid "Failed to fall back on three-way merge...\n"
505msgstr "无法回落到三方合并...\n"
4dcdc3d8 506
5809aa05 507#: apply.c:3609
4dcdc3d8 508#, c-format
a0b6b246
JX
509msgid "Applied patch to '%s' with conflicts.\n"
510msgstr "应用补丁到 '%s' 存在冲突。\n"
4dcdc3d8 511
5809aa05 512#: apply.c:3614
4dcdc3d8 513#, c-format
a0b6b246
JX
514msgid "Applied patch to '%s' cleanly.\n"
515msgstr "成功应用补丁到 '%s'。\n"
4dcdc3d8 516
5809aa05 517#: apply.c:3640
a0b6b246
JX
518msgid "removal patch leaves file contents"
519msgstr "移除补丁仍留下了文件内容"
4dcdc3d8 520
5809aa05 521#: apply.c:3712
1003b3a5 522#, c-format
a0b6b246
JX
523msgid "%s: wrong type"
524msgstr "%s:错误类型"
1003b3a5 525
5809aa05 526#: apply.c:3714
1003b3a5 527#, c-format
a0b6b246
JX
528msgid "%s has type %o, expected %o"
529msgstr "%s 的类型是 %o,应为 %o"
1003b3a5 530
5809aa05 531#: apply.c:3864 apply.c:3866
4dcdc3d8 532#, c-format
a0b6b246
JX
533msgid "invalid path '%s'"
534msgstr "无效路径 '%s'"
4dcdc3d8 535
5809aa05 536#: apply.c:3922
4dcdc3d8 537#, c-format
a0b6b246
JX
538msgid "%s: already exists in index"
539msgstr "%s:已经存在于索引中"
4dcdc3d8 540
5809aa05 541#: apply.c:3925
4dcdc3d8 542#, c-format
a0b6b246
JX
543msgid "%s: already exists in working directory"
544msgstr "%s:已经存在于工作区中"
4dcdc3d8 545
5809aa05 546#: apply.c:3945
1b7f4a34 547#, c-format
a0b6b246
JX
548msgid "new mode (%o) of %s does not match old mode (%o)"
549msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1b7f4a34 550
5809aa05 551#: apply.c:3950
5b04ee3b 552#, c-format
a0b6b246
JX
553msgid "new mode (%o) of %s does not match old mode (%o) of %s"
554msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
5b04ee3b 555
5809aa05 556#: apply.c:3970
8ada9598 557#, c-format
a0b6b246
JX
558msgid "affected file '%s' is beyond a symbolic link"
559msgstr "受影响的文件 '%s' 位于符号链接中"
8ada9598 560
5809aa05 561#: apply.c:3974
81809b99 562#, c-format
a0b6b246
JX
563msgid "%s: patch does not apply"
564msgstr "%s:补丁未应用"
8ada9598 565
5809aa05 566#: apply.c:3989
8ada9598 567#, c-format
a0b6b246
JX
568msgid "Checking patch %s..."
569msgstr "检查补丁 %s..."
8ada9598 570
5809aa05 571#: apply.c:4080
a0b6b246
JX
572#, c-format
573msgid "sha1 information is lacking or useless for submodule %s"
574msgstr "子模组 %s 的 sha1 信息缺失或无效"
8ada9598 575
5809aa05 576#: apply.c:4087
8ada9598 577#, c-format
a0b6b246 578msgid "mode change for %s, which is not in current HEAD"
31e5e17b 579msgstr "%s 的模式变更,但它不在当前 HEAD 中"
8ada9598 580
5809aa05 581#: apply.c:4090
a0b6b246
JX
582#, c-format
583msgid "sha1 information is lacking or useless (%s)."
584msgstr "sha1 信息缺失或无效(%s)。"
6792b93b 585
31e5e17b 586#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140
8ada9598 587#, c-format
a0b6b246
JX
588msgid "make_cache_entry failed for path '%s'"
589msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
8ada9598 590
5809aa05 591#: apply.c:4099
a0b6b246
JX
592#, c-format
593msgid "could not add %s to temporary index"
594msgstr "不能在临时索引中添加 %s"
9aeb4c2b 595
5809aa05 596#: apply.c:4109
a0b6b246
JX
597#, c-format
598msgid "could not write temporary index to %s"
599msgstr "不能把临时索引写入到 %s"
9aeb4c2b 600
5809aa05 601#: apply.c:4247
a0b6b246
JX
602#, c-format
603msgid "unable to remove %s from index"
604msgstr "不能从索引中移除 %s"
8ada9598 605
5809aa05 606#: apply.c:4282
8ada9598 607#, c-format
a0b6b246
JX
608msgid "corrupt patch for submodule %s"
609msgstr "子模组 %s 损坏的补丁"
8ada9598 610
5809aa05 611#: apply.c:4288
9aeb4c2b 612#, c-format
a0b6b246 613msgid "unable to stat newly created file '%s'"
65e2041e 614msgstr "不能对新建文件 '%s' 调用 stat"
9aeb4c2b 615
5809aa05 616#: apply.c:4296
a0b6b246
JX
617#, c-format
618msgid "unable to create backing store for newly created file %s"
619msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 620
5809aa05 621#: apply.c:4302 apply.c:4446
81809b99 622#, c-format
a0b6b246
JX
623msgid "unable to add cache entry for %s"
624msgstr "无法为 %s 添加缓存条目"
8ada9598 625
5809aa05 626#: apply.c:4343
a0b6b246
JX
627#, c-format
628msgid "failed to write to '%s'"
629msgstr "无法写入 '%s'"
8ada9598 630
5809aa05 631#: apply.c:4347
220c313c 632#, c-format
a0b6b246
JX
633msgid "closing file '%s'"
634msgstr "关闭文件 '%s'"
220c313c 635
5809aa05 636#: apply.c:4417
c04f5ac3 637#, c-format
a0b6b246
JX
638msgid "unable to write file '%s' mode %o"
639msgstr "不能写文件 '%s' 权限 %o"
c04f5ac3 640
5809aa05 641#: apply.c:4515
c04f5ac3 642#, c-format
a0b6b246
JX
643msgid "Applied patch %s cleanly."
644msgstr "成功应用补丁 %s。"
c04f5ac3 645
5809aa05 646#: apply.c:4523
a0b6b246
JX
647msgid "internal error"
648msgstr "内部错误"
c04f5ac3 649
5809aa05 650#: apply.c:4526
5c57d762 651#, c-format
a0b6b246
JX
652msgid "Applying patch %%s with %d reject..."
653msgid_plural "Applying patch %%s with %d rejects..."
654msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
655msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
5c57d762 656
5809aa05 657#: apply.c:4537
5c57d762 658#, c-format
a0b6b246
JX
659msgid "truncating .rej filename to %.*s.rej"
660msgstr "截短 .rej 文件名为 %.*s.rej"
5c57d762 661
fd8cb379 662#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036
220c313c 663#, c-format
a0b6b246
JX
664msgid "cannot open %s"
665msgstr "不能打开 %s"
220c313c 666
5809aa05 667#: apply.c:4559
220c313c 668#, c-format
a0b6b246
JX
669msgid "Hunk #%d applied cleanly."
670msgstr "第 #%d 个片段成功应用。"
220c313c 671
5809aa05 672#: apply.c:4563
5c57d762 673#, c-format
a0b6b246
JX
674msgid "Rejected hunk #%d."
675msgstr "拒绝第 #%d 个片段。"
5c57d762 676
5809aa05 677#: apply.c:4673
5c57d762 678#, c-format
a0b6b246
JX
679msgid "Skipped patch '%s'."
680msgstr "略过补丁 '%s'。"
5c57d762 681
5809aa05 682#: apply.c:4681
a0b6b246
JX
683msgid "unrecognized input"
684msgstr "未能识别的输入"
5c57d762 685
5809aa05 686#: apply.c:4700
a0b6b246
JX
687msgid "unable to read index file"
688msgstr "无法读取索引文件"
5c57d762 689
5809aa05 690#: apply.c:4837
220c313c 691#, c-format
a0b6b246
JX
692msgid "can't open patch '%s': %s"
693msgstr "不能打开补丁 '%s':%s"
220c313c 694
5809aa05 695#: apply.c:4864
5c57d762 696#, c-format
a0b6b246
JX
697msgid "squelched %d whitespace error"
698msgid_plural "squelched %d whitespace errors"
699msgstr[0] "抑制下仍有 %d 个空白字符误用"
700msgstr[1] "抑制下仍有 %d 个空白字符误用"
5c57d762 701
5809aa05 702#: apply.c:4870 apply.c:4885
5c57d762 703#, c-format
a0b6b246
JX
704msgid "%d line adds whitespace errors."
705msgid_plural "%d lines add whitespace errors."
a4f16749
JX
706msgstr[0] "%d 行新增了空白字符误用。"
707msgstr[1] "%d 行新增了空白字符误用。"
5c57d762 708
5809aa05 709#: apply.c:4878
5c57d762 710#, c-format
a0b6b246
JX
711msgid "%d line applied after fixing whitespace errors."
712msgid_plural "%d lines applied after fixing whitespace errors."
713msgstr[0] "修复空白错误后,应用了 %d 行。"
714msgstr[1] "修复空白错误后,应用了 %d 行。"
5c57d762 715
fd8cb379 716#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389
a0b6b246
JX
717msgid "Unable to write new index file"
718msgstr "无法写入新索引文件"
5c57d762 719
31e5e17b 720#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257
fd8cb379
JX
721#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198
722#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210
723#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584
724#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807
a4f16749 725#: git-add--interactive.perl:197
a0b6b246
JX
726msgid "path"
727msgstr "路径"
5c57d762 728
5809aa05 729#: apply.c:4922
a0b6b246
JX
730msgid "don't apply changes matching the given path"
731msgstr "不要应用与给出路径向匹配的变更"
5c57d762 732
5809aa05 733#: apply.c:4925
a0b6b246
JX
734msgid "apply changes matching the given path"
735msgstr "应用与给出路径向匹配的变更"
220c313c 736
31e5e17b 737#: apply.c:4927 builtin/am.c:2263
a0b6b246
JX
738msgid "num"
739msgstr "数字"
220c313c 740
5809aa05 741#: apply.c:4928
a0b6b246
JX
742msgid "remove <num> leading slashes from traditional diff paths"
743msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
220c313c 744
5809aa05 745#: apply.c:4931
a0b6b246
JX
746msgid "ignore additions made by the patch"
747msgstr "忽略补丁中的添加的文件"
220c313c 748
5809aa05 749#: apply.c:4933
a0b6b246
JX
750msgid "instead of applying the patch, output diffstat for the input"
751msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
220c313c 752
5809aa05 753#: apply.c:4937
a0b6b246
JX
754msgid "show number of added and deleted lines in decimal notation"
755msgstr "以十进制数显示添加和删除的行数"
220c313c 756
5809aa05 757#: apply.c:4939
a0b6b246
JX
758msgid "instead of applying the patch, output a summary for the input"
759msgstr "不应用补丁,而是显示输入的概要"
220c313c 760
5809aa05 761#: apply.c:4941
a0b6b246
JX
762msgid "instead of applying the patch, see if the patch is applicable"
763msgstr "不应用补丁,而是查看补丁是否可应用"
220c313c 764
5809aa05 765#: apply.c:4943
a0b6b246
JX
766msgid "make sure the patch is applicable to the current index"
767msgstr "确认补丁可以应用到当前索引"
276ceeaa 768
5809aa05 769#: apply.c:4945
a0b6b246
JX
770msgid "apply a patch without touching the working tree"
771msgstr "应用补丁而不修改工作区"
5b04ee3b 772
5809aa05 773#: apply.c:4947
a0b6b246
JX
774msgid "accept a patch that touches outside the working area"
775msgstr "接受修改工作区之外文件的补丁"
5c57d762 776
31e5e17b 777#: apply.c:4950
a0b6b246
JX
778msgid "also apply the patch (use with --stat/--summary/--check)"
779msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
c04f5ac3 780
31e5e17b 781#: apply.c:4952
a0b6b246
JX
782msgid "attempt three-way merge if a patch does not apply"
783msgstr "如果一个补丁不能应用则尝试三方合并"
c04f5ac3 784
31e5e17b 785#: apply.c:4954
a0b6b246
JX
786msgid "build a temporary index based on embedded index information"
787msgstr "创建一个临时索引基于嵌入的索引信息"
c04f5ac3 788
31e5e17b 789#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515
a0b6b246
JX
790msgid "paths are separated with NUL character"
791msgstr "路径以 NUL 字符分隔"
8ada9598 792
31e5e17b 793#: apply.c:4959
a0b6b246
JX
794msgid "ensure at least <n> lines of context match"
795msgstr "确保至少匹配 <n> 行上下文"
8ada9598 796
31e5e17b 797#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95
6937cb4e 798#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
fd8cb379 799#: builtin/pack-objects.c:3177
a0b6b246
JX
800msgid "action"
801msgstr "动作"
8ada9598 802
31e5e17b 803#: apply.c:4961
a0b6b246
JX
804msgid "detect new or modified lines that have whitespace errors"
805msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 806
31e5e17b 807#: apply.c:4964 apply.c:4967
a0b6b246
JX
808msgid "ignore changes in whitespace when finding context"
809msgstr "查找上下文时忽略空白字符的变更"
8ada9598 810
31e5e17b 811#: apply.c:4970
a0b6b246
JX
812msgid "apply the patch in reverse"
813msgstr "反向应用补丁"
8ada9598 814
31e5e17b 815#: apply.c:4972
a0b6b246
JX
816msgid "don't expect at least one line of context"
817msgstr "无需至少一行上下文"
8ada9598 818
31e5e17b 819#: apply.c:4974
a0b6b246
JX
820msgid "leave the rejected hunks in corresponding *.rej files"
821msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 822
31e5e17b 823#: apply.c:4976
a0b6b246
JX
824msgid "allow overlapping hunks"
825msgstr "允许重叠的补丁片段"
8ada9598 826
fd8cb379
JX
827#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21
828#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666
829#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124
a0b6b246
JX
830msgid "be verbose"
831msgstr "冗长输出"
8ada9598 832
31e5e17b 833#: apply.c:4979
a0b6b246
JX
834msgid "tolerate incorrectly detected missing new-line at the end of file"
835msgstr "允许不正确的文件末尾换行符"
cfff71a9 836
31e5e17b 837#: apply.c:4982
a0b6b246
JX
838msgid "do not trust the line counts in the hunk headers"
839msgstr "不信任补丁片段的头信息中的行号"
6c94aba5 840
31e5e17b 841#: apply.c:4984 builtin/am.c:2251
a0b6b246
JX
842msgid "root"
843msgstr "根目录"
c04f5ac3 844
31e5e17b 845#: apply.c:4985
a0b6b246
JX
846msgid "prepend <root> to all filenames"
847msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 848
a4f16749 849#: archive.c:13
a0b6b246
JX
850msgid "git archive [<options>] <tree-ish> [<path>...]"
851msgstr "git archive [<选项>] <树或提交> [<路径>...]"
07432cef 852
a4f16749 853#: archive.c:14
a0b6b246
JX
854msgid "git archive --list"
855msgstr "git archive --list"
856
a4f16749 857#: archive.c:15
c04f5ac3 858msgid ""
a0b6b246 859"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
c04f5ac3 860msgstr ""
a0b6b246 861"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
6acbf033 862
a4f16749 863#: archive.c:16
a0b6b246
JX
864msgid "git archive --remote <repo> [--exec <cmd>] --list"
865msgstr "git archive --remote <仓库> [--exec <命令>] --list"
6acbf033 866
fd8cb379 867#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298
c04f5ac3 868#, c-format
a0b6b246
JX
869msgid "pathspec '%s' did not match any files"
870msgstr "路径规格 '%s' 未匹配任何文件"
c04f5ac3 871
fd8cb379 872#: archive.c:434
a0b6b246
JX
873msgid "fmt"
874msgstr "格式"
07432cef 875
fd8cb379 876#: archive.c:434
a0b6b246
JX
877msgid "archive format"
878msgstr "归档格式"
7aea43ff 879
fd8cb379 880#: archive.c:435 builtin/log.c:1462
a0b6b246
JX
881msgid "prefix"
882msgstr "前缀"
7aea43ff 883
fd8cb379 884#: archive.c:436
a0b6b246
JX
885msgid "prepend prefix to each pathname in the archive"
886msgstr "为归档中每个路径名加上前缀"
c04f5ac3 887
fd8cb379
JX
888#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127
889#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869
31e5e17b 890#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554
fd8cb379 891#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119
31e5e17b 892#: parse-options.h:165
a0b6b246
JX
893msgid "file"
894msgstr "文件"
a77c07d9 895
fd8cb379 896#: archive.c:438 builtin/archive.c:89
a0b6b246
JX
897msgid "write the archive to this file"
898msgstr "归档写入此文件"
a77c07d9 899
fd8cb379 900#: archive.c:440
a0b6b246
JX
901msgid "read .gitattributes in working directory"
902msgstr "读取工作区中的 .gitattributes"
7ac1c0ad 903
fd8cb379 904#: archive.c:441
a0b6b246
JX
905msgid "report archived files on stderr"
906msgstr "在标准错误上报告归档文件"
7ac1c0ad 907
fd8cb379 908#: archive.c:442
a0b6b246
JX
909msgid "store only"
910msgstr "只存储"
7ac1c0ad 911
fd8cb379 912#: archive.c:443
a0b6b246
JX
913msgid "compress faster"
914msgstr "压缩速度更快"
8ada9598 915
fd8cb379 916#: archive.c:451
a0b6b246
JX
917msgid "compress better"
918msgstr "压缩效果更好"
8ada9598 919
fd8cb379 920#: archive.c:454
a0b6b246
JX
921msgid "list supported archive formats"
922msgstr "列出支持的归档格式"
a77c07d9 923
fd8cb379
JX
924#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113
925#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593
a0b6b246
JX
926msgid "repo"
927msgstr "仓库"
c04f5ac3 928
fd8cb379 929#: archive.c:457 builtin/archive.c:91
a0b6b246
JX
930msgid "retrieve the archive from remote repository <repo>"
931msgstr "从远程仓库(<仓库>)提取归档文件"
8ada9598 932
fd8cb379 933#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489
a0b6b246
JX
934msgid "command"
935msgstr "命令"
936
fd8cb379 937#: archive.c:459 builtin/archive.c:93
a0b6b246
JX
938msgid "path to the remote git-upload-archive command"
939msgstr "远程 git-upload-archive 命令的路径"
940
fd8cb379 941#: archive.c:466
a0b6b246
JX
942msgid "Unexpected option --remote"
943msgstr "未知参数 --remote"
944
fd8cb379 945#: archive.c:468
a0b6b246
JX
946msgid "Option --exec can only be used together with --remote"
947msgstr "选项 --exec 只能和 --remote 同时使用"
948
fd8cb379 949#: archive.c:470
a0b6b246
JX
950msgid "Unexpected option --output"
951msgstr "未知参数 --output"
952
fd8cb379 953#: archive.c:492
a0b6b246
JX
954#, c-format
955msgid "Unknown archive format '%s'"
956msgstr "未知归档格式 '%s'"
957
fd8cb379 958#: archive.c:499
8ada9598 959#, c-format
a0b6b246
JX
960msgid "Argument not supported for format '%s': -%d"
961msgstr "参数不支持此格式 '%s':-%d"
962
6937cb4e 963#: attr.c:218
87cb7997
JX
964#, c-format
965msgid "%.*s is not a valid attribute name"
966msgstr "%.*s 不是一个有效的属性名"
967
6937cb4e 968#: attr.c:415
8ada9598 969msgid ""
a0b6b246
JX
970"Negative patterns are ignored in git attributes\n"
971"Use '\\!' for literal leading exclamation."
8ada9598 972msgstr ""
a0b6b246
JX
973"负值模版在 git attributes 中被忽略\n"
974"当字符串确实要以感叹号开始时,使用 '\\!'。"
8ada9598 975
fd8cb379 976#: bisect.c:461
8ada9598 977#, c-format
a0b6b246
JX
978msgid "Badly quoted content in file '%s': %s"
979msgstr "文件 '%s' 包含错误的引用格式:%s"
8ada9598 980
fd8cb379 981#: bisect.c:669
a0b6b246
JX
982#, c-format
983msgid "We cannot bisect more!\n"
984msgstr "我们无法进行更多的二分查找!\n"
8ada9598 985
fd8cb379 986#: bisect.c:723
2e8451e8 987#, c-format
a0b6b246
JX
988msgid "Not a valid commit name %s"
989msgstr "不是一个有效的提交名 %s"
2e8451e8 990
fd8cb379 991#: bisect.c:747
5b04ee3b
JX
992#, c-format
993msgid ""
a0b6b246
JX
994"The merge base %s is bad.\n"
995"This means the bug has been fixed between %s and [%s].\n"
5b04ee3b 996msgstr ""
a0b6b246
JX
997"合并基线 %s 是坏的。\n"
998"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
5b04ee3b 999
fd8cb379 1000#: bisect.c:752
5b04ee3b 1001#, c-format
a0b6b246
JX
1002msgid ""
1003"The merge base %s is new.\n"
1004"The property has changed between %s and [%s].\n"
1005msgstr ""
1006"合并基线 %s 是新的。\n"
1007"介于 %s 和 [%s] 之间的属性已经被修改。\n"
5b04ee3b 1008
fd8cb379 1009#: bisect.c:757
a0b6b246
JX
1010#, c-format
1011msgid ""
1012"The merge base %s is %s.\n"
1013"This means the first '%s' commit is between %s and [%s].\n"
1014msgstr ""
1015"合并基线 %s 是 %s。\n"
1016"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
07432cef 1017
fd8cb379 1018#: bisect.c:765
a0b6b246
JX
1019#, c-format
1020msgid ""
1a79b2f1 1021"Some %s revs are not ancestors of the %s rev.\n"
a0b6b246
JX
1022"git bisect cannot work properly in this case.\n"
1023"Maybe you mistook %s and %s revs?\n"
1024msgstr ""
1025"一些 %s 版本不是 %s 版本的祖先。\n"
1026"这种情况下 git 二分查找无法正常工作。\n"
1027"您可能弄错了 %s 和 %s 版本?\n"
07432cef 1028
fd8cb379 1029#: bisect.c:778
a0b6b246
JX
1030#, c-format
1031msgid ""
1032"the merge base between %s and [%s] must be skipped.\n"
1033"So we cannot be sure the first %s commit is between %s and %s.\n"
1034"We continue anyway."
1035msgstr ""
1036"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1037"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1038"我们仍旧继续。"
649900bc 1039
fd8cb379 1040#: bisect.c:811
649900bc 1041#, c-format
a0b6b246
JX
1042msgid "Bisecting: a merge base must be tested\n"
1043msgstr "二分查找中:合并基线必须是经过测试的\n"
649900bc 1044
fd8cb379 1045#: bisect.c:851
a0b6b246
JX
1046#, c-format
1047msgid "a %s revision is needed"
1048msgstr "需要一个 %s 版本"
649900bc 1049
fd8cb379 1050#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236
649900bc 1051#, c-format
a0b6b246
JX
1052msgid "could not create file '%s'"
1053msgstr "不能创建文件 '%s'"
649900bc 1054
fd8cb379 1055#: bisect.c:921
649900bc 1056#, c-format
a0b6b246
JX
1057msgid "could not read file '%s'"
1058msgstr "不能读取文件 '%s'"
649900bc 1059
fd8cb379 1060#: bisect.c:951
a0b6b246
JX
1061msgid "reading bisect refs failed"
1062msgstr "读取二分查找引用失败"
649900bc 1063
fd8cb379 1064#: bisect.c:970
649900bc 1065#, c-format
a0b6b246
JX
1066msgid "%s was both %s and %s\n"
1067msgstr "%s 同时为 %s 和 %s\n"
649900bc 1068
fd8cb379 1069#: bisect.c:978
649900bc 1070#, c-format
a0b6b246
JX
1071msgid ""
1072"No testable commit found.\n"
1073"Maybe you started with bad path parameters?\n"
1074msgstr ""
1075"没有发现可测试的提交。\n"
1076"可能您在运行时使用了错误的路径参数?\n"
649900bc 1077
fd8cb379 1078#: bisect.c:997
649900bc 1079#, c-format
a0b6b246
JX
1080msgid "(roughly %d step)"
1081msgid_plural "(roughly %d steps)"
1082msgstr[0] "(大概 %d 步)"
1083msgstr[1] "(大概 %d 步)"
649900bc 1084
a4f16749
JX
1085#. TRANSLATORS: the last %s will be replaced with "(roughly %d
1086#. steps)" translation.
1087#.
fd8cb379 1088#: bisect.c:1003
649900bc 1089#, c-format
a0b6b246
JX
1090msgid "Bisecting: %d revision left to test after this %s\n"
1091msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1092msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1093msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
649900bc 1094
fd8cb379 1095#: blame.c:1756
a4f16749
JX
1096msgid "--contents and --reverse do not blend well."
1097msgstr "--contents 和 --reverse 不能混用。"
1098
fd8cb379 1099#: blame.c:1767
a4f16749
JX
1100msgid "cannot use --contents with final commit object name"
1101msgstr "不能将 --contents 和最终的提交对象名共用"
1102
fd8cb379 1103#: blame.c:1787
a4f16749
JX
1104msgid "--reverse and --first-parent together require specified latest commit"
1105msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
1106
fd8cb379
JX
1107#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861
1108#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920
1109#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372
1110#: builtin/shortlog.c:192
a4f16749
JX
1111msgid "revision walk setup failed"
1112msgstr "版本遍历设置失败"
1113
fd8cb379 1114#: blame.c:1814
a4f16749
JX
1115msgid ""
1116"--reverse --first-parent together require range along first-parent chain"
1117msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
1118
fd8cb379 1119#: blame.c:1825
a4f16749
JX
1120#, c-format
1121msgid "no such path %s in %s"
1122msgstr "在 %2$s 中无此路径 %1$s"
1123
fd8cb379 1124#: blame.c:1836
a4f16749
JX
1125#, c-format
1126msgid "cannot read blob %s for path %s"
1127msgstr "不能为路径 %2$s 读取数据对象 %1$s"
1128
fd8cb379 1129#: branch.c:54
649900bc 1130#, c-format
a0b6b246
JX
1131msgid ""
1132"\n"
1133"After fixing the error cause you may try to fix up\n"
1134"the remote tracking information by invoking\n"
1135"\"git branch --set-upstream-to=%s%s%s\"."
1136msgstr ""
1137"\n"
1138"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1139"\"git branch --set-upstream-to=%s%s%s\" 。"
649900bc 1140
fd8cb379 1141#: branch.c:68
649900bc 1142#, c-format
a0b6b246
JX
1143msgid "Not setting branch %s as its own upstream."
1144msgstr "未设置分支 %s 作为它自己的上游。"
649900bc 1145
fd8cb379 1146#: branch.c:94
649900bc 1147#, c-format
6937cb4e
JX
1148msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
1149msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 1150
fd8cb379 1151#: branch.c:95
649900bc 1152#, c-format
6937cb4e
JX
1153msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
1154msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 1155
fd8cb379 1156#: branch.c:99
649900bc 1157#, c-format
6937cb4e
JX
1158msgid "Branch '%s' set up to track local branch '%s' by rebasing."
1159msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
649900bc 1160
fd8cb379 1161#: branch.c:100
649900bc 1162#, c-format
6937cb4e 1163msgid "Branch '%s' set up to track local branch '%s'."
493a9322 1164msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
649900bc 1165
fd8cb379 1166#: branch.c:105
649900bc 1167#, c-format
6937cb4e
JX
1168msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
1169msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
649900bc 1170
fd8cb379 1171#: branch.c:106
649900bc 1172#, c-format
6937cb4e
JX
1173msgid "Branch '%s' set up to track remote ref '%s'."
1174msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
649900bc 1175
fd8cb379 1176#: branch.c:110
649900bc 1177#, c-format
6937cb4e
JX
1178msgid "Branch '%s' set up to track local ref '%s' by rebasing."
1179msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
649900bc 1180
fd8cb379 1181#: branch.c:111
649900bc 1182#, c-format
6937cb4e
JX
1183msgid "Branch '%s' set up to track local ref '%s'."
1184msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
649900bc 1185
fd8cb379 1186#: branch.c:120
a0b6b246
JX
1187msgid "Unable to write upstream branch configuration"
1188msgstr "无法写入上游分支配置"
649900bc 1189
fd8cb379 1190#: branch.c:157
649900bc 1191#, c-format
a0b6b246
JX
1192msgid "Not tracking: ambiguous information for ref %s"
1193msgstr "未跟踪:引用 %s 有歧义"
649900bc 1194
fd8cb379 1195#: branch.c:190
649900bc 1196#, c-format
a0b6b246
JX
1197msgid "'%s' is not a valid branch name."
1198msgstr "'%s' 不是一个有效的分支名称。"
649900bc 1199
fd8cb379 1200#: branch.c:209
649900bc 1201#, c-format
a0b6b246
JX
1202msgid "A branch named '%s' already exists."
1203msgstr "一个分支名 '%s' 已经存在。"
649900bc 1204
fd8cb379 1205#: branch.c:214
a0b6b246
JX
1206msgid "Cannot force update the current branch."
1207msgstr "无法强制更新当前分支。"
649900bc 1208
fd8cb379 1209#: branch.c:234
649900bc 1210#, c-format
a0b6b246
JX
1211msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1212msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
649900bc 1213
fd8cb379 1214#: branch.c:236
649900bc 1215#, c-format
a0b6b246
JX
1216msgid "the requested upstream branch '%s' does not exist"
1217msgstr "请求的上游分支 '%s' 不存在"
649900bc 1218
fd8cb379 1219#: branch.c:238
a0b6b246
JX
1220msgid ""
1221"\n"
1222"If you are planning on basing your work on an upstream\n"
1223"branch that already exists at the remote, you may need to\n"
1224"run \"git fetch\" to retrieve it.\n"
1225"\n"
1226"If you are planning to push out a new local branch that\n"
1227"will track its remote counterpart, you may want to use\n"
1228"\"git push -u\" to set the upstream config as you push."
1229msgstr ""
1230"\n"
1231"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
1232"您可能需要执行 \"git fetch\" 来获取分支。\n"
1233"\n"
1234"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
1235"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
649900bc 1236
fd8cb379 1237#: branch.c:281
649900bc 1238#, c-format
a0b6b246
JX
1239msgid "Not a valid object name: '%s'."
1240msgstr "不是一个有效的对象名:'%s'。"
649900bc 1241
fd8cb379 1242#: branch.c:301
649900bc 1243#, c-format
a0b6b246
JX
1244msgid "Ambiguous object name: '%s'."
1245msgstr "歧义的对象名:'%s'。"
649900bc 1246
fd8cb379 1247#: branch.c:306
649900bc 1248#, c-format
a0b6b246
JX
1249msgid "Not a valid branch point: '%s'."
1250msgstr "无效的分支点:'%s'。"
649900bc 1251
fd8cb379 1252#: branch.c:360
649900bc 1253#, c-format
a0b6b246
JX
1254msgid "'%s' is already checked out at '%s'"
1255msgstr "'%s' 已经检出到 '%s'"
649900bc 1256
fd8cb379 1257#: branch.c:383
a0b6b246
JX
1258#, c-format
1259msgid "HEAD of working tree %s is not updated"
1260msgstr "工作区 %s 的 HEAD 指向没有被更新"
649900bc 1261
a0b6b246 1262#: bundle.c:34
649900bc 1263#, c-format
a0b6b246
JX
1264msgid "'%s' does not look like a v2 bundle file"
1265msgstr "'%s' 不像是一个 v2 版本的包文件"
649900bc 1266
a4f16749 1267#: bundle.c:62
a0b6b246
JX
1268#, c-format
1269msgid "unrecognized header: %s%s (%d)"
1270msgstr "未能识别的包头:%s%s (%d)"
649900bc 1271
fd8cb379 1272#: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755
649900bc 1273#, c-format
a0b6b246
JX
1274msgid "could not open '%s'"
1275msgstr "不能打开 '%s'"
649900bc 1276
31e5e17b 1277#: bundle.c:139
a0b6b246
JX
1278msgid "Repository lacks these prerequisite commits:"
1279msgstr "仓库中缺少这些必备的提交:"
649900bc 1280
31e5e17b 1281#: bundle.c:190
2e8451e8 1282#, c-format
a0b6b246
JX
1283msgid "The bundle contains this ref:"
1284msgid_plural "The bundle contains these %d refs:"
1285msgstr[0] "这个包中含有这个引用:"
1286msgstr[1] "这个包中含有 %d 个引用:"
2e8451e8 1287
31e5e17b 1288#: bundle.c:197
a0b6b246
JX
1289msgid "The bundle records a complete history."
1290msgstr "这个包记录一个完整历史。"
2e8451e8 1291
31e5e17b 1292#: bundle.c:199
2e8451e8 1293#, c-format
a0b6b246
JX
1294msgid "The bundle requires this ref:"
1295msgid_plural "The bundle requires these %d refs:"
1296msgstr[0] "这个包需要这个引用:"
1297msgstr[1] "这个包需要 %d 个引用:"
2e8451e8 1298
31e5e17b 1299#: bundle.c:258
a0b6b246
JX
1300msgid "Could not spawn pack-objects"
1301msgstr "不能生成 pack-objects 进程"
1003b3a5 1302
31e5e17b 1303#: bundle.c:269
a0b6b246
JX
1304msgid "pack-objects died"
1305msgstr "pack-objects 终止"
8ada9598 1306
31e5e17b 1307#: bundle.c:311
a0b6b246
JX
1308msgid "rev-list died"
1309msgstr "rev-list 终止"
1310
31e5e17b 1311#: bundle.c:360
81809b99 1312#, c-format
a0b6b246
JX
1313msgid "ref '%s' is excluded by the rev-list options"
1314msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 1315
fd8cb379 1316#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303
81809b99 1317#, c-format
a0b6b246
JX
1318msgid "unrecognized argument: %s"
1319msgstr "未能识别的参数:%s"
8ada9598 1320
31e5e17b 1321#: bundle.c:458
a0b6b246
JX
1322msgid "Refusing to create empty bundle."
1323msgstr "不能创建空包。"
1324
31e5e17b 1325#: bundle.c:470
81809b99 1326#, c-format
a0b6b246
JX
1327msgid "cannot create '%s'"
1328msgstr "不能创建 '%s'"
8ada9598 1329
31e5e17b 1330#: bundle.c:498
a0b6b246
JX
1331msgid "index-pack died"
1332msgstr "index-pack 终止"
63af42fe 1333
31e5e17b 1334#: color.c:296
94550ed3 1335#, c-format
a0b6b246
JX
1336msgid "invalid color value: %.*s"
1337msgstr "无效的颜色值:%.*s"
94550ed3 1338
fd8cb379
JX
1339#: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465
1340#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376
1341#: builtin/replace.c:448
94550ed3 1342#, c-format
a0b6b246
JX
1343msgid "could not parse %s"
1344msgstr "不能解析 %s"
94550ed3 1345
fd8cb379 1346#: commit.c:45
a0b6b246
JX
1347#, c-format
1348msgid "%s %s is not a commit!"
31e5e17b 1349msgstr "%s %s 不是一个提交!"
90314792 1350
fd8cb379
JX
1351#: commit.c:182
1352msgid ""
1353"Support for <GIT_DIR>/info/grafts is deprecated\n"
1354"and will be removed in a future Git version.\n"
1355"\n"
1356"Please use \"git replace --convert-graft-file\"\n"
1357"to convert the grafts into replace refs.\n"
1358"\n"
1359"Turn this message off by running\n"
1360"\"git config advice.graftFileDeprecated false\""
1361msgstr ""
1362"对 <GIT_DIR>/info/grafts 的支持已被弃用,并将在\n"
1363"未来的Git版本中被移除。\n"
1364"\n"
1365"请使用 \"git replace --convert-graft-file\" 将\n"
1366"grafts 转换为替换引用。\n"
1367"\n"
1368"设置 \"git config advice.graftFileDeprecated false\"\n"
1369"可关闭本消息"
1370
1371#: commit.c:1540
90314792 1372msgid ""
a0b6b246
JX
1373"Warning: commit message did not conform to UTF-8.\n"
1374"You may want to amend it after fixing the message, or set the config\n"
1375"variable i18n.commitencoding to the encoding your project uses.\n"
1376msgstr ""
29004bbb 1377"警告:提交说明不符合 UTF-8 字符编码。\n"
a0b6b246 1378"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
29004bbb 1379"设置为您项目所用的字符编码。\n"
90314792 1380
fd8cb379
JX
1381#: commit-graph.c:669
1382#, c-format
1383msgid "the commit graph format cannot write %d commits"
1384msgstr "提交图形格式不能写入 %d 个提交"
1385
1386#: commit-graph.c:696
1387msgid "too many commits to write graph"
1388msgstr "提交太多不能画图"
1389
1390#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521
1391#, c-format
1392msgid "cannot mkdir %s"
1393msgstr "不能创建目录 %s"
1394
5809aa05 1395#: compat/obstack.c:405 compat/obstack.c:407
a0b6b246
JX
1396msgid "memory exhausted"
1397msgstr "内存耗尽"
90314792 1398
fd8cb379 1399#: config.c:187
87cb7997
JX
1400msgid "relative config include conditionals must come from files"
1401msgstr "包含相对路径的条件引用必须来自于文件"
1402
fd8cb379 1403#: config.c:788
90314792 1404#, c-format
a0b6b246
JX
1405msgid "bad config line %d in blob %s"
1406msgstr "数据对象 %2$s 中错误的配置行 %1$d"
90314792 1407
fd8cb379 1408#: config.c:792
a77c07d9 1409#, c-format
a0b6b246
JX
1410msgid "bad config line %d in file %s"
1411msgstr "文件 %2$s 中错误的配置行 %1$d"
a77c07d9 1412
fd8cb379 1413#: config.c:796
a77c07d9 1414#, c-format
a0b6b246
JX
1415msgid "bad config line %d in standard input"
1416msgstr "标准输入中错误的配置行 %d"
a77c07d9 1417
fd8cb379 1418#: config.c:800
90314792 1419#, c-format
a0b6b246
JX
1420msgid "bad config line %d in submodule-blob %s"
1421msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
90314792 1422
fd8cb379 1423#: config.c:804
90314792 1424#, c-format
a0b6b246
JX
1425msgid "bad config line %d in command line %s"
1426msgstr "命令行 %2$s 中错误的配置行 %1$d"
90314792 1427
fd8cb379 1428#: config.c:808
90314792 1429#, c-format
a0b6b246
JX
1430msgid "bad config line %d in %s"
1431msgstr "在 %2$s 中错误的配置行 %1$d"
220c313c 1432
fd8cb379 1433#: config.c:936
a0b6b246
JX
1434msgid "out of range"
1435msgstr "超出范围"
6c94aba5 1436
fd8cb379 1437#: config.c:936
a0b6b246
JX
1438msgid "invalid unit"
1439msgstr "无效的单位"
6c94aba5 1440
fd8cb379 1441#: config.c:942
6c94aba5 1442#, c-format
a0b6b246
JX
1443msgid "bad numeric config value '%s' for '%s': %s"
1444msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
6c94aba5 1445
fd8cb379 1446#: config.c:947
1b7f4a34 1447#, c-format
a0b6b246
JX
1448msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
1449msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 1450
fd8cb379 1451#: config.c:950
1b7f4a34 1452#, c-format
a0b6b246
JX
1453msgid "bad numeric config value '%s' for '%s' in file %s: %s"
1454msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 1455
fd8cb379 1456#: config.c:953
1b7f4a34 1457#, c-format
a0b6b246
JX
1458msgid "bad numeric config value '%s' for '%s' in standard input: %s"
1459msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
1b7f4a34 1460
fd8cb379 1461#: config.c:956
1b7f4a34 1462#, c-format
a0b6b246
JX
1463msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
1464msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 1465
fd8cb379 1466#: config.c:959
94550ed3 1467#, c-format
a0b6b246
JX
1468msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
1469msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 1470
fd8cb379 1471#: config.c:962
276ceeaa 1472#, c-format
a0b6b246
JX
1473msgid "bad numeric config value '%s' for '%s' in %s: %s"
1474msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 1475
fd8cb379 1476#: config.c:1057
276ceeaa 1477#, c-format
a0b6b246
JX
1478msgid "failed to expand user dir in: '%s'"
1479msgstr "无法扩展 '%s' 中的用户目录"
94550ed3 1480
fd8cb379 1481#: config.c:1066
5809aa05
JX
1482#, c-format
1483msgid "'%s' for '%s' is not a valid timestamp"
1484msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
1485
fd8cb379 1486#: config.c:1171 config.c:1182
3495628d 1487#, c-format
a0b6b246
JX
1488msgid "bad zlib compression level %d"
1489msgstr "错误的 zlib 压缩级别 %d"
3495628d 1490
fd8cb379 1491#: config.c:1307
3495628d 1492#, c-format
a0b6b246
JX
1493msgid "invalid mode for object creation: %s"
1494msgstr "无效的对象创建模式:%s"
3495628d 1495
fd8cb379 1496#: config.c:1473
1a79b2f1
JX
1497#, c-format
1498msgid "bad pack compression level %d"
1499msgstr "错误的打包压缩级别 %d"
1500
fd8cb379 1501#: config.c:1681
a0b6b246
JX
1502msgid "unable to parse command-line config"
1503msgstr "无法解析命令行中的配置"
94550ed3 1504
fd8cb379 1505#: config.c:2013
a0b6b246
JX
1506msgid "unknown error occurred while reading the configuration files"
1507msgstr "在读取配置文件时遇到未知错误"
94550ed3 1508
fd8cb379 1509#: config.c:2200
87cb7997
JX
1510#, c-format
1511msgid "Invalid %s: '%s'"
1512msgstr "无效 %s:'%s'"
1513
fd8cb379 1514#: config.c:2243
87cb7997
JX
1515#, c-format
1516msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
1517msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'"
1518
fd8cb379 1519#: config.c:2269
87cb7997
JX
1520#, c-format
1521msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
1522msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
1523
fd8cb379 1524#: config.c:2294
276ceeaa 1525#, c-format
a0b6b246
JX
1526msgid "unable to parse '%s' from command-line config"
1527msgstr "无法解析命令行配置中的 '%s'"
1b7f4a34 1528
fd8cb379 1529#: config.c:2296
94550ed3 1530#, c-format
a0b6b246
JX
1531msgid "bad config variable '%s' in file '%s' at line %d"
1532msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
94550ed3 1533
fd8cb379 1534#: config.c:2402
276ceeaa 1535#, c-format
a0b6b246
JX
1536msgid "%s has multiple values"
1537msgstr "%s 有多个取值"
276ceeaa 1538
fd8cb379 1539#: config.c:2766 config.c:3019
1a79b2f1
JX
1540#, c-format
1541msgid "fstat on %s failed"
65e2041e 1542msgstr "对 %s 调用 fstat 失败"
1a79b2f1 1543
fd8cb379 1544#: config.c:2905
94550ed3 1545#, c-format
a0b6b246
JX
1546msgid "could not set '%s' to '%s'"
1547msgstr "不能设置 '%s' 为 '%s'"
94550ed3 1548
fd8cb379 1549#: config.c:2907 builtin/remote.c:779
276ceeaa 1550#, c-format
a0b6b246
JX
1551msgid "could not unset '%s'"
1552msgstr "不能取消设置 '%s'"
276ceeaa 1553
fd8cb379 1554#: connect.c:61
a0b6b246 1555msgid "The remote end hung up upon initial contact"
29004bbb 1556msgstr "远端在连接发起时即挂断"
94550ed3 1557
fd8cb379 1558#: connect.c:63
a0b6b246
JX
1559msgid ""
1560"Could not read from remote repository.\n"
1561"\n"
1562"Please make sure you have the correct access rights\n"
1563"and the repository exists."
1564msgstr ""
1565"无法读取远程仓库。\n"
1566"\n"
1567"请确认您有正确的访问权限并且仓库存在。"
1568
fd8cb379 1569#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145
a0b6b246
JX
1570msgid "Checking connectivity"
1571msgstr "检查连接中"
1572
31e5e17b 1573#: connected.c:78
a0b6b246
JX
1574msgid "Could not run 'git rev-list'"
1575msgstr "不能执行 'git rev-list'"
1576
31e5e17b 1577#: connected.c:98
a0b6b246
JX
1578msgid "failed write to rev-list"
1579msgstr "无法写入 rev-list"
1580
31e5e17b 1581#: connected.c:105
a0b6b246
JX
1582msgid "failed to close rev-list's stdin"
1583msgstr "无法关闭 rev-list 的标准输入"
1584
fd8cb379 1585#: convert.c:206
3495628d 1586#, c-format
31e5e17b
JX
1587msgid "CRLF would be replaced by LF in %s."
1588msgstr "文件 %s 中的 CRLF 将被 LF 替换。"
1589
fd8cb379 1590#: convert.c:208
31e5e17b 1591#, c-format
a0b6b246
JX
1592msgid ""
1593"CRLF will be replaced by LF in %s.\n"
1594"The file will have its original line endings in your working directory."
1595msgstr ""
1596"文件 %s 中的 CRLF 将被 LF 替换。\n"
1597"在工作区中该文件仍保持原有的换行符。"
3495628d 1598
fd8cb379 1599#: convert.c:216
3495628d 1600#, c-format
31e5e17b
JX
1601msgid "LF would be replaced by CRLF in %s"
1602msgstr "文件 %s 中的 LF 将被 CRLF 替换"
3495628d 1603
fd8cb379 1604#: convert.c:218
276ceeaa 1605#, c-format
a0b6b246
JX
1606msgid ""
1607"LF will be replaced by CRLF in %s.\n"
1608"The file will have its original line endings in your working directory."
1609msgstr ""
1610"文件 %s 中的 LF 将被 CRLF 替换。\n"
1611"在工作区中该文件仍保持原有的换行符。"
276ceeaa 1612
fd8cb379
JX
1613#: convert.c:279
1614#, c-format
1615msgid "BOM is prohibited in '%s' if encoded as %s"
1616msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM"
1617
1618#: convert.c:286
1619#, c-format
1620msgid ""
1621"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
1622"tree-encoding."
1623msgstr "文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%s 作为工作区编码。"
1624
1625#: convert.c:304
1626#, c-format
1627msgid "BOM is required in '%s' if encoded as %s"
1628msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM"
1629
1630#: convert.c:306
1631#, c-format
1632msgid ""
1633"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
1634"%sLE (depending on the byte order) as working-tree-encoding."
1635msgstr ""
1636"文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字"
1637"节序)作为工作区编码。"
1638
1639#: convert.c:424
1640#, c-format
1641msgid "failed to encode '%s' from %s to %s"
1642msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
1643
1644#: convert.c:467
1645#, c-format
1646msgid "encoding '%s' from %s to %s and back is not the same"
1647msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
1648
1649#: convert.c:1225
1650msgid "true/false are no valid working-tree-encodings"
1651msgstr "true/false 不是有效的工作区编码"
1652
a4f16749 1653#: date.c:116
a0b6b246
JX
1654msgid "in the future"
1655msgstr "在将来"
3495628d 1656
a4f16749 1657#: date.c:122
3495628d 1658#, c-format
a4f16749
JX
1659msgid "%<PRIuMAX> second ago"
1660msgid_plural "%<PRIuMAX> seconds ago"
1661msgstr[0] "%<PRIuMAX> 秒钟前"
1662msgstr[1] "%<PRIuMAX> 秒钟前"
3495628d 1663
a4f16749 1664#: date.c:129
3495628d 1665#, c-format
a4f16749
JX
1666msgid "%<PRIuMAX> minute ago"
1667msgid_plural "%<PRIuMAX> minutes ago"
1668msgstr[0] "%<PRIuMAX> 分钟前"
1669msgstr[1] "%<PRIuMAX> 分钟前"
3495628d 1670
a4f16749 1671#: date.c:136
3495628d 1672#, c-format
a4f16749
JX
1673msgid "%<PRIuMAX> hour ago"
1674msgid_plural "%<PRIuMAX> hours ago"
1675msgstr[0] "%<PRIuMAX> 小时前"
1676msgstr[1] "%<PRIuMAX> 小时前"
3495628d 1677
a4f16749 1678#: date.c:143
3495628d 1679#, c-format
a4f16749
JX
1680msgid "%<PRIuMAX> day ago"
1681msgid_plural "%<PRIuMAX> days ago"
1682msgstr[0] "%<PRIuMAX> 天前"
1683msgstr[1] "%<PRIuMAX> 天前"
3495628d 1684
a4f16749 1685#: date.c:149
94550ed3 1686#, c-format
a4f16749
JX
1687msgid "%<PRIuMAX> week ago"
1688msgid_plural "%<PRIuMAX> weeks ago"
1689msgstr[0] "%<PRIuMAX> 周前"
1690msgstr[1] "%<PRIuMAX> 周前"
94550ed3 1691
a4f16749 1692#: date.c:156
3495628d 1693#, c-format
a4f16749
JX
1694msgid "%<PRIuMAX> month ago"
1695msgid_plural "%<PRIuMAX> months ago"
1696msgstr[0] "%<PRIuMAX> 个月前"
1697msgstr[1] "%<PRIuMAX> 个月前"
3495628d 1698
a4f16749 1699#: date.c:167
3495628d 1700#, c-format
a4f16749
JX
1701msgid "%<PRIuMAX> year"
1702msgid_plural "%<PRIuMAX> years"
1703msgstr[0] "%<PRIuMAX> 年"
1704msgstr[1] "%<PRIuMAX> 年"
3495628d 1705
a0b6b246 1706#. TRANSLATORS: "%s" is "<n> years"
a4f16749 1707#: date.c:170
94550ed3 1708#, c-format
a4f16749
JX
1709msgid "%s, %<PRIuMAX> month ago"
1710msgid_plural "%s, %<PRIuMAX> months ago"
1711msgstr[0] "%s %<PRIuMAX> 个月前"
1712msgstr[1] "%s %<PRIuMAX> 个月前"
94550ed3 1713
a4f16749 1714#: date.c:175 date.c:180
94550ed3 1715#, c-format
a4f16749
JX
1716msgid "%<PRIuMAX> year ago"
1717msgid_plural "%<PRIuMAX> years ago"
1718msgstr[0] "%<PRIuMAX> 年前"
1719msgstr[1] "%<PRIuMAX> 年前"
94550ed3 1720
a0b6b246 1721#: diffcore-order.c:24
cfff71a9 1722#, c-format
a0b6b246
JX
1723msgid "failed to read orderfile '%s'"
1724msgstr "无法读取排序文件 '%s'"
cfff71a9 1725
5809aa05 1726#: diffcore-rename.c:535
a0b6b246 1727msgid "Performing inexact rename detection"
87cb7997 1728msgstr "正在进行非精确的重命名探测"
cfff71a9 1729
6937cb4e 1730#: diff.c:74
cfff71a9 1731#, c-format
a0b6b246
JX
1732msgid "option '%s' requires a value"
1733msgstr "选项 '%s' 需要一个值"
cfff71a9 1734
a0b6b246 1735# 译者:注意保持前导空格
6937cb4e 1736#: diff.c:152
a0b6b246
JX
1737#, c-format
1738msgid " Failed to parse dirstat cut-off percentage '%s'\n"
1739msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
cfff71a9 1740
a0b6b246 1741# 译者:注意保持前导空格
6937cb4e 1742#: diff.c:157
a0b6b246
JX
1743#, c-format
1744msgid " Unknown dirstat parameter '%s'\n"
1745msgstr " 未知的 dirstat 参数 '%s'\n"
7aea43ff 1746
6937cb4e
JX
1747#: diff.c:281
1748msgid ""
1749"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
1750"'plain'"
5809aa05
JX
1751msgstr ""
1752"代码移动的颜色设置必须是 'no'、'default'、'zebra'、'dimmed_zebra' 或 'plain'"
6937cb4e
JX
1753
1754#: diff.c:341
7aea43ff 1755#, c-format
a0b6b246
JX
1756msgid "Unknown value for 'diff.submodule' config variable: '%s'"
1757msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
7aea43ff 1758
5809aa05 1759#: diff.c:401
7aea43ff 1760#, c-format
a0b6b246
JX
1761msgid ""
1762"Found errors in 'diff.dirstat' config variable:\n"
1763"%s"
1764msgstr ""
1765"发现配置变量 'diff.dirstat' 中的错误:\n"
1766"%s"
7aea43ff 1767
fd8cb379 1768#: diff.c:3823
7aea43ff 1769#, c-format
a0b6b246
JX
1770msgid "external diff died, stopping at %s"
1771msgstr "外部 diff 退出,停止在 %s"
7aea43ff 1772
fd8cb379 1773#: diff.c:4153
a0b6b246
JX
1774msgid "--name-only, --name-status, --check and -s are mutually exclusive"
1775msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
1776
fd8cb379 1777#: diff.c:4156
31e5e17b
JX
1778msgid "-G, -S and --find-object are mutually exclusive"
1779msgstr "-G、-S 和 --find-object 是互斥的"
1780
fd8cb379 1781#: diff.c:4244
a0b6b246
JX
1782msgid "--follow requires exactly one pathspec"
1783msgstr "--follow 明确要求只跟一个路径规格"
1784
fd8cb379 1785#: diff.c:4410
7aea43ff 1786#, c-format
a0b6b246
JX
1787msgid ""
1788"Failed to parse --dirstat/-X option parameter:\n"
1789"%s"
1790msgstr ""
1791"无法解析 --dirstat/-X 选项的参数:\n"
1792"%s"
7aea43ff 1793
fd8cb379 1794#: diff.c:4424
7aea43ff 1795#, c-format
a0b6b246
JX
1796msgid "Failed to parse --submodule option parameter: '%s'"
1797msgstr "无法解析 --submodule 选项的参数:'%s'"
7aea43ff 1798
fd8cb379 1799#: diff.c:5500
a0b6b246
JX
1800msgid "inexact rename detection was skipped due to too many files."
1801msgstr "因为文件太多,略过不严格的重命名检查。"
1802
fd8cb379 1803#: diff.c:5503
a0b6b246
JX
1804msgid "only found copies from modified paths due to too many files."
1805msgstr "因为文件太多,只在修改的路径中查找拷贝。"
1806
fd8cb379 1807#: diff.c:5506
7aea43ff 1808#, c-format
a0b6b246
JX
1809msgid ""
1810"you may want to set your %s variable to at least %d and retry the command."
29004bbb 1811msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
7aea43ff 1812
fd8cb379 1813#: dir.c:1867
31e5e17b
JX
1814#, c-format
1815msgid "could not open directory '%s'"
1816msgstr "不能打开目录 '%s'"
1817
fd8cb379 1818#: dir.c:2109
a0b6b246
JX
1819msgid "failed to get kernel name and information"
1820msgstr "无法获得内核名称和信息"
7aea43ff 1821
fd8cb379 1822#: dir.c:2233
a0b6b246
JX
1823msgid "Untracked cache is disabled on this system or location."
1824msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
7aea43ff 1825
fd8cb379 1826#: dir.c:3075 dir.c:3080
87cb7997
JX
1827#, c-format
1828msgid "could not create directories for %s"
1829msgstr "不能为 %s 创建目录"
1830
fd8cb379 1831#: dir.c:3109
1a79b2f1
JX
1832#, c-format
1833msgid "could not migrate git directory from '%s' to '%s'"
1834msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
1835
5809aa05
JX
1836#: editor.c:61
1837#, c-format
1838msgid "hint: Waiting for your editor to close the file...%c"
1839msgstr "提示:等待您的编辑器关闭文件...%c"
1840
1841#: entry.c:177
6937cb4e
JX
1842msgid "Filtering content"
1843msgstr "过滤内容"
1844
5809aa05 1845#: entry.c:435
87cb7997
JX
1846#, c-format
1847msgid "could not stat file '%s'"
65e2041e 1848msgstr "不能对文件 '%s' 调用 stat"
87cb7997 1849
31e5e17b
JX
1850#: fetch-object.c:17
1851msgid "Remote with no URL"
1852msgstr "远程未设置 URL"
1853
fd8cb379 1854#: fetch-pack.c:254
a0b6b246
JX
1855msgid "git fetch-pack: expected shallow list"
1856msgstr "git fetch-pack:应为 shallow 列表"
1857
fd8cb379 1858#: fetch-pack.c:266
31e5e17b
JX
1859msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
1860msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包"
a0b6b246 1861
fd8cb379 1862#: fetch-pack.c:285 builtin/archive.c:63
60638e98
JX
1863#, c-format
1864msgid "remote error: %s"
1865msgstr "远程错误:%s"
1866
fd8cb379 1867#: fetch-pack.c:286
90314792 1868#, c-format
275588f9 1869msgid "git fetch-pack: expected ACK/NAK, got '%s'"
a0b6b246 1870msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
90314792 1871
fd8cb379 1872#: fetch-pack.c:338
a0b6b246
JX
1873msgid "--stateless-rpc requires multi_ack_detailed"
1874msgstr "--stateless-rpc 需要 multi_ack_detailed"
90314792 1875
fd8cb379 1876#: fetch-pack.c:429 fetch-pack.c:1310
90314792 1877#, c-format
a0b6b246
JX
1878msgid "invalid shallow line: %s"
1879msgstr "无效的 shallow 信息:%s"
90314792 1880
fd8cb379 1881#: fetch-pack.c:435 fetch-pack.c:1316
c04f5ac3 1882#, c-format
a0b6b246
JX
1883msgid "invalid unshallow line: %s"
1884msgstr "无效的 unshallow 信息:%s"
c04f5ac3 1885
fd8cb379 1886#: fetch-pack.c:437 fetch-pack.c:1318
a0b6b246
JX
1887#, c-format
1888msgid "object not found: %s"
1889msgstr "对象未找到:%s"
07432cef 1890
fd8cb379 1891#: fetch-pack.c:440 fetch-pack.c:1321
c04f5ac3 1892#, c-format
a0b6b246
JX
1893msgid "error in object: %s"
1894msgstr "对象中出错:%s"
07432cef 1895
fd8cb379 1896#: fetch-pack.c:442 fetch-pack.c:1323
c04f5ac3 1897#, c-format
a0b6b246
JX
1898msgid "no shallow found: %s"
1899msgstr "未发现 shallow:%s"
c04f5ac3 1900
fd8cb379 1901#: fetch-pack.c:445 fetch-pack.c:1326
a0b6b246
JX
1902#, c-format
1903msgid "expected shallow/unshallow, got %s"
1904msgstr "应为 shallow/unshallow,却得到 %s"
07432cef 1905
fd8cb379 1906#: fetch-pack.c:486
a0b6b246
JX
1907#, c-format
1908msgid "got %s %d %s"
1909msgstr "得到 %s %d %s"
1b7f4a34 1910
fd8cb379 1911#: fetch-pack.c:500
1b7f4a34 1912#, c-format
a0b6b246
JX
1913msgid "invalid commit %s"
1914msgstr "无效提交 %s"
1b7f4a34 1915
fd8cb379 1916#: fetch-pack.c:533
a0b6b246
JX
1917msgid "giving up"
1918msgstr "放弃"
814ff314 1919
fd8cb379 1920#: fetch-pack.c:543 progress.c:229
a0b6b246
JX
1921msgid "done"
1922msgstr "完成"
2e8451e8 1923
fd8cb379 1924#: fetch-pack.c:555
2e8451e8 1925#, c-format
a0b6b246
JX
1926msgid "got %s (%d) %s"
1927msgstr "得到 %s (%d) %s"
2e8451e8 1928
fd8cb379 1929#: fetch-pack.c:601
a0b6b246
JX
1930#, c-format
1931msgid "Marking %s as complete"
1932msgstr "标记 %s 为完成"
220c313c 1933
fd8cb379 1934#: fetch-pack.c:828
a0b6b246
JX
1935#, c-format
1936msgid "already have %s (%s)"
29004bbb 1937msgstr "已经有 %s(%s)"
220c313c 1938
fd8cb379 1939#: fetch-pack.c:869
a0b6b246
JX
1940msgid "fetch-pack: unable to fork off sideband demultiplexer"
1941msgstr "fetch-pack:无法派生 sideband 多路输出"
1b7f4a34 1942
fd8cb379 1943#: fetch-pack.c:877
a0b6b246
JX
1944msgid "protocol error: bad pack header"
1945msgstr "协议错误:坏的包头"
814ff314 1946
fd8cb379 1947#: fetch-pack.c:944
a0b6b246
JX
1948#, c-format
1949msgid "fetch-pack: unable to fork off %s"
1950msgstr "fetch-pack:无法派生进程 %s"
5c57d762 1951
fd8cb379 1952#: fetch-pack.c:960
a0b6b246
JX
1953#, c-format
1954msgid "%s failed"
1955msgstr "%s 失败"
14c8bced 1956
fd8cb379 1957#: fetch-pack.c:962
a0b6b246
JX
1958msgid "error in sideband demultiplexer"
1959msgstr "sideband 多路输出出错"
c04f5ac3 1960
fd8cb379 1961#: fetch-pack.c:989
a0b6b246
JX
1962msgid "Server does not support shallow clients"
1963msgstr "服务器不支持 shalllow 客户端"
c04f5ac3 1964
fd8cb379 1965#: fetch-pack.c:993
a0b6b246
JX
1966msgid "Server supports multi_ack_detailed"
1967msgstr "服务器支持 multi_ack_detailed"
c04f5ac3 1968
fd8cb379 1969#: fetch-pack.c:996
a0b6b246
JX
1970msgid "Server supports no-done"
1971msgstr "服务器支持 no-done"
c04f5ac3 1972
fd8cb379 1973#: fetch-pack.c:1002
a0b6b246
JX
1974msgid "Server supports multi_ack"
1975msgstr "服务器支持 multi_ack"
c04f5ac3 1976
fd8cb379 1977#: fetch-pack.c:1006
a0b6b246
JX
1978msgid "Server supports side-band-64k"
1979msgstr "服务器支持 side-band-64k"
c04f5ac3 1980
fd8cb379 1981#: fetch-pack.c:1010
a0b6b246
JX
1982msgid "Server supports side-band"
1983msgstr "服务器支持 side-band"
5c57d762 1984
fd8cb379 1985#: fetch-pack.c:1014
a0b6b246
JX
1986msgid "Server supports allow-tip-sha1-in-want"
1987msgstr "服务器支持 allow-tip-sha1-in-want"
c04f5ac3 1988
fd8cb379 1989#: fetch-pack.c:1018
a0b6b246
JX
1990msgid "Server supports allow-reachable-sha1-in-want"
1991msgstr "服务器支持 allow-reachable-sha1-in-want"
8ada9598 1992
fd8cb379 1993#: fetch-pack.c:1028
a0b6b246
JX
1994msgid "Server supports ofs-delta"
1995msgstr "服务器支持 ofs-delta"
8ada9598 1996
fd8cb379 1997#: fetch-pack.c:1034 fetch-pack.c:1204
31e5e17b
JX
1998msgid "Server supports filter"
1999msgstr "服务器支持 filter"
2000
fd8cb379 2001#: fetch-pack.c:1042
81809b99 2002#, c-format
a0b6b246
JX
2003msgid "Server version is %.*s"
2004msgstr "服务器版本 %.*s"
8ada9598 2005
fd8cb379 2006#: fetch-pack.c:1048
a0b6b246
JX
2007msgid "Server does not support --shallow-since"
2008msgstr "服务器不支持 --shallow-since"
8ada9598 2009
fd8cb379 2010#: fetch-pack.c:1052
a0b6b246
JX
2011msgid "Server does not support --shallow-exclude"
2012msgstr "服务器不支持 --shallow-exclude"
c04f5ac3 2013
fd8cb379 2014#: fetch-pack.c:1054
a0b6b246
JX
2015msgid "Server does not support --deepen"
2016msgstr "服务器不支持 --deepen"
c04f5ac3 2017
fd8cb379 2018#: fetch-pack.c:1065
a0b6b246
JX
2019msgid "no common commits"
2020msgstr "没有共同的提交"
c04f5ac3 2021
fd8cb379 2022#: fetch-pack.c:1077 fetch-pack.c:1414
a0b6b246
JX
2023msgid "git fetch-pack: fetch failed."
2024msgstr "git fetch-pack:获取失败。"
c04f5ac3 2025
fd8cb379
JX
2026#: fetch-pack.c:1199
2027msgid "Server does not support shallow requests"
2028msgstr "服务器不支持 shalllow 请求"
2029
2030#: fetch-pack.c:1584
a0b6b246
JX
2031msgid "no matching remote head"
2032msgstr "没有匹配的远程分支"
c04f5ac3 2033
fd8cb379 2034#: fetch-pack.c:1610
87cb7997
JX
2035#, c-format
2036msgid "no such remote ref %s"
2037msgstr "没有这样的远程引用 %s"
2038
fd8cb379 2039#: fetch-pack.c:1613
87cb7997
JX
2040#, c-format
2041msgid "Server does not allow request for unadvertised object %s"
2042msgstr "服务器不允许请求未公开的对象 %s"
2043
fd8cb379 2044#: gpg-interface.c:185
a0b6b246
JX
2045msgid "gpg failed to sign the data"
2046msgstr "gpg 无法为数据签名"
c04f5ac3 2047
fd8cb379 2048#: gpg-interface.c:210
a0b6b246
JX
2049msgid "could not create temporary file"
2050msgstr "不能创建临时文件"
c04f5ac3 2051
fd8cb379 2052#: gpg-interface.c:213
c04f5ac3 2053#, c-format
a0b6b246
JX
2054msgid "failed writing detached signature to '%s'"
2055msgstr "无法将分离式签名写入 '%s'"
c04f5ac3 2056
a4f16749 2057#: graph.c:97
1a79b2f1
JX
2058#, c-format
2059msgid "ignore invalid color '%.*s' in log.graphColors"
2060msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
2061
fd8cb379 2062#: grep.c:2020
c04f5ac3 2063#, c-format
a0b6b246
JX
2064msgid "'%s': unable to read %s"
2065msgstr "'%s':无法读取 %s"
c04f5ac3 2066
fd8cb379 2067#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81
31e5e17b 2068#: builtin/rm.c:134
c04f5ac3 2069#, c-format
a0b6b246 2070msgid "failed to stat '%s'"
65e2041e 2071msgstr "对 '%s' 调用 stat 失败"
c04f5ac3 2072
fd8cb379 2073#: grep.c:2048
a0b6b246
JX
2074#, c-format
2075msgid "'%s': short read"
2076msgstr "'%s':读取不完整"
5c57d762 2077
fd8cb379
JX
2078#: help.c:23
2079msgid "start a working area (see also: git help tutorial)"
2080msgstr "开始一个工作区(参见:git help tutorial)"
2081
2082#: help.c:24
2083msgid "work on the current change (see also: git help everyday)"
2084msgstr "在当前变更上工作(参见:git help everyday)"
2085
2086#: help.c:25
2087msgid "examine the history and state (see also: git help revisions)"
2088msgstr "检查历史和状态(参见:git help revisions)"
2089
2090#: help.c:26
2091msgid "grow, mark and tweak your common history"
2092msgstr "扩展、标记和调校您的历史记录"
2093
2094#: help.c:27
2095msgid "collaborate (see also: git help workflows)"
2096msgstr "协同(参见:git help workflows)"
2097
2098#: help.c:31
2099msgid "Main Porcelain Commands"
2100msgstr "主要的上层命令"
2101
2102#: help.c:32
2103msgid "Ancillary Commands / Manipulators"
2104msgstr "辅助命令/操作者"
2105
2106#: help.c:33
2107msgid "Ancillary Commands / Interrogators"
2108msgstr "辅助命令/询问者"
2109
2110#: help.c:34
2111msgid "Interacting with Others"
2112msgstr "与其它系统交互"
2113
2114#: help.c:35
2115msgid "Low-level Commands / Manipulators"
2116msgstr "低级命令/操作者"
2117
2118#: help.c:36
2119msgid "Low-level Commands / Interrogators"
2120msgstr "低级命令/询问者"
2121
2122#: help.c:37
2123msgid "Low-level Commands / Synching Repositories"
2124msgstr "低级命令/同步仓库"
2125
2126#: help.c:38
2127msgid "Low-level Commands / Internal Helpers"
2128msgstr "低级命令/内部助手"
2129
2130#: help.c:293
a0b6b246
JX
2131#, c-format
2132msgid "available git commands in '%s'"
2133msgstr "在 '%s' 下可用的 git 命令"
c04f5ac3 2134
fd8cb379 2135#: help.c:300
a0b6b246
JX
2136msgid "git commands available from elsewhere on your $PATH"
2137msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
5c57d762 2138
fd8cb379 2139#: help.c:309
a0b6b246
JX
2140msgid "These are common Git commands used in various situations:"
2141msgstr "这些是各种场合常见的 Git 命令:"
5c57d762 2142
fd8cb379
JX
2143#: help.c:358 git.c:90
2144#, c-format
2145msgid "unsupported command listing type '%s'"
2146msgstr "不支持的命令列表类型 '%s'"
2147
2148#: help.c:405
2149msgid "The common Git guides are:"
2150msgstr "最常用的 Git 向导有:"
2151
2152#: help.c:467
c04f5ac3 2153#, c-format
a0b6b246
JX
2154msgid ""
2155"'%s' appears to be a git command, but we were not\n"
2156"able to execute it. Maybe git-%s is broken?"
2157msgstr ""
2158"'%s' 像是一个 git 命令,但却无法运行。\n"
2159"可能是 git-%s 受损?"
c04f5ac3 2160
fd8cb379 2161#: help.c:526
a0b6b246
JX
2162msgid "Uh oh. Your system reports no Git commands at all."
2163msgstr "唉呀,您的系统中未发现 Git 命令。"
c04f5ac3 2164
fd8cb379 2165#: help.c:548
c04f5ac3 2166#, c-format
a4f16749 2167msgid "WARNING: You called a Git command named '%s', which does not exist."
554e8501 2168msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。"
a4f16749 2169
fd8cb379 2170#: help.c:553
a4f16749
JX
2171#, c-format
2172msgid "Continuing under the assumption that you meant '%s'."
554e8501 2173msgstr "假定你想要的是 '%s' 并继续。"
c04f5ac3 2174
fd8cb379 2175#: help.c:558
c04f5ac3 2176#, c-format
a4f16749 2177msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
554e8501 2178msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。"
c04f5ac3 2179
fd8cb379 2180#: help.c:566
c04f5ac3 2181#, c-format
a0b6b246
JX
2182msgid "git: '%s' is not a git command. See 'git --help'."
2183msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
c04f5ac3 2184
fd8cb379 2185#: help.c:570
a4f16749
JX
2186msgid ""
2187"\n"
2188"The most similar command is"
2189msgid_plural ""
2190"\n"
2191"The most similar commands are"
6937cb4e
JX
2192msgstr[0] ""
2193"\n"
2194"最相似的命令是"
2195msgstr[1] ""
2196"\n"
2197"最相似的命令是"
a4f16749 2198
fd8cb379 2199#: help.c:585
a4f16749
JX
2200msgid "git version [<options>]"
2201msgstr "git version [<选项>]"
2202
fd8cb379 2203#: help.c:652
a4f16749
JX
2204#, c-format
2205msgid "%s: %s - %s"
2206msgstr "%s:%s - %s"
2207
fd8cb379 2208#: help.c:656
a0b6b246
JX
2209msgid ""
2210"\n"
2211"Did you mean this?"
2212msgid_plural ""
2213"\n"
2214"Did you mean one of these?"
2215msgstr[0] ""
2216"\n"
2217"您指的是这个么?"
2218msgstr[1] ""
2219"\n"
2220"您指的是这其中的某一个么?"
c04f5ac3 2221
a4f16749 2222#: ident.c:342
a0b6b246
JX
2223msgid ""
2224"\n"
2225"*** Please tell me who you are.\n"
2226"\n"
2227"Run\n"
2228"\n"
2229" git config --global user.email \"you@example.com\"\n"
2230" git config --global user.name \"Your Name\"\n"
2231"\n"
2232"to set your account's default identity.\n"
2233"Omit --global to set the identity only in this repository.\n"
2234"\n"
2235msgstr ""
2236"\n"
2237"*** 请告诉我你是谁。\n"
2238"\n"
2239"运行\n"
2240"\n"
2241" git config --global user.email \"you@example.com\"\n"
2242" git config --global user.name \"Your Name\"\n"
2243"\n"
2244"来设置您账号的缺省身份标识。\n"
2245"如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
c04f5ac3 2246
a4f16749 2247#: ident.c:366
87cb7997 2248msgid "no email was given and auto-detection is disabled"
65e2041e 2249msgstr "未提供邮件地址且自动探测被禁用"
87cb7997 2250
a4f16749 2251#: ident.c:371
87cb7997
JX
2252#, c-format
2253msgid "unable to auto-detect email address (got '%s')"
2254msgstr "无法自动探测邮件地址(得到 '%s')"
2255
a4f16749 2256#: ident.c:381
87cb7997
JX
2257msgid "no name was given and auto-detection is disabled"
2258msgstr "未提供姓名且自动探测被禁用"
2259
a4f16749 2260#: ident.c:387
87cb7997
JX
2261#, c-format
2262msgid "unable to auto-detect name (got '%s')"
2263msgstr "无法自动探测姓名(得到 '%s')"
2264
a4f16749 2265#: ident.c:395
87cb7997
JX
2266#, c-format
2267msgid "empty ident name (for <%s>) not allowed"
2268msgstr "不允许空的姓名(对于 <%s>)"
2269
a4f16749 2270#: ident.c:401
87cb7997
JX
2271#, c-format
2272msgid "name consists only of disallowed characters: %s"
2273msgstr "姓名中仅包含禁用字符:%s"
2274
fd8cb379 2275#: ident.c:416 builtin/commit.c:587
87cb7997
JX
2276#, c-format
2277msgid "invalid date format: %s"
2278msgstr "无效的日期格式:%s"
2279
31e5e17b
JX
2280#: list-objects-filter-options.c:36
2281msgid "multiple filter-specs cannot be combined"
2282msgstr "不能混用多种过滤规格"
5809aa05 2283
31e5e17b
JX
2284#: list-objects-filter-options.c:126
2285msgid "cannot change partial clone promisor remote"
2286msgstr "无法修改部分克隆的 promisor 远程仓库"
5809aa05 2287
6937cb4e 2288#: lockfile.c:151
c04f5ac3 2289#, c-format
a0b6b246
JX
2290msgid ""
2291"Unable to create '%s.lock': %s.\n"
2292"\n"
2293"Another git process seems to be running in this repository, e.g.\n"
2294"an editor opened by 'git commit'. Please make sure all processes\n"
2295"are terminated then try again. If it still fails, a git process\n"
2296"may have crashed in this repository earlier:\n"
2297"remove the file manually to continue."
2298msgstr ""
2299"无法创建 '%s.lock':%s。\n"
2300"\n"
2301"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
2302"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
2303"可能之前有一个 git 进程在这个仓库中异常退出:\n"
2304"手动删除这个文件再继续。"
c04f5ac3 2305
6937cb4e 2306#: lockfile.c:159
a0b6b246
JX
2307#, c-format
2308msgid "Unable to create '%s.lock': %s"
2309msgstr "不能创建 '%s.lock':%s"
c04f5ac3 2310
fd8cb379 2311#: merge.c:71
a0b6b246
JX
2312msgid "failed to read the cache"
2313msgstr "无法读取缓存"
c04f5ac3 2314
fd8cb379
JX
2315#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378
2316#: builtin/checkout.c:606 builtin/clone.c:761
a0b6b246
JX
2317msgid "unable to write new index file"
2318msgstr "无法写新的索引文件"
c04f5ac3 2319
fd8cb379 2320#: merge-recursive.c:298
a0b6b246
JX
2321msgid "(bad commit)\n"
2322msgstr "(坏提交)\n"
c04f5ac3 2323
fd8cb379 2324#: merge-recursive.c:320
a0b6b246 2325#, c-format
fd8cb379
JX
2326msgid "add_cacheinfo failed for path '%s'; merge aborting."
2327msgstr "addinfo_cache 对路径 '%s' 执行失败,合并终止。"
c04f5ac3 2328
fd8cb379
JX
2329#: merge-recursive.c:328
2330#, c-format
2331msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
2332msgstr "addinfo_cache 无法刷新路径 '%s',合并终止。"
2333
2334#: merge-recursive.c:410
a0b6b246
JX
2335msgid "error building trees"
2336msgstr "无法创建树"
c04f5ac3 2337
fd8cb379 2338#: merge-recursive.c:881
c04f5ac3 2339#, c-format
a0b6b246
JX
2340msgid "failed to create path '%s'%s"
2341msgstr "无法创建路径 '%s'%s"
c04f5ac3 2342
fd8cb379 2343#: merge-recursive.c:892
c04f5ac3 2344#, c-format
a0b6b246
JX
2345msgid "Removing %s to make room for subdirectory\n"
2346msgstr "删除 %s 以便为子目录留出空间\n"
c04f5ac3 2347
fd8cb379 2348#: merge-recursive.c:906 merge-recursive.c:925
a0b6b246
JX
2349msgid ": perhaps a D/F conflict?"
2350msgstr ":可能是一个目录/文件冲突?"
c04f5ac3 2351
fd8cb379 2352#: merge-recursive.c:915
c04f5ac3 2353#, c-format
a0b6b246
JX
2354msgid "refusing to lose untracked file at '%s'"
2355msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
c04f5ac3 2356
fd8cb379 2357#: merge-recursive.c:957 builtin/cat-file.c:37
c04f5ac3 2358#, c-format
a0b6b246
JX
2359msgid "cannot read object %s '%s'"
2360msgstr "不能读取对象 %s '%s'"
c04f5ac3 2361
fd8cb379 2362#: merge-recursive.c:959
4dcdc3d8 2363#, c-format
a0b6b246
JX
2364msgid "blob expected for %s '%s'"
2365msgstr "%s '%s' 应为数据对象"
4dcdc3d8 2366
fd8cb379 2367#: merge-recursive.c:983
4dcdc3d8 2368#, c-format
a0b6b246
JX
2369msgid "failed to open '%s': %s"
2370msgstr "无法打开 '%s':%s"
4dcdc3d8 2371
fd8cb379 2372#: merge-recursive.c:994
a0b6b246
JX
2373#, c-format
2374msgid "failed to symlink '%s': %s"
2375msgstr "无法创建符号链接 '%s':%s"
c04f5ac3 2376
fd8cb379 2377#: merge-recursive.c:999
5c57d762 2378#, c-format
a0b6b246
JX
2379msgid "do not know what to do with %06o %s '%s'"
2380msgstr "不知道如何处理 %06o %s '%s'"
5c57d762 2381
fd8cb379
JX
2382#: merge-recursive.c:1186
2383#, c-format
2384msgid "Failed to merge submodule %s (not checked out)"
2385msgstr "无法合并子模组 %s (没有检出)"
2386
2387#: merge-recursive.c:1193
2388#, c-format
2389msgid "Failed to merge submodule %s (commits not present)"
2390msgstr "无法合并子模组 %s(提交不存在)"
2391
2392#: merge-recursive.c:1200
2393#, c-format
2394msgid "Failed to merge submodule %s (commits don't follow merge-base)"
2395msgstr "无法合并子模组 %s (提交未跟随合并基线)"
2396
2397#: merge-recursive.c:1208 merge-recursive.c:1220
2398#, c-format
2399msgid "Fast-forwarding submodule %s to the following commit:"
2400msgstr "子模组 %s 快进到如下提交:"
2401
2402#: merge-recursive.c:1211 merge-recursive.c:1223
2403#, c-format
2404msgid "Fast-forwarding submodule %s"
2405msgstr "快进子模组 %s"
2406
2407#: merge-recursive.c:1245
2408#, c-format
2409msgid "Failed to merge submodule %s (merge following commits not found)"
2410msgstr "无法合并子模组 %s (没发现合并跟随的提交)"
2411
2412#: merge-recursive.c:1249
2413#, c-format
2414msgid "Failed to merge submodule %s (not fast-forward)"
2415msgstr "无法合并子模组 %s(非快进)"
2416
2417#: merge-recursive.c:1250
2418msgid "Found a possible merge resolution for the submodule:\n"
2419msgstr "找到子模组的一个可能的合并方案:\n"
2420
2421#: merge-recursive.c:1253
2422#, c-format
2423msgid ""
2424"If this is correct simply add it to the index for example\n"
2425"by using:\n"
2426"\n"
2427" git update-index --cacheinfo 160000 %s \"%s\"\n"
2428"\n"
2429"which will accept this suggestion.\n"
2430msgstr ""
2431"如果这个正确,将其添加到索引,例如使用命令:\n"
2432"\n"
2433" git update-index --cacheinfo 160000 %s \"%s\"\n"
2434"\n"
2435"以接受此建议。\n"
2436
2437#: merge-recursive.c:1262
2438#, c-format
2439msgid "Failed to merge submodule %s (multiple merges found)"
2440msgstr "无法合并子模组 %s (发现多个合并)"
2441
2442#: merge-recursive.c:1321
a0b6b246
JX
2443msgid "Failed to execute internal merge"
2444msgstr "无法执行内部合并"
2445
fd8cb379 2446#: merge-recursive.c:1326
5c57d762 2447#, c-format
a0b6b246
JX
2448msgid "Unable to add %s to database"
2449msgstr "不能添加 %s 至对象库"
5c57d762 2450
fd8cb379
JX
2451#: merge-recursive.c:1358
2452#, c-format
2453msgid "Auto-merging %s"
2454msgstr "自动合并 %s"
2455
2456#: merge-recursive.c:1423
2457#, c-format
2458msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
2459msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。"
2460
2461#: merge-recursive.c:1475
5c57d762
JX
2462#, c-format
2463msgid ""
a0b6b246
JX
2464"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2465"in tree."
5c57d762 2466msgstr ""
87cb7997
JX
2467"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
2468"本被保留。"
2469
fd8cb379 2470#: merge-recursive.c:1480
87cb7997
JX
2471#, c-format
2472msgid ""
2473"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
2474"left in tree."
2475msgstr ""
2476"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
2477"%7$s 版本被保留。"
c04f5ac3 2478
fd8cb379 2479#: merge-recursive.c:1487
7aea43ff 2480#, c-format
a0b6b246
JX
2481msgid ""
2482"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2483"in tree at %s."
2484msgstr ""
87cb7997
JX
2485"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
2486"本保留在 %8$s 中。"
7aea43ff 2487
fd8cb379 2488#: merge-recursive.c:1492
87cb7997
JX
2489#, c-format
2490msgid ""
2491"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
2492"left in tree at %s."
2493msgstr ""
2494"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
2495"%7$s 版本保留在 %9$s 中。"
2496
fd8cb379 2497#: merge-recursive.c:1526
a0b6b246
JX
2498msgid "rename"
2499msgstr "重命名"
5b04ee3b 2500
fd8cb379 2501#: merge-recursive.c:1526
a0b6b246
JX
2502msgid "renamed"
2503msgstr "重命名"
5b04ee3b 2504
fd8cb379
JX
2505#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368
2506#: merge-recursive.c:3086
2507#, c-format
2508msgid "Refusing to lose dirty file at %s"
2509msgstr "拒绝丢失脏文件 '%s'"
2510
2511#: merge-recursive.c:1594
5c57d762 2512#, c-format
a0b6b246
JX
2513msgid "%s is a directory in %s adding as %s instead"
2514msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
5c57d762 2515
fd8cb379
JX
2516#: merge-recursive.c:1599
2517#, c-format
2518msgid "Refusing to lose untracked file at %s; adding as %s instead"
2519msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s"
2520
2521#: merge-recursive.c:1625
5c57d762
JX
2522#, c-format
2523msgid ""
a0b6b246
JX
2524"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
2525"\"->\"%s\" in \"%s\"%s"
5c57d762 2526msgstr ""
a0b6b246
JX
2527"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
2528"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
5c57d762 2529
fd8cb379 2530#: merge-recursive.c:1630
a0b6b246
JX
2531msgid " (left unresolved)"
2532msgstr "(留下未解决)"
5c57d762 2533
fd8cb379 2534#: merge-recursive.c:1694
5c57d762 2535#, c-format
a0b6b246 2536msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
5c57d762 2537msgstr ""
a0b6b246
JX
2538"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
2539"%5$s"
3495628d 2540
fd8cb379 2541#: merge-recursive.c:1733
3495628d 2542#, c-format
a0b6b246
JX
2543msgid "Renaming %s to %s and %s to %s instead"
2544msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
3495628d 2545
fd8cb379
JX
2546#: merge-recursive.c:1745
2547#, c-format
2548msgid "Refusing to lose untracked file at %s, even though it's in the way."
2549msgstr "拒绝丢失未跟踪文件 '%s',即使它妨碍了。"
2550
2551#: merge-recursive.c:1951
2552#, c-format
2553msgid ""
2554"CONFLICT (directory rename split): Unclear where to place %s because "
2555"directory %s was renamed to multiple other directories, with no destination "
2556"getting a majority of the files."
2557msgstr ""
2558"冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个"
2559"其它目录,没有一个目录包含主要的文件。"
2560
2561#: merge-recursive.c:1983
2562#, c-format
2563msgid ""
2564"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
2565"implicit directory rename(s) putting the following path(s) there: %s."
2566msgstr ""
2567"冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放"
2568"在:%s。"
2569
2570#: merge-recursive.c:1993
2571#, c-format
2572msgid ""
2573"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
2574"implicit directory renames tried to put these paths there: %s"
2575msgstr ""
2576"冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路"
2577"径放置于此:%s"
2578
2579#: merge-recursive.c:2085
2580#, c-format
2581msgid ""
2582"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
2583">%s in %s"
2584msgstr ""
2585"冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 "
2586"%4$s->%5$s"
2587
2588#: merge-recursive.c:2330
2589#, c-format
2590msgid ""
2591"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
2592"renamed."
2593msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。"
2594
2595#: merge-recursive.c:2736
3495628d 2596#, c-format
a0b6b246
JX
2597msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
2598msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
2e8451e8 2599
fd8cb379 2600#: merge-recursive.c:2751
a0b6b246
JX
2601#, c-format
2602msgid "Adding merged %s"
2603msgstr "添加合并后的 %s"
90314792 2604
fd8cb379 2605#: merge-recursive.c:2758 merge-recursive.c:3089
90314792 2606#, c-format
a0b6b246
JX
2607msgid "Adding as %s instead"
2608msgstr "而是以 %s 为名添加"
90314792 2609
fd8cb379 2610#: merge-recursive.c:2914
90314792 2611#, c-format
a0b6b246
JX
2612msgid "cannot read object %s"
2613msgstr "不能读取对象 %s"
90314792 2614
fd8cb379 2615#: merge-recursive.c:2917
90314792 2616#, c-format
a0b6b246
JX
2617msgid "object %s is not a blob"
2618msgstr "对象 %s 不是一个数据对象"
90314792 2619
fd8cb379 2620#: merge-recursive.c:2986
a0b6b246
JX
2621msgid "modify"
2622msgstr "修改"
90314792 2623
fd8cb379 2624#: merge-recursive.c:2986
a0b6b246
JX
2625msgid "modified"
2626msgstr "修改"
5b04ee3b 2627
fd8cb379 2628#: merge-recursive.c:2997
a0b6b246
JX
2629msgid "content"
2630msgstr "内容"
5b04ee3b 2631
fd8cb379 2632#: merge-recursive.c:3004
a0b6b246
JX
2633msgid "add/add"
2634msgstr "添加/添加"
3495628d 2635
fd8cb379 2636#: merge-recursive.c:3046
220c313c 2637#, c-format
a0b6b246
JX
2638msgid "Skipped %s (merged same as existing)"
2639msgstr "略过 %s(已经做过相同合并)"
220c313c 2640
fd8cb379 2641#: merge-recursive.c:3055 git-submodule.sh:895
a0b6b246
JX
2642msgid "submodule"
2643msgstr "子模组"
2644
fd8cb379 2645#: merge-recursive.c:3056
220c313c 2646#, c-format
a0b6b246
JX
2647msgid "CONFLICT (%s): Merge conflict in %s"
2648msgstr "冲突(%s):合并冲突于 %s"
220c313c 2649
fd8cb379 2650#: merge-recursive.c:3178
220c313c 2651#, c-format
a0b6b246
JX
2652msgid "Removing %s"
2653msgstr "删除 %s"
220c313c 2654
fd8cb379 2655#: merge-recursive.c:3204
a0b6b246
JX
2656msgid "file/directory"
2657msgstr "文件/目录"
220c313c 2658
fd8cb379 2659#: merge-recursive.c:3210
a0b6b246
JX
2660msgid "directory/file"
2661msgstr "目录/文件"
276ceeaa 2662
fd8cb379 2663#: merge-recursive.c:3217
276ceeaa 2664#, c-format
a0b6b246
JX
2665msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
2666msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
276ceeaa 2667
fd8cb379 2668#: merge-recursive.c:3226
276ceeaa 2669#, c-format
a0b6b246
JX
2670msgid "Adding %s"
2671msgstr "添加 %s"
276ceeaa 2672
fd8cb379 2673#: merge-recursive.c:3267
5809aa05
JX
2674#, c-format
2675msgid "Dirty index: cannot merge (dirty: %s)"
2676msgstr "脏索引:不能合并(脏文件:%s)"
2677
fd8cb379 2678#: merge-recursive.c:3271
6937cb4e 2679msgid "Already up to date!"
a0b6b246 2680msgstr "已经是最新的!"
276ceeaa 2681
fd8cb379 2682#: merge-recursive.c:3280
276ceeaa 2683#, c-format
a0b6b246
JX
2684msgid "merging of trees %s and %s failed"
2685msgstr "无法合并树 %s 和 %s"
276ceeaa 2686
fd8cb379 2687#: merge-recursive.c:3379
a0b6b246
JX
2688msgid "Merging:"
2689msgstr "合并:"
5c57d762 2690
fd8cb379 2691#: merge-recursive.c:3392
5c57d762 2692#, c-format
a0b6b246
JX
2693msgid "found %u common ancestor:"
2694msgid_plural "found %u common ancestors:"
2695msgstr[0] "发现 %u 个共同祖先:"
2696msgstr[1] "发现 %u 个共同祖先:"
2697
fd8cb379 2698#: merge-recursive.c:3431
a0b6b246
JX
2699msgid "merge returned no commit"
2700msgstr "合并未返回提交"
2701
fd8cb379 2702#: merge-recursive.c:3495
5c57d762 2703#, c-format
a0b6b246
JX
2704msgid "Could not parse object '%s'"
2705msgstr "不能解析对象 '%s'"
5c57d762 2706
fd8cb379 2707#: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816
a0b6b246
JX
2708msgid "Unable to write index."
2709msgstr "不能写入索引。"
2710
6937cb4e 2711#: notes-merge.c:272
5c57d762
JX
2712#, c-format
2713msgid ""
a0b6b246
JX
2714"You have not concluded your previous notes merge (%s exists).\n"
2715"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
2716"commit/abort the previous merge before you start a new notes merge."
5c57d762 2717msgstr ""
29004bbb 2718"您的前一次注释合并尚未结束(存在 %s)。\n"
1a79b2f1
JX
2719"在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
2720"notes merge --abort' 来提交/终止前一次合并。"
5c57d762 2721
6937cb4e 2722#: notes-merge.c:279
a0b6b246
JX
2723#, c-format
2724msgid "You have not concluded your notes merge (%s exists)."
2725msgstr "您尚未结束注释合并(存在 %s)。"
2726
31e5e17b 2727#: notes-utils.c:43
a0b6b246
JX
2728msgid "Cannot commit uninitialized/unreferenced notes tree"
2729msgstr "不能提交未初始化/未引用的注解树"
5c57d762 2730
31e5e17b 2731#: notes-utils.c:102
1b7f4a34 2732#, c-format
a0b6b246
JX
2733msgid "Bad notes.rewriteMode value: '%s'"
2734msgstr "坏的 notes.rewriteMode 值:'%s'"
1b7f4a34 2735
31e5e17b 2736#: notes-utils.c:112
5b04ee3b 2737#, c-format
a0b6b246
JX
2738msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
2739msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
5b04ee3b 2740
a4f16749
JX
2741#. TRANSLATORS: The first %s is the name of
2742#. the environment variable, the second %s is
2743#. its value.
2744#.
31e5e17b 2745#: notes-utils.c:142
5b04ee3b 2746#, c-format
a0b6b246
JX
2747msgid "Bad %s value: '%s'"
2748msgstr "坏的 %s 值:'%s'"
5b04ee3b 2749
fd8cb379 2750#: object.c:242
5b04ee3b 2751#, c-format
a0b6b246
JX
2752msgid "unable to parse object: %s"
2753msgstr "不能解析对象:%s"
5b04ee3b 2754
fd8cb379 2755#: packfile.c:563
6937cb4e
JX
2756msgid "offset before end of packfile (broken .idx?)"
2757msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
2758
fd8cb379 2759#: packfile.c:1742
6937cb4e
JX
2760#, c-format
2761msgid "offset before start of pack index for %s (corrupt index?)"
2762msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
2763
fd8cb379 2764#: packfile.c:1746
6937cb4e
JX
2765#, c-format
2766msgid "offset beyond end of pack index for %s (truncated index?)"
2767msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
2768
fd8cb379 2769#: parse-options.c:621
a0b6b246
JX
2770msgid "..."
2771msgstr "..."
2772
fd8cb379 2773#: parse-options.c:640
5b04ee3b 2774#, c-format
a0b6b246
JX
2775msgid "usage: %s"
2776msgstr "用法:%s"
5b04ee3b 2777
a0b6b246 2778#. TRANSLATORS: the colon here should align with the
a4f16749
JX
2779#. one in "usage: %s" translation.
2780#.
fd8cb379 2781#: parse-options.c:646
5b04ee3b 2782#, c-format
a0b6b246
JX
2783msgid " or: %s"
2784msgstr " 或:%s"
5b04ee3b 2785
a0b6b246 2786# 译者:为保证在输出中对齐,注意调整句中空格!
fd8cb379 2787#: parse-options.c:649
5b04ee3b 2788#, c-format
a0b6b246
JX
2789msgid " %s"
2790msgstr " %s"
5b04ee3b 2791
fd8cb379 2792#: parse-options.c:688
a0b6b246
JX
2793msgid "-NUM"
2794msgstr "-数字"
2795
fd8cb379
JX
2796#: parse-options-cb.c:44
2797#, c-format
2798msgid "malformed expiration date '%s'"
2799msgstr "格式错误的到期时间:'%s'"
2800
2801#: parse-options-cb.c:112
5b04ee3b 2802#, c-format
a0b6b246 2803msgid "malformed object name '%s'"
fd8cb379 2804msgstr "格式错误的对象名 '%s'"
5b04ee3b 2805
fd8cb379 2806#: path.c:892
5b04ee3b 2807#, c-format
a0b6b246
JX
2808msgid "Could not make %s writable by group"
2809msgstr "不能设置 %s 为组可写"
2810
a4f16749 2811#: pathspec.c:129
87cb7997
JX
2812msgid "Escape character '\\' not allowed as last character in attr value"
2813msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
2814
a4f16749 2815#: pathspec.c:147
87cb7997
JX
2816msgid "Only one 'attr:' specification is allowed."
2817msgstr "只允许一个 'attr:' 规格。"
2818
a4f16749 2819#: pathspec.c:150
87cb7997
JX
2820msgid "attr spec must not be empty"
2821msgstr "属性规格不能为空"
2822
a4f16749 2823#: pathspec.c:193
87cb7997
JX
2824#, c-format
2825msgid "invalid attribute name %s"
2826msgstr "无效的属性名 %s"
2827
a4f16749 2828#: pathspec.c:258
a0b6b246
JX
2829msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
2830msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
2831
a4f16749 2832#: pathspec.c:265
5b04ee3b 2833msgid ""
a0b6b246
JX
2834"global 'literal' pathspec setting is incompatible with all other global "
2835"pathspec settings"
2836msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
5b04ee3b 2837
a4f16749 2838#: pathspec.c:305
a0b6b246
JX
2839msgid "invalid parameter for pathspec magic 'prefix'"
2840msgstr "路径规格包含无效的神奇前缀"
2841
a4f16749 2842#: pathspec.c:326
5b04ee3b 2843#, c-format
a0b6b246
JX
2844msgid "Invalid pathspec magic '%.*s' in '%s'"
2845msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
5b04ee3b 2846
a4f16749 2847#: pathspec.c:331
5b04ee3b 2848#, c-format
a0b6b246
JX
2849msgid "Missing ')' at the end of pathspec magic in '%s'"
2850msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
5b04ee3b 2851
a4f16749 2852#: pathspec.c:369
5b04ee3b 2853#, c-format
a0b6b246
JX
2854msgid "Unimplemented pathspec magic '%c' in '%s'"
2855msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
5b04ee3b 2856
a4f16749 2857#: pathspec.c:428
5b04ee3b 2858#, c-format
a0b6b246
JX
2859msgid "%s: 'literal' and 'glob' are incompatible"
2860msgstr "%s:'literal' 和 'glob' 不兼容"
5b04ee3b 2861
a4f16749 2862#: pathspec.c:441
5b04ee3b 2863#, c-format
a0b6b246
JX
2864msgid "%s: '%s' is outside repository"
2865msgstr "%s:'%s' 在仓库之外"
5b04ee3b 2866
a4f16749 2867#: pathspec.c:515
5b04ee3b 2868#, c-format
1a79b2f1
JX
2869msgid "'%s' (mnemonic: '%c')"
2870msgstr "'%s'(助记符:'%c')"
5b04ee3b 2871
a4f16749 2872#: pathspec.c:525
5b04ee3b 2873#, c-format
a0b6b246
JX
2874msgid "%s: pathspec magic not supported by this command: %s"
2875msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
2876
5809aa05 2877#: pathspec.c:592
5b04ee3b 2878#, c-format
a0b6b246
JX
2879msgid "pathspec '%s' is beyond a symbolic link"
2880msgstr "路径规格 '%s' 位于符号链接中"
2881
6937cb4e 2882#: pretty.c:962
a0b6b246
JX
2883msgid "unable to parse --pretty format"
2884msgstr "不能解析 --pretty 格式"
2885
fd8cb379 2886#: read-cache.c:1500
5b04ee3b
JX
2887#, c-format
2888msgid ""
a0b6b246
JX
2889"index.version set, but the value is invalid.\n"
2890"Using version %i"
5b04ee3b 2891msgstr ""
a0b6b246
JX
2892"设置了 index.version,但是取值无效。\n"
2893"使用版本 %i"
5b04ee3b 2894
fd8cb379 2895#: read-cache.c:1510
5b04ee3b
JX
2896#, c-format
2897msgid ""
a0b6b246
JX
2898"GIT_INDEX_VERSION set, but the value is invalid.\n"
2899"Using version %i"
5b04ee3b 2900msgstr ""
a0b6b246
JX
2901"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
2902"使用版本 %i"
5b04ee3b 2903
fd8cb379 2904#: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048
a4f16749
JX
2905#, c-format
2906msgid "could not close '%s'"
2907msgstr "不能关闭 '%s'"
2908
fd8cb379 2909#: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234
87cb7997 2910#, c-format
60638e98 2911msgid "could not stat '%s'"
65e2041e 2912msgstr "不能对 '%s' 调用 stat"
87cb7997 2913
fd8cb379 2914#: read-cache.c:2490
87cb7997
JX
2915#, c-format
2916msgid "unable to open git dir: %s"
2917msgstr "不能打开 git 目录:%s"
2918
fd8cb379 2919#: read-cache.c:2502
87cb7997
JX
2920#, c-format
2921msgid "unable to unlink: %s"
2922msgstr "无法删除:%s"
2923
fd8cb379
JX
2924#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395
2925#: builtin/am.c:779
5b04ee3b 2926#, c-format
fd8cb379 2927msgid "could not open '%s' for writing"
a0b6b246 2928msgstr "无法打开 '%s' 进行写入"
5b04ee3b 2929
fd8cb379 2930#: refs.c:1880
60638e98
JX
2931msgid "ref updates forbidden inside quarantine environment"
2932msgstr "在隔离环境中禁止更新引用"
2933
fd8cb379 2934#: refs/files-backend.c:1191
6937cb4e
JX
2935#, c-format
2936msgid "could not remove reference %s"
2937msgstr "无法删除引用 %s"
2938
fd8cb379
JX
2939#: refs/files-backend.c:1205 refs/packed-backend.c:1531
2940#: refs/packed-backend.c:1541
5b04ee3b 2941#, c-format
a0b6b246
JX
2942msgid "could not delete reference %s: %s"
2943msgstr "无法删除引用 %s:%s"
5b04ee3b 2944
fd8cb379 2945#: refs/files-backend.c:1208 refs/packed-backend.c:1544
5b04ee3b 2946#, c-format
a0b6b246
JX
2947msgid "could not delete references: %s"
2948msgstr "无法删除引用:%s"
5b04ee3b 2949
fd8cb379 2950#: ref-filter.c:35 wt-status.c:1850
87cb7997
JX
2951msgid "gone"
2952msgstr "丢失"
2953
2954#: ref-filter.c:36
2955#, c-format
2956msgid "ahead %d"
2957msgstr "领先 %d"
2958
2959#: ref-filter.c:37
2960#, c-format
2961msgid "behind %d"
2962msgstr "落后 %d"
2963
2964#: ref-filter.c:38
2965#, c-format
2966msgid "ahead %d, behind %d"
2967msgstr "领先 %d,落后 %d"
2968
fd8cb379 2969#: ref-filter.c:121
5b04ee3b 2970#, c-format
a0b6b246 2971msgid "expected format: %%(color:<color>)"
58b6f078 2972msgstr "期望的格式:%%(color:<颜色>)"
5b04ee3b 2973
fd8cb379 2974#: ref-filter.c:123
5b04ee3b 2975#, c-format
a0b6b246
JX
2976msgid "unrecognized color: %%(color:%s)"
2977msgstr "未能识别的颜色:%%(color:%s)"
6c94aba5 2978
fd8cb379 2979#: ref-filter.c:145
a0b6b246 2980#, c-format
87cb7997
JX
2981msgid "Integer value expected refname:lstrip=%s"
2982msgstr "期望整数值 refname:lstrip=%s"
90314792 2983
fd8cb379 2984#: ref-filter.c:149
87cb7997
JX
2985#, c-format
2986msgid "Integer value expected refname:rstrip=%s"
2987msgstr "期望整数值 refname:rstrip=%s"
2988
fd8cb379 2989#: ref-filter.c:151
87cb7997
JX
2990#, c-format
2991msgid "unrecognized %%(%s) argument: %s"
2992msgstr "未能识别的 %%(%s) 参数:%s"
2993
fd8cb379 2994#: ref-filter.c:206
90314792 2995#, c-format
a0b6b246
JX
2996msgid "%%(body) does not take arguments"
2997msgstr "%%(body) 不带参数"
90314792 2998
fd8cb379 2999#: ref-filter.c:215
a0b6b246
JX
3000#, c-format
3001msgid "%%(subject) does not take arguments"
3002msgstr "%%(subject) 不带参数"
90314792 3003
fd8cb379 3004#: ref-filter.c:235
1a79b2f1 3005#, c-format
6937cb4e
JX
3006msgid "unknown %%(trailers) argument: %s"
3007msgstr "未知的 %%(trailers) 参数:%s"
1a79b2f1 3008
fd8cb379 3009#: ref-filter.c:264
a0b6b246
JX
3010#, c-format
3011msgid "positive value expected contents:lines=%s"
87cb7997 3012msgstr "期望一个正数 contents:lines=%s"
90314792 3013
fd8cb379 3014#: ref-filter.c:266
a0b6b246
JX
3015#, c-format
3016msgid "unrecognized %%(contents) argument: %s"
3017msgstr "未能识别的 %%(contents) 参数:%s"
90314792 3018
fd8cb379 3019#: ref-filter.c:281
87cb7997
JX
3020#, c-format
3021msgid "positive value expected objectname:short=%s"
3022msgstr "期望一个正数 objectname:short=%s"
3023
fd8cb379 3024#: ref-filter.c:285
a0b6b246
JX
3025#, c-format
3026msgid "unrecognized %%(objectname) argument: %s"
3027msgstr "未能识别的 %%(objectname) 参数:%s"
90314792 3028
fd8cb379 3029#: ref-filter.c:315
a0b6b246
JX
3030#, c-format
3031msgid "expected format: %%(align:<width>,<position>)"
58b6f078 3032msgstr "期望的格式:%%(align:<宽度>,<位置>)"
90314792 3033
fd8cb379 3034#: ref-filter.c:327
5c57d762 3035#, c-format
a0b6b246
JX
3036msgid "unrecognized position:%s"
3037msgstr "未能识别的位置:%s"
5c57d762 3038
fd8cb379 3039#: ref-filter.c:334
1b7f4a34 3040#, c-format
a0b6b246
JX
3041msgid "unrecognized width:%s"
3042msgstr "未能识别的宽度:%s"
1b7f4a34 3043
fd8cb379 3044#: ref-filter.c:343
1b7f4a34 3045#, c-format
a0b6b246
JX
3046msgid "unrecognized %%(align) argument: %s"
3047msgstr "未能识别的 %%(align) 参数:%s"
1b7f4a34 3048
fd8cb379 3049#: ref-filter.c:351
1b7f4a34 3050#, c-format
a0b6b246
JX
3051msgid "positive width expected with the %%(align) atom"
3052msgstr "元素 %%(align) 需要一个正数的宽度"
1b7f4a34 3053
fd8cb379 3054#: ref-filter.c:369
87cb7997
JX
3055#, c-format
3056msgid "unrecognized %%(if) argument: %s"
3057msgstr "未能识别的 %%(if) 参数:%s"
3058
fd8cb379 3059#: ref-filter.c:464
07432cef 3060#, c-format
a0b6b246 3061msgid "malformed field name: %.*s"
fd8cb379 3062msgstr "格式错误的字段名:%.*s"
ef317cd5 3063
fd8cb379 3064#: ref-filter.c:491
a0b6b246
JX
3065#, c-format
3066msgid "unknown field name: %.*s"
3067msgstr "未知的字段名:%.*s"
220c313c 3068
fd8cb379 3069#: ref-filter.c:608
87cb7997
JX
3070#, c-format
3071msgid "format: %%(if) atom used without a %%(then) atom"
3072msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
3073
fd8cb379 3074#: ref-filter.c:671
87cb7997
JX
3075#, c-format
3076msgid "format: %%(then) atom used without an %%(if) atom"
3077msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
3078
fd8cb379 3079#: ref-filter.c:673
87cb7997
JX
3080#, c-format
3081msgid "format: %%(then) atom used more than once"
3082msgstr "格式:%%(then) 元素用了多次"
3083
fd8cb379 3084#: ref-filter.c:675
87cb7997
JX
3085#, c-format
3086msgid "format: %%(then) atom used after %%(else)"
3087msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
3088
fd8cb379 3089#: ref-filter.c:703
87cb7997
JX
3090#, c-format
3091msgid "format: %%(else) atom used without an %%(if) atom"
3092msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
3093
fd8cb379 3094#: ref-filter.c:705
87cb7997
JX
3095#, c-format
3096msgid "format: %%(else) atom used without a %%(then) atom"
3097msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
3098
fd8cb379 3099#: ref-filter.c:707
87cb7997
JX
3100#, c-format
3101msgid "format: %%(else) atom used more than once"
3102msgstr "格式:%%(else) 元素用了多次"
3103
fd8cb379 3104#: ref-filter.c:722
7aea43ff 3105#, c-format
a0b6b246
JX
3106msgid "format: %%(end) atom used without corresponding atom"
3107msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
7aea43ff 3108
fd8cb379 3109#: ref-filter.c:779
7aea43ff 3110#, c-format
a0b6b246 3111msgid "malformed format string %s"
fd8cb379 3112msgstr "错误的格式化字符串 %s"
7aea43ff 3113
fd8cb379 3114#: ref-filter.c:1387
87cb7997
JX
3115#, c-format
3116msgid "(no branch, rebasing %s)"
3117msgstr "(非分支,正变基 %s)"
3118
fd8cb379
JX
3119#: ref-filter.c:1390
3120#, c-format
3121msgid "(no branch, rebasing detached HEAD %s)"
3122msgstr "(非分支,正变基分离头指针 %s)"
3123
3124#: ref-filter.c:1393
87cb7997
JX
3125#, c-format
3126msgid "(no branch, bisect started on %s)"
3127msgstr "(非分支,二分查找开始于 %s)"
c04f5ac3 3128
a4f16749
JX
3129#. TRANSLATORS: make sure this matches "HEAD
3130#. detached at " in wt-status.c
3131#.
fd8cb379 3132#: ref-filter.c:1401
c04f5ac3 3133#, c-format
87cb7997
JX
3134msgid "(HEAD detached at %s)"
3135msgstr "(头指针分离于 %s)"
c04f5ac3 3136
a4f16749
JX
3137#. TRANSLATORS: make sure this matches "HEAD
3138#. detached from " in wt-status.c
3139#.
fd8cb379 3140#: ref-filter.c:1408
a0b6b246 3141#, c-format
87cb7997
JX
3142msgid "(HEAD detached from %s)"
3143msgstr "(头指针分离自 %s)"
6792b93b 3144
fd8cb379 3145#: ref-filter.c:1412
87cb7997
JX
3146msgid "(no branch)"
3147msgstr "(非分支)"
3148
fd8cb379 3149#: ref-filter.c:1442
a0b6b246
JX
3150#, c-format
3151msgid "missing object %s for %s"
3152msgstr "缺失 %2$s 的对象 %1$s"
c04f5ac3 3153
fd8cb379 3154#: ref-filter.c:1445
a0b6b246
JX
3155#, c-format
3156msgid "parse_object_buffer failed on %s for %s"
3157msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
6792b93b 3158
fd8cb379 3159#: ref-filter.c:1902
a0b6b246
JX
3160#, c-format
3161msgid "malformed object at '%s'"
fd8cb379 3162msgstr "格式错误的对象 '%s'"
c04f5ac3 3163
fd8cb379 3164#: ref-filter.c:1984
a0b6b246
JX
3165#, c-format
3166msgid "ignoring ref with broken name %s"
3167msgstr "忽略带有错误名称 %s 的引用"
c04f5ac3 3168
fd8cb379 3169#: ref-filter.c:1989
a0b6b246
JX
3170#, c-format
3171msgid "ignoring broken ref %s"
3172msgstr "忽略损坏的引用 %s"
c04f5ac3 3173
fd8cb379 3174#: ref-filter.c:2261
a0b6b246
JX
3175#, c-format
3176msgid "format: %%(end) atom missing"
3177msgstr "格式:缺少 %%(end) 元素"
c04f5ac3 3178
fd8cb379 3179#: ref-filter.c:2365
a0b6b246
JX
3180#, c-format
3181msgid "malformed object name %s"
fd8cb379 3182msgstr "格式错误的对象名 %s"
c04f5ac3 3183
fd8cb379 3184#: remote.c:605
a0b6b246
JX
3185#, c-format
3186msgid "Cannot fetch both %s and %s to %s"
3187msgstr "不能同时获取 %s 和 %s 至 %s"
c04f5ac3 3188
fd8cb379 3189#: remote.c:609
c04f5ac3 3190#, c-format
a0b6b246
JX
3191msgid "%s usually tracks %s, not %s"
3192msgstr "%s 通常跟踪 %s,而非 %s"
c04f5ac3 3193
fd8cb379 3194#: remote.c:613
a0b6b246
JX
3195#, c-format
3196msgid "%s tracks both %s and %s"
3197msgstr "%s 同时跟踪 %s 和 %s"
c04f5ac3 3198
fd8cb379 3199#: remote.c:621
a0b6b246
JX
3200msgid "Internal error"
3201msgstr "内部错误"
c04f5ac3 3202
fd8cb379 3203#: remote.c:1534 remote.c:1635
a0b6b246
JX
3204msgid "HEAD does not point to a branch"
3205msgstr "HEAD 没有指向一个分支"
c04f5ac3 3206
fd8cb379 3207#: remote.c:1543
a0b6b246
JX
3208#, c-format
3209msgid "no such branch: '%s'"
3210msgstr "没有此分支:'%s'"
c04f5ac3 3211
fd8cb379 3212#: remote.c:1546
a0b6b246
JX
3213#, c-format
3214msgid "no upstream configured for branch '%s'"
3215msgstr "尚未给分支 '%s' 设置上游"
c04f5ac3 3216
fd8cb379 3217#: remote.c:1552
a0b6b246
JX
3218#, c-format
3219msgid "upstream branch '%s' not stored as a remote-tracking branch"
3220msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
c04f5ac3 3221
fd8cb379 3222#: remote.c:1567
a0b6b246
JX
3223#, c-format
3224msgid "push destination '%s' on remote '%s' has no local tracking branch"
3225msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
c04f5ac3 3226
fd8cb379 3227#: remote.c:1579
a0b6b246
JX
3228#, c-format
3229msgid "branch '%s' has no remote for pushing"
3230msgstr "分支 '%s' 没有设置要推送的远程服务器"
cfff71a9 3231
fd8cb379 3232#: remote.c:1589
a0b6b246
JX
3233#, c-format
3234msgid "push refspecs for '%s' do not include '%s'"
3235msgstr "向 '%s' 推送引用规格未包含 '%s'"
cfff71a9 3236
fd8cb379 3237#: remote.c:1602
a0b6b246
JX
3238msgid "push has no destination (push.default is 'nothing')"
3239msgstr "推送无目标(push.default 是 'nothing')"
cfff71a9 3240
fd8cb379 3241#: remote.c:1624
a0b6b246
JX
3242msgid "cannot resolve 'simple' push to a single destination"
3243msgstr "无法解析 'simple' 推送至一个单独的目标"
6c94aba5 3244
fd8cb379 3245#: remote.c:1939
a0b6b246
JX
3246#, c-format
3247msgid "Your branch is based on '%s', but the upstream is gone.\n"
3248msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
6c94aba5 3249
fd8cb379 3250#: remote.c:1943
a0b6b246
JX
3251msgid " (use \"git branch --unset-upstream\" to fixup)\n"
3252msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
6c94aba5 3253
fd8cb379 3254#: remote.c:1946
a0b6b246 3255#, c-format
6937cb4e 3256msgid "Your branch is up to date with '%s'.\n"
a0b6b246 3257msgstr "您的分支与上游分支 '%s' 一致。\n"
cfff71a9 3258
fd8cb379 3259#: remote.c:1950
31e5e17b
JX
3260#, c-format
3261msgid "Your branch and '%s' refer to different commits.\n"
3262msgstr "您的分支和 '%s' 指向不同的提交。\n"
3263
fd8cb379 3264#: remote.c:1953
31e5e17b
JX
3265#, c-format
3266msgid " (use \"%s\" for details)\n"
3267msgstr " (使用 \"%s\" 查看详情)\n"
3268
fd8cb379 3269#: remote.c:1957
a0b6b246
JX
3270#, c-format
3271msgid "Your branch is ahead of '%s' by %d commit.\n"
3272msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
3273msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
3274msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
cfff71a9 3275
fd8cb379 3276#: remote.c:1963
a0b6b246
JX
3277msgid " (use \"git push\" to publish your local commits)\n"
3278msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
c04f5ac3 3279
fd8cb379 3280#: remote.c:1966
a0b6b246
JX
3281#, c-format
3282msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
3283msgid_plural ""
3284"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
3285msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
3286msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 3287
a0b6b246 3288# 译者:注意保持前导空格
fd8cb379 3289#: remote.c:1974
a0b6b246
JX
3290msgid " (use \"git pull\" to update your local branch)\n"
3291msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
c04f5ac3 3292
fd8cb379 3293#: remote.c:1977
a0b6b246
JX
3294#, c-format
3295msgid ""
3296"Your branch and '%s' have diverged,\n"
3297"and have %d and %d different commit each, respectively.\n"
3298msgid_plural ""
3299"Your branch and '%s' have diverged,\n"
3300"and have %d and %d different commits each, respectively.\n"
3301msgstr[0] ""
3302"您的分支和 '%s' 出现了偏离,\n"
3303"并且分别有 %d 和 %d 处不同的提交。\n"
3304msgstr[1] ""
3305"您的分支和 '%s' 出现了偏离,\n"
3306"并且分别有 %d 和 %d 处不同的提交。\n"
90314792 3307
a0b6b246 3308# 译者:注意保持前导空格
fd8cb379 3309#: remote.c:1987
a0b6b246
JX
3310msgid " (use \"git pull\" to merge the remote branch into yours)\n"
3311msgstr " (使用 \"git pull\" 来合并远程分支)\n"
90314792 3312
fd8cb379 3313#: revision.c:2289
a0b6b246
JX
3314msgid "your current branch appears to be broken"
3315msgstr "您的当前分支好像被损坏"
cfff71a9 3316
fd8cb379 3317#: revision.c:2292
a0b6b246
JX
3318#, c-format
3319msgid "your current branch '%s' does not have any commits yet"
3320msgstr "您的当前分支 '%s' 尚无任何提交"
6792b93b 3321
fd8cb379 3322#: revision.c:2489
a0b6b246
JX
3323msgid "--first-parent is incompatible with --bisect"
3324msgstr "--first-parent 与 --bisect 不兼容"
6792b93b 3325
fd8cb379 3326#: run-command.c:728
a0b6b246
JX
3327msgid "open /dev/null failed"
3328msgstr "不能打开 /dev/null"
5c57d762 3329
fd8cb379 3330#: run-command.c:1271
5809aa05
JX
3331#, c-format
3332msgid ""
3333"The '%s' hook was ignored because it's not set as executable.\n"
3334"You can disable this warning with `git config advice.ignoredHook false`."
3335msgstr ""
3336"因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n"
3337"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
3338
3339#: send-pack.c:141
31e5e17b
JX
3340msgid "unexpected flush packet while reading remote unpack status"
3341msgstr "读取远程解包状态时收到意外的 flush 包"
3342
3343#: send-pack.c:143
87cb7997
JX
3344#, c-format
3345msgid "unable to parse remote unpack status: %s"
3346msgstr "不能解析远程解包状态:%s"
3347
31e5e17b 3348#: send-pack.c:145
87cb7997
JX
3349#, c-format
3350msgid "remote unpack failed: %s"
3351msgstr "远程解包失败:%s"
3352
31e5e17b 3353#: send-pack.c:308
a0b6b246
JX
3354msgid "failed to sign the push certificate"
3355msgstr "无法为推送证书签名"
6792b93b 3356
31e5e17b 3357#: send-pack.c:421
a0b6b246
JX
3358msgid "the receiving end does not support --signed push"
3359msgstr "接收端不支持签名推送"
6792b93b 3360
31e5e17b 3361#: send-pack.c:423
a0b6b246
JX
3362msgid ""
3363"not sending a push certificate since the receiving end does not support --"
3364"signed push"
3365msgstr "未发送推送证书,因为接收端不支持签名推送"
6792b93b 3366
31e5e17b 3367#: send-pack.c:435
a0b6b246
JX
3368msgid "the receiving end does not support --atomic push"
3369msgstr "接收端不支持原子推送"
6792b93b 3370
31e5e17b 3371#: send-pack.c:440
a0b6b246
JX
3372msgid "the receiving end does not support push options"
3373msgstr "接收端不支持推送选项"
6792b93b 3374
fd8cb379 3375#: sequencer.c:175
31e5e17b
JX
3376#, c-format
3377msgid "invalid commit message cleanup mode '%s'"
3378msgstr "无效的提交信息清理模式 '%s'"
3379
fd8cb379
JX
3380#: sequencer.c:275
3381#, c-format
3382msgid "could not delete '%s'"
3383msgstr "无法删除 '%s'"
3384
3385#: sequencer.c:301
a0b6b246
JX
3386msgid "revert"
3387msgstr "还原"
6792b93b 3388
fd8cb379 3389#: sequencer.c:303
a0b6b246
JX
3390msgid "cherry-pick"
3391msgstr "拣选"
3392
fd8cb379 3393#: sequencer.c:305
1a79b2f1
JX
3394msgid "rebase -i"
3395msgstr "rebase -i"
3396
fd8cb379 3397#: sequencer.c:307
1a79b2f1
JX
3398#, c-format
3399msgid "Unknown action: %d"
3400msgstr "未知动作:%d"
3401
fd8cb379 3402#: sequencer.c:364
a0b6b246
JX
3403msgid ""
3404"after resolving the conflicts, mark the corrected paths\n"
3405"with 'git add <paths>' or 'git rm <paths>'"
3406msgstr ""
3407"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
3408"命令标记修正后的文件"
3409
fd8cb379 3410#: sequencer.c:367
a0b6b246
JX
3411msgid ""
3412"after resolving the conflicts, mark the corrected paths\n"
3413"with 'git add <paths>' or 'git rm <paths>'\n"
3414"and commit the result with 'git commit'"
3415msgstr ""
3416"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
3417"对修正后的文件做标记,然后用 'git commit' 提交"
1b7f4a34 3418
fd8cb379 3419#: sequencer.c:380 sequencer.c:2468
1b7f4a34 3420#, c-format
a0b6b246
JX
3421msgid "could not lock '%s'"
3422msgstr "不能锁定 '%s'"
1b7f4a34 3423
fd8cb379
JX
3424#: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486
3425#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656
1b7f4a34 3426#, c-format
a0b6b246
JX
3427msgid "could not write to '%s'"
3428msgstr "不能写入 '%s'"
1b7f4a34 3429
fd8cb379 3430#: sequencer.c:387
a0b6b246 3431#, c-format
72351d7d 3432msgid "could not write eol to '%s'"
a0b6b246 3433msgstr "不能将换行符写入 '%s'"
1b7f4a34 3434
fd8cb379
JX
3435#: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488
3436#: sequencer.c:2702
1b7f4a34 3437#, c-format
31e5e17b
JX
3438msgid "failed to finalize '%s'"
3439msgstr "无法完成 '%s'"
1b7f4a34 3440
fd8cb379
JX
3441#: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371
3442#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727
3443#: builtin/merge.c:1046
a0b6b246
JX
3444#, c-format
3445msgid "could not read '%s'"
3446msgstr "不能读取 '%s'"
1b7f4a34 3447
fd8cb379 3448#: sequencer.c:441
63af42fe 3449#, c-format
a0b6b246
JX
3450msgid "your local changes would be overwritten by %s."
3451msgstr "您的本地修改将被%s覆盖。"
63af42fe 3452
fd8cb379 3453#: sequencer.c:445
a0b6b246 3454msgid "commit your changes or stash them to proceed."
a4f16749 3455msgstr "提交您的修改或贮藏后再继续。"
6792b93b 3456
fd8cb379 3457#: sequencer.c:474
a0b6b246
JX
3458#, c-format
3459msgid "%s: fast-forward"
3460msgstr "%s:快进"
6792b93b 3461
1a79b2f1 3462#. TRANSLATORS: %s will be "revert", "cherry-pick" or
a4f16749 3463#. "rebase -i".
1a79b2f1 3464#.
fd8cb379 3465#: sequencer.c:563
a0b6b246
JX
3466#, c-format
3467msgid "%s: Unable to write new index file"
3468msgstr "%s:无法写入新索引文件"
6792b93b 3469
fd8cb379 3470#: sequencer.c:579
5809aa05
JX
3471msgid "unable to update cache tree"
3472msgstr "不能更新缓存树"
6792b93b 3473
fd8cb379
JX
3474#: sequencer.c:592
3475msgid "could not resolve HEAD commit"
3476msgstr "不能解析 HEAD 提交"
3477
3478#: sequencer.c:749
63af42fe
JX
3479#, c-format
3480msgid ""
a0b6b246
JX
3481"you have staged changes in your working tree\n"
3482"If these changes are meant to be squashed into the previous commit, run:\n"
3483"\n"
3484" git commit --amend %s\n"
3485"\n"
3486"If they are meant to go into a new commit, run:\n"
3487"\n"
3488" git commit %s\n"
3489"\n"
3490"In both cases, once you're done, continue with:\n"
3491"\n"
3492" git rebase --continue\n"
3493msgstr ""
1a79b2f1
JX
3494"您的工作区中存在已暂存的修改\n"
3495"如果这些修改需要被并入前一个提交,执行:\n"
a0b6b246
JX
3496"\n"
3497" git commit --amend %s\n"
3498"\n"
29004bbb 3499"如果这些修改要形成一个新提交,执行:\n"
a0b6b246
JX
3500"\n"
3501" git commit %s\n"
3502"\n"
3503"无论哪种情况,当您完成提交,继续执行:\n"
3504"\n"
3505" git rebase --continue\n"
6792b93b 3506
fd8cb379
JX
3507#: sequencer.c:818
3508msgid "writing root commit"
3509msgstr "写根提交"
3510
3511#: sequencer.c:1043
31e5e17b
JX
3512msgid "'prepare-commit-msg' hook failed"
3513msgstr "'prepare-commit-msg' 钩子失败"
3514
fd8cb379 3515#: sequencer.c:1050
31e5e17b
JX
3516msgid ""
3517"Your name and email address were configured automatically based\n"
3518"on your username and hostname. Please check that they are accurate.\n"
3519"You can suppress this message by setting them explicitly. Run the\n"
3520"following command and follow the instructions in your editor to edit\n"
3521"your configuration file:\n"
3522"\n"
3523" git config --global --edit\n"
3524"\n"
3525"After doing this, you may fix the identity used for this commit with:\n"
3526"\n"
3527" git commit --amend --reset-author\n"
3528msgstr ""
3529"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
3530"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
3531"中编辑您的配置文件:\n"
3532"\n"
3533" git config --global --edit\n"
3534"\n"
3535"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
3536"\n"
3537" git commit --amend --reset-author\n"
3538
fd8cb379 3539#: sequencer.c:1063
31e5e17b
JX
3540msgid ""
3541"Your name and email address were configured automatically based\n"
3542"on your username and hostname. Please check that they are accurate.\n"
3543"You can suppress this message by setting them explicitly:\n"
3544"\n"
3545" git config --global user.name \"Your Name\"\n"
3546" git config --global user.email you@example.com\n"
3547"\n"
3548"After doing this, you may fix the identity used for this commit with:\n"
3549"\n"
3550" git commit --amend --reset-author\n"
3551msgstr ""
3552"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
3553"与否。您可以对其进行设置以免再出现本提示信息:\n"
3554"\n"
3555" git config --global user.name \"Your Name\"\n"
3556" git config --global user.email you@example.com\n"
3557"\n"
3558"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
3559"\n"
3560" git commit --amend --reset-author\n"
3561
fd8cb379 3562#: sequencer.c:1103
31e5e17b
JX
3563msgid "couldn't look up newly created commit"
3564msgstr "无法找到新创建的提交"
3565
fd8cb379 3566#: sequencer.c:1105
31e5e17b
JX
3567msgid "could not parse newly created commit"
3568msgstr "不能解析新创建的提交"
3569
fd8cb379 3570#: sequencer.c:1151
31e5e17b
JX
3571msgid "unable to resolve HEAD after creating commit"
3572msgstr "创建提交后,不能解析 HEAD"
3573
fd8cb379 3574#: sequencer.c:1153
31e5e17b
JX
3575msgid "detached HEAD"
3576msgstr "分离头指针"
3577
3578# 译者:中文字符串拼接,可删除前导空格
fd8cb379 3579#: sequencer.c:1157
31e5e17b
JX
3580msgid " (root-commit)"
3581msgstr "(根提交)"
3582
fd8cb379 3583#: sequencer.c:1178
31e5e17b
JX
3584msgid "could not parse HEAD"
3585msgstr "不能解析 HEAD"
3586
fd8cb379 3587#: sequencer.c:1180
31e5e17b
JX
3588#, c-format
3589msgid "HEAD %s is not a commit!"
3590msgstr "HEAD %s 不是一个提交!"
3591
fd8cb379 3592#: sequencer.c:1184 builtin/commit.c:1528
31e5e17b
JX
3593msgid "could not parse HEAD commit"
3594msgstr "不能解析 HEAD 提交"
3595
fd8cb379 3596#: sequencer.c:1235 sequencer.c:1832
31e5e17b
JX
3597msgid "unable to parse commit author"
3598msgstr "不能解析提交作者"
3599
fd8cb379 3600#: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645
31e5e17b
JX
3601msgid "git write-tree failed to write a tree"
3602msgstr "git write-tree 无法写入树对象"
3603
fd8cb379 3604#: sequencer.c:1262 sequencer.c:1317
31e5e17b
JX
3605#, c-format
3606msgid "unable to read commit message from '%s'"
3607msgstr "不能从 '%s' 读取提交说明"
3608
fd8cb379
JX
3609#: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825
3610#: builtin/merge.c:850
31e5e17b
JX
3611msgid "failed to write commit object"
3612msgstr "无法写提交对象"
3613
fd8cb379 3614#: sequencer.c:1344
a0b6b246 3615#, c-format
5809aa05
JX
3616msgid "could not parse commit %s"
3617msgstr "不能解析提交 %s"
6792b93b 3618
fd8cb379 3619#: sequencer.c:1349
63af42fe 3620#, c-format
5809aa05
JX
3621msgid "could not parse parent commit %s"
3622msgstr "不能解析父提交 %s"
63af42fe 3623
fd8cb379 3624#: sequencer.c:1500 sequencer.c:1525
1a79b2f1
JX
3625#, c-format
3626msgid "This is a combination of %d commits."
3627msgstr "这是一个 %d 个提交的组合。"
3628
fd8cb379 3629#: sequencer.c:1510 sequencer.c:4355
1a79b2f1
JX
3630msgid "need a HEAD to fixup"
3631msgstr "需要一个 HEAD 来修复"
3632
fd8cb379 3633#: sequencer.c:1512 sequencer.c:2729
1a79b2f1
JX
3634msgid "could not read HEAD"
3635msgstr "不能读取 HEAD"
3636
fd8cb379 3637#: sequencer.c:1514
1a79b2f1
JX
3638msgid "could not read HEAD's commit message"
3639msgstr "不能读取 HEAD 的提交说明"
3640
fd8cb379 3641#: sequencer.c:1520
1a79b2f1
JX
3642#, c-format
3643msgid "cannot write '%s'"
3644msgstr "不能写 '%s'"
3645
fd8cb379 3646#: sequencer.c:1527 git-rebase--interactive.sh:457
1a79b2f1
JX
3647msgid "This is the 1st commit message:"
3648msgstr "这是第一个提交说明:"
3649
fd8cb379 3650#: sequencer.c:1535
1a79b2f1
JX
3651#, c-format
3652msgid "could not read commit message of %s"
3653msgstr "不能读取 %s 的提交说明"
3654
fd8cb379 3655#: sequencer.c:1542
1a79b2f1
JX
3656#, c-format
3657msgid "This is the commit message #%d:"
3658msgstr "这是提交说明 #%d:"
3659
fd8cb379 3660#: sequencer.c:1548
1a79b2f1
JX
3661#, c-format
3662msgid "The commit message #%d will be skipped:"
3663msgstr "提交说明 #%d 将被跳过:"
3664
fd8cb379 3665#: sequencer.c:1553
1a79b2f1
JX
3666#, c-format
3667msgid "unknown command: %d"
3668msgstr "未知命令:%d"
3669
fd8cb379 3670#: sequencer.c:1631
a0b6b246
JX
3671msgid "your index file is unmerged."
3672msgstr "您的索引文件未完成合并。"
6792b93b 3673
fd8cb379
JX
3674#: sequencer.c:1638
3675msgid "cannot fixup root commit"
3676msgstr "不能修复根提交"
3677
3678#: sequencer.c:1657
a0b6b246
JX
3679#, c-format
3680msgid "commit %s is a merge but no -m option was given."
3681msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
6792b93b 3682
fd8cb379 3683#: sequencer.c:1665
a0b6b246
JX
3684#, c-format
3685msgid "commit %s does not have parent %d"
3686msgstr "提交 %s 没有第 %d 个父提交"
3687
fd8cb379 3688#: sequencer.c:1669
a0b6b246
JX
3689#, c-format
3690msgid "mainline was specified but commit %s is not a merge."
3691msgstr "指定了主线,但是提交 %s 不是一个合并提交。"
3692
fd8cb379 3693#: sequencer.c:1675
1a79b2f1
JX
3694#, c-format
3695msgid "cannot get commit message for %s"
3696msgstr "不能得到 %s 的提交说明"
3697
a0b6b246
JX
3698#. TRANSLATORS: The first %s will be a "todo" command like
3699#. "revert" or "pick", the second %s a SHA1.
fd8cb379 3700#: sequencer.c:1694
a0b6b246
JX
3701#, c-format
3702msgid "%s: cannot parse parent commit %s"
3703msgstr "%s:不能解析父提交 %s"
3704
fd8cb379 3705#: sequencer.c:1759
a0b6b246 3706#, c-format
1a79b2f1
JX
3707msgid "could not rename '%s' to '%s'"
3708msgstr "不能将 '%s' 重命名为 '%s'"
a0b6b246 3709
fd8cb379 3710#: sequencer.c:1813
a0b6b246
JX
3711#, c-format
3712msgid "could not revert %s... %s"
3713msgstr "不能还原 %s... %s"
3714
fd8cb379 3715#: sequencer.c:1814
a0b6b246
JX
3716#, c-format
3717msgid "could not apply %s... %s"
3718msgstr "不能应用 %s... %s"
3719
fd8cb379 3720#: sequencer.c:1864
a0b6b246
JX
3721msgid "empty commit set passed"
3722msgstr "提供了空的提交集"
3723
fd8cb379 3724#: sequencer.c:1874
a0b6b246
JX
3725#, c-format
3726msgid "git %s: failed to read the index"
3727msgstr "git %s:无法读取索引"
3728
fd8cb379 3729#: sequencer.c:1881
a0b6b246
JX
3730#, c-format
3731msgid "git %s: failed to refresh the index"
3732msgstr "git %s:无法刷新索引"
3733
fd8cb379 3734#: sequencer.c:1961
5809aa05
JX
3735#, c-format
3736msgid "%s does not accept arguments: '%s'"
3737msgstr "%s 不接受参数:'%s'"
3738
fd8cb379 3739#: sequencer.c:1970
5809aa05
JX
3740#, c-format
3741msgid "missing arguments for %s"
3742msgstr "缺少 %s 的参数"
3743
fd8cb379 3744#: sequencer.c:2029
a0b6b246
JX
3745#, c-format
3746msgid "invalid line %d: %.*s"
3747msgstr "无效行 %d:%.*s"
3748
fd8cb379 3749#: sequencer.c:2037
1a79b2f1
JX
3750#, c-format
3751msgid "cannot '%s' without a previous commit"
3752msgstr "没有父提交的情况下不能 '%s'"
a0b6b246 3753
fd8cb379 3754#: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173
a0b6b246
JX
3755#, c-format
3756msgid "could not read '%s'."
3757msgstr "不能读取 '%s'。"
3758
fd8cb379 3759#: sequencer.c:2108
1a79b2f1
JX
3760msgid "please fix this using 'git rebase --edit-todo'."
3761msgstr "请用 'git rebase --edit-todo' 来修改。"
3762
fd8cb379 3763#: sequencer.c:2110
a0b6b246
JX
3764#, c-format
3765msgid "unusable instruction sheet: '%s'"
29004bbb 3766msgstr "不可用的指令清单:'%s'"
a0b6b246 3767
fd8cb379 3768#: sequencer.c:2115
1a79b2f1
JX
3769msgid "no commits parsed."
3770msgstr "没有解析提交。"
3771
fd8cb379 3772#: sequencer.c:2126
a0b6b246
JX
3773msgid "cannot cherry-pick during a revert."
3774msgstr "不能在回退中执行拣选。"
3775
fd8cb379 3776#: sequencer.c:2128
a0b6b246
JX
3777msgid "cannot revert during a cherry-pick."
3778msgstr "不能在拣选中执行回退。"
3779
fd8cb379 3780#: sequencer.c:2195
a0b6b246
JX
3781#, c-format
3782msgid "invalid key: %s"
3783msgstr "无效键名:%s"
3784
fd8cb379 3785#: sequencer.c:2198
a0b6b246
JX
3786#, c-format
3787msgid "invalid value for %s: %s"
3788msgstr "%s 的值无效:%s"
3789
fd8cb379
JX
3790#: sequencer.c:2269
3791msgid "unusable squash-onto"
3792msgstr "不可用的 squash-onto"
3793
3794#: sequencer.c:2285
a0b6b246
JX
3795#, c-format
3796msgid "malformed options sheet: '%s'"
fd8cb379 3797msgstr "格式错误的选项清单:'%s'"
a0b6b246 3798
fd8cb379 3799#: sequencer.c:2323
a0b6b246
JX
3800msgid "a cherry-pick or revert is already in progress"
3801msgstr "一个拣选或还原操作已在进行"
3802
fd8cb379 3803#: sequencer.c:2324
a0b6b246
JX
3804msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
3805msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
3806
fd8cb379 3807#: sequencer.c:2327
a0b6b246
JX
3808#, c-format
3809msgid "could not create sequencer directory '%s'"
3810msgstr "不能创建序列目录 '%s'"
3811
fd8cb379 3812#: sequencer.c:2341
a0b6b246
JX
3813msgid "could not lock HEAD"
3814msgstr "不能锁定 HEAD"
3815
fd8cb379 3816#: sequencer.c:2396 sequencer.c:3403
a0b6b246
JX
3817msgid "no cherry-pick or revert in progress"
3818msgstr "拣选或还原操作并未进行"
3819
fd8cb379 3820#: sequencer.c:2398
a0b6b246
JX
3821msgid "cannot resolve HEAD"
3822msgstr "不能解析 HEAD"
3823
fd8cb379 3824#: sequencer.c:2400 sequencer.c:2435
a0b6b246
JX
3825msgid "cannot abort from a branch yet to be born"
3826msgstr "不能从尚未建立的分支终止"
3827
fd8cb379 3828#: sequencer.c:2421 builtin/grep.c:720
a0b6b246
JX
3829#, c-format
3830msgid "cannot open '%s'"
3831msgstr "不能打开 '%s'"
3832
fd8cb379 3833#: sequencer.c:2423
a0b6b246
JX
3834#, c-format
3835msgid "cannot read '%s': %s"
3836msgstr "不能读取 '%s':%s"
3837
fd8cb379 3838#: sequencer.c:2424
a0b6b246
JX
3839msgid "unexpected end of file"
3840msgstr "意外的文件结束"
3841
fd8cb379 3842#: sequencer.c:2430
a0b6b246
JX
3843#, c-format
3844msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
3845msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
3846
fd8cb379 3847#: sequencer.c:2441
1a79b2f1
JX
3848msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
3849msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
3850
fd8cb379 3851#: sequencer.c:2545 sequencer.c:3321
31e5e17b
JX
3852#, c-format
3853msgid "could not update %s"
3854msgstr "不能更新 %s"
3855
fd8cb379 3856#: sequencer.c:2583 sequencer.c:3301
1a79b2f1
JX
3857msgid "cannot read HEAD"
3858msgstr "不能读取 HEAD"
3859
fd8cb379 3860#: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639
1a79b2f1
JX
3861#, c-format
3862msgid "could not copy '%s' to '%s'"
3863msgstr "不能拷贝 '%s' 至 '%s'"
3864
fd8cb379 3865#: sequencer.c:2641
1a79b2f1
JX
3866msgid "could not read index"
3867msgstr "不能读取索引"
3868
3869# 译者:注意保持前导空格
fd8cb379 3870#: sequencer.c:2646
1a79b2f1
JX
3871#, c-format
3872msgid ""
3873"execution failed: %s\n"
3874"%sYou can fix the problem, and then run\n"
3875"\n"
3876" git rebase --continue\n"
3877"\n"
3878msgstr ""
3879"执行失败:%s\n"
3880"%s您可以改正该问题,然后运行\n"
3881"\n"
3882" git rebase --continue\n"
3883"\n"
3884
fd8cb379 3885#: sequencer.c:2652
1a79b2f1
JX
3886msgid "and made changes to the index and/or the working tree\n"
3887msgstr "并且修改索引和/或工作区\n"
3888
fd8cb379 3889#: sequencer.c:2658
1a79b2f1
JX
3890#, c-format
3891msgid ""
3892"execution succeeded: %s\n"
3893"but left changes to the index and/or the working tree\n"
3894"Commit or stash your changes, and then run\n"
3895"\n"
3896" git rebase --continue\n"
3897"\n"
3898msgstr ""
3899"执行成功:%s\n"
3900"但是在索引和/或工作区中存在变更\n"
a4f16749 3901"提交或贮藏修改,然后运行\n"
1a79b2f1
JX
3902"\n"
3903" git rebase --continue\n"
3904"\n"
3905
fd8cb379
JX
3906#: sequencer.c:2771
3907msgid "writing fake root commit"
3908msgstr "写伪根提交"
3909
3910#: sequencer.c:2776
3911msgid "writing squash-onto"
3912msgstr "写入 squash-onto"
3913
3914#: sequencer.c:2811
3915#, c-format
3916msgid "failed to find tree of %s"
3917msgstr "无法找到 %s 指向的树。"
3918
3919#: sequencer.c:2829
3920msgid "could not write index"
3921msgstr "不能写入索引"
3922
3923#: sequencer.c:2861
3924msgid "cannot merge without a current revision"
3925msgstr "没有当前版本不能合并"
3926
3927#: sequencer.c:2884
3928#, c-format
3929msgid "could not resolve '%s'"
3930msgstr "无法解析 '%s'"
3931
3932#: sequencer.c:2906
3933#, c-format
3934msgid "could not get commit message of '%s'"
3935msgstr "不能获取 '%s' 的提交说明"
3936
3937#: sequencer.c:2916 sequencer.c:2941
3938#, c-format
3939msgid "could not write '%s'"
3940msgstr "不能写入 '%s'"
3941
3942#: sequencer.c:3005
3943#, c-format
3944msgid "could not even attempt to merge '%.*s'"
3945msgstr "甚至不能尝试合并 '%.*s'"
3946
3947#: sequencer.c:3021
3948msgid "merge: Unable to write new index file"
3949msgstr "合并:无法写入新索引文件"
3950
3951#: sequencer.c:3088
1a79b2f1 3952#, c-format
a4f16749
JX
3953msgid "Applied autostash.\n"
3954msgstr "已应用 autostash。\n"
1a79b2f1 3955
fd8cb379 3956#: sequencer.c:3100
1a79b2f1
JX
3957#, c-format
3958msgid "cannot store %s"
3959msgstr "不能存储 %s"
3960
fd8cb379 3961#: sequencer.c:3103 git-rebase.sh:188
1a79b2f1
JX
3962#, c-format
3963msgid ""
3964"Applying autostash resulted in conflicts.\n"
3965"Your changes are safe in the stash.\n"
3966"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
3967msgstr ""
3968"应用 autostash 导致冲突。\n"
a4f16749 3969"您的修改安全地保存在贮藏区中。\n"
1a79b2f1
JX
3970"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
3971
fd8cb379
JX
3972#: sequencer.c:3134
3973#, c-format
3974msgid ""
3975"Could not execute the todo command\n"
3976"\n"
3977" %.*s\n"
3978"It has been rescheduled; To edit the command before continuing, please\n"
3979"edit the todo list first:\n"
3980"\n"
3981" git rebase --edit-todo\n"
3982" git rebase --continue\n"
3983msgstr ""
3984"无法执行待办命令\n"
3985"\n"
3986" %.*s\n"
3987"已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n"
3988"\n"
3989" git rebase --edit-todo\n"
3990" git rebase --continue\n"
3991
3992#: sequencer.c:3202
1a79b2f1 3993#, c-format
87cb7997
JX
3994msgid "Stopped at %s... %.*s\n"
3995msgstr "停止在 %s... %.*s\n"
1a79b2f1 3996
fd8cb379 3997#: sequencer.c:3264
1a79b2f1
JX
3998#, c-format
3999msgid "unknown command %d"
4000msgstr "未知命令 %d"
4001
fd8cb379 4002#: sequencer.c:3309
1a79b2f1
JX
4003msgid "could not read orig-head"
4004msgstr "不能读取 orig-head"
4005
fd8cb379 4006#: sequencer.c:3314 sequencer.c:4352
1a79b2f1
JX
4007msgid "could not read 'onto'"
4008msgstr "不能读取 'onto'"
4009
fd8cb379 4010#: sequencer.c:3328
1a79b2f1
JX
4011#, c-format
4012msgid "could not update HEAD to %s"
4013msgstr "不能更新 HEAD 为 %s"
4014
fd8cb379 4015#: sequencer.c:3414
1a79b2f1
JX
4016msgid "cannot rebase: You have unstaged changes."
4017msgstr "不能变基:您有未暂存的变更。"
4018
fd8cb379 4019#: sequencer.c:3423
1a79b2f1
JX
4020msgid "cannot amend non-existing commit"
4021msgstr "不能修补不存在的提交"
4022
fd8cb379 4023#: sequencer.c:3425
1a79b2f1
JX
4024#, c-format
4025msgid "invalid file: '%s'"
4026msgstr "无效文件:'%s'"
4027
fd8cb379 4028#: sequencer.c:3427
1a79b2f1
JX
4029#, c-format
4030msgid "invalid contents: '%s'"
4031msgstr "无效内容:'%s'"
4032
fd8cb379 4033#: sequencer.c:3430
1a79b2f1
JX
4034msgid ""
4035"\n"
4036"You have uncommitted changes in your working tree. Please, commit them\n"
4037"first and then run 'git rebase --continue' again."
87cb7997
JX
4038msgstr ""
4039"\n"
4040"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
1a79b2f1 4041
fd8cb379
JX
4042#: sequencer.c:3455 sequencer.c:3493
4043#, c-format
4044msgid "could not write file: '%s'"
4045msgstr "不能写入文件:'%s'"
4046
4047#: sequencer.c:3508
4048msgid "could not remove CHERRY_PICK_HEAD"
4049msgstr "不能删除 CHERRY_PICK_HEAD"
4050
4051#: sequencer.c:3515
1a79b2f1
JX
4052msgid "could not commit staged changes."
4053msgstr "不能提交暂存的修改。"
4054
fd8cb379 4055#: sequencer.c:3612
a0b6b246
JX
4056#, c-format
4057msgid "%s: can't cherry-pick a %s"
4058msgstr "%s:不能拣选一个%s"
4059
fd8cb379 4060#: sequencer.c:3616
a0b6b246
JX
4061#, c-format
4062msgid "%s: bad revision"
4063msgstr "%s:错误的版本"
4064
fd8cb379 4065#: sequencer.c:3649
a0b6b246
JX
4066msgid "can't revert as initial commit"
4067msgstr "不能作为初始提交回退"
4068
fd8cb379 4069#: sequencer.c:4098
6937cb4e
JX
4070msgid "make_script: unhandled options"
4071msgstr "make_script:有未能处理的选项"
4072
fd8cb379 4073#: sequencer.c:4101
6937cb4e
JX
4074msgid "make_script: error preparing revisions"
4075msgstr "make_script:准备版本时错误"
4076
fd8cb379 4077#: sequencer.c:4142 sequencer.c:4177
6937cb4e
JX
4078#, c-format
4079msgid "unusable todo list: '%s'"
4080msgstr "不可用的待办列表:'%s'"
4081
fd8cb379 4082#: sequencer.c:4236
6937cb4e
JX
4083#, c-format
4084msgid ""
4085"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
4086msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
4087
fd8cb379 4088#: sequencer.c:4302
6937cb4e
JX
4089#, c-format
4090msgid ""
4091"Warning: some commits may have been dropped accidentally.\n"
4092"Dropped commits (newer to older):\n"
4093msgstr ""
4094"警告:一些提交可能被意外丢弃。\n"
4095"丢弃的提交(从新到旧):\n"
4096
fd8cb379 4097#: sequencer.c:4309
6937cb4e
JX
4098#, c-format
4099msgid ""
4100"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
4101"\n"
4102"Use 'git config rebase.missingCommitsCheck' to change the level of "
4103"warnings.\n"
4104"The possible behaviours are: ignore, warn, error.\n"
4105"\n"
4106msgstr ""
4107"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
4108"\n"
4109"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
4110"可选值有:ignore、warn、error。\n"
4111"\n"
4112
fd8cb379 4113#: sequencer.c:4321
6937cb4e
JX
4114#, c-format
4115msgid ""
4116"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
4117"continue'.\n"
4118"Or you can abort the rebase with 'git rebase --abort'.\n"
4119msgstr ""
4120"您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n"
4121"或者您可以用 'git rebase --abort' 终止变基。\n"
4122
fd8cb379 4123#: sequencer.c:4375
6937cb4e 4124#, c-format
5809aa05
JX
4125msgid "could not parse commit '%s'"
4126msgstr "不能解析提交 '%s'"
6937cb4e 4127
fd8cb379 4128#: sequencer.c:4490
6937cb4e
JX
4129msgid "the script was already rearranged."
4130msgstr "脚本已经重新编排。"
4131
fd8cb379 4132#: setup.c:123
31e5e17b
JX
4133#, c-format
4134msgid "'%s' is outside repository"
4135msgstr "'%s' 在仓库之外"
4136
fd8cb379 4137#: setup.c:172
a0b6b246 4138#, c-format
6792b93b 4139msgid ""
a0b6b246
JX
4140"%s: no such path in the working tree.\n"
4141"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
4142msgstr ""
4143"%s:工作区中无此路径。\n"
58b6f078 4144"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
6792b93b 4145
fd8cb379 4146#: setup.c:185
90314792 4147#, c-format
a0b6b246
JX
4148msgid ""
4149"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
4150"Use '--' to separate paths from revisions, like this:\n"
4151"'git <command> [<revision>...] -- [<file>...]'"
4152msgstr ""
4153"有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
4154"使用 '--' 来分隔版本和路径,例如:\n"
58b6f078 4155"'git <命令> [<版本>...] -- [<文件>...]'"
6792b93b 4156
fd8cb379 4157#: setup.c:234
31e5e17b
JX
4158#, c-format
4159msgid "option '%s' must come before non-option arguments"
4160msgstr "选项 '%s' 必须在其他非选项参数之前"
4161
fd8cb379 4162#: setup.c:253
a0b6b246
JX
4163#, c-format
4164msgid ""
4165"ambiguous argument '%s': both revision and filename\n"
4166"Use '--' to separate paths from revisions, like this:\n"
4167"'git <command> [<revision>...] -- [<file>...]'"
4168msgstr ""
4169"有歧义的参数 '%s':可同时是版本和文件\n"
4170"使用 '--' 来分隔版本和路径,例如:\n"
58b6f078 4171"'git <命令> [<版本>...] -- [<文件>...]'"
2e8451e8 4172
fd8cb379 4173#: setup.c:389
31e5e17b
JX
4174msgid "unable to set up work tree using invalid config"
4175msgstr "无法使用无效配置来创建工作区"
4176
fd8cb379 4177#: setup.c:393
31e5e17b 4178msgid "this operation must be run in a work tree"
610f8099 4179msgstr "该操作必须在一个工作区中运行"
31e5e17b 4180
fd8cb379 4181#: setup.c:503
a0b6b246
JX
4182#, c-format
4183msgid "Expected git repo version <= %d, found %d"
4184msgstr "期望 git 仓库版本 <= %d,却得到 %d"
6792b93b 4185
fd8cb379 4186#: setup.c:511
a0b6b246
JX
4187msgid "unknown repository extensions found:"
4188msgstr "发现未知的仓库扩展:"
2e8451e8 4189
fd8cb379 4190#: setup.c:530
1003b3a5 4191#, c-format
31e5e17b
JX
4192msgid "error opening '%s'"
4193msgstr "无法打开 '%s'"
1003b3a5 4194
fd8cb379 4195#: setup.c:532
31e5e17b
JX
4196#, c-format
4197msgid "too large to be a .git file: '%s'"
610f8099 4198msgstr "文件太大,无法作为 .git 文件:'%s'"
31e5e17b 4199
fd8cb379 4200#: setup.c:534
31e5e17b
JX
4201#, c-format
4202msgid "error reading %s"
4203msgstr "无法读取 %s"
4204
fd8cb379 4205#: setup.c:536
31e5e17b
JX
4206#, c-format
4207msgid "invalid gitfile format: %s"
4208msgstr "无效的 gitfile 格式:%s"
4209
fd8cb379 4210#: setup.c:538
31e5e17b
JX
4211#, c-format
4212msgid "no path in gitfile: %s"
4213msgstr "在 gitfile 中没有路径:%s"
4214
fd8cb379 4215#: setup.c:540
31e5e17b
JX
4216#, c-format
4217msgid "not a git repository: %s"
4218msgstr "不是一个 git 仓库:%s"
4219
fd8cb379 4220#: setup.c:639
31e5e17b
JX
4221#, c-format
4222msgid "'$%s' too big"
4223msgstr "'$%s' 太大"
4224
fd8cb379 4225#: setup.c:653
31e5e17b
JX
4226#, c-format
4227msgid "not a git repository: '%s'"
4228msgstr "不是一个 git 仓库:'%s'"
4229
fd8cb379 4230#: setup.c:682 setup.c:684 setup.c:715
31e5e17b
JX
4231#, c-format
4232msgid "cannot chdir to '%s'"
4233msgstr "不能切换目录到 '%s'"
4234
fd8cb379 4235#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815
31e5e17b 4236msgid "cannot come back to cwd"
a0b6b246 4237msgstr "无法返回当前工作目录"
1003b3a5 4238
fd8cb379 4239#: setup.c:813
31e5e17b
JX
4240#, c-format
4241msgid "not a git repository (or any of the parent directories): %s"
4242msgstr "不是一个 git 仓库(或者任何父目录):%s"
4243
fd8cb379 4244#: setup.c:824
31e5e17b
JX
4245#, c-format
4246msgid "failed to stat '%*s%s%s'"
4247msgstr "无法获取 '%*s%s%s' 状态(stat)"
4248
fd8cb379 4249#: setup.c:1054
a0b6b246
JX
4250msgid "Unable to read current working directory"
4251msgstr "不能读取当前工作目录"
1003b3a5 4252
fd8cb379 4253#: setup.c:1066 setup.c:1072
87cb7997 4254#, c-format
31e5e17b 4255msgid "cannot change to '%s'"
87cb7997
JX
4256msgstr "不能切换到 '%s'"
4257
fd8cb379 4258#: setup.c:1085
a0b6b246
JX
4259#, c-format
4260msgid ""
31e5e17b 4261"not a git repository (or any parent up to mount point %s)\n"
a0b6b246
JX
4262"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
4263msgstr ""
31e5e17b 4264"不是一个 git 仓库(或者直至挂载点 %s 的任何父目录)\n"
a0b6b246 4265"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
1003b3a5 4266
fd8cb379 4267#: setup.c:1168
a0b6b246
JX
4268#, c-format
4269msgid ""
31e5e17b 4270"problem with core.sharedRepository filemode value (0%.3o).\n"
a0b6b246
JX
4271"The owner of files must always have read and write permissions."
4272msgstr ""
31e5e17b 4273"参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n"
a0b6b246 4274"文件属主必须始终拥有读写权限。"
6792b93b 4275
fd8cb379 4276#: setup.c:1211
31e5e17b
JX
4277msgid "open /dev/null or dup failed"
4278msgstr "不能打开或者复制 /dev/null"
4279
fd8cb379 4280#: setup.c:1226
31e5e17b
JX
4281msgid "fork failed"
4282msgstr "fork 失败"
4283
fd8cb379 4284#: setup.c:1231
31e5e17b
JX
4285msgid "setsid failed"
4286msgstr "setsid 失败"
4287
fd8cb379 4288#: sha1-file.c:625
a0b6b246
JX
4289#, c-format
4290msgid "path '%s' does not exist"
4291msgstr "路径 '%s' 不存在"
4292
fd8cb379 4293#: sha1-file.c:651
a0b6b246
JX
4294#, c-format
4295msgid "reference repository '%s' as a linked checkout is not supported yet."
4296msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
4297
fd8cb379 4298#: sha1-file.c:657
a0b6b246
JX
4299#, c-format
4300msgid "reference repository '%s' is not a local repository."
4301msgstr "参考仓库 '%s' 不是一个本地仓库。"
4302
fd8cb379 4303#: sha1-file.c:663
a0b6b246
JX
4304#, c-format
4305msgid "reference repository '%s' is shallow"
4306msgstr "参考仓库 '%s' 是一个浅克隆"
4307
fd8cb379 4308#: sha1-file.c:671
a0b6b246
JX
4309#, c-format
4310msgid "reference repository '%s' is grafted"
fd8cb379 4311msgstr "参考仓库 '%s' 已被移植"
a0b6b246 4312
fd8cb379 4313#: sha1-name.c:442
a0b6b246
JX
4314#, c-format
4315msgid "short SHA1 %s is ambiguous"
29004bbb 4316msgstr "短 SHA1 %s 存在歧义"
a0b6b246 4317
fd8cb379 4318#: sha1-name.c:453
a0b6b246
JX
4319msgid "The candidates are:"
4320msgstr "候选者有:"
4321
fd8cb379 4322#: sha1-name.c:695
a0b6b246
JX
4323msgid ""
4324"Git normally never creates a ref that ends with 40 hex characters\n"
4325"because it will be ignored when you just specify 40-hex. These refs\n"
4326"may be created by mistake. For example,\n"
4327"\n"
4328" git checkout -b $br $(git rev-parse ...)\n"
4329"\n"
4330"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
4331"examine these refs and maybe delete them. Turn this message off by\n"
4332"running \"git config advice.objectNameWarning false\""
4333msgstr ""
4334"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
4335"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
4336"\n"
4337" git checkout -b $br $(git rev-parse ...)\n"
4338"\n"
4339"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
4340"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
4341"命令关闭本消息通知。"
4342
fd8cb379 4343#: submodule.c:97 submodule.c:131
a0b6b246
JX
4344msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
4345msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
4346
fd8cb379 4347#: submodule.c:101 submodule.c:135
a0b6b246
JX
4348#, c-format
4349msgid "Could not find section in .gitmodules where path=%s"
4350msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
4351
fd8cb379 4352#: submodule.c:109
a0b6b246
JX
4353#, c-format
4354msgid "Could not update .gitmodules entry %s"
4355msgstr "不能更新 .gitmodules 条目 %s"
4356
fd8cb379 4357#: submodule.c:142
a0b6b246
JX
4358#, c-format
4359msgid "Could not remove .gitmodules entry for %s"
4360msgstr "无法移除 %s 的 .gitmodules 条目"
4361
fd8cb379 4362#: submodule.c:153
a0b6b246
JX
4363msgid "staging updated .gitmodules failed"
4364msgstr "将更新后 .gitmodules 添加暂存区失败"
4365
fd8cb379 4366#: submodule.c:315
a4f16749
JX
4367#, c-format
4368msgid "in unpopulated submodule '%s'"
4369msgstr "位于未检出的子模组 '%s'"
4370
fd8cb379 4371#: submodule.c:346
a4f16749
JX
4372#, c-format
4373msgid "Pathspec '%s' is in submodule '%.*s'"
4374msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
4375
fd8cb379 4376#: submodule.c:837
6937cb4e
JX
4377#, c-format
4378msgid "submodule entry '%s' (%s) is a %s, not a commit"
493a9322 4379msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交"
6937cb4e 4380
fd8cb379 4381#: submodule.c:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743
6937cb4e
JX
4382msgid "Failed to resolve HEAD as a valid ref."
4383msgstr "无法将 HEAD 解析为有效引用。"
4384
fd8cb379 4385#: submodule.c:1375
1a79b2f1 4386#, c-format
87cb7997 4387msgid "'%s' not recognized as a git repository"
65e2041e 4388msgstr "无法将 '%s' 识别为一个 git 仓库"
1a79b2f1 4389
fd8cb379 4390#: submodule.c:1513
1a79b2f1 4391#, c-format
87cb7997
JX
4392msgid "could not start 'git status' in submodule '%s'"
4393msgstr "无法在子模组 '%s' 中启动 'git status'"
1a79b2f1 4394
fd8cb379 4395#: submodule.c:1526
87cb7997
JX
4396#, c-format
4397msgid "could not run 'git status' in submodule '%s'"
4398msgstr "无法在子模组 '%s' 中执行 'git status'"
4399
fd8cb379 4400#: submodule.c:1619
87cb7997
JX
4401#, c-format
4402msgid "submodule '%s' has dirty index"
4403msgstr "子模组 '%s' 中有脏索引"
4404
fd8cb379 4405#: submodule.c:1718
1a79b2f1
JX
4406#, c-format
4407msgid ""
4408"relocate_gitdir for submodule '%s' with more than one worktree not supported"
4409msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
4410
fd8cb379 4411#: submodule.c:1730 submodule.c:1786
1a79b2f1
JX
4412#, c-format
4413msgid "could not lookup name for submodule '%s'"
4414msgstr "不能查询子模组 '%s' 的名称"
4415
fd8cb379
JX
4416#: submodule.c:1734 builtin/submodule--helper.c:1261
4417#: builtin/submodule--helper.c:1271
1a79b2f1
JX
4418#, c-format
4419msgid "could not create directory '%s'"
4420msgstr "不能创建目录 '%s'"
4421
fd8cb379 4422#: submodule.c:1737
1a79b2f1
JX
4423#, c-format
4424msgid ""
4425"Migrating git directory of '%s%s' from\n"
4426"'%s' to\n"
4427"'%s'\n"
4428msgstr ""
4429"将 '%s%s' 的 git 目录从\n"
4430"'%s' 迁移至\n"
4431"'%s'\n"
4432
fd8cb379 4433#: submodule.c:1821
1a79b2f1
JX
4434#, c-format
4435msgid "could not recurse into submodule '%s'"
4436msgstr "无法递归进子模组路径 '%s'"
4437
fd8cb379 4438#: submodule.c:1865
87cb7997
JX
4439msgid "could not start ls-files in .."
4440msgstr "无法在 .. 中启动 ls-files"
4441
fd8cb379 4442#: submodule.c:1904
87cb7997
JX
4443#, c-format
4444msgid "ls-tree returned unexpected return code %d"
4445msgstr "ls-tree 返回未知返回值 %d"
4446
fd8cb379
JX
4447#: submodule-config.c:230
4448#, c-format
4449msgid "ignoring suspicious submodule name: %s"
4450msgstr "忽略可疑的子模组名称:%s"
4451
4452#: submodule-config.c:294
6937cb4e
JX
4453msgid "negative values not allowed for submodule.fetchjobs"
4454msgstr "submodule.fetchjobs 不允许为负值"
4455
fd8cb379 4456#: submodule-config.c:467
a0b6b246
JX
4457#, c-format
4458msgid "invalid value for %s"
4459msgstr "%s 的值无效"
4460
6937cb4e 4461#: trailer.c:238
a0b6b246
JX
4462#, c-format
4463msgid "running trailer command '%s' failed"
4464msgstr "执行 trailer 命令 '%s' 失败"
4465
6937cb4e
JX
4466#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
4467#: trailer.c:557
a0b6b246
JX
4468#, c-format
4469msgid "unknown value '%s' for key '%s'"
4470msgstr "键 '%2$s' 的未知取值 '%1$s'"
4471
fd8cb379 4472#: trailer.c:539 trailer.c:544 builtin/remote.c:293
a0b6b246
JX
4473#, c-format
4474msgid "more than one %s"
4475msgstr "多于一个 %s"
4476
6937cb4e 4477#: trailer.c:730
a0b6b246
JX
4478#, c-format
4479msgid "empty trailer token in trailer '%.*s'"
4480msgstr "签名 '%.*s' 的键为空"
4481
6937cb4e 4482#: trailer.c:750
a0b6b246
JX
4483#, c-format
4484msgid "could not read input file '%s'"
4485msgstr "不能读取输入文件 '%s'"
4486
6937cb4e 4487#: trailer.c:753
a0b6b246
JX
4488msgid "could not read from stdin"
4489msgstr "不能自标准输入读取"
4490
6937cb4e 4491#: trailer.c:1008 builtin/am.c:46
a0b6b246
JX
4492#, c-format
4493msgid "could not stat %s"
65e2041e 4494msgstr "不能对 %s 调用 stat"
a0b6b246 4495
6937cb4e 4496#: trailer.c:1010
a0b6b246
JX
4497#, c-format
4498msgid "file %s is not a regular file"
4499msgstr "文件 %s 不是一个正规文件"
4500
6937cb4e 4501#: trailer.c:1012
a0b6b246
JX
4502#, c-format
4503msgid "file %s is not writable by user"
4504msgstr "文件 %s 用户不可写"
4505
6937cb4e 4506#: trailer.c:1024
a0b6b246
JX
4507msgid "could not open temporary file"
4508msgstr "不能打开临时文件"
4509
6937cb4e 4510#: trailer.c:1064
a0b6b246
JX
4511#, c-format
4512msgid "could not rename temporary file to %s"
4513msgstr "不能重命名临时文件为 %s"
4514
fd8cb379 4515#: transport.c:116
a0b6b246
JX
4516#, c-format
4517msgid "Would set upstream of '%s' to '%s' of '%s'\n"
4518msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
4519
fd8cb379 4520#: transport.c:208
a0b6b246
JX
4521#, c-format
4522msgid "transport: invalid depth option '%s'"
4523msgstr "传输:无效的深度选项 '%s'"
4524
fd8cb379
JX
4525#: transport.c:584
4526msgid "could not parse transport.color.* config"
4527msgstr "不能解析 transport.color.* 配置"
4528
4529#: transport.c:996
a0b6b246
JX
4530#, c-format
4531msgid ""
4532"The following submodule paths contain changes that can\n"
4533"not be found on any remote:\n"
4534msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
4535
fd8cb379 4536#: transport.c:1000
a0b6b246
JX
4537#, c-format
4538msgid ""
4539"\n"
4540"Please try\n"
4541"\n"
4542"\tgit push --recurse-submodules=on-demand\n"
4543"\n"
4544"or cd to the path and use\n"
4545"\n"
4546"\tgit push\n"
4547"\n"
4548"to push them to a remote.\n"
4549"\n"
4550msgstr ""
4551"\n"
4552"请尝试\n"
4553"\n"
4554"\tgit push --recurse-submodules=on-demand\n"
4555"\n"
4556"或者进入到子目录执行\n"
4557"\n"
4558"\tgit push\n"
4559"\n"
4560"以推送至远程。\n"
4561"\n"
4562
fd8cb379 4563#: transport.c:1008
a0b6b246
JX
4564msgid "Aborting."
4565msgstr "正在终止。"
4566
fd8cb379 4567#: transport-helper.c:1087
a0b6b246
JX
4568#, c-format
4569msgid "Could not read ref %s"
4570msgstr "不能读取引用 %s"
4571
4572#: tree-walk.c:31
4573msgid "too-short tree object"
4574msgstr "太短的树对象"
4575
4576#: tree-walk.c:37
4577msgid "malformed mode in tree entry"
29004bbb 4578msgstr "树对象中的条目模式错误"
a0b6b246
JX
4579
4580#: tree-walk.c:41
4581msgid "empty filename in tree entry"
4582msgstr "树对象条目中空的文件名"
4583
fd8cb379 4584#: tree-walk.c:113
a0b6b246
JX
4585msgid "too-short tree file"
4586msgstr "太短的树文件"
4587
fd8cb379 4588#: unpack-trees.c:111
a0b6b246
JX
4589#, c-format
4590msgid ""
4591"Your local changes to the following files would be overwritten by checkout:\n"
4592"%%sPlease commit your changes or stash them before you switch branches."
4593msgstr ""
4594"您对下列文件的本地修改将被检出操作覆盖:\n"
a4f16749 4595"%%s请在切换分支前提交或贮藏您的修改。"
a0b6b246 4596
fd8cb379 4597#: unpack-trees.c:113
a0b6b246
JX
4598#, c-format
4599msgid ""
4600"Your local changes to the following files would be overwritten by checkout:\n"
4601"%%s"
4602msgstr ""
4603"您对下列文件的本地修改将被检出操作覆盖:\n"
4604"%%s"
4605
fd8cb379 4606#: unpack-trees.c:116
a0b6b246
JX
4607#, c-format
4608msgid ""
4609"Your local changes to the following files would be overwritten by merge:\n"
4610"%%sPlease commit your changes or stash them before you merge."
4611msgstr ""
4612"您对下列文件的本地修改将被合并操作覆盖:\n"
a4f16749 4613"%%s请在合并前提交或贮藏您的修改。"
a0b6b246 4614
fd8cb379 4615#: unpack-trees.c:118
a0b6b246
JX
4616#, c-format
4617msgid ""
4618"Your local changes to the following files would be overwritten by merge:\n"
4619"%%s"
4620msgstr ""
4621"您对下列文件的本地修改将被合并操作覆盖:\n"
4622"%%s"
4623
fd8cb379 4624#: unpack-trees.c:121
a0b6b246
JX
4625#, c-format
4626msgid ""
4627"Your local changes to the following files would be overwritten by %s:\n"
4628"%%sPlease commit your changes or stash them before you %s."
4629msgstr ""
4630"您对下列文件的本地修改将被 %s 覆盖:\n"
a4f16749 4631"%%s请在 %s 之前提交或贮藏您的修改。"
6792b93b 4632
fd8cb379 4633#: unpack-trees.c:123
a0b6b246
JX
4634#, c-format
4635msgid ""
4636"Your local changes to the following files would be overwritten by %s:\n"
4637"%%s"
4638msgstr ""
4639"您对下列文件的本地修改将被 %s 覆盖:\n"
4640"%%s"
c04f5ac3 4641
fd8cb379 4642#: unpack-trees.c:128
a0b6b246
JX
4643#, c-format
4644msgid ""
1a79b2f1 4645"Updating the following directories would lose untracked files in them:\n"
a0b6b246
JX
4646"%s"
4647msgstr ""
4648"更新如下目录将会丢失其中未跟踪的文件:\n"
4649"%s"
1b7f4a34 4650
fd8cb379 4651#: unpack-trees.c:132
a0b6b246
JX
4652#, c-format
4653msgid ""
4654"The following untracked working tree files would be removed by checkout:\n"
4655"%%sPlease move or remove them before you switch branches."
4656msgstr ""
4657"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
4658"%%s请在切换分支之前移动或删除。"
2e8451e8 4659
fd8cb379 4660#: unpack-trees.c:134
a0b6b246
JX
4661#, c-format
4662msgid ""
4663"The following untracked working tree files would be removed by checkout:\n"
4664"%%s"
4665msgstr ""
4666"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
4667"%%s"
1003b3a5 4668
fd8cb379 4669#: unpack-trees.c:137
a0b6b246
JX
4670#, c-format
4671msgid ""
4672"The following untracked working tree files would be removed by merge:\n"
4673"%%sPlease move or remove them before you merge."
4674msgstr ""
4675"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
4676"%%s请在合并前移动或删除。"
1003b3a5 4677
fd8cb379 4678#: unpack-trees.c:139
a0b6b246
JX
4679#, c-format
4680msgid ""
4681"The following untracked working tree files would be removed by merge:\n"
4682"%%s"
4683msgstr ""
4684"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
4685"%%s"
c04f5ac3 4686
fd8cb379 4687#: unpack-trees.c:142
a0b6b246
JX
4688#, c-format
4689msgid ""
4690"The following untracked working tree files would be removed by %s:\n"
4691"%%sPlease move or remove them before you %s."
4692msgstr ""
4693"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
4694"%%s请在 %s 前移动或删除。"
c04f5ac3 4695
fd8cb379 4696#: unpack-trees.c:144
a0b6b246
JX
4697#, c-format
4698msgid ""
4699"The following untracked working tree files would be removed by %s:\n"
4700"%%s"
4701msgstr ""
4702"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
4703"%%s"
c04f5ac3 4704
fd8cb379 4705#: unpack-trees.c:150
a0b6b246
JX
4706#, c-format
4707msgid ""
4708"The following untracked working tree files would be overwritten by "
4709"checkout:\n"
4710"%%sPlease move or remove them before you switch branches."
4711msgstr ""
4712"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
4713"%%s请在切换分支前移动或删除。"
c04f5ac3 4714
fd8cb379 4715#: unpack-trees.c:152
1003b3a5 4716#, c-format
4dcdc3d8 4717msgid ""
a0b6b246
JX
4718"The following untracked working tree files would be overwritten by "
4719"checkout:\n"
4720"%%s"
4dcdc3d8 4721msgstr ""
a0b6b246
JX
4722"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
4723"%%s"
1003b3a5 4724
fd8cb379 4725#: unpack-trees.c:155
c04f5ac3 4726#, c-format
a0b6b246
JX
4727msgid ""
4728"The following untracked working tree files would be overwritten by merge:\n"
4729"%%sPlease move or remove them before you merge."
4730msgstr ""
4731"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
4732"%%s请在合并前移动或删除。"
c04f5ac3 4733
fd8cb379 4734#: unpack-trees.c:157
a0b6b246
JX
4735#, c-format
4736msgid ""
4737"The following untracked working tree files would be overwritten by merge:\n"
4738"%%s"
4739msgstr ""
4740"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
4741"%%s"
c04f5ac3 4742
fd8cb379 4743#: unpack-trees.c:160
a0b6b246
JX
4744#, c-format
4745msgid ""
4746"The following untracked working tree files would be overwritten by %s:\n"
4747"%%sPlease move or remove them before you %s."
4748msgstr ""
4749"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
4750"%%s请在 %s 前移动或删除。"
c04f5ac3 4751
fd8cb379 4752#: unpack-trees.c:162
07432cef 4753#, c-format
a0b6b246
JX
4754msgid ""
4755"The following untracked working tree files would be overwritten by %s:\n"
4756"%%s"
4757msgstr ""
4758"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
4759"%%s"
c04f5ac3 4760
fd8cb379 4761#: unpack-trees.c:170
07432cef 4762#, c-format
a0b6b246
JX
4763msgid "Entry '%s' overlaps with '%s'. Cannot bind."
4764msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
c04f5ac3 4765
fd8cb379 4766#: unpack-trees.c:173
07432cef 4767#, c-format
ef317cd5 4768msgid ""
6937cb4e 4769"Cannot update sparse checkout: the following entries are not up to date:\n"
a0b6b246
JX
4770"%s"
4771msgstr ""
4772"无法更新稀疏检出:如下条目不是最新:\n"
4773"%s"
c04f5ac3 4774
fd8cb379 4775#: unpack-trees.c:175
07432cef 4776#, c-format
a0b6b246
JX
4777msgid ""
4778"The following working tree files would be overwritten by sparse checkout "
4779"update:\n"
4780"%s"
4781msgstr ""
4782"工作区中下列文件将被稀疏检出更新所覆盖:\n"
4783"%s"
c04f5ac3 4784
fd8cb379 4785#: unpack-trees.c:177
07432cef 4786#, c-format
a0b6b246
JX
4787msgid ""
4788"The following working tree files would be removed by sparse checkout "
4789"update:\n"
4790"%s"
4791msgstr ""
4792"工作区中下列文件将被稀疏检出更新所删除:\n"
4793"%s"
c04f5ac3 4794
fd8cb379 4795#: unpack-trees.c:179
87cb7997
JX
4796#, c-format
4797msgid ""
4798"Cannot update submodule:\n"
4799"%s"
4800msgstr ""
4801"无法更新子模组:\n"
4802"%s"
4803
fd8cb379 4804#: unpack-trees.c:262
07432cef 4805#, c-format
a0b6b246
JX
4806msgid "Aborting\n"
4807msgstr "终止中\n"
ef317cd5 4808
fd8cb379 4809#: unpack-trees.c:344
a0b6b246
JX
4810msgid "Checking out files"
4811msgstr "正在检出文件"
c04f5ac3 4812
87cb7997 4813#: urlmatch.c:163
a0b6b246
JX
4814msgid "invalid URL scheme name or missing '://' suffix"
4815msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
4816
87cb7997 4817#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
07432cef 4818#, c-format
a0b6b246
JX
4819msgid "invalid %XX escape sequence"
4820msgstr "无效的 %XX 转义序列"
c04f5ac3 4821
87cb7997 4822#: urlmatch.c:215
a0b6b246
JX
4823msgid "missing host and scheme is not 'file:'"
4824msgstr "缺失主机名且 URL 方案不是 'file:'"
c04f5ac3 4825
87cb7997 4826#: urlmatch.c:232
a0b6b246
JX
4827msgid "a 'file:' URL may not have a port number"
4828msgstr "一个 'file:' URL 不应该包含端口号"
94550ed3 4829
87cb7997 4830#: urlmatch.c:247
a0b6b246
JX
4831msgid "invalid characters in host name"
4832msgstr "主机名中包含无效的字符"
90314792 4833
87cb7997 4834#: urlmatch.c:292 urlmatch.c:303
a0b6b246
JX
4835msgid "invalid port number"
4836msgstr "无效的端口号"
c04f5ac3 4837
87cb7997 4838#: urlmatch.c:371
a0b6b246
JX
4839msgid "invalid '..' path segment"
4840msgstr "无效的 '..' 路径片段"
5c0c220c 4841
31e5e17b 4842#: worktree.c:245 builtin/am.c:2147
a77c07d9 4843#, c-format
a0b6b246
JX
4844msgid "failed to read '%s'"
4845msgstr "无法读取 '%s'"
ef317cd5 4846
31e5e17b
JX
4847#: worktree.c:291
4848#, c-format
4849msgid "'%s' at main working tree is not the repository directory"
4850msgstr "在主工作区的 '%s' 不是仓库目录"
4851
4852#: worktree.c:302
4853#, c-format
4854msgid "'%s' file does not contain absolute path to the working tree location"
4855msgstr "文件 '%s' 不包含工作区的绝对路径"
4856
4857#: worktree.c:314
4858#, c-format
4859msgid "'%s' does not exist"
4860msgstr "'%s' 不存在"
4861
4862#: worktree.c:320
4863#, c-format
4864msgid "'%s' is not a .git file, error code %d"
4865msgstr "'%s' 不是一个 .git 文件,错误码 %d"
4866
4867#: worktree.c:328
4868#, c-format
4869msgid "'%s' does not point back to '%s'"
4870msgstr "'%s' 没有指回到 '%s'"
4871
a4f16749 4872#: wrapper.c:223 wrapper.c:393
c04f5ac3 4873#, c-format
a0b6b246
JX
4874msgid "could not open '%s' for reading and writing"
4875msgstr "无法打开 '%s' 进行读写"
c04f5ac3 4876
5809aa05 4877#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
fd8cb379 4878#: builtin/am.c:862 builtin/merge.c:1043
c04f5ac3 4879#, c-format
a0b6b246
JX
4880msgid "could not open '%s' for reading"
4881msgstr "无法打开 '%s' 进行读取"
c04f5ac3 4882
a4f16749 4883#: wrapper.c:424 wrapper.c:624
a0b6b246
JX
4884#, c-format
4885msgid "unable to access '%s'"
4886msgstr "不能访问 '%s'"
c04f5ac3 4887
a4f16749 4888#: wrapper.c:632
a0b6b246
JX
4889msgid "unable to get current working directory"
4890msgstr "不能获取当前工作目录"
c04f5ac3 4891
fd8cb379 4892#: wt-status.c:154
a0b6b246
JX
4893msgid "Unmerged paths:"
4894msgstr "未合并的路径:"
7aea43ff 4895
a0b6b246 4896# 译者:注意保持前导空格
fd8cb379 4897#: wt-status.c:181 wt-status.c:208
c04f5ac3 4898#, c-format
a0b6b246
JX
4899msgid " (use \"git reset %s <file>...\" to unstage)"
4900msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
c04f5ac3 4901
a0b6b246 4902# 译者:注意保持前导空格
fd8cb379 4903#: wt-status.c:183 wt-status.c:210
a0b6b246
JX
4904msgid " (use \"git rm --cached <file>...\" to unstage)"
4905msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
c04f5ac3 4906
a0b6b246 4907# 译者:注意保持前导空格
fd8cb379 4908#: wt-status.c:187
a0b6b246
JX
4909msgid " (use \"git add <file>...\" to mark resolution)"
4910msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
8ada9598 4911
a0b6b246 4912# 译者:注意保持前导空格
fd8cb379 4913#: wt-status.c:189 wt-status.c:193
a0b6b246
JX
4914msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
4915msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
8ada9598 4916
a0b6b246 4917# 译者:注意保持前导空格
fd8cb379 4918#: wt-status.c:191
a0b6b246
JX
4919msgid " (use \"git rm <file>...\" to mark resolution)"
4920msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
ef317cd5 4921
fd8cb379 4922#: wt-status.c:202 wt-status.c:1015
a0b6b246
JX
4923msgid "Changes to be committed:"
4924msgstr "要提交的变更:"
ef317cd5 4925
fd8cb379 4926#: wt-status.c:220 wt-status.c:1024
a0b6b246
JX
4927msgid "Changes not staged for commit:"
4928msgstr "尚未暂存以备提交的变更:"
ef317cd5 4929
a0b6b246 4930# 译者:注意保持前导空格
fd8cb379 4931#: wt-status.c:224
a0b6b246
JX
4932msgid " (use \"git add <file>...\" to update what will be committed)"
4933msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
ef317cd5 4934
a0b6b246 4935# 译者:注意保持前导空格
fd8cb379 4936#: wt-status.c:226
a0b6b246
JX
4937msgid " (use \"git add/rm <file>...\" to update what will be committed)"
4938msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
ef317cd5 4939
a0b6b246 4940# 译者:注意保持前导空格
fd8cb379 4941#: wt-status.c:227
a0b6b246
JX
4942msgid ""
4943" (use \"git checkout -- <file>...\" to discard changes in working directory)"
4944msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
ef317cd5 4945
a0b6b246 4946# 译者:注意保持前导空格
fd8cb379 4947#: wt-status.c:229
a0b6b246
JX
4948msgid " (commit or discard the untracked or modified content in submodules)"
4949msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
ef317cd5 4950
a0b6b246 4951# 译者:注意保持前导空格
fd8cb379 4952#: wt-status.c:241
a0b6b246
JX
4953#, c-format
4954msgid " (use \"git %s <file>...\" to include in what will be committed)"
4955msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
ef317cd5 4956
fd8cb379 4957#: wt-status.c:256
a0b6b246
JX
4958msgid "both deleted:"
4959msgstr "双方删除:"
ef317cd5 4960
fd8cb379 4961#: wt-status.c:258
a0b6b246
JX
4962msgid "added by us:"
4963msgstr "由我们添加:"
4dcdc3d8 4964
fd8cb379 4965#: wt-status.c:260
a0b6b246
JX
4966msgid "deleted by them:"
4967msgstr "由他们删除:"
ef317cd5 4968
fd8cb379 4969#: wt-status.c:262
a0b6b246
JX
4970msgid "added by them:"
4971msgstr "由他们添加:"
ef317cd5 4972
fd8cb379 4973#: wt-status.c:264
a0b6b246
JX
4974msgid "deleted by us:"
4975msgstr "由我们删除:"
ef317cd5 4976
fd8cb379 4977#: wt-status.c:266
a0b6b246
JX
4978msgid "both added:"
4979msgstr "双方添加:"
5c57d762 4980
fd8cb379 4981#: wt-status.c:268
a0b6b246
JX
4982msgid "both modified:"
4983msgstr "双方修改:"
5c57d762 4984
fd8cb379 4985#: wt-status.c:278
a0b6b246
JX
4986msgid "new file:"
4987msgstr "新文件:"
8ada9598 4988
fd8cb379 4989#: wt-status.c:280
a0b6b246
JX
4990msgid "copied:"
4991msgstr "拷贝:"
8ada9598 4992
fd8cb379 4993#: wt-status.c:282
a0b6b246
JX
4994msgid "deleted:"
4995msgstr "删除:"
8ada9598 4996
fd8cb379 4997#: wt-status.c:284
a0b6b246
JX
4998msgid "modified:"
4999msgstr "修改:"
8ada9598 5000
fd8cb379 5001#: wt-status.c:286
a0b6b246
JX
5002msgid "renamed:"
5003msgstr "重命名:"
5c57d762 5004
fd8cb379 5005#: wt-status.c:288
a0b6b246
JX
5006msgid "typechange:"
5007msgstr "类型变更:"
8ada9598 5008
fd8cb379 5009#: wt-status.c:290
a0b6b246
JX
5010msgid "unknown:"
5011msgstr "未知:"
8ada9598 5012
fd8cb379 5013#: wt-status.c:292
a0b6b246
JX
5014msgid "unmerged:"
5015msgstr "未合并:"
8ada9598 5016
a0b6b246 5017# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
fd8cb379 5018#: wt-status.c:372
a0b6b246
JX
5019msgid "new commits, "
5020msgstr "新提交, "
8ada9598 5021
a0b6b246 5022# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
fd8cb379 5023#: wt-status.c:374
a0b6b246
JX
5024msgid "modified content, "
5025msgstr "修改的内容, "
1b7f4a34 5026
a0b6b246 5027# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
fd8cb379 5028#: wt-status.c:376
a0b6b246
JX
5029msgid "untracked content, "
5030msgstr "未跟踪的内容, "
1b7f4a34 5031
fd8cb379 5032#: wt-status.c:853
a4f16749
JX
5033#, c-format
5034msgid "Your stash currently has %d entry"
5035msgid_plural "Your stash currently has %d entries"
5036msgstr[0] "您的贮藏区当前有 %d 条记录"
5037msgstr[1] "您的贮藏区当前有 %d 条记录"
5038
fd8cb379 5039#: wt-status.c:885
a0b6b246
JX
5040msgid "Submodules changed but not updated:"
5041msgstr "子模组已修改但尚未更新:"
1b7f4a34 5042
fd8cb379 5043#: wt-status.c:887
a0b6b246
JX
5044msgid "Submodule changes to be committed:"
5045msgstr "要提交的子模组变更:"
1b7f4a34 5046
fd8cb379 5047#: wt-status.c:969
a0b6b246 5048msgid ""
6937cb4e
JX
5049"Do not modify or remove the line above.\n"
5050"Everything below it will be ignored."
a0b6b246 5051msgstr ""
6937cb4e
JX
5052"不要改动或删除上面的一行。\n"
5053"其下所有内容都将被忽略。"
1b7f4a34 5054
fd8cb379 5055#: wt-status.c:1084
a0b6b246
JX
5056msgid "You have unmerged paths."
5057msgstr "您有尚未合并的路径。"
1b7f4a34 5058
a0b6b246 5059# 译者:注意保持前导空格
fd8cb379 5060#: wt-status.c:1087
a0b6b246
JX
5061msgid " (fix conflicts and run \"git commit\")"
5062msgstr " (解决冲突并运行 \"git commit\")"
1b7f4a34 5063
a0b6b246 5064# 译者:注意保持前导空格
fd8cb379 5065#: wt-status.c:1089
a0b6b246
JX
5066msgid " (use \"git merge --abort\" to abort the merge)"
5067msgstr " (使用 \"git merge --abort\" 终止合并)"
1b7f4a34 5068
fd8cb379 5069#: wt-status.c:1094
a0b6b246
JX
5070msgid "All conflicts fixed but you are still merging."
5071msgstr "所有冲突已解决但您仍处于合并中。"
1b7f4a34 5072
a0b6b246 5073# 译者:注意保持前导空格
fd8cb379 5074#: wt-status.c:1097
a0b6b246
JX
5075msgid " (use \"git commit\" to conclude merge)"
5076msgstr " (使用 \"git commit\" 结束合并)"
1b7f4a34 5077
fd8cb379 5078#: wt-status.c:1107
a0b6b246
JX
5079msgid "You are in the middle of an am session."
5080msgstr "您正处于 am 操作过程中。"
1b7f4a34 5081
fd8cb379 5082#: wt-status.c:1110
a0b6b246
JX
5083msgid "The current patch is empty."
5084msgstr "当前的补丁为空。"
1b7f4a34 5085
a0b6b246 5086# 译者:注意保持前导空格
fd8cb379 5087#: wt-status.c:1114
a0b6b246
JX
5088msgid " (fix conflicts and then run \"git am --continue\")"
5089msgstr " (解决冲突,然后运行 \"git am --continue\")"
1b7f4a34 5090
a0b6b246 5091# 译者:注意保持前导空格
fd8cb379 5092#: wt-status.c:1116
a0b6b246
JX
5093msgid " (use \"git am --skip\" to skip this patch)"
5094msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1b7f4a34 5095
a0b6b246 5096# 译者:注意保持前导空格
fd8cb379 5097#: wt-status.c:1118
a0b6b246
JX
5098msgid " (use \"git am --abort\" to restore the original branch)"
5099msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1b7f4a34 5100
fd8cb379 5101#: wt-status.c:1250
1a79b2f1
JX
5102msgid "git-rebase-todo is missing."
5103msgstr "git-rebase-todo 丢失。"
5104
fd8cb379 5105#: wt-status.c:1252
a0b6b246
JX
5106msgid "No commands done."
5107msgstr "没有命令被执行。"
5108
fd8cb379 5109#: wt-status.c:1255
1b7f4a34 5110#, c-format
a0b6b246
JX
5111msgid "Last command done (%d command done):"
5112msgid_plural "Last commands done (%d commands done):"
5113msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
5114msgstr[1] "最后的命令已完成(%d 条命令被执行):"
1b7f4a34 5115
fd8cb379 5116#: wt-status.c:1266
1b7f4a34 5117#, c-format
a0b6b246
JX
5118msgid " (see more in file %s)"
5119msgstr " (更多参见文件 %s)"
5120
fd8cb379 5121#: wt-status.c:1271
a0b6b246
JX
5122msgid "No commands remaining."
5123msgstr "未剩下任何命令。"
1b7f4a34 5124
fd8cb379 5125#: wt-status.c:1274
1b7f4a34 5126#, c-format
a0b6b246
JX
5127msgid "Next command to do (%d remaining command):"
5128msgid_plural "Next commands to do (%d remaining commands):"
5129msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
5130msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
1b7f4a34 5131
a0b6b246 5132# 译者:注意保持前导空格
fd8cb379 5133#: wt-status.c:1282
a0b6b246
JX
5134msgid " (use \"git rebase --edit-todo\" to view and edit)"
5135msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
1b7f4a34 5136
fd8cb379 5137#: wt-status.c:1295
1b7f4a34 5138#, c-format
a0b6b246
JX
5139msgid "You are currently rebasing branch '%s' on '%s'."
5140msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1b7f4a34 5141
fd8cb379 5142#: wt-status.c:1300
a0b6b246
JX
5143msgid "You are currently rebasing."
5144msgstr "您在执行变基操作。"
1b7f4a34 5145
a0b6b246 5146# 译者:注意保持前导空格
fd8cb379 5147#: wt-status.c:1314
a0b6b246
JX
5148msgid " (fix conflicts and then run \"git rebase --continue\")"
5149msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1b7f4a34 5150
a0b6b246 5151# 译者:注意保持前导空格
fd8cb379 5152#: wt-status.c:1316
a0b6b246
JX
5153msgid " (use \"git rebase --skip\" to skip this patch)"
5154msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
5155
5156# 译者:注意保持前导空格
fd8cb379 5157#: wt-status.c:1318
a0b6b246
JX
5158msgid " (use \"git rebase --abort\" to check out the original branch)"
5159msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
5160
5161# 译者:注意保持前导空格
fd8cb379 5162#: wt-status.c:1324
a0b6b246
JX
5163msgid " (all conflicts fixed: run \"git rebase --continue\")"
5164msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1b7f4a34 5165
fd8cb379 5166#: wt-status.c:1328
a0b6b246 5167#, c-format
1b7f4a34 5168msgid ""
a0b6b246
JX
5169"You are currently splitting a commit while rebasing branch '%s' on '%s'."
5170msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1b7f4a34 5171
fd8cb379 5172#: wt-status.c:1333
a0b6b246
JX
5173msgid "You are currently splitting a commit during a rebase."
5174msgstr "您在执行变基操作时拆分提交。"
1b7f4a34 5175
a0b6b246 5176# 译者:注意保持前导空格
fd8cb379 5177#: wt-status.c:1336
a0b6b246
JX
5178msgid " (Once your working directory is clean, run \"git rebase --continue\")"
5179msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1b7f4a34 5180
fd8cb379 5181#: wt-status.c:1340
a0b6b246
JX
5182#, c-format
5183msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
5184msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1b7f4a34 5185
fd8cb379 5186#: wt-status.c:1345
a0b6b246
JX
5187msgid "You are currently editing a commit during a rebase."
5188msgstr "您在执行变基操作时编辑提交。"
1b7f4a34 5189
a0b6b246 5190# 译者:注意保持前导空格
fd8cb379 5191#: wt-status.c:1348
a0b6b246
JX
5192msgid " (use \"git commit --amend\" to amend the current commit)"
5193msgstr " (使用 \"git commit --amend\" 修补当前提交)"
5194
5195# 译者:注意保持前导空格
fd8cb379 5196#: wt-status.c:1350
a0b6b246
JX
5197msgid ""
5198" (use \"git rebase --continue\" once you are satisfied with your changes)"
5199msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1b7f4a34 5200
fd8cb379 5201#: wt-status.c:1360
1b7f4a34 5202#, c-format
a0b6b246
JX
5203msgid "You are currently cherry-picking commit %s."
5204msgstr "您在执行拣选提交 %s 的操作。"
1b7f4a34 5205
a0b6b246 5206# 译者:注意保持前导空格
fd8cb379 5207#: wt-status.c:1365
a0b6b246
JX
5208msgid " (fix conflicts and run \"git cherry-pick --continue\")"
5209msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1b7f4a34 5210
a0b6b246 5211# 译者:注意保持前导空格
fd8cb379 5212#: wt-status.c:1368
a0b6b246
JX
5213msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
5214msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1b7f4a34 5215
a0b6b246 5216# 译者:注意保持前导空格
fd8cb379 5217#: wt-status.c:1370
a0b6b246
JX
5218msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
5219msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1b7f4a34 5220
fd8cb379 5221#: wt-status.c:1379
1b7f4a34 5222#, c-format
a0b6b246
JX
5223msgid "You are currently reverting commit %s."
5224msgstr "您在执行反转提交 %s 的操作。"
1b7f4a34 5225
a0b6b246 5226# 译者:注意保持前导空格
fd8cb379 5227#: wt-status.c:1384
a0b6b246
JX
5228msgid " (fix conflicts and run \"git revert --continue\")"
5229msgstr " (解决冲突并运行 \"git revert --continue\")"
1b7f4a34 5230
a0b6b246 5231# 译者:注意保持前导空格
fd8cb379 5232#: wt-status.c:1387
a0b6b246
JX
5233msgid " (all conflicts fixed: run \"git revert --continue\")"
5234msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1b7f4a34 5235
a0b6b246 5236# 译者:注意保持前导空格
fd8cb379 5237#: wt-status.c:1389
a0b6b246
JX
5238msgid " (use \"git revert --abort\" to cancel the revert operation)"
5239msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1b7f4a34 5240
fd8cb379 5241#: wt-status.c:1400
1b7f4a34 5242#, c-format
a0b6b246
JX
5243msgid "You are currently bisecting, started from branch '%s'."
5244msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1b7f4a34 5245
fd8cb379 5246#: wt-status.c:1404
a0b6b246
JX
5247msgid "You are currently bisecting."
5248msgstr "您在执行二分查找操作。"
1b7f4a34 5249
a0b6b246 5250# 译者:注意保持前导空格
fd8cb379 5251#: wt-status.c:1407
a0b6b246
JX
5252msgid " (use \"git bisect reset\" to get back to the original branch)"
5253msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1b7f4a34 5254
fd8cb379 5255#: wt-status.c:1604
a0b6b246
JX
5256msgid "On branch "
5257msgstr "位于分支 "
1b7f4a34 5258
fd8cb379 5259#: wt-status.c:1610
a0b6b246
JX
5260msgid "interactive rebase in progress; onto "
5261msgstr "交互式变基操作正在进行中;至 "
1b7f4a34 5262
fd8cb379 5263#: wt-status.c:1612
a0b6b246
JX
5264msgid "rebase in progress; onto "
5265msgstr "变基操作正在进行中;至 "
1b7f4a34 5266
fd8cb379 5267#: wt-status.c:1617
a0b6b246
JX
5268msgid "HEAD detached at "
5269msgstr "头指针分离于 "
1b7f4a34 5270
fd8cb379 5271#: wt-status.c:1619
a0b6b246
JX
5272msgid "HEAD detached from "
5273msgstr "头指针分离自 "
1b7f4a34 5274
fd8cb379 5275#: wt-status.c:1622
a0b6b246
JX
5276msgid "Not currently on any branch."
5277msgstr "当前不在任何分支上。"
1b7f4a34 5278
fd8cb379 5279#: wt-status.c:1642
a0b6b246
JX
5280msgid "Initial commit"
5281msgstr "初始提交"
1b7f4a34 5282
fd8cb379 5283#: wt-status.c:1643
a4f16749
JX
5284msgid "No commits yet"
5285msgstr "尚无提交"
5286
fd8cb379 5287#: wt-status.c:1657
a0b6b246
JX
5288msgid "Untracked files"
5289msgstr "未跟踪的文件"
1b7f4a34 5290
fd8cb379 5291#: wt-status.c:1659
a0b6b246
JX
5292msgid "Ignored files"
5293msgstr "忽略的文件"
1b7f4a34 5294
fd8cb379 5295#: wt-status.c:1663
a0b6b246
JX
5296#, c-format
5297msgid ""
5298"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
5299"may speed it up, but you have to be careful not to forget to add\n"
5300"new files yourself (see 'git help status')."
5301msgstr ""
5302"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
5303"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1b7f4a34 5304
fd8cb379 5305#: wt-status.c:1669
a0b6b246
JX
5306#, c-format
5307msgid "Untracked files not listed%s"
5308msgstr "未跟踪的文件没有列出%s"
1b7f4a34 5309
a0b6b246 5310# 译者:中文字符串拼接,可删除前导空格
fd8cb379 5311#: wt-status.c:1671
a0b6b246
JX
5312msgid " (use -u option to show untracked files)"
5313msgstr "(使用 -u 参数显示未跟踪的文件)"
1b7f4a34 5314
fd8cb379 5315#: wt-status.c:1677
a0b6b246
JX
5316msgid "No changes"
5317msgstr "没有修改"
1b7f4a34 5318
fd8cb379 5319#: wt-status.c:1682
a0b6b246
JX
5320#, c-format
5321msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
5322msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1b7f4a34 5323
fd8cb379 5324#: wt-status.c:1685
a0b6b246
JX
5325#, c-format
5326msgid "no changes added to commit\n"
5327msgstr "修改尚未加入提交\n"
1b7f4a34 5328
fd8cb379 5329#: wt-status.c:1688
a0b6b246
JX
5330#, c-format
5331msgid ""
5332"nothing added to commit but untracked files present (use \"git add\" to "
5333"track)\n"
5334msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1b7f4a34 5335
fd8cb379 5336#: wt-status.c:1691
a0b6b246
JX
5337#, c-format
5338msgid "nothing added to commit but untracked files present\n"
5339msgstr "提交为空,但是存在尚未跟踪的文件\n"
1b7f4a34 5340
a0b6b246 5341# 译者:中文字符串拼接,可删除前导空格
fd8cb379 5342#: wt-status.c:1694
a0b6b246
JX
5343#, c-format
5344msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
5345msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1b7f4a34 5346
fd8cb379 5347#: wt-status.c:1697 wt-status.c:1702
a0b6b246
JX
5348#, c-format
5349msgid "nothing to commit\n"
5350msgstr "无文件要提交\n"
1b7f4a34 5351
a0b6b246 5352# 译者:中文字符串拼接,可删除前导空格
fd8cb379 5353#: wt-status.c:1700
a0b6b246
JX
5354#, c-format
5355msgid "nothing to commit (use -u to show untracked files)\n"
5356msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1b7f4a34 5357
a0b6b246 5358# 译者:中文字符串拼接,可删除前导空格
fd8cb379 5359#: wt-status.c:1704
a0b6b246
JX
5360#, c-format
5361msgid "nothing to commit, working tree clean\n"
5362msgstr "无文件要提交,干净的工作区\n"
5363
fd8cb379 5364#: wt-status.c:1817
a4f16749
JX
5365msgid "No commits yet on "
5366msgstr "尚无提交在 "
1b7f4a34 5367
fd8cb379 5368#: wt-status.c:1821
a0b6b246
JX
5369msgid "HEAD (no branch)"
5370msgstr "HEAD(非分支)"
1b7f4a34 5371
fd8cb379 5372#: wt-status.c:1852
31e5e17b
JX
5373msgid "different"
5374msgstr "不同"
5375
a0b6b246 5376# 译者:注意保持句尾空格
fd8cb379 5377#: wt-status.c:1854 wt-status.c:1862
a0b6b246
JX
5378msgid "behind "
5379msgstr "落后 "
1b7f4a34 5380
fd8cb379 5381#: wt-status.c:1857 wt-status.c:1860
a0b6b246
JX
5382msgid "ahead "
5383msgstr "领先 "
1b7f4a34 5384
a0b6b246 5385#. TRANSLATORS: the action is e.g. "pull with rebase"
fd8cb379 5386#: wt-status.c:2366
a0b6b246
JX
5387#, c-format
5388msgid "cannot %s: You have unstaged changes."
5389msgstr "不能%s:您有未暂存的变更。"
1b7f4a34 5390
fd8cb379 5391#: wt-status.c:2372
a0b6b246 5392msgid "additionally, your index contains uncommitted changes."
29004bbb 5393msgstr "另外,您的索引中包含未提交的变更。"
1b7f4a34 5394
fd8cb379 5395#: wt-status.c:2374
a0b6b246
JX
5396#, c-format
5397msgid "cannot %s: Your index contains uncommitted changes."
5398msgstr "不能%s:您的索引中包含未提交的变更。"
1b7f4a34 5399
fd8cb379 5400#: compat/precompose_utf8.c:58 builtin/clone.c:442
a0b6b246
JX
5401#, c-format
5402msgid "failed to unlink '%s'"
5403msgstr "无法删除 '%s'"
1b7f4a34 5404
a4f16749 5405#: builtin/add.c:24
a0b6b246
JX
5406msgid "git add [<options>] [--] <pathspec>..."
5407msgstr "git add [<选项>] [--] <路径规格>..."
1b7f4a34 5408
5809aa05 5409#: builtin/add.c:83
a0b6b246
JX
5410#, c-format
5411msgid "unexpected diff status %c"
5412msgstr "意外的差异状态 %c"
1b7f4a34 5413
fd8cb379 5414#: builtin/add.c:88 builtin/commit.c:266
a0b6b246
JX
5415msgid "updating files failed"
5416msgstr "更新文件失败"
1b7f4a34 5417
5809aa05 5418#: builtin/add.c:98
a0b6b246
JX
5419#, c-format
5420msgid "remove '%s'\n"
5421msgstr "删除 '%s'\n"
1b7f4a34 5422
5809aa05 5423#: builtin/add.c:173
a0b6b246
JX
5424msgid "Unstaged changes after refreshing the index:"
5425msgstr "刷新索引之后尚未被暂存的变更:"
1b7f4a34 5426
fd8cb379 5427#: builtin/add.c:233 builtin/rev-parse.c:892
a0b6b246
JX
5428msgid "Could not read the index"
5429msgstr "不能读取索引"
1b7f4a34 5430
5809aa05 5431#: builtin/add.c:244
a0b6b246
JX
5432#, c-format
5433msgid "Could not open '%s' for writing."
5434msgstr "无法打开 '%s' 进行写入。"
1b7f4a34 5435
5809aa05 5436#: builtin/add.c:248
a0b6b246
JX
5437msgid "Could not write patch"
5438msgstr "不能生成补丁"
1b7f4a34 5439
5809aa05 5440#: builtin/add.c:251
a0b6b246
JX
5441msgid "editing patch failed"
5442msgstr "编辑补丁失败"
1b7f4a34 5443
5809aa05 5444#: builtin/add.c:254
1b7f4a34 5445#, c-format
a0b6b246 5446msgid "Could not stat '%s'"
65e2041e 5447msgstr "不能对 '%s' 调用 stat"
1b7f4a34 5448
5809aa05 5449#: builtin/add.c:256
a0b6b246
JX
5450msgid "Empty patch. Aborted."
5451msgstr "空补丁。异常终止。"
1b7f4a34 5452
5809aa05 5453#: builtin/add.c:261
a0b6b246
JX
5454#, c-format
5455msgid "Could not apply '%s'"
5456msgstr "不能应用 '%s'"
1b7f4a34 5457
fd8cb379 5458#: builtin/add.c:269
a0b6b246
JX
5459msgid "The following paths are ignored by one of your .gitignore files:\n"
5460msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 5461
fd8cb379
JX
5462#: builtin/add.c:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123
5463#: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557
5464#: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165
a0b6b246
JX
5465msgid "dry run"
5466msgstr "演习"
8ada9598 5467
fd8cb379 5468#: builtin/add.c:292
a0b6b246
JX
5469msgid "interactive picking"
5470msgstr "交互式拣选"
8ada9598 5471
fd8cb379 5472#: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302
a0b6b246
JX
5473msgid "select hunks interactively"
5474msgstr "交互式挑选数据块"
8ada9598 5475
fd8cb379 5476#: builtin/add.c:294
a0b6b246
JX
5477msgid "edit current diff and apply"
5478msgstr "编辑当前差异并应用"
8ada9598 5479
fd8cb379 5480#: builtin/add.c:295
a0b6b246
JX
5481msgid "allow adding otherwise ignored files"
5482msgstr "允许添加忽略的文件"
8ada9598 5483
fd8cb379 5484#: builtin/add.c:296
a0b6b246
JX
5485msgid "update tracked files"
5486msgstr "更新已跟踪的文件"
8ada9598 5487
fd8cb379 5488#: builtin/add.c:297
5809aa05
JX
5489msgid "renormalize EOL of tracked files (implies -u)"
5490msgstr "对已跟踪文件(暗含 -u)重新归一换行符"
5491
fd8cb379 5492#: builtin/add.c:298
a0b6b246
JX
5493msgid "record only the fact that the path will be added later"
5494msgstr "只记录,该路径稍后再添加"
8ada9598 5495
fd8cb379 5496#: builtin/add.c:299
a0b6b246
JX
5497msgid "add changes from all tracked and untracked files"
5498msgstr "添加所有改变的已跟踪文件和未跟踪文件"
8ada9598 5499
fd8cb379 5500#: builtin/add.c:302
a0b6b246
JX
5501msgid "ignore paths removed in the working tree (same as --no-all)"
5502msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
8ada9598 5503
fd8cb379 5504#: builtin/add.c:304
a0b6b246
JX
5505msgid "don't add, only refresh the index"
5506msgstr "不添加,只刷新索引"
8ada9598 5507
fd8cb379 5508#: builtin/add.c:305
a0b6b246
JX
5509msgid "just skip files which cannot be added because of errors"
5510msgstr "跳过因出错不能添加的文件"
8ada9598 5511
fd8cb379 5512#: builtin/add.c:306
a0b6b246
JX
5513msgid "check if - even missing - files are ignored in dry run"
5514msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
8ada9598 5515
fd8cb379 5516#: builtin/add.c:307 builtin/update-index.c:974
a0b6b246
JX
5517msgid "(+/-)x"
5518msgstr "(+/-)x"
8ada9598 5519
fd8cb379 5520#: builtin/add.c:307 builtin/update-index.c:975
a0b6b246
JX
5521msgid "override the executable bit of the listed files"
5522msgstr "覆盖列表里文件的可执行位"
8ada9598 5523
fd8cb379 5524#: builtin/add.c:309
a4f16749
JX
5525msgid "warn when adding an embedded repository"
5526msgstr "创建一个嵌入式仓库时给予警告"
5527
fd8cb379 5528#: builtin/add.c:324
a4f16749
JX
5529#, c-format
5530msgid ""
5531"You've added another git repository inside your current repository.\n"
5532"Clones of the outer repository will not contain the contents of\n"
5533"the embedded repository and will not know how to obtain it.\n"
5534"If you meant to add a submodule, use:\n"
5535"\n"
5536"\tgit submodule add <url> %s\n"
5537"\n"
5538"If you added this path by mistake, you can remove it from the\n"
5539"index with:\n"
5540"\n"
5541"\tgit rm --cached %s\n"
5542"\n"
5543"See \"git help submodule\" for more information."
5544msgstr ""
6937cb4e
JX
5545"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容,并"
5546"且不知道该如何获取它。\n"
a4f16749
JX
5547"如果您要添加一个子模组,使用:\n"
5548"\n"
5549"\tgit submodule add <url> %s\n"
5550"\n"
5551"如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n"
5552"\n"
5553"\tgit rm --cached %s\n"
5554"\n"
5555"参见 \"git help submodule\" 获取更多信息。"
5556
fd8cb379 5557#: builtin/add.c:352
a4f16749
JX
5558#, c-format
5559msgid "adding embedded git repository: %s"
5560msgstr "正在添加嵌入式 git 仓库:%s"
5561
fd8cb379 5562#: builtin/add.c:370
8ada9598 5563#, c-format
a0b6b246
JX
5564msgid "Use -f if you really want to add them.\n"
5565msgstr "使用 -f 参数如果您确实要添加它们。\n"
8ada9598 5566
fd8cb379 5567#: builtin/add.c:378
a0b6b246
JX
5568msgid "adding files failed"
5569msgstr "添加文件失败"
8ada9598 5570
fd8cb379 5571#: builtin/add.c:416
a0b6b246
JX
5572msgid "-A and -u are mutually incompatible"
5573msgstr "-A 和 -u 选项互斥"
8ada9598 5574
fd8cb379 5575#: builtin/add.c:423
a0b6b246
JX
5576msgid "Option --ignore-missing can only be used together with --dry-run"
5577msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 5578
fd8cb379 5579#: builtin/add.c:427
8ada9598 5580#, c-format
a0b6b246
JX
5581msgid "--chmod param '%s' must be either -x or +x"
5582msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
8ada9598 5583
fd8cb379 5584#: builtin/add.c:442
8ada9598 5585#, c-format
a0b6b246
JX
5586msgid "Nothing specified, nothing added.\n"
5587msgstr "没有指定文件,也没有文件被添加。\n"
8ada9598 5588
fd8cb379 5589#: builtin/add.c:443
8ada9598 5590#, c-format
a0b6b246
JX
5591msgid "Maybe you wanted to say 'git add .'?\n"
5592msgstr "也许您想要执行 'git add .'?\n"
8ada9598 5593
fd8cb379
JX
5594#: builtin/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280
5595#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325
31e5e17b 5596#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241
fd8cb379 5597#: builtin/rm.c:270 builtin/submodule--helper.c:328
a0b6b246
JX
5598msgid "index file corrupt"
5599msgstr "索引文件损坏"
8ada9598 5600
6937cb4e 5601#: builtin/am.c:414
a0b6b246
JX
5602msgid "could not parse author script"
5603msgstr "不能解析作者脚本"
8ada9598 5604
6937cb4e 5605#: builtin/am.c:498
81809b99 5606#, c-format
a0b6b246
JX
5607msgid "'%s' was deleted by the applypatch-msg hook"
5608msgstr "'%s' 被 applypatch-msg 钩子删除"
8ada9598 5609
6937cb4e 5610#: builtin/am.c:539
8ada9598 5611#, c-format
a0b6b246
JX
5612msgid "Malformed input line: '%s'."
5613msgstr "非法的输入行:'%s'。"
8ada9598 5614
6937cb4e 5615#: builtin/am.c:576
8ada9598 5616#, c-format
a0b6b246
JX
5617msgid "Failed to copy notes from '%s' to '%s'"
5618msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
8ada9598 5619
6937cb4e 5620#: builtin/am.c:602
a0b6b246
JX
5621msgid "fseek failed"
5622msgstr "fseek 失败"
8ada9598 5623
5809aa05 5624#: builtin/am.c:790
8ada9598 5625#, c-format
a0b6b246
JX
5626msgid "could not parse patch '%s'"
5627msgstr "无法解析补丁 '%s'"
8ada9598 5628
5809aa05 5629#: builtin/am.c:855
a0b6b246
JX
5630msgid "Only one StGIT patch series can be applied at once"
5631msgstr "一次只能有一个 StGIT 补丁队列被应用"
5632
5809aa05 5633#: builtin/am.c:903
a0b6b246
JX
5634msgid "invalid timestamp"
5635msgstr "无效的时间戳"
5636
5809aa05 5637#: builtin/am.c:908 builtin/am.c:920
a0b6b246
JX
5638msgid "invalid Date line"
5639msgstr "无效的日期行"
8ada9598 5640
5809aa05 5641#: builtin/am.c:915
a0b6b246
JX
5642msgid "invalid timezone offset"
5643msgstr "无效的时区偏移值"
8ada9598 5644
5809aa05 5645#: builtin/am.c:1008
a0b6b246 5646msgid "Patch format detection failed."
87cb7997 5647msgstr "补丁格式探测失败。"
8ada9598 5648
fd8cb379 5649#: builtin/am.c:1013 builtin/clone.c:407
8ada9598 5650#, c-format
a0b6b246
JX
5651msgid "failed to create directory '%s'"
5652msgstr "无法创建目录 '%s'"
8ada9598 5653
31e5e17b 5654#: builtin/am.c:1018
a0b6b246
JX
5655msgid "Failed to split patches."
5656msgstr "无法拆分补丁。"
814ff314 5657
fd8cb379 5658#: builtin/am.c:1148 builtin/commit.c:351
a0b6b246
JX
5659msgid "unable to write index file"
5660msgstr "无法写入索引文件"
8ada9598 5661
31e5e17b 5662#: builtin/am.c:1162
8ada9598 5663#, c-format
a0b6b246
JX
5664msgid "When you have resolved this problem, run \"%s --continue\"."
5665msgstr "当您解决这一问题,执行 \"%s --continue\"。"
8ada9598 5666
31e5e17b 5667#: builtin/am.c:1163
81809b99 5668#, c-format
a0b6b246
JX
5669msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
5670msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
8ada9598 5671
31e5e17b 5672#: builtin/am.c:1164
81809b99 5673#, c-format
a0b6b246
JX
5674msgid "To restore the original branch and stop patching, run \"%s --abort\"."
5675msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
8ada9598 5676
31e5e17b 5677#: builtin/am.c:1271
a4f16749
JX
5678msgid "Patch is empty."
5679msgstr "补丁为空。"
23ff3338 5680
31e5e17b 5681#: builtin/am.c:1337
8ada9598 5682#, c-format
a4f16749
JX
5683msgid "invalid ident line: %.*s"
5684msgstr "无效的身份标识:%.*s"
8ada9598 5685
31e5e17b 5686#: builtin/am.c:1359
8ada9598 5687#, c-format
a0b6b246
JX
5688msgid "unable to parse commit %s"
5689msgstr "不能解析提交 %s"
8ada9598 5690
31e5e17b 5691#: builtin/am.c:1554
a0b6b246
JX
5692msgid "Repository lacks necessary blobs to fall back on 3-way merge."
5693msgstr "仓库缺乏必要的数据对象以进行三方合并。"
814ff314 5694
31e5e17b 5695#: builtin/am.c:1556
a0b6b246
JX
5696msgid "Using index info to reconstruct a base tree..."
5697msgstr "使用索引来重建一个(三方合并的)基础目录树..."
8ada9598 5698
31e5e17b 5699#: builtin/am.c:1575
a0b6b246
JX
5700msgid ""
5701"Did you hand edit your patch?\n"
5702"It does not apply to blobs recorded in its index."
5703msgstr ""
5704"您是否曾手动编辑过您的补丁?\n"
5705"无法应用补丁到索引中的数据对象上。"
23ff3338 5706
31e5e17b 5707#: builtin/am.c:1581
a0b6b246
JX
5708msgid "Falling back to patching base and 3-way merge..."
5709msgstr "回落到基础版本上打补丁及进行三方合并..."
8ada9598 5710
31e5e17b 5711#: builtin/am.c:1606
a0b6b246
JX
5712msgid "Failed to merge in the changes."
5713msgstr "无法合并变更。"
d691f479 5714
31e5e17b 5715#: builtin/am.c:1637
a0b6b246
JX
5716msgid "applying to an empty history"
5717msgstr "正应用到一个空历史上"
8ada9598 5718
31e5e17b 5719#: builtin/am.c:1683 builtin/am.c:1687
8ada9598 5720#, c-format
a0b6b246
JX
5721msgid "cannot resume: %s does not exist."
5722msgstr "无法继续:%s 不存在。"
8ada9598 5723
31e5e17b 5724#: builtin/am.c:1703
a0b6b246
JX
5725msgid "cannot be interactive without stdin connected to a terminal."
5726msgstr "标准输入没有和终端关联,不能进行交互式操作。"
8ada9598 5727
31e5e17b 5728#: builtin/am.c:1708
a0b6b246
JX
5729msgid "Commit Body is:"
5730msgstr "提交内容为:"
8ada9598 5731
a0b6b246
JX
5732# 译者:注意保持句尾空格
5733#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
5734#. in your translation. The program will only accept English
5735#. input at this point.
5736#.
31e5e17b 5737#: builtin/am.c:1718
a0b6b246
JX
5738msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
5739msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
8ada9598 5740
31e5e17b 5741#: builtin/am.c:1768
8ada9598 5742#, c-format
a0b6b246
JX
5743msgid "Dirty index: cannot apply patches (dirty: %s)"
5744msgstr "脏索引:不能应用补丁(脏文件:%s)"
8ada9598 5745
31e5e17b 5746#: builtin/am.c:1808 builtin/am.c:1879
81809b99 5747#, c-format
a0b6b246
JX
5748msgid "Applying: %.*s"
5749msgstr "应用:%.*s"
8ada9598 5750
31e5e17b 5751#: builtin/am.c:1824
a0b6b246
JX
5752msgid "No changes -- Patch already applied."
5753msgstr "没有变更 —— 补丁已经应用过。"
8ada9598 5754
31e5e17b 5755#: builtin/am.c:1832
81809b99 5756#, c-format
a0b6b246
JX
5757msgid "Patch failed at %s %.*s"
5758msgstr "打补丁失败于 %s %.*s"
8ada9598 5759
31e5e17b
JX
5760#: builtin/am.c:1838
5761msgid "Use 'git am --show-current-patch' to see the failed patch"
5762msgstr "用 'git am --show-current-patch' 命令查看失败的补丁"
8ada9598 5763
31e5e17b 5764#: builtin/am.c:1882
a0b6b246
JX
5765msgid ""
5766"No changes - did you forget to use 'git add'?\n"
5767"If there is nothing left to stage, chances are that something else\n"
5768"already introduced the same changes; you might want to skip this patch."
5769msgstr ""
5770"没有变更 —— 您是不是忘了执行 'git add'?\n"
5771"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
5772"您也许想要跳过这个补丁。"
8ada9598 5773
31e5e17b 5774#: builtin/am.c:1889
a0b6b246
JX
5775msgid ""
5776"You still have unmerged paths in your index.\n"
a4f16749
JX
5777"You should 'git add' each file with resolved conflicts to mark them as "
5778"such.\n"
5779"You might run `git rm` on a file to accept \"deleted by them\" for it."
a0b6b246 5780msgstr ""
a4f16749
JX
5781"在您的索引中仍存在未合并的路径。\n"
5782"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
5783"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
8ada9598 5784
31e5e17b
JX
5785#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324
5786#: builtin/reset.c:332
8ada9598 5787#, c-format
a0b6b246
JX
5788msgid "Could not parse object '%s'."
5789msgstr "不能解析对象 '%s'。"
8ada9598 5790
31e5e17b 5791#: builtin/am.c:2048
a0b6b246
JX
5792msgid "failed to clean index"
5793msgstr "无法清空索引"
5b04ee3b 5794
31e5e17b 5795#: builtin/am.c:2083
a0b6b246
JX
5796msgid ""
5797"You seem to have moved HEAD since the last 'am' failure.\n"
5798"Not rewinding to ORIG_HEAD"
5799msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
8ada9598 5800
31e5e17b 5801#: builtin/am.c:2174
8ada9598 5802#, c-format
a0b6b246
JX
5803msgid "Invalid value for --patch-format: %s"
5804msgstr "无效的 --patch-format 值:%s"
8ada9598 5805
31e5e17b 5806#: builtin/am.c:2210
a0b6b246
JX
5807msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
5808msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
5b04ee3b 5809
31e5e17b 5810#: builtin/am.c:2211
a0b6b246
JX
5811msgid "git am [<options>] (--continue | --skip | --abort)"
5812msgstr "git am [<选项>] (--continue | --skip | --abort)"
8ada9598 5813
31e5e17b 5814#: builtin/am.c:2217
a0b6b246
JX
5815msgid "run interactively"
5816msgstr "以交互式方式运行"
8ada9598 5817
31e5e17b 5818#: builtin/am.c:2219
a0b6b246
JX
5819msgid "historical option -- no-op"
5820msgstr "老的参数 —— 无作用"
8ada9598 5821
31e5e17b 5822#: builtin/am.c:2221
a0b6b246
JX
5823msgid "allow fall back on 3way merging if needed"
5824msgstr "如果必要,允许使用三方合并。"
8ada9598 5825
31e5e17b 5826#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57
fd8cb379 5827#: builtin/repack.c:192
a0b6b246
JX
5828msgid "be quiet"
5829msgstr "静默模式"
8ada9598 5830
31e5e17b 5831#: builtin/am.c:2224
a0b6b246
JX
5832msgid "add a Signed-off-by line to the commit message"
5833msgstr "在提交说明中添加一个 Signed-off-by 签名"
5c57d762 5834
31e5e17b 5835#: builtin/am.c:2227
a0b6b246
JX
5836msgid "recode into utf8 (default)"
5837msgstr "使用 utf8 字符集(默认)"
5c57d762 5838
31e5e17b 5839#: builtin/am.c:2229
a0b6b246
JX
5840msgid "pass -k flag to git-mailinfo"
5841msgstr "向 git-mailinfo 传递 -k 参数"
5c57d762 5842
31e5e17b 5843#: builtin/am.c:2231
a0b6b246
JX
5844msgid "pass -b flag to git-mailinfo"
5845msgstr "向 git-mailinfo 传递 -b 参数"
5c57d762 5846
31e5e17b 5847#: builtin/am.c:2233
a0b6b246
JX
5848msgid "pass -m flag to git-mailinfo"
5849msgstr "向 git-mailinfo 传递 -m 参数"
5c57d762 5850
31e5e17b 5851#: builtin/am.c:2235
a0b6b246
JX
5852msgid "pass --keep-cr flag to git-mailsplit for mbox format"
5853msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
5c57d762 5854
31e5e17b 5855#: builtin/am.c:2238
a0b6b246
JX
5856msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
5857msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
8ada9598 5858
31e5e17b 5859#: builtin/am.c:2241
a0b6b246
JX
5860msgid "strip everything before a scissors line"
5861msgstr "丢弃裁切线前的所有内容"
8ada9598 5862
31e5e17b
JX
5863#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252
5864#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264
5865#: builtin/am.c:2270
a0b6b246
JX
5866msgid "pass it through git-apply"
5867msgstr "传递给 git-apply"
8ada9598 5868
fd8cb379
JX
5869#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665
5870#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:208
5871#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201
5872#: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631
5873#: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144
5874#: parse-options.h:146 parse-options.h:258
a0b6b246
JX
5875msgid "n"
5876msgstr "n"
8ada9598 5877
fd8cb379
JX
5878#: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38
5879#: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39
a0b6b246
JX
5880msgid "format"
5881msgstr "格式"
8ada9598 5882
31e5e17b 5883#: builtin/am.c:2267
a0b6b246
JX
5884msgid "format the patch(es) are in"
5885msgstr "补丁的格式"
8ada9598 5886
31e5e17b 5887#: builtin/am.c:2273
a0b6b246
JX
5888msgid "override error message when patch failure occurs"
5889msgstr "打补丁失败时显示的错误信息"
8ada9598 5890
31e5e17b 5891#: builtin/am.c:2275
a0b6b246
JX
5892msgid "continue applying patches after resolving a conflict"
5893msgstr "冲突解决后继续应用补丁"
814ff314 5894
31e5e17b 5895#: builtin/am.c:2278
a0b6b246
JX
5896msgid "synonyms for --continue"
5897msgstr "和 --continue 同义"
8ada9598 5898
31e5e17b 5899#: builtin/am.c:2281
a0b6b246
JX
5900msgid "skip the current patch"
5901msgstr "跳过当前补丁"
23ff3338 5902
31e5e17b 5903#: builtin/am.c:2284
a0b6b246
JX
5904msgid "restore the original branch and abort the patching operation."
5905msgstr "恢复原始分支并终止打补丁操作。"
8ada9598 5906
31e5e17b
JX
5907#: builtin/am.c:2287
5908msgid "abort the patching operation but keep HEAD where it is."
5909msgstr "终止补丁操作但保持 HEAD 不变。"
5910
5911#: builtin/am.c:2290
5912msgid "show the patch being applied."
5913msgstr "显示正在应用的补丁。"
5914
5915#: builtin/am.c:2294
a0b6b246
JX
5916msgid "lie about committer date"
5917msgstr "将作者日期作为提交日期"
8ada9598 5918
31e5e17b 5919#: builtin/am.c:2296
a0b6b246
JX
5920msgid "use current timestamp for author date"
5921msgstr "用当前时间作为作者日期"
8ada9598 5922
fd8cb379
JX
5923#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:239
5924#: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399
a0b6b246
JX
5925msgid "key-id"
5926msgstr "key-id"
8ada9598 5927
31e5e17b 5928#: builtin/am.c:2299
a0b6b246
JX
5929msgid "GPG-sign commits"
5930msgstr "使用 GPG 签名提交"
8ada9598 5931
31e5e17b 5932#: builtin/am.c:2302
a0b6b246
JX
5933msgid "(internal use for git-rebase)"
5934msgstr "(内部使用,用于 git-rebase)"
8ada9598 5935
31e5e17b 5936#: builtin/am.c:2320
a0b6b246
JX
5937msgid ""
5938"The -b/--binary option has been a no-op for long time, and\n"
5939"it will be removed. Please do not use it anymore."
5940msgstr ""
5941"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
5942"请不要再使用它了。"
8ada9598 5943
31e5e17b 5944#: builtin/am.c:2327
a0b6b246
JX
5945msgid "failed to read the index"
5946msgstr "无法读取索引"
8ada9598 5947
31e5e17b 5948#: builtin/am.c:2342
a0b6b246
JX
5949#, c-format
5950msgid "previous rebase directory %s still exists but mbox given."
5951msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
8ada9598 5952
31e5e17b 5953#: builtin/am.c:2366
a0b6b246
JX
5954#, c-format
5955msgid ""
5956"Stray %s directory found.\n"
5957"Use \"git am --abort\" to remove it."
5958msgstr ""
5959"发现了错误的 %s 目录。\n"
5960"使用 \"git am --abort\" 删除它。"
c04f5ac3 5961
31e5e17b 5962#: builtin/am.c:2372
a0b6b246
JX
5963msgid "Resolve operation not in progress, we are not resuming."
5964msgstr "解决操作未进行,我们不会继续。"
c04f5ac3 5965
a0b6b246
JX
5966#: builtin/apply.c:8
5967msgid "git apply [<options>] [<patch>...]"
5968msgstr "git apply [<选项>] [<补丁>...]"
c04f5ac3 5969
c04f5ac3
JX
5970#: builtin/archive.c:17
5971#, c-format
5972msgid "could not create archive file '%s'"
90e6ef53 5973msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
5974
5975#: builtin/archive.c:20
5976msgid "could not redirect output"
195febda 5977msgstr "不能重定向输出"
c04f5ac3
JX
5978
5979#: builtin/archive.c:37
5980msgid "git archive: Remote with no URL"
4375c10e 5981msgstr "git archive:未提供远程 URL"
c04f5ac3
JX
5982
5983#: builtin/archive.c:58
31e5e17b
JX
5984msgid "git archive: expected ACK/NAK, got a flush packet"
5985msgstr "git archive:期望是 ACK/NAK,却得到 flush 包"
c04f5ac3 5986
1003b3a5 5987#: builtin/archive.c:61
c04f5ac3
JX
5988#, c-format
5989msgid "git archive: NACK %s"
90e6ef53 5990msgstr "git archive:NACK %s"
c04f5ac3 5991
1003b3a5 5992#: builtin/archive.c:64
c04f5ac3 5993msgid "git archive: protocol error"
90e6ef53 5994msgstr "git archive:协议错误"
c04f5ac3 5995
1003b3a5 5996#: builtin/archive.c:68
c04f5ac3 5997msgid "git archive: expected a flush"
31e5e17b 5998msgstr "git archive:应有一个 flush 包"
c04f5ac3 5999
5809aa05 6000#: builtin/bisect--helper.c:12
ef317cd5 6001msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 6002msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5 6003
5809aa05
JX
6004#: builtin/bisect--helper.c:13
6005msgid "git bisect--helper --write-terms <bad_term> <good_term>"
6006msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>"
6007
6008#: builtin/bisect--helper.c:14
6009msgid "git bisect--helper --bisect-clean-state"
6010msgstr "git bisect--helper --bisect-clean-state"
6011
6012#: builtin/bisect--helper.c:46
6013#, c-format
6014msgid "'%s' is not a valid term"
6015msgstr "'%s' 不是一个有效的术语"
6016
6017#: builtin/bisect--helper.c:50
6018#, c-format
6019msgid "can't use the builtin command '%s' as a term"
6020msgstr "不能使用内置命令 '%s' 作为术语"
6021
6022#: builtin/bisect--helper.c:60
6023#, c-format
6024msgid "can't change the meaning of the term '%s'"
6025msgstr "不能修改术语 '%s' 的含义"
6026
6027#: builtin/bisect--helper.c:71
6028msgid "please use two different terms"
6029msgstr "请使用两个不同的术语"
6030
6031#: builtin/bisect--helper.c:78
6032msgid "could not open the file BISECT_TERMS"
6033msgstr "不能打开文件 BISECT_TERMS"
6034
6035#: builtin/bisect--helper.c:120
ef317cd5 6036msgid "perform 'git bisect next'"
07432cef 6037msgstr "执行 'git bisect next'"
ef317cd5 6038
5809aa05
JX
6039#: builtin/bisect--helper.c:122
6040msgid "write the terms to .git/BISECT_TERMS"
6041msgstr "将术语写入 .git/BISECT_TERMS"
6042
6043#: builtin/bisect--helper.c:124
6044msgid "cleanup the bisection state"
6045msgstr "清除二分查找状态"
6046
6047#: builtin/bisect--helper.c:126
6048msgid "check for expected revs"
6049msgstr "检查预期的版本"
6050
6051#: builtin/bisect--helper.c:128
ef317cd5 6052msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 6053msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5 6054
5809aa05
JX
6055#: builtin/bisect--helper.c:143
6056msgid "--write-terms requires two arguments"
6057msgstr "--write-terms 需要两个参数"
6058
6059#: builtin/bisect--helper.c:147
6060msgid "--bisect-clean-state requires no arguments"
6061msgstr "--bisect-clean-state 不需要参数"
6062
fd8cb379 6063#: builtin/blame.c:29
7aea43ff
JX
6064msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
6065msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
ef317cd5 6066
fd8cb379 6067#: builtin/blame.c:34
814ff314
JX
6068msgid "<rev-opts> are documented in git-rev-list(1)"
6069msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
ef317cd5 6070
fd8cb379
JX
6071#: builtin/blame.c:404
6072#, c-format
6073msgid "expecting a color: %s"
6074msgstr "期望一个颜色:%s"
6075
6076#: builtin/blame.c:411
6077msgid "must end with a color"
6078msgstr "必须以一个颜色结尾"
6079
6080#: builtin/blame.c:697
6081#, c-format
6082msgid "invalid color '%s' in color.blame.repeatedLines"
6083msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
6084
6085#: builtin/blame.c:715
6086msgid "invalid value for blame.coloring"
6087msgstr "设置 blame.coloring 中的无效取值"
6088
6089#: builtin/blame.c:786
ef317cd5 6090msgid "Show blame entries as we find them, incrementally"
07432cef 6091msgstr "增量式地显示发现的 blame 条目"
ef317cd5 6092
fd8cb379 6093#: builtin/blame.c:787
ef317cd5 6094msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 6095msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 6096
fd8cb379 6097#: builtin/blame.c:788
ef317cd5 6098msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 6099msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 6100
fd8cb379 6101#: builtin/blame.c:789
ef317cd5 6102msgid "Show work cost statistics"
07432cef 6103msgstr "显示命令消耗统计"
ef317cd5 6104
fd8cb379 6105#: builtin/blame.c:790
276ceeaa
JX
6106msgid "Force progress reporting"
6107msgstr "强制进度显示"
6108
fd8cb379 6109#: builtin/blame.c:791
ef317cd5 6110msgid "Show output score for blame entries"
07432cef 6111msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 6112
fd8cb379 6113#: builtin/blame.c:792
ef317cd5 6114msgid "Show original filename (Default: auto)"
07432cef 6115msgstr "显示原始文件名(默认:自动)"
ef317cd5 6116
fd8cb379 6117#: builtin/blame.c:793
ef317cd5 6118msgid "Show original linenumber (Default: off)"
07432cef 6119msgstr "显示原始的行号(默认:关闭)"
ef317cd5 6120
fd8cb379 6121#: builtin/blame.c:794
ef317cd5 6122msgid "Show in a format designed for machine consumption"
07432cef 6123msgstr "显示为一个适合机器读取的格式"
ef317cd5 6124
fd8cb379 6125#: builtin/blame.c:795
ef317cd5 6126msgid "Show porcelain format with per-line commit information"
07432cef 6127msgstr "为每一行显示机器适用的提交信息"
ef317cd5 6128
fd8cb379 6129#: builtin/blame.c:796
ef317cd5 6130msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 6131msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 6132
fd8cb379 6133#: builtin/blame.c:797
ef317cd5 6134msgid "Show raw timestamp (Default: off)"
07432cef 6135msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 6136
fd8cb379 6137#: builtin/blame.c:798
ef317cd5 6138msgid "Show long commit SHA1 (Default: off)"
4375c10e 6139msgstr "显示长的 SHA1 提交号(默认:关闭)"
ef317cd5 6140
fd8cb379 6141#: builtin/blame.c:799
ef317cd5 6142msgid "Suppress author name and timestamp (Default: off)"
07432cef 6143msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 6144
fd8cb379 6145#: builtin/blame.c:800
ef317cd5 6146msgid "Show author email instead of name (Default: off)"
07432cef 6147msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 6148
fd8cb379 6149#: builtin/blame.c:801
ef317cd5 6150msgid "Ignore whitespace differences"
07432cef 6151msgstr "忽略空白差异"
ef317cd5 6152
fd8cb379
JX
6153#: builtin/blame.c:802
6154msgid "color redundant metadata from previous line differently"
6155msgstr "使用颜色间隔输出与前一行不同的重复元信息"
6156
6157#: builtin/blame.c:803
6158msgid "color lines by age"
6159msgstr "依据时间着色"
6160
6161#: builtin/blame.c:810
1a79b2f1
JX
6162msgid "Use an experimental heuristic to improve diffs"
6163msgstr "使用一个试验性的启发式算法改进差异显示"
a0b6b246 6164
fd8cb379 6165#: builtin/blame.c:812
ef317cd5 6166msgid "Spend extra cycles to find better match"
07432cef 6167msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 6168
fd8cb379 6169#: builtin/blame.c:813
ef317cd5 6170msgid "Use revisions from <file> instead of calling git-rev-list"
d9d56b23 6171msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
ef317cd5 6172
fd8cb379 6173#: builtin/blame.c:814
ef317cd5 6174msgid "Use <file>'s contents as the final image"
d9d56b23 6175msgstr "使用 <文件> 的内容作为最终的图片"
ef317cd5 6176
fd8cb379 6177#: builtin/blame.c:815 builtin/blame.c:816
ef317cd5 6178msgid "score"
07432cef 6179msgstr "得分"
ef317cd5 6180
fd8cb379 6181#: builtin/blame.c:815
ef317cd5 6182msgid "Find line copies within and across files"
07432cef 6183msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 6184
fd8cb379 6185#: builtin/blame.c:816
ef317cd5 6186msgid "Find line movements within and across files"
07432cef 6187msgstr "找到文件内及跨文件的行移动"
ef317cd5 6188
fd8cb379 6189#: builtin/blame.c:817
ef317cd5 6190msgid "n,m"
07432cef 6191msgstr "n,m"
ef317cd5 6192
fd8cb379 6193#: builtin/blame.c:817
ef317cd5 6194msgid "Process only line range n,m, counting from 1"
07432cef 6195msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 6196
fd8cb379 6197#: builtin/blame.c:866
a0b6b246
JX
6198msgid "--progress can't be used with --incremental or porcelain formats"
6199msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
6200
a4f16749
JX
6201#. TRANSLATORS: This string is used to tell us the
6202#. maximum display width for a relative timestamp in
6203#. "git blame" output. For C locale, "4 years, 11
6204#. months ago", which takes 22 places, is the longest
6205#. among various forms of relative timestamps, but
6206#. your language may need more or fewer display
6207#. columns.
6208#.
fd8cb379 6209#: builtin/blame.c:917
6c94aba5
JX
6210msgid "4 years, 11 months ago"
6211msgstr "4 年 11 个月前"
6212
fd8cb379 6213#: builtin/blame.c:1003
a0b6b246
JX
6214#, c-format
6215msgid "file %s has only %lu line"
6216msgid_plural "file %s has only %lu lines"
6217msgstr[0] "文件 %s 只有 %lu 行"
6218msgstr[1] "文件 %s 只有 %lu 行"
6219
fd8cb379 6220#: builtin/blame.c:1049
a4f16749
JX
6221msgid "Blaming lines"
6222msgstr "追踪代码行"
6223
6224#: builtin/branch.c:27
814ff314
JX
6225msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
6226msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
ef317cd5 6227
a4f16749 6228#: builtin/branch.c:28
814ff314
JX
6229msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
6230msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 6231
a4f16749 6232#: builtin/branch.c:29
814ff314
JX
6233msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
6234msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
ef317cd5 6235
a4f16749 6236#: builtin/branch.c:30
814ff314
JX
6237msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
6238msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 6239
a4f16749 6240#: builtin/branch.c:31
6937cb4e
JX
6241msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
6242msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
6243
6244#: builtin/branch.c:32
94550ed3
JX
6245msgid "git branch [<options>] [-r | -a] [--points-at]"
6246msgstr "git branch [<选项>] [-r | -a] [--points-at]"
6247
6937cb4e 6248#: builtin/branch.c:33
87cb7997
JX
6249msgid "git branch [<options>] [-r | -a] [--format]"
6250msgstr "git branch [<选项>] [-r | -a] [--format]"
6251
90e6ef53 6252# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
6937cb4e 6253#: builtin/branch.c:146
c04f5ac3
JX
6254#, c-format
6255msgid ""
6256"deleting branch '%s' that has been merged to\n"
6257" '%s', but not yet merged to HEAD."
6258msgstr ""
70fc47bf 6259"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
6260" '%s',但未合并到 HEAD。"
6261
90e6ef53 6262# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
6937cb4e 6263#: builtin/branch.c:150
c04f5ac3
JX
6264#, c-format
6265msgid ""
6266"not deleting branch '%s' that is not yet merged to\n"
6267" '%s', even though it is merged to HEAD."
6268msgstr ""
70fc47bf
T
6269"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
6270" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 6271
6937cb4e 6272#: builtin/branch.c:164
07432cef
WS
6273#, c-format
6274msgid "Couldn't look up commit object for '%s'"
6275msgstr "无法查询 '%s' 指向的提交对象"
6276
6937cb4e 6277#: builtin/branch.c:168
07432cef
WS
6278#, c-format
6279msgid ""
6280"The branch '%s' is not fully merged.\n"
6281"If you are sure you want to delete it, run 'git branch -D %s'."
6282msgstr ""
6283"分支 '%s' 没有完全合并。\n"
6284"如果您确认要删除它,执行 'git branch -D %s'。"
6285
6937cb4e 6286#: builtin/branch.c:181
07432cef 6287msgid "Update of config-file failed"
6937cb4e 6288msgstr "更新配置文件失败"
07432cef 6289
6937cb4e 6290#: builtin/branch.c:212
c04f5ac3 6291msgid "cannot use -a with -d"
649900bc 6292msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 6293
6937cb4e 6294#: builtin/branch.c:218
c04f5ac3
JX
6295msgid "Couldn't look up commit object for HEAD"
6296msgstr "无法查询 HEAD 指向的提交对象"
6297
6937cb4e 6298#: builtin/branch.c:232
c04f5ac3 6299#, c-format
5b04ee3b
JX
6300msgid "Cannot delete branch '%s' checked out at '%s'"
6301msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
c04f5ac3 6302
6937cb4e 6303#: builtin/branch.c:247
5ae481e0 6304#, c-format
7aea43ff
JX
6305msgid "remote-tracking branch '%s' not found."
6306msgstr "未能找到远程跟踪分支 '%s'。"
c04f5ac3 6307
6937cb4e 6308#: builtin/branch.c:248
81809b99 6309#, c-format
8ada9598 6310msgid "branch '%s' not found."
81809b99 6311msgstr "分支 '%s' 未发现。"
8ada9598 6312
6937cb4e 6313#: builtin/branch.c:263
81809b99 6314#, c-format
7aea43ff
JX
6315msgid "Error deleting remote-tracking branch '%s'"
6316msgstr "无法删除远程跟踪分支 '%s'"
c04f5ac3 6317
6937cb4e 6318#: builtin/branch.c:264
81809b99 6319#, c-format
8ada9598 6320msgid "Error deleting branch '%s'"
7aea43ff 6321msgstr "无法删除分支 '%s'"
8ada9598 6322
6937cb4e 6323#: builtin/branch.c:271
81809b99 6324#, c-format
7aea43ff
JX
6325msgid "Deleted remote-tracking branch %s (was %s).\n"
6326msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
c04f5ac3 6327
6937cb4e 6328#: builtin/branch.c:272
81809b99 6329#, c-format
8ada9598 6330msgid "Deleted branch %s (was %s).\n"
81809b99 6331msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 6332
fd8cb379 6333#: builtin/branch.c:416 builtin/tag.c:58
6937cb4e
JX
6334msgid "unable to parse format string"
6335msgstr "不能解析格式化字符串"
6336
fd8cb379 6337#: builtin/branch.c:453
5b04ee3b
JX
6338#, c-format
6339msgid "Branch %s is being rebased at %s"
6340msgstr "分支 %s 正被变基到 %s"
6341
fd8cb379 6342#: builtin/branch.c:457
5b04ee3b
JX
6343#, c-format
6344msgid "Branch %s is being bisected at %s"
6345msgstr "分支 %s 正被二分查找于 %s"
6346
fd8cb379 6347#: builtin/branch.c:474
6937cb4e
JX
6348msgid "cannot copy the current branch while not on any."
6349msgstr "无法拷贝当前分支因为不处于任何分支上。"
6350
fd8cb379 6351#: builtin/branch.c:476
c04f5ac3 6352msgid "cannot rename the current branch while not on any."
90e6ef53 6353msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 6354
fd8cb379 6355#: builtin/branch.c:487
c04f5ac3
JX
6356#, c-format
6357msgid "Invalid branch name: '%s'"
6358msgstr "无效的分支名:'%s'"
6359
fd8cb379 6360#: builtin/branch.c:514
c04f5ac3
JX
6361msgid "Branch rename failed"
6362msgstr "分支重命名失败"
6363
fd8cb379 6364#: builtin/branch.c:516
6937cb4e
JX
6365msgid "Branch copy failed"
6366msgstr "分支拷贝失败"
6367
fd8cb379 6368#: builtin/branch.c:520
6937cb4e 6369#, c-format
5809aa05
JX
6370msgid "Created a copy of a misnamed branch '%s'"
6371msgstr "已为错误命名的分支 '%s' 创建了一个副本"
6937cb4e 6372
fd8cb379 6373#: builtin/branch.c:523
c04f5ac3
JX
6374#, c-format
6375msgid "Renamed a misnamed branch '%s' away"
6937cb4e 6376msgstr "已将错误命名的分支 '%s' 重命名"
c04f5ac3 6377
fd8cb379 6378#: builtin/branch.c:529
c04f5ac3
JX
6379#, c-format
6380msgid "Branch renamed to %s, but HEAD is not updated!"
6381msgstr "分支重命名为 %s,但 HEAD 没有更新!"
6382
fd8cb379 6383#: builtin/branch.c:538
c04f5ac3 6384msgid "Branch is renamed, but update of config-file failed"
6937cb4e
JX
6385msgstr "分支被重命名,但更新配置文件失败"
6386
fd8cb379 6387#: builtin/branch.c:540
6937cb4e
JX
6388msgid "Branch is copied, but update of config-file failed"
6389msgstr "分支已拷贝,但更新配置文件失败"
c04f5ac3 6390
fd8cb379 6391#: builtin/branch.c:556
5c57d762
JX
6392#, c-format
6393msgid ""
6394"Please edit the description for the branch\n"
6395" %s\n"
6396"Lines starting with '%c' will be stripped.\n"
6397msgstr ""
6398"请编辑分支的描述\n"
6399" %s\n"
6400"以 '%c' 开头的行将被过滤。\n"
c04f5ac3 6401
fd8cb379 6402#: builtin/branch.c:589
ef317cd5 6403msgid "Generic options"
07432cef 6404msgstr "通用选项"
c04f5ac3 6405
fd8cb379 6406#: builtin/branch.c:591
ef317cd5 6407msgid "show hash and subject, give twice for upstream branch"
07432cef 6408msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 6409
fd8cb379 6410#: builtin/branch.c:592
ef317cd5 6411msgid "suppress informational messages"
07432cef 6412msgstr "不显示信息"
8ada9598 6413
fd8cb379 6414#: builtin/branch.c:593
ef317cd5 6415msgid "set up tracking mode (see git-pull(1))"
07432cef 6416msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 6417
fd8cb379 6418#: builtin/branch.c:595
6937cb4e
JX
6419msgid "do not use"
6420msgstr "不要使用"
c04f5ac3 6421
fd8cb379 6422#: builtin/branch.c:597
5b04ee3b
JX
6423msgid "upstream"
6424msgstr "上游"
6425
fd8cb379 6426#: builtin/branch.c:597
5b04ee3b
JX
6427msgid "change the upstream info"
6428msgstr "改变上游信息"
6429
fd8cb379 6430#: builtin/branch.c:598
a0b6b246
JX
6431msgid "Unset the upstream info"
6432msgstr "取消上游信息的设置"
6433
fd8cb379 6434#: builtin/branch.c:599
ef317cd5 6435msgid "use colored output"
07432cef 6436msgstr "使用彩色输出"
c04f5ac3 6437
fd8cb379 6438#: builtin/branch.c:600
ef317cd5 6439msgid "act on remote-tracking branches"
07432cef 6440msgstr "作用于远程跟踪分支"
c04f5ac3 6441
fd8cb379 6442#: builtin/branch.c:602 builtin/branch.c:604
ef317cd5 6443msgid "print only branches that contain the commit"
07432cef 6444msgstr "只打印包含该提交的分支"
c04f5ac3 6445
fd8cb379 6446#: builtin/branch.c:603 builtin/branch.c:605
87cb7997
JX
6447msgid "print only branches that don't contain the commit"
6448msgstr "只打印不包含该提交的分支"
6449
fd8cb379 6450#: builtin/branch.c:608
ef317cd5 6451msgid "Specific git-branch actions:"
07432cef 6452msgstr "具体的 git-branch 动作:"
c04f5ac3 6453
fd8cb379 6454#: builtin/branch.c:609
ef317cd5 6455msgid "list both remote-tracking and local branches"
07432cef 6456msgstr "列出远程跟踪及本地分支"
c04f5ac3 6457
fd8cb379 6458#: builtin/branch.c:611
ef317cd5 6459msgid "delete fully merged branch"
07432cef 6460msgstr "删除完全合并的分支"
c04f5ac3 6461
fd8cb379 6462#: builtin/branch.c:612
ef317cd5 6463msgid "delete branch (even if not merged)"
07432cef 6464msgstr "删除分支(即使没有合并)"
c04f5ac3 6465
fd8cb379 6466#: builtin/branch.c:613
ef317cd5 6467msgid "move/rename a branch and its reflog"
07432cef 6468msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 6469
fd8cb379 6470#: builtin/branch.c:614
ef317cd5 6471msgid "move/rename a branch, even if target exists"
07432cef 6472msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 6473
fd8cb379 6474#: builtin/branch.c:615
6937cb4e
JX
6475msgid "copy a branch and its reflog"
6476msgstr "拷贝一个分支和它的引用日志"
6477
fd8cb379 6478#: builtin/branch.c:616
6937cb4e
JX
6479msgid "copy a branch, even if target exists"
6480msgstr "拷贝一个分支,即使目标已存在"
6481
fd8cb379 6482#: builtin/branch.c:617
ef317cd5 6483msgid "list branch names"
07432cef 6484msgstr "列出分支名"
c04f5ac3 6485
fd8cb379 6486#: builtin/branch.c:618
ef317cd5 6487msgid "create the branch's reflog"
07432cef 6488msgstr "创建分支的引用日志"
ef317cd5 6489
fd8cb379 6490#: builtin/branch.c:620
ef317cd5 6491msgid "edit the description for the branch"
07432cef 6492msgstr "标记分支的描述"
ef317cd5 6493
fd8cb379 6494#: builtin/branch.c:621
04cb2f28
JX
6495msgid "force creation, move/rename, deletion"
6496msgstr "强制创建、移动/重命名、删除"
ef317cd5 6497
fd8cb379 6498#: builtin/branch.c:622
94550ed3
JX
6499msgid "print only branches that are merged"
6500msgstr "只打印已经合并的分支"
ef317cd5 6501
fd8cb379 6502#: builtin/branch.c:623
94550ed3
JX
6503msgid "print only branches that are not merged"
6504msgstr "只打印尚未合并的分支"
ef317cd5 6505
fd8cb379 6506#: builtin/branch.c:624
ef317cd5 6507msgid "list branches in columns"
07432cef 6508msgstr "以列的方式显示分支"
ef317cd5 6509
fd8cb379
JX
6510#: builtin/branch.c:625 builtin/for-each-ref.c:40 builtin/ls-remote.c:70
6511#: builtin/tag.c:412
94550ed3
JX
6512msgid "key"
6513msgstr "key"
6514
fd8cb379
JX
6515#: builtin/branch.c:626 builtin/for-each-ref.c:41 builtin/ls-remote.c:71
6516#: builtin/tag.c:413
94550ed3
JX
6517msgid "field name to sort on"
6518msgstr "排序的字段名"
6519
fd8cb379 6520#: builtin/branch.c:628 builtin/for-each-ref.c:43 builtin/notes.c:408
6937cb4e 6521#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
fd8cb379 6522#: builtin/tag.c:415
94550ed3
JX
6523msgid "object"
6524msgstr "对象"
6525
fd8cb379 6526#: builtin/branch.c:629
94550ed3
JX
6527msgid "print only branches of the object"
6528msgstr "只打印指向该对象的分支"
6529
fd8cb379 6530#: builtin/branch.c:631 builtin/for-each-ref.c:49 builtin/tag.c:422
1a79b2f1
JX
6531msgid "sorting and filtering are case insensitive"
6532msgstr "排序和过滤属于大小写不敏感"
6533
fd8cb379 6534#: builtin/branch.c:632 builtin/for-each-ref.c:38 builtin/tag.c:420
a4f16749 6535#: builtin/verify-tag.c:39
87cb7997
JX
6536msgid "format to use for the output"
6537msgstr "输出格式"
6538
fd8cb379 6539#: builtin/branch.c:655 builtin/clone.c:737
c04f5ac3 6540msgid "HEAD not found below refs/heads!"
90e6ef53 6541msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 6542
fd8cb379 6543#: builtin/branch.c:678
8ada9598 6544msgid "--column and --verbose are incompatible"
81809b99 6545msgstr "--column 和 --verbose 不兼容"
8ada9598 6546
fd8cb379 6547#: builtin/branch.c:693 builtin/branch.c:745 builtin/branch.c:754
a77c07d9
JX
6548msgid "branch name required"
6549msgstr "必须提供分支名"
6550
fd8cb379 6551#: builtin/branch.c:721
a77c07d9
JX
6552msgid "Cannot give description to detached HEAD"
6553msgstr "不能向分离头指针提供描述"
6554
fd8cb379 6555#: builtin/branch.c:726
a77c07d9
JX
6556msgid "cannot edit description of more than one branch"
6557msgstr "不能为一个以上的分支编辑描述"
6558
fd8cb379 6559#: builtin/branch.c:733
a77c07d9
JX
6560#, c-format
6561msgid "No commit on branch '%s' yet."
6562msgstr "分支 '%s' 尚无提交。"
6563
fd8cb379 6564#: builtin/branch.c:736
a77c07d9
JX
6565#, c-format
6566msgid "No branch named '%s'."
6567msgstr "没有分支 '%s'。"
6568
fd8cb379 6569#: builtin/branch.c:751
6937cb4e
JX
6570msgid "too many branches for a copy operation"
6571msgstr "为拷贝操作提供了太多的分支名"
a77c07d9 6572
fd8cb379 6573#: builtin/branch.c:760
6937cb4e
JX
6574msgid "too many arguments for a rename operation"
6575msgstr "为重命名操作提供了太多的参数"
1003b3a5 6576
fd8cb379 6577#: builtin/branch.c:765
6937cb4e
JX
6578msgid "too many arguments to set new upstream"
6579msgstr "为设置新上游提供了太多的参数"
6580
fd8cb379 6581#: builtin/branch.c:769
1003b3a5
JX
6582#, c-format
6583msgid ""
6584"could not set upstream of HEAD to %s when it does not point to any branch."
6585msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
6586
fd8cb379 6587#: builtin/branch.c:772 builtin/branch.c:794 builtin/branch.c:810
1003b3a5
JX
6588#, c-format
6589msgid "no such branch '%s'"
6590msgstr "没有此分支 '%s'"
6591
fd8cb379 6592#: builtin/branch.c:776
07432cef 6593#, c-format
ef317cd5 6594msgid "branch '%s' does not exist"
07432cef 6595msgstr "分支 '%s' 不存在"
ef317cd5 6596
fd8cb379 6597#: builtin/branch.c:788
6937cb4e
JX
6598msgid "too many arguments to unset upstream"
6599msgstr "为取消上游设置操作提供了太多的参数"
1003b3a5 6600
fd8cb379 6601#: builtin/branch.c:792
1003b3a5
JX
6602msgid "could not unset upstream of HEAD when it does not point to any branch."
6603msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
6604
fd8cb379 6605#: builtin/branch.c:798
ef317cd5
JX
6606#, c-format
6607msgid "Branch '%s' has no upstream information"
07432cef 6608msgstr "分支 '%s' 没有上游信息"
ef317cd5 6609
fd8cb379 6610#: builtin/branch.c:813
c04f5ac3
JX
6611msgid "-a and -r options to 'git branch' do not make sense with a branch name"
6612msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
6613
fd8cb379 6614#: builtin/branch.c:816
ef317cd5 6615msgid ""
6937cb4e
JX
6616"the '--set-upstream' option is no longer supported. Please use '--track' or "
6617"'--set-upstream-to' instead."
ef317cd5 6618msgstr ""
6937cb4e 6619"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
ef317cd5 6620
87cb7997 6621#: builtin/bundle.c:45
c04f5ac3
JX
6622#, c-format
6623msgid "%s is okay\n"
6624msgstr "%s 可以\n"
6625
87cb7997 6626#: builtin/bundle.c:58
c04f5ac3 6627msgid "Need a repository to create a bundle."
160fb2b2 6628msgstr "需要一个仓库来创建包。"
c04f5ac3 6629
87cb7997 6630#: builtin/bundle.c:62
c04f5ac3 6631msgid "Need a repository to unbundle."
160fb2b2 6632msgstr "需要一个仓库来解包。"
c04f5ac3 6633
fd8cb379 6634#: builtin/cat-file.c:525
7aea43ff 6635msgid ""
a0b6b246
JX
6636"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
6637"p | <type> | --textconv | --filters) [--path=<path>] <object>"
275588f9
JX
6638msgstr ""
6639"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
6640"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
ef317cd5 6641
fd8cb379 6642#: builtin/cat-file.c:526
a0b6b246
JX
6643msgid ""
6644"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
6645"filters]"
275588f9
JX
6646msgstr ""
6647"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
6648"filters]"
ef317cd5 6649
fd8cb379 6650#: builtin/cat-file.c:563
ef317cd5 6651msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 6652msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 6653
fd8cb379 6654#: builtin/cat-file.c:564
ef317cd5 6655msgid "show object type"
07432cef 6656msgstr "显示对象类型"
ef317cd5 6657
fd8cb379 6658#: builtin/cat-file.c:565
ef317cd5 6659msgid "show object size"
07432cef 6660msgstr "显示对象大小"
ef317cd5 6661
fd8cb379 6662#: builtin/cat-file.c:567
ef317cd5 6663msgid "exit with zero when there's no error"
07432cef 6664msgstr "当没有错误时退出并返回零"
ef317cd5 6665
fd8cb379 6666#: builtin/cat-file.c:568
ef317cd5 6667msgid "pretty-print object's content"
07432cef 6668msgstr "美观地打印对象的内容"
ef317cd5 6669
fd8cb379 6670#: builtin/cat-file.c:570
ef317cd5 6671msgid "for blob objects, run textconv on object's content"
a0b6b246
JX
6672msgstr "对于数据对象,对其内容做文本转换"
6673
fd8cb379 6674#: builtin/cat-file.c:572
a0b6b246
JX
6675msgid "for blob objects, run filters on object's content"
6676msgstr "对于数据对象,对其内容做过滤"
6677
fd8cb379 6678#: builtin/cat-file.c:573 git-submodule.sh:894
a0b6b246
JX
6679msgid "blob"
6680msgstr "数据对象"
6681
fd8cb379 6682#: builtin/cat-file.c:574
a0b6b246
JX
6683msgid "use a specific path for --textconv/--filters"
6684msgstr "对于 --textconv/--filters 使用一个特定的路径"
ef317cd5 6685
fd8cb379 6686#: builtin/cat-file.c:576
7aea43ff
JX
6687msgid "allow -s and -t to work with broken/corrupt objects"
6688msgstr "允许 -s 和 -t 对损坏的对象生效"
6689
fd8cb379 6690#: builtin/cat-file.c:577
1b7f4a34
JX
6691msgid "buffer --batch output"
6692msgstr "缓冲 --batch 的输出"
6693
fd8cb379 6694#: builtin/cat-file.c:579
ef317cd5 6695msgid "show info and content of objects fed from the standard input"
07432cef 6696msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 6697
fd8cb379 6698#: builtin/cat-file.c:582
ef317cd5 6699msgid "show info about objects fed from the standard input"
07432cef 6700msgstr "显示从标准输入提供的对象的信息"
ef317cd5 6701
fd8cb379 6702#: builtin/cat-file.c:585
7aea43ff
JX
6703msgid "follow in-tree symlinks (used with --batch or --batch-check)"
6704msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
6705
fd8cb379 6706#: builtin/cat-file.c:587
1b7f4a34
JX
6707msgid "show all objects with --batch or --batch-check"
6708msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
6709
a4f16749 6710#: builtin/check-attr.c:12
814ff314
JX
6711msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
6712msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
ef317cd5 6713
a4f16749 6714#: builtin/check-attr.c:13
94550ed3
JX
6715msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
6716msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
ef317cd5 6717
a4f16749 6718#: builtin/check-attr.c:20
ef317cd5 6719msgid "report all attributes set on file"
07432cef 6720msgstr "报告设置在文件上的所有属性"
ef317cd5 6721
a4f16749 6722#: builtin/check-attr.c:21
ef317cd5 6723msgid "use .gitattributes only from the index"
07432cef 6724msgstr "只使用索引中的 .gitattributes"
ef317cd5 6725
31e5e17b 6726#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100
ef317cd5 6727msgid "read file names from stdin"
07432cef 6728msgstr "从标准输入读出文件名"
ef317cd5 6729
a4f16749 6730#: builtin/check-attr.c:24 builtin/check-ignore.c:26
90314792
JX
6731msgid "terminate input and output records by a NUL character"
6732msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 6733
fd8cb379 6734#: builtin/check-ignore.c:20 builtin/checkout.c:1113 builtin/gc.c:500
a77c07d9
JX
6735msgid "suppress progress reporting"
6736msgstr "不显示进度报告"
6737
a4f16749 6738#: builtin/check-ignore.c:28
2e8451e8
JX
6739msgid "show non-matching input paths"
6740msgstr "显示未匹配的输入路径"
6741
a4f16749 6742#: builtin/check-ignore.c:30
90314792
JX
6743msgid "ignore index when checking"
6744msgstr "检查时忽略索引"
6745
31e5e17b 6746#: builtin/check-ignore.c:159
a77c07d9 6747msgid "cannot specify pathnames with --stdin"
1b7f4a34 6748msgstr "不能同时指定路径及 --stdin 参数"
a77c07d9 6749
31e5e17b 6750#: builtin/check-ignore.c:162
a77c07d9
JX
6751msgid "-z only makes sense with --stdin"
6752msgstr "-z 需要和 --stdin 参数共用才有意义"
6753
31e5e17b 6754#: builtin/check-ignore.c:164
a77c07d9
JX
6755msgid "no path specified"
6756msgstr "未指定路径"
6757
31e5e17b 6758#: builtin/check-ignore.c:168
a77c07d9
JX
6759msgid "--quiet is only valid with a single pathname"
6760msgstr "参数 --quiet 只在提供一个路径名时有效"
6761
31e5e17b 6762#: builtin/check-ignore.c:170
a77c07d9
JX
6763msgid "cannot have both --quiet and --verbose"
6764msgstr "不能同时提供 --quiet 和 --verbose 参数"
6765
31e5e17b 6766#: builtin/check-ignore.c:173
2e8451e8
JX
6767msgid "--non-matching is only valid with --verbose"
6768msgstr "--non-matching 选项只在使用 --verbose 时有效"
6769
a4f16749 6770#: builtin/check-mailmap.c:9
814ff314
JX
6771msgid "git check-mailmap [<options>] <contact>..."
6772msgstr "git check-mailmap [<选项>] <联系地址>..."
2e8451e8 6773
a4f16749 6774#: builtin/check-mailmap.c:14
2e8451e8
JX
6775msgid "also read contacts from stdin"
6776msgstr "还从标准输入读取联系地址"
6777
a4f16749 6778#: builtin/check-mailmap.c:25
2e8451e8
JX
6779#, c-format
6780msgid "unable to parse contact: %s"
6781msgstr "不能解析联系地址:%s"
6782
a4f16749 6783#: builtin/check-mailmap.c:48
2e8451e8
JX
6784msgid "no contacts specified"
6785msgstr "未指定联系地址"
6786
a4f16749 6787#: builtin/checkout-index.c:128
814ff314
JX
6788msgid "git checkout-index [<options>] [--] [<file>...]"
6789msgstr "git checkout-index [<选项>] [--] [<文件>...]"
ef317cd5 6790
5809aa05 6791#: builtin/checkout-index.c:143
276ceeaa
JX
6792msgid "stage should be between 1 and 3 or all"
6793msgstr "索引值应该取值 1 到 3 或者 all"
6794
5809aa05 6795#: builtin/checkout-index.c:159
ef317cd5 6796msgid "check out all files in the index"
07432cef 6797msgstr "检出索引区的所有文件"
ef317cd5 6798
5809aa05 6799#: builtin/checkout-index.c:160
ef317cd5 6800msgid "force overwrite of existing files"
07432cef 6801msgstr "强制覆盖现有的文件"
ef317cd5 6802
5809aa05 6803#: builtin/checkout-index.c:162
ef317cd5 6804msgid "no warning for existing files and files not in index"
07432cef 6805msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 6806
5809aa05 6807#: builtin/checkout-index.c:164
ef317cd5 6808msgid "don't checkout new files"
07432cef 6809msgstr "不检出新文件"
ef317cd5 6810
5809aa05 6811#: builtin/checkout-index.c:166
ef317cd5 6812msgid "update stat information in the index file"
07432cef 6813msgstr "更新索引中文件的状态信息"
ef317cd5 6814
5809aa05 6815#: builtin/checkout-index.c:170
ef317cd5 6816msgid "read list of paths from the standard input"
07432cef 6817msgstr "从标准输入读取路径列表"
ef317cd5 6818
5809aa05 6819#: builtin/checkout-index.c:172
ef317cd5 6820msgid "write the content to temporary files"
07432cef 6821msgstr "将内容写入临时文件"
ef317cd5 6822
5809aa05 6823#: builtin/checkout-index.c:173 builtin/column.c:31
fd8cb379
JX
6824#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1219
6825#: builtin/submodule--helper.c:1227 builtin/submodule--helper.c:1591
6826#: builtin/worktree.c:610
ef317cd5 6827msgid "string"
07432cef 6828msgstr "字符串"
ef317cd5 6829
5809aa05 6830#: builtin/checkout-index.c:174
ef317cd5 6831msgid "when creating files, prepend <string>"
4375c10e 6832msgstr "在创建文件时,在前面加上 <字符串>"
ef317cd5 6833
5809aa05 6834#: builtin/checkout-index.c:176
ef317cd5 6835msgid "copy out the files from named stage"
07432cef 6836msgstr "从指定暂存区中拷出文件"
ef317cd5 6837
5809aa05 6838#: builtin/checkout.c:27
814ff314
JX
6839msgid "git checkout [<options>] <branch>"
6840msgstr "git checkout [<选项>] <分支>"
ef317cd5 6841
5809aa05 6842#: builtin/checkout.c:28
814ff314
JX
6843msgid "git checkout [<options>] [<branch>] -- <file>..."
6844msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
ef317cd5 6845
5809aa05 6846#: builtin/checkout.c:136 builtin/checkout.c:169
c04f5ac3
JX
6847#, c-format
6848msgid "path '%s' does not have our version"
6849msgstr "路径 '%s' 没有我们的版本"
6850
5809aa05 6851#: builtin/checkout.c:138 builtin/checkout.c:171
c04f5ac3
JX
6852#, c-format
6853msgid "path '%s' does not have their version"
6854msgstr "路径 '%s' 没有他们的版本"
6855
5809aa05 6856#: builtin/checkout.c:154
c04f5ac3
JX
6857#, c-format
6858msgid "path '%s' does not have all necessary versions"
6859msgstr "路径 '%s' 没有全部必须的版本"
6860
5809aa05 6861#: builtin/checkout.c:198
c04f5ac3
JX
6862#, c-format
6863msgid "path '%s' does not have necessary versions"
6864msgstr "路径 '%s' 没有必须的版本"
6865
5809aa05 6866#: builtin/checkout.c:215
c04f5ac3
JX
6867#, c-format
6868msgid "path '%s': cannot merge"
90e6ef53 6869msgstr "path '%s':无法合并"
c04f5ac3 6870
31e5e17b 6871#: builtin/checkout.c:231
c04f5ac3
JX
6872#, c-format
6873msgid "Unable to add merge result for '%s'"
6874msgstr "无法为 '%s' 添加合并结果"
6875
31e5e17b
JX
6876#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
6877#: builtin/checkout.c:262
07432cef 6878#, c-format
ef317cd5 6879msgid "'%s' cannot be used with updating paths"
07432cef 6880msgstr "'%s' 不能在更新路径时使用"
ef317cd5 6881
31e5e17b 6882#: builtin/checkout.c:265 builtin/checkout.c:268
07432cef 6883#, c-format
ef317cd5 6884msgid "'%s' cannot be used with %s"
07432cef 6885msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 6886
31e5e17b 6887#: builtin/checkout.c:271
ef317cd5
JX
6888#, c-format
6889msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 6890msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 6891
31e5e17b 6892#: builtin/checkout.c:340 builtin/checkout.c:347
c04f5ac3
JX
6893#, c-format
6894msgid "path '%s' is unmerged"
6895msgstr "路径 '%s' 未合并"
6896
fd8cb379 6897#: builtin/checkout.c:506
c04f5ac3 6898msgid "you need to resolve your current index first"
90e6ef53 6899msgstr "您需要先解决当前索引的冲突"
c04f5ac3 6900
fd8cb379 6901#: builtin/checkout.c:643
c04f5ac3 6902#, c-format
1b7f4a34
JX
6903msgid "Can not do reflog for '%s': %s\n"
6904msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
c04f5ac3 6905
fd8cb379 6906#: builtin/checkout.c:684
c04f5ac3
JX
6907msgid "HEAD is now at"
6908msgstr "HEAD 目前位于"
6909
fd8cb379 6910#: builtin/checkout.c:688 builtin/clone.c:691
3495628d
JX
6911msgid "unable to update HEAD"
6912msgstr "不能更新 HEAD"
6913
fd8cb379 6914#: builtin/checkout.c:692
c04f5ac3
JX
6915#, c-format
6916msgid "Reset branch '%s'\n"
6917msgstr "重置分支 '%s'\n"
6918
fd8cb379 6919#: builtin/checkout.c:695
c04f5ac3
JX
6920#, c-format
6921msgid "Already on '%s'\n"
6922msgstr "已经位于 '%s'\n"
6923
fd8cb379 6924#: builtin/checkout.c:699
c04f5ac3
JX
6925#, c-format
6926msgid "Switched to and reset branch '%s'\n"
6927msgstr "切换并重置分支 '%s'\n"
6928
fd8cb379 6929#: builtin/checkout.c:701 builtin/checkout.c:1046
c04f5ac3
JX
6930#, c-format
6931msgid "Switched to a new branch '%s'\n"
6932msgstr "切换到一个新分支 '%s'\n"
6933
fd8cb379 6934#: builtin/checkout.c:703
c04f5ac3
JX
6935#, c-format
6936msgid "Switched to branch '%s'\n"
6937msgstr "切换到分支 '%s'\n"
6938
90e6ef53 6939# 译者:注意保持前导空格
fd8cb379 6940#: builtin/checkout.c:754
c04f5ac3
JX
6941#, c-format
6942msgid " ... and %d more.\n"
90e6ef53 6943msgstr " ... 及其它 %d 个。\n"
c04f5ac3 6944
fd8cb379 6945#: builtin/checkout.c:760
c04f5ac3
JX
6946#, c-format
6947msgid ""
6948"Warning: you are leaving %d commit behind, not connected to\n"
6949"any of your branches:\n"
6950"\n"
6951"%s\n"
6952msgid_plural ""
6953"Warning: you are leaving %d commits behind, not connected to\n"
6954"any of your branches:\n"
6955"\n"
6956"%s\n"
6957msgstr[0] ""
6958"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
6959"\n"
6960"%s\n"
5ae481e0
JX
6961msgstr[1] ""
6962"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
6963"\n"
6964"%s\n"
c04f5ac3 6965
fd8cb379 6966#: builtin/checkout.c:779
c04f5ac3
JX
6967#, c-format
6968msgid ""
7aea43ff
JX
6969"If you want to keep it by creating a new branch, this may be a good time\n"
6970"to do so with:\n"
6971"\n"
6972" git branch <new-branch-name> %s\n"
6973"\n"
6974msgid_plural ""
c04f5ac3
JX
6975"If you want to keep them by creating a new branch, this may be a good time\n"
6976"to do so with:\n"
6977"\n"
814ff314 6978" git branch <new-branch-name> %s\n"
c04f5ac3 6979"\n"
7aea43ff
JX
6980msgstr[0] ""
6981"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
6982"如下操作:\n"
6983"\n"
6984" git branch <新分支名> %s\n"
6985"\n"
6986msgstr[1] ""
6987"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
c04f5ac3
JX
6988"如下操作:\n"
6989"\n"
814ff314 6990" git branch <新分支名> %s\n"
c04f5ac3
JX
6991"\n"
6992
fd8cb379 6993#: builtin/checkout.c:811
c04f5ac3
JX
6994msgid "internal error in revision walk"
6995msgstr "在版本遍历时遇到内部错误"
6996
fd8cb379 6997#: builtin/checkout.c:815
c04f5ac3
JX
6998msgid "Previous HEAD position was"
6999msgstr "之前的 HEAD 位置是"
7000
fd8cb379 7001#: builtin/checkout.c:843 builtin/checkout.c:1041
c04f5ac3 7002msgid "You are on a branch yet to be born"
90e6ef53 7003msgstr "您位于一个尚未初始化的分支"
c04f5ac3 7004
fd8cb379 7005#: builtin/checkout.c:947
90314792
JX
7006#, c-format
7007msgid "only one reference expected, %d given."
a0b6b246 7008msgstr "应只有一个引用,却给出了 %d 个"
90314792 7009
fd8cb379 7010#: builtin/checkout.c:987 builtin/worktree.c:240 builtin/worktree.c:389
c04f5ac3
JX
7011#, c-format
7012msgid "invalid reference: %s"
7013msgstr "无效引用:%s"
7014
fd8cb379 7015#: builtin/checkout.c:1016
c04f5ac3
JX
7016#, c-format
7017msgid "reference is not a tree: %s"
7018msgstr "引用不是一个树:%s"
7019
fd8cb379 7020#: builtin/checkout.c:1055
ef317cd5 7021msgid "paths cannot be used with switching branches"
07432cef 7022msgstr "路径不能和切换分支同时使用"
c04f5ac3 7023
fd8cb379 7024#: builtin/checkout.c:1058 builtin/checkout.c:1062
07432cef 7025#, c-format
ef317cd5 7026msgid "'%s' cannot be used with switching branches"
07432cef 7027msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 7028
fd8cb379
JX
7029#: builtin/checkout.c:1066 builtin/checkout.c:1069 builtin/checkout.c:1074
7030#: builtin/checkout.c:1077
07432cef 7031#, c-format
ef317cd5 7032msgid "'%s' cannot be used with '%s'"
07432cef 7033msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 7034
fd8cb379 7035#: builtin/checkout.c:1082
07432cef 7036#, c-format
ef317cd5 7037msgid "Cannot switch branch to a non-commit '%s'"
07432cef 7038msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 7039
fd8cb379
JX
7040#: builtin/checkout.c:1114 builtin/checkout.c:1116 builtin/clone.c:118
7041#: builtin/remote.c:167 builtin/remote.c:169 builtin/worktree.c:433
7042#: builtin/worktree.c:435
ef317cd5 7043msgid "branch"
07432cef 7044msgstr "分支"
c04f5ac3 7045
fd8cb379 7046#: builtin/checkout.c:1115
ef317cd5 7047msgid "create and checkout a new branch"
07432cef 7048msgstr "创建并检出一个新的分支"
c04f5ac3 7049
fd8cb379 7050#: builtin/checkout.c:1117
ef317cd5 7051msgid "create/reset and checkout a branch"
07432cef 7052msgstr "创建/重置并检出一个分支"
c04f5ac3 7053
fd8cb379 7054#: builtin/checkout.c:1118
ef317cd5 7055msgid "create reflog for new branch"
07432cef 7056msgstr "为新的分支创建引用日志"
ef317cd5 7057
fd8cb379 7058#: builtin/checkout.c:1119 builtin/worktree.c:437
5c57d762
JX
7059msgid "detach HEAD at named commit"
7060msgstr "HEAD 从指定的提交分离"
ef317cd5 7061
fd8cb379 7062#: builtin/checkout.c:1120
ef317cd5 7063msgid "set upstream info for new branch"
07432cef 7064msgstr "为新的分支设置上游信息"
ef317cd5 7065
fd8cb379 7066#: builtin/checkout.c:1122
6c94aba5 7067msgid "new-branch"
07432cef 7068msgstr "新分支"
ef317cd5 7069
fd8cb379 7070#: builtin/checkout.c:1122
ef317cd5 7071msgid "new unparented branch"
07432cef 7072msgstr "新的没有父提交的分支"
ef317cd5 7073
fd8cb379 7074#: builtin/checkout.c:1123
ef317cd5 7075msgid "checkout our version for unmerged files"
07432cef 7076msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 7077
fd8cb379 7078#: builtin/checkout.c:1125
ef317cd5 7079msgid "checkout their version for unmerged files"
07432cef 7080msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 7081
fd8cb379 7082#: builtin/checkout.c:1127
ef317cd5 7083msgid "force checkout (throw away local modifications)"
07432cef 7084msgstr "强制检出(丢弃本地修改)"
c04f5ac3 7085
fd8cb379 7086#: builtin/checkout.c:1129
ef317cd5 7087msgid "perform a 3-way merge with the new branch"
160fb2b2 7088msgstr "和新的分支执行三方合并"
ef317cd5 7089
fd8cb379 7090#: builtin/checkout.c:1131 builtin/merge.c:241
ef317cd5 7091msgid "update ignored files (default)"
07432cef 7092msgstr "更新忽略的文件(默认)"
c04f5ac3 7093
fd8cb379 7094#: builtin/checkout.c:1133 builtin/log.c:1499 parse-options.h:264
ef317cd5 7095msgid "style"
07432cef 7096msgstr "风格"
ef317cd5 7097
fd8cb379 7098#: builtin/checkout.c:1134
ef317cd5 7099msgid "conflict style (merge or diff3)"
07432cef 7100msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 7101
fd8cb379 7102#: builtin/checkout.c:1137
4dcdc3d8
JX
7103msgid "do not limit pathspecs to sparse entries only"
7104msgstr "对路径不做稀疏检出的限制"
7105
fd8cb379 7106#: builtin/checkout.c:1139
814ff314
JX
7107msgid "second guess 'git checkout <no-such-branch>'"
7108msgstr "二次猜测'git checkout <无此分支>'"
ef317cd5 7109
fd8cb379 7110#: builtin/checkout.c:1141
7aea43ff
JX
7111msgid "do not check if another worktree is holding the given ref"
7112msgstr "不检查指定的引用是否被其他工作区所占用"
7113
fd8cb379
JX
7114#: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149
7115#: builtin/merge.c:238 builtin/pull.c:128 builtin/push.c:572
7116#: builtin/send-pack.c:174
94550ed3
JX
7117msgid "force progress reporting"
7118msgstr "强制显示进度报告"
7119
fd8cb379 7120#: builtin/checkout.c:1175
ef317cd5 7121msgid "-b, -B and --orphan are mutually exclusive"
07432cef 7122msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 7123
fd8cb379 7124#: builtin/checkout.c:1192
ef317cd5
JX
7125msgid "--track needs a branch name"
7126msgstr "--track 需要一个分支名"
7127
fd8cb379 7128#: builtin/checkout.c:1197
ef317cd5
JX
7129msgid "Missing branch name; try -b"
7130msgstr "缺少分支名;尝试 -b"
7131
fd8cb379 7132#: builtin/checkout.c:1233
c04f5ac3 7133msgid "invalid path specification"
90e6ef53 7134msgstr "无效的路径规格"
c04f5ac3 7135
fd8cb379 7136#: builtin/checkout.c:1240
07432cef 7137#, c-format
a4f16749
JX
7138msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
7139msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'"
c04f5ac3 7140
fd8cb379 7141#: builtin/checkout.c:1244
07432cef 7142#, c-format
ef317cd5 7143msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 7144msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 7145
fd8cb379 7146#: builtin/checkout.c:1248
c04f5ac3
JX
7147msgid ""
7148"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
7149"checking out of the index."
7150msgstr ""
90e6ef53 7151"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 7152
a4f16749 7153#: builtin/clean.c:26
2e8451e8
JX
7154msgid ""
7155"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
7156msgstr ""
7157"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 7158
a4f16749 7159#: builtin/clean.c:30
07432cef
WS
7160#, c-format
7161msgid "Removing %s\n"
7162msgstr "正删除 %s\n"
7163
a4f16749 7164#: builtin/clean.c:31
07432cef
WS
7165#, c-format
7166msgid "Would remove %s\n"
7167msgstr "将删除 %s\n"
7168
a4f16749 7169#: builtin/clean.c:32
07432cef
WS
7170#, c-format
7171msgid "Skipping repository %s\n"
160fb2b2 7172msgstr "忽略仓库 %s\n"
07432cef 7173
a4f16749 7174#: builtin/clean.c:33
07432cef
WS
7175#, c-format
7176msgid "Would skip repository %s\n"
160fb2b2 7177msgstr "将忽略仓库 %s\n"
07432cef 7178
a4f16749 7179#: builtin/clean.c:34
07432cef
WS
7180#, c-format
7181msgid "failed to remove %s"
7182msgstr "无法删除 %s"
7183
fd8cb379 7184#: builtin/clean.c:302 git-add--interactive.perl:579
1a79b2f1 7185#, c-format
2e8451e8
JX
7186msgid ""
7187"Prompt help:\n"
7188"1 - select a numbered item\n"
7189"foo - select item based on unique prefix\n"
1a79b2f1 7190" - (empty) select nothing\n"
2e8451e8
JX
7191msgstr ""
7192"帮助:\n"
7193"1 - 通过编号选择一个选项\n"
1a79b2f1
JX
7194"foo - 通过唯一前缀选择一个选项\n"
7195" - (空)什么也不选择\n"
2e8451e8 7196
fd8cb379 7197#: builtin/clean.c:306 git-add--interactive.perl:588
1a79b2f1 7198#, c-format
2e8451e8
JX
7199msgid ""
7200"Prompt help:\n"
7201"1 - select a single item\n"
7202"3-5 - select a range of items\n"
7203"2-3,6-9 - select multiple ranges\n"
7204"foo - select item based on unique prefix\n"
7205"-... - unselect specified items\n"
7206"* - choose all items\n"
1a79b2f1 7207" - (empty) finish selecting\n"
2e8451e8
JX
7208msgstr ""
7209"帮助:\n"
7210"1 - 选择一个选项\n"
7211"3-5 - 选择一个范围内的所有选项\n"
7212"2-3,6-9 - 选择多个范围内的所有选项\n"
1a79b2f1 7213"foo - 通过唯一前缀选择一个选项\n"
2e8451e8
JX
7214"-... - 反选特定的选项\n"
7215"* - 选择所有选项\n"
1a79b2f1 7216" - (空)结束选择\n"
2e8451e8 7217
fd8cb379
JX
7218#: builtin/clean.c:522 git-add--interactive.perl:554
7219#: git-add--interactive.perl:559
1a79b2f1
JX
7220#, c-format, perl-format
7221msgid "Huh (%s)?\n"
7222msgstr "嗯(%s)?\n"
2e8451e8 7223
5809aa05 7224#: builtin/clean.c:664
2e8451e8
JX
7225#, c-format
7226msgid "Input ignore patterns>> "
7227msgstr "输入模版以排除条目>> "
7228
5809aa05 7229#: builtin/clean.c:701
2e8451e8
JX
7230#, c-format
7231msgid "WARNING: Cannot find items matched by: %s"
7232msgstr "警告:无法找到和 %s 匹配的条目"
7233
5809aa05 7234#: builtin/clean.c:722
2e8451e8
JX
7235msgid "Select items to delete"
7236msgstr "选择要删除的条目"
7237
814ff314 7238#. TRANSLATORS: Make sure to keep [y/N] as is
5809aa05 7239#: builtin/clean.c:763
2e8451e8 7240#, c-format
814ff314
JX
7241msgid "Remove %s [y/N]? "
7242msgstr "删除 %s [y/N]?"
2e8451e8 7243
fd8cb379 7244#: builtin/clean.c:788 git-add--interactive.perl:1717
1a79b2f1
JX
7245#, c-format
7246msgid "Bye.\n"
7247msgstr "再见。\n"
2e8451e8 7248
5809aa05 7249#: builtin/clean.c:796
2e8451e8
JX
7250msgid ""
7251"clean - start cleaning\n"
7252"filter by pattern - exclude items from deletion\n"
7253"select by numbers - select items to be deleted by numbers\n"
7254"ask each - confirm each deletion (like \"rm -i\")\n"
7255"quit - stop cleaning\n"
7256"help - this screen\n"
7257"? - help for prompt selection"
7258msgstr ""
7259"clean - 开始清理\n"
7260"filter by pattern - 通过模版排除要删除的条目\n"
7261"select by numbers - 通过数字选择要删除的条目\n"
7262"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
7263"quit - 停止删除并退出\n"
7264"help - 显示本帮助\n"
7265"? - 显示如何在提示符下选择的帮助"
7266
fd8cb379 7267#: builtin/clean.c:823 git-add--interactive.perl:1793
2e8451e8
JX
7268msgid "*** Commands ***"
7269msgstr "*** 命令 ***"
7270
fd8cb379 7271#: builtin/clean.c:824 git-add--interactive.perl:1790
2e8451e8
JX
7272msgid "What now"
7273msgstr "请选择"
7274
5809aa05 7275#: builtin/clean.c:832
2e8451e8
JX
7276msgid "Would remove the following item:"
7277msgid_plural "Would remove the following items:"
7278msgstr[0] "将删除如下条目:"
7279msgstr[1] "将删除如下条目:"
7280
5809aa05 7281#: builtin/clean.c:848
2e8451e8
JX
7282msgid "No more files to clean, exiting."
7283msgstr "没有要清理的文件,退出。"
7284
5809aa05 7285#: builtin/clean.c:910
ef317cd5 7286msgid "do not print names of files removed"
07432cef 7287msgstr "不打印删除文件的名称"
ef317cd5 7288
5809aa05 7289#: builtin/clean.c:912
ef317cd5 7290msgid "force"
07432cef 7291msgstr "强制"
ef317cd5 7292
5809aa05 7293#: builtin/clean.c:913
2e8451e8
JX
7294msgid "interactive cleaning"
7295msgstr "交互式清除"
7296
5809aa05 7297#: builtin/clean.c:915
ef317cd5 7298msgid "remove whole directories"
07432cef 7299msgstr "删除整个目录"
ef317cd5 7300
31e5e17b
JX
7301#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535
7302#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159
5809aa05
JX
7303#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
7304#: builtin/show-ref.c:176
ef317cd5 7305msgid "pattern"
07432cef 7306msgstr "模式"
ef317cd5 7307
5809aa05 7308#: builtin/clean.c:917
ef317cd5 7309msgid "add <pattern> to ignore rules"
4375c10e 7310msgstr "添加 <模式> 到忽略规则"
ef317cd5 7311
5809aa05 7312#: builtin/clean.c:918
ef317cd5 7313msgid "remove ignored files, too"
07432cef 7314msgstr "也删除忽略的文件"
ef317cd5 7315
5809aa05 7316#: builtin/clean.c:920
ef317cd5 7317msgid "remove only ignored files"
07432cef 7318msgstr "只删除忽略的文件"
c04f5ac3 7319
5809aa05 7320#: builtin/clean.c:938
c04f5ac3 7321msgid "-x and -X cannot be used together"
649900bc 7322msgstr "-x 和 -X 不能同时使用"
c04f5ac3 7323
5809aa05 7324#: builtin/clean.c:942
c04f5ac3 7325msgid ""
6c94aba5 7326"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 7327"clean"
c04f5ac3 7328msgstr ""
2e8451e8 7329"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 7330
5809aa05 7331#: builtin/clean.c:945
c04f5ac3 7332msgid ""
6c94aba5 7333"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 7334"refusing to clean"
c04f5ac3 7335msgstr ""
2e8451e8 7336"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 7337
fd8cb379 7338#: builtin/clone.c:42
814ff314 7339msgid "git clone [<options>] [--] <repo> [<dir>]"
160fb2b2 7340msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
ef317cd5 7341
fd8cb379 7342#: builtin/clone.c:87
ef317cd5 7343msgid "don't create a checkout"
07432cef 7344msgstr "不创建一个检出"
ef317cd5 7345
fd8cb379 7346#: builtin/clone.c:88 builtin/clone.c:90 builtin/init-db.c:479
ef317cd5 7347msgid "create a bare repository"
160fb2b2 7348msgstr "创建一个纯仓库"
ef317cd5 7349
fd8cb379 7350#: builtin/clone.c:92
ef317cd5 7351msgid "create a mirror repository (implies bare)"
160fb2b2 7352msgstr "创建一个镜像仓库(也是纯仓库)"
ef317cd5 7353
fd8cb379 7354#: builtin/clone.c:94
ef317cd5 7355msgid "to clone from a local repository"
160fb2b2 7356msgstr "从本地仓库克隆"
ef317cd5 7357
fd8cb379 7358#: builtin/clone.c:96
ef317cd5 7359msgid "don't use local hardlinks, always copy"
07432cef 7360msgstr "不使用本地硬链接,始终复制"
ef317cd5 7361
fd8cb379 7362#: builtin/clone.c:98
ef317cd5 7363msgid "setup as shared repository"
160fb2b2 7364msgstr "设置为共享仓库"
ef317cd5 7365
fd8cb379 7366#: builtin/clone.c:100 builtin/clone.c:104
87cb7997 7367msgid "pathspec"
65e2041e 7368msgstr "路径规格"
87cb7997 7369
fd8cb379 7370#: builtin/clone.c:100 builtin/clone.c:104
ef317cd5 7371msgid "initialize submodules in the clone"
07432cef 7372msgstr "在克隆时初始化子模组"
ef317cd5 7373
fd8cb379 7374#: builtin/clone.c:107
5b04ee3b
JX
7375msgid "number of submodules cloned in parallel"
7376msgstr "并发克隆的子模组的数量"
7377
fd8cb379 7378#: builtin/clone.c:108 builtin/init-db.c:476
ef317cd5 7379msgid "template-directory"
07432cef 7380msgstr "模板目录"
ef317cd5 7381
fd8cb379 7382#: builtin/clone.c:109 builtin/init-db.c:477
ef317cd5 7383msgid "directory from which templates will be used"
07432cef 7384msgstr "模板目录将被使用"
ef317cd5 7385
fd8cb379
JX
7386#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1223
7387#: builtin/submodule--helper.c:1594
ef317cd5 7388msgid "reference repository"
160fb2b2 7389msgstr "参考仓库"
ef317cd5 7390
fd8cb379
JX
7391#: builtin/clone.c:115 builtin/submodule--helper.c:1225
7392#: builtin/submodule--helper.c:1596
7aea43ff 7393msgid "use --reference only while cloning"
160fb2b2 7394msgstr "仅在克隆时参考 --reference 指向的本地仓库"
7aea43ff 7395
fd8cb379
JX
7396#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:44
7397#: builtin/pack-objects.c:3166 builtin/repack.c:213
ef317cd5 7398msgid "name"
07432cef 7399msgstr "名称"
ef317cd5 7400
fd8cb379 7401#: builtin/clone.c:117
ef317cd5 7402msgid "use <name> instead of 'origin' to track upstream"
4375c10e 7403msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
ef317cd5 7404
fd8cb379 7405#: builtin/clone.c:119
ef317cd5 7406msgid "checkout <branch> instead of the remote's HEAD"
4375c10e 7407msgstr "检出 <分支> 而不是远程 HEAD"
ef317cd5 7408
fd8cb379 7409#: builtin/clone.c:121
ef317cd5 7410msgid "path to git-upload-pack on the remote"
07432cef 7411msgstr "远程 git-upload-pack 路径"
ef317cd5 7412
fd8cb379
JX
7413#: builtin/clone.c:122 builtin/fetch.c:150 builtin/grep.c:813
7414#: builtin/pull.c:216
ef317cd5 7415msgid "depth"
07432cef 7416msgstr "深度"
ef317cd5 7417
fd8cb379 7418#: builtin/clone.c:123
ef317cd5 7419msgid "create a shallow clone of that depth"
07432cef 7420msgstr "创建一个指定深度的浅克隆"
ef317cd5 7421
fd8cb379 7422#: builtin/clone.c:124 builtin/fetch.c:152 builtin/pack-objects.c:3157
31e5e17b 7423#: parse-options.h:154
a0b6b246
JX
7424msgid "time"
7425msgstr "时间"
7426
fd8cb379 7427#: builtin/clone.c:125
a0b6b246
JX
7428msgid "create a shallow clone since a specific time"
7429msgstr "从一个特定时间创建一个浅克隆"
7430
fd8cb379 7431#: builtin/clone.c:126 builtin/fetch.c:154
a0b6b246
JX
7432msgid "revision"
7433msgstr "版本"
7434
fd8cb379 7435#: builtin/clone.c:127 builtin/fetch.c:155
1a79b2f1
JX
7436msgid "deepen history of shallow clone, excluding rev"
7437msgstr "深化浅克隆的历史,除了特定版本"
a0b6b246 7438
fd8cb379 7439#: builtin/clone.c:129
ef317cd5 7440msgid "clone only one branch, HEAD or --branch"
07432cef 7441msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 7442
fd8cb379 7443#: builtin/clone.c:131
a4f16749
JX
7444msgid "don't clone any tags, and make later fetches not to follow them"
7445msgstr "不要克隆任何标签,并且后续获取操作也不下载它们"
7446
fd8cb379 7447#: builtin/clone.c:133
5b04ee3b
JX
7448msgid "any cloned submodules will be shallow"
7449msgstr "子模组将以浅下载模式克隆"
7450
fd8cb379 7451#: builtin/clone.c:134 builtin/init-db.c:485
ef317cd5 7452msgid "gitdir"
07432cef 7453msgstr "git目录"
ef317cd5 7454
fd8cb379 7455#: builtin/clone.c:135 builtin/init-db.c:486
ef317cd5 7456msgid "separate git dir from working tree"
07432cef 7457msgstr "git目录和工作区分离"
ef317cd5 7458
fd8cb379 7459#: builtin/clone.c:136
ef317cd5 7460msgid "key=value"
07432cef 7461msgstr "key=value"
ef317cd5 7462
fd8cb379 7463#: builtin/clone.c:137
ef317cd5 7464msgid "set config inside the new repository"
160fb2b2 7465msgstr "在新仓库中设置配置信息"
ef317cd5 7466
fd8cb379
JX
7467#: builtin/clone.c:138 builtin/fetch.c:173 builtin/pull.c:229
7468#: builtin/push.c:583
276ceeaa
JX
7469msgid "use IPv4 addresses only"
7470msgstr "只使用 IPv4 地址"
7471
fd8cb379
JX
7472#: builtin/clone.c:140 builtin/fetch.c:175 builtin/pull.c:232
7473#: builtin/push.c:585
276ceeaa
JX
7474msgid "use IPv6 addresses only"
7475msgstr "只使用 IPv6 地址"
7476
fd8cb379 7477#: builtin/clone.c:278
3495628d
JX
7478msgid ""
7479"No directory name could be guessed.\n"
7480"Please specify a directory on the command line"
7481msgstr ""
7482"无法猜到目录名。\n"
26e4cbec 7483"请在命令行指定一个目录"
3495628d 7484
fd8cb379 7485#: builtin/clone.c:331
cfff71a9 7486#, c-format
a0b6b246
JX
7487msgid "info: Could not add alternate for '%s': %s\n"
7488msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
cfff71a9 7489
fd8cb379 7490#: builtin/clone.c:403
5c57d762
JX
7491#, c-format
7492msgid "failed to open '%s'"
7493msgstr "无法打开 '%s'"
7494
fd8cb379 7495#: builtin/clone.c:411
c04f5ac3
JX
7496#, c-format
7497msgid "%s exists and is not a directory"
7498msgstr "%s 存在且不是一个目录"
7499
fd8cb379 7500#: builtin/clone.c:425
c04f5ac3
JX
7501#, c-format
7502msgid "failed to stat %s\n"
65e2041e 7503msgstr "对 %s 调用 stat 失败\n"
c04f5ac3 7504
fd8cb379 7505#: builtin/clone.c:447
c04f5ac3
JX
7506#, c-format
7507msgid "failed to create link '%s'"
90e6ef53 7508msgstr "无法创建链接 '%s'"
c04f5ac3 7509
fd8cb379 7510#: builtin/clone.c:451
c04f5ac3
JX
7511#, c-format
7512msgid "failed to copy file to '%s'"
90e6ef53 7513msgstr "无法拷贝文件至 '%s'"
c04f5ac3 7514
fd8cb379 7515#: builtin/clone.c:477
c04f5ac3
JX
7516#, c-format
7517msgid "done.\n"
7518msgstr "完成。\n"
7519
fd8cb379 7520#: builtin/clone.c:491
1003b3a5
JX
7521msgid ""
7522"Clone succeeded, but checkout failed.\n"
7523"You can inspect what was checked out with 'git status'\n"
7524"and retry the checkout with 'git checkout -f HEAD'\n"
7525msgstr ""
7526"克隆成功,但是检出失败。\n"
7527"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
7528"'git checkout -f HEAD' 重试\n"
7529
fd8cb379 7530#: builtin/clone.c:568
c04f5ac3
JX
7531#, c-format
7532msgid "Could not find remote branch %s to clone."
90e6ef53 7533msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 7534
fd8cb379 7535#: builtin/clone.c:663
1003b3a5
JX
7536msgid "remote did not send all necessary objects"
7537msgstr "远程没有发送所有必须的对象"
7538
fd8cb379 7539#: builtin/clone.c:679
3495628d
JX
7540#, c-format
7541msgid "unable to update %s"
7542msgstr "不能更新 %s"
7543
fd8cb379 7544#: builtin/clone.c:728
c04f5ac3
JX
7545msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
7546msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
7547
fd8cb379 7548#: builtin/clone.c:758
1003b3a5
JX
7549msgid "unable to checkout working tree"
7550msgstr "不能检出工作区"
7551
fd8cb379 7552#: builtin/clone.c:803
3495628d
JX
7553msgid "unable to write parameters to config file"
7554msgstr "无法将参数写入配置文件"
7555
fd8cb379 7556#: builtin/clone.c:866
04cb2f28
JX
7557msgid "cannot repack to clean up"
7558msgstr "无法执行 repack 来清理"
7559
fd8cb379 7560#: builtin/clone.c:868
04cb2f28
JX
7561msgid "cannot unlink temporary alternates file"
7562msgstr "无法删除临时的 alternates 文件"
7563
fd8cb379 7564#: builtin/clone.c:907 builtin/receive-pack.c:1947
c04f5ac3
JX
7565msgid "Too many arguments."
7566msgstr "太多参数。"
7567
fd8cb379 7568#: builtin/clone.c:911
c04f5ac3 7569msgid "You must specify a repository to clone."
160fb2b2 7570msgstr "您必须指定一个仓库来克隆。"
c04f5ac3 7571
fd8cb379 7572#: builtin/clone.c:924
c04f5ac3
JX
7573#, c-format
7574msgid "--bare and --origin %s options are incompatible."
7575msgstr "--bare 和 --origin %s 选项不兼容。"
7576
fd8cb379 7577#: builtin/clone.c:927
07432cef
WS
7578msgid "--bare and --separate-git-dir are incompatible."
7579msgstr "--bare 和 --separate-git-dir 选项不兼容。"
7580
fd8cb379 7581#: builtin/clone.c:940
c04f5ac3
JX
7582#, c-format
7583msgid "repository '%s' does not exist"
160fb2b2 7584msgstr "仓库 '%s' 不存在"
c04f5ac3 7585
fd8cb379 7586#: builtin/clone.c:946 builtin/fetch.c:1460
cfff71a9
JX
7587#, c-format
7588msgid "depth %s is not a positive number"
7589msgstr "深度 %s 不是一个正数"
7590
fd8cb379 7591#: builtin/clone.c:956
c04f5ac3
JX
7592#, c-format
7593msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 7594msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 7595
fd8cb379 7596#: builtin/clone.c:966
c04f5ac3
JX
7597#, c-format
7598msgid "working tree '%s' already exists."
7599msgstr "工作区 '%s' 已经存在。"
7600
fd8cb379
JX
7601#: builtin/clone.c:981 builtin/clone.c:1002 builtin/difftool.c:270
7602#: builtin/worktree.c:246 builtin/worktree.c:276
5bb01d4f
JX
7603#, c-format
7604msgid "could not create leading directories of '%s'"
7605msgstr "不能为 '%s' 创建先导目录"
7606
fd8cb379 7607#: builtin/clone.c:986
c04f5ac3 7608#, c-format
814ff314
JX
7609msgid "could not create work tree dir '%s'"
7610msgstr "不能创建工作区目录 '%s'"
c04f5ac3 7611
fd8cb379 7612#: builtin/clone.c:1006
c04f5ac3
JX
7613#, c-format
7614msgid "Cloning into bare repository '%s'...\n"
160fb2b2 7615msgstr "克隆到纯仓库 '%s'...\n"
c04f5ac3 7616
fd8cb379 7617#: builtin/clone.c:1008
c04f5ac3
JX
7618#, c-format
7619msgid "Cloning into '%s'...\n"
7620msgstr "正克隆到 '%s'...\n"
7621
fd8cb379 7622#: builtin/clone.c:1032
a0b6b246
JX
7623msgid ""
7624"clone --recursive is not compatible with both --reference and --reference-if-"
7625"able"
7626msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
7627
31e5e17b 7628#: builtin/clone.c:1093
6acbf033 7629msgid "--depth is ignored in local clones; use file:// instead."
a0b6b246
JX
7630msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
7631
31e5e17b 7632#: builtin/clone.c:1095
a0b6b246
JX
7633msgid "--shallow-since is ignored in local clones; use file:// instead."
7634msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
6acbf033 7635
31e5e17b 7636#: builtin/clone.c:1097
a0b6b246
JX
7637msgid "--shallow-exclude is ignored in local clones; use file:// instead."
7638msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
7639
31e5e17b
JX
7640#: builtin/clone.c:1099
7641msgid "--filter is ignored in local clones; use file:// instead."
7642msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。"
7643
7644#: builtin/clone.c:1102
6acbf033 7645msgid "source repository is shallow, ignoring --local"
160fb2b2 7646msgstr "源仓库是浅克隆,忽略 --local"
6acbf033 7647
31e5e17b 7648#: builtin/clone.c:1107
6acbf033
JX
7649msgid "--local is ignored"
7650msgstr "--local 被忽略"
7651
31e5e17b 7652#: builtin/clone.c:1169 builtin/clone.c:1177
c04f5ac3
JX
7653#, c-format
7654msgid "Remote branch %s not found in upstream %s"
7655msgstr "远程分支 %s 在上游 %s 未发现"
7656
31e5e17b 7657#: builtin/clone.c:1180
c04f5ac3 7658msgid "You appear to have cloned an empty repository."
160fb2b2 7659msgstr "您似乎克隆了一个空仓库。"
c04f5ac3 7660
a4f16749 7661#: builtin/column.c:10
814ff314
JX
7662msgid "git column [<options>]"
7663msgstr "git column [<选项>]"
ef317cd5 7664
a4f16749 7665#: builtin/column.c:27
ef317cd5 7666msgid "lookup config vars"
07432cef 7667msgstr "查找配置变量"
ef317cd5 7668
a4f16749 7669#: builtin/column.c:28 builtin/column.c:29
ef317cd5 7670msgid "layout to use"
07432cef 7671msgstr "要使用的布局"
ef317cd5 7672
a4f16749 7673#: builtin/column.c:30
ef317cd5 7674msgid "Maximum width"
07432cef 7675msgstr "最大宽度"
ef317cd5 7676
a4f16749 7677#: builtin/column.c:31
ef317cd5 7678msgid "Padding space on left border"
07432cef 7679msgstr "左边框的填充空间"
ef317cd5 7680
a4f16749 7681#: builtin/column.c:32
ef317cd5 7682msgid "Padding space on right border"
07432cef 7683msgstr "右边框的填充空间"
ef317cd5 7684
a4f16749 7685#: builtin/column.c:33
ef317cd5 7686msgid "Padding space between columns"
07432cef 7687msgstr "两列之间的填充空间"
ef317cd5 7688
fd8cb379 7689#: builtin/column.c:51
8ada9598 7690msgid "--command must be the first argument"
81809b99 7691msgstr "--command 必须是第一个参数"
8ada9598 7692
31e5e17b 7693#: builtin/commit.c:37
814ff314 7694msgid "git commit [<options>] [--] <pathspec>..."
160fb2b2 7695msgstr "git commit [<选项>] [--] <路径规格>..."
ef317cd5 7696
31e5e17b 7697#: builtin/commit.c:42
814ff314 7698msgid "git status [<options>] [--] <pathspec>..."
160fb2b2 7699msgstr "git status [<选项>] [--] <路径规格>..."
ef317cd5 7700
31e5e17b 7701#: builtin/commit.c:47
c04f5ac3
JX
7702msgid ""
7703"You asked to amend the most recent commit, but doing so would make\n"
7704"it empty. You can repeat your command with --allow-empty, or you can\n"
7705"remove the commit entirely with \"git reset HEAD^\".\n"
7706msgstr ""
1b150dc9
T
7707"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
7708"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 7709
31e5e17b 7710#: builtin/commit.c:52
c04f5ac3
JX
7711msgid ""
7712"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
7713"If you wish to commit it anyway, use:\n"
7714"\n"
7715" git commit --allow-empty\n"
7716"\n"
c04f5ac3 7717msgstr ""
a9ce4543
T
7718"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
7719"也要提交,使用命令:\n"
c04f5ac3
JX
7720"\n"
7721" git commit --allow-empty\n"
7722"\n"
c04f5ac3 7723
31e5e17b 7724#: builtin/commit.c:59
b1894384
JX
7725msgid "Otherwise, please use 'git reset'\n"
7726msgstr "否则,请使用命令 'git reset'\n"
7727
31e5e17b 7728#: builtin/commit.c:62
b1894384
JX
7729msgid ""
7730"If you wish to skip this commit, use:\n"
7731"\n"
7732" git reset\n"
7733"\n"
7734"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
7735"the remaining commits.\n"
7736msgstr ""
7737"如果您想跳过这个提交,使用命令:\n"
7738"\n"
7739" git reset\n"
7740"\n"
7741"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
7742"操作。\n"
7743
fd8cb379 7744#: builtin/commit.c:293
c04f5ac3 7745msgid "failed to unpack HEAD tree object"
90e6ef53 7746msgstr "无法解包 HEAD 树对象"
c04f5ac3 7747
fd8cb379 7748#: builtin/commit.c:334
c04f5ac3 7749msgid "unable to create temporary index"
90e6ef53 7750msgstr "不能创建临时索引"
c04f5ac3 7751
fd8cb379 7752#: builtin/commit.c:340
c04f5ac3
JX
7753msgid "interactive add failed"
7754msgstr "交互式添加失败"
7755
fd8cb379 7756#: builtin/commit.c:353
220c313c
JX
7757msgid "unable to update temporary index"
7758msgstr "无法更新临时索引"
7759
fd8cb379 7760#: builtin/commit.c:355
220c313c
JX
7761msgid "Failed to update main cache tree"
7762msgstr "不能更新树的主缓存"
7763
fd8cb379 7764#: builtin/commit.c:380 builtin/commit.c:403 builtin/commit.c:449
c04f5ac3 7765msgid "unable to write new_index file"
90e6ef53 7766msgstr "无法写 new_index 文件"
c04f5ac3 7767
fd8cb379 7768#: builtin/commit.c:432
8ada9598 7769msgid "cannot do a partial commit during a merge."
81809b99 7770msgstr "在合并过程中不能做部分提交。"
c04f5ac3 7771
fd8cb379 7772#: builtin/commit.c:434
8ada9598 7773msgid "cannot do a partial commit during a cherry-pick."
81809b99 7774msgstr "在拣选过程中不能做部分提交。"
8ada9598 7775
fd8cb379 7776#: builtin/commit.c:442
c04f5ac3 7777msgid "cannot read the index"
90e6ef53 7778msgstr "无法读取索引"
c04f5ac3 7779
fd8cb379 7780#: builtin/commit.c:461
c04f5ac3 7781msgid "unable to write temporary index file"
90e6ef53 7782msgstr "无法写临时索引文件"
c04f5ac3 7783
fd8cb379 7784#: builtin/commit.c:558
220c313c
JX
7785#, c-format
7786msgid "commit '%s' lacks author header"
7787msgstr "提交 '%s' 缺少作者信息"
7788
fd8cb379 7789#: builtin/commit.c:560
c04f5ac3 7790#, c-format
220c313c 7791msgid "commit '%s' has malformed author line"
fd8cb379 7792msgstr "提交 '%s' 有格式错误的作者信息"
c04f5ac3 7793
fd8cb379 7794#: builtin/commit.c:579
c04f5ac3 7795msgid "malformed --author parameter"
fd8cb379 7796msgstr "格式错误的 --author 参数"
c04f5ac3 7797
fd8cb379 7798#: builtin/commit.c:631
6acbf033
JX
7799msgid ""
7800"unable to select a comment character that is not used\n"
7801"in the current commit message"
7802msgstr "无法选择一个未被当前提交说明使用的注释字符"
7803
fd8cb379 7804#: builtin/commit.c:668 builtin/commit.c:701 builtin/commit.c:1029
c04f5ac3
JX
7805#, c-format
7806msgid "could not lookup commit %s"
7807msgstr "不能查询提交 %s"
7808
fd8cb379 7809#: builtin/commit.c:680 builtin/shortlog.c:316
c04f5ac3
JX
7810#, c-format
7811msgid "(reading log message from standard input)\n"
90e6ef53 7812msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 7813
fd8cb379 7814#: builtin/commit.c:682
c04f5ac3 7815msgid "could not read log from standard input"
90e6ef53 7816msgstr "不能从标准输入中读取日志信息"
c04f5ac3 7817
fd8cb379 7818#: builtin/commit.c:686
c04f5ac3
JX
7819#, c-format
7820msgid "could not read log file '%s'"
90e6ef53 7821msgstr "不能读取日志文件 '%s'"
c04f5ac3 7822
fd8cb379 7823#: builtin/commit.c:715 builtin/commit.c:723
c04f5ac3 7824msgid "could not read SQUASH_MSG"
90e6ef53 7825msgstr "不能读取 SQUASH_MSG"
c04f5ac3 7826
fd8cb379 7827#: builtin/commit.c:720
5b04ee3b
JX
7828msgid "could not read MERGE_MSG"
7829msgstr "不能读取 MERGE_MSG"
7830
fd8cb379 7831#: builtin/commit.c:774
c04f5ac3 7832msgid "could not write commit template"
90e6ef53 7833msgstr "不能写提交模版"
c04f5ac3 7834
fd8cb379 7835#: builtin/commit.c:792
81809b99 7836#, c-format
c04f5ac3
JX
7837msgid ""
7838"\n"
8ada9598 7839"It looks like you may be committing a merge.\n"
c04f5ac3
JX
7840"If this is not correct, please remove the file\n"
7841"\t%s\n"
7842"and try again.\n"
7843msgstr ""
7844"\n"
649900bc 7845"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
7846"\t%s\n"
7847"然后重试。\n"
7848
fd8cb379 7849#: builtin/commit.c:797
81809b99 7850#, c-format
8ada9598
JX
7851msgid ""
7852"\n"
7853"It looks like you may be committing a cherry-pick.\n"
7854"If this is not correct, please remove the file\n"
7855"\t%s\n"
7856"and try again.\n"
7857msgstr ""
7858"\n"
649900bc 7859"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
7860"\t%s\n"
7861"然后重试。\n"
c04f5ac3 7862
fd8cb379 7863#: builtin/commit.c:810
a77c07d9 7864#, c-format
c04f5ac3 7865msgid ""
8ada9598 7866"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 7867"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 7868msgstr ""
a77c07d9 7869"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 7870"说明将会终止提交。\n"
c04f5ac3 7871
fd8cb379 7872#: builtin/commit.c:818
a77c07d9 7873#, c-format
c04f5ac3 7874msgid ""
8ada9598 7875"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 7876"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
7877"An empty message aborts the commit.\n"
7878msgstr ""
a77c07d9
JX
7879"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
7880"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 7881
90e6ef53 7882# 译者:为保证在输出中对齐,注意调整句中空格!
fd8cb379 7883#: builtin/commit.c:835
6acbf033
JX
7884#, c-format
7885msgid "%sAuthor: %.*s <%.*s>"
7886msgstr "%s作者: %.*s <%.*s>"
7887
7888# 译者:为保证在输出中对齐,注意调整句中空格!
fd8cb379 7889#: builtin/commit.c:843
c04f5ac3 7890#, c-format
6acbf033
JX
7891msgid "%sDate: %s"
7892msgstr "%s日期: %s"
c04f5ac3 7893
90e6ef53 7894# 译者:为保证在输出中对齐,注意调整句中空格!
fd8cb379 7895#: builtin/commit.c:850
c04f5ac3 7896#, c-format
6acbf033
JX
7897msgid "%sCommitter: %.*s <%.*s>"
7898msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 7899
fd8cb379 7900#: builtin/commit.c:867
c04f5ac3 7901msgid "Cannot read index"
90e6ef53 7902msgstr "无法读取索引"
c04f5ac3 7903
fd8cb379 7904#: builtin/commit.c:933
c04f5ac3
JX
7905msgid "Error building trees"
7906msgstr "无法创建树对象"
7907
fd8cb379 7908#: builtin/commit.c:947 builtin/tag.c:257
c04f5ac3
JX
7909#, c-format
7910msgid "Please supply the message using either -m or -F option.\n"
07432cef 7911msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 7912
fd8cb379 7913#: builtin/commit.c:991
c04f5ac3 7914#, c-format
814ff314 7915msgid "--author '%s' is not 'Name <email>' and matches no existing author"
58b6f078 7916msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配"
c04f5ac3 7917
fd8cb379 7918#: builtin/commit.c:1005
5809aa05
JX
7919#, c-format
7920msgid "Invalid ignored mode '%s'"
7921msgstr "无效的忽略模式 '%s'"
7922
fd8cb379 7923#: builtin/commit.c:1019 builtin/commit.c:1269
c04f5ac3
JX
7924#, c-format
7925msgid "Invalid untracked files mode '%s'"
90e6ef53 7926msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 7927
fd8cb379 7928#: builtin/commit.c:1057
2e8451e8
JX
7929msgid "--long and -z are incompatible"
7930msgstr "--long 和 -z 选项不兼容"
7931
fd8cb379 7932#: builtin/commit.c:1090
c04f5ac3
JX
7933msgid "Using both --reset-author and --author does not make sense"
7934msgstr "同时使用 --reset-author 和 --author 没有意义"
7935
fd8cb379 7936#: builtin/commit.c:1099
c04f5ac3 7937msgid "You have nothing to amend."
90e6ef53 7938msgstr "您没有可修补的提交。"
c04f5ac3 7939
fd8cb379 7940#: builtin/commit.c:1102
8ada9598 7941msgid "You are in the middle of a merge -- cannot amend."
81809b99 7942msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 7943
fd8cb379 7944#: builtin/commit.c:1104
8ada9598 7945msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 7946msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 7947
fd8cb379 7948#: builtin/commit.c:1107
c04f5ac3 7949msgid "Options --squash and --fixup cannot be used together"
649900bc 7950msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 7951
fd8cb379 7952#: builtin/commit.c:1117
c04f5ac3
JX
7953msgid "Only one of -c/-C/-F/--fixup can be used."
7954msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
7955
fd8cb379 7956#: builtin/commit.c:1119
31e5e17b
JX
7957msgid "Option -m cannot be combined with -c/-C/-F."
7958msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
c04f5ac3 7959
fd8cb379 7960#: builtin/commit.c:1127
c04f5ac3 7961msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 7962msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 7963
fd8cb379 7964#: builtin/commit.c:1144
c04f5ac3
JX
7965msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
7966msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
7967
fd8cb379 7968#: builtin/commit.c:1146
c04f5ac3
JX
7969msgid "No paths with --include/--only does not make sense."
7970msgstr "参数 --include/--only 不跟路径没有意义。"
7971
fd8cb379 7972#: builtin/commit.c:1160 builtin/tag.c:543
c04f5ac3
JX
7973#, c-format
7974msgid "Invalid cleanup mode %s"
7975msgstr "无效的清理模式 %s"
7976
fd8cb379 7977#: builtin/commit.c:1165
c04f5ac3 7978msgid "Paths with -a does not make sense."
649900bc 7979msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 7980
fd8cb379 7981#: builtin/commit.c:1303 builtin/commit.c:1480
ef317cd5 7982msgid "show status concisely"
07432cef 7983msgstr "以简洁的格式显示状态"
ef317cd5 7984
fd8cb379 7985#: builtin/commit.c:1305 builtin/commit.c:1482
ef317cd5 7986msgid "show branch information"
07432cef 7987msgstr "显示分支信息"
ef317cd5 7988
fd8cb379 7989#: builtin/commit.c:1307
a4f16749
JX
7990msgid "show stash information"
7991msgstr "显示贮藏区信息"
7992
fd8cb379 7993#: builtin/commit.c:1309 builtin/commit.c:1484
31e5e17b
JX
7994msgid "compute full ahead/behind values"
7995msgstr "计算完整的领先/落后值"
7996
fd8cb379 7997#: builtin/commit.c:1311
a0b6b246
JX
7998msgid "version"
7999msgstr "版本"
8000
fd8cb379
JX
8001#: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558
8002#: builtin/worktree.c:581
ef317cd5 8003msgid "machine-readable output"
07432cef
WS
8004msgstr "机器可读的输出"
8005
fd8cb379 8006#: builtin/commit.c:1314 builtin/commit.c:1488
07432cef
WS
8007msgid "show status in long format (default)"
8008msgstr "以长格式显示状态(默认)"
ef317cd5 8009
fd8cb379 8010#: builtin/commit.c:1317 builtin/commit.c:1491
ef317cd5 8011msgid "terminate entries with NUL"
4375c10e 8012msgstr "条目以 NUL 字符结尾"
ef317cd5 8013
fd8cb379
JX
8014#: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494
8015#: builtin/fast-export.c:1001 builtin/fast-export.c:1004 builtin/tag.c:397
ef317cd5 8016msgid "mode"
07432cef 8017msgstr "模式"
ef317cd5 8018
fd8cb379 8019#: builtin/commit.c:1320 builtin/commit.c:1494
ef317cd5 8020msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 8021msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 8022
fd8cb379 8023#: builtin/commit.c:1324
5809aa05
JX
8024msgid ""
8025"show ignored files, optional modes: traditional, matching, no. (Default: "
8026"traditional)"
31e5e17b
JX
8027msgstr ""
8028"显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)"
ef317cd5 8029
fd8cb379 8030#: builtin/commit.c:1326 parse-options.h:167
ef317cd5
JX
8031msgid "when"
8032msgstr "何时"
8033
fd8cb379 8034#: builtin/commit.c:1327
ef317cd5
JX
8035msgid ""
8036"ignore changes to submodules, optional when: all, dirty, untracked. "
8037"(Default: all)"
8038msgstr ""
07432cef 8039"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 8040
fd8cb379 8041#: builtin/commit.c:1329
ef317cd5 8042msgid "list untracked files in columns"
07432cef 8043msgstr "以列的方式显示未跟踪的文件"
ef317cd5 8044
fd8cb379
JX
8045#: builtin/commit.c:1330
8046msgid "do not detect renames"
8047msgstr "不检测重命名"
8048
8049#: builtin/commit.c:1332
8050msgid "detect renames, optionally set similarity index"
8051msgstr "检测重命名,可以设置索引相似度"
8052
8053#: builtin/commit.c:1352
5809aa05
JX
8054msgid "Unsupported combination of ignored and untracked-files arguments"
8055msgstr "不支持已忽略和未跟踪文件参数的组合"
8056
fd8cb379 8057#: builtin/commit.c:1450
ef317cd5 8058msgid "suppress summary after successful commit"
07432cef 8059msgstr "提交成功后不显示概述信息"
c04f5ac3 8060
fd8cb379 8061#: builtin/commit.c:1451
ef317cd5 8062msgid "show diff in commit message template"
07432cef 8063msgstr "在提交说明模板里显示差异"
c04f5ac3 8064
fd8cb379 8065#: builtin/commit.c:1453
ef317cd5 8066msgid "Commit message options"
07432cef 8067msgstr "提交说明选项"
c04f5ac3 8068
fd8cb379 8069#: builtin/commit.c:1454 builtin/tag.c:394
ef317cd5 8070msgid "read message from file"
07432cef 8071msgstr "从文件中读取提交说明"
c04f5ac3 8072
fd8cb379 8073#: builtin/commit.c:1455
ef317cd5 8074msgid "author"
07432cef 8075msgstr "作者"
c04f5ac3 8076
fd8cb379 8077#: builtin/commit.c:1455
ef317cd5 8078msgid "override author for commit"
07432cef 8079msgstr "提交时覆盖作者"
73a60cd2 8080
fd8cb379 8081#: builtin/commit.c:1456 builtin/gc.c:501
ef317cd5 8082msgid "date"
07432cef 8083msgstr "日期"
c04f5ac3 8084
fd8cb379 8085#: builtin/commit.c:1456
ef317cd5 8086msgid "override date for commit"
07432cef 8087msgstr "提交时覆盖日期"
c04f5ac3 8088
fd8cb379
JX
8089#: builtin/commit.c:1457 builtin/merge.c:228 builtin/notes.c:402
8090#: builtin/notes.c:565 builtin/tag.c:392
ef317cd5 8091msgid "message"
07432cef 8092msgstr "说明"
c04f5ac3 8093
fd8cb379 8094#: builtin/commit.c:1457
ef317cd5 8095msgid "commit message"
07432cef 8096msgstr "提交说明"
ef317cd5 8097
fd8cb379
JX
8098#: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460
8099#: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92
94550ed3
JX
8100msgid "commit"
8101msgstr "提交"
8102
fd8cb379 8103#: builtin/commit.c:1458
ef317cd5 8104msgid "reuse and edit message from specified commit"
07432cef 8105msgstr "重用并编辑指定提交的提交说明"
ef317cd5 8106
fd8cb379 8107#: builtin/commit.c:1459
ef317cd5 8108msgid "reuse message from specified commit"
07432cef 8109msgstr "重用指定提交的提交说明"
ef317cd5 8110
fd8cb379 8111#: builtin/commit.c:1460
ef317cd5 8112msgid "use autosquash formatted message to fixup specified commit"
07432cef 8113msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 8114
fd8cb379 8115#: builtin/commit.c:1461
ef317cd5 8116msgid "use autosquash formatted message to squash specified commit"
07432cef 8117msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 8118
fd8cb379 8119#: builtin/commit.c:1462
ef317cd5 8120msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 8121msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 8122
fd8cb379
JX
8123#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:242
8124#: builtin/pull.c:154 builtin/revert.c:105
ef317cd5 8125msgid "add Signed-off-by:"
07432cef 8126msgstr "添加 Signed-off-by: 签名"
ef317cd5 8127
fd8cb379 8128#: builtin/commit.c:1464
ef317cd5 8129msgid "use specified template file"
07432cef 8130msgstr "使用指定的模板文件"
ef317cd5 8131
fd8cb379 8132#: builtin/commit.c:1465
ef317cd5 8133msgid "force edit of commit"
07432cef 8134msgstr "强制编辑提交"
ef317cd5 8135
07432cef 8136# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
fd8cb379 8137#: builtin/commit.c:1466
ef317cd5 8138msgid "default"
07432cef 8139msgstr "default"
ef317cd5 8140
fd8cb379 8141#: builtin/commit.c:1466 builtin/tag.c:398
ef317cd5 8142msgid "how to strip spaces and #comments from message"
07432cef 8143msgstr "设置如何删除提交说明里的空格和#注释"
ef317cd5 8144
fd8cb379 8145#: builtin/commit.c:1467
ef317cd5 8146msgid "include status in commit message template"
07432cef 8147msgstr "在提交说明模板里包含状态信息"
ef317cd5 8148
fd8cb379 8149#: builtin/commit.c:1469 builtin/merge.c:240 builtin/pull.c:184
a4f16749 8150#: builtin/revert.c:113
ef317cd5 8151msgid "GPG sign commit"
07432cef 8152msgstr "GPG 提交签名"
ef317cd5 8153
fd8cb379 8154#: builtin/commit.c:1472
ef317cd5 8155msgid "Commit contents options"
07432cef 8156msgstr "提交内容选项"
ef317cd5 8157
fd8cb379 8158#: builtin/commit.c:1473
ef317cd5 8159msgid "commit all changed files"
07432cef 8160msgstr "提交所有改动的文件"
ef317cd5 8161
fd8cb379 8162#: builtin/commit.c:1474
ef317cd5 8163msgid "add specified files to index for commit"
07432cef 8164msgstr "添加指定的文件到索引区等待提交"
ef317cd5 8165
fd8cb379 8166#: builtin/commit.c:1475
ef317cd5 8167msgid "interactively add files"
07432cef 8168msgstr "交互式添加文件"
ef317cd5 8169
fd8cb379 8170#: builtin/commit.c:1476
ef317cd5 8171msgid "interactively add changes"
07432cef 8172msgstr "交互式添加变更"
ef317cd5 8173
fd8cb379 8174#: builtin/commit.c:1477
ef317cd5 8175msgid "commit only specified files"
07432cef 8176msgstr "只提交指定的文件"
ef317cd5 8177
fd8cb379 8178#: builtin/commit.c:1478
5c57d762
JX
8179msgid "bypass pre-commit and commit-msg hooks"
8180msgstr "绕过 pre-commit 和 commit-msg 钩子"
8181
fd8cb379 8182#: builtin/commit.c:1479
ef317cd5 8183msgid "show what would be committed"
07432cef 8184msgstr "显示将要提交的内容"
ef317cd5 8185
fd8cb379 8186#: builtin/commit.c:1492
ef317cd5 8187msgid "amend previous commit"
07432cef 8188msgstr "修改先前的提交"
ef317cd5 8189
fd8cb379 8190#: builtin/commit.c:1493
ef317cd5 8191msgid "bypass post-rewrite hook"
07432cef 8192msgstr "绕过 post-rewrite 钩子"
ef317cd5 8193
fd8cb379 8194#: builtin/commit.c:1498
ef317cd5 8195msgid "ok to record an empty change"
07432cef 8196msgstr "允许一个空提交"
ef317cd5 8197
fd8cb379 8198#: builtin/commit.c:1500
ef317cd5 8199msgid "ok to record a change with an empty message"
07432cef 8200msgstr "允许空的提交说明"
ef317cd5 8201
fd8cb379 8202#: builtin/commit.c:1573
c04f5ac3
JX
8203#, c-format
8204msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 8205msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 8206
fd8cb379 8207#: builtin/commit.c:1580
c04f5ac3 8208msgid "could not read MERGE_MODE"
90e6ef53 8209msgstr "不能读取 MERGE_MODE"
c04f5ac3 8210
fd8cb379 8211#: builtin/commit.c:1599
c04f5ac3
JX
8212#, c-format
8213msgid "could not read commit message: %s"
90e6ef53 8214msgstr "不能读取提交说明:%s"
c04f5ac3 8215
fd8cb379 8216#: builtin/commit.c:1610
c04f5ac3
JX
8217#, c-format
8218msgid "Aborting commit due to empty commit message.\n"
8219msgstr "终止提交因为提交说明为空。\n"
8220
fd8cb379 8221#: builtin/commit.c:1615
6937cb4e
JX
8222#, c-format
8223msgid "Aborting commit; you did not edit the message.\n"
8224msgstr "终止提交;您未更改来自模版的提交说明。\n"
8225
fd8cb379 8226#: builtin/commit.c:1650
c04f5ac3
JX
8227msgid ""
8228"Repository has been updated, but unable to write\n"
220c313c 8229"new_index file. Check that disk is not full and quota is\n"
c04f5ac3
JX
8230"not exceeded, and then \"git reset HEAD\" to recover."
8231msgstr ""
160fb2b2 8232"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
90e6ef53 8233"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 8234
fd8cb379
JX
8235#: builtin/commit-graph.c:9
8236msgid "git commit-graph [--object-dir <objdir>]"
8237msgstr "git commit-graph [--object-dir <对象目录>]"
8238
8239#: builtin/commit-graph.c:10 builtin/commit-graph.c:16
8240msgid "git commit-graph read [--object-dir <objdir>]"
8241msgstr "git commit-graph read [--object-dir <对象目录>]"
8242
8243#: builtin/commit-graph.c:11 builtin/commit-graph.c:21
8244msgid ""
8245"git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--"
8246"stdin-commits]"
8247msgstr ""
8248"git commit-graph write [--object-dir <对象目录>] [--append] [--stdin-packs|--"
8249"stdin-commits]"
8250
8251#: builtin/commit-graph.c:39 builtin/commit-graph.c:92
8252#: builtin/commit-graph.c:147 builtin/fetch.c:161 builtin/log.c:1466
8253msgid "dir"
8254msgstr "目录"
8255
8256#: builtin/commit-graph.c:40 builtin/commit-graph.c:93
8257#: builtin/commit-graph.c:148
8258msgid "The object directory to store the graph"
8259msgstr "保存图形的对象目录"
8260
8261#: builtin/commit-graph.c:95
8262msgid "scan pack-indexes listed by stdin for commits"
8263msgstr "从标准输入中的包索引文件列表中扫描提交"
8264
8265#: builtin/commit-graph.c:97
8266msgid "start walk at commits listed by stdin"
8267msgstr "从标准输入中的提交开始扫描"
8268
8269#: builtin/commit-graph.c:99
8270msgid "include all commits already in the commit-graph file"
8271msgstr "包含 commit-graph 文件中已有所有提交"
8272
8273#: builtin/commit-graph.c:108
8274msgid "cannot use both --stdin-commits and --stdin-packs"
8275msgstr "不能同时使用 --stdin-commits 和 --stdin-packs 选项"
8276
a4f16749 8277#: builtin/config.c:10
814ff314
JX
8278msgid "git config [<options>]"
8279msgstr "git config [<选项>]"
ef317cd5 8280
fd8cb379
JX
8281#: builtin/config.c:101
8282#, c-format
8283msgid "unrecognized --type argument, %s"
8284msgstr "未能识别的 --type 参数,%s"
8285
8286#: builtin/config.c:123
ef317cd5 8287msgid "Config file location"
07432cef 8288msgstr "配置文件位置"
ef317cd5 8289
fd8cb379 8290#: builtin/config.c:124
ef317cd5 8291msgid "use global config file"
07432cef 8292msgstr "使用全局配置文件"
ef317cd5 8293
fd8cb379 8294#: builtin/config.c:125
ef317cd5 8295msgid "use system config file"
07432cef 8296msgstr "使用系统级配置文件"
ef317cd5 8297
fd8cb379 8298#: builtin/config.c:126
ef317cd5 8299msgid "use repository config file"
160fb2b2 8300msgstr "使用仓库级配置文件"
ef317cd5 8301
fd8cb379 8302#: builtin/config.c:127
ef317cd5 8303msgid "use given config file"
07432cef 8304msgstr "使用指定的配置文件"
ef317cd5 8305
fd8cb379 8306#: builtin/config.c:128
2e8451e8 8307msgid "blob-id"
4375c10e 8308msgstr "数据对象 ID"
2e8451e8 8309
fd8cb379 8310#: builtin/config.c:128
2e8451e8
JX
8311msgid "read config from given blob object"
8312msgstr "从给定的数据对象读取配置"
8313
fd8cb379 8314#: builtin/config.c:129
ef317cd5 8315msgid "Action"
07432cef 8316msgstr "操作"
ef317cd5 8317
fd8cb379 8318#: builtin/config.c:130
ef317cd5 8319msgid "get value: name [value-regex]"
07432cef 8320msgstr "获取值:name [value-regex]"
ef317cd5 8321
fd8cb379 8322#: builtin/config.c:131
ef317cd5 8323msgid "get all values: key [value-regex]"
07432cef 8324msgstr "获得所有的值:key [value-regex]"
ef317cd5 8325
fd8cb379 8326#: builtin/config.c:132
ef317cd5 8327msgid "get values for regexp: name-regex [value-regex]"
07432cef 8328msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 8329
fd8cb379 8330#: builtin/config.c:133
90314792
JX
8331msgid "get value specific for the URL: section[.var] URL"
8332msgstr "获得 URL 取值:section[.var] URL"
8333
fd8cb379 8334#: builtin/config.c:134
ef317cd5 8335msgid "replace all matching variables: name value [value_regex]"
07432cef 8336msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 8337
fd8cb379 8338#: builtin/config.c:135
ef317cd5 8339msgid "add a new variable: name value"
07432cef 8340msgstr "添加一个新的变量:name value"
ef317cd5 8341
fd8cb379 8342#: builtin/config.c:136
ef317cd5 8343msgid "remove a variable: name [value-regex]"
07432cef 8344msgstr "删除一个变量:name [value-regex]"
ef317cd5 8345
fd8cb379 8346#: builtin/config.c:137
ef317cd5 8347msgid "remove all matches: name [value-regex]"
07432cef 8348msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 8349
fd8cb379 8350#: builtin/config.c:138
ef317cd5 8351msgid "rename section: old-name new-name"
07432cef 8352msgstr "重命名小节:old-name new-name"
ef317cd5 8353
fd8cb379 8354#: builtin/config.c:139
ef317cd5 8355msgid "remove a section: name"
07432cef 8356msgstr "删除一个小节:name"
ef317cd5 8357
fd8cb379 8358#: builtin/config.c:140
ef317cd5 8359msgid "list all"
07432cef 8360msgstr "列出所有"
ef317cd5 8361
fd8cb379 8362#: builtin/config.c:141
ef317cd5 8363msgid "open an editor"
07432cef 8364msgstr "打开一个编辑器"
ef317cd5 8365
fd8cb379 8366#: builtin/config.c:142
04cb2f28
JX
8367msgid "find the color configured: slot [default]"
8368msgstr "获得配置的颜色:配置 [默认]"
ef317cd5 8369
fd8cb379 8370#: builtin/config.c:143
04cb2f28
JX
8371msgid "find the color setting: slot [stdout-is-tty]"
8372msgstr "获得颜色设置:配置 [stdout-is-tty]"
ef317cd5 8373
fd8cb379 8374#: builtin/config.c:144
ef317cd5 8375msgid "Type"
07432cef 8376msgstr "类型"
ef317cd5 8377
fd8cb379
JX
8378#: builtin/config.c:145
8379msgid "value is given this type"
8380msgstr "取值为该类型"
8381
8382#: builtin/config.c:146
ef317cd5 8383msgid "value is \"true\" or \"false\""
07432cef 8384msgstr "值是 \"true\" 或 \"false\""
ef317cd5 8385
fd8cb379 8386#: builtin/config.c:147
ef317cd5 8387msgid "value is decimal number"
07432cef 8388msgstr "值是十进制数"
ef317cd5 8389
fd8cb379 8390#: builtin/config.c:148
ef317cd5 8391msgid "value is --bool or --int"
07432cef 8392msgstr "值是 --bool or --int"
ef317cd5 8393
fd8cb379 8394#: builtin/config.c:149
ef317cd5 8395msgid "value is a path (file or directory name)"
07432cef 8396msgstr "值是一个路径(文件或目录名)"
ef317cd5 8397
fd8cb379 8398#: builtin/config.c:150
5809aa05
JX
8399msgid "value is an expiry date"
8400msgstr "值是一个到期日期"
8401
fd8cb379 8402#: builtin/config.c:151
ef317cd5 8403msgid "Other"
07432cef 8404msgstr "其它"
ef317cd5 8405
fd8cb379 8406#: builtin/config.c:152
ef317cd5 8407msgid "terminate values with NUL byte"
4375c10e 8408msgstr "终止值是 NUL 字节"
ef317cd5 8409
fd8cb379 8410#: builtin/config.c:153
1b7f4a34
JX
8411msgid "show variable names only"
8412msgstr "只显示变量名"
8413
fd8cb379 8414#: builtin/config.c:154
ef317cd5 8415msgid "respect include directives on lookup"
07432cef 8416msgstr "查询时参照 include 指令递归查找"
ef317cd5 8417
fd8cb379 8418#: builtin/config.c:155
276ceeaa
JX
8419msgid "show origin of config (file, standard input, blob, command line)"
8420msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
8421
fd8cb379
JX
8422#: builtin/config.c:156
8423msgid "value"
8424msgstr "取值"
8425
8426#: builtin/config.c:156
8427msgid "with --get, use default value when missing entry"
8428msgstr "使用 --get 参数,当缺少设置时使用默认值"
8429
8430#: builtin/config.c:332
8431#, c-format
8432msgid "failed to format default config value: %s"
8433msgstr "无法格式化默认配置取值:%s"
8434
8435#: builtin/config.c:431
220c313c 8436msgid "unable to parse default color value"
160fb2b2 8437msgstr "不能解析默认颜色值"
220c313c 8438
fd8cb379 8439#: builtin/config.c:575
220c313c
JX
8440#, c-format
8441msgid ""
8442"# This is Git's per-user configuration file.\n"
7aea43ff 8443"[user]\n"
220c313c 8444"# Please adapt and uncomment the following lines:\n"
7aea43ff 8445"#\tname = %s\n"
220c313c
JX
8446"#\temail = %s\n"
8447msgstr ""
8448"# This is Git's per-user configuration file.\n"
7aea43ff 8449"[user]\n"
220c313c 8450"# Please adapt and uncomment the following lines:\n"
7aea43ff 8451"#\tname = %s\n"
220c313c
JX
8452"#\temail = %s\n"
8453
fd8cb379 8454#: builtin/config.c:603
a4f16749
JX
8455msgid "--local can only be used inside a git repository"
8456msgstr "--local 只能在一个仓库内使用"
8457
fd8cb379
JX
8458#: builtin/config.c:606
8459msgid "--blob can only be used inside a git repository"
8460msgstr "--blob 只能在一个仓库内使用"
8461
8462#: builtin/config.c:735
220c313c
JX
8463#, c-format
8464msgid "cannot create configuration file %s"
8465msgstr "不能创建配置文件 %s"
8466
fd8cb379 8467#: builtin/config.c:748
a0b6b246
JX
8468#, c-format
8469msgid ""
8470"cannot overwrite multiple values with a single value\n"
8471" Use a regexp, --add or --replace-all to change %s."
8472msgstr ""
8473"无法用一个值覆盖多个值\n"
8474" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
8475
fd8cb379 8476#: builtin/count-objects.c:90
4dcdc3d8
JX
8477msgid "git count-objects [-v] [-H | --human-readable]"
8478msgstr "git count-objects [-v] [-H | --human-readable]"
8479
fd8cb379 8480#: builtin/count-objects.c:100
4dcdc3d8
JX
8481msgid "print sizes in human readable format"
8482msgstr "以用户可读的格式显示大小"
ef317cd5 8483
5809aa05 8484#: builtin/describe.c:22
814ff314
JX
8485msgid "git describe [<options>] [<commit-ish>...]"
8486msgstr "git describe [<选项>] [<提交号>...]"
ef317cd5 8487
5809aa05 8488#: builtin/describe.c:23
814ff314
JX
8489msgid "git describe [<options>] --dirty"
8490msgstr "git describe [<选项>] --dirty"
ef317cd5 8491
5809aa05 8492#: builtin/describe.c:57
87cb7997
JX
8493msgid "head"
8494msgstr "头"
8495
5809aa05 8496#: builtin/describe.c:57
87cb7997
JX
8497msgid "lightweight"
8498msgstr "轻量级的"
8499
5809aa05 8500#: builtin/describe.c:57
87cb7997
JX
8501msgid "annotated"
8502msgstr "附注的"
8503
5809aa05 8504#: builtin/describe.c:267
c04f5ac3
JX
8505#, c-format
8506msgid "annotated tag %s not available"
55a16ee4 8507msgstr "附注标签 %s 无效"
c04f5ac3 8508
5809aa05 8509#: builtin/describe.c:271
c04f5ac3
JX
8510#, c-format
8511msgid "annotated tag %s has no embedded name"
55a16ee4 8512msgstr "附注标签 %s 没有嵌入名称"
c04f5ac3 8513
5809aa05 8514#: builtin/describe.c:273
c04f5ac3
JX
8515#, c-format
8516msgid "tag '%s' is really '%s' here"
55a16ee4 8517msgstr "标签 '%s' 的确是在 '%s'"
c04f5ac3 8518
31e5e17b 8519#: builtin/describe.c:317
c04f5ac3
JX
8520#, c-format
8521msgid "no tag exactly matches '%s'"
55a16ee4 8522msgstr "没有标签准确匹配 '%s'"
c04f5ac3 8523
31e5e17b 8524#: builtin/describe.c:319
c04f5ac3 8525#, c-format
5809aa05
JX
8526msgid "No exact match on refs or tags, searching to describe\n"
8527msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n"
c04f5ac3 8528
31e5e17b 8529#: builtin/describe.c:366
c04f5ac3
JX
8530#, c-format
8531msgid "finished search at %s\n"
8532msgstr "完成搜索 %s\n"
8533
31e5e17b 8534#: builtin/describe.c:392
c04f5ac3
JX
8535#, c-format
8536msgid ""
8537"No annotated tags can describe '%s'.\n"
8538"However, there were unannotated tags: try --tags."
8539msgstr ""
55a16ee4
RC
8540"没有附注标签能描述 '%s'。\n"
8541"然而,存在未附注标签:尝试 --tags。"
c04f5ac3 8542
31e5e17b 8543#: builtin/describe.c:396
c04f5ac3
JX
8544#, c-format
8545msgid ""
8546"No tags can describe '%s'.\n"
8547"Try --always, or create some tags."
8548msgstr ""
55a16ee4
RC
8549"没有标签能描述 '%s'。\n"
8550"尝试 --always,或者创建一些标签。"
c04f5ac3 8551
31e5e17b 8552#: builtin/describe.c:426
c04f5ac3
JX
8553#, c-format
8554msgid "traversed %lu commits\n"
8555msgstr "已遍历 %lu 个提交\n"
8556
31e5e17b 8557#: builtin/describe.c:429
c04f5ac3
JX
8558#, c-format
8559msgid ""
8560"more than %i tags found; listed %i most recent\n"
8561"gave up search at %s\n"
8562msgstr ""
55a16ee4 8563"发现多于 %i 个标签,列出最近的 %i 个\n"
90e6ef53 8564"在 %s 放弃搜索\n"
c04f5ac3 8565
31e5e17b 8566#: builtin/describe.c:497
5809aa05
JX
8567#, c-format
8568msgid "describe %s\n"
8569msgstr "描述 %s\n"
8570
31e5e17b 8571#: builtin/describe.c:500 builtin/log.c:502
5809aa05
JX
8572#, c-format
8573msgid "Not a valid object name %s"
8574msgstr "不是一个有效的对象名 %s"
8575
31e5e17b 8576#: builtin/describe.c:508
5809aa05
JX
8577#, c-format
8578msgid "%s is neither a commit nor blob"
8579msgstr "%s 既不是提交也不是数据对象"
8580
31e5e17b 8581#: builtin/describe.c:522
ef317cd5 8582msgid "find the tag that comes after the commit"
55a16ee4 8583msgstr "寻找该提交之后的标签"
ef317cd5 8584
31e5e17b 8585#: builtin/describe.c:523
ef317cd5 8586msgid "debug search strategy on stderr"
07432cef 8587msgstr "在标准错误上调试搜索策略"
ef317cd5 8588
31e5e17b 8589#: builtin/describe.c:524
1003b3a5
JX
8590msgid "use any ref"
8591msgstr "使用任意引用"
8592
31e5e17b 8593#: builtin/describe.c:525
1003b3a5 8594msgid "use any tag, even unannotated"
55a16ee4 8595msgstr "使用任意标签,即使未附带注释"
ef317cd5 8596
31e5e17b 8597#: builtin/describe.c:526
ef317cd5 8598msgid "always use long format"
07432cef 8599msgstr "始终使用长提交号格式"
ef317cd5 8600
31e5e17b 8601#: builtin/describe.c:527
2e8451e8
JX
8602msgid "only follow first parent"
8603msgstr "只跟随第一个父提交"
8604
31e5e17b 8605#: builtin/describe.c:530
ef317cd5 8606msgid "only output exact matches"
07432cef 8607msgstr "只输出精确匹配"
ef317cd5 8608
31e5e17b 8609#: builtin/describe.c:532
ef317cd5 8610msgid "consider <n> most recent tags (default: 10)"
55a16ee4 8611msgstr "考虑最近 <n> 个标签(默认:10)"
ef317cd5 8612
31e5e17b 8613#: builtin/describe.c:534
ef317cd5 8614msgid "only consider tags matching <pattern>"
55a16ee4 8615msgstr "只考虑匹配 <模式> 的标签"
ef317cd5 8616
31e5e17b 8617#: builtin/describe.c:536
87cb7997
JX
8618msgid "do not consider tags matching <pattern>"
8619msgstr "不考虑匹配 <模式> 的标签"
8620
31e5e17b 8621#: builtin/describe.c:538 builtin/name-rev.c:406
ef317cd5 8622msgid "show abbreviated commit object as fallback"
07432cef 8623msgstr "显示简写的提交号作为后备"
ef317cd5 8624
31e5e17b 8625#: builtin/describe.c:539 builtin/describe.c:542
ef317cd5 8626msgid "mark"
07432cef 8627msgstr "标记"
ef317cd5 8628
31e5e17b 8629#: builtin/describe.c:540
ef317cd5 8630msgid "append <mark> on dirty working tree (default: \"-dirty\")"
160fb2b2 8631msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
ef317cd5 8632
31e5e17b 8633#: builtin/describe.c:543
87cb7997
JX
8634msgid "append <mark> on broken working tree (default: \"-broken\")"
8635msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
8636
31e5e17b 8637#: builtin/describe.c:561
c04f5ac3
JX
8638msgid "--long is incompatible with --abbrev=0"
8639msgstr "--long 与 --abbrev=0 不兼容"
8640
31e5e17b 8641#: builtin/describe.c:590
c04f5ac3 8642msgid "No names found, cannot describe anything."
90e6ef53 8643msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 8644
31e5e17b 8645#: builtin/describe.c:640
a8a5406a 8646msgid "--dirty is incompatible with commit-ishes"
87cb7997
JX
8647msgstr "--dirty 与提交号不兼容"
8648
31e5e17b 8649#: builtin/describe.c:642
87cb7997
JX
8650msgid "--broken is incompatible with commit-ishes"
8651msgstr "--broken 与提交号不兼容"
c04f5ac3 8652
1a79b2f1 8653#: builtin/diff.c:83
c04f5ac3
JX
8654#, c-format
8655msgid "'%s': not a regular file or symlink"
8656msgstr "'%s':不是一个正规文件或符号链接"
8657
5809aa05 8658#: builtin/diff.c:234
c04f5ac3
JX
8659#, c-format
8660msgid "invalid option: %s"
8661msgstr "无效选项:%s"
8662
5809aa05 8663#: builtin/diff.c:356
c04f5ac3 8664msgid "Not a git repository"
160fb2b2 8665msgstr "不是一个 git 仓库"
c04f5ac3 8666
5809aa05 8667#: builtin/diff.c:399
c04f5ac3
JX
8668#, c-format
8669msgid "invalid object '%s' given."
8670msgstr "提供了无效对象 '%s'。"
8671
5809aa05 8672#: builtin/diff.c:408
c04f5ac3
JX
8673#, c-format
8674msgid "more than two blobs given: '%s'"
160fb2b2 8675msgstr "提供了超过两个数据对象:'%s'"
c04f5ac3 8676
5809aa05 8677#: builtin/diff.c:413
c04f5ac3
JX
8678#, c-format
8679msgid "unhandled object '%s' given."
6c94aba5 8680msgstr "无法处理的对象 '%s'。"
c04f5ac3 8681
a4f16749 8682#: builtin/difftool.c:29
1a79b2f1
JX
8683msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
8684msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
8685
6937cb4e 8686#: builtin/difftool.c:259
1a79b2f1
JX
8687#, c-format
8688msgid "failed: %d"
8689msgstr "失败:%d"
8690
6937cb4e 8691#: builtin/difftool.c:301
87cb7997
JX
8692#, c-format
8693msgid "could not read symlink %s"
8694msgstr "无法读取符号链接 %s"
8695
6937cb4e 8696#: builtin/difftool.c:303
87cb7997
JX
8697#, c-format
8698msgid "could not read symlink file %s"
8699msgstr "无法读取符号链接文件 %s"
8700
6937cb4e 8701#: builtin/difftool.c:311
87cb7997
JX
8702#, c-format
8703msgid "could not read object %s for symlink %s"
8704msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
8705
6937cb4e 8706#: builtin/difftool.c:412
1a79b2f1
JX
8707msgid ""
8708"combined diff formats('-c' and '--cc') are not supported in\n"
8709"directory diff mode('-d' and '--dir-diff')."
87cb7997
JX
8710msgstr ""
8711"不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
8712"cc')。"
1a79b2f1 8713
5809aa05 8714#: builtin/difftool.c:632
1a79b2f1
JX
8715#, c-format
8716msgid "both files modified: '%s' and '%s'."
8717msgstr "两个文件都被修改:'%s' 和 '%s'。"
8718
5809aa05 8719#: builtin/difftool.c:634
1a79b2f1
JX
8720msgid "working tree file has been left."
8721msgstr "工作区文件被留了下来。"
8722
5809aa05 8723#: builtin/difftool.c:645
1a79b2f1
JX
8724#, c-format
8725msgid "temporary files exist in '%s'."
8726msgstr "临时文件存在于 '%s'。"
8727
5809aa05 8728#: builtin/difftool.c:646
1a79b2f1
JX
8729msgid "you may want to cleanup or recover these."
8730msgstr "您可能想要清理或者恢复它们。"
8731
5809aa05 8732#: builtin/difftool.c:695
1a79b2f1
JX
8733msgid "use `diff.guitool` instead of `diff.tool`"
8734msgstr "使用 `diff.guitool` 代替 `diff.tool`"
8735
5809aa05 8736#: builtin/difftool.c:697
1a79b2f1
JX
8737msgid "perform a full-directory diff"
8738msgstr "执行一个全目录差异比较"
8739
5809aa05 8740#: builtin/difftool.c:699
1a79b2f1
JX
8741msgid "do not prompt before launching a diff tool"
8742msgstr "启动差异比较工具之前不提示"
8743
fd8cb379 8744#: builtin/difftool.c:704
1a79b2f1
JX
8745msgid "use symlinks in dir-diff mode"
8746msgstr "在 dir-diff 模式中使用符号链接"
8747
fd8cb379 8748#: builtin/difftool.c:705
1a79b2f1
JX
8749msgid "<tool>"
8750msgstr "<工具>"
8751
fd8cb379 8752#: builtin/difftool.c:706
1a79b2f1
JX
8753msgid "use the specified diff tool"
8754msgstr "使用指定的差异比较工具"
8755
fd8cb379 8756#: builtin/difftool.c:708
1a79b2f1
JX
8757msgid "print a list of diff tools that may be used with `--tool`"
8758msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
8759
fd8cb379 8760#: builtin/difftool.c:711
1a79b2f1
JX
8761msgid ""
8762"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
8763"code"
8764msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出"
8765
fd8cb379 8766#: builtin/difftool.c:713
1a79b2f1
JX
8767msgid "<command>"
8768msgstr "<命令>"
8769
fd8cb379 8770#: builtin/difftool.c:714
1a79b2f1
JX
8771msgid "specify a custom command for viewing diffs"
8772msgstr "指定一个用于查看差异的自定义命令"
8773
fd8cb379 8774#: builtin/difftool.c:738
1a79b2f1
JX
8775msgid "no <tool> given for --tool=<tool>"
8776msgstr "没有为 --tool=<工具> 参数提供 <工具>"
8777
fd8cb379 8778#: builtin/difftool.c:745
1a79b2f1
JX
8779msgid "no <cmd> given for --extcmd=<cmd>"
8780msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
8781
fd8cb379 8782#: builtin/fast-export.c:27
ef317cd5 8783msgid "git fast-export [rev-list-opts]"
07432cef 8784msgstr "git fast-export [rev-list-opts]"
ef317cd5 8785
fd8cb379 8786#: builtin/fast-export.c:1000
ef317cd5 8787msgid "show progress after <n> objects"
07432cef 8788msgstr "在 <n> 个对象之后显示进度"
ef317cd5 8789
fd8cb379 8790#: builtin/fast-export.c:1002
ef317cd5 8791msgid "select handling of signed tags"
55a16ee4 8792msgstr "选择如何处理签名标签"
ef317cd5 8793
fd8cb379 8794#: builtin/fast-export.c:1005
ef317cd5 8795msgid "select handling of tags that tag filtered objects"
55a16ee4 8796msgstr "选择当标签指向被过滤对象时该标签的处理方式"
ef317cd5 8797
fd8cb379 8798#: builtin/fast-export.c:1008
ef317cd5 8799msgid "Dump marks to this file"
07432cef 8800msgstr "把标记存储到这个文件"
ef317cd5 8801
fd8cb379 8802#: builtin/fast-export.c:1010
ef317cd5 8803msgid "Import marks from this file"
07432cef 8804msgstr "从这个文件导入标记"
ef317cd5 8805
fd8cb379 8806#: builtin/fast-export.c:1012
ef317cd5 8807msgid "Fake a tagger when tags lack one"
55a16ee4 8808msgstr "当标签缺少标记者字段时,假装提供一个"
ef317cd5 8809
fd8cb379 8810#: builtin/fast-export.c:1014
ef317cd5 8811msgid "Output full tree for each commit"
07432cef 8812msgstr "每次提交都输出整个树"
ef317cd5 8813
fd8cb379 8814#: builtin/fast-export.c:1016
ef317cd5 8815msgid "Use the done feature to terminate the stream"
07432cef 8816msgstr "使用 done 功能来终止流"
ef317cd5 8817
fd8cb379 8818#: builtin/fast-export.c:1017
ef317cd5 8819msgid "Skip output of blob data"
07432cef 8820msgstr "跳过数据对象的输出"
ef317cd5 8821
fd8cb379 8822#: builtin/fast-export.c:1018
6acbf033 8823msgid "refspec"
160fb2b2 8824msgstr "引用规格"
6acbf033 8825
fd8cb379 8826#: builtin/fast-export.c:1019
6acbf033 8827msgid "Apply refspec to exported refs"
160fb2b2 8828msgstr "对导出的引用应用引用规格"
6acbf033 8829
fd8cb379 8830#: builtin/fast-export.c:1020
220c313c
JX
8831msgid "anonymize output"
8832msgstr "匿名输出"
8833
fd8cb379 8834#: builtin/fetch.c:26
ef317cd5 8835msgid "git fetch [<options>] [<repository> [<refspec>...]]"
160fb2b2 8836msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
ef317cd5 8837
fd8cb379 8838#: builtin/fetch.c:27
ef317cd5 8839msgid "git fetch [<options>] <group>"
07432cef 8840msgstr "git fetch [<选项>] <组>"
ef317cd5 8841
fd8cb379 8842#: builtin/fetch.c:28
ef317cd5 8843msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
160fb2b2 8844msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
ef317cd5 8845
fd8cb379 8846#: builtin/fetch.c:29
ef317cd5 8847msgid "git fetch --all [<options>]"
07432cef 8848msgstr "git fetch --all [<选项>]"
ef317cd5 8849
fd8cb379 8850#: builtin/fetch.c:123 builtin/pull.c:193
ef317cd5 8851msgid "fetch from all remotes"
07432cef 8852msgstr "从所有的远程抓取"
ef317cd5 8853
fd8cb379 8854#: builtin/fetch.c:125 builtin/pull.c:196
ef317cd5 8855msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 8856msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 8857
fd8cb379 8858#: builtin/fetch.c:127 builtin/pull.c:199
ef317cd5 8859msgid "path to upload pack on remote end"
07432cef 8860msgstr "上传包到远程的路径"
ef317cd5 8861
fd8cb379 8862#: builtin/fetch.c:128 builtin/pull.c:201
ef317cd5 8863msgid "force overwrite of local branch"
07432cef 8864msgstr "强制覆盖本地分支"
ef317cd5 8865
fd8cb379 8866#: builtin/fetch.c:130
ef317cd5 8867msgid "fetch from multiple remotes"
07432cef 8868msgstr "从多个远程抓取"
ef317cd5 8869
fd8cb379 8870#: builtin/fetch.c:132 builtin/pull.c:203
ef317cd5 8871msgid "fetch all tags and associated objects"
55a16ee4 8872msgstr "抓取所有的标签和关联对象"
ef317cd5 8873
fd8cb379 8874#: builtin/fetch.c:134
ef317cd5 8875msgid "do not fetch all tags (--no-tags)"
55a16ee4 8876msgstr "不抓取任何标签(--no-tags)"
ef317cd5 8877
fd8cb379 8878#: builtin/fetch.c:136
276ceeaa
JX
8879msgid "number of submodules fetched in parallel"
8880msgstr "子模组获取的并发数"
8881
fd8cb379 8882#: builtin/fetch.c:138 builtin/pull.c:206
ef317cd5 8883msgid "prune remote-tracking branches no longer on remote"
07432cef 8884msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 8885
fd8cb379 8886#: builtin/fetch.c:140
31e5e17b
JX
8887msgid "prune local tags no longer on remote and clobber changed tags"
8888msgstr "清除远程不存在的本地标签,并且替换变更标签"
8889
07432cef 8890# 译者:可选值,不能翻译
fd8cb379 8891#: builtin/fetch.c:141 builtin/fetch.c:164 builtin/pull.c:131
ef317cd5 8892msgid "on-demand"
07432cef 8893msgstr "on-demand"
ef317cd5 8894
fd8cb379 8895#: builtin/fetch.c:142
ef317cd5 8896msgid "control recursive fetching of submodules"
07432cef 8897msgstr "控制子模组的递归抓取"
ef317cd5 8898
fd8cb379 8899#: builtin/fetch.c:146 builtin/pull.c:214
ef317cd5 8900msgid "keep downloaded pack"
07432cef 8901msgstr "保持下载包"
ef317cd5 8902
fd8cb379 8903#: builtin/fetch.c:148
ef317cd5 8904msgid "allow updating of HEAD ref"
07432cef 8905msgstr "允许更新 HEAD 引用"
ef317cd5 8906
fd8cb379 8907#: builtin/fetch.c:151 builtin/fetch.c:157 builtin/pull.c:217
ef317cd5 8908msgid "deepen history of shallow clone"
07432cef 8909msgstr "深化浅克隆的历史"
ef317cd5 8910
fd8cb379 8911#: builtin/fetch.c:153
a0b6b246
JX
8912msgid "deepen history of shallow repository based on time"
8913msgstr "基于时间来深化浅克隆的历史"
8914
fd8cb379 8915#: builtin/fetch.c:159 builtin/pull.c:220
a77c07d9 8916msgid "convert to a complete repository"
160fb2b2 8917msgstr "转换为一个完整的仓库"
a77c07d9 8918
fd8cb379 8919#: builtin/fetch.c:162
ef317cd5 8920msgid "prepend this to submodule path output"
07432cef 8921msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 8922
fd8cb379 8923#: builtin/fetch.c:165
a4f16749
JX
8924msgid ""
8925"default for recursive fetching of submodules (lower priority than config "
8926"files)"
8927msgstr "递归获取子模组的缺省值(比配置文件优先级低)"
ef317cd5 8928
fd8cb379 8929#: builtin/fetch.c:169 builtin/pull.c:223
cfff71a9
JX
8930msgid "accept refs that update .git/shallow"
8931msgstr "接受更新 .git/shallow 的引用"
8932
fd8cb379 8933#: builtin/fetch.c:170 builtin/pull.c:225
6acbf033
JX
8934msgid "refmap"
8935msgstr "引用映射"
8936
fd8cb379 8937#: builtin/fetch.c:171 builtin/pull.c:226
6acbf033
JX
8938msgid "specify fetch refmap"
8939msgstr "指定获取操作的引用映射"
8940
fd8cb379
JX
8941#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582
8942#: builtin/send-pack.c:172
8943msgid "server-specific"
8944msgstr "server-specific"
8945
8946#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582
8947#: builtin/send-pack.c:173
8948msgid "option to transmit"
8949msgstr "传输选项"
8950
8951#: builtin/fetch.c:442
c04f5ac3
JX
8952msgid "Couldn't find remote ref HEAD"
8953msgstr "无法发现远程 HEAD 引用"
8954
fd8cb379 8955#: builtin/fetch.c:560
5c57d762
JX
8956#, c-format
8957msgid "configuration fetch.output contains invalid value %s"
8958msgstr "配置变量 fetch.output 包含无效值 %s"
8959
fd8cb379 8960#: builtin/fetch.c:653
c04f5ac3
JX
8961#, c-format
8962msgid "object %s not found"
8963msgstr "对象 %s 未发现"
8964
fd8cb379 8965#: builtin/fetch.c:657
c04f5ac3
JX
8966msgid "[up to date]"
8967msgstr "[最新]"
8968
fd8cb379 8969#: builtin/fetch.c:670 builtin/fetch.c:750
c04f5ac3
JX
8970msgid "[rejected]"
8971msgstr "[已拒绝]"
8972
fd8cb379 8973#: builtin/fetch.c:671
5c57d762 8974msgid "can't fetch in current branch"
9a4b694c 8975msgstr "当前分支下不能执行获取操作"
5c57d762 8976
fd8cb379 8977#: builtin/fetch.c:680
c04f5ac3 8978msgid "[tag update]"
55a16ee4 8979msgstr "[标签更新]"
c04f5ac3 8980
fd8cb379
JX
8981#: builtin/fetch.c:681 builtin/fetch.c:714 builtin/fetch.c:730
8982#: builtin/fetch.c:745
5c57d762
JX
8983msgid "unable to update local ref"
8984msgstr "不能更新本地引用"
c04f5ac3 8985
fd8cb379 8986#: builtin/fetch.c:700
c04f5ac3 8987msgid "[new tag]"
55a16ee4 8988msgstr "[新标签]"
c04f5ac3 8989
fd8cb379 8990#: builtin/fetch.c:703
c04f5ac3
JX
8991msgid "[new branch]"
8992msgstr "[新分支]"
8993
fd8cb379 8994#: builtin/fetch.c:706
170e9899
JX
8995msgid "[new ref]"
8996msgstr "[新引用]"
8997
fd8cb379 8998#: builtin/fetch.c:745
c04f5ac3
JX
8999msgid "forced update"
9000msgstr "强制更新"
9001
fd8cb379 9002#: builtin/fetch.c:750
5c57d762
JX
9003msgid "non-fast-forward"
9004msgstr "非快进"
c04f5ac3 9005
fd8cb379 9006#: builtin/fetch.c:795
c04f5ac3
JX
9007#, c-format
9008msgid "%s did not send all necessary objects\n"
9009msgstr "%s 未发送所有必须的对象\n"
9010
fd8cb379 9011#: builtin/fetch.c:815
cfff71a9
JX
9012#, c-format
9013msgid "reject %s because shallow roots are not allowed to be updated"
9014msgstr "拒绝 %s 因为浅克隆不允许被更新"
9015
fd8cb379 9016#: builtin/fetch.c:903 builtin/fetch.c:999
c04f5ac3
JX
9017#, c-format
9018msgid "From %.*s\n"
9019msgstr "来自 %.*s\n"
9020
fd8cb379 9021#: builtin/fetch.c:914
c04f5ac3
JX
9022#, c-format
9023msgid ""
9024"some local refs could not be updated; try running\n"
9025" 'git remote prune %s' to remove any old, conflicting branches"
9026msgstr ""
9027"一些本地引用不能被更新;尝试运行\n"
9028" 'git remote prune %s' 来删除旧的、有冲突的分支"
9029
90e6ef53 9030# 译者:注意保持前导空格
fd8cb379 9031#: builtin/fetch.c:969
81809b99 9032#, c-format
8ada9598 9033msgid " (%s will become dangling)"
07432cef 9034msgstr " (%s 将成为摇摆状态)"
c04f5ac3 9035
90e6ef53 9036# 译者:注意保持前导空格
fd8cb379 9037#: builtin/fetch.c:970
81809b99 9038#, c-format
8ada9598 9039msgid " (%s has become dangling)"
07432cef 9040msgstr " (%s 已成为摇摆状态)"
c04f5ac3 9041
fd8cb379 9042#: builtin/fetch.c:1002
c04f5ac3
JX
9043msgid "[deleted]"
9044msgstr "[已删除]"
9045
fd8cb379 9046#: builtin/fetch.c:1003 builtin/remote.c:1033
c04f5ac3
JX
9047msgid "(none)"
9048msgstr "(无)"
9049
fd8cb379 9050#: builtin/fetch.c:1026
c04f5ac3
JX
9051#, c-format
9052msgid "Refusing to fetch into current branch %s of non-bare repository"
160fb2b2 9053msgstr "拒绝获取到非纯仓库的当前分支 %s"
c04f5ac3 9054
fd8cb379 9055#: builtin/fetch.c:1045
c04f5ac3
JX
9056#, c-format
9057msgid "Option \"%s\" value \"%s\" is not valid for %s"
9058msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
9059
fd8cb379 9060#: builtin/fetch.c:1048
c04f5ac3
JX
9061#, c-format
9062msgid "Option \"%s\" is ignored for %s\n"
81809b99 9063msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 9064
fd8cb379 9065#: builtin/fetch.c:1287
c04f5ac3
JX
9066#, c-format
9067msgid "Fetching %s\n"
d4a8e00b 9068msgstr "正在获取 %s\n"
c04f5ac3 9069
fd8cb379 9070#: builtin/fetch.c:1289 builtin/remote.c:98
c04f5ac3
JX
9071#, c-format
9072msgid "Could not fetch %s"
9073msgstr "不能获取 %s"
9074
fd8cb379 9075#: builtin/fetch.c:1335 builtin/fetch.c:1503
31e5e17b
JX
9076msgid ""
9077"--filter can only be used with the remote configured in core.partialClone"
9078msgstr "只可以将 --filter 用于在 core.partialClone 中配置的远程仓库"
9079
fd8cb379 9080#: builtin/fetch.c:1358
c04f5ac3
JX
9081msgid ""
9082"No remote repository specified. Please, specify either a URL or a\n"
9083"remote name from which new revisions should be fetched."
4375c10e 9084msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
c04f5ac3 9085
fd8cb379 9086#: builtin/fetch.c:1395
c04f5ac3 9087msgid "You need to specify a tag name."
55a16ee4 9088msgstr "您需要指定一个标签名称。"
c04f5ac3 9089
fd8cb379 9090#: builtin/fetch.c:1444
a0b6b246
JX
9091msgid "Negative depth in --deepen is not supported"
9092msgstr "--deepen 不支持负数深度"
9093
fd8cb379 9094#: builtin/fetch.c:1446
a0b6b246
JX
9095msgid "--deepen and --depth are mutually exclusive"
9096msgstr "--deepen 和 --depth 是互斥的"
9097
fd8cb379 9098#: builtin/fetch.c:1451
a77c07d9
JX
9099msgid "--depth and --unshallow cannot be used together"
9100msgstr "--depth 和 --unshallow 不能同时使用"
9101
fd8cb379 9102#: builtin/fetch.c:1453
a77c07d9 9103msgid "--unshallow on a complete repository does not make sense"
160fb2b2 9104msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
a77c07d9 9105
fd8cb379 9106#: builtin/fetch.c:1469
c04f5ac3 9107msgid "fetch --all does not take a repository argument"
160fb2b2 9108msgstr "fetch --all 不能带一个仓库参数"
c04f5ac3 9109
fd8cb379 9110#: builtin/fetch.c:1471
c04f5ac3 9111msgid "fetch --all does not make sense with refspecs"
160fb2b2 9112msgstr "fetch --all 带引用规格没有任何意义"
c04f5ac3 9113
fd8cb379 9114#: builtin/fetch.c:1480
c04f5ac3
JX
9115#, c-format
9116msgid "No such remote or remote group: %s"
9117msgstr "没有这样的远程或远程组:%s"
9118
fd8cb379 9119#: builtin/fetch.c:1487
c04f5ac3 9120msgid "Fetching a group and specifying refspecs does not make sense"
160fb2b2 9121msgstr "获取组并指定引用规格没有意义"
c04f5ac3 9122
a4f16749 9123#: builtin/fmt-merge-msg.c:15
814ff314
JX
9124msgid ""
9125"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
9126msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
c04f5ac3 9127
5809aa05 9128#: builtin/fmt-merge-msg.c:666
ef317cd5 9129msgid "populate log with at most <n> entries from shortlog"
07432cef 9130msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 9131
5809aa05 9132#: builtin/fmt-merge-msg.c:669
ef317cd5 9133msgid "alias for --log (deprecated)"
07432cef 9134msgstr "参数 --log 的别名(已弃用)"
ef317cd5 9135
5809aa05 9136#: builtin/fmt-merge-msg.c:672
ef317cd5 9137msgid "text"
07432cef 9138msgstr "文本"
ef317cd5 9139
5809aa05 9140#: builtin/fmt-merge-msg.c:673
ef317cd5 9141msgid "use <text> as start of message"
07432cef 9142msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 9143
5809aa05 9144#: builtin/fmt-merge-msg.c:674
ef317cd5 9145msgid "file to read from"
07432cef 9146msgstr "从文件中读取"
ef317cd5 9147
a4f16749 9148#: builtin/for-each-ref.c:10
814ff314
JX
9149msgid "git for-each-ref [<options>] [<pattern>]"
9150msgstr "git for-each-ref [<选项>] [<模式>]"
ef317cd5 9151
a4f16749 9152#: builtin/for-each-ref.c:11
94550ed3
JX
9153msgid "git for-each-ref [--points-at <object>]"
9154msgstr "git for-each-ref [--points-at <对象>]"
9155
a4f16749 9156#: builtin/for-each-ref.c:12
87cb7997
JX
9157msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
9158msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
94550ed3 9159
a4f16749 9160#: builtin/for-each-ref.c:13
87cb7997
JX
9161msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
9162msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
94550ed3 9163
a4f16749 9164#: builtin/for-each-ref.c:28
ef317cd5 9165msgid "quote placeholders suitably for shells"
07432cef 9166msgstr "引用占位符适用于 shells"
ef317cd5 9167
a4f16749 9168#: builtin/for-each-ref.c:30
ef317cd5 9169msgid "quote placeholders suitably for perl"
07432cef 9170msgstr "引用占位符适用于 perl"
ef317cd5 9171
a4f16749 9172#: builtin/for-each-ref.c:32
ef317cd5 9173msgid "quote placeholders suitably for python"
07432cef 9174msgstr "引用占位符适用于 python"
ef317cd5 9175
a4f16749 9176#: builtin/for-each-ref.c:34
04cb2f28
JX
9177msgid "quote placeholders suitably for Tcl"
9178msgstr "引用占位符适用于 Tcl"
ef317cd5 9179
a4f16749 9180#: builtin/for-each-ref.c:37
ef317cd5 9181msgid "show only <n> matched refs"
07432cef 9182msgstr "只显示 <n> 个匹配的引用"
ef317cd5 9183
fd8cb379 9184#: builtin/for-each-ref.c:39 builtin/tag.c:421
6937cb4e
JX
9185msgid "respect format colors"
9186msgstr "遵照格式中的颜色输出"
9187
9188#: builtin/for-each-ref.c:43
94550ed3
JX
9189msgid "print only refs which points at the given object"
9190msgstr "只打印指向给定对象的引用"
ef317cd5 9191
6937cb4e 9192#: builtin/for-each-ref.c:45
94550ed3
JX
9193msgid "print only refs that are merged"
9194msgstr "只打印已经合并的引用"
9195
6937cb4e 9196#: builtin/for-each-ref.c:46
94550ed3
JX
9197msgid "print only refs that are not merged"
9198msgstr "只打印没有合并的引用"
ef317cd5 9199
6937cb4e 9200#: builtin/for-each-ref.c:47
94550ed3
JX
9201msgid "print only refs which contain the commit"
9202msgstr "只打印包含该提交的引用"
9203
6937cb4e 9204#: builtin/for-each-ref.c:48
87cb7997
JX
9205msgid "print only refs which don't contain the commit"
9206msgstr "只打印不包含该提交的引用"
9207
fd8cb379 9208#: builtin/fsck.c:569
6c94aba5
JX
9209msgid "Checking object directories"
9210msgstr "检查对象目录中"
9211
fd8cb379 9212#: builtin/fsck.c:661
814ff314
JX
9213msgid "git fsck [<options>] [<object>...]"
9214msgstr "git fsck [<选项>] [<对象>...]"
ef317cd5 9215
fd8cb379 9216#: builtin/fsck.c:667
ef317cd5 9217msgid "show unreachable objects"
07432cef 9218msgstr "显示不可达的对象"
ef317cd5 9219
fd8cb379 9220#: builtin/fsck.c:668
ef317cd5 9221msgid "show dangling objects"
07432cef 9222msgstr "显示摇摆的对象"
ef317cd5 9223
fd8cb379 9224#: builtin/fsck.c:669
ef317cd5 9225msgid "report tags"
55a16ee4 9226msgstr "报告标签"
ef317cd5 9227
fd8cb379 9228#: builtin/fsck.c:670
ef317cd5 9229msgid "report root nodes"
07432cef 9230msgstr "报告根节点"
ef317cd5 9231
fd8cb379 9232#: builtin/fsck.c:671
ef317cd5 9233msgid "make index objects head nodes"
07432cef 9234msgstr "将索引亦作为检查的头节点"
ef317cd5 9235
fd8cb379 9236#: builtin/fsck.c:672
ef317cd5 9237msgid "make reflogs head nodes (default)"
07432cef 9238msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 9239
fd8cb379 9240#: builtin/fsck.c:673
ef317cd5 9241msgid "also consider packs and alternate objects"
07432cef 9242msgstr "也考虑包和备用对象"
ef317cd5 9243
fd8cb379 9244#: builtin/fsck.c:674
1b7f4a34
JX
9245msgid "check only connectivity"
9246msgstr "仅检查连通性"
9247
fd8cb379 9248#: builtin/fsck.c:675
ef317cd5 9249msgid "enable more strict checking"
07432cef 9250msgstr "启用更严格的检查"
ef317cd5 9251
fd8cb379 9252#: builtin/fsck.c:677
ef317cd5 9253msgid "write dangling objects in .git/lost-found"
07432cef 9254msgstr "将摇摆对象写入 .git/lost-found 中"
ef317cd5 9255
fd8cb379 9256#: builtin/fsck.c:678 builtin/prune.c:109
ef317cd5 9257msgid "show progress"
07432cef 9258msgstr "显示进度"
ef317cd5 9259
fd8cb379 9260#: builtin/fsck.c:679
5c57d762
JX
9261msgid "show verbose names for reachable objects"
9262msgstr "显示可达对象的详细名称"
9263
fd8cb379 9264#: builtin/fsck.c:745
6c94aba5
JX
9265msgid "Checking objects"
9266msgstr "检查对象中"
9267
fd8cb379 9268#: builtin/gc.c:33
814ff314
JX
9269msgid "git gc [<options>]"
9270msgstr "git gc [<选项>]"
ef317cd5 9271
fd8cb379 9272#: builtin/gc.c:88
c04f5ac3 9273#, c-format
87cb7997 9274msgid "Failed to fstat %s: %s"
65e2041e 9275msgstr "对 %s 调用 fstat 失败:%s"
c04f5ac3 9276
fd8cb379 9277#: builtin/gc.c:452
c04f5ac3 9278#, c-format
87cb7997 9279msgid "Can't stat %s"
65e2041e 9280msgstr "不能对 %s 调用 stat"
c04f5ac3 9281
fd8cb379 9282#: builtin/gc.c:461
94550ed3
JX
9283#, c-format
9284msgid ""
9285"The last gc run reported the following. Please correct the root cause\n"
9286"and remove %s.\n"
9287"Automatic cleanup will not be performed until the file is removed.\n"
9288"\n"
9289"%s"
9290msgstr ""
9291"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
9292"在该文件被删除之前,自动清理将不会执行。\n"
9293"\n"
9294"%s"
9295
fd8cb379 9296#: builtin/gc.c:502
ef317cd5 9297msgid "prune unreferenced objects"
07432cef 9298msgstr "清除未引用的对象"
ef317cd5 9299
fd8cb379 9300#: builtin/gc.c:504
ef317cd5 9301msgid "be more thorough (increased runtime)"
07432cef 9302msgstr "更彻底(增加运行时间)"
ef317cd5 9303
fd8cb379 9304#: builtin/gc.c:505
ef317cd5 9305msgid "enable auto-gc mode"
07432cef 9306msgstr "启用自动垃圾回收模式"
ef317cd5 9307
fd8cb379 9308#: builtin/gc.c:508
90314792
JX
9309msgid "force running gc even if there may be another gc running"
9310msgstr "强制执行 gc 即使另外一个 gc 正在执行"
9311
fd8cb379
JX
9312#: builtin/gc.c:511
9313msgid "repack all other packs except the largest pack"
9314msgstr "除了最大的包之外,对所有其它包文件重新打包"
9315
9316#: builtin/gc.c:528
9317#, c-format
9318msgid "failed to parse gc.logexpiry value %s"
9319msgstr "无法解析 gc.logexpiry 的值 %s"
9320
9321#: builtin/gc.c:539
87cb7997 9322#, c-format
fd8cb379 9323msgid "failed to parse prune expiry value %s"
87cb7997
JX
9324msgstr "无法解析 gc.logexpiry 的值 %s"
9325
fd8cb379 9326#: builtin/gc.c:559
c04f5ac3 9327#, c-format
6c94aba5 9328msgid "Auto packing the repository in background for optimum performance.\n"
160fb2b2 9329msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6c94aba5 9330
fd8cb379 9331#: builtin/gc.c:561
6c94aba5
JX
9332#, c-format
9333msgid "Auto packing the repository for optimum performance.\n"
160fb2b2 9334msgstr "自动打包仓库以求最佳性能。\n"
6c94aba5 9335
fd8cb379 9336#: builtin/gc.c:562
6c94aba5
JX
9337#, c-format
9338msgid "See \"git help gc\" for manual housekeeping.\n"
9339msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 9340
fd8cb379 9341#: builtin/gc.c:598
90314792
JX
9342#, c-format
9343msgid ""
9344"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
9345msgstr ""
29004bbb 9346"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)"
90314792 9347
fd8cb379 9348#: builtin/gc.c:645
c04f5ac3
JX
9349msgid ""
9350"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 9351msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 9352
fd8cb379 9353#: builtin/grep.c:28
814ff314
JX
9354msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
9355msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
ef317cd5 9356
fd8cb379 9357#: builtin/grep.c:226
c04f5ac3
JX
9358#, c-format
9359msgid "grep: failed to create thread: %s"
90e6ef53 9360msgstr "grep:无法创建线程:%s"
c04f5ac3 9361
fd8cb379 9362#: builtin/grep.c:284
276ceeaa
JX
9363#, c-format
9364msgid "invalid number of threads specified (%d) for %s"
9365msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
9366
a4f16749
JX
9367#. TRANSLATORS: %s is the configuration
9368#. variable for tweaking threads, currently
9369#. grep.threads
9370#.
fd8cb379 9371#: builtin/grep.c:293 builtin/index-pack.c:1535 builtin/index-pack.c:1727
a4f16749
JX
9372#, c-format
9373msgid "no threads support, ignoring %s"
9374msgstr "没有线程支持,忽略 %s"
9375
fd8cb379 9376#: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623
c04f5ac3
JX
9377#, c-format
9378msgid "unable to read tree (%s)"
90e6ef53 9379msgstr "无法读取树(%s)"
c04f5ac3 9380
fd8cb379 9381#: builtin/grep.c:638
c04f5ac3
JX
9382#, c-format
9383msgid "unable to grep from object of type %s"
9384msgstr "无法抓取来自于 %s 类型的对象"
9385
31e5e17b 9386#: builtin/grep.c:703
c04f5ac3
JX
9387#, c-format
9388msgid "switch `%c' expects a numerical value"
9389msgstr "开关 `%c' 期望一个数字值"
9390
31e5e17b 9391#: builtin/grep.c:790
ef317cd5 9392msgid "search in index instead of in the work tree"
07432cef 9393msgstr "在索引区搜索而不是在工作区"
ef317cd5 9394
31e5e17b 9395#: builtin/grep.c:792
ef317cd5 9396msgid "find in contents not managed by git"
07432cef 9397msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
9398
9399# 译者:中文字符串拼接,可删除前导空格
31e5e17b 9400#: builtin/grep.c:794
ef317cd5 9401msgid "search in both tracked and untracked files"
07432cef 9402msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 9403
31e5e17b 9404#: builtin/grep.c:796
814ff314
JX
9405msgid "ignore files specified via '.gitignore'"
9406msgstr "忽略 '.gitignore' 包含的文件"
ef317cd5 9407
31e5e17b 9408#: builtin/grep.c:798
87cb7997 9409msgid "recursively search in each submodule"
1a79b2f1
JX
9410msgstr "在每一个子模组中递归搜索"
9411
31e5e17b 9412#: builtin/grep.c:801
ef317cd5 9413msgid "show non-matching lines"
07432cef 9414msgstr "显示未匹配的行"
ef317cd5 9415
31e5e17b 9416#: builtin/grep.c:803
ef317cd5 9417msgid "case insensitive matching"
07432cef 9418msgstr "不区分大小写匹配"
ef317cd5 9419
31e5e17b 9420#: builtin/grep.c:805
ef317cd5 9421msgid "match patterns only at word boundaries"
07432cef 9422msgstr "只在单词边界匹配模式"
ef317cd5 9423
31e5e17b 9424#: builtin/grep.c:807
ef317cd5 9425msgid "process binary files as text"
07432cef 9426msgstr "把二进制文件当做文本处理"
ef317cd5 9427
31e5e17b 9428#: builtin/grep.c:809
ef317cd5 9429msgid "don't match patterns in binary files"
07432cef 9430msgstr "不在二进制文件中匹配模式"
ef317cd5 9431
31e5e17b 9432#: builtin/grep.c:812
90314792
JX
9433msgid "process binary files with textconv filters"
9434msgstr "用 textconv 过滤器处理二进制文件"
9435
31e5e17b 9436#: builtin/grep.c:814
ef317cd5 9437msgid "descend at most <depth> levels"
07432cef 9438msgstr "最多以指定的深度向下寻找"
ef317cd5 9439
31e5e17b 9440#: builtin/grep.c:818
ef317cd5 9441msgid "use extended POSIX regular expressions"
07432cef 9442msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 9443
31e5e17b 9444#: builtin/grep.c:821
ef317cd5 9445msgid "use basic POSIX regular expressions (default)"
07432cef 9446msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 9447
31e5e17b 9448#: builtin/grep.c:824
ef317cd5 9449msgid "interpret patterns as fixed strings"
07432cef 9450msgstr "把模式解析为固定的字符串"
ef317cd5 9451
31e5e17b 9452#: builtin/grep.c:827
ef317cd5 9453msgid "use Perl-compatible regular expressions"
07432cef 9454msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 9455
31e5e17b 9456#: builtin/grep.c:830
ef317cd5 9457msgid "show line numbers"
07432cef 9458msgstr "显示行号"
ef317cd5 9459
31e5e17b 9460#: builtin/grep.c:831
ef317cd5 9461msgid "don't show filenames"
07432cef 9462msgstr "不显示文件名"
ef317cd5 9463
31e5e17b 9464#: builtin/grep.c:832
ef317cd5 9465msgid "show filenames"
07432cef 9466msgstr "显示文件名"
ef317cd5 9467
31e5e17b 9468#: builtin/grep.c:834
ef317cd5 9469msgid "show filenames relative to top directory"
07432cef 9470msgstr "显示相对于顶级目录的文件名"
ef317cd5 9471
31e5e17b 9472#: builtin/grep.c:836
ef317cd5 9473msgid "show only filenames instead of matching lines"
07432cef 9474msgstr "只显示文件名而不显示匹配的行"
ef317cd5 9475
31e5e17b 9476#: builtin/grep.c:838
ef317cd5 9477msgid "synonym for --files-with-matches"
07432cef 9478msgstr "和 --files-with-matches 同义"
ef317cd5 9479
31e5e17b 9480#: builtin/grep.c:841
ef317cd5 9481msgid "show only the names of files without match"
07432cef 9482msgstr "只显示未匹配的文件名"
ef317cd5 9483
31e5e17b 9484#: builtin/grep.c:843
ef317cd5 9485msgid "print NUL after filenames"
07432cef 9486msgstr "在文件名后输出 NUL 字符"
ef317cd5 9487
31e5e17b 9488#: builtin/grep.c:846
ef317cd5 9489msgid "show the number of matches instead of matching lines"
07432cef 9490msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 9491
31e5e17b 9492#: builtin/grep.c:847
ef317cd5 9493msgid "highlight matches"
07432cef 9494msgstr "高亮显示匹配项"
ef317cd5 9495
31e5e17b 9496#: builtin/grep.c:849
ef317cd5 9497msgid "print empty line between matches from different files"
07432cef 9498msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 9499
31e5e17b 9500#: builtin/grep.c:851
ef317cd5 9501msgid "show filename only once above matches from same file"
07432cef 9502msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 9503
31e5e17b 9504#: builtin/grep.c:854
ef317cd5 9505msgid "show <n> context lines before and after matches"
07432cef 9506msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 9507
31e5e17b 9508#: builtin/grep.c:857
ef317cd5 9509msgid "show <n> context lines before matches"
07432cef 9510msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 9511
31e5e17b 9512#: builtin/grep.c:859
ef317cd5 9513msgid "show <n> context lines after matches"
07432cef 9514msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 9515
31e5e17b 9516#: builtin/grep.c:861
276ceeaa
JX
9517msgid "use <n> worker threads"
9518msgstr "使用 <n> 个工作线程"
9519
31e5e17b 9520#: builtin/grep.c:862
ef317cd5 9521msgid "shortcut for -C NUM"
07432cef 9522msgstr "快捷键 -C 数字"
ef317cd5 9523
31e5e17b 9524#: builtin/grep.c:865
ef317cd5 9525msgid "show a line with the function name before matches"
07432cef 9526msgstr "在匹配的前面显示一行函数名"
ef317cd5 9527
31e5e17b 9528#: builtin/grep.c:867
ef317cd5 9529msgid "show the surrounding function"
07432cef 9530msgstr "显示所在函数的前后内容"
ef317cd5 9531
31e5e17b 9532#: builtin/grep.c:870
ef317cd5 9533msgid "read patterns from file"
07432cef 9534msgstr "从文件读取模式"
ef317cd5 9535
31e5e17b 9536#: builtin/grep.c:872
ef317cd5 9537msgid "match <pattern>"
07432cef 9538msgstr "匹配 <模式>"
ef317cd5 9539
31e5e17b 9540#: builtin/grep.c:874
ef317cd5 9541msgid "combine patterns specified with -e"
07432cef 9542msgstr "组合用 -e 参数设定的模式"
ef317cd5 9543
31e5e17b 9544#: builtin/grep.c:886
ef317cd5 9545msgid "indicate hit with exit status without output"
07432cef 9546msgstr "不输出,而用退出码标识命中状态"
ef317cd5 9547
31e5e17b 9548#: builtin/grep.c:888
ef317cd5 9549msgid "show only matches from files that match all patterns"
07432cef 9550msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 9551
31e5e17b 9552#: builtin/grep.c:890
07432cef
WS
9553msgid "show parse tree for grep expression"
9554msgstr "显示 grep 表达式的解析树"
9555
31e5e17b 9556#: builtin/grep.c:894
ef317cd5 9557msgid "pager"
07432cef 9558msgstr "分页"
ef317cd5 9559
31e5e17b 9560#: builtin/grep.c:894
ef317cd5 9561msgid "show matching files in the pager"
07432cef 9562msgstr "分页显示匹配的文件"
ef317cd5 9563
31e5e17b 9564#: builtin/grep.c:898
ef317cd5 9565msgid "allow calling of grep(1) (ignored by this build)"
07432cef 9566msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 9567
31e5e17b 9568#: builtin/grep.c:962
c04f5ac3
JX
9569msgid "no pattern given."
9570msgstr "未提供模式匹配。"
9571
31e5e17b 9572#: builtin/grep.c:994
87cb7997
JX
9573msgid "--no-index or --untracked cannot be used with revs"
9574msgstr "--no-index 或 --untracked 不能和版本同时使用"
9575
31e5e17b 9576#: builtin/grep.c:1001
87cb7997
JX
9577#, c-format
9578msgid "unable to resolve revision: %s"
9579msgstr "不能解析版本:%s"
9580
fd8cb379 9581#: builtin/grep.c:1036 builtin/index-pack.c:1531
276ceeaa
JX
9582#, c-format
9583msgid "invalid number of threads specified (%d)"
9584msgstr "指定的线程数无效(%d)"
9585
31e5e17b 9586#: builtin/grep.c:1041
a4f16749
JX
9587msgid "no threads support, ignoring --threads"
9588msgstr "没有线程支持,忽略 --threads"
9589
31e5e17b 9590#: builtin/grep.c:1065
c04f5ac3
JX
9591msgid "--open-files-in-pager only works on the worktree"
9592msgstr "--open-files-in-pager 仅用于工作区"
9593
31e5e17b 9594#: builtin/grep.c:1088
1a79b2f1
JX
9595msgid "option not supported with --recurse-submodules."
9596msgstr "选项不支持和 --recurse-submodules 共用。"
9597
31e5e17b 9598#: builtin/grep.c:1094
c04f5ac3 9599msgid "--cached or --untracked cannot be used with --no-index."
649900bc 9600msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
c04f5ac3 9601
31e5e17b 9602#: builtin/grep.c:1100
c04f5ac3 9603msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 9604msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 9605
31e5e17b 9606#: builtin/grep.c:1108
c04f5ac3
JX
9607msgid "both --cached and trees are given."
9608msgstr "同时给出了 --cached 和树对象。"
9609
31e5e17b 9610#: builtin/hash-object.c:83
ef317cd5 9611msgid ""
814ff314
JX
9612"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
9613"[--] <file>..."
ef317cd5 9614msgstr ""
814ff314
JX
9615"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
9616"[--] <文件>..."
ef317cd5 9617
31e5e17b 9618#: builtin/hash-object.c:84
94550ed3
JX
9619msgid "git hash-object --stdin-paths"
9620msgstr "git hash-object --stdin-paths"
ef317cd5 9621
31e5e17b 9622#: builtin/hash-object.c:96
ef317cd5 9623msgid "type"
07432cef 9624msgstr "类型"
ef317cd5 9625
31e5e17b 9626#: builtin/hash-object.c:96
ef317cd5 9627msgid "object type"
07432cef 9628msgstr "对象类型"
ef317cd5 9629
31e5e17b 9630#: builtin/hash-object.c:97
ef317cd5 9631msgid "write the object into the object database"
07432cef 9632msgstr "将对象写入对象数据库"
ef317cd5 9633
31e5e17b 9634#: builtin/hash-object.c:99
ef317cd5 9635msgid "read the object from stdin"
07432cef 9636msgstr "从标准输入读取对象"
ef317cd5 9637
31e5e17b 9638#: builtin/hash-object.c:101
ef317cd5 9639msgid "store file as is without filters"
07432cef 9640msgstr "原样存储文件不使用过滤器"
ef317cd5 9641
31e5e17b 9642#: builtin/hash-object.c:102
220c313c
JX
9643msgid ""
9644"just hash any random garbage to create corrupt objects for debugging Git"
9645msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
9646
31e5e17b 9647#: builtin/hash-object.c:103
ef317cd5 9648msgid "process file as it were from this path"
07432cef 9649msgstr "处理文件并假设其来自于此路径"
ef317cd5 9650
fd8cb379 9651#: builtin/help.c:45
ef317cd5 9652msgid "print all available commands"
07432cef 9653msgstr "打印所有可用的命令"
ef317cd5 9654
fd8cb379 9655#: builtin/help.c:46
a0b6b246
JX
9656msgid "exclude guides"
9657msgstr "排除向导"
9658
fd8cb379 9659#: builtin/help.c:47
4dcdc3d8
JX
9660msgid "print list of useful guides"
9661msgstr "显示有用的指南列表"
9662
fd8cb379 9663#: builtin/help.c:48
ef317cd5 9664msgid "show man page"
07432cef 9665msgstr "显示 man 手册"
ef317cd5 9666
fd8cb379 9667#: builtin/help.c:49
ef317cd5 9668msgid "show manual in web browser"
07432cef 9669msgstr "在 web 浏览器中显示手册"
ef317cd5 9670
fd8cb379 9671#: builtin/help.c:51
ef317cd5 9672msgid "show info page"
07432cef 9673msgstr "显示 info 手册"
ef317cd5 9674
fd8cb379
JX
9675#: builtin/help.c:53
9676msgid "print command description"
9677msgstr "打印命令描述"
9678
9679#: builtin/help.c:58
814ff314
JX
9680msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
9681msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
ef317cd5 9682
fd8cb379 9683#: builtin/help.c:70
81809b99 9684#, c-format
8ada9598 9685msgid "unrecognized help format '%s'"
81809b99 9686msgstr "未能识别的帮助格式 '%s'"
8ada9598 9687
fd8cb379 9688#: builtin/help.c:97
8ada9598 9689msgid "Failed to start emacsclient."
81809b99 9690msgstr "无法启动 emacsclient。"
8ada9598 9691
fd8cb379 9692#: builtin/help.c:110
8ada9598 9693msgid "Failed to parse emacsclient version."
81809b99 9694msgstr "无法解析 emacsclient 版本。"
8ada9598 9695
fd8cb379 9696#: builtin/help.c:118
8ada9598
JX
9697#, c-format
9698msgid "emacsclient version '%d' too old (< 22)."
07432cef 9699msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 9700
fd8cb379 9701#: builtin/help.c:136 builtin/help.c:158 builtin/help.c:168 builtin/help.c:176
81809b99 9702#, c-format
5b04ee3b
JX
9703msgid "failed to exec '%s'"
9704msgstr "无法执行 '%s'"
8ada9598 9705
fd8cb379 9706#: builtin/help.c:214
8ada9598
JX
9707#, c-format
9708msgid ""
9709"'%s': path for unsupported man viewer.\n"
9710"Please consider using 'man.<tool>.cmd' instead."
9711msgstr ""
81809b99 9712"'%s':不支持的 man 手册查看器的路径。\n"
d9d56b23 9713"请使用 'man.<工具>.cmd'。"
8ada9598 9714
fd8cb379 9715#: builtin/help.c:226
8ada9598
JX
9716#, c-format
9717msgid ""
9718"'%s': cmd for supported man viewer.\n"
9719"Please consider using 'man.<tool>.path' instead."
9720msgstr ""
81809b99 9721"'%s': 支持的 man 手册查看器命令。\n"
d9d56b23 9722"请使用 'man.<工具>.path'。"
8ada9598 9723
fd8cb379 9724#: builtin/help.c:343
8ada9598
JX
9725#, c-format
9726msgid "'%s': unknown man viewer."
81809b99 9727msgstr "'%s':未知的 man 查看器。"
8ada9598 9728
fd8cb379 9729#: builtin/help.c:360
8ada9598 9730msgid "no man viewer handled the request"
81809b99 9731msgstr "没有 man 查看器处理此请求"
8ada9598 9732
fd8cb379 9733#: builtin/help.c:368
8ada9598 9734msgid "no info viewer handled the request"
81809b99 9735msgstr "没有 info 查看器处理此请求"
8ada9598 9736
fd8cb379
JX
9737#: builtin/help.c:415
9738#, c-format
9739msgid "'%s' is aliased to '%s'"
9740msgstr "'%s' 是 '%s' 的别名"
220c313c 9741
fd8cb379
JX
9742#: builtin/help.c:442 builtin/help.c:459
9743#, c-format
9744msgid "usage: %s%s"
9745msgstr "用法:%s%s"
4dcdc3d8 9746
fd8cb379
JX
9747#: builtin/index-pack.c:158
9748#, c-format
9749msgid "unable to open %s"
9750msgstr "不能打开 %s"
4dcdc3d8 9751
fd8cb379 9752#: builtin/index-pack.c:208
8ada9598
JX
9753#, c-format
9754msgid "object type mismatch at %s"
81809b99 9755msgstr "%s 的对象类型不匹配"
8ada9598 9756
fd8cb379 9757#: builtin/index-pack.c:228
6acbf033
JX
9758#, c-format
9759msgid "did not receive expected object %s"
a0b6b246 9760msgstr "未能获取预期的对象 %s"
8ada9598 9761
fd8cb379 9762#: builtin/index-pack.c:231
6acbf033
JX
9763#, c-format
9764msgid "object %s: expected type %s, found %s"
a0b6b246 9765msgstr "对象 %s:应为类型 %s,却是 %s"
6acbf033 9766
fd8cb379 9767#: builtin/index-pack.c:273
81809b99 9768#, c-format
8ada9598
JX
9769msgid "cannot fill %d byte"
9770msgid_plural "cannot fill %d bytes"
81809b99 9771msgstr[0] "无法填充 %d 字节"
5ae481e0 9772msgstr[1] "无法填充 %d 字节"
8ada9598 9773
fd8cb379 9774#: builtin/index-pack.c:283
8ada9598 9775msgid "early EOF"
81809b99 9776msgstr "过早的文件结束符(EOF)"
8ada9598 9777
fd8cb379 9778#: builtin/index-pack.c:284
8ada9598 9779msgid "read error on input"
81809b99 9780msgstr "输入上的读错误"
8ada9598 9781
fd8cb379 9782#: builtin/index-pack.c:296
8ada9598 9783msgid "used more bytes than were available"
81809b99 9784msgstr "用掉了超过可用的字节"
8ada9598 9785
fd8cb379 9786#: builtin/index-pack.c:303
8ada9598 9787msgid "pack too large for current definition of off_t"
81809b99 9788msgstr "包太大超过了当前 off_t 的定义"
8ada9598 9789
fd8cb379 9790#: builtin/index-pack.c:306 builtin/unpack-objects.c:93
a0b6b246
JX
9791msgid "pack exceeds maximum allowed size"
9792msgstr "包超过了最大允许值"
9793
fd8cb379 9794#: builtin/index-pack.c:321
81809b99 9795#, c-format
8ada9598 9796msgid "unable to create '%s'"
81809b99 9797msgstr "不能创建 '%s'"
8ada9598 9798
fd8cb379 9799#: builtin/index-pack.c:327
81809b99 9800#, c-format
8ada9598 9801msgid "cannot open packfile '%s'"
81809b99 9802msgstr "无法打开包文件 '%s'"
8ada9598 9803
fd8cb379 9804#: builtin/index-pack.c:341
8ada9598 9805msgid "pack signature mismatch"
81809b99 9806msgstr "包签名不匹配"
8ada9598 9807
fd8cb379 9808#: builtin/index-pack.c:343
ef317cd5
JX
9809#, c-format
9810msgid "pack version %<PRIu32> unsupported"
07432cef 9811msgstr "不支持包版本 %<PRIu32>"
ef317cd5 9812
fd8cb379 9813#: builtin/index-pack.c:361
8ada9598 9814#, c-format
5c57d762
JX
9815msgid "pack has bad object at offset %<PRIuMAX>: %s"
9816msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
8ada9598 9817
fd8cb379 9818#: builtin/index-pack.c:482
8ada9598
JX
9819#, c-format
9820msgid "inflate returned %d"
81809b99 9821msgstr "解压缩返回 %d"
8ada9598 9822
fd8cb379 9823#: builtin/index-pack.c:531
8ada9598 9824msgid "offset value overflow for delta base object"
81809b99 9825msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 9826
fd8cb379 9827#: builtin/index-pack.c:539
8ada9598 9828msgid "delta base offset is out of bound"
81809b99 9829msgstr "delta 基准偏移越界"
8ada9598 9830
fd8cb379 9831#: builtin/index-pack.c:547
81809b99 9832#, c-format
8ada9598 9833msgid "unknown object type %d"
81809b99 9834msgstr "未知对象类型 %d"
8ada9598 9835
fd8cb379 9836#: builtin/index-pack.c:578
8ada9598 9837msgid "cannot pread pack file"
81809b99 9838msgstr "无法读取包文件"
8ada9598 9839
fd8cb379 9840#: builtin/index-pack.c:580
8ada9598 9841#, c-format
5c57d762
JX
9842msgid "premature end of pack file, %<PRIuMAX> byte missing"
9843msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
9844msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
9845msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8ada9598 9846
fd8cb379 9847#: builtin/index-pack.c:606
8ada9598 9848msgid "serious inflate inconsistency"
81809b99 9849msgstr "解压缩严重的不一致"
8ada9598 9850
fd8cb379
JX
9851#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780
9852#: builtin/index-pack.c:819 builtin/index-pack.c:828
8ada9598
JX
9853#, c-format
9854msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 9855msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 9856
fd8cb379
JX
9857#: builtin/index-pack.c:754 builtin/pack-objects.c:198
9858#: builtin/pack-objects.c:292
6792b93b
JX
9859#, c-format
9860msgid "unable to read %s"
9861msgstr "不能读 %s"
9862
fd8cb379 9863#: builtin/index-pack.c:817
87cb7997
JX
9864#, c-format
9865msgid "cannot read existing object info %s"
9866msgstr "不能读取现存对象信息 %s"
9867
fd8cb379 9868#: builtin/index-pack.c:825
6792b93b
JX
9869#, c-format
9870msgid "cannot read existing object %s"
9871msgstr "不能读取现存对象 %s"
9872
fd8cb379 9873#: builtin/index-pack.c:839
81809b99 9874#, c-format
8ada9598 9875msgid "invalid blob object %s"
160fb2b2 9876msgstr "无效的数据对象 %s"
8ada9598 9877
fd8cb379
JX
9878#: builtin/index-pack.c:842 builtin/index-pack.c:860
9879msgid "fsck error in packed object"
9880msgstr "对打包对象 fsck 检查出错"
9881
9882#: builtin/index-pack.c:857
81809b99 9883#, c-format
8ada9598 9884msgid "invalid %s"
81809b99 9885msgstr "无效的 %s"
8ada9598 9886
fd8cb379 9887#: builtin/index-pack.c:862
8ada9598
JX
9888#, c-format
9889msgid "Not all child objects of %s are reachable"
81809b99 9890msgstr "%s 的所有子对象并非都可达"
8ada9598 9891
fd8cb379 9892#: builtin/index-pack.c:934 builtin/index-pack.c:965
8ada9598 9893msgid "failed to apply delta"
81809b99 9894msgstr "无法应用 delta"
8ada9598 9895
fd8cb379 9896#: builtin/index-pack.c:1135
8ada9598 9897msgid "Receiving objects"
81809b99 9898msgstr "接收对象中"
8ada9598 9899
fd8cb379 9900#: builtin/index-pack.c:1135
8ada9598 9901msgid "Indexing objects"
81809b99 9902msgstr "索引对象中"
8ada9598 9903
fd8cb379 9904#: builtin/index-pack.c:1169
8ada9598 9905msgid "pack is corrupted (SHA1 mismatch)"
81809b99 9906msgstr "包冲突(SHA1 不匹配)"
8ada9598 9907
fd8cb379 9908#: builtin/index-pack.c:1174
8ada9598 9909msgid "cannot fstat packfile"
65e2041e 9910msgstr "不能对包文件调用 fstat"
8ada9598 9911
fd8cb379 9912#: builtin/index-pack.c:1177
8ada9598 9913msgid "pack has junk at the end"
81809b99 9914msgstr "包的结尾有垃圾数据"
8ada9598 9915
fd8cb379 9916#: builtin/index-pack.c:1189
6792b93b
JX
9917msgid "confusion beyond insanity in parse_pack_objects()"
9918msgstr "parse_pack_objects() 中遇到不可理喻的问题"
9919
fd8cb379 9920#: builtin/index-pack.c:1212
8ada9598 9921msgid "Resolving deltas"
81809b99 9922msgstr "处理 delta 中"
8ada9598 9923
fd8cb379 9924#: builtin/index-pack.c:1223
07432cef 9925#, c-format
ef317cd5 9926msgid "unable to create thread: %s"
07432cef 9927msgstr "不能创建线程:%s"
ef317cd5 9928
fd8cb379 9929#: builtin/index-pack.c:1265
8ada9598 9930msgid "confusion beyond insanity"
81809b99 9931msgstr "不可理喻"
8ada9598 9932
fd8cb379 9933#: builtin/index-pack.c:1271
ef317cd5 9934#, c-format
5b04ee3b
JX
9935msgid "completed with %d local object"
9936msgid_plural "completed with %d local objects"
9937msgstr[0] "完成 %d 个本地对象"
9938msgstr[1] "完成 %d 个本地对象"
ef317cd5 9939
fd8cb379 9940#: builtin/index-pack.c:1283
ef317cd5
JX
9941#, c-format
9942msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 9943msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 9944
fd8cb379 9945#: builtin/index-pack.c:1287
8ada9598
JX
9946#, c-format
9947msgid "pack has %d unresolved delta"
9948msgid_plural "pack has %d unresolved deltas"
81809b99 9949msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 9950msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 9951
fd8cb379 9952#: builtin/index-pack.c:1311
81809b99 9953#, c-format
8ada9598 9954msgid "unable to deflate appended object (%d)"
07432cef 9955msgstr "不能压缩附加对象(%d)"
8ada9598 9956
fd8cb379 9957#: builtin/index-pack.c:1388
8ada9598
JX
9958#, c-format
9959msgid "local object %s is corrupt"
81809b99 9960msgstr "本地对象 %s 已损坏"
8ada9598 9961
fd8cb379 9962#: builtin/index-pack.c:1402
31e5e17b
JX
9963#, c-format
9964msgid "packfile name '%s' does not end with '.pack'"
9965msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
8ada9598 9966
fd8cb379 9967#: builtin/index-pack.c:1427
81809b99 9968#, c-format
31e5e17b
JX
9969msgid "cannot write %s file '%s'"
9970msgstr "无法写入 %s 文件 '%s'"
8ada9598 9971
fd8cb379 9972#: builtin/index-pack.c:1435
81809b99 9973#, c-format
31e5e17b
JX
9974msgid "cannot close written %s file '%s'"
9975msgstr "无法关闭已写入的 %s 文件 '%s'"
9976
fd8cb379 9977#: builtin/index-pack.c:1459
31e5e17b
JX
9978msgid "error while closing pack file"
9979msgstr "关闭包文件时出错"
8ada9598 9980
fd8cb379 9981#: builtin/index-pack.c:1473
8ada9598 9982msgid "cannot store pack file"
81809b99 9983msgstr "无法存储包文件"
8ada9598 9984
fd8cb379 9985#: builtin/index-pack.c:1481
8ada9598 9986msgid "cannot store index file"
81809b99 9987msgstr "无法存储索引文件"
8ada9598 9988
fd8cb379 9989#: builtin/index-pack.c:1525
07432cef 9990#, c-format
ef317cd5 9991msgid "bad pack.indexversion=%<PRIu32>"
07432cef 9992msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 9993
fd8cb379 9994#: builtin/index-pack.c:1594
81809b99 9995#, c-format
8ada9598 9996msgid "Cannot open existing pack file '%s'"
81809b99 9997msgstr "无法打开现存包文件 '%s'"
8ada9598 9998
fd8cb379 9999#: builtin/index-pack.c:1596
81809b99 10000#, c-format
8ada9598 10001msgid "Cannot open existing pack idx file for '%s'"
81809b99 10002msgstr "无法为 %s 打开包索引文件"
8ada9598 10003
fd8cb379 10004#: builtin/index-pack.c:1644
81809b99 10005#, c-format
8ada9598
JX
10006msgid "non delta: %d object"
10007msgid_plural "non delta: %d objects"
81809b99 10008msgstr[0] "非 delta:%d 个对象"
5ae481e0 10009msgstr[1] "非 delta:%d 个对象"
8ada9598 10010
fd8cb379 10011#: builtin/index-pack.c:1651
8ada9598
JX
10012#, c-format
10013msgid "chain length = %d: %lu object"
10014msgid_plural "chain length = %d: %lu objects"
81809b99 10015msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 10016msgstr[1] "链长 = %d: %lu 对象"
8ada9598 10017
fd8cb379 10018#: builtin/index-pack.c:1688
31e5e17b
JX
10019msgid "Cannot come back to cwd"
10020msgstr "无法返回当前工作目录"
5b04ee3b 10021
fd8cb379
JX
10022#: builtin/index-pack.c:1739 builtin/index-pack.c:1742
10023#: builtin/index-pack.c:1758 builtin/index-pack.c:1762
81809b99 10024#, c-format
8ada9598 10025msgid "bad %s"
81809b99 10026msgstr "错误选项 %s"
8ada9598 10027
fd8cb379 10028#: builtin/index-pack.c:1778
8ada9598 10029msgid "--fix-thin cannot be used without --stdin"
649900bc 10030msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 10031
fd8cb379 10032#: builtin/index-pack.c:1780
1a79b2f1
JX
10033msgid "--stdin requires a git repository"
10034msgstr "--stdin 需要一个 git 仓库"
10035
fd8cb379 10036#: builtin/index-pack.c:1786
8ada9598 10037msgid "--verify with no packfile name given"
dbd6cced 10038msgstr "--verify 没有提供包文件名参数"
8ada9598 10039
fd8cb379
JX
10040#: builtin/index-pack.c:1836 builtin/unpack-objects.c:578
10041msgid "fsck error in pack objects"
10042msgstr "在打包对象中 fsck 检查出错"
10043
a4f16749 10044#: builtin/init-db.c:55
c04f5ac3
JX
10045#, c-format
10046msgid "cannot stat '%s'"
65e2041e 10047msgstr "不能对 '%s' 调用 stat"
c04f5ac3 10048
a4f16749 10049#: builtin/init-db.c:61
c04f5ac3
JX
10050#, c-format
10051msgid "cannot stat template '%s'"
65e2041e 10052msgstr "不能对模版 '%s' 调用 stat"
c04f5ac3 10053
a4f16749 10054#: builtin/init-db.c:66
c04f5ac3
JX
10055#, c-format
10056msgid "cannot opendir '%s'"
10057msgstr "不能打开目录 '%s'"
10058
a4f16749 10059#: builtin/init-db.c:77
c04f5ac3
JX
10060#, c-format
10061msgid "cannot readlink '%s'"
10062msgstr "不能读取链接 '%s'"
10063
a4f16749 10064#: builtin/init-db.c:79
c04f5ac3
JX
10065#, c-format
10066msgid "cannot symlink '%s' '%s'"
90e6ef53 10067msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3 10068
a4f16749 10069#: builtin/init-db.c:85
c04f5ac3
JX
10070#, c-format
10071msgid "cannot copy '%s' to '%s'"
10072msgstr "不能拷贝 '%s' 至 '%s'"
10073
a4f16749 10074#: builtin/init-db.c:89
c04f5ac3
JX
10075#, c-format
10076msgid "ignoring template %s"
10077msgstr "忽略模版 %s"
10078
a4f16749 10079#: builtin/init-db.c:120
c04f5ac3 10080#, c-format
fd8cb379
JX
10081msgid "templates not found in %s"
10082msgstr "没有在 %s 中找到模版"
c04f5ac3 10083
a4f16749 10084#: builtin/init-db.c:135
c04f5ac3 10085#, c-format
5b04ee3b
JX
10086msgid "not copying templates from '%s': %s"
10087msgstr "没有从 '%s' 复制模版:%s"
c04f5ac3 10088
a4f16749 10089#: builtin/init-db.c:328
c04f5ac3
JX
10090#, c-format
10091msgid "unable to handle file type %d"
10092msgstr "不能处理 %d 类型的文件"
10093
a4f16749 10094#: builtin/init-db.c:331
c04f5ac3
JX
10095#, c-format
10096msgid "unable to move %s to %s"
10097msgstr "不能移动 %s 至 %s"
10098
a4f16749 10099#: builtin/init-db.c:348 builtin/init-db.c:351
a0b6b246
JX
10100#, c-format
10101msgid "%s already exists"
10102msgstr "%s 已经存在"
10103
a4f16749 10104#: builtin/init-db.c:404
c04f5ac3 10105#, c-format
5c57d762
JX
10106msgid "Reinitialized existing shared Git repository in %s%s\n"
10107msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
c04f5ac3 10108
a4f16749 10109#: builtin/init-db.c:405
5c57d762
JX
10110#, c-format
10111msgid "Reinitialized existing Git repository in %s%s\n"
10112msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
c04f5ac3 10113
a4f16749 10114#: builtin/init-db.c:409
5c57d762
JX
10115#, c-format
10116msgid "Initialized empty shared Git repository in %s%s\n"
9a4b694c 10117msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
c04f5ac3 10118
a4f16749 10119#: builtin/init-db.c:410
5c57d762
JX
10120#, c-format
10121msgid "Initialized empty Git repository in %s%s\n"
9a4b694c 10122msgstr "已初始化空的 Git 仓库于 %s%s\n"
c04f5ac3 10123
a4f16749 10124#: builtin/init-db.c:458
ef317cd5 10125msgid ""
a77c07d9 10126"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
814ff314 10127"shared[=<permissions>]] [<directory>]"
ef317cd5 10128msgstr ""
07432cef 10129"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
814ff314 10130"[<目录>]"
ef317cd5 10131
a4f16749 10132#: builtin/init-db.c:481
ef317cd5 10133msgid "permissions"
07432cef 10134msgstr "权限"
ef317cd5 10135
a4f16749 10136#: builtin/init-db.c:482
ef317cd5 10137msgid "specify that the git repository is to be shared amongst several users"
160fb2b2 10138msgstr "指定 git 仓库是多个用户之间共享的"
ef317cd5 10139
a4f16749 10140#: builtin/init-db.c:525
c04f5ac3
JX
10141#, c-format
10142msgid "cannot chdir to %s"
10143msgstr "不能切换目录到 %s"
10144
a4f16749 10145#: builtin/init-db.c:546
c04f5ac3
JX
10146#, c-format
10147msgid ""
10148"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
10149"dir=<directory>)"
1e607449 10150msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
c04f5ac3 10151
a4f16749 10152#: builtin/init-db.c:574
c04f5ac3
JX
10153#, c-format
10154msgid "Cannot access work tree '%s'"
10155msgstr "不能访问工作区 '%s'"
10156
220c313c
JX
10157#: builtin/interpret-trailers.c:15
10158msgid ""
276ceeaa
JX
10159"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
10160"<token>[(=|:)<value>])...] [<file>...]"
3495628d
JX
10161msgstr ""
10162"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
10163">])...] [<文件>...]"
276ceeaa 10164
6937cb4e 10165#: builtin/interpret-trailers.c:92
276ceeaa
JX
10166msgid "edit files in place"
10167msgstr "在原位编辑文件"
220c313c 10168
6937cb4e 10169#: builtin/interpret-trailers.c:93
220c313c 10170msgid "trim empty trailers"
6937cb4e
JX
10171msgstr "删除空的尾部署名"
10172
10173#: builtin/interpret-trailers.c:96
10174msgid "where to place the new trailer"
10175msgstr "在哪里放置新的尾部署名"
220c313c 10176
6937cb4e
JX
10177#: builtin/interpret-trailers.c:98
10178msgid "action if trailer already exists"
10179msgstr "当尾部署名已经存在时所采取的动作"
10180
10181#: builtin/interpret-trailers.c:100
10182msgid "action if trailer is missing"
10183msgstr "当尾部署名缺失时所采取的动作"
10184
10185#: builtin/interpret-trailers.c:102
10186msgid "output only the trailers"
10187msgstr "只输出尾部署名"
10188
10189#: builtin/interpret-trailers.c:103
10190msgid "do not apply config rules"
10191msgstr "不要应用配置规则"
10192
10193#: builtin/interpret-trailers.c:104
10194msgid "join whitespace-continued values"
10195msgstr "连接空白折行的值"
10196
10197#: builtin/interpret-trailers.c:105
10198msgid "set parsing options"
10199msgstr "设置解析选项"
10200
10201#: builtin/interpret-trailers.c:107
220c313c 10202msgid "trailer"
6937cb4e 10203msgstr "尾部署名"
220c313c 10204
6937cb4e 10205#: builtin/interpret-trailers.c:108
220c313c 10206msgid "trailer(s) to add"
6937cb4e 10207msgstr "要添加的尾部署名"
220c313c 10208
6937cb4e
JX
10209#: builtin/interpret-trailers.c:117
10210msgid "--trailer with --only-input does not make sense"
10211msgstr "--trailer 和 --only-input 同时使用没有意义"
10212
10213#: builtin/interpret-trailers.c:127
276ceeaa
JX
10214msgid "no input file given for in-place editing"
10215msgstr "没有给出要原位编辑的文件"
10216
31e5e17b 10217#: builtin/log.c:48
7aea43ff 10218msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
d9d56b23 10219msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
ef317cd5 10220
31e5e17b 10221#: builtin/log.c:49
814ff314
JX
10222msgid "git show [<options>] <object>..."
10223msgstr "git show [<选项>] <对象>..."
ef317cd5 10224
31e5e17b 10225#: builtin/log.c:93
220c313c
JX
10226#, c-format
10227msgid "invalid --decorate option: %s"
10228msgstr "无效的 --decorate 选项:%s"
10229
31e5e17b 10230#: builtin/log.c:153
ef317cd5 10231msgid "suppress diff output"
07432cef 10232msgstr "不显示差异输出"
ef317cd5 10233
31e5e17b 10234#: builtin/log.c:154
ef317cd5 10235msgid "show source"
07432cef 10236msgstr "显示源"
ef317cd5 10237
31e5e17b 10238#: builtin/log.c:155
07432cef
WS
10239msgid "Use mail map file"
10240msgstr "使用邮件映射文件"
10241
31e5e17b 10242#: builtin/log.c:157
5809aa05
JX
10243msgid "only decorate refs that match <pattern>"
10244msgstr "只修饰与 <模式> 匹配的引用"
10245
31e5e17b 10246#: builtin/log.c:159
5809aa05
JX
10247msgid "do not decorate refs that match <pattern>"
10248msgstr "不修饰和 <模式> 匹配的引用"
10249
31e5e17b 10250#: builtin/log.c:160
ef317cd5 10251msgid "decorate options"
07432cef 10252msgstr "修饰选项"
ef317cd5 10253
31e5e17b 10254#: builtin/log.c:163
220c313c
JX
10255msgid "Process line range n,m in file, counting from 1"
10256msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
10257
31e5e17b 10258#: builtin/log.c:259
c04f5ac3
JX
10259#, c-format
10260msgid "Final output: %d %s\n"
10261msgstr "最终输出:%d %s\n"
10262
31e5e17b 10263#: builtin/log.c:510
220c313c
JX
10264#, c-format
10265msgid "git show %s: bad file"
10266msgstr "git show %s: 损坏的文件"
10267
31e5e17b 10268#: builtin/log.c:525 builtin/log.c:619
c04f5ac3
JX
10269#, c-format
10270msgid "Could not read object %s"
90e6ef53 10271msgstr "不能读取对象 %s"
c04f5ac3 10272
31e5e17b 10273#: builtin/log.c:643
c04f5ac3
JX
10274#, c-format
10275msgid "Unknown type: %d"
10276msgstr "未知类型:%d"
10277
31e5e17b 10278#: builtin/log.c:764
c04f5ac3
JX
10279msgid "format.headers without value"
10280msgstr "format.headers 没有值"
10281
31e5e17b 10282#: builtin/log.c:865
c04f5ac3
JX
10283msgid "name of output directory is too long"
10284msgstr "输出目录名太长"
10285
31e5e17b 10286#: builtin/log.c:881
c04f5ac3
JX
10287#, c-format
10288msgid "Cannot open patch file %s"
10289msgstr "无法打开补丁文件 %s"
10290
31e5e17b 10291#: builtin/log.c:898
c04f5ac3
JX
10292msgid "Need exactly one range."
10293msgstr "只需要一个范围。"
10294
31e5e17b 10295#: builtin/log.c:908
c04f5ac3
JX
10296msgid "Not a range."
10297msgstr "不是一个范围。"
10298
31e5e17b 10299#: builtin/log.c:1014
c04f5ac3
JX
10300msgid "Cover letter needs email format"
10301msgstr "信封需要邮件地址格式"
10302
31e5e17b 10303#: builtin/log.c:1095
c04f5ac3
JX
10304#, c-format
10305msgid "insane in-reply-to: %s"
10306msgstr "不正常的 in-reply-to:%s"
10307
31e5e17b 10308#: builtin/log.c:1122
814ff314
JX
10309msgid "git format-patch [<options>] [<since> | <revision-range>]"
10310msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
ef317cd5 10311
31e5e17b 10312#: builtin/log.c:1172
c04f5ac3
JX
10313msgid "Two output directories?"
10314msgstr "两个输出目录?"
10315
31e5e17b 10316#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
5b04ee3b
JX
10317#, c-format
10318msgid "Unknown commit %s"
10319msgstr "未知提交 %s"
10320
fd8cb379 10321#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:523
5b04ee3b
JX
10322#, c-format
10323msgid "Failed to resolve '%s' as a valid ref."
10324msgstr "无法解析 '%s' 为一个有效引用。"
10325
31e5e17b 10326#: builtin/log.c:1294
5b04ee3b
JX
10327msgid "Could not find exact merge base."
10328msgstr "不能找到准确的合并基线。"
10329
31e5e17b 10330#: builtin/log.c:1298
5b04ee3b
JX
10331msgid ""
10332"Failed to get upstream, if you want to record base commit automatically,\n"
10333"please use git branch --set-upstream-to to track a remote branch.\n"
10334"Or you could specify base commit by --base=<base-commit-id> manually."
10335msgstr ""
10336"无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
aef18cc6 10337"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
58b6f078 10338"参数 --base=<基线提交> 手动指定一个基线提交。"
5b04ee3b 10339
31e5e17b 10340#: builtin/log.c:1318
5b04ee3b
JX
10341msgid "Failed to find exact merge base"
10342msgstr "无法找到准确的合并基线"
10343
31e5e17b 10344#: builtin/log.c:1329
5b04ee3b
JX
10345msgid "base commit should be the ancestor of revision list"
10346msgstr "基线提交应该是版本列表的祖先"
10347
31e5e17b 10348#: builtin/log.c:1333
5b04ee3b
JX
10349msgid "base commit shouldn't be in revision list"
10350msgstr "基线提交不应该出现在版本列表中"
10351
31e5e17b 10352#: builtin/log.c:1382
5b04ee3b 10353msgid "cannot get patch id"
aef18cc6 10354msgstr "无法得到补丁 id"
5b04ee3b 10355
31e5e17b 10356#: builtin/log.c:1441
ef317cd5 10357msgid "use [PATCH n/m] even with a single patch"
07432cef 10358msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 10359
31e5e17b 10360#: builtin/log.c:1444
ef317cd5 10361msgid "use [PATCH] even with multiple patches"
07432cef 10362msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 10363
31e5e17b 10364#: builtin/log.c:1448
ef317cd5 10365msgid "print patches to standard out"
07432cef 10366msgstr "打印补丁到标准输出"
c04f5ac3 10367
31e5e17b 10368#: builtin/log.c:1450
ef317cd5 10369msgid "generate a cover letter"
07432cef 10370msgstr "生成一封附信"
c04f5ac3 10371
31e5e17b 10372#: builtin/log.c:1452
ef317cd5 10373msgid "use simple number sequence for output file names"
07432cef 10374msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 10375
31e5e17b 10376#: builtin/log.c:1453
ef317cd5 10377msgid "sfx"
07432cef 10378msgstr "后缀"
ef317cd5 10379
31e5e17b 10380#: builtin/log.c:1454
ef317cd5 10381msgid "use <sfx> instead of '.patch'"
07432cef 10382msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 10383
31e5e17b 10384#: builtin/log.c:1456
ef317cd5 10385msgid "start numbering patches at <n> instead of 1"
07432cef
WS
10386msgstr "补丁以 <n> 开始编号,而不是1"
10387
31e5e17b 10388#: builtin/log.c:1458
07432cef
WS
10389msgid "mark the series as Nth re-roll"
10390msgstr "标记补丁系列是第几次重制"
ef317cd5 10391
31e5e17b 10392#: builtin/log.c:1460
a0b6b246
JX
10393msgid "Use [RFC PATCH] instead of [PATCH]"
10394msgstr "使用 [RFC PATCH] 代替 [PATCH]"
10395
31e5e17b 10396#: builtin/log.c:1463
ef317cd5 10397msgid "Use [<prefix>] instead of [PATCH]"
07432cef 10398msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 10399
31e5e17b 10400#: builtin/log.c:1466
ef317cd5 10401msgid "store resulting files in <dir>"
d9d56b23 10402msgstr "把结果文件存储在 <目录>"
ef317cd5 10403
31e5e17b 10404#: builtin/log.c:1469
ef317cd5 10405msgid "don't strip/add [PATCH]"
07432cef 10406msgstr "不删除/添加 [PATCH]"
ef317cd5 10407
31e5e17b 10408#: builtin/log.c:1472
ef317cd5 10409msgid "don't output binary diffs"
07432cef 10410msgstr "不输出二进制差异"
ef317cd5 10411
31e5e17b 10412#: builtin/log.c:1474
89f80d72
JX
10413msgid "output all-zero hash in From header"
10414msgstr "在 From 头信息中输出全为零的哈希值"
10415
31e5e17b 10416#: builtin/log.c:1476
ef317cd5 10417msgid "don't include a patch matching a commit upstream"
07432cef 10418msgstr "不包含已在上游提交中的补丁"
ef317cd5 10419
31e5e17b 10420#: builtin/log.c:1478
ef317cd5 10421msgid "show patch format instead of default (patch + stat)"
07432cef 10422msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 10423
31e5e17b 10424#: builtin/log.c:1480
ef317cd5 10425msgid "Messaging"
07432cef 10426msgstr "邮件发送"
ef317cd5 10427
31e5e17b 10428#: builtin/log.c:1481
ef317cd5 10429msgid "header"
07432cef 10430msgstr "header"
ef317cd5 10431
31e5e17b 10432#: builtin/log.c:1482
ef317cd5 10433msgid "add email header"
07432cef 10434msgstr "添加邮件头"
ef317cd5 10435
31e5e17b 10436#: builtin/log.c:1483 builtin/log.c:1485
ef317cd5 10437msgid "email"
07432cef 10438msgstr "邮件地址"
ef317cd5 10439
31e5e17b 10440#: builtin/log.c:1483
ef317cd5 10441msgid "add To: header"
07432cef 10442msgstr "添加收件人"
ef317cd5 10443
31e5e17b 10444#: builtin/log.c:1485
ef317cd5 10445msgid "add Cc: header"
07432cef 10446msgstr "添加抄送"
ef317cd5 10447
31e5e17b 10448#: builtin/log.c:1487
2e8451e8 10449msgid "ident"
d9d56b23 10450msgstr "标识"
2e8451e8 10451
31e5e17b 10452#: builtin/log.c:1488
2e8451e8 10453msgid "set From address to <ident> (or committer ident if absent)"
4375c10e 10454msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
2e8451e8 10455
31e5e17b 10456#: builtin/log.c:1490
ef317cd5 10457msgid "message-id"
d9d56b23 10458msgstr "邮件标识"
ef317cd5 10459
31e5e17b 10460#: builtin/log.c:1491
ef317cd5 10461msgid "make first mail a reply to <message-id>"
d9d56b23 10462msgstr "使第一封邮件作为对 <邮件标识> 的回复"
ef317cd5 10463
31e5e17b 10464#: builtin/log.c:1492 builtin/log.c:1495
ef317cd5 10465msgid "boundary"
07432cef 10466msgstr "边界"
ef317cd5 10467
31e5e17b 10468#: builtin/log.c:1493
ef317cd5 10469msgid "attach the patch"
07432cef 10470msgstr "附件方式添加补丁"
ef317cd5 10471
31e5e17b 10472#: builtin/log.c:1496
ef317cd5 10473msgid "inline the patch"
07432cef 10474msgstr "内联显示补丁"
ef317cd5 10475
31e5e17b 10476#: builtin/log.c:1500
ef317cd5 10477msgid "enable message threading, styles: shallow, deep"
07432cef 10478msgstr "启用邮件线索,风格:浅,深"
ef317cd5 10479
31e5e17b 10480#: builtin/log.c:1502
ef317cd5 10481msgid "signature"
07432cef 10482msgstr "签名"
ef317cd5 10483
31e5e17b 10484#: builtin/log.c:1503
ef317cd5 10485msgid "add a signature"
07432cef 10486msgstr "添加一个签名"
ef317cd5 10487
31e5e17b 10488#: builtin/log.c:1504
5b04ee3b
JX
10489msgid "base-commit"
10490msgstr "基线提交"
10491
31e5e17b 10492#: builtin/log.c:1505
5b04ee3b
JX
10493msgid "add prerequisite tree info to the patch series"
10494msgstr "为补丁列表添加前置树信息"
10495
31e5e17b 10496#: builtin/log.c:1507
6acbf033
JX
10497msgid "add a signature from a file"
10498msgstr "从文件添加一个签名"
10499
31e5e17b 10500#: builtin/log.c:1508
ef317cd5 10501msgid "don't print the patch filenames"
07432cef 10502msgstr "不要打印补丁文件名"
ef317cd5 10503
31e5e17b 10504#: builtin/log.c:1510
6937cb4e
JX
10505msgid "show progress while generating patches"
10506msgstr "在生成补丁时显示进度"
10507
31e5e17b 10508#: builtin/log.c:1585
a4f16749
JX
10509#, c-format
10510msgid "invalid ident line: %s"
10511msgstr "包含无效的身份标识:%s"
10512
31e5e17b 10513#: builtin/log.c:1600
c04f5ac3
JX
10514msgid "-n and -k are mutually exclusive."
10515msgstr "-n 和 -k 互斥。"
10516
31e5e17b 10517#: builtin/log.c:1602
a0b6b246
JX
10518msgid "--subject-prefix/--rfc and -k are mutually exclusive."
10519msgstr "--subject-prefix/--rfc 和 -k 互斥。"
c04f5ac3 10520
31e5e17b 10521#: builtin/log.c:1610
c04f5ac3
JX
10522msgid "--name-only does not make sense"
10523msgstr "--name-only 无意义"
10524
31e5e17b 10525#: builtin/log.c:1612
c04f5ac3
JX
10526msgid "--name-status does not make sense"
10527msgstr "--name-status 无意义"
10528
31e5e17b 10529#: builtin/log.c:1614
c04f5ac3
JX
10530msgid "--check does not make sense"
10531msgstr "--check 无意义"
10532
31e5e17b 10533#: builtin/log.c:1646
c04f5ac3
JX
10534msgid "standard output, or directory, which one?"
10535msgstr "标准输出或目录,哪一个?"
10536
31e5e17b 10537#: builtin/log.c:1648
c04f5ac3
JX
10538#, c-format
10539msgid "Could not create directory '%s'"
90e6ef53 10540msgstr "不能创建目录 '%s'"
c04f5ac3 10541
31e5e17b 10542#: builtin/log.c:1741
6acbf033
JX
10543#, c-format
10544msgid "unable to read signature file '%s'"
10545msgstr "无法读取签名文件 '%s'"
10546
31e5e17b 10547#: builtin/log.c:1773
6937cb4e
JX
10548msgid "Generating patches"
10549msgstr "生成补丁"
10550
31e5e17b 10551#: builtin/log.c:1817
c04f5ac3
JX
10552msgid "Failed to create output files"
10553msgstr "无法创建输出文件"
10554
31e5e17b 10555#: builtin/log.c:1867
ef317cd5 10556msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 10557msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 10558
31e5e17b 10559#: builtin/log.c:1921
c04f5ac3
JX
10560#, c-format
10561msgid ""
10562"Could not find a tracked remote branch, please specify <upstream> manually.\n"
d9d56b23 10563msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
c04f5ac3 10564
5809aa05 10565#: builtin/ls-files.c:468
814ff314
JX
10566msgid "git ls-files [<options>] [<file>...]"
10567msgstr "git ls-files [<选项>] [<文件>...]"
ef317cd5 10568
5809aa05 10569#: builtin/ls-files.c:517
ef317cd5 10570msgid "identify the file status with tags"
07432cef 10571msgstr "用标签标识文件的状态"
ef317cd5 10572
5809aa05 10573#: builtin/ls-files.c:519
ef317cd5 10574msgid "use lowercase letters for 'assume unchanged' files"
07432cef 10575msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 10576
5809aa05
JX
10577#: builtin/ls-files.c:521
10578msgid "use lowercase letters for 'fsmonitor clean' files"
10579msgstr "使用小写字母表示 'fsmonitor clean' 文件"
10580
10581#: builtin/ls-files.c:523
ef317cd5 10582msgid "show cached files in the output (default)"
07432cef 10583msgstr "显示缓存的文件(默认)"
ef317cd5 10584
5809aa05 10585#: builtin/ls-files.c:525
ef317cd5 10586msgid "show deleted files in the output"
07432cef 10587msgstr "显示已删除的文件"
ef317cd5 10588
5809aa05 10589#: builtin/ls-files.c:527
ef317cd5 10590msgid "show modified files in the output"
07432cef 10591msgstr "显示已修改的文件"
ef317cd5 10592
5809aa05 10593#: builtin/ls-files.c:529
ef317cd5 10594msgid "show other files in the output"
07432cef 10595msgstr "显示其它文件"
ef317cd5 10596
5809aa05 10597#: builtin/ls-files.c:531
ef317cd5 10598msgid "show ignored files in the output"
07432cef 10599msgstr "显示忽略的文件"
ef317cd5 10600
5809aa05 10601#: builtin/ls-files.c:534
ef317cd5 10602msgid "show staged contents' object name in the output"
07432cef 10603msgstr "显示暂存区内容的对象名称"
ef317cd5 10604
5809aa05 10605#: builtin/ls-files.c:536
ef317cd5 10606msgid "show files on the filesystem that need to be removed"
07432cef 10607msgstr "显示文件系统需要删除的文件"
ef317cd5 10608
5809aa05 10609#: builtin/ls-files.c:538
220c313c 10610msgid "show 'other' directories' names only"
07432cef 10611msgstr "只显示“其他”目录的名称"
ef317cd5 10612
5809aa05 10613#: builtin/ls-files.c:540
276ceeaa
JX
10614msgid "show line endings of files"
10615msgstr "显示文件换行符格式"
10616
5809aa05 10617#: builtin/ls-files.c:542
ef317cd5 10618msgid "don't show empty directories"
07432cef 10619msgstr "不显示空目录"
ef317cd5 10620
5809aa05 10621#: builtin/ls-files.c:545
ef317cd5 10622msgid "show unmerged files in the output"
07432cef 10623msgstr "显示未合并的文件"
ef317cd5 10624
5809aa05 10625#: builtin/ls-files.c:547
ef317cd5 10626msgid "show resolve-undo information"
07432cef 10627msgstr "显示 resolve-undo 信息"
ef317cd5 10628
5809aa05 10629#: builtin/ls-files.c:549
ef317cd5 10630msgid "skip files matching pattern"
07432cef 10631msgstr "匹配排除文件的模式"
ef317cd5 10632
5809aa05 10633#: builtin/ls-files.c:552
ef317cd5 10634msgid "exclude patterns are read from <file>"
07432cef 10635msgstr "从 <文件> 中读取排除模式"
ef317cd5 10636
5809aa05 10637#: builtin/ls-files.c:555
ef317cd5 10638msgid "read additional per-directory exclude patterns in <file>"
07432cef 10639msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 10640
5809aa05 10641#: builtin/ls-files.c:557
ef317cd5 10642msgid "add the standard git exclusions"
07432cef 10643msgstr "添加标准的 git 排除"
ef317cd5 10644
5809aa05 10645#: builtin/ls-files.c:560
ef317cd5 10646msgid "make the output relative to the project top directory"
07432cef 10647msgstr "显示相对于顶级目录的文件名"
ef317cd5 10648
5809aa05 10649#: builtin/ls-files.c:563
a0b6b246
JX
10650msgid "recurse through submodules"
10651msgstr "在子模组中递归"
10652
5809aa05 10653#: builtin/ls-files.c:565
ef317cd5 10654msgid "if any <file> is not in the index, treat this as an error"
07432cef 10655msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 10656
5809aa05 10657#: builtin/ls-files.c:566
ef317cd5 10658msgid "tree-ish"
07432cef 10659msgstr "树或提交"
ef317cd5 10660
5809aa05 10661#: builtin/ls-files.c:567
ef317cd5 10662msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 10663msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5 10664
5809aa05 10665#: builtin/ls-files.c:569
ef317cd5 10666msgid "show debugging data"
07432cef 10667msgstr "显示调试数据"
ef317cd5 10668
fd8cb379 10669#: builtin/ls-remote.c:9
276ceeaa
JX
10670msgid ""
10671"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
10672" [-q | --quiet] [--exit-code] [--get-url]\n"
10673" [--symref] [<repository> [<refs>...]]"
10674msgstr ""
10675"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
10676" [-q | --quiet] [--exit-code] [--get-url]\n"
10677" [--symref] [<仓库> [<引用>...]]"
10678
fd8cb379 10679#: builtin/ls-remote.c:59
276ceeaa
JX
10680msgid "do not print remote URL"
10681msgstr "不打印远程 URL"
10682
fd8cb379 10683#: builtin/ls-remote.c:60 builtin/ls-remote.c:62
276ceeaa
JX
10684msgid "exec"
10685msgstr "exec"
10686
fd8cb379 10687#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
276ceeaa
JX
10688msgid "path of git-upload-pack on the remote host"
10689msgstr "远程主机上的 git-upload-pack 路径"
10690
fd8cb379 10691#: builtin/ls-remote.c:65
276ceeaa
JX
10692msgid "limit to tags"
10693msgstr "仅限于标签"
10694
fd8cb379 10695#: builtin/ls-remote.c:66
276ceeaa
JX
10696msgid "limit to heads"
10697msgstr "仅限于分支"
10698
fd8cb379 10699#: builtin/ls-remote.c:67
276ceeaa
JX
10700msgid "do not show peeled tags"
10701msgstr "不显示已解析的标签"
10702
fd8cb379 10703#: builtin/ls-remote.c:69
276ceeaa
JX
10704msgid "take url.<base>.insteadOf into account"
10705msgstr "参考 url.<base>.insteadOf 设置"
10706
fd8cb379 10707#: builtin/ls-remote.c:73
276ceeaa
JX
10708msgid "exit with exit code 2 if no matching refs are found"
10709msgstr "若未找到匹配的引用则以退出码2退出"
10710
fd8cb379 10711#: builtin/ls-remote.c:76
276ceeaa
JX
10712msgid "show underlying ref in addition to the object pointed by it"
10713msgstr "除了显示指向的对象外,显示指向的引用名"
10714
a4f16749 10715#: builtin/ls-tree.c:29
ef317cd5 10716msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 10717msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5 10718
a4f16749 10719#: builtin/ls-tree.c:127
ef317cd5 10720msgid "only show trees"
07432cef 10721msgstr "只显示树"
ef317cd5 10722
a4f16749 10723#: builtin/ls-tree.c:129
ef317cd5 10724msgid "recurse into subtrees"
07432cef 10725msgstr "递归到子树"
ef317cd5 10726
a4f16749 10727#: builtin/ls-tree.c:131
ef317cd5 10728msgid "show trees when recursing"
07432cef 10729msgstr "当递归时显示树"
ef317cd5 10730
a4f16749 10731#: builtin/ls-tree.c:134
ef317cd5 10732msgid "terminate entries with NUL byte"
4375c10e 10733msgstr "条目以 NUL 字符终止"
ef317cd5 10734
a4f16749 10735#: builtin/ls-tree.c:135
ef317cd5 10736msgid "include object size"
07432cef 10737msgstr "包括对象大小"
ef317cd5 10738
a4f16749 10739#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
ef317cd5 10740msgid "list only filenames"
07432cef 10741msgstr "只列出文件名"
ef317cd5 10742
a4f16749 10743#: builtin/ls-tree.c:142
ef317cd5 10744msgid "use full path names"
07432cef 10745msgstr "使用文件的全路径"
ef317cd5 10746
a4f16749 10747#: builtin/ls-tree.c:144
ef317cd5 10748msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 10749msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5 10750
a4f16749
JX
10751#: builtin/mailsplit.c:241
10752#, c-format
10753msgid "empty mbox: '%s'"
10754msgstr "空的 mbox:'%s'"
10755
fd8cb379 10756#: builtin/merge.c:51
814ff314
JX
10757msgid "git merge [<options>] [<commit>...]"
10758msgstr "git merge [<选项>] [<提交>...]"
ef317cd5 10759
fd8cb379 10760#: builtin/merge.c:52
ef317cd5 10761msgid "git merge --abort"
07432cef 10762msgstr "git merge --abort"
ef317cd5 10763
fd8cb379 10764#: builtin/merge.c:53
1a79b2f1
JX
10765msgid "git merge --continue"
10766msgstr "git merge --continue"
10767
fd8cb379 10768#: builtin/merge.c:110
c04f5ac3
JX
10769msgid "switch `m' requires a value"
10770msgstr "开关 `m' 需要一个值"
10771
fd8cb379 10772#: builtin/merge.c:147
c04f5ac3
JX
10773#, c-format
10774msgid "Could not find merge strategy '%s'.\n"
90e6ef53 10775msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 10776
fd8cb379 10777#: builtin/merge.c:148
c04f5ac3
JX
10778#, c-format
10779msgid "Available strategies are:"
10780msgstr "可用的策略有:"
10781
fd8cb379 10782#: builtin/merge.c:153
c04f5ac3
JX
10783#, c-format
10784msgid "Available custom strategies are:"
10785msgstr "可用的自定义策略有:"
10786
fd8cb379 10787#: builtin/merge.c:203 builtin/pull.c:142
ef317cd5 10788msgid "do not show a diffstat at the end of the merge"
07432cef 10789msgstr "在合并的最后不显示差异统计"
ef317cd5 10790
fd8cb379 10791#: builtin/merge.c:206 builtin/pull.c:145
ef317cd5 10792msgid "show a diffstat at the end of the merge"
07432cef 10793msgstr "在合并的最后显示差异统计"
ef317cd5 10794
fd8cb379 10795#: builtin/merge.c:207 builtin/pull.c:148
ef317cd5 10796msgid "(synonym to --stat)"
07432cef 10797msgstr "(和 --stat 同义)"
ef317cd5 10798
fd8cb379 10799#: builtin/merge.c:209 builtin/pull.c:151
ef317cd5 10800msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 10801msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 10802
fd8cb379 10803#: builtin/merge.c:212 builtin/pull.c:157
ef317cd5 10804msgid "create a single commit instead of doing a merge"
07432cef 10805msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 10806
fd8cb379 10807#: builtin/merge.c:214 builtin/pull.c:160
ef317cd5 10808msgid "perform a commit if the merge succeeds (default)"
07432cef 10809msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 10810
fd8cb379 10811#: builtin/merge.c:216 builtin/pull.c:163
ef317cd5 10812msgid "edit message before committing"
07432cef 10813msgstr "在提交前编辑提交说明"
ef317cd5 10814
fd8cb379 10815#: builtin/merge.c:217
ef317cd5 10816msgid "allow fast-forward (default)"
07432cef 10817msgstr "允许快进(默认)"
ef317cd5 10818
fd8cb379 10819#: builtin/merge.c:219 builtin/pull.c:169
ef317cd5 10820msgid "abort if fast-forward is not possible"
07432cef 10821msgstr "如果不能快进就放弃合并"
ef317cd5 10822
fd8cb379 10823#: builtin/merge.c:223 builtin/pull.c:172
5c57d762 10824msgid "verify that the named commit has a valid GPG signature"
1003b3a5
JX
10825msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
10826
fd8cb379 10827#: builtin/merge.c:224 builtin/notes.c:777 builtin/pull.c:176
a4f16749 10828#: builtin/revert.c:109
ef317cd5 10829msgid "strategy"
07432cef 10830msgstr "策略"
ef317cd5 10831
fd8cb379 10832#: builtin/merge.c:225 builtin/pull.c:177
ef317cd5 10833msgid "merge strategy to use"
07432cef 10834msgstr "要使用的合并策略"
ef317cd5 10835
fd8cb379 10836#: builtin/merge.c:226 builtin/pull.c:180
ef317cd5 10837msgid "option=value"
07432cef 10838msgstr "option=value"
ef317cd5 10839
fd8cb379 10840#: builtin/merge.c:227 builtin/pull.c:181
ef317cd5 10841msgid "option for selected merge strategy"
07432cef 10842msgstr "所选的合并策略的选项"
ef317cd5 10843
fd8cb379 10844#: builtin/merge.c:229
ef317cd5 10845msgid "merge commit message (for a non-fast-forward merge)"
07432cef 10846msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 10847
fd8cb379 10848#: builtin/merge.c:233
ef317cd5 10849msgid "abort the current in-progress merge"
07432cef 10850msgstr "放弃当前正在进行的合并"
ef317cd5 10851
fd8cb379 10852#: builtin/merge.c:235
1a79b2f1
JX
10853msgid "continue the current in-progress merge"
10854msgstr "继续当前正在进行的合并"
10855
fd8cb379 10856#: builtin/merge.c:237 builtin/pull.c:188
5b04ee3b
JX
10857msgid "allow merging unrelated histories"
10858msgstr "允许合并不相关的历史"
10859
fd8cb379 10860#: builtin/merge.c:243
6937cb4e
JX
10861msgid "verify commit-msg hook"
10862msgstr "校验 commit-msg 钩子"
10863
fd8cb379 10864#: builtin/merge.c:268
c04f5ac3 10865msgid "could not run stash."
a4f16749 10866msgstr "不能运行贮藏。"
c04f5ac3 10867
fd8cb379 10868#: builtin/merge.c:273
c04f5ac3 10869msgid "stash failed"
a4f16749 10870msgstr "贮藏失败"
c04f5ac3 10871
fd8cb379 10872#: builtin/merge.c:278
c04f5ac3
JX
10873#, c-format
10874msgid "not a valid object: %s"
10875msgstr "不是一个有效对象:%s"
10876
fd8cb379 10877#: builtin/merge.c:300 builtin/merge.c:317
c04f5ac3
JX
10878msgid "read-tree failed"
10879msgstr "读取树失败"
10880
90e6ef53 10881# 译者:注意保持前导空格
fd8cb379 10882#: builtin/merge.c:347
c04f5ac3
JX
10883msgid " (nothing to squash)"
10884msgstr " (无可压缩)"
10885
fd8cb379 10886#: builtin/merge.c:358
c04f5ac3
JX
10887#, c-format
10888msgid "Squash commit -- not updating HEAD\n"
10889msgstr "压缩提交 -- 未更新 HEAD\n"
10890
fd8cb379 10891#: builtin/merge.c:408
c04f5ac3
JX
10892#, c-format
10893msgid "No merge message -- not updating HEAD\n"
10894msgstr "无合并信息 -- 未更新 HEAD\n"
10895
fd8cb379 10896#: builtin/merge.c:458
c04f5ac3
JX
10897#, c-format
10898msgid "'%s' does not point to a commit"
10899msgstr "'%s' 没有指向一个提交"
10900
fd8cb379 10901#: builtin/merge.c:548
c04f5ac3
JX
10902#, c-format
10903msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 10904msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 10905
fd8cb379 10906#: builtin/merge.c:669
c04f5ac3 10907msgid "Not handling anything other than two heads merge."
29004bbb 10908msgstr "未处理两个头合并之外的任何操作。"
c04f5ac3 10909
fd8cb379 10910#: builtin/merge.c:683
c04f5ac3
JX
10911#, c-format
10912msgid "Unknown option for merge-recursive: -X%s"
10913msgstr "merge-recursive 的未知选项:-X%s"
10914
fd8cb379 10915#: builtin/merge.c:698
c04f5ac3
JX
10916#, c-format
10917msgid "unable to write %s"
10918msgstr "不能写 %s"
10919
31e5e17b 10920#: builtin/merge.c:749
c04f5ac3
JX
10921#, c-format
10922msgid "Could not read from '%s'"
10923msgstr "不能从 '%s' 读取"
10924
31e5e17b 10925#: builtin/merge.c:758
c04f5ac3
JX
10926#, c-format
10927msgid "Not committing merge; use 'git commit' to complete the merge.\n"
10928msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
10929
31e5e17b 10930#: builtin/merge.c:764
a77c07d9 10931#, c-format
c04f5ac3
JX
10932msgid ""
10933"Please enter a commit message to explain why this merge is necessary,\n"
10934"especially if it merges an updated upstream into a topic branch.\n"
10935"\n"
a77c07d9 10936"Lines starting with '%c' will be ignored, and an empty message aborts\n"
c04f5ac3
JX
10937"the commit.\n"
10938msgstr ""
10939"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
10940"合并到主题分支。\n"
10941"\n"
a77c07d9 10942"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
c04f5ac3 10943
31e5e17b 10944#: builtin/merge.c:800
c04f5ac3
JX
10945msgid "Empty commit message."
10946msgstr "空提交信息。"
10947
fd8cb379 10948#: builtin/merge.c:819
c04f5ac3
JX
10949#, c-format
10950msgid "Wonderful.\n"
10951msgstr "太棒了。\n"
10952
fd8cb379 10953#: builtin/merge.c:872
c04f5ac3
JX
10954#, c-format
10955msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
10956msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
10957
fd8cb379 10958#: builtin/merge.c:911
c04f5ac3 10959msgid "No current branch."
90e6ef53 10960msgstr "没有当前分支。"
c04f5ac3 10961
fd8cb379 10962#: builtin/merge.c:913
c04f5ac3 10963msgid "No remote for the current branch."
160fb2b2 10964msgstr "当前分支没有对应的远程仓库。"
c04f5ac3 10965
fd8cb379 10966#: builtin/merge.c:915
c04f5ac3 10967msgid "No default upstream defined for the current branch."
90e6ef53 10968msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 10969
fd8cb379 10970#: builtin/merge.c:920
170e9899 10971#, c-format
2e8451e8
JX
10972msgid "No remote-tracking branch for %s from %s"
10973msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 10974
fd8cb379 10975#: builtin/merge.c:973
5c57d762
JX
10976#, c-format
10977msgid "Bad value '%s' in environment '%s'"
9a4b694c 10978msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
5c57d762 10979
fd8cb379 10980#: builtin/merge.c:1075
5c57d762
JX
10981#, c-format
10982msgid "not something we can merge in %s: %s"
10983msgstr "不能在 %s 中合并:%s"
10984
fd8cb379 10985#: builtin/merge.c:1109
5c57d762
JX
10986msgid "not something we can merge"
10987msgstr "不能合并"
10988
fd8cb379 10989#: builtin/merge.c:1211
1a79b2f1
JX
10990msgid "--abort expects no arguments"
10991msgstr "--abort 不带参数"
10992
fd8cb379 10993#: builtin/merge.c:1215
c04f5ac3 10994msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 10995msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 10996
fd8cb379 10997#: builtin/merge.c:1227
1a79b2f1
JX
10998msgid "--continue expects no arguments"
10999msgstr "--continue 不带参数"
11000
fd8cb379 11001#: builtin/merge.c:1231
1a79b2f1
JX
11002msgid "There is no merge in progress (MERGE_HEAD missing)."
11003msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
11004
fd8cb379 11005#: builtin/merge.c:1247
c04f5ac3
JX
11006msgid ""
11007"You have not concluded your merge (MERGE_HEAD exists).\n"
220c313c 11008"Please, commit your changes before you merge."
c04f5ac3
JX
11009msgstr ""
11010"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 11011"请在合并前先提交您的修改。"
c04f5ac3 11012
fd8cb379 11013#: builtin/merge.c:1254
c04f5ac3
JX
11014msgid ""
11015"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
220c313c 11016"Please, commit your changes before you merge."
c04f5ac3
JX
11017msgstr ""
11018"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 11019"请在合并前先提交您的修改。"
c04f5ac3 11020
fd8cb379 11021#: builtin/merge.c:1257
c04f5ac3
JX
11022msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
11023msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
11024
fd8cb379 11025#: builtin/merge.c:1266
c04f5ac3 11026msgid "You cannot combine --squash with --no-ff."
649900bc 11027msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 11028
fd8cb379 11029#: builtin/merge.c:1274
c04f5ac3 11030msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 11031msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 11032
fd8cb379 11033#: builtin/merge.c:1291
c04f5ac3
JX
11034msgid "Squash commit into empty head not supported yet"
11035msgstr "尚不支持到空分支的压缩提交"
11036
fd8cb379 11037#: builtin/merge.c:1293
c04f5ac3
JX
11038msgid "Non-fast-forward commit does not make sense into an empty head"
11039msgstr "到空分支的非快进式提交没有意义"
11040
fd8cb379 11041#: builtin/merge.c:1298
2e8451e8
JX
11042#, c-format
11043msgid "%s - not something we can merge"
11044msgstr "%s - 不能被合并"
11045
fd8cb379 11046#: builtin/merge.c:1300
7aea43ff
JX
11047msgid "Can merge only exactly one commit into empty head"
11048msgstr "只能将一个提交合并到空分支上"
11049
fd8cb379 11050#: builtin/merge.c:1334
1003b3a5
JX
11051#, c-format
11052msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
11053msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
11054
fd8cb379 11055#: builtin/merge.c:1337
1003b3a5
JX
11056#, c-format
11057msgid "Commit %s has a bad GPG signature allegedly by %s."
11058msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
11059
fd8cb379 11060#: builtin/merge.c:1340
1003b3a5
JX
11061#, c-format
11062msgid "Commit %s does not have a GPG signature."
11063msgstr "提交 %s 没有一个 GPG 签名。"
11064
fd8cb379 11065#: builtin/merge.c:1343
1003b3a5
JX
11066#, c-format
11067msgid "Commit %s has a good GPG signature by %s\n"
11068msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
11069
fd8cb379 11070#: builtin/merge.c:1402
5b04ee3b
JX
11071msgid "refusing to merge unrelated histories"
11072msgstr "拒绝合并无关的历史"
11073
fd8cb379 11074#: builtin/merge.c:1411
6937cb4e 11075msgid "Already up to date."
5c57d762
JX
11076msgstr "已经是最新的。"
11077
fd8cb379 11078#: builtin/merge.c:1421
c04f5ac3
JX
11079#, c-format
11080msgid "Updating %s..%s\n"
11081msgstr "更新 %s..%s\n"
11082
fd8cb379 11083#: builtin/merge.c:1462
c04f5ac3
JX
11084#, c-format
11085msgid "Trying really trivial in-index merge...\n"
90e6ef53 11086msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 11087
fd8cb379 11088#: builtin/merge.c:1469
c04f5ac3
JX
11089#, c-format
11090msgid "Nope.\n"
11091msgstr "无。\n"
11092
fd8cb379 11093#: builtin/merge.c:1494
6937cb4e 11094msgid "Already up to date. Yeeah!"
5c57d762
JX
11095msgstr "已经是最新的。耶!"
11096
fd8cb379 11097#: builtin/merge.c:1500
c04f5ac3 11098msgid "Not possible to fast-forward, aborting."
1aabac65 11099msgstr "无法快进,终止。"
c04f5ac3 11100
fd8cb379 11101#: builtin/merge.c:1523 builtin/merge.c:1602
c04f5ac3
JX
11102#, c-format
11103msgid "Rewinding the tree to pristine...\n"
11104msgstr "将树回滚至原始状态...\n"
11105
fd8cb379 11106#: builtin/merge.c:1527
c04f5ac3
JX
11107#, c-format
11108msgid "Trying merge strategy %s...\n"
11109msgstr "尝试合并策略 %s...\n"
11110
fd8cb379 11111#: builtin/merge.c:1593
c04f5ac3
JX
11112#, c-format
11113msgid "No merge strategy handled the merge.\n"
11114msgstr "没有合并策略处理此合并。\n"
11115
fd8cb379 11116#: builtin/merge.c:1595
c04f5ac3
JX
11117#, c-format
11118msgid "Merge with strategy %s failed.\n"
11119msgstr "使用策略 %s 合并失败。\n"
11120
fd8cb379 11121#: builtin/merge.c:1604
c04f5ac3
JX
11122#, c-format
11123msgid "Using the %s to prepare resolving by hand.\n"
11124msgstr "使用 %s 以准备手工解决。\n"
11125
fd8cb379 11126#: builtin/merge.c:1616
c04f5ac3
JX
11127#, c-format
11128msgid "Automatic merge went well; stopped before committing as requested\n"
11129msgstr "自动合并进展顺利,按要求在提交前停止\n"
11130
a4f16749 11131#: builtin/merge-base.c:30
814ff314
JX
11132msgid "git merge-base [-a | --all] <commit> <commit>..."
11133msgstr "git merge-base [-a | --all] <提交> <提交>..."
ef317cd5 11134
a4f16749 11135#: builtin/merge-base.c:31
814ff314
JX
11136msgid "git merge-base [-a | --all] --octopus <commit>..."
11137msgstr "git merge-base [-a | --all] --octopus <提交>..."
ef317cd5 11138
a4f16749 11139#: builtin/merge-base.c:32
ef317cd5 11140msgid "git merge-base --independent <commit>..."
07432cef 11141msgstr "git merge-base --independent <提交>..."
ef317cd5 11142
a4f16749 11143#: builtin/merge-base.c:33
ef317cd5 11144msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 11145msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5 11146
a4f16749 11147#: builtin/merge-base.c:34
cfff71a9 11148msgid "git merge-base --fork-point <ref> [<commit>]"
d9d56b23 11149msgstr "git merge-base --fork-point <引用> [<提交>]"
cfff71a9 11150
5809aa05 11151#: builtin/merge-base.c:220
ef317cd5 11152msgid "output all common ancestors"
07432cef 11153msgstr "输出所有共同的祖先"
ef317cd5 11154
5809aa05 11155#: builtin/merge-base.c:222
ef317cd5 11156msgid "find ancestors for a single n-way merge"
07432cef 11157msgstr "查找一个多路合并的祖先提交"
ef317cd5 11158
5809aa05 11159#: builtin/merge-base.c:224
ef317cd5 11160msgid "list revs not reachable from others"
07432cef 11161msgstr "显示不能被其他访问到的版本"
ef317cd5 11162
5809aa05 11163#: builtin/merge-base.c:226
ef317cd5 11164msgid "is the first one ancestor of the other?"
07432cef 11165msgstr "第一个是其他的祖先提交么?"
ef317cd5 11166
5809aa05 11167#: builtin/merge-base.c:228
cfff71a9 11168msgid "find where <commit> forked from reflog of <ref>"
e397e7e3 11169msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
cfff71a9 11170
a4f16749 11171#: builtin/merge-file.c:9
ef317cd5 11172msgid ""
814ff314
JX
11173"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
11174"<orig-file> <file2>"
ef317cd5 11175msgstr ""
814ff314
JX
11176"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
11177"件> <文件2>"
ef317cd5 11178
a4f16749 11179#: builtin/merge-file.c:33
ef317cd5 11180msgid "send results to standard output"
07432cef 11181msgstr "将结果发送到标准输出"
ef317cd5 11182
a4f16749 11183#: builtin/merge-file.c:34
ef317cd5 11184msgid "use a diff3 based merge"
07432cef 11185msgstr "使用基于 diff3 的合并"
ef317cd5 11186
a4f16749 11187#: builtin/merge-file.c:35
ef317cd5 11188msgid "for conflicts, use our version"
07432cef 11189msgstr "如果冲突,使用我们的版本"
ef317cd5 11190
a4f16749 11191#: builtin/merge-file.c:37
ef317cd5 11192msgid "for conflicts, use their version"
07432cef 11193msgstr "如果冲突,使用他们的版本"
ef317cd5 11194
a4f16749 11195#: builtin/merge-file.c:39
ef317cd5 11196msgid "for conflicts, use a union version"
07432cef 11197msgstr "如果冲突,使用联合版本"
ef317cd5 11198
a4f16749 11199#: builtin/merge-file.c:42
ef317cd5 11200msgid "for conflicts, use this marker size"
07432cef 11201msgstr "如果冲突,使用指定长度的标记"
ef317cd5 11202
a4f16749 11203#: builtin/merge-file.c:43
ef317cd5 11204msgid "do not warn about conflicts"
07432cef 11205msgstr "不要警告冲突"
ef317cd5 11206
a4f16749 11207#: builtin/merge-file.c:45
814ff314
JX
11208msgid "set labels for file1/orig-file/file2"
11209msgstr "为 文件1/初始文件/文件2 设置标签"
c04f5ac3 11210
a0b6b246
JX
11211#: builtin/merge-recursive.c:45
11212#, c-format
11213msgid "unknown option %s"
11214msgstr "未知选项 %s"
11215
11216#: builtin/merge-recursive.c:51
11217#, c-format
11218msgid "could not parse object '%s'"
11219msgstr "不能解析对象 '%s'"
11220
11221#: builtin/merge-recursive.c:55
11222#, c-format
11223msgid "cannot handle more than %d base. Ignoring %s."
11224msgid_plural "cannot handle more than %d bases. Ignoring %s."
11225msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
11226msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
11227
11228#: builtin/merge-recursive.c:63
11229msgid "not handling anything other than two heads merge."
11230msgstr "不能处理两个头合并之外的任何操作。"
11231
11232#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
11233#, c-format
11234msgid "could not resolve ref '%s'"
11235msgstr "无法解析引用 '%s'"
11236
11237#: builtin/merge-recursive.c:77
11238#, c-format
11239msgid "Merging %s with %s\n"
11240msgstr "合并 %s 和 %s\n"
11241
276ceeaa 11242#: builtin/mktree.c:65
ef317cd5 11243msgid "git mktree [-z] [--missing] [--batch]"
07432cef 11244msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 11245
a4f16749 11246#: builtin/mktree.c:153
ef317cd5 11247msgid "input is NUL terminated"
07432cef 11248msgstr "输入以 NUL 字符终止"
c04f5ac3 11249
a4f16749 11250#: builtin/mktree.c:154 builtin/write-tree.c:25
ef317cd5 11251msgid "allow missing objects"
07432cef 11252msgstr "允许丢失的对象"
c04f5ac3 11253
a4f16749 11254#: builtin/mktree.c:155
ef317cd5 11255msgid "allow creation of more than one tree"
07432cef 11256msgstr "允许创建一个以上的树"
c04f5ac3 11257
a4f16749 11258#: builtin/mv.c:17
814ff314
JX
11259msgid "git mv [<options>] <source>... <destination>"
11260msgstr "git mv [<选项>] <源>... <目标>"
c04f5ac3 11261
fd8cb379 11262#: builtin/mv.c:82
220c313c
JX
11263#, c-format
11264msgid "Directory %s is in index and no submodule?"
11265msgstr "目录 %s 在索引中并且不是子模组?"
11266
fd8cb379 11267#: builtin/mv.c:84 builtin/rm.c:288
220c313c 11268msgid "Please stage your changes to .gitmodules or stash them to proceed"
a4f16749 11269msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
220c313c 11270
fd8cb379 11271#: builtin/mv.c:102
220c313c
JX
11272#, c-format
11273msgid "%.*s is in index"
11274msgstr "%.*s 在索引中"
11275
fd8cb379 11276#: builtin/mv.c:124
ef317cd5 11277msgid "force move/rename even if target exists"
07432cef 11278msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 11279
fd8cb379 11280#: builtin/mv.c:126
ef317cd5 11281msgid "skip move/rename errors"
07432cef 11282msgstr "跳过移动/重命名错误"
c04f5ac3 11283
31e5e17b 11284#: builtin/mv.c:168
220c313c
JX
11285#, c-format
11286msgid "destination '%s' is not a directory"
11287msgstr "目标 '%s' 不是一个目录"
11288
31e5e17b 11289#: builtin/mv.c:179
c04f5ac3
JX
11290#, c-format
11291msgid "Checking rename of '%s' to '%s'\n"
11292msgstr "检查 '%s' 到 '%s' 的重命名\n"
11293
31e5e17b 11294#: builtin/mv.c:183
c04f5ac3
JX
11295msgid "bad source"
11296msgstr "坏的源"
11297
31e5e17b 11298#: builtin/mv.c:186
c04f5ac3
JX
11299msgid "can not move directory into itself"
11300msgstr "不能将目录移动到自身"
11301
31e5e17b 11302#: builtin/mv.c:189
c04f5ac3
JX
11303msgid "cannot move directory over file"
11304msgstr "不能将目录移动到文件"
11305
31e5e17b 11306#: builtin/mv.c:198
c04f5ac3
JX
11307msgid "source directory is empty"
11308msgstr "源目录为空"
11309
31e5e17b 11310#: builtin/mv.c:223
c04f5ac3
JX
11311msgid "not under version control"
11312msgstr "不在版本控制之下"
11313
31e5e17b 11314#: builtin/mv.c:226
c04f5ac3
JX
11315msgid "destination exists"
11316msgstr "目标已存在"
11317
31e5e17b 11318#: builtin/mv.c:234
c04f5ac3
JX
11319#, c-format
11320msgid "overwriting '%s'"
11321msgstr "覆盖 '%s'"
11322
31e5e17b 11323#: builtin/mv.c:237
c04f5ac3
JX
11324msgid "Cannot overwrite"
11325msgstr "不能覆盖"
11326
31e5e17b 11327#: builtin/mv.c:240
c04f5ac3
JX
11328msgid "multiple sources for the same target"
11329msgstr "同一目标具有多个源"
11330
31e5e17b 11331#: builtin/mv.c:242
cfff71a9
JX
11332msgid "destination directory does not exist"
11333msgstr "目标目录不存在"
11334
31e5e17b 11335#: builtin/mv.c:249
c04f5ac3
JX
11336#, c-format
11337msgid "%s, source=%s, destination=%s"
11338msgstr "%s,源=%s,目标=%s"
11339
31e5e17b 11340#: builtin/mv.c:270
c04f5ac3
JX
11341#, c-format
11342msgid "Renaming %s to %s\n"
11343msgstr "重命名 %s 至 %s\n"
11344
fd8cb379 11345#: builtin/mv.c:276 builtin/remote.c:715 builtin/repack.c:409
c04f5ac3
JX
11346#, c-format
11347msgid "renaming '%s' failed"
11348msgstr "重命名 '%s' 失败"
11349
a4f16749 11350#: builtin/name-rev.c:338
814ff314
JX
11351msgid "git name-rev [<options>] <commit>..."
11352msgstr "git name-rev [<选项>] <提交>..."
ef317cd5 11353
a4f16749 11354#: builtin/name-rev.c:339
814ff314
JX
11355msgid "git name-rev [<options>] --all"
11356msgstr "git name-rev [<选项>] --all"
ef317cd5 11357
a4f16749 11358#: builtin/name-rev.c:340
814ff314
JX
11359msgid "git name-rev [<options>] --stdin"
11360msgstr "git name-rev [<选项>] --stdin"
ef317cd5 11361
a4f16749 11362#: builtin/name-rev.c:395
ef317cd5 11363msgid "print only names (no SHA-1)"
07432cef 11364msgstr "只打印名称(无 SHA-1)"
ef317cd5 11365
a4f16749 11366#: builtin/name-rev.c:396
ef317cd5 11367msgid "only use tags to name the commits"
55a16ee4 11368msgstr "只使用标签来命名提交"
ef317cd5 11369
a4f16749 11370#: builtin/name-rev.c:398
ef317cd5 11371msgid "only use refs matching <pattern>"
07432cef 11372msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 11373
a4f16749 11374#: builtin/name-rev.c:400
87cb7997
JX
11375msgid "ignore refs matching <pattern>"
11376msgstr "忽略和 <模式> 相匹配的引用"
11377
a4f16749 11378#: builtin/name-rev.c:402
ef317cd5 11379msgid "list all commits reachable from all refs"
07432cef 11380msgstr "列出可以从所有引用访问的提交"
ef317cd5 11381
a4f16749 11382#: builtin/name-rev.c:403
ef317cd5 11383msgid "read from stdin"
07432cef 11384msgstr "从标准输入读取"
ef317cd5 11385
a4f16749 11386#: builtin/name-rev.c:404
90314792
JX
11387msgid "allow to print `undefined` names (default)"
11388msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 11389
a4f16749 11390#: builtin/name-rev.c:410
2e8451e8 11391msgid "dereference tags in the input (internal use)"
55a16ee4 11392msgstr "反向解析输入中的标签(内部使用)"
2e8451e8 11393
a4f16749 11394#: builtin/notes.c:26
814ff314 11395msgid "git notes [--ref <notes-ref>] [list [<object>]]"
07432cef 11396msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 11397
a4f16749 11398#: builtin/notes.c:27
ef317cd5 11399msgid ""
814ff314 11400"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
04cb2f28 11401"| (-c | -C) <object>] [<object>]"
ef317cd5 11402msgstr ""
04cb2f28
JX
11403"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
11404"| (-c | -C) <对象>] [<对象>]"
ef317cd5 11405
a4f16749 11406#: builtin/notes.c:28
814ff314 11407msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
07432cef 11408msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 11409
a4f16749 11410#: builtin/notes.c:29
ef317cd5 11411msgid ""
814ff314 11412"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
04cb2f28 11413"(-c | -C) <object>] [<object>]"
ef317cd5 11414msgstr ""
04cb2f28
JX
11415"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
11416"(-c | -C) <对象>] [<对象>]"
ef317cd5 11417
a4f16749 11418#: builtin/notes.c:30
814ff314 11419msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
04cb2f28 11420msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
ef317cd5 11421
a4f16749 11422#: builtin/notes.c:31
814ff314 11423msgid "git notes [--ref <notes-ref>] show [<object>]"
07432cef 11424msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 11425
a4f16749 11426#: builtin/notes.c:32
ef317cd5 11427msgid ""
814ff314 11428"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
07432cef 11429msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 11430
a4f16749 11431#: builtin/notes.c:33
ef317cd5 11432msgid "git notes merge --commit [-v | -q]"
07432cef 11433msgstr "git notes merge --commit [-v | -q]"
ef317cd5 11434
a4f16749 11435#: builtin/notes.c:34
ef317cd5 11436msgid "git notes merge --abort [-v | -q]"
07432cef 11437msgstr "git notes merge --abort [-v | -q]"
ef317cd5 11438
a4f16749 11439#: builtin/notes.c:35
814ff314 11440msgid "git notes [--ref <notes-ref>] remove [<object>...]"
07432cef 11441msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 11442
a4f16749 11443#: builtin/notes.c:36
5809aa05
JX
11444msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
11445msgstr "git notes [--ref <注解引用>] prune [-n] [-v]"
ef317cd5 11446
a4f16749 11447#: builtin/notes.c:37
814ff314 11448msgid "git notes [--ref <notes-ref>] get-ref"
07432cef 11449msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 11450
a4f16749 11451#: builtin/notes.c:42
ef317cd5 11452msgid "git notes [list [<object>]]"
07432cef 11453msgstr "git notes [list [<对象>]]"
ef317cd5 11454
a4f16749 11455#: builtin/notes.c:47
ef317cd5 11456msgid "git notes add [<options>] [<object>]"
07432cef 11457msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 11458
a4f16749 11459#: builtin/notes.c:52
ef317cd5 11460msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 11461msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 11462
a4f16749 11463#: builtin/notes.c:53
ef317cd5 11464msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 11465msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 11466
a4f16749 11467#: builtin/notes.c:58
ef317cd5 11468msgid "git notes append [<options>] [<object>]"
07432cef 11469msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 11470
a4f16749 11471#: builtin/notes.c:63
ef317cd5 11472msgid "git notes edit [<object>]"
07432cef 11473msgstr "git notes edit [<对象>]"
ef317cd5 11474
a4f16749 11475#: builtin/notes.c:68
ef317cd5 11476msgid "git notes show [<object>]"
07432cef 11477msgstr "git notes show [<对象>]"
ef317cd5 11478
a4f16749 11479#: builtin/notes.c:73
814ff314 11480msgid "git notes merge [<options>] <notes-ref>"
07432cef 11481msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 11482
a4f16749 11483#: builtin/notes.c:74
ef317cd5 11484msgid "git notes merge --commit [<options>]"
07432cef 11485msgstr "git notes merge --commit [<选项>]"
ef317cd5 11486
a4f16749 11487#: builtin/notes.c:75
ef317cd5 11488msgid "git notes merge --abort [<options>]"
07432cef 11489msgstr "git notes merge --abort [<选项>]"
ef317cd5 11490
a4f16749 11491#: builtin/notes.c:80
ef317cd5 11492msgid "git notes remove [<object>]"
07432cef 11493msgstr "git notes remove [<对象>]"
ef317cd5 11494
a4f16749 11495#: builtin/notes.c:85
ef317cd5 11496msgid "git notes prune [<options>]"
07432cef 11497msgstr "git notes prune [<选项>]"
ef317cd5 11498
a4f16749 11499#: builtin/notes.c:90
ef317cd5 11500msgid "git notes get-ref"
07432cef 11501msgstr "git notes get-ref"
ef317cd5 11502
a4f16749 11503#: builtin/notes.c:95
5c57d762
JX
11504msgid "Write/edit the notes for the following object:"
11505msgstr "为下面的对象写/编辑说明:"
11506
a4f16749 11507#: builtin/notes.c:148
c04f5ac3
JX
11508#, c-format
11509msgid "unable to start 'show' for object '%s'"
11510msgstr "不能为对象 '%s' 开始 'show'"
11511
a4f16749 11512#: builtin/notes.c:152
a77c07d9
JX
11513msgid "could not read 'show' output"
11514msgstr "不能读取 'show' 的输出"
c04f5ac3 11515
a4f16749 11516#: builtin/notes.c:160
c04f5ac3
JX
11517#, c-format
11518msgid "failed to finish 'show' for object '%s'"
11519msgstr "无法为对象 '%s' 完成 'show'"
11520
a4f16749 11521#: builtin/notes.c:195
a0b6b246 11522msgid "please supply the note contents using either -m or -F option"
c04f5ac3
JX
11523msgstr "请通过 -m 或 -F 选项为注解提供内容"
11524
a4f16749 11525#: builtin/notes.c:204
c04f5ac3
JX
11526msgid "unable to write note object"
11527msgstr "不能写注解对象"
11528
a4f16749 11529#: builtin/notes.c:206
c04f5ac3 11530#, c-format
a0b6b246 11531msgid "the note contents have been left in %s"
220c313c 11532msgstr "注解内容被留在 %s 中"
c04f5ac3 11533
fd8cb379 11534#: builtin/notes.c:234 builtin/tag.c:507
c04f5ac3
JX
11535#, c-format
11536msgid "cannot read '%s'"
11537msgstr "不能读取 '%s'"
11538
fd8cb379 11539#: builtin/notes.c:236 builtin/tag.c:510
c04f5ac3
JX
11540#, c-format
11541msgid "could not open or read '%s'"
11542msgstr "不能打开或读取 '%s'"
11543
a4f16749 11544#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
6937cb4e
JX
11545#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
11546#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
a0b6b246
JX
11547#, c-format
11548msgid "failed to resolve '%s' as a valid ref."
11549msgstr "无法解析 '%s' 为一个有效引用。"
11550
a4f16749 11551#: builtin/notes.c:258
c04f5ac3 11552#, c-format
a0b6b246 11553msgid "failed to read object '%s'."
c04f5ac3
JX
11554msgstr "无法读取对象 '%s'。"
11555
a4f16749 11556#: builtin/notes.c:262
6c94aba5 11557#, c-format
a0b6b246
JX
11558msgid "cannot read note data from non-blob object '%s'."
11559msgstr "不能从非数据对象 '%s' 中读取注解数据。"
11560
a4f16749 11561#: builtin/notes.c:302
a0b6b246
JX
11562#, c-format
11563msgid "malformed input line: '%s'."
fd8cb379 11564msgstr "格式错误的输入行:'%s'。"
a0b6b246 11565
a4f16749 11566#: builtin/notes.c:317
a0b6b246
JX
11567#, c-format
11568msgid "failed to copy notes from '%s' to '%s'"
11569msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
6c94aba5 11570
a4f16749
JX
11571#. TRANSLATORS: the first %s will be replaced by a git
11572#. notes command: 'add', 'merge', 'remove', etc.
11573#.
6937cb4e 11574#: builtin/notes.c:349
a0b6b246
JX
11575#, c-format
11576msgid "refusing to %s notes in %s (outside of refs/notes/)"
11577msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
11578
6937cb4e
JX
11579#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
11580#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
11581#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
c04f5ac3
JX
11582msgid "too many parameters"
11583msgstr "参数太多"
11584
6937cb4e 11585#: builtin/notes.c:382 builtin/notes.c:668
c04f5ac3 11586#, c-format
a0b6b246 11587msgid "no note found for object %s."
c04f5ac3
JX
11588msgstr "未发现对象 %s 的注解。"
11589
6937cb4e 11590#: builtin/notes.c:403 builtin/notes.c:566
ef317cd5 11591msgid "note contents as a string"
07432cef 11592msgstr "注解内容作为一个字符串"
ef317cd5 11593
6937cb4e 11594#: builtin/notes.c:406 builtin/notes.c:569
ef317cd5 11595msgid "note contents in a file"
07432cef 11596msgstr "注解内容到一个文件中"
ef317cd5 11597
6937cb4e 11598#: builtin/notes.c:409 builtin/notes.c:572
ef317cd5 11599msgid "reuse and edit specified note object"
07432cef 11600msgstr "重用和编辑指定的注解对象"
ef317cd5 11601
6937cb4e 11602#: builtin/notes.c:412 builtin/notes.c:575
ef317cd5 11603msgid "reuse specified note object"
07432cef 11604msgstr "重用指定的注解对象"
ef317cd5 11605
6937cb4e 11606#: builtin/notes.c:415 builtin/notes.c:578
04cb2f28
JX
11607msgid "allow storing empty note"
11608msgstr "允许保存空白注释"
11609
6937cb4e 11610#: builtin/notes.c:416 builtin/notes.c:487
ef317cd5 11611msgid "replace existing notes"
07432cef 11612msgstr "替换已存在的注解"
ef317cd5 11613
6937cb4e 11614#: builtin/notes.c:441
c04f5ac3
JX
11615#, c-format
11616msgid ""
11617"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
11618"existing notes"
11619msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
11620
6937cb4e 11621#: builtin/notes.c:456 builtin/notes.c:535
c04f5ac3
JX
11622#, c-format
11623msgid "Overwriting existing notes for object %s\n"
11624msgstr "覆盖对象 %s 现存注解\n"
11625
6937cb4e 11626#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
04cb2f28
JX
11627#, c-format
11628msgid "Removing note for object %s\n"
11629msgstr "删除对象 %s 的注解\n"
11630
6937cb4e 11631#: builtin/notes.c:488
ef317cd5 11632msgid "read objects from stdin"
07432cef 11633msgstr "从标准输入读取对象"
ef317cd5 11634
6937cb4e 11635#: builtin/notes.c:490
ef317cd5 11636msgid "load rewriting config for <command> (implies --stdin)"
07432cef 11637msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 11638
6937cb4e 11639#: builtin/notes.c:508
c04f5ac3
JX
11640msgid "too few parameters"
11641msgstr "参数太少"
11642
6937cb4e 11643#: builtin/notes.c:529
c04f5ac3
JX
11644#, c-format
11645msgid ""
11646"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
11647"existing notes"
11648msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
11649
6937cb4e 11650#: builtin/notes.c:541
c04f5ac3 11651#, c-format
a0b6b246 11652msgid "missing notes on source object %s. Cannot copy."
c04f5ac3
JX
11653msgstr "源对象 %s 缺少注解。不能拷贝。"
11654
6937cb4e 11655#: builtin/notes.c:593
ef317cd5
JX
11656#, c-format
11657msgid ""
11658"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
11659"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
11660msgstr ""
11661"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
11662"请换用 'git notes add -f -m/-F/-c/-C'。\n"
11663
6937cb4e 11664#: builtin/notes.c:688
a0b6b246
JX
11665msgid "failed to delete ref NOTES_MERGE_PARTIAL"
11666msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
11667
6937cb4e 11668#: builtin/notes.c:690
a0b6b246
JX
11669msgid "failed to delete ref NOTES_MERGE_REF"
11670msgstr "无法删除引用 NOTES_MERGE_REF"
11671
6937cb4e 11672#: builtin/notes.c:692
a0b6b246
JX
11673msgid "failed to remove 'git notes merge' worktree"
11674msgstr "无法删除 'git notes merge' 工作区"
11675
6937cb4e 11676#: builtin/notes.c:712
a0b6b246
JX
11677msgid "failed to read ref NOTES_MERGE_PARTIAL"
11678msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
11679
6937cb4e 11680#: builtin/notes.c:714
a0b6b246
JX
11681msgid "could not find commit from NOTES_MERGE_PARTIAL."
11682msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
11683
6937cb4e 11684#: builtin/notes.c:716
a0b6b246
JX
11685msgid "could not parse commit from NOTES_MERGE_PARTIAL."
11686msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
11687
6937cb4e 11688#: builtin/notes.c:729
a0b6b246
JX
11689msgid "failed to resolve NOTES_MERGE_REF"
11690msgstr "无法解析 NOTES_MERGE_REF"
11691
6937cb4e 11692#: builtin/notes.c:732
a0b6b246
JX
11693msgid "failed to finalize notes merge"
11694msgstr "无法完成注解合并"
11695
6937cb4e 11696#: builtin/notes.c:758
5c57d762
JX
11697#, c-format
11698msgid "unknown notes merge strategy %s"
11699msgstr "未知的注解合并策略 %s"
11700
6937cb4e 11701#: builtin/notes.c:774
ef317cd5 11702msgid "General options"
07432cef 11703msgstr "通用选项"
ef317cd5 11704
6937cb4e 11705#: builtin/notes.c:776
ef317cd5 11706msgid "Merge options"
07432cef 11707msgstr "合并选项"
ef317cd5 11708
6937cb4e 11709#: builtin/notes.c:778
ef317cd5
JX
11710msgid ""
11711"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
11712"cat_sort_uniq)"
07432cef 11713msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 11714
6937cb4e 11715#: builtin/notes.c:780
ef317cd5 11716msgid "Committing unmerged notes"
07432cef 11717msgstr "提交未合并的注解"
ef317cd5 11718
6937cb4e 11719#: builtin/notes.c:782
ef317cd5 11720msgid "finalize notes merge by committing unmerged notes"
07432cef 11721msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 11722
6937cb4e 11723#: builtin/notes.c:784
ef317cd5 11724msgid "Aborting notes merge resolution"
07432cef 11725msgstr "中止注解合并的方案"
ef317cd5 11726
6937cb4e 11727#: builtin/notes.c:786
ef317cd5 11728msgid "abort notes merge"
07432cef 11729msgstr "中止注解合并"
ef317cd5 11730
6937cb4e 11731#: builtin/notes.c:797
5c57d762
JX
11732msgid "cannot mix --commit, --abort or -s/--strategy"
11733msgstr "不能混用 --commit、--abort 或 -s/--strategy"
11734
6937cb4e 11735#: builtin/notes.c:802
a0b6b246 11736msgid "must specify a notes ref to merge"
9a4b694c 11737msgstr "必须指定一个注解引用来合并"
5c57d762 11738
6937cb4e 11739#: builtin/notes.c:826
5c57d762 11740#, c-format
a0b6b246 11741msgid "unknown -s/--strategy: %s"
5c57d762
JX
11742msgstr "未知的 -s/--strategy:%s"
11743
6937cb4e 11744#: builtin/notes.c:863
1b7f4a34 11745#, c-format
a0b6b246
JX
11746msgid "a notes merge into %s is already in-progress at %s"
11747msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
1b7f4a34 11748
6937cb4e 11749#: builtin/notes.c:866
5c57d762 11750#, c-format
a0b6b246
JX
11751msgid "failed to store link to current notes ref (%s)"
11752msgstr "无法存储链接到当前的注解引用(%s)"
5c57d762 11753
6937cb4e 11754#: builtin/notes.c:868
5c57d762
JX
11755#, c-format
11756msgid ""
11757"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
11758"'git notes merge --commit', or abort the merge with 'git notes merge --"
11759"abort'.\n"
a0b6b246
JX
11760msgstr ""
11761"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
11762"交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
5c57d762 11763
6937cb4e 11764#: builtin/notes.c:890
ef317cd5
JX
11765#, c-format
11766msgid "Object %s has no note\n"
11767msgstr "对象 %s 没有注解\n"
11768
6937cb4e 11769#: builtin/notes.c:902
ef317cd5 11770msgid "attempt to remove non-existent note is not an error"
07432cef 11771msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 11772
6937cb4e 11773#: builtin/notes.c:905
ef317cd5 11774msgid "read object names from the standard input"
07432cef 11775msgstr "从标准输入读取对象名称"
ef317cd5 11776
fd8cb379 11777#: builtin/notes.c:943 builtin/prune.c:107 builtin/worktree.c:151
5c57d762
JX
11778msgid "do not remove, show only"
11779msgstr "不删除,只显示"
11780
6937cb4e 11781#: builtin/notes.c:944
5c57d762
JX
11782msgid "report pruned notes"
11783msgstr "报告清除的注解"
11784
6937cb4e 11785#: builtin/notes.c:986
6c94aba5 11786msgid "notes-ref"
07432cef 11787msgstr "注解引用"
ef317cd5 11788
6937cb4e 11789#: builtin/notes.c:987
814ff314 11790msgid "use notes from <notes-ref>"
07432cef 11791msgstr "从 <注解引用> 使用注解"
ef317cd5 11792
6937cb4e 11793#: builtin/notes.c:1022
ef317cd5 11794#, c-format
a0b6b246 11795msgid "unknown subcommand: %s"
ef317cd5
JX
11796msgstr "未知子命令:%s"
11797
fd8cb379 11798#: builtin/pack-objects.c:48
1b7f4a34
JX
11799msgid ""
11800"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
11801msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
ef317cd5 11802
fd8cb379 11803#: builtin/pack-objects.c:49
1b7f4a34
JX
11804msgid ""
11805"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
58b6f078 11806msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
ef317cd5 11807
fd8cb379 11808#: builtin/pack-objects.c:211 builtin/pack-objects.c:214
ef317cd5
JX
11809#, c-format
11810msgid "deflate error (%d)"
11811msgstr "压缩错误 (%d)"
11812
fd8cb379 11813#: builtin/pack-objects.c:810
5b04ee3b
JX
11814msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
11815msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
11816
fd8cb379 11817#: builtin/pack-objects.c:823
6c94aba5
JX
11818msgid "Writing objects"
11819msgstr "写入对象中"
11820
fd8cb379 11821#: builtin/pack-objects.c:1106
6c94aba5
JX
11822msgid "disabling bitmap writing, as some objects are not being packed"
11823msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
11824
fd8cb379
JX
11825#: builtin/pack-objects.c:1765
11826msgid "Counting objects"
11827msgstr "对象计数中"
11828
11829#: builtin/pack-objects.c:1895
11830#, c-format
11831msgid "unable to get size of %s"
11832msgstr "不能得到 %s 的大小"
11833
11834#: builtin/pack-objects.c:1910
11835#, c-format
11836msgid "unable to parse object header of %s"
11837msgstr "无法解析对象 %s 头信息"
11838
11839#: builtin/pack-objects.c:2564
6c94aba5
JX
11840msgid "Compressing objects"
11841msgstr "压缩对象中"
11842
fd8cb379 11843#: builtin/pack-objects.c:2735
5809aa05
JX
11844msgid "invalid value for --missing"
11845msgstr "选项 --missing 的值无效"
11846
fd8cb379 11847#: builtin/pack-objects.c:3067
ef317cd5
JX
11848#, c-format
11849msgid "unsupported index version %s"
11850msgstr "不支持的索引版本 %s"
11851
fd8cb379 11852#: builtin/pack-objects.c:3071
ef317cd5
JX
11853#, c-format
11854msgid "bad index version '%s'"
11855msgstr "坏的索引版本 '%s'"
11856
fd8cb379 11857#: builtin/pack-objects.c:3102
ef317cd5 11858msgid "do not show progress meter"
07432cef 11859msgstr "不显示进度表"
ef317cd5 11860
fd8cb379 11861#: builtin/pack-objects.c:3104
ef317cd5 11862msgid "show progress meter"
07432cef 11863msgstr "显示进度表"
ef317cd5 11864
fd8cb379 11865#: builtin/pack-objects.c:3106
ef317cd5 11866msgid "show progress meter during object writing phase"
07432cef 11867msgstr "在对象写入阶段显示进度表"
ef317cd5 11868
fd8cb379 11869#: builtin/pack-objects.c:3109
ef317cd5 11870msgid "similar to --all-progress when progress meter is shown"
07432cef 11871msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 11872
fd8cb379 11873#: builtin/pack-objects.c:3110
ef317cd5 11874msgid "version[,offset]"
07432cef 11875msgstr "版本[,偏移]"
ef317cd5 11876
fd8cb379 11877#: builtin/pack-objects.c:3111
ef317cd5 11878msgid "write the pack index file in the specified idx format version"
07432cef 11879msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 11880
fd8cb379 11881#: builtin/pack-objects.c:3114
ef317cd5 11882msgid "maximum size of each output pack file"
07432cef 11883msgstr "每个输出包的最大尺寸"
ef317cd5 11884
fd8cb379 11885#: builtin/pack-objects.c:3116
ef317cd5 11886msgid "ignore borrowed objects from alternate object store"
160fb2b2 11887msgstr "忽略从备用对象存储里借用对象"
ef317cd5 11888
fd8cb379 11889#: builtin/pack-objects.c:3118
ef317cd5 11890msgid "ignore packed objects"
07432cef 11891msgstr "忽略包对象"
ef317cd5 11892
fd8cb379 11893#: builtin/pack-objects.c:3120
ef317cd5 11894msgid "limit pack window by objects"
07432cef 11895msgstr "限制打包窗口的对象数"
ef317cd5 11896
fd8cb379 11897#: builtin/pack-objects.c:3122
ef317cd5 11898msgid "limit pack window by memory in addition to object limit"
07432cef 11899msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 11900
fd8cb379 11901#: builtin/pack-objects.c:3124
ef317cd5 11902msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 11903msgstr "打包允许的 delta 链的最大长度"
ef317cd5 11904
fd8cb379 11905#: builtin/pack-objects.c:3126
ef317cd5 11906msgid "reuse existing deltas"
07432cef 11907msgstr "重用已存在的 deltas"
ef317cd5 11908
fd8cb379 11909#: builtin/pack-objects.c:3128
ef317cd5 11910msgid "reuse existing objects"
07432cef 11911msgstr "重用已存在的对象"
ef317cd5 11912
fd8cb379 11913#: builtin/pack-objects.c:3130
ef317cd5 11914msgid "use OFS_DELTA objects"
07432cef 11915msgstr "使用 OFS_DELTA 对象"
ef317cd5 11916
fd8cb379 11917#: builtin/pack-objects.c:3132
ef317cd5 11918msgid "use threads when searching for best delta matches"
07432cef 11919msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 11920
fd8cb379 11921#: builtin/pack-objects.c:3134
ef317cd5 11922msgid "do not create an empty pack output"
07432cef 11923msgstr "不创建空的包输出"
ef317cd5 11924
fd8cb379 11925#: builtin/pack-objects.c:3136
ef317cd5 11926msgid "read revision arguments from standard input"
d9d56b23 11927msgstr "从标准输入读取版本号参数"
ef317cd5 11928
fd8cb379 11929#: builtin/pack-objects.c:3138
ef317cd5 11930msgid "limit the objects to those that are not yet packed"
07432cef 11931msgstr "限制那些尚未打包的对象"
ef317cd5 11932
fd8cb379 11933#: builtin/pack-objects.c:3141
ef317cd5 11934msgid "include objects reachable from any reference"
07432cef 11935msgstr "包括可以从任何引用访问到的对象"
ef317cd5 11936
fd8cb379 11937#: builtin/pack-objects.c:3144
ef317cd5 11938msgid "include objects referred by reflog entries"
07432cef 11939msgstr "包括被引用日志引用到的对象"
ef317cd5 11940
fd8cb379 11941#: builtin/pack-objects.c:3147
220c313c
JX
11942msgid "include objects referred to by the index"
11943msgstr "包括被索引引用到的对象"
11944
fd8cb379 11945#: builtin/pack-objects.c:3150
ef317cd5 11946msgid "output pack to stdout"
07432cef 11947msgstr "输出包到标准输出"
ef317cd5 11948
fd8cb379 11949#: builtin/pack-objects.c:3152
ef317cd5 11950msgid "include tag objects that refer to objects to be packed"
53438e8f 11951msgstr "包括那些引用了待打包对象的标签对象"
ef317cd5 11952
fd8cb379 11953#: builtin/pack-objects.c:3154
ef317cd5 11954msgid "keep unreachable objects"
07432cef 11955msgstr "维持不可达的对象"
ef317cd5 11956
fd8cb379 11957#: builtin/pack-objects.c:3156
5c57d762
JX
11958msgid "pack loose unreachable objects"
11959msgstr "打包松散的不可达对象"
11960
fd8cb379 11961#: builtin/pack-objects.c:3158
ef317cd5 11962msgid "unpack unreachable objects newer than <time>"
07432cef 11963msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 11964
fd8cb379 11965#: builtin/pack-objects.c:3161
ef317cd5 11966msgid "create thin packs"
07432cef 11967msgstr "创建精简包"
ef317cd5 11968
fd8cb379 11969#: builtin/pack-objects.c:3163
04cb2f28 11970msgid "create packs suitable for shallow fetches"
160fb2b2 11971msgstr "创建适合浅克隆仓库获取的包"
04cb2f28 11972
fd8cb379 11973#: builtin/pack-objects.c:3165
ef317cd5 11974msgid "ignore packs that have companion .keep file"
07432cef 11975msgstr "忽略配有 .keep 文件的包"
ef317cd5 11976
fd8cb379
JX
11977#: builtin/pack-objects.c:3167
11978msgid "ignore this pack"
11979msgstr "忽略该 pack"
11980
11981#: builtin/pack-objects.c:3169
ef317cd5 11982msgid "pack compression level"
07432cef 11983msgstr "打包压缩级别"
ef317cd5 11984
fd8cb379 11985#: builtin/pack-objects.c:3171
ef317cd5 11986msgid "do not hide commits by grafts"
fd8cb379 11987msgstr "显示被移植隐藏的提交"
ef317cd5 11988
fd8cb379 11989#: builtin/pack-objects.c:3173
6c94aba5
JX
11990msgid "use a bitmap index if available to speed up counting objects"
11991msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
11992
fd8cb379 11993#: builtin/pack-objects.c:3175
6c94aba5
JX
11994msgid "write a bitmap index together with the pack index"
11995msgstr "在建立包索引的同时创建 bitmap 索引"
11996
fd8cb379 11997#: builtin/pack-objects.c:3178
5809aa05
JX
11998msgid "handling for missing objects"
11999msgstr "处理丢失的对象"
12000
fd8cb379 12001#: builtin/pack-objects.c:3181
31e5e17b
JX
12002msgid "do not pack objects in promisor packfiles"
12003msgstr "不要打包 promisor 包文件中的对象"
12004
fd8cb379
JX
12005#: builtin/pack-objects.c:3205
12006#, c-format
12007msgid "delta chain depth %d is too deep, forcing %d"
12008msgstr "增量链深度 %d 太深了,强制为 %d"
12009
12010#: builtin/pack-objects.c:3210
12011#, c-format
12012msgid "pack.deltaCacheLimit is too high, forcing %d"
12013msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d"
6c94aba5 12014
fd8cb379
JX
12015#: builtin/pack-objects.c:3338
12016msgid "Enumerating objects"
12017msgstr "枚举对象"
12018
12019#: builtin/pack-refs.c:7
814ff314
JX
12020msgid "git pack-refs [<options>]"
12021msgstr "git pack-refs [<选项>]"
c04f5ac3 12022
fd8cb379 12023#: builtin/pack-refs.c:15
ef317cd5 12024msgid "pack everything"
07432cef 12025msgstr "打包一切"
c04f5ac3 12026
fd8cb379 12027#: builtin/pack-refs.c:16
ef317cd5 12028msgid "prune loose refs (default)"
07432cef 12029msgstr "清除松散的引用(默认)"
c04f5ac3 12030
6937cb4e 12031#: builtin/prune-packed.c:8
814ff314
JX
12032msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
12033msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
6792b93b 12034
6937cb4e 12035#: builtin/prune-packed.c:41
6c94aba5
JX
12036msgid "Removing duplicate objects"
12037msgstr "正在删除重复对象"
12038
5bb01d4f 12039#: builtin/prune.c:11
5809aa05
JX
12040msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
12041msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
7ac1c0ad 12042
fd8cb379 12043#: builtin/prune.c:108
1b7f4a34
JX
12044msgid "report pruned objects"
12045msgstr "报告清除的对象"
12046
fd8cb379 12047#: builtin/prune.c:111
1b7f4a34
JX
12048msgid "expire objects older than <time>"
12049msgstr "使早于给定时间的对象过期"
12050
fd8cb379 12051#: builtin/prune.c:113
31e5e17b
JX
12052msgid "limit traversal to objects outside promisor packfiles"
12053msgstr "限制遍历 promisor 包以外的对象"
12054
fd8cb379 12055#: builtin/prune.c:127
94550ed3
JX
12056msgid "cannot prune in a precious-objects repo"
12057msgstr "不能在珍品仓库中执行清理操作"
12058
fd8cb379 12059#: builtin/pull.c:59 builtin/pull.c:61
a0b6b246
JX
12060#, c-format
12061msgid "Invalid value for %s: %s"
12062msgstr "%s 的值无效:%s"
12063
fd8cb379 12064#: builtin/pull.c:81
94550ed3 12065msgid "git pull [<options>] [<repository> [<refspec>...]]"
1b7f4a34
JX
12066msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
12067
fd8cb379 12068#: builtin/pull.c:132
a4f16749
JX
12069msgid "control for recursive fetching of submodules"
12070msgstr "控制子模组的递归获取"
12071
fd8cb379 12072#: builtin/pull.c:136
1b7f4a34
JX
12073msgid "Options related to merging"
12074msgstr "和合并相关的选项"
12075
fd8cb379 12076#: builtin/pull.c:139
1b7f4a34
JX
12077msgid "incorporate changes by rebasing rather than merging"
12078msgstr "使用变基操作取代合并操作以合入修改"
12079
fd8cb379 12080#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:121
1b7f4a34
JX
12081msgid "allow fast-forward"
12082msgstr "允许快进式"
12083
fd8cb379 12084#: builtin/pull.c:175
5b04ee3b 12085msgid "automatically stash/stash pop before and after rebase"
554e8501 12086msgstr "变基操作前后执行自动贮藏和弹出贮藏"
5b04ee3b 12087
fd8cb379 12088#: builtin/pull.c:191
1b7f4a34
JX
12089msgid "Options related to fetching"
12090msgstr "和获取相关的参数"
12091
fd8cb379 12092#: builtin/pull.c:209
276ceeaa
JX
12093msgid "number of submodules pulled in parallel"
12094msgstr "并发拉取的子模组的数量"
12095
fd8cb379 12096#: builtin/pull.c:304
1b7f4a34
JX
12097#, c-format
12098msgid "Invalid value for pull.ff: %s"
12099msgstr "pull.ff 的取值无效:%s"
12100
fd8cb379 12101#: builtin/pull.c:420
1b7f4a34
JX
12102msgid ""
12103"There is no candidate for rebasing against among the refs that you just "
12104"fetched."
12105msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
12106
fd8cb379 12107#: builtin/pull.c:422
1b7f4a34
JX
12108msgid ""
12109"There are no candidates for merging among the refs that you just fetched."
12110msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
12111
fd8cb379 12112#: builtin/pull.c:423
1b7f4a34
JX
12113msgid ""
12114"Generally this means that you provided a wildcard refspec which had no\n"
12115"matches on the remote end."
12116msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
12117
fd8cb379 12118#: builtin/pull.c:426
1b7f4a34
JX
12119#, c-format
12120msgid ""
12121"You asked to pull from the remote '%s', but did not specify\n"
12122"a branch. Because this is not the default configured remote\n"
12123"for your current branch, you must specify a branch on the command line."
12124msgstr ""
12125"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
12126"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
12127
fd8cb379 12128#: builtin/pull.c:431 git-parse-remote.sh:73
1b7f4a34
JX
12129msgid "You are not currently on a branch."
12130msgstr "您当前不在一个分支上。"
12131
fd8cb379 12132#: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79
1b7f4a34
JX
12133msgid "Please specify which branch you want to rebase against."
12134msgstr "请指定您要变基到哪一个分支。"
12135
fd8cb379 12136#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82
1b7f4a34
JX
12137msgid "Please specify which branch you want to merge with."
12138msgstr "请指定您要合并哪一个分支。"
12139
fd8cb379 12140#: builtin/pull.c:436 builtin/pull.c:451
1b7f4a34
JX
12141msgid "See git-pull(1) for details."
12142msgstr "详见 git-pull(1)。"
12143
fd8cb379 12144#: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453
5b04ee3b
JX
12145#: git-parse-remote.sh:64
12146msgid "<remote>"
12147msgstr "<远程>"
12148
fd8cb379 12149#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:523
5b04ee3b
JX
12150#: git-parse-remote.sh:65
12151msgid "<branch>"
12152msgstr "<分支>"
12153
fd8cb379 12154#: builtin/pull.c:446 git-parse-remote.sh:75
1b7f4a34
JX
12155msgid "There is no tracking information for the current branch."
12156msgstr "当前分支没有跟踪信息。"
12157
fd8cb379 12158#: builtin/pull.c:455 git-parse-remote.sh:95
1b7f4a34 12159msgid ""
5b04ee3b
JX
12160"If you wish to set tracking information for this branch you can do so with:"
12161msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
7ac1c0ad 12162
fd8cb379 12163#: builtin/pull.c:460
1b7f4a34
JX
12164#, c-format
12165msgid ""
12166"Your configuration specifies to merge with the ref '%s'\n"
12167"from the remote, but no such ref was fetched."
12168msgstr ""
12169"您的配置中指定要合并远程的引用 '%s',\n"
12170"但是没有获取到这个引用。"
7ac1c0ad 12171
fd8cb379 12172#: builtin/pull.c:826
5c57d762
JX
12173msgid "ignoring --verify-signatures for rebase"
12174msgstr "为变基操作忽略 --verify-signatures"
12175
fd8cb379 12176#: builtin/pull.c:874
5b04ee3b
JX
12177msgid "--[no-]autostash option is only valid with --rebase."
12178msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
12179
fd8cb379 12180#: builtin/pull.c:882
1b7f4a34
JX
12181msgid "Updating an unborn branch with changes added to the index."
12182msgstr "更新尚未诞生的分支,变更添加至索引。"
12183
fd8cb379 12184#: builtin/pull.c:885
a0b6b246
JX
12185msgid "pull with rebase"
12186msgstr "变基式拉取"
12187
fd8cb379 12188#: builtin/pull.c:886
a0b6b246 12189msgid "please commit or stash them."
554e8501 12190msgstr "请提交或贮藏它们。"
a0b6b246 12191
fd8cb379 12192#: builtin/pull.c:911
1b7f4a34
JX
12193#, c-format
12194msgid ""
12195"fetch updated the current branch head.\n"
12196"fast-forwarding your working tree from\n"
12197"commit %s."
12198msgstr ""
12199"fetch 更新了当前的分支。快进您的工作区\n"
12200"至提交 %s。"
ef317cd5 12201
fd8cb379 12202#: builtin/pull.c:916
1b7f4a34
JX
12203#, c-format
12204msgid ""
12205"Cannot fast-forward your working tree.\n"
12206"After making sure that you saved anything precious from\n"
12207"$ git diff %s\n"
12208"output, run\n"
12209"$ git reset --hard\n"
12210"to recover."
12211msgstr ""
12212"您当前的工作区无法执行快进操作。\n"
12213"首先执行如下命令:\n"
12214"$ git diff %s\n"
12215"以确认所有有用的数据均已保存。然后执行下面的命令\n"
12216"$ git reset --hard\n"
12217"恢复之前的状态。"
12218
fd8cb379 12219#: builtin/pull.c:931
1b7f4a34
JX
12220msgid "Cannot merge multiple branches into empty head."
12221msgstr "无法将多个分支合并到空分支。"
12222
fd8cb379 12223#: builtin/pull.c:935
1b7f4a34
JX
12224msgid "Cannot rebase onto multiple branches."
12225msgstr "无法变基到多个分支。"
12226
fd8cb379 12227#: builtin/pull.c:942
a4f16749
JX
12228msgid "cannot rebase with locally recorded submodule modifications"
12229msgstr "本地子模组中有修改,无法变基"
12230
fd8cb379 12231#: builtin/push.c:19
ef317cd5 12232msgid "git push [<options>] [<repository> [<refspec>...]]"
160fb2b2 12233msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
7ac1c0ad 12234
fd8cb379 12235#: builtin/push.c:111
c04f5ac3 12236msgid "tag shorthand without <tag>"
55a16ee4 12237msgstr "标签后面未提供 <标签> 参数"
c04f5ac3 12238
fd8cb379 12239#: builtin/push.c:121
c04f5ac3 12240msgid "--delete only accepts plain target ref names"
90e6ef53 12241msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 12242
fd8cb379 12243#: builtin/push.c:165
8ada9598
JX
12244msgid ""
12245"\n"
12246"To choose either option permanently, see push.default in 'git help config'."
12247msgstr ""
81809b99
JX
12248"\n"
12249"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 12250
fd8cb379 12251#: builtin/push.c:168
8ada9598
JX
12252#, c-format
12253msgid ""
12254"The upstream branch of your current branch does not match\n"
12255"the name of your current branch. To push to the upstream branch\n"
12256"on the remote, use\n"
12257"\n"
12258" git push %s HEAD:%s\n"
12259"\n"
12260"To push to the branch of the same name on the remote, use\n"
12261"\n"
12262" git push %s %s\n"
12263"%s"
12264msgstr ""
81809b99
JX
12265"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
12266"上游分支,使用\n"
12267"\n"
12268" git push %s HEAD:%s\n"
12269"\n"
12270"为推送至远程同名分支,使用\n"
12271"\n"
12272" git push %s %s\n"
12273"%s"
8ada9598 12274
fd8cb379 12275#: builtin/push.c:183
c04f5ac3
JX
12276#, c-format
12277msgid ""
12278"You are not currently on a branch.\n"
12279"To push the history leading to the current (detached HEAD)\n"
12280"state now, use\n"
12281"\n"
12282" git push %s HEAD:<name-of-remote-branch>\n"
12283msgstr ""
12284"您当前不在一个分支上。\n"
90e6ef53 12285"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3 12286"\n"
d9d56b23 12287" git push %s HEAD:<远程分支名字>\n"
c04f5ac3 12288
fd8cb379 12289#: builtin/push.c:197
c04f5ac3
JX
12290#, c-format
12291msgid ""
12292"The current branch %s has no upstream branch.\n"
12293"To push the current branch and set the remote as upstream, use\n"
12294"\n"
12295" git push --set-upstream %s %s\n"
12296msgstr ""
12297"当前分支 %s 没有对应的上游分支。\n"
12298"为推送当前分支并建立与远程上游的跟踪,使用\n"
12299"\n"
12300" git push --set-upstream %s %s\n"
12301
fd8cb379 12302#: builtin/push.c:205
c04f5ac3
JX
12303#, c-format
12304msgid "The current branch %s has multiple upstream branches, refusing to push."
12305msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
12306
fd8cb379 12307#: builtin/push.c:208
73a60cd2
JX
12308#, c-format
12309msgid ""
12310"You are pushing to remote '%s', which is not the upstream of\n"
12311"your current branch '%s', without telling me what to push\n"
12312"to update which remote branch."
12313msgstr ""
12314"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
12315"而没有告诉我要推送什么、更新哪个远程分支。"
12316
fd8cb379 12317#: builtin/push.c:267
c04f5ac3
JX
12318msgid ""
12319"You didn't specify any refspecs to push, and push.default is \"nothing\"."
160fb2b2 12320msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
c04f5ac3 12321
fd8cb379 12322#: builtin/push.c:274
170e9899
JX
12323msgid ""
12324"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
12325"its remote counterpart. Integrate the remote changes (e.g.\n"
12326"'git pull ...') before pushing again.\n"
170e9899
JX
12327"See the 'Note about fast-forwards' in 'git push --help' for details."
12328msgstr ""
eff6d3a9 12329"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 12330"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 12331"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 12332
fd8cb379 12333#: builtin/push.c:280
170e9899
JX
12334msgid ""
12335"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
12336"counterpart. Check out this branch and integrate the remote changes\n"
12337"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
12338"See the 'Note about fast-forwards' in 'git push --help' for details."
12339msgstr ""
eff6d3a9 12340"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 12341"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 12342"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 12343
fd8cb379 12344#: builtin/push.c:286
07432cef 12345msgid ""
a77c07d9
JX
12346"Updates were rejected because the remote contains work that you do\n"
12347"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
12348"to the same ref. You may want to first integrate the remote changes\n"
12349"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
12350"See the 'Note about fast-forwards' in 'git push --help' for details."
12351msgstr ""
160fb2b2
JX
12352"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
12353"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
2e8451e8 12354"(如 'git pull ...')。\n"
a77c07d9
JX
12355"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
12356
fd8cb379 12357#: builtin/push.c:293
a77c07d9 12358msgid "Updates were rejected because the tag already exists in the remote."
55a16ee4 12359msgstr "更新被拒绝,因为该标签在远程已经存在。"
a77c07d9 12360
fd8cb379 12361#: builtin/push.c:296
a77c07d9
JX
12362msgid ""
12363"You cannot update a remote ref that points at a non-commit object,\n"
12364"or update a remote ref to make it point at a non-commit object,\n"
12365"without using the '--force' option.\n"
12366msgstr ""
12367"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
12368"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 12369
fd8cb379 12370#: builtin/push.c:357
c04f5ac3
JX
12371#, c-format
12372msgid "Pushing to %s\n"
12373msgstr "推送到 %s\n"
12374
fd8cb379 12375#: builtin/push.c:361
c04f5ac3
JX
12376#, c-format
12377msgid "failed to push some refs to '%s'"
12378msgstr "无法推送一些引用到 '%s'"
12379
fd8cb379 12380#: builtin/push.c:395
c04f5ac3
JX
12381#, c-format
12382msgid "bad repository '%s'"
160fb2b2 12383msgstr "坏的仓库 '%s'"
c04f5ac3 12384
fd8cb379 12385#: builtin/push.c:396
c04f5ac3
JX
12386msgid ""
12387"No configured push destination.\n"
12388"Either specify the URL from the command-line or configure a remote "
12389"repository using\n"
12390"\n"
12391" git remote add <name> <url>\n"
12392"\n"
12393"and then push using the remote name\n"
12394"\n"
12395" git push <name>\n"
12396msgstr ""
90e6ef53 12397"没有配置推送目标。\n"
4375c10e 12398"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
c04f5ac3 12399"\n"
d9d56b23 12400" git remote add <名称> <地址>\n"
c04f5ac3 12401"\n"
160fb2b2 12402"然后使用该远程仓库名执行推送\n"
c04f5ac3 12403"\n"
d9d56b23 12404" git push <名称>\n"
c04f5ac3 12405
fd8cb379 12406#: builtin/push.c:551
ef317cd5 12407msgid "repository"
160fb2b2 12408msgstr "仓库"
ef317cd5 12409
fd8cb379 12410#: builtin/push.c:552 builtin/send-pack.c:164
ef317cd5 12411msgid "push all refs"
07432cef 12412msgstr "推送所有引用"
ef317cd5 12413
fd8cb379 12414#: builtin/push.c:553 builtin/send-pack.c:166
ef317cd5 12415msgid "mirror all refs"
07432cef 12416msgstr "镜像所有引用"
ef317cd5 12417
fd8cb379 12418#: builtin/push.c:555
ef317cd5 12419msgid "delete refs"
07432cef 12420msgstr "删除引用"
ef317cd5 12421
fd8cb379 12422#: builtin/push.c:556
ef317cd5 12423msgid "push tags (can't be used with --all or --mirror)"
55a16ee4 12424msgstr "推送标签(不能使用 --all or --mirror)"
ef317cd5 12425
fd8cb379 12426#: builtin/push.c:559 builtin/send-pack.c:167
ef317cd5
JX
12427msgid "force updates"
12428msgstr "强制更新"
12429
fd8cb379 12430#: builtin/push.c:561 builtin/send-pack.c:181
90314792
JX
12431msgid "refname>:<expect"
12432msgstr "引用名>:<期望值"
12433
fd8cb379 12434#: builtin/push.c:562 builtin/send-pack.c:182
90314792
JX
12435msgid "require old value of ref to be at this value"
12436msgstr "要求引用旧的取值为设定值"
12437
fd8cb379 12438#: builtin/push.c:565
ef317cd5 12439msgid "control recursive pushing of submodules"
07432cef 12440msgstr "控制子模组的递归推送"
ef317cd5 12441
fd8cb379 12442#: builtin/push.c:567 builtin/send-pack.c:175
ef317cd5 12443msgid "use thin pack"
07432cef 12444msgstr "使用精简打包"
ef317cd5 12445
fd8cb379
JX
12446#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161
12447#: builtin/send-pack.c:162
ef317cd5 12448msgid "receive pack program"
07432cef 12449msgstr "接收包程序"
ef317cd5 12450
fd8cb379 12451#: builtin/push.c:570
ef317cd5 12452msgid "set upstream for git pull/status"
07432cef 12453msgstr "设置 git pull/status 的上游"
ef317cd5 12454
fd8cb379 12455#: builtin/push.c:573
ef317cd5 12456msgid "prune locally removed refs"
07432cef 12457msgstr "清除本地删除的引用"
ef317cd5 12458
fd8cb379 12459#: builtin/push.c:575
a77c07d9
JX
12460msgid "bypass pre-push hook"
12461msgstr "绕过 pre-push 钩子"
12462
fd8cb379 12463#: builtin/push.c:576
1003b3a5 12464msgid "push missing but relevant tags"
55a16ee4 12465msgstr "推送缺失但有关的标签"
1003b3a5 12466
fd8cb379 12467#: builtin/push.c:579 builtin/send-pack.c:169
220c313c
JX
12468msgid "GPG sign the push"
12469msgstr "用 GPG 为推送签名"
12470
fd8cb379 12471#: builtin/push.c:581 builtin/send-pack.c:176
814ff314
JX
12472msgid "request atomic transaction on remote side"
12473msgstr "需要远端支持原子事务"
12474
fd8cb379 12475#: builtin/push.c:599
c04f5ac3
JX
12476msgid "--delete is incompatible with --all, --mirror and --tags"
12477msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
12478
fd8cb379 12479#: builtin/push.c:601
c04f5ac3
JX
12480msgid "--delete doesn't make sense without any refs"
12481msgstr "--delete 未接任何引用没有意义"
12482
5809aa05 12483#: builtin/push.c:604
fd8cb379
JX
12484msgid "--all and --tags are incompatible"
12485msgstr "--all 和 --tags 不兼容"
12486
12487#: builtin/push.c:606
12488msgid "--all can't be combined with refspecs"
12489msgstr "--all 不能和引用规格同时使用"
12490
12491#: builtin/push.c:610
12492msgid "--mirror and --tags are incompatible"
12493msgstr "--mirror 和 --tags 不兼容"
12494
12495#: builtin/push.c:612
12496msgid "--mirror can't be combined with refspecs"
12497msgstr "--mirror 不能和引用规格同时使用"
12498
12499#: builtin/push.c:615
12500msgid "--all and --mirror are incompatible"
12501msgstr "--all 和 --mirror 不兼容"
12502
12503#: builtin/push.c:634
5c57d762
JX
12504msgid "push options must not have new line characters"
12505msgstr "推送选项不能有换行符"
12506
87cb7997 12507#: builtin/read-tree.c:40
ef317cd5 12508msgid ""
1b7f4a34 12509"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
ef317cd5
JX
12510"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
12511"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
12512msgstr ""
1b7f4a34 12513"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
07432cef 12514"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
1b7f4a34 12515"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
ef317cd5 12516
fd8cb379 12517#: builtin/read-tree.c:120
ef317cd5 12518msgid "write resulting index to <file>"
d9d56b23 12519msgstr "将索引结果写入 <文件>"
ef317cd5 12520
fd8cb379 12521#: builtin/read-tree.c:123
ef317cd5 12522msgid "only empty the index"
07432cef 12523msgstr "只是清空索引"
ef317cd5 12524
fd8cb379 12525#: builtin/read-tree.c:125
ef317cd5 12526msgid "Merging"
07432cef 12527msgstr "合并"
ef317cd5 12528
fd8cb379 12529#: builtin/read-tree.c:127
ef317cd5 12530msgid "perform a merge in addition to a read"
07432cef 12531msgstr "读取之余再执行一个合并"
ef317cd5 12532
fd8cb379 12533#: builtin/read-tree.c:129
ef317cd5 12534msgid "3-way merge if no file level merging required"
160fb2b2 12535msgstr "如果没有文件级合并需要,执行三方合并"
ef317cd5 12536
fd8cb379 12537#: builtin/read-tree.c:131
ef317cd5 12538msgid "3-way merge in presence of adds and removes"
160fb2b2 12539msgstr "存在添加和删除时,也执行三方合并"
ef317cd5 12540
fd8cb379 12541#: builtin/read-tree.c:133
ef317cd5 12542msgid "same as -m, but discard unmerged entries"
07432cef 12543msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 12544
fd8cb379 12545#: builtin/read-tree.c:134
ef317cd5 12546msgid "<subdirectory>/"
07432cef 12547msgstr "<子目录>/"
ef317cd5 12548
fd8cb379 12549#: builtin/read-tree.c:135
ef317cd5 12550msgid "read the tree into the index under <subdirectory>/"
07432cef 12551msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 12552
fd8cb379 12553#: builtin/read-tree.c:138
ef317cd5 12554msgid "update working tree with merge result"
07432cef 12555msgstr "用合并的结果更新工作区"
ef317cd5 12556
fd8cb379 12557#: builtin/read-tree.c:140
ef317cd5 12558msgid "gitignore"
07432cef 12559msgstr "gitignore"
ef317cd5 12560
fd8cb379 12561#: builtin/read-tree.c:141
ef317cd5 12562msgid "allow explicitly ignored files to be overwritten"
07432cef 12563msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 12564
fd8cb379 12565#: builtin/read-tree.c:144
ef317cd5 12566msgid "don't check the working tree after merging"
07432cef 12567msgstr "合并后不检查工作区"
ef317cd5 12568
fd8cb379 12569#: builtin/read-tree.c:145
ef317cd5 12570msgid "don't update the index or the work tree"
07432cef 12571msgstr "不更新索引区和工作区"
ef317cd5 12572
fd8cb379 12573#: builtin/read-tree.c:147
ef317cd5 12574msgid "skip applying sparse checkout filter"
07432cef 12575msgstr "跳过应用稀疏检出过滤器"
ef317cd5 12576
fd8cb379 12577#: builtin/read-tree.c:149
ef317cd5 12578msgid "debug unpack-trees"
07432cef 12579msgstr "调试 unpack-trees"
ef317cd5 12580
a4f16749 12581#: builtin/rebase--helper.c:8
87cb7997
JX
12582msgid "git rebase--helper [<options>]"
12583msgstr "git rebase--helper [<选项>]"
12584
5809aa05 12585#: builtin/rebase--helper.c:24
6937cb4e
JX
12586msgid "keep empty commits"
12587msgstr "保持空提交"
12588
31e5e17b
JX
12589#: builtin/rebase--helper.c:26 builtin/revert.c:123
12590msgid "allow commits with empty messages"
12591msgstr "允许提交说明为空"
12592
12593#: builtin/rebase--helper.c:27
fd8cb379
JX
12594msgid "rebase merge commits"
12595msgstr "对合并提交变基"
12596
12597#: builtin/rebase--helper.c:29
12598msgid "keep original branch points of cousins"
12599msgstr "保持兄弟提交的原始分支点"
12600
12601#: builtin/rebase--helper.c:30
87cb7997
JX
12602msgid "continue rebase"
12603msgstr "继续变基"
12604
fd8cb379 12605#: builtin/rebase--helper.c:32
87cb7997
JX
12606msgid "abort rebase"
12607msgstr "中止变基"
12608
fd8cb379 12609#: builtin/rebase--helper.c:35
6937cb4e
JX
12610msgid "make rebase script"
12611msgstr "制作变基脚本"
12612
fd8cb379 12613#: builtin/rebase--helper.c:37
5809aa05
JX
12614msgid "shorten commit ids in the todo list"
12615msgstr "缩短待办列表中的提交号"
6937cb4e 12616
fd8cb379 12617#: builtin/rebase--helper.c:39
5809aa05
JX
12618msgid "expand commit ids in the todo list"
12619msgstr "扩展待办列表中的提交号"
12620
fd8cb379 12621#: builtin/rebase--helper.c:41
6937cb4e
JX
12622msgid "check the todo list"
12623msgstr "检查待办列表"
12624
fd8cb379 12625#: builtin/rebase--helper.c:43
6937cb4e
JX
12626msgid "skip unnecessary picks"
12627msgstr "跳过不必要的拣选"
12628
fd8cb379 12629#: builtin/rebase--helper.c:45
6937cb4e
JX
12630msgid "rearrange fixup/squash lines"
12631msgstr "重新排列 fixup/squash 行"
12632
fd8cb379 12633#: builtin/rebase--helper.c:47
5809aa05
JX
12634msgid "insert exec commands in todo list"
12635msgstr "在待办列表中插入 exec 执行命令"
12636
fd8cb379
JX
12637#: builtin/rebase--helper.c:68
12638msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
12639msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果"
12640
12641#: builtin/receive-pack.c:31
5b04ee3b 12642msgid "git receive-pack <git-dir>"
58b6f078 12643msgstr "git receive-pack <仓库目录>"
5b04ee3b 12644
fd8cb379 12645#: builtin/receive-pack.c:842
a0b6b246
JX
12646msgid ""
12647"By default, updating the current branch in a non-bare repository\n"
12648"is denied, because it will make the index and work tree inconsistent\n"
12649"with what you pushed, and will require 'git reset --hard' to match\n"
12650"the work tree to HEAD.\n"
12651"\n"
1a79b2f1
JX
12652"You can set the 'receive.denyCurrentBranch' configuration variable\n"
12653"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
a0b6b246
JX
12654"its current branch; however, this is not recommended unless you\n"
12655"arranged to update its work tree to match what you pushed in some\n"
12656"other way.\n"
12657"\n"
12658"To squelch this message and still keep the default behaviour, set\n"
12659"'receive.denyCurrentBranch' configuration variable to 'refuse'."
12660msgstr ""
12661"默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
12662"不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
12663"\n"
12664"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
12665"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
12666"用某种方式将其工作区更新至您推送的状态。\n"
12667"\n"
12668"若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
12669"配置变量为 'refuse'。"
12670
fd8cb379 12671#: builtin/receive-pack.c:862
a0b6b246
JX
12672msgid ""
12673"By default, deleting the current branch is denied, because the next\n"
12674"'git clone' won't result in any file checked out, causing confusion.\n"
12675"\n"
12676"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
12677"'warn' or 'ignore' in the remote repository to allow deleting the\n"
12678"current branch, with or without a warning message.\n"
12679"\n"
12680"To squelch this message, you can set it to 'refuse'."
12681msgstr ""
12682"默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
29004bbb 12683"导致困惑。\n"
a0b6b246
JX
12684"\n"
12685"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
29004bbb 12686"'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
a0b6b246
JX
12687"\n"
12688"若要屏蔽此信息,您可以设置它为 'refuse'。"
12689
fd8cb379 12690#: builtin/receive-pack.c:1935
5b04ee3b
JX
12691msgid "quiet"
12692msgstr "静默模式"
12693
fd8cb379 12694#: builtin/receive-pack.c:1949
5b04ee3b
JX
12695msgid "You must specify a directory."
12696msgstr "您必须指定一个目录。"
12697
31e5e17b 12698#: builtin/reflog.c:532 builtin/reflog.c:537
2e8451e8
JX
12699#, c-format
12700msgid "'%s' is not a valid timestamp"
12701msgstr "'%s' 不是一个有效的时间戳"
12702
fd8cb379 12703#: builtin/remote.c:14
ef317cd5 12704msgid "git remote [-v | --verbose]"
07432cef 12705msgstr "git remote [-v | --verbose]"
ef317cd5 12706
fd8cb379 12707#: builtin/remote.c:15
ef317cd5 12708msgid ""
814ff314 12709"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
ef317cd5
JX
12710"mirror=<fetch|push>] <name> <url>"
12711msgstr ""
814ff314 12712"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
d9d56b23 12713"mirror=<fetch|push>] <名称> <地址>"
ef317cd5 12714
fd8cb379 12715#: builtin/remote.c:16 builtin/remote.c:36
ef317cd5 12716msgid "git remote rename <old> <new>"
07432cef 12717msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 12718
fd8cb379 12719#: builtin/remote.c:17 builtin/remote.c:41
ef317cd5 12720msgid "git remote remove <name>"
07432cef 12721msgstr "git remote remove <名称>"
ef317cd5 12722
fd8cb379 12723#: builtin/remote.c:18 builtin/remote.c:46
814ff314
JX
12724msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
12725msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
ef317cd5 12726
fd8cb379 12727#: builtin/remote.c:19
ef317cd5 12728msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 12729msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 12730
fd8cb379 12731#: builtin/remote.c:20
ef317cd5 12732msgid "git remote prune [-n | --dry-run] <name>"
07432cef 12733msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 12734
fd8cb379 12735#: builtin/remote.c:21
ef317cd5
JX
12736msgid ""
12737"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 12738msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 12739
fd8cb379 12740#: builtin/remote.c:22
ef317cd5 12741msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 12742msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 12743
fd8cb379 12744#: builtin/remote.c:23 builtin/remote.c:72
94550ed3
JX
12745msgid "git remote get-url [--push] [--all] <name>"
12746msgstr "git remote get-url [--push] [--all] <名称>"
12747
fd8cb379 12748#: builtin/remote.c:24 builtin/remote.c:77
ef317cd5 12749msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 12750msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 12751
fd8cb379 12752#: builtin/remote.c:25 builtin/remote.c:78
ef317cd5 12753msgid "git remote set-url --add <name> <newurl>"
07432cef 12754msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 12755
fd8cb379 12756#: builtin/remote.c:26 builtin/remote.c:79
ef317cd5 12757msgid "git remote set-url --delete <name> <url>"
07432cef 12758msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 12759
fd8cb379 12760#: builtin/remote.c:31
ef317cd5 12761msgid "git remote add [<options>] <name> <url>"
07432cef 12762msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 12763
fd8cb379 12764#: builtin/remote.c:51
ef317cd5 12765msgid "git remote set-branches <name> <branch>..."
07432cef 12766msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 12767
fd8cb379 12768#: builtin/remote.c:52
ef317cd5 12769msgid "git remote set-branches --add <name> <branch>..."
07432cef 12770msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 12771
fd8cb379 12772#: builtin/remote.c:57
ef317cd5 12773msgid "git remote show [<options>] <name>"
07432cef 12774msgstr "git remote show [<选项>] <名称>"
ef317cd5 12775
fd8cb379 12776#: builtin/remote.c:62
ef317cd5 12777msgid "git remote prune [<options>] <name>"
07432cef 12778msgstr "git remote prune [<选项>] <名称>"
ef317cd5 12779
fd8cb379 12780#: builtin/remote.c:67
ef317cd5 12781msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 12782msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 12783
fd8cb379 12784#: builtin/remote.c:96
81809b99 12785#, c-format
8ada9598 12786msgid "Updating %s"
81809b99 12787msgstr "更新 %s 中"
8ada9598 12788
fd8cb379 12789#: builtin/remote.c:128
8ada9598
JX
12790msgid ""
12791"--mirror is dangerous and deprecated; please\n"
12792"\t use --mirror=fetch or --mirror=push instead"
12793msgstr ""
81809b99
JX
12794"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
12795"\t 或 --mirror=push"
8ada9598 12796
fd8cb379 12797#: builtin/remote.c:145
81809b99 12798#, c-format
8ada9598 12799msgid "unknown mirror argument: %s"
81809b99 12800msgstr "未知的镜像参数:%s"
8ada9598 12801
fd8cb379 12802#: builtin/remote.c:161
ef317cd5 12803msgid "fetch the remote branches"
07432cef 12804msgstr "抓取远程的分支"
ef317cd5 12805
fd8cb379 12806#: builtin/remote.c:163
ef317cd5 12807msgid "import all tags and associated objects when fetching"
55a16ee4 12808msgstr "抓取时导入所有的标签和关联对象"
ef317cd5 12809
fd8cb379 12810#: builtin/remote.c:166
ef317cd5 12811msgid "or do not fetch any tag at all (--no-tags)"
55a16ee4 12812msgstr "或不抓取任何标签(--no-tags)"
ef317cd5 12813
fd8cb379 12814#: builtin/remote.c:168
ef317cd5 12815msgid "branch(es) to track"
07432cef 12816msgstr "跟踪的分支"
ef317cd5 12817
fd8cb379 12818#: builtin/remote.c:169
ef317cd5 12819msgid "master branch"
07432cef 12820msgstr "主线分支"
ef317cd5 12821
fd8cb379 12822#: builtin/remote.c:170
ef317cd5 12823msgid "push|fetch"
07432cef 12824msgstr "push|fetch"
ef317cd5 12825
fd8cb379 12826#: builtin/remote.c:171
ef317cd5 12827msgid "set up remote as a mirror to push to or fetch from"
07432cef 12828msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 12829
fd8cb379 12830#: builtin/remote.c:183
8ada9598 12831msgid "specifying a master branch makes no sense with --mirror"
81809b99 12832msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 12833
fd8cb379 12834#: builtin/remote.c:185
8ada9598 12835msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 12836msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 12837
fd8cb379 12838#: builtin/remote.c:192 builtin/remote.c:634
81809b99 12839#, c-format
8ada9598 12840msgid "remote %s already exists."
81809b99 12841msgstr "远程 %s 已经存在。"
8ada9598 12842
fd8cb379 12843#: builtin/remote.c:196 builtin/remote.c:638
81809b99 12844#, c-format
8ada9598 12845msgid "'%s' is not a valid remote name"
81809b99 12846msgstr "'%s' 不是一个有效的远程名称"
8ada9598 12847
fd8cb379 12848#: builtin/remote.c:236
81809b99 12849#, c-format
8ada9598 12850msgid "Could not setup master '%s'"
81809b99 12851msgstr "无法设置 master '%s'"
8ada9598 12852
fd8cb379 12853#: builtin/remote.c:342
81809b99 12854#, c-format
8ada9598 12855msgid "Could not get fetch map for refspec %s"
160fb2b2 12856msgstr "无法得到引用规格 %s 的获取列表"
8ada9598 12857
fd8cb379 12858#: builtin/remote.c:441 builtin/remote.c:449
8ada9598 12859msgid "(matching)"
81809b99 12860msgstr "(匹配)"
8ada9598 12861
fd8cb379 12862#: builtin/remote.c:453
8ada9598 12863msgid "(delete)"
81809b99 12864msgstr "(删除)"
8ada9598 12865
fd8cb379 12866#: builtin/remote.c:627 builtin/remote.c:762 builtin/remote.c:861
81809b99 12867#, c-format
8ada9598 12868msgid "No such remote: %s"
81809b99 12869msgstr "没有这样的远程:%s"
8ada9598 12870
fd8cb379 12871#: builtin/remote.c:644
81809b99 12872#, c-format
8ada9598 12873msgid "Could not rename config section '%s' to '%s'"
81809b99 12874msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 12875
fd8cb379 12876#: builtin/remote.c:664
8ada9598
JX
12877#, c-format
12878msgid ""
d691f479 12879"Not updating non-default fetch refspec\n"
8ada9598
JX
12880"\t%s\n"
12881"\tPlease update the configuration manually if necessary."
12882msgstr ""
160fb2b2 12883"没有更新非默认的获取引用规格\n"
81809b99
JX
12884"\t%s\n"
12885"\t如果必要请手动更新配置。"
8ada9598 12886
fd8cb379 12887#: builtin/remote.c:700
81809b99 12888#, c-format
8ada9598 12889msgid "deleting '%s' failed"
81809b99 12890msgstr "删除 '%s' 失败"
8ada9598 12891
fd8cb379 12892#: builtin/remote.c:734
81809b99 12893#, c-format
8ada9598 12894msgid "creating '%s' failed"
81809b99 12895msgstr "创建 '%s' 失败"
8ada9598 12896
fd8cb379 12897#: builtin/remote.c:799
8ada9598
JX
12898msgid ""
12899"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
12900"to delete it, use:"
12901msgid_plural ""
12902"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
12903"to delete them, use:"
5ae481e0
JX
12904msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
12905msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 12906
fd8cb379 12907#: builtin/remote.c:813
276ceeaa
JX
12908#, c-format
12909msgid "Could not remove config section '%s'"
12910msgstr "不能移除配置小节 '%s'"
12911
fd8cb379 12912#: builtin/remote.c:914
8ada9598
JX
12913#, c-format
12914msgid " new (next fetch will store in remotes/%s)"
81809b99 12915msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 12916
fd8cb379 12917#: builtin/remote.c:917
8ada9598 12918msgid " tracked"
81809b99 12919msgstr " 已跟踪"
8ada9598 12920
fd8cb379 12921#: builtin/remote.c:919
8ada9598 12922msgid " stale (use 'git remote prune' to remove)"
81809b99 12923msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 12924
fd8cb379 12925#: builtin/remote.c:921
8ada9598 12926msgid " ???"
81809b99 12927msgstr " ???"
8ada9598 12928
fd8cb379 12929#: builtin/remote.c:962
8ada9598
JX
12930#, c-format
12931msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 12932msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 12933
fd8cb379 12934#: builtin/remote.c:971
81809b99 12935#, c-format
276ceeaa
JX
12936msgid "rebases interactively onto remote %s"
12937msgstr "交互式变基到远程 %s"
8ada9598 12938
fd8cb379
JX
12939#: builtin/remote.c:973
12940#, c-format
12941msgid "rebases interactively (with merges) onto remote %s"
12942msgstr "交互式变基(含合并提交)到远程 %s"
12943
12944#: builtin/remote.c:976
5c57d762
JX
12945#, c-format
12946msgid "rebases onto remote %s"
12947msgstr "变基到远程 %s"
12948
fd8cb379 12949#: builtin/remote.c:980
81809b99 12950#, c-format
8ada9598 12951msgid " merges with remote %s"
81809b99 12952msgstr " 与远程 %s 合并"
8ada9598 12953
fd8cb379 12954#: builtin/remote.c:983
81809b99 12955#, c-format
8ada9598 12956msgid "merges with remote %s"
81809b99 12957msgstr "与远程 %s 合并"
8ada9598 12958
fd8cb379 12959#: builtin/remote.c:986
5c57d762
JX
12960#, c-format
12961msgid "%-*s and with remote %s\n"
12962msgstr "%-*s 以及和远程 %s\n"
8ada9598 12963
fd8cb379 12964#: builtin/remote.c:1029
8ada9598 12965msgid "create"
81809b99 12966msgstr "创建"
8ada9598 12967
fd8cb379 12968#: builtin/remote.c:1032
8ada9598 12969msgid "delete"
81809b99 12970msgstr "删除"
8ada9598 12971
fd8cb379 12972#: builtin/remote.c:1036
8ada9598 12973msgid "up to date"
81809b99 12974msgstr "最新"
8ada9598 12975
fd8cb379 12976#: builtin/remote.c:1039
8ada9598 12977msgid "fast-forwardable"
81809b99 12978msgstr "可快进"
8ada9598 12979
fd8cb379 12980#: builtin/remote.c:1042
8ada9598 12981msgid "local out of date"
81809b99 12982msgstr "本地已过时"
8ada9598 12983
fd8cb379 12984#: builtin/remote.c:1049
8ada9598
JX
12985#, c-format
12986msgid " %-*s forces to %-*s (%s)"
81809b99 12987msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 12988
fd8cb379 12989#: builtin/remote.c:1052
8ada9598
JX
12990#, c-format
12991msgid " %-*s pushes to %-*s (%s)"
81809b99 12992msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 12993
fd8cb379 12994#: builtin/remote.c:1056
8ada9598
JX
12995#, c-format
12996msgid " %-*s forces to %s"
81809b99 12997msgstr " %-*s 强制推送至 %s"
8ada9598 12998
fd8cb379 12999#: builtin/remote.c:1059
8ada9598
JX
13000#, c-format
13001msgid " %-*s pushes to %s"
81809b99 13002msgstr " %-*s 推送至 %s"
8ada9598 13003
fd8cb379 13004#: builtin/remote.c:1127
ef317cd5 13005msgid "do not query remotes"
07432cef 13006msgstr "不查询远程"
ef317cd5 13007
fd8cb379 13008#: builtin/remote.c:1154
81809b99 13009#, c-format
8ada9598 13010msgid "* remote %s"
81809b99 13011msgstr "* 远程 %s"
8ada9598 13012
fd8cb379 13013#: builtin/remote.c:1155
8ada9598
JX
13014#, c-format
13015msgid " Fetch URL: %s"
81809b99 13016msgstr " 获取地址:%s"
8ada9598 13017
fd8cb379 13018#: builtin/remote.c:1156 builtin/remote.c:1172 builtin/remote.c:1311
8ada9598 13019msgid "(no URL)"
81809b99 13020msgstr "(无 URL)"
8ada9598 13021
a4f16749
JX
13022#. TRANSLATORS: the colon ':' should align
13023#. with the one in " Fetch URL: %s"
13024#. translation.
13025#.
fd8cb379 13026#: builtin/remote.c:1170 builtin/remote.c:1172
8ada9598
JX
13027#, c-format
13028msgid " Push URL: %s"
81809b99 13029msgstr " 推送地址:%s"
8ada9598 13030
fd8cb379 13031#: builtin/remote.c:1174 builtin/remote.c:1176 builtin/remote.c:1178
81809b99 13032#, c-format
8ada9598 13033msgid " HEAD branch: %s"
4375c10e 13034msgstr " HEAD 分支:%s"
8ada9598 13035
5c57d762 13036# 译者:中文字符串拼接,可删除前导空格
fd8cb379 13037#: builtin/remote.c:1174
5c57d762
JX
13038msgid "(not queried)"
13039msgstr "(未查询)"
13040
fd8cb379 13041#: builtin/remote.c:1176
5c57d762
JX
13042msgid "(unknown)"
13043msgstr "(未知)"
13044
fd8cb379 13045#: builtin/remote.c:1180
8ada9598
JX
13046#, c-format
13047msgid ""
13048" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 13049msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 13050
fd8cb379 13051#: builtin/remote.c:1192
81809b99 13052#, c-format
8ada9598
JX
13053msgid " Remote branch:%s"
13054msgid_plural " Remote branches:%s"
81809b99 13055msgstr[0] " 远程分支:%s"
5ae481e0 13056msgstr[1] " 远程分支:%s"
8ada9598 13057
81809b99 13058# 译者:中文字符串拼接,可删除前导空格
fd8cb379 13059#: builtin/remote.c:1195 builtin/remote.c:1221
8ada9598 13060msgid " (status not queried)"
81809b99 13061msgstr "(状态未查询)"
8ada9598 13062
fd8cb379 13063#: builtin/remote.c:1204
8ada9598
JX
13064msgid " Local branch configured for 'git pull':"
13065msgid_plural " Local branches configured for 'git pull':"
81809b99 13066msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 13067msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 13068
fd8cb379 13069#: builtin/remote.c:1212
8ada9598 13070msgid " Local refs will be mirrored by 'git push'"
81809b99 13071msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 13072
fd8cb379 13073#: builtin/remote.c:1218
81809b99 13074#, c-format
8ada9598
JX
13075msgid " Local ref configured for 'git push'%s:"
13076msgid_plural " Local refs configured for 'git push'%s:"
81809b99 13077msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 13078msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 13079
fd8cb379 13080#: builtin/remote.c:1239
ef317cd5 13081msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 13082msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 13083
fd8cb379 13084#: builtin/remote.c:1241
ef317cd5 13085msgid "delete refs/remotes/<name>/HEAD"
07432cef 13086msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 13087
fd8cb379 13088#: builtin/remote.c:1256
8ada9598 13089msgid "Cannot determine remote HEAD"
81809b99 13090msgstr "无法确定远程 HEAD"
8ada9598 13091
fd8cb379 13092#: builtin/remote.c:1258
8ada9598 13093msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 13094msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 13095
fd8cb379 13096#: builtin/remote.c:1268
81809b99 13097#, c-format
8ada9598 13098msgid "Could not delete %s"
81809b99 13099msgstr "无法删除 %s"
8ada9598 13100
fd8cb379 13101#: builtin/remote.c:1276
81809b99 13102#, c-format
8ada9598 13103msgid "Not a valid ref: %s"
81809b99 13104msgstr "不是一个有效引用:%s"
8ada9598 13105
fd8cb379 13106#: builtin/remote.c:1278
81809b99 13107#, c-format
8ada9598 13108msgid "Could not setup %s"
81809b99 13109msgstr "不能设置 %s"
8ada9598
JX
13110
13111# 译者:注意保持前导空格
fd8cb379 13112#: builtin/remote.c:1296
81809b99 13113#, c-format
8ada9598 13114msgid " %s will become dangling!"
07432cef 13115msgstr " %s 将成为摇摆状态!"
8ada9598
JX
13116
13117# 译者:注意保持前导空格
fd8cb379 13118#: builtin/remote.c:1297
81809b99 13119#, c-format
8ada9598 13120msgid " %s has become dangling!"
07432cef 13121msgstr " %s 已成为摇摆状态!"
8ada9598 13122
fd8cb379 13123#: builtin/remote.c:1307
81809b99 13124#, c-format
8ada9598 13125msgid "Pruning %s"
81809b99 13126msgstr "修剪 %s"
8ada9598 13127
fd8cb379 13128#: builtin/remote.c:1308
8ada9598
JX
13129#, c-format
13130msgid "URL: %s"
81809b99 13131msgstr "URL:%s"
8ada9598 13132
fd8cb379 13133#: builtin/remote.c:1324
8ada9598
JX
13134#, c-format
13135msgid " * [would prune] %s"
81809b99 13136msgstr " * [将删除] %s"
8ada9598 13137
fd8cb379 13138#: builtin/remote.c:1327
8ada9598
JX
13139#, c-format
13140msgid " * [pruned] %s"
81809b99 13141msgstr " * [已删除] %s"
8ada9598 13142
fd8cb379 13143#: builtin/remote.c:1372
ef317cd5 13144msgid "prune remotes after fetching"
07432cef 13145msgstr "抓取后清除远程"
ef317cd5 13146
fd8cb379 13147#: builtin/remote.c:1435 builtin/remote.c:1489 builtin/remote.c:1557
81809b99 13148#, c-format
8ada9598 13149msgid "No such remote '%s'"
81809b99 13150msgstr "没有此远程 '%s'"
8ada9598 13151
fd8cb379 13152#: builtin/remote.c:1451
ef317cd5 13153msgid "add branch"
07432cef 13154msgstr "添加分支"
ef317cd5 13155
fd8cb379 13156#: builtin/remote.c:1458
8ada9598 13157msgid "no remote specified"
81809b99 13158msgstr "未指定远程"
8ada9598 13159
fd8cb379 13160#: builtin/remote.c:1475
94550ed3
JX
13161msgid "query push URLs rather than fetch URLs"
13162msgstr "查询推送 URL 地址,而非获取 URL 地址"
13163
fd8cb379 13164#: builtin/remote.c:1477
94550ed3
JX
13165msgid "return all URLs"
13166msgstr "返回所有 URL 地址"
13167
fd8cb379 13168#: builtin/remote.c:1505
94550ed3
JX
13169#, c-format
13170msgid "no URLs configured for remote '%s'"
13171msgstr "没有给远程仓库 '%s' 设定 URL"
13172
fd8cb379 13173#: builtin/remote.c:1531
ef317cd5 13174msgid "manipulate push URLs"
07432cef 13175msgstr "操作推送 URLS"
ef317cd5 13176
fd8cb379 13177#: builtin/remote.c:1533
ef317cd5 13178msgid "add URL"
07432cef 13179msgstr "添加 URL"
ef317cd5 13180
fd8cb379 13181#: builtin/remote.c:1535
ef317cd5 13182msgid "delete URLs"
07432cef 13183msgstr "删除 URLS"
ef317cd5 13184
fd8cb379 13185#: builtin/remote.c:1542
8ada9598 13186msgid "--add --delete doesn't make sense"
81809b99 13187msgstr "--add --delete 无意义"
8ada9598 13188
fd8cb379 13189#: builtin/remote.c:1581
81809b99 13190#, c-format
8ada9598 13191msgid "Invalid old URL pattern: %s"
4375c10e 13192msgstr "无效的旧 URL 匹配模版:%s"
8ada9598 13193
fd8cb379 13194#: builtin/remote.c:1589
81809b99 13195#, c-format
8ada9598 13196msgid "No such URL found: %s"
4375c10e 13197msgstr "未找到此 URL:%s"
8ada9598 13198
fd8cb379 13199#: builtin/remote.c:1591
8ada9598 13200msgid "Will not delete all non-push URLs"
4375c10e 13201msgstr "将不会删除所有非推送 URL 地址"
8ada9598 13202
fd8cb379 13203#: builtin/remote.c:1607
ef317cd5 13204msgid "be verbose; must be placed before a subcommand"
07432cef 13205msgstr "冗长输出;必须置于子命令之前"
ef317cd5 13206
fd8cb379 13207#: builtin/remote.c:1638
a0b6b246
JX
13208#, c-format
13209msgid "Unknown subcommand: %s"
13210msgstr "未知子命令:%s"
13211
a4f16749 13212#: builtin/repack.c:18
814ff314
JX
13213msgid "git repack [<options>]"
13214msgstr "git repack [<选项>]"
90314792 13215
a4f16749 13216#: builtin/repack.c:23
1a79b2f1
JX
13217msgid ""
13218"Incremental repacks are incompatible with bitmap indexes. Use\n"
13219"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
13220msgstr ""
13221"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
13222"或禁用 pack.writebitmaps 配置。"
13223
fd8cb379 13224#: builtin/repack.c:180
90314792
JX
13225msgid "pack everything in a single pack"
13226msgstr "所有内容打包到一个包文件中"
13227
fd8cb379 13228#: builtin/repack.c:182
90314792
JX
13229msgid "same as -a, and turn unreachable objects loose"
13230msgstr "和 -a 相同,并将不可达的对象设为松散对象"
13231
fd8cb379 13232#: builtin/repack.c:185
90314792
JX
13233msgid "remove redundant packs, and run git-prune-packed"
13234msgstr "删除多余的包,运行 git-prune-packed"
13235
fd8cb379 13236#: builtin/repack.c:187
90314792
JX
13237msgid "pass --no-reuse-delta to git-pack-objects"
13238msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
13239
fd8cb379 13240#: builtin/repack.c:189
90314792
JX
13241msgid "pass --no-reuse-object to git-pack-objects"
13242msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
13243
fd8cb379 13244#: builtin/repack.c:191
90314792
JX
13245msgid "do not run git-update-server-info"
13246msgstr "不运行 git-update-server-info"
13247
fd8cb379 13248#: builtin/repack.c:194
90314792
JX
13249msgid "pass --local to git-pack-objects"
13250msgstr "向 git-pack-objects 传递参数 --local"
13251
fd8cb379 13252#: builtin/repack.c:196
6c94aba5
JX
13253msgid "write bitmap index"
13254msgstr "写 bitmap 索引"
13255
fd8cb379 13256#: builtin/repack.c:197
90314792
JX
13257msgid "approxidate"
13258msgstr "近似日期"
13259
fd8cb379 13260#: builtin/repack.c:198
90314792
JX
13261msgid "with -A, do not loosen objects older than this"
13262msgstr "使用 -A,不要将早于给定时间的对象过期"
13263
fd8cb379 13264#: builtin/repack.c:200
5c57d762
JX
13265msgid "with -a, repack unreachable objects"
13266msgstr "使用 -a ,重新对不可达对象打包"
13267
fd8cb379 13268#: builtin/repack.c:202
90314792
JX
13269msgid "size of the window used for delta compression"
13270msgstr "用于增量压缩的窗口值"
13271
fd8cb379 13272#: builtin/repack.c:203 builtin/repack.c:209
8376b58d
JX
13273msgid "bytes"
13274msgstr "字节"
13275
fd8cb379 13276#: builtin/repack.c:204
90314792
JX
13277msgid "same as the above, but limit memory size instead of entries count"
13278msgstr "和上面的相似,但限制内存大小而非条目数"
13279
fd8cb379 13280#: builtin/repack.c:206
90314792
JX
13281msgid "limits the maximum delta depth"
13282msgstr "限制最大增量深度"
13283
fd8cb379 13284#: builtin/repack.c:208
a4f16749
JX
13285msgid "limits the maximum number of threads"
13286msgstr "限制最大线程数"
13287
fd8cb379 13288#: builtin/repack.c:210
90314792 13289msgid "maximum size of each packfile"
dbd6cced 13290msgstr "每个包文件的最大尺寸"
90314792 13291
fd8cb379 13292#: builtin/repack.c:212
6c94aba5
JX
13293msgid "repack objects in packs marked with .keep"
13294msgstr "对标记为 .keep 的包中的对象重新打包"
13295
fd8cb379
JX
13296#: builtin/repack.c:214
13297msgid "do not repack this pack"
13298msgstr "不要对该包文件重新打包"
13299
13300#: builtin/repack.c:224
94550ed3
JX
13301msgid "cannot delete packs in a precious-objects repo"
13302msgstr "不能删除珍品仓库中的打包文件"
13303
fd8cb379 13304#: builtin/repack.c:228
5c57d762
JX
13305msgid "--keep-unreachable and -A are incompatible"
13306msgstr "--keep-unreachable 和 -A 不兼容"
13307
fd8cb379 13308#: builtin/repack.c:425 builtin/worktree.c:139
90314792 13309#, c-format
5c57d762
JX
13310msgid "failed to remove '%s'"
13311msgstr "无法删除 '%s'"
90314792 13312
fd8cb379 13313#: builtin/replace.c:22
ef317cd5 13314msgid "git replace [-f] <object> <replacement>"
07432cef 13315msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 13316
fd8cb379 13317#: builtin/replace.c:23
6acbf033
JX
13318msgid "git replace [-f] --edit <object>"
13319msgstr "git replace [-f] --edit <对象>"
13320
fd8cb379 13321#: builtin/replace.c:24
6acbf033
JX
13322msgid "git replace [-f] --graft <commit> [<parent>...]"
13323msgstr "git replace [-f] --graft <提交> [<父提交>...]"
13324
fd8cb379
JX
13325#: builtin/replace.c:25
13326msgid "git replace [-f] --convert-graft-file"
13327msgstr "git replace [-f] --convert-graft-file"
13328
13329#: builtin/replace.c:26
ef317cd5 13330msgid "git replace -d <object>..."
07432cef 13331msgstr "git replace -d <对象>..."
ef317cd5 13332
fd8cb379 13333#: builtin/replace.c:27
cfff71a9
JX
13334msgid "git replace [--format=<format>] [-l [<pattern>]]"
13335msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 13336
fd8cb379 13337#: builtin/replace.c:371 builtin/replace.c:415 builtin/replace.c:445
6acbf033
JX
13338#, c-format
13339msgid "Not a valid object name: '%s'"
13340msgstr "不是一个有效的对象名:'%s'"
13341
fd8cb379 13342#: builtin/replace.c:407
6acbf033
JX
13343#, c-format
13344msgid "bad mergetag in commit '%s'"
55a16ee4 13345msgstr "提交 '%s' 中含有损坏的合并标签"
6acbf033 13346
fd8cb379 13347#: builtin/replace.c:409
6acbf033
JX
13348#, c-format
13349msgid "malformed mergetag in commit '%s'"
fd8cb379 13350msgstr "提交 '%s' 中含有格式错误的合并标签"
6acbf033 13351
fd8cb379 13352#: builtin/replace.c:421
6acbf033
JX
13353#, c-format
13354msgid ""
13355"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
13356"instead of --graft"
55a16ee4 13357msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
6acbf033 13358
fd8cb379 13359#: builtin/replace.c:460
6acbf033
JX
13360#, c-format
13361msgid "the original commit '%s' has a gpg signature."
13362msgstr "原始提交 '%s' 中包含一个 GPG 签名"
13363
fd8cb379 13364#: builtin/replace.c:461
6acbf033
JX
13365msgid "the signature will be removed in the replacement commit!"
13366msgstr "在替换的提交中签名将被移除!"
13367
fd8cb379 13368#: builtin/replace.c:471
6acbf033
JX
13369#, c-format
13370msgid "could not write replacement commit for: '%s'"
13371msgstr "不能为 '%s' 写替换提交"
13372
fd8cb379
JX
13373#: builtin/replace.c:514
13374#, c-format
13375msgid ""
13376"could not convert the following graft(s):\n"
13377"%s"
13378msgstr ""
13379"不能转换下列移植:\n"
13380"%s"
13381
13382#: builtin/replace.c:535
ef317cd5 13383msgid "list replace refs"
07432cef 13384msgstr "列出替换的引用"
ef317cd5 13385
fd8cb379 13386#: builtin/replace.c:536
ef317cd5 13387msgid "delete replace refs"
07432cef 13388msgstr "删除替换的引用"
ef317cd5 13389
fd8cb379 13390#: builtin/replace.c:537
6acbf033
JX
13391msgid "edit existing object"
13392msgstr "编辑现存的对象"
13393
fd8cb379 13394#: builtin/replace.c:538
6acbf033
JX
13395msgid "change a commit's parents"
13396msgstr "修改一个提交的父提交"
13397
fd8cb379
JX
13398#: builtin/replace.c:539
13399msgid "convert existing graft file"
13400msgstr "转换现存的移植文件"
13401
13402#: builtin/replace.c:540
ef317cd5 13403msgid "replace the ref if it exists"
07432cef 13404msgstr "如果存在则替换引用"
ef317cd5 13405
fd8cb379 13406#: builtin/replace.c:542
6acbf033
JX
13407msgid "do not pretty-print contents for --edit"
13408msgstr "不要为 --edit 操作美观显示内容"
13409
fd8cb379 13410#: builtin/replace.c:543
cfff71a9
JX
13411msgid "use this format"
13412msgstr "使用此格式"
13413
a4f16749 13414#: builtin/rerere.c:13
814ff314
JX
13415msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
13416msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
ef317cd5 13417
a4f16749 13418#: builtin/rerere.c:59
ef317cd5 13419msgid "register clean resolutions in index"
07432cef 13420msgstr "在索引中注册干净的解决方案"
ef317cd5 13421
a4f16749 13422#: builtin/reset.c:29
ef317cd5
JX
13423msgid ""
13424"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 13425msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5 13426
a4f16749 13427#: builtin/reset.c:30
a0b6b246
JX
13428msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
13429msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
ef317cd5 13430
a4f16749 13431#: builtin/reset.c:31
07432cef
WS
13432msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
13433msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 13434
a4f16749 13435#: builtin/reset.c:37
c04f5ac3
JX
13436msgid "mixed"
13437msgstr "混杂"
13438
a4f16749 13439#: builtin/reset.c:37
c04f5ac3
JX
13440msgid "soft"
13441msgstr "软性"
13442
a4f16749 13443#: builtin/reset.c:37
c04f5ac3
JX
13444msgid "hard"
13445msgstr "硬性"
13446
a4f16749 13447#: builtin/reset.c:37
8ada9598
JX
13448msgid "merge"
13449msgstr "合并"
13450
a4f16749 13451#: builtin/reset.c:37
c04f5ac3
JX
13452msgid "keep"
13453msgstr "保持"
13454
6937cb4e 13455#: builtin/reset.c:78
c04f5ac3
JX
13456msgid "You do not have a valid HEAD."
13457msgstr "您没有一个有效的 HEAD。"
13458
6937cb4e 13459#: builtin/reset.c:80
c04f5ac3
JX
13460msgid "Failed to find tree of HEAD."
13461msgstr "无法找到 HEAD 指向的树。"
13462
6937cb4e 13463#: builtin/reset.c:86
c04f5ac3
JX
13464#, c-format
13465msgid "Failed to find tree of %s."
13466msgstr "无法找到 %s 指向的树。"
13467
31e5e17b 13468#: builtin/reset.c:111
c04f5ac3
JX
13469#, c-format
13470msgid "HEAD is now at %s"
13471msgstr "HEAD 现在位于 %s"
13472
90e6ef53 13473# 译者:汉字之间无空格,故删除%s前后空格
31e5e17b 13474#: builtin/reset.c:189
c04f5ac3
JX
13475#, c-format
13476msgid "Cannot do a %s reset in the middle of a merge."
13477msgstr "在合并过程中不能做%s重置操作。"
13478
31e5e17b 13479#: builtin/reset.c:289
ef317cd5 13480msgid "be quiet, only report errors"
07432cef 13481msgstr "安静模式,只报告错误"
ef317cd5 13482
31e5e17b 13483#: builtin/reset.c:291
ef317cd5 13484msgid "reset HEAD and index"
07432cef 13485msgstr "重置 HEAD 和索引"
ef317cd5 13486
31e5e17b 13487#: builtin/reset.c:292
ef317cd5 13488msgid "reset only HEAD"
07432cef 13489msgstr "只重置 HEAD"
ef317cd5 13490
31e5e17b 13491#: builtin/reset.c:294 builtin/reset.c:296
ef317cd5 13492msgid "reset HEAD, index and working tree"
07432cef 13493msgstr "重置 HEAD、索引和工作区"
ef317cd5 13494
31e5e17b 13495#: builtin/reset.c:298
ef317cd5 13496msgid "reset HEAD but keep local changes"
07432cef 13497msgstr "重置 HEAD 但保存本地变更"
ef317cd5 13498
31e5e17b 13499#: builtin/reset.c:304
6c94aba5
JX
13500msgid "record only the fact that removed paths will be added later"
13501msgstr "将删除的路径标记为稍后添加"
13502
31e5e17b 13503#: builtin/reset.c:321
07432cef
WS
13504#, c-format
13505msgid "Failed to resolve '%s' as a valid revision."
13506msgstr "无法将 '%s' 解析为一个有效的版本。"
13507
31e5e17b 13508#: builtin/reset.c:329
07432cef
WS
13509#, c-format
13510msgid "Failed to resolve '%s' as a valid tree."
13511msgstr "无法将 '%s' 解析为一个有效的树对象。"
13512
31e5e17b 13513#: builtin/reset.c:338
c04f5ac3 13514msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 13515msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 13516
31e5e17b 13517#: builtin/reset.c:347
c04f5ac3 13518msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
d9d56b23 13519msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
c04f5ac3 13520
90e6ef53 13521# 译者:汉字之间无空格,故删除%s前后空格
31e5e17b 13522#: builtin/reset.c:349
c04f5ac3
JX
13523#, c-format
13524msgid "Cannot do %s reset with paths."
13525msgstr "不能带路径进行%s重置。"
13526
90e6ef53 13527# 译者:汉字之间无空格,故删除%s前后空格
31e5e17b 13528#: builtin/reset.c:359
c04f5ac3
JX
13529#, c-format
13530msgid "%s reset is not allowed in a bare repository"
160fb2b2 13531msgstr "不能对纯仓库进行%s重置"
c04f5ac3 13532
31e5e17b 13533#: builtin/reset.c:363
6c94aba5
JX
13534msgid "-N can only be used with --mixed"
13535msgstr "-N 只能和 --mixed 同时使用"
13536
31e5e17b 13537#: builtin/reset.c:380
90314792 13538msgid "Unstaged changes after reset:"
160fb2b2 13539msgstr "重置后取消暂存的变更:"
90314792 13540
31e5e17b 13541#: builtin/reset.c:386
ef317cd5
JX
13542#, c-format
13543msgid "Could not reset index file to revision '%s'."
13544msgstr "不能重置索引文件至版本 '%s'。"
13545
31e5e17b 13546#: builtin/reset.c:390
07432cef
WS
13547msgid "Could not write new index file."
13548msgstr "不能写入新的索引文件。"
13549
31e5e17b
JX
13550#: builtin/rev-list.c:397
13551msgid "cannot combine --exclude-promisor-objects and --missing"
13552msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
13553
13554#: builtin/rev-list.c:455
5809aa05
JX
13555msgid "object filtering requires --objects"
13556msgstr "对象过滤需要 --objects"
13557
31e5e17b 13558#: builtin/rev-list.c:458
5809aa05
JX
13559#, c-format
13560msgid "invalid sparse value '%s'"
13561msgstr "无效的稀疏值 '%s'"
13562
31e5e17b 13563#: builtin/rev-list.c:499
1b7f4a34
JX
13564msgid "rev-list does not support display of notes"
13565msgstr "rev-list 不支持显示注解"
13566
31e5e17b 13567#: builtin/rev-list.c:502
5809aa05
JX
13568msgid "cannot combine --use-bitmap-index with object filtering"
13569msgstr "不能将 --use-bitmap-index 和对象过滤组合使用"
13570
fd8cb379 13571#: builtin/rev-parse.c:406
814ff314
JX
13572msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
13573msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
ef317cd5 13574
fd8cb379 13575#: builtin/rev-parse.c:411
ef317cd5 13576msgid "keep the `--` passed as an arg"
07432cef 13577msgstr "保持 `--` 作为一个参数传递"
ef317cd5 13578
fd8cb379 13579#: builtin/rev-parse.c:413
ef317cd5 13580msgid "stop parsing after the first non-option argument"
07432cef 13581msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 13582
fd8cb379 13583#: builtin/rev-parse.c:416
cfff71a9
JX
13584msgid "output in stuck long form"
13585msgstr "以固定长格式输出"
13586
fd8cb379 13587#: builtin/rev-parse.c:549
ef317cd5 13588msgid ""
814ff314 13589"git rev-parse --parseopt [<options>] -- [<args>...]\n"
ef317cd5 13590" or: git rev-parse --sq-quote [<arg>...]\n"
814ff314 13591" or: git rev-parse [<options>] [<arg>...]\n"
ef317cd5
JX
13592"\n"
13593"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
13594msgstr ""
814ff314 13595"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
90314792 13596" 或者:git rev-parse --sq-quote [<参数>...]\n"
814ff314 13597" 或者:git rev-parse [<选项>] [<参数>...]\n"
07432cef
WS
13598"\n"
13599"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5 13600
a4f16749 13601#: builtin/revert.c:23
814ff314
JX
13602msgid "git revert [<options>] <commit-ish>..."
13603msgstr "git revert [<选项>] <提交号>..."
ef317cd5 13604
a4f16749 13605#: builtin/revert.c:24
ef317cd5 13606msgid "git revert <subcommand>"
07432cef 13607msgstr "git revert <子命令>"
ef317cd5 13608
a4f16749 13609#: builtin/revert.c:29
814ff314
JX
13610msgid "git cherry-pick [<options>] <commit-ish>..."
13611msgstr "git cherry-pick [<选项>] <提交号>..."
ef317cd5 13612
a4f16749 13613#: builtin/revert.c:30
ef317cd5 13614msgid "git cherry-pick <subcommand>"
07432cef 13615msgstr "git cherry-pick <子命令>"
ef317cd5 13616
a4f16749 13617#: builtin/revert.c:90
ef317cd5
JX
13618#, c-format
13619msgid "%s: %s cannot be used with %s"
13620msgstr "%s:%s 不能和 %s 同时使用"
13621
a4f16749 13622#: builtin/revert.c:99
ef317cd5 13623msgid "end revert or cherry-pick sequence"
07432cef 13624msgstr "终止反转或拣选操作"
ef317cd5 13625
a4f16749 13626#: builtin/revert.c:100
ef317cd5 13627msgid "resume revert or cherry-pick sequence"
07432cef 13628msgstr "继续反转或拣选操作"
ef317cd5 13629
a4f16749 13630#: builtin/revert.c:101
ef317cd5 13631msgid "cancel revert or cherry-pick sequence"
07432cef 13632msgstr "取消反转或拣选操作"
ef317cd5 13633
a4f16749 13634#: builtin/revert.c:102
ef317cd5 13635msgid "don't automatically commit"
07432cef 13636msgstr "不要自动提交"
ef317cd5 13637
a4f16749 13638#: builtin/revert.c:103
ef317cd5 13639msgid "edit the commit message"
07432cef 13640msgstr "编辑提交说明"
ef317cd5 13641
a4f16749 13642#: builtin/revert.c:106
87cb7997 13643msgid "parent-number"
07432cef 13644msgstr "父编号"
ef317cd5 13645
a4f16749 13646#: builtin/revert.c:107
87cb7997
JX
13647msgid "select mainline parent"
13648msgstr "选择主干父提交编号"
13649
a4f16749 13650#: builtin/revert.c:109
ef317cd5 13651msgid "merge strategy"
07432cef 13652msgstr "合并策略"
ef317cd5 13653
a4f16749 13654#: builtin/revert.c:110
ef317cd5 13655msgid "option"
07432cef 13656msgstr "选项"
ef317cd5 13657
a4f16749 13658#: builtin/revert.c:111
ef317cd5 13659msgid "option for merge strategy"
07432cef 13660msgstr "合并策略的选项"
ef317cd5 13661
a4f16749 13662#: builtin/revert.c:120
ef317cd5 13663msgid "append commit name"
07432cef 13664msgstr "追加提交名称"
ef317cd5 13665
a4f16749 13666#: builtin/revert.c:122
ef317cd5 13667msgid "preserve initially empty commits"
07432cef 13668msgstr "保留初始化的空提交"
ef317cd5 13669
a4f16749 13670#: builtin/revert.c:124
ef317cd5 13671msgid "keep redundant, empty commits"
07432cef 13672msgstr "保持多余的、空的提交"
ef317cd5 13673
6937cb4e 13674#: builtin/revert.c:214
c04f5ac3
JX
13675msgid "revert failed"
13676msgstr "还原失败"
13677
6937cb4e 13678#: builtin/revert.c:227
c04f5ac3
JX
13679msgid "cherry-pick failed"
13680msgstr "拣选失败"
13681
a4f16749 13682#: builtin/rm.c:18
814ff314
JX
13683msgid "git rm [<options>] [--] <file>..."
13684msgstr "git rm [<选项>] [--] <文件>..."
07432cef 13685
a4f16749 13686#: builtin/rm.c:206
c04f5ac3 13687msgid ""
2e8451e8
JX
13688"the following file has staged content different from both the\n"
13689"file and the HEAD:"
13690msgid_plural ""
13691"the following files have staged content different from both the\n"
13692"file and the HEAD:"
13693msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
13694msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
13695
a4f16749 13696#: builtin/rm.c:211
2e8451e8
JX
13697msgid ""
13698"\n"
c04f5ac3
JX
13699"(use -f to force removal)"
13700msgstr ""
2e8451e8 13701"\n"
c04f5ac3
JX
13702"(使用 -f 强制删除)"
13703
a4f16749 13704#: builtin/rm.c:215
2e8451e8
JX
13705msgid "the following file has changes staged in the index:"
13706msgid_plural "the following files have changes staged in the index:"
160fb2b2
JX
13707msgstr[0] "下列文件索引中有变更"
13708msgstr[1] "下列文件索引中有变更"
c04f5ac3 13709
a4f16749 13710#: builtin/rm.c:219 builtin/rm.c:228
c04f5ac3 13711msgid ""
2e8451e8 13712"\n"
c04f5ac3
JX
13713"(use --cached to keep the file, or -f to force removal)"
13714msgstr ""
2e8451e8
JX
13715"\n"
13716"(使用 --cached 保留本地文件,或用 -f 强制删除)"
13717
a4f16749 13718#: builtin/rm.c:225
2e8451e8
JX
13719msgid "the following file has local modifications:"
13720msgid_plural "the following files have local modifications:"
13721msgstr[0] "如下文件有本地修改:"
13722msgstr[1] "如下文件有本地修改:"
c04f5ac3 13723
fd8cb379 13724#: builtin/rm.c:241
ef317cd5 13725msgid "do not list removed files"
07432cef 13726msgstr "不列出删除的文件"
ef317cd5 13727
fd8cb379 13728#: builtin/rm.c:242
ef317cd5 13729msgid "only remove from the index"
07432cef 13730msgstr "只从索引区删除"
ef317cd5 13731
fd8cb379 13732#: builtin/rm.c:243
ef317cd5 13733msgid "override the up-to-date check"
07432cef 13734msgstr "忽略文件更新状态检查"
ef317cd5 13735
fd8cb379 13736#: builtin/rm.c:244
ef317cd5 13737msgid "allow recursive removal"
07432cef 13738msgstr "允许递归删除"
ef317cd5 13739
fd8cb379 13740#: builtin/rm.c:246
ef317cd5 13741msgid "exit with a zero status even if nothing matched"
07432cef 13742msgstr "即使没有匹配,也以零状态退出"
ef317cd5 13743
fd8cb379 13744#: builtin/rm.c:306
c04f5ac3
JX
13745#, c-format
13746msgid "not removing '%s' recursively without -r"
13747msgstr "未提供 -r 选项不会递归删除 '%s'"
13748
fd8cb379 13749#: builtin/rm.c:345
c04f5ac3
JX
13750#, c-format
13751msgid "git rm: unable to remove %s"
13752msgstr "git rm:不能删除 %s"
13753
fd8cb379 13754#: builtin/rm.c:368
1a79b2f1
JX
13755#, c-format
13756msgid "could not remove '%s'"
13757msgstr "无法删除 '%s'"
13758
fd8cb379 13759#: builtin/send-pack.c:20
1b7f4a34
JX
13760msgid ""
13761"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
13762"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
13763"[<ref>...]\n"
13764" --all and explicit <ref> specification are mutually exclusive."
13765msgstr ""
13766"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
13767"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
13768" --all 和明确的 <引用> 互斥。"
13769
fd8cb379 13770#: builtin/send-pack.c:163
1b7f4a34
JX
13771msgid "remote name"
13772msgstr "远程名称"
13773
fd8cb379 13774#: builtin/send-pack.c:177
1b7f4a34
JX
13775msgid "use stateless RPC protocol"
13776msgstr "使用无状态的 RPC 协议"
13777
fd8cb379 13778#: builtin/send-pack.c:178
1b7f4a34
JX
13779msgid "read refs from stdin"
13780msgstr "从标准输入读取引用"
13781
fd8cb379 13782#: builtin/send-pack.c:179
1b7f4a34
JX
13783msgid "print status from remote helper"
13784msgstr "打印来自远程 helper 的状态"
13785
fd8cb379
JX
13786#: builtin/serve.c:7
13787msgid "git serve [<options>]"
13788msgstr "git serve [<选项>]"
13789
13790#: builtin/serve.c:17 builtin/upload-pack.c:23
13791msgid "quit after a single request/response exchange"
13792msgstr "在一次单独的请求/响应之后退出"
13793
13794#: builtin/serve.c:19
13795msgid "exit immediately after advertising capabilities"
13796msgstr "在广告功能后立即退出"
13797
a4f16749 13798#: builtin/shortlog.c:14
fd8cb379
JX
13799msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
13800msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
13801
13802#: builtin/shortlog.c:15
13803msgid "git log --pretty=short | git shortlog [<options>]"
13804msgstr "git log --pretty=short | git shortlog [<选项>]"
ef317cd5 13805
fd8cb379 13806#: builtin/shortlog.c:264
1a79b2f1
JX
13807msgid "Group by committer rather than author"
13808msgstr "按照提交者分组而不是作者"
13809
fd8cb379 13810#: builtin/shortlog.c:266
ef317cd5 13811msgid "sort output according to the number of commits per author"
07432cef 13812msgstr "根据每个作者的提交数量排序"
ef317cd5 13813
fd8cb379 13814#: builtin/shortlog.c:268
ef317cd5 13815msgid "Suppress commit descriptions, only provides commit count"
07432cef 13816msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 13817
fd8cb379 13818#: builtin/shortlog.c:270
ef317cd5 13819msgid "Show the email address of each author"
07432cef 13820msgstr "显示每个作者的电子邮件地址"
ef317cd5 13821
fd8cb379 13822#: builtin/shortlog.c:271
ef317cd5 13823msgid "w[,i1[,i2]]"
07432cef 13824msgstr "w[,i1[,i2]]"
ef317cd5 13825
fd8cb379 13826#: builtin/shortlog.c:272
ef317cd5 13827msgid "Linewrap output"
07432cef 13828msgstr "折行输出"
ef317cd5 13829
fd8cb379
JX
13830#: builtin/shortlog.c:298
13831msgid "too many arguments given outside repository"
13832msgstr "仓库外执行提供了太多的参数"
13833
a4f16749 13834#: builtin/show-branch.c:12
ef317cd5 13835msgid ""
814ff314 13836"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
13837"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
13838"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
13839"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
ef317cd5 13840msgstr ""
814ff314 13841"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
13842"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
13843"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
13844"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
ef317cd5 13845
a4f16749 13846#: builtin/show-branch.c:16
814ff314 13847msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
58b6f078 13848msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
ef317cd5 13849
a4f16749 13850#: builtin/show-branch.c:376
a0b6b246
JX
13851#, c-format
13852msgid "ignoring %s; cannot handle more than %d ref"
13853msgid_plural "ignoring %s; cannot handle more than %d refs"
13854msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
13855msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
13856
a4f16749 13857#: builtin/show-branch.c:530
a0b6b246
JX
13858#, c-format
13859msgid "no matching refs with %s"
13860msgstr "没有和 %s 匹配的引用"
13861
a4f16749 13862#: builtin/show-branch.c:626
ef317cd5 13863msgid "show remote-tracking and local branches"
07432cef 13864msgstr "显示远程跟踪的和本地的分支"
ef317cd5 13865
a4f16749 13866#: builtin/show-branch.c:628
ef317cd5 13867msgid "show remote-tracking branches"
07432cef 13868msgstr "显示远程跟踪的分支"
ef317cd5 13869
a4f16749 13870#: builtin/show-branch.c:630
ef317cd5 13871msgid "color '*!+-' corresponding to the branch"
07432cef 13872msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 13873
a4f16749 13874#: builtin/show-branch.c:632
ef317cd5 13875msgid "show <n> more commits after the common ancestor"
07432cef 13876msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 13877
a4f16749 13878#: builtin/show-branch.c:634
ef317cd5 13879msgid "synonym to more=-1"
07432cef 13880msgstr "和 more=-1 同义"
ef317cd5 13881
a4f16749 13882#: builtin/show-branch.c:635
ef317cd5 13883msgid "suppress naming strings"
07432cef 13884msgstr "不显示字符串命名"
ef317cd5 13885
a4f16749 13886#: builtin/show-branch.c:637
ef317cd5 13887msgid "include the current branch"
07432cef 13888msgstr "包括当前分支"
ef317cd5 13889
a4f16749 13890#: builtin/show-branch.c:639
ef317cd5 13891msgid "name commits with their object names"
07432cef 13892msgstr "以对象名字命名提交"
ef317cd5 13893
a4f16749 13894#: builtin/show-branch.c:641
ef317cd5 13895msgid "show possible merge bases"
07432cef 13896msgstr "显示可能合并的基线"
ef317cd5 13897
a4f16749 13898#: builtin/show-branch.c:643
ef317cd5 13899msgid "show refs unreachable from any other ref"
07432cef 13900msgstr "显示没有任何引用的的引用"
ef317cd5 13901
a4f16749 13902#: builtin/show-branch.c:645
ef317cd5 13903msgid "show commits in topological order"
07432cef 13904msgstr "以拓扑顺序显示提交"
ef317cd5 13905
a4f16749 13906#: builtin/show-branch.c:648
ef317cd5 13907msgid "show only commits not on the first branch"
07432cef 13908msgstr "只显示不在第一个分支上的提交"
ef317cd5 13909
a4f16749 13910#: builtin/show-branch.c:650
ef317cd5 13911msgid "show merges reachable from only one tip"
07432cef 13912msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 13913
a4f16749 13914#: builtin/show-branch.c:652
2e8451e8
JX
13915msgid "topologically sort, maintaining date order where possible"
13916msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 13917
a4f16749 13918#: builtin/show-branch.c:655
ef317cd5 13919msgid "<n>[,<base>]"
07432cef 13920msgstr "<n>[,<base>]"
ef317cd5 13921
a4f16749 13922#: builtin/show-branch.c:656
ef317cd5 13923msgid "show <n> most recent ref-log entries starting at base"
58b6f078 13924msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
ef317cd5 13925
a4f16749 13926#: builtin/show-branch.c:690
a0b6b246
JX
13927msgid ""
13928"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
13929msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
13930
a4f16749 13931#: builtin/show-branch.c:714
a0b6b246
JX
13932msgid "no branches given, and HEAD is not valid"
13933msgstr "未提供分支,且 HEAD 无效"
13934
a4f16749 13935#: builtin/show-branch.c:717
a0b6b246
JX
13936msgid "--reflog option needs one branch name"
13937msgstr "选项 --reflog 需要一个分支名"
13938
a4f16749 13939#: builtin/show-branch.c:720
a0b6b246
JX
13940#, c-format
13941msgid "only %d entry can be shown at one time."
13942msgid_plural "only %d entries can be shown at one time."
13943msgstr[0] "一次只能显示 %d 个条目。"
13944msgstr[1] "一次只能显示 %d 个条目。"
13945
a4f16749 13946#: builtin/show-branch.c:724
a0b6b246
JX
13947#, c-format
13948msgid "no such ref %s"
13949msgstr "无此引用 %s"
13950
a4f16749 13951#: builtin/show-branch.c:808
a0b6b246
JX
13952#, c-format
13953msgid "cannot handle more than %d rev."
13954msgid_plural "cannot handle more than %d revs."
13955msgstr[0] "不能处理 %d 个以上的版本。"
13956msgstr[1] "不能处理 %d 个以上的版本。"
13957
a4f16749 13958#: builtin/show-branch.c:812
a0b6b246
JX
13959#, c-format
13960msgid "'%s' is not a valid ref."
13961msgstr "'%s' 不是一个有效的引用。"
13962
a4f16749 13963#: builtin/show-branch.c:815
a0b6b246
JX
13964#, c-format
13965msgid "cannot find commit %s (%s)"
29004bbb 13966msgstr "不能找到提交 %s(%s)"
a0b6b246 13967
ef317cd5
JX
13968#: builtin/show-ref.c:10
13969msgid ""
814ff314
JX
13970"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
13971"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
ef317cd5 13972msgstr ""
814ff314
JX
13973"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
13974"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
ef317cd5
JX
13975
13976#: builtin/show-ref.c:11
94550ed3
JX
13977msgid "git show-ref --exclude-existing[=<pattern>]"
13978msgstr "git show-ref --exclude-existing[=<模式>]"
ef317cd5 13979
1a79b2f1 13980#: builtin/show-ref.c:159
ef317cd5 13981msgid "only show tags (can be combined with heads)"
55a16ee4 13982msgstr "只显示标签(可以和头共用)"
ef317cd5 13983
1a79b2f1 13984#: builtin/show-ref.c:160
ef317cd5 13985msgid "only show heads (can be combined with tags)"
55a16ee4 13986msgstr "只显示头(可以和标签共用)"
ef317cd5 13987
1a79b2f1 13988#: builtin/show-ref.c:161
ef317cd5 13989msgid "stricter reference checking, requires exact ref path"
07432cef 13990msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 13991
1a79b2f1 13992#: builtin/show-ref.c:164 builtin/show-ref.c:166
2e8451e8
JX
13993msgid "show the HEAD reference, even if it would be filtered out"
13994msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 13995
1a79b2f1 13996#: builtin/show-ref.c:168
ef317cd5 13997msgid "dereference tags into object IDs"
4375c10e 13998msgstr "转换标签到对象 ID"
ef317cd5 13999
1a79b2f1 14000#: builtin/show-ref.c:170
ef317cd5 14001msgid "only show SHA1 hash using <n> digits"
07432cef 14002msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
ef317cd5 14003
1a79b2f1 14004#: builtin/show-ref.c:174
ef317cd5 14005msgid "do not print results to stdout (useful with --verify)"
07432cef 14006msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
ef317cd5 14007
1a79b2f1 14008#: builtin/show-ref.c:176
ef317cd5 14009msgid "show refs from stdin that aren't in local repository"
160fb2b2 14010msgstr "显示从标准输入中读入的不在本地仓库中的引用"
ef317cd5 14011
a4f16749 14012#: builtin/stripspace.c:18
94550ed3
JX
14013msgid "git stripspace [-s | --strip-comments]"
14014msgstr "git stripspace [-s | --strip-comments]"
14015
a4f16749 14016#: builtin/stripspace.c:19
94550ed3
JX
14017msgid "git stripspace [-c | --comment-lines]"
14018msgstr "git stripspace [-c | --comment-lines]"
14019
a4f16749 14020#: builtin/stripspace.c:36
94550ed3
JX
14021msgid "skip and remove all lines starting with comment character"
14022msgstr "跳过和移除所有的注释行"
14023
a4f16749 14024#: builtin/stripspace.c:39
276ceeaa 14025msgid "prepend comment character and space to each line"
94550ed3
JX
14026msgstr "为每一行的行首添加注释符和空格"
14027
fd8cb379 14028#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1688
5b04ee3b
JX
14029#, c-format
14030msgid "No such ref: %s"
14031msgstr "没有这样的引用:%s"
14032
fd8cb379 14033#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1697
5b04ee3b
JX
14034#, c-format
14035msgid "Expecting a full ref name, got %s"
14036msgstr "期望一个完整的引用名称,却得到 %s"
14037
fd8cb379 14038#: builtin/submodule--helper.c:61
31e5e17b
JX
14039msgid "submodule--helper print-default-remote takes no arguments"
14040msgstr "submodule--helper print-default-remote 不带参数"
14041
fd8cb379 14042#: builtin/submodule--helper.c:98
5b04ee3b
JX
14043#, c-format
14044msgid "cannot strip one component off url '%s'"
14045msgstr "无法从 url '%s' 剥离一个组件"
14046
fd8cb379 14047#: builtin/submodule--helper.c:406 builtin/submodule--helper.c:1211
94550ed3
JX
14048msgid "alternative anchor for relative paths"
14049msgstr "相对路径的替代锚记(anchor)"
14050
fd8cb379 14051#: builtin/submodule--helper.c:411
94550ed3
JX
14052msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
14053msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
14054
fd8cb379 14055#: builtin/submodule--helper.c:462 builtin/submodule--helper.c:485
5b04ee3b
JX
14056#, c-format
14057msgid "No url found for submodule path '%s' in .gitmodules"
14058msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
14059
fd8cb379 14060#: builtin/submodule--helper.c:500
87cb7997
JX
14061#, c-format
14062msgid ""
14063"could not lookup configuration '%s'. Assuming this repository is its own "
14064"authoritative upstream."
14065msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
14066
fd8cb379 14067#: builtin/submodule--helper.c:511
5b04ee3b
JX
14068#, c-format
14069msgid "Failed to register url for submodule path '%s'"
14070msgstr "无法为子模组 '%s' 注册 url"
14071
fd8cb379 14072#: builtin/submodule--helper.c:515
5b04ee3b
JX
14073#, c-format
14074msgid "Submodule '%s' (%s) registered for path '%s'\n"
aef18cc6 14075msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
5b04ee3b
JX
14076
14077#
fd8cb379 14078#: builtin/submodule--helper.c:525
aef18cc6 14079#, c-format
5b04ee3b 14080msgid "warning: command update mode suggested for submodule '%s'\n"
aef18cc6 14081msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
5b04ee3b 14082
fd8cb379 14083#: builtin/submodule--helper.c:532
5b04ee3b
JX
14084#, c-format
14085msgid "Failed to register update mode for submodule path '%s'"
14086msgstr "无法为子模组 '%s' 注册更新模式"
14087
fd8cb379 14088#: builtin/submodule--helper.c:554
5b04ee3b 14089msgid "Suppress output for initializing a submodule"
31e5e17b 14090msgstr "阻止子模组初始化的输出"
5b04ee3b 14091
fd8cb379 14092#: builtin/submodule--helper.c:559
5b04ee3b
JX
14093msgid "git submodule--helper init [<path>]"
14094msgstr "git submodule--helper init [<路径>]"
14095
fd8cb379 14096#: builtin/submodule--helper.c:631 builtin/submodule--helper.c:757
94550ed3
JX
14097#, c-format
14098msgid "no submodule mapping found in .gitmodules for path '%s'"
14099msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
14100
fd8cb379 14101#: builtin/submodule--helper.c:670
5809aa05
JX
14102#, c-format
14103msgid "could not resolve HEAD ref inside the submodule '%s'"
14104msgstr "无法解析子模组 '%s' 的 HEAD 引用"
14105
fd8cb379 14106#: builtin/submodule--helper.c:697 builtin/submodule--helper.c:866
5809aa05
JX
14107#, c-format
14108msgid "failed to recurse into submodule '%s'"
14109msgstr "无法递归子模组 '%s'"
14110
fd8cb379 14111#: builtin/submodule--helper.c:721 builtin/submodule--helper.c:1031
5809aa05 14112msgid "Suppress submodule status output"
31e5e17b 14113msgstr "阻止子模组状态输出"
5809aa05 14114
fd8cb379 14115#: builtin/submodule--helper.c:722
5809aa05
JX
14116msgid ""
14117"Use commit stored in the index instead of the one stored in the submodule "
14118"HEAD"
14119msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交"
14120
fd8cb379 14121#: builtin/submodule--helper.c:723
5809aa05 14122msgid "recurse into nested submodules"
31e5e17b 14123msgstr "递归进入嵌套子模组中"
5809aa05 14124
fd8cb379 14125#: builtin/submodule--helper.c:728
5809aa05
JX
14126msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
14127msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
14128
fd8cb379 14129#: builtin/submodule--helper.c:752
5809aa05
JX
14130msgid "git submodule--helper name <path>"
14131msgstr "git submodule--helper name <路径>"
14132
fd8cb379 14133#: builtin/submodule--helper.c:816
31e5e17b
JX
14134#, c-format
14135msgid "Synchronizing submodule url for '%s'\n"
14136msgstr "为 '%s' 同步子模组 url\n"
14137
fd8cb379 14138#: builtin/submodule--helper.c:822
31e5e17b
JX
14139#, c-format
14140msgid "failed to register url for submodule path '%s'"
14141msgstr "无法为子模组路径 '%s' 注册 url"
14142
fd8cb379 14143#: builtin/submodule--helper.c:836
31e5e17b
JX
14144#, c-format
14145msgid "failed to get the default remote for submodule '%s'"
14146msgstr "无法得到子模组 '%s' 的默认远程关联"
14147
fd8cb379 14148#: builtin/submodule--helper.c:847
31e5e17b
JX
14149#, c-format
14150msgid "failed to update remote for submodule '%s'"
14151msgstr "无法为子模组 '%s' 更新远程关联"
14152
fd8cb379 14153#: builtin/submodule--helper.c:895
31e5e17b
JX
14154msgid "Suppress output of synchronizing submodule url"
14155msgstr "阻止子模组 url 同步的输出"
14156
fd8cb379 14157#: builtin/submodule--helper.c:897
31e5e17b
JX
14158msgid "Recurse into nested submodules"
14159msgstr "递归进入嵌套子模组中"
14160
fd8cb379 14161#: builtin/submodule--helper.c:902
31e5e17b
JX
14162msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
14163msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
14164
fd8cb379 14165#: builtin/submodule--helper.c:956
31e5e17b
JX
14166#, c-format
14167msgid ""
14168"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
14169"really want to remove it including all of its history)"
14170msgstr ""
fd8cb379
JX
14171"子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm "
14172"-rf' 命令)"
31e5e17b 14173
fd8cb379 14174#: builtin/submodule--helper.c:968
31e5e17b
JX
14175#, c-format
14176msgid ""
14177"Submodule work tree '%s' contains local modifications; use '-f' to discard "
14178"them"
14179msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们"
14180
fd8cb379 14181#: builtin/submodule--helper.c:976
31e5e17b
JX
14182#, c-format
14183msgid "Cleared directory '%s'\n"
14184msgstr "已清除目录 '%s'\n"
14185
fd8cb379 14186#: builtin/submodule--helper.c:978
31e5e17b
JX
14187#, c-format
14188msgid "Could not remove submodule work tree '%s'\n"
14189msgstr "无法移除子模组工作区 '%s'\n"
14190
fd8cb379 14191#: builtin/submodule--helper.c:987
31e5e17b
JX
14192#, c-format
14193msgid "could not create empty submodule directory %s"
14194msgstr "不能创建空的子模组目录 %s"
14195
fd8cb379 14196#: builtin/submodule--helper.c:1003
31e5e17b
JX
14197#, c-format
14198msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
14199msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
14200
fd8cb379 14201#: builtin/submodule--helper.c:1032
31e5e17b
JX
14202msgid "Remove submodule working trees even if they contain local changes"
14203msgstr "删除子模组工作区,即使包含本地修改"
14204
fd8cb379 14205#: builtin/submodule--helper.c:1033
31e5e17b
JX
14206msgid "Unregister all submodules"
14207msgstr "将所有子模组取消注册"
14208
fd8cb379 14209#: builtin/submodule--helper.c:1038
31e5e17b
JX
14210msgid ""
14211"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
14212msgstr ""
14213"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
14214
fd8cb379 14215#: builtin/submodule--helper.c:1052
31e5e17b
JX
14216msgid "Use '--all' if you really want to deinitialize all submodules"
14217msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
14218
fd8cb379 14219#: builtin/submodule--helper.c:1145 builtin/submodule--helper.c:1148
a0b6b246
JX
14220#, c-format
14221msgid "submodule '%s' cannot add alternate: %s"
14222msgstr "子模组 '%s' 不能添加仓库备选:%s"
14223
fd8cb379 14224#: builtin/submodule--helper.c:1184
a0b6b246
JX
14225#, c-format
14226msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
14227msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
14228
fd8cb379 14229#: builtin/submodule--helper.c:1191
a0b6b246
JX
14230#, c-format
14231msgid "Value '%s' for submodule.alternateLocation is not recognized"
14232msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
14233
fd8cb379 14234#: builtin/submodule--helper.c:1214
94550ed3
JX
14235msgid "where the new submodule will be cloned to"
14236msgstr "新的子模组将要克隆的路径"
14237
fd8cb379 14238#: builtin/submodule--helper.c:1217
94550ed3
JX
14239msgid "name of the new submodule"
14240msgstr "新子模组的名称"
14241
fd8cb379 14242#: builtin/submodule--helper.c:1220
94550ed3
JX
14243msgid "url where to clone the submodule from"
14244msgstr "克隆子模组的 url 地址"
14245
fd8cb379 14246#: builtin/submodule--helper.c:1228
94550ed3
JX
14247msgid "depth for shallow clones"
14248msgstr "浅克隆的深度"
14249
fd8cb379 14250#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1606
a0b6b246 14251msgid "force cloning progress"
29004bbb 14252msgstr "强制显示克隆进度"
a0b6b246 14253
fd8cb379 14254#: builtin/submodule--helper.c:1236
94550ed3
JX
14255msgid ""
14256"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
5b04ee3b 14257"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
5c57d762
JX
14258msgstr ""
14259"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
14260"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
94550ed3 14261
fd8cb379 14262#: builtin/submodule--helper.c:1267
94550ed3
JX
14263#, c-format
14264msgid "clone of '%s' into submodule path '%s' failed"
14265msgstr "无法克隆 '%s' 到子模组路径 '%s'"
14266
fd8cb379 14267#: builtin/submodule--helper.c:1281
94550ed3
JX
14268#, c-format
14269msgid "could not get submodule directory for '%s'"
14270msgstr "无法得到 '%s' 的子模组目录"
14271
fd8cb379 14272#: builtin/submodule--helper.c:1347
5b04ee3b
JX
14273#, c-format
14274msgid "Submodule path '%s' not initialized"
14275msgstr "子模组 '%s' 尚未初始化"
14276
fd8cb379 14277#: builtin/submodule--helper.c:1351
5b04ee3b
JX
14278msgid "Maybe you want to use 'update --init'?"
14279msgstr "也许您想要执行 'update --init'?"
14280
fd8cb379 14281#: builtin/submodule--helper.c:1380
5b04ee3b
JX
14282#, c-format
14283msgid "Skipping unmerged submodule %s"
14284msgstr "略过未合并的子模组 %s"
14285
fd8cb379 14286#: builtin/submodule--helper.c:1409
5b04ee3b
JX
14287#, c-format
14288msgid "Skipping submodule '%s'"
14289msgstr "略过子模组 '%s'"
14290
fd8cb379 14291#: builtin/submodule--helper.c:1544
5c57d762
JX
14292#, c-format
14293msgid "Failed to clone '%s'. Retry scheduled"
14294msgstr "克隆 '%s' 失败。按计划重试"
14295
fd8cb379 14296#: builtin/submodule--helper.c:1555
5c57d762
JX
14297#, c-format
14298msgid "Failed to clone '%s' a second time, aborting"
14299msgstr "第二次尝试克隆 '%s' 失败,退出"
14300
fd8cb379 14301#: builtin/submodule--helper.c:1585 builtin/submodule--helper.c:1808
5b04ee3b
JX
14302msgid "path into the working tree"
14303msgstr "到工作区的路径"
14304
fd8cb379 14305#: builtin/submodule--helper.c:1588
5b04ee3b
JX
14306msgid "path into the working tree, across nested submodule boundaries"
14307msgstr "工作区中的路径,递归嵌套子模组"
14308
fd8cb379 14309#: builtin/submodule--helper.c:1592
5b04ee3b
JX
14310msgid "rebase, merge, checkout or none"
14311msgstr "rebase、merge、checkout 或 none"
14312
fd8cb379 14313#: builtin/submodule--helper.c:1598
5b04ee3b
JX
14314msgid "Create a shallow clone truncated to the specified number of revisions"
14315msgstr "创建一个指定深度的浅克隆"
14316
fd8cb379 14317#: builtin/submodule--helper.c:1601
5b04ee3b
JX
14318msgid "parallel jobs"
14319msgstr "并发任务"
14320
fd8cb379 14321#: builtin/submodule--helper.c:1603
5c57d762 14322msgid "whether the initial clone should follow the shallow recommendation"
9a4b694c 14323msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
5c57d762 14324
fd8cb379 14325#: builtin/submodule--helper.c:1604
5b04ee3b
JX
14326msgid "don't print cloning progress"
14327msgstr "不要输出克隆进度"
94550ed3 14328
fd8cb379 14329#: builtin/submodule--helper.c:1611
5b04ee3b
JX
14330msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
14331msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
14332
fd8cb379 14333#: builtin/submodule--helper.c:1624
5b04ee3b
JX
14334msgid "bad value for update parameter"
14335msgstr "update 参数取值错误"
14336
fd8cb379 14337#: builtin/submodule--helper.c:1692
5c57d762
JX
14338#, c-format
14339msgid ""
14340"Submodule (%s) branch configured to inherit branch from superproject, but "
14341"the superproject is not on any branch"
14342msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
14343
fd8cb379 14344#: builtin/submodule--helper.c:1809
1a79b2f1
JX
14345msgid "recurse into submodules"
14346msgstr "在子模组中递归"
14347
fd8cb379 14348#: builtin/submodule--helper.c:1815
1a79b2f1
JX
14349msgid "git submodule--helper embed-git-dir [<path>...]"
14350msgstr "git submodule--helper embed-git-dir [<路径>...]"
14351
fd8cb379 14352#: builtin/submodule--helper.c:1901
1a79b2f1
JX
14353#, c-format
14354msgid "%s doesn't support --super-prefix"
14355msgstr "%s 不支持 --super-prefix"
14356
fd8cb379 14357#: builtin/submodule--helper.c:1907
94550ed3 14358#, c-format
5b04ee3b
JX
14359msgid "'%s' is not a valid submodule--helper subcommand"
14360msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
94550ed3 14361
a4f16749 14362#: builtin/symbolic-ref.c:8
814ff314
JX
14363msgid "git symbolic-ref [<options>] <name> [<ref>]"
14364msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
07432cef 14365
a4f16749 14366#: builtin/symbolic-ref.c:9
814ff314
JX
14367msgid "git symbolic-ref -d [-q] <name>"
14368msgstr "git symbolic-ref -d [-q] <名称>"
ef317cd5 14369
6937cb4e 14370#: builtin/symbolic-ref.c:40
ef317cd5 14371msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
14372msgstr "不显示非符号(分离的)引用的错误信息"
14373
6937cb4e 14374#: builtin/symbolic-ref.c:41
07432cef
WS
14375msgid "delete symbolic ref"
14376msgstr "删除符号引用"
ef317cd5 14377
6937cb4e 14378#: builtin/symbolic-ref.c:42
ef317cd5 14379msgid "shorten ref output"
6937cb4e 14380msgstr "缩短引用输出"
ef317cd5 14381
6937cb4e 14382#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
ef317cd5 14383msgid "reason"
07432cef 14384msgstr "原因"
ef317cd5 14385
6937cb4e 14386#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
ef317cd5 14387msgid "reason of the update"
07432cef 14388msgstr "更新的原因"
ef317cd5 14389
a4f16749 14390#: builtin/tag.c:24
ef317cd5 14391msgid ""
814ff314
JX
14392"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
14393"[<head>]"
14394msgstr ""
14395"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
ef317cd5 14396
a4f16749 14397#: builtin/tag.c:25
ef317cd5 14398msgid "git tag -d <tagname>..."
07432cef 14399msgstr "git tag -d <标签名>..."
ef317cd5 14400
a4f16749 14401#: builtin/tag.c:26
ef317cd5 14402msgid ""
87cb7997
JX
14403"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
14404"points-at <object>]\n"
94550ed3 14405"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
ef317cd5 14406msgstr ""
87cb7997
JX
14407"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
14408"at <对象>]\n"
94550ed3 14409"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
ef317cd5 14410
a4f16749 14411#: builtin/tag.c:28
1a79b2f1
JX
14412msgid "git tag -v [--format=<format>] <tagname>..."
14413msgstr "git tag -v [--format=<格式>] <标签名>..."
ef317cd5 14414
6937cb4e 14415#: builtin/tag.c:86
c04f5ac3
JX
14416#, c-format
14417msgid "tag '%s' not found."
55a16ee4 14418msgstr "未发现标签 '%s'。"
c04f5ac3 14419
6937cb4e 14420#: builtin/tag.c:102
c04f5ac3
JX
14421#, c-format
14422msgid "Deleted tag '%s' (was %s)\n"
55a16ee4 14423msgstr "已删除标签 '%s'(曾为 %s)\n"
c04f5ac3 14424
fd8cb379 14425#: builtin/tag.c:132
a77c07d9 14426#, c-format
c04f5ac3
JX
14427msgid ""
14428"\n"
6acbf033
JX
14429"Write a message for tag:\n"
14430" %s\n"
a77c07d9 14431"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
14432msgstr ""
14433"\n"
55a16ee4 14434"输入一个标签说明:\n"
6acbf033 14435" %s\n"
a77c07d9 14436"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 14437
fd8cb379 14438#: builtin/tag.c:136
a77c07d9 14439#, c-format
c04f5ac3
JX
14440msgid ""
14441"\n"
6acbf033
JX
14442"Write a message for tag:\n"
14443" %s\n"
a77c07d9 14444"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 14445"want to.\n"
c04f5ac3
JX
14446msgstr ""
14447"\n"
55a16ee4 14448"输入一个标签说明:\n"
6acbf033 14449" %s\n"
a77c07d9 14450"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 14451
fd8cb379 14452#: builtin/tag.c:190
c04f5ac3 14453msgid "unable to sign the tag"
55a16ee4 14454msgstr "无法签署标签"
c04f5ac3 14455
fd8cb379 14456#: builtin/tag.c:192
c04f5ac3 14457msgid "unable to write tag file"
55a16ee4 14458msgstr "无法写标签文件"
c04f5ac3 14459
fd8cb379 14460#: builtin/tag.c:217
c04f5ac3 14461msgid "bad object type."
90e6ef53 14462msgstr "坏的对象类型。"
c04f5ac3 14463
fd8cb379 14464#: builtin/tag.c:266
c04f5ac3 14465msgid "no tag message?"
55a16ee4 14466msgstr "无标签说明?"
c04f5ac3 14467
fd8cb379 14468#: builtin/tag.c:273
c04f5ac3
JX
14469#, c-format
14470msgid "The tag message has been left in %s\n"
55a16ee4 14471msgstr "标签说明被保留在 %s\n"
c04f5ac3 14472
fd8cb379 14473#: builtin/tag.c:382
ef317cd5 14474msgid "list tag names"
55a16ee4 14475msgstr "列出标签名称"
ef317cd5 14476
fd8cb379 14477#: builtin/tag.c:384
ef317cd5 14478msgid "print <n> lines of each tag message"
55a16ee4 14479msgstr "每个标签信息打印 <n> 行"
ef317cd5 14480
fd8cb379 14481#: builtin/tag.c:386
ef317cd5 14482msgid "delete tags"
55a16ee4 14483msgstr "删除标签"
ef317cd5 14484
fd8cb379 14485#: builtin/tag.c:387
ef317cd5 14486msgid "verify tags"
55a16ee4 14487msgstr "验证标签"
ef317cd5 14488
fd8cb379 14489#: builtin/tag.c:389
ef317cd5 14490msgid "Tag creation options"
55a16ee4 14491msgstr "标签创建选项"
ef317cd5 14492
fd8cb379 14493#: builtin/tag.c:391
ef317cd5 14494msgid "annotated tag, needs a message"
55a16ee4 14495msgstr "附注标签,需要一个说明"
ef317cd5 14496
fd8cb379 14497#: builtin/tag.c:393
ef317cd5 14498msgid "tag message"
55a16ee4 14499msgstr "标签说明"
ef317cd5 14500
fd8cb379 14501#: builtin/tag.c:395
31e5e17b
JX
14502msgid "force edit of tag message"
14503msgstr "强制编辑标签说明"
14504
fd8cb379 14505#: builtin/tag.c:396
ef317cd5 14506msgid "annotated and GPG-signed tag"
55a16ee4 14507msgstr "附注并附加 GPG 签名的标签"
ef317cd5 14508
fd8cb379 14509#: builtin/tag.c:400
ef317cd5 14510msgid "use another key to sign the tag"
55a16ee4 14511msgstr "使用另外的私钥签名该标签"
ef317cd5 14512
fd8cb379 14513#: builtin/tag.c:401
ef317cd5 14514msgid "replace the tag if exists"
55a16ee4 14515msgstr "如果存在,替换现有的标签"
ef317cd5 14516
fd8cb379 14517#: builtin/tag.c:402 builtin/update-ref.c:368
03ea3327 14518msgid "create a reflog"
1b7f4a34
JX
14519msgstr "创建引用日志"
14520
fd8cb379 14521#: builtin/tag.c:404
814ff314 14522msgid "Tag listing options"
55a16ee4 14523msgstr "标签列表选项"
814ff314 14524
fd8cb379 14525#: builtin/tag.c:405
ef317cd5 14526msgid "show tag list in columns"
55a16ee4 14527msgstr "以列的方式显示标签列表"
ef317cd5 14528
fd8cb379 14529#: builtin/tag.c:406 builtin/tag.c:408
ef317cd5 14530msgid "print only tags that contain the commit"
87cb7997 14531msgstr "只打印包含该提交的标签"
ef317cd5 14532
fd8cb379 14533#: builtin/tag.c:407 builtin/tag.c:409
87cb7997
JX
14534msgid "print only tags that don't contain the commit"
14535msgstr "只打印不包含该提交的标签"
14536
fd8cb379 14537#: builtin/tag.c:410
94550ed3
JX
14538msgid "print only tags that are merged"
14539msgstr "只打印已经合并的标签"
14540
fd8cb379 14541#: builtin/tag.c:411
94550ed3
JX
14542msgid "print only tags that are not merged"
14543msgstr "只打印尚未合并的标签"
14544
fd8cb379 14545#: builtin/tag.c:416
ef317cd5 14546msgid "print only tags of the object"
87cb7997 14547msgstr "只打印指向该对象的标签"
ef317cd5 14548
fd8cb379 14549#: builtin/tag.c:460
8ada9598 14550msgid "--column and -n are incompatible"
81809b99 14551msgstr "--column 和 -n 不兼容"
8ada9598 14552
fd8cb379 14553#: builtin/tag.c:482
87cb7997
JX
14554msgid "-n option is only allowed in list mode"
14555msgstr "-n 选项只允许用在列表显示模式"
c04f5ac3 14556
fd8cb379 14557#: builtin/tag.c:484
87cb7997
JX
14558msgid "--contains option is only allowed in list mode"
14559msgstr "--contains 选项只允许用在列表显示模式"
c04f5ac3 14560
fd8cb379 14561#: builtin/tag.c:486
87cb7997
JX
14562msgid "--no-contains option is only allowed in list mode"
14563msgstr "--no-contains 选项只允许用在列表显示模式"
7ac1c0ad 14564
fd8cb379 14565#: builtin/tag.c:488
87cb7997
JX
14566msgid "--points-at option is only allowed in list mode"
14567msgstr "--points-at 选项只允许用在列表显示模式"
94550ed3 14568
fd8cb379 14569#: builtin/tag.c:490
87cb7997
JX
14570msgid "--merged and --no-merged options are only allowed in list mode"
14571msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
14572
fd8cb379 14573#: builtin/tag.c:501
c04f5ac3
JX
14574msgid "only one -F or -m option is allowed."
14575msgstr "只允许一个 -F 或 -m 选项。"
14576
fd8cb379 14577#: builtin/tag.c:520
c04f5ac3
JX
14578msgid "too many params"
14579msgstr "太多参数"
14580
fd8cb379 14581#: builtin/tag.c:526
c04f5ac3
JX
14582#, c-format
14583msgid "'%s' is not a valid tag name."
55a16ee4 14584msgstr "'%s' 不是一个有效的标签名称。"
c04f5ac3 14585
fd8cb379 14586#: builtin/tag.c:531
c04f5ac3
JX
14587#, c-format
14588msgid "tag '%s' already exists"
55a16ee4 14589msgstr "标签 '%s' 已存在"
c04f5ac3 14590
fd8cb379 14591#: builtin/tag.c:562
c04f5ac3
JX
14592#, c-format
14593msgid "Updated tag '%s' (was %s)\n"
55a16ee4 14594msgstr "已更新标签 '%s'(曾为 %s)\n"
c04f5ac3 14595
31e5e17b 14596#: builtin/unpack-objects.c:498
6c94aba5
JX
14597msgid "Unpacking objects"
14598msgstr "展开对象中"
14599
5809aa05 14600#: builtin/update-index.c:82
7aea43ff
JX
14601#, c-format
14602msgid "failed to create directory %s"
14603msgstr "无法创建目录 %s"
14604
5809aa05 14605#: builtin/update-index.c:88
7aea43ff
JX
14606#, c-format
14607msgid "failed to stat %s"
65e2041e 14608msgstr "对 %s 调用 stat 失败"
7aea43ff 14609
5809aa05 14610#: builtin/update-index.c:98
7aea43ff
JX
14611#, c-format
14612msgid "failed to create file %s"
14613msgstr "无法创建文件 %s"
14614
5809aa05 14615#: builtin/update-index.c:106
7aea43ff
JX
14616#, c-format
14617msgid "failed to delete file %s"
14618msgstr "无法删除文件 %s"
14619
5809aa05 14620#: builtin/update-index.c:113 builtin/update-index.c:219
7aea43ff
JX
14621#, c-format
14622msgid "failed to delete directory %s"
14623msgstr "无法删除目录 %s"
14624
5809aa05 14625#: builtin/update-index.c:138
7aea43ff 14626#, c-format
276ceeaa
JX
14627msgid "Testing mtime in '%s' "
14628msgstr "在 '%s' 中测试 mtime "
7aea43ff 14629
5809aa05 14630#: builtin/update-index.c:152
7aea43ff
JX
14631msgid "directory stat info does not change after adding a new file"
14632msgstr "添加一个新文件后,目录的状态信息未改变"
14633
5809aa05 14634#: builtin/update-index.c:165
7aea43ff
JX
14635msgid "directory stat info does not change after adding a new directory"
14636msgstr "添加一个新目录后,目录的状态信息未改变"
14637
5809aa05 14638#: builtin/update-index.c:178
7aea43ff
JX
14639msgid "directory stat info changes after updating a file"
14640msgstr "更新一个文件后,目录的状态信息被修改"
14641
5809aa05 14642#: builtin/update-index.c:189
7aea43ff
JX
14643msgid "directory stat info changes after adding a file inside subdirectory"
14644msgstr "在子目录中添加文件后,目录的状态信息被修改"
14645
5809aa05 14646#: builtin/update-index.c:200
7aea43ff
JX
14647msgid "directory stat info does not change after deleting a file"
14648msgstr "删除一个文件后,目录的状态信息未改变"
14649
5809aa05 14650#: builtin/update-index.c:213
7aea43ff
JX
14651msgid "directory stat info does not change after deleting a directory"
14652msgstr "删除一个目录后,目录的状态信息未改变"
14653
5809aa05 14654#: builtin/update-index.c:220
7aea43ff
JX
14655msgid " OK"
14656msgstr " OK"
14657
fd8cb379 14658#: builtin/update-index.c:589
814ff314
JX
14659msgid "git update-index [<options>] [--] [<file>...]"
14660msgstr "git update-index [<选项>] [--] [<文件>...]"
8ada9598 14661
fd8cb379 14662#: builtin/update-index.c:946
ef317cd5 14663msgid "continue refresh even when index needs update"
07432cef 14664msgstr "当索引需要更新时继续刷新"
8ada9598 14665
fd8cb379 14666#: builtin/update-index.c:949
ef317cd5 14667msgid "refresh: ignore submodules"
07432cef 14668msgstr "刷新:忽略子模组"
8ada9598 14669
fd8cb379 14670#: builtin/update-index.c:952
ef317cd5 14671msgid "do not ignore new files"
07432cef 14672msgstr "不忽略新的文件"
8ada9598 14673
fd8cb379 14674#: builtin/update-index.c:954
ef317cd5 14675msgid "let files replace directories and vice-versa"
07432cef 14676msgstr "让文件替换目录(反之亦然)"
ef317cd5 14677
fd8cb379 14678#: builtin/update-index.c:956
ef317cd5 14679msgid "notice files missing from worktree"
07432cef 14680msgstr "通知文件从工作区丢失"
ef317cd5 14681
fd8cb379 14682#: builtin/update-index.c:958
ef317cd5 14683msgid "refresh even if index contains unmerged entries"
07432cef 14684msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 14685
fd8cb379 14686#: builtin/update-index.c:961
ef317cd5 14687msgid "refresh stat information"
07432cef 14688msgstr "刷新统计信息"
ef317cd5 14689
fd8cb379 14690#: builtin/update-index.c:965
ef317cd5 14691msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 14692msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 14693
fd8cb379 14694#: builtin/update-index.c:969
6c94aba5 14695msgid "<mode>,<object>,<path>"
d9d56b23 14696msgstr "<存取模式>,<对象>,<路径>"
ef317cd5 14697
fd8cb379 14698#: builtin/update-index.c:970
ef317cd5 14699msgid "add the specified entry to the index"
07432cef 14700msgstr "添加指定的条目到索引区"
ef317cd5 14701
fd8cb379 14702#: builtin/update-index.c:979
ef317cd5 14703msgid "mark files as \"not changing\""
07432cef 14704msgstr "把文件标记为 \"没有变更\""
ef317cd5 14705
fd8cb379 14706#: builtin/update-index.c:982
ef317cd5 14707msgid "clear assumed-unchanged bit"
07432cef 14708msgstr "清除 assumed-unchanged 位"
ef317cd5 14709
fd8cb379 14710#: builtin/update-index.c:985
ef317cd5 14711msgid "mark files as \"index-only\""
07432cef 14712msgstr "把文件标记为 \"仅索引\""
ef317cd5 14713
fd8cb379 14714#: builtin/update-index.c:988
ef317cd5 14715msgid "clear skip-worktree bit"
07432cef 14716msgstr "清除 skip-worktree 位"
ef317cd5 14717
fd8cb379 14718#: builtin/update-index.c:991
ef317cd5 14719msgid "add to index only; do not add content to object database"
07432cef 14720msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 14721
fd8cb379 14722#: builtin/update-index.c:993
ef317cd5 14723msgid "remove named paths even if present in worktree"
07432cef 14724msgstr "即使存在工作区里,也删除路径"
ef317cd5 14725
fd8cb379 14726#: builtin/update-index.c:995
ef317cd5 14727msgid "with --stdin: input lines are terminated by null bytes"
07432cef 14728msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 14729
fd8cb379 14730#: builtin/update-index.c:997
ef317cd5 14731msgid "read list of paths to be updated from standard input"
07432cef 14732msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 14733
fd8cb379 14734#: builtin/update-index.c:1001
ef317cd5 14735msgid "add entries from standard input to the index"
07432cef 14736msgstr "从标准输入添加条目到索引区"
ef317cd5 14737
fd8cb379 14738#: builtin/update-index.c:1005
ef317cd5 14739msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 14740msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 14741
fd8cb379 14742#: builtin/update-index.c:1009
ef317cd5 14743msgid "only update entries that differ from HEAD"
07432cef 14744msgstr "只更新与 HEAD 不同的条目"
ef317cd5 14745
fd8cb379 14746#: builtin/update-index.c:1013
ef317cd5 14747msgid "ignore files missing from worktree"
07432cef 14748msgstr "忽略工作区丢失的文件"
ef317cd5 14749
fd8cb379 14750#: builtin/update-index.c:1016
ef317cd5 14751msgid "report actions to standard output"
07432cef 14752msgstr "在标准输出显示操作"
ef317cd5 14753
fd8cb379 14754#: builtin/update-index.c:1018
ef317cd5 14755msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 14756msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 14757
fd8cb379 14758#: builtin/update-index.c:1022
ef317cd5 14759msgid "write index in this format"
07432cef 14760msgstr "以这种格式写入索引区"
ef317cd5 14761
fd8cb379 14762#: builtin/update-index.c:1024
6acbf033
JX
14763msgid "enable or disable split index"
14764msgstr "启用或禁用索引拆分"
14765
fd8cb379 14766#: builtin/update-index.c:1026
7aea43ff
JX
14767msgid "enable/disable untracked cache"
14768msgstr "启用/禁用对未跟踪文件的缓存"
14769
fd8cb379 14770#: builtin/update-index.c:1028
276ceeaa
JX
14771msgid "test if the filesystem supports untracked cache"
14772msgstr "测试文件系统是否支持未跟踪文件缓存"
14773
fd8cb379 14774#: builtin/update-index.c:1030
7aea43ff
JX
14775msgid "enable untracked cache without testing the filesystem"
14776msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
14777
fd8cb379 14778#: builtin/update-index.c:1032
5809aa05
JX
14779msgid "write out the index even if is not flagged as changed"
14780msgstr "即使没有被标记为已更改,也要写出索引"
14781
fd8cb379 14782#: builtin/update-index.c:1034
5809aa05
JX
14783msgid "enable or disable file system monitor"
14784msgstr "启用或禁用文件系统监控"
14785
fd8cb379 14786#: builtin/update-index.c:1036
5809aa05
JX
14787msgid "mark files as fsmonitor valid"
14788msgstr "标记文件为 fsmonitor 有效"
14789
fd8cb379 14790#: builtin/update-index.c:1039
5809aa05
JX
14791msgid "clear fsmonitor valid bit"
14792msgstr "清除 fsmonitor 有效位"
14793
fd8cb379 14794#: builtin/update-index.c:1138
87cb7997
JX
14795msgid ""
14796"core.splitIndex is set to false; remove or change it, if you really want to "
14797"enable split index"
14798msgstr ""
14799"core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。"
14800
fd8cb379 14801#: builtin/update-index.c:1147
87cb7997
JX
14802msgid ""
14803"core.splitIndex is set to true; remove or change it, if you really want to "
14804"disable split index"
14805msgstr ""
14806"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。"
14807
fd8cb379 14808#: builtin/update-index.c:1158
a0b6b246
JX
14809msgid ""
14810"core.untrackedCache is set to true; remove or change it, if you really want "
14811"to disable the untracked cache"
275588f9
JX
14812msgstr ""
14813"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
14814"改它。"
a0b6b246 14815
fd8cb379 14816#: builtin/update-index.c:1162
276ceeaa
JX
14817msgid "Untracked cache disabled"
14818msgstr "缓存未跟踪文件被禁用"
14819
fd8cb379 14820#: builtin/update-index.c:1170
a0b6b246
JX
14821msgid ""
14822"core.untrackedCache is set to false; remove or change it, if you really want "
14823"to enable the untracked cache"
275588f9
JX
14824msgstr ""
14825"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
14826"修改它。"
a0b6b246 14827
fd8cb379 14828#: builtin/update-index.c:1174
276ceeaa
JX
14829#, c-format
14830msgid "Untracked cache enabled for '%s'"
14831msgstr "缓存未跟踪文件在 '%s' 启用"
14832
fd8cb379 14833#: builtin/update-index.c:1182
5809aa05 14834msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
31e5e17b 14835msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项"
5809aa05 14836
fd8cb379 14837#: builtin/update-index.c:1186
5809aa05
JX
14838msgid "fsmonitor enabled"
14839msgstr "fsmonitor 被启用"
14840
fd8cb379 14841#: builtin/update-index.c:1189
5809aa05
JX
14842msgid ""
14843"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
31e5e17b 14844msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项"
5809aa05 14845
fd8cb379 14846#: builtin/update-index.c:1193
5809aa05
JX
14847msgid "fsmonitor disabled"
14848msgstr "fsmonitor 被禁用"
14849
a4f16749 14850#: builtin/update-ref.c:10
814ff314
JX
14851msgid "git update-ref [<options>] -d <refname> [<old-val>]"
14852msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
ef317cd5 14853
a4f16749 14854#: builtin/update-ref.c:11
814ff314
JX
14855msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
14856msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
90314792 14857
a4f16749 14858#: builtin/update-ref.c:12
814ff314
JX
14859msgid "git update-ref [<options>] --stdin [-z]"
14860msgstr "git update-ref [<选项>] --stdin [-z]"
ef317cd5 14861
6937cb4e 14862#: builtin/update-ref.c:363
ef317cd5 14863msgid "delete the reference"
07432cef 14864msgstr "删除引用"
ef317cd5 14865
6937cb4e 14866#: builtin/update-ref.c:365
ef317cd5 14867msgid "update <refname> not the one it points to"
07432cef 14868msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 14869
6937cb4e 14870#: builtin/update-ref.c:366
90314792
JX
14871msgid "stdin has NUL-terminated arguments"
14872msgstr "标准输入有以 NUL 字符终止的参数"
14873
6937cb4e 14874#: builtin/update-ref.c:367
90314792
JX
14875msgid "read updates from stdin"
14876msgstr "从标准输入读取更新"
14877
a4f16749 14878#: builtin/update-server-info.c:7
ef317cd5 14879msgid "git update-server-info [--force]"
07432cef 14880msgstr "git update-server-info [--force]"
ef317cd5 14881
a4f16749 14882#: builtin/update-server-info.c:15
ef317cd5 14883msgid "update the info files from scratch"
07432cef 14884msgstr "从头开始更新文件信息"
ef317cd5 14885
fd8cb379
JX
14886#: builtin/upload-pack.c:11
14887msgid "git upload-pack [<options>] <dir>"
14888msgstr "git upload-pack [<选项>] <目录>"
14889
14890#: builtin/upload-pack.c:25
14891msgid "exit immediately after initial ref advertisement"
14892msgstr "在初始的引用广告后立即退出"
14893
14894#: builtin/upload-pack.c:27
14895msgid "do not try <directory>/.git/ if <directory> is no Git directory"
14896msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/"
14897
14898#: builtin/upload-pack.c:29
14899msgid "interrupt transfer after <n> seconds of inactivity"
14900msgstr "不活动 <n> 秒钟后终止传输"
14901
a4f16749 14902#: builtin/verify-commit.c:18
814ff314
JX
14903msgid "git verify-commit [-v | --verbose] <commit>..."
14904msgstr "git verify-commit [-v | --verbose] <提交>..."
6acbf033 14905
a4f16749 14906#: builtin/verify-commit.c:73
6acbf033
JX
14907msgid "print commit contents"
14908msgstr "打印提交内容"
14909
a4f16749 14910#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
1b7f4a34
JX
14911msgid "print raw gpg status output"
14912msgstr "打印原始 gpg 状态输出"
14913
a4f16749 14914#: builtin/verify-pack.c:55
814ff314
JX
14915msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
14916msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
ef317cd5 14917
a4f16749 14918#: builtin/verify-pack.c:65
ef317cd5
JX
14919msgid "verbose"
14920msgstr "冗长输出"
14921
a4f16749 14922#: builtin/verify-pack.c:67
ef317cd5 14923msgid "show statistics only"
07432cef 14924msgstr "只显示统计"
ef317cd5 14925
a4f16749 14926#: builtin/verify-tag.c:19
1a79b2f1
JX
14927msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
14928msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
ef317cd5 14929
a4f16749 14930#: builtin/verify-tag.c:37
ef317cd5 14931msgid "print tag contents"
55a16ee4 14932msgstr "打印标签内容"
ef317cd5 14933
5809aa05 14934#: builtin/worktree.c:17
31e5e17b
JX
14935msgid "git worktree add [<options>] <path> [<commit-ish>]"
14936msgstr "git worktree add [<选项>] <路径> [<提交>]"
5bb01d4f 14937
5809aa05 14938#: builtin/worktree.c:18
5c57d762
JX
14939msgid "git worktree list [<options>]"
14940msgstr "git worktree list [<选项>]"
14941
5809aa05 14942#: builtin/worktree.c:19
5c57d762
JX
14943msgid "git worktree lock [<options>] <path>"
14944msgstr "git worktree lock [<选项>] <路径>"
14945
5809aa05 14946#: builtin/worktree.c:20
31e5e17b
JX
14947msgid "git worktree move <worktree> <new-path>"
14948msgstr "git worktree move <工作区> <新路径>"
14949
14950#: builtin/worktree.c:21
5bb01d4f
JX
14951msgid "git worktree prune [<options>]"
14952msgstr "git worktree prune [<选项>]"
14953
31e5e17b
JX
14954#: builtin/worktree.c:22
14955msgid "git worktree remove [<options>] <worktree>"
14956msgstr "git worktree remove [<选项>] <工作区>"
14957
14958#: builtin/worktree.c:23
5c57d762
JX
14959msgid "git worktree unlock <path>"
14960msgstr "git worktree unlock <路径>"
94550ed3 14961
fd8cb379 14962#: builtin/worktree.c:58
5bb01d4f
JX
14963#, c-format
14964msgid "Removing worktrees/%s: not a valid directory"
14965msgstr "删除工作区/%s:不是一个有效的目录"
14966
fd8cb379 14967#: builtin/worktree.c:64
5bb01d4f
JX
14968#, c-format
14969msgid "Removing worktrees/%s: gitdir file does not exist"
14970msgstr "删除 worktrees/%s:gitdir 文件不存在"
14971
fd8cb379 14972#: builtin/worktree.c:69 builtin/worktree.c:78
5bb01d4f
JX
14973#, c-format
14974msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
14975msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
14976
fd8cb379 14977#: builtin/worktree.c:88
6937cb4e
JX
14978#, c-format
14979msgid ""
14980"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
14981"%<PRIuMAX>)"
14982msgstr "删除工作树/%s:读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)"
14983
fd8cb379 14984#: builtin/worktree.c:96
5bb01d4f
JX
14985#, c-format
14986msgid "Removing worktrees/%s: invalid gitdir file"
14987msgstr "删除 worktrees/%s:无效的 gitdir 文件"
14988
fd8cb379 14989#: builtin/worktree.c:105
5bb01d4f
JX
14990#, c-format
14991msgid "Removing worktrees/%s: gitdir file points to non-existent location"
14992msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
14993
fd8cb379 14994#: builtin/worktree.c:152
1a79b2f1
JX
14995msgid "report pruned working trees"
14996msgstr "报告清除的工作区"
14997
fd8cb379 14998#: builtin/worktree.c:154
1a79b2f1 14999msgid "expire working trees older than <time>"
58b6f078 15000msgstr "将早于 <时间> 的工作区过期"
1a79b2f1 15001
fd8cb379 15002#: builtin/worktree.c:229
5bb01d4f
JX
15003#, c-format
15004msgid "'%s' already exists"
15005msgstr "'%s' 已经存在"
15006
fd8cb379 15007#: builtin/worktree.c:260
5bb01d4f
JX
15008#, c-format
15009msgid "could not create directory of '%s'"
15010msgstr "不能创建目录 '%s'"
15011
fd8cb379
JX
15012#: builtin/worktree.c:373 builtin/worktree.c:379
15013#, c-format
15014msgid "Preparing worktree (new branch '%s')"
15015msgstr "准备工作区(新分支 '%s')"
15016
15017#: builtin/worktree.c:375
15018#, c-format
15019msgid "Preparing worktree (resetting branch '%s'; was at %s)"
15020msgstr "准备工作区(重置分支 '%s',之前为 %s)"
15021
15022#: builtin/worktree.c:384
15023#, c-format
15024msgid "Preparing worktree (checking out '%s')"
15025msgstr "准备工作区(检出 '%s')"
15026
15027#: builtin/worktree.c:390
5bb01d4f 15028#, c-format
fd8cb379
JX
15029msgid "Preparing worktree (detached HEAD %s)"
15030msgstr "准备工作区(分离头指针 %s)"
5bb01d4f 15031
fd8cb379 15032#: builtin/worktree.c:431
5bb01d4f 15033msgid "checkout <branch> even if already checked out in other worktree"
58b6f078 15034msgstr "检出 <分支>,即使已经被检出到其它工作区"
5bb01d4f 15035
fd8cb379 15036#: builtin/worktree.c:434
5bb01d4f
JX
15037msgid "create a new branch"
15038msgstr "创建一个新分支"
15039
fd8cb379 15040#: builtin/worktree.c:436
5bb01d4f
JX
15041msgid "create or reset a branch"
15042msgstr "创建或重置一个分支"
15043
fd8cb379 15044#: builtin/worktree.c:438
5b04ee3b
JX
15045msgid "populate the new working tree"
15046msgstr "生成新的工作区"
15047
fd8cb379 15048#: builtin/worktree.c:439
60638e98
JX
15049msgid "keep the new working tree locked"
15050msgstr "锁定新工作区"
15051
fd8cb379 15052#: builtin/worktree.c:441
5809aa05
JX
15053msgid "set up tracking mode (see git-branch(1))"
15054msgstr "设置跟踪模式(参见 git-branch(1))"
15055
fd8cb379 15056#: builtin/worktree.c:444
5809aa05
JX
15057msgid "try to match the new branch name with a remote-tracking branch"
15058msgstr "尝试为新分支名匹配一个远程跟踪分支"
15059
fd8cb379 15060#: builtin/worktree.c:452
1b7f4a34
JX
15061msgid "-b, -B, and --detach are mutually exclusive"
15062msgstr "-b、-B 和 --detach 是互斥的"
5bb01d4f 15063
fd8cb379 15064#: builtin/worktree.c:511
5809aa05
JX
15065msgid "--[no-]track can only be used if a new branch is created"
15066msgstr "只能在创建新分支时使用选项 --[no-]track "
15067
fd8cb379 15068#: builtin/worktree.c:611
5c57d762
JX
15069msgid "reason for locking"
15070msgstr "锁定原因"
15071
fd8cb379
JX
15072#: builtin/worktree.c:623 builtin/worktree.c:656 builtin/worktree.c:710
15073#: builtin/worktree.c:850
5c57d762
JX
15074#, c-format
15075msgid "'%s' is not a working tree"
15076msgstr "'%s' 不是一个工作区"
15077
fd8cb379 15078#: builtin/worktree.c:625 builtin/worktree.c:658
5c57d762
JX
15079msgid "The main working tree cannot be locked or unlocked"
15080msgstr "主工作区无法被加锁或解锁"
15081
fd8cb379 15082#: builtin/worktree.c:630
5c57d762
JX
15083#, c-format
15084msgid "'%s' is already locked, reason: %s"
15085msgstr "'%s' 已被锁定,原因:%s"
15086
fd8cb379 15087#: builtin/worktree.c:632
5c57d762
JX
15088#, c-format
15089msgid "'%s' is already locked"
15090msgstr "'%s' 已被锁定"
15091
fd8cb379 15092#: builtin/worktree.c:660
5c57d762
JX
15093#, c-format
15094msgid "'%s' is not locked"
15095msgstr "'%s' 未被锁定"
15096
fd8cb379 15097#: builtin/worktree.c:685
31e5e17b 15098msgid "working trees containing submodules cannot be moved or removed"
610f8099 15099msgstr "不能移动或删除包含子模组的工作区"
31e5e17b 15100
fd8cb379 15101#: builtin/worktree.c:712 builtin/worktree.c:852
31e5e17b
JX
15102#, c-format
15103msgid "'%s' is a main working tree"
15104msgstr "'%s' 是一个主工作区"
15105
fd8cb379 15106#: builtin/worktree.c:717
31e5e17b
JX
15107#, c-format
15108msgid "could not figure out destination name from '%s'"
15109msgstr "无法从 '%s' 算出目标名称"
15110
fd8cb379 15111#: builtin/worktree.c:723
31e5e17b
JX
15112#, c-format
15113msgid "target '%s' already exists"
15114msgstr "目标 '%s' 已存在"
15115
fd8cb379 15116#: builtin/worktree.c:730
31e5e17b
JX
15117#, c-format
15118msgid "cannot move a locked working tree, lock reason: %s"
15119msgstr "无法移动一个锁定的工作区,锁定原因:%s"
15120
fd8cb379 15121#: builtin/worktree.c:732
31e5e17b
JX
15122msgid "cannot move a locked working tree"
15123msgstr "无法移动一个锁定的工作区"
15124
fd8cb379 15125#: builtin/worktree.c:735
31e5e17b
JX
15126#, c-format
15127msgid "validation failed, cannot move working tree: %s"
15128msgstr "验证失败,无法移动工作区:%s"
15129
fd8cb379 15130#: builtin/worktree.c:740
31e5e17b
JX
15131#, c-format
15132msgid "failed to move '%s' to '%s'"
15133msgstr "无法移动 '%s' 到 '%s'"
15134
fd8cb379 15135#: builtin/worktree.c:788
31e5e17b
JX
15136#, c-format
15137msgid "failed to run 'git status' on '%s'"
15138msgstr "无法在 '%s' 中执行 'git status'"
15139
fd8cb379 15140#: builtin/worktree.c:792
31e5e17b
JX
15141#, c-format
15142msgid "'%s' is dirty, use --force to delete it"
15143msgstr "'%s' 是脏的,使用 --force 删除"
15144
fd8cb379 15145#: builtin/worktree.c:797
31e5e17b
JX
15146#, c-format
15147msgid "failed to run 'git status' on '%s', code %d"
15148msgstr "无法在 '%s' 中执行 'git status',退出码 %d"
15149
fd8cb379 15150#: builtin/worktree.c:808 builtin/worktree.c:822
31e5e17b
JX
15151#, c-format
15152msgid "failed to delete '%s'"
15153msgstr "无法删除 '%s'"
15154
fd8cb379 15155#: builtin/worktree.c:834
31e5e17b
JX
15156msgid "force removing even if the worktree is dirty"
15157msgstr "强制删除,即使工作区是脏的"
15158
fd8cb379 15159#: builtin/worktree.c:856
31e5e17b
JX
15160#, c-format
15161msgid "cannot remove a locked working tree, lock reason: %s"
15162msgstr "无法删除一个锁定的工作区,锁定原因:%s"
15163
fd8cb379 15164#: builtin/worktree.c:858
31e5e17b
JX
15165msgid "cannot remove a locked working tree"
15166msgstr "无法删除一个锁定的工作区"
15167
fd8cb379 15168#: builtin/worktree.c:861
31e5e17b
JX
15169#, c-format
15170msgid "validation failed, cannot remove working tree: %s"
15171msgstr "验证失败,无法删除工作区:%s"
15172
a4f16749 15173#: builtin/write-tree.c:14
ef317cd5 15174msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 15175msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5 15176
a4f16749 15177#: builtin/write-tree.c:27
ef317cd5 15178msgid "<prefix>/"
07432cef 15179msgstr "<前缀>/"
ef317cd5 15180
a4f16749 15181#: builtin/write-tree.c:28
ef317cd5 15182msgid "write tree object for a subdirectory <prefix>"
07432cef 15183msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5 15184
a4f16749 15185#: builtin/write-tree.c:31
ef317cd5 15186msgid "only useful for debugging"
07432cef 15187msgstr "只对调试有用"
ef317cd5 15188
6937cb4e 15189#: credential-cache--daemon.c:222
a0b6b246
JX
15190#, c-format
15191msgid ""
15192"The permissions on your socket directory are too loose; other\n"
15193"users may be able to read your cached credentials. Consider running:\n"
15194"\n"
15195"\tchmod 0700 %s"
15196msgstr ""
1a79b2f1
JX
15197"您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
15198"行:\n"
a0b6b246
JX
15199"\n"
15200"\tchmod 0700 %s"
15201
6937cb4e 15202#: credential-cache--daemon.c:271
220c313c
JX
15203msgid "print debugging messages to stderr"
15204msgstr "调试信息输出到标准错误"
15205
fd8cb379 15206#: git.c:27
31e5e17b
JX
15207msgid ""
15208"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
15209" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
fd8cb379
JX
15210" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
15211"bare]\n"
31e5e17b
JX
15212" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
15213" <command> [<args>]"
15214msgstr ""
fd8cb379 15215"git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n"
31e5e17b 15216" [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
fd8cb379
JX
15217" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
15218"bare]\n"
31e5e17b
JX
15219" [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
15220" <命令> [<参数>]"
15221
fd8cb379 15222#: git.c:34
4dcdc3d8 15223msgid ""
220c313c 15224"'git help -a' and 'git help -g' list available subcommands and some\n"
4dcdc3d8
JX
15225"concept guides. See 'git help <command>' or 'git help <concept>'\n"
15226"to read about a specific subcommand or concept."
15227msgstr ""
220c313c
JX
15228"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
15229"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
15230"帮助。"
8ada9598 15231
fd8cb379 15232#: git.c:173
31e5e17b
JX
15233#, c-format
15234msgid "no directory given for --git-dir\n"
15235msgstr "没有为 --git-dir 提供目录\n"
15236
fd8cb379 15237#: git.c:187
31e5e17b
JX
15238#, c-format
15239msgid "no namespace given for --namespace\n"
15240msgstr "没有为 --namespace 提供命名空间\n"
15241
fd8cb379 15242#: git.c:201
31e5e17b
JX
15243#, c-format
15244msgid "no directory given for --work-tree\n"
15245msgstr "没有为 --work-tree 提供目录\n"
15246
fd8cb379 15247#: git.c:215
31e5e17b
JX
15248#, c-format
15249msgid "no prefix given for --super-prefix\n"
15250msgstr "没有为 --super-prefix 提供前缀\n"
15251
fd8cb379 15252#: git.c:237
31e5e17b
JX
15253#, c-format
15254msgid "-c expects a configuration string\n"
15255msgstr "应为 -c 提供一个配置字符串\n"
15256
fd8cb379 15257#: git.c:275
31e5e17b
JX
15258#, c-format
15259msgid "no directory given for -C\n"
15260msgstr "没有为 -C 提供目录\n"
15261
fd8cb379 15262#: git.c:300
31e5e17b
JX
15263#, c-format
15264msgid "unknown option: %s\n"
15265msgstr "未知选项:%s\n"
15266
fd8cb379 15267#: git.c:765
31e5e17b
JX
15268#, c-format
15269msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
15270msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n"
15271
fd8cb379 15272#: git.c:777
31e5e17b
JX
15273#, c-format
15274msgid "failed to run command '%s': %s\n"
15275msgstr "无法运行命令 '%s':%s\n"
15276
fd8cb379 15277#: http.c:348
60638e98
JX
15278#, c-format
15279msgid "negative value for http.postbuffer; defaulting to %d"
15280msgstr "http.postbuffer 为负值,默认为 %d"
15281
fd8cb379 15282#: http.c:369
a0b6b246
JX
15283msgid "Delegation control is not supported with cURL < 7.22.0"
15284msgstr "当 cURL < 7.22.0 时,不支持委托控制"
15285
fd8cb379 15286#: http.c:378
276ceeaa
JX
15287msgid "Public key pinning not supported with cURL < 7.44.0"
15288msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
15289
fd8cb379 15290#: http.c:1854
1a79b2f1
JX
15291#, c-format
15292msgid ""
15293"unable to update url base from redirection:\n"
15294" asked for: %s\n"
15295" redirect: %s"
15296msgstr ""
15297"不能更新重定向的 url base:\n"
15298" 请求:%s\n"
15299" 重定向:%s"
15300
fd8cb379 15301#: remote-curl.c:401
1a79b2f1
JX
15302#, c-format
15303msgid "redirecting to %s"
15304msgstr "重定向到 %s"
15305
31e5e17b 15306#: list-objects-filter-options.h:59
5809aa05
JX
15307msgid "args"
15308msgstr "参数"
15309
31e5e17b 15310#: list-objects-filter-options.h:60
5809aa05
JX
15311msgid "object filtering"
15312msgstr "对象过滤"
15313
fd8cb379
JX
15314#: parse-options.h:157
15315msgid "expiry-date"
15316msgstr "到期时间"
7aea43ff 15317
fd8cb379
JX
15318#: parse-options.h:172
15319msgid "no-op (backward compatibility)"
15320msgstr "空操作(向后兼容)"
7aea43ff 15321
fd8cb379
JX
15322#: parse-options.h:251
15323msgid "be more verbose"
15324msgstr "更加详细"
7aea43ff 15325
fd8cb379
JX
15326#: parse-options.h:253
15327msgid "be more quiet"
15328msgstr "更加安静"
7aea43ff 15329
fd8cb379
JX
15330#: parse-options.h:259
15331msgid "use <n> digits to display SHA-1s"
15332msgstr "用 <n> 位数字显示 SHA-1 哈希值"
7aea43ff 15333
fd8cb379 15334#: command-list.h:50
8ada9598 15335msgid "Add file contents to the index"
81809b99 15336msgstr "添加文件内容至索引"
8ada9598 15337
fd8cb379
JX
15338#: command-list.h:51
15339msgid "Apply a series of patches from a mailbox"
15340msgstr "应用邮箱格式的系列补丁"
15341
15342#: command-list.h:52
15343msgid "Annotate file lines with commit information"
15344msgstr "使用提交信息注释文件行"
15345
15346#: command-list.h:53
15347msgid "Apply a patch to files and/or to the index"
15348msgstr "应用一个补丁到文件和/或索引区"
15349
15350#: command-list.h:54
15351msgid "Import an Arch repository into Git"
15352msgstr "将一个 Arch 仓库导入到 Git"
15353
15354#: command-list.h:55
15355msgid "Create an archive of files from a named tree"
15356msgstr "基于一个指定的树创建文件存档"
15357
15358#: command-list.h:56
1b7f4a34
JX
15359msgid "Use binary search to find the commit that introduced a bug"
15360msgstr "通过二分查找定位引入 bug 的提交"
8ada9598 15361
fd8cb379
JX
15362#: command-list.h:57
15363msgid "Show what revision and author last modified each line of a file"
15364msgstr "显示文件每一行最后修改的版本和修改者"
15365
15366#: command-list.h:58
8ada9598 15367msgid "List, create, or delete branches"
81809b99 15368msgstr "列出、创建或删除分支"
8ada9598 15369
fd8cb379
JX
15370#: command-list.h:59
15371msgid "Move objects and refs by archive"
15372msgstr "通过归档移动对象和引用"
15373
15374#: command-list.h:60
15375msgid "Provide content or type and size information for repository objects"
15376msgstr "提供仓库对象的内容、类型或大小"
15377
15378#: command-list.h:61
15379msgid "Display gitattributes information"
15380msgstr "显示 gitattributes 信息"
15381
15382#: command-list.h:62
15383msgid "Debug gitignore / exclude files"
15384msgstr "调试 gitignore / exclude 文件"
15385
15386#: command-list.h:63
15387msgid "Show canonical names and email addresses of contacts"
15388msgstr "显示联系人的规范名称和电子邮件"
15389
15390#: command-list.h:64
5bb01d4f
JX
15391msgid "Switch branches or restore working tree files"
15392msgstr "切换分支或恢复工作区文件"
8ada9598 15393
fd8cb379
JX
15394#: command-list.h:65
15395msgid "Copy files from the index to the working tree"
15396msgstr "从索引拷贝文件到工作区"
15397
15398#: command-list.h:66
15399msgid "Ensures that a reference name is well formed"
15400msgstr "确保引用名称格式正确"
15401
15402#: command-list.h:67
15403msgid "Find commits yet to be applied to upstream"
15404msgstr "查找尚未应用到上游的提交"
15405
15406#: command-list.h:68
15407msgid "Apply the changes introduced by some existing commits"
15408msgstr "应用一些现存提交引入的修改"
15409
15410#: command-list.h:69
15411msgid "Graphical alternative to git-commit"
15412msgstr "git-commit 的图形替代界面"
15413
15414#: command-list.h:70
15415msgid "Remove untracked files from the working tree"
15416msgstr "从工作区中删除未跟踪文件"
15417
15418#: command-list.h:71
8ada9598 15419msgid "Clone a repository into a new directory"
160fb2b2 15420msgstr "克隆一个仓库到一个新目录"
8ada9598 15421
fd8cb379
JX
15422#: command-list.h:72
15423msgid "Display data in columns"
15424msgstr "以列的方式显示数据"
15425
15426#: command-list.h:73
8ada9598 15427msgid "Record changes to the repository"
160fb2b2 15428msgstr "记录变更到仓库"
8ada9598 15429
fd8cb379
JX
15430#: command-list.h:74
15431msgid "Write and verify Git commit graph files"
15432msgstr "写入和校验 Git 提交图形文件"
15433
15434#: command-list.h:75
15435msgid "Create a new commit object"
15436msgstr "创建一个新的提交对象"
15437
15438#: command-list.h:76
15439msgid "Get and set repository or global options"
15440msgstr "获取和设置仓库或者全局选项"
15441
15442#: command-list.h:77
15443msgid "Count unpacked number of objects and their disk consumption"
15444msgstr "计算未打包对象的数量和磁盘空间占用"
15445
15446#: command-list.h:78
15447msgid "Retrieve and store user credentials"
15448msgstr "检索和存储用户密码"
15449
15450#: command-list.h:79
15451msgid "Helper to temporarily store passwords in memory"
15452msgstr "在内存中临时存储密码的助手"
15453
15454#: command-list.h:80
15455msgid "Helper to store credentials on disk"
15456msgstr "在磁盘存储密码的助手"
15457
15458#: command-list.h:81
15459msgid "Export a single commit to a CVS checkout"
15460msgstr "将一个提交导出到 CVS 检出中"
15461
15462#: command-list.h:82
15463msgid "Salvage your data out of another SCM people love to hate"
15464msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据"
15465
15466#: command-list.h:83
15467msgid "A CVS server emulator for Git"
15468msgstr "Git 的一个 CVS 服务模拟器"
15469
15470#: command-list.h:84
15471msgid "A really simple server for Git repositories"
15472msgstr "一个非常简单的 Git 仓库服务器"
15473
15474#: command-list.h:85
15475msgid "Give an object a human readable name based on an available ref"
15476msgstr "基于一个现存的引用为一个对象起一个可读的名称"
15477
15478#: command-list.h:86
8ada9598 15479msgid "Show changes between commits, commit and working tree, etc"
81809b99 15480msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598 15481
fd8cb379
JX
15482#: command-list.h:87
15483msgid "Compares files in the working tree and the index"
15484msgstr "比较工作区和索引区中的文件"
15485
15486#: command-list.h:88
15487msgid "Compare a tree to the working tree or index"
15488msgstr "将一个树和工作区或索引做比较"
15489
15490#: command-list.h:89
15491msgid "Compares the content and mode of blobs found via two tree objects"
15492msgstr "比较两个树对象的文件内容和模式"
15493
15494#: command-list.h:90
15495msgid "Show changes using common diff tools"
15496msgstr "使用常见的差异工具显示更改"
15497
15498#: command-list.h:91
15499msgid "Git data exporter"
15500msgstr "Git 数据导出器"
15501
15502#: command-list.h:92
15503msgid "Backend for fast Git data importers"
15504msgstr "Git 快速数据导入器后端"
15505
15506#: command-list.h:93
8ada9598 15507msgid "Download objects and refs from another repository"
160fb2b2 15508msgstr "从另外一个仓库下载对象和引用"
8ada9598 15509
fd8cb379
JX
15510#: command-list.h:94
15511msgid "Receive missing objects from another repository"
15512msgstr "从另一个仓库获取缺失的对象"
15513
15514#: command-list.h:95
15515msgid "Rewrite branches"
15516msgstr "重写分支"
15517
15518#: command-list.h:96
15519msgid "Produce a merge commit message"
15520msgstr "生成一个合并提交信息"
15521
15522#: command-list.h:97
15523msgid "Output information on each ref"
15524msgstr "对每一个引用输出信息 "
15525
15526#: command-list.h:98
15527msgid "Prepare patches for e-mail submission"
15528msgstr "准备电子邮件提交的补丁"
15529
15530#: command-list.h:99
15531msgid "Verifies the connectivity and validity of the objects in the database"
15532msgstr "验证仓库中对象的连通性和有效性"
15533
15534#: command-list.h:100
15535msgid "Cleanup unnecessary files and optimize the local repository"
15536msgstr "清除不必要的文件和优化本地仓库"
15537
15538#: command-list.h:101
15539msgid "Extract commit ID from an archive created using git-archive"
15540msgstr "从 git-archive 创建的归档文件中提取提交ID"
15541
15542#: command-list.h:102
8ada9598 15543msgid "Print lines matching a pattern"
81809b99 15544msgstr "输出和模式匹配的行"
8ada9598 15545
fd8cb379
JX
15546#: command-list.h:103
15547msgid "A portable graphical interface to Git"
15548msgstr "一个便携的 Git 图形客户端"
15549
15550#: command-list.h:104
15551msgid "Compute object ID and optionally creates a blob from a file"
15552msgstr "从一个文件计算对象ID,并可以创建 blob 数据对象"
15553
15554#: command-list.h:105
15555msgid "Display help information about Git"
15556msgstr "显示 Git 的帮助信息"
15557
15558#: command-list.h:106
15559msgid "Server side implementation of Git over HTTP"
15560msgstr "Git HTTP 协议的服务端实现"
15561
15562#: command-list.h:107
15563msgid "Download from a remote Git repository via HTTP"
15564msgstr "通过 HTTP 从远程 Git 仓库下载"
15565
15566#: command-list.h:108
15567msgid "Push objects over HTTP/DAV to another repository"
15568msgstr "通过 HTTP/DAV 推送对象另一个仓库"
15569
15570#: command-list.h:109
15571msgid "Send a collection of patches from stdin to an IMAP folder"
15572msgstr "从标准输入将一组补丁发送到IMAP文件夹"
15573
15574#: command-list.h:110
15575msgid "Build pack index file for an existing packed archive"
15576msgstr "从一个现存的包存档文件创建包索引"
15577
15578#: command-list.h:111
a77c07d9 15579msgid "Create an empty Git repository or reinitialize an existing one"
160fb2b2 15580msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
8ada9598 15581
fd8cb379
JX
15582#: command-list.h:112
15583msgid "Instantly browse your working repository in gitweb"
15584msgstr "在 gitweb 中即时浏览您的工作仓库"
15585
15586#: command-list.h:113
15587msgid "add or parse structured information in commit messages"
15588msgstr "添加或解析提交说明中的结构化信息"
15589
15590#: command-list.h:114
15591msgid "The Git repository browser"
15592msgstr "Git 仓库浏览器"
15593
15594#: command-list.h:115
8ada9598 15595msgid "Show commit logs"
81809b99 15596msgstr "显示提交日志"
8ada9598 15597
fd8cb379
JX
15598#: command-list.h:116
15599msgid "Show information about files in the index and the working tree"
15600msgstr "显示索引和工作区中文件的信息"
15601
15602#: command-list.h:117
15603msgid "List references in a remote repository"
15604msgstr "显示一个远程仓库的引用"
15605
15606#: command-list.h:118
15607msgid "List the contents of a tree object"
15608msgstr "显示一个树对象的内容"
15609
15610#: command-list.h:119
15611msgid "Extracts patch and authorship from a single e-mail message"
15612msgstr "从单个电子邮件中提取补丁和作者身份"
15613
15614#: command-list.h:120
15615msgid "Simple UNIX mbox splitter program"
15616msgstr "简单的 UNIX mbox 邮箱切分程序"
15617
15618#: command-list.h:121
8ada9598 15619msgid "Join two or more development histories together"
81809b99 15620msgstr "合并两个或更多开发历史"
8ada9598 15621
fd8cb379
JX
15622#: command-list.h:122
15623msgid "Find as good common ancestors as possible for a merge"
15624msgstr "为了合并查找尽可能好的公共祖先提交"
15625
15626#: command-list.h:123
15627msgid "Run a three-way file merge"
15628msgstr "运行一个三路文件合并"
15629
15630#: command-list.h:124
15631msgid "Run a merge for files needing merging"
15632msgstr "对于需要合并的文件执行合并"
15633
15634#: command-list.h:125
15635msgid "The standard helper program to use with git-merge-index"
15636msgstr "与 git-merge-index 一起使用的标准向导程序"
15637
15638#: command-list.h:126
15639msgid "Run merge conflict resolution tools to resolve merge conflicts"
15640msgstr "运行合并冲突解决工具以解决合并冲突"
15641
15642#: command-list.h:127
15643msgid "Show three-way merge without touching index"
15644msgstr "显示三路合并而不动索引"
15645
15646#: command-list.h:128
15647msgid "Creates a tag object"
15648msgstr "创建一个标签对象"
15649
15650#: command-list.h:129
15651msgid "Build a tree-object from ls-tree formatted text"
15652msgstr "基于 ls-tree 的格式化文本创建一个树对象"
15653
15654#: command-list.h:130
8ada9598 15655msgid "Move or rename a file, a directory, or a symlink"
81809b99 15656msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598 15657
fd8cb379
JX
15658# 查找给定版本的符号名称
15659#: command-list.h:131
15660msgid "Find symbolic names for given revs"
15661msgstr "查找给定版本的符号名称"
15662
15663#: command-list.h:132
15664msgid "Add or inspect object notes"
15665msgstr "添加或检查对象注释"
15666
15667#: command-list.h:133
15668msgid "Import from and submit to Perforce repositories"
15669msgstr "导入和提交到 Perforce 仓库中"
15670
15671#: command-list.h:134
15672msgid "Create a packed archive of objects"
15673msgstr "创建对象的存档包"
15674
15675#: command-list.h:135
15676msgid "Find redundant pack files"
15677msgstr "查找冗余的包文件"
15678
15679#: command-list.h:136
15680msgid "Pack heads and tags for efficient repository access"
15681msgstr "打包头和标签以实现高效的仓库访问"
15682
15683#: command-list.h:137
15684msgid "Routines to help parsing remote repository access parameters"
15685msgstr "帮助解析远程仓库访问参数的例程"
15686
15687#: command-list.h:138
15688msgid "Compute unique ID for a patch"
15689msgstr "计算一个补丁的唯一ID"
15690
15691#: command-list.h:139
15692msgid "Prune all unreachable objects from the object database"
15693msgstr "删除对象库中所有不可达对象"
15694
15695#: command-list.h:140
15696msgid "Remove extra objects that are already in pack files"
15697msgstr "删除已经在包文件中的多余对象"
15698
15699#: command-list.h:141
2e8451e8 15700msgid "Fetch from and integrate with another repository or a local branch"
160fb2b2 15701msgstr "获取并整合另外的仓库或一个本地分支"
8ada9598 15702
fd8cb379 15703#: command-list.h:142
8ada9598 15704msgid "Update remote refs along with associated objects"
81809b99 15705msgstr "更新远程引用和相关的对象"
8ada9598 15706
fd8cb379
JX
15707#: command-list.h:143
15708msgid "Applies a quilt patchset onto the current branch"
15709msgstr "将一个 quilt 补丁集应用到当前分支。"
15710
15711#: command-list.h:144
15712msgid "Reads tree information into the index"
15713msgstr "将树信息读取到索引"
15714
15715#: command-list.h:145
3495628d
JX
15716msgid "Reapply commits on top of another base tip"
15717msgstr "在另一个分支上重新应用提交"
8ada9598 15718
fd8cb379
JX
15719#: command-list.h:146
15720msgid "Receive what is pushed into the repository"
15721msgstr "接收推送到仓库中的对象"
15722
15723#: command-list.h:147
15724msgid "Manage reflog information"
15725msgstr "管理 reflog 信息"
15726
15727#: command-list.h:148
15728msgid "Manage set of tracked repositories"
15729msgstr "管理已跟踪仓库"
15730
15731#: command-list.h:149
15732msgid "Pack unpacked objects in a repository"
15733msgstr "打包仓库中未打包对象"
15734
15735#: command-list.h:150
15736msgid "Create, list, delete refs to replace objects"
15737msgstr "创建、列出、删除对象替换引用"
15738
15739#: command-list.h:151
15740msgid "Generates a summary of pending changes"
15741msgstr "生成待定更改的摘要"
15742
15743#: command-list.h:152
15744msgid "Reuse recorded resolution of conflicted merges"
15745msgstr "重用冲突合并的解决方案记录"
15746
15747#: command-list.h:153
8ada9598 15748msgid "Reset current HEAD to the specified state"
4375c10e 15749msgstr "重置当前 HEAD 到指定状态"
8ada9598 15750
fd8cb379
JX
15751#: command-list.h:154
15752msgid "Revert some existing commits"
15753msgstr "回退一些现存提交"
15754
15755#: command-list.h:155
15756msgid "Lists commit objects in reverse chronological order"
15757msgstr "按时间顺序列出提交对象"
15758
15759#: command-list.h:156
15760msgid "Pick out and massage parameters"
15761msgstr "选出并处理参数"
15762
15763#: command-list.h:157
8ada9598 15764msgid "Remove files from the working tree and from the index"
81809b99 15765msgstr "从工作区和索引中删除文件"
8ada9598 15766
fd8cb379
JX
15767#: command-list.h:158
15768msgid "Send a collection of patches as emails"
15769msgstr "通过电子邮件发送一组补丁"
15770
15771#: command-list.h:159
15772msgid "Push objects over Git protocol to another repository"
15773msgstr "使用 Git 协议推送对象到另一个仓库"
15774
15775#: command-list.h:160
15776msgid "Restricted login shell for Git-only SSH access"
15777msgstr "只允许 Git SSH 访问的受限登录shell"
15778
15779#: command-list.h:161
15780msgid "Summarize 'git log' output"
15781msgstr "'git log' 输出摘要"
15782
15783#: command-list.h:162
8ada9598 15784msgid "Show various types of objects"
81809b99 15785msgstr "显示各种类型的对象"
8ada9598 15786
fd8cb379
JX
15787#: command-list.h:163
15788msgid "Show branches and their commits"
15789msgstr "显示分支和提交"
15790
15791#: command-list.h:164
15792msgid "Show packed archive index"
15793msgstr "显示打包归档索引"
15794
15795#: command-list.h:165
15796msgid "List references in a local repository"
15797msgstr "显示本地仓库中的引用"
15798
15799#: command-list.h:166
15800msgid "Git's i18n setup code for shell scripts"
15801msgstr "为 shell 脚本准备的 Git 国际化设置代码"
15802
15803#: command-list.h:167
15804msgid "Common Git shell script setup code"
15805msgstr "常用的 Git shell 脚本设置代码"
15806
15807#: command-list.h:168
15808msgid "Stash the changes in a dirty working directory away"
15809msgstr "贮藏脏工作区中的修改"
15810
15811#: command-list.h:169
15812msgid "Add file contents to the staging area"
15813msgstr "将文件内容添加到索引"
15814
15815#: command-list.h:170
8ada9598 15816msgid "Show the working tree status"
81809b99 15817msgstr "显示工作区状态"
8ada9598 15818
fd8cb379
JX
15819#: command-list.h:171
15820msgid "Remove unnecessary whitespace"
15821msgstr "删除不必要的空白字符"
15822
15823#: command-list.h:172
15824msgid "Initialize, update or inspect submodules"
15825msgstr "初始化、更新或检查子模组"
15826
15827#: command-list.h:173
15828msgid "Bidirectional operation between a Subversion repository and Git"
15829msgstr "Subersion 仓库和 Git 之间的双向操作"
15830
15831#: command-list.h:174
15832msgid "Read, modify and delete symbolic refs"
15833msgstr "读取、修改和删除符号引用"
15834
15835#: command-list.h:175
8ada9598 15836msgid "Create, list, delete or verify a tag object signed with GPG"
4375c10e 15837msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
8ada9598 15838
fd8cb379
JX
15839#: command-list.h:176
15840msgid "Creates a temporary file with a blob's contents"
15841msgstr "用 blob 数据对象的内容创建一个临时文件"
220c313c 15842
fd8cb379
JX
15843#: command-list.h:177
15844msgid "Unpack objects from a packed archive"
15845msgstr "从打包文件中解压缩对象"
220c313c 15846
fd8cb379
JX
15847#: command-list.h:178
15848msgid "Register file contents in the working tree to the index"
15849msgstr "将工作区的文件内容注册到索引"
220c313c 15850
fd8cb379
JX
15851#: command-list.h:179
15852msgid "Update the object name stored in a ref safely"
15853msgstr "安全地更新存储于引用中的对象名称"
220c313c 15854
fd8cb379
JX
15855#: command-list.h:180
15856msgid "Update auxiliary info file to help dumb servers"
15857msgstr "更新辅助信息文件以帮助哑协议服务"
15858
15859#: command-list.h:181
15860msgid "Send archive back to git-archive"
15861msgstr "将存档发送回 git-archive"
15862
15863#: command-list.h:182
15864msgid "Send objects packed back to git-fetch-pack"
15865msgstr "将对象压缩包发送回 git-fetch-pack"
15866
15867#: command-list.h:183
15868msgid "Show a Git logical variable"
15869msgstr "显示一个Git逻辑变量"
15870
15871#: command-list.h:184
15872msgid "Check the GPG signature of commits"
15873msgstr "检查 GPG 提交签名"
15874
15875#: command-list.h:185
15876msgid "Validate packed Git archive files"
15877msgstr "校验打包的Git存仓文件"
15878
15879#: command-list.h:186
15880msgid "Check the GPG signature of tags"
15881msgstr "检查标签的 GPG 签名"
15882
15883#: command-list.h:187
15884msgid "Git web interface (web frontend to Git repositories)"
15885msgstr "Git web 界面(Git 仓库的 web 前端)"
15886
15887#: command-list.h:188
15888msgid "Show logs with difference each commit introduces"
15889msgstr "显示每一个提交引入的差异日志"
15890
15891#: command-list.h:189
15892msgid "Manage multiple working trees"
15893msgstr "管理多个工作区"
15894
15895#: command-list.h:190
15896msgid "Create a tree object from the current index"
15897msgstr "从当前索引创建一个树对象"
15898
15899#: command-list.h:191
15900msgid "Defining attributes per path"
15901msgstr "定义路径的属性"
15902
15903#: command-list.h:192
15904msgid "Git command-line interface and conventions"
15905msgstr "Git 命令行界面和约定"
15906
15907#: command-list.h:193
15908msgid "A Git core tutorial for developers"
15909msgstr "面向开发人员的 Git 核心教程"
15910
15911#: command-list.h:194
15912msgid "Git for CVS users"
15913msgstr "适合 CVS 用户的 Git 帮助"
15914
15915#: command-list.h:195
15916msgid "Tweaking diff output"
15917msgstr "调整差异输出"
15918
15919#: command-list.h:196
15920msgid "A useful minimum set of commands for Everyday Git"
15921msgstr "每一天 Git 的一组有用的最小命令集合"
15922
15923#: command-list.h:197
15924msgid "A Git Glossary"
15925msgstr "Git 词汇表"
15926
15927#: command-list.h:198
15928msgid "Hooks used by Git"
15929msgstr "Git 使用的钩子"
15930
15931#: command-list.h:199
15932msgid "Specifies intentionally untracked files to ignore"
15933msgstr "忽略指定的未跟踪文件"
15934
15935#: command-list.h:200
15936msgid "Defining submodule properties"
15937msgstr "定义子模组属性"
15938
15939#: command-list.h:201
15940msgid "Git namespaces"
15941msgstr "Git 名字空间"
15942
15943#: command-list.h:202
15944msgid "Git Repository Layout"
15945msgstr "Git 仓库布局"
15946
15947#: command-list.h:203
15948msgid "Specifying revisions and ranges for Git"
15949msgstr "指定 Git 的版本和版本范围"
15950
15951#: command-list.h:204
15952msgid "A tutorial introduction to Git: part two"
15953msgstr "一个 Git 教程:第二部分"
15954
15955#: command-list.h:205
15956msgid "A tutorial introduction to Git"
15957msgstr "一个 Git 教程"
15958
15959#: command-list.h:206
15960msgid "An overview of recommended workflows with Git"
15961msgstr "Git 推荐的工作流概览"
220c313c 15962
5b04ee3b 15963#: rerere.h:40
220c313c
JX
15964msgid "update the index with reused conflict resolution if possible"
15965msgstr "如果可能,重用冲突解决更新索引"
15966
5c57d762 15967#: git-bisect.sh:54
b694fbb1
JX
15968msgid "You need to start by \"git bisect start\""
15969msgstr "您需要执行 \"git bisect start\" 来开始"
15970
90e6ef53 15971# 译者:注意保持句尾空格
c04f5ac3
JX
15972#. TRANSLATORS: Make sure to include [Y] and [n] in your
15973#. translation. The program will only accept English input
15974#. at this point.
5c57d762 15975#: git-bisect.sh:60
c04f5ac3
JX
15976msgid "Do you want me to do it for you [Y/n]? "
15977msgstr "您想让我为您这样做么[Y/n]? "
15978
5c57d762 15979#: git-bisect.sh:121
c04f5ac3
JX
15980#, sh-format
15981msgid "unrecognised option: '$arg'"
81809b99 15982msgstr "未能识别的选项:'$arg'"
c04f5ac3 15983
5c57d762 15984#: git-bisect.sh:125
c04f5ac3
JX
15985#, sh-format
15986msgid "'$arg' does not appear to be a valid revision"
15987msgstr "'$arg' 看起来不像是一个有效的版本"
15988
5c57d762 15989#: git-bisect.sh:154
c04f5ac3
JX
15990msgid "Bad HEAD - I need a HEAD"
15991msgstr "坏的 HEAD - 我需要一个 HEAD"
15992
5c57d762 15993#: git-bisect.sh:167
c04f5ac3
JX
15994#, sh-format
15995msgid ""
814ff314 15996"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
d9d56b23 15997msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
c04f5ac3 15998
5c57d762 15999#: git-bisect.sh:177
cfff71a9
JX
16000msgid "won't bisect on cg-seek'ed tree"
16001msgstr "不会在做了 cg-seek 的树上做二分查找"
c04f5ac3 16002
5c57d762 16003#: git-bisect.sh:181
c04f5ac3 16004msgid "Bad HEAD - strange symbolic ref"
90e6ef53 16005msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3 16006
5c57d762 16007#: git-bisect.sh:233
c04f5ac3
JX
16008#, sh-format
16009msgid "Bad bisect_write argument: $state"
90e6ef53 16010msgstr "坏的 bisect_write 参数:$state"
c04f5ac3 16011
5809aa05 16012#: git-bisect.sh:246
c04f5ac3
JX
16013#, sh-format
16014msgid "Bad rev input: $arg"
9a4b694c 16015msgstr "坏的输入版本:$arg"
c04f5ac3 16016
5809aa05 16017#: git-bisect.sh:265
5c57d762
JX
16018#, sh-format
16019msgid "Bad rev input: $bisected_head"
9a4b694c 16020msgstr "坏的输入版本:$bisected_head"
c04f5ac3 16021
5809aa05 16022#: git-bisect.sh:274
c04f5ac3
JX
16023#, sh-format
16024msgid "Bad rev input: $rev"
9a4b694c 16025msgstr "坏的输入版本:$rev"
c04f5ac3 16026
5809aa05 16027#: git-bisect.sh:283
1b7f4a34
JX
16028#, sh-format
16029msgid "'git bisect $TERM_BAD' can take only one argument."
16030msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
16031
5809aa05 16032#: git-bisect.sh:306
1b7f4a34
JX
16033#, sh-format
16034msgid "Warning: bisecting only with a $TERM_BAD commit."
16035msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
b694fbb1 16036
90e6ef53 16037# 译者:注意保持句尾空格
c04f5ac3
JX
16038#. TRANSLATORS: Make sure to include [Y] and [n] in your
16039#. translation. The program will only accept English input
16040#. at this point.
5809aa05 16041#: git-bisect.sh:312
c04f5ac3
JX
16042msgid "Are you sure [Y/n]? "
16043msgstr "您确认么[Y/n]? "
16044
5809aa05 16045#: git-bisect.sh:324
1b7f4a34 16046#, sh-format
b694fbb1 16047msgid ""
1b7f4a34
JX
16048"You need to give me at least one $bad_syn and one $good_syn revision.\n"
16049"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
b694fbb1
JX
16050msgstr ""
16051"您需要给我至少一个好版本和一个坏版本。\n"
1b7f4a34 16052"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
b694fbb1 16053
5809aa05 16054#: git-bisect.sh:327
1b7f4a34 16055#, sh-format
b694fbb1
JX
16056msgid ""
16057"You need to start by \"git bisect start\".\n"
1b7f4a34
JX
16058"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
16059"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
b694fbb1
JX
16060msgstr ""
16061"您需要执行 \"git bisect start\" 来开始。\n"
16062"然后需要提供我至少一个好版本和一个坏版本。\n"
1b7f4a34 16063"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
b694fbb1 16064
5809aa05 16065#: git-bisect.sh:398 git-bisect.sh:512
b694fbb1
JX
16066msgid "We are not bisecting."
16067msgstr "我们没有在二分查找。"
16068
5809aa05 16069#: git-bisect.sh:405
c04f5ac3
JX
16070#, sh-format
16071msgid "'$invalid' is not a valid commit"
16072msgstr "'$invalid' 不是一个有效的提交"
16073
5809aa05 16074#: git-bisect.sh:414
c04f5ac3
JX
16075#, sh-format
16076msgid ""
16077"Could not check out original HEAD '$branch'.\n"
16078"Try 'git bisect reset <commit>'."
16079msgstr ""
16080"不能检出原始 HEAD '$branch'。\n"
07432cef 16081"尝试 'git bisect reset <提交>'。"
c04f5ac3 16082
5809aa05 16083#: git-bisect.sh:422
c04f5ac3
JX
16084msgid "No logfile given"
16085msgstr "未提供日志文件"
16086
5809aa05 16087#: git-bisect.sh:423
c04f5ac3
JX
16088#, sh-format
16089msgid "cannot read $file for replaying"
16090msgstr "不能读取 $file 来重放"
16091
5809aa05 16092#: git-bisect.sh:444
c04f5ac3
JX
16093msgid "?? what are you talking about?"
16094msgstr "?? 您在说什么?"
16095
5809aa05
JX
16096#: git-bisect.sh:453
16097msgid "bisect run failed: no command provided."
16098msgstr "二分查找运行失败:没有提供命令。"
16099
16100#: git-bisect.sh:458
b694fbb1
JX
16101#, sh-format
16102msgid "running $command"
16103msgstr "运行 $command"
16104
5809aa05 16105#: git-bisect.sh:465
b694fbb1
JX
16106#, sh-format
16107msgid ""
16108"bisect run failed:\n"
16109"exit code $res from '$command' is < 0 or >= 128"
16110msgstr ""
16111"二分查找运行失败:\n"
07432cef 16112"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 16113
5809aa05 16114#: git-bisect.sh:491
b694fbb1
JX
16115msgid "bisect run cannot continue any more"
16116msgstr "二分查找不能继续运行"
16117
5809aa05 16118#: git-bisect.sh:497
b694fbb1
JX
16119#, sh-format
16120msgid ""
16121"bisect run failed:\n"
16122"'bisect_state $state' exited with error code $res"
16123msgstr ""
16124"二分查找运行失败:\n"
16125"'bisect_state $state' 退出码为 $res"
16126
5809aa05 16127#: git-bisect.sh:504
b694fbb1
JX
16128msgid "bisect run success"
16129msgstr "二分查找运行成功"
c04f5ac3 16130
5809aa05 16131#: git-bisect.sh:533
b694fbb1 16132#, sh-format
1b7f4a34
JX
16133msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
16134msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
c04f5ac3 16135
5809aa05 16136#: git-bisect.sh:567
94550ed3
JX
16137msgid "no terms defined"
16138msgstr "未定义术语"
16139
5809aa05 16140#: git-bisect.sh:584
94550ed3
JX
16141#, sh-format
16142msgid ""
16143"invalid argument $arg for 'git bisect terms'.\n"
16144"Supported options are: --term-good|--term-old and --term-bad|--term-new."
16145msgstr ""
16146"参数 $arg 对命令 'git bisect terms' 无效。\n"
16147"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
16148
5c57d762
JX
16149#: git-merge-octopus.sh:46
16150msgid ""
16151"Error: Your local changes to the following files would be overwritten by "
16152"merge"
16153msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
16154
16155#: git-merge-octopus.sh:61
16156msgid "Automated merge did not work."
9a4b694c 16157msgstr "自动合并未生效。"
5c57d762
JX
16158
16159#: git-merge-octopus.sh:62
a0b6b246 16160msgid "Should not be doing an octopus."
5c57d762
JX
16161msgstr "不应该执行章鱼式合并。"
16162
16163#: git-merge-octopus.sh:73
16164#, sh-format
16165msgid "Unable to find common commit with $pretty_name"
16166msgstr "无法找到和 $pretty_name 的基线提交"
16167
16168#: git-merge-octopus.sh:77
16169#, sh-format
6937cb4e 16170msgid "Already up to date with $pretty_name"
5c57d762
JX
16171msgstr "已经和 $pretty_name 保持一致"
16172
16173#: git-merge-octopus.sh:89
16174#, sh-format
16175msgid "Fast-forwarding to: $pretty_name"
16176msgstr "快进至:$pretty_name"
16177
16178#: git-merge-octopus.sh:97
16179#, sh-format
16180msgid "Trying simple merge with $pretty_name"
16181msgstr "尝试和 $pretty_name 的简单合并"
16182
16183#: git-merge-octopus.sh:102
16184msgid "Simple merge did not work, trying automatic merge."
9a4b694c 16185msgstr "简单合并未生效,尝试自动合并。"
5c57d762 16186
fd8cb379 16187#: git-rebase.sh:61
649900bc 16188msgid ""
6937cb4e
JX
16189"Resolve all conflicts manually, mark them as resolved with\n"
16190"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
16191"You can instead skip this commit: run \"git rebase --skip\".\n"
16192"To abort and get back to the state before \"git rebase\", run \"git rebase --"
16193"abort\"."
649900bc 16194msgstr ""
58b6f078 16195"手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n"
6937cb4e
JX
16196"冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n"
16197"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
16198"\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。"
649900bc 16199
fd8cb379 16200#: git-rebase.sh:173 git-rebase.sh:442
5c57d762
JX
16201#, sh-format
16202msgid "Could not move back to $head_name"
16203msgstr "无法移回 $head_name"
16204
fd8cb379 16205#: git-rebase.sh:184
a4f16749
JX
16206msgid "Applied autostash."
16207msgstr "成功应用 autostash。"
16208
fd8cb379 16209#: git-rebase.sh:187
2e8451e8
JX
16210#, sh-format
16211msgid "Cannot store $stash_sha1"
16212msgstr "无法保存 $stash_sha1"
16213
fd8cb379 16214#: git-rebase.sh:229
649900bc 16215msgid "The pre-rebase hook refused to rebase."
98b2761d 16216msgstr "钩子 pre-rebase 拒绝变基操作。"
649900bc 16217
fd8cb379 16218#: git-rebase.sh:234
5809aa05
JX
16219msgid "It looks like 'git am' is in progress. Cannot rebase."
16220msgstr "看起来 'git-am' 正在执行中。无法变基。"
649900bc 16221
fd8cb379 16222#: git-rebase.sh:403
649900bc
JX
16223msgid "No rebase in progress?"
16224msgstr "没有正在进行的变基?"
16225
fd8cb379 16226#: git-rebase.sh:414
07432cef
WS
16227msgid "The --edit-todo action can only be used during interactive rebase."
16228msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
16229
fd8cb379 16230#: git-rebase.sh:421
649900bc
JX
16231msgid "Cannot read HEAD"
16232msgstr "不能读取 HEAD"
16233
fd8cb379 16234#: git-rebase.sh:424
649900bc
JX
16235msgid ""
16236"You must edit all merge conflicts and then\n"
16237"mark them as resolved using git add"
16238msgstr ""
16239"您必须编辑所有的合并冲突,然后通过 git add\n"
16240"命令将它们标记为已解决"
16241
fd8cb379 16242#: git-rebase.sh:468
649900bc
JX
16243#, sh-format
16244msgid ""
16245"It seems that there is already a $state_dir_base directory, and\n"
16246"I wonder if you are in the middle of another rebase. If that is the\n"
16247"case, please try\n"
16248"\t$cmd_live_rebase\n"
16249"If that is not the case, please\n"
16250"\t$cmd_clear_stale_rebase\n"
16251"and run me again. I am stopping in case you still have something\n"
16252"valuable there."
16253msgstr ""
98b2761d
JX
16254"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
16255"过程中。 如果是这样,请执行\n"
649900bc
JX
16256"\t$cmd_live_rebase\n"
16257"如果不是这样,请执行\n"
16258"\t$cmd_clear_stale_rebase\n"
98b2761d 16259"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
649900bc 16260
fd8cb379
JX
16261#: git-rebase.sh:509
16262msgid "error: cannot combine '--signoff' with '--preserve-merges'"
16263msgstr "错误:不能组合参数 '--signoff' 和 '--preserve-merges'"
16264
16265#: git-rebase.sh:537
649900bc 16266#, sh-format
5809aa05
JX
16267msgid "invalid upstream '$upstream_name'"
16268msgstr "无效的上游 '$upstream_name'"
649900bc 16269
fd8cb379 16270#: git-rebase.sh:561
649900bc
JX
16271#, sh-format
16272msgid "$onto_name: there are more than one merge bases"
16273msgstr "$onto_name: 有一个以上的合并基准"
16274
fd8cb379 16275#: git-rebase.sh:564 git-rebase.sh:568
649900bc
JX
16276#, sh-format
16277msgid "$onto_name: there is no merge base"
16278msgstr "$onto_name: 没有合并基准"
16279
fd8cb379 16280#: git-rebase.sh:573
649900bc
JX
16281#, sh-format
16282msgid "Does not point to a valid commit: $onto_name"
16283msgstr "没有指向一个有效的提交:$onto_name"
16284
fd8cb379 16285#: git-rebase.sh:599
649900bc 16286#, sh-format
5809aa05
JX
16287msgid "fatal: no such branch/commit '$branch_name'"
16288msgstr "严重错误:无此分支/提交 '$branch_name'"
649900bc 16289
fd8cb379 16290#: git-rebase.sh:632
2e8451e8
JX
16291msgid "Cannot autostash"
16292msgstr "无法 autostash"
16293
fd8cb379 16294#: git-rebase.sh:637
2e8451e8
JX
16295#, sh-format
16296msgid "Created autostash: $stash_abbrev"
16297msgstr "创建了 autostash: $stash_abbrev"
16298
fd8cb379 16299#: git-rebase.sh:641
649900bc 16300msgid "Please commit or stash them."
a4f16749 16301msgstr "请提交或贮藏修改。"
649900bc 16302
fd8cb379 16303#: git-rebase.sh:664
5809aa05
JX
16304#, sh-format
16305msgid "HEAD is up to date."
16306msgstr "HEAD 是最新的。"
16307
fd8cb379 16308#: git-rebase.sh:666
649900bc
JX
16309#, sh-format
16310msgid "Current branch $branch_name is up to date."
16311msgstr "当前分支 $branch_name 是最新的。"
16312
fd8cb379 16313#: git-rebase.sh:674
5809aa05
JX
16314#, sh-format
16315msgid "HEAD is up to date, rebase forced."
16316msgstr "HEAD 是最新的,强制变基。"
16317
fd8cb379 16318#: git-rebase.sh:676
649900bc
JX
16319#, sh-format
16320msgid "Current branch $branch_name is up to date, rebase forced."
16321msgstr "当前分支 $branch_name 是最新的,强制变基。"
16322
fd8cb379 16323#: git-rebase.sh:688
649900bc
JX
16324#, sh-format
16325msgid "Changes from $mb to $onto:"
16326msgstr "变更从 $mb 到 $onto:"
16327
fd8cb379 16328#: git-rebase.sh:697
649900bc 16329msgid "First, rewinding head to replay your work on top of it..."
160fb2b2 16330msgstr "首先,回退分支以便在上面重放您的工作..."
649900bc 16331
fd8cb379 16332#: git-rebase.sh:707
649900bc
JX
16333#, sh-format
16334msgid "Fast-forwarded $branch_name to $onto_name."
16335msgstr "快进 $branch_name 至 $onto_name。"
16336
6937cb4e 16337#: git-stash.sh:61
c04f5ac3
JX
16338msgid "git stash clear with parameters is unimplemented"
16339msgstr "git stash clear 不支持参数"
16340
5809aa05 16341#: git-stash.sh:108
c04f5ac3
JX
16342msgid "You do not have the initial commit yet"
16343msgstr "您尚未建立初始提交"
16344
5809aa05 16345#: git-stash.sh:123
c04f5ac3 16346msgid "Cannot save the current index state"
90e6ef53 16347msgstr "无法保存当前索引状态"
c04f5ac3 16348
5809aa05 16349#: git-stash.sh:138
a0b6b246
JX
16350msgid "Cannot save the untracked files"
16351msgstr "无法保存未跟踪文件"
16352
5809aa05 16353#: git-stash.sh:158 git-stash.sh:171
c04f5ac3
JX
16354msgid "Cannot save the current worktree state"
16355msgstr "无法保存当前工作区状态"
16356
5809aa05 16357#: git-stash.sh:175
c04f5ac3 16358msgid "No changes selected"
90e6ef53 16359msgstr "没有选择变更"
c04f5ac3 16360
5809aa05 16361#: git-stash.sh:178
c04f5ac3 16362msgid "Cannot remove temporary index (can't happen)"
90e6ef53 16363msgstr "无法删除临时索引(不应发生)"
c04f5ac3 16364
5809aa05 16365#: git-stash.sh:191
c04f5ac3
JX
16366msgid "Cannot record working tree state"
16367msgstr "不能记录工作区状态"
16368
5809aa05 16369#: git-stash.sh:229
2e8451e8
JX
16370#, sh-format
16371msgid "Cannot update $ref_stash with $w_commit"
16372msgstr "无法用 $w_commit 更新 $ref_stash"
16373
5809aa05 16374#: git-stash.sh:281
b694fbb1 16375#, sh-format
5809aa05
JX
16376msgid "error: unknown option for 'stash push': $option"
16377msgstr "错误:'stash push' 的未知选项:$option"
b694fbb1 16378
5809aa05 16379#: git-stash.sh:295
a0b6b246
JX
16380msgid "Can't use --patch and --include-untracked or --all at the same time"
16381msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
16382
5809aa05 16383#: git-stash.sh:303
c04f5ac3
JX
16384msgid "No local changes to save"
16385msgstr "没有要保存的本地修改"
16386
5809aa05 16387#: git-stash.sh:308
c04f5ac3 16388msgid "Cannot initialize stash"
a4f16749 16389msgstr "无法初始化贮藏"
c04f5ac3 16390
5809aa05 16391#: git-stash.sh:312
c04f5ac3
JX
16392msgid "Cannot save the current status"
16393msgstr "无法保存当前状态"
16394
5809aa05 16395#: git-stash.sh:313
5c57d762
JX
16396#, sh-format
16397msgid "Saved working directory and index state $stash_msg"
16398msgstr "保存工作目录和索引状态 $stash_msg"
16399
fd8cb379 16400#: git-stash.sh:342
c04f5ac3
JX
16401msgid "Cannot remove worktree changes"
16402msgstr "无法删除工作区变更"
16403
fd8cb379 16404#: git-stash.sh:490
7aea43ff
JX
16405#, sh-format
16406msgid "unknown option: $opt"
16407msgstr "未知选项: $opt"
16408
fd8cb379 16409#: git-stash.sh:503
a4f16749
JX
16410msgid "No stash entries found."
16411msgstr "未发现贮藏条目。"
c04f5ac3 16412
fd8cb379 16413#: git-stash.sh:510
c04f5ac3
JX
16414#, sh-format
16415msgid "Too many revisions specified: $REV"
90e6ef53 16416msgstr "指定了太多的版本:$REV"
c04f5ac3 16417
fd8cb379 16418#: git-stash.sh:525
c04f5ac3 16419#, sh-format
220c313c
JX
16420msgid "$reference is not a valid reference"
16421msgstr "$reference 不是一个有效的引用"
c04f5ac3 16422
fd8cb379 16423#: git-stash.sh:553
c04f5ac3
JX
16424#, sh-format
16425msgid "'$args' is not a stash-like commit"
a4f16749 16426msgstr "'$args' 不是贮藏式提交"
c04f5ac3 16427
fd8cb379 16428#: git-stash.sh:564
c04f5ac3
JX
16429#, sh-format
16430msgid "'$args' is not a stash reference"
a4f16749 16431msgstr "'$args' 不是一个贮藏引用"
c04f5ac3 16432
fd8cb379 16433#: git-stash.sh:572
c04f5ac3 16434msgid "unable to refresh index"
90e6ef53 16435msgstr "无法刷新索引"
c04f5ac3 16436
fd8cb379 16437#: git-stash.sh:576
c04f5ac3 16438msgid "Cannot apply a stash in the middle of a merge"
a4f16749 16439msgstr "无法在合并过程应用贮藏"
c04f5ac3 16440
fd8cb379 16441#: git-stash.sh:584
c04f5ac3 16442msgid "Conflicts in index. Try without --index."
90e6ef53 16443msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3 16444
fd8cb379 16445#: git-stash.sh:586
c04f5ac3 16446msgid "Could not save index tree"
90e6ef53 16447msgstr "不能保存索引树"
c04f5ac3 16448
fd8cb379 16449#: git-stash.sh:595
a4f16749
JX
16450msgid "Could not restore untracked files from stash entry"
16451msgstr "无法从贮藏条目中恢复未跟踪文件"
a0b6b246 16452
fd8cb379 16453#: git-stash.sh:620
c04f5ac3 16454msgid "Cannot unstage modified files"
160fb2b2 16455msgstr "无法将修改的文件取消暂存"
c04f5ac3 16456
fd8cb379 16457#: git-stash.sh:635
b694fbb1 16458msgid "Index was not unstashed."
a4f16749 16459msgstr "索引未从贮藏中恢复。"
b694fbb1 16460
fd8cb379 16461#: git-stash.sh:649
a4f16749
JX
16462msgid "The stash entry is kept in case you need it again."
16463msgstr "贮藏条目被保留以备您再次需要。"
5c57d762 16464
fd8cb379 16465#: git-stash.sh:658
c04f5ac3
JX
16466#, sh-format
16467msgid "Dropped ${REV} ($s)"
16468msgstr "丢弃了 ${REV} ($s)"
16469
fd8cb379 16470#: git-stash.sh:659
c04f5ac3
JX
16471#, sh-format
16472msgid "${REV}: Could not drop stash entry"
a4f16749 16473msgstr "${REV}:无法丢弃贮藏条目"
c04f5ac3 16474
fd8cb379 16475#: git-stash.sh:667
c04f5ac3
JX
16476msgid "No branch name specified"
16477msgstr "未指定分支名"
16478
fd8cb379 16479#: git-stash.sh:746
c04f5ac3
JX
16480msgid "(To restore them type \"git stash apply\")"
16481msgstr "(为恢复数据输入 \"git stash apply\")"
16482
fd8cb379 16483#: git-submodule.sh:188
2e8451e8
JX
16484msgid "Relative path can only be used from the toplevel of the working tree"
16485msgstr "只能在工作区的顶级目录中使用相对路径"
16486
fd8cb379 16487#: git-submodule.sh:198
c04f5ac3
JX
16488#, sh-format
16489msgid "repo URL: '$repo' must be absolute or begin with ./|../"
4375c10e 16490msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
c04f5ac3 16491
fd8cb379 16492#: git-submodule.sh:217
c04f5ac3 16493#, sh-format
170e9899
JX
16494msgid "'$sm_path' already exists in the index"
16495msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 16496
fd8cb379 16497#: git-submodule.sh:220
1a79b2f1
JX
16498#, sh-format
16499msgid "'$sm_path' already exists in the index and is not a submodule"
16500msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
16501
fd8cb379 16502#: git-submodule.sh:226
b694fbb1
JX
16503#, sh-format
16504msgid ""
16505"The following path is ignored by one of your .gitignore files:\n"
16506"$sm_path\n"
16507"Use -f if you really want to add it."
16508msgstr ""
16509"以下路径被您的一个 .gitignore 文件所忽略:\n"
16510"$sm_path\n"
16511"如果您确实想添加它,使用 -f 参数。"
16512
fd8cb379 16513#: git-submodule.sh:249
b694fbb1
JX
16514#, sh-format
16515msgid "Adding existing repo at '$sm_path' to the index"
160fb2b2 16516msgstr "添加位于 '$sm_path' 的现存仓库到索引"
b694fbb1 16517
fd8cb379 16518#: git-submodule.sh:251
c04f5ac3 16519#, sh-format
170e9899 16520msgid "'$sm_path' already exists and is not a valid git repo"
160fb2b2 16521msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
c04f5ac3 16522
fd8cb379 16523#: git-submodule.sh:259
07432cef
WS
16524#, sh-format
16525msgid "A git directory for '$sm_name' is found locally with remote(s):"
160fb2b2 16526msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
07432cef 16527
fd8cb379 16528#: git-submodule.sh:261
07432cef
WS
16529#, sh-format
16530msgid ""
5c57d762
JX
16531"If you want to reuse this local git directory instead of cloning again from\n"
16532" $realrepo\n"
16533"use the '--force' option. If the local git directory is not the correct "
16534"repo\n"
07432cef
WS
16535"or you are unsure what this means choose another name with the '--name' "
16536"option."
5c57d762
JX
16537msgstr ""
16538"如果您想要重用这个本地 git 目录而非重新克隆自\n"
16539" $realrepo\n"
16540"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
16541"或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
07432cef 16542
fd8cb379 16543#: git-submodule.sh:267
07432cef
WS
16544#, sh-format
16545msgid "Reactivating local git directory for submodule '$sm_name'."
16546msgstr "激活本地 git 目录到子模组 '$sm_name'。"
16547
fd8cb379 16548#: git-submodule.sh:279
c04f5ac3 16549#, sh-format
170e9899
JX
16550msgid "Unable to checkout submodule '$sm_path'"
16551msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 16552
fd8cb379 16553#: git-submodule.sh:284
c04f5ac3 16554#, sh-format
170e9899
JX
16555msgid "Failed to add submodule '$sm_path'"
16556msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 16557
fd8cb379 16558#: git-submodule.sh:293
c04f5ac3 16559#, sh-format
170e9899
JX
16560msgid "Failed to register submodule '$sm_path'"
16561msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 16562
fd8cb379 16563#: git-submodule.sh:354
c04f5ac3 16564#, sh-format
5b04ee3b
JX
16565msgid "Entering '$displaypath'"
16566msgstr "正在进入 '$displaypath'"
c04f5ac3 16567
fd8cb379 16568#: git-submodule.sh:374
c04f5ac3 16569#, sh-format
5b04ee3b 16570msgid "Stopping at '$displaypath'; script returned non-zero status."
aef18cc6 16571msgstr "停止于 '$displaypath';脚本返回非零值。"
c04f5ac3 16572
fd8cb379 16573#: git-submodule.sh:600
c04f5ac3 16574#, sh-format
2e8451e8
JX
16575msgid "Unable to find current revision in submodule path '$displaypath'"
16576msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 16577
fd8cb379 16578#: git-submodule.sh:610
c04f5ac3 16579#, sh-format
170e9899
JX
16580msgid "Unable to fetch in submodule path '$sm_path'"
16581msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 16582
fd8cb379 16583#: git-submodule.sh:615
5c57d762
JX
16584#, sh-format
16585msgid ""
16586"Unable to find current ${remote_name}/${branch} revision in submodule path "
16587"'$sm_path'"
9a4b694c 16588msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
5c57d762 16589
fd8cb379 16590#: git-submodule.sh:633
2e8451e8
JX
16591#, sh-format
16592msgid "Unable to fetch in submodule path '$displaypath'"
16593msgstr "无法在子模组路径 '$displaypath' 中获取"
16594
fd8cb379 16595#: git-submodule.sh:639
5c57d762
JX
16596#, sh-format
16597msgid ""
16598"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
16599"Direct fetching of that commit failed."
a0b6b246
JX
16600msgstr ""
16601"获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
5c57d762 16602
fd8cb379 16603#: git-submodule.sh:646
6c94aba5
JX
16604#, sh-format
16605msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
16606msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
16607
fd8cb379 16608#: git-submodule.sh:647
c04f5ac3 16609#, sh-format
6c94aba5
JX
16610msgid "Submodule path '$displaypath': checked out '$sha1'"
16611msgstr "子模组路径 '$displaypath':检出 '$sha1'"
16612
fd8cb379 16613#: git-submodule.sh:651
6c94aba5 16614#, sh-format
2e8451e8
JX
16615msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
16616msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 16617
fd8cb379 16618#: git-submodule.sh:652
c04f5ac3 16619#, sh-format
2e8451e8
JX
16620msgid "Submodule path '$displaypath': rebased into '$sha1'"
16621msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 16622
fd8cb379 16623#: git-submodule.sh:657
c04f5ac3 16624#, sh-format
2e8451e8
JX
16625msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
16626msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 16627
fd8cb379 16628#: git-submodule.sh:658
c04f5ac3 16629#, sh-format
2e8451e8
JX
16630msgid "Submodule path '$displaypath': merged in '$sha1'"
16631msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 16632
fd8cb379 16633#: git-submodule.sh:663
c04f5ac3 16634#, sh-format
5b04ee3b
JX
16635msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
16636msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
c04f5ac3 16637
fd8cb379 16638#: git-submodule.sh:664
c04f5ac3 16639#, sh-format
5b04ee3b 16640msgid "Submodule path '$displaypath': '$command $sha1'"
aef18cc6 16641msgstr "子模组 '$displaypath':'$command $sha1'"
c04f5ac3 16642
fd8cb379 16643#: git-submodule.sh:695
2e8451e8
JX
16644#, sh-format
16645msgid "Failed to recurse into submodule path '$displaypath'"
16646msgstr "无法递归进子模组路径 '$displaypath'"
16647
fd8cb379 16648#: git-submodule.sh:791
649900bc
JX
16649msgid "The --cached option cannot be used with the --files option"
16650msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1 16651
fd8cb379 16652#: git-submodule.sh:843
b694fbb1
JX
16653#, sh-format
16654msgid "unexpected mode $mod_dst"
16655msgstr "意外的模式 $mod_dst"
c04f5ac3 16656
90e6ef53 16657# 译者:注意保持前导空格
fd8cb379 16658#: git-submodule.sh:863
c04f5ac3 16659#, sh-format
2e8451e8
JX
16660msgid " Warn: $display_name doesn't contain commit $sha1_src"
16661msgstr " 警告:$display_name 未包含提交 $sha1_src"
c04f5ac3 16662
90e6ef53 16663# 译者:注意保持前导空格
fd8cb379 16664#: git-submodule.sh:866
c04f5ac3 16665#, sh-format
2e8451e8
JX
16666msgid " Warn: $display_name doesn't contain commit $sha1_dst"
16667msgstr " 警告:$display_name 未包含提交 $sha1_dst"
c04f5ac3 16668
90e6ef53 16669# 译者:注意保持前导空格
fd8cb379 16670#: git-submodule.sh:869
c04f5ac3 16671#, sh-format
2e8451e8
JX
16672msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
16673msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
c04f5ac3 16674
5b04ee3b
JX
16675#: git-parse-remote.sh:89
16676#, sh-format
16677msgid "See git-${cmd}(1) for details."
16678msgstr "详见 git-${cmd}(1)。"
5c57d762 16679
fd8cb379 16680#: git-rebase--interactive.sh:142
5c57d762
JX
16681#, sh-format
16682msgid "Rebasing ($new_count/$total)"
16683msgstr "变基中($new_count/$total)"
16684
fd8cb379 16685#: git-rebase--interactive.sh:158
5c57d762
JX
16686msgid ""
16687"\n"
16688"Commands:\n"
fd8cb379
JX
16689"p, pick <commit> = use commit\n"
16690"r, reword <commit> = use commit, but edit the commit message\n"
16691"e, edit <commit> = use commit, but stop for amending\n"
16692"s, squash <commit> = use commit, but meld into previous commit\n"
16693"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
16694"x, exec <command> = run command (the rest of the line) using shell\n"
16695"d, drop <commit> = remove commit\n"
16696"l, label <label> = label current HEAD with a name\n"
16697"t, reset <label> = reset HEAD to a label\n"
16698"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
16699". create a merge commit using the original merge commit's\n"
16700". message (or the oneline, if no original merge commit was\n"
16701". specified). Use -c <commit> to reword the commit message.\n"
5c57d762
JX
16702"\n"
16703"These lines can be re-ordered; they are executed from top to bottom.\n"
16704msgstr ""
16705"\n"
16706"命令:\n"
fd8cb379
JX
16707"p, pick <提交> = 使用提交\n"
16708"r, reword <提交> = 使用提交,但修改提交说明\n"
16709"e, edit <提交> = 使用提交,进入 shell 以便进行提交修补\n"
16710"s, squash <提交> = 使用提交,但融合到前一个提交\n"
16711"f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
16712"x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
16713"d, drop <提交> = 删除提交\n"
16714"l, label <label> = 为当前 HEAD 打上标记\n"
16715"t, reset <label> = 重置 HEAD 到该标记\n"
16716"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
16717". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
16718". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
16719". -c <提交> 可以编辑提交说明。\n"
5c57d762 16720"\n"
fd8cb379 16721"可以对这些行重新排序,将从上至下执行。\n"
5c57d762 16722
fd8cb379 16723#: git-rebase--interactive.sh:179
5c57d762
JX
16724msgid ""
16725"\n"
16726"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
a0b6b246
JX
16727msgstr ""
16728"\n"
16729"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
5c57d762 16730
fd8cb379 16731#: git-rebase--interactive.sh:183
5c57d762
JX
16732msgid ""
16733"\n"
16734"If you remove a line here THAT COMMIT WILL BE LOST.\n"
a0b6b246
JX
16735msgstr ""
16736"\n"
16737"如果您在这里删除一行,对应的提交将会丢失。\n"
5c57d762 16738
fd8cb379 16739#: git-rebase--interactive.sh:221
5c57d762
JX
16740#, sh-format
16741msgid ""
16742"You can amend the commit now, with\n"
16743"\n"
16744"\tgit commit --amend $gpg_sign_opt_quoted\n"
16745"\n"
16746"Once you are satisfied with your changes, run\n"
16747"\n"
16748"\tgit rebase --continue"
16749msgstr ""
16750"您现在可以修补这个提交,使用\n"
16751"\n"
16752"\tgit commit --amend $gpg_sign_opt_quoted\n"
16753"\n"
9a4b694c 16754"当您对变更感到满意,执行\n"
5c57d762
JX
16755"\n"
16756"\tgit rebase --continue"
16757
fd8cb379 16758#: git-rebase--interactive.sh:246
5c57d762
JX
16759#, sh-format
16760msgid "$sha1: not a commit that can be picked"
16761msgstr "$sha1:不是一个可以被拣选的提交"
16762
fd8cb379 16763#: git-rebase--interactive.sh:285
5c57d762
JX
16764#, sh-format
16765msgid "Invalid commit name: $sha1"
16766msgstr "无效的提交名:$sha1"
16767
fd8cb379 16768#: git-rebase--interactive.sh:325
5c57d762
JX
16769msgid "Cannot write current commit's replacement sha1"
16770msgstr "不能写入当前提交的替代 sha1"
16771
fd8cb379 16772#: git-rebase--interactive.sh:376
5c57d762
JX
16773#, sh-format
16774msgid "Fast-forward to $sha1"
16775msgstr "快进到 $sha1"
16776
fd8cb379 16777#: git-rebase--interactive.sh:378
5c57d762
JX
16778#, sh-format
16779msgid "Cannot fast-forward to $sha1"
16780msgstr "不能快进到 $sha1"
16781
fd8cb379 16782#: git-rebase--interactive.sh:387
5c57d762
JX
16783#, sh-format
16784msgid "Cannot move HEAD to $first_parent"
16785msgstr "不能移动 HEAD 到 $first_parent"
16786
fd8cb379 16787#: git-rebase--interactive.sh:392
5c57d762
JX
16788#, sh-format
16789msgid "Refusing to squash a merge: $sha1"
16790msgstr "拒绝压缩一个合并:$sha1"
16791
fd8cb379 16792#: git-rebase--interactive.sh:410
5c57d762
JX
16793#, sh-format
16794msgid "Error redoing merge $sha1"
16795msgstr "无法重做合并 $sha1"
16796
fd8cb379 16797#: git-rebase--interactive.sh:419
5c57d762
JX
16798#, sh-format
16799msgid "Could not pick $sha1"
16800msgstr "不能拣选 $sha1"
16801
fd8cb379 16802#: git-rebase--interactive.sh:428
5c57d762
JX
16803#, sh-format
16804msgid "This is the commit message #${n}:"
9a4b694c 16805msgstr "这是提交说明 #${n}:"
5c57d762 16806
fd8cb379 16807#: git-rebase--interactive.sh:433
5c57d762
JX
16808#, sh-format
16809msgid "The commit message #${n} will be skipped:"
9a4b694c 16810msgstr "提交说明 #${n} 将被跳过:"
5c57d762 16811
fd8cb379 16812#: git-rebase--interactive.sh:444
5c57d762
JX
16813#, sh-format
16814msgid "This is a combination of $count commit."
16815msgid_plural "This is a combination of $count commits."
16816msgstr[0] "这是一个 $count 个提交的组合。"
16817msgstr[1] "这是一个 $count 个提交的组合。"
16818
fd8cb379 16819#: git-rebase--interactive.sh:453
5c57d762
JX
16820#, sh-format
16821msgid "Cannot write $fixup_msg"
16822msgstr "不能写入 $fixup_msg"
16823
fd8cb379 16824#: git-rebase--interactive.sh:456
5c57d762
JX
16825msgid "This is a combination of 2 commits."
16826msgstr "这是一个 2 个提交的组合。"
16827
fd8cb379
JX
16828#: git-rebase--interactive.sh:497 git-rebase--interactive.sh:540
16829#: git-rebase--interactive.sh:543
5c57d762
JX
16830#, sh-format
16831msgid "Could not apply $sha1... $rest"
16832msgstr "不能应用 $sha1... $rest"
16833
fd8cb379 16834#: git-rebase--interactive.sh:572
5c57d762
JX
16835#, sh-format
16836msgid ""
16837"Could not amend commit after successfully picking $sha1... $rest\n"
16838"This is most likely due to an empty commit message, or the pre-commit hook\n"
16839"failed. If the pre-commit hook failed, you may need to resolve the issue "
16840"before\n"
16841"you are able to reword the commit."
16842msgstr ""
16843"不能在成功拣选 $sha1... $rest 之后修补提交\n"
16844"这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
16845"钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
16846
fd8cb379 16847#: git-rebase--interactive.sh:587
5c57d762
JX
16848#, sh-format
16849msgid "Stopped at $sha1_abbrev... $rest"
16850msgstr "停止在 $sha1_abbrev... $rest"
16851
fd8cb379 16852#: git-rebase--interactive.sh:602
5c57d762
JX
16853#, sh-format
16854msgid "Cannot '$squash_style' without a previous commit"
9a4b694c 16855msgstr "没有父提交的情况下不能 '$squash_style'"
5c57d762 16856
fd8cb379 16857#: git-rebase--interactive.sh:644
5c57d762
JX
16858#, sh-format
16859msgid "Executing: $rest"
16860msgstr "执行:$rest"
16861
fd8cb379 16862#: git-rebase--interactive.sh:652
5c57d762
JX
16863#, sh-format
16864msgid "Execution failed: $rest"
16865msgstr "执行失败:$rest"
16866
fd8cb379 16867#: git-rebase--interactive.sh:654
5c57d762
JX
16868msgid "and made changes to the index and/or the working tree"
16869msgstr "并且修改索引和/或工作区"
16870
16871# 译者:注意保持前导空格
fd8cb379 16872#: git-rebase--interactive.sh:656
5c57d762
JX
16873msgid ""
16874"You can fix the problem, and then run\n"
16875"\n"
16876"\tgit rebase --continue"
16877msgstr ""
16878"您可以解决这个问题,然后运行\n"
16879"\n"
16880"\tgit rebase --continue"
16881
16882#. TRANSLATORS: after these lines is a command to be issued by the user
fd8cb379 16883#: git-rebase--interactive.sh:669
5c57d762
JX
16884#, sh-format
16885msgid ""
16886"Execution succeeded: $rest\n"
16887"but left changes to the index and/or the working tree\n"
16888"Commit or stash your changes, and then run\n"
16889"\n"
16890"\tgit rebase --continue"
16891msgstr ""
16892"执行成功:$rest\n"
a4f16749 16893"但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n"
5c57d762
JX
16894"\n"
16895"\tgit rebase --continue"
16896
fd8cb379 16897#: git-rebase--interactive.sh:680
5c57d762
JX
16898#, sh-format
16899msgid "Unknown command: $command $sha1 $rest"
16900msgstr "未知命令:$command $sha1 $rest"
16901
fd8cb379 16902#: git-rebase--interactive.sh:681
5c57d762
JX
16903msgid "Please fix this using 'git rebase --edit-todo'."
16904msgstr "要修改请使用命令 'git rebase --edit-todo'。"
16905
fd8cb379 16906#: git-rebase--interactive.sh:716
5c57d762
JX
16907#, sh-format
16908msgid "Successfully rebased and updated $head_name."
9a4b694c 16909msgstr "成功变基并更新 $head_name。"
5c57d762 16910
fd8cb379 16911#: git-rebase--interactive.sh:740
5c57d762
JX
16912msgid "could not detach HEAD"
16913msgstr "不能检出为分离头指针"
16914
fd8cb379 16915#: git-rebase--interactive.sh:778
5c57d762
JX
16916msgid "Could not remove CHERRY_PICK_HEAD"
16917msgstr "不能删除 CHERRY_PICK_HEAD"
16918
fd8cb379 16919#: git-rebase--interactive.sh:783
5c57d762
JX
16920#, sh-format
16921msgid ""
16922"You have staged changes in your working tree.\n"
16923"If these changes are meant to be\n"
16924"squashed into the previous commit, run:\n"
16925"\n"
16926" git commit --amend $gpg_sign_opt_quoted\n"
16927"\n"
16928"If they are meant to go into a new commit, run:\n"
16929"\n"
16930" git commit $gpg_sign_opt_quoted\n"
16931"\n"
a0b6b246 16932"In both cases, once you're done, continue with:\n"
5c57d762
JX
16933"\n"
16934" git rebase --continue\n"
16935msgstr ""
16936"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
16937"\n"
16938" git commit --amend $gpg_sign_opt_quoted\n"
16939"\n"
16940"如果这些变更要形成一个新提交,执行:\n"
16941"\n"
16942" git commit $gpg_sign_opt_quoted\n"
16943"\n"
9a4b694c 16944"无论哪种情况,当您完成提交,继续执行:\n"
5c57d762
JX
16945"\n"
16946" git rebase --continue\n"
16947
fd8cb379 16948#: git-rebase--interactive.sh:800
5c57d762 16949msgid "Error trying to find the author identity to amend commit"
9a4b694c 16950msgstr "在修补提交中查找作者信息时遇到错误"
5c57d762 16951
fd8cb379 16952#: git-rebase--interactive.sh:805
5c57d762
JX
16953msgid ""
16954"You have uncommitted changes in your working tree. Please commit them\n"
16955"first and then run 'git rebase --continue' again."
a0b6b246
JX
16956msgstr ""
16957"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
5c57d762 16958
fd8cb379 16959#: git-rebase--interactive.sh:810 git-rebase--interactive.sh:814
5c57d762
JX
16960msgid "Could not commit staged changes."
16961msgstr "不能提交暂存的修改。"
16962
fd8cb379 16963#: git-rebase--interactive.sh:843
5c57d762
JX
16964msgid ""
16965"\n"
16966"You are editing the todo file of an ongoing interactive rebase.\n"
16967"To continue rebase after editing, run:\n"
16968" git rebase --continue\n"
16969"\n"
16970msgstr ""
16971"\n"
6937cb4e 16972"您正在修改运行中的交互式变基待办列表。若要在编辑结束后继续变基,\n"
5c57d762
JX
16973"请执行:\n"
16974" git rebase --continue\n"
16975"\n"
16976
fd8cb379 16977#: git-rebase--interactive.sh:851 git-rebase--interactive.sh:937
5c57d762
JX
16978msgid "Could not execute editor"
16979msgstr "无法运行编辑器"
16980
fd8cb379 16981#: git-rebase--interactive.sh:872
5c57d762
JX
16982#, sh-format
16983msgid "Could not checkout $switch_to"
16984msgstr "不能检出 $switch_to"
16985
fd8cb379 16986#: git-rebase--interactive.sh:879
5c57d762
JX
16987msgid "No HEAD?"
16988msgstr "没有 HEAD?"
16989
fd8cb379 16990#: git-rebase--interactive.sh:880
5c57d762
JX
16991#, sh-format
16992msgid "Could not create temporary $state_dir"
16993msgstr "不能创建临时 $state_dir"
16994
fd8cb379 16995#: git-rebase--interactive.sh:883
5c57d762
JX
16996msgid "Could not mark as interactive"
16997msgstr "不能标记为交互式"
16998
fd8cb379 16999#: git-rebase--interactive.sh:915
5c57d762
JX
17000#, sh-format
17001msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
17002msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
17003msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
17004msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
17005
fd8cb379 17006#: git-rebase--interactive.sh:920
5c57d762
JX
17007msgid ""
17008"\n"
fd8cb379 17009"\tHowever, if you remove everything, the rebase will be aborted.\n"
5c57d762 17010"\n"
fd8cb379 17011"\t"
a0b6b246
JX
17012msgstr ""
17013"\n"
fd8cb379 17014"\t然而,如果您删除全部内容,变基操作将会终止。\n"
a0b6b246 17015"\n"
fd8cb379 17016"\t"
5c57d762 17017
fd8cb379 17018#: git-rebase--interactive.sh:927
5c57d762
JX
17019msgid "Note that empty commits are commented out"
17020msgstr "注意空提交已被注释掉"
17021
fd8cb379
JX
17022#: git-rebase--interactive.sh:980
17023msgid "Could not generate todo list"
17024msgstr "无法生成待办列表"
17025
17026#: git-rebase--interactive.sh:1001 git-rebase--interactive.sh:1006
17027msgid "Could not init rewritten commits"
17028msgstr "不能对重写提交进行初始化"
17029
5c57d762
JX
17030#: git-sh-setup.sh:89 git-sh-setup.sh:94
17031#, sh-format
17032msgid "usage: $dashless $USAGE"
17033msgstr "用法:$dashless $USAGE"
17034
17035#: git-sh-setup.sh:190
17036#, sh-format
17037msgid "Cannot chdir to $cdup, the toplevel of the working tree"
9a4b694c 17038msgstr "不能切换目录到 $cdup,工作区的顶级目录"
5c57d762
JX
17039
17040#: git-sh-setup.sh:199 git-sh-setup.sh:206
17041#, sh-format
17042msgid "fatal: $program_name cannot be used without a working tree."
17043msgstr "严重错误:$program_name 不能在没有工作区的情况下使用"
17044
17045#: git-sh-setup.sh:220
17046msgid "Cannot rebase: You have unstaged changes."
17047msgstr "不能变基:您有未暂存的变更。"
17048
17049#: git-sh-setup.sh:223
17050msgid "Cannot rewrite branches: You have unstaged changes."
17051msgstr "不能重写分支:您有未暂存的变更。"
17052
a0b6b246
JX
17053#: git-sh-setup.sh:226
17054msgid "Cannot pull with rebase: You have unstaged changes."
17055msgstr "无法通过变基方式拉取:您有未暂存的变更。"
17056
5c57d762
JX
17057#: git-sh-setup.sh:229
17058#, sh-format
17059msgid "Cannot $action: You have unstaged changes."
17060msgstr "不能 $action:您有未暂存的变更。"
17061
17062#: git-sh-setup.sh:242
17063msgid "Cannot rebase: Your index contains uncommitted changes."
17064msgstr "不能变基:您的索引中包含未提交的变更。"
17065
a0b6b246
JX
17066#: git-sh-setup.sh:245
17067msgid "Cannot pull with rebase: Your index contains uncommitted changes."
17068msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
17069
5c57d762
JX
17070#: git-sh-setup.sh:248
17071#, sh-format
17072msgid "Cannot $action: Your index contains uncommitted changes."
17073msgstr "不能 $action:您的索引中包含未提交的变更。"
17074
a0b6b246
JX
17075#: git-sh-setup.sh:252
17076msgid "Additionally, your index contains uncommitted changes."
17077msgstr "而且您的索引中包含未提交的变更。"
17078
5c57d762
JX
17079#: git-sh-setup.sh:372
17080msgid "You need to run this command from the toplevel of the working tree."
17081msgstr "您需要在工作区的顶级目录中运行这个命令。"
17082
17083#: git-sh-setup.sh:377
17084msgid "Unable to determine absolute path of git directory"
17085msgstr "不能确定 git 目录的绝对路径"
a0b6b246 17086
1a79b2f1 17087#. TRANSLATORS: you can adjust this to align "git add -i" status menu
a4f16749 17088#: git-add--interactive.perl:196
1a79b2f1
JX
17089#, perl-format
17090msgid "%12s %12s %s"
17091msgstr "%12s %12s %s"
17092
a4f16749 17093#: git-add--interactive.perl:197
1a79b2f1
JX
17094msgid "staged"
17095msgstr "缓存"
17096
a4f16749 17097#: git-add--interactive.perl:197
1a79b2f1
JX
17098msgid "unstaged"
17099msgstr "未缓存"
17100
fd8cb379 17101#: git-add--interactive.perl:253 git-add--interactive.perl:278
1a79b2f1
JX
17102msgid "binary"
17103msgstr "二进制"
17104
fd8cb379 17105#: git-add--interactive.perl:262 git-add--interactive.perl:316
1a79b2f1
JX
17106msgid "nothing"
17107msgstr "无"
17108
fd8cb379 17109#: git-add--interactive.perl:298 git-add--interactive.perl:313
1a79b2f1
JX
17110msgid "unchanged"
17111msgstr "没有修改"
17112
fd8cb379 17113#: git-add--interactive.perl:609
1a79b2f1
JX
17114#, perl-format
17115msgid "added %d path\n"
17116msgid_plural "added %d paths\n"
17117msgstr[0] "增加了 %d 个路径\n"
17118msgstr[1] "增加了 %d 个路径\n"
17119
fd8cb379 17120#: git-add--interactive.perl:612
1a79b2f1
JX
17121#, perl-format
17122msgid "updated %d path\n"
17123msgid_plural "updated %d paths\n"
17124msgstr[0] "更新了 %d 个路径\n"
17125msgstr[1] "更新了 %d 个路径\n"
17126
fd8cb379 17127#: git-add--interactive.perl:615
1a79b2f1
JX
17128#, perl-format
17129msgid "reverted %d path\n"
17130msgid_plural "reverted %d paths\n"
17131msgstr[0] "还原了 %d 个路径\n"
17132msgstr[1] "还原了 %d 个路径\n"
17133
fd8cb379 17134#: git-add--interactive.perl:618
1a79b2f1
JX
17135#, perl-format
17136msgid "touched %d path\n"
17137msgid_plural "touched %d paths\n"
17138msgstr[0] "触碰了 %d 个路径\n"
17139msgstr[1] "触碰了 %d 个路径\n"
17140
fd8cb379 17141#: git-add--interactive.perl:627
1a79b2f1
JX
17142msgid "Update"
17143msgstr "更新"
17144
fd8cb379 17145#: git-add--interactive.perl:639
1a79b2f1
JX
17146msgid "Revert"
17147msgstr "还原"
17148
fd8cb379 17149#: git-add--interactive.perl:662
1a79b2f1
JX
17150#, perl-format
17151msgid "note: %s is untracked now.\n"
17152msgstr "说明:%s 现已成为未跟踪的。\n"
17153
fd8cb379 17154#: git-add--interactive.perl:673
1a79b2f1
JX
17155msgid "Add untracked"
17156msgstr "添加未跟踪的"
17157
fd8cb379 17158#: git-add--interactive.perl:679
1a79b2f1
JX
17159msgid "No untracked files.\n"
17160msgstr "没有未跟踪的文件。\n"
17161
fd8cb379 17162#: git-add--interactive.perl:1033
1a79b2f1
JX
17163msgid ""
17164"If the patch applies cleanly, the edited hunk will immediately be\n"
17165"marked for staging."
17166msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
17167
fd8cb379 17168#: git-add--interactive.perl:1036
1a79b2f1
JX
17169msgid ""
17170"If the patch applies cleanly, the edited hunk will immediately be\n"
17171"marked for stashing."
a4f16749 17172msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。"
1a79b2f1 17173
fd8cb379 17174#: git-add--interactive.perl:1039
1a79b2f1
JX
17175msgid ""
17176"If the patch applies cleanly, the edited hunk will immediately be\n"
17177"marked for unstaging."
17178msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
17179
fd8cb379 17180#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
1a79b2f1
JX
17181msgid ""
17182"If the patch applies cleanly, the edited hunk will immediately be\n"
17183"marked for applying."
17184msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
17185
fd8cb379 17186#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
1a79b2f1
JX
17187msgid ""
17188"If the patch applies cleanly, the edited hunk will immediately be\n"
17189"marked for discarding."
17190msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
17191
fd8cb379 17192#: git-add--interactive.perl:1085
1a79b2f1
JX
17193#, perl-format
17194msgid "failed to open hunk edit file for writing: %s"
17195msgstr "无法写入块编辑文件:%s"
17196
fd8cb379 17197#: git-add--interactive.perl:1086
1a79b2f1
JX
17198msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
17199msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
17200
fd8cb379 17201#: git-add--interactive.perl:1092
1a79b2f1
JX
17202#, perl-format
17203msgid ""
17204"---\n"
17205"To remove '%s' lines, make them ' ' lines (context).\n"
17206"To remove '%s' lines, delete them.\n"
17207"Lines starting with %s will be removed.\n"
17208msgstr ""
17209"---\n"
17210"要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
17211"要删除 '%s' 开始的行,删除它们。\n"
17212"以 %s 开始的行将被删除。\n"
17213
17214#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
fd8cb379 17215#: git-add--interactive.perl:1100
1a79b2f1
JX
17216msgid ""
17217"If it does not apply cleanly, you will be given an opportunity to\n"
17218"edit again. If all lines of the hunk are removed, then the edit is\n"
17219"aborted and the hunk is left unchanged.\n"
17220msgstr ""
17221"如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
17222"此次编辑被终止,该块不会被修改。\n"
17223
fd8cb379 17224#: git-add--interactive.perl:1114
1a79b2f1
JX
17225#, perl-format
17226msgid "failed to open hunk edit file for reading: %s"
17227msgstr "无法读取块编辑文件:%s"
17228
17229#. TRANSLATORS: do not translate [y/n]
17230#. The program will only accept that input
17231#. at this point.
17232#. Consider translating (saying "no" discards!) as
17233#. (saying "n" for "no" discards!) if the translation
17234#. of the word "no" does not start with n.
fd8cb379 17235#: git-add--interactive.perl:1213
1a79b2f1
JX
17236msgid ""
17237"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
17238msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
17239
fd8cb379 17240#: git-add--interactive.perl:1222
1a79b2f1
JX
17241msgid ""
17242"y - stage this hunk\n"
17243"n - do not stage this hunk\n"
17244"q - quit; do not stage this hunk or any of the remaining ones\n"
17245"a - stage this hunk and all later hunks in the file\n"
17246"d - do not stage this hunk or any of the later hunks in the file"
17247msgstr ""
17248"y - 暂存该块\n"
17249"n - 不要暂存该块\n"
17250"q - 退出。不暂存该块及后面的全部块\n"
17251"a - 暂存该块和本文件中后面的全部块\n"
17252"d - 不暂存该块和本文件中后面的全部块"
17253
fd8cb379 17254#: git-add--interactive.perl:1228
1a79b2f1
JX
17255msgid ""
17256"y - stash this hunk\n"
17257"n - do not stash this hunk\n"
17258"q - quit; do not stash this hunk or any of the remaining ones\n"
17259"a - stash this hunk and all later hunks in the file\n"
17260"d - do not stash this hunk or any of the later hunks in the file"
17261msgstr ""
17262"y - 贮藏该块\n"
17263"n - 不要贮藏该块\n"
17264"q - 退出。不贮藏该块及后面的全部块\n"
17265"a - 贮藏该块和本文件中后面的全部块\n"
17266"d - 不贮藏该块和本文件中后面的全部块"
17267
fd8cb379 17268#: git-add--interactive.perl:1234
1a79b2f1
JX
17269msgid ""
17270"y - unstage this hunk\n"
17271"n - do not unstage this hunk\n"
17272"q - quit; do not unstage this hunk or any of the remaining ones\n"
17273"a - unstage this hunk and all later hunks in the file\n"
17274"d - do not unstage this hunk or any of the later hunks in the file"
17275msgstr ""
17276"y - 不暂存该块\n"
17277"n - 不要不暂存该块\n"
17278"q - 退出。不要不暂存该块及后面的全部块\n"
17279"a - 不暂存该块和本文件中后面的全部块\n"
17280"d - 不要不暂存该块和本文件中后面的全部块"
17281
fd8cb379 17282#: git-add--interactive.perl:1240
1a79b2f1
JX
17283msgid ""
17284"y - apply this hunk to index\n"
17285"n - do not apply this hunk to index\n"
17286"q - quit; do not apply this hunk or any of the remaining ones\n"
17287"a - apply this hunk and all later hunks in the file\n"
17288"d - do not apply this hunk or any of the later hunks in the file"
17289msgstr ""
17290"y - 在索引中应用该块\n"
17291"n - 不要在索引中应用该块\n"
17292"q - 退出。不要应用该块及后面的全部块\n"
17293"a - 应用该块和本文件中后面的全部块\n"
17294"d - 不要应用该块和本文件中后面的全部块"
17295
fd8cb379 17296#: git-add--interactive.perl:1246
1a79b2f1
JX
17297msgid ""
17298"y - discard this hunk from worktree\n"
17299"n - do not discard this hunk from worktree\n"
17300"q - quit; do not discard this hunk or any of the remaining ones\n"
17301"a - discard this hunk and all later hunks in the file\n"
17302"d - do not discard this hunk or any of the later hunks in the file"
17303msgstr ""
17304"y - 在工作区中丢弃该块\n"
17305"n - 不要在工作区中丢弃该块\n"
17306"q - 退出。不要丢弃该块及后面的全部块\n"
17307"a - 丢弃该块和本文件中后面的全部块\n"
17308"d - 不要丢弃该块和本文件中后面的全部块"
17309
fd8cb379 17310#: git-add--interactive.perl:1252
1a79b2f1
JX
17311msgid ""
17312"y - discard this hunk from index and worktree\n"
17313"n - do not discard this hunk from index and worktree\n"
17314"q - quit; do not discard this hunk or any of the remaining ones\n"
17315"a - discard this hunk and all later hunks in the file\n"
17316"d - do not discard this hunk or any of the later hunks in the file"
17317msgstr ""
17318"y - 在索引和工作区中丢弃该块\n"
17319"n - 不要在索引和工作区中丢弃该块\n"
17320"q - 退出。不要丢弃该块及后面的全部块\n"
17321"a - 丢弃该块和本文件中后面的全部块\n"
17322"d - 不要丢弃该块和本文件中后面的全部块"
17323
fd8cb379 17324#: git-add--interactive.perl:1258
1a79b2f1
JX
17325msgid ""
17326"y - apply this hunk to index and worktree\n"
17327"n - do not apply this hunk to index and worktree\n"
17328"q - quit; do not apply this hunk or any of the remaining ones\n"
17329"a - apply this hunk and all later hunks in the file\n"
17330"d - do not apply this hunk or any of the later hunks in the file"
17331msgstr ""
17332"y - 在索引和工作区中应用该块\n"
17333"n - 不要在索引和工作区中应用该块\n"
17334"q - 退出。不要应用该块及后面的全部块\n"
17335"a - 应用该块和本文件中后面的全部块\n"
17336"d - 不要应用该块和本文件中后面的全部块"
17337
fd8cb379 17338#: git-add--interactive.perl:1273
1a79b2f1
JX
17339msgid ""
17340"g - select a hunk to go to\n"
17341"/ - search for a hunk matching the given regex\n"
17342"j - leave this hunk undecided, see next undecided hunk\n"
17343"J - leave this hunk undecided, see next hunk\n"
17344"k - leave this hunk undecided, see previous undecided hunk\n"
17345"K - leave this hunk undecided, see previous hunk\n"
17346"s - split the current hunk into smaller hunks\n"
17347"e - manually edit the current hunk\n"
17348"? - print help\n"
17349msgstr ""
17350"g - 选择跳转到一个块\n"
17351"/ - 查找和给定正则表达式匹配的块\n"
17352"j - 维持该块未决状态,查看下一个未决块\n"
17353"J - 维持该块未决状态,查看下一个块\n"
17354"k - 维持该块未决状态,查看上一个未决块\n"
17355"K - 维持该块未决状态,查看上一个块\n"
17356"s - 拆分当前块为更小的块\n"
17357"e - 手动编辑当前块\n"
17358"? - 显示帮助\n"
17359
fd8cb379 17360#: git-add--interactive.perl:1304
1a79b2f1
JX
17361msgid "The selected hunks do not apply to the index!\n"
17362msgstr "选中的块不能应用到索引!\n"
17363
fd8cb379 17364#: git-add--interactive.perl:1305
1a79b2f1
JX
17365msgid "Apply them to the worktree anyway? "
17366msgstr "无论如何都要应用到工作区么?"
17367
fd8cb379 17368#: git-add--interactive.perl:1308
1a79b2f1
JX
17369msgid "Nothing was applied.\n"
17370msgstr "未应用。\n"
17371
fd8cb379 17372#: git-add--interactive.perl:1319
1a79b2f1
JX
17373#, perl-format
17374msgid "ignoring unmerged: %s\n"
17375msgstr "忽略未合入的:%s\n"
17376
fd8cb379 17377#: git-add--interactive.perl:1328
1a79b2f1
JX
17378msgid "Only binary files changed.\n"
17379msgstr "只有二进制文件被修改。\n"
17380
fd8cb379 17381#: git-add--interactive.perl:1330
1a79b2f1
JX
17382msgid "No changes.\n"
17383msgstr "没有修改。\n"
17384
fd8cb379 17385#: git-add--interactive.perl:1338
1a79b2f1
JX
17386msgid "Patch update"
17387msgstr "补丁更新"
17388
fd8cb379 17389#: git-add--interactive.perl:1390
1a79b2f1 17390#, perl-format
31e5e17b
JX
17391msgid "Stage mode change [y,n,q,a,d%s,?]? "
17392msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 17393
fd8cb379 17394#: git-add--interactive.perl:1391
1a79b2f1 17395#, perl-format
31e5e17b
JX
17396msgid "Stage deletion [y,n,q,a,d%s,?]? "
17397msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
1a79b2f1 17398
fd8cb379 17399#: git-add--interactive.perl:1392
1a79b2f1 17400#, perl-format
31e5e17b
JX
17401msgid "Stage this hunk [y,n,q,a,d%s,?]? "
17402msgstr "暂存该块 [y,n,q,a,d%s,?]? "
1a79b2f1 17403
fd8cb379 17404#: git-add--interactive.perl:1395
1a79b2f1 17405#, perl-format
31e5e17b
JX
17406msgid "Stash mode change [y,n,q,a,d%s,?]? "
17407msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 17408
fd8cb379 17409#: git-add--interactive.perl:1396
1a79b2f1 17410#, perl-format
31e5e17b
JX
17411msgid "Stash deletion [y,n,q,a,d%s,?]? "
17412msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
1a79b2f1 17413
fd8cb379 17414#: git-add--interactive.perl:1397
1a79b2f1 17415#, perl-format
31e5e17b
JX
17416msgid "Stash this hunk [y,n,q,a,d%s,?]? "
17417msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
1a79b2f1 17418
fd8cb379 17419#: git-add--interactive.perl:1400
1a79b2f1 17420#, perl-format
31e5e17b
JX
17421msgid "Unstage mode change [y,n,q,a,d%s,?]? "
17422msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 17423
fd8cb379 17424#: git-add--interactive.perl:1401
1a79b2f1 17425#, perl-format
31e5e17b
JX
17426msgid "Unstage deletion [y,n,q,a,d%s,?]? "
17427msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
1a79b2f1 17428
fd8cb379 17429#: git-add--interactive.perl:1402
1a79b2f1 17430#, perl-format
31e5e17b
JX
17431msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
17432msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
1a79b2f1 17433
fd8cb379 17434#: git-add--interactive.perl:1405
1a79b2f1 17435#, perl-format
31e5e17b
JX
17436msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
17437msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
1a79b2f1 17438
fd8cb379 17439#: git-add--interactive.perl:1406
1a79b2f1 17440#, perl-format
31e5e17b
JX
17441msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
17442msgstr "将删除应用到索引 [y,n,q,a,d%s,?]? "
1a79b2f1 17443
fd8cb379 17444#: git-add--interactive.perl:1407
1a79b2f1 17445#, perl-format
31e5e17b 17446msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
610f8099 17447msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
1a79b2f1 17448
fd8cb379 17449#: git-add--interactive.perl:1410
1a79b2f1 17450#, perl-format
31e5e17b
JX
17451msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
17452msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 17453
fd8cb379 17454#: git-add--interactive.perl:1411
1a79b2f1 17455#, perl-format
31e5e17b
JX
17456msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
17457msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
1a79b2f1 17458
fd8cb379 17459#: git-add--interactive.perl:1412
1a79b2f1 17460#, perl-format
31e5e17b
JX
17461msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
17462msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
1a79b2f1 17463
fd8cb379 17464#: git-add--interactive.perl:1415
1a79b2f1 17465#, perl-format
31e5e17b
JX
17466msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
17467msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
1a79b2f1 17468
fd8cb379 17469#: git-add--interactive.perl:1416
1a79b2f1 17470#, perl-format
31e5e17b
JX
17471msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
17472msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? "
1a79b2f1 17473
fd8cb379 17474#: git-add--interactive.perl:1417
1a79b2f1 17475#, perl-format
31e5e17b
JX
17476msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
17477msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
1a79b2f1 17478
fd8cb379 17479#: git-add--interactive.perl:1420
1a79b2f1 17480#, perl-format
31e5e17b
JX
17481msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
17482msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
1a79b2f1 17483
fd8cb379 17484#: git-add--interactive.perl:1421
1a79b2f1 17485#, perl-format
31e5e17b
JX
17486msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
17487msgstr "将删除应用到索引和工作区 [y,n,q,a,d%s,?]? "
1a79b2f1 17488
fd8cb379 17489#: git-add--interactive.perl:1422
1a79b2f1 17490#, perl-format
31e5e17b
JX
17491msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
17492msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
17493
fd8cb379 17494#: git-add--interactive.perl:1522
31e5e17b
JX
17495msgid "No other hunks to goto\n"
17496msgstr "没有其它可供跳转的块\n"
1a79b2f1 17497
fd8cb379 17498#: git-add--interactive.perl:1529
1a79b2f1
JX
17499msgid "go to which hunk (<ret> to see more)? "
17500msgstr "跳转到哪个块(<回车> 查看更多)? "
17501
fd8cb379 17502#: git-add--interactive.perl:1531
1a79b2f1
JX
17503msgid "go to which hunk? "
17504msgstr "跳转到哪个块?"
17505
fd8cb379 17506#: git-add--interactive.perl:1540
1a79b2f1
JX
17507#, perl-format
17508msgid "Invalid number: '%s'\n"
17509msgstr "无效数字:'%s'\n"
17510
fd8cb379 17511#: git-add--interactive.perl:1545
1a79b2f1
JX
17512#, perl-format
17513msgid "Sorry, only %d hunk available.\n"
17514msgid_plural "Sorry, only %d hunks available.\n"
17515msgstr[0] "对不起,只有 %d 个可用块。\n"
17516msgstr[1] "对不起,只有 %d 个可用块。\n"
17517
fd8cb379 17518#: git-add--interactive.perl:1571
31e5e17b
JX
17519msgid "No other hunks to search\n"
17520msgstr "没有其它可供查找的块\n"
17521
fd8cb379 17522#: git-add--interactive.perl:1575
1a79b2f1
JX
17523msgid "search for regex? "
17524msgstr "使用正则表达式搜索?"
17525
fd8cb379 17526#: git-add--interactive.perl:1588
1a79b2f1
JX
17527#, perl-format
17528msgid "Malformed search regexp %s: %s\n"
17529msgstr "错误的正则表达式 %s:%s\n"
17530
fd8cb379 17531#: git-add--interactive.perl:1598
1a79b2f1
JX
17532msgid "No hunk matches the given pattern\n"
17533msgstr "没有和给定模式相匹配的快\n"
17534
fd8cb379 17535#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
1a79b2f1
JX
17536msgid "No previous hunk\n"
17537msgstr "没有前一个块\n"
17538
fd8cb379 17539#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
1a79b2f1
JX
17540msgid "No next hunk\n"
17541msgstr "没有下一个块\n"
17542
fd8cb379 17543#: git-add--interactive.perl:1644
31e5e17b
JX
17544msgid "Sorry, cannot split this hunk\n"
17545msgstr "对不起,不能拆分这个块\n"
17546
fd8cb379 17547#: git-add--interactive.perl:1650
1a79b2f1
JX
17548#, perl-format
17549msgid "Split into %d hunk.\n"
17550msgid_plural "Split into %d hunks.\n"
17551msgstr[0] "拆分为 %d 块。\n"
17552msgstr[1] "拆分为 %d 块。\n"
17553
fd8cb379 17554#: git-add--interactive.perl:1660
31e5e17b
JX
17555msgid "Sorry, cannot edit this hunk\n"
17556msgstr "对不起,不能编辑这个块\n"
17557
fd8cb379 17558#: git-add--interactive.perl:1706
1a79b2f1
JX
17559msgid "Review diff"
17560msgstr "检视 diff"
17561
17562#. TRANSLATORS: please do not translate the command names
17563#. 'status', 'update', 'revert', etc.
fd8cb379 17564#: git-add--interactive.perl:1725
1a79b2f1
JX
17565msgid ""
17566"status - show paths with changes\n"
17567"update - add working tree state to the staged set of changes\n"
17568"revert - revert staged set of changes back to the HEAD version\n"
17569"patch - pick hunks and update selectively\n"
87cb7997 17570"diff - view diff between HEAD and index\n"
1a79b2f1
JX
17571"add untracked - add contents of untracked files to the staged set of "
17572"changes\n"
17573msgstr ""
17574"status - 显示含变更的路径\n"
17575"update - 添加工作区状态至暂存列表\n"
17576"revert - 还原修改的暂存集至 HEAD 版本\n"
17577"patch - 挑选块并且有选择地更新\n"
17578"diff - 显示 HEAD 和索引间差异\n"
17579"add untracked - 添加未跟踪文件的内容至暂存列表\n"
17580
fd8cb379
JX
17581#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
17582#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
17583#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
1a79b2f1
JX
17584msgid "missing --"
17585msgstr "缺失 --"
17586
fd8cb379 17587#: git-add--interactive.perl:1763
1a79b2f1
JX
17588#, perl-format
17589msgid "unknown --patch mode: %s"
17590msgstr "未知的 --patch 模式:%s"
17591
fd8cb379 17592#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
1a79b2f1
JX
17593#, perl-format
17594msgid "invalid argument %s, expecting --"
17595msgstr "无效的参数 %s,期望是 --"
17596
31e5e17b 17597#: git-send-email.perl:130
1a79b2f1
JX
17598msgid "local zone differs from GMT by a non-minute interval\n"
17599msgstr "本地时间和 GMT 有不到一分钟间隔\n"
17600
31e5e17b 17601#: git-send-email.perl:137 git-send-email.perl:143
1a79b2f1
JX
17602msgid "local time offset greater than or equal to 24 hours\n"
17603msgstr "本地时间偏移量大于等于 24 小时\n"
17604
31e5e17b 17605#: git-send-email.perl:211 git-send-email.perl:217
1a79b2f1
JX
17606msgid "the editor exited uncleanly, aborting everything"
17607msgstr "编辑器非正常退出,终止所有操作"
17608
31e5e17b 17609#: git-send-email.perl:294
1a79b2f1
JX
17610#, perl-format
17611msgid ""
17612"'%s' contains an intermediate version of the email you were composing.\n"
17613msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
17614
31e5e17b 17615#: git-send-email.perl:299
1a79b2f1
JX
17616#, perl-format
17617msgid "'%s.final' contains the composed email.\n"
17618msgstr "'%s.final' 包含编辑的邮件。\n"
17619
31e5e17b 17620#: git-send-email.perl:317
1a79b2f1
JX
17621msgid "--dump-aliases incompatible with other options\n"
17622msgstr "--dump-aliases 和其它选项不兼容\n"
17623
31e5e17b 17624#: git-send-email.perl:383 git-send-email.perl:638
1a79b2f1
JX
17625msgid "Cannot run git format-patch from outside a repository\n"
17626msgstr "不能在仓库之外运行 git format-patch\n"
17627
31e5e17b
JX
17628#: git-send-email.perl:386
17629msgid ""
17630"`batch-size` and `relogin` must be specified together (via command-line or "
17631"configuration option)\n"
17632msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n"
17633
17634#: git-send-email.perl:456
1a79b2f1
JX
17635#, perl-format
17636msgid "Unknown --suppress-cc field: '%s'\n"
17637msgstr "未知的 --suppress-cc 字段:'%s'\n"
17638
31e5e17b 17639#: git-send-email.perl:485
1a79b2f1
JX
17640#, perl-format
17641msgid "Unknown --confirm setting: '%s'\n"
17642msgstr "未知的 --confirm 设置:'%s'\n"
17643
31e5e17b 17644#: git-send-email.perl:513
1a79b2f1
JX
17645#, perl-format
17646msgid "warning: sendmail alias with quotes is not supported: %s\n"
17647msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
17648
31e5e17b 17649#: git-send-email.perl:515
1a79b2f1
JX
17650#, perl-format
17651msgid "warning: `:include:` not supported: %s\n"
17652msgstr "警告:不支持 `:include:`:%s\n"
17653
31e5e17b 17654#: git-send-email.perl:517
1a79b2f1
JX
17655#, perl-format
17656msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
17657msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
17658
31e5e17b 17659#: git-send-email.perl:522
1a79b2f1
JX
17660#, perl-format
17661msgid "warning: sendmail line is not recognized: %s\n"
17662msgstr "警告:不能识别的 sendmail 行:%s\n"
17663
31e5e17b 17664#: git-send-email.perl:604
1a79b2f1
JX
17665#, perl-format
17666msgid ""
17667"File '%s' exists but it could also be the range of commits\n"
17668"to produce patches for. Please disambiguate by...\n"
17669"\n"
17670" * Saying \"./%s\" if you mean a file; or\n"
17671" * Giving --format-patch option if you mean a range.\n"
17672msgstr ""
87cb7997
JX
17673"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
17674"歧义:\n"
1a79b2f1
JX
17675"\n"
17676" * 如果含义为一个文件,使用 \"./%s\",或者\n"
17677" * 如果含义为一个范围,使用 --format-patch 选项。\n"
17678
31e5e17b 17679#: git-send-email.perl:625
1a79b2f1
JX
17680#, perl-format
17681msgid "Failed to opendir %s: %s"
17682msgstr "无法打开目录 %s: %s"
17683
31e5e17b 17684#: git-send-email.perl:649
1a79b2f1
JX
17685#, perl-format
17686msgid ""
17687"fatal: %s: %s\n"
17688"warning: no patches were sent\n"
17689msgstr ""
17690"严重:%s:%s\n"
17691"警告:补丁未能发送\n"
17692
31e5e17b 17693#: git-send-email.perl:660
1a79b2f1
JX
17694msgid ""
17695"\n"
17696"No patch files specified!\n"
17697"\n"
87cb7997
JX
17698msgstr ""
17699"\n"
17700"未指定补丁文件!\n"
17701"\n"
1a79b2f1 17702
31e5e17b 17703#: git-send-email.perl:673
1a79b2f1
JX
17704#, perl-format
17705msgid "No subject line in %s?"
17706msgstr "在 %s 中没有标题行?"
17707
31e5e17b 17708#: git-send-email.perl:683
1a79b2f1
JX
17709#, perl-format
17710msgid "Failed to open for writing %s: %s"
17711msgstr "无法写入 %s: %s"
17712
31e5e17b 17713#: git-send-email.perl:694
1a79b2f1
JX
17714msgid ""
17715"Lines beginning in \"GIT:\" will be removed.\n"
17716"Consider including an overall diffstat or table of contents\n"
17717"for the patch you are writing.\n"
17718"\n"
17719"Clear the body content if you don't wish to send a summary.\n"
17720msgstr ""
17721"以 \"GIT:\" 开头的行将被删除。\n"
17722"考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n"
17723"\n"
17724"如果您不想发送摘要,清除内容。\n"
17725
31e5e17b 17726#: git-send-email.perl:718
1a79b2f1
JX
17727#, perl-format
17728msgid "Failed to open %s: %s"
17729msgstr "无法打开 %s: %s"
17730
31e5e17b
JX
17731#: git-send-email.perl:735
17732#, perl-format
17733msgid "Failed to open %s.final: %s"
17734msgstr "无法打开 %s.final: %s"
1a79b2f1 17735
31e5e17b 17736#: git-send-email.perl:778
1a79b2f1
JX
17737msgid "Summary email is empty, skipping it\n"
17738msgstr "摘要邮件为空,跳过\n"
17739
17740#. TRANSLATORS: please keep [y/N] as is.
31e5e17b 17741#: git-send-email.perl:813
1a79b2f1
JX
17742#, perl-format
17743msgid "Are you sure you want to use <%s> [y/N]? "
17744msgstr "您确认要使用 <%s> [y/N]?"
17745
31e5e17b 17746#: git-send-email.perl:868
1a79b2f1
JX
17747msgid ""
17748"The following files are 8bit, but do not declare a Content-Transfer-"
17749"Encoding.\n"
17750msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
17751
31e5e17b 17752#: git-send-email.perl:873
1a79b2f1
JX
17753msgid "Which 8bit encoding should I declare [UTF-8]? "
17754msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?"
17755
31e5e17b 17756#: git-send-email.perl:881
1a79b2f1
JX
17757#, perl-format
17758msgid ""
17759"Refusing to send because the patch\n"
17760"\t%s\n"
17761"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
17762"want to send.\n"
17763msgstr ""
17764"拒绝发送,因为补丁\n"
17765"\t%s\n"
17766"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
17767
31e5e17b 17768#: git-send-email.perl:900
1a79b2f1
JX
17769msgid "To whom should the emails be sent (if anyone)?"
17770msgstr "邮件将要发送给谁?"
17771
31e5e17b 17772#: git-send-email.perl:918
1a79b2f1
JX
17773#, perl-format
17774msgid "fatal: alias '%s' expands to itself\n"
17775msgstr "严重:别名 '%s' 扩展为它自己\n"
17776
31e5e17b 17777#: git-send-email.perl:930
1a79b2f1
JX
17778msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
17779msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?"
17780
31e5e17b 17781#: git-send-email.perl:988 git-send-email.perl:996
1a79b2f1
JX
17782#, perl-format
17783msgid "error: unable to extract a valid address from: %s\n"
17784msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
17785
17786#. TRANSLATORS: Make sure to include [q] [d] [e] in your
17787#. translation. The program will only accept English input
17788#. at this point.
31e5e17b 17789#: git-send-email.perl:1000
1a79b2f1
JX
17790msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
17791msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):"
17792
31e5e17b 17793#: git-send-email.perl:1317
1a79b2f1
JX
17794#, perl-format
17795msgid "CA path \"%s\" does not exist"
17796msgstr "CA 路径 \"%s\" 不存在"
17797
fd8cb379 17798#: git-send-email.perl:1400
1a79b2f1
JX
17799msgid ""
17800" The Cc list above has been expanded by additional\n"
17801" addresses found in the patch commit message. By default\n"
17802" send-email prompts before sending whenever this occurs.\n"
17803" This behavior is controlled by the sendemail.confirm\n"
17804" configuration setting.\n"
17805"\n"
17806" For additional information, run 'git send-email --help'.\n"
17807" To retain the current behavior, but squelch this message,\n"
17808" run 'git config --global sendemail.confirm auto'.\n"
17809"\n"
17810msgstr ""
17811" 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n"
17812" 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
17813" sendemail.confirm 配置设置。\n"
17814"\n"
17815" 更多信息,执行 'git send-email --help'。\n"
17816" 要保持当前行为,但不显示此信息,运行 'git config --global\n"
17817" sendemail.confirm auto'。\n"
17818"\n"
17819
fd8cb379 17820#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
1a79b2f1
JX
17821#. translation. The program will only accept English input
17822#. at this point.
fd8cb379
JX
17823#: git-send-email.perl:1415
17824msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
17825msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
1a79b2f1 17826
fd8cb379 17827#: git-send-email.perl:1418
1a79b2f1
JX
17828msgid "Send this email reply required"
17829msgstr "发送要求的邮件回复"
17830
fd8cb379 17831#: git-send-email.perl:1446
1a79b2f1
JX
17832msgid "The required SMTP server is not properly defined."
17833msgstr "要求的 SMTP 服务器未被正确定义。"
17834
fd8cb379 17835#: git-send-email.perl:1493
1a79b2f1
JX
17836#, perl-format
17837msgid "Server does not support STARTTLS! %s"
17838msgstr "服务器不支持 STARTTLS!%s"
17839
fd8cb379 17840#: git-send-email.perl:1498 git-send-email.perl:1502
a4f16749
JX
17841#, perl-format
17842msgid "STARTTLS failed! %s"
17843msgstr "STARTTLS 失败!%s"
17844
fd8cb379 17845#: git-send-email.perl:1512
1a79b2f1
JX
17846msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
17847msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
17848
fd8cb379 17849#: git-send-email.perl:1530
1a79b2f1
JX
17850#, perl-format
17851msgid "Failed to send %s\n"
17852msgstr "无法发送 %s\n"
17853
fd8cb379 17854#: git-send-email.perl:1533
1a79b2f1
JX
17855#, perl-format
17856msgid "Dry-Sent %s\n"
17857msgstr "演习发送 %s\n"
17858
fd8cb379 17859#: git-send-email.perl:1533
1a79b2f1
JX
17860#, perl-format
17861msgid "Sent %s\n"
17862msgstr "正发送 %s\n"
17863
fd8cb379 17864#: git-send-email.perl:1535
1a79b2f1
JX
17865msgid "Dry-OK. Log says:\n"
17866msgstr "演习成功。日志说:\n"
17867
fd8cb379 17868#: git-send-email.perl:1535
1a79b2f1
JX
17869msgid "OK. Log says:\n"
17870msgstr "OK。日志说:\n"
17871
fd8cb379 17872#: git-send-email.perl:1547
1a79b2f1
JX
17873msgid "Result: "
17874msgstr "结果:"
17875
fd8cb379 17876#: git-send-email.perl:1550
1a79b2f1
JX
17877msgid "Result: OK\n"
17878msgstr "结果:OK\n"
17879
fd8cb379 17880#: git-send-email.perl:1568
1a79b2f1
JX
17881#, perl-format
17882msgid "can't open file %s"
17883msgstr "无法打开文件 %s"
17884
fd8cb379 17885#: git-send-email.perl:1615 git-send-email.perl:1635
1a79b2f1
JX
17886#, perl-format
17887msgid "(mbox) Adding cc: %s from line '%s'\n"
17888msgstr "(mbox) 添加 cc:%s 自行 '%s'\n"
17889
fd8cb379 17890#: git-send-email.perl:1621
1a79b2f1
JX
17891#, perl-format
17892msgid "(mbox) Adding to: %s from line '%s'\n"
17893msgstr "(mbox) 添加 to:%s 自行 '%s'\n"
17894
fd8cb379 17895#: git-send-email.perl:1674
1a79b2f1
JX
17896#, perl-format
17897msgid "(non-mbox) Adding cc: %s from line '%s'\n"
17898msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n"
17899
fd8cb379 17900#: git-send-email.perl:1699
1a79b2f1
JX
17901#, perl-format
17902msgid "(body) Adding cc: %s from line '%s'\n"
17903msgstr "(body) 添加 cc: %s 自行 '%s'\n"
17904
fd8cb379 17905#: git-send-email.perl:1817
1a79b2f1
JX
17906#, perl-format
17907msgid "(%s) Could not execute '%s'"
17908msgstr "(%s) 不能执行 '%s'"
17909
fd8cb379 17910#: git-send-email.perl:1824
1a79b2f1
JX
17911#, perl-format
17912msgid "(%s) Adding %s: %s from: '%s'\n"
17913msgstr "(%s) 添加 %s: %s 自:'%s'\n"
17914
fd8cb379 17915#: git-send-email.perl:1828
1a79b2f1
JX
17916#, perl-format
17917msgid "(%s) failed to close pipe to '%s'"
17918msgstr "(%s) 无法关闭管道至 '%s'"
17919
fd8cb379 17920#: git-send-email.perl:1855
1a79b2f1
JX
17921msgid "cannot send message as 7bit"
17922msgstr "不能以 7bit 形式发送信息"
17923
fd8cb379 17924#: git-send-email.perl:1863
1a79b2f1
JX
17925msgid "invalid transfer encoding"
17926msgstr "无效的传送编码"
17927
fd8cb379 17928#: git-send-email.perl:1901 git-send-email.perl:1952 git-send-email.perl:1962
1a79b2f1
JX
17929#, perl-format
17930msgid "unable to open %s: %s\n"
17931msgstr "不能打开 %s:%s\n"
17932
fd8cb379 17933#: git-send-email.perl:1904
1a79b2f1
JX
17934#, perl-format
17935msgid "%s: patch contains a line longer than 998 characters"
17936msgstr "%s:补丁包含一个超过 998 字符的行"
17937
fd8cb379 17938#: git-send-email.perl:1920
1a79b2f1
JX
17939#, perl-format
17940msgid "Skipping %s with backup suffix '%s'.\n"
17941msgstr "略过 %s 含备份后缀 '%s'。\n"
17942
17943#. TRANSLATORS: please keep "[y|N]" as is.
fd8cb379 17944#: git-send-email.perl:1924
1a79b2f1
JX
17945#, perl-format
17946msgid "Do you really want to send %s? [y|N]: "
17947msgstr "您真的要发送 %s?[y|N]:"
5809aa05 17948
fd8cb379
JX
17949#~ msgid "Everyday Git With 20 Commands Or So"
17950#~ msgstr "每一天 Git 常用的约 20 条命令"
17951
17952#~ msgid "Could not open '%s' for writing"
17953#~ msgstr "无法打开 '%s' 进行写入"
17954
17955#~ msgid "BUG: returned path string doesn't match cwd?"
17956#~ msgstr "BUG:返回的路径和当前路径不匹配?"
17957
17958#~ msgid "Error in object"
17959#~ msgstr "对象中出错"
17960
17961#~ msgid ""
17962#~ "unexpected 1st line of squash message:\n"
17963#~ "\n"
17964#~ "\t%.*s"
17965#~ msgstr ""
17966#~ "意外的压缩提交首行提交信息:\n"
17967#~ "\n"
17968#~ "\t%.*s"
17969
17970#~ msgid ""
17971#~ "invalid 1st line of squash message:\n"
17972#~ "\n"
17973#~ "\t%.*s"
17974#~ msgstr ""
17975#~ "压缩提交的首行提交信息无效:\n"
17976#~ "\n"
17977#~ "\t%.*s"
17978
31e5e17b
JX
17979#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
17980#~ msgstr "To/Cc/Bcc 字段不解析,它们被忽略\n"
17981
17982#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
17983#~ msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF"
17984
17985#~ msgid "The copy of the patch that failed is found in: %s"
17986#~ msgstr "失败的补丁文件副本位于:%s"
17987
17988#~ msgid "invalid filter-spec expression '%s'"
17989#~ msgstr "无效的 filter-spec 表达式 '%s'"
17990
17991#~ msgid "pathspec and --all are incompatible"
17992#~ msgstr "pathspec 和 --all 不兼容"
17993
17994#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
17995#~ msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
17996
5809aa05
JX
17997#~ msgid ""
17998#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
17999#~ "please use . instead if you meant to match all paths"
18000#~ msgstr ""
18001#~ "在下一个版本中,使用空字符串作为路径规格将被视作非法。如果要匹配所有路"
18002#~ "径,\n"
18003#~ "请代之以 ."
18004
18005#~ msgid "unable to open '%s' for writing"
18006#~ msgstr "无法以写入方式打开 '%s'"
18007
18008#~ msgid "could not truncate '%s'"
18009#~ msgstr "无法截断 '%s'"
18010
18011#~ msgid "could not finish '%s'"
18012#~ msgstr "无法结束 '%s'"
18013
18014#~ msgid "could not close %s"
18015#~ msgstr "不能关闭 %s"
18016
18017#~ msgid "Copied a misnamed branch '%s' away"
18018#~ msgstr "已将错误命名的分支 '%s' 复制"
18019
18020#~ msgid "it does not make sense to create 'HEAD' manually"
18021#~ msgstr "手工创建 'HEAD' 没有意义"
18022
18023#~ msgid "Don't know how to clone %s"
18024#~ msgstr "不知道如何克隆 %s"
18025
18026#~ msgid "show ignored files"
18027#~ msgstr "显示忽略的文件"
18028
18029#~ msgid "%s is not a valid '%s' object"
18030#~ msgstr "%s 不是一个有效的 '%s' 对象"
18031
18032#~ msgid "Don't know how to fetch from %s"
18033#~ msgstr "不知道如何从 %s 获取"
18034
18035#~ msgid "'$term' is not a valid term"
18036#~ msgstr "'$term' 不是一个有效的名称"
18037
18038#~ msgid ""
18039#~ "error: unknown option for 'stash save': $option\n"
18040#~ " To provide a message, use git stash save -- '$option'"
18041#~ msgstr ""
18042#~ "错误:'stash save' 的未知选项:$option\n"
18043#~ " 要提供一个描述信息,使用 git stash save -- '$option'"
18044
18045#~ msgid "Failed to recurse into submodule path '$sm_path'"
18046#~ msgstr "无法递归进子模组路径 '$sm_path'"