]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
l10n: ko.po: Update Korean translation
[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:
5809aa05 6# - Fangyi Zhou <fangyi.zhou AT yuriko.moe>
c04f5ac3 7# - Jiang Xin <worldhello.net AT gmail.com>
bbdf0acc
JX
8# - Lian Cheng <rhythm.mail AT gmail.com>
9# - Ray Chen <oldsharp AT gmail.com>
c04f5ac3 10# - Riku <lu.riku AT gmail.com>
bbdf0acc
JX
11# - Thynson <lanxingcan AT gmail.com>
12# - ws3389 <willsmith3389 AT gmail.com>
13# - Wang Sheng <wangsheng2008love AT 163.com>
554e8501 14# - 依云 <lilydjwg AT gmail.com>
bbdf0acc 15# - Yichao Yu <yyc1992 AT gmail.com>
c04f5ac3 16# - Zhuang Ya <zhuangya AT me.com>
c04f5ac3 17#
160fb2b2
JX
18# Git glossary for Chinese translators
19#
20# English | Chinese
21# ---------------------------------+--------------------------------------
22# 3-way merge | 三方合并
23# abbreviate | 简写(的 SHA-1 值)
24# alternate object database | 备用对象库
25# amend | 修补
26# ancestor | 祖先,祖先提交
27# annotated tag | 附注标签
28# bare repository | 纯仓库
29# bisect | 二分查找
30# blob object | 数据对象
31# branch | 分支
32# bundle | 包
33# bypass | 绕过
34# cache | 索引(的别称)
35# chain | (提交)链
36# changeset | 变更集
37# checkout | 检出
38# checksum | 校验,校验和
39# cherry-picking | 拣选
40# clean | 干净(的工作区)
41# clone | 克隆
42# commit | 提交
667599e8 43# commit message | 提交说明
160fb2b2
JX
44# commit object | 提交对象
45# commit-ish (also committish) | 提交号
46# conflict | 冲突
47# core Git | 核心 Git 工具
48# DAG | 有向无环图
49# dangling object | 摇摆对象
50# detached HEAD | 分离头指针
51# directory | 目录
52# dirty | 脏(的工作区)
755c831b 53# dumb HTTP protocol | 哑 HTTP 协议
160fb2b2
JX
54# evil merge | 坏合并(合并引入了父提交没有的修改)
55# fast-forward | 快进
56# fetch | 获取
57# file system | 文件系统
e397e7e3 58# fork | 派生
160fb2b2
JX
59# Git archive | 仓库(对于 arch 用户)
60# gitfile | gitfile(仓库链接文件)
61# grafts | (提交)嫁接
62# hash | 哈希值
63# HEAD | HEAD(头指针,亦即当前分支)
64# head | 头、分支
65# head ref | 分支
66# header | 头信息
67# hook | 钩子
68# hunk | 补丁片段
69# index | 索引
70# index entry | 索引条目
71# loose object | 松散对象
72# loose refs | 松散引用
73# master | master(默认分支名)
74# merge | 合并
75# object | 对象
76# object database | 对象库
77# object identifier | 对象标识符
78# object name | 对象名称
79# object type | 对象类型
80# octopus | 章鱼式合并(两分支以上的合并)
81# origin | origin(默认的远程名称)
82# pack | 包
83# pack index | 包索引
84# packfile | 包文件
85# parent | 父提交
86# patch | 补丁
87# pathspec | 路径规格
88# pattern | 模式
12e59059 89# pickaxe | 挖掘
160fb2b2
JX
90# plumbing | 管件(Git 底层核心命令的别称)
91# porcelain | 瓷件(Git 上层封装命令的别称)
94550ed3 92# precious-objects repo | 珍品仓库
160fb2b2
JX
93# prune | 清除
94# pull | 拉,拉取
95# push | 推,推送
96# reachable | 可达
97# rebase | 变基
98# ref | 引用
99# reflog | 引用日志
100# refspec | 引用规格
101# remote | 远程,远程仓库
102# remote-tracking branch | 远程跟踪分支
103# replay | 重放
104# repo | 仓库
105# repository | 仓库
106# resolve | (冲突)解决
107# revert | 还原
108# revision | 版本
109# rewind | 回退
110# SCM | 源代码管理(工具)
ee7589bb 111# SHA-1 | SHA-1(安全哈希算法1)
160fb2b2
JX
112# shallow repository | 浅(克隆)仓库
113# signed tag | 签名标签
755c831b 114# smart HTTP protocol | 智能 HTTP 协议
160fb2b2
JX
115# squash | 压缩
116# stage | n. 暂存区(即索引); v. 暂存
a4f16749 117# stash | n. 贮藏区; v. 贮藏
160fb2b2
JX
118# submodule | 子模组
119# symref | 符号引用
933c015e 120# tag | n. 标签; v. 打标签
160fb2b2
JX
121# tag object | 标签对象
122# tagger | 打标签者
123# topic branch | 主题分支
124# track | 跟踪
6937cb4e 125# trailer | 尾部署名
160fb2b2
JX
126# tree | 树(工作区或树对象)
127# tree object | 树对象
128# tree-ish (also treeish) | 树对象(或可以解析为一树对象)
129# unmerged index | 未合并索引
130# unpack | 解包
131# unreachable object | 不可达对象
132# unstage | 取消暂存
133# upstream | 上游
134# upstream branch | 上游分支
135# working tree | 工作区
136#
c04f5ac3
JX
137msgid ""
138msgstr ""
139"Project-Id-Version: Git\n"
140"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
5809aa05
JX
141"POT-Creation-Date: 2018-01-07 07:50+0800\n"
142"PO-Revision-Date: 2018-01-09 09:53+0800\n"
c04f5ac3 143"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
7aea43ff 144"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
c04f5ac3
JX
145"Language: zh_CN\n"
146"MIME-Version: 1.0\n"
147"Content-Type: text/plain; charset=UTF-8\n"
148"Content-Transfer-Encoding: 8bit\n"
5ae481e0 149"Plural-Forms: nplurals=2; plural=(n != 1);\n"
c04f5ac3 150
5809aa05 151#: advice.c:62
c04f5ac3
JX
152#, c-format
153msgid "hint: %.*s\n"
154msgstr "提示:%.*s\n"
155
5809aa05 156#: advice.c:90
5c57d762
JX
157msgid "Cherry-picking is not possible because you have unmerged files."
158msgstr "无法拣选,因为您有未合并的文件。"
159
5809aa05 160#: advice.c:92
5c57d762
JX
161msgid "Committing is not possible because you have unmerged files."
162msgstr "无法提交,因为您有未合并的文件。"
163
5809aa05 164#: advice.c:94
5c57d762
JX
165msgid "Merging is not possible because you have unmerged files."
166msgstr "无法合并,因为您有未合并的文件。"
167
5809aa05 168#: advice.c:96
5c57d762
JX
169msgid "Pulling is not possible because you have unmerged files."
170msgstr "无法拉取,因为您有未合并的文件。"
171
5809aa05 172#: advice.c:98
5c57d762
JX
173msgid "Reverting is not possible because you have unmerged files."
174msgstr "无法回退,因为您有未合并的文件。"
175
5809aa05 176#: advice.c:100
5c57d762
JX
177#, c-format
178msgid "It is not possible to %s because you have unmerged files."
179msgstr "无法 %s,因为您有未合并的文件。"
180
5809aa05 181#: advice.c:108
c04f5ac3 182msgid ""
6acbf033 183"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 184"as appropriate to mark resolution and make a commit."
c04f5ac3 185msgstr ""
d9d56b23 186"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
220c313c 187"解决方案并提交。"
c04f5ac3 188
5809aa05 189#: advice.c:116
5c57d762
JX
190msgid "Exiting because of an unresolved conflict."
191msgstr "因为存在未解决的冲突而退出。"
192
5809aa05 193#: advice.c:121 builtin/merge.c:1213
1b7f4a34
JX
194msgid "You have not concluded your merge (MERGE_HEAD exists)."
195msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
196
5809aa05 197#: advice.c:123
94550ed3 198msgid "Please, commit your changes before merging."
1b7f4a34
JX
199msgstr "请在合并前先提交您的修改。"
200
5809aa05 201#: advice.c:124
1b7f4a34
JX
202msgid "Exiting because of unfinished merge."
203msgstr "因为存在未完成的合并而退出。"
204
5809aa05 205#: advice.c:130
5c57d762
JX
206#, c-format
207msgid ""
208"Note: checking out '%s'.\n"
209"\n"
210"You are in 'detached HEAD' state. You can look around, make experimental\n"
211"changes and commit them, and you can discard any commits you make in this\n"
212"state without impacting any branches by performing another checkout.\n"
213"\n"
214"If you want to create a new branch to retain commits you create, you may\n"
215"do so (now or later) by using -b with the checkout command again. Example:\n"
216"\n"
217" git checkout -b <new-branch-name>\n"
218"\n"
219msgstr ""
220"注意:正在检出 '%s'。\n"
221"\n"
a0b6b246
JX
222"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另"
223"外\n"
5c57d762
JX
224"的检出分支操作丢弃在这个状态下所做的任何提交。\n"
225"\n"
226"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n"
227"参数 -b 来实现(现在或稍后)。例如:\n"
228"\n"
58b6f078 229" git checkout -b <新分支名>\n"
5c57d762
JX
230"\n"
231
a4f16749 232#: apply.c:58
a0b6b246
JX
233#, c-format
234msgid "unrecognized whitespace option '%s'"
235msgstr "未能识别的空白字符选项 '%s'"
ef317cd5 236
a4f16749 237#: apply.c:74
90314792 238#, c-format
a0b6b246
JX
239msgid "unrecognized whitespace ignore option '%s'"
240msgstr "未能识别的空白字符忽略选项 '%s'"
90314792 241
5809aa05 242#: apply.c:122
a0b6b246 243msgid "--reject and --3way cannot be used together."
2090d5b4 244msgstr "--reject 和 --3way 不能同时使用。"
ef317cd5 245
5809aa05 246#: apply.c:124
a0b6b246
JX
247msgid "--cached and --3way cannot be used together."
248msgstr "--cached 和 --3way 不能同时使用。"
ef317cd5 249
5809aa05 250#: apply.c:127
a0b6b246
JX
251msgid "--3way outside a repository"
252msgstr "--3way 在一个仓库之外"
ef317cd5 253
5809aa05 254#: apply.c:138
a0b6b246
JX
255msgid "--index outside a repository"
256msgstr "--index 在一个仓库之外"
ef317cd5 257
5809aa05 258#: apply.c:141
a0b6b246
JX
259msgid "--cached outside a repository"
260msgstr "--cached 在一个仓库之外"
ef317cd5 261
5809aa05 262#: apply.c:821
a0b6b246
JX
263#, c-format
264msgid "Cannot prepare timestamp regexp %s"
265msgstr "无法准备时间戳正则表达式 %s"
ef317cd5 266
5809aa05 267#: apply.c:830
a0b6b246
JX
268#, c-format
269msgid "regexec returned %d for input: %s"
270msgstr "regexec 返回 %d,输入为:%s"
ef317cd5 271
5809aa05 272#: apply.c:904
a0b6b246
JX
273#, c-format
274msgid "unable to find filename in patch at line %d"
275msgstr "不能在补丁的第 %d 行找到文件名"
ef317cd5 276
5809aa05 277#: apply.c:942
a0b6b246
JX
278#, c-format
279msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
280msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
ef317cd5 281
5809aa05 282#: apply.c:948
a0b6b246
JX
283#, c-format
284msgid "git apply: bad git-diff - inconsistent new filename on line %d"
285msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
ef317cd5 286
5809aa05 287#: apply.c:949
a0b6b246
JX
288#, c-format
289msgid "git apply: bad git-diff - inconsistent old filename on line %d"
290msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
ef317cd5 291
5809aa05 292#: apply.c:954
a0b6b246
JX
293#, c-format
294msgid "git apply: bad git-diff - expected /dev/null on line %d"
295msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
ef317cd5 296
5809aa05 297#: apply.c:983
a4f16749
JX
298#, c-format
299msgid "invalid mode on line %d: %s"
300msgstr "第 %d 行包含无效文件模式:%s"
301
5809aa05 302#: apply.c:1301
a4f16749
JX
303#, c-format
304msgid "inconsistent header lines %d and %d"
305msgstr "不一致的文件头,%d 行和 %d 行"
306
5809aa05 307#: apply.c:1473
a0b6b246
JX
308#, c-format
309msgid "recount: unexpected line: %.*s"
310msgstr "recount:意外的行:%.*s"
ef317cd5 311
5809aa05 312#: apply.c:1542
a0b6b246
JX
313#, c-format
314msgid "patch fragment without header at line %d: %.*s"
315msgstr "第 %d 行的补丁片段没有头信息:%.*s"
ef317cd5 316
5809aa05 317#: apply.c:1562
a0b6b246
JX
318#, c-format
319msgid ""
320"git diff header lacks filename information when removing %d leading pathname "
321"component (line %d)"
322msgid_plural ""
323"git diff header lacks filename information when removing %d leading pathname "
324"components (line %d)"
325msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
326msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
ef317cd5 327
5809aa05 328#: apply.c:1575
a0b6b246
JX
329#, c-format
330msgid "git diff header lacks filename information (line %d)"
331msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
07432cef 332
5809aa05 333#: apply.c:1763
a0b6b246
JX
334msgid "new file depends on old contents"
335msgstr "新文件依赖旧内容"
5c57d762 336
5809aa05 337#: apply.c:1765
a0b6b246
JX
338msgid "deleted file still has contents"
339msgstr "删除的文件仍有内容"
5c57d762 340
5809aa05 341#: apply.c:1799
a0b6b246
JX
342#, c-format
343msgid "corrupt patch at line %d"
344msgstr "补丁在第 %d 行损坏"
5c57d762 345
5809aa05 346#: apply.c:1836
5c57d762 347#, c-format
a0b6b246
JX
348msgid "new file %s depends on old contents"
349msgstr "新文件 %s 依赖旧内容"
5c57d762 350
5809aa05 351#: apply.c:1838
5c57d762 352#, c-format
a0b6b246
JX
353msgid "deleted file %s still has contents"
354msgstr "删除的文件 %s 仍有内容"
5c57d762 355
5809aa05 356#: apply.c:1841
a0b6b246
JX
357#, c-format
358msgid "** warning: file %s becomes empty but is not deleted"
359msgstr "** 警告:文件 %s 成为空文件但并未删除"
ef317cd5 360
5809aa05 361#: apply.c:1988
5c57d762 362#, c-format
a0b6b246
JX
363msgid "corrupt binary patch at line %d: %.*s"
364msgstr "二进制补丁在第 %d 行损坏:%.*s"
5c57d762 365
5809aa05 366#: apply.c:2025
5c57d762 367#, c-format
a0b6b246
JX
368msgid "unrecognized binary patch at line %d"
369msgstr "未能识别的二进制补丁位于第 %d 行"
5c57d762 370
5809aa05 371#: apply.c:2185
5c57d762 372#, c-format
a0b6b246
JX
373msgid "patch with only garbage at line %d"
374msgstr "补丁文件的第 %d 行只有垃圾数据"
5c57d762 375
5809aa05 376#: apply.c:2271
5c57d762 377#, c-format
a0b6b246
JX
378msgid "unable to read symlink %s"
379msgstr "无法读取符号链接 %s"
5c57d762 380
5809aa05 381#: apply.c:2275
5c57d762 382#, c-format
a0b6b246
JX
383msgid "unable to open or read %s"
384msgstr "不能打开或读取 %s"
5c57d762 385
5809aa05 386#: apply.c:2934
5c57d762 387#, c-format
a0b6b246
JX
388msgid "invalid start of line: '%c'"
389msgstr "无效的行首字符:'%c'"
5c57d762 390
5809aa05 391#: apply.c:3055
5c57d762 392#, c-format
a0b6b246
JX
393msgid "Hunk #%d succeeded at %d (offset %d line)."
394msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
395msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
396msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
5c57d762 397
5809aa05 398#: apply.c:3067
5c57d762 399#, c-format
a0b6b246
JX
400msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
401msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
5c57d762 402
5809aa05 403#: apply.c:3073
5c57d762
JX
404#, c-format
405msgid ""
a0b6b246
JX
406"while searching for:\n"
407"%.*s"
5c57d762 408msgstr ""
a0b6b246
JX
409"当查询:\n"
410"%.*s"
5c57d762 411
5809aa05 412#: apply.c:3095
5c57d762 413#, c-format
a0b6b246
JX
414msgid "missing binary patch data for '%s'"
415msgstr "缺失 '%s' 的二进制补丁数据"
5c57d762 416
5809aa05 417#: apply.c:3103
5c57d762 418#, c-format
a0b6b246 419msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
29004bbb 420msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
5c57d762 421
5809aa05 422#: apply.c:3149
5c57d762 423#, c-format
a0b6b246
JX
424msgid "cannot apply binary patch to '%s' without full index line"
425msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
5c57d762 426
5809aa05 427#: apply.c:3159
5c57d762 428#, c-format
a0b6b246
JX
429msgid ""
430"the patch applies to '%s' (%s), which does not match the current contents."
29004bbb 431msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
5c57d762 432
5809aa05 433#: apply.c:3167
a0b6b246
JX
434#, c-format
435msgid "the patch applies to an empty '%s' but it is not empty"
29004bbb 436msgstr "补丁应用到空文件 '%s',但其并非空文件"
5c57d762 437
5809aa05 438#: apply.c:3185
5c57d762 439#, c-format
a0b6b246
JX
440msgid "the necessary postimage %s for '%s' cannot be read"
441msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"
5c57d762 442
5809aa05 443#: apply.c:3198
5c57d762 444#, c-format
a0b6b246
JX
445msgid "binary patch does not apply to '%s'"
446msgstr "二进制补丁未应用到 '%s'"
5c57d762 447
5809aa05 448#: apply.c:3204
5c57d762 449#, c-format
a0b6b246
JX
450msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
451msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
5c57d762 452
5809aa05 453#: apply.c:3225
276ceeaa 454#, c-format
a0b6b246
JX
455msgid "patch failed: %s:%ld"
456msgstr "打补丁失败:%s:%ld"
276ceeaa 457
5809aa05 458#: apply.c:3347
4dcdc3d8 459#, c-format
a0b6b246
JX
460msgid "cannot checkout %s"
461msgstr "不能检出 %s"
4dcdc3d8 462
5809aa05 463#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277
4dcdc3d8 464#, c-format
a0b6b246
JX
465msgid "failed to read %s"
466msgstr "无法读取 %s"
4dcdc3d8 467
5809aa05 468#: apply.c:3404
4dcdc3d8 469#, c-format
a0b6b246
JX
470msgid "reading from '%s' beyond a symbolic link"
471msgstr "读取位于符号链接中的 '%s'"
4dcdc3d8 472
5809aa05 473#: apply.c:3433 apply.c:3673
4dcdc3d8 474#, c-format
a0b6b246
JX
475msgid "path %s has been renamed/deleted"
476msgstr "路径 %s 已经被重命名/删除"
4dcdc3d8 477
5809aa05 478#: apply.c:3516 apply.c:3687
4dcdc3d8 479#, c-format
a0b6b246
JX
480msgid "%s: does not exist in index"
481msgstr "%s:不存在于索引中"
4dcdc3d8 482
5809aa05 483#: apply.c:3525 apply.c:3695
4dcdc3d8 484#, c-format
a0b6b246
JX
485msgid "%s: does not match index"
486msgstr "%s:和索引不匹配"
4dcdc3d8 487
5809aa05 488#: apply.c:3560
a0b6b246
JX
489msgid "repository lacks the necessary blob to fall back on 3-way merge."
490msgstr "仓库缺乏必要的数据对象以进行三方合并。"
4dcdc3d8 491
5809aa05 492#: apply.c:3563
4dcdc3d8 493#, c-format
a0b6b246
JX
494msgid "Falling back to three-way merge...\n"
495msgstr "回落到三方合并...\n"
4dcdc3d8 496
5809aa05 497#: apply.c:3579 apply.c:3583
4dcdc3d8 498#, c-format
a0b6b246
JX
499msgid "cannot read the current contents of '%s'"
500msgstr "无法读取 '%s' 的当前内容"
276ceeaa 501
5809aa05 502#: apply.c:3595
4dcdc3d8 503#, c-format
a0b6b246
JX
504msgid "Failed to fall back on three-way merge...\n"
505msgstr "无法回落到三方合并...\n"
4dcdc3d8 506
5809aa05 507#: apply.c:3609
4dcdc3d8 508#, c-format
a0b6b246
JX
509msgid "Applied patch to '%s' with conflicts.\n"
510msgstr "应用补丁到 '%s' 存在冲突。\n"
4dcdc3d8 511
5809aa05 512#: apply.c:3614
4dcdc3d8 513#, c-format
a0b6b246
JX
514msgid "Applied patch to '%s' cleanly.\n"
515msgstr "成功应用补丁到 '%s'。\n"
4dcdc3d8 516
5809aa05 517#: apply.c:3640
a0b6b246
JX
518msgid "removal patch leaves file contents"
519msgstr "移除补丁仍留下了文件内容"
4dcdc3d8 520
5809aa05 521#: apply.c:3712
1003b3a5 522#, c-format
a0b6b246
JX
523msgid "%s: wrong type"
524msgstr "%s:错误类型"
1003b3a5 525
5809aa05 526#: apply.c:3714
1003b3a5 527#, c-format
a0b6b246
JX
528msgid "%s has type %o, expected %o"
529msgstr "%s 的类型是 %o,应为 %o"
1003b3a5 530
5809aa05 531#: apply.c:3864 apply.c:3866
4dcdc3d8 532#, c-format
a0b6b246
JX
533msgid "invalid path '%s'"
534msgstr "无效路径 '%s'"
4dcdc3d8 535
5809aa05 536#: apply.c:3922
4dcdc3d8 537#, c-format
a0b6b246
JX
538msgid "%s: already exists in index"
539msgstr "%s:已经存在于索引中"
4dcdc3d8 540
5809aa05 541#: apply.c:3925
4dcdc3d8 542#, c-format
a0b6b246
JX
543msgid "%s: already exists in working directory"
544msgstr "%s:已经存在于工作区中"
4dcdc3d8 545
5809aa05 546#: apply.c:3945
1b7f4a34 547#, c-format
a0b6b246
JX
548msgid "new mode (%o) of %s does not match old mode (%o)"
549msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1b7f4a34 550
5809aa05 551#: apply.c:3950
5b04ee3b 552#, c-format
a0b6b246
JX
553msgid "new mode (%o) of %s does not match old mode (%o) of %s"
554msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
5b04ee3b 555
5809aa05 556#: apply.c:3970
8ada9598 557#, c-format
a0b6b246
JX
558msgid "affected file '%s' is beyond a symbolic link"
559msgstr "受影响的文件 '%s' 位于符号链接中"
8ada9598 560
5809aa05 561#: apply.c:3974
81809b99 562#, c-format
a0b6b246
JX
563msgid "%s: patch does not apply"
564msgstr "%s:补丁未应用"
8ada9598 565
5809aa05 566#: apply.c:3989
8ada9598 567#, c-format
a0b6b246
JX
568msgid "Checking patch %s..."
569msgstr "检查补丁 %s..."
8ada9598 570
5809aa05 571#: apply.c:4080
a0b6b246
JX
572#, c-format
573msgid "sha1 information is lacking or useless for submodule %s"
574msgstr "子模组 %s 的 sha1 信息缺失或无效"
8ada9598 575
5809aa05 576#: apply.c:4087
8ada9598 577#, c-format
a0b6b246 578msgid "mode change for %s, which is not in current HEAD"
29004bbb 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
5809aa05 586#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
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
5809aa05 662#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
220c313c 663#, c-format
a0b6b246
JX
664msgid "cannot open %s"
665msgstr "不能打开 %s"
220c313c 666
5809aa05 667#: apply.c:4559
220c313c 668#, c-format
a0b6b246
JX
669msgid "Hunk #%d applied cleanly."
670msgstr "第 #%d 个片段成功应用。"
220c313c 671
5809aa05 672#: apply.c:4563
5c57d762 673#, c-format
a0b6b246
JX
674msgid "Rejected hunk #%d."
675msgstr "拒绝第 #%d 个片段。"
5c57d762 676
5809aa05 677#: apply.c:4673
5c57d762 678#, c-format
a0b6b246
JX
679msgid "Skipped patch '%s'."
680msgstr "略过补丁 '%s'。"
5c57d762 681
5809aa05 682#: apply.c:4681
a0b6b246
JX
683msgid "unrecognized input"
684msgstr "未能识别的输入"
5c57d762 685
5809aa05 686#: apply.c:4700
a0b6b246
JX
687msgid "unable to read index file"
688msgstr "无法读取索引文件"
5c57d762 689
5809aa05 690#: apply.c:4837
220c313c 691#, c-format
a0b6b246
JX
692msgid "can't open patch '%s': %s"
693msgstr "不能打开补丁 '%s':%s"
220c313c 694
5809aa05 695#: apply.c:4864
5c57d762 696#, c-format
a0b6b246
JX
697msgid "squelched %d whitespace error"
698msgid_plural "squelched %d whitespace errors"
699msgstr[0] "抑制下仍有 %d 个空白字符误用"
700msgstr[1] "抑制下仍有 %d 个空白字符误用"
5c57d762 701
5809aa05 702#: apply.c:4870 apply.c:4885
5c57d762 703#, c-format
a0b6b246
JX
704msgid "%d line adds whitespace errors."
705msgid_plural "%d lines add whitespace errors."
a4f16749
JX
706msgstr[0] "%d 行新增了空白字符误用。"
707msgstr[1] "%d 行新增了空白字符误用。"
5c57d762 708
5809aa05 709#: apply.c:4878
5c57d762 710#, c-format
a0b6b246
JX
711msgid "%d line applied after fixing whitespace errors."
712msgid_plural "%d lines applied after fixing whitespace errors."
713msgstr[0] "修复空白错误后,应用了 %d 行。"
714msgstr[1] "修复空白错误后,应用了 %d 行。"
5c57d762 715
5809aa05 716#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390
a0b6b246
JX
717msgid "Unable to write new index file"
718msgstr "无法写入新索引文件"
5c57d762 719
5809aa05
JX
720#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
721#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
722#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
723#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
724#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
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
5809aa05 737#: apply.c:4927 builtin/am.c:2229
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
5809aa05 777#: apply.c:4949
a0b6b246
JX
778msgid "also apply the patch (use with --stat/--summary/--check)"
779msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
c04f5ac3 780
5809aa05 781#: apply.c:4951
a0b6b246
JX
782msgid "attempt three-way merge if a patch does not apply"
783msgstr "如果一个补丁不能应用则尝试三方合并"
c04f5ac3 784
5809aa05 785#: apply.c:4953
a0b6b246
JX
786msgid "build a temporary index based on embedded index information"
787msgstr "创建一个临时索引基于嵌入的索引信息"
c04f5ac3 788
5809aa05 789#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
a0b6b246
JX
790msgid "paths are separated with NUL character"
791msgstr "路径以 NUL 字符分隔"
8ada9598 792
5809aa05 793#: apply.c:4958
a0b6b246
JX
794msgid "ensure at least <n> lines of context match"
795msgstr "确保至少匹配 <n> 行上下文"
8ada9598 796
5809aa05 797#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
6937cb4e 798#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
5809aa05 799#: builtin/pack-objects.c:3009
a0b6b246
JX
800msgid "action"
801msgstr "动作"
8ada9598 802
5809aa05 803#: apply.c:4960
a0b6b246
JX
804msgid "detect new or modified lines that have whitespace errors"
805msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 806
5809aa05 807#: apply.c:4963 apply.c:4966
a0b6b246
JX
808msgid "ignore changes in whitespace when finding context"
809msgstr "查找上下文时忽略空白字符的变更"
8ada9598 810
5809aa05 811#: apply.c:4969
a0b6b246
JX
812msgid "apply the patch in reverse"
813msgstr "反向应用补丁"
8ada9598 814
5809aa05 815#: apply.c:4971
a0b6b246
JX
816msgid "don't expect at least one line of context"
817msgstr "无需至少一行上下文"
8ada9598 818
5809aa05 819#: apply.c:4973
a0b6b246
JX
820msgid "leave the rejected hunks in corresponding *.rej files"
821msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 822
5809aa05 823#: apply.c:4975
a0b6b246
JX
824msgid "allow overlapping hunks"
825msgstr "允许重叠的补丁片段"
8ada9598 826
5809aa05
JX
827#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
828#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
829#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
a0b6b246
JX
830msgid "be verbose"
831msgstr "冗长输出"
8ada9598 832
5809aa05 833#: apply.c:4978
a0b6b246
JX
834msgid "tolerate incorrectly detected missing new-line at the end of file"
835msgstr "允许不正确的文件末尾换行符"
cfff71a9 836
5809aa05 837#: apply.c:4981
a0b6b246
JX
838msgid "do not trust the line counts in the hunk headers"
839msgstr "不信任补丁片段的头信息中的行号"
6c94aba5 840
5809aa05 841#: apply.c:4983 builtin/am.c:2217
a0b6b246
JX
842msgid "root"
843msgstr "根目录"
c04f5ac3 844
5809aa05 845#: apply.c:4984
a0b6b246
JX
846msgid "prepend <root> to all filenames"
847msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 848
a4f16749 849#: archive.c:13
a0b6b246
JX
850msgid "git archive [<options>] <tree-ish> [<path>...]"
851msgstr "git archive [<选项>] <树或提交> [<路径>...]"
07432cef 852
a4f16749 853#: archive.c:14
a0b6b246
JX
854msgid "git archive --list"
855msgstr "git archive --list"
856
a4f16749 857#: archive.c:15
c04f5ac3 858msgid ""
a0b6b246 859"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
c04f5ac3 860msgstr ""
a0b6b246 861"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
6acbf033 862
a4f16749 863#: archive.c:16
a0b6b246
JX
864msgid "git archive --remote <repo> [--exec <cmd>] --list"
865msgstr "git archive --remote <仓库> [--exec <命令>] --list"
6acbf033 866
5809aa05 867#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299
c04f5ac3 868#, c-format
a0b6b246
JX
869msgid "pathspec '%s' did not match any files"
870msgstr "路径规格 '%s' 未匹配任何文件"
c04f5ac3 871
6937cb4e 872#: archive.c:436
a0b6b246
JX
873msgid "fmt"
874msgstr "格式"
07432cef 875
6937cb4e 876#: archive.c:436
a0b6b246
JX
877msgid "archive format"
878msgstr "归档格式"
7aea43ff 879
5809aa05 880#: archive.c:437 builtin/log.c:1459
a0b6b246
JX
881msgid "prefix"
882msgstr "前缀"
7aea43ff 883
6937cb4e 884#: archive.c:438
a0b6b246
JX
885msgid "prepend prefix to each pathname in the archive"
886msgstr "为归档中每个路径名加上前缀"
c04f5ac3 887
5809aa05
JX
888#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
889#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
890#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
6937cb4e 891#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
1a79b2f1 892#: parse-options.h:153
a0b6b246
JX
893msgid "file"
894msgstr "文件"
a77c07d9 895
6937cb4e 896#: archive.c:440 builtin/archive.c:89
a0b6b246
JX
897msgid "write the archive to this file"
898msgstr "归档写入此文件"
a77c07d9 899
6937cb4e 900#: archive.c:442
a0b6b246
JX
901msgid "read .gitattributes in working directory"
902msgstr "读取工作区中的 .gitattributes"
7ac1c0ad 903
6937cb4e 904#: archive.c:443
a0b6b246
JX
905msgid "report archived files on stderr"
906msgstr "在标准错误上报告归档文件"
7ac1c0ad 907
6937cb4e 908#: archive.c:444
a0b6b246
JX
909msgid "store only"
910msgstr "只存储"
7ac1c0ad 911
6937cb4e 912#: archive.c:445
a0b6b246
JX
913msgid "compress faster"
914msgstr "压缩速度更快"
8ada9598 915
6937cb4e 916#: archive.c:453
a0b6b246
JX
917msgid "compress better"
918msgstr "压缩效果更好"
8ada9598 919
6937cb4e 920#: archive.c:456
a0b6b246
JX
921msgid "list supported archive formats"
922msgstr "列出支持的归档格式"
a77c07d9 923
6937cb4e 924#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
5809aa05 925#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
a0b6b246
JX
926msgid "repo"
927msgstr "仓库"
c04f5ac3 928
6937cb4e 929#: archive.c:459 builtin/archive.c:91
a0b6b246
JX
930msgid "retrieve the archive from remote repository <repo>"
931msgstr "从远程仓库(<仓库>)提取归档文件"
8ada9598 932
6937cb4e 933#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
a0b6b246
JX
934msgid "command"
935msgstr "命令"
936
6937cb4e 937#: archive.c:461 builtin/archive.c:93
a0b6b246
JX
938msgid "path to the remote git-upload-archive command"
939msgstr "远程 git-upload-archive 命令的路径"
940
6937cb4e 941#: archive.c:468
a0b6b246
JX
942msgid "Unexpected option --remote"
943msgstr "未知参数 --remote"
944
6937cb4e 945#: archive.c:470
a0b6b246
JX
946msgid "Option --exec can only be used together with --remote"
947msgstr "选项 --exec 只能和 --remote 同时使用"
948
6937cb4e 949#: archive.c:472
a0b6b246
JX
950msgid "Unexpected option --output"
951msgstr "未知参数 --output"
952
6937cb4e 953#: archive.c:494
a0b6b246
JX
954#, c-format
955msgid "Unknown archive format '%s'"
956msgstr "未知归档格式 '%s'"
957
6937cb4e 958#: archive.c:501
8ada9598 959#, c-format
a0b6b246
JX
960msgid "Argument not supported for format '%s': -%d"
961msgstr "参数不支持此格式 '%s':-%d"
962
6937cb4e 963#: attr.c:218
87cb7997
JX
964#, c-format
965msgid "%.*s is not a valid attribute name"
966msgstr "%.*s 不是一个有效的属性名"
967
6937cb4e 968#: attr.c:415
8ada9598 969msgid ""
a0b6b246
JX
970"Negative patterns are ignored in git attributes\n"
971"Use '\\!' for literal leading exclamation."
8ada9598 972msgstr ""
a0b6b246
JX
973"负值模版在 git attributes 中被忽略\n"
974"当字符串确实要以感叹号开始时,使用 '\\!'。"
8ada9598 975
5809aa05 976#: bisect.c:458
8ada9598 977#, c-format
a0b6b246
JX
978msgid "Badly quoted content in file '%s': %s"
979msgstr "文件 '%s' 包含错误的引用格式:%s"
8ada9598 980
5809aa05 981#: bisect.c:666
a0b6b246
JX
982#, c-format
983msgid "We cannot bisect more!\n"
984msgstr "我们无法进行更多的二分查找!\n"
8ada9598 985
5809aa05 986#: bisect.c:720
2e8451e8 987#, c-format
a0b6b246
JX
988msgid "Not a valid commit name %s"
989msgstr "不是一个有效的提交名 %s"
2e8451e8 990
5809aa05 991#: bisect.c:744
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
5809aa05 1000#: bisect.c:749
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
5809aa05 1009#: bisect.c:754
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
5809aa05 1018#: bisect.c:762
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
5809aa05 1029#: bisect.c:775
a0b6b246
JX
1030#, c-format
1031msgid ""
1032"the merge base between %s and [%s] must be skipped.\n"
1033"So we cannot be sure the first %s commit is between %s and %s.\n"
1034"We continue anyway."
1035msgstr ""
1036"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1037"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1038"我们仍旧继续。"
649900bc 1039
5809aa05 1040#: bisect.c:810
649900bc 1041#, c-format
a0b6b246
JX
1042msgid "Bisecting: a merge base must be tested\n"
1043msgstr "二分查找中:合并基线必须是经过测试的\n"
649900bc 1044
5809aa05 1045#: bisect.c:862
a0b6b246
JX
1046#, c-format
1047msgid "a %s revision is needed"
1048msgstr "需要一个 %s 版本"
649900bc 1049
5809aa05 1050#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
649900bc 1051#, c-format
a0b6b246
JX
1052msgid "could not create file '%s'"
1053msgstr "不能创建文件 '%s'"
649900bc 1054
5809aa05 1055#: bisect.c:930
649900bc 1056#, c-format
a0b6b246
JX
1057msgid "could not read file '%s'"
1058msgstr "不能读取文件 '%s'"
649900bc 1059
5809aa05 1060#: bisect.c:960
a0b6b246
JX
1061msgid "reading bisect refs failed"
1062msgstr "读取二分查找引用失败"
649900bc 1063
5809aa05 1064#: bisect.c:979
649900bc 1065#, c-format
a0b6b246
JX
1066msgid "%s was both %s and %s\n"
1067msgstr "%s 同时为 %s 和 %s\n"
649900bc 1068
5809aa05 1069#: bisect.c:987
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
5809aa05 1078#: bisect.c:1006
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#.
5809aa05 1088#: bisect.c:1012
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
a4f16749
JX
1095#: blame.c:1757
1096msgid "--contents and --reverse do not blend well."
1097msgstr "--contents 和 --reverse 不能混用。"
1098
1099#: blame.c:1768
1100msgid "cannot use --contents with final commit object name"
1101msgstr "不能将 --contents 和最终的提交对象名共用"
1102
1103#: blame.c:1788
1104msgid "--reverse and --first-parent together require specified latest commit"
1105msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
1106
5809aa05
JX
1107#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
1108#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
1109#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
6937cb4e 1110#: builtin/shortlog.c:191
a4f16749
JX
1111msgid "revision walk setup failed"
1112msgstr "版本遍历设置失败"
1113
1114#: blame.c:1815
1115msgid ""
1116"--reverse --first-parent together require range along first-parent chain"
1117msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
1118
1119#: blame.c:1826
1120#, c-format
1121msgid "no such path %s in %s"
1122msgstr "在 %2$s 中无此路径 %1$s"
1123
1124#: blame.c:1837
1125#, c-format
1126msgid "cannot read blob %s for path %s"
1127msgstr "不能为路径 %2$s 读取数据对象 %1$s"
1128
a0b6b246 1129#: branch.c:53
649900bc 1130#, c-format
a0b6b246
JX
1131msgid ""
1132"\n"
1133"After fixing the error cause you may try to fix up\n"
1134"the remote tracking information by invoking\n"
1135"\"git branch --set-upstream-to=%s%s%s\"."
1136msgstr ""
1137"\n"
1138"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1139"\"git branch --set-upstream-to=%s%s%s\" 。"
649900bc 1140
a0b6b246 1141#: branch.c:67
649900bc 1142#, c-format
a0b6b246
JX
1143msgid "Not setting branch %s as its own upstream."
1144msgstr "未设置分支 %s 作为它自己的上游。"
649900bc 1145
a0b6b246 1146#: branch.c:93
649900bc 1147#, c-format
6937cb4e
JX
1148msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
1149msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 1150
a0b6b246 1151#: branch.c:94
649900bc 1152#, c-format
6937cb4e
JX
1153msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
1154msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 1155
a0b6b246 1156#: branch.c:98
649900bc 1157#, c-format
6937cb4e
JX
1158msgid "Branch '%s' set up to track local branch '%s' by rebasing."
1159msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
649900bc 1160
a0b6b246 1161#: branch.c:99
649900bc 1162#, c-format
6937cb4e 1163msgid "Branch '%s' set up to track local branch '%s'."
493a9322 1164msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
649900bc 1165
a0b6b246 1166#: branch.c:104
649900bc 1167#, c-format
6937cb4e
JX
1168msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
1169msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
649900bc 1170
a0b6b246 1171#: branch.c:105
649900bc 1172#, c-format
6937cb4e
JX
1173msgid "Branch '%s' set up to track remote ref '%s'."
1174msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
649900bc 1175
a0b6b246 1176#: branch.c:109
649900bc 1177#, c-format
6937cb4e
JX
1178msgid "Branch '%s' set up to track local ref '%s' by rebasing."
1179msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
649900bc 1180
a0b6b246 1181#: branch.c:110
649900bc 1182#, c-format
6937cb4e
JX
1183msgid "Branch '%s' set up to track local ref '%s'."
1184msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
649900bc 1185
a0b6b246
JX
1186#: branch.c:119
1187msgid "Unable to write upstream branch configuration"
1188msgstr "无法写入上游分支配置"
649900bc 1189
a0b6b246 1190#: branch.c:156
649900bc 1191#, c-format
a0b6b246
JX
1192msgid "Not tracking: ambiguous information for ref %s"
1193msgstr "未跟踪:引用 %s 有歧义"
649900bc 1194
5809aa05 1195#: branch.c:189
649900bc 1196#, c-format
a0b6b246
JX
1197msgid "'%s' is not a valid branch name."
1198msgstr "'%s' 不是一个有效的分支名称。"
649900bc 1199
5809aa05 1200#: branch.c:208
649900bc 1201#, c-format
a0b6b246
JX
1202msgid "A branch named '%s' already exists."
1203msgstr "一个分支名 '%s' 已经存在。"
649900bc 1204
5809aa05 1205#: branch.c:213
a0b6b246
JX
1206msgid "Cannot force update the current branch."
1207msgstr "无法强制更新当前分支。"
649900bc 1208
5809aa05 1209#: branch.c:233
649900bc 1210#, c-format
a0b6b246
JX
1211msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1212msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
649900bc 1213
5809aa05 1214#: branch.c:235
649900bc 1215#, c-format
a0b6b246
JX
1216msgid "the requested upstream branch '%s' does not exist"
1217msgstr "请求的上游分支 '%s' 不存在"
649900bc 1218
5809aa05 1219#: branch.c:237
a0b6b246
JX
1220msgid ""
1221"\n"
1222"If you are planning on basing your work on an upstream\n"
1223"branch that already exists at the remote, you may need to\n"
1224"run \"git fetch\" to retrieve it.\n"
1225"\n"
1226"If you are planning to push out a new local branch that\n"
1227"will track its remote counterpart, you may want to use\n"
1228"\"git push -u\" to set the upstream config as you push."
1229msgstr ""
1230"\n"
1231"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
1232"您可能需要执行 \"git fetch\" 来获取分支。\n"
1233"\n"
1234"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
1235"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
649900bc 1236
5809aa05 1237#: branch.c:280
649900bc 1238#, c-format
a0b6b246
JX
1239msgid "Not a valid object name: '%s'."
1240msgstr "不是一个有效的对象名:'%s'。"
649900bc 1241
5809aa05 1242#: branch.c:300
649900bc 1243#, c-format
a0b6b246
JX
1244msgid "Ambiguous object name: '%s'."
1245msgstr "歧义的对象名:'%s'。"
649900bc 1246
5809aa05 1247#: branch.c:305
649900bc 1248#, c-format
a0b6b246
JX
1249msgid "Not a valid branch point: '%s'."
1250msgstr "无效的分支点:'%s'。"
649900bc 1251
5809aa05 1252#: branch.c:359
649900bc 1253#, c-format
a0b6b246
JX
1254msgid "'%s' is already checked out at '%s'"
1255msgstr "'%s' 已经检出到 '%s'"
649900bc 1256
5809aa05 1257#: branch.c:382
a0b6b246
JX
1258#, c-format
1259msgid "HEAD of working tree %s is not updated"
1260msgstr "工作区 %s 的 HEAD 指向没有被更新"
649900bc 1261
a0b6b246 1262#: bundle.c:34
649900bc 1263#, c-format
a0b6b246
JX
1264msgid "'%s' does not look like a v2 bundle file"
1265msgstr "'%s' 不像是一个 v2 版本的包文件"
649900bc 1266
a4f16749 1267#: bundle.c:62
a0b6b246
JX
1268#, c-format
1269msgid "unrecognized header: %s%s (%d)"
1270msgstr "未能识别的包头:%s%s (%d)"
649900bc 1271
5809aa05
JX
1272#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
1273#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
649900bc 1274#, c-format
a0b6b246
JX
1275msgid "could not open '%s'"
1276msgstr "不能打开 '%s'"
649900bc 1277
a4f16749 1278#: bundle.c:140
a0b6b246
JX
1279msgid "Repository lacks these prerequisite commits:"
1280msgstr "仓库中缺少这些必备的提交:"
649900bc 1281
6937cb4e 1282#: bundle.c:193
2e8451e8 1283#, c-format
a0b6b246
JX
1284msgid "The bundle contains this ref:"
1285msgid_plural "The bundle contains these %d refs:"
1286msgstr[0] "这个包中含有这个引用:"
1287msgstr[1] "这个包中含有 %d 个引用:"
2e8451e8 1288
6937cb4e 1289#: bundle.c:200
a0b6b246
JX
1290msgid "The bundle records a complete history."
1291msgstr "这个包记录一个完整历史。"
2e8451e8 1292
6937cb4e 1293#: bundle.c:202
2e8451e8 1294#, c-format
a0b6b246
JX
1295msgid "The bundle requires this ref:"
1296msgid_plural "The bundle requires these %d refs:"
1297msgstr[0] "这个包需要这个引用:"
1298msgstr[1] "这个包需要 %d 个引用:"
2e8451e8 1299
6937cb4e 1300#: bundle.c:261
a0b6b246
JX
1301msgid "Could not spawn pack-objects"
1302msgstr "不能生成 pack-objects 进程"
1003b3a5 1303
6937cb4e 1304#: bundle.c:272
a0b6b246
JX
1305msgid "pack-objects died"
1306msgstr "pack-objects 终止"
8ada9598 1307
6937cb4e 1308#: bundle.c:314
a0b6b246
JX
1309msgid "rev-list died"
1310msgstr "rev-list 终止"
1311
6937cb4e 1312#: bundle.c:363
81809b99 1313#, c-format
a0b6b246
JX
1314msgid "ref '%s' is excluded by the rev-list options"
1315msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 1316
5809aa05 1317#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
81809b99 1318#, c-format
a0b6b246
JX
1319msgid "unrecognized argument: %s"
1320msgstr "未能识别的参数:%s"
8ada9598 1321
6937cb4e 1322#: bundle.c:461
a0b6b246
JX
1323msgid "Refusing to create empty bundle."
1324msgstr "不能创建空包。"
1325
6937cb4e 1326#: bundle.c:473
81809b99 1327#, c-format
a0b6b246
JX
1328msgid "cannot create '%s'"
1329msgstr "不能创建 '%s'"
8ada9598 1330
6937cb4e 1331#: bundle.c:501
a0b6b246
JX
1332msgid "index-pack died"
1333msgstr "index-pack 终止"
63af42fe 1334
a4f16749 1335#: color.c:301
94550ed3 1336#, c-format
a0b6b246
JX
1337msgid "invalid color value: %.*s"
1338msgstr "无效的颜色值:%.*s"
94550ed3 1339
5809aa05
JX
1340#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
1341#: builtin/am.c:1434 builtin/am.c:2069
94550ed3 1342#, c-format
a0b6b246
JX
1343msgid "could not parse %s"
1344msgstr "不能解析 %s"
94550ed3 1345
a4f16749 1346#: commit.c:43
a0b6b246
JX
1347#, c-format
1348msgid "%s %s is not a commit!"
1349msgstr "%s %s 不是一个提交!"
90314792 1350
5809aa05 1351#: commit.c:1524
90314792 1352msgid ""
a0b6b246
JX
1353"Warning: commit message did not conform to UTF-8.\n"
1354"You may want to amend it after fixing the message, or set the config\n"
1355"variable i18n.commitencoding to the encoding your project uses.\n"
1356msgstr ""
29004bbb 1357"警告:提交说明不符合 UTF-8 字符编码。\n"
a0b6b246 1358"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
29004bbb 1359"设置为您项目所用的字符编码。\n"
90314792 1360
5809aa05 1361#: compat/obstack.c:405 compat/obstack.c:407
a0b6b246
JX
1362msgid "memory exhausted"
1363msgstr "内存耗尽"
90314792 1364
5809aa05 1365#: config.c:186
87cb7997
JX
1366msgid "relative config include conditionals must come from files"
1367msgstr "包含相对路径的条件引用必须来自于文件"
1368
5809aa05 1369#: config.c:720
90314792 1370#, c-format
a0b6b246
JX
1371msgid "bad config line %d in blob %s"
1372msgstr "数据对象 %2$s 中错误的配置行 %1$d"
90314792 1373
5809aa05 1374#: config.c:724
a77c07d9 1375#, c-format
a0b6b246
JX
1376msgid "bad config line %d in file %s"
1377msgstr "文件 %2$s 中错误的配置行 %1$d"
a77c07d9 1378
5809aa05 1379#: config.c:728
a77c07d9 1380#, c-format
a0b6b246
JX
1381msgid "bad config line %d in standard input"
1382msgstr "标准输入中错误的配置行 %d"
a77c07d9 1383
5809aa05 1384#: config.c:732
90314792 1385#, c-format
a0b6b246
JX
1386msgid "bad config line %d in submodule-blob %s"
1387msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
90314792 1388
5809aa05 1389#: config.c:736
90314792 1390#, c-format
a0b6b246
JX
1391msgid "bad config line %d in command line %s"
1392msgstr "命令行 %2$s 中错误的配置行 %1$d"
90314792 1393
5809aa05 1394#: config.c:740
90314792 1395#, c-format
a0b6b246
JX
1396msgid "bad config line %d in %s"
1397msgstr "在 %2$s 中错误的配置行 %1$d"
220c313c 1398
5809aa05 1399#: config.c:868
a0b6b246
JX
1400msgid "out of range"
1401msgstr "超出范围"
6c94aba5 1402
5809aa05 1403#: config.c:868
a0b6b246
JX
1404msgid "invalid unit"
1405msgstr "无效的单位"
6c94aba5 1406
5809aa05 1407#: config.c:874
6c94aba5 1408#, c-format
a0b6b246
JX
1409msgid "bad numeric config value '%s' for '%s': %s"
1410msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
6c94aba5 1411
5809aa05 1412#: config.c:879
1b7f4a34 1413#, c-format
a0b6b246
JX
1414msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
1415msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 1416
5809aa05 1417#: config.c:882
1b7f4a34 1418#, c-format
a0b6b246
JX
1419msgid "bad numeric config value '%s' for '%s' in file %s: %s"
1420msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 1421
5809aa05 1422#: config.c:885
1b7f4a34 1423#, c-format
a0b6b246
JX
1424msgid "bad numeric config value '%s' for '%s' in standard input: %s"
1425msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
1b7f4a34 1426
5809aa05 1427#: config.c:888
1b7f4a34 1428#, c-format
a0b6b246
JX
1429msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
1430msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 1431
5809aa05 1432#: config.c:891
94550ed3 1433#, c-format
a0b6b246
JX
1434msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
1435msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 1436
5809aa05 1437#: config.c:894
276ceeaa 1438#, c-format
a0b6b246
JX
1439msgid "bad numeric config value '%s' for '%s' in %s: %s"
1440msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 1441
5809aa05 1442#: config.c:989
276ceeaa 1443#, c-format
a0b6b246
JX
1444msgid "failed to expand user dir in: '%s'"
1445msgstr "无法扩展 '%s' 中的用户目录"
94550ed3 1446
5809aa05
JX
1447#: config.c:998
1448#, c-format
1449msgid "'%s' for '%s' is not a valid timestamp"
1450msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
1451
1452#: config.c:1094 config.c:1105
3495628d 1453#, c-format
a0b6b246
JX
1454msgid "bad zlib compression level %d"
1455msgstr "错误的 zlib 压缩级别 %d"
3495628d 1456
5809aa05 1457#: config.c:1222
3495628d 1458#, c-format
a0b6b246
JX
1459msgid "invalid mode for object creation: %s"
1460msgstr "无效的对象创建模式:%s"
3495628d 1461
5809aa05 1462#: config.c:1378
1a79b2f1
JX
1463#, c-format
1464msgid "bad pack compression level %d"
1465msgstr "错误的打包压缩级别 %d"
1466
5809aa05 1467#: config.c:1574
a0b6b246
JX
1468msgid "unable to parse command-line config"
1469msgstr "无法解析命令行中的配置"
94550ed3 1470
5809aa05 1471#: config.c:1906
a0b6b246
JX
1472msgid "unknown error occurred while reading the configuration files"
1473msgstr "在读取配置文件时遇到未知错误"
94550ed3 1474
5809aa05 1475#: config.c:2093
87cb7997
JX
1476#, c-format
1477msgid "Invalid %s: '%s'"
1478msgstr "无效 %s:'%s'"
1479
5809aa05 1480#: config.c:2136
87cb7997
JX
1481#, c-format
1482msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
1483msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'"
1484
5809aa05 1485#: config.c:2162
87cb7997
JX
1486#, c-format
1487msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
1488msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
1489
5809aa05 1490#: config.c:2187
276ceeaa 1491#, c-format
a0b6b246
JX
1492msgid "unable to parse '%s' from command-line config"
1493msgstr "无法解析命令行配置中的 '%s'"
1b7f4a34 1494
5809aa05 1495#: config.c:2189
94550ed3 1496#, c-format
a0b6b246
JX
1497msgid "bad config variable '%s' in file '%s' at line %d"
1498msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
94550ed3 1499
5809aa05 1500#: config.c:2248
276ceeaa 1501#, c-format
a0b6b246
JX
1502msgid "%s has multiple values"
1503msgstr "%s 有多个取值"
276ceeaa 1504
5809aa05 1505#: config.c:2591 config.c:2808
1a79b2f1
JX
1506#, c-format
1507msgid "fstat on %s failed"
65e2041e 1508msgstr "对 %s 调用 fstat 失败"
1a79b2f1 1509
5809aa05 1510#: config.c:2698
94550ed3 1511#, c-format
a0b6b246
JX
1512msgid "could not set '%s' to '%s'"
1513msgstr "不能设置 '%s' 为 '%s'"
94550ed3 1514
5809aa05 1515#: config.c:2700 builtin/remote.c:776
276ceeaa 1516#, c-format
a0b6b246
JX
1517msgid "could not unset '%s'"
1518msgstr "不能取消设置 '%s'"
276ceeaa 1519
5809aa05 1520#: connect.c:52
a0b6b246 1521msgid "The remote end hung up upon initial contact"
29004bbb 1522msgstr "远端在连接发起时即挂断"
94550ed3 1523
5809aa05 1524#: connect.c:54
a0b6b246
JX
1525msgid ""
1526"Could not read from remote repository.\n"
1527"\n"
1528"Please make sure you have the correct access rights\n"
1529"and the repository exists."
1530msgstr ""
1531"无法读取远程仓库。\n"
1532"\n"
1533"请确认您有正确的访问权限并且仓库存在。"
1534
6937cb4e 1535#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
a0b6b246
JX
1536msgid "Checking connectivity"
1537msgstr "检查连接中"
1538
6937cb4e 1539#: connected.c:76
a0b6b246
JX
1540msgid "Could not run 'git rev-list'"
1541msgstr "不能执行 'git rev-list'"
1542
6937cb4e 1543#: connected.c:96
a0b6b246
JX
1544msgid "failed write to rev-list"
1545msgstr "无法写入 rev-list"
1546
6937cb4e 1547#: connected.c:103
a0b6b246
JX
1548msgid "failed to close rev-list's stdin"
1549msgstr "无法关闭 rev-list 的标准输入"
1550
a4f16749 1551#: convert.c:205
3495628d 1552#, c-format
a0b6b246
JX
1553msgid ""
1554"CRLF will be replaced by LF in %s.\n"
1555"The file will have its original line endings in your working directory."
1556msgstr ""
1557"文件 %s 中的 CRLF 将被 LF 替换。\n"
1558"在工作区中该文件仍保持原有的换行符。"
3495628d 1559
a4f16749 1560#: convert.c:209
3495628d 1561#, c-format
a0b6b246
JX
1562msgid "CRLF would be replaced by LF in %s."
1563msgstr "文件 %s 中的 CRLF 将被 LF 替换。"
3495628d 1564
a4f16749 1565#: convert.c:215
276ceeaa 1566#, c-format
a0b6b246
JX
1567msgid ""
1568"LF will be replaced by CRLF in %s.\n"
1569"The file will have its original line endings in your working directory."
1570msgstr ""
1571"文件 %s 中的 LF 将被 CRLF 替换。\n"
1572"在工作区中该文件仍保持原有的换行符。"
276ceeaa 1573
a4f16749 1574#: convert.c:219
3495628d 1575#, c-format
a0b6b246
JX
1576msgid "LF would be replaced by CRLF in %s"
1577msgstr "文件 %s 中的 LF 将被 CRLF 替换"
3495628d 1578
a4f16749 1579#: date.c:116
a0b6b246
JX
1580msgid "in the future"
1581msgstr "在将来"
3495628d 1582
a4f16749 1583#: date.c:122
3495628d 1584#, c-format
a4f16749
JX
1585msgid "%<PRIuMAX> second ago"
1586msgid_plural "%<PRIuMAX> seconds ago"
1587msgstr[0] "%<PRIuMAX> 秒钟前"
1588msgstr[1] "%<PRIuMAX> 秒钟前"
3495628d 1589
a4f16749 1590#: date.c:129
3495628d 1591#, c-format
a4f16749
JX
1592msgid "%<PRIuMAX> minute ago"
1593msgid_plural "%<PRIuMAX> minutes ago"
1594msgstr[0] "%<PRIuMAX> 分钟前"
1595msgstr[1] "%<PRIuMAX> 分钟前"
3495628d 1596
a4f16749 1597#: date.c:136
3495628d 1598#, c-format
a4f16749
JX
1599msgid "%<PRIuMAX> hour ago"
1600msgid_plural "%<PRIuMAX> hours ago"
1601msgstr[0] "%<PRIuMAX> 小时前"
1602msgstr[1] "%<PRIuMAX> 小时前"
3495628d 1603
a4f16749 1604#: date.c:143
3495628d 1605#, c-format
a4f16749
JX
1606msgid "%<PRIuMAX> day ago"
1607msgid_plural "%<PRIuMAX> days ago"
1608msgstr[0] "%<PRIuMAX> 天前"
1609msgstr[1] "%<PRIuMAX> 天前"
3495628d 1610
a4f16749 1611#: date.c:149
94550ed3 1612#, c-format
a4f16749
JX
1613msgid "%<PRIuMAX> week ago"
1614msgid_plural "%<PRIuMAX> weeks ago"
1615msgstr[0] "%<PRIuMAX> 周前"
1616msgstr[1] "%<PRIuMAX> 周前"
94550ed3 1617
a4f16749 1618#: date.c:156
3495628d 1619#, c-format
a4f16749
JX
1620msgid "%<PRIuMAX> month ago"
1621msgid_plural "%<PRIuMAX> months ago"
1622msgstr[0] "%<PRIuMAX> 个月前"
1623msgstr[1] "%<PRIuMAX> 个月前"
3495628d 1624
a4f16749 1625#: date.c:167
3495628d 1626#, c-format
a4f16749
JX
1627msgid "%<PRIuMAX> year"
1628msgid_plural "%<PRIuMAX> years"
1629msgstr[0] "%<PRIuMAX> 年"
1630msgstr[1] "%<PRIuMAX> 年"
3495628d 1631
a0b6b246 1632#. TRANSLATORS: "%s" is "<n> years"
a4f16749 1633#: date.c:170
94550ed3 1634#, c-format
a4f16749
JX
1635msgid "%s, %<PRIuMAX> month ago"
1636msgid_plural "%s, %<PRIuMAX> months ago"
1637msgstr[0] "%s %<PRIuMAX> 个月前"
1638msgstr[1] "%s %<PRIuMAX> 个月前"
94550ed3 1639
a4f16749 1640#: date.c:175 date.c:180
94550ed3 1641#, c-format
a4f16749
JX
1642msgid "%<PRIuMAX> year ago"
1643msgid_plural "%<PRIuMAX> years ago"
1644msgstr[0] "%<PRIuMAX> 年前"
1645msgstr[1] "%<PRIuMAX> 年前"
94550ed3 1646
a0b6b246 1647#: diffcore-order.c:24
cfff71a9 1648#, c-format
a0b6b246
JX
1649msgid "failed to read orderfile '%s'"
1650msgstr "无法读取排序文件 '%s'"
cfff71a9 1651
5809aa05 1652#: diffcore-rename.c:535
a0b6b246 1653msgid "Performing inexact rename detection"
87cb7997 1654msgstr "正在进行非精确的重命名探测"
cfff71a9 1655
6937cb4e 1656#: diff.c:74
cfff71a9 1657#, c-format
a0b6b246
JX
1658msgid "option '%s' requires a value"
1659msgstr "选项 '%s' 需要一个值"
cfff71a9 1660
a0b6b246 1661# 译者:注意保持前导空格
6937cb4e 1662#: diff.c:152
a0b6b246
JX
1663#, c-format
1664msgid " Failed to parse dirstat cut-off percentage '%s'\n"
1665msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
cfff71a9 1666
a0b6b246 1667# 译者:注意保持前导空格
6937cb4e 1668#: diff.c:157
a0b6b246
JX
1669#, c-format
1670msgid " Unknown dirstat parameter '%s'\n"
1671msgstr " 未知的 dirstat 参数 '%s'\n"
7aea43ff 1672
6937cb4e
JX
1673#: diff.c:281
1674msgid ""
1675"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
1676"'plain'"
5809aa05
JX
1677msgstr ""
1678"代码移动的颜色设置必须是 'no'、'default'、'zebra'、'dimmed_zebra' 或 'plain'"
6937cb4e
JX
1679
1680#: diff.c:341
7aea43ff 1681#, c-format
a0b6b246
JX
1682msgid "Unknown value for 'diff.submodule' config variable: '%s'"
1683msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
7aea43ff 1684
5809aa05 1685#: diff.c:401
7aea43ff 1686#, c-format
a0b6b246
JX
1687msgid ""
1688"Found errors in 'diff.dirstat' config variable:\n"
1689"%s"
1690msgstr ""
1691"发现配置变量 'diff.dirstat' 中的错误:\n"
1692"%s"
7aea43ff 1693
5809aa05 1694#: diff.c:3799
7aea43ff 1695#, c-format
a0b6b246
JX
1696msgid "external diff died, stopping at %s"
1697msgstr "外部 diff 退出,停止在 %s"
7aea43ff 1698
5809aa05 1699#: diff.c:4127
a0b6b246
JX
1700msgid "--name-only, --name-status, --check and -s are mutually exclusive"
1701msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
1702
5809aa05 1703#: diff.c:4215
a0b6b246
JX
1704msgid "--follow requires exactly one pathspec"
1705msgstr "--follow 明确要求只跟一个路径规格"
1706
5809aa05 1707#: diff.c:4381
7aea43ff 1708#, c-format
a0b6b246
JX
1709msgid ""
1710"Failed to parse --dirstat/-X option parameter:\n"
1711"%s"
1712msgstr ""
1713"无法解析 --dirstat/-X 选项的参数:\n"
1714"%s"
7aea43ff 1715
5809aa05 1716#: diff.c:4395
7aea43ff 1717#, c-format
a0b6b246
JX
1718msgid "Failed to parse --submodule option parameter: '%s'"
1719msgstr "无法解析 --submodule 选项的参数:'%s'"
7aea43ff 1720
5809aa05 1721#: diff.c:5446
a0b6b246
JX
1722msgid "inexact rename detection was skipped due to too many files."
1723msgstr "因为文件太多,略过不严格的重命名检查。"
1724
5809aa05 1725#: diff.c:5449
a0b6b246
JX
1726msgid "only found copies from modified paths due to too many files."
1727msgstr "因为文件太多,只在修改的路径中查找拷贝。"
1728
5809aa05 1729#: diff.c:5452
7aea43ff 1730#, c-format
a0b6b246
JX
1731msgid ""
1732"you may want to set your %s variable to at least %d and retry the command."
29004bbb 1733msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
7aea43ff 1734
5809aa05 1735#: dir.c:2100
a0b6b246
JX
1736msgid "failed to get kernel name and information"
1737msgstr "无法获得内核名称和信息"
7aea43ff 1738
5809aa05 1739#: dir.c:2219
a0b6b246
JX
1740msgid "Untracked cache is disabled on this system or location."
1741msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
7aea43ff 1742
5809aa05 1743#: dir.c:3002 dir.c:3007
87cb7997
JX
1744#, c-format
1745msgid "could not create directories for %s"
1746msgstr "不能为 %s 创建目录"
1747
5809aa05 1748#: dir.c:3032
1a79b2f1
JX
1749#, c-format
1750msgid "could not migrate git directory from '%s' to '%s'"
1751msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
1752
5809aa05
JX
1753#: editor.c:61
1754#, c-format
1755msgid "hint: Waiting for your editor to close the file...%c"
1756msgstr "提示:等待您的编辑器关闭文件...%c"
1757
1758#: entry.c:177
6937cb4e
JX
1759msgid "Filtering content"
1760msgstr "过滤内容"
1761
5809aa05 1762#: entry.c:435
87cb7997
JX
1763#, c-format
1764msgid "could not stat file '%s'"
65e2041e 1765msgstr "不能对文件 '%s' 调用 stat"
87cb7997 1766
6937cb4e 1767#: fetch-pack.c:252
a0b6b246
JX
1768msgid "git fetch-pack: expected shallow list"
1769msgstr "git fetch-pack:应为 shallow 列表"
1770
6937cb4e 1771#: fetch-pack.c:264
a0b6b246
JX
1772msgid "git fetch-pack: expected ACK/NAK, got EOF"
1773msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF"
1774
6937cb4e 1775#: fetch-pack.c:283 builtin/archive.c:63
60638e98
JX
1776#, c-format
1777msgid "remote error: %s"
1778msgstr "远程错误:%s"
1779
6937cb4e 1780#: fetch-pack.c:284
90314792 1781#, c-format
275588f9 1782msgid "git fetch-pack: expected ACK/NAK, got '%s'"
a0b6b246 1783msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
90314792 1784
6937cb4e 1785#: fetch-pack.c:336
a0b6b246
JX
1786msgid "--stateless-rpc requires multi_ack_detailed"
1787msgstr "--stateless-rpc 需要 multi_ack_detailed"
90314792 1788
6937cb4e 1789#: fetch-pack.c:422
90314792 1790#, c-format
a0b6b246
JX
1791msgid "invalid shallow line: %s"
1792msgstr "无效的 shallow 信息:%s"
90314792 1793
6937cb4e 1794#: fetch-pack.c:428
c04f5ac3 1795#, c-format
a0b6b246
JX
1796msgid "invalid unshallow line: %s"
1797msgstr "无效的 unshallow 信息:%s"
c04f5ac3 1798
6937cb4e 1799#: fetch-pack.c:430
a0b6b246
JX
1800#, c-format
1801msgid "object not found: %s"
1802msgstr "对象未找到:%s"
07432cef 1803
6937cb4e 1804#: fetch-pack.c:433
c04f5ac3 1805#, c-format
a0b6b246
JX
1806msgid "error in object: %s"
1807msgstr "对象中出错:%s"
07432cef 1808
6937cb4e 1809#: fetch-pack.c:435
c04f5ac3 1810#, c-format
a0b6b246
JX
1811msgid "no shallow found: %s"
1812msgstr "未发现 shallow:%s"
c04f5ac3 1813
6937cb4e 1814#: fetch-pack.c:438
a0b6b246
JX
1815#, c-format
1816msgid "expected shallow/unshallow, got %s"
1817msgstr "应为 shallow/unshallow,却得到 %s"
07432cef 1818
6937cb4e 1819#: fetch-pack.c:477
a0b6b246
JX
1820#, c-format
1821msgid "got %s %d %s"
1822msgstr "得到 %s %d %s"
1b7f4a34 1823
6937cb4e 1824#: fetch-pack.c:491
1b7f4a34 1825#, c-format
a0b6b246
JX
1826msgid "invalid commit %s"
1827msgstr "无效提交 %s"
1b7f4a34 1828
6937cb4e 1829#: fetch-pack.c:524
a0b6b246
JX
1830msgid "giving up"
1831msgstr "放弃"
814ff314 1832
5809aa05 1833#: fetch-pack.c:534 progress.c:229
a0b6b246
JX
1834msgid "done"
1835msgstr "完成"
2e8451e8 1836
6937cb4e 1837#: fetch-pack.c:546
2e8451e8 1838#, c-format
a0b6b246
JX
1839msgid "got %s (%d) %s"
1840msgstr "得到 %s (%d) %s"
2e8451e8 1841
6937cb4e 1842#: fetch-pack.c:592
a0b6b246
JX
1843#, c-format
1844msgid "Marking %s as complete"
1845msgstr "标记 %s 为完成"
220c313c 1846
5809aa05 1847#: fetch-pack.c:777
a0b6b246
JX
1848#, c-format
1849msgid "already have %s (%s)"
29004bbb 1850msgstr "已经有 %s(%s)"
220c313c 1851
5809aa05 1852#: fetch-pack.c:815
a0b6b246
JX
1853msgid "fetch-pack: unable to fork off sideband demultiplexer"
1854msgstr "fetch-pack:无法派生 sideband 多路输出"
1b7f4a34 1855
5809aa05 1856#: fetch-pack.c:823
a0b6b246
JX
1857msgid "protocol error: bad pack header"
1858msgstr "协议错误:坏的包头"
814ff314 1859
5809aa05 1860#: fetch-pack.c:879
a0b6b246
JX
1861#, c-format
1862msgid "fetch-pack: unable to fork off %s"
1863msgstr "fetch-pack:无法派生进程 %s"
5c57d762 1864
5809aa05 1865#: fetch-pack.c:895
a0b6b246
JX
1866#, c-format
1867msgid "%s failed"
1868msgstr "%s 失败"
14c8bced 1869
5809aa05 1870#: fetch-pack.c:897
a0b6b246
JX
1871msgid "error in sideband demultiplexer"
1872msgstr "sideband 多路输出出错"
c04f5ac3 1873
5809aa05 1874#: fetch-pack.c:924
a0b6b246
JX
1875msgid "Server does not support shallow clients"
1876msgstr "服务器不支持 shalllow 客户端"
c04f5ac3 1877
5809aa05 1878#: fetch-pack.c:928
a0b6b246
JX
1879msgid "Server supports multi_ack_detailed"
1880msgstr "服务器支持 multi_ack_detailed"
c04f5ac3 1881
5809aa05 1882#: fetch-pack.c:931
a0b6b246
JX
1883msgid "Server supports no-done"
1884msgstr "服务器支持 no-done"
c04f5ac3 1885
5809aa05 1886#: fetch-pack.c:937
a0b6b246
JX
1887msgid "Server supports multi_ack"
1888msgstr "服务器支持 multi_ack"
c04f5ac3 1889
5809aa05 1890#: fetch-pack.c:941
a0b6b246
JX
1891msgid "Server supports side-band-64k"
1892msgstr "服务器支持 side-band-64k"
c04f5ac3 1893
5809aa05 1894#: fetch-pack.c:945
a0b6b246
JX
1895msgid "Server supports side-band"
1896msgstr "服务器支持 side-band"
5c57d762 1897
5809aa05 1898#: fetch-pack.c:949
a0b6b246
JX
1899msgid "Server supports allow-tip-sha1-in-want"
1900msgstr "服务器支持 allow-tip-sha1-in-want"
c04f5ac3 1901
5809aa05 1902#: fetch-pack.c:953
a0b6b246
JX
1903msgid "Server supports allow-reachable-sha1-in-want"
1904msgstr "服务器支持 allow-reachable-sha1-in-want"
8ada9598 1905
5809aa05 1906#: fetch-pack.c:963
a0b6b246
JX
1907msgid "Server supports ofs-delta"
1908msgstr "服务器支持 ofs-delta"
8ada9598 1909
5809aa05 1910#: fetch-pack.c:970
81809b99 1911#, c-format
a0b6b246
JX
1912msgid "Server version is %.*s"
1913msgstr "服务器版本 %.*s"
8ada9598 1914
5809aa05 1915#: fetch-pack.c:976
a0b6b246
JX
1916msgid "Server does not support --shallow-since"
1917msgstr "服务器不支持 --shallow-since"
8ada9598 1918
5809aa05 1919#: fetch-pack.c:980
a0b6b246
JX
1920msgid "Server does not support --shallow-exclude"
1921msgstr "服务器不支持 --shallow-exclude"
c04f5ac3 1922
5809aa05 1923#: fetch-pack.c:982
a0b6b246
JX
1924msgid "Server does not support --deepen"
1925msgstr "服务器不支持 --deepen"
c04f5ac3 1926
5809aa05 1927#: fetch-pack.c:993
a0b6b246
JX
1928msgid "no common commits"
1929msgstr "没有共同的提交"
c04f5ac3 1930
5809aa05 1931#: fetch-pack.c:1005
a0b6b246
JX
1932msgid "git fetch-pack: fetch failed."
1933msgstr "git fetch-pack:获取失败。"
c04f5ac3 1934
5809aa05 1935#: fetch-pack.c:1167
a0b6b246
JX
1936msgid "no matching remote head"
1937msgstr "没有匹配的远程分支"
c04f5ac3 1938
5809aa05 1939#: fetch-pack.c:1189
87cb7997
JX
1940#, c-format
1941msgid "no such remote ref %s"
1942msgstr "没有这样的远程引用 %s"
1943
5809aa05 1944#: fetch-pack.c:1192
87cb7997
JX
1945#, c-format
1946msgid "Server does not allow request for unadvertised object %s"
1947msgstr "服务器不允许请求未公开的对象 %s"
1948
a4f16749 1949#: gpg-interface.c:181
a0b6b246
JX
1950msgid "gpg failed to sign the data"
1951msgstr "gpg 无法为数据签名"
c04f5ac3 1952
a4f16749 1953#: gpg-interface.c:211
a0b6b246
JX
1954msgid "could not create temporary file"
1955msgstr "不能创建临时文件"
c04f5ac3 1956
6937cb4e 1957#: gpg-interface.c:214
c04f5ac3 1958#, c-format
a0b6b246
JX
1959msgid "failed writing detached signature to '%s'"
1960msgstr "无法将分离式签名写入 '%s'"
c04f5ac3 1961
a4f16749 1962#: graph.c:97
1a79b2f1
JX
1963#, c-format
1964msgid "ignore invalid color '%.*s' in log.graphColors"
1965msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
1966
5809aa05 1967#: grep.c:2017
c04f5ac3 1968#, c-format
a0b6b246
JX
1969msgid "'%s': unable to read %s"
1970msgstr "'%s':无法读取 %s"
c04f5ac3 1971
5809aa05 1972#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
c04f5ac3 1973#, c-format
a0b6b246 1974msgid "failed to stat '%s'"
65e2041e 1975msgstr "对 '%s' 调用 stat 失败"
c04f5ac3 1976
5809aa05 1977#: grep.c:2045
a0b6b246
JX
1978#, c-format
1979msgid "'%s': short read"
1980msgstr "'%s':读取不完整"
5c57d762 1981
a4f16749 1982#: help.c:179
a0b6b246
JX
1983#, c-format
1984msgid "available git commands in '%s'"
1985msgstr "在 '%s' 下可用的 git 命令"
c04f5ac3 1986
a4f16749 1987#: help.c:186
a0b6b246
JX
1988msgid "git commands available from elsewhere on your $PATH"
1989msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
5c57d762 1990
a4f16749 1991#: help.c:217
a0b6b246
JX
1992msgid "These are common Git commands used in various situations:"
1993msgstr "这些是各种场合常见的 Git 命令:"
5c57d762 1994
a4f16749 1995#: help.c:281
c04f5ac3 1996#, c-format
a0b6b246
JX
1997msgid ""
1998"'%s' appears to be a git command, but we were not\n"
1999"able to execute it. Maybe git-%s is broken?"
2000msgstr ""
2001"'%s' 像是一个 git 命令,但却无法运行。\n"
2002"可能是 git-%s 受损?"
c04f5ac3 2003
a4f16749 2004#: help.c:336
a0b6b246
JX
2005msgid "Uh oh. Your system reports no Git commands at all."
2006msgstr "唉呀,您的系统中未发现 Git 命令。"
c04f5ac3 2007
a4f16749 2008#: help.c:358
c04f5ac3 2009#, c-format
a4f16749 2010msgid "WARNING: You called a Git command named '%s', which does not exist."
554e8501 2011msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。"
a4f16749
JX
2012
2013#: help.c:363
2014#, c-format
2015msgid "Continuing under the assumption that you meant '%s'."
554e8501 2016msgstr "假定你想要的是 '%s' 并继续。"
c04f5ac3 2017
a4f16749 2018#: help.c:368
c04f5ac3 2019#, c-format
a4f16749 2020msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
554e8501 2021msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。"
c04f5ac3 2022
a4f16749 2023#: help.c:376
c04f5ac3 2024#, c-format
a0b6b246
JX
2025msgid "git: '%s' is not a git command. See 'git --help'."
2026msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
c04f5ac3 2027
a4f16749
JX
2028#: help.c:380
2029msgid ""
2030"\n"
2031"The most similar command is"
2032msgid_plural ""
2033"\n"
2034"The most similar commands are"
6937cb4e
JX
2035msgstr[0] ""
2036"\n"
2037"最相似的命令是"
2038msgstr[1] ""
2039"\n"
2040"最相似的命令是"
a4f16749
JX
2041
2042#: help.c:395
2043msgid "git version [<options>]"
2044msgstr "git version [<选项>]"
2045
5809aa05 2046#: help.c:462
a4f16749
JX
2047#, c-format
2048msgid "%s: %s - %s"
2049msgstr "%s:%s - %s"
2050
5809aa05 2051#: help.c:466
a0b6b246
JX
2052msgid ""
2053"\n"
2054"Did you mean this?"
2055msgid_plural ""
2056"\n"
2057"Did you mean one of these?"
2058msgstr[0] ""
2059"\n"
2060"您指的是这个么?"
2061msgstr[1] ""
2062"\n"
2063"您指的是这其中的某一个么?"
c04f5ac3 2064
a4f16749 2065#: ident.c:342
a0b6b246
JX
2066msgid ""
2067"\n"
2068"*** Please tell me who you are.\n"
2069"\n"
2070"Run\n"
2071"\n"
2072" git config --global user.email \"you@example.com\"\n"
2073" git config --global user.name \"Your Name\"\n"
2074"\n"
2075"to set your account's default identity.\n"
2076"Omit --global to set the identity only in this repository.\n"
2077"\n"
2078msgstr ""
2079"\n"
2080"*** 请告诉我你是谁。\n"
2081"\n"
2082"运行\n"
2083"\n"
2084" git config --global user.email \"you@example.com\"\n"
2085" git config --global user.name \"Your Name\"\n"
2086"\n"
2087"来设置您账号的缺省身份标识。\n"
2088"如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
c04f5ac3 2089
a4f16749 2090#: ident.c:366
87cb7997 2091msgid "no email was given and auto-detection is disabled"
65e2041e 2092msgstr "未提供邮件地址且自动探测被禁用"
87cb7997 2093
a4f16749 2094#: ident.c:371
87cb7997
JX
2095#, c-format
2096msgid "unable to auto-detect email address (got '%s')"
2097msgstr "无法自动探测邮件地址(得到 '%s')"
2098
a4f16749 2099#: ident.c:381
87cb7997
JX
2100msgid "no name was given and auto-detection is disabled"
2101msgstr "未提供姓名且自动探测被禁用"
2102
a4f16749 2103#: ident.c:387
87cb7997
JX
2104#, c-format
2105msgid "unable to auto-detect name (got '%s')"
2106msgstr "无法自动探测姓名(得到 '%s')"
2107
a4f16749 2108#: ident.c:395
87cb7997
JX
2109#, c-format
2110msgid "empty ident name (for <%s>) not allowed"
2111msgstr "不允许空的姓名(对于 <%s>)"
2112
a4f16749 2113#: ident.c:401
87cb7997
JX
2114#, c-format
2115msgid "name consists only of disallowed characters: %s"
2116msgstr "姓名中仅包含禁用字符:%s"
2117
6937cb4e 2118#: ident.c:416 builtin/commit.c:616
87cb7997
JX
2119#, c-format
2120msgid "invalid date format: %s"
2121msgstr "无效的日期格式:%s"
2122
5809aa05
JX
2123#: list-objects-filter-options.c:30
2124msgid "multiple object filter types cannot be combined"
2125msgstr "不能混用多种对象过滤类型"
2126
2127#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
2128#, c-format
2129msgid "invalid filter-spec expression '%s'"
2130msgstr "无效的 filter-spec 表达式 '%s'"
2131
6937cb4e 2132#: lockfile.c:151
c04f5ac3 2133#, c-format
a0b6b246
JX
2134msgid ""
2135"Unable to create '%s.lock': %s.\n"
2136"\n"
2137"Another git process seems to be running in this repository, e.g.\n"
2138"an editor opened by 'git commit'. Please make sure all processes\n"
2139"are terminated then try again. If it still fails, a git process\n"
2140"may have crashed in this repository earlier:\n"
2141"remove the file manually to continue."
2142msgstr ""
2143"无法创建 '%s.lock':%s。\n"
2144"\n"
2145"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
2146"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
2147"可能之前有一个 git 进程在这个仓库中异常退出:\n"
2148"手动删除这个文件再继续。"
c04f5ac3 2149
6937cb4e 2150#: lockfile.c:159
a0b6b246
JX
2151#, c-format
2152msgid "Unable to create '%s.lock': %s"
2153msgstr "不能创建 '%s.lock':%s"
c04f5ac3 2154
5809aa05 2155#: merge.c:74
a0b6b246
JX
2156msgid "failed to read the cache"
2157msgstr "无法读取缓存"
c04f5ac3 2158
5809aa05
JX
2159#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
2160#: builtin/checkout.c:600 builtin/clone.c:754
a0b6b246
JX
2161msgid "unable to write new index file"
2162msgstr "无法写新的索引文件"
c04f5ac3 2163
6937cb4e 2164#: merge-recursive.c:235
a0b6b246
JX
2165msgid "(bad commit)\n"
2166msgstr "(坏提交)\n"
c04f5ac3 2167
6937cb4e 2168#: merge-recursive.c:257 merge-recursive.c:265
a0b6b246
JX
2169#, c-format
2170msgid "addinfo_cache failed for path '%s'"
2171msgstr "为路径 '%s' addinfo_cache 失败"
c04f5ac3 2172
6937cb4e 2173#: merge-recursive.c:329
a0b6b246
JX
2174msgid "error building trees"
2175msgstr "无法创建树"
c04f5ac3 2176
6937cb4e 2177#: merge-recursive.c:752
c04f5ac3 2178#, c-format
a0b6b246
JX
2179msgid "failed to create path '%s'%s"
2180msgstr "无法创建路径 '%s'%s"
c04f5ac3 2181
6937cb4e 2182#: merge-recursive.c:763
c04f5ac3 2183#, c-format
a0b6b246
JX
2184msgid "Removing %s to make room for subdirectory\n"
2185msgstr "删除 %s 以便为子目录留出空间\n"
c04f5ac3 2186
6937cb4e 2187#: merge-recursive.c:777 merge-recursive.c:796
a0b6b246
JX
2188msgid ": perhaps a D/F conflict?"
2189msgstr ":可能是一个目录/文件冲突?"
c04f5ac3 2190
6937cb4e 2191#: merge-recursive.c:786
c04f5ac3 2192#, c-format
a0b6b246
JX
2193msgid "refusing to lose untracked file at '%s'"
2194msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
c04f5ac3 2195
6937cb4e 2196#: merge-recursive.c:828 builtin/cat-file.c:37
c04f5ac3 2197#, c-format
a0b6b246
JX
2198msgid "cannot read object %s '%s'"
2199msgstr "不能读取对象 %s '%s'"
c04f5ac3 2200
6937cb4e 2201#: merge-recursive.c:830
4dcdc3d8 2202#, c-format
a0b6b246
JX
2203msgid "blob expected for %s '%s'"
2204msgstr "%s '%s' 应为数据对象"
4dcdc3d8 2205
6937cb4e 2206#: merge-recursive.c:854
4dcdc3d8 2207#, c-format
a0b6b246
JX
2208msgid "failed to open '%s': %s"
2209msgstr "无法打开 '%s':%s"
4dcdc3d8 2210
6937cb4e 2211#: merge-recursive.c:865
a0b6b246
JX
2212#, c-format
2213msgid "failed to symlink '%s': %s"
2214msgstr "无法创建符号链接 '%s':%s"
c04f5ac3 2215
6937cb4e 2216#: merge-recursive.c:870
5c57d762 2217#, c-format
a0b6b246
JX
2218msgid "do not know what to do with %06o %s '%s'"
2219msgstr "不知道如何处理 %06o %s '%s'"
5c57d762 2220
6937cb4e 2221#: merge-recursive.c:1010
a0b6b246
JX
2222msgid "Failed to execute internal merge"
2223msgstr "无法执行内部合并"
2224
6937cb4e 2225#: merge-recursive.c:1014
5c57d762 2226#, c-format
a0b6b246
JX
2227msgid "Unable to add %s to database"
2228msgstr "不能添加 %s 至对象库"
5c57d762 2229
6937cb4e 2230#: merge-recursive.c:1117
5c57d762
JX
2231#, c-format
2232msgid ""
a0b6b246
JX
2233"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2234"in tree."
5c57d762 2235msgstr ""
87cb7997
JX
2236"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
2237"本被保留。"
2238
6937cb4e 2239#: merge-recursive.c:1122
87cb7997
JX
2240#, c-format
2241msgid ""
2242"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
2243"left in tree."
2244msgstr ""
2245"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
2246"%7$s 版本被保留。"
c04f5ac3 2247
6937cb4e 2248#: merge-recursive.c:1129
7aea43ff 2249#, c-format
a0b6b246
JX
2250msgid ""
2251"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2252"in tree at %s."
2253msgstr ""
87cb7997
JX
2254"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
2255"本保留在 %8$s 中。"
7aea43ff 2256
6937cb4e 2257#: merge-recursive.c:1134
87cb7997
JX
2258#, c-format
2259msgid ""
2260"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
2261"left in tree at %s."
2262msgstr ""
2263"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
2264"%7$s 版本保留在 %9$s 中。"
2265
6937cb4e 2266#: merge-recursive.c:1168
a0b6b246
JX
2267msgid "rename"
2268msgstr "重命名"
5b04ee3b 2269
6937cb4e 2270#: merge-recursive.c:1168
a0b6b246
JX
2271msgid "renamed"
2272msgstr "重命名"
5b04ee3b 2273
6937cb4e 2274#: merge-recursive.c:1225
5c57d762 2275#, c-format
a0b6b246
JX
2276msgid "%s is a directory in %s adding as %s instead"
2277msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
5c57d762 2278
6937cb4e 2279#: merge-recursive.c:1250
5c57d762
JX
2280#, c-format
2281msgid ""
a0b6b246
JX
2282"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
2283"\"->\"%s\" in \"%s\"%s"
5c57d762 2284msgstr ""
a0b6b246
JX
2285"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
2286"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
5c57d762 2287
6937cb4e 2288#: merge-recursive.c:1255
a0b6b246
JX
2289msgid " (left unresolved)"
2290msgstr "(留下未解决)"
5c57d762 2291
6937cb4e 2292#: merge-recursive.c:1317
5c57d762 2293#, c-format
a0b6b246 2294msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
5c57d762 2295msgstr ""
a0b6b246
JX
2296"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
2297"%5$s"
3495628d 2298
6937cb4e 2299#: merge-recursive.c:1350
3495628d 2300#, c-format
a0b6b246
JX
2301msgid "Renaming %s to %s and %s to %s instead"
2302msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
3495628d 2303
6937cb4e 2304#: merge-recursive.c:1553
3495628d 2305#, c-format
a0b6b246
JX
2306msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
2307msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
2e8451e8 2308
6937cb4e 2309#: merge-recursive.c:1568
a0b6b246
JX
2310#, c-format
2311msgid "Adding merged %s"
2312msgstr "添加合并后的 %s"
90314792 2313
6937cb4e 2314#: merge-recursive.c:1575 merge-recursive.c:1805
90314792 2315#, c-format
a0b6b246
JX
2316msgid "Adding as %s instead"
2317msgstr "而是以 %s 为名添加"
90314792 2318
6937cb4e 2319#: merge-recursive.c:1632
90314792 2320#, c-format
a0b6b246
JX
2321msgid "cannot read object %s"
2322msgstr "不能读取对象 %s"
90314792 2323
6937cb4e 2324#: merge-recursive.c:1635
90314792 2325#, c-format
a0b6b246
JX
2326msgid "object %s is not a blob"
2327msgstr "对象 %s 不是一个数据对象"
90314792 2328
6937cb4e 2329#: merge-recursive.c:1704
a0b6b246
JX
2330msgid "modify"
2331msgstr "修改"
90314792 2332
6937cb4e 2333#: merge-recursive.c:1704
a0b6b246
JX
2334msgid "modified"
2335msgstr "修改"
5b04ee3b 2336
6937cb4e 2337#: merge-recursive.c:1714
a0b6b246
JX
2338msgid "content"
2339msgstr "内容"
5b04ee3b 2340
6937cb4e 2341#: merge-recursive.c:1721
a0b6b246
JX
2342msgid "add/add"
2343msgstr "添加/添加"
3495628d 2344
6937cb4e 2345#: merge-recursive.c:1757
220c313c 2346#, c-format
a0b6b246
JX
2347msgid "Skipped %s (merged same as existing)"
2348msgstr "略过 %s(已经做过相同合并)"
220c313c 2349
6937cb4e 2350#: merge-recursive.c:1771
220c313c 2351#, c-format
a0b6b246
JX
2352msgid "Auto-merging %s"
2353msgstr "自动合并 %s"
220c313c 2354
5809aa05 2355#: merge-recursive.c:1775 git-submodule.sh:932
a0b6b246
JX
2356msgid "submodule"
2357msgstr "子模组"
2358
6937cb4e 2359#: merge-recursive.c:1776
220c313c 2360#, c-format
a0b6b246
JX
2361msgid "CONFLICT (%s): Merge conflict in %s"
2362msgstr "冲突(%s):合并冲突于 %s"
220c313c 2363
6937cb4e 2364#: merge-recursive.c:1870
220c313c 2365#, c-format
a0b6b246
JX
2366msgid "Removing %s"
2367msgstr "删除 %s"
220c313c 2368
6937cb4e 2369#: merge-recursive.c:1896
a0b6b246
JX
2370msgid "file/directory"
2371msgstr "文件/目录"
220c313c 2372
6937cb4e 2373#: merge-recursive.c:1902
a0b6b246
JX
2374msgid "directory/file"
2375msgstr "目录/文件"
276ceeaa 2376
5809aa05 2377#: merge-recursive.c:1909
276ceeaa 2378#, c-format
a0b6b246
JX
2379msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
2380msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
276ceeaa 2381
5809aa05 2382#: merge-recursive.c:1918
276ceeaa 2383#, c-format
a0b6b246
JX
2384msgid "Adding %s"
2385msgstr "添加 %s"
276ceeaa 2386
5809aa05
JX
2387#: merge-recursive.c:1958
2388#, c-format
2389msgid "Dirty index: cannot merge (dirty: %s)"
2390msgstr "脏索引:不能合并(脏文件:%s)"
2391
2392#: merge-recursive.c:1962
6937cb4e 2393msgid "Already up to date!"
a0b6b246 2394msgstr "已经是最新的!"
276ceeaa 2395
5809aa05 2396#: merge-recursive.c:1971
276ceeaa 2397#, c-format
a0b6b246
JX
2398msgid "merging of trees %s and %s failed"
2399msgstr "无法合并树 %s 和 %s"
276ceeaa 2400
5809aa05 2401#: merge-recursive.c:2068
a0b6b246
JX
2402msgid "Merging:"
2403msgstr "合并:"
5c57d762 2404
5809aa05 2405#: merge-recursive.c:2081
5c57d762 2406#, c-format
a0b6b246
JX
2407msgid "found %u common ancestor:"
2408msgid_plural "found %u common ancestors:"
2409msgstr[0] "发现 %u 个共同祖先:"
2410msgstr[1] "发现 %u 个共同祖先:"
2411
5809aa05 2412#: merge-recursive.c:2120
a0b6b246
JX
2413msgid "merge returned no commit"
2414msgstr "合并未返回提交"
2415
5809aa05 2416#: merge-recursive.c:2183
5c57d762 2417#, c-format
a0b6b246
JX
2418msgid "Could not parse object '%s'"
2419msgstr "不能解析对象 '%s'"
5c57d762 2420
5809aa05 2421#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
a0b6b246
JX
2422msgid "Unable to write index."
2423msgstr "不能写入索引。"
2424
6937cb4e 2425#: notes-merge.c:272
5c57d762
JX
2426#, c-format
2427msgid ""
a0b6b246
JX
2428"You have not concluded your previous notes merge (%s exists).\n"
2429"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
2430"commit/abort the previous merge before you start a new notes merge."
5c57d762 2431msgstr ""
29004bbb 2432"您的前一次注释合并尚未结束(存在 %s)。\n"
1a79b2f1
JX
2433"在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
2434"notes merge --abort' 来提交/终止前一次合并。"
5c57d762 2435
6937cb4e 2436#: notes-merge.c:279
a0b6b246
JX
2437#, c-format
2438msgid "You have not concluded your notes merge (%s exists)."
2439msgstr "您尚未结束注释合并(存在 %s)。"
2440
a4f16749 2441#: notes-utils.c:42
a0b6b246
JX
2442msgid "Cannot commit uninitialized/unreferenced notes tree"
2443msgstr "不能提交未初始化/未引用的注解树"
5c57d762 2444
a4f16749 2445#: notes-utils.c:101
1b7f4a34 2446#, c-format
a0b6b246
JX
2447msgid "Bad notes.rewriteMode value: '%s'"
2448msgstr "坏的 notes.rewriteMode 值:'%s'"
1b7f4a34 2449
a4f16749 2450#: notes-utils.c:111
5b04ee3b 2451#, c-format
a0b6b246
JX
2452msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
2453msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
5b04ee3b 2454
a4f16749
JX
2455#. TRANSLATORS: The first %s is the name of
2456#. the environment variable, the second %s is
2457#. its value.
2458#.
2459#: notes-utils.c:141
5b04ee3b 2460#, c-format
a0b6b246
JX
2461msgid "Bad %s value: '%s'"
2462msgstr "坏的 %s 值:'%s'"
5b04ee3b 2463
6937cb4e 2464#: object.c:239
5b04ee3b 2465#, c-format
a0b6b246
JX
2466msgid "unable to parse object: %s"
2467msgstr "不能解析对象:%s"
5b04ee3b 2468
6937cb4e
JX
2469#: packfile.c:556
2470msgid "offset before end of packfile (broken .idx?)"
2471msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
2472
2473#: packfile.c:1683
2474#, c-format
2475msgid "offset before start of pack index for %s (corrupt index?)"
2476msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
2477
2478#: packfile.c:1687
2479#, c-format
2480msgid "offset beyond end of pack index for %s (truncated index?)"
2481msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
2482
a4f16749 2483#: parse-options.c:573
a0b6b246
JX
2484msgid "..."
2485msgstr "..."
2486
6937cb4e 2487#: parse-options.c:592
5b04ee3b 2488#, c-format
a0b6b246
JX
2489msgid "usage: %s"
2490msgstr "用法:%s"
5b04ee3b 2491
a0b6b246 2492#. TRANSLATORS: the colon here should align with the
a4f16749
JX
2493#. one in "usage: %s" translation.
2494#.
6937cb4e 2495#: parse-options.c:598
5b04ee3b 2496#, c-format
a0b6b246
JX
2497msgid " or: %s"
2498msgstr " 或:%s"
5b04ee3b 2499
a0b6b246 2500# 译者:为保证在输出中对齐,注意调整句中空格!
6937cb4e 2501#: parse-options.c:601
5b04ee3b 2502#, c-format
a0b6b246
JX
2503msgid " %s"
2504msgstr " %s"
5b04ee3b 2505
6937cb4e 2506#: parse-options.c:640
a0b6b246
JX
2507msgid "-NUM"
2508msgstr "-数字"
2509
2510#: parse-options-cb.c:108
5b04ee3b 2511#, c-format
a0b6b246
JX
2512msgid "malformed object name '%s'"
2513msgstr "非法的对象名 '%s'"
5b04ee3b 2514
6937cb4e 2515#: path.c:891
5b04ee3b 2516#, c-format
a0b6b246
JX
2517msgid "Could not make %s writable by group"
2518msgstr "不能设置 %s 为组可写"
2519
a4f16749 2520#: pathspec.c:129
87cb7997
JX
2521msgid "Escape character '\\' not allowed as last character in attr value"
2522msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
2523
a4f16749 2524#: pathspec.c:147
87cb7997
JX
2525msgid "Only one 'attr:' specification is allowed."
2526msgstr "只允许一个 'attr:' 规格。"
2527
a4f16749 2528#: pathspec.c:150
87cb7997
JX
2529msgid "attr spec must not be empty"
2530msgstr "属性规格不能为空"
2531
a4f16749 2532#: pathspec.c:193
87cb7997
JX
2533#, c-format
2534msgid "invalid attribute name %s"
2535msgstr "无效的属性名 %s"
2536
a4f16749 2537#: pathspec.c:258
a0b6b246
JX
2538msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
2539msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
2540
a4f16749 2541#: pathspec.c:265
5b04ee3b 2542msgid ""
a0b6b246
JX
2543"global 'literal' pathspec setting is incompatible with all other global "
2544"pathspec settings"
2545msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
5b04ee3b 2546
a4f16749 2547#: pathspec.c:305
a0b6b246
JX
2548msgid "invalid parameter for pathspec magic 'prefix'"
2549msgstr "路径规格包含无效的神奇前缀"
2550
a4f16749 2551#: pathspec.c:326
5b04ee3b 2552#, c-format
a0b6b246
JX
2553msgid "Invalid pathspec magic '%.*s' in '%s'"
2554msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
5b04ee3b 2555
a4f16749 2556#: pathspec.c:331
5b04ee3b 2557#, c-format
a0b6b246
JX
2558msgid "Missing ')' at the end of pathspec magic in '%s'"
2559msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
5b04ee3b 2560
a4f16749 2561#: pathspec.c:369
5b04ee3b 2562#, c-format
a0b6b246
JX
2563msgid "Unimplemented pathspec magic '%c' in '%s'"
2564msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
5b04ee3b 2565
a4f16749 2566#: pathspec.c:428
5b04ee3b 2567#, c-format
a0b6b246
JX
2568msgid "%s: 'literal' and 'glob' are incompatible"
2569msgstr "%s:'literal' 和 'glob' 不兼容"
5b04ee3b 2570
a4f16749 2571#: pathspec.c:441
5b04ee3b 2572#, c-format
a0b6b246
JX
2573msgid "%s: '%s' is outside repository"
2574msgstr "%s:'%s' 在仓库之外"
5b04ee3b 2575
a4f16749 2576#: pathspec.c:515
5b04ee3b 2577#, c-format
1a79b2f1
JX
2578msgid "'%s' (mnemonic: '%c')"
2579msgstr "'%s'(助记符:'%c')"
5b04ee3b 2580
a4f16749 2581#: pathspec.c:525
5b04ee3b 2582#, c-format
a0b6b246
JX
2583msgid "%s: pathspec magic not supported by this command: %s"
2584msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
2585
5809aa05 2586#: pathspec.c:592
5b04ee3b 2587#, c-format
a0b6b246
JX
2588msgid "pathspec '%s' is beyond a symbolic link"
2589msgstr "路径规格 '%s' 位于符号链接中"
2590
6937cb4e 2591#: pretty.c:962
a0b6b246
JX
2592msgid "unable to parse --pretty format"
2593msgstr "不能解析 --pretty 格式"
2594
5809aa05 2595#: read-cache.c:1472
5b04ee3b
JX
2596#, c-format
2597msgid ""
a0b6b246
JX
2598"index.version set, but the value is invalid.\n"
2599"Using version %i"
5b04ee3b 2600msgstr ""
a0b6b246
JX
2601"设置了 index.version,但是取值无效。\n"
2602"使用版本 %i"
5b04ee3b 2603
5809aa05 2604#: read-cache.c:1482
5b04ee3b
JX
2605#, c-format
2606msgid ""
a0b6b246
JX
2607"GIT_INDEX_VERSION set, but the value is invalid.\n"
2608"Using version %i"
5b04ee3b 2609msgstr ""
a0b6b246
JX
2610"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
2611"使用版本 %i"
5b04ee3b 2612
5809aa05 2613#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
a4f16749
JX
2614#, c-format
2615msgid "could not close '%s'"
2616msgstr "不能关闭 '%s'"
2617
5809aa05 2618#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
87cb7997 2619#, c-format
60638e98 2620msgid "could not stat '%s'"
65e2041e 2621msgstr "不能对 '%s' 调用 stat"
87cb7997 2622
5809aa05 2623#: read-cache.c:2455
87cb7997
JX
2624#, c-format
2625msgid "unable to open git dir: %s"
2626msgstr "不能打开 git 目录:%s"
2627
5809aa05 2628#: read-cache.c:2467
87cb7997
JX
2629#, c-format
2630msgid "unable to unlink: %s"
2631msgstr "无法删除:%s"
2632
5809aa05 2633#: refs.c:706
5b04ee3b 2634#, c-format
a0b6b246
JX
2635msgid "Could not open '%s' for writing"
2636msgstr "无法打开 '%s' 进行写入"
5b04ee3b 2637
5809aa05 2638#: refs.c:1850
60638e98
JX
2639msgid "ref updates forbidden inside quarantine environment"
2640msgstr "在隔离环境中禁止更新引用"
2641
5809aa05 2642#: refs/files-backend.c:1189
6937cb4e
JX
2643#, c-format
2644msgid "could not remove reference %s"
2645msgstr "无法删除引用 %s"
2646
5809aa05
JX
2647#: refs/files-backend.c:1203 refs/packed-backend.c:1524
2648#: refs/packed-backend.c:1534
5b04ee3b 2649#, c-format
a0b6b246
JX
2650msgid "could not delete reference %s: %s"
2651msgstr "无法删除引用 %s:%s"
5b04ee3b 2652
5809aa05 2653#: refs/files-backend.c:1206 refs/packed-backend.c:1537
5b04ee3b 2654#, c-format
a0b6b246
JX
2655msgid "could not delete references: %s"
2656msgstr "无法删除引用:%s"
5b04ee3b 2657
5809aa05 2658#: ref-filter.c:35 wt-status.c:1816
87cb7997
JX
2659msgid "gone"
2660msgstr "丢失"
2661
2662#: ref-filter.c:36
2663#, c-format
2664msgid "ahead %d"
2665msgstr "领先 %d"
2666
2667#: ref-filter.c:37
2668#, c-format
2669msgid "behind %d"
2670msgstr "落后 %d"
2671
2672#: ref-filter.c:38
2673#, c-format
2674msgid "ahead %d, behind %d"
2675msgstr "领先 %d,落后 %d"
2676
5809aa05 2677#: ref-filter.c:107
5b04ee3b 2678#, c-format
a0b6b246 2679msgid "expected format: %%(color:<color>)"
58b6f078 2680msgstr "期望的格式:%%(color:<颜色>)"
5b04ee3b 2681
5809aa05 2682#: ref-filter.c:109
5b04ee3b 2683#, c-format
a0b6b246
JX
2684msgid "unrecognized color: %%(color:%s)"
2685msgstr "未能识别的颜色:%%(color:%s)"
6c94aba5 2686
5809aa05 2687#: ref-filter.c:129
a0b6b246 2688#, c-format
87cb7997
JX
2689msgid "Integer value expected refname:lstrip=%s"
2690msgstr "期望整数值 refname:lstrip=%s"
90314792 2691
5809aa05 2692#: ref-filter.c:133
87cb7997
JX
2693#, c-format
2694msgid "Integer value expected refname:rstrip=%s"
2695msgstr "期望整数值 refname:rstrip=%s"
2696
5809aa05 2697#: ref-filter.c:135
87cb7997
JX
2698#, c-format
2699msgid "unrecognized %%(%s) argument: %s"
2700msgstr "未能识别的 %%(%s) 参数:%s"
2701
5809aa05 2702#: ref-filter.c:184
90314792 2703#, c-format
a0b6b246
JX
2704msgid "%%(body) does not take arguments"
2705msgstr "%%(body) 不带参数"
90314792 2706
5809aa05 2707#: ref-filter.c:191
a0b6b246
JX
2708#, c-format
2709msgid "%%(subject) does not take arguments"
2710msgstr "%%(subject) 不带参数"
90314792 2711
5809aa05 2712#: ref-filter.c:209
1a79b2f1 2713#, c-format
6937cb4e
JX
2714msgid "unknown %%(trailers) argument: %s"
2715msgstr "未知的 %%(trailers) 参数:%s"
1a79b2f1 2716
5809aa05 2717#: ref-filter.c:232
a0b6b246
JX
2718#, c-format
2719msgid "positive value expected contents:lines=%s"
87cb7997 2720msgstr "期望一个正数 contents:lines=%s"
90314792 2721
5809aa05 2722#: ref-filter.c:234
a0b6b246
JX
2723#, c-format
2724msgid "unrecognized %%(contents) argument: %s"
2725msgstr "未能识别的 %%(contents) 参数:%s"
90314792 2726
5809aa05 2727#: ref-filter.c:247
87cb7997
JX
2728#, c-format
2729msgid "positive value expected objectname:short=%s"
2730msgstr "期望一个正数 objectname:short=%s"
2731
5809aa05 2732#: ref-filter.c:251
a0b6b246
JX
2733#, c-format
2734msgid "unrecognized %%(objectname) argument: %s"
2735msgstr "未能识别的 %%(objectname) 参数:%s"
90314792 2736
5809aa05 2737#: ref-filter.c:278
a0b6b246
JX
2738#, c-format
2739msgid "expected format: %%(align:<width>,<position>)"
58b6f078 2740msgstr "期望的格式:%%(align:<宽度>,<位置>)"
90314792 2741
5809aa05 2742#: ref-filter.c:290
5c57d762 2743#, c-format
a0b6b246
JX
2744msgid "unrecognized position:%s"
2745msgstr "未能识别的位置:%s"
5c57d762 2746
5809aa05 2747#: ref-filter.c:294
1b7f4a34 2748#, c-format
a0b6b246
JX
2749msgid "unrecognized width:%s"
2750msgstr "未能识别的宽度:%s"
1b7f4a34 2751
5809aa05 2752#: ref-filter.c:300
1b7f4a34 2753#, c-format
a0b6b246
JX
2754msgid "unrecognized %%(align) argument: %s"
2755msgstr "未能识别的 %%(align) 参数:%s"
1b7f4a34 2756
5809aa05 2757#: ref-filter.c:304
1b7f4a34 2758#, c-format
a0b6b246
JX
2759msgid "positive width expected with the %%(align) atom"
2760msgstr "元素 %%(align) 需要一个正数的宽度"
1b7f4a34 2761
5809aa05 2762#: ref-filter.c:319
87cb7997
JX
2763#, c-format
2764msgid "unrecognized %%(if) argument: %s"
2765msgstr "未能识别的 %%(if) 参数:%s"
2766
5809aa05 2767#: ref-filter.c:409
07432cef 2768#, c-format
a0b6b246
JX
2769msgid "malformed field name: %.*s"
2770msgstr "非法的字段名:%.*s"
ef317cd5 2771
5809aa05 2772#: ref-filter.c:435
a0b6b246
JX
2773#, c-format
2774msgid "unknown field name: %.*s"
2775msgstr "未知的字段名:%.*s"
220c313c 2776
5809aa05 2777#: ref-filter.c:547
87cb7997
JX
2778#, c-format
2779msgid "format: %%(if) atom used without a %%(then) atom"
2780msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
2781
5809aa05 2782#: ref-filter.c:607
87cb7997
JX
2783#, c-format
2784msgid "format: %%(then) atom used without an %%(if) atom"
2785msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
2786
5809aa05 2787#: ref-filter.c:609
87cb7997
JX
2788#, c-format
2789msgid "format: %%(then) atom used more than once"
2790msgstr "格式:%%(then) 元素用了多次"
2791
5809aa05 2792#: ref-filter.c:611
87cb7997
JX
2793#, c-format
2794msgid "format: %%(then) atom used after %%(else)"
2795msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
2796
5809aa05 2797#: ref-filter.c:637
87cb7997
JX
2798#, c-format
2799msgid "format: %%(else) atom used without an %%(if) atom"
2800msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
2801
5809aa05 2802#: ref-filter.c:639
87cb7997
JX
2803#, c-format
2804msgid "format: %%(else) atom used without a %%(then) atom"
2805msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
2806
5809aa05 2807#: ref-filter.c:641
87cb7997
JX
2808#, c-format
2809msgid "format: %%(else) atom used more than once"
2810msgstr "格式:%%(else) 元素用了多次"
2811
5809aa05 2812#: ref-filter.c:654
7aea43ff 2813#, c-format
a0b6b246
JX
2814msgid "format: %%(end) atom used without corresponding atom"
2815msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
7aea43ff 2816
5809aa05 2817#: ref-filter.c:709
7aea43ff 2818#, c-format
a0b6b246
JX
2819msgid "malformed format string %s"
2820msgstr "非法的格式化字符串 %s"
7aea43ff 2821
5809aa05 2822#: ref-filter.c:1313
87cb7997
JX
2823#, c-format
2824msgid "(no branch, rebasing %s)"
2825msgstr "(非分支,正变基 %s)"
2826
5809aa05 2827#: ref-filter.c:1316
87cb7997
JX
2828#, c-format
2829msgid "(no branch, bisect started on %s)"
2830msgstr "(非分支,二分查找开始于 %s)"
c04f5ac3 2831
a4f16749
JX
2832#. TRANSLATORS: make sure this matches "HEAD
2833#. detached at " in wt-status.c
2834#.
5809aa05 2835#: ref-filter.c:1324
c04f5ac3 2836#, c-format
87cb7997
JX
2837msgid "(HEAD detached at %s)"
2838msgstr "(头指针分离于 %s)"
c04f5ac3 2839
a4f16749
JX
2840#. TRANSLATORS: make sure this matches "HEAD
2841#. detached from " in wt-status.c
2842#.
5809aa05 2843#: ref-filter.c:1331
a0b6b246 2844#, c-format
87cb7997
JX
2845msgid "(HEAD detached from %s)"
2846msgstr "(头指针分离自 %s)"
6792b93b 2847
5809aa05 2848#: ref-filter.c:1335
87cb7997
JX
2849msgid "(no branch)"
2850msgstr "(非分支)"
2851
5809aa05 2852#: ref-filter.c:1488 ref-filter.c:1519
a0b6b246
JX
2853#, c-format
2854msgid "missing object %s for %s"
2855msgstr "缺失 %2$s 的对象 %1$s"
c04f5ac3 2856
5809aa05 2857#: ref-filter.c:1491 ref-filter.c:1522
a0b6b246
JX
2858#, c-format
2859msgid "parse_object_buffer failed on %s for %s"
2860msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
6792b93b 2861
5809aa05 2862#: ref-filter.c:1822
a0b6b246
JX
2863#, c-format
2864msgid "malformed object at '%s'"
2865msgstr "非法的对象于 '%s'"
c04f5ac3 2866
5809aa05 2867#: ref-filter.c:1889
a0b6b246
JX
2868#, c-format
2869msgid "ignoring ref with broken name %s"
2870msgstr "忽略带有错误名称 %s 的引用"
c04f5ac3 2871
5809aa05 2872#: ref-filter.c:1894
a0b6b246
JX
2873#, c-format
2874msgid "ignoring broken ref %s"
2875msgstr "忽略损坏的引用 %s"
c04f5ac3 2876
5809aa05 2877#: ref-filter.c:2156
a0b6b246
JX
2878#, c-format
2879msgid "format: %%(end) atom missing"
2880msgstr "格式:缺少 %%(end) 元素"
c04f5ac3 2881
5809aa05 2882#: ref-filter.c:2250
a0b6b246
JX
2883#, c-format
2884msgid "malformed object name %s"
2885msgstr "非法的对象名 %s"
c04f5ac3 2886
5809aa05 2887#: remote.c:780
a0b6b246
JX
2888#, c-format
2889msgid "Cannot fetch both %s and %s to %s"
2890msgstr "不能同时获取 %s 和 %s 至 %s"
c04f5ac3 2891
5809aa05 2892#: remote.c:784
c04f5ac3 2893#, c-format
a0b6b246
JX
2894msgid "%s usually tracks %s, not %s"
2895msgstr "%s 通常跟踪 %s,而非 %s"
c04f5ac3 2896
5809aa05 2897#: remote.c:788
a0b6b246
JX
2898#, c-format
2899msgid "%s tracks both %s and %s"
2900msgstr "%s 同时跟踪 %s 和 %s"
c04f5ac3 2901
5809aa05 2902#: remote.c:796
a0b6b246
JX
2903msgid "Internal error"
2904msgstr "内部错误"
c04f5ac3 2905
5809aa05 2906#: remote.c:1711 remote.c:1813
a0b6b246
JX
2907msgid "HEAD does not point to a branch"
2908msgstr "HEAD 没有指向一个分支"
c04f5ac3 2909
5809aa05 2910#: remote.c:1720
a0b6b246
JX
2911#, c-format
2912msgid "no such branch: '%s'"
2913msgstr "没有此分支:'%s'"
c04f5ac3 2914
5809aa05 2915#: remote.c:1723
a0b6b246
JX
2916#, c-format
2917msgid "no upstream configured for branch '%s'"
2918msgstr "尚未给分支 '%s' 设置上游"
c04f5ac3 2919
5809aa05 2920#: remote.c:1729
a0b6b246
JX
2921#, c-format
2922msgid "upstream branch '%s' not stored as a remote-tracking branch"
2923msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
c04f5ac3 2924
5809aa05 2925#: remote.c:1744
a0b6b246
JX
2926#, c-format
2927msgid "push destination '%s' on remote '%s' has no local tracking branch"
2928msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
c04f5ac3 2929
5809aa05 2930#: remote.c:1756
a0b6b246
JX
2931#, c-format
2932msgid "branch '%s' has no remote for pushing"
2933msgstr "分支 '%s' 没有设置要推送的远程服务器"
cfff71a9 2934
5809aa05 2935#: remote.c:1767
a0b6b246
JX
2936#, c-format
2937msgid "push refspecs for '%s' do not include '%s'"
2938msgstr "向 '%s' 推送引用规格未包含 '%s'"
cfff71a9 2939
5809aa05 2940#: remote.c:1780
a0b6b246
JX
2941msgid "push has no destination (push.default is 'nothing')"
2942msgstr "推送无目标(push.default 是 'nothing')"
cfff71a9 2943
5809aa05 2944#: remote.c:1802
a0b6b246
JX
2945msgid "cannot resolve 'simple' push to a single destination"
2946msgstr "无法解析 'simple' 推送至一个单独的目标"
6c94aba5 2947
5809aa05 2948#: remote.c:2106
a0b6b246
JX
2949#, c-format
2950msgid "Your branch is based on '%s', but the upstream is gone.\n"
2951msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
6c94aba5 2952
5809aa05 2953#: remote.c:2110
a0b6b246
JX
2954msgid " (use \"git branch --unset-upstream\" to fixup)\n"
2955msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
6c94aba5 2956
5809aa05 2957#: remote.c:2113
a0b6b246 2958#, c-format
6937cb4e 2959msgid "Your branch is up to date with '%s'.\n"
a0b6b246 2960msgstr "您的分支与上游分支 '%s' 一致。\n"
cfff71a9 2961
5809aa05 2962#: remote.c:2117
a0b6b246
JX
2963#, c-format
2964msgid "Your branch is ahead of '%s' by %d commit.\n"
2965msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
2966msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
2967msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
cfff71a9 2968
5809aa05 2969#: remote.c:2123
a0b6b246
JX
2970msgid " (use \"git push\" to publish your local commits)\n"
2971msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
c04f5ac3 2972
5809aa05 2973#: remote.c:2126
a0b6b246
JX
2974#, c-format
2975msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
2976msgid_plural ""
2977"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
2978msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
2979msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 2980
a0b6b246 2981# 译者:注意保持前导空格
5809aa05 2982#: remote.c:2134
a0b6b246
JX
2983msgid " (use \"git pull\" to update your local branch)\n"
2984msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
c04f5ac3 2985
5809aa05 2986#: remote.c:2137
a0b6b246
JX
2987#, c-format
2988msgid ""
2989"Your branch and '%s' have diverged,\n"
2990"and have %d and %d different commit each, respectively.\n"
2991msgid_plural ""
2992"Your branch and '%s' have diverged,\n"
2993"and have %d and %d different commits each, respectively.\n"
2994msgstr[0] ""
2995"您的分支和 '%s' 出现了偏离,\n"
2996"并且分别有 %d 和 %d 处不同的提交。\n"
2997msgstr[1] ""
2998"您的分支和 '%s' 出现了偏离,\n"
2999"并且分别有 %d 和 %d 处不同的提交。\n"
90314792 3000
a0b6b246 3001# 译者:注意保持前导空格
5809aa05 3002#: remote.c:2147
a0b6b246
JX
3003msgid " (use \"git pull\" to merge the remote branch into yours)\n"
3004msgstr " (使用 \"git pull\" 来合并远程分支)\n"
90314792 3005
5809aa05 3006#: revision.c:2268
a0b6b246
JX
3007msgid "your current branch appears to be broken"
3008msgstr "您的当前分支好像被损坏"
cfff71a9 3009
5809aa05 3010#: revision.c:2271
a0b6b246
JX
3011#, c-format
3012msgid "your current branch '%s' does not have any commits yet"
3013msgstr "您的当前分支 '%s' 尚无任何提交"
6792b93b 3014
5809aa05 3015#: revision.c:2465
a0b6b246
JX
3016msgid "--first-parent is incompatible with --bisect"
3017msgstr "--first-parent 与 --bisect 不兼容"
6792b93b 3018
5809aa05 3019#: run-command.c:645
a0b6b246
JX
3020msgid "open /dev/null failed"
3021msgstr "不能打开 /dev/null"
5c57d762 3022
5809aa05
JX
3023#: run-command.c:1188
3024#, c-format
3025msgid ""
3026"The '%s' hook was ignored because it's not set as executable.\n"
3027"You can disable this warning with `git config advice.ignoredHook false`."
3028msgstr ""
3029"因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n"
3030"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
3031
3032#: send-pack.c:141
87cb7997
JX
3033#, c-format
3034msgid "unable to parse remote unpack status: %s"
3035msgstr "不能解析远程解包状态:%s"
3036
5809aa05 3037#: send-pack.c:143
87cb7997
JX
3038#, c-format
3039msgid "remote unpack failed: %s"
3040msgstr "远程解包失败:%s"
3041
5809aa05 3042#: send-pack.c:306
a0b6b246
JX
3043msgid "failed to sign the push certificate"
3044msgstr "无法为推送证书签名"
6792b93b 3045
5809aa05 3046#: send-pack.c:419
a0b6b246
JX
3047msgid "the receiving end does not support --signed push"
3048msgstr "接收端不支持签名推送"
6792b93b 3049
5809aa05 3050#: send-pack.c:421
a0b6b246
JX
3051msgid ""
3052"not sending a push certificate since the receiving end does not support --"
3053"signed push"
3054msgstr "未发送推送证书,因为接收端不支持签名推送"
6792b93b 3055
5809aa05 3056#: send-pack.c:433
a0b6b246
JX
3057msgid "the receiving end does not support --atomic push"
3058msgstr "接收端不支持原子推送"
6792b93b 3059
5809aa05 3060#: send-pack.c:438
a0b6b246
JX
3061msgid "the receiving end does not support push options"
3062msgstr "接收端不支持推送选项"
6792b93b 3063
6937cb4e 3064#: sequencer.c:218
a0b6b246
JX
3065msgid "revert"
3066msgstr "还原"
6792b93b 3067
6937cb4e 3068#: sequencer.c:220
a0b6b246
JX
3069msgid "cherry-pick"
3070msgstr "拣选"
3071
6937cb4e 3072#: sequencer.c:222
1a79b2f1
JX
3073msgid "rebase -i"
3074msgstr "rebase -i"
3075
6937cb4e 3076#: sequencer.c:224
1a79b2f1
JX
3077#, c-format
3078msgid "Unknown action: %d"
3079msgstr "未知动作:%d"
3080
6937cb4e 3081#: sequencer.c:281
a0b6b246
JX
3082msgid ""
3083"after resolving the conflicts, mark the corrected paths\n"
3084"with 'git add <paths>' or 'git rm <paths>'"
3085msgstr ""
3086"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
3087"命令标记修正后的文件"
3088
6937cb4e 3089#: sequencer.c:284
a0b6b246
JX
3090msgid ""
3091"after resolving the conflicts, mark the corrected paths\n"
3092"with 'git add <paths>' or 'git rm <paths>'\n"
3093"and commit the result with 'git commit'"
3094msgstr ""
3095"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
3096"对修正后的文件做标记,然后用 'git commit' 提交"
1b7f4a34 3097
5809aa05 3098#: sequencer.c:297 sequencer.c:1718
1b7f4a34 3099#, c-format
a0b6b246
JX
3100msgid "could not lock '%s'"
3101msgstr "不能锁定 '%s'"
1b7f4a34 3102
5809aa05
JX
3103#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
3104#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
1b7f4a34 3105#, c-format
a0b6b246
JX
3106msgid "could not write to '%s'"
3107msgstr "不能写入 '%s'"
1b7f4a34 3108
6937cb4e 3109#: sequencer.c:304
a0b6b246 3110#, c-format
72351d7d 3111msgid "could not write eol to '%s'"
a0b6b246 3112msgstr "不能将换行符写入 '%s'"
1b7f4a34 3113
5809aa05 3114#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
1b7f4a34 3115#, c-format
a0b6b246
JX
3116msgid "failed to finalize '%s'."
3117msgstr "无法完成 '%s'。"
1b7f4a34 3118
5809aa05
JX
3119#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
3120#: builtin/commit.c:754 builtin/merge.c:1046
a0b6b246
JX
3121#, c-format
3122msgid "could not read '%s'"
3123msgstr "不能读取 '%s'"
1b7f4a34 3124
6937cb4e 3125#: sequencer.c:358
63af42fe 3126#, c-format
a0b6b246
JX
3127msgid "your local changes would be overwritten by %s."
3128msgstr "您的本地修改将被%s覆盖。"
63af42fe 3129
6937cb4e 3130#: sequencer.c:362
a0b6b246 3131msgid "commit your changes or stash them to proceed."
a4f16749 3132msgstr "提交您的修改或贮藏后再继续。"
6792b93b 3133
6937cb4e 3134#: sequencer.c:391
a0b6b246
JX
3135#, c-format
3136msgid "%s: fast-forward"
3137msgstr "%s:快进"
6792b93b 3138
1a79b2f1 3139#. TRANSLATORS: %s will be "revert", "cherry-pick" or
a4f16749 3140#. "rebase -i".
1a79b2f1 3141#.
5809aa05 3142#: sequencer.c:477
a0b6b246
JX
3143#, c-format
3144msgid "%s: Unable to write new index file"
3145msgstr "%s:无法写入新索引文件"
6792b93b 3146
5809aa05
JX
3147#: sequencer.c:496
3148msgid "could not resolve HEAD commit"
3149msgstr "不能解析 HEAD 提交"
6792b93b 3150
5809aa05
JX
3151#: sequencer.c:516
3152msgid "unable to update cache tree"
3153msgstr "不能更新缓存树"
6792b93b 3154
5809aa05 3155#: sequencer.c:600
63af42fe
JX
3156#, c-format
3157msgid ""
a0b6b246
JX
3158"you have staged changes in your working tree\n"
3159"If these changes are meant to be squashed into the previous commit, run:\n"
3160"\n"
3161" git commit --amend %s\n"
3162"\n"
3163"If they are meant to go into a new commit, run:\n"
3164"\n"
3165" git commit %s\n"
3166"\n"
3167"In both cases, once you're done, continue with:\n"
3168"\n"
3169" git rebase --continue\n"
3170msgstr ""
1a79b2f1
JX
3171"您的工作区中存在已暂存的修改\n"
3172"如果这些修改需要被并入前一个提交,执行:\n"
a0b6b246
JX
3173"\n"
3174" git commit --amend %s\n"
3175"\n"
29004bbb 3176"如果这些修改要形成一个新提交,执行:\n"
a0b6b246
JX
3177"\n"
3178" git commit %s\n"
3179"\n"
3180"无论哪种情况,当您完成提交,继续执行:\n"
3181"\n"
3182" git rebase --continue\n"
6792b93b 3183
5809aa05 3184#: sequencer.c:702
a0b6b246 3185#, c-format
5809aa05
JX
3186msgid "could not parse commit %s"
3187msgstr "不能解析提交 %s"
6792b93b 3188
5809aa05 3189#: sequencer.c:707
63af42fe 3190#, c-format
5809aa05
JX
3191msgid "could not parse parent commit %s"
3192msgstr "不能解析父提交 %s"
63af42fe 3193
5809aa05 3194#: sequencer.c:836
1a79b2f1
JX
3195#, c-format
3196msgid ""
3197"unexpected 1st line of squash message:\n"
3198"\n"
3199"\t%.*s"
3200msgstr ""
3201"意外的压缩提交首行提交信息:\n"
3202"\n"
3203"\t%.*s"
3204
5809aa05 3205#: sequencer.c:842
1a79b2f1
JX
3206#, c-format
3207msgid ""
3208"invalid 1st line of squash message:\n"
3209"\n"
3210"\t%.*s"
3211msgstr ""
3212"压缩提交的首行提交信息无效:\n"
3213"\n"
3214"\t%.*s"
3215
5809aa05 3216#: sequencer.c:848 sequencer.c:873
1a79b2f1
JX
3217#, c-format
3218msgid "This is a combination of %d commits."
3219msgstr "这是一个 %d 个提交的组合。"
3220
5809aa05 3221#: sequencer.c:857 sequencer.c:2748
1a79b2f1
JX
3222msgid "need a HEAD to fixup"
3223msgstr "需要一个 HEAD 来修复"
3224
5809aa05 3225#: sequencer.c:859
1a79b2f1
JX
3226msgid "could not read HEAD"
3227msgstr "不能读取 HEAD"
3228
5809aa05 3229#: sequencer.c:861
1a79b2f1
JX
3230msgid "could not read HEAD's commit message"
3231msgstr "不能读取 HEAD 的提交说明"
3232
5809aa05 3233#: sequencer.c:867
1a79b2f1
JX
3234#, c-format
3235msgid "cannot write '%s'"
3236msgstr "不能写 '%s'"
3237
5809aa05 3238#: sequencer.c:876 git-rebase--interactive.sh:446
1a79b2f1
JX
3239msgid "This is the 1st commit message:"
3240msgstr "这是第一个提交说明:"
3241
5809aa05 3242#: sequencer.c:884
1a79b2f1
JX
3243#, c-format
3244msgid "could not read commit message of %s"
3245msgstr "不能读取 %s 的提交说明"
3246
5809aa05 3247#: sequencer.c:891
1a79b2f1
JX
3248#, c-format
3249msgid "This is the commit message #%d:"
3250msgstr "这是提交说明 #%d:"
3251
5809aa05 3252#: sequencer.c:896
1a79b2f1
JX
3253#, c-format
3254msgid "The commit message #%d will be skipped:"
3255msgstr "提交说明 #%d 将被跳过:"
3256
5809aa05 3257#: sequencer.c:901
1a79b2f1
JX
3258#, c-format
3259msgid "unknown command: %d"
3260msgstr "未知命令:%d"
3261
5809aa05 3262#: sequencer.c:967
a0b6b246
JX
3263msgid "your index file is unmerged."
3264msgstr "您的索引文件未完成合并。"
6792b93b 3265
5809aa05 3266#: sequencer.c:986
a0b6b246
JX
3267#, c-format
3268msgid "commit %s is a merge but no -m option was given."
3269msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
6792b93b 3270
5809aa05 3271#: sequencer.c:994
a0b6b246
JX
3272#, c-format
3273msgid "commit %s does not have parent %d"
3274msgstr "提交 %s 没有第 %d 个父提交"
3275
5809aa05 3276#: sequencer.c:998
a0b6b246
JX
3277#, c-format
3278msgid "mainline was specified but commit %s is not a merge."
3279msgstr "指定了主线,但是提交 %s 不是一个合并提交。"
3280
5809aa05 3281#: sequencer.c:1004
1a79b2f1
JX
3282#, c-format
3283msgid "cannot get commit message for %s"
3284msgstr "不能得到 %s 的提交说明"
3285
a0b6b246
JX
3286#. TRANSLATORS: The first %s will be a "todo" command like
3287#. "revert" or "pick", the second %s a SHA1.
5809aa05 3288#: sequencer.c:1023
a0b6b246
JX
3289#, c-format
3290msgid "%s: cannot parse parent commit %s"
3291msgstr "%s:不能解析父提交 %s"
3292
5809aa05 3293#: sequencer.c:1086 sequencer.c:1867
a0b6b246 3294#, c-format
1a79b2f1
JX
3295msgid "could not rename '%s' to '%s'"
3296msgstr "不能将 '%s' 重命名为 '%s'"
a0b6b246 3297
5809aa05 3298#: sequencer.c:1137
a0b6b246
JX
3299#, c-format
3300msgid "could not revert %s... %s"
3301msgstr "不能还原 %s... %s"
3302
5809aa05 3303#: sequencer.c:1138
a0b6b246
JX
3304#, c-format
3305msgid "could not apply %s... %s"
3306msgstr "不能应用 %s... %s"
3307
5809aa05 3308#: sequencer.c:1180
a0b6b246
JX
3309msgid "empty commit set passed"
3310msgstr "提供了空的提交集"
3311
5809aa05 3312#: sequencer.c:1190
a0b6b246
JX
3313#, c-format
3314msgid "git %s: failed to read the index"
3315msgstr "git %s:无法读取索引"
3316
5809aa05 3317#: sequencer.c:1196
a0b6b246
JX
3318#, c-format
3319msgid "git %s: failed to refresh the index"
3320msgstr "git %s:无法刷新索引"
3321
5809aa05
JX
3322#: sequencer.c:1270
3323#, c-format
3324msgid "%s does not accept arguments: '%s'"
3325msgstr "%s 不接受参数:'%s'"
3326
3327#: sequencer.c:1279
3328#, c-format
3329msgid "missing arguments for %s"
3330msgstr "缺少 %s 的参数"
3331
3332#: sequencer.c:1322
a0b6b246
JX
3333#, c-format
3334msgid "invalid line %d: %.*s"
3335msgstr "无效行 %d:%.*s"
3336
5809aa05 3337#: sequencer.c:1330
1a79b2f1
JX
3338#, c-format
3339msgid "cannot '%s' without a previous commit"
3340msgstr "没有父提交的情况下不能 '%s'"
a0b6b246 3341
5809aa05
JX
3342#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
3343#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
a0b6b246
JX
3344#, c-format
3345msgid "could not read '%s'."
3346msgstr "不能读取 '%s'。"
3347
5809aa05 3348#: sequencer.c:1375
1a79b2f1
JX
3349msgid "please fix this using 'git rebase --edit-todo'."
3350msgstr "请用 'git rebase --edit-todo' 来修改。"
3351
5809aa05 3352#: sequencer.c:1377
a0b6b246
JX
3353#, c-format
3354msgid "unusable instruction sheet: '%s'"
29004bbb 3355msgstr "不可用的指令清单:'%s'"
a0b6b246 3356
5809aa05 3357#: sequencer.c:1382
1a79b2f1
JX
3358msgid "no commits parsed."
3359msgstr "没有解析提交。"
3360
5809aa05 3361#: sequencer.c:1393
a0b6b246
JX
3362msgid "cannot cherry-pick during a revert."
3363msgstr "不能在回退中执行拣选。"
3364
5809aa05 3365#: sequencer.c:1395
a0b6b246
JX
3366msgid "cannot revert during a cherry-pick."
3367msgstr "不能在拣选中执行回退。"
3368
5809aa05 3369#: sequencer.c:1462
a0b6b246
JX
3370#, c-format
3371msgid "invalid key: %s"
3372msgstr "无效键名:%s"
3373
5809aa05 3374#: sequencer.c:1465
a0b6b246
JX
3375#, c-format
3376msgid "invalid value for %s: %s"
3377msgstr "%s 的值无效:%s"
3378
5809aa05 3379#: sequencer.c:1531
a0b6b246
JX
3380#, c-format
3381msgid "malformed options sheet: '%s'"
3382msgstr "非法的选项清单:'%s'"
3383
5809aa05 3384#: sequencer.c:1569
a0b6b246
JX
3385msgid "a cherry-pick or revert is already in progress"
3386msgstr "一个拣选或还原操作已在进行"
3387
5809aa05 3388#: sequencer.c:1570
a0b6b246
JX
3389msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
3390msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
3391
5809aa05 3392#: sequencer.c:1573
a0b6b246
JX
3393#, c-format
3394msgid "could not create sequencer directory '%s'"
3395msgstr "不能创建序列目录 '%s'"
3396
5809aa05 3397#: sequencer.c:1588
a0b6b246
JX
3398msgid "could not lock HEAD"
3399msgstr "不能锁定 HEAD"
3400
5809aa05 3401#: sequencer.c:1646 sequencer.c:2230
a0b6b246
JX
3402msgid "no cherry-pick or revert in progress"
3403msgstr "拣选或还原操作并未进行"
3404
5809aa05 3405#: sequencer.c:1648
a0b6b246
JX
3406msgid "cannot resolve HEAD"
3407msgstr "不能解析 HEAD"
3408
5809aa05 3409#: sequencer.c:1650 sequencer.c:1685
a0b6b246
JX
3410msgid "cannot abort from a branch yet to be born"
3411msgstr "不能从尚未建立的分支终止"
3412
5809aa05 3413#: sequencer.c:1671 builtin/grep.c:713
a0b6b246
JX
3414#, c-format
3415msgid "cannot open '%s'"
3416msgstr "不能打开 '%s'"
3417
5809aa05 3418#: sequencer.c:1673
a0b6b246
JX
3419#, c-format
3420msgid "cannot read '%s': %s"
3421msgstr "不能读取 '%s':%s"
3422
5809aa05 3423#: sequencer.c:1674
a0b6b246
JX
3424msgid "unexpected end of file"
3425msgstr "意外的文件结束"
3426
5809aa05 3427#: sequencer.c:1680
a0b6b246
JX
3428#, c-format
3429msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
3430msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
3431
5809aa05 3432#: sequencer.c:1691
1a79b2f1
JX
3433msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
3434msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
3435
5809aa05 3436#: sequencer.c:1832 sequencer.c:2128
1a79b2f1
JX
3437msgid "cannot read HEAD"
3438msgstr "不能读取 HEAD"
3439
5809aa05 3440#: sequencer.c:1872 builtin/difftool.c:639
1a79b2f1
JX
3441#, c-format
3442msgid "could not copy '%s' to '%s'"
3443msgstr "不能拷贝 '%s' 至 '%s'"
3444
5809aa05 3445#: sequencer.c:1891
1a79b2f1
JX
3446msgid "could not read index"
3447msgstr "不能读取索引"
3448
3449# 译者:注意保持前导空格
5809aa05 3450#: sequencer.c:1896
1a79b2f1
JX
3451#, c-format
3452msgid ""
3453"execution failed: %s\n"
3454"%sYou can fix the problem, and then run\n"
3455"\n"
3456" git rebase --continue\n"
3457"\n"
3458msgstr ""
3459"执行失败:%s\n"
3460"%s您可以改正该问题,然后运行\n"
3461"\n"
3462" git rebase --continue\n"
3463"\n"
3464
5809aa05 3465#: sequencer.c:1902
1a79b2f1
JX
3466msgid "and made changes to the index and/or the working tree\n"
3467msgstr "并且修改索引和/或工作区\n"
3468
5809aa05 3469#: sequencer.c:1908
1a79b2f1
JX
3470#, c-format
3471msgid ""
3472"execution succeeded: %s\n"
3473"but left changes to the index and/or the working tree\n"
3474"Commit or stash your changes, and then run\n"
3475"\n"
3476" git rebase --continue\n"
3477"\n"
3478msgstr ""
3479"执行成功:%s\n"
3480"但是在索引和/或工作区中存在变更\n"
a4f16749 3481"提交或贮藏修改,然后运行\n"
1a79b2f1
JX
3482"\n"
3483" git rebase --continue\n"
3484"\n"
3485
5809aa05 3486#: sequencer.c:1967
1a79b2f1 3487#, c-format
a4f16749
JX
3488msgid "Applied autostash.\n"
3489msgstr "已应用 autostash。\n"
1a79b2f1 3490
5809aa05 3491#: sequencer.c:1979
1a79b2f1
JX
3492#, c-format
3493msgid "cannot store %s"
3494msgstr "不能存储 %s"
3495
5809aa05 3496#: sequencer.c:1982 git-rebase.sh:175
1a79b2f1
JX
3497#, c-format
3498msgid ""
3499"Applying autostash resulted in conflicts.\n"
3500"Your changes are safe in the stash.\n"
3501"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
3502msgstr ""
3503"应用 autostash 导致冲突。\n"
a4f16749 3504"您的修改安全地保存在贮藏区中。\n"
1a79b2f1
JX
3505"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
3506
5809aa05 3507#: sequencer.c:2064
1a79b2f1 3508#, c-format
87cb7997
JX
3509msgid "Stopped at %s... %.*s\n"
3510msgstr "停止在 %s... %.*s\n"
1a79b2f1 3511
5809aa05 3512#: sequencer.c:2106
1a79b2f1
JX
3513#, c-format
3514msgid "unknown command %d"
3515msgstr "未知命令 %d"
3516
5809aa05 3517#: sequencer.c:2136
1a79b2f1
JX
3518msgid "could not read orig-head"
3519msgstr "不能读取 orig-head"
3520
5809aa05 3521#: sequencer.c:2141 sequencer.c:2745
1a79b2f1
JX
3522msgid "could not read 'onto'"
3523msgstr "不能读取 'onto'"
3524
5809aa05 3525#: sequencer.c:2148
1a79b2f1
JX
3526#, c-format
3527msgid "could not update %s"
3528msgstr "不能更新 %s"
3529
5809aa05 3530#: sequencer.c:2155
1a79b2f1
JX
3531#, c-format
3532msgid "could not update HEAD to %s"
3533msgstr "不能更新 HEAD 为 %s"
3534
5809aa05 3535#: sequencer.c:2239
1a79b2f1
JX
3536msgid "cannot rebase: You have unstaged changes."
3537msgstr "不能变基:您有未暂存的变更。"
3538
5809aa05 3539#: sequencer.c:2244
1a79b2f1
JX
3540msgid "could not remove CHERRY_PICK_HEAD"
3541msgstr "不能删除 CHERRY_PICK_HEAD"
3542
5809aa05 3543#: sequencer.c:2253
1a79b2f1
JX
3544msgid "cannot amend non-existing commit"
3545msgstr "不能修补不存在的提交"
3546
5809aa05 3547#: sequencer.c:2255
1a79b2f1
JX
3548#, c-format
3549msgid "invalid file: '%s'"
3550msgstr "无效文件:'%s'"
3551
5809aa05 3552#: sequencer.c:2257
1a79b2f1
JX
3553#, c-format
3554msgid "invalid contents: '%s'"
3555msgstr "无效内容:'%s'"
3556
5809aa05 3557#: sequencer.c:2260
1a79b2f1
JX
3558msgid ""
3559"\n"
3560"You have uncommitted changes in your working tree. Please, commit them\n"
3561"first and then run 'git rebase --continue' again."
87cb7997
JX
3562msgstr ""
3563"\n"
3564"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
1a79b2f1 3565
5809aa05 3566#: sequencer.c:2270
1a79b2f1
JX
3567msgid "could not commit staged changes."
3568msgstr "不能提交暂存的修改。"
3569
5809aa05 3570#: sequencer.c:2350
a0b6b246
JX
3571#, c-format
3572msgid "%s: can't cherry-pick a %s"
3573msgstr "%s:不能拣选一个%s"
3574
5809aa05 3575#: sequencer.c:2354
a0b6b246
JX
3576#, c-format
3577msgid "%s: bad revision"
3578msgstr "%s:错误的版本"
3579
5809aa05 3580#: sequencer.c:2387
a0b6b246
JX
3581msgid "can't revert as initial commit"
3582msgstr "不能作为初始提交回退"
3583
5809aa05 3584#: sequencer.c:2492
6937cb4e
JX
3585msgid "make_script: unhandled options"
3586msgstr "make_script:有未能处理的选项"
3587
5809aa05 3588#: sequencer.c:2495
6937cb4e
JX
3589msgid "make_script: error preparing revisions"
3590msgstr "make_script:准备版本时错误"
3591
5809aa05 3592#: sequencer.c:2529 sequencer.c:2564
6937cb4e
JX
3593#, c-format
3594msgid "unusable todo list: '%s'"
3595msgstr "不可用的待办列表:'%s'"
3596
5809aa05 3597#: sequencer.c:2615
6937cb4e
JX
3598#, c-format
3599msgid ""
3600"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
3601msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
3602
5809aa05 3603#: sequencer.c:2695
6937cb4e
JX
3604#, c-format
3605msgid ""
3606"Warning: some commits may have been dropped accidentally.\n"
3607"Dropped commits (newer to older):\n"
3608msgstr ""
3609"警告:一些提交可能被意外丢弃。\n"
3610"丢弃的提交(从新到旧):\n"
3611
5809aa05 3612#: sequencer.c:2702
6937cb4e
JX
3613#, c-format
3614msgid ""
3615"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
3616"\n"
3617"Use 'git config rebase.missingCommitsCheck' to change the level of "
3618"warnings.\n"
3619"The possible behaviours are: ignore, warn, error.\n"
3620"\n"
3621msgstr ""
3622"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
3623"\n"
3624"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
3625"可选值有:ignore、warn、error。\n"
3626"\n"
3627
5809aa05 3628#: sequencer.c:2714
6937cb4e
JX
3629#, c-format
3630msgid ""
3631"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
3632"continue'.\n"
3633"Or you can abort the rebase with 'git rebase --abort'.\n"
3634msgstr ""
3635"您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n"
3636"或者您可以用 'git rebase --abort' 终止变基。\n"
3637
5809aa05
JX
3638#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
3639#: builtin/am.c:779
6937cb4e
JX
3640#, c-format
3641msgid "could not open '%s' for writing"
3642msgstr "无法打开 '%s' 进行写入"
3643
5809aa05 3644#: sequencer.c:2775
6937cb4e 3645#, c-format
5809aa05
JX
3646msgid "could not parse commit '%s'"
3647msgstr "不能解析提交 '%s'"
6937cb4e 3648
5809aa05 3649#: sequencer.c:2897
6937cb4e
JX
3650msgid "the script was already rearranged."
3651msgstr "脚本已经重新编排。"
3652
a4f16749 3653#: setup.c:171
a0b6b246 3654#, c-format
6792b93b 3655msgid ""
a0b6b246
JX
3656"%s: no such path in the working tree.\n"
3657"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
3658msgstr ""
3659"%s:工作区中无此路径。\n"
58b6f078 3660"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
6792b93b 3661
a4f16749 3662#: setup.c:184
90314792 3663#, c-format
a0b6b246
JX
3664msgid ""
3665"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
3666"Use '--' to separate paths from revisions, like this:\n"
3667"'git <command> [<revision>...] -- [<file>...]'"
3668msgstr ""
3669"有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
3670"使用 '--' 来分隔版本和路径,例如:\n"
58b6f078 3671"'git <命令> [<版本>...] -- [<文件>...]'"
6792b93b 3672
a4f16749 3673#: setup.c:252
a0b6b246
JX
3674#, c-format
3675msgid ""
3676"ambiguous argument '%s': both revision and filename\n"
3677"Use '--' to separate paths from revisions, like this:\n"
3678"'git <command> [<revision>...] -- [<file>...]'"
3679msgstr ""
3680"有歧义的参数 '%s':可同时是版本和文件\n"
3681"使用 '--' 来分隔版本和路径,例如:\n"
58b6f078 3682"'git <命令> [<版本>...] -- [<文件>...]'"
2e8451e8 3683
5809aa05 3684#: setup.c:501
a0b6b246
JX
3685#, c-format
3686msgid "Expected git repo version <= %d, found %d"
3687msgstr "期望 git 仓库版本 <= %d,却得到 %d"
6792b93b 3688
5809aa05 3689#: setup.c:509
a0b6b246
JX
3690msgid "unknown repository extensions found:"
3691msgstr "发现未知的仓库扩展:"
2e8451e8 3692
5809aa05 3693#: setup.c:811
1003b3a5 3694#, c-format
a0b6b246
JX
3695msgid "Not a git repository (or any of the parent directories): %s"
3696msgstr "不是一个 git 仓库(或者任何父目录):%s"
1003b3a5 3697
5809aa05 3698#: setup.c:813 builtin/index-pack.c:1653
a0b6b246
JX
3699msgid "Cannot come back to cwd"
3700msgstr "无法返回当前工作目录"
1003b3a5 3701
5809aa05 3702#: setup.c:1052
a0b6b246
JX
3703msgid "Unable to read current working directory"
3704msgstr "不能读取当前工作目录"
1003b3a5 3705
5809aa05 3706#: setup.c:1064 setup.c:1070
87cb7997
JX
3707#, c-format
3708msgid "Cannot change to '%s'"
3709msgstr "不能切换到 '%s'"
3710
5809aa05 3711#: setup.c:1083
a0b6b246
JX
3712#, c-format
3713msgid ""
3714"Not a git repository (or any parent up to mount point %s)\n"
3715"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
3716msgstr ""
3717"不是一个 git 仓库(或者向上递归至挂载点 %s 的任何祖先目录)\n"
3718"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
1003b3a5 3719
5809aa05 3720#: setup.c:1167
a0b6b246
JX
3721#, c-format
3722msgid ""
3723"Problem with core.sharedRepository filemode value (0%.3o).\n"
3724"The owner of files must always have read and write permissions."
3725msgstr ""
3726"参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n"
3727"文件属主必须始终拥有读写权限。"
6792b93b 3728
5809aa05 3729#: sha1_file.c:598
a0b6b246
JX
3730#, c-format
3731msgid "path '%s' does not exist"
3732msgstr "路径 '%s' 不存在"
3733
5809aa05 3734#: sha1_file.c:624
a0b6b246
JX
3735#, c-format
3736msgid "reference repository '%s' as a linked checkout is not supported yet."
3737msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
3738
5809aa05 3739#: sha1_file.c:630
a0b6b246
JX
3740#, c-format
3741msgid "reference repository '%s' is not a local repository."
3742msgstr "参考仓库 '%s' 不是一个本地仓库。"
3743
5809aa05 3744#: sha1_file.c:636
a0b6b246
JX
3745#, c-format
3746msgid "reference repository '%s' is shallow"
3747msgstr "参考仓库 '%s' 是一个浅克隆"
3748
5809aa05 3749#: sha1_file.c:644
a0b6b246
JX
3750#, c-format
3751msgid "reference repository '%s' is grafted"
3752msgstr "参考仓库 '%s' 已被嫁接"
3753
5809aa05 3754#: sha1_name.c:422
a0b6b246
JX
3755#, c-format
3756msgid "short SHA1 %s is ambiguous"
29004bbb 3757msgstr "短 SHA1 %s 存在歧义"
a0b6b246 3758
5809aa05 3759#: sha1_name.c:433
a0b6b246
JX
3760msgid "The candidates are:"
3761msgstr "候选者有:"
3762
5809aa05 3763#: sha1_name.c:693
a0b6b246
JX
3764msgid ""
3765"Git normally never creates a ref that ends with 40 hex characters\n"
3766"because it will be ignored when you just specify 40-hex. These refs\n"
3767"may be created by mistake. For example,\n"
3768"\n"
3769" git checkout -b $br $(git rev-parse ...)\n"
3770"\n"
3771"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
3772"examine these refs and maybe delete them. Turn this message off by\n"
3773"running \"git config advice.objectNameWarning false\""
3774msgstr ""
3775"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
3776"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
3777"\n"
3778" git checkout -b $br $(git rev-parse ...)\n"
3779"\n"
3780"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
3781"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
3782"命令关闭本消息通知。"
3783
5809aa05 3784#: submodule.c:96 submodule.c:130
a0b6b246
JX
3785msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
3786msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
3787
5809aa05 3788#: submodule.c:100 submodule.c:134
a0b6b246
JX
3789#, c-format
3790msgid "Could not find section in .gitmodules where path=%s"
3791msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
3792
5809aa05 3793#: submodule.c:108
a0b6b246
JX
3794#, c-format
3795msgid "Could not update .gitmodules entry %s"
3796msgstr "不能更新 .gitmodules 条目 %s"
3797
5809aa05 3798#: submodule.c:141
a0b6b246
JX
3799#, c-format
3800msgid "Could not remove .gitmodules entry for %s"
3801msgstr "无法移除 %s 的 .gitmodules 条目"
3802
5809aa05 3803#: submodule.c:152
a0b6b246
JX
3804msgid "staging updated .gitmodules failed"
3805msgstr "将更新后 .gitmodules 添加暂存区失败"
3806
5809aa05 3807#: submodule.c:312
a4f16749
JX
3808#, c-format
3809msgid "in unpopulated submodule '%s'"
3810msgstr "位于未检出的子模组 '%s'"
3811
5809aa05 3812#: submodule.c:343
a4f16749
JX
3813#, c-format
3814msgid "Pathspec '%s' is in submodule '%.*s'"
3815msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
3816
5809aa05 3817#: submodule.c:833
6937cb4e
JX
3818#, c-format
3819msgid "submodule entry '%s' (%s) is a %s, not a commit"
493a9322 3820msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交"
6937cb4e 3821
5809aa05 3822#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
6937cb4e
JX
3823msgid "Failed to resolve HEAD as a valid ref."
3824msgstr "无法将 HEAD 解析为有效引用。"
3825
5809aa05 3826#: submodule.c:1370
1a79b2f1 3827#, c-format
87cb7997 3828msgid "'%s' not recognized as a git repository"
65e2041e 3829msgstr "无法将 '%s' 识别为一个 git 仓库"
1a79b2f1 3830
5809aa05 3831#: submodule.c:1508
1a79b2f1 3832#, c-format
87cb7997
JX
3833msgid "could not start 'git status' in submodule '%s'"
3834msgstr "无法在子模组 '%s' 中启动 'git status'"
1a79b2f1 3835
5809aa05 3836#: submodule.c:1521
87cb7997
JX
3837#, c-format
3838msgid "could not run 'git status' in submodule '%s'"
3839msgstr "无法在子模组 '%s' 中执行 'git status'"
3840
5809aa05 3841#: submodule.c:1614
87cb7997
JX
3842#, c-format
3843msgid "submodule '%s' has dirty index"
3844msgstr "子模组 '%s' 中有脏索引"
3845
5809aa05 3846#: submodule.c:1876
1a79b2f1
JX
3847#, c-format
3848msgid ""
3849"relocate_gitdir for submodule '%s' with more than one worktree not supported"
3850msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
3851
5809aa05 3852#: submodule.c:1888 submodule.c:1944
1a79b2f1
JX
3853#, c-format
3854msgid "could not lookup name for submodule '%s'"
3855msgstr "不能查询子模组 '%s' 的名称"
3856
5809aa05
JX
3857#: submodule.c:1892 builtin/submodule--helper.c:909
3858#: builtin/submodule--helper.c:919
1a79b2f1
JX
3859#, c-format
3860msgid "could not create directory '%s'"
3861msgstr "不能创建目录 '%s'"
3862
5809aa05 3863#: submodule.c:1895
1a79b2f1
JX
3864#, c-format
3865msgid ""
3866"Migrating git directory of '%s%s' from\n"
3867"'%s' to\n"
3868"'%s'\n"
3869msgstr ""
3870"将 '%s%s' 的 git 目录从\n"
3871"'%s' 迁移至\n"
3872"'%s'\n"
3873
5809aa05 3874#: submodule.c:1979
1a79b2f1
JX
3875#, c-format
3876msgid "could not recurse into submodule '%s'"
3877msgstr "无法递归进子模组路径 '%s'"
3878
5809aa05 3879#: submodule.c:2023
87cb7997
JX
3880msgid "could not start ls-files in .."
3881msgstr "无法在 .. 中启动 ls-files"
3882
5809aa05 3883#: submodule.c:2043
87cb7997
JX
3884msgid "BUG: returned path string doesn't match cwd?"
3885msgstr "BUG:返回的路径和当前路径不匹配?"
3886
5809aa05 3887#: submodule.c:2062
87cb7997
JX
3888#, c-format
3889msgid "ls-tree returned unexpected return code %d"
3890msgstr "ls-tree 返回未知返回值 %d"
3891
6937cb4e
JX
3892#: submodule-config.c:263
3893msgid "negative values not allowed for submodule.fetchjobs"
3894msgstr "submodule.fetchjobs 不允许为负值"
3895
3896#: submodule-config.c:436
a0b6b246
JX
3897#, c-format
3898msgid "invalid value for %s"
3899msgstr "%s 的值无效"
3900
6937cb4e 3901#: trailer.c:238
a0b6b246
JX
3902#, c-format
3903msgid "running trailer command '%s' failed"
3904msgstr "执行 trailer 命令 '%s' 失败"
3905
6937cb4e
JX
3906#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
3907#: trailer.c:557
a0b6b246
JX
3908#, c-format
3909msgid "unknown value '%s' for key '%s'"
3910msgstr "键 '%2$s' 的未知取值 '%1$s'"
3911
6937cb4e 3912#: trailer.c:539 trailer.c:544 builtin/remote.c:290
a0b6b246
JX
3913#, c-format
3914msgid "more than one %s"
3915msgstr "多于一个 %s"
3916
6937cb4e 3917#: trailer.c:730
a0b6b246
JX
3918#, c-format
3919msgid "empty trailer token in trailer '%.*s'"
3920msgstr "签名 '%.*s' 的键为空"
3921
6937cb4e 3922#: trailer.c:750
a0b6b246
JX
3923#, c-format
3924msgid "could not read input file '%s'"
3925msgstr "不能读取输入文件 '%s'"
3926
6937cb4e 3927#: trailer.c:753
a0b6b246
JX
3928msgid "could not read from stdin"
3929msgstr "不能自标准输入读取"
3930
6937cb4e 3931#: trailer.c:1008 builtin/am.c:46
a0b6b246
JX
3932#, c-format
3933msgid "could not stat %s"
65e2041e 3934msgstr "不能对 %s 调用 stat"
a0b6b246 3935
6937cb4e 3936#: trailer.c:1010
a0b6b246
JX
3937#, c-format
3938msgid "file %s is not a regular file"
3939msgstr "文件 %s 不是一个正规文件"
3940
6937cb4e 3941#: trailer.c:1012
a0b6b246
JX
3942#, c-format
3943msgid "file %s is not writable by user"
3944msgstr "文件 %s 用户不可写"
3945
6937cb4e 3946#: trailer.c:1024
a0b6b246
JX
3947msgid "could not open temporary file"
3948msgstr "不能打开临时文件"
3949
6937cb4e 3950#: trailer.c:1064
a0b6b246
JX
3951#, c-format
3952msgid "could not rename temporary file to %s"
3953msgstr "不能重命名临时文件为 %s"
3954
5809aa05 3955#: transport.c:63
a0b6b246
JX
3956#, c-format
3957msgid "Would set upstream of '%s' to '%s' of '%s'\n"
3958msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
3959
5809aa05 3960#: transport.c:152
a0b6b246
JX
3961#, c-format
3962msgid "transport: invalid depth option '%s'"
3963msgstr "传输:无效的深度选项 '%s'"
3964
5809aa05 3965#: transport.c:904
a0b6b246
JX
3966#, c-format
3967msgid ""
3968"The following submodule paths contain changes that can\n"
3969"not be found on any remote:\n"
3970msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
3971
5809aa05 3972#: transport.c:908
a0b6b246
JX
3973#, c-format
3974msgid ""
3975"\n"
3976"Please try\n"
3977"\n"
3978"\tgit push --recurse-submodules=on-demand\n"
3979"\n"
3980"or cd to the path and use\n"
3981"\n"
3982"\tgit push\n"
3983"\n"
3984"to push them to a remote.\n"
3985"\n"
3986msgstr ""
3987"\n"
3988"请尝试\n"
3989"\n"
3990"\tgit push --recurse-submodules=on-demand\n"
3991"\n"
3992"或者进入到子目录执行\n"
3993"\n"
3994"\tgit push\n"
3995"\n"
3996"以推送至远程。\n"
3997"\n"
3998
5809aa05 3999#: transport.c:916
a0b6b246
JX
4000msgid "Aborting."
4001msgstr "正在终止。"
4002
5809aa05 4003#: transport-helper.c:1074
a0b6b246
JX
4004#, c-format
4005msgid "Could not read ref %s"
4006msgstr "不能读取引用 %s"
4007
4008#: tree-walk.c:31
4009msgid "too-short tree object"
4010msgstr "太短的树对象"
4011
4012#: tree-walk.c:37
4013msgid "malformed mode in tree entry"
29004bbb 4014msgstr "树对象中的条目模式错误"
a0b6b246
JX
4015
4016#: tree-walk.c:41
4017msgid "empty filename in tree entry"
4018msgstr "树对象条目中空的文件名"
4019
6937cb4e 4020#: tree-walk.c:114
a0b6b246
JX
4021msgid "too-short tree file"
4022msgstr "太短的树文件"
4023
5809aa05 4024#: unpack-trees.c:107
a0b6b246
JX
4025#, c-format
4026msgid ""
4027"Your local changes to the following files would be overwritten by checkout:\n"
4028"%%sPlease commit your changes or stash them before you switch branches."
4029msgstr ""
4030"您对下列文件的本地修改将被检出操作覆盖:\n"
a4f16749 4031"%%s请在切换分支前提交或贮藏您的修改。"
a0b6b246 4032
5809aa05 4033#: unpack-trees.c:109
a0b6b246
JX
4034#, c-format
4035msgid ""
4036"Your local changes to the following files would be overwritten by checkout:\n"
4037"%%s"
4038msgstr ""
4039"您对下列文件的本地修改将被检出操作覆盖:\n"
4040"%%s"
4041
5809aa05 4042#: unpack-trees.c:112
a0b6b246
JX
4043#, c-format
4044msgid ""
4045"Your local changes to the following files would be overwritten by merge:\n"
4046"%%sPlease commit your changes or stash them before you merge."
4047msgstr ""
4048"您对下列文件的本地修改将被合并操作覆盖:\n"
a4f16749 4049"%%s请在合并前提交或贮藏您的修改。"
a0b6b246 4050
5809aa05 4051#: unpack-trees.c:114
a0b6b246
JX
4052#, c-format
4053msgid ""
4054"Your local changes to the following files would be overwritten by merge:\n"
4055"%%s"
4056msgstr ""
4057"您对下列文件的本地修改将被合并操作覆盖:\n"
4058"%%s"
4059
5809aa05 4060#: unpack-trees.c:117
a0b6b246
JX
4061#, c-format
4062msgid ""
4063"Your local changes to the following files would be overwritten by %s:\n"
4064"%%sPlease commit your changes or stash them before you %s."
4065msgstr ""
4066"您对下列文件的本地修改将被 %s 覆盖:\n"
a4f16749 4067"%%s请在 %s 之前提交或贮藏您的修改。"
6792b93b 4068
5809aa05 4069#: unpack-trees.c:119
a0b6b246
JX
4070#, c-format
4071msgid ""
4072"Your local changes to the following files would be overwritten by %s:\n"
4073"%%s"
4074msgstr ""
4075"您对下列文件的本地修改将被 %s 覆盖:\n"
4076"%%s"
c04f5ac3 4077
5809aa05 4078#: unpack-trees.c:124
a0b6b246
JX
4079#, c-format
4080msgid ""
1a79b2f1 4081"Updating the following directories would lose untracked files in them:\n"
a0b6b246
JX
4082"%s"
4083msgstr ""
4084"更新如下目录将会丢失其中未跟踪的文件:\n"
4085"%s"
1b7f4a34 4086
5809aa05 4087#: unpack-trees.c:128
a0b6b246
JX
4088#, c-format
4089msgid ""
4090"The following untracked working tree files would be removed by checkout:\n"
4091"%%sPlease move or remove them before you switch branches."
4092msgstr ""
4093"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
4094"%%s请在切换分支之前移动或删除。"
2e8451e8 4095
5809aa05 4096#: unpack-trees.c:130
a0b6b246
JX
4097#, c-format
4098msgid ""
4099"The following untracked working tree files would be removed by checkout:\n"
4100"%%s"
4101msgstr ""
4102"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
4103"%%s"
1003b3a5 4104
5809aa05 4105#: unpack-trees.c:133
a0b6b246
JX
4106#, c-format
4107msgid ""
4108"The following untracked working tree files would be removed by merge:\n"
4109"%%sPlease move or remove them before you merge."
4110msgstr ""
4111"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
4112"%%s请在合并前移动或删除。"
1003b3a5 4113
5809aa05 4114#: unpack-trees.c:135
a0b6b246
JX
4115#, c-format
4116msgid ""
4117"The following untracked working tree files would be removed by merge:\n"
4118"%%s"
4119msgstr ""
4120"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
4121"%%s"
c04f5ac3 4122
5809aa05 4123#: unpack-trees.c:138
a0b6b246
JX
4124#, c-format
4125msgid ""
4126"The following untracked working tree files would be removed by %s:\n"
4127"%%sPlease move or remove them before you %s."
4128msgstr ""
4129"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
4130"%%s请在 %s 前移动或删除。"
c04f5ac3 4131
5809aa05 4132#: unpack-trees.c:140
a0b6b246
JX
4133#, c-format
4134msgid ""
4135"The following untracked working tree files would be removed by %s:\n"
4136"%%s"
4137msgstr ""
4138"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
4139"%%s"
c04f5ac3 4140
5809aa05 4141#: unpack-trees.c:145
a0b6b246
JX
4142#, c-format
4143msgid ""
4144"The following untracked working tree files would be overwritten by "
4145"checkout:\n"
4146"%%sPlease move or remove them before you switch branches."
4147msgstr ""
4148"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
4149"%%s请在切换分支前移动或删除。"
c04f5ac3 4150
5809aa05 4151#: unpack-trees.c:147
1003b3a5 4152#, c-format
4dcdc3d8 4153msgid ""
a0b6b246
JX
4154"The following untracked working tree files would be overwritten by "
4155"checkout:\n"
4156"%%s"
4dcdc3d8 4157msgstr ""
a0b6b246
JX
4158"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
4159"%%s"
1003b3a5 4160
5809aa05 4161#: unpack-trees.c:150
c04f5ac3 4162#, c-format
a0b6b246
JX
4163msgid ""
4164"The following untracked working tree files would be overwritten by merge:\n"
4165"%%sPlease move or remove them before you merge."
4166msgstr ""
4167"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
4168"%%s请在合并前移动或删除。"
c04f5ac3 4169
5809aa05 4170#: unpack-trees.c:152
a0b6b246
JX
4171#, c-format
4172msgid ""
4173"The following untracked working tree files would be overwritten by merge:\n"
4174"%%s"
4175msgstr ""
4176"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
4177"%%s"
c04f5ac3 4178
5809aa05 4179#: unpack-trees.c:155
a0b6b246
JX
4180#, c-format
4181msgid ""
4182"The following untracked working tree files would be overwritten by %s:\n"
4183"%%sPlease move or remove them before you %s."
4184msgstr ""
4185"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
4186"%%s请在 %s 前移动或删除。"
c04f5ac3 4187
5809aa05 4188#: unpack-trees.c:157
07432cef 4189#, c-format
a0b6b246
JX
4190msgid ""
4191"The following untracked working tree files would be overwritten by %s:\n"
4192"%%s"
4193msgstr ""
4194"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
4195"%%s"
c04f5ac3 4196
5809aa05 4197#: unpack-trees.c:164
07432cef 4198#, c-format
a0b6b246
JX
4199msgid "Entry '%s' overlaps with '%s'. Cannot bind."
4200msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
c04f5ac3 4201
5809aa05 4202#: unpack-trees.c:167
07432cef 4203#, c-format
ef317cd5 4204msgid ""
6937cb4e 4205"Cannot update sparse checkout: the following entries are not up to date:\n"
a0b6b246
JX
4206"%s"
4207msgstr ""
4208"无法更新稀疏检出:如下条目不是最新:\n"
4209"%s"
c04f5ac3 4210
5809aa05 4211#: unpack-trees.c:169
07432cef 4212#, c-format
a0b6b246
JX
4213msgid ""
4214"The following working tree files would be overwritten by sparse checkout "
4215"update:\n"
4216"%s"
4217msgstr ""
4218"工作区中下列文件将被稀疏检出更新所覆盖:\n"
4219"%s"
c04f5ac3 4220
5809aa05 4221#: unpack-trees.c:171
07432cef 4222#, c-format
a0b6b246
JX
4223msgid ""
4224"The following working tree files would be removed by sparse checkout "
4225"update:\n"
4226"%s"
4227msgstr ""
4228"工作区中下列文件将被稀疏检出更新所删除:\n"
4229"%s"
c04f5ac3 4230
5809aa05 4231#: unpack-trees.c:173
87cb7997
JX
4232#, c-format
4233msgid ""
4234"Cannot update submodule:\n"
4235"%s"
4236msgstr ""
4237"无法更新子模组:\n"
4238"%s"
4239
5809aa05 4240#: unpack-trees.c:250
07432cef 4241#, c-format
a0b6b246
JX
4242msgid "Aborting\n"
4243msgstr "终止中\n"
ef317cd5 4244
5809aa05 4245#: unpack-trees.c:332
a0b6b246
JX
4246msgid "Checking out files"
4247msgstr "正在检出文件"
c04f5ac3 4248
87cb7997 4249#: urlmatch.c:163
a0b6b246
JX
4250msgid "invalid URL scheme name or missing '://' suffix"
4251msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
4252
87cb7997 4253#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
07432cef 4254#, c-format
a0b6b246
JX
4255msgid "invalid %XX escape sequence"
4256msgstr "无效的 %XX 转义序列"
c04f5ac3 4257
87cb7997 4258#: urlmatch.c:215
a0b6b246
JX
4259msgid "missing host and scheme is not 'file:'"
4260msgstr "缺失主机名且 URL 方案不是 'file:'"
c04f5ac3 4261
87cb7997 4262#: urlmatch.c:232
a0b6b246
JX
4263msgid "a 'file:' URL may not have a port number"
4264msgstr "一个 'file:' URL 不应该包含端口号"
94550ed3 4265
87cb7997 4266#: urlmatch.c:247
a0b6b246
JX
4267msgid "invalid characters in host name"
4268msgstr "主机名中包含无效的字符"
90314792 4269
87cb7997 4270#: urlmatch.c:292 urlmatch.c:303
a0b6b246
JX
4271msgid "invalid port number"
4272msgstr "无效的端口号"
c04f5ac3 4273
87cb7997 4274#: urlmatch.c:371
a0b6b246
JX
4275msgid "invalid '..' path segment"
4276msgstr "无效的 '..' 路径片段"
5c0c220c 4277
a4f16749 4278#: worktree.c:245
a77c07d9 4279#, c-format
a0b6b246
JX
4280msgid "failed to read '%s'"
4281msgstr "无法读取 '%s'"
ef317cd5 4282
a4f16749 4283#: wrapper.c:223 wrapper.c:393
c04f5ac3 4284#, c-format
a0b6b246
JX
4285msgid "could not open '%s' for reading and writing"
4286msgstr "无法打开 '%s' 进行读写"
c04f5ac3 4287
5809aa05
JX
4288#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
4289#: builtin/am.c:862 builtin/merge.c:1043
c04f5ac3 4290#, c-format
a0b6b246
JX
4291msgid "could not open '%s' for reading"
4292msgstr "无法打开 '%s' 进行读取"
c04f5ac3 4293
a4f16749 4294#: wrapper.c:424 wrapper.c:624
a0b6b246
JX
4295#, c-format
4296msgid "unable to access '%s'"
4297msgstr "不能访问 '%s'"
c04f5ac3 4298
a4f16749 4299#: wrapper.c:632
a0b6b246
JX
4300msgid "unable to get current working directory"
4301msgstr "不能获取当前工作目录"
c04f5ac3 4302
6937cb4e 4303#: wt-status.c:150
a0b6b246
JX
4304msgid "Unmerged paths:"
4305msgstr "未合并的路径:"
7aea43ff 4306
a0b6b246 4307# 译者:注意保持前导空格
6937cb4e 4308#: wt-status.c:177 wt-status.c:204
c04f5ac3 4309#, c-format
a0b6b246
JX
4310msgid " (use \"git reset %s <file>...\" to unstage)"
4311msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
c04f5ac3 4312
a0b6b246 4313# 译者:注意保持前导空格
6937cb4e 4314#: wt-status.c:179 wt-status.c:206
a0b6b246
JX
4315msgid " (use \"git rm --cached <file>...\" to unstage)"
4316msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
c04f5ac3 4317
a0b6b246 4318# 译者:注意保持前导空格
6937cb4e 4319#: wt-status.c:183
a0b6b246
JX
4320msgid " (use \"git add <file>...\" to mark resolution)"
4321msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
8ada9598 4322
a0b6b246 4323# 译者:注意保持前导空格
6937cb4e 4324#: wt-status.c:185 wt-status.c:189
a0b6b246
JX
4325msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
4326msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
8ada9598 4327
a0b6b246 4328# 译者:注意保持前导空格
6937cb4e 4329#: wt-status.c:187
a0b6b246
JX
4330msgid " (use \"git rm <file>...\" to mark resolution)"
4331msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
ef317cd5 4332
5809aa05 4333#: wt-status.c:198 wt-status.c:984
a0b6b246
JX
4334msgid "Changes to be committed:"
4335msgstr "要提交的变更:"
ef317cd5 4336
5809aa05 4337#: wt-status.c:216 wt-status.c:993
a0b6b246
JX
4338msgid "Changes not staged for commit:"
4339msgstr "尚未暂存以备提交的变更:"
ef317cd5 4340
a0b6b246 4341# 译者:注意保持前导空格
6937cb4e 4342#: wt-status.c:220
a0b6b246
JX
4343msgid " (use \"git add <file>...\" to update what will be committed)"
4344msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
ef317cd5 4345
a0b6b246 4346# 译者:注意保持前导空格
6937cb4e 4347#: wt-status.c:222
a0b6b246
JX
4348msgid " (use \"git add/rm <file>...\" to update what will be committed)"
4349msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
ef317cd5 4350
a0b6b246 4351# 译者:注意保持前导空格
6937cb4e 4352#: wt-status.c:223
a0b6b246
JX
4353msgid ""
4354" (use \"git checkout -- <file>...\" to discard changes in working directory)"
4355msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
ef317cd5 4356
a0b6b246 4357# 译者:注意保持前导空格
6937cb4e 4358#: wt-status.c:225
a0b6b246
JX
4359msgid " (commit or discard the untracked or modified content in submodules)"
4360msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
ef317cd5 4361
a0b6b246 4362# 译者:注意保持前导空格
6937cb4e 4363#: wt-status.c:237
a0b6b246
JX
4364#, c-format
4365msgid " (use \"git %s <file>...\" to include in what will be committed)"
4366msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
ef317cd5 4367
6937cb4e 4368#: wt-status.c:252
a0b6b246
JX
4369msgid "both deleted:"
4370msgstr "双方删除:"
ef317cd5 4371
6937cb4e 4372#: wt-status.c:254
a0b6b246
JX
4373msgid "added by us:"
4374msgstr "由我们添加:"
4dcdc3d8 4375
6937cb4e 4376#: wt-status.c:256
a0b6b246
JX
4377msgid "deleted by them:"
4378msgstr "由他们删除:"
ef317cd5 4379
6937cb4e 4380#: wt-status.c:258
a0b6b246
JX
4381msgid "added by them:"
4382msgstr "由他们添加:"
ef317cd5 4383
6937cb4e 4384#: wt-status.c:260
a0b6b246
JX
4385msgid "deleted by us:"
4386msgstr "由我们删除:"
ef317cd5 4387
6937cb4e 4388#: wt-status.c:262
a0b6b246
JX
4389msgid "both added:"
4390msgstr "双方添加:"
5c57d762 4391
6937cb4e 4392#: wt-status.c:264
a0b6b246
JX
4393msgid "both modified:"
4394msgstr "双方修改:"
5c57d762 4395
6937cb4e 4396#: wt-status.c:274
a0b6b246
JX
4397msgid "new file:"
4398msgstr "新文件:"
8ada9598 4399
6937cb4e 4400#: wt-status.c:276
a0b6b246
JX
4401msgid "copied:"
4402msgstr "拷贝:"
8ada9598 4403
6937cb4e 4404#: wt-status.c:278
a0b6b246
JX
4405msgid "deleted:"
4406msgstr "删除:"
8ada9598 4407
6937cb4e 4408#: wt-status.c:280
a0b6b246
JX
4409msgid "modified:"
4410msgstr "修改:"
8ada9598 4411
6937cb4e 4412#: wt-status.c:282
a0b6b246
JX
4413msgid "renamed:"
4414msgstr "重命名:"
5c57d762 4415
6937cb4e 4416#: wt-status.c:284
a0b6b246
JX
4417msgid "typechange:"
4418msgstr "类型变更:"
8ada9598 4419
6937cb4e 4420#: wt-status.c:286
a0b6b246
JX
4421msgid "unknown:"
4422msgstr "未知:"
8ada9598 4423
6937cb4e 4424#: wt-status.c:288
a0b6b246
JX
4425msgid "unmerged:"
4426msgstr "未合并:"
8ada9598 4427
a0b6b246 4428# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6937cb4e 4429#: wt-status.c:370
a0b6b246
JX
4430msgid "new commits, "
4431msgstr "新提交, "
8ada9598 4432
a0b6b246 4433# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6937cb4e 4434#: wt-status.c:372
a0b6b246
JX
4435msgid "modified content, "
4436msgstr "修改的内容, "
1b7f4a34 4437
a0b6b246 4438# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6937cb4e 4439#: wt-status.c:374
a0b6b246
JX
4440msgid "untracked content, "
4441msgstr "未跟踪的内容, "
1b7f4a34 4442
5809aa05 4443#: wt-status.c:824
a4f16749
JX
4444#, c-format
4445msgid "Your stash currently has %d entry"
4446msgid_plural "Your stash currently has %d entries"
4447msgstr[0] "您的贮藏区当前有 %d 条记录"
4448msgstr[1] "您的贮藏区当前有 %d 条记录"
4449
5809aa05 4450#: wt-status.c:856
a0b6b246
JX
4451msgid "Submodules changed but not updated:"
4452msgstr "子模组已修改但尚未更新:"
1b7f4a34 4453
5809aa05 4454#: wt-status.c:858
a0b6b246
JX
4455msgid "Submodule changes to be committed:"
4456msgstr "要提交的子模组变更:"
1b7f4a34 4457
5809aa05 4458#: wt-status.c:940
a0b6b246 4459msgid ""
6937cb4e
JX
4460"Do not modify or remove the line above.\n"
4461"Everything below it will be ignored."
a0b6b246 4462msgstr ""
6937cb4e
JX
4463"不要改动或删除上面的一行。\n"
4464"其下所有内容都将被忽略。"
1b7f4a34 4465
5809aa05 4466#: wt-status.c:1053
a0b6b246
JX
4467msgid "You have unmerged paths."
4468msgstr "您有尚未合并的路径。"
1b7f4a34 4469
a0b6b246 4470# 译者:注意保持前导空格
5809aa05 4471#: wt-status.c:1056
a0b6b246
JX
4472msgid " (fix conflicts and run \"git commit\")"
4473msgstr " (解决冲突并运行 \"git commit\")"
1b7f4a34 4474
a0b6b246 4475# 译者:注意保持前导空格
5809aa05 4476#: wt-status.c:1058
a0b6b246
JX
4477msgid " (use \"git merge --abort\" to abort the merge)"
4478msgstr " (使用 \"git merge --abort\" 终止合并)"
1b7f4a34 4479
5809aa05 4480#: wt-status.c:1063
a0b6b246
JX
4481msgid "All conflicts fixed but you are still merging."
4482msgstr "所有冲突已解决但您仍处于合并中。"
1b7f4a34 4483
a0b6b246 4484# 译者:注意保持前导空格
5809aa05 4485#: wt-status.c:1066
a0b6b246
JX
4486msgid " (use \"git commit\" to conclude merge)"
4487msgstr " (使用 \"git commit\" 结束合并)"
1b7f4a34 4488
5809aa05 4489#: wt-status.c:1076
a0b6b246
JX
4490msgid "You are in the middle of an am session."
4491msgstr "您正处于 am 操作过程中。"
1b7f4a34 4492
5809aa05 4493#: wt-status.c:1079
a0b6b246
JX
4494msgid "The current patch is empty."
4495msgstr "当前的补丁为空。"
1b7f4a34 4496
a0b6b246 4497# 译者:注意保持前导空格
5809aa05 4498#: wt-status.c:1083
a0b6b246
JX
4499msgid " (fix conflicts and then run \"git am --continue\")"
4500msgstr " (解决冲突,然后运行 \"git am --continue\")"
1b7f4a34 4501
a0b6b246 4502# 译者:注意保持前导空格
5809aa05 4503#: wt-status.c:1085
a0b6b246
JX
4504msgid " (use \"git am --skip\" to skip this patch)"
4505msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1b7f4a34 4506
a0b6b246 4507# 译者:注意保持前导空格
5809aa05 4508#: wt-status.c:1087
a0b6b246
JX
4509msgid " (use \"git am --abort\" to restore the original branch)"
4510msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1b7f4a34 4511
5809aa05 4512#: wt-status.c:1219
1a79b2f1
JX
4513msgid "git-rebase-todo is missing."
4514msgstr "git-rebase-todo 丢失。"
4515
5809aa05 4516#: wt-status.c:1221
a0b6b246
JX
4517msgid "No commands done."
4518msgstr "没有命令被执行。"
4519
5809aa05 4520#: wt-status.c:1224
1b7f4a34 4521#, c-format
a0b6b246
JX
4522msgid "Last command done (%d command done):"
4523msgid_plural "Last commands done (%d commands done):"
4524msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
4525msgstr[1] "最后的命令已完成(%d 条命令被执行):"
1b7f4a34 4526
5809aa05 4527#: wt-status.c:1235
1b7f4a34 4528#, c-format
a0b6b246
JX
4529msgid " (see more in file %s)"
4530msgstr " (更多参见文件 %s)"
4531
5809aa05 4532#: wt-status.c:1240
a0b6b246
JX
4533msgid "No commands remaining."
4534msgstr "未剩下任何命令。"
1b7f4a34 4535
5809aa05 4536#: wt-status.c:1243
1b7f4a34 4537#, c-format
a0b6b246
JX
4538msgid "Next command to do (%d remaining command):"
4539msgid_plural "Next commands to do (%d remaining commands):"
4540msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
4541msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
1b7f4a34 4542
a0b6b246 4543# 译者:注意保持前导空格
5809aa05 4544#: wt-status.c:1251
a0b6b246
JX
4545msgid " (use \"git rebase --edit-todo\" to view and edit)"
4546msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
1b7f4a34 4547
5809aa05 4548#: wt-status.c:1264
1b7f4a34 4549#, c-format
a0b6b246
JX
4550msgid "You are currently rebasing branch '%s' on '%s'."
4551msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1b7f4a34 4552
5809aa05 4553#: wt-status.c:1269
a0b6b246
JX
4554msgid "You are currently rebasing."
4555msgstr "您在执行变基操作。"
1b7f4a34 4556
a0b6b246 4557# 译者:注意保持前导空格
5809aa05 4558#: wt-status.c:1283
a0b6b246
JX
4559msgid " (fix conflicts and then run \"git rebase --continue\")"
4560msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1b7f4a34 4561
a0b6b246 4562# 译者:注意保持前导空格
5809aa05 4563#: wt-status.c:1285
a0b6b246
JX
4564msgid " (use \"git rebase --skip\" to skip this patch)"
4565msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
4566
4567# 译者:注意保持前导空格
5809aa05 4568#: wt-status.c:1287
a0b6b246
JX
4569msgid " (use \"git rebase --abort\" to check out the original branch)"
4570msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
4571
4572# 译者:注意保持前导空格
5809aa05 4573#: wt-status.c:1293
a0b6b246
JX
4574msgid " (all conflicts fixed: run \"git rebase --continue\")"
4575msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1b7f4a34 4576
5809aa05 4577#: wt-status.c:1297
a0b6b246 4578#, c-format
1b7f4a34 4579msgid ""
a0b6b246
JX
4580"You are currently splitting a commit while rebasing branch '%s' on '%s'."
4581msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1b7f4a34 4582
5809aa05 4583#: wt-status.c:1302
a0b6b246
JX
4584msgid "You are currently splitting a commit during a rebase."
4585msgstr "您在执行变基操作时拆分提交。"
1b7f4a34 4586
a0b6b246 4587# 译者:注意保持前导空格
5809aa05 4588#: wt-status.c:1305
a0b6b246
JX
4589msgid " (Once your working directory is clean, run \"git rebase --continue\")"
4590msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1b7f4a34 4591
5809aa05 4592#: wt-status.c:1309
a0b6b246
JX
4593#, c-format
4594msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
4595msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1b7f4a34 4596
5809aa05 4597#: wt-status.c:1314
a0b6b246
JX
4598msgid "You are currently editing a commit during a rebase."
4599msgstr "您在执行变基操作时编辑提交。"
1b7f4a34 4600
a0b6b246 4601# 译者:注意保持前导空格
5809aa05 4602#: wt-status.c:1317
a0b6b246
JX
4603msgid " (use \"git commit --amend\" to amend the current commit)"
4604msgstr " (使用 \"git commit --amend\" 修补当前提交)"
4605
4606# 译者:注意保持前导空格
5809aa05 4607#: wt-status.c:1319
a0b6b246
JX
4608msgid ""
4609" (use \"git rebase --continue\" once you are satisfied with your changes)"
4610msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1b7f4a34 4611
5809aa05 4612#: wt-status.c:1329
1b7f4a34 4613#, c-format
a0b6b246
JX
4614msgid "You are currently cherry-picking commit %s."
4615msgstr "您在执行拣选提交 %s 的操作。"
1b7f4a34 4616
a0b6b246 4617# 译者:注意保持前导空格
5809aa05 4618#: wt-status.c:1334
a0b6b246
JX
4619msgid " (fix conflicts and run \"git cherry-pick --continue\")"
4620msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1b7f4a34 4621
a0b6b246 4622# 译者:注意保持前导空格
5809aa05 4623#: wt-status.c:1337
a0b6b246
JX
4624msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
4625msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1b7f4a34 4626
a0b6b246 4627# 译者:注意保持前导空格
5809aa05 4628#: wt-status.c:1339
a0b6b246
JX
4629msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
4630msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1b7f4a34 4631
5809aa05 4632#: wt-status.c:1348
1b7f4a34 4633#, c-format
a0b6b246
JX
4634msgid "You are currently reverting commit %s."
4635msgstr "您在执行反转提交 %s 的操作。"
1b7f4a34 4636
a0b6b246 4637# 译者:注意保持前导空格
5809aa05 4638#: wt-status.c:1353
a0b6b246
JX
4639msgid " (fix conflicts and run \"git revert --continue\")"
4640msgstr " (解决冲突并运行 \"git revert --continue\")"
1b7f4a34 4641
a0b6b246 4642# 译者:注意保持前导空格
5809aa05 4643#: wt-status.c:1356
a0b6b246
JX
4644msgid " (all conflicts fixed: run \"git revert --continue\")"
4645msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1b7f4a34 4646
a0b6b246 4647# 译者:注意保持前导空格
5809aa05 4648#: wt-status.c:1358
a0b6b246
JX
4649msgid " (use \"git revert --abort\" to cancel the revert operation)"
4650msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1b7f4a34 4651
5809aa05 4652#: wt-status.c:1369
1b7f4a34 4653#, c-format
a0b6b246
JX
4654msgid "You are currently bisecting, started from branch '%s'."
4655msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1b7f4a34 4656
5809aa05 4657#: wt-status.c:1373
a0b6b246
JX
4658msgid "You are currently bisecting."
4659msgstr "您在执行二分查找操作。"
1b7f4a34 4660
a0b6b246 4661# 译者:注意保持前导空格
5809aa05 4662#: wt-status.c:1376
a0b6b246
JX
4663msgid " (use \"git bisect reset\" to get back to the original branch)"
4664msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1b7f4a34 4665
5809aa05 4666#: wt-status.c:1573
a0b6b246
JX
4667msgid "On branch "
4668msgstr "位于分支 "
1b7f4a34 4669
5809aa05 4670#: wt-status.c:1579
a0b6b246
JX
4671msgid "interactive rebase in progress; onto "
4672msgstr "交互式变基操作正在进行中;至 "
1b7f4a34 4673
5809aa05 4674#: wt-status.c:1581
a0b6b246
JX
4675msgid "rebase in progress; onto "
4676msgstr "变基操作正在进行中;至 "
1b7f4a34 4677
5809aa05 4678#: wt-status.c:1586
a0b6b246
JX
4679msgid "HEAD detached at "
4680msgstr "头指针分离于 "
1b7f4a34 4681
5809aa05 4682#: wt-status.c:1588
a0b6b246
JX
4683msgid "HEAD detached from "
4684msgstr "头指针分离自 "
1b7f4a34 4685
5809aa05 4686#: wt-status.c:1591
a0b6b246
JX
4687msgid "Not currently on any branch."
4688msgstr "当前不在任何分支上。"
1b7f4a34 4689
5809aa05 4690#: wt-status.c:1611
a0b6b246
JX
4691msgid "Initial commit"
4692msgstr "初始提交"
1b7f4a34 4693
5809aa05 4694#: wt-status.c:1612
a4f16749
JX
4695msgid "No commits yet"
4696msgstr "尚无提交"
4697
5809aa05 4698#: wt-status.c:1626
a0b6b246
JX
4699msgid "Untracked files"
4700msgstr "未跟踪的文件"
1b7f4a34 4701
5809aa05 4702#: wt-status.c:1628
a0b6b246
JX
4703msgid "Ignored files"
4704msgstr "忽略的文件"
1b7f4a34 4705
5809aa05 4706#: wt-status.c:1632
a0b6b246
JX
4707#, c-format
4708msgid ""
4709"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
4710"may speed it up, but you have to be careful not to forget to add\n"
4711"new files yourself (see 'git help status')."
4712msgstr ""
4713"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
4714"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1b7f4a34 4715
5809aa05 4716#: wt-status.c:1638
a0b6b246
JX
4717#, c-format
4718msgid "Untracked files not listed%s"
4719msgstr "未跟踪的文件没有列出%s"
1b7f4a34 4720
a0b6b246 4721# 译者:中文字符串拼接,可删除前导空格
5809aa05 4722#: wt-status.c:1640
a0b6b246
JX
4723msgid " (use -u option to show untracked files)"
4724msgstr "(使用 -u 参数显示未跟踪的文件)"
1b7f4a34 4725
5809aa05 4726#: wt-status.c:1646
a0b6b246
JX
4727msgid "No changes"
4728msgstr "没有修改"
1b7f4a34 4729
5809aa05 4730#: wt-status.c:1651
a0b6b246
JX
4731#, c-format
4732msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
4733msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1b7f4a34 4734
5809aa05 4735#: wt-status.c:1654
a0b6b246
JX
4736#, c-format
4737msgid "no changes added to commit\n"
4738msgstr "修改尚未加入提交\n"
1b7f4a34 4739
5809aa05 4740#: wt-status.c:1657
a0b6b246
JX
4741#, c-format
4742msgid ""
4743"nothing added to commit but untracked files present (use \"git add\" to "
4744"track)\n"
4745msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1b7f4a34 4746
5809aa05 4747#: wt-status.c:1660
a0b6b246
JX
4748#, c-format
4749msgid "nothing added to commit but untracked files present\n"
4750msgstr "提交为空,但是存在尚未跟踪的文件\n"
1b7f4a34 4751
a0b6b246 4752# 译者:中文字符串拼接,可删除前导空格
5809aa05 4753#: wt-status.c:1663
a0b6b246
JX
4754#, c-format
4755msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
4756msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1b7f4a34 4757
5809aa05 4758#: wt-status.c:1666 wt-status.c:1671
a0b6b246
JX
4759#, c-format
4760msgid "nothing to commit\n"
4761msgstr "无文件要提交\n"
1b7f4a34 4762
a0b6b246 4763# 译者:中文字符串拼接,可删除前导空格
5809aa05 4764#: wt-status.c:1669
a0b6b246
JX
4765#, c-format
4766msgid "nothing to commit (use -u to show untracked files)\n"
4767msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1b7f4a34 4768
a0b6b246 4769# 译者:中文字符串拼接,可删除前导空格
5809aa05 4770#: wt-status.c:1673
a0b6b246
JX
4771#, c-format
4772msgid "nothing to commit, working tree clean\n"
4773msgstr "无文件要提交,干净的工作区\n"
4774
5809aa05 4775#: wt-status.c:1785
a4f16749
JX
4776msgid "No commits yet on "
4777msgstr "尚无提交在 "
1b7f4a34 4778
5809aa05 4779#: wt-status.c:1789
a0b6b246
JX
4780msgid "HEAD (no branch)"
4781msgstr "HEAD(非分支)"
1b7f4a34 4782
a0b6b246 4783# 译者:注意保持句尾空格
5809aa05 4784#: wt-status.c:1818 wt-status.c:1826
a0b6b246
JX
4785msgid "behind "
4786msgstr "落后 "
1b7f4a34 4787
5809aa05 4788#: wt-status.c:1821 wt-status.c:1824
a0b6b246
JX
4789msgid "ahead "
4790msgstr "领先 "
1b7f4a34 4791
a0b6b246 4792#. TRANSLATORS: the action is e.g. "pull with rebase"
5809aa05 4793#: wt-status.c:2318
a0b6b246
JX
4794#, c-format
4795msgid "cannot %s: You have unstaged changes."
4796msgstr "不能%s:您有未暂存的变更。"
1b7f4a34 4797
5809aa05 4798#: wt-status.c:2324
a0b6b246 4799msgid "additionally, your index contains uncommitted changes."
29004bbb 4800msgstr "另外,您的索引中包含未提交的变更。"
1b7f4a34 4801
5809aa05 4802#: wt-status.c:2326
a0b6b246
JX
4803#, c-format
4804msgid "cannot %s: Your index contains uncommitted changes."
4805msgstr "不能%s:您的索引中包含未提交的变更。"
1b7f4a34 4806
6937cb4e 4807#: compat/precompose_utf8.c:58 builtin/clone.c:437
a0b6b246
JX
4808#, c-format
4809msgid "failed to unlink '%s'"
4810msgstr "无法删除 '%s'"
1b7f4a34 4811
a4f16749 4812#: builtin/add.c:24
a0b6b246
JX
4813msgid "git add [<options>] [--] <pathspec>..."
4814msgstr "git add [<选项>] [--] <路径规格>..."
1b7f4a34 4815
5809aa05 4816#: builtin/add.c:83
a0b6b246
JX
4817#, c-format
4818msgid "unexpected diff status %c"
4819msgstr "意外的差异状态 %c"
1b7f4a34 4820
5809aa05 4821#: builtin/add.c:88 builtin/commit.c:291
a0b6b246
JX
4822msgid "updating files failed"
4823msgstr "更新文件失败"
1b7f4a34 4824
5809aa05 4825#: builtin/add.c:98
a0b6b246
JX
4826#, c-format
4827msgid "remove '%s'\n"
4828msgstr "删除 '%s'\n"
1b7f4a34 4829
5809aa05 4830#: builtin/add.c:173
a0b6b246
JX
4831msgid "Unstaged changes after refreshing the index:"
4832msgstr "刷新索引之后尚未被暂存的变更:"
1b7f4a34 4833
5809aa05 4834#: builtin/add.c:233 builtin/rev-parse.c:888
a0b6b246
JX
4835msgid "Could not read the index"
4836msgstr "不能读取索引"
1b7f4a34 4837
5809aa05 4838#: builtin/add.c:244
a0b6b246
JX
4839#, c-format
4840msgid "Could not open '%s' for writing."
4841msgstr "无法打开 '%s' 进行写入。"
1b7f4a34 4842
5809aa05 4843#: builtin/add.c:248
a0b6b246
JX
4844msgid "Could not write patch"
4845msgstr "不能生成补丁"
1b7f4a34 4846
5809aa05 4847#: builtin/add.c:251
a0b6b246
JX
4848msgid "editing patch failed"
4849msgstr "编辑补丁失败"
1b7f4a34 4850
5809aa05 4851#: builtin/add.c:254
1b7f4a34 4852#, c-format
a0b6b246 4853msgid "Could not stat '%s'"
65e2041e 4854msgstr "不能对 '%s' 调用 stat"
1b7f4a34 4855
5809aa05 4856#: builtin/add.c:256
a0b6b246
JX
4857msgid "Empty patch. Aborted."
4858msgstr "空补丁。异常终止。"
1b7f4a34 4859
5809aa05 4860#: builtin/add.c:261
a0b6b246
JX
4861#, c-format
4862msgid "Could not apply '%s'"
4863msgstr "不能应用 '%s'"
1b7f4a34 4864
5809aa05 4865#: builtin/add.c:271
a0b6b246
JX
4866msgid "The following paths are ignored by one of your .gitignore files:\n"
4867msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 4868
5809aa05
JX
4869#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
4870#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
6937cb4e 4871#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
a0b6b246
JX
4872msgid "dry run"
4873msgstr "演习"
8ada9598 4874
5809aa05 4875#: builtin/add.c:294
a0b6b246
JX
4876msgid "interactive picking"
4877msgstr "交互式拣选"
8ada9598 4878
5809aa05 4879#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
a0b6b246
JX
4880msgid "select hunks interactively"
4881msgstr "交互式挑选数据块"
8ada9598 4882
5809aa05 4883#: builtin/add.c:296
a0b6b246
JX
4884msgid "edit current diff and apply"
4885msgstr "编辑当前差异并应用"
8ada9598 4886
5809aa05 4887#: builtin/add.c:297
a0b6b246
JX
4888msgid "allow adding otherwise ignored files"
4889msgstr "允许添加忽略的文件"
8ada9598 4890
5809aa05 4891#: builtin/add.c:298
a0b6b246
JX
4892msgid "update tracked files"
4893msgstr "更新已跟踪的文件"
8ada9598 4894
5809aa05
JX
4895#: builtin/add.c:299
4896msgid "renormalize EOL of tracked files (implies -u)"
4897msgstr "对已跟踪文件(暗含 -u)重新归一换行符"
4898
4899#: builtin/add.c:300
a0b6b246
JX
4900msgid "record only the fact that the path will be added later"
4901msgstr "只记录,该路径稍后再添加"
8ada9598 4902
5809aa05 4903#: builtin/add.c:301
a0b6b246
JX
4904msgid "add changes from all tracked and untracked files"
4905msgstr "添加所有改变的已跟踪文件和未跟踪文件"
8ada9598 4906
5809aa05 4907#: builtin/add.c:304
a0b6b246
JX
4908msgid "ignore paths removed in the working tree (same as --no-all)"
4909msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
8ada9598 4910
5809aa05 4911#: builtin/add.c:306
a0b6b246
JX
4912msgid "don't add, only refresh the index"
4913msgstr "不添加,只刷新索引"
8ada9598 4914
5809aa05 4915#: builtin/add.c:307
a0b6b246
JX
4916msgid "just skip files which cannot be added because of errors"
4917msgstr "跳过因出错不能添加的文件"
8ada9598 4918
5809aa05 4919#: builtin/add.c:308
a0b6b246
JX
4920msgid "check if - even missing - files are ignored in dry run"
4921msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
8ada9598 4922
5809aa05 4923#: builtin/add.c:309 builtin/update-index.c:964
a0b6b246
JX
4924msgid "(+/-)x"
4925msgstr "(+/-)x"
8ada9598 4926
5809aa05 4927#: builtin/add.c:309 builtin/update-index.c:965
a0b6b246
JX
4928msgid "override the executable bit of the listed files"
4929msgstr "覆盖列表里文件的可执行位"
8ada9598 4930
5809aa05 4931#: builtin/add.c:311
a4f16749
JX
4932msgid "warn when adding an embedded repository"
4933msgstr "创建一个嵌入式仓库时给予警告"
4934
5809aa05 4935#: builtin/add.c:326
a4f16749
JX
4936#, c-format
4937msgid ""
4938"You've added another git repository inside your current repository.\n"
4939"Clones of the outer repository will not contain the contents of\n"
4940"the embedded repository and will not know how to obtain it.\n"
4941"If you meant to add a submodule, use:\n"
4942"\n"
4943"\tgit submodule add <url> %s\n"
4944"\n"
4945"If you added this path by mistake, you can remove it from the\n"
4946"index with:\n"
4947"\n"
4948"\tgit rm --cached %s\n"
4949"\n"
4950"See \"git help submodule\" for more information."
4951msgstr ""
6937cb4e
JX
4952"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容,并"
4953"且不知道该如何获取它。\n"
a4f16749
JX
4954"如果您要添加一个子模组,使用:\n"
4955"\n"
4956"\tgit submodule add <url> %s\n"
4957"\n"
4958"如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n"
4959"\n"
4960"\tgit rm --cached %s\n"
4961"\n"
4962"参见 \"git help submodule\" 获取更多信息。"
4963
5809aa05 4964#: builtin/add.c:354
a4f16749
JX
4965#, c-format
4966msgid "adding embedded git repository: %s"
4967msgstr "正在添加嵌入式 git 仓库:%s"
4968
5809aa05 4969#: builtin/add.c:372
8ada9598 4970#, c-format
a0b6b246
JX
4971msgid "Use -f if you really want to add them.\n"
4972msgstr "使用 -f 参数如果您确实要添加它们。\n"
8ada9598 4973
5809aa05 4974#: builtin/add.c:380
a0b6b246
JX
4975msgid "adding files failed"
4976msgstr "添加文件失败"
8ada9598 4977
5809aa05 4978#: builtin/add.c:417
a0b6b246
JX
4979msgid "-A and -u are mutually incompatible"
4980msgstr "-A 和 -u 选项互斥"
8ada9598 4981
5809aa05 4982#: builtin/add.c:424
a0b6b246
JX
4983msgid "Option --ignore-missing can only be used together with --dry-run"
4984msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 4985
5809aa05 4986#: builtin/add.c:428
8ada9598 4987#, c-format
a0b6b246
JX
4988msgid "--chmod param '%s' must be either -x or +x"
4989msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
8ada9598 4990
5809aa05 4991#: builtin/add.c:443
8ada9598 4992#, c-format
a0b6b246
JX
4993msgid "Nothing specified, nothing added.\n"
4994msgstr "没有指定文件,也没有文件被添加。\n"
8ada9598 4995
5809aa05 4996#: builtin/add.c:444
8ada9598 4997#, c-format
a0b6b246
JX
4998msgid "Maybe you wanted to say 'git add .'?\n"
4999msgstr "也许您想要执行 'git add .'?\n"
8ada9598 5000
5809aa05
JX
5001#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
5002#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
5003#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
5004#: builtin/rm.c:271 builtin/submodule--helper.c:311
a0b6b246
JX
5005msgid "index file corrupt"
5006msgstr "索引文件损坏"
8ada9598 5007
6937cb4e 5008#: builtin/am.c:414
a0b6b246
JX
5009msgid "could not parse author script"
5010msgstr "不能解析作者脚本"
8ada9598 5011
6937cb4e 5012#: builtin/am.c:498
81809b99 5013#, c-format
a0b6b246
JX
5014msgid "'%s' was deleted by the applypatch-msg hook"
5015msgstr "'%s' 被 applypatch-msg 钩子删除"
8ada9598 5016
6937cb4e 5017#: builtin/am.c:539
8ada9598 5018#, c-format
a0b6b246
JX
5019msgid "Malformed input line: '%s'."
5020msgstr "非法的输入行:'%s'。"
8ada9598 5021
6937cb4e 5022#: builtin/am.c:576
8ada9598 5023#, c-format
a0b6b246
JX
5024msgid "Failed to copy notes from '%s' to '%s'"
5025msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
8ada9598 5026
6937cb4e 5027#: builtin/am.c:602
a0b6b246
JX
5028msgid "fseek failed"
5029msgstr "fseek 失败"
8ada9598 5030
5809aa05 5031#: builtin/am.c:790
8ada9598 5032#, c-format
a0b6b246
JX
5033msgid "could not parse patch '%s'"
5034msgstr "无法解析补丁 '%s'"
8ada9598 5035
5809aa05 5036#: builtin/am.c:855
a0b6b246
JX
5037msgid "Only one StGIT patch series can be applied at once"
5038msgstr "一次只能有一个 StGIT 补丁队列被应用"
5039
5809aa05 5040#: builtin/am.c:903
a0b6b246
JX
5041msgid "invalid timestamp"
5042msgstr "无效的时间戳"
5043
5809aa05 5044#: builtin/am.c:908 builtin/am.c:920
a0b6b246
JX
5045msgid "invalid Date line"
5046msgstr "无效的日期行"
8ada9598 5047
5809aa05 5048#: builtin/am.c:915
a0b6b246
JX
5049msgid "invalid timezone offset"
5050msgstr "无效的时区偏移值"
8ada9598 5051
5809aa05 5052#: builtin/am.c:1008
a0b6b246 5053msgid "Patch format detection failed."
87cb7997 5054msgstr "补丁格式探测失败。"
8ada9598 5055
5809aa05 5056#: builtin/am.c:1013 builtin/clone.c:402
8ada9598 5057#, c-format
a0b6b246
JX
5058msgid "failed to create directory '%s'"
5059msgstr "无法创建目录 '%s'"
8ada9598 5060
5809aa05 5061#: builtin/am.c:1017
a0b6b246
JX
5062msgid "Failed to split patches."
5063msgstr "无法拆分补丁。"
814ff314 5064
5809aa05 5065#: builtin/am.c:1146 builtin/commit.c:376
a0b6b246
JX
5066msgid "unable to write index file"
5067msgstr "无法写入索引文件"
8ada9598 5068
5809aa05 5069#: builtin/am.c:1160
8ada9598 5070#, c-format
a0b6b246
JX
5071msgid "When you have resolved this problem, run \"%s --continue\"."
5072msgstr "当您解决这一问题,执行 \"%s --continue\"。"
8ada9598 5073
5809aa05 5074#: builtin/am.c:1161
81809b99 5075#, c-format
a0b6b246
JX
5076msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
5077msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
8ada9598 5078
5809aa05 5079#: builtin/am.c:1162
81809b99 5080#, c-format
a0b6b246
JX
5081msgid "To restore the original branch and stop patching, run \"%s --abort\"."
5082msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
8ada9598 5083
5809aa05 5084#: builtin/am.c:1269
a4f16749
JX
5085msgid "Patch is empty."
5086msgstr "补丁为空。"
23ff3338 5087
5809aa05 5088#: builtin/am.c:1335
8ada9598 5089#, c-format
a4f16749
JX
5090msgid "invalid ident line: %.*s"
5091msgstr "无效的身份标识:%.*s"
8ada9598 5092
5809aa05 5093#: builtin/am.c:1357
8ada9598 5094#, c-format
a0b6b246
JX
5095msgid "unable to parse commit %s"
5096msgstr "不能解析提交 %s"
8ada9598 5097
5809aa05 5098#: builtin/am.c:1550
a0b6b246
JX
5099msgid "Repository lacks necessary blobs to fall back on 3-way merge."
5100msgstr "仓库缺乏必要的数据对象以进行三方合并。"
814ff314 5101
5809aa05 5102#: builtin/am.c:1552
a0b6b246
JX
5103msgid "Using index info to reconstruct a base tree..."
5104msgstr "使用索引来重建一个(三方合并的)基础目录树..."
8ada9598 5105
5809aa05 5106#: builtin/am.c:1571
a0b6b246
JX
5107msgid ""
5108"Did you hand edit your patch?\n"
5109"It does not apply to blobs recorded in its index."
5110msgstr ""
5111"您是否曾手动编辑过您的补丁?\n"
5112"无法应用补丁到索引中的数据对象上。"
23ff3338 5113
5809aa05 5114#: builtin/am.c:1577
a0b6b246
JX
5115msgid "Falling back to patching base and 3-way merge..."
5116msgstr "回落到基础版本上打补丁及进行三方合并..."
8ada9598 5117
5809aa05 5118#: builtin/am.c:1602
a0b6b246
JX
5119msgid "Failed to merge in the changes."
5120msgstr "无法合并变更。"
d691f479 5121
5809aa05 5122#: builtin/am.c:1626 builtin/merge.c:642
a0b6b246
JX
5123msgid "git write-tree failed to write a tree"
5124msgstr "git write-tree 无法写入一树对象"
814ff314 5125
5809aa05 5126#: builtin/am.c:1633
a0b6b246
JX
5127msgid "applying to an empty history"
5128msgstr "正应用到一个空历史上"
8ada9598 5129
5809aa05
JX
5130#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
5131#: builtin/merge.c:850
a0b6b246
JX
5132msgid "failed to write commit object"
5133msgstr "无法写提交对象"
8ada9598 5134
5809aa05 5135#: builtin/am.c:1679 builtin/am.c:1683
8ada9598 5136#, c-format
a0b6b246
JX
5137msgid "cannot resume: %s does not exist."
5138msgstr "无法继续:%s 不存在。"
8ada9598 5139
5809aa05 5140#: builtin/am.c:1699
a0b6b246
JX
5141msgid "cannot be interactive without stdin connected to a terminal."
5142msgstr "标准输入没有和终端关联,不能进行交互式操作。"
8ada9598 5143
5809aa05 5144#: builtin/am.c:1704
a0b6b246
JX
5145msgid "Commit Body is:"
5146msgstr "提交内容为:"
8ada9598 5147
a0b6b246
JX
5148# 译者:注意保持句尾空格
5149#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
5150#. in your translation. The program will only accept English
5151#. input at this point.
5152#.
5809aa05 5153#: builtin/am.c:1714
a0b6b246
JX
5154msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
5155msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
8ada9598 5156
5809aa05 5157#: builtin/am.c:1764
8ada9598 5158#, c-format
a0b6b246
JX
5159msgid "Dirty index: cannot apply patches (dirty: %s)"
5160msgstr "脏索引:不能应用补丁(脏文件:%s)"
8ada9598 5161
5809aa05 5162#: builtin/am.c:1804 builtin/am.c:1876
81809b99 5163#, c-format
a0b6b246
JX
5164msgid "Applying: %.*s"
5165msgstr "应用:%.*s"
8ada9598 5166
5809aa05 5167#: builtin/am.c:1820
a0b6b246
JX
5168msgid "No changes -- Patch already applied."
5169msgstr "没有变更 —— 补丁已经应用过。"
8ada9598 5170
5809aa05 5171#: builtin/am.c:1828
81809b99 5172#, c-format
a0b6b246
JX
5173msgid "Patch failed at %s %.*s"
5174msgstr "打补丁失败于 %s %.*s"
8ada9598 5175
5809aa05 5176#: builtin/am.c:1834
8ada9598 5177#, c-format
a0b6b246
JX
5178msgid "The copy of the patch that failed is found in: %s"
5179msgstr "失败的补丁文件副本位于:%s"
8ada9598 5180
5809aa05 5181#: builtin/am.c:1879
a0b6b246
JX
5182msgid ""
5183"No changes - did you forget to use 'git add'?\n"
5184"If there is nothing left to stage, chances are that something else\n"
5185"already introduced the same changes; you might want to skip this patch."
5186msgstr ""
5187"没有变更 —— 您是不是忘了执行 'git add'?\n"
5188"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
5189"您也许想要跳过这个补丁。"
8ada9598 5190
5809aa05 5191#: builtin/am.c:1886
a0b6b246
JX
5192msgid ""
5193"You still have unmerged paths in your index.\n"
a4f16749
JX
5194"You should 'git add' each file with resolved conflicts to mark them as "
5195"such.\n"
5196"You might run `git rm` on a file to accept \"deleted by them\" for it."
a0b6b246 5197msgstr ""
a4f16749
JX
5198"在您的索引中仍存在未合并的路径。\n"
5199"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
5200"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
8ada9598 5201
5809aa05 5202#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
6937cb4e 5203#: builtin/reset.c:340
8ada9598 5204#, c-format
a0b6b246
JX
5205msgid "Could not parse object '%s'."
5206msgstr "不能解析对象 '%s'。"
8ada9598 5207
5809aa05 5208#: builtin/am.c:2045
a0b6b246
JX
5209msgid "failed to clean index"
5210msgstr "无法清空索引"
5b04ee3b 5211
5809aa05 5212#: builtin/am.c:2080
a0b6b246
JX
5213msgid ""
5214"You seem to have moved HEAD since the last 'am' failure.\n"
5215"Not rewinding to ORIG_HEAD"
5216msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
8ada9598 5217
5809aa05 5218#: builtin/am.c:2143
8ada9598 5219#, c-format
a0b6b246
JX
5220msgid "Invalid value for --patch-format: %s"
5221msgstr "无效的 --patch-format 值:%s"
8ada9598 5222
5809aa05 5223#: builtin/am.c:2176
a0b6b246
JX
5224msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
5225msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
5b04ee3b 5226
5809aa05 5227#: builtin/am.c:2177
a0b6b246
JX
5228msgid "git am [<options>] (--continue | --skip | --abort)"
5229msgstr "git am [<选项>] (--continue | --skip | --abort)"
8ada9598 5230
5809aa05 5231#: builtin/am.c:2183
a0b6b246
JX
5232msgid "run interactively"
5233msgstr "以交互式方式运行"
8ada9598 5234
5809aa05 5235#: builtin/am.c:2185
a0b6b246
JX
5236msgid "historical option -- no-op"
5237msgstr "老的参数 —— 无作用"
8ada9598 5238
5809aa05 5239#: builtin/am.c:2187
a0b6b246
JX
5240msgid "allow fall back on 3way merging if needed"
5241msgstr "如果必要,允许使用三方合并。"
8ada9598 5242
5809aa05 5243#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
a4f16749 5244#: builtin/repack.c:180
a0b6b246
JX
5245msgid "be quiet"
5246msgstr "静默模式"
8ada9598 5247
5809aa05 5248#: builtin/am.c:2190
a0b6b246
JX
5249msgid "add a Signed-off-by line to the commit message"
5250msgstr "在提交说明中添加一个 Signed-off-by 签名"
5c57d762 5251
5809aa05 5252#: builtin/am.c:2193
a0b6b246
JX
5253msgid "recode into utf8 (default)"
5254msgstr "使用 utf8 字符集(默认)"
5c57d762 5255
5809aa05 5256#: builtin/am.c:2195
a0b6b246
JX
5257msgid "pass -k flag to git-mailinfo"
5258msgstr "向 git-mailinfo 传递 -k 参数"
5c57d762 5259
5809aa05 5260#: builtin/am.c:2197
a0b6b246
JX
5261msgid "pass -b flag to git-mailinfo"
5262msgstr "向 git-mailinfo 传递 -b 参数"
5c57d762 5263
5809aa05 5264#: builtin/am.c:2199
a0b6b246
JX
5265msgid "pass -m flag to git-mailinfo"
5266msgstr "向 git-mailinfo 传递 -m 参数"
5c57d762 5267
5809aa05 5268#: builtin/am.c:2201
a0b6b246
JX
5269msgid "pass --keep-cr flag to git-mailsplit for mbox format"
5270msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
5c57d762 5271
5809aa05 5272#: builtin/am.c:2204
a0b6b246
JX
5273msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
5274msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
8ada9598 5275
5809aa05 5276#: builtin/am.c:2207
a0b6b246
JX
5277msgid "strip everything before a scissors line"
5278msgstr "丢弃裁切线前的所有内容"
8ada9598 5279
5809aa05
JX
5280#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
5281#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
5282#: builtin/am.c:2236
a0b6b246
JX
5283msgid "pass it through git-apply"
5284msgstr "传递给 git-apply"
8ada9598 5285
5809aa05
JX
5286#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
5287#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
6937cb4e
JX
5288#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
5289#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
5290#: parse-options.h:132 parse-options.h:134 parse-options.h:245
a0b6b246
JX
5291msgid "n"
5292msgstr "n"
8ada9598 5293
5809aa05 5294#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
6937cb4e 5295#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
a0b6b246
JX
5296msgid "format"
5297msgstr "格式"
8ada9598 5298
5809aa05 5299#: builtin/am.c:2233
a0b6b246
JX
5300msgid "format the patch(es) are in"
5301msgstr "补丁的格式"
8ada9598 5302
5809aa05 5303#: builtin/am.c:2239
a0b6b246
JX
5304msgid "override error message when patch failure occurs"
5305msgstr "打补丁失败时显示的错误信息"
8ada9598 5306
5809aa05 5307#: builtin/am.c:2241
a0b6b246
JX
5308msgid "continue applying patches after resolving a conflict"
5309msgstr "冲突解决后继续应用补丁"
814ff314 5310
5809aa05 5311#: builtin/am.c:2244
a0b6b246
JX
5312msgid "synonyms for --continue"
5313msgstr "和 --continue 同义"
8ada9598 5314
5809aa05 5315#: builtin/am.c:2247
a0b6b246
JX
5316msgid "skip the current patch"
5317msgstr "跳过当前补丁"
23ff3338 5318
5809aa05 5319#: builtin/am.c:2250
a0b6b246
JX
5320msgid "restore the original branch and abort the patching operation."
5321msgstr "恢复原始分支并终止打补丁操作。"
8ada9598 5322
5809aa05 5323#: builtin/am.c:2254
a0b6b246
JX
5324msgid "lie about committer date"
5325msgstr "将作者日期作为提交日期"
8ada9598 5326
5809aa05 5327#: builtin/am.c:2256
a0b6b246
JX
5328msgid "use current timestamp for author date"
5329msgstr "用当前时间作为作者日期"
8ada9598 5330
5809aa05
JX
5331#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
5332#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
a0b6b246
JX
5333msgid "key-id"
5334msgstr "key-id"
8ada9598 5335
5809aa05 5336#: builtin/am.c:2259
a0b6b246
JX
5337msgid "GPG-sign commits"
5338msgstr "使用 GPG 签名提交"
8ada9598 5339
5809aa05 5340#: builtin/am.c:2262
a0b6b246
JX
5341msgid "(internal use for git-rebase)"
5342msgstr "(内部使用,用于 git-rebase)"
8ada9598 5343
5809aa05 5344#: builtin/am.c:2280
a0b6b246
JX
5345msgid ""
5346"The -b/--binary option has been a no-op for long time, and\n"
5347"it will be removed. Please do not use it anymore."
5348msgstr ""
5349"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
5350"请不要再使用它了。"
8ada9598 5351
5809aa05 5352#: builtin/am.c:2287
a0b6b246
JX
5353msgid "failed to read the index"
5354msgstr "无法读取索引"
8ada9598 5355
5809aa05 5356#: builtin/am.c:2302
a0b6b246
JX
5357#, c-format
5358msgid "previous rebase directory %s still exists but mbox given."
5359msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
8ada9598 5360
5809aa05 5361#: builtin/am.c:2326
a0b6b246
JX
5362#, c-format
5363msgid ""
5364"Stray %s directory found.\n"
5365"Use \"git am --abort\" to remove it."
5366msgstr ""
5367"发现了错误的 %s 目录。\n"
5368"使用 \"git am --abort\" 删除它。"
c04f5ac3 5369
5809aa05 5370#: builtin/am.c:2332
a0b6b246
JX
5371msgid "Resolve operation not in progress, we are not resuming."
5372msgstr "解决操作未进行,我们不会继续。"
c04f5ac3 5373
a0b6b246
JX
5374#: builtin/apply.c:8
5375msgid "git apply [<options>] [<patch>...]"
5376msgstr "git apply [<选项>] [<补丁>...]"
c04f5ac3 5377
c04f5ac3
JX
5378#: builtin/archive.c:17
5379#, c-format
5380msgid "could not create archive file '%s'"
90e6ef53 5381msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
5382
5383#: builtin/archive.c:20
5384msgid "could not redirect output"
195febda 5385msgstr "不能重定向输出"
c04f5ac3
JX
5386
5387#: builtin/archive.c:37
5388msgid "git archive: Remote with no URL"
4375c10e 5389msgstr "git archive:未提供远程 URL"
c04f5ac3
JX
5390
5391#: builtin/archive.c:58
5392msgid "git archive: expected ACK/NAK, got EOF"
4375c10e 5393msgstr "git archive:应为 ACK/NACK,却得到 EOF"
c04f5ac3 5394
1003b3a5 5395#: builtin/archive.c:61
c04f5ac3
JX
5396#, c-format
5397msgid "git archive: NACK %s"
90e6ef53 5398msgstr "git archive:NACK %s"
c04f5ac3 5399
1003b3a5 5400#: builtin/archive.c:64
c04f5ac3 5401msgid "git archive: protocol error"
90e6ef53 5402msgstr "git archive:协议错误"
c04f5ac3 5403
1003b3a5 5404#: builtin/archive.c:68
c04f5ac3 5405msgid "git archive: expected a flush"
a0b6b246 5406msgstr "git archive:应有一个 flush 刷新"
c04f5ac3 5407
5809aa05 5408#: builtin/bisect--helper.c:12
ef317cd5 5409msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 5410msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5 5411
5809aa05
JX
5412#: builtin/bisect--helper.c:13
5413msgid "git bisect--helper --write-terms <bad_term> <good_term>"
5414msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>"
5415
5416#: builtin/bisect--helper.c:14
5417msgid "git bisect--helper --bisect-clean-state"
5418msgstr "git bisect--helper --bisect-clean-state"
5419
5420#: builtin/bisect--helper.c:46
5421#, c-format
5422msgid "'%s' is not a valid term"
5423msgstr "'%s' 不是一个有效的术语"
5424
5425#: builtin/bisect--helper.c:50
5426#, c-format
5427msgid "can't use the builtin command '%s' as a term"
5428msgstr "不能使用内置命令 '%s' 作为术语"
5429
5430#: builtin/bisect--helper.c:60
5431#, c-format
5432msgid "can't change the meaning of the term '%s'"
5433msgstr "不能修改术语 '%s' 的含义"
5434
5435#: builtin/bisect--helper.c:71
5436msgid "please use two different terms"
5437msgstr "请使用两个不同的术语"
5438
5439#: builtin/bisect--helper.c:78
5440msgid "could not open the file BISECT_TERMS"
5441msgstr "不能打开文件 BISECT_TERMS"
5442
5443#: builtin/bisect--helper.c:120
ef317cd5 5444msgid "perform 'git bisect next'"
07432cef 5445msgstr "执行 'git bisect next'"
ef317cd5 5446
5809aa05
JX
5447#: builtin/bisect--helper.c:122
5448msgid "write the terms to .git/BISECT_TERMS"
5449msgstr "将术语写入 .git/BISECT_TERMS"
5450
5451#: builtin/bisect--helper.c:124
5452msgid "cleanup the bisection state"
5453msgstr "清除二分查找状态"
5454
5455#: builtin/bisect--helper.c:126
5456msgid "check for expected revs"
5457msgstr "检查预期的版本"
5458
5459#: builtin/bisect--helper.c:128
ef317cd5 5460msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 5461msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5 5462
5809aa05
JX
5463#: builtin/bisect--helper.c:143
5464msgid "--write-terms requires two arguments"
5465msgstr "--write-terms 需要两个参数"
5466
5467#: builtin/bisect--helper.c:147
5468msgid "--bisect-clean-state requires no arguments"
5469msgstr "--bisect-clean-state 不需要参数"
5470
a4f16749 5471#: builtin/blame.c:27
7aea43ff
JX
5472msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
5473msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
ef317cd5 5474
a4f16749 5475#: builtin/blame.c:32
814ff314
JX
5476msgid "<rev-opts> are documented in git-rev-list(1)"
5477msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
ef317cd5 5478
a4f16749 5479#: builtin/blame.c:668
ef317cd5 5480msgid "Show blame entries as we find them, incrementally"
07432cef 5481msgstr "增量式地显示发现的 blame 条目"
ef317cd5 5482
a4f16749 5483#: builtin/blame.c:669
ef317cd5 5484msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 5485msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 5486
a4f16749 5487#: builtin/blame.c:670
ef317cd5 5488msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 5489msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 5490
a4f16749 5491#: builtin/blame.c:671
ef317cd5 5492msgid "Show work cost statistics"
07432cef 5493msgstr "显示命令消耗统计"
ef317cd5 5494
a4f16749 5495#: builtin/blame.c:672
276ceeaa
JX
5496msgid "Force progress reporting"
5497msgstr "强制进度显示"
5498
a4f16749 5499#: builtin/blame.c:673
ef317cd5 5500msgid "Show output score for blame entries"
07432cef 5501msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 5502
a4f16749 5503#: builtin/blame.c:674
ef317cd5 5504msgid "Show original filename (Default: auto)"
07432cef 5505msgstr "显示原始文件名(默认:自动)"
ef317cd5 5506
a4f16749 5507#: builtin/blame.c:675
ef317cd5 5508msgid "Show original linenumber (Default: off)"
07432cef 5509msgstr "显示原始的行号(默认:关闭)"
ef317cd5 5510
a4f16749 5511#: builtin/blame.c:676
ef317cd5 5512msgid "Show in a format designed for machine consumption"
07432cef 5513msgstr "显示为一个适合机器读取的格式"
ef317cd5 5514
a4f16749 5515#: builtin/blame.c:677
ef317cd5 5516msgid "Show porcelain format with per-line commit information"
07432cef 5517msgstr "为每一行显示机器适用的提交信息"
ef317cd5 5518
a4f16749 5519#: builtin/blame.c:678
ef317cd5 5520msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 5521msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 5522
a4f16749 5523#: builtin/blame.c:679
ef317cd5 5524msgid "Show raw timestamp (Default: off)"
07432cef 5525msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 5526
a4f16749 5527#: builtin/blame.c:680
ef317cd5 5528msgid "Show long commit SHA1 (Default: off)"
4375c10e 5529msgstr "显示长的 SHA1 提交号(默认:关闭)"
ef317cd5 5530
a4f16749 5531#: builtin/blame.c:681
ef317cd5 5532msgid "Suppress author name and timestamp (Default: off)"
07432cef 5533msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 5534
a4f16749 5535#: builtin/blame.c:682
ef317cd5 5536msgid "Show author email instead of name (Default: off)"
07432cef 5537msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 5538
a4f16749 5539#: builtin/blame.c:683
ef317cd5 5540msgid "Ignore whitespace differences"
07432cef 5541msgstr "忽略空白差异"
ef317cd5 5542
a4f16749 5543#: builtin/blame.c:690
1a79b2f1
JX
5544msgid "Use an experimental heuristic to improve diffs"
5545msgstr "使用一个试验性的启发式算法改进差异显示"
a0b6b246 5546
a4f16749 5547#: builtin/blame.c:692
ef317cd5 5548msgid "Spend extra cycles to find better match"
07432cef 5549msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 5550
a4f16749 5551#: builtin/blame.c:693
ef317cd5 5552msgid "Use revisions from <file> instead of calling git-rev-list"
d9d56b23 5553msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
ef317cd5 5554
a4f16749 5555#: builtin/blame.c:694
ef317cd5 5556msgid "Use <file>'s contents as the final image"
d9d56b23 5557msgstr "使用 <文件> 的内容作为最终的图片"
ef317cd5 5558
a4f16749 5559#: builtin/blame.c:695 builtin/blame.c:696
ef317cd5 5560msgid "score"
07432cef 5561msgstr "得分"
ef317cd5 5562
a4f16749 5563#: builtin/blame.c:695
ef317cd5 5564msgid "Find line copies within and across files"
07432cef 5565msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 5566
a4f16749 5567#: builtin/blame.c:696
ef317cd5 5568msgid "Find line movements within and across files"
07432cef 5569msgstr "找到文件内及跨文件的行移动"
ef317cd5 5570
a4f16749 5571#: builtin/blame.c:697
ef317cd5 5572msgid "n,m"
07432cef 5573msgstr "n,m"
ef317cd5 5574
a4f16749 5575#: builtin/blame.c:697
ef317cd5 5576msgid "Process only line range n,m, counting from 1"
07432cef 5577msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 5578
a4f16749 5579#: builtin/blame.c:744
a0b6b246
JX
5580msgid "--progress can't be used with --incremental or porcelain formats"
5581msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
5582
a4f16749
JX
5583#. TRANSLATORS: This string is used to tell us the
5584#. maximum display width for a relative timestamp in
5585#. "git blame" output. For C locale, "4 years, 11
5586#. months ago", which takes 22 places, is the longest
5587#. among various forms of relative timestamps, but
5588#. your language may need more or fewer display
5589#. columns.
5590#.
5591#: builtin/blame.c:795
6c94aba5
JX
5592msgid "4 years, 11 months ago"
5593msgstr "4 年 11 个月前"
5594
a4f16749 5595#: builtin/blame.c:882
a0b6b246
JX
5596#, c-format
5597msgid "file %s has only %lu line"
5598msgid_plural "file %s has only %lu lines"
5599msgstr[0] "文件 %s 只有 %lu 行"
5600msgstr[1] "文件 %s 只有 %lu 行"
5601
a4f16749
JX
5602#: builtin/blame.c:928
5603msgid "Blaming lines"
5604msgstr "追踪代码行"
5605
5606#: builtin/branch.c:27
814ff314
JX
5607msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
5608msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
ef317cd5 5609
a4f16749 5610#: builtin/branch.c:28
814ff314
JX
5611msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
5612msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 5613
a4f16749 5614#: builtin/branch.c:29
814ff314
JX
5615msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
5616msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
ef317cd5 5617
a4f16749 5618#: builtin/branch.c:30
814ff314
JX
5619msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
5620msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 5621
a4f16749 5622#: builtin/branch.c:31
6937cb4e
JX
5623msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
5624msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
5625
5626#: builtin/branch.c:32
94550ed3
JX
5627msgid "git branch [<options>] [-r | -a] [--points-at]"
5628msgstr "git branch [<选项>] [-r | -a] [--points-at]"
5629
6937cb4e 5630#: builtin/branch.c:33
87cb7997
JX
5631msgid "git branch [<options>] [-r | -a] [--format]"
5632msgstr "git branch [<选项>] [-r | -a] [--format]"
5633
90e6ef53 5634# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
6937cb4e 5635#: builtin/branch.c:146
c04f5ac3
JX
5636#, c-format
5637msgid ""
5638"deleting branch '%s' that has been merged to\n"
5639" '%s', but not yet merged to HEAD."
5640msgstr ""
70fc47bf 5641"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
5642" '%s',但未合并到 HEAD。"
5643
90e6ef53 5644# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
6937cb4e 5645#: builtin/branch.c:150
c04f5ac3
JX
5646#, c-format
5647msgid ""
5648"not deleting branch '%s' that is not yet merged to\n"
5649" '%s', even though it is merged to HEAD."
5650msgstr ""
70fc47bf
T
5651"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
5652" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 5653
6937cb4e 5654#: builtin/branch.c:164
07432cef
WS
5655#, c-format
5656msgid "Couldn't look up commit object for '%s'"
5657msgstr "无法查询 '%s' 指向的提交对象"
5658
6937cb4e 5659#: builtin/branch.c:168
07432cef
WS
5660#, c-format
5661msgid ""
5662"The branch '%s' is not fully merged.\n"
5663"If you are sure you want to delete it, run 'git branch -D %s'."
5664msgstr ""
5665"分支 '%s' 没有完全合并。\n"
5666"如果您确认要删除它,执行 'git branch -D %s'。"
5667
6937cb4e 5668#: builtin/branch.c:181
07432cef 5669msgid "Update of config-file failed"
6937cb4e 5670msgstr "更新配置文件失败"
07432cef 5671
6937cb4e 5672#: builtin/branch.c:212
c04f5ac3 5673msgid "cannot use -a with -d"
649900bc 5674msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 5675
6937cb4e 5676#: builtin/branch.c:218
c04f5ac3
JX
5677msgid "Couldn't look up commit object for HEAD"
5678msgstr "无法查询 HEAD 指向的提交对象"
5679
6937cb4e 5680#: builtin/branch.c:232
c04f5ac3 5681#, c-format
5b04ee3b
JX
5682msgid "Cannot delete branch '%s' checked out at '%s'"
5683msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
c04f5ac3 5684
6937cb4e 5685#: builtin/branch.c:247
5ae481e0 5686#, c-format
7aea43ff
JX
5687msgid "remote-tracking branch '%s' not found."
5688msgstr "未能找到远程跟踪分支 '%s'。"
c04f5ac3 5689
6937cb4e 5690#: builtin/branch.c:248
81809b99 5691#, c-format
8ada9598 5692msgid "branch '%s' not found."
81809b99 5693msgstr "分支 '%s' 未发现。"
8ada9598 5694
6937cb4e 5695#: builtin/branch.c:263
81809b99 5696#, c-format
7aea43ff
JX
5697msgid "Error deleting remote-tracking branch '%s'"
5698msgstr "无法删除远程跟踪分支 '%s'"
c04f5ac3 5699
6937cb4e 5700#: builtin/branch.c:264
81809b99 5701#, c-format
8ada9598 5702msgid "Error deleting branch '%s'"
7aea43ff 5703msgstr "无法删除分支 '%s'"
8ada9598 5704
6937cb4e 5705#: builtin/branch.c:271
81809b99 5706#, c-format
7aea43ff
JX
5707msgid "Deleted remote-tracking branch %s (was %s).\n"
5708msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
c04f5ac3 5709
6937cb4e 5710#: builtin/branch.c:272
81809b99 5711#, c-format
8ada9598 5712msgid "Deleted branch %s (was %s).\n"
81809b99 5713msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 5714
6937cb4e
JX
5715#: builtin/branch.c:417 builtin/tag.c:58
5716msgid "unable to parse format string"
5717msgstr "不能解析格式化字符串"
5718
5719#: builtin/branch.c:450
5b04ee3b
JX
5720#, c-format
5721msgid "Branch %s is being rebased at %s"
5722msgstr "分支 %s 正被变基到 %s"
5723
6937cb4e 5724#: builtin/branch.c:454
5b04ee3b
JX
5725#, c-format
5726msgid "Branch %s is being bisected at %s"
5727msgstr "分支 %s 正被二分查找于 %s"
5728
5809aa05 5729#: builtin/branch.c:471
6937cb4e
JX
5730msgid "cannot copy the current branch while not on any."
5731msgstr "无法拷贝当前分支因为不处于任何分支上。"
5732
5809aa05 5733#: builtin/branch.c:473
c04f5ac3 5734msgid "cannot rename the current branch while not on any."
90e6ef53 5735msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 5736
5809aa05 5737#: builtin/branch.c:484
c04f5ac3
JX
5738#, c-format
5739msgid "Invalid branch name: '%s'"
5740msgstr "无效的分支名:'%s'"
5741
5809aa05 5742#: builtin/branch.c:511
c04f5ac3
JX
5743msgid "Branch rename failed"
5744msgstr "分支重命名失败"
5745
5809aa05 5746#: builtin/branch.c:513
6937cb4e
JX
5747msgid "Branch copy failed"
5748msgstr "分支拷贝失败"
5749
5809aa05 5750#: builtin/branch.c:517
6937cb4e 5751#, c-format
5809aa05
JX
5752msgid "Created a copy of a misnamed branch '%s'"
5753msgstr "已为错误命名的分支 '%s' 创建了一个副本"
6937cb4e 5754
5809aa05 5755#: builtin/branch.c:520
c04f5ac3
JX
5756#, c-format
5757msgid "Renamed a misnamed branch '%s' away"
6937cb4e 5758msgstr "已将错误命名的分支 '%s' 重命名"
c04f5ac3 5759
5809aa05 5760#: builtin/branch.c:526
c04f5ac3
JX
5761#, c-format
5762msgid "Branch renamed to %s, but HEAD is not updated!"
5763msgstr "分支重命名为 %s,但 HEAD 没有更新!"
5764
5809aa05 5765#: builtin/branch.c:535
c04f5ac3 5766msgid "Branch is renamed, but update of config-file failed"
6937cb4e
JX
5767msgstr "分支被重命名,但更新配置文件失败"
5768
5809aa05 5769#: builtin/branch.c:537
6937cb4e
JX
5770msgid "Branch is copied, but update of config-file failed"
5771msgstr "分支已拷贝,但更新配置文件失败"
c04f5ac3 5772
5809aa05 5773#: builtin/branch.c:553
5c57d762
JX
5774#, c-format
5775msgid ""
5776"Please edit the description for the branch\n"
5777" %s\n"
5778"Lines starting with '%c' will be stripped.\n"
5779msgstr ""
5780"请编辑分支的描述\n"
5781" %s\n"
5782"以 '%c' 开头的行将被过滤。\n"
c04f5ac3 5783
5809aa05 5784#: builtin/branch.c:586
ef317cd5 5785msgid "Generic options"
07432cef 5786msgstr "通用选项"
c04f5ac3 5787
5809aa05 5788#: builtin/branch.c:588
ef317cd5 5789msgid "show hash and subject, give twice for upstream branch"
07432cef 5790msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 5791
5809aa05 5792#: builtin/branch.c:589
ef317cd5 5793msgid "suppress informational messages"
07432cef 5794msgstr "不显示信息"
8ada9598 5795
5809aa05 5796#: builtin/branch.c:590
ef317cd5 5797msgid "set up tracking mode (see git-pull(1))"
07432cef 5798msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 5799
5809aa05 5800#: builtin/branch.c:592
6937cb4e
JX
5801msgid "do not use"
5802msgstr "不要使用"
c04f5ac3 5803
5809aa05 5804#: builtin/branch.c:594
5b04ee3b
JX
5805msgid "upstream"
5806msgstr "上游"
5807
5809aa05 5808#: builtin/branch.c:594
5b04ee3b
JX
5809msgid "change the upstream info"
5810msgstr "改变上游信息"
5811
5809aa05 5812#: builtin/branch.c:595
a0b6b246
JX
5813msgid "Unset the upstream info"
5814msgstr "取消上游信息的设置"
5815
5809aa05 5816#: builtin/branch.c:596
ef317cd5 5817msgid "use colored output"
07432cef 5818msgstr "使用彩色输出"
c04f5ac3 5819
5809aa05 5820#: builtin/branch.c:597
ef317cd5 5821msgid "act on remote-tracking branches"
07432cef 5822msgstr "作用于远程跟踪分支"
c04f5ac3 5823
5809aa05 5824#: builtin/branch.c:599 builtin/branch.c:601
ef317cd5 5825msgid "print only branches that contain the commit"
07432cef 5826msgstr "只打印包含该提交的分支"
c04f5ac3 5827
5809aa05 5828#: builtin/branch.c:600 builtin/branch.c:602
87cb7997
JX
5829msgid "print only branches that don't contain the commit"
5830msgstr "只打印不包含该提交的分支"
5831
5809aa05 5832#: builtin/branch.c:605
ef317cd5 5833msgid "Specific git-branch actions:"
07432cef 5834msgstr "具体的 git-branch 动作:"
c04f5ac3 5835
5809aa05 5836#: builtin/branch.c:606
ef317cd5 5837msgid "list both remote-tracking and local branches"
07432cef 5838msgstr "列出远程跟踪及本地分支"
c04f5ac3 5839
5809aa05 5840#: builtin/branch.c:608
ef317cd5 5841msgid "delete fully merged branch"
07432cef 5842msgstr "删除完全合并的分支"
c04f5ac3 5843
5809aa05 5844#: builtin/branch.c:609
ef317cd5 5845msgid "delete branch (even if not merged)"
07432cef 5846msgstr "删除分支(即使没有合并)"
c04f5ac3 5847
5809aa05 5848#: builtin/branch.c:610
ef317cd5 5849msgid "move/rename a branch and its reflog"
07432cef 5850msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 5851
5809aa05 5852#: builtin/branch.c:611
ef317cd5 5853msgid "move/rename a branch, even if target exists"
07432cef 5854msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 5855
5809aa05 5856#: builtin/branch.c:612
6937cb4e
JX
5857msgid "copy a branch and its reflog"
5858msgstr "拷贝一个分支和它的引用日志"
5859
5809aa05 5860#: builtin/branch.c:613
6937cb4e
JX
5861msgid "copy a branch, even if target exists"
5862msgstr "拷贝一个分支,即使目标已存在"
5863
5809aa05 5864#: builtin/branch.c:614
ef317cd5 5865msgid "list branch names"
07432cef 5866msgstr "列出分支名"
c04f5ac3 5867
5809aa05 5868#: builtin/branch.c:615
ef317cd5 5869msgid "create the branch's reflog"
07432cef 5870msgstr "创建分支的引用日志"
ef317cd5 5871
5809aa05 5872#: builtin/branch.c:617
ef317cd5 5873msgid "edit the description for the branch"
07432cef 5874msgstr "标记分支的描述"
ef317cd5 5875
5809aa05 5876#: builtin/branch.c:618
04cb2f28
JX
5877msgid "force creation, move/rename, deletion"
5878msgstr "强制创建、移动/重命名、删除"
ef317cd5 5879
5809aa05 5880#: builtin/branch.c:619
94550ed3
JX
5881msgid "print only branches that are merged"
5882msgstr "只打印已经合并的分支"
ef317cd5 5883
5809aa05 5884#: builtin/branch.c:620
94550ed3
JX
5885msgid "print only branches that are not merged"
5886msgstr "只打印尚未合并的分支"
ef317cd5 5887
5809aa05 5888#: builtin/branch.c:621
ef317cd5 5889msgid "list branches in columns"
07432cef 5890msgstr "以列的方式显示分支"
ef317cd5 5891
5809aa05 5892#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
94550ed3
JX
5893msgid "key"
5894msgstr "key"
5895
5809aa05 5896#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
94550ed3
JX
5897msgid "field name to sort on"
5898msgstr "排序的字段名"
5899
5809aa05 5900#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
6937cb4e
JX
5901#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
5902#: builtin/tag.c:408
94550ed3
JX
5903msgid "object"
5904msgstr "对象"
5905
5809aa05 5906#: builtin/branch.c:626
94550ed3
JX
5907msgid "print only branches of the object"
5908msgstr "只打印指向该对象的分支"
5909
5809aa05 5910#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
1a79b2f1
JX
5911msgid "sorting and filtering are case insensitive"
5912msgstr "排序和过滤属于大小写不敏感"
5913
5809aa05 5914#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
a4f16749 5915#: builtin/verify-tag.c:39
87cb7997
JX
5916msgid "format to use for the output"
5917msgstr "输出格式"
5918
5809aa05 5919#: builtin/branch.c:652 builtin/clone.c:730
c04f5ac3 5920msgid "HEAD not found below refs/heads!"
90e6ef53 5921msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 5922
5809aa05 5923#: builtin/branch.c:675
8ada9598 5924msgid "--column and --verbose are incompatible"
81809b99 5925msgstr "--column 和 --verbose 不兼容"
8ada9598 5926
5809aa05 5927#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751
a77c07d9
JX
5928msgid "branch name required"
5929msgstr "必须提供分支名"
5930
5809aa05 5931#: builtin/branch.c:718
a77c07d9
JX
5932msgid "Cannot give description to detached HEAD"
5933msgstr "不能向分离头指针提供描述"
5934
5809aa05 5935#: builtin/branch.c:723
a77c07d9
JX
5936msgid "cannot edit description of more than one branch"
5937msgstr "不能为一个以上的分支编辑描述"
5938
5809aa05 5939#: builtin/branch.c:730
a77c07d9
JX
5940#, c-format
5941msgid "No commit on branch '%s' yet."
5942msgstr "分支 '%s' 尚无提交。"
5943
5809aa05 5944#: builtin/branch.c:733
a77c07d9
JX
5945#, c-format
5946msgid "No branch named '%s'."
5947msgstr "没有分支 '%s'。"
5948
5809aa05 5949#: builtin/branch.c:748
6937cb4e
JX
5950msgid "too many branches for a copy operation"
5951msgstr "为拷贝操作提供了太多的分支名"
a77c07d9 5952
5809aa05 5953#: builtin/branch.c:757
6937cb4e
JX
5954msgid "too many arguments for a rename operation"
5955msgstr "为重命名操作提供了太多的参数"
1003b3a5 5956
5809aa05 5957#: builtin/branch.c:762
6937cb4e
JX
5958msgid "too many arguments to set new upstream"
5959msgstr "为设置新上游提供了太多的参数"
5960
5809aa05 5961#: builtin/branch.c:766
1003b3a5
JX
5962#, c-format
5963msgid ""
5964"could not set upstream of HEAD to %s when it does not point to any branch."
5965msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
5966
5809aa05 5967#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807
1003b3a5
JX
5968#, c-format
5969msgid "no such branch '%s'"
5970msgstr "没有此分支 '%s'"
5971
5809aa05 5972#: builtin/branch.c:773
07432cef 5973#, c-format
ef317cd5 5974msgid "branch '%s' does not exist"
07432cef 5975msgstr "分支 '%s' 不存在"
ef317cd5 5976
5809aa05 5977#: builtin/branch.c:785
6937cb4e
JX
5978msgid "too many arguments to unset upstream"
5979msgstr "为取消上游设置操作提供了太多的参数"
1003b3a5 5980
5809aa05 5981#: builtin/branch.c:789
1003b3a5
JX
5982msgid "could not unset upstream of HEAD when it does not point to any branch."
5983msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
5984
5809aa05 5985#: builtin/branch.c:795
ef317cd5
JX
5986#, c-format
5987msgid "Branch '%s' has no upstream information"
07432cef 5988msgstr "分支 '%s' 没有上游信息"
ef317cd5 5989
5809aa05 5990#: builtin/branch.c:810
c04f5ac3
JX
5991msgid "-a and -r options to 'git branch' do not make sense with a branch name"
5992msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
5993
5809aa05 5994#: builtin/branch.c:813
ef317cd5 5995msgid ""
6937cb4e
JX
5996"the '--set-upstream' option is no longer supported. Please use '--track' or "
5997"'--set-upstream-to' instead."
ef317cd5 5998msgstr ""
6937cb4e 5999"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
ef317cd5 6000
87cb7997 6001#: builtin/bundle.c:45
c04f5ac3
JX
6002#, c-format
6003msgid "%s is okay\n"
6004msgstr "%s 可以\n"
6005
87cb7997 6006#: builtin/bundle.c:58
c04f5ac3 6007msgid "Need a repository to create a bundle."
160fb2b2 6008msgstr "需要一个仓库来创建包。"
c04f5ac3 6009
87cb7997 6010#: builtin/bundle.c:62
c04f5ac3 6011msgid "Need a repository to unbundle."
160fb2b2 6012msgstr "需要一个仓库来解包。"
c04f5ac3 6013
6937cb4e 6014#: builtin/cat-file.c:521
7aea43ff 6015msgid ""
a0b6b246
JX
6016"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
6017"p | <type> | --textconv | --filters) [--path=<path>] <object>"
275588f9
JX
6018msgstr ""
6019"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
6020"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
ef317cd5 6021
6937cb4e 6022#: builtin/cat-file.c:522
a0b6b246
JX
6023msgid ""
6024"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
6025"filters]"
275588f9
JX
6026msgstr ""
6027"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
6028"filters]"
ef317cd5 6029
6937cb4e 6030#: builtin/cat-file.c:559
ef317cd5 6031msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 6032msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 6033
6937cb4e 6034#: builtin/cat-file.c:560
ef317cd5 6035msgid "show object type"
07432cef 6036msgstr "显示对象类型"
ef317cd5 6037
6937cb4e 6038#: builtin/cat-file.c:561
ef317cd5 6039msgid "show object size"
07432cef 6040msgstr "显示对象大小"
ef317cd5 6041
6937cb4e 6042#: builtin/cat-file.c:563
ef317cd5 6043msgid "exit with zero when there's no error"
07432cef 6044msgstr "当没有错误时退出并返回零"
ef317cd5 6045
6937cb4e 6046#: builtin/cat-file.c:564
ef317cd5 6047msgid "pretty-print object's content"
07432cef 6048msgstr "美观地打印对象的内容"
ef317cd5 6049
6937cb4e 6050#: builtin/cat-file.c:566
ef317cd5 6051msgid "for blob objects, run textconv on object's content"
a0b6b246
JX
6052msgstr "对于数据对象,对其内容做文本转换"
6053
6937cb4e 6054#: builtin/cat-file.c:568
a0b6b246
JX
6055msgid "for blob objects, run filters on object's content"
6056msgstr "对于数据对象,对其内容做过滤"
6057
5809aa05 6058#: builtin/cat-file.c:569 git-submodule.sh:931
a0b6b246
JX
6059msgid "blob"
6060msgstr "数据对象"
6061
6937cb4e 6062#: builtin/cat-file.c:570
a0b6b246
JX
6063msgid "use a specific path for --textconv/--filters"
6064msgstr "对于 --textconv/--filters 使用一个特定的路径"
ef317cd5 6065
6937cb4e 6066#: builtin/cat-file.c:572
7aea43ff
JX
6067msgid "allow -s and -t to work with broken/corrupt objects"
6068msgstr "允许 -s 和 -t 对损坏的对象生效"
6069
6937cb4e 6070#: builtin/cat-file.c:573
1b7f4a34
JX
6071msgid "buffer --batch output"
6072msgstr "缓冲 --batch 的输出"
6073
6937cb4e 6074#: builtin/cat-file.c:575
ef317cd5 6075msgid "show info and content of objects fed from the standard input"
07432cef 6076msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 6077
6937cb4e 6078#: builtin/cat-file.c:578
ef317cd5 6079msgid "show info about objects fed from the standard input"
07432cef 6080msgstr "显示从标准输入提供的对象的信息"
ef317cd5 6081
6937cb4e 6082#: builtin/cat-file.c:581
7aea43ff
JX
6083msgid "follow in-tree symlinks (used with --batch or --batch-check)"
6084msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
6085
6937cb4e 6086#: builtin/cat-file.c:583
1b7f4a34
JX
6087msgid "show all objects with --batch or --batch-check"
6088msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
6089
a4f16749 6090#: builtin/check-attr.c:12
814ff314
JX
6091msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
6092msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
ef317cd5 6093
a4f16749 6094#: builtin/check-attr.c:13
94550ed3
JX
6095msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
6096msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
ef317cd5 6097
a4f16749 6098#: builtin/check-attr.c:20
ef317cd5 6099msgid "report all attributes set on file"
07432cef 6100msgstr "报告设置在文件上的所有属性"
ef317cd5 6101
a4f16749 6102#: builtin/check-attr.c:21
ef317cd5 6103msgid "use .gitattributes only from the index"
07432cef 6104msgstr "只使用索引中的 .gitattributes"
ef317cd5 6105
a4f16749 6106#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
ef317cd5 6107msgid "read file names from stdin"
07432cef 6108msgstr "从标准输入读出文件名"
ef317cd5 6109
a4f16749 6110#: builtin/check-attr.c:24 builtin/check-ignore.c:26
90314792
JX
6111msgid "terminate input and output records by a NUL character"
6112msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 6113
5809aa05 6114#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
a77c07d9
JX
6115msgid "suppress progress reporting"
6116msgstr "不显示进度报告"
6117
a4f16749 6118#: builtin/check-ignore.c:28
2e8451e8
JX
6119msgid "show non-matching input paths"
6120msgstr "显示未匹配的输入路径"
6121
a4f16749 6122#: builtin/check-ignore.c:30
90314792
JX
6123msgid "ignore index when checking"
6124msgstr "检查时忽略索引"
6125
a4f16749 6126#: builtin/check-ignore.c:158
a77c07d9 6127msgid "cannot specify pathnames with --stdin"
1b7f4a34 6128msgstr "不能同时指定路径及 --stdin 参数"
a77c07d9 6129
a4f16749 6130#: builtin/check-ignore.c:161
a77c07d9
JX
6131msgid "-z only makes sense with --stdin"
6132msgstr "-z 需要和 --stdin 参数共用才有意义"
6133
a4f16749 6134#: builtin/check-ignore.c:163
a77c07d9
JX
6135msgid "no path specified"
6136msgstr "未指定路径"
6137
a4f16749 6138#: builtin/check-ignore.c:167
a77c07d9
JX
6139msgid "--quiet is only valid with a single pathname"
6140msgstr "参数 --quiet 只在提供一个路径名时有效"
6141
a4f16749 6142#: builtin/check-ignore.c:169
a77c07d9
JX
6143msgid "cannot have both --quiet and --verbose"
6144msgstr "不能同时提供 --quiet 和 --verbose 参数"
6145
a4f16749 6146#: builtin/check-ignore.c:172
2e8451e8
JX
6147msgid "--non-matching is only valid with --verbose"
6148msgstr "--non-matching 选项只在使用 --verbose 时有效"
6149
a4f16749 6150#: builtin/check-mailmap.c:9
814ff314
JX
6151msgid "git check-mailmap [<options>] <contact>..."
6152msgstr "git check-mailmap [<选项>] <联系地址>..."
2e8451e8 6153
a4f16749 6154#: builtin/check-mailmap.c:14
2e8451e8
JX
6155msgid "also read contacts from stdin"
6156msgstr "还从标准输入读取联系地址"
6157
a4f16749 6158#: builtin/check-mailmap.c:25
2e8451e8
JX
6159#, c-format
6160msgid "unable to parse contact: %s"
6161msgstr "不能解析联系地址:%s"
6162
a4f16749 6163#: builtin/check-mailmap.c:48
2e8451e8
JX
6164msgid "no contacts specified"
6165msgstr "未指定联系地址"
6166
a4f16749 6167#: builtin/checkout-index.c:128
814ff314
JX
6168msgid "git checkout-index [<options>] [--] [<file>...]"
6169msgstr "git checkout-index [<选项>] [--] [<文件>...]"
ef317cd5 6170
5809aa05 6171#: builtin/checkout-index.c:143
276ceeaa
JX
6172msgid "stage should be between 1 and 3 or all"
6173msgstr "索引值应该取值 1 到 3 或者 all"
6174
5809aa05 6175#: builtin/checkout-index.c:159
ef317cd5 6176msgid "check out all files in the index"
07432cef 6177msgstr "检出索引区的所有文件"
ef317cd5 6178
5809aa05 6179#: builtin/checkout-index.c:160
ef317cd5 6180msgid "force overwrite of existing files"
07432cef 6181msgstr "强制覆盖现有的文件"
ef317cd5 6182
5809aa05 6183#: builtin/checkout-index.c:162
ef317cd5 6184msgid "no warning for existing files and files not in index"
07432cef 6185msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 6186
5809aa05 6187#: builtin/checkout-index.c:164
ef317cd5 6188msgid "don't checkout new files"
07432cef 6189msgstr "不检出新文件"
ef317cd5 6190
5809aa05 6191#: builtin/checkout-index.c:166
ef317cd5 6192msgid "update stat information in the index file"
07432cef 6193msgstr "更新索引中文件的状态信息"
ef317cd5 6194
5809aa05 6195#: builtin/checkout-index.c:170
ef317cd5 6196msgid "read list of paths from the standard input"
07432cef 6197msgstr "从标准输入读取路径列表"
ef317cd5 6198
5809aa05 6199#: builtin/checkout-index.c:172
ef317cd5 6200msgid "write the content to temporary files"
07432cef 6201msgstr "将内容写入临时文件"
ef317cd5 6202
5809aa05
JX
6203#: builtin/checkout-index.c:173 builtin/column.c:31
6204#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
6205#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
6206#: builtin/worktree.c:552
ef317cd5 6207msgid "string"
07432cef 6208msgstr "字符串"
ef317cd5 6209
5809aa05 6210#: builtin/checkout-index.c:174
ef317cd5 6211msgid "when creating files, prepend <string>"
4375c10e 6212msgstr "在创建文件时,在前面加上 <字符串>"
ef317cd5 6213
5809aa05 6214#: builtin/checkout-index.c:176
ef317cd5 6215msgid "copy out the files from named stage"
07432cef 6216msgstr "从指定暂存区中拷出文件"
ef317cd5 6217
5809aa05 6218#: builtin/checkout.c:27
814ff314
JX
6219msgid "git checkout [<options>] <branch>"
6220msgstr "git checkout [<选项>] <分支>"
ef317cd5 6221
5809aa05 6222#: builtin/checkout.c:28
814ff314
JX
6223msgid "git checkout [<options>] [<branch>] -- <file>..."
6224msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
ef317cd5 6225
5809aa05 6226#: builtin/checkout.c:136 builtin/checkout.c:169
c04f5ac3
JX
6227#, c-format
6228msgid "path '%s' does not have our version"
6229msgstr "路径 '%s' 没有我们的版本"
6230
5809aa05 6231#: builtin/checkout.c:138 builtin/checkout.c:171
c04f5ac3
JX
6232#, c-format
6233msgid "path '%s' does not have their version"
6234msgstr "路径 '%s' 没有他们的版本"
6235
5809aa05 6236#: builtin/checkout.c:154
c04f5ac3
JX
6237#, c-format
6238msgid "path '%s' does not have all necessary versions"
6239msgstr "路径 '%s' 没有全部必须的版本"
6240
5809aa05 6241#: builtin/checkout.c:198
c04f5ac3
JX
6242#, c-format
6243msgid "path '%s' does not have necessary versions"
6244msgstr "路径 '%s' 没有必须的版本"
6245
5809aa05 6246#: builtin/checkout.c:215
c04f5ac3
JX
6247#, c-format
6248msgid "path '%s': cannot merge"
90e6ef53 6249msgstr "path '%s':无法合并"
c04f5ac3 6250
5809aa05 6251#: builtin/checkout.c:232
c04f5ac3
JX
6252#, c-format
6253msgid "Unable to add merge result for '%s'"
6254msgstr "无法为 '%s' 添加合并结果"
6255
5809aa05
JX
6256#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
6257#: builtin/checkout.c:263
07432cef 6258#, c-format
ef317cd5 6259msgid "'%s' cannot be used with updating paths"
07432cef 6260msgstr "'%s' 不能在更新路径时使用"
ef317cd5 6261
5809aa05 6262#: builtin/checkout.c:266 builtin/checkout.c:269
07432cef 6263#, c-format
ef317cd5 6264msgid "'%s' cannot be used with %s"
07432cef 6265msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 6266
5809aa05 6267#: builtin/checkout.c:272
ef317cd5
JX
6268#, c-format
6269msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 6270msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 6271
5809aa05 6272#: builtin/checkout.c:341 builtin/checkout.c:348
c04f5ac3
JX
6273#, c-format
6274msgid "path '%s' is unmerged"
6275msgstr "路径 '%s' 未合并"
6276
5809aa05 6277#: builtin/checkout.c:506
c04f5ac3 6278msgid "you need to resolve your current index first"
90e6ef53 6279msgstr "您需要先解决当前索引的冲突"
c04f5ac3 6280
5809aa05 6281#: builtin/checkout.c:637
c04f5ac3 6282#, c-format
1b7f4a34
JX
6283msgid "Can not do reflog for '%s': %s\n"
6284msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
c04f5ac3 6285
5809aa05 6286#: builtin/checkout.c:678
c04f5ac3
JX
6287msgid "HEAD is now at"
6288msgstr "HEAD 目前位于"
6289
5809aa05 6290#: builtin/checkout.c:682 builtin/clone.c:684
3495628d
JX
6291msgid "unable to update HEAD"
6292msgstr "不能更新 HEAD"
6293
5809aa05 6294#: builtin/checkout.c:686
c04f5ac3
JX
6295#, c-format
6296msgid "Reset branch '%s'\n"
6297msgstr "重置分支 '%s'\n"
6298
5809aa05 6299#: builtin/checkout.c:689
c04f5ac3
JX
6300#, c-format
6301msgid "Already on '%s'\n"
6302msgstr "已经位于 '%s'\n"
6303
5809aa05 6304#: builtin/checkout.c:693
c04f5ac3
JX
6305#, c-format
6306msgid "Switched to and reset branch '%s'\n"
6307msgstr "切换并重置分支 '%s'\n"
6308
5809aa05 6309#: builtin/checkout.c:695 builtin/checkout.c:1051
c04f5ac3
JX
6310#, c-format
6311msgid "Switched to a new branch '%s'\n"
6312msgstr "切换到一个新分支 '%s'\n"
6313
5809aa05 6314#: builtin/checkout.c:697
c04f5ac3
JX
6315#, c-format
6316msgid "Switched to branch '%s'\n"
6317msgstr "切换到分支 '%s'\n"
6318
90e6ef53 6319# 译者:注意保持前导空格
5809aa05 6320#: builtin/checkout.c:748
c04f5ac3
JX
6321#, c-format
6322msgid " ... and %d more.\n"
90e6ef53 6323msgstr " ... 及其它 %d 个。\n"
c04f5ac3 6324
5809aa05 6325#: builtin/checkout.c:754
c04f5ac3
JX
6326#, c-format
6327msgid ""
6328"Warning: you are leaving %d commit behind, not connected to\n"
6329"any of your branches:\n"
6330"\n"
6331"%s\n"
6332msgid_plural ""
6333"Warning: you are leaving %d commits behind, not connected to\n"
6334"any of your branches:\n"
6335"\n"
6336"%s\n"
6337msgstr[0] ""
6338"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
6339"\n"
6340"%s\n"
5ae481e0
JX
6341msgstr[1] ""
6342"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
6343"\n"
6344"%s\n"
c04f5ac3 6345
5809aa05 6346#: builtin/checkout.c:773
c04f5ac3
JX
6347#, c-format
6348msgid ""
7aea43ff
JX
6349"If you want to keep it by creating a new branch, this may be a good time\n"
6350"to do so with:\n"
6351"\n"
6352" git branch <new-branch-name> %s\n"
6353"\n"
6354msgid_plural ""
c04f5ac3
JX
6355"If you want to keep them by creating a new branch, this may be a good time\n"
6356"to do so with:\n"
6357"\n"
814ff314 6358" git branch <new-branch-name> %s\n"
c04f5ac3 6359"\n"
7aea43ff
JX
6360msgstr[0] ""
6361"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
6362"如下操作:\n"
6363"\n"
6364" git branch <新分支名> %s\n"
6365"\n"
6366msgstr[1] ""
6367"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
c04f5ac3
JX
6368"如下操作:\n"
6369"\n"
814ff314 6370" git branch <新分支名> %s\n"
c04f5ac3
JX
6371"\n"
6372
5809aa05 6373#: builtin/checkout.c:814
c04f5ac3
JX
6374msgid "internal error in revision walk"
6375msgstr "在版本遍历时遇到内部错误"
6376
5809aa05 6377#: builtin/checkout.c:818
c04f5ac3
JX
6378msgid "Previous HEAD position was"
6379msgstr "之前的 HEAD 位置是"
6380
5809aa05 6381#: builtin/checkout.c:848 builtin/checkout.c:1046
c04f5ac3 6382msgid "You are on a branch yet to be born"
90e6ef53 6383msgstr "您位于一个尚未初始化的分支"
c04f5ac3 6384
5809aa05 6385#: builtin/checkout.c:952
90314792
JX
6386#, c-format
6387msgid "only one reference expected, %d given."
a0b6b246 6388msgstr "应只有一个引用,却给出了 %d 个"
90314792 6389
5809aa05 6390#: builtin/checkout.c:992 builtin/worktree.c:247
c04f5ac3
JX
6391#, c-format
6392msgid "invalid reference: %s"
6393msgstr "无效引用:%s"
6394
5809aa05 6395#: builtin/checkout.c:1021
c04f5ac3
JX
6396#, c-format
6397msgid "reference is not a tree: %s"
6398msgstr "引用不是一个树:%s"
6399
5809aa05 6400#: builtin/checkout.c:1060
ef317cd5 6401msgid "paths cannot be used with switching branches"
07432cef 6402msgstr "路径不能和切换分支同时使用"
c04f5ac3 6403
5809aa05 6404#: builtin/checkout.c:1063 builtin/checkout.c:1067
07432cef 6405#, c-format
ef317cd5 6406msgid "'%s' cannot be used with switching branches"
07432cef 6407msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 6408
5809aa05
JX
6409#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
6410#: builtin/checkout.c:1082
07432cef 6411#, c-format
ef317cd5 6412msgid "'%s' cannot be used with '%s'"
07432cef 6413msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 6414
5809aa05 6415#: builtin/checkout.c:1087
07432cef 6416#, c-format
ef317cd5 6417msgid "Cannot switch branch to a non-commit '%s'"
07432cef 6418msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 6419
5809aa05
JX
6420#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
6421#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
6422#: builtin/worktree.c:371
ef317cd5 6423msgid "branch"
07432cef 6424msgstr "分支"
c04f5ac3 6425
5809aa05 6426#: builtin/checkout.c:1120
ef317cd5 6427msgid "create and checkout a new branch"
07432cef 6428msgstr "创建并检出一个新的分支"
c04f5ac3 6429
5809aa05 6430#: builtin/checkout.c:1122
ef317cd5 6431msgid "create/reset and checkout a branch"
07432cef 6432msgstr "创建/重置并检出一个分支"
c04f5ac3 6433
5809aa05 6434#: builtin/checkout.c:1123
ef317cd5 6435msgid "create reflog for new branch"
07432cef 6436msgstr "为新的分支创建引用日志"
ef317cd5 6437
5809aa05 6438#: builtin/checkout.c:1124 builtin/worktree.c:373
5c57d762
JX
6439msgid "detach HEAD at named commit"
6440msgstr "HEAD 从指定的提交分离"
ef317cd5 6441
5809aa05 6442#: builtin/checkout.c:1125
ef317cd5 6443msgid "set upstream info for new branch"
07432cef 6444msgstr "为新的分支设置上游信息"
ef317cd5 6445
5809aa05 6446#: builtin/checkout.c:1127
6c94aba5 6447msgid "new-branch"
07432cef 6448msgstr "新分支"
ef317cd5 6449
5809aa05 6450#: builtin/checkout.c:1127
ef317cd5 6451msgid "new unparented branch"
07432cef 6452msgstr "新的没有父提交的分支"
ef317cd5 6453
5809aa05 6454#: builtin/checkout.c:1128
ef317cd5 6455msgid "checkout our version for unmerged files"
07432cef 6456msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 6457
5809aa05 6458#: builtin/checkout.c:1130
ef317cd5 6459msgid "checkout their version for unmerged files"
07432cef 6460msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 6461
5809aa05 6462#: builtin/checkout.c:1132
ef317cd5 6463msgid "force checkout (throw away local modifications)"
07432cef 6464msgstr "强制检出(丢弃本地修改)"
c04f5ac3 6465
5809aa05 6466#: builtin/checkout.c:1133
ef317cd5 6467msgid "perform a 3-way merge with the new branch"
160fb2b2 6468msgstr "和新的分支执行三方合并"
ef317cd5 6469
5809aa05 6470#: builtin/checkout.c:1134 builtin/merge.c:238
ef317cd5 6471msgid "update ignored files (default)"
07432cef 6472msgstr "更新忽略的文件(默认)"
c04f5ac3 6473
5809aa05 6474#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
ef317cd5 6475msgid "style"
07432cef 6476msgstr "风格"
ef317cd5 6477
5809aa05 6478#: builtin/checkout.c:1136
ef317cd5 6479msgid "conflict style (merge or diff3)"
07432cef 6480msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 6481
5809aa05 6482#: builtin/checkout.c:1139
4dcdc3d8
JX
6483msgid "do not limit pathspecs to sparse entries only"
6484msgstr "对路径不做稀疏检出的限制"
6485
5809aa05 6486#: builtin/checkout.c:1141
814ff314
JX
6487msgid "second guess 'git checkout <no-such-branch>'"
6488msgstr "二次猜测'git checkout <无此分支>'"
ef317cd5 6489
5809aa05 6490#: builtin/checkout.c:1143
7aea43ff
JX
6491msgid "do not check if another worktree is holding the given ref"
6492msgstr "不检查指定的引用是否被其他工作区所占用"
6493
5809aa05
JX
6494#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
6495#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
a4f16749 6496#: builtin/send-pack.c:173
94550ed3
JX
6497msgid "force progress reporting"
6498msgstr "强制显示进度报告"
6499
5809aa05 6500#: builtin/checkout.c:1177
ef317cd5 6501msgid "-b, -B and --orphan are mutually exclusive"
07432cef 6502msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 6503
5809aa05 6504#: builtin/checkout.c:1194
ef317cd5
JX
6505msgid "--track needs a branch name"
6506msgstr "--track 需要一个分支名"
6507
5809aa05 6508#: builtin/checkout.c:1199
ef317cd5
JX
6509msgid "Missing branch name; try -b"
6510msgstr "缺少分支名;尝试 -b"
6511
5809aa05 6512#: builtin/checkout.c:1235
c04f5ac3 6513msgid "invalid path specification"
90e6ef53 6514msgstr "无效的路径规格"
c04f5ac3 6515
5809aa05 6516#: builtin/checkout.c:1242
07432cef 6517#, c-format
a4f16749
JX
6518msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
6519msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'"
c04f5ac3 6520
5809aa05 6521#: builtin/checkout.c:1246
07432cef 6522#, c-format
ef317cd5 6523msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 6524msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 6525
5809aa05 6526#: builtin/checkout.c:1250
c04f5ac3
JX
6527msgid ""
6528"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
6529"checking out of the index."
6530msgstr ""
90e6ef53 6531"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 6532
a4f16749 6533#: builtin/clean.c:26
2e8451e8
JX
6534msgid ""
6535"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
6536msgstr ""
6537"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 6538
a4f16749 6539#: builtin/clean.c:30
07432cef
WS
6540#, c-format
6541msgid "Removing %s\n"
6542msgstr "正删除 %s\n"
6543
a4f16749 6544#: builtin/clean.c:31
07432cef
WS
6545#, c-format
6546msgid "Would remove %s\n"
6547msgstr "将删除 %s\n"
6548
a4f16749 6549#: builtin/clean.c:32
07432cef
WS
6550#, c-format
6551msgid "Skipping repository %s\n"
160fb2b2 6552msgstr "忽略仓库 %s\n"
07432cef 6553
a4f16749 6554#: builtin/clean.c:33
07432cef
WS
6555#, c-format
6556msgid "Would skip repository %s\n"
160fb2b2 6557msgstr "将忽略仓库 %s\n"
07432cef 6558
a4f16749 6559#: builtin/clean.c:34
07432cef
WS
6560#, c-format
6561msgid "failed to remove %s"
6562msgstr "无法删除 %s"
6563
5809aa05 6564#: builtin/clean.c:302 git-add--interactive.perl:572
1a79b2f1 6565#, c-format
2e8451e8
JX
6566msgid ""
6567"Prompt help:\n"
6568"1 - select a numbered item\n"
6569"foo - select item based on unique prefix\n"
1a79b2f1 6570" - (empty) select nothing\n"
2e8451e8
JX
6571msgstr ""
6572"帮助:\n"
6573"1 - 通过编号选择一个选项\n"
1a79b2f1
JX
6574"foo - 通过唯一前缀选择一个选项\n"
6575" - (空)什么也不选择\n"
2e8451e8 6576
5809aa05 6577#: builtin/clean.c:306 git-add--interactive.perl:581
1a79b2f1 6578#, c-format
2e8451e8
JX
6579msgid ""
6580"Prompt help:\n"
6581"1 - select a single item\n"
6582"3-5 - select a range of items\n"
6583"2-3,6-9 - select multiple ranges\n"
6584"foo - select item based on unique prefix\n"
6585"-... - unselect specified items\n"
6586"* - choose all items\n"
1a79b2f1 6587" - (empty) finish selecting\n"
2e8451e8
JX
6588msgstr ""
6589"帮助:\n"
6590"1 - 选择一个选项\n"
6591"3-5 - 选择一个范围内的所有选项\n"
6592"2-3,6-9 - 选择多个范围内的所有选项\n"
1a79b2f1 6593"foo - 通过唯一前缀选择一个选项\n"
2e8451e8
JX
6594"-... - 反选特定的选项\n"
6595"* - 选择所有选项\n"
1a79b2f1 6596" - (空)结束选择\n"
2e8451e8 6597
5809aa05 6598#: builtin/clean.c:522 git-add--interactive.perl:547
a4f16749 6599#: git-add--interactive.perl:552
1a79b2f1
JX
6600#, c-format, perl-format
6601msgid "Huh (%s)?\n"
6602msgstr "嗯(%s)?\n"
2e8451e8 6603
5809aa05 6604#: builtin/clean.c:664
2e8451e8
JX
6605#, c-format
6606msgid "Input ignore patterns>> "
6607msgstr "输入模版以排除条目>> "
6608
5809aa05 6609#: builtin/clean.c:701
2e8451e8
JX
6610#, c-format
6611msgid "WARNING: Cannot find items matched by: %s"
6612msgstr "警告:无法找到和 %s 匹配的条目"
6613
5809aa05 6614#: builtin/clean.c:722
2e8451e8
JX
6615msgid "Select items to delete"
6616msgstr "选择要删除的条目"
6617
814ff314 6618#. TRANSLATORS: Make sure to keep [y/N] as is
5809aa05 6619#: builtin/clean.c:763
2e8451e8 6620#, c-format
814ff314
JX
6621msgid "Remove %s [y/N]? "
6622msgstr "删除 %s [y/N]?"
2e8451e8 6623
5809aa05 6624#: builtin/clean.c:788 git-add--interactive.perl:1616
1a79b2f1
JX
6625#, c-format
6626msgid "Bye.\n"
6627msgstr "再见。\n"
2e8451e8 6628
5809aa05 6629#: builtin/clean.c:796
2e8451e8
JX
6630msgid ""
6631"clean - start cleaning\n"
6632"filter by pattern - exclude items from deletion\n"
6633"select by numbers - select items to be deleted by numbers\n"
6634"ask each - confirm each deletion (like \"rm -i\")\n"
6635"quit - stop cleaning\n"
6636"help - this screen\n"
6637"? - help for prompt selection"
6638msgstr ""
6639"clean - 开始清理\n"
6640"filter by pattern - 通过模版排除要删除的条目\n"
6641"select by numbers - 通过数字选择要删除的条目\n"
6642"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
6643"quit - 停止删除并退出\n"
6644"help - 显示本帮助\n"
6645"? - 显示如何在提示符下选择的帮助"
6646
5809aa05 6647#: builtin/clean.c:823 git-add--interactive.perl:1692
2e8451e8
JX
6648msgid "*** Commands ***"
6649msgstr "*** 命令 ***"
6650
5809aa05 6651#: builtin/clean.c:824 git-add--interactive.perl:1689
2e8451e8
JX
6652msgid "What now"
6653msgstr "请选择"
6654
5809aa05 6655#: builtin/clean.c:832
2e8451e8
JX
6656msgid "Would remove the following item:"
6657msgid_plural "Would remove the following items:"
6658msgstr[0] "将删除如下条目:"
6659msgstr[1] "将删除如下条目:"
6660
5809aa05 6661#: builtin/clean.c:848
2e8451e8
JX
6662msgid "No more files to clean, exiting."
6663msgstr "没有要清理的文件,退出。"
6664
5809aa05 6665#: builtin/clean.c:910
ef317cd5 6666msgid "do not print names of files removed"
07432cef 6667msgstr "不打印删除文件的名称"
ef317cd5 6668
5809aa05 6669#: builtin/clean.c:912
ef317cd5 6670msgid "force"
07432cef 6671msgstr "强制"
ef317cd5 6672
5809aa05 6673#: builtin/clean.c:913
2e8451e8
JX
6674msgid "interactive cleaning"
6675msgstr "交互式清除"
6676
5809aa05 6677#: builtin/clean.c:915
ef317cd5 6678msgid "remove whole directories"
07432cef 6679msgstr "删除整个目录"
ef317cd5 6680
5809aa05
JX
6681#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
6682#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
6683#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
6684#: builtin/show-ref.c:176
ef317cd5 6685msgid "pattern"
07432cef 6686msgstr "模式"
ef317cd5 6687
5809aa05 6688#: builtin/clean.c:917
ef317cd5 6689msgid "add <pattern> to ignore rules"
4375c10e 6690msgstr "添加 <模式> 到忽略规则"
ef317cd5 6691
5809aa05 6692#: builtin/clean.c:918
ef317cd5 6693msgid "remove ignored files, too"
07432cef 6694msgstr "也删除忽略的文件"
ef317cd5 6695
5809aa05 6696#: builtin/clean.c:920
ef317cd5 6697msgid "remove only ignored files"
07432cef 6698msgstr "只删除忽略的文件"
c04f5ac3 6699
5809aa05 6700#: builtin/clean.c:938
c04f5ac3 6701msgid "-x and -X cannot be used together"
649900bc 6702msgstr "-x 和 -X 不能同时使用"
c04f5ac3 6703
5809aa05 6704#: builtin/clean.c:942
c04f5ac3 6705msgid ""
6c94aba5 6706"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 6707"clean"
c04f5ac3 6708msgstr ""
2e8451e8 6709"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 6710
5809aa05 6711#: builtin/clean.c:945
c04f5ac3 6712msgid ""
6c94aba5 6713"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 6714"refusing to clean"
c04f5ac3 6715msgstr ""
2e8451e8 6716"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 6717
6937cb4e 6718#: builtin/clone.c:39
814ff314 6719msgid "git clone [<options>] [--] <repo> [<dir>]"
160fb2b2 6720msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
ef317cd5 6721
6937cb4e 6722#: builtin/clone.c:83
ef317cd5 6723msgid "don't create a checkout"
07432cef 6724msgstr "不创建一个检出"
ef317cd5 6725
6937cb4e 6726#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
ef317cd5 6727msgid "create a bare repository"
160fb2b2 6728msgstr "创建一个纯仓库"
ef317cd5 6729
6937cb4e 6730#: builtin/clone.c:88
ef317cd5 6731msgid "create a mirror repository (implies bare)"
160fb2b2 6732msgstr "创建一个镜像仓库(也是纯仓库)"
ef317cd5 6733
6937cb4e 6734#: builtin/clone.c:90
ef317cd5 6735msgid "to clone from a local repository"
160fb2b2 6736msgstr "从本地仓库克隆"
ef317cd5 6737
6937cb4e 6738#: builtin/clone.c:92
ef317cd5 6739msgid "don't use local hardlinks, always copy"
07432cef 6740msgstr "不使用本地硬链接,始终复制"
ef317cd5 6741
6937cb4e 6742#: builtin/clone.c:94
ef317cd5 6743msgid "setup as shared repository"
160fb2b2 6744msgstr "设置为共享仓库"
ef317cd5 6745
6937cb4e 6746#: builtin/clone.c:96 builtin/clone.c:100
87cb7997 6747msgid "pathspec"
65e2041e 6748msgstr "路径规格"
87cb7997 6749
6937cb4e 6750#: builtin/clone.c:96 builtin/clone.c:100
ef317cd5 6751msgid "initialize submodules in the clone"
07432cef 6752msgstr "在克隆时初始化子模组"
ef317cd5 6753
6937cb4e 6754#: builtin/clone.c:103
5b04ee3b
JX
6755msgid "number of submodules cloned in parallel"
6756msgstr "并发克隆的子模组的数量"
6757
6937cb4e 6758#: builtin/clone.c:104 builtin/init-db.c:476
ef317cd5 6759msgid "template-directory"
07432cef 6760msgstr "模板目录"
ef317cd5 6761
6937cb4e 6762#: builtin/clone.c:105 builtin/init-db.c:477
ef317cd5 6763msgid "directory from which templates will be used"
07432cef 6764msgstr "模板目录将被使用"
ef317cd5 6765
5809aa05
JX
6766#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
6767#: builtin/submodule--helper.c:1240
ef317cd5 6768msgid "reference repository"
160fb2b2 6769msgstr "参考仓库"
ef317cd5 6770
6937cb4e 6771#: builtin/clone.c:111
7aea43ff 6772msgid "use --reference only while cloning"
160fb2b2 6773msgstr "仅在克隆时参考 --reference 指向的本地仓库"
7aea43ff 6774
6937cb4e 6775#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
ef317cd5 6776msgid "name"
07432cef 6777msgstr "名称"
ef317cd5 6778
6937cb4e 6779#: builtin/clone.c:113
ef317cd5 6780msgid "use <name> instead of 'origin' to track upstream"
4375c10e 6781msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
ef317cd5 6782
6937cb4e 6783#: builtin/clone.c:115
ef317cd5 6784msgid "checkout <branch> instead of the remote's HEAD"
4375c10e 6785msgstr "检出 <分支> 而不是远程 HEAD"
ef317cd5 6786
6937cb4e 6787#: builtin/clone.c:117
ef317cd5 6788msgid "path to git-upload-pack on the remote"
07432cef 6789msgstr "远程 git-upload-pack 路径"
ef317cd5 6790
5809aa05
JX
6791#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
6792#: builtin/pull.c:211
ef317cd5 6793msgid "depth"
07432cef 6794msgstr "深度"
ef317cd5 6795
6937cb4e 6796#: builtin/clone.c:119
ef317cd5 6797msgid "create a shallow clone of that depth"
07432cef 6798msgstr "创建一个指定深度的浅克隆"
ef317cd5 6799
5809aa05 6800#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
a0b6b246
JX
6801#: parse-options.h:142
6802msgid "time"
6803msgstr "时间"
6804
6937cb4e 6805#: builtin/clone.c:121
a0b6b246
JX
6806msgid "create a shallow clone since a specific time"
6807msgstr "从一个特定时间创建一个浅克隆"
6808
5809aa05 6809#: builtin/clone.c:122 builtin/fetch.c:142
a0b6b246
JX
6810msgid "revision"
6811msgstr "版本"
6812
5809aa05 6813#: builtin/clone.c:123 builtin/fetch.c:143
1a79b2f1
JX
6814msgid "deepen history of shallow clone, excluding rev"
6815msgstr "深化浅克隆的历史,除了特定版本"
a0b6b246 6816
6937cb4e 6817#: builtin/clone.c:125
ef317cd5 6818msgid "clone only one branch, HEAD or --branch"
07432cef 6819msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 6820
6937cb4e 6821#: builtin/clone.c:127
a4f16749
JX
6822msgid "don't clone any tags, and make later fetches not to follow them"
6823msgstr "不要克隆任何标签,并且后续获取操作也不下载它们"
6824
6937cb4e 6825#: builtin/clone.c:129
5b04ee3b
JX
6826msgid "any cloned submodules will be shallow"
6827msgstr "子模组将以浅下载模式克隆"
6828
6937cb4e 6829#: builtin/clone.c:130 builtin/init-db.c:485
ef317cd5 6830msgid "gitdir"
07432cef 6831msgstr "git目录"
ef317cd5 6832
6937cb4e 6833#: builtin/clone.c:131 builtin/init-db.c:486
ef317cd5 6834msgid "separate git dir from working tree"
07432cef 6835msgstr "git目录和工作区分离"
ef317cd5 6836
6937cb4e 6837#: builtin/clone.c:132
ef317cd5 6838msgid "key=value"
07432cef 6839msgstr "key=value"
ef317cd5 6840
6937cb4e 6841#: builtin/clone.c:133
ef317cd5 6842msgid "set config inside the new repository"
160fb2b2 6843msgstr "在新仓库中设置配置信息"
ef317cd5 6844
5809aa05
JX
6845#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
6846#: builtin/push.c:567
276ceeaa
JX
6847msgid "use IPv4 addresses only"
6848msgstr "只使用 IPv4 地址"
6849
5809aa05
JX
6850#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
6851#: builtin/push.c:569
276ceeaa
JX
6852msgid "use IPv6 addresses only"
6853msgstr "只使用 IPv6 地址"
6854
6937cb4e 6855#: builtin/clone.c:273
3495628d
JX
6856msgid ""
6857"No directory name could be guessed.\n"
6858"Please specify a directory on the command line"
6859msgstr ""
6860"无法猜到目录名。\n"
26e4cbec 6861"请在命令行指定一个目录"
3495628d 6862
6937cb4e 6863#: builtin/clone.c:326
cfff71a9 6864#, c-format
a0b6b246
JX
6865msgid "info: Could not add alternate for '%s': %s\n"
6866msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
cfff71a9 6867
6937cb4e 6868#: builtin/clone.c:398
5c57d762
JX
6869#, c-format
6870msgid "failed to open '%s'"
6871msgstr "无法打开 '%s'"
6872
6937cb4e 6873#: builtin/clone.c:406
c04f5ac3
JX
6874#, c-format
6875msgid "%s exists and is not a directory"
6876msgstr "%s 存在且不是一个目录"
6877
6937cb4e 6878#: builtin/clone.c:420
c04f5ac3
JX
6879#, c-format
6880msgid "failed to stat %s\n"
65e2041e 6881msgstr "对 %s 调用 stat 失败\n"
c04f5ac3 6882
6937cb4e 6883#: builtin/clone.c:442
c04f5ac3
JX
6884#, c-format
6885msgid "failed to create link '%s'"
90e6ef53 6886msgstr "无法创建链接 '%s'"
c04f5ac3 6887
6937cb4e 6888#: builtin/clone.c:446
c04f5ac3
JX
6889#, c-format
6890msgid "failed to copy file to '%s'"
90e6ef53 6891msgstr "无法拷贝文件至 '%s'"
c04f5ac3 6892
5809aa05 6893#: builtin/clone.c:472
c04f5ac3
JX
6894#, c-format
6895msgid "done.\n"
6896msgstr "完成。\n"
6897
5809aa05 6898#: builtin/clone.c:484
1003b3a5
JX
6899msgid ""
6900"Clone succeeded, but checkout failed.\n"
6901"You can inspect what was checked out with 'git status'\n"
6902"and retry the checkout with 'git checkout -f HEAD'\n"
6903msgstr ""
6904"克隆成功,但是检出失败。\n"
6905"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
6906"'git checkout -f HEAD' 重试\n"
6907
5809aa05 6908#: builtin/clone.c:561
c04f5ac3
JX
6909#, c-format
6910msgid "Could not find remote branch %s to clone."
90e6ef53 6911msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 6912
5809aa05 6913#: builtin/clone.c:656
1003b3a5
JX
6914msgid "remote did not send all necessary objects"
6915msgstr "远程没有发送所有必须的对象"
6916
5809aa05 6917#: builtin/clone.c:672
3495628d
JX
6918#, c-format
6919msgid "unable to update %s"
6920msgstr "不能更新 %s"
6921
5809aa05 6922#: builtin/clone.c:721
c04f5ac3
JX
6923msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
6924msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
6925
6937cb4e 6926#: builtin/clone.c:751
1003b3a5
JX
6927msgid "unable to checkout working tree"
6928msgstr "不能检出工作区"
6929
6937cb4e 6930#: builtin/clone.c:796
3495628d
JX
6931msgid "unable to write parameters to config file"
6932msgstr "无法将参数写入配置文件"
6933
6937cb4e 6934#: builtin/clone.c:859
04cb2f28
JX
6935msgid "cannot repack to clean up"
6936msgstr "无法执行 repack 来清理"
6937
6937cb4e 6938#: builtin/clone.c:861
04cb2f28
JX
6939msgid "cannot unlink temporary alternates file"
6940msgstr "无法删除临时的 alternates 文件"
6941
5809aa05 6942#: builtin/clone.c:894 builtin/receive-pack.c:1945
c04f5ac3
JX
6943msgid "Too many arguments."
6944msgstr "太多参数。"
6945
6937cb4e 6946#: builtin/clone.c:898
c04f5ac3 6947msgid "You must specify a repository to clone."
160fb2b2 6948msgstr "您必须指定一个仓库来克隆。"
c04f5ac3 6949
6937cb4e 6950#: builtin/clone.c:911
c04f5ac3
JX
6951#, c-format
6952msgid "--bare and --origin %s options are incompatible."
6953msgstr "--bare 和 --origin %s 选项不兼容。"
6954
6937cb4e 6955#: builtin/clone.c:914
07432cef
WS
6956msgid "--bare and --separate-git-dir are incompatible."
6957msgstr "--bare 和 --separate-git-dir 选项不兼容。"
6958
6937cb4e 6959#: builtin/clone.c:927
c04f5ac3
JX
6960#, c-format
6961msgid "repository '%s' does not exist"
160fb2b2 6962msgstr "仓库 '%s' 不存在"
c04f5ac3 6963
5809aa05 6964#: builtin/clone.c:933 builtin/fetch.c:1358
cfff71a9
JX
6965#, c-format
6966msgid "depth %s is not a positive number"
6967msgstr "深度 %s 不是一个正数"
6968
6937cb4e 6969#: builtin/clone.c:943
c04f5ac3
JX
6970#, c-format
6971msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 6972msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 6973
6937cb4e 6974#: builtin/clone.c:953
c04f5ac3
JX
6975#, c-format
6976msgid "working tree '%s' already exists."
6977msgstr "工作区 '%s' 已经存在。"
6978
6937cb4e 6979#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
5809aa05 6980#: builtin/worktree.c:253 builtin/worktree.c:283
5bb01d4f
JX
6981#, c-format
6982msgid "could not create leading directories of '%s'"
6983msgstr "不能为 '%s' 创建先导目录"
6984
6937cb4e 6985#: builtin/clone.c:971
c04f5ac3 6986#, c-format
814ff314
JX
6987msgid "could not create work tree dir '%s'"
6988msgstr "不能创建工作区目录 '%s'"
c04f5ac3 6989
6937cb4e 6990#: builtin/clone.c:983
c04f5ac3
JX
6991#, c-format
6992msgid "Cloning into bare repository '%s'...\n"
160fb2b2 6993msgstr "克隆到纯仓库 '%s'...\n"
c04f5ac3 6994
6937cb4e 6995#: builtin/clone.c:985
c04f5ac3
JX
6996#, c-format
6997msgid "Cloning into '%s'...\n"
6998msgstr "正克隆到 '%s'...\n"
6999
6937cb4e 7000#: builtin/clone.c:1009
a0b6b246
JX
7001msgid ""
7002"clone --recursive is not compatible with both --reference and --reference-if-"
7003"able"
7004msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
7005
6937cb4e 7006#: builtin/clone.c:1071
6acbf033 7007msgid "--depth is ignored in local clones; use file:// instead."
a0b6b246
JX
7008msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
7009
6937cb4e 7010#: builtin/clone.c:1073
a0b6b246
JX
7011msgid "--shallow-since is ignored in local clones; use file:// instead."
7012msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
6acbf033 7013
6937cb4e 7014#: builtin/clone.c:1075
a0b6b246
JX
7015msgid "--shallow-exclude is ignored in local clones; use file:// instead."
7016msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
7017
6937cb4e 7018#: builtin/clone.c:1078
6acbf033 7019msgid "source repository is shallow, ignoring --local"
160fb2b2 7020msgstr "源仓库是浅克隆,忽略 --local"
6acbf033 7021
6937cb4e 7022#: builtin/clone.c:1083
6acbf033
JX
7023msgid "--local is ignored"
7024msgstr "--local 被忽略"
7025
5809aa05 7026#: builtin/clone.c:1139 builtin/clone.c:1147
c04f5ac3
JX
7027#, c-format
7028msgid "Remote branch %s not found in upstream %s"
7029msgstr "远程分支 %s 在上游 %s 未发现"
7030
5809aa05 7031#: builtin/clone.c:1150
c04f5ac3 7032msgid "You appear to have cloned an empty repository."
160fb2b2 7033msgstr "您似乎克隆了一个空仓库。"
c04f5ac3 7034
a4f16749 7035#: builtin/column.c:10
814ff314
JX
7036msgid "git column [<options>]"
7037msgstr "git column [<选项>]"
ef317cd5 7038
a4f16749 7039#: builtin/column.c:27
ef317cd5 7040msgid "lookup config vars"
07432cef 7041msgstr "查找配置变量"
ef317cd5 7042
a4f16749 7043#: builtin/column.c:28 builtin/column.c:29
ef317cd5 7044msgid "layout to use"
07432cef 7045msgstr "要使用的布局"
ef317cd5 7046
a4f16749 7047#: builtin/column.c:30
ef317cd5 7048msgid "Maximum width"
07432cef 7049msgstr "最大宽度"
ef317cd5 7050
a4f16749 7051#: builtin/column.c:31
ef317cd5 7052msgid "Padding space on left border"
07432cef 7053msgstr "左边框的填充空间"
ef317cd5 7054
a4f16749 7055#: builtin/column.c:32
ef317cd5 7056msgid "Padding space on right border"
07432cef 7057msgstr "右边框的填充空间"
ef317cd5 7058
a4f16749 7059#: builtin/column.c:33
ef317cd5 7060msgid "Padding space between columns"
07432cef 7061msgstr "两列之间的填充空间"
ef317cd5 7062
a4f16749 7063#: builtin/column.c:52
8ada9598 7064msgid "--command must be the first argument"
81809b99 7065msgstr "--command 必须是第一个参数"
8ada9598 7066
a4f16749 7067#: builtin/commit.c:39
814ff314 7068msgid "git commit [<options>] [--] <pathspec>..."
160fb2b2 7069msgstr "git commit [<选项>] [--] <路径规格>..."
ef317cd5 7070
a4f16749 7071#: builtin/commit.c:44
814ff314 7072msgid "git status [<options>] [--] <pathspec>..."
160fb2b2 7073msgstr "git status [<选项>] [--] <路径规格>..."
ef317cd5 7074
a4f16749 7075#: builtin/commit.c:49
220c313c
JX
7076msgid ""
7077"Your name and email address were configured automatically based\n"
7078"on your username and hostname. Please check that they are accurate.\n"
7079"You can suppress this message by setting them explicitly. Run the\n"
7080"following command and follow the instructions in your editor to edit\n"
7081"your configuration file:\n"
7082"\n"
7083" git config --global --edit\n"
7084"\n"
7085"After doing this, you may fix the identity used for this commit with:\n"
7086"\n"
7087" git commit --amend --reset-author\n"
7088msgstr ""
7089"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
7090"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
7091"中编辑您的配置文件:\n"
7092"\n"
7093" git config --global --edit\n"
7094"\n"
7095"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
7096"\n"
7097" git commit --amend --reset-author\n"
7098
a4f16749 7099#: builtin/commit.c:62
c04f5ac3
JX
7100msgid ""
7101"Your name and email address were configured automatically based\n"
7102"on your username and hostname. Please check that they are accurate.\n"
7103"You can suppress this message by setting them explicitly:\n"
7104"\n"
7105" git config --global user.name \"Your Name\"\n"
7106" git config --global user.email you@example.com\n"
7107"\n"
7108"After doing this, you may fix the identity used for this commit with:\n"
7109"\n"
7110" git commit --amend --reset-author\n"
7111msgstr ""
90e6ef53 7112"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
220c313c 7113"与否。您可以对其进行设置以免再出现本提示信息:\n"
c04f5ac3
JX
7114"\n"
7115" git config --global user.name \"Your Name\"\n"
7116" git config --global user.email you@example.com\n"
7117"\n"
90e6ef53 7118"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
c04f5ac3
JX
7119"\n"
7120" git commit --amend --reset-author\n"
7121
a4f16749 7122#: builtin/commit.c:74
c04f5ac3
JX
7123msgid ""
7124"You asked to amend the most recent commit, but doing so would make\n"
7125"it empty. You can repeat your command with --allow-empty, or you can\n"
7126"remove the commit entirely with \"git reset HEAD^\".\n"
7127msgstr ""
1b150dc9
T
7128"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
7129"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 7130
a4f16749 7131#: builtin/commit.c:79
c04f5ac3
JX
7132msgid ""
7133"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
7134"If you wish to commit it anyway, use:\n"
7135"\n"
7136" git commit --allow-empty\n"
7137"\n"
c04f5ac3 7138msgstr ""
a9ce4543
T
7139"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
7140"也要提交,使用命令:\n"
c04f5ac3
JX
7141"\n"
7142" git commit --allow-empty\n"
7143"\n"
c04f5ac3 7144
a4f16749 7145#: builtin/commit.c:86
b1894384
JX
7146msgid "Otherwise, please use 'git reset'\n"
7147msgstr "否则,请使用命令 'git reset'\n"
7148
a4f16749 7149#: builtin/commit.c:89
b1894384
JX
7150msgid ""
7151"If you wish to skip this commit, use:\n"
7152"\n"
7153" git reset\n"
7154"\n"
7155"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
7156"the remaining commits.\n"
7157msgstr ""
7158"如果您想跳过这个提交,使用命令:\n"
7159"\n"
7160" git reset\n"
7161"\n"
7162"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
7163"操作。\n"
7164
6937cb4e 7165#: builtin/commit.c:318
c04f5ac3 7166msgid "failed to unpack HEAD tree object"
90e6ef53 7167msgstr "无法解包 HEAD 树对象"
c04f5ac3 7168
6937cb4e 7169#: builtin/commit.c:359
c04f5ac3 7170msgid "unable to create temporary index"
90e6ef53 7171msgstr "不能创建临时索引"
c04f5ac3 7172
6937cb4e 7173#: builtin/commit.c:365
c04f5ac3
JX
7174msgid "interactive add failed"
7175msgstr "交互式添加失败"
7176
6937cb4e 7177#: builtin/commit.c:378
220c313c
JX
7178msgid "unable to update temporary index"
7179msgstr "无法更新临时索引"
7180
6937cb4e 7181#: builtin/commit.c:380
220c313c
JX
7182msgid "Failed to update main cache tree"
7183msgstr "不能更新树的主缓存"
7184
6937cb4e 7185#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
c04f5ac3 7186msgid "unable to write new_index file"
90e6ef53 7187msgstr "无法写 new_index 文件"
c04f5ac3 7188
6937cb4e 7189#: builtin/commit.c:461
8ada9598 7190msgid "cannot do a partial commit during a merge."
81809b99 7191msgstr "在合并过程中不能做部分提交。"
c04f5ac3 7192
6937cb4e 7193#: builtin/commit.c:463
8ada9598 7194msgid "cannot do a partial commit during a cherry-pick."
81809b99 7195msgstr "在拣选过程中不能做部分提交。"
8ada9598 7196
6937cb4e 7197#: builtin/commit.c:471
c04f5ac3 7198msgid "cannot read the index"
90e6ef53 7199msgstr "无法读取索引"
c04f5ac3 7200
6937cb4e 7201#: builtin/commit.c:490
c04f5ac3 7202msgid "unable to write temporary index file"
90e6ef53 7203msgstr "无法写临时索引文件"
c04f5ac3 7204
6937cb4e 7205#: builtin/commit.c:587
220c313c
JX
7206#, c-format
7207msgid "commit '%s' lacks author header"
7208msgstr "提交 '%s' 缺少作者信息"
7209
6937cb4e 7210#: builtin/commit.c:589
c04f5ac3 7211#, c-format
220c313c
JX
7212msgid "commit '%s' has malformed author line"
7213msgstr "提交 '%s' 有非法的作者信息"
c04f5ac3 7214
6937cb4e 7215#: builtin/commit.c:608
c04f5ac3
JX
7216msgid "malformed --author parameter"
7217msgstr "非法的 --author 参数"
7218
6937cb4e 7219#: builtin/commit.c:660
6acbf033
JX
7220msgid ""
7221"unable to select a comment character that is not used\n"
7222"in the current commit message"
7223msgstr "无法选择一个未被当前提交说明使用的注释字符"
7224
5809aa05 7225#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
c04f5ac3
JX
7226#, c-format
7227msgid "could not lookup commit %s"
7228msgstr "不能查询提交 %s"
7229
6937cb4e 7230#: builtin/commit.c:709 builtin/shortlog.c:309
c04f5ac3
JX
7231#, c-format
7232msgid "(reading log message from standard input)\n"
90e6ef53 7233msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 7234
6937cb4e 7235#: builtin/commit.c:711
c04f5ac3 7236msgid "could not read log from standard input"
90e6ef53 7237msgstr "不能从标准输入中读取日志信息"
c04f5ac3 7238
6937cb4e 7239#: builtin/commit.c:715
c04f5ac3
JX
7240#, c-format
7241msgid "could not read log file '%s'"
90e6ef53 7242msgstr "不能读取日志文件 '%s'"
c04f5ac3 7243
6937cb4e 7244#: builtin/commit.c:742 builtin/commit.c:750
c04f5ac3 7245msgid "could not read SQUASH_MSG"
90e6ef53 7246msgstr "不能读取 SQUASH_MSG"
c04f5ac3 7247
6937cb4e 7248#: builtin/commit.c:747
5b04ee3b
JX
7249msgid "could not read MERGE_MSG"
7250msgstr "不能读取 MERGE_MSG"
7251
6937cb4e 7252#: builtin/commit.c:801
c04f5ac3 7253msgid "could not write commit template"
90e6ef53 7254msgstr "不能写提交模版"
c04f5ac3 7255
6937cb4e 7256#: builtin/commit.c:819
81809b99 7257#, c-format
c04f5ac3
JX
7258msgid ""
7259"\n"
8ada9598 7260"It looks like you may be committing a merge.\n"
c04f5ac3
JX
7261"If this is not correct, please remove the file\n"
7262"\t%s\n"
7263"and try again.\n"
7264msgstr ""
7265"\n"
649900bc 7266"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
7267"\t%s\n"
7268"然后重试。\n"
7269
6937cb4e 7270#: builtin/commit.c:824
81809b99 7271#, c-format
8ada9598
JX
7272msgid ""
7273"\n"
7274"It looks like you may be committing a cherry-pick.\n"
7275"If this is not correct, please remove the file\n"
7276"\t%s\n"
7277"and try again.\n"
7278msgstr ""
7279"\n"
649900bc 7280"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
7281"\t%s\n"
7282"然后重试。\n"
c04f5ac3 7283
6937cb4e 7284#: builtin/commit.c:837
a77c07d9 7285#, c-format
c04f5ac3 7286msgid ""
8ada9598 7287"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 7288"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 7289msgstr ""
a77c07d9 7290"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 7291"说明将会终止提交。\n"
c04f5ac3 7292
6937cb4e 7293#: builtin/commit.c:844
a77c07d9 7294#, c-format
c04f5ac3 7295msgid ""
8ada9598 7296"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 7297"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
7298"An empty message aborts the commit.\n"
7299msgstr ""
a77c07d9
JX
7300"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
7301"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 7302
90e6ef53 7303# 译者:为保证在输出中对齐,注意调整句中空格!
6937cb4e 7304#: builtin/commit.c:861
6acbf033
JX
7305#, c-format
7306msgid "%sAuthor: %.*s <%.*s>"
7307msgstr "%s作者: %.*s <%.*s>"
7308
7309# 译者:为保证在输出中对齐,注意调整句中空格!
6937cb4e 7310#: builtin/commit.c:869
c04f5ac3 7311#, c-format
6acbf033
JX
7312msgid "%sDate: %s"
7313msgstr "%s日期: %s"
c04f5ac3 7314
90e6ef53 7315# 译者:为保证在输出中对齐,注意调整句中空格!
6937cb4e 7316#: builtin/commit.c:876
c04f5ac3 7317#, c-format
6acbf033
JX
7318msgid "%sCommitter: %.*s <%.*s>"
7319msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 7320
6937cb4e 7321#: builtin/commit.c:893
c04f5ac3 7322msgid "Cannot read index"
90e6ef53 7323msgstr "无法读取索引"
c04f5ac3 7324
5809aa05 7325#: builtin/commit.c:959
c04f5ac3
JX
7326msgid "Error building trees"
7327msgstr "无法创建树对象"
7328
5809aa05 7329#: builtin/commit.c:973 builtin/tag.c:252
c04f5ac3
JX
7330#, c-format
7331msgid "Please supply the message using either -m or -F option.\n"
07432cef 7332msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 7333
5809aa05 7334#: builtin/commit.c:1076
c04f5ac3 7335#, c-format
814ff314 7336msgid "--author '%s' is not 'Name <email>' and matches no existing author"
58b6f078 7337msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配"
c04f5ac3 7338
5809aa05
JX
7339#: builtin/commit.c:1090
7340#, c-format
7341msgid "Invalid ignored mode '%s'"
7342msgstr "无效的忽略模式 '%s'"
7343
7344#: builtin/commit.c:1104 builtin/commit.c:1349
c04f5ac3
JX
7345#, c-format
7346msgid "Invalid untracked files mode '%s'"
90e6ef53 7347msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 7348
5809aa05 7349#: builtin/commit.c:1142
2e8451e8
JX
7350msgid "--long and -z are incompatible"
7351msgstr "--long 和 -z 选项不兼容"
7352
5809aa05 7353#: builtin/commit.c:1172
c04f5ac3
JX
7354msgid "Using both --reset-author and --author does not make sense"
7355msgstr "同时使用 --reset-author 和 --author 没有意义"
7356
5809aa05 7357#: builtin/commit.c:1181
c04f5ac3 7358msgid "You have nothing to amend."
90e6ef53 7359msgstr "您没有可修补的提交。"
c04f5ac3 7360
5809aa05 7361#: builtin/commit.c:1184
8ada9598 7362msgid "You are in the middle of a merge -- cannot amend."
81809b99 7363msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 7364
5809aa05 7365#: builtin/commit.c:1186
8ada9598 7366msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 7367msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 7368
5809aa05 7369#: builtin/commit.c:1189
c04f5ac3 7370msgid "Options --squash and --fixup cannot be used together"
649900bc 7371msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 7372
5809aa05 7373#: builtin/commit.c:1199
c04f5ac3
JX
7374msgid "Only one of -c/-C/-F/--fixup can be used."
7375msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
7376
5809aa05 7377#: builtin/commit.c:1201
c04f5ac3 7378msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
649900bc 7379msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
c04f5ac3 7380
5809aa05 7381#: builtin/commit.c:1209
c04f5ac3 7382msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 7383msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 7384
5809aa05 7385#: builtin/commit.c:1226
c04f5ac3
JX
7386msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
7387msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
7388
5809aa05 7389#: builtin/commit.c:1228
c04f5ac3
JX
7390msgid "No paths with --include/--only does not make sense."
7391msgstr "参数 --include/--only 不跟路径没有意义。"
7392
5809aa05 7393#: builtin/commit.c:1240 builtin/tag.c:535
c04f5ac3
JX
7394#, c-format
7395msgid "Invalid cleanup mode %s"
7396msgstr "无效的清理模式 %s"
7397
5809aa05 7398#: builtin/commit.c:1245
c04f5ac3 7399msgid "Paths with -a does not make sense."
649900bc 7400msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 7401
5809aa05 7402#: builtin/commit.c:1363 builtin/commit.c:1648
ef317cd5 7403msgid "show status concisely"
07432cef 7404msgstr "以简洁的格式显示状态"
ef317cd5 7405
5809aa05 7406#: builtin/commit.c:1365 builtin/commit.c:1650
ef317cd5 7407msgid "show branch information"
07432cef 7408msgstr "显示分支信息"
ef317cd5 7409
5809aa05 7410#: builtin/commit.c:1367
a4f16749
JX
7411msgid "show stash information"
7412msgstr "显示贮藏区信息"
7413
5809aa05 7414#: builtin/commit.c:1369
a0b6b246
JX
7415msgid "version"
7416msgstr "版本"
7417
5809aa05
JX
7418#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
7419#: builtin/worktree.c:523
ef317cd5 7420msgid "machine-readable output"
07432cef
WS
7421msgstr "机器可读的输出"
7422
5809aa05 7423#: builtin/commit.c:1372 builtin/commit.c:1654
07432cef
WS
7424msgid "show status in long format (default)"
7425msgstr "以长格式显示状态(默认)"
ef317cd5 7426
5809aa05 7427#: builtin/commit.c:1375 builtin/commit.c:1657
ef317cd5 7428msgid "terminate entries with NUL"
4375c10e 7429msgstr "条目以 NUL 字符结尾"
ef317cd5 7430
5809aa05
JX
7431#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
7432#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
ef317cd5 7433msgid "mode"
07432cef 7434msgstr "模式"
ef317cd5 7435
5809aa05 7436#: builtin/commit.c:1378 builtin/commit.c:1660
ef317cd5 7437msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 7438msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 7439
5809aa05
JX
7440#: builtin/commit.c:1382
7441msgid ""
7442"show ignored files, optional modes: traditional, matching, no. (Default: "
7443"traditional)"
7444msgstr "显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)"
ef317cd5 7445
5809aa05 7446#: builtin/commit.c:1384 parse-options.h:155
ef317cd5
JX
7447msgid "when"
7448msgstr "何时"
7449
5809aa05 7450#: builtin/commit.c:1385
ef317cd5
JX
7451msgid ""
7452"ignore changes to submodules, optional when: all, dirty, untracked. "
7453"(Default: all)"
7454msgstr ""
07432cef 7455"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 7456
5809aa05 7457#: builtin/commit.c:1387
ef317cd5 7458msgid "list untracked files in columns"
07432cef 7459msgstr "以列的方式显示未跟踪的文件"
ef317cd5 7460
5809aa05
JX
7461#: builtin/commit.c:1406
7462msgid "Unsupported combination of ignored and untracked-files arguments"
7463msgstr "不支持已忽略和未跟踪文件参数的组合"
7464
7465#: builtin/commit.c:1469
c04f5ac3
JX
7466msgid "couldn't look up newly created commit"
7467msgstr "无法找到新创建的提交"
7468
5809aa05 7469#: builtin/commit.c:1471
c04f5ac3 7470msgid "could not parse newly created commit"
90e6ef53 7471msgstr "不能解析新创建的提交"
c04f5ac3 7472
5809aa05
JX
7473#: builtin/commit.c:1516
7474msgid "unable to resolve HEAD after creating commit"
7475msgstr "创建提交后,不能解析 HEAD"
7476
7477#: builtin/commit.c:1518
c04f5ac3
JX
7478msgid "detached HEAD"
7479msgstr "分离头指针"
7480
7e238ab7 7481# 译者:中文字符串拼接,可删除前导空格
5809aa05 7482#: builtin/commit.c:1521
c04f5ac3 7483msgid " (root-commit)"
7e238ab7 7484msgstr "(根提交)"
c04f5ac3 7485
5809aa05 7486#: builtin/commit.c:1618
ef317cd5 7487msgid "suppress summary after successful commit"
07432cef 7488msgstr "提交成功后不显示概述信息"
c04f5ac3 7489
5809aa05 7490#: builtin/commit.c:1619
ef317cd5 7491msgid "show diff in commit message template"
07432cef 7492msgstr "在提交说明模板里显示差异"
c04f5ac3 7493
5809aa05 7494#: builtin/commit.c:1621
ef317cd5 7495msgid "Commit message options"
07432cef 7496msgstr "提交说明选项"
c04f5ac3 7497
5809aa05 7498#: builtin/commit.c:1622 builtin/tag.c:388
ef317cd5 7499msgid "read message from file"
07432cef 7500msgstr "从文件中读取提交说明"
c04f5ac3 7501
5809aa05 7502#: builtin/commit.c:1623
ef317cd5 7503msgid "author"
07432cef 7504msgstr "作者"
c04f5ac3 7505
5809aa05 7506#: builtin/commit.c:1623
ef317cd5 7507msgid "override author for commit"
07432cef 7508msgstr "提交时覆盖作者"
73a60cd2 7509
5809aa05 7510#: builtin/commit.c:1624 builtin/gc.c:359
ef317cd5 7511msgid "date"
07432cef 7512msgstr "日期"
c04f5ac3 7513
5809aa05 7514#: builtin/commit.c:1624
ef317cd5 7515msgid "override date for commit"
07432cef 7516msgstr "提交时覆盖日期"
c04f5ac3 7517
5809aa05 7518#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
6937cb4e 7519#: builtin/notes.c:565 builtin/tag.c:386
ef317cd5 7520msgid "message"
07432cef 7521msgstr "说明"
c04f5ac3 7522
5809aa05 7523#: builtin/commit.c:1625
ef317cd5 7524msgid "commit message"
07432cef 7525msgstr "提交说明"
ef317cd5 7526
5809aa05
JX
7527#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
7528#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
94550ed3
JX
7529msgid "commit"
7530msgstr "提交"
7531
5809aa05 7532#: builtin/commit.c:1626
ef317cd5 7533msgid "reuse and edit message from specified commit"
07432cef 7534msgstr "重用并编辑指定提交的提交说明"
ef317cd5 7535
5809aa05 7536#: builtin/commit.c:1627
ef317cd5 7537msgid "reuse message from specified commit"
07432cef 7538msgstr "重用指定提交的提交说明"
ef317cd5 7539
5809aa05 7540#: builtin/commit.c:1628
ef317cd5 7541msgid "use autosquash formatted message to fixup specified commit"
07432cef 7542msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 7543
5809aa05 7544#: builtin/commit.c:1629
ef317cd5 7545msgid "use autosquash formatted message to squash specified commit"
07432cef 7546msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 7547
5809aa05 7548#: builtin/commit.c:1630
ef317cd5 7549msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 7550msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 7551
5809aa05
JX
7552#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
7553#: builtin/pull.c:149 builtin/revert.c:105
ef317cd5 7554msgid "add Signed-off-by:"
07432cef 7555msgstr "添加 Signed-off-by: 签名"
ef317cd5 7556
5809aa05 7557#: builtin/commit.c:1632
ef317cd5 7558msgid "use specified template file"
07432cef 7559msgstr "使用指定的模板文件"
ef317cd5 7560
5809aa05 7561#: builtin/commit.c:1633
ef317cd5 7562msgid "force edit of commit"
07432cef 7563msgstr "强制编辑提交"
ef317cd5 7564
07432cef 7565# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
5809aa05 7566#: builtin/commit.c:1634
ef317cd5 7567msgid "default"
07432cef 7568msgstr "default"
ef317cd5 7569
5809aa05 7570#: builtin/commit.c:1634 builtin/tag.c:391
ef317cd5 7571msgid "how to strip spaces and #comments from message"
07432cef 7572msgstr "设置如何删除提交说明里的空格和#注释"
ef317cd5 7573
5809aa05 7574#: builtin/commit.c:1635
ef317cd5 7575msgid "include status in commit message template"
07432cef 7576msgstr "在提交说明模板里包含状态信息"
ef317cd5 7577
5809aa05 7578#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
a4f16749 7579#: builtin/revert.c:113
ef317cd5 7580msgid "GPG sign commit"
07432cef 7581msgstr "GPG 提交签名"
ef317cd5 7582
5809aa05 7583#: builtin/commit.c:1640
ef317cd5 7584msgid "Commit contents options"
07432cef 7585msgstr "提交内容选项"
ef317cd5 7586
5809aa05 7587#: builtin/commit.c:1641
ef317cd5 7588msgid "commit all changed files"
07432cef 7589msgstr "提交所有改动的文件"
ef317cd5 7590
5809aa05 7591#: builtin/commit.c:1642
ef317cd5 7592msgid "add specified files to index for commit"
07432cef 7593msgstr "添加指定的文件到索引区等待提交"
ef317cd5 7594
5809aa05 7595#: builtin/commit.c:1643
ef317cd5 7596msgid "interactively add files"
07432cef 7597msgstr "交互式添加文件"
ef317cd5 7598
5809aa05 7599#: builtin/commit.c:1644
ef317cd5 7600msgid "interactively add changes"
07432cef 7601msgstr "交互式添加变更"
ef317cd5 7602
5809aa05 7603#: builtin/commit.c:1645
ef317cd5 7604msgid "commit only specified files"
07432cef 7605msgstr "只提交指定的文件"
ef317cd5 7606
5809aa05 7607#: builtin/commit.c:1646
5c57d762
JX
7608msgid "bypass pre-commit and commit-msg hooks"
7609msgstr "绕过 pre-commit 和 commit-msg 钩子"
7610
5809aa05 7611#: builtin/commit.c:1647
ef317cd5 7612msgid "show what would be committed"
07432cef 7613msgstr "显示将要提交的内容"
ef317cd5 7614
5809aa05 7615#: builtin/commit.c:1658
ef317cd5 7616msgid "amend previous commit"
07432cef 7617msgstr "修改先前的提交"
ef317cd5 7618
5809aa05 7619#: builtin/commit.c:1659
ef317cd5 7620msgid "bypass post-rewrite hook"
07432cef 7621msgstr "绕过 post-rewrite 钩子"
ef317cd5 7622
5809aa05 7623#: builtin/commit.c:1664
ef317cd5 7624msgid "ok to record an empty change"
07432cef 7625msgstr "允许一个空提交"
ef317cd5 7626
5809aa05 7627#: builtin/commit.c:1666
ef317cd5 7628msgid "ok to record a change with an empty message"
07432cef 7629msgstr "允许空的提交说明"
ef317cd5 7630
5809aa05 7631#: builtin/commit.c:1696
c04f5ac3 7632msgid "could not parse HEAD commit"
90e6ef53 7633msgstr "不能解析 HEAD 提交"
c04f5ac3 7634
5809aa05 7635#: builtin/commit.c:1741
c04f5ac3
JX
7636#, c-format
7637msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 7638msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 7639
5809aa05 7640#: builtin/commit.c:1748
c04f5ac3 7641msgid "could not read MERGE_MODE"
90e6ef53 7642msgstr "不能读取 MERGE_MODE"
c04f5ac3 7643
5809aa05 7644#: builtin/commit.c:1767
c04f5ac3
JX
7645#, c-format
7646msgid "could not read commit message: %s"
90e6ef53 7647msgstr "不能读取提交说明:%s"
c04f5ac3 7648
5809aa05 7649#: builtin/commit.c:1778
c04f5ac3
JX
7650#, c-format
7651msgid "Aborting commit due to empty commit message.\n"
7652msgstr "终止提交因为提交说明为空。\n"
7653
5809aa05 7654#: builtin/commit.c:1783
6937cb4e
JX
7655#, c-format
7656msgid "Aborting commit; you did not edit the message.\n"
7657msgstr "终止提交;您未更改来自模版的提交说明。\n"
7658
5809aa05 7659#: builtin/commit.c:1831
c04f5ac3
JX
7660msgid ""
7661"Repository has been updated, but unable to write\n"
220c313c 7662"new_index file. Check that disk is not full and quota is\n"
c04f5ac3
JX
7663"not exceeded, and then \"git reset HEAD\" to recover."
7664msgstr ""
160fb2b2 7665"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
90e6ef53 7666"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 7667
a4f16749 7668#: builtin/config.c:10
814ff314
JX
7669msgid "git config [<options>]"
7670msgstr "git config [<选项>]"
ef317cd5 7671
5809aa05 7672#: builtin/config.c:58
ef317cd5 7673msgid "Config file location"
07432cef 7674msgstr "配置文件位置"
ef317cd5 7675
5809aa05 7676#: builtin/config.c:59
ef317cd5 7677msgid "use global config file"
07432cef 7678msgstr "使用全局配置文件"
ef317cd5 7679
5809aa05 7680#: builtin/config.c:60
ef317cd5 7681msgid "use system config file"
07432cef 7682msgstr "使用系统级配置文件"
ef317cd5 7683
5809aa05 7684#: builtin/config.c:61
ef317cd5 7685msgid "use repository config file"
160fb2b2 7686msgstr "使用仓库级配置文件"
ef317cd5 7687
5809aa05 7688#: builtin/config.c:62
ef317cd5 7689msgid "use given config file"
07432cef 7690msgstr "使用指定的配置文件"
ef317cd5 7691
5809aa05 7692#: builtin/config.c:63
2e8451e8 7693msgid "blob-id"
4375c10e 7694msgstr "数据对象 ID"
2e8451e8 7695
5809aa05 7696#: builtin/config.c:63
2e8451e8
JX
7697msgid "read config from given blob object"
7698msgstr "从给定的数据对象读取配置"
7699
5809aa05 7700#: builtin/config.c:64
ef317cd5 7701msgid "Action"
07432cef 7702msgstr "操作"
ef317cd5 7703
5809aa05 7704#: builtin/config.c:65
ef317cd5 7705msgid "get value: name [value-regex]"
07432cef 7706msgstr "获取值:name [value-regex]"
ef317cd5 7707
5809aa05 7708#: builtin/config.c:66
ef317cd5 7709msgid "get all values: key [value-regex]"
07432cef 7710msgstr "获得所有的值:key [value-regex]"
ef317cd5 7711
5809aa05 7712#: builtin/config.c:67
ef317cd5 7713msgid "get values for regexp: name-regex [value-regex]"
07432cef 7714msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 7715
5809aa05 7716#: builtin/config.c:68
90314792
JX
7717msgid "get value specific for the URL: section[.var] URL"
7718msgstr "获得 URL 取值:section[.var] URL"
7719
5809aa05 7720#: builtin/config.c:69
ef317cd5 7721msgid "replace all matching variables: name value [value_regex]"
07432cef 7722msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 7723
5809aa05 7724#: builtin/config.c:70
ef317cd5 7725msgid "add a new variable: name value"
07432cef 7726msgstr "添加一个新的变量:name value"
ef317cd5 7727
5809aa05 7728#: builtin/config.c:71
ef317cd5 7729msgid "remove a variable: name [value-regex]"
07432cef 7730msgstr "删除一个变量:name [value-regex]"
ef317cd5 7731
5809aa05 7732#: builtin/config.c:72
ef317cd5 7733msgid "remove all matches: name [value-regex]"
07432cef 7734msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 7735
5809aa05 7736#: builtin/config.c:73
ef317cd5 7737msgid "rename section: old-name new-name"
07432cef 7738msgstr "重命名小节:old-name new-name"
ef317cd5 7739
5809aa05 7740#: builtin/config.c:74
ef317cd5 7741msgid "remove a section: name"
07432cef 7742msgstr "删除一个小节:name"
ef317cd5 7743
5809aa05 7744#: builtin/config.c:75
ef317cd5 7745msgid "list all"
07432cef 7746msgstr "列出所有"
ef317cd5 7747
5809aa05 7748#: builtin/config.c:76
ef317cd5 7749msgid "open an editor"
07432cef 7750msgstr "打开一个编辑器"
ef317cd5 7751
5809aa05 7752#: builtin/config.c:77
04cb2f28
JX
7753msgid "find the color configured: slot [default]"
7754msgstr "获得配置的颜色:配置 [默认]"
ef317cd5 7755
5809aa05 7756#: builtin/config.c:78
04cb2f28
JX
7757msgid "find the color setting: slot [stdout-is-tty]"
7758msgstr "获得颜色设置:配置 [stdout-is-tty]"
ef317cd5 7759
5809aa05 7760#: builtin/config.c:79
ef317cd5 7761msgid "Type"
07432cef 7762msgstr "类型"
ef317cd5 7763
5809aa05 7764#: builtin/config.c:80
ef317cd5 7765msgid "value is \"true\" or \"false\""
07432cef 7766msgstr "值是 \"true\" 或 \"false\""
ef317cd5 7767
5809aa05 7768#: builtin/config.c:81
ef317cd5 7769msgid "value is decimal number"
07432cef 7770msgstr "值是十进制数"
ef317cd5 7771
5809aa05 7772#: builtin/config.c:82
ef317cd5 7773msgid "value is --bool or --int"
07432cef 7774msgstr "值是 --bool or --int"
ef317cd5 7775
5809aa05 7776#: builtin/config.c:83
ef317cd5 7777msgid "value is a path (file or directory name)"
07432cef 7778msgstr "值是一个路径(文件或目录名)"
ef317cd5 7779
5809aa05
JX
7780#: builtin/config.c:84
7781msgid "value is an expiry date"
7782msgstr "值是一个到期日期"
7783
7784#: builtin/config.c:85
ef317cd5 7785msgid "Other"
07432cef 7786msgstr "其它"
ef317cd5 7787
5809aa05 7788#: builtin/config.c:86
ef317cd5 7789msgid "terminate values with NUL byte"
4375c10e 7790msgstr "终止值是 NUL 字节"
ef317cd5 7791
5809aa05 7792#: builtin/config.c:87
1b7f4a34
JX
7793msgid "show variable names only"
7794msgstr "只显示变量名"
7795
5809aa05 7796#: builtin/config.c:88
ef317cd5 7797msgid "respect include directives on lookup"
07432cef 7798msgstr "查询时参照 include 指令递归查找"
ef317cd5 7799
5809aa05 7800#: builtin/config.c:89
276ceeaa
JX
7801msgid "show origin of config (file, standard input, blob, command line)"
7802msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
7803
5809aa05 7804#: builtin/config.c:335
220c313c 7805msgid "unable to parse default color value"
160fb2b2 7806msgstr "不能解析默认颜色值"
220c313c 7807
5809aa05 7808#: builtin/config.c:479
220c313c
JX
7809#, c-format
7810msgid ""
7811"# This is Git's per-user configuration file.\n"
7aea43ff 7812"[user]\n"
220c313c 7813"# Please adapt and uncomment the following lines:\n"
7aea43ff 7814"#\tname = %s\n"
220c313c
JX
7815"#\temail = %s\n"
7816msgstr ""
7817"# This is Git's per-user configuration file.\n"
7aea43ff 7818"[user]\n"
220c313c 7819"# Please adapt and uncomment the following lines:\n"
7aea43ff 7820"#\tname = %s\n"
220c313c
JX
7821"#\temail = %s\n"
7822
5809aa05 7823#: builtin/config.c:507
a4f16749
JX
7824msgid "--local can only be used inside a git repository"
7825msgstr "--local 只能在一个仓库内使用"
7826
5809aa05 7827#: builtin/config.c:632
220c313c
JX
7828#, c-format
7829msgid "cannot create configuration file %s"
7830msgstr "不能创建配置文件 %s"
7831
5809aa05 7832#: builtin/config.c:645
a0b6b246
JX
7833#, c-format
7834msgid ""
7835"cannot overwrite multiple values with a single value\n"
7836" Use a regexp, --add or --replace-all to change %s."
7837msgstr ""
7838"无法用一个值覆盖多个值\n"
7839" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
7840
6937cb4e 7841#: builtin/count-objects.c:88
4dcdc3d8
JX
7842msgid "git count-objects [-v] [-H | --human-readable]"
7843msgstr "git count-objects [-v] [-H | --human-readable]"
7844
6937cb4e 7845#: builtin/count-objects.c:98
4dcdc3d8
JX
7846msgid "print sizes in human readable format"
7847msgstr "以用户可读的格式显示大小"
ef317cd5 7848
5809aa05 7849#: builtin/describe.c:22
814ff314
JX
7850msgid "git describe [<options>] [<commit-ish>...]"
7851msgstr "git describe [<选项>] [<提交号>...]"
ef317cd5 7852
5809aa05 7853#: builtin/describe.c:23
814ff314
JX
7854msgid "git describe [<options>] --dirty"
7855msgstr "git describe [<选项>] --dirty"
ef317cd5 7856
5809aa05 7857#: builtin/describe.c:57
87cb7997
JX
7858msgid "head"
7859msgstr "头"
7860
5809aa05 7861#: builtin/describe.c:57
87cb7997
JX
7862msgid "lightweight"
7863msgstr "轻量级的"
7864
5809aa05 7865#: builtin/describe.c:57
87cb7997
JX
7866msgid "annotated"
7867msgstr "附注的"
7868
5809aa05 7869#: builtin/describe.c:267
c04f5ac3
JX
7870#, c-format
7871msgid "annotated tag %s not available"
55a16ee4 7872msgstr "附注标签 %s 无效"
c04f5ac3 7873
5809aa05 7874#: builtin/describe.c:271
c04f5ac3
JX
7875#, c-format
7876msgid "annotated tag %s has no embedded name"
55a16ee4 7877msgstr "附注标签 %s 没有嵌入名称"
c04f5ac3 7878
5809aa05 7879#: builtin/describe.c:273
c04f5ac3
JX
7880#, c-format
7881msgid "tag '%s' is really '%s' here"
55a16ee4 7882msgstr "标签 '%s' 的确是在 '%s'"
c04f5ac3 7883
5809aa05 7884#: builtin/describe.c:314
c04f5ac3
JX
7885#, c-format
7886msgid "no tag exactly matches '%s'"
55a16ee4 7887msgstr "没有标签准确匹配 '%s'"
c04f5ac3 7888
5809aa05 7889#: builtin/describe.c:316
c04f5ac3 7890#, c-format
5809aa05
JX
7891msgid "No exact match on refs or tags, searching to describe\n"
7892msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n"
c04f5ac3 7893
5809aa05 7894#: builtin/describe.c:363
c04f5ac3
JX
7895#, c-format
7896msgid "finished search at %s\n"
7897msgstr "完成搜索 %s\n"
7898
5809aa05 7899#: builtin/describe.c:389
c04f5ac3
JX
7900#, c-format
7901msgid ""
7902"No annotated tags can describe '%s'.\n"
7903"However, there were unannotated tags: try --tags."
7904msgstr ""
55a16ee4
RC
7905"没有附注标签能描述 '%s'。\n"
7906"然而,存在未附注标签:尝试 --tags。"
c04f5ac3 7907
5809aa05 7908#: builtin/describe.c:393
c04f5ac3
JX
7909#, c-format
7910msgid ""
7911"No tags can describe '%s'.\n"
7912"Try --always, or create some tags."
7913msgstr ""
55a16ee4
RC
7914"没有标签能描述 '%s'。\n"
7915"尝试 --always,或者创建一些标签。"
c04f5ac3 7916
5809aa05 7917#: builtin/describe.c:423
c04f5ac3
JX
7918#, c-format
7919msgid "traversed %lu commits\n"
7920msgstr "已遍历 %lu 个提交\n"
7921
5809aa05 7922#: builtin/describe.c:426
c04f5ac3
JX
7923#, c-format
7924msgid ""
7925"more than %i tags found; listed %i most recent\n"
7926"gave up search at %s\n"
7927msgstr ""
55a16ee4 7928"发现多于 %i 个标签,列出最近的 %i 个\n"
90e6ef53 7929"在 %s 放弃搜索\n"
c04f5ac3 7930
5809aa05
JX
7931#: builtin/describe.c:494
7932#, c-format
7933msgid "describe %s\n"
7934msgstr "描述 %s\n"
7935
7936#: builtin/describe.c:497 builtin/log.c:500
7937#, c-format
7938msgid "Not a valid object name %s"
7939msgstr "不是一个有效的对象名 %s"
7940
7941#: builtin/describe.c:505
7942#, c-format
7943msgid "%s is neither a commit nor blob"
7944msgstr "%s 既不是提交也不是数据对象"
7945
7946#: builtin/describe.c:519
ef317cd5 7947msgid "find the tag that comes after the commit"
55a16ee4 7948msgstr "寻找该提交之后的标签"
ef317cd5 7949
5809aa05 7950#: builtin/describe.c:520
ef317cd5 7951msgid "debug search strategy on stderr"
07432cef 7952msgstr "在标准错误上调试搜索策略"
ef317cd5 7953
5809aa05 7954#: builtin/describe.c:521
1003b3a5
JX
7955msgid "use any ref"
7956msgstr "使用任意引用"
7957
5809aa05 7958#: builtin/describe.c:522
1003b3a5 7959msgid "use any tag, even unannotated"
55a16ee4 7960msgstr "使用任意标签,即使未附带注释"
ef317cd5 7961
5809aa05 7962#: builtin/describe.c:523
ef317cd5 7963msgid "always use long format"
07432cef 7964msgstr "始终使用长提交号格式"
ef317cd5 7965
5809aa05 7966#: builtin/describe.c:524
2e8451e8
JX
7967msgid "only follow first parent"
7968msgstr "只跟随第一个父提交"
7969
5809aa05 7970#: builtin/describe.c:527
ef317cd5 7971msgid "only output exact matches"
07432cef 7972msgstr "只输出精确匹配"
ef317cd5 7973
5809aa05 7974#: builtin/describe.c:529
ef317cd5 7975msgid "consider <n> most recent tags (default: 10)"
55a16ee4 7976msgstr "考虑最近 <n> 个标签(默认:10)"
ef317cd5 7977
5809aa05 7978#: builtin/describe.c:531
ef317cd5 7979msgid "only consider tags matching <pattern>"
55a16ee4 7980msgstr "只考虑匹配 <模式> 的标签"
ef317cd5 7981
5809aa05 7982#: builtin/describe.c:533
87cb7997
JX
7983msgid "do not consider tags matching <pattern>"
7984msgstr "不考虑匹配 <模式> 的标签"
7985
5809aa05 7986#: builtin/describe.c:535 builtin/name-rev.c:406
ef317cd5 7987msgid "show abbreviated commit object as fallback"
07432cef 7988msgstr "显示简写的提交号作为后备"
ef317cd5 7989
5809aa05 7990#: builtin/describe.c:536 builtin/describe.c:539
ef317cd5 7991msgid "mark"
07432cef 7992msgstr "标记"
ef317cd5 7993
5809aa05 7994#: builtin/describe.c:537
ef317cd5 7995msgid "append <mark> on dirty working tree (default: \"-dirty\")"
160fb2b2 7996msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
ef317cd5 7997
5809aa05 7998#: builtin/describe.c:540
87cb7997
JX
7999msgid "append <mark> on broken working tree (default: \"-broken\")"
8000msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
8001
5809aa05 8002#: builtin/describe.c:558
c04f5ac3
JX
8003msgid "--long is incompatible with --abbrev=0"
8004msgstr "--long 与 --abbrev=0 不兼容"
8005
5809aa05 8006#: builtin/describe.c:587
c04f5ac3 8007msgid "No names found, cannot describe anything."
90e6ef53 8008msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 8009
5809aa05 8010#: builtin/describe.c:637
a8a5406a 8011msgid "--dirty is incompatible with commit-ishes"
87cb7997
JX
8012msgstr "--dirty 与提交号不兼容"
8013
5809aa05 8014#: builtin/describe.c:639
87cb7997
JX
8015msgid "--broken is incompatible with commit-ishes"
8016msgstr "--broken 与提交号不兼容"
c04f5ac3 8017
1a79b2f1 8018#: builtin/diff.c:83
c04f5ac3
JX
8019#, c-format
8020msgid "'%s': not a regular file or symlink"
8021msgstr "'%s':不是一个正规文件或符号链接"
8022
5809aa05 8023#: builtin/diff.c:234
c04f5ac3
JX
8024#, c-format
8025msgid "invalid option: %s"
8026msgstr "无效选项:%s"
8027
5809aa05 8028#: builtin/diff.c:356
c04f5ac3 8029msgid "Not a git repository"
160fb2b2 8030msgstr "不是一个 git 仓库"
c04f5ac3 8031
5809aa05 8032#: builtin/diff.c:399
c04f5ac3
JX
8033#, c-format
8034msgid "invalid object '%s' given."
8035msgstr "提供了无效对象 '%s'。"
8036
5809aa05 8037#: builtin/diff.c:408
c04f5ac3
JX
8038#, c-format
8039msgid "more than two blobs given: '%s'"
160fb2b2 8040msgstr "提供了超过两个数据对象:'%s'"
c04f5ac3 8041
5809aa05 8042#: builtin/diff.c:413
c04f5ac3
JX
8043#, c-format
8044msgid "unhandled object '%s' given."
6c94aba5 8045msgstr "无法处理的对象 '%s'。"
c04f5ac3 8046
a4f16749 8047#: builtin/difftool.c:29
1a79b2f1
JX
8048msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
8049msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
8050
6937cb4e 8051#: builtin/difftool.c:259
1a79b2f1
JX
8052#, c-format
8053msgid "failed: %d"
8054msgstr "失败:%d"
8055
6937cb4e 8056#: builtin/difftool.c:301
87cb7997
JX
8057#, c-format
8058msgid "could not read symlink %s"
8059msgstr "无法读取符号链接 %s"
8060
6937cb4e 8061#: builtin/difftool.c:303
87cb7997
JX
8062#, c-format
8063msgid "could not read symlink file %s"
8064msgstr "无法读取符号链接文件 %s"
8065
6937cb4e 8066#: builtin/difftool.c:311
87cb7997
JX
8067#, c-format
8068msgid "could not read object %s for symlink %s"
8069msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
8070
6937cb4e 8071#: builtin/difftool.c:412
1a79b2f1
JX
8072msgid ""
8073"combined diff formats('-c' and '--cc') are not supported in\n"
8074"directory diff mode('-d' and '--dir-diff')."
87cb7997
JX
8075msgstr ""
8076"不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
8077"cc')。"
1a79b2f1 8078
5809aa05 8079#: builtin/difftool.c:632
1a79b2f1
JX
8080#, c-format
8081msgid "both files modified: '%s' and '%s'."
8082msgstr "两个文件都被修改:'%s' 和 '%s'。"
8083
5809aa05 8084#: builtin/difftool.c:634
1a79b2f1
JX
8085msgid "working tree file has been left."
8086msgstr "工作区文件被留了下来。"
8087
5809aa05 8088#: builtin/difftool.c:645
1a79b2f1
JX
8089#, c-format
8090msgid "temporary files exist in '%s'."
8091msgstr "临时文件存在于 '%s'。"
8092
5809aa05 8093#: builtin/difftool.c:646
1a79b2f1
JX
8094msgid "you may want to cleanup or recover these."
8095msgstr "您可能想要清理或者恢复它们。"
8096
5809aa05 8097#: builtin/difftool.c:695
1a79b2f1
JX
8098msgid "use `diff.guitool` instead of `diff.tool`"
8099msgstr "使用 `diff.guitool` 代替 `diff.tool`"
8100
5809aa05 8101#: builtin/difftool.c:697
1a79b2f1
JX
8102msgid "perform a full-directory diff"
8103msgstr "执行一个全目录差异比较"
8104
5809aa05 8105#: builtin/difftool.c:699
1a79b2f1
JX
8106msgid "do not prompt before launching a diff tool"
8107msgstr "启动差异比较工具之前不提示"
8108
5809aa05 8109#: builtin/difftool.c:705
1a79b2f1
JX
8110msgid "use symlinks in dir-diff mode"
8111msgstr "在 dir-diff 模式中使用符号链接"
8112
5809aa05 8113#: builtin/difftool.c:706
1a79b2f1
JX
8114msgid "<tool>"
8115msgstr "<工具>"
8116
5809aa05 8117#: builtin/difftool.c:707
1a79b2f1
JX
8118msgid "use the specified diff tool"
8119msgstr "使用指定的差异比较工具"
8120
5809aa05 8121#: builtin/difftool.c:709
1a79b2f1
JX
8122msgid "print a list of diff tools that may be used with `--tool`"
8123msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
8124
5809aa05 8125#: builtin/difftool.c:712
1a79b2f1
JX
8126msgid ""
8127"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
8128"code"
8129msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出"
8130
5809aa05 8131#: builtin/difftool.c:714
1a79b2f1
JX
8132msgid "<command>"
8133msgstr "<命令>"
8134
5809aa05 8135#: builtin/difftool.c:715
1a79b2f1
JX
8136msgid "specify a custom command for viewing diffs"
8137msgstr "指定一个用于查看差异的自定义命令"
8138
5809aa05 8139#: builtin/difftool.c:739
1a79b2f1
JX
8140msgid "no <tool> given for --tool=<tool>"
8141msgstr "没有为 --tool=<工具> 参数提供 <工具>"
8142
5809aa05 8143#: builtin/difftool.c:746
1a79b2f1
JX
8144msgid "no <cmd> given for --extcmd=<cmd>"
8145msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
8146
a4f16749 8147#: builtin/fast-export.c:26
ef317cd5 8148msgid "git fast-export [rev-list-opts]"
07432cef 8149msgstr "git fast-export [rev-list-opts]"
ef317cd5 8150
6937cb4e 8151#: builtin/fast-export.c:998
ef317cd5 8152msgid "show progress after <n> objects"
07432cef 8153msgstr "在 <n> 个对象之后显示进度"
ef317cd5 8154
6937cb4e 8155#: builtin/fast-export.c:1000
ef317cd5 8156msgid "select handling of signed tags"
55a16ee4 8157msgstr "选择如何处理签名标签"
ef317cd5 8158
6937cb4e 8159#: builtin/fast-export.c:1003
ef317cd5 8160msgid "select handling of tags that tag filtered objects"
55a16ee4 8161msgstr "选择当标签指向被过滤对象时该标签的处理方式"
ef317cd5 8162
6937cb4e 8163#: builtin/fast-export.c:1006
ef317cd5 8164msgid "Dump marks to this file"
07432cef 8165msgstr "把标记存储到这个文件"
ef317cd5 8166
6937cb4e 8167#: builtin/fast-export.c:1008
ef317cd5 8168msgid "Import marks from this file"
07432cef 8169msgstr "从这个文件导入标记"
ef317cd5 8170
6937cb4e 8171#: builtin/fast-export.c:1010
ef317cd5 8172msgid "Fake a tagger when tags lack one"
55a16ee4 8173msgstr "当标签缺少标记者字段时,假装提供一个"
ef317cd5 8174
6937cb4e 8175#: builtin/fast-export.c:1012
ef317cd5 8176msgid "Output full tree for each commit"
07432cef 8177msgstr "每次提交都输出整个树"
ef317cd5 8178
6937cb4e 8179#: builtin/fast-export.c:1014
ef317cd5 8180msgid "Use the done feature to terminate the stream"
07432cef 8181msgstr "使用 done 功能来终止流"
ef317cd5 8182
6937cb4e 8183#: builtin/fast-export.c:1015
ef317cd5 8184msgid "Skip output of blob data"
07432cef 8185msgstr "跳过数据对象的输出"
ef317cd5 8186
6937cb4e 8187#: builtin/fast-export.c:1016
6acbf033 8188msgid "refspec"
160fb2b2 8189msgstr "引用规格"
6acbf033 8190
6937cb4e 8191#: builtin/fast-export.c:1017
6acbf033 8192msgid "Apply refspec to exported refs"
160fb2b2 8193msgstr "对导出的引用应用引用规格"
6acbf033 8194
6937cb4e 8195#: builtin/fast-export.c:1018
220c313c
JX
8196msgid "anonymize output"
8197msgstr "匿名输出"
8198
5809aa05 8199#: builtin/fetch.c:24
ef317cd5 8200msgid "git fetch [<options>] [<repository> [<refspec>...]]"
160fb2b2 8201msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
ef317cd5 8202
5809aa05 8203#: builtin/fetch.c:25
ef317cd5 8204msgid "git fetch [<options>] <group>"
07432cef 8205msgstr "git fetch [<选项>] <组>"
ef317cd5 8206
5809aa05 8207#: builtin/fetch.c:26
ef317cd5 8208msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
160fb2b2 8209msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
ef317cd5 8210
5809aa05 8211#: builtin/fetch.c:27
ef317cd5 8212msgid "git fetch --all [<options>]"
07432cef 8213msgstr "git fetch --all [<选项>]"
ef317cd5 8214
5809aa05 8215#: builtin/fetch.c:113 builtin/pull.c:188
ef317cd5 8216msgid "fetch from all remotes"
07432cef 8217msgstr "从所有的远程抓取"
ef317cd5 8218
5809aa05 8219#: builtin/fetch.c:115 builtin/pull.c:191
ef317cd5 8220msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 8221msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 8222
5809aa05 8223#: builtin/fetch.c:117 builtin/pull.c:194
ef317cd5 8224msgid "path to upload pack on remote end"
07432cef 8225msgstr "上传包到远程的路径"
ef317cd5 8226
5809aa05 8227#: builtin/fetch.c:118 builtin/pull.c:196
ef317cd5 8228msgid "force overwrite of local branch"
07432cef 8229msgstr "强制覆盖本地分支"
ef317cd5 8230
5809aa05 8231#: builtin/fetch.c:120
ef317cd5 8232msgid "fetch from multiple remotes"
07432cef 8233msgstr "从多个远程抓取"
ef317cd5 8234
5809aa05 8235#: builtin/fetch.c:122 builtin/pull.c:198
ef317cd5 8236msgid "fetch all tags and associated objects"
55a16ee4 8237msgstr "抓取所有的标签和关联对象"
ef317cd5 8238
5809aa05 8239#: builtin/fetch.c:124
ef317cd5 8240msgid "do not fetch all tags (--no-tags)"
55a16ee4 8241msgstr "不抓取任何标签(--no-tags)"
ef317cd5 8242
5809aa05 8243#: builtin/fetch.c:126
276ceeaa
JX
8244msgid "number of submodules fetched in parallel"
8245msgstr "子模组获取的并发数"
8246
5809aa05 8247#: builtin/fetch.c:128 builtin/pull.c:201
ef317cd5 8248msgid "prune remote-tracking branches no longer on remote"
07432cef 8249msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 8250
07432cef 8251# 译者:可选值,不能翻译
5809aa05 8252#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
ef317cd5 8253msgid "on-demand"
07432cef 8254msgstr "on-demand"
ef317cd5 8255
5809aa05 8256#: builtin/fetch.c:130
ef317cd5 8257msgid "control recursive fetching of submodules"
07432cef 8258msgstr "控制子模组的递归抓取"
ef317cd5 8259
5809aa05 8260#: builtin/fetch.c:134 builtin/pull.c:209
ef317cd5 8261msgid "keep downloaded pack"
07432cef 8262msgstr "保持下载包"
ef317cd5 8263
5809aa05 8264#: builtin/fetch.c:136
ef317cd5 8265msgid "allow updating of HEAD ref"
07432cef 8266msgstr "允许更新 HEAD 引用"
ef317cd5 8267
5809aa05 8268#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
ef317cd5 8269msgid "deepen history of shallow clone"
07432cef 8270msgstr "深化浅克隆的历史"
ef317cd5 8271
5809aa05 8272#: builtin/fetch.c:141
a0b6b246
JX
8273msgid "deepen history of shallow repository based on time"
8274msgstr "基于时间来深化浅克隆的历史"
8275
5809aa05 8276#: builtin/fetch.c:147 builtin/pull.c:215
a77c07d9 8277msgid "convert to a complete repository"
160fb2b2 8278msgstr "转换为一个完整的仓库"
a77c07d9 8279
5809aa05 8280#: builtin/fetch.c:149 builtin/log.c:1463
ef317cd5 8281msgid "dir"
07432cef 8282msgstr "目录"
ef317cd5 8283
5809aa05 8284#: builtin/fetch.c:150
ef317cd5 8285msgid "prepend this to submodule path output"
07432cef 8286msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 8287
5809aa05 8288#: builtin/fetch.c:153
a4f16749
JX
8289msgid ""
8290"default for recursive fetching of submodules (lower priority than config "
8291"files)"
8292msgstr "递归获取子模组的缺省值(比配置文件优先级低)"
ef317cd5 8293
5809aa05 8294#: builtin/fetch.c:157 builtin/pull.c:218
cfff71a9
JX
8295msgid "accept refs that update .git/shallow"
8296msgstr "接受更新 .git/shallow 的引用"
8297
5809aa05 8298#: builtin/fetch.c:158 builtin/pull.c:220
6acbf033
JX
8299msgid "refmap"
8300msgstr "引用映射"
8301
5809aa05 8302#: builtin/fetch.c:159 builtin/pull.c:221
6acbf033
JX
8303msgid "specify fetch refmap"
8304msgstr "指定获取操作的引用映射"
8305
5809aa05 8306#: builtin/fetch.c:417
c04f5ac3
JX
8307msgid "Couldn't find remote ref HEAD"
8308msgstr "无法发现远程 HEAD 引用"
8309
5809aa05 8310#: builtin/fetch.c:535
5c57d762
JX
8311#, c-format
8312msgid "configuration fetch.output contains invalid value %s"
8313msgstr "配置变量 fetch.output 包含无效值 %s"
8314
5809aa05 8315#: builtin/fetch.c:628
c04f5ac3
JX
8316#, c-format
8317msgid "object %s not found"
8318msgstr "对象 %s 未发现"
8319
5809aa05 8320#: builtin/fetch.c:632
c04f5ac3
JX
8321msgid "[up to date]"
8322msgstr "[最新]"
8323
5809aa05 8324#: builtin/fetch.c:645 builtin/fetch.c:725
c04f5ac3
JX
8325msgid "[rejected]"
8326msgstr "[已拒绝]"
8327
5809aa05 8328#: builtin/fetch.c:646
5c57d762 8329msgid "can't fetch in current branch"
9a4b694c 8330msgstr "当前分支下不能执行获取操作"
5c57d762 8331
5809aa05 8332#: builtin/fetch.c:655
c04f5ac3 8333msgid "[tag update]"
55a16ee4 8334msgstr "[标签更新]"
c04f5ac3 8335
5809aa05
JX
8336#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
8337#: builtin/fetch.c:720
5c57d762
JX
8338msgid "unable to update local ref"
8339msgstr "不能更新本地引用"
c04f5ac3 8340
5809aa05 8341#: builtin/fetch.c:675
c04f5ac3 8342msgid "[new tag]"
55a16ee4 8343msgstr "[新标签]"
c04f5ac3 8344
5809aa05 8345#: builtin/fetch.c:678
c04f5ac3
JX
8346msgid "[new branch]"
8347msgstr "[新分支]"
8348
5809aa05 8349#: builtin/fetch.c:681
170e9899
JX
8350msgid "[new ref]"
8351msgstr "[新引用]"
8352
5809aa05 8353#: builtin/fetch.c:720
c04f5ac3
JX
8354msgid "forced update"
8355msgstr "强制更新"
8356
5809aa05 8357#: builtin/fetch.c:725
5c57d762
JX
8358msgid "non-fast-forward"
8359msgstr "非快进"
c04f5ac3 8360
5809aa05 8361#: builtin/fetch.c:770
c04f5ac3
JX
8362#, c-format
8363msgid "%s did not send all necessary objects\n"
8364msgstr "%s 未发送所有必须的对象\n"
8365
5809aa05 8366#: builtin/fetch.c:790
cfff71a9
JX
8367#, c-format
8368msgid "reject %s because shallow roots are not allowed to be updated"
8369msgstr "拒绝 %s 因为浅克隆不允许被更新"
8370
5809aa05 8371#: builtin/fetch.c:878 builtin/fetch.c:974
c04f5ac3
JX
8372#, c-format
8373msgid "From %.*s\n"
8374msgstr "来自 %.*s\n"
8375
5809aa05 8376#: builtin/fetch.c:889
c04f5ac3
JX
8377#, c-format
8378msgid ""
8379"some local refs could not be updated; try running\n"
8380" 'git remote prune %s' to remove any old, conflicting branches"
8381msgstr ""
8382"一些本地引用不能被更新;尝试运行\n"
8383" 'git remote prune %s' 来删除旧的、有冲突的分支"
8384
90e6ef53 8385# 译者:注意保持前导空格
5809aa05 8386#: builtin/fetch.c:944
81809b99 8387#, c-format
8ada9598 8388msgid " (%s will become dangling)"
07432cef 8389msgstr " (%s 将成为摇摆状态)"
c04f5ac3 8390
90e6ef53 8391# 译者:注意保持前导空格
5809aa05 8392#: builtin/fetch.c:945
81809b99 8393#, c-format
8ada9598 8394msgid " (%s has become dangling)"
07432cef 8395msgstr " (%s 已成为摇摆状态)"
c04f5ac3 8396
5809aa05 8397#: builtin/fetch.c:977
c04f5ac3
JX
8398msgid "[deleted]"
8399msgstr "[已删除]"
8400
5809aa05 8401#: builtin/fetch.c:978 builtin/remote.c:1024
c04f5ac3
JX
8402msgid "(none)"
8403msgstr "(无)"
8404
5809aa05 8405#: builtin/fetch.c:1001
c04f5ac3
JX
8406#, c-format
8407msgid "Refusing to fetch into current branch %s of non-bare repository"
160fb2b2 8408msgstr "拒绝获取到非纯仓库的当前分支 %s"
c04f5ac3 8409
5809aa05 8410#: builtin/fetch.c:1020
c04f5ac3
JX
8411#, c-format
8412msgid "Option \"%s\" value \"%s\" is not valid for %s"
8413msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
8414
5809aa05 8415#: builtin/fetch.c:1023
c04f5ac3
JX
8416#, c-format
8417msgid "Option \"%s\" is ignored for %s\n"
81809b99 8418msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 8419
5809aa05 8420#: builtin/fetch.c:1256
c04f5ac3
JX
8421#, c-format
8422msgid "Fetching %s\n"
d4a8e00b 8423msgstr "正在获取 %s\n"
c04f5ac3 8424
5809aa05 8425#: builtin/fetch.c:1258 builtin/remote.c:97
c04f5ac3
JX
8426#, c-format
8427msgid "Could not fetch %s"
8428msgstr "不能获取 %s"
8429
5809aa05 8430#: builtin/fetch.c:1276
c04f5ac3
JX
8431msgid ""
8432"No remote repository specified. Please, specify either a URL or a\n"
8433"remote name from which new revisions should be fetched."
4375c10e 8434msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
c04f5ac3 8435
5809aa05 8436#: builtin/fetch.c:1299
c04f5ac3 8437msgid "You need to specify a tag name."
55a16ee4 8438msgstr "您需要指定一个标签名称。"
c04f5ac3 8439
5809aa05 8440#: builtin/fetch.c:1342
a0b6b246
JX
8441msgid "Negative depth in --deepen is not supported"
8442msgstr "--deepen 不支持负数深度"
8443
5809aa05 8444#: builtin/fetch.c:1344
a0b6b246
JX
8445msgid "--deepen and --depth are mutually exclusive"
8446msgstr "--deepen 和 --depth 是互斥的"
8447
5809aa05 8448#: builtin/fetch.c:1349
a77c07d9
JX
8449msgid "--depth and --unshallow cannot be used together"
8450msgstr "--depth 和 --unshallow 不能同时使用"
8451
5809aa05 8452#: builtin/fetch.c:1351
a77c07d9 8453msgid "--unshallow on a complete repository does not make sense"
160fb2b2 8454msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
a77c07d9 8455
5809aa05 8456#: builtin/fetch.c:1364
c04f5ac3 8457msgid "fetch --all does not take a repository argument"
160fb2b2 8458msgstr "fetch --all 不能带一个仓库参数"
c04f5ac3 8459
5809aa05 8460#: builtin/fetch.c:1366
c04f5ac3 8461msgid "fetch --all does not make sense with refspecs"
160fb2b2 8462msgstr "fetch --all 带引用规格没有任何意义"
c04f5ac3 8463
5809aa05 8464#: builtin/fetch.c:1377
c04f5ac3
JX
8465#, c-format
8466msgid "No such remote or remote group: %s"
8467msgstr "没有这样的远程或远程组:%s"
8468
5809aa05 8469#: builtin/fetch.c:1385
c04f5ac3 8470msgid "Fetching a group and specifying refspecs does not make sense"
160fb2b2 8471msgstr "获取组并指定引用规格没有意义"
c04f5ac3 8472
a4f16749 8473#: builtin/fmt-merge-msg.c:15
814ff314
JX
8474msgid ""
8475"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
8476msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
c04f5ac3 8477
5809aa05 8478#: builtin/fmt-merge-msg.c:666
ef317cd5 8479msgid "populate log with at most <n> entries from shortlog"
07432cef 8480msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 8481
5809aa05 8482#: builtin/fmt-merge-msg.c:669
ef317cd5 8483msgid "alias for --log (deprecated)"
07432cef 8484msgstr "参数 --log 的别名(已弃用)"
ef317cd5 8485
5809aa05 8486#: builtin/fmt-merge-msg.c:672
ef317cd5 8487msgid "text"
07432cef 8488msgstr "文本"
ef317cd5 8489
5809aa05 8490#: builtin/fmt-merge-msg.c:673
ef317cd5 8491msgid "use <text> as start of message"
07432cef 8492msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 8493
5809aa05 8494#: builtin/fmt-merge-msg.c:674
ef317cd5 8495msgid "file to read from"
07432cef 8496msgstr "从文件中读取"
ef317cd5 8497
a4f16749 8498#: builtin/for-each-ref.c:10
814ff314
JX
8499msgid "git for-each-ref [<options>] [<pattern>]"
8500msgstr "git for-each-ref [<选项>] [<模式>]"
ef317cd5 8501
a4f16749 8502#: builtin/for-each-ref.c:11
94550ed3
JX
8503msgid "git for-each-ref [--points-at <object>]"
8504msgstr "git for-each-ref [--points-at <对象>]"
8505
a4f16749 8506#: builtin/for-each-ref.c:12
87cb7997
JX
8507msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
8508msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
94550ed3 8509
a4f16749 8510#: builtin/for-each-ref.c:13
87cb7997
JX
8511msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
8512msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
94550ed3 8513
a4f16749 8514#: builtin/for-each-ref.c:28
ef317cd5 8515msgid "quote placeholders suitably for shells"
07432cef 8516msgstr "引用占位符适用于 shells"
ef317cd5 8517
a4f16749 8518#: builtin/for-each-ref.c:30
ef317cd5 8519msgid "quote placeholders suitably for perl"
07432cef 8520msgstr "引用占位符适用于 perl"
ef317cd5 8521
a4f16749 8522#: builtin/for-each-ref.c:32
ef317cd5 8523msgid "quote placeholders suitably for python"
07432cef 8524msgstr "引用占位符适用于 python"
ef317cd5 8525
a4f16749 8526#: builtin/for-each-ref.c:34
04cb2f28
JX
8527msgid "quote placeholders suitably for Tcl"
8528msgstr "引用占位符适用于 Tcl"
ef317cd5 8529
a4f16749 8530#: builtin/for-each-ref.c:37
ef317cd5 8531msgid "show only <n> matched refs"
07432cef 8532msgstr "只显示 <n> 个匹配的引用"
ef317cd5 8533
6937cb4e
JX
8534#: builtin/for-each-ref.c:39 builtin/tag.c:414
8535msgid "respect format colors"
8536msgstr "遵照格式中的颜色输出"
8537
8538#: builtin/for-each-ref.c:43
94550ed3
JX
8539msgid "print only refs which points at the given object"
8540msgstr "只打印指向给定对象的引用"
ef317cd5 8541
6937cb4e 8542#: builtin/for-each-ref.c:45
94550ed3
JX
8543msgid "print only refs that are merged"
8544msgstr "只打印已经合并的引用"
8545
6937cb4e 8546#: builtin/for-each-ref.c:46
94550ed3
JX
8547msgid "print only refs that are not merged"
8548msgstr "只打印没有合并的引用"
ef317cd5 8549
6937cb4e 8550#: builtin/for-each-ref.c:47
94550ed3
JX
8551msgid "print only refs which contain the commit"
8552msgstr "只打印包含该提交的引用"
8553
6937cb4e 8554#: builtin/for-each-ref.c:48
87cb7997
JX
8555msgid "print only refs which don't contain the commit"
8556msgstr "只打印不包含该提交的引用"
8557
6937cb4e 8558#: builtin/fsck.c:543
6c94aba5
JX
8559msgid "Checking object directories"
8560msgstr "检查对象目录中"
8561
6937cb4e 8562#: builtin/fsck.c:635
814ff314
JX
8563msgid "git fsck [<options>] [<object>...]"
8564msgstr "git fsck [<选项>] [<对象>...]"
ef317cd5 8565
6937cb4e 8566#: builtin/fsck.c:641
ef317cd5 8567msgid "show unreachable objects"
07432cef 8568msgstr "显示不可达的对象"
ef317cd5 8569
6937cb4e 8570#: builtin/fsck.c:642
ef317cd5 8571msgid "show dangling objects"
07432cef 8572msgstr "显示摇摆的对象"
ef317cd5 8573
6937cb4e 8574#: builtin/fsck.c:643
ef317cd5 8575msgid "report tags"
55a16ee4 8576msgstr "报告标签"
ef317cd5 8577
6937cb4e 8578#: builtin/fsck.c:644
ef317cd5 8579msgid "report root nodes"
07432cef 8580msgstr "报告根节点"
ef317cd5 8581
6937cb4e 8582#: builtin/fsck.c:645
ef317cd5 8583msgid "make index objects head nodes"
07432cef 8584msgstr "将索引亦作为检查的头节点"
ef317cd5 8585
6937cb4e 8586#: builtin/fsck.c:646
ef317cd5 8587msgid "make reflogs head nodes (default)"
07432cef 8588msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 8589
6937cb4e 8590#: builtin/fsck.c:647
ef317cd5 8591msgid "also consider packs and alternate objects"
07432cef 8592msgstr "也考虑包和备用对象"
ef317cd5 8593
6937cb4e 8594#: builtin/fsck.c:648
1b7f4a34
JX
8595msgid "check only connectivity"
8596msgstr "仅检查连通性"
8597
6937cb4e 8598#: builtin/fsck.c:649
ef317cd5 8599msgid "enable more strict checking"
07432cef 8600msgstr "启用更严格的检查"
ef317cd5 8601
6937cb4e 8602#: builtin/fsck.c:651
ef317cd5 8603msgid "write dangling objects in .git/lost-found"
07432cef 8604msgstr "将摇摆对象写入 .git/lost-found 中"
ef317cd5 8605
6937cb4e 8606#: builtin/fsck.c:652 builtin/prune.c:107
ef317cd5 8607msgid "show progress"
07432cef 8608msgstr "显示进度"
ef317cd5 8609
6937cb4e 8610#: builtin/fsck.c:653
5c57d762
JX
8611msgid "show verbose names for reachable objects"
8612msgstr "显示可达对象的详细名称"
8613
6937cb4e 8614#: builtin/fsck.c:714
6c94aba5
JX
8615msgid "Checking objects"
8616msgstr "检查对象中"
8617
6937cb4e 8618#: builtin/gc.c:27
814ff314
JX
8619msgid "git gc [<options>]"
8620msgstr "git gc [<选项>]"
ef317cd5 8621
6937cb4e 8622#: builtin/gc.c:80
c04f5ac3 8623#, c-format
87cb7997 8624msgid "Failed to fstat %s: %s"
65e2041e 8625msgstr "对 %s 调用 fstat 失败:%s"
c04f5ac3 8626
6937cb4e 8627#: builtin/gc.c:312
c04f5ac3 8628#, c-format
87cb7997 8629msgid "Can't stat %s"
65e2041e 8630msgstr "不能对 %s 调用 stat"
c04f5ac3 8631
6937cb4e 8632#: builtin/gc.c:321
94550ed3
JX
8633#, c-format
8634msgid ""
8635"The last gc run reported the following. Please correct the root cause\n"
8636"and remove %s.\n"
8637"Automatic cleanup will not be performed until the file is removed.\n"
8638"\n"
8639"%s"
8640msgstr ""
8641"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
8642"在该文件被删除之前,自动清理将不会执行。\n"
8643"\n"
8644"%s"
8645
6937cb4e 8646#: builtin/gc.c:360
ef317cd5 8647msgid "prune unreferenced objects"
07432cef 8648msgstr "清除未引用的对象"
ef317cd5 8649
6937cb4e 8650#: builtin/gc.c:362
ef317cd5 8651msgid "be more thorough (increased runtime)"
07432cef 8652msgstr "更彻底(增加运行时间)"
ef317cd5 8653
6937cb4e 8654#: builtin/gc.c:363
ef317cd5 8655msgid "enable auto-gc mode"
07432cef 8656msgstr "启用自动垃圾回收模式"
ef317cd5 8657
6937cb4e 8658#: builtin/gc.c:364
90314792
JX
8659msgid "force running gc even if there may be another gc running"
8660msgstr "强制执行 gc 即使另外一个 gc 正在执行"
8661
6937cb4e 8662#: builtin/gc.c:381
87cb7997
JX
8663#, c-format
8664msgid "Failed to parse gc.logexpiry value %s"
8665msgstr "无法解析 gc.logexpiry 的值 %s"
8666
6937cb4e 8667#: builtin/gc.c:409
c04f5ac3 8668#, c-format
6c94aba5 8669msgid "Auto packing the repository in background for optimum performance.\n"
160fb2b2 8670msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6c94aba5 8671
6937cb4e 8672#: builtin/gc.c:411
6c94aba5
JX
8673#, c-format
8674msgid "Auto packing the repository for optimum performance.\n"
160fb2b2 8675msgstr "自动打包仓库以求最佳性能。\n"
6c94aba5 8676
6937cb4e 8677#: builtin/gc.c:412
6c94aba5
JX
8678#, c-format
8679msgid "See \"git help gc\" for manual housekeeping.\n"
8680msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 8681
6937cb4e 8682#: builtin/gc.c:437
90314792
JX
8683#, c-format
8684msgid ""
8685"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
8686msgstr ""
29004bbb 8687"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)"
90314792 8688
6937cb4e 8689#: builtin/gc.c:481
c04f5ac3
JX
8690msgid ""
8691"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 8692msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 8693
a4f16749 8694#: builtin/grep.c:27
814ff314
JX
8695msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
8696msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
ef317cd5 8697
6937cb4e 8698#: builtin/grep.c:226
c04f5ac3
JX
8699#, c-format
8700msgid "grep: failed to create thread: %s"
90e6ef53 8701msgstr "grep:无法创建线程:%s"
c04f5ac3 8702
6937cb4e 8703#: builtin/grep.c:284
276ceeaa
JX
8704#, c-format
8705msgid "invalid number of threads specified (%d) for %s"
8706msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
8707
a4f16749
JX
8708#. TRANSLATORS: %s is the configuration
8709#. variable for tweaking threads, currently
8710#. grep.threads
8711#.
5809aa05 8712#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
a4f16749
JX
8713#, c-format
8714msgid "no threads support, ignoring %s"
8715msgstr "没有线程支持,忽略 %s"
8716
5809aa05 8717#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
c04f5ac3
JX
8718#, c-format
8719msgid "unable to read tree (%s)"
90e6ef53 8720msgstr "无法读取树(%s)"
c04f5ac3 8721
5809aa05 8722#: builtin/grep.c:630
c04f5ac3
JX
8723#, c-format
8724msgid "unable to grep from object of type %s"
8725msgstr "无法抓取来自于 %s 类型的对象"
8726
5809aa05 8727#: builtin/grep.c:696
c04f5ac3
JX
8728#, c-format
8729msgid "switch `%c' expects a numerical value"
8730msgstr "开关 `%c' 期望一个数字值"
8731
5809aa05 8732#: builtin/grep.c:783
ef317cd5 8733msgid "search in index instead of in the work tree"
07432cef 8734msgstr "在索引区搜索而不是在工作区"
ef317cd5 8735
5809aa05 8736#: builtin/grep.c:785
ef317cd5 8737msgid "find in contents not managed by git"
07432cef 8738msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
8739
8740# 译者:中文字符串拼接,可删除前导空格
5809aa05 8741#: builtin/grep.c:787
ef317cd5 8742msgid "search in both tracked and untracked files"
07432cef 8743msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 8744
5809aa05 8745#: builtin/grep.c:789
814ff314
JX
8746msgid "ignore files specified via '.gitignore'"
8747msgstr "忽略 '.gitignore' 包含的文件"
ef317cd5 8748
5809aa05 8749#: builtin/grep.c:791
87cb7997 8750msgid "recursively search in each submodule"
1a79b2f1
JX
8751msgstr "在每一个子模组中递归搜索"
8752
5809aa05 8753#: builtin/grep.c:794
ef317cd5 8754msgid "show non-matching lines"
07432cef 8755msgstr "显示未匹配的行"
ef317cd5 8756
5809aa05 8757#: builtin/grep.c:796
ef317cd5 8758msgid "case insensitive matching"
07432cef 8759msgstr "不区分大小写匹配"
ef317cd5 8760
5809aa05 8761#: builtin/grep.c:798
ef317cd5 8762msgid "match patterns only at word boundaries"
07432cef 8763msgstr "只在单词边界匹配模式"
ef317cd5 8764
5809aa05 8765#: builtin/grep.c:800
ef317cd5 8766msgid "process binary files as text"
07432cef 8767msgstr "把二进制文件当做文本处理"
ef317cd5 8768
5809aa05 8769#: builtin/grep.c:802
ef317cd5 8770msgid "don't match patterns in binary files"
07432cef 8771msgstr "不在二进制文件中匹配模式"
ef317cd5 8772
5809aa05 8773#: builtin/grep.c:805
90314792
JX
8774msgid "process binary files with textconv filters"
8775msgstr "用 textconv 过滤器处理二进制文件"
8776
5809aa05 8777#: builtin/grep.c:807
ef317cd5 8778msgid "descend at most <depth> levels"
07432cef 8779msgstr "最多以指定的深度向下寻找"
ef317cd5 8780
5809aa05 8781#: builtin/grep.c:811
ef317cd5 8782msgid "use extended POSIX regular expressions"
07432cef 8783msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 8784
5809aa05 8785#: builtin/grep.c:814
ef317cd5 8786msgid "use basic POSIX regular expressions (default)"
07432cef 8787msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 8788
5809aa05 8789#: builtin/grep.c:817
ef317cd5 8790msgid "interpret patterns as fixed strings"
07432cef 8791msgstr "把模式解析为固定的字符串"
ef317cd5 8792
5809aa05 8793#: builtin/grep.c:820
ef317cd5 8794msgid "use Perl-compatible regular expressions"
07432cef 8795msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 8796
5809aa05 8797#: builtin/grep.c:823
ef317cd5 8798msgid "show line numbers"
07432cef 8799msgstr "显示行号"
ef317cd5 8800
5809aa05 8801#: builtin/grep.c:824
ef317cd5 8802msgid "don't show filenames"
07432cef 8803msgstr "不显示文件名"
ef317cd5 8804
5809aa05 8805#: builtin/grep.c:825
ef317cd5 8806msgid "show filenames"
07432cef 8807msgstr "显示文件名"
ef317cd5 8808
5809aa05 8809#: builtin/grep.c:827
ef317cd5 8810msgid "show filenames relative to top directory"
07432cef 8811msgstr "显示相对于顶级目录的文件名"
ef317cd5 8812
5809aa05 8813#: builtin/grep.c:829
ef317cd5 8814msgid "show only filenames instead of matching lines"
07432cef 8815msgstr "只显示文件名而不显示匹配的行"
ef317cd5 8816
5809aa05 8817#: builtin/grep.c:831
ef317cd5 8818msgid "synonym for --files-with-matches"
07432cef 8819msgstr "和 --files-with-matches 同义"
ef317cd5 8820
5809aa05 8821#: builtin/grep.c:834
ef317cd5 8822msgid "show only the names of files without match"
07432cef 8823msgstr "只显示未匹配的文件名"
ef317cd5 8824
5809aa05 8825#: builtin/grep.c:836
ef317cd5 8826msgid "print NUL after filenames"
07432cef 8827msgstr "在文件名后输出 NUL 字符"
ef317cd5 8828
5809aa05 8829#: builtin/grep.c:838
ef317cd5 8830msgid "show the number of matches instead of matching lines"
07432cef 8831msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 8832
5809aa05 8833#: builtin/grep.c:839
ef317cd5 8834msgid "highlight matches"
07432cef 8835msgstr "高亮显示匹配项"
ef317cd5 8836
5809aa05 8837#: builtin/grep.c:841
ef317cd5 8838msgid "print empty line between matches from different files"
07432cef 8839msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 8840
5809aa05 8841#: builtin/grep.c:843
ef317cd5 8842msgid "show filename only once above matches from same file"
07432cef 8843msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 8844
5809aa05 8845#: builtin/grep.c:846
ef317cd5 8846msgid "show <n> context lines before and after matches"
07432cef 8847msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 8848
5809aa05 8849#: builtin/grep.c:849
ef317cd5 8850msgid "show <n> context lines before matches"
07432cef 8851msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 8852
5809aa05 8853#: builtin/grep.c:851
ef317cd5 8854msgid "show <n> context lines after matches"
07432cef 8855msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 8856
5809aa05 8857#: builtin/grep.c:853
276ceeaa
JX
8858msgid "use <n> worker threads"
8859msgstr "使用 <n> 个工作线程"
8860
5809aa05 8861#: builtin/grep.c:854
ef317cd5 8862msgid "shortcut for -C NUM"
07432cef 8863msgstr "快捷键 -C 数字"
ef317cd5 8864
5809aa05 8865#: builtin/grep.c:857
ef317cd5 8866msgid "show a line with the function name before matches"
07432cef 8867msgstr "在匹配的前面显示一行函数名"
ef317cd5 8868
5809aa05 8869#: builtin/grep.c:859
ef317cd5 8870msgid "show the surrounding function"
07432cef 8871msgstr "显示所在函数的前后内容"
ef317cd5 8872
5809aa05 8873#: builtin/grep.c:862
ef317cd5 8874msgid "read patterns from file"
07432cef 8875msgstr "从文件读取模式"
ef317cd5 8876
5809aa05 8877#: builtin/grep.c:864
ef317cd5 8878msgid "match <pattern>"
07432cef 8879msgstr "匹配 <模式>"
ef317cd5 8880
5809aa05 8881#: builtin/grep.c:866
ef317cd5 8882msgid "combine patterns specified with -e"
07432cef 8883msgstr "组合用 -e 参数设定的模式"
ef317cd5 8884
5809aa05 8885#: builtin/grep.c:878
ef317cd5 8886msgid "indicate hit with exit status without output"
07432cef 8887msgstr "不输出,而用退出码标识命中状态"
ef317cd5 8888
5809aa05 8889#: builtin/grep.c:880
ef317cd5 8890msgid "show only matches from files that match all patterns"
07432cef 8891msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 8892
5809aa05 8893#: builtin/grep.c:882
07432cef
WS
8894msgid "show parse tree for grep expression"
8895msgstr "显示 grep 表达式的解析树"
8896
5809aa05 8897#: builtin/grep.c:886
ef317cd5 8898msgid "pager"
07432cef 8899msgstr "分页"
ef317cd5 8900
5809aa05 8901#: builtin/grep.c:886
ef317cd5 8902msgid "show matching files in the pager"
07432cef 8903msgstr "分页显示匹配的文件"
ef317cd5 8904
5809aa05 8905#: builtin/grep.c:889
ef317cd5 8906msgid "allow calling of grep(1) (ignored by this build)"
07432cef 8907msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 8908
5809aa05 8909#: builtin/grep.c:952
c04f5ac3
JX
8910msgid "no pattern given."
8911msgstr "未提供模式匹配。"
8912
5809aa05 8913#: builtin/grep.c:984
87cb7997
JX
8914msgid "--no-index or --untracked cannot be used with revs"
8915msgstr "--no-index 或 --untracked 不能和版本同时使用"
8916
5809aa05 8917#: builtin/grep.c:991
87cb7997
JX
8918#, c-format
8919msgid "unable to resolve revision: %s"
8920msgstr "不能解析版本:%s"
8921
5809aa05 8922#: builtin/grep.c:1026 builtin/index-pack.c:1491
276ceeaa
JX
8923#, c-format
8924msgid "invalid number of threads specified (%d)"
8925msgstr "指定的线程数无效(%d)"
8926
5809aa05 8927#: builtin/grep.c:1031
a4f16749
JX
8928msgid "no threads support, ignoring --threads"
8929msgstr "没有线程支持,忽略 --threads"
8930
5809aa05 8931#: builtin/grep.c:1055
c04f5ac3
JX
8932msgid "--open-files-in-pager only works on the worktree"
8933msgstr "--open-files-in-pager 仅用于工作区"
8934
5809aa05 8935#: builtin/grep.c:1078
1a79b2f1
JX
8936msgid "option not supported with --recurse-submodules."
8937msgstr "选项不支持和 --recurse-submodules 共用。"
8938
5809aa05 8939#: builtin/grep.c:1084
c04f5ac3 8940msgid "--cached or --untracked cannot be used with --no-index."
649900bc 8941msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
c04f5ac3 8942
5809aa05 8943#: builtin/grep.c:1090
c04f5ac3 8944msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 8945msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 8946
5809aa05 8947#: builtin/grep.c:1098
c04f5ac3
JX
8948msgid "both --cached and trees are given."
8949msgstr "同时给出了 --cached 和树对象。"
8950
a4f16749 8951#: builtin/hash-object.c:82
ef317cd5 8952msgid ""
814ff314
JX
8953"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
8954"[--] <file>..."
ef317cd5 8955msgstr ""
814ff314
JX
8956"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
8957"[--] <文件>..."
ef317cd5 8958
a4f16749 8959#: builtin/hash-object.c:83
94550ed3
JX
8960msgid "git hash-object --stdin-paths"
8961msgstr "git hash-object --stdin-paths"
ef317cd5 8962
a4f16749 8963#: builtin/hash-object.c:95
ef317cd5 8964msgid "type"
07432cef 8965msgstr "类型"
ef317cd5 8966
a4f16749 8967#: builtin/hash-object.c:95
ef317cd5 8968msgid "object type"
07432cef 8969msgstr "对象类型"
ef317cd5 8970
a4f16749 8971#: builtin/hash-object.c:96
ef317cd5 8972msgid "write the object into the object database"
07432cef 8973msgstr "将对象写入对象数据库"
ef317cd5 8974
a4f16749 8975#: builtin/hash-object.c:98
ef317cd5 8976msgid "read the object from stdin"
07432cef 8977msgstr "从标准输入读取对象"
ef317cd5 8978
a4f16749 8979#: builtin/hash-object.c:100
ef317cd5 8980msgid "store file as is without filters"
07432cef 8981msgstr "原样存储文件不使用过滤器"
ef317cd5 8982
a4f16749 8983#: builtin/hash-object.c:101
220c313c
JX
8984msgid ""
8985"just hash any random garbage to create corrupt objects for debugging Git"
8986msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
8987
a4f16749 8988#: builtin/hash-object.c:102
ef317cd5 8989msgid "process file as it were from this path"
07432cef 8990msgstr "处理文件并假设其来自于此路径"
ef317cd5 8991
a4f16749 8992#: builtin/help.c:43
ef317cd5 8993msgid "print all available commands"
07432cef 8994msgstr "打印所有可用的命令"
ef317cd5 8995
a4f16749 8996#: builtin/help.c:44
a0b6b246
JX
8997msgid "exclude guides"
8998msgstr "排除向导"
8999
a4f16749 9000#: builtin/help.c:45
4dcdc3d8
JX
9001msgid "print list of useful guides"
9002msgstr "显示有用的指南列表"
9003
a4f16749 9004#: builtin/help.c:46
ef317cd5 9005msgid "show man page"
07432cef 9006msgstr "显示 man 手册"
ef317cd5 9007
a4f16749 9008#: builtin/help.c:47
ef317cd5 9009msgid "show manual in web browser"
07432cef 9010msgstr "在 web 浏览器中显示手册"
ef317cd5 9011
a4f16749 9012#: builtin/help.c:49
ef317cd5 9013msgid "show info page"
07432cef 9014msgstr "显示 info 手册"
ef317cd5 9015
a4f16749 9016#: builtin/help.c:55
814ff314
JX
9017msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
9018msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
ef317cd5 9019
a4f16749 9020#: builtin/help.c:67
81809b99 9021#, c-format
8ada9598 9022msgid "unrecognized help format '%s'"
81809b99 9023msgstr "未能识别的帮助格式 '%s'"
8ada9598 9024
a4f16749 9025#: builtin/help.c:94
8ada9598 9026msgid "Failed to start emacsclient."
81809b99 9027msgstr "无法启动 emacsclient。"
8ada9598 9028
a4f16749 9029#: builtin/help.c:107
8ada9598 9030msgid "Failed to parse emacsclient version."
81809b99 9031msgstr "无法解析 emacsclient 版本。"
8ada9598 9032
a4f16749 9033#: builtin/help.c:115
8ada9598
JX
9034#, c-format
9035msgid "emacsclient version '%d' too old (< 22)."
07432cef 9036msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 9037
6937cb4e 9038#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
81809b99 9039#, c-format
5b04ee3b
JX
9040msgid "failed to exec '%s'"
9041msgstr "无法执行 '%s'"
8ada9598 9042
6937cb4e 9043#: builtin/help.c:211
8ada9598
JX
9044#, c-format
9045msgid ""
9046"'%s': path for unsupported man viewer.\n"
9047"Please consider using 'man.<tool>.cmd' instead."
9048msgstr ""
81809b99 9049"'%s':不支持的 man 手册查看器的路径。\n"
d9d56b23 9050"请使用 'man.<工具>.cmd'。"
8ada9598 9051
6937cb4e 9052#: builtin/help.c:223
8ada9598
JX
9053#, c-format
9054msgid ""
9055"'%s': cmd for supported man viewer.\n"
9056"Please consider using 'man.<tool>.path' instead."
9057msgstr ""
81809b99 9058"'%s': 支持的 man 手册查看器命令。\n"
d9d56b23 9059"请使用 'man.<工具>.path'。"
8ada9598 9060
6937cb4e 9061#: builtin/help.c:340
8ada9598
JX
9062#, c-format
9063msgid "'%s': unknown man viewer."
81809b99 9064msgstr "'%s':未知的 man 查看器。"
8ada9598 9065
6937cb4e 9066#: builtin/help.c:357
8ada9598 9067msgid "no man viewer handled the request"
81809b99 9068msgstr "没有 man 查看器处理此请求"
8ada9598 9069
6937cb4e 9070#: builtin/help.c:365
8ada9598 9071msgid "no info viewer handled the request"
81809b99 9072msgstr "没有 info 查看器处理此请求"
8ada9598 9073
6937cb4e 9074#: builtin/help.c:407
4dcdc3d8
JX
9075msgid "Defining attributes per path"
9076msgstr "定义路径的属性"
9077
6937cb4e 9078#: builtin/help.c:408
220c313c
JX
9079msgid "Everyday Git With 20 Commands Or So"
9080msgstr "每一天 Git 常用的约 20 条命令"
9081
6937cb4e 9082#: builtin/help.c:409
4dcdc3d8
JX
9083msgid "A Git glossary"
9084msgstr "Git 词汇表"
9085
6937cb4e 9086#: builtin/help.c:410
4dcdc3d8
JX
9087msgid "Specifies intentionally untracked files to ignore"
9088msgstr "忽略指定的未跟踪文件"
9089
6937cb4e 9090#: builtin/help.c:411
4dcdc3d8
JX
9091msgid "Defining submodule properties"
9092msgstr "定义子模组属性"
9093
6937cb4e 9094#: builtin/help.c:412
4dcdc3d8
JX
9095msgid "Specifying revisions and ranges for Git"
9096msgstr "指定 Git 的版本和版本范围"
9097
6937cb4e 9098#: builtin/help.c:413
4dcdc3d8
JX
9099msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
9100msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
9101
6937cb4e 9102#: builtin/help.c:414
4dcdc3d8
JX
9103msgid "An overview of recommended workflows with Git"
9104msgstr "Git 推荐的工作流概览"
9105
6937cb4e 9106#: builtin/help.c:426
4dcdc3d8
JX
9107msgid "The common Git guides are:\n"
9108msgstr "最常用的 Git 向导有:\n"
9109
6937cb4e 9110#: builtin/help.c:444
8ada9598 9111#, c-format
6937cb4e
JX
9112msgid "'%s' is aliased to '%s'"
9113msgstr "'%s' 是 '%s' 的别名"
8ada9598 9114
6937cb4e 9115#: builtin/help.c:466 builtin/help.c:483
a0b6b246
JX
9116#, c-format
9117msgid "usage: %s%s"
9118msgstr "用法:%s%s"
9119
6937cb4e 9120#: builtin/index-pack.c:156
6acbf033
JX
9121#, c-format
9122msgid "unable to open %s"
9123msgstr "不能打开 %s"
9124
6937cb4e 9125#: builtin/index-pack.c:206
8ada9598
JX
9126#, c-format
9127msgid "object type mismatch at %s"
81809b99 9128msgstr "%s 的对象类型不匹配"
8ada9598 9129
6937cb4e 9130#: builtin/index-pack.c:226
6acbf033
JX
9131#, c-format
9132msgid "did not receive expected object %s"
a0b6b246 9133msgstr "未能获取预期的对象 %s"
8ada9598 9134
6937cb4e 9135#: builtin/index-pack.c:229
6acbf033
JX
9136#, c-format
9137msgid "object %s: expected type %s, found %s"
a0b6b246 9138msgstr "对象 %s:应为类型 %s,却是 %s"
6acbf033 9139
6937cb4e 9140#: builtin/index-pack.c:271
81809b99 9141#, c-format
8ada9598
JX
9142msgid "cannot fill %d byte"
9143msgid_plural "cannot fill %d bytes"
81809b99 9144msgstr[0] "无法填充 %d 字节"
5ae481e0 9145msgstr[1] "无法填充 %d 字节"
8ada9598 9146
6937cb4e 9147#: builtin/index-pack.c:281
8ada9598 9148msgid "early EOF"
81809b99 9149msgstr "过早的文件结束符(EOF)"
8ada9598 9150
6937cb4e 9151#: builtin/index-pack.c:282
8ada9598 9152msgid "read error on input"
81809b99 9153msgstr "输入上的读错误"
8ada9598 9154
6937cb4e 9155#: builtin/index-pack.c:294
8ada9598 9156msgid "used more bytes than were available"
81809b99 9157msgstr "用掉了超过可用的字节"
8ada9598 9158
6937cb4e 9159#: builtin/index-pack.c:301
8ada9598 9160msgid "pack too large for current definition of off_t"
81809b99 9161msgstr "包太大超过了当前 off_t 的定义"
8ada9598 9162
6937cb4e 9163#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
a0b6b246
JX
9164msgid "pack exceeds maximum allowed size"
9165msgstr "包超过了最大允许值"
9166
6937cb4e 9167#: builtin/index-pack.c:319
81809b99 9168#, c-format
8ada9598 9169msgid "unable to create '%s'"
81809b99 9170msgstr "不能创建 '%s'"
8ada9598 9171
6937cb4e 9172#: builtin/index-pack.c:325
81809b99 9173#, c-format
8ada9598 9174msgid "cannot open packfile '%s'"
81809b99 9175msgstr "无法打开包文件 '%s'"
8ada9598 9176
6937cb4e 9177#: builtin/index-pack.c:339
8ada9598 9178msgid "pack signature mismatch"
81809b99 9179msgstr "包签名不匹配"
8ada9598 9180
6937cb4e 9181#: builtin/index-pack.c:341
ef317cd5
JX
9182#, c-format
9183msgid "pack version %<PRIu32> unsupported"
07432cef 9184msgstr "不支持包版本 %<PRIu32>"
ef317cd5 9185
6937cb4e 9186#: builtin/index-pack.c:359
8ada9598 9187#, c-format
5c57d762
JX
9188msgid "pack has bad object at offset %<PRIuMAX>: %s"
9189msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
8ada9598 9190
6937cb4e 9191#: builtin/index-pack.c:480
8ada9598
JX
9192#, c-format
9193msgid "inflate returned %d"
81809b99 9194msgstr "解压缩返回 %d"
8ada9598 9195
6937cb4e 9196#: builtin/index-pack.c:529
8ada9598 9197msgid "offset value overflow for delta base object"
81809b99 9198msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 9199
6937cb4e 9200#: builtin/index-pack.c:537
8ada9598 9201msgid "delta base offset is out of bound"
81809b99 9202msgstr "delta 基准偏移越界"
8ada9598 9203
6937cb4e 9204#: builtin/index-pack.c:545
81809b99 9205#, c-format
8ada9598 9206msgid "unknown object type %d"
81809b99 9207msgstr "未知对象类型 %d"
8ada9598 9208
6937cb4e 9209#: builtin/index-pack.c:576
8ada9598 9210msgid "cannot pread pack file"
81809b99 9211msgstr "无法读取包文件"
8ada9598 9212
6937cb4e 9213#: builtin/index-pack.c:578
8ada9598 9214#, c-format
5c57d762
JX
9215msgid "premature end of pack file, %<PRIuMAX> byte missing"
9216msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
9217msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
9218msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8ada9598 9219
6937cb4e 9220#: builtin/index-pack.c:604
8ada9598 9221msgid "serious inflate inconsistency"
81809b99 9222msgstr "解压缩严重的不一致"
8ada9598 9223
6937cb4e
JX
9224#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
9225#: builtin/index-pack.c:817 builtin/index-pack.c:826
8ada9598
JX
9226#, c-format
9227msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 9228msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 9229
5809aa05
JX
9230#: builtin/index-pack.c:752 builtin/pack-objects.c:179
9231#: builtin/pack-objects.c:273
6792b93b
JX
9232#, c-format
9233msgid "unable to read %s"
9234msgstr "不能读 %s"
9235
6937cb4e 9236#: builtin/index-pack.c:815
87cb7997
JX
9237#, c-format
9238msgid "cannot read existing object info %s"
9239msgstr "不能读取现存对象信息 %s"
9240
6937cb4e 9241#: builtin/index-pack.c:823
6792b93b
JX
9242#, c-format
9243msgid "cannot read existing object %s"
9244msgstr "不能读取现存对象 %s"
9245
6937cb4e 9246#: builtin/index-pack.c:837
81809b99 9247#, c-format
8ada9598 9248msgid "invalid blob object %s"
160fb2b2 9249msgstr "无效的数据对象 %s"
8ada9598 9250
6937cb4e 9251#: builtin/index-pack.c:852
81809b99 9252#, c-format
8ada9598 9253msgid "invalid %s"
81809b99 9254msgstr "无效的 %s"
8ada9598 9255
6937cb4e 9256#: builtin/index-pack.c:855
8ada9598 9257msgid "Error in object"
81809b99 9258msgstr "对象中出错"
8ada9598 9259
6937cb4e 9260#: builtin/index-pack.c:857
8ada9598
JX
9261#, c-format
9262msgid "Not all child objects of %s are reachable"
81809b99 9263msgstr "%s 的所有子对象并非都可达"
8ada9598 9264
6937cb4e 9265#: builtin/index-pack.c:929 builtin/index-pack.c:960
8ada9598 9266msgid "failed to apply delta"
81809b99 9267msgstr "无法应用 delta"
8ada9598 9268
6937cb4e 9269#: builtin/index-pack.c:1131
8ada9598 9270msgid "Receiving objects"
81809b99 9271msgstr "接收对象中"
8ada9598 9272
6937cb4e 9273#: builtin/index-pack.c:1131
8ada9598 9274msgid "Indexing objects"
81809b99 9275msgstr "索引对象中"
8ada9598 9276
6937cb4e 9277#: builtin/index-pack.c:1165
8ada9598 9278msgid "pack is corrupted (SHA1 mismatch)"
81809b99 9279msgstr "包冲突(SHA1 不匹配)"
8ada9598 9280
6937cb4e 9281#: builtin/index-pack.c:1170
8ada9598 9282msgid "cannot fstat packfile"
65e2041e 9283msgstr "不能对包文件调用 fstat"
8ada9598 9284
6937cb4e 9285#: builtin/index-pack.c:1173
8ada9598 9286msgid "pack has junk at the end"
81809b99 9287msgstr "包的结尾有垃圾数据"
8ada9598 9288
6937cb4e 9289#: builtin/index-pack.c:1185
6792b93b
JX
9290msgid "confusion beyond insanity in parse_pack_objects()"
9291msgstr "parse_pack_objects() 中遇到不可理喻的问题"
9292
6937cb4e 9293#: builtin/index-pack.c:1208
8ada9598 9294msgid "Resolving deltas"
81809b99 9295msgstr "处理 delta 中"
8ada9598 9296
6937cb4e 9297#: builtin/index-pack.c:1219
07432cef 9298#, c-format
ef317cd5 9299msgid "unable to create thread: %s"
07432cef 9300msgstr "不能创建线程:%s"
ef317cd5 9301
6937cb4e 9302#: builtin/index-pack.c:1261
8ada9598 9303msgid "confusion beyond insanity"
81809b99 9304msgstr "不可理喻"
8ada9598 9305
6937cb4e 9306#: builtin/index-pack.c:1267
ef317cd5 9307#, c-format
5b04ee3b
JX
9308msgid "completed with %d local object"
9309msgid_plural "completed with %d local objects"
9310msgstr[0] "完成 %d 个本地对象"
9311msgstr[1] "完成 %d 个本地对象"
ef317cd5 9312
6937cb4e 9313#: builtin/index-pack.c:1279
ef317cd5
JX
9314#, c-format
9315msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 9316msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 9317
6937cb4e 9318#: builtin/index-pack.c:1283
8ada9598
JX
9319#, c-format
9320msgid "pack has %d unresolved delta"
9321msgid_plural "pack has %d unresolved deltas"
81809b99 9322msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 9323msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 9324
6937cb4e 9325#: builtin/index-pack.c:1307
81809b99 9326#, c-format
8ada9598 9327msgid "unable to deflate appended object (%d)"
07432cef 9328msgstr "不能压缩附加对象(%d)"
8ada9598 9329
6937cb4e 9330#: builtin/index-pack.c:1383
8ada9598
JX
9331#, c-format
9332msgid "local object %s is corrupt"
81809b99 9333msgstr "本地对象 %s 已损坏"
8ada9598 9334
6937cb4e 9335#: builtin/index-pack.c:1409
8ada9598 9336msgid "error while closing pack file"
81809b99 9337msgstr "关闭包文件时出错"
8ada9598 9338
6937cb4e 9339#: builtin/index-pack.c:1421
81809b99 9340#, c-format
8ada9598 9341msgid "cannot write keep file '%s'"
81809b99 9342msgstr "无法写保留文件 '%s'"
8ada9598 9343
6937cb4e 9344#: builtin/index-pack.c:1429
81809b99 9345#, c-format
8ada9598 9346msgid "cannot close written keep file '%s'"
81809b99 9347msgstr "无法关闭保留文件 '%s'"
8ada9598 9348
6937cb4e 9349#: builtin/index-pack.c:1439
8ada9598 9350msgid "cannot store pack file"
81809b99 9351msgstr "无法存储包文件"
8ada9598 9352
6937cb4e 9353#: builtin/index-pack.c:1447
8ada9598 9354msgid "cannot store index file"
81809b99 9355msgstr "无法存储索引文件"
8ada9598 9356
6937cb4e 9357#: builtin/index-pack.c:1485
07432cef 9358#, c-format
ef317cd5 9359msgid "bad pack.indexversion=%<PRIu32>"
07432cef 9360msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 9361
6937cb4e 9362#: builtin/index-pack.c:1553
81809b99 9363#, c-format
8ada9598 9364msgid "Cannot open existing pack file '%s'"
81809b99 9365msgstr "无法打开现存包文件 '%s'"
8ada9598 9366
6937cb4e 9367#: builtin/index-pack.c:1555
81809b99 9368#, c-format
8ada9598 9369msgid "Cannot open existing pack idx file for '%s'"
81809b99 9370msgstr "无法为 %s 打开包索引文件"
8ada9598 9371
6937cb4e 9372#: builtin/index-pack.c:1603
81809b99 9373#, c-format
8ada9598
JX
9374msgid "non delta: %d object"
9375msgid_plural "non delta: %d objects"
81809b99 9376msgstr[0] "非 delta:%d 个对象"
5ae481e0 9377msgstr[1] "非 delta:%d 个对象"
8ada9598 9378
6937cb4e 9379#: builtin/index-pack.c:1610
8ada9598
JX
9380#, c-format
9381msgid "chain length = %d: %lu object"
9382msgid_plural "chain length = %d: %lu objects"
81809b99 9383msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 9384msgstr[1] "链长 = %d: %lu 对象"
8ada9598 9385
6937cb4e 9386#: builtin/index-pack.c:1623
5b04ee3b
JX
9387#, c-format
9388msgid "packfile name '%s' does not end with '.pack'"
9389msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
9390
5809aa05
JX
9391#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
9392#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
81809b99 9393#, c-format
8ada9598 9394msgid "bad %s"
81809b99 9395msgstr "错误选项 %s"
8ada9598 9396
5809aa05 9397#: builtin/index-pack.c:1739
8ada9598 9398msgid "--fix-thin cannot be used without --stdin"
649900bc 9399msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 9400
5809aa05 9401#: builtin/index-pack.c:1741
1a79b2f1
JX
9402msgid "--stdin requires a git repository"
9403msgstr "--stdin 需要一个 git 仓库"
9404
5809aa05 9405#: builtin/index-pack.c:1749
8ada9598 9406msgid "--verify with no packfile name given"
dbd6cced 9407msgstr "--verify 没有提供包文件名参数"
8ada9598 9408
a4f16749 9409#: builtin/init-db.c:55
c04f5ac3
JX
9410#, c-format
9411msgid "cannot stat '%s'"
65e2041e 9412msgstr "不能对 '%s' 调用 stat"
c04f5ac3 9413
a4f16749 9414#: builtin/init-db.c:61
c04f5ac3
JX
9415#, c-format
9416msgid "cannot stat template '%s'"
65e2041e 9417msgstr "不能对模版 '%s' 调用 stat"
c04f5ac3 9418
a4f16749 9419#: builtin/init-db.c:66
c04f5ac3
JX
9420#, c-format
9421msgid "cannot opendir '%s'"
9422msgstr "不能打开目录 '%s'"
9423
a4f16749 9424#: builtin/init-db.c:77
c04f5ac3
JX
9425#, c-format
9426msgid "cannot readlink '%s'"
9427msgstr "不能读取链接 '%s'"
9428
a4f16749 9429#: builtin/init-db.c:79
c04f5ac3
JX
9430#, c-format
9431msgid "cannot symlink '%s' '%s'"
90e6ef53 9432msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3 9433
a4f16749 9434#: builtin/init-db.c:85
c04f5ac3
JX
9435#, c-format
9436msgid "cannot copy '%s' to '%s'"
9437msgstr "不能拷贝 '%s' 至 '%s'"
9438
a4f16749 9439#: builtin/init-db.c:89
c04f5ac3
JX
9440#, c-format
9441msgid "ignoring template %s"
9442msgstr "忽略模版 %s"
9443
a4f16749 9444#: builtin/init-db.c:120
c04f5ac3
JX
9445#, c-format
9446msgid "templates not found %s"
9447msgstr "模版未找到 %s"
9448
a4f16749 9449#: builtin/init-db.c:135
c04f5ac3 9450#, c-format
5b04ee3b
JX
9451msgid "not copying templates from '%s': %s"
9452msgstr "没有从 '%s' 复制模版:%s"
c04f5ac3 9453
a4f16749 9454#: builtin/init-db.c:328
c04f5ac3
JX
9455#, c-format
9456msgid "unable to handle file type %d"
9457msgstr "不能处理 %d 类型的文件"
9458
a4f16749 9459#: builtin/init-db.c:331
c04f5ac3
JX
9460#, c-format
9461msgid "unable to move %s to %s"
9462msgstr "不能移动 %s 至 %s"
9463
a4f16749 9464#: builtin/init-db.c:348 builtin/init-db.c:351
a0b6b246
JX
9465#, c-format
9466msgid "%s already exists"
9467msgstr "%s 已经存在"
9468
a4f16749 9469#: builtin/init-db.c:404
c04f5ac3 9470#, c-format
5c57d762
JX
9471msgid "Reinitialized existing shared Git repository in %s%s\n"
9472msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
c04f5ac3 9473
a4f16749 9474#: builtin/init-db.c:405
5c57d762
JX
9475#, c-format
9476msgid "Reinitialized existing Git repository in %s%s\n"
9477msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
c04f5ac3 9478
a4f16749 9479#: builtin/init-db.c:409
5c57d762
JX
9480#, c-format
9481msgid "Initialized empty shared Git repository in %s%s\n"
9a4b694c 9482msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
c04f5ac3 9483
a4f16749 9484#: builtin/init-db.c:410
5c57d762
JX
9485#, c-format
9486msgid "Initialized empty Git repository in %s%s\n"
9a4b694c 9487msgstr "已初始化空的 Git 仓库于 %s%s\n"
c04f5ac3 9488
a4f16749 9489#: builtin/init-db.c:458
ef317cd5 9490msgid ""
a77c07d9 9491"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
814ff314 9492"shared[=<permissions>]] [<directory>]"
ef317cd5 9493msgstr ""
07432cef 9494"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
814ff314 9495"[<目录>]"
ef317cd5 9496
a4f16749 9497#: builtin/init-db.c:481
ef317cd5 9498msgid "permissions"
07432cef 9499msgstr "权限"
ef317cd5 9500
a4f16749 9501#: builtin/init-db.c:482
ef317cd5 9502msgid "specify that the git repository is to be shared amongst several users"
160fb2b2 9503msgstr "指定 git 仓库是多个用户之间共享的"
ef317cd5 9504
a4f16749 9505#: builtin/init-db.c:516 builtin/init-db.c:521
c04f5ac3
JX
9506#, c-format
9507msgid "cannot mkdir %s"
9508msgstr "不能创建目录 %s"
9509
a4f16749 9510#: builtin/init-db.c:525
c04f5ac3
JX
9511#, c-format
9512msgid "cannot chdir to %s"
9513msgstr "不能切换目录到 %s"
9514
a4f16749 9515#: builtin/init-db.c:546
c04f5ac3
JX
9516#, c-format
9517msgid ""
9518"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
9519"dir=<directory>)"
1e607449 9520msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
c04f5ac3 9521
a4f16749 9522#: builtin/init-db.c:574
c04f5ac3
JX
9523#, c-format
9524msgid "Cannot access work tree '%s'"
9525msgstr "不能访问工作区 '%s'"
9526
220c313c
JX
9527#: builtin/interpret-trailers.c:15
9528msgid ""
276ceeaa
JX
9529"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
9530"<token>[(=|:)<value>])...] [<file>...]"
3495628d
JX
9531msgstr ""
9532"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
9533">])...] [<文件>...]"
276ceeaa 9534
6937cb4e 9535#: builtin/interpret-trailers.c:92
276ceeaa
JX
9536msgid "edit files in place"
9537msgstr "在原位编辑文件"
220c313c 9538
6937cb4e 9539#: builtin/interpret-trailers.c:93
220c313c 9540msgid "trim empty trailers"
6937cb4e
JX
9541msgstr "删除空的尾部署名"
9542
9543#: builtin/interpret-trailers.c:96
9544msgid "where to place the new trailer"
9545msgstr "在哪里放置新的尾部署名"
220c313c 9546
6937cb4e
JX
9547#: builtin/interpret-trailers.c:98
9548msgid "action if trailer already exists"
9549msgstr "当尾部署名已经存在时所采取的动作"
9550
9551#: builtin/interpret-trailers.c:100
9552msgid "action if trailer is missing"
9553msgstr "当尾部署名缺失时所采取的动作"
9554
9555#: builtin/interpret-trailers.c:102
9556msgid "output only the trailers"
9557msgstr "只输出尾部署名"
9558
9559#: builtin/interpret-trailers.c:103
9560msgid "do not apply config rules"
9561msgstr "不要应用配置规则"
9562
9563#: builtin/interpret-trailers.c:104
9564msgid "join whitespace-continued values"
9565msgstr "连接空白折行的值"
9566
9567#: builtin/interpret-trailers.c:105
9568msgid "set parsing options"
9569msgstr "设置解析选项"
9570
9571#: builtin/interpret-trailers.c:107
220c313c 9572msgid "trailer"
6937cb4e 9573msgstr "尾部署名"
220c313c 9574
6937cb4e 9575#: builtin/interpret-trailers.c:108
220c313c 9576msgid "trailer(s) to add"
6937cb4e 9577msgstr "要添加的尾部署名"
220c313c 9578
6937cb4e
JX
9579#: builtin/interpret-trailers.c:117
9580msgid "--trailer with --only-input does not make sense"
9581msgstr "--trailer 和 --only-input 同时使用没有意义"
9582
9583#: builtin/interpret-trailers.c:127
276ceeaa
JX
9584msgid "no input file given for in-place editing"
9585msgstr "没有给出要原位编辑的文件"
9586
6937cb4e 9587#: builtin/log.c:46
7aea43ff 9588msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
d9d56b23 9589msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
ef317cd5 9590
6937cb4e 9591#: builtin/log.c:47
814ff314
JX
9592msgid "git show [<options>] <object>..."
9593msgstr "git show [<选项>] <对象>..."
ef317cd5 9594
6937cb4e 9595#: builtin/log.c:91
220c313c
JX
9596#, c-format
9597msgid "invalid --decorate option: %s"
9598msgstr "无效的 --decorate 选项:%s"
9599
5809aa05 9600#: builtin/log.c:151
ef317cd5 9601msgid "suppress diff output"
07432cef 9602msgstr "不显示差异输出"
ef317cd5 9603
5809aa05 9604#: builtin/log.c:152
ef317cd5 9605msgid "show source"
07432cef 9606msgstr "显示源"
ef317cd5 9607
5809aa05 9608#: builtin/log.c:153
07432cef
WS
9609msgid "Use mail map file"
9610msgstr "使用邮件映射文件"
9611
5809aa05
JX
9612#: builtin/log.c:155
9613msgid "only decorate refs that match <pattern>"
9614msgstr "只修饰与 <模式> 匹配的引用"
9615
9616#: builtin/log.c:157
9617msgid "do not decorate refs that match <pattern>"
9618msgstr "不修饰和 <模式> 匹配的引用"
9619
9620#: builtin/log.c:158
ef317cd5 9621msgid "decorate options"
07432cef 9622msgstr "修饰选项"
ef317cd5 9623
5809aa05 9624#: builtin/log.c:161
220c313c
JX
9625msgid "Process line range n,m in file, counting from 1"
9626msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
9627
5809aa05 9628#: builtin/log.c:257
c04f5ac3
JX
9629#, c-format
9630msgid "Final output: %d %s\n"
9631msgstr "最终输出:%d %s\n"
9632
5809aa05 9633#: builtin/log.c:508
220c313c
JX
9634#, c-format
9635msgid "git show %s: bad file"
9636msgstr "git show %s: 损坏的文件"
9637
5809aa05 9638#: builtin/log.c:523 builtin/log.c:617
c04f5ac3
JX
9639#, c-format
9640msgid "Could not read object %s"
90e6ef53 9641msgstr "不能读取对象 %s"
c04f5ac3 9642
5809aa05 9643#: builtin/log.c:641
c04f5ac3
JX
9644#, c-format
9645msgid "Unknown type: %d"
9646msgstr "未知类型:%d"
9647
5809aa05 9648#: builtin/log.c:762
c04f5ac3
JX
9649msgid "format.headers without value"
9650msgstr "format.headers 没有值"
9651
5809aa05 9652#: builtin/log.c:863
c04f5ac3
JX
9653msgid "name of output directory is too long"
9654msgstr "输出目录名太长"
9655
5809aa05 9656#: builtin/log.c:879
c04f5ac3
JX
9657#, c-format
9658msgid "Cannot open patch file %s"
9659msgstr "无法打开补丁文件 %s"
9660
5809aa05 9661#: builtin/log.c:896
c04f5ac3
JX
9662msgid "Need exactly one range."
9663msgstr "只需要一个范围。"
9664
5809aa05 9665#: builtin/log.c:906
c04f5ac3
JX
9666msgid "Not a range."
9667msgstr "不是一个范围。"
9668
5809aa05 9669#: builtin/log.c:1012
c04f5ac3
JX
9670msgid "Cover letter needs email format"
9671msgstr "信封需要邮件地址格式"
9672
5809aa05 9673#: builtin/log.c:1092
c04f5ac3
JX
9674#, c-format
9675msgid "insane in-reply-to: %s"
9676msgstr "不正常的 in-reply-to:%s"
9677
5809aa05 9678#: builtin/log.c:1119
814ff314
JX
9679msgid "git format-patch [<options>] [<since> | <revision-range>]"
9680msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
ef317cd5 9681
5809aa05 9682#: builtin/log.c:1169
c04f5ac3
JX
9683msgid "Two output directories?"
9684msgstr "两个输出目录?"
9685
5809aa05 9686#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
5b04ee3b
JX
9687#, c-format
9688msgid "Unknown commit %s"
9689msgstr "未知提交 %s"
9690
5809aa05 9691#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
5b04ee3b
JX
9692#, c-format
9693msgid "Failed to resolve '%s' as a valid ref."
9694msgstr "无法解析 '%s' 为一个有效引用。"
9695
5809aa05 9696#: builtin/log.c:1291
5b04ee3b
JX
9697msgid "Could not find exact merge base."
9698msgstr "不能找到准确的合并基线。"
9699
5809aa05 9700#: builtin/log.c:1295
5b04ee3b
JX
9701msgid ""
9702"Failed to get upstream, if you want to record base commit automatically,\n"
9703"please use git branch --set-upstream-to to track a remote branch.\n"
9704"Or you could specify base commit by --base=<base-commit-id> manually."
9705msgstr ""
9706"无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
aef18cc6 9707"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
58b6f078 9708"参数 --base=<基线提交> 手动指定一个基线提交。"
5b04ee3b 9709
5809aa05 9710#: builtin/log.c:1315
5b04ee3b
JX
9711msgid "Failed to find exact merge base"
9712msgstr "无法找到准确的合并基线"
9713
5809aa05 9714#: builtin/log.c:1326
5b04ee3b
JX
9715msgid "base commit should be the ancestor of revision list"
9716msgstr "基线提交应该是版本列表的祖先"
9717
5809aa05 9718#: builtin/log.c:1330
5b04ee3b
JX
9719msgid "base commit shouldn't be in revision list"
9720msgstr "基线提交不应该出现在版本列表中"
9721
5809aa05 9722#: builtin/log.c:1379
5b04ee3b 9723msgid "cannot get patch id"
aef18cc6 9724msgstr "无法得到补丁 id"
5b04ee3b 9725
5809aa05 9726#: builtin/log.c:1438
ef317cd5 9727msgid "use [PATCH n/m] even with a single patch"
07432cef 9728msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 9729
5809aa05 9730#: builtin/log.c:1441
ef317cd5 9731msgid "use [PATCH] even with multiple patches"
07432cef 9732msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 9733
5809aa05 9734#: builtin/log.c:1445
ef317cd5 9735msgid "print patches to standard out"
07432cef 9736msgstr "打印补丁到标准输出"
c04f5ac3 9737
5809aa05 9738#: builtin/log.c:1447
ef317cd5 9739msgid "generate a cover letter"
07432cef 9740msgstr "生成一封附信"
c04f5ac3 9741
5809aa05 9742#: builtin/log.c:1449
ef317cd5 9743msgid "use simple number sequence for output file names"
07432cef 9744msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 9745
5809aa05 9746#: builtin/log.c:1450
ef317cd5 9747msgid "sfx"
07432cef 9748msgstr "后缀"
ef317cd5 9749
5809aa05 9750#: builtin/log.c:1451
ef317cd5 9751msgid "use <sfx> instead of '.patch'"
07432cef 9752msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 9753
5809aa05 9754#: builtin/log.c:1453
ef317cd5 9755msgid "start numbering patches at <n> instead of 1"
07432cef
WS
9756msgstr "补丁以 <n> 开始编号,而不是1"
9757
5809aa05 9758#: builtin/log.c:1455
07432cef
WS
9759msgid "mark the series as Nth re-roll"
9760msgstr "标记补丁系列是第几次重制"
ef317cd5 9761
5809aa05 9762#: builtin/log.c:1457
a0b6b246
JX
9763msgid "Use [RFC PATCH] instead of [PATCH]"
9764msgstr "使用 [RFC PATCH] 代替 [PATCH]"
9765
5809aa05 9766#: builtin/log.c:1460
ef317cd5 9767msgid "Use [<prefix>] instead of [PATCH]"
07432cef 9768msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 9769
5809aa05 9770#: builtin/log.c:1463
ef317cd5 9771msgid "store resulting files in <dir>"
d9d56b23 9772msgstr "把结果文件存储在 <目录>"
ef317cd5 9773
5809aa05 9774#: builtin/log.c:1466
ef317cd5 9775msgid "don't strip/add [PATCH]"
07432cef 9776msgstr "不删除/添加 [PATCH]"
ef317cd5 9777
5809aa05 9778#: builtin/log.c:1469
ef317cd5 9779msgid "don't output binary diffs"
07432cef 9780msgstr "不输出二进制差异"
ef317cd5 9781
5809aa05 9782#: builtin/log.c:1471
89f80d72
JX
9783msgid "output all-zero hash in From header"
9784msgstr "在 From 头信息中输出全为零的哈希值"
9785
5809aa05 9786#: builtin/log.c:1473
ef317cd5 9787msgid "don't include a patch matching a commit upstream"
07432cef 9788msgstr "不包含已在上游提交中的补丁"
ef317cd5 9789
5809aa05 9790#: builtin/log.c:1475
ef317cd5 9791msgid "show patch format instead of default (patch + stat)"
07432cef 9792msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 9793
5809aa05 9794#: builtin/log.c:1477
ef317cd5 9795msgid "Messaging"
07432cef 9796msgstr "邮件发送"
ef317cd5 9797
5809aa05 9798#: builtin/log.c:1478
ef317cd5 9799msgid "header"
07432cef 9800msgstr "header"
ef317cd5 9801
5809aa05 9802#: builtin/log.c:1479
ef317cd5 9803msgid "add email header"
07432cef 9804msgstr "添加邮件头"
ef317cd5 9805
5809aa05 9806#: builtin/log.c:1480 builtin/log.c:1482
ef317cd5 9807msgid "email"
07432cef 9808msgstr "邮件地址"
ef317cd5 9809
5809aa05 9810#: builtin/log.c:1480
ef317cd5 9811msgid "add To: header"
07432cef 9812msgstr "添加收件人"
ef317cd5 9813
5809aa05 9814#: builtin/log.c:1482
ef317cd5 9815msgid "add Cc: header"
07432cef 9816msgstr "添加抄送"
ef317cd5 9817
5809aa05 9818#: builtin/log.c:1484
2e8451e8 9819msgid "ident"
d9d56b23 9820msgstr "标识"
2e8451e8 9821
5809aa05 9822#: builtin/log.c:1485
2e8451e8 9823msgid "set From address to <ident> (or committer ident if absent)"
4375c10e 9824msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
2e8451e8 9825
5809aa05 9826#: builtin/log.c:1487
ef317cd5 9827msgid "message-id"
d9d56b23 9828msgstr "邮件标识"
ef317cd5 9829
5809aa05 9830#: builtin/log.c:1488
ef317cd5 9831msgid "make first mail a reply to <message-id>"
d9d56b23 9832msgstr "使第一封邮件作为对 <邮件标识> 的回复"
ef317cd5 9833
5809aa05 9834#: builtin/log.c:1489 builtin/log.c:1492
ef317cd5 9835msgid "boundary"
07432cef 9836msgstr "边界"
ef317cd5 9837
5809aa05 9838#: builtin/log.c:1490
ef317cd5 9839msgid "attach the patch"
07432cef 9840msgstr "附件方式添加补丁"
ef317cd5 9841
5809aa05 9842#: builtin/log.c:1493
ef317cd5 9843msgid "inline the patch"
07432cef 9844msgstr "内联显示补丁"
ef317cd5 9845
5809aa05 9846#: builtin/log.c:1497
ef317cd5 9847msgid "enable message threading, styles: shallow, deep"
07432cef 9848msgstr "启用邮件线索,风格:浅,深"
ef317cd5 9849
5809aa05 9850#: builtin/log.c:1499
ef317cd5 9851msgid "signature"
07432cef 9852msgstr "签名"
ef317cd5 9853
5809aa05 9854#: builtin/log.c:1500
ef317cd5 9855msgid "add a signature"
07432cef 9856msgstr "添加一个签名"
ef317cd5 9857
5809aa05 9858#: builtin/log.c:1501
5b04ee3b
JX
9859msgid "base-commit"
9860msgstr "基线提交"
9861
5809aa05 9862#: builtin/log.c:1502
5b04ee3b
JX
9863msgid "add prerequisite tree info to the patch series"
9864msgstr "为补丁列表添加前置树信息"
9865
5809aa05 9866#: builtin/log.c:1504
6acbf033
JX
9867msgid "add a signature from a file"
9868msgstr "从文件添加一个签名"
9869
5809aa05 9870#: builtin/log.c:1505
ef317cd5 9871msgid "don't print the patch filenames"
07432cef 9872msgstr "不要打印补丁文件名"
ef317cd5 9873
5809aa05 9874#: builtin/log.c:1507
6937cb4e
JX
9875msgid "show progress while generating patches"
9876msgstr "在生成补丁时显示进度"
9877
5809aa05 9878#: builtin/log.c:1582
a4f16749
JX
9879#, c-format
9880msgid "invalid ident line: %s"
9881msgstr "包含无效的身份标识:%s"
9882
5809aa05 9883#: builtin/log.c:1597
c04f5ac3
JX
9884msgid "-n and -k are mutually exclusive."
9885msgstr "-n 和 -k 互斥。"
9886
5809aa05 9887#: builtin/log.c:1599
a0b6b246
JX
9888msgid "--subject-prefix/--rfc and -k are mutually exclusive."
9889msgstr "--subject-prefix/--rfc 和 -k 互斥。"
c04f5ac3 9890
5809aa05 9891#: builtin/log.c:1607
c04f5ac3
JX
9892msgid "--name-only does not make sense"
9893msgstr "--name-only 无意义"
9894
5809aa05 9895#: builtin/log.c:1609
c04f5ac3
JX
9896msgid "--name-status does not make sense"
9897msgstr "--name-status 无意义"
9898
5809aa05 9899#: builtin/log.c:1611
c04f5ac3
JX
9900msgid "--check does not make sense"
9901msgstr "--check 无意义"
9902
5809aa05 9903#: builtin/log.c:1641
c04f5ac3
JX
9904msgid "standard output, or directory, which one?"
9905msgstr "标准输出或目录,哪一个?"
9906
5809aa05 9907#: builtin/log.c:1643
c04f5ac3
JX
9908#, c-format
9909msgid "Could not create directory '%s'"
90e6ef53 9910msgstr "不能创建目录 '%s'"
c04f5ac3 9911
5809aa05 9912#: builtin/log.c:1736
6acbf033
JX
9913#, c-format
9914msgid "unable to read signature file '%s'"
9915msgstr "无法读取签名文件 '%s'"
9916
5809aa05 9917#: builtin/log.c:1768
6937cb4e
JX
9918msgid "Generating patches"
9919msgstr "生成补丁"
9920
5809aa05 9921#: builtin/log.c:1812
c04f5ac3
JX
9922msgid "Failed to create output files"
9923msgstr "无法创建输出文件"
9924
5809aa05 9925#: builtin/log.c:1862
ef317cd5 9926msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 9927msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 9928
5809aa05 9929#: builtin/log.c:1916
c04f5ac3
JX
9930#, c-format
9931msgid ""
9932"Could not find a tracked remote branch, please specify <upstream> manually.\n"
d9d56b23 9933msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
c04f5ac3 9934
5809aa05 9935#: builtin/ls-files.c:468
814ff314
JX
9936msgid "git ls-files [<options>] [<file>...]"
9937msgstr "git ls-files [<选项>] [<文件>...]"
ef317cd5 9938
5809aa05 9939#: builtin/ls-files.c:517
ef317cd5 9940msgid "identify the file status with tags"
07432cef 9941msgstr "用标签标识文件的状态"
ef317cd5 9942
5809aa05 9943#: builtin/ls-files.c:519
ef317cd5 9944msgid "use lowercase letters for 'assume unchanged' files"
07432cef 9945msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 9946
5809aa05
JX
9947#: builtin/ls-files.c:521
9948msgid "use lowercase letters for 'fsmonitor clean' files"
9949msgstr "使用小写字母表示 'fsmonitor clean' 文件"
9950
9951#: builtin/ls-files.c:523
ef317cd5 9952msgid "show cached files in the output (default)"
07432cef 9953msgstr "显示缓存的文件(默认)"
ef317cd5 9954
5809aa05 9955#: builtin/ls-files.c:525
ef317cd5 9956msgid "show deleted files in the output"
07432cef 9957msgstr "显示已删除的文件"
ef317cd5 9958
5809aa05 9959#: builtin/ls-files.c:527
ef317cd5 9960msgid "show modified files in the output"
07432cef 9961msgstr "显示已修改的文件"
ef317cd5 9962
5809aa05 9963#: builtin/ls-files.c:529
ef317cd5 9964msgid "show other files in the output"
07432cef 9965msgstr "显示其它文件"
ef317cd5 9966
5809aa05 9967#: builtin/ls-files.c:531
ef317cd5 9968msgid "show ignored files in the output"
07432cef 9969msgstr "显示忽略的文件"
ef317cd5 9970
5809aa05 9971#: builtin/ls-files.c:534
ef317cd5 9972msgid "show staged contents' object name in the output"
07432cef 9973msgstr "显示暂存区内容的对象名称"
ef317cd5 9974
5809aa05 9975#: builtin/ls-files.c:536
ef317cd5 9976msgid "show files on the filesystem that need to be removed"
07432cef 9977msgstr "显示文件系统需要删除的文件"
ef317cd5 9978
5809aa05 9979#: builtin/ls-files.c:538
220c313c 9980msgid "show 'other' directories' names only"
07432cef 9981msgstr "只显示“其他”目录的名称"
ef317cd5 9982
5809aa05 9983#: builtin/ls-files.c:540
276ceeaa
JX
9984msgid "show line endings of files"
9985msgstr "显示文件换行符格式"
9986
5809aa05 9987#: builtin/ls-files.c:542
ef317cd5 9988msgid "don't show empty directories"
07432cef 9989msgstr "不显示空目录"
ef317cd5 9990
5809aa05 9991#: builtin/ls-files.c:545
ef317cd5 9992msgid "show unmerged files in the output"
07432cef 9993msgstr "显示未合并的文件"
ef317cd5 9994
5809aa05 9995#: builtin/ls-files.c:547
ef317cd5 9996msgid "show resolve-undo information"
07432cef 9997msgstr "显示 resolve-undo 信息"
ef317cd5 9998
5809aa05 9999#: builtin/ls-files.c:549
ef317cd5 10000msgid "skip files matching pattern"
07432cef 10001msgstr "匹配排除文件的模式"
ef317cd5 10002
5809aa05 10003#: builtin/ls-files.c:552
ef317cd5 10004msgid "exclude patterns are read from <file>"
07432cef 10005msgstr "从 <文件> 中读取排除模式"
ef317cd5 10006
5809aa05 10007#: builtin/ls-files.c:555
ef317cd5 10008msgid "read additional per-directory exclude patterns in <file>"
07432cef 10009msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 10010
5809aa05 10011#: builtin/ls-files.c:557
ef317cd5 10012msgid "add the standard git exclusions"
07432cef 10013msgstr "添加标准的 git 排除"
ef317cd5 10014
5809aa05 10015#: builtin/ls-files.c:560
ef317cd5 10016msgid "make the output relative to the project top directory"
07432cef 10017msgstr "显示相对于顶级目录的文件名"
ef317cd5 10018
5809aa05 10019#: builtin/ls-files.c:563
a0b6b246
JX
10020msgid "recurse through submodules"
10021msgstr "在子模组中递归"
10022
5809aa05 10023#: builtin/ls-files.c:565
ef317cd5 10024msgid "if any <file> is not in the index, treat this as an error"
07432cef 10025msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 10026
5809aa05 10027#: builtin/ls-files.c:566
ef317cd5 10028msgid "tree-ish"
07432cef 10029msgstr "树或提交"
ef317cd5 10030
5809aa05 10031#: builtin/ls-files.c:567
ef317cd5 10032msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 10033msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5 10034
5809aa05 10035#: builtin/ls-files.c:569
ef317cd5 10036msgid "show debugging data"
07432cef 10037msgstr "显示调试数据"
ef317cd5 10038
276ceeaa
JX
10039#: builtin/ls-remote.c:7
10040msgid ""
10041"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
10042" [-q | --quiet] [--exit-code] [--get-url]\n"
10043" [--symref] [<repository> [<refs>...]]"
10044msgstr ""
10045"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
10046" [-q | --quiet] [--exit-code] [--get-url]\n"
10047" [--symref] [<仓库> [<引用>...]]"
10048
87cb7997 10049#: builtin/ls-remote.c:52
276ceeaa
JX
10050msgid "do not print remote URL"
10051msgstr "不打印远程 URL"
10052
87cb7997 10053#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
276ceeaa
JX
10054msgid "exec"
10055msgstr "exec"
10056
87cb7997 10057#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
276ceeaa
JX
10058msgid "path of git-upload-pack on the remote host"
10059msgstr "远程主机上的 git-upload-pack 路径"
10060
87cb7997 10061#: builtin/ls-remote.c:58
276ceeaa
JX
10062msgid "limit to tags"
10063msgstr "仅限于标签"
10064
87cb7997 10065#: builtin/ls-remote.c:59
276ceeaa
JX
10066msgid "limit to heads"
10067msgstr "仅限于分支"
10068
87cb7997 10069#: builtin/ls-remote.c:60
276ceeaa
JX
10070msgid "do not show peeled tags"
10071msgstr "不显示已解析的标签"
10072
87cb7997 10073#: builtin/ls-remote.c:62
276ceeaa
JX
10074msgid "take url.<base>.insteadOf into account"
10075msgstr "参考 url.<base>.insteadOf 设置"
10076
87cb7997 10077#: builtin/ls-remote.c:64
276ceeaa
JX
10078msgid "exit with exit code 2 if no matching refs are found"
10079msgstr "若未找到匹配的引用则以退出码2退出"
10080
87cb7997 10081#: builtin/ls-remote.c:66
276ceeaa
JX
10082msgid "show underlying ref in addition to the object pointed by it"
10083msgstr "除了显示指向的对象外,显示指向的引用名"
10084
a4f16749 10085#: builtin/ls-tree.c:29
ef317cd5 10086msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 10087msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5 10088
a4f16749 10089#: builtin/ls-tree.c:127
ef317cd5 10090msgid "only show trees"
07432cef 10091msgstr "只显示树"
ef317cd5 10092
a4f16749 10093#: builtin/ls-tree.c:129
ef317cd5 10094msgid "recurse into subtrees"
07432cef 10095msgstr "递归到子树"
ef317cd5 10096
a4f16749 10097#: builtin/ls-tree.c:131
ef317cd5 10098msgid "show trees when recursing"
07432cef 10099msgstr "当递归时显示树"
ef317cd5 10100
a4f16749 10101#: builtin/ls-tree.c:134
ef317cd5 10102msgid "terminate entries with NUL byte"
4375c10e 10103msgstr "条目以 NUL 字符终止"
ef317cd5 10104
a4f16749 10105#: builtin/ls-tree.c:135
ef317cd5 10106msgid "include object size"
07432cef 10107msgstr "包括对象大小"
ef317cd5 10108
a4f16749 10109#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
ef317cd5 10110msgid "list only filenames"
07432cef 10111msgstr "只列出文件名"
ef317cd5 10112
a4f16749 10113#: builtin/ls-tree.c:142
ef317cd5 10114msgid "use full path names"
07432cef 10115msgstr "使用文件的全路径"
ef317cd5 10116
a4f16749 10117#: builtin/ls-tree.c:144
ef317cd5 10118msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 10119msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5 10120
a4f16749
JX
10121#: builtin/mailsplit.c:241
10122#, c-format
10123msgid "empty mbox: '%s'"
10124msgstr "空的 mbox:'%s'"
10125
6937cb4e 10126#: builtin/merge.c:48
814ff314
JX
10127msgid "git merge [<options>] [<commit>...]"
10128msgstr "git merge [<选项>] [<提交>...]"
ef317cd5 10129
6937cb4e 10130#: builtin/merge.c:49
ef317cd5 10131msgid "git merge --abort"
07432cef 10132msgstr "git merge --abort"
ef317cd5 10133
6937cb4e 10134#: builtin/merge.c:50
1a79b2f1
JX
10135msgid "git merge --continue"
10136msgstr "git merge --continue"
10137
6937cb4e 10138#: builtin/merge.c:107
c04f5ac3
JX
10139msgid "switch `m' requires a value"
10140msgstr "开关 `m' 需要一个值"
10141
6937cb4e 10142#: builtin/merge.c:144
c04f5ac3
JX
10143#, c-format
10144msgid "Could not find merge strategy '%s'.\n"
90e6ef53 10145msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 10146
6937cb4e 10147#: builtin/merge.c:145
c04f5ac3
JX
10148#, c-format
10149msgid "Available strategies are:"
10150msgstr "可用的策略有:"
10151
6937cb4e 10152#: builtin/merge.c:150
c04f5ac3
JX
10153#, c-format
10154msgid "Available custom strategies are:"
10155msgstr "可用的自定义策略有:"
10156
5809aa05 10157#: builtin/merge.c:200 builtin/pull.c:137
ef317cd5 10158msgid "do not show a diffstat at the end of the merge"
07432cef 10159msgstr "在合并的最后不显示差异统计"
ef317cd5 10160
5809aa05 10161#: builtin/merge.c:203 builtin/pull.c:140
ef317cd5 10162msgid "show a diffstat at the end of the merge"
07432cef 10163msgstr "在合并的最后显示差异统计"
ef317cd5 10164
5809aa05 10165#: builtin/merge.c:204 builtin/pull.c:143
ef317cd5 10166msgid "(synonym to --stat)"
07432cef 10167msgstr "(和 --stat 同义)"
ef317cd5 10168
5809aa05 10169#: builtin/merge.c:206 builtin/pull.c:146
ef317cd5 10170msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 10171msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 10172
5809aa05 10173#: builtin/merge.c:209 builtin/pull.c:152
ef317cd5 10174msgid "create a single commit instead of doing a merge"
07432cef 10175msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 10176
5809aa05 10177#: builtin/merge.c:211 builtin/pull.c:155
ef317cd5 10178msgid "perform a commit if the merge succeeds (default)"
07432cef 10179msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 10180
5809aa05 10181#: builtin/merge.c:213 builtin/pull.c:158
ef317cd5 10182msgid "edit message before committing"
07432cef 10183msgstr "在提交前编辑提交说明"
ef317cd5 10184
6937cb4e 10185#: builtin/merge.c:214
ef317cd5 10186msgid "allow fast-forward (default)"
07432cef 10187msgstr "允许快进(默认)"
ef317cd5 10188
5809aa05 10189#: builtin/merge.c:216 builtin/pull.c:164
ef317cd5 10190msgid "abort if fast-forward is not possible"
07432cef 10191msgstr "如果不能快进就放弃合并"
ef317cd5 10192
5809aa05 10193#: builtin/merge.c:220 builtin/pull.c:167
5c57d762 10194msgid "verify that the named commit has a valid GPG signature"
1003b3a5
JX
10195msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
10196
5809aa05 10197#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
a4f16749 10198#: builtin/revert.c:109
ef317cd5 10199msgid "strategy"
07432cef 10200msgstr "策略"
ef317cd5 10201
5809aa05 10202#: builtin/merge.c:222 builtin/pull.c:172
ef317cd5 10203msgid "merge strategy to use"
07432cef 10204msgstr "要使用的合并策略"
ef317cd5 10205
5809aa05 10206#: builtin/merge.c:223 builtin/pull.c:175
ef317cd5 10207msgid "option=value"
07432cef 10208msgstr "option=value"
ef317cd5 10209
5809aa05 10210#: builtin/merge.c:224 builtin/pull.c:176
ef317cd5 10211msgid "option for selected merge strategy"
07432cef 10212msgstr "所选的合并策略的选项"
ef317cd5 10213
6937cb4e 10214#: builtin/merge.c:226
ef317cd5 10215msgid "merge commit message (for a non-fast-forward merge)"
07432cef 10216msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 10217
6937cb4e 10218#: builtin/merge.c:230
ef317cd5 10219msgid "abort the current in-progress merge"
07432cef 10220msgstr "放弃当前正在进行的合并"
ef317cd5 10221
6937cb4e 10222#: builtin/merge.c:232
1a79b2f1
JX
10223msgid "continue the current in-progress merge"
10224msgstr "继续当前正在进行的合并"
10225
5809aa05 10226#: builtin/merge.c:234 builtin/pull.c:183
5b04ee3b
JX
10227msgid "allow merging unrelated histories"
10228msgstr "允许合并不相关的历史"
10229
6937cb4e
JX
10230#: builtin/merge.c:240
10231msgid "verify commit-msg hook"
10232msgstr "校验 commit-msg 钩子"
10233
10234#: builtin/merge.c:265
c04f5ac3 10235msgid "could not run stash."
a4f16749 10236msgstr "不能运行贮藏。"
c04f5ac3 10237
6937cb4e 10238#: builtin/merge.c:270
c04f5ac3 10239msgid "stash failed"
a4f16749 10240msgstr "贮藏失败"
c04f5ac3 10241
6937cb4e 10242#: builtin/merge.c:275
c04f5ac3
JX
10243#, c-format
10244msgid "not a valid object: %s"
10245msgstr "不是一个有效对象:%s"
10246
6937cb4e 10247#: builtin/merge.c:297 builtin/merge.c:314
c04f5ac3
JX
10248msgid "read-tree failed"
10249msgstr "读取树失败"
10250
90e6ef53 10251# 译者:注意保持前导空格
6937cb4e 10252#: builtin/merge.c:344
c04f5ac3
JX
10253msgid " (nothing to squash)"
10254msgstr " (无可压缩)"
10255
6937cb4e 10256#: builtin/merge.c:355
c04f5ac3
JX
10257#, c-format
10258msgid "Squash commit -- not updating HEAD\n"
10259msgstr "压缩提交 -- 未更新 HEAD\n"
10260
6937cb4e 10261#: builtin/merge.c:405
c04f5ac3
JX
10262#, c-format
10263msgid "No merge message -- not updating HEAD\n"
10264msgstr "无合并信息 -- 未更新 HEAD\n"
10265
5809aa05 10266#: builtin/merge.c:455
c04f5ac3
JX
10267#, c-format
10268msgid "'%s' does not point to a commit"
10269msgstr "'%s' 没有指向一个提交"
10270
5809aa05 10271#: builtin/merge.c:545
c04f5ac3
JX
10272#, c-format
10273msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 10274msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 10275
5809aa05 10276#: builtin/merge.c:667
c04f5ac3 10277msgid "Not handling anything other than two heads merge."
29004bbb 10278msgstr "未处理两个头合并之外的任何操作。"
c04f5ac3 10279
5809aa05 10280#: builtin/merge.c:681
c04f5ac3
JX
10281#, c-format
10282msgid "Unknown option for merge-recursive: -X%s"
10283msgstr "merge-recursive 的未知选项:-X%s"
10284
5809aa05 10285#: builtin/merge.c:696
c04f5ac3
JX
10286#, c-format
10287msgid "unable to write %s"
10288msgstr "不能写 %s"
10289
5809aa05 10290#: builtin/merge.c:748
c04f5ac3
JX
10291#, c-format
10292msgid "Could not read from '%s'"
10293msgstr "不能从 '%s' 读取"
10294
5809aa05 10295#: builtin/merge.c:757
c04f5ac3
JX
10296#, c-format
10297msgid "Not committing merge; use 'git commit' to complete the merge.\n"
10298msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
10299
5809aa05 10300#: builtin/merge.c:763
a77c07d9 10301#, c-format
c04f5ac3
JX
10302msgid ""
10303"Please enter a commit message to explain why this merge is necessary,\n"
10304"especially if it merges an updated upstream into a topic branch.\n"
10305"\n"
a77c07d9 10306"Lines starting with '%c' will be ignored, and an empty message aborts\n"
c04f5ac3
JX
10307"the commit.\n"
10308msgstr ""
10309"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
10310"合并到主题分支。\n"
10311"\n"
a77c07d9 10312"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
c04f5ac3 10313
5809aa05 10314#: builtin/merge.c:799
c04f5ac3
JX
10315msgid "Empty commit message."
10316msgstr "空提交信息。"
10317
5809aa05 10318#: builtin/merge.c:819
c04f5ac3
JX
10319#, c-format
10320msgid "Wonderful.\n"
10321msgstr "太棒了。\n"
10322
5809aa05 10323#: builtin/merge.c:872
c04f5ac3
JX
10324#, c-format
10325msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
10326msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
10327
5809aa05 10328#: builtin/merge.c:911
c04f5ac3 10329msgid "No current branch."
90e6ef53 10330msgstr "没有当前分支。"
c04f5ac3 10331
5809aa05 10332#: builtin/merge.c:913
c04f5ac3 10333msgid "No remote for the current branch."
160fb2b2 10334msgstr "当前分支没有对应的远程仓库。"
c04f5ac3 10335
5809aa05 10336#: builtin/merge.c:915
c04f5ac3 10337msgid "No default upstream defined for the current branch."
90e6ef53 10338msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 10339
5809aa05 10340#: builtin/merge.c:920
170e9899 10341#, c-format
2e8451e8
JX
10342msgid "No remote-tracking branch for %s from %s"
10343msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 10344
5809aa05 10345#: builtin/merge.c:973
5c57d762
JX
10346#, c-format
10347msgid "Bad value '%s' in environment '%s'"
9a4b694c 10348msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
5c57d762 10349
5809aa05 10350#: builtin/merge.c:1075
5c57d762
JX
10351#, c-format
10352msgid "not something we can merge in %s: %s"
10353msgstr "不能在 %s 中合并:%s"
10354
5809aa05 10355#: builtin/merge.c:1109
5c57d762
JX
10356msgid "not something we can merge"
10357msgstr "不能合并"
10358
5809aa05 10359#: builtin/merge.c:1174
1a79b2f1
JX
10360msgid "--abort expects no arguments"
10361msgstr "--abort 不带参数"
10362
5809aa05 10363#: builtin/merge.c:1178
c04f5ac3 10364msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 10365msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 10366
5809aa05 10367#: builtin/merge.c:1190
1a79b2f1
JX
10368msgid "--continue expects no arguments"
10369msgstr "--continue 不带参数"
10370
5809aa05 10371#: builtin/merge.c:1194
1a79b2f1
JX
10372msgid "There is no merge in progress (MERGE_HEAD missing)."
10373msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
10374
5809aa05 10375#: builtin/merge.c:1210
c04f5ac3
JX
10376msgid ""
10377"You have not concluded your merge (MERGE_HEAD exists).\n"
220c313c 10378"Please, commit your changes before you merge."
c04f5ac3
JX
10379msgstr ""
10380"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 10381"请在合并前先提交您的修改。"
c04f5ac3 10382
5809aa05 10383#: builtin/merge.c:1217
c04f5ac3
JX
10384msgid ""
10385"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
220c313c 10386"Please, commit your changes before you merge."
c04f5ac3
JX
10387msgstr ""
10388"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 10389"请在合并前先提交您的修改。"
c04f5ac3 10390
5809aa05 10391#: builtin/merge.c:1220
c04f5ac3
JX
10392msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
10393msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
10394
5809aa05 10395#: builtin/merge.c:1229
c04f5ac3 10396msgid "You cannot combine --squash with --no-ff."
649900bc 10397msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 10398
5809aa05 10399#: builtin/merge.c:1237
c04f5ac3 10400msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 10401msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 10402
5809aa05 10403#: builtin/merge.c:1254
c04f5ac3
JX
10404msgid "Squash commit into empty head not supported yet"
10405msgstr "尚不支持到空分支的压缩提交"
10406
5809aa05 10407#: builtin/merge.c:1256
c04f5ac3
JX
10408msgid "Non-fast-forward commit does not make sense into an empty head"
10409msgstr "到空分支的非快进式提交没有意义"
10410
5809aa05 10411#: builtin/merge.c:1261
2e8451e8
JX
10412#, c-format
10413msgid "%s - not something we can merge"
10414msgstr "%s - 不能被合并"
10415
5809aa05 10416#: builtin/merge.c:1263
7aea43ff
JX
10417msgid "Can merge only exactly one commit into empty head"
10418msgstr "只能将一个提交合并到空分支上"
10419
5809aa05 10420#: builtin/merge.c:1297
1003b3a5
JX
10421#, c-format
10422msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
10423msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
10424
5809aa05 10425#: builtin/merge.c:1300
1003b3a5
JX
10426#, c-format
10427msgid "Commit %s has a bad GPG signature allegedly by %s."
10428msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
10429
5809aa05 10430#: builtin/merge.c:1303
1003b3a5
JX
10431#, c-format
10432msgid "Commit %s does not have a GPG signature."
10433msgstr "提交 %s 没有一个 GPG 签名。"
10434
5809aa05 10435#: builtin/merge.c:1306
1003b3a5
JX
10436#, c-format
10437msgid "Commit %s has a good GPG signature by %s\n"
10438msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
10439
5809aa05 10440#: builtin/merge.c:1368
5b04ee3b
JX
10441msgid "refusing to merge unrelated histories"
10442msgstr "拒绝合并无关的历史"
10443
5809aa05 10444#: builtin/merge.c:1377
6937cb4e 10445msgid "Already up to date."
5c57d762
JX
10446msgstr "已经是最新的。"
10447
5809aa05 10448#: builtin/merge.c:1387
c04f5ac3
JX
10449#, c-format
10450msgid "Updating %s..%s\n"
10451msgstr "更新 %s..%s\n"
10452
5809aa05 10453#: builtin/merge.c:1428
c04f5ac3
JX
10454#, c-format
10455msgid "Trying really trivial in-index merge...\n"
90e6ef53 10456msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 10457
5809aa05 10458#: builtin/merge.c:1435
c04f5ac3
JX
10459#, c-format
10460msgid "Nope.\n"
10461msgstr "无。\n"
10462
5809aa05 10463#: builtin/merge.c:1460
6937cb4e 10464msgid "Already up to date. Yeeah!"
5c57d762
JX
10465msgstr "已经是最新的。耶!"
10466
5809aa05 10467#: builtin/merge.c:1466
c04f5ac3 10468msgid "Not possible to fast-forward, aborting."
1aabac65 10469msgstr "无法快进,终止。"
c04f5ac3 10470
5809aa05 10471#: builtin/merge.c:1489 builtin/merge.c:1568
c04f5ac3
JX
10472#, c-format
10473msgid "Rewinding the tree to pristine...\n"
10474msgstr "将树回滚至原始状态...\n"
10475
5809aa05 10476#: builtin/merge.c:1493
c04f5ac3
JX
10477#, c-format
10478msgid "Trying merge strategy %s...\n"
10479msgstr "尝试合并策略 %s...\n"
10480
5809aa05 10481#: builtin/merge.c:1559
c04f5ac3
JX
10482#, c-format
10483msgid "No merge strategy handled the merge.\n"
10484msgstr "没有合并策略处理此合并。\n"
10485
5809aa05 10486#: builtin/merge.c:1561
c04f5ac3
JX
10487#, c-format
10488msgid "Merge with strategy %s failed.\n"
10489msgstr "使用策略 %s 合并失败。\n"
10490
5809aa05 10491#: builtin/merge.c:1570
c04f5ac3
JX
10492#, c-format
10493msgid "Using the %s to prepare resolving by hand.\n"
10494msgstr "使用 %s 以准备手工解决。\n"
10495
5809aa05 10496#: builtin/merge.c:1582
c04f5ac3
JX
10497#, c-format
10498msgid "Automatic merge went well; stopped before committing as requested\n"
10499msgstr "自动合并进展顺利,按要求在提交前停止\n"
10500
a4f16749 10501#: builtin/merge-base.c:30
814ff314
JX
10502msgid "git merge-base [-a | --all] <commit> <commit>..."
10503msgstr "git merge-base [-a | --all] <提交> <提交>..."
ef317cd5 10504
a4f16749 10505#: builtin/merge-base.c:31
814ff314
JX
10506msgid "git merge-base [-a | --all] --octopus <commit>..."
10507msgstr "git merge-base [-a | --all] --octopus <提交>..."
ef317cd5 10508
a4f16749 10509#: builtin/merge-base.c:32
ef317cd5 10510msgid "git merge-base --independent <commit>..."
07432cef 10511msgstr "git merge-base --independent <提交>..."
ef317cd5 10512
a4f16749 10513#: builtin/merge-base.c:33
ef317cd5 10514msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 10515msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5 10516
a4f16749 10517#: builtin/merge-base.c:34
cfff71a9 10518msgid "git merge-base --fork-point <ref> [<commit>]"
d9d56b23 10519msgstr "git merge-base --fork-point <引用> [<提交>]"
cfff71a9 10520
5809aa05 10521#: builtin/merge-base.c:220
ef317cd5 10522msgid "output all common ancestors"
07432cef 10523msgstr "输出所有共同的祖先"
ef317cd5 10524
5809aa05 10525#: builtin/merge-base.c:222
ef317cd5 10526msgid "find ancestors for a single n-way merge"
07432cef 10527msgstr "查找一个多路合并的祖先提交"
ef317cd5 10528
5809aa05 10529#: builtin/merge-base.c:224
ef317cd5 10530msgid "list revs not reachable from others"
07432cef 10531msgstr "显示不能被其他访问到的版本"
ef317cd5 10532
5809aa05 10533#: builtin/merge-base.c:226
ef317cd5 10534msgid "is the first one ancestor of the other?"
07432cef 10535msgstr "第一个是其他的祖先提交么?"
ef317cd5 10536
5809aa05 10537#: builtin/merge-base.c:228
cfff71a9 10538msgid "find where <commit> forked from reflog of <ref>"
e397e7e3 10539msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
cfff71a9 10540
a4f16749 10541#: builtin/merge-file.c:9
ef317cd5 10542msgid ""
814ff314
JX
10543"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
10544"<orig-file> <file2>"
ef317cd5 10545msgstr ""
814ff314
JX
10546"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
10547"件> <文件2>"
ef317cd5 10548
a4f16749 10549#: builtin/merge-file.c:33
ef317cd5 10550msgid "send results to standard output"
07432cef 10551msgstr "将结果发送到标准输出"
ef317cd5 10552
a4f16749 10553#: builtin/merge-file.c:34
ef317cd5 10554msgid "use a diff3 based merge"
07432cef 10555msgstr "使用基于 diff3 的合并"
ef317cd5 10556
a4f16749 10557#: builtin/merge-file.c:35
ef317cd5 10558msgid "for conflicts, use our version"
07432cef 10559msgstr "如果冲突,使用我们的版本"
ef317cd5 10560
a4f16749 10561#: builtin/merge-file.c:37
ef317cd5 10562msgid "for conflicts, use their version"
07432cef 10563msgstr "如果冲突,使用他们的版本"
ef317cd5 10564
a4f16749 10565#: builtin/merge-file.c:39
ef317cd5 10566msgid "for conflicts, use a union version"
07432cef 10567msgstr "如果冲突,使用联合版本"
ef317cd5 10568
a4f16749 10569#: builtin/merge-file.c:42
ef317cd5 10570msgid "for conflicts, use this marker size"
07432cef 10571msgstr "如果冲突,使用指定长度的标记"
ef317cd5 10572
a4f16749 10573#: builtin/merge-file.c:43
ef317cd5 10574msgid "do not warn about conflicts"
07432cef 10575msgstr "不要警告冲突"
ef317cd5 10576
a4f16749 10577#: builtin/merge-file.c:45
814ff314
JX
10578msgid "set labels for file1/orig-file/file2"
10579msgstr "为 文件1/初始文件/文件2 设置标签"
c04f5ac3 10580
a0b6b246
JX
10581#: builtin/merge-recursive.c:45
10582#, c-format
10583msgid "unknown option %s"
10584msgstr "未知选项 %s"
10585
10586#: builtin/merge-recursive.c:51
10587#, c-format
10588msgid "could not parse object '%s'"
10589msgstr "不能解析对象 '%s'"
10590
10591#: builtin/merge-recursive.c:55
10592#, c-format
10593msgid "cannot handle more than %d base. Ignoring %s."
10594msgid_plural "cannot handle more than %d bases. Ignoring %s."
10595msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
10596msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
10597
10598#: builtin/merge-recursive.c:63
10599msgid "not handling anything other than two heads merge."
10600msgstr "不能处理两个头合并之外的任何操作。"
10601
10602#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
10603#, c-format
10604msgid "could not resolve ref '%s'"
10605msgstr "无法解析引用 '%s'"
10606
10607#: builtin/merge-recursive.c:77
10608#, c-format
10609msgid "Merging %s with %s\n"
10610msgstr "合并 %s 和 %s\n"
10611
276ceeaa 10612#: builtin/mktree.c:65
ef317cd5 10613msgid "git mktree [-z] [--missing] [--batch]"
07432cef 10614msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 10615
a4f16749 10616#: builtin/mktree.c:153
ef317cd5 10617msgid "input is NUL terminated"
07432cef 10618msgstr "输入以 NUL 字符终止"
c04f5ac3 10619
a4f16749 10620#: builtin/mktree.c:154 builtin/write-tree.c:25
ef317cd5 10621msgid "allow missing objects"
07432cef 10622msgstr "允许丢失的对象"
c04f5ac3 10623
a4f16749 10624#: builtin/mktree.c:155
ef317cd5 10625msgid "allow creation of more than one tree"
07432cef 10626msgstr "允许创建一个以上的树"
c04f5ac3 10627
a4f16749 10628#: builtin/mv.c:17
814ff314
JX
10629msgid "git mv [<options>] <source>... <destination>"
10630msgstr "git mv [<选项>] <源>... <目标>"
c04f5ac3 10631
a4f16749 10632#: builtin/mv.c:83
220c313c
JX
10633#, c-format
10634msgid "Directory %s is in index and no submodule?"
10635msgstr "目录 %s 在索引中并且不是子模组?"
10636
6937cb4e 10637#: builtin/mv.c:85 builtin/rm.c:289
220c313c 10638msgid "Please stage your changes to .gitmodules or stash them to proceed"
a4f16749 10639msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
220c313c 10640
a4f16749 10641#: builtin/mv.c:103
220c313c
JX
10642#, c-format
10643msgid "%.*s is in index"
10644msgstr "%.*s 在索引中"
10645
a4f16749 10646#: builtin/mv.c:125
ef317cd5 10647msgid "force move/rename even if target exists"
07432cef 10648msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 10649
a4f16749 10650#: builtin/mv.c:126
ef317cd5 10651msgid "skip move/rename errors"
07432cef 10652msgstr "跳过移动/重命名错误"
c04f5ac3 10653
6937cb4e 10654#: builtin/mv.c:167
220c313c
JX
10655#, c-format
10656msgid "destination '%s' is not a directory"
10657msgstr "目标 '%s' 不是一个目录"
10658
6937cb4e 10659#: builtin/mv.c:178
c04f5ac3
JX
10660#, c-format
10661msgid "Checking rename of '%s' to '%s'\n"
10662msgstr "检查 '%s' 到 '%s' 的重命名\n"
10663
6937cb4e 10664#: builtin/mv.c:182
c04f5ac3
JX
10665msgid "bad source"
10666msgstr "坏的源"
10667
6937cb4e 10668#: builtin/mv.c:185
c04f5ac3
JX
10669msgid "can not move directory into itself"
10670msgstr "不能将目录移动到自身"
10671
6937cb4e 10672#: builtin/mv.c:188
c04f5ac3
JX
10673msgid "cannot move directory over file"
10674msgstr "不能将目录移动到文件"
10675
6937cb4e 10676#: builtin/mv.c:197
c04f5ac3
JX
10677msgid "source directory is empty"
10678msgstr "源目录为空"
10679
6937cb4e 10680#: builtin/mv.c:222
c04f5ac3
JX
10681msgid "not under version control"
10682msgstr "不在版本控制之下"
10683
6937cb4e 10684#: builtin/mv.c:225
c04f5ac3
JX
10685msgid "destination exists"
10686msgstr "目标已存在"
10687
6937cb4e 10688#: builtin/mv.c:233
c04f5ac3
JX
10689#, c-format
10690msgid "overwriting '%s'"
10691msgstr "覆盖 '%s'"
10692
6937cb4e 10693#: builtin/mv.c:236
c04f5ac3
JX
10694msgid "Cannot overwrite"
10695msgstr "不能覆盖"
10696
6937cb4e 10697#: builtin/mv.c:239
c04f5ac3
JX
10698msgid "multiple sources for the same target"
10699msgstr "同一目标具有多个源"
10700
6937cb4e 10701#: builtin/mv.c:241
cfff71a9
JX
10702msgid "destination directory does not exist"
10703msgstr "目标目录不存在"
10704
6937cb4e 10705#: builtin/mv.c:248
c04f5ac3
JX
10706#, c-format
10707msgid "%s, source=%s, destination=%s"
10708msgstr "%s,源=%s,目标=%s"
10709
6937cb4e 10710#: builtin/mv.c:269
c04f5ac3
JX
10711#, c-format
10712msgid "Renaming %s to %s\n"
10713msgstr "重命名 %s 至 %s\n"
10714
6937cb4e 10715#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
c04f5ac3
JX
10716#, c-format
10717msgid "renaming '%s' failed"
10718msgstr "重命名 '%s' 失败"
10719
a4f16749 10720#: builtin/name-rev.c:338
814ff314
JX
10721msgid "git name-rev [<options>] <commit>..."
10722msgstr "git name-rev [<选项>] <提交>..."
ef317cd5 10723
a4f16749 10724#: builtin/name-rev.c:339
814ff314
JX
10725msgid "git name-rev [<options>] --all"
10726msgstr "git name-rev [<选项>] --all"
ef317cd5 10727
a4f16749 10728#: builtin/name-rev.c:340
814ff314
JX
10729msgid "git name-rev [<options>] --stdin"
10730msgstr "git name-rev [<选项>] --stdin"
ef317cd5 10731
a4f16749 10732#: builtin/name-rev.c:395
ef317cd5 10733msgid "print only names (no SHA-1)"
07432cef 10734msgstr "只打印名称(无 SHA-1)"
ef317cd5 10735
a4f16749 10736#: builtin/name-rev.c:396
ef317cd5 10737msgid "only use tags to name the commits"
55a16ee4 10738msgstr "只使用标签来命名提交"
ef317cd5 10739
a4f16749 10740#: builtin/name-rev.c:398
ef317cd5 10741msgid "only use refs matching <pattern>"
07432cef 10742msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 10743
a4f16749 10744#: builtin/name-rev.c:400
87cb7997
JX
10745msgid "ignore refs matching <pattern>"
10746msgstr "忽略和 <模式> 相匹配的引用"
10747
a4f16749 10748#: builtin/name-rev.c:402
ef317cd5 10749msgid "list all commits reachable from all refs"
07432cef 10750msgstr "列出可以从所有引用访问的提交"
ef317cd5 10751
a4f16749 10752#: builtin/name-rev.c:403
ef317cd5 10753msgid "read from stdin"
07432cef 10754msgstr "从标准输入读取"
ef317cd5 10755
a4f16749 10756#: builtin/name-rev.c:404
90314792
JX
10757msgid "allow to print `undefined` names (default)"
10758msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 10759
a4f16749 10760#: builtin/name-rev.c:410
2e8451e8 10761msgid "dereference tags in the input (internal use)"
55a16ee4 10762msgstr "反向解析输入中的标签(内部使用)"
2e8451e8 10763
a4f16749 10764#: builtin/notes.c:26
814ff314 10765msgid "git notes [--ref <notes-ref>] [list [<object>]]"
07432cef 10766msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 10767
a4f16749 10768#: builtin/notes.c:27
ef317cd5 10769msgid ""
814ff314 10770"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
04cb2f28 10771"| (-c | -C) <object>] [<object>]"
ef317cd5 10772msgstr ""
04cb2f28
JX
10773"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
10774"| (-c | -C) <对象>] [<对象>]"
ef317cd5 10775
a4f16749 10776#: builtin/notes.c:28
814ff314 10777msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
07432cef 10778msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 10779
a4f16749 10780#: builtin/notes.c:29
ef317cd5 10781msgid ""
814ff314 10782"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
04cb2f28 10783"(-c | -C) <object>] [<object>]"
ef317cd5 10784msgstr ""
04cb2f28
JX
10785"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
10786"(-c | -C) <对象>] [<对象>]"
ef317cd5 10787
a4f16749 10788#: builtin/notes.c:30
814ff314 10789msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
04cb2f28 10790msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
ef317cd5 10791
a4f16749 10792#: builtin/notes.c:31
814ff314 10793msgid "git notes [--ref <notes-ref>] show [<object>]"
07432cef 10794msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 10795
a4f16749 10796#: builtin/notes.c:32
ef317cd5 10797msgid ""
814ff314 10798"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
07432cef 10799msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 10800
a4f16749 10801#: builtin/notes.c:33
ef317cd5 10802msgid "git notes merge --commit [-v | -q]"
07432cef 10803msgstr "git notes merge --commit [-v | -q]"
ef317cd5 10804
a4f16749 10805#: builtin/notes.c:34
ef317cd5 10806msgid "git notes merge --abort [-v | -q]"
07432cef 10807msgstr "git notes merge --abort [-v | -q]"
ef317cd5 10808
a4f16749 10809#: builtin/notes.c:35
814ff314 10810msgid "git notes [--ref <notes-ref>] remove [<object>...]"
07432cef 10811msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 10812
a4f16749 10813#: builtin/notes.c:36
5809aa05
JX
10814msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
10815msgstr "git notes [--ref <注解引用>] prune [-n] [-v]"
ef317cd5 10816
a4f16749 10817#: builtin/notes.c:37
814ff314 10818msgid "git notes [--ref <notes-ref>] get-ref"
07432cef 10819msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 10820
a4f16749 10821#: builtin/notes.c:42
ef317cd5 10822msgid "git notes [list [<object>]]"
07432cef 10823msgstr "git notes [list [<对象>]]"
ef317cd5 10824
a4f16749 10825#: builtin/notes.c:47
ef317cd5 10826msgid "git notes add [<options>] [<object>]"
07432cef 10827msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 10828
a4f16749 10829#: builtin/notes.c:52
ef317cd5 10830msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 10831msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 10832
a4f16749 10833#: builtin/notes.c:53
ef317cd5 10834msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 10835msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 10836
a4f16749 10837#: builtin/notes.c:58
ef317cd5 10838msgid "git notes append [<options>] [<object>]"
07432cef 10839msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 10840
a4f16749 10841#: builtin/notes.c:63
ef317cd5 10842msgid "git notes edit [<object>]"
07432cef 10843msgstr "git notes edit [<对象>]"
ef317cd5 10844
a4f16749 10845#: builtin/notes.c:68
ef317cd5 10846msgid "git notes show [<object>]"
07432cef 10847msgstr "git notes show [<对象>]"
ef317cd5 10848
a4f16749 10849#: builtin/notes.c:73
814ff314 10850msgid "git notes merge [<options>] <notes-ref>"
07432cef 10851msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 10852
a4f16749 10853#: builtin/notes.c:74
ef317cd5 10854msgid "git notes merge --commit [<options>]"
07432cef 10855msgstr "git notes merge --commit [<选项>]"
ef317cd5 10856
a4f16749 10857#: builtin/notes.c:75
ef317cd5 10858msgid "git notes merge --abort [<options>]"
07432cef 10859msgstr "git notes merge --abort [<选项>]"
ef317cd5 10860
a4f16749 10861#: builtin/notes.c:80
ef317cd5 10862msgid "git notes remove [<object>]"
07432cef 10863msgstr "git notes remove [<对象>]"
ef317cd5 10864
a4f16749 10865#: builtin/notes.c:85
ef317cd5 10866msgid "git notes prune [<options>]"
07432cef 10867msgstr "git notes prune [<选项>]"
ef317cd5 10868
a4f16749 10869#: builtin/notes.c:90
ef317cd5 10870msgid "git notes get-ref"
07432cef 10871msgstr "git notes get-ref"
ef317cd5 10872
a4f16749 10873#: builtin/notes.c:95
5c57d762
JX
10874msgid "Write/edit the notes for the following object:"
10875msgstr "为下面的对象写/编辑说明:"
10876
a4f16749 10877#: builtin/notes.c:148
c04f5ac3
JX
10878#, c-format
10879msgid "unable to start 'show' for object '%s'"
10880msgstr "不能为对象 '%s' 开始 'show'"
10881
a4f16749 10882#: builtin/notes.c:152
a77c07d9
JX
10883msgid "could not read 'show' output"
10884msgstr "不能读取 'show' 的输出"
c04f5ac3 10885
a4f16749 10886#: builtin/notes.c:160
c04f5ac3
JX
10887#, c-format
10888msgid "failed to finish 'show' for object '%s'"
10889msgstr "无法为对象 '%s' 完成 'show'"
10890
a4f16749 10891#: builtin/notes.c:195
a0b6b246 10892msgid "please supply the note contents using either -m or -F option"
c04f5ac3
JX
10893msgstr "请通过 -m 或 -F 选项为注解提供内容"
10894
a4f16749 10895#: builtin/notes.c:204
c04f5ac3
JX
10896msgid "unable to write note object"
10897msgstr "不能写注解对象"
10898
a4f16749 10899#: builtin/notes.c:206
c04f5ac3 10900#, c-format
a0b6b246 10901msgid "the note contents have been left in %s"
220c313c 10902msgstr "注解内容被留在 %s 中"
c04f5ac3 10903
6937cb4e 10904#: builtin/notes.c:234 builtin/tag.c:500
c04f5ac3
JX
10905#, c-format
10906msgid "cannot read '%s'"
10907msgstr "不能读取 '%s'"
10908
6937cb4e 10909#: builtin/notes.c:236 builtin/tag.c:503
c04f5ac3
JX
10910#, c-format
10911msgid "could not open or read '%s'"
10912msgstr "不能打开或读取 '%s'"
10913
a4f16749 10914#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
6937cb4e
JX
10915#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
10916#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
a0b6b246
JX
10917#, c-format
10918msgid "failed to resolve '%s' as a valid ref."
10919msgstr "无法解析 '%s' 为一个有效引用。"
10920
a4f16749 10921#: builtin/notes.c:258
c04f5ac3 10922#, c-format
a0b6b246 10923msgid "failed to read object '%s'."
c04f5ac3
JX
10924msgstr "无法读取对象 '%s'。"
10925
a4f16749 10926#: builtin/notes.c:262
6c94aba5 10927#, c-format
a0b6b246
JX
10928msgid "cannot read note data from non-blob object '%s'."
10929msgstr "不能从非数据对象 '%s' 中读取注解数据。"
10930
a4f16749 10931#: builtin/notes.c:302
a0b6b246
JX
10932#, c-format
10933msgid "malformed input line: '%s'."
10934msgstr "非法的输入行:'%s'。"
10935
a4f16749 10936#: builtin/notes.c:317
a0b6b246
JX
10937#, c-format
10938msgid "failed to copy notes from '%s' to '%s'"
10939msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
6c94aba5 10940
a4f16749
JX
10941#. TRANSLATORS: the first %s will be replaced by a git
10942#. notes command: 'add', 'merge', 'remove', etc.
10943#.
6937cb4e 10944#: builtin/notes.c:349
a0b6b246
JX
10945#, c-format
10946msgid "refusing to %s notes in %s (outside of refs/notes/)"
10947msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
10948
6937cb4e
JX
10949#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
10950#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
10951#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
c04f5ac3
JX
10952msgid "too many parameters"
10953msgstr "参数太多"
10954
6937cb4e 10955#: builtin/notes.c:382 builtin/notes.c:668
c04f5ac3 10956#, c-format
a0b6b246 10957msgid "no note found for object %s."
c04f5ac3
JX
10958msgstr "未发现对象 %s 的注解。"
10959
6937cb4e 10960#: builtin/notes.c:403 builtin/notes.c:566
ef317cd5 10961msgid "note contents as a string"
07432cef 10962msgstr "注解内容作为一个字符串"
ef317cd5 10963
6937cb4e 10964#: builtin/notes.c:406 builtin/notes.c:569
ef317cd5 10965msgid "note contents in a file"
07432cef 10966msgstr "注解内容到一个文件中"
ef317cd5 10967
6937cb4e 10968#: builtin/notes.c:409 builtin/notes.c:572
ef317cd5 10969msgid "reuse and edit specified note object"
07432cef 10970msgstr "重用和编辑指定的注解对象"
ef317cd5 10971
6937cb4e 10972#: builtin/notes.c:412 builtin/notes.c:575
ef317cd5 10973msgid "reuse specified note object"
07432cef 10974msgstr "重用指定的注解对象"
ef317cd5 10975
6937cb4e 10976#: builtin/notes.c:415 builtin/notes.c:578
04cb2f28
JX
10977msgid "allow storing empty note"
10978msgstr "允许保存空白注释"
10979
6937cb4e 10980#: builtin/notes.c:416 builtin/notes.c:487
ef317cd5 10981msgid "replace existing notes"
07432cef 10982msgstr "替换已存在的注解"
ef317cd5 10983
6937cb4e 10984#: builtin/notes.c:441
c04f5ac3
JX
10985#, c-format
10986msgid ""
10987"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
10988"existing notes"
10989msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
10990
6937cb4e 10991#: builtin/notes.c:456 builtin/notes.c:535
c04f5ac3
JX
10992#, c-format
10993msgid "Overwriting existing notes for object %s\n"
10994msgstr "覆盖对象 %s 现存注解\n"
10995
6937cb4e 10996#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
04cb2f28
JX
10997#, c-format
10998msgid "Removing note for object %s\n"
10999msgstr "删除对象 %s 的注解\n"
11000
6937cb4e 11001#: builtin/notes.c:488
ef317cd5 11002msgid "read objects from stdin"
07432cef 11003msgstr "从标准输入读取对象"
ef317cd5 11004
6937cb4e 11005#: builtin/notes.c:490
ef317cd5 11006msgid "load rewriting config for <command> (implies --stdin)"
07432cef 11007msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 11008
6937cb4e 11009#: builtin/notes.c:508
c04f5ac3
JX
11010msgid "too few parameters"
11011msgstr "参数太少"
11012
6937cb4e 11013#: builtin/notes.c:529
c04f5ac3
JX
11014#, c-format
11015msgid ""
11016"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
11017"existing notes"
11018msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
11019
6937cb4e 11020#: builtin/notes.c:541
c04f5ac3 11021#, c-format
a0b6b246 11022msgid "missing notes on source object %s. Cannot copy."
c04f5ac3
JX
11023msgstr "源对象 %s 缺少注解。不能拷贝。"
11024
6937cb4e 11025#: builtin/notes.c:593
ef317cd5
JX
11026#, c-format
11027msgid ""
11028"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
11029"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
11030msgstr ""
11031"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
11032"请换用 'git notes add -f -m/-F/-c/-C'。\n"
11033
6937cb4e 11034#: builtin/notes.c:688
a0b6b246
JX
11035msgid "failed to delete ref NOTES_MERGE_PARTIAL"
11036msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
11037
6937cb4e 11038#: builtin/notes.c:690
a0b6b246
JX
11039msgid "failed to delete ref NOTES_MERGE_REF"
11040msgstr "无法删除引用 NOTES_MERGE_REF"
11041
6937cb4e 11042#: builtin/notes.c:692
a0b6b246
JX
11043msgid "failed to remove 'git notes merge' worktree"
11044msgstr "无法删除 'git notes merge' 工作区"
11045
6937cb4e 11046#: builtin/notes.c:712
a0b6b246
JX
11047msgid "failed to read ref NOTES_MERGE_PARTIAL"
11048msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
11049
6937cb4e 11050#: builtin/notes.c:714
a0b6b246
JX
11051msgid "could not find commit from NOTES_MERGE_PARTIAL."
11052msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
11053
6937cb4e 11054#: builtin/notes.c:716
a0b6b246
JX
11055msgid "could not parse commit from NOTES_MERGE_PARTIAL."
11056msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
11057
6937cb4e 11058#: builtin/notes.c:729
a0b6b246
JX
11059msgid "failed to resolve NOTES_MERGE_REF"
11060msgstr "无法解析 NOTES_MERGE_REF"
11061
6937cb4e 11062#: builtin/notes.c:732
a0b6b246
JX
11063msgid "failed to finalize notes merge"
11064msgstr "无法完成注解合并"
11065
6937cb4e 11066#: builtin/notes.c:758
5c57d762
JX
11067#, c-format
11068msgid "unknown notes merge strategy %s"
11069msgstr "未知的注解合并策略 %s"
11070
6937cb4e 11071#: builtin/notes.c:774
ef317cd5 11072msgid "General options"
07432cef 11073msgstr "通用选项"
ef317cd5 11074
6937cb4e 11075#: builtin/notes.c:776
ef317cd5 11076msgid "Merge options"
07432cef 11077msgstr "合并选项"
ef317cd5 11078
6937cb4e 11079#: builtin/notes.c:778
ef317cd5
JX
11080msgid ""
11081"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
11082"cat_sort_uniq)"
07432cef 11083msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 11084
6937cb4e 11085#: builtin/notes.c:780
ef317cd5 11086msgid "Committing unmerged notes"
07432cef 11087msgstr "提交未合并的注解"
ef317cd5 11088
6937cb4e 11089#: builtin/notes.c:782
ef317cd5 11090msgid "finalize notes merge by committing unmerged notes"
07432cef 11091msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 11092
6937cb4e 11093#: builtin/notes.c:784
ef317cd5 11094msgid "Aborting notes merge resolution"
07432cef 11095msgstr "中止注解合并的方案"
ef317cd5 11096
6937cb4e 11097#: builtin/notes.c:786
ef317cd5 11098msgid "abort notes merge"
07432cef 11099msgstr "中止注解合并"
ef317cd5 11100
6937cb4e 11101#: builtin/notes.c:797
5c57d762
JX
11102msgid "cannot mix --commit, --abort or -s/--strategy"
11103msgstr "不能混用 --commit、--abort 或 -s/--strategy"
11104
6937cb4e 11105#: builtin/notes.c:802
a0b6b246 11106msgid "must specify a notes ref to merge"
9a4b694c 11107msgstr "必须指定一个注解引用来合并"
5c57d762 11108
6937cb4e 11109#: builtin/notes.c:826
5c57d762 11110#, c-format
a0b6b246 11111msgid "unknown -s/--strategy: %s"
5c57d762
JX
11112msgstr "未知的 -s/--strategy:%s"
11113
6937cb4e 11114#: builtin/notes.c:863
1b7f4a34 11115#, c-format
a0b6b246
JX
11116msgid "a notes merge into %s is already in-progress at %s"
11117msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
1b7f4a34 11118
6937cb4e 11119#: builtin/notes.c:866
5c57d762 11120#, c-format
a0b6b246
JX
11121msgid "failed to store link to current notes ref (%s)"
11122msgstr "无法存储链接到当前的注解引用(%s)"
5c57d762 11123
6937cb4e 11124#: builtin/notes.c:868
5c57d762
JX
11125#, c-format
11126msgid ""
11127"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
11128"'git notes merge --commit', or abort the merge with 'git notes merge --"
11129"abort'.\n"
a0b6b246
JX
11130msgstr ""
11131"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
11132"交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
5c57d762 11133
6937cb4e 11134#: builtin/notes.c:890
ef317cd5
JX
11135#, c-format
11136msgid "Object %s has no note\n"
11137msgstr "对象 %s 没有注解\n"
11138
6937cb4e 11139#: builtin/notes.c:902
ef317cd5 11140msgid "attempt to remove non-existent note is not an error"
07432cef 11141msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 11142
6937cb4e 11143#: builtin/notes.c:905
ef317cd5 11144msgid "read object names from the standard input"
07432cef 11145msgstr "从标准输入读取对象名称"
ef317cd5 11146
5809aa05 11147#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
5c57d762
JX
11148msgid "do not remove, show only"
11149msgstr "不删除,只显示"
11150
6937cb4e 11151#: builtin/notes.c:944
5c57d762
JX
11152msgid "report pruned notes"
11153msgstr "报告清除的注解"
11154
6937cb4e 11155#: builtin/notes.c:986
6c94aba5 11156msgid "notes-ref"
07432cef 11157msgstr "注解引用"
ef317cd5 11158
6937cb4e 11159#: builtin/notes.c:987
814ff314 11160msgid "use notes from <notes-ref>"
07432cef 11161msgstr "从 <注解引用> 使用注解"
ef317cd5 11162
6937cb4e 11163#: builtin/notes.c:1022
ef317cd5 11164#, c-format
a0b6b246 11165msgid "unknown subcommand: %s"
ef317cd5
JX
11166msgstr "未知子命令:%s"
11167
5809aa05 11168#: builtin/pack-objects.c:33
1b7f4a34
JX
11169msgid ""
11170"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
11171msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
ef317cd5 11172
5809aa05 11173#: builtin/pack-objects.c:34
1b7f4a34
JX
11174msgid ""
11175"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
58b6f078 11176msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
ef317cd5 11177
5809aa05 11178#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
ef317cd5
JX
11179#, c-format
11180msgid "deflate error (%d)"
11181msgstr "压缩错误 (%d)"
11182
5809aa05 11183#: builtin/pack-objects.c:788
5b04ee3b
JX
11184msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
11185msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
11186
5809aa05 11187#: builtin/pack-objects.c:801
6c94aba5
JX
11188msgid "Writing objects"
11189msgstr "写入对象中"
11190
5809aa05 11191#: builtin/pack-objects.c:1081
6c94aba5
JX
11192msgid "disabling bitmap writing, as some objects are not being packed"
11193msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
11194
5809aa05 11195#: builtin/pack-objects.c:2451
6c94aba5
JX
11196msgid "Compressing objects"
11197msgstr "压缩对象中"
11198
5809aa05
JX
11199#: builtin/pack-objects.c:2599
11200msgid "invalid value for --missing"
11201msgstr "选项 --missing 的值无效"
11202
11203#: builtin/pack-objects.c:2902
ef317cd5
JX
11204#, c-format
11205msgid "unsupported index version %s"
11206msgstr "不支持的索引版本 %s"
11207
5809aa05 11208#: builtin/pack-objects.c:2906
ef317cd5
JX
11209#, c-format
11210msgid "bad index version '%s'"
11211msgstr "坏的索引版本 '%s'"
11212
5809aa05 11213#: builtin/pack-objects.c:2936
ef317cd5 11214msgid "do not show progress meter"
07432cef 11215msgstr "不显示进度表"
ef317cd5 11216
5809aa05 11217#: builtin/pack-objects.c:2938
ef317cd5 11218msgid "show progress meter"
07432cef 11219msgstr "显示进度表"
ef317cd5 11220
5809aa05 11221#: builtin/pack-objects.c:2940
ef317cd5 11222msgid "show progress meter during object writing phase"
07432cef 11223msgstr "在对象写入阶段显示进度表"
ef317cd5 11224
5809aa05 11225#: builtin/pack-objects.c:2943
ef317cd5 11226msgid "similar to --all-progress when progress meter is shown"
07432cef 11227msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 11228
5809aa05 11229#: builtin/pack-objects.c:2944
ef317cd5 11230msgid "version[,offset]"
07432cef 11231msgstr "版本[,偏移]"
ef317cd5 11232
5809aa05 11233#: builtin/pack-objects.c:2945
ef317cd5 11234msgid "write the pack index file in the specified idx format version"
07432cef 11235msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 11236
5809aa05 11237#: builtin/pack-objects.c:2948
ef317cd5 11238msgid "maximum size of each output pack file"
07432cef 11239msgstr "每个输出包的最大尺寸"
ef317cd5 11240
5809aa05 11241#: builtin/pack-objects.c:2950
ef317cd5 11242msgid "ignore borrowed objects from alternate object store"
160fb2b2 11243msgstr "忽略从备用对象存储里借用对象"
ef317cd5 11244
5809aa05 11245#: builtin/pack-objects.c:2952
ef317cd5 11246msgid "ignore packed objects"
07432cef 11247msgstr "忽略包对象"
ef317cd5 11248
5809aa05 11249#: builtin/pack-objects.c:2954
ef317cd5 11250msgid "limit pack window by objects"
07432cef 11251msgstr "限制打包窗口的对象数"
ef317cd5 11252
5809aa05 11253#: builtin/pack-objects.c:2956
ef317cd5 11254msgid "limit pack window by memory in addition to object limit"
07432cef 11255msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 11256
5809aa05 11257#: builtin/pack-objects.c:2958
ef317cd5 11258msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 11259msgstr "打包允许的 delta 链的最大长度"
ef317cd5 11260
5809aa05 11261#: builtin/pack-objects.c:2960
ef317cd5 11262msgid "reuse existing deltas"
07432cef 11263msgstr "重用已存在的 deltas"
ef317cd5 11264
5809aa05 11265#: builtin/pack-objects.c:2962
ef317cd5 11266msgid "reuse existing objects"
07432cef 11267msgstr "重用已存在的对象"
ef317cd5 11268
5809aa05 11269#: builtin/pack-objects.c:2964
ef317cd5 11270msgid "use OFS_DELTA objects"
07432cef 11271msgstr "使用 OFS_DELTA 对象"
ef317cd5 11272
5809aa05 11273#: builtin/pack-objects.c:2966
ef317cd5 11274msgid "use threads when searching for best delta matches"
07432cef 11275msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 11276
5809aa05 11277#: builtin/pack-objects.c:2968
ef317cd5 11278msgid "do not create an empty pack output"
07432cef 11279msgstr "不创建空的包输出"
ef317cd5 11280
5809aa05 11281#: builtin/pack-objects.c:2970
ef317cd5 11282msgid "read revision arguments from standard input"
d9d56b23 11283msgstr "从标准输入读取版本号参数"
ef317cd5 11284
5809aa05 11285#: builtin/pack-objects.c:2972
ef317cd5 11286msgid "limit the objects to those that are not yet packed"
07432cef 11287msgstr "限制那些尚未打包的对象"
ef317cd5 11288
5809aa05 11289#: builtin/pack-objects.c:2975
ef317cd5 11290msgid "include objects reachable from any reference"
07432cef 11291msgstr "包括可以从任何引用访问到的对象"
ef317cd5 11292
5809aa05 11293#: builtin/pack-objects.c:2978
ef317cd5 11294msgid "include objects referred by reflog entries"
07432cef 11295msgstr "包括被引用日志引用到的对象"
ef317cd5 11296
5809aa05 11297#: builtin/pack-objects.c:2981
220c313c
JX
11298msgid "include objects referred to by the index"
11299msgstr "包括被索引引用到的对象"
11300
5809aa05 11301#: builtin/pack-objects.c:2984
ef317cd5 11302msgid "output pack to stdout"
07432cef 11303msgstr "输出包到标准输出"
ef317cd5 11304
5809aa05 11305#: builtin/pack-objects.c:2986
ef317cd5 11306msgid "include tag objects that refer to objects to be packed"
53438e8f 11307msgstr "包括那些引用了待打包对象的标签对象"
ef317cd5 11308
5809aa05 11309#: builtin/pack-objects.c:2988
ef317cd5 11310msgid "keep unreachable objects"
07432cef 11311msgstr "维持不可达的对象"
ef317cd5 11312
5809aa05 11313#: builtin/pack-objects.c:2990
5c57d762
JX
11314msgid "pack loose unreachable objects"
11315msgstr "打包松散的不可达对象"
11316
5809aa05 11317#: builtin/pack-objects.c:2992
ef317cd5 11318msgid "unpack unreachable objects newer than <time>"
07432cef 11319msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 11320
5809aa05 11321#: builtin/pack-objects.c:2995
ef317cd5 11322msgid "create thin packs"
07432cef 11323msgstr "创建精简包"
ef317cd5 11324
5809aa05 11325#: builtin/pack-objects.c:2997
04cb2f28 11326msgid "create packs suitable for shallow fetches"
160fb2b2 11327msgstr "创建适合浅克隆仓库获取的包"
04cb2f28 11328
5809aa05 11329#: builtin/pack-objects.c:2999
ef317cd5 11330msgid "ignore packs that have companion .keep file"
07432cef 11331msgstr "忽略配有 .keep 文件的包"
ef317cd5 11332
5809aa05 11333#: builtin/pack-objects.c:3001
ef317cd5 11334msgid "pack compression level"
07432cef 11335msgstr "打包压缩级别"
ef317cd5 11336
5809aa05 11337#: builtin/pack-objects.c:3003
ef317cd5 11338msgid "do not hide commits by grafts"
cfff71a9 11339msgstr "显示被嫁接隐藏的提交"
ef317cd5 11340
5809aa05 11341#: builtin/pack-objects.c:3005
6c94aba5
JX
11342msgid "use a bitmap index if available to speed up counting objects"
11343msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
11344
5809aa05 11345#: builtin/pack-objects.c:3007
6c94aba5
JX
11346msgid "write a bitmap index together with the pack index"
11347msgstr "在建立包索引的同时创建 bitmap 索引"
11348
5809aa05
JX
11349#: builtin/pack-objects.c:3010
11350msgid "handling for missing objects"
11351msgstr "处理丢失的对象"
11352
11353#: builtin/pack-objects.c:3144
6c94aba5
JX
11354msgid "Counting objects"
11355msgstr "对象计数中"
11356
ef317cd5 11357#: builtin/pack-refs.c:6
814ff314
JX
11358msgid "git pack-refs [<options>]"
11359msgstr "git pack-refs [<选项>]"
c04f5ac3 11360
ef317cd5
JX
11361#: builtin/pack-refs.c:14
11362msgid "pack everything"
07432cef 11363msgstr "打包一切"
c04f5ac3 11364
ef317cd5
JX
11365#: builtin/pack-refs.c:15
11366msgid "prune loose refs (default)"
07432cef 11367msgstr "清除松散的引用(默认)"
c04f5ac3 11368
6937cb4e 11369#: builtin/prune-packed.c:8
814ff314
JX
11370msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
11371msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
6792b93b 11372
6937cb4e 11373#: builtin/prune-packed.c:41
6c94aba5
JX
11374msgid "Removing duplicate objects"
11375msgstr "正在删除重复对象"
11376
5bb01d4f 11377#: builtin/prune.c:11
5809aa05
JX
11378msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
11379msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
7ac1c0ad 11380
1a79b2f1 11381#: builtin/prune.c:106
1b7f4a34
JX
11382msgid "report pruned objects"
11383msgstr "报告清除的对象"
11384
1a79b2f1 11385#: builtin/prune.c:109
1b7f4a34
JX
11386msgid "expire objects older than <time>"
11387msgstr "使早于给定时间的对象过期"
11388
94550ed3
JX
11389#: builtin/prune.c:123
11390msgid "cannot prune in a precious-objects repo"
11391msgstr "不能在珍品仓库中执行清理操作"
11392
a4f16749 11393#: builtin/pull.c:54 builtin/pull.c:56
a0b6b246
JX
11394#, c-format
11395msgid "Invalid value for %s: %s"
11396msgstr "%s 的值无效:%s"
11397
a4f16749 11398#: builtin/pull.c:76
94550ed3 11399msgid "git pull [<options>] [<repository> [<refspec>...]]"
1b7f4a34
JX
11400msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
11401
5809aa05 11402#: builtin/pull.c:127
a4f16749
JX
11403msgid "control for recursive fetching of submodules"
11404msgstr "控制子模组的递归获取"
11405
5809aa05 11406#: builtin/pull.c:131
1b7f4a34
JX
11407msgid "Options related to merging"
11408msgstr "和合并相关的选项"
11409
5809aa05 11410#: builtin/pull.c:134
1b7f4a34
JX
11411msgid "incorporate changes by rebasing rather than merging"
11412msgstr "使用变基操作取代合并操作以合入修改"
11413
5809aa05 11414#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121
1b7f4a34
JX
11415msgid "allow fast-forward"
11416msgstr "允许快进式"
11417
5809aa05 11418#: builtin/pull.c:170
5b04ee3b 11419msgid "automatically stash/stash pop before and after rebase"
554e8501 11420msgstr "变基操作前后执行自动贮藏和弹出贮藏"
5b04ee3b 11421
5809aa05 11422#: builtin/pull.c:186
1b7f4a34
JX
11423msgid "Options related to fetching"
11424msgstr "和获取相关的参数"
11425
5809aa05 11426#: builtin/pull.c:204
276ceeaa
JX
11427msgid "number of submodules pulled in parallel"
11428msgstr "并发拉取的子模组的数量"
11429
5809aa05 11430#: builtin/pull.c:299
1b7f4a34
JX
11431#, c-format
11432msgid "Invalid value for pull.ff: %s"
11433msgstr "pull.ff 的取值无效:%s"
11434
5809aa05 11435#: builtin/pull.c:415
1b7f4a34
JX
11436msgid ""
11437"There is no candidate for rebasing against among the refs that you just "
11438"fetched."
11439msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
11440
5809aa05 11441#: builtin/pull.c:417
1b7f4a34
JX
11442msgid ""
11443"There are no candidates for merging among the refs that you just fetched."
11444msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
11445
5809aa05 11446#: builtin/pull.c:418
1b7f4a34
JX
11447msgid ""
11448"Generally this means that you provided a wildcard refspec which had no\n"
11449"matches on the remote end."
11450msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
11451
5809aa05 11452#: builtin/pull.c:421
1b7f4a34
JX
11453#, c-format
11454msgid ""
11455"You asked to pull from the remote '%s', but did not specify\n"
11456"a branch. Because this is not the default configured remote\n"
11457"for your current branch, you must specify a branch on the command line."
11458msgstr ""
11459"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
11460"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
11461
5809aa05 11462#: builtin/pull.c:426 git-parse-remote.sh:73
1b7f4a34
JX
11463msgid "You are not currently on a branch."
11464msgstr "您当前不在一个分支上。"
11465
5809aa05 11466#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79
1b7f4a34
JX
11467msgid "Please specify which branch you want to rebase against."
11468msgstr "请指定您要变基到哪一个分支。"
11469
5809aa05 11470#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82
1b7f4a34
JX
11471msgid "Please specify which branch you want to merge with."
11472msgstr "请指定您要合并哪一个分支。"
11473
5809aa05 11474#: builtin/pull.c:431 builtin/pull.c:446
1b7f4a34
JX
11475msgid "See git-pull(1) for details."
11476msgstr "详见 git-pull(1)。"
11477
5809aa05 11478#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448
5b04ee3b
JX
11479#: git-parse-remote.sh:64
11480msgid "<remote>"
11481msgstr "<远程>"
11482
5809aa05 11483#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
5b04ee3b
JX
11484#: git-parse-remote.sh:65
11485msgid "<branch>"
11486msgstr "<分支>"
11487
5809aa05 11488#: builtin/pull.c:441 git-parse-remote.sh:75
1b7f4a34
JX
11489msgid "There is no tracking information for the current branch."
11490msgstr "当前分支没有跟踪信息。"
11491
5809aa05 11492#: builtin/pull.c:450 git-parse-remote.sh:95
1b7f4a34 11493msgid ""
5b04ee3b
JX
11494"If you wish to set tracking information for this branch you can do so with:"
11495msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
7ac1c0ad 11496
5809aa05 11497#: builtin/pull.c:455
1b7f4a34
JX
11498#, c-format
11499msgid ""
11500"Your configuration specifies to merge with the ref '%s'\n"
11501"from the remote, but no such ref was fetched."
11502msgstr ""
11503"您的配置中指定要合并远程的引用 '%s',\n"
11504"但是没有获取到这个引用。"
7ac1c0ad 11505
5809aa05 11506#: builtin/pull.c:817
5c57d762
JX
11507msgid "ignoring --verify-signatures for rebase"
11508msgstr "为变基操作忽略 --verify-signatures"
11509
5809aa05 11510#: builtin/pull.c:865
5b04ee3b
JX
11511msgid "--[no-]autostash option is only valid with --rebase."
11512msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
11513
5809aa05 11514#: builtin/pull.c:873
1b7f4a34
JX
11515msgid "Updating an unborn branch with changes added to the index."
11516msgstr "更新尚未诞生的分支,变更添加至索引。"
11517
5809aa05 11518#: builtin/pull.c:876
a0b6b246
JX
11519msgid "pull with rebase"
11520msgstr "变基式拉取"
11521
5809aa05 11522#: builtin/pull.c:877
a0b6b246 11523msgid "please commit or stash them."
554e8501 11524msgstr "请提交或贮藏它们。"
a0b6b246 11525
5809aa05 11526#: builtin/pull.c:902
1b7f4a34
JX
11527#, c-format
11528msgid ""
11529"fetch updated the current branch head.\n"
11530"fast-forwarding your working tree from\n"
11531"commit %s."
11532msgstr ""
11533"fetch 更新了当前的分支。快进您的工作区\n"
11534"至提交 %s。"
ef317cd5 11535
5809aa05 11536#: builtin/pull.c:907
1b7f4a34
JX
11537#, c-format
11538msgid ""
11539"Cannot fast-forward your working tree.\n"
11540"After making sure that you saved anything precious from\n"
11541"$ git diff %s\n"
11542"output, run\n"
11543"$ git reset --hard\n"
11544"to recover."
11545msgstr ""
11546"您当前的工作区无法执行快进操作。\n"
11547"首先执行如下命令:\n"
11548"$ git diff %s\n"
11549"以确认所有有用的数据均已保存。然后执行下面的命令\n"
11550"$ git reset --hard\n"
11551"恢复之前的状态。"
11552
5809aa05 11553#: builtin/pull.c:922
1b7f4a34
JX
11554msgid "Cannot merge multiple branches into empty head."
11555msgstr "无法将多个分支合并到空分支。"
11556
5809aa05 11557#: builtin/pull.c:926
1b7f4a34
JX
11558msgid "Cannot rebase onto multiple branches."
11559msgstr "无法变基到多个分支。"
11560
5809aa05 11561#: builtin/pull.c:933
a4f16749
JX
11562msgid "cannot rebase with locally recorded submodule modifications"
11563msgstr "本地子模组中有修改,无法变基"
11564
11565#: builtin/push.c:17
ef317cd5 11566msgid "git push [<options>] [<repository> [<refspec>...]]"
160fb2b2 11567msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
7ac1c0ad 11568
5809aa05 11569#: builtin/push.c:92
c04f5ac3 11570msgid "tag shorthand without <tag>"
55a16ee4 11571msgstr "标签后面未提供 <标签> 参数"
c04f5ac3 11572
5809aa05 11573#: builtin/push.c:102
c04f5ac3 11574msgid "--delete only accepts plain target ref names"
90e6ef53 11575msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 11576
5809aa05 11577#: builtin/push.c:146
8ada9598
JX
11578msgid ""
11579"\n"
11580"To choose either option permanently, see push.default in 'git help config'."
11581msgstr ""
81809b99
JX
11582"\n"
11583"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 11584
5809aa05 11585#: builtin/push.c:149
8ada9598
JX
11586#, c-format
11587msgid ""
11588"The upstream branch of your current branch does not match\n"
11589"the name of your current branch. To push to the upstream branch\n"
11590"on the remote, use\n"
11591"\n"
11592" git push %s HEAD:%s\n"
11593"\n"
11594"To push to the branch of the same name on the remote, use\n"
11595"\n"
11596" git push %s %s\n"
11597"%s"
11598msgstr ""
81809b99
JX
11599"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
11600"上游分支,使用\n"
11601"\n"
11602" git push %s HEAD:%s\n"
11603"\n"
11604"为推送至远程同名分支,使用\n"
11605"\n"
11606" git push %s %s\n"
11607"%s"
8ada9598 11608
5809aa05 11609#: builtin/push.c:164
c04f5ac3
JX
11610#, c-format
11611msgid ""
11612"You are not currently on a branch.\n"
11613"To push the history leading to the current (detached HEAD)\n"
11614"state now, use\n"
11615"\n"
11616" git push %s HEAD:<name-of-remote-branch>\n"
11617msgstr ""
11618"您当前不在一个分支上。\n"
90e6ef53 11619"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3 11620"\n"
d9d56b23 11621" git push %s HEAD:<远程分支名字>\n"
c04f5ac3 11622
5809aa05 11623#: builtin/push.c:178
c04f5ac3
JX
11624#, c-format
11625msgid ""
11626"The current branch %s has no upstream branch.\n"
11627"To push the current branch and set the remote as upstream, use\n"
11628"\n"
11629" git push --set-upstream %s %s\n"
11630msgstr ""
11631"当前分支 %s 没有对应的上游分支。\n"
11632"为推送当前分支并建立与远程上游的跟踪,使用\n"
11633"\n"
11634" git push --set-upstream %s %s\n"
11635
5809aa05 11636#: builtin/push.c:186
c04f5ac3
JX
11637#, c-format
11638msgid "The current branch %s has multiple upstream branches, refusing to push."
11639msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
11640
5809aa05 11641#: builtin/push.c:189
73a60cd2
JX
11642#, c-format
11643msgid ""
11644"You are pushing to remote '%s', which is not the upstream of\n"
11645"your current branch '%s', without telling me what to push\n"
11646"to update which remote branch."
11647msgstr ""
11648"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
11649"而没有告诉我要推送什么、更新哪个远程分支。"
11650
5809aa05 11651#: builtin/push.c:248
c04f5ac3
JX
11652msgid ""
11653"You didn't specify any refspecs to push, and push.default is \"nothing\"."
160fb2b2 11654msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
c04f5ac3 11655
5809aa05 11656#: builtin/push.c:255
170e9899
JX
11657msgid ""
11658"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
11659"its remote counterpart. Integrate the remote changes (e.g.\n"
11660"'git pull ...') before pushing again.\n"
170e9899
JX
11661"See the 'Note about fast-forwards' in 'git push --help' for details."
11662msgstr ""
eff6d3a9 11663"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 11664"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 11665"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 11666
5809aa05 11667#: builtin/push.c:261
170e9899
JX
11668msgid ""
11669"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
11670"counterpart. Check out this branch and integrate the remote changes\n"
11671"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
11672"See the 'Note about fast-forwards' in 'git push --help' for details."
11673msgstr ""
eff6d3a9 11674"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 11675"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 11676"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 11677
5809aa05 11678#: builtin/push.c:267
07432cef 11679msgid ""
a77c07d9
JX
11680"Updates were rejected because the remote contains work that you do\n"
11681"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
11682"to the same ref. You may want to first integrate the remote changes\n"
11683"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
11684"See the 'Note about fast-forwards' in 'git push --help' for details."
11685msgstr ""
160fb2b2
JX
11686"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
11687"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
2e8451e8 11688"(如 'git pull ...')。\n"
a77c07d9
JX
11689"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
11690
5809aa05 11691#: builtin/push.c:274
a77c07d9 11692msgid "Updates were rejected because the tag already exists in the remote."
55a16ee4 11693msgstr "更新被拒绝,因为该标签在远程已经存在。"
a77c07d9 11694
5809aa05 11695#: builtin/push.c:277
a77c07d9
JX
11696msgid ""
11697"You cannot update a remote ref that points at a non-commit object,\n"
11698"or update a remote ref to make it point at a non-commit object,\n"
11699"without using the '--force' option.\n"
11700msgstr ""
11701"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
11702"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 11703
5809aa05 11704#: builtin/push.c:337
c04f5ac3
JX
11705#, c-format
11706msgid "Pushing to %s\n"
11707msgstr "推送到 %s\n"
11708
5809aa05 11709#: builtin/push.c:341
c04f5ac3
JX
11710#, c-format
11711msgid "failed to push some refs to '%s'"
11712msgstr "无法推送一些引用到 '%s'"
11713
5809aa05 11714#: builtin/push.c:372
c04f5ac3
JX
11715#, c-format
11716msgid "bad repository '%s'"
160fb2b2 11717msgstr "坏的仓库 '%s'"
c04f5ac3 11718
5809aa05 11719#: builtin/push.c:373
c04f5ac3
JX
11720msgid ""
11721"No configured push destination.\n"
11722"Either specify the URL from the command-line or configure a remote "
11723"repository using\n"
11724"\n"
11725" git remote add <name> <url>\n"
11726"\n"
11727"and then push using the remote name\n"
11728"\n"
11729" git push <name>\n"
11730msgstr ""
90e6ef53 11731"没有配置推送目标。\n"
4375c10e 11732"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
c04f5ac3 11733"\n"
d9d56b23 11734" git remote add <名称> <地址>\n"
c04f5ac3 11735"\n"
160fb2b2 11736"然后使用该远程仓库名执行推送\n"
c04f5ac3 11737"\n"
d9d56b23 11738" git push <名称>\n"
c04f5ac3 11739
5809aa05 11740#: builtin/push.c:391
c04f5ac3
JX
11741msgid "--all and --tags are incompatible"
11742msgstr "--all 和 --tags 不兼容"
11743
5809aa05 11744#: builtin/push.c:392
c04f5ac3 11745msgid "--all can't be combined with refspecs"
160fb2b2 11746msgstr "--all 不能和引用规格同时使用"
c04f5ac3 11747
5809aa05 11748#: builtin/push.c:397
c04f5ac3
JX
11749msgid "--mirror and --tags are incompatible"
11750msgstr "--mirror 和 --tags 不兼容"
11751
5809aa05 11752#: builtin/push.c:398
c04f5ac3 11753msgid "--mirror can't be combined with refspecs"
160fb2b2 11754msgstr "--mirror 不能和引用规格同时使用"
c04f5ac3 11755
5809aa05 11756#: builtin/push.c:403
c04f5ac3
JX
11757msgid "--all and --mirror are incompatible"
11758msgstr "--all 和 --mirror 不兼容"
11759
5809aa05 11760#: builtin/push.c:535
ef317cd5 11761msgid "repository"
160fb2b2 11762msgstr "仓库"
ef317cd5 11763
5809aa05 11764#: builtin/push.c:536 builtin/send-pack.c:163
ef317cd5 11765msgid "push all refs"
07432cef 11766msgstr "推送所有引用"
ef317cd5 11767
5809aa05 11768#: builtin/push.c:537 builtin/send-pack.c:165
ef317cd5 11769msgid "mirror all refs"
07432cef 11770msgstr "镜像所有引用"
ef317cd5 11771
5809aa05 11772#: builtin/push.c:539
ef317cd5 11773msgid "delete refs"
07432cef 11774msgstr "删除引用"
ef317cd5 11775
5809aa05 11776#: builtin/push.c:540
ef317cd5 11777msgid "push tags (can't be used with --all or --mirror)"
55a16ee4 11778msgstr "推送标签(不能使用 --all or --mirror)"
ef317cd5 11779
5809aa05 11780#: builtin/push.c:543 builtin/send-pack.c:166
ef317cd5
JX
11781msgid "force updates"
11782msgstr "强制更新"
11783
5809aa05 11784#: builtin/push.c:545 builtin/send-pack.c:180
90314792
JX
11785msgid "refname>:<expect"
11786msgstr "引用名>:<期望值"
11787
5809aa05 11788#: builtin/push.c:546 builtin/send-pack.c:181
90314792
JX
11789msgid "require old value of ref to be at this value"
11790msgstr "要求引用旧的取值为设定值"
11791
5809aa05 11792#: builtin/push.c:549
ef317cd5 11793msgid "control recursive pushing of submodules"
07432cef 11794msgstr "控制子模组的递归推送"
ef317cd5 11795
5809aa05 11796#: builtin/push.c:551 builtin/send-pack.c:174
ef317cd5 11797msgid "use thin pack"
07432cef 11798msgstr "使用精简打包"
ef317cd5 11799
5809aa05 11800#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160
a4f16749 11801#: builtin/send-pack.c:161
ef317cd5 11802msgid "receive pack program"
07432cef 11803msgstr "接收包程序"
ef317cd5 11804
5809aa05 11805#: builtin/push.c:554
ef317cd5 11806msgid "set upstream for git pull/status"
07432cef 11807msgstr "设置 git pull/status 的上游"
ef317cd5 11808
5809aa05 11809#: builtin/push.c:557
ef317cd5 11810msgid "prune locally removed refs"
07432cef 11811msgstr "清除本地删除的引用"
ef317cd5 11812
5809aa05 11813#: builtin/push.c:559
a77c07d9
JX
11814msgid "bypass pre-push hook"
11815msgstr "绕过 pre-push 钩子"
11816
5809aa05 11817#: builtin/push.c:560
1003b3a5 11818msgid "push missing but relevant tags"
55a16ee4 11819msgstr "推送缺失但有关的标签"
1003b3a5 11820
5809aa05 11821#: builtin/push.c:563 builtin/send-pack.c:168
220c313c
JX
11822msgid "GPG sign the push"
11823msgstr "用 GPG 为推送签名"
11824
5809aa05 11825#: builtin/push.c:565 builtin/send-pack.c:175
814ff314
JX
11826msgid "request atomic transaction on remote side"
11827msgstr "需要远端支持原子事务"
11828
5809aa05 11829#: builtin/push.c:566 builtin/send-pack.c:171
5c57d762
JX
11830msgid "server-specific"
11831msgstr "server-specific"
11832
5809aa05 11833#: builtin/push.c:566 builtin/send-pack.c:172
5c57d762 11834msgid "option to transmit"
9a4b694c 11835msgstr "传输选项"
5c57d762 11836
5809aa05 11837#: builtin/push.c:583
c04f5ac3
JX
11838msgid "--delete is incompatible with --all, --mirror and --tags"
11839msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
11840
5809aa05 11841#: builtin/push.c:585
c04f5ac3
JX
11842msgid "--delete doesn't make sense without any refs"
11843msgstr "--delete 未接任何引用没有意义"
11844
5809aa05 11845#: builtin/push.c:604
5c57d762
JX
11846msgid "push options must not have new line characters"
11847msgstr "推送选项不能有换行符"
11848
87cb7997 11849#: builtin/read-tree.c:40
ef317cd5 11850msgid ""
1b7f4a34 11851"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
ef317cd5
JX
11852"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
11853"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
11854msgstr ""
1b7f4a34 11855"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
07432cef 11856"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
1b7f4a34 11857"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
ef317cd5 11858
a4f16749 11859#: builtin/read-tree.c:121
ef317cd5 11860msgid "write resulting index to <file>"
d9d56b23 11861msgstr "将索引结果写入 <文件>"
ef317cd5 11862
a4f16749 11863#: builtin/read-tree.c:124
ef317cd5 11864msgid "only empty the index"
07432cef 11865msgstr "只是清空索引"
ef317cd5 11866
a4f16749 11867#: builtin/read-tree.c:126
ef317cd5 11868msgid "Merging"
07432cef 11869msgstr "合并"
ef317cd5 11870
a4f16749 11871#: builtin/read-tree.c:128
ef317cd5 11872msgid "perform a merge in addition to a read"
07432cef 11873msgstr "读取之余再执行一个合并"
ef317cd5 11874
a4f16749 11875#: builtin/read-tree.c:130
ef317cd5 11876msgid "3-way merge if no file level merging required"
160fb2b2 11877msgstr "如果没有文件级合并需要,执行三方合并"
ef317cd5 11878
a4f16749 11879#: builtin/read-tree.c:132
ef317cd5 11880msgid "3-way merge in presence of adds and removes"
160fb2b2 11881msgstr "存在添加和删除时,也执行三方合并"
ef317cd5 11882
a4f16749 11883#: builtin/read-tree.c:134
ef317cd5 11884msgid "same as -m, but discard unmerged entries"
07432cef 11885msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 11886
a4f16749 11887#: builtin/read-tree.c:135
ef317cd5 11888msgid "<subdirectory>/"
07432cef 11889msgstr "<子目录>/"
ef317cd5 11890
a4f16749 11891#: builtin/read-tree.c:136
ef317cd5 11892msgid "read the tree into the index under <subdirectory>/"
07432cef 11893msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 11894
a4f16749 11895#: builtin/read-tree.c:139
ef317cd5 11896msgid "update working tree with merge result"
07432cef 11897msgstr "用合并的结果更新工作区"
ef317cd5 11898
a4f16749 11899#: builtin/read-tree.c:141
ef317cd5 11900msgid "gitignore"
07432cef 11901msgstr "gitignore"
ef317cd5 11902
a4f16749 11903#: builtin/read-tree.c:142
ef317cd5 11904msgid "allow explicitly ignored files to be overwritten"
07432cef 11905msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 11906
a4f16749 11907#: builtin/read-tree.c:145
ef317cd5 11908msgid "don't check the working tree after merging"
07432cef 11909msgstr "合并后不检查工作区"
ef317cd5 11910
a4f16749 11911#: builtin/read-tree.c:146
ef317cd5 11912msgid "don't update the index or the work tree"
07432cef 11913msgstr "不更新索引区和工作区"
ef317cd5 11914
a4f16749 11915#: builtin/read-tree.c:148
ef317cd5 11916msgid "skip applying sparse checkout filter"
07432cef 11917msgstr "跳过应用稀疏检出过滤器"
ef317cd5 11918
a4f16749 11919#: builtin/read-tree.c:150
ef317cd5 11920msgid "debug unpack-trees"
07432cef 11921msgstr "调试 unpack-trees"
ef317cd5 11922
a4f16749 11923#: builtin/rebase--helper.c:8
87cb7997
JX
11924msgid "git rebase--helper [<options>]"
11925msgstr "git rebase--helper [<选项>]"
11926
5809aa05 11927#: builtin/rebase--helper.c:24
6937cb4e
JX
11928msgid "keep empty commits"
11929msgstr "保持空提交"
11930
5809aa05 11931#: builtin/rebase--helper.c:25
87cb7997
JX
11932msgid "continue rebase"
11933msgstr "继续变基"
11934
5809aa05 11935#: builtin/rebase--helper.c:27
87cb7997
JX
11936msgid "abort rebase"
11937msgstr "中止变基"
11938
5809aa05 11939#: builtin/rebase--helper.c:30
6937cb4e
JX
11940msgid "make rebase script"
11941msgstr "制作变基脚本"
11942
6937cb4e 11943#: builtin/rebase--helper.c:32
5809aa05
JX
11944msgid "shorten commit ids in the todo list"
11945msgstr "缩短待办列表中的提交号"
6937cb4e
JX
11946
11947#: builtin/rebase--helper.c:34
5809aa05
JX
11948msgid "expand commit ids in the todo list"
11949msgstr "扩展待办列表中的提交号"
11950
11951#: builtin/rebase--helper.c:36
6937cb4e
JX
11952msgid "check the todo list"
11953msgstr "检查待办列表"
11954
5809aa05 11955#: builtin/rebase--helper.c:38
6937cb4e
JX
11956msgid "skip unnecessary picks"
11957msgstr "跳过不必要的拣选"
11958
5809aa05 11959#: builtin/rebase--helper.c:40
6937cb4e
JX
11960msgid "rearrange fixup/squash lines"
11961msgstr "重新排列 fixup/squash 行"
11962
5809aa05
JX
11963#: builtin/rebase--helper.c:42
11964msgid "insert exec commands in todo list"
11965msgstr "在待办列表中插入 exec 执行命令"
11966
11967#: builtin/receive-pack.c:30
5b04ee3b 11968msgid "git receive-pack <git-dir>"
58b6f078 11969msgstr "git receive-pack <仓库目录>"
5b04ee3b 11970
5809aa05 11971#: builtin/receive-pack.c:840
a0b6b246
JX
11972msgid ""
11973"By default, updating the current branch in a non-bare repository\n"
11974"is denied, because it will make the index and work tree inconsistent\n"
11975"with what you pushed, and will require 'git reset --hard' to match\n"
11976"the work tree to HEAD.\n"
11977"\n"
1a79b2f1
JX
11978"You can set the 'receive.denyCurrentBranch' configuration variable\n"
11979"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
a0b6b246
JX
11980"its current branch; however, this is not recommended unless you\n"
11981"arranged to update its work tree to match what you pushed in some\n"
11982"other way.\n"
11983"\n"
11984"To squelch this message and still keep the default behaviour, set\n"
11985"'receive.denyCurrentBranch' configuration variable to 'refuse'."
11986msgstr ""
11987"默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
11988"不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
11989"\n"
11990"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
11991"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
11992"用某种方式将其工作区更新至您推送的状态。\n"
11993"\n"
11994"若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
11995"配置变量为 'refuse'。"
11996
5809aa05 11997#: builtin/receive-pack.c:860
a0b6b246
JX
11998msgid ""
11999"By default, deleting the current branch is denied, because the next\n"
12000"'git clone' won't result in any file checked out, causing confusion.\n"
12001"\n"
12002"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
12003"'warn' or 'ignore' in the remote repository to allow deleting the\n"
12004"current branch, with or without a warning message.\n"
12005"\n"
12006"To squelch this message, you can set it to 'refuse'."
12007msgstr ""
12008"默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
29004bbb 12009"导致困惑。\n"
a0b6b246
JX
12010"\n"
12011"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
29004bbb 12012"'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
a0b6b246
JX
12013"\n"
12014"若要屏蔽此信息,您可以设置它为 'refuse'。"
12015
5809aa05 12016#: builtin/receive-pack.c:1933
5b04ee3b
JX
12017msgid "quiet"
12018msgstr "静默模式"
12019
5809aa05 12020#: builtin/receive-pack.c:1947
5b04ee3b
JX
12021msgid "You must specify a directory."
12022msgstr "您必须指定一个目录。"
12023
5809aa05 12024#: builtin/reflog.c:531 builtin/reflog.c:536
2e8451e8
JX
12025#, c-format
12026msgid "'%s' is not a valid timestamp"
12027msgstr "'%s' 不是一个有效的时间戳"
12028
a4f16749 12029#: builtin/remote.c:13
ef317cd5 12030msgid "git remote [-v | --verbose]"
07432cef 12031msgstr "git remote [-v | --verbose]"
ef317cd5 12032
a4f16749 12033#: builtin/remote.c:14
ef317cd5 12034msgid ""
814ff314 12035"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
ef317cd5
JX
12036"mirror=<fetch|push>] <name> <url>"
12037msgstr ""
814ff314 12038"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
d9d56b23 12039"mirror=<fetch|push>] <名称> <地址>"
ef317cd5 12040
a4f16749 12041#: builtin/remote.c:15 builtin/remote.c:35
ef317cd5 12042msgid "git remote rename <old> <new>"
07432cef 12043msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 12044
a4f16749 12045#: builtin/remote.c:16 builtin/remote.c:40
ef317cd5 12046msgid "git remote remove <name>"
07432cef 12047msgstr "git remote remove <名称>"
ef317cd5 12048
a4f16749 12049#: builtin/remote.c:17 builtin/remote.c:45
814ff314
JX
12050msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
12051msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
ef317cd5 12052
a4f16749 12053#: builtin/remote.c:18
ef317cd5 12054msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 12055msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 12056
a4f16749 12057#: builtin/remote.c:19
ef317cd5 12058msgid "git remote prune [-n | --dry-run] <name>"
07432cef 12059msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 12060
a4f16749 12061#: builtin/remote.c:20
ef317cd5
JX
12062msgid ""
12063"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 12064msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 12065
a4f16749 12066#: builtin/remote.c:21
ef317cd5 12067msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 12068msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 12069
a4f16749 12070#: builtin/remote.c:22 builtin/remote.c:71
94550ed3
JX
12071msgid "git remote get-url [--push] [--all] <name>"
12072msgstr "git remote get-url [--push] [--all] <名称>"
12073
a4f16749 12074#: builtin/remote.c:23 builtin/remote.c:76
ef317cd5 12075msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 12076msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 12077
a4f16749 12078#: builtin/remote.c:24 builtin/remote.c:77
ef317cd5 12079msgid "git remote set-url --add <name> <newurl>"
07432cef 12080msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 12081
a4f16749 12082#: builtin/remote.c:25 builtin/remote.c:78
ef317cd5 12083msgid "git remote set-url --delete <name> <url>"
07432cef 12084msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 12085
a4f16749 12086#: builtin/remote.c:30
ef317cd5 12087msgid "git remote add [<options>] <name> <url>"
07432cef 12088msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 12089
a4f16749 12090#: builtin/remote.c:50
ef317cd5 12091msgid "git remote set-branches <name> <branch>..."
07432cef 12092msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 12093
a4f16749 12094#: builtin/remote.c:51
ef317cd5 12095msgid "git remote set-branches --add <name> <branch>..."
07432cef 12096msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 12097
a4f16749 12098#: builtin/remote.c:56
ef317cd5 12099msgid "git remote show [<options>] <name>"
07432cef 12100msgstr "git remote show [<选项>] <名称>"
ef317cd5 12101
a4f16749 12102#: builtin/remote.c:61
ef317cd5 12103msgid "git remote prune [<options>] <name>"
07432cef 12104msgstr "git remote prune [<选项>] <名称>"
ef317cd5 12105
a4f16749 12106#: builtin/remote.c:66
ef317cd5 12107msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 12108msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 12109
a4f16749 12110#: builtin/remote.c:95
81809b99 12111#, c-format
8ada9598 12112msgid "Updating %s"
81809b99 12113msgstr "更新 %s 中"
8ada9598 12114
a4f16749 12115#: builtin/remote.c:127
8ada9598
JX
12116msgid ""
12117"--mirror is dangerous and deprecated; please\n"
12118"\t use --mirror=fetch or --mirror=push instead"
12119msgstr ""
81809b99
JX
12120"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
12121"\t 或 --mirror=push"
8ada9598 12122
a4f16749 12123#: builtin/remote.c:144
81809b99 12124#, c-format
8ada9598 12125msgid "unknown mirror argument: %s"
81809b99 12126msgstr "未知的镜像参数:%s"
8ada9598 12127
a4f16749 12128#: builtin/remote.c:160
ef317cd5 12129msgid "fetch the remote branches"
07432cef 12130msgstr "抓取远程的分支"
ef317cd5 12131
a4f16749 12132#: builtin/remote.c:162
ef317cd5 12133msgid "import all tags and associated objects when fetching"
55a16ee4 12134msgstr "抓取时导入所有的标签和关联对象"
ef317cd5 12135
a4f16749 12136#: builtin/remote.c:165
ef317cd5 12137msgid "or do not fetch any tag at all (--no-tags)"
55a16ee4 12138msgstr "或不抓取任何标签(--no-tags)"
ef317cd5 12139
a4f16749 12140#: builtin/remote.c:167
ef317cd5 12141msgid "branch(es) to track"
07432cef 12142msgstr "跟踪的分支"
ef317cd5 12143
a4f16749 12144#: builtin/remote.c:168
ef317cd5 12145msgid "master branch"
07432cef 12146msgstr "主线分支"
ef317cd5 12147
a4f16749 12148#: builtin/remote.c:169
ef317cd5 12149msgid "push|fetch"
07432cef 12150msgstr "push|fetch"
ef317cd5 12151
a4f16749 12152#: builtin/remote.c:170
ef317cd5 12153msgid "set up remote as a mirror to push to or fetch from"
07432cef 12154msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 12155
a4f16749 12156#: builtin/remote.c:182
8ada9598 12157msgid "specifying a master branch makes no sense with --mirror"
81809b99 12158msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 12159
a4f16749 12160#: builtin/remote.c:184
8ada9598 12161msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 12162msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 12163
6937cb4e 12164#: builtin/remote.c:191 builtin/remote.c:631
81809b99 12165#, c-format
8ada9598 12166msgid "remote %s already exists."
81809b99 12167msgstr "远程 %s 已经存在。"
8ada9598 12168
6937cb4e 12169#: builtin/remote.c:195 builtin/remote.c:635
81809b99 12170#, c-format
8ada9598 12171msgid "'%s' is not a valid remote name"
81809b99 12172msgstr "'%s' 不是一个有效的远程名称"
8ada9598 12173
a4f16749 12174#: builtin/remote.c:235
81809b99 12175#, c-format
8ada9598 12176msgid "Could not setup master '%s'"
81809b99 12177msgstr "无法设置 master '%s'"
8ada9598 12178
a4f16749 12179#: builtin/remote.c:337
81809b99 12180#, c-format
8ada9598 12181msgid "Could not get fetch map for refspec %s"
160fb2b2 12182msgstr "无法得到引用规格 %s 的获取列表"
8ada9598 12183
a4f16749 12184#: builtin/remote.c:438 builtin/remote.c:446
8ada9598 12185msgid "(matching)"
81809b99 12186msgstr "(匹配)"
8ada9598 12187
a4f16749 12188#: builtin/remote.c:450
8ada9598 12189msgid "(delete)"
81809b99 12190msgstr "(删除)"
8ada9598 12191
6937cb4e 12192#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
81809b99 12193#, c-format
8ada9598 12194msgid "No such remote: %s"
81809b99 12195msgstr "没有这样的远程:%s"
8ada9598 12196
6937cb4e 12197#: builtin/remote.c:641
81809b99 12198#, c-format
8ada9598 12199msgid "Could not rename config section '%s' to '%s'"
81809b99 12200msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 12201
6937cb4e 12202#: builtin/remote.c:661
8ada9598
JX
12203#, c-format
12204msgid ""
d691f479 12205"Not updating non-default fetch refspec\n"
8ada9598
JX
12206"\t%s\n"
12207"\tPlease update the configuration manually if necessary."
12208msgstr ""
160fb2b2 12209"没有更新非默认的获取引用规格\n"
81809b99
JX
12210"\t%s\n"
12211"\t如果必要请手动更新配置。"
8ada9598 12212
6937cb4e 12213#: builtin/remote.c:697
81809b99 12214#, c-format
8ada9598 12215msgid "deleting '%s' failed"
81809b99 12216msgstr "删除 '%s' 失败"
8ada9598 12217
6937cb4e 12218#: builtin/remote.c:731
81809b99 12219#, c-format
8ada9598 12220msgid "creating '%s' failed"
81809b99 12221msgstr "创建 '%s' 失败"
8ada9598 12222
6937cb4e 12223#: builtin/remote.c:796
8ada9598
JX
12224msgid ""
12225"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
12226"to delete it, use:"
12227msgid_plural ""
12228"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
12229"to delete them, use:"
5ae481e0
JX
12230msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
12231msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 12232
6937cb4e 12233#: builtin/remote.c:810
276ceeaa
JX
12234#, c-format
12235msgid "Could not remove config section '%s'"
12236msgstr "不能移除配置小节 '%s'"
12237
6937cb4e 12238#: builtin/remote.c:911
8ada9598
JX
12239#, c-format
12240msgid " new (next fetch will store in remotes/%s)"
81809b99 12241msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 12242
6937cb4e 12243#: builtin/remote.c:914
8ada9598 12244msgid " tracked"
81809b99 12245msgstr " 已跟踪"
8ada9598 12246
6937cb4e 12247#: builtin/remote.c:916
8ada9598 12248msgid " stale (use 'git remote prune' to remove)"
81809b99 12249msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 12250
6937cb4e 12251#: builtin/remote.c:918
8ada9598 12252msgid " ???"
81809b99 12253msgstr " ???"
8ada9598 12254
6937cb4e 12255#: builtin/remote.c:959
8ada9598
JX
12256#, c-format
12257msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 12258msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 12259
6937cb4e 12260#: builtin/remote.c:967
81809b99 12261#, c-format
276ceeaa
JX
12262msgid "rebases interactively onto remote %s"
12263msgstr "交互式变基到远程 %s"
8ada9598 12264
6937cb4e 12265#: builtin/remote.c:968
5c57d762
JX
12266#, c-format
12267msgid "rebases onto remote %s"
12268msgstr "变基到远程 %s"
12269
6937cb4e 12270#: builtin/remote.c:971
81809b99 12271#, c-format
8ada9598 12272msgid " merges with remote %s"
81809b99 12273msgstr " 与远程 %s 合并"
8ada9598 12274
6937cb4e 12275#: builtin/remote.c:974
81809b99 12276#, c-format
8ada9598 12277msgid "merges with remote %s"
81809b99 12278msgstr "与远程 %s 合并"
8ada9598 12279
6937cb4e 12280#: builtin/remote.c:977
5c57d762
JX
12281#, c-format
12282msgid "%-*s and with remote %s\n"
12283msgstr "%-*s 以及和远程 %s\n"
8ada9598 12284
6937cb4e 12285#: builtin/remote.c:1020
8ada9598 12286msgid "create"
81809b99 12287msgstr "创建"
8ada9598 12288
6937cb4e 12289#: builtin/remote.c:1023
8ada9598 12290msgid "delete"
81809b99 12291msgstr "删除"
8ada9598 12292
6937cb4e 12293#: builtin/remote.c:1027
8ada9598 12294msgid "up to date"
81809b99 12295msgstr "最新"
8ada9598 12296
6937cb4e 12297#: builtin/remote.c:1030
8ada9598 12298msgid "fast-forwardable"
81809b99 12299msgstr "可快进"
8ada9598 12300
6937cb4e 12301#: builtin/remote.c:1033
8ada9598 12302msgid "local out of date"
81809b99 12303msgstr "本地已过时"
8ada9598 12304
6937cb4e 12305#: builtin/remote.c:1040
8ada9598
JX
12306#, c-format
12307msgid " %-*s forces to %-*s (%s)"
81809b99 12308msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 12309
6937cb4e 12310#: builtin/remote.c:1043
8ada9598
JX
12311#, c-format
12312msgid " %-*s pushes to %-*s (%s)"
81809b99 12313msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 12314
6937cb4e 12315#: builtin/remote.c:1047
8ada9598
JX
12316#, c-format
12317msgid " %-*s forces to %s"
81809b99 12318msgstr " %-*s 强制推送至 %s"
8ada9598 12319
6937cb4e 12320#: builtin/remote.c:1050
8ada9598
JX
12321#, c-format
12322msgid " %-*s pushes to %s"
81809b99 12323msgstr " %-*s 推送至 %s"
8ada9598 12324
6937cb4e 12325#: builtin/remote.c:1118
ef317cd5 12326msgid "do not query remotes"
07432cef 12327msgstr "不查询远程"
ef317cd5 12328
6937cb4e 12329#: builtin/remote.c:1145
81809b99 12330#, c-format
8ada9598 12331msgid "* remote %s"
81809b99 12332msgstr "* 远程 %s"
8ada9598 12333
6937cb4e 12334#: builtin/remote.c:1146
8ada9598
JX
12335#, c-format
12336msgid " Fetch URL: %s"
81809b99 12337msgstr " 获取地址:%s"
8ada9598 12338
6937cb4e 12339#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
8ada9598 12340msgid "(no URL)"
81809b99 12341msgstr "(无 URL)"
8ada9598 12342
a4f16749
JX
12343#. TRANSLATORS: the colon ':' should align
12344#. with the one in " Fetch URL: %s"
12345#. translation.
12346#.
6937cb4e 12347#: builtin/remote.c:1161 builtin/remote.c:1163
8ada9598
JX
12348#, c-format
12349msgid " Push URL: %s"
81809b99 12350msgstr " 推送地址:%s"
8ada9598 12351
6937cb4e 12352#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
81809b99 12353#, c-format
8ada9598 12354msgid " HEAD branch: %s"
4375c10e 12355msgstr " HEAD 分支:%s"
8ada9598 12356
5c57d762 12357# 译者:中文字符串拼接,可删除前导空格
6937cb4e 12358#: builtin/remote.c:1165
5c57d762
JX
12359msgid "(not queried)"
12360msgstr "(未查询)"
12361
6937cb4e 12362#: builtin/remote.c:1167
5c57d762
JX
12363msgid "(unknown)"
12364msgstr "(未知)"
12365
6937cb4e 12366#: builtin/remote.c:1171
8ada9598
JX
12367#, c-format
12368msgid ""
12369" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 12370msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 12371
6937cb4e 12372#: builtin/remote.c:1183
81809b99 12373#, c-format
8ada9598
JX
12374msgid " Remote branch:%s"
12375msgid_plural " Remote branches:%s"
81809b99 12376msgstr[0] " 远程分支:%s"
5ae481e0 12377msgstr[1] " 远程分支:%s"
8ada9598 12378
81809b99 12379# 译者:中文字符串拼接,可删除前导空格
6937cb4e 12380#: builtin/remote.c:1186 builtin/remote.c:1212
8ada9598 12381msgid " (status not queried)"
81809b99 12382msgstr "(状态未查询)"
8ada9598 12383
6937cb4e 12384#: builtin/remote.c:1195
8ada9598
JX
12385msgid " Local branch configured for 'git pull':"
12386msgid_plural " Local branches configured for 'git pull':"
81809b99 12387msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 12388msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 12389
6937cb4e 12390#: builtin/remote.c:1203
8ada9598 12391msgid " Local refs will be mirrored by 'git push'"
81809b99 12392msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 12393
6937cb4e 12394#: builtin/remote.c:1209
81809b99 12395#, c-format
8ada9598
JX
12396msgid " Local ref configured for 'git push'%s:"
12397msgid_plural " Local refs configured for 'git push'%s:"
81809b99 12398msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 12399msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 12400
6937cb4e 12401#: builtin/remote.c:1230
ef317cd5 12402msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 12403msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 12404
6937cb4e 12405#: builtin/remote.c:1232
ef317cd5 12406msgid "delete refs/remotes/<name>/HEAD"
07432cef 12407msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 12408
6937cb4e 12409#: builtin/remote.c:1247
8ada9598 12410msgid "Cannot determine remote HEAD"
81809b99 12411msgstr "无法确定远程 HEAD"
8ada9598 12412
6937cb4e 12413#: builtin/remote.c:1249
8ada9598 12414msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 12415msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 12416
6937cb4e 12417#: builtin/remote.c:1259
81809b99 12418#, c-format
8ada9598 12419msgid "Could not delete %s"
81809b99 12420msgstr "无法删除 %s"
8ada9598 12421
6937cb4e 12422#: builtin/remote.c:1267
81809b99 12423#, c-format
8ada9598 12424msgid "Not a valid ref: %s"
81809b99 12425msgstr "不是一个有效引用:%s"
8ada9598 12426
6937cb4e 12427#: builtin/remote.c:1269
81809b99 12428#, c-format
8ada9598 12429msgid "Could not setup %s"
81809b99 12430msgstr "不能设置 %s"
8ada9598
JX
12431
12432# 译者:注意保持前导空格
6937cb4e 12433#: builtin/remote.c:1287
81809b99 12434#, c-format
8ada9598 12435msgid " %s will become dangling!"
07432cef 12436msgstr " %s 将成为摇摆状态!"
8ada9598
JX
12437
12438# 译者:注意保持前导空格
6937cb4e 12439#: builtin/remote.c:1288
81809b99 12440#, c-format
8ada9598 12441msgid " %s has become dangling!"
07432cef 12442msgstr " %s 已成为摇摆状态!"
8ada9598 12443
6937cb4e 12444#: builtin/remote.c:1298
81809b99 12445#, c-format
8ada9598 12446msgid "Pruning %s"
81809b99 12447msgstr "修剪 %s"
8ada9598 12448
6937cb4e 12449#: builtin/remote.c:1299
8ada9598
JX
12450#, c-format
12451msgid "URL: %s"
81809b99 12452msgstr "URL:%s"
8ada9598 12453
6937cb4e 12454#: builtin/remote.c:1315
8ada9598
JX
12455#, c-format
12456msgid " * [would prune] %s"
81809b99 12457msgstr " * [将删除] %s"
8ada9598 12458
6937cb4e 12459#: builtin/remote.c:1318
8ada9598
JX
12460#, c-format
12461msgid " * [pruned] %s"
81809b99 12462msgstr " * [已删除] %s"
8ada9598 12463
6937cb4e 12464#: builtin/remote.c:1363
ef317cd5 12465msgid "prune remotes after fetching"
07432cef 12466msgstr "抓取后清除远程"
ef317cd5 12467
6937cb4e 12468#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
81809b99 12469#, c-format
8ada9598 12470msgid "No such remote '%s'"
81809b99 12471msgstr "没有此远程 '%s'"
8ada9598 12472
6937cb4e 12473#: builtin/remote.c:1442
ef317cd5 12474msgid "add branch"
07432cef 12475msgstr "添加分支"
ef317cd5 12476
6937cb4e 12477#: builtin/remote.c:1449
8ada9598 12478msgid "no remote specified"
81809b99 12479msgstr "未指定远程"
8ada9598 12480
6937cb4e 12481#: builtin/remote.c:1466
94550ed3
JX
12482msgid "query push URLs rather than fetch URLs"
12483msgstr "查询推送 URL 地址,而非获取 URL 地址"
12484
6937cb4e 12485#: builtin/remote.c:1468
94550ed3
JX
12486msgid "return all URLs"
12487msgstr "返回所有 URL 地址"
12488
6937cb4e 12489#: builtin/remote.c:1496
94550ed3
JX
12490#, c-format
12491msgid "no URLs configured for remote '%s'"
12492msgstr "没有给远程仓库 '%s' 设定 URL"
12493
6937cb4e 12494#: builtin/remote.c:1522
ef317cd5 12495msgid "manipulate push URLs"
07432cef 12496msgstr "操作推送 URLS"
ef317cd5 12497
6937cb4e 12498#: builtin/remote.c:1524
ef317cd5 12499msgid "add URL"
07432cef 12500msgstr "添加 URL"
ef317cd5 12501
6937cb4e 12502#: builtin/remote.c:1526
ef317cd5 12503msgid "delete URLs"
07432cef 12504msgstr "删除 URLS"
ef317cd5 12505
6937cb4e 12506#: builtin/remote.c:1533
8ada9598 12507msgid "--add --delete doesn't make sense"
81809b99 12508msgstr "--add --delete 无意义"
8ada9598 12509
6937cb4e 12510#: builtin/remote.c:1572
81809b99 12511#, c-format
8ada9598 12512msgid "Invalid old URL pattern: %s"
4375c10e 12513msgstr "无效的旧 URL 匹配模版:%s"
8ada9598 12514
6937cb4e 12515#: builtin/remote.c:1580
81809b99 12516#, c-format
8ada9598 12517msgid "No such URL found: %s"
4375c10e 12518msgstr "未找到此 URL:%s"
8ada9598 12519
6937cb4e 12520#: builtin/remote.c:1582
8ada9598 12521msgid "Will not delete all non-push URLs"
4375c10e 12522msgstr "将不会删除所有非推送 URL 地址"
8ada9598 12523
6937cb4e 12524#: builtin/remote.c:1598
ef317cd5 12525msgid "be verbose; must be placed before a subcommand"
07432cef 12526msgstr "冗长输出;必须置于子命令之前"
ef317cd5 12527
6937cb4e 12528#: builtin/remote.c:1629
a0b6b246
JX
12529#, c-format
12530msgid "Unknown subcommand: %s"
12531msgstr "未知子命令:%s"
12532
a4f16749 12533#: builtin/repack.c:18
814ff314
JX
12534msgid "git repack [<options>]"
12535msgstr "git repack [<选项>]"
90314792 12536
a4f16749 12537#: builtin/repack.c:23
1a79b2f1
JX
12538msgid ""
12539"Incremental repacks are incompatible with bitmap indexes. Use\n"
12540"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
12541msgstr ""
12542"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
12543"或禁用 pack.writebitmaps 配置。"
12544
a4f16749 12545#: builtin/repack.c:168
90314792
JX
12546msgid "pack everything in a single pack"
12547msgstr "所有内容打包到一个包文件中"
12548
a4f16749 12549#: builtin/repack.c:170
90314792
JX
12550msgid "same as -a, and turn unreachable objects loose"
12551msgstr "和 -a 相同,并将不可达的对象设为松散对象"
12552
a4f16749 12553#: builtin/repack.c:173
90314792
JX
12554msgid "remove redundant packs, and run git-prune-packed"
12555msgstr "删除多余的包,运行 git-prune-packed"
12556
a4f16749 12557#: builtin/repack.c:175
90314792
JX
12558msgid "pass --no-reuse-delta to git-pack-objects"
12559msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
12560
a4f16749 12561#: builtin/repack.c:177
90314792
JX
12562msgid "pass --no-reuse-object to git-pack-objects"
12563msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
12564
a4f16749 12565#: builtin/repack.c:179
90314792
JX
12566msgid "do not run git-update-server-info"
12567msgstr "不运行 git-update-server-info"
12568
a4f16749 12569#: builtin/repack.c:182
90314792
JX
12570msgid "pass --local to git-pack-objects"
12571msgstr "向 git-pack-objects 传递参数 --local"
12572
a4f16749 12573#: builtin/repack.c:184
6c94aba5
JX
12574msgid "write bitmap index"
12575msgstr "写 bitmap 索引"
12576
a4f16749 12577#: builtin/repack.c:185
90314792
JX
12578msgid "approxidate"
12579msgstr "近似日期"
12580
a4f16749 12581#: builtin/repack.c:186
90314792
JX
12582msgid "with -A, do not loosen objects older than this"
12583msgstr "使用 -A,不要将早于给定时间的对象过期"
12584
a4f16749 12585#: builtin/repack.c:188
5c57d762
JX
12586msgid "with -a, repack unreachable objects"
12587msgstr "使用 -a ,重新对不可达对象打包"
12588
a4f16749 12589#: builtin/repack.c:190
90314792
JX
12590msgid "size of the window used for delta compression"
12591msgstr "用于增量压缩的窗口值"
12592
a4f16749 12593#: builtin/repack.c:191 builtin/repack.c:197
8376b58d
JX
12594msgid "bytes"
12595msgstr "字节"
12596
a4f16749 12597#: builtin/repack.c:192
90314792
JX
12598msgid "same as the above, but limit memory size instead of entries count"
12599msgstr "和上面的相似,但限制内存大小而非条目数"
12600
a4f16749 12601#: builtin/repack.c:194
90314792
JX
12602msgid "limits the maximum delta depth"
12603msgstr "限制最大增量深度"
12604
a4f16749
JX
12605#: builtin/repack.c:196
12606msgid "limits the maximum number of threads"
12607msgstr "限制最大线程数"
12608
12609#: builtin/repack.c:198
90314792 12610msgid "maximum size of each packfile"
dbd6cced 12611msgstr "每个包文件的最大尺寸"
90314792 12612
a4f16749 12613#: builtin/repack.c:200
6c94aba5
JX
12614msgid "repack objects in packs marked with .keep"
12615msgstr "对标记为 .keep 的包中的对象重新打包"
12616
a4f16749 12617#: builtin/repack.c:210
94550ed3
JX
12618msgid "cannot delete packs in a precious-objects repo"
12619msgstr "不能删除珍品仓库中的打包文件"
12620
a4f16749 12621#: builtin/repack.c:214
5c57d762
JX
12622msgid "--keep-unreachable and -A are incompatible"
12623msgstr "--keep-unreachable 和 -A 不兼容"
12624
5809aa05 12625#: builtin/repack.c:406 builtin/worktree.c:146
90314792 12626#, c-format
5c57d762
JX
12627msgid "failed to remove '%s'"
12628msgstr "无法删除 '%s'"
90314792 12629
a4f16749 12630#: builtin/replace.c:20
ef317cd5 12631msgid "git replace [-f] <object> <replacement>"
07432cef 12632msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 12633
a4f16749 12634#: builtin/replace.c:21
6acbf033
JX
12635msgid "git replace [-f] --edit <object>"
12636msgstr "git replace [-f] --edit <对象>"
12637
a4f16749 12638#: builtin/replace.c:22
6acbf033
JX
12639msgid "git replace [-f] --graft <commit> [<parent>...]"
12640msgstr "git replace [-f] --graft <提交> [<父提交>...]"
12641
a4f16749 12642#: builtin/replace.c:23
ef317cd5 12643msgid "git replace -d <object>..."
07432cef 12644msgstr "git replace -d <对象>..."
ef317cd5 12645
a4f16749 12646#: builtin/replace.c:24
cfff71a9
JX
12647msgid "git replace [--format=<format>] [-l [<pattern>]]"
12648msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 12649
a4f16749 12650#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
6acbf033
JX
12651#, c-format
12652msgid "Not a valid object name: '%s'"
12653msgstr "不是一个有效的对象名:'%s'"
12654
a4f16749 12655#: builtin/replace.c:361
6acbf033
JX
12656#, c-format
12657msgid "bad mergetag in commit '%s'"
55a16ee4 12658msgstr "提交 '%s' 中含有损坏的合并标签"
6acbf033 12659
a4f16749 12660#: builtin/replace.c:363
6acbf033
JX
12661#, c-format
12662msgid "malformed mergetag in commit '%s'"
55a16ee4 12663msgstr "提交 '%s' 中含有非法的合并标签"
6acbf033 12664
a4f16749 12665#: builtin/replace.c:374
6acbf033
JX
12666#, c-format
12667msgid ""
12668"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
12669"instead of --graft"
55a16ee4 12670msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
6acbf033 12671
a4f16749 12672#: builtin/replace.c:407
6acbf033
JX
12673#, c-format
12674msgid "the original commit '%s' has a gpg signature."
12675msgstr "原始提交 '%s' 中包含一个 GPG 签名"
12676
a4f16749 12677#: builtin/replace.c:408
6acbf033
JX
12678msgid "the signature will be removed in the replacement commit!"
12679msgstr "在替换的提交中签名将被移除!"
12680
a4f16749 12681#: builtin/replace.c:414
6acbf033
JX
12682#, c-format
12683msgid "could not write replacement commit for: '%s'"
12684msgstr "不能为 '%s' 写替换提交"
12685
a4f16749 12686#: builtin/replace.c:438
ef317cd5 12687msgid "list replace refs"
07432cef 12688msgstr "列出替换的引用"
ef317cd5 12689
a4f16749 12690#: builtin/replace.c:439
ef317cd5 12691msgid "delete replace refs"
07432cef 12692msgstr "删除替换的引用"
ef317cd5 12693
a4f16749 12694#: builtin/replace.c:440
6acbf033
JX
12695msgid "edit existing object"
12696msgstr "编辑现存的对象"
12697
a4f16749 12698#: builtin/replace.c:441
6acbf033
JX
12699msgid "change a commit's parents"
12700msgstr "修改一个提交的父提交"
12701
a4f16749 12702#: builtin/replace.c:442
ef317cd5 12703msgid "replace the ref if it exists"
07432cef 12704msgstr "如果存在则替换引用"
ef317cd5 12705
a4f16749 12706#: builtin/replace.c:443
6acbf033
JX
12707msgid "do not pretty-print contents for --edit"
12708msgstr "不要为 --edit 操作美观显示内容"
12709
a4f16749 12710#: builtin/replace.c:444
cfff71a9
JX
12711msgid "use this format"
12712msgstr "使用此格式"
12713
a4f16749 12714#: builtin/rerere.c:13
814ff314
JX
12715msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
12716msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
ef317cd5 12717
a4f16749 12718#: builtin/rerere.c:59
ef317cd5 12719msgid "register clean resolutions in index"
07432cef 12720msgstr "在索引中注册干净的解决方案"
ef317cd5 12721
a4f16749 12722#: builtin/reset.c:29
ef317cd5
JX
12723msgid ""
12724"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 12725msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5 12726
a4f16749 12727#: builtin/reset.c:30
a0b6b246
JX
12728msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
12729msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
ef317cd5 12730
a4f16749 12731#: builtin/reset.c:31
07432cef
WS
12732msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
12733msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 12734
a4f16749 12735#: builtin/reset.c:37
c04f5ac3
JX
12736msgid "mixed"
12737msgstr "混杂"
12738
a4f16749 12739#: builtin/reset.c:37
c04f5ac3
JX
12740msgid "soft"
12741msgstr "软性"
12742
a4f16749 12743#: builtin/reset.c:37
c04f5ac3
JX
12744msgid "hard"
12745msgstr "硬性"
12746
a4f16749 12747#: builtin/reset.c:37
8ada9598
JX
12748msgid "merge"
12749msgstr "合并"
12750
a4f16749 12751#: builtin/reset.c:37
c04f5ac3
JX
12752msgid "keep"
12753msgstr "保持"
12754
6937cb4e 12755#: builtin/reset.c:78
c04f5ac3
JX
12756msgid "You do not have a valid HEAD."
12757msgstr "您没有一个有效的 HEAD。"
12758
6937cb4e 12759#: builtin/reset.c:80
c04f5ac3
JX
12760msgid "Failed to find tree of HEAD."
12761msgstr "无法找到 HEAD 指向的树。"
12762
6937cb4e 12763#: builtin/reset.c:86
c04f5ac3
JX
12764#, c-format
12765msgid "Failed to find tree of %s."
12766msgstr "无法找到 %s 指向的树。"
12767
6937cb4e 12768#: builtin/reset.c:113
c04f5ac3
JX
12769#, c-format
12770msgid "HEAD is now at %s"
12771msgstr "HEAD 现在位于 %s"
12772
90e6ef53 12773# 译者:汉字之间无空格,故删除%s前后空格
6937cb4e 12774#: builtin/reset.c:197
c04f5ac3
JX
12775#, c-format
12776msgid "Cannot do a %s reset in the middle of a merge."
12777msgstr "在合并过程中不能做%s重置操作。"
12778
6937cb4e 12779#: builtin/reset.c:297
ef317cd5 12780msgid "be quiet, only report errors"
07432cef 12781msgstr "安静模式,只报告错误"
ef317cd5 12782
6937cb4e 12783#: builtin/reset.c:299
ef317cd5 12784msgid "reset HEAD and index"
07432cef 12785msgstr "重置 HEAD 和索引"
ef317cd5 12786
6937cb4e 12787#: builtin/reset.c:300
ef317cd5 12788msgid "reset only HEAD"
07432cef 12789msgstr "只重置 HEAD"
ef317cd5 12790
6937cb4e 12791#: builtin/reset.c:302 builtin/reset.c:304
ef317cd5 12792msgid "reset HEAD, index and working tree"
07432cef 12793msgstr "重置 HEAD、索引和工作区"
ef317cd5 12794
6937cb4e 12795#: builtin/reset.c:306
ef317cd5 12796msgid "reset HEAD but keep local changes"
07432cef 12797msgstr "重置 HEAD 但保存本地变更"
ef317cd5 12798
6937cb4e 12799#: builtin/reset.c:312
6c94aba5
JX
12800msgid "record only the fact that removed paths will be added later"
12801msgstr "将删除的路径标记为稍后添加"
12802
6937cb4e 12803#: builtin/reset.c:329
07432cef
WS
12804#, c-format
12805msgid "Failed to resolve '%s' as a valid revision."
12806msgstr "无法将 '%s' 解析为一个有效的版本。"
12807
6937cb4e 12808#: builtin/reset.c:337
07432cef
WS
12809#, c-format
12810msgid "Failed to resolve '%s' as a valid tree."
12811msgstr "无法将 '%s' 解析为一个有效的树对象。"
12812
6937cb4e 12813#: builtin/reset.c:346
c04f5ac3 12814msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 12815msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 12816
6937cb4e 12817#: builtin/reset.c:355
c04f5ac3 12818msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
d9d56b23 12819msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
c04f5ac3 12820
90e6ef53 12821# 译者:汉字之间无空格,故删除%s前后空格
6937cb4e 12822#: builtin/reset.c:357
c04f5ac3
JX
12823#, c-format
12824msgid "Cannot do %s reset with paths."
12825msgstr "不能带路径进行%s重置。"
12826
90e6ef53 12827# 译者:汉字之间无空格,故删除%s前后空格
6937cb4e 12828#: builtin/reset.c:367
c04f5ac3
JX
12829#, c-format
12830msgid "%s reset is not allowed in a bare repository"
160fb2b2 12831msgstr "不能对纯仓库进行%s重置"
c04f5ac3 12832
6937cb4e 12833#: builtin/reset.c:371
6c94aba5
JX
12834msgid "-N can only be used with --mixed"
12835msgstr "-N 只能和 --mixed 同时使用"
12836
6937cb4e 12837#: builtin/reset.c:388
90314792 12838msgid "Unstaged changes after reset:"
160fb2b2 12839msgstr "重置后取消暂存的变更:"
90314792 12840
6937cb4e 12841#: builtin/reset.c:394
ef317cd5
JX
12842#, c-format
12843msgid "Could not reset index file to revision '%s'."
12844msgstr "不能重置索引文件至版本 '%s'。"
12845
6937cb4e 12846#: builtin/reset.c:398
07432cef
WS
12847msgid "Could not write new index file."
12848msgstr "不能写入新的索引文件。"
12849
5809aa05
JX
12850#: builtin/rev-list.c:399
12851msgid "object filtering requires --objects"
12852msgstr "对象过滤需要 --objects"
12853
12854#: builtin/rev-list.c:402
12855#, c-format
12856msgid "invalid sparse value '%s'"
12857msgstr "无效的稀疏值 '%s'"
12858
12859#: builtin/rev-list.c:442
1b7f4a34
JX
12860msgid "rev-list does not support display of notes"
12861msgstr "rev-list 不支持显示注解"
12862
5809aa05
JX
12863#: builtin/rev-list.c:445
12864msgid "cannot combine --use-bitmap-index with object filtering"
12865msgstr "不能将 --use-bitmap-index 和对象过滤组合使用"
12866
6937cb4e 12867#: builtin/rev-parse.c:402
814ff314
JX
12868msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
12869msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
ef317cd5 12870
6937cb4e 12871#: builtin/rev-parse.c:407
ef317cd5 12872msgid "keep the `--` passed as an arg"
07432cef 12873msgstr "保持 `--` 作为一个参数传递"
ef317cd5 12874
6937cb4e 12875#: builtin/rev-parse.c:409
ef317cd5 12876msgid "stop parsing after the first non-option argument"
07432cef 12877msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 12878
6937cb4e 12879#: builtin/rev-parse.c:412
cfff71a9
JX
12880msgid "output in stuck long form"
12881msgstr "以固定长格式输出"
12882
6937cb4e 12883#: builtin/rev-parse.c:545
ef317cd5 12884msgid ""
814ff314 12885"git rev-parse --parseopt [<options>] -- [<args>...]\n"
ef317cd5 12886" or: git rev-parse --sq-quote [<arg>...]\n"
814ff314 12887" or: git rev-parse [<options>] [<arg>...]\n"
ef317cd5
JX
12888"\n"
12889"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
12890msgstr ""
814ff314 12891"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
90314792 12892" 或者:git rev-parse --sq-quote [<参数>...]\n"
814ff314 12893" 或者:git rev-parse [<选项>] [<参数>...]\n"
07432cef
WS
12894"\n"
12895"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5 12896
a4f16749 12897#: builtin/revert.c:23
814ff314
JX
12898msgid "git revert [<options>] <commit-ish>..."
12899msgstr "git revert [<选项>] <提交号>..."
ef317cd5 12900
a4f16749 12901#: builtin/revert.c:24
ef317cd5 12902msgid "git revert <subcommand>"
07432cef 12903msgstr "git revert <子命令>"
ef317cd5 12904
a4f16749 12905#: builtin/revert.c:29
814ff314
JX
12906msgid "git cherry-pick [<options>] <commit-ish>..."
12907msgstr "git cherry-pick [<选项>] <提交号>..."
ef317cd5 12908
a4f16749 12909#: builtin/revert.c:30
ef317cd5 12910msgid "git cherry-pick <subcommand>"
07432cef 12911msgstr "git cherry-pick <子命令>"
ef317cd5 12912
a4f16749 12913#: builtin/revert.c:90
ef317cd5
JX
12914#, c-format
12915msgid "%s: %s cannot be used with %s"
12916msgstr "%s:%s 不能和 %s 同时使用"
12917
a4f16749 12918#: builtin/revert.c:99
ef317cd5 12919msgid "end revert or cherry-pick sequence"
07432cef 12920msgstr "终止反转或拣选操作"
ef317cd5 12921
a4f16749 12922#: builtin/revert.c:100
ef317cd5 12923msgid "resume revert or cherry-pick sequence"
07432cef 12924msgstr "继续反转或拣选操作"
ef317cd5 12925
a4f16749 12926#: builtin/revert.c:101
ef317cd5 12927msgid "cancel revert or cherry-pick sequence"
07432cef 12928msgstr "取消反转或拣选操作"
ef317cd5 12929
a4f16749 12930#: builtin/revert.c:102
ef317cd5 12931msgid "don't automatically commit"
07432cef 12932msgstr "不要自动提交"
ef317cd5 12933
a4f16749 12934#: builtin/revert.c:103
ef317cd5 12935msgid "edit the commit message"
07432cef 12936msgstr "编辑提交说明"
ef317cd5 12937
a4f16749 12938#: builtin/revert.c:106
87cb7997 12939msgid "parent-number"
07432cef 12940msgstr "父编号"
ef317cd5 12941
a4f16749 12942#: builtin/revert.c:107
87cb7997
JX
12943msgid "select mainline parent"
12944msgstr "选择主干父提交编号"
12945
a4f16749 12946#: builtin/revert.c:109
ef317cd5 12947msgid "merge strategy"
07432cef 12948msgstr "合并策略"
ef317cd5 12949
a4f16749 12950#: builtin/revert.c:110
ef317cd5 12951msgid "option"
07432cef 12952msgstr "选项"
ef317cd5 12953
a4f16749 12954#: builtin/revert.c:111
ef317cd5 12955msgid "option for merge strategy"
07432cef 12956msgstr "合并策略的选项"
ef317cd5 12957
a4f16749 12958#: builtin/revert.c:120
ef317cd5 12959msgid "append commit name"
07432cef 12960msgstr "追加提交名称"
ef317cd5 12961
a4f16749 12962#: builtin/revert.c:122
ef317cd5 12963msgid "preserve initially empty commits"
07432cef 12964msgstr "保留初始化的空提交"
ef317cd5 12965
a4f16749 12966#: builtin/revert.c:123
ef317cd5 12967msgid "allow commits with empty messages"
07432cef 12968msgstr "允许提交说明为空"
c04f5ac3 12969
a4f16749 12970#: builtin/revert.c:124
ef317cd5 12971msgid "keep redundant, empty commits"
07432cef 12972msgstr "保持多余的、空的提交"
ef317cd5 12973
6937cb4e 12974#: builtin/revert.c:214
c04f5ac3
JX
12975msgid "revert failed"
12976msgstr "还原失败"
12977
6937cb4e 12978#: builtin/revert.c:227
c04f5ac3
JX
12979msgid "cherry-pick failed"
12980msgstr "拣选失败"
12981
a4f16749 12982#: builtin/rm.c:18
814ff314
JX
12983msgid "git rm [<options>] [--] <file>..."
12984msgstr "git rm [<选项>] [--] <文件>..."
07432cef 12985
a4f16749 12986#: builtin/rm.c:206
c04f5ac3 12987msgid ""
2e8451e8
JX
12988"the following file has staged content different from both the\n"
12989"file and the HEAD:"
12990msgid_plural ""
12991"the following files have staged content different from both the\n"
12992"file and the HEAD:"
12993msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
12994msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
12995
a4f16749 12996#: builtin/rm.c:211
2e8451e8
JX
12997msgid ""
12998"\n"
c04f5ac3
JX
12999"(use -f to force removal)"
13000msgstr ""
2e8451e8 13001"\n"
c04f5ac3
JX
13002"(使用 -f 强制删除)"
13003
a4f16749 13004#: builtin/rm.c:215
2e8451e8
JX
13005msgid "the following file has changes staged in the index:"
13006msgid_plural "the following files have changes staged in the index:"
160fb2b2
JX
13007msgstr[0] "下列文件索引中有变更"
13008msgstr[1] "下列文件索引中有变更"
c04f5ac3 13009
a4f16749 13010#: builtin/rm.c:219 builtin/rm.c:228
c04f5ac3 13011msgid ""
2e8451e8 13012"\n"
c04f5ac3
JX
13013"(use --cached to keep the file, or -f to force removal)"
13014msgstr ""
2e8451e8
JX
13015"\n"
13016"(使用 --cached 保留本地文件,或用 -f 强制删除)"
13017
a4f16749 13018#: builtin/rm.c:225
2e8451e8
JX
13019msgid "the following file has local modifications:"
13020msgid_plural "the following files have local modifications:"
13021msgstr[0] "如下文件有本地修改:"
13022msgstr[1] "如下文件有本地修改:"
c04f5ac3 13023
a4f16749 13024#: builtin/rm.c:243
ef317cd5 13025msgid "do not list removed files"
07432cef 13026msgstr "不列出删除的文件"
ef317cd5 13027
a4f16749 13028#: builtin/rm.c:244
ef317cd5 13029msgid "only remove from the index"
07432cef 13030msgstr "只从索引区删除"
ef317cd5 13031
a4f16749 13032#: builtin/rm.c:245
ef317cd5 13033msgid "override the up-to-date check"
07432cef 13034msgstr "忽略文件更新状态检查"
ef317cd5 13035
a4f16749 13036#: builtin/rm.c:246
ef317cd5 13037msgid "allow recursive removal"
07432cef 13038msgstr "允许递归删除"
ef317cd5 13039
a4f16749 13040#: builtin/rm.c:248
ef317cd5 13041msgid "exit with a zero status even if nothing matched"
07432cef 13042msgstr "即使没有匹配,也以零状态退出"
ef317cd5 13043
6937cb4e 13044#: builtin/rm.c:307
c04f5ac3
JX
13045#, c-format
13046msgid "not removing '%s' recursively without -r"
13047msgstr "未提供 -r 选项不会递归删除 '%s'"
13048
6937cb4e 13049#: builtin/rm.c:346
c04f5ac3
JX
13050#, c-format
13051msgid "git rm: unable to remove %s"
13052msgstr "git rm:不能删除 %s"
13053
6937cb4e 13054#: builtin/rm.c:369
1a79b2f1
JX
13055#, c-format
13056msgid "could not remove '%s'"
13057msgstr "无法删除 '%s'"
13058
a4f16749 13059#: builtin/send-pack.c:19
1b7f4a34
JX
13060msgid ""
13061"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
13062"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
13063"[<ref>...]\n"
13064" --all and explicit <ref> specification are mutually exclusive."
13065msgstr ""
13066"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
13067"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
13068" --all 和明确的 <引用> 互斥。"
13069
a4f16749 13070#: builtin/send-pack.c:162
1b7f4a34
JX
13071msgid "remote name"
13072msgstr "远程名称"
13073
a4f16749 13074#: builtin/send-pack.c:176
1b7f4a34
JX
13075msgid "use stateless RPC protocol"
13076msgstr "使用无状态的 RPC 协议"
13077
a4f16749 13078#: builtin/send-pack.c:177
1b7f4a34
JX
13079msgid "read refs from stdin"
13080msgstr "从标准输入读取引用"
13081
a4f16749 13082#: builtin/send-pack.c:178
1b7f4a34
JX
13083msgid "print status from remote helper"
13084msgstr "打印来自远程 helper 的状态"
13085
a4f16749 13086#: builtin/shortlog.c:14
814ff314 13087msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
4dcdc3d8 13088msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
ef317cd5 13089
6937cb4e 13090#: builtin/shortlog.c:263
1a79b2f1
JX
13091msgid "Group by committer rather than author"
13092msgstr "按照提交者分组而不是作者"
13093
6937cb4e 13094#: builtin/shortlog.c:265
ef317cd5 13095msgid "sort output according to the number of commits per author"
07432cef 13096msgstr "根据每个作者的提交数量排序"
ef317cd5 13097
6937cb4e 13098#: builtin/shortlog.c:267
ef317cd5 13099msgid "Suppress commit descriptions, only provides commit count"
07432cef 13100msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 13101
6937cb4e 13102#: builtin/shortlog.c:269
ef317cd5 13103msgid "Show the email address of each author"
07432cef 13104msgstr "显示每个作者的电子邮件地址"
ef317cd5 13105
6937cb4e 13106#: builtin/shortlog.c:270
ef317cd5 13107msgid "w[,i1[,i2]]"
07432cef 13108msgstr "w[,i1[,i2]]"
ef317cd5 13109
6937cb4e 13110#: builtin/shortlog.c:271
ef317cd5 13111msgid "Linewrap output"
07432cef 13112msgstr "折行输出"
ef317cd5 13113
a4f16749 13114#: builtin/show-branch.c:12
ef317cd5 13115msgid ""
814ff314 13116"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
13117"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
13118"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
13119"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
ef317cd5 13120msgstr ""
814ff314 13121"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
13122"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
13123"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
13124"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
ef317cd5 13125
a4f16749 13126#: builtin/show-branch.c:16
814ff314 13127msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
58b6f078 13128msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
ef317cd5 13129
a4f16749 13130#: builtin/show-branch.c:376
a0b6b246
JX
13131#, c-format
13132msgid "ignoring %s; cannot handle more than %d ref"
13133msgid_plural "ignoring %s; cannot handle more than %d refs"
13134msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
13135msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
13136
a4f16749 13137#: builtin/show-branch.c:530
a0b6b246
JX
13138#, c-format
13139msgid "no matching refs with %s"
13140msgstr "没有和 %s 匹配的引用"
13141
a4f16749 13142#: builtin/show-branch.c:626
ef317cd5 13143msgid "show remote-tracking and local branches"
07432cef 13144msgstr "显示远程跟踪的和本地的分支"
ef317cd5 13145
a4f16749 13146#: builtin/show-branch.c:628
ef317cd5 13147msgid "show remote-tracking branches"
07432cef 13148msgstr "显示远程跟踪的分支"
ef317cd5 13149
a4f16749 13150#: builtin/show-branch.c:630
ef317cd5 13151msgid "color '*!+-' corresponding to the branch"
07432cef 13152msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 13153
a4f16749 13154#: builtin/show-branch.c:632
ef317cd5 13155msgid "show <n> more commits after the common ancestor"
07432cef 13156msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 13157
a4f16749 13158#: builtin/show-branch.c:634
ef317cd5 13159msgid "synonym to more=-1"
07432cef 13160msgstr "和 more=-1 同义"
ef317cd5 13161
a4f16749 13162#: builtin/show-branch.c:635
ef317cd5 13163msgid "suppress naming strings"
07432cef 13164msgstr "不显示字符串命名"
ef317cd5 13165
a4f16749 13166#: builtin/show-branch.c:637
ef317cd5 13167msgid "include the current branch"
07432cef 13168msgstr "包括当前分支"
ef317cd5 13169
a4f16749 13170#: builtin/show-branch.c:639
ef317cd5 13171msgid "name commits with their object names"
07432cef 13172msgstr "以对象名字命名提交"
ef317cd5 13173
a4f16749 13174#: builtin/show-branch.c:641
ef317cd5 13175msgid "show possible merge bases"
07432cef 13176msgstr "显示可能合并的基线"
ef317cd5 13177
a4f16749 13178#: builtin/show-branch.c:643
ef317cd5 13179msgid "show refs unreachable from any other ref"
07432cef 13180msgstr "显示没有任何引用的的引用"
ef317cd5 13181
a4f16749 13182#: builtin/show-branch.c:645
ef317cd5 13183msgid "show commits in topological order"
07432cef 13184msgstr "以拓扑顺序显示提交"
ef317cd5 13185
a4f16749 13186#: builtin/show-branch.c:648
ef317cd5 13187msgid "show only commits not on the first branch"
07432cef 13188msgstr "只显示不在第一个分支上的提交"
ef317cd5 13189
a4f16749 13190#: builtin/show-branch.c:650
ef317cd5 13191msgid "show merges reachable from only one tip"
07432cef 13192msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 13193
a4f16749 13194#: builtin/show-branch.c:652
2e8451e8
JX
13195msgid "topologically sort, maintaining date order where possible"
13196msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 13197
a4f16749 13198#: builtin/show-branch.c:655
ef317cd5 13199msgid "<n>[,<base>]"
07432cef 13200msgstr "<n>[,<base>]"
ef317cd5 13201
a4f16749 13202#: builtin/show-branch.c:656
ef317cd5 13203msgid "show <n> most recent ref-log entries starting at base"
58b6f078 13204msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
ef317cd5 13205
a4f16749 13206#: builtin/show-branch.c:690
a0b6b246
JX
13207msgid ""
13208"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
13209msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
13210
a4f16749 13211#: builtin/show-branch.c:714
a0b6b246
JX
13212msgid "no branches given, and HEAD is not valid"
13213msgstr "未提供分支,且 HEAD 无效"
13214
a4f16749 13215#: builtin/show-branch.c:717
a0b6b246
JX
13216msgid "--reflog option needs one branch name"
13217msgstr "选项 --reflog 需要一个分支名"
13218
a4f16749 13219#: builtin/show-branch.c:720
a0b6b246
JX
13220#, c-format
13221msgid "only %d entry can be shown at one time."
13222msgid_plural "only %d entries can be shown at one time."
13223msgstr[0] "一次只能显示 %d 个条目。"
13224msgstr[1] "一次只能显示 %d 个条目。"
13225
a4f16749 13226#: builtin/show-branch.c:724
a0b6b246
JX
13227#, c-format
13228msgid "no such ref %s"
13229msgstr "无此引用 %s"
13230
a4f16749 13231#: builtin/show-branch.c:808
a0b6b246
JX
13232#, c-format
13233msgid "cannot handle more than %d rev."
13234msgid_plural "cannot handle more than %d revs."
13235msgstr[0] "不能处理 %d 个以上的版本。"
13236msgstr[1] "不能处理 %d 个以上的版本。"
13237
a4f16749 13238#: builtin/show-branch.c:812
a0b6b246
JX
13239#, c-format
13240msgid "'%s' is not a valid ref."
13241msgstr "'%s' 不是一个有效的引用。"
13242
a4f16749 13243#: builtin/show-branch.c:815
a0b6b246
JX
13244#, c-format
13245msgid "cannot find commit %s (%s)"
29004bbb 13246msgstr "不能找到提交 %s(%s)"
a0b6b246 13247
ef317cd5
JX
13248#: builtin/show-ref.c:10
13249msgid ""
814ff314
JX
13250"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
13251"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
ef317cd5 13252msgstr ""
814ff314
JX
13253"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
13254"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
ef317cd5
JX
13255
13256#: builtin/show-ref.c:11
94550ed3
JX
13257msgid "git show-ref --exclude-existing[=<pattern>]"
13258msgstr "git show-ref --exclude-existing[=<模式>]"
ef317cd5 13259
1a79b2f1 13260#: builtin/show-ref.c:159
ef317cd5 13261msgid "only show tags (can be combined with heads)"
55a16ee4 13262msgstr "只显示标签(可以和头共用)"
ef317cd5 13263
1a79b2f1 13264#: builtin/show-ref.c:160
ef317cd5 13265msgid "only show heads (can be combined with tags)"
55a16ee4 13266msgstr "只显示头(可以和标签共用)"
ef317cd5 13267
1a79b2f1 13268#: builtin/show-ref.c:161
ef317cd5 13269msgid "stricter reference checking, requires exact ref path"
07432cef 13270msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 13271
1a79b2f1 13272#: builtin/show-ref.c:164 builtin/show-ref.c:166
2e8451e8
JX
13273msgid "show the HEAD reference, even if it would be filtered out"
13274msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 13275
1a79b2f1 13276#: builtin/show-ref.c:168
ef317cd5 13277msgid "dereference tags into object IDs"
4375c10e 13278msgstr "转换标签到对象 ID"
ef317cd5 13279
1a79b2f1 13280#: builtin/show-ref.c:170
ef317cd5 13281msgid "only show SHA1 hash using <n> digits"
07432cef 13282msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
ef317cd5 13283
1a79b2f1 13284#: builtin/show-ref.c:174
ef317cd5 13285msgid "do not print results to stdout (useful with --verify)"
07432cef 13286msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
ef317cd5 13287
1a79b2f1 13288#: builtin/show-ref.c:176
ef317cd5 13289msgid "show refs from stdin that aren't in local repository"
160fb2b2 13290msgstr "显示从标准输入中读入的不在本地仓库中的引用"
ef317cd5 13291
a4f16749 13292#: builtin/stripspace.c:18
94550ed3
JX
13293msgid "git stripspace [-s | --strip-comments]"
13294msgstr "git stripspace [-s | --strip-comments]"
13295
a4f16749 13296#: builtin/stripspace.c:19
94550ed3
JX
13297msgid "git stripspace [-c | --comment-lines]"
13298msgstr "git stripspace [-c | --comment-lines]"
13299
a4f16749 13300#: builtin/stripspace.c:36
94550ed3
JX
13301msgid "skip and remove all lines starting with comment character"
13302msgstr "跳过和移除所有的注释行"
13303
a4f16749 13304#: builtin/stripspace.c:39
276ceeaa 13305msgid "prepend comment character and space to each line"
94550ed3
JX
13306msgstr "为每一行的行首添加注释符和空格"
13307
5809aa05 13308#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
5b04ee3b
JX
13309#, c-format
13310msgid "No such ref: %s"
13311msgstr "没有这样的引用:%s"
13312
5809aa05 13313#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
5b04ee3b
JX
13314#, c-format
13315msgid "Expecting a full ref name, got %s"
13316msgstr "期望一个完整的引用名称,却得到 %s"
13317
5809aa05 13318#: builtin/submodule--helper.c:81
5b04ee3b
JX
13319#, c-format
13320msgid "cannot strip one component off url '%s'"
13321msgstr "无法从 url '%s' 剥离一个组件"
13322
5809aa05 13323#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
94550ed3
JX
13324msgid "alternative anchor for relative paths"
13325msgstr "相对路径的替代锚记(anchor)"
13326
5809aa05 13327#: builtin/submodule--helper.c:375
94550ed3
JX
13328msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
13329msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
13330
5809aa05 13331#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
5b04ee3b
JX
13332#, c-format
13333msgid "No url found for submodule path '%s' in .gitmodules"
13334msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
13335
5809aa05 13336#: builtin/submodule--helper.c:464
87cb7997
JX
13337#, c-format
13338msgid ""
13339"could not lookup configuration '%s'. Assuming this repository is its own "
13340"authoritative upstream."
13341msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
13342
5809aa05 13343#: builtin/submodule--helper.c:475
5b04ee3b
JX
13344#, c-format
13345msgid "Failed to register url for submodule path '%s'"
13346msgstr "无法为子模组 '%s' 注册 url"
13347
5809aa05 13348#: builtin/submodule--helper.c:479
5b04ee3b
JX
13349#, c-format
13350msgid "Submodule '%s' (%s) registered for path '%s'\n"
aef18cc6 13351msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
5b04ee3b
JX
13352
13353#
5809aa05 13354#: builtin/submodule--helper.c:489
aef18cc6 13355#, c-format
5b04ee3b 13356msgid "warning: command update mode suggested for submodule '%s'\n"
aef18cc6 13357msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
5b04ee3b 13358
5809aa05 13359#: builtin/submodule--helper.c:496
5b04ee3b
JX
13360#, c-format
13361msgid "Failed to register update mode for submodule path '%s'"
13362msgstr "无法为子模组 '%s' 注册更新模式"
13363
5809aa05 13364#: builtin/submodule--helper.c:518
5b04ee3b 13365msgid "Suppress output for initializing a submodule"
5809aa05 13366msgstr "取消子模组初始化的输出"
5b04ee3b 13367
5809aa05 13368#: builtin/submodule--helper.c:523
5b04ee3b
JX
13369msgid "git submodule--helper init [<path>]"
13370msgstr "git submodule--helper init [<路径>]"
13371
5809aa05 13372#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
94550ed3
JX
13373#, c-format
13374msgid "no submodule mapping found in .gitmodules for path '%s'"
13375msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
13376
5809aa05
JX
13377#: builtin/submodule--helper.c:626
13378#, c-format
13379msgid "could not resolve HEAD ref inside the submodule '%s'"
13380msgstr "无法解析子模组 '%s' 的 HEAD 引用"
13381
13382#: builtin/submodule--helper.c:653
13383#, c-format
13384msgid "failed to recurse into submodule '%s'"
13385msgstr "无法递归子模组 '%s'"
13386
13387#: builtin/submodule--helper.c:677
13388msgid "Suppress submodule status output"
13389msgstr "取消子模组状态输出"
13390
13391#: builtin/submodule--helper.c:678
13392msgid ""
13393"Use commit stored in the index instead of the one stored in the submodule "
13394"HEAD"
13395msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交"
13396
13397#: builtin/submodule--helper.c:679
13398msgid "recurse into nested submodules"
13399msgstr "在嵌套子模组中递归"
13400
13401#: builtin/submodule--helper.c:684
13402msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
13403msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
13404
13405#: builtin/submodule--helper.c:708
13406msgid "git submodule--helper name <path>"
13407msgstr "git submodule--helper name <路径>"
13408
13409#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
a0b6b246
JX
13410#, c-format
13411msgid "submodule '%s' cannot add alternate: %s"
13412msgstr "子模组 '%s' 不能添加仓库备选:%s"
13413
5809aa05 13414#: builtin/submodule--helper.c:835
a0b6b246
JX
13415#, c-format
13416msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
13417msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
13418
5809aa05 13419#: builtin/submodule--helper.c:842
a0b6b246
JX
13420#, c-format
13421msgid "Value '%s' for submodule.alternateLocation is not recognized"
13422msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
13423
5809aa05 13424#: builtin/submodule--helper.c:864
94550ed3
JX
13425msgid "where the new submodule will be cloned to"
13426msgstr "新的子模组将要克隆的路径"
13427
5809aa05 13428#: builtin/submodule--helper.c:867
94550ed3
JX
13429msgid "name of the new submodule"
13430msgstr "新子模组的名称"
13431
5809aa05 13432#: builtin/submodule--helper.c:870
94550ed3
JX
13433msgid "url where to clone the submodule from"
13434msgstr "克隆子模组的 url 地址"
13435
5809aa05 13436#: builtin/submodule--helper.c:876
94550ed3
JX
13437msgid "depth for shallow clones"
13438msgstr "浅克隆的深度"
13439
5809aa05 13440#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
a0b6b246 13441msgid "force cloning progress"
29004bbb 13442msgstr "强制显示克隆进度"
a0b6b246 13443
5809aa05 13444#: builtin/submodule--helper.c:884
94550ed3
JX
13445msgid ""
13446"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
5b04ee3b 13447"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
5c57d762
JX
13448msgstr ""
13449"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
13450"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
94550ed3 13451
5809aa05 13452#: builtin/submodule--helper.c:915
94550ed3
JX
13453#, c-format
13454msgid "clone of '%s' into submodule path '%s' failed"
13455msgstr "无法克隆 '%s' 到子模组路径 '%s'"
13456
5809aa05 13457#: builtin/submodule--helper.c:930
94550ed3
JX
13458#, c-format
13459msgid "could not get submodule directory for '%s'"
13460msgstr "无法得到 '%s' 的子模组目录"
13461
5809aa05 13462#: builtin/submodule--helper.c:995
5b04ee3b
JX
13463#, c-format
13464msgid "Submodule path '%s' not initialized"
13465msgstr "子模组 '%s' 尚未初始化"
13466
5809aa05 13467#: builtin/submodule--helper.c:999
5b04ee3b
JX
13468msgid "Maybe you want to use 'update --init'?"
13469msgstr "也许您想要执行 'update --init'?"
13470
5809aa05 13471#: builtin/submodule--helper.c:1028
5b04ee3b
JX
13472#, c-format
13473msgid "Skipping unmerged submodule %s"
13474msgstr "略过未合并的子模组 %s"
13475
5809aa05 13476#: builtin/submodule--helper.c:1057
5b04ee3b
JX
13477#, c-format
13478msgid "Skipping submodule '%s'"
13479msgstr "略过子模组 '%s'"
13480
5809aa05 13481#: builtin/submodule--helper.c:1190
5c57d762
JX
13482#, c-format
13483msgid "Failed to clone '%s'. Retry scheduled"
13484msgstr "克隆 '%s' 失败。按计划重试"
13485
5809aa05 13486#: builtin/submodule--helper.c:1201
5c57d762
JX
13487#, c-format
13488msgid "Failed to clone '%s' a second time, aborting"
13489msgstr "第二次尝试克隆 '%s' 失败,退出"
13490
5809aa05 13491#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
5b04ee3b
JX
13492msgid "path into the working tree"
13493msgstr "到工作区的路径"
13494
5809aa05 13495#: builtin/submodule--helper.c:1234
5b04ee3b
JX
13496msgid "path into the working tree, across nested submodule boundaries"
13497msgstr "工作区中的路径,递归嵌套子模组"
13498
5809aa05 13499#: builtin/submodule--helper.c:1238
5b04ee3b
JX
13500msgid "rebase, merge, checkout or none"
13501msgstr "rebase、merge、checkout 或 none"
13502
5809aa05 13503#: builtin/submodule--helper.c:1242
5b04ee3b
JX
13504msgid "Create a shallow clone truncated to the specified number of revisions"
13505msgstr "创建一个指定深度的浅克隆"
13506
5809aa05 13507#: builtin/submodule--helper.c:1245
5b04ee3b
JX
13508msgid "parallel jobs"
13509msgstr "并发任务"
13510
5809aa05 13511#: builtin/submodule--helper.c:1247
5c57d762 13512msgid "whether the initial clone should follow the shallow recommendation"
9a4b694c 13513msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
5c57d762 13514
5809aa05 13515#: builtin/submodule--helper.c:1248
5b04ee3b
JX
13516msgid "don't print cloning progress"
13517msgstr "不要输出克隆进度"
94550ed3 13518
5809aa05 13519#: builtin/submodule--helper.c:1255
5b04ee3b
JX
13520msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
13521msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
13522
5809aa05 13523#: builtin/submodule--helper.c:1268
5b04ee3b
JX
13524msgid "bad value for update parameter"
13525msgstr "update 参数取值错误"
13526
5809aa05 13527#: builtin/submodule--helper.c:1336
5c57d762
JX
13528#, c-format
13529msgid ""
13530"Submodule (%s) branch configured to inherit branch from superproject, but "
13531"the superproject is not on any branch"
13532msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
13533
5809aa05 13534#: builtin/submodule--helper.c:1452
1a79b2f1
JX
13535msgid "recurse into submodules"
13536msgstr "在子模组中递归"
13537
5809aa05 13538#: builtin/submodule--helper.c:1458
1a79b2f1
JX
13539msgid "git submodule--helper embed-git-dir [<path>...]"
13540msgstr "git submodule--helper embed-git-dir [<路径>...]"
13541
5809aa05 13542#: builtin/submodule--helper.c:1517
1a79b2f1
JX
13543#, c-format
13544msgid "%s doesn't support --super-prefix"
13545msgstr "%s 不支持 --super-prefix"
13546
5809aa05 13547#: builtin/submodule--helper.c:1523
94550ed3 13548#, c-format
5b04ee3b
JX
13549msgid "'%s' is not a valid submodule--helper subcommand"
13550msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
94550ed3 13551
a4f16749 13552#: builtin/symbolic-ref.c:8
814ff314
JX
13553msgid "git symbolic-ref [<options>] <name> [<ref>]"
13554msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
07432cef 13555
a4f16749 13556#: builtin/symbolic-ref.c:9
814ff314
JX
13557msgid "git symbolic-ref -d [-q] <name>"
13558msgstr "git symbolic-ref -d [-q] <名称>"
ef317cd5 13559
6937cb4e 13560#: builtin/symbolic-ref.c:40
ef317cd5 13561msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
13562msgstr "不显示非符号(分离的)引用的错误信息"
13563
6937cb4e 13564#: builtin/symbolic-ref.c:41
07432cef
WS
13565msgid "delete symbolic ref"
13566msgstr "删除符号引用"
ef317cd5 13567
6937cb4e 13568#: builtin/symbolic-ref.c:42
ef317cd5 13569msgid "shorten ref output"
6937cb4e 13570msgstr "缩短引用输出"
ef317cd5 13571
6937cb4e 13572#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
ef317cd5 13573msgid "reason"
07432cef 13574msgstr "原因"
ef317cd5 13575
6937cb4e 13576#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
ef317cd5 13577msgid "reason of the update"
07432cef 13578msgstr "更新的原因"
ef317cd5 13579
a4f16749 13580#: builtin/tag.c:24
ef317cd5 13581msgid ""
814ff314
JX
13582"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
13583"[<head>]"
13584msgstr ""
13585"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
ef317cd5 13586
a4f16749 13587#: builtin/tag.c:25
ef317cd5 13588msgid "git tag -d <tagname>..."
07432cef 13589msgstr "git tag -d <标签名>..."
ef317cd5 13590
a4f16749 13591#: builtin/tag.c:26
ef317cd5 13592msgid ""
87cb7997
JX
13593"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
13594"points-at <object>]\n"
94550ed3 13595"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
ef317cd5 13596msgstr ""
87cb7997
JX
13597"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
13598"at <对象>]\n"
94550ed3 13599"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
ef317cd5 13600
a4f16749 13601#: builtin/tag.c:28
1a79b2f1
JX
13602msgid "git tag -v [--format=<format>] <tagname>..."
13603msgstr "git tag -v [--format=<格式>] <标签名>..."
ef317cd5 13604
6937cb4e 13605#: builtin/tag.c:86
c04f5ac3
JX
13606#, c-format
13607msgid "tag '%s' not found."
55a16ee4 13608msgstr "未发现标签 '%s'。"
c04f5ac3 13609
6937cb4e 13610#: builtin/tag.c:102
c04f5ac3
JX
13611#, c-format
13612msgid "Deleted tag '%s' (was %s)\n"
55a16ee4 13613msgstr "已删除标签 '%s'(曾为 %s)\n"
c04f5ac3 13614
6937cb4e 13615#: builtin/tag.c:131
a77c07d9 13616#, c-format
c04f5ac3
JX
13617msgid ""
13618"\n"
6acbf033
JX
13619"Write a message for tag:\n"
13620" %s\n"
a77c07d9 13621"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
13622msgstr ""
13623"\n"
55a16ee4 13624"输入一个标签说明:\n"
6acbf033 13625" %s\n"
a77c07d9 13626"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 13627
6937cb4e 13628#: builtin/tag.c:135
a77c07d9 13629#, c-format
c04f5ac3
JX
13630msgid ""
13631"\n"
6acbf033
JX
13632"Write a message for tag:\n"
13633" %s\n"
a77c07d9 13634"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 13635"want to.\n"
c04f5ac3
JX
13636msgstr ""
13637"\n"
55a16ee4 13638"输入一个标签说明:\n"
6acbf033 13639" %s\n"
a77c07d9 13640"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 13641
6937cb4e 13642#: builtin/tag.c:189
c04f5ac3 13643msgid "unable to sign the tag"
55a16ee4 13644msgstr "无法签署标签"
c04f5ac3 13645
6937cb4e 13646#: builtin/tag.c:191
c04f5ac3 13647msgid "unable to write tag file"
55a16ee4 13648msgstr "无法写标签文件"
c04f5ac3 13649
6937cb4e 13650#: builtin/tag.c:215
c04f5ac3 13651msgid "bad object type."
90e6ef53 13652msgstr "坏的对象类型。"
c04f5ac3 13653
6937cb4e 13654#: builtin/tag.c:261
c04f5ac3 13655msgid "no tag message?"
55a16ee4 13656msgstr "无标签说明?"
c04f5ac3 13657
6937cb4e 13658#: builtin/tag.c:268
c04f5ac3
JX
13659#, c-format
13660msgid "The tag message has been left in %s\n"
55a16ee4 13661msgstr "标签说明被保留在 %s\n"
c04f5ac3 13662
6937cb4e 13663#: builtin/tag.c:376
ef317cd5 13664msgid "list tag names"
55a16ee4 13665msgstr "列出标签名称"
ef317cd5 13666
6937cb4e 13667#: builtin/tag.c:378
ef317cd5 13668msgid "print <n> lines of each tag message"
55a16ee4 13669msgstr "每个标签信息打印 <n> 行"
ef317cd5 13670
6937cb4e 13671#: builtin/tag.c:380
ef317cd5 13672msgid "delete tags"
55a16ee4 13673msgstr "删除标签"
ef317cd5 13674
6937cb4e 13675#: builtin/tag.c:381
ef317cd5 13676msgid "verify tags"
55a16ee4 13677msgstr "验证标签"
ef317cd5 13678
6937cb4e 13679#: builtin/tag.c:383
ef317cd5 13680msgid "Tag creation options"
55a16ee4 13681msgstr "标签创建选项"
ef317cd5 13682
6937cb4e 13683#: builtin/tag.c:385
ef317cd5 13684msgid "annotated tag, needs a message"
55a16ee4 13685msgstr "附注标签,需要一个说明"
ef317cd5 13686
6937cb4e 13687#: builtin/tag.c:387
ef317cd5 13688msgid "tag message"
55a16ee4 13689msgstr "标签说明"
ef317cd5 13690
6937cb4e 13691#: builtin/tag.c:389
ef317cd5 13692msgid "annotated and GPG-signed tag"
55a16ee4 13693msgstr "附注并附加 GPG 签名的标签"
ef317cd5 13694
6937cb4e 13695#: builtin/tag.c:393
ef317cd5 13696msgid "use another key to sign the tag"
55a16ee4 13697msgstr "使用另外的私钥签名该标签"
ef317cd5 13698
6937cb4e 13699#: builtin/tag.c:394
ef317cd5 13700msgid "replace the tag if exists"
55a16ee4 13701msgstr "如果存在,替换现有的标签"
ef317cd5 13702
6937cb4e 13703#: builtin/tag.c:395 builtin/update-ref.c:368
03ea3327 13704msgid "create a reflog"
1b7f4a34
JX
13705msgstr "创建引用日志"
13706
6937cb4e 13707#: builtin/tag.c:397
814ff314 13708msgid "Tag listing options"
55a16ee4 13709msgstr "标签列表选项"
814ff314 13710
6937cb4e 13711#: builtin/tag.c:398
ef317cd5 13712msgid "show tag list in columns"
55a16ee4 13713msgstr "以列的方式显示标签列表"
ef317cd5 13714
6937cb4e 13715#: builtin/tag.c:399 builtin/tag.c:401
ef317cd5 13716msgid "print only tags that contain the commit"
87cb7997 13717msgstr "只打印包含该提交的标签"
ef317cd5 13718
6937cb4e 13719#: builtin/tag.c:400 builtin/tag.c:402
87cb7997
JX
13720msgid "print only tags that don't contain the commit"
13721msgstr "只打印不包含该提交的标签"
13722
6937cb4e 13723#: builtin/tag.c:403
94550ed3
JX
13724msgid "print only tags that are merged"
13725msgstr "只打印已经合并的标签"
13726
6937cb4e 13727#: builtin/tag.c:404
94550ed3
JX
13728msgid "print only tags that are not merged"
13729msgstr "只打印尚未合并的标签"
13730
6937cb4e 13731#: builtin/tag.c:409
ef317cd5 13732msgid "print only tags of the object"
87cb7997 13733msgstr "只打印指向该对象的标签"
ef317cd5 13734
6937cb4e 13735#: builtin/tag.c:453
8ada9598 13736msgid "--column and -n are incompatible"
81809b99 13737msgstr "--column 和 -n 不兼容"
8ada9598 13738
6937cb4e 13739#: builtin/tag.c:475
87cb7997
JX
13740msgid "-n option is only allowed in list mode"
13741msgstr "-n 选项只允许用在列表显示模式"
c04f5ac3 13742
6937cb4e 13743#: builtin/tag.c:477
87cb7997
JX
13744msgid "--contains option is only allowed in list mode"
13745msgstr "--contains 选项只允许用在列表显示模式"
c04f5ac3 13746
6937cb4e 13747#: builtin/tag.c:479
87cb7997
JX
13748msgid "--no-contains option is only allowed in list mode"
13749msgstr "--no-contains 选项只允许用在列表显示模式"
7ac1c0ad 13750
6937cb4e 13751#: builtin/tag.c:481
87cb7997
JX
13752msgid "--points-at option is only allowed in list mode"
13753msgstr "--points-at 选项只允许用在列表显示模式"
94550ed3 13754
6937cb4e 13755#: builtin/tag.c:483
87cb7997
JX
13756msgid "--merged and --no-merged options are only allowed in list mode"
13757msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
13758
6937cb4e 13759#: builtin/tag.c:494
c04f5ac3
JX
13760msgid "only one -F or -m option is allowed."
13761msgstr "只允许一个 -F 或 -m 选项。"
13762
6937cb4e 13763#: builtin/tag.c:513
c04f5ac3
JX
13764msgid "too many params"
13765msgstr "太多参数"
13766
6937cb4e 13767#: builtin/tag.c:519
c04f5ac3
JX
13768#, c-format
13769msgid "'%s' is not a valid tag name."
55a16ee4 13770msgstr "'%s' 不是一个有效的标签名称。"
c04f5ac3 13771
6937cb4e 13772#: builtin/tag.c:524
c04f5ac3
JX
13773#, c-format
13774msgid "tag '%s' already exists"
55a16ee4 13775msgstr "标签 '%s' 已存在"
c04f5ac3 13776
6937cb4e 13777#: builtin/tag.c:554
c04f5ac3
JX
13778#, c-format
13779msgid "Updated tag '%s' (was %s)\n"
55a16ee4 13780msgstr "已更新标签 '%s'(曾为 %s)\n"
c04f5ac3 13781
a4f16749 13782#: builtin/unpack-objects.c:494
6c94aba5
JX
13783msgid "Unpacking objects"
13784msgstr "展开对象中"
13785
5809aa05 13786#: builtin/update-index.c:82
7aea43ff
JX
13787#, c-format
13788msgid "failed to create directory %s"
13789msgstr "无法创建目录 %s"
13790
5809aa05 13791#: builtin/update-index.c:88
7aea43ff
JX
13792#, c-format
13793msgid "failed to stat %s"
65e2041e 13794msgstr "对 %s 调用 stat 失败"
7aea43ff 13795
5809aa05 13796#: builtin/update-index.c:98
7aea43ff
JX
13797#, c-format
13798msgid "failed to create file %s"
13799msgstr "无法创建文件 %s"
13800
5809aa05 13801#: builtin/update-index.c:106
7aea43ff
JX
13802#, c-format
13803msgid "failed to delete file %s"
13804msgstr "无法删除文件 %s"
13805
5809aa05 13806#: builtin/update-index.c:113 builtin/update-index.c:219
7aea43ff
JX
13807#, c-format
13808msgid "failed to delete directory %s"
13809msgstr "无法删除目录 %s"
13810
5809aa05 13811#: builtin/update-index.c:138
7aea43ff 13812#, c-format
276ceeaa
JX
13813msgid "Testing mtime in '%s' "
13814msgstr "在 '%s' 中测试 mtime "
7aea43ff 13815
5809aa05 13816#: builtin/update-index.c:152
7aea43ff
JX
13817msgid "directory stat info does not change after adding a new file"
13818msgstr "添加一个新文件后,目录的状态信息未改变"
13819
5809aa05 13820#: builtin/update-index.c:165
7aea43ff
JX
13821msgid "directory stat info does not change after adding a new directory"
13822msgstr "添加一个新目录后,目录的状态信息未改变"
13823
5809aa05 13824#: builtin/update-index.c:178
7aea43ff
JX
13825msgid "directory stat info changes after updating a file"
13826msgstr "更新一个文件后,目录的状态信息被修改"
13827
5809aa05 13828#: builtin/update-index.c:189
7aea43ff
JX
13829msgid "directory stat info changes after adding a file inside subdirectory"
13830msgstr "在子目录中添加文件后,目录的状态信息被修改"
13831
5809aa05 13832#: builtin/update-index.c:200
7aea43ff
JX
13833msgid "directory stat info does not change after deleting a file"
13834msgstr "删除一个文件后,目录的状态信息未改变"
13835
5809aa05 13836#: builtin/update-index.c:213
7aea43ff
JX
13837msgid "directory stat info does not change after deleting a directory"
13838msgstr "删除一个目录后,目录的状态信息未改变"
13839
5809aa05 13840#: builtin/update-index.c:220
7aea43ff
JX
13841msgid " OK"
13842msgstr " OK"
13843
5809aa05 13844#: builtin/update-index.c:579
814ff314
JX
13845msgid "git update-index [<options>] [--] [<file>...]"
13846msgstr "git update-index [<选项>] [--] [<文件>...]"
8ada9598 13847
5809aa05 13848#: builtin/update-index.c:936
ef317cd5 13849msgid "continue refresh even when index needs update"
07432cef 13850msgstr "当索引需要更新时继续刷新"
8ada9598 13851
5809aa05 13852#: builtin/update-index.c:939
ef317cd5 13853msgid "refresh: ignore submodules"
07432cef 13854msgstr "刷新:忽略子模组"
8ada9598 13855
5809aa05 13856#: builtin/update-index.c:942
ef317cd5 13857msgid "do not ignore new files"
07432cef 13858msgstr "不忽略新的文件"
8ada9598 13859
5809aa05 13860#: builtin/update-index.c:944
ef317cd5 13861msgid "let files replace directories and vice-versa"
07432cef 13862msgstr "让文件替换目录(反之亦然)"
ef317cd5 13863
5809aa05 13864#: builtin/update-index.c:946
ef317cd5 13865msgid "notice files missing from worktree"
07432cef 13866msgstr "通知文件从工作区丢失"
ef317cd5 13867
5809aa05 13868#: builtin/update-index.c:948
ef317cd5 13869msgid "refresh even if index contains unmerged entries"
07432cef 13870msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 13871
5809aa05 13872#: builtin/update-index.c:951
ef317cd5 13873msgid "refresh stat information"
07432cef 13874msgstr "刷新统计信息"
ef317cd5 13875
5809aa05 13876#: builtin/update-index.c:955
ef317cd5 13877msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 13878msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 13879
5809aa05 13880#: builtin/update-index.c:959
6c94aba5 13881msgid "<mode>,<object>,<path>"
d9d56b23 13882msgstr "<存取模式>,<对象>,<路径>"
ef317cd5 13883
5809aa05 13884#: builtin/update-index.c:960
ef317cd5 13885msgid "add the specified entry to the index"
07432cef 13886msgstr "添加指定的条目到索引区"
ef317cd5 13887
5809aa05 13888#: builtin/update-index.c:969
ef317cd5 13889msgid "mark files as \"not changing\""
07432cef 13890msgstr "把文件标记为 \"没有变更\""
ef317cd5 13891
5809aa05 13892#: builtin/update-index.c:972
ef317cd5 13893msgid "clear assumed-unchanged bit"
07432cef 13894msgstr "清除 assumed-unchanged 位"
ef317cd5 13895
5809aa05 13896#: builtin/update-index.c:975
ef317cd5 13897msgid "mark files as \"index-only\""
07432cef 13898msgstr "把文件标记为 \"仅索引\""
ef317cd5 13899
5809aa05 13900#: builtin/update-index.c:978
ef317cd5 13901msgid "clear skip-worktree bit"
07432cef 13902msgstr "清除 skip-worktree 位"
ef317cd5 13903
5809aa05 13904#: builtin/update-index.c:981
ef317cd5 13905msgid "add to index only; do not add content to object database"
07432cef 13906msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 13907
5809aa05 13908#: builtin/update-index.c:983
ef317cd5 13909msgid "remove named paths even if present in worktree"
07432cef 13910msgstr "即使存在工作区里,也删除路径"
ef317cd5 13911
5809aa05 13912#: builtin/update-index.c:985
ef317cd5 13913msgid "with --stdin: input lines are terminated by null bytes"
07432cef 13914msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 13915
5809aa05 13916#: builtin/update-index.c:987
ef317cd5 13917msgid "read list of paths to be updated from standard input"
07432cef 13918msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 13919
5809aa05 13920#: builtin/update-index.c:991
ef317cd5 13921msgid "add entries from standard input to the index"
07432cef 13922msgstr "从标准输入添加条目到索引区"
ef317cd5 13923
5809aa05 13924#: builtin/update-index.c:995
ef317cd5 13925msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 13926msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 13927
5809aa05 13928#: builtin/update-index.c:999
ef317cd5 13929msgid "only update entries that differ from HEAD"
07432cef 13930msgstr "只更新与 HEAD 不同的条目"
ef317cd5 13931
5809aa05 13932#: builtin/update-index.c:1003
ef317cd5 13933msgid "ignore files missing from worktree"
07432cef 13934msgstr "忽略工作区丢失的文件"
ef317cd5 13935
5809aa05 13936#: builtin/update-index.c:1006
ef317cd5 13937msgid "report actions to standard output"
07432cef 13938msgstr "在标准输出显示操作"
ef317cd5 13939
5809aa05 13940#: builtin/update-index.c:1008
ef317cd5 13941msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 13942msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 13943
5809aa05 13944#: builtin/update-index.c:1012
ef317cd5 13945msgid "write index in this format"
07432cef 13946msgstr "以这种格式写入索引区"
ef317cd5 13947
5809aa05 13948#: builtin/update-index.c:1014
6acbf033
JX
13949msgid "enable or disable split index"
13950msgstr "启用或禁用索引拆分"
13951
5809aa05 13952#: builtin/update-index.c:1016
7aea43ff
JX
13953msgid "enable/disable untracked cache"
13954msgstr "启用/禁用对未跟踪文件的缓存"
13955
5809aa05 13956#: builtin/update-index.c:1018
276ceeaa
JX
13957msgid "test if the filesystem supports untracked cache"
13958msgstr "测试文件系统是否支持未跟踪文件缓存"
13959
5809aa05 13960#: builtin/update-index.c:1020
7aea43ff
JX
13961msgid "enable untracked cache without testing the filesystem"
13962msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
13963
5809aa05
JX
13964#: builtin/update-index.c:1022
13965msgid "write out the index even if is not flagged as changed"
13966msgstr "即使没有被标记为已更改,也要写出索引"
13967
13968#: builtin/update-index.c:1024
13969msgid "enable or disable file system monitor"
13970msgstr "启用或禁用文件系统监控"
13971
13972#: builtin/update-index.c:1026
13973msgid "mark files as fsmonitor valid"
13974msgstr "标记文件为 fsmonitor 有效"
13975
13976#: builtin/update-index.c:1029
13977msgid "clear fsmonitor valid bit"
13978msgstr "清除 fsmonitor 有效位"
13979
13980#: builtin/update-index.c:1127
87cb7997
JX
13981msgid ""
13982"core.splitIndex is set to false; remove or change it, if you really want to "
13983"enable split index"
13984msgstr ""
13985"core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。"
13986
5809aa05 13987#: builtin/update-index.c:1136
87cb7997
JX
13988msgid ""
13989"core.splitIndex is set to true; remove or change it, if you really want to "
13990"disable split index"
13991msgstr ""
13992"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。"
13993
5809aa05 13994#: builtin/update-index.c:1147
a0b6b246
JX
13995msgid ""
13996"core.untrackedCache is set to true; remove or change it, if you really want "
13997"to disable the untracked cache"
275588f9
JX
13998msgstr ""
13999"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
14000"改它。"
a0b6b246 14001
5809aa05 14002#: builtin/update-index.c:1151
276ceeaa
JX
14003msgid "Untracked cache disabled"
14004msgstr "缓存未跟踪文件被禁用"
14005
5809aa05 14006#: builtin/update-index.c:1159
a0b6b246
JX
14007msgid ""
14008"core.untrackedCache is set to false; remove or change it, if you really want "
14009"to enable the untracked cache"
275588f9
JX
14010msgstr ""
14011"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
14012"修改它。"
a0b6b246 14013
5809aa05 14014#: builtin/update-index.c:1163
276ceeaa
JX
14015#, c-format
14016msgid "Untracked cache enabled for '%s'"
14017msgstr "缓存未跟踪文件在 '%s' 启用"
14018
5809aa05
JX
14019#: builtin/update-index.c:1171
14020msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
14021msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置"
14022
14023#: builtin/update-index.c:1175
14024msgid "fsmonitor enabled"
14025msgstr "fsmonitor 被启用"
14026
14027#: builtin/update-index.c:1178
14028msgid ""
14029"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
14030msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除设置"
14031
14032#: builtin/update-index.c:1182
14033msgid "fsmonitor disabled"
14034msgstr "fsmonitor 被禁用"
14035
a4f16749 14036#: builtin/update-ref.c:10
814ff314
JX
14037msgid "git update-ref [<options>] -d <refname> [<old-val>]"
14038msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
ef317cd5 14039
a4f16749 14040#: builtin/update-ref.c:11
814ff314
JX
14041msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
14042msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
90314792 14043
a4f16749 14044#: builtin/update-ref.c:12
814ff314
JX
14045msgid "git update-ref [<options>] --stdin [-z]"
14046msgstr "git update-ref [<选项>] --stdin [-z]"
ef317cd5 14047
6937cb4e 14048#: builtin/update-ref.c:363
ef317cd5 14049msgid "delete the reference"
07432cef 14050msgstr "删除引用"
ef317cd5 14051
6937cb4e 14052#: builtin/update-ref.c:365
ef317cd5 14053msgid "update <refname> not the one it points to"
07432cef 14054msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 14055
6937cb4e 14056#: builtin/update-ref.c:366
90314792
JX
14057msgid "stdin has NUL-terminated arguments"
14058msgstr "标准输入有以 NUL 字符终止的参数"
14059
6937cb4e 14060#: builtin/update-ref.c:367
90314792
JX
14061msgid "read updates from stdin"
14062msgstr "从标准输入读取更新"
14063
a4f16749 14064#: builtin/update-server-info.c:7
ef317cd5 14065msgid "git update-server-info [--force]"
07432cef 14066msgstr "git update-server-info [--force]"
ef317cd5 14067
a4f16749 14068#: builtin/update-server-info.c:15
ef317cd5 14069msgid "update the info files from scratch"
07432cef 14070msgstr "从头开始更新文件信息"
ef317cd5 14071
a4f16749 14072#: builtin/verify-commit.c:18
814ff314
JX
14073msgid "git verify-commit [-v | --verbose] <commit>..."
14074msgstr "git verify-commit [-v | --verbose] <提交>..."
6acbf033 14075
a4f16749 14076#: builtin/verify-commit.c:73
6acbf033
JX
14077msgid "print commit contents"
14078msgstr "打印提交内容"
14079
a4f16749 14080#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
1b7f4a34
JX
14081msgid "print raw gpg status output"
14082msgstr "打印原始 gpg 状态输出"
14083
a4f16749 14084#: builtin/verify-pack.c:55
814ff314
JX
14085msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
14086msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
ef317cd5 14087
a4f16749 14088#: builtin/verify-pack.c:65
ef317cd5
JX
14089msgid "verbose"
14090msgstr "冗长输出"
14091
a4f16749 14092#: builtin/verify-pack.c:67
ef317cd5 14093msgid "show statistics only"
07432cef 14094msgstr "只显示统计"
ef317cd5 14095
a4f16749 14096#: builtin/verify-tag.c:19
1a79b2f1
JX
14097msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
14098msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
ef317cd5 14099
a4f16749 14100#: builtin/verify-tag.c:37
ef317cd5 14101msgid "print tag contents"
55a16ee4 14102msgstr "打印标签内容"
ef317cd5 14103
5809aa05 14104#: builtin/worktree.c:17
94550ed3
JX
14105msgid "git worktree add [<options>] <path> [<branch>]"
14106msgstr "git worktree add [<选项>] <路径> [<分支>]"
5bb01d4f 14107
5809aa05 14108#: builtin/worktree.c:18
5c57d762
JX
14109msgid "git worktree list [<options>]"
14110msgstr "git worktree list [<选项>]"
14111
5809aa05 14112#: builtin/worktree.c:19
5c57d762
JX
14113msgid "git worktree lock [<options>] <path>"
14114msgstr "git worktree lock [<选项>] <路径>"
14115
5809aa05 14116#: builtin/worktree.c:20
5bb01d4f
JX
14117msgid "git worktree prune [<options>]"
14118msgstr "git worktree prune [<选项>]"
14119
5809aa05 14120#: builtin/worktree.c:21
5c57d762
JX
14121msgid "git worktree unlock <path>"
14122msgstr "git worktree unlock <路径>"
94550ed3 14123
5809aa05 14124#: builtin/worktree.c:58
5bb01d4f
JX
14125#, c-format
14126msgid "Removing worktrees/%s: not a valid directory"
14127msgstr "删除工作区/%s:不是一个有效的目录"
14128
5809aa05 14129#: builtin/worktree.c:64
5bb01d4f
JX
14130#, c-format
14131msgid "Removing worktrees/%s: gitdir file does not exist"
14132msgstr "删除 worktrees/%s:gitdir 文件不存在"
14133
5809aa05 14134#: builtin/worktree.c:69 builtin/worktree.c:78
5bb01d4f
JX
14135#, c-format
14136msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
14137msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
14138
5809aa05 14139#: builtin/worktree.c:88
6937cb4e
JX
14140#, c-format
14141msgid ""
14142"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
14143"%<PRIuMAX>)"
14144msgstr "删除工作树/%s:读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)"
14145
5809aa05 14146#: builtin/worktree.c:96
5bb01d4f
JX
14147#, c-format
14148msgid "Removing worktrees/%s: invalid gitdir file"
14149msgstr "删除 worktrees/%s:无效的 gitdir 文件"
14150
5809aa05 14151#: builtin/worktree.c:112
5bb01d4f
JX
14152#, c-format
14153msgid "Removing worktrees/%s: gitdir file points to non-existent location"
14154msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
14155
5809aa05 14156#: builtin/worktree.c:159
1a79b2f1
JX
14157msgid "report pruned working trees"
14158msgstr "报告清除的工作区"
14159
5809aa05 14160#: builtin/worktree.c:161
1a79b2f1 14161msgid "expire working trees older than <time>"
58b6f078 14162msgstr "将早于 <时间> 的工作区过期"
1a79b2f1 14163
5809aa05 14164#: builtin/worktree.c:236
5bb01d4f
JX
14165#, c-format
14166msgid "'%s' already exists"
14167msgstr "'%s' 已经存在"
14168
5809aa05 14169#: builtin/worktree.c:267
5bb01d4f
JX
14170#, c-format
14171msgid "could not create directory of '%s'"
14172msgstr "不能创建目录 '%s'"
14173
5809aa05 14174#: builtin/worktree.c:306
5bb01d4f 14175#, c-format
1b7f4a34 14176msgid "Preparing %s (identifier %s)"
29004bbb 14177msgstr "准备 %s(标识符 %s)"
5bb01d4f 14178
5809aa05 14179#: builtin/worktree.c:368
5bb01d4f 14180msgid "checkout <branch> even if already checked out in other worktree"
58b6f078 14181msgstr "检出 <分支>,即使已经被检出到其它工作区"
5bb01d4f 14182
5809aa05 14183#: builtin/worktree.c:370
5bb01d4f
JX
14184msgid "create a new branch"
14185msgstr "创建一个新分支"
14186
5809aa05 14187#: builtin/worktree.c:372
5bb01d4f
JX
14188msgid "create or reset a branch"
14189msgstr "创建或重置一个分支"
14190
5809aa05 14191#: builtin/worktree.c:374
5b04ee3b
JX
14192msgid "populate the new working tree"
14193msgstr "生成新的工作区"
14194
5809aa05 14195#: builtin/worktree.c:375
60638e98
JX
14196msgid "keep the new working tree locked"
14197msgstr "锁定新工作区"
14198
5809aa05
JX
14199#: builtin/worktree.c:377
14200msgid "set up tracking mode (see git-branch(1))"
14201msgstr "设置跟踪模式(参见 git-branch(1))"
14202
14203#: builtin/worktree.c:380
14204msgid "try to match the new branch name with a remote-tracking branch"
14205msgstr "尝试为新分支名匹配一个远程跟踪分支"
14206
14207#: builtin/worktree.c:388
1b7f4a34
JX
14208msgid "-b, -B, and --detach are mutually exclusive"
14209msgstr "-b、-B 和 --detach 是互斥的"
5bb01d4f 14210
5809aa05
JX
14211#: builtin/worktree.c:453
14212msgid "--[no-]track can only be used if a new branch is created"
14213msgstr "只能在创建新分支时使用选项 --[no-]track "
14214
14215#: builtin/worktree.c:553
5c57d762
JX
14216msgid "reason for locking"
14217msgstr "锁定原因"
14218
5809aa05 14219#: builtin/worktree.c:565 builtin/worktree.c:598
5c57d762
JX
14220#, c-format
14221msgid "'%s' is not a working tree"
14222msgstr "'%s' 不是一个工作区"
14223
5809aa05 14224#: builtin/worktree.c:567 builtin/worktree.c:600
5c57d762
JX
14225msgid "The main working tree cannot be locked or unlocked"
14226msgstr "主工作区无法被加锁或解锁"
14227
5809aa05 14228#: builtin/worktree.c:572
5c57d762
JX
14229#, c-format
14230msgid "'%s' is already locked, reason: %s"
14231msgstr "'%s' 已被锁定,原因:%s"
14232
5809aa05 14233#: builtin/worktree.c:574
5c57d762
JX
14234#, c-format
14235msgid "'%s' is already locked"
14236msgstr "'%s' 已被锁定"
14237
5809aa05 14238#: builtin/worktree.c:602
5c57d762
JX
14239#, c-format
14240msgid "'%s' is not locked"
14241msgstr "'%s' 未被锁定"
14242
a4f16749 14243#: builtin/write-tree.c:14
ef317cd5 14244msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 14245msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5 14246
a4f16749 14247#: builtin/write-tree.c:27
ef317cd5 14248msgid "<prefix>/"
07432cef 14249msgstr "<前缀>/"
ef317cd5 14250
a4f16749 14251#: builtin/write-tree.c:28
ef317cd5 14252msgid "write tree object for a subdirectory <prefix>"
07432cef 14253msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5 14254
a4f16749 14255#: builtin/write-tree.c:31
ef317cd5 14256msgid "only useful for debugging"
07432cef 14257msgstr "只对调试有用"
ef317cd5 14258
5809aa05 14259#: upload-pack.c:24
5c57d762
JX
14260msgid "git upload-pack [<options>] <dir>"
14261msgstr "git upload-pack [<选项>] <目录>"
14262
5809aa05 14263#: upload-pack.c:1041
5c57d762
JX
14264msgid "quit after a single request/response exchange"
14265msgstr "在一次单独的请求/响应(request/response)交换后退出"
14266
5809aa05 14267#: upload-pack.c:1043
5c57d762
JX
14268msgid "exit immediately after initial ref advertisement"
14269msgstr "在初始的引用广告后立即退出"
14270
5809aa05 14271#: upload-pack.c:1045
5c57d762 14272msgid "do not try <directory>/.git/ if <directory> is no Git directory"
58b6f078 14273msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/"
5c57d762 14274
5809aa05 14275#: upload-pack.c:1047
5c57d762
JX
14276msgid "interrupt transfer after <n> seconds of inactivity"
14277msgstr "不活动 <n> 秒钟后终止传输"
14278
6937cb4e 14279#: credential-cache--daemon.c:222
a0b6b246
JX
14280#, c-format
14281msgid ""
14282"The permissions on your socket directory are too loose; other\n"
14283"users may be able to read your cached credentials. Consider running:\n"
14284"\n"
14285"\tchmod 0700 %s"
14286msgstr ""
1a79b2f1
JX
14287"您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
14288"行:\n"
a0b6b246
JX
14289"\n"
14290"\tchmod 0700 %s"
14291
6937cb4e 14292#: credential-cache--daemon.c:271
220c313c
JX
14293msgid "print debugging messages to stderr"
14294msgstr "调试信息输出到标准错误"
14295
a4f16749 14296#: git.c:15
4dcdc3d8 14297msgid ""
220c313c 14298"'git help -a' and 'git help -g' list available subcommands and some\n"
4dcdc3d8
JX
14299"concept guides. See 'git help <command>' or 'git help <concept>'\n"
14300"to read about a specific subcommand or concept."
14301msgstr ""
220c313c
JX
14302"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
14303"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
14304"帮助。"
8ada9598 14305
5809aa05 14306#: http.c:339
60638e98
JX
14307#, c-format
14308msgid "negative value for http.postbuffer; defaulting to %d"
14309msgstr "http.postbuffer 为负值,默认为 %d"
14310
5809aa05 14311#: http.c:360
a0b6b246
JX
14312msgid "Delegation control is not supported with cURL < 7.22.0"
14313msgstr "当 cURL < 7.22.0 时,不支持委托控制"
14314
5809aa05 14315#: http.c:369
276ceeaa
JX
14316msgid "Public key pinning not supported with cURL < 7.44.0"
14317msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
14318
5809aa05 14319#: http.c:1791
1a79b2f1
JX
14320#, c-format
14321msgid ""
14322"unable to update url base from redirection:\n"
14323" asked for: %s\n"
14324" redirect: %s"
14325msgstr ""
14326"不能更新重定向的 url base:\n"
14327" 请求:%s\n"
14328" 重定向:%s"
14329
a4f16749 14330#: remote-curl.c:324
1a79b2f1
JX
14331#, c-format
14332msgid "redirecting to %s"
14333msgstr "重定向到 %s"
14334
5809aa05
JX
14335#: list-objects-filter-options.h:54
14336msgid "args"
14337msgstr "参数"
14338
14339#: list-objects-filter-options.h:55
14340msgid "object filtering"
14341msgstr "对象过滤"
14342
1b7f4a34 14343#: common-cmds.h:9
7aea43ff
JX
14344msgid "start a working area (see also: git help tutorial)"
14345msgstr "开始一个工作区(参见:git help tutorial)"
14346
1b7f4a34 14347#: common-cmds.h:10
7aea43ff
JX
14348msgid "work on the current change (see also: git help everyday)"
14349msgstr "在当前变更上工作(参见:git help everyday)"
14350
1b7f4a34 14351#: common-cmds.h:11
7aea43ff
JX
14352msgid "examine the history and state (see also: git help revisions)"
14353msgstr "检查历史和状态(参见:git help revisions)"
14354
1b7f4a34 14355#: common-cmds.h:12
7aea43ff
JX
14356msgid "grow, mark and tweak your common history"
14357msgstr "扩展、标记和调校您的历史记录"
14358
1b7f4a34 14359#: common-cmds.h:13
7aea43ff
JX
14360msgid "collaborate (see also: git help workflows)"
14361msgstr "协同(参见:git help workflows)"
14362
1b7f4a34 14363#: common-cmds.h:17
8ada9598 14364msgid "Add file contents to the index"
81809b99 14365msgstr "添加文件内容至索引"
8ada9598 14366
1b7f4a34
JX
14367#: common-cmds.h:18
14368msgid "Use binary search to find the commit that introduced a bug"
14369msgstr "通过二分查找定位引入 bug 的提交"
8ada9598 14370
1b7f4a34 14371#: common-cmds.h:19
8ada9598 14372msgid "List, create, or delete branches"
81809b99 14373msgstr "列出、创建或删除分支"
8ada9598 14374
1b7f4a34 14375#: common-cmds.h:20
5bb01d4f
JX
14376msgid "Switch branches or restore working tree files"
14377msgstr "切换分支或恢复工作区文件"
8ada9598 14378
1b7f4a34 14379#: common-cmds.h:21
8ada9598 14380msgid "Clone a repository into a new directory"
160fb2b2 14381msgstr "克隆一个仓库到一个新目录"
8ada9598 14382
1b7f4a34 14383#: common-cmds.h:22
8ada9598 14384msgid "Record changes to the repository"
160fb2b2 14385msgstr "记录变更到仓库"
8ada9598 14386
1b7f4a34 14387#: common-cmds.h:23
8ada9598 14388msgid "Show changes between commits, commit and working tree, etc"
81809b99 14389msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598 14390
1b7f4a34 14391#: common-cmds.h:24
8ada9598 14392msgid "Download objects and refs from another repository"
160fb2b2 14393msgstr "从另外一个仓库下载对象和引用"
8ada9598 14394
1b7f4a34 14395#: common-cmds.h:25
8ada9598 14396msgid "Print lines matching a pattern"
81809b99 14397msgstr "输出和模式匹配的行"
8ada9598 14398
1b7f4a34 14399#: common-cmds.h:26
a77c07d9 14400msgid "Create an empty Git repository or reinitialize an existing one"
160fb2b2 14401msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
8ada9598 14402
1b7f4a34 14403#: common-cmds.h:27
8ada9598 14404msgid "Show commit logs"
81809b99 14405msgstr "显示提交日志"
8ada9598 14406
1b7f4a34 14407#: common-cmds.h:28
8ada9598 14408msgid "Join two or more development histories together"
81809b99 14409msgstr "合并两个或更多开发历史"
8ada9598 14410
1b7f4a34 14411#: common-cmds.h:29
8ada9598 14412msgid "Move or rename a file, a directory, or a symlink"
81809b99 14413msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598 14414
1b7f4a34 14415#: common-cmds.h:30
2e8451e8 14416msgid "Fetch from and integrate with another repository or a local branch"
160fb2b2 14417msgstr "获取并整合另外的仓库或一个本地分支"
8ada9598 14418
1b7f4a34 14419#: common-cmds.h:31
8ada9598 14420msgid "Update remote refs along with associated objects"
81809b99 14421msgstr "更新远程引用和相关的对象"
8ada9598 14422
1b7f4a34 14423#: common-cmds.h:32
3495628d
JX
14424msgid "Reapply commits on top of another base tip"
14425msgstr "在另一个分支上重新应用提交"
8ada9598 14426
1b7f4a34 14427#: common-cmds.h:33
8ada9598 14428msgid "Reset current HEAD to the specified state"
4375c10e 14429msgstr "重置当前 HEAD 到指定状态"
8ada9598 14430
1b7f4a34 14431#: common-cmds.h:34
8ada9598 14432msgid "Remove files from the working tree and from the index"
81809b99 14433msgstr "从工作区和索引中删除文件"
8ada9598 14434
1b7f4a34 14435#: common-cmds.h:35
8ada9598 14436msgid "Show various types of objects"
81809b99 14437msgstr "显示各种类型的对象"
8ada9598 14438
1b7f4a34 14439#: common-cmds.h:36
8ada9598 14440msgid "Show the working tree status"
81809b99 14441msgstr "显示工作区状态"
8ada9598 14442
1b7f4a34 14443#: common-cmds.h:37
8ada9598 14444msgid "Create, list, delete or verify a tag object signed with GPG"
4375c10e 14445msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
8ada9598 14446
1b7f4a34 14447#: parse-options.h:145
220c313c
JX
14448msgid "expiry-date"
14449msgstr "到期时间"
14450
1b7f4a34 14451#: parse-options.h:160
220c313c
JX
14452msgid "no-op (backward compatibility)"
14453msgstr "空操作(向后兼容)"
14454
a0b6b246 14455#: parse-options.h:238
220c313c
JX
14456msgid "be more verbose"
14457msgstr "更加详细"
14458
a0b6b246 14459#: parse-options.h:240
220c313c
JX
14460msgid "be more quiet"
14461msgstr "更加安静"
14462
a0b6b246 14463#: parse-options.h:246
220c313c
JX
14464msgid "use <n> digits to display SHA-1s"
14465msgstr "用 <n> 位数字显示 SHA-1 哈希值"
14466
5b04ee3b 14467#: rerere.h:40
220c313c
JX
14468msgid "update the index with reused conflict resolution if possible"
14469msgstr "如果可能,重用冲突解决更新索引"
14470
5c57d762 14471#: git-bisect.sh:54
b694fbb1
JX
14472msgid "You need to start by \"git bisect start\""
14473msgstr "您需要执行 \"git bisect start\" 来开始"
14474
90e6ef53 14475# 译者:注意保持句尾空格
c04f5ac3
JX
14476#. TRANSLATORS: Make sure to include [Y] and [n] in your
14477#. translation. The program will only accept English input
14478#. at this point.
5c57d762 14479#: git-bisect.sh:60
c04f5ac3
JX
14480msgid "Do you want me to do it for you [Y/n]? "
14481msgstr "您想让我为您这样做么[Y/n]? "
14482
5c57d762 14483#: git-bisect.sh:121
c04f5ac3
JX
14484#, sh-format
14485msgid "unrecognised option: '$arg'"
81809b99 14486msgstr "未能识别的选项:'$arg'"
c04f5ac3 14487
5c57d762 14488#: git-bisect.sh:125
c04f5ac3
JX
14489#, sh-format
14490msgid "'$arg' does not appear to be a valid revision"
14491msgstr "'$arg' 看起来不像是一个有效的版本"
14492
5c57d762 14493#: git-bisect.sh:154
c04f5ac3
JX
14494msgid "Bad HEAD - I need a HEAD"
14495msgstr "坏的 HEAD - 我需要一个 HEAD"
14496
5c57d762 14497#: git-bisect.sh:167
c04f5ac3
JX
14498#, sh-format
14499msgid ""
814ff314 14500"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
d9d56b23 14501msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
c04f5ac3 14502
5c57d762 14503#: git-bisect.sh:177
cfff71a9
JX
14504msgid "won't bisect on cg-seek'ed tree"
14505msgstr "不会在做了 cg-seek 的树上做二分查找"
c04f5ac3 14506
5c57d762 14507#: git-bisect.sh:181
c04f5ac3 14508msgid "Bad HEAD - strange symbolic ref"
90e6ef53 14509msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3 14510
5c57d762 14511#: git-bisect.sh:233
c04f5ac3
JX
14512#, sh-format
14513msgid "Bad bisect_write argument: $state"
90e6ef53 14514msgstr "坏的 bisect_write 参数:$state"
c04f5ac3 14515
5809aa05 14516#: git-bisect.sh:246
c04f5ac3
JX
14517#, sh-format
14518msgid "Bad rev input: $arg"
9a4b694c 14519msgstr "坏的输入版本:$arg"
c04f5ac3 14520
5809aa05 14521#: git-bisect.sh:265
5c57d762
JX
14522#, sh-format
14523msgid "Bad rev input: $bisected_head"
9a4b694c 14524msgstr "坏的输入版本:$bisected_head"
c04f5ac3 14525
5809aa05 14526#: git-bisect.sh:274
c04f5ac3
JX
14527#, sh-format
14528msgid "Bad rev input: $rev"
9a4b694c 14529msgstr "坏的输入版本:$rev"
c04f5ac3 14530
5809aa05 14531#: git-bisect.sh:283
1b7f4a34
JX
14532#, sh-format
14533msgid "'git bisect $TERM_BAD' can take only one argument."
14534msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
14535
5809aa05 14536#: git-bisect.sh:306
1b7f4a34
JX
14537#, sh-format
14538msgid "Warning: bisecting only with a $TERM_BAD commit."
14539msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
b694fbb1 14540
90e6ef53 14541# 译者:注意保持句尾空格
c04f5ac3
JX
14542#. TRANSLATORS: Make sure to include [Y] and [n] in your
14543#. translation. The program will only accept English input
14544#. at this point.
5809aa05 14545#: git-bisect.sh:312
c04f5ac3
JX
14546msgid "Are you sure [Y/n]? "
14547msgstr "您确认么[Y/n]? "
14548
5809aa05 14549#: git-bisect.sh:324
1b7f4a34 14550#, sh-format
b694fbb1 14551msgid ""
1b7f4a34
JX
14552"You need to give me at least one $bad_syn and one $good_syn revision.\n"
14553"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
b694fbb1
JX
14554msgstr ""
14555"您需要给我至少一个好版本和一个坏版本。\n"
1b7f4a34 14556"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
b694fbb1 14557
5809aa05 14558#: git-bisect.sh:327
1b7f4a34 14559#, sh-format
b694fbb1
JX
14560msgid ""
14561"You need to start by \"git bisect start\".\n"
1b7f4a34
JX
14562"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
14563"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
b694fbb1
JX
14564msgstr ""
14565"您需要执行 \"git bisect start\" 来开始。\n"
14566"然后需要提供我至少一个好版本和一个坏版本。\n"
1b7f4a34 14567"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
b694fbb1 14568
5809aa05 14569#: git-bisect.sh:398 git-bisect.sh:512
b694fbb1
JX
14570msgid "We are not bisecting."
14571msgstr "我们没有在二分查找。"
14572
5809aa05 14573#: git-bisect.sh:405
c04f5ac3
JX
14574#, sh-format
14575msgid "'$invalid' is not a valid commit"
14576msgstr "'$invalid' 不是一个有效的提交"
14577
5809aa05 14578#: git-bisect.sh:414
c04f5ac3
JX
14579#, sh-format
14580msgid ""
14581"Could not check out original HEAD '$branch'.\n"
14582"Try 'git bisect reset <commit>'."
14583msgstr ""
14584"不能检出原始 HEAD '$branch'。\n"
07432cef 14585"尝试 'git bisect reset <提交>'。"
c04f5ac3 14586
5809aa05 14587#: git-bisect.sh:422
c04f5ac3
JX
14588msgid "No logfile given"
14589msgstr "未提供日志文件"
14590
5809aa05 14591#: git-bisect.sh:423
c04f5ac3
JX
14592#, sh-format
14593msgid "cannot read $file for replaying"
14594msgstr "不能读取 $file 来重放"
14595
5809aa05 14596#: git-bisect.sh:444
c04f5ac3
JX
14597msgid "?? what are you talking about?"
14598msgstr "?? 您在说什么?"
14599
5809aa05
JX
14600#: git-bisect.sh:453
14601msgid "bisect run failed: no command provided."
14602msgstr "二分查找运行失败:没有提供命令。"
14603
14604#: git-bisect.sh:458
b694fbb1
JX
14605#, sh-format
14606msgid "running $command"
14607msgstr "运行 $command"
14608
5809aa05 14609#: git-bisect.sh:465
b694fbb1
JX
14610#, sh-format
14611msgid ""
14612"bisect run failed:\n"
14613"exit code $res from '$command' is < 0 or >= 128"
14614msgstr ""
14615"二分查找运行失败:\n"
07432cef 14616"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 14617
5809aa05 14618#: git-bisect.sh:491
b694fbb1
JX
14619msgid "bisect run cannot continue any more"
14620msgstr "二分查找不能继续运行"
14621
5809aa05 14622#: git-bisect.sh:497
b694fbb1
JX
14623#, sh-format
14624msgid ""
14625"bisect run failed:\n"
14626"'bisect_state $state' exited with error code $res"
14627msgstr ""
14628"二分查找运行失败:\n"
14629"'bisect_state $state' 退出码为 $res"
14630
5809aa05 14631#: git-bisect.sh:504
b694fbb1
JX
14632msgid "bisect run success"
14633msgstr "二分查找运行成功"
c04f5ac3 14634
5809aa05 14635#: git-bisect.sh:533
b694fbb1 14636#, sh-format
1b7f4a34
JX
14637msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
14638msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
c04f5ac3 14639
5809aa05 14640#: git-bisect.sh:567
94550ed3
JX
14641msgid "no terms defined"
14642msgstr "未定义术语"
14643
5809aa05 14644#: git-bisect.sh:584
94550ed3
JX
14645#, sh-format
14646msgid ""
14647"invalid argument $arg for 'git bisect terms'.\n"
14648"Supported options are: --term-good|--term-old and --term-bad|--term-new."
14649msgstr ""
14650"参数 $arg 对命令 'git bisect terms' 无效。\n"
14651"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
14652
5c57d762
JX
14653#: git-merge-octopus.sh:46
14654msgid ""
14655"Error: Your local changes to the following files would be overwritten by "
14656"merge"
14657msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
14658
14659#: git-merge-octopus.sh:61
14660msgid "Automated merge did not work."
9a4b694c 14661msgstr "自动合并未生效。"
5c57d762
JX
14662
14663#: git-merge-octopus.sh:62
a0b6b246 14664msgid "Should not be doing an octopus."
5c57d762
JX
14665msgstr "不应该执行章鱼式合并。"
14666
14667#: git-merge-octopus.sh:73
14668#, sh-format
14669msgid "Unable to find common commit with $pretty_name"
14670msgstr "无法找到和 $pretty_name 的基线提交"
14671
14672#: git-merge-octopus.sh:77
14673#, sh-format
6937cb4e 14674msgid "Already up to date with $pretty_name"
5c57d762
JX
14675msgstr "已经和 $pretty_name 保持一致"
14676
14677#: git-merge-octopus.sh:89
14678#, sh-format
14679msgid "Fast-forwarding to: $pretty_name"
14680msgstr "快进至:$pretty_name"
14681
14682#: git-merge-octopus.sh:97
14683#, sh-format
14684msgid "Trying simple merge with $pretty_name"
14685msgstr "尝试和 $pretty_name 的简单合并"
14686
14687#: git-merge-octopus.sh:102
14688msgid "Simple merge did not work, trying automatic merge."
9a4b694c 14689msgstr "简单合并未生效,尝试自动合并。"
5c57d762 14690
60638e98 14691#: git-rebase.sh:58
649900bc 14692msgid ""
6937cb4e
JX
14693"Resolve all conflicts manually, mark them as resolved with\n"
14694"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
14695"You can instead skip this commit: run \"git rebase --skip\".\n"
14696"To abort and get back to the state before \"git rebase\", run \"git rebase --"
14697"abort\"."
649900bc 14698msgstr ""
58b6f078 14699"手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n"
6937cb4e
JX
14700"冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n"
14701"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
14702"\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。"
649900bc 14703
6937cb4e 14704#: git-rebase.sh:160 git-rebase.sh:402
5c57d762
JX
14705#, sh-format
14706msgid "Could not move back to $head_name"
14707msgstr "无法移回 $head_name"
14708
6937cb4e 14709#: git-rebase.sh:171
a4f16749
JX
14710msgid "Applied autostash."
14711msgstr "成功应用 autostash。"
14712
6937cb4e 14713#: git-rebase.sh:174
2e8451e8
JX
14714#, sh-format
14715msgid "Cannot store $stash_sha1"
14716msgstr "无法保存 $stash_sha1"
14717
6937cb4e 14718#: git-rebase.sh:214
649900bc 14719msgid "The pre-rebase hook refused to rebase."
98b2761d 14720msgstr "钩子 pre-rebase 拒绝变基操作。"
649900bc 14721
6937cb4e 14722#: git-rebase.sh:219
5809aa05
JX
14723msgid "It looks like 'git am' is in progress. Cannot rebase."
14724msgstr "看起来 'git-am' 正在执行中。无法变基。"
649900bc 14725
6937cb4e 14726#: git-rebase.sh:363
649900bc
JX
14727msgid "No rebase in progress?"
14728msgstr "没有正在进行的变基?"
14729
6937cb4e 14730#: git-rebase.sh:374
07432cef
WS
14731msgid "The --edit-todo action can only be used during interactive rebase."
14732msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
14733
6937cb4e 14734#: git-rebase.sh:381
649900bc
JX
14735msgid "Cannot read HEAD"
14736msgstr "不能读取 HEAD"
14737
6937cb4e 14738#: git-rebase.sh:384
649900bc
JX
14739msgid ""
14740"You must edit all merge conflicts and then\n"
14741"mark them as resolved using git add"
14742msgstr ""
14743"您必须编辑所有的合并冲突,然后通过 git add\n"
14744"命令将它们标记为已解决"
14745
6937cb4e 14746#: git-rebase.sh:424
649900bc
JX
14747#, sh-format
14748msgid ""
14749"It seems that there is already a $state_dir_base directory, and\n"
14750"I wonder if you are in the middle of another rebase. If that is the\n"
14751"case, please try\n"
14752"\t$cmd_live_rebase\n"
14753"If that is not the case, please\n"
14754"\t$cmd_clear_stale_rebase\n"
14755"and run me again. I am stopping in case you still have something\n"
14756"valuable there."
14757msgstr ""
98b2761d
JX
14758"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
14759"过程中。 如果是这样,请执行\n"
649900bc
JX
14760"\t$cmd_live_rebase\n"
14761"如果不是这样,请执行\n"
14762"\t$cmd_clear_stale_rebase\n"
98b2761d 14763"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
649900bc 14764
6937cb4e 14765#: git-rebase.sh:480
649900bc 14766#, sh-format
5809aa05
JX
14767msgid "invalid upstream '$upstream_name'"
14768msgstr "无效的上游 '$upstream_name'"
649900bc 14769
6937cb4e 14770#: git-rebase.sh:504
649900bc
JX
14771#, sh-format
14772msgid "$onto_name: there are more than one merge bases"
14773msgstr "$onto_name: 有一个以上的合并基准"
14774
6937cb4e 14775#: git-rebase.sh:507 git-rebase.sh:511
649900bc
JX
14776#, sh-format
14777msgid "$onto_name: there is no merge base"
14778msgstr "$onto_name: 没有合并基准"
14779
6937cb4e 14780#: git-rebase.sh:516
649900bc
JX
14781#, sh-format
14782msgid "Does not point to a valid commit: $onto_name"
14783msgstr "没有指向一个有效的提交:$onto_name"
14784
5809aa05 14785#: git-rebase.sh:542
649900bc 14786#, sh-format
5809aa05
JX
14787msgid "fatal: no such branch/commit '$branch_name'"
14788msgstr "严重错误:无此分支/提交 '$branch_name'"
649900bc 14789
5809aa05 14790#: git-rebase.sh:575
2e8451e8
JX
14791msgid "Cannot autostash"
14792msgstr "无法 autostash"
14793
5809aa05 14794#: git-rebase.sh:580
2e8451e8
JX
14795#, sh-format
14796msgid "Created autostash: $stash_abbrev"
14797msgstr "创建了 autostash: $stash_abbrev"
14798
5809aa05 14799#: git-rebase.sh:584
649900bc 14800msgid "Please commit or stash them."
a4f16749 14801msgstr "请提交或贮藏修改。"
649900bc 14802
5809aa05
JX
14803#: git-rebase.sh:607
14804#, sh-format
14805msgid "HEAD is up to date."
14806msgstr "HEAD 是最新的。"
14807
14808#: git-rebase.sh:609
649900bc
JX
14809#, sh-format
14810msgid "Current branch $branch_name is up to date."
14811msgstr "当前分支 $branch_name 是最新的。"
14812
5809aa05
JX
14813#: git-rebase.sh:617
14814#, sh-format
14815msgid "HEAD is up to date, rebase forced."
14816msgstr "HEAD 是最新的,强制变基。"
14817
14818#: git-rebase.sh:619
649900bc
JX
14819#, sh-format
14820msgid "Current branch $branch_name is up to date, rebase forced."
14821msgstr "当前分支 $branch_name 是最新的,强制变基。"
14822
5809aa05 14823#: git-rebase.sh:631
649900bc
JX
14824#, sh-format
14825msgid "Changes from $mb to $onto:"
14826msgstr "变更从 $mb 到 $onto:"
14827
5809aa05 14828#: git-rebase.sh:640
649900bc 14829msgid "First, rewinding head to replay your work on top of it..."
160fb2b2 14830msgstr "首先,回退分支以便在上面重放您的工作..."
649900bc 14831
5809aa05 14832#: git-rebase.sh:650
649900bc
JX
14833#, sh-format
14834msgid "Fast-forwarded $branch_name to $onto_name."
14835msgstr "快进 $branch_name 至 $onto_name。"
14836
6937cb4e 14837#: git-stash.sh:61
c04f5ac3
JX
14838msgid "git stash clear with parameters is unimplemented"
14839msgstr "git stash clear 不支持参数"
14840
5809aa05 14841#: git-stash.sh:108
c04f5ac3
JX
14842msgid "You do not have the initial commit yet"
14843msgstr "您尚未建立初始提交"
14844
5809aa05 14845#: git-stash.sh:123
c04f5ac3 14846msgid "Cannot save the current index state"
90e6ef53 14847msgstr "无法保存当前索引状态"
c04f5ac3 14848
5809aa05 14849#: git-stash.sh:138
a0b6b246
JX
14850msgid "Cannot save the untracked files"
14851msgstr "无法保存未跟踪文件"
14852
5809aa05 14853#: git-stash.sh:158 git-stash.sh:171
c04f5ac3
JX
14854msgid "Cannot save the current worktree state"
14855msgstr "无法保存当前工作区状态"
14856
5809aa05 14857#: git-stash.sh:175
c04f5ac3 14858msgid "No changes selected"
90e6ef53 14859msgstr "没有选择变更"
c04f5ac3 14860
5809aa05 14861#: git-stash.sh:178
c04f5ac3 14862msgid "Cannot remove temporary index (can't happen)"
90e6ef53 14863msgstr "无法删除临时索引(不应发生)"
c04f5ac3 14864
5809aa05 14865#: git-stash.sh:191
c04f5ac3
JX
14866msgid "Cannot record working tree state"
14867msgstr "不能记录工作区状态"
14868
5809aa05 14869#: git-stash.sh:229
2e8451e8
JX
14870#, sh-format
14871msgid "Cannot update $ref_stash with $w_commit"
14872msgstr "无法用 $w_commit 更新 $ref_stash"
14873
5809aa05 14874#: git-stash.sh:281
b694fbb1 14875#, sh-format
5809aa05
JX
14876msgid "error: unknown option for 'stash push': $option"
14877msgstr "错误:'stash push' 的未知选项:$option"
b694fbb1 14878
5809aa05 14879#: git-stash.sh:295
a0b6b246
JX
14880msgid "Can't use --patch and --include-untracked or --all at the same time"
14881msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
14882
5809aa05 14883#: git-stash.sh:303
c04f5ac3
JX
14884msgid "No local changes to save"
14885msgstr "没有要保存的本地修改"
14886
5809aa05 14887#: git-stash.sh:308
c04f5ac3 14888msgid "Cannot initialize stash"
a4f16749 14889msgstr "无法初始化贮藏"
c04f5ac3 14890
5809aa05 14891#: git-stash.sh:312
c04f5ac3
JX
14892msgid "Cannot save the current status"
14893msgstr "无法保存当前状态"
14894
5809aa05 14895#: git-stash.sh:313
5c57d762
JX
14896#, sh-format
14897msgid "Saved working directory and index state $stash_msg"
14898msgstr "保存工作目录和索引状态 $stash_msg"
14899
5809aa05 14900#: git-stash.sh:341
c04f5ac3
JX
14901msgid "Cannot remove worktree changes"
14902msgstr "无法删除工作区变更"
14903
5809aa05 14904#: git-stash.sh:489
7aea43ff
JX
14905#, sh-format
14906msgid "unknown option: $opt"
14907msgstr "未知选项: $opt"
14908
5809aa05 14909#: git-stash.sh:502
a4f16749
JX
14910msgid "No stash entries found."
14911msgstr "未发现贮藏条目。"
c04f5ac3 14912
5809aa05 14913#: git-stash.sh:509
c04f5ac3
JX
14914#, sh-format
14915msgid "Too many revisions specified: $REV"
90e6ef53 14916msgstr "指定了太多的版本:$REV"
c04f5ac3 14917
5809aa05 14918#: git-stash.sh:524
c04f5ac3 14919#, sh-format
220c313c
JX
14920msgid "$reference is not a valid reference"
14921msgstr "$reference 不是一个有效的引用"
c04f5ac3 14922
5809aa05 14923#: git-stash.sh:552
c04f5ac3
JX
14924#, sh-format
14925msgid "'$args' is not a stash-like commit"
a4f16749 14926msgstr "'$args' 不是贮藏式提交"
c04f5ac3 14927
5809aa05 14928#: git-stash.sh:563
c04f5ac3
JX
14929#, sh-format
14930msgid "'$args' is not a stash reference"
a4f16749 14931msgstr "'$args' 不是一个贮藏引用"
c04f5ac3 14932
5809aa05 14933#: git-stash.sh:571
c04f5ac3 14934msgid "unable to refresh index"
90e6ef53 14935msgstr "无法刷新索引"
c04f5ac3 14936
5809aa05 14937#: git-stash.sh:575
c04f5ac3 14938msgid "Cannot apply a stash in the middle of a merge"
a4f16749 14939msgstr "无法在合并过程应用贮藏"
c04f5ac3 14940
5809aa05 14941#: git-stash.sh:583
c04f5ac3 14942msgid "Conflicts in index. Try without --index."
90e6ef53 14943msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3 14944
5809aa05 14945#: git-stash.sh:585
c04f5ac3 14946msgid "Could not save index tree"
90e6ef53 14947msgstr "不能保存索引树"
c04f5ac3 14948
5809aa05 14949#: git-stash.sh:594
a4f16749
JX
14950msgid "Could not restore untracked files from stash entry"
14951msgstr "无法从贮藏条目中恢复未跟踪文件"
a0b6b246 14952
5809aa05 14953#: git-stash.sh:619
c04f5ac3 14954msgid "Cannot unstage modified files"
160fb2b2 14955msgstr "无法将修改的文件取消暂存"
c04f5ac3 14956
5809aa05 14957#: git-stash.sh:634
b694fbb1 14958msgid "Index was not unstashed."
a4f16749 14959msgstr "索引未从贮藏中恢复。"
b694fbb1 14960
5809aa05 14961#: git-stash.sh:648
a4f16749
JX
14962msgid "The stash entry is kept in case you need it again."
14963msgstr "贮藏条目被保留以备您再次需要。"
5c57d762 14964
5809aa05 14965#: git-stash.sh:657
c04f5ac3
JX
14966#, sh-format
14967msgid "Dropped ${REV} ($s)"
14968msgstr "丢弃了 ${REV} ($s)"
14969
5809aa05 14970#: git-stash.sh:658
c04f5ac3
JX
14971#, sh-format
14972msgid "${REV}: Could not drop stash entry"
a4f16749 14973msgstr "${REV}:无法丢弃贮藏条目"
c04f5ac3 14974
5809aa05 14975#: git-stash.sh:666
c04f5ac3
JX
14976msgid "No branch name specified"
14977msgstr "未指定分支名"
14978
5809aa05 14979#: git-stash.sh:745
c04f5ac3
JX
14980msgid "(To restore them type \"git stash apply\")"
14981msgstr "(为恢复数据输入 \"git stash apply\")"
14982
1a79b2f1 14983#: git-submodule.sh:181
2e8451e8
JX
14984msgid "Relative path can only be used from the toplevel of the working tree"
14985msgstr "只能在工作区的顶级目录中使用相对路径"
14986
1a79b2f1 14987#: git-submodule.sh:191
c04f5ac3
JX
14988#, sh-format
14989msgid "repo URL: '$repo' must be absolute or begin with ./|../"
4375c10e 14990msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
c04f5ac3 14991
1a79b2f1 14992#: git-submodule.sh:210
c04f5ac3 14993#, sh-format
170e9899
JX
14994msgid "'$sm_path' already exists in the index"
14995msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 14996
1a79b2f1
JX
14997#: git-submodule.sh:213
14998#, sh-format
14999msgid "'$sm_path' already exists in the index and is not a submodule"
15000msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
15001
a4f16749 15002#: git-submodule.sh:219
b694fbb1
JX
15003#, sh-format
15004msgid ""
15005"The following path is ignored by one of your .gitignore files:\n"
15006"$sm_path\n"
15007"Use -f if you really want to add it."
15008msgstr ""
15009"以下路径被您的一个 .gitignore 文件所忽略:\n"
15010"$sm_path\n"
15011"如果您确实想添加它,使用 -f 参数。"
15012
a4f16749 15013#: git-submodule.sh:237
b694fbb1
JX
15014#, sh-format
15015msgid "Adding existing repo at '$sm_path' to the index"
160fb2b2 15016msgstr "添加位于 '$sm_path' 的现存仓库到索引"
b694fbb1 15017
a4f16749 15018#: git-submodule.sh:239
c04f5ac3 15019#, sh-format
170e9899 15020msgid "'$sm_path' already exists and is not a valid git repo"
160fb2b2 15021msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
c04f5ac3 15022
a4f16749 15023#: git-submodule.sh:247
07432cef
WS
15024#, sh-format
15025msgid "A git directory for '$sm_name' is found locally with remote(s):"
160fb2b2 15026msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
07432cef 15027
a4f16749 15028#: git-submodule.sh:249
07432cef
WS
15029#, sh-format
15030msgid ""
5c57d762
JX
15031"If you want to reuse this local git directory instead of cloning again from\n"
15032" $realrepo\n"
15033"use the '--force' option. If the local git directory is not the correct "
15034"repo\n"
07432cef
WS
15035"or you are unsure what this means choose another name with the '--name' "
15036"option."
5c57d762
JX
15037msgstr ""
15038"如果您想要重用这个本地 git 目录而非重新克隆自\n"
15039" $realrepo\n"
15040"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
15041"或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
07432cef 15042
a4f16749 15043#: git-submodule.sh:255
07432cef
WS
15044#, sh-format
15045msgid "Reactivating local git directory for submodule '$sm_name'."
15046msgstr "激活本地 git 目录到子模组 '$sm_name'。"
15047
a4f16749 15048#: git-submodule.sh:267
c04f5ac3 15049#, sh-format
170e9899
JX
15050msgid "Unable to checkout submodule '$sm_path'"
15051msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 15052
a4f16749 15053#: git-submodule.sh:272
c04f5ac3 15054#, sh-format
170e9899
JX
15055msgid "Failed to add submodule '$sm_path'"
15056msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 15057
a4f16749 15058#: git-submodule.sh:281
c04f5ac3 15059#, sh-format
170e9899
JX
15060msgid "Failed to register submodule '$sm_path'"
15061msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 15062
a4f16749 15063#: git-submodule.sh:342
c04f5ac3 15064#, sh-format
5b04ee3b
JX
15065msgid "Entering '$displaypath'"
15066msgstr "正在进入 '$displaypath'"
c04f5ac3 15067
a4f16749 15068#: git-submodule.sh:362
c04f5ac3 15069#, sh-format
5b04ee3b 15070msgid "Stopping at '$displaypath'; script returned non-zero status."
aef18cc6 15071msgstr "停止于 '$displaypath';脚本返回非零值。"
c04f5ac3 15072
a4f16749 15073#: git-submodule.sh:433
c04f5ac3 15074#, sh-format
5b04ee3b
JX
15075msgid "pathspec and --all are incompatible"
15076msgstr "pathspec 和 --all 不兼容"
c04f5ac3 15077
a4f16749 15078#: git-submodule.sh:438
c04f5ac3 15079#, sh-format
5b04ee3b 15080msgid "Use '--all' if you really want to deinitialize all submodules"
aef18cc6 15081msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
1003b3a5 15082
a4f16749 15083#: git-submodule.sh:458
1003b3a5
JX
15084#, sh-format
15085msgid ""
5c57d762 15086"Submodule work tree '$displaypath' contains a .git directory\n"
1003b3a5 15087"(use 'rm -rf' if you really want to remove it including all of its history)"
5c57d762
JX
15088msgstr ""
15089"子模组工作区 '$displaypath' 包含一个 .git 目录\n"
9a4b694c 15090"(如果您真的想删除它及其全部历史,使用 'rm -rf' 命令)"
1003b3a5 15091
a4f16749 15092#: git-submodule.sh:466
c04f5ac3
JX
15093#, sh-format
15094msgid ""
2e8451e8 15095"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
1003b3a5 15096"discard them"
2e8451e8 15097msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
1003b3a5 15098
a4f16749 15099#: git-submodule.sh:469
1003b3a5 15100#, sh-format
2e8451e8
JX
15101msgid "Cleared directory '$displaypath'"
15102msgstr "已清除目录 '$displaypath'"
1003b3a5 15103
a4f16749 15104#: git-submodule.sh:470
1003b3a5 15105#, sh-format
2e8451e8
JX
15106msgid "Could not remove submodule work tree '$displaypath'"
15107msgstr "无法移除子模组工作区 '$displaypath'"
1003b3a5 15108
a4f16749 15109#: git-submodule.sh:473
1003b3a5 15110#, sh-format
2e8451e8
JX
15111msgid "Could not create empty submodule directory '$displaypath'"
15112msgstr "不能创建空的子模组目录 '$displaypath'"
1003b3a5 15113
a4f16749 15114#: git-submodule.sh:482
1003b3a5 15115#, sh-format
2e8451e8
JX
15116msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
15117msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
1003b3a5 15118
6937cb4e 15119#: git-submodule.sh:637
c04f5ac3 15120#, sh-format
2e8451e8
JX
15121msgid "Unable to find current revision in submodule path '$displaypath'"
15122msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 15123
6937cb4e 15124#: git-submodule.sh:647
c04f5ac3 15125#, sh-format
170e9899
JX
15126msgid "Unable to fetch in submodule path '$sm_path'"
15127msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 15128
6937cb4e 15129#: git-submodule.sh:652
5c57d762
JX
15130#, sh-format
15131msgid ""
15132"Unable to find current ${remote_name}/${branch} revision in submodule path "
15133"'$sm_path'"
9a4b694c 15134msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
5c57d762 15135
6937cb4e 15136#: git-submodule.sh:670
2e8451e8
JX
15137#, sh-format
15138msgid "Unable to fetch in submodule path '$displaypath'"
15139msgstr "无法在子模组路径 '$displaypath' 中获取"
15140
6937cb4e 15141#: git-submodule.sh:676
5c57d762
JX
15142#, sh-format
15143msgid ""
15144"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
15145"Direct fetching of that commit failed."
a0b6b246
JX
15146msgstr ""
15147"获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
5c57d762 15148
6937cb4e 15149#: git-submodule.sh:683
6c94aba5
JX
15150#, sh-format
15151msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
15152msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
15153
6937cb4e 15154#: git-submodule.sh:684
c04f5ac3 15155#, sh-format
6c94aba5
JX
15156msgid "Submodule path '$displaypath': checked out '$sha1'"
15157msgstr "子模组路径 '$displaypath':检出 '$sha1'"
15158
6937cb4e 15159#: git-submodule.sh:688
6c94aba5 15160#, sh-format
2e8451e8
JX
15161msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
15162msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 15163
6937cb4e 15164#: git-submodule.sh:689
c04f5ac3 15165#, sh-format
2e8451e8
JX
15166msgid "Submodule path '$displaypath': rebased into '$sha1'"
15167msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 15168
6937cb4e 15169#: git-submodule.sh:694
c04f5ac3 15170#, sh-format
2e8451e8
JX
15171msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
15172msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 15173
6937cb4e 15174#: git-submodule.sh:695
c04f5ac3 15175#, sh-format
2e8451e8
JX
15176msgid "Submodule path '$displaypath': merged in '$sha1'"
15177msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 15178
6937cb4e 15179#: git-submodule.sh:700
c04f5ac3 15180#, sh-format
5b04ee3b
JX
15181msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
15182msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
c04f5ac3 15183
6937cb4e 15184#: git-submodule.sh:701
c04f5ac3 15185#, sh-format
5b04ee3b 15186msgid "Submodule path '$displaypath': '$command $sha1'"
aef18cc6 15187msgstr "子模组 '$displaypath':'$command $sha1'"
c04f5ac3 15188
6937cb4e 15189#: git-submodule.sh:732
2e8451e8
JX
15190#, sh-format
15191msgid "Failed to recurse into submodule path '$displaypath'"
15192msgstr "无法递归进子模组路径 '$displaypath'"
15193
5809aa05 15194#: git-submodule.sh:828
649900bc
JX
15195msgid "The --cached option cannot be used with the --files option"
15196msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1 15197
5809aa05 15198#: git-submodule.sh:880
b694fbb1
JX
15199#, sh-format
15200msgid "unexpected mode $mod_dst"
15201msgstr "意外的模式 $mod_dst"
c04f5ac3 15202
90e6ef53 15203# 译者:注意保持前导空格
5809aa05 15204#: git-submodule.sh:900
c04f5ac3 15205#, sh-format
2e8451e8
JX
15206msgid " Warn: $display_name doesn't contain commit $sha1_src"
15207msgstr " 警告:$display_name 未包含提交 $sha1_src"
c04f5ac3 15208
90e6ef53 15209# 译者:注意保持前导空格
5809aa05 15210#: git-submodule.sh:903
c04f5ac3 15211#, sh-format
2e8451e8
JX
15212msgid " Warn: $display_name doesn't contain commit $sha1_dst"
15213msgstr " 警告:$display_name 未包含提交 $sha1_dst"
c04f5ac3 15214
90e6ef53 15215# 译者:注意保持前导空格
5809aa05 15216#: git-submodule.sh:906
c04f5ac3 15217#, sh-format
2e8451e8
JX
15218msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
15219msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
c04f5ac3 15220
5809aa05 15221#: git-submodule.sh:1077
c04f5ac3 15222#, sh-format
2e8451e8
JX
15223msgid "Synchronizing submodule url for '$displaypath'"
15224msgstr "为 '$displaypath' 同步子模组 url"
1b7f4a34 15225
5b04ee3b
JX
15226#: git-parse-remote.sh:89
15227#, sh-format
15228msgid "See git-${cmd}(1) for details."
15229msgstr "详见 git-${cmd}(1)。"
5c57d762 15230
1a79b2f1 15231#: git-rebase--interactive.sh:140
5c57d762
JX
15232#, sh-format
15233msgid "Rebasing ($new_count/$total)"
15234msgstr "变基中($new_count/$total)"
15235
1a79b2f1 15236#: git-rebase--interactive.sh:156
5c57d762
JX
15237msgid ""
15238"\n"
15239"Commands:\n"
6937cb4e
JX
15240"p, pick = use commit\n"
15241"r, reword = use commit, but edit the commit message\n"
15242"e, edit = use commit, but stop for amending\n"
15243"s, squash = use commit, but meld into previous commit\n"
15244"f, fixup = like \"squash\", but discard this commit's log message\n"
15245"x, exec = run command (the rest of the line) using shell\n"
15246"d, drop = remove commit\n"
5c57d762
JX
15247"\n"
15248"These lines can be re-ordered; they are executed from top to bottom.\n"
15249msgstr ""
15250"\n"
15251"命令:\n"
6937cb4e
JX
15252"p, pick = 使用提交\n"
15253"r, reword = 使用提交,但修改提交说明\n"
15254"e, edit = 使用提交,但停止以便进行提交修补\n"
15255"s, squash = 使用提交,但和前一个版本融合\n"
15256"f, fixup = 类似于 \"squash\",但丢弃提交说明日志\n"
15257"x, exec = 使用 shell 运行命令(此行剩余部分)\n"
15258"d, drop = 删除提交\n"
5c57d762 15259"\n"
9a4b694c 15260"这些行可以被重新排序;它们会被从上至下地执行。\n"
5c57d762 15261
1a79b2f1 15262#: git-rebase--interactive.sh:171
5c57d762
JX
15263msgid ""
15264"\n"
15265"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
a0b6b246
JX
15266msgstr ""
15267"\n"
15268"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
5c57d762 15269
1a79b2f1 15270#: git-rebase--interactive.sh:175
5c57d762
JX
15271msgid ""
15272"\n"
15273"If you remove a line here THAT COMMIT WILL BE LOST.\n"
a0b6b246
JX
15274msgstr ""
15275"\n"
15276"如果您在这里删除一行,对应的提交将会丢失。\n"
5c57d762 15277
1a79b2f1 15278#: git-rebase--interactive.sh:211
5c57d762
JX
15279#, sh-format
15280msgid ""
15281"You can amend the commit now, with\n"
15282"\n"
15283"\tgit commit --amend $gpg_sign_opt_quoted\n"
15284"\n"
15285"Once you are satisfied with your changes, run\n"
15286"\n"
15287"\tgit rebase --continue"
15288msgstr ""
15289"您现在可以修补这个提交,使用\n"
15290"\n"
15291"\tgit commit --amend $gpg_sign_opt_quoted\n"
15292"\n"
9a4b694c 15293"当您对变更感到满意,执行\n"
5c57d762
JX
15294"\n"
15295"\tgit rebase --continue"
15296
1a79b2f1 15297#: git-rebase--interactive.sh:236
5c57d762
JX
15298#, sh-format
15299msgid "$sha1: not a commit that can be picked"
15300msgstr "$sha1:不是一个可以被拣选的提交"
15301
1a79b2f1 15302#: git-rebase--interactive.sh:275
5c57d762
JX
15303#, sh-format
15304msgid "Invalid commit name: $sha1"
15305msgstr "无效的提交名:$sha1"
15306
1a79b2f1 15307#: git-rebase--interactive.sh:317
5c57d762
JX
15308msgid "Cannot write current commit's replacement sha1"
15309msgstr "不能写入当前提交的替代 sha1"
15310
1a79b2f1 15311#: git-rebase--interactive.sh:369
5c57d762
JX
15312#, sh-format
15313msgid "Fast-forward to $sha1"
15314msgstr "快进到 $sha1"
15315
1a79b2f1 15316#: git-rebase--interactive.sh:371
5c57d762
JX
15317#, sh-format
15318msgid "Cannot fast-forward to $sha1"
15319msgstr "不能快进到 $sha1"
15320
1a79b2f1 15321#: git-rebase--interactive.sh:380
5c57d762
JX
15322#, sh-format
15323msgid "Cannot move HEAD to $first_parent"
15324msgstr "不能移动 HEAD 到 $first_parent"
15325
1a79b2f1 15326#: git-rebase--interactive.sh:385
5c57d762
JX
15327#, sh-format
15328msgid "Refusing to squash a merge: $sha1"
15329msgstr "拒绝压缩一个合并:$sha1"
15330
6937cb4e 15331#: git-rebase--interactive.sh:400
5c57d762
JX
15332#, sh-format
15333msgid "Error redoing merge $sha1"
15334msgstr "无法重做合并 $sha1"
15335
6937cb4e 15336#: git-rebase--interactive.sh:408
5c57d762
JX
15337#, sh-format
15338msgid "Could not pick $sha1"
15339msgstr "不能拣选 $sha1"
15340
6937cb4e 15341#: git-rebase--interactive.sh:417
5c57d762
JX
15342#, sh-format
15343msgid "This is the commit message #${n}:"
9a4b694c 15344msgstr "这是提交说明 #${n}:"
5c57d762 15345
6937cb4e 15346#: git-rebase--interactive.sh:422
5c57d762
JX
15347#, sh-format
15348msgid "The commit message #${n} will be skipped:"
9a4b694c 15349msgstr "提交说明 #${n} 将被跳过:"
5c57d762 15350
6937cb4e 15351#: git-rebase--interactive.sh:433
5c57d762
JX
15352#, sh-format
15353msgid "This is a combination of $count commit."
15354msgid_plural "This is a combination of $count commits."
15355msgstr[0] "这是一个 $count 个提交的组合。"
15356msgstr[1] "这是一个 $count 个提交的组合。"
15357
6937cb4e 15358#: git-rebase--interactive.sh:442
5c57d762
JX
15359#, sh-format
15360msgid "Cannot write $fixup_msg"
15361msgstr "不能写入 $fixup_msg"
15362
6937cb4e 15363#: git-rebase--interactive.sh:445
5c57d762
JX
15364msgid "This is a combination of 2 commits."
15365msgstr "这是一个 2 个提交的组合。"
15366
6937cb4e
JX
15367#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
15368#: git-rebase--interactive.sh:532
5c57d762
JX
15369#, sh-format
15370msgid "Could not apply $sha1... $rest"
15371msgstr "不能应用 $sha1... $rest"
15372
6937cb4e 15373#: git-rebase--interactive.sh:560
5c57d762
JX
15374#, sh-format
15375msgid ""
15376"Could not amend commit after successfully picking $sha1... $rest\n"
15377"This is most likely due to an empty commit message, or the pre-commit hook\n"
15378"failed. If the pre-commit hook failed, you may need to resolve the issue "
15379"before\n"
15380"you are able to reword the commit."
15381msgstr ""
15382"不能在成功拣选 $sha1... $rest 之后修补提交\n"
15383"这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
15384"钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
15385
6937cb4e 15386#: git-rebase--interactive.sh:575
5c57d762
JX
15387#, sh-format
15388msgid "Stopped at $sha1_abbrev... $rest"
15389msgstr "停止在 $sha1_abbrev... $rest"
15390
6937cb4e 15391#: git-rebase--interactive.sh:590
5c57d762
JX
15392#, sh-format
15393msgid "Cannot '$squash_style' without a previous commit"
9a4b694c 15394msgstr "没有父提交的情况下不能 '$squash_style'"
5c57d762 15395
6937cb4e 15396#: git-rebase--interactive.sh:632
5c57d762
JX
15397#, sh-format
15398msgid "Executing: $rest"
15399msgstr "执行:$rest"
15400
6937cb4e 15401#: git-rebase--interactive.sh:640
5c57d762
JX
15402#, sh-format
15403msgid "Execution failed: $rest"
15404msgstr "执行失败:$rest"
15405
6937cb4e 15406#: git-rebase--interactive.sh:642
5c57d762
JX
15407msgid "and made changes to the index and/or the working tree"
15408msgstr "并且修改索引和/或工作区"
15409
15410# 译者:注意保持前导空格
6937cb4e 15411#: git-rebase--interactive.sh:644
5c57d762
JX
15412msgid ""
15413"You can fix the problem, and then run\n"
15414"\n"
15415"\tgit rebase --continue"
15416msgstr ""
15417"您可以解决这个问题,然后运行\n"
15418"\n"
15419"\tgit rebase --continue"
15420
15421#. TRANSLATORS: after these lines is a command to be issued by the user
6937cb4e 15422#: git-rebase--interactive.sh:657
5c57d762
JX
15423#, sh-format
15424msgid ""
15425"Execution succeeded: $rest\n"
15426"but left changes to the index and/or the working tree\n"
15427"Commit or stash your changes, and then run\n"
15428"\n"
15429"\tgit rebase --continue"
15430msgstr ""
15431"执行成功:$rest\n"
a4f16749 15432"但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n"
5c57d762
JX
15433"\n"
15434"\tgit rebase --continue"
15435
6937cb4e 15436#: git-rebase--interactive.sh:668
5c57d762
JX
15437#, sh-format
15438msgid "Unknown command: $command $sha1 $rest"
15439msgstr "未知命令:$command $sha1 $rest"
15440
6937cb4e 15441#: git-rebase--interactive.sh:669
5c57d762
JX
15442msgid "Please fix this using 'git rebase --edit-todo'."
15443msgstr "要修改请使用命令 'git rebase --edit-todo'。"
15444
6937cb4e 15445#: git-rebase--interactive.sh:704
5c57d762
JX
15446#, sh-format
15447msgid "Successfully rebased and updated $head_name."
9a4b694c 15448msgstr "成功变基并更新 $head_name。"
5c57d762 15449
5809aa05 15450#: git-rebase--interactive.sh:728
5c57d762
JX
15451msgid "could not detach HEAD"
15452msgstr "不能检出为分离头指针"
15453
5809aa05 15454#: git-rebase--interactive.sh:763
5c57d762
JX
15455msgid "Could not remove CHERRY_PICK_HEAD"
15456msgstr "不能删除 CHERRY_PICK_HEAD"
15457
5809aa05 15458#: git-rebase--interactive.sh:768
5c57d762
JX
15459#, sh-format
15460msgid ""
15461"You have staged changes in your working tree.\n"
15462"If these changes are meant to be\n"
15463"squashed into the previous commit, run:\n"
15464"\n"
15465" git commit --amend $gpg_sign_opt_quoted\n"
15466"\n"
15467"If they are meant to go into a new commit, run:\n"
15468"\n"
15469" git commit $gpg_sign_opt_quoted\n"
15470"\n"
a0b6b246 15471"In both cases, once you're done, continue with:\n"
5c57d762
JX
15472"\n"
15473" git rebase --continue\n"
15474msgstr ""
15475"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
15476"\n"
15477" git commit --amend $gpg_sign_opt_quoted\n"
15478"\n"
15479"如果这些变更要形成一个新提交,执行:\n"
15480"\n"
15481" git commit $gpg_sign_opt_quoted\n"
15482"\n"
9a4b694c 15483"无论哪种情况,当您完成提交,继续执行:\n"
5c57d762
JX
15484"\n"
15485" git rebase --continue\n"
15486
5809aa05 15487#: git-rebase--interactive.sh:785
5c57d762 15488msgid "Error trying to find the author identity to amend commit"
9a4b694c 15489msgstr "在修补提交中查找作者信息时遇到错误"
5c57d762 15490
5809aa05 15491#: git-rebase--interactive.sh:790
5c57d762
JX
15492msgid ""
15493"You have uncommitted changes in your working tree. Please commit them\n"
15494"first and then run 'git rebase --continue' again."
a0b6b246
JX
15495msgstr ""
15496"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
5c57d762 15497
5809aa05 15498#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
5c57d762
JX
15499msgid "Could not commit staged changes."
15500msgstr "不能提交暂存的修改。"
15501
5809aa05 15502#: git-rebase--interactive.sh:827
5c57d762
JX
15503msgid ""
15504"\n"
15505"You are editing the todo file of an ongoing interactive rebase.\n"
15506"To continue rebase after editing, run:\n"
15507" git rebase --continue\n"
15508"\n"
15509msgstr ""
15510"\n"
6937cb4e 15511"您正在修改运行中的交互式变基待办列表。若要在编辑结束后继续变基,\n"
5c57d762
JX
15512"请执行:\n"
15513" git rebase --continue\n"
15514"\n"
15515
5809aa05 15516#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
5c57d762
JX
15517msgid "Could not execute editor"
15518msgstr "无法运行编辑器"
15519
5809aa05 15520#: git-rebase--interactive.sh:848
5c57d762
JX
15521#, sh-format
15522msgid "Could not checkout $switch_to"
15523msgstr "不能检出 $switch_to"
15524
5809aa05 15525#: git-rebase--interactive.sh:853
5c57d762
JX
15526msgid "No HEAD?"
15527msgstr "没有 HEAD?"
15528
5809aa05 15529#: git-rebase--interactive.sh:854
5c57d762
JX
15530#, sh-format
15531msgid "Could not create temporary $state_dir"
15532msgstr "不能创建临时 $state_dir"
15533
5809aa05 15534#: git-rebase--interactive.sh:856
5c57d762
JX
15535msgid "Could not mark as interactive"
15536msgstr "不能标记为交互式"
15537
5809aa05 15538#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
5c57d762
JX
15539msgid "Could not init rewritten commits"
15540msgstr "不能对重写提交进行初始化"
15541
5809aa05
JX
15542#: git-rebase--interactive.sh:897
15543msgid "Could not generate todo list"
15544msgstr "无法生成待办列表"
15545
15546#: git-rebase--interactive.sh:973
5c57d762
JX
15547#, sh-format
15548msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
15549msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
15550msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
15551msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
15552
5809aa05 15553#: git-rebase--interactive.sh:978
5c57d762
JX
15554msgid ""
15555"\n"
15556"However, if you remove everything, the rebase will be aborted.\n"
15557"\n"
a0b6b246
JX
15558msgstr ""
15559"\n"
15560"然而,如果您删除全部内容,变基操作将会终止。\n"
15561"\n"
5c57d762 15562
5809aa05 15563#: git-rebase--interactive.sh:985
5c57d762
JX
15564msgid "Note that empty commits are commented out"
15565msgstr "注意空提交已被注释掉"
15566
15567#: git-sh-setup.sh:89 git-sh-setup.sh:94
15568#, sh-format
15569msgid "usage: $dashless $USAGE"
15570msgstr "用法:$dashless $USAGE"
15571
15572#: git-sh-setup.sh:190
15573#, sh-format
15574msgid "Cannot chdir to $cdup, the toplevel of the working tree"
9a4b694c 15575msgstr "不能切换目录到 $cdup,工作区的顶级目录"
5c57d762
JX
15576
15577#: git-sh-setup.sh:199 git-sh-setup.sh:206
15578#, sh-format
15579msgid "fatal: $program_name cannot be used without a working tree."
15580msgstr "严重错误:$program_name 不能在没有工作区的情况下使用"
15581
15582#: git-sh-setup.sh:220
15583msgid "Cannot rebase: You have unstaged changes."
15584msgstr "不能变基:您有未暂存的变更。"
15585
15586#: git-sh-setup.sh:223
15587msgid "Cannot rewrite branches: You have unstaged changes."
15588msgstr "不能重写分支:您有未暂存的变更。"
15589
a0b6b246
JX
15590#: git-sh-setup.sh:226
15591msgid "Cannot pull with rebase: You have unstaged changes."
15592msgstr "无法通过变基方式拉取:您有未暂存的变更。"
15593
5c57d762
JX
15594#: git-sh-setup.sh:229
15595#, sh-format
15596msgid "Cannot $action: You have unstaged changes."
15597msgstr "不能 $action:您有未暂存的变更。"
15598
15599#: git-sh-setup.sh:242
15600msgid "Cannot rebase: Your index contains uncommitted changes."
15601msgstr "不能变基:您的索引中包含未提交的变更。"
15602
a0b6b246
JX
15603#: git-sh-setup.sh:245
15604msgid "Cannot pull with rebase: Your index contains uncommitted changes."
15605msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
15606
5c57d762
JX
15607#: git-sh-setup.sh:248
15608#, sh-format
15609msgid "Cannot $action: Your index contains uncommitted changes."
15610msgstr "不能 $action:您的索引中包含未提交的变更。"
15611
a0b6b246
JX
15612#: git-sh-setup.sh:252
15613msgid "Additionally, your index contains uncommitted changes."
15614msgstr "而且您的索引中包含未提交的变更。"
15615
5c57d762
JX
15616#: git-sh-setup.sh:372
15617msgid "You need to run this command from the toplevel of the working tree."
15618msgstr "您需要在工作区的顶级目录中运行这个命令。"
15619
15620#: git-sh-setup.sh:377
15621msgid "Unable to determine absolute path of git directory"
15622msgstr "不能确定 git 目录的绝对路径"
a0b6b246 15623
1a79b2f1 15624#. TRANSLATORS: you can adjust this to align "git add -i" status menu
a4f16749 15625#: git-add--interactive.perl:196
1a79b2f1
JX
15626#, perl-format
15627msgid "%12s %12s %s"
15628msgstr "%12s %12s %s"
15629
a4f16749 15630#: git-add--interactive.perl:197
1a79b2f1
JX
15631msgid "staged"
15632msgstr "缓存"
15633
a4f16749 15634#: git-add--interactive.perl:197
1a79b2f1
JX
15635msgid "unstaged"
15636msgstr "未缓存"
15637
a4f16749 15638#: git-add--interactive.perl:246 git-add--interactive.perl:271
1a79b2f1
JX
15639msgid "binary"
15640msgstr "二进制"
15641
a4f16749 15642#: git-add--interactive.perl:255 git-add--interactive.perl:309
1a79b2f1
JX
15643msgid "nothing"
15644msgstr "无"
15645
a4f16749 15646#: git-add--interactive.perl:291 git-add--interactive.perl:306
1a79b2f1
JX
15647msgid "unchanged"
15648msgstr "没有修改"
15649
a4f16749 15650#: git-add--interactive.perl:602
1a79b2f1
JX
15651#, perl-format
15652msgid "added %d path\n"
15653msgid_plural "added %d paths\n"
15654msgstr[0] "增加了 %d 个路径\n"
15655msgstr[1] "增加了 %d 个路径\n"
15656
a4f16749 15657#: git-add--interactive.perl:605
1a79b2f1
JX
15658#, perl-format
15659msgid "updated %d path\n"
15660msgid_plural "updated %d paths\n"
15661msgstr[0] "更新了 %d 个路径\n"
15662msgstr[1] "更新了 %d 个路径\n"
15663
a4f16749 15664#: git-add--interactive.perl:608
1a79b2f1
JX
15665#, perl-format
15666msgid "reverted %d path\n"
15667msgid_plural "reverted %d paths\n"
15668msgstr[0] "还原了 %d 个路径\n"
15669msgstr[1] "还原了 %d 个路径\n"
15670
a4f16749 15671#: git-add--interactive.perl:611
1a79b2f1
JX
15672#, perl-format
15673msgid "touched %d path\n"
15674msgid_plural "touched %d paths\n"
15675msgstr[0] "触碰了 %d 个路径\n"
15676msgstr[1] "触碰了 %d 个路径\n"
15677
a4f16749 15678#: git-add--interactive.perl:620
1a79b2f1
JX
15679msgid "Update"
15680msgstr "更新"
15681
a4f16749 15682#: git-add--interactive.perl:632
1a79b2f1
JX
15683msgid "Revert"
15684msgstr "还原"
15685
a4f16749 15686#: git-add--interactive.perl:655
1a79b2f1
JX
15687#, perl-format
15688msgid "note: %s is untracked now.\n"
15689msgstr "说明:%s 现已成为未跟踪的。\n"
15690
a4f16749 15691#: git-add--interactive.perl:666
1a79b2f1
JX
15692msgid "Add untracked"
15693msgstr "添加未跟踪的"
15694
a4f16749 15695#: git-add--interactive.perl:672
1a79b2f1
JX
15696msgid "No untracked files.\n"
15697msgstr "没有未跟踪的文件。\n"
15698
a4f16749 15699#: git-add--interactive.perl:985
1a79b2f1
JX
15700msgid ""
15701"If the patch applies cleanly, the edited hunk will immediately be\n"
15702"marked for staging."
15703msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
15704
a4f16749 15705#: git-add--interactive.perl:988
1a79b2f1
JX
15706msgid ""
15707"If the patch applies cleanly, the edited hunk will immediately be\n"
15708"marked for stashing."
a4f16749 15709msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。"
1a79b2f1 15710
a4f16749 15711#: git-add--interactive.perl:991
1a79b2f1
JX
15712msgid ""
15713"If the patch applies cleanly, the edited hunk will immediately be\n"
15714"marked for unstaging."
15715msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
15716
a4f16749 15717#: git-add--interactive.perl:994 git-add--interactive.perl:1003
1a79b2f1
JX
15718msgid ""
15719"If the patch applies cleanly, the edited hunk will immediately be\n"
15720"marked for applying."
15721msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
15722
a4f16749 15723#: git-add--interactive.perl:997 git-add--interactive.perl:1000
1a79b2f1
JX
15724msgid ""
15725"If the patch applies cleanly, the edited hunk will immediately be\n"
15726"marked for discarding."
15727msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
15728
a4f16749 15729#: git-add--interactive.perl:1013
1a79b2f1
JX
15730#, perl-format
15731msgid "failed to open hunk edit file for writing: %s"
15732msgstr "无法写入块编辑文件:%s"
15733
a4f16749 15734#: git-add--interactive.perl:1014
1a79b2f1
JX
15735msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
15736msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
15737
a4f16749 15738#: git-add--interactive.perl:1020
1a79b2f1
JX
15739#, perl-format
15740msgid ""
15741"---\n"
15742"To remove '%s' lines, make them ' ' lines (context).\n"
15743"To remove '%s' lines, delete them.\n"
15744"Lines starting with %s will be removed.\n"
15745msgstr ""
15746"---\n"
15747"要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
15748"要删除 '%s' 开始的行,删除它们。\n"
15749"以 %s 开始的行将被删除。\n"
15750
15751#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
a4f16749 15752#: git-add--interactive.perl:1028
1a79b2f1
JX
15753msgid ""
15754"If it does not apply cleanly, you will be given an opportunity to\n"
15755"edit again. If all lines of the hunk are removed, then the edit is\n"
15756"aborted and the hunk is left unchanged.\n"
15757msgstr ""
15758"如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
15759"此次编辑被终止,该块不会被修改。\n"
15760
a4f16749 15761#: git-add--interactive.perl:1042
1a79b2f1
JX
15762#, perl-format
15763msgid "failed to open hunk edit file for reading: %s"
15764msgstr "无法读取块编辑文件:%s"
15765
15766#. TRANSLATORS: do not translate [y/n]
15767#. The program will only accept that input
15768#. at this point.
15769#. Consider translating (saying "no" discards!) as
15770#. (saying "n" for "no" discards!) if the translation
15771#. of the word "no" does not start with n.
a4f16749 15772#: git-add--interactive.perl:1134
1a79b2f1
JX
15773msgid ""
15774"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
15775msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
15776
a4f16749 15777#: git-add--interactive.perl:1143
1a79b2f1
JX
15778msgid ""
15779"y - stage this hunk\n"
15780"n - do not stage this hunk\n"
15781"q - quit; do not stage this hunk or any of the remaining ones\n"
15782"a - stage this hunk and all later hunks in the file\n"
15783"d - do not stage this hunk or any of the later hunks in the file"
15784msgstr ""
15785"y - 暂存该块\n"
15786"n - 不要暂存该块\n"
15787"q - 退出。不暂存该块及后面的全部块\n"
15788"a - 暂存该块和本文件中后面的全部块\n"
15789"d - 不暂存该块和本文件中后面的全部块"
15790
a4f16749 15791#: git-add--interactive.perl:1149
1a79b2f1
JX
15792msgid ""
15793"y - stash this hunk\n"
15794"n - do not stash this hunk\n"
15795"q - quit; do not stash this hunk or any of the remaining ones\n"
15796"a - stash this hunk and all later hunks in the file\n"
15797"d - do not stash this hunk or any of the later hunks in the file"
15798msgstr ""
15799"y - 贮藏该块\n"
15800"n - 不要贮藏该块\n"
15801"q - 退出。不贮藏该块及后面的全部块\n"
15802"a - 贮藏该块和本文件中后面的全部块\n"
15803"d - 不贮藏该块和本文件中后面的全部块"
15804
a4f16749 15805#: git-add--interactive.perl:1155
1a79b2f1
JX
15806msgid ""
15807"y - unstage this hunk\n"
15808"n - do not unstage this hunk\n"
15809"q - quit; do not unstage this hunk or any of the remaining ones\n"
15810"a - unstage this hunk and all later hunks in the file\n"
15811"d - do not unstage this hunk or any of the later hunks in the file"
15812msgstr ""
15813"y - 不暂存该块\n"
15814"n - 不要不暂存该块\n"
15815"q - 退出。不要不暂存该块及后面的全部块\n"
15816"a - 不暂存该块和本文件中后面的全部块\n"
15817"d - 不要不暂存该块和本文件中后面的全部块"
15818
a4f16749 15819#: git-add--interactive.perl:1161
1a79b2f1
JX
15820msgid ""
15821"y - apply this hunk to index\n"
15822"n - do not apply this hunk to index\n"
15823"q - quit; do not apply this hunk or any of the remaining ones\n"
15824"a - apply this hunk and all later hunks in the file\n"
15825"d - do not apply this hunk or any of the later hunks in the file"
15826msgstr ""
15827"y - 在索引中应用该块\n"
15828"n - 不要在索引中应用该块\n"
15829"q - 退出。不要应用该块及后面的全部块\n"
15830"a - 应用该块和本文件中后面的全部块\n"
15831"d - 不要应用该块和本文件中后面的全部块"
15832
a4f16749 15833#: git-add--interactive.perl:1167
1a79b2f1
JX
15834msgid ""
15835"y - discard this hunk from worktree\n"
15836"n - do not discard this hunk from worktree\n"
15837"q - quit; do not discard this hunk or any of the remaining ones\n"
15838"a - discard this hunk and all later hunks in the file\n"
15839"d - do not discard this hunk or any of the later hunks in the file"
15840msgstr ""
15841"y - 在工作区中丢弃该块\n"
15842"n - 不要在工作区中丢弃该块\n"
15843"q - 退出。不要丢弃该块及后面的全部块\n"
15844"a - 丢弃该块和本文件中后面的全部块\n"
15845"d - 不要丢弃该块和本文件中后面的全部块"
15846
a4f16749 15847#: git-add--interactive.perl:1173
1a79b2f1
JX
15848msgid ""
15849"y - discard this hunk from index and worktree\n"
15850"n - do not discard this hunk from index and worktree\n"
15851"q - quit; do not discard this hunk or any of the remaining ones\n"
15852"a - discard this hunk and all later hunks in the file\n"
15853"d - do not discard this hunk or any of the later hunks in the file"
15854msgstr ""
15855"y - 在索引和工作区中丢弃该块\n"
15856"n - 不要在索引和工作区中丢弃该块\n"
15857"q - 退出。不要丢弃该块及后面的全部块\n"
15858"a - 丢弃该块和本文件中后面的全部块\n"
15859"d - 不要丢弃该块和本文件中后面的全部块"
15860
a4f16749 15861#: git-add--interactive.perl:1179
1a79b2f1
JX
15862msgid ""
15863"y - apply this hunk to index and worktree\n"
15864"n - do not apply this hunk to index and worktree\n"
15865"q - quit; do not apply this hunk or any of the remaining ones\n"
15866"a - apply this hunk and all later hunks in the file\n"
15867"d - do not apply this hunk or any of the later hunks in the file"
15868msgstr ""
15869"y - 在索引和工作区中应用该块\n"
15870"n - 不要在索引和工作区中应用该块\n"
15871"q - 退出。不要应用该块及后面的全部块\n"
15872"a - 应用该块和本文件中后面的全部块\n"
15873"d - 不要应用该块和本文件中后面的全部块"
15874
a4f16749 15875#: git-add--interactive.perl:1188
1a79b2f1
JX
15876msgid ""
15877"g - select a hunk to go to\n"
15878"/ - search for a hunk matching the given regex\n"
15879"j - leave this hunk undecided, see next undecided hunk\n"
15880"J - leave this hunk undecided, see next hunk\n"
15881"k - leave this hunk undecided, see previous undecided hunk\n"
15882"K - leave this hunk undecided, see previous hunk\n"
15883"s - split the current hunk into smaller hunks\n"
15884"e - manually edit the current hunk\n"
15885"? - print help\n"
15886msgstr ""
15887"g - 选择跳转到一个块\n"
15888"/ - 查找和给定正则表达式匹配的块\n"
15889"j - 维持该块未决状态,查看下一个未决块\n"
15890"J - 维持该块未决状态,查看下一个块\n"
15891"k - 维持该块未决状态,查看上一个未决块\n"
15892"K - 维持该块未决状态,查看上一个块\n"
15893"s - 拆分当前块为更小的块\n"
15894"e - 手动编辑当前块\n"
15895"? - 显示帮助\n"
15896
a4f16749 15897#: git-add--interactive.perl:1219
1a79b2f1
JX
15898msgid "The selected hunks do not apply to the index!\n"
15899msgstr "选中的块不能应用到索引!\n"
15900
a4f16749 15901#: git-add--interactive.perl:1220
1a79b2f1
JX
15902msgid "Apply them to the worktree anyway? "
15903msgstr "无论如何都要应用到工作区么?"
15904
a4f16749 15905#: git-add--interactive.perl:1223
1a79b2f1
JX
15906msgid "Nothing was applied.\n"
15907msgstr "未应用。\n"
15908
a4f16749 15909#: git-add--interactive.perl:1234
1a79b2f1
JX
15910#, perl-format
15911msgid "ignoring unmerged: %s\n"
15912msgstr "忽略未合入的:%s\n"
15913
a4f16749 15914#: git-add--interactive.perl:1243
1a79b2f1
JX
15915msgid "Only binary files changed.\n"
15916msgstr "只有二进制文件被修改。\n"
15917
a4f16749 15918#: git-add--interactive.perl:1245
1a79b2f1
JX
15919msgid "No changes.\n"
15920msgstr "没有修改。\n"
15921
a4f16749 15922#: git-add--interactive.perl:1253
1a79b2f1
JX
15923msgid "Patch update"
15924msgstr "补丁更新"
15925
a4f16749 15926#: git-add--interactive.perl:1305
1a79b2f1
JX
15927#, perl-format
15928msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
15929msgstr "暂存状态修改 [y,n,q,a,d,/%s,?]? "
15930
a4f16749 15931#: git-add--interactive.perl:1306
1a79b2f1
JX
15932#, perl-format
15933msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
15934msgstr "暂存状态删除 [y,n,q,a,d,/%s,?]? "
15935
a4f16749 15936#: git-add--interactive.perl:1307
1a79b2f1
JX
15937#, perl-format
15938msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
15939msgstr "暂存该块 [y,n,q,a,d,/%s,?]? "
15940
a4f16749 15941#: git-add--interactive.perl:1310
1a79b2f1
JX
15942#, perl-format
15943msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
15944msgstr "贮藏状态修改 [y,n,q,a,d,/%s,?]? "
15945
a4f16749 15946#: git-add--interactive.perl:1311
1a79b2f1
JX
15947#, perl-format
15948msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
15949msgstr "贮藏状态删除 [y,n,q,a,d,/%s,?]? "
15950
a4f16749 15951#: git-add--interactive.perl:1312
1a79b2f1
JX
15952#, perl-format
15953msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
15954msgstr "贮藏该块 [y,n,q,a,d,/%s,?]? "
15955
a4f16749 15956#: git-add--interactive.perl:1315
1a79b2f1
JX
15957#, perl-format
15958msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
15959msgstr "未暂存状态修改 [y,n,q,a,d,/%s,?]? "
15960
a4f16749 15961#: git-add--interactive.perl:1316
1a79b2f1
JX
15962#, perl-format
15963msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
15964msgstr "未暂存状态删除 [y,n,q,a,d,/%s,?]? "
15965
a4f16749 15966#: git-add--interactive.perl:1317
1a79b2f1
JX
15967#, perl-format
15968msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
15969msgstr "不暂存该块 [y,n,q,a,d,/%s,?]? "
15970
a4f16749 15971#: git-add--interactive.perl:1320
1a79b2f1
JX
15972#, perl-format
15973msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
15974msgstr "修改索引中的应用状态 [y,n,q,a,d,/%s,?]? "
15975
a4f16749 15976#: git-add--interactive.perl:1321
1a79b2f1
JX
15977#, perl-format
15978msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
15979msgstr "从索引中删除应用状态 [y,n,q,a,d,/%s,?]? "
15980
a4f16749 15981#: git-add--interactive.perl:1322
1a79b2f1
JX
15982#, perl-format
15983msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
15984msgstr "将此块应用到索引 [y,n,q,a,d,/%s,?]? "
15985
a4f16749 15986#: git-add--interactive.perl:1325
1a79b2f1
JX
15987#, perl-format
15988msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
15989msgstr "修改工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
15990
a4f16749 15991#: git-add--interactive.perl:1326
1a79b2f1
JX
15992#, perl-format
15993msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
15994msgstr "从工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
15995
a4f16749 15996#: git-add--interactive.perl:1327
1a79b2f1
JX
15997#, perl-format
15998msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
15999msgstr "从工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
16000
a4f16749 16001#: git-add--interactive.perl:1330
1a79b2f1
JX
16002#, perl-format
16003msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
16004msgstr "修改索引和工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
16005
a4f16749 16006#: git-add--interactive.perl:1331
1a79b2f1
JX
16007#, perl-format
16008msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
16009msgstr "从索引和工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
16010
a4f16749 16011#: git-add--interactive.perl:1332
1a79b2f1
JX
16012#, perl-format
16013msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
16014msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
16015
a4f16749 16016#: git-add--interactive.perl:1335
1a79b2f1
JX
16017#, perl-format
16018msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
16019msgstr "修改索引和工作区中的应用状态 [y,n,q,a,d,/%s,?]? "
16020
a4f16749 16021#: git-add--interactive.perl:1336
1a79b2f1
JX
16022#, perl-format
16023msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
16024msgstr "从索引和工作区中删除应用状态 [y,n,q,a,d,/%s,?]? "
16025
a4f16749 16026#: git-add--interactive.perl:1337
1a79b2f1
JX
16027#, perl-format
16028msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
16029msgstr "在索引和工作区中应用该块 [y,n,q,a,d,/%s,?]? "
16030
a4f16749 16031#: git-add--interactive.perl:1440
1a79b2f1
JX
16032msgid "go to which hunk (<ret> to see more)? "
16033msgstr "跳转到哪个块(<回车> 查看更多)? "
16034
a4f16749 16035#: git-add--interactive.perl:1442
1a79b2f1
JX
16036msgid "go to which hunk? "
16037msgstr "跳转到哪个块?"
16038
a4f16749 16039#: git-add--interactive.perl:1451
1a79b2f1
JX
16040#, perl-format
16041msgid "Invalid number: '%s'\n"
16042msgstr "无效数字:'%s'\n"
16043
a4f16749 16044#: git-add--interactive.perl:1456
1a79b2f1
JX
16045#, perl-format
16046msgid "Sorry, only %d hunk available.\n"
16047msgid_plural "Sorry, only %d hunks available.\n"
16048msgstr[0] "对不起,只有 %d 个可用块。\n"
16049msgstr[1] "对不起,只有 %d 个可用块。\n"
16050
a4f16749 16051#: git-add--interactive.perl:1482
1a79b2f1
JX
16052msgid "search for regex? "
16053msgstr "使用正则表达式搜索?"
16054
a4f16749 16055#: git-add--interactive.perl:1495
1a79b2f1
JX
16056#, perl-format
16057msgid "Malformed search regexp %s: %s\n"
16058msgstr "错误的正则表达式 %s:%s\n"
16059
a4f16749 16060#: git-add--interactive.perl:1505
1a79b2f1
JX
16061msgid "No hunk matches the given pattern\n"
16062msgstr "没有和给定模式相匹配的快\n"
16063
a4f16749 16064#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
1a79b2f1
JX
16065msgid "No previous hunk\n"
16066msgstr "没有前一个块\n"
16067
a4f16749 16068#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
1a79b2f1
JX
16069msgid "No next hunk\n"
16070msgstr "没有下一个块\n"
16071
a4f16749 16072#: git-add--interactive.perl:1553
1a79b2f1
JX
16073#, perl-format
16074msgid "Split into %d hunk.\n"
16075msgid_plural "Split into %d hunks.\n"
16076msgstr[0] "拆分为 %d 块。\n"
16077msgstr[1] "拆分为 %d 块。\n"
16078
a4f16749 16079#: git-add--interactive.perl:1605
1a79b2f1
JX
16080msgid "Review diff"
16081msgstr "检视 diff"
16082
16083#. TRANSLATORS: please do not translate the command names
16084#. 'status', 'update', 'revert', etc.
a4f16749 16085#: git-add--interactive.perl:1624
1a79b2f1
JX
16086msgid ""
16087"status - show paths with changes\n"
16088"update - add working tree state to the staged set of changes\n"
16089"revert - revert staged set of changes back to the HEAD version\n"
16090"patch - pick hunks and update selectively\n"
87cb7997 16091"diff - view diff between HEAD and index\n"
1a79b2f1
JX
16092"add untracked - add contents of untracked files to the staged set of "
16093"changes\n"
16094msgstr ""
16095"status - 显示含变更的路径\n"
16096"update - 添加工作区状态至暂存列表\n"
16097"revert - 还原修改的暂存集至 HEAD 版本\n"
16098"patch - 挑选块并且有选择地更新\n"
16099"diff - 显示 HEAD 和索引间差异\n"
16100"add untracked - 添加未跟踪文件的内容至暂存列表\n"
16101
a4f16749
JX
16102#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
16103#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
16104#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
1a79b2f1
JX
16105msgid "missing --"
16106msgstr "缺失 --"
16107
a4f16749 16108#: git-add--interactive.perl:1662
1a79b2f1
JX
16109#, perl-format
16110msgid "unknown --patch mode: %s"
16111msgstr "未知的 --patch 模式:%s"
16112
a4f16749 16113#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
1a79b2f1
JX
16114#, perl-format
16115msgid "invalid argument %s, expecting --"
16116msgstr "无效的参数 %s,期望是 --"
16117
a4f16749 16118#: git-send-email.perl:126
1a79b2f1
JX
16119msgid "local zone differs from GMT by a non-minute interval\n"
16120msgstr "本地时间和 GMT 有不到一分钟间隔\n"
16121
a4f16749 16122#: git-send-email.perl:133 git-send-email.perl:139
1a79b2f1
JX
16123msgid "local time offset greater than or equal to 24 hours\n"
16124msgstr "本地时间偏移量大于等于 24 小时\n"
16125
6937cb4e 16126#: git-send-email.perl:207 git-send-email.perl:213
1a79b2f1
JX
16127msgid "the editor exited uncleanly, aborting everything"
16128msgstr "编辑器非正常退出,终止所有操作"
16129
6937cb4e 16130#: git-send-email.perl:290
1a79b2f1
JX
16131#, perl-format
16132msgid ""
16133"'%s' contains an intermediate version of the email you were composing.\n"
16134msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
16135
6937cb4e 16136#: git-send-email.perl:295
1a79b2f1
JX
16137#, perl-format
16138msgid "'%s.final' contains the composed email.\n"
16139msgstr "'%s.final' 包含编辑的邮件。\n"
16140
6937cb4e 16141#: git-send-email.perl:313
1a79b2f1
JX
16142msgid "--dump-aliases incompatible with other options\n"
16143msgstr "--dump-aliases 和其它选项不兼容\n"
16144
6937cb4e 16145#: git-send-email.perl:378 git-send-email.perl:629
1a79b2f1
JX
16146msgid "Cannot run git format-patch from outside a repository\n"
16147msgstr "不能在仓库之外运行 git format-patch\n"
16148
6937cb4e 16149#: git-send-email.perl:447
1a79b2f1
JX
16150#, perl-format
16151msgid "Unknown --suppress-cc field: '%s'\n"
16152msgstr "未知的 --suppress-cc 字段:'%s'\n"
16153
6937cb4e 16154#: git-send-email.perl:476
1a79b2f1
JX
16155#, perl-format
16156msgid "Unknown --confirm setting: '%s'\n"
16157msgstr "未知的 --confirm 设置:'%s'\n"
16158
6937cb4e 16159#: git-send-email.perl:504
1a79b2f1
JX
16160#, perl-format
16161msgid "warning: sendmail alias with quotes is not supported: %s\n"
16162msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
16163
6937cb4e 16164#: git-send-email.perl:506
1a79b2f1
JX
16165#, perl-format
16166msgid "warning: `:include:` not supported: %s\n"
16167msgstr "警告:不支持 `:include:`:%s\n"
16168
6937cb4e 16169#: git-send-email.perl:508
1a79b2f1
JX
16170#, perl-format
16171msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
16172msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
16173
6937cb4e 16174#: git-send-email.perl:513
1a79b2f1
JX
16175#, perl-format
16176msgid "warning: sendmail line is not recognized: %s\n"
16177msgstr "警告:不能识别的 sendmail 行:%s\n"
16178
6937cb4e 16179#: git-send-email.perl:595
1a79b2f1
JX
16180#, perl-format
16181msgid ""
16182"File '%s' exists but it could also be the range of commits\n"
16183"to produce patches for. Please disambiguate by...\n"
16184"\n"
16185" * Saying \"./%s\" if you mean a file; or\n"
16186" * Giving --format-patch option if you mean a range.\n"
16187msgstr ""
87cb7997
JX
16188"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
16189"歧义:\n"
1a79b2f1
JX
16190"\n"
16191" * 如果含义为一个文件,使用 \"./%s\",或者\n"
16192" * 如果含义为一个范围,使用 --format-patch 选项。\n"
16193
6937cb4e 16194#: git-send-email.perl:616
1a79b2f1
JX
16195#, perl-format
16196msgid "Failed to opendir %s: %s"
16197msgstr "无法打开目录 %s: %s"
16198
6937cb4e 16199#: git-send-email.perl:640
1a79b2f1
JX
16200#, perl-format
16201msgid ""
16202"fatal: %s: %s\n"
16203"warning: no patches were sent\n"
16204msgstr ""
16205"严重:%s:%s\n"
16206"警告:补丁未能发送\n"
16207
6937cb4e 16208#: git-send-email.perl:651
1a79b2f1
JX
16209msgid ""
16210"\n"
16211"No patch files specified!\n"
16212"\n"
87cb7997
JX
16213msgstr ""
16214"\n"
16215"未指定补丁文件!\n"
16216"\n"
1a79b2f1 16217
6937cb4e 16218#: git-send-email.perl:664
1a79b2f1
JX
16219#, perl-format
16220msgid "No subject line in %s?"
16221msgstr "在 %s 中没有标题行?"
16222
6937cb4e 16223#: git-send-email.perl:674
1a79b2f1
JX
16224#, perl-format
16225msgid "Failed to open for writing %s: %s"
16226msgstr "无法写入 %s: %s"
16227
6937cb4e 16228#: git-send-email.perl:684
1a79b2f1
JX
16229msgid ""
16230"Lines beginning in \"GIT:\" will be removed.\n"
16231"Consider including an overall diffstat or table of contents\n"
16232"for the patch you are writing.\n"
16233"\n"
16234"Clear the body content if you don't wish to send a summary.\n"
16235msgstr ""
16236"以 \"GIT:\" 开头的行将被删除。\n"
16237"考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n"
16238"\n"
16239"如果您不想发送摘要,清除内容。\n"
16240
6937cb4e 16241#: git-send-email.perl:707
1a79b2f1
JX
16242#, perl-format
16243msgid "Failed to open %s.final: %s"
16244msgstr "无法打开 %s.final: %s"
16245
6937cb4e 16246#: git-send-email.perl:710
1a79b2f1
JX
16247#, perl-format
16248msgid "Failed to open %s: %s"
16249msgstr "无法打开 %s: %s"
16250
6937cb4e 16251#: git-send-email.perl:745
1a79b2f1
JX
16252msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
16253msgstr "To/Cc/Bcc 字段不解析,它们被忽略\n"
16254
6937cb4e 16255#: git-send-email.perl:754
1a79b2f1
JX
16256msgid "Summary email is empty, skipping it\n"
16257msgstr "摘要邮件为空,跳过\n"
16258
16259#. TRANSLATORS: please keep [y/N] as is.
6937cb4e 16260#: git-send-email.perl:786
1a79b2f1
JX
16261#, perl-format
16262msgid "Are you sure you want to use <%s> [y/N]? "
16263msgstr "您确认要使用 <%s> [y/N]?"
16264
6937cb4e 16265#: git-send-email.perl:815
1a79b2f1
JX
16266msgid ""
16267"The following files are 8bit, but do not declare a Content-Transfer-"
16268"Encoding.\n"
16269msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
16270
6937cb4e 16271#: git-send-email.perl:820
1a79b2f1
JX
16272msgid "Which 8bit encoding should I declare [UTF-8]? "
16273msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?"
16274
6937cb4e 16275#: git-send-email.perl:828
1a79b2f1
JX
16276#, perl-format
16277msgid ""
16278"Refusing to send because the patch\n"
16279"\t%s\n"
16280"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
16281"want to send.\n"
16282msgstr ""
16283"拒绝发送,因为补丁\n"
16284"\t%s\n"
16285"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
16286
6937cb4e 16287#: git-send-email.perl:847
1a79b2f1
JX
16288msgid "To whom should the emails be sent (if anyone)?"
16289msgstr "邮件将要发送给谁?"
16290
6937cb4e 16291#: git-send-email.perl:865
1a79b2f1
JX
16292#, perl-format
16293msgid "fatal: alias '%s' expands to itself\n"
16294msgstr "严重:别名 '%s' 扩展为它自己\n"
16295
6937cb4e 16296#: git-send-email.perl:877
1a79b2f1
JX
16297msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
16298msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?"
16299
5809aa05 16300#: git-send-email.perl:929 git-send-email.perl:937
1a79b2f1
JX
16301#, perl-format
16302msgid "error: unable to extract a valid address from: %s\n"
16303msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
16304
16305#. TRANSLATORS: Make sure to include [q] [d] [e] in your
16306#. translation. The program will only accept English input
16307#. at this point.
5809aa05 16308#: git-send-email.perl:941
1a79b2f1
JX
16309msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
16310msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):"
16311
5809aa05 16312#: git-send-email.perl:1262
1a79b2f1
JX
16313#, perl-format
16314msgid "CA path \"%s\" does not exist"
16315msgstr "CA 路径 \"%s\" 不存在"
16316
5809aa05 16317#: git-send-email.perl:1337
1a79b2f1
JX
16318msgid ""
16319" The Cc list above has been expanded by additional\n"
16320" addresses found in the patch commit message. By default\n"
16321" send-email prompts before sending whenever this occurs.\n"
16322" This behavior is controlled by the sendemail.confirm\n"
16323" configuration setting.\n"
16324"\n"
16325" For additional information, run 'git send-email --help'.\n"
16326" To retain the current behavior, but squelch this message,\n"
16327" run 'git config --global sendemail.confirm auto'.\n"
16328"\n"
16329msgstr ""
16330" 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n"
16331" 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
16332" sendemail.confirm 配置设置。\n"
16333"\n"
16334" 更多信息,执行 'git send-email --help'。\n"
16335" 要保持当前行为,但不显示此信息,运行 'git config --global\n"
16336" sendemail.confirm auto'。\n"
16337"\n"
16338
16339#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
16340#. translation. The program will only accept English input
16341#. at this point.
5809aa05 16342#: git-send-email.perl:1352
1a79b2f1
JX
16343msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
16344msgstr "发送邮件?([y]es|[n]o|[q]uit|[a]ll):"
16345
5809aa05 16346#: git-send-email.perl:1355
1a79b2f1
JX
16347msgid "Send this email reply required"
16348msgstr "发送要求的邮件回复"
16349
5809aa05 16350#: git-send-email.perl:1381
1a79b2f1
JX
16351msgid "The required SMTP server is not properly defined."
16352msgstr "要求的 SMTP 服务器未被正确定义。"
16353
5809aa05 16354#: git-send-email.perl:1428
1a79b2f1
JX
16355#, perl-format
16356msgid "Server does not support STARTTLS! %s"
16357msgstr "服务器不支持 STARTTLS!%s"
16358
5809aa05 16359#: git-send-email.perl:1433 git-send-email.perl:1437
a4f16749
JX
16360#, perl-format
16361msgid "STARTTLS failed! %s"
16362msgstr "STARTTLS 失败!%s"
16363
5809aa05 16364#: git-send-email.perl:1447
1a79b2f1
JX
16365msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
16366msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
16367
5809aa05 16368#: git-send-email.perl:1465
1a79b2f1
JX
16369#, perl-format
16370msgid "Failed to send %s\n"
16371msgstr "无法发送 %s\n"
16372
5809aa05 16373#: git-send-email.perl:1468
1a79b2f1
JX
16374#, perl-format
16375msgid "Dry-Sent %s\n"
16376msgstr "演习发送 %s\n"
16377
5809aa05 16378#: git-send-email.perl:1468
1a79b2f1
JX
16379#, perl-format
16380msgid "Sent %s\n"
16381msgstr "正发送 %s\n"
16382
5809aa05 16383#: git-send-email.perl:1470
1a79b2f1
JX
16384msgid "Dry-OK. Log says:\n"
16385msgstr "演习成功。日志说:\n"
16386
5809aa05 16387#: git-send-email.perl:1470
1a79b2f1
JX
16388msgid "OK. Log says:\n"
16389msgstr "OK。日志说:\n"
16390
5809aa05 16391#: git-send-email.perl:1482
1a79b2f1
JX
16392msgid "Result: "
16393msgstr "结果:"
16394
5809aa05 16395#: git-send-email.perl:1485
1a79b2f1
JX
16396msgid "Result: OK\n"
16397msgstr "结果:OK\n"
16398
5809aa05 16399#: git-send-email.perl:1498
1a79b2f1
JX
16400#, perl-format
16401msgid "can't open file %s"
16402msgstr "无法打开文件 %s"
16403
5809aa05 16404#: git-send-email.perl:1545 git-send-email.perl:1565
1a79b2f1
JX
16405#, perl-format
16406msgid "(mbox) Adding cc: %s from line '%s'\n"
16407msgstr "(mbox) 添加 cc:%s 自行 '%s'\n"
16408
5809aa05 16409#: git-send-email.perl:1551
1a79b2f1
JX
16410#, perl-format
16411msgid "(mbox) Adding to: %s from line '%s'\n"
16412msgstr "(mbox) 添加 to:%s 自行 '%s'\n"
16413
5809aa05 16414#: git-send-email.perl:1599
1a79b2f1
JX
16415#, perl-format
16416msgid "(non-mbox) Adding cc: %s from line '%s'\n"
16417msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n"
16418
5809aa05 16419#: git-send-email.perl:1624
1a79b2f1
JX
16420#, perl-format
16421msgid "(body) Adding cc: %s from line '%s'\n"
16422msgstr "(body) 添加 cc: %s 自行 '%s'\n"
16423
5809aa05 16424#: git-send-email.perl:1730
1a79b2f1
JX
16425#, perl-format
16426msgid "(%s) Could not execute '%s'"
16427msgstr "(%s) 不能执行 '%s'"
16428
5809aa05 16429#: git-send-email.perl:1737
1a79b2f1
JX
16430#, perl-format
16431msgid "(%s) Adding %s: %s from: '%s'\n"
16432msgstr "(%s) 添加 %s: %s 自:'%s'\n"
16433
5809aa05 16434#: git-send-email.perl:1741
1a79b2f1
JX
16435#, perl-format
16436msgid "(%s) failed to close pipe to '%s'"
16437msgstr "(%s) 无法关闭管道至 '%s'"
16438
5809aa05 16439#: git-send-email.perl:1768
1a79b2f1
JX
16440msgid "cannot send message as 7bit"
16441msgstr "不能以 7bit 形式发送信息"
16442
5809aa05 16443#: git-send-email.perl:1776
1a79b2f1
JX
16444msgid "invalid transfer encoding"
16445msgstr "无效的传送编码"
16446
5809aa05 16447#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
1a79b2f1
JX
16448#, perl-format
16449msgid "unable to open %s: %s\n"
16450msgstr "不能打开 %s:%s\n"
16451
5809aa05 16452#: git-send-email.perl:1817
1a79b2f1
JX
16453#, perl-format
16454msgid "%s: patch contains a line longer than 998 characters"
16455msgstr "%s:补丁包含一个超过 998 字符的行"
16456
5809aa05 16457#: git-send-email.perl:1833
1a79b2f1
JX
16458#, perl-format
16459msgid "Skipping %s with backup suffix '%s'.\n"
16460msgstr "略过 %s 含备份后缀 '%s'。\n"
16461
16462#. TRANSLATORS: please keep "[y|N]" as is.
5809aa05 16463#: git-send-email.perl:1837
1a79b2f1
JX
16464#, perl-format
16465msgid "Do you really want to send %s? [y|N]: "
16466msgstr "您真的要发送 %s?[y|N]:"
5809aa05
JX
16467
16468#~ msgid ""
16469#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
16470#~ "please use . instead if you meant to match all paths"
16471#~ msgstr ""
16472#~ "在下一个版本中,使用空字符串作为路径规格将被视作非法。如果要匹配所有路"
16473#~ "径,\n"
16474#~ "请代之以 ."
16475
16476#~ msgid "unable to open '%s' for writing"
16477#~ msgstr "无法以写入方式打开 '%s'"
16478
16479#~ msgid "could not truncate '%s'"
16480#~ msgstr "无法截断 '%s'"
16481
16482#~ msgid "could not finish '%s'"
16483#~ msgstr "无法结束 '%s'"
16484
16485#~ msgid "could not close %s"
16486#~ msgstr "不能关闭 %s"
16487
16488#~ msgid "Copied a misnamed branch '%s' away"
16489#~ msgstr "已将错误命名的分支 '%s' 复制"
16490
16491#~ msgid "it does not make sense to create 'HEAD' manually"
16492#~ msgstr "手工创建 'HEAD' 没有意义"
16493
16494#~ msgid "Don't know how to clone %s"
16495#~ msgstr "不知道如何克隆 %s"
16496
16497#~ msgid "show ignored files"
16498#~ msgstr "显示忽略的文件"
16499
16500#~ msgid "%s is not a valid '%s' object"
16501#~ msgstr "%s 不是一个有效的 '%s' 对象"
16502
16503#~ msgid "Don't know how to fetch from %s"
16504#~ msgstr "不知道如何从 %s 获取"
16505
16506#~ msgid "'$term' is not a valid term"
16507#~ msgstr "'$term' 不是一个有效的名称"
16508
16509#~ msgid ""
16510#~ "error: unknown option for 'stash save': $option\n"
16511#~ " To provide a message, use git stash save -- '$option'"
16512#~ msgstr ""
16513#~ "错误:'stash save' 的未知选项:$option\n"
16514#~ " 要提供一个描述信息,使用 git stash save -- '$option'"
16515
16516#~ msgid "Failed to recurse into submodule path '$sm_path'"
16517#~ msgstr "无法递归进子模组路径 '$sm_path'"