blob: 622b61c95a69db0332161ce235d5b7e379a12869 [file] [log] [blame]
Jiang Xinc04f5ac2012-02-13 14:41:59 +08001# Chinese translations for Git package
2# Git 软件包的简体中文翻译.
Wang Sheng07432ce2013-01-30 17:23:08 +08003# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004# This file is distributed under the same license as the Git package.
Jiang Xin814ff312015-02-16 21:34:19 +08005# Contributors:
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006# - Jiang Xin <worldhello.net AT gmail.com>
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007# - Lian Cheng <rhythm.mail AT gmail.com>
Jiang Xinbbdf0ac2015-08-04 00:33:16 +08008# - Ray Chen <oldsharp AT gmail.com>
9# - Riku <lu.riku AT gmail.com>
10# - Thynson <lanxingcan AT gmail.com>
11# - ws3389 <willsmith3389 AT gmail.com>
12# - Wang Sheng <wangsheng2008love AT 163.com>
13# - Yichao Yu <yyc1992 AT gmail.com>
14# - Zhuang Ya <zhuangya AT me.com>
Jiang Xinc04f5ac2012-02-13 14:41:59 +080015#
Jiang Xin160fb2b2015-08-02 21:47:30 +080016# Git glossary for Chinese translators
17#
18# English | Chinese
19# ---------------------------------+--------------------------------------
20# 3-way merge | 三方合并
21# abbreviate | 简写(的 SHA-1 值)
22# alternate object database | 备用对象库
23# amend | 修补
24# ancestor | 祖先,祖先提交
25# annotated tag | 附注标签
26# bare repository | 纯仓库
27# bisect | 二分查找
28# blob object | 数据对象
29# branch | 分支
30# bundle | 包
31# bypass | 绕过
32# cache | 索引(的别称)
33# chain | (提交)链
34# changeset | 变更集
35# checkout | 检出
36# checksum | 校验,校验和
37# cherry-picking | 拣选
38# clean | 干净(的工作区)
39# clone | 克隆
40# commit | 提交
Ray Chen667599e2015-08-25 09:47:50 +080041# commit message | 提交说明
Jiang Xin160fb2b2015-08-02 21:47:30 +080042# commit object | 提交对象
43# commit-ish (also committish) | 提交号
44# conflict | 冲突
45# core Git | 核心 Git 工具
46# DAG | 有向无环图
47# dangling object | 摇摆对象
48# detached HEAD | 分离头指针
49# directory | 目录
50# dirty | 脏(的工作区)
Ray Chen755c8312015-08-20 09:39:17 +080051# dumb HTTP protocol | 哑 HTTP 协议
Jiang Xin160fb2b2015-08-02 21:47:30 +080052# evil merge | 坏合并(合并引入了父提交没有的修改)
53# fast-forward | 快进
54# fetch | 获取
55# file system | 文件系统
Ray Chene397e7e2015-08-20 11:01:34 +080056# fork | 派生
Jiang Xin160fb2b2015-08-02 21:47:30 +080057# Git archive | 仓库(对于 arch 用户)
58# gitfile | gitfile(仓库链接文件)
59# grafts | (提交)嫁接
60# hash | 哈希值
61# HEAD | HEAD(头指针,亦即当前分支)
62# head | 头、分支
63# head ref | 分支
64# header | 头信息
65# hook | 钩子
66# hunk | 补丁片段
67# index | 索引
68# index entry | 索引条目
69# loose object | 松散对象
70# loose refs | 松散引用
71# master | master(默认分支名)
72# merge | 合并
73# object | 对象
74# object database | 对象库
75# object identifier | 对象标识符
76# object name | 对象名称
77# object type | 对象类型
78# octopus | 章鱼式合并(两分支以上的合并)
79# origin | origin(默认的远程名称)
80# pack | 包
81# pack index | 包索引
82# packfile | 包文件
83# parent | 父提交
84# patch | 补丁
85# pathspec | 路径规格
86# pattern | 模式
Ray Chen12e59052015-08-20 15:24:01 +080087# pickaxe | 挖掘
Jiang Xin160fb2b2015-08-02 21:47:30 +080088# plumbing | 管件(Git 底层核心命令的别称)
89# porcelain | 瓷件(Git 上层封装命令的别称)
Jiang Xin94550ed2015-11-16 07:02:11 +080090# precious-objects repo | 珍品仓库
Jiang Xin160fb2b2015-08-02 21:47:30 +080091# prune | 清除
92# pull | 拉,拉取
93# push | 推,推送
94# reachable | 可达
95# rebase | 变基
96# ref | 引用
97# reflog | 引用日志
98# refspec | 引用规格
99# remote | 远程,远程仓库
100# remote-tracking branch | 远程跟踪分支
101# replay | 重放
102# repo | 仓库
103# repository | 仓库
104# resolve | (冲突)解决
105# revert | 还原
106# revision | 版本
107# rewind | 回退
108# SCM | 源代码管理(工具)
Ray Chenee7589b2015-08-20 09:17:09 +0800109# SHA-1 | SHA-1(安全哈希算法1)
Jiang Xin160fb2b2015-08-02 21:47:30 +0800110# shallow repository | 浅(克隆)仓库
111# signed tag | 签名标签
Ray Chen755c8312015-08-20 09:39:17 +0800112# smart HTTP protocol | 智能 HTTP 协议
Jiang Xin160fb2b2015-08-02 21:47:30 +0800113# squash | 压缩
114# stage | n. 暂存区(即索引); v. 暂存
115# stash | n. 进度保存; v. 保存进度
116# submodule | 子模组
117# symref | 符号引用
Ray Chen933c0152015-08-20 10:22:43 +0800118# tag | n. 标签; v. 打标签
Jiang Xin160fb2b2015-08-02 21:47:30 +0800119# tag object | 标签对象
120# tagger | 打标签者
121# topic branch | 主题分支
122# track | 跟踪
123# tree | 树(工作区或树对象)
124# tree object | 树对象
125# tree-ish (also treeish) | 树对象(或可以解析为一树对象)
126# unmerged index | 未合并索引
127# unpack | 解包
128# unreachable object | 不可达对象
129# unstage | 取消暂存
130# upstream | 上游
131# upstream branch | 上游分支
132# working tree | 工作区
133#
Jiang Xinc04f5ac2012-02-13 14:41:59 +0800134msgid ""
135msgstr ""
136"Project-Id-Version: Git\n"
137"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800138"POT-Creation-Date: 2017-02-18 01:00+0800\n"
139"PO-Revision-Date: 2017-02-25 00:10+0800\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +0800140"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
Jiang Xin7aea43f2015-05-31 08:42:31 +0800141"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +0800142"Language: zh_CN\n"
143"MIME-Version: 1.0\n"
144"Content-Type: text/plain; charset=UTF-8\n"
145"Content-Transfer-Encoding: 8bit\n"
Jiang Xin5ae481e2012-05-31 17:35:59 +0800146"Plural-Forms: nplurals=2; plural=(n != 1);\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +0800147
Jiang Xin6c94aba2014-03-13 12:41:34 +0800148#: advice.c:55
Jiang Xinc04f5ac2012-02-13 14:41:59 +0800149#, c-format
150msgid "hint: %.*s\n"
151msgstr "提示:%.*s\n"
152
Jiang Xin5c57d762016-08-28 10:18:12 +0800153#: advice.c:83
154msgid "Cherry-picking is not possible because you have unmerged files."
155msgstr "无法拣选,因为您有未合并的文件。"
156
157#: advice.c:85
158msgid "Committing is not possible because you have unmerged files."
159msgstr "无法提交,因为您有未合并的文件。"
160
161#: advice.c:87
162msgid "Merging is not possible because you have unmerged files."
163msgstr "无法合并,因为您有未合并的文件。"
164
165#: advice.c:89
166msgid "Pulling is not possible because you have unmerged files."
167msgstr "无法拉取,因为您有未合并的文件。"
168
169#: advice.c:91
170msgid "Reverting is not possible because you have unmerged files."
171msgstr "无法回退,因为您有未合并的文件。"
172
173#: advice.c:93
174#, c-format
175msgid "It is not possible to %s because you have unmerged files."
176msgstr "无法 %s,因为您有未合并的文件。"
177
178#: advice.c:101
Jiang Xinc04f5ac2012-02-13 14:41:59 +0800179msgid ""
Jiang Xin6acbf032014-08-04 16:23:15 +0800180"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
Jiang Xin220c3132014-10-08 10:55:14 +0800181"as appropriate to mark resolution and make a commit."
Jiang Xinc04f5ac2012-02-13 14:41:59 +0800182msgstr ""
Jiang Xind9d56b22015-01-18 20:37:57 +0800183"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
Jiang Xin220c3132014-10-08 10:55:14 +0800184"解决方案并提交。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +0800185
Jiang Xin5c57d762016-08-28 10:18:12 +0800186#: advice.c:109
187msgid "Exiting because of an unresolved conflict."
188msgstr "因为存在未解决的冲突而退出。"
189
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800190#: advice.c:114 builtin/merge.c:1206
Jiang Xin1b7f4a32015-08-23 15:23:21 +0800191msgid "You have not concluded your merge (MERGE_HEAD exists)."
192msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
193
Jiang Xin5c57d762016-08-28 10:18:12 +0800194#: advice.c:116
Jiang Xin94550ed2015-11-16 07:02:11 +0800195msgid "Please, commit your changes before merging."
Jiang Xin1b7f4a32015-08-23 15:23:21 +0800196msgstr "请在合并前先提交您的修改。"
197
Jiang Xin5c57d762016-08-28 10:18:12 +0800198#: advice.c:117
Jiang Xin1b7f4a32015-08-23 15:23:21 +0800199msgid "Exiting because of unfinished merge."
200msgstr "因为存在未完成的合并而退出。"
201
Jiang Xin5c57d762016-08-28 10:18:12 +0800202#: advice.c:123
203#, c-format
204msgid ""
205"Note: checking out '%s'.\n"
206"\n"
207"You are in 'detached HEAD' state. You can look around, make experimental\n"
208"changes and commit them, and you can discard any commits you make in this\n"
209"state without impacting any branches by performing another checkout.\n"
210"\n"
211"If you want to create a new branch to retain commits you create, you may\n"
212"do so (now or later) by using -b with the checkout command again. Example:\n"
213"\n"
214" git checkout -b <new-branch-name>\n"
215"\n"
216msgstr ""
217"注意:正在检出 '%s'。\n"
218"\n"
Jiang Xina0b6b242016-10-27 21:53:37 +0800219"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另"
220"外\n"
Jiang Xin5c57d762016-08-28 10:18:12 +0800221"的检出分支操作丢弃在这个状态下所做的任何提交。\n"
222"\n"
223"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n"
224"参数 -b 来实现(现在或稍后)。例如:\n"
225"\n"
226" git checkout -b <new-branch-name>\n"
227"\n"
228
Jiang Xina0b6b242016-10-27 21:53:37 +0800229#: apply.c:57
230#, c-format
231msgid "unrecognized whitespace option '%s'"
232msgstr "未能识别的空白字符选项 '%s'"
233
234#: apply.c:73
235#, c-format
236msgid "unrecognized whitespace ignore option '%s'"
237msgstr "未能识别的空白字符忽略选项 '%s'"
238
239#: apply.c:125
240msgid "--reject and --3way cannot be used together."
241msgstr "--reject 和 --3say 不能同时使用。"
242
243#: apply.c:127
244msgid "--cached and --3way cannot be used together."
245msgstr "--cached 和 --3way 不能同时使用。"
246
247#: apply.c:130
248msgid "--3way outside a repository"
249msgstr "--3way 在一个仓库之外"
250
251#: apply.c:141
252msgid "--index outside a repository"
253msgstr "--index 在一个仓库之外"
254
255#: apply.c:144
256msgid "--cached outside a repository"
257msgstr "--cached 在一个仓库之外"
258
259#: apply.c:845
260#, c-format
261msgid "Cannot prepare timestamp regexp %s"
262msgstr "无法准备时间戳正则表达式 %s"
263
264#: apply.c:854
265#, c-format
266msgid "regexec returned %d for input: %s"
267msgstr "regexec 返回 %d,输入为:%s"
268
269#: apply.c:938
270#, c-format
271msgid "unable to find filename in patch at line %d"
272msgstr "不能在补丁的第 %d 行找到文件名"
273
274#: apply.c:977
275#, c-format
276msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
277msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
278
279#: apply.c:983
280#, c-format
281msgid "git apply: bad git-diff - inconsistent new filename on line %d"
282msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
283
284#: apply.c:984
285#, c-format
286msgid "git apply: bad git-diff - inconsistent old filename on line %d"
287msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
288
289#: apply.c:990
290#, c-format
291msgid "git apply: bad git-diff - expected /dev/null on line %d"
292msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
293
294#: apply.c:1488
295#, c-format
296msgid "recount: unexpected line: %.*s"
297msgstr "recount:意外的行:%.*s"
298
299#: apply.c:1557
300#, c-format
301msgid "patch fragment without header at line %d: %.*s"
302msgstr "第 %d 行的补丁片段没有头信息:%.*s"
303
304#: apply.c:1577
305#, c-format
306msgid ""
307"git diff header lacks filename information when removing %d leading pathname "
308"component (line %d)"
309msgid_plural ""
310"git diff header lacks filename information when removing %d leading pathname "
311"components (line %d)"
312msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
313msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
314
315#: apply.c:1589
316#, c-format
317msgid "git diff header lacks filename information (line %d)"
318msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
319
320#: apply.c:1759
321msgid "new file depends on old contents"
322msgstr "新文件依赖旧内容"
323
324#: apply.c:1761
325msgid "deleted file still has contents"
326msgstr "删除的文件仍有内容"
327
328#: apply.c:1795
329#, c-format
330msgid "corrupt patch at line %d"
331msgstr "补丁在第 %d 行损坏"
332
333#: apply.c:1832
334#, c-format
335msgid "new file %s depends on old contents"
336msgstr "新文件 %s 依赖旧内容"
337
338#: apply.c:1834
339#, c-format
340msgid "deleted file %s still has contents"
341msgstr "删除的文件 %s 仍有内容"
342
343#: apply.c:1837
344#, c-format
345msgid "** warning: file %s becomes empty but is not deleted"
346msgstr "** 警告:文件 %s 成为空文件但并未删除"
347
348#: apply.c:1984
349#, c-format
350msgid "corrupt binary patch at line %d: %.*s"
351msgstr "二进制补丁在第 %d 行损坏:%.*s"
352
353#: apply.c:2021
354#, c-format
355msgid "unrecognized binary patch at line %d"
356msgstr "未能识别的二进制补丁位于第 %d 行"
357
358#: apply.c:2182
359#, c-format
360msgid "patch with only garbage at line %d"
361msgstr "补丁文件的第 %d 行只有垃圾数据"
362
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800363#: apply.c:2265
Jiang Xina0b6b242016-10-27 21:53:37 +0800364#, c-format
365msgid "unable to read symlink %s"
366msgstr "无法读取符号链接 %s"
367
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800368#: apply.c:2269
Jiang Xina0b6b242016-10-27 21:53:37 +0800369#, c-format
370msgid "unable to open or read %s"
371msgstr "不能打开或读取 %s"
372
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800373#: apply.c:2922
Jiang Xina0b6b242016-10-27 21:53:37 +0800374#, c-format
375msgid "invalid start of line: '%c'"
376msgstr "无效的行首字符:'%c'"
377
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800378#: apply.c:3041
Jiang Xina0b6b242016-10-27 21:53:37 +0800379#, c-format
380msgid "Hunk #%d succeeded at %d (offset %d line)."
381msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
382msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
383msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
384
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800385#: apply.c:3053
Jiang Xina0b6b242016-10-27 21:53:37 +0800386#, c-format
387msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
388msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
389
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800390#: apply.c:3059
Jiang Xina0b6b242016-10-27 21:53:37 +0800391#, c-format
392msgid ""
393"while searching for:\n"
394"%.*s"
395msgstr ""
396"当查询:\n"
397"%.*s"
398
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800399#: apply.c:3081
Jiang Xina0b6b242016-10-27 21:53:37 +0800400#, c-format
401msgid "missing binary patch data for '%s'"
402msgstr "缺失 '%s' 的二进制补丁数据"
403
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800404#: apply.c:3089
Jiang Xina0b6b242016-10-27 21:53:37 +0800405#, c-format
406msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
Ray Chen29004bb2016-12-28 17:08:45 +0800407msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
Jiang Xina0b6b242016-10-27 21:53:37 +0800408
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800409#: apply.c:3135
Jiang Xina0b6b242016-10-27 21:53:37 +0800410#, c-format
411msgid "cannot apply binary patch to '%s' without full index line"
412msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
413
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800414#: apply.c:3145
Jiang Xina0b6b242016-10-27 21:53:37 +0800415#, c-format
416msgid ""
417"the patch applies to '%s' (%s), which does not match the current contents."
Ray Chen29004bb2016-12-28 17:08:45 +0800418msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
Jiang Xina0b6b242016-10-27 21:53:37 +0800419
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800420#: apply.c:3153
Jiang Xina0b6b242016-10-27 21:53:37 +0800421#, c-format
422msgid "the patch applies to an empty '%s' but it is not empty"
Ray Chen29004bb2016-12-28 17:08:45 +0800423msgstr "补丁应用到空文件 '%s',但其并非空文件"
Jiang Xina0b6b242016-10-27 21:53:37 +0800424
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800425#: apply.c:3171
Jiang Xina0b6b242016-10-27 21:53:37 +0800426#, c-format
427msgid "the necessary postimage %s for '%s' cannot be read"
428msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"
429
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800430#: apply.c:3184
Jiang Xina0b6b242016-10-27 21:53:37 +0800431#, c-format
432msgid "binary patch does not apply to '%s'"
433msgstr "二进制补丁未应用到 '%s'"
434
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800435#: apply.c:3190
Jiang Xina0b6b242016-10-27 21:53:37 +0800436#, c-format
437msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
438msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
439
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800440#: apply.c:3211
Jiang Xina0b6b242016-10-27 21:53:37 +0800441#, c-format
442msgid "patch failed: %s:%ld"
443msgstr "打补丁失败:%s:%ld"
444
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800445#: apply.c:3333
Jiang Xina0b6b242016-10-27 21:53:37 +0800446#, c-format
447msgid "cannot checkout %s"
448msgstr "不能检出 %s"
449
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800450#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248
Jiang Xina0b6b242016-10-27 21:53:37 +0800451#, c-format
452msgid "failed to read %s"
453msgstr "无法读取 %s"
454
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800455#: apply.c:3389
Jiang Xina0b6b242016-10-27 21:53:37 +0800456#, c-format
457msgid "reading from '%s' beyond a symbolic link"
458msgstr "读取位于符号链接中的 '%s'"
459
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800460#: apply.c:3418 apply.c:3658
Jiang Xina0b6b242016-10-27 21:53:37 +0800461#, c-format
462msgid "path %s has been renamed/deleted"
463msgstr "路径 %s 已经被重命名/删除"
464
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800465#: apply.c:3501 apply.c:3672
Jiang Xina0b6b242016-10-27 21:53:37 +0800466#, c-format
467msgid "%s: does not exist in index"
468msgstr "%s:不存在于索引中"
469
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800470#: apply.c:3510 apply.c:3680
Jiang Xina0b6b242016-10-27 21:53:37 +0800471#, c-format
472msgid "%s: does not match index"
473msgstr "%s:和索引不匹配"
474
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800475#: apply.c:3545
Jiang Xina0b6b242016-10-27 21:53:37 +0800476msgid "repository lacks the necessary blob to fall back on 3-way merge."
477msgstr "仓库缺乏必要的数据对象以进行三方合并。"
478
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800479#: apply.c:3548
Jiang Xina0b6b242016-10-27 21:53:37 +0800480#, c-format
481msgid "Falling back to three-way merge...\n"
482msgstr "回落到三方合并...\n"
483
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800484#: apply.c:3564 apply.c:3568
Jiang Xina0b6b242016-10-27 21:53:37 +0800485#, c-format
486msgid "cannot read the current contents of '%s'"
487msgstr "无法读取 '%s' 的当前内容"
488
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800489#: apply.c:3580
Jiang Xina0b6b242016-10-27 21:53:37 +0800490#, c-format
491msgid "Failed to fall back on three-way merge...\n"
492msgstr "无法回落到三方合并...\n"
493
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800494#: apply.c:3594
Jiang Xina0b6b242016-10-27 21:53:37 +0800495#, c-format
496msgid "Applied patch to '%s' with conflicts.\n"
497msgstr "应用补丁到 '%s' 存在冲突。\n"
498
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800499#: apply.c:3599
Jiang Xina0b6b242016-10-27 21:53:37 +0800500#, c-format
501msgid "Applied patch to '%s' cleanly.\n"
502msgstr "成功应用补丁到 '%s'。\n"
503
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800504#: apply.c:3625
Jiang Xina0b6b242016-10-27 21:53:37 +0800505msgid "removal patch leaves file contents"
506msgstr "移除补丁仍留下了文件内容"
507
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800508#: apply.c:3697
Jiang Xina0b6b242016-10-27 21:53:37 +0800509#, c-format
510msgid "%s: wrong type"
511msgstr "%s:错误类型"
512
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800513#: apply.c:3699
Jiang Xina0b6b242016-10-27 21:53:37 +0800514#, c-format
515msgid "%s has type %o, expected %o"
516msgstr "%s 的类型是 %o,应为 %o"
517
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800518#: apply.c:3850 apply.c:3852
Jiang Xina0b6b242016-10-27 21:53:37 +0800519#, c-format
520msgid "invalid path '%s'"
521msgstr "无效路径 '%s'"
522
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800523#: apply.c:3908
Jiang Xina0b6b242016-10-27 21:53:37 +0800524#, c-format
525msgid "%s: already exists in index"
526msgstr "%s:已经存在于索引中"
527
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800528#: apply.c:3911
Jiang Xina0b6b242016-10-27 21:53:37 +0800529#, c-format
530msgid "%s: already exists in working directory"
531msgstr "%s:已经存在于工作区中"
532
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800533#: apply.c:3931
Jiang Xina0b6b242016-10-27 21:53:37 +0800534#, c-format
535msgid "new mode (%o) of %s does not match old mode (%o)"
536msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
537
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800538#: apply.c:3936
Jiang Xina0b6b242016-10-27 21:53:37 +0800539#, c-format
540msgid "new mode (%o) of %s does not match old mode (%o) of %s"
541msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
542
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800543#: apply.c:3956
Jiang Xina0b6b242016-10-27 21:53:37 +0800544#, c-format
545msgid "affected file '%s' is beyond a symbolic link"
546msgstr "受影响的文件 '%s' 位于符号链接中"
547
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800548#: apply.c:3960
Jiang Xina0b6b242016-10-27 21:53:37 +0800549#, c-format
550msgid "%s: patch does not apply"
551msgstr "%s:补丁未应用"
552
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800553#: apply.c:3975
Jiang Xina0b6b242016-10-27 21:53:37 +0800554#, c-format
555msgid "Checking patch %s..."
556msgstr "检查补丁 %s..."
557
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800558#: apply.c:4066
Jiang Xina0b6b242016-10-27 21:53:37 +0800559#, c-format
560msgid "sha1 information is lacking or useless for submodule %s"
561msgstr "子模组 %s 的 sha1 信息缺失或无效"
562
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800563#: apply.c:4073
Jiang Xina0b6b242016-10-27 21:53:37 +0800564#, c-format
565msgid "mode change for %s, which is not in current HEAD"
Ray Chen29004bb2016-12-28 17:08:45 +0800566msgstr "%s 的模式被改变,但它不在当前 HEAD 中"
Jiang Xina0b6b242016-10-27 21:53:37 +0800567
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800568#: apply.c:4076
Jiang Xina0b6b242016-10-27 21:53:37 +0800569#, c-format
570msgid "sha1 information is lacking or useless (%s)."
571msgstr "sha1 信息缺失或无效(%s)。"
572
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800573#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135
Jiang Xina0b6b242016-10-27 21:53:37 +0800574#, c-format
575msgid "make_cache_entry failed for path '%s'"
576msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
577
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800578#: apply.c:4085
Jiang Xina0b6b242016-10-27 21:53:37 +0800579#, c-format
580msgid "could not add %s to temporary index"
581msgstr "不能在临时索引中添加 %s"
582
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800583#: apply.c:4095
Jiang Xina0b6b242016-10-27 21:53:37 +0800584#, c-format
585msgid "could not write temporary index to %s"
586msgstr "不能把临时索引写入到 %s"
587
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800588#: apply.c:4233
Jiang Xina0b6b242016-10-27 21:53:37 +0800589#, c-format
590msgid "unable to remove %s from index"
591msgstr "不能从索引中移除 %s"
592
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800593#: apply.c:4268
Jiang Xina0b6b242016-10-27 21:53:37 +0800594#, c-format
595msgid "corrupt patch for submodule %s"
596msgstr "子模组 %s 损坏的补丁"
597
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800598#: apply.c:4274
Jiang Xina0b6b242016-10-27 21:53:37 +0800599#, c-format
600msgid "unable to stat newly created file '%s'"
601msgstr "不能枚举新建文件 '%s' 的状态"
602
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800603#: apply.c:4282
Jiang Xina0b6b242016-10-27 21:53:37 +0800604#, c-format
605msgid "unable to create backing store for newly created file %s"
606msgstr "不能为新建文件 %s 创建后端存储"
607
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800608#: apply.c:4288 apply.c:4432
Jiang Xina0b6b242016-10-27 21:53:37 +0800609#, c-format
610msgid "unable to add cache entry for %s"
611msgstr "无法为 %s 添加缓存条目"
612
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800613#: apply.c:4329
Jiang Xina0b6b242016-10-27 21:53:37 +0800614#, c-format
615msgid "failed to write to '%s'"
616msgstr "无法写入 '%s'"
617
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800618#: apply.c:4333
Jiang Xina0b6b242016-10-27 21:53:37 +0800619#, c-format
620msgid "closing file '%s'"
621msgstr "关闭文件 '%s'"
622
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800623#: apply.c:4403
Jiang Xina0b6b242016-10-27 21:53:37 +0800624#, c-format
625msgid "unable to write file '%s' mode %o"
626msgstr "不能写文件 '%s' 权限 %o"
627
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800628#: apply.c:4501
Jiang Xina0b6b242016-10-27 21:53:37 +0800629#, c-format
630msgid "Applied patch %s cleanly."
631msgstr "成功应用补丁 %s。"
632
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800633#: apply.c:4509
Jiang Xina0b6b242016-10-27 21:53:37 +0800634msgid "internal error"
635msgstr "内部错误"
636
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800637#: apply.c:4512
Jiang Xina0b6b242016-10-27 21:53:37 +0800638#, c-format
639msgid "Applying patch %%s with %d reject..."
640msgid_plural "Applying patch %%s with %d rejects..."
641msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
642msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
643
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800644#: apply.c:4523
Jiang Xina0b6b242016-10-27 21:53:37 +0800645#, c-format
646msgid "truncating .rej filename to %.*s.rej"
647msgstr "截短 .rej 文件名为 %.*s.rej"
648
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800649#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986
Jiang Xina0b6b242016-10-27 21:53:37 +0800650#, c-format
651msgid "cannot open %s"
652msgstr "不能打开 %s"
653
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800654#: apply.c:4545
Jiang Xina0b6b242016-10-27 21:53:37 +0800655#, c-format
656msgid "Hunk #%d applied cleanly."
657msgstr "第 #%d 个片段成功应用。"
658
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800659#: apply.c:4549
Jiang Xina0b6b242016-10-27 21:53:37 +0800660#, c-format
661msgid "Rejected hunk #%d."
662msgstr "拒绝第 #%d 个片段。"
663
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800664#: apply.c:4659
Jiang Xina0b6b242016-10-27 21:53:37 +0800665#, c-format
666msgid "Skipped patch '%s'."
667msgstr "略过补丁 '%s'。"
668
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800669#: apply.c:4667
Jiang Xina0b6b242016-10-27 21:53:37 +0800670msgid "unrecognized input"
671msgstr "未能识别的输入"
672
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800673#: apply.c:4686
Jiang Xina0b6b242016-10-27 21:53:37 +0800674msgid "unable to read index file"
675msgstr "无法读取索引文件"
676
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800677#: apply.c:4824
Jiang Xina0b6b242016-10-27 21:53:37 +0800678#, c-format
679msgid "can't open patch '%s': %s"
680msgstr "不能打开补丁 '%s':%s"
681
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800682#: apply.c:4849
Jiang Xina0b6b242016-10-27 21:53:37 +0800683#, c-format
684msgid "squelched %d whitespace error"
685msgid_plural "squelched %d whitespace errors"
686msgstr[0] "抑制下仍有 %d 个空白字符误用"
687msgstr[1] "抑制下仍有 %d 个空白字符误用"
688
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800689#: apply.c:4855 apply.c:4870
Jiang Xina0b6b242016-10-27 21:53:37 +0800690#, c-format
691msgid "%d line adds whitespace errors."
692msgid_plural "%d lines add whitespace errors."
693msgstr[0] "%d 行有空白字符误用。"
694msgstr[1] "%d 行有空白字符误用。"
695
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800696#: apply.c:4863
Jiang Xina0b6b242016-10-27 21:53:37 +0800697#, c-format
698msgid "%d line applied after fixing whitespace errors."
699msgid_plural "%d lines applied after fixing whitespace errors."
700msgstr[0] "修复空白错误后,应用了 %d 行。"
701msgstr[1] "修复空白错误后,应用了 %d 行。"
702
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800703#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
Jiang Xina0b6b242016-10-27 21:53:37 +0800704msgid "Unable to write new index file"
705msgstr "无法写入新索引文件"
706
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800707#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280
Jiang Xina0b6b242016-10-27 21:53:37 +0800708#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800709#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591
710#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960
711#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104
712#: git-add--interactive.perl:239
Jiang Xina0b6b242016-10-27 21:53:37 +0800713msgid "path"
714msgstr "路径"
715
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800716#: apply.c:4911
Jiang Xina0b6b242016-10-27 21:53:37 +0800717msgid "don't apply changes matching the given path"
718msgstr "不要应用与给出路径向匹配的变更"
719
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800720#: apply.c:4914
Jiang Xina0b6b242016-10-27 21:53:37 +0800721msgid "apply changes matching the given path"
722msgstr "应用与给出路径向匹配的变更"
723
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800724#: apply.c:4916 builtin/am.c:2286
Jiang Xina0b6b242016-10-27 21:53:37 +0800725msgid "num"
726msgstr "数字"
727
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800728#: apply.c:4917
Jiang Xina0b6b242016-10-27 21:53:37 +0800729msgid "remove <num> leading slashes from traditional diff paths"
730msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
731
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800732#: apply.c:4920
Jiang Xina0b6b242016-10-27 21:53:37 +0800733msgid "ignore additions made by the patch"
734msgstr "忽略补丁中的添加的文件"
735
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800736#: apply.c:4922
Jiang Xina0b6b242016-10-27 21:53:37 +0800737msgid "instead of applying the patch, output diffstat for the input"
738msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
739
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800740#: apply.c:4926
Jiang Xina0b6b242016-10-27 21:53:37 +0800741msgid "show number of added and deleted lines in decimal notation"
742msgstr "以十进制数显示添加和删除的行数"
743
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800744#: apply.c:4928
Jiang Xina0b6b242016-10-27 21:53:37 +0800745msgid "instead of applying the patch, output a summary for the input"
746msgstr "不应用补丁,而是显示输入的概要"
747
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800748#: apply.c:4930
Jiang Xina0b6b242016-10-27 21:53:37 +0800749msgid "instead of applying the patch, see if the patch is applicable"
750msgstr "不应用补丁,而是查看补丁是否可应用"
751
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800752#: apply.c:4932
Jiang Xina0b6b242016-10-27 21:53:37 +0800753msgid "make sure the patch is applicable to the current index"
754msgstr "确认补丁可以应用到当前索引"
755
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800756#: apply.c:4934
Jiang Xina0b6b242016-10-27 21:53:37 +0800757msgid "apply a patch without touching the working tree"
758msgstr "应用补丁而不修改工作区"
759
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800760#: apply.c:4936
Jiang Xina0b6b242016-10-27 21:53:37 +0800761msgid "accept a patch that touches outside the working area"
762msgstr "接受修改工作区之外文件的补丁"
763
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800764#: apply.c:4938
Jiang Xina0b6b242016-10-27 21:53:37 +0800765msgid "also apply the patch (use with --stat/--summary/--check)"
766msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
767
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800768#: apply.c:4940
Jiang Xina0b6b242016-10-27 21:53:37 +0800769msgid "attempt three-way merge if a patch does not apply"
770msgstr "如果一个补丁不能应用则尝试三方合并"
771
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800772#: apply.c:4942
Jiang Xina0b6b242016-10-27 21:53:37 +0800773msgid "build a temporary index based on embedded index information"
774msgstr "创建一个临时索引基于嵌入的索引信息"
775
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800776#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507
Jiang Xina0b6b242016-10-27 21:53:37 +0800777msgid "paths are separated with NUL character"
778msgstr "路径以 NUL 字符分隔"
779
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800780#: apply.c:4947
Jiang Xina0b6b242016-10-27 21:53:37 +0800781msgid "ensure at least <n> lines of context match"
782msgstr "确保至少匹配 <n> 行上下文"
783
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800784#: apply.c:4948 builtin/am.c:2265
Jiang Xina0b6b242016-10-27 21:53:37 +0800785msgid "action"
786msgstr "动作"
787
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800788#: apply.c:4949
Jiang Xina0b6b242016-10-27 21:53:37 +0800789msgid "detect new or modified lines that have whitespace errors"
790msgstr "检查新增和修改的行中间的空白字符滥用"
791
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800792#: apply.c:4952 apply.c:4955
Jiang Xina0b6b242016-10-27 21:53:37 +0800793msgid "ignore changes in whitespace when finding context"
794msgstr "查找上下文时忽略空白字符的变更"
795
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800796#: apply.c:4958
Jiang Xina0b6b242016-10-27 21:53:37 +0800797msgid "apply the patch in reverse"
798msgstr "反向应用补丁"
799
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800800#: apply.c:4960
Jiang Xina0b6b242016-10-27 21:53:37 +0800801msgid "don't expect at least one line of context"
802msgstr "无需至少一行上下文"
803
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800804#: apply.c:4962
Jiang Xina0b6b242016-10-27 21:53:37 +0800805msgid "leave the rejected hunks in corresponding *.rej files"
806msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
807
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800808#: apply.c:4964
Jiang Xina0b6b242016-10-27 21:53:37 +0800809msgid "allow overlapping hunks"
810msgstr "允许重叠的补丁片段"
811
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800812#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19
813#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651
814#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114
Jiang Xina0b6b242016-10-27 21:53:37 +0800815msgid "be verbose"
816msgstr "冗长输出"
817
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800818#: apply.c:4967
Jiang Xina0b6b242016-10-27 21:53:37 +0800819msgid "tolerate incorrectly detected missing new-line at the end of file"
820msgstr "允许不正确的文件末尾换行符"
821
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800822#: apply.c:4970
Jiang Xina0b6b242016-10-27 21:53:37 +0800823msgid "do not trust the line counts in the hunk headers"
824msgstr "不信任补丁片段的头信息中的行号"
825
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800826#: apply.c:4972 builtin/am.c:2274
Jiang Xina0b6b242016-10-27 21:53:37 +0800827msgid "root"
828msgstr "根目录"
829
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800830#: apply.c:4973
Jiang Xina0b6b242016-10-27 21:53:37 +0800831msgid "prepend <root> to all filenames"
832msgstr "为所有文件名前添加 <根目录>"
833
Jiang Xin1b7f4a32015-08-23 15:23:21 +0800834#: archive.c:12
Jiang Xin814ff312015-02-16 21:34:19 +0800835msgid "git archive [<options>] <tree-ish> [<path>...]"
836msgstr "git archive [<选项>] <树或提交> [<路径>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +0800837
Jiang Xin1b7f4a32015-08-23 15:23:21 +0800838#: archive.c:13
Jiang Xinef317cd2012-09-15 11:17:00 +0800839msgid "git archive --list"
Wang Sheng07432ce2013-01-30 17:23:08 +0800840msgstr "git archive --list"
Jiang Xinef317cd2012-09-15 11:17:00 +0800841
Jiang Xin1b7f4a32015-08-23 15:23:21 +0800842#: archive.c:14
Jiang Xinef317cd2012-09-15 11:17:00 +0800843msgid ""
Jiang Xin814ff312015-02-16 21:34:19 +0800844"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +0800845msgstr ""
Jiang Xin160fb2b2015-08-02 21:47:30 +0800846"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +0800847
Jiang Xin1b7f4a32015-08-23 15:23:21 +0800848#: archive.c:15
Jiang Xinef317cd2012-09-15 11:17:00 +0800849msgid "git archive --remote <repo> [--exec <cmd>] --list"
Jiang Xin160fb2b2015-08-02 21:47:30 +0800850msgstr "git archive --remote <仓库> [--exec <命令>] --list"
Jiang Xinef317cd2012-09-15 11:17:00 +0800851
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800852#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
Jiang Xin90314792013-09-17 23:37:05 +0800853#, c-format
854msgid "pathspec '%s' did not match any files"
Jiang Xin160fb2b2015-08-02 21:47:30 +0800855msgstr "路径规格 '%s' 未匹配任何文件"
Jiang Xin90314792013-09-17 23:37:05 +0800856
Jiang Xin94550ed2015-11-16 07:02:11 +0800857#: archive.c:429
Jiang Xinef317cd2012-09-15 11:17:00 +0800858msgid "fmt"
Wang Sheng07432ce2013-01-30 17:23:08 +0800859msgstr "格式"
Jiang Xinef317cd2012-09-15 11:17:00 +0800860
Jiang Xin94550ed2015-11-16 07:02:11 +0800861#: archive.c:429
Jiang Xinef317cd2012-09-15 11:17:00 +0800862msgid "archive format"
Wang Sheng07432ce2013-01-30 17:23:08 +0800863msgstr "归档格式"
Jiang Xinef317cd2012-09-15 11:17:00 +0800864
Jiang Xina0b6b242016-10-27 21:53:37 +0800865#: archive.c:430 builtin/log.c:1429
Jiang Xinef317cd2012-09-15 11:17:00 +0800866msgid "prefix"
Wang Sheng07432ce2013-01-30 17:23:08 +0800867msgstr "前缀"
Jiang Xinef317cd2012-09-15 11:17:00 +0800868
Jiang Xin94550ed2015-11-16 07:02:11 +0800869#: archive.c:431
Jiang Xinef317cd2012-09-15 11:17:00 +0800870msgid "prepend prefix to each pathname in the archive"
Wang Sheng07432ce2013-01-30 17:23:08 +0800871msgstr "为归档中每个路径名加上前缀"
Jiang Xinef317cd2012-09-15 11:17:00 +0800872
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800873#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59
874#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054
875#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544
876#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109
877#: parse-options.h:153
Jiang Xinef317cd2012-09-15 11:17:00 +0800878msgid "file"
879msgstr "文件"
880
Jiang Xin94550ed2015-11-16 07:02:11 +0800881#: archive.c:433 builtin/archive.c:89
Jiang Xinef317cd2012-09-15 11:17:00 +0800882msgid "write the archive to this file"
Wang Sheng07432ce2013-01-30 17:23:08 +0800883msgstr "归档写入此文件"
Jiang Xinef317cd2012-09-15 11:17:00 +0800884
Jiang Xin94550ed2015-11-16 07:02:11 +0800885#: archive.c:435
Wang Sheng07432ce2013-01-30 17:23:08 +0800886msgid "read .gitattributes in working directory"
887msgstr "读取工作区中的 .gitattributes"
Jiang Xinef317cd2012-09-15 11:17:00 +0800888
Jiang Xin94550ed2015-11-16 07:02:11 +0800889#: archive.c:436
Wang Sheng07432ce2013-01-30 17:23:08 +0800890msgid "report archived files on stderr"
891msgstr "在标准错误上报告归档文件"
Jiang Xinef317cd2012-09-15 11:17:00 +0800892
Jiang Xin94550ed2015-11-16 07:02:11 +0800893#: archive.c:437
Wang Sheng07432ce2013-01-30 17:23:08 +0800894msgid "store only"
895msgstr "只存储"
896
Jiang Xin94550ed2015-11-16 07:02:11 +0800897#: archive.c:438
Jiang Xinef317cd2012-09-15 11:17:00 +0800898msgid "compress faster"
Wang Sheng07432ce2013-01-30 17:23:08 +0800899msgstr "压缩速度更快"
Jiang Xinef317cd2012-09-15 11:17:00 +0800900
Jiang Xin94550ed2015-11-16 07:02:11 +0800901#: archive.c:446
Jiang Xinef317cd2012-09-15 11:17:00 +0800902msgid "compress better"
Wang Sheng07432ce2013-01-30 17:23:08 +0800903msgstr "压缩效果更好"
Jiang Xinef317cd2012-09-15 11:17:00 +0800904
Jiang Xin94550ed2015-11-16 07:02:11 +0800905#: archive.c:449
Jiang Xinef317cd2012-09-15 11:17:00 +0800906msgid "list supported archive formats"
Wang Sheng07432ce2013-01-30 17:23:08 +0800907msgstr "列出支持的归档格式"
Jiang Xinef317cd2012-09-15 11:17:00 +0800908
Jiang Xina0b6b242016-10-27 21:53:37 +0800909#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
Jiang Xin1a79b2f2017-01-27 22:50:57 +0800910#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969
Jiang Xinef317cd2012-09-15 11:17:00 +0800911msgid "repo"
Jiang Xin160fb2b2015-08-02 21:47:30 +0800912msgstr "仓库"
Jiang Xinef317cd2012-09-15 11:17:00 +0800913
Jiang Xin94550ed2015-11-16 07:02:11 +0800914#: archive.c:452 builtin/archive.c:91
Jiang Xinef317cd2012-09-15 11:17:00 +0800915msgid "retrieve the archive from remote repository <repo>"
Jiang Xin160fb2b2015-08-02 21:47:30 +0800916msgstr "从远程仓库(<仓库>)提取归档文件"
Jiang Xinef317cd2012-09-15 11:17:00 +0800917
Jiang Xina0b6b242016-10-27 21:53:37 +0800918#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
Jiang Xinef317cd2012-09-15 11:17:00 +0800919msgid "command"
Wang Sheng07432ce2013-01-30 17:23:08 +0800920msgstr "命令"
Jiang Xinef317cd2012-09-15 11:17:00 +0800921
Jiang Xin94550ed2015-11-16 07:02:11 +0800922#: archive.c:454 builtin/archive.c:93
Jiang Xinef317cd2012-09-15 11:17:00 +0800923msgid "path to the remote git-upload-archive command"
Wang Sheng07432ce2013-01-30 17:23:08 +0800924msgstr "远程 git-upload-archive 命令的路径"
925
Jiang Xin5c57d762016-08-28 10:18:12 +0800926#: archive.c:461
927msgid "Unexpected option --remote"
Ray Chen9a4b6942016-09-07 18:03:04 +0800928msgstr "未知参数 --remote"
Jiang Xin5c57d762016-08-28 10:18:12 +0800929
930#: archive.c:463
931msgid "Option --exec can only be used together with --remote"
932msgstr "选项 --exec 只能和 --remote 同时使用"
933
934#: archive.c:465
935msgid "Unexpected option --output"
936msgstr "未知参数 --output"
937
938#: archive.c:487
939#, c-format
940msgid "Unknown archive format '%s'"
941msgstr "未知归档格式 '%s'"
942
943#: archive.c:494
944#, c-format
945msgid "Argument not supported for format '%s': -%d"
946msgstr "参数不支持此格式 '%s':-%d"
947
Jiang Xin276ceea2016-02-28 20:35:55 +0800948#: attr.c:263
Wang Sheng07432ce2013-01-30 17:23:08 +0800949msgid ""
Jiang Xina7409df2013-03-05 13:09:55 +0800950"Negative patterns are ignored in git attributes\n"
Wang Sheng07432ce2013-01-30 17:23:08 +0800951"Use '\\!' for literal leading exclamation."
Jiang Xinef317cd2012-09-15 11:17:00 +0800952msgstr ""
Jiang Xina7409df2013-03-05 13:09:55 +0800953"负值模版在 git attributes 中被忽略\n"
Wang Sheng07432ce2013-01-30 17:23:08 +0800954"当字符串确实要以感叹号开始时,使用 '\\!'。"
Jiang Xinef317cd2012-09-15 11:17:00 +0800955
Jiang Xin5c57d762016-08-28 10:18:12 +0800956#: bisect.c:441
957#, c-format
958msgid "Could not open file '%s'"
959msgstr "不能打开文件 '%s'"
960
961#: bisect.c:446
962#, c-format
963msgid "Badly quoted content in file '%s': %s"
964msgstr "文件 '%s' 包含错误的引用格式:%s"
965
966#: bisect.c:655
967#, c-format
968msgid "We cannot bisect more!\n"
969msgstr "我们无法进行更多的二分查找!\n"
970
971#: bisect.c:708
972#, c-format
973msgid "Not a valid commit name %s"
974msgstr "不是一个有效的提交名 %s"
975
976#: bisect.c:732
977#, c-format
978msgid ""
979"The merge base %s is bad.\n"
980"This means the bug has been fixed between %s and [%s].\n"
981msgstr ""
982"合并基线 %s 是坏的。\n"
983"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
984
985#: bisect.c:737
986#, c-format
987msgid ""
988"The merge base %s is new.\n"
989"The property has changed between %s and [%s].\n"
990msgstr ""
991"合并基线 %s 是新的。\n"
992"介于 %s 和 [%s] 之间的属性已经被修改。\n"
993
994#: bisect.c:742
995#, c-format
996msgid ""
997"The merge base %s is %s.\n"
998"This means the first '%s' commit is between %s and [%s].\n"
999msgstr ""
1000"合并基线 %s 是 %s。\n"
1001"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
1002
1003#: bisect.c:750
1004#, c-format
1005msgid ""
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001006"Some %s revs are not ancestors of the %s rev.\n"
Jiang Xin5c57d762016-08-28 10:18:12 +08001007"git bisect cannot work properly in this case.\n"
1008"Maybe you mistook %s and %s revs?\n"
1009msgstr ""
1010"一些 %s 版本不是 %s 版本的祖先。\n"
1011"这种情况下 git 二分查找无法正常工作。\n"
1012"您可能弄错了 %s 和 %s 版本?\n"
1013
1014#: bisect.c:763
1015#, c-format
1016msgid ""
1017"the merge base between %s and [%s] must be skipped.\n"
1018"So we cannot be sure the first %s commit is between %s and %s.\n"
1019"We continue anyway."
1020msgstr ""
1021"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1022"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1023"我们仍旧继续。"
1024
1025#: bisect.c:798
1026#, c-format
1027msgid "Bisecting: a merge base must be tested\n"
Ray Chen9a4b6942016-09-07 18:03:04 +08001028msgstr "二分查找中:合并基线必须是经过测试的\n"
Jiang Xin5c57d762016-08-28 10:18:12 +08001029
1030#: bisect.c:849
1031#, c-format
1032msgid "a %s revision is needed"
1033msgstr "需要一个 %s 版本"
1034
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001035#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262
Jiang Xin5c57d762016-08-28 10:18:12 +08001036#, c-format
1037msgid "could not create file '%s'"
1038msgstr "不能创建文件 '%s'"
1039
1040#: bisect.c:917
1041#, c-format
1042msgid "could not read file '%s'"
1043msgstr "不能读取文件 '%s'"
1044
1045#: bisect.c:947
1046msgid "reading bisect refs failed"
1047msgstr "读取二分查找引用失败"
1048
1049#: bisect.c:967
1050#, c-format
1051msgid "%s was both %s and %s\n"
1052msgstr "%s 同时为 %s 和 %s\n"
1053
1054#: bisect.c:975
1055#, c-format
1056msgid ""
1057"No testable commit found.\n"
1058"Maybe you started with bad path parameters?\n"
1059msgstr ""
1060"没有发现可测试的提交。\n"
1061"可能您在运行时使用了错误的路径参数?\n"
1062
1063#: bisect.c:994
1064#, c-format
1065msgid "(roughly %d step)"
1066msgid_plural "(roughly %d steps)"
1067msgstr[0] "(大概 %d 步)"
1068msgstr[1] "(大概 %d 步)"
1069
1070#. TRANSLATORS: the last %s will be replaced with
1071#. "(roughly %d steps)" translation
1072#: bisect.c:998
1073#, c-format
1074msgid "Bisecting: %d revision left to test after this %s\n"
1075msgid_plural "Bisecting: %d revisions left to test after this %s\n"
Ray Chen9a4b6942016-09-07 18:03:04 +08001076msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1077msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
Jiang Xin5c57d762016-08-28 10:18:12 +08001078
Jiang Xin276ceea2016-02-28 20:35:55 +08001079#: branch.c:53
1080#, c-format
1081msgid ""
1082"\n"
1083"After fixing the error cause you may try to fix up\n"
1084"the remote tracking information by invoking\n"
1085"\"git branch --set-upstream-to=%s%s%s\"."
1086msgstr ""
1087"\n"
1088"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1089"\"git branch --set-upstream-to=%s%s%s\" 。"
1090
1091#: branch.c:67
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08001092#, c-format
1093msgid "Not setting branch %s as its own upstream."
1094msgstr "未设置分支 %s 作为它自己的上游。"
1095
Jiang Xin276ceea2016-02-28 20:35:55 +08001096#: branch.c:93
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08001097#, c-format
1098msgid "Branch %s set up to track remote branch %s from %s by rebasing."
1099msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
1100
Jiang Xin276ceea2016-02-28 20:35:55 +08001101#: branch.c:94
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08001102#, c-format
1103msgid "Branch %s set up to track remote branch %s from %s."
1104msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
1105
Jiang Xin276ceea2016-02-28 20:35:55 +08001106#: branch.c:98
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08001107#, c-format
1108msgid "Branch %s set up to track local branch %s by rebasing."
1109msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
1110
Jiang Xin276ceea2016-02-28 20:35:55 +08001111#: branch.c:99
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08001112#, c-format
1113msgid "Branch %s set up to track local branch %s."
1114msgstr "分支 %s 设置为跟踪本地分支 %s。"
1115
Jiang Xin276ceea2016-02-28 20:35:55 +08001116#: branch.c:104
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08001117#, c-format
1118msgid "Branch %s set up to track remote ref %s by rebasing."
1119msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
1120
Jiang Xin276ceea2016-02-28 20:35:55 +08001121#: branch.c:105
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08001122#, c-format
1123msgid "Branch %s set up to track remote ref %s."
1124msgstr "分支 %s 设置为跟踪远程引用 %s。"
1125
Jiang Xin276ceea2016-02-28 20:35:55 +08001126#: branch.c:109
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08001127#, c-format
1128msgid "Branch %s set up to track local ref %s by rebasing."
1129msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
1130
Jiang Xin276ceea2016-02-28 20:35:55 +08001131#: branch.c:110
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08001132#, c-format
1133msgid "Branch %s set up to track local ref %s."
1134msgstr "分支 %s 设置为跟踪本地引用 %s。"
1135
Jiang Xin276ceea2016-02-28 20:35:55 +08001136#: branch.c:119
1137msgid "Unable to write upstream branch configuration"
1138msgstr "无法写入上游分支配置"
1139
1140#: branch.c:156
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08001141#, c-format
1142msgid "Not tracking: ambiguous information for ref %s"
1143msgstr "未跟踪:引用 %s 有歧义"
1144
Jiang Xin276ceea2016-02-28 20:35:55 +08001145#: branch.c:185
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08001146#, c-format
1147msgid "'%s' is not a valid branch name."
1148msgstr "'%s' 不是一个有效的分支名称。"
1149
Jiang Xin276ceea2016-02-28 20:35:55 +08001150#: branch.c:190
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08001151#, c-format
1152msgid "A branch named '%s' already exists."
1153msgstr "一个分支名 '%s' 已经存在。"
1154
Jiang Xin276ceea2016-02-28 20:35:55 +08001155#: branch.c:198
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08001156msgid "Cannot force update the current branch."
1157msgstr "无法强制更新当前分支。"
1158
Jiang Xin276ceea2016-02-28 20:35:55 +08001159#: branch.c:218
Jiang Xin1003b3a2013-04-11 17:55:09 +08001160#, c-format
1161msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1162msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
1163
Jiang Xin276ceea2016-02-28 20:35:55 +08001164#: branch.c:220
Jiang Xin1003b3a2013-04-11 17:55:09 +08001165#, c-format
1166msgid "the requested upstream branch '%s' does not exist"
1167msgstr "请求的上游分支 '%s' 不存在"
1168
Jiang Xin276ceea2016-02-28 20:35:55 +08001169#: branch.c:222
Jiang Xin1003b3a2013-04-11 17:55:09 +08001170msgid ""
1171"\n"
1172"If you are planning on basing your work on an upstream\n"
1173"branch that already exists at the remote, you may need to\n"
1174"run \"git fetch\" to retrieve it.\n"
1175"\n"
1176"If you are planning to push out a new local branch that\n"
1177"will track its remote counterpart, you may want to use\n"
1178"\"git push -u\" to set the upstream config as you push."
1179msgstr ""
1180"\n"
1181"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
1182"您可能需要执行 \"git fetch\" 来获取分支。\n"
1183"\n"
1184"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
1185"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
1186
Jiang Xin275588f2016-11-22 22:24:59 +08001187#: branch.c:265
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08001188#, c-format
1189msgid "Not a valid object name: '%s'."
1190msgstr "不是一个有效的对象名:'%s'。"
1191
Jiang Xin275588f2016-11-22 22:24:59 +08001192#: branch.c:285
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08001193#, c-format
1194msgid "Ambiguous object name: '%s'."
1195msgstr "歧义的对象名:'%s'。"
1196
Jiang Xin275588f2016-11-22 22:24:59 +08001197#: branch.c:290
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08001198#, c-format
1199msgid "Not a valid branch point: '%s'."
1200msgstr "无效的分支点:'%s'。"
1201
Jiang Xin275588f2016-11-22 22:24:59 +08001202#: branch.c:344
Jiang Xin1b7f4a32015-08-23 15:23:21 +08001203#, c-format
1204msgid "'%s' is already checked out at '%s'"
1205msgstr "'%s' 已经检出到 '%s'"
1206
Jiang Xin275588f2016-11-22 22:24:59 +08001207#: branch.c:363
Jiang Xin5b04ee32016-05-29 20:40:35 +08001208#, c-format
1209msgid "HEAD of working tree %s is not updated"
1210msgstr "工作区 %s 的 HEAD 指向没有被更新"
1211
Jiang Xin220c3132014-10-08 10:55:14 +08001212#: bundle.c:34
Jiang Xin8ada9592012-05-21 09:35:47 +08001213#, c-format
1214msgid "'%s' does not look like a v2 bundle file"
Jiang Xin81809b92012-05-30 12:19:47 +08001215msgstr "'%s' 不像是一个 v2 版本的包文件"
Jiang Xin8ada9592012-05-21 09:35:47 +08001216
Jiang Xin220c3132014-10-08 10:55:14 +08001217#: bundle.c:61
Jiang Xin81809b92012-05-30 12:19:47 +08001218#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08001219msgid "unrecognized header: %s%s (%d)"
Jiang Xin81809b92012-05-30 12:19:47 +08001220msgstr "未能识别的包头:%s%s (%d)"
Jiang Xin8ada9592012-05-21 09:35:47 +08001221
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001222#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777
Jiang Xin8ada9592012-05-21 09:35:47 +08001223#, c-format
1224msgid "could not open '%s'"
1225msgstr "不能打开 '%s'"
1226
Jiang Xin220c3132014-10-08 10:55:14 +08001227#: bundle.c:139
Jiang Xin8ada9592012-05-21 09:35:47 +08001228msgid "Repository lacks these prerequisite commits:"
Jiang Xin160fb2b2015-08-02 21:47:30 +08001229msgstr "仓库中缺少这些必备的提交:"
Jiang Xin8ada9592012-05-21 09:35:47 +08001230
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001231#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290
1232#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348
Jiang Xina0b6b242016-10-27 21:53:37 +08001233#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001234#: builtin/merge.c:360 builtin/shortlog.c:177
Jiang Xin8ada9592012-05-21 09:35:47 +08001235msgid "revision walk setup failed"
1236msgstr "版本遍历设置失败"
1237
Jiang Xin220c3132014-10-08 10:55:14 +08001238#: bundle.c:185
Jiang Xin8ada9592012-05-21 09:35:47 +08001239#, c-format
Jiang Xin1003b3a2013-04-11 17:55:09 +08001240msgid "The bundle contains this ref:"
1241msgid_plural "The bundle contains these %d refs:"
1242msgstr[0] "这个包中含有这个引用:"
1243msgstr[1] "这个包中含有 %d 个引用:"
Jiang Xin8ada9592012-05-21 09:35:47 +08001244
Jiang Xin220c3132014-10-08 10:55:14 +08001245#: bundle.c:192
Jiang Xin6792b932012-07-04 17:20:34 +08001246msgid "The bundle records a complete history."
1247msgstr "这个包记录一个完整历史。"
1248
Jiang Xin220c3132014-10-08 10:55:14 +08001249#: bundle.c:194
Jiang Xin8ada9592012-05-21 09:35:47 +08001250#, c-format
Jiang Xin1003b3a2013-04-11 17:55:09 +08001251msgid "The bundle requires this ref:"
1252msgid_plural "The bundle requires these %d refs:"
1253msgstr[0] "这个包需要这个引用:"
1254msgstr[1] "这个包需要 %d 个引用:"
Jiang Xin8ada9592012-05-21 09:35:47 +08001255
Jiang Xin1b7f4a32015-08-23 15:23:21 +08001256#: bundle.c:253
Jiang Xin9aeb4c22014-11-20 10:53:48 +08001257msgid "Could not spawn pack-objects"
1258msgstr "不能生成 pack-objects 进程"
1259
Jiang Xin1b7f4a32015-08-23 15:23:21 +08001260#: bundle.c:264
Jiang Xin9aeb4c22014-11-20 10:53:48 +08001261msgid "pack-objects died"
1262msgstr "pack-objects 终止"
1263
Jiang Xin1b7f4a32015-08-23 15:23:21 +08001264#: bundle.c:304
Jiang Xin8ada9592012-05-21 09:35:47 +08001265msgid "rev-list died"
Jiang Xin81809b92012-05-30 12:19:47 +08001266msgstr "rev-list 终止"
Jiang Xin8ada9592012-05-21 09:35:47 +08001267
Jiang Xin1b7f4a32015-08-23 15:23:21 +08001268#: bundle.c:353
Jiang Xin8ada9592012-05-21 09:35:47 +08001269#, c-format
1270msgid "ref '%s' is excluded by the rev-list options"
Jiang Xin81809b92012-05-30 12:19:47 +08001271msgstr "引用 '%s' 被 rev-list 选项排除"
Jiang Xin8ada9592012-05-21 09:35:47 +08001272
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001273#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282
Jiang Xin9aeb4c22014-11-20 10:53:48 +08001274#, c-format
1275msgid "unrecognized argument: %s"
1276msgstr "未能识别的参数:%s"
1277
Jiang Xin5b04ee32016-05-29 20:40:35 +08001278#: bundle.c:451
Jiang Xin8ada9592012-05-21 09:35:47 +08001279msgid "Refusing to create empty bundle."
Jiang Xin81809b92012-05-30 12:19:47 +08001280msgstr "不能创建空包。"
Jiang Xin8ada9592012-05-21 09:35:47 +08001281
Jiang Xin5b04ee32016-05-29 20:40:35 +08001282#: bundle.c:463
Jiang Xin81809b92012-05-30 12:19:47 +08001283#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08001284msgid "cannot create '%s'"
Jiang Xin81809b92012-05-30 12:19:47 +08001285msgstr "不能创建 '%s'"
Jiang Xin8ada9592012-05-21 09:35:47 +08001286
Jiang Xin5b04ee32016-05-29 20:40:35 +08001287#: bundle.c:491
Jiang Xin8ada9592012-05-21 09:35:47 +08001288msgid "index-pack died"
Jiang Xin81809b92012-05-30 12:19:47 +08001289msgstr "index-pack 终止"
Jiang Xin8ada9592012-05-21 09:35:47 +08001290
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001291#: color.c:300
Jiang Xin220c3132014-10-08 10:55:14 +08001292#, c-format
1293msgid "invalid color value: %.*s"
1294msgstr "无效的颜色值:%.*s"
1295
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001296#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457
1297#: builtin/am.c:1493 builtin/am.c:2127
Jiang Xinc04f5ac2012-02-13 14:41:59 +08001298#, c-format
1299msgid "could not parse %s"
1300msgstr "不能解析 %s"
1301
Jiang Xin6acbf032014-08-04 16:23:15 +08001302#: commit.c:42
Jiang Xinc04f5ac2012-02-13 14:41:59 +08001303#, c-format
1304msgid "%s %s is not a commit!"
1305msgstr "%s %s 不是一个提交!"
1306
Jiang Xina0b6b242016-10-27 21:53:37 +08001307#: commit.c:1514
1308msgid ""
1309"Warning: commit message did not conform to UTF-8.\n"
1310"You may want to amend it after fixing the message, or set the config\n"
1311"variable i18n.commitencoding to the encoding your project uses.\n"
1312msgstr ""
Ray Chen29004bb2016-12-28 17:08:45 +08001313"警告:提交说明不符合 UTF-8 字符编码。\n"
Jiang Xina0b6b242016-10-27 21:53:37 +08001314"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
Ray Chen29004bb2016-12-28 17:08:45 +08001315"设置为您项目所用的字符编码。\n"
Jiang Xina0b6b242016-10-27 21:53:37 +08001316
Jiang Xinc04f5ac2012-02-13 14:41:59 +08001317#: compat/obstack.c:406 compat/obstack.c:408
1318msgid "memory exhausted"
1319msgstr "内存耗尽"
1320
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001321#: config.c:518
Jiang Xin220c3132014-10-08 10:55:14 +08001322#, c-format
Jiang Xin5c57d762016-08-28 10:18:12 +08001323msgid "bad config line %d in blob %s"
1324msgstr "数据对象 %2$s 中错误的配置行 %1$d"
Jiang Xin220c3132014-10-08 10:55:14 +08001325
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001326#: config.c:522
Jiang Xin220c3132014-10-08 10:55:14 +08001327#, c-format
Jiang Xin5c57d762016-08-28 10:18:12 +08001328msgid "bad config line %d in file %s"
1329msgstr "文件 %2$s 中错误的配置行 %1$d"
Jiang Xin220c3132014-10-08 10:55:14 +08001330
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001331#: config.c:526
Jiang Xin5c57d762016-08-28 10:18:12 +08001332#, c-format
1333msgid "bad config line %d in standard input"
1334msgstr "标准输入中错误的配置行 %d"
1335
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001336#: config.c:530
Jiang Xin5c57d762016-08-28 10:18:12 +08001337#, c-format
1338msgid "bad config line %d in submodule-blob %s"
Ray Chen9a4b6942016-09-07 18:03:04 +08001339msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
Jiang Xin5c57d762016-08-28 10:18:12 +08001340
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001341#: config.c:534
Jiang Xin5c57d762016-08-28 10:18:12 +08001342#, c-format
1343msgid "bad config line %d in command line %s"
1344msgstr "命令行 %2$s 中错误的配置行 %1$d"
1345
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001346#: config.c:538
Jiang Xin5c57d762016-08-28 10:18:12 +08001347#, c-format
1348msgid "bad config line %d in %s"
1349msgstr "在 %2$s 中错误的配置行 %1$d"
1350
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001351#: config.c:657
Jiang Xin5c57d762016-08-28 10:18:12 +08001352msgid "out of range"
1353msgstr "超出范围"
1354
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001355#: config.c:657
Jiang Xin5c57d762016-08-28 10:18:12 +08001356msgid "invalid unit"
1357msgstr "无效的单位"
1358
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001359#: config.c:663
Jiang Xin220c3132014-10-08 10:55:14 +08001360#, c-format
1361msgid "bad numeric config value '%s' for '%s': %s"
Ray Chen9a4b6942016-09-07 18:03:04 +08001362msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
Jiang Xin220c3132014-10-08 10:55:14 +08001363
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001364#: config.c:668
Jiang Xin5c57d762016-08-28 10:18:12 +08001365#, c-format
1366msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
Ray Chen9a4b6942016-09-07 18:03:04 +08001367msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
Jiang Xin5c57d762016-08-28 10:18:12 +08001368
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001369#: config.c:671
Jiang Xin5c57d762016-08-28 10:18:12 +08001370#, c-format
1371msgid "bad numeric config value '%s' for '%s' in file %s: %s"
Ray Chen9a4b6942016-09-07 18:03:04 +08001372msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
Jiang Xin5c57d762016-08-28 10:18:12 +08001373
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001374#: config.c:674
Jiang Xin5c57d762016-08-28 10:18:12 +08001375#, c-format
1376msgid "bad numeric config value '%s' for '%s' in standard input: %s"
Ray Chen9a4b6942016-09-07 18:03:04 +08001377msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
Jiang Xin5c57d762016-08-28 10:18:12 +08001378
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001379#: config.c:677
Jiang Xin5c57d762016-08-28 10:18:12 +08001380#, c-format
1381msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
Ray Chen9a4b6942016-09-07 18:03:04 +08001382msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
Jiang Xin5c57d762016-08-28 10:18:12 +08001383
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001384#: config.c:680
Jiang Xin5c57d762016-08-28 10:18:12 +08001385#, c-format
1386msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
Ray Chen9a4b6942016-09-07 18:03:04 +08001387msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
Jiang Xin5c57d762016-08-28 10:18:12 +08001388
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001389#: config.c:683
Jiang Xin5c57d762016-08-28 10:18:12 +08001390#, c-format
1391msgid "bad numeric config value '%s' for '%s' in %s: %s"
Ray Chen9a4b6942016-09-07 18:03:04 +08001392msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
Jiang Xin5c57d762016-08-28 10:18:12 +08001393
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001394#: config.c:770
Jiang Xin220c3132014-10-08 10:55:14 +08001395#, c-format
1396msgid "failed to expand user dir in: '%s'"
1397msgstr "无法扩展 '%s' 中的用户目录"
1398
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001399#: config.c:865 config.c:876
Jiang Xin220c3132014-10-08 10:55:14 +08001400#, c-format
1401msgid "bad zlib compression level %d"
1402msgstr "错误的 zlib 压缩级别 %d"
1403
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001404#: config.c:993
Jiang Xin220c3132014-10-08 10:55:14 +08001405#, c-format
1406msgid "invalid mode for object creation: %s"
1407msgstr "无效的对象创建模式:%s"
1408
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001409#: config.c:1149
1410#, c-format
1411msgid "bad pack compression level %d"
1412msgstr "错误的打包压缩级别 %d"
1413
1414#: config.c:1339
Jiang Xin220c3132014-10-08 10:55:14 +08001415msgid "unable to parse command-line config"
1416msgstr "无法解析命令行中的配置"
1417
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001418#: config.c:1389
Jiang Xin5c57d762016-08-28 10:18:12 +08001419msgid "unknown error occurred while reading the configuration files"
Jiang Xin220c3132014-10-08 10:55:14 +08001420msgstr "在读取配置文件时遇到未知错误"
1421
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001422#: config.c:1743
Jiang Xin220c3132014-10-08 10:55:14 +08001423#, c-format
1424msgid "unable to parse '%s' from command-line config"
1425msgstr "无法解析命令行配置中的 '%s'"
1426
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001427#: config.c:1745
Jiang Xin220c3132014-10-08 10:55:14 +08001428#, c-format
1429msgid "bad config variable '%s' in file '%s' at line %d"
1430msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
1431
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001432#: config.c:1804
Jiang Xin220c3132014-10-08 10:55:14 +08001433#, c-format
1434msgid "%s has multiple values"
1435msgstr "%s 有多个取值"
1436
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001437#: config.c:2225 config.c:2450
1438#, c-format
1439msgid "fstat on %s failed"
1440msgstr "在 %s 上执行 fstat 失败"
1441
1442#: config.c:2343
Jiang Xin5b04ee32016-05-29 20:40:35 +08001443#, c-format
1444msgid "could not set '%s' to '%s'"
1445msgstr "不能设置 '%s' 为 '%s'"
1446
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001447#: config.c:2345
Jiang Xin276ceea2016-02-28 20:35:55 +08001448#, c-format
Jiang Xin5b04ee32016-05-29 20:40:35 +08001449msgid "could not unset '%s'"
1450msgstr "不能取消设置 '%s'"
Jiang Xin276ceea2016-02-28 20:35:55 +08001451
Jiang Xina0b6b242016-10-27 21:53:37 +08001452#: connect.c:49
1453msgid "The remote end hung up upon initial contact"
Ray Chen29004bb2016-12-28 17:08:45 +08001454msgstr "远端在连接发起时即挂断"
Jiang Xina0b6b242016-10-27 21:53:37 +08001455
1456#: connect.c:51
1457msgid ""
1458"Could not read from remote repository.\n"
1459"\n"
1460"Please make sure you have the correct access rights\n"
1461"and the repository exists."
1462msgstr ""
1463"无法读取远程仓库。\n"
1464"\n"
1465"请确认您有正确的访问权限并且仓库存在。"
1466
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001467#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140
Jiang Xin5c57d762016-08-28 10:18:12 +08001468msgid "Checking connectivity"
1469msgstr "检查连接中"
1470
Jiang Xina0b6b242016-10-27 21:53:37 +08001471#: connected.c:75
Jiang Xinc04f5ac2012-02-13 14:41:59 +08001472msgid "Could not run 'git rev-list'"
1473msgstr "不能执行 'git rev-list'"
1474
Jiang Xina0b6b242016-10-27 21:53:37 +08001475#: connected.c:95
Jiang Xin5b04ee32016-05-29 20:40:35 +08001476msgid "failed write to rev-list"
1477msgstr "无法写入 rev-list"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08001478
Jiang Xina0b6b242016-10-27 21:53:37 +08001479#: connected.c:102
Jiang Xin5b04ee32016-05-29 20:40:35 +08001480msgid "failed to close rev-list's stdin"
1481msgstr "无法关闭 rev-list 的标准输入"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08001482
Jiang Xina0b6b242016-10-27 21:53:37 +08001483#: convert.c:201
1484#, c-format
1485msgid ""
1486"CRLF will be replaced by LF in %s.\n"
1487"The file will have its original line endings in your working directory."
1488msgstr ""
1489"文件 %s 中的 CRLF 将被 LF 替换。\n"
1490"在工作区中该文件仍保持原有的换行符。"
1491
1492#: convert.c:205
1493#, c-format
1494msgid "CRLF would be replaced by LF in %s."
1495msgstr "文件 %s 中的 CRLF 将被 LF 替换。"
1496
1497#: convert.c:211
1498#, c-format
1499msgid ""
1500"LF will be replaced by CRLF in %s.\n"
1501"The file will have its original line endings in your working directory."
1502msgstr ""
1503"文件 %s 中的 LF 将被 CRLF 替换。\n"
1504"在工作区中该文件仍保持原有的换行符。"
1505
1506#: convert.c:215
1507#, c-format
1508msgid "LF would be replaced by CRLF in %s"
1509msgstr "文件 %s 中的 LF 将被 CRLF 替换"
1510
Jiang Xin5c57d762016-08-28 10:18:12 +08001511#: date.c:97
Jiang Xin8ada9592012-05-21 09:35:47 +08001512msgid "in the future"
Jiang Xin81809b92012-05-30 12:19:47 +08001513msgstr "在将来"
Jiang Xin8ada9592012-05-21 09:35:47 +08001514
Jiang Xin5c57d762016-08-28 10:18:12 +08001515#: date.c:103
Jiang Xin8ada9592012-05-21 09:35:47 +08001516#, c-format
1517msgid "%lu second ago"
1518msgid_plural "%lu seconds ago"
Jiang Xin6c94aba2014-03-13 12:41:34 +08001519msgstr[0] "%lu 秒钟前"
1520msgstr[1] "%lu 秒钟前"
Jiang Xin8ada9592012-05-21 09:35:47 +08001521
Jiang Xin5c57d762016-08-28 10:18:12 +08001522#: date.c:110
Jiang Xin8ada9592012-05-21 09:35:47 +08001523#, c-format
1524msgid "%lu minute ago"
1525msgid_plural "%lu minutes ago"
Jiang Xin6c94aba2014-03-13 12:41:34 +08001526msgstr[0] "%lu 分钟前"
1527msgstr[1] "%lu 分钟前"
Jiang Xin8ada9592012-05-21 09:35:47 +08001528
Jiang Xin5c57d762016-08-28 10:18:12 +08001529#: date.c:117
Jiang Xin8ada9592012-05-21 09:35:47 +08001530#, c-format
1531msgid "%lu hour ago"
1532msgid_plural "%lu hours ago"
Jiang Xin6c94aba2014-03-13 12:41:34 +08001533msgstr[0] "%lu 小时前"
1534msgstr[1] "%lu 小时前"
Jiang Xin8ada9592012-05-21 09:35:47 +08001535
Jiang Xin5c57d762016-08-28 10:18:12 +08001536#: date.c:124
Jiang Xin8ada9592012-05-21 09:35:47 +08001537#, c-format
1538msgid "%lu day ago"
1539msgid_plural "%lu days ago"
Jiang Xin6c94aba2014-03-13 12:41:34 +08001540msgstr[0] "%lu 天前"
1541msgstr[1] "%lu 天前"
Jiang Xin8ada9592012-05-21 09:35:47 +08001542
Jiang Xin5c57d762016-08-28 10:18:12 +08001543#: date.c:130
Jiang Xin8ada9592012-05-21 09:35:47 +08001544#, c-format
1545msgid "%lu week ago"
1546msgid_plural "%lu weeks ago"
Jiang Xin6c94aba2014-03-13 12:41:34 +08001547msgstr[0] "%lu 周前"
1548msgstr[1] "%lu 周前"
Jiang Xin8ada9592012-05-21 09:35:47 +08001549
Jiang Xin5c57d762016-08-28 10:18:12 +08001550#: date.c:137
Jiang Xin8ada9592012-05-21 09:35:47 +08001551#, c-format
1552msgid "%lu month ago"
1553msgid_plural "%lu months ago"
Jiang Xin6c94aba2014-03-13 12:41:34 +08001554msgstr[0] "%lu 个月前"
1555msgstr[1] "%lu 个月前"
Jiang Xin8ada9592012-05-21 09:35:47 +08001556
Jiang Xin5c57d762016-08-28 10:18:12 +08001557#: date.c:148
Jiang Xin8ada9592012-05-21 09:35:47 +08001558#, c-format
1559msgid "%lu year"
1560msgid_plural "%lu years"
Jiang Xin81809b92012-05-30 12:19:47 +08001561msgstr[0] "%lu 年"
Jiang Xin5ae481e2012-05-31 17:35:59 +08001562msgstr[1] "%lu 年"
Jiang Xin8ada9592012-05-21 09:35:47 +08001563
Jiang Xin6c94aba2014-03-13 12:41:34 +08001564#. TRANSLATORS: "%s" is "<n> years"
Jiang Xin5c57d762016-08-28 10:18:12 +08001565#: date.c:151
Jiang Xin8ada9592012-05-21 09:35:47 +08001566#, c-format
1567msgid "%s, %lu month ago"
1568msgid_plural "%s, %lu months ago"
Jiang Xin6c94aba2014-03-13 12:41:34 +08001569msgstr[0] "%s %lu 个月前"
1570msgstr[1] "%s %lu 个月前"
Jiang Xin8ada9592012-05-21 09:35:47 +08001571
Jiang Xin5c57d762016-08-28 10:18:12 +08001572#: date.c:156 date.c:161
Jiang Xin8ada9592012-05-21 09:35:47 +08001573#, c-format
1574msgid "%lu year ago"
1575msgid_plural "%lu years ago"
Jiang Xin81809b92012-05-30 12:19:47 +08001576msgstr[0] "%lu 年前"
Jiang Xin5ae481e2012-05-31 17:35:59 +08001577msgstr[1] "%lu 年前"
Jiang Xin8ada9592012-05-21 09:35:47 +08001578
Jiang Xincfff71a2014-01-18 11:04:21 +08001579#: diffcore-order.c:24
1580#, c-format
1581msgid "failed to read orderfile '%s'"
1582msgstr "无法读取排序文件 '%s'"
1583
Jiang Xin275588f2016-11-22 22:24:59 +08001584#: diffcore-rename.c:536
Jiang Xin6c94aba2014-03-13 12:41:34 +08001585msgid "Performing inexact rename detection"
1586msgstr "正在进行非精确的重命名检测"
1587
Jiang Xina0b6b242016-10-27 21:53:37 +08001588#: diff.c:62
1589#, c-format
1590msgid "option '%s' requires a value"
1591msgstr "选项 '%s' 需要一个值"
1592
Jiang Xin90e6ef52012-03-27 14:46:11 +08001593# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +08001594#: diff.c:124
Jiang Xinc04f5ac2012-02-13 14:41:59 +08001595#, c-format
Wang Sheng07432ce2013-01-30 17:23:08 +08001596msgid " Failed to parse dirstat cut-off percentage '%s'\n"
1597msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08001598
Jiang Xin90e6ef52012-03-27 14:46:11 +08001599# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +08001600#: diff.c:129
Jiang Xinc04f5ac2012-02-13 14:41:59 +08001601#, c-format
Wang Sheng07432ce2013-01-30 17:23:08 +08001602msgid " Unknown dirstat parameter '%s'\n"
1603msgstr " 未知的 dirstat 参数 '%s'\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08001604
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001605#: diff.c:281
Wang Sheng07432ce2013-01-30 17:23:08 +08001606#, c-format
1607msgid "Unknown value for 'diff.submodule' config variable: '%s'"
1608msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
1609
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001610#: diff.c:344
Jiang Xinc04f5ac2012-02-13 14:41:59 +08001611#, c-format
1612msgid ""
1613"Found errors in 'diff.dirstat' config variable:\n"
1614"%s"
1615msgstr ""
Jiang Xin90e6ef52012-03-27 14:46:11 +08001616"发现配置变量 'diff.dirstat' 中的错误:\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08001617"%s"
1618
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001619#: diff.c:3085
Jiang Xin6acbf032014-08-04 16:23:15 +08001620#, c-format
1621msgid "external diff died, stopping at %s"
1622msgstr "外部 diff 退出,停止在 %s"
1623
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001624#: diff.c:3411
Jiang Xina0b6b242016-10-27 21:53:37 +08001625msgid "--name-only, --name-status, --check and -s are mutually exclusive"
1626msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
1627
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001628#: diff.c:3501
Jiang Xin6acbf032014-08-04 16:23:15 +08001629msgid "--follow requires exactly one pathspec"
Ray Chen9a4b6942016-09-07 18:03:04 +08001630msgstr "--follow 明确要求只跟一个路径规格"
Jiang Xin6acbf032014-08-04 16:23:15 +08001631
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001632#: diff.c:3664
Jiang Xinc04f5ac2012-02-13 14:41:59 +08001633#, c-format
1634msgid ""
1635"Failed to parse --dirstat/-X option parameter:\n"
1636"%s"
1637msgstr ""
1638"无法解析 --dirstat/-X 选项的参数:\n"
1639"%s"
1640
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001641#: diff.c:3678
Wang Sheng07432ce2013-01-30 17:23:08 +08001642#, c-format
1643msgid "Failed to parse --submodule option parameter: '%s'"
1644msgstr "无法解析 --submodule 选项的参数:'%s'"
1645
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001646#: diff.c:4696
Jiang Xina0b6b242016-10-27 21:53:37 +08001647msgid "inexact rename detection was skipped due to too many files."
1648msgstr "因为文件太多,略过不严格的重命名检查。"
1649
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001650#: diff.c:4699
Jiang Xina0b6b242016-10-27 21:53:37 +08001651msgid "only found copies from modified paths due to too many files."
1652msgstr "因为文件太多,只在修改的路径中查找拷贝。"
1653
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001654#: diff.c:4702
Jiang Xina0b6b242016-10-27 21:53:37 +08001655#, c-format
1656msgid ""
1657"you may want to set your %s variable to at least %d and retry the command."
Ray Chen29004bb2016-12-28 17:08:45 +08001658msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
Jiang Xina0b6b242016-10-27 21:53:37 +08001659
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001660#: dir.c:1862
Jiang Xin7aea43f2015-05-31 08:42:31 +08001661msgid "failed to get kernel name and information"
1662msgstr "无法获得内核名称和信息"
1663
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001664#: dir.c:1981
Jiang Xin276ceea2016-02-28 20:35:55 +08001665msgid "Untracked cache is disabled on this system or location."
1666msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
Jiang Xin7aea43f2015-05-31 08:42:31 +08001667
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001668#: dir.c:2759
1669#, c-format
1670msgid "could not migrate git directory from '%s' to '%s'"
1671msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
1672
Jiang Xina0b6b242016-10-27 21:53:37 +08001673#: fetch-pack.c:213
1674msgid "git fetch-pack: expected shallow list"
1675msgstr "git fetch-pack:应为 shallow 列表"
1676
1677#: fetch-pack.c:225
1678msgid "git fetch-pack: expected ACK/NAK, got EOF"
1679msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF"
1680
1681#: fetch-pack.c:243
1682#, c-format
Jiang Xin275588f2016-11-22 22:24:59 +08001683msgid "git fetch-pack: expected ACK/NAK, got '%s'"
Jiang Xina0b6b242016-10-27 21:53:37 +08001684msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
1685
1686#: fetch-pack.c:295
1687msgid "--stateless-rpc requires multi_ack_detailed"
1688msgstr "--stateless-rpc 需要 multi_ack_detailed"
1689
1690#: fetch-pack.c:381
1691#, c-format
1692msgid "invalid shallow line: %s"
1693msgstr "无效的 shallow 信息:%s"
1694
1695#: fetch-pack.c:387
1696#, c-format
1697msgid "invalid unshallow line: %s"
1698msgstr "无效的 unshallow 信息:%s"
1699
1700#: fetch-pack.c:389
1701#, c-format
1702msgid "object not found: %s"
1703msgstr "对象未找到:%s"
1704
1705#: fetch-pack.c:392
1706#, c-format
1707msgid "error in object: %s"
1708msgstr "对象中出错:%s"
1709
1710#: fetch-pack.c:394
1711#, c-format
1712msgid "no shallow found: %s"
1713msgstr "未发现 shallow:%s"
1714
1715#: fetch-pack.c:397
1716#, c-format
1717msgid "expected shallow/unshallow, got %s"
1718msgstr "应为 shallow/unshallow,却得到 %s"
1719
1720#: fetch-pack.c:436
1721#, c-format
1722msgid "got %s %d %s"
1723msgstr "得到 %s %d %s"
1724
1725#: fetch-pack.c:450
1726#, c-format
1727msgid "invalid commit %s"
1728msgstr "无效提交 %s"
1729
1730#: fetch-pack.c:483
1731msgid "giving up"
1732msgstr "放弃"
1733
1734#: fetch-pack.c:493 progress.c:235
1735msgid "done"
1736msgstr "完成"
1737
1738#: fetch-pack.c:505
1739#, c-format
1740msgid "got %s (%d) %s"
1741msgstr "得到 %s (%d) %s"
1742
1743#: fetch-pack.c:551
1744#, c-format
1745msgid "Marking %s as complete"
1746msgstr "标记 %s 为完成"
1747
1748#: fetch-pack.c:697
1749#, c-format
1750msgid "already have %s (%s)"
Ray Chen29004bb2016-12-28 17:08:45 +08001751msgstr "已经有 %s(%s)"
Jiang Xina0b6b242016-10-27 21:53:37 +08001752
1753#: fetch-pack.c:735
1754msgid "fetch-pack: unable to fork off sideband demultiplexer"
1755msgstr "fetch-pack:无法派生 sideband 多路输出"
1756
1757#: fetch-pack.c:743
1758msgid "protocol error: bad pack header"
1759msgstr "协议错误:坏的包头"
1760
1761#: fetch-pack.c:799
1762#, c-format
1763msgid "fetch-pack: unable to fork off %s"
1764msgstr "fetch-pack:无法派生进程 %s"
1765
1766#: fetch-pack.c:815
1767#, c-format
1768msgid "%s failed"
1769msgstr "%s 失败"
1770
1771#: fetch-pack.c:817
1772msgid "error in sideband demultiplexer"
1773msgstr "sideband 多路输出出错"
1774
1775#: fetch-pack.c:844
1776msgid "Server does not support shallow clients"
1777msgstr "服务器不支持 shalllow 客户端"
1778
1779#: fetch-pack.c:848
1780msgid "Server supports multi_ack_detailed"
1781msgstr "服务器支持 multi_ack_detailed"
1782
1783#: fetch-pack.c:851
1784msgid "Server supports no-done"
1785msgstr "服务器支持 no-done"
1786
1787#: fetch-pack.c:857
1788msgid "Server supports multi_ack"
1789msgstr "服务器支持 multi_ack"
1790
1791#: fetch-pack.c:861
1792msgid "Server supports side-band-64k"
1793msgstr "服务器支持 side-band-64k"
1794
1795#: fetch-pack.c:865
1796msgid "Server supports side-band"
1797msgstr "服务器支持 side-band"
1798
1799#: fetch-pack.c:869
1800msgid "Server supports allow-tip-sha1-in-want"
1801msgstr "服务器支持 allow-tip-sha1-in-want"
1802
1803#: fetch-pack.c:873
1804msgid "Server supports allow-reachable-sha1-in-want"
1805msgstr "服务器支持 allow-reachable-sha1-in-want"
1806
1807#: fetch-pack.c:883
1808msgid "Server supports ofs-delta"
1809msgstr "服务器支持 ofs-delta"
1810
1811#: fetch-pack.c:890
1812#, c-format
1813msgid "Server version is %.*s"
1814msgstr "服务器版本 %.*s"
1815
1816#: fetch-pack.c:896
1817msgid "Server does not support --shallow-since"
1818msgstr "服务器不支持 --shallow-since"
1819
1820#: fetch-pack.c:900
1821msgid "Server does not support --shallow-exclude"
1822msgstr "服务器不支持 --shallow-exclude"
1823
1824#: fetch-pack.c:902
1825msgid "Server does not support --deepen"
1826msgstr "服务器不支持 --deepen"
1827
1828#: fetch-pack.c:913
1829msgid "no common commits"
1830msgstr "没有共同的提交"
1831
1832#: fetch-pack.c:925
1833msgid "git fetch-pack: fetch failed."
1834msgstr "git fetch-pack:获取失败。"
1835
1836#: fetch-pack.c:1087
1837msgid "no matching remote head"
1838msgstr "没有匹配的远程分支"
1839
1840#: gpg-interface.c:185
Jiang Xinc04f5ac2012-02-13 14:41:59 +08001841msgid "gpg failed to sign the data"
1842msgstr "gpg 无法为数据签名"
1843
Jiang Xina0b6b242016-10-27 21:53:37 +08001844#: gpg-interface.c:215
Jiang Xin5c57d762016-08-28 10:18:12 +08001845msgid "could not create temporary file"
1846msgstr "不能创建临时文件"
Jiang Xina77c07d2013-02-14 17:47:45 +08001847
Jiang Xina0b6b242016-10-27 21:53:37 +08001848#: gpg-interface.c:217
Jiang Xina77c07d2013-02-14 17:47:45 +08001849#, c-format
Jiang Xin5b04ee32016-05-29 20:40:35 +08001850msgid "failed writing detached signature to '%s'"
1851msgstr "无法将分离式签名写入 '%s'"
Jiang Xina77c07d2013-02-14 17:47:45 +08001852
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001853#: graph.c:96
1854#, c-format
1855msgid "ignore invalid color '%.*s' in log.graphColors"
1856msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
1857
1858#: grep.c:1794
Jiang Xin7ac1c0a2012-02-28 12:24:54 +08001859#, c-format
1860msgid "'%s': unable to read %s"
1861msgstr "'%s':无法读取 %s"
1862
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001863#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133
Jiang Xin7ac1c0a2012-02-28 12:24:54 +08001864#, c-format
Jiang Xin5b04ee32016-05-29 20:40:35 +08001865msgid "failed to stat '%s'"
1866msgstr "无法枚举 '%s' 状态"
Jiang Xin7ac1c0a2012-02-28 12:24:54 +08001867
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001868#: grep.c:1822
Jiang Xin7ac1c0a2012-02-28 12:24:54 +08001869#, c-format
Jiang Xin5b04ee32016-05-29 20:40:35 +08001870msgid "'%s': short read"
1871msgstr "'%s':读取不完整"
Jiang Xin7ac1c0a2012-02-28 12:24:54 +08001872
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001873#: help.c:218
Jiang Xin81809b92012-05-30 12:19:47 +08001874#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08001875msgid "available git commands in '%s'"
Jiang Xin81809b92012-05-30 12:19:47 +08001876msgstr "在 '%s' 下可用的 git 命令"
Jiang Xin8ada9592012-05-21 09:35:47 +08001877
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001878#: help.c:225
Jiang Xin8ada9592012-05-21 09:35:47 +08001879msgid "git commands available from elsewhere on your $PATH"
Jiang Xin81809b92012-05-30 12:19:47 +08001880msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
Jiang Xin8ada9592012-05-21 09:35:47 +08001881
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001882#: help.c:256
Jiang Xin7aea43f2015-05-31 08:42:31 +08001883msgid "These are common Git commands used in various situations:"
1884msgstr "这些是各种场合常见的 Git 命令:"
Jiang Xina77c07d2013-02-14 17:47:45 +08001885
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001886#: help.c:321
Jiang Xinc04f5ac2012-02-13 14:41:59 +08001887#, c-format
1888msgid ""
1889"'%s' appears to be a git command, but we were not\n"
1890"able to execute it. Maybe git-%s is broken?"
1891msgstr ""
1892"'%s' 像是一个 git 命令,但却无法运行。\n"
1893"可能是 git-%s 受损?"
1894
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001895#: help.c:376
Jiang Xin8ada9592012-05-21 09:35:47 +08001896msgid "Uh oh. Your system reports no Git commands at all."
Jiang Xin81809b92012-05-30 12:19:47 +08001897msgstr "唉呀,您的系统中未发现 Git 命令。"
Jiang Xin8ada9592012-05-21 09:35:47 +08001898
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001899#: help.c:398
Jiang Xin8ada9592012-05-21 09:35:47 +08001900#, c-format
1901msgid ""
1902"WARNING: You called a Git command named '%s', which does not exist.\n"
1903"Continuing under the assumption that you meant '%s'"
1904msgstr ""
Jiang Xin7665d452016-09-05 23:26:21 +08001905"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n"
Jiang Xin81809b92012-05-30 12:19:47 +08001906"是 '%s'"
Jiang Xin8ada9592012-05-21 09:35:47 +08001907
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001908#: help.c:403
Jiang Xin8ada9592012-05-21 09:35:47 +08001909#, c-format
1910msgid "in %0.1f seconds automatically..."
Jiang Xin81809b92012-05-30 12:19:47 +08001911msgstr "在 %0.1f 秒钟后自动运行..."
Jiang Xin8ada9592012-05-21 09:35:47 +08001912
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001913#: help.c:410
Jiang Xin8ada9592012-05-21 09:35:47 +08001914#, c-format
1915msgid "git: '%s' is not a git command. See 'git --help'."
Jiang Xin81809b92012-05-30 12:19:47 +08001916msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
Jiang Xin8ada9592012-05-21 09:35:47 +08001917
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001918#: help.c:414 help.c:480
Jiang Xin8ada9592012-05-21 09:35:47 +08001919msgid ""
1920"\n"
1921"Did you mean this?"
1922msgid_plural ""
1923"\n"
1924"Did you mean one of these?"
1925msgstr[0] ""
Jiang Xin81809b92012-05-30 12:19:47 +08001926"\n"
1927"您指的是这个么?"
1928msgstr[1] ""
1929"\n"
Thynson195febd2012-08-07 17:39:30 +08001930"您指的是这其中的某一个么?"
Jiang Xin8ada9592012-05-21 09:35:47 +08001931
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001932#: help.c:476
Jiang Xin2e8451e2013-07-26 14:00:02 +08001933#, c-format
1934msgid "%s: %s - %s"
1935msgstr "%s:%s - %s"
1936
Jiang Xina0b6b242016-10-27 21:53:37 +08001937#: ident.c:334
1938msgid ""
1939"\n"
1940"*** Please tell me who you are.\n"
1941"\n"
1942"Run\n"
1943"\n"
1944" git config --global user.email \"you@example.com\"\n"
1945" git config --global user.name \"Your Name\"\n"
1946"\n"
1947"to set your account's default identity.\n"
1948"Omit --global to set the identity only in this repository.\n"
1949"\n"
1950msgstr ""
1951"\n"
1952"*** 请告诉我你是谁。\n"
1953"\n"
1954"运行\n"
1955"\n"
1956" git config --global user.email \"you@example.com\"\n"
1957" git config --global user.name \"Your Name\"\n"
1958"\n"
1959"来设置您账号的缺省身份标识。\n"
1960"如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
1961
Jiang Xin5b04ee32016-05-29 20:40:35 +08001962#: lockfile.c:152
1963#, c-format
1964msgid ""
1965"Unable to create '%s.lock': %s.\n"
1966"\n"
1967"Another git process seems to be running in this repository, e.g.\n"
1968"an editor opened by 'git commit'. Please make sure all processes\n"
1969"are terminated then try again. If it still fails, a git process\n"
1970"may have crashed in this repository earlier:\n"
1971"remove the file manually to continue."
1972msgstr ""
1973"无法创建 '%s.lock':%s。\n"
1974"\n"
1975"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
1976"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
1977"可能之前有一个 git 进程在这个仓库中异常退出:\n"
1978"手动删除这个文件再继续。"
1979
1980#: lockfile.c:160
1981#, c-format
1982msgid "Unable to create '%s.lock': %s"
1983msgstr "不能创建 '%s.lock':%s"
1984
Jiang Xin220c3132014-10-08 10:55:14 +08001985#: merge.c:41
Wang Sheng07432ce2013-01-30 17:23:08 +08001986msgid "failed to read the cache"
1987msgstr "无法读取缓存"
1988
Jiang Xina0b6b242016-10-27 21:53:37 +08001989#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
1990#: builtin/checkout.c:588 builtin/clone.c:731
Wang Sheng07432ce2013-01-30 17:23:08 +08001991msgid "unable to write new index file"
1992msgstr "无法写新的索引文件"
1993
Jiang Xin5c57d762016-08-28 10:18:12 +08001994#: merge-recursive.c:209
Jiang Xin649900b2012-08-02 11:50:59 +08001995msgid "(bad commit)\n"
1996msgstr "(坏提交)\n"
1997
Jiang Xin1a79b2f2017-01-27 22:50:57 +08001998#: merge-recursive.c:231 merge-recursive.c:239
Jiang Xin649900b2012-08-02 11:50:59 +08001999#, c-format
2000msgid "addinfo_cache failed for path '%s'"
2001msgstr "为路径 '%s' addinfo_cache 失败"
2002
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002003#: merge-recursive.c:303
Jiang Xin649900b2012-08-02 11:50:59 +08002004msgid "error building trees"
2005msgstr "无法创建树"
2006
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002007#: merge-recursive.c:727
Jiang Xin649900b2012-08-02 11:50:59 +08002008#, c-format
2009msgid "failed to create path '%s'%s"
2010msgstr "无法创建路径 '%s'%s"
2011
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002012#: merge-recursive.c:738
Jiang Xin649900b2012-08-02 11:50:59 +08002013#, c-format
2014msgid "Removing %s to make room for subdirectory\n"
2015msgstr "删除 %s 以便为子目录留出空间\n"
2016
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002017#: merge-recursive.c:752 merge-recursive.c:771
Jiang Xin649900b2012-08-02 11:50:59 +08002018msgid ": perhaps a D/F conflict?"
2019msgstr ":可能是一个目录/文件冲突?"
2020
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002021#: merge-recursive.c:761
Jiang Xin649900b2012-08-02 11:50:59 +08002022#, c-format
2023msgid "refusing to lose untracked file at '%s'"
2024msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
2025
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002026#: merge-recursive.c:803 builtin/cat-file.c:34
Jiang Xin649900b2012-08-02 11:50:59 +08002027#, c-format
2028msgid "cannot read object %s '%s'"
2029msgstr "不能读取对象 %s '%s'"
2030
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002031#: merge-recursive.c:805
Jiang Xin649900b2012-08-02 11:50:59 +08002032#, c-format
2033msgid "blob expected for %s '%s'"
Jiang Xin160fb2b2015-08-02 21:47:30 +08002034msgstr "%s '%s' 应为数据对象"
Jiang Xin649900b2012-08-02 11:50:59 +08002035
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002036#: merge-recursive.c:829
Jiang Xin649900b2012-08-02 11:50:59 +08002037#, c-format
Jiang Xin5c57d762016-08-28 10:18:12 +08002038msgid "failed to open '%s': %s"
2039msgstr "无法打开 '%s':%s"
Jiang Xin649900b2012-08-02 11:50:59 +08002040
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002041#: merge-recursive.c:840
Jiang Xin649900b2012-08-02 11:50:59 +08002042#, c-format
Jiang Xin5c57d762016-08-28 10:18:12 +08002043msgid "failed to symlink '%s': %s"
2044msgstr "无法创建符号链接 '%s':%s"
Jiang Xin649900b2012-08-02 11:50:59 +08002045
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002046#: merge-recursive.c:845
Jiang Xin649900b2012-08-02 11:50:59 +08002047#, c-format
2048msgid "do not know what to do with %06o %s '%s'"
2049msgstr "不知道如何处理 %06o %s '%s'"
2050
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002051#: merge-recursive.c:985
Jiang Xin649900b2012-08-02 11:50:59 +08002052msgid "Failed to execute internal merge"
2053msgstr "无法执行内部合并"
2054
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002055#: merge-recursive.c:989
Jiang Xin649900b2012-08-02 11:50:59 +08002056#, c-format
2057msgid "Unable to add %s to database"
2058msgstr "不能添加 %s 至对象库"
2059
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002060#: merge-recursive.c:1088 merge-recursive.c:1102
Jiang Xin649900b2012-08-02 11:50:59 +08002061#, c-format
2062msgid ""
2063"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2064"in tree."
2065msgstr ""
2066"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
2067"的版本被保留。"
2068
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002069#: merge-recursive.c:1094 merge-recursive.c:1107
Jiang Xin649900b2012-08-02 11:50:59 +08002070#, c-format
2071msgid ""
2072"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
2073"in tree at %s."
2074msgstr ""
2075"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
2076"的版本保留于 %8$s 中。"
2077
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002078#: merge-recursive.c:1150
Jiang Xin649900b2012-08-02 11:50:59 +08002079msgid "rename"
2080msgstr "重命名"
2081
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002082#: merge-recursive.c:1150
Jiang Xin649900b2012-08-02 11:50:59 +08002083msgid "renamed"
2084msgstr "重命名"
2085
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002086#: merge-recursive.c:1207
Jiang Xin649900b2012-08-02 11:50:59 +08002087#, c-format
2088msgid "%s is a directory in %s adding as %s instead"
2089msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
2090
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002091#: merge-recursive.c:1232
Jiang Xin649900b2012-08-02 11:50:59 +08002092#, c-format
2093msgid ""
2094"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
2095"\"->\"%s\" in \"%s\"%s"
2096msgstr ""
2097"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
2098"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
2099
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002100#: merge-recursive.c:1237
Jiang Xin649900b2012-08-02 11:50:59 +08002101msgid " (left unresolved)"
2102msgstr "(留下未解决)"
2103
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002104#: merge-recursive.c:1299
Jiang Xin649900b2012-08-02 11:50:59 +08002105#, c-format
2106msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
2107msgstr ""
2108"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
2109"%5$s"
2110
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002111#: merge-recursive.c:1332
Jiang Xin649900b2012-08-02 11:50:59 +08002112#, c-format
2113msgid "Renaming %s to %s and %s to %s instead"
Wang Sheng07432ce2013-01-30 17:23:08 +08002114msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
Jiang Xin649900b2012-08-02 11:50:59 +08002115
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002116#: merge-recursive.c:1535
Jiang Xin649900b2012-08-02 11:50:59 +08002117#, c-format
2118msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
2119msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
2120
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002121#: merge-recursive.c:1550
Jiang Xin649900b2012-08-02 11:50:59 +08002122#, c-format
2123msgid "Adding merged %s"
2124msgstr "添加合并后的 %s"
2125
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002126#: merge-recursive.c:1557 merge-recursive.c:1771
Jiang Xin649900b2012-08-02 11:50:59 +08002127#, c-format
2128msgid "Adding as %s instead"
2129msgstr "而是以 %s 为名添加"
2130
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002131#: merge-recursive.c:1614
Jiang Xin649900b2012-08-02 11:50:59 +08002132#, c-format
2133msgid "cannot read object %s"
2134msgstr "不能读取对象 %s"
2135
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002136#: merge-recursive.c:1617
Jiang Xin649900b2012-08-02 11:50:59 +08002137#, c-format
2138msgid "object %s is not a blob"
Jiang Xin160fb2b2015-08-02 21:47:30 +08002139msgstr "对象 %s 不是一个数据对象"
Jiang Xin649900b2012-08-02 11:50:59 +08002140
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002141#: merge-recursive.c:1670
Jiang Xin649900b2012-08-02 11:50:59 +08002142msgid "modify"
2143msgstr "修改"
2144
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002145#: merge-recursive.c:1670
Jiang Xin649900b2012-08-02 11:50:59 +08002146msgid "modified"
2147msgstr "修改"
2148
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002149#: merge-recursive.c:1680
Jiang Xin649900b2012-08-02 11:50:59 +08002150msgid "content"
2151msgstr "内容"
2152
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002153#: merge-recursive.c:1687
Jiang Xin649900b2012-08-02 11:50:59 +08002154msgid "add/add"
2155msgstr "添加/添加"
2156
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002157#: merge-recursive.c:1723
Jiang Xin649900b2012-08-02 11:50:59 +08002158#, c-format
2159msgid "Skipped %s (merged same as existing)"
2160msgstr "略过 %s(已经做过相同合并)"
2161
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002162#: merge-recursive.c:1737
Jiang Xin649900b2012-08-02 11:50:59 +08002163#, c-format
2164msgid "Auto-merging %s"
2165msgstr "自动合并 %s"
2166
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002167#: merge-recursive.c:1741 git-submodule.sh:930
Jiang Xin649900b2012-08-02 11:50:59 +08002168msgid "submodule"
2169msgstr "子模组"
2170
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002171#: merge-recursive.c:1742
Jiang Xin649900b2012-08-02 11:50:59 +08002172#, c-format
2173msgid "CONFLICT (%s): Merge conflict in %s"
2174msgstr "冲突(%s):合并冲突于 %s"
2175
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002176#: merge-recursive.c:1836
Jiang Xin649900b2012-08-02 11:50:59 +08002177#, c-format
2178msgid "Removing %s"
2179msgstr "删除 %s"
2180
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002181#: merge-recursive.c:1862
Jiang Xin649900b2012-08-02 11:50:59 +08002182msgid "file/directory"
2183msgstr "文件/目录"
2184
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002185#: merge-recursive.c:1868
Jiang Xin649900b2012-08-02 11:50:59 +08002186msgid "directory/file"
2187msgstr "目录/文件"
2188
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002189#: merge-recursive.c:1874
Jiang Xin649900b2012-08-02 11:50:59 +08002190#, c-format
2191msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
2192msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
2193
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002194#: merge-recursive.c:1883
Jiang Xin649900b2012-08-02 11:50:59 +08002195#, c-format
2196msgid "Adding %s"
2197msgstr "添加 %s"
2198
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002199#: merge-recursive.c:1920
Jiang Xin649900b2012-08-02 11:50:59 +08002200msgid "Already up-to-date!"
2201msgstr "已经是最新的!"
2202
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002203#: merge-recursive.c:1929
Jiang Xin649900b2012-08-02 11:50:59 +08002204#, c-format
2205msgid "merging of trees %s and %s failed"
2206msgstr "无法合并树 %s 和 %s"
2207
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002208#: merge-recursive.c:2012
Jiang Xin649900b2012-08-02 11:50:59 +08002209msgid "Merging:"
2210msgstr "合并:"
2211
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002212#: merge-recursive.c:2025
Jiang Xin649900b2012-08-02 11:50:59 +08002213#, c-format
Jiang Xine5e38ce2012-08-07 01:10:34 +08002214msgid "found %u common ancestor:"
2215msgid_plural "found %u common ancestors:"
2216msgstr[0] "发现 %u 个共同祖先:"
2217msgstr[1] "发现 %u 个共同祖先:"
Jiang Xin649900b2012-08-02 11:50:59 +08002218
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002219#: merge-recursive.c:2064
Jiang Xin649900b2012-08-02 11:50:59 +08002220msgid "merge returned no commit"
2221msgstr "合并未返回提交"
2222
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002223#: merge-recursive.c:2127
Jiang Xin649900b2012-08-02 11:50:59 +08002224#, c-format
2225msgid "Could not parse object '%s'"
2226msgstr "不能解析对象 '%s'"
2227
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002228#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792
Jiang Xin649900b2012-08-02 11:50:59 +08002229msgid "Unable to write index."
2230msgstr "不能写入索引。"
2231
Jiang Xina0b6b242016-10-27 21:53:37 +08002232#: notes-merge.c:273
2233#, c-format
2234msgid ""
2235"You have not concluded your previous notes merge (%s exists).\n"
2236"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
2237"commit/abort the previous merge before you start a new notes merge."
2238msgstr ""
Ray Chen29004bb2016-12-28 17:08:45 +08002239"您的前一次注释合并尚未结束(存在 %s)。\n"
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002240"在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
2241"notes merge --abort' 来提交/终止前一次合并。"
Jiang Xina0b6b242016-10-27 21:53:37 +08002242
2243#: notes-merge.c:280
2244#, c-format
2245msgid "You have not concluded your notes merge (%s exists)."
2246msgstr "您尚未结束注释合并(存在 %s)。"
2247
Jiang Xin6acbf032014-08-04 16:23:15 +08002248#: notes-utils.c:41
Jiang Xin2e8451e2013-07-26 14:00:02 +08002249msgid "Cannot commit uninitialized/unreferenced notes tree"
2250msgstr "不能提交未初始化/未引用的注解树"
2251
Jiang Xin1b7f4a32015-08-23 15:23:21 +08002252#: notes-utils.c:100
Jiang Xin2e8451e2013-07-26 14:00:02 +08002253#, c-format
2254msgid "Bad notes.rewriteMode value: '%s'"
2255msgstr "坏的 notes.rewriteMode 值:'%s'"
2256
Jiang Xin1b7f4a32015-08-23 15:23:21 +08002257#: notes-utils.c:110
Jiang Xin2e8451e2013-07-26 14:00:02 +08002258#, c-format
2259msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
2260msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
2261
2262#. TRANSLATORS: The first %s is the name of the
2263#. environment variable, the second %s is its value
Jiang Xin1b7f4a32015-08-23 15:23:21 +08002264#: notes-utils.c:137
Jiang Xin2e8451e2013-07-26 14:00:02 +08002265#, c-format
2266msgid "Bad %s value: '%s'"
2267msgstr "坏的 %s 值:'%s'"
2268
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002269#: object.c:240
Jiang Xin1003b3a2013-04-11 17:55:09 +08002270#, c-format
2271msgid "unable to parse object: %s"
2272msgstr "不能解析对象:%s"
2273
Jiang Xin5b04ee32016-05-29 20:40:35 +08002274#: parse-options.c:572
Jiang Xin8ada9592012-05-21 09:35:47 +08002275msgid "..."
Jiang Xin81809b92012-05-30 12:19:47 +08002276msgstr "..."
Jiang Xin8ada9592012-05-21 09:35:47 +08002277
Jiang Xin5b04ee32016-05-29 20:40:35 +08002278#: parse-options.c:590
Jiang Xin81809b92012-05-30 12:19:47 +08002279#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08002280msgid "usage: %s"
Jiang Xin81809b92012-05-30 12:19:47 +08002281msgstr "用法:%s"
Jiang Xin8ada9592012-05-21 09:35:47 +08002282
2283#. TRANSLATORS: the colon here should align with the
2284#. one in "usage: %s" translation
Jiang Xin5b04ee32016-05-29 20:40:35 +08002285#: parse-options.c:594
Jiang Xin81809b92012-05-30 12:19:47 +08002286#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08002287msgid " or: %s"
Jiang Xin81809b92012-05-30 12:19:47 +08002288msgstr " 或:%s"
Jiang Xin8ada9592012-05-21 09:35:47 +08002289
2290# 译者:为保证在输出中对齐,注意调整句中空格!
Jiang Xin5b04ee32016-05-29 20:40:35 +08002291#: parse-options.c:597
Jiang Xin81809b92012-05-30 12:19:47 +08002292#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08002293msgid " %s"
Jiang Xin81809b92012-05-30 12:19:47 +08002294msgstr " %s"
Jiang Xin8ada9592012-05-21 09:35:47 +08002295
Jiang Xin5b04ee32016-05-29 20:40:35 +08002296#: parse-options.c:631
Jiang Xin63af42f2013-02-19 14:52:24 +08002297msgid "-NUM"
2298msgstr "-数字"
2299
Jiang Xin94550ed2015-11-16 07:02:11 +08002300#: parse-options-cb.c:108
2301#, c-format
2302msgid "malformed object name '%s'"
2303msgstr "非法的对象名 '%s'"
2304
Jiang Xina0b6b242016-10-27 21:53:37 +08002305#: path.c:826
Jiang Xin94550ed2015-11-16 07:02:11 +08002306#, c-format
2307msgid "Could not make %s writable by group"
2308msgstr "不能设置 %s 为组可写"
2309
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002310#: pathspec.c:142
Jiang Xin90314792013-09-17 23:37:05 +08002311msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
Jiang Xin160fb2b2015-08-02 21:47:30 +08002312msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
Jiang Xina77c07d2013-02-14 17:47:45 +08002313
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002314#: pathspec.c:149
Jiang Xin90314792013-09-17 23:37:05 +08002315msgid ""
2316"global 'literal' pathspec setting is incompatible with all other global "
2317"pathspec settings"
Jiang Xin160fb2b2015-08-02 21:47:30 +08002318msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
Jiang Xina77c07d2013-02-14 17:47:45 +08002319
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002320#: pathspec.c:188
Jiang Xin90314792013-09-17 23:37:05 +08002321msgid "invalid parameter for pathspec magic 'prefix'"
Jiang Xin160fb2b2015-08-02 21:47:30 +08002322msgstr "路径规格包含无效的神奇前缀"
Jiang Xin90314792013-09-17 23:37:05 +08002323
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002324#: pathspec.c:201
Jiang Xin90314792013-09-17 23:37:05 +08002325#, c-format
2326msgid "Invalid pathspec magic '%.*s' in '%s'"
Jiang Xin160fb2b2015-08-02 21:47:30 +08002327msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
Jiang Xin90314792013-09-17 23:37:05 +08002328
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002329#: pathspec.c:206
Jiang Xin90314792013-09-17 23:37:05 +08002330#, c-format
2331msgid "Missing ')' at the end of pathspec magic in '%s'"
Jiang Xin160fb2b2015-08-02 21:47:30 +08002332msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
Jiang Xin90314792013-09-17 23:37:05 +08002333
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002334#: pathspec.c:238
Jiang Xin90314792013-09-17 23:37:05 +08002335#, c-format
2336msgid "Unimplemented pathspec magic '%c' in '%s'"
Jiang Xin160fb2b2015-08-02 21:47:30 +08002337msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
Jiang Xin90314792013-09-17 23:37:05 +08002338
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002339#: pathspec.c:293 pathspec.c:315
Jiang Xin90314792013-09-17 23:37:05 +08002340#, c-format
2341msgid "Pathspec '%s' is in submodule '%.*s'"
Jiang Xin160fb2b2015-08-02 21:47:30 +08002342msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
Jiang Xin90314792013-09-17 23:37:05 +08002343
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002344#: pathspec.c:350
2345#, c-format
2346msgid "%s: 'literal' and 'glob' are incompatible"
2347msgstr "%s:'literal' 和 'glob' 不兼容"
2348
2349#: pathspec.c:363
2350#, c-format
2351msgid "%s: '%s' is outside repository"
2352msgstr "%s:'%s' 在仓库之外"
2353
2354#: pathspec.c:451
2355#, c-format
2356msgid "'%s' (mnemonic: '%c')"
2357msgstr "'%s'(助记符:'%c')"
2358
2359#: pathspec.c:461
Jiang Xin90314792013-09-17 23:37:05 +08002360#, c-format
2361msgid "%s: pathspec magic not supported by this command: %s"
Jiang Xin160fb2b2015-08-02 21:47:30 +08002362msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
Jiang Xin90314792013-09-17 23:37:05 +08002363
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002364#: pathspec.c:511
Jiang Xina0b6b242016-10-27 21:53:37 +08002365msgid ""
2366"empty strings as pathspecs will be made invalid in upcoming releases. please "
2367"use . instead if you meant to match all paths"
2368msgstr ""
Ray Chen29004bb2016-12-28 17:08:45 +08002369"在下一个版本中,使用空字符串作为路径规格将被视作非法。如果要匹配所有路径,\n"
Jiang Xina0b6b242016-10-27 21:53:37 +08002370"请代之以 ."
2371
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002372#: pathspec.c:535
Jiang Xin90314792013-09-17 23:37:05 +08002373#, c-format
2374msgid "pathspec '%s' is beyond a symbolic link"
Jiang Xin160fb2b2015-08-02 21:47:30 +08002375msgstr "路径规格 '%s' 位于符号链接中"
Jiang Xin90314792013-09-17 23:37:05 +08002376
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002377#: pathspec.c:544
Jiang Xincfff71a2014-01-18 11:04:21 +08002378msgid ""
2379"There is nothing to exclude from by :(exclude) patterns.\n"
2380"Perhaps you forgot to add either ':/' or '.' ?"
2381msgstr ""
2382"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
2383"添加 ':/' 或 '.' ?"
2384
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002385#: pretty.c:982
Jiang Xin220c3132014-10-08 10:55:14 +08002386msgid "unable to parse --pretty format"
2387msgstr "不能解析 --pretty 格式"
2388
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002389#: read-cache.c:1307
Jiang Xin6c94aba2014-03-13 12:41:34 +08002390#, c-format
2391msgid ""
2392"index.version set, but the value is invalid.\n"
2393"Using version %i"
2394msgstr ""
2395"设置了 index.version,但是取值无效。\n"
2396"使用版本 %i"
2397
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002398#: read-cache.c:1317
Jiang Xin6c94aba2014-03-13 12:41:34 +08002399#, c-format
2400msgid ""
2401"GIT_INDEX_VERSION set, but the value is invalid.\n"
2402"Using version %i"
2403msgstr ""
2404"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
2405"使用版本 %i"
2406
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002407#: refs.c:576 builtin/merge.c:844
Jiang Xin1b7f4a32015-08-23 15:23:21 +08002408#, c-format
2409msgid "Could not open '%s' for writing"
2410msgstr "无法打开 '%s' 进行写入"
2411
Jiang Xina0b6b242016-10-27 21:53:37 +08002412#: refs/files-backend.c:2481
Jiang Xin1b7f4a32015-08-23 15:23:21 +08002413#, c-format
2414msgid "could not delete reference %s: %s"
2415msgstr "无法删除引用 %s:%s"
2416
Jiang Xina0b6b242016-10-27 21:53:37 +08002417#: refs/files-backend.c:2484
Jiang Xin1b7f4a32015-08-23 15:23:21 +08002418#, c-format
2419msgid "could not delete references: %s"
2420msgstr "无法删除引用:%s"
2421
Jiang Xina0b6b242016-10-27 21:53:37 +08002422#: refs/files-backend.c:2493
Jiang Xin1b7f4a32015-08-23 15:23:21 +08002423#, c-format
2424msgid "could not remove reference %s"
2425msgstr "无法删除引用 %s"
2426
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002427#: ref-filter.c:56
Jiang Xin94550ed2015-11-16 07:02:11 +08002428#, c-format
2429msgid "expected format: %%(color:<color>)"
2430msgstr "期望的格式:%%(color:<color>)"
2431
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002432#: ref-filter.c:58
Jiang Xin276ceea2016-02-28 20:35:55 +08002433#, c-format
2434msgid "unrecognized color: %%(color:%s)"
2435msgstr "未能识别的颜色:%%(color:%s)"
Jiang Xin1b7f4a32015-08-23 15:23:21 +08002436
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002437#: ref-filter.c:72
Jiang Xin276ceea2016-02-28 20:35:55 +08002438#, c-format
2439msgid "unrecognized format: %%(%s)"
2440msgstr "未能识别的格式:%%(%s)"
2441
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002442#: ref-filter.c:78
Jiang Xin34956282016-03-12 22:09:24 +08002443#, c-format
2444msgid "%%(body) does not take arguments"
2445msgstr "%%(body) 不带参数"
2446
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002447#: ref-filter.c:85
Jiang Xin34956282016-03-12 22:09:24 +08002448#, c-format
2449msgid "%%(subject) does not take arguments"
2450msgstr "%%(subject) 不带参数"
2451
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002452#: ref-filter.c:92
2453#, c-format
2454msgid "%%(trailers) does not take arguments"
2455msgstr "%%(trailers) 不带参数"
2456
2457#: ref-filter.c:111
Jiang Xin276ceea2016-02-28 20:35:55 +08002458#, c-format
2459msgid "positive value expected contents:lines=%s"
2460msgstr "要为 contents:lines=%s 提供一个正数"
2461
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002462#: ref-filter.c:113
Jiang Xin276ceea2016-02-28 20:35:55 +08002463#, c-format
2464msgid "unrecognized %%(contents) argument: %s"
2465msgstr "未能识别的 %%(contents) 参数:%s"
2466
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002467#: ref-filter.c:123
Jiang Xin276ceea2016-02-28 20:35:55 +08002468#, c-format
2469msgid "unrecognized %%(objectname) argument: %s"
2470msgstr "未能识别的 %%(objectname) 参数:%s"
2471
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002472#: ref-filter.c:145
Jiang Xin94550ed2015-11-16 07:02:11 +08002473#, c-format
2474msgid "expected format: %%(align:<width>,<position>)"
2475msgstr "期望的格式:%%(align:<width>,<position>)"
2476
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002477#: ref-filter.c:157
Jiang Xin94550ed2015-11-16 07:02:11 +08002478#, c-format
Jiang Xin276ceea2016-02-28 20:35:55 +08002479msgid "unrecognized position:%s"
2480msgstr "未能识别的位置:%s"
Jiang Xin94550ed2015-11-16 07:02:11 +08002481
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002482#: ref-filter.c:161
Jiang Xin276ceea2016-02-28 20:35:55 +08002483#, c-format
2484msgid "unrecognized width:%s"
2485msgstr "未能识别的宽度:%s"
2486
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002487#: ref-filter.c:167
Jiang Xin276ceea2016-02-28 20:35:55 +08002488#, c-format
2489msgid "unrecognized %%(align) argument: %s"
2490msgstr "未能识别的 %%(align) 参数:%s"
2491
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002492#: ref-filter.c:171
Jiang Xin94550ed2015-11-16 07:02:11 +08002493#, c-format
2494msgid "positive width expected with the %%(align) atom"
2495msgstr "元素 %%(align) 需要一个正数的宽度"
2496
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002497#: ref-filter.c:255
Jiang Xin34956282016-03-12 22:09:24 +08002498#, c-format
2499msgid "malformed field name: %.*s"
2500msgstr "非法的字段名:%.*s"
2501
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002502#: ref-filter.c:281
Jiang Xin34956282016-03-12 22:09:24 +08002503#, c-format
2504msgid "unknown field name: %.*s"
2505msgstr "未知的字段名:%.*s"
2506
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002507#: ref-filter.c:383
Jiang Xin276ceea2016-02-28 20:35:55 +08002508#, c-format
2509msgid "format: %%(end) atom used without corresponding atom"
2510msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
2511
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002512#: ref-filter.c:435
Jiang Xin34956282016-03-12 22:09:24 +08002513#, c-format
2514msgid "malformed format string %s"
2515msgstr "非法的格式化字符串 %s"
2516
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002517#: ref-filter.c:898
Jiang Xin34956282016-03-12 22:09:24 +08002518msgid ":strip= requires a positive integer argument"
2519msgstr ":strip= 需要一个正整型参数"
2520
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002521#: ref-filter.c:903
Jiang Xin34956282016-03-12 22:09:24 +08002522#, c-format
2523msgid "ref '%s' does not have %ld components to :strip"
Ray Chen26e4cbe2016-03-16 11:44:44 +08002524msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
Jiang Xin34956282016-03-12 22:09:24 +08002525
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002526#: ref-filter.c:1066
Jiang Xin34956282016-03-12 22:09:24 +08002527#, c-format
2528msgid "unknown %.*s format %s"
Ray Chen26e4cbe2016-03-16 11:44:44 +08002529msgstr "未知的 %.*s 格式 %s"
Jiang Xin34956282016-03-12 22:09:24 +08002530
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002531#: ref-filter.c:1086 ref-filter.c:1117
Jiang Xin34956282016-03-12 22:09:24 +08002532#, c-format
2533msgid "missing object %s for %s"
Ray Chen26e4cbe2016-03-16 11:44:44 +08002534msgstr "缺失 %2$s 的对象 %1$s"
Jiang Xin34956282016-03-12 22:09:24 +08002535
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002536#: ref-filter.c:1089 ref-filter.c:1120
Jiang Xin34956282016-03-12 22:09:24 +08002537#, c-format
2538msgid "parse_object_buffer failed on %s for %s"
2539msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
2540
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002541#: ref-filter.c:1343
Jiang Xin94550ed2015-11-16 07:02:11 +08002542#, c-format
2543msgid "malformed object at '%s'"
2544msgstr "非法的对象于 '%s'"
2545
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002546#: ref-filter.c:1410
Jiang Xin34956282016-03-12 22:09:24 +08002547#, c-format
2548msgid "ignoring ref with broken name %s"
2549msgstr "忽略带有错误名称 %s 的引用"
2550
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002551#: ref-filter.c:1415
Jiang Xin34956282016-03-12 22:09:24 +08002552#, c-format
2553msgid "ignoring broken ref %s"
2554msgstr "忽略损坏的引用 %s"
2555
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002556#: ref-filter.c:1670
Jiang Xin94550ed2015-11-16 07:02:11 +08002557#, c-format
2558msgid "format: %%(end) atom missing"
2559msgstr "格式:缺少 %%(end) 元素"
2560
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002561#: ref-filter.c:1734
Jiang Xin94550ed2015-11-16 07:02:11 +08002562#, c-format
2563msgid "malformed object name %s"
2564msgstr "非法的对象名 %s"
2565
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002566#: remote.c:754
Jiang Xincfff71a2014-01-18 11:04:21 +08002567#, c-format
2568msgid "Cannot fetch both %s and %s to %s"
2569msgstr "不能同时获取 %s 和 %s 至 %s"
2570
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002571#: remote.c:758
Jiang Xincfff71a2014-01-18 11:04:21 +08002572#, c-format
2573msgid "%s usually tracks %s, not %s"
2574msgstr "%s 通常跟踪 %s,而非 %s"
2575
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002576#: remote.c:762
Jiang Xincfff71a2014-01-18 11:04:21 +08002577#, c-format
2578msgid "%s tracks both %s and %s"
2579msgstr "%s 同时跟踪 %s 和 %s"
2580
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002581#: remote.c:770
Jiang Xincfff71a2014-01-18 11:04:21 +08002582msgid "Internal error"
2583msgstr "内部错误"
2584
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002585#: remote.c:1685 remote.c:1787
Jiang Xin7aea43f2015-05-31 08:42:31 +08002586msgid "HEAD does not point to a branch"
2587msgstr "HEAD 没有指向一个分支"
2588
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002589#: remote.c:1694
Jiang Xin7aea43f2015-05-31 08:42:31 +08002590#, c-format
2591msgid "no such branch: '%s'"
2592msgstr "没有此分支:'%s'"
2593
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002594#: remote.c:1697
Jiang Xin7aea43f2015-05-31 08:42:31 +08002595#, c-format
2596msgid "no upstream configured for branch '%s'"
2597msgstr "尚未给分支 '%s' 设置上游"
2598
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002599#: remote.c:1703
Jiang Xin7aea43f2015-05-31 08:42:31 +08002600#, c-format
2601msgid "upstream branch '%s' not stored as a remote-tracking branch"
2602msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
2603
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002604#: remote.c:1718
Jiang Xin7aea43f2015-05-31 08:42:31 +08002605#, c-format
2606msgid "push destination '%s' on remote '%s' has no local tracking branch"
2607msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
2608
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002609#: remote.c:1730
Jiang Xin7aea43f2015-05-31 08:42:31 +08002610#, c-format
2611msgid "branch '%s' has no remote for pushing"
2612msgstr "分支 '%s' 没有设置要推送的远程服务器"
2613
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002614#: remote.c:1741
Jiang Xin7aea43f2015-05-31 08:42:31 +08002615#, c-format
2616msgid "push refspecs for '%s' do not include '%s'"
Jiang Xin160fb2b2015-08-02 21:47:30 +08002617msgstr "向 '%s' 推送引用规格未包含 '%s'"
Jiang Xin7aea43f2015-05-31 08:42:31 +08002618
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002619#: remote.c:1754
Jiang Xin7aea43f2015-05-31 08:42:31 +08002620msgid "push has no destination (push.default is 'nothing')"
2621msgstr "推送无目标(push.default 是 'nothing')"
2622
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002623#: remote.c:1776
Jiang Xin7aea43f2015-05-31 08:42:31 +08002624msgid "cannot resolve 'simple' push to a single destination"
2625msgstr "无法解析 'simple' 推送至一个单独的目标"
2626
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002627#: remote.c:2081
Jiang Xin90314792013-09-17 23:37:05 +08002628#, c-format
2629msgid "Your branch is based on '%s', but the upstream is gone.\n"
2630msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
2631
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002632#: remote.c:2085
Jiang Xin90314792013-09-17 23:37:05 +08002633msgid " (use \"git branch --unset-upstream\" to fixup)\n"
2634msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
2635
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002636#: remote.c:2088
Jiang Xin90314792013-09-17 23:37:05 +08002637#, c-format
2638msgid "Your branch is up-to-date with '%s'.\n"
2639msgstr "您的分支与上游分支 '%s' 一致。\n"
2640
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002641#: remote.c:2092
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002642#, c-format
2643msgid "Your branch is ahead of '%s' by %d commit.\n"
2644msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
2645msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
Jiang Xin5ae481e2012-05-31 17:35:59 +08002646msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002647
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002648#: remote.c:2098
Wang Sheng07432ce2013-01-30 17:23:08 +08002649msgid " (use \"git push\" to publish your local commits)\n"
2650msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
2651
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002652#: remote.c:2101
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002653#, c-format
2654msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
2655msgid_plural ""
2656"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
Jiang Xin90e6ef52012-03-27 14:46:11 +08002657msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
Jiang Xin5ae481e2012-05-31 17:35:59 +08002658msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002659
Wang Sheng07432ce2013-01-30 17:23:08 +08002660# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002661#: remote.c:2109
Wang Sheng07432ce2013-01-30 17:23:08 +08002662msgid " (use \"git pull\" to update your local branch)\n"
2663msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
2664
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002665#: remote.c:2112
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002666#, c-format
2667msgid ""
2668"Your branch and '%s' have diverged,\n"
2669"and have %d and %d different commit each, respectively.\n"
2670msgid_plural ""
2671"Your branch and '%s' have diverged,\n"
2672"and have %d and %d different commits each, respectively.\n"
2673msgstr[0] ""
2674"您的分支和 '%s' 出现了偏离,\n"
Thynson195febd2012-08-07 17:39:30 +08002675"并且分别有 %d 和 %d 处不同的提交。\n"
Jiang Xin5ae481e2012-05-31 17:35:59 +08002676msgstr[1] ""
2677"您的分支和 '%s' 出现了偏离,\n"
Thynson195febd2012-08-07 17:39:30 +08002678"并且分别有 %d 和 %d 处不同的提交。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002679
Wang Sheng07432ce2013-01-30 17:23:08 +08002680# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002681#: remote.c:2122
Wang Sheng07432ce2013-01-30 17:23:08 +08002682msgid " (use \"git pull\" to merge the remote branch into yours)\n"
2683msgstr " (使用 \"git pull\" 来合并远程分支)\n"
2684
Jiang Xina0b6b242016-10-27 21:53:37 +08002685#: revision.c:2158
Jiang Xin1b7f4a32015-08-23 15:23:21 +08002686msgid "your current branch appears to be broken"
2687msgstr "您的当前分支好像被损坏"
2688
Jiang Xina0b6b242016-10-27 21:53:37 +08002689#: revision.c:2161
Jiang Xin1b7f4a32015-08-23 15:23:21 +08002690#, c-format
2691msgid "your current branch '%s' does not have any commits yet"
2692msgstr "您的当前分支 '%s' 尚无任何提交"
2693
Jiang Xina0b6b242016-10-27 21:53:37 +08002694#: revision.c:2355
Jiang Xin814ff312015-02-16 21:34:19 +08002695msgid "--first-parent is incompatible with --bisect"
2696msgstr "--first-parent 与 --bisect 不兼容"
2697
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002698#: run-command.c:125
Jiang Xin2e8451e2013-07-26 14:00:02 +08002699msgid "open /dev/null failed"
2700msgstr "不能打开 /dev/null"
2701
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002702#: run-command.c:127
Jiang Xin2e8451e2013-07-26 14:00:02 +08002703#, c-format
2704msgid "dup2(%d,%d) failed"
2705msgstr "不能调用 dup2(%d,%d)"
2706
Jiang Xina0b6b242016-10-27 21:53:37 +08002707#: send-pack.c:297
Jiang Xin220c3132014-10-08 10:55:14 +08002708msgid "failed to sign the push certificate"
2709msgstr "无法为推送证书签名"
2710
Jiang Xina0b6b242016-10-27 21:53:37 +08002711#: send-pack.c:410
Jiang Xin220c3132014-10-08 10:55:14 +08002712msgid "the receiving end does not support --signed push"
2713msgstr "接收端不支持签名推送"
2714
Jiang Xina0b6b242016-10-27 21:53:37 +08002715#: send-pack.c:412
Jiang Xin1b7f4a32015-08-23 15:23:21 +08002716msgid ""
2717"not sending a push certificate since the receiving end does not support --"
2718"signed push"
2719msgstr "未发送推送证书,因为接收端不支持签名推送"
2720
Jiang Xina0b6b242016-10-27 21:53:37 +08002721#: send-pack.c:424
Jiang Xin44f518e2015-04-03 08:39:57 +08002722msgid "the receiving end does not support --atomic push"
2723msgstr "接收端不支持原子推送"
Jiang Xin814ff312015-02-16 21:34:19 +08002724
Jiang Xina0b6b242016-10-27 21:53:37 +08002725#: send-pack.c:429
Jiang Xin5c57d762016-08-28 10:18:12 +08002726msgid "the receiving end does not support push options"
2727msgstr "接收端不支持推送选项"
2728
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002729#: sequencer.c:215
Jiang Xina0b6b242016-10-27 21:53:37 +08002730msgid "revert"
2731msgstr "还原"
2732
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002733#: sequencer.c:217
Jiang Xina0b6b242016-10-27 21:53:37 +08002734msgid "cherry-pick"
2735msgstr "拣选"
2736
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002737#: sequencer.c:219
2738msgid "rebase -i"
2739msgstr "rebase -i"
2740
2741#: sequencer.c:221
2742#, c-format
2743msgid "Unknown action: %d"
2744msgstr "未知动作:%d"
2745
2746#: sequencer.c:278
Jiang Xin14c8bce2012-03-08 12:06:53 +08002747msgid ""
2748"after resolving the conflicts, mark the corrected paths\n"
2749"with 'git add <paths>' or 'git rm <paths>'"
2750msgstr ""
Jiang Xind9d56b22015-01-18 20:37:57 +08002751"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
Jiang Xin14c8bce2012-03-08 12:06:53 +08002752"命令标记修正后的文件"
2753
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002754#: sequencer.c:281
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002755msgid ""
2756"after resolving the conflicts, mark the corrected paths\n"
2757"with 'git add <paths>' or 'git rm <paths>'\n"
2758"and commit the result with 'git commit'"
2759msgstr ""
Jiang Xind9d56b22015-01-18 20:37:57 +08002760"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002761"对修正后的文件做标记,然后用 'git commit' 提交"
2762
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002763#: sequencer.c:294 sequencer.c:1667
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002764#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +08002765msgid "could not lock '%s'"
2766msgstr "不能锁定 '%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002767
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002768#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002769#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +08002770msgid "could not write to '%s'"
2771msgstr "不能写入 '%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002772
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002773#: sequencer.c:301
Jiang Xina0b6b242016-10-27 21:53:37 +08002774#, c-format
Jiang Xin72351d72016-11-20 20:26:17 +08002775msgid "could not write eol to '%s'"
Jiang Xina0b6b242016-10-27 21:53:37 +08002776msgstr "不能将换行符写入 '%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002777
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002778#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674
Jiang Xina0b6b242016-10-27 21:53:37 +08002779#, c-format
2780msgid "failed to finalize '%s'."
2781msgstr "无法完成 '%s'。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002782
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002783#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259
2784#: builtin/commit.c:749 builtin/merge.c:1036
Jiang Xina0b6b242016-10-27 21:53:37 +08002785#, c-format
2786msgid "could not read '%s'"
2787msgstr "不能读取 '%s'"
2788
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002789#: sequencer.c:355
Jiang Xina0b6b242016-10-27 21:53:37 +08002790#, c-format
2791msgid "your local changes would be overwritten by %s."
2792msgstr "您的本地修改将被%s覆盖。"
2793
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002794#: sequencer.c:359
Jiang Xina0b6b242016-10-27 21:53:37 +08002795msgid "commit your changes or stash them to proceed."
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002796msgstr "提交您的修改或保存进度后再继续。"
2797
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002798#: sequencer.c:388
Jiang Xin5c57d762016-08-28 10:18:12 +08002799#, c-format
2800msgid "%s: fast-forward"
2801msgstr "%s:快进"
2802
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002803#. TRANSLATORS: %s will be "revert", "cherry-pick" or
2804#. * "rebase -i".
2805#.
2806#: sequencer.c:470
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002807#, c-format
2808msgid "%s: Unable to write new index file"
Jiang Xin90e6ef52012-03-27 14:46:11 +08002809msgstr "%s:无法写入新索引文件"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002810
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002811#: sequencer.c:489
Jiang Xina0b6b242016-10-27 21:53:37 +08002812msgid "could not resolve HEAD commit\n"
Jiang Xin81809b92012-05-30 12:19:47 +08002813msgstr "不能解析 HEAD 提交\n"
Jiang Xin8ada9592012-05-21 09:35:47 +08002814
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002815#: sequencer.c:509
Jiang Xina0b6b242016-10-27 21:53:37 +08002816msgid "unable to update cache tree\n"
Ray Chen29004bb2016-12-28 17:08:45 +08002817msgstr "不能更新缓存树\n"
Jiang Xin8ada9592012-05-21 09:35:47 +08002818
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002819#: sequencer.c:592
Jiang Xin81809b92012-05-30 12:19:47 +08002820#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +08002821msgid ""
2822"you have staged changes in your working tree\n"
2823"If these changes are meant to be squashed into the previous commit, run:\n"
2824"\n"
2825" git commit --amend %s\n"
2826"\n"
2827"If they are meant to go into a new commit, run:\n"
2828"\n"
2829" git commit %s\n"
2830"\n"
2831"In both cases, once you're done, continue with:\n"
2832"\n"
2833" git rebase --continue\n"
2834msgstr ""
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002835"您的工作区中存在已暂存的修改\n"
2836"如果这些修改需要被并入前一个提交,执行:\n"
Jiang Xina0b6b242016-10-27 21:53:37 +08002837"\n"
2838" git commit --amend %s\n"
2839"\n"
Ray Chen29004bb2016-12-28 17:08:45 +08002840"如果这些修改要形成一个新提交,执行:\n"
Jiang Xina0b6b242016-10-27 21:53:37 +08002841"\n"
2842" git commit %s\n"
2843"\n"
2844"无论哪种情况,当您完成提交,继续执行:\n"
2845"\n"
2846" git rebase --continue\n"
2847
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002848#: sequencer.c:688
Jiang Xina0b6b242016-10-27 21:53:37 +08002849#, c-format
2850msgid "could not parse commit %s\n"
Jiang Xin81809b92012-05-30 12:19:47 +08002851msgstr "不能解析提交 %s\n"
Jiang Xin8ada9592012-05-21 09:35:47 +08002852
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002853#: sequencer.c:693
Jiang Xin81809b92012-05-30 12:19:47 +08002854#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +08002855msgid "could not parse parent commit %s\n"
Jiang Xin81809b92012-05-30 12:19:47 +08002856msgstr "不能解析父提交 %s\n"
Jiang Xin8ada9592012-05-21 09:35:47 +08002857
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002858#: sequencer.c:815
2859#, c-format
2860msgid ""
2861"unexpected 1st line of squash message:\n"
2862"\n"
2863"\t%.*s"
2864msgstr ""
2865"意外的压缩提交首行提交信息:\n"
2866"\n"
2867"\t%.*s"
2868
2869#: sequencer.c:821
2870#, c-format
2871msgid ""
2872"invalid 1st line of squash message:\n"
2873"\n"
2874"\t%.*s"
2875msgstr ""
2876"压缩提交的首行提交信息无效:\n"
2877"\n"
2878"\t%.*s"
2879
2880#: sequencer.c:827 sequencer.c:852
2881#, c-format
2882msgid "This is a combination of %d commits."
2883msgstr "这是一个 %d 个提交的组合。"
2884
2885#: sequencer.c:836
2886msgid "need a HEAD to fixup"
2887msgstr "需要一个 HEAD 来修复"
2888
2889#: sequencer.c:838
2890msgid "could not read HEAD"
2891msgstr "不能读取 HEAD"
2892
2893#: sequencer.c:840
2894msgid "could not read HEAD's commit message"
2895msgstr "不能读取 HEAD 的提交说明"
2896
2897#: sequencer.c:846
2898#, c-format
2899msgid "cannot write '%s'"
2900msgstr "不能写 '%s'"
2901
2902#: sequencer.c:855 git-rebase--interactive.sh:445
2903msgid "This is the 1st commit message:"
2904msgstr "这是第一个提交说明:"
2905
2906#: sequencer.c:863
2907#, c-format
2908msgid "could not read commit message of %s"
2909msgstr "不能读取 %s 的提交说明"
2910
2911#: sequencer.c:870
2912#, c-format
2913msgid "This is the commit message #%d:"
2914msgstr "这是提交说明 #%d:"
2915
2916#: sequencer.c:875
2917#, c-format
2918msgid "The commit message #%d will be skipped:"
2919msgstr "提交说明 #%d 将被跳过:"
2920
2921#: sequencer.c:880
2922#, c-format
2923msgid "unknown command: %d"
2924msgstr "未知命令:%d"
2925
2926#: sequencer.c:946
Jiang Xina0b6b242016-10-27 21:53:37 +08002927msgid "your index file is unmerged."
Jiang Xin90e6ef52012-03-27 14:46:11 +08002928msgstr "您的索引文件未完成合并。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002929
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002930#: sequencer.c:964
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002931#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +08002932msgid "commit %s is a merge but no -m option was given."
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002933msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
2934
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002935#: sequencer.c:972
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002936#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +08002937msgid "commit %s does not have parent %d"
2938msgstr "提交 %s 没有第 %d 个父提交"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002939
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002940#: sequencer.c:976
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002941#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +08002942msgid "mainline was specified but commit %s is not a merge."
2943msgstr "指定了主线,但是提交 %s 不是一个合并提交。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002944
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002945#: sequencer.c:982
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002946#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +08002947msgid "cannot get commit message for %s"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002948msgstr "不能得到 %s 的提交说明"
2949
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002950#. TRANSLATORS: The first %s will be a "todo" command like
2951#. "revert" or "pick", the second %s a SHA1.
2952#: sequencer.c:1001
2953#, c-format
2954msgid "%s: cannot parse parent commit %s"
2955msgstr "%s:不能解析父提交 %s"
2956
2957#: sequencer.c:1063 sequencer.c:1812
2958#, c-format
2959msgid "could not rename '%s' to '%s'"
2960msgstr "不能将 '%s' 重命名为 '%s'"
2961
2962#: sequencer.c:1114
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002963#, c-format
2964msgid "could not revert %s... %s"
2965msgstr "不能还原 %s... %s"
2966
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002967#: sequencer.c:1115
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002968#, c-format
2969msgid "could not apply %s... %s"
2970msgstr "不能应用 %s... %s"
2971
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002972#: sequencer.c:1157
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002973msgid "empty commit set passed"
2974msgstr "提供了空的提交集"
2975
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002976#: sequencer.c:1167
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002977#, c-format
2978msgid "git %s: failed to read the index"
Jiang Xin90e6ef52012-03-27 14:46:11 +08002979msgstr "git %s:无法读取索引"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002980
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002981#: sequencer.c:1174
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002982#, c-format
2983msgid "git %s: failed to refresh the index"
Jiang Xin90e6ef52012-03-27 14:46:11 +08002984msgstr "git %s:无法刷新索引"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002985
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002986#: sequencer.c:1294
Jiang Xina0b6b242016-10-27 21:53:37 +08002987#, c-format
2988msgid "invalid line %d: %.*s"
2989msgstr "无效行 %d:%.*s"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08002990
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002991#: sequencer.c:1302
2992#, c-format
2993msgid "cannot '%s' without a previous commit"
2994msgstr "没有父提交的情况下不能 '%s'"
Jiang Xin5c57d762016-08-28 10:18:12 +08002995
Jiang Xin1a79b2f2017-01-27 22:50:57 +08002996#: sequencer.c:1334
Jiang Xina0b6b242016-10-27 21:53:37 +08002997#, c-format
2998msgid "could not read '%s'."
2999msgstr "不能读取 '%s'。"
3000
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003001#: sequencer.c:1341
3002msgid "please fix this using 'git rebase --edit-todo'."
3003msgstr "请用 'git rebase --edit-todo' 来修改。"
3004
3005#: sequencer.c:1343
Jiang Xina0b6b242016-10-27 21:53:37 +08003006#, c-format
3007msgid "unusable instruction sheet: '%s'"
Ray Chen29004bb2016-12-28 17:08:45 +08003008msgstr "不可用的指令清单:'%s'"
Jiang Xina0b6b242016-10-27 21:53:37 +08003009
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003010#: sequencer.c:1348
3011msgid "no commits parsed."
3012msgstr "没有解析提交。"
3013
3014#: sequencer.c:1359
Jiang Xina0b6b242016-10-27 21:53:37 +08003015msgid "cannot cherry-pick during a revert."
Jiang Xin5c57d762016-08-28 10:18:12 +08003016msgstr "不能在回退中执行拣选。"
3017
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003018#: sequencer.c:1361
Jiang Xina0b6b242016-10-27 21:53:37 +08003019msgid "cannot revert during a cherry-pick."
3020msgstr "不能在拣选中执行回退。"
Jiang Xin5c57d762016-08-28 10:18:12 +08003021
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003022#: sequencer.c:1424
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003023#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +08003024msgid "invalid key: %s"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003025msgstr "无效键名:%s"
3026
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003027#: sequencer.c:1427
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003028#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +08003029msgid "invalid value for %s: %s"
Jiang Xin81809b92012-05-30 12:19:47 +08003030msgstr "%s 的值无效:%s"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003031
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003032#: sequencer.c:1484
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003033#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +08003034msgid "malformed options sheet: '%s'"
3035msgstr "非法的选项清单:'%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003036
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003037#: sequencer.c:1522
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003038msgid "a cherry-pick or revert is already in progress"
3039msgstr "一个拣选或还原操作已在进行"
3040
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003041#: sequencer.c:1523
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003042msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
3043msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
3044
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003045#: sequencer.c:1526
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003046#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +08003047msgid "could not create sequencer directory '%s'"
3048msgstr "不能创建序列目录 '%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003049
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003050#: sequencer.c:1540
Jiang Xina0b6b242016-10-27 21:53:37 +08003051msgid "could not lock HEAD"
3052msgstr "不能锁定 HEAD"
3053
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003054#: sequencer.c:1596 sequencer.c:2150
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003055msgid "no cherry-pick or revert in progress"
Thynson195febd2012-08-07 17:39:30 +08003056msgstr "拣选或还原操作并未进行"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003057
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003058#: sequencer.c:1598
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003059msgid "cannot resolve HEAD"
3060msgstr "不能解析 HEAD"
3061
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003062#: sequencer.c:1600 sequencer.c:1634
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003063msgid "cannot abort from a branch yet to be born"
Jiang Xin90e6ef52012-03-27 14:46:11 +08003064msgstr "不能从尚未建立的分支终止"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003065
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003066#: sequencer.c:1620 builtin/grep.c:904
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003067#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +08003068msgid "cannot open '%s'"
3069msgstr "不能打开 '%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003070
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003071#: sequencer.c:1622
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003072#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +08003073msgid "cannot read '%s': %s"
3074msgstr "不能读取 '%s':%s"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003075
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003076#: sequencer.c:1623
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003077msgid "unexpected end of file"
Thynson9aafc932012-08-07 17:25:21 +08003078msgstr "意外的文件结束"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003079
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003080#: sequencer.c:1629
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003081#, c-format
3082msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
Jiang Xin90e6ef52012-03-27 14:46:11 +08003083msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003084
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003085#: sequencer.c:1640
3086msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
3087msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
3088
3089#: sequencer.c:1777 sequencer.c:2049
3090msgid "cannot read HEAD"
3091msgstr "不能读取 HEAD"
3092
3093#: sequencer.c:1817 builtin/difftool.c:574
3094#, c-format
3095msgid "could not copy '%s' to '%s'"
3096msgstr "不能拷贝 '%s' 至 '%s'"
3097
3098#: sequencer.c:1833
3099msgid "could not read index"
3100msgstr "不能读取索引"
3101
3102# 译者:注意保持前导空格
3103#: sequencer.c:1838
3104#, c-format
3105msgid ""
3106"execution failed: %s\n"
3107"%sYou can fix the problem, and then run\n"
3108"\n"
3109" git rebase --continue\n"
3110"\n"
3111msgstr ""
3112"执行失败:%s\n"
3113"%s您可以改正该问题,然后运行\n"
3114"\n"
3115" git rebase --continue\n"
3116"\n"
3117
3118#: sequencer.c:1844
3119msgid "and made changes to the index and/or the working tree\n"
3120msgstr "并且修改索引和/或工作区\n"
3121
3122#: sequencer.c:1850
3123#, c-format
3124msgid ""
3125"execution succeeded: %s\n"
3126"but left changes to the index and/or the working tree\n"
3127"Commit or stash your changes, and then run\n"
3128"\n"
3129" git rebase --continue\n"
3130"\n"
3131msgstr ""
3132"执行成功:%s\n"
3133"但是在索引和/或工作区中存在变更\n"
3134"提交或暂存修改,然后运行\n"
3135"\n"
3136" git rebase --continue\n"
3137"\n"
3138
3139#: sequencer.c:1905 git-rebase.sh:168
3140#, c-format
3141msgid "Applied autostash."
3142msgstr "成功应用 autostash。"
3143
3144#: sequencer.c:1917
3145#, c-format
3146msgid "cannot store %s"
3147msgstr "不能存储 %s"
3148
3149#: sequencer.c:1919 git-rebase.sh:172
3150#, c-format
3151msgid ""
3152"Applying autostash resulted in conflicts.\n"
3153"Your changes are safe in the stash.\n"
3154"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
3155msgstr ""
3156"应用 autostash 导致冲突。\n"
3157"您的修改安全地保存在 stash 中。\n"
3158"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
3159
3160#: sequencer.c:2000
3161#, c-format
3162msgid "stopped at %s... %.*s"
3163msgstr "停止在 %s... %.*s"
3164
3165#: sequencer.c:2027
3166#, c-format
3167msgid "unknown command %d"
3168msgstr "未知命令 %d"
3169
3170#: sequencer.c:2057
3171msgid "could not read orig-head"
3172msgstr "不能读取 orig-head"
3173
3174#: sequencer.c:2061
3175msgid "could not read 'onto'"
3176msgstr "不能读取 'onto'"
3177
3178#: sequencer.c:2068
3179#, c-format
3180msgid "could not update %s"
3181msgstr "不能更新 %s"
3182
3183#: sequencer.c:2075
3184#, c-format
3185msgid "could not update HEAD to %s"
3186msgstr "不能更新 HEAD 为 %s"
3187
3188#: sequencer.c:2159
3189msgid "cannot rebase: You have unstaged changes."
3190msgstr "不能变基:您有未暂存的变更。"
3191
3192#: sequencer.c:2164
3193msgid "could not remove CHERRY_PICK_HEAD"
3194msgstr "不能删除 CHERRY_PICK_HEAD"
3195
3196#: sequencer.c:2173
3197msgid "cannot amend non-existing commit"
3198msgstr "不能修补不存在的提交"
3199
3200#: sequencer.c:2175
3201#, c-format
3202msgid "invalid file: '%s'"
3203msgstr "无效文件:'%s'"
3204
3205#: sequencer.c:2177
3206#, c-format
3207msgid "invalid contents: '%s'"
3208msgstr "无效内容:'%s'"
3209
3210#: sequencer.c:2180
3211msgid ""
3212"\n"
3213"You have uncommitted changes in your working tree. Please, commit them\n"
3214"first and then run 'git rebase --continue' again."
3215msgstr "\n您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
3216
3217#: sequencer.c:2190
3218msgid "could not commit staged changes."
3219msgstr "不能提交暂存的修改。"
3220
3221#: sequencer.c:2270
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08003222#, c-format
3223msgid "%s: can't cherry-pick a %s"
3224msgstr "%s:不能拣选一个%s"
3225
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003226#: sequencer.c:2274
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08003227#, c-format
3228msgid "%s: bad revision"
3229msgstr "%s:错误的版本"
3230
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003231#: sequencer.c:2307
Jiang Xina0b6b242016-10-27 21:53:37 +08003232msgid "can't revert as initial commit"
3233msgstr "不能作为初始提交回退"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003234
Jiang Xin5c57d762016-08-28 10:18:12 +08003235#: setup.c:160
3236#, c-format
3237msgid ""
3238"%s: no such path in the working tree.\n"
3239"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
3240msgstr ""
3241"%s:工作区中无此路径。\n"
3242"使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003243
Jiang Xin5c57d762016-08-28 10:18:12 +08003244#: setup.c:173
3245#, c-format
3246msgid ""
3247"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
3248"Use '--' to separate paths from revisions, like this:\n"
3249"'git <command> [<revision>...] -- [<file>...]'"
3250msgstr ""
Ray Chen9a4b6942016-09-07 18:03:04 +08003251"有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
Jiang Xin5c57d762016-08-28 10:18:12 +08003252"使用 '--' 来分隔版本和路径,例如:\n"
3253"'git <command> [<revision>...] -- [<file>...]'"
3254
3255#: setup.c:223
3256#, c-format
3257msgid ""
3258"ambiguous argument '%s': both revision and filename\n"
3259"Use '--' to separate paths from revisions, like this:\n"
3260"'git <command> [<revision>...] -- [<file>...]'"
3261msgstr ""
Ray Chen9a4b6942016-09-07 18:03:04 +08003262"有歧义的参数 '%s':可同时是版本和文件\n"
Jiang Xin5c57d762016-08-28 10:18:12 +08003263"使用 '--' 来分隔版本和路径,例如:\n"
3264"'git <command> [<revision>...] -- [<file>...]'"
3265
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003266#: setup.c:470
Jiang Xin5b04ee32016-05-29 20:40:35 +08003267#, c-format
3268msgid "Expected git repo version <= %d, found %d"
3269msgstr "期望 git 仓库版本 <= %d,却得到 %d"
3270
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003271#: setup.c:478
Jiang Xin5b04ee32016-05-29 20:40:35 +08003272msgid "unknown repository extensions found:"
3273msgstr "发现未知的仓库扩展:"
3274
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003275#: setup.c:768
Jiang Xin5c57d762016-08-28 10:18:12 +08003276#, c-format
3277msgid "Not a git repository (or any of the parent directories): %s"
3278msgstr "不是一个 git 仓库(或者任何父目录):%s"
3279
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003280#: setup.c:770 setup.c:922 builtin/index-pack.c:1643
Jiang Xin5c57d762016-08-28 10:18:12 +08003281msgid "Cannot come back to cwd"
3282msgstr "无法返回当前工作目录"
3283
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003284#: setup.c:852
Jiang Xin5c57d762016-08-28 10:18:12 +08003285msgid "Unable to read current working directory"
3286msgstr "不能读取当前工作目录"
3287
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003288#: setup.c:927
Jiang Xin5c57d762016-08-28 10:18:12 +08003289#, c-format
3290msgid ""
3291"Not a git repository (or any parent up to mount point %s)\n"
3292"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
3293msgstr ""
Ray Chen9a4b6942016-09-07 18:03:04 +08003294"不是一个 git 仓库(或者向上递归至挂载点 %s 的任何祖先目录)\n"
Jiang Xin5c57d762016-08-28 10:18:12 +08003295"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
3296
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003297#: setup.c:934
Jiang Xin5c57d762016-08-28 10:18:12 +08003298#, c-format
3299msgid "Cannot change to '%s/..'"
3300msgstr "不能切换到 '%s/..'"
3301
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003302#: setup.c:996
Jiang Xin5c57d762016-08-28 10:18:12 +08003303#, c-format
3304msgid ""
3305"Problem with core.sharedRepository filemode value (0%.3o).\n"
3306"The owner of files must always have read and write permissions."
3307msgstr ""
Ray Chen9a4b6942016-09-07 18:03:04 +08003308"参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n"
Jiang Xin5c57d762016-08-28 10:18:12 +08003309"文件属主必须始终拥有读写权限。"
3310
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003311#: sha1_file.c:490
Jiang Xina0b6b242016-10-27 21:53:37 +08003312#, c-format
3313msgid "path '%s' does not exist"
3314msgstr "路径 '%s' 不存在"
3315
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003316#: sha1_file.c:516
Jiang Xina0b6b242016-10-27 21:53:37 +08003317#, c-format
3318msgid "reference repository '%s' as a linked checkout is not supported yet."
3319msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
3320
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003321#: sha1_file.c:522
Jiang Xina0b6b242016-10-27 21:53:37 +08003322#, c-format
3323msgid "reference repository '%s' is not a local repository."
3324msgstr "参考仓库 '%s' 不是一个本地仓库。"
3325
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003326#: sha1_file.c:528
Jiang Xina0b6b242016-10-27 21:53:37 +08003327#, c-format
3328msgid "reference repository '%s' is shallow"
3329msgstr "参考仓库 '%s' 是一个浅克隆"
3330
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003331#: sha1_file.c:536
Jiang Xina0b6b242016-10-27 21:53:37 +08003332#, c-format
3333msgid "reference repository '%s' is grafted"
3334msgstr "参考仓库 '%s' 已被嫁接"
3335
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003336#: sha1_file.c:1176
Jiang Xin34956282016-03-12 22:09:24 +08003337msgid "offset before end of packfile (broken .idx?)"
3338msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
3339
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003340#: sha1_file.c:2637
Jiang Xin34956282016-03-12 22:09:24 +08003341#, c-format
3342msgid "offset before start of pack index for %s (corrupt index?)"
3343msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
3344
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003345#: sha1_file.c:2641
Jiang Xin34956282016-03-12 22:09:24 +08003346#, c-format
3347msgid "offset beyond end of pack index for %s (truncated index?)"
Ray Chen26e4cbe2016-03-16 11:44:44 +08003348msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
Jiang Xin34956282016-03-12 22:09:24 +08003349
Jiang Xina0b6b242016-10-27 21:53:37 +08003350#: sha1_name.c:407
3351#, c-format
3352msgid "short SHA1 %s is ambiguous"
Ray Chen29004bb2016-12-28 17:08:45 +08003353msgstr "短 SHA1 %s 存在歧义"
Jiang Xina0b6b242016-10-27 21:53:37 +08003354
3355#: sha1_name.c:418
3356msgid "The candidates are:"
3357msgstr "候选者有:"
3358
Jiang Xin275588f2016-11-22 22:24:59 +08003359#: sha1_name.c:578
Jiang Xin2e8451e2013-07-26 14:00:02 +08003360msgid ""
3361"Git normally never creates a ref that ends with 40 hex characters\n"
3362"because it will be ignored when you just specify 40-hex. These refs\n"
3363"may be created by mistake. For example,\n"
3364"\n"
3365" git checkout -b $br $(git rev-parse ...)\n"
3366"\n"
3367"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
3368"examine these refs and maybe delete them. Turn this message off by\n"
Jiang Xinb1894382013-08-06 14:49:18 +08003369"running \"git config advice.objectNameWarning false\""
Jiang Xin2e8451e2013-07-26 14:00:02 +08003370msgstr ""
3371"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
3372"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
3373"\n"
3374" git checkout -b $br $(git rev-parse ...)\n"
3375"\n"
3376"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
Jiang Xinb1894382013-08-06 14:49:18 +08003377"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
Jiang Xin2e8451e2013-07-26 14:00:02 +08003378"命令关闭本消息通知。"
3379
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003380#: submodule.c:65 submodule.c:99
Jiang Xin90314792013-09-17 23:37:05 +08003381msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
3382msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
3383
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003384#: submodule.c:69 submodule.c:103
Jiang Xin90314792013-09-17 23:37:05 +08003385#, c-format
3386msgid "Could not find section in .gitmodules where path=%s"
3387msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
3388
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003389#: submodule.c:77
Jiang Xin90314792013-09-17 23:37:05 +08003390#, c-format
3391msgid "Could not update .gitmodules entry %s"
3392msgstr "不能更新 .gitmodules 条目 %s"
3393
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003394#: submodule.c:110
Jiang Xin90314792013-09-17 23:37:05 +08003395#, c-format
3396msgid "Could not remove .gitmodules entry for %s"
3397msgstr "无法移除 %s 的 .gitmodules 条目"
3398
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003399#: submodule.c:121
Jiang Xin90314792013-09-17 23:37:05 +08003400msgid "staging updated .gitmodules failed"
3401msgstr "将更新后 .gitmodules 添加暂存区失败"
3402
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003403#: submodule.c:159
Jiang Xin5b04ee32016-05-29 20:40:35 +08003404msgid "negative values not allowed for submodule.fetchJobs"
3405msgstr "submodule.fetchJobs 不允许为负值"
3406
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003407#: submodule.c:1184
3408#, c-format
3409msgid "could not start 'git status in submodule '%s'"
3410msgstr "无法在子模组 '%s' 中启动 git status"
3411
3412#: submodule.c:1197
3413#, c-format
3414msgid "could not run 'git status in submodule '%s'"
3415msgstr "无法在子模组 '%s' 中执行 git status"
3416
3417#: submodule.c:1398
3418#, c-format
3419msgid ""
3420"relocate_gitdir for submodule '%s' with more than one worktree not supported"
3421msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
3422
3423#: submodule.c:1410 submodule.c:1471
3424#, c-format
3425msgid "could not lookup name for submodule '%s'"
3426msgstr "不能查询子模组 '%s' 的名称"
3427
3428#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640
3429#: builtin/submodule--helper.c:650
3430#, c-format
3431msgid "could not create directory '%s'"
3432msgstr "不能创建目录 '%s'"
3433
3434#: submodule.c:1420
3435#, c-format
3436msgid ""
3437"Migrating git directory of '%s%s' from\n"
3438"'%s' to\n"
3439"'%s'\n"
3440msgstr ""
3441"将 '%s%s' 的 git 目录从\n"
3442"'%s' 迁移至\n"
3443"'%s'\n"
3444
3445#: submodule.c:1512
3446#, c-format
3447msgid "could not recurse into submodule '%s'"
3448msgstr "无法递归进子模组路径 '%s'"
3449
3450#: submodule-config.c:360
Jiang Xin5b04ee32016-05-29 20:40:35 +08003451#, c-format
3452msgid "invalid value for %s"
3453msgstr "%s 的值无效"
3454
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003455#: trailer.c:240
Jiang Xin34956282016-03-12 22:09:24 +08003456#, c-format
3457msgid "running trailer command '%s' failed"
3458msgstr "执行 trailer 命令 '%s' 失败"
3459
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003460#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539
3461#: trailer.c:543
Jiang Xin220c3132014-10-08 10:55:14 +08003462#, c-format
3463msgid "unknown value '%s' for key '%s'"
3464msgstr "键 '%2$s' 的未知取值 '%1$s'"
3465
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003466#: trailer.c:525 trailer.c:530 builtin/remote.c:289
Jiang Xin220c3132014-10-08 10:55:14 +08003467#, c-format
3468msgid "more than one %s"
3469msgstr "多于一个 %s"
3470
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003471#: trailer.c:702
Jiang Xin220c3132014-10-08 10:55:14 +08003472#, c-format
Jiang Xin9aeb4c22014-11-20 10:53:48 +08003473msgid "empty trailer token in trailer '%.*s'"
3474msgstr "签名 '%.*s' 的键为空"
Jiang Xin220c3132014-10-08 10:55:14 +08003475
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003476#: trailer.c:722
Jiang Xin220c3132014-10-08 10:55:14 +08003477#, c-format
3478msgid "could not read input file '%s'"
3479msgstr "不能读取输入文件 '%s'"
3480
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003481#: trailer.c:725
Jiang Xin220c3132014-10-08 10:55:14 +08003482msgid "could not read from stdin"
3483msgstr "不能自标准输入读取"
3484
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003485#: trailer.c:949 builtin/am.c:44
Jiang Xin276ceea2016-02-28 20:35:55 +08003486#, c-format
3487msgid "could not stat %s"
3488msgstr "不能获取 %s 的文件状态"
3489
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003490#: trailer.c:951
Jiang Xin276ceea2016-02-28 20:35:55 +08003491#, c-format
3492msgid "file %s is not a regular file"
3493msgstr "文件 %s 不是一个正规文件"
3494
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003495#: trailer.c:953
Jiang Xin276ceea2016-02-28 20:35:55 +08003496#, c-format
3497msgid "file %s is not writable by user"
3498msgstr "文件 %s 用户不可写"
3499
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003500#: trailer.c:965
Jiang Xin276ceea2016-02-28 20:35:55 +08003501msgid "could not open temporary file"
3502msgstr "不能打开临时文件"
3503
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003504#: trailer.c:1001
Jiang Xin276ceea2016-02-28 20:35:55 +08003505#, c-format
3506msgid "could not rename temporary file to %s"
3507msgstr "不能重命名临时文件为 %s"
3508
Jiang Xin5c57d762016-08-28 10:18:12 +08003509#: transport.c:62
3510#, c-format
3511msgid "Would set upstream of '%s' to '%s' of '%s'\n"
3512msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
3513
3514#: transport.c:151
3515#, c-format
3516msgid "transport: invalid depth option '%s'"
3517msgstr "传输:无效的深度选项 '%s'"
3518
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003519#: transport.c:885
Jiang Xin5c57d762016-08-28 10:18:12 +08003520#, c-format
3521msgid ""
3522"The following submodule paths contain changes that can\n"
3523"not be found on any remote:\n"
Ray Chen9a4b6942016-09-07 18:03:04 +08003524msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
Jiang Xin5c57d762016-08-28 10:18:12 +08003525
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003526#: transport.c:889
Jiang Xin5c57d762016-08-28 10:18:12 +08003527#, c-format
3528msgid ""
3529"\n"
3530"Please try\n"
3531"\n"
3532"\tgit push --recurse-submodules=on-demand\n"
3533"\n"
3534"or cd to the path and use\n"
3535"\n"
3536"\tgit push\n"
3537"\n"
3538"to push them to a remote.\n"
3539"\n"
3540msgstr ""
3541"\n"
3542"请尝试\n"
3543"\n"
3544"\tgit push --recurse-submodules=on-demand\n"
3545"\n"
3546"或者进入到子目录执行\n"
3547"\n"
3548"\tgit push\n"
3549"\n"
Ray Chen9a4b6942016-09-07 18:03:04 +08003550"以推送至远程。\n"
Jiang Xin5c57d762016-08-28 10:18:12 +08003551"\n"
3552
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003553#: transport.c:897
Jiang Xin5c57d762016-08-28 10:18:12 +08003554msgid "Aborting."
3555msgstr "正在终止。"
3556
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003557#: transport-helper.c:1082
Jiang Xin1b7f4a32015-08-23 15:23:21 +08003558#, c-format
3559msgid "Could not read ref %s"
3560msgstr "不能读取引用 %s"
3561
Jiang Xina0b6b242016-10-27 21:53:37 +08003562#: tree-walk.c:31
3563msgid "too-short tree object"
3564msgstr "太短的树对象"
3565
3566#: tree-walk.c:37
3567msgid "malformed mode in tree entry"
Ray Chen29004bb2016-12-28 17:08:45 +08003568msgstr "树对象中的条目模式错误"
Jiang Xina0b6b242016-10-27 21:53:37 +08003569
3570#: tree-walk.c:41
3571msgid "empty filename in tree entry"
3572msgstr "树对象条目中空的文件名"
3573
3574#: tree-walk.c:113
3575msgid "too-short tree file"
3576msgstr "太短的树文件"
3577
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003578#: unpack-trees.c:99
Jiang Xin5b04ee32016-05-29 20:40:35 +08003579#, c-format
3580msgid ""
3581"Your local changes to the following files would be overwritten by checkout:\n"
Jiang Xin5c57d762016-08-28 10:18:12 +08003582"%%sPlease commit your changes or stash them before you switch branches."
Jiang Xin5b04ee32016-05-29 20:40:35 +08003583msgstr ""
3584"您对下列文件的本地修改将被检出操作覆盖:\n"
Ray Chenaef18cc2016-06-06 00:06:17 +08003585"%%s请在切换分支前提交您的修改或者保存进度。"
Jiang Xin5b04ee32016-05-29 20:40:35 +08003586
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003587#: unpack-trees.c:101
Jiang Xin5b04ee32016-05-29 20:40:35 +08003588#, c-format
3589msgid ""
3590"Your local changes to the following files would be overwritten by checkout:\n"
3591"%%s"
3592msgstr ""
3593"您对下列文件的本地修改将被检出操作覆盖:\n"
3594"%%s"
3595
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003596#: unpack-trees.c:104
Jiang Xin5b04ee32016-05-29 20:40:35 +08003597#, c-format
3598msgid ""
3599"Your local changes to the following files would be overwritten by merge:\n"
Jiang Xin5c57d762016-08-28 10:18:12 +08003600"%%sPlease commit your changes or stash them before you merge."
Jiang Xin5b04ee32016-05-29 20:40:35 +08003601msgstr ""
3602"您对下列文件的本地修改将被合并操作覆盖:\n"
Ray Chenaef18cc2016-06-06 00:06:17 +08003603"%%s请在合并前提交您的修改或者保存进度。"
Jiang Xin5b04ee32016-05-29 20:40:35 +08003604
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003605#: unpack-trees.c:106
Jiang Xin5b04ee32016-05-29 20:40:35 +08003606#, c-format
3607msgid ""
3608"Your local changes to the following files would be overwritten by merge:\n"
3609"%%s"
3610msgstr ""
3611"您对下列文件的本地修改将被合并操作覆盖:\n"
3612"%%s"
3613
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003614#: unpack-trees.c:109
Jiang Xin5b04ee32016-05-29 20:40:35 +08003615#, c-format
3616msgid ""
3617"Your local changes to the following files would be overwritten by %s:\n"
Jiang Xin5c57d762016-08-28 10:18:12 +08003618"%%sPlease commit your changes or stash them before you %s."
Jiang Xin5b04ee32016-05-29 20:40:35 +08003619msgstr ""
3620"您对下列文件的本地修改将被 %s 覆盖:\n"
Ray Chenaef18cc2016-06-06 00:06:17 +08003621"%%s请在 %s 之前提交您的修改或者保存进度。"
Jiang Xin5b04ee32016-05-29 20:40:35 +08003622
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003623#: unpack-trees.c:111
Jiang Xin5b04ee32016-05-29 20:40:35 +08003624#, c-format
3625msgid ""
3626"Your local changes to the following files would be overwritten by %s:\n"
3627"%%s"
3628msgstr ""
3629"您对下列文件的本地修改将被 %s 覆盖:\n"
3630"%%s"
3631
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003632#: unpack-trees.c:116
Jiang Xin5b04ee32016-05-29 20:40:35 +08003633#, c-format
3634msgid ""
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003635"Updating the following directories would lose untracked files in them:\n"
Jiang Xin5b04ee32016-05-29 20:40:35 +08003636"%s"
3637msgstr ""
3638"更新如下目录将会丢失其中未跟踪的文件:\n"
3639"%s"
3640
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003641#: unpack-trees.c:120
Jiang Xin5b04ee32016-05-29 20:40:35 +08003642#, c-format
3643msgid ""
3644"The following untracked working tree files would be removed by checkout:\n"
Jiang Xin5c57d762016-08-28 10:18:12 +08003645"%%sPlease move or remove them before you switch branches."
Jiang Xin5b04ee32016-05-29 20:40:35 +08003646msgstr ""
Ray Chenaef18cc2016-06-06 00:06:17 +08003647"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
3648"%%s请在切换分支之前移动或删除。"
Jiang Xin5b04ee32016-05-29 20:40:35 +08003649
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003650#: unpack-trees.c:122
Jiang Xin5b04ee32016-05-29 20:40:35 +08003651#, c-format
3652msgid ""
3653"The following untracked working tree files would be removed by checkout:\n"
3654"%%s"
3655msgstr ""
3656"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
3657"%%s"
3658
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003659#: unpack-trees.c:125
Jiang Xin5b04ee32016-05-29 20:40:35 +08003660#, c-format
3661msgid ""
3662"The following untracked working tree files would be removed by merge:\n"
Jiang Xin5c57d762016-08-28 10:18:12 +08003663"%%sPlease move or remove them before you merge."
Jiang Xin5b04ee32016-05-29 20:40:35 +08003664msgstr ""
3665"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
3666"%%s请在合并前移动或删除。"
3667
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003668#: unpack-trees.c:127
Jiang Xin5b04ee32016-05-29 20:40:35 +08003669#, c-format
3670msgid ""
3671"The following untracked working tree files would be removed by merge:\n"
3672"%%s"
3673msgstr ""
3674"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
3675"%%s"
3676
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003677#: unpack-trees.c:130
Jiang Xin5b04ee32016-05-29 20:40:35 +08003678#, c-format
3679msgid ""
3680"The following untracked working tree files would be removed by %s:\n"
Jiang Xin5c57d762016-08-28 10:18:12 +08003681"%%sPlease move or remove them before you %s."
Jiang Xin5b04ee32016-05-29 20:40:35 +08003682msgstr ""
3683"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
3684"%%s请在 %s 前移动或删除。"
3685
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003686#: unpack-trees.c:132
Jiang Xin5b04ee32016-05-29 20:40:35 +08003687#, c-format
3688msgid ""
3689"The following untracked working tree files would be removed by %s:\n"
3690"%%s"
3691msgstr ""
3692"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
3693"%%s"
3694
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003695#: unpack-trees.c:137
Jiang Xin5b04ee32016-05-29 20:40:35 +08003696#, c-format
3697msgid ""
3698"The following untracked working tree files would be overwritten by "
3699"checkout:\n"
Jiang Xin5c57d762016-08-28 10:18:12 +08003700"%%sPlease move or remove them before you switch branches."
Jiang Xin5b04ee32016-05-29 20:40:35 +08003701msgstr ""
3702"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
3703"%%s请在切换分支前移动或删除。"
3704
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003705#: unpack-trees.c:139
Jiang Xin5b04ee32016-05-29 20:40:35 +08003706#, c-format
3707msgid ""
3708"The following untracked working tree files would be overwritten by "
3709"checkout:\n"
3710"%%s"
3711msgstr ""
3712"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
3713"%%s"
3714
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003715#: unpack-trees.c:142
Jiang Xin5b04ee32016-05-29 20:40:35 +08003716#, c-format
3717msgid ""
3718"The following untracked working tree files would be overwritten by merge:\n"
Jiang Xin5c57d762016-08-28 10:18:12 +08003719"%%sPlease move or remove them before you merge."
Jiang Xin5b04ee32016-05-29 20:40:35 +08003720msgstr ""
3721"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
3722"%%s请在合并前移动或删除。"
3723
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003724#: unpack-trees.c:144
Jiang Xin5b04ee32016-05-29 20:40:35 +08003725#, c-format
3726msgid ""
3727"The following untracked working tree files would be overwritten by merge:\n"
3728"%%s"
3729msgstr ""
3730"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
3731"%%s"
3732
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003733#: unpack-trees.c:147
Jiang Xin5b04ee32016-05-29 20:40:35 +08003734#, c-format
3735msgid ""
3736"The following untracked working tree files would be overwritten by %s:\n"
Jiang Xin5c57d762016-08-28 10:18:12 +08003737"%%sPlease move or remove them before you %s."
Jiang Xin5b04ee32016-05-29 20:40:35 +08003738msgstr ""
3739"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
3740"%%s请在 %s 前移动或删除。"
3741
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003742#: unpack-trees.c:149
Jiang Xin5b04ee32016-05-29 20:40:35 +08003743#, c-format
3744msgid ""
3745"The following untracked working tree files would be overwritten by %s:\n"
3746"%%s"
3747msgstr ""
3748"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
3749"%%s"
3750
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003751#: unpack-trees.c:156
Jiang Xin5b04ee32016-05-29 20:40:35 +08003752#, c-format
3753msgid "Entry '%s' overlaps with '%s'. Cannot bind."
3754msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
3755
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003756#: unpack-trees.c:159
Jiang Xin5b04ee32016-05-29 20:40:35 +08003757#, c-format
3758msgid ""
3759"Cannot update sparse checkout: the following entries are not up-to-date:\n"
3760"%s"
3761msgstr ""
Ray Chenaef18cc2016-06-06 00:06:17 +08003762"无法更新稀疏检出:如下条目不是最新:\n"
Jiang Xin5b04ee32016-05-29 20:40:35 +08003763"%s"
3764
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003765#: unpack-trees.c:161
Jiang Xin5b04ee32016-05-29 20:40:35 +08003766#, c-format
3767msgid ""
Jiang Xina0b6b242016-10-27 21:53:37 +08003768"The following working tree files would be overwritten by sparse checkout "
Jiang Xin5b04ee32016-05-29 20:40:35 +08003769"update:\n"
3770"%s"
3771msgstr ""
Jiang Xina0b6b242016-10-27 21:53:37 +08003772"工作区中下列文件将被稀疏检出更新所覆盖:\n"
Jiang Xin5b04ee32016-05-29 20:40:35 +08003773"%s"
3774
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003775#: unpack-trees.c:163
Jiang Xin5b04ee32016-05-29 20:40:35 +08003776#, c-format
3777msgid ""
Jiang Xina0b6b242016-10-27 21:53:37 +08003778"The following working tree files would be removed by sparse checkout "
Jiang Xin5b04ee32016-05-29 20:40:35 +08003779"update:\n"
3780"%s"
3781msgstr ""
Jiang Xina0b6b242016-10-27 21:53:37 +08003782"工作区中下列文件将被稀疏检出更新所删除:\n"
Jiang Xin5b04ee32016-05-29 20:40:35 +08003783"%s"
3784
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003785#: unpack-trees.c:240
Jiang Xin5b04ee32016-05-29 20:40:35 +08003786#, c-format
3787msgid "Aborting\n"
3788msgstr "终止中\n"
3789
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003790#: unpack-trees.c:270
Jiang Xin6c94aba2014-03-13 12:41:34 +08003791msgid "Checking out files"
3792msgstr "正在检出文件"
3793
Jiang Xin90314792013-09-17 23:37:05 +08003794#: urlmatch.c:120
3795msgid "invalid URL scheme name or missing '://' suffix"
3796msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
3797
3798#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
3799#, c-format
3800msgid "invalid %XX escape sequence"
3801msgstr "无效的 %XX 转义序列"
3802
3803#: urlmatch.c:172
3804msgid "missing host and scheme is not 'file:'"
Ray Chen4375c102015-08-10 18:03:29 +08003805msgstr "缺失主机名且 URL 方案不是 'file:'"
Jiang Xin90314792013-09-17 23:37:05 +08003806
3807#: urlmatch.c:189
3808msgid "a 'file:' URL may not have a port number"
3809msgstr "一个 'file:' URL 不应该包含端口号"
3810
3811#: urlmatch.c:199
3812msgid "invalid characters in host name"
3813msgstr "主机名中包含无效的字符"
3814
3815#: urlmatch.c:244 urlmatch.c:255
3816msgid "invalid port number"
3817msgstr "无效的端口号"
3818
3819#: urlmatch.c:322
3820msgid "invalid '..' path segment"
3821msgstr "无效的 '..' 路径片段"
3822
Jiang Xin5c57d762016-08-28 10:18:12 +08003823#: worktree.c:282
3824#, c-format
3825msgid "failed to read '%s'"
3826msgstr "无法读取 '%s'"
3827
3828#: wrapper.c:222 wrapper.c:392
Jiang Xin1b7f4a32015-08-23 15:23:21 +08003829#, c-format
3830msgid "could not open '%s' for reading and writing"
3831msgstr "无法打开 '%s' 进行读写"
3832
Jiang Xina0b6b242016-10-27 21:53:37 +08003833#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
Jiang Xin1b7f4a32015-08-23 15:23:21 +08003834#, c-format
3835msgid "could not open '%s' for writing"
3836msgstr "无法打开 '%s' 进行写入"
3837
Jiang Xina0b6b242016-10-27 21:53:37 +08003838#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
Jiang Xin1a79b2f2017-01-27 22:50:57 +08003839#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033
Jiang Xina0b6b242016-10-27 21:53:37 +08003840#: builtin/pull.c:341
Jiang Xin1b7f4a32015-08-23 15:23:21 +08003841#, c-format
3842msgid "could not open '%s' for reading"
3843msgstr "无法打开 '%s' 进行读取"
3844
Jiang Xin5c57d762016-08-28 10:18:12 +08003845#: wrapper.c:605 wrapper.c:626
Wang Sheng07432ce2013-01-30 17:23:08 +08003846#, c-format
3847msgid "unable to access '%s'"
3848msgstr "不能访问 '%s'"
3849
Jiang Xin5c57d762016-08-28 10:18:12 +08003850#: wrapper.c:634
Jiang Xin220c3132014-10-08 10:55:14 +08003851msgid "unable to get current working directory"
3852msgstr "不能获取当前工作目录"
3853
Jiang Xin5c57d762016-08-28 10:18:12 +08003854#: wrapper.c:658
Jiang Xin7aea43f2015-05-31 08:42:31 +08003855#, c-format
3856msgid "could not write to %s"
3857msgstr "不能写入 %s"
3858
Jiang Xin5c57d762016-08-28 10:18:12 +08003859#: wrapper.c:660
Jiang Xin7aea43f2015-05-31 08:42:31 +08003860#, c-format
3861msgid "could not close %s"
3862msgstr "不能关闭 %s"
3863
Jiang Xina0b6b242016-10-27 21:53:37 +08003864#: wt-status.c:151
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003865msgid "Unmerged paths:"
3866msgstr "未合并的路径:"
3867
Jiang Xin90e6ef52012-03-27 14:46:11 +08003868# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +08003869#: wt-status.c:178 wt-status.c:205
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003870#, c-format
3871msgid " (use \"git reset %s <file>...\" to unstage)"
Jiang Xin160fb2b2015-08-02 21:47:30 +08003872msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003873
Jiang Xin90e6ef52012-03-27 14:46:11 +08003874# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +08003875#: wt-status.c:180 wt-status.c:207
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003876msgid " (use \"git rm --cached <file>...\" to unstage)"
Jiang Xin160fb2b2015-08-02 21:47:30 +08003877msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003878
Jiang Xin90e6ef52012-03-27 14:46:11 +08003879# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +08003880#: wt-status.c:184
Jiang Xin6792b932012-07-04 17:20:34 +08003881msgid " (use \"git add <file>...\" to mark resolution)"
Jiang Xind9d56b22015-01-18 20:37:57 +08003882msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
Jiang Xin6792b932012-07-04 17:20:34 +08003883
3884# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +08003885#: wt-status.c:186 wt-status.c:190
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003886msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
Jiang Xind9d56b22015-01-18 20:37:57 +08003887msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003888
Jiang Xin6792b932012-07-04 17:20:34 +08003889# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +08003890#: wt-status.c:188
Jiang Xin6792b932012-07-04 17:20:34 +08003891msgid " (use \"git rm <file>...\" to mark resolution)"
Jiang Xind9d56b22015-01-18 20:37:57 +08003892msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
Jiang Xin6792b932012-07-04 17:20:34 +08003893
Jiang Xina0b6b242016-10-27 21:53:37 +08003894#: wt-status.c:199 wt-status.c:945
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003895msgid "Changes to be committed:"
3896msgstr "要提交的变更:"
3897
Jiang Xina0b6b242016-10-27 21:53:37 +08003898#: wt-status.c:217 wt-status.c:954
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003899msgid "Changes not staged for commit:"
Jiang Xin7e238ab2012-03-30 10:55:34 +08003900msgstr "尚未暂存以备提交的变更:"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003901
Jiang Xin90e6ef52012-03-27 14:46:11 +08003902# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +08003903#: wt-status.c:221
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003904msgid " (use \"git add <file>...\" to update what will be committed)"
Jiang Xind9d56b22015-01-18 20:37:57 +08003905msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003906
Jiang Xin90e6ef52012-03-27 14:46:11 +08003907# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +08003908#: wt-status.c:223
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003909msgid " (use \"git add/rm <file>...\" to update what will be committed)"
Jiang Xind9d56b22015-01-18 20:37:57 +08003910msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003911
Jiang Xin90e6ef52012-03-27 14:46:11 +08003912# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +08003913#: wt-status.c:224
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003914msgid ""
3915" (use \"git checkout -- <file>...\" to discard changes in working directory)"
Jiang Xind9d56b22015-01-18 20:37:57 +08003916msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003917
Jiang Xin90e6ef52012-03-27 14:46:11 +08003918# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +08003919#: wt-status.c:226
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003920msgid " (commit or discard the untracked or modified content in submodules)"
3921msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
3922
Jiang Xin90e6ef52012-03-27 14:46:11 +08003923# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +08003924#: wt-status.c:238
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003925#, c-format
3926msgid " (use \"git %s <file>...\" to include in what will be committed)"
Jiang Xind9d56b22015-01-18 20:37:57 +08003927msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003928
Jiang Xina0b6b242016-10-27 21:53:37 +08003929#: wt-status.c:253
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003930msgid "both deleted:"
3931msgstr "双方删除:"
3932
Jiang Xina0b6b242016-10-27 21:53:37 +08003933#: wt-status.c:255
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003934msgid "added by us:"
3935msgstr "由我们添加:"
3936
Jiang Xina0b6b242016-10-27 21:53:37 +08003937#: wt-status.c:257
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003938msgid "deleted by them:"
3939msgstr "由他们删除:"
3940
Jiang Xina0b6b242016-10-27 21:53:37 +08003941#: wt-status.c:259
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003942msgid "added by them:"
3943msgstr "由他们添加:"
3944
Jiang Xina0b6b242016-10-27 21:53:37 +08003945#: wt-status.c:261
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003946msgid "deleted by us:"
3947msgstr "由我们删除:"
3948
Jiang Xina0b6b242016-10-27 21:53:37 +08003949#: wt-status.c:263
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003950msgid "both added:"
3951msgstr "双方添加:"
3952
Jiang Xina0b6b242016-10-27 21:53:37 +08003953#: wt-status.c:265
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003954msgid "both modified:"
3955msgstr "双方修改:"
3956
Jiang Xina0b6b242016-10-27 21:53:37 +08003957#: wt-status.c:275
Jiang Xin6c94aba2014-03-13 12:41:34 +08003958msgid "new file:"
3959msgstr "新文件:"
Jiang Xincfff71a2014-01-18 11:04:21 +08003960
Jiang Xina0b6b242016-10-27 21:53:37 +08003961#: wt-status.c:277
Jiang Xin6c94aba2014-03-13 12:41:34 +08003962msgid "copied:"
3963msgstr "拷贝:"
Jiang Xincfff71a2014-01-18 11:04:21 +08003964
Jiang Xina0b6b242016-10-27 21:53:37 +08003965#: wt-status.c:279
Jiang Xin6c94aba2014-03-13 12:41:34 +08003966msgid "deleted:"
3967msgstr "删除:"
Jiang Xincfff71a2014-01-18 11:04:21 +08003968
Jiang Xina0b6b242016-10-27 21:53:37 +08003969#: wt-status.c:281
Jiang Xin6c94aba2014-03-13 12:41:34 +08003970msgid "modified:"
3971msgstr "修改:"
Jiang Xincfff71a2014-01-18 11:04:21 +08003972
Jiang Xina0b6b242016-10-27 21:53:37 +08003973#: wt-status.c:283
Jiang Xin6c94aba2014-03-13 12:41:34 +08003974msgid "renamed:"
3975msgstr "重命名:"
3976
Jiang Xina0b6b242016-10-27 21:53:37 +08003977#: wt-status.c:285
Jiang Xin6c94aba2014-03-13 12:41:34 +08003978msgid "typechange:"
3979msgstr "类型变更:"
3980
Jiang Xina0b6b242016-10-27 21:53:37 +08003981#: wt-status.c:287
Jiang Xin6c94aba2014-03-13 12:41:34 +08003982msgid "unknown:"
3983msgstr "未知:"
3984
Jiang Xina0b6b242016-10-27 21:53:37 +08003985#: wt-status.c:289
Jiang Xin6c94aba2014-03-13 12:41:34 +08003986msgid "unmerged:"
3987msgstr "未合并:"
Jiang Xincfff71a2014-01-18 11:04:21 +08003988
Jiang Xin90e6ef52012-03-27 14:46:11 +08003989# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
Jiang Xina0b6b242016-10-27 21:53:37 +08003990#: wt-status.c:371
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003991msgid "new commits, "
Jiang Xinaa9565f2012-03-05 13:16:27 +08003992msgstr "新提交, "
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003993
Jiang Xin90e6ef52012-03-27 14:46:11 +08003994# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
Jiang Xina0b6b242016-10-27 21:53:37 +08003995#: wt-status.c:373
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003996msgid "modified content, "
Jiang Xinaa9565f2012-03-05 13:16:27 +08003997msgstr "修改的内容, "
Jiang Xinc04f5ac2012-02-13 14:41:59 +08003998
Jiang Xin90e6ef52012-03-27 14:46:11 +08003999# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
Jiang Xina0b6b242016-10-27 21:53:37 +08004000#: wt-status.c:375
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004001msgid "untracked content, "
Jiang Xinaa9565f2012-03-05 13:16:27 +08004002msgstr "未跟踪的内容, "
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004003
Jiang Xina0b6b242016-10-27 21:53:37 +08004004#: wt-status.c:818
Jiang Xin90314792013-09-17 23:37:05 +08004005msgid "Submodules changed but not updated:"
4006msgstr "子模组已修改但尚未更新:"
4007
Jiang Xina0b6b242016-10-27 21:53:37 +08004008#: wt-status.c:820
Jiang Xin90314792013-09-17 23:37:05 +08004009msgid "Submodule changes to be committed:"
4010msgstr "要提交的子模组变更:"
4011
Jiang Xina0b6b242016-10-27 21:53:37 +08004012#: wt-status.c:901
Jiang Xincfff71a2014-01-18 11:04:21 +08004013msgid ""
4014"Do not touch the line above.\n"
4015"Everything below will be removed."
4016msgstr ""
4017"不要改动上面的一行。\n"
4018"下面的所有内容均将被删除。"
4019
Jiang Xina0b6b242016-10-27 21:53:37 +08004020#: wt-status.c:1013
Jiang Xin6792b932012-07-04 17:20:34 +08004021msgid "You have unmerged paths."
Thynson195febd2012-08-07 17:39:30 +08004022msgstr "您有尚未合并的路径。"
Jiang Xin6792b932012-07-04 17:20:34 +08004023
4024# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +08004025#: wt-status.c:1016
Jiang Xin6792b932012-07-04 17:20:34 +08004026msgid " (fix conflicts and run \"git commit\")"
4027msgstr " (解决冲突并运行 \"git commit\")"
4028
Jiang Xin5c57d762016-08-28 10:18:12 +08004029# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +08004030#: wt-status.c:1018
Jiang Xin5c57d762016-08-28 10:18:12 +08004031msgid " (use \"git merge --abort\" to abort the merge)"
4032msgstr " (使用 \"git merge --abort\" 终止合并)"
4033
Jiang Xina0b6b242016-10-27 21:53:37 +08004034#: wt-status.c:1023
Jiang Xin6792b932012-07-04 17:20:34 +08004035msgid "All conflicts fixed but you are still merging."
4036msgstr "所有冲突已解决但您仍处于合并中。"
4037
4038# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +08004039#: wt-status.c:1026
Jiang Xin6792b932012-07-04 17:20:34 +08004040msgid " (use \"git commit\" to conclude merge)"
4041msgstr " (使用 \"git commit\" 结束合并)"
4042
Jiang Xina0b6b242016-10-27 21:53:37 +08004043#: wt-status.c:1036
Jiang Xin6792b932012-07-04 17:20:34 +08004044msgid "You are in the middle of an am session."
Jiang Xin98b27612014-02-02 20:46:58 +08004045msgstr "您正处于 am 操作过程中。"
Jiang Xin6792b932012-07-04 17:20:34 +08004046
Jiang Xina0b6b242016-10-27 21:53:37 +08004047#: wt-status.c:1039
Jiang Xin6792b932012-07-04 17:20:34 +08004048msgid "The current patch is empty."
4049msgstr "当前的补丁为空。"
4050
4051# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +08004052#: wt-status.c:1043
Jiang Xin2e8451e2013-07-26 14:00:02 +08004053msgid " (fix conflicts and then run \"git am --continue\")"
4054msgstr " (解决冲突,然后运行 \"git am --continue\")"
Jiang Xin6792b932012-07-04 17:20:34 +08004055
4056# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +08004057#: wt-status.c:1045
Jiang Xin6792b932012-07-04 17:20:34 +08004058msgid " (use \"git am --skip\" to skip this patch)"
4059msgstr " (使用 \"git am --skip\" 跳过此补丁)"
4060
4061# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +08004062#: wt-status.c:1047
Jiang Xin6792b932012-07-04 17:20:34 +08004063msgid " (use \"git am --abort\" to restore the original branch)"
4064msgstr " (使用 \"git am --abort\" 恢复原有分支)"
4065
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004066#: wt-status.c:1176
4067msgid "git-rebase-todo is missing."
4068msgstr "git-rebase-todo 丢失。"
4069
4070#: wt-status.c:1178
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004071msgid "No commands done."
4072msgstr "没有命令被执行。"
4073
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004074#: wt-status.c:1181
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004075#, c-format
4076msgid "Last command done (%d command done):"
4077msgid_plural "Last commands done (%d commands done):"
4078msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
4079msgstr[1] "最后的命令已完成(%d 条命令被执行):"
4080
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004081#: wt-status.c:1192
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004082#, c-format
4083msgid " (see more in file %s)"
4084msgstr " (更多参见文件 %s)"
4085
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004086#: wt-status.c:1197
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004087msgid "No commands remaining."
4088msgstr "未剩下任何命令。"
4089
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004090#: wt-status.c:1200
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004091#, c-format
4092msgid "Next command to do (%d remaining command):"
4093msgid_plural "Next commands to do (%d remaining commands):"
4094msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
4095msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
4096
4097# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004098#: wt-status.c:1208
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004099msgid " (use \"git rebase --edit-todo\" to view and edit)"
4100msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
4101
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004102#: wt-status.c:1221
Jiang Xin63af42f2013-02-19 14:52:24 +08004103#, c-format
4104msgid "You are currently rebasing branch '%s' on '%s'."
Jiang Xin98b27612014-02-02 20:46:58 +08004105msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
Jiang Xin63af42f2013-02-19 14:52:24 +08004106
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004107#: wt-status.c:1226
Jiang Xin6792b932012-07-04 17:20:34 +08004108msgid "You are currently rebasing."
Jiang Xin98b27612014-02-02 20:46:58 +08004109msgstr "您在执行变基操作。"
Jiang Xin6792b932012-07-04 17:20:34 +08004110
4111# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004112#: wt-status.c:1240
Jiang Xin6792b932012-07-04 17:20:34 +08004113msgid " (fix conflicts and then run \"git rebase --continue\")"
4114msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
4115
4116# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004117#: wt-status.c:1242
Jiang Xin6792b932012-07-04 17:20:34 +08004118msgid " (use \"git rebase --skip\" to skip this patch)"
4119msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
4120
4121# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004122#: wt-status.c:1244
Jiang Xin6792b932012-07-04 17:20:34 +08004123msgid " (use \"git rebase --abort\" to check out the original branch)"
4124msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
4125
4126# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004127#: wt-status.c:1250
Jiang Xin6792b932012-07-04 17:20:34 +08004128msgid " (all conflicts fixed: run \"git rebase --continue\")"
4129msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
4130
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004131#: wt-status.c:1254
Jiang Xin63af42f2013-02-19 14:52:24 +08004132#, c-format
4133msgid ""
4134"You are currently splitting a commit while rebasing branch '%s' on '%s'."
Jiang Xin98b27612014-02-02 20:46:58 +08004135msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
Jiang Xin63af42f2013-02-19 14:52:24 +08004136
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004137#: wt-status.c:1259
Jiang Xin6792b932012-07-04 17:20:34 +08004138msgid "You are currently splitting a commit during a rebase."
Jiang Xin98b27612014-02-02 20:46:58 +08004139msgstr "您在执行变基操作时拆分提交。"
Jiang Xin6792b932012-07-04 17:20:34 +08004140
4141# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004142#: wt-status.c:1262
Jiang Xin6792b932012-07-04 17:20:34 +08004143msgid " (Once your working directory is clean, run \"git rebase --continue\")"
4144msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
4145
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004146#: wt-status.c:1266
Jiang Xin63af42f2013-02-19 14:52:24 +08004147#, c-format
4148msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
Jiang Xin98b27612014-02-02 20:46:58 +08004149msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
Jiang Xin63af42f2013-02-19 14:52:24 +08004150
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004151#: wt-status.c:1271
Jiang Xin6792b932012-07-04 17:20:34 +08004152msgid "You are currently editing a commit during a rebase."
Jiang Xin98b27612014-02-02 20:46:58 +08004153msgstr "您在执行变基操作时编辑提交。"
Jiang Xin6792b932012-07-04 17:20:34 +08004154
4155# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004156#: wt-status.c:1274
Jiang Xin6792b932012-07-04 17:20:34 +08004157msgid " (use \"git commit --amend\" to amend the current commit)"
4158msgstr " (使用 \"git commit --amend\" 修补当前提交)"
4159
4160# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004161#: wt-status.c:1276
Jiang Xin6792b932012-07-04 17:20:34 +08004162msgid ""
4163" (use \"git rebase --continue\" once you are satisfied with your changes)"
Thynson195febd2012-08-07 17:39:30 +08004164msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
Jiang Xin6792b932012-07-04 17:20:34 +08004165
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004166#: wt-status.c:1286
Jiang Xin90314792013-09-17 23:37:05 +08004167#, c-format
4168msgid "You are currently cherry-picking commit %s."
Jiang Xin98b27612014-02-02 20:46:58 +08004169msgstr "您在执行拣选提交 %s 的操作。"
Jiang Xin6792b932012-07-04 17:20:34 +08004170
4171# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004172#: wt-status.c:1291
Jiang Xin2e8451e2013-07-26 14:00:02 +08004173msgid " (fix conflicts and run \"git cherry-pick --continue\")"
4174msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
Jiang Xin6792b932012-07-04 17:20:34 +08004175
Jiang Xin2e8451e2013-07-26 14:00:02 +08004176# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004177#: wt-status.c:1294
Jiang Xin2e8451e2013-07-26 14:00:02 +08004178msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
4179msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
4180
4181# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004182#: wt-status.c:1296
Jiang Xin2e8451e2013-07-26 14:00:02 +08004183msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
4184msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
4185
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004186#: wt-status.c:1305
Jiang Xin63af42f2013-02-19 14:52:24 +08004187#, c-format
Jiang Xin1003b3a2013-04-11 17:55:09 +08004188msgid "You are currently reverting commit %s."
Jiang Xin98b27612014-02-02 20:46:58 +08004189msgstr "您在执行反转提交 %s 的操作。"
Jiang Xin63af42f2013-02-19 14:52:24 +08004190
Jiang Xin1003b3a2013-04-11 17:55:09 +08004191# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004192#: wt-status.c:1310
Jiang Xin1003b3a2013-04-11 17:55:09 +08004193msgid " (fix conflicts and run \"git revert --continue\")"
4194msgstr " (解决冲突并运行 \"git revert --continue\")"
4195
4196# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004197#: wt-status.c:1313
Jiang Xin1003b3a2013-04-11 17:55:09 +08004198msgid " (all conflicts fixed: run \"git revert --continue\")"
4199msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
4200
4201# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004202#: wt-status.c:1315
Jiang Xin1003b3a2013-04-11 17:55:09 +08004203msgid " (use \"git revert --abort\" to cancel the revert operation)"
4204msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
4205
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004206#: wt-status.c:1326
Jiang Xin1003b3a2013-04-11 17:55:09 +08004207#, c-format
4208msgid "You are currently bisecting, started from branch '%s'."
Jiang Xin98b27612014-02-02 20:46:58 +08004209msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
Jiang Xin1003b3a2013-04-11 17:55:09 +08004210
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004211#: wt-status.c:1330
Jiang Xin6792b932012-07-04 17:20:34 +08004212msgid "You are currently bisecting."
Jiang Xin98b27612014-02-02 20:46:58 +08004213msgstr "您在执行二分查找操作。"
Jiang Xin6792b932012-07-04 17:20:34 +08004214
4215# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004216#: wt-status.c:1333
Jiang Xin6792b932012-07-04 17:20:34 +08004217msgid " (use \"git bisect reset\" to get back to the original branch)"
4218msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
4219
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004220#: wt-status.c:1530
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004221msgid "On branch "
4222msgstr "位于分支 "
4223
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004224#: wt-status.c:1536
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004225msgid "interactive rebase in progress; onto "
4226msgstr "交互式变基操作正在进行中;至 "
4227
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004228#: wt-status.c:1538
Jiang Xin2e8451e2013-07-26 14:00:02 +08004229msgid "rebase in progress; onto "
Jiang Xin98b27612014-02-02 20:46:58 +08004230msgstr "变基操作正在进行中;至 "
Jiang Xin2e8451e2013-07-26 14:00:02 +08004231
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004232#: wt-status.c:1543
Jiang Xin1003b3a2013-04-11 17:55:09 +08004233msgid "HEAD detached at "
4234msgstr "头指针分离于 "
4235
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004236#: wt-status.c:1545
Jiang Xin1003b3a2013-04-11 17:55:09 +08004237msgid "HEAD detached from "
4238msgstr "头指针分离自 "
4239
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004240#: wt-status.c:1548
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004241msgid "Not currently on any branch."
4242msgstr "当前不在任何分支上。"
4243
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004244#: wt-status.c:1566
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004245msgid "Initial commit"
4246msgstr "初始提交"
4247
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004248#: wt-status.c:1580
Wang Sheng07432ce2013-01-30 17:23:08 +08004249msgid "Untracked files"
4250msgstr "未跟踪的文件"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004251
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004252#: wt-status.c:1582
Wang Sheng07432ce2013-01-30 17:23:08 +08004253msgid "Ignored files"
4254msgstr "忽略的文件"
4255
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004256#: wt-status.c:1586
Jiang Xin1003b3a2013-04-11 17:55:09 +08004257#, c-format
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004258msgid ""
4259"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
4260"may speed it up, but you have to be careful not to forget to add\n"
4261"new files yourself (see 'git help status')."
4262msgstr ""
4263"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
4264"但您需要小心不要忘了添加新文件(参见 'git help status')。"
Jiang Xin1003b3a2013-04-11 17:55:09 +08004265
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004266#: wt-status.c:1592
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004267#, c-format
4268msgid "Untracked files not listed%s"
4269msgstr "未跟踪的文件没有列出%s"
4270
Jiang Xin7e238ab2012-03-30 10:55:34 +08004271# 译者:中文字符串拼接,可删除前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004272#: wt-status.c:1594
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004273msgid " (use -u option to show untracked files)"
Jiang Xin7e238ab2012-03-30 10:55:34 +08004274msgstr "(使用 -u 参数显示未跟踪的文件)"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004275
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004276#: wt-status.c:1600
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004277msgid "No changes"
4278msgstr "没有修改"
4279
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004280#: wt-status.c:1605
Wang Sheng07432ce2013-01-30 17:23:08 +08004281#, c-format
Jiang Xinef317cd2012-09-15 11:17:00 +08004282msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
Wang Sheng07432ce2013-01-30 17:23:08 +08004283msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004284
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004285#: wt-status.c:1608
Wang Sheng07432ce2013-01-30 17:23:08 +08004286#, c-format
Jiang Xinef317cd2012-09-15 11:17:00 +08004287msgid "no changes added to commit\n"
Wang Sheng07432ce2013-01-30 17:23:08 +08004288msgstr "修改尚未加入提交\n"
Jiang Xinef317cd2012-09-15 11:17:00 +08004289
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004290#: wt-status.c:1611
Wang Sheng07432ce2013-01-30 17:23:08 +08004291#, c-format
Jiang Xinef317cd2012-09-15 11:17:00 +08004292msgid ""
4293"nothing added to commit but untracked files present (use \"git add\" to "
4294"track)\n"
Wang Sheng07432ce2013-01-30 17:23:08 +08004295msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
Jiang Xinef317cd2012-09-15 11:17:00 +08004296
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004297#: wt-status.c:1614
Wang Sheng07432ce2013-01-30 17:23:08 +08004298#, c-format
Jiang Xinef317cd2012-09-15 11:17:00 +08004299msgid "nothing added to commit but untracked files present\n"
Wang Sheng07432ce2013-01-30 17:23:08 +08004300msgstr "提交为空,但是存在尚未跟踪的文件\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004301
Jiang Xin7e238ab2012-03-30 10:55:34 +08004302# 译者:中文字符串拼接,可删除前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004303#: wt-status.c:1617
Wang Sheng07432ce2013-01-30 17:23:08 +08004304#, c-format
Jiang Xinef317cd2012-09-15 11:17:00 +08004305msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
Wang Sheng07432ce2013-01-30 17:23:08 +08004306msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004307
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004308#: wt-status.c:1620 wt-status.c:1625
Wang Sheng07432ce2013-01-30 17:23:08 +08004309#, c-format
Jiang Xinef317cd2012-09-15 11:17:00 +08004310msgid "nothing to commit\n"
Wang Sheng07432ce2013-01-30 17:23:08 +08004311msgstr "无文件要提交\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004312
Jiang Xin7e238ab2012-03-30 10:55:34 +08004313# 译者:中文字符串拼接,可删除前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004314#: wt-status.c:1623
Wang Sheng07432ce2013-01-30 17:23:08 +08004315#, c-format
Jiang Xinef317cd2012-09-15 11:17:00 +08004316msgid "nothing to commit (use -u to show untracked files)\n"
Wang Sheng07432ce2013-01-30 17:23:08 +08004317msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004318
Jiang Xin7e238ab2012-03-30 10:55:34 +08004319# 译者:中文字符串拼接,可删除前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004320#: wt-status.c:1627
Wang Sheng07432ce2013-01-30 17:23:08 +08004321#, c-format
Jiang Xin5c57d762016-08-28 10:18:12 +08004322msgid "nothing to commit, working tree clean\n"
Wang Sheng07432ce2013-01-30 17:23:08 +08004323msgstr "无文件要提交,干净的工作区\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004324
Jiang Xin90e6ef52012-03-27 14:46:11 +08004325# 译者:注意保持句尾空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004326#: wt-status.c:1734
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004327msgid "Initial commit on "
4328msgstr "初始提交于 "
4329
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004330#: wt-status.c:1738
Jiang Xin94550ed2015-11-16 07:02:11 +08004331msgid "HEAD (no branch)"
4332msgstr "HEAD(非分支)"
4333
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004334#: wt-status.c:1767
Jiang Xin90314792013-09-17 23:37:05 +08004335msgid "gone"
4336msgstr "丢失"
4337
Jiang Xin90e6ef52012-03-27 14:46:11 +08004338# 译者:注意保持句尾空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004339#: wt-status.c:1769 wt-status.c:1777
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004340msgid "behind "
4341msgstr "落后 "
4342
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004343#: wt-status.c:1772 wt-status.c:1775
Jiang Xin5c0c2202016-03-16 00:27:40 +08004344msgid "ahead "
4345msgstr "领先 "
4346
Jiang Xina0b6b242016-10-27 21:53:37 +08004347#. TRANSLATORS: the action is e.g. "pull with rebase"
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004348#: wt-status.c:2277
Jiang Xina0b6b242016-10-27 21:53:37 +08004349#, c-format
4350msgid "cannot %s: You have unstaged changes."
4351msgstr "不能%s:您有未暂存的变更。"
4352
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004353#: wt-status.c:2283
Jiang Xina0b6b242016-10-27 21:53:37 +08004354msgid "additionally, your index contains uncommitted changes."
Ray Chen29004bb2016-12-28 17:08:45 +08004355msgstr "另外,您的索引中包含未提交的变更。"
Jiang Xina0b6b242016-10-27 21:53:37 +08004356
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004357#: wt-status.c:2285
Jiang Xina0b6b242016-10-27 21:53:37 +08004358#, c-format
4359msgid "cannot %s: Your index contains uncommitted changes."
4360msgstr "不能%s:您的索引中包含未提交的变更。"
4361
4362#: compat/precompose_utf8.c:57 builtin/clone.c:414
Jiang Xina77c07d2013-02-14 17:47:45 +08004363#, c-format
4364msgid "failed to unlink '%s'"
4365msgstr "无法删除 '%s'"
Jiang Xinef317cd2012-09-15 11:17:00 +08004366
Jiang Xin220c3132014-10-08 10:55:14 +08004367#: builtin/add.c:22
Jiang Xin814ff312015-02-16 21:34:19 +08004368msgid "git add [<options>] [--] <pathspec>..."
Jiang Xin160fb2b2015-08-02 21:47:30 +08004369msgstr "git add [<选项>] [--] <路径规格>..."
Jiang Xina77c07d2013-02-14 17:47:45 +08004370
Jiang Xina0b6b242016-10-27 21:53:37 +08004371#: builtin/add.c:80
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004372#, c-format
4373msgid "unexpected diff status %c"
4374msgstr "意外的差异状态 %c"
4375
Jiang Xina0b6b242016-10-27 21:53:37 +08004376#: builtin/add.c:85 builtin/commit.c:291
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004377msgid "updating files failed"
4378msgstr "更新文件失败"
4379
Jiang Xina0b6b242016-10-27 21:53:37 +08004380#: builtin/add.c:95
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004381#, c-format
4382msgid "remove '%s'\n"
4383msgstr "删除 '%s'\n"
4384
Jiang Xina0b6b242016-10-27 21:53:37 +08004385#: builtin/add.c:149
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004386msgid "Unstaged changes after refreshing the index:"
4387msgstr "刷新索引之后尚未被暂存的变更:"
4388
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004389#: builtin/add.c:209 builtin/rev-parse.c:845
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004390msgid "Could not read the index"
4391msgstr "不能读取索引"
4392
Jiang Xina0b6b242016-10-27 21:53:37 +08004393#: builtin/add.c:220
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004394#, c-format
4395msgid "Could not open '%s' for writing."
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004396msgstr "无法打开 '%s' 进行写入。"
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004397
Jiang Xina0b6b242016-10-27 21:53:37 +08004398#: builtin/add.c:224
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004399msgid "Could not write patch"
4400msgstr "不能生成补丁"
4401
Jiang Xina0b6b242016-10-27 21:53:37 +08004402#: builtin/add.c:227
Jiang Xin7aea43f2015-05-31 08:42:31 +08004403msgid "editing patch failed"
4404msgstr "编辑补丁失败"
4405
Jiang Xina0b6b242016-10-27 21:53:37 +08004406#: builtin/add.c:230
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004407#, c-format
4408msgid "Could not stat '%s'"
4409msgstr "不能查看文件状态 '%s'"
4410
Jiang Xina0b6b242016-10-27 21:53:37 +08004411#: builtin/add.c:232
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004412msgid "Empty patch. Aborted."
4413msgstr "空补丁。异常终止。"
4414
Jiang Xina0b6b242016-10-27 21:53:37 +08004415#: builtin/add.c:237
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004416#, c-format
4417msgid "Could not apply '%s'"
4418msgstr "不能应用 '%s'"
4419
Jiang Xina0b6b242016-10-27 21:53:37 +08004420#: builtin/add.c:247
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004421msgid "The following paths are ignored by one of your .gitignore files:\n"
4422msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
4423
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004424#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123
4425#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524
4426#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004427msgid "dry run"
4428msgstr "演习"
4429
Jiang Xina0b6b242016-10-27 21:53:37 +08004430#: builtin/add.c:269
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004431msgid "interactive picking"
4432msgstr "交互式拣选"
4433
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004434#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004435msgid "select hunks interactively"
4436msgstr "交互式挑选数据块"
4437
Jiang Xina0b6b242016-10-27 21:53:37 +08004438#: builtin/add.c:271
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004439msgid "edit current diff and apply"
4440msgstr "编辑当前差异并应用"
4441
Jiang Xina0b6b242016-10-27 21:53:37 +08004442#: builtin/add.c:272
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004443msgid "allow adding otherwise ignored files"
4444msgstr "允许添加忽略的文件"
4445
Jiang Xina0b6b242016-10-27 21:53:37 +08004446#: builtin/add.c:273
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004447msgid "update tracked files"
4448msgstr "更新已跟踪的文件"
4449
Jiang Xina0b6b242016-10-27 21:53:37 +08004450#: builtin/add.c:274
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004451msgid "record only the fact that the path will be added later"
4452msgstr "只记录,该路径稍后再添加"
4453
Jiang Xina0b6b242016-10-27 21:53:37 +08004454#: builtin/add.c:275
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004455msgid "add changes from all tracked and untracked files"
4456msgstr "添加所有改变的已跟踪文件和未跟踪文件"
4457
Jiang Xina0b6b242016-10-27 21:53:37 +08004458#: builtin/add.c:278
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004459msgid "ignore paths removed in the working tree (same as --no-all)"
4460msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
4461
Jiang Xina0b6b242016-10-27 21:53:37 +08004462#: builtin/add.c:280
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004463msgid "don't add, only refresh the index"
4464msgstr "不添加,只刷新索引"
4465
Jiang Xina0b6b242016-10-27 21:53:37 +08004466#: builtin/add.c:281
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004467msgid "just skip files which cannot be added because of errors"
4468msgstr "跳过因出错不能添加的文件"
4469
Jiang Xina0b6b242016-10-27 21:53:37 +08004470#: builtin/add.c:282
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004471msgid "check if - even missing - files are ignored in dry run"
4472msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
4473
Jiang Xina0b6b242016-10-27 21:53:37 +08004474#: builtin/add.c:283 builtin/update-index.c:947
Jiang Xin5c57d762016-08-28 10:18:12 +08004475msgid "(+/-)x"
4476msgstr "(+/-)x"
4477
Jiang Xina0b6b242016-10-27 21:53:37 +08004478#: builtin/add.c:283 builtin/update-index.c:948
Jiang Xin5c57d762016-08-28 10:18:12 +08004479msgid "override the executable bit of the listed files"
4480msgstr "覆盖列表里文件的可执行位"
4481
Jiang Xina0b6b242016-10-27 21:53:37 +08004482#: builtin/add.c:305
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004483#, c-format
4484msgid "Use -f if you really want to add them.\n"
4485msgstr "使用 -f 参数如果您确实要添加它们。\n"
4486
Jiang Xina0b6b242016-10-27 21:53:37 +08004487#: builtin/add.c:312
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08004488msgid "adding files failed"
4489msgstr "添加文件失败"
4490
Jiang Xina0b6b242016-10-27 21:53:37 +08004491#: builtin/add.c:348
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004492msgid "-A and -u are mutually incompatible"
4493msgstr "-A 和 -u 选项互斥"
4494
Jiang Xina0b6b242016-10-27 21:53:37 +08004495#: builtin/add.c:355
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004496msgid "Option --ignore-missing can only be used together with --dry-run"
Jiang Xin649900b2012-08-02 11:50:59 +08004497msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004498
Jiang Xina0b6b242016-10-27 21:53:37 +08004499#: builtin/add.c:359
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004500#, c-format
Jiang Xin5c57d762016-08-28 10:18:12 +08004501msgid "--chmod param '%s' must be either -x or +x"
4502msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
4503
Jiang Xina0b6b242016-10-27 21:53:37 +08004504#: builtin/add.c:374
Jiang Xin5c57d762016-08-28 10:18:12 +08004505#, c-format
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004506msgid "Nothing specified, nothing added.\n"
Jiang Xin90e6ef52012-03-27 14:46:11 +08004507msgstr "没有指定文件,也没有文件被添加。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004508
Jiang Xina0b6b242016-10-27 21:53:37 +08004509#: builtin/add.c:375
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004510#, c-format
4511msgid "Maybe you wanted to say 'git add .'?\n"
4512msgstr "也许您想要执行 'git add .'?\n"
4513
Jiang Xina0b6b242016-10-27 21:53:37 +08004514#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
4515#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004516#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271
Jiang Xina0b6b242016-10-27 21:53:37 +08004517#: builtin/submodule--helper.c:244
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004518msgid "index file corrupt"
Jiang Xin90e6ef52012-03-27 14:46:11 +08004519msgstr "索引文件损坏"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004520
Jiang Xina0b6b242016-10-27 21:53:37 +08004521#: builtin/am.c:414
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004522msgid "could not parse author script"
4523msgstr "不能解析作者脚本"
4524
Jiang Xina0b6b242016-10-27 21:53:37 +08004525#: builtin/am.c:491
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004526#, c-format
4527msgid "'%s' was deleted by the applypatch-msg hook"
4528msgstr "'%s' 被 applypatch-msg 钩子删除"
4529
Jiang Xina0b6b242016-10-27 21:53:37 +08004530#: builtin/am.c:532
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004531#, c-format
4532msgid "Malformed input line: '%s'."
4533msgstr "非法的输入行:'%s'。"
4534
Jiang Xina0b6b242016-10-27 21:53:37 +08004535#: builtin/am.c:569
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004536#, c-format
4537msgid "Failed to copy notes from '%s' to '%s'"
4538msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
4539
Jiang Xina0b6b242016-10-27 21:53:37 +08004540#: builtin/am.c:595
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004541msgid "fseek failed"
4542msgstr "fseek 失败"
4543
Jiang Xina0b6b242016-10-27 21:53:37 +08004544#: builtin/am.c:775
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004545#, c-format
4546msgid "could not parse patch '%s'"
4547msgstr "无法解析补丁 '%s'"
4548
Jiang Xina0b6b242016-10-27 21:53:37 +08004549#: builtin/am.c:840
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004550msgid "Only one StGIT patch series can be applied at once"
4551msgstr "一次只能有一个 StGIT 补丁队列被应用"
4552
Jiang Xina0b6b242016-10-27 21:53:37 +08004553#: builtin/am.c:887
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004554msgid "invalid timestamp"
4555msgstr "无效的时间戳"
4556
Jiang Xina0b6b242016-10-27 21:53:37 +08004557#: builtin/am.c:890 builtin/am.c:898
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004558msgid "invalid Date line"
4559msgstr "无效的日期行"
4560
Jiang Xina0b6b242016-10-27 21:53:37 +08004561#: builtin/am.c:895
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004562msgid "invalid timezone offset"
4563msgstr "无效的时区偏移值"
4564
Jiang Xina0b6b242016-10-27 21:53:37 +08004565#: builtin/am.c:984
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004566msgid "Patch format detection failed."
4567msgstr "补丁格式检测失败。"
4568
Jiang Xina0b6b242016-10-27 21:53:37 +08004569#: builtin/am.c:989 builtin/clone.c:379
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004570#, c-format
4571msgid "failed to create directory '%s'"
4572msgstr "无法创建目录 '%s'"
4573
Jiang Xina0b6b242016-10-27 21:53:37 +08004574#: builtin/am.c:993
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004575msgid "Failed to split patches."
4576msgstr "无法拆分补丁。"
4577
Jiang Xina0b6b242016-10-27 21:53:37 +08004578#: builtin/am.c:1125 builtin/commit.c:376
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004579msgid "unable to write index file"
4580msgstr "无法写入索引文件"
4581
Jiang Xina0b6b242016-10-27 21:53:37 +08004582#: builtin/am.c:1176
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004583#, c-format
4584msgid "When you have resolved this problem, run \"%s --continue\"."
4585msgstr "当您解决这一问题,执行 \"%s --continue\"。"
4586
Jiang Xina0b6b242016-10-27 21:53:37 +08004587#: builtin/am.c:1177
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004588#, c-format
4589msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
4590msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
4591
Jiang Xina0b6b242016-10-27 21:53:37 +08004592#: builtin/am.c:1178
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004593#, c-format
4594msgid "To restore the original branch and stop patching, run \"%s --abort\"."
4595msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
4596
Jiang Xina0b6b242016-10-27 21:53:37 +08004597#: builtin/am.c:1316
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004598msgid "Patch is empty. Was it split wrong?"
4599msgstr "补丁为空。是不是切分错误?"
4600
Jiang Xina0b6b242016-10-27 21:53:37 +08004601#: builtin/am.c:1390 builtin/log.c:1550
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004602#, c-format
4603msgid "invalid ident line: %s"
4604msgstr "包含无效的身份标识:%s"
4605
Jiang Xina0b6b242016-10-27 21:53:37 +08004606#: builtin/am.c:1417
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004607#, c-format
4608msgid "unable to parse commit %s"
4609msgstr "不能解析提交 %s"
4610
Jiang Xina0b6b242016-10-27 21:53:37 +08004611#: builtin/am.c:1610
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004612msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4613msgstr "仓库缺乏必要的数据对象以进行三方合并。"
4614
Jiang Xina0b6b242016-10-27 21:53:37 +08004615#: builtin/am.c:1612
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004616msgid "Using index info to reconstruct a base tree..."
4617msgstr "使用索引来重建一个(三方合并的)基础目录树..."
4618
Jiang Xina0b6b242016-10-27 21:53:37 +08004619#: builtin/am.c:1631
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004620msgid ""
4621"Did you hand edit your patch?\n"
4622"It does not apply to blobs recorded in its index."
4623msgstr ""
4624"您是否曾手动编辑过您的补丁?\n"
4625"无法应用补丁到索引中的数据对象上。"
4626
Jiang Xina0b6b242016-10-27 21:53:37 +08004627#: builtin/am.c:1637
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004628msgid "Falling back to patching base and 3-way merge..."
4629msgstr "回落到基础版本上打补丁及进行三方合并..."
4630
Jiang Xina0b6b242016-10-27 21:53:37 +08004631#: builtin/am.c:1662
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004632msgid "Failed to merge in the changes."
4633msgstr "无法合并变更。"
4634
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004635#: builtin/am.c:1686 builtin/merge.c:632
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004636msgid "git write-tree failed to write a tree"
4637msgstr "git write-tree 无法写入一树对象"
4638
Jiang Xina0b6b242016-10-27 21:53:37 +08004639#: builtin/am.c:1693
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004640msgid "applying to an empty history"
4641msgstr "正应用到一个空历史上"
4642
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004643#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
4644#: builtin/merge.c:827
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004645msgid "failed to write commit object"
4646msgstr "无法写提交对象"
4647
Jiang Xina0b6b242016-10-27 21:53:37 +08004648#: builtin/am.c:1739 builtin/am.c:1743
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004649#, c-format
4650msgid "cannot resume: %s does not exist."
4651msgstr "无法继续:%s 不存在。"
4652
Jiang Xina0b6b242016-10-27 21:53:37 +08004653#: builtin/am.c:1759
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004654msgid "cannot be interactive without stdin connected to a terminal."
4655msgstr "标准输入没有和终端关联,不能进行交互式操作。"
4656
Jiang Xina0b6b242016-10-27 21:53:37 +08004657#: builtin/am.c:1764
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004658msgid "Commit Body is:"
4659msgstr "提交内容为:"
4660
4661# 译者:注意保持句尾空格
4662#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
4663#. in your translation. The program will only accept English
4664#. input at this point.
4665#.
Jiang Xina0b6b242016-10-27 21:53:37 +08004666#: builtin/am.c:1774
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004667msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
4668msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
4669
Jiang Xina0b6b242016-10-27 21:53:37 +08004670#: builtin/am.c:1824
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004671#, c-format
4672msgid "Dirty index: cannot apply patches (dirty: %s)"
4673msgstr "脏索引:不能应用补丁(脏文件:%s)"
4674
Jiang Xina0b6b242016-10-27 21:53:37 +08004675#: builtin/am.c:1861 builtin/am.c:1933
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004676#, c-format
4677msgid "Applying: %.*s"
4678msgstr "应用:%.*s"
4679
Jiang Xina0b6b242016-10-27 21:53:37 +08004680#: builtin/am.c:1877
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004681msgid "No changes -- Patch already applied."
4682msgstr "没有变更 —— 补丁已经应用过。"
4683
Jiang Xina0b6b242016-10-27 21:53:37 +08004684#: builtin/am.c:1885
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004685#, c-format
4686msgid "Patch failed at %s %.*s"
4687msgstr "打补丁失败于 %s %.*s"
4688
Jiang Xina0b6b242016-10-27 21:53:37 +08004689#: builtin/am.c:1891
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004690#, c-format
4691msgid "The copy of the patch that failed is found in: %s"
4692msgstr "失败的补丁文件副本位于:%s"
4693
Jiang Xina0b6b242016-10-27 21:53:37 +08004694#: builtin/am.c:1936
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004695msgid ""
4696"No changes - did you forget to use 'git add'?\n"
4697"If there is nothing left to stage, chances are that something else\n"
4698"already introduced the same changes; you might want to skip this patch."
4699msgstr ""
4700"没有变更 —— 您是不是忘了执行 'git add'?\n"
4701"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
4702"您也许想要跳过这个补丁。"
4703
Jiang Xina0b6b242016-10-27 21:53:37 +08004704#: builtin/am.c:1943
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004705msgid ""
4706"You still have unmerged paths in your index.\n"
4707"Did you forget to use 'git add'?"
4708msgstr ""
4709"您的索引中仍有未合并的路径。\n"
4710"您是否忘了执行 'git add'?"
4711
Jiang Xina0b6b242016-10-27 21:53:37 +08004712#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004713#: builtin/reset.c:316
4714#, c-format
4715msgid "Could not parse object '%s'."
4716msgstr "不能解析对象 '%s'。"
4717
Jiang Xina0b6b242016-10-27 21:53:37 +08004718#: builtin/am.c:2103
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004719msgid "failed to clean index"
4720msgstr "无法清空索引"
4721
Jiang Xina0b6b242016-10-27 21:53:37 +08004722#: builtin/am.c:2137
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004723msgid ""
4724"You seem to have moved HEAD since the last 'am' failure.\n"
4725"Not rewinding to ORIG_HEAD"
4726msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
4727
Jiang Xina0b6b242016-10-27 21:53:37 +08004728#: builtin/am.c:2200
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004729#, c-format
4730msgid "Invalid value for --patch-format: %s"
4731msgstr "无效的 --patch-format 值:%s"
4732
Jiang Xina0b6b242016-10-27 21:53:37 +08004733#: builtin/am.c:2233
4734msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
4735msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004736
Jiang Xina0b6b242016-10-27 21:53:37 +08004737#: builtin/am.c:2234
Jiang Xin94550ed2015-11-16 07:02:11 +08004738msgid "git am [<options>] (--continue | --skip | --abort)"
4739msgstr "git am [<选项>] (--continue | --skip | --abort)"
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004740
Jiang Xina0b6b242016-10-27 21:53:37 +08004741#: builtin/am.c:2240
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004742msgid "run interactively"
4743msgstr "以交互式方式运行"
4744
Jiang Xina0b6b242016-10-27 21:53:37 +08004745#: builtin/am.c:2242
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004746msgid "historical option -- no-op"
4747msgstr "老的参数 —— 无作用"
4748
Jiang Xina0b6b242016-10-27 21:53:37 +08004749#: builtin/am.c:2244
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004750msgid "allow fall back on 3way merging if needed"
4751msgstr "如果必要,允许使用三方合并。"
4752
Jiang Xina0b6b242016-10-27 21:53:37 +08004753#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004754#: builtin/repack.c:178
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004755msgid "be quiet"
4756msgstr "静默模式"
4757
Jiang Xina0b6b242016-10-27 21:53:37 +08004758#: builtin/am.c:2247
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004759msgid "add a Signed-off-by line to the commit message"
4760msgstr "在提交说明中添加一个 Signed-off-by 签名"
4761
Jiang Xina0b6b242016-10-27 21:53:37 +08004762#: builtin/am.c:2250
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004763msgid "recode into utf8 (default)"
4764msgstr "使用 utf8 字符集(默认)"
4765
Jiang Xina0b6b242016-10-27 21:53:37 +08004766#: builtin/am.c:2252
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004767msgid "pass -k flag to git-mailinfo"
4768msgstr "向 git-mailinfo 传递 -k 参数"
4769
Jiang Xina0b6b242016-10-27 21:53:37 +08004770#: builtin/am.c:2254
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004771msgid "pass -b flag to git-mailinfo"
4772msgstr "向 git-mailinfo 传递 -b 参数"
4773
Jiang Xina0b6b242016-10-27 21:53:37 +08004774#: builtin/am.c:2256
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004775msgid "pass -m flag to git-mailinfo"
4776msgstr "向 git-mailinfo 传递 -m 参数"
4777
Jiang Xina0b6b242016-10-27 21:53:37 +08004778#: builtin/am.c:2258
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004779msgid "pass --keep-cr flag to git-mailsplit for mbox format"
4780msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
4781
Jiang Xina0b6b242016-10-27 21:53:37 +08004782#: builtin/am.c:2261
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004783msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
4784msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
4785
Jiang Xina0b6b242016-10-27 21:53:37 +08004786#: builtin/am.c:2264
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004787msgid "strip everything before a scissors line"
4788msgstr "丢弃裁切线前的所有内容"
4789
Jiang Xina0b6b242016-10-27 21:53:37 +08004790#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
4791#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
4792#: builtin/am.c:2293
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004793msgid "pass it through git-apply"
4794msgstr "传递给 git-apply"
4795
Jiang Xina0b6b242016-10-27 21:53:37 +08004796#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004797#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135
4798#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
4799#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355
Jiang Xina0b6b242016-10-27 21:53:37 +08004800#: parse-options.h:132 parse-options.h:134 parse-options.h:245
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004801msgid "n"
4802msgstr "n"
4803
Jiang Xina0b6b242016-10-27 21:53:37 +08004804#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004805#: builtin/tag.c:387 builtin/verify-tag.c:38
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004806msgid "format"
4807msgstr "格式"
4808
Jiang Xina0b6b242016-10-27 21:53:37 +08004809#: builtin/am.c:2290
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004810msgid "format the patch(es) are in"
4811msgstr "补丁的格式"
4812
Jiang Xina0b6b242016-10-27 21:53:37 +08004813#: builtin/am.c:2296
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004814msgid "override error message when patch failure occurs"
4815msgstr "打补丁失败时显示的错误信息"
4816
Jiang Xina0b6b242016-10-27 21:53:37 +08004817#: builtin/am.c:2298
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004818msgid "continue applying patches after resolving a conflict"
4819msgstr "冲突解决后继续应用补丁"
4820
Jiang Xina0b6b242016-10-27 21:53:37 +08004821#: builtin/am.c:2301
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004822msgid "synonyms for --continue"
4823msgstr "和 --continue 同义"
4824
Jiang Xina0b6b242016-10-27 21:53:37 +08004825#: builtin/am.c:2304
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004826msgid "skip the current patch"
4827msgstr "跳过当前补丁"
4828
Jiang Xina0b6b242016-10-27 21:53:37 +08004829#: builtin/am.c:2307
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004830msgid "restore the original branch and abort the patching operation."
4831msgstr "恢复原始分支并终止打补丁操作。"
4832
Jiang Xina0b6b242016-10-27 21:53:37 +08004833#: builtin/am.c:2311
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004834msgid "lie about committer date"
4835msgstr "将作者日期作为提交日期"
4836
Jiang Xina0b6b242016-10-27 21:53:37 +08004837#: builtin/am.c:2313
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004838msgid "use current timestamp for author date"
4839msgstr "用当前时间作为作者日期"
4840
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004841#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233
4842#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004843msgid "key-id"
4844msgstr "key-id"
4845
Jiang Xina0b6b242016-10-27 21:53:37 +08004846#: builtin/am.c:2316
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004847msgid "GPG-sign commits"
4848msgstr "使用 GPG 签名提交"
4849
Jiang Xina0b6b242016-10-27 21:53:37 +08004850#: builtin/am.c:2319
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004851msgid "(internal use for git-rebase)"
4852msgstr "(内部使用,用于 git-rebase)"
4853
Jiang Xina0b6b242016-10-27 21:53:37 +08004854#: builtin/am.c:2334
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004855msgid ""
4856"The -b/--binary option has been a no-op for long time, and\n"
4857"it will be removed. Please do not use it anymore."
4858msgstr ""
4859"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
4860"请不要再使用它了。"
4861
Jiang Xina0b6b242016-10-27 21:53:37 +08004862#: builtin/am.c:2341
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004863msgid "failed to read the index"
4864msgstr "无法读取索引"
4865
Jiang Xina0b6b242016-10-27 21:53:37 +08004866#: builtin/am.c:2356
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004867#, c-format
4868msgid "previous rebase directory %s still exists but mbox given."
4869msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
4870
Jiang Xina0b6b242016-10-27 21:53:37 +08004871#: builtin/am.c:2380
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004872#, c-format
4873msgid ""
4874"Stray %s directory found.\n"
4875"Use \"git am --abort\" to remove it."
4876msgstr ""
4877"发现了错误的 %s 目录。\n"
4878"使用 \"git am --abort\" 删除它。"
4879
Jiang Xina0b6b242016-10-27 21:53:37 +08004880#: builtin/am.c:2386
Jiang Xin1b7f4a32015-08-23 15:23:21 +08004881msgid "Resolve operation not in progress, we are not resuming."
4882msgstr "解决操作未进行,我们不会继续。"
4883
Jiang Xina0b6b242016-10-27 21:53:37 +08004884#: builtin/apply.c:8
Jiang Xin814ff312015-02-16 21:34:19 +08004885msgid "git apply [<options>] [<patch>...]"
4886msgstr "git apply [<选项>] [<补丁>...]"
Jiang Xin8ada9592012-05-21 09:35:47 +08004887
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004888#: builtin/archive.c:17
4889#, c-format
4890msgid "could not create archive file '%s'"
Jiang Xin90e6ef52012-03-27 14:46:11 +08004891msgstr "不能创建归档文件 '%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004892
4893#: builtin/archive.c:20
4894msgid "could not redirect output"
Thynson195febd2012-08-07 17:39:30 +08004895msgstr "不能重定向输出"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004896
4897#: builtin/archive.c:37
4898msgid "git archive: Remote with no URL"
Ray Chen4375c102015-08-10 18:03:29 +08004899msgstr "git archive:未提供远程 URL"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004900
4901#: builtin/archive.c:58
4902msgid "git archive: expected ACK/NAK, got EOF"
Ray Chen4375c102015-08-10 18:03:29 +08004903msgstr "git archive:应为 ACK/NACK,却得到 EOF"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004904
Jiang Xin1003b3a2013-04-11 17:55:09 +08004905#: builtin/archive.c:61
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004906#, c-format
4907msgid "git archive: NACK %s"
Jiang Xin90e6ef52012-03-27 14:46:11 +08004908msgstr "git archive:NACK %s"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004909
Jiang Xin1003b3a2013-04-11 17:55:09 +08004910#: builtin/archive.c:63
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004911#, c-format
4912msgid "remote error: %s"
4913msgstr "远程错误:%s"
4914
Jiang Xin1003b3a2013-04-11 17:55:09 +08004915#: builtin/archive.c:64
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004916msgid "git archive: protocol error"
Jiang Xin90e6ef52012-03-27 14:46:11 +08004917msgstr "git archive:协议错误"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004918
Jiang Xin1003b3a2013-04-11 17:55:09 +08004919#: builtin/archive.c:68
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004920msgid "git archive: expected a flush"
Jiang Xina0b6b242016-10-27 21:53:37 +08004921msgstr "git archive:应有一个 flush 刷新"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08004922
Jiang Xinef317cd2012-09-15 11:17:00 +08004923#: builtin/bisect--helper.c:7
4924msgid "git bisect--helper --next-all [--no-checkout]"
Wang Sheng07432ce2013-01-30 17:23:08 +08004925msgstr "git bisect--helper --next-all [--no-checkout]"
Jiang Xinef317cd2012-09-15 11:17:00 +08004926
4927#: builtin/bisect--helper.c:17
4928msgid "perform 'git bisect next'"
Wang Sheng07432ce2013-01-30 17:23:08 +08004929msgstr "执行 'git bisect next'"
Jiang Xinef317cd2012-09-15 11:17:00 +08004930
4931#: builtin/bisect--helper.c:19
4932msgid "update BISECT_HEAD instead of checking out the current commit"
Wang Sheng07432ce2013-01-30 17:23:08 +08004933msgstr "更新 BISECT_HEAD 而非检出当前提交"
Jiang Xinef317cd2012-09-15 11:17:00 +08004934
Jiang Xin276ceea2016-02-28 20:35:55 +08004935#: builtin/blame.c:33
Jiang Xin7aea43f2015-05-31 08:42:31 +08004936msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
4937msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
Jiang Xinef317cd2012-09-15 11:17:00 +08004938
Jiang Xin276ceea2016-02-28 20:35:55 +08004939#: builtin/blame.c:38
Jiang Xin814ff312015-02-16 21:34:19 +08004940msgid "<rev-opts> are documented in git-rev-list(1)"
4941msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
Jiang Xinef317cd2012-09-15 11:17:00 +08004942
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004943#: builtin/blame.c:1786
Jiang Xin276ceea2016-02-28 20:35:55 +08004944msgid "Blaming lines"
4945msgstr "追踪代码行"
4946
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004947#: builtin/blame.c:2582
Jiang Xinef317cd2012-09-15 11:17:00 +08004948msgid "Show blame entries as we find them, incrementally"
Wang Sheng07432ce2013-01-30 17:23:08 +08004949msgstr "增量式地显示发现的 blame 条目"
Jiang Xinef317cd2012-09-15 11:17:00 +08004950
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004951#: builtin/blame.c:2583
Jiang Xinef317cd2012-09-15 11:17:00 +08004952msgid "Show blank SHA-1 for boundary commits (Default: off)"
Wang Sheng07432ce2013-01-30 17:23:08 +08004953msgstr "边界提交显示空的 SHA-1(默认:关闭)"
Jiang Xinef317cd2012-09-15 11:17:00 +08004954
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004955#: builtin/blame.c:2584
Jiang Xinef317cd2012-09-15 11:17:00 +08004956msgid "Do not treat root commits as boundaries (Default: off)"
Wang Sheng07432ce2013-01-30 17:23:08 +08004957msgstr "不把根提交作为边界(默认:关闭)"
Jiang Xinef317cd2012-09-15 11:17:00 +08004958
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004959#: builtin/blame.c:2585
Jiang Xinef317cd2012-09-15 11:17:00 +08004960msgid "Show work cost statistics"
Wang Sheng07432ce2013-01-30 17:23:08 +08004961msgstr "显示命令消耗统计"
Jiang Xinef317cd2012-09-15 11:17:00 +08004962
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004963#: builtin/blame.c:2586
Jiang Xin276ceea2016-02-28 20:35:55 +08004964msgid "Force progress reporting"
4965msgstr "强制进度显示"
4966
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004967#: builtin/blame.c:2587
Jiang Xinef317cd2012-09-15 11:17:00 +08004968msgid "Show output score for blame entries"
Wang Sheng07432ce2013-01-30 17:23:08 +08004969msgstr "显示判断 blame 条目位移的得分诊断信息"
Jiang Xinef317cd2012-09-15 11:17:00 +08004970
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004971#: builtin/blame.c:2588
Jiang Xinef317cd2012-09-15 11:17:00 +08004972msgid "Show original filename (Default: auto)"
Wang Sheng07432ce2013-01-30 17:23:08 +08004973msgstr "显示原始文件名(默认:自动)"
Jiang Xinef317cd2012-09-15 11:17:00 +08004974
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004975#: builtin/blame.c:2589
Jiang Xinef317cd2012-09-15 11:17:00 +08004976msgid "Show original linenumber (Default: off)"
Wang Sheng07432ce2013-01-30 17:23:08 +08004977msgstr "显示原始的行号(默认:关闭)"
Jiang Xinef317cd2012-09-15 11:17:00 +08004978
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004979#: builtin/blame.c:2590
Jiang Xinef317cd2012-09-15 11:17:00 +08004980msgid "Show in a format designed for machine consumption"
Wang Sheng07432ce2013-01-30 17:23:08 +08004981msgstr "显示为一个适合机器读取的格式"
Jiang Xinef317cd2012-09-15 11:17:00 +08004982
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004983#: builtin/blame.c:2591
Jiang Xinef317cd2012-09-15 11:17:00 +08004984msgid "Show porcelain format with per-line commit information"
Wang Sheng07432ce2013-01-30 17:23:08 +08004985msgstr "为每一行显示机器适用的提交信息"
Jiang Xinef317cd2012-09-15 11:17:00 +08004986
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004987#: builtin/blame.c:2592
Jiang Xinef317cd2012-09-15 11:17:00 +08004988msgid "Use the same output mode as git-annotate (Default: off)"
Wang Sheng07432ce2013-01-30 17:23:08 +08004989msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
Jiang Xinef317cd2012-09-15 11:17:00 +08004990
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004991#: builtin/blame.c:2593
Jiang Xinef317cd2012-09-15 11:17:00 +08004992msgid "Show raw timestamp (Default: off)"
Wang Sheng07432ce2013-01-30 17:23:08 +08004993msgstr "显示原始时间戳(默认:关闭)"
Jiang Xinef317cd2012-09-15 11:17:00 +08004994
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004995#: builtin/blame.c:2594
Jiang Xinef317cd2012-09-15 11:17:00 +08004996msgid "Show long commit SHA1 (Default: off)"
Ray Chen4375c102015-08-10 18:03:29 +08004997msgstr "显示长的 SHA1 提交号(默认:关闭)"
Jiang Xinef317cd2012-09-15 11:17:00 +08004998
Jiang Xin1a79b2f2017-01-27 22:50:57 +08004999#: builtin/blame.c:2595
Jiang Xinef317cd2012-09-15 11:17:00 +08005000msgid "Suppress author name and timestamp (Default: off)"
Wang Sheng07432ce2013-01-30 17:23:08 +08005001msgstr "隐藏作者名字和时间戳(默认:关闭)"
Jiang Xinef317cd2012-09-15 11:17:00 +08005002
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005003#: builtin/blame.c:2596
Jiang Xinef317cd2012-09-15 11:17:00 +08005004msgid "Show author email instead of name (Default: off)"
Wang Sheng07432ce2013-01-30 17:23:08 +08005005msgstr "显示作者的邮箱而不是名字(默认:关闭)"
Jiang Xinef317cd2012-09-15 11:17:00 +08005006
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005007#: builtin/blame.c:2597
Jiang Xinef317cd2012-09-15 11:17:00 +08005008msgid "Ignore whitespace differences"
Wang Sheng07432ce2013-01-30 17:23:08 +08005009msgstr "忽略空白差异"
Jiang Xinef317cd2012-09-15 11:17:00 +08005010
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005011#: builtin/blame.c:2604
5012msgid "Use an experimental heuristic to improve diffs"
5013msgstr "使用一个试验性的启发式算法改进差异显示"
Jiang Xina0b6b242016-10-27 21:53:37 +08005014
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005015#: builtin/blame.c:2606
Jiang Xinef317cd2012-09-15 11:17:00 +08005016msgid "Spend extra cycles to find better match"
Wang Sheng07432ce2013-01-30 17:23:08 +08005017msgstr "花费额外的循环来找到更好的匹配"
Jiang Xinef317cd2012-09-15 11:17:00 +08005018
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005019#: builtin/blame.c:2607
Jiang Xinef317cd2012-09-15 11:17:00 +08005020msgid "Use revisions from <file> instead of calling git-rev-list"
Jiang Xind9d56b22015-01-18 20:37:57 +08005021msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
Jiang Xinef317cd2012-09-15 11:17:00 +08005022
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005023#: builtin/blame.c:2608
Jiang Xinef317cd2012-09-15 11:17:00 +08005024msgid "Use <file>'s contents as the final image"
Jiang Xind9d56b22015-01-18 20:37:57 +08005025msgstr "使用 <文件> 的内容作为最终的图片"
Jiang Xinef317cd2012-09-15 11:17:00 +08005026
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005027#: builtin/blame.c:2609 builtin/blame.c:2610
Jiang Xinef317cd2012-09-15 11:17:00 +08005028msgid "score"
Wang Sheng07432ce2013-01-30 17:23:08 +08005029msgstr "得分"
Jiang Xinef317cd2012-09-15 11:17:00 +08005030
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005031#: builtin/blame.c:2609
Jiang Xinef317cd2012-09-15 11:17:00 +08005032msgid "Find line copies within and across files"
Wang Sheng07432ce2013-01-30 17:23:08 +08005033msgstr "找到文件内及跨文件的行拷贝"
Jiang Xinef317cd2012-09-15 11:17:00 +08005034
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005035#: builtin/blame.c:2610
Jiang Xinef317cd2012-09-15 11:17:00 +08005036msgid "Find line movements within and across files"
Wang Sheng07432ce2013-01-30 17:23:08 +08005037msgstr "找到文件内及跨文件的行移动"
Jiang Xinef317cd2012-09-15 11:17:00 +08005038
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005039#: builtin/blame.c:2611
Jiang Xinef317cd2012-09-15 11:17:00 +08005040msgid "n,m"
Wang Sheng07432ce2013-01-30 17:23:08 +08005041msgstr "n,m"
Jiang Xinef317cd2012-09-15 11:17:00 +08005042
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005043#: builtin/blame.c:2611
Jiang Xinef317cd2012-09-15 11:17:00 +08005044msgid "Process only line range n,m, counting from 1"
Wang Sheng07432ce2013-01-30 17:23:08 +08005045msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
Jiang Xinef317cd2012-09-15 11:17:00 +08005046
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005047#: builtin/blame.c:2658
Jiang Xina0b6b242016-10-27 21:53:37 +08005048msgid "--progress can't be used with --incremental or porcelain formats"
5049msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
5050
Jiang Xin6c94aba2014-03-13 12:41:34 +08005051#. TRANSLATORS: This string is used to tell us the maximum
5052#. display width for a relative timestamp in "git blame"
5053#. output. For C locale, "4 years, 11 months ago", which
5054#. takes 22 places, is the longest among various forms of
5055#. relative timestamps, but your language may need more or
5056#. fewer display columns.
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005057#: builtin/blame.c:2706
Jiang Xin6c94aba2014-03-13 12:41:34 +08005058msgid "4 years, 11 months ago"
5059msgstr "4 年 11 个月前"
5060
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005061#: builtin/blame.c:2786
Jiang Xina0b6b242016-10-27 21:53:37 +08005062msgid "--contents and --reverse do not blend well."
5063msgstr "--contents 和 --reverse 不能混用。"
5064
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005065#: builtin/blame.c:2806
Jiang Xina0b6b242016-10-27 21:53:37 +08005066msgid "cannot use --contents with final commit object name"
5067msgstr "不能将 --contents 和最终的提交对象名共用"
5068
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005069#: builtin/blame.c:2811
Jiang Xina0b6b242016-10-27 21:53:37 +08005070msgid "--reverse and --first-parent together require specified latest commit"
5071msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
5072
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005073#: builtin/blame.c:2838
Jiang Xina0b6b242016-10-27 21:53:37 +08005074msgid ""
5075"--reverse --first-parent together require range along first-parent chain"
5076msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
5077
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005078#: builtin/blame.c:2849
Jiang Xina0b6b242016-10-27 21:53:37 +08005079#, c-format
5080msgid "no such path %s in %s"
5081msgstr "在 %2$s 中无此路径 %1$s"
5082
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005083#: builtin/blame.c:2860
Jiang Xina0b6b242016-10-27 21:53:37 +08005084#, c-format
5085msgid "cannot read blob %s for path %s"
Ray Chen29004bb2016-12-28 17:08:45 +08005086msgstr "不能为路径 %2$s 读取数据对象 %1$s"
Jiang Xina0b6b242016-10-27 21:53:37 +08005087
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005088#: builtin/blame.c:2879
Jiang Xina0b6b242016-10-27 21:53:37 +08005089#, c-format
5090msgid "file %s has only %lu line"
5091msgid_plural "file %s has only %lu lines"
5092msgstr[0] "文件 %s 只有 %lu 行"
5093msgstr[1] "文件 %s 只有 %lu 行"
5094
Jiang Xin5b04ee32016-05-29 20:40:35 +08005095#: builtin/branch.c:26
Jiang Xin814ff312015-02-16 21:34:19 +08005096msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
5097msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
Jiang Xinef317cd2012-09-15 11:17:00 +08005098
Jiang Xin5b04ee32016-05-29 20:40:35 +08005099#: builtin/branch.c:27
Jiang Xin814ff312015-02-16 21:34:19 +08005100msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
5101msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
Jiang Xinef317cd2012-09-15 11:17:00 +08005102
Jiang Xin5b04ee32016-05-29 20:40:35 +08005103#: builtin/branch.c:28
Jiang Xin814ff312015-02-16 21:34:19 +08005104msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
5105msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
Jiang Xinef317cd2012-09-15 11:17:00 +08005106
Jiang Xin5b04ee32016-05-29 20:40:35 +08005107#: builtin/branch.c:29
Jiang Xin814ff312015-02-16 21:34:19 +08005108msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
5109msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
Jiang Xinef317cd2012-09-15 11:17:00 +08005110
Jiang Xin5b04ee32016-05-29 20:40:35 +08005111#: builtin/branch.c:30
Jiang Xin94550ed2015-11-16 07:02:11 +08005112msgid "git branch [<options>] [-r | -a] [--points-at]"
5113msgstr "git branch [<选项>] [-r | -a] [--points-at]"
5114
Jiang Xin90e6ef52012-03-27 14:46:11 +08005115# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
Jiang Xin5b04ee32016-05-29 20:40:35 +08005116#: builtin/branch.c:143
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005117#, c-format
5118msgid ""
5119"deleting branch '%s' that has been merged to\n"
5120" '%s', but not yet merged to HEAD."
5121msgstr ""
Thynson70fc47b2012-02-29 01:58:30 +08005122"将要删除的分支 '%s' 已经被合并到\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005123" '%s',但未合并到 HEAD。"
5124
Jiang Xin90e6ef52012-03-27 14:46:11 +08005125# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
Jiang Xin5b04ee32016-05-29 20:40:35 +08005126#: builtin/branch.c:147
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005127#, c-format
5128msgid ""
5129"not deleting branch '%s' that is not yet merged to\n"
5130" '%s', even though it is merged to HEAD."
5131msgstr ""
Thynson70fc47b2012-02-29 01:58:30 +08005132"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
5133" 然而却尚未被合并到分支 '%s' 。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005134
Jiang Xin5b04ee32016-05-29 20:40:35 +08005135#: builtin/branch.c:161
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005136#, c-format
5137msgid "Couldn't look up commit object for '%s'"
5138msgstr "无法查询 '%s' 指向的提交对象"
5139
Jiang Xin5b04ee32016-05-29 20:40:35 +08005140#: builtin/branch.c:165
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005141#, c-format
5142msgid ""
5143"The branch '%s' is not fully merged.\n"
5144"If you are sure you want to delete it, run 'git branch -D %s'."
5145msgstr ""
5146"分支 '%s' 没有完全合并。\n"
5147"如果您确认要删除它,执行 'git branch -D %s'。"
5148
Jiang Xin5b04ee32016-05-29 20:40:35 +08005149#: builtin/branch.c:178
Wang Sheng07432ce2013-01-30 17:23:08 +08005150msgid "Update of config-file failed"
5151msgstr "无法更新 config 文件"
5152
Jiang Xin5b04ee32016-05-29 20:40:35 +08005153#: builtin/branch.c:206
Wang Sheng07432ce2013-01-30 17:23:08 +08005154msgid "cannot use -a with -d"
5155msgstr "不能将 -a 和 -d 同时使用"
5156
Jiang Xin5b04ee32016-05-29 20:40:35 +08005157#: builtin/branch.c:212
Wang Sheng07432ce2013-01-30 17:23:08 +08005158msgid "Couldn't look up commit object for HEAD"
5159msgstr "无法查询 HEAD 指向的提交对象"
5160
Jiang Xin5b04ee32016-05-29 20:40:35 +08005161#: builtin/branch.c:226
Wang Sheng07432ce2013-01-30 17:23:08 +08005162#, c-format
Jiang Xin5b04ee32016-05-29 20:40:35 +08005163msgid "Cannot delete branch '%s' checked out at '%s'"
5164msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
Wang Sheng07432ce2013-01-30 17:23:08 +08005165
Jiang Xin5b04ee32016-05-29 20:40:35 +08005166#: builtin/branch.c:241
Wang Sheng07432ce2013-01-30 17:23:08 +08005167#, c-format
Jiang Xin7aea43f2015-05-31 08:42:31 +08005168msgid "remote-tracking branch '%s' not found."
5169msgstr "未能找到远程跟踪分支 '%s'。"
Wang Sheng07432ce2013-01-30 17:23:08 +08005170
Jiang Xin5b04ee32016-05-29 20:40:35 +08005171#: builtin/branch.c:242
Wang Sheng07432ce2013-01-30 17:23:08 +08005172#, c-format
5173msgid "branch '%s' not found."
5174msgstr "分支 '%s' 未发现。"
5175
Jiang Xin5b04ee32016-05-29 20:40:35 +08005176#: builtin/branch.c:257
Jiang Xin81809b92012-05-30 12:19:47 +08005177#, c-format
Jiang Xin7aea43f2015-05-31 08:42:31 +08005178msgid "Error deleting remote-tracking branch '%s'"
5179msgstr "无法删除远程跟踪分支 '%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005180
Jiang Xin5b04ee32016-05-29 20:40:35 +08005181#: builtin/branch.c:258
Jiang Xin81809b92012-05-30 12:19:47 +08005182#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08005183msgid "Error deleting branch '%s'"
Jiang Xin7aea43f2015-05-31 08:42:31 +08005184msgstr "无法删除分支 '%s'"
Jiang Xin8ada9592012-05-21 09:35:47 +08005185
Jiang Xin5b04ee32016-05-29 20:40:35 +08005186#: builtin/branch.c:265
Jiang Xin81809b92012-05-30 12:19:47 +08005187#, c-format
Jiang Xin7aea43f2015-05-31 08:42:31 +08005188msgid "Deleted remote-tracking branch %s (was %s).\n"
5189msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005190
Jiang Xin5b04ee32016-05-29 20:40:35 +08005191#: builtin/branch.c:266
Jiang Xin81809b92012-05-30 12:19:47 +08005192#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08005193msgid "Deleted branch %s (was %s).\n"
Jiang Xin81809b92012-05-30 12:19:47 +08005194msgstr "已删除分支 %s(曾为 %s)。\n"
Jiang Xin8ada9592012-05-21 09:35:47 +08005195
Jiang Xin5c57d762016-08-28 10:18:12 +08005196#: builtin/branch.c:312
Jiang Xin81809b92012-05-30 12:19:47 +08005197#, c-format
Jiang Xin90314792013-09-17 23:37:05 +08005198msgid "[%s: gone]"
5199msgstr "[%s: 丢失]"
5200
Jiang Xin5c57d762016-08-28 10:18:12 +08005201#: builtin/branch.c:317
Jiang Xin90314792013-09-17 23:37:05 +08005202#, c-format
5203msgid "[%s]"
5204msgstr "[%s]"
5205
Jiang Xin5c57d762016-08-28 10:18:12 +08005206#: builtin/branch.c:322
Jiang Xin90314792013-09-17 23:37:05 +08005207#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08005208msgid "[%s: behind %d]"
Jiang Xin81809b92012-05-30 12:19:47 +08005209msgstr "[%s:落后 %d]"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005210
Jiang Xin5c57d762016-08-28 10:18:12 +08005211#: builtin/branch.c:324
Jiang Xin81809b92012-05-30 12:19:47 +08005212#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08005213msgid "[behind %d]"
Jiang Xin81809b92012-05-30 12:19:47 +08005214msgstr "[落后 %d]"
Jiang Xin8ada9592012-05-21 09:35:47 +08005215
Jiang Xin5c57d762016-08-28 10:18:12 +08005216#: builtin/branch.c:328
Jiang Xin81809b92012-05-30 12:19:47 +08005217#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08005218msgid "[%s: ahead %d]"
Jiang Xin81809b92012-05-30 12:19:47 +08005219msgstr "[%s:领先 %d]"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005220
Jiang Xin5c57d762016-08-28 10:18:12 +08005221#: builtin/branch.c:330
Jiang Xin81809b92012-05-30 12:19:47 +08005222#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08005223msgid "[ahead %d]"
Jiang Xin81809b92012-05-30 12:19:47 +08005224msgstr "[领先 %d]"
Jiang Xin8ada9592012-05-21 09:35:47 +08005225
Jiang Xin5c57d762016-08-28 10:18:12 +08005226#: builtin/branch.c:333
Jiang Xin81809b92012-05-30 12:19:47 +08005227#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08005228msgid "[%s: ahead %d, behind %d]"
Jiang Xin81809b92012-05-30 12:19:47 +08005229msgstr "[%s:领先 %d,落后 %d]"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005230
Jiang Xin5c57d762016-08-28 10:18:12 +08005231#: builtin/branch.c:336
Jiang Xin81809b92012-05-30 12:19:47 +08005232#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08005233msgid "[ahead %d, behind %d]"
Jiang Xin81809b92012-05-30 12:19:47 +08005234msgstr "[领先 %d,落后 %d]"
Jiang Xin8ada9592012-05-21 09:35:47 +08005235
Jiang Xin5c57d762016-08-28 10:18:12 +08005236#: builtin/branch.c:349
Jiang Xina77c07d2013-02-14 17:47:45 +08005237msgid " **** invalid ref ****"
5238msgstr " **** 无效引用 ****"
5239
Jiang Xin5c57d762016-08-28 10:18:12 +08005240#: builtin/branch.c:375
Jiang Xin1003b3a2013-04-11 17:55:09 +08005241#, c-format
5242msgid "(no branch, rebasing %s)"
5243msgstr "(非分支,正变基 %s)"
5244
Jiang Xin5c57d762016-08-28 10:18:12 +08005245#: builtin/branch.c:378
Jiang Xin1003b3a2013-04-11 17:55:09 +08005246#, c-format
5247msgid "(no branch, bisect started on %s)"
5248msgstr "(非分支,二分查找开始于 %s)"
5249
Jiang Xin5b04ee32016-05-29 20:40:35 +08005250#. TRANSLATORS: make sure this matches
5251#. "HEAD detached at " in wt-status.c
Jiang Xin5c57d762016-08-28 10:18:12 +08005252#: builtin/branch.c:384
Jiang Xin814ff312015-02-16 21:34:19 +08005253#, c-format
5254msgid "(HEAD detached at %s)"
5255msgstr "(头指针分离于 %s)"
5256
Jiang Xin5b04ee32016-05-29 20:40:35 +08005257#. TRANSLATORS: make sure this matches
5258#. "HEAD detached from " in wt-status.c
Jiang Xin5c57d762016-08-28 10:18:12 +08005259#: builtin/branch.c:389
Jiang Xin814ff312015-02-16 21:34:19 +08005260#, c-format
5261msgid "(HEAD detached from %s)"
5262msgstr "(头指针分离自 %s)"
5263
Jiang Xin5c57d762016-08-28 10:18:12 +08005264#: builtin/branch.c:393
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005265msgid "(no branch)"
5266msgstr "(非分支)"
5267
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005268#: builtin/branch.c:535
Jiang Xin5b04ee32016-05-29 20:40:35 +08005269#, c-format
5270msgid "Branch %s is being rebased at %s"
5271msgstr "分支 %s 正被变基到 %s"
5272
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005273#: builtin/branch.c:539
Jiang Xin5b04ee32016-05-29 20:40:35 +08005274#, c-format
5275msgid "Branch %s is being bisected at %s"
5276msgstr "分支 %s 正被二分查找于 %s"
5277
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005278#: builtin/branch.c:554
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005279msgid "cannot rename the current branch while not on any."
Jiang Xin90e6ef52012-03-27 14:46:11 +08005280msgstr "无法重命名当前分支因为不处于任何分支上。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005281
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005282#: builtin/branch.c:564
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005283#, c-format
5284msgid "Invalid branch name: '%s'"
5285msgstr "无效的分支名:'%s'"
5286
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005287#: builtin/branch.c:581
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005288msgid "Branch rename failed"
5289msgstr "分支重命名失败"
5290
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005291#: builtin/branch.c:585
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005292#, c-format
5293msgid "Renamed a misnamed branch '%s' away"
5294msgstr "重命名掉一个错误命名的旧分支 '%s'"
5295
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005296#: builtin/branch.c:588
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005297#, c-format
5298msgid "Branch renamed to %s, but HEAD is not updated!"
5299msgstr "分支重命名为 %s,但 HEAD 没有更新!"
5300
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005301#: builtin/branch.c:595
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005302msgid "Branch is renamed, but update of config-file failed"
5303msgstr "分支被重命名,但更新 config 文件失败"
5304
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005305#: builtin/branch.c:611
Jiang Xin5c57d762016-08-28 10:18:12 +08005306#, c-format
5307msgid ""
5308"Please edit the description for the branch\n"
5309" %s\n"
5310"Lines starting with '%c' will be stripped.\n"
5311msgstr ""
5312"请编辑分支的描述\n"
5313" %s\n"
5314"以 '%c' 开头的行将被过滤。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005315
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005316#: builtin/branch.c:643
Jiang Xinef317cd2012-09-15 11:17:00 +08005317msgid "Generic options"
Wang Sheng07432ce2013-01-30 17:23:08 +08005318msgstr "通用选项"
Jiang Xinef317cd2012-09-15 11:17:00 +08005319
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005320#: builtin/branch.c:645
Jiang Xinef317cd2012-09-15 11:17:00 +08005321msgid "show hash and subject, give twice for upstream branch"
Wang Sheng07432ce2013-01-30 17:23:08 +08005322msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
Jiang Xinef317cd2012-09-15 11:17:00 +08005323
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005324#: builtin/branch.c:646
Jiang Xinef317cd2012-09-15 11:17:00 +08005325msgid "suppress informational messages"
Wang Sheng07432ce2013-01-30 17:23:08 +08005326msgstr "不显示信息"
Jiang Xinef317cd2012-09-15 11:17:00 +08005327
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005328#: builtin/branch.c:647
Wang Sheng07432ce2013-01-30 17:23:08 +08005329msgid "set up tracking mode (see git-pull(1))"
5330msgstr "设置跟踪模式(参见 git-pull(1))"
Jiang Xinef317cd2012-09-15 11:17:00 +08005331
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005332#: builtin/branch.c:649
Wang Sheng07432ce2013-01-30 17:23:08 +08005333msgid "change upstream info"
5334msgstr "改变上游信息"
Jiang Xinef317cd2012-09-15 11:17:00 +08005335
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005336#: builtin/branch.c:651
Jiang Xin5b04ee32016-05-29 20:40:35 +08005337msgid "upstream"
5338msgstr "上游"
5339
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005340#: builtin/branch.c:651
Jiang Xin5b04ee32016-05-29 20:40:35 +08005341msgid "change the upstream info"
5342msgstr "改变上游信息"
5343
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005344#: builtin/branch.c:652
Jiang Xina0b6b242016-10-27 21:53:37 +08005345msgid "Unset the upstream info"
5346msgstr "取消上游信息的设置"
5347
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005348#: builtin/branch.c:653
Wang Sheng07432ce2013-01-30 17:23:08 +08005349msgid "use colored output"
5350msgstr "使用彩色输出"
Jiang Xinef317cd2012-09-15 11:17:00 +08005351
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005352#: builtin/branch.c:654
Wang Sheng07432ce2013-01-30 17:23:08 +08005353msgid "act on remote-tracking branches"
5354msgstr "作用于远程跟踪分支"
Jiang Xinef317cd2012-09-15 11:17:00 +08005355
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005356#: builtin/branch.c:656 builtin/branch.c:657
Wang Sheng07432ce2013-01-30 17:23:08 +08005357msgid "print only branches that contain the commit"
5358msgstr "只打印包含该提交的分支"
Jiang Xinef317cd2012-09-15 11:17:00 +08005359
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005360#: builtin/branch.c:660
Wang Sheng07432ce2013-01-30 17:23:08 +08005361msgid "Specific git-branch actions:"
5362msgstr "具体的 git-branch 动作:"
Jiang Xinef317cd2012-09-15 11:17:00 +08005363
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005364#: builtin/branch.c:661
Wang Sheng07432ce2013-01-30 17:23:08 +08005365msgid "list both remote-tracking and local branches"
5366msgstr "列出远程跟踪及本地分支"
5367
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005368#: builtin/branch.c:663
Wang Sheng07432ce2013-01-30 17:23:08 +08005369msgid "delete fully merged branch"
5370msgstr "删除完全合并的分支"
5371
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005372#: builtin/branch.c:664
Wang Sheng07432ce2013-01-30 17:23:08 +08005373msgid "delete branch (even if not merged)"
5374msgstr "删除分支(即使没有合并)"
5375
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005376#: builtin/branch.c:665
Wang Sheng07432ce2013-01-30 17:23:08 +08005377msgid "move/rename a branch and its reflog"
5378msgstr "移动/重命名一个分支,以及它的引用日志"
5379
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005380#: builtin/branch.c:666
Wang Sheng07432ce2013-01-30 17:23:08 +08005381msgid "move/rename a branch, even if target exists"
5382msgstr "移动/重命名一个分支,即使目标已存在"
5383
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005384#: builtin/branch.c:667
Wang Sheng07432ce2013-01-30 17:23:08 +08005385msgid "list branch names"
5386msgstr "列出分支名"
5387
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005388#: builtin/branch.c:668
Wang Sheng07432ce2013-01-30 17:23:08 +08005389msgid "create the branch's reflog"
5390msgstr "创建分支的引用日志"
5391
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005392#: builtin/branch.c:670
Wang Sheng07432ce2013-01-30 17:23:08 +08005393msgid "edit the description for the branch"
5394msgstr "标记分支的描述"
5395
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005396#: builtin/branch.c:671
Jiang Xin04cb2f22015-01-04 12:27:38 +08005397msgid "force creation, move/rename, deletion"
5398msgstr "强制创建、移动/重命名、删除"
Jiang Xinef317cd2012-09-15 11:17:00 +08005399
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005400#: builtin/branch.c:672
Jiang Xin94550ed2015-11-16 07:02:11 +08005401msgid "print only branches that are merged"
5402msgstr "只打印已经合并的分支"
Wang Sheng07432ce2013-01-30 17:23:08 +08005403
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005404#: builtin/branch.c:673
Jiang Xin94550ed2015-11-16 07:02:11 +08005405msgid "print only branches that are not merged"
5406msgstr "只打印尚未合并的分支"
Wang Sheng07432ce2013-01-30 17:23:08 +08005407
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005408#: builtin/branch.c:674
Wang Sheng07432ce2013-01-30 17:23:08 +08005409msgid "list branches in columns"
5410msgstr "以列的方式显示分支"
5411
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005412#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381
Jiang Xin94550ed2015-11-16 07:02:11 +08005413msgid "key"
5414msgstr "key"
5415
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005416#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382
Jiang Xin94550ed2015-11-16 07:02:11 +08005417msgid "field name to sort on"
5418msgstr "排序的字段名"
5419
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005420#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404
Jiang Xina0b6b242016-10-27 21:53:37 +08005421#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005422#: builtin/tag.c:384
Jiang Xin94550ed2015-11-16 07:02:11 +08005423msgid "object"
5424msgstr "对象"
5425
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005426#: builtin/branch.c:679
Jiang Xin94550ed2015-11-16 07:02:11 +08005427msgid "print only branches of the object"
5428msgstr "只打印指向该对象的分支"
5429
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005430#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388
5431msgid "sorting and filtering are case insensitive"
5432msgstr "排序和过滤属于大小写不敏感"
5433
5434#: builtin/branch.c:698
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005435msgid "Failed to resolve HEAD as a valid ref."
5436msgstr "无法将 HEAD 解析为有效引用。"
5437
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005438#: builtin/branch.c:702 builtin/clone.c:706
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005439msgid "HEAD not found below refs/heads!"
Jiang Xin90e6ef52012-03-27 14:46:11 +08005440msgstr "HEAD 没有位于 /refs/heads 之下!"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005441
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005442#: builtin/branch.c:724
Jiang Xin8ada9592012-05-21 09:35:47 +08005443msgid "--column and --verbose are incompatible"
Jiang Xin81809b92012-05-30 12:19:47 +08005444msgstr "--column 和 --verbose 不兼容"
Jiang Xin8ada9592012-05-21 09:35:47 +08005445
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005446#: builtin/branch.c:735 builtin/branch.c:787
Jiang Xina77c07d2013-02-14 17:47:45 +08005447msgid "branch name required"
5448msgstr "必须提供分支名"
5449
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005450#: builtin/branch.c:763
Jiang Xina77c07d2013-02-14 17:47:45 +08005451msgid "Cannot give description to detached HEAD"
5452msgstr "不能向分离头指针提供描述"
5453
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005454#: builtin/branch.c:768
Jiang Xina77c07d2013-02-14 17:47:45 +08005455msgid "cannot edit description of more than one branch"
5456msgstr "不能为一个以上的分支编辑描述"
5457
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005458#: builtin/branch.c:775
Jiang Xina77c07d2013-02-14 17:47:45 +08005459#, c-format
5460msgid "No commit on branch '%s' yet."
5461msgstr "分支 '%s' 尚无提交。"
5462
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005463#: builtin/branch.c:778
Jiang Xina77c07d2013-02-14 17:47:45 +08005464#, c-format
5465msgid "No branch named '%s'."
5466msgstr "没有分支 '%s'。"
5467
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005468#: builtin/branch.c:793
Jiang Xina77c07d2013-02-14 17:47:45 +08005469msgid "too many branches for a rename operation"
5470msgstr "为重命名操作提供了太多的分支名"
5471
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005472#: builtin/branch.c:798
Jiang Xin1003b3a2013-04-11 17:55:09 +08005473msgid "too many branches to set new upstream"
5474msgstr "为设置新上游提供了太多的分支名"
5475
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005476#: builtin/branch.c:802
Jiang Xin1003b3a2013-04-11 17:55:09 +08005477#, c-format
5478msgid ""
5479"could not set upstream of HEAD to %s when it does not point to any branch."
5480msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
5481
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005482#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848
Jiang Xin1003b3a2013-04-11 17:55:09 +08005483#, c-format
5484msgid "no such branch '%s'"
5485msgstr "没有此分支 '%s'"
5486
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005487#: builtin/branch.c:809
Wang Sheng07432ce2013-01-30 17:23:08 +08005488#, c-format
Jiang Xinef317cd2012-09-15 11:17:00 +08005489msgid "branch '%s' does not exist"
Wang Sheng07432ce2013-01-30 17:23:08 +08005490msgstr "分支 '%s' 不存在"
Jiang Xinef317cd2012-09-15 11:17:00 +08005491
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005492#: builtin/branch.c:821
Jiang Xin1003b3a2013-04-11 17:55:09 +08005493msgid "too many branches to unset upstream"
5494msgstr "为取消上游设置操作提供了太多的分支名"
5495
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005496#: builtin/branch.c:825
Jiang Xin1003b3a2013-04-11 17:55:09 +08005497msgid "could not unset upstream of HEAD when it does not point to any branch."
5498msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
5499
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005500#: builtin/branch.c:831
Jiang Xinef317cd2012-09-15 11:17:00 +08005501#, c-format
5502msgid "Branch '%s' has no upstream information"
Wang Sheng07432ce2013-01-30 17:23:08 +08005503msgstr "分支 '%s' 没有上游信息"
Jiang Xinef317cd2012-09-15 11:17:00 +08005504
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005505#: builtin/branch.c:845
Jiang Xin1003b3a2013-04-11 17:55:09 +08005506msgid "it does not make sense to create 'HEAD' manually"
5507msgstr "手工创建 'HEAD' 没有意义"
5508
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005509#: builtin/branch.c:851
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005510msgid "-a and -r options to 'git branch' do not make sense with a branch name"
5511msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
5512
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005513#: builtin/branch.c:854
Jiang Xinef317cd2012-09-15 11:17:00 +08005514#, c-format
5515msgid ""
5516"The --set-upstream flag is deprecated and will be removed. Consider using --"
5517"track or --set-upstream-to\n"
5518msgstr ""
Wang Sheng07432ce2013-01-30 17:23:08 +08005519"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
Jiang Xinef317cd2012-09-15 11:17:00 +08005520
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005521#: builtin/branch.c:871
Jiang Xinef317cd2012-09-15 11:17:00 +08005522#, c-format
5523msgid ""
5524"\n"
5525"If you wanted to make '%s' track '%s', do this:\n"
5526"\n"
5527msgstr ""
Wang Sheng07432ce2013-01-30 17:23:08 +08005528"\n"
5529"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
5530"\n"
Jiang Xinef317cd2012-09-15 11:17:00 +08005531
Jiang Xin7aea43f2015-05-31 08:42:31 +08005532#: builtin/bundle.c:51
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005533#, c-format
5534msgid "%s is okay\n"
5535msgstr "%s 可以\n"
5536
Jiang Xin7aea43f2015-05-31 08:42:31 +08005537#: builtin/bundle.c:64
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005538msgid "Need a repository to create a bundle."
Jiang Xin160fb2b2015-08-02 21:47:30 +08005539msgstr "需要一个仓库来创建包。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005540
Jiang Xin7aea43f2015-05-31 08:42:31 +08005541#: builtin/bundle.c:68
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005542msgid "Need a repository to unbundle."
Jiang Xin160fb2b2015-08-02 21:47:30 +08005543msgstr "需要一个仓库来解包。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005544
Jiang Xina0b6b242016-10-27 21:53:37 +08005545#: builtin/cat-file.c:513
Jiang Xin7aea43f2015-05-31 08:42:31 +08005546msgid ""
Jiang Xina0b6b242016-10-27 21:53:37 +08005547"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5548"p | <type> | --textconv | --filters) [--path=<path>] <object>"
Jiang Xin275588f2016-11-22 22:24:59 +08005549msgstr ""
5550"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
5551"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
Jiang Xinef317cd2012-09-15 11:17:00 +08005552
Jiang Xina0b6b242016-10-27 21:53:37 +08005553#: builtin/cat-file.c:514
5554msgid ""
5555"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5556"filters]"
Jiang Xin275588f2016-11-22 22:24:59 +08005557msgstr ""
5558"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
5559"filters]"
Jiang Xinef317cd2012-09-15 11:17:00 +08005560
Jiang Xina0b6b242016-10-27 21:53:37 +08005561#: builtin/cat-file.c:551
Jiang Xinef317cd2012-09-15 11:17:00 +08005562msgid "<type> can be one of: blob, tree, commit, tag"
Wang Sheng07432ce2013-01-30 17:23:08 +08005563msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
Jiang Xinef317cd2012-09-15 11:17:00 +08005564
Jiang Xina0b6b242016-10-27 21:53:37 +08005565#: builtin/cat-file.c:552
Jiang Xinef317cd2012-09-15 11:17:00 +08005566msgid "show object type"
Wang Sheng07432ce2013-01-30 17:23:08 +08005567msgstr "显示对象类型"
Jiang Xinef317cd2012-09-15 11:17:00 +08005568
Jiang Xina0b6b242016-10-27 21:53:37 +08005569#: builtin/cat-file.c:553
Jiang Xinef317cd2012-09-15 11:17:00 +08005570msgid "show object size"
Wang Sheng07432ce2013-01-30 17:23:08 +08005571msgstr "显示对象大小"
Jiang Xinef317cd2012-09-15 11:17:00 +08005572
Jiang Xina0b6b242016-10-27 21:53:37 +08005573#: builtin/cat-file.c:555
Jiang Xinef317cd2012-09-15 11:17:00 +08005574msgid "exit with zero when there's no error"
Wang Sheng07432ce2013-01-30 17:23:08 +08005575msgstr "当没有错误时退出并返回零"
Jiang Xinef317cd2012-09-15 11:17:00 +08005576
Jiang Xina0b6b242016-10-27 21:53:37 +08005577#: builtin/cat-file.c:556
Jiang Xinef317cd2012-09-15 11:17:00 +08005578msgid "pretty-print object's content"
Wang Sheng07432ce2013-01-30 17:23:08 +08005579msgstr "美观地打印对象的内容"
Jiang Xinef317cd2012-09-15 11:17:00 +08005580
Jiang Xina0b6b242016-10-27 21:53:37 +08005581#: builtin/cat-file.c:558
Jiang Xinef317cd2012-09-15 11:17:00 +08005582msgid "for blob objects, run textconv on object's content"
Jiang Xina0b6b242016-10-27 21:53:37 +08005583msgstr "对于数据对象,对其内容做文本转换"
Jiang Xinef317cd2012-09-15 11:17:00 +08005584
Jiang Xina0b6b242016-10-27 21:53:37 +08005585#: builtin/cat-file.c:560
5586msgid "for blob objects, run filters on object's content"
5587msgstr "对于数据对象,对其内容做过滤"
5588
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005589#: builtin/cat-file.c:561 git-submodule.sh:929
Jiang Xina0b6b242016-10-27 21:53:37 +08005590msgid "blob"
5591msgstr "数据对象"
5592
5593#: builtin/cat-file.c:562
5594msgid "use a specific path for --textconv/--filters"
5595msgstr "对于 --textconv/--filters 使用一个特定的路径"
5596
5597#: builtin/cat-file.c:564
Jiang Xin7aea43f2015-05-31 08:42:31 +08005598msgid "allow -s and -t to work with broken/corrupt objects"
5599msgstr "允许 -s 和 -t 对损坏的对象生效"
5600
Jiang Xina0b6b242016-10-27 21:53:37 +08005601#: builtin/cat-file.c:565
Jiang Xin1b7f4a32015-08-23 15:23:21 +08005602msgid "buffer --batch output"
5603msgstr "缓冲 --batch 的输出"
5604
Jiang Xina0b6b242016-10-27 21:53:37 +08005605#: builtin/cat-file.c:567
Jiang Xinef317cd2012-09-15 11:17:00 +08005606msgid "show info and content of objects fed from the standard input"
Wang Sheng07432ce2013-01-30 17:23:08 +08005607msgstr "显示从标准输入提供的对象的信息和内容"
Jiang Xinef317cd2012-09-15 11:17:00 +08005608
Jiang Xina0b6b242016-10-27 21:53:37 +08005609#: builtin/cat-file.c:570
Jiang Xinef317cd2012-09-15 11:17:00 +08005610msgid "show info about objects fed from the standard input"
Wang Sheng07432ce2013-01-30 17:23:08 +08005611msgstr "显示从标准输入提供的对象的信息"
Jiang Xinef317cd2012-09-15 11:17:00 +08005612
Jiang Xina0b6b242016-10-27 21:53:37 +08005613#: builtin/cat-file.c:573
Jiang Xin7aea43f2015-05-31 08:42:31 +08005614msgid "follow in-tree symlinks (used with --batch or --batch-check)"
5615msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
5616
Jiang Xina0b6b242016-10-27 21:53:37 +08005617#: builtin/cat-file.c:575
Jiang Xin1b7f4a32015-08-23 15:23:21 +08005618msgid "show all objects with --batch or --batch-check"
5619msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
5620
Jiang Xinef317cd2012-09-15 11:17:00 +08005621#: builtin/check-attr.c:11
Jiang Xin814ff312015-02-16 21:34:19 +08005622msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
5623msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
Jiang Xinef317cd2012-09-15 11:17:00 +08005624
5625#: builtin/check-attr.c:12
Jiang Xin94550ed2015-11-16 07:02:11 +08005626msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
5627msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +08005628
5629#: builtin/check-attr.c:19
5630msgid "report all attributes set on file"
Wang Sheng07432ce2013-01-30 17:23:08 +08005631msgstr "报告设置在文件上的所有属性"
Jiang Xinef317cd2012-09-15 11:17:00 +08005632
5633#: builtin/check-attr.c:20
5634msgid "use .gitattributes only from the index"
Wang Sheng07432ce2013-01-30 17:23:08 +08005635msgstr "只使用索引中的 .gitattributes"
Jiang Xinef317cd2012-09-15 11:17:00 +08005636
Jiang Xina0b6b242016-10-27 21:53:37 +08005637#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
Jiang Xinef317cd2012-09-15 11:17:00 +08005638msgid "read file names from stdin"
Wang Sheng07432ce2013-01-30 17:23:08 +08005639msgstr "从标准输入读出文件名"
Jiang Xinef317cd2012-09-15 11:17:00 +08005640
Jiang Xina77c07d2013-02-14 17:47:45 +08005641#: builtin/check-attr.c:23 builtin/check-ignore.c:24
Jiang Xin90314792013-09-17 23:37:05 +08005642msgid "terminate input and output records by a NUL character"
5643msgstr "输入和输出的记录使用 NUL 字符终结"
Jiang Xinef317cd2012-09-15 11:17:00 +08005644
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005645#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332
Jiang Xina77c07d2013-02-14 17:47:45 +08005646msgid "suppress progress reporting"
5647msgstr "不显示进度报告"
5648
Jiang Xin2e8451e2013-07-26 14:00:02 +08005649#: builtin/check-ignore.c:26
5650msgid "show non-matching input paths"
5651msgstr "显示未匹配的输入路径"
5652
Jiang Xin90314792013-09-17 23:37:05 +08005653#: builtin/check-ignore.c:28
5654msgid "ignore index when checking"
5655msgstr "检查时忽略索引"
5656
5657#: builtin/check-ignore.c:154
Jiang Xina77c07d2013-02-14 17:47:45 +08005658msgid "cannot specify pathnames with --stdin"
Jiang Xin1b7f4a32015-08-23 15:23:21 +08005659msgstr "不能同时指定路径及 --stdin 参数"
Jiang Xina77c07d2013-02-14 17:47:45 +08005660
Jiang Xin90314792013-09-17 23:37:05 +08005661#: builtin/check-ignore.c:157
Jiang Xina77c07d2013-02-14 17:47:45 +08005662msgid "-z only makes sense with --stdin"
5663msgstr "-z 需要和 --stdin 参数共用才有意义"
5664
Jiang Xin90314792013-09-17 23:37:05 +08005665#: builtin/check-ignore.c:159
Jiang Xina77c07d2013-02-14 17:47:45 +08005666msgid "no path specified"
5667msgstr "未指定路径"
5668
Jiang Xin90314792013-09-17 23:37:05 +08005669#: builtin/check-ignore.c:163
Jiang Xina77c07d2013-02-14 17:47:45 +08005670msgid "--quiet is only valid with a single pathname"
5671msgstr "参数 --quiet 只在提供一个路径名时有效"
5672
Jiang Xin90314792013-09-17 23:37:05 +08005673#: builtin/check-ignore.c:165
Jiang Xina77c07d2013-02-14 17:47:45 +08005674msgid "cannot have both --quiet and --verbose"
5675msgstr "不能同时提供 --quiet 和 --verbose 参数"
5676
Jiang Xin90314792013-09-17 23:37:05 +08005677#: builtin/check-ignore.c:168
Jiang Xin2e8451e2013-07-26 14:00:02 +08005678msgid "--non-matching is only valid with --verbose"
5679msgstr "--non-matching 选项只在使用 --verbose 时有效"
5680
5681#: builtin/check-mailmap.c:8
Jiang Xin814ff312015-02-16 21:34:19 +08005682msgid "git check-mailmap [<options>] <contact>..."
5683msgstr "git check-mailmap [<选项>] <联系地址>..."
Jiang Xin2e8451e2013-07-26 14:00:02 +08005684
5685#: builtin/check-mailmap.c:13
5686msgid "also read contacts from stdin"
5687msgstr "还从标准输入读取联系地址"
5688
5689#: builtin/check-mailmap.c:24
5690#, c-format
5691msgid "unable to parse contact: %s"
5692msgstr "不能解析联系地址:%s"
5693
5694#: builtin/check-mailmap.c:47
5695msgid "no contacts specified"
5696msgstr "未指定联系地址"
5697
Jiang Xin276ceea2016-02-28 20:35:55 +08005698#: builtin/checkout-index.c:127
Jiang Xin814ff312015-02-16 21:34:19 +08005699msgid "git checkout-index [<options>] [--] [<file>...]"
5700msgstr "git checkout-index [<选项>] [--] [<文件>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +08005701
Jiang Xin276ceea2016-02-28 20:35:55 +08005702#: builtin/checkout-index.c:144
5703msgid "stage should be between 1 and 3 or all"
5704msgstr "索引值应该取值 1 到 3 或者 all"
5705
5706#: builtin/checkout-index.c:160
Jiang Xinef317cd2012-09-15 11:17:00 +08005707msgid "check out all files in the index"
Wang Sheng07432ce2013-01-30 17:23:08 +08005708msgstr "检出索引区的所有文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08005709
Jiang Xin276ceea2016-02-28 20:35:55 +08005710#: builtin/checkout-index.c:161
Jiang Xinef317cd2012-09-15 11:17:00 +08005711msgid "force overwrite of existing files"
Wang Sheng07432ce2013-01-30 17:23:08 +08005712msgstr "强制覆盖现有的文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08005713
Jiang Xin276ceea2016-02-28 20:35:55 +08005714#: builtin/checkout-index.c:163
Jiang Xinef317cd2012-09-15 11:17:00 +08005715msgid "no warning for existing files and files not in index"
Wang Sheng07432ce2013-01-30 17:23:08 +08005716msgstr "存在或不在索引中的文件都没有警告"
Jiang Xinef317cd2012-09-15 11:17:00 +08005717
Jiang Xin276ceea2016-02-28 20:35:55 +08005718#: builtin/checkout-index.c:165
Jiang Xinef317cd2012-09-15 11:17:00 +08005719msgid "don't checkout new files"
Wang Sheng07432ce2013-01-30 17:23:08 +08005720msgstr "不检出新文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08005721
Jiang Xin276ceea2016-02-28 20:35:55 +08005722#: builtin/checkout-index.c:167
Jiang Xinef317cd2012-09-15 11:17:00 +08005723msgid "update stat information in the index file"
Wang Sheng07432ce2013-01-30 17:23:08 +08005724msgstr "更新索引中文件的状态信息"
Jiang Xinef317cd2012-09-15 11:17:00 +08005725
Jiang Xin276ceea2016-02-28 20:35:55 +08005726#: builtin/checkout-index.c:171
Jiang Xinef317cd2012-09-15 11:17:00 +08005727msgid "read list of paths from the standard input"
Wang Sheng07432ce2013-01-30 17:23:08 +08005728msgstr "从标准输入读取路径列表"
Jiang Xinef317cd2012-09-15 11:17:00 +08005729
Jiang Xin276ceea2016-02-28 20:35:55 +08005730#: builtin/checkout-index.c:173
Jiang Xinef317cd2012-09-15 11:17:00 +08005731msgid "write the content to temporary files"
Wang Sheng07432ce2013-01-30 17:23:08 +08005732msgstr "将内容写入临时文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08005733
Jiang Xin276ceea2016-02-28 20:35:55 +08005734#: builtin/checkout-index.c:174 builtin/column.c:30
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005735#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600
5736#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967
5737#: builtin/worktree.c:471
Jiang Xinef317cd2012-09-15 11:17:00 +08005738msgid "string"
Wang Sheng07432ce2013-01-30 17:23:08 +08005739msgstr "字符串"
Jiang Xinef317cd2012-09-15 11:17:00 +08005740
Jiang Xin276ceea2016-02-28 20:35:55 +08005741#: builtin/checkout-index.c:175
Jiang Xinef317cd2012-09-15 11:17:00 +08005742msgid "when creating files, prepend <string>"
Ray Chen4375c102015-08-10 18:03:29 +08005743msgstr "在创建文件时,在前面加上 <字符串>"
Jiang Xinef317cd2012-09-15 11:17:00 +08005744
Jiang Xin276ceea2016-02-28 20:35:55 +08005745#: builtin/checkout-index.c:177
Jiang Xinef317cd2012-09-15 11:17:00 +08005746msgid "copy out the files from named stage"
Wang Sheng07432ce2013-01-30 17:23:08 +08005747msgstr "从指定暂存区中拷出文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08005748
Jiang Xin1b7f4a32015-08-23 15:23:21 +08005749#: builtin/checkout.c:25
Jiang Xin814ff312015-02-16 21:34:19 +08005750msgid "git checkout [<options>] <branch>"
5751msgstr "git checkout [<选项>] <分支>"
Jiang Xinef317cd2012-09-15 11:17:00 +08005752
Jiang Xin1b7f4a32015-08-23 15:23:21 +08005753#: builtin/checkout.c:26
Jiang Xin814ff312015-02-16 21:34:19 +08005754msgid "git checkout [<options>] [<branch>] -- <file>..."
5755msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
Jiang Xinef317cd2012-09-15 11:17:00 +08005756
Jiang Xin94550ed2015-11-16 07:02:11 +08005757#: builtin/checkout.c:134 builtin/checkout.c:167
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005758#, c-format
5759msgid "path '%s' does not have our version"
5760msgstr "路径 '%s' 没有我们的版本"
5761
Jiang Xin94550ed2015-11-16 07:02:11 +08005762#: builtin/checkout.c:136 builtin/checkout.c:169
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005763#, c-format
5764msgid "path '%s' does not have their version"
5765msgstr "路径 '%s' 没有他们的版本"
5766
Jiang Xin94550ed2015-11-16 07:02:11 +08005767#: builtin/checkout.c:152
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005768#, c-format
5769msgid "path '%s' does not have all necessary versions"
5770msgstr "路径 '%s' 没有全部必须的版本"
5771
Jiang Xin94550ed2015-11-16 07:02:11 +08005772#: builtin/checkout.c:196
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005773#, c-format
5774msgid "path '%s' does not have necessary versions"
5775msgstr "路径 '%s' 没有必须的版本"
5776
Jiang Xin94550ed2015-11-16 07:02:11 +08005777#: builtin/checkout.c:213
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005778#, c-format
5779msgid "path '%s': cannot merge"
Jiang Xin90e6ef52012-03-27 14:46:11 +08005780msgstr "path '%s':无法合并"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005781
Jiang Xin94550ed2015-11-16 07:02:11 +08005782#: builtin/checkout.c:230
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005783#, c-format
5784msgid "Unable to add merge result for '%s'"
5785msgstr "无法为 '%s' 添加合并结果"
5786
Jiang Xin5b04ee32016-05-29 20:40:35 +08005787#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
5788#: builtin/checkout.c:259
Wang Sheng07432ce2013-01-30 17:23:08 +08005789#, c-format
Jiang Xinef317cd2012-09-15 11:17:00 +08005790msgid "'%s' cannot be used with updating paths"
Wang Sheng07432ce2013-01-30 17:23:08 +08005791msgstr "'%s' 不能在更新路径时使用"
Jiang Xinef317cd2012-09-15 11:17:00 +08005792
Jiang Xin5b04ee32016-05-29 20:40:35 +08005793#: builtin/checkout.c:262 builtin/checkout.c:265
Wang Sheng07432ce2013-01-30 17:23:08 +08005794#, c-format
Jiang Xinef317cd2012-09-15 11:17:00 +08005795msgid "'%s' cannot be used with %s"
Wang Sheng07432ce2013-01-30 17:23:08 +08005796msgstr "'%s' 不能和 %s 同时使用"
Jiang Xinef317cd2012-09-15 11:17:00 +08005797
Jiang Xin5b04ee32016-05-29 20:40:35 +08005798#: builtin/checkout.c:268
Jiang Xinef317cd2012-09-15 11:17:00 +08005799#, c-format
5800msgid "Cannot update paths and switch to branch '%s' at the same time."
Wang Sheng07432ce2013-01-30 17:23:08 +08005801msgstr "不能同时更新路径并切换到分支'%s'。"
Jiang Xinef317cd2012-09-15 11:17:00 +08005802
Jiang Xin5b04ee32016-05-29 20:40:35 +08005803#: builtin/checkout.c:339 builtin/checkout.c:346
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005804#, c-format
5805msgid "path '%s' is unmerged"
5806msgstr "路径 '%s' 未合并"
5807
Jiang Xina0b6b242016-10-27 21:53:37 +08005808#: builtin/checkout.c:494
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005809msgid "you need to resolve your current index first"
Jiang Xin90e6ef52012-03-27 14:46:11 +08005810msgstr "您需要先解决当前索引的冲突"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005811
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005812#: builtin/checkout.c:625
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005813#, c-format
Jiang Xin1b7f4a32015-08-23 15:23:21 +08005814msgid "Can not do reflog for '%s': %s\n"
5815msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005816
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005817#: builtin/checkout.c:666
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005818msgid "HEAD is now at"
5819msgstr "HEAD 目前位于"
5820
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005821#: builtin/checkout.c:670 builtin/clone.c:660
Jiang Xin34956282016-03-12 22:09:24 +08005822msgid "unable to update HEAD"
5823msgstr "不能更新 HEAD"
5824
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005825#: builtin/checkout.c:674
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005826#, c-format
5827msgid "Reset branch '%s'\n"
5828msgstr "重置分支 '%s'\n"
5829
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005830#: builtin/checkout.c:677
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005831#, c-format
5832msgid "Already on '%s'\n"
5833msgstr "已经位于 '%s'\n"
5834
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005835#: builtin/checkout.c:681
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005836#, c-format
5837msgid "Switched to and reset branch '%s'\n"
5838msgstr "切换并重置分支 '%s'\n"
5839
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005840#: builtin/checkout.c:683 builtin/checkout.c:1072
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005841#, c-format
5842msgid "Switched to a new branch '%s'\n"
5843msgstr "切换到一个新分支 '%s'\n"
5844
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005845#: builtin/checkout.c:685
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005846#, c-format
5847msgid "Switched to branch '%s'\n"
5848msgstr "切换到分支 '%s'\n"
5849
Jiang Xin90e6ef52012-03-27 14:46:11 +08005850# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005851#: builtin/checkout.c:736
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005852#, c-format
5853msgid " ... and %d more.\n"
Jiang Xin90e6ef52012-03-27 14:46:11 +08005854msgstr " ... 及其它 %d 个。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005855
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005856#: builtin/checkout.c:742
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005857#, c-format
5858msgid ""
5859"Warning: you are leaving %d commit behind, not connected to\n"
5860"any of your branches:\n"
5861"\n"
5862"%s\n"
5863msgid_plural ""
5864"Warning: you are leaving %d commits behind, not connected to\n"
5865"any of your branches:\n"
5866"\n"
5867"%s\n"
5868msgstr[0] ""
5869"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
5870"\n"
5871"%s\n"
Jiang Xin5ae481e2012-05-31 17:35:59 +08005872msgstr[1] ""
5873"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
5874"\n"
5875"%s\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005876
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005877#: builtin/checkout.c:761
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005878#, c-format
5879msgid ""
Jiang Xin7aea43f2015-05-31 08:42:31 +08005880"If you want to keep it by creating a new branch, this may be a good time\n"
5881"to do so with:\n"
5882"\n"
5883" git branch <new-branch-name> %s\n"
5884"\n"
5885msgid_plural ""
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005886"If you want to keep them by creating a new branch, this may be a good time\n"
5887"to do so with:\n"
5888"\n"
Jiang Xin814ff312015-02-16 21:34:19 +08005889" git branch <new-branch-name> %s\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005890"\n"
Jiang Xin7aea43f2015-05-31 08:42:31 +08005891msgstr[0] ""
5892"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
5893"如下操作:\n"
5894"\n"
5895" git branch <新分支名> %s\n"
5896"\n"
5897msgstr[1] ""
5898"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005899"如下操作:\n"
5900"\n"
Jiang Xin814ff312015-02-16 21:34:19 +08005901" git branch <新分支名> %s\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005902"\n"
5903
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005904#: builtin/checkout.c:797
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005905msgid "internal error in revision walk"
5906msgstr "在版本遍历时遇到内部错误"
5907
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005908#: builtin/checkout.c:801
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005909msgid "Previous HEAD position was"
5910msgstr "之前的 HEAD 位置是"
5911
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005912#: builtin/checkout.c:828 builtin/checkout.c:1067
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005913msgid "You are on a branch yet to be born"
Jiang Xin90e6ef52012-03-27 14:46:11 +08005914msgstr "您位于一个尚未初始化的分支"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005915
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005916#: builtin/checkout.c:973
Jiang Xin90314792013-09-17 23:37:05 +08005917#, c-format
5918msgid "only one reference expected, %d given."
Jiang Xina0b6b242016-10-27 21:53:37 +08005919msgstr "应只有一个引用,却给出了 %d 个"
Jiang Xin90314792013-09-17 23:37:05 +08005920
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005921#: builtin/checkout.c:1013 builtin/worktree.c:214
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005922#, c-format
5923msgid "invalid reference: %s"
5924msgstr "无效引用:%s"
5925
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005926#: builtin/checkout.c:1042
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005927#, c-format
5928msgid "reference is not a tree: %s"
5929msgstr "引用不是一个树:%s"
5930
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005931#: builtin/checkout.c:1081
Jiang Xinef317cd2012-09-15 11:17:00 +08005932msgid "paths cannot be used with switching branches"
Wang Sheng07432ce2013-01-30 17:23:08 +08005933msgstr "路径不能和切换分支同时使用"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005934
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005935#: builtin/checkout.c:1084 builtin/checkout.c:1088
Wang Sheng07432ce2013-01-30 17:23:08 +08005936#, c-format
Jiang Xinef317cd2012-09-15 11:17:00 +08005937msgid "'%s' cannot be used with switching branches"
Wang Sheng07432ce2013-01-30 17:23:08 +08005938msgstr "'%s' 不能和切换分支同时使用"
Jiang Xinef317cd2012-09-15 11:17:00 +08005939
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005940#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100
5941#: builtin/checkout.c:1103
Wang Sheng07432ce2013-01-30 17:23:08 +08005942#, c-format
Jiang Xinef317cd2012-09-15 11:17:00 +08005943msgid "'%s' cannot be used with '%s'"
Wang Sheng07432ce2013-01-30 17:23:08 +08005944msgstr "'%s' 不能和 '%s' 同时使用"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005945
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005946#: builtin/checkout.c:1108
Wang Sheng07432ce2013-01-30 17:23:08 +08005947#, c-format
Jiang Xinef317cd2012-09-15 11:17:00 +08005948msgid "Cannot switch branch to a non-commit '%s'"
Wang Sheng07432ce2013-01-30 17:23:08 +08005949msgstr "不能切换分支到一个非提交 '%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08005950
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005951#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93
Jiang Xin5c57d762016-08-28 10:18:12 +08005952#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
5953#: builtin/worktree.c:326
Jiang Xinef317cd2012-09-15 11:17:00 +08005954msgid "branch"
Wang Sheng07432ce2013-01-30 17:23:08 +08005955msgstr "分支"
Jiang Xinef317cd2012-09-15 11:17:00 +08005956
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005957#: builtin/checkout.c:1142
Wang Sheng07432ce2013-01-30 17:23:08 +08005958msgid "create and checkout a new branch"
5959msgstr "创建并检出一个新的分支"
Jiang Xinef317cd2012-09-15 11:17:00 +08005960
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005961#: builtin/checkout.c:1144
Wang Sheng07432ce2013-01-30 17:23:08 +08005962msgid "create/reset and checkout a branch"
5963msgstr "创建/重置并检出一个分支"
5964
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005965#: builtin/checkout.c:1145
Wang Sheng07432ce2013-01-30 17:23:08 +08005966msgid "create reflog for new branch"
5967msgstr "为新的分支创建引用日志"
Jiang Xinef317cd2012-09-15 11:17:00 +08005968
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005969#: builtin/checkout.c:1146 builtin/worktree.c:328
Jiang Xin5c57d762016-08-28 10:18:12 +08005970msgid "detach HEAD at named commit"
5971msgstr "HEAD 从指定的提交分离"
Jiang Xinef317cd2012-09-15 11:17:00 +08005972
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005973#: builtin/checkout.c:1147
Wang Sheng07432ce2013-01-30 17:23:08 +08005974msgid "set upstream info for new branch"
5975msgstr "为新的分支设置上游信息"
Jiang Xinef317cd2012-09-15 11:17:00 +08005976
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005977#: builtin/checkout.c:1149
Jiang Xin6c94aba2014-03-13 12:41:34 +08005978msgid "new-branch"
Wang Sheng07432ce2013-01-30 17:23:08 +08005979msgstr "新分支"
Jiang Xinef317cd2012-09-15 11:17:00 +08005980
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005981#: builtin/checkout.c:1149
Wang Sheng07432ce2013-01-30 17:23:08 +08005982msgid "new unparented branch"
5983msgstr "新的没有父提交的分支"
5984
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005985#: builtin/checkout.c:1150
Wang Sheng07432ce2013-01-30 17:23:08 +08005986msgid "checkout our version for unmerged files"
5987msgstr "对尚未合并的文件检出我们的版本"
Jiang Xinef317cd2012-09-15 11:17:00 +08005988
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005989#: builtin/checkout.c:1152
Wang Sheng07432ce2013-01-30 17:23:08 +08005990msgid "checkout their version for unmerged files"
5991msgstr "对尚未合并的文件检出他们的版本"
Jiang Xinef317cd2012-09-15 11:17:00 +08005992
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005993#: builtin/checkout.c:1154
Wang Sheng07432ce2013-01-30 17:23:08 +08005994msgid "force checkout (throw away local modifications)"
5995msgstr "强制检出(丢弃本地修改)"
Jiang Xinef317cd2012-09-15 11:17:00 +08005996
Jiang Xin1a79b2f2017-01-27 22:50:57 +08005997#: builtin/checkout.c:1155
Wang Sheng07432ce2013-01-30 17:23:08 +08005998msgid "perform a 3-way merge with the new branch"
Jiang Xin160fb2b2015-08-02 21:47:30 +08005999msgstr "和新的分支执行三方合并"
Wang Sheng07432ce2013-01-30 17:23:08 +08006000
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006001#: builtin/checkout.c:1156 builtin/merge.c:235
Wang Sheng07432ce2013-01-30 17:23:08 +08006002msgid "update ignored files (default)"
6003msgstr "更新忽略的文件(默认)"
6004
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006005#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251
Wang Sheng07432ce2013-01-30 17:23:08 +08006006msgid "style"
6007msgstr "风格"
Jiang Xinef317cd2012-09-15 11:17:00 +08006008
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006009#: builtin/checkout.c:1158
Wang Sheng07432ce2013-01-30 17:23:08 +08006010msgid "conflict style (merge or diff3)"
6011msgstr "冲突输出风格(merge 或 diff3)"
6012
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006013#: builtin/checkout.c:1161
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08006014msgid "do not limit pathspecs to sparse entries only"
6015msgstr "对路径不做稀疏检出的限制"
6016
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006017#: builtin/checkout.c:1163
Jiang Xin814ff312015-02-16 21:34:19 +08006018msgid "second guess 'git checkout <no-such-branch>'"
6019msgstr "二次猜测'git checkout <无此分支>'"
Jiang Xinef317cd2012-09-15 11:17:00 +08006020
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006021#: builtin/checkout.c:1165
Jiang Xin7aea43f2015-05-31 08:42:31 +08006022msgid "do not check if another worktree is holding the given ref"
6023msgstr "不检查指定的引用是否被其他工作区所占用"
6024
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006025#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119
6026#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539
Jiang Xin94550ed2015-11-16 07:02:11 +08006027#: builtin/send-pack.c:168
6028msgid "force progress reporting"
6029msgstr "强制显示进度报告"
6030
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006031#: builtin/checkout.c:1197
Jiang Xinef317cd2012-09-15 11:17:00 +08006032msgid "-b, -B and --orphan are mutually exclusive"
Wang Sheng07432ce2013-01-30 17:23:08 +08006033msgstr "-b、-B 和 --orphan 是互斥的"
Jiang Xinef317cd2012-09-15 11:17:00 +08006034
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006035#: builtin/checkout.c:1214
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006036msgid "--track needs a branch name"
6037msgstr "--track 需要一个分支名"
6038
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006039#: builtin/checkout.c:1219
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006040msgid "Missing branch name; try -b"
6041msgstr "缺少分支名;尝试 -b"
6042
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006043#: builtin/checkout.c:1255
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006044msgid "invalid path specification"
Jiang Xin90e6ef52012-03-27 14:46:11 +08006045msgstr "无效的路径规格"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006046
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006047#: builtin/checkout.c:1262
Wang Sheng07432ce2013-01-30 17:23:08 +08006048#, c-format
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006049msgid ""
Jiang Xinef317cd2012-09-15 11:17:00 +08006050"Cannot update paths and switch to branch '%s' at the same time.\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006051"Did you intend to checkout '%s' which can not be resolved as commit?"
6052msgstr ""
Wang Sheng07432ce2013-01-30 17:23:08 +08006053"不能同时更新路径并切换到分支'%s'。\n"
6054"您是想要检出 '%s' 但其未能解析为提交么?"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006055
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006056#: builtin/checkout.c:1267
Wang Sheng07432ce2013-01-30 17:23:08 +08006057#, c-format
Jiang Xinef317cd2012-09-15 11:17:00 +08006058msgid "git checkout: --detach does not take a path argument '%s'"
Wang Sheng07432ce2013-01-30 17:23:08 +08006059msgstr "git checkout:--detach 不能接收路径参数 '%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006060
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006061#: builtin/checkout.c:1271
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006062msgid ""
6063"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
6064"checking out of the index."
6065msgstr ""
Jiang Xin90e6ef52012-03-27 14:46:11 +08006066"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006067
Jiang Xin1b7f4a32015-08-23 15:23:21 +08006068#: builtin/clean.c:25
Jiang Xin2e8451e2013-07-26 14:00:02 +08006069msgid ""
6070"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
6071msgstr ""
6072"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006073
Jiang Xin1b7f4a32015-08-23 15:23:21 +08006074#: builtin/clean.c:29
Wang Sheng07432ce2013-01-30 17:23:08 +08006075#, c-format
6076msgid "Removing %s\n"
6077msgstr "正删除 %s\n"
6078
Jiang Xin1b7f4a32015-08-23 15:23:21 +08006079#: builtin/clean.c:30
Wang Sheng07432ce2013-01-30 17:23:08 +08006080#, c-format
6081msgid "Would remove %s\n"
6082msgstr "将删除 %s\n"
6083
Jiang Xin1b7f4a32015-08-23 15:23:21 +08006084#: builtin/clean.c:31
Wang Sheng07432ce2013-01-30 17:23:08 +08006085#, c-format
6086msgid "Skipping repository %s\n"
Jiang Xin160fb2b2015-08-02 21:47:30 +08006087msgstr "忽略仓库 %s\n"
Wang Sheng07432ce2013-01-30 17:23:08 +08006088
Jiang Xin1b7f4a32015-08-23 15:23:21 +08006089#: builtin/clean.c:32
Wang Sheng07432ce2013-01-30 17:23:08 +08006090#, c-format
6091msgid "Would skip repository %s\n"
Jiang Xin160fb2b2015-08-02 21:47:30 +08006092msgstr "将忽略仓库 %s\n"
Wang Sheng07432ce2013-01-30 17:23:08 +08006093
Jiang Xin1b7f4a32015-08-23 15:23:21 +08006094#: builtin/clean.c:33
Wang Sheng07432ce2013-01-30 17:23:08 +08006095#, c-format
6096msgid "failed to remove %s"
6097msgstr "无法删除 %s"
6098
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006099#: builtin/clean.c:291 git-add--interactive.perl:623
6100#, c-format
Jiang Xin2e8451e2013-07-26 14:00:02 +08006101msgid ""
6102"Prompt help:\n"
6103"1 - select a numbered item\n"
6104"foo - select item based on unique prefix\n"
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006105" - (empty) select nothing\n"
Jiang Xin2e8451e2013-07-26 14:00:02 +08006106msgstr ""
6107"帮助:\n"
6108"1 - 通过编号选择一个选项\n"
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006109"foo - 通过唯一前缀选择一个选项\n"
6110" - (空)什么也不选择\n"
Jiang Xin2e8451e2013-07-26 14:00:02 +08006111
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006112#: builtin/clean.c:295 git-add--interactive.perl:632
6113#, c-format
Jiang Xin2e8451e2013-07-26 14:00:02 +08006114msgid ""
6115"Prompt help:\n"
6116"1 - select a single item\n"
6117"3-5 - select a range of items\n"
6118"2-3,6-9 - select multiple ranges\n"
6119"foo - select item based on unique prefix\n"
6120"-... - unselect specified items\n"
6121"* - choose all items\n"
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006122" - (empty) finish selecting\n"
Jiang Xin2e8451e2013-07-26 14:00:02 +08006123msgstr ""
6124"帮助:\n"
6125"1 - 选择一个选项\n"
6126"3-5 - 选择一个范围内的所有选项\n"
6127"2-3,6-9 - 选择多个范围内的所有选项\n"
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006128"foo - 通过唯一前缀选择一个选项\n"
Jiang Xin2e8451e2013-07-26 14:00:02 +08006129"-... - 反选特定的选项\n"
6130"* - 选择所有选项\n"
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006131" - (空)结束选择\n"
Jiang Xin2e8451e2013-07-26 14:00:02 +08006132
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006133#: builtin/clean.c:511 git-add--interactive.perl:598
6134#: git-add--interactive.perl:603
6135#, c-format, perl-format
6136msgid "Huh (%s)?\n"
6137msgstr "嗯(%s)?\n"
Jiang Xin2e8451e2013-07-26 14:00:02 +08006138
Jiang Xin276ceea2016-02-28 20:35:55 +08006139#: builtin/clean.c:653
Jiang Xin2e8451e2013-07-26 14:00:02 +08006140#, c-format
6141msgid "Input ignore patterns>> "
6142msgstr "输入模版以排除条目>> "
6143
Jiang Xin276ceea2016-02-28 20:35:55 +08006144#: builtin/clean.c:690
Jiang Xin2e8451e2013-07-26 14:00:02 +08006145#, c-format
6146msgid "WARNING: Cannot find items matched by: %s"
6147msgstr "警告:无法找到和 %s 匹配的条目"
6148
Jiang Xin276ceea2016-02-28 20:35:55 +08006149#: builtin/clean.c:711
Jiang Xin2e8451e2013-07-26 14:00:02 +08006150msgid "Select items to delete"
6151msgstr "选择要删除的条目"
6152
Jiang Xin814ff312015-02-16 21:34:19 +08006153#. TRANSLATORS: Make sure to keep [y/N] as is
Jiang Xin276ceea2016-02-28 20:35:55 +08006154#: builtin/clean.c:752
Jiang Xin2e8451e2013-07-26 14:00:02 +08006155#, c-format
Jiang Xin814ff312015-02-16 21:34:19 +08006156msgid "Remove %s [y/N]? "
6157msgstr "删除 %s [y/N]?"
Jiang Xin2e8451e2013-07-26 14:00:02 +08006158
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006159#: builtin/clean.c:777 git-add--interactive.perl:1669
6160#, c-format
6161msgid "Bye.\n"
6162msgstr "再见。\n"
Jiang Xin2e8451e2013-07-26 14:00:02 +08006163
Jiang Xin276ceea2016-02-28 20:35:55 +08006164#: builtin/clean.c:785
Jiang Xin2e8451e2013-07-26 14:00:02 +08006165msgid ""
6166"clean - start cleaning\n"
6167"filter by pattern - exclude items from deletion\n"
6168"select by numbers - select items to be deleted by numbers\n"
6169"ask each - confirm each deletion (like \"rm -i\")\n"
6170"quit - stop cleaning\n"
6171"help - this screen\n"
6172"? - help for prompt selection"
6173msgstr ""
6174"clean - 开始清理\n"
6175"filter by pattern - 通过模版排除要删除的条目\n"
6176"select by numbers - 通过数字选择要删除的条目\n"
6177"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
6178"quit - 停止删除并退出\n"
6179"help - 显示本帮助\n"
6180"? - 显示如何在提示符下选择的帮助"
6181
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006182#: builtin/clean.c:812 git-add--interactive.perl:1745
Jiang Xin2e8451e2013-07-26 14:00:02 +08006183msgid "*** Commands ***"
6184msgstr "*** 命令 ***"
6185
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006186#: builtin/clean.c:813 git-add--interactive.perl:1742
Jiang Xin2e8451e2013-07-26 14:00:02 +08006187msgid "What now"
6188msgstr "请选择"
6189
Jiang Xin276ceea2016-02-28 20:35:55 +08006190#: builtin/clean.c:821
Jiang Xin2e8451e2013-07-26 14:00:02 +08006191msgid "Would remove the following item:"
6192msgid_plural "Would remove the following items:"
6193msgstr[0] "将删除如下条目:"
6194msgstr[1] "将删除如下条目:"
6195
Jiang Xin276ceea2016-02-28 20:35:55 +08006196#: builtin/clean.c:838
Jiang Xin2e8451e2013-07-26 14:00:02 +08006197msgid "No more files to clean, exiting."
6198msgstr "没有要清理的文件,退出。"
6199
Jiang Xin276ceea2016-02-28 20:35:55 +08006200#: builtin/clean.c:869
Jiang Xinef317cd2012-09-15 11:17:00 +08006201msgid "do not print names of files removed"
Wang Sheng07432ce2013-01-30 17:23:08 +08006202msgstr "不打印删除文件的名称"
Jiang Xinef317cd2012-09-15 11:17:00 +08006203
Jiang Xin276ceea2016-02-28 20:35:55 +08006204#: builtin/clean.c:871
Jiang Xinef317cd2012-09-15 11:17:00 +08006205msgid "force"
Wang Sheng07432ce2013-01-30 17:23:08 +08006206msgstr "强制"
Jiang Xinef317cd2012-09-15 11:17:00 +08006207
Jiang Xin276ceea2016-02-28 20:35:55 +08006208#: builtin/clean.c:872
Jiang Xin2e8451e2013-07-26 14:00:02 +08006209msgid "interactive cleaning"
6210msgstr "交互式清除"
6211
Jiang Xin276ceea2016-02-28 20:35:55 +08006212#: builtin/clean.c:874
Jiang Xinef317cd2012-09-15 11:17:00 +08006213msgid "remove whole directories"
Wang Sheng07432ce2013-01-30 17:23:08 +08006214msgstr "删除整个目录"
Jiang Xinef317cd2012-09-15 11:17:00 +08006215
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006216#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056
6217#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176
Jiang Xinef317cd2012-09-15 11:17:00 +08006218msgid "pattern"
Wang Sheng07432ce2013-01-30 17:23:08 +08006219msgstr "模式"
Jiang Xinef317cd2012-09-15 11:17:00 +08006220
Jiang Xin276ceea2016-02-28 20:35:55 +08006221#: builtin/clean.c:876
Jiang Xinef317cd2012-09-15 11:17:00 +08006222msgid "add <pattern> to ignore rules"
Ray Chen4375c102015-08-10 18:03:29 +08006223msgstr "添加 <模式> 到忽略规则"
Jiang Xinef317cd2012-09-15 11:17:00 +08006224
Jiang Xin276ceea2016-02-28 20:35:55 +08006225#: builtin/clean.c:877
Jiang Xinef317cd2012-09-15 11:17:00 +08006226msgid "remove ignored files, too"
Wang Sheng07432ce2013-01-30 17:23:08 +08006227msgstr "也删除忽略的文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08006228
Jiang Xin276ceea2016-02-28 20:35:55 +08006229#: builtin/clean.c:879
Jiang Xinef317cd2012-09-15 11:17:00 +08006230msgid "remove only ignored files"
Wang Sheng07432ce2013-01-30 17:23:08 +08006231msgstr "只删除忽略的文件"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006232
Jiang Xin276ceea2016-02-28 20:35:55 +08006233#: builtin/clean.c:897
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006234msgid "-x and -X cannot be used together"
Jiang Xin649900b2012-08-02 11:50:59 +08006235msgstr "-x 和 -X 不能同时使用"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006236
Jiang Xin276ceea2016-02-28 20:35:55 +08006237#: builtin/clean.c:901
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006238msgid ""
Jiang Xin6c94aba2014-03-13 12:41:34 +08006239"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006240"clean"
6241msgstr ""
Jiang Xin2e8451e2013-07-26 14:00:02 +08006242"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006243
Jiang Xin276ceea2016-02-28 20:35:55 +08006244#: builtin/clean.c:904
Jiang Xin2e8451e2013-07-26 14:00:02 +08006245msgid ""
Jiang Xin6c94aba2014-03-13 12:41:34 +08006246"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
Jiang Xin2e8451e2013-07-26 14:00:02 +08006247"refusing to clean"
6248msgstr ""
6249"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
6250
Jiang Xin220c3132014-10-08 10:55:14 +08006251#: builtin/clone.c:37
Jiang Xin814ff312015-02-16 21:34:19 +08006252msgid "git clone [<options>] [--] <repo> [<dir>]"
Jiang Xin160fb2b2015-08-02 21:47:30 +08006253msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
Jiang Xinef317cd2012-09-15 11:17:00 +08006254
Jiang Xina0b6b242016-10-27 21:53:37 +08006255#: builtin/clone.c:65
Jiang Xinef317cd2012-09-15 11:17:00 +08006256msgid "don't create a checkout"
Wang Sheng07432ce2013-01-30 17:23:08 +08006257msgstr "不创建一个检出"
Jiang Xinef317cd2012-09-15 11:17:00 +08006258
Jiang Xina0b6b242016-10-27 21:53:37 +08006259#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
Jiang Xinef317cd2012-09-15 11:17:00 +08006260msgid "create a bare repository"
Jiang Xin160fb2b2015-08-02 21:47:30 +08006261msgstr "创建一个纯仓库"
Jiang Xinef317cd2012-09-15 11:17:00 +08006262
Jiang Xina0b6b242016-10-27 21:53:37 +08006263#: builtin/clone.c:70
Jiang Xinef317cd2012-09-15 11:17:00 +08006264msgid "create a mirror repository (implies bare)"
Jiang Xin160fb2b2015-08-02 21:47:30 +08006265msgstr "创建一个镜像仓库(也是纯仓库)"
Jiang Xinef317cd2012-09-15 11:17:00 +08006266
Jiang Xina0b6b242016-10-27 21:53:37 +08006267#: builtin/clone.c:72
Jiang Xinef317cd2012-09-15 11:17:00 +08006268msgid "to clone from a local repository"
Jiang Xin160fb2b2015-08-02 21:47:30 +08006269msgstr "从本地仓库克隆"
Jiang Xinef317cd2012-09-15 11:17:00 +08006270
Jiang Xina0b6b242016-10-27 21:53:37 +08006271#: builtin/clone.c:74
Jiang Xinef317cd2012-09-15 11:17:00 +08006272msgid "don't use local hardlinks, always copy"
Wang Sheng07432ce2013-01-30 17:23:08 +08006273msgstr "不使用本地硬链接,始终复制"
Jiang Xinef317cd2012-09-15 11:17:00 +08006274
Jiang Xina0b6b242016-10-27 21:53:37 +08006275#: builtin/clone.c:76
Jiang Xinef317cd2012-09-15 11:17:00 +08006276msgid "setup as shared repository"
Jiang Xin160fb2b2015-08-02 21:47:30 +08006277msgstr "设置为共享仓库"
Jiang Xinef317cd2012-09-15 11:17:00 +08006278
Jiang Xina0b6b242016-10-27 21:53:37 +08006279#: builtin/clone.c:78 builtin/clone.c:80
Jiang Xinef317cd2012-09-15 11:17:00 +08006280msgid "initialize submodules in the clone"
Wang Sheng07432ce2013-01-30 17:23:08 +08006281msgstr "在克隆时初始化子模组"
Jiang Xinef317cd2012-09-15 11:17:00 +08006282
Jiang Xina0b6b242016-10-27 21:53:37 +08006283#: builtin/clone.c:82
Jiang Xin5b04ee32016-05-29 20:40:35 +08006284msgid "number of submodules cloned in parallel"
6285msgstr "并发克隆的子模组的数量"
6286
Jiang Xina0b6b242016-10-27 21:53:37 +08006287#: builtin/clone.c:83 builtin/init-db.c:475
Jiang Xinef317cd2012-09-15 11:17:00 +08006288msgid "template-directory"
Wang Sheng07432ce2013-01-30 17:23:08 +08006289msgstr "模板目录"
Jiang Xinef317cd2012-09-15 11:17:00 +08006290
Jiang Xina0b6b242016-10-27 21:53:37 +08006291#: builtin/clone.c:84 builtin/init-db.c:476
Jiang Xinef317cd2012-09-15 11:17:00 +08006292msgid "directory from which templates will be used"
Wang Sheng07432ce2013-01-30 17:23:08 +08006293msgstr "模板目录将被使用"
Jiang Xinef317cd2012-09-15 11:17:00 +08006294
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006295#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604
6296#: builtin/submodule--helper.c:970
Jiang Xinef317cd2012-09-15 11:17:00 +08006297msgid "reference repository"
Jiang Xin160fb2b2015-08-02 21:47:30 +08006298msgstr "参考仓库"
Jiang Xinef317cd2012-09-15 11:17:00 +08006299
Jiang Xina0b6b242016-10-27 21:53:37 +08006300#: builtin/clone.c:90
Jiang Xin04cb2f22015-01-04 12:27:38 +08006301msgid "use --reference only while cloning"
Jiang Xin160fb2b2015-08-02 21:47:30 +08006302msgstr "仅在克隆时参考 --reference 指向的本地仓库"
Jiang Xin04cb2f22015-01-04 12:27:38 +08006303
Jiang Xina0b6b242016-10-27 21:53:37 +08006304#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
Jiang Xin7aea43f2015-05-31 08:42:31 +08006305msgid "name"
6306msgstr "名称"
6307
Jiang Xina0b6b242016-10-27 21:53:37 +08006308#: builtin/clone.c:92
Jiang Xin7aea43f2015-05-31 08:42:31 +08006309msgid "use <name> instead of 'origin' to track upstream"
Ray Chen4375c102015-08-10 18:03:29 +08006310msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
Jiang Xin7aea43f2015-05-31 08:42:31 +08006311
Jiang Xina0b6b242016-10-27 21:53:37 +08006312#: builtin/clone.c:94
Jiang Xin7aea43f2015-05-31 08:42:31 +08006313msgid "checkout <branch> instead of the remote's HEAD"
Ray Chen4375c102015-08-10 18:03:29 +08006314msgstr "检出 <分支> 而不是远程 HEAD"
Jiang Xin7aea43f2015-05-31 08:42:31 +08006315
Jiang Xina0b6b242016-10-27 21:53:37 +08006316#: builtin/clone.c:96
Jiang Xin7aea43f2015-05-31 08:42:31 +08006317msgid "path to git-upload-pack on the remote"
6318msgstr "远程 git-upload-pack 路径"
6319
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006320#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999
Jiang Xina0b6b242016-10-27 21:53:37 +08006321#: builtin/pull.c:202
Jiang Xin7aea43f2015-05-31 08:42:31 +08006322msgid "depth"
6323msgstr "深度"
6324
Jiang Xina0b6b242016-10-27 21:53:37 +08006325#: builtin/clone.c:98
Jiang Xin7aea43f2015-05-31 08:42:31 +08006326msgid "create a shallow clone of that depth"
6327msgstr "创建一个指定深度的浅克隆"
6328
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006329#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836
Jiang Xina0b6b242016-10-27 21:53:37 +08006330#: parse-options.h:142
6331msgid "time"
6332msgstr "时间"
6333
6334#: builtin/clone.c:100
6335msgid "create a shallow clone since a specific time"
6336msgstr "从一个特定时间创建一个浅克隆"
6337
6338#: builtin/clone.c:101 builtin/fetch.c:124
6339msgid "revision"
6340msgstr "版本"
6341
6342#: builtin/clone.c:102 builtin/fetch.c:125
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006343msgid "deepen history of shallow clone, excluding rev"
6344msgstr "深化浅克隆的历史,除了特定版本"
Jiang Xina0b6b242016-10-27 21:53:37 +08006345
6346#: builtin/clone.c:104
Jiang Xin7aea43f2015-05-31 08:42:31 +08006347msgid "clone only one branch, HEAD or --branch"
6348msgstr "只克隆一个分支、HEAD 或 --branch"
6349
Jiang Xina0b6b242016-10-27 21:53:37 +08006350#: builtin/clone.c:106
Jiang Xin5b04ee32016-05-29 20:40:35 +08006351msgid "any cloned submodules will be shallow"
6352msgstr "子模组将以浅下载模式克隆"
6353
Jiang Xina0b6b242016-10-27 21:53:37 +08006354#: builtin/clone.c:107 builtin/init-db.c:484
Jiang Xinef317cd2012-09-15 11:17:00 +08006355msgid "gitdir"
Wang Sheng07432ce2013-01-30 17:23:08 +08006356msgstr "git目录"
Jiang Xinef317cd2012-09-15 11:17:00 +08006357
Jiang Xina0b6b242016-10-27 21:53:37 +08006358#: builtin/clone.c:108 builtin/init-db.c:485
Jiang Xinef317cd2012-09-15 11:17:00 +08006359msgid "separate git dir from working tree"
Wang Sheng07432ce2013-01-30 17:23:08 +08006360msgstr "git目录和工作区分离"
Jiang Xinef317cd2012-09-15 11:17:00 +08006361
Jiang Xina0b6b242016-10-27 21:53:37 +08006362#: builtin/clone.c:109
Jiang Xinef317cd2012-09-15 11:17:00 +08006363msgid "key=value"
Wang Sheng07432ce2013-01-30 17:23:08 +08006364msgstr "key=value"
Jiang Xinef317cd2012-09-15 11:17:00 +08006365
Jiang Xina0b6b242016-10-27 21:53:37 +08006366#: builtin/clone.c:110
Jiang Xinef317cd2012-09-15 11:17:00 +08006367msgid "set config inside the new repository"
Jiang Xin160fb2b2015-08-02 21:47:30 +08006368msgstr "在新仓库中设置配置信息"
Jiang Xinef317cd2012-09-15 11:17:00 +08006369
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006370#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550
Jiang Xin276ceea2016-02-28 20:35:55 +08006371msgid "use IPv4 addresses only"
6372msgstr "只使用 IPv4 地址"
6373
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006374#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552
Jiang Xin276ceea2016-02-28 20:35:55 +08006375msgid "use IPv6 addresses only"
6376msgstr "只使用 IPv6 地址"
6377
Jiang Xina0b6b242016-10-27 21:53:37 +08006378#: builtin/clone.c:250
Jiang Xin34956282016-03-12 22:09:24 +08006379msgid ""
6380"No directory name could be guessed.\n"
6381"Please specify a directory on the command line"
6382msgstr ""
6383"无法猜到目录名。\n"
Ray Chen26e4cbe2016-03-16 11:44:44 +08006384"请在命令行指定一个目录"
Jiang Xin34956282016-03-12 22:09:24 +08006385
Jiang Xina0b6b242016-10-27 21:53:37 +08006386#: builtin/clone.c:303
Jiang Xin94550ed2015-11-16 07:02:11 +08006387#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +08006388msgid "info: Could not add alternate for '%s': %s\n"
6389msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
Jiang Xin94550ed2015-11-16 07:02:11 +08006390
Jiang Xina0b6b242016-10-27 21:53:37 +08006391#: builtin/clone.c:375
Jiang Xin5c57d762016-08-28 10:18:12 +08006392#, c-format
6393msgid "failed to open '%s'"
6394msgstr "无法打开 '%s'"
6395
Jiang Xina0b6b242016-10-27 21:53:37 +08006396#: builtin/clone.c:383
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006397#, c-format
6398msgid "%s exists and is not a directory"
6399msgstr "%s 存在且不是一个目录"
6400
Jiang Xina0b6b242016-10-27 21:53:37 +08006401#: builtin/clone.c:397
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006402#, c-format
6403msgid "failed to stat %s\n"
Jiang Xin90e6ef52012-03-27 14:46:11 +08006404msgstr "无法枚举 %s 状态\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006405
Jiang Xina0b6b242016-10-27 21:53:37 +08006406#: builtin/clone.c:419
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006407#, c-format
6408msgid "failed to create link '%s'"
Jiang Xin90e6ef52012-03-27 14:46:11 +08006409msgstr "无法创建链接 '%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006410
Jiang Xina0b6b242016-10-27 21:53:37 +08006411#: builtin/clone.c:423
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006412#, c-format
6413msgid "failed to copy file to '%s'"
Jiang Xin90e6ef52012-03-27 14:46:11 +08006414msgstr "无法拷贝文件至 '%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006415
Jiang Xina0b6b242016-10-27 21:53:37 +08006416#: builtin/clone.c:448
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006417#, c-format
6418msgid "done.\n"
6419msgstr "完成。\n"
6420
Jiang Xina0b6b242016-10-27 21:53:37 +08006421#: builtin/clone.c:460
Jiang Xin1003b3a2013-04-11 17:55:09 +08006422msgid ""
6423"Clone succeeded, but checkout failed.\n"
6424"You can inspect what was checked out with 'git status'\n"
6425"and retry the checkout with 'git checkout -f HEAD'\n"
6426msgstr ""
6427"克隆成功,但是检出失败。\n"
6428"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
6429"'git checkout -f HEAD' 重试\n"
6430
Jiang Xina0b6b242016-10-27 21:53:37 +08006431#: builtin/clone.c:537
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006432#, c-format
6433msgid "Could not find remote branch %s to clone."
Jiang Xin90e6ef52012-03-27 14:46:11 +08006434msgstr "不能发现要克隆的远程分支 %s。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006435
Jiang Xina0b6b242016-10-27 21:53:37 +08006436#: builtin/clone.c:632
Jiang Xin1003b3a2013-04-11 17:55:09 +08006437msgid "remote did not send all necessary objects"
6438msgstr "远程没有发送所有必须的对象"
6439
Jiang Xina0b6b242016-10-27 21:53:37 +08006440#: builtin/clone.c:648
Jiang Xin34956282016-03-12 22:09:24 +08006441#, c-format
6442msgid "unable to update %s"
6443msgstr "不能更新 %s"
6444
Jiang Xina0b6b242016-10-27 21:53:37 +08006445#: builtin/clone.c:697
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006446msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
6447msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
6448
Jiang Xina0b6b242016-10-27 21:53:37 +08006449#: builtin/clone.c:728
Jiang Xin1003b3a2013-04-11 17:55:09 +08006450msgid "unable to checkout working tree"
6451msgstr "不能检出工作区"
6452
Jiang Xina0b6b242016-10-27 21:53:37 +08006453#: builtin/clone.c:768
Jiang Xin34956282016-03-12 22:09:24 +08006454msgid "unable to write parameters to config file"
6455msgstr "无法将参数写入配置文件"
6456
Jiang Xina0b6b242016-10-27 21:53:37 +08006457#: builtin/clone.c:831
Jiang Xin04cb2f22015-01-04 12:27:38 +08006458msgid "cannot repack to clean up"
6459msgstr "无法执行 repack 来清理"
6460
Jiang Xina0b6b242016-10-27 21:53:37 +08006461#: builtin/clone.c:833
Jiang Xin04cb2f22015-01-04 12:27:38 +08006462msgid "cannot unlink temporary alternates file"
6463msgstr "无法删除临时的 alternates 文件"
6464
Jiang Xina0b6b242016-10-27 21:53:37 +08006465#: builtin/clone.c:866 builtin/receive-pack.c:1895
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006466msgid "Too many arguments."
6467msgstr "太多参数。"
6468
Jiang Xina0b6b242016-10-27 21:53:37 +08006469#: builtin/clone.c:870
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006470msgid "You must specify a repository to clone."
Jiang Xin160fb2b2015-08-02 21:47:30 +08006471msgstr "您必须指定一个仓库来克隆。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006472
Jiang Xina0b6b242016-10-27 21:53:37 +08006473#: builtin/clone.c:883
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006474#, c-format
6475msgid "--bare and --origin %s options are incompatible."
6476msgstr "--bare 和 --origin %s 选项不兼容。"
6477
Jiang Xina0b6b242016-10-27 21:53:37 +08006478#: builtin/clone.c:886
Wang Sheng07432ce2013-01-30 17:23:08 +08006479msgid "--bare and --separate-git-dir are incompatible."
6480msgstr "--bare 和 --separate-git-dir 选项不兼容。"
6481
Jiang Xina0b6b242016-10-27 21:53:37 +08006482#: builtin/clone.c:899
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006483#, c-format
6484msgid "repository '%s' does not exist"
Jiang Xin160fb2b2015-08-02 21:47:30 +08006485msgstr "仓库 '%s' 不存在"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006486
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006487#: builtin/clone.c:905 builtin/fetch.c:1335
Jiang Xincfff71a2014-01-18 11:04:21 +08006488#, c-format
6489msgid "depth %s is not a positive number"
6490msgstr "深度 %s 不是一个正数"
6491
Jiang Xina0b6b242016-10-27 21:53:37 +08006492#: builtin/clone.c:915
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006493#, c-format
6494msgid "destination path '%s' already exists and is not an empty directory."
Jiang Xin90e6ef52012-03-27 14:46:11 +08006495msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006496
Jiang Xina0b6b242016-10-27 21:53:37 +08006497#: builtin/clone.c:925
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006498#, c-format
6499msgid "working tree '%s' already exists."
6500msgstr "工作区 '%s' 已经存在。"
6501
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006502#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252
6503#: builtin/submodule--helper.c:659 builtin/worktree.c:222
6504#: builtin/worktree.c:249
Jiang Xin5bb01d42015-07-14 07:33:09 +08006505#, c-format
6506msgid "could not create leading directories of '%s'"
6507msgstr "不能为 '%s' 创建先导目录"
6508
Jiang Xina0b6b242016-10-27 21:53:37 +08006509#: builtin/clone.c:943
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006510#, c-format
Jiang Xin814ff312015-02-16 21:34:19 +08006511msgid "could not create work tree dir '%s'"
6512msgstr "不能创建工作区目录 '%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006513
Jiang Xina0b6b242016-10-27 21:53:37 +08006514#: builtin/clone.c:955
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006515#, c-format
6516msgid "Cloning into bare repository '%s'...\n"
Jiang Xin160fb2b2015-08-02 21:47:30 +08006517msgstr "克隆到纯仓库 '%s'...\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006518
Jiang Xina0b6b242016-10-27 21:53:37 +08006519#: builtin/clone.c:957
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006520#, c-format
6521msgid "Cloning into '%s'...\n"
6522msgstr "正克隆到 '%s'...\n"
6523
Jiang Xina0b6b242016-10-27 21:53:37 +08006524#: builtin/clone.c:963
6525msgid ""
6526"clone --recursive is not compatible with both --reference and --reference-if-"
6527"able"
6528msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
Jiang Xin6acbf032014-08-04 16:23:15 +08006529
Jiang Xina0b6b242016-10-27 21:53:37 +08006530#: builtin/clone.c:1019
6531msgid "--depth is ignored in local clones; use file:// instead."
6532msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
6533
6534#: builtin/clone.c:1021
6535msgid "--shallow-since is ignored in local clones; use file:// instead."
6536msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
6537
6538#: builtin/clone.c:1023
6539msgid "--shallow-exclude is ignored in local clones; use file:// instead."
6540msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
6541
6542#: builtin/clone.c:1026
Jiang Xin6acbf032014-08-04 16:23:15 +08006543msgid "source repository is shallow, ignoring --local"
Jiang Xin160fb2b2015-08-02 21:47:30 +08006544msgstr "源仓库是浅克隆,忽略 --local"
Jiang Xin6acbf032014-08-04 16:23:15 +08006545
Jiang Xina0b6b242016-10-27 21:53:37 +08006546#: builtin/clone.c:1031
Jiang Xin6acbf032014-08-04 16:23:15 +08006547msgid "--local is ignored"
6548msgstr "--local 被忽略"
6549
Jiang Xina0b6b242016-10-27 21:53:37 +08006550#: builtin/clone.c:1035
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006551#, c-format
6552msgid "Don't know how to clone %s"
6553msgstr "不知道如何克隆 %s"
6554
Jiang Xina0b6b242016-10-27 21:53:37 +08006555#: builtin/clone.c:1090 builtin/clone.c:1098
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006556#, c-format
6557msgid "Remote branch %s not found in upstream %s"
6558msgstr "远程分支 %s 在上游 %s 未发现"
6559
Jiang Xina0b6b242016-10-27 21:53:37 +08006560#: builtin/clone.c:1101
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006561msgid "You appear to have cloned an empty repository."
Jiang Xin160fb2b2015-08-02 21:47:30 +08006562msgstr "您似乎克隆了一个空仓库。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006563
Jiang Xinef317cd2012-09-15 11:17:00 +08006564#: builtin/column.c:9
Jiang Xin814ff312015-02-16 21:34:19 +08006565msgid "git column [<options>]"
6566msgstr "git column [<选项>]"
Jiang Xinef317cd2012-09-15 11:17:00 +08006567
6568#: builtin/column.c:26
6569msgid "lookup config vars"
Wang Sheng07432ce2013-01-30 17:23:08 +08006570msgstr "查找配置变量"
Jiang Xinef317cd2012-09-15 11:17:00 +08006571
6572#: builtin/column.c:27 builtin/column.c:28
Jiang Xinef317cd2012-09-15 11:17:00 +08006573msgid "layout to use"
Wang Sheng07432ce2013-01-30 17:23:08 +08006574msgstr "要使用的布局"
Jiang Xinef317cd2012-09-15 11:17:00 +08006575
6576#: builtin/column.c:29
6577msgid "Maximum width"
Wang Sheng07432ce2013-01-30 17:23:08 +08006578msgstr "最大宽度"
Jiang Xinef317cd2012-09-15 11:17:00 +08006579
6580#: builtin/column.c:30
6581msgid "Padding space on left border"
Wang Sheng07432ce2013-01-30 17:23:08 +08006582msgstr "左边框的填充空间"
Jiang Xinef317cd2012-09-15 11:17:00 +08006583
6584#: builtin/column.c:31
6585msgid "Padding space on right border"
Wang Sheng07432ce2013-01-30 17:23:08 +08006586msgstr "右边框的填充空间"
Jiang Xinef317cd2012-09-15 11:17:00 +08006587
6588#: builtin/column.c:32
6589msgid "Padding space between columns"
Wang Sheng07432ce2013-01-30 17:23:08 +08006590msgstr "两列之间的填充空间"
Jiang Xinef317cd2012-09-15 11:17:00 +08006591
Jiang Xin8ada9592012-05-21 09:35:47 +08006592#: builtin/column.c:51
6593msgid "--command must be the first argument"
Jiang Xin81809b92012-05-30 12:19:47 +08006594msgstr "--command 必须是第一个参数"
Jiang Xin8ada9592012-05-21 09:35:47 +08006595
Jiang Xin94550ed2015-11-16 07:02:11 +08006596#: builtin/commit.c:38
Jiang Xin814ff312015-02-16 21:34:19 +08006597msgid "git commit [<options>] [--] <pathspec>..."
Jiang Xin160fb2b2015-08-02 21:47:30 +08006598msgstr "git commit [<选项>] [--] <路径规格>..."
Jiang Xinef317cd2012-09-15 11:17:00 +08006599
Jiang Xin94550ed2015-11-16 07:02:11 +08006600#: builtin/commit.c:43
Jiang Xin814ff312015-02-16 21:34:19 +08006601msgid "git status [<options>] [--] <pathspec>..."
Jiang Xin160fb2b2015-08-02 21:47:30 +08006602msgstr "git status [<选项>] [--] <路径规格>..."
Jiang Xinef317cd2012-09-15 11:17:00 +08006603
Jiang Xin94550ed2015-11-16 07:02:11 +08006604#: builtin/commit.c:48
Jiang Xin220c3132014-10-08 10:55:14 +08006605msgid ""
6606"Your name and email address were configured automatically based\n"
6607"on your username and hostname. Please check that they are accurate.\n"
6608"You can suppress this message by setting them explicitly. Run the\n"
6609"following command and follow the instructions in your editor to edit\n"
6610"your configuration file:\n"
6611"\n"
6612" git config --global --edit\n"
6613"\n"
6614"After doing this, you may fix the identity used for this commit with:\n"
6615"\n"
6616" git commit --amend --reset-author\n"
6617msgstr ""
6618"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6619"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
6620"中编辑您的配置文件:\n"
6621"\n"
6622" git config --global --edit\n"
6623"\n"
6624"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6625"\n"
6626" git commit --amend --reset-author\n"
6627
Jiang Xin94550ed2015-11-16 07:02:11 +08006628#: builtin/commit.c:61
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006629msgid ""
6630"Your name and email address were configured automatically based\n"
6631"on your username and hostname. Please check that they are accurate.\n"
6632"You can suppress this message by setting them explicitly:\n"
6633"\n"
6634" git config --global user.name \"Your Name\"\n"
6635" git config --global user.email you@example.com\n"
6636"\n"
6637"After doing this, you may fix the identity used for this commit with:\n"
6638"\n"
6639" git commit --amend --reset-author\n"
6640msgstr ""
Jiang Xin90e6ef52012-03-27 14:46:11 +08006641"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
Jiang Xin220c3132014-10-08 10:55:14 +08006642"与否。您可以对其进行设置以免再出现本提示信息:\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006643"\n"
6644" git config --global user.name \"Your Name\"\n"
6645" git config --global user.email you@example.com\n"
6646"\n"
Jiang Xin90e6ef52012-03-27 14:46:11 +08006647"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006648"\n"
6649" git commit --amend --reset-author\n"
6650
Jiang Xin94550ed2015-11-16 07:02:11 +08006651#: builtin/commit.c:73
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006652msgid ""
6653"You asked to amend the most recent commit, but doing so would make\n"
6654"it empty. You can repeat your command with --allow-empty, or you can\n"
6655"remove the commit entirely with \"git reset HEAD^\".\n"
6656msgstr ""
Thynson1b150dc2012-02-29 02:08:22 +08006657"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
6658"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006659
Jiang Xin94550ed2015-11-16 07:02:11 +08006660#: builtin/commit.c:78
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006661msgid ""
6662"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
6663"If you wish to commit it anyway, use:\n"
6664"\n"
6665" git commit --allow-empty\n"
6666"\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006667msgstr ""
Thynsona9ce4542012-02-29 02:03:39 +08006668"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
6669"也要提交,使用命令:\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006670"\n"
6671" git commit --allow-empty\n"
6672"\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006673
Jiang Xin94550ed2015-11-16 07:02:11 +08006674#: builtin/commit.c:85
Jiang Xinb1894382013-08-06 14:49:18 +08006675msgid "Otherwise, please use 'git reset'\n"
6676msgstr "否则,请使用命令 'git reset'\n"
6677
Jiang Xin94550ed2015-11-16 07:02:11 +08006678#: builtin/commit.c:88
Jiang Xinb1894382013-08-06 14:49:18 +08006679msgid ""
6680"If you wish to skip this commit, use:\n"
6681"\n"
6682" git reset\n"
6683"\n"
6684"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
6685"the remaining commits.\n"
6686msgstr ""
6687"如果您想跳过这个提交,使用命令:\n"
6688"\n"
6689" git reset\n"
6690"\n"
6691"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
6692"操作。\n"
6693
Jiang Xina0b6b242016-10-27 21:53:37 +08006694#: builtin/commit.c:318
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006695msgid "failed to unpack HEAD tree object"
Jiang Xin90e6ef52012-03-27 14:46:11 +08006696msgstr "无法解包 HEAD 树对象"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006697
Jiang Xina0b6b242016-10-27 21:53:37 +08006698#: builtin/commit.c:359
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006699msgid "unable to create temporary index"
Jiang Xin90e6ef52012-03-27 14:46:11 +08006700msgstr "不能创建临时索引"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006701
Jiang Xina0b6b242016-10-27 21:53:37 +08006702#: builtin/commit.c:365
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006703msgid "interactive add failed"
6704msgstr "交互式添加失败"
6705
Jiang Xina0b6b242016-10-27 21:53:37 +08006706#: builtin/commit.c:378
Jiang Xin220c3132014-10-08 10:55:14 +08006707msgid "unable to update temporary index"
6708msgstr "无法更新临时索引"
6709
Jiang Xina0b6b242016-10-27 21:53:37 +08006710#: builtin/commit.c:380
Jiang Xin220c3132014-10-08 10:55:14 +08006711msgid "Failed to update main cache tree"
6712msgstr "不能更新树的主缓存"
6713
Jiang Xina0b6b242016-10-27 21:53:37 +08006714#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006715msgid "unable to write new_index file"
Jiang Xin90e6ef52012-03-27 14:46:11 +08006716msgstr "无法写 new_index 文件"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006717
Jiang Xina0b6b242016-10-27 21:53:37 +08006718#: builtin/commit.c:458
Jiang Xin8ada9592012-05-21 09:35:47 +08006719msgid "cannot do a partial commit during a merge."
Jiang Xin81809b92012-05-30 12:19:47 +08006720msgstr "在合并过程中不能做部分提交。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006721
Jiang Xina0b6b242016-10-27 21:53:37 +08006722#: builtin/commit.c:460
Jiang Xin8ada9592012-05-21 09:35:47 +08006723msgid "cannot do a partial commit during a cherry-pick."
Jiang Xin81809b92012-05-30 12:19:47 +08006724msgstr "在拣选过程中不能做部分提交。"
Jiang Xin8ada9592012-05-21 09:35:47 +08006725
Jiang Xina0b6b242016-10-27 21:53:37 +08006726#: builtin/commit.c:469
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006727msgid "cannot read the index"
Jiang Xin90e6ef52012-03-27 14:46:11 +08006728msgstr "无法读取索引"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006729
Jiang Xina0b6b242016-10-27 21:53:37 +08006730#: builtin/commit.c:488
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006731msgid "unable to write temporary index file"
Jiang Xin90e6ef52012-03-27 14:46:11 +08006732msgstr "无法写临时索引文件"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006733
Jiang Xina0b6b242016-10-27 21:53:37 +08006734#: builtin/commit.c:582
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006735#, c-format
Jiang Xin220c3132014-10-08 10:55:14 +08006736msgid "commit '%s' lacks author header"
6737msgstr "提交 '%s' 缺少作者信息"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006738
Jiang Xina0b6b242016-10-27 21:53:37 +08006739#: builtin/commit.c:584
Jiang Xin220c3132014-10-08 10:55:14 +08006740#, c-format
6741msgid "commit '%s' has malformed author line"
6742msgstr "提交 '%s' 有非法的作者信息"
6743
Jiang Xina0b6b242016-10-27 21:53:37 +08006744#: builtin/commit.c:603
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006745msgid "malformed --author parameter"
6746msgstr "非法的 --author 参数"
6747
Jiang Xina0b6b242016-10-27 21:53:37 +08006748#: builtin/commit.c:611
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006749#, c-format
Jiang Xin6acbf032014-08-04 16:23:15 +08006750msgid "invalid date format: %s"
6751msgstr "无效的日期格式:%s"
6752
Jiang Xina0b6b242016-10-27 21:53:37 +08006753#: builtin/commit.c:655
Jiang Xin6acbf032014-08-04 16:23:15 +08006754msgid ""
6755"unable to select a comment character that is not used\n"
6756"in the current commit message"
6757msgstr "无法选择一个未被当前提交说明使用的注释字符"
6758
Jiang Xina0b6b242016-10-27 21:53:37 +08006759#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006760#, c-format
6761msgid "could not lookup commit %s"
6762msgstr "不能查询提交 %s"
6763
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006764#: builtin/commit.c:704 builtin/shortlog.c:295
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006765#, c-format
6766msgid "(reading log message from standard input)\n"
Jiang Xin90e6ef52012-03-27 14:46:11 +08006767msgstr "(正从标准输入中读取日志信息)\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006768
Jiang Xina0b6b242016-10-27 21:53:37 +08006769#: builtin/commit.c:706
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006770msgid "could not read log from standard input"
Jiang Xin90e6ef52012-03-27 14:46:11 +08006771msgstr "不能从标准输入中读取日志信息"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006772
Jiang Xina0b6b242016-10-27 21:53:37 +08006773#: builtin/commit.c:710
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006774#, c-format
6775msgid "could not read log file '%s'"
Jiang Xin90e6ef52012-03-27 14:46:11 +08006776msgstr "不能读取日志文件 '%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006777
Jiang Xina0b6b242016-10-27 21:53:37 +08006778#: builtin/commit.c:737 builtin/commit.c:745
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006779msgid "could not read SQUASH_MSG"
Jiang Xin90e6ef52012-03-27 14:46:11 +08006780msgstr "不能读取 SQUASH_MSG"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006781
Jiang Xina0b6b242016-10-27 21:53:37 +08006782#: builtin/commit.c:742
Jiang Xin5b04ee32016-05-29 20:40:35 +08006783msgid "could not read MERGE_MSG"
6784msgstr "不能读取 MERGE_MSG"
6785
Jiang Xina0b6b242016-10-27 21:53:37 +08006786#: builtin/commit.c:796
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006787msgid "could not write commit template"
Jiang Xin90e6ef52012-03-27 14:46:11 +08006788msgstr "不能写提交模版"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006789
Jiang Xina0b6b242016-10-27 21:53:37 +08006790#: builtin/commit.c:814
Jiang Xin81809b92012-05-30 12:19:47 +08006791#, c-format
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006792msgid ""
6793"\n"
Jiang Xin8ada9592012-05-21 09:35:47 +08006794"It looks like you may be committing a merge.\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006795"If this is not correct, please remove the file\n"
6796"\t%s\n"
6797"and try again.\n"
6798msgstr ""
6799"\n"
Jiang Xin649900b2012-08-02 11:50:59 +08006800"似乎您正在做一个合并提交。如果不对,请删除文件\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006801"\t%s\n"
6802"然后重试。\n"
6803
Jiang Xina0b6b242016-10-27 21:53:37 +08006804#: builtin/commit.c:819
Jiang Xin81809b92012-05-30 12:19:47 +08006805#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08006806msgid ""
6807"\n"
6808"It looks like you may be committing a cherry-pick.\n"
6809"If this is not correct, please remove the file\n"
6810"\t%s\n"
6811"and try again.\n"
6812msgstr ""
6813"\n"
Jiang Xin649900b2012-08-02 11:50:59 +08006814"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
Jiang Xin8ada9592012-05-21 09:35:47 +08006815"\t%s\n"
6816"然后重试。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006817
Jiang Xina0b6b242016-10-27 21:53:37 +08006818#: builtin/commit.c:832
Jiang Xina77c07d2013-02-14 17:47:45 +08006819#, c-format
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006820msgid ""
Jiang Xin8ada9592012-05-21 09:35:47 +08006821"Please enter the commit message for your changes. Lines starting\n"
Jiang Xina77c07d2013-02-14 17:47:45 +08006822"with '%c' will be ignored, and an empty message aborts the commit.\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006823msgstr ""
Jiang Xina77c07d2013-02-14 17:47:45 +08006824"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
Jiang Xin81809b92012-05-30 12:19:47 +08006825"说明将会终止提交。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006826
Jiang Xina0b6b242016-10-27 21:53:37 +08006827#: builtin/commit.c:839
Jiang Xina77c07d2013-02-14 17:47:45 +08006828#, c-format
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006829msgid ""
Jiang Xin8ada9592012-05-21 09:35:47 +08006830"Please enter the commit message for your changes. Lines starting\n"
Jiang Xina77c07d2013-02-14 17:47:45 +08006831"with '%c' will be kept; you may remove them yourself if you want to.\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006832"An empty message aborts the commit.\n"
6833msgstr ""
Jiang Xina77c07d2013-02-14 17:47:45 +08006834"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
6835"也可以删除它们。一个空的提交说明将会终止提交。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006836
Jiang Xin90e6ef52012-03-27 14:46:11 +08006837# 译者:为保证在输出中对齐,注意调整句中空格!
Jiang Xina0b6b242016-10-27 21:53:37 +08006838#: builtin/commit.c:859
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006839#, c-format
Jiang Xin6acbf032014-08-04 16:23:15 +08006840msgid "%sAuthor: %.*s <%.*s>"
6841msgstr "%s作者: %.*s <%.*s>"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006842
Jiang Xin90e6ef52012-03-27 14:46:11 +08006843# 译者:为保证在输出中对齐,注意调整句中空格!
Jiang Xina0b6b242016-10-27 21:53:37 +08006844#: builtin/commit.c:867
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006845#, c-format
Jiang Xin6acbf032014-08-04 16:23:15 +08006846msgid "%sDate: %s"
6847msgstr "%s日期: %s"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006848
Jiang Xin6acbf032014-08-04 16:23:15 +08006849# 译者:为保证在输出中对齐,注意调整句中空格!
Jiang Xina0b6b242016-10-27 21:53:37 +08006850#: builtin/commit.c:874
Jiang Xin6acbf032014-08-04 16:23:15 +08006851#, c-format
6852msgid "%sCommitter: %.*s <%.*s>"
6853msgstr "%s提交者:%.*s <%.*s>"
6854
Jiang Xina0b6b242016-10-27 21:53:37 +08006855#: builtin/commit.c:892
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006856msgid "Cannot read index"
Jiang Xin90e6ef52012-03-27 14:46:11 +08006857msgstr "无法读取索引"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006858
Jiang Xina0b6b242016-10-27 21:53:37 +08006859#: builtin/commit.c:954
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006860msgid "Error building trees"
6861msgstr "无法创建树对象"
6862
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006863#: builtin/commit.c:968 builtin/tag.c:280
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006864#, c-format
6865msgid "Please supply the message using either -m or -F option.\n"
Wang Sheng07432ce2013-01-30 17:23:08 +08006866msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006867
Jiang Xina0b6b242016-10-27 21:53:37 +08006868#: builtin/commit.c:1071
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006869#, c-format
Jiang Xin814ff312015-02-16 21:34:19 +08006870msgid "--author '%s' is not 'Name <email>' and matches no existing author"
6871msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006872
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006873#: builtin/commit.c:1086 builtin/commit.c:1325
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006874#, c-format
6875msgid "Invalid untracked files mode '%s'"
Jiang Xin90e6ef52012-03-27 14:46:11 +08006876msgstr "无效的未追踪文件参数 '%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006877
Jiang Xina0b6b242016-10-27 21:53:37 +08006878#: builtin/commit.c:1124
Jiang Xin2e8451e2013-07-26 14:00:02 +08006879msgid "--long and -z are incompatible"
6880msgstr "--long 和 -z 选项不兼容"
6881
Jiang Xina0b6b242016-10-27 21:53:37 +08006882#: builtin/commit.c:1154
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006883msgid "Using both --reset-author and --author does not make sense"
6884msgstr "同时使用 --reset-author 和 --author 没有意义"
6885
Jiang Xina0b6b242016-10-27 21:53:37 +08006886#: builtin/commit.c:1163
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006887msgid "You have nothing to amend."
Jiang Xin90e6ef52012-03-27 14:46:11 +08006888msgstr "您没有可修补的提交。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006889
Jiang Xina0b6b242016-10-27 21:53:37 +08006890#: builtin/commit.c:1166
Jiang Xin8ada9592012-05-21 09:35:47 +08006891msgid "You are in the middle of a merge -- cannot amend."
Jiang Xin81809b92012-05-30 12:19:47 +08006892msgstr "您正处于一个合并过程中 -- 无法修补提交。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006893
Jiang Xina0b6b242016-10-27 21:53:37 +08006894#: builtin/commit.c:1168
Jiang Xin8ada9592012-05-21 09:35:47 +08006895msgid "You are in the middle of a cherry-pick -- cannot amend."
Jiang Xin81809b92012-05-30 12:19:47 +08006896msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
Jiang Xin8ada9592012-05-21 09:35:47 +08006897
Jiang Xina0b6b242016-10-27 21:53:37 +08006898#: builtin/commit.c:1171
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006899msgid "Options --squash and --fixup cannot be used together"
Jiang Xin649900b2012-08-02 11:50:59 +08006900msgstr "选项 --squash 和 --fixup 不能同时使用"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006901
Jiang Xina0b6b242016-10-27 21:53:37 +08006902#: builtin/commit.c:1181
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006903msgid "Only one of -c/-C/-F/--fixup can be used."
6904msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
6905
Jiang Xina0b6b242016-10-27 21:53:37 +08006906#: builtin/commit.c:1183
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006907msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
Jiang Xin649900b2012-08-02 11:50:59 +08006908msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006909
Jiang Xina0b6b242016-10-27 21:53:37 +08006910#: builtin/commit.c:1191
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006911msgid "--reset-author can be used only with -C, -c or --amend."
Jiang Xin649900b2012-08-02 11:50:59 +08006912msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006913
Jiang Xina0b6b242016-10-27 21:53:37 +08006914#: builtin/commit.c:1208
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006915msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
6916msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
6917
Jiang Xina0b6b242016-10-27 21:53:37 +08006918#: builtin/commit.c:1210
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006919msgid "No paths with --include/--only does not make sense."
6920msgstr "参数 --include/--only 不跟路径没有意义。"
6921
Jiang Xina0b6b242016-10-27 21:53:37 +08006922#: builtin/commit.c:1212
Jiang Xin6c94aba2014-03-13 12:41:34 +08006923msgid "Explicit paths specified without -i or -o; assuming --only paths..."
6924msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006925
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006926#: builtin/commit.c:1224 builtin/tag.c:495
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006927#, c-format
6928msgid "Invalid cleanup mode %s"
6929msgstr "无效的清理模式 %s"
6930
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006931#: builtin/commit.c:1229
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006932msgid "Paths with -a does not make sense."
Jiang Xin649900b2012-08-02 11:50:59 +08006933msgstr "路径和 -a 选项同时使用没有意义。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006934
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006935#: builtin/commit.c:1339 builtin/commit.c:1612
Jiang Xinef317cd2012-09-15 11:17:00 +08006936msgid "show status concisely"
Wang Sheng07432ce2013-01-30 17:23:08 +08006937msgstr "以简洁的格式显示状态"
Jiang Xinef317cd2012-09-15 11:17:00 +08006938
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006939#: builtin/commit.c:1341 builtin/commit.c:1614
Jiang Xinef317cd2012-09-15 11:17:00 +08006940msgid "show branch information"
Wang Sheng07432ce2013-01-30 17:23:08 +08006941msgstr "显示分支信息"
Jiang Xinef317cd2012-09-15 11:17:00 +08006942
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006943#: builtin/commit.c:1343
Jiang Xina0b6b242016-10-27 21:53:37 +08006944msgid "version"
6945msgstr "版本"
6946
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006947#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
6948#: builtin/worktree.c:442
Jiang Xinef317cd2012-09-15 11:17:00 +08006949msgid "machine-readable output"
Wang Sheng07432ce2013-01-30 17:23:08 +08006950msgstr "机器可读的输出"
Jiang Xinef317cd2012-09-15 11:17:00 +08006951
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006952#: builtin/commit.c:1346 builtin/commit.c:1618
Wang Sheng07432ce2013-01-30 17:23:08 +08006953msgid "show status in long format (default)"
6954msgstr "以长格式显示状态(默认)"
6955
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006956#: builtin/commit.c:1349 builtin/commit.c:1621
Jiang Xinef317cd2012-09-15 11:17:00 +08006957msgid "terminate entries with NUL"
Ray Chen4375c102015-08-10 18:03:29 +08006958msgstr "条目以 NUL 字符结尾"
Jiang Xinef317cd2012-09-15 11:17:00 +08006959
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006960#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
6961#: builtin/fast-export.c:984 builtin/tag.c:368
Jiang Xinef317cd2012-09-15 11:17:00 +08006962msgid "mode"
Wang Sheng07432ce2013-01-30 17:23:08 +08006963msgstr "模式"
Jiang Xinef317cd2012-09-15 11:17:00 +08006964
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006965#: builtin/commit.c:1352 builtin/commit.c:1624
Jiang Xinef317cd2012-09-15 11:17:00 +08006966msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
Wang Sheng07432ce2013-01-30 17:23:08 +08006967msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
Jiang Xinef317cd2012-09-15 11:17:00 +08006968
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006969#: builtin/commit.c:1355
Jiang Xinef317cd2012-09-15 11:17:00 +08006970msgid "show ignored files"
Wang Sheng07432ce2013-01-30 17:23:08 +08006971msgstr "显示忽略的文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08006972
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006973#: builtin/commit.c:1356 parse-options.h:155
Jiang Xinef317cd2012-09-15 11:17:00 +08006974msgid "when"
6975msgstr "何时"
6976
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006977#: builtin/commit.c:1357
Jiang Xinef317cd2012-09-15 11:17:00 +08006978msgid ""
6979"ignore changes to submodules, optional when: all, dirty, untracked. "
6980"(Default: all)"
6981msgstr ""
Wang Sheng07432ce2013-01-30 17:23:08 +08006982"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
Jiang Xinef317cd2012-09-15 11:17:00 +08006983
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006984#: builtin/commit.c:1359
Jiang Xinef317cd2012-09-15 11:17:00 +08006985msgid "list untracked files in columns"
Wang Sheng07432ce2013-01-30 17:23:08 +08006986msgstr "以列的方式显示未跟踪的文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08006987
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006988#: builtin/commit.c:1435
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006989msgid "couldn't look up newly created commit"
6990msgstr "无法找到新创建的提交"
6991
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006992#: builtin/commit.c:1437
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006993msgid "could not parse newly created commit"
Jiang Xin90e6ef52012-03-27 14:46:11 +08006994msgstr "不能解析新创建的提交"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006995
Jiang Xin1a79b2f2017-01-27 22:50:57 +08006996#: builtin/commit.c:1482
Jiang Xinc04f5ac2012-02-13 14:41:59 +08006997msgid "detached HEAD"
6998msgstr "分离头指针"
6999
Jiang Xin7e238ab2012-03-30 10:55:34 +08007000# 译者:中文字符串拼接,可删除前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007001#: builtin/commit.c:1485
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007002msgid " (root-commit)"
Jiang Xin7e238ab2012-03-30 10:55:34 +08007003msgstr "(根提交)"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007004
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007005#: builtin/commit.c:1582
Jiang Xinef317cd2012-09-15 11:17:00 +08007006msgid "suppress summary after successful commit"
Wang Sheng07432ce2013-01-30 17:23:08 +08007007msgstr "提交成功后不显示概述信息"
Jiang Xinef317cd2012-09-15 11:17:00 +08007008
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007009#: builtin/commit.c:1583
Jiang Xinef317cd2012-09-15 11:17:00 +08007010msgid "show diff in commit message template"
Wang Sheng07432ce2013-01-30 17:23:08 +08007011msgstr "在提交说明模板里显示差异"
Jiang Xinef317cd2012-09-15 11:17:00 +08007012
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007013#: builtin/commit.c:1585
Jiang Xinef317cd2012-09-15 11:17:00 +08007014msgid "Commit message options"
Wang Sheng07432ce2013-01-30 17:23:08 +08007015msgstr "提交说明选项"
Jiang Xinef317cd2012-09-15 11:17:00 +08007016
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007017#: builtin/commit.c:1586 builtin/tag.c:366
Jiang Xinef317cd2012-09-15 11:17:00 +08007018msgid "read message from file"
Wang Sheng07432ce2013-01-30 17:23:08 +08007019msgstr "从文件中读取提交说明"
Jiang Xinef317cd2012-09-15 11:17:00 +08007020
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007021#: builtin/commit.c:1587
Jiang Xinef317cd2012-09-15 11:17:00 +08007022msgid "author"
Wang Sheng07432ce2013-01-30 17:23:08 +08007023msgstr "作者"
Jiang Xinef317cd2012-09-15 11:17:00 +08007024
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007025#: builtin/commit.c:1587
Jiang Xinef317cd2012-09-15 11:17:00 +08007026msgid "override author for commit"
Wang Sheng07432ce2013-01-30 17:23:08 +08007027msgstr "提交时覆盖作者"
Jiang Xinef317cd2012-09-15 11:17:00 +08007028
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007029#: builtin/commit.c:1588 builtin/gc.c:333
Jiang Xinef317cd2012-09-15 11:17:00 +08007030msgid "date"
Wang Sheng07432ce2013-01-30 17:23:08 +08007031msgstr "日期"
Jiang Xinef317cd2012-09-15 11:17:00 +08007032
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007033#: builtin/commit.c:1588
Jiang Xinef317cd2012-09-15 11:17:00 +08007034msgid "override date for commit"
Wang Sheng07432ce2013-01-30 17:23:08 +08007035msgstr "提交时覆盖日期"
Jiang Xinef317cd2012-09-15 11:17:00 +08007036
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007037#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398
7038#: builtin/notes.c:561 builtin/tag.c:364
Jiang Xinef317cd2012-09-15 11:17:00 +08007039msgid "message"
Wang Sheng07432ce2013-01-30 17:23:08 +08007040msgstr "说明"
Jiang Xinef317cd2012-09-15 11:17:00 +08007041
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007042#: builtin/commit.c:1589
Jiang Xinef317cd2012-09-15 11:17:00 +08007043msgid "commit message"
Wang Sheng07432ce2013-01-30 17:23:08 +08007044msgstr "提交说明"
Jiang Xinef317cd2012-09-15 11:17:00 +08007045
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007046#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
7047#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81
Jiang Xin94550ed2015-11-16 07:02:11 +08007048msgid "commit"
7049msgstr "提交"
7050
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007051#: builtin/commit.c:1590
Jiang Xinef317cd2012-09-15 11:17:00 +08007052msgid "reuse and edit message from specified commit"
Wang Sheng07432ce2013-01-30 17:23:08 +08007053msgstr "重用并编辑指定提交的提交说明"
Jiang Xinef317cd2012-09-15 11:17:00 +08007054
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007055#: builtin/commit.c:1591
Jiang Xinef317cd2012-09-15 11:17:00 +08007056msgid "reuse message from specified commit"
Wang Sheng07432ce2013-01-30 17:23:08 +08007057msgstr "重用指定提交的提交说明"
Jiang Xinef317cd2012-09-15 11:17:00 +08007058
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007059#: builtin/commit.c:1592
Jiang Xinef317cd2012-09-15 11:17:00 +08007060msgid "use autosquash formatted message to fixup specified commit"
Wang Sheng07432ce2013-01-30 17:23:08 +08007061msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
Jiang Xinef317cd2012-09-15 11:17:00 +08007062
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007063#: builtin/commit.c:1593
Jiang Xinef317cd2012-09-15 11:17:00 +08007064msgid "use autosquash formatted message to squash specified commit"
Wang Sheng07432ce2013-01-30 17:23:08 +08007065msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
Jiang Xinef317cd2012-09-15 11:17:00 +08007066
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007067#: builtin/commit.c:1594
Jiang Xinef317cd2012-09-15 11:17:00 +08007068msgid "the commit is authored by me now (used with -C/-c/--amend)"
Wang Sheng07432ce2013-01-30 17:23:08 +08007069msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
Jiang Xinef317cd2012-09-15 11:17:00 +08007070
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007071#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86
Jiang Xinef317cd2012-09-15 11:17:00 +08007072msgid "add Signed-off-by:"
Wang Sheng07432ce2013-01-30 17:23:08 +08007073msgstr "添加 Signed-off-by: 签名"
Jiang Xinef317cd2012-09-15 11:17:00 +08007074
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007075#: builtin/commit.c:1596
Jiang Xinef317cd2012-09-15 11:17:00 +08007076msgid "use specified template file"
Wang Sheng07432ce2013-01-30 17:23:08 +08007077msgstr "使用指定的模板文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08007078
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007079#: builtin/commit.c:1597
Jiang Xinef317cd2012-09-15 11:17:00 +08007080msgid "force edit of commit"
Wang Sheng07432ce2013-01-30 17:23:08 +08007081msgstr "强制编辑提交"
Jiang Xinef317cd2012-09-15 11:17:00 +08007082
Wang Sheng07432ce2013-01-30 17:23:08 +08007083# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007084#: builtin/commit.c:1598
Jiang Xinef317cd2012-09-15 11:17:00 +08007085msgid "default"
Wang Sheng07432ce2013-01-30 17:23:08 +08007086msgstr "default"
Jiang Xinef317cd2012-09-15 11:17:00 +08007087
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007088#: builtin/commit.c:1598 builtin/tag.c:369
Jiang Xinef317cd2012-09-15 11:17:00 +08007089msgid "how to strip spaces and #comments from message"
Wang Sheng07432ce2013-01-30 17:23:08 +08007090msgstr "设置如何删除提交说明里的空格和#注释"
Jiang Xinef317cd2012-09-15 11:17:00 +08007091
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007092#: builtin/commit.c:1599
Jiang Xinef317cd2012-09-15 11:17:00 +08007093msgid "include status in commit message template"
Wang Sheng07432ce2013-01-30 17:23:08 +08007094msgstr "在提交说明模板里包含状态信息"
Jiang Xinef317cd2012-09-15 11:17:00 +08007095
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007096#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166
Jiang Xin1b7f4a32015-08-23 15:23:21 +08007097#: builtin/revert.c:93
Jiang Xinef317cd2012-09-15 11:17:00 +08007098msgid "GPG sign commit"
Wang Sheng07432ce2013-01-30 17:23:08 +08007099msgstr "GPG 提交签名"
Jiang Xinef317cd2012-09-15 11:17:00 +08007100
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007101#: builtin/commit.c:1604
Jiang Xinef317cd2012-09-15 11:17:00 +08007102msgid "Commit contents options"
Wang Sheng07432ce2013-01-30 17:23:08 +08007103msgstr "提交内容选项"
7104
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007105#: builtin/commit.c:1605
Wang Sheng07432ce2013-01-30 17:23:08 +08007106msgid "commit all changed files"
7107msgstr "提交所有改动的文件"
7108
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007109#: builtin/commit.c:1606
Wang Sheng07432ce2013-01-30 17:23:08 +08007110msgid "add specified files to index for commit"
7111msgstr "添加指定的文件到索引区等待提交"
7112
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007113#: builtin/commit.c:1607
Wang Sheng07432ce2013-01-30 17:23:08 +08007114msgid "interactively add files"
7115msgstr "交互式添加文件"
7116
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007117#: builtin/commit.c:1608
Wang Sheng07432ce2013-01-30 17:23:08 +08007118msgid "interactively add changes"
7119msgstr "交互式添加变更"
7120
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007121#: builtin/commit.c:1609
Wang Sheng07432ce2013-01-30 17:23:08 +08007122msgid "commit only specified files"
7123msgstr "只提交指定的文件"
7124
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007125#: builtin/commit.c:1610
Jiang Xin5c57d762016-08-28 10:18:12 +08007126msgid "bypass pre-commit and commit-msg hooks"
7127msgstr "绕过 pre-commit 和 commit-msg 钩子"
7128
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007129#: builtin/commit.c:1611
Wang Sheng07432ce2013-01-30 17:23:08 +08007130msgid "show what would be committed"
7131msgstr "显示将要提交的内容"
Jiang Xinef317cd2012-09-15 11:17:00 +08007132
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007133#: builtin/commit.c:1622
Wang Sheng07432ce2013-01-30 17:23:08 +08007134msgid "amend previous commit"
7135msgstr "修改先前的提交"
Jiang Xinef317cd2012-09-15 11:17:00 +08007136
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007137#: builtin/commit.c:1623
Wang Sheng07432ce2013-01-30 17:23:08 +08007138msgid "bypass post-rewrite hook"
7139msgstr "绕过 post-rewrite 钩子"
Jiang Xinef317cd2012-09-15 11:17:00 +08007140
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007141#: builtin/commit.c:1628
Jiang Xinef317cd2012-09-15 11:17:00 +08007142msgid "ok to record an empty change"
Wang Sheng07432ce2013-01-30 17:23:08 +08007143msgstr "允许一个空提交"
Jiang Xinef317cd2012-09-15 11:17:00 +08007144
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007145#: builtin/commit.c:1630
Jiang Xinef317cd2012-09-15 11:17:00 +08007146msgid "ok to record a change with an empty message"
Wang Sheng07432ce2013-01-30 17:23:08 +08007147msgstr "允许空的提交说明"
Jiang Xinef317cd2012-09-15 11:17:00 +08007148
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007149#: builtin/commit.c:1659
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007150msgid "could not parse HEAD commit"
Jiang Xin90e6ef52012-03-27 14:46:11 +08007151msgstr "不能解析 HEAD 提交"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007152
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007153#: builtin/commit.c:1707
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007154#, c-format
7155msgid "Corrupt MERGE_HEAD file (%s)"
Jiang Xin90e6ef52012-03-27 14:46:11 +08007156msgstr "损坏的 MERGE_HEAD 文件(%s)"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007157
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007158#: builtin/commit.c:1714
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007159msgid "could not read MERGE_MODE"
Jiang Xin90e6ef52012-03-27 14:46:11 +08007160msgstr "不能读取 MERGE_MODE"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007161
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007162#: builtin/commit.c:1733
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007163#, c-format
7164msgid "could not read commit message: %s"
Jiang Xin90e6ef52012-03-27 14:46:11 +08007165msgstr "不能读取提交说明:%s"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007166
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007167#: builtin/commit.c:1744
Jiang Xin73a60cd2012-04-28 22:42:41 +08007168#, c-format
7169msgid "Aborting commit; you did not edit the message.\n"
7170msgstr "终止提交;您未更改来自模版的提交说明。\n"
7171
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007172#: builtin/commit.c:1749
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007173#, c-format
7174msgid "Aborting commit due to empty commit message.\n"
7175msgstr "终止提交因为提交说明为空。\n"
7176
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007177#: builtin/commit.c:1797
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007178msgid ""
7179"Repository has been updated, but unable to write\n"
Jiang Xin220c3132014-10-08 10:55:14 +08007180"new_index file. Check that disk is not full and quota is\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007181"not exceeded, and then \"git reset HEAD\" to recover."
7182msgstr ""
Jiang Xin160fb2b2015-08-02 21:47:30 +08007183"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
Jiang Xin90e6ef52012-03-27 14:46:11 +08007184"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007185
Jiang Xin276ceea2016-02-28 20:35:55 +08007186#: builtin/config.c:9
Jiang Xin814ff312015-02-16 21:34:19 +08007187msgid "git config [<options>]"
7188msgstr "git config [<选项>]"
Wang Sheng07432ce2013-01-30 17:23:08 +08007189
Jiang Xin5c57d762016-08-28 10:18:12 +08007190#: builtin/config.c:55
Wang Sheng07432ce2013-01-30 17:23:08 +08007191msgid "Config file location"
7192msgstr "配置文件位置"
Jiang Xinef317cd2012-09-15 11:17:00 +08007193
Jiang Xin5c57d762016-08-28 10:18:12 +08007194#: builtin/config.c:56
Wang Sheng07432ce2013-01-30 17:23:08 +08007195msgid "use global config file"
7196msgstr "使用全局配置文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08007197
Jiang Xin5c57d762016-08-28 10:18:12 +08007198#: builtin/config.c:57
Wang Sheng07432ce2013-01-30 17:23:08 +08007199msgid "use system config file"
7200msgstr "使用系统级配置文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08007201
Jiang Xin5c57d762016-08-28 10:18:12 +08007202#: builtin/config.c:58
Wang Sheng07432ce2013-01-30 17:23:08 +08007203msgid "use repository config file"
Jiang Xin160fb2b2015-08-02 21:47:30 +08007204msgstr "使用仓库级配置文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08007205
Jiang Xin5c57d762016-08-28 10:18:12 +08007206#: builtin/config.c:59
Wang Sheng07432ce2013-01-30 17:23:08 +08007207msgid "use given config file"
7208msgstr "使用指定的配置文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08007209
Jiang Xin5c57d762016-08-28 10:18:12 +08007210#: builtin/config.c:60
Jiang Xin2e8451e2013-07-26 14:00:02 +08007211msgid "blob-id"
Ray Chen4375c102015-08-10 18:03:29 +08007212msgstr "数据对象 ID"
Jiang Xin2e8451e2013-07-26 14:00:02 +08007213
Jiang Xin5c57d762016-08-28 10:18:12 +08007214#: builtin/config.c:60
Jiang Xin2e8451e2013-07-26 14:00:02 +08007215msgid "read config from given blob object"
7216msgstr "从给定的数据对象读取配置"
7217
Jiang Xin5c57d762016-08-28 10:18:12 +08007218#: builtin/config.c:61
Wang Sheng07432ce2013-01-30 17:23:08 +08007219msgid "Action"
7220msgstr "操作"
Jiang Xinef317cd2012-09-15 11:17:00 +08007221
Jiang Xin5c57d762016-08-28 10:18:12 +08007222#: builtin/config.c:62
Wang Sheng07432ce2013-01-30 17:23:08 +08007223msgid "get value: name [value-regex]"
7224msgstr "获取值:name [value-regex]"
Jiang Xinef317cd2012-09-15 11:17:00 +08007225
Jiang Xin5c57d762016-08-28 10:18:12 +08007226#: builtin/config.c:63
Wang Sheng07432ce2013-01-30 17:23:08 +08007227msgid "get all values: key [value-regex]"
7228msgstr "获得所有的值:key [value-regex]"
Jiang Xinef317cd2012-09-15 11:17:00 +08007229
Jiang Xin5c57d762016-08-28 10:18:12 +08007230#: builtin/config.c:64
Wang Sheng07432ce2013-01-30 17:23:08 +08007231msgid "get values for regexp: name-regex [value-regex]"
7232msgstr "根据正则表达式获得值:name-regex [value-regex]"
Jiang Xinef317cd2012-09-15 11:17:00 +08007233
Jiang Xin5c57d762016-08-28 10:18:12 +08007234#: builtin/config.c:65
Jiang Xin90314792013-09-17 23:37:05 +08007235msgid "get value specific for the URL: section[.var] URL"
7236msgstr "获得 URL 取值:section[.var] URL"
7237
Jiang Xin5c57d762016-08-28 10:18:12 +08007238#: builtin/config.c:66
Wang Sheng07432ce2013-01-30 17:23:08 +08007239msgid "replace all matching variables: name value [value_regex]"
7240msgstr "替换所有匹配的变量:name value [value_regex]"
Jiang Xinef317cd2012-09-15 11:17:00 +08007241
Jiang Xin5c57d762016-08-28 10:18:12 +08007242#: builtin/config.c:67
Wang Sheng07432ce2013-01-30 17:23:08 +08007243msgid "add a new variable: name value"
7244msgstr "添加一个新的变量:name value"
Jiang Xinef317cd2012-09-15 11:17:00 +08007245
Jiang Xin5c57d762016-08-28 10:18:12 +08007246#: builtin/config.c:68
Wang Sheng07432ce2013-01-30 17:23:08 +08007247msgid "remove a variable: name [value-regex]"
7248msgstr "删除一个变量:name [value-regex]"
Jiang Xinef317cd2012-09-15 11:17:00 +08007249
Jiang Xin5c57d762016-08-28 10:18:12 +08007250#: builtin/config.c:69
Wang Sheng07432ce2013-01-30 17:23:08 +08007251msgid "remove all matches: name [value-regex]"
7252msgstr "删除所有匹配项:name [value-regex]"
Jiang Xinef317cd2012-09-15 11:17:00 +08007253
Jiang Xin5c57d762016-08-28 10:18:12 +08007254#: builtin/config.c:70
Wang Sheng07432ce2013-01-30 17:23:08 +08007255msgid "rename section: old-name new-name"
7256msgstr "重命名小节:old-name new-name"
Jiang Xinef317cd2012-09-15 11:17:00 +08007257
Jiang Xin5c57d762016-08-28 10:18:12 +08007258#: builtin/config.c:71
Wang Sheng07432ce2013-01-30 17:23:08 +08007259msgid "remove a section: name"
7260msgstr "删除一个小节:name"
Jiang Xinef317cd2012-09-15 11:17:00 +08007261
Jiang Xin5c57d762016-08-28 10:18:12 +08007262#: builtin/config.c:72
Wang Sheng07432ce2013-01-30 17:23:08 +08007263msgid "list all"
7264msgstr "列出所有"
Jiang Xinef317cd2012-09-15 11:17:00 +08007265
Jiang Xin5c57d762016-08-28 10:18:12 +08007266#: builtin/config.c:73
Wang Sheng07432ce2013-01-30 17:23:08 +08007267msgid "open an editor"
7268msgstr "打开一个编辑器"
7269
Jiang Xin5c57d762016-08-28 10:18:12 +08007270#: builtin/config.c:74
Jiang Xin04cb2f22015-01-04 12:27:38 +08007271msgid "find the color configured: slot [default]"
7272msgstr "获得配置的颜色:配置 [默认]"
Jiang Xinef317cd2012-09-15 11:17:00 +08007273
Jiang Xin5c57d762016-08-28 10:18:12 +08007274#: builtin/config.c:75
Jiang Xin04cb2f22015-01-04 12:27:38 +08007275msgid "find the color setting: slot [stdout-is-tty]"
7276msgstr "获得颜色设置:配置 [stdout-is-tty]"
Jiang Xinef317cd2012-09-15 11:17:00 +08007277
Jiang Xin5c57d762016-08-28 10:18:12 +08007278#: builtin/config.c:76
Wang Sheng07432ce2013-01-30 17:23:08 +08007279msgid "Type"
7280msgstr "类型"
Jiang Xinef317cd2012-09-15 11:17:00 +08007281
Jiang Xin5c57d762016-08-28 10:18:12 +08007282#: builtin/config.c:77
Wang Sheng07432ce2013-01-30 17:23:08 +08007283msgid "value is \"true\" or \"false\""
7284msgstr "值是 \"true\" 或 \"false\""
Jiang Xinef317cd2012-09-15 11:17:00 +08007285
Jiang Xin5c57d762016-08-28 10:18:12 +08007286#: builtin/config.c:78
Wang Sheng07432ce2013-01-30 17:23:08 +08007287msgid "value is decimal number"
7288msgstr "值是十进制数"
Jiang Xinef317cd2012-09-15 11:17:00 +08007289
Jiang Xin5c57d762016-08-28 10:18:12 +08007290#: builtin/config.c:79
Wang Sheng07432ce2013-01-30 17:23:08 +08007291msgid "value is --bool or --int"
7292msgstr "值是 --bool or --int"
Jiang Xinef317cd2012-09-15 11:17:00 +08007293
Jiang Xin5c57d762016-08-28 10:18:12 +08007294#: builtin/config.c:80
Wang Sheng07432ce2013-01-30 17:23:08 +08007295msgid "value is a path (file or directory name)"
7296msgstr "值是一个路径(文件或目录名)"
Jiang Xinef317cd2012-09-15 11:17:00 +08007297
Jiang Xin5c57d762016-08-28 10:18:12 +08007298#: builtin/config.c:81
Wang Sheng07432ce2013-01-30 17:23:08 +08007299msgid "Other"
7300msgstr "其它"
Jiang Xinef317cd2012-09-15 11:17:00 +08007301
Jiang Xin5c57d762016-08-28 10:18:12 +08007302#: builtin/config.c:82
Wang Sheng07432ce2013-01-30 17:23:08 +08007303msgid "terminate values with NUL byte"
Ray Chen4375c102015-08-10 18:03:29 +08007304msgstr "终止值是 NUL 字节"
Jiang Xinef317cd2012-09-15 11:17:00 +08007305
Jiang Xin5c57d762016-08-28 10:18:12 +08007306#: builtin/config.c:83
Jiang Xin1b7f4a32015-08-23 15:23:21 +08007307msgid "show variable names only"
7308msgstr "只显示变量名"
7309
Jiang Xin5c57d762016-08-28 10:18:12 +08007310#: builtin/config.c:84
Jiang Xinef317cd2012-09-15 11:17:00 +08007311msgid "respect include directives on lookup"
Wang Sheng07432ce2013-01-30 17:23:08 +08007312msgstr "查询时参照 include 指令递归查找"
Jiang Xinef317cd2012-09-15 11:17:00 +08007313
Jiang Xin5c57d762016-08-28 10:18:12 +08007314#: builtin/config.c:85
Jiang Xin276ceea2016-02-28 20:35:55 +08007315msgid "show origin of config (file, standard input, blob, command line)"
7316msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
7317
Jiang Xin5c57d762016-08-28 10:18:12 +08007318#: builtin/config.c:327
Jiang Xin220c3132014-10-08 10:55:14 +08007319msgid "unable to parse default color value"
Jiang Xin160fb2b2015-08-02 21:47:30 +08007320msgstr "不能解析默认颜色值"
Jiang Xin220c3132014-10-08 10:55:14 +08007321
Jiang Xin5c57d762016-08-28 10:18:12 +08007322#: builtin/config.c:471
Jiang Xin220c3132014-10-08 10:55:14 +08007323#, c-format
7324msgid ""
7325"# This is Git's per-user configuration file.\n"
Jiang Xin7aea43f2015-05-31 08:42:31 +08007326"[user]\n"
Jiang Xin220c3132014-10-08 10:55:14 +08007327"# Please adapt and uncomment the following lines:\n"
Jiang Xin7aea43f2015-05-31 08:42:31 +08007328"#\tname = %s\n"
Jiang Xin220c3132014-10-08 10:55:14 +08007329"#\temail = %s\n"
7330msgstr ""
7331"# This is Git's per-user configuration file.\n"
Jiang Xin7aea43f2015-05-31 08:42:31 +08007332"[user]\n"
Jiang Xin220c3132014-10-08 10:55:14 +08007333"# Please adapt and uncomment the following lines:\n"
Jiang Xin7aea43f2015-05-31 08:42:31 +08007334"#\tname = %s\n"
Jiang Xin220c3132014-10-08 10:55:14 +08007335"#\temail = %s\n"
7336
Jiang Xin5c57d762016-08-28 10:18:12 +08007337#: builtin/config.c:613
Jiang Xin220c3132014-10-08 10:55:14 +08007338#, c-format
7339msgid "cannot create configuration file %s"
7340msgstr "不能创建配置文件 %s"
7341
Jiang Xina0b6b242016-10-27 21:53:37 +08007342#: builtin/config.c:625
7343#, c-format
7344msgid ""
7345"cannot overwrite multiple values with a single value\n"
7346" Use a regexp, --add or --replace-all to change %s."
7347msgstr ""
7348"无法用一个值覆盖多个值\n"
7349" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
7350
7351#: builtin/count-objects.c:86
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08007352msgid "git count-objects [-v] [-H | --human-readable]"
7353msgstr "git count-objects [-v] [-H | --human-readable]"
7354
Jiang Xina0b6b242016-10-27 21:53:37 +08007355#: builtin/count-objects.c:96
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08007356msgid "print sizes in human readable format"
7357msgstr "以用户可读的格式显示大小"
Jiang Xinef317cd2012-09-15 11:17:00 +08007358
Jiang Xin220c3132014-10-08 10:55:14 +08007359#: builtin/describe.c:17
Jiang Xin814ff312015-02-16 21:34:19 +08007360msgid "git describe [<options>] [<commit-ish>...]"
7361msgstr "git describe [<选项>] [<提交号>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +08007362
Jiang Xin220c3132014-10-08 10:55:14 +08007363#: builtin/describe.c:18
Jiang Xin814ff312015-02-16 21:34:19 +08007364msgid "git describe [<options>] --dirty"
7365msgstr "git describe [<选项>] --dirty"
Jiang Xinef317cd2012-09-15 11:17:00 +08007366
Jiang Xin220c3132014-10-08 10:55:14 +08007367#: builtin/describe.c:217
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007368#, c-format
7369msgid "annotated tag %s not available"
Ray Chen55a16ee2015-07-28 12:52:28 +08007370msgstr "附注标签 %s 无效"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007371
Jiang Xin220c3132014-10-08 10:55:14 +08007372#: builtin/describe.c:221
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007373#, c-format
7374msgid "annotated tag %s has no embedded name"
Ray Chen55a16ee2015-07-28 12:52:28 +08007375msgstr "附注标签 %s 没有嵌入名称"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007376
Jiang Xin220c3132014-10-08 10:55:14 +08007377#: builtin/describe.c:223
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007378#, c-format
7379msgid "tag '%s' is really '%s' here"
Ray Chen55a16ee2015-07-28 12:52:28 +08007380msgstr "标签 '%s' 的确是在 '%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007381
Jiang Xin5c57d762016-08-28 10:18:12 +08007382#: builtin/describe.c:250 builtin/log.c:480
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007383#, c-format
7384msgid "Not a valid object name %s"
7385msgstr "不是一个有效的对象名 %s"
7386
Jiang Xin220c3132014-10-08 10:55:14 +08007387#: builtin/describe.c:253
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007388#, c-format
7389msgid "%s is not a valid '%s' object"
7390msgstr "%s 不是一个有效的 '%s' 对象"
7391
Jiang Xin220c3132014-10-08 10:55:14 +08007392#: builtin/describe.c:270
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007393#, c-format
7394msgid "no tag exactly matches '%s'"
Ray Chen55a16ee2015-07-28 12:52:28 +08007395msgstr "没有标签准确匹配 '%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007396
Jiang Xin220c3132014-10-08 10:55:14 +08007397#: builtin/describe.c:272
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007398#, c-format
7399msgid "searching to describe %s\n"
7400msgstr "搜索描述 %s\n"
7401
Jiang Xin220c3132014-10-08 10:55:14 +08007402#: builtin/describe.c:319
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007403#, c-format
7404msgid "finished search at %s\n"
7405msgstr "完成搜索 %s\n"
7406
Jiang Xin220c3132014-10-08 10:55:14 +08007407#: builtin/describe.c:346
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007408#, c-format
7409msgid ""
7410"No annotated tags can describe '%s'.\n"
7411"However, there were unannotated tags: try --tags."
7412msgstr ""
Ray Chen55a16ee2015-07-28 12:52:28 +08007413"没有附注标签能描述 '%s'。\n"
7414"然而,存在未附注标签:尝试 --tags。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007415
Jiang Xin220c3132014-10-08 10:55:14 +08007416#: builtin/describe.c:350
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007417#, c-format
7418msgid ""
7419"No tags can describe '%s'.\n"
7420"Try --always, or create some tags."
7421msgstr ""
Ray Chen55a16ee2015-07-28 12:52:28 +08007422"没有标签能描述 '%s'。\n"
7423"尝试 --always,或者创建一些标签。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007424
Jiang Xin220c3132014-10-08 10:55:14 +08007425#: builtin/describe.c:371
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007426#, c-format
7427msgid "traversed %lu commits\n"
7428msgstr "已遍历 %lu 个提交\n"
7429
Jiang Xin220c3132014-10-08 10:55:14 +08007430#: builtin/describe.c:374
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007431#, c-format
7432msgid ""
7433"more than %i tags found; listed %i most recent\n"
7434"gave up search at %s\n"
7435msgstr ""
Ray Chen55a16ee2015-07-28 12:52:28 +08007436"发现多于 %i 个标签,列出最近的 %i 个\n"
Jiang Xin90e6ef52012-03-27 14:46:11 +08007437"在 %s 放弃搜索\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007438
Jiang Xin220c3132014-10-08 10:55:14 +08007439#: builtin/describe.c:396
Jiang Xinef317cd2012-09-15 11:17:00 +08007440msgid "find the tag that comes after the commit"
Ray Chen55a16ee2015-07-28 12:52:28 +08007441msgstr "寻找该提交之后的标签"
Jiang Xinef317cd2012-09-15 11:17:00 +08007442
Jiang Xin220c3132014-10-08 10:55:14 +08007443#: builtin/describe.c:397
Jiang Xinef317cd2012-09-15 11:17:00 +08007444msgid "debug search strategy on stderr"
Wang Sheng07432ce2013-01-30 17:23:08 +08007445msgstr "在标准错误上调试搜索策略"
Jiang Xinef317cd2012-09-15 11:17:00 +08007446
Jiang Xin220c3132014-10-08 10:55:14 +08007447#: builtin/describe.c:398
Jiang Xin1003b3a2013-04-11 17:55:09 +08007448msgid "use any ref"
7449msgstr "使用任意引用"
7450
Jiang Xin220c3132014-10-08 10:55:14 +08007451#: builtin/describe.c:399
Jiang Xin1003b3a2013-04-11 17:55:09 +08007452msgid "use any tag, even unannotated"
Ray Chen55a16ee2015-07-28 12:52:28 +08007453msgstr "使用任意标签,即使未附带注释"
Jiang Xinef317cd2012-09-15 11:17:00 +08007454
Jiang Xin220c3132014-10-08 10:55:14 +08007455#: builtin/describe.c:400
Jiang Xinef317cd2012-09-15 11:17:00 +08007456msgid "always use long format"
Wang Sheng07432ce2013-01-30 17:23:08 +08007457msgstr "始终使用长提交号格式"
Jiang Xinef317cd2012-09-15 11:17:00 +08007458
Jiang Xin220c3132014-10-08 10:55:14 +08007459#: builtin/describe.c:401
Jiang Xin2e8451e2013-07-26 14:00:02 +08007460msgid "only follow first parent"
7461msgstr "只跟随第一个父提交"
7462
Jiang Xin220c3132014-10-08 10:55:14 +08007463#: builtin/describe.c:404
Jiang Xinef317cd2012-09-15 11:17:00 +08007464msgid "only output exact matches"
Wang Sheng07432ce2013-01-30 17:23:08 +08007465msgstr "只输出精确匹配"
Jiang Xinef317cd2012-09-15 11:17:00 +08007466
Jiang Xin220c3132014-10-08 10:55:14 +08007467#: builtin/describe.c:406
Jiang Xinef317cd2012-09-15 11:17:00 +08007468msgid "consider <n> most recent tags (default: 10)"
Ray Chen55a16ee2015-07-28 12:52:28 +08007469msgstr "考虑最近 <n> 个标签(默认:10)"
Jiang Xinef317cd2012-09-15 11:17:00 +08007470
Jiang Xin220c3132014-10-08 10:55:14 +08007471#: builtin/describe.c:408
Jiang Xinef317cd2012-09-15 11:17:00 +08007472msgid "only consider tags matching <pattern>"
Ray Chen55a16ee2015-07-28 12:52:28 +08007473msgstr "只考虑匹配 <模式> 的标签"
Jiang Xinef317cd2012-09-15 11:17:00 +08007474
Jiang Xina0b6b242016-10-27 21:53:37 +08007475#: builtin/describe.c:410 builtin/name-rev.c:320
Jiang Xinef317cd2012-09-15 11:17:00 +08007476msgid "show abbreviated commit object as fallback"
Wang Sheng07432ce2013-01-30 17:23:08 +08007477msgstr "显示简写的提交号作为后备"
Jiang Xinef317cd2012-09-15 11:17:00 +08007478
Jiang Xin220c3132014-10-08 10:55:14 +08007479#: builtin/describe.c:411
Jiang Xinef317cd2012-09-15 11:17:00 +08007480msgid "mark"
Wang Sheng07432ce2013-01-30 17:23:08 +08007481msgstr "标记"
Jiang Xinef317cd2012-09-15 11:17:00 +08007482
Jiang Xin220c3132014-10-08 10:55:14 +08007483#: builtin/describe.c:412
Jiang Xinef317cd2012-09-15 11:17:00 +08007484msgid "append <mark> on dirty working tree (default: \"-dirty\")"
Jiang Xin160fb2b2015-08-02 21:47:30 +08007485msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
Jiang Xinef317cd2012-09-15 11:17:00 +08007486
Jiang Xin220c3132014-10-08 10:55:14 +08007487#: builtin/describe.c:430
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007488msgid "--long is incompatible with --abbrev=0"
7489msgstr "--long 与 --abbrev=0 不兼容"
7490
Jiang Xin220c3132014-10-08 10:55:14 +08007491#: builtin/describe.c:456
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007492msgid "No names found, cannot describe anything."
Jiang Xin90e6ef52012-03-27 14:46:11 +08007493msgstr "没有发现名称,无法描述任何东西。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007494
Jiang Xin220c3132014-10-08 10:55:14 +08007495#: builtin/describe.c:476
Richard Hansena8a54062013-09-04 15:04:31 -04007496msgid "--dirty is incompatible with commit-ishes"
Jiang Xin649900b2012-08-02 11:50:59 +08007497msgstr "--dirty 不能与提交同时使用"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007498
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007499#: builtin/diff.c:83
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007500#, c-format
7501msgid "'%s': not a regular file or symlink"
7502msgstr "'%s':不是一个正规文件或符号链接"
7503
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007504#: builtin/diff.c:234
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007505#, c-format
7506msgid "invalid option: %s"
7507msgstr "无效选项:%s"
7508
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007509#: builtin/diff.c:358
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007510msgid "Not a git repository"
Jiang Xin160fb2b2015-08-02 21:47:30 +08007511msgstr "不是一个 git 仓库"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007512
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007513#: builtin/diff.c:401
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007514#, c-format
7515msgid "invalid object '%s' given."
7516msgstr "提供了无效对象 '%s'。"
7517
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007518#: builtin/diff.c:410
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007519#, c-format
7520msgid "more than two blobs given: '%s'"
Jiang Xin160fb2b2015-08-02 21:47:30 +08007521msgstr "提供了超过两个数据对象:'%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007522
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007523#: builtin/diff.c:417
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007524#, c-format
7525msgid "unhandled object '%s' given."
Jiang Xin6c94aba2014-03-13 12:41:34 +08007526msgstr "无法处理的对象 '%s'。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007527
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007528#: builtin/difftool.c:28
7529msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
7530msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
7531
7532#: builtin/difftool.c:241
7533#, c-format
7534msgid "failed: %d"
7535msgstr "失败:%d"
7536
7537#: builtin/difftool.c:342
7538msgid ""
7539"combined diff formats('-c' and '--cc') are not supported in\n"
7540"directory diff mode('-d' and '--dir-diff')."
7541msgstr "不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--cc')。"
7542
7543#: builtin/difftool.c:567
7544#, c-format
7545msgid "both files modified: '%s' and '%s'."
7546msgstr "两个文件都被修改:'%s' 和 '%s'。"
7547
7548#: builtin/difftool.c:569
7549msgid "working tree file has been left."
7550msgstr "工作区文件被留了下来。"
7551
7552#: builtin/difftool.c:580
7553#, c-format
7554msgid "temporary files exist in '%s'."
7555msgstr "临时文件存在于 '%s'。"
7556
7557#: builtin/difftool.c:581
7558msgid "you may want to cleanup or recover these."
7559msgstr "您可能想要清理或者恢复它们。"
7560
7561#: builtin/difftool.c:626
7562msgid "use `diff.guitool` instead of `diff.tool`"
7563msgstr "使用 `diff.guitool` 代替 `diff.tool`"
7564
7565#: builtin/difftool.c:628
7566msgid "perform a full-directory diff"
7567msgstr "执行一个全目录差异比较"
7568
7569#: builtin/difftool.c:630
7570msgid "do not prompt before launching a diff tool"
7571msgstr "启动差异比较工具之前不提示"
7572
7573#: builtin/difftool.c:636
7574msgid "use symlinks in dir-diff mode"
7575msgstr "在 dir-diff 模式中使用符号链接"
7576
7577#: builtin/difftool.c:637
7578msgid "<tool>"
7579msgstr "<工具>"
7580
7581#: builtin/difftool.c:638
7582msgid "use the specified diff tool"
7583msgstr "使用指定的差异比较工具"
7584
7585#: builtin/difftool.c:640
7586msgid "print a list of diff tools that may be used with `--tool`"
7587msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
7588
7589#: builtin/difftool.c:643
7590msgid ""
7591"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
7592"code"
7593msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出"
7594
7595#: builtin/difftool.c:645
7596msgid "<command>"
7597msgstr "<命令>"
7598
7599#: builtin/difftool.c:646
7600msgid "specify a custom command for viewing diffs"
7601msgstr "指定一个用于查看差异的自定义命令"
7602
7603#: builtin/difftool.c:670
7604msgid "no <tool> given for --tool=<tool>"
7605msgstr "没有为 --tool=<工具> 参数提供 <工具>"
7606
7607#: builtin/difftool.c:677
7608msgid "no <cmd> given for --extcmd=<cmd>"
7609msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
7610
Jiang Xin1b7f4a32015-08-23 15:23:21 +08007611#: builtin/fast-export.c:25
Jiang Xinef317cd2012-09-15 11:17:00 +08007612msgid "git fast-export [rev-list-opts]"
Wang Sheng07432ce2013-01-30 17:23:08 +08007613msgstr "git fast-export [rev-list-opts]"
Jiang Xinef317cd2012-09-15 11:17:00 +08007614
Jiang Xin1b7f4a32015-08-23 15:23:21 +08007615#: builtin/fast-export.c:980
Jiang Xinef317cd2012-09-15 11:17:00 +08007616msgid "show progress after <n> objects"
Wang Sheng07432ce2013-01-30 17:23:08 +08007617msgstr "在 <n> 个对象之后显示进度"
Jiang Xinef317cd2012-09-15 11:17:00 +08007618
Jiang Xin1b7f4a32015-08-23 15:23:21 +08007619#: builtin/fast-export.c:982
Jiang Xinef317cd2012-09-15 11:17:00 +08007620msgid "select handling of signed tags"
Ray Chen55a16ee2015-07-28 12:52:28 +08007621msgstr "选择如何处理签名标签"
Jiang Xinef317cd2012-09-15 11:17:00 +08007622
Jiang Xin1b7f4a32015-08-23 15:23:21 +08007623#: builtin/fast-export.c:985
Wang Sheng07432ce2013-01-30 17:23:08 +08007624msgid "select handling of tags that tag filtered objects"
Ray Chen55a16ee2015-07-28 12:52:28 +08007625msgstr "选择当标签指向被过滤对象时该标签的处理方式"
Jiang Xinef317cd2012-09-15 11:17:00 +08007626
Jiang Xin1b7f4a32015-08-23 15:23:21 +08007627#: builtin/fast-export.c:988
Wang Sheng07432ce2013-01-30 17:23:08 +08007628msgid "Dump marks to this file"
7629msgstr "把标记存储到这个文件"
7630
Jiang Xin1b7f4a32015-08-23 15:23:21 +08007631#: builtin/fast-export.c:990
Wang Sheng07432ce2013-01-30 17:23:08 +08007632msgid "Import marks from this file"
7633msgstr "从这个文件导入标记"
7634
Jiang Xin1b7f4a32015-08-23 15:23:21 +08007635#: builtin/fast-export.c:992
Wang Sheng07432ce2013-01-30 17:23:08 +08007636msgid "Fake a tagger when tags lack one"
Ray Chen55a16ee2015-07-28 12:52:28 +08007637msgstr "当标签缺少标记者字段时,假装提供一个"
Wang Sheng07432ce2013-01-30 17:23:08 +08007638
Jiang Xin1b7f4a32015-08-23 15:23:21 +08007639#: builtin/fast-export.c:994
Wang Sheng07432ce2013-01-30 17:23:08 +08007640msgid "Output full tree for each commit"
7641msgstr "每次提交都输出整个树"
7642
Jiang Xin1b7f4a32015-08-23 15:23:21 +08007643#: builtin/fast-export.c:996
Wang Sheng07432ce2013-01-30 17:23:08 +08007644msgid "Use the done feature to terminate the stream"
7645msgstr "使用 done 功能来终止流"
7646
Jiang Xin1b7f4a32015-08-23 15:23:21 +08007647#: builtin/fast-export.c:997
Jiang Xinef317cd2012-09-15 11:17:00 +08007648msgid "Skip output of blob data"
Wang Sheng07432ce2013-01-30 17:23:08 +08007649msgstr "跳过数据对象的输出"
Jiang Xinef317cd2012-09-15 11:17:00 +08007650
Jiang Xin1b7f4a32015-08-23 15:23:21 +08007651#: builtin/fast-export.c:998
Jiang Xin6acbf032014-08-04 16:23:15 +08007652msgid "refspec"
Jiang Xin160fb2b2015-08-02 21:47:30 +08007653msgstr "引用规格"
Jiang Xin6acbf032014-08-04 16:23:15 +08007654
Jiang Xin1b7f4a32015-08-23 15:23:21 +08007655#: builtin/fast-export.c:999
Jiang Xin6acbf032014-08-04 16:23:15 +08007656msgid "Apply refspec to exported refs"
Jiang Xin160fb2b2015-08-02 21:47:30 +08007657msgstr "对导出的引用应用引用规格"
Jiang Xin6acbf032014-08-04 16:23:15 +08007658
Jiang Xin1b7f4a32015-08-23 15:23:21 +08007659#: builtin/fast-export.c:1000
Jiang Xin220c3132014-10-08 10:55:14 +08007660msgid "anonymize output"
7661msgstr "匿名输出"
7662
Jiang Xin5c57d762016-08-28 10:18:12 +08007663#: builtin/fetch.c:21
Jiang Xinef317cd2012-09-15 11:17:00 +08007664msgid "git fetch [<options>] [<repository> [<refspec>...]]"
Jiang Xin160fb2b2015-08-02 21:47:30 +08007665msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
Jiang Xinef317cd2012-09-15 11:17:00 +08007666
Jiang Xin5c57d762016-08-28 10:18:12 +08007667#: builtin/fetch.c:22
Jiang Xinef317cd2012-09-15 11:17:00 +08007668msgid "git fetch [<options>] <group>"
Wang Sheng07432ce2013-01-30 17:23:08 +08007669msgstr "git fetch [<选项>] <组>"
Jiang Xinef317cd2012-09-15 11:17:00 +08007670
Jiang Xin5c57d762016-08-28 10:18:12 +08007671#: builtin/fetch.c:23
Jiang Xinef317cd2012-09-15 11:17:00 +08007672msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
Jiang Xin160fb2b2015-08-02 21:47:30 +08007673msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
Jiang Xinef317cd2012-09-15 11:17:00 +08007674
Jiang Xin5c57d762016-08-28 10:18:12 +08007675#: builtin/fetch.c:24
Jiang Xinef317cd2012-09-15 11:17:00 +08007676msgid "git fetch --all [<options>]"
Wang Sheng07432ce2013-01-30 17:23:08 +08007677msgstr "git fetch --all [<选项>]"
Jiang Xinef317cd2012-09-15 11:17:00 +08007678
Jiang Xina0b6b242016-10-27 21:53:37 +08007679#: builtin/fetch.c:95 builtin/pull.c:175
Jiang Xinef317cd2012-09-15 11:17:00 +08007680msgid "fetch from all remotes"
Wang Sheng07432ce2013-01-30 17:23:08 +08007681msgstr "从所有的远程抓取"
Jiang Xinef317cd2012-09-15 11:17:00 +08007682
Jiang Xina0b6b242016-10-27 21:53:37 +08007683#: builtin/fetch.c:97 builtin/pull.c:178
Jiang Xinef317cd2012-09-15 11:17:00 +08007684msgid "append to .git/FETCH_HEAD instead of overwriting"
Wang Sheng07432ce2013-01-30 17:23:08 +08007685msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
Jiang Xinef317cd2012-09-15 11:17:00 +08007686
Jiang Xina0b6b242016-10-27 21:53:37 +08007687#: builtin/fetch.c:99 builtin/pull.c:181
Jiang Xinef317cd2012-09-15 11:17:00 +08007688msgid "path to upload pack on remote end"
Wang Sheng07432ce2013-01-30 17:23:08 +08007689msgstr "上传包到远程的路径"
Jiang Xinef317cd2012-09-15 11:17:00 +08007690
Jiang Xina0b6b242016-10-27 21:53:37 +08007691#: builtin/fetch.c:100 builtin/pull.c:183
Jiang Xinef317cd2012-09-15 11:17:00 +08007692msgid "force overwrite of local branch"
Wang Sheng07432ce2013-01-30 17:23:08 +08007693msgstr "强制覆盖本地分支"
Jiang Xinef317cd2012-09-15 11:17:00 +08007694
Jiang Xina0b6b242016-10-27 21:53:37 +08007695#: builtin/fetch.c:102
Jiang Xinef317cd2012-09-15 11:17:00 +08007696msgid "fetch from multiple remotes"
Wang Sheng07432ce2013-01-30 17:23:08 +08007697msgstr "从多个远程抓取"
Jiang Xinef317cd2012-09-15 11:17:00 +08007698
Jiang Xina0b6b242016-10-27 21:53:37 +08007699#: builtin/fetch.c:104 builtin/pull.c:185
Jiang Xinef317cd2012-09-15 11:17:00 +08007700msgid "fetch all tags and associated objects"
Ray Chen55a16ee2015-07-28 12:52:28 +08007701msgstr "抓取所有的标签和关联对象"
Jiang Xinef317cd2012-09-15 11:17:00 +08007702
Jiang Xina0b6b242016-10-27 21:53:37 +08007703#: builtin/fetch.c:106
Jiang Xinef317cd2012-09-15 11:17:00 +08007704msgid "do not fetch all tags (--no-tags)"
Ray Chen55a16ee2015-07-28 12:52:28 +08007705msgstr "不抓取任何标签(--no-tags)"
Jiang Xinef317cd2012-09-15 11:17:00 +08007706
Jiang Xina0b6b242016-10-27 21:53:37 +08007707#: builtin/fetch.c:108
Jiang Xin276ceea2016-02-28 20:35:55 +08007708msgid "number of submodules fetched in parallel"
7709msgstr "子模组获取的并发数"
7710
Jiang Xina0b6b242016-10-27 21:53:37 +08007711#: builtin/fetch.c:110 builtin/pull.c:188
Jiang Xinef317cd2012-09-15 11:17:00 +08007712msgid "prune remote-tracking branches no longer on remote"
Wang Sheng07432ce2013-01-30 17:23:08 +08007713msgstr "清除远程已经不存在的分支的跟踪分支"
Jiang Xinef317cd2012-09-15 11:17:00 +08007714
Wang Sheng07432ce2013-01-30 17:23:08 +08007715# 译者:可选值,不能翻译
Jiang Xina0b6b242016-10-27 21:53:37 +08007716#: builtin/fetch.c:111 builtin/pull.c:191
Jiang Xinef317cd2012-09-15 11:17:00 +08007717msgid "on-demand"
Wang Sheng07432ce2013-01-30 17:23:08 +08007718msgstr "on-demand"
Jiang Xinef317cd2012-09-15 11:17:00 +08007719
Jiang Xina0b6b242016-10-27 21:53:37 +08007720#: builtin/fetch.c:112 builtin/pull.c:192
Jiang Xinef317cd2012-09-15 11:17:00 +08007721msgid "control recursive fetching of submodules"
Wang Sheng07432ce2013-01-30 17:23:08 +08007722msgstr "控制子模组的递归抓取"
Jiang Xinef317cd2012-09-15 11:17:00 +08007723
Jiang Xina0b6b242016-10-27 21:53:37 +08007724#: builtin/fetch.c:116 builtin/pull.c:200
Jiang Xinef317cd2012-09-15 11:17:00 +08007725msgid "keep downloaded pack"
Wang Sheng07432ce2013-01-30 17:23:08 +08007726msgstr "保持下载包"
Jiang Xinef317cd2012-09-15 11:17:00 +08007727
Jiang Xina0b6b242016-10-27 21:53:37 +08007728#: builtin/fetch.c:118
Jiang Xinef317cd2012-09-15 11:17:00 +08007729msgid "allow updating of HEAD ref"
Wang Sheng07432ce2013-01-30 17:23:08 +08007730msgstr "允许更新 HEAD 引用"
Jiang Xinef317cd2012-09-15 11:17:00 +08007731
Jiang Xina0b6b242016-10-27 21:53:37 +08007732#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
Jiang Xinef317cd2012-09-15 11:17:00 +08007733msgid "deepen history of shallow clone"
Wang Sheng07432ce2013-01-30 17:23:08 +08007734msgstr "深化浅克隆的历史"
Jiang Xinef317cd2012-09-15 11:17:00 +08007735
Jiang Xina0b6b242016-10-27 21:53:37 +08007736#: builtin/fetch.c:123
7737msgid "deepen history of shallow repository based on time"
7738msgstr "基于时间来深化浅克隆的历史"
7739
7740#: builtin/fetch.c:129 builtin/pull.c:206
Jiang Xina77c07d2013-02-14 17:47:45 +08007741msgid "convert to a complete repository"
Jiang Xin160fb2b2015-08-02 21:47:30 +08007742msgstr "转换为一个完整的仓库"
Jiang Xina77c07d2013-02-14 17:47:45 +08007743
Jiang Xina0b6b242016-10-27 21:53:37 +08007744#: builtin/fetch.c:131 builtin/log.c:1433
Jiang Xinef317cd2012-09-15 11:17:00 +08007745msgid "dir"
Wang Sheng07432ce2013-01-30 17:23:08 +08007746msgstr "目录"
Jiang Xinef317cd2012-09-15 11:17:00 +08007747
Jiang Xina0b6b242016-10-27 21:53:37 +08007748#: builtin/fetch.c:132
Jiang Xinef317cd2012-09-15 11:17:00 +08007749msgid "prepend this to submodule path output"
Wang Sheng07432ce2013-01-30 17:23:08 +08007750msgstr "在子模组路径输出的前面加上此目录"
Jiang Xinef317cd2012-09-15 11:17:00 +08007751
Jiang Xina0b6b242016-10-27 21:53:37 +08007752#: builtin/fetch.c:135
Jiang Xinef317cd2012-09-15 11:17:00 +08007753msgid "default mode for recursion"
Wang Sheng07432ce2013-01-30 17:23:08 +08007754msgstr "递归的默认模式"
Jiang Xinef317cd2012-09-15 11:17:00 +08007755
Jiang Xina0b6b242016-10-27 21:53:37 +08007756#: builtin/fetch.c:137 builtin/pull.c:209
Jiang Xincfff71a2014-01-18 11:04:21 +08007757msgid "accept refs that update .git/shallow"
7758msgstr "接受更新 .git/shallow 的引用"
7759
Jiang Xina0b6b242016-10-27 21:53:37 +08007760#: builtin/fetch.c:138 builtin/pull.c:211
Jiang Xin6acbf032014-08-04 16:23:15 +08007761msgid "refmap"
7762msgstr "引用映射"
7763
Jiang Xina0b6b242016-10-27 21:53:37 +08007764#: builtin/fetch.c:139 builtin/pull.c:212
Jiang Xin6acbf032014-08-04 16:23:15 +08007765msgid "specify fetch refmap"
7766msgstr "指定获取操作的引用映射"
7767
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007768#: builtin/fetch.c:395
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007769msgid "Couldn't find remote ref HEAD"
7770msgstr "无法发现远程 HEAD 引用"
7771
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007772#: builtin/fetch.c:511
Jiang Xin5c57d762016-08-28 10:18:12 +08007773#, c-format
7774msgid "configuration fetch.output contains invalid value %s"
7775msgstr "配置变量 fetch.output 包含无效值 %s"
7776
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007777#: builtin/fetch.c:604
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007778#, c-format
7779msgid "object %s not found"
7780msgstr "对象 %s 未发现"
7781
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007782#: builtin/fetch.c:608
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007783msgid "[up to date]"
7784msgstr "[最新]"
7785
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007786#: builtin/fetch.c:621 builtin/fetch.c:701
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007787msgid "[rejected]"
7788msgstr "[已拒绝]"
7789
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007790#: builtin/fetch.c:622
Jiang Xin5c57d762016-08-28 10:18:12 +08007791msgid "can't fetch in current branch"
Ray Chen9a4b6942016-09-07 18:03:04 +08007792msgstr "当前分支下不能执行获取操作"
Jiang Xin5c57d762016-08-28 10:18:12 +08007793
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007794#: builtin/fetch.c:631
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007795msgid "[tag update]"
Ray Chen55a16ee2015-07-28 12:52:28 +08007796msgstr "[标签更新]"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007797
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007798#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681
7799#: builtin/fetch.c:696
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007800msgid "unable to update local ref"
7801msgstr "不能更新本地引用"
7802
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007803#: builtin/fetch.c:651
Jiang Xin5c57d762016-08-28 10:18:12 +08007804msgid "[new tag]"
7805msgstr "[新标签]"
7806
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007807#: builtin/fetch.c:654
Jiang Xin5c57d762016-08-28 10:18:12 +08007808msgid "[new branch]"
7809msgstr "[新分支]"
7810
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007811#: builtin/fetch.c:657
Jiang Xin5c57d762016-08-28 10:18:12 +08007812msgid "[new ref]"
7813msgstr "[新引用]"
7814
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007815#: builtin/fetch.c:696
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007816msgid "forced update"
7817msgstr "强制更新"
7818
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007819#: builtin/fetch.c:701
Jiang Xin5c57d762016-08-28 10:18:12 +08007820msgid "non-fast-forward"
7821msgstr "非快进"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007822
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007823#: builtin/fetch.c:746
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007824#, c-format
7825msgid "%s did not send all necessary objects\n"
7826msgstr "%s 未发送所有必须的对象\n"
7827
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007828#: builtin/fetch.c:766
Jiang Xincfff71a2014-01-18 11:04:21 +08007829#, c-format
7830msgid "reject %s because shallow roots are not allowed to be updated"
7831msgstr "拒绝 %s 因为浅克隆不允许被更新"
7832
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007833#: builtin/fetch.c:853 builtin/fetch.c:949
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007834#, c-format
7835msgid "From %.*s\n"
7836msgstr "来自 %.*s\n"
7837
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007838#: builtin/fetch.c:864
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007839#, c-format
7840msgid ""
7841"some local refs could not be updated; try running\n"
7842" 'git remote prune %s' to remove any old, conflicting branches"
7843msgstr ""
7844"一些本地引用不能被更新;尝试运行\n"
7845" 'git remote prune %s' 来删除旧的、有冲突的分支"
7846
Jiang Xin90e6ef52012-03-27 14:46:11 +08007847# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007848#: builtin/fetch.c:919
Jiang Xin81809b92012-05-30 12:19:47 +08007849#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08007850msgid " (%s will become dangling)"
Wang Sheng07432ce2013-01-30 17:23:08 +08007851msgstr " (%s 将成为摇摆状态)"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007852
Jiang Xin90e6ef52012-03-27 14:46:11 +08007853# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007854#: builtin/fetch.c:920
Jiang Xin81809b92012-05-30 12:19:47 +08007855#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08007856msgid " (%s has become dangling)"
Wang Sheng07432ce2013-01-30 17:23:08 +08007857msgstr " (%s 已成为摇摆状态)"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007858
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007859#: builtin/fetch.c:952
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007860msgid "[deleted]"
7861msgstr "[已删除]"
7862
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007863#: builtin/fetch.c:953 builtin/remote.c:1020
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007864msgid "(none)"
7865msgstr "(无)"
7866
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007867#: builtin/fetch.c:976
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007868#, c-format
7869msgid "Refusing to fetch into current branch %s of non-bare repository"
Jiang Xin160fb2b2015-08-02 21:47:30 +08007870msgstr "拒绝获取到非纯仓库的当前分支 %s"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007871
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007872#: builtin/fetch.c:995
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007873#, c-format
7874msgid "Option \"%s\" value \"%s\" is not valid for %s"
7875msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
7876
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007877#: builtin/fetch.c:998
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007878#, c-format
7879msgid "Option \"%s\" is ignored for %s\n"
Jiang Xin81809b92012-05-30 12:19:47 +08007880msgstr "选项 \"%s\" 为 %s 所忽略\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007881
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007882#: builtin/fetch.c:1074
Jiang Xin90314792013-09-17 23:37:05 +08007883#, c-format
7884msgid "Don't know how to fetch from %s"
7885msgstr "不知道如何从 %s 获取"
7886
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007887#: builtin/fetch.c:1234
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007888#, c-format
7889msgid "Fetching %s\n"
Rikud4a8e002012-02-02 16:40:12 +08007890msgstr "正在获取 %s\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007891
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007892#: builtin/fetch.c:1236 builtin/remote.c:96
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007893#, c-format
7894msgid "Could not fetch %s"
7895msgstr "不能获取 %s"
7896
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007897#: builtin/fetch.c:1254
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007898msgid ""
7899"No remote repository specified. Please, specify either a URL or a\n"
7900"remote name from which new revisions should be fetched."
Ray Chen4375c102015-08-10 18:03:29 +08007901msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007902
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007903#: builtin/fetch.c:1277
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007904msgid "You need to specify a tag name."
Ray Chen55a16ee2015-07-28 12:52:28 +08007905msgstr "您需要指定一个标签名称。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007906
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007907#: builtin/fetch.c:1319
Jiang Xina0b6b242016-10-27 21:53:37 +08007908msgid "Negative depth in --deepen is not supported"
7909msgstr "--deepen 不支持负数深度"
7910
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007911#: builtin/fetch.c:1321
Jiang Xina0b6b242016-10-27 21:53:37 +08007912msgid "--deepen and --depth are mutually exclusive"
7913msgstr "--deepen 和 --depth 是互斥的"
7914
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007915#: builtin/fetch.c:1326
Jiang Xina77c07d2013-02-14 17:47:45 +08007916msgid "--depth and --unshallow cannot be used together"
7917msgstr "--depth 和 --unshallow 不能同时使用"
7918
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007919#: builtin/fetch.c:1328
Jiang Xina77c07d2013-02-14 17:47:45 +08007920msgid "--unshallow on a complete repository does not make sense"
Jiang Xin160fb2b2015-08-02 21:47:30 +08007921msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
Jiang Xina77c07d2013-02-14 17:47:45 +08007922
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007923#: builtin/fetch.c:1350
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007924msgid "fetch --all does not take a repository argument"
Jiang Xin160fb2b2015-08-02 21:47:30 +08007925msgstr "fetch --all 不能带一个仓库参数"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007926
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007927#: builtin/fetch.c:1352
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007928msgid "fetch --all does not make sense with refspecs"
Jiang Xin160fb2b2015-08-02 21:47:30 +08007929msgstr "fetch --all 带引用规格没有任何意义"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007930
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007931#: builtin/fetch.c:1363
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007932#, c-format
7933msgid "No such remote or remote group: %s"
7934msgstr "没有这样的远程或远程组:%s"
7935
Jiang Xin1a79b2f2017-01-27 22:50:57 +08007936#: builtin/fetch.c:1371
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007937msgid "Fetching a group and specifying refspecs does not make sense"
Jiang Xin160fb2b2015-08-02 21:47:30 +08007938msgstr "获取组并指定引用规格没有意义"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08007939
Jiang Xin1b7f4a32015-08-23 15:23:21 +08007940#: builtin/fmt-merge-msg.c:14
Jiang Xin814ff312015-02-16 21:34:19 +08007941msgid ""
7942"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
7943msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
Jiang Xinef317cd2012-09-15 11:17:00 +08007944
Jiang Xina0b6b242016-10-27 21:53:37 +08007945#: builtin/fmt-merge-msg.c:663
Wang Sheng07432ce2013-01-30 17:23:08 +08007946msgid "populate log with at most <n> entries from shortlog"
7947msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
7948
Jiang Xina0b6b242016-10-27 21:53:37 +08007949#: builtin/fmt-merge-msg.c:666
Wang Sheng07432ce2013-01-30 17:23:08 +08007950msgid "alias for --log (deprecated)"
7951msgstr "参数 --log 的别名(已弃用)"
7952
Jiang Xina0b6b242016-10-27 21:53:37 +08007953#: builtin/fmt-merge-msg.c:669
Jiang Xinef317cd2012-09-15 11:17:00 +08007954msgid "text"
Wang Sheng07432ce2013-01-30 17:23:08 +08007955msgstr "文本"
Jiang Xinef317cd2012-09-15 11:17:00 +08007956
Jiang Xina0b6b242016-10-27 21:53:37 +08007957#: builtin/fmt-merge-msg.c:670
Jiang Xinef317cd2012-09-15 11:17:00 +08007958msgid "use <text> as start of message"
Wang Sheng07432ce2013-01-30 17:23:08 +08007959msgstr "使用 <文本> 作为提交说明的开始"
Jiang Xinef317cd2012-09-15 11:17:00 +08007960
Jiang Xina0b6b242016-10-27 21:53:37 +08007961#: builtin/fmt-merge-msg.c:671
Jiang Xinef317cd2012-09-15 11:17:00 +08007962msgid "file to read from"
Wang Sheng07432ce2013-01-30 17:23:08 +08007963msgstr "从文件中读取"
Jiang Xinef317cd2012-09-15 11:17:00 +08007964
Jiang Xin1b7f4a32015-08-23 15:23:21 +08007965#: builtin/for-each-ref.c:9
Jiang Xin814ff312015-02-16 21:34:19 +08007966msgid "git for-each-ref [<options>] [<pattern>]"
7967msgstr "git for-each-ref [<选项>] [<模式>]"
Jiang Xinef317cd2012-09-15 11:17:00 +08007968
Jiang Xin94550ed2015-11-16 07:02:11 +08007969#: builtin/for-each-ref.c:10
7970msgid "git for-each-ref [--points-at <object>]"
7971msgstr "git for-each-ref [--points-at <对象>]"
7972
7973#: builtin/for-each-ref.c:11
7974msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
7975msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
7976
7977#: builtin/for-each-ref.c:12
7978msgid "git for-each-ref [--contains [<object>]]"
7979msgstr "git for-each-ref [--contains [<对象>]]"
7980
7981#: builtin/for-each-ref.c:27
Jiang Xinef317cd2012-09-15 11:17:00 +08007982msgid "quote placeholders suitably for shells"
Wang Sheng07432ce2013-01-30 17:23:08 +08007983msgstr "引用占位符适用于 shells"
Jiang Xinef317cd2012-09-15 11:17:00 +08007984
Jiang Xin94550ed2015-11-16 07:02:11 +08007985#: builtin/for-each-ref.c:29
Jiang Xinef317cd2012-09-15 11:17:00 +08007986msgid "quote placeholders suitably for perl"
Wang Sheng07432ce2013-01-30 17:23:08 +08007987msgstr "引用占位符适用于 perl"
Jiang Xinef317cd2012-09-15 11:17:00 +08007988
Jiang Xin94550ed2015-11-16 07:02:11 +08007989#: builtin/for-each-ref.c:31
Jiang Xinef317cd2012-09-15 11:17:00 +08007990msgid "quote placeholders suitably for python"
Wang Sheng07432ce2013-01-30 17:23:08 +08007991msgstr "引用占位符适用于 python"
Jiang Xinef317cd2012-09-15 11:17:00 +08007992
Jiang Xin94550ed2015-11-16 07:02:11 +08007993#: builtin/for-each-ref.c:33
Jiang Xin04cb2f22015-01-04 12:27:38 +08007994msgid "quote placeholders suitably for Tcl"
7995msgstr "引用占位符适用于 Tcl"
Jiang Xinef317cd2012-09-15 11:17:00 +08007996
Jiang Xin94550ed2015-11-16 07:02:11 +08007997#: builtin/for-each-ref.c:36
Jiang Xinef317cd2012-09-15 11:17:00 +08007998msgid "show only <n> matched refs"
Wang Sheng07432ce2013-01-30 17:23:08 +08007999msgstr "只显示 <n> 个匹配的引用"
Jiang Xinef317cd2012-09-15 11:17:00 +08008000
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008001#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38
Jiang Xinef317cd2012-09-15 11:17:00 +08008002msgid "format to use for the output"
Wang Sheng07432ce2013-01-30 17:23:08 +08008003msgstr "输出格式"
Jiang Xinef317cd2012-09-15 11:17:00 +08008004
Jiang Xin94550ed2015-11-16 07:02:11 +08008005#: builtin/for-each-ref.c:41
8006msgid "print only refs which points at the given object"
8007msgstr "只打印指向给定对象的引用"
Jiang Xinef317cd2012-09-15 11:17:00 +08008008
Jiang Xin94550ed2015-11-16 07:02:11 +08008009#: builtin/for-each-ref.c:43
8010msgid "print only refs that are merged"
8011msgstr "只打印已经合并的引用"
Jiang Xinef317cd2012-09-15 11:17:00 +08008012
Jiang Xin94550ed2015-11-16 07:02:11 +08008013#: builtin/for-each-ref.c:44
8014msgid "print only refs that are not merged"
8015msgstr "只打印没有合并的引用"
8016
8017#: builtin/for-each-ref.c:45
8018msgid "print only refs which contain the commit"
8019msgstr "只打印包含该提交的引用"
8020
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008021#: builtin/fsck.c:554
Jiang Xin6c94aba2014-03-13 12:41:34 +08008022msgid "Checking object directories"
8023msgstr "检查对象目录中"
8024
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008025#: builtin/fsck.c:646
Jiang Xin814ff312015-02-16 21:34:19 +08008026msgid "git fsck [<options>] [<object>...]"
8027msgstr "git fsck [<选项>] [<对象>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +08008028
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008029#: builtin/fsck.c:652
Jiang Xinef317cd2012-09-15 11:17:00 +08008030msgid "show unreachable objects"
Wang Sheng07432ce2013-01-30 17:23:08 +08008031msgstr "显示不可达的对象"
Jiang Xinef317cd2012-09-15 11:17:00 +08008032
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008033#: builtin/fsck.c:653
Jiang Xinef317cd2012-09-15 11:17:00 +08008034msgid "show dangling objects"
Wang Sheng07432ce2013-01-30 17:23:08 +08008035msgstr "显示摇摆的对象"
Jiang Xinef317cd2012-09-15 11:17:00 +08008036
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008037#: builtin/fsck.c:654
Jiang Xinef317cd2012-09-15 11:17:00 +08008038msgid "report tags"
Ray Chen55a16ee2015-07-28 12:52:28 +08008039msgstr "报告标签"
Jiang Xinef317cd2012-09-15 11:17:00 +08008040
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008041#: builtin/fsck.c:655
Jiang Xinef317cd2012-09-15 11:17:00 +08008042msgid "report root nodes"
Wang Sheng07432ce2013-01-30 17:23:08 +08008043msgstr "报告根节点"
Jiang Xinef317cd2012-09-15 11:17:00 +08008044
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008045#: builtin/fsck.c:656
Jiang Xinef317cd2012-09-15 11:17:00 +08008046msgid "make index objects head nodes"
Wang Sheng07432ce2013-01-30 17:23:08 +08008047msgstr "将索引亦作为检查的头节点"
Jiang Xinef317cd2012-09-15 11:17:00 +08008048
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008049#: builtin/fsck.c:657
Jiang Xinef317cd2012-09-15 11:17:00 +08008050msgid "make reflogs head nodes (default)"
Wang Sheng07432ce2013-01-30 17:23:08 +08008051msgstr "将引用日志作为检查的头节点(默认)"
Jiang Xinef317cd2012-09-15 11:17:00 +08008052
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008053#: builtin/fsck.c:658
Jiang Xinef317cd2012-09-15 11:17:00 +08008054msgid "also consider packs and alternate objects"
Wang Sheng07432ce2013-01-30 17:23:08 +08008055msgstr "也考虑包和备用对象"
Jiang Xinef317cd2012-09-15 11:17:00 +08008056
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008057#: builtin/fsck.c:659
Jiang Xin1b7f4a32015-08-23 15:23:21 +08008058msgid "check only connectivity"
8059msgstr "仅检查连通性"
8060
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008061#: builtin/fsck.c:660
Jiang Xinef317cd2012-09-15 11:17:00 +08008062msgid "enable more strict checking"
Wang Sheng07432ce2013-01-30 17:23:08 +08008063msgstr "启用更严格的检查"
Jiang Xinef317cd2012-09-15 11:17:00 +08008064
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008065#: builtin/fsck.c:662
Jiang Xinef317cd2012-09-15 11:17:00 +08008066msgid "write dangling objects in .git/lost-found"
Wang Sheng07432ce2013-01-30 17:23:08 +08008067msgstr "将摇摆对象写入 .git/lost-found 中"
Jiang Xinef317cd2012-09-15 11:17:00 +08008068
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008069#: builtin/fsck.c:663 builtin/prune.c:107
Jiang Xinef317cd2012-09-15 11:17:00 +08008070msgid "show progress"
Wang Sheng07432ce2013-01-30 17:23:08 +08008071msgstr "显示进度"
Jiang Xinef317cd2012-09-15 11:17:00 +08008072
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008073#: builtin/fsck.c:664
Jiang Xin5c57d762016-08-28 10:18:12 +08008074msgid "show verbose names for reachable objects"
8075msgstr "显示可达对象的详细名称"
8076
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008077#: builtin/fsck.c:725
Jiang Xin6c94aba2014-03-13 12:41:34 +08008078msgid "Checking objects"
8079msgstr "检查对象中"
8080
Jiang Xin1b7f4a32015-08-23 15:23:21 +08008081#: builtin/gc.c:25
Jiang Xin814ff312015-02-16 21:34:19 +08008082msgid "git gc [<options>]"
8083msgstr "git gc [<选项>]"
Jiang Xinef317cd2012-09-15 11:17:00 +08008084
Jiang Xin94550ed2015-11-16 07:02:11 +08008085#: builtin/gc.c:72
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008086#, c-format
Jiang Xin7aea43f2015-05-31 08:42:31 +08008087msgid "Invalid %s: '%s'"
8088msgstr "无效 %s:'%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008089
Jiang Xin94550ed2015-11-16 07:02:11 +08008090#: builtin/gc.c:139
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008091#, c-format
8092msgid "insanely long object directory %.*s"
8093msgstr "不正常的长对象目录 %.*s"
8094
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008095#: builtin/gc.c:297
Jiang Xin94550ed2015-11-16 07:02:11 +08008096#, c-format
8097msgid ""
8098"The last gc run reported the following. Please correct the root cause\n"
8099"and remove %s.\n"
8100"Automatic cleanup will not be performed until the file is removed.\n"
8101"\n"
8102"%s"
8103msgstr ""
8104"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
8105"在该文件被删除之前,自动清理将不会执行。\n"
8106"\n"
8107"%s"
8108
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008109#: builtin/gc.c:334
Jiang Xinef317cd2012-09-15 11:17:00 +08008110msgid "prune unreferenced objects"
Wang Sheng07432ce2013-01-30 17:23:08 +08008111msgstr "清除未引用的对象"
Jiang Xinef317cd2012-09-15 11:17:00 +08008112
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008113#: builtin/gc.c:336
Jiang Xinef317cd2012-09-15 11:17:00 +08008114msgid "be more thorough (increased runtime)"
Wang Sheng07432ce2013-01-30 17:23:08 +08008115msgstr "更彻底(增加运行时间)"
Jiang Xinef317cd2012-09-15 11:17:00 +08008116
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008117#: builtin/gc.c:337
Jiang Xinef317cd2012-09-15 11:17:00 +08008118msgid "enable auto-gc mode"
Wang Sheng07432ce2013-01-30 17:23:08 +08008119msgstr "启用自动垃圾回收模式"
Jiang Xinef317cd2012-09-15 11:17:00 +08008120
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008121#: builtin/gc.c:338
Jiang Xin90314792013-09-17 23:37:05 +08008122msgid "force running gc even if there may be another gc running"
8123msgstr "强制执行 gc 即使另外一个 gc 正在执行"
8124
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008125#: builtin/gc.c:380
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008126#, c-format
Jiang Xin6c94aba2014-03-13 12:41:34 +08008127msgid "Auto packing the repository in background for optimum performance.\n"
Jiang Xin160fb2b2015-08-02 21:47:30 +08008128msgstr "自动在后台执行仓库打包以求最佳性能。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008129
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008130#: builtin/gc.c:382
Jiang Xin6c94aba2014-03-13 12:41:34 +08008131#, c-format
8132msgid "Auto packing the repository for optimum performance.\n"
Jiang Xin160fb2b2015-08-02 21:47:30 +08008133msgstr "自动打包仓库以求最佳性能。\n"
Jiang Xin6c94aba2014-03-13 12:41:34 +08008134
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008135#: builtin/gc.c:383
Jiang Xin6c94aba2014-03-13 12:41:34 +08008136#, c-format
8137msgid "See \"git help gc\" for manual housekeeping.\n"
8138msgstr "手工维护参见 \"git help gc\"。\n"
8139
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008140#: builtin/gc.c:404
Jiang Xin90314792013-09-17 23:37:05 +08008141#, c-format
8142msgid ""
8143"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
8144msgstr ""
Ray Chen29004bb2016-12-28 17:08:45 +08008145"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)"
Jiang Xin90314792013-09-17 23:37:05 +08008146
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008147#: builtin/gc.c:448
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008148msgid ""
8149"There are too many unreachable loose objects; run 'git prune' to remove them."
Jiang Xin90e6ef52012-03-27 14:46:11 +08008150msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008151
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008152#: builtin/grep.c:25
Jiang Xin814ff312015-02-16 21:34:19 +08008153msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
8154msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +08008155
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008156#: builtin/grep.c:232
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008157#, c-format
8158msgid "grep: failed to create thread: %s"
Jiang Xin90e6ef52012-03-27 14:46:11 +08008159msgstr "grep:无法创建线程:%s"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008160
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008161#: builtin/grep.c:290
Jiang Xin276ceea2016-02-28 20:35:55 +08008162#, c-format
8163msgid "invalid number of threads specified (%d) for %s"
8164msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
8165
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008166#: builtin/grep.c:763 builtin/grep.c:804
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008167#, c-format
8168msgid "unable to read tree (%s)"
Jiang Xin90e6ef52012-03-27 14:46:11 +08008169msgstr "无法读取树(%s)"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008170
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008171#: builtin/grep.c:823
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008172#, c-format
8173msgid "unable to grep from object of type %s"
8174msgstr "无法抓取来自于 %s 类型的对象"
8175
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008176#: builtin/grep.c:887
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008177#, c-format
8178msgid "switch `%c' expects a numerical value"
8179msgstr "开关 `%c' 期望一个数字值"
8180
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008181#: builtin/grep.c:973
Jiang Xinef317cd2012-09-15 11:17:00 +08008182msgid "search in index instead of in the work tree"
Wang Sheng07432ce2013-01-30 17:23:08 +08008183msgstr "在索引区搜索而不是在工作区"
Jiang Xinef317cd2012-09-15 11:17:00 +08008184
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008185#: builtin/grep.c:975
Jiang Xinef317cd2012-09-15 11:17:00 +08008186msgid "find in contents not managed by git"
Wang Sheng07432ce2013-01-30 17:23:08 +08008187msgstr "在未被 git 管理的内容中查找"
Jiang Xinef317cd2012-09-15 11:17:00 +08008188
8189# 译者:中文字符串拼接,可删除前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008190#: builtin/grep.c:977
Jiang Xinef317cd2012-09-15 11:17:00 +08008191msgid "search in both tracked and untracked files"
Wang Sheng07432ce2013-01-30 17:23:08 +08008192msgstr "在跟踪和未跟踪的文件中搜索"
8193
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008194#: builtin/grep.c:979
Jiang Xin814ff312015-02-16 21:34:19 +08008195msgid "ignore files specified via '.gitignore'"
8196msgstr "忽略 '.gitignore' 包含的文件"
Wang Sheng07432ce2013-01-30 17:23:08 +08008197
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008198#: builtin/grep.c:981
8199msgid "recursivley search in each submodule"
8200msgstr "在每一个子模组中递归搜索"
8201
8202#: builtin/grep.c:983
8203msgid "basename"
8204msgstr "基本名"
8205
8206#: builtin/grep.c:984
8207msgid "prepend parent project's basename to output"
8208msgstr "在输出中以父项目的基本名为前缀"
8209
8210#: builtin/grep.c:987
Wang Sheng07432ce2013-01-30 17:23:08 +08008211msgid "show non-matching lines"
8212msgstr "显示未匹配的行"
8213
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008214#: builtin/grep.c:989
Wang Sheng07432ce2013-01-30 17:23:08 +08008215msgid "case insensitive matching"
8216msgstr "不区分大小写匹配"
8217
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008218#: builtin/grep.c:991
Wang Sheng07432ce2013-01-30 17:23:08 +08008219msgid "match patterns only at word boundaries"
8220msgstr "只在单词边界匹配模式"
8221
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008222#: builtin/grep.c:993
Wang Sheng07432ce2013-01-30 17:23:08 +08008223msgid "process binary files as text"
8224msgstr "把二进制文件当做文本处理"
8225
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008226#: builtin/grep.c:995
Wang Sheng07432ce2013-01-30 17:23:08 +08008227msgid "don't match patterns in binary files"
8228msgstr "不在二进制文件中匹配模式"
8229
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008230#: builtin/grep.c:998
Jiang Xin90314792013-09-17 23:37:05 +08008231msgid "process binary files with textconv filters"
8232msgstr "用 textconv 过滤器处理二进制文件"
8233
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008234#: builtin/grep.c:1000
Wang Sheng07432ce2013-01-30 17:23:08 +08008235msgid "descend at most <depth> levels"
8236msgstr "最多以指定的深度向下寻找"
8237
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008238#: builtin/grep.c:1004
Wang Sheng07432ce2013-01-30 17:23:08 +08008239msgid "use extended POSIX regular expressions"
8240msgstr "使用扩展的 POSIX 正则表达式"
8241
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008242#: builtin/grep.c:1007
Wang Sheng07432ce2013-01-30 17:23:08 +08008243msgid "use basic POSIX regular expressions (default)"
8244msgstr "使用基本的 POSIX 正则表达式(默认)"
8245
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008246#: builtin/grep.c:1010
Wang Sheng07432ce2013-01-30 17:23:08 +08008247msgid "interpret patterns as fixed strings"
8248msgstr "把模式解析为固定的字符串"
8249
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008250#: builtin/grep.c:1013
Wang Sheng07432ce2013-01-30 17:23:08 +08008251msgid "use Perl-compatible regular expressions"
8252msgstr "使用 Perl 兼容的正则表达式"
8253
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008254#: builtin/grep.c:1016
Wang Sheng07432ce2013-01-30 17:23:08 +08008255msgid "show line numbers"
8256msgstr "显示行号"
8257
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008258#: builtin/grep.c:1017
Wang Sheng07432ce2013-01-30 17:23:08 +08008259msgid "don't show filenames"
8260msgstr "不显示文件名"
8261
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008262#: builtin/grep.c:1018
Wang Sheng07432ce2013-01-30 17:23:08 +08008263msgid "show filenames"
8264msgstr "显示文件名"
8265
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008266#: builtin/grep.c:1020
Wang Sheng07432ce2013-01-30 17:23:08 +08008267msgid "show filenames relative to top directory"
8268msgstr "显示相对于顶级目录的文件名"
8269
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008270#: builtin/grep.c:1022
Wang Sheng07432ce2013-01-30 17:23:08 +08008271msgid "show only filenames instead of matching lines"
8272msgstr "只显示文件名而不显示匹配的行"
8273
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008274#: builtin/grep.c:1024
Wang Sheng07432ce2013-01-30 17:23:08 +08008275msgid "synonym for --files-with-matches"
8276msgstr "和 --files-with-matches 同义"
8277
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008278#: builtin/grep.c:1027
Wang Sheng07432ce2013-01-30 17:23:08 +08008279msgid "show only the names of files without match"
8280msgstr "只显示未匹配的文件名"
8281
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008282#: builtin/grep.c:1029
Wang Sheng07432ce2013-01-30 17:23:08 +08008283msgid "print NUL after filenames"
8284msgstr "在文件名后输出 NUL 字符"
8285
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008286#: builtin/grep.c:1031
Wang Sheng07432ce2013-01-30 17:23:08 +08008287msgid "show the number of matches instead of matching lines"
8288msgstr "显示总匹配行数,而不显示匹配的行"
8289
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008290#: builtin/grep.c:1032
Wang Sheng07432ce2013-01-30 17:23:08 +08008291msgid "highlight matches"
8292msgstr "高亮显示匹配项"
8293
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008294#: builtin/grep.c:1034
Wang Sheng07432ce2013-01-30 17:23:08 +08008295msgid "print empty line between matches from different files"
8296msgstr "在不同文件的匹配项之间打印空行"
8297
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008298#: builtin/grep.c:1036
Wang Sheng07432ce2013-01-30 17:23:08 +08008299msgid "show filename only once above matches from same file"
8300msgstr "只在同一文件的匹配项的上面显示一次文件名"
8301
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008302#: builtin/grep.c:1039
Wang Sheng07432ce2013-01-30 17:23:08 +08008303msgid "show <n> context lines before and after matches"
8304msgstr "显示匹配项前后的 <n> 行上下文"
8305
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008306#: builtin/grep.c:1042
Wang Sheng07432ce2013-01-30 17:23:08 +08008307msgid "show <n> context lines before matches"
8308msgstr "显示匹配项前 <n> 行上下文"
8309
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008310#: builtin/grep.c:1044
Wang Sheng07432ce2013-01-30 17:23:08 +08008311msgid "show <n> context lines after matches"
8312msgstr "显示匹配项后 <n> 行上下文"
8313
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008314#: builtin/grep.c:1046
Jiang Xin276ceea2016-02-28 20:35:55 +08008315msgid "use <n> worker threads"
8316msgstr "使用 <n> 个工作线程"
8317
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008318#: builtin/grep.c:1047
Wang Sheng07432ce2013-01-30 17:23:08 +08008319msgid "shortcut for -C NUM"
8320msgstr "快捷键 -C 数字"
8321
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008322#: builtin/grep.c:1050
Wang Sheng07432ce2013-01-30 17:23:08 +08008323msgid "show a line with the function name before matches"
8324msgstr "在匹配的前面显示一行函数名"
8325
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008326#: builtin/grep.c:1052
Wang Sheng07432ce2013-01-30 17:23:08 +08008327msgid "show the surrounding function"
8328msgstr "显示所在函数的前后内容"
8329
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008330#: builtin/grep.c:1055
Wang Sheng07432ce2013-01-30 17:23:08 +08008331msgid "read patterns from file"
8332msgstr "从文件读取模式"
8333
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008334#: builtin/grep.c:1057
Wang Sheng07432ce2013-01-30 17:23:08 +08008335msgid "match <pattern>"
8336msgstr "匹配 <模式>"
8337
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008338#: builtin/grep.c:1059
Wang Sheng07432ce2013-01-30 17:23:08 +08008339msgid "combine patterns specified with -e"
8340msgstr "组合用 -e 参数设定的模式"
8341
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008342#: builtin/grep.c:1071
Wang Sheng07432ce2013-01-30 17:23:08 +08008343msgid "indicate hit with exit status without output"
8344msgstr "不输出,而用退出码标识命中状态"
Jiang Xinef317cd2012-09-15 11:17:00 +08008345
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008346#: builtin/grep.c:1073
Wang Sheng07432ce2013-01-30 17:23:08 +08008347msgid "show only matches from files that match all patterns"
8348msgstr "只显示匹配所有模式的文件中的匹配"
Jiang Xinef317cd2012-09-15 11:17:00 +08008349
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008350#: builtin/grep.c:1075
Wang Sheng07432ce2013-01-30 17:23:08 +08008351msgid "show parse tree for grep expression"
8352msgstr "显示 grep 表达式的解析树"
Jiang Xinef317cd2012-09-15 11:17:00 +08008353
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008354#: builtin/grep.c:1079
Wang Sheng07432ce2013-01-30 17:23:08 +08008355msgid "pager"
8356msgstr "分页"
Jiang Xinef317cd2012-09-15 11:17:00 +08008357
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008358#: builtin/grep.c:1079
Wang Sheng07432ce2013-01-30 17:23:08 +08008359msgid "show matching files in the pager"
8360msgstr "分页显示匹配的文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08008361
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008362#: builtin/grep.c:1082
Jiang Xinef317cd2012-09-15 11:17:00 +08008363msgid "allow calling of grep(1) (ignored by this build)"
Wang Sheng07432ce2013-01-30 17:23:08 +08008364msgstr "允许调用 grep(1)(本次构建忽略)"
Jiang Xinef317cd2012-09-15 11:17:00 +08008365
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008366#: builtin/grep.c:1146
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008367msgid "no pattern given."
8368msgstr "未提供模式匹配。"
8369
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008370#: builtin/grep.c:1178 builtin/index-pack.c:1482
Jiang Xin276ceea2016-02-28 20:35:55 +08008371#, c-format
8372msgid "invalid number of threads specified (%d)"
8373msgstr "指定的线程数无效(%d)"
8374
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008375#: builtin/grep.c:1215
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008376msgid "--open-files-in-pager only works on the worktree"
8377msgstr "--open-files-in-pager 仅用于工作区"
8378
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008379#: builtin/grep.c:1238
8380msgid "option not supported with --recurse-submodules."
8381msgstr "选项不支持和 --recurse-submodules 共用。"
8382
8383#: builtin/grep.c:1244
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008384msgid "--cached or --untracked cannot be used with --no-index."
Jiang Xin649900b2012-08-02 11:50:59 +08008385msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008386
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008387#: builtin/grep.c:1249
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008388msgid "--no-index or --untracked cannot be used with revs."
Jiang Xin649900b2012-08-02 11:50:59 +08008389msgstr "--no-index 或 --untracked 不能和版本同时使用。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008390
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008391#: builtin/grep.c:1252
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008392msgid "--[no-]exclude-standard cannot be used for tracked contents."
Jiang Xin90e6ef52012-03-27 14:46:11 +08008393msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008394
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008395#: builtin/grep.c:1260
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008396msgid "both --cached and trees are given."
8397msgstr "同时给出了 --cached 和树对象。"
8398
Jiang Xin276ceea2016-02-28 20:35:55 +08008399#: builtin/hash-object.c:81
Jiang Xinef317cd2012-09-15 11:17:00 +08008400msgid ""
Jiang Xin814ff312015-02-16 21:34:19 +08008401"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
8402"[--] <file>..."
Jiang Xinef317cd2012-09-15 11:17:00 +08008403msgstr ""
Jiang Xin814ff312015-02-16 21:34:19 +08008404"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
8405"[--] <文件>..."
Jiang Xinef317cd2012-09-15 11:17:00 +08008406
Jiang Xin276ceea2016-02-28 20:35:55 +08008407#: builtin/hash-object.c:82
Jiang Xin94550ed2015-11-16 07:02:11 +08008408msgid "git hash-object --stdin-paths"
8409msgstr "git hash-object --stdin-paths"
Jiang Xinef317cd2012-09-15 11:17:00 +08008410
Jiang Xina0b6b242016-10-27 21:53:37 +08008411#: builtin/hash-object.c:94
Jiang Xinef317cd2012-09-15 11:17:00 +08008412msgid "type"
Wang Sheng07432ce2013-01-30 17:23:08 +08008413msgstr "类型"
Jiang Xinef317cd2012-09-15 11:17:00 +08008414
Jiang Xina0b6b242016-10-27 21:53:37 +08008415#: builtin/hash-object.c:94
Jiang Xinef317cd2012-09-15 11:17:00 +08008416msgid "object type"
Wang Sheng07432ce2013-01-30 17:23:08 +08008417msgstr "对象类型"
Jiang Xinef317cd2012-09-15 11:17:00 +08008418
Jiang Xina0b6b242016-10-27 21:53:37 +08008419#: builtin/hash-object.c:95
Jiang Xinef317cd2012-09-15 11:17:00 +08008420msgid "write the object into the object database"
Wang Sheng07432ce2013-01-30 17:23:08 +08008421msgstr "将对象写入对象数据库"
Jiang Xinef317cd2012-09-15 11:17:00 +08008422
Jiang Xina0b6b242016-10-27 21:53:37 +08008423#: builtin/hash-object.c:97
Jiang Xinef317cd2012-09-15 11:17:00 +08008424msgid "read the object from stdin"
Wang Sheng07432ce2013-01-30 17:23:08 +08008425msgstr "从标准输入读取对象"
Jiang Xinef317cd2012-09-15 11:17:00 +08008426
Jiang Xina0b6b242016-10-27 21:53:37 +08008427#: builtin/hash-object.c:99
Jiang Xinef317cd2012-09-15 11:17:00 +08008428msgid "store file as is without filters"
Wang Sheng07432ce2013-01-30 17:23:08 +08008429msgstr "原样存储文件不使用过滤器"
Jiang Xinef317cd2012-09-15 11:17:00 +08008430
Jiang Xina0b6b242016-10-27 21:53:37 +08008431#: builtin/hash-object.c:100
Jiang Xin220c3132014-10-08 10:55:14 +08008432msgid ""
8433"just hash any random garbage to create corrupt objects for debugging Git"
8434msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
8435
Jiang Xina0b6b242016-10-27 21:53:37 +08008436#: builtin/hash-object.c:101
Jiang Xinef317cd2012-09-15 11:17:00 +08008437msgid "process file as it were from this path"
Wang Sheng07432ce2013-01-30 17:23:08 +08008438msgstr "处理文件并假设其来自于此路径"
Jiang Xinef317cd2012-09-15 11:17:00 +08008439
Jiang Xina0b6b242016-10-27 21:53:37 +08008440#: builtin/help.c:42
Jiang Xinef317cd2012-09-15 11:17:00 +08008441msgid "print all available commands"
Wang Sheng07432ce2013-01-30 17:23:08 +08008442msgstr "打印所有可用的命令"
Jiang Xinef317cd2012-09-15 11:17:00 +08008443
Jiang Xina0b6b242016-10-27 21:53:37 +08008444#: builtin/help.c:43
8445msgid "exclude guides"
8446msgstr "排除向导"
8447
8448#: builtin/help.c:44
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08008449msgid "print list of useful guides"
8450msgstr "显示有用的指南列表"
8451
Jiang Xina0b6b242016-10-27 21:53:37 +08008452#: builtin/help.c:45
Jiang Xinef317cd2012-09-15 11:17:00 +08008453msgid "show man page"
Wang Sheng07432ce2013-01-30 17:23:08 +08008454msgstr "显示 man 手册"
Jiang Xinef317cd2012-09-15 11:17:00 +08008455
Jiang Xina0b6b242016-10-27 21:53:37 +08008456#: builtin/help.c:46
Jiang Xinef317cd2012-09-15 11:17:00 +08008457msgid "show manual in web browser"
Wang Sheng07432ce2013-01-30 17:23:08 +08008458msgstr "在 web 浏览器中显示手册"
Jiang Xinef317cd2012-09-15 11:17:00 +08008459
Jiang Xina0b6b242016-10-27 21:53:37 +08008460#: builtin/help.c:48
Jiang Xinef317cd2012-09-15 11:17:00 +08008461msgid "show info page"
Wang Sheng07432ce2013-01-30 17:23:08 +08008462msgstr "显示 info 手册"
Jiang Xinef317cd2012-09-15 11:17:00 +08008463
Jiang Xina0b6b242016-10-27 21:53:37 +08008464#: builtin/help.c:54
Jiang Xin814ff312015-02-16 21:34:19 +08008465msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
8466msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
Jiang Xinef317cd2012-09-15 11:17:00 +08008467
Jiang Xina0b6b242016-10-27 21:53:37 +08008468#: builtin/help.c:66
Jiang Xin81809b92012-05-30 12:19:47 +08008469#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08008470msgid "unrecognized help format '%s'"
Jiang Xin81809b92012-05-30 12:19:47 +08008471msgstr "未能识别的帮助格式 '%s'"
Jiang Xin8ada9592012-05-21 09:35:47 +08008472
Jiang Xina0b6b242016-10-27 21:53:37 +08008473#: builtin/help.c:93
Jiang Xin8ada9592012-05-21 09:35:47 +08008474msgid "Failed to start emacsclient."
Jiang Xin81809b92012-05-30 12:19:47 +08008475msgstr "无法启动 emacsclient。"
Jiang Xin8ada9592012-05-21 09:35:47 +08008476
Jiang Xina0b6b242016-10-27 21:53:37 +08008477#: builtin/help.c:106
Jiang Xin8ada9592012-05-21 09:35:47 +08008478msgid "Failed to parse emacsclient version."
Jiang Xin81809b92012-05-30 12:19:47 +08008479msgstr "无法解析 emacsclient 版本。"
Jiang Xin8ada9592012-05-21 09:35:47 +08008480
Jiang Xina0b6b242016-10-27 21:53:37 +08008481#: builtin/help.c:114
Jiang Xin8ada9592012-05-21 09:35:47 +08008482#, c-format
8483msgid "emacsclient version '%d' too old (< 22)."
Wang Sheng07432ce2013-01-30 17:23:08 +08008484msgstr "emacsclient 版本 '%d' 太老(< 22)。"
Jiang Xin8ada9592012-05-21 09:35:47 +08008485
Jiang Xina0b6b242016-10-27 21:53:37 +08008486#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
Jiang Xin81809b92012-05-30 12:19:47 +08008487#, c-format
Jiang Xin5b04ee32016-05-29 20:40:35 +08008488msgid "failed to exec '%s'"
8489msgstr "无法执行 '%s'"
Jiang Xin8ada9592012-05-21 09:35:47 +08008490
Jiang Xina0b6b242016-10-27 21:53:37 +08008491#: builtin/help.c:207
Jiang Xin8ada9592012-05-21 09:35:47 +08008492#, c-format
8493msgid ""
8494"'%s': path for unsupported man viewer.\n"
8495"Please consider using 'man.<tool>.cmd' instead."
8496msgstr ""
Jiang Xin81809b92012-05-30 12:19:47 +08008497"'%s':不支持的 man 手册查看器的路径。\n"
Jiang Xind9d56b22015-01-18 20:37:57 +08008498"请使用 'man.<工具>.cmd'。"
Jiang Xin8ada9592012-05-21 09:35:47 +08008499
Jiang Xina0b6b242016-10-27 21:53:37 +08008500#: builtin/help.c:219
Jiang Xin8ada9592012-05-21 09:35:47 +08008501#, c-format
8502msgid ""
8503"'%s': cmd for supported man viewer.\n"
8504"Please consider using 'man.<tool>.path' instead."
8505msgstr ""
Jiang Xin81809b92012-05-30 12:19:47 +08008506"'%s': 支持的 man 手册查看器命令。\n"
Jiang Xind9d56b22015-01-18 20:37:57 +08008507"请使用 'man.<工具>.path'。"
Jiang Xin8ada9592012-05-21 09:35:47 +08008508
Jiang Xina0b6b242016-10-27 21:53:37 +08008509#: builtin/help.c:336
Jiang Xin8ada9592012-05-21 09:35:47 +08008510#, c-format
8511msgid "'%s': unknown man viewer."
Jiang Xin81809b92012-05-30 12:19:47 +08008512msgstr "'%s':未知的 man 查看器。"
Jiang Xin8ada9592012-05-21 09:35:47 +08008513
Jiang Xina0b6b242016-10-27 21:53:37 +08008514#: builtin/help.c:353
Jiang Xin8ada9592012-05-21 09:35:47 +08008515msgid "no man viewer handled the request"
Jiang Xin81809b92012-05-30 12:19:47 +08008516msgstr "没有 man 查看器处理此请求"
Jiang Xin8ada9592012-05-21 09:35:47 +08008517
Jiang Xina0b6b242016-10-27 21:53:37 +08008518#: builtin/help.c:361
Jiang Xin8ada9592012-05-21 09:35:47 +08008519msgid "no info viewer handled the request"
Jiang Xin81809b92012-05-30 12:19:47 +08008520msgstr "没有 info 查看器处理此请求"
Jiang Xin8ada9592012-05-21 09:35:47 +08008521
Jiang Xina0b6b242016-10-27 21:53:37 +08008522#: builtin/help.c:403
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08008523msgid "Defining attributes per path"
8524msgstr "定义路径的属性"
8525
Jiang Xina0b6b242016-10-27 21:53:37 +08008526#: builtin/help.c:404
Jiang Xin220c3132014-10-08 10:55:14 +08008527msgid "Everyday Git With 20 Commands Or So"
8528msgstr "每一天 Git 常用的约 20 条命令"
8529
Jiang Xina0b6b242016-10-27 21:53:37 +08008530#: builtin/help.c:405
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08008531msgid "A Git glossary"
8532msgstr "Git 词汇表"
8533
Jiang Xina0b6b242016-10-27 21:53:37 +08008534#: builtin/help.c:406
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08008535msgid "Specifies intentionally untracked files to ignore"
8536msgstr "忽略指定的未跟踪文件"
8537
Jiang Xina0b6b242016-10-27 21:53:37 +08008538#: builtin/help.c:407
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08008539msgid "Defining submodule properties"
8540msgstr "定义子模组属性"
8541
Jiang Xina0b6b242016-10-27 21:53:37 +08008542#: builtin/help.c:408
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08008543msgid "Specifying revisions and ranges for Git"
8544msgstr "指定 Git 的版本和版本范围"
8545
Jiang Xina0b6b242016-10-27 21:53:37 +08008546#: builtin/help.c:409
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08008547msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
8548msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
8549
Jiang Xina0b6b242016-10-27 21:53:37 +08008550#: builtin/help.c:410
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08008551msgid "An overview of recommended workflows with Git"
8552msgstr "Git 推荐的工作流概览"
8553
Jiang Xina0b6b242016-10-27 21:53:37 +08008554#: builtin/help.c:422
Jiang Xin4dcdc3d2013-04-13 10:02:43 +08008555msgid "The common Git guides are:\n"
8556msgstr "最常用的 Git 向导有:\n"
8557
Jiang Xina0b6b242016-10-27 21:53:37 +08008558#: builtin/help.c:440
Jiang Xin8ada9592012-05-21 09:35:47 +08008559#, c-format
8560msgid "`git %s' is aliased to `%s'"
Jiang Xin81809b92012-05-30 12:19:47 +08008561msgstr "`git %s' 是 `%s' 的别名"
Jiang Xin8ada9592012-05-21 09:35:47 +08008562
Jiang Xina0b6b242016-10-27 21:53:37 +08008563#: builtin/help.c:462 builtin/help.c:479
8564#, c-format
8565msgid "usage: %s%s"
8566msgstr "用法:%s%s"
8567
8568#: builtin/index-pack.c:154
Jiang Xin6acbf032014-08-04 16:23:15 +08008569#, c-format
8570msgid "unable to open %s"
8571msgstr "不能打开 %s"
8572
Jiang Xina0b6b242016-10-27 21:53:37 +08008573#: builtin/index-pack.c:204
Jiang Xin8ada9592012-05-21 09:35:47 +08008574#, c-format
8575msgid "object type mismatch at %s"
Jiang Xin81809b92012-05-30 12:19:47 +08008576msgstr "%s 的对象类型不匹配"
Jiang Xin8ada9592012-05-21 09:35:47 +08008577
Jiang Xina0b6b242016-10-27 21:53:37 +08008578#: builtin/index-pack.c:224
Jiang Xin6acbf032014-08-04 16:23:15 +08008579#, c-format
8580msgid "did not receive expected object %s"
Jiang Xina0b6b242016-10-27 21:53:37 +08008581msgstr "未能获取预期的对象 %s"
Jiang Xin8ada9592012-05-21 09:35:47 +08008582
Jiang Xina0b6b242016-10-27 21:53:37 +08008583#: builtin/index-pack.c:227
Jiang Xin6acbf032014-08-04 16:23:15 +08008584#, c-format
8585msgid "object %s: expected type %s, found %s"
Jiang Xina0b6b242016-10-27 21:53:37 +08008586msgstr "对象 %s:应为类型 %s,却是 %s"
Jiang Xin6acbf032014-08-04 16:23:15 +08008587
Jiang Xina0b6b242016-10-27 21:53:37 +08008588#: builtin/index-pack.c:269
Jiang Xin81809b92012-05-30 12:19:47 +08008589#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08008590msgid "cannot fill %d byte"
8591msgid_plural "cannot fill %d bytes"
Jiang Xin81809b92012-05-30 12:19:47 +08008592msgstr[0] "无法填充 %d 字节"
Jiang Xin5ae481e2012-05-31 17:35:59 +08008593msgstr[1] "无法填充 %d 字节"
Jiang Xin8ada9592012-05-21 09:35:47 +08008594
Jiang Xina0b6b242016-10-27 21:53:37 +08008595#: builtin/index-pack.c:279
Jiang Xin8ada9592012-05-21 09:35:47 +08008596msgid "early EOF"
Jiang Xin81809b92012-05-30 12:19:47 +08008597msgstr "过早的文件结束符(EOF)"
Jiang Xin8ada9592012-05-21 09:35:47 +08008598
Jiang Xina0b6b242016-10-27 21:53:37 +08008599#: builtin/index-pack.c:280
Jiang Xin8ada9592012-05-21 09:35:47 +08008600msgid "read error on input"
Jiang Xin81809b92012-05-30 12:19:47 +08008601msgstr "输入上的读错误"
Jiang Xin8ada9592012-05-21 09:35:47 +08008602
Jiang Xina0b6b242016-10-27 21:53:37 +08008603#: builtin/index-pack.c:292
Jiang Xin8ada9592012-05-21 09:35:47 +08008604msgid "used more bytes than were available"
Jiang Xin81809b92012-05-30 12:19:47 +08008605msgstr "用掉了超过可用的字节"
Jiang Xin8ada9592012-05-21 09:35:47 +08008606
Jiang Xina0b6b242016-10-27 21:53:37 +08008607#: builtin/index-pack.c:299
Jiang Xin8ada9592012-05-21 09:35:47 +08008608msgid "pack too large for current definition of off_t"
Jiang Xin81809b92012-05-30 12:19:47 +08008609msgstr "包太大超过了当前 off_t 的定义"
Jiang Xin8ada9592012-05-21 09:35:47 +08008610
Jiang Xina0b6b242016-10-27 21:53:37 +08008611#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
8612msgid "pack exceeds maximum allowed size"
8613msgstr "包超过了最大允许值"
8614
8615#: builtin/index-pack.c:317
Jiang Xin81809b92012-05-30 12:19:47 +08008616#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08008617msgid "unable to create '%s'"
Jiang Xin81809b92012-05-30 12:19:47 +08008618msgstr "不能创建 '%s'"
Jiang Xin8ada9592012-05-21 09:35:47 +08008619
Jiang Xina0b6b242016-10-27 21:53:37 +08008620#: builtin/index-pack.c:322
Jiang Xin81809b92012-05-30 12:19:47 +08008621#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08008622msgid "cannot open packfile '%s'"
Jiang Xin81809b92012-05-30 12:19:47 +08008623msgstr "无法打开包文件 '%s'"
Jiang Xin8ada9592012-05-21 09:35:47 +08008624
Jiang Xina0b6b242016-10-27 21:53:37 +08008625#: builtin/index-pack.c:336
Jiang Xin8ada9592012-05-21 09:35:47 +08008626msgid "pack signature mismatch"
Jiang Xin81809b92012-05-30 12:19:47 +08008627msgstr "包签名不匹配"
Jiang Xin8ada9592012-05-21 09:35:47 +08008628
Jiang Xina0b6b242016-10-27 21:53:37 +08008629#: builtin/index-pack.c:338
Jiang Xinef317cd2012-09-15 11:17:00 +08008630#, c-format
8631msgid "pack version %<PRIu32> unsupported"
Wang Sheng07432ce2013-01-30 17:23:08 +08008632msgstr "不支持包版本 %<PRIu32>"
Jiang Xinef317cd2012-09-15 11:17:00 +08008633
Jiang Xina0b6b242016-10-27 21:53:37 +08008634#: builtin/index-pack.c:356
Jiang Xin8ada9592012-05-21 09:35:47 +08008635#, c-format
Jiang Xin5c57d762016-08-28 10:18:12 +08008636msgid "pack has bad object at offset %<PRIuMAX>: %s"
8637msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
Jiang Xin8ada9592012-05-21 09:35:47 +08008638
Jiang Xina0b6b242016-10-27 21:53:37 +08008639#: builtin/index-pack.c:478
Jiang Xin8ada9592012-05-21 09:35:47 +08008640#, c-format
8641msgid "inflate returned %d"
Jiang Xin81809b92012-05-30 12:19:47 +08008642msgstr "解压缩返回 %d"
Jiang Xin8ada9592012-05-21 09:35:47 +08008643
Jiang Xina0b6b242016-10-27 21:53:37 +08008644#: builtin/index-pack.c:527
Jiang Xin8ada9592012-05-21 09:35:47 +08008645msgid "offset value overflow for delta base object"
Jiang Xin81809b92012-05-30 12:19:47 +08008646msgstr "偏移值覆盖了 delta 基准对象"
Jiang Xin8ada9592012-05-21 09:35:47 +08008647
Jiang Xina0b6b242016-10-27 21:53:37 +08008648#: builtin/index-pack.c:535
Jiang Xin8ada9592012-05-21 09:35:47 +08008649msgid "delta base offset is out of bound"
Jiang Xin81809b92012-05-30 12:19:47 +08008650msgstr "delta 基准偏移越界"
Jiang Xin8ada9592012-05-21 09:35:47 +08008651
Jiang Xina0b6b242016-10-27 21:53:37 +08008652#: builtin/index-pack.c:543
Jiang Xin81809b92012-05-30 12:19:47 +08008653#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08008654msgid "unknown object type %d"
Jiang Xin81809b92012-05-30 12:19:47 +08008655msgstr "未知对象类型 %d"
Jiang Xin8ada9592012-05-21 09:35:47 +08008656
Jiang Xina0b6b242016-10-27 21:53:37 +08008657#: builtin/index-pack.c:574
Jiang Xin8ada9592012-05-21 09:35:47 +08008658msgid "cannot pread pack file"
Jiang Xin81809b92012-05-30 12:19:47 +08008659msgstr "无法读取包文件"
Jiang Xin8ada9592012-05-21 09:35:47 +08008660
Jiang Xina0b6b242016-10-27 21:53:37 +08008661#: builtin/index-pack.c:576
Jiang Xin8ada9592012-05-21 09:35:47 +08008662#, c-format
Jiang Xin5c57d762016-08-28 10:18:12 +08008663msgid "premature end of pack file, %<PRIuMAX> byte missing"
8664msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
8665msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8666msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
Jiang Xin8ada9592012-05-21 09:35:47 +08008667
Jiang Xina0b6b242016-10-27 21:53:37 +08008668#: builtin/index-pack.c:602
Jiang Xin8ada9592012-05-21 09:35:47 +08008669msgid "serious inflate inconsistency"
Jiang Xin81809b92012-05-30 12:19:47 +08008670msgstr "解压缩严重的不一致"
Jiang Xin8ada9592012-05-21 09:35:47 +08008671
Jiang Xina0b6b242016-10-27 21:53:37 +08008672#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008673#: builtin/index-pack.c:813 builtin/index-pack.c:822
Jiang Xin8ada9592012-05-21 09:35:47 +08008674#, c-format
8675msgid "SHA1 COLLISION FOUND WITH %s !"
Jiang Xin81809b92012-05-30 12:19:47 +08008676msgstr "发现 %s 出现 SHA1 冲突!"
Jiang Xin8ada9592012-05-21 09:35:47 +08008677
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008678#: builtin/index-pack.c:751 builtin/pack-objects.c:164
8679#: builtin/pack-objects.c:256
Jiang Xin6792b932012-07-04 17:20:34 +08008680#, c-format
8681msgid "unable to read %s"
8682msgstr "不能读 %s"
8683
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008684#: builtin/index-pack.c:819
Jiang Xin6792b932012-07-04 17:20:34 +08008685#, c-format
8686msgid "cannot read existing object %s"
8687msgstr "不能读取现存对象 %s"
8688
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008689#: builtin/index-pack.c:833
Jiang Xin81809b92012-05-30 12:19:47 +08008690#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08008691msgid "invalid blob object %s"
Jiang Xin160fb2b2015-08-02 21:47:30 +08008692msgstr "无效的数据对象 %s"
Jiang Xin8ada9592012-05-21 09:35:47 +08008693
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008694#: builtin/index-pack.c:847
Jiang Xin81809b92012-05-30 12:19:47 +08008695#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08008696msgid "invalid %s"
Jiang Xin81809b92012-05-30 12:19:47 +08008697msgstr "无效的 %s"
Jiang Xin8ada9592012-05-21 09:35:47 +08008698
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008699#: builtin/index-pack.c:850
Jiang Xin8ada9592012-05-21 09:35:47 +08008700msgid "Error in object"
Jiang Xin81809b92012-05-30 12:19:47 +08008701msgstr "对象中出错"
Jiang Xin8ada9592012-05-21 09:35:47 +08008702
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008703#: builtin/index-pack.c:852
Jiang Xin8ada9592012-05-21 09:35:47 +08008704#, c-format
8705msgid "Not all child objects of %s are reachable"
Jiang Xin81809b92012-05-30 12:19:47 +08008706msgstr "%s 的所有子对象并非都可达"
Jiang Xin8ada9592012-05-21 09:35:47 +08008707
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008708#: builtin/index-pack.c:924 builtin/index-pack.c:955
Jiang Xin8ada9592012-05-21 09:35:47 +08008709msgid "failed to apply delta"
Jiang Xin81809b92012-05-30 12:19:47 +08008710msgstr "无法应用 delta"
Jiang Xin8ada9592012-05-21 09:35:47 +08008711
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008712#: builtin/index-pack.c:1125
Jiang Xin8ada9592012-05-21 09:35:47 +08008713msgid "Receiving objects"
Jiang Xin81809b92012-05-30 12:19:47 +08008714msgstr "接收对象中"
Jiang Xin8ada9592012-05-21 09:35:47 +08008715
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008716#: builtin/index-pack.c:1125
Jiang Xin8ada9592012-05-21 09:35:47 +08008717msgid "Indexing objects"
Jiang Xin81809b92012-05-30 12:19:47 +08008718msgstr "索引对象中"
Jiang Xin8ada9592012-05-21 09:35:47 +08008719
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008720#: builtin/index-pack.c:1157
Jiang Xin8ada9592012-05-21 09:35:47 +08008721msgid "pack is corrupted (SHA1 mismatch)"
Jiang Xin81809b92012-05-30 12:19:47 +08008722msgstr "包冲突(SHA1 不匹配)"
Jiang Xin8ada9592012-05-21 09:35:47 +08008723
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008724#: builtin/index-pack.c:1162
Jiang Xin8ada9592012-05-21 09:35:47 +08008725msgid "cannot fstat packfile"
Jiang Xin81809b92012-05-30 12:19:47 +08008726msgstr "不能枚举包文件状态"
Jiang Xin8ada9592012-05-21 09:35:47 +08008727
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008728#: builtin/index-pack.c:1165
Jiang Xin8ada9592012-05-21 09:35:47 +08008729msgid "pack has junk at the end"
Jiang Xin81809b92012-05-30 12:19:47 +08008730msgstr "包的结尾有垃圾数据"
Jiang Xin8ada9592012-05-21 09:35:47 +08008731
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008732#: builtin/index-pack.c:1176
Jiang Xin6792b932012-07-04 17:20:34 +08008733msgid "confusion beyond insanity in parse_pack_objects()"
8734msgstr "parse_pack_objects() 中遇到不可理喻的问题"
8735
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008736#: builtin/index-pack.c:1199
Jiang Xin8ada9592012-05-21 09:35:47 +08008737msgid "Resolving deltas"
Jiang Xin81809b92012-05-30 12:19:47 +08008738msgstr "处理 delta 中"
Jiang Xin8ada9592012-05-21 09:35:47 +08008739
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008740#: builtin/index-pack.c:1210
Wang Sheng07432ce2013-01-30 17:23:08 +08008741#, c-format
Jiang Xinef317cd2012-09-15 11:17:00 +08008742msgid "unable to create thread: %s"
Wang Sheng07432ce2013-01-30 17:23:08 +08008743msgstr "不能创建线程:%s"
Jiang Xinef317cd2012-09-15 11:17:00 +08008744
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008745#: builtin/index-pack.c:1252
Jiang Xin8ada9592012-05-21 09:35:47 +08008746msgid "confusion beyond insanity"
Jiang Xin81809b92012-05-30 12:19:47 +08008747msgstr "不可理喻"
Jiang Xin8ada9592012-05-21 09:35:47 +08008748
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008749#: builtin/index-pack.c:1258
Jiang Xinef317cd2012-09-15 11:17:00 +08008750#, c-format
Jiang Xin5b04ee32016-05-29 20:40:35 +08008751msgid "completed with %d local object"
8752msgid_plural "completed with %d local objects"
8753msgstr[0] "完成 %d 个本地对象"
8754msgstr[1] "完成 %d 个本地对象"
Jiang Xinef317cd2012-09-15 11:17:00 +08008755
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008756#: builtin/index-pack.c:1270
Jiang Xinef317cd2012-09-15 11:17:00 +08008757#, c-format
8758msgid "Unexpected tail checksum for %s (disk corruption?)"
Wang Sheng07432ce2013-01-30 17:23:08 +08008759msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
Jiang Xinef317cd2012-09-15 11:17:00 +08008760
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008761#: builtin/index-pack.c:1274
Jiang Xin8ada9592012-05-21 09:35:47 +08008762#, c-format
8763msgid "pack has %d unresolved delta"
8764msgid_plural "pack has %d unresolved deltas"
Jiang Xin81809b92012-05-30 12:19:47 +08008765msgstr[0] "包有 %d 个未解决的 delta"
Jiang Xin5ae481e2012-05-31 17:35:59 +08008766msgstr[1] "包有 %d 个未解决的 delta"
Jiang Xin8ada9592012-05-21 09:35:47 +08008767
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008768#: builtin/index-pack.c:1298
Jiang Xin81809b92012-05-30 12:19:47 +08008769#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08008770msgid "unable to deflate appended object (%d)"
Wang Sheng07432ce2013-01-30 17:23:08 +08008771msgstr "不能压缩附加对象(%d)"
Jiang Xin8ada9592012-05-21 09:35:47 +08008772
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008773#: builtin/index-pack.c:1374
Jiang Xin8ada9592012-05-21 09:35:47 +08008774#, c-format
8775msgid "local object %s is corrupt"
Jiang Xin81809b92012-05-30 12:19:47 +08008776msgstr "本地对象 %s 已损坏"
Jiang Xin8ada9592012-05-21 09:35:47 +08008777
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008778#: builtin/index-pack.c:1398
Jiang Xin8ada9592012-05-21 09:35:47 +08008779msgid "error while closing pack file"
Jiang Xin81809b92012-05-30 12:19:47 +08008780msgstr "关闭包文件时出错"
Jiang Xin8ada9592012-05-21 09:35:47 +08008781
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008782#: builtin/index-pack.c:1411
Jiang Xin81809b92012-05-30 12:19:47 +08008783#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08008784msgid "cannot write keep file '%s'"
Jiang Xin81809b92012-05-30 12:19:47 +08008785msgstr "无法写保留文件 '%s'"
Jiang Xin8ada9592012-05-21 09:35:47 +08008786
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008787#: builtin/index-pack.c:1419
Jiang Xin81809b92012-05-30 12:19:47 +08008788#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08008789msgid "cannot close written keep file '%s'"
Jiang Xin81809b92012-05-30 12:19:47 +08008790msgstr "无法关闭保留文件 '%s'"
Jiang Xin8ada9592012-05-21 09:35:47 +08008791
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008792#: builtin/index-pack.c:1432
Jiang Xin8ada9592012-05-21 09:35:47 +08008793msgid "cannot store pack file"
Jiang Xin81809b92012-05-30 12:19:47 +08008794msgstr "无法存储包文件"
Jiang Xin8ada9592012-05-21 09:35:47 +08008795
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008796#: builtin/index-pack.c:1443
Jiang Xin8ada9592012-05-21 09:35:47 +08008797msgid "cannot store index file"
Jiang Xin81809b92012-05-30 12:19:47 +08008798msgstr "无法存储索引文件"
Jiang Xin8ada9592012-05-21 09:35:47 +08008799
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008800#: builtin/index-pack.c:1476
Wang Sheng07432ce2013-01-30 17:23:08 +08008801#, c-format
Jiang Xinef317cd2012-09-15 11:17:00 +08008802msgid "bad pack.indexversion=%<PRIu32>"
Wang Sheng07432ce2013-01-30 17:23:08 +08008803msgstr "坏的 pack.indexversion=%<PRIu32>"
Jiang Xinef317cd2012-09-15 11:17:00 +08008804
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008805#: builtin/index-pack.c:1486 builtin/index-pack.c:1683
Jiang Xinef317cd2012-09-15 11:17:00 +08008806#, c-format
8807msgid "no threads support, ignoring %s"
Wang Sheng07432ce2013-01-30 17:23:08 +08008808msgstr "没有线程支持,忽略 %s"
Jiang Xinef317cd2012-09-15 11:17:00 +08008809
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008810#: builtin/index-pack.c:1544
Jiang Xin81809b92012-05-30 12:19:47 +08008811#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08008812msgid "Cannot open existing pack file '%s'"
Jiang Xin81809b92012-05-30 12:19:47 +08008813msgstr "无法打开现存包文件 '%s'"
Jiang Xin8ada9592012-05-21 09:35:47 +08008814
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008815#: builtin/index-pack.c:1546
Jiang Xin81809b92012-05-30 12:19:47 +08008816#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08008817msgid "Cannot open existing pack idx file for '%s'"
Jiang Xin81809b92012-05-30 12:19:47 +08008818msgstr "无法为 %s 打开包索引文件"
Jiang Xin8ada9592012-05-21 09:35:47 +08008819
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008820#: builtin/index-pack.c:1593
Jiang Xin81809b92012-05-30 12:19:47 +08008821#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +08008822msgid "non delta: %d object"
8823msgid_plural "non delta: %d objects"
Jiang Xin81809b92012-05-30 12:19:47 +08008824msgstr[0] "非 delta:%d 个对象"
Jiang Xin5ae481e2012-05-31 17:35:59 +08008825msgstr[1] "非 delta:%d 个对象"
Jiang Xin8ada9592012-05-21 09:35:47 +08008826
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008827#: builtin/index-pack.c:1600
Jiang Xin8ada9592012-05-21 09:35:47 +08008828#, c-format
8829msgid "chain length = %d: %lu object"
8830msgid_plural "chain length = %d: %lu objects"
Jiang Xin81809b92012-05-30 12:19:47 +08008831msgstr[0] "链长 = %d: %lu 对象"
Jiang Xin5ae481e2012-05-31 17:35:59 +08008832msgstr[1] "链长 = %d: %lu 对象"
Jiang Xin8ada9592012-05-21 09:35:47 +08008833
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008834#: builtin/index-pack.c:1613
Jiang Xin8ada9592012-05-21 09:35:47 +08008835#, c-format
8836msgid "packfile name '%s' does not end with '.pack'"
Ray Chendbd6cce2015-07-28 13:26:41 +08008837msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
Jiang Xin8ada9592012-05-21 09:35:47 +08008838
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008839#: builtin/index-pack.c:1695 builtin/index-pack.c:1698
8840#: builtin/index-pack.c:1714 builtin/index-pack.c:1718
Jiang Xin5b04ee32016-05-29 20:40:35 +08008841#, c-format
8842msgid "bad %s"
8843msgstr "错误选项 %s"
8844
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008845#: builtin/index-pack.c:1734
Jiang Xin5b04ee32016-05-29 20:40:35 +08008846msgid "--fix-thin cannot be used without --stdin"
8847msgstr "--fix-thin 不能和 --stdin 同时使用"
8848
Jiang Xin1a79b2f2017-01-27 22:50:57 +08008849#: builtin/index-pack.c:1736
8850msgid "--stdin requires a git repository"
8851msgstr "--stdin 需要一个 git 仓库"
8852
8853#: builtin/index-pack.c:1744
Jiang Xin8ada9592012-05-21 09:35:47 +08008854msgid "--verify with no packfile name given"
Ray Chendbd6cce2015-07-28 13:26:41 +08008855msgstr "--verify 没有提供包文件名参数"
Jiang Xin8ada9592012-05-21 09:35:47 +08008856
Jiang Xina0b6b242016-10-27 21:53:37 +08008857#: builtin/init-db.c:54
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008858#, c-format
8859msgid "cannot stat '%s'"
8860msgstr "不能枚举 '%s' 状态"
8861
Jiang Xina0b6b242016-10-27 21:53:37 +08008862#: builtin/init-db.c:60
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008863#, c-format
8864msgid "cannot stat template '%s'"
8865msgstr "不能枚举模版 '%s' 状态"
8866
Jiang Xina0b6b242016-10-27 21:53:37 +08008867#: builtin/init-db.c:65
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008868#, c-format
8869msgid "cannot opendir '%s'"
8870msgstr "不能打开目录 '%s'"
8871
Jiang Xina0b6b242016-10-27 21:53:37 +08008872#: builtin/init-db.c:76
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008873#, c-format
8874msgid "cannot readlink '%s'"
8875msgstr "不能读取链接 '%s'"
8876
Jiang Xina0b6b242016-10-27 21:53:37 +08008877#: builtin/init-db.c:78
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008878#, c-format
8879msgid "cannot symlink '%s' '%s'"
Jiang Xin90e6ef52012-03-27 14:46:11 +08008880msgstr "不能自 '%s' 到 '%s' 创建符号链接"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008881
Jiang Xina0b6b242016-10-27 21:53:37 +08008882#: builtin/init-db.c:84
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008883#, c-format
8884msgid "cannot copy '%s' to '%s'"
8885msgstr "不能拷贝 '%s' 至 '%s'"
8886
Jiang Xina0b6b242016-10-27 21:53:37 +08008887#: builtin/init-db.c:88
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008888#, c-format
8889msgid "ignoring template %s"
8890msgstr "忽略模版 %s"
8891
Jiang Xina0b6b242016-10-27 21:53:37 +08008892#: builtin/init-db.c:119
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008893#, c-format
8894msgid "templates not found %s"
8895msgstr "模版未找到 %s"
8896
Jiang Xina0b6b242016-10-27 21:53:37 +08008897#: builtin/init-db.c:134
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008898#, c-format
Jiang Xin5b04ee32016-05-29 20:40:35 +08008899msgid "not copying templates from '%s': %s"
8900msgstr "没有从 '%s' 复制模版:%s"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008901
Jiang Xina0b6b242016-10-27 21:53:37 +08008902#: builtin/init-db.c:327
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008903#, c-format
8904msgid "unable to handle file type %d"
8905msgstr "不能处理 %d 类型的文件"
8906
Jiang Xina0b6b242016-10-27 21:53:37 +08008907#: builtin/init-db.c:330
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008908#, c-format
8909msgid "unable to move %s to %s"
8910msgstr "不能移动 %s 至 %s"
8911
Jiang Xina0b6b242016-10-27 21:53:37 +08008912#: builtin/init-db.c:347 builtin/init-db.c:350
8913#, c-format
8914msgid "%s already exists"
8915msgstr "%s 已经存在"
8916
8917#: builtin/init-db.c:403
Jiang Xin5c57d762016-08-28 10:18:12 +08008918#, c-format
8919msgid "Reinitialized existing shared Git repository in %s%s\n"
8920msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
8921
Jiang Xina0b6b242016-10-27 21:53:37 +08008922#: builtin/init-db.c:404
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008923#, c-format
Jiang Xin5c57d762016-08-28 10:18:12 +08008924msgid "Reinitialized existing Git repository in %s%s\n"
8925msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008926
Jiang Xina0b6b242016-10-27 21:53:37 +08008927#: builtin/init-db.c:408
Jiang Xin5c57d762016-08-28 10:18:12 +08008928#, c-format
8929msgid "Initialized empty shared Git repository in %s%s\n"
Ray Chen9a4b6942016-09-07 18:03:04 +08008930msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008931
Jiang Xina0b6b242016-10-27 21:53:37 +08008932#: builtin/init-db.c:409
Jiang Xin5c57d762016-08-28 10:18:12 +08008933#, c-format
8934msgid "Initialized empty Git repository in %s%s\n"
Ray Chen9a4b6942016-09-07 18:03:04 +08008935msgstr "已初始化空的 Git 仓库于 %s%s\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008936
Jiang Xina0b6b242016-10-27 21:53:37 +08008937#: builtin/init-db.c:457
Jiang Xinef317cd2012-09-15 11:17:00 +08008938msgid ""
Jiang Xina77c07d2013-02-14 17:47:45 +08008939"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
Jiang Xin814ff312015-02-16 21:34:19 +08008940"shared[=<permissions>]] [<directory>]"
Jiang Xinef317cd2012-09-15 11:17:00 +08008941msgstr ""
Wang Sheng07432ce2013-01-30 17:23:08 +08008942"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
Jiang Xin814ff312015-02-16 21:34:19 +08008943"[<目录>]"
Jiang Xinef317cd2012-09-15 11:17:00 +08008944
Jiang Xina0b6b242016-10-27 21:53:37 +08008945#: builtin/init-db.c:480
Jiang Xinef317cd2012-09-15 11:17:00 +08008946msgid "permissions"
Wang Sheng07432ce2013-01-30 17:23:08 +08008947msgstr "权限"
Jiang Xinef317cd2012-09-15 11:17:00 +08008948
Jiang Xina0b6b242016-10-27 21:53:37 +08008949#: builtin/init-db.c:481
Jiang Xinef317cd2012-09-15 11:17:00 +08008950msgid "specify that the git repository is to be shared amongst several users"
Jiang Xin160fb2b2015-08-02 21:47:30 +08008951msgstr "指定 git 仓库是多个用户之间共享的"
Jiang Xinef317cd2012-09-15 11:17:00 +08008952
Jiang Xina0b6b242016-10-27 21:53:37 +08008953#: builtin/init-db.c:515 builtin/init-db.c:520
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008954#, c-format
8955msgid "cannot mkdir %s"
8956msgstr "不能创建目录 %s"
8957
Jiang Xina0b6b242016-10-27 21:53:37 +08008958#: builtin/init-db.c:524
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008959#, c-format
8960msgid "cannot chdir to %s"
8961msgstr "不能切换目录到 %s"
8962
Jiang Xina0b6b242016-10-27 21:53:37 +08008963#: builtin/init-db.c:545
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008964#, c-format
8965msgid ""
8966"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
8967"dir=<directory>)"
Jiang Xin1e607442015-01-21 15:05:03 +08008968msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008969
Jiang Xina0b6b242016-10-27 21:53:37 +08008970#: builtin/init-db.c:573
Jiang Xinc04f5ac2012-02-13 14:41:59 +08008971#, c-format
8972msgid "Cannot access work tree '%s'"
8973msgstr "不能访问工作区 '%s'"
8974
Jiang Xin220c3132014-10-08 10:55:14 +08008975#: builtin/interpret-trailers.c:15
8976msgid ""
Jiang Xin276ceea2016-02-28 20:35:55 +08008977"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
8978"<token>[(=|:)<value>])...] [<file>...]"
Jiang Xin34956282016-03-12 22:09:24 +08008979msgstr ""
8980"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
8981">])...] [<文件>...]"
Jiang Xin220c3132014-10-08 10:55:14 +08008982
Jiang Xin276ceea2016-02-28 20:35:55 +08008983#: builtin/interpret-trailers.c:26
8984msgid "edit files in place"
8985msgstr "在原位编辑文件"
8986
8987#: builtin/interpret-trailers.c:27
Jiang Xin220c3132014-10-08 10:55:14 +08008988msgid "trim empty trailers"
8989msgstr "删除空签名"
8990
Jiang Xin276ceea2016-02-28 20:35:55 +08008991#: builtin/interpret-trailers.c:28
Jiang Xin220c3132014-10-08 10:55:14 +08008992msgid "trailer"
8993msgstr "签名"
8994
Jiang Xin276ceea2016-02-28 20:35:55 +08008995#: builtin/interpret-trailers.c:29
Jiang Xin220c3132014-10-08 10:55:14 +08008996msgid "trailer(s) to add"
8997msgstr "要添加的签名"
8998
Jiang Xin276ceea2016-02-28 20:35:55 +08008999#: builtin/interpret-trailers.c:42
9000msgid "no input file given for in-place editing"
9001msgstr "没有给出要原位编辑的文件"
9002
Jiang Xin5c57d762016-08-28 10:18:12 +08009003#: builtin/log.c:44
Jiang Xin7aea43f2015-05-31 08:42:31 +08009004msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
Jiang Xind9d56b22015-01-18 20:37:57 +08009005msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +08009006
Jiang Xin5c57d762016-08-28 10:18:12 +08009007#: builtin/log.c:45
Jiang Xin814ff312015-02-16 21:34:19 +08009008msgid "git show [<options>] <object>..."
9009msgstr "git show [<选项>] <对象>..."
Jiang Xinef317cd2012-09-15 11:17:00 +08009010
Jiang Xin5c57d762016-08-28 10:18:12 +08009011#: builtin/log.c:84
Jiang Xin220c3132014-10-08 10:55:14 +08009012#, c-format
9013msgid "invalid --decorate option: %s"
9014msgstr "无效的 --decorate 选项:%s"
9015
Jiang Xin5c57d762016-08-28 10:18:12 +08009016#: builtin/log.c:139
Wang Sheng07432ce2013-01-30 17:23:08 +08009017msgid "suppress diff output"
9018msgstr "不显示差异输出"
Jiang Xinef317cd2012-09-15 11:17:00 +08009019
Jiang Xin5c57d762016-08-28 10:18:12 +08009020#: builtin/log.c:140
Wang Sheng07432ce2013-01-30 17:23:08 +08009021msgid "show source"
9022msgstr "显示源"
9023
Jiang Xin5c57d762016-08-28 10:18:12 +08009024#: builtin/log.c:141
Wang Sheng07432ce2013-01-30 17:23:08 +08009025msgid "Use mail map file"
9026msgstr "使用邮件映射文件"
9027
Jiang Xin5c57d762016-08-28 10:18:12 +08009028#: builtin/log.c:142
Wang Sheng07432ce2013-01-30 17:23:08 +08009029msgid "decorate options"
9030msgstr "修饰选项"
9031
Jiang Xin5c57d762016-08-28 10:18:12 +08009032#: builtin/log.c:145
Jiang Xin220c3132014-10-08 10:55:14 +08009033msgid "Process line range n,m in file, counting from 1"
9034msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
9035
Jiang Xin5c57d762016-08-28 10:18:12 +08009036#: builtin/log.c:241
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009037#, c-format
9038msgid "Final output: %d %s\n"
9039msgstr "最终输出:%d %s\n"
9040
Jiang Xin5c57d762016-08-28 10:18:12 +08009041#: builtin/log.c:486
Jiang Xin220c3132014-10-08 10:55:14 +08009042#, c-format
9043msgid "git show %s: bad file"
9044msgstr "git show %s: 损坏的文件"
9045
Jiang Xin5c57d762016-08-28 10:18:12 +08009046#: builtin/log.c:500 builtin/log.c:594
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009047#, c-format
9048msgid "Could not read object %s"
Jiang Xin90e6ef52012-03-27 14:46:11 +08009049msgstr "不能读取对象 %s"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009050
Jiang Xin5c57d762016-08-28 10:18:12 +08009051#: builtin/log.c:618
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009052#, c-format
9053msgid "Unknown type: %d"
9054msgstr "未知类型:%d"
9055
Jiang Xin5c57d762016-08-28 10:18:12 +08009056#: builtin/log.c:739
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009057msgid "format.headers without value"
9058msgstr "format.headers 没有值"
9059
Jiang Xin5c57d762016-08-28 10:18:12 +08009060#: builtin/log.c:839
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009061msgid "name of output directory is too long"
9062msgstr "输出目录名太长"
9063
Jiang Xin5c57d762016-08-28 10:18:12 +08009064#: builtin/log.c:854
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009065#, c-format
9066msgid "Cannot open patch file %s"
9067msgstr "无法打开补丁文件 %s"
9068
Jiang Xin5c57d762016-08-28 10:18:12 +08009069#: builtin/log.c:868
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009070msgid "Need exactly one range."
9071msgstr "只需要一个范围。"
9072
Jiang Xin5c57d762016-08-28 10:18:12 +08009073#: builtin/log.c:878
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009074msgid "Not a range."
9075msgstr "不是一个范围。"
9076
Jiang Xin5c57d762016-08-28 10:18:12 +08009077#: builtin/log.c:984
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009078msgid "Cover letter needs email format"
9079msgstr "信封需要邮件地址格式"
9080
Jiang Xina0b6b242016-10-27 21:53:37 +08009081#: builtin/log.c:1063
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009082#, c-format
9083msgid "insane in-reply-to: %s"
9084msgstr "不正常的 in-reply-to:%s"
9085
Jiang Xina0b6b242016-10-27 21:53:37 +08009086#: builtin/log.c:1091
Jiang Xin814ff312015-02-16 21:34:19 +08009087msgid "git format-patch [<options>] [<since> | <revision-range>]"
9088msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
Jiang Xinef317cd2012-09-15 11:17:00 +08009089
Jiang Xina0b6b242016-10-27 21:53:37 +08009090#: builtin/log.c:1141
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009091msgid "Two output directories?"
9092msgstr "两个输出目录?"
9093
Jiang Xina0b6b242016-10-27 21:53:37 +08009094#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
Jiang Xin5b04ee32016-05-29 20:40:35 +08009095#, c-format
9096msgid "Unknown commit %s"
9097msgstr "未知提交 %s"
9098
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009099#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476
Jiang Xin5b04ee32016-05-29 20:40:35 +08009100#, c-format
9101msgid "Failed to resolve '%s' as a valid ref."
9102msgstr "无法解析 '%s' 为一个有效引用。"
9103
Jiang Xina0b6b242016-10-27 21:53:37 +08009104#: builtin/log.c:1263
Jiang Xin5b04ee32016-05-29 20:40:35 +08009105msgid "Could not find exact merge base."
9106msgstr "不能找到准确的合并基线。"
9107
Jiang Xina0b6b242016-10-27 21:53:37 +08009108#: builtin/log.c:1267
Jiang Xin5b04ee32016-05-29 20:40:35 +08009109msgid ""
9110"Failed to get upstream, if you want to record base commit automatically,\n"
9111"please use git branch --set-upstream-to to track a remote branch.\n"
9112"Or you could specify base commit by --base=<base-commit-id> manually."
9113msgstr ""
9114"无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
Ray Chenaef18cc2016-06-06 00:06:17 +08009115"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
Jiang Xin5b04ee32016-05-29 20:40:35 +08009116"参数 --base=<base-commit-id> 手动指定一个基线提交。"
9117
Jiang Xina0b6b242016-10-27 21:53:37 +08009118#: builtin/log.c:1287
Jiang Xin5b04ee32016-05-29 20:40:35 +08009119msgid "Failed to find exact merge base"
9120msgstr "无法找到准确的合并基线"
9121
Jiang Xina0b6b242016-10-27 21:53:37 +08009122#: builtin/log.c:1298
Jiang Xin5b04ee32016-05-29 20:40:35 +08009123msgid "base commit should be the ancestor of revision list"
9124msgstr "基线提交应该是版本列表的祖先"
9125
Jiang Xina0b6b242016-10-27 21:53:37 +08009126#: builtin/log.c:1302
Jiang Xin5b04ee32016-05-29 20:40:35 +08009127msgid "base commit shouldn't be in revision list"
9128msgstr "基线提交不应该出现在版本列表中"
9129
Jiang Xina0b6b242016-10-27 21:53:37 +08009130#: builtin/log.c:1351
Jiang Xin5b04ee32016-05-29 20:40:35 +08009131msgid "cannot get patch id"
Ray Chenaef18cc2016-06-06 00:06:17 +08009132msgstr "无法得到补丁 id"
Jiang Xin5b04ee32016-05-29 20:40:35 +08009133
Jiang Xina0b6b242016-10-27 21:53:37 +08009134#: builtin/log.c:1408
Wang Sheng07432ce2013-01-30 17:23:08 +08009135msgid "use [PATCH n/m] even with a single patch"
9136msgstr "使用 [PATCH n/m],即使只有一个补丁"
Jiang Xinef317cd2012-09-15 11:17:00 +08009137
Jiang Xina0b6b242016-10-27 21:53:37 +08009138#: builtin/log.c:1411
Wang Sheng07432ce2013-01-30 17:23:08 +08009139msgid "use [PATCH] even with multiple patches"
9140msgstr "使用 [PATCH],即使有多个补丁"
Jiang Xinef317cd2012-09-15 11:17:00 +08009141
Jiang Xina0b6b242016-10-27 21:53:37 +08009142#: builtin/log.c:1415
Wang Sheng07432ce2013-01-30 17:23:08 +08009143msgid "print patches to standard out"
9144msgstr "打印补丁到标准输出"
Jiang Xinef317cd2012-09-15 11:17:00 +08009145
Jiang Xina0b6b242016-10-27 21:53:37 +08009146#: builtin/log.c:1417
Wang Sheng07432ce2013-01-30 17:23:08 +08009147msgid "generate a cover letter"
9148msgstr "生成一封附信"
Jiang Xinef317cd2012-09-15 11:17:00 +08009149
Jiang Xina0b6b242016-10-27 21:53:37 +08009150#: builtin/log.c:1419
Wang Sheng07432ce2013-01-30 17:23:08 +08009151msgid "use simple number sequence for output file names"
9152msgstr "使用简单的数字序列作为输出文件名"
9153
Jiang Xina0b6b242016-10-27 21:53:37 +08009154#: builtin/log.c:1420
Wang Sheng07432ce2013-01-30 17:23:08 +08009155msgid "sfx"
9156msgstr "后缀"
9157
Jiang Xina0b6b242016-10-27 21:53:37 +08009158#: builtin/log.c:1421
Wang Sheng07432ce2013-01-30 17:23:08 +08009159msgid "use <sfx> instead of '.patch'"
9160msgstr "使用 <后缀> 代替 '.patch'"
Jiang Xinef317cd2012-09-15 11:17:00 +08009161
Jiang Xina0b6b242016-10-27 21:53:37 +08009162#: builtin/log.c:1423
Wang Sheng07432ce2013-01-30 17:23:08 +08009163msgid "start numbering patches at <n> instead of 1"
9164msgstr "补丁以 <n> 开始编号,而不是1"
Jiang Xinef317cd2012-09-15 11:17:00 +08009165
Jiang Xina0b6b242016-10-27 21:53:37 +08009166#: builtin/log.c:1425
Wang Sheng07432ce2013-01-30 17:23:08 +08009167msgid "mark the series as Nth re-roll"
9168msgstr "标记补丁系列是第几次重制"
9169
Jiang Xina0b6b242016-10-27 21:53:37 +08009170#: builtin/log.c:1427
9171msgid "Use [RFC PATCH] instead of [PATCH]"
9172msgstr "使用 [RFC PATCH] 代替 [PATCH]"
9173
9174#: builtin/log.c:1430
Wang Sheng07432ce2013-01-30 17:23:08 +08009175msgid "Use [<prefix>] instead of [PATCH]"
9176msgstr "使用 [<前缀>] 代替 [PATCH]"
9177
Jiang Xina0b6b242016-10-27 21:53:37 +08009178#: builtin/log.c:1433
Wang Sheng07432ce2013-01-30 17:23:08 +08009179msgid "store resulting files in <dir>"
Jiang Xind9d56b22015-01-18 20:37:57 +08009180msgstr "把结果文件存储在 <目录>"
Wang Sheng07432ce2013-01-30 17:23:08 +08009181
Jiang Xina0b6b242016-10-27 21:53:37 +08009182#: builtin/log.c:1436
Wang Sheng07432ce2013-01-30 17:23:08 +08009183msgid "don't strip/add [PATCH]"
9184msgstr "不删除/添加 [PATCH]"
9185
Jiang Xina0b6b242016-10-27 21:53:37 +08009186#: builtin/log.c:1439
Wang Sheng07432ce2013-01-30 17:23:08 +08009187msgid "don't output binary diffs"
9188msgstr "不输出二进制差异"
9189
Jiang Xina0b6b242016-10-27 21:53:37 +08009190#: builtin/log.c:1441
Jiang Xin89f80d72015-12-22 23:06:59 +08009191msgid "output all-zero hash in From header"
9192msgstr "在 From 头信息中输出全为零的哈希值"
9193
Jiang Xina0b6b242016-10-27 21:53:37 +08009194#: builtin/log.c:1443
Wang Sheng07432ce2013-01-30 17:23:08 +08009195msgid "don't include a patch matching a commit upstream"
9196msgstr "不包含已在上游提交中的补丁"
9197
Jiang Xina0b6b242016-10-27 21:53:37 +08009198#: builtin/log.c:1445
Wang Sheng07432ce2013-01-30 17:23:08 +08009199msgid "show patch format instead of default (patch + stat)"
9200msgstr "显示纯补丁格式而非默认的(补丁+状态)"
9201
Jiang Xina0b6b242016-10-27 21:53:37 +08009202#: builtin/log.c:1447
Wang Sheng07432ce2013-01-30 17:23:08 +08009203msgid "Messaging"
9204msgstr "邮件发送"
9205
Jiang Xina0b6b242016-10-27 21:53:37 +08009206#: builtin/log.c:1448
Wang Sheng07432ce2013-01-30 17:23:08 +08009207msgid "header"
9208msgstr "header"
9209
Jiang Xina0b6b242016-10-27 21:53:37 +08009210#: builtin/log.c:1449
Wang Sheng07432ce2013-01-30 17:23:08 +08009211msgid "add email header"
9212msgstr "添加邮件头"
9213
Jiang Xina0b6b242016-10-27 21:53:37 +08009214#: builtin/log.c:1450 builtin/log.c:1452
Wang Sheng07432ce2013-01-30 17:23:08 +08009215msgid "email"
9216msgstr "邮件地址"
9217
Jiang Xina0b6b242016-10-27 21:53:37 +08009218#: builtin/log.c:1450
Wang Sheng07432ce2013-01-30 17:23:08 +08009219msgid "add To: header"
9220msgstr "添加收件人"
9221
Jiang Xina0b6b242016-10-27 21:53:37 +08009222#: builtin/log.c:1452
Wang Sheng07432ce2013-01-30 17:23:08 +08009223msgid "add Cc: header"
9224msgstr "添加抄送"
9225
Jiang Xina0b6b242016-10-27 21:53:37 +08009226#: builtin/log.c:1454
Jiang Xin2e8451e2013-07-26 14:00:02 +08009227msgid "ident"
Jiang Xind9d56b22015-01-18 20:37:57 +08009228msgstr "标识"
Jiang Xin2e8451e2013-07-26 14:00:02 +08009229
Jiang Xina0b6b242016-10-27 21:53:37 +08009230#: builtin/log.c:1455
Jiang Xin2e8451e2013-07-26 14:00:02 +08009231msgid "set From address to <ident> (or committer ident if absent)"
Ray Chen4375c102015-08-10 18:03:29 +08009232msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
Jiang Xin2e8451e2013-07-26 14:00:02 +08009233
Jiang Xina0b6b242016-10-27 21:53:37 +08009234#: builtin/log.c:1457
Wang Sheng07432ce2013-01-30 17:23:08 +08009235msgid "message-id"
Jiang Xind9d56b22015-01-18 20:37:57 +08009236msgstr "邮件标识"
Wang Sheng07432ce2013-01-30 17:23:08 +08009237
Jiang Xina0b6b242016-10-27 21:53:37 +08009238#: builtin/log.c:1458
Wang Sheng07432ce2013-01-30 17:23:08 +08009239msgid "make first mail a reply to <message-id>"
Jiang Xind9d56b22015-01-18 20:37:57 +08009240msgstr "使第一封邮件作为对 <邮件标识> 的回复"
Wang Sheng07432ce2013-01-30 17:23:08 +08009241
Jiang Xina0b6b242016-10-27 21:53:37 +08009242#: builtin/log.c:1459 builtin/log.c:1462
Wang Sheng07432ce2013-01-30 17:23:08 +08009243msgid "boundary"
9244msgstr "边界"
9245
Jiang Xina0b6b242016-10-27 21:53:37 +08009246#: builtin/log.c:1460
Wang Sheng07432ce2013-01-30 17:23:08 +08009247msgid "attach the patch"
9248msgstr "附件方式添加补丁"
9249
Jiang Xina0b6b242016-10-27 21:53:37 +08009250#: builtin/log.c:1463
Wang Sheng07432ce2013-01-30 17:23:08 +08009251msgid "inline the patch"
9252msgstr "内联显示补丁"
9253
Jiang Xina0b6b242016-10-27 21:53:37 +08009254#: builtin/log.c:1467
Wang Sheng07432ce2013-01-30 17:23:08 +08009255msgid "enable message threading, styles: shallow, deep"
9256msgstr "启用邮件线索,风格:浅,深"
9257
Jiang Xina0b6b242016-10-27 21:53:37 +08009258#: builtin/log.c:1469
Jiang Xinef317cd2012-09-15 11:17:00 +08009259msgid "signature"
Wang Sheng07432ce2013-01-30 17:23:08 +08009260msgstr "签名"
Jiang Xinef317cd2012-09-15 11:17:00 +08009261
Jiang Xina0b6b242016-10-27 21:53:37 +08009262#: builtin/log.c:1470
Jiang Xinef317cd2012-09-15 11:17:00 +08009263msgid "add a signature"
Wang Sheng07432ce2013-01-30 17:23:08 +08009264msgstr "添加一个签名"
Jiang Xinef317cd2012-09-15 11:17:00 +08009265
Jiang Xina0b6b242016-10-27 21:53:37 +08009266#: builtin/log.c:1471
Jiang Xin5b04ee32016-05-29 20:40:35 +08009267msgid "base-commit"
9268msgstr "基线提交"
9269
Jiang Xina0b6b242016-10-27 21:53:37 +08009270#: builtin/log.c:1472
Jiang Xin5b04ee32016-05-29 20:40:35 +08009271msgid "add prerequisite tree info to the patch series"
9272msgstr "为补丁列表添加前置树信息"
9273
Jiang Xina0b6b242016-10-27 21:53:37 +08009274#: builtin/log.c:1474
Jiang Xin6acbf032014-08-04 16:23:15 +08009275msgid "add a signature from a file"
9276msgstr "从文件添加一个签名"
9277
Jiang Xina0b6b242016-10-27 21:53:37 +08009278#: builtin/log.c:1475
Jiang Xinef317cd2012-09-15 11:17:00 +08009279msgid "don't print the patch filenames"
Wang Sheng07432ce2013-01-30 17:23:08 +08009280msgstr "不要打印补丁文件名"
Jiang Xinef317cd2012-09-15 11:17:00 +08009281
Jiang Xina0b6b242016-10-27 21:53:37 +08009282#: builtin/log.c:1565
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009283msgid "-n and -k are mutually exclusive."
9284msgstr "-n 和 -k 互斥。"
9285
Jiang Xina0b6b242016-10-27 21:53:37 +08009286#: builtin/log.c:1567
9287msgid "--subject-prefix/--rfc and -k are mutually exclusive."
9288msgstr "--subject-prefix/--rfc 和 -k 互斥。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009289
Jiang Xina0b6b242016-10-27 21:53:37 +08009290#: builtin/log.c:1575
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009291msgid "--name-only does not make sense"
9292msgstr "--name-only 无意义"
9293
Jiang Xina0b6b242016-10-27 21:53:37 +08009294#: builtin/log.c:1577
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009295msgid "--name-status does not make sense"
9296msgstr "--name-status 无意义"
9297
Jiang Xina0b6b242016-10-27 21:53:37 +08009298#: builtin/log.c:1579
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009299msgid "--check does not make sense"
9300msgstr "--check 无意义"
9301
Jiang Xina0b6b242016-10-27 21:53:37 +08009302#: builtin/log.c:1609
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009303msgid "standard output, or directory, which one?"
9304msgstr "标准输出或目录,哪一个?"
9305
Jiang Xina0b6b242016-10-27 21:53:37 +08009306#: builtin/log.c:1611
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009307#, c-format
9308msgid "Could not create directory '%s'"
Jiang Xin90e6ef52012-03-27 14:46:11 +08009309msgstr "不能创建目录 '%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009310
Jiang Xina0b6b242016-10-27 21:53:37 +08009311#: builtin/log.c:1705
Jiang Xin6acbf032014-08-04 16:23:15 +08009312#, c-format
9313msgid "unable to read signature file '%s'"
9314msgstr "无法读取签名文件 '%s'"
9315
Jiang Xina0b6b242016-10-27 21:53:37 +08009316#: builtin/log.c:1777
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009317msgid "Failed to create output files"
9318msgstr "无法创建输出文件"
9319
Jiang Xina0b6b242016-10-27 21:53:37 +08009320#: builtin/log.c:1826
Jiang Xinef317cd2012-09-15 11:17:00 +08009321msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
Wang Sheng07432ce2013-01-30 17:23:08 +08009322msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
Jiang Xinef317cd2012-09-15 11:17:00 +08009323
Jiang Xina0b6b242016-10-27 21:53:37 +08009324#: builtin/log.c:1880
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009325#, c-format
9326msgid ""
9327"Could not find a tracked remote branch, please specify <upstream> manually.\n"
Jiang Xind9d56b22015-01-18 20:37:57 +08009328msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009329
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009330#: builtin/ls-files.c:460
Jiang Xin814ff312015-02-16 21:34:19 +08009331msgid "git ls-files [<options>] [<file>...]"
9332msgstr "git ls-files [<选项>] [<文件>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +08009333
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009334#: builtin/ls-files.c:509
Jiang Xinef317cd2012-09-15 11:17:00 +08009335msgid "identify the file status with tags"
Wang Sheng07432ce2013-01-30 17:23:08 +08009336msgstr "用标签标识文件的状态"
Jiang Xinef317cd2012-09-15 11:17:00 +08009337
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009338#: builtin/ls-files.c:511
Jiang Xinef317cd2012-09-15 11:17:00 +08009339msgid "use lowercase letters for 'assume unchanged' files"
Wang Sheng07432ce2013-01-30 17:23:08 +08009340msgstr "使用小写字母表示 '假设未改变的' 文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08009341
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009342#: builtin/ls-files.c:513
Jiang Xinef317cd2012-09-15 11:17:00 +08009343msgid "show cached files in the output (default)"
Wang Sheng07432ce2013-01-30 17:23:08 +08009344msgstr "显示缓存的文件(默认)"
Jiang Xinef317cd2012-09-15 11:17:00 +08009345
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009346#: builtin/ls-files.c:515
Jiang Xinef317cd2012-09-15 11:17:00 +08009347msgid "show deleted files in the output"
Wang Sheng07432ce2013-01-30 17:23:08 +08009348msgstr "显示已删除的文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08009349
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009350#: builtin/ls-files.c:517
Jiang Xinef317cd2012-09-15 11:17:00 +08009351msgid "show modified files in the output"
Wang Sheng07432ce2013-01-30 17:23:08 +08009352msgstr "显示已修改的文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08009353
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009354#: builtin/ls-files.c:519
Jiang Xinef317cd2012-09-15 11:17:00 +08009355msgid "show other files in the output"
Wang Sheng07432ce2013-01-30 17:23:08 +08009356msgstr "显示其它文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08009357
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009358#: builtin/ls-files.c:521
Jiang Xinef317cd2012-09-15 11:17:00 +08009359msgid "show ignored files in the output"
Wang Sheng07432ce2013-01-30 17:23:08 +08009360msgstr "显示忽略的文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08009361
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009362#: builtin/ls-files.c:524
Jiang Xinef317cd2012-09-15 11:17:00 +08009363msgid "show staged contents' object name in the output"
Wang Sheng07432ce2013-01-30 17:23:08 +08009364msgstr "显示暂存区内容的对象名称"
Jiang Xinef317cd2012-09-15 11:17:00 +08009365
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009366#: builtin/ls-files.c:526
Jiang Xinef317cd2012-09-15 11:17:00 +08009367msgid "show files on the filesystem that need to be removed"
Wang Sheng07432ce2013-01-30 17:23:08 +08009368msgstr "显示文件系统需要删除的文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08009369
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009370#: builtin/ls-files.c:528
Jiang Xin220c3132014-10-08 10:55:14 +08009371msgid "show 'other' directories' names only"
Wang Sheng07432ce2013-01-30 17:23:08 +08009372msgstr "只显示“其他”目录的名称"
Jiang Xinef317cd2012-09-15 11:17:00 +08009373
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009374#: builtin/ls-files.c:530
Jiang Xin276ceea2016-02-28 20:35:55 +08009375msgid "show line endings of files"
9376msgstr "显示文件换行符格式"
9377
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009378#: builtin/ls-files.c:532
Jiang Xinef317cd2012-09-15 11:17:00 +08009379msgid "don't show empty directories"
Wang Sheng07432ce2013-01-30 17:23:08 +08009380msgstr "不显示空目录"
Jiang Xinef317cd2012-09-15 11:17:00 +08009381
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009382#: builtin/ls-files.c:535
Jiang Xinef317cd2012-09-15 11:17:00 +08009383msgid "show unmerged files in the output"
Wang Sheng07432ce2013-01-30 17:23:08 +08009384msgstr "显示未合并的文件"
Jiang Xinef317cd2012-09-15 11:17:00 +08009385
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009386#: builtin/ls-files.c:537
Jiang Xinef317cd2012-09-15 11:17:00 +08009387msgid "show resolve-undo information"
Wang Sheng07432ce2013-01-30 17:23:08 +08009388msgstr "显示 resolve-undo 信息"
Jiang Xinef317cd2012-09-15 11:17:00 +08009389
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009390#: builtin/ls-files.c:539
Jiang Xinef317cd2012-09-15 11:17:00 +08009391msgid "skip files matching pattern"
Wang Sheng07432ce2013-01-30 17:23:08 +08009392msgstr "匹配排除文件的模式"
Jiang Xinef317cd2012-09-15 11:17:00 +08009393
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009394#: builtin/ls-files.c:542
Jiang Xinef317cd2012-09-15 11:17:00 +08009395msgid "exclude patterns are read from <file>"
Wang Sheng07432ce2013-01-30 17:23:08 +08009396msgstr "从 <文件> 中读取排除模式"
Jiang Xinef317cd2012-09-15 11:17:00 +08009397
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009398#: builtin/ls-files.c:545
Jiang Xinef317cd2012-09-15 11:17:00 +08009399msgid "read additional per-directory exclude patterns in <file>"
Wang Sheng07432ce2013-01-30 17:23:08 +08009400msgstr "从 <文件> 读取额外的每个目录的排除模式"
Jiang Xinef317cd2012-09-15 11:17:00 +08009401
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009402#: builtin/ls-files.c:547
Jiang Xinef317cd2012-09-15 11:17:00 +08009403msgid "add the standard git exclusions"
Wang Sheng07432ce2013-01-30 17:23:08 +08009404msgstr "添加标准的 git 排除"
Jiang Xinef317cd2012-09-15 11:17:00 +08009405
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009406#: builtin/ls-files.c:550
Jiang Xinef317cd2012-09-15 11:17:00 +08009407msgid "make the output relative to the project top directory"
Wang Sheng07432ce2013-01-30 17:23:08 +08009408msgstr "显示相对于顶级目录的文件名"
Jiang Xinef317cd2012-09-15 11:17:00 +08009409
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009410#: builtin/ls-files.c:553
Jiang Xina0b6b242016-10-27 21:53:37 +08009411msgid "recurse through submodules"
9412msgstr "在子模组中递归"
9413
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009414#: builtin/ls-files.c:555
Jiang Xinef317cd2012-09-15 11:17:00 +08009415msgid "if any <file> is not in the index, treat this as an error"
Wang Sheng07432ce2013-01-30 17:23:08 +08009416msgstr "如果任何 <文件> 都不在索引区,视为错误"
Jiang Xinef317cd2012-09-15 11:17:00 +08009417
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009418#: builtin/ls-files.c:556
Jiang Xinef317cd2012-09-15 11:17:00 +08009419msgid "tree-ish"
Wang Sheng07432ce2013-01-30 17:23:08 +08009420msgstr "树或提交"
Jiang Xinef317cd2012-09-15 11:17:00 +08009421
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009422#: builtin/ls-files.c:557
Jiang Xinef317cd2012-09-15 11:17:00 +08009423msgid "pretend that paths removed since <tree-ish> are still present"
Wang Sheng07432ce2013-01-30 17:23:08 +08009424msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
Jiang Xinef317cd2012-09-15 11:17:00 +08009425
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009426#: builtin/ls-files.c:559
Jiang Xinef317cd2012-09-15 11:17:00 +08009427msgid "show debugging data"
Wang Sheng07432ce2013-01-30 17:23:08 +08009428msgstr "显示调试数据"
Jiang Xinef317cd2012-09-15 11:17:00 +08009429
Jiang Xin276ceea2016-02-28 20:35:55 +08009430#: builtin/ls-remote.c:7
9431msgid ""
9432"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9433" [-q | --quiet] [--exit-code] [--get-url]\n"
9434" [--symref] [<repository> [<refs>...]]"
9435msgstr ""
9436"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9437" [-q | --quiet] [--exit-code] [--get-url]\n"
9438" [--symref] [<仓库> [<引用>...]]"
9439
9440#: builtin/ls-remote.c:50
9441msgid "do not print remote URL"
9442msgstr "不打印远程 URL"
9443
9444#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
9445msgid "exec"
9446msgstr "exec"
9447
9448#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
9449msgid "path of git-upload-pack on the remote host"
9450msgstr "远程主机上的 git-upload-pack 路径"
9451
9452#: builtin/ls-remote.c:56
9453msgid "limit to tags"
9454msgstr "仅限于标签"
9455
9456#: builtin/ls-remote.c:57
9457msgid "limit to heads"
9458msgstr "仅限于分支"
9459
9460#: builtin/ls-remote.c:58
9461msgid "do not show peeled tags"
9462msgstr "不显示已解析的标签"
9463
9464#: builtin/ls-remote.c:60
9465msgid "take url.<base>.insteadOf into account"
9466msgstr "参考 url.<base>.insteadOf 设置"
9467
9468#: builtin/ls-remote.c:62
9469msgid "exit with exit code 2 if no matching refs are found"
9470msgstr "若未找到匹配的引用则以退出码2退出"
9471
9472#: builtin/ls-remote.c:64
9473msgid "show underlying ref in addition to the object pointed by it"
9474msgstr "除了显示指向的对象外,显示指向的引用名"
9475
Jiang Xin90314792013-09-17 23:37:05 +08009476#: builtin/ls-tree.c:28
Jiang Xinef317cd2012-09-15 11:17:00 +08009477msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
Wang Sheng07432ce2013-01-30 17:23:08 +08009478msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +08009479
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009480#: builtin/ls-tree.c:126
Jiang Xinef317cd2012-09-15 11:17:00 +08009481msgid "only show trees"
Wang Sheng07432ce2013-01-30 17:23:08 +08009482msgstr "只显示树"
Jiang Xinef317cd2012-09-15 11:17:00 +08009483
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009484#: builtin/ls-tree.c:128
Jiang Xinef317cd2012-09-15 11:17:00 +08009485msgid "recurse into subtrees"
Wang Sheng07432ce2013-01-30 17:23:08 +08009486msgstr "递归到子树"
Jiang Xinef317cd2012-09-15 11:17:00 +08009487
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009488#: builtin/ls-tree.c:130
Jiang Xinef317cd2012-09-15 11:17:00 +08009489msgid "show trees when recursing"
Wang Sheng07432ce2013-01-30 17:23:08 +08009490msgstr "当递归时显示树"
Jiang Xinef317cd2012-09-15 11:17:00 +08009491
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009492#: builtin/ls-tree.c:133
Jiang Xinef317cd2012-09-15 11:17:00 +08009493msgid "terminate entries with NUL byte"
Ray Chen4375c102015-08-10 18:03:29 +08009494msgstr "条目以 NUL 字符终止"
Jiang Xinef317cd2012-09-15 11:17:00 +08009495
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009496#: builtin/ls-tree.c:134
Jiang Xinef317cd2012-09-15 11:17:00 +08009497msgid "include object size"
Wang Sheng07432ce2013-01-30 17:23:08 +08009498msgstr "包括对象大小"
Jiang Xinef317cd2012-09-15 11:17:00 +08009499
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009500#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
Jiang Xinef317cd2012-09-15 11:17:00 +08009501msgid "list only filenames"
Wang Sheng07432ce2013-01-30 17:23:08 +08009502msgstr "只列出文件名"
Jiang Xinef317cd2012-09-15 11:17:00 +08009503
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009504#: builtin/ls-tree.c:141
Jiang Xinef317cd2012-09-15 11:17:00 +08009505msgid "use full path names"
Wang Sheng07432ce2013-01-30 17:23:08 +08009506msgstr "使用文件的全路径"
Jiang Xinef317cd2012-09-15 11:17:00 +08009507
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009508#: builtin/ls-tree.c:143
Jiang Xinef317cd2012-09-15 11:17:00 +08009509msgid "list entire tree; not just current directory (implies --full-name)"
Wang Sheng07432ce2013-01-30 17:23:08 +08009510msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
Jiang Xinef317cd2012-09-15 11:17:00 +08009511
Jiang Xin5c57d762016-08-28 10:18:12 +08009512#: builtin/merge.c:46
Jiang Xin814ff312015-02-16 21:34:19 +08009513msgid "git merge [<options>] [<commit>...]"
9514msgstr "git merge [<选项>] [<提交>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +08009515
Jiang Xin5c57d762016-08-28 10:18:12 +08009516#: builtin/merge.c:47
Jiang Xin814ff312015-02-16 21:34:19 +08009517msgid "git merge [<options>] <msg> HEAD <commit>"
9518msgstr "git merge [<选项>] <说明> HEAD <提交>"
Jiang Xinef317cd2012-09-15 11:17:00 +08009519
Jiang Xin5c57d762016-08-28 10:18:12 +08009520#: builtin/merge.c:48
Jiang Xinef317cd2012-09-15 11:17:00 +08009521msgid "git merge --abort"
Wang Sheng07432ce2013-01-30 17:23:08 +08009522msgstr "git merge --abort"
Jiang Xinef317cd2012-09-15 11:17:00 +08009523
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009524#: builtin/merge.c:49
9525msgid "git merge --continue"
9526msgstr "git merge --continue"
9527
9528#: builtin/merge.c:104
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009529msgid "switch `m' requires a value"
9530msgstr "开关 `m' 需要一个值"
9531
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009532#: builtin/merge.c:141
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009533#, c-format
9534msgid "Could not find merge strategy '%s'.\n"
Jiang Xin90e6ef52012-03-27 14:46:11 +08009535msgstr "不能找到合并策略 '%s'。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009536
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009537#: builtin/merge.c:142
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009538#, c-format
9539msgid "Available strategies are:"
9540msgstr "可用的策略有:"
9541
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009542#: builtin/merge.c:147
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009543#, c-format
9544msgid "Available custom strategies are:"
9545msgstr "可用的自定义策略有:"
9546
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009547#: builtin/merge.c:197 builtin/pull.c:127
Jiang Xinef317cd2012-09-15 11:17:00 +08009548msgid "do not show a diffstat at the end of the merge"
Wang Sheng07432ce2013-01-30 17:23:08 +08009549msgstr "在合并的最后不显示差异统计"
Jiang Xinef317cd2012-09-15 11:17:00 +08009550
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009551#: builtin/merge.c:200 builtin/pull.c:130
Jiang Xinef317cd2012-09-15 11:17:00 +08009552msgid "show a diffstat at the end of the merge"
Wang Sheng07432ce2013-01-30 17:23:08 +08009553msgstr "在合并的最后显示差异统计"
Jiang Xinef317cd2012-09-15 11:17:00 +08009554
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009555#: builtin/merge.c:201 builtin/pull.c:133
Jiang Xinef317cd2012-09-15 11:17:00 +08009556msgid "(synonym to --stat)"
Wang Sheng07432ce2013-01-30 17:23:08 +08009557msgstr "(和 --stat 同义)"
Jiang Xinef317cd2012-09-15 11:17:00 +08009558
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009559#: builtin/merge.c:203 builtin/pull.c:136
Jiang Xinef317cd2012-09-15 11:17:00 +08009560msgid "add (at most <n>) entries from shortlog to merge commit message"
Wang Sheng07432ce2013-01-30 17:23:08 +08009561msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
Jiang Xinef317cd2012-09-15 11:17:00 +08009562
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009563#: builtin/merge.c:206 builtin/pull.c:139
Jiang Xinef317cd2012-09-15 11:17:00 +08009564msgid "create a single commit instead of doing a merge"
Wang Sheng07432ce2013-01-30 17:23:08 +08009565msgstr "创建一个单独的提交而不是做一次合并"
Jiang Xinef317cd2012-09-15 11:17:00 +08009566
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009567#: builtin/merge.c:208 builtin/pull.c:142
Jiang Xinef317cd2012-09-15 11:17:00 +08009568msgid "perform a commit if the merge succeeds (default)"
Wang Sheng07432ce2013-01-30 17:23:08 +08009569msgstr "如果合并成功,执行一次提交(默认)"
Jiang Xinef317cd2012-09-15 11:17:00 +08009570
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009571#: builtin/merge.c:210 builtin/pull.c:145
Jiang Xinef317cd2012-09-15 11:17:00 +08009572msgid "edit message before committing"
Wang Sheng07432ce2013-01-30 17:23:08 +08009573msgstr "在提交前编辑提交说明"
Jiang Xinef317cd2012-09-15 11:17:00 +08009574
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009575#: builtin/merge.c:211
Jiang Xinef317cd2012-09-15 11:17:00 +08009576msgid "allow fast-forward (default)"
Wang Sheng07432ce2013-01-30 17:23:08 +08009577msgstr "允许快进(默认)"
Jiang Xinef317cd2012-09-15 11:17:00 +08009578
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009579#: builtin/merge.c:213 builtin/pull.c:151
Jiang Xinef317cd2012-09-15 11:17:00 +08009580msgid "abort if fast-forward is not possible"
Wang Sheng07432ce2013-01-30 17:23:08 +08009581msgstr "如果不能快进就放弃合并"
Jiang Xinef317cd2012-09-15 11:17:00 +08009582
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009583#: builtin/merge.c:217 builtin/pull.c:154
Jiang Xin5c57d762016-08-28 10:18:12 +08009584msgid "verify that the named commit has a valid GPG signature"
Jiang Xin1003b3a2013-04-11 17:55:09 +08009585msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
9586
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009587#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158
Jiang Xin1b7f4a32015-08-23 15:23:21 +08009588#: builtin/revert.c:89
Jiang Xinef317cd2012-09-15 11:17:00 +08009589msgid "strategy"
Wang Sheng07432ce2013-01-30 17:23:08 +08009590msgstr "策略"
Jiang Xinef317cd2012-09-15 11:17:00 +08009591
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009592#: builtin/merge.c:219 builtin/pull.c:159
Jiang Xinef317cd2012-09-15 11:17:00 +08009593msgid "merge strategy to use"
Wang Sheng07432ce2013-01-30 17:23:08 +08009594msgstr "要使用的合并策略"
Jiang Xinef317cd2012-09-15 11:17:00 +08009595
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009596#: builtin/merge.c:220 builtin/pull.c:162
Jiang Xinef317cd2012-09-15 11:17:00 +08009597msgid "option=value"
Wang Sheng07432ce2013-01-30 17:23:08 +08009598msgstr "option=value"
Jiang Xinef317cd2012-09-15 11:17:00 +08009599
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009600#: builtin/merge.c:221 builtin/pull.c:163
Jiang Xinef317cd2012-09-15 11:17:00 +08009601msgid "option for selected merge strategy"
Wang Sheng07432ce2013-01-30 17:23:08 +08009602msgstr "所选的合并策略的选项"
Jiang Xinef317cd2012-09-15 11:17:00 +08009603
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009604#: builtin/merge.c:223
Jiang Xinef317cd2012-09-15 11:17:00 +08009605msgid "merge commit message (for a non-fast-forward merge)"
Wang Sheng07432ce2013-01-30 17:23:08 +08009606msgstr "合并的提交说明(针对非快进式合并)"
Jiang Xinef317cd2012-09-15 11:17:00 +08009607
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009608#: builtin/merge.c:227
Jiang Xinef317cd2012-09-15 11:17:00 +08009609msgid "abort the current in-progress merge"
Wang Sheng07432ce2013-01-30 17:23:08 +08009610msgstr "放弃当前正在进行的合并"
Jiang Xinef317cd2012-09-15 11:17:00 +08009611
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009612#: builtin/merge.c:229
9613msgid "continue the current in-progress merge"
9614msgstr "继续当前正在进行的合并"
9615
9616#: builtin/merge.c:231 builtin/pull.c:170
Jiang Xin5b04ee32016-05-29 20:40:35 +08009617msgid "allow merging unrelated histories"
9618msgstr "允许合并不相关的历史"
9619
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009620#: builtin/merge.c:259
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009621msgid "could not run stash."
9622msgstr "不能进行进度保存。"
9623
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009624#: builtin/merge.c:264
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009625msgid "stash failed"
9626msgstr "进度保存失败"
9627
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009628#: builtin/merge.c:269
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009629#, c-format
9630msgid "not a valid object: %s"
9631msgstr "不是一个有效对象:%s"
9632
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009633#: builtin/merge.c:288 builtin/merge.c:305
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009634msgid "read-tree failed"
9635msgstr "读取树失败"
9636
Jiang Xin90e6ef52012-03-27 14:46:11 +08009637# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009638#: builtin/merge.c:335
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009639msgid " (nothing to squash)"
9640msgstr " (无可压缩)"
9641
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009642#: builtin/merge.c:346
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009643#, c-format
9644msgid "Squash commit -- not updating HEAD\n"
9645msgstr "压缩提交 -- 未更新 HEAD\n"
9646
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009647#: builtin/merge.c:396
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009648#, c-format
9649msgid "No merge message -- not updating HEAD\n"
9650msgstr "无合并信息 -- 未更新 HEAD\n"
9651
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009652#: builtin/merge.c:447
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009653#, c-format
9654msgid "'%s' does not point to a commit"
9655msgstr "'%s' 没有指向一个提交"
9656
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009657#: builtin/merge.c:537
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009658#, c-format
9659msgid "Bad branch.%s.mergeoptions string: %s"
Jiang Xin90e6ef52012-03-27 14:46:11 +08009660msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009661
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009662#: builtin/merge.c:656
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009663msgid "Not handling anything other than two heads merge."
Ray Chen29004bb2016-12-28 17:08:45 +08009664msgstr "未处理两个头合并之外的任何操作。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009665
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009666#: builtin/merge.c:670
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009667#, c-format
9668msgid "Unknown option for merge-recursive: -X%s"
9669msgstr "merge-recursive 的未知选项:-X%s"
9670
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009671#: builtin/merge.c:685
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009672#, c-format
9673msgid "unable to write %s"
9674msgstr "不能写 %s"
9675
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009676#: builtin/merge.c:737
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009677#, c-format
9678msgid "Could not read from '%s'"
9679msgstr "不能从 '%s' 读取"
9680
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009681#: builtin/merge.c:746
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009682#, c-format
9683msgid "Not committing merge; use 'git commit' to complete the merge.\n"
9684msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
9685
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009686#: builtin/merge.c:752
Jiang Xina77c07d2013-02-14 17:47:45 +08009687#, c-format
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009688msgid ""
9689"Please enter a commit message to explain why this merge is necessary,\n"
9690"especially if it merges an updated upstream into a topic branch.\n"
9691"\n"
Jiang Xina77c07d2013-02-14 17:47:45 +08009692"Lines starting with '%c' will be ignored, and an empty message aborts\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009693"the commit.\n"
9694msgstr ""
9695"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
9696"合并到主题分支。\n"
9697"\n"
Jiang Xina77c07d2013-02-14 17:47:45 +08009698"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009699
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009700#: builtin/merge.c:776
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009701msgid "Empty commit message."
9702msgstr "空提交信息。"
9703
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009704#: builtin/merge.c:796
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009705#, c-format
9706msgid "Wonderful.\n"
9707msgstr "太棒了。\n"
9708
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009709#: builtin/merge.c:851
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009710#, c-format
9711msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
9712msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
9713
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009714#: builtin/merge.c:867
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009715#, c-format
9716msgid "'%s' is not a commit"
9717msgstr "'%s' 不是一个提交"
9718
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009719#: builtin/merge.c:908
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009720msgid "No current branch."
Jiang Xin90e6ef52012-03-27 14:46:11 +08009721msgstr "没有当前分支。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009722
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009723#: builtin/merge.c:910
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009724msgid "No remote for the current branch."
Jiang Xin160fb2b2015-08-02 21:47:30 +08009725msgstr "当前分支没有对应的远程仓库。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009726
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009727#: builtin/merge.c:912
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009728msgid "No default upstream defined for the current branch."
Jiang Xin90e6ef52012-03-27 14:46:11 +08009729msgstr "当前分支没有定义默认的上游分支。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009730
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009731#: builtin/merge.c:917
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009732#, c-format
Jiang Xin2e8451e2013-07-26 14:00:02 +08009733msgid "No remote-tracking branch for %s from %s"
9734msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009735
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009736#: builtin/merge.c:964
Jiang Xin5c57d762016-08-28 10:18:12 +08009737#, c-format
9738msgid "Bad value '%s' in environment '%s'"
Ray Chen9a4b6942016-09-07 18:03:04 +08009739msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
Jiang Xin5c57d762016-08-28 10:18:12 +08009740
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009741#: builtin/merge.c:1038
Jiang Xin7aea43f2015-05-31 08:42:31 +08009742#, c-format
9743msgid "could not close '%s'"
9744msgstr "不能关闭 '%s'"
9745
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009746#: builtin/merge.c:1065
Jiang Xin5c57d762016-08-28 10:18:12 +08009747#, c-format
9748msgid "not something we can merge in %s: %s"
9749msgstr "不能在 %s 中合并:%s"
9750
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009751#: builtin/merge.c:1099
Jiang Xin5c57d762016-08-28 10:18:12 +08009752msgid "not something we can merge"
9753msgstr "不能合并"
9754
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009755#: builtin/merge.c:1167
9756msgid "--abort expects no arguments"
9757msgstr "--abort 不带参数"
9758
9759#: builtin/merge.c:1171
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009760msgid "There is no merge to abort (MERGE_HEAD missing)."
Jiang Xin90e6ef52012-03-27 14:46:11 +08009761msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009762
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009763#: builtin/merge.c:1183
9764msgid "--continue expects no arguments"
9765msgstr "--continue 不带参数"
9766
9767#: builtin/merge.c:1187
9768msgid "There is no merge in progress (MERGE_HEAD missing)."
9769msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
9770
9771#: builtin/merge.c:1203
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009772msgid ""
9773"You have not concluded your merge (MERGE_HEAD exists).\n"
Jiang Xin220c3132014-10-08 10:55:14 +08009774"Please, commit your changes before you merge."
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009775msgstr ""
9776"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
Jiang Xin90e6ef52012-03-27 14:46:11 +08009777"请在合并前先提交您的修改。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009778
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009779#: builtin/merge.c:1210
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009780msgid ""
9781"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
Jiang Xin220c3132014-10-08 10:55:14 +08009782"Please, commit your changes before you merge."
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009783msgstr ""
9784"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
Jiang Xin90e6ef52012-03-27 14:46:11 +08009785"请在合并前先提交您的修改。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009786
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009787#: builtin/merge.c:1213
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009788msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
9789msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
9790
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009791#: builtin/merge.c:1222
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009792msgid "You cannot combine --squash with --no-ff."
Jiang Xin649900b2012-08-02 11:50:59 +08009793msgstr "您不能将 --squash 与 --no-ff 同时使用。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009794
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009795#: builtin/merge.c:1230
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009796msgid "No commit specified and merge.defaultToUpstream not set."
Jiang Xin90e6ef52012-03-27 14:46:11 +08009797msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009798
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009799#: builtin/merge.c:1247
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009800msgid "Squash commit into empty head not supported yet"
9801msgstr "尚不支持到空分支的压缩提交"
9802
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009803#: builtin/merge.c:1249
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009804msgid "Non-fast-forward commit does not make sense into an empty head"
9805msgstr "到空分支的非快进式提交没有意义"
9806
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009807#: builtin/merge.c:1254
Jiang Xin2e8451e2013-07-26 14:00:02 +08009808#, c-format
9809msgid "%s - not something we can merge"
9810msgstr "%s - 不能被合并"
9811
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009812#: builtin/merge.c:1256
Jiang Xin7aea43f2015-05-31 08:42:31 +08009813msgid "Can merge only exactly one commit into empty head"
9814msgstr "只能将一个提交合并到空分支上"
9815
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009816#: builtin/merge.c:1312
Jiang Xin1003b3a2013-04-11 17:55:09 +08009817#, c-format
9818msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
9819msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
9820
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009821#: builtin/merge.c:1315
Jiang Xin1003b3a2013-04-11 17:55:09 +08009822#, c-format
9823msgid "Commit %s has a bad GPG signature allegedly by %s."
9824msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
9825
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009826#: builtin/merge.c:1318
Jiang Xin1003b3a2013-04-11 17:55:09 +08009827#, c-format
9828msgid "Commit %s does not have a GPG signature."
9829msgstr "提交 %s 没有一个 GPG 签名。"
9830
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009831#: builtin/merge.c:1321
Jiang Xin1003b3a2013-04-11 17:55:09 +08009832#, c-format
9833msgid "Commit %s has a good GPG signature by %s\n"
9834msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
9835
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009836#: builtin/merge.c:1383
Jiang Xin5b04ee32016-05-29 20:40:35 +08009837msgid "refusing to merge unrelated histories"
9838msgstr "拒绝合并无关的历史"
9839
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009840#: builtin/merge.c:1392
Jiang Xin5c57d762016-08-28 10:18:12 +08009841msgid "Already up-to-date."
9842msgstr "已经是最新的。"
9843
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009844#: builtin/merge.c:1402
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009845#, c-format
9846msgid "Updating %s..%s\n"
9847msgstr "更新 %s..%s\n"
9848
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009849#: builtin/merge.c:1443
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009850#, c-format
9851msgid "Trying really trivial in-index merge...\n"
Jiang Xin90e6ef52012-03-27 14:46:11 +08009852msgstr "尝试非常小的索引内合并...\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009853
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009854#: builtin/merge.c:1450
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009855#, c-format
9856msgid "Nope.\n"
9857msgstr "无。\n"
9858
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009859#: builtin/merge.c:1475
Jiang Xin5c57d762016-08-28 10:18:12 +08009860msgid "Already up-to-date. Yeeah!"
9861msgstr "已经是最新的。耶!"
9862
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009863#: builtin/merge.c:1481
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009864msgid "Not possible to fast-forward, aborting."
Thynson1aabac62012-03-03 08:34:28 +08009865msgstr "无法快进,终止。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009866
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009867#: builtin/merge.c:1504 builtin/merge.c:1583
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009868#, c-format
9869msgid "Rewinding the tree to pristine...\n"
9870msgstr "将树回滚至原始状态...\n"
9871
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009872#: builtin/merge.c:1508
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009873#, c-format
9874msgid "Trying merge strategy %s...\n"
9875msgstr "尝试合并策略 %s...\n"
9876
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009877#: builtin/merge.c:1574
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009878#, c-format
9879msgid "No merge strategy handled the merge.\n"
9880msgstr "没有合并策略处理此合并。\n"
9881
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009882#: builtin/merge.c:1576
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009883#, c-format
9884msgid "Merge with strategy %s failed.\n"
9885msgstr "使用策略 %s 合并失败。\n"
9886
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009887#: builtin/merge.c:1585
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009888#, c-format
9889msgid "Using the %s to prepare resolving by hand.\n"
9890msgstr "使用 %s 以准备手工解决。\n"
9891
Jiang Xin1a79b2f2017-01-27 22:50:57 +08009892#: builtin/merge.c:1597
Jiang Xinc04f5ac2012-02-13 14:41:59 +08009893#, c-format
9894msgid "Automatic merge went well; stopped before committing as requested\n"
9895msgstr "自动合并进展顺利,按要求在提交前停止\n"
9896
Jiang Xincfff71a2014-01-18 11:04:21 +08009897#: builtin/merge-base.c:29
Jiang Xin814ff312015-02-16 21:34:19 +08009898msgid "git merge-base [-a | --all] <commit> <commit>..."
9899msgstr "git merge-base [-a | --all] <提交> <提交>..."
Jiang Xinef317cd2012-09-15 11:17:00 +08009900
Jiang Xincfff71a2014-01-18 11:04:21 +08009901#: builtin/merge-base.c:30
Jiang Xin814ff312015-02-16 21:34:19 +08009902msgid "git merge-base [-a | --all] --octopus <commit>..."
9903msgstr "git merge-base [-a | --all] --octopus <提交>..."
Jiang Xinef317cd2012-09-15 11:17:00 +08009904
Jiang Xincfff71a2014-01-18 11:04:21 +08009905#: builtin/merge-base.c:31
Jiang Xinef317cd2012-09-15 11:17:00 +08009906msgid "git merge-base --independent <commit>..."
Wang Sheng07432ce2013-01-30 17:23:08 +08009907msgstr "git merge-base --independent <提交>..."
Jiang Xinef317cd2012-09-15 11:17:00 +08009908
Jiang Xincfff71a2014-01-18 11:04:21 +08009909#: builtin/merge-base.c:32
Jiang Xinef317cd2012-09-15 11:17:00 +08009910msgid "git merge-base --is-ancestor <commit> <commit>"
Wang Sheng07432ce2013-01-30 17:23:08 +08009911msgstr "git merge-base --is-ancestor <提交> <提交>"
Jiang Xinef317cd2012-09-15 11:17:00 +08009912
Jiang Xincfff71a2014-01-18 11:04:21 +08009913#: builtin/merge-base.c:33
9914msgid "git merge-base --fork-point <ref> [<commit>]"
Jiang Xind9d56b22015-01-18 20:37:57 +08009915msgstr "git merge-base --fork-point <引用> [<提交>]"
Jiang Xincfff71a2014-01-18 11:04:21 +08009916
Jiang Xina0b6b242016-10-27 21:53:37 +08009917#: builtin/merge-base.c:217
Jiang Xinef317cd2012-09-15 11:17:00 +08009918msgid "output all common ancestors"
Wang Sheng07432ce2013-01-30 17:23:08 +08009919msgstr "输出所有共同的祖先"
Jiang Xinef317cd2012-09-15 11:17:00 +08009920
Jiang Xina0b6b242016-10-27 21:53:37 +08009921#: builtin/merge-base.c:219
Jiang Xinef317cd2012-09-15 11:17:00 +08009922msgid "find ancestors for a single n-way merge"
Wang Sheng07432ce2013-01-30 17:23:08 +08009923msgstr "查找一个多路合并的祖先提交"
Jiang Xinef317cd2012-09-15 11:17:00 +08009924
Jiang Xina0b6b242016-10-27 21:53:37 +08009925#: builtin/merge-base.c:221
Jiang Xinef317cd2012-09-15 11:17:00 +08009926msgid "list revs not reachable from others"
Wang Sheng07432ce2013-01-30 17:23:08 +08009927msgstr "显示不能被其他访问到的版本"
Jiang Xinef317cd2012-09-15 11:17:00 +08009928
Jiang Xina0b6b242016-10-27 21:53:37 +08009929#: builtin/merge-base.c:223
Jiang Xinef317cd2012-09-15 11:17:00 +08009930msgid "is the first one ancestor of the other?"
Wang Sheng07432ce2013-01-30 17:23:08 +08009931msgstr "第一个是其他的祖先提交么?"
Jiang Xinef317cd2012-09-15 11:17:00 +08009932
Jiang Xina0b6b242016-10-27 21:53:37 +08009933#: builtin/merge-base.c:225
Jiang Xincfff71a2014-01-18 11:04:21 +08009934msgid "find where <commit> forked from reflog of <ref>"
Ray Chene397e7e2015-08-20 11:01:34 +08009935msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
Jiang Xincfff71a2014-01-18 11:04:21 +08009936
Jiang Xinef317cd2012-09-15 11:17:00 +08009937#: builtin/merge-file.c:8
9938msgid ""
Jiang Xin814ff312015-02-16 21:34:19 +08009939"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
9940"<orig-file> <file2>"
Jiang Xinef317cd2012-09-15 11:17:00 +08009941msgstr ""
Jiang Xin814ff312015-02-16 21:34:19 +08009942"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
9943"件> <文件2>"
Jiang Xinef317cd2012-09-15 11:17:00 +08009944
9945#: builtin/merge-file.c:33
9946msgid "send results to standard output"
Wang Sheng07432ce2013-01-30 17:23:08 +08009947msgstr "将结果发送到标准输出"
Jiang Xinef317cd2012-09-15 11:17:00 +08009948
9949#: builtin/merge-file.c:34
9950msgid "use a diff3 based merge"
Wang Sheng07432ce2013-01-30 17:23:08 +08009951msgstr "使用基于 diff3 的合并"
Jiang Xinef317cd2012-09-15 11:17:00 +08009952
9953#: builtin/merge-file.c:35
9954msgid "for conflicts, use our version"
Wang Sheng07432ce2013-01-30 17:23:08 +08009955msgstr "如果冲突,使用我们的版本"
Jiang Xinef317cd2012-09-15 11:17:00 +08009956
9957#: builtin/merge-file.c:37
9958msgid "for conflicts, use their version"
Wang Sheng07432ce2013-01-30 17:23:08 +08009959msgstr "如果冲突,使用他们的版本"
Jiang Xinef317cd2012-09-15 11:17:00 +08009960
9961#: builtin/merge-file.c:39
9962msgid "for conflicts, use a union version"
Wang Sheng07432ce2013-01-30 17:23:08 +08009963msgstr "如果冲突,使用联合版本"
Jiang Xinef317cd2012-09-15 11:17:00 +08009964
9965#: builtin/merge-file.c:42
9966msgid "for conflicts, use this marker size"
Wang Sheng07432ce2013-01-30 17:23:08 +08009967msgstr "如果冲突,使用指定长度的标记"
Jiang Xinef317cd2012-09-15 11:17:00 +08009968
9969#: builtin/merge-file.c:43
9970msgid "do not warn about conflicts"
Wang Sheng07432ce2013-01-30 17:23:08 +08009971msgstr "不要警告冲突"
Jiang Xinef317cd2012-09-15 11:17:00 +08009972
9973#: builtin/merge-file.c:45
Jiang Xin814ff312015-02-16 21:34:19 +08009974msgid "set labels for file1/orig-file/file2"
9975msgstr "为 文件1/初始文件/文件2 设置标签"
Jiang Xinef317cd2012-09-15 11:17:00 +08009976
Jiang Xina0b6b242016-10-27 21:53:37 +08009977#: builtin/merge-recursive.c:45
9978#, c-format
9979msgid "unknown option %s"
9980msgstr "未知选项 %s"
9981
9982#: builtin/merge-recursive.c:51
9983#, c-format
9984msgid "could not parse object '%s'"
9985msgstr "不能解析对象 '%s'"
9986
9987#: builtin/merge-recursive.c:55
9988#, c-format
9989msgid "cannot handle more than %d base. Ignoring %s."
9990msgid_plural "cannot handle more than %d bases. Ignoring %s."
9991msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
9992msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
9993
9994#: builtin/merge-recursive.c:63
9995msgid "not handling anything other than two heads merge."
9996msgstr "不能处理两个头合并之外的任何操作。"
9997
9998#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
9999#, c-format
10000msgid "could not resolve ref '%s'"
10001msgstr "无法解析引用 '%s'"
10002
10003#: builtin/merge-recursive.c:77
10004#, c-format
10005msgid "Merging %s with %s\n"
10006msgstr "合并 %s 和 %s\n"
10007
Jiang Xin276ceea2016-02-28 20:35:55 +080010008#: builtin/mktree.c:65
Jiang Xinef317cd2012-09-15 11:17:00 +080010009msgid "git mktree [-z] [--missing] [--batch]"
Wang Sheng07432ce2013-01-30 17:23:08 +080010010msgstr "git mktree [-z] [--missing] [--batch]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010011
Jiang Xin276ceea2016-02-28 20:35:55 +080010012#: builtin/mktree.c:152
Jiang Xinef317cd2012-09-15 11:17:00 +080010013msgid "input is NUL terminated"
Wang Sheng07432ce2013-01-30 17:23:08 +080010014msgstr "输入以 NUL 字符终止"
Jiang Xinef317cd2012-09-15 11:17:00 +080010015
Jiang Xin276ceea2016-02-28 20:35:55 +080010016#: builtin/mktree.c:153 builtin/write-tree.c:24
Jiang Xinef317cd2012-09-15 11:17:00 +080010017msgid "allow missing objects"
Wang Sheng07432ce2013-01-30 17:23:08 +080010018msgstr "允许丢失的对象"
Jiang Xinef317cd2012-09-15 11:17:00 +080010019
Jiang Xin276ceea2016-02-28 20:35:55 +080010020#: builtin/mktree.c:154
Jiang Xinef317cd2012-09-15 11:17:00 +080010021msgid "allow creation of more than one tree"
Wang Sheng07432ce2013-01-30 17:23:08 +080010022msgstr "允许创建一个以上的树"
Jiang Xinef317cd2012-09-15 11:17:00 +080010023
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010024#: builtin/mv.c:16
Jiang Xin814ff312015-02-16 21:34:19 +080010025msgid "git mv [<options>] <source>... <destination>"
10026msgstr "git mv [<选项>] <源>... <目标>"
Jiang Xinef317cd2012-09-15 11:17:00 +080010027
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010028#: builtin/mv.c:82
Jiang Xin220c3132014-10-08 10:55:14 +080010029#, c-format
10030msgid "Directory %s is in index and no submodule?"
10031msgstr "目录 %s 在索引中并且不是子模组?"
10032
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010033#: builtin/mv.c:84 builtin/rm.c:290
Jiang Xin220c3132014-10-08 10:55:14 +080010034msgid "Please stage your changes to .gitmodules or stash them to proceed"
Jiang Xin160fb2b2015-08-02 21:47:30 +080010035msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
Jiang Xin220c3132014-10-08 10:55:14 +080010036
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010037#: builtin/mv.c:102
Jiang Xin220c3132014-10-08 10:55:14 +080010038#, c-format
10039msgid "%.*s is in index"
10040msgstr "%.*s 在索引中"
10041
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010042#: builtin/mv.c:124
Jiang Xinef317cd2012-09-15 11:17:00 +080010043msgid "force move/rename even if target exists"
Wang Sheng07432ce2013-01-30 17:23:08 +080010044msgstr "强制移动/重命令,即使目标存在"
Jiang Xinef317cd2012-09-15 11:17:00 +080010045
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010046#: builtin/mv.c:125
Jiang Xinef317cd2012-09-15 11:17:00 +080010047msgid "skip move/rename errors"
Wang Sheng07432ce2013-01-30 17:23:08 +080010048msgstr "跳过移动/重命名错误"
Jiang Xinef317cd2012-09-15 11:17:00 +080010049
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010050#: builtin/mv.c:167
Jiang Xin220c3132014-10-08 10:55:14 +080010051#, c-format
10052msgid "destination '%s' is not a directory"
10053msgstr "目标 '%s' 不是一个目录"
10054
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010055#: builtin/mv.c:178
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010056#, c-format
10057msgid "Checking rename of '%s' to '%s'\n"
10058msgstr "检查 '%s' 到 '%s' 的重命名\n"
10059
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010060#: builtin/mv.c:182
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010061msgid "bad source"
10062msgstr "坏的源"
10063
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010064#: builtin/mv.c:185
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010065msgid "can not move directory into itself"
10066msgstr "不能将目录移动到自身"
10067
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010068#: builtin/mv.c:188
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010069msgid "cannot move directory over file"
10070msgstr "不能将目录移动到文件"
10071
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010072#: builtin/mv.c:197
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010073msgid "source directory is empty"
10074msgstr "源目录为空"
10075
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010076#: builtin/mv.c:222
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010077msgid "not under version control"
10078msgstr "不在版本控制之下"
10079
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010080#: builtin/mv.c:225
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010081msgid "destination exists"
10082msgstr "目标已存在"
10083
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010084#: builtin/mv.c:233
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010085#, c-format
10086msgid "overwriting '%s'"
10087msgstr "覆盖 '%s'"
10088
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010089#: builtin/mv.c:236
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010090msgid "Cannot overwrite"
10091msgstr "不能覆盖"
10092
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010093#: builtin/mv.c:239
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010094msgid "multiple sources for the same target"
10095msgstr "同一目标具有多个源"
10096
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010097#: builtin/mv.c:241
Jiang Xincfff71a2014-01-18 11:04:21 +080010098msgid "destination directory does not exist"
10099msgstr "目标目录不存在"
10100
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010101#: builtin/mv.c:248
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010102#, c-format
10103msgid "%s, source=%s, destination=%s"
10104msgstr "%s,源=%s,目标=%s"
10105
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010106#: builtin/mv.c:269
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010107#, c-format
10108msgid "Renaming %s to %s\n"
10109msgstr "重命名 %s 至 %s\n"
10110
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010111#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010112#, c-format
10113msgid "renaming '%s' failed"
10114msgstr "重命名 '%s' 失败"
10115
Jiang Xina0b6b242016-10-27 21:53:37 +080010116#: builtin/name-rev.c:257
Jiang Xin814ff312015-02-16 21:34:19 +080010117msgid "git name-rev [<options>] <commit>..."
10118msgstr "git name-rev [<选项>] <提交>..."
Jiang Xinef317cd2012-09-15 11:17:00 +080010119
Jiang Xina0b6b242016-10-27 21:53:37 +080010120#: builtin/name-rev.c:258
Jiang Xin814ff312015-02-16 21:34:19 +080010121msgid "git name-rev [<options>] --all"
10122msgstr "git name-rev [<选项>] --all"
Jiang Xinef317cd2012-09-15 11:17:00 +080010123
Jiang Xina0b6b242016-10-27 21:53:37 +080010124#: builtin/name-rev.c:259
Jiang Xin814ff312015-02-16 21:34:19 +080010125msgid "git name-rev [<options>] --stdin"
10126msgstr "git name-rev [<选项>] --stdin"
Jiang Xinef317cd2012-09-15 11:17:00 +080010127
Jiang Xina0b6b242016-10-27 21:53:37 +080010128#: builtin/name-rev.c:311
Jiang Xinef317cd2012-09-15 11:17:00 +080010129msgid "print only names (no SHA-1)"
Wang Sheng07432ce2013-01-30 17:23:08 +080010130msgstr "只打印名称(无 SHA-1)"
Jiang Xinef317cd2012-09-15 11:17:00 +080010131
Jiang Xina0b6b242016-10-27 21:53:37 +080010132#: builtin/name-rev.c:312
Jiang Xinef317cd2012-09-15 11:17:00 +080010133msgid "only use tags to name the commits"
Ray Chen55a16ee2015-07-28 12:52:28 +080010134msgstr "只使用标签来命名提交"
Jiang Xinef317cd2012-09-15 11:17:00 +080010135
Jiang Xina0b6b242016-10-27 21:53:37 +080010136#: builtin/name-rev.c:314
Jiang Xinef317cd2012-09-15 11:17:00 +080010137msgid "only use refs matching <pattern>"
Wang Sheng07432ce2013-01-30 17:23:08 +080010138msgstr "只使用和 <模式> 相匹配的引用"
Jiang Xinef317cd2012-09-15 11:17:00 +080010139
Jiang Xina0b6b242016-10-27 21:53:37 +080010140#: builtin/name-rev.c:316
Jiang Xinef317cd2012-09-15 11:17:00 +080010141msgid "list all commits reachable from all refs"
Wang Sheng07432ce2013-01-30 17:23:08 +080010142msgstr "列出可以从所有引用访问的提交"
Jiang Xinef317cd2012-09-15 11:17:00 +080010143
Jiang Xina0b6b242016-10-27 21:53:37 +080010144#: builtin/name-rev.c:317
Jiang Xinef317cd2012-09-15 11:17:00 +080010145msgid "read from stdin"
Wang Sheng07432ce2013-01-30 17:23:08 +080010146msgstr "从标准输入读取"
Jiang Xinef317cd2012-09-15 11:17:00 +080010147
Jiang Xina0b6b242016-10-27 21:53:37 +080010148#: builtin/name-rev.c:318
Jiang Xin90314792013-09-17 23:37:05 +080010149msgid "allow to print `undefined` names (default)"
10150msgstr "允许打印 `未定义` 的名称(默认)"
Jiang Xinef317cd2012-09-15 11:17:00 +080010151
Jiang Xina0b6b242016-10-27 21:53:37 +080010152#: builtin/name-rev.c:324
Jiang Xin2e8451e2013-07-26 14:00:02 +080010153msgid "dereference tags in the input (internal use)"
Ray Chen55a16ee2015-07-28 12:52:28 +080010154msgstr "反向解析输入中的标签(内部使用)"
Jiang Xin2e8451e2013-07-26 14:00:02 +080010155
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010156#: builtin/notes.c:25
Jiang Xin814ff312015-02-16 21:34:19 +080010157msgid "git notes [--ref <notes-ref>] [list [<object>]]"
Wang Sheng07432ce2013-01-30 17:23:08 +080010158msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010159
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010160#: builtin/notes.c:26
Jiang Xinef317cd2012-09-15 11:17:00 +080010161msgid ""
Jiang Xin814ff312015-02-16 21:34:19 +080010162"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
Jiang Xin04cb2f22015-01-04 12:27:38 +080010163"| (-c | -C) <object>] [<object>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010164msgstr ""
Jiang Xin04cb2f22015-01-04 12:27:38 +080010165"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
10166"| (-c | -C) <对象>] [<对象>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010167
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010168#: builtin/notes.c:27
Jiang Xin814ff312015-02-16 21:34:19 +080010169msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
Wang Sheng07432ce2013-01-30 17:23:08 +080010170msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
Jiang Xinef317cd2012-09-15 11:17:00 +080010171
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010172#: builtin/notes.c:28
Jiang Xinef317cd2012-09-15 11:17:00 +080010173msgid ""
Jiang Xin814ff312015-02-16 21:34:19 +080010174"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
Jiang Xin04cb2f22015-01-04 12:27:38 +080010175"(-c | -C) <object>] [<object>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010176msgstr ""
Jiang Xin04cb2f22015-01-04 12:27:38 +080010177"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
10178"(-c | -C) <对象>] [<对象>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010179
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010180#: builtin/notes.c:29
Jiang Xin814ff312015-02-16 21:34:19 +080010181msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
Jiang Xin04cb2f22015-01-04 12:27:38 +080010182msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010183
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010184#: builtin/notes.c:30
Jiang Xin814ff312015-02-16 21:34:19 +080010185msgid "git notes [--ref <notes-ref>] show [<object>]"
Wang Sheng07432ce2013-01-30 17:23:08 +080010186msgstr "git notes [--ref <注解引用>] show [<对象>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010187
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010188#: builtin/notes.c:31
Wang Sheng07432ce2013-01-30 17:23:08 +080010189msgid ""
Jiang Xin814ff312015-02-16 21:34:19 +080010190"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
Wang Sheng07432ce2013-01-30 17:23:08 +080010191msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
Jiang Xinef317cd2012-09-15 11:17:00 +080010192
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010193#: builtin/notes.c:32
Wang Sheng07432ce2013-01-30 17:23:08 +080010194msgid "git notes merge --commit [-v | -q]"
10195msgstr "git notes merge --commit [-v | -q]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010196
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010197#: builtin/notes.c:33
Wang Sheng07432ce2013-01-30 17:23:08 +080010198msgid "git notes merge --abort [-v | -q]"
10199msgstr "git notes merge --abort [-v | -q]"
10200
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010201#: builtin/notes.c:34
Jiang Xin814ff312015-02-16 21:34:19 +080010202msgid "git notes [--ref <notes-ref>] remove [<object>...]"
Wang Sheng07432ce2013-01-30 17:23:08 +080010203msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
10204
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010205#: builtin/notes.c:35
Jiang Xin814ff312015-02-16 21:34:19 +080010206msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
Wang Sheng07432ce2013-01-30 17:23:08 +080010207msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
10208
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010209#: builtin/notes.c:36
Jiang Xin814ff312015-02-16 21:34:19 +080010210msgid "git notes [--ref <notes-ref>] get-ref"
Wang Sheng07432ce2013-01-30 17:23:08 +080010211msgstr "git notes [--ref <注解引用>] get-ref"
Jiang Xinef317cd2012-09-15 11:17:00 +080010212
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010213#: builtin/notes.c:41
Jiang Xinef317cd2012-09-15 11:17:00 +080010214msgid "git notes [list [<object>]]"
Wang Sheng07432ce2013-01-30 17:23:08 +080010215msgstr "git notes [list [<对象>]]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010216
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010217#: builtin/notes.c:46
Jiang Xinef317cd2012-09-15 11:17:00 +080010218msgid "git notes add [<options>] [<object>]"
Wang Sheng07432ce2013-01-30 17:23:08 +080010219msgstr "git notes add [<选项>] [<对象>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010220
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010221#: builtin/notes.c:51
Jiang Xinef317cd2012-09-15 11:17:00 +080010222msgid "git notes copy [<options>] <from-object> <to-object>"
Wang Sheng07432ce2013-01-30 17:23:08 +080010223msgstr "git notes copy [<选项>] <源对象> <目标对象>"
Jiang Xinef317cd2012-09-15 11:17:00 +080010224
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010225#: builtin/notes.c:52
Jiang Xinef317cd2012-09-15 11:17:00 +080010226msgid "git notes copy --stdin [<from-object> <to-object>]..."
Wang Sheng07432ce2013-01-30 17:23:08 +080010227msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
Jiang Xinef317cd2012-09-15 11:17:00 +080010228
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010229#: builtin/notes.c:57
Jiang Xinef317cd2012-09-15 11:17:00 +080010230msgid "git notes append [<options>] [<object>]"
Wang Sheng07432ce2013-01-30 17:23:08 +080010231msgstr "git notes append [<选项>] [<对象>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010232
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010233#: builtin/notes.c:62
Jiang Xinef317cd2012-09-15 11:17:00 +080010234msgid "git notes edit [<object>]"
Wang Sheng07432ce2013-01-30 17:23:08 +080010235msgstr "git notes edit [<对象>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010236
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010237#: builtin/notes.c:67
Jiang Xinef317cd2012-09-15 11:17:00 +080010238msgid "git notes show [<object>]"
Wang Sheng07432ce2013-01-30 17:23:08 +080010239msgstr "git notes show [<对象>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010240
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010241#: builtin/notes.c:72
Jiang Xin814ff312015-02-16 21:34:19 +080010242msgid "git notes merge [<options>] <notes-ref>"
Wang Sheng07432ce2013-01-30 17:23:08 +080010243msgstr "git notes merge [<选项>] <注解引用>"
Jiang Xinef317cd2012-09-15 11:17:00 +080010244
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010245#: builtin/notes.c:73
Jiang Xinef317cd2012-09-15 11:17:00 +080010246msgid "git notes merge --commit [<options>]"
Wang Sheng07432ce2013-01-30 17:23:08 +080010247msgstr "git notes merge --commit [<选项>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010248
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010249#: builtin/notes.c:74
Jiang Xinef317cd2012-09-15 11:17:00 +080010250msgid "git notes merge --abort [<options>]"
Wang Sheng07432ce2013-01-30 17:23:08 +080010251msgstr "git notes merge --abort [<选项>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010252
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010253#: builtin/notes.c:79
Jiang Xinef317cd2012-09-15 11:17:00 +080010254msgid "git notes remove [<object>]"
Wang Sheng07432ce2013-01-30 17:23:08 +080010255msgstr "git notes remove [<对象>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010256
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010257#: builtin/notes.c:84
Jiang Xinef317cd2012-09-15 11:17:00 +080010258msgid "git notes prune [<options>]"
Wang Sheng07432ce2013-01-30 17:23:08 +080010259msgstr "git notes prune [<选项>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010260
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010261#: builtin/notes.c:89
Jiang Xinef317cd2012-09-15 11:17:00 +080010262msgid "git notes get-ref"
Wang Sheng07432ce2013-01-30 17:23:08 +080010263msgstr "git notes get-ref"
Jiang Xinef317cd2012-09-15 11:17:00 +080010264
Jiang Xin5c57d762016-08-28 10:18:12 +080010265#: builtin/notes.c:94
10266msgid "Write/edit the notes for the following object:"
10267msgstr "为下面的对象写/编辑说明:"
10268
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010269#: builtin/notes.c:147
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010270#, c-format
10271msgid "unable to start 'show' for object '%s'"
10272msgstr "不能为对象 '%s' 开始 'show'"
10273
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010274#: builtin/notes.c:151
Jiang Xina77c07d2013-02-14 17:47:45 +080010275msgid "could not read 'show' output"
10276msgstr "不能读取 'show' 的输出"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010277
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010278#: builtin/notes.c:159
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010279#, c-format
10280msgid "failed to finish 'show' for object '%s'"
10281msgstr "无法为对象 '%s' 完成 'show'"
10282
Jiang Xin5c57d762016-08-28 10:18:12 +080010283#: builtin/notes.c:194
Jiang Xina0b6b242016-10-27 21:53:37 +080010284msgid "please supply the note contents using either -m or -F option"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010285msgstr "请通过 -m 或 -F 选项为注解提供内容"
10286
Jiang Xin5c57d762016-08-28 10:18:12 +080010287#: builtin/notes.c:203
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010288msgid "unable to write note object"
10289msgstr "不能写注解对象"
10290
Jiang Xin5c57d762016-08-28 10:18:12 +080010291#: builtin/notes.c:205
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010292#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +080010293msgid "the note contents have been left in %s"
Jiang Xin220c3132014-10-08 10:55:14 +080010294msgstr "注解内容被留在 %s 中"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010295
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010296#: builtin/notes.c:233 builtin/tag.c:460
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010297#, c-format
10298msgid "cannot read '%s'"
10299msgstr "不能读取 '%s'"
10300
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010301#: builtin/notes.c:235 builtin/tag.c:463
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010302#, c-format
10303msgid "could not open or read '%s'"
10304msgstr "不能打开或读取 '%s'"
10305
Jiang Xina0b6b242016-10-27 21:53:37 +080010306#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
10307#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
10308#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
10309#, c-format
10310msgid "failed to resolve '%s' as a valid ref."
10311msgstr "无法解析 '%s' 为一个有效引用。"
10312
Jiang Xin5c57d762016-08-28 10:18:12 +080010313#: builtin/notes.c:257
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010314#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +080010315msgid "failed to read object '%s'."
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010316msgstr "无法读取对象 '%s'。"
10317
Jiang Xin5c57d762016-08-28 10:18:12 +080010318#: builtin/notes.c:261
Jiang Xin6c94aba2014-03-13 12:41:34 +080010319#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +080010320msgid "cannot read note data from non-blob object '%s'."
10321msgstr "不能从非数据对象 '%s' 中读取注解数据。"
Jiang Xin6c94aba2014-03-13 12:41:34 +080010322
Jiang Xina0b6b242016-10-27 21:53:37 +080010323#: builtin/notes.c:301
10324#, c-format
10325msgid "malformed input line: '%s'."
10326msgstr "非法的输入行:'%s'。"
10327
10328#: builtin/notes.c:316
10329#, c-format
10330msgid "failed to copy notes from '%s' to '%s'"
10331msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
10332
10333#. TRANSLATORS: the first %s will be replaced by a
10334#. git notes command: 'add', 'merge', 'remove', etc.
10335#: builtin/notes.c:345
10336#, c-format
10337msgid "refusing to %s notes in %s (outside of refs/notes/)"
10338msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
10339
10340#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
10341#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
10342#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010343msgid "too many parameters"
10344msgstr "参数太多"
10345
Jiang Xina0b6b242016-10-27 21:53:37 +080010346#: builtin/notes.c:378 builtin/notes.c:665
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010347#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +080010348msgid "no note found for object %s."
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010349msgstr "未发现对象 %s 的注解。"
10350
Jiang Xina0b6b242016-10-27 21:53:37 +080010351#: builtin/notes.c:399 builtin/notes.c:562
Wang Sheng07432ce2013-01-30 17:23:08 +080010352msgid "note contents as a string"
10353msgstr "注解内容作为一个字符串"
Jiang Xinef317cd2012-09-15 11:17:00 +080010354
Jiang Xina0b6b242016-10-27 21:53:37 +080010355#: builtin/notes.c:402 builtin/notes.c:565
Wang Sheng07432ce2013-01-30 17:23:08 +080010356msgid "note contents in a file"
10357msgstr "注解内容到一个文件中"
10358
Jiang Xina0b6b242016-10-27 21:53:37 +080010359#: builtin/notes.c:405 builtin/notes.c:568
Wang Sheng07432ce2013-01-30 17:23:08 +080010360msgid "reuse and edit specified note object"
10361msgstr "重用和编辑指定的注解对象"
10362
Jiang Xina0b6b242016-10-27 21:53:37 +080010363#: builtin/notes.c:408 builtin/notes.c:571
Jiang Xinef317cd2012-09-15 11:17:00 +080010364msgid "reuse specified note object"
Wang Sheng07432ce2013-01-30 17:23:08 +080010365msgstr "重用指定的注解对象"
Jiang Xinef317cd2012-09-15 11:17:00 +080010366
Jiang Xina0b6b242016-10-27 21:53:37 +080010367#: builtin/notes.c:411 builtin/notes.c:574
Jiang Xin04cb2f22015-01-04 12:27:38 +080010368msgid "allow storing empty note"
10369msgstr "允许保存空白注释"
10370
Jiang Xina0b6b242016-10-27 21:53:37 +080010371#: builtin/notes.c:412 builtin/notes.c:483
Jiang Xinef317cd2012-09-15 11:17:00 +080010372msgid "replace existing notes"
Wang Sheng07432ce2013-01-30 17:23:08 +080010373msgstr "替换已存在的注解"
Jiang Xinef317cd2012-09-15 11:17:00 +080010374
Jiang Xina0b6b242016-10-27 21:53:37 +080010375#: builtin/notes.c:437
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010376#, c-format
10377msgid ""
10378"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
10379"existing notes"
10380msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
10381
Jiang Xina0b6b242016-10-27 21:53:37 +080010382#: builtin/notes.c:452 builtin/notes.c:531
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010383#, c-format
10384msgid "Overwriting existing notes for object %s\n"
10385msgstr "覆盖对象 %s 现存注解\n"
10386
Jiang Xina0b6b242016-10-27 21:53:37 +080010387#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
Jiang Xin04cb2f22015-01-04 12:27:38 +080010388#, c-format
10389msgid "Removing note for object %s\n"
10390msgstr "删除对象 %s 的注解\n"
10391
Jiang Xina0b6b242016-10-27 21:53:37 +080010392#: builtin/notes.c:484
Jiang Xinef317cd2012-09-15 11:17:00 +080010393msgid "read objects from stdin"
Wang Sheng07432ce2013-01-30 17:23:08 +080010394msgstr "从标准输入读取对象"
Jiang Xinef317cd2012-09-15 11:17:00 +080010395
Jiang Xina0b6b242016-10-27 21:53:37 +080010396#: builtin/notes.c:486
Jiang Xinef317cd2012-09-15 11:17:00 +080010397msgid "load rewriting config for <command> (implies --stdin)"
Wang Sheng07432ce2013-01-30 17:23:08 +080010398msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
Jiang Xinef317cd2012-09-15 11:17:00 +080010399
Jiang Xina0b6b242016-10-27 21:53:37 +080010400#: builtin/notes.c:504
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010401msgid "too few parameters"
10402msgstr "参数太少"
10403
Jiang Xina0b6b242016-10-27 21:53:37 +080010404#: builtin/notes.c:525
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010405#, c-format
10406msgid ""
10407"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
10408"existing notes"
10409msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
10410
Jiang Xina0b6b242016-10-27 21:53:37 +080010411#: builtin/notes.c:537
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010412#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +080010413msgid "missing notes on source object %s. Cannot copy."
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010414msgstr "源对象 %s 缺少注解。不能拷贝。"
10415
Jiang Xina0b6b242016-10-27 21:53:37 +080010416#: builtin/notes.c:589
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010417#, c-format
10418msgid ""
10419"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
10420"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
10421msgstr ""
Jiang Xin90e6ef52012-03-27 14:46:11 +080010422"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010423"请换用 'git notes add -f -m/-F/-c/-C'。\n"
10424
Jiang Xina0b6b242016-10-27 21:53:37 +080010425#: builtin/notes.c:685
10426msgid "failed to delete ref NOTES_MERGE_PARTIAL"
10427msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
10428
10429#: builtin/notes.c:687
10430msgid "failed to delete ref NOTES_MERGE_REF"
10431msgstr "无法删除引用 NOTES_MERGE_REF"
10432
10433#: builtin/notes.c:689
10434msgid "failed to remove 'git notes merge' worktree"
10435msgstr "无法删除 'git notes merge' 工作区"
10436
10437#: builtin/notes.c:709
10438msgid "failed to read ref NOTES_MERGE_PARTIAL"
10439msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
10440
10441#: builtin/notes.c:711
10442msgid "could not find commit from NOTES_MERGE_PARTIAL."
10443msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
10444
10445#: builtin/notes.c:713
10446msgid "could not parse commit from NOTES_MERGE_PARTIAL."
10447msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
10448
10449#: builtin/notes.c:726
10450msgid "failed to resolve NOTES_MERGE_REF"
10451msgstr "无法解析 NOTES_MERGE_REF"
10452
10453#: builtin/notes.c:729
10454msgid "failed to finalize notes merge"
10455msgstr "无法完成注解合并"
10456
10457#: builtin/notes.c:755
Jiang Xin5c57d762016-08-28 10:18:12 +080010458#, c-format
10459msgid "unknown notes merge strategy %s"
10460msgstr "未知的注解合并策略 %s"
10461
Jiang Xina0b6b242016-10-27 21:53:37 +080010462#: builtin/notes.c:771
Jiang Xinef317cd2012-09-15 11:17:00 +080010463msgid "General options"
Wang Sheng07432ce2013-01-30 17:23:08 +080010464msgstr "通用选项"
Jiang Xinef317cd2012-09-15 11:17:00 +080010465
Jiang Xina0b6b242016-10-27 21:53:37 +080010466#: builtin/notes.c:773
Jiang Xinef317cd2012-09-15 11:17:00 +080010467msgid "Merge options"
Wang Sheng07432ce2013-01-30 17:23:08 +080010468msgstr "合并选项"
Jiang Xinef317cd2012-09-15 11:17:00 +080010469
Jiang Xina0b6b242016-10-27 21:53:37 +080010470#: builtin/notes.c:775
Jiang Xinef317cd2012-09-15 11:17:00 +080010471msgid ""
10472"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
10473"cat_sort_uniq)"
Wang Sheng07432ce2013-01-30 17:23:08 +080010474msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
Jiang Xinef317cd2012-09-15 11:17:00 +080010475
Jiang Xina0b6b242016-10-27 21:53:37 +080010476#: builtin/notes.c:777
Jiang Xinef317cd2012-09-15 11:17:00 +080010477msgid "Committing unmerged notes"
Wang Sheng07432ce2013-01-30 17:23:08 +080010478msgstr "提交未合并的注解"
Jiang Xinef317cd2012-09-15 11:17:00 +080010479
Jiang Xina0b6b242016-10-27 21:53:37 +080010480#: builtin/notes.c:779
Jiang Xinef317cd2012-09-15 11:17:00 +080010481msgid "finalize notes merge by committing unmerged notes"
Wang Sheng07432ce2013-01-30 17:23:08 +080010482msgstr "通过提交未合并的注解来完成注解合并"
Jiang Xinef317cd2012-09-15 11:17:00 +080010483
Jiang Xina0b6b242016-10-27 21:53:37 +080010484#: builtin/notes.c:781
Jiang Xinef317cd2012-09-15 11:17:00 +080010485msgid "Aborting notes merge resolution"
Wang Sheng07432ce2013-01-30 17:23:08 +080010486msgstr "中止注解合并的方案"
Jiang Xinef317cd2012-09-15 11:17:00 +080010487
Jiang Xina0b6b242016-10-27 21:53:37 +080010488#: builtin/notes.c:783
Jiang Xinef317cd2012-09-15 11:17:00 +080010489msgid "abort notes merge"
Wang Sheng07432ce2013-01-30 17:23:08 +080010490msgstr "中止注解合并"
Jiang Xinef317cd2012-09-15 11:17:00 +080010491
Jiang Xina0b6b242016-10-27 21:53:37 +080010492#: builtin/notes.c:794
Jiang Xin5c57d762016-08-28 10:18:12 +080010493msgid "cannot mix --commit, --abort or -s/--strategy"
10494msgstr "不能混用 --commit、--abort 或 -s/--strategy"
10495
Jiang Xina0b6b242016-10-27 21:53:37 +080010496#: builtin/notes.c:799
10497msgid "must specify a notes ref to merge"
Ray Chen9a4b6942016-09-07 18:03:04 +080010498msgstr "必须指定一个注解引用来合并"
Jiang Xin5c57d762016-08-28 10:18:12 +080010499
Jiang Xina0b6b242016-10-27 21:53:37 +080010500#: builtin/notes.c:823
Jiang Xin5c57d762016-08-28 10:18:12 +080010501#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +080010502msgid "unknown -s/--strategy: %s"
Jiang Xin5c57d762016-08-28 10:18:12 +080010503msgstr "未知的 -s/--strategy:%s"
10504
Jiang Xina0b6b242016-10-27 21:53:37 +080010505#: builtin/notes.c:860
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010506#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +080010507msgid "a notes merge into %s is already in-progress at %s"
10508msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
Jiang Xin5c57d762016-08-28 10:18:12 +080010509
10510#: builtin/notes.c:863
10511#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +080010512msgid "failed to store link to current notes ref (%s)"
10513msgstr "无法存储链接到当前的注解引用(%s)"
10514
10515#: builtin/notes.c:865
10516#, c-format
Jiang Xin5c57d762016-08-28 10:18:12 +080010517msgid ""
10518"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
10519"'git notes merge --commit', or abort the merge with 'git notes merge --"
10520"abort'.\n"
Jiang Xina0b6b242016-10-27 21:53:37 +080010521msgstr ""
10522"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
10523"交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
Jiang Xin5c57d762016-08-28 10:18:12 +080010524
Jiang Xina0b6b242016-10-27 21:53:37 +080010525#: builtin/notes.c:887
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010526#, c-format
10527msgid "Object %s has no note\n"
10528msgstr "对象 %s 没有注解\n"
10529
Jiang Xina0b6b242016-10-27 21:53:37 +080010530#: builtin/notes.c:899
Wang Sheng07432ce2013-01-30 17:23:08 +080010531msgid "attempt to remove non-existent note is not an error"
10532msgstr "尝试删除不存在的注解不是一个错误"
10533
Jiang Xina0b6b242016-10-27 21:53:37 +080010534#: builtin/notes.c:902
Jiang Xinef317cd2012-09-15 11:17:00 +080010535msgid "read object names from the standard input"
Wang Sheng07432ce2013-01-30 17:23:08 +080010536msgstr "从标准输入读取对象名称"
Jiang Xinef317cd2012-09-15 11:17:00 +080010537
Jiang Xina0b6b242016-10-27 21:53:37 +080010538#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
Jiang Xin5c57d762016-08-28 10:18:12 +080010539msgid "do not remove, show only"
10540msgstr "不删除,只显示"
10541
Jiang Xina0b6b242016-10-27 21:53:37 +080010542#: builtin/notes.c:941
Jiang Xin5c57d762016-08-28 10:18:12 +080010543msgid "report pruned notes"
10544msgstr "报告清除的注解"
10545
Jiang Xina0b6b242016-10-27 21:53:37 +080010546#: builtin/notes.c:983
Jiang Xin6c94aba2014-03-13 12:41:34 +080010547msgid "notes-ref"
Wang Sheng07432ce2013-01-30 17:23:08 +080010548msgstr "注解引用"
Jiang Xinef317cd2012-09-15 11:17:00 +080010549
Jiang Xina0b6b242016-10-27 21:53:37 +080010550#: builtin/notes.c:984
Jiang Xin814ff312015-02-16 21:34:19 +080010551msgid "use notes from <notes-ref>"
Wang Sheng07432ce2013-01-30 17:23:08 +080010552msgstr "从 <注解引用> 使用注解"
Jiang Xinef317cd2012-09-15 11:17:00 +080010553
Jiang Xina0b6b242016-10-27 21:53:37 +080010554#: builtin/notes.c:1019
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010555#, c-format
Jiang Xina0b6b242016-10-27 21:53:37 +080010556msgid "unknown subcommand: %s"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010557msgstr "未知子命令:%s"
10558
Jiang Xina0b6b242016-10-27 21:53:37 +080010559#: builtin/pack-objects.c:29
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010560msgid ""
10561"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
10562msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010563
Jiang Xina0b6b242016-10-27 21:53:37 +080010564#: builtin/pack-objects.c:30
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010565msgid ""
10566"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
10567msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010568
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010569#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
Jiang Xin6792b932012-07-04 17:20:34 +080010570#, c-format
10571msgid "deflate error (%d)"
10572msgstr "压缩错误 (%d)"
10573
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010574#: builtin/pack-objects.c:766
Jiang Xin5b04ee32016-05-29 20:40:35 +080010575msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
10576msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
10577
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010578#: builtin/pack-objects.c:779
Jiang Xin6c94aba2014-03-13 12:41:34 +080010579msgid "Writing objects"
10580msgstr "写入对象中"
10581
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010582#: builtin/pack-objects.c:1068
Jiang Xin6c94aba2014-03-13 12:41:34 +080010583msgid "disabling bitmap writing, as some objects are not being packed"
10584msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
10585
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010586#: builtin/pack-objects.c:2344
Jiang Xin6c94aba2014-03-13 12:41:34 +080010587msgid "Compressing objects"
10588msgstr "压缩对象中"
10589
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010590#: builtin/pack-objects.c:2747
Jiang Xin7ac1c0a2012-02-28 12:24:54 +080010591#, c-format
10592msgid "unsupported index version %s"
Jiang Xin90e6ef52012-03-27 14:46:11 +080010593msgstr "不支持的索引版本 %s"
Jiang Xin7ac1c0a2012-02-28 12:24:54 +080010594
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010595#: builtin/pack-objects.c:2751
Jiang Xin7ac1c0a2012-02-28 12:24:54 +080010596#, c-format
10597msgid "bad index version '%s'"
Jiang Xin90e6ef52012-03-27 14:46:11 +080010598msgstr "坏的索引版本 '%s'"
Jiang Xin7ac1c0a2012-02-28 12:24:54 +080010599
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010600#: builtin/pack-objects.c:2781
Jiang Xinef317cd2012-09-15 11:17:00 +080010601msgid "do not show progress meter"
Wang Sheng07432ce2013-01-30 17:23:08 +080010602msgstr "不显示进度表"
Jiang Xinef317cd2012-09-15 11:17:00 +080010603
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010604#: builtin/pack-objects.c:2783
Jiang Xinef317cd2012-09-15 11:17:00 +080010605msgid "show progress meter"
Wang Sheng07432ce2013-01-30 17:23:08 +080010606msgstr "显示进度表"
Jiang Xinef317cd2012-09-15 11:17:00 +080010607
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010608#: builtin/pack-objects.c:2785
Jiang Xinef317cd2012-09-15 11:17:00 +080010609msgid "show progress meter during object writing phase"
Wang Sheng07432ce2013-01-30 17:23:08 +080010610msgstr "在对象写入阶段显示进度表"
10611
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010612#: builtin/pack-objects.c:2788
Wang Sheng07432ce2013-01-30 17:23:08 +080010613msgid "similar to --all-progress when progress meter is shown"
10614msgstr "当进度表显示时类似于 --all-progress"
Jiang Xinef317cd2012-09-15 11:17:00 +080010615
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010616#: builtin/pack-objects.c:2789
Wang Sheng07432ce2013-01-30 17:23:08 +080010617msgid "version[,offset]"
10618msgstr "版本[,偏移]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010619
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010620#: builtin/pack-objects.c:2790
Jiang Xinef317cd2012-09-15 11:17:00 +080010621msgid "write the pack index file in the specified idx format version"
Wang Sheng07432ce2013-01-30 17:23:08 +080010622msgstr "用指定的 idx 格式版本来写包索引文件"
Jiang Xinef317cd2012-09-15 11:17:00 +080010623
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010624#: builtin/pack-objects.c:2793
Jiang Xinef317cd2012-09-15 11:17:00 +080010625msgid "maximum size of each output pack file"
Wang Sheng07432ce2013-01-30 17:23:08 +080010626msgstr "每个输出包的最大尺寸"
Jiang Xinef317cd2012-09-15 11:17:00 +080010627
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010628#: builtin/pack-objects.c:2795
Jiang Xinef317cd2012-09-15 11:17:00 +080010629msgid "ignore borrowed objects from alternate object store"
Jiang Xin160fb2b2015-08-02 21:47:30 +080010630msgstr "忽略从备用对象存储里借用对象"
Jiang Xinef317cd2012-09-15 11:17:00 +080010631
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010632#: builtin/pack-objects.c:2797
Jiang Xinef317cd2012-09-15 11:17:00 +080010633msgid "ignore packed objects"
Wang Sheng07432ce2013-01-30 17:23:08 +080010634msgstr "忽略包对象"
Jiang Xinef317cd2012-09-15 11:17:00 +080010635
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010636#: builtin/pack-objects.c:2799
Jiang Xinef317cd2012-09-15 11:17:00 +080010637msgid "limit pack window by objects"
Wang Sheng07432ce2013-01-30 17:23:08 +080010638msgstr "限制打包窗口的对象数"
Jiang Xinef317cd2012-09-15 11:17:00 +080010639
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010640#: builtin/pack-objects.c:2801
Jiang Xinef317cd2012-09-15 11:17:00 +080010641msgid "limit pack window by memory in addition to object limit"
Wang Sheng07432ce2013-01-30 17:23:08 +080010642msgstr "除对象数量限制外设置打包窗口的内存限制"
Jiang Xinef317cd2012-09-15 11:17:00 +080010643
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010644#: builtin/pack-objects.c:2803
Jiang Xinef317cd2012-09-15 11:17:00 +080010645msgid "maximum length of delta chain allowed in the resulting pack"
Wang Sheng07432ce2013-01-30 17:23:08 +080010646msgstr "打包允许的 delta 链的最大长度"
Jiang Xinef317cd2012-09-15 11:17:00 +080010647
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010648#: builtin/pack-objects.c:2805
Jiang Xinef317cd2012-09-15 11:17:00 +080010649msgid "reuse existing deltas"
Wang Sheng07432ce2013-01-30 17:23:08 +080010650msgstr "重用已存在的 deltas"
Jiang Xinef317cd2012-09-15 11:17:00 +080010651
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010652#: builtin/pack-objects.c:2807
Jiang Xinef317cd2012-09-15 11:17:00 +080010653msgid "reuse existing objects"
Wang Sheng07432ce2013-01-30 17:23:08 +080010654msgstr "重用已存在的对象"
Jiang Xinef317cd2012-09-15 11:17:00 +080010655
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010656#: builtin/pack-objects.c:2809
Jiang Xinef317cd2012-09-15 11:17:00 +080010657msgid "use OFS_DELTA objects"
Wang Sheng07432ce2013-01-30 17:23:08 +080010658msgstr "使用 OFS_DELTA 对象"
Jiang Xinef317cd2012-09-15 11:17:00 +080010659
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010660#: builtin/pack-objects.c:2811
Jiang Xinef317cd2012-09-15 11:17:00 +080010661msgid "use threads when searching for best delta matches"
Wang Sheng07432ce2013-01-30 17:23:08 +080010662msgstr "使用线程查询最佳 delta 匹配"
Jiang Xinef317cd2012-09-15 11:17:00 +080010663
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010664#: builtin/pack-objects.c:2813
Jiang Xinef317cd2012-09-15 11:17:00 +080010665msgid "do not create an empty pack output"
Wang Sheng07432ce2013-01-30 17:23:08 +080010666msgstr "不创建空的包输出"
Jiang Xinef317cd2012-09-15 11:17:00 +080010667
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010668#: builtin/pack-objects.c:2815
Jiang Xinef317cd2012-09-15 11:17:00 +080010669msgid "read revision arguments from standard input"
Jiang Xind9d56b22015-01-18 20:37:57 +080010670msgstr "从标准输入读取版本号参数"
Jiang Xinef317cd2012-09-15 11:17:00 +080010671
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010672#: builtin/pack-objects.c:2817
Jiang Xinef317cd2012-09-15 11:17:00 +080010673msgid "limit the objects to those that are not yet packed"
Wang Sheng07432ce2013-01-30 17:23:08 +080010674msgstr "限制那些尚未打包的对象"
Jiang Xinef317cd2012-09-15 11:17:00 +080010675
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010676#: builtin/pack-objects.c:2820
Jiang Xinef317cd2012-09-15 11:17:00 +080010677msgid "include objects reachable from any reference"
Wang Sheng07432ce2013-01-30 17:23:08 +080010678msgstr "包括可以从任何引用访问到的对象"
Jiang Xinef317cd2012-09-15 11:17:00 +080010679
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010680#: builtin/pack-objects.c:2823
Jiang Xinef317cd2012-09-15 11:17:00 +080010681msgid "include objects referred by reflog entries"
Wang Sheng07432ce2013-01-30 17:23:08 +080010682msgstr "包括被引用日志引用到的对象"
Jiang Xinef317cd2012-09-15 11:17:00 +080010683
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010684#: builtin/pack-objects.c:2826
Jiang Xin220c3132014-10-08 10:55:14 +080010685msgid "include objects referred to by the index"
10686msgstr "包括被索引引用到的对象"
10687
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010688#: builtin/pack-objects.c:2829
Jiang Xinef317cd2012-09-15 11:17:00 +080010689msgid "output pack to stdout"
Wang Sheng07432ce2013-01-30 17:23:08 +080010690msgstr "输出包到标准输出"
Jiang Xinef317cd2012-09-15 11:17:00 +080010691
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010692#: builtin/pack-objects.c:2831
Jiang Xinef317cd2012-09-15 11:17:00 +080010693msgid "include tag objects that refer to objects to be packed"
Ray Chen53438e82015-07-27 14:55:00 +080010694msgstr "包括那些引用了待打包对象的标签对象"
Jiang Xinef317cd2012-09-15 11:17:00 +080010695
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010696#: builtin/pack-objects.c:2833
Jiang Xinef317cd2012-09-15 11:17:00 +080010697msgid "keep unreachable objects"
Wang Sheng07432ce2013-01-30 17:23:08 +080010698msgstr "维持不可达的对象"
Jiang Xinef317cd2012-09-15 11:17:00 +080010699
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010700#: builtin/pack-objects.c:2835
Jiang Xin5c57d762016-08-28 10:18:12 +080010701msgid "pack loose unreachable objects"
10702msgstr "打包松散的不可达对象"
10703
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010704#: builtin/pack-objects.c:2837
Jiang Xinef317cd2012-09-15 11:17:00 +080010705msgid "unpack unreachable objects newer than <time>"
Wang Sheng07432ce2013-01-30 17:23:08 +080010706msgstr "将比给定 <时间> 新的无法访问的对象解包"
Jiang Xinef317cd2012-09-15 11:17:00 +080010707
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010708#: builtin/pack-objects.c:2840
Jiang Xinef317cd2012-09-15 11:17:00 +080010709msgid "create thin packs"
Wang Sheng07432ce2013-01-30 17:23:08 +080010710msgstr "创建精简包"
Jiang Xinef317cd2012-09-15 11:17:00 +080010711
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010712#: builtin/pack-objects.c:2842
Jiang Xin04cb2f22015-01-04 12:27:38 +080010713msgid "create packs suitable for shallow fetches"
Jiang Xin160fb2b2015-08-02 21:47:30 +080010714msgstr "创建适合浅克隆仓库获取的包"
Jiang Xin04cb2f22015-01-04 12:27:38 +080010715
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010716#: builtin/pack-objects.c:2844
Jiang Xinef317cd2012-09-15 11:17:00 +080010717msgid "ignore packs that have companion .keep file"
Wang Sheng07432ce2013-01-30 17:23:08 +080010718msgstr "忽略配有 .keep 文件的包"
Jiang Xinef317cd2012-09-15 11:17:00 +080010719
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010720#: builtin/pack-objects.c:2846
Jiang Xinef317cd2012-09-15 11:17:00 +080010721msgid "pack compression level"
Wang Sheng07432ce2013-01-30 17:23:08 +080010722msgstr "打包压缩级别"
Jiang Xinef317cd2012-09-15 11:17:00 +080010723
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010724#: builtin/pack-objects.c:2848
Jiang Xinef317cd2012-09-15 11:17:00 +080010725msgid "do not hide commits by grafts"
Jiang Xincfff71a2014-01-18 11:04:21 +080010726msgstr "显示被嫁接隐藏的提交"
Jiang Xinef317cd2012-09-15 11:17:00 +080010727
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010728#: builtin/pack-objects.c:2850
Jiang Xin6c94aba2014-03-13 12:41:34 +080010729msgid "use a bitmap index if available to speed up counting objects"
10730msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
10731
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010732#: builtin/pack-objects.c:2852
Jiang Xin6c94aba2014-03-13 12:41:34 +080010733msgid "write a bitmap index together with the pack index"
10734msgstr "在建立包索引的同时创建 bitmap 索引"
10735
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010736#: builtin/pack-objects.c:2979
Jiang Xin6c94aba2014-03-13 12:41:34 +080010737msgid "Counting objects"
10738msgstr "对象计数中"
10739
Jiang Xinef317cd2012-09-15 11:17:00 +080010740#: builtin/pack-refs.c:6
Jiang Xin814ff312015-02-16 21:34:19 +080010741msgid "git pack-refs [<options>]"
10742msgstr "git pack-refs [<选项>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010743
10744#: builtin/pack-refs.c:14
10745msgid "pack everything"
Wang Sheng07432ce2013-01-30 17:23:08 +080010746msgstr "打包一切"
Jiang Xinef317cd2012-09-15 11:17:00 +080010747
10748#: builtin/pack-refs.c:15
10749msgid "prune loose refs (default)"
Wang Sheng07432ce2013-01-30 17:23:08 +080010750msgstr "清除松散的引用(默认)"
Jiang Xinef317cd2012-09-15 11:17:00 +080010751
10752#: builtin/prune-packed.c:7
Jiang Xin814ff312015-02-16 21:34:19 +080010753msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
10754msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010755
Jiang Xin220c3132014-10-08 10:55:14 +080010756#: builtin/prune-packed.c:40
Jiang Xin6c94aba2014-03-13 12:41:34 +080010757msgid "Removing duplicate objects"
10758msgstr "正在删除重复对象"
10759
Jiang Xin5bb01d42015-07-14 07:33:09 +080010760#: builtin/prune.c:11
Jiang Xinef317cd2012-09-15 11:17:00 +080010761msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
Wang Sheng07432ce2013-01-30 17:23:08 +080010762msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010763
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010764#: builtin/prune.c:106
Jiang Xinef317cd2012-09-15 11:17:00 +080010765msgid "report pruned objects"
Wang Sheng07432ce2013-01-30 17:23:08 +080010766msgstr "报告清除的对象"
Jiang Xinef317cd2012-09-15 11:17:00 +080010767
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010768#: builtin/prune.c:109
Jiang Xinef317cd2012-09-15 11:17:00 +080010769msgid "expire objects older than <time>"
Wang Sheng07432ce2013-01-30 17:23:08 +080010770msgstr "使早于给定时间的对象过期"
Jiang Xinef317cd2012-09-15 11:17:00 +080010771
Jiang Xin94550ed2015-11-16 07:02:11 +080010772#: builtin/prune.c:123
10773msgid "cannot prune in a precious-objects repo"
10774msgstr "不能在珍品仓库中执行清理操作"
10775
Jiang Xina0b6b242016-10-27 21:53:37 +080010776#: builtin/pull.c:51 builtin/pull.c:53
10777#, c-format
10778msgid "Invalid value for %s: %s"
10779msgstr "%s 的值无效:%s"
10780
10781#: builtin/pull.c:73
Jiang Xin94550ed2015-11-16 07:02:11 +080010782msgid "git pull [<options>] [<repository> [<refspec>...]]"
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010783msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
10784
Jiang Xina0b6b242016-10-27 21:53:37 +080010785#: builtin/pull.c:121
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010786msgid "Options related to merging"
10787msgstr "和合并相关的选项"
10788
Jiang Xina0b6b242016-10-27 21:53:37 +080010789#: builtin/pull.c:124
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010790msgid "incorporate changes by rebasing rather than merging"
10791msgstr "使用变基操作取代合并操作以合入修改"
10792
Jiang Xina0b6b242016-10-27 21:53:37 +080010793#: builtin/pull.c:148 builtin/revert.c:101
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010794msgid "allow fast-forward"
10795msgstr "允许快进式"
10796
Jiang Xina0b6b242016-10-27 21:53:37 +080010797#: builtin/pull.c:157
Jiang Xin5b04ee32016-05-29 20:40:35 +080010798msgid "automatically stash/stash pop before and after rebase"
10799msgstr "自动在变基操作前后执行 stash/stash pop"
10800
Jiang Xina0b6b242016-10-27 21:53:37 +080010801#: builtin/pull.c:173
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010802msgid "Options related to fetching"
10803msgstr "和获取相关的参数"
10804
Jiang Xina0b6b242016-10-27 21:53:37 +080010805#: builtin/pull.c:195
Jiang Xin276ceea2016-02-28 20:35:55 +080010806msgid "number of submodules pulled in parallel"
10807msgstr "并发拉取的子模组的数量"
10808
Jiang Xina0b6b242016-10-27 21:53:37 +080010809#: builtin/pull.c:284
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010810#, c-format
10811msgid "Invalid value for pull.ff: %s"
10812msgstr "pull.ff 的取值无效:%s"
10813
Jiang Xina0b6b242016-10-27 21:53:37 +080010814#: builtin/pull.c:397
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010815msgid ""
10816"There is no candidate for rebasing against among the refs that you just "
10817"fetched."
10818msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
10819
Jiang Xina0b6b242016-10-27 21:53:37 +080010820#: builtin/pull.c:399
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010821msgid ""
10822"There are no candidates for merging among the refs that you just fetched."
10823msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
10824
Jiang Xina0b6b242016-10-27 21:53:37 +080010825#: builtin/pull.c:400
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010826msgid ""
10827"Generally this means that you provided a wildcard refspec which had no\n"
10828"matches on the remote end."
10829msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
10830
Jiang Xina0b6b242016-10-27 21:53:37 +080010831#: builtin/pull.c:403
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010832#, c-format
10833msgid ""
10834"You asked to pull from the remote '%s', but did not specify\n"
10835"a branch. Because this is not the default configured remote\n"
10836"for your current branch, you must specify a branch on the command line."
10837msgstr ""
10838"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
10839"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
10840
Jiang Xina0b6b242016-10-27 21:53:37 +080010841#: builtin/pull.c:408 git-parse-remote.sh:73
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010842msgid "You are not currently on a branch."
10843msgstr "您当前不在一个分支上。"
10844
Jiang Xina0b6b242016-10-27 21:53:37 +080010845#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010846msgid "Please specify which branch you want to rebase against."
10847msgstr "请指定您要变基到哪一个分支。"
10848
Jiang Xina0b6b242016-10-27 21:53:37 +080010849#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010850msgid "Please specify which branch you want to merge with."
10851msgstr "请指定您要合并哪一个分支。"
10852
Jiang Xina0b6b242016-10-27 21:53:37 +080010853#: builtin/pull.c:413 builtin/pull.c:428
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010854msgid "See git-pull(1) for details."
10855msgstr "详见 git-pull(1)。"
10856
Jiang Xina0b6b242016-10-27 21:53:37 +080010857#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
Jiang Xin5b04ee32016-05-29 20:40:35 +080010858#: git-parse-remote.sh:64
10859msgid "<remote>"
10860msgstr "<远程>"
10861
Jiang Xin1a79b2f2017-01-27 22:50:57 +080010862#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
Jiang Xin5b04ee32016-05-29 20:40:35 +080010863#: git-parse-remote.sh:65
10864msgid "<branch>"
10865msgstr "<分支>"
10866
Jiang Xina0b6b242016-10-27 21:53:37 +080010867#: builtin/pull.c:423 git-parse-remote.sh:75
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010868msgid "There is no tracking information for the current branch."
10869msgstr "当前分支没有跟踪信息。"
10870
Jiang Xina0b6b242016-10-27 21:53:37 +080010871#: builtin/pull.c:432 git-parse-remote.sh:95
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010872msgid ""
Jiang Xin5b04ee32016-05-29 20:40:35 +080010873"If you wish to set tracking information for this branch you can do so with:"
10874msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010875
Jiang Xina0b6b242016-10-27 21:53:37 +080010876#: builtin/pull.c:437
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010877#, c-format
10878msgid ""
10879"Your configuration specifies to merge with the ref '%s'\n"
10880"from the remote, but no such ref was fetched."
10881msgstr ""
10882"您的配置中指定要合并远程的引用 '%s',\n"
10883"但是没有获取到这个引用。"
10884
Jiang Xina0b6b242016-10-27 21:53:37 +080010885#: builtin/pull.c:754
Jiang Xin5c57d762016-08-28 10:18:12 +080010886msgid "ignoring --verify-signatures for rebase"
10887msgstr "为变基操作忽略 --verify-signatures"
10888
Jiang Xina0b6b242016-10-27 21:53:37 +080010889#: builtin/pull.c:801
Jiang Xin5b04ee32016-05-29 20:40:35 +080010890msgid "--[no-]autostash option is only valid with --rebase."
10891msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
10892
Jiang Xina0b6b242016-10-27 21:53:37 +080010893#: builtin/pull.c:809
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010894msgid "Updating an unborn branch with changes added to the index."
10895msgstr "更新尚未诞生的分支,变更添加至索引。"
10896
Jiang Xina0b6b242016-10-27 21:53:37 +080010897#: builtin/pull.c:812
10898msgid "pull with rebase"
10899msgstr "变基式拉取"
10900
10901#: builtin/pull.c:813
10902msgid "please commit or stash them."
10903msgstr "请提交或为它们保存进度。"
10904
10905#: builtin/pull.c:838
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010906#, c-format
10907msgid ""
10908"fetch updated the current branch head.\n"
10909"fast-forwarding your working tree from\n"
10910"commit %s."
10911msgstr ""
10912"fetch 更新了当前的分支。快进您的工作区\n"
10913"至提交 %s。"
10914
Jiang Xina0b6b242016-10-27 21:53:37 +080010915#: builtin/pull.c:843
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010916#, c-format
10917msgid ""
10918"Cannot fast-forward your working tree.\n"
10919"After making sure that you saved anything precious from\n"
10920"$ git diff %s\n"
10921"output, run\n"
10922"$ git reset --hard\n"
10923"to recover."
10924msgstr ""
10925"您当前的工作区无法执行快进操作。\n"
10926"首先执行如下命令:\n"
10927"$ git diff %s\n"
10928"以确认所有有用的数据均已保存。然后执行下面的命令\n"
10929"$ git reset --hard\n"
10930"恢复之前的状态。"
10931
Jiang Xina0b6b242016-10-27 21:53:37 +080010932#: builtin/pull.c:858
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010933msgid "Cannot merge multiple branches into empty head."
10934msgstr "无法将多个分支合并到空分支。"
10935
Jiang Xina0b6b242016-10-27 21:53:37 +080010936#: builtin/pull.c:862
Jiang Xin1b7f4a32015-08-23 15:23:21 +080010937msgid "Cannot rebase onto multiple branches."
10938msgstr "无法变基到多个分支。"
10939
Jiang Xin89f80d72015-12-22 23:06:59 +080010940#: builtin/push.c:16
Jiang Xinef317cd2012-09-15 11:17:00 +080010941msgid "git push [<options>] [<repository> [<refspec>...]]"
Jiang Xin160fb2b2015-08-02 21:47:30 +080010942msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
Jiang Xinef317cd2012-09-15 11:17:00 +080010943
Jiang Xin276ceea2016-02-28 20:35:55 +080010944#: builtin/push.c:89
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010945msgid "tag shorthand without <tag>"
Ray Chen55a16ee2015-07-28 12:52:28 +080010946msgstr "标签后面未提供 <标签> 参数"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010947
Jiang Xin276ceea2016-02-28 20:35:55 +080010948#: builtin/push.c:99
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010949msgid "--delete only accepts plain target ref names"
Jiang Xin90e6ef52012-03-27 14:46:11 +080010950msgstr "--delete 只接受简单的目标引用名"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010951
Jiang Xin276ceea2016-02-28 20:35:55 +080010952#: builtin/push.c:143
Jiang Xin8ada9592012-05-21 09:35:47 +080010953msgid ""
10954"\n"
10955"To choose either option permanently, see push.default in 'git help config'."
10956msgstr ""
Jiang Xin81809b92012-05-30 12:19:47 +080010957"\n"
10958"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
Jiang Xin8ada9592012-05-21 09:35:47 +080010959
Jiang Xin276ceea2016-02-28 20:35:55 +080010960#: builtin/push.c:146
Jiang Xin8ada9592012-05-21 09:35:47 +080010961#, c-format
10962msgid ""
10963"The upstream branch of your current branch does not match\n"
10964"the name of your current branch. To push to the upstream branch\n"
10965"on the remote, use\n"
10966"\n"
10967" git push %s HEAD:%s\n"
10968"\n"
10969"To push to the branch of the same name on the remote, use\n"
10970"\n"
10971" git push %s %s\n"
10972"%s"
10973msgstr ""
Jiang Xin81809b92012-05-30 12:19:47 +080010974"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
10975"上游分支,使用\n"
10976"\n"
10977" git push %s HEAD:%s\n"
10978"\n"
10979"为推送至远程同名分支,使用\n"
10980"\n"
10981" git push %s %s\n"
10982"%s"
Jiang Xin8ada9592012-05-21 09:35:47 +080010983
Jiang Xin276ceea2016-02-28 20:35:55 +080010984#: builtin/push.c:161
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010985#, c-format
10986msgid ""
10987"You are not currently on a branch.\n"
10988"To push the history leading to the current (detached HEAD)\n"
10989"state now, use\n"
10990"\n"
10991" git push %s HEAD:<name-of-remote-branch>\n"
10992msgstr ""
10993"您当前不在一个分支上。\n"
Jiang Xin90e6ef52012-03-27 14:46:11 +080010994"现在为推送当前(分离头指针)的历史,使用\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010995"\n"
Jiang Xind9d56b22015-01-18 20:37:57 +080010996" git push %s HEAD:<远程分支名字>\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010997
Jiang Xin276ceea2016-02-28 20:35:55 +080010998#: builtin/push.c:175
Jiang Xinc04f5ac2012-02-13 14:41:59 +080010999#, c-format
11000msgid ""
11001"The current branch %s has no upstream branch.\n"
11002"To push the current branch and set the remote as upstream, use\n"
11003"\n"
11004" git push --set-upstream %s %s\n"
11005msgstr ""
11006"当前分支 %s 没有对应的上游分支。\n"
11007"为推送当前分支并建立与远程上游的跟踪,使用\n"
11008"\n"
11009" git push --set-upstream %s %s\n"
11010
Jiang Xin276ceea2016-02-28 20:35:55 +080011011#: builtin/push.c:183
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011012#, c-format
11013msgid "The current branch %s has multiple upstream branches, refusing to push."
11014msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
11015
Jiang Xin276ceea2016-02-28 20:35:55 +080011016#: builtin/push.c:186
Jiang Xin73a60cd2012-04-28 22:42:41 +080011017#, c-format
11018msgid ""
11019"You are pushing to remote '%s', which is not the upstream of\n"
11020"your current branch '%s', without telling me what to push\n"
11021"to update which remote branch."
11022msgstr ""
11023"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
11024"而没有告诉我要推送什么、更新哪个远程分支。"
11025
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011026#: builtin/push.c:245
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011027msgid ""
11028"You didn't specify any refspecs to push, and push.default is \"nothing\"."
Jiang Xin160fb2b2015-08-02 21:47:30 +080011029msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011030
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011031#: builtin/push.c:252
Jiang Xin170e9892012-04-30 00:06:55 +080011032msgid ""
11033"Updates were rejected because the tip of your current branch is behind\n"
Jiang Xin2e8451e2013-07-26 14:00:02 +080011034"its remote counterpart. Integrate the remote changes (e.g.\n"
11035"'git pull ...') before pushing again.\n"
Jiang Xin170e9892012-04-30 00:06:55 +080011036"See the 'Note about fast-forwards' in 'git push --help' for details."
11037msgstr ""
Jiang Xineff6d3a2012-05-15 11:53:26 +080011038"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
Jiang Xin2e8451e2013-07-26 14:00:02 +080011039"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
Jiang Xineff6d3a2012-05-15 11:53:26 +080011040"'git push --help' 中的 'Note about fast-forwards' 小节。"
Jiang Xin170e9892012-04-30 00:06:55 +080011041
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011042#: builtin/push.c:258
Jiang Xin170e9892012-04-30 00:06:55 +080011043msgid ""
11044"Updates were rejected because a pushed branch tip is behind its remote\n"
Jiang Xin2e8451e2013-07-26 14:00:02 +080011045"counterpart. Check out this branch and integrate the remote changes\n"
11046"(e.g. 'git pull ...') before pushing again.\n"
Jiang Xin170e9892012-04-30 00:06:55 +080011047"See the 'Note about fast-forwards' in 'git push --help' for details."
11048msgstr ""
Jiang Xineff6d3a2012-05-15 11:53:26 +080011049"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
Jiang Xin2e8451e2013-07-26 14:00:02 +080011050"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
Jiang Xineff6d3a2012-05-15 11:53:26 +080011051"'git push --help' 中的 'Note about fast-forwards' 小节。"
Jiang Xin170e9892012-04-30 00:06:55 +080011052
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011053#: builtin/push.c:264
Wang Sheng07432ce2013-01-30 17:23:08 +080011054msgid ""
Jiang Xina77c07d2013-02-14 17:47:45 +080011055"Updates were rejected because the remote contains work that you do\n"
11056"not have locally. This is usually caused by another repository pushing\n"
Jiang Xin2e8451e2013-07-26 14:00:02 +080011057"to the same ref. You may want to first integrate the remote changes\n"
11058"(e.g., 'git pull ...') before pushing again.\n"
Jiang Xina77c07d2013-02-14 17:47:45 +080011059"See the 'Note about fast-forwards' in 'git push --help' for details."
11060msgstr ""
Jiang Xin160fb2b2015-08-02 21:47:30 +080011061"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
11062"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
Jiang Xin2e8451e2013-07-26 14:00:02 +080011063"(如 'git pull ...')。\n"
Jiang Xina77c07d2013-02-14 17:47:45 +080011064"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
Wang Sheng07432ce2013-01-30 17:23:08 +080011065
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011066#: builtin/push.c:271
Jiang Xina77c07d2013-02-14 17:47:45 +080011067msgid "Updates were rejected because the tag already exists in the remote."
Ray Chen55a16ee2015-07-28 12:52:28 +080011068msgstr "更新被拒绝,因为该标签在远程已经存在。"
Jiang Xina77c07d2013-02-14 17:47:45 +080011069
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011070#: builtin/push.c:274
Jiang Xina77c07d2013-02-14 17:47:45 +080011071msgid ""
11072"You cannot update a remote ref that points at a non-commit object,\n"
11073"or update a remote ref to make it point at a non-commit object,\n"
11074"without using the '--force' option.\n"
11075msgstr ""
11076"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
11077"也不能更新远程引用让其指向一个非提交对象。\n"
11078
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011079#: builtin/push.c:334
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011080#, c-format
11081msgid "Pushing to %s\n"
11082msgstr "推送到 %s\n"
11083
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011084#: builtin/push.c:338
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011085#, c-format
11086msgid "failed to push some refs to '%s'"
11087msgstr "无法推送一些引用到 '%s'"
11088
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011089#: builtin/push.c:369
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011090#, c-format
11091msgid "bad repository '%s'"
Jiang Xin160fb2b2015-08-02 21:47:30 +080011092msgstr "坏的仓库 '%s'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011093
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011094#: builtin/push.c:370
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011095msgid ""
11096"No configured push destination.\n"
11097"Either specify the URL from the command-line or configure a remote "
11098"repository using\n"
11099"\n"
11100" git remote add <name> <url>\n"
11101"\n"
11102"and then push using the remote name\n"
11103"\n"
11104" git push <name>\n"
11105msgstr ""
Jiang Xin90e6ef52012-03-27 14:46:11 +080011106"没有配置推送目标。\n"
Ray Chen4375c102015-08-10 18:03:29 +080011107"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011108"\n"
Jiang Xind9d56b22015-01-18 20:37:57 +080011109" git remote add <名称> <地址>\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011110"\n"
Jiang Xin160fb2b2015-08-02 21:47:30 +080011111"然后使用该远程仓库名执行推送\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011112"\n"
Jiang Xind9d56b22015-01-18 20:37:57 +080011113" git push <名称>\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011114
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011115#: builtin/push.c:388
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011116msgid "--all and --tags are incompatible"
11117msgstr "--all 和 --tags 不兼容"
11118
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011119#: builtin/push.c:389
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011120msgid "--all can't be combined with refspecs"
Jiang Xin160fb2b2015-08-02 21:47:30 +080011121msgstr "--all 不能和引用规格同时使用"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011122
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011123#: builtin/push.c:394
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011124msgid "--mirror and --tags are incompatible"
11125msgstr "--mirror 和 --tags 不兼容"
11126
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011127#: builtin/push.c:395
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011128msgid "--mirror can't be combined with refspecs"
Jiang Xin160fb2b2015-08-02 21:47:30 +080011129msgstr "--mirror 不能和引用规格同时使用"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011130
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011131#: builtin/push.c:400
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011132msgid "--all and --mirror are incompatible"
11133msgstr "--all 和 --mirror 不兼容"
11134
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011135#: builtin/push.c:518
Wang Sheng07432ce2013-01-30 17:23:08 +080011136msgid "repository"
Jiang Xin160fb2b2015-08-02 21:47:30 +080011137msgstr "仓库"
Wang Sheng07432ce2013-01-30 17:23:08 +080011138
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011139#: builtin/push.c:519 builtin/send-pack.c:161
Wang Sheng07432ce2013-01-30 17:23:08 +080011140msgid "push all refs"
11141msgstr "推送所有引用"
11142
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011143#: builtin/push.c:520 builtin/send-pack.c:163
Wang Sheng07432ce2013-01-30 17:23:08 +080011144msgid "mirror all refs"
11145msgstr "镜像所有引用"
11146
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011147#: builtin/push.c:522
Wang Sheng07432ce2013-01-30 17:23:08 +080011148msgid "delete refs"
11149msgstr "删除引用"
11150
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011151#: builtin/push.c:523
Wang Sheng07432ce2013-01-30 17:23:08 +080011152msgid "push tags (can't be used with --all or --mirror)"
Ray Chen55a16ee2015-07-28 12:52:28 +080011153msgstr "推送标签(不能使用 --all or --mirror)"
Wang Sheng07432ce2013-01-30 17:23:08 +080011154
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011155#: builtin/push.c:526 builtin/send-pack.c:164
Jiang Xinef317cd2012-09-15 11:17:00 +080011156msgid "force updates"
11157msgstr "强制更新"
11158
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011159#: builtin/push.c:528 builtin/send-pack.c:175
Jiang Xin90314792013-09-17 23:37:05 +080011160msgid "refname>:<expect"
11161msgstr "引用名>:<期望值"
11162
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011163#: builtin/push.c:529 builtin/send-pack.c:176
Jiang Xin90314792013-09-17 23:37:05 +080011164msgid "require old value of ref to be at this value"
11165msgstr "要求引用旧的取值为设定值"
11166
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011167#: builtin/push.c:532
Wang Sheng07432ce2013-01-30 17:23:08 +080011168msgid "control recursive pushing of submodules"
11169msgstr "控制子模组的递归推送"
Jiang Xinef317cd2012-09-15 11:17:00 +080011170
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011171#: builtin/push.c:534 builtin/send-pack.c:169
Wang Sheng07432ce2013-01-30 17:23:08 +080011172msgid "use thin pack"
11173msgstr "使用精简打包"
11174
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011175#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158
Jiang Xin1b7f4a32015-08-23 15:23:21 +080011176#: builtin/send-pack.c:159
Wang Sheng07432ce2013-01-30 17:23:08 +080011177msgid "receive pack program"
11178msgstr "接收包程序"
11179
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011180#: builtin/push.c:537
Wang Sheng07432ce2013-01-30 17:23:08 +080011181msgid "set upstream for git pull/status"
11182msgstr "设置 git pull/status 的上游"
11183
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011184#: builtin/push.c:540
Wang Sheng07432ce2013-01-30 17:23:08 +080011185msgid "prune locally removed refs"
11186msgstr "清除本地删除的引用"
11187
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011188#: builtin/push.c:542
Jiang Xina77c07d2013-02-14 17:47:45 +080011189msgid "bypass pre-push hook"
11190msgstr "绕过 pre-push 钩子"
11191
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011192#: builtin/push.c:543
Jiang Xin1003b3a2013-04-11 17:55:09 +080011193msgid "push missing but relevant tags"
Ray Chen55a16ee2015-07-28 12:52:28 +080011194msgstr "推送缺失但有关的标签"
Jiang Xin1003b3a2013-04-11 17:55:09 +080011195
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011196#: builtin/push.c:546 builtin/send-pack.c:166
Jiang Xin220c3132014-10-08 10:55:14 +080011197msgid "GPG sign the push"
11198msgstr "用 GPG 为推送签名"
11199
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011200#: builtin/push.c:548 builtin/send-pack.c:170
Jiang Xin814ff312015-02-16 21:34:19 +080011201msgid "request atomic transaction on remote side"
11202msgstr "需要远端支持原子事务"
11203
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011204#: builtin/push.c:549
Jiang Xin5c57d762016-08-28 10:18:12 +080011205msgid "server-specific"
11206msgstr "server-specific"
11207
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011208#: builtin/push.c:549
Jiang Xin5c57d762016-08-28 10:18:12 +080011209msgid "option to transmit"
Ray Chen9a4b6942016-09-07 18:03:04 +080011210msgstr "传输选项"
Jiang Xin5c57d762016-08-28 10:18:12 +080011211
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011212#: builtin/push.c:563
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011213msgid "--delete is incompatible with --all, --mirror and --tags"
11214msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
11215
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011216#: builtin/push.c:565
Jiang Xinc04f5ac2012-02-13 14:41:59 +080011217msgid "--delete doesn't make sense without any refs"
11218msgstr "--delete 未接任何引用没有意义"
11219
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011220#: builtin/push.c:584
Jiang Xin5c57d762016-08-28 10:18:12 +080011221msgid "push options must not have new line characters"
11222msgstr "推送选项不能有换行符"
11223
Jiang Xin220c3132014-10-08 10:55:14 +080011224#: builtin/read-tree.c:37
Jiang Xinef317cd2012-09-15 11:17:00 +080011225msgid ""
Jiang Xin1b7f4a32015-08-23 15:23:21 +080011226"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
Jiang Xinef317cd2012-09-15 11:17:00 +080011227"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
11228"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
11229msgstr ""
Jiang Xin1b7f4a32015-08-23 15:23:21 +080011230"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
Wang Sheng07432ce2013-01-30 17:23:08 +080011231"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
Jiang Xin1b7f4a32015-08-23 15:23:21 +080011232"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
Jiang Xinef317cd2012-09-15 11:17:00 +080011233
Jiang Xin220c3132014-10-08 10:55:14 +080011234#: builtin/read-tree.c:110
Jiang Xinef317cd2012-09-15 11:17:00 +080011235msgid "write resulting index to <file>"
Jiang Xind9d56b22015-01-18 20:37:57 +080011236msgstr "将索引结果写入 <文件>"
Jiang Xinef317cd2012-09-15 11:17:00 +080011237
Jiang Xin220c3132014-10-08 10:55:14 +080011238#: builtin/read-tree.c:113
Jiang Xinef317cd2012-09-15 11:17:00 +080011239msgid "only empty the index"
Wang Sheng07432ce2013-01-30 17:23:08 +080011240msgstr "只是清空索引"
Jiang Xinef317cd2012-09-15 11:17:00 +080011241
Jiang Xin220c3132014-10-08 10:55:14 +080011242#: builtin/read-tree.c:115
Jiang Xinef317cd2012-09-15 11:17:00 +080011243msgid "Merging"
Wang Sheng07432ce2013-01-30 17:23:08 +080011244msgstr "合并"
Jiang Xinef317cd2012-09-15 11:17:00 +080011245
Jiang Xin220c3132014-10-08 10:55:14 +080011246#: builtin/read-tree.c:117
Jiang Xinef317cd2012-09-15 11:17:00 +080011247msgid "perform a merge in addition to a read"
Wang Sheng07432ce2013-01-30 17:23:08 +080011248msgstr "读取之余再执行一个合并"
Jiang Xinef317cd2012-09-15 11:17:00 +080011249
Jiang Xin220c3132014-10-08 10:55:14 +080011250#: builtin/read-tree.c:119
Jiang Xinef317cd2012-09-15 11:17:00 +080011251msgid "3-way merge if no file level merging required"
Jiang Xin160fb2b2015-08-02 21:47:30 +080011252msgstr "如果没有文件级合并需要,执行三方合并"
Jiang Xinef317cd2012-09-15 11:17:00 +080011253
Jiang Xin220c3132014-10-08 10:55:14 +080011254#: builtin/read-tree.c:121
Jiang Xinef317cd2012-09-15 11:17:00 +080011255msgid "3-way merge in presence of adds and removes"
Jiang Xin160fb2b2015-08-02 21:47:30 +080011256msgstr "存在添加和删除时,也执行三方合并"
Jiang Xinef317cd2012-09-15 11:17:00 +080011257
Jiang Xin220c3132014-10-08 10:55:14 +080011258#: builtin/read-tree.c:123
Jiang Xinef317cd2012-09-15 11:17:00 +080011259msgid "same as -m, but discard unmerged entries"
Wang Sheng07432ce2013-01-30 17:23:08 +080011260msgstr "类似于 -m,但丢弃未合并的条目"
Jiang Xinef317cd2012-09-15 11:17:00 +080011261
Jiang Xin220c3132014-10-08 10:55:14 +080011262#: builtin/read-tree.c:124
Jiang Xinef317cd2012-09-15 11:17:00 +080011263msgid "<subdirectory>/"
Wang Sheng07432ce2013-01-30 17:23:08 +080011264msgstr "<子目录>/"
Jiang Xinef317cd2012-09-15 11:17:00 +080011265
Jiang Xin220c3132014-10-08 10:55:14 +080011266#: builtin/read-tree.c:125
Jiang Xinef317cd2012-09-15 11:17:00 +080011267msgid "read the tree into the index under <subdirectory>/"
Wang Sheng07432ce2013-01-30 17:23:08 +080011268msgstr "读取树对象到索引的 <子目录>/ 下"
Jiang Xinef317cd2012-09-15 11:17:00 +080011269
Jiang Xin220c3132014-10-08 10:55:14 +080011270#: builtin/read-tree.c:128
Jiang Xinef317cd2012-09-15 11:17:00 +080011271msgid "update working tree with merge result"
Wang Sheng07432ce2013-01-30 17:23:08 +080011272msgstr "用合并的结果更新工作区"
Jiang Xinef317cd2012-09-15 11:17:00 +080011273
Jiang Xin220c3132014-10-08 10:55:14 +080011274#: builtin/read-tree.c:130
Jiang Xinef317cd2012-09-15 11:17:00 +080011275msgid "gitignore"
Wang Sheng07432ce2013-01-30 17:23:08 +080011276msgstr "gitignore"
Jiang Xinef317cd2012-09-15 11:17:00 +080011277
Jiang Xin220c3132014-10-08 10:55:14 +080011278#: builtin/read-tree.c:131
Jiang Xinef317cd2012-09-15 11:17:00 +080011279msgid "allow explicitly ignored files to be overwritten"
Wang Sheng07432ce2013-01-30 17:23:08 +080011280msgstr "允许忽略文件中设定的文件可以被覆盖"
Jiang Xinef317cd2012-09-15 11:17:00 +080011281
Jiang Xin220c3132014-10-08 10:55:14 +080011282#: builtin/read-tree.c:134
Jiang Xinef317cd2012-09-15 11:17:00 +080011283msgid "don't check the working tree after merging"
Wang Sheng07432ce2013-01-30 17:23:08 +080011284msgstr "合并后不检查工作区"
Jiang Xinef317cd2012-09-15 11:17:00 +080011285
Jiang Xin220c3132014-10-08 10:55:14 +080011286#: builtin/read-tree.c:135
Jiang Xinef317cd2012-09-15 11:17:00 +080011287msgid "don't update the index or the work tree"
Wang Sheng07432ce2013-01-30 17:23:08 +080011288msgstr "不更新索引区和工作区"
Jiang Xinef317cd2012-09-15 11:17:00 +080011289
Jiang Xin220c3132014-10-08 10:55:14 +080011290#: builtin/read-tree.c:137
Jiang Xinef317cd2012-09-15 11:17:00 +080011291msgid "skip applying sparse checkout filter"
Wang Sheng07432ce2013-01-30 17:23:08 +080011292msgstr "跳过应用稀疏检出过滤器"
Jiang Xinef317cd2012-09-15 11:17:00 +080011293
Jiang Xin220c3132014-10-08 10:55:14 +080011294#: builtin/read-tree.c:139
Jiang Xinef317cd2012-09-15 11:17:00 +080011295msgid "debug unpack-trees"
Wang Sheng07432ce2013-01-30 17:23:08 +080011296msgstr "调试 unpack-trees"
Jiang Xinef317cd2012-09-15 11:17:00 +080011297
Jiang Xina0b6b242016-10-27 21:53:37 +080011298#: builtin/receive-pack.c:26
Jiang Xin5b04ee32016-05-29 20:40:35 +080011299msgid "git receive-pack <git-dir>"
11300msgstr "git receive-pack <git-dir>"
11301
Jiang Xina0b6b242016-10-27 21:53:37 +080011302#: builtin/receive-pack.c:793
11303msgid ""
11304"By default, updating the current branch in a non-bare repository\n"
11305"is denied, because it will make the index and work tree inconsistent\n"
11306"with what you pushed, and will require 'git reset --hard' to match\n"
11307"the work tree to HEAD.\n"
11308"\n"
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011309"You can set the 'receive.denyCurrentBranch' configuration variable\n"
11310"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
Jiang Xina0b6b242016-10-27 21:53:37 +080011311"its current branch; however, this is not recommended unless you\n"
11312"arranged to update its work tree to match what you pushed in some\n"
11313"other way.\n"
11314"\n"
11315"To squelch this message and still keep the default behaviour, set\n"
11316"'receive.denyCurrentBranch' configuration variable to 'refuse'."
11317msgstr ""
11318"默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
11319"不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
11320"\n"
11321"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
11322"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
11323"用某种方式将其工作区更新至您推送的状态。\n"
11324"\n"
11325"若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
11326"配置变量为 'refuse'。"
11327
11328#: builtin/receive-pack.c:813
11329msgid ""
11330"By default, deleting the current branch is denied, because the next\n"
11331"'git clone' won't result in any file checked out, causing confusion.\n"
11332"\n"
11333"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
11334"'warn' or 'ignore' in the remote repository to allow deleting the\n"
11335"current branch, with or without a warning message.\n"
11336"\n"
11337"To squelch this message, you can set it to 'refuse'."
11338msgstr ""
11339"默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
Ray Chen29004bb2016-12-28 17:08:45 +080011340"导致困惑。\n"
Jiang Xina0b6b242016-10-27 21:53:37 +080011341"\n"
11342"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
Ray Chen29004bb2016-12-28 17:08:45 +080011343"'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
Jiang Xina0b6b242016-10-27 21:53:37 +080011344"\n"
11345"若要屏蔽此信息,您可以设置它为 'refuse'。"
11346
11347#: builtin/receive-pack.c:1883
Jiang Xin5b04ee32016-05-29 20:40:35 +080011348msgid "quiet"
11349msgstr "静默模式"
11350
Jiang Xina0b6b242016-10-27 21:53:37 +080011351#: builtin/receive-pack.c:1897
Jiang Xin5b04ee32016-05-29 20:40:35 +080011352msgid "You must specify a directory."
11353msgstr "您必须指定一个目录。"
11354
Jiang Xin276ceea2016-02-28 20:35:55 +080011355#: builtin/reflog.c:423
Jiang Xin2e8451e2013-07-26 14:00:02 +080011356#, c-format
Jiang Xin1b7f4a32015-08-23 15:23:21 +080011357msgid "'%s' for '%s' is not a valid timestamp"
Jiang Xin2e8451e2013-07-26 14:00:02 +080011358msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
11359
Jiang Xin276ceea2016-02-28 20:35:55 +080011360#: builtin/reflog.c:540 builtin/reflog.c:545
Jiang Xin2e8451e2013-07-26 14:00:02 +080011361#, c-format
11362msgid "'%s' is not a valid timestamp"
11363msgstr "'%s' 不是一个有效的时间戳"
11364
Jiang Xincfff71a2014-01-18 11:04:21 +080011365#: builtin/remote.c:12
Jiang Xinef317cd2012-09-15 11:17:00 +080011366msgid "git remote [-v | --verbose]"
Wang Sheng07432ce2013-01-30 17:23:08 +080011367msgstr "git remote [-v | --verbose]"
Jiang Xinef317cd2012-09-15 11:17:00 +080011368
Jiang Xincfff71a2014-01-18 11:04:21 +080011369#: builtin/remote.c:13
Jiang Xinef317cd2012-09-15 11:17:00 +080011370msgid ""
Jiang Xin814ff312015-02-16 21:34:19 +080011371"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
Jiang Xinef317cd2012-09-15 11:17:00 +080011372"mirror=<fetch|push>] <name> <url>"
11373msgstr ""
Jiang Xin814ff312015-02-16 21:34:19 +080011374"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
Jiang Xind9d56b22015-01-18 20:37:57 +080011375"mirror=<fetch|push>] <名称> <地址>"
Jiang Xinef317cd2012-09-15 11:17:00 +080011376
Jiang Xin94550ed2015-11-16 07:02:11 +080011377#: builtin/remote.c:14 builtin/remote.c:34
Jiang Xinef317cd2012-09-15 11:17:00 +080011378msgid "git remote rename <old> <new>"
Wang Sheng07432ce2013-01-30 17:23:08 +080011379msgstr "git remote rename <旧名称> <新名称>"
Jiang Xinef317cd2012-09-15 11:17:00 +080011380
Jiang Xin94550ed2015-11-16 07:02:11 +080011381#: builtin/remote.c:15 builtin/remote.c:39
Jiang Xinef317cd2012-09-15 11:17:00 +080011382msgid "git remote remove <name>"
Wang Sheng07432ce2013-01-30 17:23:08 +080011383msgstr "git remote remove <名称>"
Jiang Xinef317cd2012-09-15 11:17:00 +080011384
Jiang Xin94550ed2015-11-16 07:02:11 +080011385#: builtin/remote.c:16 builtin/remote.c:44
Jiang Xin814ff312015-02-16 21:34:19 +080011386msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
11387msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
Jiang Xinef317cd2012-09-15 11:17:00 +080011388
Jiang Xincfff71a2014-01-18 11:04:21 +080011389#: builtin/remote.c:17
Jiang Xinef317cd2012-09-15 11:17:00 +080011390msgid "git remote [-v | --verbose] show [-n] <name>"
Wang Sheng07432ce2013-01-30 17:23:08 +080011391msgstr "git remote [-v | --verbose] show [-n] <名称>"
Jiang Xinef317cd2012-09-15 11:17:00 +080011392
Jiang Xincfff71a2014-01-18 11:04:21 +080011393#: builtin/remote.c:18
Jiang Xinef317cd2012-09-15 11:17:00 +080011394msgid "git remote prune [-n | --dry-run] <name>"
Wang Sheng07432ce2013-01-30 17:23:08 +080011395msgstr "git remote prune [-n | --dry-run] <名称>"
Jiang Xinef317cd2012-09-15 11:17:00 +080011396
Jiang Xincfff71a2014-01-18 11:04:21 +080011397#: builtin/remote.c:19
Jiang Xinef317cd2012-09-15 11:17:00 +080011398msgid ""
11399"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
Wang Sheng07432ce2013-01-30 17:23:08 +080011400msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
Jiang Xinef317cd2012-09-15 11:17:00 +080011401
Jiang Xincfff71a2014-01-18 11:04:21 +080011402#: builtin/remote.c:20
Jiang Xinef317cd2012-09-15 11:17:00 +080011403msgid "git remote set-branches [--add] <name> <branch>..."
Wang Sheng07432ce2013-01-30 17:23:08 +080011404msgstr "git remote set-branches [--add] <名称> <分支>..."
Jiang Xinef317cd2012-09-15 11:17:00 +080011405
Jiang Xin94550ed2015-11-16 07:02:11 +080011406#: builtin/remote.c:21 builtin/remote.c:70
11407msgid "git remote get-url [--push] [--all] <name>"
11408msgstr "git remote get-url [--push] [--all] <名称>"
11409
11410#: builtin/remote.c:22 builtin/remote.c:75
Jiang Xinef317cd2012-09-15 11:17:00 +080011411msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
Wang Sheng07432ce2013-01-30 17:23:08 +080011412msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080011413
Jiang Xin94550ed2015-11-16 07:02:11 +080011414#: builtin/remote.c:23 builtin/remote.c:76
Jiang Xinef317cd2012-09-15 11:17:00 +080011415msgid "git remote set-url --add <name> <newurl>"
Wang Sheng07432ce2013-01-30 17:23:08 +080011416msgstr "git remote set-url --add <名称> <新的地址>"
Jiang Xinef317cd2012-09-15 11:17:00 +080011417
Jiang Xin94550ed2015-11-16 07:02:11 +080011418#: builtin/remote.c:24 builtin/remote.c:77
Jiang Xinef317cd2012-09-15 11:17:00 +080011419msgid "git remote set-url --delete <name> <url>"
Wang Sheng07432ce2013-01-30 17:23:08 +080011420msgstr "git remote set-url --delete <名称> <地址>"
Jiang Xinef317cd2012-09-15 11:17:00 +080011421
Jiang Xin94550ed2015-11-16 07:02:11 +080011422#: builtin/remote.c:29
Jiang Xinef317cd2012-09-15 11:17:00 +080011423msgid "git remote add [<options>] <name> <url>"
Wang Sheng07432ce2013-01-30 17:23:08 +080011424msgstr "git remote add [<选项>] <名称> <地址>"
Jiang Xinef317cd2012-09-15 11:17:00 +080011425
Jiang Xin94550ed2015-11-16 07:02:11 +080011426#: builtin/remote.c:49
Jiang Xinef317cd2012-09-15 11:17:00 +080011427msgid "git remote set-branches <name> <branch>..."
Wang Sheng07432ce2013-01-30 17:23:08 +080011428msgstr "git remote set-branches <名称> <分支>..."
Jiang Xinef317cd2012-09-15 11:17:00 +080011429
Jiang Xin94550ed2015-11-16 07:02:11 +080011430#: builtin/remote.c:50
Jiang Xinef317cd2012-09-15 11:17:00 +080011431msgid "git remote set-branches --add <name> <branch>..."
Wang Sheng07432ce2013-01-30 17:23:08 +080011432msgstr "git remote set-branches --add <名称> <分支>..."
Jiang Xinef317cd2012-09-15 11:17:00 +080011433
Jiang Xin94550ed2015-11-16 07:02:11 +080011434#: builtin/remote.c:55
Jiang Xinef317cd2012-09-15 11:17:00 +080011435msgid "git remote show [<options>] <name>"
Wang Sheng07432ce2013-01-30 17:23:08 +080011436msgstr "git remote show [<选项>] <名称>"
Jiang Xinef317cd2012-09-15 11:17:00 +080011437
Jiang Xin94550ed2015-11-16 07:02:11 +080011438#: builtin/remote.c:60
Jiang Xinef317cd2012-09-15 11:17:00 +080011439msgid "git remote prune [<options>] <name>"
Wang Sheng07432ce2013-01-30 17:23:08 +080011440msgstr "git remote prune [<选项>] <名称>"
Jiang Xinef317cd2012-09-15 11:17:00 +080011441
Jiang Xin94550ed2015-11-16 07:02:11 +080011442#: builtin/remote.c:65
Jiang Xinef317cd2012-09-15 11:17:00 +080011443msgid "git remote update [<options>] [<group> | <remote>]..."
Wang Sheng07432ce2013-01-30 17:23:08 +080011444msgstr "git remote update [<选项>] [<组> | <远程>]..."
Jiang Xinef317cd2012-09-15 11:17:00 +080011445
Jiang Xin94550ed2015-11-16 07:02:11 +080011446#: builtin/remote.c:94
Jiang Xin81809b92012-05-30 12:19:47 +080011447#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011448msgid "Updating %s"
Jiang Xin81809b92012-05-30 12:19:47 +080011449msgstr "更新 %s 中"
Jiang Xin8ada9592012-05-21 09:35:47 +080011450
Jiang Xin94550ed2015-11-16 07:02:11 +080011451#: builtin/remote.c:126
Jiang Xin8ada9592012-05-21 09:35:47 +080011452msgid ""
11453"--mirror is dangerous and deprecated; please\n"
11454"\t use --mirror=fetch or --mirror=push instead"
11455msgstr ""
Jiang Xin81809b92012-05-30 12:19:47 +080011456"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
11457"\t 或 --mirror=push"
Jiang Xin8ada9592012-05-21 09:35:47 +080011458
Jiang Xin94550ed2015-11-16 07:02:11 +080011459#: builtin/remote.c:143
Jiang Xin81809b92012-05-30 12:19:47 +080011460#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011461msgid "unknown mirror argument: %s"
Jiang Xin81809b92012-05-30 12:19:47 +080011462msgstr "未知的镜像参数:%s"
Jiang Xin8ada9592012-05-21 09:35:47 +080011463
Jiang Xin94550ed2015-11-16 07:02:11 +080011464#: builtin/remote.c:159
Jiang Xinef317cd2012-09-15 11:17:00 +080011465msgid "fetch the remote branches"
Wang Sheng07432ce2013-01-30 17:23:08 +080011466msgstr "抓取远程的分支"
Jiang Xinef317cd2012-09-15 11:17:00 +080011467
Jiang Xin94550ed2015-11-16 07:02:11 +080011468#: builtin/remote.c:161
Jiang Xinef317cd2012-09-15 11:17:00 +080011469msgid "import all tags and associated objects when fetching"
Ray Chen55a16ee2015-07-28 12:52:28 +080011470msgstr "抓取时导入所有的标签和关联对象"
Jiang Xinef317cd2012-09-15 11:17:00 +080011471
Jiang Xin94550ed2015-11-16 07:02:11 +080011472#: builtin/remote.c:164
Jiang Xinef317cd2012-09-15 11:17:00 +080011473msgid "or do not fetch any tag at all (--no-tags)"
Ray Chen55a16ee2015-07-28 12:52:28 +080011474msgstr "或不抓取任何标签(--no-tags)"
Jiang Xinef317cd2012-09-15 11:17:00 +080011475
Jiang Xin94550ed2015-11-16 07:02:11 +080011476#: builtin/remote.c:166
Jiang Xinef317cd2012-09-15 11:17:00 +080011477msgid "branch(es) to track"
Wang Sheng07432ce2013-01-30 17:23:08 +080011478msgstr "跟踪的分支"
Jiang Xinef317cd2012-09-15 11:17:00 +080011479
Jiang Xin94550ed2015-11-16 07:02:11 +080011480#: builtin/remote.c:167
Jiang Xinef317cd2012-09-15 11:17:00 +080011481msgid "master branch"
Wang Sheng07432ce2013-01-30 17:23:08 +080011482msgstr "主线分支"
Jiang Xinef317cd2012-09-15 11:17:00 +080011483
Jiang Xin94550ed2015-11-16 07:02:11 +080011484#: builtin/remote.c:168
Jiang Xinef317cd2012-09-15 11:17:00 +080011485msgid "push|fetch"
Wang Sheng07432ce2013-01-30 17:23:08 +080011486msgstr "push|fetch"
Jiang Xinef317cd2012-09-15 11:17:00 +080011487
Jiang Xin94550ed2015-11-16 07:02:11 +080011488#: builtin/remote.c:169
Jiang Xinef317cd2012-09-15 11:17:00 +080011489msgid "set up remote as a mirror to push to or fetch from"
Wang Sheng07432ce2013-01-30 17:23:08 +080011490msgstr "把远程设置为用以推送或抓取的镜像"
Jiang Xinef317cd2012-09-15 11:17:00 +080011491
Jiang Xin94550ed2015-11-16 07:02:11 +080011492#: builtin/remote.c:181
Jiang Xin8ada9592012-05-21 09:35:47 +080011493msgid "specifying a master branch makes no sense with --mirror"
Jiang Xin81809b92012-05-30 12:19:47 +080011494msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
Jiang Xin8ada9592012-05-21 09:35:47 +080011495
Jiang Xin94550ed2015-11-16 07:02:11 +080011496#: builtin/remote.c:183
Jiang Xin8ada9592012-05-21 09:35:47 +080011497msgid "specifying branches to track makes sense only with fetch mirrors"
Jiang Xin649900b2012-08-02 11:50:59 +080011498msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
Jiang Xin8ada9592012-05-21 09:35:47 +080011499
Jiang Xin5c57d762016-08-28 10:18:12 +080011500#: builtin/remote.c:190 builtin/remote.c:629
Jiang Xin81809b92012-05-30 12:19:47 +080011501#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011502msgid "remote %s already exists."
Jiang Xin81809b92012-05-30 12:19:47 +080011503msgstr "远程 %s 已经存在。"
Jiang Xin8ada9592012-05-21 09:35:47 +080011504
Jiang Xin5c57d762016-08-28 10:18:12 +080011505#: builtin/remote.c:194 builtin/remote.c:633
Jiang Xin81809b92012-05-30 12:19:47 +080011506#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011507msgid "'%s' is not a valid remote name"
Jiang Xin81809b92012-05-30 12:19:47 +080011508msgstr "'%s' 不是一个有效的远程名称"
Jiang Xin8ada9592012-05-21 09:35:47 +080011509
Jiang Xin276ceea2016-02-28 20:35:55 +080011510#: builtin/remote.c:234
Jiang Xin81809b92012-05-30 12:19:47 +080011511#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011512msgid "Could not setup master '%s'"
Jiang Xin81809b92012-05-30 12:19:47 +080011513msgstr "无法设置 master '%s'"
Jiang Xin8ada9592012-05-21 09:35:47 +080011514
Jiang Xin276ceea2016-02-28 20:35:55 +080011515#: builtin/remote.c:336
Jiang Xin81809b92012-05-30 12:19:47 +080011516#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011517msgid "Could not get fetch map for refspec %s"
Jiang Xin160fb2b2015-08-02 21:47:30 +080011518msgstr "无法得到引用规格 %s 的获取列表"
Jiang Xin8ada9592012-05-21 09:35:47 +080011519
Jiang Xin276ceea2016-02-28 20:35:55 +080011520#: builtin/remote.c:437 builtin/remote.c:445
Jiang Xin8ada9592012-05-21 09:35:47 +080011521msgid "(matching)"
Jiang Xin81809b92012-05-30 12:19:47 +080011522msgstr "(匹配)"
Jiang Xin8ada9592012-05-21 09:35:47 +080011523
Jiang Xin276ceea2016-02-28 20:35:55 +080011524#: builtin/remote.c:449
Jiang Xin8ada9592012-05-21 09:35:47 +080011525msgid "(delete)"
Jiang Xin81809b92012-05-30 12:19:47 +080011526msgstr "(删除)"
Jiang Xin8ada9592012-05-21 09:35:47 +080011527
Jiang Xin5c57d762016-08-28 10:18:12 +080011528#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
Jiang Xin81809b92012-05-30 12:19:47 +080011529#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011530msgid "No such remote: %s"
Jiang Xin81809b92012-05-30 12:19:47 +080011531msgstr "没有这样的远程:%s"
Jiang Xin8ada9592012-05-21 09:35:47 +080011532
Jiang Xin5c57d762016-08-28 10:18:12 +080011533#: builtin/remote.c:639
Jiang Xin81809b92012-05-30 12:19:47 +080011534#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011535msgid "Could not rename config section '%s' to '%s'"
Jiang Xin81809b92012-05-30 12:19:47 +080011536msgstr "不能重命名配置小节 '%s' 到 '%s'"
Jiang Xin8ada9592012-05-21 09:35:47 +080011537
Jiang Xin5c57d762016-08-28 10:18:12 +080011538#: builtin/remote.c:659
Jiang Xin8ada9592012-05-21 09:35:47 +080011539#, c-format
11540msgid ""
Jiang Xind691f472012-06-02 17:12:59 +080011541"Not updating non-default fetch refspec\n"
Jiang Xin8ada9592012-05-21 09:35:47 +080011542"\t%s\n"
11543"\tPlease update the configuration manually if necessary."
11544msgstr ""
Jiang Xin160fb2b2015-08-02 21:47:30 +080011545"没有更新非默认的获取引用规格\n"
Jiang Xin81809b92012-05-30 12:19:47 +080011546"\t%s\n"
11547"\t如果必要请手动更新配置。"
Jiang Xin8ada9592012-05-21 09:35:47 +080011548
Jiang Xin5c57d762016-08-28 10:18:12 +080011549#: builtin/remote.c:695
Jiang Xin81809b92012-05-30 12:19:47 +080011550#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011551msgid "deleting '%s' failed"
Jiang Xin81809b92012-05-30 12:19:47 +080011552msgstr "删除 '%s' 失败"
Jiang Xin8ada9592012-05-21 09:35:47 +080011553
Jiang Xin5c57d762016-08-28 10:18:12 +080011554#: builtin/remote.c:729
Jiang Xin81809b92012-05-30 12:19:47 +080011555#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011556msgid "creating '%s' failed"
Jiang Xin81809b92012-05-30 12:19:47 +080011557msgstr "创建 '%s' 失败"
Jiang Xin8ada9592012-05-21 09:35:47 +080011558
Jiang Xin5c57d762016-08-28 10:18:12 +080011559#: builtin/remote.c:792
Jiang Xin8ada9592012-05-21 09:35:47 +080011560msgid ""
11561"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
11562"to delete it, use:"
11563msgid_plural ""
11564"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
11565"to delete them, use:"
Jiang Xin5ae481e2012-05-31 17:35:59 +080011566msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
11567msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
Jiang Xin8ada9592012-05-21 09:35:47 +080011568
Jiang Xin5c57d762016-08-28 10:18:12 +080011569#: builtin/remote.c:806
Jiang Xin276ceea2016-02-28 20:35:55 +080011570#, c-format
11571msgid "Could not remove config section '%s'"
11572msgstr "不能移除配置小节 '%s'"
11573
Jiang Xin5c57d762016-08-28 10:18:12 +080011574#: builtin/remote.c:907
Jiang Xin8ada9592012-05-21 09:35:47 +080011575#, c-format
11576msgid " new (next fetch will store in remotes/%s)"
Jiang Xin81809b92012-05-30 12:19:47 +080011577msgstr " 新的(下一次获取将存储于 remotes/%s)"
Jiang Xin8ada9592012-05-21 09:35:47 +080011578
Jiang Xin5c57d762016-08-28 10:18:12 +080011579#: builtin/remote.c:910
Jiang Xin8ada9592012-05-21 09:35:47 +080011580msgid " tracked"
Jiang Xin81809b92012-05-30 12:19:47 +080011581msgstr " 已跟踪"
Jiang Xin8ada9592012-05-21 09:35:47 +080011582
Jiang Xin5c57d762016-08-28 10:18:12 +080011583#: builtin/remote.c:912
Jiang Xin8ada9592012-05-21 09:35:47 +080011584msgid " stale (use 'git remote prune' to remove)"
Jiang Xin81809b92012-05-30 12:19:47 +080011585msgstr " 过时(使用 'git remote prune' 来移除)"
Jiang Xin8ada9592012-05-21 09:35:47 +080011586
Jiang Xin5c57d762016-08-28 10:18:12 +080011587#: builtin/remote.c:914
Jiang Xin8ada9592012-05-21 09:35:47 +080011588msgid " ???"
Jiang Xin81809b92012-05-30 12:19:47 +080011589msgstr " ???"
Jiang Xin8ada9592012-05-21 09:35:47 +080011590
Jiang Xin5c57d762016-08-28 10:18:12 +080011591#: builtin/remote.c:955
Jiang Xin8ada9592012-05-21 09:35:47 +080011592#, c-format
11593msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
Jiang Xin81809b92012-05-30 12:19:47 +080011594msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
Jiang Xin8ada9592012-05-21 09:35:47 +080011595
Jiang Xin5c57d762016-08-28 10:18:12 +080011596#: builtin/remote.c:963
Jiang Xin81809b92012-05-30 12:19:47 +080011597#, c-format
Jiang Xin276ceea2016-02-28 20:35:55 +080011598msgid "rebases interactively onto remote %s"
11599msgstr "交互式变基到远程 %s"
Jiang Xin8ada9592012-05-21 09:35:47 +080011600
Jiang Xin5c57d762016-08-28 10:18:12 +080011601#: builtin/remote.c:964
11602#, c-format
11603msgid "rebases onto remote %s"
11604msgstr "变基到远程 %s"
11605
11606#: builtin/remote.c:967
Jiang Xin81809b92012-05-30 12:19:47 +080011607#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011608msgid " merges with remote %s"
Jiang Xin81809b92012-05-30 12:19:47 +080011609msgstr " 与远程 %s 合并"
Jiang Xin8ada9592012-05-21 09:35:47 +080011610
Jiang Xin5c57d762016-08-28 10:18:12 +080011611#: builtin/remote.c:970
Jiang Xin81809b92012-05-30 12:19:47 +080011612#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011613msgid "merges with remote %s"
Jiang Xin81809b92012-05-30 12:19:47 +080011614msgstr "与远程 %s 合并"
Jiang Xin8ada9592012-05-21 09:35:47 +080011615
Jiang Xin5c57d762016-08-28 10:18:12 +080011616#: builtin/remote.c:973
11617#, c-format
11618msgid "%-*s and with remote %s\n"
11619msgstr "%-*s 以及和远程 %s\n"
Jiang Xin8ada9592012-05-21 09:35:47 +080011620
Jiang Xin5c57d762016-08-28 10:18:12 +080011621#: builtin/remote.c:1016
Jiang Xin8ada9592012-05-21 09:35:47 +080011622msgid "create"
Jiang Xin81809b92012-05-30 12:19:47 +080011623msgstr "创建"
Jiang Xin8ada9592012-05-21 09:35:47 +080011624
Jiang Xin5c57d762016-08-28 10:18:12 +080011625#: builtin/remote.c:1019
Jiang Xin8ada9592012-05-21 09:35:47 +080011626msgid "delete"
Jiang Xin81809b92012-05-30 12:19:47 +080011627msgstr "删除"
Jiang Xin8ada9592012-05-21 09:35:47 +080011628
Jiang Xin5c57d762016-08-28 10:18:12 +080011629#: builtin/remote.c:1023
Jiang Xin8ada9592012-05-21 09:35:47 +080011630msgid "up to date"
Jiang Xin81809b92012-05-30 12:19:47 +080011631msgstr "最新"
Jiang Xin8ada9592012-05-21 09:35:47 +080011632
Jiang Xin5c57d762016-08-28 10:18:12 +080011633#: builtin/remote.c:1026
Jiang Xin8ada9592012-05-21 09:35:47 +080011634msgid "fast-forwardable"
Jiang Xin81809b92012-05-30 12:19:47 +080011635msgstr "可快进"
Jiang Xin8ada9592012-05-21 09:35:47 +080011636
Jiang Xin5c57d762016-08-28 10:18:12 +080011637#: builtin/remote.c:1029
Jiang Xin8ada9592012-05-21 09:35:47 +080011638msgid "local out of date"
Jiang Xin81809b92012-05-30 12:19:47 +080011639msgstr "本地已过时"
Jiang Xin8ada9592012-05-21 09:35:47 +080011640
Jiang Xin5c57d762016-08-28 10:18:12 +080011641#: builtin/remote.c:1036
Jiang Xin8ada9592012-05-21 09:35:47 +080011642#, c-format
11643msgid " %-*s forces to %-*s (%s)"
Jiang Xin81809b92012-05-30 12:19:47 +080011644msgstr " %-*s 强制推送至 %-*s (%s)"
Jiang Xin8ada9592012-05-21 09:35:47 +080011645
Jiang Xin5c57d762016-08-28 10:18:12 +080011646#: builtin/remote.c:1039
Jiang Xin8ada9592012-05-21 09:35:47 +080011647#, c-format
11648msgid " %-*s pushes to %-*s (%s)"
Jiang Xin81809b92012-05-30 12:19:47 +080011649msgstr " %-*s 推送至 %-*s (%s)"
Jiang Xin8ada9592012-05-21 09:35:47 +080011650
Jiang Xin5c57d762016-08-28 10:18:12 +080011651#: builtin/remote.c:1043
Jiang Xin8ada9592012-05-21 09:35:47 +080011652#, c-format
11653msgid " %-*s forces to %s"
Jiang Xin81809b92012-05-30 12:19:47 +080011654msgstr " %-*s 强制推送至 %s"
Jiang Xin8ada9592012-05-21 09:35:47 +080011655
Jiang Xin5c57d762016-08-28 10:18:12 +080011656#: builtin/remote.c:1046
Jiang Xin8ada9592012-05-21 09:35:47 +080011657#, c-format
11658msgid " %-*s pushes to %s"
Jiang Xin81809b92012-05-30 12:19:47 +080011659msgstr " %-*s 推送至 %s"
Jiang Xin8ada9592012-05-21 09:35:47 +080011660
Jiang Xin5c57d762016-08-28 10:18:12 +080011661#: builtin/remote.c:1114
Jiang Xinef317cd2012-09-15 11:17:00 +080011662msgid "do not query remotes"
Wang Sheng07432ce2013-01-30 17:23:08 +080011663msgstr "不查询远程"
Jiang Xinef317cd2012-09-15 11:17:00 +080011664
Jiang Xin5c57d762016-08-28 10:18:12 +080011665#: builtin/remote.c:1141
Jiang Xin81809b92012-05-30 12:19:47 +080011666#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011667msgid "* remote %s"
Jiang Xin81809b92012-05-30 12:19:47 +080011668msgstr "* 远程 %s"
Jiang Xin8ada9592012-05-21 09:35:47 +080011669
Jiang Xin5c57d762016-08-28 10:18:12 +080011670#: builtin/remote.c:1142
Jiang Xin8ada9592012-05-21 09:35:47 +080011671#, c-format
11672msgid " Fetch URL: %s"
Jiang Xin81809b92012-05-30 12:19:47 +080011673msgstr " 获取地址:%s"
Jiang Xin8ada9592012-05-21 09:35:47 +080011674
Jiang Xina0b6b242016-10-27 21:53:37 +080011675#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
Jiang Xin8ada9592012-05-21 09:35:47 +080011676msgid "(no URL)"
Jiang Xin81809b92012-05-30 12:19:47 +080011677msgstr "(无 URL)"
Jiang Xin8ada9592012-05-21 09:35:47 +080011678
Jiang Xin5b04ee32016-05-29 20:40:35 +080011679#. TRANSLATORS: the colon ':' should align with
11680#. the one in " Fetch URL: %s" translation
Jiang Xin5c57d762016-08-28 10:18:12 +080011681#: builtin/remote.c:1154 builtin/remote.c:1156
Jiang Xin8ada9592012-05-21 09:35:47 +080011682#, c-format
11683msgid " Push URL: %s"
Jiang Xin81809b92012-05-30 12:19:47 +080011684msgstr " 推送地址:%s"
Jiang Xin8ada9592012-05-21 09:35:47 +080011685
Jiang Xin5c57d762016-08-28 10:18:12 +080011686#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
Jiang Xin81809b92012-05-30 12:19:47 +080011687#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011688msgid " HEAD branch: %s"
Ray Chen4375c102015-08-10 18:03:29 +080011689msgstr " HEAD 分支:%s"
Jiang Xin8ada9592012-05-21 09:35:47 +080011690
Jiang Xin5c57d762016-08-28 10:18:12 +080011691# 译者:中文字符串拼接,可删除前导空格
11692#: builtin/remote.c:1158
11693msgid "(not queried)"
11694msgstr "(未查询)"
11695
11696#: builtin/remote.c:1160
11697msgid "(unknown)"
11698msgstr "(未知)"
11699
11700#: builtin/remote.c:1164
Jiang Xin8ada9592012-05-21 09:35:47 +080011701#, c-format
11702msgid ""
11703" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
Jiang Xin5ae481e2012-05-31 17:35:59 +080011704msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
Jiang Xin8ada9592012-05-21 09:35:47 +080011705
Jiang Xin5c57d762016-08-28 10:18:12 +080011706#: builtin/remote.c:1176
Jiang Xin81809b92012-05-30 12:19:47 +080011707#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011708msgid " Remote branch:%s"
11709msgid_plural " Remote branches:%s"
Jiang Xin81809b92012-05-30 12:19:47 +080011710msgstr[0] " 远程分支:%s"
Jiang Xin5ae481e2012-05-31 17:35:59 +080011711msgstr[1] " 远程分支:%s"
Jiang Xin8ada9592012-05-21 09:35:47 +080011712
Jiang Xin81809b92012-05-30 12:19:47 +080011713# 译者:中文字符串拼接,可删除前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +080011714#: builtin/remote.c:1179 builtin/remote.c:1205
Jiang Xin8ada9592012-05-21 09:35:47 +080011715msgid " (status not queried)"
Jiang Xin81809b92012-05-30 12:19:47 +080011716msgstr "(状态未查询)"
Jiang Xin8ada9592012-05-21 09:35:47 +080011717
Jiang Xin5c57d762016-08-28 10:18:12 +080011718#: builtin/remote.c:1188
Jiang Xin8ada9592012-05-21 09:35:47 +080011719msgid " Local branch configured for 'git pull':"
11720msgid_plural " Local branches configured for 'git pull':"
Jiang Xin81809b92012-05-30 12:19:47 +080011721msgstr[0] " 为 'git pull' 配置的本地分支:"
Jiang Xin5ae481e2012-05-31 17:35:59 +080011722msgstr[1] " 为 'git pull' 配置的本地分支:"
Jiang Xin8ada9592012-05-21 09:35:47 +080011723
Jiang Xin5c57d762016-08-28 10:18:12 +080011724#: builtin/remote.c:1196
Jiang Xin8ada9592012-05-21 09:35:47 +080011725msgid " Local refs will be mirrored by 'git push'"
Jiang Xin81809b92012-05-30 12:19:47 +080011726msgstr " 本地引用将在 'git push' 时被镜像"
Jiang Xin8ada9592012-05-21 09:35:47 +080011727
Jiang Xina0b6b242016-10-27 21:53:37 +080011728#: builtin/remote.c:1202
Jiang Xin81809b92012-05-30 12:19:47 +080011729#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011730msgid " Local ref configured for 'git push'%s:"
11731msgid_plural " Local refs configured for 'git push'%s:"
Jiang Xin81809b92012-05-30 12:19:47 +080011732msgstr[0] " 为 'git push' 配置的本地引用%s:"
Jiang Xin5ae481e2012-05-31 17:35:59 +080011733msgstr[1] " 为 'git push' 配置的本地引用%s:"
Jiang Xin8ada9592012-05-21 09:35:47 +080011734
Jiang Xina0b6b242016-10-27 21:53:37 +080011735#: builtin/remote.c:1223
Jiang Xinef317cd2012-09-15 11:17:00 +080011736msgid "set refs/remotes/<name>/HEAD according to remote"
Wang Sheng07432ce2013-01-30 17:23:08 +080011737msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
Jiang Xinef317cd2012-09-15 11:17:00 +080011738
Jiang Xina0b6b242016-10-27 21:53:37 +080011739#: builtin/remote.c:1225
Jiang Xinef317cd2012-09-15 11:17:00 +080011740msgid "delete refs/remotes/<name>/HEAD"
Wang Sheng07432ce2013-01-30 17:23:08 +080011741msgstr "删除 refs/remotes/<名称>/HEAD"
Jiang Xinef317cd2012-09-15 11:17:00 +080011742
Jiang Xina0b6b242016-10-27 21:53:37 +080011743#: builtin/remote.c:1240
Jiang Xin8ada9592012-05-21 09:35:47 +080011744msgid "Cannot determine remote HEAD"
Jiang Xin81809b92012-05-30 12:19:47 +080011745msgstr "无法确定远程 HEAD"
Jiang Xin8ada9592012-05-21 09:35:47 +080011746
Jiang Xina0b6b242016-10-27 21:53:37 +080011747#: builtin/remote.c:1242
Jiang Xin8ada9592012-05-21 09:35:47 +080011748msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
Jiang Xin81809b92012-05-30 12:19:47 +080011749msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
Jiang Xin8ada9592012-05-21 09:35:47 +080011750
Jiang Xina0b6b242016-10-27 21:53:37 +080011751#: builtin/remote.c:1252
Jiang Xin81809b92012-05-30 12:19:47 +080011752#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011753msgid "Could not delete %s"
Jiang Xin81809b92012-05-30 12:19:47 +080011754msgstr "无法删除 %s"
Jiang Xin8ada9592012-05-21 09:35:47 +080011755
Jiang Xina0b6b242016-10-27 21:53:37 +080011756#: builtin/remote.c:1260
Jiang Xin81809b92012-05-30 12:19:47 +080011757#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011758msgid "Not a valid ref: %s"
Jiang Xin81809b92012-05-30 12:19:47 +080011759msgstr "不是一个有效引用:%s"
Jiang Xin8ada9592012-05-21 09:35:47 +080011760
Jiang Xina0b6b242016-10-27 21:53:37 +080011761#: builtin/remote.c:1262
Jiang Xin81809b92012-05-30 12:19:47 +080011762#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011763msgid "Could not setup %s"
Jiang Xin81809b92012-05-30 12:19:47 +080011764msgstr "不能设置 %s"
Jiang Xin8ada9592012-05-21 09:35:47 +080011765
11766# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +080011767#: builtin/remote.c:1280
Jiang Xin81809b92012-05-30 12:19:47 +080011768#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011769msgid " %s will become dangling!"
Wang Sheng07432ce2013-01-30 17:23:08 +080011770msgstr " %s 将成为摇摆状态!"
Jiang Xin8ada9592012-05-21 09:35:47 +080011771
11772# 译者:注意保持前导空格
Jiang Xina0b6b242016-10-27 21:53:37 +080011773#: builtin/remote.c:1281
Jiang Xin81809b92012-05-30 12:19:47 +080011774#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011775msgid " %s has become dangling!"
Wang Sheng07432ce2013-01-30 17:23:08 +080011776msgstr " %s 已成为摇摆状态!"
Jiang Xin8ada9592012-05-21 09:35:47 +080011777
Jiang Xina0b6b242016-10-27 21:53:37 +080011778#: builtin/remote.c:1291
Jiang Xin81809b92012-05-30 12:19:47 +080011779#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011780msgid "Pruning %s"
Jiang Xin81809b92012-05-30 12:19:47 +080011781msgstr "修剪 %s"
Jiang Xin8ada9592012-05-21 09:35:47 +080011782
Jiang Xina0b6b242016-10-27 21:53:37 +080011783#: builtin/remote.c:1292
Jiang Xin8ada9592012-05-21 09:35:47 +080011784#, c-format
11785msgid "URL: %s"
Jiang Xin81809b92012-05-30 12:19:47 +080011786msgstr "URL:%s"
Jiang Xin8ada9592012-05-21 09:35:47 +080011787
Jiang Xina0b6b242016-10-27 21:53:37 +080011788#: builtin/remote.c:1308
Jiang Xin8ada9592012-05-21 09:35:47 +080011789#, c-format
11790msgid " * [would prune] %s"
Jiang Xin81809b92012-05-30 12:19:47 +080011791msgstr " * [将删除] %s"
Jiang Xin8ada9592012-05-21 09:35:47 +080011792
Jiang Xina0b6b242016-10-27 21:53:37 +080011793#: builtin/remote.c:1311
Jiang Xin8ada9592012-05-21 09:35:47 +080011794#, c-format
11795msgid " * [pruned] %s"
Jiang Xin81809b92012-05-30 12:19:47 +080011796msgstr " * [已删除] %s"
Jiang Xin8ada9592012-05-21 09:35:47 +080011797
Jiang Xina0b6b242016-10-27 21:53:37 +080011798#: builtin/remote.c:1356
Jiang Xinef317cd2012-09-15 11:17:00 +080011799msgid "prune remotes after fetching"
Wang Sheng07432ce2013-01-30 17:23:08 +080011800msgstr "抓取后清除远程"
Jiang Xinef317cd2012-09-15 11:17:00 +080011801
Jiang Xina0b6b242016-10-27 21:53:37 +080011802#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
Jiang Xin81809b92012-05-30 12:19:47 +080011803#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011804msgid "No such remote '%s'"
Jiang Xin81809b92012-05-30 12:19:47 +080011805msgstr "没有此远程 '%s'"
Jiang Xin8ada9592012-05-21 09:35:47 +080011806
Jiang Xina0b6b242016-10-27 21:53:37 +080011807#: builtin/remote.c:1435
Jiang Xinef317cd2012-09-15 11:17:00 +080011808msgid "add branch"
Wang Sheng07432ce2013-01-30 17:23:08 +080011809msgstr "添加分支"
Jiang Xinef317cd2012-09-15 11:17:00 +080011810
Jiang Xina0b6b242016-10-27 21:53:37 +080011811#: builtin/remote.c:1442
Jiang Xin8ada9592012-05-21 09:35:47 +080011812msgid "no remote specified"
Jiang Xin81809b92012-05-30 12:19:47 +080011813msgstr "未指定远程"
Jiang Xin8ada9592012-05-21 09:35:47 +080011814
Jiang Xina0b6b242016-10-27 21:53:37 +080011815#: builtin/remote.c:1459
Jiang Xin94550ed2015-11-16 07:02:11 +080011816msgid "query push URLs rather than fetch URLs"
11817msgstr "查询推送 URL 地址,而非获取 URL 地址"
11818
Jiang Xina0b6b242016-10-27 21:53:37 +080011819#: builtin/remote.c:1461
Jiang Xin94550ed2015-11-16 07:02:11 +080011820msgid "return all URLs"
11821msgstr "返回所有 URL 地址"
11822
Jiang Xina0b6b242016-10-27 21:53:37 +080011823#: builtin/remote.c:1489
Jiang Xin94550ed2015-11-16 07:02:11 +080011824#, c-format
11825msgid "no URLs configured for remote '%s'"
11826msgstr "没有给远程仓库 '%s' 设定 URL"
11827
Jiang Xina0b6b242016-10-27 21:53:37 +080011828#: builtin/remote.c:1515
Jiang Xinef317cd2012-09-15 11:17:00 +080011829msgid "manipulate push URLs"
Wang Sheng07432ce2013-01-30 17:23:08 +080011830msgstr "操作推送 URLS"
Jiang Xinef317cd2012-09-15 11:17:00 +080011831
Jiang Xina0b6b242016-10-27 21:53:37 +080011832#: builtin/remote.c:1517
Jiang Xinef317cd2012-09-15 11:17:00 +080011833msgid "add URL"
Wang Sheng07432ce2013-01-30 17:23:08 +080011834msgstr "添加 URL"
Jiang Xinef317cd2012-09-15 11:17:00 +080011835
Jiang Xina0b6b242016-10-27 21:53:37 +080011836#: builtin/remote.c:1519
Jiang Xinef317cd2012-09-15 11:17:00 +080011837msgid "delete URLs"
Wang Sheng07432ce2013-01-30 17:23:08 +080011838msgstr "删除 URLS"
Jiang Xinef317cd2012-09-15 11:17:00 +080011839
Jiang Xina0b6b242016-10-27 21:53:37 +080011840#: builtin/remote.c:1526
Jiang Xin8ada9592012-05-21 09:35:47 +080011841msgid "--add --delete doesn't make sense"
Jiang Xin81809b92012-05-30 12:19:47 +080011842msgstr "--add --delete 无意义"
Jiang Xin8ada9592012-05-21 09:35:47 +080011843
Jiang Xina0b6b242016-10-27 21:53:37 +080011844#: builtin/remote.c:1567
Jiang Xin81809b92012-05-30 12:19:47 +080011845#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011846msgid "Invalid old URL pattern: %s"
Ray Chen4375c102015-08-10 18:03:29 +080011847msgstr "无效的旧 URL 匹配模版:%s"
Jiang Xin8ada9592012-05-21 09:35:47 +080011848
Jiang Xina0b6b242016-10-27 21:53:37 +080011849#: builtin/remote.c:1575
Jiang Xin81809b92012-05-30 12:19:47 +080011850#, c-format
Jiang Xin8ada9592012-05-21 09:35:47 +080011851msgid "No such URL found: %s"
Ray Chen4375c102015-08-10 18:03:29 +080011852msgstr "未找到此 URL:%s"
Jiang Xin8ada9592012-05-21 09:35:47 +080011853
Jiang Xina0b6b242016-10-27 21:53:37 +080011854#: builtin/remote.c:1577
Jiang Xin8ada9592012-05-21 09:35:47 +080011855msgid "Will not delete all non-push URLs"
Ray Chen4375c102015-08-10 18:03:29 +080011856msgstr "将不会删除所有非推送 URL 地址"
Jiang Xin8ada9592012-05-21 09:35:47 +080011857
Jiang Xina0b6b242016-10-27 21:53:37 +080011858#: builtin/remote.c:1591
Jiang Xinef317cd2012-09-15 11:17:00 +080011859msgid "be verbose; must be placed before a subcommand"
Wang Sheng07432ce2013-01-30 17:23:08 +080011860msgstr "冗长输出;必须置于子命令之前"
Jiang Xinef317cd2012-09-15 11:17:00 +080011861
Jiang Xina0b6b242016-10-27 21:53:37 +080011862#: builtin/remote.c:1622
11863#, c-format
11864msgid "Unknown subcommand: %s"
11865msgstr "未知子命令:%s"
11866
Jiang Xin6acbf032014-08-04 16:23:15 +080011867#: builtin/repack.c:17
Jiang Xin814ff312015-02-16 21:34:19 +080011868msgid "git repack [<options>]"
11869msgstr "git repack [<选项>]"
Jiang Xin90314792013-09-17 23:37:05 +080011870
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011871#: builtin/repack.c:22
11872msgid ""
11873"Incremental repacks are incompatible with bitmap indexes. Use\n"
11874"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
11875msgstr ""
11876"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
11877"或禁用 pack.writebitmaps 配置。"
11878
11879#: builtin/repack.c:166
Jiang Xin90314792013-09-17 23:37:05 +080011880msgid "pack everything in a single pack"
11881msgstr "所有内容打包到一个包文件中"
11882
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011883#: builtin/repack.c:168
Jiang Xin90314792013-09-17 23:37:05 +080011884msgid "same as -a, and turn unreachable objects loose"
11885msgstr "和 -a 相同,并将不可达的对象设为松散对象"
11886
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011887#: builtin/repack.c:171
Jiang Xin90314792013-09-17 23:37:05 +080011888msgid "remove redundant packs, and run git-prune-packed"
11889msgstr "删除多余的包,运行 git-prune-packed"
11890
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011891#: builtin/repack.c:173
Jiang Xin90314792013-09-17 23:37:05 +080011892msgid "pass --no-reuse-delta to git-pack-objects"
11893msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
11894
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011895#: builtin/repack.c:175
Jiang Xin90314792013-09-17 23:37:05 +080011896msgid "pass --no-reuse-object to git-pack-objects"
11897msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
11898
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011899#: builtin/repack.c:177
Jiang Xin90314792013-09-17 23:37:05 +080011900msgid "do not run git-update-server-info"
11901msgstr "不运行 git-update-server-info"
11902
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011903#: builtin/repack.c:180
Jiang Xin90314792013-09-17 23:37:05 +080011904msgid "pass --local to git-pack-objects"
11905msgstr "向 git-pack-objects 传递参数 --local"
11906
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011907#: builtin/repack.c:182
Jiang Xin6c94aba2014-03-13 12:41:34 +080011908msgid "write bitmap index"
11909msgstr "写 bitmap 索引"
11910
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011911#: builtin/repack.c:183
Jiang Xin90314792013-09-17 23:37:05 +080011912msgid "approxidate"
11913msgstr "近似日期"
11914
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011915#: builtin/repack.c:184
Jiang Xin90314792013-09-17 23:37:05 +080011916msgid "with -A, do not loosen objects older than this"
11917msgstr "使用 -A,不要将早于给定时间的对象过期"
11918
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011919#: builtin/repack.c:186
Jiang Xin5c57d762016-08-28 10:18:12 +080011920msgid "with -a, repack unreachable objects"
11921msgstr "使用 -a ,重新对不可达对象打包"
11922
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011923#: builtin/repack.c:188
Jiang Xin90314792013-09-17 23:37:05 +080011924msgid "size of the window used for delta compression"
11925msgstr "用于增量压缩的窗口值"
11926
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011927#: builtin/repack.c:189 builtin/repack.c:193
Jiang Xin8376b582014-02-02 20:46:58 +080011928msgid "bytes"
11929msgstr "字节"
11930
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011931#: builtin/repack.c:190
Jiang Xin90314792013-09-17 23:37:05 +080011932msgid "same as the above, but limit memory size instead of entries count"
11933msgstr "和上面的相似,但限制内存大小而非条目数"
11934
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011935#: builtin/repack.c:192
Jiang Xin90314792013-09-17 23:37:05 +080011936msgid "limits the maximum delta depth"
11937msgstr "限制最大增量深度"
11938
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011939#: builtin/repack.c:194
Jiang Xin90314792013-09-17 23:37:05 +080011940msgid "maximum size of each packfile"
Ray Chendbd6cce2015-07-28 13:26:41 +080011941msgstr "每个包文件的最大尺寸"
Jiang Xin90314792013-09-17 23:37:05 +080011942
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011943#: builtin/repack.c:196
Jiang Xin6c94aba2014-03-13 12:41:34 +080011944msgid "repack objects in packs marked with .keep"
11945msgstr "对标记为 .keep 的包中的对象重新打包"
11946
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011947#: builtin/repack.c:206
Jiang Xin94550ed2015-11-16 07:02:11 +080011948msgid "cannot delete packs in a precious-objects repo"
11949msgstr "不能删除珍品仓库中的打包文件"
11950
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011951#: builtin/repack.c:210
Jiang Xin5c57d762016-08-28 10:18:12 +080011952msgid "--keep-unreachable and -A are incompatible"
11953msgstr "--keep-unreachable 和 -A 不兼容"
11954
Jiang Xin1a79b2f2017-01-27 22:50:57 +080011955#: builtin/repack.c:400 builtin/worktree.c:115
Jiang Xin90314792013-09-17 23:37:05 +080011956#, c-format
Jiang Xin5c57d762016-08-28 10:18:12 +080011957msgid "failed to remove '%s'"
11958msgstr "无法删除 '%s'"
Jiang Xin90314792013-09-17 23:37:05 +080011959
Jiang Xin6acbf032014-08-04 16:23:15 +080011960#: builtin/replace.c:19
Jiang Xinef317cd2012-09-15 11:17:00 +080011961msgid "git replace [-f] <object> <replacement>"
Wang Sheng07432ce2013-01-30 17:23:08 +080011962msgstr "git replace [-f] <对象> <替换物>"
Jiang Xinef317cd2012-09-15 11:17:00 +080011963
Jiang Xin6acbf032014-08-04 16:23:15 +080011964#: builtin/replace.c:20
11965msgid "git replace [-f] --edit <object>"
11966msgstr "git replace [-f] --edit <对象>"
11967
11968#: builtin/replace.c:21
11969msgid "git replace [-f] --graft <commit> [<parent>...]"
11970msgstr "git replace [-f] --graft <提交> [<父提交>...]"
11971
11972#: builtin/replace.c:22
Jiang Xinef317cd2012-09-15 11:17:00 +080011973msgid "git replace -d <object>..."
Wang Sheng07432ce2013-01-30 17:23:08 +080011974msgstr "git replace -d <对象>..."
Jiang Xinef317cd2012-09-15 11:17:00 +080011975
Jiang Xin6acbf032014-08-04 16:23:15 +080011976#: builtin/replace.c:23
Jiang Xincfff71a2014-01-18 11:04:21 +080011977msgid "git replace [--format=<format>] [-l [<pattern>]]"
11978msgstr "git replace [--format=<格式>] [-l [<模式>]]"
Jiang Xinef317cd2012-09-15 11:17:00 +080011979
Jiang Xin220c3132014-10-08 10:55:14 +080011980#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
Jiang Xin6acbf032014-08-04 16:23:15 +080011981#, c-format
11982msgid "Not a valid object name: '%s'"
11983msgstr "不是一个有效的对象名:'%s'"
11984
Jiang Xin220c3132014-10-08 10:55:14 +080011985#: builtin/replace.c:355
Jiang Xin6acbf032014-08-04 16:23:15 +080011986#, c-format
11987msgid "bad mergetag in commit '%s'"
Ray Chen55a16ee2015-07-28 12:52:28 +080011988msgstr "提交 '%s' 中含有损坏的合并标签"
Jiang Xin6acbf032014-08-04 16:23:15 +080011989
Jiang Xin220c3132014-10-08 10:55:14 +080011990#: builtin/replace.c:357
Jiang Xin6acbf032014-08-04 16:23:15 +080011991#, c-format
11992msgid "malformed mergetag in commit '%s'"
Ray Chen55a16ee2015-07-28 12:52:28 +080011993msgstr "提交 '%s' 中含有非法的合并标签"
Jiang Xin6acbf032014-08-04 16:23:15 +080011994
Jiang Xin220c3132014-10-08 10:55:14 +080011995#: builtin/replace.c:368
Jiang Xin6acbf032014-08-04 16:23:15 +080011996#, c-format
11997msgid ""
11998"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
11999"instead of --graft"
Ray Chen55a16ee2015-07-28 12:52:28 +080012000msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
Jiang Xin6acbf032014-08-04 16:23:15 +080012001
Jiang Xin220c3132014-10-08 10:55:14 +080012002#: builtin/replace.c:401
Jiang Xin6acbf032014-08-04 16:23:15 +080012003#, c-format
12004msgid "the original commit '%s' has a gpg signature."
12005msgstr "原始提交 '%s' 中包含一个 GPG 签名"
12006
Jiang Xin220c3132014-10-08 10:55:14 +080012007#: builtin/replace.c:402
Jiang Xin6acbf032014-08-04 16:23:15 +080012008msgid "the signature will be removed in the replacement commit!"
12009msgstr "在替换的提交中签名将被移除!"
12010
Jiang Xin220c3132014-10-08 10:55:14 +080012011#: builtin/replace.c:408
Jiang Xin6acbf032014-08-04 16:23:15 +080012012#, c-format
12013msgid "could not write replacement commit for: '%s'"
12014msgstr "不能为 '%s' 写替换提交"
12015
Jiang Xin220c3132014-10-08 10:55:14 +080012016#: builtin/replace.c:432
Jiang Xinef317cd2012-09-15 11:17:00 +080012017msgid "list replace refs"
Wang Sheng07432ce2013-01-30 17:23:08 +080012018msgstr "列出替换的引用"
Jiang Xinef317cd2012-09-15 11:17:00 +080012019
Jiang Xin220c3132014-10-08 10:55:14 +080012020#: builtin/replace.c:433
Jiang Xinef317cd2012-09-15 11:17:00 +080012021msgid "delete replace refs"
Wang Sheng07432ce2013-01-30 17:23:08 +080012022msgstr "删除替换的引用"
Jiang Xinef317cd2012-09-15 11:17:00 +080012023
Jiang Xin220c3132014-10-08 10:55:14 +080012024#: builtin/replace.c:434
Jiang Xin6acbf032014-08-04 16:23:15 +080012025msgid "edit existing object"
12026msgstr "编辑现存的对象"
12027
Jiang Xin220c3132014-10-08 10:55:14 +080012028#: builtin/replace.c:435
Jiang Xin6acbf032014-08-04 16:23:15 +080012029msgid "change a commit's parents"
12030msgstr "修改一个提交的父提交"
12031
Jiang Xin220c3132014-10-08 10:55:14 +080012032#: builtin/replace.c:436
Jiang Xinef317cd2012-09-15 11:17:00 +080012033msgid "replace the ref if it exists"
Wang Sheng07432ce2013-01-30 17:23:08 +080012034msgstr "如果存在则替换引用"
Jiang Xinef317cd2012-09-15 11:17:00 +080012035
Jiang Xin220c3132014-10-08 10:55:14 +080012036#: builtin/replace.c:437
Jiang Xin6acbf032014-08-04 16:23:15 +080012037msgid "do not pretty-print contents for --edit"
12038msgstr "不要为 --edit 操作美观显示内容"
12039
Jiang Xin220c3132014-10-08 10:55:14 +080012040#: builtin/replace.c:438
Jiang Xincfff71a2014-01-18 11:04:21 +080012041msgid "use this format"
12042msgstr "使用此格式"
12043
Jiang Xin90314792013-09-17 23:37:05 +080012044#: builtin/rerere.c:12
Jiang Xin814ff312015-02-16 21:34:19 +080012045msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
12046msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
Jiang Xinef317cd2012-09-15 11:17:00 +080012047
Jiang Xin94550ed2015-11-16 07:02:11 +080012048#: builtin/rerere.c:58
Jiang Xinef317cd2012-09-15 11:17:00 +080012049msgid "register clean resolutions in index"
Wang Sheng07432ce2013-01-30 17:23:08 +080012050msgstr "在索引中注册干净的解决方案"
Jiang Xinef317cd2012-09-15 11:17:00 +080012051
Jiang Xin220c3132014-10-08 10:55:14 +080012052#: builtin/reset.c:26
Jiang Xinef317cd2012-09-15 11:17:00 +080012053msgid ""
12054"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
Wang Sheng07432ce2013-01-30 17:23:08 +080012055msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080012056
Jiang Xin220c3132014-10-08 10:55:14 +080012057#: builtin/reset.c:27
Jiang Xina0b6b242016-10-27 21:53:37 +080012058msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
12059msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
Jiang Xinef317cd2012-09-15 11:17:00 +080012060
Jiang Xin220c3132014-10-08 10:55:14 +080012061#: builtin/reset.c:28
Wang Sheng07432ce2013-01-30 17:23:08 +080012062msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
12063msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +080012064
Jiang Xin220c3132014-10-08 10:55:14 +080012065#: builtin/reset.c:34
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012066msgid "mixed"
12067msgstr "混杂"
12068
Jiang Xin220c3132014-10-08 10:55:14 +080012069#: builtin/reset.c:34
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012070msgid "soft"
12071msgstr "软性"
12072
Jiang Xin220c3132014-10-08 10:55:14 +080012073#: builtin/reset.c:34
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012074msgid "hard"
12075msgstr "硬性"
12076
Jiang Xin220c3132014-10-08 10:55:14 +080012077#: builtin/reset.c:34
Jiang Xin8ada9592012-05-21 09:35:47 +080012078msgid "merge"
12079msgstr "合并"
12080
Jiang Xin220c3132014-10-08 10:55:14 +080012081#: builtin/reset.c:34
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012082msgid "keep"
12083msgstr "保持"
12084
Jiang Xin220c3132014-10-08 10:55:14 +080012085#: builtin/reset.c:74
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012086msgid "You do not have a valid HEAD."
12087msgstr "您没有一个有效的 HEAD。"
12088
Jiang Xin220c3132014-10-08 10:55:14 +080012089#: builtin/reset.c:76
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012090msgid "Failed to find tree of HEAD."
12091msgstr "无法找到 HEAD 指向的树。"
12092
Jiang Xin220c3132014-10-08 10:55:14 +080012093#: builtin/reset.c:82
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012094#, c-format
12095msgid "Failed to find tree of %s."
12096msgstr "无法找到 %s 指向的树。"
12097
Jiang Xin220c3132014-10-08 10:55:14 +080012098#: builtin/reset.c:100
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012099#, c-format
12100msgid "HEAD is now at %s"
12101msgstr "HEAD 现在位于 %s"
12102
Jiang Xin90e6ef52012-03-27 14:46:11 +080012103# 译者:汉字之间无空格,故删除%s前后空格
Jiang Xin220c3132014-10-08 10:55:14 +080012104#: builtin/reset.c:183
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012105#, c-format
12106msgid "Cannot do a %s reset in the middle of a merge."
12107msgstr "在合并过程中不能做%s重置操作。"
12108
Jiang Xin220c3132014-10-08 10:55:14 +080012109#: builtin/reset.c:276
Jiang Xinef317cd2012-09-15 11:17:00 +080012110msgid "be quiet, only report errors"
Wang Sheng07432ce2013-01-30 17:23:08 +080012111msgstr "安静模式,只报告错误"
Jiang Xinef317cd2012-09-15 11:17:00 +080012112
Jiang Xin220c3132014-10-08 10:55:14 +080012113#: builtin/reset.c:278
Jiang Xinef317cd2012-09-15 11:17:00 +080012114msgid "reset HEAD and index"
Wang Sheng07432ce2013-01-30 17:23:08 +080012115msgstr "重置 HEAD 和索引"
Jiang Xinef317cd2012-09-15 11:17:00 +080012116
Jiang Xin220c3132014-10-08 10:55:14 +080012117#: builtin/reset.c:279
Jiang Xinef317cd2012-09-15 11:17:00 +080012118msgid "reset only HEAD"
Wang Sheng07432ce2013-01-30 17:23:08 +080012119msgstr "只重置 HEAD"
Jiang Xinef317cd2012-09-15 11:17:00 +080012120
Jiang Xin220c3132014-10-08 10:55:14 +080012121#: builtin/reset.c:281 builtin/reset.c:283
Jiang Xinef317cd2012-09-15 11:17:00 +080012122msgid "reset HEAD, index and working tree"
Wang Sheng07432ce2013-01-30 17:23:08 +080012123msgstr "重置 HEAD、索引和工作区"
Jiang Xinef317cd2012-09-15 11:17:00 +080012124
Jiang Xin220c3132014-10-08 10:55:14 +080012125#: builtin/reset.c:285
Jiang Xinef317cd2012-09-15 11:17:00 +080012126msgid "reset HEAD but keep local changes"
Wang Sheng07432ce2013-01-30 17:23:08 +080012127msgstr "重置 HEAD 但保存本地变更"
Jiang Xinef317cd2012-09-15 11:17:00 +080012128
Jiang Xin220c3132014-10-08 10:55:14 +080012129#: builtin/reset.c:288
Jiang Xin6c94aba2014-03-13 12:41:34 +080012130msgid "record only the fact that removed paths will be added later"
12131msgstr "将删除的路径标记为稍后添加"
12132
Jiang Xin220c3132014-10-08 10:55:14 +080012133#: builtin/reset.c:305
Wang Sheng07432ce2013-01-30 17:23:08 +080012134#, c-format
12135msgid "Failed to resolve '%s' as a valid revision."
12136msgstr "无法将 '%s' 解析为一个有效的版本。"
12137
Jiang Xin220c3132014-10-08 10:55:14 +080012138#: builtin/reset.c:313
Wang Sheng07432ce2013-01-30 17:23:08 +080012139#, c-format
12140msgid "Failed to resolve '%s' as a valid tree."
12141msgstr "无法将 '%s' 解析为一个有效的树对象。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012142
Jiang Xin220c3132014-10-08 10:55:14 +080012143#: builtin/reset.c:322
Wang Sheng07432ce2013-01-30 17:23:08 +080012144msgid "--patch is incompatible with --{hard,mixed,soft}"
12145msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
12146
Jiang Xin220c3132014-10-08 10:55:14 +080012147#: builtin/reset.c:331
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012148msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
Jiang Xind9d56b22015-01-18 20:37:57 +080012149msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012150
Jiang Xin90e6ef52012-03-27 14:46:11 +080012151# 译者:汉字之间无空格,故删除%s前后空格
Jiang Xin220c3132014-10-08 10:55:14 +080012152#: builtin/reset.c:333
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012153#, c-format
12154msgid "Cannot do %s reset with paths."
12155msgstr "不能带路径进行%s重置。"
12156
Jiang Xin90e6ef52012-03-27 14:46:11 +080012157# 译者:汉字之间无空格,故删除%s前后空格
Jiang Xin220c3132014-10-08 10:55:14 +080012158#: builtin/reset.c:343
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012159#, c-format
12160msgid "%s reset is not allowed in a bare repository"
Jiang Xin160fb2b2015-08-02 21:47:30 +080012161msgstr "不能对纯仓库进行%s重置"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012162
Jiang Xin220c3132014-10-08 10:55:14 +080012163#: builtin/reset.c:347
Jiang Xin6c94aba2014-03-13 12:41:34 +080012164msgid "-N can only be used with --mixed"
12165msgstr "-N 只能和 --mixed 同时使用"
12166
Jiang Xin220c3132014-10-08 10:55:14 +080012167#: builtin/reset.c:364
Jiang Xin90314792013-09-17 23:37:05 +080012168msgid "Unstaged changes after reset:"
Jiang Xin160fb2b2015-08-02 21:47:30 +080012169msgstr "重置后取消暂存的变更:"
Jiang Xin90314792013-09-17 23:37:05 +080012170
Jiang Xin220c3132014-10-08 10:55:14 +080012171#: builtin/reset.c:370
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012172#, c-format
12173msgid "Could not reset index file to revision '%s'."
Jiang Xin90e6ef52012-03-27 14:46:11 +080012174msgstr "不能重置索引文件至版本 '%s'。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012175
Jiang Xin220c3132014-10-08 10:55:14 +080012176#: builtin/reset.c:374
Wang Sheng07432ce2013-01-30 17:23:08 +080012177msgid "Could not write new index file."
12178msgstr "不能写入新的索引文件。"
12179
Jiang Xina0b6b242016-10-27 21:53:37 +080012180#: builtin/rev-list.c:354
Jiang Xin1b7f4a32015-08-23 15:23:21 +080012181msgid "rev-list does not support display of notes"
12182msgstr "rev-list 不支持显示注解"
12183
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012184#: builtin/rev-parse.c:391
Jiang Xin814ff312015-02-16 21:34:19 +080012185msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
12186msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +080012187
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012188#: builtin/rev-parse.c:396
Jiang Xinef317cd2012-09-15 11:17:00 +080012189msgid "keep the `--` passed as an arg"
Wang Sheng07432ce2013-01-30 17:23:08 +080012190msgstr "保持 `--` 作为一个参数传递"
Jiang Xinef317cd2012-09-15 11:17:00 +080012191
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012192#: builtin/rev-parse.c:398
Jiang Xinef317cd2012-09-15 11:17:00 +080012193msgid "stop parsing after the first non-option argument"
Wang Sheng07432ce2013-01-30 17:23:08 +080012194msgstr "遇到第一个非选项参数后停止解析"
Jiang Xinef317cd2012-09-15 11:17:00 +080012195
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012196#: builtin/rev-parse.c:401
Jiang Xincfff71a2014-01-18 11:04:21 +080012197msgid "output in stuck long form"
12198msgstr "以固定长格式输出"
12199
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012200#: builtin/rev-parse.c:532
Jiang Xinef317cd2012-09-15 11:17:00 +080012201msgid ""
Jiang Xin814ff312015-02-16 21:34:19 +080012202"git rev-parse --parseopt [<options>] -- [<args>...]\n"
Jiang Xinef317cd2012-09-15 11:17:00 +080012203" or: git rev-parse --sq-quote [<arg>...]\n"
Jiang Xin814ff312015-02-16 21:34:19 +080012204" or: git rev-parse [<options>] [<arg>...]\n"
Jiang Xinef317cd2012-09-15 11:17:00 +080012205"\n"
12206"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
12207msgstr ""
Jiang Xin814ff312015-02-16 21:34:19 +080012208"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
Jiang Xin90314792013-09-17 23:37:05 +080012209" 或者:git rev-parse --sq-quote [<参数>...]\n"
Jiang Xin814ff312015-02-16 21:34:19 +080012210" 或者:git rev-parse [<选项>] [<参数>...]\n"
Wang Sheng07432ce2013-01-30 17:23:08 +080012211"\n"
12212"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
Jiang Xinef317cd2012-09-15 11:17:00 +080012213
12214#: builtin/revert.c:22
Jiang Xin814ff312015-02-16 21:34:19 +080012215msgid "git revert [<options>] <commit-ish>..."
12216msgstr "git revert [<选项>] <提交号>..."
Jiang Xinef317cd2012-09-15 11:17:00 +080012217
12218#: builtin/revert.c:23
12219msgid "git revert <subcommand>"
Wang Sheng07432ce2013-01-30 17:23:08 +080012220msgstr "git revert <子命令>"
Jiang Xinef317cd2012-09-15 11:17:00 +080012221
12222#: builtin/revert.c:28
Jiang Xin814ff312015-02-16 21:34:19 +080012223msgid "git cherry-pick [<options>] <commit-ish>..."
12224msgstr "git cherry-pick [<选项>] <提交号>..."
Jiang Xinef317cd2012-09-15 11:17:00 +080012225
12226#: builtin/revert.c:29
Jiang Xinef317cd2012-09-15 11:17:00 +080012227msgid "git cherry-pick <subcommand>"
Wang Sheng07432ce2013-01-30 17:23:08 +080012228msgstr "git cherry-pick <子命令>"
Jiang Xinef317cd2012-09-15 11:17:00 +080012229
Jiang Xin90314792013-09-17 23:37:05 +080012230#: builtin/revert.c:71
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012231#, c-format
12232msgid "%s: %s cannot be used with %s"
Jiang Xin649900b2012-08-02 11:50:59 +080012233msgstr "%s:%s 不能和 %s 同时使用"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012234
Jiang Xin90314792013-09-17 23:37:05 +080012235#: builtin/revert.c:80
Jiang Xinef317cd2012-09-15 11:17:00 +080012236msgid "end revert or cherry-pick sequence"
Wang Sheng07432ce2013-01-30 17:23:08 +080012237msgstr "终止反转或拣选操作"
Jiang Xinef317cd2012-09-15 11:17:00 +080012238
Jiang Xin90314792013-09-17 23:37:05 +080012239#: builtin/revert.c:81
Jiang Xinef317cd2012-09-15 11:17:00 +080012240msgid "resume revert or cherry-pick sequence"
Wang Sheng07432ce2013-01-30 17:23:08 +080012241msgstr "继续反转或拣选操作"
Jiang Xinef317cd2012-09-15 11:17:00 +080012242
Jiang Xin90314792013-09-17 23:37:05 +080012243#: builtin/revert.c:82
Jiang Xinef317cd2012-09-15 11:17:00 +080012244msgid "cancel revert or cherry-pick sequence"
Wang Sheng07432ce2013-01-30 17:23:08 +080012245msgstr "取消反转或拣选操作"
Jiang Xinef317cd2012-09-15 11:17:00 +080012246
Jiang Xin90314792013-09-17 23:37:05 +080012247#: builtin/revert.c:83
Jiang Xinef317cd2012-09-15 11:17:00 +080012248msgid "don't automatically commit"
Wang Sheng07432ce2013-01-30 17:23:08 +080012249msgstr "不要自动提交"
Jiang Xinef317cd2012-09-15 11:17:00 +080012250
Jiang Xin90314792013-09-17 23:37:05 +080012251#: builtin/revert.c:84
Jiang Xinef317cd2012-09-15 11:17:00 +080012252msgid "edit the commit message"
Wang Sheng07432ce2013-01-30 17:23:08 +080012253msgstr "编辑提交说明"
Jiang Xinef317cd2012-09-15 11:17:00 +080012254
Jiang Xin90314792013-09-17 23:37:05 +080012255#: builtin/revert.c:87
Jiang Xinef317cd2012-09-15 11:17:00 +080012256msgid "parent number"
Wang Sheng07432ce2013-01-30 17:23:08 +080012257msgstr "父编号"
Jiang Xinef317cd2012-09-15 11:17:00 +080012258
Jiang Xin90314792013-09-17 23:37:05 +080012259#: builtin/revert.c:89
Jiang Xinef317cd2012-09-15 11:17:00 +080012260msgid "merge strategy"
Wang Sheng07432ce2013-01-30 17:23:08 +080012261msgstr "合并策略"
Jiang Xinef317cd2012-09-15 11:17:00 +080012262
Jiang Xin90314792013-09-17 23:37:05 +080012263#: builtin/revert.c:90
Jiang Xinef317cd2012-09-15 11:17:00 +080012264msgid "option"
Wang Sheng07432ce2013-01-30 17:23:08 +080012265msgstr "选项"
Jiang Xinef317cd2012-09-15 11:17:00 +080012266
Jiang Xin90314792013-09-17 23:37:05 +080012267#: builtin/revert.c:91
Jiang Xinef317cd2012-09-15 11:17:00 +080012268msgid "option for merge strategy"
Wang Sheng07432ce2013-01-30 17:23:08 +080012269msgstr "合并策略的选项"
Jiang Xinef317cd2012-09-15 11:17:00 +080012270
Jiang Xin5c57d762016-08-28 10:18:12 +080012271#: builtin/revert.c:100
Jiang Xinef317cd2012-09-15 11:17:00 +080012272msgid "append commit name"
Wang Sheng07432ce2013-01-30 17:23:08 +080012273msgstr "追加提交名称"
Jiang Xinef317cd2012-09-15 11:17:00 +080012274
Jiang Xin5c57d762016-08-28 10:18:12 +080012275#: builtin/revert.c:102
Jiang Xinef317cd2012-09-15 11:17:00 +080012276msgid "preserve initially empty commits"
Wang Sheng07432ce2013-01-30 17:23:08 +080012277msgstr "保留初始化的空提交"
Jiang Xinef317cd2012-09-15 11:17:00 +080012278
Jiang Xin5c57d762016-08-28 10:18:12 +080012279#: builtin/revert.c:103
Jiang Xinef317cd2012-09-15 11:17:00 +080012280msgid "allow commits with empty messages"
Wang Sheng07432ce2013-01-30 17:23:08 +080012281msgstr "允许提交说明为空"
Jiang Xinef317cd2012-09-15 11:17:00 +080012282
Jiang Xin5c57d762016-08-28 10:18:12 +080012283#: builtin/revert.c:104
Jiang Xinef317cd2012-09-15 11:17:00 +080012284msgid "keep redundant, empty commits"
Wang Sheng07432ce2013-01-30 17:23:08 +080012285msgstr "保持多余的、空的提交"
Jiang Xinef317cd2012-09-15 11:17:00 +080012286
Jiang Xin5c57d762016-08-28 10:18:12 +080012287#: builtin/revert.c:192
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012288msgid "revert failed"
12289msgstr "还原失败"
12290
Jiang Xina0b6b242016-10-27 21:53:37 +080012291#: builtin/revert.c:205
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012292msgid "cherry-pick failed"
12293msgstr "拣选失败"
12294
Jiang Xin90314792013-09-17 23:37:05 +080012295#: builtin/rm.c:17
Jiang Xin814ff312015-02-16 21:34:19 +080012296msgid "git rm [<options>] [--] <file>..."
12297msgstr "git rm [<选项>] [--] <文件>..."
Jiang Xinef317cd2012-09-15 11:17:00 +080012298
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012299#: builtin/rm.c:205
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012300msgid ""
Jiang Xin2e8451e2013-07-26 14:00:02 +080012301"the following file has staged content different from both the\n"
12302"file and the HEAD:"
12303msgid_plural ""
12304"the following files have staged content different from both the\n"
12305"file and the HEAD:"
12306msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
12307msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
12308
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012309#: builtin/rm.c:210
Jiang Xin2e8451e2013-07-26 14:00:02 +080012310msgid ""
12311"\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012312"(use -f to force removal)"
12313msgstr ""
Jiang Xin2e8451e2013-07-26 14:00:02 +080012314"\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012315"(使用 -f 强制删除)"
12316
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012317#: builtin/rm.c:214
Jiang Xin2e8451e2013-07-26 14:00:02 +080012318msgid "the following file has changes staged in the index:"
12319msgid_plural "the following files have changes staged in the index:"
Jiang Xin160fb2b2015-08-02 21:47:30 +080012320msgstr[0] "下列文件索引中有变更"
12321msgstr[1] "下列文件索引中有变更"
Jiang Xin2e8451e2013-07-26 14:00:02 +080012322
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012323#: builtin/rm.c:218 builtin/rm.c:227
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012324msgid ""
Jiang Xin2e8451e2013-07-26 14:00:02 +080012325"\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012326"(use --cached to keep the file, or -f to force removal)"
12327msgstr ""
Jiang Xin2e8451e2013-07-26 14:00:02 +080012328"\n"
12329"(使用 --cached 保留本地文件,或用 -f 强制删除)"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012330
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012331#: builtin/rm.c:224
Jiang Xin2e8451e2013-07-26 14:00:02 +080012332msgid "the following file has local modifications:"
12333msgid_plural "the following files have local modifications:"
12334msgstr[0] "如下文件有本地修改:"
12335msgstr[1] "如下文件有本地修改:"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012336
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012337#: builtin/rm.c:242
Jiang Xinef317cd2012-09-15 11:17:00 +080012338msgid "do not list removed files"
Wang Sheng07432ce2013-01-30 17:23:08 +080012339msgstr "不列出删除的文件"
Jiang Xinef317cd2012-09-15 11:17:00 +080012340
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012341#: builtin/rm.c:243
Jiang Xinef317cd2012-09-15 11:17:00 +080012342msgid "only remove from the index"
Wang Sheng07432ce2013-01-30 17:23:08 +080012343msgstr "只从索引区删除"
Jiang Xinef317cd2012-09-15 11:17:00 +080012344
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012345#: builtin/rm.c:244
Jiang Xinef317cd2012-09-15 11:17:00 +080012346msgid "override the up-to-date check"
Wang Sheng07432ce2013-01-30 17:23:08 +080012347msgstr "忽略文件更新状态检查"
Jiang Xinef317cd2012-09-15 11:17:00 +080012348
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012349#: builtin/rm.c:245
Jiang Xinef317cd2012-09-15 11:17:00 +080012350msgid "allow recursive removal"
Wang Sheng07432ce2013-01-30 17:23:08 +080012351msgstr "允许递归删除"
Jiang Xinef317cd2012-09-15 11:17:00 +080012352
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012353#: builtin/rm.c:247
Jiang Xinef317cd2012-09-15 11:17:00 +080012354msgid "exit with a zero status even if nothing matched"
Wang Sheng07432ce2013-01-30 17:23:08 +080012355msgstr "即使没有匹配,也以零状态退出"
Jiang Xinef317cd2012-09-15 11:17:00 +080012356
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012357#: builtin/rm.c:308
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012358#, c-format
12359msgid "not removing '%s' recursively without -r"
12360msgstr "未提供 -r 选项不会递归删除 '%s'"
12361
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012362#: builtin/rm.c:347
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012363#, c-format
12364msgid "git rm: unable to remove %s"
12365msgstr "git rm:不能删除 %s"
12366
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012367#: builtin/rm.c:370
12368#, c-format
12369msgid "could not remove '%s'"
12370msgstr "无法删除 '%s'"
12371
Jiang Xin1b7f4a32015-08-23 15:23:21 +080012372#: builtin/send-pack.c:18
12373msgid ""
12374"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
12375"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
12376"[<ref>...]\n"
12377" --all and explicit <ref> specification are mutually exclusive."
12378msgstr ""
12379"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
12380"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
12381" --all 和明确的 <引用> 互斥。"
12382
12383#: builtin/send-pack.c:160
12384msgid "remote name"
12385msgstr "远程名称"
12386
12387#: builtin/send-pack.c:171
12388msgid "use stateless RPC protocol"
12389msgstr "使用无状态的 RPC 协议"
12390
12391#: builtin/send-pack.c:172
12392msgid "read refs from stdin"
12393msgstr "从标准输入读取引用"
12394
12395#: builtin/send-pack.c:173
12396msgid "print status from remote helper"
12397msgstr "打印来自远程 helper 的状态"
12398
Jiang Xinef317cd2012-09-15 11:17:00 +080012399#: builtin/shortlog.c:13
Jiang Xin814ff312015-02-16 21:34:19 +080012400msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
Jiang Xin4dcdc3d2013-04-13 10:02:43 +080012401msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
Jiang Xinef317cd2012-09-15 11:17:00 +080012402
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012403#: builtin/shortlog.c:249
12404msgid "Group by committer rather than author"
12405msgstr "按照提交者分组而不是作者"
12406
12407#: builtin/shortlog.c:251
Jiang Xinef317cd2012-09-15 11:17:00 +080012408msgid "sort output according to the number of commits per author"
Wang Sheng07432ce2013-01-30 17:23:08 +080012409msgstr "根据每个作者的提交数量排序"
Jiang Xinef317cd2012-09-15 11:17:00 +080012410
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012411#: builtin/shortlog.c:253
Jiang Xinef317cd2012-09-15 11:17:00 +080012412msgid "Suppress commit descriptions, only provides commit count"
Wang Sheng07432ce2013-01-30 17:23:08 +080012413msgstr "隐藏提交说明,只提供提交数量"
Jiang Xinef317cd2012-09-15 11:17:00 +080012414
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012415#: builtin/shortlog.c:255
Jiang Xinef317cd2012-09-15 11:17:00 +080012416msgid "Show the email address of each author"
Wang Sheng07432ce2013-01-30 17:23:08 +080012417msgstr "显示每个作者的电子邮件地址"
Jiang Xinef317cd2012-09-15 11:17:00 +080012418
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012419#: builtin/shortlog.c:256
Jiang Xinef317cd2012-09-15 11:17:00 +080012420msgid "w[,i1[,i2]]"
Wang Sheng07432ce2013-01-30 17:23:08 +080012421msgstr "w[,i1[,i2]]"
Jiang Xinef317cd2012-09-15 11:17:00 +080012422
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012423#: builtin/shortlog.c:257
Jiang Xinef317cd2012-09-15 11:17:00 +080012424msgid "Linewrap output"
Wang Sheng07432ce2013-01-30 17:23:08 +080012425msgstr "折行输出"
Jiang Xinef317cd2012-09-15 11:17:00 +080012426
Jiang Xin94550ed2015-11-16 07:02:11 +080012427#: builtin/show-branch.c:10
Jiang Xinef317cd2012-09-15 11:17:00 +080012428msgid ""
Jiang Xin814ff312015-02-16 21:34:19 +080012429"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
Jiang Xin1e607442015-01-21 15:05:03 +080012430"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
12431"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
12432"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
Jiang Xinef317cd2012-09-15 11:17:00 +080012433msgstr ""
Jiang Xin814ff312015-02-16 21:34:19 +080012434"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
Jiang Xin1e607442015-01-21 15:05:03 +080012435"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
12436"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
12437"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
Jiang Xinef317cd2012-09-15 11:17:00 +080012438
Jiang Xin94550ed2015-11-16 07:02:11 +080012439#: builtin/show-branch.c:14
Jiang Xin814ff312015-02-16 21:34:19 +080012440msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
12441msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080012442
Jiang Xina0b6b242016-10-27 21:53:37 +080012443#: builtin/show-branch.c:375
12444#, c-format
12445msgid "ignoring %s; cannot handle more than %d ref"
12446msgid_plural "ignoring %s; cannot handle more than %d refs"
12447msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
12448msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
12449
12450#: builtin/show-branch.c:541
12451#, c-format
12452msgid "no matching refs with %s"
12453msgstr "没有和 %s 匹配的引用"
12454
12455#: builtin/show-branch.c:639
Jiang Xinef317cd2012-09-15 11:17:00 +080012456msgid "show remote-tracking and local branches"
Wang Sheng07432ce2013-01-30 17:23:08 +080012457msgstr "显示远程跟踪的和本地的分支"
Jiang Xinef317cd2012-09-15 11:17:00 +080012458
Jiang Xina0b6b242016-10-27 21:53:37 +080012459#: builtin/show-branch.c:641
Jiang Xinef317cd2012-09-15 11:17:00 +080012460msgid "show remote-tracking branches"
Wang Sheng07432ce2013-01-30 17:23:08 +080012461msgstr "显示远程跟踪的分支"
Jiang Xinef317cd2012-09-15 11:17:00 +080012462
Jiang Xina0b6b242016-10-27 21:53:37 +080012463#: builtin/show-branch.c:643
Jiang Xinef317cd2012-09-15 11:17:00 +080012464msgid "color '*!+-' corresponding to the branch"
Wang Sheng07432ce2013-01-30 17:23:08 +080012465msgstr "着色 '*!+-' 到相应的分支"
Jiang Xinef317cd2012-09-15 11:17:00 +080012466
Jiang Xina0b6b242016-10-27 21:53:37 +080012467#: builtin/show-branch.c:645
Jiang Xinef317cd2012-09-15 11:17:00 +080012468msgid "show <n> more commits after the common ancestor"
Wang Sheng07432ce2013-01-30 17:23:08 +080012469msgstr "显示共同祖先后的 <n> 个提交"
Jiang Xinef317cd2012-09-15 11:17:00 +080012470
Jiang Xina0b6b242016-10-27 21:53:37 +080012471#: builtin/show-branch.c:647
Jiang Xinef317cd2012-09-15 11:17:00 +080012472msgid "synonym to more=-1"
Wang Sheng07432ce2013-01-30 17:23:08 +080012473msgstr "和 more=-1 同义"
Jiang Xinef317cd2012-09-15 11:17:00 +080012474
Jiang Xina0b6b242016-10-27 21:53:37 +080012475#: builtin/show-branch.c:648
Jiang Xinef317cd2012-09-15 11:17:00 +080012476msgid "suppress naming strings"
Wang Sheng07432ce2013-01-30 17:23:08 +080012477msgstr "不显示字符串命名"
Jiang Xinef317cd2012-09-15 11:17:00 +080012478
Jiang Xina0b6b242016-10-27 21:53:37 +080012479#: builtin/show-branch.c:650
Jiang Xinef317cd2012-09-15 11:17:00 +080012480msgid "include the current branch"
Wang Sheng07432ce2013-01-30 17:23:08 +080012481msgstr "包括当前分支"
Jiang Xinef317cd2012-09-15 11:17:00 +080012482
Jiang Xina0b6b242016-10-27 21:53:37 +080012483#: builtin/show-branch.c:652
Jiang Xinef317cd2012-09-15 11:17:00 +080012484msgid "name commits with their object names"
Wang Sheng07432ce2013-01-30 17:23:08 +080012485msgstr "以对象名字命名提交"
Jiang Xinef317cd2012-09-15 11:17:00 +080012486
Jiang Xina0b6b242016-10-27 21:53:37 +080012487#: builtin/show-branch.c:654
Jiang Xinef317cd2012-09-15 11:17:00 +080012488msgid "show possible merge bases"
Wang Sheng07432ce2013-01-30 17:23:08 +080012489msgstr "显示可能合并的基线"
Jiang Xinef317cd2012-09-15 11:17:00 +080012490
Jiang Xina0b6b242016-10-27 21:53:37 +080012491#: builtin/show-branch.c:656
Jiang Xinef317cd2012-09-15 11:17:00 +080012492msgid "show refs unreachable from any other ref"
Wang Sheng07432ce2013-01-30 17:23:08 +080012493msgstr "显示没有任何引用的的引用"
Jiang Xinef317cd2012-09-15 11:17:00 +080012494
Jiang Xina0b6b242016-10-27 21:53:37 +080012495#: builtin/show-branch.c:658
Jiang Xinef317cd2012-09-15 11:17:00 +080012496msgid "show commits in topological order"
Wang Sheng07432ce2013-01-30 17:23:08 +080012497msgstr "以拓扑顺序显示提交"
Jiang Xinef317cd2012-09-15 11:17:00 +080012498
Jiang Xina0b6b242016-10-27 21:53:37 +080012499#: builtin/show-branch.c:661
Jiang Xinef317cd2012-09-15 11:17:00 +080012500msgid "show only commits not on the first branch"
Wang Sheng07432ce2013-01-30 17:23:08 +080012501msgstr "只显示不在第一个分支上的提交"
Jiang Xinef317cd2012-09-15 11:17:00 +080012502
Jiang Xina0b6b242016-10-27 21:53:37 +080012503#: builtin/show-branch.c:663
Jiang Xinef317cd2012-09-15 11:17:00 +080012504msgid "show merges reachable from only one tip"
Wang Sheng07432ce2013-01-30 17:23:08 +080012505msgstr "显示仅一个分支可访问的合并提交"
Jiang Xinef317cd2012-09-15 11:17:00 +080012506
Jiang Xina0b6b242016-10-27 21:53:37 +080012507#: builtin/show-branch.c:665
Jiang Xin2e8451e2013-07-26 14:00:02 +080012508msgid "topologically sort, maintaining date order where possible"
12509msgstr "拓扑方式排序,并尽可能地保持日期顺序"
Jiang Xinef317cd2012-09-15 11:17:00 +080012510
Jiang Xina0b6b242016-10-27 21:53:37 +080012511#: builtin/show-branch.c:668
Jiang Xinef317cd2012-09-15 11:17:00 +080012512msgid "<n>[,<base>]"
Wang Sheng07432ce2013-01-30 17:23:08 +080012513msgstr "<n>[,<base>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080012514
Jiang Xina0b6b242016-10-27 21:53:37 +080012515#: builtin/show-branch.c:669
Jiang Xinef317cd2012-09-15 11:17:00 +080012516msgid "show <n> most recent ref-log entries starting at base"
Wang Sheng07432ce2013-01-30 17:23:08 +080012517msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
Jiang Xinef317cd2012-09-15 11:17:00 +080012518
Jiang Xina0b6b242016-10-27 21:53:37 +080012519#: builtin/show-branch.c:703
12520msgid ""
12521"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
12522msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
12523
12524#: builtin/show-branch.c:727
12525msgid "no branches given, and HEAD is not valid"
12526msgstr "未提供分支,且 HEAD 无效"
12527
12528#: builtin/show-branch.c:730
12529msgid "--reflog option needs one branch name"
12530msgstr "选项 --reflog 需要一个分支名"
12531
12532#: builtin/show-branch.c:733
12533#, c-format
12534msgid "only %d entry can be shown at one time."
12535msgid_plural "only %d entries can be shown at one time."
12536msgstr[0] "一次只能显示 %d 个条目。"
12537msgstr[1] "一次只能显示 %d 个条目。"
12538
12539#: builtin/show-branch.c:737
12540#, c-format
12541msgid "no such ref %s"
12542msgstr "无此引用 %s"
12543
12544#: builtin/show-branch.c:829
12545#, c-format
12546msgid "cannot handle more than %d rev."
12547msgid_plural "cannot handle more than %d revs."
12548msgstr[0] "不能处理 %d 个以上的版本。"
12549msgstr[1] "不能处理 %d 个以上的版本。"
12550
12551#: builtin/show-branch.c:833
12552#, c-format
12553msgid "'%s' is not a valid ref."
12554msgstr "'%s' 不是一个有效的引用。"
12555
12556#: builtin/show-branch.c:836
12557#, c-format
12558msgid "cannot find commit %s (%s)"
Ray Chen29004bb2016-12-28 17:08:45 +080012559msgstr "不能找到提交 %s(%s)"
Jiang Xina0b6b242016-10-27 21:53:37 +080012560
Jiang Xinef317cd2012-09-15 11:17:00 +080012561#: builtin/show-ref.c:10
12562msgid ""
Jiang Xin814ff312015-02-16 21:34:19 +080012563"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
12564"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +080012565msgstr ""
Jiang Xin814ff312015-02-16 21:34:19 +080012566"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
12567"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +080012568
12569#: builtin/show-ref.c:11
Jiang Xin94550ed2015-11-16 07:02:11 +080012570msgid "git show-ref --exclude-existing[=<pattern>]"
12571msgstr "git show-ref --exclude-existing[=<模式>]"
Wang Sheng07432ce2013-01-30 17:23:08 +080012572
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012573#: builtin/show-ref.c:159
Wang Sheng07432ce2013-01-30 17:23:08 +080012574msgid "only show tags (can be combined with heads)"
Ray Chen55a16ee2015-07-28 12:52:28 +080012575msgstr "只显示标签(可以和头共用)"
Wang Sheng07432ce2013-01-30 17:23:08 +080012576
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012577#: builtin/show-ref.c:160
Wang Sheng07432ce2013-01-30 17:23:08 +080012578msgid "only show heads (can be combined with tags)"
Ray Chen55a16ee2015-07-28 12:52:28 +080012579msgstr "只显示头(可以和标签共用)"
Wang Sheng07432ce2013-01-30 17:23:08 +080012580
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012581#: builtin/show-ref.c:161
Wang Sheng07432ce2013-01-30 17:23:08 +080012582msgid "stricter reference checking, requires exact ref path"
12583msgstr "更严格的引用检测,需要精确的引用路径"
12584
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012585#: builtin/show-ref.c:164 builtin/show-ref.c:166
Jiang Xin2e8451e2013-07-26 14:00:02 +080012586msgid "show the HEAD reference, even if it would be filtered out"
12587msgstr "显示 HEAD 引用,即使被过滤掉"
Wang Sheng07432ce2013-01-30 17:23:08 +080012588
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012589#: builtin/show-ref.c:168
Wang Sheng07432ce2013-01-30 17:23:08 +080012590msgid "dereference tags into object IDs"
Ray Chen4375c102015-08-10 18:03:29 +080012591msgstr "转换标签到对象 ID"
Wang Sheng07432ce2013-01-30 17:23:08 +080012592
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012593#: builtin/show-ref.c:170
Wang Sheng07432ce2013-01-30 17:23:08 +080012594msgid "only show SHA1 hash using <n> digits"
12595msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
12596
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012597#: builtin/show-ref.c:174
Wang Sheng07432ce2013-01-30 17:23:08 +080012598msgid "do not print results to stdout (useful with --verify)"
12599msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
Jiang Xinef317cd2012-09-15 11:17:00 +080012600
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012601#: builtin/show-ref.c:176
Jiang Xinef317cd2012-09-15 11:17:00 +080012602msgid "show refs from stdin that aren't in local repository"
Jiang Xin160fb2b2015-08-02 21:47:30 +080012603msgstr "显示从标准输入中读入的不在本地仓库中的引用"
Jiang Xinef317cd2012-09-15 11:17:00 +080012604
Jiang Xin94550ed2015-11-16 07:02:11 +080012605#: builtin/stripspace.c:17
12606msgid "git stripspace [-s | --strip-comments]"
12607msgstr "git stripspace [-s | --strip-comments]"
12608
12609#: builtin/stripspace.c:18
12610msgid "git stripspace [-c | --comment-lines]"
12611msgstr "git stripspace [-c | --comment-lines]"
12612
12613#: builtin/stripspace.c:35
12614msgid "skip and remove all lines starting with comment character"
12615msgstr "跳过和移除所有的注释行"
12616
12617#: builtin/stripspace.c:38
Jiang Xin276ceea2016-02-28 20:35:55 +080012618msgid "prepend comment character and space to each line"
Jiang Xin94550ed2015-11-16 07:02:11 +080012619msgstr "为每一行的行首添加注释符和空格"
12620
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012621#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062
Jiang Xin5b04ee32016-05-29 20:40:35 +080012622#, c-format
12623msgid "No such ref: %s"
12624msgstr "没有这样的引用:%s"
12625
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012626#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071
Jiang Xin5b04ee32016-05-29 20:40:35 +080012627#, c-format
12628msgid "Expecting a full ref name, got %s"
12629msgstr "期望一个完整的引用名称,却得到 %s"
12630
12631#: builtin/submodule--helper.c:71
12632#, c-format
12633msgid "cannot strip one component off url '%s'"
12634msgstr "无法从 url '%s' 剥离一个组件"
12635
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012636#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592
Jiang Xin94550ed2015-11-16 07:02:11 +080012637msgid "alternative anchor for relative paths"
12638msgstr "相对路径的替代锚记(anchor)"
12639
Jiang Xina0b6b242016-10-27 21:53:37 +080012640#: builtin/submodule--helper.c:287
Jiang Xin94550ed2015-11-16 07:02:11 +080012641msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
12642msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
12643
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012644#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347
Jiang Xin5b04ee32016-05-29 20:40:35 +080012645#, c-format
12646msgid "No url found for submodule path '%s' in .gitmodules"
12647msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
12648
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012649#: builtin/submodule--helper.c:373
Jiang Xin5b04ee32016-05-29 20:40:35 +080012650#, c-format
12651msgid "Failed to register url for submodule path '%s'"
12652msgstr "无法为子模组 '%s' 注册 url"
12653
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012654#: builtin/submodule--helper.c:377
Jiang Xin5b04ee32016-05-29 20:40:35 +080012655#, c-format
12656msgid "Submodule '%s' (%s) registered for path '%s'\n"
Ray Chenaef18cc2016-06-06 00:06:17 +080012657msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
Jiang Xin5b04ee32016-05-29 20:40:35 +080012658
12659#
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012660#: builtin/submodule--helper.c:387
Ray Chenaef18cc2016-06-06 00:06:17 +080012661#, c-format
Jiang Xin5b04ee32016-05-29 20:40:35 +080012662msgid "warning: command update mode suggested for submodule '%s'\n"
Ray Chenaef18cc2016-06-06 00:06:17 +080012663msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
Jiang Xin5b04ee32016-05-29 20:40:35 +080012664
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012665#: builtin/submodule--helper.c:394
Jiang Xin5b04ee32016-05-29 20:40:35 +080012666#, c-format
12667msgid "Failed to register update mode for submodule path '%s'"
12668msgstr "无法为子模组 '%s' 注册更新模式"
12669
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012670#: builtin/submodule--helper.c:410
Jiang Xin5b04ee32016-05-29 20:40:35 +080012671msgid "Suppress output for initializing a submodule"
12672msgstr "初始化子模组时抑制输出"
12673
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012674#: builtin/submodule--helper.c:415
Jiang Xin5b04ee32016-05-29 20:40:35 +080012675msgid "git submodule--helper init [<path>]"
12676msgstr "git submodule--helper init [<路径>]"
12677
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012678#: builtin/submodule--helper.c:436
Jiang Xin94550ed2015-11-16 07:02:11 +080012679msgid "git submodule--helper name <path>"
12680msgstr "git submodule--helper name <路径>"
12681
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012682#: builtin/submodule--helper.c:442
Jiang Xin94550ed2015-11-16 07:02:11 +080012683#, c-format
12684msgid "no submodule mapping found in .gitmodules for path '%s'"
12685msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
12686
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012687#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528
Jiang Xina0b6b242016-10-27 21:53:37 +080012688#, c-format
12689msgid "submodule '%s' cannot add alternate: %s"
12690msgstr "子模组 '%s' 不能添加仓库备选:%s"
12691
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012692#: builtin/submodule--helper.c:564
Jiang Xina0b6b242016-10-27 21:53:37 +080012693#, c-format
12694msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
12695msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
12696
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012697#: builtin/submodule--helper.c:571
Jiang Xina0b6b242016-10-27 21:53:37 +080012698#, c-format
12699msgid "Value '%s' for submodule.alternateLocation is not recognized"
12700msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
12701
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012702#: builtin/submodule--helper.c:595
Jiang Xin94550ed2015-11-16 07:02:11 +080012703msgid "where the new submodule will be cloned to"
12704msgstr "新的子模组将要克隆的路径"
12705
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012706#: builtin/submodule--helper.c:598
Jiang Xin94550ed2015-11-16 07:02:11 +080012707msgid "name of the new submodule"
12708msgstr "新子模组的名称"
12709
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012710#: builtin/submodule--helper.c:601
Jiang Xin94550ed2015-11-16 07:02:11 +080012711msgid "url where to clone the submodule from"
12712msgstr "克隆子模组的 url 地址"
12713
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012714#: builtin/submodule--helper.c:607
Jiang Xin94550ed2015-11-16 07:02:11 +080012715msgid "depth for shallow clones"
12716msgstr "浅克隆的深度"
12717
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012718#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980
Jiang Xina0b6b242016-10-27 21:53:37 +080012719msgid "force cloning progress"
Ray Chen29004bb2016-12-28 17:08:45 +080012720msgstr "强制显示克隆进度"
Jiang Xina0b6b242016-10-27 21:53:37 +080012721
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012722#: builtin/submodule--helper.c:615
Jiang Xin94550ed2015-11-16 07:02:11 +080012723msgid ""
12724"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
Jiang Xin5b04ee32016-05-29 20:40:35 +080012725"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
Jiang Xin5c57d762016-08-28 10:18:12 +080012726msgstr ""
12727"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
12728"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
Jiang Xin94550ed2015-11-16 07:02:11 +080012729
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012730#: builtin/submodule--helper.c:646
Jiang Xin94550ed2015-11-16 07:02:11 +080012731#, c-format
12732msgid "clone of '%s' into submodule path '%s' failed"
12733msgstr "无法克隆 '%s' 到子模组路径 '%s'"
12734
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012735#: builtin/submodule--helper.c:662
Jiang Xin94550ed2015-11-16 07:02:11 +080012736#, c-format
12737msgid "cannot open file '%s'"
12738msgstr "无法打开文件 '%s'"
12739
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012740#: builtin/submodule--helper.c:667
Jiang Xin94550ed2015-11-16 07:02:11 +080012741#, c-format
12742msgid "could not close file %s"
12743msgstr "无法关闭文件 %s"
12744
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012745#: builtin/submodule--helper.c:674
Jiang Xin94550ed2015-11-16 07:02:11 +080012746#, c-format
12747msgid "could not get submodule directory for '%s'"
12748msgstr "无法得到 '%s' 的子模组目录"
12749
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012750#: builtin/submodule--helper.c:742
Jiang Xin94550ed2015-11-16 07:02:11 +080012751#, c-format
Jiang Xin5b04ee32016-05-29 20:40:35 +080012752msgid "Submodule path '%s' not initialized"
12753msgstr "子模组 '%s' 尚未初始化"
12754
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012755#: builtin/submodule--helper.c:746
Jiang Xin5b04ee32016-05-29 20:40:35 +080012756msgid "Maybe you want to use 'update --init'?"
12757msgstr "也许您想要执行 'update --init'?"
12758
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012759#: builtin/submodule--helper.c:772
Jiang Xin5b04ee32016-05-29 20:40:35 +080012760#, c-format
12761msgid "Skipping unmerged submodule %s"
12762msgstr "略过未合并的子模组 %s"
12763
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012764#: builtin/submodule--helper.c:793
Jiang Xin5b04ee32016-05-29 20:40:35 +080012765#, c-format
12766msgid "Skipping submodule '%s'"
12767msgstr "略过子模组 '%s'"
12768
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012769#: builtin/submodule--helper.c:929
Jiang Xin5c57d762016-08-28 10:18:12 +080012770#, c-format
12771msgid "Failed to clone '%s'. Retry scheduled"
12772msgstr "克隆 '%s' 失败。按计划重试"
12773
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012774#: builtin/submodule--helper.c:940
Jiang Xin5c57d762016-08-28 10:18:12 +080012775#, c-format
12776msgid "Failed to clone '%s' a second time, aborting"
12777msgstr "第二次尝试克隆 '%s' 失败,退出"
12778
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012779#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105
Jiang Xin5b04ee32016-05-29 20:40:35 +080012780msgid "path into the working tree"
12781msgstr "到工作区的路径"
12782
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012783#: builtin/submodule--helper.c:964
Jiang Xin5b04ee32016-05-29 20:40:35 +080012784msgid "path into the working tree, across nested submodule boundaries"
12785msgstr "工作区中的路径,递归嵌套子模组"
12786
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012787#: builtin/submodule--helper.c:968
Jiang Xin5b04ee32016-05-29 20:40:35 +080012788msgid "rebase, merge, checkout or none"
12789msgstr "rebase、merge、checkout 或 none"
12790
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012791#: builtin/submodule--helper.c:972
Jiang Xin5b04ee32016-05-29 20:40:35 +080012792msgid "Create a shallow clone truncated to the specified number of revisions"
12793msgstr "创建一个指定深度的浅克隆"
12794
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012795#: builtin/submodule--helper.c:975
Jiang Xin5b04ee32016-05-29 20:40:35 +080012796msgid "parallel jobs"
12797msgstr "并发任务"
12798
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012799#: builtin/submodule--helper.c:977
Jiang Xin5c57d762016-08-28 10:18:12 +080012800msgid "whether the initial clone should follow the shallow recommendation"
Ray Chen9a4b6942016-09-07 18:03:04 +080012801msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
Jiang Xin5c57d762016-08-28 10:18:12 +080012802
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012803#: builtin/submodule--helper.c:978
Jiang Xin5b04ee32016-05-29 20:40:35 +080012804msgid "don't print cloning progress"
12805msgstr "不要输出克隆进度"
12806
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012807#: builtin/submodule--helper.c:985
Jiang Xin5b04ee32016-05-29 20:40:35 +080012808msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
12809msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
12810
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012811#: builtin/submodule--helper.c:995
Jiang Xin5b04ee32016-05-29 20:40:35 +080012812msgid "bad value for update parameter"
12813msgstr "update 参数取值错误"
12814
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012815#: builtin/submodule--helper.c:1066
Jiang Xin5c57d762016-08-28 10:18:12 +080012816#, c-format
12817msgid ""
12818"Submodule (%s) branch configured to inherit branch from superproject, but "
12819"the superproject is not on any branch"
12820msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
12821
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012822#: builtin/submodule--helper.c:1106
12823msgid "recurse into submodules"
12824msgstr "在子模组中递归"
12825
12826#: builtin/submodule--helper.c:1112
12827msgid "git submodule--helper embed-git-dir [<path>...]"
12828msgstr "git submodule--helper embed-git-dir [<路径>...]"
12829
12830#: builtin/submodule--helper.c:1157
Jiang Xin5b04ee32016-05-29 20:40:35 +080012831msgid "submodule--helper subcommand must be called with a subcommand"
12832msgstr "submodule-helper 子命令必须由另外的子命令调用"
12833
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012834#: builtin/submodule--helper.c:1164
12835#, c-format
12836msgid "%s doesn't support --super-prefix"
12837msgstr "%s 不支持 --super-prefix"
12838
12839#: builtin/submodule--helper.c:1170
Jiang Xin5b04ee32016-05-29 20:40:35 +080012840#, c-format
12841msgid "'%s' is not a valid submodule--helper subcommand"
12842msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
Jiang Xin94550ed2015-11-16 07:02:11 +080012843
Jiang Xinef317cd2012-09-15 11:17:00 +080012844#: builtin/symbolic-ref.c:7
Jiang Xin814ff312015-02-16 21:34:19 +080012845msgid "git symbolic-ref [<options>] <name> [<ref>]"
12846msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080012847
Wang Sheng07432ce2013-01-30 17:23:08 +080012848#: builtin/symbolic-ref.c:8
Jiang Xin814ff312015-02-16 21:34:19 +080012849msgid "git symbolic-ref -d [-q] <name>"
12850msgstr "git symbolic-ref -d [-q] <名称>"
Wang Sheng07432ce2013-01-30 17:23:08 +080012851
12852#: builtin/symbolic-ref.c:40
Jiang Xinef317cd2012-09-15 11:17:00 +080012853msgid "suppress error message for non-symbolic (detached) refs"
Wang Sheng07432ce2013-01-30 17:23:08 +080012854msgstr "不显示非符号(分离的)引用的错误信息"
Jiang Xinef317cd2012-09-15 11:17:00 +080012855
Wang Sheng07432ce2013-01-30 17:23:08 +080012856#: builtin/symbolic-ref.c:41
12857msgid "delete symbolic ref"
12858msgstr "删除符号引用"
12859
12860#: builtin/symbolic-ref.c:42
Jiang Xinef317cd2012-09-15 11:17:00 +080012861msgid "shorten ref output"
Wang Sheng07432ce2013-01-30 17:23:08 +080012862msgstr "简短的引用输出"
Jiang Xinef317cd2012-09-15 11:17:00 +080012863
Jiang Xin1b7f4a32015-08-23 15:23:21 +080012864#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
Jiang Xinef317cd2012-09-15 11:17:00 +080012865msgid "reason"
Wang Sheng07432ce2013-01-30 17:23:08 +080012866msgstr "原因"
Jiang Xinef317cd2012-09-15 11:17:00 +080012867
Jiang Xin1b7f4a32015-08-23 15:23:21 +080012868#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
Jiang Xinef317cd2012-09-15 11:17:00 +080012869msgid "reason of the update"
Wang Sheng07432ce2013-01-30 17:23:08 +080012870msgstr "更新的原因"
Jiang Xinef317cd2012-09-15 11:17:00 +080012871
Jiang Xin94550ed2015-11-16 07:02:11 +080012872#: builtin/tag.c:23
Jiang Xinef317cd2012-09-15 11:17:00 +080012873msgid ""
Jiang Xin814ff312015-02-16 21:34:19 +080012874"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
12875"[<head>]"
12876msgstr ""
12877"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080012878
Jiang Xin94550ed2015-11-16 07:02:11 +080012879#: builtin/tag.c:24
Jiang Xinef317cd2012-09-15 11:17:00 +080012880msgid "git tag -d <tagname>..."
Wang Sheng07432ce2013-01-30 17:23:08 +080012881msgstr "git tag -d <标签名>..."
Jiang Xinef317cd2012-09-15 11:17:00 +080012882
Jiang Xin94550ed2015-11-16 07:02:11 +080012883#: builtin/tag.c:25
Jiang Xinef317cd2012-09-15 11:17:00 +080012884msgid ""
Jiang Xin814ff312015-02-16 21:34:19 +080012885"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
Jiang Xin94550ed2015-11-16 07:02:11 +080012886"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +080012887msgstr ""
Jiang Xin94550ed2015-11-16 07:02:11 +080012888"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
12889"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +080012890
Jiang Xin94550ed2015-11-16 07:02:11 +080012891#: builtin/tag.c:27
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012892msgid "git tag -v [--format=<format>] <tagname>..."
12893msgstr "git tag -v [--format=<格式>] <标签名>..."
Jiang Xinef317cd2012-09-15 11:17:00 +080012894
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012895#: builtin/tag.c:82
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012896#, c-format
12897msgid "tag name too long: %.*s..."
Ray Chen55a16ee2015-07-28 12:52:28 +080012898msgstr "标签名称太长:%.*s..."
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012899
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012900#: builtin/tag.c:87
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012901#, c-format
12902msgid "tag '%s' not found."
Ray Chen55a16ee2015-07-28 12:52:28 +080012903msgstr "未发现标签 '%s'。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012904
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012905#: builtin/tag.c:102
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012906#, c-format
12907msgid "Deleted tag '%s' (was %s)\n"
Ray Chen55a16ee2015-07-28 12:52:28 +080012908msgstr "已删除标签 '%s'(曾为 %s)\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012909
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012910#: builtin/tag.c:131
Jiang Xina77c07d2013-02-14 17:47:45 +080012911#, c-format
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012912msgid ""
12913"\n"
Jiang Xin6acbf032014-08-04 16:23:15 +080012914"Write a message for tag:\n"
12915" %s\n"
Jiang Xina77c07d2013-02-14 17:47:45 +080012916"Lines starting with '%c' will be ignored.\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012917msgstr ""
12918"\n"
Ray Chen55a16ee2015-07-28 12:52:28 +080012919"输入一个标签说明:\n"
Jiang Xin6acbf032014-08-04 16:23:15 +080012920" %s\n"
Jiang Xina77c07d2013-02-14 17:47:45 +080012921"以 '%c' 开头的行将被忽略。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012922
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012923#: builtin/tag.c:135
Jiang Xina77c07d2013-02-14 17:47:45 +080012924#, c-format
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012925msgid ""
12926"\n"
Jiang Xin6acbf032014-08-04 16:23:15 +080012927"Write a message for tag:\n"
12928" %s\n"
Jiang Xina77c07d2013-02-14 17:47:45 +080012929"Lines starting with '%c' will be kept; you may remove them yourself if you "
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012930"want to.\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012931msgstr ""
12932"\n"
Ray Chen55a16ee2015-07-28 12:52:28 +080012933"输入一个标签说明:\n"
Jiang Xin6acbf032014-08-04 16:23:15 +080012934" %s\n"
Jiang Xina77c07d2013-02-14 17:47:45 +080012935"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012936
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012937#: builtin/tag.c:213
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012938msgid "unable to sign the tag"
Ray Chen55a16ee2015-07-28 12:52:28 +080012939msgstr "无法签署标签"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012940
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012941#: builtin/tag.c:215
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012942msgid "unable to write tag file"
Ray Chen55a16ee2015-07-28 12:52:28 +080012943msgstr "无法写标签文件"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012944
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012945#: builtin/tag.c:240
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012946msgid "bad object type."
Jiang Xin90e6ef52012-03-27 14:46:11 +080012947msgstr "坏的对象类型。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012948
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012949#: builtin/tag.c:253
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012950msgid "tag header too big."
Ray Chen55a16ee2015-07-28 12:52:28 +080012951msgstr "标签头信息太大。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012952
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012953#: builtin/tag.c:289
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012954msgid "no tag message?"
Ray Chen55a16ee2015-07-28 12:52:28 +080012955msgstr "无标签说明?"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012956
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012957#: builtin/tag.c:295
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012958#, c-format
12959msgid "The tag message has been left in %s\n"
Ray Chen55a16ee2015-07-28 12:52:28 +080012960msgstr "标签说明被保留在 %s\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080012961
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012962#: builtin/tag.c:354
Jiang Xinef317cd2012-09-15 11:17:00 +080012963msgid "list tag names"
Ray Chen55a16ee2015-07-28 12:52:28 +080012964msgstr "列出标签名称"
Jiang Xinef317cd2012-09-15 11:17:00 +080012965
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012966#: builtin/tag.c:356
Jiang Xinef317cd2012-09-15 11:17:00 +080012967msgid "print <n> lines of each tag message"
Ray Chen55a16ee2015-07-28 12:52:28 +080012968msgstr "每个标签信息打印 <n> 行"
Jiang Xinef317cd2012-09-15 11:17:00 +080012969
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012970#: builtin/tag.c:358
Jiang Xinef317cd2012-09-15 11:17:00 +080012971msgid "delete tags"
Ray Chen55a16ee2015-07-28 12:52:28 +080012972msgstr "删除标签"
Jiang Xinef317cd2012-09-15 11:17:00 +080012973
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012974#: builtin/tag.c:359
Jiang Xinef317cd2012-09-15 11:17:00 +080012975msgid "verify tags"
Ray Chen55a16ee2015-07-28 12:52:28 +080012976msgstr "验证标签"
Jiang Xinef317cd2012-09-15 11:17:00 +080012977
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012978#: builtin/tag.c:361
Jiang Xinef317cd2012-09-15 11:17:00 +080012979msgid "Tag creation options"
Ray Chen55a16ee2015-07-28 12:52:28 +080012980msgstr "标签创建选项"
Jiang Xinef317cd2012-09-15 11:17:00 +080012981
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012982#: builtin/tag.c:363
Jiang Xinef317cd2012-09-15 11:17:00 +080012983msgid "annotated tag, needs a message"
Ray Chen55a16ee2015-07-28 12:52:28 +080012984msgstr "附注标签,需要一个说明"
Jiang Xinef317cd2012-09-15 11:17:00 +080012985
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012986#: builtin/tag.c:365
Jiang Xinef317cd2012-09-15 11:17:00 +080012987msgid "tag message"
Ray Chen55a16ee2015-07-28 12:52:28 +080012988msgstr "标签说明"
Jiang Xinef317cd2012-09-15 11:17:00 +080012989
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012990#: builtin/tag.c:367
Jiang Xinef317cd2012-09-15 11:17:00 +080012991msgid "annotated and GPG-signed tag"
Ray Chen55a16ee2015-07-28 12:52:28 +080012992msgstr "附注并附加 GPG 签名的标签"
Jiang Xinef317cd2012-09-15 11:17:00 +080012993
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012994#: builtin/tag.c:371
Jiang Xinef317cd2012-09-15 11:17:00 +080012995msgid "use another key to sign the tag"
Ray Chen55a16ee2015-07-28 12:52:28 +080012996msgstr "使用另外的私钥签名该标签"
Jiang Xinef317cd2012-09-15 11:17:00 +080012997
Jiang Xin1a79b2f2017-01-27 22:50:57 +080012998#: builtin/tag.c:372
Jiang Xinef317cd2012-09-15 11:17:00 +080012999msgid "replace the tag if exists"
Ray Chen55a16ee2015-07-28 12:52:28 +080013000msgstr "如果存在,替换现有的标签"
Jiang Xinef317cd2012-09-15 11:17:00 +080013001
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013002#: builtin/tag.c:373 builtin/update-ref.c:368
Jiang Xin03ea3322015-09-15 21:51:26 +080013003msgid "create a reflog"
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013004msgstr "创建引用日志"
13005
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013006#: builtin/tag.c:375
Jiang Xin814ff312015-02-16 21:34:19 +080013007msgid "Tag listing options"
Ray Chen55a16ee2015-07-28 12:52:28 +080013008msgstr "标签列表选项"
Jiang Xin814ff312015-02-16 21:34:19 +080013009
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013010#: builtin/tag.c:376
Jiang Xinef317cd2012-09-15 11:17:00 +080013011msgid "show tag list in columns"
Ray Chen55a16ee2015-07-28 12:52:28 +080013012msgstr "以列的方式显示标签列表"
Jiang Xinef317cd2012-09-15 11:17:00 +080013013
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013014#: builtin/tag.c:377 builtin/tag.c:378
Jiang Xinef317cd2012-09-15 11:17:00 +080013015msgid "print only tags that contain the commit"
Ray Chen55a16ee2015-07-28 12:52:28 +080013016msgstr "只打印包含提交的标签"
Jiang Xinef317cd2012-09-15 11:17:00 +080013017
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013018#: builtin/tag.c:379
Jiang Xin94550ed2015-11-16 07:02:11 +080013019msgid "print only tags that are merged"
13020msgstr "只打印已经合并的标签"
13021
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013022#: builtin/tag.c:380
Jiang Xin94550ed2015-11-16 07:02:11 +080013023msgid "print only tags that are not merged"
13024msgstr "只打印尚未合并的标签"
13025
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013026#: builtin/tag.c:385
Jiang Xinef317cd2012-09-15 11:17:00 +080013027msgid "print only tags of the object"
Ray Chen55a16ee2015-07-28 12:52:28 +080013028msgstr "只打印对象的标签"
Jiang Xinef317cd2012-09-15 11:17:00 +080013029
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013030#: builtin/tag.c:415
Jiang Xin8ada9592012-05-21 09:35:47 +080013031msgid "--column and -n are incompatible"
Jiang Xin81809b92012-05-30 12:19:47 +080013032msgstr "--column 和 -n 不兼容"
Jiang Xin8ada9592012-05-21 09:35:47 +080013033
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013034#: builtin/tag.c:437
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013035msgid "-n option is only allowed with -l."
Jiang Xin649900b2012-08-02 11:50:59 +080013036msgstr "-n 选项只允许和 -l 同时使用。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013037
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013038#: builtin/tag.c:439
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013039msgid "--contains option is only allowed with -l."
Jiang Xin649900b2012-08-02 11:50:59 +080013040msgstr "--contains 选项只允许和 -l 同时使用。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013041
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013042#: builtin/tag.c:441
Jiang Xin7ac1c0a2012-02-28 12:24:54 +080013043msgid "--points-at option is only allowed with -l."
Jiang Xin649900b2012-08-02 11:50:59 +080013044msgstr "--points-at 选项只允许和 -l 同时使用。"
Jiang Xin7ac1c0a2012-02-28 12:24:54 +080013045
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013046#: builtin/tag.c:443
Jiang Xin94550ed2015-11-16 07:02:11 +080013047msgid "--merged and --no-merged option are only allowed with -l"
13048msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
13049
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013050#: builtin/tag.c:454
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013051msgid "only one -F or -m option is allowed."
13052msgstr "只允许一个 -F 或 -m 选项。"
13053
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013054#: builtin/tag.c:473
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013055msgid "too many params"
13056msgstr "太多参数"
13057
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013058#: builtin/tag.c:479
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013059#, c-format
13060msgid "'%s' is not a valid tag name."
Ray Chen55a16ee2015-07-28 12:52:28 +080013061msgstr "'%s' 不是一个有效的标签名称。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013062
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013063#: builtin/tag.c:484
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013064#, c-format
13065msgid "tag '%s' already exists"
Ray Chen55a16ee2015-07-28 12:52:28 +080013066msgstr "标签 '%s' 已存在"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013067
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013068#: builtin/tag.c:512
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013069#, c-format
13070msgid "Updated tag '%s' (was %s)\n"
Ray Chen55a16ee2015-07-28 12:52:28 +080013071msgstr "已更新标签 '%s'(曾为 %s)\n"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013072
Jiang Xina0b6b242016-10-27 21:53:37 +080013073#: builtin/unpack-objects.c:493
Jiang Xin6c94aba2014-03-13 12:41:34 +080013074msgid "Unpacking objects"
13075msgstr "展开对象中"
13076
Jiang Xin276ceea2016-02-28 20:35:55 +080013077#: builtin/update-index.c:79
Jiang Xin7aea43f2015-05-31 08:42:31 +080013078#, c-format
13079msgid "failed to create directory %s"
13080msgstr "无法创建目录 %s"
13081
Jiang Xin276ceea2016-02-28 20:35:55 +080013082#: builtin/update-index.c:85
Jiang Xin7aea43f2015-05-31 08:42:31 +080013083#, c-format
13084msgid "failed to stat %s"
13085msgstr "无法枚举 %s 状态"
13086
Jiang Xin276ceea2016-02-28 20:35:55 +080013087#: builtin/update-index.c:95
Jiang Xin7aea43f2015-05-31 08:42:31 +080013088#, c-format
13089msgid "failed to create file %s"
13090msgstr "无法创建文件 %s"
13091
Jiang Xin276ceea2016-02-28 20:35:55 +080013092#: builtin/update-index.c:103
Jiang Xin7aea43f2015-05-31 08:42:31 +080013093#, c-format
13094msgid "failed to delete file %s"
13095msgstr "无法删除文件 %s"
13096
Jiang Xin276ceea2016-02-28 20:35:55 +080013097#: builtin/update-index.c:110 builtin/update-index.c:212
Jiang Xin7aea43f2015-05-31 08:42:31 +080013098#, c-format
13099msgid "failed to delete directory %s"
13100msgstr "无法删除目录 %s"
13101
Jiang Xin276ceea2016-02-28 20:35:55 +080013102#: builtin/update-index.c:133
Jiang Xin7aea43f2015-05-31 08:42:31 +080013103#, c-format
Jiang Xin276ceea2016-02-28 20:35:55 +080013104msgid "Testing mtime in '%s' "
13105msgstr "在 '%s' 中测试 mtime "
Jiang Xin7aea43f2015-05-31 08:42:31 +080013106
Jiang Xin276ceea2016-02-28 20:35:55 +080013107#: builtin/update-index.c:145
Jiang Xin7aea43f2015-05-31 08:42:31 +080013108msgid "directory stat info does not change after adding a new file"
13109msgstr "添加一个新文件后,目录的状态信息未改变"
13110
Jiang Xin276ceea2016-02-28 20:35:55 +080013111#: builtin/update-index.c:158
Jiang Xin7aea43f2015-05-31 08:42:31 +080013112msgid "directory stat info does not change after adding a new directory"
13113msgstr "添加一个新目录后,目录的状态信息未改变"
13114
Jiang Xin276ceea2016-02-28 20:35:55 +080013115#: builtin/update-index.c:171
Jiang Xin7aea43f2015-05-31 08:42:31 +080013116msgid "directory stat info changes after updating a file"
13117msgstr "更新一个文件后,目录的状态信息被修改"
13118
Jiang Xin276ceea2016-02-28 20:35:55 +080013119#: builtin/update-index.c:182
Jiang Xin7aea43f2015-05-31 08:42:31 +080013120msgid "directory stat info changes after adding a file inside subdirectory"
13121msgstr "在子目录中添加文件后,目录的状态信息被修改"
13122
Jiang Xin276ceea2016-02-28 20:35:55 +080013123#: builtin/update-index.c:193
Jiang Xin7aea43f2015-05-31 08:42:31 +080013124msgid "directory stat info does not change after deleting a file"
13125msgstr "删除一个文件后,目录的状态信息未改变"
13126
Jiang Xin276ceea2016-02-28 20:35:55 +080013127#: builtin/update-index.c:206
Jiang Xin7aea43f2015-05-31 08:42:31 +080013128msgid "directory stat info does not change after deleting a directory"
13129msgstr "删除一个目录后,目录的状态信息未改变"
13130
Jiang Xin276ceea2016-02-28 20:35:55 +080013131#: builtin/update-index.c:213
Jiang Xin7aea43f2015-05-31 08:42:31 +080013132msgid " OK"
13133msgstr " OK"
13134
Jiang Xina0b6b242016-10-27 21:53:37 +080013135#: builtin/update-index.c:564
Jiang Xin814ff312015-02-16 21:34:19 +080013136msgid "git update-index [<options>] [--] [<file>...]"
13137msgstr "git update-index [<选项>] [--] [<文件>...]"
Jiang Xinef317cd2012-09-15 11:17:00 +080013138
Jiang Xina0b6b242016-10-27 21:53:37 +080013139#: builtin/update-index.c:919
Jiang Xinef317cd2012-09-15 11:17:00 +080013140msgid "continue refresh even when index needs update"
Wang Sheng07432ce2013-01-30 17:23:08 +080013141msgstr "当索引需要更新时继续刷新"
Jiang Xinef317cd2012-09-15 11:17:00 +080013142
Jiang Xina0b6b242016-10-27 21:53:37 +080013143#: builtin/update-index.c:922
Jiang Xinef317cd2012-09-15 11:17:00 +080013144msgid "refresh: ignore submodules"
Wang Sheng07432ce2013-01-30 17:23:08 +080013145msgstr "刷新:忽略子模组"
Jiang Xinef317cd2012-09-15 11:17:00 +080013146
Jiang Xina0b6b242016-10-27 21:53:37 +080013147#: builtin/update-index.c:925
Jiang Xinef317cd2012-09-15 11:17:00 +080013148msgid "do not ignore new files"
Wang Sheng07432ce2013-01-30 17:23:08 +080013149msgstr "不忽略新的文件"
Jiang Xinef317cd2012-09-15 11:17:00 +080013150
Jiang Xina0b6b242016-10-27 21:53:37 +080013151#: builtin/update-index.c:927
Jiang Xinef317cd2012-09-15 11:17:00 +080013152msgid "let files replace directories and vice-versa"
Wang Sheng07432ce2013-01-30 17:23:08 +080013153msgstr "让文件替换目录(反之亦然)"
Jiang Xinef317cd2012-09-15 11:17:00 +080013154
Jiang Xina0b6b242016-10-27 21:53:37 +080013155#: builtin/update-index.c:929
Jiang Xinef317cd2012-09-15 11:17:00 +080013156msgid "notice files missing from worktree"
Wang Sheng07432ce2013-01-30 17:23:08 +080013157msgstr "通知文件从工作区丢失"
Jiang Xinef317cd2012-09-15 11:17:00 +080013158
Jiang Xina0b6b242016-10-27 21:53:37 +080013159#: builtin/update-index.c:931
Jiang Xinef317cd2012-09-15 11:17:00 +080013160msgid "refresh even if index contains unmerged entries"
Wang Sheng07432ce2013-01-30 17:23:08 +080013161msgstr "即使索引区包含未合并的条目也执行刷新"
Jiang Xinef317cd2012-09-15 11:17:00 +080013162
Jiang Xina0b6b242016-10-27 21:53:37 +080013163#: builtin/update-index.c:934
Jiang Xinef317cd2012-09-15 11:17:00 +080013164msgid "refresh stat information"
Wang Sheng07432ce2013-01-30 17:23:08 +080013165msgstr "刷新统计信息"
Jiang Xinef317cd2012-09-15 11:17:00 +080013166
Jiang Xina0b6b242016-10-27 21:53:37 +080013167#: builtin/update-index.c:938
Jiang Xinef317cd2012-09-15 11:17:00 +080013168msgid "like --refresh, but ignore assume-unchanged setting"
Wang Sheng07432ce2013-01-30 17:23:08 +080013169msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
Jiang Xinef317cd2012-09-15 11:17:00 +080013170
Jiang Xina0b6b242016-10-27 21:53:37 +080013171#: builtin/update-index.c:942
Jiang Xin6c94aba2014-03-13 12:41:34 +080013172msgid "<mode>,<object>,<path>"
Jiang Xind9d56b22015-01-18 20:37:57 +080013173msgstr "<存取模式>,<对象>,<路径>"
Jiang Xinef317cd2012-09-15 11:17:00 +080013174
Jiang Xina0b6b242016-10-27 21:53:37 +080013175#: builtin/update-index.c:943
Wang Sheng07432ce2013-01-30 17:23:08 +080013176msgid "add the specified entry to the index"
13177msgstr "添加指定的条目到索引区"
Jiang Xinef317cd2012-09-15 11:17:00 +080013178
Jiang Xina0b6b242016-10-27 21:53:37 +080013179#: builtin/update-index.c:952
Jiang Xinef317cd2012-09-15 11:17:00 +080013180msgid "mark files as \"not changing\""
Wang Sheng07432ce2013-01-30 17:23:08 +080013181msgstr "把文件标记为 \"没有变更\""
Jiang Xinef317cd2012-09-15 11:17:00 +080013182
Jiang Xina0b6b242016-10-27 21:53:37 +080013183#: builtin/update-index.c:955
Jiang Xinef317cd2012-09-15 11:17:00 +080013184msgid "clear assumed-unchanged bit"
Wang Sheng07432ce2013-01-30 17:23:08 +080013185msgstr "清除 assumed-unchanged 位"
Jiang Xinef317cd2012-09-15 11:17:00 +080013186
Jiang Xina0b6b242016-10-27 21:53:37 +080013187#: builtin/update-index.c:958
Jiang Xinef317cd2012-09-15 11:17:00 +080013188msgid "mark files as \"index-only\""
Wang Sheng07432ce2013-01-30 17:23:08 +080013189msgstr "把文件标记为 \"仅索引\""
Jiang Xinef317cd2012-09-15 11:17:00 +080013190
Jiang Xina0b6b242016-10-27 21:53:37 +080013191#: builtin/update-index.c:961
Jiang Xinef317cd2012-09-15 11:17:00 +080013192msgid "clear skip-worktree bit"
Wang Sheng07432ce2013-01-30 17:23:08 +080013193msgstr "清除 skip-worktree 位"
Jiang Xinef317cd2012-09-15 11:17:00 +080013194
Jiang Xina0b6b242016-10-27 21:53:37 +080013195#: builtin/update-index.c:964
Jiang Xinef317cd2012-09-15 11:17:00 +080013196msgid "add to index only; do not add content to object database"
Wang Sheng07432ce2013-01-30 17:23:08 +080013197msgstr "只添加到索引区;不添加对象到对象库"
Jiang Xinef317cd2012-09-15 11:17:00 +080013198
Jiang Xina0b6b242016-10-27 21:53:37 +080013199#: builtin/update-index.c:966
Jiang Xinef317cd2012-09-15 11:17:00 +080013200msgid "remove named paths even if present in worktree"
Wang Sheng07432ce2013-01-30 17:23:08 +080013201msgstr "即使存在工作区里,也删除路径"
Jiang Xinef317cd2012-09-15 11:17:00 +080013202
Jiang Xina0b6b242016-10-27 21:53:37 +080013203#: builtin/update-index.c:968
Jiang Xinef317cd2012-09-15 11:17:00 +080013204msgid "with --stdin: input lines are terminated by null bytes"
Wang Sheng07432ce2013-01-30 17:23:08 +080013205msgstr "携带 --stdin:输入的行以 null 字符终止"
Jiang Xinef317cd2012-09-15 11:17:00 +080013206
Jiang Xina0b6b242016-10-27 21:53:37 +080013207#: builtin/update-index.c:970
Jiang Xinef317cd2012-09-15 11:17:00 +080013208msgid "read list of paths to be updated from standard input"
Wang Sheng07432ce2013-01-30 17:23:08 +080013209msgstr "从标准输入中读取需要更新的路径列表"
Jiang Xinef317cd2012-09-15 11:17:00 +080013210
Jiang Xina0b6b242016-10-27 21:53:37 +080013211#: builtin/update-index.c:974
Jiang Xinef317cd2012-09-15 11:17:00 +080013212msgid "add entries from standard input to the index"
Wang Sheng07432ce2013-01-30 17:23:08 +080013213msgstr "从标准输入添加条目到索引区"
Jiang Xinef317cd2012-09-15 11:17:00 +080013214
Jiang Xina0b6b242016-10-27 21:53:37 +080013215#: builtin/update-index.c:978
Jiang Xinef317cd2012-09-15 11:17:00 +080013216msgid "repopulate stages #2 and #3 for the listed paths"
Wang Sheng07432ce2013-01-30 17:23:08 +080013217msgstr "为指定文件重新生成第2和第3暂存区"
Jiang Xinef317cd2012-09-15 11:17:00 +080013218
Jiang Xina0b6b242016-10-27 21:53:37 +080013219#: builtin/update-index.c:982
Jiang Xinef317cd2012-09-15 11:17:00 +080013220msgid "only update entries that differ from HEAD"
Wang Sheng07432ce2013-01-30 17:23:08 +080013221msgstr "只更新与 HEAD 不同的条目"
Jiang Xinef317cd2012-09-15 11:17:00 +080013222
Jiang Xina0b6b242016-10-27 21:53:37 +080013223#: builtin/update-index.c:986
Jiang Xinef317cd2012-09-15 11:17:00 +080013224msgid "ignore files missing from worktree"
Wang Sheng07432ce2013-01-30 17:23:08 +080013225msgstr "忽略工作区丢失的文件"
Jiang Xinef317cd2012-09-15 11:17:00 +080013226
Jiang Xina0b6b242016-10-27 21:53:37 +080013227#: builtin/update-index.c:989
Jiang Xinef317cd2012-09-15 11:17:00 +080013228msgid "report actions to standard output"
Wang Sheng07432ce2013-01-30 17:23:08 +080013229msgstr "在标准输出显示操作"
Jiang Xinef317cd2012-09-15 11:17:00 +080013230
Jiang Xina0b6b242016-10-27 21:53:37 +080013231#: builtin/update-index.c:991
Jiang Xinef317cd2012-09-15 11:17:00 +080013232msgid "(for porcelains) forget saved unresolved conflicts"
Wang Sheng07432ce2013-01-30 17:23:08 +080013233msgstr "(for porcelains) 忘记保存的未解决的冲突"
Jiang Xinef317cd2012-09-15 11:17:00 +080013234
Jiang Xina0b6b242016-10-27 21:53:37 +080013235#: builtin/update-index.c:995
Jiang Xinef317cd2012-09-15 11:17:00 +080013236msgid "write index in this format"
Wang Sheng07432ce2013-01-30 17:23:08 +080013237msgstr "以这种格式写入索引区"
Jiang Xinef317cd2012-09-15 11:17:00 +080013238
Jiang Xina0b6b242016-10-27 21:53:37 +080013239#: builtin/update-index.c:997
Jiang Xin6acbf032014-08-04 16:23:15 +080013240msgid "enable or disable split index"
13241msgstr "启用或禁用索引拆分"
13242
Jiang Xina0b6b242016-10-27 21:53:37 +080013243#: builtin/update-index.c:999
Jiang Xin7aea43f2015-05-31 08:42:31 +080013244msgid "enable/disable untracked cache"
13245msgstr "启用/禁用对未跟踪文件的缓存"
13246
Jiang Xina0b6b242016-10-27 21:53:37 +080013247#: builtin/update-index.c:1001
Jiang Xin276ceea2016-02-28 20:35:55 +080013248msgid "test if the filesystem supports untracked cache"
13249msgstr "测试文件系统是否支持未跟踪文件缓存"
13250
Jiang Xina0b6b242016-10-27 21:53:37 +080013251#: builtin/update-index.c:1003
Jiang Xin7aea43f2015-05-31 08:42:31 +080013252msgid "enable untracked cache without testing the filesystem"
13253msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
13254
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013255#: builtin/update-index.c:1120
Jiang Xina0b6b242016-10-27 21:53:37 +080013256msgid ""
13257"core.untrackedCache is set to true; remove or change it, if you really want "
13258"to disable the untracked cache"
Jiang Xin275588f2016-11-22 22:24:59 +080013259msgstr ""
13260"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
13261"改它。"
Jiang Xina0b6b242016-10-27 21:53:37 +080013262
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013263#: builtin/update-index.c:1124
Jiang Xin276ceea2016-02-28 20:35:55 +080013264msgid "Untracked cache disabled"
13265msgstr "缓存未跟踪文件被禁用"
13266
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013267#: builtin/update-index.c:1132
Jiang Xina0b6b242016-10-27 21:53:37 +080013268msgid ""
13269"core.untrackedCache is set to false; remove or change it, if you really want "
13270"to enable the untracked cache"
Jiang Xin275588f2016-11-22 22:24:59 +080013271msgstr ""
13272"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
13273"修改它。"
Jiang Xina0b6b242016-10-27 21:53:37 +080013274
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013275#: builtin/update-index.c:1136
Jiang Xin276ceea2016-02-28 20:35:55 +080013276#, c-format
13277msgid "Untracked cache enabled for '%s'"
13278msgstr "缓存未跟踪文件在 '%s' 启用"
13279
Jiang Xin90314792013-09-17 23:37:05 +080013280#: builtin/update-ref.c:9
Jiang Xin814ff312015-02-16 21:34:19 +080013281msgid "git update-ref [<options>] -d <refname> [<old-val>]"
13282msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080013283
Jiang Xin90314792013-09-17 23:37:05 +080013284#: builtin/update-ref.c:10
Jiang Xin814ff312015-02-16 21:34:19 +080013285msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
13286msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
Jiang Xinef317cd2012-09-15 11:17:00 +080013287
Jiang Xin90314792013-09-17 23:37:05 +080013288#: builtin/update-ref.c:11
Jiang Xin814ff312015-02-16 21:34:19 +080013289msgid "git update-ref [<options>] --stdin [-z]"
13290msgstr "git update-ref [<选项>] --stdin [-z]"
Jiang Xin90314792013-09-17 23:37:05 +080013291
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013292#: builtin/update-ref.c:363
Jiang Xinef317cd2012-09-15 11:17:00 +080013293msgid "delete the reference"
Wang Sheng07432ce2013-01-30 17:23:08 +080013294msgstr "删除引用"
Jiang Xinef317cd2012-09-15 11:17:00 +080013295
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013296#: builtin/update-ref.c:365
Jiang Xinef317cd2012-09-15 11:17:00 +080013297msgid "update <refname> not the one it points to"
Wang Sheng07432ce2013-01-30 17:23:08 +080013298msgstr "更新 <引用名> 本身而不是它指向的引用"
Jiang Xinef317cd2012-09-15 11:17:00 +080013299
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013300#: builtin/update-ref.c:366
Jiang Xin90314792013-09-17 23:37:05 +080013301msgid "stdin has NUL-terminated arguments"
13302msgstr "标准输入有以 NUL 字符终止的参数"
13303
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013304#: builtin/update-ref.c:367
Jiang Xin90314792013-09-17 23:37:05 +080013305msgid "read updates from stdin"
13306msgstr "从标准输入读取更新"
13307
Jiang Xinef317cd2012-09-15 11:17:00 +080013308#: builtin/update-server-info.c:6
13309msgid "git update-server-info [--force]"
Wang Sheng07432ce2013-01-30 17:23:08 +080013310msgstr "git update-server-info [--force]"
Jiang Xinef317cd2012-09-15 11:17:00 +080013311
13312#: builtin/update-server-info.c:14
13313msgid "update the info files from scratch"
Wang Sheng07432ce2013-01-30 17:23:08 +080013314msgstr "从头开始更新文件信息"
Jiang Xinef317cd2012-09-15 11:17:00 +080013315
Jiang Xin6acbf032014-08-04 16:23:15 +080013316#: builtin/verify-commit.c:17
Jiang Xin814ff312015-02-16 21:34:19 +080013317msgid "git verify-commit [-v | --verbose] <commit>..."
13318msgstr "git verify-commit [-v | --verbose] <提交>..."
Jiang Xin6acbf032014-08-04 16:23:15 +080013319
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013320#: builtin/verify-commit.c:72
Jiang Xin6acbf032014-08-04 16:23:15 +080013321msgid "print commit contents"
13322msgstr "打印提交内容"
13323
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013324#: builtin/verify-commit.c:73 builtin/verify-tag.c:37
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013325msgid "print raw gpg status output"
13326msgstr "打印原始 gpg 状态输出"
13327
Jiang Xin220c3132014-10-08 10:55:14 +080013328#: builtin/verify-pack.c:54
Jiang Xin814ff312015-02-16 21:34:19 +080013329msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
13330msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
Jiang Xinef317cd2012-09-15 11:17:00 +080013331
Jiang Xin220c3132014-10-08 10:55:14 +080013332#: builtin/verify-pack.c:64
Jiang Xinef317cd2012-09-15 11:17:00 +080013333msgid "verbose"
13334msgstr "冗长输出"
13335
Jiang Xin220c3132014-10-08 10:55:14 +080013336#: builtin/verify-pack.c:66
Jiang Xinef317cd2012-09-15 11:17:00 +080013337msgid "show statistics only"
Wang Sheng07432ce2013-01-30 17:23:08 +080013338msgstr "只显示统计"
Jiang Xinef317cd2012-09-15 11:17:00 +080013339
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013340#: builtin/verify-tag.c:18
13341msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
13342msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
Jiang Xinef317cd2012-09-15 11:17:00 +080013343
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013344#: builtin/verify-tag.c:36
Jiang Xinef317cd2012-09-15 11:17:00 +080013345msgid "print tag contents"
Ray Chen55a16ee2015-07-28 12:52:28 +080013346msgstr "打印标签内容"
Jiang Xinef317cd2012-09-15 11:17:00 +080013347
Jiang Xin94550ed2015-11-16 07:02:11 +080013348#: builtin/worktree.c:15
13349msgid "git worktree add [<options>] <path> [<branch>]"
13350msgstr "git worktree add [<选项>] <路径> [<分支>]"
Jiang Xin5bb01d42015-07-14 07:33:09 +080013351
Jiang Xin94550ed2015-11-16 07:02:11 +080013352#: builtin/worktree.c:16
Jiang Xin94550ed2015-11-16 07:02:11 +080013353msgid "git worktree list [<options>]"
13354msgstr "git worktree list [<选项>]"
13355
Jiang Xin5c57d762016-08-28 10:18:12 +080013356#: builtin/worktree.c:17
13357msgid "git worktree lock [<options>] <path>"
13358msgstr "git worktree lock [<选项>] <路径>"
13359
13360#: builtin/worktree.c:18
13361msgid "git worktree prune [<options>]"
13362msgstr "git worktree prune [<选项>]"
13363
13364#: builtin/worktree.c:19
13365msgid "git worktree unlock <path>"
13366msgstr "git worktree unlock <路径>"
13367
13368#: builtin/worktree.c:42
Jiang Xin5bb01d42015-07-14 07:33:09 +080013369#, c-format
13370msgid "Removing worktrees/%s: not a valid directory"
13371msgstr "删除工作区/%s:不是一个有效的目录"
13372
Jiang Xin5c57d762016-08-28 10:18:12 +080013373#: builtin/worktree.c:48
Jiang Xin5bb01d42015-07-14 07:33:09 +080013374#, c-format
13375msgid "Removing worktrees/%s: gitdir file does not exist"
13376msgstr "删除 worktrees/%s:gitdir 文件不存在"
13377
Jiang Xin5c57d762016-08-28 10:18:12 +080013378#: builtin/worktree.c:53
Jiang Xin5bb01d42015-07-14 07:33:09 +080013379#, c-format
13380msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
13381msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
13382
Jiang Xin5c57d762016-08-28 10:18:12 +080013383#: builtin/worktree.c:64
Jiang Xin5bb01d42015-07-14 07:33:09 +080013384#, c-format
13385msgid "Removing worktrees/%s: invalid gitdir file"
13386msgstr "删除 worktrees/%s:无效的 gitdir 文件"
13387
Jiang Xin5c57d762016-08-28 10:18:12 +080013388#: builtin/worktree.c:80
Jiang Xin5bb01d42015-07-14 07:33:09 +080013389#, c-format
13390msgid "Removing worktrees/%s: gitdir file points to non-existent location"
13391msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
13392
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013393#: builtin/worktree.c:128
13394msgid "report pruned working trees"
13395msgstr "报告清除的工作区"
13396
13397#: builtin/worktree.c:130
13398msgid "expire working trees older than <time>"
13399msgstr "将早于 <time> 的工作区过期"
13400
Jiang Xin5c57d762016-08-28 10:18:12 +080013401#: builtin/worktree.c:204
Jiang Xin5bb01d42015-07-14 07:33:09 +080013402#, c-format
13403msgid "'%s' already exists"
13404msgstr "'%s' 已经存在"
13405
Jiang Xin5c57d762016-08-28 10:18:12 +080013406#: builtin/worktree.c:236
Jiang Xin5bb01d42015-07-14 07:33:09 +080013407#, c-format
13408msgid "could not create directory of '%s'"
13409msgstr "不能创建目录 '%s'"
13410
Jiang Xin5c57d762016-08-28 10:18:12 +080013411#: builtin/worktree.c:272
Jiang Xin5bb01d42015-07-14 07:33:09 +080013412#, c-format
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013413msgid "Preparing %s (identifier %s)"
Ray Chen29004bb2016-12-28 17:08:45 +080013414msgstr "准备 %s(标识符 %s)"
Jiang Xin5bb01d42015-07-14 07:33:09 +080013415
Jiang Xin5c57d762016-08-28 10:18:12 +080013416#: builtin/worktree.c:323
Jiang Xin5bb01d42015-07-14 07:33:09 +080013417msgid "checkout <branch> even if already checked out in other worktree"
13418msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
13419
Jiang Xin5c57d762016-08-28 10:18:12 +080013420#: builtin/worktree.c:325
Jiang Xin5bb01d42015-07-14 07:33:09 +080013421msgid "create a new branch"
13422msgstr "创建一个新分支"
13423
Jiang Xin5c57d762016-08-28 10:18:12 +080013424#: builtin/worktree.c:327
Jiang Xin5bb01d42015-07-14 07:33:09 +080013425msgid "create or reset a branch"
13426msgstr "创建或重置一个分支"
13427
Jiang Xin5c57d762016-08-28 10:18:12 +080013428#: builtin/worktree.c:329
Jiang Xin5b04ee32016-05-29 20:40:35 +080013429msgid "populate the new working tree"
13430msgstr "生成新的工作区"
13431
Jiang Xin5c57d762016-08-28 10:18:12 +080013432#: builtin/worktree.c:337
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013433msgid "-b, -B, and --detach are mutually exclusive"
13434msgstr "-b、-B 和 --detach 是互斥的"
Jiang Xin5bb01d42015-07-14 07:33:09 +080013435
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013436#: builtin/worktree.c:472
Jiang Xin5c57d762016-08-28 10:18:12 +080013437msgid "reason for locking"
13438msgstr "锁定原因"
13439
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013440#: builtin/worktree.c:484 builtin/worktree.c:517
Jiang Xin5c57d762016-08-28 10:18:12 +080013441#, c-format
13442msgid "'%s' is not a working tree"
13443msgstr "'%s' 不是一个工作区"
13444
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013445#: builtin/worktree.c:486 builtin/worktree.c:519
Jiang Xin5c57d762016-08-28 10:18:12 +080013446msgid "The main working tree cannot be locked or unlocked"
13447msgstr "主工作区无法被加锁或解锁"
13448
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013449#: builtin/worktree.c:491
Jiang Xin5c57d762016-08-28 10:18:12 +080013450#, c-format
13451msgid "'%s' is already locked, reason: %s"
13452msgstr "'%s' 已被锁定,原因:%s"
13453
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013454#: builtin/worktree.c:493
Jiang Xin5c57d762016-08-28 10:18:12 +080013455#, c-format
13456msgid "'%s' is already locked"
13457msgstr "'%s' 已被锁定"
13458
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013459#: builtin/worktree.c:521
Jiang Xin5c57d762016-08-28 10:18:12 +080013460#, c-format
13461msgid "'%s' is not locked"
13462msgstr "'%s' 未被锁定"
13463
Jiang Xinef317cd2012-09-15 11:17:00 +080013464#: builtin/write-tree.c:13
13465msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
Wang Sheng07432ce2013-01-30 17:23:08 +080013466msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
Jiang Xinef317cd2012-09-15 11:17:00 +080013467
13468#: builtin/write-tree.c:26
13469msgid "<prefix>/"
Wang Sheng07432ce2013-01-30 17:23:08 +080013470msgstr "<前缀>/"
Jiang Xinef317cd2012-09-15 11:17:00 +080013471
13472#: builtin/write-tree.c:27
13473msgid "write tree object for a subdirectory <prefix>"
Wang Sheng07432ce2013-01-30 17:23:08 +080013474msgstr "将 <前缀> 子目录内容写到一个树对象"
Jiang Xinef317cd2012-09-15 11:17:00 +080013475
13476#: builtin/write-tree.c:30
13477msgid "only useful for debugging"
Wang Sheng07432ce2013-01-30 17:23:08 +080013478msgstr "只对调试有用"
Jiang Xinef317cd2012-09-15 11:17:00 +080013479
Jiang Xina0b6b242016-10-27 21:53:37 +080013480#: upload-pack.c:22
Jiang Xin5c57d762016-08-28 10:18:12 +080013481msgid "git upload-pack [<options>] <dir>"
13482msgstr "git upload-pack [<选项>] <目录>"
13483
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013484#: upload-pack.c:1036
Jiang Xin5c57d762016-08-28 10:18:12 +080013485msgid "quit after a single request/response exchange"
13486msgstr "在一次单独的请求/响应(request/response)交换后退出"
13487
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013488#: upload-pack.c:1038
Jiang Xin5c57d762016-08-28 10:18:12 +080013489msgid "exit immediately after initial ref advertisement"
13490msgstr "在初始的引用广告后立即退出"
13491
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013492#: upload-pack.c:1040
Jiang Xin5c57d762016-08-28 10:18:12 +080013493msgid "do not try <directory>/.git/ if <directory> is no Git directory"
13494msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录"
13495
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013496#: upload-pack.c:1042
Jiang Xin5c57d762016-08-28 10:18:12 +080013497msgid "interrupt transfer after <n> seconds of inactivity"
13498msgstr "不活动 <n> 秒钟后终止传输"
13499
Jiang Xina0b6b242016-10-27 21:53:37 +080013500#: credential-cache--daemon.c:223
13501#, c-format
13502msgid ""
13503"The permissions on your socket directory are too loose; other\n"
13504"users may be able to read your cached credentials. Consider running:\n"
13505"\n"
13506"\tchmod 0700 %s"
13507msgstr ""
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013508"您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
13509"行:\n"
Jiang Xina0b6b242016-10-27 21:53:37 +080013510"\n"
13511"\tchmod 0700 %s"
13512
Jiang Xin5b04ee32016-05-29 20:40:35 +080013513#: credential-cache--daemon.c:271
Jiang Xin220c3132014-10-08 10:55:14 +080013514msgid "print debugging messages to stderr"
13515msgstr "调试信息输出到标准错误"
13516
Jiang Xind9d56b22015-01-18 20:37:57 +080013517#: git.c:14
Jiang Xin4dcdc3d2013-04-13 10:02:43 +080013518msgid ""
Jiang Xin220c3132014-10-08 10:55:14 +080013519"'git help -a' and 'git help -g' list available subcommands and some\n"
Jiang Xin4dcdc3d2013-04-13 10:02:43 +080013520"concept guides. See 'git help <command>' or 'git help <concept>'\n"
13521"to read about a specific subcommand or concept."
13522msgstr ""
Jiang Xin220c3132014-10-08 10:55:14 +080013523"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
13524"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
13525"帮助。"
Jiang Xin8ada9592012-05-21 09:35:47 +080013526
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013527#: http.c:344
Jiang Xina0b6b242016-10-27 21:53:37 +080013528msgid "Delegation control is not supported with cURL < 7.22.0"
13529msgstr "当 cURL < 7.22.0 时,不支持委托控制"
13530
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013531#: http.c:353
Jiang Xin276ceea2016-02-28 20:35:55 +080013532msgid "Public key pinning not supported with cURL < 7.44.0"
13533msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
13534
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013535#: http.c:1713
13536#, c-format
13537msgid ""
13538"unable to update url base from redirection:\n"
13539" asked for: %s\n"
13540" redirect: %s"
13541msgstr ""
13542"不能更新重定向的 url base:\n"
13543" 请求:%s\n"
13544" 重定向:%s"
13545
13546#: remote-curl.c:319
13547#, c-format
13548msgid "redirecting to %s"
13549msgstr "重定向到 %s"
13550
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013551#: common-cmds.h:9
Jiang Xin7aea43f2015-05-31 08:42:31 +080013552msgid "start a working area (see also: git help tutorial)"
13553msgstr "开始一个工作区(参见:git help tutorial)"
13554
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013555#: common-cmds.h:10
Jiang Xin7aea43f2015-05-31 08:42:31 +080013556msgid "work on the current change (see also: git help everyday)"
13557msgstr "在当前变更上工作(参见:git help everyday)"
13558
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013559#: common-cmds.h:11
Jiang Xin7aea43f2015-05-31 08:42:31 +080013560msgid "examine the history and state (see also: git help revisions)"
13561msgstr "检查历史和状态(参见:git help revisions)"
13562
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013563#: common-cmds.h:12
Jiang Xin7aea43f2015-05-31 08:42:31 +080013564msgid "grow, mark and tweak your common history"
13565msgstr "扩展、标记和调校您的历史记录"
13566
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013567#: common-cmds.h:13
Jiang Xin7aea43f2015-05-31 08:42:31 +080013568msgid "collaborate (see also: git help workflows)"
13569msgstr "协同(参见:git help workflows)"
13570
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013571#: common-cmds.h:17
Jiang Xin8ada9592012-05-21 09:35:47 +080013572msgid "Add file contents to the index"
Jiang Xin81809b92012-05-30 12:19:47 +080013573msgstr "添加文件内容至索引"
Jiang Xin8ada9592012-05-21 09:35:47 +080013574
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013575#: common-cmds.h:18
13576msgid "Use binary search to find the commit that introduced a bug"
13577msgstr "通过二分查找定位引入 bug 的提交"
Jiang Xin8ada9592012-05-21 09:35:47 +080013578
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013579#: common-cmds.h:19
Jiang Xin8ada9592012-05-21 09:35:47 +080013580msgid "List, create, or delete branches"
Jiang Xin81809b92012-05-30 12:19:47 +080013581msgstr "列出、创建或删除分支"
Jiang Xin8ada9592012-05-21 09:35:47 +080013582
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013583#: common-cmds.h:20
Jiang Xin5bb01d42015-07-14 07:33:09 +080013584msgid "Switch branches or restore working tree files"
13585msgstr "切换分支或恢复工作区文件"
Jiang Xin8ada9592012-05-21 09:35:47 +080013586
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013587#: common-cmds.h:21
Jiang Xin8ada9592012-05-21 09:35:47 +080013588msgid "Clone a repository into a new directory"
Jiang Xin160fb2b2015-08-02 21:47:30 +080013589msgstr "克隆一个仓库到一个新目录"
Jiang Xin8ada9592012-05-21 09:35:47 +080013590
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013591#: common-cmds.h:22
Jiang Xin8ada9592012-05-21 09:35:47 +080013592msgid "Record changes to the repository"
Jiang Xin160fb2b2015-08-02 21:47:30 +080013593msgstr "记录变更到仓库"
Jiang Xin8ada9592012-05-21 09:35:47 +080013594
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013595#: common-cmds.h:23
Jiang Xin8ada9592012-05-21 09:35:47 +080013596msgid "Show changes between commits, commit and working tree, etc"
Jiang Xin81809b92012-05-30 12:19:47 +080013597msgstr "显示提交之间、提交和工作区之间等的差异"
Jiang Xin8ada9592012-05-21 09:35:47 +080013598
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013599#: common-cmds.h:24
Jiang Xin8ada9592012-05-21 09:35:47 +080013600msgid "Download objects and refs from another repository"
Jiang Xin160fb2b2015-08-02 21:47:30 +080013601msgstr "从另外一个仓库下载对象和引用"
Jiang Xin8ada9592012-05-21 09:35:47 +080013602
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013603#: common-cmds.h:25
Jiang Xin8ada9592012-05-21 09:35:47 +080013604msgid "Print lines matching a pattern"
Jiang Xin81809b92012-05-30 12:19:47 +080013605msgstr "输出和模式匹配的行"
Jiang Xin8ada9592012-05-21 09:35:47 +080013606
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013607#: common-cmds.h:26
Jiang Xina77c07d2013-02-14 17:47:45 +080013608msgid "Create an empty Git repository or reinitialize an existing one"
Jiang Xin160fb2b2015-08-02 21:47:30 +080013609msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
Jiang Xin8ada9592012-05-21 09:35:47 +080013610
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013611#: common-cmds.h:27
Jiang Xin8ada9592012-05-21 09:35:47 +080013612msgid "Show commit logs"
Jiang Xin81809b92012-05-30 12:19:47 +080013613msgstr "显示提交日志"
Jiang Xin8ada9592012-05-21 09:35:47 +080013614
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013615#: common-cmds.h:28
Jiang Xin8ada9592012-05-21 09:35:47 +080013616msgid "Join two or more development histories together"
Jiang Xin81809b92012-05-30 12:19:47 +080013617msgstr "合并两个或更多开发历史"
Jiang Xin8ada9592012-05-21 09:35:47 +080013618
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013619#: common-cmds.h:29
Jiang Xin8ada9592012-05-21 09:35:47 +080013620msgid "Move or rename a file, a directory, or a symlink"
Jiang Xin81809b92012-05-30 12:19:47 +080013621msgstr "移动或重命名一个文件、目录或符号链接"
Jiang Xin8ada9592012-05-21 09:35:47 +080013622
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013623#: common-cmds.h:30
Jiang Xin2e8451e2013-07-26 14:00:02 +080013624msgid "Fetch from and integrate with another repository or a local branch"
Jiang Xin160fb2b2015-08-02 21:47:30 +080013625msgstr "获取并整合另外的仓库或一个本地分支"
Jiang Xin8ada9592012-05-21 09:35:47 +080013626
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013627#: common-cmds.h:31
Jiang Xin8ada9592012-05-21 09:35:47 +080013628msgid "Update remote refs along with associated objects"
Jiang Xin81809b92012-05-30 12:19:47 +080013629msgstr "更新远程引用和相关的对象"
Jiang Xin8ada9592012-05-21 09:35:47 +080013630
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013631#: common-cmds.h:32
Jiang Xin34956282016-03-12 22:09:24 +080013632msgid "Reapply commits on top of another base tip"
13633msgstr "在另一个分支上重新应用提交"
Jiang Xin8ada9592012-05-21 09:35:47 +080013634
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013635#: common-cmds.h:33
Jiang Xin8ada9592012-05-21 09:35:47 +080013636msgid "Reset current HEAD to the specified state"
Ray Chen4375c102015-08-10 18:03:29 +080013637msgstr "重置当前 HEAD 到指定状态"
Jiang Xin8ada9592012-05-21 09:35:47 +080013638
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013639#: common-cmds.h:34
Jiang Xin8ada9592012-05-21 09:35:47 +080013640msgid "Remove files from the working tree and from the index"
Jiang Xin81809b92012-05-30 12:19:47 +080013641msgstr "从工作区和索引中删除文件"
Jiang Xin8ada9592012-05-21 09:35:47 +080013642
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013643#: common-cmds.h:35
Jiang Xin8ada9592012-05-21 09:35:47 +080013644msgid "Show various types of objects"
Jiang Xin81809b92012-05-30 12:19:47 +080013645msgstr "显示各种类型的对象"
Jiang Xin8ada9592012-05-21 09:35:47 +080013646
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013647#: common-cmds.h:36
Jiang Xin8ada9592012-05-21 09:35:47 +080013648msgid "Show the working tree status"
Jiang Xin81809b92012-05-30 12:19:47 +080013649msgstr "显示工作区状态"
Jiang Xin8ada9592012-05-21 09:35:47 +080013650
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013651#: common-cmds.h:37
Jiang Xin8ada9592012-05-21 09:35:47 +080013652msgid "Create, list, delete or verify a tag object signed with GPG"
Ray Chen4375c102015-08-10 18:03:29 +080013653msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
Jiang Xin8ada9592012-05-21 09:35:47 +080013654
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013655#: parse-options.h:145
Jiang Xin220c3132014-10-08 10:55:14 +080013656msgid "expiry-date"
13657msgstr "到期时间"
13658
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013659#: parse-options.h:160
Jiang Xin220c3132014-10-08 10:55:14 +080013660msgid "no-op (backward compatibility)"
13661msgstr "空操作(向后兼容)"
13662
Jiang Xina0b6b242016-10-27 21:53:37 +080013663#: parse-options.h:238
Jiang Xin220c3132014-10-08 10:55:14 +080013664msgid "be more verbose"
13665msgstr "更加详细"
13666
Jiang Xina0b6b242016-10-27 21:53:37 +080013667#: parse-options.h:240
Jiang Xin220c3132014-10-08 10:55:14 +080013668msgid "be more quiet"
13669msgstr "更加安静"
13670
Jiang Xina0b6b242016-10-27 21:53:37 +080013671#: parse-options.h:246
Jiang Xin220c3132014-10-08 10:55:14 +080013672msgid "use <n> digits to display SHA-1s"
13673msgstr "用 <n> 位数字显示 SHA-1 哈希值"
13674
Jiang Xin5b04ee32016-05-29 20:40:35 +080013675#: rerere.h:40
Jiang Xin220c3132014-10-08 10:55:14 +080013676msgid "update the index with reused conflict resolution if possible"
13677msgstr "如果可能,重用冲突解决更新索引"
13678
Jiang Xin5c57d762016-08-28 10:18:12 +080013679#: git-bisect.sh:54
Jiang Xinb694fbb2012-06-08 12:07:25 +080013680msgid "You need to start by \"git bisect start\""
13681msgstr "您需要执行 \"git bisect start\" 来开始"
13682
Jiang Xin90e6ef52012-03-27 14:46:11 +080013683# 译者:注意保持句尾空格
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013684#. TRANSLATORS: Make sure to include [Y] and [n] in your
13685#. translation. The program will only accept English input
13686#. at this point.
Jiang Xin5c57d762016-08-28 10:18:12 +080013687#: git-bisect.sh:60
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013688msgid "Do you want me to do it for you [Y/n]? "
13689msgstr "您想让我为您这样做么[Y/n]? "
13690
Jiang Xin5c57d762016-08-28 10:18:12 +080013691#: git-bisect.sh:121
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013692#, sh-format
13693msgid "unrecognised option: '$arg'"
Jiang Xin81809b92012-05-30 12:19:47 +080013694msgstr "未能识别的选项:'$arg'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013695
Jiang Xin5c57d762016-08-28 10:18:12 +080013696#: git-bisect.sh:125
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013697#, sh-format
13698msgid "'$arg' does not appear to be a valid revision"
13699msgstr "'$arg' 看起来不像是一个有效的版本"
13700
Jiang Xin5c57d762016-08-28 10:18:12 +080013701#: git-bisect.sh:154
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013702msgid "Bad HEAD - I need a HEAD"
13703msgstr "坏的 HEAD - 我需要一个 HEAD"
13704
Jiang Xin5c57d762016-08-28 10:18:12 +080013705#: git-bisect.sh:167
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013706#, sh-format
13707msgid ""
Jiang Xin814ff312015-02-16 21:34:19 +080013708"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
Jiang Xind9d56b22015-01-18 20:37:57 +080013709msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013710
Jiang Xin5c57d762016-08-28 10:18:12 +080013711#: git-bisect.sh:177
Jiang Xincfff71a2014-01-18 11:04:21 +080013712msgid "won't bisect on cg-seek'ed tree"
13713msgstr "不会在做了 cg-seek 的树上做二分查找"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013714
Jiang Xin5c57d762016-08-28 10:18:12 +080013715#: git-bisect.sh:181
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013716msgid "Bad HEAD - strange symbolic ref"
Jiang Xin90e6ef52012-03-27 14:46:11 +080013717msgstr "坏的 HEAD - 奇怪的符号引用"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013718
Jiang Xin5c57d762016-08-28 10:18:12 +080013719#: git-bisect.sh:233
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013720#, sh-format
13721msgid "Bad bisect_write argument: $state"
Jiang Xin90e6ef52012-03-27 14:46:11 +080013722msgstr "坏的 bisect_write 参数:$state"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013723
Jiang Xin5c57d762016-08-28 10:18:12 +080013724#: git-bisect.sh:262
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013725#, sh-format
13726msgid "Bad rev input: $arg"
Ray Chen9a4b6942016-09-07 18:03:04 +080013727msgstr "坏的输入版本:$arg"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013728
Jiang Xin5c57d762016-08-28 10:18:12 +080013729#: git-bisect.sh:281
13730#, sh-format
13731msgid "Bad rev input: $bisected_head"
Ray Chen9a4b6942016-09-07 18:03:04 +080013732msgstr "坏的输入版本:$bisected_head"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013733
Jiang Xin94550ed2015-11-16 07:02:11 +080013734#: git-bisect.sh:290
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013735#, sh-format
13736msgid "Bad rev input: $rev"
Ray Chen9a4b6942016-09-07 18:03:04 +080013737msgstr "坏的输入版本:$rev"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013738
Jiang Xin94550ed2015-11-16 07:02:11 +080013739#: git-bisect.sh:299
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013740#, sh-format
13741msgid "'git bisect $TERM_BAD' can take only one argument."
13742msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
13743
Jiang Xin94550ed2015-11-16 07:02:11 +080013744#: git-bisect.sh:322
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013745#, sh-format
13746msgid "Warning: bisecting only with a $TERM_BAD commit."
13747msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
Jiang Xinb694fbb2012-06-08 12:07:25 +080013748
Jiang Xin90e6ef52012-03-27 14:46:11 +080013749# 译者:注意保持句尾空格
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013750#. TRANSLATORS: Make sure to include [Y] and [n] in your
13751#. translation. The program will only accept English input
13752#. at this point.
Jiang Xin94550ed2015-11-16 07:02:11 +080013753#: git-bisect.sh:328
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013754msgid "Are you sure [Y/n]? "
13755msgstr "您确认么[Y/n]? "
13756
Jiang Xin94550ed2015-11-16 07:02:11 +080013757#: git-bisect.sh:340
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013758#, sh-format
Jiang Xinb694fbb2012-06-08 12:07:25 +080013759msgid ""
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013760"You need to give me at least one $bad_syn and one $good_syn revision.\n"
13761"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
Jiang Xinb694fbb2012-06-08 12:07:25 +080013762msgstr ""
13763"您需要给我至少一个好版本和一个坏版本。\n"
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013764"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
Jiang Xinb694fbb2012-06-08 12:07:25 +080013765
Jiang Xin94550ed2015-11-16 07:02:11 +080013766#: git-bisect.sh:343
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013767#, sh-format
Jiang Xinb694fbb2012-06-08 12:07:25 +080013768msgid ""
13769"You need to start by \"git bisect start\".\n"
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013770"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
13771"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
Jiang Xinb694fbb2012-06-08 12:07:25 +080013772msgstr ""
13773"您需要执行 \"git bisect start\" 来开始。\n"
13774"然后需要提供我至少一个好版本和一个坏版本。\n"
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013775"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
Jiang Xinb694fbb2012-06-08 12:07:25 +080013776
Jiang Xin94550ed2015-11-16 07:02:11 +080013777#: git-bisect.sh:414 git-bisect.sh:546
Jiang Xinb694fbb2012-06-08 12:07:25 +080013778msgid "We are not bisecting."
13779msgstr "我们没有在二分查找。"
13780
Jiang Xin94550ed2015-11-16 07:02:11 +080013781#: git-bisect.sh:421
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013782#, sh-format
13783msgid "'$invalid' is not a valid commit"
13784msgstr "'$invalid' 不是一个有效的提交"
13785
Jiang Xin94550ed2015-11-16 07:02:11 +080013786#: git-bisect.sh:430
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013787#, sh-format
13788msgid ""
13789"Could not check out original HEAD '$branch'.\n"
13790"Try 'git bisect reset <commit>'."
13791msgstr ""
13792"不能检出原始 HEAD '$branch'。\n"
Wang Sheng07432ce2013-01-30 17:23:08 +080013793"尝试 'git bisect reset <提交>'。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013794
Jiang Xin94550ed2015-11-16 07:02:11 +080013795#: git-bisect.sh:458
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013796msgid "No logfile given"
13797msgstr "未提供日志文件"
13798
Jiang Xin94550ed2015-11-16 07:02:11 +080013799#: git-bisect.sh:459
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013800#, sh-format
13801msgid "cannot read $file for replaying"
13802msgstr "不能读取 $file 来重放"
13803
Jiang Xin94550ed2015-11-16 07:02:11 +080013804#: git-bisect.sh:480
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013805msgid "?? what are you talking about?"
13806msgstr "?? 您在说什么?"
13807
Jiang Xin94550ed2015-11-16 07:02:11 +080013808#: git-bisect.sh:492
Jiang Xinb694fbb2012-06-08 12:07:25 +080013809#, sh-format
13810msgid "running $command"
13811msgstr "运行 $command"
13812
Jiang Xin94550ed2015-11-16 07:02:11 +080013813#: git-bisect.sh:499
Jiang Xinb694fbb2012-06-08 12:07:25 +080013814#, sh-format
13815msgid ""
13816"bisect run failed:\n"
13817"exit code $res from '$command' is < 0 or >= 128"
13818msgstr ""
13819"二分查找运行失败:\n"
Wang Sheng07432ce2013-01-30 17:23:08 +080013820"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
Jiang Xinb694fbb2012-06-08 12:07:25 +080013821
Jiang Xin94550ed2015-11-16 07:02:11 +080013822#: git-bisect.sh:525
Jiang Xinb694fbb2012-06-08 12:07:25 +080013823msgid "bisect run cannot continue any more"
13824msgstr "二分查找不能继续运行"
13825
Jiang Xin94550ed2015-11-16 07:02:11 +080013826#: git-bisect.sh:531
Jiang Xinb694fbb2012-06-08 12:07:25 +080013827#, sh-format
13828msgid ""
13829"bisect run failed:\n"
13830"'bisect_state $state' exited with error code $res"
13831msgstr ""
13832"二分查找运行失败:\n"
13833"'bisect_state $state' 退出码为 $res"
13834
Jiang Xin94550ed2015-11-16 07:02:11 +080013835#: git-bisect.sh:538
Jiang Xinb694fbb2012-06-08 12:07:25 +080013836msgid "bisect run success"
13837msgstr "二分查找运行成功"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013838
Jiang Xin94550ed2015-11-16 07:02:11 +080013839#: git-bisect.sh:565
13840msgid "please use two different terms"
13841msgstr "请使用两个不同的术语"
13842
13843#: git-bisect.sh:575
13844#, sh-format
13845msgid "'$term' is not a valid term"
13846msgstr "'$term' 不是一个有效的名称"
13847
13848#: git-bisect.sh:578
13849#, sh-format
13850msgid "can't use the builtin command '$term' as a term"
13851msgstr "不能使用内置命令 '$term' 作为术语"
13852
13853#: git-bisect.sh:587 git-bisect.sh:593
13854#, sh-format
13855msgid "can't change the meaning of term '$term'"
13856msgstr "不能修改术语 '$term' 的含义"
13857
13858#: git-bisect.sh:606
Jiang Xinb694fbb2012-06-08 12:07:25 +080013859#, sh-format
Jiang Xin1b7f4a32015-08-23 15:23:21 +080013860msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
13861msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080013862
Jiang Xin94550ed2015-11-16 07:02:11 +080013863#: git-bisect.sh:636
13864msgid "no terms defined"
13865msgstr "未定义术语"
13866
13867#: git-bisect.sh:653
13868#, sh-format
13869msgid ""
13870"invalid argument $arg for 'git bisect terms'.\n"
13871"Supported options are: --term-good|--term-old and --term-bad|--term-new."
13872msgstr ""
13873"参数 $arg 对命令 'git bisect terms' 无效。\n"
13874"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
13875
Jiang Xin5c57d762016-08-28 10:18:12 +080013876#: git-merge-octopus.sh:46
13877msgid ""
13878"Error: Your local changes to the following files would be overwritten by "
13879"merge"
13880msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
13881
13882#: git-merge-octopus.sh:61
13883msgid "Automated merge did not work."
Ray Chen9a4b6942016-09-07 18:03:04 +080013884msgstr "自动合并未生效。"
Jiang Xin5c57d762016-08-28 10:18:12 +080013885
13886#: git-merge-octopus.sh:62
Jiang Xina0b6b242016-10-27 21:53:37 +080013887msgid "Should not be doing an octopus."
Jiang Xin5c57d762016-08-28 10:18:12 +080013888msgstr "不应该执行章鱼式合并。"
13889
13890#: git-merge-octopus.sh:73
13891#, sh-format
13892msgid "Unable to find common commit with $pretty_name"
13893msgstr "无法找到和 $pretty_name 的基线提交"
13894
13895#: git-merge-octopus.sh:77
13896#, sh-format
13897msgid "Already up-to-date with $pretty_name"
13898msgstr "已经和 $pretty_name 保持一致"
13899
13900#: git-merge-octopus.sh:89
13901#, sh-format
13902msgid "Fast-forwarding to: $pretty_name"
13903msgstr "快进至:$pretty_name"
13904
13905#: git-merge-octopus.sh:97
13906#, sh-format
13907msgid "Trying simple merge with $pretty_name"
13908msgstr "尝试和 $pretty_name 的简单合并"
13909
13910#: git-merge-octopus.sh:102
13911msgid "Simple merge did not work, trying automatic merge."
Ray Chen9a4b6942016-09-07 18:03:04 +080013912msgstr "简单合并未生效,尝试自动合并。"
Jiang Xin5c57d762016-08-28 10:18:12 +080013913
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013914#: git-rebase.sh:57
Jiang Xin649900b2012-08-02 11:50:59 +080013915msgid ""
13916"When you have resolved this problem, run \"git rebase --continue\".\n"
13917"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
13918"To check out the original branch and stop rebasing, run \"git rebase --abort"
13919"\"."
13920msgstr ""
13921"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
13922"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
13923"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
13924
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013925#: git-rebase.sh:157 git-rebase.sh:396
Jiang Xin5c57d762016-08-28 10:18:12 +080013926#, sh-format
13927msgid "Could not move back to $head_name"
13928msgstr "无法移回 $head_name"
13929
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013930#: git-rebase.sh:171
Jiang Xin2e8451e2013-07-26 14:00:02 +080013931#, sh-format
13932msgid "Cannot store $stash_sha1"
13933msgstr "无法保存 $stash_sha1"
13934
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013935#: git-rebase.sh:211
Jiang Xin649900b2012-08-02 11:50:59 +080013936msgid "The pre-rebase hook refused to rebase."
Jiang Xin98b27612014-02-02 20:46:58 +080013937msgstr "钩子 pre-rebase 拒绝变基操作。"
Jiang Xin649900b2012-08-02 11:50:59 +080013938
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013939#: git-rebase.sh:216
Jiang Xin649900b2012-08-02 11:50:59 +080013940msgid "It looks like git-am is in progress. Cannot rebase."
13941msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
13942
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013943#: git-rebase.sh:357
Jiang Xin649900b2012-08-02 11:50:59 +080013944msgid "No rebase in progress?"
13945msgstr "没有正在进行的变基?"
13946
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013947#: git-rebase.sh:368
Wang Sheng07432ce2013-01-30 17:23:08 +080013948msgid "The --edit-todo action can only be used during interactive rebase."
13949msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
13950
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013951#: git-rebase.sh:375
Jiang Xin649900b2012-08-02 11:50:59 +080013952msgid "Cannot read HEAD"
13953msgstr "不能读取 HEAD"
13954
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013955#: git-rebase.sh:378
Jiang Xin649900b2012-08-02 11:50:59 +080013956msgid ""
13957"You must edit all merge conflicts and then\n"
13958"mark them as resolved using git add"
13959msgstr ""
13960"您必须编辑所有的合并冲突,然后通过 git add\n"
13961"命令将它们标记为已解决"
13962
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013963#: git-rebase.sh:418
Jiang Xin649900b2012-08-02 11:50:59 +080013964#, sh-format
13965msgid ""
13966"It seems that there is already a $state_dir_base directory, and\n"
13967"I wonder if you are in the middle of another rebase. If that is the\n"
13968"case, please try\n"
13969"\t$cmd_live_rebase\n"
13970"If that is not the case, please\n"
13971"\t$cmd_clear_stale_rebase\n"
13972"and run me again. I am stopping in case you still have something\n"
13973"valuable there."
13974msgstr ""
Jiang Xin98b27612014-02-02 20:46:58 +080013975"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
13976"过程中。 如果是这样,请执行\n"
Jiang Xin649900b2012-08-02 11:50:59 +080013977"\t$cmd_live_rebase\n"
13978"如果不是这样,请执行\n"
13979"\t$cmd_clear_stale_rebase\n"
Jiang Xin98b27612014-02-02 20:46:58 +080013980"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
Jiang Xin649900b2012-08-02 11:50:59 +080013981
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013982#: git-rebase.sh:469
Jiang Xin649900b2012-08-02 11:50:59 +080013983#, sh-format
13984msgid "invalid upstream $upstream_name"
13985msgstr "无效的上游 $upstream_name"
13986
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013987#: git-rebase.sh:493
Jiang Xin649900b2012-08-02 11:50:59 +080013988#, sh-format
13989msgid "$onto_name: there are more than one merge bases"
13990msgstr "$onto_name: 有一个以上的合并基准"
13991
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013992#: git-rebase.sh:496 git-rebase.sh:500
Jiang Xin649900b2012-08-02 11:50:59 +080013993#, sh-format
13994msgid "$onto_name: there is no merge base"
13995msgstr "$onto_name: 没有合并基准"
13996
Jiang Xin1a79b2f2017-01-27 22:50:57 +080013997#: git-rebase.sh:505
Jiang Xin649900b2012-08-02 11:50:59 +080013998#, sh-format
13999msgid "Does not point to a valid commit: $onto_name"
14000msgstr "没有指向一个有效的提交:$onto_name"
14001
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014002#: git-rebase.sh:528
Jiang Xin649900b2012-08-02 11:50:59 +080014003#, sh-format
14004msgid "fatal: no such branch: $branch_name"
14005msgstr "严重错误:无此分支:$branch_name"
14006
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014007#: git-rebase.sh:561
Jiang Xin2e8451e2013-07-26 14:00:02 +080014008msgid "Cannot autostash"
14009msgstr "无法 autostash"
14010
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014011#: git-rebase.sh:566
Jiang Xin2e8451e2013-07-26 14:00:02 +080014012#, sh-format
14013msgid "Created autostash: $stash_abbrev"
14014msgstr "创建了 autostash: $stash_abbrev"
14015
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014016#: git-rebase.sh:570
Jiang Xin649900b2012-08-02 11:50:59 +080014017msgid "Please commit or stash them."
14018msgstr "请提交或为它们保存进度。"
14019
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014020#: git-rebase.sh:590
Jiang Xin649900b2012-08-02 11:50:59 +080014021#, sh-format
14022msgid "Current branch $branch_name is up to date."
14023msgstr "当前分支 $branch_name 是最新的。"
14024
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014025#: git-rebase.sh:594
Jiang Xin649900b2012-08-02 11:50:59 +080014026#, sh-format
14027msgid "Current branch $branch_name is up to date, rebase forced."
14028msgstr "当前分支 $branch_name 是最新的,强制变基。"
14029
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014030#: git-rebase.sh:605
Jiang Xin649900b2012-08-02 11:50:59 +080014031#, sh-format
14032msgid "Changes from $mb to $onto:"
14033msgstr "变更从 $mb 到 $onto:"
14034
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014035#: git-rebase.sh:614
Jiang Xin649900b2012-08-02 11:50:59 +080014036msgid "First, rewinding head to replay your work on top of it..."
Jiang Xin160fb2b2015-08-02 21:47:30 +080014037msgstr "首先,回退分支以便在上面重放您的工作..."
Jiang Xin649900b2012-08-02 11:50:59 +080014038
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014039#: git-rebase.sh:624
Jiang Xin649900b2012-08-02 11:50:59 +080014040#, sh-format
14041msgid "Fast-forwarded $branch_name to $onto_name."
14042msgstr "快进 $branch_name 至 $onto_name。"
14043
Jiang Xin5c57d762016-08-28 10:18:12 +080014044#: git-stash.sh:50
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014045msgid "git stash clear with parameters is unimplemented"
14046msgstr "git stash clear 不支持参数"
14047
Jiang Xin5c57d762016-08-28 10:18:12 +080014048#: git-stash.sh:73
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014049msgid "You do not have the initial commit yet"
14050msgstr "您尚未建立初始提交"
14051
Jiang Xin5c57d762016-08-28 10:18:12 +080014052#: git-stash.sh:88
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014053msgid "Cannot save the current index state"
Jiang Xin90e6ef52012-03-27 14:46:11 +080014054msgstr "无法保存当前索引状态"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014055
Jiang Xina0b6b242016-10-27 21:53:37 +080014056#: git-stash.sh:103
14057msgid "Cannot save the untracked files"
14058msgstr "无法保存未跟踪文件"
14059
Jiang Xin5c57d762016-08-28 10:18:12 +080014060#: git-stash.sh:123 git-stash.sh:136
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014061msgid "Cannot save the current worktree state"
14062msgstr "无法保存当前工作区状态"
14063
Jiang Xin5c57d762016-08-28 10:18:12 +080014064#: git-stash.sh:140
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014065msgid "No changes selected"
Jiang Xin90e6ef52012-03-27 14:46:11 +080014066msgstr "没有选择变更"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014067
Jiang Xin5c57d762016-08-28 10:18:12 +080014068#: git-stash.sh:143
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014069msgid "Cannot remove temporary index (can't happen)"
Jiang Xin90e6ef52012-03-27 14:46:11 +080014070msgstr "无法删除临时索引(不应发生)"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014071
Jiang Xin5c57d762016-08-28 10:18:12 +080014072#: git-stash.sh:156
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014073msgid "Cannot record working tree state"
14074msgstr "不能记录工作区状态"
14075
Jiang Xin5c57d762016-08-28 10:18:12 +080014076#: git-stash.sh:188
Jiang Xin2e8451e2013-07-26 14:00:02 +080014077#, sh-format
14078msgid "Cannot update $ref_stash with $w_commit"
14079msgstr "无法用 $w_commit 更新 $ref_stash"
14080
Jiang Xinb694fbb2012-06-08 12:07:25 +080014081#. TRANSLATORS: $option is an invalid option, like
14082#. `--blah-blah'. The 7 spaces at the beginning of the
14083#. second line correspond to "error: ". So you should line
14084#. up the second line with however many characters the
14085#. translation of "error: " takes in your language. E.g. in
14086#. English this is:
14087#.
14088#. $ git stash save --blah-blah 2>&1 | head -n 2
14089#. error: unknown option for 'stash save': --blah-blah
14090#. To provide a message, use git stash save -- '--blah-blah'
Jiang Xin5c57d762016-08-28 10:18:12 +080014091#: git-stash.sh:238
Jiang Xinb694fbb2012-06-08 12:07:25 +080014092#, sh-format
14093msgid ""
14094"error: unknown option for 'stash save': $option\n"
14095" To provide a message, use git stash save -- '$option'"
14096msgstr ""
14097"错误:'stash save' 的未知选项:$option\n"
14098" 要提供一个描述信息,使用 git stash save -- '$option'"
14099
Jiang Xina0b6b242016-10-27 21:53:37 +080014100#: git-stash.sh:251
14101msgid "Can't use --patch and --include-untracked or --all at the same time"
14102msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
14103
Jiang Xin5c57d762016-08-28 10:18:12 +080014104#: git-stash.sh:259
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014105msgid "No local changes to save"
14106msgstr "没有要保存的本地修改"
14107
Jiang Xin5c57d762016-08-28 10:18:12 +080014108#: git-stash.sh:263
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014109msgid "Cannot initialize stash"
Jiang Xin90e6ef52012-03-27 14:46:11 +080014110msgstr "无法初始化 stash"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014111
Jiang Xin5c57d762016-08-28 10:18:12 +080014112#: git-stash.sh:267
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014113msgid "Cannot save the current status"
14114msgstr "无法保存当前状态"
14115
Jiang Xin5c57d762016-08-28 10:18:12 +080014116#: git-stash.sh:268
14117#, sh-format
14118msgid "Saved working directory and index state $stash_msg"
14119msgstr "保存工作目录和索引状态 $stash_msg"
14120
14121#: git-stash.sh:285
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014122msgid "Cannot remove worktree changes"
14123msgstr "无法删除工作区变更"
14124
Jiang Xina0b6b242016-10-27 21:53:37 +080014125#: git-stash.sh:403
Jiang Xin7aea43f2015-05-31 08:42:31 +080014126#, sh-format
14127msgid "unknown option: $opt"
14128msgstr "未知选项: $opt"
14129
Jiang Xina0b6b242016-10-27 21:53:37 +080014130#: git-stash.sh:416
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014131msgid "No stash found."
Jiang Xin90e6ef52012-03-27 14:46:11 +080014132msgstr "未发现 stash。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014133
Jiang Xina0b6b242016-10-27 21:53:37 +080014134#: git-stash.sh:423
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014135#, sh-format
14136msgid "Too many revisions specified: $REV"
Jiang Xin90e6ef52012-03-27 14:46:11 +080014137msgstr "指定了太多的版本:$REV"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014138
Jiang Xina0b6b242016-10-27 21:53:37 +080014139#: git-stash.sh:438
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014140#, sh-format
Jiang Xin220c3132014-10-08 10:55:14 +080014141msgid "$reference is not a valid reference"
14142msgstr "$reference 不是一个有效的引用"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014143
Jiang Xina0b6b242016-10-27 21:53:37 +080014144#: git-stash.sh:466
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014145#, sh-format
14146msgid "'$args' is not a stash-like commit"
Jiang Xin90e6ef52012-03-27 14:46:11 +080014147msgstr "'$args' 不是 stash 样提交"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014148
Jiang Xina0b6b242016-10-27 21:53:37 +080014149#: git-stash.sh:477
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014150#, sh-format
14151msgid "'$args' is not a stash reference"
Jiang Xin90e6ef52012-03-27 14:46:11 +080014152msgstr "'$args' 不是一个 stash 引用"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014153
Jiang Xina0b6b242016-10-27 21:53:37 +080014154#: git-stash.sh:485
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014155msgid "unable to refresh index"
Jiang Xin90e6ef52012-03-27 14:46:11 +080014156msgstr "无法刷新索引"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014157
Jiang Xina0b6b242016-10-27 21:53:37 +080014158#: git-stash.sh:489
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014159msgid "Cannot apply a stash in the middle of a merge"
14160msgstr "无法在合并过程中恢复进度"
14161
Jiang Xina0b6b242016-10-27 21:53:37 +080014162#: git-stash.sh:497
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014163msgid "Conflicts in index. Try without --index."
Jiang Xin90e6ef52012-03-27 14:46:11 +080014164msgstr "索引中有冲突。尝试不使用 --index。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014165
Jiang Xina0b6b242016-10-27 21:53:37 +080014166#: git-stash.sh:499
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014167msgid "Could not save index tree"
Jiang Xin90e6ef52012-03-27 14:46:11 +080014168msgstr "不能保存索引树"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014169
Jiang Xina0b6b242016-10-27 21:53:37 +080014170#: git-stash.sh:508
14171msgid "Could not restore untracked files from stash"
14172msgstr "无法从进度保存中恢复未跟踪文件"
14173
14174#: git-stash.sh:533
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014175msgid "Cannot unstage modified files"
Jiang Xin160fb2b2015-08-02 21:47:30 +080014176msgstr "无法将修改的文件取消暂存"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014177
Jiang Xina0b6b242016-10-27 21:53:37 +080014178#: git-stash.sh:548
Jiang Xinb694fbb2012-06-08 12:07:25 +080014179msgid "Index was not unstashed."
14180msgstr "索引的进度没有被恢复。"
14181
Jiang Xina0b6b242016-10-27 21:53:37 +080014182#: git-stash.sh:562
Jiang Xin5c57d762016-08-28 10:18:12 +080014183msgid "The stash is kept in case you need it again."
Ray Chen9a4b6942016-09-07 18:03:04 +080014184msgstr "暂存被保留以备您再次需要。"
Jiang Xin5c57d762016-08-28 10:18:12 +080014185
Jiang Xina0b6b242016-10-27 21:53:37 +080014186#: git-stash.sh:571
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014187#, sh-format
14188msgid "Dropped ${REV} ($s)"
14189msgstr "丢弃了 ${REV} ($s)"
14190
Jiang Xina0b6b242016-10-27 21:53:37 +080014191#: git-stash.sh:572
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014192#, sh-format
14193msgid "${REV}: Could not drop stash entry"
Jiang Xin90e6ef52012-03-27 14:46:11 +080014194msgstr "${REV}:不能丢弃进度条目"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014195
Jiang Xina0b6b242016-10-27 21:53:37 +080014196#: git-stash.sh:580
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014197msgid "No branch name specified"
14198msgstr "未指定分支名"
14199
Jiang Xina0b6b242016-10-27 21:53:37 +080014200#: git-stash.sh:652
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014201msgid "(To restore them type \"git stash apply\")"
14202msgstr "(为恢复数据输入 \"git stash apply\")"
14203
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014204#: git-submodule.sh:181
Jiang Xin2e8451e2013-07-26 14:00:02 +080014205msgid "Relative path can only be used from the toplevel of the working tree"
14206msgstr "只能在工作区的顶级目录中使用相对路径"
14207
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014208#: git-submodule.sh:191
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014209#, sh-format
14210msgid "repo URL: '$repo' must be absolute or begin with ./|../"
Ray Chen4375c102015-08-10 18:03:29 +080014211msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014212
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014213#: git-submodule.sh:210
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014214#, sh-format
Jiang Xin170e9892012-04-30 00:06:55 +080014215msgid "'$sm_path' already exists in the index"
14216msgstr "'$sm_path' 已经存在于索引中"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014217
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014218#: git-submodule.sh:213
14219#, sh-format
14220msgid "'$sm_path' already exists in the index and is not a submodule"
14221msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
14222
14223#: git-submodule.sh:218
Jiang Xinb694fbb2012-06-08 12:07:25 +080014224#, sh-format
14225msgid ""
14226"The following path is ignored by one of your .gitignore files:\n"
14227"$sm_path\n"
14228"Use -f if you really want to add it."
14229msgstr ""
14230"以下路径被您的一个 .gitignore 文件所忽略:\n"
14231"$sm_path\n"
14232"如果您确实想添加它,使用 -f 参数。"
14233
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014234#: git-submodule.sh:236
Jiang Xinb694fbb2012-06-08 12:07:25 +080014235#, sh-format
14236msgid "Adding existing repo at '$sm_path' to the index"
Jiang Xin160fb2b2015-08-02 21:47:30 +080014237msgstr "添加位于 '$sm_path' 的现存仓库到索引"
Jiang Xinb694fbb2012-06-08 12:07:25 +080014238
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014239#: git-submodule.sh:238
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014240#, sh-format
Jiang Xin170e9892012-04-30 00:06:55 +080014241msgid "'$sm_path' already exists and is not a valid git repo"
Jiang Xin160fb2b2015-08-02 21:47:30 +080014242msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014243
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014244#: git-submodule.sh:246
Wang Sheng07432ce2013-01-30 17:23:08 +080014245#, sh-format
14246msgid "A git directory for '$sm_name' is found locally with remote(s):"
Jiang Xin160fb2b2015-08-02 21:47:30 +080014247msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
Wang Sheng07432ce2013-01-30 17:23:08 +080014248
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014249#: git-submodule.sh:248
Wang Sheng07432ce2013-01-30 17:23:08 +080014250#, sh-format
14251msgid ""
Jiang Xin5c57d762016-08-28 10:18:12 +080014252"If you want to reuse this local git directory instead of cloning again from\n"
14253" $realrepo\n"
14254"use the '--force' option. If the local git directory is not the correct "
14255"repo\n"
Wang Sheng07432ce2013-01-30 17:23:08 +080014256"or you are unsure what this means choose another name with the '--name' "
14257"option."
Jiang Xin5c57d762016-08-28 10:18:12 +080014258msgstr ""
14259"如果您想要重用这个本地 git 目录而非重新克隆自\n"
14260" $realrepo\n"
14261"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
14262"或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
Wang Sheng07432ce2013-01-30 17:23:08 +080014263
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014264#: git-submodule.sh:254
Wang Sheng07432ce2013-01-30 17:23:08 +080014265#, sh-format
14266msgid "Reactivating local git directory for submodule '$sm_name'."
14267msgstr "激活本地 git 目录到子模组 '$sm_name'。"
14268
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014269#: git-submodule.sh:266
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014270#, sh-format
Jiang Xin170e9892012-04-30 00:06:55 +080014271msgid "Unable to checkout submodule '$sm_path'"
14272msgstr "不能检出子模组 '$sm_path'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014273
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014274#: git-submodule.sh:271
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014275#, sh-format
Jiang Xin170e9892012-04-30 00:06:55 +080014276msgid "Failed to add submodule '$sm_path'"
14277msgstr "无法添加子模组 '$sm_path'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014278
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014279#: git-submodule.sh:280
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014280#, sh-format
Jiang Xin170e9892012-04-30 00:06:55 +080014281msgid "Failed to register submodule '$sm_path'"
14282msgstr "无法注册子模组 '$sm_path'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014283
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014284#: git-submodule.sh:327
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014285#, sh-format
Jiang Xin5b04ee32016-05-29 20:40:35 +080014286msgid "Entering '$displaypath'"
14287msgstr "正在进入 '$displaypath'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014288
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014289#: git-submodule.sh:347
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014290#, sh-format
Jiang Xin5b04ee32016-05-29 20:40:35 +080014291msgid "Stopping at '$displaypath'; script returned non-zero status."
Ray Chenaef18cc2016-06-06 00:06:17 +080014292msgstr "停止于 '$displaypath';脚本返回非零值。"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014293
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014294#: git-submodule.sh:418
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014295#, sh-format
Jiang Xin5b04ee32016-05-29 20:40:35 +080014296msgid "pathspec and --all are incompatible"
14297msgstr "pathspec 和 --all 不兼容"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014298
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014299#: git-submodule.sh:423
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014300#, sh-format
Jiang Xin5b04ee32016-05-29 20:40:35 +080014301msgid "Use '--all' if you really want to deinitialize all submodules"
Ray Chenaef18cc2016-06-06 00:06:17 +080014302msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014303
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014304#: git-submodule.sh:443
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014305#, sh-format
14306msgid ""
Jiang Xin5c57d762016-08-28 10:18:12 +080014307"Submodule work tree '$displaypath' contains a .git directory\n"
Jiang Xin1003b3a2013-04-11 17:55:09 +080014308"(use 'rm -rf' if you really want to remove it including all of its history)"
Jiang Xin5c57d762016-08-28 10:18:12 +080014309msgstr ""
14310"子模组工作区 '$displaypath' 包含一个 .git 目录\n"
Ray Chen9a4b6942016-09-07 18:03:04 +080014311"(如果您真的想删除它及其全部历史,使用 'rm -rf' 命令)"
Jiang Xin1003b3a2013-04-11 17:55:09 +080014312
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014313#: git-submodule.sh:451
Jiang Xin1003b3a2013-04-11 17:55:09 +080014314#, sh-format
14315msgid ""
Jiang Xin2e8451e2013-07-26 14:00:02 +080014316"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
Jiang Xin1003b3a2013-04-11 17:55:09 +080014317"discard them"
Jiang Xin2e8451e2013-07-26 14:00:02 +080014318msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
Jiang Xin1003b3a2013-04-11 17:55:09 +080014319
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014320#: git-submodule.sh:454
Jiang Xin1003b3a2013-04-11 17:55:09 +080014321#, sh-format
Jiang Xin2e8451e2013-07-26 14:00:02 +080014322msgid "Cleared directory '$displaypath'"
14323msgstr "已清除目录 '$displaypath'"
Jiang Xin1003b3a2013-04-11 17:55:09 +080014324
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014325#: git-submodule.sh:455
Jiang Xin1003b3a2013-04-11 17:55:09 +080014326#, sh-format
Jiang Xin2e8451e2013-07-26 14:00:02 +080014327msgid "Could not remove submodule work tree '$displaypath'"
14328msgstr "无法移除子模组工作区 '$displaypath'"
Jiang Xin1003b3a2013-04-11 17:55:09 +080014329
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014330#: git-submodule.sh:458
Jiang Xin1003b3a2013-04-11 17:55:09 +080014331#, sh-format
Jiang Xin2e8451e2013-07-26 14:00:02 +080014332msgid "Could not create empty submodule directory '$displaypath'"
14333msgstr "不能创建空的子模组目录 '$displaypath'"
Jiang Xin1003b3a2013-04-11 17:55:09 +080014334
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014335#: git-submodule.sh:467
Jiang Xin1003b3a2013-04-11 17:55:09 +080014336#, sh-format
Jiang Xin2e8451e2013-07-26 14:00:02 +080014337msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
14338msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
Jiang Xin1003b3a2013-04-11 17:55:09 +080014339
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014340#: git-submodule.sh:623
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014341#, sh-format
Jiang Xin2e8451e2013-07-26 14:00:02 +080014342msgid "Unable to find current revision in submodule path '$displaypath'"
14343msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014344
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014345#: git-submodule.sh:633
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014346#, sh-format
Jiang Xin170e9892012-04-30 00:06:55 +080014347msgid "Unable to fetch in submodule path '$sm_path'"
14348msgstr "无法在子模组路径 '$sm_path' 中获取"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014349
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014350#: git-submodule.sh:638
Jiang Xin5c57d762016-08-28 10:18:12 +080014351#, sh-format
14352msgid ""
14353"Unable to find current ${remote_name}/${branch} revision in submodule path "
14354"'$sm_path'"
Ray Chen9a4b6942016-09-07 18:03:04 +080014355msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
Jiang Xin5c57d762016-08-28 10:18:12 +080014356
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014357#: git-submodule.sh:656
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014358#, sh-format
Jiang Xin2e8451e2013-07-26 14:00:02 +080014359msgid "Unable to fetch in submodule path '$displaypath'"
14360msgstr "无法在子模组路径 '$displaypath' 中获取"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014361
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014362#: git-submodule.sh:662
Jiang Xin5c57d762016-08-28 10:18:12 +080014363#, sh-format
14364msgid ""
14365"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
14366"Direct fetching of that commit failed."
Jiang Xina0b6b242016-10-27 21:53:37 +080014367msgstr ""
14368"获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
Jiang Xin5c57d762016-08-28 10:18:12 +080014369
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014370#: git-submodule.sh:669
Jiang Xin6c94aba2014-03-13 12:41:34 +080014371#, sh-format
14372msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
14373msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
14374
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014375#: git-submodule.sh:670
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014376#, sh-format
Jiang Xin6c94aba2014-03-13 12:41:34 +080014377msgid "Submodule path '$displaypath': checked out '$sha1'"
14378msgstr "子模组路径 '$displaypath':检出 '$sha1'"
14379
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014380#: git-submodule.sh:674
Jiang Xin6c94aba2014-03-13 12:41:34 +080014381#, sh-format
Jiang Xin2e8451e2013-07-26 14:00:02 +080014382msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
14383msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014384
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014385#: git-submodule.sh:675
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014386#, sh-format
Jiang Xin2e8451e2013-07-26 14:00:02 +080014387msgid "Submodule path '$displaypath': rebased into '$sha1'"
14388msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014389
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014390#: git-submodule.sh:680
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014391#, sh-format
Jiang Xin2e8451e2013-07-26 14:00:02 +080014392msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
14393msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014394
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014395#: git-submodule.sh:681
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014396#, sh-format
Jiang Xin2e8451e2013-07-26 14:00:02 +080014397msgid "Submodule path '$displaypath': merged in '$sha1'"
14398msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014399
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014400#: git-submodule.sh:686
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014401#, sh-format
Jiang Xin5b04ee32016-05-29 20:40:35 +080014402msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
14403msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014404
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014405#: git-submodule.sh:687
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014406#, sh-format
Jiang Xin5b04ee32016-05-29 20:40:35 +080014407msgid "Submodule path '$displaypath': '$command $sha1'"
Ray Chenaef18cc2016-06-06 00:06:17 +080014408msgstr "子模组 '$displaypath':'$command $sha1'"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014409
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014410#: git-submodule.sh:718
Jiang Xin2e8451e2013-07-26 14:00:02 +080014411#, sh-format
14412msgid "Failed to recurse into submodule path '$displaypath'"
14413msgstr "无法递归进子模组路径 '$displaypath'"
14414
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014415#: git-submodule.sh:826
Jiang Xin649900b2012-08-02 11:50:59 +080014416msgid "The --cached option cannot be used with the --files option"
14417msgstr "选项 --cached 不能和选项 --files 同时使用"
Jiang Xinb694fbb2012-06-08 12:07:25 +080014418
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014419#: git-submodule.sh:878
Jiang Xinb694fbb2012-06-08 12:07:25 +080014420#, sh-format
14421msgid "unexpected mode $mod_dst"
14422msgstr "意外的模式 $mod_dst"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014423
Jiang Xin90e6ef52012-03-27 14:46:11 +080014424# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014425#: git-submodule.sh:898
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014426#, sh-format
Jiang Xin2e8451e2013-07-26 14:00:02 +080014427msgid " Warn: $display_name doesn't contain commit $sha1_src"
14428msgstr " 警告:$display_name 未包含提交 $sha1_src"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014429
Jiang Xin90e6ef52012-03-27 14:46:11 +080014430# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014431#: git-submodule.sh:901
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014432#, sh-format
Jiang Xin2e8451e2013-07-26 14:00:02 +080014433msgid " Warn: $display_name doesn't contain commit $sha1_dst"
14434msgstr " 警告:$display_name 未包含提交 $sha1_dst"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014435
Jiang Xin90e6ef52012-03-27 14:46:11 +080014436# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014437#: git-submodule.sh:904
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014438#, sh-format
Jiang Xin2e8451e2013-07-26 14:00:02 +080014439msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
14440msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014441
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014442#: git-submodule.sh:1051
Jiang Xin1003b3a2013-04-11 17:55:09 +080014443#, sh-format
14444msgid "Failed to recurse into submodule path '$sm_path'"
14445msgstr "无法递归进子模组路径 '$sm_path'"
14446
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014447#: git-submodule.sh:1118
Jiang Xinc04f5ac2012-02-13 14:41:59 +080014448#, sh-format
Jiang Xin2e8451e2013-07-26 14:00:02 +080014449msgid "Synchronizing submodule url for '$displaypath'"
14450msgstr "为 '$displaypath' 同步子模组 url"
Jiang Xin1b7f4a32015-08-23 15:23:21 +080014451
Jiang Xin5b04ee32016-05-29 20:40:35 +080014452#: git-parse-remote.sh:89
14453#, sh-format
14454msgid "See git-${cmd}(1) for details."
14455msgstr "详见 git-${cmd}(1)。"
Jiang Xin5c57d762016-08-28 10:18:12 +080014456
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014457#: git-rebase--interactive.sh:140
Jiang Xin5c57d762016-08-28 10:18:12 +080014458#, sh-format
14459msgid "Rebasing ($new_count/$total)"
14460msgstr "变基中($new_count/$total)"
14461
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014462#: git-rebase--interactive.sh:156
Jiang Xin5c57d762016-08-28 10:18:12 +080014463msgid ""
14464"\n"
14465"Commands:\n"
14466" p, pick = use commit\n"
14467" r, reword = use commit, but edit the commit message\n"
14468" e, edit = use commit, but stop for amending\n"
14469" s, squash = use commit, but meld into previous commit\n"
14470" f, fixup = like \"squash\", but discard this commit's log message\n"
14471" x, exec = run command (the rest of the line) using shell\n"
14472" d, drop = remove commit\n"
14473"\n"
14474"These lines can be re-ordered; they are executed from top to bottom.\n"
14475msgstr ""
14476"\n"
14477"命令:\n"
14478" p, pick = 使用提交\n"
14479" r, reword = 使用提交,但修改提交说明\n"
14480" e, edit = 使用提交,但停止以便进行提交修补\n"
14481" s, squash = 使用提交,但和前一个版本融合\n"
14482" f, fixup = 类似于 \"squash\",但丢弃提交说明日志\n"
14483" x, exec = 使用 shell 运行命令(此行剩余部分)\n"
14484" d, drop = 删除提交\n"
14485"\n"
Ray Chen9a4b6942016-09-07 18:03:04 +080014486"这些行可以被重新排序;它们会被从上至下地执行。\n"
Jiang Xin5c57d762016-08-28 10:18:12 +080014487"\n"
14488
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014489#: git-rebase--interactive.sh:171
Jiang Xin5c57d762016-08-28 10:18:12 +080014490msgid ""
14491"\n"
14492"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
Jiang Xina0b6b242016-10-27 21:53:37 +080014493msgstr ""
14494"\n"
14495"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
Jiang Xin5c57d762016-08-28 10:18:12 +080014496
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014497#: git-rebase--interactive.sh:175
Jiang Xin5c57d762016-08-28 10:18:12 +080014498msgid ""
14499"\n"
14500"If you remove a line here THAT COMMIT WILL BE LOST.\n"
Jiang Xina0b6b242016-10-27 21:53:37 +080014501msgstr ""
14502"\n"
14503"如果您在这里删除一行,对应的提交将会丢失。\n"
Jiang Xin5c57d762016-08-28 10:18:12 +080014504
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014505#: git-rebase--interactive.sh:211
Jiang Xin5c57d762016-08-28 10:18:12 +080014506#, sh-format
14507msgid ""
14508"You can amend the commit now, with\n"
14509"\n"
14510"\tgit commit --amend $gpg_sign_opt_quoted\n"
14511"\n"
14512"Once you are satisfied with your changes, run\n"
14513"\n"
14514"\tgit rebase --continue"
14515msgstr ""
14516"您现在可以修补这个提交,使用\n"
14517"\n"
14518"\tgit commit --amend $gpg_sign_opt_quoted\n"
14519"\n"
Ray Chen9a4b6942016-09-07 18:03:04 +080014520"当您对变更感到满意,执行\n"
Jiang Xin5c57d762016-08-28 10:18:12 +080014521"\n"
14522"\tgit rebase --continue"
14523
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014524#: git-rebase--interactive.sh:236
Jiang Xin5c57d762016-08-28 10:18:12 +080014525#, sh-format
14526msgid "$sha1: not a commit that can be picked"
14527msgstr "$sha1:不是一个可以被拣选的提交"
14528
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014529#: git-rebase--interactive.sh:275
Jiang Xin5c57d762016-08-28 10:18:12 +080014530#, sh-format
14531msgid "Invalid commit name: $sha1"
14532msgstr "无效的提交名:$sha1"
14533
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014534#: git-rebase--interactive.sh:317
Jiang Xin5c57d762016-08-28 10:18:12 +080014535msgid "Cannot write current commit's replacement sha1"
14536msgstr "不能写入当前提交的替代 sha1"
14537
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014538#: git-rebase--interactive.sh:369
Jiang Xin5c57d762016-08-28 10:18:12 +080014539#, sh-format
14540msgid "Fast-forward to $sha1"
14541msgstr "快进到 $sha1"
14542
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014543#: git-rebase--interactive.sh:371
Jiang Xin5c57d762016-08-28 10:18:12 +080014544#, sh-format
14545msgid "Cannot fast-forward to $sha1"
14546msgstr "不能快进到 $sha1"
14547
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014548#: git-rebase--interactive.sh:380
Jiang Xin5c57d762016-08-28 10:18:12 +080014549#, sh-format
14550msgid "Cannot move HEAD to $first_parent"
14551msgstr "不能移动 HEAD 到 $first_parent"
14552
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014553#: git-rebase--interactive.sh:385
Jiang Xin5c57d762016-08-28 10:18:12 +080014554#, sh-format
14555msgid "Refusing to squash a merge: $sha1"
14556msgstr "拒绝压缩一个合并:$sha1"
14557
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014558#: git-rebase--interactive.sh:399
Jiang Xin5c57d762016-08-28 10:18:12 +080014559#, sh-format
14560msgid "Error redoing merge $sha1"
14561msgstr "无法重做合并 $sha1"
14562
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014563#: git-rebase--interactive.sh:407
Jiang Xin5c57d762016-08-28 10:18:12 +080014564#, sh-format
14565msgid "Could not pick $sha1"
14566msgstr "不能拣选 $sha1"
14567
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014568#: git-rebase--interactive.sh:416
Jiang Xin5c57d762016-08-28 10:18:12 +080014569#, sh-format
14570msgid "This is the commit message #${n}:"
Ray Chen9a4b6942016-09-07 18:03:04 +080014571msgstr "这是提交说明 #${n}:"
Jiang Xin5c57d762016-08-28 10:18:12 +080014572
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014573#: git-rebase--interactive.sh:421
Jiang Xin5c57d762016-08-28 10:18:12 +080014574#, sh-format
14575msgid "The commit message #${n} will be skipped:"
Ray Chen9a4b6942016-09-07 18:03:04 +080014576msgstr "提交说明 #${n} 将被跳过:"
Jiang Xin5c57d762016-08-28 10:18:12 +080014577
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014578#: git-rebase--interactive.sh:432
Jiang Xin5c57d762016-08-28 10:18:12 +080014579#, sh-format
14580msgid "This is a combination of $count commit."
14581msgid_plural "This is a combination of $count commits."
14582msgstr[0] "这是一个 $count 个提交的组合。"
14583msgstr[1] "这是一个 $count 个提交的组合。"
14584
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014585#: git-rebase--interactive.sh:441
Jiang Xin5c57d762016-08-28 10:18:12 +080014586#, sh-format
14587msgid "Cannot write $fixup_msg"
14588msgstr "不能写入 $fixup_msg"
14589
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014590#: git-rebase--interactive.sh:444
Jiang Xin5c57d762016-08-28 10:18:12 +080014591msgid "This is a combination of 2 commits."
14592msgstr "这是一个 2 个提交的组合。"
14593
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014594#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
14595#: git-rebase--interactive.sh:531
Jiang Xin5c57d762016-08-28 10:18:12 +080014596#, sh-format
14597msgid "Could not apply $sha1... $rest"
14598msgstr "不能应用 $sha1... $rest"
14599
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014600#: git-rebase--interactive.sh:559
Jiang Xin5c57d762016-08-28 10:18:12 +080014601#, sh-format
14602msgid ""
14603"Could not amend commit after successfully picking $sha1... $rest\n"
14604"This is most likely due to an empty commit message, or the pre-commit hook\n"
14605"failed. If the pre-commit hook failed, you may need to resolve the issue "
14606"before\n"
14607"you are able to reword the commit."
14608msgstr ""
14609"不能在成功拣选 $sha1... $rest 之后修补提交\n"
14610"这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
14611"钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
14612
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014613#: git-rebase--interactive.sh:574
Jiang Xin5c57d762016-08-28 10:18:12 +080014614#, sh-format
14615msgid "Stopped at $sha1_abbrev... $rest"
14616msgstr "停止在 $sha1_abbrev... $rest"
14617
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014618#: git-rebase--interactive.sh:589
Jiang Xin5c57d762016-08-28 10:18:12 +080014619#, sh-format
14620msgid "Cannot '$squash_style' without a previous commit"
Ray Chen9a4b6942016-09-07 18:03:04 +080014621msgstr "没有父提交的情况下不能 '$squash_style'"
Jiang Xin5c57d762016-08-28 10:18:12 +080014622
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014623#: git-rebase--interactive.sh:631
Jiang Xin5c57d762016-08-28 10:18:12 +080014624#, sh-format
14625msgid "Executing: $rest"
14626msgstr "执行:$rest"
14627
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014628#: git-rebase--interactive.sh:639
Jiang Xin5c57d762016-08-28 10:18:12 +080014629#, sh-format
14630msgid "Execution failed: $rest"
14631msgstr "执行失败:$rest"
14632
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014633#: git-rebase--interactive.sh:641
Jiang Xin5c57d762016-08-28 10:18:12 +080014634msgid "and made changes to the index and/or the working tree"
14635msgstr "并且修改索引和/或工作区"
14636
14637# 译者:注意保持前导空格
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014638#: git-rebase--interactive.sh:643
Jiang Xin5c57d762016-08-28 10:18:12 +080014639msgid ""
14640"You can fix the problem, and then run\n"
14641"\n"
14642"\tgit rebase --continue"
14643msgstr ""
14644"您可以解决这个问题,然后运行\n"
14645"\n"
14646"\tgit rebase --continue"
14647
14648#. TRANSLATORS: after these lines is a command to be issued by the user
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014649#: git-rebase--interactive.sh:656
Jiang Xin5c57d762016-08-28 10:18:12 +080014650#, sh-format
14651msgid ""
14652"Execution succeeded: $rest\n"
14653"but left changes to the index and/or the working tree\n"
14654"Commit or stash your changes, and then run\n"
14655"\n"
14656"\tgit rebase --continue"
14657msgstr ""
14658"执行成功:$rest\n"
14659"但是在索引和/或工作区中存在变更。提交或暂存修改,然后运行\n"
14660"\n"
14661"\tgit rebase --continue"
14662
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014663#: git-rebase--interactive.sh:667
Jiang Xin5c57d762016-08-28 10:18:12 +080014664#, sh-format
14665msgid "Unknown command: $command $sha1 $rest"
14666msgstr "未知命令:$command $sha1 $rest"
14667
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014668#: git-rebase--interactive.sh:668
Jiang Xin5c57d762016-08-28 10:18:12 +080014669msgid "Please fix this using 'git rebase --edit-todo'."
14670msgstr "要修改请使用命令 'git rebase --edit-todo'。"
14671
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014672#: git-rebase--interactive.sh:703
Jiang Xin5c57d762016-08-28 10:18:12 +080014673#, sh-format
14674msgid "Successfully rebased and updated $head_name."
Ray Chen9a4b6942016-09-07 18:03:04 +080014675msgstr "成功变基并更新 $head_name。"
Jiang Xin5c57d762016-08-28 10:18:12 +080014676
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014677#: git-rebase--interactive.sh:750
Jiang Xin5c57d762016-08-28 10:18:12 +080014678msgid "Could not skip unnecessary pick commands"
14679msgstr "不能跳过不必要的拣选命令"
14680
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014681#: git-rebase--interactive.sh:908
Jiang Xin5c57d762016-08-28 10:18:12 +080014682#, sh-format
14683msgid ""
14684"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
14685" - $line"
14686msgstr ""
14687"警告:缺失 SHA-1 或者在下面一行中不是一个提交:\n"
14688" - $line"
14689
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014690#: git-rebase--interactive.sh:941
Jiang Xin5c57d762016-08-28 10:18:12 +080014691#, sh-format
14692msgid ""
14693"Warning: the command isn't recognized in the following line:\n"
14694" - $line"
14695msgstr ""
14696"警告:下面一行中的命令未能被识别:\n"
14697" - $line"
14698
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014699#: git-rebase--interactive.sh:980
Jiang Xin5c57d762016-08-28 10:18:12 +080014700msgid "could not detach HEAD"
14701msgstr "不能检出为分离头指针"
14702
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014703#: git-rebase--interactive.sh:1018
Jiang Xin5c57d762016-08-28 10:18:12 +080014704msgid ""
14705"Warning: some commits may have been dropped accidentally.\n"
14706"Dropped commits (newer to older):"
14707msgstr "警告:一些提交可能被意外丢弃。丢弃的提交(从新到旧):"
14708
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014709#: git-rebase--interactive.sh:1026
Jiang Xin5c57d762016-08-28 10:18:12 +080014710msgid ""
14711"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
14712"\n"
14713"Use 'git config rebase.missingCommitsCheck' to change the level of "
14714"warnings.\n"
14715"The possible behaviours are: ignore, warn, error."
14716msgstr ""
Ray Chen9a4b6942016-09-07 18:03:04 +080014717"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
Jiang Xin5c57d762016-08-28 10:18:12 +080014718"\n"
Ray Chen9a4b6942016-09-07 18:03:04 +080014719"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
14720"可选值有:ignore、warn、error。"
Jiang Xin5c57d762016-08-28 10:18:12 +080014721
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014722#: git-rebase--interactive.sh:1037
Jiang Xin5c57d762016-08-28 10:18:12 +080014723#, sh-format
14724msgid ""
14725"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
14726"Ignoring."
Ray Chen9a4b6942016-09-07 18:03:04 +080014727msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。"
Jiang Xin5c57d762016-08-28 10:18:12 +080014728
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014729#: git-rebase--interactive.sh:1054
Jiang Xina0b6b242016-10-27 21:53:37 +080014730msgid ""
14731"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
14732"continue'."
14733msgstr ""
Ray Chen29004bb2016-12-28 17:08:45 +080014734"您可以用 'git rebase --edit-todo' 修正问题然后执行 'git rebase --continue'。"
Jiang Xin5c57d762016-08-28 10:18:12 +080014735
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014736#: git-rebase--interactive.sh:1055
Jiang Xin5c57d762016-08-28 10:18:12 +080014737msgid "Or you can abort the rebase with 'git rebase --abort'."
14738msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。"
14739
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014740#: git-rebase--interactive.sh:1079
Jiang Xin5c57d762016-08-28 10:18:12 +080014741msgid "Could not remove CHERRY_PICK_HEAD"
14742msgstr "不能删除 CHERRY_PICK_HEAD"
14743
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014744#: git-rebase--interactive.sh:1084
Jiang Xin5c57d762016-08-28 10:18:12 +080014745#, sh-format
14746msgid ""
14747"You have staged changes in your working tree.\n"
14748"If these changes are meant to be\n"
14749"squashed into the previous commit, run:\n"
14750"\n"
14751" git commit --amend $gpg_sign_opt_quoted\n"
14752"\n"
14753"If they are meant to go into a new commit, run:\n"
14754"\n"
14755" git commit $gpg_sign_opt_quoted\n"
14756"\n"
Jiang Xina0b6b242016-10-27 21:53:37 +080014757"In both cases, once you're done, continue with:\n"
Jiang Xin5c57d762016-08-28 10:18:12 +080014758"\n"
14759" git rebase --continue\n"
14760msgstr ""
14761"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
14762"\n"
14763" git commit --amend $gpg_sign_opt_quoted\n"
14764"\n"
14765"如果这些变更要形成一个新提交,执行:\n"
14766"\n"
14767" git commit $gpg_sign_opt_quoted\n"
14768"\n"
Ray Chen9a4b6942016-09-07 18:03:04 +080014769"无论哪种情况,当您完成提交,继续执行:\n"
Jiang Xin5c57d762016-08-28 10:18:12 +080014770"\n"
14771" git rebase --continue\n"
14772
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014773#: git-rebase--interactive.sh:1101
Jiang Xin5c57d762016-08-28 10:18:12 +080014774msgid "Error trying to find the author identity to amend commit"
Ray Chen9a4b6942016-09-07 18:03:04 +080014775msgstr "在修补提交中查找作者信息时遇到错误"
Jiang Xin5c57d762016-08-28 10:18:12 +080014776
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014777#: git-rebase--interactive.sh:1106
Jiang Xin5c57d762016-08-28 10:18:12 +080014778msgid ""
14779"You have uncommitted changes in your working tree. Please commit them\n"
14780"first and then run 'git rebase --continue' again."
Jiang Xina0b6b242016-10-27 21:53:37 +080014781msgstr ""
14782"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
Jiang Xin5c57d762016-08-28 10:18:12 +080014783
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014784#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115
Jiang Xin5c57d762016-08-28 10:18:12 +080014785msgid "Could not commit staged changes."
14786msgstr "不能提交暂存的修改。"
14787
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014788#: git-rebase--interactive.sh:1139
Jiang Xin5c57d762016-08-28 10:18:12 +080014789msgid ""
14790"\n"
14791"You are editing the todo file of an ongoing interactive rebase.\n"
14792"To continue rebase after editing, run:\n"
14793" git rebase --continue\n"
14794"\n"
14795msgstr ""
14796"\n"
Ray Chen9a4b6942016-09-07 18:03:04 +080014797"您正在修改运行中的交互式变基的 todo 文件。若要在编辑结束后继续变基,\n"
Jiang Xin5c57d762016-08-28 10:18:12 +080014798"请执行:\n"
14799" git rebase --continue\n"
14800"\n"
14801
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014802#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305
Jiang Xin5c57d762016-08-28 10:18:12 +080014803msgid "Could not execute editor"
14804msgstr "无法运行编辑器"
14805
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014806#: git-rebase--interactive.sh:1160
Jiang Xin5c57d762016-08-28 10:18:12 +080014807#, sh-format
14808msgid "Could not checkout $switch_to"
14809msgstr "不能检出 $switch_to"
14810
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014811#: git-rebase--interactive.sh:1165
Jiang Xin5c57d762016-08-28 10:18:12 +080014812msgid "No HEAD?"
14813msgstr "没有 HEAD?"
14814
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014815#: git-rebase--interactive.sh:1166
Jiang Xin5c57d762016-08-28 10:18:12 +080014816#, sh-format
14817msgid "Could not create temporary $state_dir"
14818msgstr "不能创建临时 $state_dir"
14819
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014820#: git-rebase--interactive.sh:1168
Jiang Xin5c57d762016-08-28 10:18:12 +080014821msgid "Could not mark as interactive"
14822msgstr "不能标记为交互式"
14823
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014824#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183
Jiang Xin5c57d762016-08-28 10:18:12 +080014825msgid "Could not init rewritten commits"
14826msgstr "不能对重写提交进行初始化"
14827
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014828#: git-rebase--interactive.sh:1283
Jiang Xin5c57d762016-08-28 10:18:12 +080014829#, sh-format
14830msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
14831msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
14832msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
14833msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
14834
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014835#: git-rebase--interactive.sh:1288
Jiang Xin5c57d762016-08-28 10:18:12 +080014836msgid ""
14837"\n"
14838"However, if you remove everything, the rebase will be aborted.\n"
14839"\n"
Jiang Xina0b6b242016-10-27 21:53:37 +080014840msgstr ""
14841"\n"
14842"然而,如果您删除全部内容,变基操作将会终止。\n"
14843"\n"
Jiang Xin5c57d762016-08-28 10:18:12 +080014844
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014845#: git-rebase--interactive.sh:1295
Jiang Xin5c57d762016-08-28 10:18:12 +080014846msgid "Note that empty commits are commented out"
14847msgstr "注意空提交已被注释掉"
14848
14849#: git-sh-setup.sh:89 git-sh-setup.sh:94
14850#, sh-format
14851msgid "usage: $dashless $USAGE"
14852msgstr "用法:$dashless $USAGE"
14853
14854#: git-sh-setup.sh:190
14855#, sh-format
14856msgid "Cannot chdir to $cdup, the toplevel of the working tree"
Ray Chen9a4b6942016-09-07 18:03:04 +080014857msgstr "不能切换目录到 $cdup,工作区的顶级目录"
Jiang Xin5c57d762016-08-28 10:18:12 +080014858
14859#: git-sh-setup.sh:199 git-sh-setup.sh:206
14860#, sh-format
14861msgid "fatal: $program_name cannot be used without a working tree."
14862msgstr "严重错误:$program_name 不能在没有工作区的情况下使用"
14863
14864#: git-sh-setup.sh:220
14865msgid "Cannot rebase: You have unstaged changes."
14866msgstr "不能变基:您有未暂存的变更。"
14867
14868#: git-sh-setup.sh:223
14869msgid "Cannot rewrite branches: You have unstaged changes."
14870msgstr "不能重写分支:您有未暂存的变更。"
14871
Jiang Xina0b6b242016-10-27 21:53:37 +080014872#: git-sh-setup.sh:226
14873msgid "Cannot pull with rebase: You have unstaged changes."
14874msgstr "无法通过变基方式拉取:您有未暂存的变更。"
14875
Jiang Xin5c57d762016-08-28 10:18:12 +080014876#: git-sh-setup.sh:229
14877#, sh-format
14878msgid "Cannot $action: You have unstaged changes."
14879msgstr "不能 $action:您有未暂存的变更。"
14880
14881#: git-sh-setup.sh:242
14882msgid "Cannot rebase: Your index contains uncommitted changes."
14883msgstr "不能变基:您的索引中包含未提交的变更。"
14884
Jiang Xina0b6b242016-10-27 21:53:37 +080014885#: git-sh-setup.sh:245
14886msgid "Cannot pull with rebase: Your index contains uncommitted changes."
14887msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
14888
Jiang Xin5c57d762016-08-28 10:18:12 +080014889#: git-sh-setup.sh:248
14890#, sh-format
14891msgid "Cannot $action: Your index contains uncommitted changes."
14892msgstr "不能 $action:您的索引中包含未提交的变更。"
14893
Jiang Xina0b6b242016-10-27 21:53:37 +080014894#: git-sh-setup.sh:252
14895msgid "Additionally, your index contains uncommitted changes."
14896msgstr "而且您的索引中包含未提交的变更。"
14897
Jiang Xin5c57d762016-08-28 10:18:12 +080014898#: git-sh-setup.sh:372
14899msgid "You need to run this command from the toplevel of the working tree."
14900msgstr "您需要在工作区的顶级目录中运行这个命令。"
14901
14902#: git-sh-setup.sh:377
14903msgid "Unable to determine absolute path of git directory"
14904msgstr "不能确定 git 目录的绝对路径"
Jiang Xina0b6b242016-10-27 21:53:37 +080014905
Jiang Xin1a79b2f2017-01-27 22:50:57 +080014906#. TRANSLATORS: you can adjust this to align "git add -i" status menu
14907#: git-add--interactive.perl:238
14908#, perl-format
14909msgid "%12s %12s %s"
14910msgstr "%12s %12s %s"
14911
14912#: git-add--interactive.perl:239
14913msgid "staged"
14914msgstr "缓存"
14915
14916#: git-add--interactive.perl:239
14917msgid "unstaged"
14918msgstr "未缓存"
14919
14920#: git-add--interactive.perl:297 git-add--interactive.perl:322
14921msgid "binary"
14922msgstr "二进制"
14923
14924#: git-add--interactive.perl:306 git-add--interactive.perl:360
14925msgid "nothing"
14926msgstr "无"
14927
14928#: git-add--interactive.perl:342 git-add--interactive.perl:357
14929msgid "unchanged"
14930msgstr "没有修改"
14931
14932#: git-add--interactive.perl:653
14933#, perl-format
14934msgid "added %d path\n"
14935msgid_plural "added %d paths\n"
14936msgstr[0] "增加了 %d 个路径\n"
14937msgstr[1] "增加了 %d 个路径\n"
14938
14939#: git-add--interactive.perl:656
14940#, perl-format
14941msgid "updated %d path\n"
14942msgid_plural "updated %d paths\n"
14943msgstr[0] "更新了 %d 个路径\n"
14944msgstr[1] "更新了 %d 个路径\n"
14945
14946#: git-add--interactive.perl:659
14947#, perl-format
14948msgid "reverted %d path\n"
14949msgid_plural "reverted %d paths\n"
14950msgstr[0] "还原了 %d 个路径\n"
14951msgstr[1] "还原了 %d 个路径\n"
14952
14953#: git-add--interactive.perl:662
14954#, perl-format
14955msgid "touched %d path\n"
14956msgid_plural "touched %d paths\n"
14957msgstr[0] "触碰了 %d 个路径\n"
14958msgstr[1] "触碰了 %d 个路径\n"
14959
14960#: git-add--interactive.perl:671
14961msgid "Update"
14962msgstr "更新"
14963
14964#: git-add--interactive.perl:683
14965msgid "Revert"
14966msgstr "还原"
14967
14968#: git-add--interactive.perl:706
14969#, perl-format
14970msgid "note: %s is untracked now.\n"
14971msgstr "说明:%s 现已成为未跟踪的。\n"
14972
14973#: git-add--interactive.perl:717
14974msgid "Add untracked"
14975msgstr "添加未跟踪的"
14976
14977#: git-add--interactive.perl:723
14978msgid "No untracked files.\n"
14979msgstr "没有未跟踪的文件。\n"
14980
14981#: git-add--interactive.perl:1039
14982msgid ""
14983"If the patch applies cleanly, the edited hunk will immediately be\n"
14984"marked for staging."
14985msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
14986
14987#: git-add--interactive.perl:1042
14988msgid ""
14989"If the patch applies cleanly, the edited hunk will immediately be\n"
14990"marked for stashing."
14991msgstr "如果补丁能干净地应用,编辑块将立即标记为保存进度。"
14992
14993#: git-add--interactive.perl:1045
14994msgid ""
14995"If the patch applies cleanly, the edited hunk will immediately be\n"
14996"marked for unstaging."
14997msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
14998
14999#: git-add--interactive.perl:1048 git-add--interactive.perl:1057
15000msgid ""
15001"If the patch applies cleanly, the edited hunk will immediately be\n"
15002"marked for applying."
15003msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
15004
15005#: git-add--interactive.perl:1051
15006msgid ""
15007"If the patch applies cleanly, the edited hunk will immediately be\n"
15008"marked for discarding"
15009msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃"
15010
15011#: git-add--interactive.perl:1054
15012msgid ""
15013"If the patch applies cleanly, the edited hunk will immediately be\n"
15014"marked for discarding."
15015msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
15016
15017#: git-add--interactive.perl:1067
15018#, perl-format
15019msgid "failed to open hunk edit file for writing: %s"
15020msgstr "无法写入块编辑文件:%s"
15021
15022#: git-add--interactive.perl:1068
15023msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
15024msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
15025
15026#: git-add--interactive.perl:1074
15027#, perl-format
15028msgid ""
15029"---\n"
15030"To remove '%s' lines, make them ' ' lines (context).\n"
15031"To remove '%s' lines, delete them.\n"
15032"Lines starting with %s will be removed.\n"
15033msgstr ""
15034"---\n"
15035"要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
15036"要删除 '%s' 开始的行,删除它们。\n"
15037"以 %s 开始的行将被删除。\n"
15038
15039#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
15040#: git-add--interactive.perl:1082
15041msgid ""
15042"If it does not apply cleanly, you will be given an opportunity to\n"
15043"edit again. If all lines of the hunk are removed, then the edit is\n"
15044"aborted and the hunk is left unchanged.\n"
15045msgstr ""
15046"如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
15047"此次编辑被终止,该块不会被修改。\n"
15048
15049#: git-add--interactive.perl:1096
15050#, perl-format
15051msgid "failed to open hunk edit file for reading: %s"
15052msgstr "无法读取块编辑文件:%s"
15053
15054#. TRANSLATORS: do not translate [y/n]
15055#. The program will only accept that input
15056#. at this point.
15057#. Consider translating (saying "no" discards!) as
15058#. (saying "n" for "no" discards!) if the translation
15059#. of the word "no" does not start with n.
15060#: git-add--interactive.perl:1187
15061msgid ""
15062"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
15063msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
15064
15065#: git-add--interactive.perl:1196
15066msgid ""
15067"y - stage this hunk\n"
15068"n - do not stage this hunk\n"
15069"q - quit; do not stage this hunk or any of the remaining ones\n"
15070"a - stage this hunk and all later hunks in the file\n"
15071"d - do not stage this hunk or any of the later hunks in the file"
15072msgstr ""
15073"y - 暂存该块\n"
15074"n - 不要暂存该块\n"
15075"q - 退出。不暂存该块及后面的全部块\n"
15076"a - 暂存该块和本文件中后面的全部块\n"
15077"d - 不暂存该块和本文件中后面的全部块"
15078
15079#: git-add--interactive.perl:1202
15080msgid ""
15081"y - stash this hunk\n"
15082"n - do not stash this hunk\n"
15083"q - quit; do not stash this hunk or any of the remaining ones\n"
15084"a - stash this hunk and all later hunks in the file\n"
15085"d - do not stash this hunk or any of the later hunks in the file"
15086msgstr ""
15087"y - 贮藏该块\n"
15088"n - 不要贮藏该块\n"
15089"q - 退出。不贮藏该块及后面的全部块\n"
15090"a - 贮藏该块和本文件中后面的全部块\n"
15091"d - 不贮藏该块和本文件中后面的全部块"
15092
15093#: git-add--interactive.perl:1208
15094msgid ""
15095"y - unstage this hunk\n"
15096"n - do not unstage this hunk\n"
15097"q - quit; do not unstage this hunk or any of the remaining ones\n"
15098"a - unstage this hunk and all later hunks in the file\n"
15099"d - do not unstage this hunk or any of the later hunks in the file"
15100msgstr ""
15101"y - 不暂存该块\n"
15102"n - 不要不暂存该块\n"
15103"q - 退出。不要不暂存该块及后面的全部块\n"
15104"a - 不暂存该块和本文件中后面的全部块\n"
15105"d - 不要不暂存该块和本文件中后面的全部块"
15106
15107#: git-add--interactive.perl:1214
15108msgid ""
15109"y - apply this hunk to index\n"
15110"n - do not apply this hunk to index\n"
15111"q - quit; do not apply this hunk or any of the remaining ones\n"
15112"a - apply this hunk and all later hunks in the file\n"
15113"d - do not apply this hunk or any of the later hunks in the file"
15114msgstr ""
15115"y - 在索引中应用该块\n"
15116"n - 不要在索引中应用该块\n"
15117"q - 退出。不要应用该块及后面的全部块\n"
15118"a - 应用该块和本文件中后面的全部块\n"
15119"d - 不要应用该块和本文件中后面的全部块"
15120
15121#: git-add--interactive.perl:1220
15122msgid ""
15123"y - discard this hunk from worktree\n"
15124"n - do not discard this hunk from worktree\n"
15125"q - quit; do not discard this hunk or any of the remaining ones\n"
15126"a - discard this hunk and all later hunks in the file\n"
15127"d - do not discard this hunk or any of the later hunks in the file"
15128msgstr ""
15129"y - 在工作区中丢弃该块\n"
15130"n - 不要在工作区中丢弃该块\n"
15131"q - 退出。不要丢弃该块及后面的全部块\n"
15132"a - 丢弃该块和本文件中后面的全部块\n"
15133"d - 不要丢弃该块和本文件中后面的全部块"
15134
15135#: git-add--interactive.perl:1226
15136msgid ""
15137"y - discard this hunk from index and worktree\n"
15138"n - do not discard this hunk from index and worktree\n"
15139"q - quit; do not discard this hunk or any of the remaining ones\n"
15140"a - discard this hunk and all later hunks in the file\n"
15141"d - do not discard this hunk or any of the later hunks in the file"
15142msgstr ""
15143"y - 在索引和工作区中丢弃该块\n"
15144"n - 不要在索引和工作区中丢弃该块\n"
15145"q - 退出。不要丢弃该块及后面的全部块\n"
15146"a - 丢弃该块和本文件中后面的全部块\n"
15147"d - 不要丢弃该块和本文件中后面的全部块"
15148
15149#: git-add--interactive.perl:1232
15150msgid ""
15151"y - apply this hunk to index and worktree\n"
15152"n - do not apply this hunk to index and worktree\n"
15153"q - quit; do not apply this hunk or any of the remaining ones\n"
15154"a - apply this hunk and all later hunks in the file\n"
15155"d - do not apply this hunk or any of the later hunks in the file"
15156msgstr ""
15157"y - 在索引和工作区中应用该块\n"
15158"n - 不要在索引和工作区中应用该块\n"
15159"q - 退出。不要应用该块及后面的全部块\n"
15160"a - 应用该块和本文件中后面的全部块\n"
15161"d - 不要应用该块和本文件中后面的全部块"
15162
15163#: git-add--interactive.perl:1241
15164msgid ""
15165"g - select a hunk to go to\n"
15166"/ - search for a hunk matching the given regex\n"
15167"j - leave this hunk undecided, see next undecided hunk\n"
15168"J - leave this hunk undecided, see next hunk\n"
15169"k - leave this hunk undecided, see previous undecided hunk\n"
15170"K - leave this hunk undecided, see previous hunk\n"
15171"s - split the current hunk into smaller hunks\n"
15172"e - manually edit the current hunk\n"
15173"? - print help\n"
15174msgstr ""
15175"g - 选择跳转到一个块\n"
15176"/ - 查找和给定正则表达式匹配的块\n"
15177"j - 维持该块未决状态,查看下一个未决块\n"
15178"J - 维持该块未决状态,查看下一个块\n"
15179"k - 维持该块未决状态,查看上一个未决块\n"
15180"K - 维持该块未决状态,查看上一个块\n"
15181"s - 拆分当前块为更小的块\n"
15182"e - 手动编辑当前块\n"
15183"? - 显示帮助\n"
15184
15185#: git-add--interactive.perl:1272
15186msgid "The selected hunks do not apply to the index!\n"
15187msgstr "选中的块不能应用到索引!\n"
15188
15189#: git-add--interactive.perl:1273
15190msgid "Apply them to the worktree anyway? "
15191msgstr "无论如何都要应用到工作区么?"
15192
15193#: git-add--interactive.perl:1276
15194msgid "Nothing was applied.\n"
15195msgstr "未应用。\n"
15196
15197#: git-add--interactive.perl:1287
15198#, perl-format
15199msgid "ignoring unmerged: %s\n"
15200msgstr "忽略未合入的:%s\n"
15201
15202#: git-add--interactive.perl:1296
15203msgid "Only binary files changed.\n"
15204msgstr "只有二进制文件被修改。\n"
15205
15206#: git-add--interactive.perl:1298
15207msgid "No changes.\n"
15208msgstr "没有修改。\n"
15209
15210#: git-add--interactive.perl:1306
15211msgid "Patch update"
15212msgstr "补丁更新"
15213
15214#: git-add--interactive.perl:1358
15215#, perl-format
15216msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
15217msgstr "暂存状态修改 [y,n,q,a,d,/%s,?]? "
15218
15219#: git-add--interactive.perl:1359
15220#, perl-format
15221msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
15222msgstr "暂存状态删除 [y,n,q,a,d,/%s,?]? "
15223
15224#: git-add--interactive.perl:1360
15225#, perl-format
15226msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
15227msgstr "暂存该块 [y,n,q,a,d,/%s,?]? "
15228
15229#: git-add--interactive.perl:1363
15230#, perl-format
15231msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
15232msgstr "贮藏状态修改 [y,n,q,a,d,/%s,?]? "
15233
15234#: git-add--interactive.perl:1364
15235#, perl-format
15236msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
15237msgstr "贮藏状态删除 [y,n,q,a,d,/%s,?]? "
15238
15239#: git-add--interactive.perl:1365
15240#, perl-format
15241msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
15242msgstr "贮藏该块 [y,n,q,a,d,/%s,?]? "
15243
15244#: git-add--interactive.perl:1368
15245#, perl-format
15246msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
15247msgstr "未暂存状态修改 [y,n,q,a,d,/%s,?]? "
15248
15249#: git-add--interactive.perl:1369
15250#, perl-format
15251msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
15252msgstr "未暂存状态删除 [y,n,q,a,d,/%s,?]? "
15253
15254#: git-add--interactive.perl:1370
15255#, perl-format
15256msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
15257msgstr "不暂存该块 [y,n,q,a,d,/%s,?]? "
15258
15259#: git-add--interactive.perl:1373
15260#, perl-format
15261msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
15262msgstr "修改索引中的应用状态 [y,n,q,a,d,/%s,?]? "
15263
15264#: git-add--interactive.perl:1374
15265#, perl-format
15266msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
15267msgstr "从索引中删除应用状态 [y,n,q,a,d,/%s,?]? "
15268
15269#: git-add--interactive.perl:1375
15270#, perl-format
15271msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
15272msgstr "将此块应用到索引 [y,n,q,a,d,/%s,?]? "
15273
15274#: git-add--interactive.perl:1378
15275#, perl-format
15276msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
15277msgstr "修改工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
15278
15279#: git-add--interactive.perl:1379
15280#, perl-format
15281msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
15282msgstr "从工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
15283
15284#: git-add--interactive.perl:1380
15285#, perl-format
15286msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
15287msgstr "从工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
15288
15289#: git-add--interactive.perl:1383
15290#, perl-format
15291msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
15292msgstr "修改索引和工作区中的丢弃状态 [y,n,q,a,d,/%s,?]? "
15293
15294#: git-add--interactive.perl:1384
15295#, perl-format
15296msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
15297msgstr "从索引和工作区中删除丢弃状态 [y,n,q,a,d,/%s,?]? "
15298
15299#: git-add--interactive.perl:1385
15300#, perl-format
15301msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
15302msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d,/%s,?]? "
15303
15304#: git-add--interactive.perl:1388
15305#, perl-format
15306msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
15307msgstr "修改索引和工作区中的应用状态 [y,n,q,a,d,/%s,?]? "
15308
15309#: git-add--interactive.perl:1389
15310#, perl-format
15311msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
15312msgstr "从索引和工作区中删除应用状态 [y,n,q,a,d,/%s,?]? "
15313
15314#: git-add--interactive.perl:1390
15315#, perl-format
15316msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
15317msgstr "在索引和工作区中应用该块 [y,n,q,a,d,/%s,?]? "
15318
15319#: git-add--interactive.perl:1493
15320msgid "go to which hunk (<ret> to see more)? "
15321msgstr "跳转到哪个块(<回车> 查看更多)? "
15322
15323#: git-add--interactive.perl:1495
15324msgid "go to which hunk? "
15325msgstr "跳转到哪个块?"
15326
15327#: git-add--interactive.perl:1504
15328#, perl-format
15329msgid "Invalid number: '%s'\n"
15330msgstr "无效数字:'%s'\n"
15331
15332#: git-add--interactive.perl:1509
15333#, perl-format
15334msgid "Sorry, only %d hunk available.\n"
15335msgid_plural "Sorry, only %d hunks available.\n"
15336msgstr[0] "对不起,只有 %d 个可用块。\n"
15337msgstr[1] "对不起,只有 %d 个可用块。\n"
15338
15339#: git-add--interactive.perl:1535
15340msgid "search for regex? "
15341msgstr "使用正则表达式搜索?"
15342
15343#: git-add--interactive.perl:1548
15344#, perl-format
15345msgid "Malformed search regexp %s: %s\n"
15346msgstr "错误的正则表达式 %s:%s\n"
15347
15348#: git-add--interactive.perl:1558
15349msgid "No hunk matches the given pattern\n"
15350msgstr "没有和给定模式相匹配的快\n"
15351
15352#: git-add--interactive.perl:1570 git-add--interactive.perl:1592
15353msgid "No previous hunk\n"
15354msgstr "没有前一个块\n"
15355
15356#: git-add--interactive.perl:1579 git-add--interactive.perl:1598
15357msgid "No next hunk\n"
15358msgstr "没有下一个块\n"
15359
15360#: git-add--interactive.perl:1606
15361#, perl-format
15362msgid "Split into %d hunk.\n"
15363msgid_plural "Split into %d hunks.\n"
15364msgstr[0] "拆分为 %d 块。\n"
15365msgstr[1] "拆分为 %d 块。\n"
15366
15367#: git-add--interactive.perl:1658
15368msgid "Review diff"
15369msgstr "检视 diff"
15370
15371#. TRANSLATORS: please do not translate the command names
15372#. 'status', 'update', 'revert', etc.
15373#: git-add--interactive.perl:1677
15374msgid ""
15375"status - show paths with changes\n"
15376"update - add working tree state to the staged set of changes\n"
15377"revert - revert staged set of changes back to the HEAD version\n"
15378"patch - pick hunks and update selectively\n"
15379"diff\t - view diff between HEAD and index\n"
15380"add untracked - add contents of untracked files to the staged set of "
15381"changes\n"
15382msgstr ""
15383"status - 显示含变更的路径\n"
15384"update - 添加工作区状态至暂存列表\n"
15385"revert - 还原修改的暂存集至 HEAD 版本\n"
15386"patch - 挑选块并且有选择地更新\n"
15387"diff - 显示 HEAD 和索引间差异\n"
15388"add untracked - 添加未跟踪文件的内容至暂存列表\n"
15389
15390#: git-add--interactive.perl:1694 git-add--interactive.perl:1699
15391#: git-add--interactive.perl:1702 git-add--interactive.perl:1709
15392#: git-add--interactive.perl:1713 git-add--interactive.perl:1719
15393msgid "missing --"
15394msgstr "缺失 --"
15395
15396#: git-add--interactive.perl:1715
15397#, perl-format
15398msgid "unknown --patch mode: %s"
15399msgstr "未知的 --patch 模式:%s"
15400
15401#: git-add--interactive.perl:1721 git-add--interactive.perl:1727
15402#, perl-format
15403msgid "invalid argument %s, expecting --"
15404msgstr "无效的参数 %s,期望是 --"
15405
15406#: git-send-email.perl:121
15407msgid "local zone differs from GMT by a non-minute interval\n"
15408msgstr "本地时间和 GMT 有不到一分钟间隔\n"
15409
15410#: git-send-email.perl:128 git-send-email.perl:134
15411msgid "local time offset greater than or equal to 24 hours\n"
15412msgstr "本地时间偏移量大于等于 24 小时\n"
15413
15414#: git-send-email.perl:202 git-send-email.perl:208
15415msgid "the editor exited uncleanly, aborting everything"
15416msgstr "编辑器非正常退出,终止所有操作"
15417
15418#: git-send-email.perl:282
15419#, perl-format
15420msgid ""
15421"'%s' contains an intermediate version of the email you were composing.\n"
15422msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
15423
15424#: git-send-email.perl:287
15425#, perl-format
15426msgid "'%s.final' contains the composed email.\n"
15427msgstr "'%s.final' 包含编辑的邮件。\n"
15428
15429#: git-send-email.perl:305
15430msgid "--dump-aliases incompatible with other options\n"
15431msgstr "--dump-aliases 和其它选项不兼容\n"
15432
15433#: git-send-email.perl:368 git-send-email.perl:623
15434msgid "Cannot run git format-patch from outside a repository\n"
15435msgstr "不能在仓库之外运行 git format-patch\n"
15436
15437#: git-send-email.perl:437
15438#, perl-format
15439msgid "Unknown --suppress-cc field: '%s'\n"
15440msgstr "未知的 --suppress-cc 字段:'%s'\n"
15441
15442#: git-send-email.perl:466
15443#, perl-format
15444msgid "Unknown --confirm setting: '%s'\n"
15445msgstr "未知的 --confirm 设置:'%s'\n"
15446
15447#: git-send-email.perl:498
15448#, perl-format
15449msgid "warning: sendmail alias with quotes is not supported: %s\n"
15450msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
15451
15452#: git-send-email.perl:500
15453#, perl-format
15454msgid "warning: `:include:` not supported: %s\n"
15455msgstr "警告:不支持 `:include:`:%s\n"
15456
15457#: git-send-email.perl:502
15458#, perl-format
15459msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
15460msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
15461
15462#: git-send-email.perl:507
15463#, perl-format
15464msgid "warning: sendmail line is not recognized: %s\n"
15465msgstr "警告:不能识别的 sendmail 行:%s\n"
15466
15467#: git-send-email.perl:589
15468#, perl-format
15469msgid ""
15470"File '%s' exists but it could also be the range of commits\n"
15471"to produce patches for. Please disambiguate by...\n"
15472"\n"
15473" * Saying \"./%s\" if you mean a file; or\n"
15474" * Giving --format-patch option if you mean a range.\n"
15475msgstr ""
15476"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除歧义:\n"
15477"\n"
15478" * 如果含义为一个文件,使用 \"./%s\",或者\n"
15479" * 如果含义为一个范围,使用 --format-patch 选项。\n"
15480
15481#: git-send-email.perl:610
15482#, perl-format
15483msgid "Failed to opendir %s: %s"
15484msgstr "无法打开目录 %s: %s"
15485
15486#: git-send-email.perl:634
15487#, perl-format
15488msgid ""
15489"fatal: %s: %s\n"
15490"warning: no patches were sent\n"
15491msgstr ""
15492"严重:%s:%s\n"
15493"警告:补丁未能发送\n"
15494
15495#: git-send-email.perl:645
15496msgid ""
15497"\n"
15498"No patch files specified!\n"
15499"\n"
15500msgstr "\n未指定补丁文件!\n\n"
15501
15502#: git-send-email.perl:658
15503#, perl-format
15504msgid "No subject line in %s?"
15505msgstr "在 %s 中没有标题行?"
15506
15507#: git-send-email.perl:668
15508#, perl-format
15509msgid "Failed to open for writing %s: %s"
15510msgstr "无法写入 %s: %s"
15511
15512#: git-send-email.perl:678
15513msgid ""
15514"Lines beginning in \"GIT:\" will be removed.\n"
15515"Consider including an overall diffstat or table of contents\n"
15516"for the patch you are writing.\n"
15517"\n"
15518"Clear the body content if you don't wish to send a summary.\n"
15519msgstr ""
15520"以 \"GIT:\" 开头的行将被删除。\n"
15521"考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n"
15522"\n"
15523"如果您不想发送摘要,清除内容。\n"
15524
15525#: git-send-email.perl:701
15526#, perl-format
15527msgid "Failed to open %s.final: %s"
15528msgstr "无法打开 %s.final: %s"
15529
15530#: git-send-email.perl:704
15531#, perl-format
15532msgid "Failed to open %s: %s"
15533msgstr "无法打开 %s: %s"
15534
15535#: git-send-email.perl:739
15536msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
15537msgstr "To/Cc/Bcc 字段不解析,它们被忽略\n"
15538
15539#: git-send-email.perl:748
15540msgid "Summary email is empty, skipping it\n"
15541msgstr "摘要邮件为空,跳过\n"
15542
15543#. TRANSLATORS: please keep [y/N] as is.
15544#: git-send-email.perl:780
15545#, perl-format
15546msgid "Are you sure you want to use <%s> [y/N]? "
15547msgstr "您确认要使用 <%s> [y/N]?"
15548
15549#: git-send-email.perl:809
15550msgid ""
15551"The following files are 8bit, but do not declare a Content-Transfer-"
15552"Encoding.\n"
15553msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
15554
15555#: git-send-email.perl:814
15556msgid "Which 8bit encoding should I declare [UTF-8]? "
15557msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?"
15558
15559#: git-send-email.perl:822
15560#, perl-format
15561msgid ""
15562"Refusing to send because the patch\n"
15563"\t%s\n"
15564"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
15565"want to send.\n"
15566msgstr ""
15567"拒绝发送,因为补丁\n"
15568"\t%s\n"
15569"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
15570
15571#: git-send-email.perl:841
15572msgid "To whom should the emails be sent (if anyone)?"
15573msgstr "邮件将要发送给谁?"
15574
15575#: git-send-email.perl:859
15576#, perl-format
15577msgid "fatal: alias '%s' expands to itself\n"
15578msgstr "严重:别名 '%s' 扩展为它自己\n"
15579
15580#: git-send-email.perl:871
15581msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
15582msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?"
15583
15584#: git-send-email.perl:921 git-send-email.perl:929
15585#, perl-format
15586msgid "error: unable to extract a valid address from: %s\n"
15587msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
15588
15589#. TRANSLATORS: Make sure to include [q] [d] [e] in your
15590#. translation. The program will only accept English input
15591#. at this point.
15592#: git-send-email.perl:933
15593msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
15594msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):"
15595
15596#: git-send-email.perl:1234
15597#, perl-format
15598msgid "CA path \"%s\" does not exist"
15599msgstr "CA 路径 \"%s\" 不存在"
15600
15601#: git-send-email.perl:1309
15602msgid ""
15603" The Cc list above has been expanded by additional\n"
15604" addresses found in the patch commit message. By default\n"
15605" send-email prompts before sending whenever this occurs.\n"
15606" This behavior is controlled by the sendemail.confirm\n"
15607" configuration setting.\n"
15608"\n"
15609" For additional information, run 'git send-email --help'.\n"
15610" To retain the current behavior, but squelch this message,\n"
15611" run 'git config --global sendemail.confirm auto'.\n"
15612"\n"
15613msgstr ""
15614" 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n"
15615" 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
15616" sendemail.confirm 配置设置。\n"
15617"\n"
15618" 更多信息,执行 'git send-email --help'。\n"
15619" 要保持当前行为,但不显示此信息,运行 'git config --global\n"
15620" sendemail.confirm auto'。\n"
15621"\n"
15622
15623#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
15624#. translation. The program will only accept English input
15625#. at this point.
15626#: git-send-email.perl:1324
15627msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
15628msgstr "发送邮件?([y]es|[n]o|[q]uit|[a]ll):"
15629
15630#: git-send-email.perl:1327
15631msgid "Send this email reply required"
15632msgstr "发送要求的邮件回复"
15633
15634#: git-send-email.perl:1353
15635msgid "The required SMTP server is not properly defined."
15636msgstr "要求的 SMTP 服务器未被正确定义。"
15637
15638#: git-send-email.perl:1397
15639#, perl-format
15640msgid "Server does not support STARTTLS! %s"
15641msgstr "服务器不支持 STARTTLS!%s"
15642
15643#: git-send-email.perl:1403
15644msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
15645msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
15646
15647#: git-send-email.perl:1421
15648#, perl-format
15649msgid "Failed to send %s\n"
15650msgstr "无法发送 %s\n"
15651
15652#: git-send-email.perl:1424
15653#, perl-format
15654msgid "Dry-Sent %s\n"
15655msgstr "演习发送 %s\n"
15656
15657#: git-send-email.perl:1424
15658#, perl-format
15659msgid "Sent %s\n"
15660msgstr "正发送 %s\n"
15661
15662#: git-send-email.perl:1426
15663msgid "Dry-OK. Log says:\n"
15664msgstr "演习成功。日志说:\n"
15665
15666#: git-send-email.perl:1426
15667msgid "OK. Log says:\n"
15668msgstr "OK。日志说:\n"
15669
15670#: git-send-email.perl:1438
15671msgid "Result: "
15672msgstr "结果:"
15673
15674#: git-send-email.perl:1441
15675msgid "Result: OK\n"
15676msgstr "结果:OK\n"
15677
15678#: git-send-email.perl:1454
15679#, perl-format
15680msgid "can't open file %s"
15681msgstr "无法打开文件 %s"
15682
15683#: git-send-email.perl:1501 git-send-email.perl:1521
15684#, perl-format
15685msgid "(mbox) Adding cc: %s from line '%s'\n"
15686msgstr "(mbox) 添加 cc:%s 自行 '%s'\n"
15687
15688#: git-send-email.perl:1507
15689#, perl-format
15690msgid "(mbox) Adding to: %s from line '%s'\n"
15691msgstr "(mbox) 添加 to:%s 自行 '%s'\n"
15692
15693#: git-send-email.perl:1555
15694#, perl-format
15695msgid "(non-mbox) Adding cc: %s from line '%s'\n"
15696msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n"
15697
15698#: git-send-email.perl:1578
15699#, perl-format
15700msgid "(body) Adding cc: %s from line '%s'\n"
15701msgstr "(body) 添加 cc: %s 自行 '%s'\n"
15702
15703#: git-send-email.perl:1676
15704#, perl-format
15705msgid "(%s) Could not execute '%s'"
15706msgstr "(%s) 不能执行 '%s'"
15707
15708#: git-send-email.perl:1683
15709#, perl-format
15710msgid "(%s) Adding %s: %s from: '%s'\n"
15711msgstr "(%s) 添加 %s: %s 自:'%s'\n"
15712
15713#: git-send-email.perl:1687
15714#, perl-format
15715msgid "(%s) failed to close pipe to '%s'"
15716msgstr "(%s) 无法关闭管道至 '%s'"
15717
15718#: git-send-email.perl:1714
15719msgid "cannot send message as 7bit"
15720msgstr "不能以 7bit 形式发送信息"
15721
15722#: git-send-email.perl:1722
15723msgid "invalid transfer encoding"
15724msgstr "无效的传送编码"
15725
15726#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802
15727#, perl-format
15728msgid "unable to open %s: %s\n"
15729msgstr "不能打开 %s:%s\n"
15730
15731#: git-send-email.perl:1744
15732#, perl-format
15733msgid "%s: patch contains a line longer than 998 characters"
15734msgstr "%s:补丁包含一个超过 998 字符的行"
15735
15736#: git-send-email.perl:1760
15737#, perl-format
15738msgid "Skipping %s with backup suffix '%s'.\n"
15739msgstr "略过 %s 含备份后缀 '%s'。\n"
15740
15741#. TRANSLATORS: please keep "[y|N]" as is.
15742#: git-send-email.perl:1764
15743#, perl-format
15744msgid "Do you really want to send %s? [y|N]: "
15745msgstr "您真的要发送 %s?[y|N]:"
15746
15747#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
15748#~ msgstr "使用一个试验性的基于空行的启发式算法改进差异显示"
15749
15750#~ msgid "Clever... amending the last one with dirty index."
15751#~ msgstr "聪明... 用脏索引修补最后一个提交。"
15752
15753#~ msgid ""
15754#~ "the following submodule (or one of its nested submodules)\n"
15755#~ "uses a .git directory:"
15756#~ msgid_plural ""
15757#~ "the following submodules (or one of their nested submodules)\n"
15758#~ "use a .git directory:"
15759#~ msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
15760#~ msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
15761
15762#~ msgid ""
15763#~ "\n"
15764#~ "(use 'rm -rf' if you really want to remove it including all of its "
15765#~ "history)"
15766#~ msgstr ""
15767#~ "\n"
15768#~ "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
15769
Jiang Xina0b6b242016-10-27 21:53:37 +080015770#~ msgid "Could not write to %s"
15771#~ msgstr "不能写入 %s"
15772
15773#~ msgid "Error wrapping up %s."
15774#~ msgstr "错误收尾 %s。"
15775
15776#~ msgid "Your local changes would be overwritten by cherry-pick."
15777#~ msgstr "您的本地修改将被拣选操作覆盖。"
15778
15779#~ msgid "Cannot revert during another revert."
15780#~ msgstr "不能在回退中执行另一回退。"
15781
15782#~ msgid "Cannot cherry-pick during another cherry-pick."
15783#~ msgstr "不能在拣选过程中执行另一拣选。"
15784
15785#~ msgid "Could not parse line %d."
15786#~ msgstr "不能解析第 %d 行。"
15787
15788#~ msgid "Could not open %s"
15789#~ msgstr "不能打开 %s"
15790
15791#~ msgid "Could not read %s."
15792#~ msgstr "不能读取 %s。"
15793
15794#~ msgid "Could not format %s."
15795#~ msgstr "不能格式化 %s。"
15796
15797#~ msgid "%s: %s"
15798#~ msgstr "%s:%s"
15799
15800#~ msgid "cannot open %s: %s"
15801#~ msgstr "不能打开 %s:%s"
15802
15803#~ msgid "You need to set your committer info first"
15804#~ msgstr "您需要先设置您的提交者信息"