]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
Merge branch 'master' of git://github.com/nafmo/git-l10n-sv
[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:
c04f5ac3 6# - Jiang Xin <worldhello.net AT gmail.com>
bbdf0acc
JX
7# - Lian Cheng <rhythm.mail AT gmail.com>
8# - Ray Chen <oldsharp AT gmail.com>
c04f5ac3 9# - Riku <lu.riku AT gmail.com>
bbdf0acc
JX
10# - Thynson <lanxingcan AT gmail.com>
11# - ws3389 <willsmith3389 AT gmail.com>
12# - Wang Sheng <wangsheng2008love AT 163.com>
554e8501 13# - 依云 <lilydjwg AT gmail.com>
bbdf0acc 14# - Yichao Yu <yyc1992 AT gmail.com>
c04f5ac3 15# - Zhuang Ya <zhuangya AT me.com>
c04f5ac3 16#
160fb2b2
JX
17# Git glossary for Chinese translators
18#
19# English | Chinese
20# ---------------------------------+--------------------------------------
21# 3-way merge | 三方合并
22# abbreviate | 简写(的 SHA-1 值)
23# alternate object database | 备用对象库
24# amend | 修补
25# ancestor | 祖先,祖先提交
26# annotated tag | 附注标签
27# bare repository | 纯仓库
28# bisect | 二分查找
29# blob object | 数据对象
30# branch | 分支
31# bundle | 包
32# bypass | 绕过
33# cache | 索引(的别称)
34# chain | (提交)链
35# changeset | 变更集
36# checkout | 检出
37# checksum | 校验,校验和
38# cherry-picking | 拣选
39# clean | 干净(的工作区)
40# clone | 克隆
41# commit | 提交
667599e8 42# commit message | 提交说明
160fb2b2
JX
43# commit object | 提交对象
44# commit-ish (also committish) | 提交号
45# conflict | 冲突
46# core Git | 核心 Git 工具
47# DAG | 有向无环图
48# dangling object | 摇摆对象
49# detached HEAD | 分离头指针
50# directory | 目录
51# dirty | 脏(的工作区)
755c831b 52# dumb HTTP protocol | 哑 HTTP 协议
160fb2b2
JX
53# evil merge | 坏合并(合并引入了父提交没有的修改)
54# fast-forward | 快进
55# fetch | 获取
56# file system | 文件系统
e397e7e3 57# fork | 派生
160fb2b2
JX
58# Git archive | 仓库(对于 arch 用户)
59# gitfile | gitfile(仓库链接文件)
60# grafts | (提交)嫁接
61# hash | 哈希值
62# HEAD | HEAD(头指针,亦即当前分支)
63# head | 头、分支
64# head ref | 分支
65# header | 头信息
66# hook | 钩子
67# hunk | 补丁片段
68# index | 索引
69# index entry | 索引条目
70# loose object | 松散对象
71# loose refs | 松散引用
72# master | master(默认分支名)
73# merge | 合并
74# object | 对象
75# object database | 对象库
76# object identifier | 对象标识符
77# object name | 对象名称
78# object type | 对象类型
79# octopus | 章鱼式合并(两分支以上的合并)
80# origin | origin(默认的远程名称)
81# pack | 包
82# pack index | 包索引
83# packfile | 包文件
84# parent | 父提交
85# patch | 补丁
86# pathspec | 路径规格
87# pattern | 模式
12e59059 88# pickaxe | 挖掘
160fb2b2
JX
89# plumbing | 管件(Git 底层核心命令的别称)
90# porcelain | 瓷件(Git 上层封装命令的别称)
94550ed3 91# precious-objects repo | 珍品仓库
160fb2b2
JX
92# prune | 清除
93# pull | 拉,拉取
94# push | 推,推送
95# reachable | 可达
96# rebase | 变基
97# ref | 引用
98# reflog | 引用日志
99# refspec | 引用规格
100# remote | 远程,远程仓库
101# remote-tracking branch | 远程跟踪分支
102# replay | 重放
103# repo | 仓库
104# repository | 仓库
105# resolve | (冲突)解决
106# revert | 还原
107# revision | 版本
108# rewind | 回退
109# SCM | 源代码管理(工具)
ee7589bb 110# SHA-1 | SHA-1(安全哈希算法1)
160fb2b2
JX
111# shallow repository | 浅(克隆)仓库
112# signed tag | 签名标签
755c831b 113# smart HTTP protocol | 智能 HTTP 协议
160fb2b2
JX
114# squash | 压缩
115# stage | n. 暂存区(即索引); v. 暂存
a4f16749 116# stash | n. 贮藏区; v. 贮藏
160fb2b2
JX
117# submodule | 子模组
118# symref | 符号引用
933c015e 119# tag | n. 标签; v. 打标签
160fb2b2
JX
120# tag object | 标签对象
121# tagger | 打标签者
122# topic branch | 主题分支
123# track | 跟踪
6937cb4e 124# trailer | 尾部署名
160fb2b2
JX
125# tree | 树(工作区或树对象)
126# tree object | 树对象
127# tree-ish (also treeish) | 树对象(或可以解析为一树对象)
128# unmerged index | 未合并索引
129# unpack | 解包
130# unreachable object | 不可达对象
131# unstage | 取消暂存
132# upstream | 上游
133# upstream branch | 上游分支
134# working tree | 工作区
135#
c04f5ac3
JX
136msgid ""
137msgstr ""
138"Project-Id-Version: Git\n"
139"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
6937cb4e 140"POT-Creation-Date: 2017-10-17 09:44+0800\n"
58b6f078 141"PO-Revision-Date: 2017-12-02 17:15+0800\n"
c04f5ac3 142"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
7aea43ff 143"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
c04f5ac3
JX
144"Language: zh_CN\n"
145"MIME-Version: 1.0\n"
146"Content-Type: text/plain; charset=UTF-8\n"
147"Content-Transfer-Encoding: 8bit\n"
5ae481e0 148"Plural-Forms: nplurals=2; plural=(n != 1);\n"
c04f5ac3 149
a4f16749 150#: advice.c:58
c04f5ac3
JX
151#, c-format
152msgid "hint: %.*s\n"
153msgstr "提示:%.*s\n"
154
a4f16749 155#: advice.c:86
5c57d762
JX
156msgid "Cherry-picking is not possible because you have unmerged files."
157msgstr "无法拣选,因为您有未合并的文件。"
158
a4f16749 159#: advice.c:88
5c57d762
JX
160msgid "Committing is not possible because you have unmerged files."
161msgstr "无法提交,因为您有未合并的文件。"
162
a4f16749 163#: advice.c:90
5c57d762
JX
164msgid "Merging is not possible because you have unmerged files."
165msgstr "无法合并,因为您有未合并的文件。"
166
a4f16749 167#: advice.c:92
5c57d762
JX
168msgid "Pulling is not possible because you have unmerged files."
169msgstr "无法拉取,因为您有未合并的文件。"
170
a4f16749 171#: advice.c:94
5c57d762
JX
172msgid "Reverting is not possible because you have unmerged files."
173msgstr "无法回退,因为您有未合并的文件。"
174
a4f16749 175#: advice.c:96
5c57d762
JX
176#, c-format
177msgid "It is not possible to %s because you have unmerged files."
178msgstr "无法 %s,因为您有未合并的文件。"
179
a4f16749 180#: advice.c:104
c04f5ac3 181msgid ""
6acbf033 182"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 183"as appropriate to mark resolution and make a commit."
c04f5ac3 184msgstr ""
d9d56b23 185"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
220c313c 186"解决方案并提交。"
c04f5ac3 187
a4f16749 188#: advice.c:112
5c57d762
JX
189msgid "Exiting because of an unresolved conflict."
190msgstr "因为存在未解决的冲突而退出。"
191
6937cb4e 192#: advice.c:117 builtin/merge.c:1211
1b7f4a34
JX
193msgid "You have not concluded your merge (MERGE_HEAD exists)."
194msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
195
a4f16749 196#: advice.c:119
94550ed3 197msgid "Please, commit your changes before merging."
1b7f4a34
JX
198msgstr "请在合并前先提交您的修改。"
199
a4f16749 200#: advice.c:120
1b7f4a34
JX
201msgid "Exiting because of unfinished merge."
202msgstr "因为存在未完成的合并而退出。"
203
a4f16749 204#: advice.c:126
5c57d762
JX
205#, c-format
206msgid ""
207"Note: checking out '%s'.\n"
208"\n"
209"You are in 'detached HEAD' state. You can look around, make experimental\n"
210"changes and commit them, and you can discard any commits you make in this\n"
211"state without impacting any branches by performing another checkout.\n"
212"\n"
213"If you want to create a new branch to retain commits you create, you may\n"
214"do so (now or later) by using -b with the checkout command again. Example:\n"
215"\n"
216" git checkout -b <new-branch-name>\n"
217"\n"
218msgstr ""
219"注意:正在检出 '%s'。\n"
220"\n"
a0b6b246
JX
221"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另"
222"外\n"
5c57d762
JX
223"的检出分支操作丢弃在这个状态下所做的任何提交。\n"
224"\n"
225"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n"
226"参数 -b 来实现(现在或稍后)。例如:\n"
227"\n"
58b6f078 228" git checkout -b <新分支名>\n"
5c57d762
JX
229"\n"
230
a4f16749 231#: apply.c:58
a0b6b246
JX
232#, c-format
233msgid "unrecognized whitespace option '%s'"
234msgstr "未能识别的空白字符选项 '%s'"
ef317cd5 235
a4f16749 236#: apply.c:74
90314792 237#, c-format
a0b6b246
JX
238msgid "unrecognized whitespace ignore option '%s'"
239msgstr "未能识别的空白字符忽略选项 '%s'"
90314792 240
6937cb4e 241#: apply.c:125
a0b6b246 242msgid "--reject and --3way cannot be used together."
2090d5b4 243msgstr "--reject 和 --3way 不能同时使用。"
ef317cd5 244
6937cb4e 245#: apply.c:127
a0b6b246
JX
246msgid "--cached and --3way cannot be used together."
247msgstr "--cached 和 --3way 不能同时使用。"
ef317cd5 248
6937cb4e 249#: apply.c:130
a0b6b246
JX
250msgid "--3way outside a repository"
251msgstr "--3way 在一个仓库之外"
ef317cd5 252
6937cb4e 253#: apply.c:141
a0b6b246
JX
254msgid "--index outside a repository"
255msgstr "--index 在一个仓库之外"
ef317cd5 256
6937cb4e 257#: apply.c:144
a0b6b246
JX
258msgid "--cached outside a repository"
259msgstr "--cached 在一个仓库之外"
ef317cd5 260
6937cb4e 261#: apply.c:845
a0b6b246
JX
262#, c-format
263msgid "Cannot prepare timestamp regexp %s"
264msgstr "无法准备时间戳正则表达式 %s"
ef317cd5 265
6937cb4e 266#: apply.c:854
a0b6b246
JX
267#, c-format
268msgid "regexec returned %d for input: %s"
269msgstr "regexec 返回 %d,输入为:%s"
ef317cd5 270
6937cb4e 271#: apply.c:928
a0b6b246
JX
272#, c-format
273msgid "unable to find filename in patch at line %d"
274msgstr "不能在补丁的第 %d 行找到文件名"
ef317cd5 275
6937cb4e 276#: apply.c:966
a0b6b246
JX
277#, c-format
278msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
279msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
ef317cd5 280
6937cb4e 281#: apply.c:972
a0b6b246
JX
282#, c-format
283msgid "git apply: bad git-diff - inconsistent new filename on line %d"
284msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
ef317cd5 285
6937cb4e 286#: apply.c:973
a0b6b246
JX
287#, c-format
288msgid "git apply: bad git-diff - inconsistent old filename on line %d"
289msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
ef317cd5 290
6937cb4e 291#: apply.c:978
a0b6b246
JX
292#, c-format
293msgid "git apply: bad git-diff - expected /dev/null on line %d"
294msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
ef317cd5 295
6937cb4e 296#: apply.c:1007
a4f16749
JX
297#, c-format
298msgid "invalid mode on line %d: %s"
299msgstr "第 %d 行包含无效文件模式:%s"
300
6937cb4e 301#: apply.c:1325
a4f16749
JX
302#, c-format
303msgid "inconsistent header lines %d and %d"
304msgstr "不一致的文件头,%d 行和 %d 行"
305
6937cb4e 306#: apply.c:1497
a0b6b246
JX
307#, c-format
308msgid "recount: unexpected line: %.*s"
309msgstr "recount:意外的行:%.*s"
ef317cd5 310
6937cb4e 311#: apply.c:1566
a0b6b246
JX
312#, c-format
313msgid "patch fragment without header at line %d: %.*s"
314msgstr "第 %d 行的补丁片段没有头信息:%.*s"
ef317cd5 315
6937cb4e 316#: apply.c:1586
a0b6b246
JX
317#, c-format
318msgid ""
319"git diff header lacks filename information when removing %d leading pathname "
320"component (line %d)"
321msgid_plural ""
322"git diff header lacks filename information when removing %d leading pathname "
323"components (line %d)"
324msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
325msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
ef317cd5 326
6937cb4e 327#: apply.c:1599
a0b6b246
JX
328#, c-format
329msgid "git diff header lacks filename information (line %d)"
330msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
07432cef 331
6937cb4e 332#: apply.c:1787
a0b6b246
JX
333msgid "new file depends on old contents"
334msgstr "新文件依赖旧内容"
5c57d762 335
6937cb4e 336#: apply.c:1789
a0b6b246
JX
337msgid "deleted file still has contents"
338msgstr "删除的文件仍有内容"
5c57d762 339
6937cb4e 340#: apply.c:1823
a0b6b246
JX
341#, c-format
342msgid "corrupt patch at line %d"
343msgstr "补丁在第 %d 行损坏"
5c57d762 344
6937cb4e 345#: apply.c:1860
5c57d762 346#, c-format
a0b6b246
JX
347msgid "new file %s depends on old contents"
348msgstr "新文件 %s 依赖旧内容"
5c57d762 349
6937cb4e 350#: apply.c:1862
5c57d762 351#, c-format
a0b6b246
JX
352msgid "deleted file %s still has contents"
353msgstr "删除的文件 %s 仍有内容"
5c57d762 354
6937cb4e 355#: apply.c:1865
a0b6b246
JX
356#, c-format
357msgid "** warning: file %s becomes empty but is not deleted"
358msgstr "** 警告:文件 %s 成为空文件但并未删除"
ef317cd5 359
6937cb4e 360#: apply.c:2012
5c57d762 361#, c-format
a0b6b246
JX
362msgid "corrupt binary patch at line %d: %.*s"
363msgstr "二进制补丁在第 %d 行损坏:%.*s"
5c57d762 364
6937cb4e 365#: apply.c:2049
5c57d762 366#, c-format
a0b6b246
JX
367msgid "unrecognized binary patch at line %d"
368msgstr "未能识别的二进制补丁位于第 %d 行"
5c57d762 369
6937cb4e 370#: apply.c:2209
5c57d762 371#, c-format
a0b6b246
JX
372msgid "patch with only garbage at line %d"
373msgstr "补丁文件的第 %d 行只有垃圾数据"
5c57d762 374
6937cb4e 375#: apply.c:2295
5c57d762 376#, c-format
a0b6b246
JX
377msgid "unable to read symlink %s"
378msgstr "无法读取符号链接 %s"
5c57d762 379
6937cb4e 380#: apply.c:2299
5c57d762 381#, c-format
a0b6b246
JX
382msgid "unable to open or read %s"
383msgstr "不能打开或读取 %s"
5c57d762 384
6937cb4e 385#: apply.c:2958
5c57d762 386#, c-format
a0b6b246
JX
387msgid "invalid start of line: '%c'"
388msgstr "无效的行首字符:'%c'"
5c57d762 389
6937cb4e 390#: apply.c:3077
5c57d762 391#, c-format
a0b6b246
JX
392msgid "Hunk #%d succeeded at %d (offset %d line)."
393msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
394msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
395msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
5c57d762 396
6937cb4e 397#: apply.c:3089
5c57d762 398#, c-format
a0b6b246
JX
399msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
400msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
5c57d762 401
6937cb4e 402#: apply.c:3095
5c57d762
JX
403#, c-format
404msgid ""
a0b6b246
JX
405"while searching for:\n"
406"%.*s"
5c57d762 407msgstr ""
a0b6b246
JX
408"当查询:\n"
409"%.*s"
5c57d762 410
6937cb4e 411#: apply.c:3117
5c57d762 412#, c-format
a0b6b246
JX
413msgid "missing binary patch data for '%s'"
414msgstr "缺失 '%s' 的二进制补丁数据"
5c57d762 415
6937cb4e 416#: apply.c:3125
5c57d762 417#, c-format
a0b6b246 418msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
29004bbb 419msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
5c57d762 420
6937cb4e 421#: apply.c:3171
5c57d762 422#, c-format
a0b6b246
JX
423msgid "cannot apply binary patch to '%s' without full index line"
424msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
5c57d762 425
6937cb4e 426#: apply.c:3181
5c57d762 427#, c-format
a0b6b246
JX
428msgid ""
429"the patch applies to '%s' (%s), which does not match the current contents."
29004bbb 430msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
5c57d762 431
6937cb4e 432#: apply.c:3189
a0b6b246
JX
433#, c-format
434msgid "the patch applies to an empty '%s' but it is not empty"
29004bbb 435msgstr "补丁应用到空文件 '%s',但其并非空文件"
5c57d762 436
6937cb4e 437#: apply.c:3207
5c57d762 438#, c-format
a0b6b246
JX
439msgid "the necessary postimage %s for '%s' cannot be read"
440msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"
5c57d762 441
6937cb4e 442#: apply.c:3220
5c57d762 443#, c-format
a0b6b246
JX
444msgid "binary patch does not apply to '%s'"
445msgstr "二进制补丁未应用到 '%s'"
5c57d762 446
6937cb4e 447#: apply.c:3226
5c57d762 448#, c-format
a0b6b246
JX
449msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
450msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
5c57d762 451
6937cb4e 452#: apply.c:3247
276ceeaa 453#, c-format
a0b6b246
JX
454msgid "patch failed: %s:%ld"
455msgstr "打补丁失败:%s:%ld"
276ceeaa 456
6937cb4e 457#: apply.c:3369
4dcdc3d8 458#, c-format
a0b6b246
JX
459msgid "cannot checkout %s"
460msgstr "不能检出 %s"
4dcdc3d8 461
6937cb4e 462#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
4dcdc3d8 463#, c-format
a0b6b246
JX
464msgid "failed to read %s"
465msgstr "无法读取 %s"
4dcdc3d8 466
6937cb4e 467#: apply.c:3426
4dcdc3d8 468#, c-format
a0b6b246
JX
469msgid "reading from '%s' beyond a symbolic link"
470msgstr "读取位于符号链接中的 '%s'"
4dcdc3d8 471
6937cb4e 472#: apply.c:3455 apply.c:3695
4dcdc3d8 473#, c-format
a0b6b246
JX
474msgid "path %s has been renamed/deleted"
475msgstr "路径 %s 已经被重命名/删除"
4dcdc3d8 476
6937cb4e 477#: apply.c:3538 apply.c:3709
4dcdc3d8 478#, c-format
a0b6b246
JX
479msgid "%s: does not exist in index"
480msgstr "%s:不存在于索引中"
4dcdc3d8 481
6937cb4e 482#: apply.c:3547 apply.c:3717
4dcdc3d8 483#, c-format
a0b6b246
JX
484msgid "%s: does not match index"
485msgstr "%s:和索引不匹配"
4dcdc3d8 486
6937cb4e 487#: apply.c:3582
a0b6b246
JX
488msgid "repository lacks the necessary blob to fall back on 3-way merge."
489msgstr "仓库缺乏必要的数据对象以进行三方合并。"
4dcdc3d8 490
6937cb4e 491#: apply.c:3585
4dcdc3d8 492#, c-format
a0b6b246
JX
493msgid "Falling back to three-way merge...\n"
494msgstr "回落到三方合并...\n"
4dcdc3d8 495
6937cb4e 496#: apply.c:3601 apply.c:3605
4dcdc3d8 497#, c-format
a0b6b246
JX
498msgid "cannot read the current contents of '%s'"
499msgstr "无法读取 '%s' 的当前内容"
276ceeaa 500
6937cb4e 501#: apply.c:3617
4dcdc3d8 502#, c-format
a0b6b246
JX
503msgid "Failed to fall back on three-way merge...\n"
504msgstr "无法回落到三方合并...\n"
4dcdc3d8 505
6937cb4e 506#: apply.c:3631
4dcdc3d8 507#, c-format
a0b6b246
JX
508msgid "Applied patch to '%s' with conflicts.\n"
509msgstr "应用补丁到 '%s' 存在冲突。\n"
4dcdc3d8 510
6937cb4e 511#: apply.c:3636
4dcdc3d8 512#, c-format
a0b6b246
JX
513msgid "Applied patch to '%s' cleanly.\n"
514msgstr "成功应用补丁到 '%s'。\n"
4dcdc3d8 515
6937cb4e 516#: apply.c:3662
a0b6b246
JX
517msgid "removal patch leaves file contents"
518msgstr "移除补丁仍留下了文件内容"
4dcdc3d8 519
6937cb4e 520#: apply.c:3734
1003b3a5 521#, c-format
a0b6b246
JX
522msgid "%s: wrong type"
523msgstr "%s:错误类型"
1003b3a5 524
6937cb4e 525#: apply.c:3736
1003b3a5 526#, c-format
a0b6b246
JX
527msgid "%s has type %o, expected %o"
528msgstr "%s 的类型是 %o,应为 %o"
1003b3a5 529
6937cb4e 530#: apply.c:3886 apply.c:3888
4dcdc3d8 531#, c-format
a0b6b246
JX
532msgid "invalid path '%s'"
533msgstr "无效路径 '%s'"
4dcdc3d8 534
6937cb4e 535#: apply.c:3944
4dcdc3d8 536#, c-format
a0b6b246
JX
537msgid "%s: already exists in index"
538msgstr "%s:已经存在于索引中"
4dcdc3d8 539
6937cb4e 540#: apply.c:3947
4dcdc3d8 541#, c-format
a0b6b246
JX
542msgid "%s: already exists in working directory"
543msgstr "%s:已经存在于工作区中"
4dcdc3d8 544
6937cb4e 545#: apply.c:3967
1b7f4a34 546#, c-format
a0b6b246
JX
547msgid "new mode (%o) of %s does not match old mode (%o)"
548msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1b7f4a34 549
6937cb4e 550#: apply.c:3972
5b04ee3b 551#, c-format
a0b6b246
JX
552msgid "new mode (%o) of %s does not match old mode (%o) of %s"
553msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
5b04ee3b 554
6937cb4e 555#: apply.c:3992
8ada9598 556#, c-format
a0b6b246
JX
557msgid "affected file '%s' is beyond a symbolic link"
558msgstr "受影响的文件 '%s' 位于符号链接中"
8ada9598 559
6937cb4e 560#: apply.c:3996
81809b99 561#, c-format
a0b6b246
JX
562msgid "%s: patch does not apply"
563msgstr "%s:补丁未应用"
8ada9598 564
6937cb4e 565#: apply.c:4011
8ada9598 566#, c-format
a0b6b246
JX
567msgid "Checking patch %s..."
568msgstr "检查补丁 %s..."
8ada9598 569
6937cb4e 570#: apply.c:4102
a0b6b246
JX
571#, c-format
572msgid "sha1 information is lacking or useless for submodule %s"
573msgstr "子模组 %s 的 sha1 信息缺失或无效"
8ada9598 574
6937cb4e 575#: apply.c:4109
8ada9598 576#, c-format
a0b6b246 577msgid "mode change for %s, which is not in current HEAD"
29004bbb 578msgstr "%s 的模式被改变,但它不在当前 HEAD 中"
8ada9598 579
6937cb4e 580#: apply.c:4112
a0b6b246
JX
581#, c-format
582msgid "sha1 information is lacking or useless (%s)."
583msgstr "sha1 信息缺失或无效(%s)。"
6792b93b 584
6937cb4e 585#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
8ada9598 586#, c-format
a0b6b246
JX
587msgid "make_cache_entry failed for path '%s'"
588msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
8ada9598 589
6937cb4e 590#: apply.c:4121
a0b6b246
JX
591#, c-format
592msgid "could not add %s to temporary index"
593msgstr "不能在临时索引中添加 %s"
9aeb4c2b 594
6937cb4e 595#: apply.c:4131
a0b6b246
JX
596#, c-format
597msgid "could not write temporary index to %s"
598msgstr "不能把临时索引写入到 %s"
9aeb4c2b 599
6937cb4e 600#: apply.c:4269
a0b6b246
JX
601#, c-format
602msgid "unable to remove %s from index"
603msgstr "不能从索引中移除 %s"
8ada9598 604
6937cb4e 605#: apply.c:4304
8ada9598 606#, c-format
a0b6b246
JX
607msgid "corrupt patch for submodule %s"
608msgstr "子模组 %s 损坏的补丁"
8ada9598 609
6937cb4e 610#: apply.c:4310
9aeb4c2b 611#, c-format
a0b6b246 612msgid "unable to stat newly created file '%s'"
65e2041e 613msgstr "不能对新建文件 '%s' 调用 stat"
9aeb4c2b 614
6937cb4e 615#: apply.c:4318
a0b6b246
JX
616#, c-format
617msgid "unable to create backing store for newly created file %s"
618msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 619
6937cb4e 620#: apply.c:4324 apply.c:4468
81809b99 621#, c-format
a0b6b246
JX
622msgid "unable to add cache entry for %s"
623msgstr "无法为 %s 添加缓存条目"
8ada9598 624
6937cb4e 625#: apply.c:4365
a0b6b246
JX
626#, c-format
627msgid "failed to write to '%s'"
628msgstr "无法写入 '%s'"
8ada9598 629
6937cb4e 630#: apply.c:4369
220c313c 631#, c-format
a0b6b246
JX
632msgid "closing file '%s'"
633msgstr "关闭文件 '%s'"
220c313c 634
6937cb4e 635#: apply.c:4439
c04f5ac3 636#, c-format
a0b6b246
JX
637msgid "unable to write file '%s' mode %o"
638msgstr "不能写文件 '%s' 权限 %o"
c04f5ac3 639
6937cb4e 640#: apply.c:4537
c04f5ac3 641#, c-format
a0b6b246
JX
642msgid "Applied patch %s cleanly."
643msgstr "成功应用补丁 %s。"
c04f5ac3 644
6937cb4e 645#: apply.c:4545
a0b6b246
JX
646msgid "internal error"
647msgstr "内部错误"
c04f5ac3 648
6937cb4e 649#: apply.c:4548
5c57d762 650#, c-format
a0b6b246
JX
651msgid "Applying patch %%s with %d reject..."
652msgid_plural "Applying patch %%s with %d rejects..."
653msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
654msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
5c57d762 655
6937cb4e 656#: apply.c:4559
5c57d762 657#, c-format
a0b6b246
JX
658msgid "truncating .rej filename to %.*s.rej"
659msgstr "截短 .rej 文件名为 %.*s.rej"
5c57d762 660
6937cb4e 661#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
220c313c 662#, c-format
a0b6b246
JX
663msgid "cannot open %s"
664msgstr "不能打开 %s"
220c313c 665
6937cb4e 666#: apply.c:4581
220c313c 667#, c-format
a0b6b246
JX
668msgid "Hunk #%d applied cleanly."
669msgstr "第 #%d 个片段成功应用。"
220c313c 670
6937cb4e 671#: apply.c:4585
5c57d762 672#, c-format
a0b6b246
JX
673msgid "Rejected hunk #%d."
674msgstr "拒绝第 #%d 个片段。"
5c57d762 675
6937cb4e 676#: apply.c:4695
5c57d762 677#, c-format
a0b6b246
JX
678msgid "Skipped patch '%s'."
679msgstr "略过补丁 '%s'。"
5c57d762 680
6937cb4e 681#: apply.c:4703
a0b6b246
JX
682msgid "unrecognized input"
683msgstr "未能识别的输入"
5c57d762 684
6937cb4e 685#: apply.c:4722
a0b6b246
JX
686msgid "unable to read index file"
687msgstr "无法读取索引文件"
5c57d762 688
6937cb4e 689#: apply.c:4859
220c313c 690#, c-format
a0b6b246
JX
691msgid "can't open patch '%s': %s"
692msgstr "不能打开补丁 '%s':%s"
220c313c 693
6937cb4e 694#: apply.c:4886
5c57d762 695#, c-format
a0b6b246
JX
696msgid "squelched %d whitespace error"
697msgid_plural "squelched %d whitespace errors"
698msgstr[0] "抑制下仍有 %d 个空白字符误用"
699msgstr[1] "抑制下仍有 %d 个空白字符误用"
5c57d762 700
6937cb4e 701#: apply.c:4892 apply.c:4907
5c57d762 702#, c-format
a0b6b246
JX
703msgid "%d line adds whitespace errors."
704msgid_plural "%d lines add whitespace errors."
a4f16749
JX
705msgstr[0] "%d 行新增了空白字符误用。"
706msgstr[1] "%d 行新增了空白字符误用。"
5c57d762 707
6937cb4e 708#: apply.c:4900
5c57d762 709#, c-format
a0b6b246
JX
710msgid "%d line applied after fixing whitespace errors."
711msgid_plural "%d lines applied after fixing whitespace errors."
712msgstr[0] "修复空白错误后,应用了 %d 行。"
713msgstr[1] "修复空白错误后,应用了 %d 行。"
5c57d762 714
6937cb4e 715#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
a0b6b246
JX
716msgid "Unable to write new index file"
717msgstr "无法写入新索引文件"
5c57d762 718
6937cb4e
JX
719#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259
720#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187
721#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622
722#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992
723#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212
a4f16749 724#: git-add--interactive.perl:197
a0b6b246
JX
725msgid "path"
726msgstr "路径"
5c57d762 727
6937cb4e 728#: apply.c:4948
a0b6b246
JX
729msgid "don't apply changes matching the given path"
730msgstr "不要应用与给出路径向匹配的变更"
5c57d762 731
6937cb4e 732#: apply.c:4951
a0b6b246
JX
733msgid "apply changes matching the given path"
734msgstr "应用与给出路径向匹配的变更"
220c313c 735
6937cb4e 736#: apply.c:4953 builtin/am.c:2265
a0b6b246
JX
737msgid "num"
738msgstr "数字"
220c313c 739
6937cb4e 740#: apply.c:4954
a0b6b246
JX
741msgid "remove <num> leading slashes from traditional diff paths"
742msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
220c313c 743
6937cb4e 744#: apply.c:4957
a0b6b246
JX
745msgid "ignore additions made by the patch"
746msgstr "忽略补丁中的添加的文件"
220c313c 747
6937cb4e 748#: apply.c:4959
a0b6b246
JX
749msgid "instead of applying the patch, output diffstat for the input"
750msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
220c313c 751
6937cb4e 752#: apply.c:4963
a0b6b246
JX
753msgid "show number of added and deleted lines in decimal notation"
754msgstr "以十进制数显示添加和删除的行数"
220c313c 755
6937cb4e 756#: apply.c:4965
a0b6b246
JX
757msgid "instead of applying the patch, output a summary for the input"
758msgstr "不应用补丁,而是显示输入的概要"
220c313c 759
6937cb4e 760#: apply.c:4967
a0b6b246
JX
761msgid "instead of applying the patch, see if the patch is applicable"
762msgstr "不应用补丁,而是查看补丁是否可应用"
220c313c 763
6937cb4e 764#: apply.c:4969
a0b6b246
JX
765msgid "make sure the patch is applicable to the current index"
766msgstr "确认补丁可以应用到当前索引"
276ceeaa 767
6937cb4e 768#: apply.c:4971
a0b6b246
JX
769msgid "apply a patch without touching the working tree"
770msgstr "应用补丁而不修改工作区"
5b04ee3b 771
6937cb4e 772#: apply.c:4973
a0b6b246
JX
773msgid "accept a patch that touches outside the working area"
774msgstr "接受修改工作区之外文件的补丁"
5c57d762 775
6937cb4e 776#: apply.c:4975
a0b6b246
JX
777msgid "also apply the patch (use with --stat/--summary/--check)"
778msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
c04f5ac3 779
6937cb4e 780#: apply.c:4977
a0b6b246
JX
781msgid "attempt three-way merge if a patch does not apply"
782msgstr "如果一个补丁不能应用则尝试三方合并"
c04f5ac3 783
6937cb4e 784#: apply.c:4979
a0b6b246
JX
785msgid "build a temporary index based on embedded index information"
786msgstr "创建一个临时索引基于嵌入的索引信息"
c04f5ac3 787
6937cb4e 788#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
a0b6b246
JX
789msgid "paths are separated with NUL character"
790msgstr "路径以 NUL 字符分隔"
8ada9598 791
6937cb4e 792#: apply.c:4984
a0b6b246
JX
793msgid "ensure at least <n> lines of context match"
794msgstr "确保至少匹配 <n> 行上下文"
8ada9598 795
6937cb4e
JX
796#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
797#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
a0b6b246
JX
798msgid "action"
799msgstr "动作"
8ada9598 800
6937cb4e 801#: apply.c:4986
a0b6b246
JX
802msgid "detect new or modified lines that have whitespace errors"
803msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 804
6937cb4e 805#: apply.c:4989 apply.c:4992
a0b6b246
JX
806msgid "ignore changes in whitespace when finding context"
807msgstr "查找上下文时忽略空白字符的变更"
8ada9598 808
6937cb4e 809#: apply.c:4995
a0b6b246
JX
810msgid "apply the patch in reverse"
811msgstr "反向应用补丁"
8ada9598 812
6937cb4e 813#: apply.c:4997
a0b6b246
JX
814msgid "don't expect at least one line of context"
815msgstr "无需至少一行上下文"
8ada9598 816
6937cb4e 817#: apply.c:4999
a0b6b246
JX
818msgid "leave the rejected hunks in corresponding *.rej files"
819msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 820
6937cb4e 821#: apply.c:5001
a0b6b246
JX
822msgid "allow overlapping hunks"
823msgstr "允许重叠的补丁片段"
8ada9598 824
6937cb4e
JX
825#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21
826#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640
827#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125
a0b6b246
JX
828msgid "be verbose"
829msgstr "冗长输出"
8ada9598 830
6937cb4e 831#: apply.c:5004
a0b6b246
JX
832msgid "tolerate incorrectly detected missing new-line at the end of file"
833msgstr "允许不正确的文件末尾换行符"
cfff71a9 834
6937cb4e 835#: apply.c:5007
a0b6b246
JX
836msgid "do not trust the line counts in the hunk headers"
837msgstr "不信任补丁片段的头信息中的行号"
6c94aba5 838
6937cb4e 839#: apply.c:5009 builtin/am.c:2253
a0b6b246
JX
840msgid "root"
841msgstr "根目录"
c04f5ac3 842
6937cb4e 843#: apply.c:5010
a0b6b246
JX
844msgid "prepend <root> to all filenames"
845msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 846
a4f16749 847#: archive.c:13
a0b6b246
JX
848msgid "git archive [<options>] <tree-ish> [<path>...]"
849msgstr "git archive [<选项>] <树或提交> [<路径>...]"
07432cef 850
a4f16749 851#: archive.c:14
a0b6b246
JX
852msgid "git archive --list"
853msgstr "git archive --list"
854
a4f16749 855#: archive.c:15
c04f5ac3 856msgid ""
a0b6b246 857"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
c04f5ac3 858msgstr ""
a0b6b246 859"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
6acbf033 860
a4f16749 861#: archive.c:16
a0b6b246
JX
862msgid "git archive --remote <repo> [--exec <cmd>] --list"
863msgstr "git archive --remote <仓库> [--exec <命令>] --list"
6acbf033 864
6937cb4e 865#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
c04f5ac3 866#, c-format
a0b6b246
JX
867msgid "pathspec '%s' did not match any files"
868msgstr "路径规格 '%s' 未匹配任何文件"
c04f5ac3 869
6937cb4e 870#: archive.c:436
a0b6b246
JX
871msgid "fmt"
872msgstr "格式"
07432cef 873
6937cb4e 874#: archive.c:436
a0b6b246
JX
875msgid "archive format"
876msgstr "归档格式"
7aea43ff 877
6937cb4e 878#: archive.c:437 builtin/log.c:1452
a0b6b246
JX
879msgid "prefix"
880msgstr "前缀"
7aea43ff 881
6937cb4e 882#: archive.c:438
a0b6b246
JX
883msgid "prepend prefix to each pathname in the archive"
884msgstr "为归档中每个路径名加上前缀"
c04f5ac3 885
6937cb4e
JX
886#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
887#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859
888#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550
889#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
1a79b2f1 890#: parse-options.h:153
a0b6b246
JX
891msgid "file"
892msgstr "文件"
a77c07d9 893
6937cb4e 894#: archive.c:440 builtin/archive.c:89
a0b6b246
JX
895msgid "write the archive to this file"
896msgstr "归档写入此文件"
a77c07d9 897
6937cb4e 898#: archive.c:442
a0b6b246
JX
899msgid "read .gitattributes in working directory"
900msgstr "读取工作区中的 .gitattributes"
7ac1c0ad 901
6937cb4e 902#: archive.c:443
a0b6b246
JX
903msgid "report archived files on stderr"
904msgstr "在标准错误上报告归档文件"
7ac1c0ad 905
6937cb4e 906#: archive.c:444
a0b6b246
JX
907msgid "store only"
908msgstr "只存储"
7ac1c0ad 909
6937cb4e 910#: archive.c:445
a0b6b246
JX
911msgid "compress faster"
912msgstr "压缩速度更快"
8ada9598 913
6937cb4e 914#: archive.c:453
a0b6b246
JX
915msgid "compress better"
916msgstr "压缩效果更好"
8ada9598 917
6937cb4e 918#: archive.c:456
a0b6b246
JX
919msgid "list supported archive formats"
920msgstr "列出支持的归档格式"
a77c07d9 921
6937cb4e
JX
922#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
923#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001
a0b6b246
JX
924msgid "repo"
925msgstr "仓库"
c04f5ac3 926
6937cb4e 927#: archive.c:459 builtin/archive.c:91
a0b6b246
JX
928msgid "retrieve the archive from remote repository <repo>"
929msgstr "从远程仓库(<仓库>)提取归档文件"
8ada9598 930
6937cb4e 931#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
a0b6b246
JX
932msgid "command"
933msgstr "命令"
934
6937cb4e 935#: archive.c:461 builtin/archive.c:93
a0b6b246
JX
936msgid "path to the remote git-upload-archive command"
937msgstr "远程 git-upload-archive 命令的路径"
938
6937cb4e 939#: archive.c:468
a0b6b246
JX
940msgid "Unexpected option --remote"
941msgstr "未知参数 --remote"
942
6937cb4e 943#: archive.c:470
a0b6b246
JX
944msgid "Option --exec can only be used together with --remote"
945msgstr "选项 --exec 只能和 --remote 同时使用"
946
6937cb4e 947#: archive.c:472
a0b6b246
JX
948msgid "Unexpected option --output"
949msgstr "未知参数 --output"
950
6937cb4e 951#: archive.c:494
a0b6b246
JX
952#, c-format
953msgid "Unknown archive format '%s'"
954msgstr "未知归档格式 '%s'"
955
6937cb4e 956#: archive.c:501
8ada9598 957#, c-format
a0b6b246
JX
958msgid "Argument not supported for format '%s': -%d"
959msgstr "参数不支持此格式 '%s':-%d"
960
6937cb4e 961#: attr.c:218
87cb7997
JX
962#, c-format
963msgid "%.*s is not a valid attribute name"
964msgstr "%.*s 不是一个有效的属性名"
965
6937cb4e 966#: attr.c:415
8ada9598 967msgid ""
a0b6b246
JX
968"Negative patterns are ignored in git attributes\n"
969"Use '\\!' for literal leading exclamation."
8ada9598 970msgstr ""
a0b6b246
JX
971"负值模版在 git attributes 中被忽略\n"
972"当字符串确实要以感叹号开始时,使用 '\\!'。"
8ada9598 973
a4f16749 974#: bisect.c:447
8ada9598 975#, c-format
a0b6b246
JX
976msgid "Badly quoted content in file '%s': %s"
977msgstr "文件 '%s' 包含错误的引用格式:%s"
8ada9598 978
a4f16749 979#: bisect.c:655
a0b6b246
JX
980#, c-format
981msgid "We cannot bisect more!\n"
982msgstr "我们无法进行更多的二分查找!\n"
8ada9598 983
a4f16749 984#: bisect.c:708
2e8451e8 985#, c-format
a0b6b246
JX
986msgid "Not a valid commit name %s"
987msgstr "不是一个有效的提交名 %s"
2e8451e8 988
a4f16749 989#: bisect.c:732
5b04ee3b
JX
990#, c-format
991msgid ""
a0b6b246
JX
992"The merge base %s is bad.\n"
993"This means the bug has been fixed between %s and [%s].\n"
5b04ee3b 994msgstr ""
a0b6b246
JX
995"合并基线 %s 是坏的。\n"
996"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
5b04ee3b 997
a4f16749 998#: bisect.c:737
5b04ee3b 999#, c-format
a0b6b246
JX
1000msgid ""
1001"The merge base %s is new.\n"
1002"The property has changed between %s and [%s].\n"
1003msgstr ""
1004"合并基线 %s 是新的。\n"
1005"介于 %s 和 [%s] 之间的属性已经被修改。\n"
5b04ee3b 1006
a4f16749 1007#: bisect.c:742
a0b6b246
JX
1008#, c-format
1009msgid ""
1010"The merge base %s is %s.\n"
1011"This means the first '%s' commit is between %s and [%s].\n"
1012msgstr ""
1013"合并基线 %s 是 %s。\n"
1014"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
07432cef 1015
a4f16749 1016#: bisect.c:750
a0b6b246
JX
1017#, c-format
1018msgid ""
1a79b2f1 1019"Some %s revs are not ancestors of the %s rev.\n"
a0b6b246
JX
1020"git bisect cannot work properly in this case.\n"
1021"Maybe you mistook %s and %s revs?\n"
1022msgstr ""
1023"一些 %s 版本不是 %s 版本的祖先。\n"
1024"这种情况下 git 二分查找无法正常工作。\n"
1025"您可能弄错了 %s 和 %s 版本?\n"
07432cef 1026
a4f16749 1027#: bisect.c:763
a0b6b246
JX
1028#, c-format
1029msgid ""
1030"the merge base between %s and [%s] must be skipped.\n"
1031"So we cannot be sure the first %s commit is between %s and %s.\n"
1032"We continue anyway."
1033msgstr ""
1034"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1035"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1036"我们仍旧继续。"
649900bc 1037
a4f16749 1038#: bisect.c:798
649900bc 1039#, c-format
a0b6b246
JX
1040msgid "Bisecting: a merge base must be tested\n"
1041msgstr "二分查找中:合并基线必须是经过测试的\n"
649900bc 1042
6937cb4e 1043#: bisect.c:850
a0b6b246
JX
1044#, c-format
1045msgid "a %s revision is needed"
1046msgstr "需要一个 %s 版本"
649900bc 1047
6937cb4e 1048#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
649900bc 1049#, c-format
a0b6b246
JX
1050msgid "could not create file '%s'"
1051msgstr "不能创建文件 '%s'"
649900bc 1052
6937cb4e 1053#: bisect.c:918
649900bc 1054#, c-format
a0b6b246
JX
1055msgid "could not read file '%s'"
1056msgstr "不能读取文件 '%s'"
649900bc 1057
6937cb4e 1058#: bisect.c:948
a0b6b246
JX
1059msgid "reading bisect refs failed"
1060msgstr "读取二分查找引用失败"
649900bc 1061
6937cb4e 1062#: bisect.c:968
649900bc 1063#, c-format
a0b6b246
JX
1064msgid "%s was both %s and %s\n"
1065msgstr "%s 同时为 %s 和 %s\n"
649900bc 1066
6937cb4e 1067#: bisect.c:976
649900bc 1068#, c-format
a0b6b246
JX
1069msgid ""
1070"No testable commit found.\n"
1071"Maybe you started with bad path parameters?\n"
1072msgstr ""
1073"没有发现可测试的提交。\n"
1074"可能您在运行时使用了错误的路径参数?\n"
649900bc 1075
6937cb4e 1076#: bisect.c:995
649900bc 1077#, c-format
a0b6b246
JX
1078msgid "(roughly %d step)"
1079msgid_plural "(roughly %d steps)"
1080msgstr[0] "(大概 %d 步)"
1081msgstr[1] "(大概 %d 步)"
649900bc 1082
a4f16749
JX
1083#. TRANSLATORS: the last %s will be replaced with "(roughly %d
1084#. steps)" translation.
1085#.
6937cb4e 1086#: bisect.c:1001
649900bc 1087#, c-format
a0b6b246
JX
1088msgid "Bisecting: %d revision left to test after this %s\n"
1089msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1090msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1091msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
649900bc 1092
a4f16749
JX
1093#: blame.c:1757
1094msgid "--contents and --reverse do not blend well."
1095msgstr "--contents 和 --reverse 不能混用。"
1096
1097#: blame.c:1768
1098msgid "cannot use --contents with final commit object name"
1099msgstr "不能将 --contents 和最终的提交对象名共用"
1100
1101#: blame.c:1788
1102msgid "--reverse and --first-parent together require specified latest commit"
1103msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
1104
6937cb4e
JX
1105#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168
1106#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911
1107#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369
1108#: builtin/shortlog.c:191
a4f16749
JX
1109msgid "revision walk setup failed"
1110msgstr "版本遍历设置失败"
1111
1112#: blame.c:1815
1113msgid ""
1114"--reverse --first-parent together require range along first-parent chain"
1115msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
1116
1117#: blame.c:1826
1118#, c-format
1119msgid "no such path %s in %s"
1120msgstr "在 %2$s 中无此路径 %1$s"
1121
1122#: blame.c:1837
1123#, c-format
1124msgid "cannot read blob %s for path %s"
1125msgstr "不能为路径 %2$s 读取数据对象 %1$s"
1126
a0b6b246 1127#: branch.c:53
649900bc 1128#, c-format
a0b6b246
JX
1129msgid ""
1130"\n"
1131"After fixing the error cause you may try to fix up\n"
1132"the remote tracking information by invoking\n"
1133"\"git branch --set-upstream-to=%s%s%s\"."
1134msgstr ""
1135"\n"
1136"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1137"\"git branch --set-upstream-to=%s%s%s\" 。"
649900bc 1138
a0b6b246 1139#: branch.c:67
649900bc 1140#, c-format
a0b6b246
JX
1141msgid "Not setting branch %s as its own upstream."
1142msgstr "未设置分支 %s 作为它自己的上游。"
649900bc 1143
a0b6b246 1144#: branch.c:93
649900bc 1145#, c-format
6937cb4e
JX
1146msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
1147msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 1148
a0b6b246 1149#: branch.c:94
649900bc 1150#, c-format
6937cb4e
JX
1151msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
1152msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 1153
a0b6b246 1154#: branch.c:98
649900bc 1155#, c-format
6937cb4e
JX
1156msgid "Branch '%s' set up to track local branch '%s' by rebasing."
1157msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
649900bc 1158
a0b6b246 1159#: branch.c:99
649900bc 1160#, c-format
6937cb4e 1161msgid "Branch '%s' set up to track local branch '%s'."
493a9322 1162msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
649900bc 1163
a0b6b246 1164#: branch.c:104
649900bc 1165#, c-format
6937cb4e
JX
1166msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
1167msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
649900bc 1168
a0b6b246 1169#: branch.c:105
649900bc 1170#, c-format
6937cb4e
JX
1171msgid "Branch '%s' set up to track remote ref '%s'."
1172msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
649900bc 1173
a0b6b246 1174#: branch.c:109
649900bc 1175#, c-format
6937cb4e
JX
1176msgid "Branch '%s' set up to track local ref '%s' by rebasing."
1177msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
649900bc 1178
a0b6b246 1179#: branch.c:110
649900bc 1180#, c-format
6937cb4e
JX
1181msgid "Branch '%s' set up to track local ref '%s'."
1182msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
649900bc 1183
a0b6b246
JX
1184#: branch.c:119
1185msgid "Unable to write upstream branch configuration"
1186msgstr "无法写入上游分支配置"
649900bc 1187
a0b6b246 1188#: branch.c:156
649900bc 1189#, c-format
a0b6b246
JX
1190msgid "Not tracking: ambiguous information for ref %s"
1191msgstr "未跟踪:引用 %s 有歧义"
649900bc 1192
a0b6b246 1193#: branch.c:185
649900bc 1194#, c-format
a0b6b246
JX
1195msgid "'%s' is not a valid branch name."
1196msgstr "'%s' 不是一个有效的分支名称。"
649900bc 1197
a0b6b246 1198#: branch.c:190
649900bc 1199#, c-format
a0b6b246
JX
1200msgid "A branch named '%s' already exists."
1201msgstr "一个分支名 '%s' 已经存在。"
649900bc 1202
6937cb4e 1203#: branch.c:197
a0b6b246
JX
1204msgid "Cannot force update the current branch."
1205msgstr "无法强制更新当前分支。"
649900bc 1206
6937cb4e 1207#: branch.c:217
649900bc 1208#, c-format
a0b6b246
JX
1209msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1210msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
649900bc 1211
6937cb4e 1212#: branch.c:219
649900bc 1213#, c-format
a0b6b246
JX
1214msgid "the requested upstream branch '%s' does not exist"
1215msgstr "请求的上游分支 '%s' 不存在"
649900bc 1216
6937cb4e 1217#: branch.c:221
a0b6b246
JX
1218msgid ""
1219"\n"
1220"If you are planning on basing your work on an upstream\n"
1221"branch that already exists at the remote, you may need to\n"
1222"run \"git fetch\" to retrieve it.\n"
1223"\n"
1224"If you are planning to push out a new local branch that\n"
1225"will track its remote counterpart, you may want to use\n"
1226"\"git push -u\" to set the upstream config as you push."
1227msgstr ""
1228"\n"
1229"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
1230"您可能需要执行 \"git fetch\" 来获取分支。\n"
1231"\n"
1232"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
1233"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
649900bc 1234
6937cb4e 1235#: branch.c:264
649900bc 1236#, c-format
a0b6b246
JX
1237msgid "Not a valid object name: '%s'."
1238msgstr "不是一个有效的对象名:'%s'。"
649900bc 1239
6937cb4e 1240#: branch.c:284
649900bc 1241#, c-format
a0b6b246
JX
1242msgid "Ambiguous object name: '%s'."
1243msgstr "歧义的对象名:'%s'。"
649900bc 1244
6937cb4e 1245#: branch.c:289
649900bc 1246#, c-format
a0b6b246
JX
1247msgid "Not a valid branch point: '%s'."
1248msgstr "无效的分支点:'%s'。"
649900bc 1249
6937cb4e 1250#: branch.c:343
649900bc 1251#, c-format
a0b6b246
JX
1252msgid "'%s' is already checked out at '%s'"
1253msgstr "'%s' 已经检出到 '%s'"
649900bc 1254
a4f16749 1255#: branch.c:366
a0b6b246
JX
1256#, c-format
1257msgid "HEAD of working tree %s is not updated"
1258msgstr "工作区 %s 的 HEAD 指向没有被更新"
649900bc 1259
a0b6b246 1260#: bundle.c:34
649900bc 1261#, c-format
a0b6b246
JX
1262msgid "'%s' does not look like a v2 bundle file"
1263msgstr "'%s' 不像是一个 v2 版本的包文件"
649900bc 1264
a4f16749 1265#: bundle.c:62
a0b6b246
JX
1266#, c-format
1267msgid "unrecognized header: %s%s (%d)"
1268msgstr "未能识别的包头:%s%s (%d)"
649900bc 1269
6937cb4e
JX
1270#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500
1271#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807
1272#: sequencer.c:2949 builtin/commit.c:782
649900bc 1273#, c-format
a0b6b246
JX
1274msgid "could not open '%s'"
1275msgstr "不能打开 '%s'"
649900bc 1276
a4f16749 1277#: bundle.c:140
a0b6b246
JX
1278msgid "Repository lacks these prerequisite commits:"
1279msgstr "仓库中缺少这些必备的提交:"
649900bc 1280
6937cb4e 1281#: bundle.c:193
2e8451e8 1282#, c-format
a0b6b246
JX
1283msgid "The bundle contains this ref:"
1284msgid_plural "The bundle contains these %d refs:"
1285msgstr[0] "这个包中含有这个引用:"
1286msgstr[1] "这个包中含有 %d 个引用:"
2e8451e8 1287
6937cb4e 1288#: bundle.c:200
a0b6b246
JX
1289msgid "The bundle records a complete history."
1290msgstr "这个包记录一个完整历史。"
2e8451e8 1291
6937cb4e 1292#: bundle.c:202
2e8451e8 1293#, c-format
a0b6b246
JX
1294msgid "The bundle requires this ref:"
1295msgid_plural "The bundle requires these %d refs:"
1296msgstr[0] "这个包需要这个引用:"
1297msgstr[1] "这个包需要 %d 个引用:"
2e8451e8 1298
6937cb4e 1299#: bundle.c:261
a0b6b246
JX
1300msgid "Could not spawn pack-objects"
1301msgstr "不能生成 pack-objects 进程"
1003b3a5 1302
6937cb4e 1303#: bundle.c:272
a0b6b246
JX
1304msgid "pack-objects died"
1305msgstr "pack-objects 终止"
8ada9598 1306
6937cb4e 1307#: bundle.c:314
a0b6b246
JX
1308msgid "rev-list died"
1309msgstr "rev-list 终止"
1310
6937cb4e 1311#: bundle.c:363
81809b99 1312#, c-format
a0b6b246
JX
1313msgid "ref '%s' is excluded by the rev-list options"
1314msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 1315
6937cb4e 1316#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
81809b99 1317#, c-format
a0b6b246
JX
1318msgid "unrecognized argument: %s"
1319msgstr "未能识别的参数:%s"
8ada9598 1320
6937cb4e 1321#: bundle.c:461
a0b6b246
JX
1322msgid "Refusing to create empty bundle."
1323msgstr "不能创建空包。"
1324
6937cb4e 1325#: bundle.c:473
81809b99 1326#, c-format
a0b6b246
JX
1327msgid "cannot create '%s'"
1328msgstr "不能创建 '%s'"
8ada9598 1329
6937cb4e 1330#: bundle.c:501
a0b6b246
JX
1331msgid "index-pack died"
1332msgstr "index-pack 终止"
63af42fe 1333
a4f16749 1334#: color.c:301
94550ed3 1335#, c-format
a0b6b246
JX
1336msgid "invalid color value: %.*s"
1337msgstr "无效的颜色值:%.*s"
94550ed3 1338
6937cb4e
JX
1339#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
1340#: builtin/am.c:1467 builtin/am.c:2105
94550ed3 1341#, c-format
a0b6b246
JX
1342msgid "could not parse %s"
1343msgstr "不能解析 %s"
94550ed3 1344
a4f16749 1345#: commit.c:43
a0b6b246
JX
1346#, c-format
1347msgid "%s %s is not a commit!"
1348msgstr "%s %s 不是一个提交!"
90314792 1349
6937cb4e 1350#: commit.c:1517
90314792 1351msgid ""
a0b6b246
JX
1352"Warning: commit message did not conform to UTF-8.\n"
1353"You may want to amend it after fixing the message, or set the config\n"
1354"variable i18n.commitencoding to the encoding your project uses.\n"
1355msgstr ""
29004bbb 1356"警告:提交说明不符合 UTF-8 字符编码。\n"
a0b6b246 1357"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
29004bbb 1358"设置为您项目所用的字符编码。\n"
90314792 1359
a0b6b246
JX
1360#: compat/obstack.c:406 compat/obstack.c:408
1361msgid "memory exhausted"
1362msgstr "内存耗尽"
90314792 1363
6937cb4e 1364#: config.c:187
87cb7997
JX
1365msgid "relative config include conditionals must come from files"
1366msgstr "包含相对路径的条件引用必须来自于文件"
1367
6937cb4e 1368#: config.c:721
90314792 1369#, c-format
a0b6b246
JX
1370msgid "bad config line %d in blob %s"
1371msgstr "数据对象 %2$s 中错误的配置行 %1$d"
90314792 1372
6937cb4e 1373#: config.c:725
a77c07d9 1374#, c-format
a0b6b246
JX
1375msgid "bad config line %d in file %s"
1376msgstr "文件 %2$s 中错误的配置行 %1$d"
a77c07d9 1377
6937cb4e 1378#: config.c:729
a77c07d9 1379#, c-format
a0b6b246
JX
1380msgid "bad config line %d in standard input"
1381msgstr "标准输入中错误的配置行 %d"
a77c07d9 1382
6937cb4e 1383#: config.c:733
90314792 1384#, c-format
a0b6b246
JX
1385msgid "bad config line %d in submodule-blob %s"
1386msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
90314792 1387
6937cb4e 1388#: config.c:737
90314792 1389#, c-format
a0b6b246
JX
1390msgid "bad config line %d in command line %s"
1391msgstr "命令行 %2$s 中错误的配置行 %1$d"
90314792 1392
6937cb4e 1393#: config.c:741
90314792 1394#, c-format
a0b6b246
JX
1395msgid "bad config line %d in %s"
1396msgstr "在 %2$s 中错误的配置行 %1$d"
220c313c 1397
6937cb4e 1398#: config.c:869
a0b6b246
JX
1399msgid "out of range"
1400msgstr "超出范围"
6c94aba5 1401
6937cb4e 1402#: config.c:869
a0b6b246
JX
1403msgid "invalid unit"
1404msgstr "无效的单位"
6c94aba5 1405
6937cb4e 1406#: config.c:875
6c94aba5 1407#, c-format
a0b6b246
JX
1408msgid "bad numeric config value '%s' for '%s': %s"
1409msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
6c94aba5 1410
6937cb4e 1411#: config.c:880
1b7f4a34 1412#, c-format
a0b6b246
JX
1413msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
1414msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 1415
6937cb4e 1416#: config.c:883
1b7f4a34 1417#, c-format
a0b6b246
JX
1418msgid "bad numeric config value '%s' for '%s' in file %s: %s"
1419msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 1420
6937cb4e 1421#: config.c:886
1b7f4a34 1422#, c-format
a0b6b246
JX
1423msgid "bad numeric config value '%s' for '%s' in standard input: %s"
1424msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
1b7f4a34 1425
6937cb4e 1426#: config.c:889
1b7f4a34 1427#, c-format
a0b6b246
JX
1428msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
1429msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 1430
6937cb4e 1431#: config.c:892
94550ed3 1432#, c-format
a0b6b246
JX
1433msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
1434msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 1435
6937cb4e 1436#: config.c:895
276ceeaa 1437#, c-format
a0b6b246
JX
1438msgid "bad numeric config value '%s' for '%s' in %s: %s"
1439msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 1440
6937cb4e 1441#: config.c:990
276ceeaa 1442#, c-format
a0b6b246
JX
1443msgid "failed to expand user dir in: '%s'"
1444msgstr "无法扩展 '%s' 中的用户目录"
94550ed3 1445
6937cb4e 1446#: config.c:1085 config.c:1096
3495628d 1447#, c-format
a0b6b246
JX
1448msgid "bad zlib compression level %d"
1449msgstr "错误的 zlib 压缩级别 %d"
3495628d 1450
6937cb4e 1451#: config.c:1213
3495628d 1452#, c-format
a0b6b246
JX
1453msgid "invalid mode for object creation: %s"
1454msgstr "无效的对象创建模式:%s"
3495628d 1455
6937cb4e 1456#: config.c:1372
1a79b2f1
JX
1457#, c-format
1458msgid "bad pack compression level %d"
1459msgstr "错误的打包压缩级别 %d"
1460
6937cb4e 1461#: config.c:1568
a0b6b246
JX
1462msgid "unable to parse command-line config"
1463msgstr "无法解析命令行中的配置"
94550ed3 1464
6937cb4e 1465#: config.c:1900
a0b6b246
JX
1466msgid "unknown error occurred while reading the configuration files"
1467msgstr "在读取配置文件时遇到未知错误"
94550ed3 1468
6937cb4e 1469#: config.c:2087
87cb7997
JX
1470#, c-format
1471msgid "Invalid %s: '%s'"
1472msgstr "无效 %s:'%s'"
1473
6937cb4e 1474#: config.c:2130
87cb7997
JX
1475#, c-format
1476msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
1477msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'"
1478
6937cb4e 1479#: config.c:2156
87cb7997
JX
1480#, c-format
1481msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
1482msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
1483
6937cb4e 1484#: config.c:2167
276ceeaa 1485#, c-format
a0b6b246
JX
1486msgid "unable to parse '%s' from command-line config"
1487msgstr "无法解析命令行配置中的 '%s'"
1b7f4a34 1488
6937cb4e 1489#: config.c:2169
94550ed3 1490#, c-format
a0b6b246
JX
1491msgid "bad config variable '%s' in file '%s' at line %d"
1492msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
94550ed3 1493
6937cb4e 1494#: config.c:2228
276ceeaa 1495#, c-format
a0b6b246
JX
1496msgid "%s has multiple values"
1497msgstr "%s 有多个取值"
276ceeaa 1498
6937cb4e 1499#: config.c:2571 config.c:2789
1a79b2f1
JX
1500#, c-format
1501msgid "fstat on %s failed"
65e2041e 1502msgstr "对 %s 调用 fstat 失败"
1a79b2f1 1503
6937cb4e 1504#: config.c:2678
94550ed3 1505#, c-format
a0b6b246
JX
1506msgid "could not set '%s' to '%s'"
1507msgstr "不能设置 '%s' 为 '%s'"
94550ed3 1508
6937cb4e 1509#: config.c:2680 builtin/remote.c:776
276ceeaa 1510#, c-format
a0b6b246
JX
1511msgid "could not unset '%s'"
1512msgstr "不能取消设置 '%s'"
276ceeaa 1513
a4f16749 1514#: connect.c:50
a0b6b246 1515msgid "The remote end hung up upon initial contact"
29004bbb 1516msgstr "远端在连接发起时即挂断"
94550ed3 1517
a4f16749 1518#: connect.c:52
a0b6b246
JX
1519msgid ""
1520"Could not read from remote repository.\n"
1521"\n"
1522"Please make sure you have the correct access rights\n"
1523"and the repository exists."
1524msgstr ""
1525"无法读取远程仓库。\n"
1526"\n"
1527"请确认您有正确的访问权限并且仓库存在。"
1528
6937cb4e 1529#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
a0b6b246
JX
1530msgid "Checking connectivity"
1531msgstr "检查连接中"
1532
6937cb4e 1533#: connected.c:76
a0b6b246
JX
1534msgid "Could not run 'git rev-list'"
1535msgstr "不能执行 'git rev-list'"
1536
6937cb4e 1537#: connected.c:96
a0b6b246
JX
1538msgid "failed write to rev-list"
1539msgstr "无法写入 rev-list"
1540
6937cb4e 1541#: connected.c:103
a0b6b246
JX
1542msgid "failed to close rev-list's stdin"
1543msgstr "无法关闭 rev-list 的标准输入"
1544
a4f16749 1545#: convert.c:205
3495628d 1546#, c-format
a0b6b246
JX
1547msgid ""
1548"CRLF will be replaced by LF in %s.\n"
1549"The file will have its original line endings in your working directory."
1550msgstr ""
1551"文件 %s 中的 CRLF 将被 LF 替换。\n"
1552"在工作区中该文件仍保持原有的换行符。"
3495628d 1553
a4f16749 1554#: convert.c:209
3495628d 1555#, c-format
a0b6b246
JX
1556msgid "CRLF would be replaced by LF in %s."
1557msgstr "文件 %s 中的 CRLF 将被 LF 替换。"
3495628d 1558
a4f16749 1559#: convert.c:215
276ceeaa 1560#, c-format
a0b6b246
JX
1561msgid ""
1562"LF will be replaced by CRLF in %s.\n"
1563"The file will have its original line endings in your working directory."
1564msgstr ""
1565"文件 %s 中的 LF 将被 CRLF 替换。\n"
1566"在工作区中该文件仍保持原有的换行符。"
276ceeaa 1567
a4f16749 1568#: convert.c:219
3495628d 1569#, c-format
a0b6b246
JX
1570msgid "LF would be replaced by CRLF in %s"
1571msgstr "文件 %s 中的 LF 将被 CRLF 替换"
3495628d 1572
a4f16749 1573#: date.c:116
a0b6b246
JX
1574msgid "in the future"
1575msgstr "在将来"
3495628d 1576
a4f16749 1577#: date.c:122
3495628d 1578#, c-format
a4f16749
JX
1579msgid "%<PRIuMAX> second ago"
1580msgid_plural "%<PRIuMAX> seconds ago"
1581msgstr[0] "%<PRIuMAX> 秒钟前"
1582msgstr[1] "%<PRIuMAX> 秒钟前"
3495628d 1583
a4f16749 1584#: date.c:129
3495628d 1585#, c-format
a4f16749
JX
1586msgid "%<PRIuMAX> minute ago"
1587msgid_plural "%<PRIuMAX> minutes ago"
1588msgstr[0] "%<PRIuMAX> 分钟前"
1589msgstr[1] "%<PRIuMAX> 分钟前"
3495628d 1590
a4f16749 1591#: date.c:136
3495628d 1592#, c-format
a4f16749
JX
1593msgid "%<PRIuMAX> hour ago"
1594msgid_plural "%<PRIuMAX> hours ago"
1595msgstr[0] "%<PRIuMAX> 小时前"
1596msgstr[1] "%<PRIuMAX> 小时前"
3495628d 1597
a4f16749 1598#: date.c:143
3495628d 1599#, c-format
a4f16749
JX
1600msgid "%<PRIuMAX> day ago"
1601msgid_plural "%<PRIuMAX> days ago"
1602msgstr[0] "%<PRIuMAX> 天前"
1603msgstr[1] "%<PRIuMAX> 天前"
3495628d 1604
a4f16749 1605#: date.c:149
94550ed3 1606#, c-format
a4f16749
JX
1607msgid "%<PRIuMAX> week ago"
1608msgid_plural "%<PRIuMAX> weeks ago"
1609msgstr[0] "%<PRIuMAX> 周前"
1610msgstr[1] "%<PRIuMAX> 周前"
94550ed3 1611
a4f16749 1612#: date.c:156
3495628d 1613#, c-format
a4f16749
JX
1614msgid "%<PRIuMAX> month ago"
1615msgid_plural "%<PRIuMAX> months ago"
1616msgstr[0] "%<PRIuMAX> 个月前"
1617msgstr[1] "%<PRIuMAX> 个月前"
3495628d 1618
a4f16749 1619#: date.c:167
3495628d 1620#, c-format
a4f16749
JX
1621msgid "%<PRIuMAX> year"
1622msgid_plural "%<PRIuMAX> years"
1623msgstr[0] "%<PRIuMAX> 年"
1624msgstr[1] "%<PRIuMAX> 年"
3495628d 1625
a0b6b246 1626#. TRANSLATORS: "%s" is "<n> years"
a4f16749 1627#: date.c:170
94550ed3 1628#, c-format
a4f16749
JX
1629msgid "%s, %<PRIuMAX> month ago"
1630msgid_plural "%s, %<PRIuMAX> months ago"
1631msgstr[0] "%s %<PRIuMAX> 个月前"
1632msgstr[1] "%s %<PRIuMAX> 个月前"
94550ed3 1633
a4f16749 1634#: date.c:175 date.c:180
94550ed3 1635#, c-format
a4f16749
JX
1636msgid "%<PRIuMAX> year ago"
1637msgid_plural "%<PRIuMAX> years ago"
1638msgstr[0] "%<PRIuMAX> 年前"
1639msgstr[1] "%<PRIuMAX> 年前"
94550ed3 1640
a0b6b246 1641#: diffcore-order.c:24
cfff71a9 1642#, c-format
a0b6b246
JX
1643msgid "failed to read orderfile '%s'"
1644msgstr "无法读取排序文件 '%s'"
cfff71a9 1645
275588f9 1646#: diffcore-rename.c:536
a0b6b246 1647msgid "Performing inexact rename detection"
87cb7997 1648msgstr "正在进行非精确的重命名探测"
cfff71a9 1649
6937cb4e 1650#: diff.c:74
cfff71a9 1651#, c-format
a0b6b246
JX
1652msgid "option '%s' requires a value"
1653msgstr "选项 '%s' 需要一个值"
cfff71a9 1654
a0b6b246 1655# 译者:注意保持前导空格
6937cb4e 1656#: diff.c:152
a0b6b246
JX
1657#, c-format
1658msgid " Failed to parse dirstat cut-off percentage '%s'\n"
1659msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
cfff71a9 1660
a0b6b246 1661# 译者:注意保持前导空格
6937cb4e 1662#: diff.c:157
a0b6b246
JX
1663#, c-format
1664msgid " Unknown dirstat parameter '%s'\n"
1665msgstr " 未知的 dirstat 参数 '%s'\n"
7aea43ff 1666
6937cb4e
JX
1667#: diff.c:281
1668msgid ""
1669"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
1670"'plain'"
1671msgstr "代码移动的颜色设置必须是 'no'、'default'、'zebra'、'dimmed_zebra' 或 'plain'"
1672
1673#: diff.c:341
7aea43ff 1674#, c-format
a0b6b246
JX
1675msgid "Unknown value for 'diff.submodule' config variable: '%s'"
1676msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
7aea43ff 1677
6937cb4e 1678#: diff.c:398
7aea43ff 1679#, c-format
a0b6b246
JX
1680msgid ""
1681"Found errors in 'diff.dirstat' config variable:\n"
1682"%s"
1683msgstr ""
1684"发现配置变量 'diff.dirstat' 中的错误:\n"
1685"%s"
7aea43ff 1686
6937cb4e 1687#: diff.c:3861
7aea43ff 1688#, c-format
a0b6b246
JX
1689msgid "external diff died, stopping at %s"
1690msgstr "外部 diff 退出,停止在 %s"
7aea43ff 1691
6937cb4e 1692#: diff.c:4189
a0b6b246
JX
1693msgid "--name-only, --name-status, --check and -s are mutually exclusive"
1694msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
1695
6937cb4e 1696#: diff.c:4279
a0b6b246
JX
1697msgid "--follow requires exactly one pathspec"
1698msgstr "--follow 明确要求只跟一个路径规格"
1699
6937cb4e 1700#: diff.c:4445
7aea43ff 1701#, c-format
a0b6b246
JX
1702msgid ""
1703"Failed to parse --dirstat/-X option parameter:\n"
1704"%s"
1705msgstr ""
1706"无法解析 --dirstat/-X 选项的参数:\n"
1707"%s"
7aea43ff 1708
6937cb4e 1709#: diff.c:4459
7aea43ff 1710#, c-format
a0b6b246
JX
1711msgid "Failed to parse --submodule option parameter: '%s'"
1712msgstr "无法解析 --submodule 选项的参数:'%s'"
7aea43ff 1713
6937cb4e 1714#: diff.c:5505
a0b6b246
JX
1715msgid "inexact rename detection was skipped due to too many files."
1716msgstr "因为文件太多,略过不严格的重命名检查。"
1717
6937cb4e 1718#: diff.c:5508
a0b6b246
JX
1719msgid "only found copies from modified paths due to too many files."
1720msgstr "因为文件太多,只在修改的路径中查找拷贝。"
1721
6937cb4e 1722#: diff.c:5511
7aea43ff 1723#, c-format
a0b6b246
JX
1724msgid ""
1725"you may want to set your %s variable to at least %d and retry the command."
29004bbb 1726msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
7aea43ff 1727
6937cb4e 1728#: dir.c:1983
a0b6b246
JX
1729msgid "failed to get kernel name and information"
1730msgstr "无法获得内核名称和信息"
7aea43ff 1731
6937cb4e 1732#: dir.c:2102
a0b6b246
JX
1733msgid "Untracked cache is disabled on this system or location."
1734msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
7aea43ff 1735
6937cb4e 1736#: dir.c:2885 dir.c:2890
87cb7997
JX
1737#, c-format
1738msgid "could not create directories for %s"
1739msgstr "不能为 %s 创建目录"
1740
6937cb4e 1741#: dir.c:2915
1a79b2f1
JX
1742#, c-format
1743msgid "could not migrate git directory from '%s' to '%s'"
1744msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
1745
6937cb4e
JX
1746#: entry.c:176
1747msgid "Filtering content"
1748msgstr "过滤内容"
1749
1750#: entry.c:433
87cb7997
JX
1751#, c-format
1752msgid "could not stat file '%s'"
65e2041e 1753msgstr "不能对文件 '%s' 调用 stat"
87cb7997 1754
6937cb4e 1755#: fetch-pack.c:252
a0b6b246
JX
1756msgid "git fetch-pack: expected shallow list"
1757msgstr "git fetch-pack:应为 shallow 列表"
1758
6937cb4e 1759#: fetch-pack.c:264
a0b6b246
JX
1760msgid "git fetch-pack: expected ACK/NAK, got EOF"
1761msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF"
1762
6937cb4e 1763#: fetch-pack.c:283 builtin/archive.c:63
60638e98
JX
1764#, c-format
1765msgid "remote error: %s"
1766msgstr "远程错误:%s"
1767
6937cb4e 1768#: fetch-pack.c:284
90314792 1769#, c-format
275588f9 1770msgid "git fetch-pack: expected ACK/NAK, got '%s'"
a0b6b246 1771msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
90314792 1772
6937cb4e 1773#: fetch-pack.c:336
a0b6b246
JX
1774msgid "--stateless-rpc requires multi_ack_detailed"
1775msgstr "--stateless-rpc 需要 multi_ack_detailed"
90314792 1776
6937cb4e 1777#: fetch-pack.c:422
90314792 1778#, c-format
a0b6b246
JX
1779msgid "invalid shallow line: %s"
1780msgstr "无效的 shallow 信息:%s"
90314792 1781
6937cb4e 1782#: fetch-pack.c:428
c04f5ac3 1783#, c-format
a0b6b246
JX
1784msgid "invalid unshallow line: %s"
1785msgstr "无效的 unshallow 信息:%s"
c04f5ac3 1786
6937cb4e 1787#: fetch-pack.c:430
a0b6b246
JX
1788#, c-format
1789msgid "object not found: %s"
1790msgstr "对象未找到:%s"
07432cef 1791
6937cb4e 1792#: fetch-pack.c:433
c04f5ac3 1793#, c-format
a0b6b246
JX
1794msgid "error in object: %s"
1795msgstr "对象中出错:%s"
07432cef 1796
6937cb4e 1797#: fetch-pack.c:435
c04f5ac3 1798#, c-format
a0b6b246
JX
1799msgid "no shallow found: %s"
1800msgstr "未发现 shallow:%s"
c04f5ac3 1801
6937cb4e 1802#: fetch-pack.c:438
a0b6b246
JX
1803#, c-format
1804msgid "expected shallow/unshallow, got %s"
1805msgstr "应为 shallow/unshallow,却得到 %s"
07432cef 1806
6937cb4e 1807#: fetch-pack.c:477
a0b6b246
JX
1808#, c-format
1809msgid "got %s %d %s"
1810msgstr "得到 %s %d %s"
1b7f4a34 1811
6937cb4e 1812#: fetch-pack.c:491
1b7f4a34 1813#, c-format
a0b6b246
JX
1814msgid "invalid commit %s"
1815msgstr "无效提交 %s"
1b7f4a34 1816
6937cb4e 1817#: fetch-pack.c:524
a0b6b246
JX
1818msgid "giving up"
1819msgstr "放弃"
814ff314 1820
6937cb4e 1821#: fetch-pack.c:534 progress.c:242
a0b6b246
JX
1822msgid "done"
1823msgstr "完成"
2e8451e8 1824
6937cb4e 1825#: fetch-pack.c:546
2e8451e8 1826#, c-format
a0b6b246
JX
1827msgid "got %s (%d) %s"
1828msgstr "得到 %s (%d) %s"
2e8451e8 1829
6937cb4e 1830#: fetch-pack.c:592
a0b6b246
JX
1831#, c-format
1832msgid "Marking %s as complete"
1833msgstr "标记 %s 为完成"
220c313c 1834
6937cb4e 1835#: fetch-pack.c:776
a0b6b246
JX
1836#, c-format
1837msgid "already have %s (%s)"
29004bbb 1838msgstr "已经有 %s(%s)"
220c313c 1839
6937cb4e 1840#: fetch-pack.c:814
a0b6b246
JX
1841msgid "fetch-pack: unable to fork off sideband demultiplexer"
1842msgstr "fetch-pack:无法派生 sideband 多路输出"
1b7f4a34 1843
6937cb4e 1844#: fetch-pack.c:822
a0b6b246
JX
1845msgid "protocol error: bad pack header"
1846msgstr "协议错误:坏的包头"
814ff314 1847
6937cb4e 1848#: fetch-pack.c:878
a0b6b246
JX
1849#, c-format
1850msgid "fetch-pack: unable to fork off %s"
1851msgstr "fetch-pack:无法派生进程 %s"
5c57d762 1852
6937cb4e 1853#: fetch-pack.c:894
a0b6b246
JX
1854#, c-format
1855msgid "%s failed"
1856msgstr "%s 失败"
14c8bced 1857
6937cb4e 1858#: fetch-pack.c:896
a0b6b246
JX
1859msgid "error in sideband demultiplexer"
1860msgstr "sideband 多路输出出错"
c04f5ac3 1861
6937cb4e 1862#: fetch-pack.c:923
a0b6b246
JX
1863msgid "Server does not support shallow clients"
1864msgstr "服务器不支持 shalllow 客户端"
c04f5ac3 1865
6937cb4e 1866#: fetch-pack.c:927
a0b6b246
JX
1867msgid "Server supports multi_ack_detailed"
1868msgstr "服务器支持 multi_ack_detailed"
c04f5ac3 1869
6937cb4e 1870#: fetch-pack.c:930
a0b6b246
JX
1871msgid "Server supports no-done"
1872msgstr "服务器支持 no-done"
c04f5ac3 1873
6937cb4e 1874#: fetch-pack.c:936
a0b6b246
JX
1875msgid "Server supports multi_ack"
1876msgstr "服务器支持 multi_ack"
c04f5ac3 1877
6937cb4e 1878#: fetch-pack.c:940
a0b6b246
JX
1879msgid "Server supports side-band-64k"
1880msgstr "服务器支持 side-band-64k"
c04f5ac3 1881
6937cb4e 1882#: fetch-pack.c:944
a0b6b246
JX
1883msgid "Server supports side-band"
1884msgstr "服务器支持 side-band"
5c57d762 1885
6937cb4e 1886#: fetch-pack.c:948
a0b6b246
JX
1887msgid "Server supports allow-tip-sha1-in-want"
1888msgstr "服务器支持 allow-tip-sha1-in-want"
c04f5ac3 1889
6937cb4e 1890#: fetch-pack.c:952
a0b6b246
JX
1891msgid "Server supports allow-reachable-sha1-in-want"
1892msgstr "服务器支持 allow-reachable-sha1-in-want"
8ada9598 1893
6937cb4e 1894#: fetch-pack.c:962
a0b6b246
JX
1895msgid "Server supports ofs-delta"
1896msgstr "服务器支持 ofs-delta"
8ada9598 1897
6937cb4e 1898#: fetch-pack.c:969
81809b99 1899#, c-format
a0b6b246
JX
1900msgid "Server version is %.*s"
1901msgstr "服务器版本 %.*s"
8ada9598 1902
6937cb4e 1903#: fetch-pack.c:975
a0b6b246
JX
1904msgid "Server does not support --shallow-since"
1905msgstr "服务器不支持 --shallow-since"
8ada9598 1906
6937cb4e 1907#: fetch-pack.c:979
a0b6b246
JX
1908msgid "Server does not support --shallow-exclude"
1909msgstr "服务器不支持 --shallow-exclude"
c04f5ac3 1910
6937cb4e 1911#: fetch-pack.c:981
a0b6b246
JX
1912msgid "Server does not support --deepen"
1913msgstr "服务器不支持 --deepen"
c04f5ac3 1914
6937cb4e 1915#: fetch-pack.c:992
a0b6b246
JX
1916msgid "no common commits"
1917msgstr "没有共同的提交"
c04f5ac3 1918
6937cb4e 1919#: fetch-pack.c:1004
a0b6b246
JX
1920msgid "git fetch-pack: fetch failed."
1921msgstr "git fetch-pack:获取失败。"
c04f5ac3 1922
6937cb4e 1923#: fetch-pack.c:1166
a0b6b246
JX
1924msgid "no matching remote head"
1925msgstr "没有匹配的远程分支"
c04f5ac3 1926
6937cb4e 1927#: fetch-pack.c:1188
87cb7997
JX
1928#, c-format
1929msgid "no such remote ref %s"
1930msgstr "没有这样的远程引用 %s"
1931
6937cb4e 1932#: fetch-pack.c:1191
87cb7997
JX
1933#, c-format
1934msgid "Server does not allow request for unadvertised object %s"
1935msgstr "服务器不允许请求未公开的对象 %s"
1936
a4f16749 1937#: gpg-interface.c:181
a0b6b246
JX
1938msgid "gpg failed to sign the data"
1939msgstr "gpg 无法为数据签名"
c04f5ac3 1940
a4f16749 1941#: gpg-interface.c:211
a0b6b246
JX
1942msgid "could not create temporary file"
1943msgstr "不能创建临时文件"
c04f5ac3 1944
6937cb4e 1945#: gpg-interface.c:214
c04f5ac3 1946#, c-format
a0b6b246
JX
1947msgid "failed writing detached signature to '%s'"
1948msgstr "无法将分离式签名写入 '%s'"
c04f5ac3 1949
a4f16749 1950#: graph.c:97
1a79b2f1
JX
1951#, c-format
1952msgid "ignore invalid color '%.*s' in log.graphColors"
1953msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
1954
6937cb4e 1955#: grep.c:1970
c04f5ac3 1956#, c-format
a0b6b246
JX
1957msgid "'%s': unable to read %s"
1958msgstr "'%s':无法读取 %s"
c04f5ac3 1959
6937cb4e 1960#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
c04f5ac3 1961#, c-format
a0b6b246 1962msgid "failed to stat '%s'"
65e2041e 1963msgstr "对 '%s' 调用 stat 失败"
c04f5ac3 1964
6937cb4e 1965#: grep.c:1998
a0b6b246
JX
1966#, c-format
1967msgid "'%s': short read"
1968msgstr "'%s':读取不完整"
5c57d762 1969
a4f16749 1970#: help.c:179
a0b6b246
JX
1971#, c-format
1972msgid "available git commands in '%s'"
1973msgstr "在 '%s' 下可用的 git 命令"
c04f5ac3 1974
a4f16749 1975#: help.c:186
a0b6b246
JX
1976msgid "git commands available from elsewhere on your $PATH"
1977msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
5c57d762 1978
a4f16749 1979#: help.c:217
a0b6b246
JX
1980msgid "These are common Git commands used in various situations:"
1981msgstr "这些是各种场合常见的 Git 命令:"
5c57d762 1982
a4f16749 1983#: help.c:281
c04f5ac3 1984#, c-format
a0b6b246
JX
1985msgid ""
1986"'%s' appears to be a git command, but we were not\n"
1987"able to execute it. Maybe git-%s is broken?"
1988msgstr ""
1989"'%s' 像是一个 git 命令,但却无法运行。\n"
1990"可能是 git-%s 受损?"
c04f5ac3 1991
a4f16749 1992#: help.c:336
a0b6b246
JX
1993msgid "Uh oh. Your system reports no Git commands at all."
1994msgstr "唉呀,您的系统中未发现 Git 命令。"
c04f5ac3 1995
a4f16749 1996#: help.c:358
c04f5ac3 1997#, c-format
a4f16749 1998msgid "WARNING: You called a Git command named '%s', which does not exist."
554e8501 1999msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。"
a4f16749
JX
2000
2001#: help.c:363
2002#, c-format
2003msgid "Continuing under the assumption that you meant '%s'."
554e8501 2004msgstr "假定你想要的是 '%s' 并继续。"
c04f5ac3 2005
a4f16749 2006#: help.c:368
c04f5ac3 2007#, c-format
a4f16749 2008msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
554e8501 2009msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。"
c04f5ac3 2010
a4f16749 2011#: help.c:376
c04f5ac3 2012#, c-format
a0b6b246
JX
2013msgid "git: '%s' is not a git command. See 'git --help'."
2014msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
c04f5ac3 2015
a4f16749
JX
2016#: help.c:380
2017msgid ""
2018"\n"
2019"The most similar command is"
2020msgid_plural ""
2021"\n"
2022"The most similar commands are"
6937cb4e
JX
2023msgstr[0] ""
2024"\n"
2025"最相似的命令是"
2026msgstr[1] ""
2027"\n"
2028"最相似的命令是"
a4f16749
JX
2029
2030#: help.c:395
2031msgid "git version [<options>]"
2032msgstr "git version [<选项>]"
2033
2034#: help.c:456
2035#, c-format
2036msgid "%s: %s - %s"
2037msgstr "%s:%s - %s"
2038
2039#: help.c:460
a0b6b246
JX
2040msgid ""
2041"\n"
2042"Did you mean this?"
2043msgid_plural ""
2044"\n"
2045"Did you mean one of these?"
2046msgstr[0] ""
2047"\n"
2048"您指的是这个么?"
2049msgstr[1] ""
2050"\n"
2051"您指的是这其中的某一个么?"
c04f5ac3 2052
a4f16749 2053#: ident.c:342
a0b6b246
JX
2054msgid ""
2055"\n"
2056"*** Please tell me who you are.\n"
2057"\n"
2058"Run\n"
2059"\n"
2060" git config --global user.email \"you@example.com\"\n"
2061" git config --global user.name \"Your Name\"\n"
2062"\n"
2063"to set your account's default identity.\n"
2064"Omit --global to set the identity only in this repository.\n"
2065"\n"
2066msgstr ""
2067"\n"
2068"*** 请告诉我你是谁。\n"
2069"\n"
2070"运行\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"来设置您账号的缺省身份标识。\n"
2076"如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
c04f5ac3 2077
a4f16749 2078#: ident.c:366
87cb7997 2079msgid "no email was given and auto-detection is disabled"
65e2041e 2080msgstr "未提供邮件地址且自动探测被禁用"
87cb7997 2081
a4f16749 2082#: ident.c:371
87cb7997
JX
2083#, c-format
2084msgid "unable to auto-detect email address (got '%s')"
2085msgstr "无法自动探测邮件地址(得到 '%s')"
2086
a4f16749 2087#: ident.c:381
87cb7997
JX
2088msgid "no name was given and auto-detection is disabled"
2089msgstr "未提供姓名且自动探测被禁用"
2090
a4f16749 2091#: ident.c:387
87cb7997
JX
2092#, c-format
2093msgid "unable to auto-detect name (got '%s')"
2094msgstr "无法自动探测姓名(得到 '%s')"
2095
a4f16749 2096#: ident.c:395
87cb7997
JX
2097#, c-format
2098msgid "empty ident name (for <%s>) not allowed"
2099msgstr "不允许空的姓名(对于 <%s>)"
2100
a4f16749 2101#: ident.c:401
87cb7997
JX
2102#, c-format
2103msgid "name consists only of disallowed characters: %s"
2104msgstr "姓名中仅包含禁用字符:%s"
2105
6937cb4e 2106#: ident.c:416 builtin/commit.c:616
87cb7997
JX
2107#, c-format
2108msgid "invalid date format: %s"
2109msgstr "无效的日期格式:%s"
2110
6937cb4e 2111#: lockfile.c:151
c04f5ac3 2112#, c-format
a0b6b246
JX
2113msgid ""
2114"Unable to create '%s.lock': %s.\n"
2115"\n"
2116"Another git process seems to be running in this repository, e.g.\n"
2117"an editor opened by 'git commit'. Please make sure all processes\n"
2118"are terminated then try again. If it still fails, a git process\n"
2119"may have crashed in this repository earlier:\n"
2120"remove the file manually to continue."
2121msgstr ""
2122"无法创建 '%s.lock':%s。\n"
2123"\n"
2124"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
2125"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
2126"可能之前有一个 git 进程在这个仓库中异常退出:\n"
2127"手动删除这个文件再继续。"
c04f5ac3 2128
6937cb4e 2129#: lockfile.c:159
a0b6b246
JX
2130#, c-format
2131msgid "Unable to create '%s.lock': %s"
2132msgstr "不能创建 '%s.lock':%s"
c04f5ac3 2133
a0b6b246
JX
2134#: merge.c:41
2135msgid "failed to read the cache"
2136msgstr "无法读取缓存"
c04f5ac3 2137
6937cb4e
JX
2138#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
2139#: builtin/checkout.c:595 builtin/clone.c:754
a0b6b246
JX
2140msgid "unable to write new index file"
2141msgstr "无法写新的索引文件"
c04f5ac3 2142
6937cb4e 2143#: merge-recursive.c:235
a0b6b246
JX
2144msgid "(bad commit)\n"
2145msgstr "(坏提交)\n"
c04f5ac3 2146
6937cb4e 2147#: merge-recursive.c:257 merge-recursive.c:265
a0b6b246
JX
2148#, c-format
2149msgid "addinfo_cache failed for path '%s'"
2150msgstr "为路径 '%s' addinfo_cache 失败"
c04f5ac3 2151
6937cb4e 2152#: merge-recursive.c:329
a0b6b246
JX
2153msgid "error building trees"
2154msgstr "无法创建树"
c04f5ac3 2155
6937cb4e 2156#: merge-recursive.c:752
c04f5ac3 2157#, c-format
a0b6b246
JX
2158msgid "failed to create path '%s'%s"
2159msgstr "无法创建路径 '%s'%s"
c04f5ac3 2160
6937cb4e 2161#: merge-recursive.c:763
c04f5ac3 2162#, c-format
a0b6b246
JX
2163msgid "Removing %s to make room for subdirectory\n"
2164msgstr "删除 %s 以便为子目录留出空间\n"
c04f5ac3 2165
6937cb4e 2166#: merge-recursive.c:777 merge-recursive.c:796
a0b6b246
JX
2167msgid ": perhaps a D/F conflict?"
2168msgstr ":可能是一个目录/文件冲突?"
c04f5ac3 2169
6937cb4e 2170#: merge-recursive.c:786
c04f5ac3 2171#, c-format
a0b6b246
JX
2172msgid "refusing to lose untracked file at '%s'"
2173msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
c04f5ac3 2174
6937cb4e 2175#: merge-recursive.c:828 builtin/cat-file.c:37
c04f5ac3 2176#, c-format
a0b6b246
JX
2177msgid "cannot read object %s '%s'"
2178msgstr "不能读取对象 %s '%s'"
c04f5ac3 2179
6937cb4e 2180#: merge-recursive.c:830
4dcdc3d8 2181#, c-format
a0b6b246
JX
2182msgid "blob expected for %s '%s'"
2183msgstr "%s '%s' 应为数据对象"
4dcdc3d8 2184
6937cb4e 2185#: merge-recursive.c:854
4dcdc3d8 2186#, c-format
a0b6b246
JX
2187msgid "failed to open '%s': %s"
2188msgstr "无法打开 '%s':%s"
4dcdc3d8 2189
6937cb4e 2190#: merge-recursive.c:865
a0b6b246
JX
2191#, c-format
2192msgid "failed to symlink '%s': %s"
2193msgstr "无法创建符号链接 '%s':%s"
c04f5ac3 2194
6937cb4e 2195#: merge-recursive.c:870
5c57d762 2196#, c-format
a0b6b246
JX
2197msgid "do not know what to do with %06o %s '%s'"
2198msgstr "不知道如何处理 %06o %s '%s'"
5c57d762 2199
6937cb4e 2200#: merge-recursive.c:1010
a0b6b246
JX
2201msgid "Failed to execute internal merge"
2202msgstr "无法执行内部合并"
2203
6937cb4e 2204#: merge-recursive.c:1014
5c57d762 2205#, c-format
a0b6b246
JX
2206msgid "Unable to add %s to database"
2207msgstr "不能添加 %s 至对象库"
5c57d762 2208
6937cb4e 2209#: merge-recursive.c:1117
5c57d762
JX
2210#, c-format
2211msgid ""
a0b6b246
JX
2212"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2213"in tree."
5c57d762 2214msgstr ""
87cb7997
JX
2215"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
2216"本被保留。"
2217
6937cb4e 2218#: merge-recursive.c:1122
87cb7997
JX
2219#, c-format
2220msgid ""
2221"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
2222"left in tree."
2223msgstr ""
2224"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
2225"%7$s 版本被保留。"
c04f5ac3 2226
6937cb4e 2227#: merge-recursive.c:1129
7aea43ff 2228#, c-format
a0b6b246
JX
2229msgid ""
2230"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2231"in tree at %s."
2232msgstr ""
87cb7997
JX
2233"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
2234"本保留在 %8$s 中。"
7aea43ff 2235
6937cb4e 2236#: merge-recursive.c:1134
87cb7997
JX
2237#, c-format
2238msgid ""
2239"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
2240"left in tree at %s."
2241msgstr ""
2242"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
2243"%7$s 版本保留在 %9$s 中。"
2244
6937cb4e 2245#: merge-recursive.c:1168
a0b6b246
JX
2246msgid "rename"
2247msgstr "重命名"
5b04ee3b 2248
6937cb4e 2249#: merge-recursive.c:1168
a0b6b246
JX
2250msgid "renamed"
2251msgstr "重命名"
5b04ee3b 2252
6937cb4e 2253#: merge-recursive.c:1225
5c57d762 2254#, c-format
a0b6b246
JX
2255msgid "%s is a directory in %s adding as %s instead"
2256msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
5c57d762 2257
6937cb4e 2258#: merge-recursive.c:1250
5c57d762
JX
2259#, c-format
2260msgid ""
a0b6b246
JX
2261"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
2262"\"->\"%s\" in \"%s\"%s"
5c57d762 2263msgstr ""
a0b6b246
JX
2264"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
2265"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
5c57d762 2266
6937cb4e 2267#: merge-recursive.c:1255
a0b6b246
JX
2268msgid " (left unresolved)"
2269msgstr "(留下未解决)"
5c57d762 2270
6937cb4e 2271#: merge-recursive.c:1317
5c57d762 2272#, c-format
a0b6b246 2273msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
5c57d762 2274msgstr ""
a0b6b246
JX
2275"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
2276"%5$s"
3495628d 2277
6937cb4e 2278#: merge-recursive.c:1350
3495628d 2279#, c-format
a0b6b246
JX
2280msgid "Renaming %s to %s and %s to %s instead"
2281msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
3495628d 2282
6937cb4e 2283#: merge-recursive.c:1553
3495628d 2284#, c-format
a0b6b246
JX
2285msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
2286msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
2e8451e8 2287
6937cb4e 2288#: merge-recursive.c:1568
a0b6b246
JX
2289#, c-format
2290msgid "Adding merged %s"
2291msgstr "添加合并后的 %s"
90314792 2292
6937cb4e 2293#: merge-recursive.c:1575 merge-recursive.c:1805
90314792 2294#, c-format
a0b6b246
JX
2295msgid "Adding as %s instead"
2296msgstr "而是以 %s 为名添加"
90314792 2297
6937cb4e 2298#: merge-recursive.c:1632
90314792 2299#, c-format
a0b6b246
JX
2300msgid "cannot read object %s"
2301msgstr "不能读取对象 %s"
90314792 2302
6937cb4e 2303#: merge-recursive.c:1635
90314792 2304#, c-format
a0b6b246
JX
2305msgid "object %s is not a blob"
2306msgstr "对象 %s 不是一个数据对象"
90314792 2307
6937cb4e 2308#: merge-recursive.c:1704
a0b6b246
JX
2309msgid "modify"
2310msgstr "修改"
90314792 2311
6937cb4e 2312#: merge-recursive.c:1704
a0b6b246
JX
2313msgid "modified"
2314msgstr "修改"
5b04ee3b 2315
6937cb4e 2316#: merge-recursive.c:1714
a0b6b246
JX
2317msgid "content"
2318msgstr "内容"
5b04ee3b 2319
6937cb4e 2320#: merge-recursive.c:1721
a0b6b246
JX
2321msgid "add/add"
2322msgstr "添加/添加"
3495628d 2323
6937cb4e 2324#: merge-recursive.c:1757
220c313c 2325#, c-format
a0b6b246
JX
2326msgid "Skipped %s (merged same as existing)"
2327msgstr "略过 %s(已经做过相同合并)"
220c313c 2328
6937cb4e 2329#: merge-recursive.c:1771
220c313c 2330#, c-format
a0b6b246
JX
2331msgid "Auto-merging %s"
2332msgstr "自动合并 %s"
220c313c 2333
6937cb4e 2334#: merge-recursive.c:1775 git-submodule.sh:944
a0b6b246
JX
2335msgid "submodule"
2336msgstr "子模组"
2337
6937cb4e 2338#: merge-recursive.c:1776
220c313c 2339#, c-format
a0b6b246
JX
2340msgid "CONFLICT (%s): Merge conflict in %s"
2341msgstr "冲突(%s):合并冲突于 %s"
220c313c 2342
6937cb4e 2343#: merge-recursive.c:1870
220c313c 2344#, c-format
a0b6b246
JX
2345msgid "Removing %s"
2346msgstr "删除 %s"
220c313c 2347
6937cb4e 2348#: merge-recursive.c:1896
a0b6b246
JX
2349msgid "file/directory"
2350msgstr "文件/目录"
220c313c 2351
6937cb4e 2352#: merge-recursive.c:1902
a0b6b246
JX
2353msgid "directory/file"
2354msgstr "目录/文件"
276ceeaa 2355
6937cb4e 2356#: merge-recursive.c:1908
276ceeaa 2357#, c-format
a0b6b246
JX
2358msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
2359msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
276ceeaa 2360
6937cb4e 2361#: merge-recursive.c:1917
276ceeaa 2362#, c-format
a0b6b246
JX
2363msgid "Adding %s"
2364msgstr "添加 %s"
276ceeaa 2365
6937cb4e
JX
2366#: merge-recursive.c:1954
2367msgid "Already up to date!"
a0b6b246 2368msgstr "已经是最新的!"
276ceeaa 2369
6937cb4e 2370#: merge-recursive.c:1963
276ceeaa 2371#, c-format
a0b6b246
JX
2372msgid "merging of trees %s and %s failed"
2373msgstr "无法合并树 %s 和 %s"
276ceeaa 2374
6937cb4e 2375#: merge-recursive.c:2060
a0b6b246
JX
2376msgid "Merging:"
2377msgstr "合并:"
5c57d762 2378
6937cb4e 2379#: merge-recursive.c:2073
5c57d762 2380#, c-format
a0b6b246
JX
2381msgid "found %u common ancestor:"
2382msgid_plural "found %u common ancestors:"
2383msgstr[0] "发现 %u 个共同祖先:"
2384msgstr[1] "发现 %u 个共同祖先:"
2385
6937cb4e 2386#: merge-recursive.c:2112
a0b6b246
JX
2387msgid "merge returned no commit"
2388msgstr "合并未返回提交"
2389
6937cb4e 2390#: merge-recursive.c:2175
5c57d762 2391#, c-format
a0b6b246
JX
2392msgid "Could not parse object '%s'"
2393msgstr "不能解析对象 '%s'"
5c57d762 2394
6937cb4e 2395#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
a0b6b246
JX
2396msgid "Unable to write index."
2397msgstr "不能写入索引。"
2398
6937cb4e 2399#: notes-merge.c:272
5c57d762
JX
2400#, c-format
2401msgid ""
a0b6b246
JX
2402"You have not concluded your previous notes merge (%s exists).\n"
2403"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
2404"commit/abort the previous merge before you start a new notes merge."
5c57d762 2405msgstr ""
29004bbb 2406"您的前一次注释合并尚未结束(存在 %s)。\n"
1a79b2f1
JX
2407"在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
2408"notes merge --abort' 来提交/终止前一次合并。"
5c57d762 2409
6937cb4e 2410#: notes-merge.c:279
a0b6b246
JX
2411#, c-format
2412msgid "You have not concluded your notes merge (%s exists)."
2413msgstr "您尚未结束注释合并(存在 %s)。"
2414
a4f16749 2415#: notes-utils.c:42
a0b6b246
JX
2416msgid "Cannot commit uninitialized/unreferenced notes tree"
2417msgstr "不能提交未初始化/未引用的注解树"
5c57d762 2418
a4f16749 2419#: notes-utils.c:101
1b7f4a34 2420#, c-format
a0b6b246
JX
2421msgid "Bad notes.rewriteMode value: '%s'"
2422msgstr "坏的 notes.rewriteMode 值:'%s'"
1b7f4a34 2423
a4f16749 2424#: notes-utils.c:111
5b04ee3b 2425#, c-format
a0b6b246
JX
2426msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
2427msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
5b04ee3b 2428
a4f16749
JX
2429#. TRANSLATORS: The first %s is the name of
2430#. the environment variable, the second %s is
2431#. its value.
2432#.
2433#: notes-utils.c:141
5b04ee3b 2434#, c-format
a0b6b246
JX
2435msgid "Bad %s value: '%s'"
2436msgstr "坏的 %s 值:'%s'"
5b04ee3b 2437
6937cb4e 2438#: object.c:239
5b04ee3b 2439#, c-format
a0b6b246
JX
2440msgid "unable to parse object: %s"
2441msgstr "不能解析对象:%s"
5b04ee3b 2442
6937cb4e
JX
2443#: packfile.c:556
2444msgid "offset before end of packfile (broken .idx?)"
2445msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
2446
2447#: packfile.c:1683
2448#, c-format
2449msgid "offset before start of pack index for %s (corrupt index?)"
2450msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
2451
2452#: packfile.c:1687
2453#, c-format
2454msgid "offset beyond end of pack index for %s (truncated index?)"
2455msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
2456
a4f16749 2457#: parse-options.c:573
a0b6b246
JX
2458msgid "..."
2459msgstr "..."
2460
6937cb4e 2461#: parse-options.c:592
5b04ee3b 2462#, c-format
a0b6b246
JX
2463msgid "usage: %s"
2464msgstr "用法:%s"
5b04ee3b 2465
a0b6b246 2466#. TRANSLATORS: the colon here should align with the
a4f16749
JX
2467#. one in "usage: %s" translation.
2468#.
6937cb4e 2469#: parse-options.c:598
5b04ee3b 2470#, c-format
a0b6b246
JX
2471msgid " or: %s"
2472msgstr " 或:%s"
5b04ee3b 2473
a0b6b246 2474# 译者:为保证在输出中对齐,注意调整句中空格!
6937cb4e 2475#: parse-options.c:601
5b04ee3b 2476#, c-format
a0b6b246
JX
2477msgid " %s"
2478msgstr " %s"
5b04ee3b 2479
6937cb4e 2480#: parse-options.c:640
a0b6b246
JX
2481msgid "-NUM"
2482msgstr "-数字"
2483
2484#: parse-options-cb.c:108
5b04ee3b 2485#, c-format
a0b6b246
JX
2486msgid "malformed object name '%s'"
2487msgstr "非法的对象名 '%s'"
5b04ee3b 2488
6937cb4e 2489#: path.c:891
5b04ee3b 2490#, c-format
a0b6b246
JX
2491msgid "Could not make %s writable by group"
2492msgstr "不能设置 %s 为组可写"
2493
a4f16749 2494#: pathspec.c:129
87cb7997
JX
2495msgid "Escape character '\\' not allowed as last character in attr value"
2496msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
2497
a4f16749 2498#: pathspec.c:147
87cb7997
JX
2499msgid "Only one 'attr:' specification is allowed."
2500msgstr "只允许一个 'attr:' 规格。"
2501
a4f16749 2502#: pathspec.c:150
87cb7997
JX
2503msgid "attr spec must not be empty"
2504msgstr "属性规格不能为空"
2505
a4f16749 2506#: pathspec.c:193
87cb7997
JX
2507#, c-format
2508msgid "invalid attribute name %s"
2509msgstr "无效的属性名 %s"
2510
a4f16749 2511#: pathspec.c:258
a0b6b246
JX
2512msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
2513msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
2514
a4f16749 2515#: pathspec.c:265
5b04ee3b 2516msgid ""
a0b6b246
JX
2517"global 'literal' pathspec setting is incompatible with all other global "
2518"pathspec settings"
2519msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
5b04ee3b 2520
a4f16749 2521#: pathspec.c:305
a0b6b246
JX
2522msgid "invalid parameter for pathspec magic 'prefix'"
2523msgstr "路径规格包含无效的神奇前缀"
2524
a4f16749 2525#: pathspec.c:326
5b04ee3b 2526#, c-format
a0b6b246
JX
2527msgid "Invalid pathspec magic '%.*s' in '%s'"
2528msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
5b04ee3b 2529
a4f16749 2530#: pathspec.c:331
5b04ee3b 2531#, c-format
a0b6b246
JX
2532msgid "Missing ')' at the end of pathspec magic in '%s'"
2533msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
5b04ee3b 2534
a4f16749 2535#: pathspec.c:369
5b04ee3b 2536#, c-format
a0b6b246
JX
2537msgid "Unimplemented pathspec magic '%c' in '%s'"
2538msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
5b04ee3b 2539
a4f16749 2540#: pathspec.c:428
5b04ee3b 2541#, c-format
a0b6b246
JX
2542msgid "%s: 'literal' and 'glob' are incompatible"
2543msgstr "%s:'literal' 和 'glob' 不兼容"
5b04ee3b 2544
a4f16749 2545#: pathspec.c:441
5b04ee3b 2546#, c-format
a0b6b246
JX
2547msgid "%s: '%s' is outside repository"
2548msgstr "%s:'%s' 在仓库之外"
5b04ee3b 2549
a4f16749 2550#: pathspec.c:515
5b04ee3b 2551#, c-format
1a79b2f1
JX
2552msgid "'%s' (mnemonic: '%c')"
2553msgstr "'%s'(助记符:'%c')"
5b04ee3b 2554
a4f16749 2555#: pathspec.c:525
5b04ee3b 2556#, c-format
a0b6b246
JX
2557msgid "%s: pathspec magic not supported by this command: %s"
2558msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
2559
6937cb4e 2560#: pathspec.c:571
5b04ee3b 2561msgid ""
a0b6b246
JX
2562"empty strings as pathspecs will be made invalid in upcoming releases. please "
2563"use . instead if you meant to match all paths"
5b04ee3b 2564msgstr ""
29004bbb 2565"在下一个版本中,使用空字符串作为路径规格将被视作非法。如果要匹配所有路径,\n"
a0b6b246 2566"请代之以 ."
5b04ee3b 2567
6937cb4e 2568#: pathspec.c:595
5b04ee3b 2569#, c-format
a0b6b246
JX
2570msgid "pathspec '%s' is beyond a symbolic link"
2571msgstr "路径规格 '%s' 位于符号链接中"
2572
6937cb4e 2573#: pretty.c:962
a0b6b246
JX
2574msgid "unable to parse --pretty format"
2575msgstr "不能解析 --pretty 格式"
2576
a4f16749 2577#: read-cache.c:1443
5b04ee3b
JX
2578#, c-format
2579msgid ""
a0b6b246
JX
2580"index.version set, but the value is invalid.\n"
2581"Using version %i"
5b04ee3b 2582msgstr ""
a0b6b246
JX
2583"设置了 index.version,但是取值无效。\n"
2584"使用版本 %i"
5b04ee3b 2585
a4f16749 2586#: read-cache.c:1453
5b04ee3b
JX
2587#, c-format
2588msgid ""
a0b6b246
JX
2589"GIT_INDEX_VERSION set, but the value is invalid.\n"
2590"Using version %i"
5b04ee3b 2591msgstr ""
a0b6b246
JX
2592"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
2593"使用版本 %i"
5b04ee3b 2594
6937cb4e 2595#: read-cache.c:2316 builtin/merge.c:1046
a4f16749
JX
2596#, c-format
2597msgid "could not close '%s'"
2598msgstr "不能关闭 '%s'"
2599
6937cb4e 2600#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
87cb7997 2601#, c-format
60638e98 2602msgid "could not stat '%s'"
65e2041e 2603msgstr "不能对 '%s' 调用 stat"
87cb7997 2604
6937cb4e 2605#: read-cache.c:2407
87cb7997
JX
2606#, c-format
2607msgid "unable to open git dir: %s"
2608msgstr "不能打开 git 目录:%s"
2609
6937cb4e 2610#: read-cache.c:2419
87cb7997
JX
2611#, c-format
2612msgid "unable to unlink: %s"
2613msgstr "无法删除:%s"
2614
6937cb4e 2615#: refs.c:638
5b04ee3b 2616#, c-format
a0b6b246
JX
2617msgid "Could not open '%s' for writing"
2618msgstr "无法打开 '%s' 进行写入"
5b04ee3b 2619
6937cb4e 2620#: refs.c:1792
60638e98
JX
2621msgid "ref updates forbidden inside quarantine environment"
2622msgstr "在隔离环境中禁止更新引用"
2623
6937cb4e
JX
2624#: refs/files-backend.c:1136
2625#, c-format
2626msgid "could not remove reference %s"
2627msgstr "无法删除引用 %s"
2628
2629#: refs/files-backend.c:1150 refs/packed-backend.c:1430
2630#: refs/packed-backend.c:1440
5b04ee3b 2631#, c-format
a0b6b246
JX
2632msgid "could not delete reference %s: %s"
2633msgstr "无法删除引用 %s:%s"
5b04ee3b 2634
6937cb4e 2635#: refs/files-backend.c:1153 refs/packed-backend.c:1443
5b04ee3b 2636#, c-format
a0b6b246
JX
2637msgid "could not delete references: %s"
2638msgstr "无法删除引用:%s"
5b04ee3b 2639
a4f16749 2640#: ref-filter.c:35 wt-status.c:1811
87cb7997
JX
2641msgid "gone"
2642msgstr "丢失"
2643
2644#: ref-filter.c:36
2645#, c-format
2646msgid "ahead %d"
2647msgstr "领先 %d"
2648
2649#: ref-filter.c:37
2650#, c-format
2651msgid "behind %d"
2652msgstr "落后 %d"
2653
2654#: ref-filter.c:38
2655#, c-format
2656msgid "ahead %d, behind %d"
2657msgstr "领先 %d,落后 %d"
2658
a4f16749 2659#: ref-filter.c:105
5b04ee3b 2660#, c-format
a0b6b246 2661msgid "expected format: %%(color:<color>)"
58b6f078 2662msgstr "期望的格式:%%(color:<颜色>)"
5b04ee3b 2663
a4f16749 2664#: ref-filter.c:107
5b04ee3b 2665#, c-format
a0b6b246
JX
2666msgid "unrecognized color: %%(color:%s)"
2667msgstr "未能识别的颜色:%%(color:%s)"
6c94aba5 2668
6937cb4e 2669#: ref-filter.c:127
a0b6b246 2670#, c-format
87cb7997
JX
2671msgid "Integer value expected refname:lstrip=%s"
2672msgstr "期望整数值 refname:lstrip=%s"
90314792 2673
6937cb4e 2674#: ref-filter.c:131
87cb7997
JX
2675#, c-format
2676msgid "Integer value expected refname:rstrip=%s"
2677msgstr "期望整数值 refname:rstrip=%s"
2678
6937cb4e 2679#: ref-filter.c:133
87cb7997
JX
2680#, c-format
2681msgid "unrecognized %%(%s) argument: %s"
2682msgstr "未能识别的 %%(%s) 参数:%s"
2683
6937cb4e 2684#: ref-filter.c:173
90314792 2685#, c-format
a0b6b246
JX
2686msgid "%%(body) does not take arguments"
2687msgstr "%%(body) 不带参数"
90314792 2688
6937cb4e 2689#: ref-filter.c:180
a0b6b246
JX
2690#, c-format
2691msgid "%%(subject) does not take arguments"
2692msgstr "%%(subject) 不带参数"
90314792 2693
6937cb4e 2694#: ref-filter.c:198
1a79b2f1 2695#, c-format
6937cb4e
JX
2696msgid "unknown %%(trailers) argument: %s"
2697msgstr "未知的 %%(trailers) 参数:%s"
1a79b2f1 2698
6937cb4e 2699#: ref-filter.c:221
a0b6b246
JX
2700#, c-format
2701msgid "positive value expected contents:lines=%s"
87cb7997 2702msgstr "期望一个正数 contents:lines=%s"
90314792 2703
6937cb4e 2704#: ref-filter.c:223
a0b6b246
JX
2705#, c-format
2706msgid "unrecognized %%(contents) argument: %s"
2707msgstr "未能识别的 %%(contents) 参数:%s"
90314792 2708
6937cb4e 2709#: ref-filter.c:236
87cb7997
JX
2710#, c-format
2711msgid "positive value expected objectname:short=%s"
2712msgstr "期望一个正数 objectname:short=%s"
2713
6937cb4e 2714#: ref-filter.c:240
a0b6b246
JX
2715#, c-format
2716msgid "unrecognized %%(objectname) argument: %s"
2717msgstr "未能识别的 %%(objectname) 参数:%s"
90314792 2718
6937cb4e 2719#: ref-filter.c:267
a0b6b246
JX
2720#, c-format
2721msgid "expected format: %%(align:<width>,<position>)"
58b6f078 2722msgstr "期望的格式:%%(align:<宽度>,<位置>)"
90314792 2723
6937cb4e 2724#: ref-filter.c:279
5c57d762 2725#, c-format
a0b6b246
JX
2726msgid "unrecognized position:%s"
2727msgstr "未能识别的位置:%s"
5c57d762 2728
6937cb4e 2729#: ref-filter.c:283
1b7f4a34 2730#, c-format
a0b6b246
JX
2731msgid "unrecognized width:%s"
2732msgstr "未能识别的宽度:%s"
1b7f4a34 2733
6937cb4e 2734#: ref-filter.c:289
1b7f4a34 2735#, c-format
a0b6b246
JX
2736msgid "unrecognized %%(align) argument: %s"
2737msgstr "未能识别的 %%(align) 参数:%s"
1b7f4a34 2738
6937cb4e 2739#: ref-filter.c:293
1b7f4a34 2740#, c-format
a0b6b246
JX
2741msgid "positive width expected with the %%(align) atom"
2742msgstr "元素 %%(align) 需要一个正数的宽度"
1b7f4a34 2743
6937cb4e 2744#: ref-filter.c:308
87cb7997
JX
2745#, c-format
2746msgid "unrecognized %%(if) argument: %s"
2747msgstr "未能识别的 %%(if) 参数:%s"
2748
6937cb4e 2749#: ref-filter.c:398
07432cef 2750#, c-format
a0b6b246
JX
2751msgid "malformed field name: %.*s"
2752msgstr "非法的字段名:%.*s"
ef317cd5 2753
6937cb4e 2754#: ref-filter.c:424
a0b6b246
JX
2755#, c-format
2756msgid "unknown field name: %.*s"
2757msgstr "未知的字段名:%.*s"
220c313c 2758
6937cb4e 2759#: ref-filter.c:536
87cb7997
JX
2760#, c-format
2761msgid "format: %%(if) atom used without a %%(then) atom"
2762msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
2763
6937cb4e 2764#: ref-filter.c:596
87cb7997
JX
2765#, c-format
2766msgid "format: %%(then) atom used without an %%(if) atom"
2767msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
2768
6937cb4e 2769#: ref-filter.c:598
87cb7997
JX
2770#, c-format
2771msgid "format: %%(then) atom used more than once"
2772msgstr "格式:%%(then) 元素用了多次"
2773
6937cb4e 2774#: ref-filter.c:600
87cb7997
JX
2775#, c-format
2776msgid "format: %%(then) atom used after %%(else)"
2777msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
2778
6937cb4e 2779#: ref-filter.c:626
87cb7997
JX
2780#, c-format
2781msgid "format: %%(else) atom used without an %%(if) atom"
2782msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
2783
6937cb4e 2784#: ref-filter.c:628
87cb7997
JX
2785#, c-format
2786msgid "format: %%(else) atom used without a %%(then) atom"
2787msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
2788
6937cb4e 2789#: ref-filter.c:630
87cb7997
JX
2790#, c-format
2791msgid "format: %%(else) atom used more than once"
2792msgstr "格式:%%(else) 元素用了多次"
2793
6937cb4e 2794#: ref-filter.c:643
7aea43ff 2795#, c-format
a0b6b246
JX
2796msgid "format: %%(end) atom used without corresponding atom"
2797msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
7aea43ff 2798
6937cb4e 2799#: ref-filter.c:698
7aea43ff 2800#, c-format
a0b6b246
JX
2801msgid "malformed format string %s"
2802msgstr "非法的格式化字符串 %s"
7aea43ff 2803
6937cb4e 2804#: ref-filter.c:1283
87cb7997
JX
2805#, c-format
2806msgid "(no branch, rebasing %s)"
2807msgstr "(非分支,正变基 %s)"
2808
6937cb4e 2809#: ref-filter.c:1286
87cb7997
JX
2810#, c-format
2811msgid "(no branch, bisect started on %s)"
2812msgstr "(非分支,二分查找开始于 %s)"
c04f5ac3 2813
a4f16749
JX
2814#. TRANSLATORS: make sure this matches "HEAD
2815#. detached at " in wt-status.c
2816#.
6937cb4e 2817#: ref-filter.c:1294
c04f5ac3 2818#, c-format
87cb7997
JX
2819msgid "(HEAD detached at %s)"
2820msgstr "(头指针分离于 %s)"
c04f5ac3 2821
a4f16749
JX
2822#. TRANSLATORS: make sure this matches "HEAD
2823#. detached from " in wt-status.c
2824#.
6937cb4e 2825#: ref-filter.c:1301
a0b6b246 2826#, c-format
87cb7997
JX
2827msgid "(HEAD detached from %s)"
2828msgstr "(头指针分离自 %s)"
6792b93b 2829
6937cb4e 2830#: ref-filter.c:1305
87cb7997
JX
2831msgid "(no branch)"
2832msgstr "(非分支)"
2833
6937cb4e 2834#: ref-filter.c:1454 ref-filter.c:1485
a0b6b246
JX
2835#, c-format
2836msgid "missing object %s for %s"
2837msgstr "缺失 %2$s 的对象 %1$s"
c04f5ac3 2838
6937cb4e 2839#: ref-filter.c:1457 ref-filter.c:1488
a0b6b246
JX
2840#, c-format
2841msgid "parse_object_buffer failed on %s for %s"
2842msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
6792b93b 2843
6937cb4e 2844#: ref-filter.c:1788
a0b6b246
JX
2845#, c-format
2846msgid "malformed object at '%s'"
2847msgstr "非法的对象于 '%s'"
c04f5ac3 2848
6937cb4e 2849#: ref-filter.c:1855
a0b6b246
JX
2850#, c-format
2851msgid "ignoring ref with broken name %s"
2852msgstr "忽略带有错误名称 %s 的引用"
c04f5ac3 2853
6937cb4e 2854#: ref-filter.c:1860
a0b6b246
JX
2855#, c-format
2856msgid "ignoring broken ref %s"
2857msgstr "忽略损坏的引用 %s"
c04f5ac3 2858
6937cb4e 2859#: ref-filter.c:2122
a0b6b246
JX
2860#, c-format
2861msgid "format: %%(end) atom missing"
2862msgstr "格式:缺少 %%(end) 元素"
c04f5ac3 2863
6937cb4e 2864#: ref-filter.c:2216
a0b6b246
JX
2865#, c-format
2866msgid "malformed object name %s"
2867msgstr "非法的对象名 %s"
c04f5ac3 2868
6937cb4e 2869#: remote.c:750
a0b6b246
JX
2870#, c-format
2871msgid "Cannot fetch both %s and %s to %s"
2872msgstr "不能同时获取 %s 和 %s 至 %s"
c04f5ac3 2873
6937cb4e 2874#: remote.c:754
c04f5ac3 2875#, c-format
a0b6b246
JX
2876msgid "%s usually tracks %s, not %s"
2877msgstr "%s 通常跟踪 %s,而非 %s"
c04f5ac3 2878
6937cb4e 2879#: remote.c:758
a0b6b246
JX
2880#, c-format
2881msgid "%s tracks both %s and %s"
2882msgstr "%s 同时跟踪 %s 和 %s"
c04f5ac3 2883
6937cb4e 2884#: remote.c:766
a0b6b246
JX
2885msgid "Internal error"
2886msgstr "内部错误"
c04f5ac3 2887
6937cb4e 2888#: remote.c:1681 remote.c:1783
a0b6b246
JX
2889msgid "HEAD does not point to a branch"
2890msgstr "HEAD 没有指向一个分支"
c04f5ac3 2891
6937cb4e 2892#: remote.c:1690
a0b6b246
JX
2893#, c-format
2894msgid "no such branch: '%s'"
2895msgstr "没有此分支:'%s'"
c04f5ac3 2896
6937cb4e 2897#: remote.c:1693
a0b6b246
JX
2898#, c-format
2899msgid "no upstream configured for branch '%s'"
2900msgstr "尚未给分支 '%s' 设置上游"
c04f5ac3 2901
6937cb4e 2902#: remote.c:1699
a0b6b246
JX
2903#, c-format
2904msgid "upstream branch '%s' not stored as a remote-tracking branch"
2905msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
c04f5ac3 2906
6937cb4e 2907#: remote.c:1714
a0b6b246
JX
2908#, c-format
2909msgid "push destination '%s' on remote '%s' has no local tracking branch"
2910msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
c04f5ac3 2911
6937cb4e 2912#: remote.c:1726
a0b6b246
JX
2913#, c-format
2914msgid "branch '%s' has no remote for pushing"
2915msgstr "分支 '%s' 没有设置要推送的远程服务器"
cfff71a9 2916
6937cb4e 2917#: remote.c:1737
a0b6b246
JX
2918#, c-format
2919msgid "push refspecs for '%s' do not include '%s'"
2920msgstr "向 '%s' 推送引用规格未包含 '%s'"
cfff71a9 2921
6937cb4e 2922#: remote.c:1750
a0b6b246
JX
2923msgid "push has no destination (push.default is 'nothing')"
2924msgstr "推送无目标(push.default 是 'nothing')"
cfff71a9 2925
6937cb4e 2926#: remote.c:1772
a0b6b246
JX
2927msgid "cannot resolve 'simple' push to a single destination"
2928msgstr "无法解析 'simple' 推送至一个单独的目标"
6c94aba5 2929
a4f16749 2930#: remote.c:2076
a0b6b246
JX
2931#, c-format
2932msgid "Your branch is based on '%s', but the upstream is gone.\n"
2933msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
6c94aba5 2934
a4f16749 2935#: remote.c:2080
a0b6b246
JX
2936msgid " (use \"git branch --unset-upstream\" to fixup)\n"
2937msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
6c94aba5 2938
a4f16749 2939#: remote.c:2083
a0b6b246 2940#, c-format
6937cb4e 2941msgid "Your branch is up to date with '%s'.\n"
a0b6b246 2942msgstr "您的分支与上游分支 '%s' 一致。\n"
cfff71a9 2943
a4f16749 2944#: remote.c:2087
a0b6b246
JX
2945#, c-format
2946msgid "Your branch is ahead of '%s' by %d commit.\n"
2947msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
2948msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
2949msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
cfff71a9 2950
a4f16749 2951#: remote.c:2093
a0b6b246
JX
2952msgid " (use \"git push\" to publish your local commits)\n"
2953msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
c04f5ac3 2954
a4f16749 2955#: remote.c:2096
a0b6b246
JX
2956#, c-format
2957msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
2958msgid_plural ""
2959"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
2960msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
2961msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 2962
a0b6b246 2963# 译者:注意保持前导空格
a4f16749 2964#: remote.c:2104
a0b6b246
JX
2965msgid " (use \"git pull\" to update your local branch)\n"
2966msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
c04f5ac3 2967
a4f16749 2968#: remote.c:2107
a0b6b246
JX
2969#, c-format
2970msgid ""
2971"Your branch and '%s' have diverged,\n"
2972"and have %d and %d different commit each, respectively.\n"
2973msgid_plural ""
2974"Your branch and '%s' have diverged,\n"
2975"and have %d and %d different commits each, respectively.\n"
2976msgstr[0] ""
2977"您的分支和 '%s' 出现了偏离,\n"
2978"并且分别有 %d 和 %d 处不同的提交。\n"
2979msgstr[1] ""
2980"您的分支和 '%s' 出现了偏离,\n"
2981"并且分别有 %d 和 %d 处不同的提交。\n"
90314792 2982
a0b6b246 2983# 译者:注意保持前导空格
a4f16749 2984#: remote.c:2117
a0b6b246
JX
2985msgid " (use \"git pull\" to merge the remote branch into yours)\n"
2986msgstr " (使用 \"git pull\" 来合并远程分支)\n"
90314792 2987
6937cb4e 2988#: revision.c:2256
a0b6b246
JX
2989msgid "your current branch appears to be broken"
2990msgstr "您的当前分支好像被损坏"
cfff71a9 2991
6937cb4e 2992#: revision.c:2259
a0b6b246
JX
2993#, c-format
2994msgid "your current branch '%s' does not have any commits yet"
2995msgstr "您的当前分支 '%s' 尚无任何提交"
6792b93b 2996
6937cb4e 2997#: revision.c:2453
a0b6b246
JX
2998msgid "--first-parent is incompatible with --bisect"
2999msgstr "--first-parent 与 --bisect 不兼容"
6792b93b 3000
a4f16749 3001#: run-command.c:644
a0b6b246
JX
3002msgid "open /dev/null failed"
3003msgstr "不能打开 /dev/null"
5c57d762 3004
a4f16749 3005#: send-pack.c:151
87cb7997
JX
3006#, c-format
3007msgid "unable to parse remote unpack status: %s"
3008msgstr "不能解析远程解包状态:%s"
3009
a4f16749 3010#: send-pack.c:153
87cb7997
JX
3011#, c-format
3012msgid "remote unpack failed: %s"
3013msgstr "远程解包失败:%s"
3014
a4f16749 3015#: send-pack.c:316
a0b6b246
JX
3016msgid "failed to sign the push certificate"
3017msgstr "无法为推送证书签名"
6792b93b 3018
a4f16749 3019#: send-pack.c:429
a0b6b246
JX
3020msgid "the receiving end does not support --signed push"
3021msgstr "接收端不支持签名推送"
6792b93b 3022
a4f16749 3023#: send-pack.c:431
a0b6b246
JX
3024msgid ""
3025"not sending a push certificate since the receiving end does not support --"
3026"signed push"
3027msgstr "未发送推送证书,因为接收端不支持签名推送"
6792b93b 3028
a4f16749 3029#: send-pack.c:443
a0b6b246
JX
3030msgid "the receiving end does not support --atomic push"
3031msgstr "接收端不支持原子推送"
6792b93b 3032
a4f16749 3033#: send-pack.c:448
a0b6b246
JX
3034msgid "the receiving end does not support push options"
3035msgstr "接收端不支持推送选项"
6792b93b 3036
6937cb4e 3037#: sequencer.c:218
a0b6b246
JX
3038msgid "revert"
3039msgstr "还原"
6792b93b 3040
6937cb4e 3041#: sequencer.c:220
a0b6b246
JX
3042msgid "cherry-pick"
3043msgstr "拣选"
3044
6937cb4e 3045#: sequencer.c:222
1a79b2f1
JX
3046msgid "rebase -i"
3047msgstr "rebase -i"
3048
6937cb4e 3049#: sequencer.c:224
1a79b2f1
JX
3050#, c-format
3051msgid "Unknown action: %d"
3052msgstr "未知动作:%d"
3053
6937cb4e 3054#: sequencer.c:281
a0b6b246
JX
3055msgid ""
3056"after resolving the conflicts, mark the corrected paths\n"
3057"with 'git add <paths>' or 'git rm <paths>'"
3058msgstr ""
3059"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
3060"命令标记修正后的文件"
3061
6937cb4e 3062#: sequencer.c:284
a0b6b246
JX
3063msgid ""
3064"after resolving the conflicts, mark the corrected paths\n"
3065"with 'git add <paths>' or 'git rm <paths>'\n"
3066"and commit the result with 'git commit'"
3067msgstr ""
3068"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
3069"对修正后的文件做标记,然后用 'git commit' 提交"
1b7f4a34 3070
6937cb4e 3071#: sequencer.c:297 sequencer.c:1704
1b7f4a34 3072#, c-format
a0b6b246
JX
3073msgid "could not lock '%s'"
3074msgstr "不能锁定 '%s'"
1b7f4a34 3075
6937cb4e
JX
3076#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
3077#: sequencer.c:2733 sequencer.c:2749
1b7f4a34 3078#, c-format
a0b6b246
JX
3079msgid "could not write to '%s'"
3080msgstr "不能写入 '%s'"
1b7f4a34 3081
6937cb4e 3082#: sequencer.c:304
a0b6b246 3083#, c-format
72351d7d 3084msgid "could not write eol to '%s'"
a0b6b246 3085msgstr "不能将换行符写入 '%s'"
1b7f4a34 3086
6937cb4e 3087#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
1b7f4a34 3088#, c-format
a0b6b246
JX
3089msgid "failed to finalize '%s'."
3090msgstr "无法完成 '%s'。"
1b7f4a34 3091
6937cb4e
JX
3092#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
3093#: builtin/commit.c:754 builtin/merge.c:1044
a0b6b246
JX
3094#, c-format
3095msgid "could not read '%s'"
3096msgstr "不能读取 '%s'"
1b7f4a34 3097
6937cb4e 3098#: sequencer.c:358
63af42fe 3099#, c-format
a0b6b246
JX
3100msgid "your local changes would be overwritten by %s."
3101msgstr "您的本地修改将被%s覆盖。"
63af42fe 3102
6937cb4e 3103#: sequencer.c:362
a0b6b246 3104msgid "commit your changes or stash them to proceed."
a4f16749 3105msgstr "提交您的修改或贮藏后再继续。"
6792b93b 3106
6937cb4e 3107#: sequencer.c:391
a0b6b246
JX
3108#, c-format
3109msgid "%s: fast-forward"
3110msgstr "%s:快进"
6792b93b 3111
1a79b2f1 3112#. TRANSLATORS: %s will be "revert", "cherry-pick" or
a4f16749 3113#. "rebase -i".
1a79b2f1 3114#.
6937cb4e 3115#: sequencer.c:474
a0b6b246
JX
3116#, c-format
3117msgid "%s: Unable to write new index file"
3118msgstr "%s:无法写入新索引文件"
6792b93b 3119
6937cb4e 3120#: sequencer.c:493
a0b6b246
JX
3121msgid "could not resolve HEAD commit\n"
3122msgstr "不能解析 HEAD 提交\n"
6792b93b 3123
6937cb4e 3124#: sequencer.c:513
a0b6b246 3125msgid "unable to update cache tree\n"
29004bbb 3126msgstr "不能更新缓存树\n"
6792b93b 3127
6937cb4e 3128#: sequencer.c:597
63af42fe
JX
3129#, c-format
3130msgid ""
a0b6b246
JX
3131"you have staged changes in your working tree\n"
3132"If these changes are meant to be squashed into the previous commit, run:\n"
3133"\n"
3134" git commit --amend %s\n"
3135"\n"
3136"If they are meant to go into a new commit, run:\n"
3137"\n"
3138" git commit %s\n"
3139"\n"
3140"In both cases, once you're done, continue with:\n"
3141"\n"
3142" git rebase --continue\n"
3143msgstr ""
1a79b2f1
JX
3144"您的工作区中存在已暂存的修改\n"
3145"如果这些修改需要被并入前一个提交,执行:\n"
a0b6b246
JX
3146"\n"
3147" git commit --amend %s\n"
3148"\n"
29004bbb 3149"如果这些修改要形成一个新提交,执行:\n"
a0b6b246
JX
3150"\n"
3151" git commit %s\n"
3152"\n"
3153"无论哪种情况,当您完成提交,继续执行:\n"
3154"\n"
3155" git rebase --continue\n"
6792b93b 3156
6937cb4e 3157#: sequencer.c:699
a0b6b246
JX
3158#, c-format
3159msgid "could not parse commit %s\n"
3160msgstr "不能解析提交 %s\n"
6792b93b 3161
6937cb4e 3162#: sequencer.c:704
63af42fe 3163#, c-format
a0b6b246
JX
3164msgid "could not parse parent commit %s\n"
3165msgstr "不能解析父提交 %s\n"
63af42fe 3166
6937cb4e 3167#: sequencer.c:826
1a79b2f1
JX
3168#, c-format
3169msgid ""
3170"unexpected 1st line of squash message:\n"
3171"\n"
3172"\t%.*s"
3173msgstr ""
3174"意外的压缩提交首行提交信息:\n"
3175"\n"
3176"\t%.*s"
3177
6937cb4e 3178#: sequencer.c:832
1a79b2f1
JX
3179#, c-format
3180msgid ""
3181"invalid 1st line of squash message:\n"
3182"\n"
3183"\t%.*s"
3184msgstr ""
3185"压缩提交的首行提交信息无效:\n"
3186"\n"
3187"\t%.*s"
3188
6937cb4e 3189#: sequencer.c:838 sequencer.c:863
1a79b2f1
JX
3190#, c-format
3191msgid "This is a combination of %d commits."
3192msgstr "这是一个 %d 个提交的组合。"
3193
6937cb4e 3194#: sequencer.c:847 sequencer.c:2681
1a79b2f1
JX
3195msgid "need a HEAD to fixup"
3196msgstr "需要一个 HEAD 来修复"
3197
6937cb4e 3198#: sequencer.c:849
1a79b2f1
JX
3199msgid "could not read HEAD"
3200msgstr "不能读取 HEAD"
3201
6937cb4e 3202#: sequencer.c:851
1a79b2f1
JX
3203msgid "could not read HEAD's commit message"
3204msgstr "不能读取 HEAD 的提交说明"
3205
6937cb4e 3206#: sequencer.c:857
1a79b2f1
JX
3207#, c-format
3208msgid "cannot write '%s'"
3209msgstr "不能写 '%s'"
3210
6937cb4e 3211#: sequencer.c:866 git-rebase--interactive.sh:446
1a79b2f1
JX
3212msgid "This is the 1st commit message:"
3213msgstr "这是第一个提交说明:"
3214
6937cb4e 3215#: sequencer.c:874
1a79b2f1
JX
3216#, c-format
3217msgid "could not read commit message of %s"
3218msgstr "不能读取 %s 的提交说明"
3219
6937cb4e 3220#: sequencer.c:881
1a79b2f1
JX
3221#, c-format
3222msgid "This is the commit message #%d:"
3223msgstr "这是提交说明 #%d:"
3224
6937cb4e 3225#: sequencer.c:886
1a79b2f1
JX
3226#, c-format
3227msgid "The commit message #%d will be skipped:"
3228msgstr "提交说明 #%d 将被跳过:"
3229
6937cb4e 3230#: sequencer.c:891
1a79b2f1
JX
3231#, c-format
3232msgid "unknown command: %d"
3233msgstr "未知命令:%d"
3234
6937cb4e 3235#: sequencer.c:957
a0b6b246
JX
3236msgid "your index file is unmerged."
3237msgstr "您的索引文件未完成合并。"
6792b93b 3238
6937cb4e 3239#: sequencer.c:975
a0b6b246
JX
3240#, c-format
3241msgid "commit %s is a merge but no -m option was given."
3242msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
6792b93b 3243
6937cb4e 3244#: sequencer.c:983
a0b6b246
JX
3245#, c-format
3246msgid "commit %s does not have parent %d"
3247msgstr "提交 %s 没有第 %d 个父提交"
3248
6937cb4e 3249#: sequencer.c:987
a0b6b246
JX
3250#, c-format
3251msgid "mainline was specified but commit %s is not a merge."
3252msgstr "指定了主线,但是提交 %s 不是一个合并提交。"
3253
6937cb4e 3254#: sequencer.c:993
1a79b2f1
JX
3255#, c-format
3256msgid "cannot get commit message for %s"
3257msgstr "不能得到 %s 的提交说明"
3258
a0b6b246
JX
3259#. TRANSLATORS: The first %s will be a "todo" command like
3260#. "revert" or "pick", the second %s a SHA1.
6937cb4e 3261#: sequencer.c:1014
a0b6b246
JX
3262#, c-format
3263msgid "%s: cannot parse parent commit %s"
3264msgstr "%s:不能解析父提交 %s"
3265
6937cb4e 3266#: sequencer.c:1077 sequencer.c:1853
a0b6b246 3267#, c-format
1a79b2f1
JX
3268msgid "could not rename '%s' to '%s'"
3269msgstr "不能将 '%s' 重命名为 '%s'"
a0b6b246 3270
6937cb4e 3271#: sequencer.c:1128
a0b6b246
JX
3272#, c-format
3273msgid "could not revert %s... %s"
3274msgstr "不能还原 %s... %s"
3275
6937cb4e 3276#: sequencer.c:1129
a0b6b246
JX
3277#, c-format
3278msgid "could not apply %s... %s"
3279msgstr "不能应用 %s... %s"
3280
6937cb4e 3281#: sequencer.c:1171
a0b6b246
JX
3282msgid "empty commit set passed"
3283msgstr "提供了空的提交集"
3284
6937cb4e 3285#: sequencer.c:1181
a0b6b246
JX
3286#, c-format
3287msgid "git %s: failed to read the index"
3288msgstr "git %s:无法读取索引"
3289
6937cb4e 3290#: sequencer.c:1188
a0b6b246
JX
3291#, c-format
3292msgid "git %s: failed to refresh the index"
3293msgstr "git %s:无法刷新索引"
3294
6937cb4e 3295#: sequencer.c:1308
a0b6b246
JX
3296#, c-format
3297msgid "invalid line %d: %.*s"
3298msgstr "无效行 %d:%.*s"
3299
6937cb4e 3300#: sequencer.c:1316
1a79b2f1
JX
3301#, c-format
3302msgid "cannot '%s' without a previous commit"
3303msgstr "没有父提交的情况下不能 '%s'"
a0b6b246 3304
6937cb4e
JX
3305#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
3306#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
a0b6b246
JX
3307#, c-format
3308msgid "could not read '%s'."
3309msgstr "不能读取 '%s'。"
3310
6937cb4e 3311#: sequencer.c:1361
1a79b2f1
JX
3312msgid "please fix this using 'git rebase --edit-todo'."
3313msgstr "请用 'git rebase --edit-todo' 来修改。"
3314
6937cb4e 3315#: sequencer.c:1363
a0b6b246
JX
3316#, c-format
3317msgid "unusable instruction sheet: '%s'"
29004bbb 3318msgstr "不可用的指令清单:'%s'"
a0b6b246 3319
6937cb4e 3320#: sequencer.c:1368
1a79b2f1
JX
3321msgid "no commits parsed."
3322msgstr "没有解析提交。"
3323
6937cb4e 3324#: sequencer.c:1379
a0b6b246
JX
3325msgid "cannot cherry-pick during a revert."
3326msgstr "不能在回退中执行拣选。"
3327
6937cb4e 3328#: sequencer.c:1381
a0b6b246
JX
3329msgid "cannot revert during a cherry-pick."
3330msgstr "不能在拣选中执行回退。"
3331
6937cb4e 3332#: sequencer.c:1448
a0b6b246
JX
3333#, c-format
3334msgid "invalid key: %s"
3335msgstr "无效键名:%s"
3336
6937cb4e 3337#: sequencer.c:1451
a0b6b246
JX
3338#, c-format
3339msgid "invalid value for %s: %s"
3340msgstr "%s 的值无效:%s"
3341
6937cb4e 3342#: sequencer.c:1517
a0b6b246
JX
3343#, c-format
3344msgid "malformed options sheet: '%s'"
3345msgstr "非法的选项清单:'%s'"
3346
6937cb4e 3347#: sequencer.c:1555
a0b6b246
JX
3348msgid "a cherry-pick or revert is already in progress"
3349msgstr "一个拣选或还原操作已在进行"
3350
6937cb4e 3351#: sequencer.c:1556
a0b6b246
JX
3352msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
3353msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
3354
6937cb4e 3355#: sequencer.c:1559
a0b6b246
JX
3356#, c-format
3357msgid "could not create sequencer directory '%s'"
3358msgstr "不能创建序列目录 '%s'"
3359
6937cb4e 3360#: sequencer.c:1574
a0b6b246
JX
3361msgid "could not lock HEAD"
3362msgstr "不能锁定 HEAD"
3363
6937cb4e 3364#: sequencer.c:1632 sequencer.c:2211
a0b6b246
JX
3365msgid "no cherry-pick or revert in progress"
3366msgstr "拣选或还原操作并未进行"
3367
6937cb4e 3368#: sequencer.c:1634
a0b6b246
JX
3369msgid "cannot resolve HEAD"
3370msgstr "不能解析 HEAD"
3371
6937cb4e 3372#: sequencer.c:1636 sequencer.c:1671
a0b6b246
JX
3373msgid "cannot abort from a branch yet to be born"
3374msgstr "不能从尚未建立的分支终止"
3375
6937cb4e 3376#: sequencer.c:1657 builtin/grep.c:711
a0b6b246
JX
3377#, c-format
3378msgid "cannot open '%s'"
3379msgstr "不能打开 '%s'"
3380
6937cb4e 3381#: sequencer.c:1659
a0b6b246
JX
3382#, c-format
3383msgid "cannot read '%s': %s"
3384msgstr "不能读取 '%s':%s"
3385
6937cb4e 3386#: sequencer.c:1660
a0b6b246
JX
3387msgid "unexpected end of file"
3388msgstr "意外的文件结束"
3389
6937cb4e 3390#: sequencer.c:1666
a0b6b246
JX
3391#, c-format
3392msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
3393msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
3394
6937cb4e 3395#: sequencer.c:1677
1a79b2f1
JX
3396msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
3397msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
3398
6937cb4e 3399#: sequencer.c:1818 sequencer.c:2109
1a79b2f1
JX
3400msgid "cannot read HEAD"
3401msgstr "不能读取 HEAD"
3402
6937cb4e 3403#: sequencer.c:1858 builtin/difftool.c:640
1a79b2f1
JX
3404#, c-format
3405msgid "could not copy '%s' to '%s'"
3406msgstr "不能拷贝 '%s' 至 '%s'"
3407
6937cb4e 3408#: sequencer.c:1874
1a79b2f1
JX
3409msgid "could not read index"
3410msgstr "不能读取索引"
3411
3412# 译者:注意保持前导空格
6937cb4e 3413#: sequencer.c:1879
1a79b2f1
JX
3414#, c-format
3415msgid ""
3416"execution failed: %s\n"
3417"%sYou can fix the problem, and then run\n"
3418"\n"
3419" git rebase --continue\n"
3420"\n"
3421msgstr ""
3422"执行失败:%s\n"
3423"%s您可以改正该问题,然后运行\n"
3424"\n"
3425" git rebase --continue\n"
3426"\n"
3427
6937cb4e 3428#: sequencer.c:1885
1a79b2f1
JX
3429msgid "and made changes to the index and/or the working tree\n"
3430msgstr "并且修改索引和/或工作区\n"
3431
6937cb4e 3432#: sequencer.c:1891
1a79b2f1
JX
3433#, c-format
3434msgid ""
3435"execution succeeded: %s\n"
3436"but left changes to the index and/or the working tree\n"
3437"Commit or stash your changes, and then run\n"
3438"\n"
3439" git rebase --continue\n"
3440"\n"
3441msgstr ""
3442"执行成功:%s\n"
3443"但是在索引和/或工作区中存在变更\n"
a4f16749 3444"提交或贮藏修改,然后运行\n"
1a79b2f1
JX
3445"\n"
3446" git rebase --continue\n"
3447"\n"
3448
6937cb4e 3449#: sequencer.c:1948
1a79b2f1 3450#, c-format
a4f16749
JX
3451msgid "Applied autostash.\n"
3452msgstr "已应用 autostash。\n"
1a79b2f1 3453
6937cb4e 3454#: sequencer.c:1960
1a79b2f1
JX
3455#, c-format
3456msgid "cannot store %s"
3457msgstr "不能存储 %s"
3458
6937cb4e 3459#: sequencer.c:1963 git-rebase.sh:175
1a79b2f1
JX
3460#, c-format
3461msgid ""
3462"Applying autostash resulted in conflicts.\n"
3463"Your changes are safe in the stash.\n"
3464"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
3465msgstr ""
3466"应用 autostash 导致冲突。\n"
a4f16749 3467"您的修改安全地保存在贮藏区中。\n"
1a79b2f1
JX
3468"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
3469
6937cb4e 3470#: sequencer.c:2045
1a79b2f1 3471#, c-format
87cb7997
JX
3472msgid "Stopped at %s... %.*s\n"
3473msgstr "停止在 %s... %.*s\n"
1a79b2f1 3474
6937cb4e 3475#: sequencer.c:2087
1a79b2f1
JX
3476#, c-format
3477msgid "unknown command %d"
3478msgstr "未知命令 %d"
3479
6937cb4e 3480#: sequencer.c:2117
1a79b2f1
JX
3481msgid "could not read orig-head"
3482msgstr "不能读取 orig-head"
3483
6937cb4e 3484#: sequencer.c:2122 sequencer.c:2678
1a79b2f1
JX
3485msgid "could not read 'onto'"
3486msgstr "不能读取 'onto'"
3487
6937cb4e 3488#: sequencer.c:2129
1a79b2f1
JX
3489#, c-format
3490msgid "could not update %s"
3491msgstr "不能更新 %s"
3492
6937cb4e 3493#: sequencer.c:2136
1a79b2f1
JX
3494#, c-format
3495msgid "could not update HEAD to %s"
3496msgstr "不能更新 HEAD 为 %s"
3497
6937cb4e 3498#: sequencer.c:2220
1a79b2f1
JX
3499msgid "cannot rebase: You have unstaged changes."
3500msgstr "不能变基:您有未暂存的变更。"
3501
6937cb4e 3502#: sequencer.c:2225
1a79b2f1
JX
3503msgid "could not remove CHERRY_PICK_HEAD"
3504msgstr "不能删除 CHERRY_PICK_HEAD"
3505
6937cb4e 3506#: sequencer.c:2234
1a79b2f1
JX
3507msgid "cannot amend non-existing commit"
3508msgstr "不能修补不存在的提交"
3509
6937cb4e 3510#: sequencer.c:2236
1a79b2f1
JX
3511#, c-format
3512msgid "invalid file: '%s'"
3513msgstr "无效文件:'%s'"
3514
6937cb4e 3515#: sequencer.c:2238
1a79b2f1
JX
3516#, c-format
3517msgid "invalid contents: '%s'"
3518msgstr "无效内容:'%s'"
3519
6937cb4e 3520#: sequencer.c:2241
1a79b2f1
JX
3521msgid ""
3522"\n"
3523"You have uncommitted changes in your working tree. Please, commit them\n"
3524"first and then run 'git rebase --continue' again."
87cb7997
JX
3525msgstr ""
3526"\n"
3527"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
1a79b2f1 3528
6937cb4e 3529#: sequencer.c:2251
1a79b2f1
JX
3530msgid "could not commit staged changes."
3531msgstr "不能提交暂存的修改。"
3532
6937cb4e 3533#: sequencer.c:2331
a0b6b246
JX
3534#, c-format
3535msgid "%s: can't cherry-pick a %s"
3536msgstr "%s:不能拣选一个%s"
3537
6937cb4e 3538#: sequencer.c:2335
a0b6b246
JX
3539#, c-format
3540msgid "%s: bad revision"
3541msgstr "%s:错误的版本"
3542
6937cb4e 3543#: sequencer.c:2368
a0b6b246
JX
3544msgid "can't revert as initial commit"
3545msgstr "不能作为初始提交回退"
3546
6937cb4e
JX
3547#: sequencer.c:2471
3548msgid "make_script: unhandled options"
3549msgstr "make_script:有未能处理的选项"
3550
3551#: sequencer.c:2474
3552msgid "make_script: error preparing revisions"
3553msgstr "make_script:准备版本时错误"
3554
3555#: sequencer.c:2510
3556#, c-format
3557msgid "unusable todo list: '%s'"
3558msgstr "不可用的待办列表:'%s'"
3559
3560#: sequencer.c:2516
3561#, c-format
3562msgid "unable to open '%s' for writing"
3563msgstr "无法以写入方式打开 '%s'"
3564
3565#: sequencer.c:2561
3566#, c-format
3567msgid ""
3568"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
3569msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
3570
3571#: sequencer.c:2641
3572#, c-format
3573msgid ""
3574"Warning: some commits may have been dropped accidentally.\n"
3575"Dropped commits (newer to older):\n"
3576msgstr ""
3577"警告:一些提交可能被意外丢弃。\n"
3578"丢弃的提交(从新到旧):\n"
3579
3580#: sequencer.c:2648
3581#, c-format
3582msgid ""
3583"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
3584"\n"
3585"Use 'git config rebase.missingCommitsCheck' to change the level of "
3586"warnings.\n"
3587"The possible behaviours are: ignore, warn, error.\n"
3588"\n"
3589msgstr ""
3590"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
3591"\n"
3592"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
3593"可选值有:ignore、warn、error。\n"
3594"\n"
3595
3596#: sequencer.c:2660
3597#, c-format
3598msgid ""
3599"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
3600"continue'.\n"
3601"Or you can abort the rebase with 'git rebase --abort'.\n"
3602msgstr ""
3603"您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n"
3604"或者您可以用 'git rebase --abort' 终止变基。\n"
3605
3606#: sequencer.c:2708
3607#, c-format
3608msgid "could not parse commit '%s'"
3609msgstr "不能解析提交 '%s'"
3610
3611#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
3612#: builtin/am.c:775
3613#, c-format
3614msgid "could not open '%s' for writing"
3615msgstr "无法打开 '%s' 进行写入"
3616
3617#: sequencer.c:2756
3618#, c-format
3619msgid "could not truncate '%s'"
3620msgstr "无法截断 '%s'"
3621
3622#: sequencer.c:2848
3623msgid "the script was already rearranged."
3624msgstr "脚本已经重新编排。"
3625
3626#: sequencer.c:2953
3627#, c-format
3628msgid "could not finish '%s'"
3629msgstr "无法结束 '%s'"
3630
a4f16749 3631#: setup.c:171
a0b6b246 3632#, c-format
6792b93b 3633msgid ""
a0b6b246
JX
3634"%s: no such path in the working tree.\n"
3635"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
3636msgstr ""
3637"%s:工作区中无此路径。\n"
58b6f078 3638"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
6792b93b 3639
a4f16749 3640#: setup.c:184
90314792 3641#, c-format
a0b6b246
JX
3642msgid ""
3643"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
3644"Use '--' to separate paths from revisions, like this:\n"
3645"'git <command> [<revision>...] -- [<file>...]'"
3646msgstr ""
3647"有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
3648"使用 '--' 来分隔版本和路径,例如:\n"
58b6f078 3649"'git <命令> [<版本>...] -- [<文件>...]'"
6792b93b 3650
a4f16749 3651#: setup.c:252
a0b6b246
JX
3652#, c-format
3653msgid ""
3654"ambiguous argument '%s': both revision and filename\n"
3655"Use '--' to separate paths from revisions, like this:\n"
3656"'git <command> [<revision>...] -- [<file>...]'"
3657msgstr ""
3658"有歧义的参数 '%s':可同时是版本和文件\n"
3659"使用 '--' 来分隔版本和路径,例如:\n"
58b6f078 3660"'git <命令> [<版本>...] -- [<文件>...]'"
2e8451e8 3661
6937cb4e 3662#: setup.c:499
a0b6b246
JX
3663#, c-format
3664msgid "Expected git repo version <= %d, found %d"
3665msgstr "期望 git 仓库版本 <= %d,却得到 %d"
6792b93b 3666
6937cb4e 3667#: setup.c:507
a0b6b246
JX
3668msgid "unknown repository extensions found:"
3669msgstr "发现未知的仓库扩展:"
2e8451e8 3670
6937cb4e 3671#: setup.c:806
1003b3a5 3672#, c-format
a0b6b246
JX
3673msgid "Not a git repository (or any of the parent directories): %s"
3674msgstr "不是一个 git 仓库(或者任何父目录):%s"
1003b3a5 3675
6937cb4e 3676#: setup.c:808 builtin/index-pack.c:1653
a0b6b246
JX
3677msgid "Cannot come back to cwd"
3678msgstr "无法返回当前工作目录"
1003b3a5 3679
6937cb4e 3680#: setup.c:1046
a0b6b246
JX
3681msgid "Unable to read current working directory"
3682msgstr "不能读取当前工作目录"
1003b3a5 3683
6937cb4e 3684#: setup.c:1058 setup.c:1064
87cb7997
JX
3685#, c-format
3686msgid "Cannot change to '%s'"
3687msgstr "不能切换到 '%s'"
3688
6937cb4e 3689#: setup.c:1077
a0b6b246
JX
3690#, c-format
3691msgid ""
3692"Not a git repository (or any parent up to mount point %s)\n"
3693"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
3694msgstr ""
3695"不是一个 git 仓库(或者向上递归至挂载点 %s 的任何祖先目录)\n"
3696"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
1003b3a5 3697
6937cb4e 3698#: setup.c:1159
a0b6b246
JX
3699#, c-format
3700msgid ""
3701"Problem with core.sharedRepository filemode value (0%.3o).\n"
3702"The owner of files must always have read and write permissions."
3703msgstr ""
3704"参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n"
3705"文件属主必须始终拥有读写权限。"
6792b93b 3706
6937cb4e 3707#: sha1_file.c:528
a0b6b246
JX
3708#, c-format
3709msgid "path '%s' does not exist"
3710msgstr "路径 '%s' 不存在"
3711
6937cb4e 3712#: sha1_file.c:554
a0b6b246
JX
3713#, c-format
3714msgid "reference repository '%s' as a linked checkout is not supported yet."
3715msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
3716
6937cb4e 3717#: sha1_file.c:560
a0b6b246
JX
3718#, c-format
3719msgid "reference repository '%s' is not a local repository."
3720msgstr "参考仓库 '%s' 不是一个本地仓库。"
3721
6937cb4e 3722#: sha1_file.c:566
a0b6b246
JX
3723#, c-format
3724msgid "reference repository '%s' is shallow"
3725msgstr "参考仓库 '%s' 是一个浅克隆"
3726
6937cb4e 3727#: sha1_file.c:574
a0b6b246
JX
3728#, c-format
3729msgid "reference repository '%s' is grafted"
3730msgstr "参考仓库 '%s' 已被嫁接"
3731
6937cb4e 3732#: sha1_name.c:420
a0b6b246
JX
3733#, c-format
3734msgid "short SHA1 %s is ambiguous"
29004bbb 3735msgstr "短 SHA1 %s 存在歧义"
a0b6b246 3736
6937cb4e 3737#: sha1_name.c:431
a0b6b246
JX
3738msgid "The candidates are:"
3739msgstr "候选者有:"
3740
6937cb4e 3741#: sha1_name.c:590
a0b6b246
JX
3742msgid ""
3743"Git normally never creates a ref that ends with 40 hex characters\n"
3744"because it will be ignored when you just specify 40-hex. These refs\n"
3745"may be created by mistake. For example,\n"
3746"\n"
3747" git checkout -b $br $(git rev-parse ...)\n"
3748"\n"
3749"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
3750"examine these refs and maybe delete them. Turn this message off by\n"
3751"running \"git config advice.objectNameWarning false\""
3752msgstr ""
3753"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
3754"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
3755"\n"
3756" git checkout -b $br $(git rev-parse ...)\n"
3757"\n"
3758"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
3759"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
3760"命令关闭本消息通知。"
3761
6937cb4e 3762#: submodule.c:93 submodule.c:127
a0b6b246
JX
3763msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
3764msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
3765
6937cb4e 3766#: submodule.c:97 submodule.c:131
a0b6b246
JX
3767#, c-format
3768msgid "Could not find section in .gitmodules where path=%s"
3769msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
3770
6937cb4e 3771#: submodule.c:105
a0b6b246
JX
3772#, c-format
3773msgid "Could not update .gitmodules entry %s"
3774msgstr "不能更新 .gitmodules 条目 %s"
3775
6937cb4e 3776#: submodule.c:138
a0b6b246
JX
3777#, c-format
3778msgid "Could not remove .gitmodules entry for %s"
3779msgstr "无法移除 %s 的 .gitmodules 条目"
3780
6937cb4e 3781#: submodule.c:149
a0b6b246
JX
3782msgid "staging updated .gitmodules failed"
3783msgstr "将更新后 .gitmodules 添加暂存区失败"
3784
6937cb4e 3785#: submodule.c:309
a4f16749
JX
3786#, c-format
3787msgid "in unpopulated submodule '%s'"
3788msgstr "位于未检出的子模组 '%s'"
3789
6937cb4e 3790#: submodule.c:340
a4f16749
JX
3791#, c-format
3792msgid "Pathspec '%s' is in submodule '%.*s'"
3793msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
3794
6937cb4e
JX
3795#: submodule.c:799
3796#, c-format
3797msgid "submodule entry '%s' (%s) is a %s, not a commit"
493a9322 3798msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交"
6937cb4e
JX
3799
3800#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
3801msgid "Failed to resolve HEAD as a valid ref."
3802msgstr "无法将 HEAD 解析为有效引用。"
3803
3804#: submodule.c:1304
1a79b2f1 3805#, c-format
87cb7997 3806msgid "'%s' not recognized as a git repository"
65e2041e 3807msgstr "无法将 '%s' 识别为一个 git 仓库"
1a79b2f1 3808
6937cb4e 3809#: submodule.c:1442
1a79b2f1 3810#, c-format
87cb7997
JX
3811msgid "could not start 'git status' in submodule '%s'"
3812msgstr "无法在子模组 '%s' 中启动 'git status'"
1a79b2f1 3813
6937cb4e 3814#: submodule.c:1455
87cb7997
JX
3815#, c-format
3816msgid "could not run 'git status' in submodule '%s'"
3817msgstr "无法在子模组 '%s' 中执行 'git status'"
3818
6937cb4e 3819#: submodule.c:1548
87cb7997
JX
3820#, c-format
3821msgid "submodule '%s' has dirty index"
3822msgstr "子模组 '%s' 中有脏索引"
3823
6937cb4e 3824#: submodule.c:1809
1a79b2f1
JX
3825#, c-format
3826msgid ""
3827"relocate_gitdir for submodule '%s' with more than one worktree not supported"
3828msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
3829
6937cb4e 3830#: submodule.c:1821 submodule.c:1877
1a79b2f1
JX
3831#, c-format
3832msgid "could not lookup name for submodule '%s'"
3833msgstr "不能查询子模组 '%s' 的名称"
3834
6937cb4e
JX
3835#: submodule.c:1825 builtin/submodule--helper.c:671
3836#: builtin/submodule--helper.c:681
1a79b2f1
JX
3837#, c-format
3838msgid "could not create directory '%s'"
3839msgstr "不能创建目录 '%s'"
3840
6937cb4e 3841#: submodule.c:1828
1a79b2f1
JX
3842#, c-format
3843msgid ""
3844"Migrating git directory of '%s%s' from\n"
3845"'%s' to\n"
3846"'%s'\n"
3847msgstr ""
3848"将 '%s%s' 的 git 目录从\n"
3849"'%s' 迁移至\n"
3850"'%s'\n"
3851
6937cb4e 3852#: submodule.c:1912
1a79b2f1
JX
3853#, c-format
3854msgid "could not recurse into submodule '%s'"
3855msgstr "无法递归进子模组路径 '%s'"
3856
6937cb4e 3857#: submodule.c:1956
87cb7997
JX
3858msgid "could not start ls-files in .."
3859msgstr "无法在 .. 中启动 ls-files"
3860
6937cb4e 3861#: submodule.c:1976
87cb7997
JX
3862msgid "BUG: returned path string doesn't match cwd?"
3863msgstr "BUG:返回的路径和当前路径不匹配?"
3864
6937cb4e 3865#: submodule.c:1995
87cb7997
JX
3866#, c-format
3867msgid "ls-tree returned unexpected return code %d"
3868msgstr "ls-tree 返回未知返回值 %d"
3869
6937cb4e
JX
3870#: submodule-config.c:263
3871msgid "negative values not allowed for submodule.fetchjobs"
3872msgstr "submodule.fetchjobs 不允许为负值"
3873
3874#: submodule-config.c:436
a0b6b246
JX
3875#, c-format
3876msgid "invalid value for %s"
3877msgstr "%s 的值无效"
3878
6937cb4e 3879#: trailer.c:238
a0b6b246
JX
3880#, c-format
3881msgid "running trailer command '%s' failed"
3882msgstr "执行 trailer 命令 '%s' 失败"
3883
6937cb4e
JX
3884#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
3885#: trailer.c:557
a0b6b246
JX
3886#, c-format
3887msgid "unknown value '%s' for key '%s'"
3888msgstr "键 '%2$s' 的未知取值 '%1$s'"
3889
6937cb4e 3890#: trailer.c:539 trailer.c:544 builtin/remote.c:290
a0b6b246
JX
3891#, c-format
3892msgid "more than one %s"
3893msgstr "多于一个 %s"
3894
6937cb4e 3895#: trailer.c:730
a0b6b246
JX
3896#, c-format
3897msgid "empty trailer token in trailer '%.*s'"
3898msgstr "签名 '%.*s' 的键为空"
3899
6937cb4e 3900#: trailer.c:750
a0b6b246
JX
3901#, c-format
3902msgid "could not read input file '%s'"
3903msgstr "不能读取输入文件 '%s'"
3904
6937cb4e 3905#: trailer.c:753
a0b6b246
JX
3906msgid "could not read from stdin"
3907msgstr "不能自标准输入读取"
3908
6937cb4e 3909#: trailer.c:1008 builtin/am.c:46
a0b6b246
JX
3910#, c-format
3911msgid "could not stat %s"
65e2041e 3912msgstr "不能对 %s 调用 stat"
a0b6b246 3913
6937cb4e 3914#: trailer.c:1010
a0b6b246
JX
3915#, c-format
3916msgid "file %s is not a regular file"
3917msgstr "文件 %s 不是一个正规文件"
3918
6937cb4e 3919#: trailer.c:1012
a0b6b246
JX
3920#, c-format
3921msgid "file %s is not writable by user"
3922msgstr "文件 %s 用户不可写"
3923
6937cb4e 3924#: trailer.c:1024
a0b6b246
JX
3925msgid "could not open temporary file"
3926msgstr "不能打开临时文件"
3927
6937cb4e 3928#: trailer.c:1064
a0b6b246
JX
3929#, c-format
3930msgid "could not rename temporary file to %s"
3931msgstr "不能重命名临时文件为 %s"
3932
6937cb4e 3933#: transport.c:62
a0b6b246
JX
3934#, c-format
3935msgid "Would set upstream of '%s' to '%s' of '%s'\n"
3936msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
3937
6937cb4e 3938#: transport.c:151
a0b6b246
JX
3939#, c-format
3940msgid "transport: invalid depth option '%s'"
3941msgstr "传输:无效的深度选项 '%s'"
3942
6937cb4e 3943#: transport.c:888
a0b6b246
JX
3944#, c-format
3945msgid ""
3946"The following submodule paths contain changes that can\n"
3947"not be found on any remote:\n"
3948msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
3949
6937cb4e 3950#: transport.c:892
a0b6b246
JX
3951#, c-format
3952msgid ""
3953"\n"
3954"Please try\n"
3955"\n"
3956"\tgit push --recurse-submodules=on-demand\n"
3957"\n"
3958"or cd to the path and use\n"
3959"\n"
3960"\tgit push\n"
3961"\n"
3962"to push them to a remote.\n"
3963"\n"
3964msgstr ""
3965"\n"
3966"请尝试\n"
3967"\n"
3968"\tgit push --recurse-submodules=on-demand\n"
3969"\n"
3970"或者进入到子目录执行\n"
3971"\n"
3972"\tgit push\n"
3973"\n"
3974"以推送至远程。\n"
3975"\n"
3976
6937cb4e 3977#: transport.c:900
a0b6b246
JX
3978msgid "Aborting."
3979msgstr "正在终止。"
3980
a4f16749 3981#: transport-helper.c:1071
a0b6b246
JX
3982#, c-format
3983msgid "Could not read ref %s"
3984msgstr "不能读取引用 %s"
3985
3986#: tree-walk.c:31
3987msgid "too-short tree object"
3988msgstr "太短的树对象"
3989
3990#: tree-walk.c:37
3991msgid "malformed mode in tree entry"
29004bbb 3992msgstr "树对象中的条目模式错误"
a0b6b246
JX
3993
3994#: tree-walk.c:41
3995msgid "empty filename in tree entry"
3996msgstr "树对象条目中空的文件名"
3997
6937cb4e 3998#: tree-walk.c:114
a0b6b246
JX
3999msgid "too-short tree file"
4000msgstr "太短的树文件"
4001
6937cb4e 4002#: unpack-trees.c:106
a0b6b246
JX
4003#, c-format
4004msgid ""
4005"Your local changes to the following files would be overwritten by checkout:\n"
4006"%%sPlease commit your changes or stash them before you switch branches."
4007msgstr ""
4008"您对下列文件的本地修改将被检出操作覆盖:\n"
a4f16749 4009"%%s请在切换分支前提交或贮藏您的修改。"
a0b6b246 4010
6937cb4e 4011#: unpack-trees.c:108
a0b6b246
JX
4012#, c-format
4013msgid ""
4014"Your local changes to the following files would be overwritten by checkout:\n"
4015"%%s"
4016msgstr ""
4017"您对下列文件的本地修改将被检出操作覆盖:\n"
4018"%%s"
4019
6937cb4e 4020#: unpack-trees.c:111
a0b6b246
JX
4021#, c-format
4022msgid ""
4023"Your local changes to the following files would be overwritten by merge:\n"
4024"%%sPlease commit your changes or stash them before you merge."
4025msgstr ""
4026"您对下列文件的本地修改将被合并操作覆盖:\n"
a4f16749 4027"%%s请在合并前提交或贮藏您的修改。"
a0b6b246 4028
6937cb4e 4029#: unpack-trees.c:113
a0b6b246
JX
4030#, c-format
4031msgid ""
4032"Your local changes to the following files would be overwritten by merge:\n"
4033"%%s"
4034msgstr ""
4035"您对下列文件的本地修改将被合并操作覆盖:\n"
4036"%%s"
4037
6937cb4e 4038#: unpack-trees.c:116
a0b6b246
JX
4039#, c-format
4040msgid ""
4041"Your local changes to the following files would be overwritten by %s:\n"
4042"%%sPlease commit your changes or stash them before you %s."
4043msgstr ""
4044"您对下列文件的本地修改将被 %s 覆盖:\n"
a4f16749 4045"%%s请在 %s 之前提交或贮藏您的修改。"
6792b93b 4046
6937cb4e 4047#: unpack-trees.c:118
a0b6b246
JX
4048#, c-format
4049msgid ""
4050"Your local changes to the following files would be overwritten by %s:\n"
4051"%%s"
4052msgstr ""
4053"您对下列文件的本地修改将被 %s 覆盖:\n"
4054"%%s"
c04f5ac3 4055
6937cb4e 4056#: unpack-trees.c:123
a0b6b246
JX
4057#, c-format
4058msgid ""
1a79b2f1 4059"Updating the following directories would lose untracked files in them:\n"
a0b6b246
JX
4060"%s"
4061msgstr ""
4062"更新如下目录将会丢失其中未跟踪的文件:\n"
4063"%s"
1b7f4a34 4064
6937cb4e 4065#: unpack-trees.c:127
a0b6b246
JX
4066#, c-format
4067msgid ""
4068"The following untracked working tree files would be removed by checkout:\n"
4069"%%sPlease move or remove them before you switch branches."
4070msgstr ""
4071"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
4072"%%s请在切换分支之前移动或删除。"
2e8451e8 4073
6937cb4e 4074#: unpack-trees.c:129
a0b6b246
JX
4075#, c-format
4076msgid ""
4077"The following untracked working tree files would be removed by checkout:\n"
4078"%%s"
4079msgstr ""
4080"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
4081"%%s"
1003b3a5 4082
6937cb4e 4083#: unpack-trees.c:132
a0b6b246
JX
4084#, c-format
4085msgid ""
4086"The following untracked working tree files would be removed by merge:\n"
4087"%%sPlease move or remove them before you merge."
4088msgstr ""
4089"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
4090"%%s请在合并前移动或删除。"
1003b3a5 4091
6937cb4e 4092#: unpack-trees.c:134
a0b6b246
JX
4093#, c-format
4094msgid ""
4095"The following untracked working tree files would be removed by merge:\n"
4096"%%s"
4097msgstr ""
4098"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
4099"%%s"
c04f5ac3 4100
6937cb4e 4101#: unpack-trees.c:137
a0b6b246
JX
4102#, c-format
4103msgid ""
4104"The following untracked working tree files would be removed by %s:\n"
4105"%%sPlease move or remove them before you %s."
4106msgstr ""
4107"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
4108"%%s请在 %s 前移动或删除。"
c04f5ac3 4109
6937cb4e 4110#: unpack-trees.c:139
a0b6b246
JX
4111#, c-format
4112msgid ""
4113"The following untracked working tree files would be removed by %s:\n"
4114"%%s"
4115msgstr ""
4116"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
4117"%%s"
c04f5ac3 4118
6937cb4e 4119#: unpack-trees.c:144
a0b6b246
JX
4120#, c-format
4121msgid ""
4122"The following untracked working tree files would be overwritten by "
4123"checkout:\n"
4124"%%sPlease move or remove them before you switch branches."
4125msgstr ""
4126"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
4127"%%s请在切换分支前移动或删除。"
c04f5ac3 4128
6937cb4e 4129#: unpack-trees.c:146
1003b3a5 4130#, c-format
4dcdc3d8 4131msgid ""
a0b6b246
JX
4132"The following untracked working tree files would be overwritten by "
4133"checkout:\n"
4134"%%s"
4dcdc3d8 4135msgstr ""
a0b6b246
JX
4136"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
4137"%%s"
1003b3a5 4138
6937cb4e 4139#: unpack-trees.c:149
c04f5ac3 4140#, c-format
a0b6b246
JX
4141msgid ""
4142"The following untracked working tree files would be overwritten by merge:\n"
4143"%%sPlease move or remove them before you merge."
4144msgstr ""
4145"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
4146"%%s请在合并前移动或删除。"
c04f5ac3 4147
6937cb4e 4148#: unpack-trees.c:151
a0b6b246
JX
4149#, c-format
4150msgid ""
4151"The following untracked working tree files would be overwritten by merge:\n"
4152"%%s"
4153msgstr ""
4154"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
4155"%%s"
c04f5ac3 4156
6937cb4e 4157#: unpack-trees.c:154
a0b6b246
JX
4158#, c-format
4159msgid ""
4160"The following untracked working tree files would be overwritten by %s:\n"
4161"%%sPlease move or remove them before you %s."
4162msgstr ""
4163"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
4164"%%s请在 %s 前移动或删除。"
c04f5ac3 4165
6937cb4e 4166#: unpack-trees.c:156
07432cef 4167#, c-format
a0b6b246
JX
4168msgid ""
4169"The following untracked working tree files would be overwritten by %s:\n"
4170"%%s"
4171msgstr ""
4172"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
4173"%%s"
c04f5ac3 4174
6937cb4e 4175#: unpack-trees.c:163
07432cef 4176#, c-format
a0b6b246
JX
4177msgid "Entry '%s' overlaps with '%s'. Cannot bind."
4178msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
c04f5ac3 4179
6937cb4e 4180#: unpack-trees.c:166
07432cef 4181#, c-format
ef317cd5 4182msgid ""
6937cb4e 4183"Cannot update sparse checkout: the following entries are not up to date:\n"
a0b6b246
JX
4184"%s"
4185msgstr ""
4186"无法更新稀疏检出:如下条目不是最新:\n"
4187"%s"
c04f5ac3 4188
6937cb4e 4189#: unpack-trees.c:168
07432cef 4190#, c-format
a0b6b246
JX
4191msgid ""
4192"The following working tree files would be overwritten by sparse checkout "
4193"update:\n"
4194"%s"
4195msgstr ""
4196"工作区中下列文件将被稀疏检出更新所覆盖:\n"
4197"%s"
c04f5ac3 4198
6937cb4e 4199#: unpack-trees.c:170
07432cef 4200#, c-format
a0b6b246
JX
4201msgid ""
4202"The following working tree files would be removed by sparse checkout "
4203"update:\n"
4204"%s"
4205msgstr ""
4206"工作区中下列文件将被稀疏检出更新所删除:\n"
4207"%s"
c04f5ac3 4208
6937cb4e 4209#: unpack-trees.c:172
87cb7997
JX
4210#, c-format
4211msgid ""
4212"Cannot update submodule:\n"
4213"%s"
4214msgstr ""
4215"无法更新子模组:\n"
4216"%s"
4217
6937cb4e 4218#: unpack-trees.c:249
07432cef 4219#, c-format
a0b6b246
JX
4220msgid "Aborting\n"
4221msgstr "终止中\n"
ef317cd5 4222
6937cb4e 4223#: unpack-trees.c:331
a0b6b246
JX
4224msgid "Checking out files"
4225msgstr "正在检出文件"
c04f5ac3 4226
87cb7997 4227#: urlmatch.c:163
a0b6b246
JX
4228msgid "invalid URL scheme name or missing '://' suffix"
4229msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
4230
87cb7997 4231#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
07432cef 4232#, c-format
a0b6b246
JX
4233msgid "invalid %XX escape sequence"
4234msgstr "无效的 %XX 转义序列"
c04f5ac3 4235
87cb7997 4236#: urlmatch.c:215
a0b6b246
JX
4237msgid "missing host and scheme is not 'file:'"
4238msgstr "缺失主机名且 URL 方案不是 'file:'"
c04f5ac3 4239
87cb7997 4240#: urlmatch.c:232
a0b6b246
JX
4241msgid "a 'file:' URL may not have a port number"
4242msgstr "一个 'file:' URL 不应该包含端口号"
94550ed3 4243
87cb7997 4244#: urlmatch.c:247
a0b6b246
JX
4245msgid "invalid characters in host name"
4246msgstr "主机名中包含无效的字符"
90314792 4247
87cb7997 4248#: urlmatch.c:292 urlmatch.c:303
a0b6b246
JX
4249msgid "invalid port number"
4250msgstr "无效的端口号"
c04f5ac3 4251
87cb7997 4252#: urlmatch.c:371
a0b6b246
JX
4253msgid "invalid '..' path segment"
4254msgstr "无效的 '..' 路径片段"
5c0c220c 4255
a4f16749 4256#: worktree.c:245
a77c07d9 4257#, c-format
a0b6b246
JX
4258msgid "failed to read '%s'"
4259msgstr "无法读取 '%s'"
ef317cd5 4260
a4f16749 4261#: wrapper.c:223 wrapper.c:393
c04f5ac3 4262#, c-format
a0b6b246
JX
4263msgid "could not open '%s' for reading and writing"
4264msgstr "无法打开 '%s' 进行读写"
c04f5ac3 4265
6937cb4e
JX
4266#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
4267#: builtin/am.c:858 builtin/merge.c:1041
c04f5ac3 4268#, c-format
a0b6b246
JX
4269msgid "could not open '%s' for reading"
4270msgstr "无法打开 '%s' 进行读取"
c04f5ac3 4271
a4f16749 4272#: wrapper.c:424 wrapper.c:624
a0b6b246
JX
4273#, c-format
4274msgid "unable to access '%s'"
4275msgstr "不能访问 '%s'"
c04f5ac3 4276
a4f16749 4277#: wrapper.c:632
a0b6b246
JX
4278msgid "unable to get current working directory"
4279msgstr "不能获取当前工作目录"
c04f5ac3 4280
a4f16749 4281#: wrapper.c:656
c04f5ac3 4282#, c-format
a0b6b246
JX
4283msgid "could not write to %s"
4284msgstr "不能写入 %s"
c04f5ac3 4285
a4f16749 4286#: wrapper.c:658
a0b6b246
JX
4287#, c-format
4288msgid "could not close %s"
4289msgstr "不能关闭 %s"
c04f5ac3 4290
6937cb4e 4291#: wt-status.c:150
a0b6b246
JX
4292msgid "Unmerged paths:"
4293msgstr "未合并的路径:"
7aea43ff 4294
a0b6b246 4295# 译者:注意保持前导空格
6937cb4e 4296#: wt-status.c:177 wt-status.c:204
c04f5ac3 4297#, c-format
a0b6b246
JX
4298msgid " (use \"git reset %s <file>...\" to unstage)"
4299msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
c04f5ac3 4300
a0b6b246 4301# 译者:注意保持前导空格
6937cb4e 4302#: wt-status.c:179 wt-status.c:206
a0b6b246
JX
4303msgid " (use \"git rm --cached <file>...\" to unstage)"
4304msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
c04f5ac3 4305
a0b6b246 4306# 译者:注意保持前导空格
6937cb4e 4307#: wt-status.c:183
a0b6b246
JX
4308msgid " (use \"git add <file>...\" to mark resolution)"
4309msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
8ada9598 4310
a0b6b246 4311# 译者:注意保持前导空格
6937cb4e 4312#: wt-status.c:185 wt-status.c:189
a0b6b246
JX
4313msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
4314msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
8ada9598 4315
a0b6b246 4316# 译者:注意保持前导空格
6937cb4e 4317#: wt-status.c:187
a0b6b246
JX
4318msgid " (use \"git rm <file>...\" to mark resolution)"
4319msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
ef317cd5 4320
6937cb4e 4321#: wt-status.c:198 wt-status.c:979
a0b6b246
JX
4322msgid "Changes to be committed:"
4323msgstr "要提交的变更:"
ef317cd5 4324
6937cb4e 4325#: wt-status.c:216 wt-status.c:988
a0b6b246
JX
4326msgid "Changes not staged for commit:"
4327msgstr "尚未暂存以备提交的变更:"
ef317cd5 4328
a0b6b246 4329# 译者:注意保持前导空格
6937cb4e 4330#: wt-status.c:220
a0b6b246
JX
4331msgid " (use \"git add <file>...\" to update what will be committed)"
4332msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
ef317cd5 4333
a0b6b246 4334# 译者:注意保持前导空格
6937cb4e 4335#: wt-status.c:222
a0b6b246
JX
4336msgid " (use \"git add/rm <file>...\" to update what will be committed)"
4337msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
ef317cd5 4338
a0b6b246 4339# 译者:注意保持前导空格
6937cb4e 4340#: wt-status.c:223
a0b6b246
JX
4341msgid ""
4342" (use \"git checkout -- <file>...\" to discard changes in working directory)"
4343msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
ef317cd5 4344
a0b6b246 4345# 译者:注意保持前导空格
6937cb4e 4346#: wt-status.c:225
a0b6b246
JX
4347msgid " (commit or discard the untracked or modified content in submodules)"
4348msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
ef317cd5 4349
a0b6b246 4350# 译者:注意保持前导空格
6937cb4e 4351#: wt-status.c:237
a0b6b246
JX
4352#, c-format
4353msgid " (use \"git %s <file>...\" to include in what will be committed)"
4354msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
ef317cd5 4355
6937cb4e 4356#: wt-status.c:252
a0b6b246
JX
4357msgid "both deleted:"
4358msgstr "双方删除:"
ef317cd5 4359
6937cb4e 4360#: wt-status.c:254
a0b6b246
JX
4361msgid "added by us:"
4362msgstr "由我们添加:"
4dcdc3d8 4363
6937cb4e 4364#: wt-status.c:256
a0b6b246
JX
4365msgid "deleted by them:"
4366msgstr "由他们删除:"
ef317cd5 4367
6937cb4e 4368#: wt-status.c:258
a0b6b246
JX
4369msgid "added by them:"
4370msgstr "由他们添加:"
ef317cd5 4371
6937cb4e 4372#: wt-status.c:260
a0b6b246
JX
4373msgid "deleted by us:"
4374msgstr "由我们删除:"
ef317cd5 4375
6937cb4e 4376#: wt-status.c:262
a0b6b246
JX
4377msgid "both added:"
4378msgstr "双方添加:"
5c57d762 4379
6937cb4e 4380#: wt-status.c:264
a0b6b246
JX
4381msgid "both modified:"
4382msgstr "双方修改:"
5c57d762 4383
6937cb4e 4384#: wt-status.c:274
a0b6b246
JX
4385msgid "new file:"
4386msgstr "新文件:"
8ada9598 4387
6937cb4e 4388#: wt-status.c:276
a0b6b246
JX
4389msgid "copied:"
4390msgstr "拷贝:"
8ada9598 4391
6937cb4e 4392#: wt-status.c:278
a0b6b246
JX
4393msgid "deleted:"
4394msgstr "删除:"
8ada9598 4395
6937cb4e 4396#: wt-status.c:280
a0b6b246
JX
4397msgid "modified:"
4398msgstr "修改:"
8ada9598 4399
6937cb4e 4400#: wt-status.c:282
a0b6b246
JX
4401msgid "renamed:"
4402msgstr "重命名:"
5c57d762 4403
6937cb4e 4404#: wt-status.c:284
a0b6b246
JX
4405msgid "typechange:"
4406msgstr "类型变更:"
8ada9598 4407
6937cb4e 4408#: wt-status.c:286
a0b6b246
JX
4409msgid "unknown:"
4410msgstr "未知:"
8ada9598 4411
6937cb4e 4412#: wt-status.c:288
a0b6b246
JX
4413msgid "unmerged:"
4414msgstr "未合并:"
8ada9598 4415
a0b6b246 4416# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6937cb4e 4417#: wt-status.c:370
a0b6b246
JX
4418msgid "new commits, "
4419msgstr "新提交, "
8ada9598 4420
a0b6b246 4421# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6937cb4e 4422#: wt-status.c:372
a0b6b246
JX
4423msgid "modified content, "
4424msgstr "修改的内容, "
1b7f4a34 4425
a0b6b246 4426# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6937cb4e 4427#: wt-status.c:374
a0b6b246
JX
4428msgid "untracked content, "
4429msgstr "未跟踪的内容, "
1b7f4a34 4430
6937cb4e 4431#: wt-status.c:819
a4f16749
JX
4432#, c-format
4433msgid "Your stash currently has %d entry"
4434msgid_plural "Your stash currently has %d entries"
4435msgstr[0] "您的贮藏区当前有 %d 条记录"
4436msgstr[1] "您的贮藏区当前有 %d 条记录"
4437
6937cb4e 4438#: wt-status.c:851
a0b6b246
JX
4439msgid "Submodules changed but not updated:"
4440msgstr "子模组已修改但尚未更新:"
1b7f4a34 4441
6937cb4e 4442#: wt-status.c:853
a0b6b246
JX
4443msgid "Submodule changes to be committed:"
4444msgstr "要提交的子模组变更:"
1b7f4a34 4445
6937cb4e 4446#: wt-status.c:935
a0b6b246 4447msgid ""
6937cb4e
JX
4448"Do not modify or remove the line above.\n"
4449"Everything below it will be ignored."
a0b6b246 4450msgstr ""
6937cb4e
JX
4451"不要改动或删除上面的一行。\n"
4452"其下所有内容都将被忽略。"
1b7f4a34 4453
6937cb4e 4454#: wt-status.c:1048
a0b6b246
JX
4455msgid "You have unmerged paths."
4456msgstr "您有尚未合并的路径。"
1b7f4a34 4457
a0b6b246 4458# 译者:注意保持前导空格
6937cb4e 4459#: wt-status.c:1051
a0b6b246
JX
4460msgid " (fix conflicts and run \"git commit\")"
4461msgstr " (解决冲突并运行 \"git commit\")"
1b7f4a34 4462
a0b6b246 4463# 译者:注意保持前导空格
6937cb4e 4464#: wt-status.c:1053
a0b6b246
JX
4465msgid " (use \"git merge --abort\" to abort the merge)"
4466msgstr " (使用 \"git merge --abort\" 终止合并)"
1b7f4a34 4467
6937cb4e 4468#: wt-status.c:1058
a0b6b246
JX
4469msgid "All conflicts fixed but you are still merging."
4470msgstr "所有冲突已解决但您仍处于合并中。"
1b7f4a34 4471
a0b6b246 4472# 译者:注意保持前导空格
6937cb4e 4473#: wt-status.c:1061
a0b6b246
JX
4474msgid " (use \"git commit\" to conclude merge)"
4475msgstr " (使用 \"git commit\" 结束合并)"
1b7f4a34 4476
6937cb4e 4477#: wt-status.c:1071
a0b6b246
JX
4478msgid "You are in the middle of an am session."
4479msgstr "您正处于 am 操作过程中。"
1b7f4a34 4480
6937cb4e 4481#: wt-status.c:1074
a0b6b246
JX
4482msgid "The current patch is empty."
4483msgstr "当前的补丁为空。"
1b7f4a34 4484
a0b6b246 4485# 译者:注意保持前导空格
6937cb4e 4486#: wt-status.c:1078
a0b6b246
JX
4487msgid " (fix conflicts and then run \"git am --continue\")"
4488msgstr " (解决冲突,然后运行 \"git am --continue\")"
1b7f4a34 4489
a0b6b246 4490# 译者:注意保持前导空格
6937cb4e 4491#: wt-status.c:1080
a0b6b246
JX
4492msgid " (use \"git am --skip\" to skip this patch)"
4493msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1b7f4a34 4494
a0b6b246 4495# 译者:注意保持前导空格
6937cb4e 4496#: wt-status.c:1082
a0b6b246
JX
4497msgid " (use \"git am --abort\" to restore the original branch)"
4498msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1b7f4a34 4499
a4f16749 4500#: wt-status.c:1214
1a79b2f1
JX
4501msgid "git-rebase-todo is missing."
4502msgstr "git-rebase-todo 丢失。"
4503
a4f16749 4504#: wt-status.c:1216
a0b6b246
JX
4505msgid "No commands done."
4506msgstr "没有命令被执行。"
4507
a4f16749 4508#: wt-status.c:1219
1b7f4a34 4509#, c-format
a0b6b246
JX
4510msgid "Last command done (%d command done):"
4511msgid_plural "Last commands done (%d commands done):"
4512msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
4513msgstr[1] "最后的命令已完成(%d 条命令被执行):"
1b7f4a34 4514
a4f16749 4515#: wt-status.c:1230
1b7f4a34 4516#, c-format
a0b6b246
JX
4517msgid " (see more in file %s)"
4518msgstr " (更多参见文件 %s)"
4519
a4f16749 4520#: wt-status.c:1235
a0b6b246
JX
4521msgid "No commands remaining."
4522msgstr "未剩下任何命令。"
1b7f4a34 4523
a4f16749 4524#: wt-status.c:1238
1b7f4a34 4525#, c-format
a0b6b246
JX
4526msgid "Next command to do (%d remaining command):"
4527msgid_plural "Next commands to do (%d remaining commands):"
4528msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
4529msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
1b7f4a34 4530
a0b6b246 4531# 译者:注意保持前导空格
a4f16749 4532#: wt-status.c:1246
a0b6b246
JX
4533msgid " (use \"git rebase --edit-todo\" to view and edit)"
4534msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
1b7f4a34 4535
a4f16749 4536#: wt-status.c:1259
1b7f4a34 4537#, c-format
a0b6b246
JX
4538msgid "You are currently rebasing branch '%s' on '%s'."
4539msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1b7f4a34 4540
a4f16749 4541#: wt-status.c:1264
a0b6b246
JX
4542msgid "You are currently rebasing."
4543msgstr "您在执行变基操作。"
1b7f4a34 4544
a0b6b246 4545# 译者:注意保持前导空格
a4f16749 4546#: wt-status.c:1278
a0b6b246
JX
4547msgid " (fix conflicts and then run \"git rebase --continue\")"
4548msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1b7f4a34 4549
a0b6b246 4550# 译者:注意保持前导空格
a4f16749 4551#: wt-status.c:1280
a0b6b246
JX
4552msgid " (use \"git rebase --skip\" to skip this patch)"
4553msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
4554
4555# 译者:注意保持前导空格
a4f16749 4556#: wt-status.c:1282
a0b6b246
JX
4557msgid " (use \"git rebase --abort\" to check out the original branch)"
4558msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
4559
4560# 译者:注意保持前导空格
a4f16749 4561#: wt-status.c:1288
a0b6b246
JX
4562msgid " (all conflicts fixed: run \"git rebase --continue\")"
4563msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1b7f4a34 4564
a4f16749 4565#: wt-status.c:1292
a0b6b246 4566#, c-format
1b7f4a34 4567msgid ""
a0b6b246
JX
4568"You are currently splitting a commit while rebasing branch '%s' on '%s'."
4569msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1b7f4a34 4570
a4f16749 4571#: wt-status.c:1297
a0b6b246
JX
4572msgid "You are currently splitting a commit during a rebase."
4573msgstr "您在执行变基操作时拆分提交。"
1b7f4a34 4574
a0b6b246 4575# 译者:注意保持前导空格
a4f16749 4576#: wt-status.c:1300
a0b6b246
JX
4577msgid " (Once your working directory is clean, run \"git rebase --continue\")"
4578msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1b7f4a34 4579
a4f16749 4580#: wt-status.c:1304
a0b6b246
JX
4581#, c-format
4582msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
4583msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1b7f4a34 4584
a4f16749 4585#: wt-status.c:1309
a0b6b246
JX
4586msgid "You are currently editing a commit during a rebase."
4587msgstr "您在执行变基操作时编辑提交。"
1b7f4a34 4588
a0b6b246 4589# 译者:注意保持前导空格
a4f16749 4590#: wt-status.c:1312
a0b6b246
JX
4591msgid " (use \"git commit --amend\" to amend the current commit)"
4592msgstr " (使用 \"git commit --amend\" 修补当前提交)"
4593
4594# 译者:注意保持前导空格
a4f16749 4595#: wt-status.c:1314
a0b6b246
JX
4596msgid ""
4597" (use \"git rebase --continue\" once you are satisfied with your changes)"
4598msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1b7f4a34 4599
a4f16749 4600#: wt-status.c:1324
1b7f4a34 4601#, c-format
a0b6b246
JX
4602msgid "You are currently cherry-picking commit %s."
4603msgstr "您在执行拣选提交 %s 的操作。"
1b7f4a34 4604
a0b6b246 4605# 译者:注意保持前导空格
a4f16749 4606#: wt-status.c:1329
a0b6b246
JX
4607msgid " (fix conflicts and run \"git cherry-pick --continue\")"
4608msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1b7f4a34 4609
a0b6b246 4610# 译者:注意保持前导空格
a4f16749 4611#: wt-status.c:1332
a0b6b246
JX
4612msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
4613msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1b7f4a34 4614
a0b6b246 4615# 译者:注意保持前导空格
a4f16749 4616#: wt-status.c:1334
a0b6b246
JX
4617msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
4618msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1b7f4a34 4619
a4f16749 4620#: wt-status.c:1343
1b7f4a34 4621#, c-format
a0b6b246
JX
4622msgid "You are currently reverting commit %s."
4623msgstr "您在执行反转提交 %s 的操作。"
1b7f4a34 4624
a0b6b246 4625# 译者:注意保持前导空格
a4f16749 4626#: wt-status.c:1348
a0b6b246
JX
4627msgid " (fix conflicts and run \"git revert --continue\")"
4628msgstr " (解决冲突并运行 \"git revert --continue\")"
1b7f4a34 4629
a0b6b246 4630# 译者:注意保持前导空格
a4f16749 4631#: wt-status.c:1351
a0b6b246
JX
4632msgid " (all conflicts fixed: run \"git revert --continue\")"
4633msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1b7f4a34 4634
a0b6b246 4635# 译者:注意保持前导空格
a4f16749 4636#: wt-status.c:1353
a0b6b246
JX
4637msgid " (use \"git revert --abort\" to cancel the revert operation)"
4638msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1b7f4a34 4639
a4f16749 4640#: wt-status.c:1364
1b7f4a34 4641#, c-format
a0b6b246
JX
4642msgid "You are currently bisecting, started from branch '%s'."
4643msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1b7f4a34 4644
a4f16749 4645#: wt-status.c:1368
a0b6b246
JX
4646msgid "You are currently bisecting."
4647msgstr "您在执行二分查找操作。"
1b7f4a34 4648
a0b6b246 4649# 译者:注意保持前导空格
a4f16749 4650#: wt-status.c:1371
a0b6b246
JX
4651msgid " (use \"git bisect reset\" to get back to the original branch)"
4652msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1b7f4a34 4653
a4f16749 4654#: wt-status.c:1568
a0b6b246
JX
4655msgid "On branch "
4656msgstr "位于分支 "
1b7f4a34 4657
a4f16749 4658#: wt-status.c:1574
a0b6b246
JX
4659msgid "interactive rebase in progress; onto "
4660msgstr "交互式变基操作正在进行中;至 "
1b7f4a34 4661
a4f16749 4662#: wt-status.c:1576
a0b6b246
JX
4663msgid "rebase in progress; onto "
4664msgstr "变基操作正在进行中;至 "
1b7f4a34 4665
a4f16749 4666#: wt-status.c:1581
a0b6b246
JX
4667msgid "HEAD detached at "
4668msgstr "头指针分离于 "
1b7f4a34 4669
a4f16749 4670#: wt-status.c:1583
a0b6b246
JX
4671msgid "HEAD detached from "
4672msgstr "头指针分离自 "
1b7f4a34 4673
a4f16749 4674#: wt-status.c:1586
a0b6b246
JX
4675msgid "Not currently on any branch."
4676msgstr "当前不在任何分支上。"
1b7f4a34 4677
a4f16749 4678#: wt-status.c:1606
a0b6b246
JX
4679msgid "Initial commit"
4680msgstr "初始提交"
1b7f4a34 4681
a4f16749
JX
4682#: wt-status.c:1607
4683msgid "No commits yet"
4684msgstr "尚无提交"
4685
4686#: wt-status.c:1621
a0b6b246
JX
4687msgid "Untracked files"
4688msgstr "未跟踪的文件"
1b7f4a34 4689
a4f16749 4690#: wt-status.c:1623
a0b6b246
JX
4691msgid "Ignored files"
4692msgstr "忽略的文件"
1b7f4a34 4693
a4f16749 4694#: wt-status.c:1627
a0b6b246
JX
4695#, c-format
4696msgid ""
4697"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
4698"may speed it up, but you have to be careful not to forget to add\n"
4699"new files yourself (see 'git help status')."
4700msgstr ""
4701"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
4702"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1b7f4a34 4703
a4f16749 4704#: wt-status.c:1633
a0b6b246
JX
4705#, c-format
4706msgid "Untracked files not listed%s"
4707msgstr "未跟踪的文件没有列出%s"
1b7f4a34 4708
a0b6b246 4709# 译者:中文字符串拼接,可删除前导空格
a4f16749 4710#: wt-status.c:1635
a0b6b246
JX
4711msgid " (use -u option to show untracked files)"
4712msgstr "(使用 -u 参数显示未跟踪的文件)"
1b7f4a34 4713
a4f16749 4714#: wt-status.c:1641
a0b6b246
JX
4715msgid "No changes"
4716msgstr "没有修改"
1b7f4a34 4717
a4f16749 4718#: wt-status.c:1646
a0b6b246
JX
4719#, c-format
4720msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
4721msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1b7f4a34 4722
a4f16749 4723#: wt-status.c:1649
a0b6b246
JX
4724#, c-format
4725msgid "no changes added to commit\n"
4726msgstr "修改尚未加入提交\n"
1b7f4a34 4727
a4f16749 4728#: wt-status.c:1652
a0b6b246
JX
4729#, c-format
4730msgid ""
4731"nothing added to commit but untracked files present (use \"git add\" to "
4732"track)\n"
4733msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1b7f4a34 4734
a4f16749 4735#: wt-status.c:1655
a0b6b246
JX
4736#, c-format
4737msgid "nothing added to commit but untracked files present\n"
4738msgstr "提交为空,但是存在尚未跟踪的文件\n"
1b7f4a34 4739
a0b6b246 4740# 译者:中文字符串拼接,可删除前导空格
a4f16749 4741#: wt-status.c:1658
a0b6b246
JX
4742#, c-format
4743msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
4744msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1b7f4a34 4745
a4f16749 4746#: wt-status.c:1661 wt-status.c:1666
a0b6b246
JX
4747#, c-format
4748msgid "nothing to commit\n"
4749msgstr "无文件要提交\n"
1b7f4a34 4750
a0b6b246 4751# 译者:中文字符串拼接,可删除前导空格
a4f16749 4752#: wt-status.c:1664
a0b6b246
JX
4753#, c-format
4754msgid "nothing to commit (use -u to show untracked files)\n"
4755msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1b7f4a34 4756
a0b6b246 4757# 译者:中文字符串拼接,可删除前导空格
a4f16749 4758#: wt-status.c:1668
a0b6b246
JX
4759#, c-format
4760msgid "nothing to commit, working tree clean\n"
4761msgstr "无文件要提交,干净的工作区\n"
4762
a4f16749
JX
4763#: wt-status.c:1780
4764msgid "No commits yet on "
4765msgstr "尚无提交在 "
1b7f4a34 4766
a4f16749 4767#: wt-status.c:1784
a0b6b246
JX
4768msgid "HEAD (no branch)"
4769msgstr "HEAD(非分支)"
1b7f4a34 4770
a0b6b246 4771# 译者:注意保持句尾空格
a4f16749 4772#: wt-status.c:1813 wt-status.c:1821
a0b6b246
JX
4773msgid "behind "
4774msgstr "落后 "
1b7f4a34 4775
a4f16749 4776#: wt-status.c:1816 wt-status.c:1819
a0b6b246
JX
4777msgid "ahead "
4778msgstr "领先 "
1b7f4a34 4779
a0b6b246 4780#. TRANSLATORS: the action is e.g. "pull with rebase"
a4f16749 4781#: wt-status.c:2311
a0b6b246
JX
4782#, c-format
4783msgid "cannot %s: You have unstaged changes."
4784msgstr "不能%s:您有未暂存的变更。"
1b7f4a34 4785
a4f16749 4786#: wt-status.c:2317
a0b6b246 4787msgid "additionally, your index contains uncommitted changes."
29004bbb 4788msgstr "另外,您的索引中包含未提交的变更。"
1b7f4a34 4789
a4f16749 4790#: wt-status.c:2319
a0b6b246
JX
4791#, c-format
4792msgid "cannot %s: Your index contains uncommitted changes."
4793msgstr "不能%s:您的索引中包含未提交的变更。"
1b7f4a34 4794
6937cb4e 4795#: compat/precompose_utf8.c:58 builtin/clone.c:437
a0b6b246
JX
4796#, c-format
4797msgid "failed to unlink '%s'"
4798msgstr "无法删除 '%s'"
1b7f4a34 4799
a4f16749 4800#: builtin/add.c:24
a0b6b246
JX
4801msgid "git add [<options>] [--] <pathspec>..."
4802msgstr "git add [<选项>] [--] <路径规格>..."
1b7f4a34 4803
a4f16749 4804#: builtin/add.c:82
a0b6b246
JX
4805#, c-format
4806msgid "unexpected diff status %c"
4807msgstr "意外的差异状态 %c"
1b7f4a34 4808
6937cb4e 4809#: builtin/add.c:87 builtin/commit.c:291
a0b6b246
JX
4810msgid "updating files failed"
4811msgstr "更新文件失败"
1b7f4a34 4812
a4f16749 4813#: builtin/add.c:97
a0b6b246
JX
4814#, c-format
4815msgid "remove '%s'\n"
4816msgstr "删除 '%s'\n"
1b7f4a34 4817
6937cb4e 4818#: builtin/add.c:153
a0b6b246
JX
4819msgid "Unstaged changes after refreshing the index:"
4820msgstr "刷新索引之后尚未被暂存的变更:"
1b7f4a34 4821
6937cb4e 4822#: builtin/add.c:213 builtin/rev-parse.c:888
a0b6b246
JX
4823msgid "Could not read the index"
4824msgstr "不能读取索引"
1b7f4a34 4825
6937cb4e 4826#: builtin/add.c:224
a0b6b246
JX
4827#, c-format
4828msgid "Could not open '%s' for writing."
4829msgstr "无法打开 '%s' 进行写入。"
1b7f4a34 4830
6937cb4e 4831#: builtin/add.c:228
a0b6b246
JX
4832msgid "Could not write patch"
4833msgstr "不能生成补丁"
1b7f4a34 4834
6937cb4e 4835#: builtin/add.c:231
a0b6b246
JX
4836msgid "editing patch failed"
4837msgstr "编辑补丁失败"
1b7f4a34 4838
6937cb4e 4839#: builtin/add.c:234
1b7f4a34 4840#, c-format
a0b6b246 4841msgid "Could not stat '%s'"
65e2041e 4842msgstr "不能对 '%s' 调用 stat"
1b7f4a34 4843
6937cb4e 4844#: builtin/add.c:236
a0b6b246
JX
4845msgid "Empty patch. Aborted."
4846msgstr "空补丁。异常终止。"
1b7f4a34 4847
6937cb4e 4848#: builtin/add.c:241
a0b6b246
JX
4849#, c-format
4850msgid "Could not apply '%s'"
4851msgstr "不能应用 '%s'"
1b7f4a34 4852
6937cb4e 4853#: builtin/add.c:251
a0b6b246
JX
4854msgid "The following paths are ignored by one of your .gitignore files:\n"
4855msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 4856
6937cb4e 4857#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124
a4f16749 4858#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
6937cb4e 4859#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
a0b6b246
JX
4860msgid "dry run"
4861msgstr "演习"
8ada9598 4862
6937cb4e 4863#: builtin/add.c:274
a0b6b246
JX
4864msgid "interactive picking"
4865msgstr "交互式拣选"
8ada9598 4866
6937cb4e 4867#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
a0b6b246
JX
4868msgid "select hunks interactively"
4869msgstr "交互式挑选数据块"
8ada9598 4870
6937cb4e 4871#: builtin/add.c:276
a0b6b246
JX
4872msgid "edit current diff and apply"
4873msgstr "编辑当前差异并应用"
8ada9598 4874
6937cb4e 4875#: builtin/add.c:277
a0b6b246
JX
4876msgid "allow adding otherwise ignored files"
4877msgstr "允许添加忽略的文件"
8ada9598 4878
6937cb4e 4879#: builtin/add.c:278
a0b6b246
JX
4880msgid "update tracked files"
4881msgstr "更新已跟踪的文件"
8ada9598 4882
6937cb4e 4883#: builtin/add.c:279
a0b6b246
JX
4884msgid "record only the fact that the path will be added later"
4885msgstr "只记录,该路径稍后再添加"
8ada9598 4886
6937cb4e 4887#: builtin/add.c:280
a0b6b246
JX
4888msgid "add changes from all tracked and untracked files"
4889msgstr "添加所有改变的已跟踪文件和未跟踪文件"
8ada9598 4890
6937cb4e 4891#: builtin/add.c:283
a0b6b246
JX
4892msgid "ignore paths removed in the working tree (same as --no-all)"
4893msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
8ada9598 4894
6937cb4e 4895#: builtin/add.c:285
a0b6b246
JX
4896msgid "don't add, only refresh the index"
4897msgstr "不添加,只刷新索引"
8ada9598 4898
6937cb4e 4899#: builtin/add.c:286
a0b6b246
JX
4900msgid "just skip files which cannot be added because of errors"
4901msgstr "跳过因出错不能添加的文件"
8ada9598 4902
6937cb4e 4903#: builtin/add.c:287
a0b6b246
JX
4904msgid "check if - even missing - files are ignored in dry run"
4905msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
8ada9598 4906
6937cb4e 4907#: builtin/add.c:288 builtin/update-index.c:954
a0b6b246
JX
4908msgid "(+/-)x"
4909msgstr "(+/-)x"
8ada9598 4910
6937cb4e 4911#: builtin/add.c:288 builtin/update-index.c:955
a0b6b246
JX
4912msgid "override the executable bit of the listed files"
4913msgstr "覆盖列表里文件的可执行位"
8ada9598 4914
6937cb4e 4915#: builtin/add.c:290
a4f16749
JX
4916msgid "warn when adding an embedded repository"
4917msgstr "创建一个嵌入式仓库时给予警告"
4918
6937cb4e 4919#: builtin/add.c:305
a4f16749
JX
4920#, c-format
4921msgid ""
4922"You've added another git repository inside your current repository.\n"
4923"Clones of the outer repository will not contain the contents of\n"
4924"the embedded repository and will not know how to obtain it.\n"
4925"If you meant to add a submodule, use:\n"
4926"\n"
4927"\tgit submodule add <url> %s\n"
4928"\n"
4929"If you added this path by mistake, you can remove it from the\n"
4930"index with:\n"
4931"\n"
4932"\tgit rm --cached %s\n"
4933"\n"
4934"See \"git help submodule\" for more information."
4935msgstr ""
6937cb4e
JX
4936"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容,并"
4937"且不知道该如何获取它。\n"
a4f16749
JX
4938"如果您要添加一个子模组,使用:\n"
4939"\n"
4940"\tgit submodule add <url> %s\n"
4941"\n"
4942"如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n"
4943"\n"
4944"\tgit rm --cached %s\n"
4945"\n"
4946"参见 \"git help submodule\" 获取更多信息。"
4947
6937cb4e 4948#: builtin/add.c:333
a4f16749
JX
4949#, c-format
4950msgid "adding embedded git repository: %s"
4951msgstr "正在添加嵌入式 git 仓库:%s"
4952
6937cb4e 4953#: builtin/add.c:351
8ada9598 4954#, c-format
a0b6b246
JX
4955msgid "Use -f if you really want to add them.\n"
4956msgstr "使用 -f 参数如果您确实要添加它们。\n"
8ada9598 4957
6937cb4e 4958#: builtin/add.c:359
a0b6b246
JX
4959msgid "adding files failed"
4960msgstr "添加文件失败"
8ada9598 4961
6937cb4e 4962#: builtin/add.c:396
a0b6b246
JX
4963msgid "-A and -u are mutually incompatible"
4964msgstr "-A 和 -u 选项互斥"
8ada9598 4965
6937cb4e 4966#: builtin/add.c:403
a0b6b246
JX
4967msgid "Option --ignore-missing can only be used together with --dry-run"
4968msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 4969
6937cb4e 4970#: builtin/add.c:407
8ada9598 4971#, c-format
a0b6b246
JX
4972msgid "--chmod param '%s' must be either -x or +x"
4973msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
8ada9598 4974
6937cb4e 4975#: builtin/add.c:422
8ada9598 4976#, c-format
a0b6b246
JX
4977msgid "Nothing specified, nothing added.\n"
4978msgstr "没有指定文件,也没有文件被添加。\n"
8ada9598 4979
6937cb4e 4980#: builtin/add.c:423
8ada9598 4981#, c-format
a0b6b246
JX
4982msgid "Maybe you wanted to say 'git add .'?\n"
4983msgstr "也许您想要执行 'git add .'?\n"
8ada9598 4984
6937cb4e
JX
4985#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282
4986#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350
4987#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271
4988#: builtin/submodule--helper.c:243
a0b6b246
JX
4989msgid "index file corrupt"
4990msgstr "索引文件损坏"
8ada9598 4991
6937cb4e 4992#: builtin/am.c:414
a0b6b246
JX
4993msgid "could not parse author script"
4994msgstr "不能解析作者脚本"
8ada9598 4995
6937cb4e 4996#: builtin/am.c:498
81809b99 4997#, c-format
a0b6b246
JX
4998msgid "'%s' was deleted by the applypatch-msg hook"
4999msgstr "'%s' 被 applypatch-msg 钩子删除"
8ada9598 5000
6937cb4e 5001#: builtin/am.c:539
8ada9598 5002#, c-format
a0b6b246
JX
5003msgid "Malformed input line: '%s'."
5004msgstr "非法的输入行:'%s'。"
8ada9598 5005
6937cb4e 5006#: builtin/am.c:576
8ada9598 5007#, c-format
a0b6b246
JX
5008msgid "Failed to copy notes from '%s' to '%s'"
5009msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
8ada9598 5010
6937cb4e 5011#: builtin/am.c:602
a0b6b246
JX
5012msgid "fseek failed"
5013msgstr "fseek 失败"
8ada9598 5014
6937cb4e 5015#: builtin/am.c:786
8ada9598 5016#, c-format
a0b6b246
JX
5017msgid "could not parse patch '%s'"
5018msgstr "无法解析补丁 '%s'"
8ada9598 5019
6937cb4e 5020#: builtin/am.c:851
a0b6b246
JX
5021msgid "Only one StGIT patch series can be applied at once"
5022msgstr "一次只能有一个 StGIT 补丁队列被应用"
5023
6937cb4e 5024#: builtin/am.c:899
a0b6b246
JX
5025msgid "invalid timestamp"
5026msgstr "无效的时间戳"
5027
6937cb4e 5028#: builtin/am.c:904 builtin/am.c:916
a0b6b246
JX
5029msgid "invalid Date line"
5030msgstr "无效的日期行"
8ada9598 5031
6937cb4e 5032#: builtin/am.c:911
a0b6b246
JX
5033msgid "invalid timezone offset"
5034msgstr "无效的时区偏移值"
8ada9598 5035
6937cb4e 5036#: builtin/am.c:1004
a0b6b246 5037msgid "Patch format detection failed."
87cb7997 5038msgstr "补丁格式探测失败。"
8ada9598 5039
6937cb4e 5040#: builtin/am.c:1009 builtin/clone.c:402
8ada9598 5041#, c-format
a0b6b246
JX
5042msgid "failed to create directory '%s'"
5043msgstr "无法创建目录 '%s'"
8ada9598 5044
6937cb4e 5045#: builtin/am.c:1013
a0b6b246
JX
5046msgid "Failed to split patches."
5047msgstr "无法拆分补丁。"
814ff314 5048
6937cb4e 5049#: builtin/am.c:1142 builtin/commit.c:376
a0b6b246
JX
5050msgid "unable to write index file"
5051msgstr "无法写入索引文件"
8ada9598 5052
6937cb4e 5053#: builtin/am.c:1193
8ada9598 5054#, c-format
a0b6b246
JX
5055msgid "When you have resolved this problem, run \"%s --continue\"."
5056msgstr "当您解决这一问题,执行 \"%s --continue\"。"
8ada9598 5057
6937cb4e 5058#: builtin/am.c:1194
81809b99 5059#, c-format
a0b6b246
JX
5060msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
5061msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
8ada9598 5062
6937cb4e 5063#: builtin/am.c:1195
81809b99 5064#, c-format
a0b6b246
JX
5065msgid "To restore the original branch and stop patching, run \"%s --abort\"."
5066msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
8ada9598 5067
6937cb4e 5068#: builtin/am.c:1302
a4f16749
JX
5069msgid "Patch is empty."
5070msgstr "补丁为空。"
23ff3338 5071
6937cb4e 5072#: builtin/am.c:1368
8ada9598 5073#, c-format
a4f16749
JX
5074msgid "invalid ident line: %.*s"
5075msgstr "无效的身份标识:%.*s"
8ada9598 5076
6937cb4e 5077#: builtin/am.c:1390
8ada9598 5078#, c-format
a0b6b246
JX
5079msgid "unable to parse commit %s"
5080msgstr "不能解析提交 %s"
8ada9598 5081
6937cb4e 5082#: builtin/am.c:1584
a0b6b246
JX
5083msgid "Repository lacks necessary blobs to fall back on 3-way merge."
5084msgstr "仓库缺乏必要的数据对象以进行三方合并。"
814ff314 5085
6937cb4e 5086#: builtin/am.c:1586
a0b6b246
JX
5087msgid "Using index info to reconstruct a base tree..."
5088msgstr "使用索引来重建一个(三方合并的)基础目录树..."
8ada9598 5089
6937cb4e 5090#: builtin/am.c:1605
a0b6b246
JX
5091msgid ""
5092"Did you hand edit your patch?\n"
5093"It does not apply to blobs recorded in its index."
5094msgstr ""
5095"您是否曾手动编辑过您的补丁?\n"
5096"无法应用补丁到索引中的数据对象上。"
23ff3338 5097
6937cb4e 5098#: builtin/am.c:1611
a0b6b246
JX
5099msgid "Falling back to patching base and 3-way merge..."
5100msgstr "回落到基础版本上打补丁及进行三方合并..."
8ada9598 5101
6937cb4e 5102#: builtin/am.c:1636
a0b6b246
JX
5103msgid "Failed to merge in the changes."
5104msgstr "无法合并变更。"
d691f479 5105
6937cb4e 5106#: builtin/am.c:1660 builtin/merge.c:641
a0b6b246
JX
5107msgid "git write-tree failed to write a tree"
5108msgstr "git write-tree 无法写入一树对象"
814ff314 5109
6937cb4e 5110#: builtin/am.c:1667
a0b6b246
JX
5111msgid "applying to an empty history"
5112msgstr "正应用到一个空历史上"
8ada9598 5113
6937cb4e
JX
5114#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
5115#: builtin/merge.c:849
a0b6b246
JX
5116msgid "failed to write commit object"
5117msgstr "无法写提交对象"
8ada9598 5118
6937cb4e 5119#: builtin/am.c:1713 builtin/am.c:1717
8ada9598 5120#, c-format
a0b6b246
JX
5121msgid "cannot resume: %s does not exist."
5122msgstr "无法继续:%s 不存在。"
8ada9598 5123
6937cb4e 5124#: builtin/am.c:1733
a0b6b246
JX
5125msgid "cannot be interactive without stdin connected to a terminal."
5126msgstr "标准输入没有和终端关联,不能进行交互式操作。"
8ada9598 5127
6937cb4e 5128#: builtin/am.c:1738
a0b6b246
JX
5129msgid "Commit Body is:"
5130msgstr "提交内容为:"
8ada9598 5131
a0b6b246
JX
5132# 译者:注意保持句尾空格
5133#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
5134#. in your translation. The program will only accept English
5135#. input at this point.
5136#.
6937cb4e 5137#: builtin/am.c:1748
a0b6b246
JX
5138msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
5139msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
8ada9598 5140
6937cb4e 5141#: builtin/am.c:1798
8ada9598 5142#, c-format
a0b6b246
JX
5143msgid "Dirty index: cannot apply patches (dirty: %s)"
5144msgstr "脏索引:不能应用补丁(脏文件:%s)"
8ada9598 5145
6937cb4e 5146#: builtin/am.c:1838 builtin/am.c:1910
81809b99 5147#, c-format
a0b6b246
JX
5148msgid "Applying: %.*s"
5149msgstr "应用:%.*s"
8ada9598 5150
6937cb4e 5151#: builtin/am.c:1854
a0b6b246
JX
5152msgid "No changes -- Patch already applied."
5153msgstr "没有变更 —— 补丁已经应用过。"
8ada9598 5154
6937cb4e 5155#: builtin/am.c:1862
81809b99 5156#, c-format
a0b6b246
JX
5157msgid "Patch failed at %s %.*s"
5158msgstr "打补丁失败于 %s %.*s"
8ada9598 5159
6937cb4e 5160#: builtin/am.c:1868
8ada9598 5161#, c-format
a0b6b246
JX
5162msgid "The copy of the patch that failed is found in: %s"
5163msgstr "失败的补丁文件副本位于:%s"
8ada9598 5164
6937cb4e 5165#: builtin/am.c:1913
a0b6b246
JX
5166msgid ""
5167"No changes - did you forget to use 'git add'?\n"
5168"If there is nothing left to stage, chances are that something else\n"
5169"already introduced the same changes; you might want to skip this patch."
5170msgstr ""
5171"没有变更 —— 您是不是忘了执行 'git add'?\n"
5172"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
5173"您也许想要跳过这个补丁。"
8ada9598 5174
6937cb4e 5175#: builtin/am.c:1920
a0b6b246
JX
5176msgid ""
5177"You still have unmerged paths in your index.\n"
a4f16749
JX
5178"You should 'git add' each file with resolved conflicts to mark them as "
5179"such.\n"
5180"You might run `git rm` on a file to accept \"deleted by them\" for it."
a0b6b246 5181msgstr ""
a4f16749
JX
5182"在您的索引中仍存在未合并的路径。\n"
5183"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
5184"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
8ada9598 5185
6937cb4e
JX
5186#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
5187#: builtin/reset.c:340
8ada9598 5188#, c-format
a0b6b246
JX
5189msgid "Could not parse object '%s'."
5190msgstr "不能解析对象 '%s'。"
8ada9598 5191
6937cb4e 5192#: builtin/am.c:2081
a0b6b246
JX
5193msgid "failed to clean index"
5194msgstr "无法清空索引"
5b04ee3b 5195
6937cb4e 5196#: builtin/am.c:2116
a0b6b246
JX
5197msgid ""
5198"You seem to have moved HEAD since the last 'am' failure.\n"
5199"Not rewinding to ORIG_HEAD"
5200msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
8ada9598 5201
6937cb4e 5202#: builtin/am.c:2179
8ada9598 5203#, c-format
a0b6b246
JX
5204msgid "Invalid value for --patch-format: %s"
5205msgstr "无效的 --patch-format 值:%s"
8ada9598 5206
6937cb4e 5207#: builtin/am.c:2212
a0b6b246
JX
5208msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
5209msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
5b04ee3b 5210
6937cb4e 5211#: builtin/am.c:2213
a0b6b246
JX
5212msgid "git am [<options>] (--continue | --skip | --abort)"
5213msgstr "git am [<选项>] (--continue | --skip | --abort)"
8ada9598 5214
6937cb4e 5215#: builtin/am.c:2219
a0b6b246
JX
5216msgid "run interactively"
5217msgstr "以交互式方式运行"
8ada9598 5218
6937cb4e 5219#: builtin/am.c:2221
a0b6b246
JX
5220msgid "historical option -- no-op"
5221msgstr "老的参数 —— 无作用"
8ada9598 5222
6937cb4e 5223#: builtin/am.c:2223
a0b6b246
JX
5224msgid "allow fall back on 3way merging if needed"
5225msgstr "如果必要,允许使用三方合并。"
8ada9598 5226
6937cb4e 5227#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
a4f16749 5228#: builtin/repack.c:180
a0b6b246
JX
5229msgid "be quiet"
5230msgstr "静默模式"
8ada9598 5231
6937cb4e 5232#: builtin/am.c:2226
a0b6b246
JX
5233msgid "add a Signed-off-by line to the commit message"
5234msgstr "在提交说明中添加一个 Signed-off-by 签名"
5c57d762 5235
6937cb4e 5236#: builtin/am.c:2229
a0b6b246
JX
5237msgid "recode into utf8 (default)"
5238msgstr "使用 utf8 字符集(默认)"
5c57d762 5239
6937cb4e 5240#: builtin/am.c:2231
a0b6b246
JX
5241msgid "pass -k flag to git-mailinfo"
5242msgstr "向 git-mailinfo 传递 -k 参数"
5c57d762 5243
6937cb4e 5244#: builtin/am.c:2233
a0b6b246
JX
5245msgid "pass -b flag to git-mailinfo"
5246msgstr "向 git-mailinfo 传递 -b 参数"
5c57d762 5247
6937cb4e 5248#: builtin/am.c:2235
a0b6b246
JX
5249msgid "pass -m flag to git-mailinfo"
5250msgstr "向 git-mailinfo 传递 -m 参数"
5c57d762 5251
6937cb4e 5252#: builtin/am.c:2237
a0b6b246
JX
5253msgid "pass --keep-cr flag to git-mailsplit for mbox format"
5254msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
5c57d762 5255
6937cb4e 5256#: builtin/am.c:2240
a0b6b246
JX
5257msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
5258msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
8ada9598 5259
6937cb4e 5260#: builtin/am.c:2243
a0b6b246
JX
5261msgid "strip everything before a scissors line"
5262msgstr "丢弃裁切线前的所有内容"
8ada9598 5263
6937cb4e
JX
5264#: builtin/am.c:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254
5265#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266
5266#: builtin/am.c:2272
a0b6b246
JX
5267msgid "pass it through git-apply"
5268msgstr "传递给 git-apply"
8ada9598 5269
6937cb4e
JX
5270#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667
5271#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197
5272#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
5273#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
5274#: parse-options.h:132 parse-options.h:134 parse-options.h:245
a0b6b246
JX
5275msgid "n"
5276msgstr "n"
8ada9598 5277
6937cb4e
JX
5278#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38
5279#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
a0b6b246
JX
5280msgid "format"
5281msgstr "格式"
8ada9598 5282
6937cb4e 5283#: builtin/am.c:2269
a0b6b246
JX
5284msgid "format the patch(es) are in"
5285msgstr "补丁的格式"
8ada9598 5286
6937cb4e 5287#: builtin/am.c:2275
a0b6b246
JX
5288msgid "override error message when patch failure occurs"
5289msgstr "打补丁失败时显示的错误信息"
8ada9598 5290
6937cb4e 5291#: builtin/am.c:2277
a0b6b246
JX
5292msgid "continue applying patches after resolving a conflict"
5293msgstr "冲突解决后继续应用补丁"
814ff314 5294
6937cb4e 5295#: builtin/am.c:2280
a0b6b246
JX
5296msgid "synonyms for --continue"
5297msgstr "和 --continue 同义"
8ada9598 5298
6937cb4e 5299#: builtin/am.c:2283
a0b6b246
JX
5300msgid "skip the current patch"
5301msgstr "跳过当前补丁"
23ff3338 5302
6937cb4e 5303#: builtin/am.c:2286
a0b6b246
JX
5304msgid "restore the original branch and abort the patching operation."
5305msgstr "恢复原始分支并终止打补丁操作。"
8ada9598 5306
6937cb4e 5307#: builtin/am.c:2290
a0b6b246
JX
5308msgid "lie about committer date"
5309msgstr "将作者日期作为提交日期"
8ada9598 5310
6937cb4e 5311#: builtin/am.c:2292
a0b6b246
JX
5312msgid "use current timestamp for author date"
5313msgstr "用当前时间作为作者日期"
8ada9598 5314
6937cb4e
JX
5315#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
5316#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
a0b6b246
JX
5317msgid "key-id"
5318msgstr "key-id"
8ada9598 5319
6937cb4e 5320#: builtin/am.c:2295
a0b6b246
JX
5321msgid "GPG-sign commits"
5322msgstr "使用 GPG 签名提交"
8ada9598 5323
6937cb4e 5324#: builtin/am.c:2298
a0b6b246
JX
5325msgid "(internal use for git-rebase)"
5326msgstr "(内部使用,用于 git-rebase)"
8ada9598 5327
6937cb4e 5328#: builtin/am.c:2316
a0b6b246
JX
5329msgid ""
5330"The -b/--binary option has been a no-op for long time, and\n"
5331"it will be removed. Please do not use it anymore."
5332msgstr ""
5333"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
5334"请不要再使用它了。"
8ada9598 5335
6937cb4e 5336#: builtin/am.c:2323
a0b6b246
JX
5337msgid "failed to read the index"
5338msgstr "无法读取索引"
8ada9598 5339
6937cb4e 5340#: builtin/am.c:2338
a0b6b246
JX
5341#, c-format
5342msgid "previous rebase directory %s still exists but mbox given."
5343msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
8ada9598 5344
6937cb4e 5345#: builtin/am.c:2362
a0b6b246
JX
5346#, c-format
5347msgid ""
5348"Stray %s directory found.\n"
5349"Use \"git am --abort\" to remove it."
5350msgstr ""
5351"发现了错误的 %s 目录。\n"
5352"使用 \"git am --abort\" 删除它。"
c04f5ac3 5353
6937cb4e 5354#: builtin/am.c:2368
a0b6b246
JX
5355msgid "Resolve operation not in progress, we are not resuming."
5356msgstr "解决操作未进行,我们不会继续。"
c04f5ac3 5357
a0b6b246
JX
5358#: builtin/apply.c:8
5359msgid "git apply [<options>] [<patch>...]"
5360msgstr "git apply [<选项>] [<补丁>...]"
c04f5ac3 5361
c04f5ac3
JX
5362#: builtin/archive.c:17
5363#, c-format
5364msgid "could not create archive file '%s'"
90e6ef53 5365msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
5366
5367#: builtin/archive.c:20
5368msgid "could not redirect output"
195febda 5369msgstr "不能重定向输出"
c04f5ac3
JX
5370
5371#: builtin/archive.c:37
5372msgid "git archive: Remote with no URL"
4375c10e 5373msgstr "git archive:未提供远程 URL"
c04f5ac3
JX
5374
5375#: builtin/archive.c:58
5376msgid "git archive: expected ACK/NAK, got EOF"
4375c10e 5377msgstr "git archive:应为 ACK/NACK,却得到 EOF"
c04f5ac3 5378
1003b3a5 5379#: builtin/archive.c:61
c04f5ac3
JX
5380#, c-format
5381msgid "git archive: NACK %s"
90e6ef53 5382msgstr "git archive:NACK %s"
c04f5ac3 5383
1003b3a5 5384#: builtin/archive.c:64
c04f5ac3 5385msgid "git archive: protocol error"
90e6ef53 5386msgstr "git archive:协议错误"
c04f5ac3 5387
1003b3a5 5388#: builtin/archive.c:68
c04f5ac3 5389msgid "git archive: expected a flush"
a0b6b246 5390msgstr "git archive:应有一个 flush 刷新"
c04f5ac3 5391
ef317cd5
JX
5392#: builtin/bisect--helper.c:7
5393msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 5394msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5
JX
5395
5396#: builtin/bisect--helper.c:17
5397msgid "perform 'git bisect next'"
07432cef 5398msgstr "执行 'git bisect next'"
ef317cd5
JX
5399
5400#: builtin/bisect--helper.c:19
5401msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 5402msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5 5403
a4f16749 5404#: builtin/blame.c:27
7aea43ff
JX
5405msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
5406msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
ef317cd5 5407
a4f16749 5408#: builtin/blame.c:32
814ff314
JX
5409msgid "<rev-opts> are documented in git-rev-list(1)"
5410msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
ef317cd5 5411
a4f16749 5412#: builtin/blame.c:668
ef317cd5 5413msgid "Show blame entries as we find them, incrementally"
07432cef 5414msgstr "增量式地显示发现的 blame 条目"
ef317cd5 5415
a4f16749 5416#: builtin/blame.c:669
ef317cd5 5417msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 5418msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 5419
a4f16749 5420#: builtin/blame.c:670
ef317cd5 5421msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 5422msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 5423
a4f16749 5424#: builtin/blame.c:671
ef317cd5 5425msgid "Show work cost statistics"
07432cef 5426msgstr "显示命令消耗统计"
ef317cd5 5427
a4f16749 5428#: builtin/blame.c:672
276ceeaa
JX
5429msgid "Force progress reporting"
5430msgstr "强制进度显示"
5431
a4f16749 5432#: builtin/blame.c:673
ef317cd5 5433msgid "Show output score for blame entries"
07432cef 5434msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 5435
a4f16749 5436#: builtin/blame.c:674
ef317cd5 5437msgid "Show original filename (Default: auto)"
07432cef 5438msgstr "显示原始文件名(默认:自动)"
ef317cd5 5439
a4f16749 5440#: builtin/blame.c:675
ef317cd5 5441msgid "Show original linenumber (Default: off)"
07432cef 5442msgstr "显示原始的行号(默认:关闭)"
ef317cd5 5443
a4f16749 5444#: builtin/blame.c:676
ef317cd5 5445msgid "Show in a format designed for machine consumption"
07432cef 5446msgstr "显示为一个适合机器读取的格式"
ef317cd5 5447
a4f16749 5448#: builtin/blame.c:677
ef317cd5 5449msgid "Show porcelain format with per-line commit information"
07432cef 5450msgstr "为每一行显示机器适用的提交信息"
ef317cd5 5451
a4f16749 5452#: builtin/blame.c:678
ef317cd5 5453msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 5454msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 5455
a4f16749 5456#: builtin/blame.c:679
ef317cd5 5457msgid "Show raw timestamp (Default: off)"
07432cef 5458msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 5459
a4f16749 5460#: builtin/blame.c:680
ef317cd5 5461msgid "Show long commit SHA1 (Default: off)"
4375c10e 5462msgstr "显示长的 SHA1 提交号(默认:关闭)"
ef317cd5 5463
a4f16749 5464#: builtin/blame.c:681
ef317cd5 5465msgid "Suppress author name and timestamp (Default: off)"
07432cef 5466msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 5467
a4f16749 5468#: builtin/blame.c:682
ef317cd5 5469msgid "Show author email instead of name (Default: off)"
07432cef 5470msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 5471
a4f16749 5472#: builtin/blame.c:683
ef317cd5 5473msgid "Ignore whitespace differences"
07432cef 5474msgstr "忽略空白差异"
ef317cd5 5475
a4f16749 5476#: builtin/blame.c:690
1a79b2f1
JX
5477msgid "Use an experimental heuristic to improve diffs"
5478msgstr "使用一个试验性的启发式算法改进差异显示"
a0b6b246 5479
a4f16749 5480#: builtin/blame.c:692
ef317cd5 5481msgid "Spend extra cycles to find better match"
07432cef 5482msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 5483
a4f16749 5484#: builtin/blame.c:693
ef317cd5 5485msgid "Use revisions from <file> instead of calling git-rev-list"
d9d56b23 5486msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
ef317cd5 5487
a4f16749 5488#: builtin/blame.c:694
ef317cd5 5489msgid "Use <file>'s contents as the final image"
d9d56b23 5490msgstr "使用 <文件> 的内容作为最终的图片"
ef317cd5 5491
a4f16749 5492#: builtin/blame.c:695 builtin/blame.c:696
ef317cd5 5493msgid "score"
07432cef 5494msgstr "得分"
ef317cd5 5495
a4f16749 5496#: builtin/blame.c:695
ef317cd5 5497msgid "Find line copies within and across files"
07432cef 5498msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 5499
a4f16749 5500#: builtin/blame.c:696
ef317cd5 5501msgid "Find line movements within and across files"
07432cef 5502msgstr "找到文件内及跨文件的行移动"
ef317cd5 5503
a4f16749 5504#: builtin/blame.c:697
ef317cd5 5505msgid "n,m"
07432cef 5506msgstr "n,m"
ef317cd5 5507
a4f16749 5508#: builtin/blame.c:697
ef317cd5 5509msgid "Process only line range n,m, counting from 1"
07432cef 5510msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 5511
a4f16749 5512#: builtin/blame.c:744
a0b6b246
JX
5513msgid "--progress can't be used with --incremental or porcelain formats"
5514msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
5515
a4f16749
JX
5516#. TRANSLATORS: This string is used to tell us the
5517#. maximum display width for a relative timestamp in
5518#. "git blame" output. For C locale, "4 years, 11
5519#. months ago", which takes 22 places, is the longest
5520#. among various forms of relative timestamps, but
5521#. your language may need more or fewer display
5522#. columns.
5523#.
5524#: builtin/blame.c:795
6c94aba5
JX
5525msgid "4 years, 11 months ago"
5526msgstr "4 年 11 个月前"
5527
a4f16749 5528#: builtin/blame.c:882
a0b6b246
JX
5529#, c-format
5530msgid "file %s has only %lu line"
5531msgid_plural "file %s has only %lu lines"
5532msgstr[0] "文件 %s 只有 %lu 行"
5533msgstr[1] "文件 %s 只有 %lu 行"
5534
a4f16749
JX
5535#: builtin/blame.c:928
5536msgid "Blaming lines"
5537msgstr "追踪代码行"
5538
5539#: builtin/branch.c:27
814ff314
JX
5540msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
5541msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
ef317cd5 5542
a4f16749 5543#: builtin/branch.c:28
814ff314
JX
5544msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
5545msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 5546
a4f16749 5547#: builtin/branch.c:29
814ff314
JX
5548msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
5549msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
ef317cd5 5550
a4f16749 5551#: builtin/branch.c:30
814ff314
JX
5552msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
5553msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 5554
a4f16749 5555#: builtin/branch.c:31
6937cb4e
JX
5556msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
5557msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
5558
5559#: builtin/branch.c:32
94550ed3
JX
5560msgid "git branch [<options>] [-r | -a] [--points-at]"
5561msgstr "git branch [<选项>] [-r | -a] [--points-at]"
5562
6937cb4e 5563#: builtin/branch.c:33
87cb7997
JX
5564msgid "git branch [<options>] [-r | -a] [--format]"
5565msgstr "git branch [<选项>] [-r | -a] [--format]"
5566
90e6ef53 5567# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
6937cb4e 5568#: builtin/branch.c:146
c04f5ac3
JX
5569#, c-format
5570msgid ""
5571"deleting branch '%s' that has been merged to\n"
5572" '%s', but not yet merged to HEAD."
5573msgstr ""
70fc47bf 5574"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
5575" '%s',但未合并到 HEAD。"
5576
90e6ef53 5577# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
6937cb4e 5578#: builtin/branch.c:150
c04f5ac3
JX
5579#, c-format
5580msgid ""
5581"not deleting branch '%s' that is not yet merged to\n"
5582" '%s', even though it is merged to HEAD."
5583msgstr ""
70fc47bf
T
5584"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
5585" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 5586
6937cb4e 5587#: builtin/branch.c:164
07432cef
WS
5588#, c-format
5589msgid "Couldn't look up commit object for '%s'"
5590msgstr "无法查询 '%s' 指向的提交对象"
5591
6937cb4e 5592#: builtin/branch.c:168
07432cef
WS
5593#, c-format
5594msgid ""
5595"The branch '%s' is not fully merged.\n"
5596"If you are sure you want to delete it, run 'git branch -D %s'."
5597msgstr ""
5598"分支 '%s' 没有完全合并。\n"
5599"如果您确认要删除它,执行 'git branch -D %s'。"
5600
6937cb4e 5601#: builtin/branch.c:181
07432cef 5602msgid "Update of config-file failed"
6937cb4e 5603msgstr "更新配置文件失败"
07432cef 5604
6937cb4e 5605#: builtin/branch.c:212
c04f5ac3 5606msgid "cannot use -a with -d"
649900bc 5607msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 5608
6937cb4e 5609#: builtin/branch.c:218
c04f5ac3
JX
5610msgid "Couldn't look up commit object for HEAD"
5611msgstr "无法查询 HEAD 指向的提交对象"
5612
6937cb4e 5613#: builtin/branch.c:232
c04f5ac3 5614#, c-format
5b04ee3b
JX
5615msgid "Cannot delete branch '%s' checked out at '%s'"
5616msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
c04f5ac3 5617
6937cb4e 5618#: builtin/branch.c:247
5ae481e0 5619#, c-format
7aea43ff
JX
5620msgid "remote-tracking branch '%s' not found."
5621msgstr "未能找到远程跟踪分支 '%s'。"
c04f5ac3 5622
6937cb4e 5623#: builtin/branch.c:248
81809b99 5624#, c-format
8ada9598 5625msgid "branch '%s' not found."
81809b99 5626msgstr "分支 '%s' 未发现。"
8ada9598 5627
6937cb4e 5628#: builtin/branch.c:263
81809b99 5629#, c-format
7aea43ff
JX
5630msgid "Error deleting remote-tracking branch '%s'"
5631msgstr "无法删除远程跟踪分支 '%s'"
c04f5ac3 5632
6937cb4e 5633#: builtin/branch.c:264
81809b99 5634#, c-format
8ada9598 5635msgid "Error deleting branch '%s'"
7aea43ff 5636msgstr "无法删除分支 '%s'"
8ada9598 5637
6937cb4e 5638#: builtin/branch.c:271
81809b99 5639#, c-format
7aea43ff
JX
5640msgid "Deleted remote-tracking branch %s (was %s).\n"
5641msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
c04f5ac3 5642
6937cb4e 5643#: builtin/branch.c:272
81809b99 5644#, c-format
8ada9598 5645msgid "Deleted branch %s (was %s).\n"
81809b99 5646msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 5647
6937cb4e
JX
5648#: builtin/branch.c:417 builtin/tag.c:58
5649msgid "unable to parse format string"
5650msgstr "不能解析格式化字符串"
5651
5652#: builtin/branch.c:450
5b04ee3b
JX
5653#, c-format
5654msgid "Branch %s is being rebased at %s"
5655msgstr "分支 %s 正被变基到 %s"
5656
6937cb4e 5657#: builtin/branch.c:454
5b04ee3b
JX
5658#, c-format
5659msgid "Branch %s is being bisected at %s"
5660msgstr "分支 %s 正被二分查找于 %s"
5661
6937cb4e
JX
5662#: builtin/branch.c:470
5663msgid "cannot copy the current branch while not on any."
5664msgstr "无法拷贝当前分支因为不处于任何分支上。"
5665
5666#: builtin/branch.c:472
c04f5ac3 5667msgid "cannot rename the current branch while not on any."
90e6ef53 5668msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 5669
6937cb4e 5670#: builtin/branch.c:483
c04f5ac3
JX
5671#, c-format
5672msgid "Invalid branch name: '%s'"
5673msgstr "无效的分支名:'%s'"
5674
6937cb4e 5675#: builtin/branch.c:504
c04f5ac3
JX
5676msgid "Branch rename failed"
5677msgstr "分支重命名失败"
5678
6937cb4e
JX
5679#: builtin/branch.c:506
5680msgid "Branch copy failed"
5681msgstr "分支拷贝失败"
5682
5683#: builtin/branch.c:510
5684#, c-format
5685msgid "Copied a misnamed branch '%s' away"
5686msgstr "已将错误命名的分支 '%s' 复制"
5687
5688#: builtin/branch.c:513
c04f5ac3
JX
5689#, c-format
5690msgid "Renamed a misnamed branch '%s' away"
6937cb4e 5691msgstr "已将错误命名的分支 '%s' 重命名"
c04f5ac3 5692
6937cb4e 5693#: builtin/branch.c:519
c04f5ac3
JX
5694#, c-format
5695msgid "Branch renamed to %s, but HEAD is not updated!"
5696msgstr "分支重命名为 %s,但 HEAD 没有更新!"
5697
6937cb4e 5698#: builtin/branch.c:528
c04f5ac3 5699msgid "Branch is renamed, but update of config-file failed"
6937cb4e
JX
5700msgstr "分支被重命名,但更新配置文件失败"
5701
5702#: builtin/branch.c:530
5703msgid "Branch is copied, but update of config-file failed"
5704msgstr "分支已拷贝,但更新配置文件失败"
c04f5ac3 5705
6937cb4e 5706#: builtin/branch.c:546
5c57d762
JX
5707#, c-format
5708msgid ""
5709"Please edit the description for the branch\n"
5710" %s\n"
5711"Lines starting with '%c' will be stripped.\n"
5712msgstr ""
5713"请编辑分支的描述\n"
5714" %s\n"
5715"以 '%c' 开头的行将被过滤。\n"
c04f5ac3 5716
6937cb4e 5717#: builtin/branch.c:579
ef317cd5 5718msgid "Generic options"
07432cef 5719msgstr "通用选项"
c04f5ac3 5720
6937cb4e 5721#: builtin/branch.c:581
ef317cd5 5722msgid "show hash and subject, give twice for upstream branch"
07432cef 5723msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 5724
6937cb4e 5725#: builtin/branch.c:582
ef317cd5 5726msgid "suppress informational messages"
07432cef 5727msgstr "不显示信息"
8ada9598 5728
6937cb4e 5729#: builtin/branch.c:583
ef317cd5 5730msgid "set up tracking mode (see git-pull(1))"
07432cef 5731msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 5732
6937cb4e
JX
5733#: builtin/branch.c:585
5734msgid "do not use"
5735msgstr "不要使用"
c04f5ac3 5736
6937cb4e 5737#: builtin/branch.c:587
5b04ee3b
JX
5738msgid "upstream"
5739msgstr "上游"
5740
6937cb4e 5741#: builtin/branch.c:587
5b04ee3b
JX
5742msgid "change the upstream info"
5743msgstr "改变上游信息"
5744
6937cb4e 5745#: builtin/branch.c:588
a0b6b246
JX
5746msgid "Unset the upstream info"
5747msgstr "取消上游信息的设置"
5748
6937cb4e 5749#: builtin/branch.c:589
ef317cd5 5750msgid "use colored output"
07432cef 5751msgstr "使用彩色输出"
c04f5ac3 5752
6937cb4e 5753#: builtin/branch.c:590
ef317cd5 5754msgid "act on remote-tracking branches"
07432cef 5755msgstr "作用于远程跟踪分支"
c04f5ac3 5756
6937cb4e 5757#: builtin/branch.c:592 builtin/branch.c:594
ef317cd5 5758msgid "print only branches that contain the commit"
07432cef 5759msgstr "只打印包含该提交的分支"
c04f5ac3 5760
6937cb4e 5761#: builtin/branch.c:593 builtin/branch.c:595
87cb7997
JX
5762msgid "print only branches that don't contain the commit"
5763msgstr "只打印不包含该提交的分支"
5764
6937cb4e 5765#: builtin/branch.c:598
ef317cd5 5766msgid "Specific git-branch actions:"
07432cef 5767msgstr "具体的 git-branch 动作:"
c04f5ac3 5768
6937cb4e 5769#: builtin/branch.c:599
ef317cd5 5770msgid "list both remote-tracking and local branches"
07432cef 5771msgstr "列出远程跟踪及本地分支"
c04f5ac3 5772
6937cb4e 5773#: builtin/branch.c:601
ef317cd5 5774msgid "delete fully merged branch"
07432cef 5775msgstr "删除完全合并的分支"
c04f5ac3 5776
6937cb4e 5777#: builtin/branch.c:602
ef317cd5 5778msgid "delete branch (even if not merged)"
07432cef 5779msgstr "删除分支(即使没有合并)"
c04f5ac3 5780
6937cb4e 5781#: builtin/branch.c:603
ef317cd5 5782msgid "move/rename a branch and its reflog"
07432cef 5783msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 5784
6937cb4e 5785#: builtin/branch.c:604
ef317cd5 5786msgid "move/rename a branch, even if target exists"
07432cef 5787msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 5788
6937cb4e
JX
5789#: builtin/branch.c:605
5790msgid "copy a branch and its reflog"
5791msgstr "拷贝一个分支和它的引用日志"
5792
5793#: builtin/branch.c:606
5794msgid "copy a branch, even if target exists"
5795msgstr "拷贝一个分支,即使目标已存在"
5796
5797#: builtin/branch.c:607
ef317cd5 5798msgid "list branch names"
07432cef 5799msgstr "列出分支名"
c04f5ac3 5800
6937cb4e 5801#: builtin/branch.c:608
ef317cd5 5802msgid "create the branch's reflog"
07432cef 5803msgstr "创建分支的引用日志"
ef317cd5 5804
6937cb4e 5805#: builtin/branch.c:610
ef317cd5 5806msgid "edit the description for the branch"
07432cef 5807msgstr "标记分支的描述"
ef317cd5 5808
6937cb4e 5809#: builtin/branch.c:611
04cb2f28
JX
5810msgid "force creation, move/rename, deletion"
5811msgstr "强制创建、移动/重命名、删除"
ef317cd5 5812
6937cb4e 5813#: builtin/branch.c:612
94550ed3
JX
5814msgid "print only branches that are merged"
5815msgstr "只打印已经合并的分支"
ef317cd5 5816
6937cb4e 5817#: builtin/branch.c:613
94550ed3
JX
5818msgid "print only branches that are not merged"
5819msgstr "只打印尚未合并的分支"
ef317cd5 5820
6937cb4e 5821#: builtin/branch.c:614
ef317cd5 5822msgid "list branches in columns"
07432cef 5823msgstr "以列的方式显示分支"
ef317cd5 5824
6937cb4e 5825#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
94550ed3
JX
5826msgid "key"
5827msgstr "key"
5828
6937cb4e 5829#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
94550ed3
JX
5830msgid "field name to sort on"
5831msgstr "排序的字段名"
5832
6937cb4e
JX
5833#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408
5834#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
5835#: builtin/tag.c:408
94550ed3
JX
5836msgid "object"
5837msgstr "对象"
5838
6937cb4e 5839#: builtin/branch.c:619
94550ed3
JX
5840msgid "print only branches of the object"
5841msgstr "只打印指向该对象的分支"
5842
6937cb4e 5843#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
1a79b2f1
JX
5844msgid "sorting and filtering are case insensitive"
5845msgstr "排序和过滤属于大小写不敏感"
5846
6937cb4e 5847#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
a4f16749 5848#: builtin/verify-tag.c:39
87cb7997
JX
5849msgid "format to use for the output"
5850msgstr "输出格式"
5851
6937cb4e 5852#: builtin/branch.c:645 builtin/clone.c:729
c04f5ac3 5853msgid "HEAD not found below refs/heads!"
90e6ef53 5854msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 5855
6937cb4e 5856#: builtin/branch.c:668
8ada9598 5857msgid "--column and --verbose are incompatible"
81809b99 5858msgstr "--column 和 --verbose 不兼容"
8ada9598 5859
6937cb4e 5860#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
a77c07d9
JX
5861msgid "branch name required"
5862msgstr "必须提供分支名"
5863
6937cb4e 5864#: builtin/branch.c:708
a77c07d9
JX
5865msgid "Cannot give description to detached HEAD"
5866msgstr "不能向分离头指针提供描述"
5867
6937cb4e 5868#: builtin/branch.c:713
a77c07d9
JX
5869msgid "cannot edit description of more than one branch"
5870msgstr "不能为一个以上的分支编辑描述"
5871
6937cb4e 5872#: builtin/branch.c:720
a77c07d9
JX
5873#, c-format
5874msgid "No commit on branch '%s' yet."
5875msgstr "分支 '%s' 尚无提交。"
5876
6937cb4e 5877#: builtin/branch.c:723
a77c07d9
JX
5878#, c-format
5879msgid "No branch named '%s'."
5880msgstr "没有分支 '%s'。"
5881
6937cb4e
JX
5882#: builtin/branch.c:738
5883msgid "too many branches for a copy operation"
5884msgstr "为拷贝操作提供了太多的分支名"
a77c07d9 5885
6937cb4e
JX
5886#: builtin/branch.c:747
5887msgid "too many arguments for a rename operation"
5888msgstr "为重命名操作提供了太多的参数"
1003b3a5 5889
6937cb4e
JX
5890#: builtin/branch.c:752
5891msgid "too many arguments to set new upstream"
5892msgstr "为设置新上游提供了太多的参数"
5893
5894#: builtin/branch.c:756
1003b3a5
JX
5895#, c-format
5896msgid ""
5897"could not set upstream of HEAD to %s when it does not point to any branch."
5898msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
5899
6937cb4e 5900#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
1003b3a5
JX
5901#, c-format
5902msgid "no such branch '%s'"
5903msgstr "没有此分支 '%s'"
5904
6937cb4e 5905#: builtin/branch.c:763
07432cef 5906#, c-format
ef317cd5 5907msgid "branch '%s' does not exist"
07432cef 5908msgstr "分支 '%s' 不存在"
ef317cd5 5909
6937cb4e
JX
5910#: builtin/branch.c:775
5911msgid "too many arguments to unset upstream"
5912msgstr "为取消上游设置操作提供了太多的参数"
1003b3a5 5913
6937cb4e 5914#: builtin/branch.c:779
1003b3a5
JX
5915msgid "could not unset upstream of HEAD when it does not point to any branch."
5916msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
5917
6937cb4e 5918#: builtin/branch.c:785
ef317cd5
JX
5919#, c-format
5920msgid "Branch '%s' has no upstream information"
07432cef 5921msgstr "分支 '%s' 没有上游信息"
ef317cd5 5922
6937cb4e 5923#: builtin/branch.c:797
1003b3a5
JX
5924msgid "it does not make sense to create 'HEAD' manually"
5925msgstr "手工创建 'HEAD' 没有意义"
5926
6937cb4e 5927#: builtin/branch.c:803
c04f5ac3
JX
5928msgid "-a and -r options to 'git branch' do not make sense with a branch name"
5929msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
5930
6937cb4e 5931#: builtin/branch.c:806
ef317cd5 5932msgid ""
6937cb4e
JX
5933"the '--set-upstream' option is no longer supported. Please use '--track' or "
5934"'--set-upstream-to' instead."
ef317cd5 5935msgstr ""
6937cb4e 5936"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
ef317cd5 5937
87cb7997 5938#: builtin/bundle.c:45
c04f5ac3
JX
5939#, c-format
5940msgid "%s is okay\n"
5941msgstr "%s 可以\n"
5942
87cb7997 5943#: builtin/bundle.c:58
c04f5ac3 5944msgid "Need a repository to create a bundle."
160fb2b2 5945msgstr "需要一个仓库来创建包。"
c04f5ac3 5946
87cb7997 5947#: builtin/bundle.c:62
c04f5ac3 5948msgid "Need a repository to unbundle."
160fb2b2 5949msgstr "需要一个仓库来解包。"
c04f5ac3 5950
6937cb4e 5951#: builtin/cat-file.c:521
7aea43ff 5952msgid ""
a0b6b246
JX
5953"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5954"p | <type> | --textconv | --filters) [--path=<path>] <object>"
275588f9
JX
5955msgstr ""
5956"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5957"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
ef317cd5 5958
6937cb4e 5959#: builtin/cat-file.c:522
a0b6b246
JX
5960msgid ""
5961"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5962"filters]"
275588f9
JX
5963msgstr ""
5964"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5965"filters]"
ef317cd5 5966
6937cb4e 5967#: builtin/cat-file.c:559
ef317cd5 5968msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 5969msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 5970
6937cb4e 5971#: builtin/cat-file.c:560
ef317cd5 5972msgid "show object type"
07432cef 5973msgstr "显示对象类型"
ef317cd5 5974
6937cb4e 5975#: builtin/cat-file.c:561
ef317cd5 5976msgid "show object size"
07432cef 5977msgstr "显示对象大小"
ef317cd5 5978
6937cb4e 5979#: builtin/cat-file.c:563
ef317cd5 5980msgid "exit with zero when there's no error"
07432cef 5981msgstr "当没有错误时退出并返回零"
ef317cd5 5982
6937cb4e 5983#: builtin/cat-file.c:564
ef317cd5 5984msgid "pretty-print object's content"
07432cef 5985msgstr "美观地打印对象的内容"
ef317cd5 5986
6937cb4e 5987#: builtin/cat-file.c:566
ef317cd5 5988msgid "for blob objects, run textconv on object's content"
a0b6b246
JX
5989msgstr "对于数据对象,对其内容做文本转换"
5990
6937cb4e 5991#: builtin/cat-file.c:568
a0b6b246
JX
5992msgid "for blob objects, run filters on object's content"
5993msgstr "对于数据对象,对其内容做过滤"
5994
6937cb4e 5995#: builtin/cat-file.c:569 git-submodule.sh:943
a0b6b246
JX
5996msgid "blob"
5997msgstr "数据对象"
5998
6937cb4e 5999#: builtin/cat-file.c:570
a0b6b246
JX
6000msgid "use a specific path for --textconv/--filters"
6001msgstr "对于 --textconv/--filters 使用一个特定的路径"
ef317cd5 6002
6937cb4e 6003#: builtin/cat-file.c:572
7aea43ff
JX
6004msgid "allow -s and -t to work with broken/corrupt objects"
6005msgstr "允许 -s 和 -t 对损坏的对象生效"
6006
6937cb4e 6007#: builtin/cat-file.c:573
1b7f4a34
JX
6008msgid "buffer --batch output"
6009msgstr "缓冲 --batch 的输出"
6010
6937cb4e 6011#: builtin/cat-file.c:575
ef317cd5 6012msgid "show info and content of objects fed from the standard input"
07432cef 6013msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 6014
6937cb4e 6015#: builtin/cat-file.c:578
ef317cd5 6016msgid "show info about objects fed from the standard input"
07432cef 6017msgstr "显示从标准输入提供的对象的信息"
ef317cd5 6018
6937cb4e 6019#: builtin/cat-file.c:581
7aea43ff
JX
6020msgid "follow in-tree symlinks (used with --batch or --batch-check)"
6021msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
6022
6937cb4e 6023#: builtin/cat-file.c:583
1b7f4a34
JX
6024msgid "show all objects with --batch or --batch-check"
6025msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
6026
a4f16749 6027#: builtin/check-attr.c:12
814ff314
JX
6028msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
6029msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
ef317cd5 6030
a4f16749 6031#: builtin/check-attr.c:13
94550ed3
JX
6032msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
6033msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
ef317cd5 6034
a4f16749 6035#: builtin/check-attr.c:20
ef317cd5 6036msgid "report all attributes set on file"
07432cef 6037msgstr "报告设置在文件上的所有属性"
ef317cd5 6038
a4f16749 6039#: builtin/check-attr.c:21
ef317cd5 6040msgid "use .gitattributes only from the index"
07432cef 6041msgstr "只使用索引中的 .gitattributes"
ef317cd5 6042
a4f16749 6043#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
ef317cd5 6044msgid "read file names from stdin"
07432cef 6045msgstr "从标准输入读出文件名"
ef317cd5 6046
a4f16749 6047#: builtin/check-attr.c:24 builtin/check-ignore.c:26
90314792
JX
6048msgid "terminate input and output records by a NUL character"
6049msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 6050
6937cb4e 6051#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
a77c07d9
JX
6052msgid "suppress progress reporting"
6053msgstr "不显示进度报告"
6054
a4f16749 6055#: builtin/check-ignore.c:28
2e8451e8
JX
6056msgid "show non-matching input paths"
6057msgstr "显示未匹配的输入路径"
6058
a4f16749 6059#: builtin/check-ignore.c:30
90314792
JX
6060msgid "ignore index when checking"
6061msgstr "检查时忽略索引"
6062
a4f16749 6063#: builtin/check-ignore.c:158
a77c07d9 6064msgid "cannot specify pathnames with --stdin"
1b7f4a34 6065msgstr "不能同时指定路径及 --stdin 参数"
a77c07d9 6066
a4f16749 6067#: builtin/check-ignore.c:161
a77c07d9
JX
6068msgid "-z only makes sense with --stdin"
6069msgstr "-z 需要和 --stdin 参数共用才有意义"
6070
a4f16749 6071#: builtin/check-ignore.c:163
a77c07d9
JX
6072msgid "no path specified"
6073msgstr "未指定路径"
6074
a4f16749 6075#: builtin/check-ignore.c:167
a77c07d9
JX
6076msgid "--quiet is only valid with a single pathname"
6077msgstr "参数 --quiet 只在提供一个路径名时有效"
6078
a4f16749 6079#: builtin/check-ignore.c:169
a77c07d9
JX
6080msgid "cannot have both --quiet and --verbose"
6081msgstr "不能同时提供 --quiet 和 --verbose 参数"
6082
a4f16749 6083#: builtin/check-ignore.c:172
2e8451e8
JX
6084msgid "--non-matching is only valid with --verbose"
6085msgstr "--non-matching 选项只在使用 --verbose 时有效"
6086
a4f16749 6087#: builtin/check-mailmap.c:9
814ff314
JX
6088msgid "git check-mailmap [<options>] <contact>..."
6089msgstr "git check-mailmap [<选项>] <联系地址>..."
2e8451e8 6090
a4f16749 6091#: builtin/check-mailmap.c:14
2e8451e8
JX
6092msgid "also read contacts from stdin"
6093msgstr "还从标准输入读取联系地址"
6094
a4f16749 6095#: builtin/check-mailmap.c:25
2e8451e8
JX
6096#, c-format
6097msgid "unable to parse contact: %s"
6098msgstr "不能解析联系地址:%s"
6099
a4f16749 6100#: builtin/check-mailmap.c:48
2e8451e8
JX
6101msgid "no contacts specified"
6102msgstr "未指定联系地址"
6103
a4f16749 6104#: builtin/checkout-index.c:128
814ff314
JX
6105msgid "git checkout-index [<options>] [--] [<file>...]"
6106msgstr "git checkout-index [<选项>] [--] [<文件>...]"
ef317cd5 6107
a4f16749 6108#: builtin/checkout-index.c:145
276ceeaa
JX
6109msgid "stage should be between 1 and 3 or all"
6110msgstr "索引值应该取值 1 到 3 或者 all"
6111
a4f16749 6112#: builtin/checkout-index.c:161
ef317cd5 6113msgid "check out all files in the index"
07432cef 6114msgstr "检出索引区的所有文件"
ef317cd5 6115
a4f16749 6116#: builtin/checkout-index.c:162
ef317cd5 6117msgid "force overwrite of existing files"
07432cef 6118msgstr "强制覆盖现有的文件"
ef317cd5 6119
a4f16749 6120#: builtin/checkout-index.c:164
ef317cd5 6121msgid "no warning for existing files and files not in index"
07432cef 6122msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 6123
a4f16749 6124#: builtin/checkout-index.c:166
ef317cd5 6125msgid "don't checkout new files"
07432cef 6126msgstr "不检出新文件"
ef317cd5 6127
a4f16749 6128#: builtin/checkout-index.c:168
ef317cd5 6129msgid "update stat information in the index file"
07432cef 6130msgstr "更新索引中文件的状态信息"
ef317cd5 6131
a4f16749 6132#: builtin/checkout-index.c:172
ef317cd5 6133msgid "read list of paths from the standard input"
07432cef 6134msgstr "从标准输入读取路径列表"
ef317cd5 6135
a4f16749 6136#: builtin/checkout-index.c:174
ef317cd5 6137msgid "write the content to temporary files"
07432cef 6138msgstr "将内容写入临时文件"
ef317cd5 6139
a4f16749 6140#: builtin/checkout-index.c:175 builtin/column.c:31
6937cb4e
JX
6141#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
6142#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
6143#: builtin/worktree.c:498
ef317cd5 6144msgid "string"
07432cef 6145msgstr "字符串"
ef317cd5 6146
a4f16749 6147#: builtin/checkout-index.c:176
ef317cd5 6148msgid "when creating files, prepend <string>"
4375c10e 6149msgstr "在创建文件时,在前面加上 <字符串>"
ef317cd5 6150
a4f16749 6151#: builtin/checkout-index.c:178
ef317cd5 6152msgid "copy out the files from named stage"
07432cef 6153msgstr "从指定暂存区中拷出文件"
ef317cd5 6154
a4f16749 6155#: builtin/checkout.c:26
814ff314
JX
6156msgid "git checkout [<options>] <branch>"
6157msgstr "git checkout [<选项>] <分支>"
ef317cd5 6158
a4f16749 6159#: builtin/checkout.c:27
814ff314
JX
6160msgid "git checkout [<options>] [<branch>] -- <file>..."
6161msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
ef317cd5 6162
a4f16749 6163#: builtin/checkout.c:135 builtin/checkout.c:168
c04f5ac3
JX
6164#, c-format
6165msgid "path '%s' does not have our version"
6166msgstr "路径 '%s' 没有我们的版本"
6167
a4f16749 6168#: builtin/checkout.c:137 builtin/checkout.c:170
c04f5ac3
JX
6169#, c-format
6170msgid "path '%s' does not have their version"
6171msgstr "路径 '%s' 没有他们的版本"
6172
a4f16749 6173#: builtin/checkout.c:153
c04f5ac3
JX
6174#, c-format
6175msgid "path '%s' does not have all necessary versions"
6176msgstr "路径 '%s' 没有全部必须的版本"
6177
a4f16749 6178#: builtin/checkout.c:197
c04f5ac3
JX
6179#, c-format
6180msgid "path '%s' does not have necessary versions"
6181msgstr "路径 '%s' 没有必须的版本"
6182
a4f16749 6183#: builtin/checkout.c:214
c04f5ac3
JX
6184#, c-format
6185msgid "path '%s': cannot merge"
90e6ef53 6186msgstr "path '%s':无法合并"
c04f5ac3 6187
a4f16749 6188#: builtin/checkout.c:231
c04f5ac3
JX
6189#, c-format
6190msgid "Unable to add merge result for '%s'"
6191msgstr "无法为 '%s' 添加合并结果"
6192
a4f16749
JX
6193#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
6194#: builtin/checkout.c:262
07432cef 6195#, c-format
ef317cd5 6196msgid "'%s' cannot be used with updating paths"
07432cef 6197msgstr "'%s' 不能在更新路径时使用"
ef317cd5 6198
a4f16749 6199#: builtin/checkout.c:265 builtin/checkout.c:268
07432cef 6200#, c-format
ef317cd5 6201msgid "'%s' cannot be used with %s"
07432cef 6202msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 6203
a4f16749 6204#: builtin/checkout.c:271
ef317cd5
JX
6205#, c-format
6206msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 6207msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 6208
a4f16749 6209#: builtin/checkout.c:342 builtin/checkout.c:349
c04f5ac3
JX
6210#, c-format
6211msgid "path '%s' is unmerged"
6212msgstr "路径 '%s' 未合并"
6213
6937cb4e 6214#: builtin/checkout.c:501
c04f5ac3 6215msgid "you need to resolve your current index first"
90e6ef53 6216msgstr "您需要先解决当前索引的冲突"
c04f5ac3 6217
6937cb4e 6218#: builtin/checkout.c:632
c04f5ac3 6219#, c-format
1b7f4a34
JX
6220msgid "Can not do reflog for '%s': %s\n"
6221msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
c04f5ac3 6222
6937cb4e 6223#: builtin/checkout.c:673
c04f5ac3
JX
6224msgid "HEAD is now at"
6225msgstr "HEAD 目前位于"
6226
6937cb4e 6227#: builtin/checkout.c:677 builtin/clone.c:683
3495628d
JX
6228msgid "unable to update HEAD"
6229msgstr "不能更新 HEAD"
6230
6937cb4e 6231#: builtin/checkout.c:681
c04f5ac3
JX
6232#, c-format
6233msgid "Reset branch '%s'\n"
6234msgstr "重置分支 '%s'\n"
6235
6937cb4e 6236#: builtin/checkout.c:684
c04f5ac3
JX
6237#, c-format
6238msgid "Already on '%s'\n"
6239msgstr "已经位于 '%s'\n"
6240
6937cb4e 6241#: builtin/checkout.c:688
c04f5ac3
JX
6242#, c-format
6243msgid "Switched to and reset branch '%s'\n"
6244msgstr "切换并重置分支 '%s'\n"
6245
6937cb4e 6246#: builtin/checkout.c:690 builtin/checkout.c:1086
c04f5ac3
JX
6247#, c-format
6248msgid "Switched to a new branch '%s'\n"
6249msgstr "切换到一个新分支 '%s'\n"
6250
6937cb4e 6251#: builtin/checkout.c:692
c04f5ac3
JX
6252#, c-format
6253msgid "Switched to branch '%s'\n"
6254msgstr "切换到分支 '%s'\n"
6255
90e6ef53 6256# 译者:注意保持前导空格
6937cb4e 6257#: builtin/checkout.c:743
c04f5ac3
JX
6258#, c-format
6259msgid " ... and %d more.\n"
90e6ef53 6260msgstr " ... 及其它 %d 个。\n"
c04f5ac3 6261
6937cb4e 6262#: builtin/checkout.c:749
c04f5ac3
JX
6263#, c-format
6264msgid ""
6265"Warning: you are leaving %d commit behind, not connected to\n"
6266"any of your branches:\n"
6267"\n"
6268"%s\n"
6269msgid_plural ""
6270"Warning: you are leaving %d commits behind, not connected to\n"
6271"any of your branches:\n"
6272"\n"
6273"%s\n"
6274msgstr[0] ""
6275"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
6276"\n"
6277"%s\n"
5ae481e0
JX
6278msgstr[1] ""
6279"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
6280"\n"
6281"%s\n"
c04f5ac3 6282
6937cb4e 6283#: builtin/checkout.c:768
c04f5ac3
JX
6284#, c-format
6285msgid ""
7aea43ff
JX
6286"If you want to keep it by creating a new branch, this may be a good time\n"
6287"to do so with:\n"
6288"\n"
6289" git branch <new-branch-name> %s\n"
6290"\n"
6291msgid_plural ""
c04f5ac3
JX
6292"If you want to keep them by creating a new branch, this may be a good time\n"
6293"to do so with:\n"
6294"\n"
814ff314 6295" git branch <new-branch-name> %s\n"
c04f5ac3 6296"\n"
7aea43ff
JX
6297msgstr[0] ""
6298"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
6299"如下操作:\n"
6300"\n"
6301" git branch <新分支名> %s\n"
6302"\n"
6303msgstr[1] ""
6304"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
c04f5ac3
JX
6305"如下操作:\n"
6306"\n"
814ff314 6307" git branch <新分支名> %s\n"
c04f5ac3
JX
6308"\n"
6309
6937cb4e 6310#: builtin/checkout.c:809
c04f5ac3
JX
6311msgid "internal error in revision walk"
6312msgstr "在版本遍历时遇到内部错误"
6313
6937cb4e 6314#: builtin/checkout.c:813
c04f5ac3
JX
6315msgid "Previous HEAD position was"
6316msgstr "之前的 HEAD 位置是"
6317
6937cb4e 6318#: builtin/checkout.c:843 builtin/checkout.c:1081
c04f5ac3 6319msgid "You are on a branch yet to be born"
90e6ef53 6320msgstr "您位于一个尚未初始化的分支"
c04f5ac3 6321
6937cb4e 6322#: builtin/checkout.c:987
90314792
JX
6323#, c-format
6324msgid "only one reference expected, %d given."
a0b6b246 6325msgstr "应只有一个引用,却给出了 %d 个"
90314792 6326
6937cb4e 6327#: builtin/checkout.c:1027 builtin/worktree.c:233
c04f5ac3
JX
6328#, c-format
6329msgid "invalid reference: %s"
6330msgstr "无效引用:%s"
6331
6937cb4e 6332#: builtin/checkout.c:1056
c04f5ac3
JX
6333#, c-format
6334msgid "reference is not a tree: %s"
6335msgstr "引用不是一个树:%s"
6336
6937cb4e 6337#: builtin/checkout.c:1095
ef317cd5 6338msgid "paths cannot be used with switching branches"
07432cef 6339msgstr "路径不能和切换分支同时使用"
c04f5ac3 6340
6937cb4e 6341#: builtin/checkout.c:1098 builtin/checkout.c:1102
07432cef 6342#, c-format
ef317cd5 6343msgid "'%s' cannot be used with switching branches"
07432cef 6344msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 6345
6937cb4e
JX
6346#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
6347#: builtin/checkout.c:1117
07432cef 6348#, c-format
ef317cd5 6349msgid "'%s' cannot be used with '%s'"
07432cef 6350msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 6351
6937cb4e 6352#: builtin/checkout.c:1122
07432cef 6353#, c-format
ef317cd5 6354msgid "Cannot switch branch to a non-commit '%s'"
07432cef 6355msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 6356
6937cb4e
JX
6357#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114
6358#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346
6359#: builtin/worktree.c:348
ef317cd5 6360msgid "branch"
07432cef 6361msgstr "分支"
c04f5ac3 6362
6937cb4e 6363#: builtin/checkout.c:1155
ef317cd5 6364msgid "create and checkout a new branch"
07432cef 6365msgstr "创建并检出一个新的分支"
c04f5ac3 6366
6937cb4e 6367#: builtin/checkout.c:1157
ef317cd5 6368msgid "create/reset and checkout a branch"
07432cef 6369msgstr "创建/重置并检出一个分支"
c04f5ac3 6370
6937cb4e 6371#: builtin/checkout.c:1158
ef317cd5 6372msgid "create reflog for new branch"
07432cef 6373msgstr "为新的分支创建引用日志"
ef317cd5 6374
6937cb4e 6375#: builtin/checkout.c:1159 builtin/worktree.c:350
5c57d762
JX
6376msgid "detach HEAD at named commit"
6377msgstr "HEAD 从指定的提交分离"
ef317cd5 6378
6937cb4e 6379#: builtin/checkout.c:1160
ef317cd5 6380msgid "set upstream info for new branch"
07432cef 6381msgstr "为新的分支设置上游信息"
ef317cd5 6382
6937cb4e 6383#: builtin/checkout.c:1162
6c94aba5 6384msgid "new-branch"
07432cef 6385msgstr "新分支"
ef317cd5 6386
6937cb4e 6387#: builtin/checkout.c:1162
ef317cd5 6388msgid "new unparented branch"
07432cef 6389msgstr "新的没有父提交的分支"
ef317cd5 6390
6937cb4e 6391#: builtin/checkout.c:1163
ef317cd5 6392msgid "checkout our version for unmerged files"
07432cef 6393msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 6394
6937cb4e 6395#: builtin/checkout.c:1165
ef317cd5 6396msgid "checkout their version for unmerged files"
07432cef 6397msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 6398
6937cb4e 6399#: builtin/checkout.c:1167
ef317cd5 6400msgid "force checkout (throw away local modifications)"
07432cef 6401msgstr "强制检出(丢弃本地修改)"
c04f5ac3 6402
6937cb4e 6403#: builtin/checkout.c:1168
ef317cd5 6404msgid "perform a 3-way merge with the new branch"
160fb2b2 6405msgstr "和新的分支执行三方合并"
ef317cd5 6406
6937cb4e 6407#: builtin/checkout.c:1169 builtin/merge.c:238
ef317cd5 6408msgid "update ignored files (default)"
07432cef 6409msgstr "更新忽略的文件(默认)"
c04f5ac3 6410
6937cb4e 6411#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
ef317cd5 6412msgid "style"
07432cef 6413msgstr "风格"
ef317cd5 6414
6937cb4e 6415#: builtin/checkout.c:1171
ef317cd5 6416msgid "conflict style (merge or diff3)"
07432cef 6417msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 6418
6937cb4e 6419#: builtin/checkout.c:1174
4dcdc3d8
JX
6420msgid "do not limit pathspecs to sparse entries only"
6421msgstr "对路径不做稀疏检出的限制"
6422
6937cb4e 6423#: builtin/checkout.c:1176
814ff314
JX
6424msgid "second guess 'git checkout <no-such-branch>'"
6425msgstr "二次猜测'git checkout <无此分支>'"
ef317cd5 6426
6937cb4e 6427#: builtin/checkout.c:1178
7aea43ff
JX
6428msgid "do not check if another worktree is holding the given ref"
6429msgstr "不检查指定的引用是否被其他工作区所占用"
6430
6937cb4e
JX
6431#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136
6432#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544
a4f16749 6433#: builtin/send-pack.c:173
94550ed3
JX
6434msgid "force progress reporting"
6435msgstr "强制显示进度报告"
6436
6937cb4e 6437#: builtin/checkout.c:1212
ef317cd5 6438msgid "-b, -B and --orphan are mutually exclusive"
07432cef 6439msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 6440
6937cb4e 6441#: builtin/checkout.c:1229
ef317cd5
JX
6442msgid "--track needs a branch name"
6443msgstr "--track 需要一个分支名"
6444
6937cb4e 6445#: builtin/checkout.c:1234
ef317cd5
JX
6446msgid "Missing branch name; try -b"
6447msgstr "缺少分支名;尝试 -b"
6448
6937cb4e 6449#: builtin/checkout.c:1270
c04f5ac3 6450msgid "invalid path specification"
90e6ef53 6451msgstr "无效的路径规格"
c04f5ac3 6452
6937cb4e 6453#: builtin/checkout.c:1277
07432cef 6454#, c-format
a4f16749
JX
6455msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
6456msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'"
c04f5ac3 6457
6937cb4e 6458#: builtin/checkout.c:1281
07432cef 6459#, c-format
ef317cd5 6460msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 6461msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 6462
6937cb4e 6463#: builtin/checkout.c:1285
c04f5ac3
JX
6464msgid ""
6465"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
6466"checking out of the index."
6467msgstr ""
90e6ef53 6468"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 6469
a4f16749 6470#: builtin/clean.c:26
2e8451e8
JX
6471msgid ""
6472"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
6473msgstr ""
6474"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 6475
a4f16749 6476#: builtin/clean.c:30
07432cef
WS
6477#, c-format
6478msgid "Removing %s\n"
6479msgstr "正删除 %s\n"
6480
a4f16749 6481#: builtin/clean.c:31
07432cef
WS
6482#, c-format
6483msgid "Would remove %s\n"
6484msgstr "将删除 %s\n"
6485
a4f16749 6486#: builtin/clean.c:32
07432cef
WS
6487#, c-format
6488msgid "Skipping repository %s\n"
160fb2b2 6489msgstr "忽略仓库 %s\n"
07432cef 6490
a4f16749 6491#: builtin/clean.c:33
07432cef
WS
6492#, c-format
6493msgid "Would skip repository %s\n"
160fb2b2 6494msgstr "将忽略仓库 %s\n"
07432cef 6495
a4f16749 6496#: builtin/clean.c:34
07432cef
WS
6497#, c-format
6498msgid "failed to remove %s"
6499msgstr "无法删除 %s"
6500
6937cb4e 6501#: builtin/clean.c:301 git-add--interactive.perl:572
1a79b2f1 6502#, c-format
2e8451e8
JX
6503msgid ""
6504"Prompt help:\n"
6505"1 - select a numbered item\n"
6506"foo - select item based on unique prefix\n"
1a79b2f1 6507" - (empty) select nothing\n"
2e8451e8
JX
6508msgstr ""
6509"帮助:\n"
6510"1 - 通过编号选择一个选项\n"
1a79b2f1
JX
6511"foo - 通过唯一前缀选择一个选项\n"
6512" - (空)什么也不选择\n"
2e8451e8 6513
6937cb4e 6514#: builtin/clean.c:305 git-add--interactive.perl:581
1a79b2f1 6515#, c-format
2e8451e8
JX
6516msgid ""
6517"Prompt help:\n"
6518"1 - select a single item\n"
6519"3-5 - select a range of items\n"
6520"2-3,6-9 - select multiple ranges\n"
6521"foo - select item based on unique prefix\n"
6522"-... - unselect specified items\n"
6523"* - choose all items\n"
1a79b2f1 6524" - (empty) finish selecting\n"
2e8451e8
JX
6525msgstr ""
6526"帮助:\n"
6527"1 - 选择一个选项\n"
6528"3-5 - 选择一个范围内的所有选项\n"
6529"2-3,6-9 - 选择多个范围内的所有选项\n"
1a79b2f1 6530"foo - 通过唯一前缀选择一个选项\n"
2e8451e8
JX
6531"-... - 反选特定的选项\n"
6532"* - 选择所有选项\n"
1a79b2f1 6533" - (空)结束选择\n"
2e8451e8 6534
6937cb4e 6535#: builtin/clean.c:521 git-add--interactive.perl:547
a4f16749 6536#: git-add--interactive.perl:552
1a79b2f1
JX
6537#, c-format, perl-format
6538msgid "Huh (%s)?\n"
6539msgstr "嗯(%s)?\n"
2e8451e8 6540
6937cb4e 6541#: builtin/clean.c:663
2e8451e8
JX
6542#, c-format
6543msgid "Input ignore patterns>> "
6544msgstr "输入模版以排除条目>> "
6545
6937cb4e 6546#: builtin/clean.c:700
2e8451e8
JX
6547#, c-format
6548msgid "WARNING: Cannot find items matched by: %s"
6549msgstr "警告:无法找到和 %s 匹配的条目"
6550
6937cb4e 6551#: builtin/clean.c:721
2e8451e8
JX
6552msgid "Select items to delete"
6553msgstr "选择要删除的条目"
6554
814ff314 6555#. TRANSLATORS: Make sure to keep [y/N] as is
6937cb4e 6556#: builtin/clean.c:762
2e8451e8 6557#, c-format
814ff314
JX
6558msgid "Remove %s [y/N]? "
6559msgstr "删除 %s [y/N]?"
2e8451e8 6560
6937cb4e 6561#: builtin/clean.c:787 git-add--interactive.perl:1616
1a79b2f1
JX
6562#, c-format
6563msgid "Bye.\n"
6564msgstr "再见。\n"
2e8451e8 6565
6937cb4e 6566#: builtin/clean.c:795
2e8451e8
JX
6567msgid ""
6568"clean - start cleaning\n"
6569"filter by pattern - exclude items from deletion\n"
6570"select by numbers - select items to be deleted by numbers\n"
6571"ask each - confirm each deletion (like \"rm -i\")\n"
6572"quit - stop cleaning\n"
6573"help - this screen\n"
6574"? - help for prompt selection"
6575msgstr ""
6576"clean - 开始清理\n"
6577"filter by pattern - 通过模版排除要删除的条目\n"
6578"select by numbers - 通过数字选择要删除的条目\n"
6579"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
6580"quit - 停止删除并退出\n"
6581"help - 显示本帮助\n"
6582"? - 显示如何在提示符下选择的帮助"
6583
6937cb4e 6584#: builtin/clean.c:822 git-add--interactive.perl:1692
2e8451e8
JX
6585msgid "*** Commands ***"
6586msgstr "*** 命令 ***"
6587
6937cb4e 6588#: builtin/clean.c:823 git-add--interactive.perl:1689
2e8451e8
JX
6589msgid "What now"
6590msgstr "请选择"
6591
6937cb4e 6592#: builtin/clean.c:831
2e8451e8
JX
6593msgid "Would remove the following item:"
6594msgid_plural "Would remove the following items:"
6595msgstr[0] "将删除如下条目:"
6596msgstr[1] "将删除如下条目:"
6597
6937cb4e 6598#: builtin/clean.c:847
2e8451e8
JX
6599msgid "No more files to clean, exiting."
6600msgstr "没有要清理的文件,退出。"
6601
6937cb4e 6602#: builtin/clean.c:909
ef317cd5 6603msgid "do not print names of files removed"
07432cef 6604msgstr "不打印删除文件的名称"
ef317cd5 6605
6937cb4e 6606#: builtin/clean.c:911
ef317cd5 6607msgid "force"
07432cef 6608msgstr "强制"
ef317cd5 6609
6937cb4e 6610#: builtin/clean.c:912
2e8451e8
JX
6611msgid "interactive cleaning"
6612msgstr "交互式清除"
6613
6937cb4e 6614#: builtin/clean.c:914
ef317cd5 6615msgid "remove whole directories"
07432cef 6616msgstr "删除整个目录"
ef317cd5 6617
6937cb4e
JX
6618#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465
6619#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397
a4f16749 6620#: builtin/name-rev.c:399 builtin/show-ref.c:176
ef317cd5 6621msgid "pattern"
07432cef 6622msgstr "模式"
ef317cd5 6623
6937cb4e 6624#: builtin/clean.c:916
ef317cd5 6625msgid "add <pattern> to ignore rules"
4375c10e 6626msgstr "添加 <模式> 到忽略规则"
ef317cd5 6627
6937cb4e 6628#: builtin/clean.c:917
ef317cd5 6629msgid "remove ignored files, too"
07432cef 6630msgstr "也删除忽略的文件"
ef317cd5 6631
6937cb4e 6632#: builtin/clean.c:919
ef317cd5 6633msgid "remove only ignored files"
07432cef 6634msgstr "只删除忽略的文件"
c04f5ac3 6635
6937cb4e 6636#: builtin/clean.c:937
c04f5ac3 6637msgid "-x and -X cannot be used together"
649900bc 6638msgstr "-x 和 -X 不能同时使用"
c04f5ac3 6639
6937cb4e 6640#: builtin/clean.c:941
c04f5ac3 6641msgid ""
6c94aba5 6642"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 6643"clean"
c04f5ac3 6644msgstr ""
2e8451e8 6645"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 6646
6937cb4e 6647#: builtin/clean.c:944
c04f5ac3 6648msgid ""
6c94aba5 6649"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 6650"refusing to clean"
c04f5ac3 6651msgstr ""
2e8451e8 6652"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 6653
6937cb4e 6654#: builtin/clone.c:39
814ff314 6655msgid "git clone [<options>] [--] <repo> [<dir>]"
160fb2b2 6656msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
ef317cd5 6657
6937cb4e 6658#: builtin/clone.c:83
ef317cd5 6659msgid "don't create a checkout"
07432cef 6660msgstr "不创建一个检出"
ef317cd5 6661
6937cb4e 6662#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
ef317cd5 6663msgid "create a bare repository"
160fb2b2 6664msgstr "创建一个纯仓库"
ef317cd5 6665
6937cb4e 6666#: builtin/clone.c:88
ef317cd5 6667msgid "create a mirror repository (implies bare)"
160fb2b2 6668msgstr "创建一个镜像仓库(也是纯仓库)"
ef317cd5 6669
6937cb4e 6670#: builtin/clone.c:90
ef317cd5 6671msgid "to clone from a local repository"
160fb2b2 6672msgstr "从本地仓库克隆"
ef317cd5 6673
6937cb4e 6674#: builtin/clone.c:92
ef317cd5 6675msgid "don't use local hardlinks, always copy"
07432cef 6676msgstr "不使用本地硬链接,始终复制"
ef317cd5 6677
6937cb4e 6678#: builtin/clone.c:94
ef317cd5 6679msgid "setup as shared repository"
160fb2b2 6680msgstr "设置为共享仓库"
ef317cd5 6681
6937cb4e 6682#: builtin/clone.c:96 builtin/clone.c:100
87cb7997 6683msgid "pathspec"
65e2041e 6684msgstr "路径规格"
87cb7997 6685
6937cb4e 6686#: builtin/clone.c:96 builtin/clone.c:100
ef317cd5 6687msgid "initialize submodules in the clone"
07432cef 6688msgstr "在克隆时初始化子模组"
ef317cd5 6689
6937cb4e 6690#: builtin/clone.c:103
5b04ee3b
JX
6691msgid "number of submodules cloned in parallel"
6692msgstr "并发克隆的子模组的数量"
6693
6937cb4e 6694#: builtin/clone.c:104 builtin/init-db.c:476
ef317cd5 6695msgid "template-directory"
07432cef 6696msgstr "模板目录"
ef317cd5 6697
6937cb4e 6698#: builtin/clone.c:105 builtin/init-db.c:477
ef317cd5 6699msgid "directory from which templates will be used"
07432cef 6700msgstr "模板目录将被使用"
ef317cd5 6701
6937cb4e
JX
6702#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
6703#: builtin/submodule--helper.c:1002
ef317cd5 6704msgid "reference repository"
160fb2b2 6705msgstr "参考仓库"
ef317cd5 6706
6937cb4e 6707#: builtin/clone.c:111
7aea43ff 6708msgid "use --reference only while cloning"
160fb2b2 6709msgstr "仅在克隆时参考 --reference 指向的本地仓库"
7aea43ff 6710
6937cb4e 6711#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
ef317cd5 6712msgid "name"
07432cef 6713msgstr "名称"
ef317cd5 6714
6937cb4e 6715#: builtin/clone.c:113
ef317cd5 6716msgid "use <name> instead of 'origin' to track upstream"
4375c10e 6717msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
ef317cd5 6718
6937cb4e 6719#: builtin/clone.c:115
ef317cd5 6720msgid "checkout <branch> instead of the remote's HEAD"
4375c10e 6721msgstr "检出 <分支> 而不是远程 HEAD"
ef317cd5 6722
6937cb4e 6723#: builtin/clone.c:117
ef317cd5 6724msgid "path to git-upload-pack on the remote"
07432cef 6725msgstr "远程 git-upload-pack 路径"
ef317cd5 6726
6937cb4e 6727#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
a4f16749 6728#: builtin/pull.c:205
ef317cd5 6729msgid "depth"
07432cef 6730msgstr "深度"
ef317cd5 6731
6937cb4e 6732#: builtin/clone.c:119
ef317cd5 6733msgid "create a shallow clone of that depth"
07432cef 6734msgstr "创建一个指定深度的浅克隆"
ef317cd5 6735
6937cb4e 6736#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
a0b6b246
JX
6737#: parse-options.h:142
6738msgid "time"
6739msgstr "时间"
6740
6937cb4e 6741#: builtin/clone.c:121
a0b6b246
JX
6742msgid "create a shallow clone since a specific time"
6743msgstr "从一个特定时间创建一个浅克隆"
6744
6937cb4e 6745#: builtin/clone.c:122 builtin/fetch.c:141
a0b6b246
JX
6746msgid "revision"
6747msgstr "版本"
6748
6937cb4e 6749#: builtin/clone.c:123 builtin/fetch.c:142
1a79b2f1
JX
6750msgid "deepen history of shallow clone, excluding rev"
6751msgstr "深化浅克隆的历史,除了特定版本"
a0b6b246 6752
6937cb4e 6753#: builtin/clone.c:125
ef317cd5 6754msgid "clone only one branch, HEAD or --branch"
07432cef 6755msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 6756
6937cb4e 6757#: builtin/clone.c:127
a4f16749
JX
6758msgid "don't clone any tags, and make later fetches not to follow them"
6759msgstr "不要克隆任何标签,并且后续获取操作也不下载它们"
6760
6937cb4e 6761#: builtin/clone.c:129
5b04ee3b
JX
6762msgid "any cloned submodules will be shallow"
6763msgstr "子模组将以浅下载模式克隆"
6764
6937cb4e 6765#: builtin/clone.c:130 builtin/init-db.c:485
ef317cd5 6766msgid "gitdir"
07432cef 6767msgstr "git目录"
ef317cd5 6768
6937cb4e 6769#: builtin/clone.c:131 builtin/init-db.c:486
ef317cd5 6770msgid "separate git dir from working tree"
07432cef 6771msgstr "git目录和工作区分离"
ef317cd5 6772
6937cb4e 6773#: builtin/clone.c:132
ef317cd5 6774msgid "key=value"
07432cef 6775msgstr "key=value"
ef317cd5 6776
6937cb4e 6777#: builtin/clone.c:133
ef317cd5 6778msgid "set config inside the new repository"
160fb2b2 6779msgstr "在新仓库中设置配置信息"
ef317cd5 6780
6937cb4e 6781#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
276ceeaa
JX
6782msgid "use IPv4 addresses only"
6783msgstr "只使用 IPv4 地址"
6784
6937cb4e 6785#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
276ceeaa
JX
6786msgid "use IPv6 addresses only"
6787msgstr "只使用 IPv6 地址"
6788
6937cb4e 6789#: builtin/clone.c:273
3495628d
JX
6790msgid ""
6791"No directory name could be guessed.\n"
6792"Please specify a directory on the command line"
6793msgstr ""
6794"无法猜到目录名。\n"
26e4cbec 6795"请在命令行指定一个目录"
3495628d 6796
6937cb4e 6797#: builtin/clone.c:326
cfff71a9 6798#, c-format
a0b6b246
JX
6799msgid "info: Could not add alternate for '%s': %s\n"
6800msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
cfff71a9 6801
6937cb4e 6802#: builtin/clone.c:398
5c57d762
JX
6803#, c-format
6804msgid "failed to open '%s'"
6805msgstr "无法打开 '%s'"
6806
6937cb4e 6807#: builtin/clone.c:406
c04f5ac3
JX
6808#, c-format
6809msgid "%s exists and is not a directory"
6810msgstr "%s 存在且不是一个目录"
6811
6937cb4e 6812#: builtin/clone.c:420
c04f5ac3
JX
6813#, c-format
6814msgid "failed to stat %s\n"
65e2041e 6815msgstr "对 %s 调用 stat 失败\n"
c04f5ac3 6816
6937cb4e 6817#: builtin/clone.c:442
c04f5ac3
JX
6818#, c-format
6819msgid "failed to create link '%s'"
90e6ef53 6820msgstr "无法创建链接 '%s'"
c04f5ac3 6821
6937cb4e 6822#: builtin/clone.c:446
c04f5ac3
JX
6823#, c-format
6824msgid "failed to copy file to '%s'"
90e6ef53 6825msgstr "无法拷贝文件至 '%s'"
c04f5ac3 6826
6937cb4e 6827#: builtin/clone.c:471
c04f5ac3
JX
6828#, c-format
6829msgid "done.\n"
6830msgstr "完成。\n"
6831
6937cb4e 6832#: builtin/clone.c:483
1003b3a5
JX
6833msgid ""
6834"Clone succeeded, but checkout failed.\n"
6835"You can inspect what was checked out with 'git status'\n"
6836"and retry the checkout with 'git checkout -f HEAD'\n"
6837msgstr ""
6838"克隆成功,但是检出失败。\n"
6839"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
6840"'git checkout -f HEAD' 重试\n"
6841
6937cb4e 6842#: builtin/clone.c:560
c04f5ac3
JX
6843#, c-format
6844msgid "Could not find remote branch %s to clone."
90e6ef53 6845msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 6846
6937cb4e 6847#: builtin/clone.c:655
1003b3a5
JX
6848msgid "remote did not send all necessary objects"
6849msgstr "远程没有发送所有必须的对象"
6850
6937cb4e 6851#: builtin/clone.c:671
3495628d
JX
6852#, c-format
6853msgid "unable to update %s"
6854msgstr "不能更新 %s"
6855
6937cb4e 6856#: builtin/clone.c:720
c04f5ac3
JX
6857msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
6858msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
6859
6937cb4e 6860#: builtin/clone.c:751
1003b3a5
JX
6861msgid "unable to checkout working tree"
6862msgstr "不能检出工作区"
6863
6937cb4e 6864#: builtin/clone.c:796
3495628d
JX
6865msgid "unable to write parameters to config file"
6866msgstr "无法将参数写入配置文件"
6867
6937cb4e 6868#: builtin/clone.c:859
04cb2f28
JX
6869msgid "cannot repack to clean up"
6870msgstr "无法执行 repack 来清理"
6871
6937cb4e 6872#: builtin/clone.c:861
04cb2f28
JX
6873msgid "cannot unlink temporary alternates file"
6874msgstr "无法删除临时的 alternates 文件"
6875
6937cb4e 6876#: builtin/clone.c:894 builtin/receive-pack.c:1944
c04f5ac3
JX
6877msgid "Too many arguments."
6878msgstr "太多参数。"
6879
6937cb4e 6880#: builtin/clone.c:898
c04f5ac3 6881msgid "You must specify a repository to clone."
160fb2b2 6882msgstr "您必须指定一个仓库来克隆。"
c04f5ac3 6883
6937cb4e 6884#: builtin/clone.c:911
c04f5ac3
JX
6885#, c-format
6886msgid "--bare and --origin %s options are incompatible."
6887msgstr "--bare 和 --origin %s 选项不兼容。"
6888
6937cb4e 6889#: builtin/clone.c:914
07432cef
WS
6890msgid "--bare and --separate-git-dir are incompatible."
6891msgstr "--bare 和 --separate-git-dir 选项不兼容。"
6892
6937cb4e 6893#: builtin/clone.c:927
c04f5ac3
JX
6894#, c-format
6895msgid "repository '%s' does not exist"
160fb2b2 6896msgstr "仓库 '%s' 不存在"
c04f5ac3 6897
6937cb4e 6898#: builtin/clone.c:933 builtin/fetch.c:1360
cfff71a9
JX
6899#, c-format
6900msgid "depth %s is not a positive number"
6901msgstr "深度 %s 不是一个正数"
6902
6937cb4e 6903#: builtin/clone.c:943
c04f5ac3
JX
6904#, c-format
6905msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 6906msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 6907
6937cb4e 6908#: builtin/clone.c:953
c04f5ac3
JX
6909#, c-format
6910msgid "working tree '%s' already exists."
6911msgstr "工作区 '%s' 已经存在。"
6912
6937cb4e
JX
6913#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
6914#: builtin/worktree.c:240 builtin/worktree.c:270
5bb01d4f
JX
6915#, c-format
6916msgid "could not create leading directories of '%s'"
6917msgstr "不能为 '%s' 创建先导目录"
6918
6937cb4e 6919#: builtin/clone.c:971
c04f5ac3 6920#, c-format
814ff314
JX
6921msgid "could not create work tree dir '%s'"
6922msgstr "不能创建工作区目录 '%s'"
c04f5ac3 6923
6937cb4e 6924#: builtin/clone.c:983
c04f5ac3
JX
6925#, c-format
6926msgid "Cloning into bare repository '%s'...\n"
160fb2b2 6927msgstr "克隆到纯仓库 '%s'...\n"
c04f5ac3 6928
6937cb4e 6929#: builtin/clone.c:985
c04f5ac3
JX
6930#, c-format
6931msgid "Cloning into '%s'...\n"
6932msgstr "正克隆到 '%s'...\n"
6933
6937cb4e 6934#: builtin/clone.c:1009
a0b6b246
JX
6935msgid ""
6936"clone --recursive is not compatible with both --reference and --reference-if-"
6937"able"
6938msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
6939
6937cb4e 6940#: builtin/clone.c:1071
6acbf033 6941msgid "--depth is ignored in local clones; use file:// instead."
a0b6b246
JX
6942msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
6943
6937cb4e 6944#: builtin/clone.c:1073
a0b6b246
JX
6945msgid "--shallow-since is ignored in local clones; use file:// instead."
6946msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
6acbf033 6947
6937cb4e 6948#: builtin/clone.c:1075
a0b6b246
JX
6949msgid "--shallow-exclude is ignored in local clones; use file:// instead."
6950msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
6951
6937cb4e 6952#: builtin/clone.c:1078
6acbf033 6953msgid "source repository is shallow, ignoring --local"
160fb2b2 6954msgstr "源仓库是浅克隆,忽略 --local"
6acbf033 6955
6937cb4e 6956#: builtin/clone.c:1083
6acbf033
JX
6957msgid "--local is ignored"
6958msgstr "--local 被忽略"
6959
6937cb4e 6960#: builtin/clone.c:1087
c04f5ac3
JX
6961#, c-format
6962msgid "Don't know how to clone %s"
6963msgstr "不知道如何克隆 %s"
6964
6937cb4e 6965#: builtin/clone.c:1142 builtin/clone.c:1150
c04f5ac3
JX
6966#, c-format
6967msgid "Remote branch %s not found in upstream %s"
6968msgstr "远程分支 %s 在上游 %s 未发现"
6969
6937cb4e 6970#: builtin/clone.c:1153
c04f5ac3 6971msgid "You appear to have cloned an empty repository."
160fb2b2 6972msgstr "您似乎克隆了一个空仓库。"
c04f5ac3 6973
a4f16749 6974#: builtin/column.c:10
814ff314
JX
6975msgid "git column [<options>]"
6976msgstr "git column [<选项>]"
ef317cd5 6977
a4f16749 6978#: builtin/column.c:27
ef317cd5 6979msgid "lookup config vars"
07432cef 6980msgstr "查找配置变量"
ef317cd5 6981
a4f16749 6982#: builtin/column.c:28 builtin/column.c:29
ef317cd5 6983msgid "layout to use"
07432cef 6984msgstr "要使用的布局"
ef317cd5 6985
a4f16749 6986#: builtin/column.c:30
ef317cd5 6987msgid "Maximum width"
07432cef 6988msgstr "最大宽度"
ef317cd5 6989
a4f16749 6990#: builtin/column.c:31
ef317cd5 6991msgid "Padding space on left border"
07432cef 6992msgstr "左边框的填充空间"
ef317cd5 6993
a4f16749 6994#: builtin/column.c:32
ef317cd5 6995msgid "Padding space on right border"
07432cef 6996msgstr "右边框的填充空间"
ef317cd5 6997
a4f16749 6998#: builtin/column.c:33
ef317cd5 6999msgid "Padding space between columns"
07432cef 7000msgstr "两列之间的填充空间"
ef317cd5 7001
a4f16749 7002#: builtin/column.c:52
8ada9598 7003msgid "--command must be the first argument"
81809b99 7004msgstr "--command 必须是第一个参数"
8ada9598 7005
a4f16749 7006#: builtin/commit.c:39
814ff314 7007msgid "git commit [<options>] [--] <pathspec>..."
160fb2b2 7008msgstr "git commit [<选项>] [--] <路径规格>..."
ef317cd5 7009
a4f16749 7010#: builtin/commit.c:44
814ff314 7011msgid "git status [<options>] [--] <pathspec>..."
160fb2b2 7012msgstr "git status [<选项>] [--] <路径规格>..."
ef317cd5 7013
a4f16749 7014#: builtin/commit.c:49
220c313c
JX
7015msgid ""
7016"Your name and email address were configured automatically based\n"
7017"on your username and hostname. Please check that they are accurate.\n"
7018"You can suppress this message by setting them explicitly. Run the\n"
7019"following command and follow the instructions in your editor to edit\n"
7020"your configuration file:\n"
7021"\n"
7022" git config --global --edit\n"
7023"\n"
7024"After doing this, you may fix the identity used for this commit with:\n"
7025"\n"
7026" git commit --amend --reset-author\n"
7027msgstr ""
7028"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
7029"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
7030"中编辑您的配置文件:\n"
7031"\n"
7032" git config --global --edit\n"
7033"\n"
7034"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
7035"\n"
7036" git commit --amend --reset-author\n"
7037
a4f16749 7038#: builtin/commit.c:62
c04f5ac3
JX
7039msgid ""
7040"Your name and email address were configured automatically based\n"
7041"on your username and hostname. Please check that they are accurate.\n"
7042"You can suppress this message by setting them explicitly:\n"
7043"\n"
7044" git config --global user.name \"Your Name\"\n"
7045" git config --global user.email you@example.com\n"
7046"\n"
7047"After doing this, you may fix the identity used for this commit with:\n"
7048"\n"
7049" git commit --amend --reset-author\n"
7050msgstr ""
90e6ef53 7051"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
220c313c 7052"与否。您可以对其进行设置以免再出现本提示信息:\n"
c04f5ac3
JX
7053"\n"
7054" git config --global user.name \"Your Name\"\n"
7055" git config --global user.email you@example.com\n"
7056"\n"
90e6ef53 7057"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
c04f5ac3
JX
7058"\n"
7059" git commit --amend --reset-author\n"
7060
a4f16749 7061#: builtin/commit.c:74
c04f5ac3
JX
7062msgid ""
7063"You asked to amend the most recent commit, but doing so would make\n"
7064"it empty. You can repeat your command with --allow-empty, or you can\n"
7065"remove the commit entirely with \"git reset HEAD^\".\n"
7066msgstr ""
1b150dc9
T
7067"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
7068"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 7069
a4f16749 7070#: builtin/commit.c:79
c04f5ac3
JX
7071msgid ""
7072"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
7073"If you wish to commit it anyway, use:\n"
7074"\n"
7075" git commit --allow-empty\n"
7076"\n"
c04f5ac3 7077msgstr ""
a9ce4543
T
7078"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
7079"也要提交,使用命令:\n"
c04f5ac3
JX
7080"\n"
7081" git commit --allow-empty\n"
7082"\n"
c04f5ac3 7083
a4f16749 7084#: builtin/commit.c:86
b1894384
JX
7085msgid "Otherwise, please use 'git reset'\n"
7086msgstr "否则,请使用命令 'git reset'\n"
7087
a4f16749 7088#: builtin/commit.c:89
b1894384
JX
7089msgid ""
7090"If you wish to skip this commit, use:\n"
7091"\n"
7092" git reset\n"
7093"\n"
7094"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
7095"the remaining commits.\n"
7096msgstr ""
7097"如果您想跳过这个提交,使用命令:\n"
7098"\n"
7099" git reset\n"
7100"\n"
7101"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
7102"操作。\n"
7103
6937cb4e 7104#: builtin/commit.c:318
c04f5ac3 7105msgid "failed to unpack HEAD tree object"
90e6ef53 7106msgstr "无法解包 HEAD 树对象"
c04f5ac3 7107
6937cb4e 7108#: builtin/commit.c:359
c04f5ac3 7109msgid "unable to create temporary index"
90e6ef53 7110msgstr "不能创建临时索引"
c04f5ac3 7111
6937cb4e 7112#: builtin/commit.c:365
c04f5ac3
JX
7113msgid "interactive add failed"
7114msgstr "交互式添加失败"
7115
6937cb4e 7116#: builtin/commit.c:378
220c313c
JX
7117msgid "unable to update temporary index"
7118msgstr "无法更新临时索引"
7119
6937cb4e 7120#: builtin/commit.c:380
220c313c
JX
7121msgid "Failed to update main cache tree"
7122msgstr "不能更新树的主缓存"
7123
6937cb4e 7124#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
c04f5ac3 7125msgid "unable to write new_index file"
90e6ef53 7126msgstr "无法写 new_index 文件"
c04f5ac3 7127
6937cb4e 7128#: builtin/commit.c:461
8ada9598 7129msgid "cannot do a partial commit during a merge."
81809b99 7130msgstr "在合并过程中不能做部分提交。"
c04f5ac3 7131
6937cb4e 7132#: builtin/commit.c:463
8ada9598 7133msgid "cannot do a partial commit during a cherry-pick."
81809b99 7134msgstr "在拣选过程中不能做部分提交。"
8ada9598 7135
6937cb4e 7136#: builtin/commit.c:471
c04f5ac3 7137msgid "cannot read the index"
90e6ef53 7138msgstr "无法读取索引"
c04f5ac3 7139
6937cb4e 7140#: builtin/commit.c:490
c04f5ac3 7141msgid "unable to write temporary index file"
90e6ef53 7142msgstr "无法写临时索引文件"
c04f5ac3 7143
6937cb4e 7144#: builtin/commit.c:587
220c313c
JX
7145#, c-format
7146msgid "commit '%s' lacks author header"
7147msgstr "提交 '%s' 缺少作者信息"
7148
6937cb4e 7149#: builtin/commit.c:589
c04f5ac3 7150#, c-format
220c313c
JX
7151msgid "commit '%s' has malformed author line"
7152msgstr "提交 '%s' 有非法的作者信息"
c04f5ac3 7153
6937cb4e 7154#: builtin/commit.c:608
c04f5ac3
JX
7155msgid "malformed --author parameter"
7156msgstr "非法的 --author 参数"
7157
6937cb4e 7158#: builtin/commit.c:660
6acbf033
JX
7159msgid ""
7160"unable to select a comment character that is not used\n"
7161"in the current commit message"
7162msgstr "无法选择一个未被当前提交说明使用的注释字符"
7163
6937cb4e 7164#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
c04f5ac3
JX
7165#, c-format
7166msgid "could not lookup commit %s"
7167msgstr "不能查询提交 %s"
7168
6937cb4e 7169#: builtin/commit.c:709 builtin/shortlog.c:309
c04f5ac3
JX
7170#, c-format
7171msgid "(reading log message from standard input)\n"
90e6ef53 7172msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 7173
6937cb4e 7174#: builtin/commit.c:711
c04f5ac3 7175msgid "could not read log from standard input"
90e6ef53 7176msgstr "不能从标准输入中读取日志信息"
c04f5ac3 7177
6937cb4e 7178#: builtin/commit.c:715
c04f5ac3
JX
7179#, c-format
7180msgid "could not read log file '%s'"
90e6ef53 7181msgstr "不能读取日志文件 '%s'"
c04f5ac3 7182
6937cb4e 7183#: builtin/commit.c:742 builtin/commit.c:750
c04f5ac3 7184msgid "could not read SQUASH_MSG"
90e6ef53 7185msgstr "不能读取 SQUASH_MSG"
c04f5ac3 7186
6937cb4e 7187#: builtin/commit.c:747
5b04ee3b
JX
7188msgid "could not read MERGE_MSG"
7189msgstr "不能读取 MERGE_MSG"
7190
6937cb4e 7191#: builtin/commit.c:801
c04f5ac3 7192msgid "could not write commit template"
90e6ef53 7193msgstr "不能写提交模版"
c04f5ac3 7194
6937cb4e 7195#: builtin/commit.c:819
81809b99 7196#, c-format
c04f5ac3
JX
7197msgid ""
7198"\n"
8ada9598 7199"It looks like you may be committing a merge.\n"
c04f5ac3
JX
7200"If this is not correct, please remove the file\n"
7201"\t%s\n"
7202"and try again.\n"
7203msgstr ""
7204"\n"
649900bc 7205"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
7206"\t%s\n"
7207"然后重试。\n"
7208
6937cb4e 7209#: builtin/commit.c:824
81809b99 7210#, c-format
8ada9598
JX
7211msgid ""
7212"\n"
7213"It looks like you may be committing a cherry-pick.\n"
7214"If this is not correct, please remove the file\n"
7215"\t%s\n"
7216"and try again.\n"
7217msgstr ""
7218"\n"
649900bc 7219"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
7220"\t%s\n"
7221"然后重试。\n"
c04f5ac3 7222
6937cb4e 7223#: builtin/commit.c:837
a77c07d9 7224#, c-format
c04f5ac3 7225msgid ""
8ada9598 7226"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 7227"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 7228msgstr ""
a77c07d9 7229"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 7230"说明将会终止提交。\n"
c04f5ac3 7231
6937cb4e 7232#: builtin/commit.c:844
a77c07d9 7233#, c-format
c04f5ac3 7234msgid ""
8ada9598 7235"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 7236"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
7237"An empty message aborts the commit.\n"
7238msgstr ""
a77c07d9
JX
7239"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
7240"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 7241
90e6ef53 7242# 译者:为保证在输出中对齐,注意调整句中空格!
6937cb4e 7243#: builtin/commit.c:861
6acbf033
JX
7244#, c-format
7245msgid "%sAuthor: %.*s <%.*s>"
7246msgstr "%s作者: %.*s <%.*s>"
7247
7248# 译者:为保证在输出中对齐,注意调整句中空格!
6937cb4e 7249#: builtin/commit.c:869
c04f5ac3 7250#, c-format
6acbf033
JX
7251msgid "%sDate: %s"
7252msgstr "%s日期: %s"
c04f5ac3 7253
90e6ef53 7254# 译者:为保证在输出中对齐,注意调整句中空格!
6937cb4e 7255#: builtin/commit.c:876
c04f5ac3 7256#, c-format
6acbf033
JX
7257msgid "%sCommitter: %.*s <%.*s>"
7258msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 7259
6937cb4e 7260#: builtin/commit.c:893
c04f5ac3 7261msgid "Cannot read index"
90e6ef53 7262msgstr "无法读取索引"
c04f5ac3 7263
6937cb4e 7264#: builtin/commit.c:958
c04f5ac3
JX
7265msgid "Error building trees"
7266msgstr "无法创建树对象"
7267
6937cb4e 7268#: builtin/commit.c:972 builtin/tag.c:252
c04f5ac3
JX
7269#, c-format
7270msgid "Please supply the message using either -m or -F option.\n"
07432cef 7271msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 7272
6937cb4e 7273#: builtin/commit.c:1075
c04f5ac3 7274#, c-format
814ff314 7275msgid "--author '%s' is not 'Name <email>' and matches no existing author"
58b6f078 7276msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配"
c04f5ac3 7277
6937cb4e 7278#: builtin/commit.c:1090 builtin/commit.c:1335
c04f5ac3
JX
7279#, c-format
7280msgid "Invalid untracked files mode '%s'"
90e6ef53 7281msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 7282
6937cb4e 7283#: builtin/commit.c:1128
2e8451e8
JX
7284msgid "--long and -z are incompatible"
7285msgstr "--long 和 -z 选项不兼容"
7286
6937cb4e 7287#: builtin/commit.c:1158
c04f5ac3
JX
7288msgid "Using both --reset-author and --author does not make sense"
7289msgstr "同时使用 --reset-author 和 --author 没有意义"
7290
6937cb4e 7291#: builtin/commit.c:1167
c04f5ac3 7292msgid "You have nothing to amend."
90e6ef53 7293msgstr "您没有可修补的提交。"
c04f5ac3 7294
6937cb4e 7295#: builtin/commit.c:1170
8ada9598 7296msgid "You are in the middle of a merge -- cannot amend."
81809b99 7297msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 7298
6937cb4e 7299#: builtin/commit.c:1172
8ada9598 7300msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 7301msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 7302
6937cb4e 7303#: builtin/commit.c:1175
c04f5ac3 7304msgid "Options --squash and --fixup cannot be used together"
649900bc 7305msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 7306
6937cb4e 7307#: builtin/commit.c:1185
c04f5ac3
JX
7308msgid "Only one of -c/-C/-F/--fixup can be used."
7309msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
7310
6937cb4e 7311#: builtin/commit.c:1187
c04f5ac3 7312msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
649900bc 7313msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
c04f5ac3 7314
6937cb4e 7315#: builtin/commit.c:1195
c04f5ac3 7316msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 7317msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 7318
6937cb4e 7319#: builtin/commit.c:1212
c04f5ac3
JX
7320msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
7321msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
7322
6937cb4e 7323#: builtin/commit.c:1214
c04f5ac3
JX
7324msgid "No paths with --include/--only does not make sense."
7325msgstr "参数 --include/--only 不跟路径没有意义。"
7326
6937cb4e 7327#: builtin/commit.c:1226 builtin/tag.c:535
c04f5ac3
JX
7328#, c-format
7329msgid "Invalid cleanup mode %s"
7330msgstr "无效的清理模式 %s"
7331
6937cb4e 7332#: builtin/commit.c:1231
c04f5ac3 7333msgid "Paths with -a does not make sense."
649900bc 7334msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 7335
6937cb4e 7336#: builtin/commit.c:1349 builtin/commit.c:1626
ef317cd5 7337msgid "show status concisely"
07432cef 7338msgstr "以简洁的格式显示状态"
ef317cd5 7339
6937cb4e 7340#: builtin/commit.c:1351 builtin/commit.c:1628
ef317cd5 7341msgid "show branch information"
07432cef 7342msgstr "显示分支信息"
ef317cd5 7343
6937cb4e 7344#: builtin/commit.c:1353
a4f16749
JX
7345msgid "show stash information"
7346msgstr "显示贮藏区信息"
7347
6937cb4e 7348#: builtin/commit.c:1355
a0b6b246
JX
7349msgid "version"
7350msgstr "版本"
7351
6937cb4e
JX
7352#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
7353#: builtin/worktree.c:469
ef317cd5 7354msgid "machine-readable output"
07432cef
WS
7355msgstr "机器可读的输出"
7356
6937cb4e 7357#: builtin/commit.c:1358 builtin/commit.c:1632
07432cef
WS
7358msgid "show status in long format (default)"
7359msgstr "以长格式显示状态(默认)"
ef317cd5 7360
6937cb4e 7361#: builtin/commit.c:1361 builtin/commit.c:1635
ef317cd5 7362msgid "terminate entries with NUL"
4375c10e 7363msgstr "条目以 NUL 字符结尾"
ef317cd5 7364
6937cb4e
JX
7365#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
7366#: builtin/fast-export.c:1002 builtin/tag.c:390
ef317cd5 7367msgid "mode"
07432cef 7368msgstr "模式"
ef317cd5 7369
6937cb4e 7370#: builtin/commit.c:1364 builtin/commit.c:1638
ef317cd5 7371msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 7372msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 7373
6937cb4e 7374#: builtin/commit.c:1367
ef317cd5 7375msgid "show ignored files"
07432cef 7376msgstr "显示忽略的文件"
ef317cd5 7377
6937cb4e 7378#: builtin/commit.c:1368 parse-options.h:155
ef317cd5
JX
7379msgid "when"
7380msgstr "何时"
7381
6937cb4e 7382#: builtin/commit.c:1369
ef317cd5
JX
7383msgid ""
7384"ignore changes to submodules, optional when: all, dirty, untracked. "
7385"(Default: all)"
7386msgstr ""
07432cef 7387"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 7388
6937cb4e 7389#: builtin/commit.c:1371
ef317cd5 7390msgid "list untracked files in columns"
07432cef 7391msgstr "以列的方式显示未跟踪的文件"
ef317cd5 7392
6937cb4e 7393#: builtin/commit.c:1449
c04f5ac3
JX
7394msgid "couldn't look up newly created commit"
7395msgstr "无法找到新创建的提交"
7396
6937cb4e 7397#: builtin/commit.c:1451
c04f5ac3 7398msgid "could not parse newly created commit"
90e6ef53 7399msgstr "不能解析新创建的提交"
c04f5ac3 7400
6937cb4e 7401#: builtin/commit.c:1496
c04f5ac3
JX
7402msgid "detached HEAD"
7403msgstr "分离头指针"
7404
7e238ab7 7405# 译者:中文字符串拼接,可删除前导空格
6937cb4e 7406#: builtin/commit.c:1499
c04f5ac3 7407msgid " (root-commit)"
7e238ab7 7408msgstr "(根提交)"
c04f5ac3 7409
6937cb4e 7410#: builtin/commit.c:1596
ef317cd5 7411msgid "suppress summary after successful commit"
07432cef 7412msgstr "提交成功后不显示概述信息"
c04f5ac3 7413
6937cb4e 7414#: builtin/commit.c:1597
ef317cd5 7415msgid "show diff in commit message template"
07432cef 7416msgstr "在提交说明模板里显示差异"
c04f5ac3 7417
6937cb4e 7418#: builtin/commit.c:1599
ef317cd5 7419msgid "Commit message options"
07432cef 7420msgstr "提交说明选项"
c04f5ac3 7421
6937cb4e 7422#: builtin/commit.c:1600 builtin/tag.c:388
ef317cd5 7423msgid "read message from file"
07432cef 7424msgstr "从文件中读取提交说明"
c04f5ac3 7425
6937cb4e 7426#: builtin/commit.c:1601
ef317cd5 7427msgid "author"
07432cef 7428msgstr "作者"
c04f5ac3 7429
6937cb4e 7430#: builtin/commit.c:1601
ef317cd5 7431msgid "override author for commit"
07432cef 7432msgstr "提交时覆盖作者"
73a60cd2 7433
6937cb4e 7434#: builtin/commit.c:1602 builtin/gc.c:359
ef317cd5 7435msgid "date"
07432cef 7436msgstr "日期"
c04f5ac3 7437
6937cb4e 7438#: builtin/commit.c:1602
ef317cd5 7439msgid "override date for commit"
07432cef 7440msgstr "提交时覆盖日期"
c04f5ac3 7441
6937cb4e
JX
7442#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
7443#: builtin/notes.c:565 builtin/tag.c:386
ef317cd5 7444msgid "message"
07432cef 7445msgstr "说明"
c04f5ac3 7446
6937cb4e 7447#: builtin/commit.c:1603
ef317cd5 7448msgid "commit message"
07432cef 7449msgstr "提交说明"
ef317cd5 7450
6937cb4e
JX
7451#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
7452#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
94550ed3
JX
7453msgid "commit"
7454msgstr "提交"
7455
6937cb4e 7456#: builtin/commit.c:1604
ef317cd5 7457msgid "reuse and edit message from specified commit"
07432cef 7458msgstr "重用并编辑指定提交的提交说明"
ef317cd5 7459
6937cb4e 7460#: builtin/commit.c:1605
ef317cd5 7461msgid "reuse message from specified commit"
07432cef 7462msgstr "重用指定提交的提交说明"
ef317cd5 7463
6937cb4e 7464#: builtin/commit.c:1606
ef317cd5 7465msgid "use autosquash formatted message to fixup specified commit"
07432cef 7466msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 7467
6937cb4e 7468#: builtin/commit.c:1607
ef317cd5 7469msgid "use autosquash formatted message to squash specified commit"
07432cef 7470msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 7471
6937cb4e 7472#: builtin/commit.c:1608
ef317cd5 7473msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 7474msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 7475
6937cb4e
JX
7476#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
7477#: builtin/revert.c:105
ef317cd5 7478msgid "add Signed-off-by:"
07432cef 7479msgstr "添加 Signed-off-by: 签名"
ef317cd5 7480
6937cb4e 7481#: builtin/commit.c:1610
ef317cd5 7482msgid "use specified template file"
07432cef 7483msgstr "使用指定的模板文件"
ef317cd5 7484
6937cb4e 7485#: builtin/commit.c:1611
ef317cd5 7486msgid "force edit of commit"
07432cef 7487msgstr "强制编辑提交"
ef317cd5 7488
07432cef 7489# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
6937cb4e 7490#: builtin/commit.c:1612
ef317cd5 7491msgid "default"
07432cef 7492msgstr "default"
ef317cd5 7493
6937cb4e 7494#: builtin/commit.c:1612 builtin/tag.c:391
ef317cd5 7495msgid "how to strip spaces and #comments from message"
07432cef 7496msgstr "设置如何删除提交说明里的空格和#注释"
ef317cd5 7497
6937cb4e 7498#: builtin/commit.c:1613
ef317cd5 7499msgid "include status in commit message template"
07432cef 7500msgstr "在提交说明模板里包含状态信息"
ef317cd5 7501
6937cb4e 7502#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
a4f16749 7503#: builtin/revert.c:113
ef317cd5 7504msgid "GPG sign commit"
07432cef 7505msgstr "GPG 提交签名"
ef317cd5 7506
6937cb4e 7507#: builtin/commit.c:1618
ef317cd5 7508msgid "Commit contents options"
07432cef 7509msgstr "提交内容选项"
ef317cd5 7510
6937cb4e 7511#: builtin/commit.c:1619
ef317cd5 7512msgid "commit all changed files"
07432cef 7513msgstr "提交所有改动的文件"
ef317cd5 7514
6937cb4e 7515#: builtin/commit.c:1620
ef317cd5 7516msgid "add specified files to index for commit"
07432cef 7517msgstr "添加指定的文件到索引区等待提交"
ef317cd5 7518
6937cb4e 7519#: builtin/commit.c:1621
ef317cd5 7520msgid "interactively add files"
07432cef 7521msgstr "交互式添加文件"
ef317cd5 7522
6937cb4e 7523#: builtin/commit.c:1622
ef317cd5 7524msgid "interactively add changes"
07432cef 7525msgstr "交互式添加变更"
ef317cd5 7526
6937cb4e 7527#: builtin/commit.c:1623
ef317cd5 7528msgid "commit only specified files"
07432cef 7529msgstr "只提交指定的文件"
ef317cd5 7530
6937cb4e 7531#: builtin/commit.c:1624
5c57d762
JX
7532msgid "bypass pre-commit and commit-msg hooks"
7533msgstr "绕过 pre-commit 和 commit-msg 钩子"
7534
6937cb4e 7535#: builtin/commit.c:1625
ef317cd5 7536msgid "show what would be committed"
07432cef 7537msgstr "显示将要提交的内容"
ef317cd5 7538
6937cb4e 7539#: builtin/commit.c:1636
ef317cd5 7540msgid "amend previous commit"
07432cef 7541msgstr "修改先前的提交"
ef317cd5 7542
6937cb4e 7543#: builtin/commit.c:1637
ef317cd5 7544msgid "bypass post-rewrite hook"
07432cef 7545msgstr "绕过 post-rewrite 钩子"
ef317cd5 7546
6937cb4e 7547#: builtin/commit.c:1642
ef317cd5 7548msgid "ok to record an empty change"
07432cef 7549msgstr "允许一个空提交"
ef317cd5 7550
6937cb4e 7551#: builtin/commit.c:1644
ef317cd5 7552msgid "ok to record a change with an empty message"
07432cef 7553msgstr "允许空的提交说明"
ef317cd5 7554
6937cb4e 7555#: builtin/commit.c:1674
c04f5ac3 7556msgid "could not parse HEAD commit"
90e6ef53 7557msgstr "不能解析 HEAD 提交"
c04f5ac3 7558
6937cb4e 7559#: builtin/commit.c:1719
c04f5ac3
JX
7560#, c-format
7561msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 7562msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 7563
6937cb4e 7564#: builtin/commit.c:1726
c04f5ac3 7565msgid "could not read MERGE_MODE"
90e6ef53 7566msgstr "不能读取 MERGE_MODE"
c04f5ac3 7567
6937cb4e 7568#: builtin/commit.c:1745
c04f5ac3
JX
7569#, c-format
7570msgid "could not read commit message: %s"
90e6ef53 7571msgstr "不能读取提交说明:%s"
c04f5ac3 7572
6937cb4e 7573#: builtin/commit.c:1756
c04f5ac3
JX
7574#, c-format
7575msgid "Aborting commit due to empty commit message.\n"
7576msgstr "终止提交因为提交说明为空。\n"
7577
6937cb4e
JX
7578#: builtin/commit.c:1761
7579#, c-format
7580msgid "Aborting commit; you did not edit the message.\n"
7581msgstr "终止提交;您未更改来自模版的提交说明。\n"
7582
7583#: builtin/commit.c:1809
c04f5ac3
JX
7584msgid ""
7585"Repository has been updated, but unable to write\n"
220c313c 7586"new_index file. Check that disk is not full and quota is\n"
c04f5ac3
JX
7587"not exceeded, and then \"git reset HEAD\" to recover."
7588msgstr ""
160fb2b2 7589"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
90e6ef53 7590"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 7591
a4f16749 7592#: builtin/config.c:10
814ff314
JX
7593msgid "git config [<options>]"
7594msgstr "git config [<选项>]"
ef317cd5 7595
a4f16749 7596#: builtin/config.c:57
ef317cd5 7597msgid "Config file location"
07432cef 7598msgstr "配置文件位置"
ef317cd5 7599
a4f16749 7600#: builtin/config.c:58
ef317cd5 7601msgid "use global config file"
07432cef 7602msgstr "使用全局配置文件"
ef317cd5 7603
a4f16749 7604#: builtin/config.c:59
ef317cd5 7605msgid "use system config file"
07432cef 7606msgstr "使用系统级配置文件"
ef317cd5 7607
a4f16749 7608#: builtin/config.c:60
ef317cd5 7609msgid "use repository config file"
160fb2b2 7610msgstr "使用仓库级配置文件"
ef317cd5 7611
a4f16749 7612#: builtin/config.c:61
ef317cd5 7613msgid "use given config file"
07432cef 7614msgstr "使用指定的配置文件"
ef317cd5 7615
a4f16749 7616#: builtin/config.c:62
2e8451e8 7617msgid "blob-id"
4375c10e 7618msgstr "数据对象 ID"
2e8451e8 7619
a4f16749 7620#: builtin/config.c:62
2e8451e8
JX
7621msgid "read config from given blob object"
7622msgstr "从给定的数据对象读取配置"
7623
a4f16749 7624#: builtin/config.c:63
ef317cd5 7625msgid "Action"
07432cef 7626msgstr "操作"
ef317cd5 7627
a4f16749 7628#: builtin/config.c:64
ef317cd5 7629msgid "get value: name [value-regex]"
07432cef 7630msgstr "获取值:name [value-regex]"
ef317cd5 7631
a4f16749 7632#: builtin/config.c:65
ef317cd5 7633msgid "get all values: key [value-regex]"
07432cef 7634msgstr "获得所有的值:key [value-regex]"
ef317cd5 7635
a4f16749 7636#: builtin/config.c:66
ef317cd5 7637msgid "get values for regexp: name-regex [value-regex]"
07432cef 7638msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 7639
a4f16749 7640#: builtin/config.c:67
90314792
JX
7641msgid "get value specific for the URL: section[.var] URL"
7642msgstr "获得 URL 取值:section[.var] URL"
7643
a4f16749 7644#: builtin/config.c:68
ef317cd5 7645msgid "replace all matching variables: name value [value_regex]"
07432cef 7646msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 7647
a4f16749 7648#: builtin/config.c:69
ef317cd5 7649msgid "add a new variable: name value"
07432cef 7650msgstr "添加一个新的变量:name value"
ef317cd5 7651
a4f16749 7652#: builtin/config.c:70
ef317cd5 7653msgid "remove a variable: name [value-regex]"
07432cef 7654msgstr "删除一个变量:name [value-regex]"
ef317cd5 7655
a4f16749 7656#: builtin/config.c:71
ef317cd5 7657msgid "remove all matches: name [value-regex]"
07432cef 7658msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 7659
a4f16749 7660#: builtin/config.c:72
ef317cd5 7661msgid "rename section: old-name new-name"
07432cef 7662msgstr "重命名小节:old-name new-name"
ef317cd5 7663
a4f16749 7664#: builtin/config.c:73
ef317cd5 7665msgid "remove a section: name"
07432cef 7666msgstr "删除一个小节:name"
ef317cd5 7667
a4f16749 7668#: builtin/config.c:74
ef317cd5 7669msgid "list all"
07432cef 7670msgstr "列出所有"
ef317cd5 7671
a4f16749 7672#: builtin/config.c:75
ef317cd5 7673msgid "open an editor"
07432cef 7674msgstr "打开一个编辑器"
ef317cd5 7675
a4f16749 7676#: builtin/config.c:76
04cb2f28
JX
7677msgid "find the color configured: slot [default]"
7678msgstr "获得配置的颜色:配置 [默认]"
ef317cd5 7679
a4f16749 7680#: builtin/config.c:77
04cb2f28
JX
7681msgid "find the color setting: slot [stdout-is-tty]"
7682msgstr "获得颜色设置:配置 [stdout-is-tty]"
ef317cd5 7683
a4f16749 7684#: builtin/config.c:78
ef317cd5 7685msgid "Type"
07432cef 7686msgstr "类型"
ef317cd5 7687
a4f16749 7688#: builtin/config.c:79
ef317cd5 7689msgid "value is \"true\" or \"false\""
07432cef 7690msgstr "值是 \"true\" 或 \"false\""
ef317cd5 7691
a4f16749 7692#: builtin/config.c:80
ef317cd5 7693msgid "value is decimal number"
07432cef 7694msgstr "值是十进制数"
ef317cd5 7695
a4f16749 7696#: builtin/config.c:81
ef317cd5 7697msgid "value is --bool or --int"
07432cef 7698msgstr "值是 --bool or --int"
ef317cd5 7699
a4f16749 7700#: builtin/config.c:82
ef317cd5 7701msgid "value is a path (file or directory name)"
07432cef 7702msgstr "值是一个路径(文件或目录名)"
ef317cd5 7703
a4f16749 7704#: builtin/config.c:83
ef317cd5 7705msgid "Other"
07432cef 7706msgstr "其它"
ef317cd5 7707
a4f16749 7708#: builtin/config.c:84
ef317cd5 7709msgid "terminate values with NUL byte"
4375c10e 7710msgstr "终止值是 NUL 字节"
ef317cd5 7711
a4f16749 7712#: builtin/config.c:85
1b7f4a34
JX
7713msgid "show variable names only"
7714msgstr "只显示变量名"
7715
a4f16749 7716#: builtin/config.c:86
ef317cd5 7717msgid "respect include directives on lookup"
07432cef 7718msgstr "查询时参照 include 指令递归查找"
ef317cd5 7719
a4f16749 7720#: builtin/config.c:87
276ceeaa
JX
7721msgid "show origin of config (file, standard input, blob, command line)"
7722msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
7723
a4f16749 7724#: builtin/config.c:327
220c313c 7725msgid "unable to parse default color value"
160fb2b2 7726msgstr "不能解析默认颜色值"
220c313c 7727
a4f16749 7728#: builtin/config.c:471
220c313c
JX
7729#, c-format
7730msgid ""
7731"# This is Git's per-user configuration file.\n"
7aea43ff 7732"[user]\n"
220c313c 7733"# Please adapt and uncomment the following lines:\n"
7aea43ff 7734"#\tname = %s\n"
220c313c
JX
7735"#\temail = %s\n"
7736msgstr ""
7737"# This is Git's per-user configuration file.\n"
7aea43ff 7738"[user]\n"
220c313c 7739"# Please adapt and uncomment the following lines:\n"
7aea43ff 7740"#\tname = %s\n"
220c313c
JX
7741"#\temail = %s\n"
7742
a4f16749
JX
7743#: builtin/config.c:499
7744msgid "--local can only be used inside a git repository"
7745msgstr "--local 只能在一个仓库内使用"
7746
6937cb4e 7747#: builtin/config.c:624
220c313c
JX
7748#, c-format
7749msgid "cannot create configuration file %s"
7750msgstr "不能创建配置文件 %s"
7751
6937cb4e 7752#: builtin/config.c:637
a0b6b246
JX
7753#, c-format
7754msgid ""
7755"cannot overwrite multiple values with a single value\n"
7756" Use a regexp, --add or --replace-all to change %s."
7757msgstr ""
7758"无法用一个值覆盖多个值\n"
7759" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
7760
6937cb4e 7761#: builtin/count-objects.c:88
4dcdc3d8
JX
7762msgid "git count-objects [-v] [-H | --human-readable]"
7763msgstr "git count-objects [-v] [-H | --human-readable]"
7764
6937cb4e 7765#: builtin/count-objects.c:98
4dcdc3d8
JX
7766msgid "print sizes in human readable format"
7767msgstr "以用户可读的格式显示大小"
ef317cd5 7768
a4f16749 7769#: builtin/describe.c:19
814ff314
JX
7770msgid "git describe [<options>] [<commit-ish>...]"
7771msgstr "git describe [<选项>] [<提交号>...]"
ef317cd5 7772
a4f16749 7773#: builtin/describe.c:20
814ff314
JX
7774msgid "git describe [<options>] --dirty"
7775msgstr "git describe [<选项>] --dirty"
ef317cd5 7776
a4f16749 7777#: builtin/describe.c:54
87cb7997
JX
7778msgid "head"
7779msgstr "头"
7780
a4f16749 7781#: builtin/describe.c:54
87cb7997
JX
7782msgid "lightweight"
7783msgstr "轻量级的"
7784
a4f16749 7785#: builtin/describe.c:54
87cb7997
JX
7786msgid "annotated"
7787msgstr "附注的"
7788
6937cb4e 7789#: builtin/describe.c:264
c04f5ac3
JX
7790#, c-format
7791msgid "annotated tag %s not available"
55a16ee4 7792msgstr "附注标签 %s 无效"
c04f5ac3 7793
6937cb4e 7794#: builtin/describe.c:268
c04f5ac3
JX
7795#, c-format
7796msgid "annotated tag %s has no embedded name"
55a16ee4 7797msgstr "附注标签 %s 没有嵌入名称"
c04f5ac3 7798
6937cb4e 7799#: builtin/describe.c:270
c04f5ac3
JX
7800#, c-format
7801msgid "tag '%s' is really '%s' here"
55a16ee4 7802msgstr "标签 '%s' 的确是在 '%s'"
c04f5ac3 7803
6937cb4e 7804#: builtin/describe.c:297 builtin/log.c:493
c04f5ac3
JX
7805#, c-format
7806msgid "Not a valid object name %s"
7807msgstr "不是一个有效的对象名 %s"
7808
6937cb4e 7809#: builtin/describe.c:300
c04f5ac3
JX
7810#, c-format
7811msgid "%s is not a valid '%s' object"
7812msgstr "%s 不是一个有效的 '%s' 对象"
7813
6937cb4e 7814#: builtin/describe.c:317
c04f5ac3
JX
7815#, c-format
7816msgid "no tag exactly matches '%s'"
55a16ee4 7817msgstr "没有标签准确匹配 '%s'"
c04f5ac3 7818
6937cb4e 7819#: builtin/describe.c:319
c04f5ac3
JX
7820#, c-format
7821msgid "searching to describe %s\n"
7822msgstr "搜索描述 %s\n"
7823
6937cb4e 7824#: builtin/describe.c:366
c04f5ac3
JX
7825#, c-format
7826msgid "finished search at %s\n"
7827msgstr "完成搜索 %s\n"
7828
6937cb4e 7829#: builtin/describe.c:393
c04f5ac3
JX
7830#, c-format
7831msgid ""
7832"No annotated tags can describe '%s'.\n"
7833"However, there were unannotated tags: try --tags."
7834msgstr ""
55a16ee4
RC
7835"没有附注标签能描述 '%s'。\n"
7836"然而,存在未附注标签:尝试 --tags。"
c04f5ac3 7837
6937cb4e 7838#: builtin/describe.c:397
c04f5ac3
JX
7839#, c-format
7840msgid ""
7841"No tags can describe '%s'.\n"
7842"Try --always, or create some tags."
7843msgstr ""
55a16ee4
RC
7844"没有标签能描述 '%s'。\n"
7845"尝试 --always,或者创建一些标签。"
c04f5ac3 7846
6937cb4e 7847#: builtin/describe.c:427
c04f5ac3
JX
7848#, c-format
7849msgid "traversed %lu commits\n"
7850msgstr "已遍历 %lu 个提交\n"
7851
6937cb4e 7852#: builtin/describe.c:430
c04f5ac3
JX
7853#, c-format
7854msgid ""
7855"more than %i tags found; listed %i most recent\n"
7856"gave up search at %s\n"
7857msgstr ""
55a16ee4 7858"发现多于 %i 个标签,列出最近的 %i 个\n"
90e6ef53 7859"在 %s 放弃搜索\n"
c04f5ac3 7860
6937cb4e 7861#: builtin/describe.c:452
ef317cd5 7862msgid "find the tag that comes after the commit"
55a16ee4 7863msgstr "寻找该提交之后的标签"
ef317cd5 7864
6937cb4e 7865#: builtin/describe.c:453
ef317cd5 7866msgid "debug search strategy on stderr"
07432cef 7867msgstr "在标准错误上调试搜索策略"
ef317cd5 7868
6937cb4e 7869#: builtin/describe.c:454
1003b3a5
JX
7870msgid "use any ref"
7871msgstr "使用任意引用"
7872
6937cb4e 7873#: builtin/describe.c:455
1003b3a5 7874msgid "use any tag, even unannotated"
55a16ee4 7875msgstr "使用任意标签,即使未附带注释"
ef317cd5 7876
6937cb4e 7877#: builtin/describe.c:456
ef317cd5 7878msgid "always use long format"
07432cef 7879msgstr "始终使用长提交号格式"
ef317cd5 7880
6937cb4e 7881#: builtin/describe.c:457
2e8451e8
JX
7882msgid "only follow first parent"
7883msgstr "只跟随第一个父提交"
7884
6937cb4e 7885#: builtin/describe.c:460
ef317cd5 7886msgid "only output exact matches"
07432cef 7887msgstr "只输出精确匹配"
ef317cd5 7888
6937cb4e 7889#: builtin/describe.c:462
ef317cd5 7890msgid "consider <n> most recent tags (default: 10)"
55a16ee4 7891msgstr "考虑最近 <n> 个标签(默认:10)"
ef317cd5 7892
6937cb4e 7893#: builtin/describe.c:464
ef317cd5 7894msgid "only consider tags matching <pattern>"
55a16ee4 7895msgstr "只考虑匹配 <模式> 的标签"
ef317cd5 7896
6937cb4e 7897#: builtin/describe.c:466
87cb7997
JX
7898msgid "do not consider tags matching <pattern>"
7899msgstr "不考虑匹配 <模式> 的标签"
7900
6937cb4e 7901#: builtin/describe.c:468 builtin/name-rev.c:406
ef317cd5 7902msgid "show abbreviated commit object as fallback"
07432cef 7903msgstr "显示简写的提交号作为后备"
ef317cd5 7904
6937cb4e 7905#: builtin/describe.c:469 builtin/describe.c:472
ef317cd5 7906msgid "mark"
07432cef 7907msgstr "标记"
ef317cd5 7908
6937cb4e 7909#: builtin/describe.c:470
ef317cd5 7910msgid "append <mark> on dirty working tree (default: \"-dirty\")"
160fb2b2 7911msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
ef317cd5 7912
6937cb4e 7913#: builtin/describe.c:473
87cb7997
JX
7914msgid "append <mark> on broken working tree (default: \"-broken\")"
7915msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
7916
6937cb4e 7917#: builtin/describe.c:491
c04f5ac3
JX
7918msgid "--long is incompatible with --abbrev=0"
7919msgstr "--long 与 --abbrev=0 不兼容"
7920
6937cb4e 7921#: builtin/describe.c:520
c04f5ac3 7922msgid "No names found, cannot describe anything."
90e6ef53 7923msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 7924
6937cb4e 7925#: builtin/describe.c:563
a8a5406a 7926msgid "--dirty is incompatible with commit-ishes"
87cb7997
JX
7927msgstr "--dirty 与提交号不兼容"
7928
6937cb4e 7929#: builtin/describe.c:565
87cb7997
JX
7930msgid "--broken is incompatible with commit-ishes"
7931msgstr "--broken 与提交号不兼容"
c04f5ac3 7932
1a79b2f1 7933#: builtin/diff.c:83
c04f5ac3
JX
7934#, c-format
7935msgid "'%s': not a regular file or symlink"
7936msgstr "'%s':不是一个正规文件或符号链接"
7937
a4f16749 7938#: builtin/diff.c:235
c04f5ac3
JX
7939#, c-format
7940msgid "invalid option: %s"
7941msgstr "无效选项:%s"
7942
6937cb4e 7943#: builtin/diff.c:357
c04f5ac3 7944msgid "Not a git repository"
160fb2b2 7945msgstr "不是一个 git 仓库"
c04f5ac3 7946
6937cb4e 7947#: builtin/diff.c:400
c04f5ac3
JX
7948#, c-format
7949msgid "invalid object '%s' given."
7950msgstr "提供了无效对象 '%s'。"
7951
6937cb4e 7952#: builtin/diff.c:409
c04f5ac3
JX
7953#, c-format
7954msgid "more than two blobs given: '%s'"
160fb2b2 7955msgstr "提供了超过两个数据对象:'%s'"
c04f5ac3 7956
6937cb4e 7957#: builtin/diff.c:414
c04f5ac3
JX
7958#, c-format
7959msgid "unhandled object '%s' given."
6c94aba5 7960msgstr "无法处理的对象 '%s'。"
c04f5ac3 7961
a4f16749 7962#: builtin/difftool.c:29
1a79b2f1
JX
7963msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
7964msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
7965
6937cb4e 7966#: builtin/difftool.c:259
1a79b2f1
JX
7967#, c-format
7968msgid "failed: %d"
7969msgstr "失败:%d"
7970
6937cb4e 7971#: builtin/difftool.c:301
87cb7997
JX
7972#, c-format
7973msgid "could not read symlink %s"
7974msgstr "无法读取符号链接 %s"
7975
6937cb4e 7976#: builtin/difftool.c:303
87cb7997
JX
7977#, c-format
7978msgid "could not read symlink file %s"
7979msgstr "无法读取符号链接文件 %s"
7980
6937cb4e 7981#: builtin/difftool.c:311
87cb7997
JX
7982#, c-format
7983msgid "could not read object %s for symlink %s"
7984msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
7985
6937cb4e 7986#: builtin/difftool.c:412
1a79b2f1
JX
7987msgid ""
7988"combined diff formats('-c' and '--cc') are not supported in\n"
7989"directory diff mode('-d' and '--dir-diff')."
87cb7997
JX
7990msgstr ""
7991"不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
7992"cc')。"
1a79b2f1 7993
6937cb4e 7994#: builtin/difftool.c:633
1a79b2f1
JX
7995#, c-format
7996msgid "both files modified: '%s' and '%s'."
7997msgstr "两个文件都被修改:'%s' 和 '%s'。"
7998
6937cb4e 7999#: builtin/difftool.c:635
1a79b2f1
JX
8000msgid "working tree file has been left."
8001msgstr "工作区文件被留了下来。"
8002
6937cb4e 8003#: builtin/difftool.c:646
1a79b2f1
JX
8004#, c-format
8005msgid "temporary files exist in '%s'."
8006msgstr "临时文件存在于 '%s'。"
8007
6937cb4e 8008#: builtin/difftool.c:647
1a79b2f1
JX
8009msgid "you may want to cleanup or recover these."
8010msgstr "您可能想要清理或者恢复它们。"
8011
6937cb4e 8012#: builtin/difftool.c:696
1a79b2f1
JX
8013msgid "use `diff.guitool` instead of `diff.tool`"
8014msgstr "使用 `diff.guitool` 代替 `diff.tool`"
8015
6937cb4e 8016#: builtin/difftool.c:698
1a79b2f1
JX
8017msgid "perform a full-directory diff"
8018msgstr "执行一个全目录差异比较"
8019
6937cb4e 8020#: builtin/difftool.c:700
1a79b2f1
JX
8021msgid "do not prompt before launching a diff tool"
8022msgstr "启动差异比较工具之前不提示"
8023
6937cb4e 8024#: builtin/difftool.c:706
1a79b2f1
JX
8025msgid "use symlinks in dir-diff mode"
8026msgstr "在 dir-diff 模式中使用符号链接"
8027
6937cb4e 8028#: builtin/difftool.c:707
1a79b2f1
JX
8029msgid "<tool>"
8030msgstr "<工具>"
8031
6937cb4e 8032#: builtin/difftool.c:708
1a79b2f1
JX
8033msgid "use the specified diff tool"
8034msgstr "使用指定的差异比较工具"
8035
6937cb4e 8036#: builtin/difftool.c:710
1a79b2f1
JX
8037msgid "print a list of diff tools that may be used with `--tool`"
8038msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
8039
6937cb4e 8040#: builtin/difftool.c:713
1a79b2f1
JX
8041msgid ""
8042"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
8043"code"
8044msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出"
8045
6937cb4e 8046#: builtin/difftool.c:715
1a79b2f1
JX
8047msgid "<command>"
8048msgstr "<命令>"
8049
6937cb4e 8050#: builtin/difftool.c:716
1a79b2f1
JX
8051msgid "specify a custom command for viewing diffs"
8052msgstr "指定一个用于查看差异的自定义命令"
8053
6937cb4e 8054#: builtin/difftool.c:740
1a79b2f1
JX
8055msgid "no <tool> given for --tool=<tool>"
8056msgstr "没有为 --tool=<工具> 参数提供 <工具>"
8057
6937cb4e 8058#: builtin/difftool.c:747
1a79b2f1
JX
8059msgid "no <cmd> given for --extcmd=<cmd>"
8060msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
8061
a4f16749 8062#: builtin/fast-export.c:26
ef317cd5 8063msgid "git fast-export [rev-list-opts]"
07432cef 8064msgstr "git fast-export [rev-list-opts]"
ef317cd5 8065
6937cb4e 8066#: builtin/fast-export.c:998
ef317cd5 8067msgid "show progress after <n> objects"
07432cef 8068msgstr "在 <n> 个对象之后显示进度"
ef317cd5 8069
6937cb4e 8070#: builtin/fast-export.c:1000
ef317cd5 8071msgid "select handling of signed tags"
55a16ee4 8072msgstr "选择如何处理签名标签"
ef317cd5 8073
6937cb4e 8074#: builtin/fast-export.c:1003
ef317cd5 8075msgid "select handling of tags that tag filtered objects"
55a16ee4 8076msgstr "选择当标签指向被过滤对象时该标签的处理方式"
ef317cd5 8077
6937cb4e 8078#: builtin/fast-export.c:1006
ef317cd5 8079msgid "Dump marks to this file"
07432cef 8080msgstr "把标记存储到这个文件"
ef317cd5 8081
6937cb4e 8082#: builtin/fast-export.c:1008
ef317cd5 8083msgid "Import marks from this file"
07432cef 8084msgstr "从这个文件导入标记"
ef317cd5 8085
6937cb4e 8086#: builtin/fast-export.c:1010
ef317cd5 8087msgid "Fake a tagger when tags lack one"
55a16ee4 8088msgstr "当标签缺少标记者字段时,假装提供一个"
ef317cd5 8089
6937cb4e 8090#: builtin/fast-export.c:1012
ef317cd5 8091msgid "Output full tree for each commit"
07432cef 8092msgstr "每次提交都输出整个树"
ef317cd5 8093
6937cb4e 8094#: builtin/fast-export.c:1014
ef317cd5 8095msgid "Use the done feature to terminate the stream"
07432cef 8096msgstr "使用 done 功能来终止流"
ef317cd5 8097
6937cb4e 8098#: builtin/fast-export.c:1015
ef317cd5 8099msgid "Skip output of blob data"
07432cef 8100msgstr "跳过数据对象的输出"
ef317cd5 8101
6937cb4e 8102#: builtin/fast-export.c:1016
6acbf033 8103msgid "refspec"
160fb2b2 8104msgstr "引用规格"
6acbf033 8105
6937cb4e 8106#: builtin/fast-export.c:1017
6acbf033 8107msgid "Apply refspec to exported refs"
160fb2b2 8108msgstr "对导出的引用应用引用规格"
6acbf033 8109
6937cb4e 8110#: builtin/fast-export.c:1018
220c313c
JX
8111msgid "anonymize output"
8112msgstr "匿名输出"
8113
6937cb4e 8114#: builtin/fetch.c:23
ef317cd5 8115msgid "git fetch [<options>] [<repository> [<refspec>...]]"
160fb2b2 8116msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
ef317cd5 8117
6937cb4e 8118#: builtin/fetch.c:24
ef317cd5 8119msgid "git fetch [<options>] <group>"
07432cef 8120msgstr "git fetch [<选项>] <组>"
ef317cd5 8121
6937cb4e 8122#: builtin/fetch.c:25
ef317cd5 8123msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
160fb2b2 8124msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
ef317cd5 8125
6937cb4e 8126#: builtin/fetch.c:26
ef317cd5 8127msgid "git fetch --all [<options>]"
07432cef 8128msgstr "git fetch --all [<选项>]"
ef317cd5 8129
6937cb4e 8130#: builtin/fetch.c:112 builtin/pull.c:182
ef317cd5 8131msgid "fetch from all remotes"
07432cef 8132msgstr "从所有的远程抓取"
ef317cd5 8133
6937cb4e 8134#: builtin/fetch.c:114 builtin/pull.c:185
ef317cd5 8135msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 8136msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 8137
6937cb4e 8138#: builtin/fetch.c:116 builtin/pull.c:188
ef317cd5 8139msgid "path to upload pack on remote end"
07432cef 8140msgstr "上传包到远程的路径"
ef317cd5 8141
6937cb4e 8142#: builtin/fetch.c:117 builtin/pull.c:190
ef317cd5 8143msgid "force overwrite of local branch"
07432cef 8144msgstr "强制覆盖本地分支"
ef317cd5 8145
6937cb4e 8146#: builtin/fetch.c:119
ef317cd5 8147msgid "fetch from multiple remotes"
07432cef 8148msgstr "从多个远程抓取"
ef317cd5 8149
6937cb4e 8150#: builtin/fetch.c:121 builtin/pull.c:192
ef317cd5 8151msgid "fetch all tags and associated objects"
55a16ee4 8152msgstr "抓取所有的标签和关联对象"
ef317cd5 8153
6937cb4e 8154#: builtin/fetch.c:123
ef317cd5 8155msgid "do not fetch all tags (--no-tags)"
55a16ee4 8156msgstr "不抓取任何标签(--no-tags)"
ef317cd5 8157
6937cb4e 8158#: builtin/fetch.c:125
276ceeaa
JX
8159msgid "number of submodules fetched in parallel"
8160msgstr "子模组获取的并发数"
8161
6937cb4e 8162#: builtin/fetch.c:127 builtin/pull.c:195
ef317cd5 8163msgid "prune remote-tracking branches no longer on remote"
07432cef 8164msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 8165
07432cef 8166# 译者:可选值,不能翻译
6937cb4e 8167#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
ef317cd5 8168msgid "on-demand"
07432cef 8169msgstr "on-demand"
ef317cd5 8170
6937cb4e 8171#: builtin/fetch.c:129
ef317cd5 8172msgid "control recursive fetching of submodules"
07432cef 8173msgstr "控制子模组的递归抓取"
ef317cd5 8174
6937cb4e 8175#: builtin/fetch.c:133 builtin/pull.c:203
ef317cd5 8176msgid "keep downloaded pack"
07432cef 8177msgstr "保持下载包"
ef317cd5 8178
6937cb4e 8179#: builtin/fetch.c:135
ef317cd5 8180msgid "allow updating of HEAD ref"
07432cef 8181msgstr "允许更新 HEAD 引用"
ef317cd5 8182
6937cb4e 8183#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
ef317cd5 8184msgid "deepen history of shallow clone"
07432cef 8185msgstr "深化浅克隆的历史"
ef317cd5 8186
6937cb4e 8187#: builtin/fetch.c:140
a0b6b246
JX
8188msgid "deepen history of shallow repository based on time"
8189msgstr "基于时间来深化浅克隆的历史"
8190
6937cb4e 8191#: builtin/fetch.c:146 builtin/pull.c:209
a77c07d9 8192msgid "convert to a complete repository"
160fb2b2 8193msgstr "转换为一个完整的仓库"
a77c07d9 8194
6937cb4e 8195#: builtin/fetch.c:148 builtin/log.c:1456
ef317cd5 8196msgid "dir"
07432cef 8197msgstr "目录"
ef317cd5 8198
6937cb4e 8199#: builtin/fetch.c:149
ef317cd5 8200msgid "prepend this to submodule path output"
07432cef 8201msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 8202
6937cb4e 8203#: builtin/fetch.c:152
a4f16749
JX
8204msgid ""
8205"default for recursive fetching of submodules (lower priority than config "
8206"files)"
8207msgstr "递归获取子模组的缺省值(比配置文件优先级低)"
ef317cd5 8208
6937cb4e 8209#: builtin/fetch.c:156 builtin/pull.c:212
cfff71a9
JX
8210msgid "accept refs that update .git/shallow"
8211msgstr "接受更新 .git/shallow 的引用"
8212
6937cb4e 8213#: builtin/fetch.c:157 builtin/pull.c:214
6acbf033
JX
8214msgid "refmap"
8215msgstr "引用映射"
8216
6937cb4e 8217#: builtin/fetch.c:158 builtin/pull.c:215
6acbf033
JX
8218msgid "specify fetch refmap"
8219msgstr "指定获取操作的引用映射"
8220
6937cb4e 8221#: builtin/fetch.c:416
c04f5ac3
JX
8222msgid "Couldn't find remote ref HEAD"
8223msgstr "无法发现远程 HEAD 引用"
8224
6937cb4e 8225#: builtin/fetch.c:534
5c57d762
JX
8226#, c-format
8227msgid "configuration fetch.output contains invalid value %s"
8228msgstr "配置变量 fetch.output 包含无效值 %s"
8229
6937cb4e 8230#: builtin/fetch.c:627
c04f5ac3
JX
8231#, c-format
8232msgid "object %s not found"
8233msgstr "对象 %s 未发现"
8234
6937cb4e 8235#: builtin/fetch.c:631
c04f5ac3
JX
8236msgid "[up to date]"
8237msgstr "[最新]"
8238
6937cb4e 8239#: builtin/fetch.c:644 builtin/fetch.c:724
c04f5ac3
JX
8240msgid "[rejected]"
8241msgstr "[已拒绝]"
8242
6937cb4e 8243#: builtin/fetch.c:645
5c57d762 8244msgid "can't fetch in current branch"
9a4b694c 8245msgstr "当前分支下不能执行获取操作"
5c57d762 8246
6937cb4e 8247#: builtin/fetch.c:654
c04f5ac3 8248msgid "[tag update]"
55a16ee4 8249msgstr "[标签更新]"
c04f5ac3 8250
6937cb4e
JX
8251#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
8252#: builtin/fetch.c:719
5c57d762
JX
8253msgid "unable to update local ref"
8254msgstr "不能更新本地引用"
c04f5ac3 8255
6937cb4e 8256#: builtin/fetch.c:674
c04f5ac3 8257msgid "[new tag]"
55a16ee4 8258msgstr "[新标签]"
c04f5ac3 8259
6937cb4e 8260#: builtin/fetch.c:677
c04f5ac3
JX
8261msgid "[new branch]"
8262msgstr "[新分支]"
8263
6937cb4e 8264#: builtin/fetch.c:680
170e9899
JX
8265msgid "[new ref]"
8266msgstr "[新引用]"
8267
6937cb4e 8268#: builtin/fetch.c:719
c04f5ac3
JX
8269msgid "forced update"
8270msgstr "强制更新"
8271
6937cb4e 8272#: builtin/fetch.c:724
5c57d762
JX
8273msgid "non-fast-forward"
8274msgstr "非快进"
c04f5ac3 8275
6937cb4e 8276#: builtin/fetch.c:769
c04f5ac3
JX
8277#, c-format
8278msgid "%s did not send all necessary objects\n"
8279msgstr "%s 未发送所有必须的对象\n"
8280
6937cb4e 8281#: builtin/fetch.c:789
cfff71a9
JX
8282#, c-format
8283msgid "reject %s because shallow roots are not allowed to be updated"
8284msgstr "拒绝 %s 因为浅克隆不允许被更新"
8285
6937cb4e 8286#: builtin/fetch.c:877 builtin/fetch.c:973
c04f5ac3
JX
8287#, c-format
8288msgid "From %.*s\n"
8289msgstr "来自 %.*s\n"
8290
6937cb4e 8291#: builtin/fetch.c:888
c04f5ac3
JX
8292#, c-format
8293msgid ""
8294"some local refs could not be updated; try running\n"
8295" 'git remote prune %s' to remove any old, conflicting branches"
8296msgstr ""
8297"一些本地引用不能被更新;尝试运行\n"
8298" 'git remote prune %s' 来删除旧的、有冲突的分支"
8299
90e6ef53 8300# 译者:注意保持前导空格
6937cb4e 8301#: builtin/fetch.c:943
81809b99 8302#, c-format
8ada9598 8303msgid " (%s will become dangling)"
07432cef 8304msgstr " (%s 将成为摇摆状态)"
c04f5ac3 8305
90e6ef53 8306# 译者:注意保持前导空格
6937cb4e 8307#: builtin/fetch.c:944
81809b99 8308#, c-format
8ada9598 8309msgid " (%s has become dangling)"
07432cef 8310msgstr " (%s 已成为摇摆状态)"
c04f5ac3 8311
6937cb4e 8312#: builtin/fetch.c:976
c04f5ac3
JX
8313msgid "[deleted]"
8314msgstr "[已删除]"
8315
6937cb4e 8316#: builtin/fetch.c:977 builtin/remote.c:1024
c04f5ac3
JX
8317msgid "(none)"
8318msgstr "(无)"
8319
6937cb4e 8320#: builtin/fetch.c:1000
c04f5ac3
JX
8321#, c-format
8322msgid "Refusing to fetch into current branch %s of non-bare repository"
160fb2b2 8323msgstr "拒绝获取到非纯仓库的当前分支 %s"
c04f5ac3 8324
6937cb4e 8325#: builtin/fetch.c:1019
c04f5ac3
JX
8326#, c-format
8327msgid "Option \"%s\" value \"%s\" is not valid for %s"
8328msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
8329
6937cb4e 8330#: builtin/fetch.c:1022
c04f5ac3
JX
8331#, c-format
8332msgid "Option \"%s\" is ignored for %s\n"
81809b99 8333msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 8334
6937cb4e 8335#: builtin/fetch.c:1098
90314792
JX
8336#, c-format
8337msgid "Don't know how to fetch from %s"
8338msgstr "不知道如何从 %s 获取"
8339
6937cb4e 8340#: builtin/fetch.c:1258
c04f5ac3
JX
8341#, c-format
8342msgid "Fetching %s\n"
d4a8e00b 8343msgstr "正在获取 %s\n"
c04f5ac3 8344
6937cb4e 8345#: builtin/fetch.c:1260 builtin/remote.c:97
c04f5ac3
JX
8346#, c-format
8347msgid "Could not fetch %s"
8348msgstr "不能获取 %s"
8349
6937cb4e 8350#: builtin/fetch.c:1278
c04f5ac3
JX
8351msgid ""
8352"No remote repository specified. Please, specify either a URL or a\n"
8353"remote name from which new revisions should be fetched."
4375c10e 8354msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
c04f5ac3 8355
6937cb4e 8356#: builtin/fetch.c:1301
c04f5ac3 8357msgid "You need to specify a tag name."
55a16ee4 8358msgstr "您需要指定一个标签名称。"
c04f5ac3 8359
6937cb4e 8360#: builtin/fetch.c:1344
a0b6b246
JX
8361msgid "Negative depth in --deepen is not supported"
8362msgstr "--deepen 不支持负数深度"
8363
6937cb4e 8364#: builtin/fetch.c:1346
a0b6b246
JX
8365msgid "--deepen and --depth are mutually exclusive"
8366msgstr "--deepen 和 --depth 是互斥的"
8367
6937cb4e 8368#: builtin/fetch.c:1351
a77c07d9
JX
8369msgid "--depth and --unshallow cannot be used together"
8370msgstr "--depth 和 --unshallow 不能同时使用"
8371
6937cb4e 8372#: builtin/fetch.c:1353
a77c07d9 8373msgid "--unshallow on a complete repository does not make sense"
160fb2b2 8374msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
a77c07d9 8375
6937cb4e 8376#: builtin/fetch.c:1366
c04f5ac3 8377msgid "fetch --all does not take a repository argument"
160fb2b2 8378msgstr "fetch --all 不能带一个仓库参数"
c04f5ac3 8379
6937cb4e 8380#: builtin/fetch.c:1368
c04f5ac3 8381msgid "fetch --all does not make sense with refspecs"
160fb2b2 8382msgstr "fetch --all 带引用规格没有任何意义"
c04f5ac3 8383
6937cb4e 8384#: builtin/fetch.c:1379
c04f5ac3
JX
8385#, c-format
8386msgid "No such remote or remote group: %s"
8387msgstr "没有这样的远程或远程组:%s"
8388
6937cb4e 8389#: builtin/fetch.c:1387
c04f5ac3 8390msgid "Fetching a group and specifying refspecs does not make sense"
160fb2b2 8391msgstr "获取组并指定引用规格没有意义"
c04f5ac3 8392
a4f16749 8393#: builtin/fmt-merge-msg.c:15
814ff314
JX
8394msgid ""
8395"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
8396msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
c04f5ac3 8397
6937cb4e 8398#: builtin/fmt-merge-msg.c:665
ef317cd5 8399msgid "populate log with at most <n> entries from shortlog"
07432cef 8400msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 8401
6937cb4e 8402#: builtin/fmt-merge-msg.c:668
ef317cd5 8403msgid "alias for --log (deprecated)"
07432cef 8404msgstr "参数 --log 的别名(已弃用)"
ef317cd5 8405
6937cb4e 8406#: builtin/fmt-merge-msg.c:671
ef317cd5 8407msgid "text"
07432cef 8408msgstr "文本"
ef317cd5 8409
6937cb4e 8410#: builtin/fmt-merge-msg.c:672
ef317cd5 8411msgid "use <text> as start of message"
07432cef 8412msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 8413
6937cb4e 8414#: builtin/fmt-merge-msg.c:673
ef317cd5 8415msgid "file to read from"
07432cef 8416msgstr "从文件中读取"
ef317cd5 8417
a4f16749 8418#: builtin/for-each-ref.c:10
814ff314
JX
8419msgid "git for-each-ref [<options>] [<pattern>]"
8420msgstr "git for-each-ref [<选项>] [<模式>]"
ef317cd5 8421
a4f16749 8422#: builtin/for-each-ref.c:11
94550ed3
JX
8423msgid "git for-each-ref [--points-at <object>]"
8424msgstr "git for-each-ref [--points-at <对象>]"
8425
a4f16749 8426#: builtin/for-each-ref.c:12
87cb7997
JX
8427msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
8428msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
94550ed3 8429
a4f16749 8430#: builtin/for-each-ref.c:13
87cb7997
JX
8431msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
8432msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
94550ed3 8433
a4f16749 8434#: builtin/for-each-ref.c:28
ef317cd5 8435msgid "quote placeholders suitably for shells"
07432cef 8436msgstr "引用占位符适用于 shells"
ef317cd5 8437
a4f16749 8438#: builtin/for-each-ref.c:30
ef317cd5 8439msgid "quote placeholders suitably for perl"
07432cef 8440msgstr "引用占位符适用于 perl"
ef317cd5 8441
a4f16749 8442#: builtin/for-each-ref.c:32
ef317cd5 8443msgid "quote placeholders suitably for python"
07432cef 8444msgstr "引用占位符适用于 python"
ef317cd5 8445
a4f16749 8446#: builtin/for-each-ref.c:34
04cb2f28
JX
8447msgid "quote placeholders suitably for Tcl"
8448msgstr "引用占位符适用于 Tcl"
ef317cd5 8449
a4f16749 8450#: builtin/for-each-ref.c:37
ef317cd5 8451msgid "show only <n> matched refs"
07432cef 8452msgstr "只显示 <n> 个匹配的引用"
ef317cd5 8453
6937cb4e
JX
8454#: builtin/for-each-ref.c:39 builtin/tag.c:414
8455msgid "respect format colors"
8456msgstr "遵照格式中的颜色输出"
8457
8458#: builtin/for-each-ref.c:43
94550ed3
JX
8459msgid "print only refs which points at the given object"
8460msgstr "只打印指向给定对象的引用"
ef317cd5 8461
6937cb4e 8462#: builtin/for-each-ref.c:45
94550ed3
JX
8463msgid "print only refs that are merged"
8464msgstr "只打印已经合并的引用"
8465
6937cb4e 8466#: builtin/for-each-ref.c:46
94550ed3
JX
8467msgid "print only refs that are not merged"
8468msgstr "只打印没有合并的引用"
ef317cd5 8469
6937cb4e 8470#: builtin/for-each-ref.c:47
94550ed3
JX
8471msgid "print only refs which contain the commit"
8472msgstr "只打印包含该提交的引用"
8473
6937cb4e 8474#: builtin/for-each-ref.c:48
87cb7997
JX
8475msgid "print only refs which don't contain the commit"
8476msgstr "只打印不包含该提交的引用"
8477
6937cb4e 8478#: builtin/fsck.c:543
6c94aba5
JX
8479msgid "Checking object directories"
8480msgstr "检查对象目录中"
8481
6937cb4e 8482#: builtin/fsck.c:635
814ff314
JX
8483msgid "git fsck [<options>] [<object>...]"
8484msgstr "git fsck [<选项>] [<对象>...]"
ef317cd5 8485
6937cb4e 8486#: builtin/fsck.c:641
ef317cd5 8487msgid "show unreachable objects"
07432cef 8488msgstr "显示不可达的对象"
ef317cd5 8489
6937cb4e 8490#: builtin/fsck.c:642
ef317cd5 8491msgid "show dangling objects"
07432cef 8492msgstr "显示摇摆的对象"
ef317cd5 8493
6937cb4e 8494#: builtin/fsck.c:643
ef317cd5 8495msgid "report tags"
55a16ee4 8496msgstr "报告标签"
ef317cd5 8497
6937cb4e 8498#: builtin/fsck.c:644
ef317cd5 8499msgid "report root nodes"
07432cef 8500msgstr "报告根节点"
ef317cd5 8501
6937cb4e 8502#: builtin/fsck.c:645
ef317cd5 8503msgid "make index objects head nodes"
07432cef 8504msgstr "将索引亦作为检查的头节点"
ef317cd5 8505
6937cb4e 8506#: builtin/fsck.c:646
ef317cd5 8507msgid "make reflogs head nodes (default)"
07432cef 8508msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 8509
6937cb4e 8510#: builtin/fsck.c:647
ef317cd5 8511msgid "also consider packs and alternate objects"
07432cef 8512msgstr "也考虑包和备用对象"
ef317cd5 8513
6937cb4e 8514#: builtin/fsck.c:648
1b7f4a34
JX
8515msgid "check only connectivity"
8516msgstr "仅检查连通性"
8517
6937cb4e 8518#: builtin/fsck.c:649
ef317cd5 8519msgid "enable more strict checking"
07432cef 8520msgstr "启用更严格的检查"
ef317cd5 8521
6937cb4e 8522#: builtin/fsck.c:651
ef317cd5 8523msgid "write dangling objects in .git/lost-found"
07432cef 8524msgstr "将摇摆对象写入 .git/lost-found 中"
ef317cd5 8525
6937cb4e 8526#: builtin/fsck.c:652 builtin/prune.c:107
ef317cd5 8527msgid "show progress"
07432cef 8528msgstr "显示进度"
ef317cd5 8529
6937cb4e 8530#: builtin/fsck.c:653
5c57d762
JX
8531msgid "show verbose names for reachable objects"
8532msgstr "显示可达对象的详细名称"
8533
6937cb4e 8534#: builtin/fsck.c:714
6c94aba5
JX
8535msgid "Checking objects"
8536msgstr "检查对象中"
8537
6937cb4e 8538#: builtin/gc.c:27
814ff314
JX
8539msgid "git gc [<options>]"
8540msgstr "git gc [<选项>]"
ef317cd5 8541
6937cb4e 8542#: builtin/gc.c:80
c04f5ac3 8543#, c-format
87cb7997 8544msgid "Failed to fstat %s: %s"
65e2041e 8545msgstr "对 %s 调用 fstat 失败:%s"
c04f5ac3 8546
6937cb4e 8547#: builtin/gc.c:312
c04f5ac3 8548#, c-format
87cb7997 8549msgid "Can't stat %s"
65e2041e 8550msgstr "不能对 %s 调用 stat"
c04f5ac3 8551
6937cb4e 8552#: builtin/gc.c:321
94550ed3
JX
8553#, c-format
8554msgid ""
8555"The last gc run reported the following. Please correct the root cause\n"
8556"and remove %s.\n"
8557"Automatic cleanup will not be performed until the file is removed.\n"
8558"\n"
8559"%s"
8560msgstr ""
8561"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
8562"在该文件被删除之前,自动清理将不会执行。\n"
8563"\n"
8564"%s"
8565
6937cb4e 8566#: builtin/gc.c:360
ef317cd5 8567msgid "prune unreferenced objects"
07432cef 8568msgstr "清除未引用的对象"
ef317cd5 8569
6937cb4e 8570#: builtin/gc.c:362
ef317cd5 8571msgid "be more thorough (increased runtime)"
07432cef 8572msgstr "更彻底(增加运行时间)"
ef317cd5 8573
6937cb4e 8574#: builtin/gc.c:363
ef317cd5 8575msgid "enable auto-gc mode"
07432cef 8576msgstr "启用自动垃圾回收模式"
ef317cd5 8577
6937cb4e 8578#: builtin/gc.c:364
90314792
JX
8579msgid "force running gc even if there may be another gc running"
8580msgstr "强制执行 gc 即使另外一个 gc 正在执行"
8581
6937cb4e 8582#: builtin/gc.c:381
87cb7997
JX
8583#, c-format
8584msgid "Failed to parse gc.logexpiry value %s"
8585msgstr "无法解析 gc.logexpiry 的值 %s"
8586
6937cb4e 8587#: builtin/gc.c:409
c04f5ac3 8588#, c-format
6c94aba5 8589msgid "Auto packing the repository in background for optimum performance.\n"
160fb2b2 8590msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6c94aba5 8591
6937cb4e 8592#: builtin/gc.c:411
6c94aba5
JX
8593#, c-format
8594msgid "Auto packing the repository for optimum performance.\n"
160fb2b2 8595msgstr "自动打包仓库以求最佳性能。\n"
6c94aba5 8596
6937cb4e 8597#: builtin/gc.c:412
6c94aba5
JX
8598#, c-format
8599msgid "See \"git help gc\" for manual housekeeping.\n"
8600msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 8601
6937cb4e 8602#: builtin/gc.c:437
90314792
JX
8603#, c-format
8604msgid ""
8605"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
8606msgstr ""
29004bbb 8607"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)"
90314792 8608
6937cb4e 8609#: builtin/gc.c:481
c04f5ac3
JX
8610msgid ""
8611"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 8612msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 8613
a4f16749 8614#: builtin/grep.c:27
814ff314
JX
8615msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
8616msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
ef317cd5 8617
6937cb4e 8618#: builtin/grep.c:226
c04f5ac3
JX
8619#, c-format
8620msgid "grep: failed to create thread: %s"
90e6ef53 8621msgstr "grep:无法创建线程:%s"
c04f5ac3 8622
6937cb4e 8623#: builtin/grep.c:284
276ceeaa
JX
8624#, c-format
8625msgid "invalid number of threads specified (%d) for %s"
8626msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
8627
a4f16749
JX
8628#. TRANSLATORS: %s is the configuration
8629#. variable for tweaking threads, currently
8630#. grep.threads
8631#.
6937cb4e 8632#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
a4f16749
JX
8633#, c-format
8634msgid "no threads support, ignoring %s"
8635msgstr "没有线程支持,忽略 %s"
8636
6937cb4e 8637#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
c04f5ac3
JX
8638#, c-format
8639msgid "unable to read tree (%s)"
90e6ef53 8640msgstr "无法读取树(%s)"
c04f5ac3 8641
6937cb4e 8642#: builtin/grep.c:628
c04f5ac3
JX
8643#, c-format
8644msgid "unable to grep from object of type %s"
8645msgstr "无法抓取来自于 %s 类型的对象"
8646
6937cb4e 8647#: builtin/grep.c:694
c04f5ac3
JX
8648#, c-format
8649msgid "switch `%c' expects a numerical value"
8650msgstr "开关 `%c' 期望一个数字值"
8651
6937cb4e 8652#: builtin/grep.c:781
ef317cd5 8653msgid "search in index instead of in the work tree"
07432cef 8654msgstr "在索引区搜索而不是在工作区"
ef317cd5 8655
6937cb4e 8656#: builtin/grep.c:783
ef317cd5 8657msgid "find in contents not managed by git"
07432cef 8658msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
8659
8660# 译者:中文字符串拼接,可删除前导空格
6937cb4e 8661#: builtin/grep.c:785
ef317cd5 8662msgid "search in both tracked and untracked files"
07432cef 8663msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 8664
6937cb4e 8665#: builtin/grep.c:787
814ff314
JX
8666msgid "ignore files specified via '.gitignore'"
8667msgstr "忽略 '.gitignore' 包含的文件"
ef317cd5 8668
6937cb4e 8669#: builtin/grep.c:789
87cb7997 8670msgid "recursively search in each submodule"
1a79b2f1
JX
8671msgstr "在每一个子模组中递归搜索"
8672
6937cb4e 8673#: builtin/grep.c:792
ef317cd5 8674msgid "show non-matching lines"
07432cef 8675msgstr "显示未匹配的行"
ef317cd5 8676
6937cb4e 8677#: builtin/grep.c:794
ef317cd5 8678msgid "case insensitive matching"
07432cef 8679msgstr "不区分大小写匹配"
ef317cd5 8680
6937cb4e 8681#: builtin/grep.c:796
ef317cd5 8682msgid "match patterns only at word boundaries"
07432cef 8683msgstr "只在单词边界匹配模式"
ef317cd5 8684
6937cb4e 8685#: builtin/grep.c:798
ef317cd5 8686msgid "process binary files as text"
07432cef 8687msgstr "把二进制文件当做文本处理"
ef317cd5 8688
6937cb4e 8689#: builtin/grep.c:800
ef317cd5 8690msgid "don't match patterns in binary files"
07432cef 8691msgstr "不在二进制文件中匹配模式"
ef317cd5 8692
6937cb4e 8693#: builtin/grep.c:803
90314792
JX
8694msgid "process binary files with textconv filters"
8695msgstr "用 textconv 过滤器处理二进制文件"
8696
6937cb4e 8697#: builtin/grep.c:805
ef317cd5 8698msgid "descend at most <depth> levels"
07432cef 8699msgstr "最多以指定的深度向下寻找"
ef317cd5 8700
6937cb4e 8701#: builtin/grep.c:809
ef317cd5 8702msgid "use extended POSIX regular expressions"
07432cef 8703msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 8704
6937cb4e 8705#: builtin/grep.c:812
ef317cd5 8706msgid "use basic POSIX regular expressions (default)"
07432cef 8707msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 8708
6937cb4e 8709#: builtin/grep.c:815
ef317cd5 8710msgid "interpret patterns as fixed strings"
07432cef 8711msgstr "把模式解析为固定的字符串"
ef317cd5 8712
6937cb4e 8713#: builtin/grep.c:818
ef317cd5 8714msgid "use Perl-compatible regular expressions"
07432cef 8715msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 8716
6937cb4e 8717#: builtin/grep.c:821
ef317cd5 8718msgid "show line numbers"
07432cef 8719msgstr "显示行号"
ef317cd5 8720
6937cb4e 8721#: builtin/grep.c:822
ef317cd5 8722msgid "don't show filenames"
07432cef 8723msgstr "不显示文件名"
ef317cd5 8724
6937cb4e 8725#: builtin/grep.c:823
ef317cd5 8726msgid "show filenames"
07432cef 8727msgstr "显示文件名"
ef317cd5 8728
6937cb4e 8729#: builtin/grep.c:825
ef317cd5 8730msgid "show filenames relative to top directory"
07432cef 8731msgstr "显示相对于顶级目录的文件名"
ef317cd5 8732
6937cb4e 8733#: builtin/grep.c:827
ef317cd5 8734msgid "show only filenames instead of matching lines"
07432cef 8735msgstr "只显示文件名而不显示匹配的行"
ef317cd5 8736
6937cb4e 8737#: builtin/grep.c:829
ef317cd5 8738msgid "synonym for --files-with-matches"
07432cef 8739msgstr "和 --files-with-matches 同义"
ef317cd5 8740
6937cb4e 8741#: builtin/grep.c:832
ef317cd5 8742msgid "show only the names of files without match"
07432cef 8743msgstr "只显示未匹配的文件名"
ef317cd5 8744
6937cb4e 8745#: builtin/grep.c:834
ef317cd5 8746msgid "print NUL after filenames"
07432cef 8747msgstr "在文件名后输出 NUL 字符"
ef317cd5 8748
6937cb4e 8749#: builtin/grep.c:836
ef317cd5 8750msgid "show the number of matches instead of matching lines"
07432cef 8751msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 8752
6937cb4e 8753#: builtin/grep.c:837
ef317cd5 8754msgid "highlight matches"
07432cef 8755msgstr "高亮显示匹配项"
ef317cd5 8756
6937cb4e 8757#: builtin/grep.c:839
ef317cd5 8758msgid "print empty line between matches from different files"
07432cef 8759msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 8760
6937cb4e 8761#: builtin/grep.c:841
ef317cd5 8762msgid "show filename only once above matches from same file"
07432cef 8763msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 8764
6937cb4e 8765#: builtin/grep.c:844
ef317cd5 8766msgid "show <n> context lines before and after matches"
07432cef 8767msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 8768
6937cb4e 8769#: builtin/grep.c:847
ef317cd5 8770msgid "show <n> context lines before matches"
07432cef 8771msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 8772
6937cb4e 8773#: builtin/grep.c:849
ef317cd5 8774msgid "show <n> context lines after matches"
07432cef 8775msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 8776
6937cb4e 8777#: builtin/grep.c:851
276ceeaa
JX
8778msgid "use <n> worker threads"
8779msgstr "使用 <n> 个工作线程"
8780
6937cb4e 8781#: builtin/grep.c:852
ef317cd5 8782msgid "shortcut for -C NUM"
07432cef 8783msgstr "快捷键 -C 数字"
ef317cd5 8784
6937cb4e 8785#: builtin/grep.c:855
ef317cd5 8786msgid "show a line with the function name before matches"
07432cef 8787msgstr "在匹配的前面显示一行函数名"
ef317cd5 8788
6937cb4e 8789#: builtin/grep.c:857
ef317cd5 8790msgid "show the surrounding function"
07432cef 8791msgstr "显示所在函数的前后内容"
ef317cd5 8792
6937cb4e 8793#: builtin/grep.c:860
ef317cd5 8794msgid "read patterns from file"
07432cef 8795msgstr "从文件读取模式"
ef317cd5 8796
6937cb4e 8797#: builtin/grep.c:862
ef317cd5 8798msgid "match <pattern>"
07432cef 8799msgstr "匹配 <模式>"
ef317cd5 8800
6937cb4e 8801#: builtin/grep.c:864
ef317cd5 8802msgid "combine patterns specified with -e"
07432cef 8803msgstr "组合用 -e 参数设定的模式"
ef317cd5 8804
6937cb4e 8805#: builtin/grep.c:876
ef317cd5 8806msgid "indicate hit with exit status without output"
07432cef 8807msgstr "不输出,而用退出码标识命中状态"
ef317cd5 8808
6937cb4e 8809#: builtin/grep.c:878
ef317cd5 8810msgid "show only matches from files that match all patterns"
07432cef 8811msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 8812
6937cb4e 8813#: builtin/grep.c:880
07432cef
WS
8814msgid "show parse tree for grep expression"
8815msgstr "显示 grep 表达式的解析树"
8816
6937cb4e 8817#: builtin/grep.c:884
ef317cd5 8818msgid "pager"
07432cef 8819msgstr "分页"
ef317cd5 8820
6937cb4e 8821#: builtin/grep.c:884
ef317cd5 8822msgid "show matching files in the pager"
07432cef 8823msgstr "分页显示匹配的文件"
ef317cd5 8824
6937cb4e 8825#: builtin/grep.c:887
ef317cd5 8826msgid "allow calling of grep(1) (ignored by this build)"
07432cef 8827msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 8828
6937cb4e 8829#: builtin/grep.c:950
c04f5ac3
JX
8830msgid "no pattern given."
8831msgstr "未提供模式匹配。"
8832
6937cb4e 8833#: builtin/grep.c:982
87cb7997
JX
8834msgid "--no-index or --untracked cannot be used with revs"
8835msgstr "--no-index 或 --untracked 不能和版本同时使用"
8836
6937cb4e 8837#: builtin/grep.c:989
87cb7997
JX
8838#, c-format
8839msgid "unable to resolve revision: %s"
8840msgstr "不能解析版本:%s"
8841
6937cb4e 8842#: builtin/grep.c:1023 builtin/index-pack.c:1491
276ceeaa
JX
8843#, c-format
8844msgid "invalid number of threads specified (%d)"
8845msgstr "指定的线程数无效(%d)"
8846
6937cb4e 8847#: builtin/grep.c:1028
a4f16749
JX
8848msgid "no threads support, ignoring --threads"
8849msgstr "没有线程支持,忽略 --threads"
8850
6937cb4e 8851#: builtin/grep.c:1052
c04f5ac3
JX
8852msgid "--open-files-in-pager only works on the worktree"
8853msgstr "--open-files-in-pager 仅用于工作区"
8854
6937cb4e 8855#: builtin/grep.c:1075
1a79b2f1
JX
8856msgid "option not supported with --recurse-submodules."
8857msgstr "选项不支持和 --recurse-submodules 共用。"
8858
6937cb4e 8859#: builtin/grep.c:1081
c04f5ac3 8860msgid "--cached or --untracked cannot be used with --no-index."
649900bc 8861msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
c04f5ac3 8862
6937cb4e 8863#: builtin/grep.c:1087
c04f5ac3 8864msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 8865msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 8866
6937cb4e 8867#: builtin/grep.c:1095
c04f5ac3
JX
8868msgid "both --cached and trees are given."
8869msgstr "同时给出了 --cached 和树对象。"
8870
a4f16749 8871#: builtin/hash-object.c:82
ef317cd5 8872msgid ""
814ff314
JX
8873"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
8874"[--] <file>..."
ef317cd5 8875msgstr ""
814ff314
JX
8876"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
8877"[--] <文件>..."
ef317cd5 8878
a4f16749 8879#: builtin/hash-object.c:83
94550ed3
JX
8880msgid "git hash-object --stdin-paths"
8881msgstr "git hash-object --stdin-paths"
ef317cd5 8882
a4f16749 8883#: builtin/hash-object.c:95
ef317cd5 8884msgid "type"
07432cef 8885msgstr "类型"
ef317cd5 8886
a4f16749 8887#: builtin/hash-object.c:95
ef317cd5 8888msgid "object type"
07432cef 8889msgstr "对象类型"
ef317cd5 8890
a4f16749 8891#: builtin/hash-object.c:96
ef317cd5 8892msgid "write the object into the object database"
07432cef 8893msgstr "将对象写入对象数据库"
ef317cd5 8894
a4f16749 8895#: builtin/hash-object.c:98
ef317cd5 8896msgid "read the object from stdin"
07432cef 8897msgstr "从标准输入读取对象"
ef317cd5 8898
a4f16749 8899#: builtin/hash-object.c:100
ef317cd5 8900msgid "store file as is without filters"
07432cef 8901msgstr "原样存储文件不使用过滤器"
ef317cd5 8902
a4f16749 8903#: builtin/hash-object.c:101
220c313c
JX
8904msgid ""
8905"just hash any random garbage to create corrupt objects for debugging Git"
8906msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
8907
a4f16749 8908#: builtin/hash-object.c:102
ef317cd5 8909msgid "process file as it were from this path"
07432cef 8910msgstr "处理文件并假设其来自于此路径"
ef317cd5 8911
a4f16749 8912#: builtin/help.c:43
ef317cd5 8913msgid "print all available commands"
07432cef 8914msgstr "打印所有可用的命令"
ef317cd5 8915
a4f16749 8916#: builtin/help.c:44
a0b6b246
JX
8917msgid "exclude guides"
8918msgstr "排除向导"
8919
a4f16749 8920#: builtin/help.c:45
4dcdc3d8
JX
8921msgid "print list of useful guides"
8922msgstr "显示有用的指南列表"
8923
a4f16749 8924#: builtin/help.c:46
ef317cd5 8925msgid "show man page"
07432cef 8926msgstr "显示 man 手册"
ef317cd5 8927
a4f16749 8928#: builtin/help.c:47
ef317cd5 8929msgid "show manual in web browser"
07432cef 8930msgstr "在 web 浏览器中显示手册"
ef317cd5 8931
a4f16749 8932#: builtin/help.c:49
ef317cd5 8933msgid "show info page"
07432cef 8934msgstr "显示 info 手册"
ef317cd5 8935
a4f16749 8936#: builtin/help.c:55
814ff314
JX
8937msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
8938msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
ef317cd5 8939
a4f16749 8940#: builtin/help.c:67
81809b99 8941#, c-format
8ada9598 8942msgid "unrecognized help format '%s'"
81809b99 8943msgstr "未能识别的帮助格式 '%s'"
8ada9598 8944
a4f16749 8945#: builtin/help.c:94
8ada9598 8946msgid "Failed to start emacsclient."
81809b99 8947msgstr "无法启动 emacsclient。"
8ada9598 8948
a4f16749 8949#: builtin/help.c:107
8ada9598 8950msgid "Failed to parse emacsclient version."
81809b99 8951msgstr "无法解析 emacsclient 版本。"
8ada9598 8952
a4f16749 8953#: builtin/help.c:115
8ada9598
JX
8954#, c-format
8955msgid "emacsclient version '%d' too old (< 22)."
07432cef 8956msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 8957
6937cb4e 8958#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
81809b99 8959#, c-format
5b04ee3b
JX
8960msgid "failed to exec '%s'"
8961msgstr "无法执行 '%s'"
8ada9598 8962
6937cb4e 8963#: builtin/help.c:211
8ada9598
JX
8964#, c-format
8965msgid ""
8966"'%s': path for unsupported man viewer.\n"
8967"Please consider using 'man.<tool>.cmd' instead."
8968msgstr ""
81809b99 8969"'%s':不支持的 man 手册查看器的路径。\n"
d9d56b23 8970"请使用 'man.<工具>.cmd'。"
8ada9598 8971
6937cb4e 8972#: builtin/help.c:223
8ada9598
JX
8973#, c-format
8974msgid ""
8975"'%s': cmd for supported man viewer.\n"
8976"Please consider using 'man.<tool>.path' instead."
8977msgstr ""
81809b99 8978"'%s': 支持的 man 手册查看器命令。\n"
d9d56b23 8979"请使用 'man.<工具>.path'。"
8ada9598 8980
6937cb4e 8981#: builtin/help.c:340
8ada9598
JX
8982#, c-format
8983msgid "'%s': unknown man viewer."
81809b99 8984msgstr "'%s':未知的 man 查看器。"
8ada9598 8985
6937cb4e 8986#: builtin/help.c:357
8ada9598 8987msgid "no man viewer handled the request"
81809b99 8988msgstr "没有 man 查看器处理此请求"
8ada9598 8989
6937cb4e 8990#: builtin/help.c:365
8ada9598 8991msgid "no info viewer handled the request"
81809b99 8992msgstr "没有 info 查看器处理此请求"
8ada9598 8993
6937cb4e 8994#: builtin/help.c:407
4dcdc3d8
JX
8995msgid "Defining attributes per path"
8996msgstr "定义路径的属性"
8997
6937cb4e 8998#: builtin/help.c:408
220c313c
JX
8999msgid "Everyday Git With 20 Commands Or So"
9000msgstr "每一天 Git 常用的约 20 条命令"
9001
6937cb4e 9002#: builtin/help.c:409
4dcdc3d8
JX
9003msgid "A Git glossary"
9004msgstr "Git 词汇表"
9005
6937cb4e 9006#: builtin/help.c:410
4dcdc3d8
JX
9007msgid "Specifies intentionally untracked files to ignore"
9008msgstr "忽略指定的未跟踪文件"
9009
6937cb4e 9010#: builtin/help.c:411
4dcdc3d8
JX
9011msgid "Defining submodule properties"
9012msgstr "定义子模组属性"
9013
6937cb4e 9014#: builtin/help.c:412
4dcdc3d8
JX
9015msgid "Specifying revisions and ranges for Git"
9016msgstr "指定 Git 的版本和版本范围"
9017
6937cb4e 9018#: builtin/help.c:413
4dcdc3d8
JX
9019msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
9020msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
9021
6937cb4e 9022#: builtin/help.c:414
4dcdc3d8
JX
9023msgid "An overview of recommended workflows with Git"
9024msgstr "Git 推荐的工作流概览"
9025
6937cb4e 9026#: builtin/help.c:426
4dcdc3d8
JX
9027msgid "The common Git guides are:\n"
9028msgstr "最常用的 Git 向导有:\n"
9029
6937cb4e 9030#: builtin/help.c:444
8ada9598 9031#, c-format
6937cb4e
JX
9032msgid "'%s' is aliased to '%s'"
9033msgstr "'%s' 是 '%s' 的别名"
8ada9598 9034
6937cb4e 9035#: builtin/help.c:466 builtin/help.c:483
a0b6b246
JX
9036#, c-format
9037msgid "usage: %s%s"
9038msgstr "用法:%s%s"
9039
6937cb4e 9040#: builtin/index-pack.c:156
6acbf033
JX
9041#, c-format
9042msgid "unable to open %s"
9043msgstr "不能打开 %s"
9044
6937cb4e 9045#: builtin/index-pack.c:206
8ada9598
JX
9046#, c-format
9047msgid "object type mismatch at %s"
81809b99 9048msgstr "%s 的对象类型不匹配"
8ada9598 9049
6937cb4e 9050#: builtin/index-pack.c:226
6acbf033
JX
9051#, c-format
9052msgid "did not receive expected object %s"
a0b6b246 9053msgstr "未能获取预期的对象 %s"
8ada9598 9054
6937cb4e 9055#: builtin/index-pack.c:229
6acbf033
JX
9056#, c-format
9057msgid "object %s: expected type %s, found %s"
a0b6b246 9058msgstr "对象 %s:应为类型 %s,却是 %s"
6acbf033 9059
6937cb4e 9060#: builtin/index-pack.c:271
81809b99 9061#, c-format
8ada9598
JX
9062msgid "cannot fill %d byte"
9063msgid_plural "cannot fill %d bytes"
81809b99 9064msgstr[0] "无法填充 %d 字节"
5ae481e0 9065msgstr[1] "无法填充 %d 字节"
8ada9598 9066
6937cb4e 9067#: builtin/index-pack.c:281
8ada9598 9068msgid "early EOF"
81809b99 9069msgstr "过早的文件结束符(EOF)"
8ada9598 9070
6937cb4e 9071#: builtin/index-pack.c:282
8ada9598 9072msgid "read error on input"
81809b99 9073msgstr "输入上的读错误"
8ada9598 9074
6937cb4e 9075#: builtin/index-pack.c:294
8ada9598 9076msgid "used more bytes than were available"
81809b99 9077msgstr "用掉了超过可用的字节"
8ada9598 9078
6937cb4e 9079#: builtin/index-pack.c:301
8ada9598 9080msgid "pack too large for current definition of off_t"
81809b99 9081msgstr "包太大超过了当前 off_t 的定义"
8ada9598 9082
6937cb4e 9083#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
a0b6b246
JX
9084msgid "pack exceeds maximum allowed size"
9085msgstr "包超过了最大允许值"
9086
6937cb4e 9087#: builtin/index-pack.c:319
81809b99 9088#, c-format
8ada9598 9089msgid "unable to create '%s'"
81809b99 9090msgstr "不能创建 '%s'"
8ada9598 9091
6937cb4e 9092#: builtin/index-pack.c:325
81809b99 9093#, c-format
8ada9598 9094msgid "cannot open packfile '%s'"
81809b99 9095msgstr "无法打开包文件 '%s'"
8ada9598 9096
6937cb4e 9097#: builtin/index-pack.c:339
8ada9598 9098msgid "pack signature mismatch"
81809b99 9099msgstr "包签名不匹配"
8ada9598 9100
6937cb4e 9101#: builtin/index-pack.c:341
ef317cd5
JX
9102#, c-format
9103msgid "pack version %<PRIu32> unsupported"
07432cef 9104msgstr "不支持包版本 %<PRIu32>"
ef317cd5 9105
6937cb4e 9106#: builtin/index-pack.c:359
8ada9598 9107#, c-format
5c57d762
JX
9108msgid "pack has bad object at offset %<PRIuMAX>: %s"
9109msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
8ada9598 9110
6937cb4e 9111#: builtin/index-pack.c:480
8ada9598
JX
9112#, c-format
9113msgid "inflate returned %d"
81809b99 9114msgstr "解压缩返回 %d"
8ada9598 9115
6937cb4e 9116#: builtin/index-pack.c:529
8ada9598 9117msgid "offset value overflow for delta base object"
81809b99 9118msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 9119
6937cb4e 9120#: builtin/index-pack.c:537
8ada9598 9121msgid "delta base offset is out of bound"
81809b99 9122msgstr "delta 基准偏移越界"
8ada9598 9123
6937cb4e 9124#: builtin/index-pack.c:545
81809b99 9125#, c-format
8ada9598 9126msgid "unknown object type %d"
81809b99 9127msgstr "未知对象类型 %d"
8ada9598 9128
6937cb4e 9129#: builtin/index-pack.c:576
8ada9598 9130msgid "cannot pread pack file"
81809b99 9131msgstr "无法读取包文件"
8ada9598 9132
6937cb4e 9133#: builtin/index-pack.c:578
8ada9598 9134#, c-format
5c57d762
JX
9135msgid "premature end of pack file, %<PRIuMAX> byte missing"
9136msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
9137msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
9138msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8ada9598 9139
6937cb4e 9140#: builtin/index-pack.c:604
8ada9598 9141msgid "serious inflate inconsistency"
81809b99 9142msgstr "解压缩严重的不一致"
8ada9598 9143
6937cb4e
JX
9144#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
9145#: builtin/index-pack.c:817 builtin/index-pack.c:826
8ada9598
JX
9146#, c-format
9147msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 9148msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 9149
6937cb4e
JX
9150#: builtin/index-pack.c:752 builtin/pack-objects.c:168
9151#: builtin/pack-objects.c:262
6792b93b
JX
9152#, c-format
9153msgid "unable to read %s"
9154msgstr "不能读 %s"
9155
6937cb4e 9156#: builtin/index-pack.c:815
87cb7997
JX
9157#, c-format
9158msgid "cannot read existing object info %s"
9159msgstr "不能读取现存对象信息 %s"
9160
6937cb4e 9161#: builtin/index-pack.c:823
6792b93b
JX
9162#, c-format
9163msgid "cannot read existing object %s"
9164msgstr "不能读取现存对象 %s"
9165
6937cb4e 9166#: builtin/index-pack.c:837
81809b99 9167#, c-format
8ada9598 9168msgid "invalid blob object %s"
160fb2b2 9169msgstr "无效的数据对象 %s"
8ada9598 9170
6937cb4e 9171#: builtin/index-pack.c:852
81809b99 9172#, c-format
8ada9598 9173msgid "invalid %s"
81809b99 9174msgstr "无效的 %s"
8ada9598 9175
6937cb4e 9176#: builtin/index-pack.c:855
8ada9598 9177msgid "Error in object"
81809b99 9178msgstr "对象中出错"
8ada9598 9179
6937cb4e 9180#: builtin/index-pack.c:857
8ada9598
JX
9181#, c-format
9182msgid "Not all child objects of %s are reachable"
81809b99 9183msgstr "%s 的所有子对象并非都可达"
8ada9598 9184
6937cb4e 9185#: builtin/index-pack.c:929 builtin/index-pack.c:960
8ada9598 9186msgid "failed to apply delta"
81809b99 9187msgstr "无法应用 delta"
8ada9598 9188
6937cb4e 9189#: builtin/index-pack.c:1131
8ada9598 9190msgid "Receiving objects"
81809b99 9191msgstr "接收对象中"
8ada9598 9192
6937cb4e 9193#: builtin/index-pack.c:1131
8ada9598 9194msgid "Indexing objects"
81809b99 9195msgstr "索引对象中"
8ada9598 9196
6937cb4e 9197#: builtin/index-pack.c:1165
8ada9598 9198msgid "pack is corrupted (SHA1 mismatch)"
81809b99 9199msgstr "包冲突(SHA1 不匹配)"
8ada9598 9200
6937cb4e 9201#: builtin/index-pack.c:1170
8ada9598 9202msgid "cannot fstat packfile"
65e2041e 9203msgstr "不能对包文件调用 fstat"
8ada9598 9204
6937cb4e 9205#: builtin/index-pack.c:1173
8ada9598 9206msgid "pack has junk at the end"
81809b99 9207msgstr "包的结尾有垃圾数据"
8ada9598 9208
6937cb4e 9209#: builtin/index-pack.c:1185
6792b93b
JX
9210msgid "confusion beyond insanity in parse_pack_objects()"
9211msgstr "parse_pack_objects() 中遇到不可理喻的问题"
9212
6937cb4e 9213#: builtin/index-pack.c:1208
8ada9598 9214msgid "Resolving deltas"
81809b99 9215msgstr "处理 delta 中"
8ada9598 9216
6937cb4e 9217#: builtin/index-pack.c:1219
07432cef 9218#, c-format
ef317cd5 9219msgid "unable to create thread: %s"
07432cef 9220msgstr "不能创建线程:%s"
ef317cd5 9221
6937cb4e 9222#: builtin/index-pack.c:1261
8ada9598 9223msgid "confusion beyond insanity"
81809b99 9224msgstr "不可理喻"
8ada9598 9225
6937cb4e 9226#: builtin/index-pack.c:1267
ef317cd5 9227#, c-format
5b04ee3b
JX
9228msgid "completed with %d local object"
9229msgid_plural "completed with %d local objects"
9230msgstr[0] "完成 %d 个本地对象"
9231msgstr[1] "完成 %d 个本地对象"
ef317cd5 9232
6937cb4e 9233#: builtin/index-pack.c:1279
ef317cd5
JX
9234#, c-format
9235msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 9236msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 9237
6937cb4e 9238#: builtin/index-pack.c:1283
8ada9598
JX
9239#, c-format
9240msgid "pack has %d unresolved delta"
9241msgid_plural "pack has %d unresolved deltas"
81809b99 9242msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 9243msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 9244
6937cb4e 9245#: builtin/index-pack.c:1307
81809b99 9246#, c-format
8ada9598 9247msgid "unable to deflate appended object (%d)"
07432cef 9248msgstr "不能压缩附加对象(%d)"
8ada9598 9249
6937cb4e 9250#: builtin/index-pack.c:1383
8ada9598
JX
9251#, c-format
9252msgid "local object %s is corrupt"
81809b99 9253msgstr "本地对象 %s 已损坏"
8ada9598 9254
6937cb4e 9255#: builtin/index-pack.c:1409
8ada9598 9256msgid "error while closing pack file"
81809b99 9257msgstr "关闭包文件时出错"
8ada9598 9258
6937cb4e 9259#: builtin/index-pack.c:1421
81809b99 9260#, c-format
8ada9598 9261msgid "cannot write keep file '%s'"
81809b99 9262msgstr "无法写保留文件 '%s'"
8ada9598 9263
6937cb4e 9264#: builtin/index-pack.c:1429
81809b99 9265#, c-format
8ada9598 9266msgid "cannot close written keep file '%s'"
81809b99 9267msgstr "无法关闭保留文件 '%s'"
8ada9598 9268
6937cb4e 9269#: builtin/index-pack.c:1439
8ada9598 9270msgid "cannot store pack file"
81809b99 9271msgstr "无法存储包文件"
8ada9598 9272
6937cb4e 9273#: builtin/index-pack.c:1447
8ada9598 9274msgid "cannot store index file"
81809b99 9275msgstr "无法存储索引文件"
8ada9598 9276
6937cb4e 9277#: builtin/index-pack.c:1485
07432cef 9278#, c-format
ef317cd5 9279msgid "bad pack.indexversion=%<PRIu32>"
07432cef 9280msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 9281
6937cb4e 9282#: builtin/index-pack.c:1553
81809b99 9283#, c-format
8ada9598 9284msgid "Cannot open existing pack file '%s'"
81809b99 9285msgstr "无法打开现存包文件 '%s'"
8ada9598 9286
6937cb4e 9287#: builtin/index-pack.c:1555
81809b99 9288#, c-format
8ada9598 9289msgid "Cannot open existing pack idx file for '%s'"
81809b99 9290msgstr "无法为 %s 打开包索引文件"
8ada9598 9291
6937cb4e 9292#: builtin/index-pack.c:1603
81809b99 9293#, c-format
8ada9598
JX
9294msgid "non delta: %d object"
9295msgid_plural "non delta: %d objects"
81809b99 9296msgstr[0] "非 delta:%d 个对象"
5ae481e0 9297msgstr[1] "非 delta:%d 个对象"
8ada9598 9298
6937cb4e 9299#: builtin/index-pack.c:1610
8ada9598
JX
9300#, c-format
9301msgid "chain length = %d: %lu object"
9302msgid_plural "chain length = %d: %lu objects"
81809b99 9303msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 9304msgstr[1] "链长 = %d: %lu 对象"
8ada9598 9305
6937cb4e 9306#: builtin/index-pack.c:1623
5b04ee3b
JX
9307#, c-format
9308msgid "packfile name '%s' does not end with '.pack'"
9309msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
9310
6937cb4e
JX
9311#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
9312#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
81809b99 9313#, c-format
8ada9598 9314msgid "bad %s"
81809b99 9315msgstr "错误选项 %s"
8ada9598 9316
6937cb4e 9317#: builtin/index-pack.c:1744
8ada9598 9318msgid "--fix-thin cannot be used without --stdin"
649900bc 9319msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 9320
6937cb4e 9321#: builtin/index-pack.c:1746
1a79b2f1
JX
9322msgid "--stdin requires a git repository"
9323msgstr "--stdin 需要一个 git 仓库"
9324
6937cb4e 9325#: builtin/index-pack.c:1754
8ada9598 9326msgid "--verify with no packfile name given"
dbd6cced 9327msgstr "--verify 没有提供包文件名参数"
8ada9598 9328
a4f16749 9329#: builtin/init-db.c:55
c04f5ac3
JX
9330#, c-format
9331msgid "cannot stat '%s'"
65e2041e 9332msgstr "不能对 '%s' 调用 stat"
c04f5ac3 9333
a4f16749 9334#: builtin/init-db.c:61
c04f5ac3
JX
9335#, c-format
9336msgid "cannot stat template '%s'"
65e2041e 9337msgstr "不能对模版 '%s' 调用 stat"
c04f5ac3 9338
a4f16749 9339#: builtin/init-db.c:66
c04f5ac3
JX
9340#, c-format
9341msgid "cannot opendir '%s'"
9342msgstr "不能打开目录 '%s'"
9343
a4f16749 9344#: builtin/init-db.c:77
c04f5ac3
JX
9345#, c-format
9346msgid "cannot readlink '%s'"
9347msgstr "不能读取链接 '%s'"
9348
a4f16749 9349#: builtin/init-db.c:79
c04f5ac3
JX
9350#, c-format
9351msgid "cannot symlink '%s' '%s'"
90e6ef53 9352msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3 9353
a4f16749 9354#: builtin/init-db.c:85
c04f5ac3
JX
9355#, c-format
9356msgid "cannot copy '%s' to '%s'"
9357msgstr "不能拷贝 '%s' 至 '%s'"
9358
a4f16749 9359#: builtin/init-db.c:89
c04f5ac3
JX
9360#, c-format
9361msgid "ignoring template %s"
9362msgstr "忽略模版 %s"
9363
a4f16749 9364#: builtin/init-db.c:120
c04f5ac3
JX
9365#, c-format
9366msgid "templates not found %s"
9367msgstr "模版未找到 %s"
9368
a4f16749 9369#: builtin/init-db.c:135
c04f5ac3 9370#, c-format
5b04ee3b
JX
9371msgid "not copying templates from '%s': %s"
9372msgstr "没有从 '%s' 复制模版:%s"
c04f5ac3 9373
a4f16749 9374#: builtin/init-db.c:328
c04f5ac3
JX
9375#, c-format
9376msgid "unable to handle file type %d"
9377msgstr "不能处理 %d 类型的文件"
9378
a4f16749 9379#: builtin/init-db.c:331
c04f5ac3
JX
9380#, c-format
9381msgid "unable to move %s to %s"
9382msgstr "不能移动 %s 至 %s"
9383
a4f16749 9384#: builtin/init-db.c:348 builtin/init-db.c:351
a0b6b246
JX
9385#, c-format
9386msgid "%s already exists"
9387msgstr "%s 已经存在"
9388
a4f16749 9389#: builtin/init-db.c:404
c04f5ac3 9390#, c-format
5c57d762
JX
9391msgid "Reinitialized existing shared Git repository in %s%s\n"
9392msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
c04f5ac3 9393
a4f16749 9394#: builtin/init-db.c:405
5c57d762
JX
9395#, c-format
9396msgid "Reinitialized existing Git repository in %s%s\n"
9397msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
c04f5ac3 9398
a4f16749 9399#: builtin/init-db.c:409
5c57d762
JX
9400#, c-format
9401msgid "Initialized empty shared Git repository in %s%s\n"
9a4b694c 9402msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
c04f5ac3 9403
a4f16749 9404#: builtin/init-db.c:410
5c57d762
JX
9405#, c-format
9406msgid "Initialized empty Git repository in %s%s\n"
9a4b694c 9407msgstr "已初始化空的 Git 仓库于 %s%s\n"
c04f5ac3 9408
a4f16749 9409#: builtin/init-db.c:458
ef317cd5 9410msgid ""
a77c07d9 9411"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
814ff314 9412"shared[=<permissions>]] [<directory>]"
ef317cd5 9413msgstr ""
07432cef 9414"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
814ff314 9415"[<目录>]"
ef317cd5 9416
a4f16749 9417#: builtin/init-db.c:481
ef317cd5 9418msgid "permissions"
07432cef 9419msgstr "权限"
ef317cd5 9420
a4f16749 9421#: builtin/init-db.c:482
ef317cd5 9422msgid "specify that the git repository is to be shared amongst several users"
160fb2b2 9423msgstr "指定 git 仓库是多个用户之间共享的"
ef317cd5 9424
a4f16749 9425#: builtin/init-db.c:516 builtin/init-db.c:521
c04f5ac3
JX
9426#, c-format
9427msgid "cannot mkdir %s"
9428msgstr "不能创建目录 %s"
9429
a4f16749 9430#: builtin/init-db.c:525
c04f5ac3
JX
9431#, c-format
9432msgid "cannot chdir to %s"
9433msgstr "不能切换目录到 %s"
9434
a4f16749 9435#: builtin/init-db.c:546
c04f5ac3
JX
9436#, c-format
9437msgid ""
9438"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
9439"dir=<directory>)"
1e607449 9440msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
c04f5ac3 9441
a4f16749 9442#: builtin/init-db.c:574
c04f5ac3
JX
9443#, c-format
9444msgid "Cannot access work tree '%s'"
9445msgstr "不能访问工作区 '%s'"
9446
220c313c
JX
9447#: builtin/interpret-trailers.c:15
9448msgid ""
276ceeaa
JX
9449"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
9450"<token>[(=|:)<value>])...] [<file>...]"
3495628d
JX
9451msgstr ""
9452"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
9453">])...] [<文件>...]"
276ceeaa 9454
6937cb4e 9455#: builtin/interpret-trailers.c:92
276ceeaa
JX
9456msgid "edit files in place"
9457msgstr "在原位编辑文件"
220c313c 9458
6937cb4e 9459#: builtin/interpret-trailers.c:93
220c313c 9460msgid "trim empty trailers"
6937cb4e
JX
9461msgstr "删除空的尾部署名"
9462
9463#: builtin/interpret-trailers.c:96
9464msgid "where to place the new trailer"
9465msgstr "在哪里放置新的尾部署名"
220c313c 9466
6937cb4e
JX
9467#: builtin/interpret-trailers.c:98
9468msgid "action if trailer already exists"
9469msgstr "当尾部署名已经存在时所采取的动作"
9470
9471#: builtin/interpret-trailers.c:100
9472msgid "action if trailer is missing"
9473msgstr "当尾部署名缺失时所采取的动作"
9474
9475#: builtin/interpret-trailers.c:102
9476msgid "output only the trailers"
9477msgstr "只输出尾部署名"
9478
9479#: builtin/interpret-trailers.c:103
9480msgid "do not apply config rules"
9481msgstr "不要应用配置规则"
9482
9483#: builtin/interpret-trailers.c:104
9484msgid "join whitespace-continued values"
9485msgstr "连接空白折行的值"
9486
9487#: builtin/interpret-trailers.c:105
9488msgid "set parsing options"
9489msgstr "设置解析选项"
9490
9491#: builtin/interpret-trailers.c:107
220c313c 9492msgid "trailer"
6937cb4e 9493msgstr "尾部署名"
220c313c 9494
6937cb4e 9495#: builtin/interpret-trailers.c:108
220c313c 9496msgid "trailer(s) to add"
6937cb4e 9497msgstr "要添加的尾部署名"
220c313c 9498
6937cb4e
JX
9499#: builtin/interpret-trailers.c:117
9500msgid "--trailer with --only-input does not make sense"
9501msgstr "--trailer 和 --only-input 同时使用没有意义"
9502
9503#: builtin/interpret-trailers.c:127
276ceeaa
JX
9504msgid "no input file given for in-place editing"
9505msgstr "没有给出要原位编辑的文件"
9506
6937cb4e 9507#: builtin/log.c:46
7aea43ff 9508msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
d9d56b23 9509msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
ef317cd5 9510
6937cb4e 9511#: builtin/log.c:47
814ff314
JX
9512msgid "git show [<options>] <object>..."
9513msgstr "git show [<选项>] <对象>..."
ef317cd5 9514
6937cb4e 9515#: builtin/log.c:91
220c313c
JX
9516#, c-format
9517msgid "invalid --decorate option: %s"
9518msgstr "无效的 --decorate 选项:%s"
9519
6937cb4e 9520#: builtin/log.c:148
ef317cd5 9521msgid "suppress diff output"
07432cef 9522msgstr "不显示差异输出"
ef317cd5 9523
6937cb4e 9524#: builtin/log.c:149
ef317cd5 9525msgid "show source"
07432cef 9526msgstr "显示源"
ef317cd5 9527
6937cb4e 9528#: builtin/log.c:150
07432cef
WS
9529msgid "Use mail map file"
9530msgstr "使用邮件映射文件"
9531
6937cb4e 9532#: builtin/log.c:151
ef317cd5 9533msgid "decorate options"
07432cef 9534msgstr "修饰选项"
ef317cd5 9535
6937cb4e 9536#: builtin/log.c:154
220c313c
JX
9537msgid "Process line range n,m in file, counting from 1"
9538msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
9539
6937cb4e 9540#: builtin/log.c:250
c04f5ac3
JX
9541#, c-format
9542msgid "Final output: %d %s\n"
9543msgstr "最终输出:%d %s\n"
9544
6937cb4e 9545#: builtin/log.c:501
220c313c
JX
9546#, c-format
9547msgid "git show %s: bad file"
9548msgstr "git show %s: 损坏的文件"
9549
6937cb4e 9550#: builtin/log.c:516 builtin/log.c:610
c04f5ac3
JX
9551#, c-format
9552msgid "Could not read object %s"
90e6ef53 9553msgstr "不能读取对象 %s"
c04f5ac3 9554
6937cb4e 9555#: builtin/log.c:634
c04f5ac3
JX
9556#, c-format
9557msgid "Unknown type: %d"
9558msgstr "未知类型:%d"
9559
6937cb4e 9560#: builtin/log.c:755
c04f5ac3
JX
9561msgid "format.headers without value"
9562msgstr "format.headers 没有值"
9563
6937cb4e 9564#: builtin/log.c:856
c04f5ac3
JX
9565msgid "name of output directory is too long"
9566msgstr "输出目录名太长"
9567
6937cb4e 9568#: builtin/log.c:872
c04f5ac3
JX
9569#, c-format
9570msgid "Cannot open patch file %s"
9571msgstr "无法打开补丁文件 %s"
9572
6937cb4e 9573#: builtin/log.c:889
c04f5ac3
JX
9574msgid "Need exactly one range."
9575msgstr "只需要一个范围。"
9576
6937cb4e 9577#: builtin/log.c:899
c04f5ac3
JX
9578msgid "Not a range."
9579msgstr "不是一个范围。"
9580
6937cb4e 9581#: builtin/log.c:1005
c04f5ac3
JX
9582msgid "Cover letter needs email format"
9583msgstr "信封需要邮件地址格式"
9584
6937cb4e 9585#: builtin/log.c:1085
c04f5ac3
JX
9586#, c-format
9587msgid "insane in-reply-to: %s"
9588msgstr "不正常的 in-reply-to:%s"
9589
6937cb4e 9590#: builtin/log.c:1112
814ff314
JX
9591msgid "git format-patch [<options>] [<since> | <revision-range>]"
9592msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
ef317cd5 9593
6937cb4e 9594#: builtin/log.c:1162
c04f5ac3
JX
9595msgid "Two output directories?"
9596msgstr "两个输出目录?"
9597
6937cb4e 9598#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
5b04ee3b
JX
9599#, c-format
9600msgid "Unknown commit %s"
9601msgstr "未知提交 %s"
9602
6937cb4e 9603#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
5b04ee3b
JX
9604#, c-format
9605msgid "Failed to resolve '%s' as a valid ref."
9606msgstr "无法解析 '%s' 为一个有效引用。"
9607
6937cb4e 9608#: builtin/log.c:1284
5b04ee3b
JX
9609msgid "Could not find exact merge base."
9610msgstr "不能找到准确的合并基线。"
9611
6937cb4e 9612#: builtin/log.c:1288
5b04ee3b
JX
9613msgid ""
9614"Failed to get upstream, if you want to record base commit automatically,\n"
9615"please use git branch --set-upstream-to to track a remote branch.\n"
9616"Or you could specify base commit by --base=<base-commit-id> manually."
9617msgstr ""
9618"无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
aef18cc6 9619"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
58b6f078 9620"参数 --base=<基线提交> 手动指定一个基线提交。"
5b04ee3b 9621
6937cb4e 9622#: builtin/log.c:1308
5b04ee3b
JX
9623msgid "Failed to find exact merge base"
9624msgstr "无法找到准确的合并基线"
9625
6937cb4e 9626#: builtin/log.c:1319
5b04ee3b
JX
9627msgid "base commit should be the ancestor of revision list"
9628msgstr "基线提交应该是版本列表的祖先"
9629
6937cb4e 9630#: builtin/log.c:1323
5b04ee3b
JX
9631msgid "base commit shouldn't be in revision list"
9632msgstr "基线提交不应该出现在版本列表中"
9633
6937cb4e 9634#: builtin/log.c:1372
5b04ee3b 9635msgid "cannot get patch id"
aef18cc6 9636msgstr "无法得到补丁 id"
5b04ee3b 9637
6937cb4e 9638#: builtin/log.c:1431
ef317cd5 9639msgid "use [PATCH n/m] even with a single patch"
07432cef 9640msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 9641
6937cb4e 9642#: builtin/log.c:1434
ef317cd5 9643msgid "use [PATCH] even with multiple patches"
07432cef 9644msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 9645
6937cb4e 9646#: builtin/log.c:1438
ef317cd5 9647msgid "print patches to standard out"
07432cef 9648msgstr "打印补丁到标准输出"
c04f5ac3 9649
6937cb4e 9650#: builtin/log.c:1440
ef317cd5 9651msgid "generate a cover letter"
07432cef 9652msgstr "生成一封附信"
c04f5ac3 9653
6937cb4e 9654#: builtin/log.c:1442
ef317cd5 9655msgid "use simple number sequence for output file names"
07432cef 9656msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 9657
6937cb4e 9658#: builtin/log.c:1443
ef317cd5 9659msgid "sfx"
07432cef 9660msgstr "后缀"
ef317cd5 9661
6937cb4e 9662#: builtin/log.c:1444
ef317cd5 9663msgid "use <sfx> instead of '.patch'"
07432cef 9664msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 9665
6937cb4e 9666#: builtin/log.c:1446
ef317cd5 9667msgid "start numbering patches at <n> instead of 1"
07432cef
WS
9668msgstr "补丁以 <n> 开始编号,而不是1"
9669
6937cb4e 9670#: builtin/log.c:1448
07432cef
WS
9671msgid "mark the series as Nth re-roll"
9672msgstr "标记补丁系列是第几次重制"
ef317cd5 9673
6937cb4e 9674#: builtin/log.c:1450
a0b6b246
JX
9675msgid "Use [RFC PATCH] instead of [PATCH]"
9676msgstr "使用 [RFC PATCH] 代替 [PATCH]"
9677
6937cb4e 9678#: builtin/log.c:1453
ef317cd5 9679msgid "Use [<prefix>] instead of [PATCH]"
07432cef 9680msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 9681
6937cb4e 9682#: builtin/log.c:1456
ef317cd5 9683msgid "store resulting files in <dir>"
d9d56b23 9684msgstr "把结果文件存储在 <目录>"
ef317cd5 9685
6937cb4e 9686#: builtin/log.c:1459
ef317cd5 9687msgid "don't strip/add [PATCH]"
07432cef 9688msgstr "不删除/添加 [PATCH]"
ef317cd5 9689
6937cb4e 9690#: builtin/log.c:1462
ef317cd5 9691msgid "don't output binary diffs"
07432cef 9692msgstr "不输出二进制差异"
ef317cd5 9693
6937cb4e 9694#: builtin/log.c:1464
89f80d72
JX
9695msgid "output all-zero hash in From header"
9696msgstr "在 From 头信息中输出全为零的哈希值"
9697
6937cb4e 9698#: builtin/log.c:1466
ef317cd5 9699msgid "don't include a patch matching a commit upstream"
07432cef 9700msgstr "不包含已在上游提交中的补丁"
ef317cd5 9701
6937cb4e 9702#: builtin/log.c:1468
ef317cd5 9703msgid "show patch format instead of default (patch + stat)"
07432cef 9704msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 9705
6937cb4e 9706#: builtin/log.c:1470
ef317cd5 9707msgid "Messaging"
07432cef 9708msgstr "邮件发送"
ef317cd5 9709
6937cb4e 9710#: builtin/log.c:1471
ef317cd5 9711msgid "header"
07432cef 9712msgstr "header"
ef317cd5 9713
6937cb4e 9714#: builtin/log.c:1472
ef317cd5 9715msgid "add email header"
07432cef 9716msgstr "添加邮件头"
ef317cd5 9717
6937cb4e 9718#: builtin/log.c:1473 builtin/log.c:1475
ef317cd5 9719msgid "email"
07432cef 9720msgstr "邮件地址"
ef317cd5 9721
6937cb4e 9722#: builtin/log.c:1473
ef317cd5 9723msgid "add To: header"
07432cef 9724msgstr "添加收件人"
ef317cd5 9725
6937cb4e 9726#: builtin/log.c:1475
ef317cd5 9727msgid "add Cc: header"
07432cef 9728msgstr "添加抄送"
ef317cd5 9729
6937cb4e 9730#: builtin/log.c:1477
2e8451e8 9731msgid "ident"
d9d56b23 9732msgstr "标识"
2e8451e8 9733
6937cb4e 9734#: builtin/log.c:1478
2e8451e8 9735msgid "set From address to <ident> (or committer ident if absent)"
4375c10e 9736msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
2e8451e8 9737
6937cb4e 9738#: builtin/log.c:1480
ef317cd5 9739msgid "message-id"
d9d56b23 9740msgstr "邮件标识"
ef317cd5 9741
6937cb4e 9742#: builtin/log.c:1481
ef317cd5 9743msgid "make first mail a reply to <message-id>"
d9d56b23 9744msgstr "使第一封邮件作为对 <邮件标识> 的回复"
ef317cd5 9745
6937cb4e 9746#: builtin/log.c:1482 builtin/log.c:1485
ef317cd5 9747msgid "boundary"
07432cef 9748msgstr "边界"
ef317cd5 9749
6937cb4e 9750#: builtin/log.c:1483
ef317cd5 9751msgid "attach the patch"
07432cef 9752msgstr "附件方式添加补丁"
ef317cd5 9753
6937cb4e 9754#: builtin/log.c:1486
ef317cd5 9755msgid "inline the patch"
07432cef 9756msgstr "内联显示补丁"
ef317cd5 9757
6937cb4e 9758#: builtin/log.c:1490
ef317cd5 9759msgid "enable message threading, styles: shallow, deep"
07432cef 9760msgstr "启用邮件线索,风格:浅,深"
ef317cd5 9761
6937cb4e 9762#: builtin/log.c:1492
ef317cd5 9763msgid "signature"
07432cef 9764msgstr "签名"
ef317cd5 9765
6937cb4e 9766#: builtin/log.c:1493
ef317cd5 9767msgid "add a signature"
07432cef 9768msgstr "添加一个签名"
ef317cd5 9769
6937cb4e 9770#: builtin/log.c:1494
5b04ee3b
JX
9771msgid "base-commit"
9772msgstr "基线提交"
9773
6937cb4e 9774#: builtin/log.c:1495
5b04ee3b
JX
9775msgid "add prerequisite tree info to the patch series"
9776msgstr "为补丁列表添加前置树信息"
9777
6937cb4e 9778#: builtin/log.c:1497
6acbf033
JX
9779msgid "add a signature from a file"
9780msgstr "从文件添加一个签名"
9781
6937cb4e 9782#: builtin/log.c:1498
ef317cd5 9783msgid "don't print the patch filenames"
07432cef 9784msgstr "不要打印补丁文件名"
ef317cd5 9785
6937cb4e
JX
9786#: builtin/log.c:1500
9787msgid "show progress while generating patches"
9788msgstr "在生成补丁时显示进度"
9789
9790#: builtin/log.c:1575
a4f16749
JX
9791#, c-format
9792msgid "invalid ident line: %s"
9793msgstr "包含无效的身份标识:%s"
9794
6937cb4e 9795#: builtin/log.c:1590
c04f5ac3
JX
9796msgid "-n and -k are mutually exclusive."
9797msgstr "-n 和 -k 互斥。"
9798
6937cb4e 9799#: builtin/log.c:1592
a0b6b246
JX
9800msgid "--subject-prefix/--rfc and -k are mutually exclusive."
9801msgstr "--subject-prefix/--rfc 和 -k 互斥。"
c04f5ac3 9802
6937cb4e 9803#: builtin/log.c:1600
c04f5ac3
JX
9804msgid "--name-only does not make sense"
9805msgstr "--name-only 无意义"
9806
6937cb4e 9807#: builtin/log.c:1602
c04f5ac3
JX
9808msgid "--name-status does not make sense"
9809msgstr "--name-status 无意义"
9810
6937cb4e 9811#: builtin/log.c:1604
c04f5ac3
JX
9812msgid "--check does not make sense"
9813msgstr "--check 无意义"
9814
6937cb4e 9815#: builtin/log.c:1634
c04f5ac3
JX
9816msgid "standard output, or directory, which one?"
9817msgstr "标准输出或目录,哪一个?"
9818
6937cb4e 9819#: builtin/log.c:1636
c04f5ac3
JX
9820#, c-format
9821msgid "Could not create directory '%s'"
90e6ef53 9822msgstr "不能创建目录 '%s'"
c04f5ac3 9823
6937cb4e 9824#: builtin/log.c:1729
6acbf033
JX
9825#, c-format
9826msgid "unable to read signature file '%s'"
9827msgstr "无法读取签名文件 '%s'"
9828
6937cb4e
JX
9829#: builtin/log.c:1761
9830msgid "Generating patches"
9831msgstr "生成补丁"
9832
9833#: builtin/log.c:1805
c04f5ac3
JX
9834msgid "Failed to create output files"
9835msgstr "无法创建输出文件"
9836
6937cb4e 9837#: builtin/log.c:1855
ef317cd5 9838msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 9839msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 9840
6937cb4e 9841#: builtin/log.c:1909
c04f5ac3
JX
9842#, c-format
9843msgid ""
9844"Could not find a tracked remote branch, please specify <upstream> manually.\n"
d9d56b23 9845msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
c04f5ac3 9846
6937cb4e 9847#: builtin/ls-files.c:466
814ff314
JX
9848msgid "git ls-files [<options>] [<file>...]"
9849msgstr "git ls-files [<选项>] [<文件>...]"
ef317cd5 9850
6937cb4e 9851#: builtin/ls-files.c:515
ef317cd5 9852msgid "identify the file status with tags"
07432cef 9853msgstr "用标签标识文件的状态"
ef317cd5 9854
6937cb4e 9855#: builtin/ls-files.c:517
ef317cd5 9856msgid "use lowercase letters for 'assume unchanged' files"
07432cef 9857msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 9858
6937cb4e 9859#: builtin/ls-files.c:519
ef317cd5 9860msgid "show cached files in the output (default)"
07432cef 9861msgstr "显示缓存的文件(默认)"
ef317cd5 9862
6937cb4e 9863#: builtin/ls-files.c:521
ef317cd5 9864msgid "show deleted files in the output"
07432cef 9865msgstr "显示已删除的文件"
ef317cd5 9866
6937cb4e 9867#: builtin/ls-files.c:523
ef317cd5 9868msgid "show modified files in the output"
07432cef 9869msgstr "显示已修改的文件"
ef317cd5 9870
6937cb4e 9871#: builtin/ls-files.c:525
ef317cd5 9872msgid "show other files in the output"
07432cef 9873msgstr "显示其它文件"
ef317cd5 9874
6937cb4e 9875#: builtin/ls-files.c:527
ef317cd5 9876msgid "show ignored files in the output"
07432cef 9877msgstr "显示忽略的文件"
ef317cd5 9878
6937cb4e 9879#: builtin/ls-files.c:530
ef317cd5 9880msgid "show staged contents' object name in the output"
07432cef 9881msgstr "显示暂存区内容的对象名称"
ef317cd5 9882
6937cb4e 9883#: builtin/ls-files.c:532
ef317cd5 9884msgid "show files on the filesystem that need to be removed"
07432cef 9885msgstr "显示文件系统需要删除的文件"
ef317cd5 9886
6937cb4e 9887#: builtin/ls-files.c:534
220c313c 9888msgid "show 'other' directories' names only"
07432cef 9889msgstr "只显示“其他”目录的名称"
ef317cd5 9890
6937cb4e 9891#: builtin/ls-files.c:536
276ceeaa
JX
9892msgid "show line endings of files"
9893msgstr "显示文件换行符格式"
9894
6937cb4e 9895#: builtin/ls-files.c:538
ef317cd5 9896msgid "don't show empty directories"
07432cef 9897msgstr "不显示空目录"
ef317cd5 9898
6937cb4e 9899#: builtin/ls-files.c:541
ef317cd5 9900msgid "show unmerged files in the output"
07432cef 9901msgstr "显示未合并的文件"
ef317cd5 9902
6937cb4e 9903#: builtin/ls-files.c:543
ef317cd5 9904msgid "show resolve-undo information"
07432cef 9905msgstr "显示 resolve-undo 信息"
ef317cd5 9906
6937cb4e 9907#: builtin/ls-files.c:545
ef317cd5 9908msgid "skip files matching pattern"
07432cef 9909msgstr "匹配排除文件的模式"
ef317cd5 9910
6937cb4e 9911#: builtin/ls-files.c:548
ef317cd5 9912msgid "exclude patterns are read from <file>"
07432cef 9913msgstr "从 <文件> 中读取排除模式"
ef317cd5 9914
6937cb4e 9915#: builtin/ls-files.c:551
ef317cd5 9916msgid "read additional per-directory exclude patterns in <file>"
07432cef 9917msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 9918
6937cb4e 9919#: builtin/ls-files.c:553
ef317cd5 9920msgid "add the standard git exclusions"
07432cef 9921msgstr "添加标准的 git 排除"
ef317cd5 9922
6937cb4e 9923#: builtin/ls-files.c:556
ef317cd5 9924msgid "make the output relative to the project top directory"
07432cef 9925msgstr "显示相对于顶级目录的文件名"
ef317cd5 9926
6937cb4e 9927#: builtin/ls-files.c:559
a0b6b246
JX
9928msgid "recurse through submodules"
9929msgstr "在子模组中递归"
9930
6937cb4e 9931#: builtin/ls-files.c:561
ef317cd5 9932msgid "if any <file> is not in the index, treat this as an error"
07432cef 9933msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 9934
6937cb4e 9935#: builtin/ls-files.c:562
ef317cd5 9936msgid "tree-ish"
07432cef 9937msgstr "树或提交"
ef317cd5 9938
6937cb4e 9939#: builtin/ls-files.c:563
ef317cd5 9940msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 9941msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5 9942
6937cb4e 9943#: builtin/ls-files.c:565
ef317cd5 9944msgid "show debugging data"
07432cef 9945msgstr "显示调试数据"
ef317cd5 9946
276ceeaa
JX
9947#: builtin/ls-remote.c:7
9948msgid ""
9949"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9950" [-q | --quiet] [--exit-code] [--get-url]\n"
9951" [--symref] [<repository> [<refs>...]]"
9952msgstr ""
9953"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9954" [-q | --quiet] [--exit-code] [--get-url]\n"
9955" [--symref] [<仓库> [<引用>...]]"
9956
87cb7997 9957#: builtin/ls-remote.c:52
276ceeaa
JX
9958msgid "do not print remote URL"
9959msgstr "不打印远程 URL"
9960
87cb7997 9961#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
276ceeaa
JX
9962msgid "exec"
9963msgstr "exec"
9964
87cb7997 9965#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
276ceeaa
JX
9966msgid "path of git-upload-pack on the remote host"
9967msgstr "远程主机上的 git-upload-pack 路径"
9968
87cb7997 9969#: builtin/ls-remote.c:58
276ceeaa
JX
9970msgid "limit to tags"
9971msgstr "仅限于标签"
9972
87cb7997 9973#: builtin/ls-remote.c:59
276ceeaa
JX
9974msgid "limit to heads"
9975msgstr "仅限于分支"
9976
87cb7997 9977#: builtin/ls-remote.c:60
276ceeaa
JX
9978msgid "do not show peeled tags"
9979msgstr "不显示已解析的标签"
9980
87cb7997 9981#: builtin/ls-remote.c:62
276ceeaa
JX
9982msgid "take url.<base>.insteadOf into account"
9983msgstr "参考 url.<base>.insteadOf 设置"
9984
87cb7997 9985#: builtin/ls-remote.c:64
276ceeaa
JX
9986msgid "exit with exit code 2 if no matching refs are found"
9987msgstr "若未找到匹配的引用则以退出码2退出"
9988
87cb7997 9989#: builtin/ls-remote.c:66
276ceeaa
JX
9990msgid "show underlying ref in addition to the object pointed by it"
9991msgstr "除了显示指向的对象外,显示指向的引用名"
9992
a4f16749 9993#: builtin/ls-tree.c:29
ef317cd5 9994msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 9995msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5 9996
a4f16749 9997#: builtin/ls-tree.c:127
ef317cd5 9998msgid "only show trees"
07432cef 9999msgstr "只显示树"
ef317cd5 10000
a4f16749 10001#: builtin/ls-tree.c:129
ef317cd5 10002msgid "recurse into subtrees"
07432cef 10003msgstr "递归到子树"
ef317cd5 10004
a4f16749 10005#: builtin/ls-tree.c:131
ef317cd5 10006msgid "show trees when recursing"
07432cef 10007msgstr "当递归时显示树"
ef317cd5 10008
a4f16749 10009#: builtin/ls-tree.c:134
ef317cd5 10010msgid "terminate entries with NUL byte"
4375c10e 10011msgstr "条目以 NUL 字符终止"
ef317cd5 10012
a4f16749 10013#: builtin/ls-tree.c:135
ef317cd5 10014msgid "include object size"
07432cef 10015msgstr "包括对象大小"
ef317cd5 10016
a4f16749 10017#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
ef317cd5 10018msgid "list only filenames"
07432cef 10019msgstr "只列出文件名"
ef317cd5 10020
a4f16749 10021#: builtin/ls-tree.c:142
ef317cd5 10022msgid "use full path names"
07432cef 10023msgstr "使用文件的全路径"
ef317cd5 10024
a4f16749 10025#: builtin/ls-tree.c:144
ef317cd5 10026msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 10027msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5 10028
a4f16749
JX
10029#: builtin/mailsplit.c:241
10030#, c-format
10031msgid "empty mbox: '%s'"
10032msgstr "空的 mbox:'%s'"
10033
6937cb4e 10034#: builtin/merge.c:48
814ff314
JX
10035msgid "git merge [<options>] [<commit>...]"
10036msgstr "git merge [<选项>] [<提交>...]"
ef317cd5 10037
6937cb4e 10038#: builtin/merge.c:49
ef317cd5 10039msgid "git merge --abort"
07432cef 10040msgstr "git merge --abort"
ef317cd5 10041
6937cb4e 10042#: builtin/merge.c:50
1a79b2f1
JX
10043msgid "git merge --continue"
10044msgstr "git merge --continue"
10045
6937cb4e 10046#: builtin/merge.c:107
c04f5ac3
JX
10047msgid "switch `m' requires a value"
10048msgstr "开关 `m' 需要一个值"
10049
6937cb4e 10050#: builtin/merge.c:144
c04f5ac3
JX
10051#, c-format
10052msgid "Could not find merge strategy '%s'.\n"
90e6ef53 10053msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 10054
6937cb4e 10055#: builtin/merge.c:145
c04f5ac3
JX
10056#, c-format
10057msgid "Available strategies are:"
10058msgstr "可用的策略有:"
10059
6937cb4e 10060#: builtin/merge.c:150
c04f5ac3
JX
10061#, c-format
10062msgid "Available custom strategies are:"
10063msgstr "可用的自定义策略有:"
10064
6937cb4e 10065#: builtin/merge.c:200 builtin/pull.c:134
ef317cd5 10066msgid "do not show a diffstat at the end of the merge"
07432cef 10067msgstr "在合并的最后不显示差异统计"
ef317cd5 10068
6937cb4e 10069#: builtin/merge.c:203 builtin/pull.c:137
ef317cd5 10070msgid "show a diffstat at the end of the merge"
07432cef 10071msgstr "在合并的最后显示差异统计"
ef317cd5 10072
6937cb4e 10073#: builtin/merge.c:204 builtin/pull.c:140
ef317cd5 10074msgid "(synonym to --stat)"
07432cef 10075msgstr "(和 --stat 同义)"
ef317cd5 10076
6937cb4e 10077#: builtin/merge.c:206 builtin/pull.c:143
ef317cd5 10078msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 10079msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 10080
6937cb4e 10081#: builtin/merge.c:209 builtin/pull.c:146
ef317cd5 10082msgid "create a single commit instead of doing a merge"
07432cef 10083msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 10084
6937cb4e 10085#: builtin/merge.c:211 builtin/pull.c:149
ef317cd5 10086msgid "perform a commit if the merge succeeds (default)"
07432cef 10087msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 10088
6937cb4e 10089#: builtin/merge.c:213 builtin/pull.c:152
ef317cd5 10090msgid "edit message before committing"
07432cef 10091msgstr "在提交前编辑提交说明"
ef317cd5 10092
6937cb4e 10093#: builtin/merge.c:214
ef317cd5 10094msgid "allow fast-forward (default)"
07432cef 10095msgstr "允许快进(默认)"
ef317cd5 10096
6937cb4e 10097#: builtin/merge.c:216 builtin/pull.c:158
ef317cd5 10098msgid "abort if fast-forward is not possible"
07432cef 10099msgstr "如果不能快进就放弃合并"
ef317cd5 10100
6937cb4e 10101#: builtin/merge.c:220 builtin/pull.c:161
5c57d762 10102msgid "verify that the named commit has a valid GPG signature"
1003b3a5
JX
10103msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
10104
6937cb4e 10105#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
a4f16749 10106#: builtin/revert.c:109
ef317cd5 10107msgid "strategy"
07432cef 10108msgstr "策略"
ef317cd5 10109
6937cb4e 10110#: builtin/merge.c:222 builtin/pull.c:166
ef317cd5 10111msgid "merge strategy to use"
07432cef 10112msgstr "要使用的合并策略"
ef317cd5 10113
6937cb4e 10114#: builtin/merge.c:223 builtin/pull.c:169
ef317cd5 10115msgid "option=value"
07432cef 10116msgstr "option=value"
ef317cd5 10117
6937cb4e 10118#: builtin/merge.c:224 builtin/pull.c:170
ef317cd5 10119msgid "option for selected merge strategy"
07432cef 10120msgstr "所选的合并策略的选项"
ef317cd5 10121
6937cb4e 10122#: builtin/merge.c:226
ef317cd5 10123msgid "merge commit message (for a non-fast-forward merge)"
07432cef 10124msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 10125
6937cb4e 10126#: builtin/merge.c:230
ef317cd5 10127msgid "abort the current in-progress merge"
07432cef 10128msgstr "放弃当前正在进行的合并"
ef317cd5 10129
6937cb4e 10130#: builtin/merge.c:232
1a79b2f1
JX
10131msgid "continue the current in-progress merge"
10132msgstr "继续当前正在进行的合并"
10133
6937cb4e 10134#: builtin/merge.c:234 builtin/pull.c:177
5b04ee3b
JX
10135msgid "allow merging unrelated histories"
10136msgstr "允许合并不相关的历史"
10137
6937cb4e
JX
10138#: builtin/merge.c:240
10139msgid "verify commit-msg hook"
10140msgstr "校验 commit-msg 钩子"
10141
10142#: builtin/merge.c:265
c04f5ac3 10143msgid "could not run stash."
a4f16749 10144msgstr "不能运行贮藏。"
c04f5ac3 10145
6937cb4e 10146#: builtin/merge.c:270
c04f5ac3 10147msgid "stash failed"
a4f16749 10148msgstr "贮藏失败"
c04f5ac3 10149
6937cb4e 10150#: builtin/merge.c:275
c04f5ac3
JX
10151#, c-format
10152msgid "not a valid object: %s"
10153msgstr "不是一个有效对象:%s"
10154
6937cb4e 10155#: builtin/merge.c:297 builtin/merge.c:314
c04f5ac3
JX
10156msgid "read-tree failed"
10157msgstr "读取树失败"
10158
90e6ef53 10159# 译者:注意保持前导空格
6937cb4e 10160#: builtin/merge.c:344
c04f5ac3
JX
10161msgid " (nothing to squash)"
10162msgstr " (无可压缩)"
10163
6937cb4e 10164#: builtin/merge.c:355
c04f5ac3
JX
10165#, c-format
10166msgid "Squash commit -- not updating HEAD\n"
10167msgstr "压缩提交 -- 未更新 HEAD\n"
10168
6937cb4e 10169#: builtin/merge.c:405
c04f5ac3
JX
10170#, c-format
10171msgid "No merge message -- not updating HEAD\n"
10172msgstr "无合并信息 -- 未更新 HEAD\n"
10173
6937cb4e 10174#: builtin/merge.c:456
c04f5ac3
JX
10175#, c-format
10176msgid "'%s' does not point to a commit"
10177msgstr "'%s' 没有指向一个提交"
10178
6937cb4e 10179#: builtin/merge.c:546
c04f5ac3
JX
10180#, c-format
10181msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 10182msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 10183
6937cb4e 10184#: builtin/merge.c:666
c04f5ac3 10185msgid "Not handling anything other than two heads merge."
29004bbb 10186msgstr "未处理两个头合并之外的任何操作。"
c04f5ac3 10187
6937cb4e 10188#: builtin/merge.c:680
c04f5ac3
JX
10189#, c-format
10190msgid "Unknown option for merge-recursive: -X%s"
10191msgstr "merge-recursive 的未知选项:-X%s"
10192
6937cb4e 10193#: builtin/merge.c:695
c04f5ac3
JX
10194#, c-format
10195msgid "unable to write %s"
10196msgstr "不能写 %s"
10197
6937cb4e 10198#: builtin/merge.c:747
c04f5ac3
JX
10199#, c-format
10200msgid "Could not read from '%s'"
10201msgstr "不能从 '%s' 读取"
10202
6937cb4e 10203#: builtin/merge.c:756
c04f5ac3
JX
10204#, c-format
10205msgid "Not committing merge; use 'git commit' to complete the merge.\n"
10206msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
10207
6937cb4e 10208#: builtin/merge.c:762
a77c07d9 10209#, c-format
c04f5ac3
JX
10210msgid ""
10211"Please enter a commit message to explain why this merge is necessary,\n"
10212"especially if it merges an updated upstream into a topic branch.\n"
10213"\n"
a77c07d9 10214"Lines starting with '%c' will be ignored, and an empty message aborts\n"
c04f5ac3
JX
10215"the commit.\n"
10216msgstr ""
10217"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
10218"合并到主题分支。\n"
10219"\n"
a77c07d9 10220"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
c04f5ac3 10221
6937cb4e 10222#: builtin/merge.c:798
c04f5ac3
JX
10223msgid "Empty commit message."
10224msgstr "空提交信息。"
10225
6937cb4e 10226#: builtin/merge.c:818
c04f5ac3
JX
10227#, c-format
10228msgid "Wonderful.\n"
10229msgstr "太棒了。\n"
10230
6937cb4e 10231#: builtin/merge.c:871
c04f5ac3
JX
10232#, c-format
10233msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
10234msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
10235
6937cb4e 10236#: builtin/merge.c:910
c04f5ac3 10237msgid "No current branch."
90e6ef53 10238msgstr "没有当前分支。"
c04f5ac3 10239
6937cb4e 10240#: builtin/merge.c:912
c04f5ac3 10241msgid "No remote for the current branch."
160fb2b2 10242msgstr "当前分支没有对应的远程仓库。"
c04f5ac3 10243
6937cb4e 10244#: builtin/merge.c:914
c04f5ac3 10245msgid "No default upstream defined for the current branch."
90e6ef53 10246msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 10247
6937cb4e 10248#: builtin/merge.c:919
170e9899 10249#, c-format
2e8451e8
JX
10250msgid "No remote-tracking branch for %s from %s"
10251msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 10252
6937cb4e 10253#: builtin/merge.c:972
5c57d762
JX
10254#, c-format
10255msgid "Bad value '%s' in environment '%s'"
9a4b694c 10256msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
5c57d762 10257
6937cb4e 10258#: builtin/merge.c:1073
5c57d762
JX
10259#, c-format
10260msgid "not something we can merge in %s: %s"
10261msgstr "不能在 %s 中合并:%s"
10262
6937cb4e 10263#: builtin/merge.c:1107
5c57d762
JX
10264msgid "not something we can merge"
10265msgstr "不能合并"
10266
6937cb4e 10267#: builtin/merge.c:1172
1a79b2f1
JX
10268msgid "--abort expects no arguments"
10269msgstr "--abort 不带参数"
10270
6937cb4e 10271#: builtin/merge.c:1176
c04f5ac3 10272msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 10273msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 10274
6937cb4e 10275#: builtin/merge.c:1188
1a79b2f1
JX
10276msgid "--continue expects no arguments"
10277msgstr "--continue 不带参数"
10278
6937cb4e 10279#: builtin/merge.c:1192
1a79b2f1
JX
10280msgid "There is no merge in progress (MERGE_HEAD missing)."
10281msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
10282
6937cb4e 10283#: builtin/merge.c:1208
c04f5ac3
JX
10284msgid ""
10285"You have not concluded your merge (MERGE_HEAD exists).\n"
220c313c 10286"Please, commit your changes before you merge."
c04f5ac3
JX
10287msgstr ""
10288"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 10289"请在合并前先提交您的修改。"
c04f5ac3 10290
6937cb4e 10291#: builtin/merge.c:1215
c04f5ac3
JX
10292msgid ""
10293"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
220c313c 10294"Please, commit your changes before you merge."
c04f5ac3
JX
10295msgstr ""
10296"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 10297"请在合并前先提交您的修改。"
c04f5ac3 10298
6937cb4e 10299#: builtin/merge.c:1218
c04f5ac3
JX
10300msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
10301msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
10302
6937cb4e 10303#: builtin/merge.c:1227
c04f5ac3 10304msgid "You cannot combine --squash with --no-ff."
649900bc 10305msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 10306
6937cb4e 10307#: builtin/merge.c:1235
c04f5ac3 10308msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 10309msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 10310
6937cb4e 10311#: builtin/merge.c:1252
c04f5ac3
JX
10312msgid "Squash commit into empty head not supported yet"
10313msgstr "尚不支持到空分支的压缩提交"
10314
6937cb4e 10315#: builtin/merge.c:1254
c04f5ac3
JX
10316msgid "Non-fast-forward commit does not make sense into an empty head"
10317msgstr "到空分支的非快进式提交没有意义"
10318
6937cb4e 10319#: builtin/merge.c:1259
2e8451e8
JX
10320#, c-format
10321msgid "%s - not something we can merge"
10322msgstr "%s - 不能被合并"
10323
6937cb4e 10324#: builtin/merge.c:1261
7aea43ff
JX
10325msgid "Can merge only exactly one commit into empty head"
10326msgstr "只能将一个提交合并到空分支上"
10327
6937cb4e 10328#: builtin/merge.c:1295
1003b3a5
JX
10329#, c-format
10330msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
10331msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
10332
6937cb4e 10333#: builtin/merge.c:1298
1003b3a5
JX
10334#, c-format
10335msgid "Commit %s has a bad GPG signature allegedly by %s."
10336msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
10337
6937cb4e 10338#: builtin/merge.c:1301
1003b3a5
JX
10339#, c-format
10340msgid "Commit %s does not have a GPG signature."
10341msgstr "提交 %s 没有一个 GPG 签名。"
10342
6937cb4e 10343#: builtin/merge.c:1304
1003b3a5
JX
10344#, c-format
10345msgid "Commit %s has a good GPG signature by %s\n"
10346msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
10347
6937cb4e 10348#: builtin/merge.c:1366
5b04ee3b
JX
10349msgid "refusing to merge unrelated histories"
10350msgstr "拒绝合并无关的历史"
10351
6937cb4e
JX
10352#: builtin/merge.c:1375
10353msgid "Already up to date."
5c57d762
JX
10354msgstr "已经是最新的。"
10355
6937cb4e 10356#: builtin/merge.c:1385
c04f5ac3
JX
10357#, c-format
10358msgid "Updating %s..%s\n"
10359msgstr "更新 %s..%s\n"
10360
6937cb4e 10361#: builtin/merge.c:1426
c04f5ac3
JX
10362#, c-format
10363msgid "Trying really trivial in-index merge...\n"
90e6ef53 10364msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 10365
6937cb4e 10366#: builtin/merge.c:1433
c04f5ac3
JX
10367#, c-format
10368msgid "Nope.\n"
10369msgstr "无。\n"
10370
6937cb4e
JX
10371#: builtin/merge.c:1458
10372msgid "Already up to date. Yeeah!"
5c57d762
JX
10373msgstr "已经是最新的。耶!"
10374
6937cb4e 10375#: builtin/merge.c:1464
c04f5ac3 10376msgid "Not possible to fast-forward, aborting."
1aabac65 10377msgstr "无法快进,终止。"
c04f5ac3 10378
6937cb4e 10379#: builtin/merge.c:1487 builtin/merge.c:1566
c04f5ac3
JX
10380#, c-format
10381msgid "Rewinding the tree to pristine...\n"
10382msgstr "将树回滚至原始状态...\n"
10383
6937cb4e 10384#: builtin/merge.c:1491
c04f5ac3
JX
10385#, c-format
10386msgid "Trying merge strategy %s...\n"
10387msgstr "尝试合并策略 %s...\n"
10388
6937cb4e 10389#: builtin/merge.c:1557
c04f5ac3
JX
10390#, c-format
10391msgid "No merge strategy handled the merge.\n"
10392msgstr "没有合并策略处理此合并。\n"
10393
6937cb4e 10394#: builtin/merge.c:1559
c04f5ac3
JX
10395#, c-format
10396msgid "Merge with strategy %s failed.\n"
10397msgstr "使用策略 %s 合并失败。\n"
10398
6937cb4e 10399#: builtin/merge.c:1568
c04f5ac3
JX
10400#, c-format
10401msgid "Using the %s to prepare resolving by hand.\n"
10402msgstr "使用 %s 以准备手工解决。\n"
10403
6937cb4e 10404#: builtin/merge.c:1580
c04f5ac3
JX
10405#, c-format
10406msgid "Automatic merge went well; stopped before committing as requested\n"
10407msgstr "自动合并进展顺利,按要求在提交前停止\n"
10408
a4f16749 10409#: builtin/merge-base.c:30
814ff314
JX
10410msgid "git merge-base [-a | --all] <commit> <commit>..."
10411msgstr "git merge-base [-a | --all] <提交> <提交>..."
ef317cd5 10412
a4f16749 10413#: builtin/merge-base.c:31
814ff314
JX
10414msgid "git merge-base [-a | --all] --octopus <commit>..."
10415msgstr "git merge-base [-a | --all] --octopus <提交>..."
ef317cd5 10416
a4f16749 10417#: builtin/merge-base.c:32
ef317cd5 10418msgid "git merge-base --independent <commit>..."
07432cef 10419msgstr "git merge-base --independent <提交>..."
ef317cd5 10420
a4f16749 10421#: builtin/merge-base.c:33
ef317cd5 10422msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 10423msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5 10424
a4f16749 10425#: builtin/merge-base.c:34
cfff71a9 10426msgid "git merge-base --fork-point <ref> [<commit>]"
d9d56b23 10427msgstr "git merge-base --fork-point <引用> [<提交>]"
cfff71a9 10428
a4f16749 10429#: builtin/merge-base.c:218
ef317cd5 10430msgid "output all common ancestors"
07432cef 10431msgstr "输出所有共同的祖先"
ef317cd5 10432
a4f16749 10433#: builtin/merge-base.c:220
ef317cd5 10434msgid "find ancestors for a single n-way merge"
07432cef 10435msgstr "查找一个多路合并的祖先提交"
ef317cd5 10436
a4f16749 10437#: builtin/merge-base.c:222
ef317cd5 10438msgid "list revs not reachable from others"
07432cef 10439msgstr "显示不能被其他访问到的版本"
ef317cd5 10440
a4f16749 10441#: builtin/merge-base.c:224
ef317cd5 10442msgid "is the first one ancestor of the other?"
07432cef 10443msgstr "第一个是其他的祖先提交么?"
ef317cd5 10444
a4f16749 10445#: builtin/merge-base.c:226
cfff71a9 10446msgid "find where <commit> forked from reflog of <ref>"
e397e7e3 10447msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
cfff71a9 10448
a4f16749 10449#: builtin/merge-file.c:9
ef317cd5 10450msgid ""
814ff314
JX
10451"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
10452"<orig-file> <file2>"
ef317cd5 10453msgstr ""
814ff314
JX
10454"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
10455"件> <文件2>"
ef317cd5 10456
a4f16749 10457#: builtin/merge-file.c:33
ef317cd5 10458msgid "send results to standard output"
07432cef 10459msgstr "将结果发送到标准输出"
ef317cd5 10460
a4f16749 10461#: builtin/merge-file.c:34
ef317cd5 10462msgid "use a diff3 based merge"
07432cef 10463msgstr "使用基于 diff3 的合并"
ef317cd5 10464
a4f16749 10465#: builtin/merge-file.c:35
ef317cd5 10466msgid "for conflicts, use our version"
07432cef 10467msgstr "如果冲突,使用我们的版本"
ef317cd5 10468
a4f16749 10469#: builtin/merge-file.c:37
ef317cd5 10470msgid "for conflicts, use their version"
07432cef 10471msgstr "如果冲突,使用他们的版本"
ef317cd5 10472
a4f16749 10473#: builtin/merge-file.c:39
ef317cd5 10474msgid "for conflicts, use a union version"
07432cef 10475msgstr "如果冲突,使用联合版本"
ef317cd5 10476
a4f16749 10477#: builtin/merge-file.c:42
ef317cd5 10478msgid "for conflicts, use this marker size"
07432cef 10479msgstr "如果冲突,使用指定长度的标记"
ef317cd5 10480
a4f16749 10481#: builtin/merge-file.c:43
ef317cd5 10482msgid "do not warn about conflicts"
07432cef 10483msgstr "不要警告冲突"
ef317cd5 10484
a4f16749 10485#: builtin/merge-file.c:45
814ff314
JX
10486msgid "set labels for file1/orig-file/file2"
10487msgstr "为 文件1/初始文件/文件2 设置标签"
c04f5ac3 10488
a0b6b246
JX
10489#: builtin/merge-recursive.c:45
10490#, c-format
10491msgid "unknown option %s"
10492msgstr "未知选项 %s"
10493
10494#: builtin/merge-recursive.c:51
10495#, c-format
10496msgid "could not parse object '%s'"
10497msgstr "不能解析对象 '%s'"
10498
10499#: builtin/merge-recursive.c:55
10500#, c-format
10501msgid "cannot handle more than %d base. Ignoring %s."
10502msgid_plural "cannot handle more than %d bases. Ignoring %s."
10503msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
10504msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
10505
10506#: builtin/merge-recursive.c:63
10507msgid "not handling anything other than two heads merge."
10508msgstr "不能处理两个头合并之外的任何操作。"
10509
10510#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
10511#, c-format
10512msgid "could not resolve ref '%s'"
10513msgstr "无法解析引用 '%s'"
10514
10515#: builtin/merge-recursive.c:77
10516#, c-format
10517msgid "Merging %s with %s\n"
10518msgstr "合并 %s 和 %s\n"
10519
276ceeaa 10520#: builtin/mktree.c:65
ef317cd5 10521msgid "git mktree [-z] [--missing] [--batch]"
07432cef 10522msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 10523
a4f16749 10524#: builtin/mktree.c:153
ef317cd5 10525msgid "input is NUL terminated"
07432cef 10526msgstr "输入以 NUL 字符终止"
c04f5ac3 10527
a4f16749 10528#: builtin/mktree.c:154 builtin/write-tree.c:25
ef317cd5 10529msgid "allow missing objects"
07432cef 10530msgstr "允许丢失的对象"
c04f5ac3 10531
a4f16749 10532#: builtin/mktree.c:155
ef317cd5 10533msgid "allow creation of more than one tree"
07432cef 10534msgstr "允许创建一个以上的树"
c04f5ac3 10535
a4f16749 10536#: builtin/mv.c:17
814ff314
JX
10537msgid "git mv [<options>] <source>... <destination>"
10538msgstr "git mv [<选项>] <源>... <目标>"
c04f5ac3 10539
a4f16749 10540#: builtin/mv.c:83
220c313c
JX
10541#, c-format
10542msgid "Directory %s is in index and no submodule?"
10543msgstr "目录 %s 在索引中并且不是子模组?"
10544
6937cb4e 10545#: builtin/mv.c:85 builtin/rm.c:289
220c313c 10546msgid "Please stage your changes to .gitmodules or stash them to proceed"
a4f16749 10547msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
220c313c 10548
a4f16749 10549#: builtin/mv.c:103
220c313c
JX
10550#, c-format
10551msgid "%.*s is in index"
10552msgstr "%.*s 在索引中"
10553
a4f16749 10554#: builtin/mv.c:125
ef317cd5 10555msgid "force move/rename even if target exists"
07432cef 10556msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 10557
a4f16749 10558#: builtin/mv.c:126
ef317cd5 10559msgid "skip move/rename errors"
07432cef 10560msgstr "跳过移动/重命名错误"
c04f5ac3 10561
6937cb4e 10562#: builtin/mv.c:167
220c313c
JX
10563#, c-format
10564msgid "destination '%s' is not a directory"
10565msgstr "目标 '%s' 不是一个目录"
10566
6937cb4e 10567#: builtin/mv.c:178
c04f5ac3
JX
10568#, c-format
10569msgid "Checking rename of '%s' to '%s'\n"
10570msgstr "检查 '%s' 到 '%s' 的重命名\n"
10571
6937cb4e 10572#: builtin/mv.c:182
c04f5ac3
JX
10573msgid "bad source"
10574msgstr "坏的源"
10575
6937cb4e 10576#: builtin/mv.c:185
c04f5ac3
JX
10577msgid "can not move directory into itself"
10578msgstr "不能将目录移动到自身"
10579
6937cb4e 10580#: builtin/mv.c:188
c04f5ac3
JX
10581msgid "cannot move directory over file"
10582msgstr "不能将目录移动到文件"
10583
6937cb4e 10584#: builtin/mv.c:197
c04f5ac3
JX
10585msgid "source directory is empty"
10586msgstr "源目录为空"
10587
6937cb4e 10588#: builtin/mv.c:222
c04f5ac3
JX
10589msgid "not under version control"
10590msgstr "不在版本控制之下"
10591
6937cb4e 10592#: builtin/mv.c:225
c04f5ac3
JX
10593msgid "destination exists"
10594msgstr "目标已存在"
10595
6937cb4e 10596#: builtin/mv.c:233
c04f5ac3
JX
10597#, c-format
10598msgid "overwriting '%s'"
10599msgstr "覆盖 '%s'"
10600
6937cb4e 10601#: builtin/mv.c:236
c04f5ac3
JX
10602msgid "Cannot overwrite"
10603msgstr "不能覆盖"
10604
6937cb4e 10605#: builtin/mv.c:239
c04f5ac3
JX
10606msgid "multiple sources for the same target"
10607msgstr "同一目标具有多个源"
10608
6937cb4e 10609#: builtin/mv.c:241
cfff71a9
JX
10610msgid "destination directory does not exist"
10611msgstr "目标目录不存在"
10612
6937cb4e 10613#: builtin/mv.c:248
c04f5ac3
JX
10614#, c-format
10615msgid "%s, source=%s, destination=%s"
10616msgstr "%s,源=%s,目标=%s"
10617
6937cb4e 10618#: builtin/mv.c:269
c04f5ac3
JX
10619#, c-format
10620msgid "Renaming %s to %s\n"
10621msgstr "重命名 %s 至 %s\n"
10622
6937cb4e 10623#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
c04f5ac3
JX
10624#, c-format
10625msgid "renaming '%s' failed"
10626msgstr "重命名 '%s' 失败"
10627
a4f16749 10628#: builtin/name-rev.c:338
814ff314
JX
10629msgid "git name-rev [<options>] <commit>..."
10630msgstr "git name-rev [<选项>] <提交>..."
ef317cd5 10631
a4f16749 10632#: builtin/name-rev.c:339
814ff314
JX
10633msgid "git name-rev [<options>] --all"
10634msgstr "git name-rev [<选项>] --all"
ef317cd5 10635
a4f16749 10636#: builtin/name-rev.c:340
814ff314
JX
10637msgid "git name-rev [<options>] --stdin"
10638msgstr "git name-rev [<选项>] --stdin"
ef317cd5 10639
a4f16749 10640#: builtin/name-rev.c:395
ef317cd5 10641msgid "print only names (no SHA-1)"
07432cef 10642msgstr "只打印名称(无 SHA-1)"
ef317cd5 10643
a4f16749 10644#: builtin/name-rev.c:396
ef317cd5 10645msgid "only use tags to name the commits"
55a16ee4 10646msgstr "只使用标签来命名提交"
ef317cd5 10647
a4f16749 10648#: builtin/name-rev.c:398
ef317cd5 10649msgid "only use refs matching <pattern>"
07432cef 10650msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 10651
a4f16749 10652#: builtin/name-rev.c:400
87cb7997
JX
10653msgid "ignore refs matching <pattern>"
10654msgstr "忽略和 <模式> 相匹配的引用"
10655
a4f16749 10656#: builtin/name-rev.c:402
ef317cd5 10657msgid "list all commits reachable from all refs"
07432cef 10658msgstr "列出可以从所有引用访问的提交"
ef317cd5 10659
a4f16749 10660#: builtin/name-rev.c:403
ef317cd5 10661msgid "read from stdin"
07432cef 10662msgstr "从标准输入读取"
ef317cd5 10663
a4f16749 10664#: builtin/name-rev.c:404
90314792
JX
10665msgid "allow to print `undefined` names (default)"
10666msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 10667
a4f16749 10668#: builtin/name-rev.c:410
2e8451e8 10669msgid "dereference tags in the input (internal use)"
55a16ee4 10670msgstr "反向解析输入中的标签(内部使用)"
2e8451e8 10671
a4f16749 10672#: builtin/notes.c:26
814ff314 10673msgid "git notes [--ref <notes-ref>] [list [<object>]]"
07432cef 10674msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 10675
a4f16749 10676#: builtin/notes.c:27
ef317cd5 10677msgid ""
814ff314 10678"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
04cb2f28 10679"| (-c | -C) <object>] [<object>]"
ef317cd5 10680msgstr ""
04cb2f28
JX
10681"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
10682"| (-c | -C) <对象>] [<对象>]"
ef317cd5 10683
a4f16749 10684#: builtin/notes.c:28
814ff314 10685msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
07432cef 10686msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 10687
a4f16749 10688#: builtin/notes.c:29
ef317cd5 10689msgid ""
814ff314 10690"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
04cb2f28 10691"(-c | -C) <object>] [<object>]"
ef317cd5 10692msgstr ""
04cb2f28
JX
10693"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
10694"(-c | -C) <对象>] [<对象>]"
ef317cd5 10695
a4f16749 10696#: builtin/notes.c:30
814ff314 10697msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
04cb2f28 10698msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
ef317cd5 10699
a4f16749 10700#: builtin/notes.c:31
814ff314 10701msgid "git notes [--ref <notes-ref>] show [<object>]"
07432cef 10702msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 10703
a4f16749 10704#: builtin/notes.c:32
ef317cd5 10705msgid ""
814ff314 10706"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
07432cef 10707msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 10708
a4f16749 10709#: builtin/notes.c:33
ef317cd5 10710msgid "git notes merge --commit [-v | -q]"
07432cef 10711msgstr "git notes merge --commit [-v | -q]"
ef317cd5 10712
a4f16749 10713#: builtin/notes.c:34
ef317cd5 10714msgid "git notes merge --abort [-v | -q]"
07432cef 10715msgstr "git notes merge --abort [-v | -q]"
ef317cd5 10716
a4f16749 10717#: builtin/notes.c:35
814ff314 10718msgid "git notes [--ref <notes-ref>] remove [<object>...]"
07432cef 10719msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 10720
a4f16749 10721#: builtin/notes.c:36
814ff314 10722msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
07432cef 10723msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
ef317cd5 10724
a4f16749 10725#: builtin/notes.c:37
814ff314 10726msgid "git notes [--ref <notes-ref>] get-ref"
07432cef 10727msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 10728
a4f16749 10729#: builtin/notes.c:42
ef317cd5 10730msgid "git notes [list [<object>]]"
07432cef 10731msgstr "git notes [list [<对象>]]"
ef317cd5 10732
a4f16749 10733#: builtin/notes.c:47
ef317cd5 10734msgid "git notes add [<options>] [<object>]"
07432cef 10735msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 10736
a4f16749 10737#: builtin/notes.c:52
ef317cd5 10738msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 10739msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 10740
a4f16749 10741#: builtin/notes.c:53
ef317cd5 10742msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 10743msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 10744
a4f16749 10745#: builtin/notes.c:58
ef317cd5 10746msgid "git notes append [<options>] [<object>]"
07432cef 10747msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 10748
a4f16749 10749#: builtin/notes.c:63
ef317cd5 10750msgid "git notes edit [<object>]"
07432cef 10751msgstr "git notes edit [<对象>]"
ef317cd5 10752
a4f16749 10753#: builtin/notes.c:68
ef317cd5 10754msgid "git notes show [<object>]"
07432cef 10755msgstr "git notes show [<对象>]"
ef317cd5 10756
a4f16749 10757#: builtin/notes.c:73
814ff314 10758msgid "git notes merge [<options>] <notes-ref>"
07432cef 10759msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 10760
a4f16749 10761#: builtin/notes.c:74
ef317cd5 10762msgid "git notes merge --commit [<options>]"
07432cef 10763msgstr "git notes merge --commit [<选项>]"
ef317cd5 10764
a4f16749 10765#: builtin/notes.c:75
ef317cd5 10766msgid "git notes merge --abort [<options>]"
07432cef 10767msgstr "git notes merge --abort [<选项>]"
ef317cd5 10768
a4f16749 10769#: builtin/notes.c:80
ef317cd5 10770msgid "git notes remove [<object>]"
07432cef 10771msgstr "git notes remove [<对象>]"
ef317cd5 10772
a4f16749 10773#: builtin/notes.c:85
ef317cd5 10774msgid "git notes prune [<options>]"
07432cef 10775msgstr "git notes prune [<选项>]"
ef317cd5 10776
a4f16749 10777#: builtin/notes.c:90
ef317cd5 10778msgid "git notes get-ref"
07432cef 10779msgstr "git notes get-ref"
ef317cd5 10780
a4f16749 10781#: builtin/notes.c:95
5c57d762
JX
10782msgid "Write/edit the notes for the following object:"
10783msgstr "为下面的对象写/编辑说明:"
10784
a4f16749 10785#: builtin/notes.c:148
c04f5ac3
JX
10786#, c-format
10787msgid "unable to start 'show' for object '%s'"
10788msgstr "不能为对象 '%s' 开始 'show'"
10789
a4f16749 10790#: builtin/notes.c:152
a77c07d9
JX
10791msgid "could not read 'show' output"
10792msgstr "不能读取 'show' 的输出"
c04f5ac3 10793
a4f16749 10794#: builtin/notes.c:160
c04f5ac3
JX
10795#, c-format
10796msgid "failed to finish 'show' for object '%s'"
10797msgstr "无法为对象 '%s' 完成 'show'"
10798
a4f16749 10799#: builtin/notes.c:195
a0b6b246 10800msgid "please supply the note contents using either -m or -F option"
c04f5ac3
JX
10801msgstr "请通过 -m 或 -F 选项为注解提供内容"
10802
a4f16749 10803#: builtin/notes.c:204
c04f5ac3
JX
10804msgid "unable to write note object"
10805msgstr "不能写注解对象"
10806
a4f16749 10807#: builtin/notes.c:206
c04f5ac3 10808#, c-format
a0b6b246 10809msgid "the note contents have been left in %s"
220c313c 10810msgstr "注解内容被留在 %s 中"
c04f5ac3 10811
6937cb4e 10812#: builtin/notes.c:234 builtin/tag.c:500
c04f5ac3
JX
10813#, c-format
10814msgid "cannot read '%s'"
10815msgstr "不能读取 '%s'"
10816
6937cb4e 10817#: builtin/notes.c:236 builtin/tag.c:503
c04f5ac3
JX
10818#, c-format
10819msgid "could not open or read '%s'"
10820msgstr "不能打开或读取 '%s'"
10821
a4f16749 10822#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
6937cb4e
JX
10823#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
10824#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
a0b6b246
JX
10825#, c-format
10826msgid "failed to resolve '%s' as a valid ref."
10827msgstr "无法解析 '%s' 为一个有效引用。"
10828
a4f16749 10829#: builtin/notes.c:258
c04f5ac3 10830#, c-format
a0b6b246 10831msgid "failed to read object '%s'."
c04f5ac3
JX
10832msgstr "无法读取对象 '%s'。"
10833
a4f16749 10834#: builtin/notes.c:262
6c94aba5 10835#, c-format
a0b6b246
JX
10836msgid "cannot read note data from non-blob object '%s'."
10837msgstr "不能从非数据对象 '%s' 中读取注解数据。"
10838
a4f16749 10839#: builtin/notes.c:302
a0b6b246
JX
10840#, c-format
10841msgid "malformed input line: '%s'."
10842msgstr "非法的输入行:'%s'。"
10843
a4f16749 10844#: builtin/notes.c:317
a0b6b246
JX
10845#, c-format
10846msgid "failed to copy notes from '%s' to '%s'"
10847msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
6c94aba5 10848
a4f16749
JX
10849#. TRANSLATORS: the first %s will be replaced by a git
10850#. notes command: 'add', 'merge', 'remove', etc.
10851#.
6937cb4e 10852#: builtin/notes.c:349
a0b6b246
JX
10853#, c-format
10854msgid "refusing to %s notes in %s (outside of refs/notes/)"
10855msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
10856
6937cb4e
JX
10857#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
10858#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
10859#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
c04f5ac3
JX
10860msgid "too many parameters"
10861msgstr "参数太多"
10862
6937cb4e 10863#: builtin/notes.c:382 builtin/notes.c:668
c04f5ac3 10864#, c-format
a0b6b246 10865msgid "no note found for object %s."
c04f5ac3
JX
10866msgstr "未发现对象 %s 的注解。"
10867
6937cb4e 10868#: builtin/notes.c:403 builtin/notes.c:566
ef317cd5 10869msgid "note contents as a string"
07432cef 10870msgstr "注解内容作为一个字符串"
ef317cd5 10871
6937cb4e 10872#: builtin/notes.c:406 builtin/notes.c:569
ef317cd5 10873msgid "note contents in a file"
07432cef 10874msgstr "注解内容到一个文件中"
ef317cd5 10875
6937cb4e 10876#: builtin/notes.c:409 builtin/notes.c:572
ef317cd5 10877msgid "reuse and edit specified note object"
07432cef 10878msgstr "重用和编辑指定的注解对象"
ef317cd5 10879
6937cb4e 10880#: builtin/notes.c:412 builtin/notes.c:575
ef317cd5 10881msgid "reuse specified note object"
07432cef 10882msgstr "重用指定的注解对象"
ef317cd5 10883
6937cb4e 10884#: builtin/notes.c:415 builtin/notes.c:578
04cb2f28
JX
10885msgid "allow storing empty note"
10886msgstr "允许保存空白注释"
10887
6937cb4e 10888#: builtin/notes.c:416 builtin/notes.c:487
ef317cd5 10889msgid "replace existing notes"
07432cef 10890msgstr "替换已存在的注解"
ef317cd5 10891
6937cb4e 10892#: builtin/notes.c:441
c04f5ac3
JX
10893#, c-format
10894msgid ""
10895"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
10896"existing notes"
10897msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
10898
6937cb4e 10899#: builtin/notes.c:456 builtin/notes.c:535
c04f5ac3
JX
10900#, c-format
10901msgid "Overwriting existing notes for object %s\n"
10902msgstr "覆盖对象 %s 现存注解\n"
10903
6937cb4e 10904#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
04cb2f28
JX
10905#, c-format
10906msgid "Removing note for object %s\n"
10907msgstr "删除对象 %s 的注解\n"
10908
6937cb4e 10909#: builtin/notes.c:488
ef317cd5 10910msgid "read objects from stdin"
07432cef 10911msgstr "从标准输入读取对象"
ef317cd5 10912
6937cb4e 10913#: builtin/notes.c:490
ef317cd5 10914msgid "load rewriting config for <command> (implies --stdin)"
07432cef 10915msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 10916
6937cb4e 10917#: builtin/notes.c:508
c04f5ac3
JX
10918msgid "too few parameters"
10919msgstr "参数太少"
10920
6937cb4e 10921#: builtin/notes.c:529
c04f5ac3
JX
10922#, c-format
10923msgid ""
10924"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
10925"existing notes"
10926msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
10927
6937cb4e 10928#: builtin/notes.c:541
c04f5ac3 10929#, c-format
a0b6b246 10930msgid "missing notes on source object %s. Cannot copy."
c04f5ac3
JX
10931msgstr "源对象 %s 缺少注解。不能拷贝。"
10932
6937cb4e 10933#: builtin/notes.c:593
ef317cd5
JX
10934#, c-format
10935msgid ""
10936"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
10937"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
10938msgstr ""
10939"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
10940"请换用 'git notes add -f -m/-F/-c/-C'。\n"
10941
6937cb4e 10942#: builtin/notes.c:688
a0b6b246
JX
10943msgid "failed to delete ref NOTES_MERGE_PARTIAL"
10944msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
10945
6937cb4e 10946#: builtin/notes.c:690
a0b6b246
JX
10947msgid "failed to delete ref NOTES_MERGE_REF"
10948msgstr "无法删除引用 NOTES_MERGE_REF"
10949
6937cb4e 10950#: builtin/notes.c:692
a0b6b246
JX
10951msgid "failed to remove 'git notes merge' worktree"
10952msgstr "无法删除 'git notes merge' 工作区"
10953
6937cb4e 10954#: builtin/notes.c:712
a0b6b246
JX
10955msgid "failed to read ref NOTES_MERGE_PARTIAL"
10956msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
10957
6937cb4e 10958#: builtin/notes.c:714
a0b6b246
JX
10959msgid "could not find commit from NOTES_MERGE_PARTIAL."
10960msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
10961
6937cb4e 10962#: builtin/notes.c:716
a0b6b246
JX
10963msgid "could not parse commit from NOTES_MERGE_PARTIAL."
10964msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
10965
6937cb4e 10966#: builtin/notes.c:729
a0b6b246
JX
10967msgid "failed to resolve NOTES_MERGE_REF"
10968msgstr "无法解析 NOTES_MERGE_REF"
10969
6937cb4e 10970#: builtin/notes.c:732
a0b6b246
JX
10971msgid "failed to finalize notes merge"
10972msgstr "无法完成注解合并"
10973
6937cb4e 10974#: builtin/notes.c:758
5c57d762
JX
10975#, c-format
10976msgid "unknown notes merge strategy %s"
10977msgstr "未知的注解合并策略 %s"
10978
6937cb4e 10979#: builtin/notes.c:774
ef317cd5 10980msgid "General options"
07432cef 10981msgstr "通用选项"
ef317cd5 10982
6937cb4e 10983#: builtin/notes.c:776
ef317cd5 10984msgid "Merge options"
07432cef 10985msgstr "合并选项"
ef317cd5 10986
6937cb4e 10987#: builtin/notes.c:778
ef317cd5
JX
10988msgid ""
10989"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
10990"cat_sort_uniq)"
07432cef 10991msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 10992
6937cb4e 10993#: builtin/notes.c:780
ef317cd5 10994msgid "Committing unmerged notes"
07432cef 10995msgstr "提交未合并的注解"
ef317cd5 10996
6937cb4e 10997#: builtin/notes.c:782
ef317cd5 10998msgid "finalize notes merge by committing unmerged notes"
07432cef 10999msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 11000
6937cb4e 11001#: builtin/notes.c:784
ef317cd5 11002msgid "Aborting notes merge resolution"
07432cef 11003msgstr "中止注解合并的方案"
ef317cd5 11004
6937cb4e 11005#: builtin/notes.c:786
ef317cd5 11006msgid "abort notes merge"
07432cef 11007msgstr "中止注解合并"
ef317cd5 11008
6937cb4e 11009#: builtin/notes.c:797
5c57d762
JX
11010msgid "cannot mix --commit, --abort or -s/--strategy"
11011msgstr "不能混用 --commit、--abort 或 -s/--strategy"
11012
6937cb4e 11013#: builtin/notes.c:802
a0b6b246 11014msgid "must specify a notes ref to merge"
9a4b694c 11015msgstr "必须指定一个注解引用来合并"
5c57d762 11016
6937cb4e 11017#: builtin/notes.c:826
5c57d762 11018#, c-format
a0b6b246 11019msgid "unknown -s/--strategy: %s"
5c57d762
JX
11020msgstr "未知的 -s/--strategy:%s"
11021
6937cb4e 11022#: builtin/notes.c:863
1b7f4a34 11023#, c-format
a0b6b246
JX
11024msgid "a notes merge into %s is already in-progress at %s"
11025msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
1b7f4a34 11026
6937cb4e 11027#: builtin/notes.c:866
5c57d762 11028#, c-format
a0b6b246
JX
11029msgid "failed to store link to current notes ref (%s)"
11030msgstr "无法存储链接到当前的注解引用(%s)"
5c57d762 11031
6937cb4e 11032#: builtin/notes.c:868
5c57d762
JX
11033#, c-format
11034msgid ""
11035"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
11036"'git notes merge --commit', or abort the merge with 'git notes merge --"
11037"abort'.\n"
a0b6b246
JX
11038msgstr ""
11039"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
11040"交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
5c57d762 11041
6937cb4e 11042#: builtin/notes.c:890
ef317cd5
JX
11043#, c-format
11044msgid "Object %s has no note\n"
11045msgstr "对象 %s 没有注解\n"
11046
6937cb4e 11047#: builtin/notes.c:902
ef317cd5 11048msgid "attempt to remove non-existent note is not an error"
07432cef 11049msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 11050
6937cb4e 11051#: builtin/notes.c:905
ef317cd5 11052msgid "read object names from the standard input"
07432cef 11053msgstr "从标准输入读取对象名称"
ef317cd5 11054
6937cb4e 11055#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
5c57d762
JX
11056msgid "do not remove, show only"
11057msgstr "不删除,只显示"
11058
6937cb4e 11059#: builtin/notes.c:944
5c57d762
JX
11060msgid "report pruned notes"
11061msgstr "报告清除的注解"
11062
6937cb4e 11063#: builtin/notes.c:986
6c94aba5 11064msgid "notes-ref"
07432cef 11065msgstr "注解引用"
ef317cd5 11066
6937cb4e 11067#: builtin/notes.c:987
814ff314 11068msgid "use notes from <notes-ref>"
07432cef 11069msgstr "从 <注解引用> 使用注解"
ef317cd5 11070
6937cb4e 11071#: builtin/notes.c:1022
ef317cd5 11072#, c-format
a0b6b246 11073msgid "unknown subcommand: %s"
ef317cd5
JX
11074msgstr "未知子命令:%s"
11075
6937cb4e 11076#: builtin/pack-objects.c:31
1b7f4a34
JX
11077msgid ""
11078"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
11079msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
ef317cd5 11080
6937cb4e 11081#: builtin/pack-objects.c:32
1b7f4a34
JX
11082msgid ""
11083"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
58b6f078 11084msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
ef317cd5 11085
6937cb4e 11086#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
ef317cd5
JX
11087#, c-format
11088msgid "deflate error (%d)"
11089msgstr "压缩错误 (%d)"
11090
6937cb4e 11091#: builtin/pack-objects.c:777
5b04ee3b
JX
11092msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
11093msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
11094
6937cb4e 11095#: builtin/pack-objects.c:790
6c94aba5
JX
11096msgid "Writing objects"
11097msgstr "写入对象中"
11098
6937cb4e 11099#: builtin/pack-objects.c:1070
6c94aba5
JX
11100msgid "disabling bitmap writing, as some objects are not being packed"
11101msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
11102
6937cb4e 11103#: builtin/pack-objects.c:2440
6c94aba5
JX
11104msgid "Compressing objects"
11105msgstr "压缩对象中"
11106
6937cb4e 11107#: builtin/pack-objects.c:2849
ef317cd5
JX
11108#, c-format
11109msgid "unsupported index version %s"
11110msgstr "不支持的索引版本 %s"
11111
6937cb4e 11112#: builtin/pack-objects.c:2853
ef317cd5
JX
11113#, c-format
11114msgid "bad index version '%s'"
11115msgstr "坏的索引版本 '%s'"
11116
6937cb4e 11117#: builtin/pack-objects.c:2883
ef317cd5 11118msgid "do not show progress meter"
07432cef 11119msgstr "不显示进度表"
ef317cd5 11120
6937cb4e 11121#: builtin/pack-objects.c:2885
ef317cd5 11122msgid "show progress meter"
07432cef 11123msgstr "显示进度表"
ef317cd5 11124
6937cb4e 11125#: builtin/pack-objects.c:2887
ef317cd5 11126msgid "show progress meter during object writing phase"
07432cef 11127msgstr "在对象写入阶段显示进度表"
ef317cd5 11128
6937cb4e 11129#: builtin/pack-objects.c:2890
ef317cd5 11130msgid "similar to --all-progress when progress meter is shown"
07432cef 11131msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 11132
6937cb4e 11133#: builtin/pack-objects.c:2891
ef317cd5 11134msgid "version[,offset]"
07432cef 11135msgstr "版本[,偏移]"
ef317cd5 11136
6937cb4e 11137#: builtin/pack-objects.c:2892
ef317cd5 11138msgid "write the pack index file in the specified idx format version"
07432cef 11139msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 11140
6937cb4e 11141#: builtin/pack-objects.c:2895
ef317cd5 11142msgid "maximum size of each output pack file"
07432cef 11143msgstr "每个输出包的最大尺寸"
ef317cd5 11144
6937cb4e 11145#: builtin/pack-objects.c:2897
ef317cd5 11146msgid "ignore borrowed objects from alternate object store"
160fb2b2 11147msgstr "忽略从备用对象存储里借用对象"
ef317cd5 11148
6937cb4e 11149#: builtin/pack-objects.c:2899
ef317cd5 11150msgid "ignore packed objects"
07432cef 11151msgstr "忽略包对象"
ef317cd5 11152
6937cb4e 11153#: builtin/pack-objects.c:2901
ef317cd5 11154msgid "limit pack window by objects"
07432cef 11155msgstr "限制打包窗口的对象数"
ef317cd5 11156
6937cb4e 11157#: builtin/pack-objects.c:2903
ef317cd5 11158msgid "limit pack window by memory in addition to object limit"
07432cef 11159msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 11160
6937cb4e 11161#: builtin/pack-objects.c:2905
ef317cd5 11162msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 11163msgstr "打包允许的 delta 链的最大长度"
ef317cd5 11164
6937cb4e 11165#: builtin/pack-objects.c:2907
ef317cd5 11166msgid "reuse existing deltas"
07432cef 11167msgstr "重用已存在的 deltas"
ef317cd5 11168
6937cb4e 11169#: builtin/pack-objects.c:2909
ef317cd5 11170msgid "reuse existing objects"
07432cef 11171msgstr "重用已存在的对象"
ef317cd5 11172
6937cb4e 11173#: builtin/pack-objects.c:2911
ef317cd5 11174msgid "use OFS_DELTA objects"
07432cef 11175msgstr "使用 OFS_DELTA 对象"
ef317cd5 11176
6937cb4e 11177#: builtin/pack-objects.c:2913
ef317cd5 11178msgid "use threads when searching for best delta matches"
07432cef 11179msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 11180
6937cb4e 11181#: builtin/pack-objects.c:2915
ef317cd5 11182msgid "do not create an empty pack output"
07432cef 11183msgstr "不创建空的包输出"
ef317cd5 11184
6937cb4e 11185#: builtin/pack-objects.c:2917
ef317cd5 11186msgid "read revision arguments from standard input"
d9d56b23 11187msgstr "从标准输入读取版本号参数"
ef317cd5 11188
6937cb4e 11189#: builtin/pack-objects.c:2919
ef317cd5 11190msgid "limit the objects to those that are not yet packed"
07432cef 11191msgstr "限制那些尚未打包的对象"
ef317cd5 11192
6937cb4e 11193#: builtin/pack-objects.c:2922
ef317cd5 11194msgid "include objects reachable from any reference"
07432cef 11195msgstr "包括可以从任何引用访问到的对象"
ef317cd5 11196
6937cb4e 11197#: builtin/pack-objects.c:2925
ef317cd5 11198msgid "include objects referred by reflog entries"
07432cef 11199msgstr "包括被引用日志引用到的对象"
ef317cd5 11200
6937cb4e 11201#: builtin/pack-objects.c:2928
220c313c
JX
11202msgid "include objects referred to by the index"
11203msgstr "包括被索引引用到的对象"
11204
6937cb4e 11205#: builtin/pack-objects.c:2931
ef317cd5 11206msgid "output pack to stdout"
07432cef 11207msgstr "输出包到标准输出"
ef317cd5 11208
6937cb4e 11209#: builtin/pack-objects.c:2933
ef317cd5 11210msgid "include tag objects that refer to objects to be packed"
53438e8f 11211msgstr "包括那些引用了待打包对象的标签对象"
ef317cd5 11212
6937cb4e 11213#: builtin/pack-objects.c:2935
ef317cd5 11214msgid "keep unreachable objects"
07432cef 11215msgstr "维持不可达的对象"
ef317cd5 11216
6937cb4e 11217#: builtin/pack-objects.c:2937
5c57d762
JX
11218msgid "pack loose unreachable objects"
11219msgstr "打包松散的不可达对象"
11220
6937cb4e 11221#: builtin/pack-objects.c:2939
ef317cd5 11222msgid "unpack unreachable objects newer than <time>"
07432cef 11223msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 11224
6937cb4e 11225#: builtin/pack-objects.c:2942
ef317cd5 11226msgid "create thin packs"
07432cef 11227msgstr "创建精简包"
ef317cd5 11228
6937cb4e 11229#: builtin/pack-objects.c:2944
04cb2f28 11230msgid "create packs suitable for shallow fetches"
160fb2b2 11231msgstr "创建适合浅克隆仓库获取的包"
04cb2f28 11232
6937cb4e 11233#: builtin/pack-objects.c:2946
ef317cd5 11234msgid "ignore packs that have companion .keep file"
07432cef 11235msgstr "忽略配有 .keep 文件的包"
ef317cd5 11236
6937cb4e 11237#: builtin/pack-objects.c:2948
ef317cd5 11238msgid "pack compression level"
07432cef 11239msgstr "打包压缩级别"
ef317cd5 11240
6937cb4e 11241#: builtin/pack-objects.c:2950
ef317cd5 11242msgid "do not hide commits by grafts"
cfff71a9 11243msgstr "显示被嫁接隐藏的提交"
ef317cd5 11244
6937cb4e 11245#: builtin/pack-objects.c:2952
6c94aba5
JX
11246msgid "use a bitmap index if available to speed up counting objects"
11247msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
11248
6937cb4e 11249#: builtin/pack-objects.c:2954
6c94aba5
JX
11250msgid "write a bitmap index together with the pack index"
11251msgstr "在建立包索引的同时创建 bitmap 索引"
11252
6937cb4e 11253#: builtin/pack-objects.c:3081
6c94aba5
JX
11254msgid "Counting objects"
11255msgstr "对象计数中"
11256
ef317cd5 11257#: builtin/pack-refs.c:6
814ff314
JX
11258msgid "git pack-refs [<options>]"
11259msgstr "git pack-refs [<选项>]"
c04f5ac3 11260
ef317cd5
JX
11261#: builtin/pack-refs.c:14
11262msgid "pack everything"
07432cef 11263msgstr "打包一切"
c04f5ac3 11264
ef317cd5
JX
11265#: builtin/pack-refs.c:15
11266msgid "prune loose refs (default)"
07432cef 11267msgstr "清除松散的引用(默认)"
c04f5ac3 11268
6937cb4e 11269#: builtin/prune-packed.c:8
814ff314
JX
11270msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
11271msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
6792b93b 11272
6937cb4e 11273#: builtin/prune-packed.c:41
6c94aba5
JX
11274msgid "Removing duplicate objects"
11275msgstr "正在删除重复对象"
11276
5bb01d4f 11277#: builtin/prune.c:11
ef317cd5 11278msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
07432cef 11279msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7ac1c0ad 11280
1a79b2f1 11281#: builtin/prune.c:106
1b7f4a34
JX
11282msgid "report pruned objects"
11283msgstr "报告清除的对象"
11284
1a79b2f1 11285#: builtin/prune.c:109
1b7f4a34
JX
11286msgid "expire objects older than <time>"
11287msgstr "使早于给定时间的对象过期"
11288
94550ed3
JX
11289#: builtin/prune.c:123
11290msgid "cannot prune in a precious-objects repo"
11291msgstr "不能在珍品仓库中执行清理操作"
11292
a4f16749 11293#: builtin/pull.c:54 builtin/pull.c:56
a0b6b246
JX
11294#, c-format
11295msgid "Invalid value for %s: %s"
11296msgstr "%s 的值无效:%s"
11297
a4f16749 11298#: builtin/pull.c:76
94550ed3 11299msgid "git pull [<options>] [<repository> [<refspec>...]]"
1b7f4a34
JX
11300msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
11301
a4f16749
JX
11302#: builtin/pull.c:124
11303msgid "control for recursive fetching of submodules"
11304msgstr "控制子模组的递归获取"
11305
11306#: builtin/pull.c:128
1b7f4a34
JX
11307msgid "Options related to merging"
11308msgstr "和合并相关的选项"
11309
a4f16749 11310#: builtin/pull.c:131
1b7f4a34
JX
11311msgid "incorporate changes by rebasing rather than merging"
11312msgstr "使用变基操作取代合并操作以合入修改"
11313
6937cb4e 11314#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
1b7f4a34
JX
11315msgid "allow fast-forward"
11316msgstr "允许快进式"
11317
a4f16749 11318#: builtin/pull.c:164
5b04ee3b 11319msgid "automatically stash/stash pop before and after rebase"
554e8501 11320msgstr "变基操作前后执行自动贮藏和弹出贮藏"
5b04ee3b 11321
a4f16749 11322#: builtin/pull.c:180
1b7f4a34
JX
11323msgid "Options related to fetching"
11324msgstr "和获取相关的参数"
11325
a4f16749 11326#: builtin/pull.c:198
276ceeaa
JX
11327msgid "number of submodules pulled in parallel"
11328msgstr "并发拉取的子模组的数量"
11329
a4f16749 11330#: builtin/pull.c:287
1b7f4a34
JX
11331#, c-format
11332msgid "Invalid value for pull.ff: %s"
11333msgstr "pull.ff 的取值无效:%s"
11334
6937cb4e 11335#: builtin/pull.c:403
1b7f4a34
JX
11336msgid ""
11337"There is no candidate for rebasing against among the refs that you just "
11338"fetched."
11339msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
11340
6937cb4e 11341#: builtin/pull.c:405
1b7f4a34
JX
11342msgid ""
11343"There are no candidates for merging among the refs that you just fetched."
11344msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
11345
6937cb4e 11346#: builtin/pull.c:406
1b7f4a34
JX
11347msgid ""
11348"Generally this means that you provided a wildcard refspec which had no\n"
11349"matches on the remote end."
11350msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
11351
6937cb4e 11352#: builtin/pull.c:409
1b7f4a34
JX
11353#, c-format
11354msgid ""
11355"You asked to pull from the remote '%s', but did not specify\n"
11356"a branch. Because this is not the default configured remote\n"
11357"for your current branch, you must specify a branch on the command line."
11358msgstr ""
11359"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
11360"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
11361
6937cb4e 11362#: builtin/pull.c:414 git-parse-remote.sh:73
1b7f4a34
JX
11363msgid "You are not currently on a branch."
11364msgstr "您当前不在一个分支上。"
11365
6937cb4e 11366#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
1b7f4a34
JX
11367msgid "Please specify which branch you want to rebase against."
11368msgstr "请指定您要变基到哪一个分支。"
11369
6937cb4e 11370#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
1b7f4a34
JX
11371msgid "Please specify which branch you want to merge with."
11372msgstr "请指定您要合并哪一个分支。"
11373
6937cb4e 11374#: builtin/pull.c:419 builtin/pull.c:434
1b7f4a34
JX
11375msgid "See git-pull(1) for details."
11376msgstr "详见 git-pull(1)。"
11377
6937cb4e 11378#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
5b04ee3b
JX
11379#: git-parse-remote.sh:64
11380msgid "<remote>"
11381msgstr "<远程>"
11382
6937cb4e 11383#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
5b04ee3b
JX
11384#: git-parse-remote.sh:65
11385msgid "<branch>"
11386msgstr "<分支>"
11387
6937cb4e 11388#: builtin/pull.c:429 git-parse-remote.sh:75
1b7f4a34
JX
11389msgid "There is no tracking information for the current branch."
11390msgstr "当前分支没有跟踪信息。"
11391
6937cb4e 11392#: builtin/pull.c:438 git-parse-remote.sh:95
1b7f4a34 11393msgid ""
5b04ee3b
JX
11394"If you wish to set tracking information for this branch you can do so with:"
11395msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
7ac1c0ad 11396
6937cb4e 11397#: builtin/pull.c:443
1b7f4a34
JX
11398#, c-format
11399msgid ""
11400"Your configuration specifies to merge with the ref '%s'\n"
11401"from the remote, but no such ref was fetched."
11402msgstr ""
11403"您的配置中指定要合并远程的引用 '%s',\n"
11404"但是没有获取到这个引用。"
7ac1c0ad 11405
6937cb4e 11406#: builtin/pull.c:796
5c57d762
JX
11407msgid "ignoring --verify-signatures for rebase"
11408msgstr "为变基操作忽略 --verify-signatures"
11409
6937cb4e 11410#: builtin/pull.c:844
5b04ee3b
JX
11411msgid "--[no-]autostash option is only valid with --rebase."
11412msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
11413
6937cb4e 11414#: builtin/pull.c:852
1b7f4a34
JX
11415msgid "Updating an unborn branch with changes added to the index."
11416msgstr "更新尚未诞生的分支,变更添加至索引。"
11417
6937cb4e 11418#: builtin/pull.c:855
a0b6b246
JX
11419msgid "pull with rebase"
11420msgstr "变基式拉取"
11421
6937cb4e 11422#: builtin/pull.c:856
a0b6b246 11423msgid "please commit or stash them."
554e8501 11424msgstr "请提交或贮藏它们。"
a0b6b246 11425
6937cb4e 11426#: builtin/pull.c:881
1b7f4a34
JX
11427#, c-format
11428msgid ""
11429"fetch updated the current branch head.\n"
11430"fast-forwarding your working tree from\n"
11431"commit %s."
11432msgstr ""
11433"fetch 更新了当前的分支。快进您的工作区\n"
11434"至提交 %s。"
ef317cd5 11435
6937cb4e 11436#: builtin/pull.c:886
1b7f4a34
JX
11437#, c-format
11438msgid ""
11439"Cannot fast-forward your working tree.\n"
11440"After making sure that you saved anything precious from\n"
11441"$ git diff %s\n"
11442"output, run\n"
11443"$ git reset --hard\n"
11444"to recover."
11445msgstr ""
11446"您当前的工作区无法执行快进操作。\n"
11447"首先执行如下命令:\n"
11448"$ git diff %s\n"
11449"以确认所有有用的数据均已保存。然后执行下面的命令\n"
11450"$ git reset --hard\n"
11451"恢复之前的状态。"
11452
6937cb4e 11453#: builtin/pull.c:901
1b7f4a34
JX
11454msgid "Cannot merge multiple branches into empty head."
11455msgstr "无法将多个分支合并到空分支。"
11456
6937cb4e 11457#: builtin/pull.c:905
1b7f4a34
JX
11458msgid "Cannot rebase onto multiple branches."
11459msgstr "无法变基到多个分支。"
11460
6937cb4e 11461#: builtin/pull.c:912
a4f16749
JX
11462msgid "cannot rebase with locally recorded submodule modifications"
11463msgstr "本地子模组中有修改,无法变基"
11464
11465#: builtin/push.c:17
ef317cd5 11466msgid "git push [<options>] [<repository> [<refspec>...]]"
160fb2b2 11467msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
7ac1c0ad 11468
a4f16749 11469#: builtin/push.c:90
c04f5ac3 11470msgid "tag shorthand without <tag>"
55a16ee4 11471msgstr "标签后面未提供 <标签> 参数"
c04f5ac3 11472
a4f16749 11473#: builtin/push.c:100
c04f5ac3 11474msgid "--delete only accepts plain target ref names"
90e6ef53 11475msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 11476
a4f16749 11477#: builtin/push.c:144
8ada9598
JX
11478msgid ""
11479"\n"
11480"To choose either option permanently, see push.default in 'git help config'."
11481msgstr ""
81809b99
JX
11482"\n"
11483"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 11484
a4f16749 11485#: builtin/push.c:147
8ada9598
JX
11486#, c-format
11487msgid ""
11488"The upstream branch of your current branch does not match\n"
11489"the name of your current branch. To push to the upstream branch\n"
11490"on the remote, use\n"
11491"\n"
11492" git push %s HEAD:%s\n"
11493"\n"
11494"To push to the branch of the same name on the remote, use\n"
11495"\n"
11496" git push %s %s\n"
11497"%s"
11498msgstr ""
81809b99
JX
11499"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
11500"上游分支,使用\n"
11501"\n"
11502" git push %s HEAD:%s\n"
11503"\n"
11504"为推送至远程同名分支,使用\n"
11505"\n"
11506" git push %s %s\n"
11507"%s"
8ada9598 11508
a4f16749 11509#: builtin/push.c:162
c04f5ac3
JX
11510#, c-format
11511msgid ""
11512"You are not currently on a branch.\n"
11513"To push the history leading to the current (detached HEAD)\n"
11514"state now, use\n"
11515"\n"
11516" git push %s HEAD:<name-of-remote-branch>\n"
11517msgstr ""
11518"您当前不在一个分支上。\n"
90e6ef53 11519"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3 11520"\n"
d9d56b23 11521" git push %s HEAD:<远程分支名字>\n"
c04f5ac3 11522
a4f16749 11523#: builtin/push.c:176
c04f5ac3
JX
11524#, c-format
11525msgid ""
11526"The current branch %s has no upstream branch.\n"
11527"To push the current branch and set the remote as upstream, use\n"
11528"\n"
11529" git push --set-upstream %s %s\n"
11530msgstr ""
11531"当前分支 %s 没有对应的上游分支。\n"
11532"为推送当前分支并建立与远程上游的跟踪,使用\n"
11533"\n"
11534" git push --set-upstream %s %s\n"
11535
a4f16749 11536#: builtin/push.c:184
c04f5ac3
JX
11537#, c-format
11538msgid "The current branch %s has multiple upstream branches, refusing to push."
11539msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
11540
a4f16749 11541#: builtin/push.c:187
73a60cd2
JX
11542#, c-format
11543msgid ""
11544"You are pushing to remote '%s', which is not the upstream of\n"
11545"your current branch '%s', without telling me what to push\n"
11546"to update which remote branch."
11547msgstr ""
11548"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
11549"而没有告诉我要推送什么、更新哪个远程分支。"
11550
a4f16749 11551#: builtin/push.c:246
c04f5ac3
JX
11552msgid ""
11553"You didn't specify any refspecs to push, and push.default is \"nothing\"."
160fb2b2 11554msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
c04f5ac3 11555
a4f16749 11556#: builtin/push.c:253
170e9899
JX
11557msgid ""
11558"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
11559"its remote counterpart. Integrate the remote changes (e.g.\n"
11560"'git pull ...') before pushing again.\n"
170e9899
JX
11561"See the 'Note about fast-forwards' in 'git push --help' for details."
11562msgstr ""
eff6d3a9 11563"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 11564"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 11565"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 11566
a4f16749 11567#: builtin/push.c:259
170e9899
JX
11568msgid ""
11569"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
11570"counterpart. Check out this branch and integrate the remote changes\n"
11571"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
11572"See the 'Note about fast-forwards' in 'git push --help' for details."
11573msgstr ""
eff6d3a9 11574"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 11575"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 11576"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 11577
a4f16749 11578#: builtin/push.c:265
07432cef 11579msgid ""
a77c07d9
JX
11580"Updates were rejected because the remote contains work that you do\n"
11581"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
11582"to the same ref. You may want to first integrate the remote changes\n"
11583"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
11584"See the 'Note about fast-forwards' in 'git push --help' for details."
11585msgstr ""
160fb2b2
JX
11586"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
11587"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
2e8451e8 11588"(如 'git pull ...')。\n"
a77c07d9
JX
11589"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
11590
a4f16749 11591#: builtin/push.c:272
a77c07d9 11592msgid "Updates were rejected because the tag already exists in the remote."
55a16ee4 11593msgstr "更新被拒绝,因为该标签在远程已经存在。"
a77c07d9 11594
a4f16749 11595#: builtin/push.c:275
a77c07d9
JX
11596msgid ""
11597"You cannot update a remote ref that points at a non-commit object,\n"
11598"or update a remote ref to make it point at a non-commit object,\n"
11599"without using the '--force' option.\n"
11600msgstr ""
11601"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
11602"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 11603
a4f16749 11604#: builtin/push.c:335
c04f5ac3
JX
11605#, c-format
11606msgid "Pushing to %s\n"
11607msgstr "推送到 %s\n"
11608
a4f16749 11609#: builtin/push.c:339
c04f5ac3
JX
11610#, c-format
11611msgid "failed to push some refs to '%s'"
11612msgstr "无法推送一些引用到 '%s'"
11613
a4f16749 11614#: builtin/push.c:370
c04f5ac3
JX
11615#, c-format
11616msgid "bad repository '%s'"
160fb2b2 11617msgstr "坏的仓库 '%s'"
c04f5ac3 11618
a4f16749 11619#: builtin/push.c:371
c04f5ac3
JX
11620msgid ""
11621"No configured push destination.\n"
11622"Either specify the URL from the command-line or configure a remote "
11623"repository using\n"
11624"\n"
11625" git remote add <name> <url>\n"
11626"\n"
11627"and then push using the remote name\n"
11628"\n"
11629" git push <name>\n"
11630msgstr ""
90e6ef53 11631"没有配置推送目标。\n"
4375c10e 11632"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
c04f5ac3 11633"\n"
d9d56b23 11634" git remote add <名称> <地址>\n"
c04f5ac3 11635"\n"
160fb2b2 11636"然后使用该远程仓库名执行推送\n"
c04f5ac3 11637"\n"
d9d56b23 11638" git push <名称>\n"
c04f5ac3 11639
a4f16749 11640#: builtin/push.c:389
c04f5ac3
JX
11641msgid "--all and --tags are incompatible"
11642msgstr "--all 和 --tags 不兼容"
11643
a4f16749 11644#: builtin/push.c:390
c04f5ac3 11645msgid "--all can't be combined with refspecs"
160fb2b2 11646msgstr "--all 不能和引用规格同时使用"
c04f5ac3 11647
a4f16749 11648#: builtin/push.c:395
c04f5ac3
JX
11649msgid "--mirror and --tags are incompatible"
11650msgstr "--mirror 和 --tags 不兼容"
11651
a4f16749 11652#: builtin/push.c:396
c04f5ac3 11653msgid "--mirror can't be combined with refspecs"
160fb2b2 11654msgstr "--mirror 不能和引用规格同时使用"
c04f5ac3 11655
a4f16749 11656#: builtin/push.c:401
c04f5ac3
JX
11657msgid "--all and --mirror are incompatible"
11658msgstr "--all 和 --mirror 不兼容"
11659
a4f16749 11660#: builtin/push.c:523
ef317cd5 11661msgid "repository"
160fb2b2 11662msgstr "仓库"
ef317cd5 11663
a4f16749 11664#: builtin/push.c:524 builtin/send-pack.c:163
ef317cd5 11665msgid "push all refs"
07432cef 11666msgstr "推送所有引用"
ef317cd5 11667
a4f16749 11668#: builtin/push.c:525 builtin/send-pack.c:165
ef317cd5 11669msgid "mirror all refs"
07432cef 11670msgstr "镜像所有引用"
ef317cd5 11671
a4f16749 11672#: builtin/push.c:527
ef317cd5 11673msgid "delete refs"
07432cef 11674msgstr "删除引用"
ef317cd5 11675
a4f16749 11676#: builtin/push.c:528
ef317cd5 11677msgid "push tags (can't be used with --all or --mirror)"
55a16ee4 11678msgstr "推送标签(不能使用 --all or --mirror)"
ef317cd5 11679
a4f16749 11680#: builtin/push.c:531 builtin/send-pack.c:166
ef317cd5
JX
11681msgid "force updates"
11682msgstr "强制更新"
11683
a4f16749 11684#: builtin/push.c:533 builtin/send-pack.c:180
90314792
JX
11685msgid "refname>:<expect"
11686msgstr "引用名>:<期望值"
11687
a4f16749 11688#: builtin/push.c:534 builtin/send-pack.c:181
90314792
JX
11689msgid "require old value of ref to be at this value"
11690msgstr "要求引用旧的取值为设定值"
11691
a4f16749 11692#: builtin/push.c:537
ef317cd5 11693msgid "control recursive pushing of submodules"
07432cef 11694msgstr "控制子模组的递归推送"
ef317cd5 11695
a4f16749 11696#: builtin/push.c:539 builtin/send-pack.c:174
ef317cd5 11697msgid "use thin pack"
07432cef 11698msgstr "使用精简打包"
ef317cd5 11699
a4f16749
JX
11700#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
11701#: builtin/send-pack.c:161
ef317cd5 11702msgid "receive pack program"
07432cef 11703msgstr "接收包程序"
ef317cd5 11704
a4f16749 11705#: builtin/push.c:542
ef317cd5 11706msgid "set upstream for git pull/status"
07432cef 11707msgstr "设置 git pull/status 的上游"
ef317cd5 11708
a4f16749 11709#: builtin/push.c:545
ef317cd5 11710msgid "prune locally removed refs"
07432cef 11711msgstr "清除本地删除的引用"
ef317cd5 11712
a4f16749 11713#: builtin/push.c:547
a77c07d9
JX
11714msgid "bypass pre-push hook"
11715msgstr "绕过 pre-push 钩子"
11716
a4f16749 11717#: builtin/push.c:548
1003b3a5 11718msgid "push missing but relevant tags"
55a16ee4 11719msgstr "推送缺失但有关的标签"
1003b3a5 11720
a4f16749 11721#: builtin/push.c:551 builtin/send-pack.c:168
220c313c
JX
11722msgid "GPG sign the push"
11723msgstr "用 GPG 为推送签名"
11724
a4f16749 11725#: builtin/push.c:553 builtin/send-pack.c:175
814ff314
JX
11726msgid "request atomic transaction on remote side"
11727msgstr "需要远端支持原子事务"
11728
a4f16749 11729#: builtin/push.c:554 builtin/send-pack.c:171
5c57d762
JX
11730msgid "server-specific"
11731msgstr "server-specific"
11732
a4f16749 11733#: builtin/push.c:554 builtin/send-pack.c:172
5c57d762 11734msgid "option to transmit"
9a4b694c 11735msgstr "传输选项"
5c57d762 11736
a4f16749 11737#: builtin/push.c:568
c04f5ac3
JX
11738msgid "--delete is incompatible with --all, --mirror and --tags"
11739msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
11740
a4f16749 11741#: builtin/push.c:570
c04f5ac3
JX
11742msgid "--delete doesn't make sense without any refs"
11743msgstr "--delete 未接任何引用没有意义"
11744
a4f16749 11745#: builtin/push.c:589
5c57d762
JX
11746msgid "push options must not have new line characters"
11747msgstr "推送选项不能有换行符"
11748
87cb7997 11749#: builtin/read-tree.c:40
ef317cd5 11750msgid ""
1b7f4a34 11751"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
ef317cd5
JX
11752"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
11753"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
11754msgstr ""
1b7f4a34 11755"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
07432cef 11756"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
1b7f4a34 11757"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
ef317cd5 11758
a4f16749 11759#: builtin/read-tree.c:121
ef317cd5 11760msgid "write resulting index to <file>"
d9d56b23 11761msgstr "将索引结果写入 <文件>"
ef317cd5 11762
a4f16749 11763#: builtin/read-tree.c:124
ef317cd5 11764msgid "only empty the index"
07432cef 11765msgstr "只是清空索引"
ef317cd5 11766
a4f16749 11767#: builtin/read-tree.c:126
ef317cd5 11768msgid "Merging"
07432cef 11769msgstr "合并"
ef317cd5 11770
a4f16749 11771#: builtin/read-tree.c:128
ef317cd5 11772msgid "perform a merge in addition to a read"
07432cef 11773msgstr "读取之余再执行一个合并"
ef317cd5 11774
a4f16749 11775#: builtin/read-tree.c:130
ef317cd5 11776msgid "3-way merge if no file level merging required"
160fb2b2 11777msgstr "如果没有文件级合并需要,执行三方合并"
ef317cd5 11778
a4f16749 11779#: builtin/read-tree.c:132
ef317cd5 11780msgid "3-way merge in presence of adds and removes"
160fb2b2 11781msgstr "存在添加和删除时,也执行三方合并"
ef317cd5 11782
a4f16749 11783#: builtin/read-tree.c:134
ef317cd5 11784msgid "same as -m, but discard unmerged entries"
07432cef 11785msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 11786
a4f16749 11787#: builtin/read-tree.c:135
ef317cd5 11788msgid "<subdirectory>/"
07432cef 11789msgstr "<子目录>/"
ef317cd5 11790
a4f16749 11791#: builtin/read-tree.c:136
ef317cd5 11792msgid "read the tree into the index under <subdirectory>/"
07432cef 11793msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 11794
a4f16749 11795#: builtin/read-tree.c:139
ef317cd5 11796msgid "update working tree with merge result"
07432cef 11797msgstr "用合并的结果更新工作区"
ef317cd5 11798
a4f16749 11799#: builtin/read-tree.c:141
ef317cd5 11800msgid "gitignore"
07432cef 11801msgstr "gitignore"
ef317cd5 11802
a4f16749 11803#: builtin/read-tree.c:142
ef317cd5 11804msgid "allow explicitly ignored files to be overwritten"
07432cef 11805msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 11806
a4f16749 11807#: builtin/read-tree.c:145
ef317cd5 11808msgid "don't check the working tree after merging"
07432cef 11809msgstr "合并后不检查工作区"
ef317cd5 11810
a4f16749 11811#: builtin/read-tree.c:146
ef317cd5 11812msgid "don't update the index or the work tree"
07432cef 11813msgstr "不更新索引区和工作区"
ef317cd5 11814
a4f16749 11815#: builtin/read-tree.c:148
ef317cd5 11816msgid "skip applying sparse checkout filter"
07432cef 11817msgstr "跳过应用稀疏检出过滤器"
ef317cd5 11818
a4f16749 11819#: builtin/read-tree.c:150
ef317cd5 11820msgid "debug unpack-trees"
07432cef 11821msgstr "调试 unpack-trees"
ef317cd5 11822
a4f16749 11823#: builtin/rebase--helper.c:8
87cb7997
JX
11824msgid "git rebase--helper [<options>]"
11825msgstr "git rebase--helper [<选项>]"
11826
6937cb4e
JX
11827#: builtin/rebase--helper.c:22
11828msgid "keep empty commits"
11829msgstr "保持空提交"
11830
11831#: builtin/rebase--helper.c:23
87cb7997
JX
11832msgid "continue rebase"
11833msgstr "继续变基"
11834
6937cb4e 11835#: builtin/rebase--helper.c:25
87cb7997
JX
11836msgid "abort rebase"
11837msgstr "中止变基"
11838
6937cb4e
JX
11839#: builtin/rebase--helper.c:28
11840msgid "make rebase script"
11841msgstr "制作变基脚本"
11842
11843#: builtin/rebase--helper.c:30
11844msgid "shorten SHA-1s in the todo list"
11845msgstr "缩短待办列表中的哈希值"
11846
11847#: builtin/rebase--helper.c:32
11848msgid "expand SHA-1s in the todo list"
11849msgstr "扩展待办列表中的哈希值"
11850
11851#: builtin/rebase--helper.c:34
11852msgid "check the todo list"
11853msgstr "检查待办列表"
11854
11855#: builtin/rebase--helper.c:36
11856msgid "skip unnecessary picks"
11857msgstr "跳过不必要的拣选"
11858
11859#: builtin/rebase--helper.c:38
11860msgid "rearrange fixup/squash lines"
11861msgstr "重新排列 fixup/squash 行"
11862
11863#: builtin/receive-pack.c:29
5b04ee3b 11864msgid "git receive-pack <git-dir>"
58b6f078 11865msgstr "git receive-pack <仓库目录>"
5b04ee3b 11866
6937cb4e 11867#: builtin/receive-pack.c:839
a0b6b246
JX
11868msgid ""
11869"By default, updating the current branch in a non-bare repository\n"
11870"is denied, because it will make the index and work tree inconsistent\n"
11871"with what you pushed, and will require 'git reset --hard' to match\n"
11872"the work tree to HEAD.\n"
11873"\n"
1a79b2f1
JX
11874"You can set the 'receive.denyCurrentBranch' configuration variable\n"
11875"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
a0b6b246
JX
11876"its current branch; however, this is not recommended unless you\n"
11877"arranged to update its work tree to match what you pushed in some\n"
11878"other way.\n"
11879"\n"
11880"To squelch this message and still keep the default behaviour, set\n"
11881"'receive.denyCurrentBranch' configuration variable to 'refuse'."
11882msgstr ""
11883"默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
11884"不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
11885"\n"
11886"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
11887"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
11888"用某种方式将其工作区更新至您推送的状态。\n"
11889"\n"
11890"若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
11891"配置变量为 'refuse'。"
11892
6937cb4e 11893#: builtin/receive-pack.c:859
a0b6b246
JX
11894msgid ""
11895"By default, deleting the current branch is denied, because the next\n"
11896"'git clone' won't result in any file checked out, causing confusion.\n"
11897"\n"
11898"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
11899"'warn' or 'ignore' in the remote repository to allow deleting the\n"
11900"current branch, with or without a warning message.\n"
11901"\n"
11902"To squelch this message, you can set it to 'refuse'."
11903msgstr ""
11904"默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
29004bbb 11905"导致困惑。\n"
a0b6b246
JX
11906"\n"
11907"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
29004bbb 11908"'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
a0b6b246
JX
11909"\n"
11910"若要屏蔽此信息,您可以设置它为 'refuse'。"
11911
6937cb4e 11912#: builtin/receive-pack.c:1932
5b04ee3b
JX
11913msgid "quiet"
11914msgstr "静默模式"
11915
6937cb4e 11916#: builtin/receive-pack.c:1946
5b04ee3b
JX
11917msgid "You must specify a directory."
11918msgstr "您必须指定一个目录。"
11919
a4f16749 11920#: builtin/reflog.c:424
2e8451e8 11921#, c-format
1b7f4a34 11922msgid "'%s' for '%s' is not a valid timestamp"
2e8451e8
JX
11923msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
11924
a4f16749 11925#: builtin/reflog.c:541 builtin/reflog.c:546
2e8451e8
JX
11926#, c-format
11927msgid "'%s' is not a valid timestamp"
11928msgstr "'%s' 不是一个有效的时间戳"
11929
a4f16749 11930#: builtin/remote.c:13
ef317cd5 11931msgid "git remote [-v | --verbose]"
07432cef 11932msgstr "git remote [-v | --verbose]"
ef317cd5 11933
a4f16749 11934#: builtin/remote.c:14
ef317cd5 11935msgid ""
814ff314 11936"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
ef317cd5
JX
11937"mirror=<fetch|push>] <name> <url>"
11938msgstr ""
814ff314 11939"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
d9d56b23 11940"mirror=<fetch|push>] <名称> <地址>"
ef317cd5 11941
a4f16749 11942#: builtin/remote.c:15 builtin/remote.c:35
ef317cd5 11943msgid "git remote rename <old> <new>"
07432cef 11944msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 11945
a4f16749 11946#: builtin/remote.c:16 builtin/remote.c:40
ef317cd5 11947msgid "git remote remove <name>"
07432cef 11948msgstr "git remote remove <名称>"
ef317cd5 11949
a4f16749 11950#: builtin/remote.c:17 builtin/remote.c:45
814ff314
JX
11951msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
11952msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
ef317cd5 11953
a4f16749 11954#: builtin/remote.c:18
ef317cd5 11955msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 11956msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 11957
a4f16749 11958#: builtin/remote.c:19
ef317cd5 11959msgid "git remote prune [-n | --dry-run] <name>"
07432cef 11960msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 11961
a4f16749 11962#: builtin/remote.c:20
ef317cd5
JX
11963msgid ""
11964"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 11965msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 11966
a4f16749 11967#: builtin/remote.c:21
ef317cd5 11968msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 11969msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 11970
a4f16749 11971#: builtin/remote.c:22 builtin/remote.c:71
94550ed3
JX
11972msgid "git remote get-url [--push] [--all] <name>"
11973msgstr "git remote get-url [--push] [--all] <名称>"
11974
a4f16749 11975#: builtin/remote.c:23 builtin/remote.c:76
ef317cd5 11976msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 11977msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 11978
a4f16749 11979#: builtin/remote.c:24 builtin/remote.c:77
ef317cd5 11980msgid "git remote set-url --add <name> <newurl>"
07432cef 11981msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 11982
a4f16749 11983#: builtin/remote.c:25 builtin/remote.c:78
ef317cd5 11984msgid "git remote set-url --delete <name> <url>"
07432cef 11985msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 11986
a4f16749 11987#: builtin/remote.c:30
ef317cd5 11988msgid "git remote add [<options>] <name> <url>"
07432cef 11989msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 11990
a4f16749 11991#: builtin/remote.c:50
ef317cd5 11992msgid "git remote set-branches <name> <branch>..."
07432cef 11993msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 11994
a4f16749 11995#: builtin/remote.c:51
ef317cd5 11996msgid "git remote set-branches --add <name> <branch>..."
07432cef 11997msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 11998
a4f16749 11999#: builtin/remote.c:56
ef317cd5 12000msgid "git remote show [<options>] <name>"
07432cef 12001msgstr "git remote show [<选项>] <名称>"
ef317cd5 12002
a4f16749 12003#: builtin/remote.c:61
ef317cd5 12004msgid "git remote prune [<options>] <name>"
07432cef 12005msgstr "git remote prune [<选项>] <名称>"
ef317cd5 12006
a4f16749 12007#: builtin/remote.c:66
ef317cd5 12008msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 12009msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 12010
a4f16749 12011#: builtin/remote.c:95
81809b99 12012#, c-format
8ada9598 12013msgid "Updating %s"
81809b99 12014msgstr "更新 %s 中"
8ada9598 12015
a4f16749 12016#: builtin/remote.c:127
8ada9598
JX
12017msgid ""
12018"--mirror is dangerous and deprecated; please\n"
12019"\t use --mirror=fetch or --mirror=push instead"
12020msgstr ""
81809b99
JX
12021"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
12022"\t 或 --mirror=push"
8ada9598 12023
a4f16749 12024#: builtin/remote.c:144
81809b99 12025#, c-format
8ada9598 12026msgid "unknown mirror argument: %s"
81809b99 12027msgstr "未知的镜像参数:%s"
8ada9598 12028
a4f16749 12029#: builtin/remote.c:160
ef317cd5 12030msgid "fetch the remote branches"
07432cef 12031msgstr "抓取远程的分支"
ef317cd5 12032
a4f16749 12033#: builtin/remote.c:162
ef317cd5 12034msgid "import all tags and associated objects when fetching"
55a16ee4 12035msgstr "抓取时导入所有的标签和关联对象"
ef317cd5 12036
a4f16749 12037#: builtin/remote.c:165
ef317cd5 12038msgid "or do not fetch any tag at all (--no-tags)"
55a16ee4 12039msgstr "或不抓取任何标签(--no-tags)"
ef317cd5 12040
a4f16749 12041#: builtin/remote.c:167
ef317cd5 12042msgid "branch(es) to track"
07432cef 12043msgstr "跟踪的分支"
ef317cd5 12044
a4f16749 12045#: builtin/remote.c:168
ef317cd5 12046msgid "master branch"
07432cef 12047msgstr "主线分支"
ef317cd5 12048
a4f16749 12049#: builtin/remote.c:169
ef317cd5 12050msgid "push|fetch"
07432cef 12051msgstr "push|fetch"
ef317cd5 12052
a4f16749 12053#: builtin/remote.c:170
ef317cd5 12054msgid "set up remote as a mirror to push to or fetch from"
07432cef 12055msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 12056
a4f16749 12057#: builtin/remote.c:182
8ada9598 12058msgid "specifying a master branch makes no sense with --mirror"
81809b99 12059msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 12060
a4f16749 12061#: builtin/remote.c:184
8ada9598 12062msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 12063msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 12064
6937cb4e 12065#: builtin/remote.c:191 builtin/remote.c:631
81809b99 12066#, c-format
8ada9598 12067msgid "remote %s already exists."
81809b99 12068msgstr "远程 %s 已经存在。"
8ada9598 12069
6937cb4e 12070#: builtin/remote.c:195 builtin/remote.c:635
81809b99 12071#, c-format
8ada9598 12072msgid "'%s' is not a valid remote name"
81809b99 12073msgstr "'%s' 不是一个有效的远程名称"
8ada9598 12074
a4f16749 12075#: builtin/remote.c:235
81809b99 12076#, c-format
8ada9598 12077msgid "Could not setup master '%s'"
81809b99 12078msgstr "无法设置 master '%s'"
8ada9598 12079
a4f16749 12080#: builtin/remote.c:337
81809b99 12081#, c-format
8ada9598 12082msgid "Could not get fetch map for refspec %s"
160fb2b2 12083msgstr "无法得到引用规格 %s 的获取列表"
8ada9598 12084
a4f16749 12085#: builtin/remote.c:438 builtin/remote.c:446
8ada9598 12086msgid "(matching)"
81809b99 12087msgstr "(匹配)"
8ada9598 12088
a4f16749 12089#: builtin/remote.c:450
8ada9598 12090msgid "(delete)"
81809b99 12091msgstr "(删除)"
8ada9598 12092
6937cb4e 12093#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
81809b99 12094#, c-format
8ada9598 12095msgid "No such remote: %s"
81809b99 12096msgstr "没有这样的远程:%s"
8ada9598 12097
6937cb4e 12098#: builtin/remote.c:641
81809b99 12099#, c-format
8ada9598 12100msgid "Could not rename config section '%s' to '%s'"
81809b99 12101msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 12102
6937cb4e 12103#: builtin/remote.c:661
8ada9598
JX
12104#, c-format
12105msgid ""
d691f479 12106"Not updating non-default fetch refspec\n"
8ada9598
JX
12107"\t%s\n"
12108"\tPlease update the configuration manually if necessary."
12109msgstr ""
160fb2b2 12110"没有更新非默认的获取引用规格\n"
81809b99
JX
12111"\t%s\n"
12112"\t如果必要请手动更新配置。"
8ada9598 12113
6937cb4e 12114#: builtin/remote.c:697
81809b99 12115#, c-format
8ada9598 12116msgid "deleting '%s' failed"
81809b99 12117msgstr "删除 '%s' 失败"
8ada9598 12118
6937cb4e 12119#: builtin/remote.c:731
81809b99 12120#, c-format
8ada9598 12121msgid "creating '%s' failed"
81809b99 12122msgstr "创建 '%s' 失败"
8ada9598 12123
6937cb4e 12124#: builtin/remote.c:796
8ada9598
JX
12125msgid ""
12126"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
12127"to delete it, use:"
12128msgid_plural ""
12129"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
12130"to delete them, use:"
5ae481e0
JX
12131msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
12132msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 12133
6937cb4e 12134#: builtin/remote.c:810
276ceeaa
JX
12135#, c-format
12136msgid "Could not remove config section '%s'"
12137msgstr "不能移除配置小节 '%s'"
12138
6937cb4e 12139#: builtin/remote.c:911
8ada9598
JX
12140#, c-format
12141msgid " new (next fetch will store in remotes/%s)"
81809b99 12142msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 12143
6937cb4e 12144#: builtin/remote.c:914
8ada9598 12145msgid " tracked"
81809b99 12146msgstr " 已跟踪"
8ada9598 12147
6937cb4e 12148#: builtin/remote.c:916
8ada9598 12149msgid " stale (use 'git remote prune' to remove)"
81809b99 12150msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 12151
6937cb4e 12152#: builtin/remote.c:918
8ada9598 12153msgid " ???"
81809b99 12154msgstr " ???"
8ada9598 12155
6937cb4e 12156#: builtin/remote.c:959
8ada9598
JX
12157#, c-format
12158msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 12159msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 12160
6937cb4e 12161#: builtin/remote.c:967
81809b99 12162#, c-format
276ceeaa
JX
12163msgid "rebases interactively onto remote %s"
12164msgstr "交互式变基到远程 %s"
8ada9598 12165
6937cb4e 12166#: builtin/remote.c:968
5c57d762
JX
12167#, c-format
12168msgid "rebases onto remote %s"
12169msgstr "变基到远程 %s"
12170
6937cb4e 12171#: builtin/remote.c:971
81809b99 12172#, c-format
8ada9598 12173msgid " merges with remote %s"
81809b99 12174msgstr " 与远程 %s 合并"
8ada9598 12175
6937cb4e 12176#: builtin/remote.c:974
81809b99 12177#, c-format
8ada9598 12178msgid "merges with remote %s"
81809b99 12179msgstr "与远程 %s 合并"
8ada9598 12180
6937cb4e 12181#: builtin/remote.c:977
5c57d762
JX
12182#, c-format
12183msgid "%-*s and with remote %s\n"
12184msgstr "%-*s 以及和远程 %s\n"
8ada9598 12185
6937cb4e 12186#: builtin/remote.c:1020
8ada9598 12187msgid "create"
81809b99 12188msgstr "创建"
8ada9598 12189
6937cb4e 12190#: builtin/remote.c:1023
8ada9598 12191msgid "delete"
81809b99 12192msgstr "删除"
8ada9598 12193
6937cb4e 12194#: builtin/remote.c:1027
8ada9598 12195msgid "up to date"
81809b99 12196msgstr "最新"
8ada9598 12197
6937cb4e 12198#: builtin/remote.c:1030
8ada9598 12199msgid "fast-forwardable"
81809b99 12200msgstr "可快进"
8ada9598 12201
6937cb4e 12202#: builtin/remote.c:1033
8ada9598 12203msgid "local out of date"
81809b99 12204msgstr "本地已过时"
8ada9598 12205
6937cb4e 12206#: builtin/remote.c:1040
8ada9598
JX
12207#, c-format
12208msgid " %-*s forces to %-*s (%s)"
81809b99 12209msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 12210
6937cb4e 12211#: builtin/remote.c:1043
8ada9598
JX
12212#, c-format
12213msgid " %-*s pushes to %-*s (%s)"
81809b99 12214msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 12215
6937cb4e 12216#: builtin/remote.c:1047
8ada9598
JX
12217#, c-format
12218msgid " %-*s forces to %s"
81809b99 12219msgstr " %-*s 强制推送至 %s"
8ada9598 12220
6937cb4e 12221#: builtin/remote.c:1050
8ada9598
JX
12222#, c-format
12223msgid " %-*s pushes to %s"
81809b99 12224msgstr " %-*s 推送至 %s"
8ada9598 12225
6937cb4e 12226#: builtin/remote.c:1118
ef317cd5 12227msgid "do not query remotes"
07432cef 12228msgstr "不查询远程"
ef317cd5 12229
6937cb4e 12230#: builtin/remote.c:1145
81809b99 12231#, c-format
8ada9598 12232msgid "* remote %s"
81809b99 12233msgstr "* 远程 %s"
8ada9598 12234
6937cb4e 12235#: builtin/remote.c:1146
8ada9598
JX
12236#, c-format
12237msgid " Fetch URL: %s"
81809b99 12238msgstr " 获取地址:%s"
8ada9598 12239
6937cb4e 12240#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
8ada9598 12241msgid "(no URL)"
81809b99 12242msgstr "(无 URL)"
8ada9598 12243
a4f16749
JX
12244#. TRANSLATORS: the colon ':' should align
12245#. with the one in " Fetch URL: %s"
12246#. translation.
12247#.
6937cb4e 12248#: builtin/remote.c:1161 builtin/remote.c:1163
8ada9598
JX
12249#, c-format
12250msgid " Push URL: %s"
81809b99 12251msgstr " 推送地址:%s"
8ada9598 12252
6937cb4e 12253#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
81809b99 12254#, c-format
8ada9598 12255msgid " HEAD branch: %s"
4375c10e 12256msgstr " HEAD 分支:%s"
8ada9598 12257
5c57d762 12258# 译者:中文字符串拼接,可删除前导空格
6937cb4e 12259#: builtin/remote.c:1165
5c57d762
JX
12260msgid "(not queried)"
12261msgstr "(未查询)"
12262
6937cb4e 12263#: builtin/remote.c:1167
5c57d762
JX
12264msgid "(unknown)"
12265msgstr "(未知)"
12266
6937cb4e 12267#: builtin/remote.c:1171
8ada9598
JX
12268#, c-format
12269msgid ""
12270" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 12271msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 12272
6937cb4e 12273#: builtin/remote.c:1183
81809b99 12274#, c-format
8ada9598
JX
12275msgid " Remote branch:%s"
12276msgid_plural " Remote branches:%s"
81809b99 12277msgstr[0] " 远程分支:%s"
5ae481e0 12278msgstr[1] " 远程分支:%s"
8ada9598 12279
81809b99 12280# 译者:中文字符串拼接,可删除前导空格
6937cb4e 12281#: builtin/remote.c:1186 builtin/remote.c:1212
8ada9598 12282msgid " (status not queried)"
81809b99 12283msgstr "(状态未查询)"
8ada9598 12284
6937cb4e 12285#: builtin/remote.c:1195
8ada9598
JX
12286msgid " Local branch configured for 'git pull':"
12287msgid_plural " Local branches configured for 'git pull':"
81809b99 12288msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 12289msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 12290
6937cb4e 12291#: builtin/remote.c:1203
8ada9598 12292msgid " Local refs will be mirrored by 'git push'"
81809b99 12293msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 12294
6937cb4e 12295#: builtin/remote.c:1209
81809b99 12296#, c-format
8ada9598
JX
12297msgid " Local ref configured for 'git push'%s:"
12298msgid_plural " Local refs configured for 'git push'%s:"
81809b99 12299msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 12300msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 12301
6937cb4e 12302#: builtin/remote.c:1230
ef317cd5 12303msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 12304msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 12305
6937cb4e 12306#: builtin/remote.c:1232
ef317cd5 12307msgid "delete refs/remotes/<name>/HEAD"
07432cef 12308msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 12309
6937cb4e 12310#: builtin/remote.c:1247
8ada9598 12311msgid "Cannot determine remote HEAD"
81809b99 12312msgstr "无法确定远程 HEAD"
8ada9598 12313
6937cb4e 12314#: builtin/remote.c:1249
8ada9598 12315msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 12316msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 12317
6937cb4e 12318#: builtin/remote.c:1259
81809b99 12319#, c-format
8ada9598 12320msgid "Could not delete %s"
81809b99 12321msgstr "无法删除 %s"
8ada9598 12322
6937cb4e 12323#: builtin/remote.c:1267
81809b99 12324#, c-format
8ada9598 12325msgid "Not a valid ref: %s"
81809b99 12326msgstr "不是一个有效引用:%s"
8ada9598 12327
6937cb4e 12328#: builtin/remote.c:1269
81809b99 12329#, c-format
8ada9598 12330msgid "Could not setup %s"
81809b99 12331msgstr "不能设置 %s"
8ada9598
JX
12332
12333# 译者:注意保持前导空格
6937cb4e 12334#: builtin/remote.c:1287
81809b99 12335#, c-format
8ada9598 12336msgid " %s will become dangling!"
07432cef 12337msgstr " %s 将成为摇摆状态!"
8ada9598
JX
12338
12339# 译者:注意保持前导空格
6937cb4e 12340#: builtin/remote.c:1288
81809b99 12341#, c-format
8ada9598 12342msgid " %s has become dangling!"
07432cef 12343msgstr " %s 已成为摇摆状态!"
8ada9598 12344
6937cb4e 12345#: builtin/remote.c:1298
81809b99 12346#, c-format
8ada9598 12347msgid "Pruning %s"
81809b99 12348msgstr "修剪 %s"
8ada9598 12349
6937cb4e 12350#: builtin/remote.c:1299
8ada9598
JX
12351#, c-format
12352msgid "URL: %s"
81809b99 12353msgstr "URL:%s"
8ada9598 12354
6937cb4e 12355#: builtin/remote.c:1315
8ada9598
JX
12356#, c-format
12357msgid " * [would prune] %s"
81809b99 12358msgstr " * [将删除] %s"
8ada9598 12359
6937cb4e 12360#: builtin/remote.c:1318
8ada9598
JX
12361#, c-format
12362msgid " * [pruned] %s"
81809b99 12363msgstr " * [已删除] %s"
8ada9598 12364
6937cb4e 12365#: builtin/remote.c:1363
ef317cd5 12366msgid "prune remotes after fetching"
07432cef 12367msgstr "抓取后清除远程"
ef317cd5 12368
6937cb4e 12369#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
81809b99 12370#, c-format
8ada9598 12371msgid "No such remote '%s'"
81809b99 12372msgstr "没有此远程 '%s'"
8ada9598 12373
6937cb4e 12374#: builtin/remote.c:1442
ef317cd5 12375msgid "add branch"
07432cef 12376msgstr "添加分支"
ef317cd5 12377
6937cb4e 12378#: builtin/remote.c:1449
8ada9598 12379msgid "no remote specified"
81809b99 12380msgstr "未指定远程"
8ada9598 12381
6937cb4e 12382#: builtin/remote.c:1466
94550ed3
JX
12383msgid "query push URLs rather than fetch URLs"
12384msgstr "查询推送 URL 地址,而非获取 URL 地址"
12385
6937cb4e 12386#: builtin/remote.c:1468
94550ed3
JX
12387msgid "return all URLs"
12388msgstr "返回所有 URL 地址"
12389
6937cb4e 12390#: builtin/remote.c:1496
94550ed3
JX
12391#, c-format
12392msgid "no URLs configured for remote '%s'"
12393msgstr "没有给远程仓库 '%s' 设定 URL"
12394
6937cb4e 12395#: builtin/remote.c:1522
ef317cd5 12396msgid "manipulate push URLs"
07432cef 12397msgstr "操作推送 URLS"
ef317cd5 12398
6937cb4e 12399#: builtin/remote.c:1524
ef317cd5 12400msgid "add URL"
07432cef 12401msgstr "添加 URL"
ef317cd5 12402
6937cb4e 12403#: builtin/remote.c:1526
ef317cd5 12404msgid "delete URLs"
07432cef 12405msgstr "删除 URLS"
ef317cd5 12406
6937cb4e 12407#: builtin/remote.c:1533
8ada9598 12408msgid "--add --delete doesn't make sense"
81809b99 12409msgstr "--add --delete 无意义"
8ada9598 12410
6937cb4e 12411#: builtin/remote.c:1572
81809b99 12412#, c-format
8ada9598 12413msgid "Invalid old URL pattern: %s"
4375c10e 12414msgstr "无效的旧 URL 匹配模版:%s"
8ada9598 12415
6937cb4e 12416#: builtin/remote.c:1580
81809b99 12417#, c-format
8ada9598 12418msgid "No such URL found: %s"
4375c10e 12419msgstr "未找到此 URL:%s"
8ada9598 12420
6937cb4e 12421#: builtin/remote.c:1582
8ada9598 12422msgid "Will not delete all non-push URLs"
4375c10e 12423msgstr "将不会删除所有非推送 URL 地址"
8ada9598 12424
6937cb4e 12425#: builtin/remote.c:1598
ef317cd5 12426msgid "be verbose; must be placed before a subcommand"
07432cef 12427msgstr "冗长输出;必须置于子命令之前"
ef317cd5 12428
6937cb4e 12429#: builtin/remote.c:1629
a0b6b246
JX
12430#, c-format
12431msgid "Unknown subcommand: %s"
12432msgstr "未知子命令:%s"
12433
a4f16749 12434#: builtin/repack.c:18
814ff314
JX
12435msgid "git repack [<options>]"
12436msgstr "git repack [<选项>]"
90314792 12437
a4f16749 12438#: builtin/repack.c:23
1a79b2f1
JX
12439msgid ""
12440"Incremental repacks are incompatible with bitmap indexes. Use\n"
12441"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
12442msgstr ""
12443"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
12444"或禁用 pack.writebitmaps 配置。"
12445
a4f16749 12446#: builtin/repack.c:168
90314792
JX
12447msgid "pack everything in a single pack"
12448msgstr "所有内容打包到一个包文件中"
12449
a4f16749 12450#: builtin/repack.c:170
90314792
JX
12451msgid "same as -a, and turn unreachable objects loose"
12452msgstr "和 -a 相同,并将不可达的对象设为松散对象"
12453
a4f16749 12454#: builtin/repack.c:173
90314792
JX
12455msgid "remove redundant packs, and run git-prune-packed"
12456msgstr "删除多余的包,运行 git-prune-packed"
12457
a4f16749 12458#: builtin/repack.c:175
90314792
JX
12459msgid "pass --no-reuse-delta to git-pack-objects"
12460msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
12461
a4f16749 12462#: builtin/repack.c:177
90314792
JX
12463msgid "pass --no-reuse-object to git-pack-objects"
12464msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
12465
a4f16749 12466#: builtin/repack.c:179
90314792
JX
12467msgid "do not run git-update-server-info"
12468msgstr "不运行 git-update-server-info"
12469
a4f16749 12470#: builtin/repack.c:182
90314792
JX
12471msgid "pass --local to git-pack-objects"
12472msgstr "向 git-pack-objects 传递参数 --local"
12473
a4f16749 12474#: builtin/repack.c:184
6c94aba5
JX
12475msgid "write bitmap index"
12476msgstr "写 bitmap 索引"
12477
a4f16749 12478#: builtin/repack.c:185
90314792
JX
12479msgid "approxidate"
12480msgstr "近似日期"
12481
a4f16749 12482#: builtin/repack.c:186
90314792
JX
12483msgid "with -A, do not loosen objects older than this"
12484msgstr "使用 -A,不要将早于给定时间的对象过期"
12485
a4f16749 12486#: builtin/repack.c:188
5c57d762
JX
12487msgid "with -a, repack unreachable objects"
12488msgstr "使用 -a ,重新对不可达对象打包"
12489
a4f16749 12490#: builtin/repack.c:190
90314792
JX
12491msgid "size of the window used for delta compression"
12492msgstr "用于增量压缩的窗口值"
12493
a4f16749 12494#: builtin/repack.c:191 builtin/repack.c:197
8376b58d
JX
12495msgid "bytes"
12496msgstr "字节"
12497
a4f16749 12498#: builtin/repack.c:192
90314792
JX
12499msgid "same as the above, but limit memory size instead of entries count"
12500msgstr "和上面的相似,但限制内存大小而非条目数"
12501
a4f16749 12502#: builtin/repack.c:194
90314792
JX
12503msgid "limits the maximum delta depth"
12504msgstr "限制最大增量深度"
12505
a4f16749
JX
12506#: builtin/repack.c:196
12507msgid "limits the maximum number of threads"
12508msgstr "限制最大线程数"
12509
12510#: builtin/repack.c:198
90314792 12511msgid "maximum size of each packfile"
dbd6cced 12512msgstr "每个包文件的最大尺寸"
90314792 12513
a4f16749 12514#: builtin/repack.c:200
6c94aba5
JX
12515msgid "repack objects in packs marked with .keep"
12516msgstr "对标记为 .keep 的包中的对象重新打包"
12517
a4f16749 12518#: builtin/repack.c:210
94550ed3
JX
12519msgid "cannot delete packs in a precious-objects repo"
12520msgstr "不能删除珍品仓库中的打包文件"
12521
a4f16749 12522#: builtin/repack.c:214
5c57d762
JX
12523msgid "--keep-unreachable and -A are incompatible"
12524msgstr "--keep-unreachable 和 -A 不兼容"
12525
6937cb4e 12526#: builtin/repack.c:406 builtin/worktree.c:134
90314792 12527#, c-format
5c57d762
JX
12528msgid "failed to remove '%s'"
12529msgstr "无法删除 '%s'"
90314792 12530
a4f16749 12531#: builtin/replace.c:20
ef317cd5 12532msgid "git replace [-f] <object> <replacement>"
07432cef 12533msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 12534
a4f16749 12535#: builtin/replace.c:21
6acbf033
JX
12536msgid "git replace [-f] --edit <object>"
12537msgstr "git replace [-f] --edit <对象>"
12538
a4f16749 12539#: builtin/replace.c:22
6acbf033
JX
12540msgid "git replace [-f] --graft <commit> [<parent>...]"
12541msgstr "git replace [-f] --graft <提交> [<父提交>...]"
12542
a4f16749 12543#: builtin/replace.c:23
ef317cd5 12544msgid "git replace -d <object>..."
07432cef 12545msgstr "git replace -d <对象>..."
ef317cd5 12546
a4f16749 12547#: builtin/replace.c:24
cfff71a9
JX
12548msgid "git replace [--format=<format>] [-l [<pattern>]]"
12549msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 12550
a4f16749 12551#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
6acbf033
JX
12552#, c-format
12553msgid "Not a valid object name: '%s'"
12554msgstr "不是一个有效的对象名:'%s'"
12555
a4f16749 12556#: builtin/replace.c:361
6acbf033
JX
12557#, c-format
12558msgid "bad mergetag in commit '%s'"
55a16ee4 12559msgstr "提交 '%s' 中含有损坏的合并标签"
6acbf033 12560
a4f16749 12561#: builtin/replace.c:363
6acbf033
JX
12562#, c-format
12563msgid "malformed mergetag in commit '%s'"
55a16ee4 12564msgstr "提交 '%s' 中含有非法的合并标签"
6acbf033 12565
a4f16749 12566#: builtin/replace.c:374
6acbf033
JX
12567#, c-format
12568msgid ""
12569"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
12570"instead of --graft"
55a16ee4 12571msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
6acbf033 12572
a4f16749 12573#: builtin/replace.c:407
6acbf033
JX
12574#, c-format
12575msgid "the original commit '%s' has a gpg signature."
12576msgstr "原始提交 '%s' 中包含一个 GPG 签名"
12577
a4f16749 12578#: builtin/replace.c:408
6acbf033
JX
12579msgid "the signature will be removed in the replacement commit!"
12580msgstr "在替换的提交中签名将被移除!"
12581
a4f16749 12582#: builtin/replace.c:414
6acbf033
JX
12583#, c-format
12584msgid "could not write replacement commit for: '%s'"
12585msgstr "不能为 '%s' 写替换提交"
12586
a4f16749 12587#: builtin/replace.c:438
ef317cd5 12588msgid "list replace refs"
07432cef 12589msgstr "列出替换的引用"
ef317cd5 12590
a4f16749 12591#: builtin/replace.c:439
ef317cd5 12592msgid "delete replace refs"
07432cef 12593msgstr "删除替换的引用"
ef317cd5 12594
a4f16749 12595#: builtin/replace.c:440
6acbf033
JX
12596msgid "edit existing object"
12597msgstr "编辑现存的对象"
12598
a4f16749 12599#: builtin/replace.c:441
6acbf033
JX
12600msgid "change a commit's parents"
12601msgstr "修改一个提交的父提交"
12602
a4f16749 12603#: builtin/replace.c:442
ef317cd5 12604msgid "replace the ref if it exists"
07432cef 12605msgstr "如果存在则替换引用"
ef317cd5 12606
a4f16749 12607#: builtin/replace.c:443
6acbf033
JX
12608msgid "do not pretty-print contents for --edit"
12609msgstr "不要为 --edit 操作美观显示内容"
12610
a4f16749 12611#: builtin/replace.c:444
cfff71a9
JX
12612msgid "use this format"
12613msgstr "使用此格式"
12614
a4f16749 12615#: builtin/rerere.c:13
814ff314
JX
12616msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
12617msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
ef317cd5 12618
a4f16749 12619#: builtin/rerere.c:59
ef317cd5 12620msgid "register clean resolutions in index"
07432cef 12621msgstr "在索引中注册干净的解决方案"
ef317cd5 12622
a4f16749 12623#: builtin/reset.c:29
ef317cd5
JX
12624msgid ""
12625"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 12626msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5 12627
a4f16749 12628#: builtin/reset.c:30
a0b6b246
JX
12629msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
12630msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
ef317cd5 12631
a4f16749 12632#: builtin/reset.c:31
07432cef
WS
12633msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
12634msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 12635
a4f16749 12636#: builtin/reset.c:37
c04f5ac3
JX
12637msgid "mixed"
12638msgstr "混杂"
12639
a4f16749 12640#: builtin/reset.c:37
c04f5ac3
JX
12641msgid "soft"
12642msgstr "软性"
12643
a4f16749 12644#: builtin/reset.c:37
c04f5ac3
JX
12645msgid "hard"
12646msgstr "硬性"
12647
a4f16749 12648#: builtin/reset.c:37
8ada9598
JX
12649msgid "merge"
12650msgstr "合并"
12651
a4f16749 12652#: builtin/reset.c:37
c04f5ac3
JX
12653msgid "keep"
12654msgstr "保持"
12655
6937cb4e 12656#: builtin/reset.c:78
c04f5ac3
JX
12657msgid "You do not have a valid HEAD."
12658msgstr "您没有一个有效的 HEAD。"
12659
6937cb4e 12660#: builtin/reset.c:80
c04f5ac3
JX
12661msgid "Failed to find tree of HEAD."
12662msgstr "无法找到 HEAD 指向的树。"
12663
6937cb4e 12664#: builtin/reset.c:86
c04f5ac3
JX
12665#, c-format
12666msgid "Failed to find tree of %s."
12667msgstr "无法找到 %s 指向的树。"
12668
6937cb4e 12669#: builtin/reset.c:113
c04f5ac3
JX
12670#, c-format
12671msgid "HEAD is now at %s"
12672msgstr "HEAD 现在位于 %s"
12673
90e6ef53 12674# 译者:汉字之间无空格,故删除%s前后空格
6937cb4e 12675#: builtin/reset.c:197
c04f5ac3
JX
12676#, c-format
12677msgid "Cannot do a %s reset in the middle of a merge."
12678msgstr "在合并过程中不能做%s重置操作。"
12679
6937cb4e 12680#: builtin/reset.c:297
ef317cd5 12681msgid "be quiet, only report errors"
07432cef 12682msgstr "安静模式,只报告错误"
ef317cd5 12683
6937cb4e 12684#: builtin/reset.c:299
ef317cd5 12685msgid "reset HEAD and index"
07432cef 12686msgstr "重置 HEAD 和索引"
ef317cd5 12687
6937cb4e 12688#: builtin/reset.c:300
ef317cd5 12689msgid "reset only HEAD"
07432cef 12690msgstr "只重置 HEAD"
ef317cd5 12691
6937cb4e 12692#: builtin/reset.c:302 builtin/reset.c:304
ef317cd5 12693msgid "reset HEAD, index and working tree"
07432cef 12694msgstr "重置 HEAD、索引和工作区"
ef317cd5 12695
6937cb4e 12696#: builtin/reset.c:306
ef317cd5 12697msgid "reset HEAD but keep local changes"
07432cef 12698msgstr "重置 HEAD 但保存本地变更"
ef317cd5 12699
6937cb4e 12700#: builtin/reset.c:312
6c94aba5
JX
12701msgid "record only the fact that removed paths will be added later"
12702msgstr "将删除的路径标记为稍后添加"
12703
6937cb4e 12704#: builtin/reset.c:329
07432cef
WS
12705#, c-format
12706msgid "Failed to resolve '%s' as a valid revision."
12707msgstr "无法将 '%s' 解析为一个有效的版本。"
12708
6937cb4e 12709#: builtin/reset.c:337
07432cef
WS
12710#, c-format
12711msgid "Failed to resolve '%s' as a valid tree."
12712msgstr "无法将 '%s' 解析为一个有效的树对象。"
12713
6937cb4e 12714#: builtin/reset.c:346
c04f5ac3 12715msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 12716msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 12717
6937cb4e 12718#: builtin/reset.c:355
c04f5ac3 12719msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
d9d56b23 12720msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
c04f5ac3 12721
90e6ef53 12722# 译者:汉字之间无空格,故删除%s前后空格
6937cb4e 12723#: builtin/reset.c:357
c04f5ac3
JX
12724#, c-format
12725msgid "Cannot do %s reset with paths."
12726msgstr "不能带路径进行%s重置。"
12727
90e6ef53 12728# 译者:汉字之间无空格,故删除%s前后空格
6937cb4e 12729#: builtin/reset.c:367
c04f5ac3
JX
12730#, c-format
12731msgid "%s reset is not allowed in a bare repository"
160fb2b2 12732msgstr "不能对纯仓库进行%s重置"
c04f5ac3 12733
6937cb4e 12734#: builtin/reset.c:371
6c94aba5
JX
12735msgid "-N can only be used with --mixed"
12736msgstr "-N 只能和 --mixed 同时使用"
12737
6937cb4e 12738#: builtin/reset.c:388
90314792 12739msgid "Unstaged changes after reset:"
160fb2b2 12740msgstr "重置后取消暂存的变更:"
90314792 12741
6937cb4e 12742#: builtin/reset.c:394
ef317cd5
JX
12743#, c-format
12744msgid "Could not reset index file to revision '%s'."
12745msgstr "不能重置索引文件至版本 '%s'。"
12746
6937cb4e 12747#: builtin/reset.c:398
07432cef
WS
12748msgid "Could not write new index file."
12749msgstr "不能写入新的索引文件。"
12750
6937cb4e 12751#: builtin/rev-list.c:361
1b7f4a34
JX
12752msgid "rev-list does not support display of notes"
12753msgstr "rev-list 不支持显示注解"
12754
6937cb4e 12755#: builtin/rev-parse.c:402
814ff314
JX
12756msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
12757msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
ef317cd5 12758
6937cb4e 12759#: builtin/rev-parse.c:407
ef317cd5 12760msgid "keep the `--` passed as an arg"
07432cef 12761msgstr "保持 `--` 作为一个参数传递"
ef317cd5 12762
6937cb4e 12763#: builtin/rev-parse.c:409
ef317cd5 12764msgid "stop parsing after the first non-option argument"
07432cef 12765msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 12766
6937cb4e 12767#: builtin/rev-parse.c:412
cfff71a9
JX
12768msgid "output in stuck long form"
12769msgstr "以固定长格式输出"
12770
6937cb4e 12771#: builtin/rev-parse.c:545
ef317cd5 12772msgid ""
814ff314 12773"git rev-parse --parseopt [<options>] -- [<args>...]\n"
ef317cd5 12774" or: git rev-parse --sq-quote [<arg>...]\n"
814ff314 12775" or: git rev-parse [<options>] [<arg>...]\n"
ef317cd5
JX
12776"\n"
12777"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
12778msgstr ""
814ff314 12779"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
90314792 12780" 或者:git rev-parse --sq-quote [<参数>...]\n"
814ff314 12781" 或者:git rev-parse [<选项>] [<参数>...]\n"
07432cef
WS
12782"\n"
12783"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5 12784
a4f16749 12785#: builtin/revert.c:23
814ff314
JX
12786msgid "git revert [<options>] <commit-ish>..."
12787msgstr "git revert [<选项>] <提交号>..."
ef317cd5 12788
a4f16749 12789#: builtin/revert.c:24
ef317cd5 12790msgid "git revert <subcommand>"
07432cef 12791msgstr "git revert <子命令>"
ef317cd5 12792
a4f16749 12793#: builtin/revert.c:29
814ff314
JX
12794msgid "git cherry-pick [<options>] <commit-ish>..."
12795msgstr "git cherry-pick [<选项>] <提交号>..."
ef317cd5 12796
a4f16749 12797#: builtin/revert.c:30
ef317cd5 12798msgid "git cherry-pick <subcommand>"
07432cef 12799msgstr "git cherry-pick <子命令>"
ef317cd5 12800
a4f16749 12801#: builtin/revert.c:90
ef317cd5
JX
12802#, c-format
12803msgid "%s: %s cannot be used with %s"
12804msgstr "%s:%s 不能和 %s 同时使用"
12805
a4f16749 12806#: builtin/revert.c:99
ef317cd5 12807msgid "end revert or cherry-pick sequence"
07432cef 12808msgstr "终止反转或拣选操作"
ef317cd5 12809
a4f16749 12810#: builtin/revert.c:100
ef317cd5 12811msgid "resume revert or cherry-pick sequence"
07432cef 12812msgstr "继续反转或拣选操作"
ef317cd5 12813
a4f16749 12814#: builtin/revert.c:101
ef317cd5 12815msgid "cancel revert or cherry-pick sequence"
07432cef 12816msgstr "取消反转或拣选操作"
ef317cd5 12817
a4f16749 12818#: builtin/revert.c:102
ef317cd5 12819msgid "don't automatically commit"
07432cef 12820msgstr "不要自动提交"
ef317cd5 12821
a4f16749 12822#: builtin/revert.c:103
ef317cd5 12823msgid "edit the commit message"
07432cef 12824msgstr "编辑提交说明"
ef317cd5 12825
a4f16749 12826#: builtin/revert.c:106
87cb7997 12827msgid "parent-number"
07432cef 12828msgstr "父编号"
ef317cd5 12829
a4f16749 12830#: builtin/revert.c:107
87cb7997
JX
12831msgid "select mainline parent"
12832msgstr "选择主干父提交编号"
12833
a4f16749 12834#: builtin/revert.c:109
ef317cd5 12835msgid "merge strategy"
07432cef 12836msgstr "合并策略"
ef317cd5 12837
a4f16749 12838#: builtin/revert.c:110
ef317cd5 12839msgid "option"
07432cef 12840msgstr "选项"
ef317cd5 12841
a4f16749 12842#: builtin/revert.c:111
ef317cd5 12843msgid "option for merge strategy"
07432cef 12844msgstr "合并策略的选项"
ef317cd5 12845
a4f16749 12846#: builtin/revert.c:120
ef317cd5 12847msgid "append commit name"
07432cef 12848msgstr "追加提交名称"
ef317cd5 12849
a4f16749 12850#: builtin/revert.c:122
ef317cd5 12851msgid "preserve initially empty commits"
07432cef 12852msgstr "保留初始化的空提交"
ef317cd5 12853
a4f16749 12854#: builtin/revert.c:123
ef317cd5 12855msgid "allow commits with empty messages"
07432cef 12856msgstr "允许提交说明为空"
c04f5ac3 12857
a4f16749 12858#: builtin/revert.c:124
ef317cd5 12859msgid "keep redundant, empty commits"
07432cef 12860msgstr "保持多余的、空的提交"
ef317cd5 12861
6937cb4e 12862#: builtin/revert.c:214
c04f5ac3
JX
12863msgid "revert failed"
12864msgstr "还原失败"
12865
6937cb4e 12866#: builtin/revert.c:227
c04f5ac3
JX
12867msgid "cherry-pick failed"
12868msgstr "拣选失败"
12869
a4f16749 12870#: builtin/rm.c:18
814ff314
JX
12871msgid "git rm [<options>] [--] <file>..."
12872msgstr "git rm [<选项>] [--] <文件>..."
07432cef 12873
a4f16749 12874#: builtin/rm.c:206
c04f5ac3 12875msgid ""
2e8451e8
JX
12876"the following file has staged content different from both the\n"
12877"file and the HEAD:"
12878msgid_plural ""
12879"the following files have staged content different from both the\n"
12880"file and the HEAD:"
12881msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
12882msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
12883
a4f16749 12884#: builtin/rm.c:211
2e8451e8
JX
12885msgid ""
12886"\n"
c04f5ac3
JX
12887"(use -f to force removal)"
12888msgstr ""
2e8451e8 12889"\n"
c04f5ac3
JX
12890"(使用 -f 强制删除)"
12891
a4f16749 12892#: builtin/rm.c:215
2e8451e8
JX
12893msgid "the following file has changes staged in the index:"
12894msgid_plural "the following files have changes staged in the index:"
160fb2b2
JX
12895msgstr[0] "下列文件索引中有变更"
12896msgstr[1] "下列文件索引中有变更"
c04f5ac3 12897
a4f16749 12898#: builtin/rm.c:219 builtin/rm.c:228
c04f5ac3 12899msgid ""
2e8451e8 12900"\n"
c04f5ac3
JX
12901"(use --cached to keep the file, or -f to force removal)"
12902msgstr ""
2e8451e8
JX
12903"\n"
12904"(使用 --cached 保留本地文件,或用 -f 强制删除)"
12905
a4f16749 12906#: builtin/rm.c:225
2e8451e8
JX
12907msgid "the following file has local modifications:"
12908msgid_plural "the following files have local modifications:"
12909msgstr[0] "如下文件有本地修改:"
12910msgstr[1] "如下文件有本地修改:"
c04f5ac3 12911
a4f16749 12912#: builtin/rm.c:243
ef317cd5 12913msgid "do not list removed files"
07432cef 12914msgstr "不列出删除的文件"
ef317cd5 12915
a4f16749 12916#: builtin/rm.c:244
ef317cd5 12917msgid "only remove from the index"
07432cef 12918msgstr "只从索引区删除"
ef317cd5 12919
a4f16749 12920#: builtin/rm.c:245
ef317cd5 12921msgid "override the up-to-date check"
07432cef 12922msgstr "忽略文件更新状态检查"
ef317cd5 12923
a4f16749 12924#: builtin/rm.c:246
ef317cd5 12925msgid "allow recursive removal"
07432cef 12926msgstr "允许递归删除"
ef317cd5 12927
a4f16749 12928#: builtin/rm.c:248
ef317cd5 12929msgid "exit with a zero status even if nothing matched"
07432cef 12930msgstr "即使没有匹配,也以零状态退出"
ef317cd5 12931
6937cb4e 12932#: builtin/rm.c:307
c04f5ac3
JX
12933#, c-format
12934msgid "not removing '%s' recursively without -r"
12935msgstr "未提供 -r 选项不会递归删除 '%s'"
12936
6937cb4e 12937#: builtin/rm.c:346
c04f5ac3
JX
12938#, c-format
12939msgid "git rm: unable to remove %s"
12940msgstr "git rm:不能删除 %s"
12941
6937cb4e 12942#: builtin/rm.c:369
1a79b2f1
JX
12943#, c-format
12944msgid "could not remove '%s'"
12945msgstr "无法删除 '%s'"
12946
a4f16749 12947#: builtin/send-pack.c:19
1b7f4a34
JX
12948msgid ""
12949"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
12950"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
12951"[<ref>...]\n"
12952" --all and explicit <ref> specification are mutually exclusive."
12953msgstr ""
12954"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
12955"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
12956" --all 和明确的 <引用> 互斥。"
12957
a4f16749 12958#: builtin/send-pack.c:162
1b7f4a34
JX
12959msgid "remote name"
12960msgstr "远程名称"
12961
a4f16749 12962#: builtin/send-pack.c:176
1b7f4a34
JX
12963msgid "use stateless RPC protocol"
12964msgstr "使用无状态的 RPC 协议"
12965
a4f16749 12966#: builtin/send-pack.c:177
1b7f4a34
JX
12967msgid "read refs from stdin"
12968msgstr "从标准输入读取引用"
12969
a4f16749 12970#: builtin/send-pack.c:178
1b7f4a34
JX
12971msgid "print status from remote helper"
12972msgstr "打印来自远程 helper 的状态"
12973
a4f16749 12974#: builtin/shortlog.c:14
814ff314 12975msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
4dcdc3d8 12976msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
ef317cd5 12977
6937cb4e 12978#: builtin/shortlog.c:263
1a79b2f1
JX
12979msgid "Group by committer rather than author"
12980msgstr "按照提交者分组而不是作者"
12981
6937cb4e 12982#: builtin/shortlog.c:265
ef317cd5 12983msgid "sort output according to the number of commits per author"
07432cef 12984msgstr "根据每个作者的提交数量排序"
ef317cd5 12985
6937cb4e 12986#: builtin/shortlog.c:267
ef317cd5 12987msgid "Suppress commit descriptions, only provides commit count"
07432cef 12988msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 12989
6937cb4e 12990#: builtin/shortlog.c:269
ef317cd5 12991msgid "Show the email address of each author"
07432cef 12992msgstr "显示每个作者的电子邮件地址"
ef317cd5 12993
6937cb4e 12994#: builtin/shortlog.c:270
ef317cd5 12995msgid "w[,i1[,i2]]"
07432cef 12996msgstr "w[,i1[,i2]]"
ef317cd5 12997
6937cb4e 12998#: builtin/shortlog.c:271
ef317cd5 12999msgid "Linewrap output"
07432cef 13000msgstr "折行输出"
ef317cd5 13001
a4f16749 13002#: builtin/show-branch.c:12
ef317cd5 13003msgid ""
814ff314 13004"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
13005"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
13006"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
13007"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
ef317cd5 13008msgstr ""
814ff314 13009"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
13010"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
13011"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
13012"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
ef317cd5 13013
a4f16749 13014#: builtin/show-branch.c:16
814ff314 13015msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
58b6f078 13016msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
ef317cd5 13017
a4f16749 13018#: builtin/show-branch.c:376
a0b6b246
JX
13019#, c-format
13020msgid "ignoring %s; cannot handle more than %d ref"
13021msgid_plural "ignoring %s; cannot handle more than %d refs"
13022msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
13023msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
13024
a4f16749 13025#: builtin/show-branch.c:530
a0b6b246
JX
13026#, c-format
13027msgid "no matching refs with %s"
13028msgstr "没有和 %s 匹配的引用"
13029
a4f16749 13030#: builtin/show-branch.c:626
ef317cd5 13031msgid "show remote-tracking and local branches"
07432cef 13032msgstr "显示远程跟踪的和本地的分支"
ef317cd5 13033
a4f16749 13034#: builtin/show-branch.c:628
ef317cd5 13035msgid "show remote-tracking branches"
07432cef 13036msgstr "显示远程跟踪的分支"
ef317cd5 13037
a4f16749 13038#: builtin/show-branch.c:630
ef317cd5 13039msgid "color '*!+-' corresponding to the branch"
07432cef 13040msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 13041
a4f16749 13042#: builtin/show-branch.c:632
ef317cd5 13043msgid "show <n> more commits after the common ancestor"
07432cef 13044msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 13045
a4f16749 13046#: builtin/show-branch.c:634
ef317cd5 13047msgid "synonym to more=-1"
07432cef 13048msgstr "和 more=-1 同义"
ef317cd5 13049
a4f16749 13050#: builtin/show-branch.c:635
ef317cd5 13051msgid "suppress naming strings"
07432cef 13052msgstr "不显示字符串命名"
ef317cd5 13053
a4f16749 13054#: builtin/show-branch.c:637
ef317cd5 13055msgid "include the current branch"
07432cef 13056msgstr "包括当前分支"
ef317cd5 13057
a4f16749 13058#: builtin/show-branch.c:639
ef317cd5 13059msgid "name commits with their object names"
07432cef 13060msgstr "以对象名字命名提交"
ef317cd5 13061
a4f16749 13062#: builtin/show-branch.c:641
ef317cd5 13063msgid "show possible merge bases"
07432cef 13064msgstr "显示可能合并的基线"
ef317cd5 13065
a4f16749 13066#: builtin/show-branch.c:643
ef317cd5 13067msgid "show refs unreachable from any other ref"
07432cef 13068msgstr "显示没有任何引用的的引用"
ef317cd5 13069
a4f16749 13070#: builtin/show-branch.c:645
ef317cd5 13071msgid "show commits in topological order"
07432cef 13072msgstr "以拓扑顺序显示提交"
ef317cd5 13073
a4f16749 13074#: builtin/show-branch.c:648
ef317cd5 13075msgid "show only commits not on the first branch"
07432cef 13076msgstr "只显示不在第一个分支上的提交"
ef317cd5 13077
a4f16749 13078#: builtin/show-branch.c:650
ef317cd5 13079msgid "show merges reachable from only one tip"
07432cef 13080msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 13081
a4f16749 13082#: builtin/show-branch.c:652
2e8451e8
JX
13083msgid "topologically sort, maintaining date order where possible"
13084msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 13085
a4f16749 13086#: builtin/show-branch.c:655
ef317cd5 13087msgid "<n>[,<base>]"
07432cef 13088msgstr "<n>[,<base>]"
ef317cd5 13089
a4f16749 13090#: builtin/show-branch.c:656
ef317cd5 13091msgid "show <n> most recent ref-log entries starting at base"
58b6f078 13092msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
ef317cd5 13093
a4f16749 13094#: builtin/show-branch.c:690
a0b6b246
JX
13095msgid ""
13096"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
13097msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
13098
a4f16749 13099#: builtin/show-branch.c:714
a0b6b246
JX
13100msgid "no branches given, and HEAD is not valid"
13101msgstr "未提供分支,且 HEAD 无效"
13102
a4f16749 13103#: builtin/show-branch.c:717
a0b6b246
JX
13104msgid "--reflog option needs one branch name"
13105msgstr "选项 --reflog 需要一个分支名"
13106
a4f16749 13107#: builtin/show-branch.c:720
a0b6b246
JX
13108#, c-format
13109msgid "only %d entry can be shown at one time."
13110msgid_plural "only %d entries can be shown at one time."
13111msgstr[0] "一次只能显示 %d 个条目。"
13112msgstr[1] "一次只能显示 %d 个条目。"
13113
a4f16749 13114#: builtin/show-branch.c:724
a0b6b246
JX
13115#, c-format
13116msgid "no such ref %s"
13117msgstr "无此引用 %s"
13118
a4f16749 13119#: builtin/show-branch.c:808
a0b6b246
JX
13120#, c-format
13121msgid "cannot handle more than %d rev."
13122msgid_plural "cannot handle more than %d revs."
13123msgstr[0] "不能处理 %d 个以上的版本。"
13124msgstr[1] "不能处理 %d 个以上的版本。"
13125
a4f16749 13126#: builtin/show-branch.c:812
a0b6b246
JX
13127#, c-format
13128msgid "'%s' is not a valid ref."
13129msgstr "'%s' 不是一个有效的引用。"
13130
a4f16749 13131#: builtin/show-branch.c:815
a0b6b246
JX
13132#, c-format
13133msgid "cannot find commit %s (%s)"
29004bbb 13134msgstr "不能找到提交 %s(%s)"
a0b6b246 13135
ef317cd5
JX
13136#: builtin/show-ref.c:10
13137msgid ""
814ff314
JX
13138"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
13139"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
ef317cd5 13140msgstr ""
814ff314
JX
13141"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
13142"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
ef317cd5
JX
13143
13144#: builtin/show-ref.c:11
94550ed3
JX
13145msgid "git show-ref --exclude-existing[=<pattern>]"
13146msgstr "git show-ref --exclude-existing[=<模式>]"
ef317cd5 13147
1a79b2f1 13148#: builtin/show-ref.c:159
ef317cd5 13149msgid "only show tags (can be combined with heads)"
55a16ee4 13150msgstr "只显示标签(可以和头共用)"
ef317cd5 13151
1a79b2f1 13152#: builtin/show-ref.c:160
ef317cd5 13153msgid "only show heads (can be combined with tags)"
55a16ee4 13154msgstr "只显示头(可以和标签共用)"
ef317cd5 13155
1a79b2f1 13156#: builtin/show-ref.c:161
ef317cd5 13157msgid "stricter reference checking, requires exact ref path"
07432cef 13158msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 13159
1a79b2f1 13160#: builtin/show-ref.c:164 builtin/show-ref.c:166
2e8451e8
JX
13161msgid "show the HEAD reference, even if it would be filtered out"
13162msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 13163
1a79b2f1 13164#: builtin/show-ref.c:168
ef317cd5 13165msgid "dereference tags into object IDs"
4375c10e 13166msgstr "转换标签到对象 ID"
ef317cd5 13167
1a79b2f1 13168#: builtin/show-ref.c:170
ef317cd5 13169msgid "only show SHA1 hash using <n> digits"
07432cef 13170msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
ef317cd5 13171
1a79b2f1 13172#: builtin/show-ref.c:174
ef317cd5 13173msgid "do not print results to stdout (useful with --verify)"
07432cef 13174msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
ef317cd5 13175
1a79b2f1 13176#: builtin/show-ref.c:176
ef317cd5 13177msgid "show refs from stdin that aren't in local repository"
160fb2b2 13178msgstr "显示从标准输入中读入的不在本地仓库中的引用"
ef317cd5 13179
a4f16749 13180#: builtin/stripspace.c:18
94550ed3
JX
13181msgid "git stripspace [-s | --strip-comments]"
13182msgstr "git stripspace [-s | --strip-comments]"
13183
a4f16749 13184#: builtin/stripspace.c:19
94550ed3
JX
13185msgid "git stripspace [-c | --comment-lines]"
13186msgstr "git stripspace [-c | --comment-lines]"
13187
a4f16749 13188#: builtin/stripspace.c:36
94550ed3
JX
13189msgid "skip and remove all lines starting with comment character"
13190msgstr "跳过和移除所有的注释行"
13191
a4f16749 13192#: builtin/stripspace.c:39
276ceeaa 13193msgid "prepend comment character and space to each line"
94550ed3
JX
13194msgstr "为每一行的行首添加注释符和空格"
13195
6937cb4e 13196#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
5b04ee3b
JX
13197#, c-format
13198msgid "No such ref: %s"
13199msgstr "没有这样的引用:%s"
13200
6937cb4e 13201#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
5b04ee3b
JX
13202#, c-format
13203msgid "Expecting a full ref name, got %s"
13204msgstr "期望一个完整的引用名称,却得到 %s"
13205
6937cb4e 13206#: builtin/submodule--helper.c:71
5b04ee3b
JX
13207#, c-format
13208msgid "cannot strip one component off url '%s'"
13209msgstr "无法从 url '%s' 剥离一个组件"
13210
6937cb4e 13211#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
94550ed3
JX
13212msgid "alternative anchor for relative paths"
13213msgstr "相对路径的替代锚记(anchor)"
13214
6937cb4e 13215#: builtin/submodule--helper.c:307
94550ed3
JX
13216msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
13217msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
13218
6937cb4e 13219#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
5b04ee3b
JX
13220#, c-format
13221msgid "No url found for submodule path '%s' in .gitmodules"
13222msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
13223
6937cb4e 13224#: builtin/submodule--helper.c:389
87cb7997
JX
13225#, c-format
13226msgid ""
13227"could not lookup configuration '%s'. Assuming this repository is its own "
13228"authoritative upstream."
13229msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
13230
6937cb4e 13231#: builtin/submodule--helper.c:400
5b04ee3b
JX
13232#, c-format
13233msgid "Failed to register url for submodule path '%s'"
13234msgstr "无法为子模组 '%s' 注册 url"
13235
6937cb4e 13236#: builtin/submodule--helper.c:404
5b04ee3b
JX
13237#, c-format
13238msgid "Submodule '%s' (%s) registered for path '%s'\n"
aef18cc6 13239msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
5b04ee3b
JX
13240
13241#
6937cb4e 13242#: builtin/submodule--helper.c:414
aef18cc6 13243#, c-format
5b04ee3b 13244msgid "warning: command update mode suggested for submodule '%s'\n"
aef18cc6 13245msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
5b04ee3b 13246
6937cb4e 13247#: builtin/submodule--helper.c:421
5b04ee3b
JX
13248#, c-format
13249msgid "Failed to register update mode for submodule path '%s'"
13250msgstr "无法为子模组 '%s' 注册更新模式"
13251
6937cb4e 13252#: builtin/submodule--helper.c:437
5b04ee3b
JX
13253msgid "Suppress output for initializing a submodule"
13254msgstr "初始化子模组时抑制输出"
13255
6937cb4e 13256#: builtin/submodule--helper.c:442
5b04ee3b
JX
13257msgid "git submodule--helper init [<path>]"
13258msgstr "git submodule--helper init [<路径>]"
13259
6937cb4e 13260#: builtin/submodule--helper.c:470
94550ed3
JX
13261msgid "git submodule--helper name <path>"
13262msgstr "git submodule--helper name <路径>"
13263
6937cb4e 13264#: builtin/submodule--helper.c:475
94550ed3
JX
13265#, c-format
13266msgid "no submodule mapping found in .gitmodules for path '%s'"
13267msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
13268
6937cb4e 13269#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
a0b6b246
JX
13270#, c-format
13271msgid "submodule '%s' cannot add alternate: %s"
13272msgstr "子模组 '%s' 不能添加仓库备选:%s"
13273
6937cb4e 13274#: builtin/submodule--helper.c:597
a0b6b246
JX
13275#, c-format
13276msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
13277msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
13278
6937cb4e 13279#: builtin/submodule--helper.c:604
a0b6b246
JX
13280#, c-format
13281msgid "Value '%s' for submodule.alternateLocation is not recognized"
13282msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
13283
6937cb4e 13284#: builtin/submodule--helper.c:626
94550ed3
JX
13285msgid "where the new submodule will be cloned to"
13286msgstr "新的子模组将要克隆的路径"
13287
6937cb4e 13288#: builtin/submodule--helper.c:629
94550ed3
JX
13289msgid "name of the new submodule"
13290msgstr "新子模组的名称"
13291
6937cb4e 13292#: builtin/submodule--helper.c:632
94550ed3
JX
13293msgid "url where to clone the submodule from"
13294msgstr "克隆子模组的 url 地址"
13295
6937cb4e 13296#: builtin/submodule--helper.c:638
94550ed3
JX
13297msgid "depth for shallow clones"
13298msgstr "浅克隆的深度"
13299
6937cb4e 13300#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
a0b6b246 13301msgid "force cloning progress"
29004bbb 13302msgstr "强制显示克隆进度"
a0b6b246 13303
6937cb4e 13304#: builtin/submodule--helper.c:646
94550ed3
JX
13305msgid ""
13306"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
5b04ee3b 13307"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
5c57d762
JX
13308msgstr ""
13309"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
13310"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
94550ed3 13311
6937cb4e 13312#: builtin/submodule--helper.c:677
94550ed3
JX
13313#, c-format
13314msgid "clone of '%s' into submodule path '%s' failed"
13315msgstr "无法克隆 '%s' 到子模组路径 '%s'"
13316
6937cb4e 13317#: builtin/submodule--helper.c:692
94550ed3
JX
13318#, c-format
13319msgid "could not get submodule directory for '%s'"
13320msgstr "无法得到 '%s' 的子模组目录"
13321
6937cb4e 13322#: builtin/submodule--helper.c:757
5b04ee3b
JX
13323#, c-format
13324msgid "Submodule path '%s' not initialized"
13325msgstr "子模组 '%s' 尚未初始化"
13326
6937cb4e 13327#: builtin/submodule--helper.c:761
5b04ee3b
JX
13328msgid "Maybe you want to use 'update --init'?"
13329msgstr "也许您想要执行 'update --init'?"
13330
6937cb4e 13331#: builtin/submodule--helper.c:790
5b04ee3b
JX
13332#, c-format
13333msgid "Skipping unmerged submodule %s"
13334msgstr "略过未合并的子模组 %s"
13335
6937cb4e 13336#: builtin/submodule--helper.c:819
5b04ee3b
JX
13337#, c-format
13338msgid "Skipping submodule '%s'"
13339msgstr "略过子模组 '%s'"
13340
6937cb4e 13341#: builtin/submodule--helper.c:952
5c57d762
JX
13342#, c-format
13343msgid "Failed to clone '%s'. Retry scheduled"
13344msgstr "克隆 '%s' 失败。按计划重试"
13345
6937cb4e 13346#: builtin/submodule--helper.c:963
5c57d762
JX
13347#, c-format
13348msgid "Failed to clone '%s' a second time, aborting"
13349msgstr "第二次尝试克隆 '%s' 失败,退出"
13350
6937cb4e 13351#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
5b04ee3b
JX
13352msgid "path into the working tree"
13353msgstr "到工作区的路径"
13354
6937cb4e 13355#: builtin/submodule--helper.c:996
5b04ee3b
JX
13356msgid "path into the working tree, across nested submodule boundaries"
13357msgstr "工作区中的路径,递归嵌套子模组"
13358
6937cb4e 13359#: builtin/submodule--helper.c:1000
5b04ee3b
JX
13360msgid "rebase, merge, checkout or none"
13361msgstr "rebase、merge、checkout 或 none"
13362
6937cb4e 13363#: builtin/submodule--helper.c:1004
5b04ee3b
JX
13364msgid "Create a shallow clone truncated to the specified number of revisions"
13365msgstr "创建一个指定深度的浅克隆"
13366
6937cb4e 13367#: builtin/submodule--helper.c:1007
5b04ee3b
JX
13368msgid "parallel jobs"
13369msgstr "并发任务"
13370
6937cb4e 13371#: builtin/submodule--helper.c:1009
5c57d762 13372msgid "whether the initial clone should follow the shallow recommendation"
9a4b694c 13373msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
5c57d762 13374
6937cb4e 13375#: builtin/submodule--helper.c:1010
5b04ee3b
JX
13376msgid "don't print cloning progress"
13377msgstr "不要输出克隆进度"
94550ed3 13378
6937cb4e 13379#: builtin/submodule--helper.c:1017
5b04ee3b
JX
13380msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
13381msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
13382
6937cb4e 13383#: builtin/submodule--helper.c:1030
5b04ee3b
JX
13384msgid "bad value for update parameter"
13385msgstr "update 参数取值错误"
13386
6937cb4e 13387#: builtin/submodule--helper.c:1098
5c57d762
JX
13388#, c-format
13389msgid ""
13390"Submodule (%s) branch configured to inherit branch from superproject, but "
13391"the superproject is not on any branch"
13392msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
13393
6937cb4e 13394#: builtin/submodule--helper.c:1214
1a79b2f1
JX
13395msgid "recurse into submodules"
13396msgstr "在子模组中递归"
13397
6937cb4e 13398#: builtin/submodule--helper.c:1220
1a79b2f1
JX
13399msgid "git submodule--helper embed-git-dir [<path>...]"
13400msgstr "git submodule--helper embed-git-dir [<路径>...]"
13401
6937cb4e 13402#: builtin/submodule--helper.c:1278
1a79b2f1
JX
13403#, c-format
13404msgid "%s doesn't support --super-prefix"
13405msgstr "%s 不支持 --super-prefix"
13406
6937cb4e 13407#: builtin/submodule--helper.c:1284
94550ed3 13408#, c-format
5b04ee3b
JX
13409msgid "'%s' is not a valid submodule--helper subcommand"
13410msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
94550ed3 13411
a4f16749 13412#: builtin/symbolic-ref.c:8
814ff314
JX
13413msgid "git symbolic-ref [<options>] <name> [<ref>]"
13414msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
07432cef 13415
a4f16749 13416#: builtin/symbolic-ref.c:9
814ff314
JX
13417msgid "git symbolic-ref -d [-q] <name>"
13418msgstr "git symbolic-ref -d [-q] <名称>"
ef317cd5 13419
6937cb4e 13420#: builtin/symbolic-ref.c:40
ef317cd5 13421msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
13422msgstr "不显示非符号(分离的)引用的错误信息"
13423
6937cb4e 13424#: builtin/symbolic-ref.c:41
07432cef
WS
13425msgid "delete symbolic ref"
13426msgstr "删除符号引用"
ef317cd5 13427
6937cb4e 13428#: builtin/symbolic-ref.c:42
ef317cd5 13429msgid "shorten ref output"
6937cb4e 13430msgstr "缩短引用输出"
ef317cd5 13431
6937cb4e 13432#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
ef317cd5 13433msgid "reason"
07432cef 13434msgstr "原因"
ef317cd5 13435
6937cb4e 13436#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
ef317cd5 13437msgid "reason of the update"
07432cef 13438msgstr "更新的原因"
ef317cd5 13439
a4f16749 13440#: builtin/tag.c:24
ef317cd5 13441msgid ""
814ff314
JX
13442"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
13443"[<head>]"
13444msgstr ""
13445"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
ef317cd5 13446
a4f16749 13447#: builtin/tag.c:25
ef317cd5 13448msgid "git tag -d <tagname>..."
07432cef 13449msgstr "git tag -d <标签名>..."
ef317cd5 13450
a4f16749 13451#: builtin/tag.c:26
ef317cd5 13452msgid ""
87cb7997
JX
13453"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
13454"points-at <object>]\n"
94550ed3 13455"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
ef317cd5 13456msgstr ""
87cb7997
JX
13457"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
13458"at <对象>]\n"
94550ed3 13459"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
ef317cd5 13460
a4f16749 13461#: builtin/tag.c:28
1a79b2f1
JX
13462msgid "git tag -v [--format=<format>] <tagname>..."
13463msgstr "git tag -v [--format=<格式>] <标签名>..."
ef317cd5 13464
6937cb4e 13465#: builtin/tag.c:86
c04f5ac3
JX
13466#, c-format
13467msgid "tag '%s' not found."
55a16ee4 13468msgstr "未发现标签 '%s'。"
c04f5ac3 13469
6937cb4e 13470#: builtin/tag.c:102
c04f5ac3
JX
13471#, c-format
13472msgid "Deleted tag '%s' (was %s)\n"
55a16ee4 13473msgstr "已删除标签 '%s'(曾为 %s)\n"
c04f5ac3 13474
6937cb4e 13475#: builtin/tag.c:131
a77c07d9 13476#, c-format
c04f5ac3
JX
13477msgid ""
13478"\n"
6acbf033
JX
13479"Write a message for tag:\n"
13480" %s\n"
a77c07d9 13481"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
13482msgstr ""
13483"\n"
55a16ee4 13484"输入一个标签说明:\n"
6acbf033 13485" %s\n"
a77c07d9 13486"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 13487
6937cb4e 13488#: builtin/tag.c:135
a77c07d9 13489#, c-format
c04f5ac3
JX
13490msgid ""
13491"\n"
6acbf033
JX
13492"Write a message for tag:\n"
13493" %s\n"
a77c07d9 13494"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 13495"want to.\n"
c04f5ac3
JX
13496msgstr ""
13497"\n"
55a16ee4 13498"输入一个标签说明:\n"
6acbf033 13499" %s\n"
a77c07d9 13500"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 13501
6937cb4e 13502#: builtin/tag.c:189
c04f5ac3 13503msgid "unable to sign the tag"
55a16ee4 13504msgstr "无法签署标签"
c04f5ac3 13505
6937cb4e 13506#: builtin/tag.c:191
c04f5ac3 13507msgid "unable to write tag file"
55a16ee4 13508msgstr "无法写标签文件"
c04f5ac3 13509
6937cb4e 13510#: builtin/tag.c:215
c04f5ac3 13511msgid "bad object type."
90e6ef53 13512msgstr "坏的对象类型。"
c04f5ac3 13513
6937cb4e 13514#: builtin/tag.c:261
c04f5ac3 13515msgid "no tag message?"
55a16ee4 13516msgstr "无标签说明?"
c04f5ac3 13517
6937cb4e 13518#: builtin/tag.c:268
c04f5ac3
JX
13519#, c-format
13520msgid "The tag message has been left in %s\n"
55a16ee4 13521msgstr "标签说明被保留在 %s\n"
c04f5ac3 13522
6937cb4e 13523#: builtin/tag.c:376
ef317cd5 13524msgid "list tag names"
55a16ee4 13525msgstr "列出标签名称"
ef317cd5 13526
6937cb4e 13527#: builtin/tag.c:378
ef317cd5 13528msgid "print <n> lines of each tag message"
55a16ee4 13529msgstr "每个标签信息打印 <n> 行"
ef317cd5 13530
6937cb4e 13531#: builtin/tag.c:380
ef317cd5 13532msgid "delete tags"
55a16ee4 13533msgstr "删除标签"
ef317cd5 13534
6937cb4e 13535#: builtin/tag.c:381
ef317cd5 13536msgid "verify tags"
55a16ee4 13537msgstr "验证标签"
ef317cd5 13538
6937cb4e 13539#: builtin/tag.c:383
ef317cd5 13540msgid "Tag creation options"
55a16ee4 13541msgstr "标签创建选项"
ef317cd5 13542
6937cb4e 13543#: builtin/tag.c:385
ef317cd5 13544msgid "annotated tag, needs a message"
55a16ee4 13545msgstr "附注标签,需要一个说明"
ef317cd5 13546
6937cb4e 13547#: builtin/tag.c:387
ef317cd5 13548msgid "tag message"
55a16ee4 13549msgstr "标签说明"
ef317cd5 13550
6937cb4e 13551#: builtin/tag.c:389
ef317cd5 13552msgid "annotated and GPG-signed tag"
55a16ee4 13553msgstr "附注并附加 GPG 签名的标签"
ef317cd5 13554
6937cb4e 13555#: builtin/tag.c:393
ef317cd5 13556msgid "use another key to sign the tag"
55a16ee4 13557msgstr "使用另外的私钥签名该标签"
ef317cd5 13558
6937cb4e 13559#: builtin/tag.c:394
ef317cd5 13560msgid "replace the tag if exists"
55a16ee4 13561msgstr "如果存在,替换现有的标签"
ef317cd5 13562
6937cb4e 13563#: builtin/tag.c:395 builtin/update-ref.c:368
03ea3327 13564msgid "create a reflog"
1b7f4a34
JX
13565msgstr "创建引用日志"
13566
6937cb4e 13567#: builtin/tag.c:397
814ff314 13568msgid "Tag listing options"
55a16ee4 13569msgstr "标签列表选项"
814ff314 13570
6937cb4e 13571#: builtin/tag.c:398
ef317cd5 13572msgid "show tag list in columns"
55a16ee4 13573msgstr "以列的方式显示标签列表"
ef317cd5 13574
6937cb4e 13575#: builtin/tag.c:399 builtin/tag.c:401
ef317cd5 13576msgid "print only tags that contain the commit"
87cb7997 13577msgstr "只打印包含该提交的标签"
ef317cd5 13578
6937cb4e 13579#: builtin/tag.c:400 builtin/tag.c:402
87cb7997
JX
13580msgid "print only tags that don't contain the commit"
13581msgstr "只打印不包含该提交的标签"
13582
6937cb4e 13583#: builtin/tag.c:403
94550ed3
JX
13584msgid "print only tags that are merged"
13585msgstr "只打印已经合并的标签"
13586
6937cb4e 13587#: builtin/tag.c:404
94550ed3
JX
13588msgid "print only tags that are not merged"
13589msgstr "只打印尚未合并的标签"
13590
6937cb4e 13591#: builtin/tag.c:409
ef317cd5 13592msgid "print only tags of the object"
87cb7997 13593msgstr "只打印指向该对象的标签"
ef317cd5 13594
6937cb4e 13595#: builtin/tag.c:453
8ada9598 13596msgid "--column and -n are incompatible"
81809b99 13597msgstr "--column 和 -n 不兼容"
8ada9598 13598
6937cb4e 13599#: builtin/tag.c:475
87cb7997
JX
13600msgid "-n option is only allowed in list mode"
13601msgstr "-n 选项只允许用在列表显示模式"
c04f5ac3 13602
6937cb4e 13603#: builtin/tag.c:477
87cb7997
JX
13604msgid "--contains option is only allowed in list mode"
13605msgstr "--contains 选项只允许用在列表显示模式"
c04f5ac3 13606
6937cb4e 13607#: builtin/tag.c:479
87cb7997
JX
13608msgid "--no-contains option is only allowed in list mode"
13609msgstr "--no-contains 选项只允许用在列表显示模式"
7ac1c0ad 13610
6937cb4e 13611#: builtin/tag.c:481
87cb7997
JX
13612msgid "--points-at option is only allowed in list mode"
13613msgstr "--points-at 选项只允许用在列表显示模式"
94550ed3 13614
6937cb4e 13615#: builtin/tag.c:483
87cb7997
JX
13616msgid "--merged and --no-merged options are only allowed in list mode"
13617msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
13618
6937cb4e 13619#: builtin/tag.c:494
c04f5ac3
JX
13620msgid "only one -F or -m option is allowed."
13621msgstr "只允许一个 -F 或 -m 选项。"
13622
6937cb4e 13623#: builtin/tag.c:513
c04f5ac3
JX
13624msgid "too many params"
13625msgstr "太多参数"
13626
6937cb4e 13627#: builtin/tag.c:519
c04f5ac3
JX
13628#, c-format
13629msgid "'%s' is not a valid tag name."
55a16ee4 13630msgstr "'%s' 不是一个有效的标签名称。"
c04f5ac3 13631
6937cb4e 13632#: builtin/tag.c:524
c04f5ac3
JX
13633#, c-format
13634msgid "tag '%s' already exists"
55a16ee4 13635msgstr "标签 '%s' 已存在"
c04f5ac3 13636
6937cb4e 13637#: builtin/tag.c:554
c04f5ac3
JX
13638#, c-format
13639msgid "Updated tag '%s' (was %s)\n"
55a16ee4 13640msgstr "已更新标签 '%s'(曾为 %s)\n"
c04f5ac3 13641
a4f16749 13642#: builtin/unpack-objects.c:494
6c94aba5
JX
13643msgid "Unpacking objects"
13644msgstr "展开对象中"
13645
a4f16749 13646#: builtin/update-index.c:80
7aea43ff
JX
13647#, c-format
13648msgid "failed to create directory %s"
13649msgstr "无法创建目录 %s"
13650
a4f16749 13651#: builtin/update-index.c:86
7aea43ff
JX
13652#, c-format
13653msgid "failed to stat %s"
65e2041e 13654msgstr "对 %s 调用 stat 失败"
7aea43ff 13655
a4f16749 13656#: builtin/update-index.c:96
7aea43ff
JX
13657#, c-format
13658msgid "failed to create file %s"
13659msgstr "无法创建文件 %s"
13660
a4f16749 13661#: builtin/update-index.c:104
7aea43ff
JX
13662#, c-format
13663msgid "failed to delete file %s"
13664msgstr "无法删除文件 %s"
13665
a4f16749 13666#: builtin/update-index.c:111 builtin/update-index.c:217
7aea43ff
JX
13667#, c-format
13668msgid "failed to delete directory %s"
13669msgstr "无法删除目录 %s"
13670
a4f16749 13671#: builtin/update-index.c:136
7aea43ff 13672#, c-format
276ceeaa
JX
13673msgid "Testing mtime in '%s' "
13674msgstr "在 '%s' 中测试 mtime "
7aea43ff 13675
a4f16749 13676#: builtin/update-index.c:150
7aea43ff
JX
13677msgid "directory stat info does not change after adding a new file"
13678msgstr "添加一个新文件后,目录的状态信息未改变"
13679
a4f16749 13680#: builtin/update-index.c:163
7aea43ff
JX
13681msgid "directory stat info does not change after adding a new directory"
13682msgstr "添加一个新目录后,目录的状态信息未改变"
13683
a4f16749 13684#: builtin/update-index.c:176
7aea43ff
JX
13685msgid "directory stat info changes after updating a file"
13686msgstr "更新一个文件后,目录的状态信息被修改"
13687
a4f16749 13688#: builtin/update-index.c:187
7aea43ff
JX
13689msgid "directory stat info changes after adding a file inside subdirectory"
13690msgstr "在子目录中添加文件后,目录的状态信息被修改"
13691
a4f16749 13692#: builtin/update-index.c:198
7aea43ff
JX
13693msgid "directory stat info does not change after deleting a file"
13694msgstr "删除一个文件后,目录的状态信息未改变"
13695
a4f16749 13696#: builtin/update-index.c:211
7aea43ff
JX
13697msgid "directory stat info does not change after deleting a directory"
13698msgstr "删除一个目录后,目录的状态信息未改变"
13699
a4f16749 13700#: builtin/update-index.c:218
7aea43ff
JX
13701msgid " OK"
13702msgstr " OK"
13703
6937cb4e 13704#: builtin/update-index.c:571
814ff314
JX
13705msgid "git update-index [<options>] [--] [<file>...]"
13706msgstr "git update-index [<选项>] [--] [<文件>...]"
8ada9598 13707
6937cb4e 13708#: builtin/update-index.c:926
ef317cd5 13709msgid "continue refresh even when index needs update"
07432cef 13710msgstr "当索引需要更新时继续刷新"
8ada9598 13711
6937cb4e 13712#: builtin/update-index.c:929
ef317cd5 13713msgid "refresh: ignore submodules"
07432cef 13714msgstr "刷新:忽略子模组"
8ada9598 13715
6937cb4e 13716#: builtin/update-index.c:932
ef317cd5 13717msgid "do not ignore new files"
07432cef 13718msgstr "不忽略新的文件"
8ada9598 13719
6937cb4e 13720#: builtin/update-index.c:934
ef317cd5 13721msgid "let files replace directories and vice-versa"
07432cef 13722msgstr "让文件替换目录(反之亦然)"
ef317cd5 13723
6937cb4e 13724#: builtin/update-index.c:936
ef317cd5 13725msgid "notice files missing from worktree"
07432cef 13726msgstr "通知文件从工作区丢失"
ef317cd5 13727
6937cb4e 13728#: builtin/update-index.c:938
ef317cd5 13729msgid "refresh even if index contains unmerged entries"
07432cef 13730msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 13731
6937cb4e 13732#: builtin/update-index.c:941
ef317cd5 13733msgid "refresh stat information"
07432cef 13734msgstr "刷新统计信息"
ef317cd5 13735
6937cb4e 13736#: builtin/update-index.c:945
ef317cd5 13737msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 13738msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 13739
6937cb4e 13740#: builtin/update-index.c:949
6c94aba5 13741msgid "<mode>,<object>,<path>"
d9d56b23 13742msgstr "<存取模式>,<对象>,<路径>"
ef317cd5 13743
6937cb4e 13744#: builtin/update-index.c:950
ef317cd5 13745msgid "add the specified entry to the index"
07432cef 13746msgstr "添加指定的条目到索引区"
ef317cd5 13747
6937cb4e 13748#: builtin/update-index.c:959
ef317cd5 13749msgid "mark files as \"not changing\""
07432cef 13750msgstr "把文件标记为 \"没有变更\""
ef317cd5 13751
6937cb4e 13752#: builtin/update-index.c:962
ef317cd5 13753msgid "clear assumed-unchanged bit"
07432cef 13754msgstr "清除 assumed-unchanged 位"
ef317cd5 13755
6937cb4e 13756#: builtin/update-index.c:965
ef317cd5 13757msgid "mark files as \"index-only\""
07432cef 13758msgstr "把文件标记为 \"仅索引\""
ef317cd5 13759
6937cb4e 13760#: builtin/update-index.c:968
ef317cd5 13761msgid "clear skip-worktree bit"
07432cef 13762msgstr "清除 skip-worktree 位"
ef317cd5 13763
6937cb4e 13764#: builtin/update-index.c:971
ef317cd5 13765msgid "add to index only; do not add content to object database"
07432cef 13766msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 13767
6937cb4e 13768#: builtin/update-index.c:973
ef317cd5 13769msgid "remove named paths even if present in worktree"
07432cef 13770msgstr "即使存在工作区里,也删除路径"
ef317cd5 13771
6937cb4e 13772#: builtin/update-index.c:975
ef317cd5 13773msgid "with --stdin: input lines are terminated by null bytes"
07432cef 13774msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 13775
6937cb4e 13776#: builtin/update-index.c:977
ef317cd5 13777msgid "read list of paths to be updated from standard input"
07432cef 13778msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 13779
6937cb4e 13780#: builtin/update-index.c:981
ef317cd5 13781msgid "add entries from standard input to the index"
07432cef 13782msgstr "从标准输入添加条目到索引区"
ef317cd5 13783
6937cb4e 13784#: builtin/update-index.c:985
ef317cd5 13785msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 13786msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 13787
6937cb4e 13788#: builtin/update-index.c:989
ef317cd5 13789msgid "only update entries that differ from HEAD"
07432cef 13790msgstr "只更新与 HEAD 不同的条目"
ef317cd5 13791
6937cb4e 13792#: builtin/update-index.c:993
ef317cd5 13793msgid "ignore files missing from worktree"
07432cef 13794msgstr "忽略工作区丢失的文件"
ef317cd5 13795
6937cb4e 13796#: builtin/update-index.c:996
ef317cd5 13797msgid "report actions to standard output"
07432cef 13798msgstr "在标准输出显示操作"
ef317cd5 13799
6937cb4e 13800#: builtin/update-index.c:998
ef317cd5 13801msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 13802msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 13803
6937cb4e 13804#: builtin/update-index.c:1002
ef317cd5 13805msgid "write index in this format"
07432cef 13806msgstr "以这种格式写入索引区"
ef317cd5 13807
6937cb4e 13808#: builtin/update-index.c:1004
6acbf033
JX
13809msgid "enable or disable split index"
13810msgstr "启用或禁用索引拆分"
13811
6937cb4e 13812#: builtin/update-index.c:1006
7aea43ff
JX
13813msgid "enable/disable untracked cache"
13814msgstr "启用/禁用对未跟踪文件的缓存"
13815
6937cb4e 13816#: builtin/update-index.c:1008
276ceeaa
JX
13817msgid "test if the filesystem supports untracked cache"
13818msgstr "测试文件系统是否支持未跟踪文件缓存"
13819
6937cb4e 13820#: builtin/update-index.c:1010
7aea43ff
JX
13821msgid "enable untracked cache without testing the filesystem"
13822msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
13823
6937cb4e 13824#: builtin/update-index.c:1107
87cb7997
JX
13825msgid ""
13826"core.splitIndex is set to false; remove or change it, if you really want to "
13827"enable split index"
13828msgstr ""
13829"core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。"
13830
6937cb4e 13831#: builtin/update-index.c:1116
87cb7997
JX
13832msgid ""
13833"core.splitIndex is set to true; remove or change it, if you really want to "
13834"disable split index"
13835msgstr ""
13836"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。"
13837
6937cb4e 13838#: builtin/update-index.c:1127
a0b6b246
JX
13839msgid ""
13840"core.untrackedCache is set to true; remove or change it, if you really want "
13841"to disable the untracked cache"
275588f9
JX
13842msgstr ""
13843"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
13844"改它。"
a0b6b246 13845
6937cb4e 13846#: builtin/update-index.c:1131
276ceeaa
JX
13847msgid "Untracked cache disabled"
13848msgstr "缓存未跟踪文件被禁用"
13849
6937cb4e 13850#: builtin/update-index.c:1139
a0b6b246
JX
13851msgid ""
13852"core.untrackedCache is set to false; remove or change it, if you really want "
13853"to enable the untracked cache"
275588f9
JX
13854msgstr ""
13855"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
13856"修改它。"
a0b6b246 13857
6937cb4e 13858#: builtin/update-index.c:1143
276ceeaa
JX
13859#, c-format
13860msgid "Untracked cache enabled for '%s'"
13861msgstr "缓存未跟踪文件在 '%s' 启用"
13862
a4f16749 13863#: builtin/update-ref.c:10
814ff314
JX
13864msgid "git update-ref [<options>] -d <refname> [<old-val>]"
13865msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
ef317cd5 13866
a4f16749 13867#: builtin/update-ref.c:11
814ff314
JX
13868msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
13869msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
90314792 13870
a4f16749 13871#: builtin/update-ref.c:12
814ff314
JX
13872msgid "git update-ref [<options>] --stdin [-z]"
13873msgstr "git update-ref [<选项>] --stdin [-z]"
ef317cd5 13874
6937cb4e 13875#: builtin/update-ref.c:363
ef317cd5 13876msgid "delete the reference"
07432cef 13877msgstr "删除引用"
ef317cd5 13878
6937cb4e 13879#: builtin/update-ref.c:365
ef317cd5 13880msgid "update <refname> not the one it points to"
07432cef 13881msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 13882
6937cb4e 13883#: builtin/update-ref.c:366
90314792
JX
13884msgid "stdin has NUL-terminated arguments"
13885msgstr "标准输入有以 NUL 字符终止的参数"
13886
6937cb4e 13887#: builtin/update-ref.c:367
90314792
JX
13888msgid "read updates from stdin"
13889msgstr "从标准输入读取更新"
13890
a4f16749 13891#: builtin/update-server-info.c:7
ef317cd5 13892msgid "git update-server-info [--force]"
07432cef 13893msgstr "git update-server-info [--force]"
ef317cd5 13894
a4f16749 13895#: builtin/update-server-info.c:15
ef317cd5 13896msgid "update the info files from scratch"
07432cef 13897msgstr "从头开始更新文件信息"
ef317cd5 13898
a4f16749 13899#: builtin/verify-commit.c:18
814ff314
JX
13900msgid "git verify-commit [-v | --verbose] <commit>..."
13901msgstr "git verify-commit [-v | --verbose] <提交>..."
6acbf033 13902
a4f16749 13903#: builtin/verify-commit.c:73
6acbf033
JX
13904msgid "print commit contents"
13905msgstr "打印提交内容"
13906
a4f16749 13907#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
1b7f4a34
JX
13908msgid "print raw gpg status output"
13909msgstr "打印原始 gpg 状态输出"
13910
a4f16749 13911#: builtin/verify-pack.c:55
814ff314
JX
13912msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
13913msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
ef317cd5 13914
a4f16749 13915#: builtin/verify-pack.c:65
ef317cd5
JX
13916msgid "verbose"
13917msgstr "冗长输出"
13918
a4f16749 13919#: builtin/verify-pack.c:67
ef317cd5 13920msgid "show statistics only"
07432cef 13921msgstr "只显示统计"
ef317cd5 13922
a4f16749 13923#: builtin/verify-tag.c:19
1a79b2f1
JX
13924msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
13925msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
ef317cd5 13926
a4f16749 13927#: builtin/verify-tag.c:37
ef317cd5 13928msgid "print tag contents"
55a16ee4 13929msgstr "打印标签内容"
ef317cd5 13930
a4f16749 13931#: builtin/worktree.c:16
94550ed3
JX
13932msgid "git worktree add [<options>] <path> [<branch>]"
13933msgstr "git worktree add [<选项>] <路径> [<分支>]"
5bb01d4f 13934
a4f16749 13935#: builtin/worktree.c:17
5c57d762
JX
13936msgid "git worktree list [<options>]"
13937msgstr "git worktree list [<选项>]"
13938
a4f16749 13939#: builtin/worktree.c:18
5c57d762
JX
13940msgid "git worktree lock [<options>] <path>"
13941msgstr "git worktree lock [<选项>] <路径>"
13942
a4f16749 13943#: builtin/worktree.c:19
5bb01d4f
JX
13944msgid "git worktree prune [<options>]"
13945msgstr "git worktree prune [<选项>]"
13946
a4f16749 13947#: builtin/worktree.c:20
5c57d762
JX
13948msgid "git worktree unlock <path>"
13949msgstr "git worktree unlock <路径>"
94550ed3 13950
6937cb4e 13951#: builtin/worktree.c:46
5bb01d4f
JX
13952#, c-format
13953msgid "Removing worktrees/%s: not a valid directory"
13954msgstr "删除工作区/%s:不是一个有效的目录"
13955
6937cb4e 13956#: builtin/worktree.c:52
5bb01d4f
JX
13957#, c-format
13958msgid "Removing worktrees/%s: gitdir file does not exist"
13959msgstr "删除 worktrees/%s:gitdir 文件不存在"
13960
6937cb4e 13961#: builtin/worktree.c:57 builtin/worktree.c:66
5bb01d4f
JX
13962#, c-format
13963msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
13964msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
13965
6937cb4e
JX
13966#: builtin/worktree.c:76
13967#, c-format
13968msgid ""
13969"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
13970"%<PRIuMAX>)"
13971msgstr "删除工作树/%s:读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)"
13972
13973#: builtin/worktree.c:84
5bb01d4f
JX
13974#, c-format
13975msgid "Removing worktrees/%s: invalid gitdir file"
13976msgstr "删除 worktrees/%s:无效的 gitdir 文件"
13977
6937cb4e 13978#: builtin/worktree.c:100
5bb01d4f
JX
13979#, c-format
13980msgid "Removing worktrees/%s: gitdir file points to non-existent location"
13981msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
13982
6937cb4e 13983#: builtin/worktree.c:147
1a79b2f1
JX
13984msgid "report pruned working trees"
13985msgstr "报告清除的工作区"
13986
6937cb4e 13987#: builtin/worktree.c:149
1a79b2f1 13988msgid "expire working trees older than <time>"
58b6f078 13989msgstr "将早于 <时间> 的工作区过期"
1a79b2f1 13990
6937cb4e 13991#: builtin/worktree.c:223
5bb01d4f
JX
13992#, c-format
13993msgid "'%s' already exists"
13994msgstr "'%s' 已经存在"
13995
6937cb4e 13996#: builtin/worktree.c:254
5bb01d4f
JX
13997#, c-format
13998msgid "could not create directory of '%s'"
13999msgstr "不能创建目录 '%s'"
14000
6937cb4e 14001#: builtin/worktree.c:293
5bb01d4f 14002#, c-format
1b7f4a34 14003msgid "Preparing %s (identifier %s)"
29004bbb 14004msgstr "准备 %s(标识符 %s)"
5bb01d4f 14005
6937cb4e 14006#: builtin/worktree.c:345
5bb01d4f 14007msgid "checkout <branch> even if already checked out in other worktree"
58b6f078 14008msgstr "检出 <分支>,即使已经被检出到其它工作区"
5bb01d4f 14009
6937cb4e 14010#: builtin/worktree.c:347
5bb01d4f
JX
14011msgid "create a new branch"
14012msgstr "创建一个新分支"
14013
6937cb4e 14014#: builtin/worktree.c:349
5bb01d4f
JX
14015msgid "create or reset a branch"
14016msgstr "创建或重置一个分支"
14017
6937cb4e 14018#: builtin/worktree.c:351
5b04ee3b
JX
14019msgid "populate the new working tree"
14020msgstr "生成新的工作区"
14021
6937cb4e 14022#: builtin/worktree.c:352
60638e98
JX
14023msgid "keep the new working tree locked"
14024msgstr "锁定新工作区"
14025
6937cb4e 14026#: builtin/worktree.c:360
1b7f4a34
JX
14027msgid "-b, -B, and --detach are mutually exclusive"
14028msgstr "-b、-B 和 --detach 是互斥的"
5bb01d4f 14029
6937cb4e 14030#: builtin/worktree.c:499
5c57d762
JX
14031msgid "reason for locking"
14032msgstr "锁定原因"
14033
6937cb4e 14034#: builtin/worktree.c:511 builtin/worktree.c:544
5c57d762
JX
14035#, c-format
14036msgid "'%s' is not a working tree"
14037msgstr "'%s' 不是一个工作区"
14038
6937cb4e 14039#: builtin/worktree.c:513 builtin/worktree.c:546
5c57d762
JX
14040msgid "The main working tree cannot be locked or unlocked"
14041msgstr "主工作区无法被加锁或解锁"
14042
6937cb4e 14043#: builtin/worktree.c:518
5c57d762
JX
14044#, c-format
14045msgid "'%s' is already locked, reason: %s"
14046msgstr "'%s' 已被锁定,原因:%s"
14047
6937cb4e 14048#: builtin/worktree.c:520
5c57d762
JX
14049#, c-format
14050msgid "'%s' is already locked"
14051msgstr "'%s' 已被锁定"
14052
6937cb4e 14053#: builtin/worktree.c:548
5c57d762
JX
14054#, c-format
14055msgid "'%s' is not locked"
14056msgstr "'%s' 未被锁定"
14057
a4f16749 14058#: builtin/write-tree.c:14
ef317cd5 14059msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 14060msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5 14061
a4f16749 14062#: builtin/write-tree.c:27
ef317cd5 14063msgid "<prefix>/"
07432cef 14064msgstr "<前缀>/"
ef317cd5 14065
a4f16749 14066#: builtin/write-tree.c:28
ef317cd5 14067msgid "write tree object for a subdirectory <prefix>"
07432cef 14068msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5 14069
a4f16749 14070#: builtin/write-tree.c:31
ef317cd5 14071msgid "only useful for debugging"
07432cef 14072msgstr "只对调试有用"
ef317cd5 14073
a4f16749 14074#: upload-pack.c:23
5c57d762
JX
14075msgid "git upload-pack [<options>] <dir>"
14076msgstr "git upload-pack [<选项>] <目录>"
14077
6937cb4e 14078#: upload-pack.c:1040
5c57d762
JX
14079msgid "quit after a single request/response exchange"
14080msgstr "在一次单独的请求/响应(request/response)交换后退出"
14081
6937cb4e 14082#: upload-pack.c:1042
5c57d762
JX
14083msgid "exit immediately after initial ref advertisement"
14084msgstr "在初始的引用广告后立即退出"
14085
6937cb4e 14086#: upload-pack.c:1044
5c57d762 14087msgid "do not try <directory>/.git/ if <directory> is no Git directory"
58b6f078 14088msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/"
5c57d762 14089
6937cb4e 14090#: upload-pack.c:1046
5c57d762
JX
14091msgid "interrupt transfer after <n> seconds of inactivity"
14092msgstr "不活动 <n> 秒钟后终止传输"
14093
6937cb4e 14094#: credential-cache--daemon.c:222
a0b6b246
JX
14095#, c-format
14096msgid ""
14097"The permissions on your socket directory are too loose; other\n"
14098"users may be able to read your cached credentials. Consider running:\n"
14099"\n"
14100"\tchmod 0700 %s"
14101msgstr ""
1a79b2f1
JX
14102"您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
14103"行:\n"
a0b6b246
JX
14104"\n"
14105"\tchmod 0700 %s"
14106
6937cb4e 14107#: credential-cache--daemon.c:271
220c313c
JX
14108msgid "print debugging messages to stderr"
14109msgstr "调试信息输出到标准错误"
14110
a4f16749 14111#: git.c:15
4dcdc3d8 14112msgid ""
220c313c 14113"'git help -a' and 'git help -g' list available subcommands and some\n"
4dcdc3d8
JX
14114"concept guides. See 'git help <command>' or 'git help <concept>'\n"
14115"to read about a specific subcommand or concept."
14116msgstr ""
220c313c
JX
14117"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
14118"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
14119"帮助。"
8ada9598 14120
6937cb4e 14121#: http.c:338
60638e98
JX
14122#, c-format
14123msgid "negative value for http.postbuffer; defaulting to %d"
14124msgstr "http.postbuffer 为负值,默认为 %d"
14125
6937cb4e 14126#: http.c:359
a0b6b246
JX
14127msgid "Delegation control is not supported with cURL < 7.22.0"
14128msgstr "当 cURL < 7.22.0 时,不支持委托控制"
14129
6937cb4e 14130#: http.c:368
276ceeaa
JX
14131msgid "Public key pinning not supported with cURL < 7.44.0"
14132msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
14133
6937cb4e 14134#: http.c:1768
1a79b2f1
JX
14135#, c-format
14136msgid ""
14137"unable to update url base from redirection:\n"
14138" asked for: %s\n"
14139" redirect: %s"
14140msgstr ""
14141"不能更新重定向的 url base:\n"
14142" 请求:%s\n"
14143" 重定向:%s"
14144
a4f16749 14145#: remote-curl.c:324
1a79b2f1
JX
14146#, c-format
14147msgid "redirecting to %s"
14148msgstr "重定向到 %s"
14149
1b7f4a34 14150#: common-cmds.h:9
7aea43ff
JX
14151msgid "start a working area (see also: git help tutorial)"
14152msgstr "开始一个工作区(参见:git help tutorial)"
14153
1b7f4a34 14154#: common-cmds.h:10
7aea43ff
JX
14155msgid "work on the current change (see also: git help everyday)"
14156msgstr "在当前变更上工作(参见:git help everyday)"
14157
1b7f4a34 14158#: common-cmds.h:11
7aea43ff
JX
14159msgid "examine the history and state (see also: git help revisions)"
14160msgstr "检查历史和状态(参见:git help revisions)"
14161
1b7f4a34 14162#: common-cmds.h:12
7aea43ff
JX
14163msgid "grow, mark and tweak your common history"
14164msgstr "扩展、标记和调校您的历史记录"
14165
1b7f4a34 14166#: common-cmds.h:13
7aea43ff
JX
14167msgid "collaborate (see also: git help workflows)"
14168msgstr "协同(参见:git help workflows)"
14169
1b7f4a34 14170#: common-cmds.h:17
8ada9598 14171msgid "Add file contents to the index"
81809b99 14172msgstr "添加文件内容至索引"
8ada9598 14173
1b7f4a34
JX
14174#: common-cmds.h:18
14175msgid "Use binary search to find the commit that introduced a bug"
14176msgstr "通过二分查找定位引入 bug 的提交"
8ada9598 14177
1b7f4a34 14178#: common-cmds.h:19
8ada9598 14179msgid "List, create, or delete branches"
81809b99 14180msgstr "列出、创建或删除分支"
8ada9598 14181
1b7f4a34 14182#: common-cmds.h:20
5bb01d4f
JX
14183msgid "Switch branches or restore working tree files"
14184msgstr "切换分支或恢复工作区文件"
8ada9598 14185
1b7f4a34 14186#: common-cmds.h:21
8ada9598 14187msgid "Clone a repository into a new directory"
160fb2b2 14188msgstr "克隆一个仓库到一个新目录"
8ada9598 14189
1b7f4a34 14190#: common-cmds.h:22
8ada9598 14191msgid "Record changes to the repository"
160fb2b2 14192msgstr "记录变更到仓库"
8ada9598 14193
1b7f4a34 14194#: common-cmds.h:23
8ada9598 14195msgid "Show changes between commits, commit and working tree, etc"
81809b99 14196msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598 14197
1b7f4a34 14198#: common-cmds.h:24
8ada9598 14199msgid "Download objects and refs from another repository"
160fb2b2 14200msgstr "从另外一个仓库下载对象和引用"
8ada9598 14201
1b7f4a34 14202#: common-cmds.h:25
8ada9598 14203msgid "Print lines matching a pattern"
81809b99 14204msgstr "输出和模式匹配的行"
8ada9598 14205
1b7f4a34 14206#: common-cmds.h:26
a77c07d9 14207msgid "Create an empty Git repository or reinitialize an existing one"
160fb2b2 14208msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
8ada9598 14209
1b7f4a34 14210#: common-cmds.h:27
8ada9598 14211msgid "Show commit logs"
81809b99 14212msgstr "显示提交日志"
8ada9598 14213
1b7f4a34 14214#: common-cmds.h:28
8ada9598 14215msgid "Join two or more development histories together"
81809b99 14216msgstr "合并两个或更多开发历史"
8ada9598 14217
1b7f4a34 14218#: common-cmds.h:29
8ada9598 14219msgid "Move or rename a file, a directory, or a symlink"
81809b99 14220msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598 14221
1b7f4a34 14222#: common-cmds.h:30
2e8451e8 14223msgid "Fetch from and integrate with another repository or a local branch"
160fb2b2 14224msgstr "获取并整合另外的仓库或一个本地分支"
8ada9598 14225
1b7f4a34 14226#: common-cmds.h:31
8ada9598 14227msgid "Update remote refs along with associated objects"
81809b99 14228msgstr "更新远程引用和相关的对象"
8ada9598 14229
1b7f4a34 14230#: common-cmds.h:32
3495628d
JX
14231msgid "Reapply commits on top of another base tip"
14232msgstr "在另一个分支上重新应用提交"
8ada9598 14233
1b7f4a34 14234#: common-cmds.h:33
8ada9598 14235msgid "Reset current HEAD to the specified state"
4375c10e 14236msgstr "重置当前 HEAD 到指定状态"
8ada9598 14237
1b7f4a34 14238#: common-cmds.h:34
8ada9598 14239msgid "Remove files from the working tree and from the index"
81809b99 14240msgstr "从工作区和索引中删除文件"
8ada9598 14241
1b7f4a34 14242#: common-cmds.h:35
8ada9598 14243msgid "Show various types of objects"
81809b99 14244msgstr "显示各种类型的对象"
8ada9598 14245
1b7f4a34 14246#: common-cmds.h:36
8ada9598 14247msgid "Show the working tree status"
81809b99 14248msgstr "显示工作区状态"
8ada9598 14249
1b7f4a34 14250#: common-cmds.h:37
8ada9598 14251msgid "Create, list, delete or verify a tag object signed with GPG"
4375c10e 14252msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
8ada9598 14253
1b7f4a34 14254#: parse-options.h:145
220c313c
JX
14255msgid "expiry-date"
14256msgstr "到期时间"
14257
1b7f4a34 14258#: parse-options.h:160
220c313c
JX
14259msgid "no-op (backward compatibility)"
14260msgstr "空操作(向后兼容)"
14261
a0b6b246 14262#: parse-options.h:238
220c313c
JX
14263msgid "be more verbose"
14264msgstr "更加详细"
14265
a0b6b246 14266#: parse-options.h:240
220c313c
JX
14267msgid "be more quiet"
14268msgstr "更加安静"
14269
a0b6b246 14270#: parse-options.h:246
220c313c
JX
14271msgid "use <n> digits to display SHA-1s"
14272msgstr "用 <n> 位数字显示 SHA-1 哈希值"
14273
5b04ee3b 14274#: rerere.h:40
220c313c
JX
14275msgid "update the index with reused conflict resolution if possible"
14276msgstr "如果可能,重用冲突解决更新索引"
14277
5c57d762 14278#: git-bisect.sh:54
b694fbb1
JX
14279msgid "You need to start by \"git bisect start\""
14280msgstr "您需要执行 \"git bisect start\" 来开始"
14281
90e6ef53 14282# 译者:注意保持句尾空格
c04f5ac3
JX
14283#. TRANSLATORS: Make sure to include [Y] and [n] in your
14284#. translation. The program will only accept English input
14285#. at this point.
5c57d762 14286#: git-bisect.sh:60
c04f5ac3
JX
14287msgid "Do you want me to do it for you [Y/n]? "
14288msgstr "您想让我为您这样做么[Y/n]? "
14289
5c57d762 14290#: git-bisect.sh:121
c04f5ac3
JX
14291#, sh-format
14292msgid "unrecognised option: '$arg'"
81809b99 14293msgstr "未能识别的选项:'$arg'"
c04f5ac3 14294
5c57d762 14295#: git-bisect.sh:125
c04f5ac3
JX
14296#, sh-format
14297msgid "'$arg' does not appear to be a valid revision"
14298msgstr "'$arg' 看起来不像是一个有效的版本"
14299
5c57d762 14300#: git-bisect.sh:154
c04f5ac3
JX
14301msgid "Bad HEAD - I need a HEAD"
14302msgstr "坏的 HEAD - 我需要一个 HEAD"
14303
5c57d762 14304#: git-bisect.sh:167
c04f5ac3
JX
14305#, sh-format
14306msgid ""
814ff314 14307"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
d9d56b23 14308msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
c04f5ac3 14309
5c57d762 14310#: git-bisect.sh:177
cfff71a9
JX
14311msgid "won't bisect on cg-seek'ed tree"
14312msgstr "不会在做了 cg-seek 的树上做二分查找"
c04f5ac3 14313
5c57d762 14314#: git-bisect.sh:181
c04f5ac3 14315msgid "Bad HEAD - strange symbolic ref"
90e6ef53 14316msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3 14317
5c57d762 14318#: git-bisect.sh:233
c04f5ac3
JX
14319#, sh-format
14320msgid "Bad bisect_write argument: $state"
90e6ef53 14321msgstr "坏的 bisect_write 参数:$state"
c04f5ac3 14322
5c57d762 14323#: git-bisect.sh:262
c04f5ac3
JX
14324#, sh-format
14325msgid "Bad rev input: $arg"
9a4b694c 14326msgstr "坏的输入版本:$arg"
c04f5ac3 14327
5c57d762
JX
14328#: git-bisect.sh:281
14329#, sh-format
14330msgid "Bad rev input: $bisected_head"
9a4b694c 14331msgstr "坏的输入版本:$bisected_head"
c04f5ac3 14332
94550ed3 14333#: git-bisect.sh:290
c04f5ac3
JX
14334#, sh-format
14335msgid "Bad rev input: $rev"
9a4b694c 14336msgstr "坏的输入版本:$rev"
c04f5ac3 14337
94550ed3 14338#: git-bisect.sh:299
1b7f4a34
JX
14339#, sh-format
14340msgid "'git bisect $TERM_BAD' can take only one argument."
14341msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
14342
94550ed3 14343#: git-bisect.sh:322
1b7f4a34
JX
14344#, sh-format
14345msgid "Warning: bisecting only with a $TERM_BAD commit."
14346msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
b694fbb1 14347
90e6ef53 14348# 译者:注意保持句尾空格
c04f5ac3
JX
14349#. TRANSLATORS: Make sure to include [Y] and [n] in your
14350#. translation. The program will only accept English input
14351#. at this point.
94550ed3 14352#: git-bisect.sh:328
c04f5ac3
JX
14353msgid "Are you sure [Y/n]? "
14354msgstr "您确认么[Y/n]? "
14355
94550ed3 14356#: git-bisect.sh:340
1b7f4a34 14357#, sh-format
b694fbb1 14358msgid ""
1b7f4a34
JX
14359"You need to give me at least one $bad_syn and one $good_syn revision.\n"
14360"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
b694fbb1
JX
14361msgstr ""
14362"您需要给我至少一个好版本和一个坏版本。\n"
1b7f4a34 14363"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
b694fbb1 14364
94550ed3 14365#: git-bisect.sh:343
1b7f4a34 14366#, sh-format
b694fbb1
JX
14367msgid ""
14368"You need to start by \"git bisect start\".\n"
1b7f4a34
JX
14369"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
14370"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
b694fbb1
JX
14371msgstr ""
14372"您需要执行 \"git bisect start\" 来开始。\n"
14373"然后需要提供我至少一个好版本和一个坏版本。\n"
1b7f4a34 14374"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
b694fbb1 14375
94550ed3 14376#: git-bisect.sh:414 git-bisect.sh:546
b694fbb1
JX
14377msgid "We are not bisecting."
14378msgstr "我们没有在二分查找。"
14379
94550ed3 14380#: git-bisect.sh:421
c04f5ac3
JX
14381#, sh-format
14382msgid "'$invalid' is not a valid commit"
14383msgstr "'$invalid' 不是一个有效的提交"
14384
94550ed3 14385#: git-bisect.sh:430
c04f5ac3
JX
14386#, sh-format
14387msgid ""
14388"Could not check out original HEAD '$branch'.\n"
14389"Try 'git bisect reset <commit>'."
14390msgstr ""
14391"不能检出原始 HEAD '$branch'。\n"
07432cef 14392"尝试 'git bisect reset <提交>'。"
c04f5ac3 14393
94550ed3 14394#: git-bisect.sh:458
c04f5ac3
JX
14395msgid "No logfile given"
14396msgstr "未提供日志文件"
14397
94550ed3 14398#: git-bisect.sh:459
c04f5ac3
JX
14399#, sh-format
14400msgid "cannot read $file for replaying"
14401msgstr "不能读取 $file 来重放"
14402
94550ed3 14403#: git-bisect.sh:480
c04f5ac3
JX
14404msgid "?? what are you talking about?"
14405msgstr "?? 您在说什么?"
14406
94550ed3 14407#: git-bisect.sh:492
b694fbb1
JX
14408#, sh-format
14409msgid "running $command"
14410msgstr "运行 $command"
14411
94550ed3 14412#: git-bisect.sh:499
b694fbb1
JX
14413#, sh-format
14414msgid ""
14415"bisect run failed:\n"
14416"exit code $res from '$command' is < 0 or >= 128"
14417msgstr ""
14418"二分查找运行失败:\n"
07432cef 14419"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 14420
94550ed3 14421#: git-bisect.sh:525
b694fbb1
JX
14422msgid "bisect run cannot continue any more"
14423msgstr "二分查找不能继续运行"
14424
94550ed3 14425#: git-bisect.sh:531
b694fbb1
JX
14426#, sh-format
14427msgid ""
14428"bisect run failed:\n"
14429"'bisect_state $state' exited with error code $res"
14430msgstr ""
14431"二分查找运行失败:\n"
14432"'bisect_state $state' 退出码为 $res"
14433
94550ed3 14434#: git-bisect.sh:538
b694fbb1
JX
14435msgid "bisect run success"
14436msgstr "二分查找运行成功"
c04f5ac3 14437
94550ed3
JX
14438#: git-bisect.sh:565
14439msgid "please use two different terms"
14440msgstr "请使用两个不同的术语"
14441
14442#: git-bisect.sh:575
14443#, sh-format
14444msgid "'$term' is not a valid term"
14445msgstr "'$term' 不是一个有效的名称"
14446
14447#: git-bisect.sh:578
14448#, sh-format
14449msgid "can't use the builtin command '$term' as a term"
14450msgstr "不能使用内置命令 '$term' 作为术语"
14451
14452#: git-bisect.sh:587 git-bisect.sh:593
14453#, sh-format
14454msgid "can't change the meaning of term '$term'"
14455msgstr "不能修改术语 '$term' 的含义"
14456
14457#: git-bisect.sh:606
b694fbb1 14458#, sh-format
1b7f4a34
JX
14459msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
14460msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
c04f5ac3 14461
94550ed3
JX
14462#: git-bisect.sh:636
14463msgid "no terms defined"
14464msgstr "未定义术语"
14465
14466#: git-bisect.sh:653
14467#, sh-format
14468msgid ""
14469"invalid argument $arg for 'git bisect terms'.\n"
14470"Supported options are: --term-good|--term-old and --term-bad|--term-new."
14471msgstr ""
14472"参数 $arg 对命令 'git bisect terms' 无效。\n"
14473"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
14474
5c57d762
JX
14475#: git-merge-octopus.sh:46
14476msgid ""
14477"Error: Your local changes to the following files would be overwritten by "
14478"merge"
14479msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
14480
14481#: git-merge-octopus.sh:61
14482msgid "Automated merge did not work."
9a4b694c 14483msgstr "自动合并未生效。"
5c57d762
JX
14484
14485#: git-merge-octopus.sh:62
a0b6b246 14486msgid "Should not be doing an octopus."
5c57d762
JX
14487msgstr "不应该执行章鱼式合并。"
14488
14489#: git-merge-octopus.sh:73
14490#, sh-format
14491msgid "Unable to find common commit with $pretty_name"
14492msgstr "无法找到和 $pretty_name 的基线提交"
14493
14494#: git-merge-octopus.sh:77
14495#, sh-format
6937cb4e 14496msgid "Already up to date with $pretty_name"
5c57d762
JX
14497msgstr "已经和 $pretty_name 保持一致"
14498
14499#: git-merge-octopus.sh:89
14500#, sh-format
14501msgid "Fast-forwarding to: $pretty_name"
14502msgstr "快进至:$pretty_name"
14503
14504#: git-merge-octopus.sh:97
14505#, sh-format
14506msgid "Trying simple merge with $pretty_name"
14507msgstr "尝试和 $pretty_name 的简单合并"
14508
14509#: git-merge-octopus.sh:102
14510msgid "Simple merge did not work, trying automatic merge."
9a4b694c 14511msgstr "简单合并未生效,尝试自动合并。"
5c57d762 14512
60638e98 14513#: git-rebase.sh:58
649900bc 14514msgid ""
6937cb4e
JX
14515"Resolve all conflicts manually, mark them as resolved with\n"
14516"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
14517"You can instead skip this commit: run \"git rebase --skip\".\n"
14518"To abort and get back to the state before \"git rebase\", run \"git rebase --"
14519"abort\"."
649900bc 14520msgstr ""
58b6f078 14521"手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n"
6937cb4e
JX
14522"冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n"
14523"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
14524"\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。"
649900bc 14525
6937cb4e 14526#: git-rebase.sh:160 git-rebase.sh:402
5c57d762
JX
14527#, sh-format
14528msgid "Could not move back to $head_name"
14529msgstr "无法移回 $head_name"
14530
6937cb4e 14531#: git-rebase.sh:171
a4f16749
JX
14532msgid "Applied autostash."
14533msgstr "成功应用 autostash。"
14534
6937cb4e 14535#: git-rebase.sh:174
2e8451e8
JX
14536#, sh-format
14537msgid "Cannot store $stash_sha1"
14538msgstr "无法保存 $stash_sha1"
14539
6937cb4e 14540#: git-rebase.sh:214
649900bc 14541msgid "The pre-rebase hook refused to rebase."
98b2761d 14542msgstr "钩子 pre-rebase 拒绝变基操作。"
649900bc 14543
6937cb4e 14544#: git-rebase.sh:219
649900bc
JX
14545msgid "It looks like git-am is in progress. Cannot rebase."
14546msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
14547
6937cb4e 14548#: git-rebase.sh:363
649900bc
JX
14549msgid "No rebase in progress?"
14550msgstr "没有正在进行的变基?"
14551
6937cb4e 14552#: git-rebase.sh:374
07432cef
WS
14553msgid "The --edit-todo action can only be used during interactive rebase."
14554msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
14555
6937cb4e 14556#: git-rebase.sh:381
649900bc
JX
14557msgid "Cannot read HEAD"
14558msgstr "不能读取 HEAD"
14559
6937cb4e 14560#: git-rebase.sh:384
649900bc
JX
14561msgid ""
14562"You must edit all merge conflicts and then\n"
14563"mark them as resolved using git add"
14564msgstr ""
14565"您必须编辑所有的合并冲突,然后通过 git add\n"
14566"命令将它们标记为已解决"
14567
6937cb4e 14568#: git-rebase.sh:424
649900bc
JX
14569#, sh-format
14570msgid ""
14571"It seems that there is already a $state_dir_base directory, and\n"
14572"I wonder if you are in the middle of another rebase. If that is the\n"
14573"case, please try\n"
14574"\t$cmd_live_rebase\n"
14575"If that is not the case, please\n"
14576"\t$cmd_clear_stale_rebase\n"
14577"and run me again. I am stopping in case you still have something\n"
14578"valuable there."
14579msgstr ""
98b2761d
JX
14580"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
14581"过程中。 如果是这样,请执行\n"
649900bc
JX
14582"\t$cmd_live_rebase\n"
14583"如果不是这样,请执行\n"
14584"\t$cmd_clear_stale_rebase\n"
98b2761d 14585"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
649900bc 14586
6937cb4e 14587#: git-rebase.sh:480
649900bc
JX
14588#, sh-format
14589msgid "invalid upstream $upstream_name"
14590msgstr "无效的上游 $upstream_name"
14591
6937cb4e 14592#: git-rebase.sh:504
649900bc
JX
14593#, sh-format
14594msgid "$onto_name: there are more than one merge bases"
14595msgstr "$onto_name: 有一个以上的合并基准"
14596
6937cb4e 14597#: git-rebase.sh:507 git-rebase.sh:511
649900bc
JX
14598#, sh-format
14599msgid "$onto_name: there is no merge base"
14600msgstr "$onto_name: 没有合并基准"
14601
6937cb4e 14602#: git-rebase.sh:516
649900bc
JX
14603#, sh-format
14604msgid "Does not point to a valid commit: $onto_name"
14605msgstr "没有指向一个有效的提交:$onto_name"
14606
6937cb4e 14607#: git-rebase.sh:539
649900bc
JX
14608#, sh-format
14609msgid "fatal: no such branch: $branch_name"
14610msgstr "严重错误:无此分支:$branch_name"
14611
6937cb4e 14612#: git-rebase.sh:572
2e8451e8
JX
14613msgid "Cannot autostash"
14614msgstr "无法 autostash"
14615
6937cb4e 14616#: git-rebase.sh:577
2e8451e8
JX
14617#, sh-format
14618msgid "Created autostash: $stash_abbrev"
14619msgstr "创建了 autostash: $stash_abbrev"
14620
6937cb4e 14621#: git-rebase.sh:581
649900bc 14622msgid "Please commit or stash them."
a4f16749 14623msgstr "请提交或贮藏修改。"
649900bc 14624
6937cb4e 14625#: git-rebase.sh:601
649900bc
JX
14626#, sh-format
14627msgid "Current branch $branch_name is up to date."
14628msgstr "当前分支 $branch_name 是最新的。"
14629
6937cb4e 14630#: git-rebase.sh:605
649900bc
JX
14631#, sh-format
14632msgid "Current branch $branch_name is up to date, rebase forced."
14633msgstr "当前分支 $branch_name 是最新的,强制变基。"
14634
6937cb4e 14635#: git-rebase.sh:616
649900bc
JX
14636#, sh-format
14637msgid "Changes from $mb to $onto:"
14638msgstr "变更从 $mb 到 $onto:"
14639
6937cb4e 14640#: git-rebase.sh:625
649900bc 14641msgid "First, rewinding head to replay your work on top of it..."
160fb2b2 14642msgstr "首先,回退分支以便在上面重放您的工作..."
649900bc 14643
6937cb4e 14644#: git-rebase.sh:635
649900bc
JX
14645#, sh-format
14646msgid "Fast-forwarded $branch_name to $onto_name."
14647msgstr "快进 $branch_name 至 $onto_name。"
14648
6937cb4e 14649#: git-stash.sh:61
c04f5ac3
JX
14650msgid "git stash clear with parameters is unimplemented"
14651msgstr "git stash clear 不支持参数"
14652
6937cb4e 14653#: git-stash.sh:102
c04f5ac3
JX
14654msgid "You do not have the initial commit yet"
14655msgstr "您尚未建立初始提交"
14656
6937cb4e 14657#: git-stash.sh:117
c04f5ac3 14658msgid "Cannot save the current index state"
90e6ef53 14659msgstr "无法保存当前索引状态"
c04f5ac3 14660
6937cb4e 14661#: git-stash.sh:132
a0b6b246
JX
14662msgid "Cannot save the untracked files"
14663msgstr "无法保存未跟踪文件"
14664
6937cb4e 14665#: git-stash.sh:152 git-stash.sh:165
c04f5ac3
JX
14666msgid "Cannot save the current worktree state"
14667msgstr "无法保存当前工作区状态"
14668
6937cb4e 14669#: git-stash.sh:169
c04f5ac3 14670msgid "No changes selected"
90e6ef53 14671msgstr "没有选择变更"
c04f5ac3 14672
6937cb4e 14673#: git-stash.sh:172
c04f5ac3 14674msgid "Cannot remove temporary index (can't happen)"
90e6ef53 14675msgstr "无法删除临时索引(不应发生)"
c04f5ac3 14676
6937cb4e 14677#: git-stash.sh:185
c04f5ac3
JX
14678msgid "Cannot record working tree state"
14679msgstr "不能记录工作区状态"
14680
6937cb4e 14681#: git-stash.sh:217
2e8451e8
JX
14682#, sh-format
14683msgid "Cannot update $ref_stash with $w_commit"
14684msgstr "无法用 $w_commit 更新 $ref_stash"
14685
b694fbb1
JX
14686#. TRANSLATORS: $option is an invalid option, like
14687#. `--blah-blah'. The 7 spaces at the beginning of the
14688#. second line correspond to "error: ". So you should line
14689#. up the second line with however many characters the
14690#. translation of "error: " takes in your language. E.g. in
14691#. English this is:
14692#.
14693#. $ git stash save --blah-blah 2>&1 | head -n 2
14694#. error: unknown option for 'stash save': --blah-blah
14695#. To provide a message, use git stash save -- '--blah-blah'
6937cb4e 14696#: git-stash.sh:273
b694fbb1
JX
14697#, sh-format
14698msgid ""
14699"error: unknown option for 'stash save': $option\n"
14700" To provide a message, use git stash save -- '$option'"
14701msgstr ""
14702"错误:'stash save' 的未知选项:$option\n"
14703" 要提供一个描述信息,使用 git stash save -- '$option'"
14704
6937cb4e 14705#: git-stash.sh:288
a0b6b246
JX
14706msgid "Can't use --patch and --include-untracked or --all at the same time"
14707msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
14708
6937cb4e 14709#: git-stash.sh:296
c04f5ac3
JX
14710msgid "No local changes to save"
14711msgstr "没有要保存的本地修改"
14712
6937cb4e 14713#: git-stash.sh:301
c04f5ac3 14714msgid "Cannot initialize stash"
a4f16749 14715msgstr "无法初始化贮藏"
c04f5ac3 14716
6937cb4e 14717#: git-stash.sh:305
c04f5ac3
JX
14718msgid "Cannot save the current status"
14719msgstr "无法保存当前状态"
14720
6937cb4e 14721#: git-stash.sh:306
5c57d762
JX
14722#, sh-format
14723msgid "Saved working directory and index state $stash_msg"
14724msgstr "保存工作目录和索引状态 $stash_msg"
14725
6937cb4e 14726#: git-stash.sh:334
c04f5ac3
JX
14727msgid "Cannot remove worktree changes"
14728msgstr "无法删除工作区变更"
14729
6937cb4e 14730#: git-stash.sh:482
7aea43ff
JX
14731#, sh-format
14732msgid "unknown option: $opt"
14733msgstr "未知选项: $opt"
14734
6937cb4e 14735#: git-stash.sh:495
a4f16749
JX
14736msgid "No stash entries found."
14737msgstr "未发现贮藏条目。"
c04f5ac3 14738
6937cb4e 14739#: git-stash.sh:502
c04f5ac3
JX
14740#, sh-format
14741msgid "Too many revisions specified: $REV"
90e6ef53 14742msgstr "指定了太多的版本:$REV"
c04f5ac3 14743
6937cb4e 14744#: git-stash.sh:517
c04f5ac3 14745#, sh-format
220c313c
JX
14746msgid "$reference is not a valid reference"
14747msgstr "$reference 不是一个有效的引用"
c04f5ac3 14748
6937cb4e 14749#: git-stash.sh:545
c04f5ac3
JX
14750#, sh-format
14751msgid "'$args' is not a stash-like commit"
a4f16749 14752msgstr "'$args' 不是贮藏式提交"
c04f5ac3 14753
6937cb4e 14754#: git-stash.sh:556
c04f5ac3
JX
14755#, sh-format
14756msgid "'$args' is not a stash reference"
a4f16749 14757msgstr "'$args' 不是一个贮藏引用"
c04f5ac3 14758
6937cb4e 14759#: git-stash.sh:564
c04f5ac3 14760msgid "unable to refresh index"
90e6ef53 14761msgstr "无法刷新索引"
c04f5ac3 14762
6937cb4e 14763#: git-stash.sh:568
c04f5ac3 14764msgid "Cannot apply a stash in the middle of a merge"
a4f16749 14765msgstr "无法在合并过程应用贮藏"
c04f5ac3 14766
6937cb4e 14767#: git-stash.sh:576
c04f5ac3 14768msgid "Conflicts in index. Try without --index."
90e6ef53 14769msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3 14770
6937cb4e 14771#: git-stash.sh:578
c04f5ac3 14772msgid "Could not save index tree"
90e6ef53 14773msgstr "不能保存索引树"
c04f5ac3 14774
6937cb4e 14775#: git-stash.sh:587
a4f16749
JX
14776msgid "Could not restore untracked files from stash entry"
14777msgstr "无法从贮藏条目中恢复未跟踪文件"
a0b6b246 14778
6937cb4e 14779#: git-stash.sh:612
c04f5ac3 14780msgid "Cannot unstage modified files"
160fb2b2 14781msgstr "无法将修改的文件取消暂存"
c04f5ac3 14782
6937cb4e 14783#: git-stash.sh:627
b694fbb1 14784msgid "Index was not unstashed."
a4f16749 14785msgstr "索引未从贮藏中恢复。"
b694fbb1 14786
6937cb4e 14787#: git-stash.sh:641
a4f16749
JX
14788msgid "The stash entry is kept in case you need it again."
14789msgstr "贮藏条目被保留以备您再次需要。"
5c57d762 14790
6937cb4e 14791#: git-stash.sh:650
c04f5ac3
JX
14792#, sh-format
14793msgid "Dropped ${REV} ($s)"
14794msgstr "丢弃了 ${REV} ($s)"
14795
6937cb4e 14796#: git-stash.sh:651
c04f5ac3
JX
14797#, sh-format
14798msgid "${REV}: Could not drop stash entry"
a4f16749 14799msgstr "${REV}:无法丢弃贮藏条目"
c04f5ac3 14800
6937cb4e 14801#: git-stash.sh:659
c04f5ac3
JX
14802msgid "No branch name specified"
14803msgstr "未指定分支名"
14804
6937cb4e 14805#: git-stash.sh:738
c04f5ac3
JX
14806msgid "(To restore them type \"git stash apply\")"
14807msgstr "(为恢复数据输入 \"git stash apply\")"
14808
1a79b2f1 14809#: git-submodule.sh:181
2e8451e8
JX
14810msgid "Relative path can only be used from the toplevel of the working tree"
14811msgstr "只能在工作区的顶级目录中使用相对路径"
14812
1a79b2f1 14813#: git-submodule.sh:191
c04f5ac3
JX
14814#, sh-format
14815msgid "repo URL: '$repo' must be absolute or begin with ./|../"
4375c10e 14816msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
c04f5ac3 14817
1a79b2f1 14818#: git-submodule.sh:210
c04f5ac3 14819#, sh-format
170e9899
JX
14820msgid "'$sm_path' already exists in the index"
14821msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 14822
1a79b2f1
JX
14823#: git-submodule.sh:213
14824#, sh-format
14825msgid "'$sm_path' already exists in the index and is not a submodule"
14826msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
14827
a4f16749 14828#: git-submodule.sh:219
b694fbb1
JX
14829#, sh-format
14830msgid ""
14831"The following path is ignored by one of your .gitignore files:\n"
14832"$sm_path\n"
14833"Use -f if you really want to add it."
14834msgstr ""
14835"以下路径被您的一个 .gitignore 文件所忽略:\n"
14836"$sm_path\n"
14837"如果您确实想添加它,使用 -f 参数。"
14838
a4f16749 14839#: git-submodule.sh:237
b694fbb1
JX
14840#, sh-format
14841msgid "Adding existing repo at '$sm_path' to the index"
160fb2b2 14842msgstr "添加位于 '$sm_path' 的现存仓库到索引"
b694fbb1 14843
a4f16749 14844#: git-submodule.sh:239
c04f5ac3 14845#, sh-format
170e9899 14846msgid "'$sm_path' already exists and is not a valid git repo"
160fb2b2 14847msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
c04f5ac3 14848
a4f16749 14849#: git-submodule.sh:247
07432cef
WS
14850#, sh-format
14851msgid "A git directory for '$sm_name' is found locally with remote(s):"
160fb2b2 14852msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
07432cef 14853
a4f16749 14854#: git-submodule.sh:249
07432cef
WS
14855#, sh-format
14856msgid ""
5c57d762
JX
14857"If you want to reuse this local git directory instead of cloning again from\n"
14858" $realrepo\n"
14859"use the '--force' option. If the local git directory is not the correct "
14860"repo\n"
07432cef
WS
14861"or you are unsure what this means choose another name with the '--name' "
14862"option."
5c57d762
JX
14863msgstr ""
14864"如果您想要重用这个本地 git 目录而非重新克隆自\n"
14865" $realrepo\n"
14866"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
14867"或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
07432cef 14868
a4f16749 14869#: git-submodule.sh:255
07432cef
WS
14870#, sh-format
14871msgid "Reactivating local git directory for submodule '$sm_name'."
14872msgstr "激活本地 git 目录到子模组 '$sm_name'。"
14873
a4f16749 14874#: git-submodule.sh:267
c04f5ac3 14875#, sh-format
170e9899
JX
14876msgid "Unable to checkout submodule '$sm_path'"
14877msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 14878
a4f16749 14879#: git-submodule.sh:272
c04f5ac3 14880#, sh-format
170e9899
JX
14881msgid "Failed to add submodule '$sm_path'"
14882msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 14883
a4f16749 14884#: git-submodule.sh:281
c04f5ac3 14885#, sh-format
170e9899
JX
14886msgid "Failed to register submodule '$sm_path'"
14887msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 14888
a4f16749 14889#: git-submodule.sh:342
c04f5ac3 14890#, sh-format
5b04ee3b
JX
14891msgid "Entering '$displaypath'"
14892msgstr "正在进入 '$displaypath'"
c04f5ac3 14893
a4f16749 14894#: git-submodule.sh:362
c04f5ac3 14895#, sh-format
5b04ee3b 14896msgid "Stopping at '$displaypath'; script returned non-zero status."
aef18cc6 14897msgstr "停止于 '$displaypath';脚本返回非零值。"
c04f5ac3 14898
a4f16749 14899#: git-submodule.sh:433
c04f5ac3 14900#, sh-format
5b04ee3b
JX
14901msgid "pathspec and --all are incompatible"
14902msgstr "pathspec 和 --all 不兼容"
c04f5ac3 14903
a4f16749 14904#: git-submodule.sh:438
c04f5ac3 14905#, sh-format
5b04ee3b 14906msgid "Use '--all' if you really want to deinitialize all submodules"
aef18cc6 14907msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
1003b3a5 14908
a4f16749 14909#: git-submodule.sh:458
1003b3a5
JX
14910#, sh-format
14911msgid ""
5c57d762 14912"Submodule work tree '$displaypath' contains a .git directory\n"
1003b3a5 14913"(use 'rm -rf' if you really want to remove it including all of its history)"
5c57d762
JX
14914msgstr ""
14915"子模组工作区 '$displaypath' 包含一个 .git 目录\n"
9a4b694c 14916"(如果您真的想删除它及其全部历史,使用 'rm -rf' 命令)"
1003b3a5 14917
a4f16749 14918#: git-submodule.sh:466
c04f5ac3
JX
14919#, sh-format
14920msgid ""
2e8451e8 14921"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
1003b3a5 14922"discard them"
2e8451e8 14923msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
1003b3a5 14924
a4f16749 14925#: git-submodule.sh:469
1003b3a5 14926#, sh-format
2e8451e8
JX
14927msgid "Cleared directory '$displaypath'"
14928msgstr "已清除目录 '$displaypath'"
1003b3a5 14929
a4f16749 14930#: git-submodule.sh:470
1003b3a5 14931#, sh-format
2e8451e8
JX
14932msgid "Could not remove submodule work tree '$displaypath'"
14933msgstr "无法移除子模组工作区 '$displaypath'"
1003b3a5 14934
a4f16749 14935#: git-submodule.sh:473
1003b3a5 14936#, sh-format
2e8451e8
JX
14937msgid "Could not create empty submodule directory '$displaypath'"
14938msgstr "不能创建空的子模组目录 '$displaypath'"
1003b3a5 14939
a4f16749 14940#: git-submodule.sh:482
1003b3a5 14941#, sh-format
2e8451e8
JX
14942msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
14943msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
1003b3a5 14944
6937cb4e 14945#: git-submodule.sh:637
c04f5ac3 14946#, sh-format
2e8451e8
JX
14947msgid "Unable to find current revision in submodule path '$displaypath'"
14948msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 14949
6937cb4e 14950#: git-submodule.sh:647
c04f5ac3 14951#, sh-format
170e9899
JX
14952msgid "Unable to fetch in submodule path '$sm_path'"
14953msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 14954
6937cb4e 14955#: git-submodule.sh:652
5c57d762
JX
14956#, sh-format
14957msgid ""
14958"Unable to find current ${remote_name}/${branch} revision in submodule path "
14959"'$sm_path'"
9a4b694c 14960msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
5c57d762 14961
6937cb4e 14962#: git-submodule.sh:670
2e8451e8
JX
14963#, sh-format
14964msgid "Unable to fetch in submodule path '$displaypath'"
14965msgstr "无法在子模组路径 '$displaypath' 中获取"
14966
6937cb4e 14967#: git-submodule.sh:676
5c57d762
JX
14968#, sh-format
14969msgid ""
14970"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
14971"Direct fetching of that commit failed."
a0b6b246
JX
14972msgstr ""
14973"获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
5c57d762 14974
6937cb4e 14975#: git-submodule.sh:683
6c94aba5
JX
14976#, sh-format
14977msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
14978msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
14979
6937cb4e 14980#: git-submodule.sh:684
c04f5ac3 14981#, sh-format
6c94aba5
JX
14982msgid "Submodule path '$displaypath': checked out '$sha1'"
14983msgstr "子模组路径 '$displaypath':检出 '$sha1'"
14984
6937cb4e 14985#: git-submodule.sh:688
6c94aba5 14986#, sh-format
2e8451e8
JX
14987msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
14988msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 14989
6937cb4e 14990#: git-submodule.sh:689
c04f5ac3 14991#, sh-format
2e8451e8
JX
14992msgid "Submodule path '$displaypath': rebased into '$sha1'"
14993msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 14994
6937cb4e 14995#: git-submodule.sh:694
c04f5ac3 14996#, sh-format
2e8451e8
JX
14997msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
14998msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 14999
6937cb4e 15000#: git-submodule.sh:695
c04f5ac3 15001#, sh-format
2e8451e8
JX
15002msgid "Submodule path '$displaypath': merged in '$sha1'"
15003msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 15004
6937cb4e 15005#: git-submodule.sh:700
c04f5ac3 15006#, sh-format
5b04ee3b
JX
15007msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
15008msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
c04f5ac3 15009
6937cb4e 15010#: git-submodule.sh:701
c04f5ac3 15011#, sh-format
5b04ee3b 15012msgid "Submodule path '$displaypath': '$command $sha1'"
aef18cc6 15013msgstr "子模组 '$displaypath':'$command $sha1'"
c04f5ac3 15014
6937cb4e 15015#: git-submodule.sh:732
2e8451e8
JX
15016#, sh-format
15017msgid "Failed to recurse into submodule path '$displaypath'"
15018msgstr "无法递归进子模组路径 '$displaypath'"
15019
6937cb4e 15020#: git-submodule.sh:840
649900bc
JX
15021msgid "The --cached option cannot be used with the --files option"
15022msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1 15023
6937cb4e 15024#: git-submodule.sh:892
b694fbb1
JX
15025#, sh-format
15026msgid "unexpected mode $mod_dst"
15027msgstr "意外的模式 $mod_dst"
c04f5ac3 15028
90e6ef53 15029# 译者:注意保持前导空格
6937cb4e 15030#: git-submodule.sh:912
c04f5ac3 15031#, sh-format
2e8451e8
JX
15032msgid " Warn: $display_name doesn't contain commit $sha1_src"
15033msgstr " 警告:$display_name 未包含提交 $sha1_src"
c04f5ac3 15034
90e6ef53 15035# 译者:注意保持前导空格
6937cb4e 15036#: git-submodule.sh:915
c04f5ac3 15037#, sh-format
2e8451e8
JX
15038msgid " Warn: $display_name doesn't contain commit $sha1_dst"
15039msgstr " 警告:$display_name 未包含提交 $sha1_dst"
c04f5ac3 15040
90e6ef53 15041# 译者:注意保持前导空格
6937cb4e 15042#: git-submodule.sh:918
c04f5ac3 15043#, sh-format
2e8451e8
JX
15044msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
15045msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
c04f5ac3 15046
6937cb4e 15047#: git-submodule.sh:1064
1003b3a5
JX
15048#, sh-format
15049msgid "Failed to recurse into submodule path '$sm_path'"
15050msgstr "无法递归进子模组路径 '$sm_path'"
15051
6937cb4e 15052#: git-submodule.sh:1136
c04f5ac3 15053#, sh-format
2e8451e8
JX
15054msgid "Synchronizing submodule url for '$displaypath'"
15055msgstr "为 '$displaypath' 同步子模组 url"
1b7f4a34 15056
5b04ee3b
JX
15057#: git-parse-remote.sh:89
15058#, sh-format
15059msgid "See git-${cmd}(1) for details."
15060msgstr "详见 git-${cmd}(1)。"
5c57d762 15061
1a79b2f1 15062#: git-rebase--interactive.sh:140
5c57d762
JX
15063#, sh-format
15064msgid "Rebasing ($new_count/$total)"
15065msgstr "变基中($new_count/$total)"
15066
1a79b2f1 15067#: git-rebase--interactive.sh:156
5c57d762
JX
15068msgid ""
15069"\n"
15070"Commands:\n"
6937cb4e
JX
15071"p, pick = use commit\n"
15072"r, reword = use commit, but edit the commit message\n"
15073"e, edit = use commit, but stop for amending\n"
15074"s, squash = use commit, but meld into previous commit\n"
15075"f, fixup = like \"squash\", but discard this commit's log message\n"
15076"x, exec = run command (the rest of the line) using shell\n"
15077"d, drop = remove commit\n"
5c57d762
JX
15078"\n"
15079"These lines can be re-ordered; they are executed from top to bottom.\n"
15080msgstr ""
15081"\n"
15082"命令:\n"
6937cb4e
JX
15083"p, pick = 使用提交\n"
15084"r, reword = 使用提交,但修改提交说明\n"
15085"e, edit = 使用提交,但停止以便进行提交修补\n"
15086"s, squash = 使用提交,但和前一个版本融合\n"
15087"f, fixup = 类似于 \"squash\",但丢弃提交说明日志\n"
15088"x, exec = 使用 shell 运行命令(此行剩余部分)\n"
15089"d, drop = 删除提交\n"
5c57d762 15090"\n"
9a4b694c 15091"这些行可以被重新排序;它们会被从上至下地执行。\n"
5c57d762 15092
1a79b2f1 15093#: git-rebase--interactive.sh:171
5c57d762
JX
15094msgid ""
15095"\n"
15096"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
a0b6b246
JX
15097msgstr ""
15098"\n"
15099"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
5c57d762 15100
1a79b2f1 15101#: git-rebase--interactive.sh:175
5c57d762
JX
15102msgid ""
15103"\n"
15104"If you remove a line here THAT COMMIT WILL BE LOST.\n"
a0b6b246
JX
15105msgstr ""
15106"\n"
15107"如果您在这里删除一行,对应的提交将会丢失。\n"
5c57d762 15108
1a79b2f1 15109#: git-rebase--interactive.sh:211
5c57d762
JX
15110#, sh-format
15111msgid ""
15112"You can amend the commit now, with\n"
15113"\n"
15114"\tgit commit --amend $gpg_sign_opt_quoted\n"
15115"\n"
15116"Once you are satisfied with your changes, run\n"
15117"\n"
15118"\tgit rebase --continue"
15119msgstr ""
15120"您现在可以修补这个提交,使用\n"
15121"\n"
15122"\tgit commit --amend $gpg_sign_opt_quoted\n"
15123"\n"
9a4b694c 15124"当您对变更感到满意,执行\n"
5c57d762
JX
15125"\n"
15126"\tgit rebase --continue"
15127
1a79b2f1 15128#: git-rebase--interactive.sh:236
5c57d762
JX
15129#, sh-format
15130msgid "$sha1: not a commit that can be picked"
15131msgstr "$sha1:不是一个可以被拣选的提交"
15132
1a79b2f1 15133#: git-rebase--interactive.sh:275
5c57d762
JX
15134#, sh-format
15135msgid "Invalid commit name: $sha1"
15136msgstr "无效的提交名:$sha1"
15137
1a79b2f1 15138#: git-rebase--interactive.sh:317
5c57d762
JX
15139msgid "Cannot write current commit's replacement sha1"
15140msgstr "不能写入当前提交的替代 sha1"
15141
1a79b2f1 15142#: git-rebase--interactive.sh:369
5c57d762
JX
15143#, sh-format
15144msgid "Fast-forward to $sha1"
15145msgstr "快进到 $sha1"
15146
1a79b2f1 15147#: git-rebase--interactive.sh:371
5c57d762
JX
15148#, sh-format
15149msgid "Cannot fast-forward to $sha1"
15150msgstr "不能快进到 $sha1"
15151
1a79b2f1 15152#: git-rebase--interactive.sh:380
5c57d762
JX
15153#, sh-format
15154msgid "Cannot move HEAD to $first_parent"
15155msgstr "不能移动 HEAD 到 $first_parent"
15156
1a79b2f1 15157#: git-rebase--interactive.sh:385
5c57d762
JX
15158#, sh-format
15159msgid "Refusing to squash a merge: $sha1"
15160msgstr "拒绝压缩一个合并:$sha1"
15161
6937cb4e 15162#: git-rebase--interactive.sh:400
5c57d762
JX
15163#, sh-format
15164msgid "Error redoing merge $sha1"
15165msgstr "无法重做合并 $sha1"
15166
6937cb4e 15167#: git-rebase--interactive.sh:408
5c57d762
JX
15168#, sh-format
15169msgid "Could not pick $sha1"
15170msgstr "不能拣选 $sha1"
15171
6937cb4e 15172#: git-rebase--interactive.sh:417
5c57d762
JX
15173#, sh-format
15174msgid "This is the commit message #${n}:"
9a4b694c 15175msgstr "这是提交说明 #${n}:"
5c57d762 15176
6937cb4e 15177#: git-rebase--interactive.sh:422
5c57d762
JX
15178#, sh-format
15179msgid "The commit message #${n} will be skipped:"
9a4b694c 15180msgstr "提交说明 #${n} 将被跳过:"
5c57d762 15181
6937cb4e 15182#: git-rebase--interactive.sh:433
5c57d762
JX
15183#, sh-format
15184msgid "This is a combination of $count commit."
15185msgid_plural "This is a combination of $count commits."
15186msgstr[0] "这是一个 $count 个提交的组合。"
15187msgstr[1] "这是一个 $count 个提交的组合。"
15188
6937cb4e 15189#: git-rebase--interactive.sh:442
5c57d762
JX
15190#, sh-format
15191msgid "Cannot write $fixup_msg"
15192msgstr "不能写入 $fixup_msg"
15193
6937cb4e 15194#: git-rebase--interactive.sh:445
5c57d762
JX
15195msgid "This is a combination of 2 commits."
15196msgstr "这是一个 2 个提交的组合。"
15197
6937cb4e
JX
15198#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
15199#: git-rebase--interactive.sh:532
5c57d762
JX
15200#, sh-format
15201msgid "Could not apply $sha1... $rest"
15202msgstr "不能应用 $sha1... $rest"
15203
6937cb4e 15204#: git-rebase--interactive.sh:560
5c57d762
JX
15205#, sh-format
15206msgid ""
15207"Could not amend commit after successfully picking $sha1... $rest\n"
15208"This is most likely due to an empty commit message, or the pre-commit hook\n"
15209"failed. If the pre-commit hook failed, you may need to resolve the issue "
15210"before\n"
15211"you are able to reword the commit."
15212msgstr ""
15213"不能在成功拣选 $sha1... $rest 之后修补提交\n"
15214"这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
15215"钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
15216
6937cb4e 15217#: git-rebase--interactive.sh:575
5c57d762
JX
15218#, sh-format
15219msgid "Stopped at $sha1_abbrev... $rest"
15220msgstr "停止在 $sha1_abbrev... $rest"
15221
6937cb4e 15222#: git-rebase--interactive.sh:590
5c57d762
JX
15223#, sh-format
15224msgid "Cannot '$squash_style' without a previous commit"
9a4b694c 15225msgstr "没有父提交的情况下不能 '$squash_style'"
5c57d762 15226
6937cb4e 15227#: git-rebase--interactive.sh:632
5c57d762
JX
15228#, sh-format
15229msgid "Executing: $rest"
15230msgstr "执行:$rest"
15231
6937cb4e 15232#: git-rebase--interactive.sh:640
5c57d762
JX
15233#, sh-format
15234msgid "Execution failed: $rest"
15235msgstr "执行失败:$rest"
15236
6937cb4e 15237#: git-rebase--interactive.sh:642
5c57d762
JX
15238msgid "and made changes to the index and/or the working tree"
15239msgstr "并且修改索引和/或工作区"
15240
15241# 译者:注意保持前导空格
6937cb4e 15242#: git-rebase--interactive.sh:644
5c57d762
JX
15243msgid ""
15244"You can fix the problem, and then run\n"
15245"\n"
15246"\tgit rebase --continue"
15247msgstr ""
15248"您可以解决这个问题,然后运行\n"
15249"\n"
15250"\tgit rebase --continue"
15251
15252#. TRANSLATORS: after these lines is a command to be issued by the user
6937cb4e 15253#: git-rebase--interactive.sh:657
5c57d762
JX
15254#, sh-format
15255msgid ""
15256"Execution succeeded: $rest\n"
15257"but left changes to the index and/or the working tree\n"
15258"Commit or stash your changes, and then run\n"
15259"\n"
15260"\tgit rebase --continue"
15261msgstr ""
15262"执行成功:$rest\n"
a4f16749 15263"但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n"
5c57d762
JX
15264"\n"
15265"\tgit rebase --continue"
15266
6937cb4e 15267#: git-rebase--interactive.sh:668
5c57d762
JX
15268#, sh-format
15269msgid "Unknown command: $command $sha1 $rest"
15270msgstr "未知命令:$command $sha1 $rest"
15271
6937cb4e 15272#: git-rebase--interactive.sh:669
5c57d762
JX
15273msgid "Please fix this using 'git rebase --edit-todo'."
15274msgstr "要修改请使用命令 'git rebase --edit-todo'。"
15275
6937cb4e 15276#: git-rebase--interactive.sh:704
5c57d762
JX
15277#, sh-format
15278msgid "Successfully rebased and updated $head_name."
9a4b694c 15279msgstr "成功变基并更新 $head_name。"
5c57d762 15280
6937cb4e 15281#: git-rebase--interactive.sh:749
5c57d762
JX
15282msgid "could not detach HEAD"
15283msgstr "不能检出为分离头指针"
15284
6937cb4e 15285#: git-rebase--interactive.sh:784
5c57d762
JX
15286msgid "Could not remove CHERRY_PICK_HEAD"
15287msgstr "不能删除 CHERRY_PICK_HEAD"
15288
6937cb4e 15289#: git-rebase--interactive.sh:789
5c57d762
JX
15290#, sh-format
15291msgid ""
15292"You have staged changes in your working tree.\n"
15293"If these changes are meant to be\n"
15294"squashed into the previous commit, run:\n"
15295"\n"
15296" git commit --amend $gpg_sign_opt_quoted\n"
15297"\n"
15298"If they are meant to go into a new commit, run:\n"
15299"\n"
15300" git commit $gpg_sign_opt_quoted\n"
15301"\n"
a0b6b246 15302"In both cases, once you're done, continue with:\n"
5c57d762
JX
15303"\n"
15304" git rebase --continue\n"
15305msgstr ""
15306"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
15307"\n"
15308" git commit --amend $gpg_sign_opt_quoted\n"
15309"\n"
15310"如果这些变更要形成一个新提交,执行:\n"
15311"\n"
15312" git commit $gpg_sign_opt_quoted\n"
15313"\n"
9a4b694c 15314"无论哪种情况,当您完成提交,继续执行:\n"
5c57d762
JX
15315"\n"
15316" git rebase --continue\n"
15317
6937cb4e 15318#: git-rebase--interactive.sh:806
5c57d762 15319msgid "Error trying to find the author identity to amend commit"
9a4b694c 15320msgstr "在修补提交中查找作者信息时遇到错误"
5c57d762 15321
6937cb4e 15322#: git-rebase--interactive.sh:811
5c57d762
JX
15323msgid ""
15324"You have uncommitted changes in your working tree. Please commit them\n"
15325"first and then run 'git rebase --continue' again."
a0b6b246
JX
15326msgstr ""
15327"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
5c57d762 15328
6937cb4e 15329#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
5c57d762
JX
15330msgid "Could not commit staged changes."
15331msgstr "不能提交暂存的修改。"
15332
6937cb4e 15333#: git-rebase--interactive.sh:848
5c57d762
JX
15334msgid ""
15335"\n"
15336"You are editing the todo file of an ongoing interactive rebase.\n"
15337"To continue rebase after editing, run:\n"
15338" git rebase --continue\n"
15339"\n"
15340msgstr ""
15341"\n"
6937cb4e 15342"您正在修改运行中的交互式变基待办列表。若要在编辑结束后继续变基,\n"
5c57d762
JX
15343"请执行:\n"
15344" git rebase --continue\n"
15345"\n"
15346
6937cb4e 15347#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
5c57d762
JX
15348msgid "Could not execute editor"
15349msgstr "无法运行编辑器"
15350
6937cb4e 15351#: git-rebase--interactive.sh:869
5c57d762
JX
15352#, sh-format
15353msgid "Could not checkout $switch_to"
15354msgstr "不能检出 $switch_to"
15355
6937cb4e 15356#: git-rebase--interactive.sh:874
5c57d762
JX
15357msgid "No HEAD?"
15358msgstr "没有 HEAD?"
15359
6937cb4e 15360#: git-rebase--interactive.sh:875
5c57d762
JX
15361#, sh-format
15362msgid "Could not create temporary $state_dir"
15363msgstr "不能创建临时 $state_dir"
15364
6937cb4e 15365#: git-rebase--interactive.sh:877
5c57d762
JX
15366msgid "Could not mark as interactive"
15367msgstr "不能标记为交互式"
15368
6937cb4e 15369#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
5c57d762
JX
15370msgid "Could not init rewritten commits"
15371msgstr "不能对重写提交进行初始化"
15372
6937cb4e 15373#: git-rebase--interactive.sh:993
5c57d762
JX
15374#, sh-format
15375msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
15376msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
15377msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
15378msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
15379
6937cb4e 15380#: git-rebase--interactive.sh:998
5c57d762
JX
15381msgid ""
15382"\n"
15383"However, if you remove everything, the rebase will be aborted.\n"
15384"\n"
a0b6b246
JX
15385msgstr ""
15386"\n"
15387"然而,如果您删除全部内容,变基操作将会终止。\n"
15388"\n"
5c57d762 15389
6937cb4e 15390#: git-rebase--interactive.sh:1005
5c57d762
JX
15391msgid "Note that empty commits are commented out"
15392msgstr "注意空提交已被注释掉"
15393
15394#: git-sh-setup.sh:89 git-sh-setup.sh:94
15395#, sh-format
15396msgid "usage: $dashless $USAGE"
15397msgstr "用法:$dashless $USAGE"
15398
15399#: git-sh-setup.sh:190
15400#, sh-format
15401msgid "Cannot chdir to $cdup, the toplevel of the working tree"
9a4b694c 15402msgstr "不能切换目录到 $cdup,工作区的顶级目录"
5c57d762
JX
15403
15404#: git-sh-setup.sh:199 git-sh-setup.sh:206
15405#, sh-format
15406msgid "fatal: $program_name cannot be used without a working tree."
15407msgstr "严重错误:$program_name 不能在没有工作区的情况下使用"
15408
15409#: git-sh-setup.sh:220
15410msgid "Cannot rebase: You have unstaged changes."
15411msgstr "不能变基:您有未暂存的变更。"
15412
15413#: git-sh-setup.sh:223
15414msgid "Cannot rewrite branches: You have unstaged changes."
15415msgstr "不能重写分支:您有未暂存的变更。"
15416
a0b6b246
JX
15417#: git-sh-setup.sh:226
15418msgid "Cannot pull with rebase: You have unstaged changes."
15419msgstr "无法通过变基方式拉取:您有未暂存的变更。"
15420
5c57d762
JX
15421#: git-sh-setup.sh:229
15422#, sh-format
15423msgid "Cannot $action: You have unstaged changes."
15424msgstr "不能 $action:您有未暂存的变更。"
15425
15426#: git-sh-setup.sh:242
15427msgid "Cannot rebase: Your index contains uncommitted changes."
15428msgstr "不能变基:您的索引中包含未提交的变更。"
15429
a0b6b246
JX
15430#: git-sh-setup.sh:245
15431msgid "Cannot pull with rebase: Your index contains uncommitted changes."
15432msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
15433
5c57d762
JX
15434#: git-sh-setup.sh:248
15435#, sh-format
15436msgid "Cannot $action: Your index contains uncommitted changes."
15437msgstr "不能 $action:您的索引中包含未提交的变更。"
15438
a0b6b246
JX
15439#: git-sh-setup.sh:252
15440msgid "Additionally, your index contains uncommitted changes."
15441msgstr "而且您的索引中包含未提交的变更。"
15442
5c57d762
JX
15443#: git-sh-setup.sh:372
15444msgid "You need to run this command from the toplevel of the working tree."
15445msgstr "您需要在工作区的顶级目录中运行这个命令。"
15446
15447#: git-sh-setup.sh:377
15448msgid "Unable to determine absolute path of git directory"
15449msgstr "不能确定 git 目录的绝对路径"
a0b6b246 15450
1a79b2f1 15451#. TRANSLATORS: you can adjust this to align "git add -i" status menu
a4f16749 15452#: git-add--interactive.perl:196
1a79b2f1
JX
15453#, perl-format
15454msgid "%12s %12s %s"
15455msgstr "%12s %12s %s"
15456
a4f16749 15457#: git-add--interactive.perl:197
1a79b2f1
JX
15458msgid "staged"
15459msgstr "缓存"
15460
a4f16749 15461#: git-add--interactive.perl:197
1a79b2f1
JX
15462msgid "unstaged"
15463msgstr "未缓存"
15464
a4f16749 15465#: git-add--interactive.perl:246 git-add--interactive.perl:271
1a79b2f1
JX
15466msgid "binary"
15467msgstr "二进制"
15468
a4f16749 15469#: git-add--interactive.perl:255 git-add--interactive.perl:309
1a79b2f1
JX
15470msgid "nothing"
15471msgstr "无"
15472
a4f16749 15473#: git-add--interactive.perl:291 git-add--interactive.perl:306
1a79b2f1
JX
15474msgid "unchanged"
15475msgstr "没有修改"
15476
a4f16749 15477#: git-add--interactive.perl:602
1a79b2f1
JX
15478#, perl-format
15479msgid "added %d path\n"
15480msgid_plural "added %d paths\n"
15481msgstr[0] "增加了 %d 个路径\n"
15482msgstr[1] "增加了 %d 个路径\n"
15483
a4f16749 15484#: git-add--interactive.perl:605
1a79b2f1
JX
15485#, perl-format
15486msgid "updated %d path\n"
15487msgid_plural "updated %d paths\n"
15488msgstr[0] "更新了 %d 个路径\n"
15489msgstr[1] "更新了 %d 个路径\n"
15490
a4f16749 15491#: git-add--interactive.perl:608
1a79b2f1
JX
15492#, perl-format
15493msgid "reverted %d path\n"
15494msgid_plural "reverted %d paths\n"
15495msgstr[0] "还原了 %d 个路径\n"
15496msgstr[1] "还原了 %d 个路径\n"
15497
a4f16749 15498#: git-add--interactive.perl:611
1a79b2f1
JX
15499#, perl-format
15500msgid "touched %d path\n"
15501msgid_plural "touched %d paths\n"
15502msgstr[0] "触碰了 %d 个路径\n"
15503msgstr[1] "触碰了 %d 个路径\n"
15504
a4f16749 15505#: git-add--interactive.perl:620
1a79b2f1
JX
15506msgid "Update"
15507msgstr "更新"
15508
a4f16749 15509#: git-add--interactive.perl:632
1a79b2f1
JX
15510msgid "Revert"
15511msgstr "还原"
15512
a4f16749 15513#: git-add--interactive.perl:655
1a79b2f1
JX
15514#, perl-format
15515msgid "note: %s is untracked now.\n"
15516msgstr "说明:%s 现已成为未跟踪的。\n"
15517
a4f16749 15518#: git-add--interactive.perl:666
1a79b2f1
JX
15519msgid "Add untracked"
15520msgstr "添加未跟踪的"
15521
a4f16749 15522#: git-add--interactive.perl:672
1a79b2f1
JX
15523msgid "No untracked files.\n"
15524msgstr "没有未跟踪的文件。\n"
15525
a4f16749 15526#: git-add--interactive.perl:985
1a79b2f1
JX
15527msgid ""
15528"If the patch applies cleanly, the edited hunk will immediately be\n"
15529"marked for staging."
15530msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
15531
a4f16749 15532#: git-add--interactive.perl:988
1a79b2f1
JX
15533msgid ""
15534"If the patch applies cleanly, the edited hunk will immediately be\n"
15535"marked for stashing."
a4f16749 15536msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。"
1a79b2f1 15537
a4f16749 15538#: git-add--interactive.perl:991
1a79b2f1
JX
15539msgid ""
15540"If the patch applies cleanly, the edited hunk will immediately be\n"
15541"marked for unstaging."
15542msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
15543
a4f16749 15544#: git-add--interactive.perl:994 git-add--interactive.perl:1003
1a79b2f1
JX
15545msgid ""
15546"If the patch applies cleanly, the edited hunk will immediately be\n"
15547"marked for applying."
15548msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
15549
a4f16749 15550#: git-add--interactive.perl:997 git-add--interactive.perl:1000
1a79b2f1
JX
15551msgid ""
15552"If the patch applies cleanly, the edited hunk will immediately be\n"
15553"marked for discarding."
15554msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
15555
a4f16749 15556#: git-add--interactive.perl:1013
1a79b2f1
JX
15557#, perl-format
15558msgid "failed to open hunk edit file for writing: %s"
15559msgstr "无法写入块编辑文件:%s"
15560
a4f16749 15561#: git-add--interactive.perl:1014
1a79b2f1
JX
15562msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
15563msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
15564
a4f16749 15565#: git-add--interactive.perl:1020
1a79b2f1
JX
15566#, perl-format
15567msgid ""
15568"---\n"
15569"To remove '%s' lines, make them ' ' lines (context).\n"
15570"To remove '%s' lines, delete them.\n"
15571"Lines starting with %s will be removed.\n"
15572msgstr ""
15573"---\n"
15574"要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
15575"要删除 '%s' 开始的行,删除它们。\n"
15576"以 %s 开始的行将被删除。\n"
15577
15578#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
a4f16749 15579#: git-add--interactive.perl:1028
1a79b2f1
JX
15580msgid ""
15581"If it does not apply cleanly, you will be given an opportunity to\n"
15582"edit again. If all lines of the hunk are removed, then the edit is\n"
15583"aborted and the hunk is left unchanged.\n"
15584msgstr ""
15585"如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
15586"此次编辑被终止,该块不会被修改。\n"
15587
a4f16749 15588#: git-add--interactive.perl:1042
1a79b2f1
JX
15589#, perl-format
15590msgid "failed to open hunk edit file for reading: %s"
15591msgstr "无法读取块编辑文件:%s"
15592
15593#. TRANSLATORS: do not translate [y/n]
15594#. The program will only accept that input
15595#. at this point.
15596#. Consider translating (saying "no" discards!) as
15597#. (saying "n" for "no" discards!) if the translation
15598#. of the word "no" does not start with n.
a4f16749 15599#: git-add--interactive.perl:1134
1a79b2f1
JX
15600msgid ""
15601"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
15602msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
15603
a4f16749 15604#: git-add--interactive.perl:1143
1a79b2f1
JX
15605msgid ""
15606"y - stage this hunk\n"
15607"n - do not stage this hunk\n"
15608"q - quit; do not stage this hunk or any of the remaining ones\n"
15609"a - stage this hunk and all later hunks in the file\n"
15610"d - do not stage this hunk or any of the later hunks in the file"
15611msgstr ""
15612"y - 暂存该块\n"
15613"n - 不要暂存该块\n"
15614"q - 退出。不暂存该块及后面的全部块\n"
15615"a - 暂存该块和本文件中后面的全部块\n"
15616"d - 不暂存该块和本文件中后面的全部块"
15617
a4f16749 15618#: git-add--interactive.perl:1149
1a79b2f1
JX
15619msgid ""
15620"y - stash this hunk\n"
15621"n - do not stash this hunk\n"
15622"q - quit; do not stash this hunk or any of the remaining ones\n"
15623"a - stash this hunk and all later hunks in the file\n"
15624"d - do not stash this hunk or any of the later hunks in the file"
15625msgstr ""
15626"y - 贮藏该块\n"
15627"n - 不要贮藏该块\n"
15628"q - 退出。不贮藏该块及后面的全部块\n"
15629"a - 贮藏该块和本文件中后面的全部块\n"
15630"d - 不贮藏该块和本文件中后面的全部块"
15631
a4f16749 15632#: git-add--interactive.perl:1155
1a79b2f1
JX
15633msgid ""
15634"y - unstage this hunk\n"
15635"n - do not unstage this hunk\n"
15636"q - quit; do not unstage this hunk or any of the remaining ones\n"
15637"a - unstage this hunk and all later hunks in the file\n"
15638"d - do not unstage this hunk or any of the later hunks in the file"
15639msgstr ""
15640"y - 不暂存该块\n"
15641"n - 不要不暂存该块\n"
15642"q - 退出。不要不暂存该块及后面的全部块\n"
15643"a - 不暂存该块和本文件中后面的全部块\n"
15644"d - 不要不暂存该块和本文件中后面的全部块"
15645
a4f16749 15646#: git-add--interactive.perl:1161
1a79b2f1
JX
15647msgid ""
15648"y - apply this hunk to index\n"
15649"n - do not apply this hunk to index\n"
15650"q - quit; do not apply this hunk or any of the remaining ones\n"
15651"a - apply this hunk and all later hunks in the file\n"
15652"d - do not apply this hunk or any of the later hunks in the file"
15653msgstr ""
15654"y - 在索引中应用该块\n"
15655"n - 不要在索引中应用该块\n"
15656"q - 退出。不要应用该块及后面的全部块\n"
15657"a - 应用该块和本文件中后面的全部块\n"
15658"d - 不要应用该块和本文件中后面的全部块"
15659
a4f16749 15660#: git-add--interactive.perl:1167
1a79b2f1
JX
15661msgid ""
15662"y - discard this hunk from worktree\n"
15663"n - do not discard this hunk from worktree\n"
15664"q - quit; do not discard this hunk or any of the remaining ones\n"
15665"a - discard this hunk and all later hunks in the file\n"
15666"d - do not discard this hunk or any of the later hunks in the file"
15667msgstr ""
15668"y - 在工作区中丢弃该块\n"
15669"n - 不要在工作区中丢弃该块\n"
15670"q - 退出。不要丢弃该块及后面的全部块\n"
15671"a - 丢弃该块和本文件中后面的全部块\n"
15672"d - 不要丢弃该块和本文件中后面的全部块"
15673
a4f16749 15674#: git-add--interactive.perl:1173
1a79b2f1
JX
15675msgid ""
15676"y - discard this hunk from index and worktree\n"
15677"n - do not discard this hunk from index and worktree\n"
15678"q - quit; do not discard this hunk or any of the remaining ones\n"
15679"a - discard this hunk and all later hunks in the file\n"
15680"d - do not discard this hunk or any of the later hunks in the file"
15681msgstr ""
15682"y - 在索引和工作区中丢弃该块\n"
15683"n - 不要在索引和工作区中丢弃该块\n"
15684"q - 退出。不要丢弃该块及后面的全部块\n"
15685"a - 丢弃该块和本文件中后面的全部块\n"
15686"d - 不要丢弃该块和本文件中后面的全部块"
15687
a4f16749 15688#: git-add--interactive.perl:1179
1a79b2f1
JX
15689msgid ""
15690"y - apply this hunk to index and worktree\n"
15691"n - do not apply this hunk to index and worktree\n"
15692"q - quit; do not apply this hunk or any of the remaining ones\n"
15693"a - apply this hunk and all later hunks in the file\n"
15694"d - do not apply this hunk or any of the later hunks in the file"
15695msgstr ""
15696"y - 在索引和工作区中应用该块\n"
15697"n - 不要在索引和工作区中应用该块\n"
15698"q - 退出。不要应用该块及后面的全部块\n"
15699"a - 应用该块和本文件中后面的全部块\n"
15700"d - 不要应用该块和本文件中后面的全部块"
15701
a4f16749 15702#: git-add--interactive.perl:1188
1a79b2f1
JX
15703msgid ""
15704"g - select a hunk to go to\n"
15705"/ - search for a hunk matching the given regex\n"
15706"j - leave this hunk undecided, see next undecided hunk\n"
15707"J - leave this hunk undecided, see next hunk\n"
15708"k - leave this hunk undecided, see previous undecided hunk\n"
15709"K - leave this hunk undecided, see previous hunk\n"
15710"s - split the current hunk into smaller hunks\n"
15711"e - manually edit the current hunk\n"
15712"? - print help\n"
15713msgstr ""
15714"g - 选择跳转到一个块\n"
15715"/ - 查找和给定正则表达式匹配的块\n"
15716"j - 维持该块未决状态,查看下一个未决块\n"
15717"J - 维持该块未决状态,查看下一个块\n"
15718"k - 维持该块未决状态,查看上一个未决块\n"
15719"K - 维持该块未决状态,查看上一个块\n"
15720"s - 拆分当前块为更小的块\n"
15721"e - 手动编辑当前块\n"
15722"? - 显示帮助\n"
15723
a4f16749 15724#: git-add--interactive.perl:1219
1a79b2f1
JX
15725msgid "The selected hunks do not apply to the index!\n"
15726msgstr "选中的块不能应用到索引!\n"
15727
a4f16749 15728#: git-add--interactive.perl:1220
1a79b2f1
JX
15729msgid "Apply them to the worktree anyway? "
15730msgstr "无论如何都要应用到工作区么?"
15731
a4f16749 15732#: git-add--interactive.perl:1223
1a79b2f1
JX
15733msgid "Nothing was applied.\n"
15734msgstr "未应用。\n"
15735
a4f16749 15736#: git-add--interactive.perl:1234
1a79b2f1
JX
15737#, perl-format
15738msgid "ignoring unmerged: %s\n"
15739msgstr "忽略未合入的:%s\n"
15740
a4f16749 15741#: git-add--interactive.perl:1243
1a79b2f1
JX
15742msgid "Only binary files changed.\n"
15743msgstr "只有二进制文件被修改。\n"
15744
a4f16749 15745#: git-add--interactive.perl:1245
1a79b2f1
JX
15746msgid "No changes.\n"
15747msgstr "没有修改。\n"
15748
a4f16749 15749#: git-add--interactive.perl:1253
1a79b2f1
JX
15750msgid "Patch update"
15751msgstr "补丁更新"
15752
a4f16749 15753#: git-add--interactive.perl:1305
1a79b2f1
JX
15754#, perl-format
15755msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
15756msgstr "暂存状态修改 [y,n,q,a,d,/%s,?]? "
15757
a4f16749 15758#: git-add--interactive.perl:1306
1a79b2f1
JX
15759#, perl-format
15760msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
15761msgstr "暂存状态删除 [y,n,q,a,d,/%s,?]? "
15762
a4f16749 15763#: git-add--interactive.perl:1307
1a79b2f1
JX
15764#, perl-format
15765msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
15766msgstr "暂存该块 [y,n,q,a,d,/%s,?]? "
15767
a4f16749 15768#: git-add--interactive.perl:1310
1a79b2f1
JX
15769#, perl-format
15770msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
15771msgstr "贮藏状态修改 [y,n,q,a,d,/%s,?]? "
15772
a4f16749 15773#: git-add--interactive.perl:1311
1a79b2f1
JX
15774#, perl-format
15775msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
15776msgstr "贮藏状态删除 [y,n,q,a,d,/%s,?]? "
15777
a4f16749 15778#: git-add--interactive.perl:1312
1a79b2f1
JX
15779#, perl-format
15780msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
15781msgstr "贮藏该块 [y,n,q,a,d,/%s,?]? "
15782
a4f16749 15783#: git-add--interactive.perl:1315
1a79b2f1
JX
15784#, perl-format
15785msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
15786msgstr "未暂存状态修改 [y,n,q,a,d,/%s,?]? "
15787
a4f16749 15788#: git-add--interactive.perl:1316
1a79b2f1
JX
15789#, perl-format
15790msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
15791msgstr "未暂存状态删除 [y,n,q,a,d,/%s,?]? "
15792
a4f16749 15793#: git-add--interactive.perl:1317
1a79b2f1
JX
15794#, perl-format
15795msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
15796msgstr "不暂存该块 [y,n,q,a,d,/%s,?]? "
15797
a4f16749 15798#: git-add--interactive.perl:1320
1a79b2f1
JX
15799#, perl-format
15800msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
15801msgstr "修改索引中的应用状态 [y,n,q,a,d,/%s,?]? "
15802
a4f16749 15803#: git-add--interactive.perl:1321
1a79b2f1
JX
15804#, perl-format
15805msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
15806msgstr "从索引中删除应用状态 [y,n,q,a,d,/%s,?]? "
15807
a4f16749 15808#: git-add--interactive.perl:1322
1a79b2f1
JX
15809#, perl-format
15810msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
15811msgstr "将此块应用到索引 [y,n,q,a,d,/%s,?]? "
15812
a4f16749 15813#: git-add--interactive.perl:1325
1a79b2f1
JX
15814#, perl-format
15815msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
15816msgstr "修改工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
15817
a4f16749 15818#: git-add--interactive.perl:1326
1a79b2f1
JX
15819#, perl-format
15820msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
15821msgstr "从工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
15822
a4f16749 15823#: git-add--interactive.perl:1327
1a79b2f1
JX
15824#, perl-format
15825msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
15826msgstr "从工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
15827
a4f16749 15828#: git-add--interactive.perl:1330
1a79b2f1
JX
15829#, perl-format
15830msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
15831msgstr "修改索引和工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
15832
a4f16749 15833#: git-add--interactive.perl:1331
1a79b2f1
JX
15834#, perl-format
15835msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
15836msgstr "从索引和工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
15837
a4f16749 15838#: git-add--interactive.perl:1332
1a79b2f1
JX
15839#, perl-format
15840msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
15841msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
15842
a4f16749 15843#: git-add--interactive.perl:1335
1a79b2f1
JX
15844#, perl-format
15845msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
15846msgstr "修改索引和工作区中的应用状态 [y,n,q,a,d,/%s,?]? "
15847
a4f16749 15848#: git-add--interactive.perl:1336
1a79b2f1
JX
15849#, perl-format
15850msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
15851msgstr "从索引和工作区中删除应用状态 [y,n,q,a,d,/%s,?]? "
15852
a4f16749 15853#: git-add--interactive.perl:1337
1a79b2f1
JX
15854#, perl-format
15855msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
15856msgstr "在索引和工作区中应用该块 [y,n,q,a,d,/%s,?]? "
15857
a4f16749 15858#: git-add--interactive.perl:1440
1a79b2f1
JX
15859msgid "go to which hunk (<ret> to see more)? "
15860msgstr "跳转到哪个块(<回车> 查看更多)? "
15861
a4f16749 15862#: git-add--interactive.perl:1442
1a79b2f1
JX
15863msgid "go to which hunk? "
15864msgstr "跳转到哪个块?"
15865
a4f16749 15866#: git-add--interactive.perl:1451
1a79b2f1
JX
15867#, perl-format
15868msgid "Invalid number: '%s'\n"
15869msgstr "无效数字:'%s'\n"
15870
a4f16749 15871#: git-add--interactive.perl:1456
1a79b2f1
JX
15872#, perl-format
15873msgid "Sorry, only %d hunk available.\n"
15874msgid_plural "Sorry, only %d hunks available.\n"
15875msgstr[0] "对不起,只有 %d 个可用块。\n"
15876msgstr[1] "对不起,只有 %d 个可用块。\n"
15877
a4f16749 15878#: git-add--interactive.perl:1482
1a79b2f1
JX
15879msgid "search for regex? "
15880msgstr "使用正则表达式搜索?"
15881
a4f16749 15882#: git-add--interactive.perl:1495
1a79b2f1
JX
15883#, perl-format
15884msgid "Malformed search regexp %s: %s\n"
15885msgstr "错误的正则表达式 %s:%s\n"
15886
a4f16749 15887#: git-add--interactive.perl:1505
1a79b2f1
JX
15888msgid "No hunk matches the given pattern\n"
15889msgstr "没有和给定模式相匹配的快\n"
15890
a4f16749 15891#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
1a79b2f1
JX
15892msgid "No previous hunk\n"
15893msgstr "没有前一个块\n"
15894
a4f16749 15895#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
1a79b2f1
JX
15896msgid "No next hunk\n"
15897msgstr "没有下一个块\n"
15898
a4f16749 15899#: git-add--interactive.perl:1553
1a79b2f1
JX
15900#, perl-format
15901msgid "Split into %d hunk.\n"
15902msgid_plural "Split into %d hunks.\n"
15903msgstr[0] "拆分为 %d 块。\n"
15904msgstr[1] "拆分为 %d 块。\n"
15905
a4f16749 15906#: git-add--interactive.perl:1605
1a79b2f1
JX
15907msgid "Review diff"
15908msgstr "检视 diff"
15909
15910#. TRANSLATORS: please do not translate the command names
15911#. 'status', 'update', 'revert', etc.
a4f16749 15912#: git-add--interactive.perl:1624
1a79b2f1
JX
15913msgid ""
15914"status - show paths with changes\n"
15915"update - add working tree state to the staged set of changes\n"
15916"revert - revert staged set of changes back to the HEAD version\n"
15917"patch - pick hunks and update selectively\n"
87cb7997 15918"diff - view diff between HEAD and index\n"
1a79b2f1
JX
15919"add untracked - add contents of untracked files to the staged set of "
15920"changes\n"
15921msgstr ""
15922"status - 显示含变更的路径\n"
15923"update - 添加工作区状态至暂存列表\n"
15924"revert - 还原修改的暂存集至 HEAD 版本\n"
15925"patch - 挑选块并且有选择地更新\n"
15926"diff - 显示 HEAD 和索引间差异\n"
15927"add untracked - 添加未跟踪文件的内容至暂存列表\n"
15928
a4f16749
JX
15929#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
15930#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
15931#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
1a79b2f1
JX
15932msgid "missing --"
15933msgstr "缺失 --"
15934
a4f16749 15935#: git-add--interactive.perl:1662
1a79b2f1
JX
15936#, perl-format
15937msgid "unknown --patch mode: %s"
15938msgstr "未知的 --patch 模式:%s"
15939
a4f16749 15940#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
1a79b2f1
JX
15941#, perl-format
15942msgid "invalid argument %s, expecting --"
15943msgstr "无效的参数 %s,期望是 --"
15944
a4f16749 15945#: git-send-email.perl:126
1a79b2f1
JX
15946msgid "local zone differs from GMT by a non-minute interval\n"
15947msgstr "本地时间和 GMT 有不到一分钟间隔\n"
15948
a4f16749 15949#: git-send-email.perl:133 git-send-email.perl:139
1a79b2f1
JX
15950msgid "local time offset greater than or equal to 24 hours\n"
15951msgstr "本地时间偏移量大于等于 24 小时\n"
15952
6937cb4e 15953#: git-send-email.perl:207 git-send-email.perl:213
1a79b2f1
JX
15954msgid "the editor exited uncleanly, aborting everything"
15955msgstr "编辑器非正常退出,终止所有操作"
15956
6937cb4e 15957#: git-send-email.perl:290
1a79b2f1
JX
15958#, perl-format
15959msgid ""
15960"'%s' contains an intermediate version of the email you were composing.\n"
15961msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
15962
6937cb4e 15963#: git-send-email.perl:295
1a79b2f1
JX
15964#, perl-format
15965msgid "'%s.final' contains the composed email.\n"
15966msgstr "'%s.final' 包含编辑的邮件。\n"
15967
6937cb4e 15968#: git-send-email.perl:313
1a79b2f1
JX
15969msgid "--dump-aliases incompatible with other options\n"
15970msgstr "--dump-aliases 和其它选项不兼容\n"
15971
6937cb4e 15972#: git-send-email.perl:378 git-send-email.perl:629
1a79b2f1
JX
15973msgid "Cannot run git format-patch from outside a repository\n"
15974msgstr "不能在仓库之外运行 git format-patch\n"
15975
6937cb4e 15976#: git-send-email.perl:447
1a79b2f1
JX
15977#, perl-format
15978msgid "Unknown --suppress-cc field: '%s'\n"
15979msgstr "未知的 --suppress-cc 字段:'%s'\n"
15980
6937cb4e 15981#: git-send-email.perl:476
1a79b2f1
JX
15982#, perl-format
15983msgid "Unknown --confirm setting: '%s'\n"
15984msgstr "未知的 --confirm 设置:'%s'\n"
15985
6937cb4e 15986#: git-send-email.perl:504
1a79b2f1
JX
15987#, perl-format
15988msgid "warning: sendmail alias with quotes is not supported: %s\n"
15989msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
15990
6937cb4e 15991#: git-send-email.perl:506
1a79b2f1
JX
15992#, perl-format
15993msgid "warning: `:include:` not supported: %s\n"
15994msgstr "警告:不支持 `:include:`:%s\n"
15995
6937cb4e 15996#: git-send-email.perl:508
1a79b2f1
JX
15997#, perl-format
15998msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
15999msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
16000
6937cb4e 16001#: git-send-email.perl:513
1a79b2f1
JX
16002#, perl-format
16003msgid "warning: sendmail line is not recognized: %s\n"
16004msgstr "警告:不能识别的 sendmail 行:%s\n"
16005
6937cb4e 16006#: git-send-email.perl:595
1a79b2f1
JX
16007#, perl-format
16008msgid ""
16009"File '%s' exists but it could also be the range of commits\n"
16010"to produce patches for. Please disambiguate by...\n"
16011"\n"
16012" * Saying \"./%s\" if you mean a file; or\n"
16013" * Giving --format-patch option if you mean a range.\n"
16014msgstr ""
87cb7997
JX
16015"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
16016"歧义:\n"
1a79b2f1
JX
16017"\n"
16018" * 如果含义为一个文件,使用 \"./%s\",或者\n"
16019" * 如果含义为一个范围,使用 --format-patch 选项。\n"
16020
6937cb4e 16021#: git-send-email.perl:616
1a79b2f1
JX
16022#, perl-format
16023msgid "Failed to opendir %s: %s"
16024msgstr "无法打开目录 %s: %s"
16025
6937cb4e 16026#: git-send-email.perl:640
1a79b2f1
JX
16027#, perl-format
16028msgid ""
16029"fatal: %s: %s\n"
16030"warning: no patches were sent\n"
16031msgstr ""
16032"严重:%s:%s\n"
16033"警告:补丁未能发送\n"
16034
6937cb4e 16035#: git-send-email.perl:651
1a79b2f1
JX
16036msgid ""
16037"\n"
16038"No patch files specified!\n"
16039"\n"
87cb7997
JX
16040msgstr ""
16041"\n"
16042"未指定补丁文件!\n"
16043"\n"
1a79b2f1 16044
6937cb4e 16045#: git-send-email.perl:664
1a79b2f1
JX
16046#, perl-format
16047msgid "No subject line in %s?"
16048msgstr "在 %s 中没有标题行?"
16049
6937cb4e 16050#: git-send-email.perl:674
1a79b2f1
JX
16051#, perl-format
16052msgid "Failed to open for writing %s: %s"
16053msgstr "无法写入 %s: %s"
16054
6937cb4e 16055#: git-send-email.perl:684
1a79b2f1
JX
16056msgid ""
16057"Lines beginning in \"GIT:\" will be removed.\n"
16058"Consider including an overall diffstat or table of contents\n"
16059"for the patch you are writing.\n"
16060"\n"
16061"Clear the body content if you don't wish to send a summary.\n"
16062msgstr ""
16063"以 \"GIT:\" 开头的行将被删除。\n"
16064"考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n"
16065"\n"
16066"如果您不想发送摘要,清除内容。\n"
16067
6937cb4e 16068#: git-send-email.perl:707
1a79b2f1
JX
16069#, perl-format
16070msgid "Failed to open %s.final: %s"
16071msgstr "无法打开 %s.final: %s"
16072
6937cb4e 16073#: git-send-email.perl:710
1a79b2f1
JX
16074#, perl-format
16075msgid "Failed to open %s: %s"
16076msgstr "无法打开 %s: %s"
16077
6937cb4e 16078#: git-send-email.perl:745
1a79b2f1
JX
16079msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
16080msgstr "To/Cc/Bcc 字段不解析,它们被忽略\n"
16081
6937cb4e 16082#: git-send-email.perl:754
1a79b2f1
JX
16083msgid "Summary email is empty, skipping it\n"
16084msgstr "摘要邮件为空,跳过\n"
16085
16086#. TRANSLATORS: please keep [y/N] as is.
6937cb4e 16087#: git-send-email.perl:786
1a79b2f1
JX
16088#, perl-format
16089msgid "Are you sure you want to use <%s> [y/N]? "
16090msgstr "您确认要使用 <%s> [y/N]?"
16091
6937cb4e 16092#: git-send-email.perl:815
1a79b2f1
JX
16093msgid ""
16094"The following files are 8bit, but do not declare a Content-Transfer-"
16095"Encoding.\n"
16096msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
16097
6937cb4e 16098#: git-send-email.perl:820
1a79b2f1
JX
16099msgid "Which 8bit encoding should I declare [UTF-8]? "
16100msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?"
16101
6937cb4e 16102#: git-send-email.perl:828
1a79b2f1
JX
16103#, perl-format
16104msgid ""
16105"Refusing to send because the patch\n"
16106"\t%s\n"
16107"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
16108"want to send.\n"
16109msgstr ""
16110"拒绝发送,因为补丁\n"
16111"\t%s\n"
16112"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
16113
6937cb4e 16114#: git-send-email.perl:847
1a79b2f1
JX
16115msgid "To whom should the emails be sent (if anyone)?"
16116msgstr "邮件将要发送给谁?"
16117
6937cb4e 16118#: git-send-email.perl:865
1a79b2f1
JX
16119#, perl-format
16120msgid "fatal: alias '%s' expands to itself\n"
16121msgstr "严重:别名 '%s' 扩展为它自己\n"
16122
6937cb4e 16123#: git-send-email.perl:877
1a79b2f1
JX
16124msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
16125msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?"
16126
6937cb4e 16127#: git-send-email.perl:927 git-send-email.perl:935
1a79b2f1
JX
16128#, perl-format
16129msgid "error: unable to extract a valid address from: %s\n"
16130msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
16131
16132#. TRANSLATORS: Make sure to include [q] [d] [e] in your
16133#. translation. The program will only accept English input
16134#. at this point.
6937cb4e 16135#: git-send-email.perl:939
1a79b2f1
JX
16136msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
16137msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):"
16138
6937cb4e 16139#: git-send-email.perl:1260
1a79b2f1
JX
16140#, perl-format
16141msgid "CA path \"%s\" does not exist"
16142msgstr "CA 路径 \"%s\" 不存在"
16143
6937cb4e 16144#: git-send-email.perl:1335
1a79b2f1
JX
16145msgid ""
16146" The Cc list above has been expanded by additional\n"
16147" addresses found in the patch commit message. By default\n"
16148" send-email prompts before sending whenever this occurs.\n"
16149" This behavior is controlled by the sendemail.confirm\n"
16150" configuration setting.\n"
16151"\n"
16152" For additional information, run 'git send-email --help'.\n"
16153" To retain the current behavior, but squelch this message,\n"
16154" run 'git config --global sendemail.confirm auto'.\n"
16155"\n"
16156msgstr ""
16157" 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n"
16158" 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
16159" sendemail.confirm 配置设置。\n"
16160"\n"
16161" 更多信息,执行 'git send-email --help'。\n"
16162" 要保持当前行为,但不显示此信息,运行 'git config --global\n"
16163" sendemail.confirm auto'。\n"
16164"\n"
16165
16166#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
16167#. translation. The program will only accept English input
16168#. at this point.
6937cb4e 16169#: git-send-email.perl:1350
1a79b2f1
JX
16170msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
16171msgstr "发送邮件?([y]es|[n]o|[q]uit|[a]ll):"
16172
6937cb4e 16173#: git-send-email.perl:1353
1a79b2f1
JX
16174msgid "Send this email reply required"
16175msgstr "发送要求的邮件回复"
16176
6937cb4e 16177#: git-send-email.perl:1379
1a79b2f1
JX
16178msgid "The required SMTP server is not properly defined."
16179msgstr "要求的 SMTP 服务器未被正确定义。"
16180
6937cb4e 16181#: git-send-email.perl:1426
1a79b2f1
JX
16182#, perl-format
16183msgid "Server does not support STARTTLS! %s"
16184msgstr "服务器不支持 STARTTLS!%s"
16185
6937cb4e 16186#: git-send-email.perl:1431 git-send-email.perl:1435
a4f16749
JX
16187#, perl-format
16188msgid "STARTTLS failed! %s"
16189msgstr "STARTTLS 失败!%s"
16190
6937cb4e 16191#: git-send-email.perl:1445
1a79b2f1
JX
16192msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
16193msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
16194
6937cb4e 16195#: git-send-email.perl:1463
1a79b2f1
JX
16196#, perl-format
16197msgid "Failed to send %s\n"
16198msgstr "无法发送 %s\n"
16199
6937cb4e 16200#: git-send-email.perl:1466
1a79b2f1
JX
16201#, perl-format
16202msgid "Dry-Sent %s\n"
16203msgstr "演习发送 %s\n"
16204
6937cb4e 16205#: git-send-email.perl:1466
1a79b2f1
JX
16206#, perl-format
16207msgid "Sent %s\n"
16208msgstr "正发送 %s\n"
16209
6937cb4e 16210#: git-send-email.perl:1468
1a79b2f1
JX
16211msgid "Dry-OK. Log says:\n"
16212msgstr "演习成功。日志说:\n"
16213
6937cb4e 16214#: git-send-email.perl:1468
1a79b2f1
JX
16215msgid "OK. Log says:\n"
16216msgstr "OK。日志说:\n"
16217
6937cb4e 16218#: git-send-email.perl:1480
1a79b2f1
JX
16219msgid "Result: "
16220msgstr "结果:"
16221
6937cb4e 16222#: git-send-email.perl:1483
1a79b2f1
JX
16223msgid "Result: OK\n"
16224msgstr "结果:OK\n"
16225
6937cb4e 16226#: git-send-email.perl:1496
1a79b2f1
JX
16227#, perl-format
16228msgid "can't open file %s"
16229msgstr "无法打开文件 %s"
16230
6937cb4e 16231#: git-send-email.perl:1543 git-send-email.perl:1563
1a79b2f1
JX
16232#, perl-format
16233msgid "(mbox) Adding cc: %s from line '%s'\n"
16234msgstr "(mbox) 添加 cc:%s 自行 '%s'\n"
16235
6937cb4e 16236#: git-send-email.perl:1549
1a79b2f1
JX
16237#, perl-format
16238msgid "(mbox) Adding to: %s from line '%s'\n"
16239msgstr "(mbox) 添加 to:%s 自行 '%s'\n"
16240
6937cb4e 16241#: git-send-email.perl:1597
1a79b2f1
JX
16242#, perl-format
16243msgid "(non-mbox) Adding cc: %s from line '%s'\n"
16244msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n"
16245
6937cb4e 16246#: git-send-email.perl:1622
1a79b2f1
JX
16247#, perl-format
16248msgid "(body) Adding cc: %s from line '%s'\n"
16249msgstr "(body) 添加 cc: %s 自行 '%s'\n"
16250
6937cb4e 16251#: git-send-email.perl:1728
1a79b2f1
JX
16252#, perl-format
16253msgid "(%s) Could not execute '%s'"
16254msgstr "(%s) 不能执行 '%s'"
16255
6937cb4e 16256#: git-send-email.perl:1735
1a79b2f1
JX
16257#, perl-format
16258msgid "(%s) Adding %s: %s from: '%s'\n"
16259msgstr "(%s) 添加 %s: %s 自:'%s'\n"
16260
6937cb4e 16261#: git-send-email.perl:1739
1a79b2f1
JX
16262#, perl-format
16263msgid "(%s) failed to close pipe to '%s'"
16264msgstr "(%s) 无法关闭管道至 '%s'"
16265
6937cb4e 16266#: git-send-email.perl:1766
1a79b2f1
JX
16267msgid "cannot send message as 7bit"
16268msgstr "不能以 7bit 形式发送信息"
16269
6937cb4e 16270#: git-send-email.perl:1774
1a79b2f1
JX
16271msgid "invalid transfer encoding"
16272msgstr "无效的传送编码"
16273
6937cb4e 16274#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
1a79b2f1
JX
16275#, perl-format
16276msgid "unable to open %s: %s\n"
16277msgstr "不能打开 %s:%s\n"
16278
6937cb4e 16279#: git-send-email.perl:1815
1a79b2f1
JX
16280#, perl-format
16281msgid "%s: patch contains a line longer than 998 characters"
16282msgstr "%s:补丁包含一个超过 998 字符的行"
16283
6937cb4e 16284#: git-send-email.perl:1831
1a79b2f1
JX
16285#, perl-format
16286msgid "Skipping %s with backup suffix '%s'.\n"
16287msgstr "略过 %s 含备份后缀 '%s'。\n"
16288
16289#. TRANSLATORS: please keep "[y|N]" as is.
6937cb4e 16290#: git-send-email.perl:1835
1a79b2f1
JX
16291#, perl-format
16292msgid "Do you really want to send %s? [y|N]: "
16293msgstr "您真的要发送 %s?[y|N]:"