]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
Merge branch 'pb/rebase-doc-typofix'
[thirdparty/git.git] / po / zh_CN.po
CommitLineData
c04f5ac3
JX
1# Chinese translations for Git package
2# Git 软件包的简体中文翻译.
07432cef 3# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
c04f5ac3 4# This file is distributed under the same license as the Git package.
814ff314 5# Contributors:
5b533632 6# - Fangyi Zhou <me AT fangyi.io>
c04f5ac3 7# - Jiang Xin <worldhello.net AT gmail.com>
bbdf0acc
JX
8# - Lian Cheng <rhythm.mail AT gmail.com>
9# - Ray Chen <oldsharp AT gmail.com>
c04f5ac3 10# - Riku <lu.riku AT gmail.com>
bbdf0acc
JX
11# - Thynson <lanxingcan AT gmail.com>
12# - ws3389 <willsmith3389 AT gmail.com>
13# - Wang Sheng <wangsheng2008love AT 163.com>
554e8501 14# - 依云 <lilydjwg AT gmail.com>
bbdf0acc 15# - Yichao Yu <yyc1992 AT gmail.com>
c04f5ac3 16# - Zhuang Ya <zhuangya AT me.com>
c04f5ac3 17#
160fb2b2
JX
18# Git glossary for Chinese translators
19#
20# English | Chinese
21# ---------------------------------+--------------------------------------
22# 3-way merge | 三方合并
23# abbreviate | 简写(的 SHA-1 值)
24# alternate object database | 备用对象库
25# amend | 修补
26# ancestor | 祖先,祖先提交
27# annotated tag | 附注标签
28# bare repository | 纯仓库
29# bisect | 二分查找
30# blob object | 数据对象
31# branch | 分支
32# bundle | 包
33# bypass | 绕过
34# cache | 索引(的别称)
35# chain | (提交)链
36# changeset | 变更集
37# checkout | 检出
38# checksum | 校验,校验和
39# cherry-picking | 拣选
40# clean | 干净(的工作区)
41# clone | 克隆
42# commit | 提交
667599e8 43# commit message | 提交说明
160fb2b2
JX
44# commit object | 提交对象
45# commit-ish (also committish) | 提交号
46# conflict | 冲突
47# core Git | 核心 Git 工具
d46c5519 48# cover letter | 附函
160fb2b2 49# DAG | 有向无环图
e640d114 50# dangling object | 悬空对象
160fb2b2
JX
51# detached HEAD | 分离头指针
52# directory | 目录
53# dirty | 脏(的工作区)
755c831b 54# dumb HTTP protocol | 哑 HTTP 协议
160fb2b2
JX
55# evil merge | 坏合并(合并引入了父提交没有的修改)
56# fast-forward | 快进
57# fetch | 获取
58# file system | 文件系统
e397e7e3 59# fork | 派生
160fb2b2
JX
60# Git archive | 仓库(对于 arch 用户)
61# gitfile | gitfile(仓库链接文件)
fd8cb379 62# grafts | (提交)移植
160fb2b2
JX
63# hash | 哈希值
64# HEAD | HEAD(头指针,亦即当前分支)
65# head | 头、分支
66# head ref | 分支
67# header | 头信息
68# hook | 钩子
69# hunk | 补丁片段
70# index | 索引
71# index entry | 索引条目
72# loose object | 松散对象
73# loose refs | 松散引用
74# master | master(默认分支名)
75# merge | 合并
76# object | 对象
77# object database | 对象库
78# object identifier | 对象标识符
79# object name | 对象名称
80# object type | 对象类型
81# octopus | 章鱼式合并(两分支以上的合并)
82# origin | origin(默认的远程名称)
83# pack | 包
84# pack index | 包索引
85# packfile | 包文件
86# parent | 父提交
87# patch | 补丁
88# pathspec | 路径规格
89# pattern | 模式
12e59059 90# pickaxe | 挖掘
160fb2b2
JX
91# plumbing | 管件(Git 底层核心命令的别称)
92# porcelain | 瓷件(Git 上层封装命令的别称)
94550ed3 93# precious-objects repo | 珍品仓库
160fb2b2
JX
94# prune | 清除
95# pull | 拉,拉取
96# push | 推,推送
97# reachable | 可达
98# rebase | 变基
99# ref | 引用
100# reflog | 引用日志
101# refspec | 引用规格
102# remote | 远程,远程仓库
103# remote-tracking branch | 远程跟踪分支
104# replay | 重放
105# repo | 仓库
106# repository | 仓库
107# resolve | (冲突)解决
108# revert | 还原
109# revision | 版本
110# rewind | 回退
111# SCM | 源代码管理(工具)
ee7589bb 112# SHA-1 | SHA-1(安全哈希算法1)
160fb2b2
JX
113# shallow repository | 浅(克隆)仓库
114# signed tag | 签名标签
755c831b 115# smart HTTP protocol | 智能 HTTP 协议
160fb2b2
JX
116# squash | 压缩
117# stage | n. 暂存区(即索引); v. 暂存
a4f16749 118# stash | n. 贮藏区; v. 贮藏
160fb2b2
JX
119# submodule | 子模组
120# symref | 符号引用
933c015e 121# tag | n. 标签; v. 打标签
160fb2b2
JX
122# tag object | 标签对象
123# tagger | 打标签者
124# topic branch | 主题分支
125# track | 跟踪
6937cb4e 126# trailer | 尾部署名
160fb2b2
JX
127# tree | 树(工作区或树对象)
128# tree object | 树对象
129# tree-ish (also treeish) | 树对象(或可以解析为一树对象)
130# unmerged index | 未合并索引
131# unpack | 解包
132# unreachable object | 不可达对象
133# unstage | 取消暂存
134# upstream | 上游
135# upstream branch | 上游分支
136# working tree | 工作区
137#
c04f5ac3
JX
138msgid ""
139msgstr ""
140"Project-Id-Version: Git\n"
141"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
2b472aae
JX
142"POT-Creation-Date: 2020-03-11 15:26+0800\n"
143"PO-Revision-Date: 2020-03-11 15:38+0800\n"
c04f5ac3 144"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
7aea43ff 145"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
c04f5ac3
JX
146"Language: zh_CN\n"
147"MIME-Version: 1.0\n"
148"Content-Type: text/plain; charset=UTF-8\n"
149"Content-Transfer-Encoding: 8bit\n"
5ae481e0 150"Plural-Forms: nplurals=2; plural=(n != 1);\n"
c04f5ac3 151
2b472aae 152#: add-interactive.c:368
ddc12c42
JX
153#, c-format
154msgid "Huh (%s)?"
155msgstr "嗯(%s)?"
156
2b472aae
JX
157#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
158#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
159#: builtin/rebase.c:2086 builtin/rebase.c:2130
ddc12c42
JX
160msgid "could not read index"
161msgstr "不能读取索引"
162
2b472aae 163#: add-interactive.c:576 git-add--interactive.perl:269
ddc12c42
JX
164#: git-add--interactive.perl:294
165msgid "binary"
166msgstr "二进制"
167
2b472aae 168#: add-interactive.c:634 git-add--interactive.perl:278
ddc12c42
JX
169#: git-add--interactive.perl:332
170msgid "nothing"
171msgstr "无"
172
2b472aae 173#: add-interactive.c:635 git-add--interactive.perl:314
ddc12c42
JX
174#: git-add--interactive.perl:329
175msgid "unchanged"
176msgstr "没有修改"
177
2b472aae 178#: add-interactive.c:672 git-add--interactive.perl:643
ddc12c42
JX
179msgid "Update"
180msgstr "更新"
181
2b472aae 182#: add-interactive.c:689 add-interactive.c:877
ddc12c42
JX
183#, c-format
184msgid "could not stage '%s'"
185msgstr "不能暂存 '%s'"
186
2b472aae
JX
187#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
188#: builtin/rebase.c:899
ddc12c42
JX
189msgid "could not write index"
190msgstr "不能写入索引"
191
2b472aae 192#: add-interactive.c:698 git-add--interactive.perl:628
ddc12c42
JX
193#, c-format, perl-format
194msgid "updated %d path\n"
195msgid_plural "updated %d paths\n"
196msgstr[0] "更新了 %d 个路径\n"
197msgstr[1] "更新了 %d 个路径\n"
198
2b472aae 199#: add-interactive.c:716 git-add--interactive.perl:678
ddc12c42
JX
200#, c-format, perl-format
201msgid "note: %s is untracked now.\n"
202msgstr "说明:%s 现已成为未跟踪的。\n"
203
2b472aae 204#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
ddc12c42
JX
205#: builtin/reset.c:144
206#, c-format
207msgid "make_cache_entry failed for path '%s'"
208msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
209
2b472aae 210#: add-interactive.c:751 git-add--interactive.perl:655
ddc12c42
JX
211msgid "Revert"
212msgstr "还原"
213
2b472aae 214#: add-interactive.c:767
ddc12c42
JX
215msgid "Could not parse HEAD^{tree}"
216msgstr "不能解析 HEAD^{tree}"
217
2b472aae 218#: add-interactive.c:805 git-add--interactive.perl:631
ddc12c42
JX
219#, c-format, perl-format
220msgid "reverted %d path\n"
221msgid_plural "reverted %d paths\n"
222msgstr[0] "还原了 %d 个路径\n"
223msgstr[1] "还原了 %d 个路径\n"
224
2b472aae 225#: add-interactive.c:856 git-add--interactive.perl:695
ddc12c42
JX
226#, c-format
227msgid "No untracked files.\n"
228msgstr "没有未跟踪的文件。\n"
229
2b472aae 230#: add-interactive.c:860 git-add--interactive.perl:689
ddc12c42
JX
231msgid "Add untracked"
232msgstr "添加未跟踪的"
233
2b472aae 234#: add-interactive.c:887 git-add--interactive.perl:625
ddc12c42
JX
235#, c-format, perl-format
236msgid "added %d path\n"
237msgid_plural "added %d paths\n"
238msgstr[0] "增加了 %d 个路径\n"
239msgstr[1] "增加了 %d 个路径\n"
240
2b472aae 241#: add-interactive.c:917
ddc12c42
JX
242#, c-format
243msgid "ignoring unmerged: %s"
244msgstr "忽略未合入的:%s"
245
2b472aae 246#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
ddc12c42
JX
247#, c-format
248msgid "Only binary files changed.\n"
249msgstr "只有二进制文件被修改。\n"
250
2b472aae 251#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
ddc12c42
JX
252#, c-format
253msgid "No changes.\n"
254msgstr "没有修改。\n"
255
2b472aae 256#: add-interactive.c:935 git-add--interactive.perl:1376
ddc12c42
JX
257msgid "Patch update"
258msgstr "补丁更新"
259
2b472aae 260#: add-interactive.c:974 git-add--interactive.perl:1754
ddc12c42
JX
261msgid "Review diff"
262msgstr "检视 diff"
263
2b472aae 264#: add-interactive.c:1002
ddc12c42
JX
265msgid "show paths with changes"
266msgstr "显示含变更的路径"
267
2b472aae 268#: add-interactive.c:1004
ddc12c42
JX
269msgid "add working tree state to the staged set of changes"
270msgstr "将工作区状态添加到暂存区修改集中"
271
2b472aae 272#: add-interactive.c:1006
ddc12c42
JX
273msgid "revert staged set of changes back to the HEAD version"
274msgstr "将暂存的修改集恢复为 HEAD 版本"
275
2b472aae 276#: add-interactive.c:1008
ddc12c42
JX
277msgid "pick hunks and update selectively"
278msgstr "挑选数据块并有选择地更新"
279
2b472aae 280#: add-interactive.c:1010
ddc12c42
JX
281msgid "view diff between HEAD and index"
282msgstr "显示 HEAD 和索引的差异"
283
2b472aae 284#: add-interactive.c:1012
ddc12c42
JX
285msgid "add contents of untracked files to the staged set of changes"
286msgstr "将未跟踪文件的内容添加到暂存区修改集中"
287
2b472aae 288#: add-interactive.c:1020 add-interactive.c:1069
ddc12c42
JX
289msgid "Prompt help:"
290msgstr "帮助:"
291
2b472aae 292#: add-interactive.c:1022
ddc12c42
JX
293msgid "select a single item"
294msgstr "选择一个条目"
295
2b472aae 296#: add-interactive.c:1024
ddc12c42
JX
297msgid "select a range of items"
298msgstr "选择一系列条目"
299
2b472aae 300#: add-interactive.c:1026
ddc12c42
JX
301msgid "select multiple ranges"
302msgstr "选择多个范围"
303
2b472aae 304#: add-interactive.c:1028 add-interactive.c:1073
ddc12c42
JX
305msgid "select item based on unique prefix"
306msgstr "基于唯一前缀选择条目"
307
2b472aae 308#: add-interactive.c:1030
ddc12c42
JX
309msgid "unselect specified items"
310msgstr "反选指定的条目"
311
2b472aae 312#: add-interactive.c:1032
ddc12c42
JX
313msgid "choose all items"
314msgstr "选择所有条目"
315
2b472aae 316#: add-interactive.c:1034
ddc12c42
JX
317msgid "(empty) finish selecting"
318msgstr "(空)结束选择"
319
2b472aae 320#: add-interactive.c:1071
ddc12c42
JX
321msgid "select a numbered item"
322msgstr "选择一个编号条目"
323
2b472aae 324#: add-interactive.c:1075
ddc12c42
JX
325msgid "(empty) select nothing"
326msgstr "(空)不选择任何内容"
327
2b472aae 328#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
ddc12c42
JX
329msgid "*** Commands ***"
330msgstr "*** 命令 ***"
331
2b472aae 332#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
ddc12c42
JX
333msgid "What now"
334msgstr "请选择"
335
2b472aae 336#: add-interactive.c:1136 git-add--interactive.perl:213
ddc12c42
JX
337msgid "staged"
338msgstr "缓存"
339
2b472aae 340#: add-interactive.c:1136 git-add--interactive.perl:213
ddc12c42
JX
341msgid "unstaged"
342msgstr "未缓存"
343
2b472aae
JX
344#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
345#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
346#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
347#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
348#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
349#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
ddc12c42
JX
350msgid "path"
351msgstr "路径"
352
2b472aae 353#: add-interactive.c:1143
ddc12c42
JX
354msgid "could not refresh index"
355msgstr "不能刷新索引"
356
2b472aae 357#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
ddc12c42
JX
358#, c-format
359msgid "Bye.\n"
360msgstr "再见。\n"
361
2b472aae
JX
362#: add-patch.c:33 git-add--interactive.perl:1428
363#, c-format, perl-format
364msgid "Stage mode change [y,n,q,a,d%s,?]? "
365msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
ddc12c42 366
2b472aae
JX
367#: add-patch.c:34 git-add--interactive.perl:1429
368#, c-format, perl-format
369msgid "Stage deletion [y,n,q,a,d%s,?]? "
370msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
ddc12c42 371
2b472aae
JX
372#: add-patch.c:35 git-add--interactive.perl:1430
373#, c-format, perl-format
374msgid "Stage this hunk [y,n,q,a,d%s,?]? "
375msgstr "暂存该块 [y,n,q,a,d%s,?]? "
376
377#: add-patch.c:37
378msgid ""
379"If the patch applies cleanly, the edited hunk will immediately be marked for "
380"staging."
381msgstr "如果补丁能正确地应用,编辑块将立即标记为暂存。"
382
383#: add-patch.c:40
384msgid ""
385"y - stage this hunk\n"
386"n - do not stage this hunk\n"
387"q - quit; do not stage this hunk or any of the remaining ones\n"
388"a - stage this hunk and all later hunks in the file\n"
389"d - do not stage this hunk or any of the later hunks in the file\n"
390msgstr ""
391"y - 暂存该块\n"
392"n - 不要暂存该块\n"
393"q - 退出。不暂存该块及后面的全部块\n"
394"a - 暂存该块和本文件中后面的全部块\n"
395"d - 不暂存该块和本文件中后面的全部块\n"
396
397#: add-patch.c:54 git-add--interactive.perl:1433
398#, c-format, perl-format
399msgid "Stash mode change [y,n,q,a,d%s,?]? "
400msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
401
402#: add-patch.c:55 git-add--interactive.perl:1434
403#, c-format, perl-format
404msgid "Stash deletion [y,n,q,a,d%s,?]? "
405msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
406
407#: add-patch.c:56 git-add--interactive.perl:1435
408#, c-format, perl-format
409msgid "Stash this hunk [y,n,q,a,d%s,?]? "
410msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
411
412#: add-patch.c:58
413msgid ""
414"If the patch applies cleanly, the edited hunk will immediately be marked for "
415"stashing."
416msgstr "如果补丁能正确地应用,编辑块将立即标记为贮藏。"
417
418#: add-patch.c:61
419msgid ""
420"y - stash this hunk\n"
421"n - do not stash this hunk\n"
422"q - quit; do not stash this hunk or any of the remaining ones\n"
423"a - stash this hunk and all later hunks in the file\n"
424"d - do not stash this hunk or any of the later hunks in the file\n"
425msgstr ""
426"y - 贮藏该块\n"
427"n - 不要贮藏该块\n"
428"q - 退出。不贮藏该块及后面的全部块\n"
429"a - 贮藏该块和本文件中后面的全部块\n"
430"d - 不贮藏该块和本文件中后面的全部块\n"
431
432#: add-patch.c:77 git-add--interactive.perl:1438
433#, c-format, perl-format
434msgid "Unstage mode change [y,n,q,a,d%s,?]? "
435msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
436
437#: add-patch.c:78 git-add--interactive.perl:1439
438#, c-format, perl-format
439msgid "Unstage deletion [y,n,q,a,d%s,?]? "
440msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
441
442#: add-patch.c:79 git-add--interactive.perl:1440
443#, c-format, perl-format
444msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
445msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
446
447#: add-patch.c:81
448msgid ""
449"If the patch applies cleanly, the edited hunk will immediately be marked for "
450"unstaging."
451msgstr "如果补丁能正确地应用,编辑块将立即标记为未暂存。"
452
453#: add-patch.c:84
454msgid ""
455"y - unstage this hunk\n"
456"n - do not unstage this hunk\n"
457"q - quit; do not unstage this hunk or any of the remaining ones\n"
458"a - unstage this hunk and all later hunks in the file\n"
459"d - do not unstage this hunk or any of the later hunks in the file\n"
460msgstr ""
440e7442
FZ
461"y - 取消暂存该块\n"
462"n - 不要取消暂存该块\n"
463"q - 退出。不要取消暂存该块及后面的全部块\n"
464"a - 取消暂存该块和本文件中后面的全部块\n"
465"d - 不要取消暂存该块和本文件中后面的全部块\n"
2b472aae
JX
466
467#: add-patch.c:99 git-add--interactive.perl:1443
468#, c-format, perl-format
469msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
470msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
471
472#: add-patch.c:100 git-add--interactive.perl:1444
473#, c-format, perl-format
474msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
475msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
476
477#: add-patch.c:101 git-add--interactive.perl:1445
478#, c-format, perl-format
479msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
480msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
481
482#: add-patch.c:103 add-patch.c:168 add-patch.c:211
483msgid ""
484"If the patch applies cleanly, the edited hunk will immediately be marked for "
485"applying."
486msgstr "如果补丁能正确地应用,编辑块将立即标记为应用。"
487
488#: add-patch.c:106
489msgid ""
490"y - apply this hunk to index\n"
491"n - do not apply this hunk to index\n"
492"q - quit; do not apply this hunk or any of the remaining ones\n"
493"a - apply this hunk and all later hunks in the file\n"
494"d - do not apply this hunk or any of the later hunks in the file\n"
495msgstr ""
496"y - 在索引中应用该块\n"
497"n - 不要在索引中应用该块\n"
498"q - 退出。不要应用该块及后面的全部块\n"
499"a - 应用该块和本文件中后面的全部块\n"
500"d - 不要应用该块和本文件中后面的全部块\n"
501
502#: add-patch.c:121 git-add--interactive.perl:1448
503#: git-add--interactive.perl:1463
504#, c-format, perl-format
505msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
506msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
507
508#: add-patch.c:122 git-add--interactive.perl:1449
509#: git-add--interactive.perl:1464
510#, c-format, perl-format
511msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
512msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
ddc12c42 513
2b472aae
JX
514#: add-patch.c:123 git-add--interactive.perl:1450
515#: git-add--interactive.perl:1465
516#, c-format, perl-format
517msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
518msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
519
520#: add-patch.c:125 add-patch.c:147 add-patch.c:190
521msgid ""
522"If the patch applies cleanly, the edited hunk will immediately be marked for "
523"discarding."
524msgstr "如果补丁能正确地应用,编辑块将立即标记为丢弃。"
525
526#: add-patch.c:128 add-patch.c:193
527msgid ""
528"y - discard this hunk from worktree\n"
529"n - do not discard this hunk from worktree\n"
530"q - quit; do not discard this hunk or any of the remaining ones\n"
531"a - discard this hunk and all later hunks in the file\n"
532"d - do not discard this hunk or any of the later hunks in the file\n"
533msgstr ""
534"y - 在工作区中丢弃该块\n"
535"n - 不要在工作区中丢弃该块\n"
536"q - 退出。不要丢弃该块及后面的全部块\n"
537"a - 丢弃该块和本文件中后面的全部块\n"
538"d - 不要丢弃该块和本文件中后面的全部块\n"
539
540#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
541#, c-format, perl-format
542msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
543msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
544
545#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
546#, c-format, perl-format
547msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
548msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? "
549
550#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
551#, c-format, perl-format
552msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
553msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
554
555#: add-patch.c:150
556msgid ""
557"y - discard this hunk from index and worktree\n"
558"n - do not discard this hunk from index and worktree\n"
559"q - quit; do not discard this hunk or any of the remaining ones\n"
560"a - discard this hunk and all later hunks in the file\n"
561"d - do not discard this hunk or any of the later hunks in the file\n"
562msgstr ""
563"y - 在索引和工作区中丢弃该块\n"
564"n - 不要在索引和工作区中丢弃该块\n"
565"q - 退出。不要丢弃该块及后面的全部块\n"
566"a - 丢弃该块和本文件中后面的全部块\n"
567"d - 不要丢弃该块和本文件中后面的全部块\n"
568
569#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
570#, c-format, perl-format
571msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
572msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
573
574#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
575#, c-format, perl-format
576msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
577msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
578
579#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
580#, c-format, perl-format
581msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
582msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
583
584#: add-patch.c:171
585msgid ""
586"y - apply this hunk to index and worktree\n"
587"n - do not apply this hunk to index and worktree\n"
588"q - quit; do not apply this hunk or any of the remaining ones\n"
589"a - apply this hunk and all later hunks in the file\n"
590"d - do not apply this hunk or any of the later hunks in the file\n"
591msgstr ""
592"y - 在索引和工作区中应用该块\n"
593"n - 不要在索引和工作区中应用该块\n"
594"q - 退出。不要应用该块及后面的全部块\n"
595"a - 应用该块和本文件中后面的全部块\n"
596"d - 不要应用该块和本文件中后面的全部块\n"
597
598#: add-patch.c:214
599msgid ""
600"y - apply this hunk to worktree\n"
601"n - do not apply this hunk to worktree\n"
602"q - quit; do not apply this hunk or any of the remaining ones\n"
603"a - apply this hunk and all later hunks in the file\n"
604"d - do not apply this hunk or any of the later hunks in the file\n"
605msgstr ""
606"y - 在工作区中应用该块\n"
607"n - 不要在工作区中应用该块\n"
608"q - 退出。不要应用该块及后面的全部块\n"
609"a - 应用该块和本文件中后面的全部块\n"
610"d - 不要应用该块和本文件中后面的全部块\n"
611
612#: add-patch.c:318
ddc12c42
JX
613#, c-format
614msgid "could not parse hunk header '%.*s'"
615msgstr "无法解析数据块头信息 '%.*s'"
616
2b472aae 617#: add-patch.c:337 add-patch.c:341
ddc12c42
JX
618#, c-format
619msgid "could not parse colored hunk header '%.*s'"
620msgstr "无法解析彩色数据块头信息 '%.*s'"
621
2b472aae 622#: add-patch.c:395
ddc12c42
JX
623msgid "could not parse diff"
624msgstr "不能解析差异信息"
625
2b472aae 626#: add-patch.c:414
ddc12c42
JX
627msgid "could not parse colored diff"
628msgstr "不能解析彩色差异信息"
629
2b472aae
JX
630#: add-patch.c:428
631#, c-format
632msgid "failed to run '%s'"
633msgstr "运行 '%s' 失败"
634
635#: add-patch.c:587
636msgid "mismatched output from interactive.diffFilter"
637msgstr "interactive.diffFilter 的输出不匹配"
638
639#: add-patch.c:588
640msgid ""
641"Your filter must maintain a one-to-one correspondence\n"
642"between its input and output lines."
643msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"
644
645#: add-patch.c:761
ddc12c42
JX
646#, c-format
647msgid ""
648"expected context line #%d in\n"
649"%.*s"
650msgstr ""
651"预期上下文行 #%d 于\n"
652"%.*s"
653
2b472aae 654#: add-patch.c:776
ddc12c42
JX
655#, c-format
656msgid ""
657"hunks do not overlap:\n"
658"%.*s\n"
659"\tdoes not end with:\n"
660"%.*s"
661msgstr ""
662"块不重叠:\n"
663"%.*s\n"
664"\t不是结尾于:\n"
665"%.*s"
666
2b472aae 667#: add-patch.c:1052 git-add--interactive.perl:1112
ddc12c42
JX
668msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
669msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
670
2b472aae 671#: add-patch.c:1056
ddc12c42
JX
672#, c-format
673msgid ""
674"---\n"
675"To remove '%c' lines, make them ' ' lines (context).\n"
676"To remove '%c' lines, delete them.\n"
677"Lines starting with %c will be removed.\n"
678msgstr ""
679"---\n"
680"要删除 '%c' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
681"要删除 '%c' 开始的行,删除它们。\n"
682"以 %c 开始的行将被删除。\n"
683
ddc12c42 684#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
2b472aae 685#: add-patch.c:1070 git-add--interactive.perl:1126
ddc12c42
JX
686msgid ""
687"If it does not apply cleanly, you will be given an opportunity to\n"
688"edit again. If all lines of the hunk are removed, then the edit is\n"
689"aborted and the hunk is left unchanged.\n"
690msgstr ""
691"如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
692"此次编辑被终止,该块不会被修改。\n"
693
2b472aae 694#: add-patch.c:1103
ddc12c42
JX
695msgid "could not parse hunk header"
696msgstr "无法解析数据块头信息"
697
2b472aae 698#: add-patch.c:1148
ddc12c42
JX
699msgid "'git apply --cached' failed"
700msgstr "'git apply --cached' 失败"
701
702#. TRANSLATORS: do not translate [y/n]
703#. The program will only accept that input at this point.
704#. Consider translating (saying "no" discards!) as
705#. (saying "n" for "no" discards!) if the translation
706#. of the word "no" does not start with n.
707#.
708#. TRANSLATORS: do not translate [y/n]
709#. The program will only accept that input
710#. at this point.
711#. Consider translating (saying "no" discards!) as
712#. (saying "n" for "no" discards!) if the translation
713#. of the word "no" does not start with n.
2b472aae 714#: add-patch.c:1218 git-add--interactive.perl:1239
ddc12c42
JX
715msgid ""
716"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
717msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
718
2b472aae
JX
719#: add-patch.c:1261
720msgid "The selected hunks do not apply to the index!"
721msgstr "选中的块不能应用到索引!"
722
723#: add-patch.c:1262 git-add--interactive.perl:1343
724msgid "Apply them to the worktree anyway? "
725msgstr "无论如何都要应用到工作区么?"
726
727#: add-patch.c:1269 git-add--interactive.perl:1346
728msgid "Nothing was applied.\n"
729msgstr "未应用。\n"
ddc12c42 730
2b472aae 731#: add-patch.c:1326
ddc12c42
JX
732msgid ""
733"j - leave this hunk undecided, see next undecided hunk\n"
734"J - leave this hunk undecided, see next hunk\n"
735"k - leave this hunk undecided, see previous undecided hunk\n"
736"K - leave this hunk undecided, see previous hunk\n"
737"g - select a hunk to go to\n"
738"/ - search for a hunk matching the given regex\n"
739"s - split the current hunk into smaller hunks\n"
740"e - manually edit the current hunk\n"
741"? - print help\n"
742msgstr ""
743"j - 维持该块未决状态,查看下一个未决块\n"
744"J - 维持该块未决状态,查看下一个块\n"
745"k - 维持该块未决状态,查看上一个未决块\n"
746"K - 维持该块未决状态,查看上一个块\n"
747"g - 选择跳转到一个块\n"
748"/ - 查找和给定正则表达式匹配的块\n"
749"s - 拆分当前块为更小的块\n"
750"e - 手动编辑当前块\n"
751"? - 显示帮助\n"
752
2b472aae 753#: add-patch.c:1447 add-patch.c:1457
ddc12c42
JX
754msgid "No previous hunk"
755msgstr "没有前一个块"
756
2b472aae 757#: add-patch.c:1452 add-patch.c:1462
ddc12c42
JX
758msgid "No next hunk"
759msgstr "没有下一个块"
760
2b472aae 761#: add-patch.c:1468
ddc12c42
JX
762msgid "No other hunks to goto"
763msgstr "没有其它可供跳转的块"
764
2b472aae 765#: add-patch.c:1479 git-add--interactive.perl:1577
ddc12c42
JX
766msgid "go to which hunk (<ret> to see more)? "
767msgstr "跳转到哪个块(<回车> 查看更多)? "
768
2b472aae 769#: add-patch.c:1480 git-add--interactive.perl:1579
ddc12c42
JX
770msgid "go to which hunk? "
771msgstr "跳转到哪个块?"
772
2b472aae 773#: add-patch.c:1491
ddc12c42
JX
774#, c-format
775msgid "Invalid number: '%s'"
776msgstr "无效数字:'%s'"
777
2b472aae 778#: add-patch.c:1496
ddc12c42
JX
779#, c-format
780msgid "Sorry, only %d hunk available."
781msgid_plural "Sorry, only %d hunks available."
782msgstr[0] "对不起,只有 %d 个可用块。"
783msgstr[1] "对不起,只有 %d 个可用块。"
784
2b472aae 785#: add-patch.c:1505
ddc12c42
JX
786msgid "No other hunks to search"
787msgstr "没有其它可供查找的块"
788
2b472aae 789#: add-patch.c:1511 git-add--interactive.perl:1623
ddc12c42
JX
790msgid "search for regex? "
791msgstr "使用正则表达式搜索?"
792
2b472aae 793#: add-patch.c:1526
ddc12c42
JX
794#, c-format
795msgid "Malformed search regexp %s: %s"
796msgstr "错误的正则表达式 %s:%s"
797
2b472aae 798#: add-patch.c:1543
ddc12c42
JX
799msgid "No hunk matches the given pattern"
800msgstr "没有和给定模式相匹配的块"
801
2b472aae 802#: add-patch.c:1550
ddc12c42
JX
803msgid "Sorry, cannot split this hunk"
804msgstr "对不起,不能拆分这个块"
805
2b472aae 806#: add-patch.c:1554
ddc12c42
JX
807#, c-format
808msgid "Split into %d hunks."
809msgstr "拆分为 %d 块。"
810
2b472aae 811#: add-patch.c:1558
ddc12c42
JX
812msgid "Sorry, cannot edit this hunk"
813msgstr "对不起,不能编辑这个块"
814
2b472aae
JX
815#: add-patch.c:1609
816msgid "'git apply' failed"
817msgstr "'git apply' 失败"
818
819#: advice.c:115
c04f5ac3 820#, c-format
fd8cb379
JX
821msgid "%shint: %.*s%s\n"
822msgstr "%s提示:%.*s%s\n"
c04f5ac3 823
2b472aae 824#: advice.c:168
5c57d762
JX
825msgid "Cherry-picking is not possible because you have unmerged files."
826msgstr "无法拣选,因为您有未合并的文件。"
827
2b472aae 828#: advice.c:170
5c57d762
JX
829msgid "Committing is not possible because you have unmerged files."
830msgstr "无法提交,因为您有未合并的文件。"
831
2b472aae 832#: advice.c:172
5c57d762
JX
833msgid "Merging is not possible because you have unmerged files."
834msgstr "无法合并,因为您有未合并的文件。"
835
2b472aae 836#: advice.c:174
5c57d762
JX
837msgid "Pulling is not possible because you have unmerged files."
838msgstr "无法拉取,因为您有未合并的文件。"
839
2b472aae 840#: advice.c:176
5c57d762
JX
841msgid "Reverting is not possible because you have unmerged files."
842msgstr "无法回退,因为您有未合并的文件。"
843
2b472aae 844#: advice.c:178
5c57d762
JX
845#, c-format
846msgid "It is not possible to %s because you have unmerged files."
847msgstr "无法 %s,因为您有未合并的文件。"
848
2b472aae 849#: advice.c:186
c04f5ac3 850msgid ""
6acbf033 851"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 852"as appropriate to mark resolution and make a commit."
c04f5ac3 853msgstr ""
d9d56b23 854"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
220c313c 855"解决方案并提交。"
c04f5ac3 856
2b472aae 857#: advice.c:194
5c57d762
JX
858msgid "Exiting because of an unresolved conflict."
859msgstr "因为存在未解决的冲突而退出。"
860
2b472aae 861#: advice.c:199 builtin/merge.c:1335
1b7f4a34
JX
862msgid "You have not concluded your merge (MERGE_HEAD exists)."
863msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
864
2b472aae 865#: advice.c:201
94550ed3 866msgid "Please, commit your changes before merging."
1b7f4a34
JX
867msgstr "请在合并前先提交您的修改。"
868
2b472aae 869#: advice.c:202
1b7f4a34
JX
870msgid "Exiting because of unfinished merge."
871msgstr "因为存在未完成的合并而退出。"
872
2b472aae 873#: advice.c:208
5c57d762
JX
874#, c-format
875msgid ""
a6cd2cc4 876"Note: switching to '%s'.\n"
5c57d762
JX
877"\n"
878"You are in 'detached HEAD' state. You can look around, make experimental\n"
879"changes and commit them, and you can discard any commits you make in this\n"
a6cd2cc4 880"state without impacting any branches by switching back to a branch.\n"
5c57d762
JX
881"\n"
882"If you want to create a new branch to retain commits you create, you may\n"
a6cd2cc4 883"do so (now or later) by using -c with the switch command. Example:\n"
5c57d762 884"\n"
a6cd2cc4
JX
885" git switch -c <new-branch-name>\n"
886"\n"
887"Or undo this operation with:\n"
888"\n"
889" git switch -\n"
890"\n"
891"Turn off this advice by setting config variable advice.detachedHead to "
892"false\n"
5c57d762
JX
893"\n"
894msgstr ""
a6cd2cc4
JX
895"注意:正在切换到 '%s'。\n"
896"\n"
897"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以在切换\n"
898"回一个分支时,丢弃在此状态下所做的提交而不对分支造成影响。\n"
5c57d762 899"\n"
a6cd2cc4
JX
900"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在 switch 命令\n"
901"中添加参数 -c 来实现(现在或稍后)。例如:\n"
5c57d762 902"\n"
a6cd2cc4 903" git switch -c <新分支名>\n"
5c57d762 904"\n"
a6cd2cc4
JX
905"或者撤销此操作:\n"
906"\n"
907" git switch -\n"
908"\n"
909"通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n"
5c57d762
JX
910"\n"
911
06991777
JX
912#: alias.c:50
913msgid "cmdline ends with \\"
914msgstr "命令行以 \\ 结尾"
915
916#: alias.c:51
917msgid "unclosed quote"
918msgstr "未关闭的引号"
919
a6cd2cc4 920#: apply.c:69
a0b6b246
JX
921#, c-format
922msgid "unrecognized whitespace option '%s'"
923msgstr "未能识别的空白字符选项 '%s'"
ef317cd5 924
a6cd2cc4 925#: apply.c:85
90314792 926#, c-format
a0b6b246
JX
927msgid "unrecognized whitespace ignore option '%s'"
928msgstr "未能识别的空白字符忽略选项 '%s'"
90314792 929
a6cd2cc4 930#: apply.c:135
a0b6b246 931msgid "--reject and --3way cannot be used together."
2090d5b4 932msgstr "--reject 和 --3way 不能同时使用。"
ef317cd5 933
a6cd2cc4 934#: apply.c:137
a0b6b246
JX
935msgid "--cached and --3way cannot be used together."
936msgstr "--cached 和 --3way 不能同时使用。"
ef317cd5 937
a6cd2cc4 938#: apply.c:140
a0b6b246
JX
939msgid "--3way outside a repository"
940msgstr "--3way 在一个仓库之外"
ef317cd5 941
a6cd2cc4 942#: apply.c:151
a0b6b246
JX
943msgid "--index outside a repository"
944msgstr "--index 在一个仓库之外"
ef317cd5 945
a6cd2cc4 946#: apply.c:154
a0b6b246
JX
947msgid "--cached outside a repository"
948msgstr "--cached 在一个仓库之外"
ef317cd5 949
a6cd2cc4 950#: apply.c:801
a0b6b246
JX
951#, c-format
952msgid "Cannot prepare timestamp regexp %s"
953msgstr "无法准备时间戳正则表达式 %s"
ef317cd5 954
a6cd2cc4 955#: apply.c:810
a0b6b246
JX
956#, c-format
957msgid "regexec returned %d for input: %s"
958msgstr "regexec 返回 %d,输入为:%s"
ef317cd5 959
a6cd2cc4 960#: apply.c:884
a0b6b246
JX
961#, c-format
962msgid "unable to find filename in patch at line %d"
963msgstr "不能在补丁的第 %d 行找到文件名"
ef317cd5 964
a6cd2cc4 965#: apply.c:922
a0b6b246
JX
966#, c-format
967msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
968msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
ef317cd5 969
a6cd2cc4 970#: apply.c:928
a0b6b246
JX
971#, c-format
972msgid "git apply: bad git-diff - inconsistent new filename on line %d"
973msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
ef317cd5 974
a6cd2cc4 975#: apply.c:929
a0b6b246
JX
976#, c-format
977msgid "git apply: bad git-diff - inconsistent old filename on line %d"
978msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
ef317cd5 979
a6cd2cc4 980#: apply.c:934
a0b6b246
JX
981#, c-format
982msgid "git apply: bad git-diff - expected /dev/null on line %d"
983msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
ef317cd5 984
a6cd2cc4 985#: apply.c:963
a4f16749
JX
986#, c-format
987msgid "invalid mode on line %d: %s"
988msgstr "第 %d 行包含无效文件模式:%s"
989
a6cd2cc4 990#: apply.c:1282
a4f16749
JX
991#, c-format
992msgid "inconsistent header lines %d and %d"
993msgstr "不一致的文件头,%d 行和 %d 行"
994
a5cd71ca 995#: apply.c:1372
a0b6b246
JX
996#, c-format
997msgid ""
998"git diff header lacks filename information when removing %d leading pathname "
999"component (line %d)"
1000msgid_plural ""
1001"git diff header lacks filename information when removing %d leading pathname "
1002"components (line %d)"
1003msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1004msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
ef317cd5 1005
a5cd71ca 1006#: apply.c:1385
a0b6b246
JX
1007#, c-format
1008msgid "git diff header lacks filename information (line %d)"
1009msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
07432cef 1010
a5cd71ca
JX
1011#: apply.c:1481
1012#, c-format
1013msgid "recount: unexpected line: %.*s"
1014msgstr "recount:意外的行:%.*s"
1015
1016#: apply.c:1550
1017#, c-format
1018msgid "patch fragment without header at line %d: %.*s"
1019msgstr "第 %d 行的补丁片段没有头信息:%.*s"
1020
1021#: apply.c:1753
a0b6b246
JX
1022msgid "new file depends on old contents"
1023msgstr "新文件依赖旧内容"
5c57d762 1024
a5cd71ca 1025#: apply.c:1755
a0b6b246
JX
1026msgid "deleted file still has contents"
1027msgstr "删除的文件仍有内容"
5c57d762 1028
a5cd71ca 1029#: apply.c:1789
a0b6b246
JX
1030#, c-format
1031msgid "corrupt patch at line %d"
1032msgstr "补丁在第 %d 行损坏"
5c57d762 1033
a5cd71ca 1034#: apply.c:1826
5c57d762 1035#, c-format
a0b6b246
JX
1036msgid "new file %s depends on old contents"
1037msgstr "新文件 %s 依赖旧内容"
5c57d762 1038
a5cd71ca 1039#: apply.c:1828
5c57d762 1040#, c-format
a0b6b246
JX
1041msgid "deleted file %s still has contents"
1042msgstr "删除的文件 %s 仍有内容"
5c57d762 1043
a5cd71ca 1044#: apply.c:1831
a0b6b246
JX
1045#, c-format
1046msgid "** warning: file %s becomes empty but is not deleted"
1047msgstr "** 警告:文件 %s 成为空文件但并未删除"
ef317cd5 1048
a5cd71ca 1049#: apply.c:1978
5c57d762 1050#, c-format
a0b6b246
JX
1051msgid "corrupt binary patch at line %d: %.*s"
1052msgstr "二进制补丁在第 %d 行损坏:%.*s"
5c57d762 1053
a5cd71ca 1054#: apply.c:2015
5c57d762 1055#, c-format
a0b6b246
JX
1056msgid "unrecognized binary patch at line %d"
1057msgstr "未能识别的二进制补丁位于第 %d 行"
5c57d762 1058
a5cd71ca 1059#: apply.c:2177
5c57d762 1060#, c-format
a0b6b246
JX
1061msgid "patch with only garbage at line %d"
1062msgstr "补丁文件的第 %d 行只有垃圾数据"
5c57d762 1063
a5cd71ca 1064#: apply.c:2263
5c57d762 1065#, c-format
a0b6b246
JX
1066msgid "unable to read symlink %s"
1067msgstr "无法读取符号链接 %s"
5c57d762 1068
a5cd71ca 1069#: apply.c:2267
5c57d762 1070#, c-format
a0b6b246
JX
1071msgid "unable to open or read %s"
1072msgstr "不能打开或读取 %s"
5c57d762 1073
ddc12c42 1074#: apply.c:2936
5c57d762 1075#, c-format
a0b6b246
JX
1076msgid "invalid start of line: '%c'"
1077msgstr "无效的行首字符:'%c'"
5c57d762 1078
ddc12c42 1079#: apply.c:3057
5c57d762 1080#, c-format
a0b6b246
JX
1081msgid "Hunk #%d succeeded at %d (offset %d line)."
1082msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1083msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
1084msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
5c57d762 1085
ddc12c42 1086#: apply.c:3069
5c57d762 1087#, c-format
a0b6b246
JX
1088msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1089msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
5c57d762 1090
ddc12c42 1091#: apply.c:3075
5c57d762
JX
1092#, c-format
1093msgid ""
a0b6b246
JX
1094"while searching for:\n"
1095"%.*s"
5c57d762 1096msgstr ""
a0b6b246
JX
1097"当查询:\n"
1098"%.*s"
5c57d762 1099
ddc12c42 1100#: apply.c:3097
5c57d762 1101#, c-format
a0b6b246
JX
1102msgid "missing binary patch data for '%s'"
1103msgstr "缺失 '%s' 的二进制补丁数据"
5c57d762 1104
ddc12c42 1105#: apply.c:3105
5c57d762 1106#, c-format
a0b6b246 1107msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
29004bbb 1108msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
5c57d762 1109
ddc12c42 1110#: apply.c:3152
5c57d762 1111#, c-format
a0b6b246
JX
1112msgid "cannot apply binary patch to '%s' without full index line"
1113msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
5c57d762 1114
2b472aae 1115#: apply.c:3163
5c57d762 1116#, c-format
a0b6b246
JX
1117msgid ""
1118"the patch applies to '%s' (%s), which does not match the current contents."
29004bbb 1119msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
5c57d762 1120
2b472aae 1121#: apply.c:3171
a0b6b246
JX
1122#, c-format
1123msgid "the patch applies to an empty '%s' but it is not empty"
29004bbb 1124msgstr "补丁应用到空文件 '%s',但其并非空文件"
5c57d762 1125
2b472aae 1126#: apply.c:3189
5c57d762 1127#, c-format
a0b6b246 1128msgid "the necessary postimage %s for '%s' cannot be read"
e640d114 1129msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
5c57d762 1130
2b472aae 1131#: apply.c:3202
5c57d762 1132#, c-format
a0b6b246
JX
1133msgid "binary patch does not apply to '%s'"
1134msgstr "二进制补丁未应用到 '%s'"
5c57d762 1135
2b472aae 1136#: apply.c:3209
5c57d762 1137#, c-format
a0b6b246
JX
1138msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1139msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
5c57d762 1140
2b472aae 1141#: apply.c:3230
276ceeaa 1142#, c-format
a0b6b246
JX
1143msgid "patch failed: %s:%ld"
1144msgstr "打补丁失败:%s:%ld"
276ceeaa 1145
2b472aae 1146#: apply.c:3353
4dcdc3d8 1147#, c-format
a0b6b246
JX
1148msgid "cannot checkout %s"
1149msgstr "不能检出 %s"
4dcdc3d8 1150
2b472aae 1151#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
4dcdc3d8 1152#, c-format
a0b6b246
JX
1153msgid "failed to read %s"
1154msgstr "无法读取 %s"
4dcdc3d8 1155
2b472aae 1156#: apply.c:3413
4dcdc3d8 1157#, c-format
a0b6b246
JX
1158msgid "reading from '%s' beyond a symbolic link"
1159msgstr "读取位于符号链接中的 '%s'"
4dcdc3d8 1160
2b472aae 1161#: apply.c:3442 apply.c:3685
4dcdc3d8 1162#, c-format
a0b6b246
JX
1163msgid "path %s has been renamed/deleted"
1164msgstr "路径 %s 已经被重命名/删除"
4dcdc3d8 1165
2b472aae 1166#: apply.c:3528 apply.c:3700
4dcdc3d8 1167#, c-format
a0b6b246
JX
1168msgid "%s: does not exist in index"
1169msgstr "%s:不存在于索引中"
4dcdc3d8 1170
2b472aae 1171#: apply.c:3537 apply.c:3708
4dcdc3d8 1172#, c-format
a0b6b246
JX
1173msgid "%s: does not match index"
1174msgstr "%s:和索引不匹配"
4dcdc3d8 1175
2b472aae 1176#: apply.c:3572
a0b6b246
JX
1177msgid "repository lacks the necessary blob to fall back on 3-way merge."
1178msgstr "仓库缺乏必要的数据对象以进行三方合并。"
4dcdc3d8 1179
2b472aae 1180#: apply.c:3575
4dcdc3d8 1181#, c-format
a0b6b246
JX
1182msgid "Falling back to three-way merge...\n"
1183msgstr "回落到三方合并...\n"
4dcdc3d8 1184
2b472aae 1185#: apply.c:3591 apply.c:3595
4dcdc3d8 1186#, c-format
a0b6b246
JX
1187msgid "cannot read the current contents of '%s'"
1188msgstr "无法读取 '%s' 的当前内容"
276ceeaa 1189
2b472aae 1190#: apply.c:3607
4dcdc3d8 1191#, c-format
a0b6b246
JX
1192msgid "Failed to fall back on three-way merge...\n"
1193msgstr "无法回落到三方合并...\n"
4dcdc3d8 1194
2b472aae 1195#: apply.c:3621
4dcdc3d8 1196#, c-format
a0b6b246
JX
1197msgid "Applied patch to '%s' with conflicts.\n"
1198msgstr "应用补丁到 '%s' 存在冲突。\n"
4dcdc3d8 1199
2b472aae 1200#: apply.c:3626
4dcdc3d8 1201#, c-format
a0b6b246
JX
1202msgid "Applied patch to '%s' cleanly.\n"
1203msgstr "成功应用补丁到 '%s'。\n"
4dcdc3d8 1204
2b472aae 1205#: apply.c:3652
a0b6b246
JX
1206msgid "removal patch leaves file contents"
1207msgstr "移除补丁仍留下了文件内容"
4dcdc3d8 1208
2b472aae 1209#: apply.c:3725
1003b3a5 1210#, c-format
a0b6b246
JX
1211msgid "%s: wrong type"
1212msgstr "%s:错误类型"
1003b3a5 1213
2b472aae 1214#: apply.c:3727
1003b3a5 1215#, c-format
a0b6b246
JX
1216msgid "%s has type %o, expected %o"
1217msgstr "%s 的类型是 %o,应为 %o"
1003b3a5 1218
2b472aae
JX
1219#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
1220#: read-cache.c:1325
4dcdc3d8 1221#, c-format
a0b6b246
JX
1222msgid "invalid path '%s'"
1223msgstr "无效路径 '%s'"
4dcdc3d8 1224
2b472aae 1225#: apply.c:3936
4dcdc3d8 1226#, c-format
a0b6b246
JX
1227msgid "%s: already exists in index"
1228msgstr "%s:已经存在于索引中"
4dcdc3d8 1229
2b472aae 1230#: apply.c:3939
4dcdc3d8 1231#, c-format
a0b6b246
JX
1232msgid "%s: already exists in working directory"
1233msgstr "%s:已经存在于工作区中"
4dcdc3d8 1234
2b472aae 1235#: apply.c:3959
1b7f4a34 1236#, c-format
a0b6b246
JX
1237msgid "new mode (%o) of %s does not match old mode (%o)"
1238msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1b7f4a34 1239
2b472aae 1240#: apply.c:3964
5b04ee3b 1241#, c-format
a0b6b246
JX
1242msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1243msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
5b04ee3b 1244
2b472aae 1245#: apply.c:3984
8ada9598 1246#, c-format
a0b6b246
JX
1247msgid "affected file '%s' is beyond a symbolic link"
1248msgstr "受影响的文件 '%s' 位于符号链接中"
8ada9598 1249
2b472aae 1250#: apply.c:3988
81809b99 1251#, c-format
a0b6b246
JX
1252msgid "%s: patch does not apply"
1253msgstr "%s:补丁未应用"
8ada9598 1254
2b472aae 1255#: apply.c:4003
8ada9598 1256#, c-format
a0b6b246 1257msgid "Checking patch %s..."
06991777 1258msgstr "正在检查补丁 %s..."
8ada9598 1259
2b472aae 1260#: apply.c:4095
a0b6b246
JX
1261#, c-format
1262msgid "sha1 information is lacking or useless for submodule %s"
1263msgstr "子模组 %s 的 sha1 信息缺失或无效"
8ada9598 1264
2b472aae 1265#: apply.c:4102
8ada9598 1266#, c-format
a0b6b246 1267msgid "mode change for %s, which is not in current HEAD"
31e5e17b 1268msgstr "%s 的模式变更,但它不在当前 HEAD 中"
8ada9598 1269
2b472aae 1270#: apply.c:4105
a0b6b246
JX
1271#, c-format
1272msgid "sha1 information is lacking or useless (%s)."
1273msgstr "sha1 信息缺失或无效(%s)。"
6792b93b 1274
2b472aae 1275#: apply.c:4114
a0b6b246
JX
1276#, c-format
1277msgid "could not add %s to temporary index"
1278msgstr "不能在临时索引中添加 %s"
9aeb4c2b 1279
2b472aae 1280#: apply.c:4124
a0b6b246
JX
1281#, c-format
1282msgid "could not write temporary index to %s"
1283msgstr "不能把临时索引写入到 %s"
9aeb4c2b 1284
2b472aae 1285#: apply.c:4262
a0b6b246
JX
1286#, c-format
1287msgid "unable to remove %s from index"
1288msgstr "不能从索引中移除 %s"
8ada9598 1289
2b472aae 1290#: apply.c:4296
8ada9598 1291#, c-format
a0b6b246
JX
1292msgid "corrupt patch for submodule %s"
1293msgstr "子模组 %s 损坏的补丁"
8ada9598 1294
2b472aae 1295#: apply.c:4302
9aeb4c2b 1296#, c-format
a0b6b246 1297msgid "unable to stat newly created file '%s'"
65e2041e 1298msgstr "不能对新建文件 '%s' 调用 stat"
9aeb4c2b 1299
2b472aae 1300#: apply.c:4310
a0b6b246
JX
1301#, c-format
1302msgid "unable to create backing store for newly created file %s"
1303msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 1304
2b472aae 1305#: apply.c:4316 apply.c:4461
81809b99 1306#, c-format
a0b6b246
JX
1307msgid "unable to add cache entry for %s"
1308msgstr "无法为 %s 添加缓存条目"
8ada9598 1309
2b472aae 1310#: apply.c:4359
a0b6b246
JX
1311#, c-format
1312msgid "failed to write to '%s'"
c1ac5258 1313msgstr "写入 '%s' 失败"
8ada9598 1314
2b472aae 1315#: apply.c:4363
220c313c 1316#, c-format
a0b6b246
JX
1317msgid "closing file '%s'"
1318msgstr "关闭文件 '%s'"
220c313c 1319
2b472aae 1320#: apply.c:4433
c04f5ac3 1321#, c-format
a0b6b246
JX
1322msgid "unable to write file '%s' mode %o"
1323msgstr "不能写文件 '%s' 权限 %o"
c04f5ac3 1324
2b472aae 1325#: apply.c:4531
c04f5ac3 1326#, c-format
a0b6b246
JX
1327msgid "Applied patch %s cleanly."
1328msgstr "成功应用补丁 %s。"
c04f5ac3 1329
2b472aae 1330#: apply.c:4539
a0b6b246
JX
1331msgid "internal error"
1332msgstr "内部错误"
c04f5ac3 1333
2b472aae 1334#: apply.c:4542
5c57d762 1335#, c-format
a0b6b246
JX
1336msgid "Applying patch %%s with %d reject..."
1337msgid_plural "Applying patch %%s with %d rejects..."
1338msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1339msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
5c57d762 1340
2b472aae 1341#: apply.c:4553
5c57d762 1342#, c-format
a0b6b246
JX
1343msgid "truncating .rej filename to %.*s.rej"
1344msgstr "截短 .rej 文件名为 %.*s.rej"
5c57d762 1345
2b472aae 1346#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
220c313c 1347#, c-format
a0b6b246
JX
1348msgid "cannot open %s"
1349msgstr "不能打开 %s"
220c313c 1350
2b472aae 1351#: apply.c:4575
220c313c 1352#, c-format
a0b6b246
JX
1353msgid "Hunk #%d applied cleanly."
1354msgstr "第 #%d 个片段成功应用。"
220c313c 1355
2b472aae 1356#: apply.c:4579
5c57d762 1357#, c-format
a0b6b246
JX
1358msgid "Rejected hunk #%d."
1359msgstr "拒绝第 #%d 个片段。"
5c57d762 1360
2b472aae 1361#: apply.c:4698
5c57d762 1362#, c-format
a0b6b246
JX
1363msgid "Skipped patch '%s'."
1364msgstr "略过补丁 '%s'。"
5c57d762 1365
2b472aae 1366#: apply.c:4706
a0b6b246
JX
1367msgid "unrecognized input"
1368msgstr "未能识别的输入"
5c57d762 1369
2b472aae 1370#: apply.c:4726
a0b6b246
JX
1371msgid "unable to read index file"
1372msgstr "无法读取索引文件"
5c57d762 1373
2b472aae 1374#: apply.c:4883
220c313c 1375#, c-format
a0b6b246
JX
1376msgid "can't open patch '%s': %s"
1377msgstr "不能打开补丁 '%s':%s"
220c313c 1378
2b472aae 1379#: apply.c:4910
5c57d762 1380#, c-format
a0b6b246
JX
1381msgid "squelched %d whitespace error"
1382msgid_plural "squelched %d whitespace errors"
1383msgstr[0] "抑制下仍有 %d 个空白字符误用"
1384msgstr[1] "抑制下仍有 %d 个空白字符误用"
5c57d762 1385
2b472aae 1386#: apply.c:4916 apply.c:4931
5c57d762 1387#, c-format
a0b6b246
JX
1388msgid "%d line adds whitespace errors."
1389msgid_plural "%d lines add whitespace errors."
a4f16749
JX
1390msgstr[0] "%d 行新增了空白字符误用。"
1391msgstr[1] "%d 行新增了空白字符误用。"
5c57d762 1392
2b472aae 1393#: apply.c:4924
5c57d762 1394#, c-format
a0b6b246
JX
1395msgid "%d line applied after fixing whitespace errors."
1396msgid_plural "%d lines applied after fixing whitespace errors."
1397msgstr[0] "修复空白错误后,应用了 %d 行。"
1398msgstr[1] "修复空白错误后,应用了 %d 行。"
5c57d762 1399
2b472aae 1400#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
a0b6b246
JX
1401msgid "Unable to write new index file"
1402msgstr "无法写入新索引文件"
5c57d762 1403
2b472aae 1404#: apply.c:4968
a0b6b246
JX
1405msgid "don't apply changes matching the given path"
1406msgstr "不要应用与给出路径向匹配的变更"
5c57d762 1407
2b472aae 1408#: apply.c:4971
a0b6b246
JX
1409msgid "apply changes matching the given path"
1410msgstr "应用与给出路径向匹配的变更"
220c313c 1411
2b472aae 1412#: apply.c:4973 builtin/am.c:2260
a0b6b246
JX
1413msgid "num"
1414msgstr "数字"
220c313c 1415
2b472aae 1416#: apply.c:4974
a0b6b246
JX
1417msgid "remove <num> leading slashes from traditional diff paths"
1418msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
220c313c 1419
2b472aae 1420#: apply.c:4977
a0b6b246
JX
1421msgid "ignore additions made by the patch"
1422msgstr "忽略补丁中的添加的文件"
220c313c 1423
2b472aae 1424#: apply.c:4979
a0b6b246
JX
1425msgid "instead of applying the patch, output diffstat for the input"
1426msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
220c313c 1427
2b472aae 1428#: apply.c:4983
a0b6b246
JX
1429msgid "show number of added and deleted lines in decimal notation"
1430msgstr "以十进制数显示添加和删除的行数"
220c313c 1431
2b472aae 1432#: apply.c:4985
a0b6b246
JX
1433msgid "instead of applying the patch, output a summary for the input"
1434msgstr "不应用补丁,而是显示输入的概要"
220c313c 1435
2b472aae 1436#: apply.c:4987
a0b6b246
JX
1437msgid "instead of applying the patch, see if the patch is applicable"
1438msgstr "不应用补丁,而是查看补丁是否可应用"
220c313c 1439
2b472aae 1440#: apply.c:4989
a0b6b246
JX
1441msgid "make sure the patch is applicable to the current index"
1442msgstr "确认补丁可以应用到当前索引"
276ceeaa 1443
2b472aae 1444#: apply.c:4991
c1ac5258
JX
1445msgid "mark new files with `git add --intent-to-add`"
1446msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
1447
2b472aae 1448#: apply.c:4993
a0b6b246
JX
1449msgid "apply a patch without touching the working tree"
1450msgstr "应用补丁而不修改工作区"
5b04ee3b 1451
2b472aae 1452#: apply.c:4995
a0b6b246
JX
1453msgid "accept a patch that touches outside the working area"
1454msgstr "接受修改工作区之外文件的补丁"
5c57d762 1455
2b472aae 1456#: apply.c:4998
a0b6b246
JX
1457msgid "also apply the patch (use with --stat/--summary/--check)"
1458msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
c04f5ac3 1459
2b472aae 1460#: apply.c:5000
a0b6b246
JX
1461msgid "attempt three-way merge if a patch does not apply"
1462msgstr "如果一个补丁不能应用则尝试三方合并"
c04f5ac3 1463
2b472aae 1464#: apply.c:5002
a0b6b246
JX
1465msgid "build a temporary index based on embedded index information"
1466msgstr "创建一个临时索引基于嵌入的索引信息"
c04f5ac3 1467
2b472aae 1468#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
a0b6b246
JX
1469msgid "paths are separated with NUL character"
1470msgstr "路径以 NUL 字符分隔"
8ada9598 1471
2b472aae 1472#: apply.c:5007
a0b6b246
JX
1473msgid "ensure at least <n> lines of context match"
1474msgstr "确保至少匹配 <n> 行上下文"
8ada9598 1475
2b472aae 1476#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
a6cd2cc4 1477#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
2b472aae 1478#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
a0b6b246
JX
1479msgid "action"
1480msgstr "动作"
8ada9598 1481
2b472aae 1482#: apply.c:5009
a0b6b246
JX
1483msgid "detect new or modified lines that have whitespace errors"
1484msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 1485
2b472aae 1486#: apply.c:5012 apply.c:5015
a0b6b246
JX
1487msgid "ignore changes in whitespace when finding context"
1488msgstr "查找上下文时忽略空白字符的变更"
8ada9598 1489
2b472aae 1490#: apply.c:5018
a0b6b246
JX
1491msgid "apply the patch in reverse"
1492msgstr "反向应用补丁"
8ada9598 1493
2b472aae 1494#: apply.c:5020
a0b6b246
JX
1495msgid "don't expect at least one line of context"
1496msgstr "无需至少一行上下文"
8ada9598 1497
2b472aae 1498#: apply.c:5022
a0b6b246
JX
1499msgid "leave the rejected hunks in corresponding *.rej files"
1500msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 1501
2b472aae 1502#: apply.c:5024
a0b6b246
JX
1503msgid "allow overlapping hunks"
1504msgstr "允许重叠的补丁片段"
8ada9598 1505
2b472aae
JX
1506#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
1507#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
ddc12c42 1508#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
a0b6b246
JX
1509msgid "be verbose"
1510msgstr "冗长输出"
8ada9598 1511
2b472aae 1512#: apply.c:5027
a0b6b246
JX
1513msgid "tolerate incorrectly detected missing new-line at the end of file"
1514msgstr "允许不正确的文件末尾换行符"
cfff71a9 1515
2b472aae 1516#: apply.c:5030
a0b6b246
JX
1517msgid "do not trust the line counts in the hunk headers"
1518msgstr "不信任补丁片段的头信息中的行号"
6c94aba5 1519
2b472aae 1520#: apply.c:5032 builtin/am.c:2248
a0b6b246
JX
1521msgid "root"
1522msgstr "根目录"
c04f5ac3 1523
2b472aae 1524#: apply.c:5033
a0b6b246
JX
1525msgid "prepend <root> to all filenames"
1526msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 1527
c1ac5258 1528#: archive.c:14
a0b6b246 1529msgid "git archive [<options>] <tree-ish> [<path>...]"
ddc12c42 1530msgstr "git archive [<选项>] <树对象> [<路径>...]"
07432cef 1531
c1ac5258 1532#: archive.c:15
a0b6b246
JX
1533msgid "git archive --list"
1534msgstr "git archive --list"
1535
c1ac5258 1536#: archive.c:16
c04f5ac3 1537msgid ""
a0b6b246 1538"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
c04f5ac3 1539msgstr ""
ddc12c42 1540"git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]"
6acbf033 1541
c1ac5258 1542#: archive.c:17
a0b6b246
JX
1543msgid "git archive --remote <repo> [--exec <cmd>] --list"
1544msgstr "git archive --remote <仓库> [--exec <命令>] --list"
6acbf033 1545
2b472aae 1546#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
c04f5ac3 1547#, c-format
a0b6b246
JX
1548msgid "pathspec '%s' did not match any files"
1549msgstr "路径规格 '%s' 未匹配任何文件"
c04f5ac3 1550
06991777
JX
1551#: archive.c:396
1552#, c-format
1553msgid "no such ref: %.*s"
1554msgstr "无此引用:%.*s"
1555
1556#: archive.c:401
1557#, c-format
1558msgid "not a valid object name: %s"
1559msgstr "不是一个有效的对象名:%s"
1560
1561#: archive.c:414
1562#, c-format
1563msgid "not a tree object: %s"
1564msgstr "不是一个树对象:%s"
1565
a6cd2cc4 1566#: archive.c:426
06991777
JX
1567msgid "current working directory is untracked"
1568msgstr "当前工作目录未被跟踪"
1569
a6cd2cc4 1570#: archive.c:457
a0b6b246
JX
1571msgid "fmt"
1572msgstr "格式"
07432cef 1573
a6cd2cc4 1574#: archive.c:457
a0b6b246
JX
1575msgid "archive format"
1576msgstr "归档格式"
7aea43ff 1577
ddc12c42 1578#: archive.c:458 builtin/log.c:1653
a0b6b246
JX
1579msgid "prefix"
1580msgstr "前缀"
7aea43ff 1581
a6cd2cc4 1582#: archive.c:459
a0b6b246
JX
1583msgid "prepend prefix to each pathname in the archive"
1584msgstr "为归档中每个路径名加上前缀"
c04f5ac3 1585
ddc12c42 1586#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
2b472aae
JX
1587#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
1588#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
a5cd71ca
JX
1589#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
1590#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
ddc12c42 1591#: parse-options.h:190
a0b6b246
JX
1592msgid "file"
1593msgstr "文件"
a77c07d9 1594
a6cd2cc4 1595#: archive.c:461 builtin/archive.c:90
a0b6b246
JX
1596msgid "write the archive to this file"
1597msgstr "归档写入此文件"
a77c07d9 1598
a6cd2cc4 1599#: archive.c:463
a0b6b246
JX
1600msgid "read .gitattributes in working directory"
1601msgstr "读取工作区中的 .gitattributes"
7ac1c0ad 1602
a6cd2cc4 1603#: archive.c:464
a0b6b246
JX
1604msgid "report archived files on stderr"
1605msgstr "在标准错误上报告归档文件"
7ac1c0ad 1606
a6cd2cc4 1607#: archive.c:465
a0b6b246
JX
1608msgid "store only"
1609msgstr "只存储"
7ac1c0ad 1610
a6cd2cc4 1611#: archive.c:466
a0b6b246
JX
1612msgid "compress faster"
1613msgstr "压缩速度更快"
8ada9598 1614
a6cd2cc4 1615#: archive.c:474
a0b6b246
JX
1616msgid "compress better"
1617msgstr "压缩效果更好"
8ada9598 1618
a6cd2cc4 1619#: archive.c:477
a0b6b246
JX
1620msgid "list supported archive formats"
1621msgstr "列出支持的归档格式"
a77c07d9 1622
ddc12c42 1623#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
2b472aae 1624#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
a0b6b246
JX
1625msgid "repo"
1626msgstr "仓库"
c04f5ac3 1627
a6cd2cc4 1628#: archive.c:480 builtin/archive.c:92
a0b6b246
JX
1629msgid "retrieve the archive from remote repository <repo>"
1630msgstr "从远程仓库(<仓库>)提取归档文件"
8ada9598 1631
a5cd71ca 1632#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
06991777 1633#: builtin/notes.c:498
a0b6b246
JX
1634msgid "command"
1635msgstr "命令"
1636
a6cd2cc4 1637#: archive.c:482 builtin/archive.c:94
a0b6b246
JX
1638msgid "path to the remote git-upload-archive command"
1639msgstr "远程 git-upload-archive 命令的路径"
1640
a6cd2cc4 1641#: archive.c:489
a0b6b246
JX
1642msgid "Unexpected option --remote"
1643msgstr "未知参数 --remote"
1644
a6cd2cc4 1645#: archive.c:491
a0b6b246
JX
1646msgid "Option --exec can only be used together with --remote"
1647msgstr "选项 --exec 只能和 --remote 同时使用"
1648
a6cd2cc4 1649#: archive.c:493
a0b6b246
JX
1650msgid "Unexpected option --output"
1651msgstr "未知参数 --output"
1652
a6cd2cc4 1653#: archive.c:515
a0b6b246
JX
1654#, c-format
1655msgid "Unknown archive format '%s'"
1656msgstr "未知归档格式 '%s'"
1657
a6cd2cc4 1658#: archive.c:522
8ada9598 1659#, c-format
a0b6b246
JX
1660msgid "Argument not supported for format '%s': -%d"
1661msgstr "参数不支持此格式 '%s':-%d"
1662
2b472aae 1663#: archive-tar.c:125 archive-zip.c:351
c1ac5258
JX
1664#, c-format
1665msgid "cannot stream blob %s"
e640d114 1666msgstr "不能打开数据对象 %s"
c1ac5258 1667
2b472aae 1668#: archive-tar.c:266 archive-zip.c:369
c1ac5258
JX
1669#, c-format
1670msgid "unsupported file mode: 0%o (SHA1: %s)"
e640d114 1671msgstr "不支持的文件模式:0%o (SHA1: %s)"
c1ac5258 1672
2b472aae 1673#: archive-tar.c:293 archive-zip.c:359
c1ac5258
JX
1674#, c-format
1675msgid "cannot read %s"
1676msgstr "不能读取 %s"
1677
a5cd71ca 1678#: archive-tar.c:465
c1ac5258
JX
1679#, c-format
1680msgid "unable to start '%s' filter"
1681msgstr "无法启动 '%s' 过滤器"
1682
a5cd71ca 1683#: archive-tar.c:468
c1ac5258
JX
1684msgid "unable to redirect descriptor"
1685msgstr "无法重定向描述符"
1686
a5cd71ca 1687#: archive-tar.c:475
c1ac5258
JX
1688#, c-format
1689msgid "'%s' filter reported error"
e640d114 1690msgstr "'%s' 过滤器报告了错误"
c1ac5258 1691
ddc12c42 1692#: archive-zip.c:319
c1ac5258
JX
1693#, c-format
1694msgid "path is not valid UTF-8: %s"
1695msgstr "路径不是有效的 UTF-8:%s"
1696
ddc12c42 1697#: archive-zip.c:323
c1ac5258
JX
1698#, c-format
1699msgid "path too long (%d chars, SHA1: %s): %s"
1700msgstr "路径太长(%d 字符,SHA1:%s):%s"
1701
2b472aae 1702#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
c1ac5258
JX
1703#, c-format
1704msgid "deflate error (%d)"
1705msgstr "压缩错误 (%d)"
1706
2b472aae 1707#: archive-zip.c:615
c1ac5258
JX
1708#, c-format
1709msgid "timestamp too large for this system: %<PRIuMAX>"
e640d114 1710msgstr "对于本系统时间戳太大:%<PRIuMAX>"
c1ac5258 1711
ddc12c42 1712#: attr.c:212
87cb7997
JX
1713#, c-format
1714msgid "%.*s is not a valid attribute name"
1715msgstr "%.*s 不是一个有效的属性名"
1716
ddc12c42 1717#: attr.c:369
06991777
JX
1718#, c-format
1719msgid "%s not allowed: %s:%d"
5b533632 1720msgstr "不允许 %s:%s:%d"
06991777 1721
ddc12c42 1722#: attr.c:409
8ada9598 1723msgid ""
a0b6b246
JX
1724"Negative patterns are ignored in git attributes\n"
1725"Use '\\!' for literal leading exclamation."
8ada9598 1726msgstr ""
a0b6b246
JX
1727"负值模版在 git attributes 中被忽略\n"
1728"当字符串确实要以感叹号开始时,使用 '\\!'。"
8ada9598 1729
4c27fcb5 1730#: bisect.c:468
8ada9598 1731#, c-format
a0b6b246
JX
1732msgid "Badly quoted content in file '%s': %s"
1733msgstr "文件 '%s' 包含错误的引用格式:%s"
8ada9598 1734
06991777 1735#: bisect.c:678
a0b6b246
JX
1736#, c-format
1737msgid "We cannot bisect more!\n"
1738msgstr "我们无法进行更多的二分查找!\n"
8ada9598 1739
2b472aae 1740#: bisect.c:745
2e8451e8 1741#, c-format
a0b6b246
JX
1742msgid "Not a valid commit name %s"
1743msgstr "不是一个有效的提交名 %s"
2e8451e8 1744
2b472aae 1745#: bisect.c:770
5b04ee3b
JX
1746#, c-format
1747msgid ""
a0b6b246
JX
1748"The merge base %s is bad.\n"
1749"This means the bug has been fixed between %s and [%s].\n"
5b04ee3b 1750msgstr ""
a0b6b246
JX
1751"合并基线 %s 是坏的。\n"
1752"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
5b04ee3b 1753
2b472aae 1754#: bisect.c:775
5b04ee3b 1755#, c-format
a0b6b246
JX
1756msgid ""
1757"The merge base %s is new.\n"
1758"The property has changed between %s and [%s].\n"
1759msgstr ""
1760"合并基线 %s 是新的。\n"
1761"介于 %s 和 [%s] 之间的属性已经被修改。\n"
5b04ee3b 1762
2b472aae 1763#: bisect.c:780
a0b6b246
JX
1764#, c-format
1765msgid ""
1766"The merge base %s is %s.\n"
1767"This means the first '%s' commit is between %s and [%s].\n"
1768msgstr ""
1769"合并基线 %s 是 %s。\n"
1770"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
07432cef 1771
2b472aae 1772#: bisect.c:788
a0b6b246
JX
1773#, c-format
1774msgid ""
1a79b2f1 1775"Some %s revs are not ancestors of the %s rev.\n"
a0b6b246
JX
1776"git bisect cannot work properly in this case.\n"
1777"Maybe you mistook %s and %s revs?\n"
1778msgstr ""
1779"一些 %s 版本不是 %s 版本的祖先。\n"
1780"这种情况下 git 二分查找无法正常工作。\n"
1781"您可能弄错了 %s 和 %s 版本?\n"
07432cef 1782
2b472aae 1783#: bisect.c:801
a0b6b246
JX
1784#, c-format
1785msgid ""
1786"the merge base between %s and [%s] must be skipped.\n"
1787"So we cannot be sure the first %s commit is between %s and %s.\n"
1788"We continue anyway."
1789msgstr ""
1790"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1791"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1792"我们仍旧继续。"
649900bc 1793
2b472aae 1794#: bisect.c:840
649900bc 1795#, c-format
a0b6b246
JX
1796msgid "Bisecting: a merge base must be tested\n"
1797msgstr "二分查找中:合并基线必须是经过测试的\n"
649900bc 1798
2b472aae 1799#: bisect.c:890
a0b6b246
JX
1800#, c-format
1801msgid "a %s revision is needed"
1802msgstr "需要一个 %s 版本"
649900bc 1803
2b472aae 1804#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
649900bc 1805#, c-format
a0b6b246
JX
1806msgid "could not create file '%s'"
1807msgstr "不能创建文件 '%s'"
649900bc 1808
2b472aae 1809#: bisect.c:966 builtin/merge.c:149
649900bc 1810#, c-format
a0b6b246
JX
1811msgid "could not read file '%s'"
1812msgstr "不能读取文件 '%s'"
649900bc 1813
2b472aae 1814#: bisect.c:997
a0b6b246
JX
1815msgid "reading bisect refs failed"
1816msgstr "读取二分查找引用失败"
649900bc 1817
2b472aae 1818#: bisect.c:1019
649900bc 1819#, c-format
a0b6b246
JX
1820msgid "%s was both %s and %s\n"
1821msgstr "%s 同时为 %s 和 %s\n"
649900bc 1822
2b472aae 1823#: bisect.c:1028
649900bc 1824#, c-format
a0b6b246
JX
1825msgid ""
1826"No testable commit found.\n"
1827"Maybe you started with bad path parameters?\n"
1828msgstr ""
1829"没有发现可测试的提交。\n"
1830"可能您在运行时使用了错误的路径参数?\n"
649900bc 1831
2b472aae 1832#: bisect.c:1057
649900bc 1833#, c-format
a0b6b246
JX
1834msgid "(roughly %d step)"
1835msgid_plural "(roughly %d steps)"
1836msgstr[0] "(大概 %d 步)"
1837msgstr[1] "(大概 %d 步)"
649900bc 1838
a4f16749
JX
1839#. TRANSLATORS: the last %s will be replaced with "(roughly %d
1840#. steps)" translation.
1841#.
2b472aae 1842#: bisect.c:1063
649900bc 1843#, c-format
a0b6b246
JX
1844msgid "Bisecting: %d revision left to test after this %s\n"
1845msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1846msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1847msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
649900bc 1848
a5cd71ca 1849#: blame.c:2700
a4f16749
JX
1850msgid "--contents and --reverse do not blend well."
1851msgstr "--contents 和 --reverse 不能混用。"
1852
a5cd71ca 1853#: blame.c:2714
a4f16749
JX
1854msgid "cannot use --contents with final commit object name"
1855msgstr "不能将 --contents 和最终的提交对象名共用"
1856
a5cd71ca 1857#: blame.c:2735
a4f16749
JX
1858msgid "--reverse and --first-parent together require specified latest commit"
1859msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
1860
2b472aae
JX
1861#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
1862#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
1863#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
1864#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
fd8cb379 1865#: builtin/shortlog.c:192
a4f16749
JX
1866msgid "revision walk setup failed"
1867msgstr "版本遍历设置失败"
1868
a5cd71ca 1869#: blame.c:2762
a4f16749
JX
1870msgid ""
1871"--reverse --first-parent together require range along first-parent chain"
1872msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
1873
a5cd71ca 1874#: blame.c:2773
a4f16749
JX
1875#, c-format
1876msgid "no such path %s in %s"
1877msgstr "在 %2$s 中无此路径 %1$s"
1878
a5cd71ca 1879#: blame.c:2784
a4f16749
JX
1880#, c-format
1881msgid "cannot read blob %s for path %s"
1882msgstr "不能为路径 %2$s 读取数据对象 %1$s"
1883
d46c5519 1884#: branch.c:53
649900bc 1885#, c-format
a0b6b246
JX
1886msgid ""
1887"\n"
1888"After fixing the error cause you may try to fix up\n"
1889"the remote tracking information by invoking\n"
1890"\"git branch --set-upstream-to=%s%s%s\"."
1891msgstr ""
1892"\n"
1893"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1894"\"git branch --set-upstream-to=%s%s%s\" 。"
649900bc 1895
d46c5519 1896#: branch.c:67
649900bc 1897#, c-format
a0b6b246
JX
1898msgid "Not setting branch %s as its own upstream."
1899msgstr "未设置分支 %s 作为它自己的上游。"
649900bc 1900
d46c5519 1901#: branch.c:93
649900bc 1902#, c-format
6937cb4e
JX
1903msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
1904msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 1905
d46c5519 1906#: branch.c:94
649900bc 1907#, c-format
6937cb4e
JX
1908msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
1909msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 1910
d46c5519 1911#: branch.c:98
649900bc 1912#, c-format
6937cb4e
JX
1913msgid "Branch '%s' set up to track local branch '%s' by rebasing."
1914msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
649900bc 1915
d46c5519 1916#: branch.c:99
649900bc 1917#, c-format
6937cb4e 1918msgid "Branch '%s' set up to track local branch '%s'."
493a9322 1919msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
649900bc 1920
d46c5519 1921#: branch.c:104
649900bc 1922#, c-format
6937cb4e
JX
1923msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
1924msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
649900bc 1925
d46c5519 1926#: branch.c:105
649900bc 1927#, c-format
6937cb4e
JX
1928msgid "Branch '%s' set up to track remote ref '%s'."
1929msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
649900bc 1930
d46c5519 1931#: branch.c:109
649900bc 1932#, c-format
6937cb4e
JX
1933msgid "Branch '%s' set up to track local ref '%s' by rebasing."
1934msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
649900bc 1935
d46c5519 1936#: branch.c:110
649900bc 1937#, c-format
6937cb4e
JX
1938msgid "Branch '%s' set up to track local ref '%s'."
1939msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
649900bc 1940
d46c5519 1941#: branch.c:119
a0b6b246
JX
1942msgid "Unable to write upstream branch configuration"
1943msgstr "无法写入上游分支配置"
649900bc 1944
d46c5519 1945#: branch.c:156
649900bc 1946#, c-format
a0b6b246
JX
1947msgid "Not tracking: ambiguous information for ref %s"
1948msgstr "未跟踪:引用 %s 有歧义"
649900bc 1949
d46c5519 1950#: branch.c:189
649900bc 1951#, c-format
a0b6b246
JX
1952msgid "'%s' is not a valid branch name."
1953msgstr "'%s' 不是一个有效的分支名称。"
649900bc 1954
d46c5519 1955#: branch.c:208
649900bc 1956#, c-format
a0b6b246
JX
1957msgid "A branch named '%s' already exists."
1958msgstr "一个分支名 '%s' 已经存在。"
649900bc 1959
d46c5519 1960#: branch.c:213
a0b6b246
JX
1961msgid "Cannot force update the current branch."
1962msgstr "无法强制更新当前分支。"
649900bc 1963
d46c5519 1964#: branch.c:233
649900bc 1965#, c-format
a0b6b246
JX
1966msgid "Cannot setup tracking information; starting point '%s' is not a branch."
1967msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
649900bc 1968
d46c5519 1969#: branch.c:235
649900bc 1970#, c-format
a0b6b246
JX
1971msgid "the requested upstream branch '%s' does not exist"
1972msgstr "请求的上游分支 '%s' 不存在"
649900bc 1973
d46c5519 1974#: branch.c:237
a0b6b246
JX
1975msgid ""
1976"\n"
1977"If you are planning on basing your work on an upstream\n"
1978"branch that already exists at the remote, you may need to\n"
1979"run \"git fetch\" to retrieve it.\n"
1980"\n"
1981"If you are planning to push out a new local branch that\n"
1982"will track its remote counterpart, you may want to use\n"
1983"\"git push -u\" to set the upstream config as you push."
1984msgstr ""
1985"\n"
1986"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
1987"您可能需要执行 \"git fetch\" 来获取分支。\n"
1988"\n"
1989"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
1990"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
649900bc 1991
d46c5519 1992#: branch.c:281
649900bc 1993#, c-format
a0b6b246
JX
1994msgid "Not a valid object name: '%s'."
1995msgstr "不是一个有效的对象名:'%s'。"
649900bc 1996
d46c5519 1997#: branch.c:301
649900bc 1998#, c-format
a0b6b246
JX
1999msgid "Ambiguous object name: '%s'."
2000msgstr "歧义的对象名:'%s'。"
649900bc 2001
d46c5519 2002#: branch.c:306
649900bc 2003#, c-format
a0b6b246
JX
2004msgid "Not a valid branch point: '%s'."
2005msgstr "无效的分支点:'%s'。"
649900bc 2006
a6cd2cc4 2007#: branch.c:364
649900bc 2008#, c-format
a0b6b246
JX
2009msgid "'%s' is already checked out at '%s'"
2010msgstr "'%s' 已经检出到 '%s'"
649900bc 2011
a6cd2cc4 2012#: branch.c:387
a0b6b246
JX
2013#, c-format
2014msgid "HEAD of working tree %s is not updated"
2015msgstr "工作区 %s 的 HEAD 指向没有被更新"
649900bc 2016
c1ac5258 2017#: bundle.c:36
649900bc 2018#, c-format
a0b6b246
JX
2019msgid "'%s' does not look like a v2 bundle file"
2020msgstr "'%s' 不像是一个 v2 版本的包文件"
649900bc 2021
c1ac5258 2022#: bundle.c:64
a0b6b246
JX
2023#, c-format
2024msgid "unrecognized header: %s%s (%d)"
2025msgstr "未能识别的包头:%s%s (%d)"
649900bc 2026
2b472aae
JX
2027#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
2028#: builtin/commit.c:815
649900bc 2029#, c-format
a0b6b246
JX
2030msgid "could not open '%s'"
2031msgstr "不能打开 '%s'"
649900bc 2032
06991777 2033#: bundle.c:143
a0b6b246
JX
2034msgid "Repository lacks these prerequisite commits:"
2035msgstr "仓库中缺少这些必备的提交:"
649900bc 2036
a6cd2cc4
JX
2037#: bundle.c:146
2038msgid "need a repository to verify a bundle"
2039msgstr "需要一个仓库来校验一个包"
2040
2041#: bundle.c:197
2e8451e8 2042#, c-format
a0b6b246
JX
2043msgid "The bundle contains this ref:"
2044msgid_plural "The bundle contains these %d refs:"
2045msgstr[0] "这个包中含有这个引用:"
2046msgstr[1] "这个包中含有 %d 个引用:"
2e8451e8 2047
a6cd2cc4 2048#: bundle.c:204
a0b6b246
JX
2049msgid "The bundle records a complete history."
2050msgstr "这个包记录一个完整历史。"
2e8451e8 2051
a6cd2cc4 2052#: bundle.c:206
2e8451e8 2053#, c-format
a0b6b246
JX
2054msgid "The bundle requires this ref:"
2055msgid_plural "The bundle requires these %d refs:"
2056msgstr[0] "这个包需要这个引用:"
2057msgstr[1] "这个包需要 %d 个引用:"
2e8451e8 2058
ddc12c42 2059#: bundle.c:273
4c27fcb5
JX
2060msgid "unable to dup bundle descriptor"
2061msgstr "无法复制 bundle 描述符"
2062
ddc12c42 2063#: bundle.c:280
a0b6b246
JX
2064msgid "Could not spawn pack-objects"
2065msgstr "不能生成 pack-objects 进程"
1003b3a5 2066
ddc12c42 2067#: bundle.c:291
a0b6b246
JX
2068msgid "pack-objects died"
2069msgstr "pack-objects 终止"
8ada9598 2070
ddc12c42 2071#: bundle.c:333
a0b6b246
JX
2072msgid "rev-list died"
2073msgstr "rev-list 终止"
2074
ddc12c42 2075#: bundle.c:382
81809b99 2076#, c-format
a0b6b246
JX
2077msgid "ref '%s' is excluded by the rev-list options"
2078msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 2079
ddc12c42 2080#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
81809b99 2081#, c-format
a0b6b246
JX
2082msgid "unrecognized argument: %s"
2083msgstr "未能识别的参数:%s"
8ada9598 2084
ddc12c42 2085#: bundle.c:469
a0b6b246
JX
2086msgid "Refusing to create empty bundle."
2087msgstr "不能创建空包。"
2088
ddc12c42 2089#: bundle.c:479
81809b99 2090#, c-format
a0b6b246
JX
2091msgid "cannot create '%s'"
2092msgstr "不能创建 '%s'"
8ada9598 2093
ddc12c42 2094#: bundle.c:504
a0b6b246
JX
2095msgid "index-pack died"
2096msgstr "index-pack 终止"
63af42fe 2097
2b472aae 2098#: color.c:329
94550ed3 2099#, c-format
a0b6b246
JX
2100msgid "invalid color value: %.*s"
2101msgstr "无效的颜色值:%.*s"
94550ed3 2102
2b472aae
JX
2103#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
2104#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
94550ed3 2105#, c-format
a0b6b246
JX
2106msgid "could not parse %s"
2107msgstr "不能解析 %s"
94550ed3 2108
ddc12c42 2109#: commit.c:53
a0b6b246
JX
2110#, c-format
2111msgid "%s %s is not a commit!"
31e5e17b 2112msgstr "%s %s 不是一个提交!"
90314792 2113
ddc12c42 2114#: commit.c:193
fd8cb379
JX
2115msgid ""
2116"Support for <GIT_DIR>/info/grafts is deprecated\n"
2117"and will be removed in a future Git version.\n"
2118"\n"
2119"Please use \"git replace --convert-graft-file\"\n"
2120"to convert the grafts into replace refs.\n"
2121"\n"
2122"Turn this message off by running\n"
2123"\"git config advice.graftFileDeprecated false\""
2124msgstr ""
2125"对 <GIT_DIR>/info/grafts 的支持已被弃用,并将在\n"
2126"未来的Git版本中被移除。\n"
2127"\n"
2128"请使用 \"git replace --convert-graft-file\" 将\n"
2129"grafts 转换为替换引用。\n"
2130"\n"
2131"设置 \"git config advice.graftFileDeprecated false\"\n"
2132"可关闭本消息"
2133
2b472aae 2134#: commit.c:1153
4c27fcb5
JX
2135#, c-format
2136msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2137msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
2138
2b472aae 2139#: commit.c:1157
4c27fcb5
JX
2140#, c-format
2141msgid "Commit %s has a bad GPG signature allegedly by %s."
2142msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
2143
2b472aae 2144#: commit.c:1160
4c27fcb5
JX
2145#, c-format
2146msgid "Commit %s does not have a GPG signature."
2147msgstr "提交 %s 没有 GPG 签名。"
2148
2b472aae 2149#: commit.c:1163
4c27fcb5
JX
2150#, c-format
2151msgid "Commit %s has a good GPG signature by %s\n"
2152msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
2153
2b472aae 2154#: commit.c:1417
90314792 2155msgid ""
a0b6b246
JX
2156"Warning: commit message did not conform to UTF-8.\n"
2157"You may want to amend it after fixing the message, or set the config\n"
2158"variable i18n.commitencoding to the encoding your project uses.\n"
2159msgstr ""
29004bbb 2160"警告:提交说明不符合 UTF-8 字符编码。\n"
a0b6b246 2161"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
29004bbb 2162"设置为您项目所用的字符编码。\n"
90314792 2163
2b472aae 2164#: commit-graph.c:122
d46c5519
JX
2165msgid "commit-graph file is too small"
2166msgstr "提交图形文件太小"
c1ac5258 2167
2b472aae 2168#: commit-graph.c:189
c1ac5258 2169#, c-format
d46c5519
JX
2170msgid "commit-graph signature %X does not match signature %X"
2171msgstr "提交图形签名 %X 和签名 %X 不匹配"
c1ac5258 2172
2b472aae 2173#: commit-graph.c:196
c1ac5258 2174#, c-format
d46c5519
JX
2175msgid "commit-graph version %X does not match version %X"
2176msgstr "提交图形版本 %X 和版本 %X 不匹配"
c1ac5258 2177
2b472aae 2178#: commit-graph.c:203
c1ac5258 2179#, c-format
d46c5519
JX
2180msgid "commit-graph hash version %X does not match version %X"
2181msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
c1ac5258 2182
2b472aae 2183#: commit-graph.c:226
d46c5519
JX
2184msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
2185msgstr "提交图形块查找表条目丢失,文件可能不完整"
06991777 2186
2b472aae 2187#: commit-graph.c:237
c1ac5258 2188#, c-format
d46c5519
JX
2189msgid "commit-graph improper chunk offset %08x%08x"
2190msgstr "提交图形不正确的块偏移 %08x%08x"
c1ac5258 2191
2b472aae 2192#: commit-graph.c:280
c1ac5258 2193#, c-format
d46c5519
JX
2194msgid "commit-graph chunk id %08x appears multiple times"
2195msgstr "提交图形块 id %08x 出现了多次"
c1ac5258 2196
2b472aae 2197#: commit-graph.c:343
a6cd2cc4
JX
2198msgid "commit-graph has no base graphs chunk"
2199msgstr "提交图形没有基础图形块"
2200
2b472aae 2201#: commit-graph.c:353
a6cd2cc4
JX
2202msgid "commit-graph chain does not match"
2203msgstr "提交图形链不匹配"
2204
2b472aae 2205#: commit-graph.c:401
a6cd2cc4
JX
2206#, c-format
2207msgid "invalid commit-graph chain: line '%s' not a hash"
2208msgstr "无效的提交图形链:行 '%s' 不是一个哈希值"
2209
2b472aae 2210#: commit-graph.c:425
a6cd2cc4
JX
2211msgid "unable to find all commit-graph files"
2212msgstr "无法找到所有提交图形文件"
2213
2b472aae 2214#: commit-graph.c:558 commit-graph.c:618
a6cd2cc4
JX
2215msgid "invalid commit position. commit-graph is likely corrupt"
2216msgstr "无效的提交位置。提交图形可能已损坏"
2217
2b472aae 2218#: commit-graph.c:579
c1ac5258
JX
2219#, c-format
2220msgid "could not find commit %s"
2221msgstr "无法找到提交 %s"
2222
2b472aae 2223#: commit-graph.c:852 builtin/am.c:1292
a5cd71ca
JX
2224#, c-format
2225msgid "unable to parse commit %s"
2226msgstr "不能解析提交 %s"
2227
2b472aae 2228#: commit-graph.c:1011 builtin/pack-objects.c:2782
c1ac5258
JX
2229#, c-format
2230msgid "unable to get type of object %s"
2231msgstr "无法获得对象 %s 类型"
2232
2b472aae 2233#: commit-graph.c:1043
06991777
JX
2234msgid "Loading known commits in commit graph"
2235msgstr "正在加载提交图中的已知提交"
2236
2b472aae 2237#: commit-graph.c:1060
06991777
JX
2238msgid "Expanding reachable commits in commit graph"
2239msgstr "正在扩展提交图中的可达提交"
2240
2b472aae 2241#: commit-graph.c:1079
06991777
JX
2242msgid "Clearing commit marks in commit graph"
2243msgstr "正在清除提交图中的提交标记"
4c27fcb5 2244
2b472aae 2245#: commit-graph.c:1098
4c27fcb5
JX
2246msgid "Computing commit graph generation numbers"
2247msgstr "正在计算提交图世代数字"
2248
2b472aae 2249#: commit-graph.c:1173
06991777
JX
2250#, c-format
2251msgid "Finding commits for commit graph in %d pack"
2252msgid_plural "Finding commits for commit graph in %d packs"
2253msgstr[0] "正在 %d 个包中查找提交图的提交"
2254msgstr[1] "正在 %d 个包中查找提交图的提交"
4c27fcb5 2255
2b472aae 2256#: commit-graph.c:1186
c1ac5258
JX
2257#, c-format
2258msgid "error adding pack %s"
2259msgstr "添加包 %s 出错"
2260
2b472aae 2261#: commit-graph.c:1190
c1ac5258
JX
2262#, c-format
2263msgid "error opening index for %s"
2264msgstr "为 %s 打开索引出错"
2265
2b472aae 2266#: commit-graph.c:1214
06991777
JX
2267#, c-format
2268msgid "Finding commits for commit graph from %d ref"
2269msgid_plural "Finding commits for commit graph from %d refs"
2270msgstr[0] "正在从 %d 个引用中查找提交图的提交"
2271msgstr[1] "正在从 %d 个引用中查找提交图的提交"
2272
2b472aae 2273#: commit-graph.c:1234
a5cd71ca
JX
2274#, c-format
2275msgid "invalid commit object id: %s"
2276msgstr "无效的提交对象 ID:%s"
2277
2b472aae 2278#: commit-graph.c:1249
06991777
JX
2279msgid "Finding commits for commit graph among packed objects"
2280msgstr "正在打包对象中查找提交图的提交"
2281
2b472aae 2282#: commit-graph.c:1264
06991777 2283msgid "Counting distinct commits in commit graph"
8e4e0555 2284msgstr "正在计算提交图中不同的提交"
06991777 2285
2b472aae 2286#: commit-graph.c:1294
06991777 2287msgid "Finding extra edges in commit graph"
8e4e0555 2288msgstr "正在查找提交图中额外的边"
06991777 2289
2b472aae 2290#: commit-graph.c:1340
a6cd2cc4
JX
2291msgid "failed to write correct number of base graph ids"
2292msgstr "无法写入正确数量的基础图形 ID"
fd8cb379 2293
2b472aae 2294#: commit-graph.c:1373 midx.c:814
fd8cb379 2295#, c-format
c1ac5258
JX
2296msgid "unable to create leading directories of %s"
2297msgstr "不能为 %s 创建先导目录"
2298
2b472aae 2299#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
a6cd2cc4
JX
2300#, c-format
2301msgid "unable to create '%s'"
2302msgstr "不能创建 '%s'"
2303
2b472aae 2304#: commit-graph.c:1445
06991777
JX
2305#, c-format
2306msgid "Writing out commit graph in %d pass"
2307msgid_plural "Writing out commit graph in %d passes"
8e4e0555
FZ
2308msgstr[0] "正在用 %d 步写出提交图"
2309msgstr[1] "正在用 %d 步写出提交图"
06991777 2310
2b472aae 2311#: commit-graph.c:1486
a6cd2cc4
JX
2312msgid "unable to open commit-graph chain file"
2313msgstr "无法打开提交图形链文件"
2314
2b472aae 2315#: commit-graph.c:1498
a6cd2cc4
JX
2316msgid "failed to rename base commit-graph file"
2317msgstr "无法重命名基础提交图形文件"
2318
2b472aae 2319#: commit-graph.c:1518
a6cd2cc4
JX
2320msgid "failed to rename temporary commit-graph file"
2321msgstr "无法重命名临时提交图形文件"
2322
2b472aae 2323#: commit-graph.c:1631
a6cd2cc4
JX
2324msgid "Scanning merged commits"
2325msgstr "正在扫描合并提交"
2326
2b472aae 2327#: commit-graph.c:1642
a6cd2cc4
JX
2328#, c-format
2329msgid "unexpected duplicate commit id %s"
2330msgstr "意外的重复提交 ID %s"
2331
2b472aae 2332#: commit-graph.c:1665
a6cd2cc4
JX
2333msgid "Merging commit-graph"
2334msgstr "正在合并提交图形"
2335
2b472aae 2336#: commit-graph.c:1844
a6cd2cc4
JX
2337#, c-format
2338msgid "the commit graph format cannot write %d commits"
2339msgstr "提交图格式不能写入 %d 个提交"
2340
2b472aae 2341#: commit-graph.c:1855
a6cd2cc4
JX
2342msgid "too many commits to write graph"
2343msgstr "提交太多不能画图"
2344
2b472aae 2345#: commit-graph.c:1944
c1ac5258 2346msgid "the commit-graph file has incorrect checksum and is likely corrupt"
4c27fcb5
JX
2347msgstr "提交图文件的校验码错误,可能已经损坏"
2348
2b472aae 2349#: commit-graph.c:1954
d46c5519
JX
2350#, c-format
2351msgid "commit-graph has incorrect OID order: %s then %s"
5b533632 2352msgstr "提交图形的对象 ID 顺序不正确:%s 然后 %s"
d46c5519 2353
2b472aae 2354#: commit-graph.c:1964 commit-graph.c:1979
d46c5519
JX
2355#, c-format
2356msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2357msgstr "提交图形有不正确的扇出值:fanout[%d] = %u != %u"
2358
2b472aae 2359#: commit-graph.c:1971
d46c5519
JX
2360#, c-format
2361msgid "failed to parse commit %s from commit-graph"
2362msgstr "无法从提交图形中解析提交 %s"
2363
2b472aae 2364#: commit-graph.c:1989
4c27fcb5 2365msgid "Verifying commits in commit graph"
8e4e0555 2366msgstr "正在校验提交图中的提交"
fd8cb379 2367
2b472aae 2368#: commit-graph.c:2003
d46c5519
JX
2369#, c-format
2370msgid "failed to parse commit %s from object database for commit-graph"
2371msgstr "无法从提交图形的对象库中解析提交 %s"
2372
2b472aae 2373#: commit-graph.c:2010
d46c5519
JX
2374#, c-format
2375msgid "root tree OID for commit %s in commit-graph is %s != %s"
5b533632 2376msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
d46c5519 2377
2b472aae 2378#: commit-graph.c:2020
d46c5519
JX
2379#, c-format
2380msgid "commit-graph parent list for commit %s is too long"
2381msgstr "提交 %s 的提交图形父提交列表太长了"
2382
2b472aae 2383#: commit-graph.c:2029
d46c5519
JX
2384#, c-format
2385msgid "commit-graph parent for %s is %s != %s"
2386msgstr "%s 的提交图形父提交是 %s != %s"
2387
2b472aae 2388#: commit-graph.c:2042
d46c5519
JX
2389#, c-format
2390msgid "commit-graph parent list for commit %s terminates early"
2391msgstr "提交 %s 的提交图形父提交列表过早终止"
2392
2b472aae 2393#: commit-graph.c:2047
d46c5519
JX
2394#, c-format
2395msgid ""
2396"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2397msgstr "提交图形中提交 %s 的世代号是零,但其它地方非零"
2398
2b472aae 2399#: commit-graph.c:2051
d46c5519
JX
2400#, c-format
2401msgid ""
2402"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2403msgstr "提交图形中提交 %s 的世代号非零,但其它地方是零"
2404
2b472aae 2405#: commit-graph.c:2066
d46c5519
JX
2406#, c-format
2407msgid "commit-graph generation for commit %s is %u != %u"
2408msgstr "提交图形中的提交 %s 的世代号是 %u != %u"
2409
2b472aae 2410#: commit-graph.c:2072
d46c5519
JX
2411#, c-format
2412msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2413msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
2414
06991777 2415#: compat/obstack.c:406 compat/obstack.c:408
a0b6b246
JX
2416msgid "memory exhausted"
2417msgstr "内存耗尽"
90314792 2418
a6cd2cc4 2419#: config.c:124
c1ac5258
JX
2420#, c-format
2421msgid ""
2422"exceeded maximum include depth (%d) while including\n"
2423"\t%s\n"
2424"from\n"
2425"\t%s\n"
2426"This might be due to circular includes."
2427msgstr ""
e640d114 2428"超过了最大包含深度(%1$d),当从\n"
c1ac5258
JX
2429"\t%3$s\n"
2430"包含\n"
2431"\t%2$s\n"
e640d114 2432"这可能是因为循环包含。"
c1ac5258 2433
a6cd2cc4 2434#: config.c:140
c1ac5258
JX
2435#, c-format
2436msgid "could not expand include path '%s'"
2437msgstr "无法扩展包含路径 '%s'"
2438
a6cd2cc4 2439#: config.c:151
c1ac5258
JX
2440msgid "relative config includes must come from files"
2441msgstr "相对路径的配置文件引用必须来自于文件"
2442
a6cd2cc4 2443#: config.c:197
87cb7997 2444msgid "relative config include conditionals must come from files"
c1ac5258
JX
2445msgstr "相对路径的配置文件条件引用必须来自于文件"
2446
a6cd2cc4 2447#: config.c:376
c1ac5258
JX
2448#, c-format
2449msgid "key does not contain a section: %s"
2450msgstr "键名没有包含一个小节名称:%s"
87cb7997 2451
a6cd2cc4 2452#: config.c:382
c1ac5258
JX
2453#, c-format
2454msgid "key does not contain variable name: %s"
2455msgstr "键名没有包含变量名:%s"
2456
2b472aae 2457#: config.c:406 sequencer.c:2444
c1ac5258
JX
2458#, c-format
2459msgid "invalid key: %s"
2460msgstr "无效键名:%s"
2461
a6cd2cc4 2462#: config.c:412
c1ac5258
JX
2463#, c-format
2464msgid "invalid key (newline): %s"
2465msgstr "无效键名(有换行符):%s"
2466
a6cd2cc4 2467#: config.c:448 config.c:460
c1ac5258
JX
2468#, c-format
2469msgid "bogus config parameter: %s"
2470msgstr "伪配置参数:%s"
2471
a6cd2cc4 2472#: config.c:495
c1ac5258
JX
2473#, c-format
2474msgid "bogus format in %s"
2475msgstr "%s 中格式错误"
2476
a6cd2cc4 2477#: config.c:821
90314792 2478#, c-format
a0b6b246
JX
2479msgid "bad config line %d in blob %s"
2480msgstr "数据对象 %2$s 中错误的配置行 %1$d"
90314792 2481
a6cd2cc4 2482#: config.c:825
a77c07d9 2483#, c-format
a0b6b246
JX
2484msgid "bad config line %d in file %s"
2485msgstr "文件 %2$s 中错误的配置行 %1$d"
a77c07d9 2486
a6cd2cc4 2487#: config.c:829
a77c07d9 2488#, c-format
a0b6b246
JX
2489msgid "bad config line %d in standard input"
2490msgstr "标准输入中错误的配置行 %d"
a77c07d9 2491
a6cd2cc4 2492#: config.c:833
90314792 2493#, c-format
a0b6b246
JX
2494msgid "bad config line %d in submodule-blob %s"
2495msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
90314792 2496
a6cd2cc4 2497#: config.c:837
90314792 2498#, c-format
a0b6b246
JX
2499msgid "bad config line %d in command line %s"
2500msgstr "命令行 %2$s 中错误的配置行 %1$d"
90314792 2501
a6cd2cc4 2502#: config.c:841
90314792 2503#, c-format
a0b6b246
JX
2504msgid "bad config line %d in %s"
2505msgstr "在 %2$s 中错误的配置行 %1$d"
220c313c 2506
a6cd2cc4 2507#: config.c:978
a0b6b246
JX
2508msgid "out of range"
2509msgstr "超出范围"
6c94aba5 2510
a6cd2cc4 2511#: config.c:978
a0b6b246
JX
2512msgid "invalid unit"
2513msgstr "无效的单位"
6c94aba5 2514
a6cd2cc4 2515#: config.c:979
6c94aba5 2516#, c-format
a0b6b246
JX
2517msgid "bad numeric config value '%s' for '%s': %s"
2518msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
6c94aba5 2519
a6cd2cc4 2520#: config.c:998
1b7f4a34 2521#, c-format
a0b6b246
JX
2522msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
2523msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 2524
a6cd2cc4 2525#: config.c:1001
1b7f4a34 2526#, c-format
a0b6b246
JX
2527msgid "bad numeric config value '%s' for '%s' in file %s: %s"
2528msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 2529
a6cd2cc4 2530#: config.c:1004
1b7f4a34 2531#, c-format
a0b6b246
JX
2532msgid "bad numeric config value '%s' for '%s' in standard input: %s"
2533msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
1b7f4a34 2534
a6cd2cc4 2535#: config.c:1007
1b7f4a34 2536#, c-format
a0b6b246
JX
2537msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
2538msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 2539
a6cd2cc4 2540#: config.c:1010
94550ed3 2541#, c-format
a0b6b246
JX
2542msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
2543msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 2544
a6cd2cc4 2545#: config.c:1013
276ceeaa 2546#, c-format
a0b6b246
JX
2547msgid "bad numeric config value '%s' for '%s' in %s: %s"
2548msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 2549
a6cd2cc4 2550#: config.c:1108
276ceeaa 2551#, c-format
a0b6b246 2552msgid "failed to expand user dir in: '%s'"
c1ac5258 2553msgstr "无法扩展用户目录:'%s'"
94550ed3 2554
a6cd2cc4 2555#: config.c:1117
5809aa05
JX
2556#, c-format
2557msgid "'%s' for '%s' is not a valid timestamp"
2558msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
2559
a6cd2cc4 2560#: config.c:1208
c1ac5258
JX
2561#, c-format
2562msgid "abbrev length out of range: %d"
2563msgstr "缩写长度超出范围:%d"
2564
a6cd2cc4 2565#: config.c:1222 config.c:1233
3495628d 2566#, c-format
a0b6b246
JX
2567msgid "bad zlib compression level %d"
2568msgstr "错误的 zlib 压缩级别 %d"
3495628d 2569
a6cd2cc4 2570#: config.c:1325
c1ac5258
JX
2571msgid "core.commentChar should only be one character"
2572msgstr "core.commentChar 应该是一个字符"
2573
a6cd2cc4 2574#: config.c:1358
3495628d 2575#, c-format
a0b6b246
JX
2576msgid "invalid mode for object creation: %s"
2577msgstr "无效的对象创建模式:%s"
3495628d 2578
ddc12c42 2579#: config.c:1430
c1ac5258
JX
2580#, c-format
2581msgid "malformed value for %s"
2582msgstr "%s 的取值格式错误"
2583
ddc12c42 2584#: config.c:1456
c1ac5258
JX
2585#, c-format
2586msgid "malformed value for %s: %s"
2587msgstr "%s 的取值格式错误:%s"
2588
ddc12c42 2589#: config.c:1457
c1ac5258
JX
2590msgid "must be one of nothing, matching, simple, upstream or current"
2591msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current"
2592
2b472aae 2593#: config.c:1518 builtin/pack-objects.c:3541
1a79b2f1
JX
2594#, c-format
2595msgid "bad pack compression level %d"
2596msgstr "错误的打包压缩级别 %d"
2597
ddc12c42 2598#: config.c:1639
c1ac5258
JX
2599#, c-format
2600msgid "unable to load config blob object '%s'"
2601msgstr "无法从数据对象 '%s' 加载配置"
2602
ddc12c42 2603#: config.c:1642
c1ac5258
JX
2604#, c-format
2605msgid "reference '%s' does not point to a blob"
2606msgstr "引用 '%s' 没有指向一个数据对象"
2607
ddc12c42 2608#: config.c:1659
c1ac5258
JX
2609#, c-format
2610msgid "unable to resolve config blob '%s'"
2611msgstr "不能解析配置对象 '%s'"
2612
ddc12c42 2613#: config.c:1689
c1ac5258
JX
2614#, c-format
2615msgid "failed to parse %s"
2616msgstr "解析 %s 失败"
2617
2b472aae 2618#: config.c:1743
a0b6b246
JX
2619msgid "unable to parse command-line config"
2620msgstr "无法解析命令行中的配置"
94550ed3 2621
2b472aae 2622#: config.c:2097
a0b6b246
JX
2623msgid "unknown error occurred while reading the configuration files"
2624msgstr "在读取配置文件时遇到未知错误"
94550ed3 2625
2b472aae 2626#: config.c:2267
87cb7997
JX
2627#, c-format
2628msgid "Invalid %s: '%s'"
2629msgstr "无效 %s:'%s'"
2630
2b472aae 2631#: config.c:2312
87cb7997
JX
2632#, c-format
2633msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2634msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
2635
2b472aae 2636#: config.c:2358
276ceeaa 2637#, c-format
a0b6b246
JX
2638msgid "unable to parse '%s' from command-line config"
2639msgstr "无法解析命令行配置中的 '%s'"
1b7f4a34 2640
2b472aae 2641#: config.c:2360
94550ed3 2642#, c-format
a0b6b246
JX
2643msgid "bad config variable '%s' in file '%s' at line %d"
2644msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
94550ed3 2645
2b472aae 2646#: config.c:2441
c1ac5258
JX
2647#, c-format
2648msgid "invalid section name '%s'"
2649msgstr "无效的小节名称 '%s'"
2650
2b472aae 2651#: config.c:2473
276ceeaa 2652#, c-format
a0b6b246
JX
2653msgid "%s has multiple values"
2654msgstr "%s 有多个取值"
276ceeaa 2655
2b472aae 2656#: config.c:2502
c1ac5258
JX
2657#, c-format
2658msgid "failed to write new configuration file %s"
2659msgstr "写入新的配置文件 %s 失败"
2660
2b472aae 2661#: config.c:2754 config.c:3078
c1ac5258
JX
2662#, c-format
2663msgid "could not lock config file %s"
2664msgstr "不能锁定配置文件 %s"
2665
2b472aae 2666#: config.c:2765
c1ac5258
JX
2667#, c-format
2668msgid "opening %s"
2669msgstr "打开 %s"
2670
2b472aae 2671#: config.c:2800 builtin/config.c:344
c1ac5258
JX
2672#, c-format
2673msgid "invalid pattern: %s"
2674msgstr "无效模式:%s"
2675
2b472aae 2676#: config.c:2825
c1ac5258
JX
2677#, c-format
2678msgid "invalid config file %s"
2679msgstr "无效的配置文件 %s"
2680
2b472aae 2681#: config.c:2838 config.c:3091
1a79b2f1
JX
2682#, c-format
2683msgid "fstat on %s failed"
65e2041e 2684msgstr "对 %s 调用 fstat 失败"
1a79b2f1 2685
2b472aae 2686#: config.c:2849
c1ac5258
JX
2687#, c-format
2688msgid "unable to mmap '%s'"
2689msgstr "不能 mmap '%s'"
2690
2b472aae 2691#: config.c:2858 config.c:3096
c1ac5258
JX
2692#, c-format
2693msgid "chmod on %s failed"
2694msgstr "对 %s 调用 chmod 失败"
2695
2b472aae 2696#: config.c:2943 config.c:3193
c1ac5258
JX
2697#, c-format
2698msgid "could not write config file %s"
2699msgstr "不能写入配置文件 %s"
2700
2b472aae 2701#: config.c:2977
94550ed3 2702#, c-format
a0b6b246
JX
2703msgid "could not set '%s' to '%s'"
2704msgstr "不能设置 '%s' 为 '%s'"
94550ed3 2705
2b472aae 2706#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
276ceeaa 2707#, c-format
a0b6b246
JX
2708msgid "could not unset '%s'"
2709msgstr "不能取消设置 '%s'"
276ceeaa 2710
2b472aae 2711#: config.c:3069
c1ac5258
JX
2712#, c-format
2713msgid "invalid section name: %s"
2714msgstr "无效的小节名称:%s"
2715
2b472aae 2716#: config.c:3236
c1ac5258
JX
2717#, c-format
2718msgid "missing value for '%s'"
2719msgstr "%s 的取值缺失"
2720
fd8cb379 2721#: connect.c:61
c1ac5258
JX
2722msgid "the remote end hung up upon initial contact"
2723msgstr "远端在初始连接时即挂断"
94550ed3 2724
fd8cb379 2725#: connect.c:63
a0b6b246
JX
2726msgid ""
2727"Could not read from remote repository.\n"
2728"\n"
2729"Please make sure you have the correct access rights\n"
2730"and the repository exists."
2731msgstr ""
2732"无法读取远程仓库。\n"
2733"\n"
2734"请确认您有正确的访问权限并且仓库存在。"
2735
c1ac5258
JX
2736#: connect.c:81
2737#, c-format
2738msgid "server doesn't support '%s'"
2739msgstr "服务器不支持 '%s'"
2740
2741#: connect.c:103
2742#, c-format
2743msgid "server doesn't support feature '%s'"
2744msgstr "服务器不支持特性 '%s'"
2745
2746#: connect.c:114
2747msgid "expected flush after capabilities"
2748msgstr "在能力之后应为一个 flush 包"
2749
2750#: connect.c:233
2751#, c-format
2752msgid "ignoring capabilities after first line '%s'"
e640d114 2753msgstr "忽略第一行 '%s' 之后的能力字段"
c1ac5258
JX
2754
2755#: connect.c:252
2756msgid "protocol error: unexpected capabilities^{}"
2757msgstr "协议错误:意外的 capabilities^{}"
2758
2759#: connect.c:273
2760#, c-format
2761msgid "protocol error: expected shallow sha-1, got '%s'"
2762msgstr "协议错误:预期浅克隆 sha-1,却得到 '%s'"
2763
2764#: connect.c:275
2765msgid "repository on the other end cannot be shallow"
2766msgstr "另一端的仓库不能是浅克隆仓库"
2767
06991777 2768#: connect.c:313
c1ac5258
JX
2769msgid "invalid packet"
2770msgstr "无效数据包"
2771
06991777 2772#: connect.c:333
c1ac5258
JX
2773#, c-format
2774msgid "protocol error: unexpected '%s'"
2775msgstr "协议错误:意外的 '%s'"
2776
06991777 2777#: connect.c:441
c1ac5258
JX
2778#, c-format
2779msgid "invalid ls-refs response: %s"
2780msgstr "无效的 ls-refs 响应:%s"
2781
06991777 2782#: connect.c:445
c1ac5258
JX
2783msgid "expected flush after ref listing"
2784msgstr "在引用列表之后应该有一个 flush 包"
2785
06991777 2786#: connect.c:544
c1ac5258
JX
2787#, c-format
2788msgid "protocol '%s' is not supported"
2789msgstr "不支持 '%s' 协议"
2790
06991777 2791#: connect.c:595
c1ac5258
JX
2792msgid "unable to set SO_KEEPALIVE on socket"
2793msgstr "无法为 socket 设置 SO_KEEPALIVE"
2794
06991777 2795#: connect.c:635 connect.c:698
c1ac5258
JX
2796#, c-format
2797msgid "Looking up %s ... "
2798msgstr "查找 %s ..."
2799
06991777 2800#: connect.c:639
c1ac5258
JX
2801#, c-format
2802msgid "unable to look up %s (port %s) (%s)"
2803msgstr "无法查找 %s(端口 %s)(%s)"
2804
2805#. TRANSLATORS: this is the end of "Looking up %s ... "
06991777 2806#: connect.c:643 connect.c:714
c1ac5258
JX
2807#, c-format
2808msgid ""
2809"done.\n"
2810"Connecting to %s (port %s) ... "
2811msgstr ""
2812"完成。\n"
2813"连接到 %s(端口 %s)... "
2814
06991777 2815#: connect.c:665 connect.c:742
c1ac5258
JX
2816#, c-format
2817msgid ""
2818"unable to connect to %s:\n"
2819"%s"
2820msgstr ""
2821"无法连接到 %s:\n"
2822"%s"
2823
2824#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
06991777 2825#: connect.c:671 connect.c:748
c1ac5258
JX
2826msgid "done."
2827msgstr "完成。"
2828
06991777 2829#: connect.c:702
c1ac5258
JX
2830#, c-format
2831msgid "unable to look up %s (%s)"
2832msgstr "无法查找 %s(%s)"
2833
06991777 2834#: connect.c:708
c1ac5258
JX
2835#, c-format
2836msgid "unknown port %s"
2837msgstr "未知端口 %s"
2838
a5cd71ca 2839#: connect.c:845 connect.c:1175
c1ac5258
JX
2840#, c-format
2841msgid "strange hostname '%s' blocked"
2842msgstr "已阻止奇怪的主机名 '%s'"
2843
06991777 2844#: connect.c:847
c1ac5258
JX
2845#, c-format
2846msgid "strange port '%s' blocked"
2847msgstr "已阻止奇怪的端口号 '%s'"
2848
06991777 2849#: connect.c:857
c1ac5258
JX
2850#, c-format
2851msgid "cannot start proxy %s"
2852msgstr "不能启动代理 %s"
2853
a5cd71ca 2854#: connect.c:928
c1ac5258
JX
2855msgid "no path specified; see 'git help pull' for valid url syntax"
2856msgstr "未指定路径,执行 'git help pull' 查看有效的 url 语法"
2857
a5cd71ca 2858#: connect.c:1123
c1ac5258
JX
2859msgid "ssh variant 'simple' does not support -4"
2860msgstr "ssh 变体 'simple' 不支持 -4"
2861
a5cd71ca 2862#: connect.c:1135
c1ac5258
JX
2863msgid "ssh variant 'simple' does not support -6"
2864msgstr "ssh 变体 'simple' 不支持 -6"
2865
a5cd71ca 2866#: connect.c:1152
c1ac5258 2867msgid "ssh variant 'simple' does not support setting port"
e640d114 2868msgstr "ssh 变体 'simple' 不支持设置端口"
c1ac5258 2869
a5cd71ca 2870#: connect.c:1264
c1ac5258
JX
2871#, c-format
2872msgid "strange pathname '%s' blocked"
2873msgstr "已阻止奇怪的路径名 '%s'"
2874
a5cd71ca 2875#: connect.c:1311
c1ac5258
JX
2876msgid "unable to fork"
2877msgstr "无法 fork"
2878
2b472aae 2879#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
a0b6b246 2880msgid "Checking connectivity"
06991777 2881msgstr "正在检查连通性"
a0b6b246 2882
2b472aae 2883#: connected.c:110
a0b6b246
JX
2884msgid "Could not run 'git rev-list'"
2885msgstr "不能执行 'git rev-list'"
2886
2b472aae 2887#: connected.c:130
a0b6b246 2888msgid "failed write to rev-list"
c1ac5258 2889msgstr "写入 rev-list 失败"
a0b6b246 2890
2b472aae 2891#: connected.c:137
a0b6b246 2892msgid "failed to close rev-list's stdin"
c1ac5258
JX
2893msgstr "关闭 rev-list 的标准输入失败"
2894
a5cd71ca 2895#: convert.c:194
c1ac5258
JX
2896#, c-format
2897msgid "illegal crlf_action %d"
2898msgstr "非法的 crlf 动作 %d"
a0b6b246 2899
a5cd71ca 2900#: convert.c:207
3495628d 2901#, c-format
c1ac5258
JX
2902msgid "CRLF would be replaced by LF in %s"
2903msgstr "%s 中的 CRLF 将被 LF 替换"
31e5e17b 2904
a5cd71ca 2905#: convert.c:209
31e5e17b 2906#, c-format
a0b6b246
JX
2907msgid ""
2908"CRLF will be replaced by LF in %s.\n"
c1ac5258 2909"The file will have its original line endings in your working directory"
a0b6b246 2910msgstr ""
c1ac5258 2911"%s 中的 CRLF 将被 LF 替换。<\n"
a0b6b246 2912"在工作区中该文件仍保持原有的换行符。"
3495628d 2913
a5cd71ca 2914#: convert.c:217
3495628d 2915#, c-format
31e5e17b
JX
2916msgid "LF would be replaced by CRLF in %s"
2917msgstr "文件 %s 中的 LF 将被 CRLF 替换"
3495628d 2918
a5cd71ca 2919#: convert.c:219
276ceeaa 2920#, c-format
a0b6b246
JX
2921msgid ""
2922"LF will be replaced by CRLF in %s.\n"
c1ac5258 2923"The file will have its original line endings in your working directory"
a0b6b246 2924msgstr ""
c1ac5258
JX
2925"%s 中的 LF 将被 CRLF 替换。\n"
2926"在工作区中该文件仍保持原有的换行符"
276ceeaa 2927
ddc12c42 2928#: convert.c:284
fd8cb379
JX
2929#, c-format
2930msgid "BOM is prohibited in '%s' if encoded as %s"
2931msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM"
2932
ddc12c42 2933#: convert.c:291
fd8cb379
JX
2934#, c-format
2935msgid ""
ddc12c42
JX
2936"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
2937"working-tree-encoding."
2b472aae
JX
2938msgstr ""
2939"文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%.*s 作为工作区编码。"
fd8cb379 2940
ddc12c42 2941#: convert.c:304
fd8cb379
JX
2942#, c-format
2943msgid "BOM is required in '%s' if encoded as %s"
2944msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM"
2945
ddc12c42 2946#: convert.c:306
fd8cb379
JX
2947#, c-format
2948msgid ""
2949"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
2950"%sLE (depending on the byte order) as working-tree-encoding."
2951msgstr ""
2952"文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字"
2953"节序)作为工作区编码。"
2954
ddc12c42 2955#: convert.c:419 convert.c:490
fd8cb379
JX
2956#, c-format
2957msgid "failed to encode '%s' from %s to %s"
2958msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
2959
ddc12c42 2960#: convert.c:462
fd8cb379
JX
2961#, c-format
2962msgid "encoding '%s' from %s to %s and back is not the same"
2963msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
2964
ddc12c42 2965#: convert.c:668
c1ac5258
JX
2966#, c-format
2967msgid "cannot fork to run external filter '%s'"
e640d114 2968msgstr "不能 fork 以执行外部过滤器 '%s'"
c1ac5258 2969
ddc12c42 2970#: convert.c:688
c1ac5258
JX
2971#, c-format
2972msgid "cannot feed the input to external filter '%s'"
e640d114 2973msgstr "不能将输入传递给外部过滤器 '%s'"
c1ac5258 2974
ddc12c42 2975#: convert.c:695
c1ac5258
JX
2976#, c-format
2977msgid "external filter '%s' failed %d"
e640d114 2978msgstr "外部过滤器 '%s' 失败码 %d"
c1ac5258 2979
ddc12c42 2980#: convert.c:730 convert.c:733
c1ac5258
JX
2981#, c-format
2982msgid "read from external filter '%s' failed"
2983msgstr "从外部过滤器 '%s' 读取失败"
2984
ddc12c42 2985#: convert.c:736 convert.c:791
c1ac5258
JX
2986#, c-format
2987msgid "external filter '%s' failed"
2988msgstr "外部过滤器 '%s' 失败"
2989
ddc12c42 2990#: convert.c:839
c1ac5258
JX
2991msgid "unexpected filter type"
2992msgstr "意外的过滤类型"
2993
ddc12c42 2994#: convert.c:850
c1ac5258
JX
2995msgid "path name too long for external filter"
2996msgstr "外部过滤器的路径名太长"
2997
ddc12c42 2998#: convert.c:924
c1ac5258
JX
2999#, c-format
3000msgid ""
3001"external filter '%s' is not available anymore although not all paths have "
3002"been filtered"
3003msgstr "外部过滤器 '%s' 不再可用,但并非所有路径都已过滤"
3004
ddc12c42 3005#: convert.c:1223
fd8cb379
JX
3006msgid "true/false are no valid working-tree-encodings"
3007msgstr "true/false 不是有效的工作区编码"
3008
ddc12c42 3009#: convert.c:1411 convert.c:1445
c1ac5258
JX
3010#, c-format
3011msgid "%s: clean filter '%s' failed"
3012msgstr "%s:clean 过滤器 '%s' 失败"
3013
ddc12c42 3014#: convert.c:1489
c1ac5258
JX
3015#, c-format
3016msgid "%s: smudge filter %s failed"
3017msgstr "%s:smudge 过滤器 %s 失败"
3018
a5cd71ca 3019#: date.c:138
a0b6b246
JX
3020msgid "in the future"
3021msgstr "在将来"
3495628d 3022
a5cd71ca 3023#: date.c:144
3495628d 3024#, c-format
a4f16749
JX
3025msgid "%<PRIuMAX> second ago"
3026msgid_plural "%<PRIuMAX> seconds ago"
3027msgstr[0] "%<PRIuMAX> 秒钟前"
3028msgstr[1] "%<PRIuMAX> 秒钟前"
3495628d 3029
a5cd71ca 3030#: date.c:151
3495628d 3031#, c-format
a4f16749
JX
3032msgid "%<PRIuMAX> minute ago"
3033msgid_plural "%<PRIuMAX> minutes ago"
3034msgstr[0] "%<PRIuMAX> 分钟前"
3035msgstr[1] "%<PRIuMAX> 分钟前"
3495628d 3036
a5cd71ca 3037#: date.c:158
3495628d 3038#, c-format
a4f16749
JX
3039msgid "%<PRIuMAX> hour ago"
3040msgid_plural "%<PRIuMAX> hours ago"
3041msgstr[0] "%<PRIuMAX> 小时前"
3042msgstr[1] "%<PRIuMAX> 小时前"
3495628d 3043
a5cd71ca 3044#: date.c:165
3495628d 3045#, c-format
a4f16749
JX
3046msgid "%<PRIuMAX> day ago"
3047msgid_plural "%<PRIuMAX> days ago"
3048msgstr[0] "%<PRIuMAX> 天前"
3049msgstr[1] "%<PRIuMAX> 天前"
3495628d 3050
a5cd71ca 3051#: date.c:171
94550ed3 3052#, c-format
a4f16749
JX
3053msgid "%<PRIuMAX> week ago"
3054msgid_plural "%<PRIuMAX> weeks ago"
3055msgstr[0] "%<PRIuMAX> 周前"
3056msgstr[1] "%<PRIuMAX> 周前"
94550ed3 3057
a5cd71ca 3058#: date.c:178
3495628d 3059#, c-format
a4f16749
JX
3060msgid "%<PRIuMAX> month ago"
3061msgid_plural "%<PRIuMAX> months ago"
3062msgstr[0] "%<PRIuMAX> 个月前"
3063msgstr[1] "%<PRIuMAX> 个月前"
3495628d 3064
a5cd71ca 3065#: date.c:189
3495628d 3066#, c-format
a4f16749
JX
3067msgid "%<PRIuMAX> year"
3068msgid_plural "%<PRIuMAX> years"
3069msgstr[0] "%<PRIuMAX> 年"
3070msgstr[1] "%<PRIuMAX> 年"
3495628d 3071
a0b6b246 3072#. TRANSLATORS: "%s" is "<n> years"
a5cd71ca 3073#: date.c:192
94550ed3 3074#, c-format
a4f16749
JX
3075msgid "%s, %<PRIuMAX> month ago"
3076msgid_plural "%s, %<PRIuMAX> months ago"
3077msgstr[0] "%s %<PRIuMAX> 个月前"
3078msgstr[1] "%s %<PRIuMAX> 个月前"
94550ed3 3079
a5cd71ca 3080#: date.c:197 date.c:202
94550ed3 3081#, c-format
a4f16749
JX
3082msgid "%<PRIuMAX> year ago"
3083msgid_plural "%<PRIuMAX> years ago"
3084msgstr[0] "%<PRIuMAX> 年前"
3085msgstr[1] "%<PRIuMAX> 年前"
94550ed3 3086
06991777 3087#: delta-islands.c:272
4c27fcb5
JX
3088msgid "Propagating island marks"
3089msgstr "正在传播数据岛标记"
3090
06991777 3091#: delta-islands.c:290
4c27fcb5
JX
3092#, c-format
3093msgid "bad tree object %s"
3094msgstr "坏的树对象 %s"
3095
06991777 3096#: delta-islands.c:334
4c27fcb5
JX
3097#, c-format
3098msgid "failed to load island regex for '%s': %s"
3099msgstr "未能加载 '%s' 的数据岛正则表达式:%s"
3100
06991777 3101#: delta-islands.c:390
4c27fcb5
JX
3102#, c-format
3103msgid "island regex from config has too many capture groups (max=%d)"
3104msgstr "来自 config 的数据岛正则表达式有太多的捕获组(最多 %d 个)"
3105
a6cd2cc4 3106#: delta-islands.c:467
4c27fcb5
JX
3107#, c-format
3108msgid "Marked %d islands, done.\n"
3109msgstr "已标记 %d 个数据岛,结束。\n"
3110
a0b6b246 3111#: diffcore-order.c:24
cfff71a9 3112#, c-format
a0b6b246 3113msgid "failed to read orderfile '%s'"
c1ac5258 3114msgstr "读取排序文件 '%s' 失败"
cfff71a9 3115
a5cd71ca 3116#: diffcore-rename.c:543
a0b6b246 3117msgid "Performing inexact rename detection"
87cb7997 3118msgstr "正在进行非精确的重命名探测"
cfff71a9 3119
d46c5519
JX
3120#: diff-no-index.c:238
3121msgid "git diff --no-index [<options>] <path> <path>"
3122msgstr "git diff --no-index [<选项>] <路径> <路径>"
3123
3124#: diff-no-index.c:263
3125msgid ""
3126"Not a git repository. Use --no-index to compare two paths outside a working "
3127"tree"
3128msgstr "不是一个 git 仓库。使用 --no-index 比较工作区之外的两个路径"
cfff71a9 3129
a0b6b246 3130# 译者:注意保持前导空格
d46c5519 3131#: diff.c:155
a0b6b246
JX
3132#, c-format
3133msgid " Failed to parse dirstat cut-off percentage '%s'\n"
3134msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
cfff71a9 3135
a0b6b246 3136# 译者:注意保持前导空格
d46c5519 3137#: diff.c:160
a0b6b246
JX
3138#, c-format
3139msgid " Unknown dirstat parameter '%s'\n"
3140msgstr " 未知的 dirstat 参数 '%s'\n"
7aea43ff 3141
d46c5519 3142#: diff.c:296
6937cb4e 3143msgid ""
c1ac5258
JX
3144"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
3145"'dimmed-zebra', 'plain'"
5809aa05 3146msgstr ""
c1ac5258
JX
3147"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "
3148"'plain'"
3149
d46c5519 3150#: diff.c:324
c1ac5258 3151#, c-format
06991777
JX
3152msgid ""
3153"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
3154"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
3155msgstr ""
3156"未知的 color-moved-ws 模式 '%s',可能的取值有 'ignore-space-change'、'ignore-"
3157"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
c1ac5258 3158
d46c5519 3159#: diff.c:332
c1ac5258 3160msgid ""
06991777
JX
3161"color-moved-ws: allow-indentation-change cannot be combined with other "
3162"whitespace modes"
c1ac5258 3163msgstr "color-moved-ws:allow-indentation-change 不能与其它空白字符模式共用"
6937cb4e 3164
d46c5519 3165#: diff.c:405
7aea43ff 3166#, c-format
a0b6b246
JX
3167msgid "Unknown value for 'diff.submodule' config variable: '%s'"
3168msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
7aea43ff 3169
d46c5519 3170#: diff.c:465
7aea43ff 3171#, c-format
a0b6b246
JX
3172msgid ""
3173"Found errors in 'diff.dirstat' config variable:\n"
3174"%s"
3175msgstr ""
3176"发现配置变量 'diff.dirstat' 中的错误:\n"
3177"%s"
7aea43ff 3178
ddc12c42 3179#: diff.c:4202
7aea43ff 3180#, c-format
a0b6b246
JX
3181msgid "external diff died, stopping at %s"
3182msgstr "外部 diff 退出,停止在 %s"
7aea43ff 3183
ddc12c42 3184#: diff.c:4547
a0b6b246
JX
3185msgid "--name-only, --name-status, --check and -s are mutually exclusive"
3186msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
3187
ddc12c42 3188#: diff.c:4550
31e5e17b
JX
3189msgid "-G, -S and --find-object are mutually exclusive"
3190msgstr "-G、-S 和 --find-object 是互斥的"
3191
ddc12c42 3192#: diff.c:4628
a0b6b246
JX
3193msgid "--follow requires exactly one pathspec"
3194msgstr "--follow 明确要求只跟一个路径规格"
3195
ddc12c42 3196#: diff.c:4676
d46c5519
JX
3197#, c-format
3198msgid "invalid --stat value: %s"
3199msgstr "无效的 --stat 值:%s"
3200
ddc12c42 3201#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
2b472aae 3202#: parse-options.c:197 parse-options.c:201
d46c5519
JX
3203#, c-format
3204msgid "%s expects a numerical value"
3205msgstr "%s 期望一个数字值"
3206
ddc12c42 3207#: diff.c:4713
7aea43ff 3208#, c-format
a0b6b246
JX
3209msgid ""
3210"Failed to parse --dirstat/-X option parameter:\n"
3211"%s"
3212msgstr ""
3213"无法解析 --dirstat/-X 选项的参数:\n"
3214"%s"
7aea43ff 3215
ddc12c42 3216#: diff.c:4798
d46c5519
JX
3217#, c-format
3218msgid "unknown change class '%c' in --diff-filter=%s"
3219msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
3220
ddc12c42 3221#: diff.c:4822
d46c5519
JX
3222#, c-format
3223msgid "unknown value after ws-error-highlight=%.*s"
3224msgstr "ws-error-highlight=%.*s 之后未知的值"
3225
ddc12c42 3226#: diff.c:4836
7aea43ff 3227#, c-format
d46c5519
JX
3228msgid "unable to resolve '%s'"
3229msgstr "不能解析 '%s'"
3230
ddc12c42 3231#: diff.c:4886 diff.c:4892
d46c5519
JX
3232#, c-format
3233msgid "%s expects <n>/<m> form"
3234msgstr "%s 期望 <n>/<m> 格式"
3235
ddc12c42 3236#: diff.c:4904
d46c5519
JX
3237#, c-format
3238msgid "%s expects a character, got '%s'"
3239msgstr "%s 期望一个字符,得到 '%s'"
3240
ddc12c42 3241#: diff.c:4925
d46c5519
JX
3242#, c-format
3243msgid "bad --color-moved argument: %s"
3244msgstr "坏的 --color-moved 参数:%s"
3245
ddc12c42 3246#: diff.c:4944
d46c5519
JX
3247#, c-format
3248msgid "invalid mode '%s' in --color-moved-ws"
3249msgstr "--color-moved-ws 中的无效模式 '%s' "
3250
ddc12c42 3251#: diff.c:4984
d46c5519
JX
3252msgid ""
3253"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3254"\"histogram\""
3255msgstr ""
3256"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3257
ddc12c42 3258#: diff.c:5020 diff.c:5040
d46c5519
JX
3259#, c-format
3260msgid "invalid argument to %s"
3261msgstr "%s 的参数无效"
3262
ddc12c42 3263#: diff.c:5178
d46c5519
JX
3264#, c-format
3265msgid "failed to parse --submodule option parameter: '%s'"
a0b6b246 3266msgstr "无法解析 --submodule 选项的参数:'%s'"
7aea43ff 3267
ddc12c42 3268#: diff.c:5234
d46c5519
JX
3269#, c-format
3270msgid "bad --word-diff argument: %s"
3271msgstr "坏的 --word-diff 参数:%s"
3272
ddc12c42 3273#: diff.c:5257
d46c5519
JX
3274msgid "Diff output format options"
3275msgstr "差异输出格式化选项"
3276
ddc12c42 3277#: diff.c:5259 diff.c:5265
d46c5519
JX
3278msgid "generate patch"
3279msgstr "生成补丁"
3280
ddc12c42 3281#: diff.c:5262 builtin/log.c:173
d46c5519
JX
3282msgid "suppress diff output"
3283msgstr "不显示差异输出"
3284
ddc12c42 3285#: diff.c:5267 diff.c:5381 diff.c:5388
d46c5519
JX
3286msgid "<n>"
3287msgstr "<n>"
3288
ddc12c42 3289#: diff.c:5268 diff.c:5271
d46c5519
JX
3290msgid "generate diffs with <n> lines context"
3291msgstr "生成含 <n> 行上下文的差异"
3292
ddc12c42 3293#: diff.c:5273
d46c5519
JX
3294msgid "generate the diff in raw format"
3295msgstr "生成原始格式的差异"
3296
ddc12c42 3297#: diff.c:5276
d46c5519
JX
3298msgid "synonym for '-p --raw'"
3299msgstr "和 '-p --raw' 同义"
3300
ddc12c42 3301#: diff.c:5280
d46c5519
JX
3302msgid "synonym for '-p --stat'"
3303msgstr "和 '-p --stat' 同义"
3304
ddc12c42 3305#: diff.c:5284
d46c5519
JX
3306msgid "machine friendly --stat"
3307msgstr "机器友好的 --stat"
3308
ddc12c42 3309#: diff.c:5287
d46c5519
JX
3310msgid "output only the last line of --stat"
3311msgstr "只输出 --stat 的最后一行"
3312
ddc12c42 3313#: diff.c:5289 diff.c:5297
d46c5519
JX
3314msgid "<param1,param2>..."
3315msgstr "<参数1,参数2>..."
3316
ddc12c42 3317#: diff.c:5290
d46c5519
JX
3318msgid ""
3319"output the distribution of relative amount of changes for each sub-directory"
3320msgstr "输出每个子目录相对变更的分布"
3321
ddc12c42 3322#: diff.c:5294
d46c5519
JX
3323msgid "synonym for --dirstat=cumulative"
3324msgstr "和 --dirstat=cumulative 同义"
3325
ddc12c42 3326#: diff.c:5298
d46c5519
JX
3327msgid "synonym for --dirstat=files,param1,param2..."
3328msgstr "是 --dirstat=files,param1,param2... 的同义词"
3329
ddc12c42 3330#: diff.c:5302
d46c5519
JX
3331msgid "warn if changes introduce conflict markers or whitespace errors"
3332msgstr "如果变更中引入冲突定界符或空白错误,给出警告"
3333
ddc12c42 3334#: diff.c:5305
d46c5519
JX
3335msgid "condensed summary such as creations, renames and mode changes"
3336msgstr "精简摘要,例如创建、重命名和模式变更"
3337
ddc12c42 3338#: diff.c:5308
d46c5519
JX
3339msgid "show only names of changed files"
3340msgstr "只显示变更文件的文件名"
3341
ddc12c42 3342#: diff.c:5311
d46c5519
JX
3343msgid "show only names and status of changed files"
3344msgstr "只显示变更文件的文件名和状态"
3345
ddc12c42 3346#: diff.c:5313
d46c5519
JX
3347msgid "<width>[,<name-width>[,<count>]]"
3348msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
3349
ddc12c42 3350#: diff.c:5314
d46c5519 3351msgid "generate diffstat"
5b533632 3352msgstr "生成差异统计(diffstat)"
d46c5519 3353
ddc12c42 3354#: diff.c:5316 diff.c:5319 diff.c:5322
d46c5519
JX
3355msgid "<width>"
3356msgstr "<宽度>"
3357
ddc12c42 3358#: diff.c:5317
d46c5519
JX
3359msgid "generate diffstat with a given width"
3360msgstr "使用给定的长度生成差异统计"
3361
ddc12c42 3362#: diff.c:5320
d46c5519
JX
3363msgid "generate diffstat with a given name width"
3364msgstr "使用给定的文件名长度生成差异统计"
3365
ddc12c42 3366#: diff.c:5323
d46c5519
JX
3367msgid "generate diffstat with a given graph width"
3368msgstr "使用给定的图形长度生成差异统计"
3369
ddc12c42 3370#: diff.c:5325
d46c5519
JX
3371msgid "<count>"
3372msgstr "<次数>"
3373
ddc12c42 3374#: diff.c:5326
d46c5519
JX
3375msgid "generate diffstat with limited lines"
3376msgstr "生成有限行数的差异统计"
3377
ddc12c42 3378#: diff.c:5329
d46c5519
JX
3379msgid "generate compact summary in diffstat"
3380msgstr "生成差异统计的简洁摘要"
3381
ddc12c42 3382#: diff.c:5332
d46c5519
JX
3383msgid "output a binary diff that can be applied"
3384msgstr "输出一个可以应用的二进制差异"
3385
ddc12c42 3386#: diff.c:5335
d46c5519
JX
3387msgid "show full pre- and post-image object names on the \"index\" lines"
3388msgstr "在 \"index\" 行显示完整的前后对象名称"
3389
ddc12c42 3390#: diff.c:5337
d46c5519
JX
3391msgid "show colored diff"
3392msgstr "显示带颜色的差异"
3393
ddc12c42 3394#: diff.c:5338
d46c5519
JX
3395msgid "<kind>"
3396msgstr "<类型>"
3397
ddc12c42 3398#: diff.c:5339
d46c5519
JX
3399msgid ""
3400"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3401"diff"
3402msgstr "对于差异中的上下文、旧的和新的行,加亮显示错误的空白字符"
3403
ddc12c42 3404#: diff.c:5342
d46c5519
JX
3405msgid ""
3406"do not munge pathnames and use NULs as output field terminators in --raw or "
3407"--numstat"
3408msgstr ""
3409"在 --raw 或者 --numstat 中,不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
3410"符"
3411
ddc12c42 3412#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
d46c5519
JX
3413msgid "<prefix>"
3414msgstr "<前缀>"
3415
ddc12c42 3416#: diff.c:5346
d46c5519
JX
3417msgid "show the given source prefix instead of \"a/\""
3418msgstr "显示给定的源前缀取代 \"a/\""
3419
ddc12c42 3420#: diff.c:5349
d46c5519
JX
3421msgid "show the given destination prefix instead of \"b/\""
3422msgstr "显示给定的目标前缀取代 \"b/\""
3423
ddc12c42 3424#: diff.c:5352
d46c5519
JX
3425msgid "prepend an additional prefix to every line of output"
3426msgstr "输出的每一行附加前缀"
3427
ddc12c42 3428#: diff.c:5355
d46c5519
JX
3429msgid "do not show any source or destination prefix"
3430msgstr "不显示任何源和目标前缀"
3431
ddc12c42 3432#: diff.c:5358
d46c5519
JX
3433msgid "show context between diff hunks up to the specified number of lines"
3434msgstr "显示指定行数的差异块间的上下文"
3435
ddc12c42 3436#: diff.c:5362 diff.c:5367 diff.c:5372
d46c5519
JX
3437msgid "<char>"
3438msgstr "<字符>"
3439
ddc12c42 3440#: diff.c:5363
d46c5519
JX
3441msgid "specify the character to indicate a new line instead of '+'"
3442msgstr "指定一个字符取代 '+' 来表示新的一行"
3443
ddc12c42 3444#: diff.c:5368
d46c5519
JX
3445msgid "specify the character to indicate an old line instead of '-'"
3446msgstr "指定一个字符取代 '-' 来表示旧的一行"
3447
ddc12c42 3448#: diff.c:5373
d46c5519
JX
3449msgid "specify the character to indicate a context instead of ' '"
3450msgstr "指定一个字符取代 ' ' 来表示一行上下文"
3451
ddc12c42 3452#: diff.c:5376
d46c5519
JX
3453msgid "Diff rename options"
3454msgstr "差异重命名选项"
3455
ddc12c42 3456#: diff.c:5377
d46c5519
JX
3457msgid "<n>[/<m>]"
3458msgstr "<n>[/<m>]"
3459
ddc12c42 3460#: diff.c:5378
d46c5519 3461msgid "break complete rewrite changes into pairs of delete and create"
5b533632 3462msgstr "将完全重写的变更打破为成对的删除和创建"
d46c5519 3463
ddc12c42 3464#: diff.c:5382
d46c5519
JX
3465msgid "detect renames"
3466msgstr "检测重命名"
3467
ddc12c42 3468#: diff.c:5386
d46c5519
JX
3469msgid "omit the preimage for deletes"
3470msgstr "省略删除操作的差异输出"
3471
ddc12c42 3472#: diff.c:5389
d46c5519
JX
3473msgid "detect copies"
3474msgstr "检测拷贝"
3475
ddc12c42 3476#: diff.c:5393
d46c5519
JX
3477msgid "use unmodified files as source to find copies"
3478msgstr "使用未修改的文件做为发现拷贝的源"
3479
ddc12c42 3480#: diff.c:5395
d46c5519
JX
3481msgid "disable rename detection"
3482msgstr "禁用重命名探测"
3483
ddc12c42 3484#: diff.c:5398
d46c5519
JX
3485msgid "use empty blobs as rename source"
3486msgstr "使用空的数据对象做为重命名的源"
3487
ddc12c42 3488#: diff.c:5400
d46c5519
JX
3489msgid "continue listing the history of a file beyond renames"
3490msgstr "继续列出文件重命名以外的历史记录"
3491
ddc12c42 3492#: diff.c:5403
d46c5519
JX
3493msgid ""
3494"prevent rename/copy detection if the number of rename/copy targets exceeds "
3495"given limit"
3496msgstr "如果重命名/拷贝目标超过给定的限制,禁止重命名/拷贝检测"
3497
ddc12c42 3498#: diff.c:5405
d46c5519
JX
3499msgid "Diff algorithm options"
3500msgstr "差异算法选项"
3501
ddc12c42 3502#: diff.c:5407
d46c5519
JX
3503msgid "produce the smallest possible diff"
3504msgstr "生成尽可能小的差异"
3505
ddc12c42 3506#: diff.c:5410
d46c5519
JX
3507msgid "ignore whitespace when comparing lines"
3508msgstr "行比较时忽略空白字符"
3509
ddc12c42 3510#: diff.c:5413
d46c5519
JX
3511msgid "ignore changes in amount of whitespace"
3512msgstr "忽略空白字符的变更"
3513
ddc12c42 3514#: diff.c:5416
d46c5519
JX
3515msgid "ignore changes in whitespace at EOL"
3516msgstr "忽略行尾的空白字符变更"
3517
ddc12c42 3518#: diff.c:5419
d46c5519
JX
3519msgid "ignore carrier-return at the end of line"
3520msgstr "忽略行尾的回车符(CR)"
3521
ddc12c42 3522#: diff.c:5422
d46c5519
JX
3523msgid "ignore changes whose lines are all blank"
3524msgstr "忽略整行都是空白的变更"
3525
ddc12c42 3526#: diff.c:5425
d46c5519
JX
3527msgid "heuristic to shift diff hunk boundaries for easy reading"
3528msgstr "启发式转换差异边界以便阅读"
3529
ddc12c42 3530#: diff.c:5428
d46c5519
JX
3531msgid "generate diff using the \"patience diff\" algorithm"
3532msgstr "使用 \"patience diff\" 算法生成差异"
3533
ddc12c42 3534#: diff.c:5432
d46c5519
JX
3535msgid "generate diff using the \"histogram diff\" algorithm"
3536msgstr "使用 \"histogram diff\" 算法生成差异"
3537
ddc12c42 3538#: diff.c:5434
d46c5519
JX
3539msgid "<algorithm>"
3540msgstr "<算法>"
3541
ddc12c42 3542#: diff.c:5435
d46c5519
JX
3543msgid "choose a diff algorithm"
3544msgstr "选择一个差异算法"
3545
ddc12c42 3546#: diff.c:5437
d46c5519
JX
3547msgid "<text>"
3548msgstr "<文本>"
3549
ddc12c42 3550#: diff.c:5438
d46c5519 3551msgid "generate diff using the \"anchored diff\" algorithm"
5b533632 3552msgstr "使用 \"anchored diff\" 算法生成差异"
d46c5519 3553
ddc12c42 3554#: diff.c:5440 diff.c:5449 diff.c:5452
d46c5519
JX
3555msgid "<mode>"
3556msgstr "<模式>"
3557
ddc12c42 3558#: diff.c:5441
d46c5519
JX
3559msgid "show word diff, using <mode> to delimit changed words"
3560msgstr "显示单词差异,使用 <模式> 分隔变更的单词"
3561
ddc12c42 3562#: diff.c:5443 diff.c:5446 diff.c:5491
d46c5519
JX
3563msgid "<regex>"
3564msgstr "<正则>"
3565
ddc12c42 3566#: diff.c:5444
d46c5519
JX
3567msgid "use <regex> to decide what a word is"
3568msgstr "使用 <正则表达式> 确定何为一个词"
3569
ddc12c42 3570#: diff.c:5447
d46c5519
JX
3571msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3572msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
3573
ddc12c42 3574#: diff.c:5450
d46c5519
JX
3575msgid "moved lines of code are colored differently"
3576msgstr "移动的代码行用不同方式着色"
3577
ddc12c42 3578#: diff.c:5453
d46c5519
JX
3579msgid "how white spaces are ignored in --color-moved"
3580msgstr "在 --color-moved 下如何忽略空白字符"
3581
ddc12c42 3582#: diff.c:5456
d46c5519
JX
3583msgid "Other diff options"
3584msgstr "其它差异选项"
3585
ddc12c42 3586#: diff.c:5458
d46c5519
JX
3587msgid "when run from subdir, exclude changes outside and show relative paths"
3588msgstr "当从子目录运行,排除目录之外的变更并显示相对路径"
3589
ddc12c42 3590#: diff.c:5462
d46c5519
JX
3591msgid "treat all files as text"
3592msgstr "把所有文件当做文本处理"
3593
ddc12c42 3594#: diff.c:5464
d46c5519
JX
3595msgid "swap two inputs, reverse the diff"
3596msgstr "交换两个输入,反转差异"
3597
ddc12c42 3598#: diff.c:5466
d46c5519
JX
3599msgid "exit with 1 if there were differences, 0 otherwise"
3600msgstr "有差异时退出码为 1,否则为 0"
3601
ddc12c42 3602#: diff.c:5468
d46c5519
JX
3603msgid "disable all output of the program"
3604msgstr "禁用本程序的所有输出"
3605
ddc12c42 3606#: diff.c:5470
d46c5519
JX
3607msgid "allow an external diff helper to be executed"
3608msgstr "允许执行一个外置的差异助手"
3609
ddc12c42 3610#: diff.c:5472
d46c5519
JX
3611msgid "run external text conversion filters when comparing binary files"
3612msgstr "当比较二进制文件时,运行外部的文本转换过滤器"
3613
ddc12c42 3614#: diff.c:5474
d46c5519
JX
3615msgid "<when>"
3616msgstr "<何时>"
3617
ddc12c42 3618#: diff.c:5475
d46c5519
JX
3619msgid "ignore changes to submodules in the diff generation"
3620msgstr "在生成差异时,忽略子模组的更改"
3621
ddc12c42 3622#: diff.c:5478
d46c5519
JX
3623msgid "<format>"
3624msgstr "<格式>"
3625
ddc12c42 3626#: diff.c:5479
d46c5519
JX
3627msgid "specify how differences in submodules are shown"
3628msgstr "指定子模组的差异如何显示"
3629
ddc12c42 3630#: diff.c:5483
d46c5519
JX
3631msgid "hide 'git add -N' entries from the index"
3632msgstr "隐藏索引中 'git add -N' 条目"
3633
ddc12c42 3634#: diff.c:5486
d46c5519
JX
3635msgid "treat 'git add -N' entries as real in the index"
3636msgstr "将索引中 'git add -N' 条目当做真实的"
3637
ddc12c42 3638#: diff.c:5488
d46c5519
JX
3639msgid "<string>"
3640msgstr "<字符串>"
3641
ddc12c42 3642#: diff.c:5489
d46c5519
JX
3643msgid ""
3644"look for differences that change the number of occurrences of the specified "
3645"string"
3646msgstr "查找改变了指定字符串出现次数的差异"
3647
ddc12c42 3648#: diff.c:5492
d46c5519
JX
3649msgid ""
3650"look for differences that change the number of occurrences of the specified "
3651"regex"
3652msgstr "查找改变指定正则匹配出现次数的差异"
3653
ddc12c42 3654#: diff.c:5495
d46c5519
JX
3655msgid "show all changes in the changeset with -S or -G"
3656msgstr "显示使用 -S 或 -G 的变更集的所有变更"
3657
ddc12c42 3658#: diff.c:5498
d46c5519
JX
3659msgid "treat <string> in -S as extended POSIX regular expression"
3660msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
3661
ddc12c42 3662#: diff.c:5501
d46c5519
JX
3663msgid "control the order in which files appear in the output"
3664msgstr "控制输出中的文件显示顺序"
3665
ddc12c42 3666#: diff.c:5502
d46c5519 3667msgid "<object-id>"
5b533632 3668msgstr "<对象 ID>"
d46c5519 3669
ddc12c42 3670#: diff.c:5503
d46c5519
JX
3671msgid ""
3672"look for differences that change the number of occurrences of the specified "
3673"object"
3674msgstr "查找改变指定对象出现次数的差异"
3675
ddc12c42 3676#: diff.c:5505
d46c5519
JX
3677msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3678msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
3679
ddc12c42 3680#: diff.c:5506
d46c5519
JX
3681msgid "select files by diff type"
3682msgstr "通过差异类型选择文件"
3683
ddc12c42 3684#: diff.c:5508
d46c5519
JX
3685msgid "<file>"
3686msgstr "<文件>"
3687
ddc12c42 3688#: diff.c:5509
d46c5519
JX
3689msgid "Output to a specific file"
3690msgstr "输出到一个指定的文件"
3691
ddc12c42 3692#: diff.c:6164
a0b6b246
JX
3693msgid "inexact rename detection was skipped due to too many files."
3694msgstr "因为文件太多,略过不严格的重命名检查。"
3695
ddc12c42 3696#: diff.c:6167
a0b6b246
JX
3697msgid "only found copies from modified paths due to too many files."
3698msgstr "因为文件太多,只在修改的路径中查找拷贝。"
3699
ddc12c42 3700#: diff.c:6170
7aea43ff 3701#, c-format
a0b6b246
JX
3702msgid ""
3703"you may want to set your %s variable to at least %d and retry the command."
29004bbb 3704msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
7aea43ff 3705
2b472aae 3706#: dir.c:555
c1ac5258
JX
3707#, c-format
3708msgid "pathspec '%s' did not match any file(s) known to git"
3709msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
3710
2b472aae 3711#: dir.c:695 dir.c:724 dir.c:737
ddc12c42
JX
3712#, c-format
3713msgid "unrecognized pattern: '%s'"
3714msgstr "未识别的模式:'%s'"
3715
2b472aae 3716#: dir.c:754 dir.c:768
ddc12c42
JX
3717#, c-format
3718msgid "unrecognized negative pattern: '%s'"
3719msgstr "未识别的反向模式:'%s'"
3720
2b472aae 3721#: dir.c:786
ddc12c42
JX
3722#, c-format
3723msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
3724msgstr "您的 sparse-checkout 文件可能有问题:重复的模式 '%s'"
3725
2b472aae 3726#: dir.c:796
ddc12c42
JX
3727msgid "disabling cone pattern matching"
3728msgstr "禁止 cone 模式匹配"
3729
2b472aae 3730#: dir.c:1173
c1ac5258
JX
3731#, c-format
3732msgid "cannot use %s as an exclude file"
3733msgstr "不能将 %s 用作排除文件"
3734
2b472aae 3735#: dir.c:2144
31e5e17b
JX
3736#, c-format
3737msgid "could not open directory '%s'"
3738msgstr "不能打开目录 '%s'"
3739
2b472aae 3740#: dir.c:2479
a0b6b246
JX
3741msgid "failed to get kernel name and information"
3742msgstr "无法获得内核名称和信息"
7aea43ff 3743
2b472aae 3744#: dir.c:2603
c1ac5258
JX
3745msgid "untracked cache is disabled on this system or location"
3746msgstr "缓存未跟踪文件在本系统或位置中被禁用"
3747
2b472aae 3748#: dir.c:3407
c1ac5258
JX
3749#, c-format
3750msgid "index file corrupt in repo %s"
3751msgstr "仓库 %s 中的索引文件损坏"
7aea43ff 3752
2b472aae 3753#: dir.c:3452 dir.c:3457
87cb7997
JX
3754#, c-format
3755msgid "could not create directories for %s"
3756msgstr "不能为 %s 创建目录"
3757
2b472aae 3758#: dir.c:3486
1a79b2f1
JX
3759#, c-format
3760msgid "could not migrate git directory from '%s' to '%s'"
3761msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
3762
4c27fcb5 3763#: editor.c:73
5809aa05
JX
3764#, c-format
3765msgid "hint: Waiting for your editor to close the file...%c"
3766msgstr "提示:等待您的编辑器关闭文件...%c"
3767
c1ac5258 3768#: entry.c:178
6937cb4e
JX
3769msgid "Filtering content"
3770msgstr "过滤内容"
3771
d46c5519 3772#: entry.c:476
87cb7997
JX
3773#, c-format
3774msgid "could not stat file '%s'"
65e2041e 3775msgstr "不能对文件 '%s' 调用 stat"
87cb7997 3776
ddc12c42 3777#: environment.c:149
c1ac5258
JX
3778#, c-format
3779msgid "bad git namespace path \"%s\""
e640d114 3780msgstr "错误的 git 名字空间路径 \"%s\""
c1ac5258 3781
ddc12c42 3782#: environment.c:331
c1ac5258
JX
3783#, c-format
3784msgid "could not set GIT_DIR to '%s'"
3785msgstr "不能设置 GIT_DIR 为 '%s'"
3786
d46c5519 3787#: exec-cmd.c:363
c1ac5258
JX
3788#, c-format
3789msgid "too many args to run %s"
3790msgstr "执行 %s 的参数太多"
3791
a5cd71ca 3792#: fetch-pack.c:150
a0b6b246
JX
3793msgid "git fetch-pack: expected shallow list"
3794msgstr "git fetch-pack:应为 shallow 列表"
3795
a5cd71ca 3796#: fetch-pack.c:153
06991777
JX
3797msgid "git fetch-pack: expected a flush packet after shallow list"
3798msgstr "git fetch-pack:在浅克隆列表之后期望一个 flush 包"
3799
a5cd71ca 3800#: fetch-pack.c:164
31e5e17b
JX
3801msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
3802msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包"
a0b6b246 3803
a5cd71ca 3804#: fetch-pack.c:184
90314792 3805#, c-format
275588f9 3806msgid "git fetch-pack: expected ACK/NAK, got '%s'"
a0b6b246 3807msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
90314792 3808
a5cd71ca 3809#: fetch-pack.c:195
d46c5519
JX
3810msgid "unable to write to remote"
3811msgstr "无法写到远程"
3812
a5cd71ca 3813#: fetch-pack.c:257
a0b6b246
JX
3814msgid "--stateless-rpc requires multi_ack_detailed"
3815msgstr "--stateless-rpc 需要 multi_ack_detailed"
90314792 3816
ddc12c42 3817#: fetch-pack.c:356 fetch-pack.c:1340
90314792 3818#, c-format
a0b6b246
JX
3819msgid "invalid shallow line: %s"
3820msgstr "无效的 shallow 信息:%s"
90314792 3821
ddc12c42 3822#: fetch-pack.c:362 fetch-pack.c:1346
c04f5ac3 3823#, c-format
a0b6b246
JX
3824msgid "invalid unshallow line: %s"
3825msgstr "无效的 unshallow 信息:%s"
c04f5ac3 3826
ddc12c42 3827#: fetch-pack.c:364 fetch-pack.c:1348
a0b6b246
JX
3828#, c-format
3829msgid "object not found: %s"
3830msgstr "对象未找到:%s"
07432cef 3831
ddc12c42 3832#: fetch-pack.c:367 fetch-pack.c:1351
c04f5ac3 3833#, c-format
a0b6b246
JX
3834msgid "error in object: %s"
3835msgstr "对象中出错:%s"
07432cef 3836
ddc12c42 3837#: fetch-pack.c:369 fetch-pack.c:1353
c04f5ac3 3838#, c-format
a0b6b246
JX
3839msgid "no shallow found: %s"
3840msgstr "未发现 shallow:%s"
c04f5ac3 3841
ddc12c42 3842#: fetch-pack.c:372 fetch-pack.c:1357
a0b6b246
JX
3843#, c-format
3844msgid "expected shallow/unshallow, got %s"
3845msgstr "应为 shallow/unshallow,却得到 %s"
07432cef 3846
a5cd71ca 3847#: fetch-pack.c:414
a0b6b246
JX
3848#, c-format
3849msgid "got %s %d %s"
3850msgstr "得到 %s %d %s"
1b7f4a34 3851
a5cd71ca 3852#: fetch-pack.c:431
1b7f4a34 3853#, c-format
a0b6b246
JX
3854msgid "invalid commit %s"
3855msgstr "无效提交 %s"
1b7f4a34 3856
a5cd71ca 3857#: fetch-pack.c:462
a0b6b246
JX
3858msgid "giving up"
3859msgstr "放弃"
814ff314 3860
ddc12c42 3861#: fetch-pack.c:475 progress.c:323
a0b6b246
JX
3862msgid "done"
3863msgstr "完成"
2e8451e8 3864
a5cd71ca 3865#: fetch-pack.c:487
2e8451e8 3866#, c-format
a0b6b246
JX
3867msgid "got %s (%d) %s"
3868msgstr "得到 %s (%d) %s"
2e8451e8 3869
a5cd71ca 3870#: fetch-pack.c:533
a0b6b246
JX
3871#, c-format
3872msgid "Marking %s as complete"
3873msgstr "标记 %s 为完成"
220c313c 3874
ddc12c42 3875#: fetch-pack.c:754
a0b6b246
JX
3876#, c-format
3877msgid "already have %s (%s)"
29004bbb 3878msgstr "已经有 %s(%s)"
220c313c 3879
ddc12c42 3880#: fetch-pack.c:818
a0b6b246
JX
3881msgid "fetch-pack: unable to fork off sideband demultiplexer"
3882msgstr "fetch-pack:无法派生 sideband 多路输出"
1b7f4a34 3883
ddc12c42 3884#: fetch-pack.c:826
a0b6b246
JX
3885msgid "protocol error: bad pack header"
3886msgstr "协议错误:坏的包头"
814ff314 3887
ddc12c42 3888#: fetch-pack.c:900
a0b6b246
JX
3889#, c-format
3890msgid "fetch-pack: unable to fork off %s"
3891msgstr "fetch-pack:无法派生进程 %s"
5c57d762 3892
ddc12c42 3893#: fetch-pack.c:916
a0b6b246
JX
3894#, c-format
3895msgid "%s failed"
3896msgstr "%s 失败"
14c8bced 3897
ddc12c42 3898#: fetch-pack.c:918
a0b6b246
JX
3899msgid "error in sideband demultiplexer"
3900msgstr "sideband 多路输出出错"
c04f5ac3 3901
ddc12c42 3902#: fetch-pack.c:965
81809b99 3903#, c-format
a0b6b246
JX
3904msgid "Server version is %.*s"
3905msgstr "服务器版本 %.*s"
8ada9598 3906
ddc12c42
JX
3907#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
3908#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
3909#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
3910#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
a6cd2cc4
JX
3911#, c-format
3912msgid "Server supports %s"
3913msgstr "服务器支持 %s"
3914
ddc12c42 3915#: fetch-pack.c:972
a6cd2cc4
JX
3916msgid "Server does not support shallow clients"
3917msgstr "服务器不支持 shalllow 客户端"
3918
ddc12c42 3919#: fetch-pack.c:1032
a0b6b246
JX
3920msgid "Server does not support --shallow-since"
3921msgstr "服务器不支持 --shallow-since"
8ada9598 3922
ddc12c42 3923#: fetch-pack.c:1037
a0b6b246
JX
3924msgid "Server does not support --shallow-exclude"
3925msgstr "服务器不支持 --shallow-exclude"
c04f5ac3 3926
ddc12c42 3927#: fetch-pack.c:1041
a0b6b246
JX
3928msgid "Server does not support --deepen"
3929msgstr "服务器不支持 --deepen"
c04f5ac3 3930
ddc12c42 3931#: fetch-pack.c:1058
a0b6b246
JX
3932msgid "no common commits"
3933msgstr "没有共同的提交"
c04f5ac3 3934
ddc12c42 3935#: fetch-pack.c:1070 fetch-pack.c:1536
a0b6b246
JX
3936msgid "git fetch-pack: fetch failed."
3937msgstr "git fetch-pack:获取失败。"
c04f5ac3 3938
ddc12c42 3939#: fetch-pack.c:1209
fd8cb379
JX
3940msgid "Server does not support shallow requests"
3941msgstr "服务器不支持 shalllow 请求"
3942
ddc12c42 3943#: fetch-pack.c:1216
a6cd2cc4
JX
3944msgid "Server supports filter"
3945msgstr "服务器支持 filter"
3946
ddc12c42 3947#: fetch-pack.c:1239
d46c5519
JX
3948msgid "unable to write request to remote"
3949msgstr "无法将请求写到远程"
3950
ddc12c42 3951#: fetch-pack.c:1257
c1ac5258
JX
3952#, c-format
3953msgid "error reading section header '%s'"
3954msgstr "读取节标题 '%s' 出错"
3955
ddc12c42 3956#: fetch-pack.c:1263
c1ac5258
JX
3957#, c-format
3958msgid "expected '%s', received '%s'"
3959msgstr "预期 '%s',得到 '%s'"
3960
ddc12c42 3961#: fetch-pack.c:1303
c1ac5258
JX
3962#, c-format
3963msgid "unexpected acknowledgment line: '%s'"
3964msgstr "意外的确认行:'%s'"
3965
ddc12c42 3966#: fetch-pack.c:1308
c1ac5258
JX
3967#, c-format
3968msgid "error processing acks: %d"
3969msgstr "处理 ack 出错:%d"
3970
ddc12c42 3971#: fetch-pack.c:1318
4c27fcb5
JX
3972msgid "expected packfile to be sent after 'ready'"
3973msgstr "预期在 'ready' 之后发送 packfile"
3974
ddc12c42 3975#: fetch-pack.c:1320
4c27fcb5
JX
3976msgid "expected no other sections to be sent after no 'ready'"
3977msgstr "在没有 'ready' 不应该发送其它小节"
3978
ddc12c42 3979#: fetch-pack.c:1362
c1ac5258
JX
3980#, c-format
3981msgid "error processing shallow info: %d"
3982msgstr "处理浅克隆信息出错:%d"
3983
ddc12c42 3984#: fetch-pack.c:1409
c1ac5258
JX
3985#, c-format
3986msgid "expected wanted-ref, got '%s'"
3987msgstr "预期 wanted-ref,得到 '%s'"
3988
ddc12c42 3989#: fetch-pack.c:1414
c1ac5258
JX
3990#, c-format
3991msgid "unexpected wanted-ref: '%s'"
3992msgstr "意外的 wanted-ref:'%s'"
3993
ddc12c42 3994#: fetch-pack.c:1419
c1ac5258
JX
3995#, c-format
3996msgid "error processing wanted refs: %d"
3997msgstr "处理要获取的引用出错:%d"
3998
ddc12c42 3999#: fetch-pack.c:1762
a0b6b246
JX
4000msgid "no matching remote head"
4001msgstr "没有匹配的远程分支"
c04f5ac3 4002
2b472aae 4003#: fetch-pack.c:1785 builtin/clone.c:689
c1ac5258 4004msgid "remote did not send all necessary objects"
e640d114 4005msgstr "远程没有发送所有必需的对象"
c1ac5258 4006
ddc12c42 4007#: fetch-pack.c:1812
87cb7997
JX
4008#, c-format
4009msgid "no such remote ref %s"
4010msgstr "没有这样的远程引用 %s"
4011
ddc12c42 4012#: fetch-pack.c:1815
87cb7997
JX
4013#, c-format
4014msgid "Server does not allow request for unadvertised object %s"
4015msgstr "服务器不允许请求未公开的对象 %s"
4016
2b472aae
JX
4017#: gpg-interface.c:408
4018msgid "gpg failed to sign the data"
440e7442 4019msgstr "gpg 数据签名失败"
2b472aae
JX
4020
4021#: gpg-interface.c:434
a0b6b246
JX
4022msgid "could not create temporary file"
4023msgstr "不能创建临时文件"
c04f5ac3 4024
2b472aae 4025#: gpg-interface.c:437
c04f5ac3 4026#, c-format
a0b6b246
JX
4027msgid "failed writing detached signature to '%s'"
4028msgstr "无法将分离式签名写入 '%s'"
c04f5ac3 4029
ddc12c42 4030#: graph.c:98
1a79b2f1
JX
4031#, c-format
4032msgid "ignore invalid color '%.*s' in log.graphColors"
4033msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
4034
a5cd71ca
JX
4035#: grep.c:668
4036msgid ""
4037"given pattern contains NULL byte (via -f <file>). This is only supported "
4038"with -P under PCRE v2"
4039msgstr ""
ddc12c42
JX
4040"给定的模式包含 NULL 字符(通过 -f <文件> 参数)。只有 PCRE v2 下的 -P 支持此"
4041"功能"
a5cd71ca 4042
2b472aae 4043#: grep.c:2128
c04f5ac3 4044#, c-format
a0b6b246
JX
4045msgid "'%s': unable to read %s"
4046msgstr "'%s':无法读取 %s"
c04f5ac3 4047
2b472aae 4048#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
06991777 4049#: builtin/rm.c:135
c04f5ac3 4050#, c-format
a0b6b246 4051msgid "failed to stat '%s'"
65e2041e 4052msgstr "对 '%s' 调用 stat 失败"
c04f5ac3 4053
2b472aae 4054#: grep.c:2156
a0b6b246
JX
4055#, c-format
4056msgid "'%s': short read"
4057msgstr "'%s':读取不完整"
5c57d762 4058
fd8cb379
JX
4059#: help.c:23
4060msgid "start a working area (see also: git help tutorial)"
4061msgstr "开始一个工作区(参见:git help tutorial)"
4062
4063#: help.c:24
4064msgid "work on the current change (see also: git help everyday)"
4065msgstr "在当前变更上工作(参见:git help everyday)"
4066
4067#: help.c:25
4068msgid "examine the history and state (see also: git help revisions)"
4069msgstr "检查历史和状态(参见:git help revisions)"
4070
4071#: help.c:26
4072msgid "grow, mark and tweak your common history"
4073msgstr "扩展、标记和调校您的历史记录"
4074
4075#: help.c:27
4076msgid "collaborate (see also: git help workflows)"
4077msgstr "协同(参见:git help workflows)"
4078
4079#: help.c:31
4080msgid "Main Porcelain Commands"
4081msgstr "主要的上层命令"
4082
4083#: help.c:32
4084msgid "Ancillary Commands / Manipulators"
4085msgstr "辅助命令/操作者"
4086
4087#: help.c:33
4088msgid "Ancillary Commands / Interrogators"
4089msgstr "辅助命令/询问者"
4090
4091#: help.c:34
4092msgid "Interacting with Others"
4093msgstr "与其它系统交互"
4094
4095#: help.c:35
4096msgid "Low-level Commands / Manipulators"
4097msgstr "低级命令/操作者"
4098
4099#: help.c:36
4100msgid "Low-level Commands / Interrogators"
4101msgstr "低级命令/询问者"
4102
4103#: help.c:37
ddc12c42 4104msgid "Low-level Commands / Syncing Repositories"
fd8cb379
JX
4105msgstr "低级命令/同步仓库"
4106
4107#: help.c:38
4108msgid "Low-level Commands / Internal Helpers"
4109msgstr "低级命令/内部助手"
4110
06991777 4111#: help.c:298
a0b6b246
JX
4112#, c-format
4113msgid "available git commands in '%s'"
4114msgstr "在 '%s' 下可用的 git 命令"
c04f5ac3 4115
06991777 4116#: help.c:305
a0b6b246
JX
4117msgid "git commands available from elsewhere on your $PATH"
4118msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
5c57d762 4119
06991777 4120#: help.c:314
a0b6b246
JX
4121msgid "These are common Git commands used in various situations:"
4122msgstr "这些是各种场合常见的 Git 命令:"
5c57d762 4123
a6cd2cc4 4124#: help.c:363 git.c:98
fd8cb379
JX
4125#, c-format
4126msgid "unsupported command listing type '%s'"
4127msgstr "不支持的命令列表类型 '%s'"
4128
d46c5519 4129#: help.c:403
fd8cb379
JX
4130msgid "The common Git guides are:"
4131msgstr "最常用的 Git 向导有:"
4132
d46c5519 4133#: help.c:512
4c27fcb5
JX
4134msgid "See 'git help <command>' to read about a specific subcommand"
4135msgstr "执行 'git help <command>' 来查看特定子命令"
4136
d46c5519 4137#: help.c:517
4c27fcb5
JX
4138msgid "External commands"
4139msgstr "外部命令"
4140
d46c5519 4141#: help.c:532
4c27fcb5
JX
4142msgid "Command aliases"
4143msgstr "命令别名"
4144
d46c5519 4145#: help.c:596
c04f5ac3 4146#, c-format
a0b6b246
JX
4147msgid ""
4148"'%s' appears to be a git command, but we were not\n"
4149"able to execute it. Maybe git-%s is broken?"
4150msgstr ""
4151"'%s' 像是一个 git 命令,但却无法运行。\n"
4152"可能是 git-%s 受损?"
c04f5ac3 4153
d46c5519 4154#: help.c:655
a0b6b246
JX
4155msgid "Uh oh. Your system reports no Git commands at all."
4156msgstr "唉呀,您的系统中未发现 Git 命令。"
c04f5ac3 4157
d46c5519 4158#: help.c:677
c04f5ac3 4159#, c-format
a4f16749 4160msgid "WARNING: You called a Git command named '%s', which does not exist."
554e8501 4161msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。"
a4f16749 4162
d46c5519 4163#: help.c:682
a4f16749
JX
4164#, c-format
4165msgid "Continuing under the assumption that you meant '%s'."
554e8501 4166msgstr "假定你想要的是 '%s' 并继续。"
c04f5ac3 4167
d46c5519 4168#: help.c:687
c04f5ac3 4169#, c-format
a4f16749 4170msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
554e8501 4171msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。"
c04f5ac3 4172
d46c5519 4173#: help.c:695
c04f5ac3 4174#, c-format
a0b6b246
JX
4175msgid "git: '%s' is not a git command. See 'git --help'."
4176msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
c04f5ac3 4177
d46c5519 4178#: help.c:699
a4f16749
JX
4179msgid ""
4180"\n"
4181"The most similar command is"
4182msgid_plural ""
4183"\n"
4184"The most similar commands are"
6937cb4e
JX
4185msgstr[0] ""
4186"\n"
4187"最相似的命令是"
4188msgstr[1] ""
4189"\n"
4190"最相似的命令是"
a4f16749 4191
d46c5519 4192#: help.c:714
a4f16749
JX
4193msgid "git version [<options>]"
4194msgstr "git version [<选项>]"
4195
a5cd71ca 4196#: help.c:783
a4f16749
JX
4197#, c-format
4198msgid "%s: %s - %s"
4199msgstr "%s:%s - %s"
4200
a5cd71ca 4201#: help.c:787
a0b6b246
JX
4202msgid ""
4203"\n"
4204"Did you mean this?"
4205msgid_plural ""
4206"\n"
4207"Did you mean one of these?"
4208msgstr[0] ""
4209"\n"
4210"您指的是这个么?"
4211msgstr[1] ""
4212"\n"
4213"您指的是这其中的某一个么?"
c04f5ac3 4214
d46c5519 4215#: ident.c:349
a0b6b246
JX
4216msgid ""
4217"\n"
4218"*** Please tell me who you are.\n"
4219"\n"
4220"Run\n"
4221"\n"
4222" git config --global user.email \"you@example.com\"\n"
4223" git config --global user.name \"Your Name\"\n"
4224"\n"
4225"to set your account's default identity.\n"
4226"Omit --global to set the identity only in this repository.\n"
4227"\n"
4228msgstr ""
4229"\n"
4230"*** 请告诉我你是谁。\n"
4231"\n"
4232"运行\n"
4233"\n"
4234" git config --global user.email \"you@example.com\"\n"
4235" git config --global user.name \"Your Name\"\n"
4236"\n"
4237"来设置您账号的缺省身份标识。\n"
4238"如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
c04f5ac3 4239
d46c5519 4240#: ident.c:379
87cb7997 4241msgid "no email was given and auto-detection is disabled"
65e2041e 4242msgstr "未提供邮件地址且自动探测被禁用"
87cb7997 4243
d46c5519 4244#: ident.c:384
87cb7997
JX
4245#, c-format
4246msgid "unable to auto-detect email address (got '%s')"
4247msgstr "无法自动探测邮件地址(得到 '%s')"
4248
d46c5519 4249#: ident.c:401
87cb7997
JX
4250msgid "no name was given and auto-detection is disabled"
4251msgstr "未提供姓名且自动探测被禁用"
4252
d46c5519 4253#: ident.c:407
87cb7997
JX
4254#, c-format
4255msgid "unable to auto-detect name (got '%s')"
4256msgstr "无法自动探测姓名(得到 '%s')"
4257
d46c5519 4258#: ident.c:415
87cb7997
JX
4259#, c-format
4260msgid "empty ident name (for <%s>) not allowed"
4261msgstr "不允许空的姓名(对于 <%s>)"
4262
d46c5519 4263#: ident.c:421
87cb7997
JX
4264#, c-format
4265msgid "name consists only of disallowed characters: %s"
4266msgstr "姓名中仅包含禁用字符:%s"
4267
2b472aae 4268#: ident.c:436 builtin/commit.c:635
87cb7997
JX
4269#, c-format
4270msgid "invalid date format: %s"
4271msgstr "无效的日期格式:%s"
4272
a5cd71ca 4273#: list-objects.c:127
d46c5519
JX
4274#, c-format
4275msgid "entry '%s' in tree %s has tree mode, but is not a tree"
4276msgstr "树 %2$s 中的条目 '%1$s' 具有树的属性,但不是一个树对象"
4277
a5cd71ca 4278#: list-objects.c:140
d46c5519
JX
4279#, c-format
4280msgid "entry '%s' in tree %s has blob mode, but is not a blob"
4281msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的属性,但不是一个数据对象"
4282
a5cd71ca 4283#: list-objects.c:375
d46c5519
JX
4284#, c-format
4285msgid "unable to load root tree for commit %s"
4286msgstr "无法为提交 %s 加载根树"
4287
a5cd71ca
JX
4288#: list-objects-filter.c:492
4289#, c-format
4290msgid "unable to access sparse blob in '%s'"
4291msgstr "不能访问 '%s' 中的稀疏数据对象"
4292
4293#: list-objects-filter.c:495
4294#, c-format
4295msgid "unable to parse sparse filter data in %s"
4296msgstr "无法解析 %s 中的稀疏过滤器数据"
5809aa05 4297
4c27fcb5 4298#: list-objects-filter-options.c:58
06991777
JX
4299msgid "expected 'tree:<depth>'"
4300msgstr "期望 'tree:<深度>'"
4c27fcb5 4301
a5cd71ca 4302#: list-objects-filter-options.c:73
d46c5519
JX
4303msgid "sparse:path filters support has been dropped"
4304msgstr "sparse:path 过滤器支持已被删除"
4305
a5cd71ca 4306#: list-objects-filter-options.c:86
a6cd2cc4
JX
4307#, c-format
4308msgid "invalid filter-spec '%s'"
4309msgstr "无效的过滤器表达式 '%s'"
4310
a5cd71ca
JX
4311#: list-objects-filter-options.c:102
4312#, c-format
4313msgid "must escape char in sub-filter-spec: '%c'"
4314msgstr "必须对 sub-filter-spec 中的字符进行转义:'%c'"
4315
4316#: list-objects-filter-options.c:144
4317msgid "expected something after combine:"
4318msgstr "期望在组合后有一些东西:"
4319
4320#: list-objects-filter-options.c:226
4321msgid "multiple filter-specs cannot be combined"
4322msgstr "不能混用多种过滤规格"
5809aa05 4323
6937cb4e 4324#: lockfile.c:151
c04f5ac3 4325#, c-format
a0b6b246
JX
4326msgid ""
4327"Unable to create '%s.lock': %s.\n"
4328"\n"
4329"Another git process seems to be running in this repository, e.g.\n"
4330"an editor opened by 'git commit'. Please make sure all processes\n"
4331"are terminated then try again. If it still fails, a git process\n"
4332"may have crashed in this repository earlier:\n"
4333"remove the file manually to continue."
4334msgstr ""
4335"无法创建 '%s.lock':%s。\n"
4336"\n"
4337"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
4338"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
4339"可能之前有一个 git 进程在这个仓库中异常退出:\n"
4340"手动删除这个文件再继续。"
c04f5ac3 4341
6937cb4e 4342#: lockfile.c:159
a0b6b246
JX
4343#, c-format
4344msgid "Unable to create '%s.lock': %s"
4345msgstr "不能创建 '%s.lock':%s"
c04f5ac3 4346
4c27fcb5 4347#: merge.c:41
a0b6b246 4348msgid "failed to read the cache"
c1ac5258 4349msgstr "读取缓存失败"
c04f5ac3 4350
2b472aae
JX
4351#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
4352#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
4353#: builtin/stash.c:265
a0b6b246
JX
4354msgid "unable to write new index file"
4355msgstr "无法写新的索引文件"
c04f5ac3 4356
2b472aae 4357#: merge-recursive.c:356
a0b6b246
JX
4358msgid "(bad commit)\n"
4359msgstr "(坏提交)\n"
c04f5ac3 4360
2b472aae 4361#: merge-recursive.c:379
a0b6b246 4362#, c-format
fd8cb379 4363msgid "add_cacheinfo failed for path '%s'; merge aborting."
0fcd668f 4364msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。"
c04f5ac3 4365
2b472aae 4366#: merge-recursive.c:388
fd8cb379
JX
4367#, c-format
4368msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
0fcd668f 4369msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。"
fd8cb379 4370
2b472aae 4371#: merge-recursive.c:874
c04f5ac3 4372#, c-format
a0b6b246 4373msgid "failed to create path '%s'%s"
c1ac5258 4374msgstr "创建路径 '%s'%s 失败"
c04f5ac3 4375
2b472aae 4376#: merge-recursive.c:885
c04f5ac3 4377#, c-format
a0b6b246
JX
4378msgid "Removing %s to make room for subdirectory\n"
4379msgstr "删除 %s 以便为子目录留出空间\n"
c04f5ac3 4380
2b472aae 4381#: merge-recursive.c:899 merge-recursive.c:918
a0b6b246
JX
4382msgid ": perhaps a D/F conflict?"
4383msgstr ":可能是一个目录/文件冲突?"
c04f5ac3 4384
2b472aae 4385#: merge-recursive.c:908
c04f5ac3 4386#, c-format
a0b6b246
JX
4387msgid "refusing to lose untracked file at '%s'"
4388msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
c04f5ac3 4389
2b472aae 4390#: merge-recursive.c:949 builtin/cat-file.c:41
c04f5ac3 4391#, c-format
a0b6b246
JX
4392msgid "cannot read object %s '%s'"
4393msgstr "不能读取对象 %s '%s'"
c04f5ac3 4394
2b472aae 4395#: merge-recursive.c:954
4dcdc3d8 4396#, c-format
a0b6b246
JX
4397msgid "blob expected for %s '%s'"
4398msgstr "%s '%s' 应为数据对象"
4dcdc3d8 4399
2b472aae 4400#: merge-recursive.c:979
4dcdc3d8 4401#, c-format
a0b6b246 4402msgid "failed to open '%s': %s"
c1ac5258 4403msgstr "打开 '%s' 失败:%s"
4dcdc3d8 4404
2b472aae 4405#: merge-recursive.c:990
a0b6b246
JX
4406#, c-format
4407msgid "failed to symlink '%s': %s"
c1ac5258 4408msgstr "创建符号链接 '%s' 失败:%s"
c04f5ac3 4409
2b472aae 4410#: merge-recursive.c:995
5c57d762 4411#, c-format
a0b6b246
JX
4412msgid "do not know what to do with %06o %s '%s'"
4413msgstr "不知道如何处理 %06o %s '%s'"
5c57d762 4414
2b472aae 4415#: merge-recursive.c:1191
fd8cb379
JX
4416#, c-format
4417msgid "Failed to merge submodule %s (not checked out)"
4418msgstr "无法合并子模组 %s (没有检出)"
4419
2b472aae 4420#: merge-recursive.c:1198
fd8cb379
JX
4421#, c-format
4422msgid "Failed to merge submodule %s (commits not present)"
4423msgstr "无法合并子模组 %s(提交不存在)"
4424
2b472aae 4425#: merge-recursive.c:1205
fd8cb379
JX
4426#, c-format
4427msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4428msgstr "无法合并子模组 %s (提交未跟随合并基线)"
4429
2b472aae 4430#: merge-recursive.c:1213 merge-recursive.c:1225
fd8cb379
JX
4431#, c-format
4432msgid "Fast-forwarding submodule %s to the following commit:"
4433msgstr "子模组 %s 快进到如下提交:"
4434
2b472aae 4435#: merge-recursive.c:1216 merge-recursive.c:1228
fd8cb379
JX
4436#, c-format
4437msgid "Fast-forwarding submodule %s"
4438msgstr "快进子模组 %s"
4439
2b472aae 4440#: merge-recursive.c:1251
fd8cb379
JX
4441#, c-format
4442msgid "Failed to merge submodule %s (merge following commits not found)"
4443msgstr "无法合并子模组 %s (没发现合并跟随的提交)"
4444
2b472aae 4445#: merge-recursive.c:1255
fd8cb379
JX
4446#, c-format
4447msgid "Failed to merge submodule %s (not fast-forward)"
4448msgstr "无法合并子模组 %s(非快进)"
4449
2b472aae 4450#: merge-recursive.c:1256
fd8cb379
JX
4451msgid "Found a possible merge resolution for the submodule:\n"
4452msgstr "找到子模组的一个可能的合并方案:\n"
4453
2b472aae 4454#: merge-recursive.c:1259
fd8cb379
JX
4455#, c-format
4456msgid ""
4457"If this is correct simply add it to the index for example\n"
4458"by using:\n"
4459"\n"
4460" git update-index --cacheinfo 160000 %s \"%s\"\n"
4461"\n"
4462"which will accept this suggestion.\n"
4463msgstr ""
4464"如果这个正确,将其添加到索引,例如使用命令:\n"
4465"\n"
4466" git update-index --cacheinfo 160000 %s \"%s\"\n"
4467"\n"
4468"以接受此建议。\n"
4469
2b472aae 4470#: merge-recursive.c:1268
fd8cb379
JX
4471#, c-format
4472msgid "Failed to merge submodule %s (multiple merges found)"
4473msgstr "无法合并子模组 %s (发现多个合并)"
4474
2b472aae 4475#: merge-recursive.c:1341
a0b6b246
JX
4476msgid "Failed to execute internal merge"
4477msgstr "无法执行内部合并"
4478
2b472aae 4479#: merge-recursive.c:1346
5c57d762 4480#, c-format
a0b6b246
JX
4481msgid "Unable to add %s to database"
4482msgstr "不能添加 %s 至对象库"
5c57d762 4483
2b472aae 4484#: merge-recursive.c:1378
fd8cb379
JX
4485#, c-format
4486msgid "Auto-merging %s"
4487msgstr "自动合并 %s"
4488
2b472aae 4489#: merge-recursive.c:1402
fd8cb379
JX
4490#, c-format
4491msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
4492msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。"
4493
2b472aae 4494#: merge-recursive.c:1474
5c57d762
JX
4495#, c-format
4496msgid ""
a0b6b246
JX
4497"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4498"in tree."
5c57d762 4499msgstr ""
87cb7997
JX
4500"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
4501"本被保留。"
4502
2b472aae 4503#: merge-recursive.c:1479
87cb7997
JX
4504#, c-format
4505msgid ""
4506"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4507"left in tree."
4508msgstr ""
4509"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
4510"%7$s 版本被保留。"
c04f5ac3 4511
2b472aae 4512#: merge-recursive.c:1486
7aea43ff 4513#, c-format
a0b6b246
JX
4514msgid ""
4515"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4516"in tree at %s."
4517msgstr ""
87cb7997
JX
4518"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
4519"本保留在 %8$s 中。"
7aea43ff 4520
2b472aae 4521#: merge-recursive.c:1491
87cb7997
JX
4522#, c-format
4523msgid ""
4524"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4525"left in tree at %s."
4526msgstr ""
4527"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
4528"%7$s 版本保留在 %9$s 中。"
4529
2b472aae 4530#: merge-recursive.c:1526
a0b6b246
JX
4531msgid "rename"
4532msgstr "重命名"
5b04ee3b 4533
2b472aae 4534#: merge-recursive.c:1526
a0b6b246
JX
4535msgid "renamed"
4536msgstr "重命名"
5b04ee3b 4537
2b472aae 4538#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
fd8cb379
JX
4539#, c-format
4540msgid "Refusing to lose dirty file at %s"
4541msgstr "拒绝丢失脏文件 '%s'"
4542
2b472aae 4543#: merge-recursive.c:1587
06991777
JX
4544#, c-format
4545msgid "Refusing to lose untracked file at %s, even though it's in the way."
4546msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。"
4547
2b472aae 4548#: merge-recursive.c:1645
06991777
JX
4549#, c-format
4550msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
4551msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
4552
2b472aae 4553#: merge-recursive.c:1676
5c57d762 4554#, c-format
a0b6b246
JX
4555msgid "%s is a directory in %s adding as %s instead"
4556msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
5c57d762 4557
2b472aae 4558#: merge-recursive.c:1681
fd8cb379
JX
4559#, c-format
4560msgid "Refusing to lose untracked file at %s; adding as %s instead"
4561msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s"
4562
2b472aae 4563#: merge-recursive.c:1708
5c57d762
JX
4564#, c-format
4565msgid ""
a0b6b246
JX
4566"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
4567"\"->\"%s\" in \"%s\"%s"
5c57d762 4568msgstr ""
a0b6b246
JX
4569"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
4570"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
5c57d762 4571
2b472aae 4572#: merge-recursive.c:1713
a0b6b246
JX
4573msgid " (left unresolved)"
4574msgstr "(留下未解决)"
5c57d762 4575
2b472aae 4576#: merge-recursive.c:1793
5c57d762 4577#, c-format
a0b6b246 4578msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
5c57d762 4579msgstr ""
a0b6b246
JX
4580"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
4581"%5$s"
3495628d 4582
2b472aae 4583#: merge-recursive.c:2056
fd8cb379
JX
4584#, c-format
4585msgid ""
4586"CONFLICT (directory rename split): Unclear where to place %s because "
4587"directory %s was renamed to multiple other directories, with no destination "
4588"getting a majority of the files."
c1ac5258
JX
4589msgstr ""
4590"冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个"
4591"其它目录,没有目录包含大部分文件。"
fd8cb379 4592
2b472aae 4593#: merge-recursive.c:2088
fd8cb379
JX
4594#, c-format
4595msgid ""
4596"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
4597"implicit directory rename(s) putting the following path(s) there: %s."
4598msgstr ""
4599"冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放"
4600"在:%s。"
4601
2b472aae 4602#: merge-recursive.c:2098
fd8cb379
JX
4603#, c-format
4604msgid ""
4605"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
4606"implicit directory renames tried to put these paths there: %s"
4607msgstr ""
4608"冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路"
4609"径放置于此:%s"
4610
2b472aae 4611#: merge-recursive.c:2190
fd8cb379
JX
4612#, c-format
4613msgid ""
4614"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
4615">%s in %s"
4616msgstr ""
4617"冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 "
4618"%4$s->%5$s"
4619
2b472aae 4620#: merge-recursive.c:2435
fd8cb379
JX
4621#, c-format
4622msgid ""
4623"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4624"renamed."
4625msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。"
4626
2b472aae 4627#: merge-recursive.c:2961
90314792 4628#, c-format
a0b6b246
JX
4629msgid "cannot read object %s"
4630msgstr "不能读取对象 %s"
90314792 4631
2b472aae 4632#: merge-recursive.c:2964
90314792 4633#, c-format
a0b6b246
JX
4634msgid "object %s is not a blob"
4635msgstr "对象 %s 不是一个数据对象"
90314792 4636
2b472aae 4637#: merge-recursive.c:3028
a0b6b246
JX
4638msgid "modify"
4639msgstr "修改"
90314792 4640
2b472aae 4641#: merge-recursive.c:3028
a0b6b246
JX
4642msgid "modified"
4643msgstr "修改"
5b04ee3b 4644
2b472aae 4645#: merge-recursive.c:3040
a0b6b246
JX
4646msgid "content"
4647msgstr "内容"
5b04ee3b 4648
2b472aae 4649#: merge-recursive.c:3044
a0b6b246
JX
4650msgid "add/add"
4651msgstr "添加/添加"
3495628d 4652
2b472aae 4653#: merge-recursive.c:3067
220c313c 4654#, c-format
a0b6b246
JX
4655msgid "Skipped %s (merged same as existing)"
4656msgstr "略过 %s(已经做过相同合并)"
220c313c 4657
2b472aae 4658#: merge-recursive.c:3089 git-submodule.sh:1003
a0b6b246
JX
4659msgid "submodule"
4660msgstr "子模组"
4661
2b472aae 4662#: merge-recursive.c:3090
220c313c 4663#, c-format
a0b6b246
JX
4664msgid "CONFLICT (%s): Merge conflict in %s"
4665msgstr "冲突(%s):合并冲突于 %s"
220c313c 4666
2b472aae 4667#: merge-recursive.c:3120
220c313c 4668#, c-format
06991777
JX
4669msgid "Adding as %s instead"
4670msgstr "而是以 %s 为名添加"
4671
2b472aae 4672#: merge-recursive.c:3203
06991777 4673#, c-format
d46c5519
JX
4674msgid ""
4675"Path updated: %s added in %s inside a directory that was renamed in %s; "
4676"moving it to %s."
4677msgstr ""
5b533632 4678"路径已更新:%s 添加到 %s,位于一个被重命名到 %s 的目录中,将其移动到 %s。"
220c313c 4679
2b472aae 4680#: merge-recursive.c:3206
d46c5519
JX
4681#, c-format
4682msgid ""
4683"CONFLICT (file location): %s added in %s inside a directory that was renamed "
4684"in %s, suggesting it should perhaps be moved to %s."
4685msgstr ""
4686"冲突(文件位置):%s 添加到 %s,位于一个被重命名为 %s 的目录中,建议将其移动"
4687"到 %s。"
4688
2b472aae 4689#: merge-recursive.c:3210
d46c5519
JX
4690#, c-format
4691msgid ""
4692"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
4693"%s; moving it to %s."
4694msgstr ""
5b533632
FZ
4695"路径已更新:%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,将其移"
4696"动到 %5$s。"
d46c5519 4697
2b472aae 4698#: merge-recursive.c:3213
d46c5519
JX
4699#, c-format
4700msgid ""
4701"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
4702"was renamed in %s, suggesting it should perhaps be moved to %s."
4703msgstr ""
5b533632 4704"冲突(文件位置):%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,"
d46c5519
JX
4705"建议将其移动到 %5$s。"
4706
2b472aae 4707#: merge-recursive.c:3327
d46c5519
JX
4708#, c-format
4709msgid "Removing %s"
4710msgstr "删除 %s"
4711
2b472aae 4712#: merge-recursive.c:3350
d46c5519
JX
4713msgid "file/directory"
4714msgstr "文件/目录"
220c313c 4715
2b472aae 4716#: merge-recursive.c:3355
a0b6b246
JX
4717msgid "directory/file"
4718msgstr "目录/文件"
276ceeaa 4719
2b472aae 4720#: merge-recursive.c:3362
276ceeaa 4721#, c-format
a0b6b246
JX
4722msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
4723msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
276ceeaa 4724
2b472aae 4725#: merge-recursive.c:3371
276ceeaa 4726#, c-format
a0b6b246
JX
4727msgid "Adding %s"
4728msgstr "添加 %s"
276ceeaa 4729
2b472aae 4730#: merge-recursive.c:3380
06991777
JX
4731#, c-format
4732msgid "CONFLICT (add/add): Merge conflict in %s"
4733msgstr "冲突(add/add):合并冲突于 %s"
4734
2b472aae 4735#: merge-recursive.c:3424
6937cb4e 4736msgid "Already up to date!"
a0b6b246 4737msgstr "已经是最新的!"
276ceeaa 4738
2b472aae 4739#: merge-recursive.c:3433
276ceeaa 4740#, c-format
a0b6b246
JX
4741msgid "merging of trees %s and %s failed"
4742msgstr "无法合并树 %s 和 %s"
276ceeaa 4743
2b472aae 4744#: merge-recursive.c:3537
a0b6b246
JX
4745msgid "Merging:"
4746msgstr "合并:"
5c57d762 4747
2b472aae 4748#: merge-recursive.c:3550
5c57d762 4749#, c-format
a0b6b246
JX
4750msgid "found %u common ancestor:"
4751msgid_plural "found %u common ancestors:"
4752msgstr[0] "发现 %u 个共同祖先:"
4753msgstr[1] "发现 %u 个共同祖先:"
4754
2b472aae 4755#: merge-recursive.c:3600
a0b6b246
JX
4756msgid "merge returned no commit"
4757msgstr "合并未返回提交"
4758
2b472aae 4759#: merge-recursive.c:3659
a5cd71ca
JX
4760#, c-format
4761msgid ""
4762"Your local changes to the following files would be overwritten by merge:\n"
4763" %s"
4764msgstr ""
4765"您对下列文件的本地修改将被合并操作覆盖:\n"
4766" %s"
4767
2b472aae 4768#: merge-recursive.c:3756
5c57d762 4769#, c-format
a0b6b246
JX
4770msgid "Could not parse object '%s'"
4771msgstr "不能解析对象 '%s'"
5c57d762 4772
2b472aae 4773#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
a0b6b246
JX
4774msgid "Unable to write index."
4775msgstr "不能写入索引。"
4776
a5cd71ca 4777#: midx.c:68
4c27fcb5
JX
4778#, c-format
4779msgid "multi-pack-index file %s is too small"
4780msgstr "多包索引文件 %s 太小"
4781
a5cd71ca 4782#: midx.c:84
4c27fcb5
JX
4783#, c-format
4784msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
4785msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
4786
a5cd71ca 4787#: midx.c:89
4c27fcb5
JX
4788#, c-format
4789msgid "multi-pack-index version %d not recognized"
4790msgstr "multi-pack-index 版本 %d 不能被识别"
4791
a5cd71ca 4792#: midx.c:94
4c27fcb5
JX
4793#, c-format
4794msgid "hash version %u does not match"
4795msgstr "散列版本 %u 不匹配"
4796
a5cd71ca 4797#: midx.c:108
4c27fcb5
JX
4798msgid "invalid chunk offset (too large)"
4799msgstr "无效的块偏移(太大)"
4800
a5cd71ca 4801#: midx.c:132
4c27fcb5
JX
4802msgid "terminating multi-pack-index chunk id appears earlier than expected"
4803msgstr "终止多包索引块 id 出现时间早于预期"
4804
a5cd71ca 4805#: midx.c:145
4c27fcb5
JX
4806msgid "multi-pack-index missing required pack-name chunk"
4807msgstr "多包索引缺少必需的包名块"
4808
a5cd71ca 4809#: midx.c:147
4c27fcb5 4810msgid "multi-pack-index missing required OID fanout chunk"
5b533632 4811msgstr "多包索引缺少必需的对象 ID 扇出块"
4c27fcb5 4812
a5cd71ca 4813#: midx.c:149
4c27fcb5 4814msgid "multi-pack-index missing required OID lookup chunk"
5b533632 4815msgstr "多包索引缺少必需的对象 ID 查询块"
4c27fcb5 4816
a5cd71ca 4817#: midx.c:151
4c27fcb5
JX
4818msgid "multi-pack-index missing required object offsets chunk"
4819msgstr "多包索引缺少必需的对象偏移块"
4820
a5cd71ca 4821#: midx.c:165
4c27fcb5
JX
4822#, c-format
4823msgid "multi-pack-index pack names out of order: '%s' before '%s'"
4824msgstr "多包索引包名无序:'%s' 在 '%s' 之前"
4825
a5cd71ca 4826#: midx.c:210
4c27fcb5
JX
4827#, c-format
4828msgid "bad pack-int-id: %u (%u total packs)"
4829msgstr "错的 pack-int-id:%u(共有 %u 个包)"
4830
a5cd71ca 4831#: midx.c:260
4c27fcb5
JX
4832msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
4833msgstr "多包索引存储一个64位偏移,但是 off_t 太小"
4834
a5cd71ca 4835#: midx.c:288
4c27fcb5
JX
4836msgid "error preparing packfile from multi-pack-index"
4837msgstr "从多包索引准备 packfile 出错"
4838
ddc12c42 4839#: midx.c:472
4c27fcb5
JX
4840#, c-format
4841msgid "failed to add packfile '%s'"
4842msgstr "添加包文件 '%s' 失败"
4843
ddc12c42 4844#: midx.c:478
4c27fcb5
JX
4845#, c-format
4846msgid "failed to open pack-index '%s'"
4847msgstr "打开包索引 '%s' 失败"
4848
ddc12c42 4849#: midx.c:538
4c27fcb5
JX
4850#, c-format
4851msgid "failed to locate object %d in packfile"
4852msgstr "在包文件中定位对象 %d 失败"
4853
ddc12c42
JX
4854#: midx.c:842
4855msgid "Adding packfiles to multi-pack-index"
4856msgstr "添加包文件到多包索引"
4857
4858#: midx.c:875
a6cd2cc4
JX
4859#, c-format
4860msgid "did not see pack-file %s to drop"
4861msgstr "没有看到要丢弃的包文件 %s"
4862
ddc12c42
JX
4863#: midx.c:973
4864msgid "Writing chunks to multi-pack-index"
4865msgstr "写入块到多包索引"
4866
4867#: midx.c:1052
4c27fcb5
JX
4868#, c-format
4869msgid "failed to clear multi-pack-index at %s"
4870msgstr "清理位于 %s 的多包索引失败"
4871
ddc12c42 4872#: midx.c:1108
d46c5519
JX
4873msgid "Looking for referenced packfiles"
4874msgstr "正在查找引用的包文件"
4875
ddc12c42 4876#: midx.c:1123
4c27fcb5
JX
4877#, c-format
4878msgid ""
4879"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
5b533632 4880msgstr "对象 ID 扇出无序:fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
4c27fcb5 4881
ddc12c42
JX
4882#: midx.c:1128
4883msgid "Verifying OID order in multi-pack-index"
4884msgstr "校验多包索引中的 OID 顺序"
d46c5519 4885
ddc12c42 4886#: midx.c:1137
4c27fcb5
JX
4887#, c-format
4888msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
5b533632 4889msgstr "对象 ID 查询无序:oid[%d] = %s >= %s = oid[%d]"
4c27fcb5 4890
ddc12c42 4891#: midx.c:1157
d46c5519
JX
4892msgid "Sorting objects by packfile"
4893msgstr "通过包文件为对象排序"
4894
ddc12c42 4895#: midx.c:1164
4c27fcb5
JX
4896msgid "Verifying object offsets"
4897msgstr "校验对象偏移"
4898
ddc12c42 4899#: midx.c:1180
4c27fcb5
JX
4900#, c-format
4901msgid "failed to load pack entry for oid[%d] = %s"
4902msgstr "为 oid[%d] = %s 加载包条目失败"
4903
ddc12c42 4904#: midx.c:1186
4c27fcb5
JX
4905#, c-format
4906msgid "failed to load pack-index for packfile %s"
4907msgstr "为包文件 %s 加载包索引失败"
4908
ddc12c42 4909#: midx.c:1195
4c27fcb5
JX
4910#, c-format
4911msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
4912msgstr "oid[%d] = %s 错误的对象偏移:%<PRIx64> != %<PRIx64>"
4913
ddc12c42
JX
4914#: midx.c:1220
4915msgid "Counting referenced objects"
4916msgstr "正在对引用对象计数"
4917
4918#: midx.c:1230
4919msgid "Finding and deleting unreferenced packfiles"
4920msgstr "正在查找和删除未引用的包文件"
4921
4922#: midx.c:1388
a6cd2cc4
JX
4923msgid "could not start pack-objects"
4924msgstr "不能开始 pack-objects"
4925
ddc12c42 4926#: midx.c:1407
a6cd2cc4
JX
4927msgid "could not finish pack-objects"
4928msgstr "不能结束 pack-objects"
4929
a5cd71ca 4930#: name-hash.c:537
4c27fcb5
JX
4931#, c-format
4932msgid "unable to create lazy_dir thread: %s"
4933msgstr "不能创建 lazy_dir 线程:%s"
4934
a5cd71ca 4935#: name-hash.c:559
4c27fcb5
JX
4936#, c-format
4937msgid "unable to create lazy_name thread: %s"
4938msgstr "不能创建 lazy_name 线程:%s"
4939
a5cd71ca 4940#: name-hash.c:565
4c27fcb5
JX
4941#, c-format
4942msgid "unable to join lazy_name thread: %s"
4943msgstr "不能加入 lasy_name 线程:%s"
4944
06991777 4945#: notes-merge.c:277
5c57d762
JX
4946#, c-format
4947msgid ""
a0b6b246
JX
4948"You have not concluded your previous notes merge (%s exists).\n"
4949"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
4950"commit/abort the previous merge before you start a new notes merge."
5c57d762 4951msgstr ""
29004bbb 4952"您的前一次注释合并尚未结束(存在 %s)。\n"
1a79b2f1
JX
4953"在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
4954"notes merge --abort' 来提交/终止前一次合并。"
5c57d762 4955
06991777 4956#: notes-merge.c:284
a0b6b246
JX
4957#, c-format
4958msgid "You have not concluded your notes merge (%s exists)."
4959msgstr "您尚未结束注释合并(存在 %s)。"
4960
06991777 4961#: notes-utils.c:46
a0b6b246
JX
4962msgid "Cannot commit uninitialized/unreferenced notes tree"
4963msgstr "不能提交未初始化/未引用的注解树"
5c57d762 4964
06991777 4965#: notes-utils.c:105
1b7f4a34 4966#, c-format
a0b6b246
JX
4967msgid "Bad notes.rewriteMode value: '%s'"
4968msgstr "坏的 notes.rewriteMode 值:'%s'"
1b7f4a34 4969
06991777 4970#: notes-utils.c:115
5b04ee3b 4971#, c-format
a0b6b246
JX
4972msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
4973msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
5b04ee3b 4974
a4f16749
JX
4975#. TRANSLATORS: The first %s is the name of
4976#. the environment variable, the second %s is
4977#. its value.
4978#.
06991777 4979#: notes-utils.c:145
5b04ee3b 4980#, c-format
a0b6b246
JX
4981msgid "Bad %s value: '%s'"
4982msgstr "坏的 %s 值:'%s'"
5b04ee3b 4983
a5cd71ca 4984#: object.c:53
c1ac5258
JX
4985#, c-format
4986msgid "invalid object type \"%s\""
4987msgstr "无效的对象类型 \"%s\""
4988
a5cd71ca 4989#: object.c:173
c1ac5258
JX
4990#, c-format
4991msgid "object %s is a %s, not a %s"
4992msgstr "对象 %s 是一个 %s,不是一个 %s"
4993
a5cd71ca 4994#: object.c:233
c1ac5258
JX
4995#, c-format
4996msgid "object %s has unknown type id %d"
4997msgstr "对象 %s 有未知的类型 id %d"
4998
a5cd71ca 4999#: object.c:246
5b04ee3b 5000#, c-format
a0b6b246
JX
5001msgid "unable to parse object: %s"
5002msgstr "不能解析对象:%s"
5b04ee3b 5003
2b472aae 5004#: object.c:266 object.c:278
c1ac5258 5005#, c-format
06991777
JX
5006msgid "hash mismatch %s"
5007msgstr "哈希值与 %s 不匹配"
c1ac5258 5008
2b472aae 5009#: packfile.c:629
6937cb4e
JX
5010msgid "offset before end of packfile (broken .idx?)"
5011msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
5012
2b472aae 5013#: packfile.c:1899
6937cb4e
JX
5014#, c-format
5015msgid "offset before start of pack index for %s (corrupt index?)"
5016msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
5017
2b472aae 5018#: packfile.c:1903
6937cb4e
JX
5019#, c-format
5020msgid "offset beyond end of pack index for %s (truncated index?)"
5021msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
5022
2b472aae
JX
5023#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
5024#, c-format
5025msgid "unable to get size of %s"
440e7442 5026msgstr "无法得到 %s 的大小"
2b472aae 5027
d46c5519 5028#: parse-options.c:38
06991777
JX
5029#, c-format
5030msgid "%s requires a value"
8e4e0555 5031msgstr "%s 需要一个值"
06991777 5032
d46c5519 5033#: parse-options.c:73
06991777
JX
5034#, c-format
5035msgid "%s is incompatible with %s"
5036msgstr "%s 与 %s 不兼容"
5037
d46c5519 5038#: parse-options.c:78
06991777
JX
5039#, c-format
5040msgid "%s : incompatible with something else"
5041msgstr "%s:和其它的不兼容"
5042
2b472aae 5043#: parse-options.c:92 parse-options.c:96 parse-options.c:317
06991777
JX
5044#, c-format
5045msgid "%s takes no value"
8e4e0555 5046msgstr "%s 不取值"
06991777 5047
d46c5519 5048#: parse-options.c:94
06991777
JX
5049#, c-format
5050msgid "%s isn't available"
5051msgstr "%s 不可用"
5052
2b472aae 5053#: parse-options.c:217
06991777
JX
5054#, c-format
5055msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
5056msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
5057
2b472aae 5058#: parse-options.c:386
06991777
JX
5059#, c-format
5060msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
8e4e0555 5061msgstr "有歧义的选项:%s(可以是 --%s%s 或 --%s%s)"
06991777 5062
2b472aae 5063#: parse-options.c:420 parse-options.c:428
06991777 5064#, c-format
2b472aae
JX
5065msgid "did you mean `--%s` (with two dashes)?"
5066msgstr "你的意思是 `--%s`(有两个短线)?"
06991777 5067
2b472aae 5068#: parse-options.c:857
06991777
JX
5069#, c-format
5070msgid "unknown option `%s'"
5071msgstr "未知选项 `%s'"
5072
2b472aae 5073#: parse-options.c:859
06991777
JX
5074#, c-format
5075msgid "unknown switch `%c'"
5076msgstr "未知开关 `%c'"
5077
2b472aae 5078#: parse-options.c:861
06991777
JX
5079#, c-format
5080msgid "unknown non-ascii option in string: `%s'"
5b533632 5081msgstr "字符串中未知的非 ascii 字符选项:`%s'"
06991777 5082
2b472aae 5083#: parse-options.c:885
a0b6b246
JX
5084msgid "..."
5085msgstr "..."
5086
2b472aae 5087#: parse-options.c:904
5b04ee3b 5088#, c-format
a0b6b246
JX
5089msgid "usage: %s"
5090msgstr "用法:%s"
5b04ee3b 5091
a0b6b246 5092#. TRANSLATORS: the colon here should align with the
a4f16749
JX
5093#. one in "usage: %s" translation.
5094#.
2b472aae 5095#: parse-options.c:910
5b04ee3b 5096#, c-format
a0b6b246
JX
5097msgid " or: %s"
5098msgstr " 或:%s"
5b04ee3b 5099
a0b6b246 5100# 译者:为保证在输出中对齐,注意调整句中空格!
2b472aae 5101#: parse-options.c:913
5b04ee3b 5102#, c-format
a0b6b246
JX
5103msgid " %s"
5104msgstr " %s"
5b04ee3b 5105
2b472aae 5106#: parse-options.c:952
a0b6b246
JX
5107msgid "-NUM"
5108msgstr "-数字"
5109
2b472aae 5110#: parse-options.c:966
d46c5519
JX
5111#, c-format
5112msgid "alias of --%s"
5113msgstr "--%s 的别名"
5114
5115#: parse-options-cb.c:20 parse-options-cb.c:24
06991777
JX
5116#, c-format
5117msgid "option `%s' expects a numerical value"
5118msgstr "选项 `%s' 期望一个数字值"
5119
d46c5519 5120#: parse-options-cb.c:41
fd8cb379
JX
5121#, c-format
5122msgid "malformed expiration date '%s'"
5123msgstr "格式错误的到期时间:'%s'"
5124
d46c5519 5125#: parse-options-cb.c:54
06991777
JX
5126#, c-format
5127msgid "option `%s' expects \"always\", \"auto\", or \"never\""
5128msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
5129
d46c5519 5130#: parse-options-cb.c:130 parse-options-cb.c:147
5b04ee3b 5131#, c-format
a0b6b246 5132msgid "malformed object name '%s'"
fd8cb379 5133msgstr "格式错误的对象名 '%s'"
5b04ee3b 5134
ddc12c42 5135#: path.c:915
5b04ee3b 5136#, c-format
a0b6b246
JX
5137msgid "Could not make %s writable by group"
5138msgstr "不能设置 %s 为组可写"
5139
ddc12c42 5140#: pathspec.c:130
87cb7997
JX
5141msgid "Escape character '\\' not allowed as last character in attr value"
5142msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
5143
ddc12c42 5144#: pathspec.c:148
87cb7997
JX
5145msgid "Only one 'attr:' specification is allowed."
5146msgstr "只允许一个 'attr:' 规格。"
5147
ddc12c42 5148#: pathspec.c:151
87cb7997
JX
5149msgid "attr spec must not be empty"
5150msgstr "属性规格不能为空"
5151
ddc12c42 5152#: pathspec.c:194
87cb7997
JX
5153#, c-format
5154msgid "invalid attribute name %s"
5155msgstr "无效的属性名 %s"
5156
ddc12c42 5157#: pathspec.c:259
a0b6b246
JX
5158msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
5159msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
5160
ddc12c42 5161#: pathspec.c:266
5b04ee3b 5162msgid ""
a0b6b246
JX
5163"global 'literal' pathspec setting is incompatible with all other global "
5164"pathspec settings"
5165msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
5b04ee3b 5166
ddc12c42 5167#: pathspec.c:306
a0b6b246
JX
5168msgid "invalid parameter for pathspec magic 'prefix'"
5169msgstr "路径规格包含无效的神奇前缀"
5170
ddc12c42 5171#: pathspec.c:327
5b04ee3b 5172#, c-format
a0b6b246
JX
5173msgid "Invalid pathspec magic '%.*s' in '%s'"
5174msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
5b04ee3b 5175
ddc12c42 5176#: pathspec.c:332
5b04ee3b 5177#, c-format
a0b6b246
JX
5178msgid "Missing ')' at the end of pathspec magic in '%s'"
5179msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
5b04ee3b 5180
ddc12c42 5181#: pathspec.c:370
5b04ee3b 5182#, c-format
a0b6b246
JX
5183msgid "Unimplemented pathspec magic '%c' in '%s'"
5184msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
5b04ee3b 5185
ddc12c42 5186#: pathspec.c:429
5b04ee3b 5187#, c-format
a0b6b246
JX
5188msgid "%s: 'literal' and 'glob' are incompatible"
5189msgstr "%s:'literal' 和 'glob' 不兼容"
5b04ee3b 5190
ddc12c42 5191#: pathspec.c:442
5b04ee3b 5192#, c-format
2b472aae 5193msgid "%s: '%s' is outside repository at '%s'"
440e7442 5194msgstr "%s:'%s' 在位于 '%s' 的仓库之外"
5b04ee3b 5195
2b472aae 5196#: pathspec.c:517
5b04ee3b 5197#, c-format
1a79b2f1
JX
5198msgid "'%s' (mnemonic: '%c')"
5199msgstr "'%s'(助记符:'%c')"
5b04ee3b 5200
2b472aae 5201#: pathspec.c:527
5b04ee3b 5202#, c-format
a0b6b246
JX
5203msgid "%s: pathspec magic not supported by this command: %s"
5204msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
5205
2b472aae 5206#: pathspec.c:594
5b04ee3b 5207#, c-format
a0b6b246
JX
5208msgid "pathspec '%s' is beyond a symbolic link"
5209msgstr "路径规格 '%s' 位于符号链接中"
5210
2b472aae 5211#: pathspec.c:639
ddc12c42
JX
5212#, c-format
5213msgid "line is badly quoted: %s"
5214msgstr "行被错误地引用:%s"
5215
d46c5519
JX
5216#: pkt-line.c:92
5217msgid "unable to write flush packet"
5218msgstr "无法写 flush 包"
5219
5220#: pkt-line.c:99
5221msgid "unable to write delim packet"
5222msgstr "无法写 delim 包"
5223
5224#: pkt-line.c:106
c1ac5258
JX
5225msgid "flush packet write failed"
5226msgstr "flush 包写错误"
5227
d46c5519 5228#: pkt-line.c:146 pkt-line.c:232
c1ac5258
JX
5229msgid "protocol error: impossibly long line"
5230msgstr "协议错误:不可能的长行"
5231
d46c5519 5232#: pkt-line.c:162 pkt-line.c:164
c1ac5258
JX
5233msgid "packet write with format failed"
5234msgstr "格式化包写入错误"
5235
d46c5519 5236#: pkt-line.c:196
c1ac5258
JX
5237msgid "packet write failed - data exceeds max packet size"
5238msgstr "写数据包失败:数据超过了包的最大长度"
5239
d46c5519 5240#: pkt-line.c:203 pkt-line.c:210
c1ac5258
JX
5241msgid "packet write failed"
5242msgstr "数据包写入失败"
5243
d46c5519 5244#: pkt-line.c:295
c1ac5258
JX
5245msgid "read error"
5246msgstr "读取错误"
5247
d46c5519 5248#: pkt-line.c:303
c1ac5258
JX
5249msgid "the remote end hung up unexpectedly"
5250msgstr "远端意外挂断了"
5251
d46c5519 5252#: pkt-line.c:331
c1ac5258
JX
5253#, c-format
5254msgid "protocol error: bad line length character: %.4s"
5255msgstr "协议错误:错误的行长度字符串:%.4s"
5256
d46c5519 5257#: pkt-line.c:341 pkt-line.c:346
c1ac5258
JX
5258#, c-format
5259msgid "protocol error: bad line length %d"
5260msgstr "协议错误:错误的行长度 %d"
5261
d46c5519 5262#: pkt-line.c:362
06991777
JX
5263#, c-format
5264msgid "remote error: %s"
5265msgstr "远程错误:%s"
5266
5267#: preload-index.c:119
4c27fcb5
JX
5268msgid "Refreshing index"
5269msgstr "正在刷新索引"
5270
06991777 5271#: preload-index.c:138
4c27fcb5
JX
5272#, c-format
5273msgid "unable to create threaded lstat: %s"
5274msgstr "无法创建线程 lstat:%s"
5275
ddc12c42 5276#: pretty.c:981
a0b6b246
JX
5277msgid "unable to parse --pretty format"
5278msgstr "不能解析 --pretty 格式"
5279
ddc12c42 5280#: promisor-remote.c:23
a5cd71ca
JX
5281msgid "Remote with no URL"
5282msgstr "远程未设置 URL"
5283
ddc12c42 5284#: promisor-remote.c:58
a5cd71ca
JX
5285#, c-format
5286msgid "promisor remote name cannot begin with '/': %s"
5287msgstr "promisor 远程名称不能以 '/' 开始:%s"
5288
ddc12c42 5289#: range-diff.c:75
c1ac5258
JX
5290msgid "could not start `log`"
5291msgstr "不能启动 `log`"
5292
ddc12c42 5293#: range-diff.c:77
c1ac5258
JX
5294msgid "could not read `log` output"
5295msgstr "不能读取 `log` 的输出"
5296
2b472aae 5297#: range-diff.c:96 sequencer.c:5020
c1ac5258
JX
5298#, c-format
5299msgid "could not parse commit '%s'"
5300msgstr "不能解析提交 '%s'"
5301
ddc12c42 5302#: range-diff.c:122
a6cd2cc4
JX
5303#, c-format
5304msgid "could not parse git header '%.*s'"
5305msgstr "无法解析 git 头 '%.*s'"
5306
ddc12c42 5307#: range-diff.c:285
c1ac5258
JX
5308msgid "failed to generate diff"
5309msgstr "生成 diff 失败"
5310
ddc12c42 5311#: range-diff.c:518 range-diff.c:520
c1ac5258
JX
5312#, c-format
5313msgid "could not parse log for '%s'"
5314msgstr "不能解析 '%s' 的日志"
5315
d46c5519 5316#: read-cache.c:680
06991777
JX
5317#, c-format
5318msgid "will not add file alias '%s' ('%s' already exists in index)"
5319msgstr "将不会添加文件别名 '%s'('%s' 已经存在于索引中)"
5320
d46c5519 5321#: read-cache.c:696
06991777
JX
5322msgid "cannot create an empty blob in the object database"
5323msgstr "不能在对象数据库中创建空的数据对象"
5324
d46c5519 5325#: read-cache.c:718
06991777
JX
5326#, c-format
5327msgid "%s: can only add regular files, symbolic links or git-directories"
5328msgstr "%s:只能添加常规文件、符号链接或 git 目录"
5329
d46c5519
JX
5330#: read-cache.c:723
5331#, c-format
5332msgid "'%s' does not have a commit checked out"
5333msgstr "'%s' 没有检出一个提交"
5334
5335#: read-cache.c:775
06991777
JX
5336#, c-format
5337msgid "unable to index file '%s'"
5338msgstr "无法索引文件 '%s'"
5339
d46c5519 5340#: read-cache.c:794
06991777
JX
5341#, c-format
5342msgid "unable to add '%s' to index"
5343msgstr "无法在索引中添加 '%s'"
5344
d46c5519 5345#: read-cache.c:805
06991777
JX
5346#, c-format
5347msgid "unable to stat '%s'"
5348msgstr "无法对 %s 执行 stat"
5349
2b472aae 5350#: read-cache.c:1330
06991777
JX
5351#, c-format
5352msgid "'%s' appears as both a file and as a directory"
5b533632 5353msgstr "'%s' 看起来既是文件又是目录"
06991777 5354
2b472aae 5355#: read-cache.c:1536
4c27fcb5
JX
5356msgid "Refresh index"
5357msgstr "刷新索引"
5358
2b472aae 5359#: read-cache.c:1651
5b04ee3b
JX
5360#, c-format
5361msgid ""
a0b6b246
JX
5362"index.version set, but the value is invalid.\n"
5363"Using version %i"
5b04ee3b 5364msgstr ""
a0b6b246
JX
5365"设置了 index.version,但是取值无效。\n"
5366"使用版本 %i"
5b04ee3b 5367
2b472aae 5368#: read-cache.c:1661
5b04ee3b
JX
5369#, c-format
5370msgid ""
a0b6b246
JX
5371"GIT_INDEX_VERSION set, but the value is invalid.\n"
5372"Using version %i"
5b04ee3b 5373msgstr ""
a0b6b246
JX
5374"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
5375"使用版本 %i"
5b04ee3b 5376
2b472aae 5377#: read-cache.c:1717
06991777
JX
5378#, c-format
5379msgid "bad signature 0x%08x"
5380msgstr "坏的签名 0x%08x"
5381
2b472aae 5382#: read-cache.c:1720
06991777
JX
5383#, c-format
5384msgid "bad index version %d"
5385msgstr "坏的索引版本 %d"
5386
2b472aae 5387#: read-cache.c:1729
06991777 5388msgid "bad index file sha1 signature"
5b533632 5389msgstr "坏的索引文件 sha1 签名"
06991777 5390
2b472aae 5391#: read-cache.c:1759
06991777
JX
5392#, c-format
5393msgid "index uses %.4s extension, which we do not understand"
5394msgstr "索引使用不被支持的 %.4s 扩展"
5395
5396#
2b472aae 5397#: read-cache.c:1761
06991777
JX
5398#, c-format
5399msgid "ignoring %.4s extension"
5400msgstr "忽略 %.4s 扩展"
5401
2b472aae 5402#: read-cache.c:1798
06991777
JX
5403#, c-format
5404msgid "unknown index entry format 0x%08x"
5405msgstr "未知的索引条目格式 0x%08x"
5406
2b472aae 5407#: read-cache.c:1814
4c27fcb5
JX
5408#, c-format
5409msgid "malformed name field in the index, near path '%s'"
5410msgstr "索引中靠近路径 '%s' 有错误的名称字段"
5411
2b472aae 5412#: read-cache.c:1871
06991777
JX
5413msgid "unordered stage entries in index"
5414msgstr "索引中有未排序的暂存条目"
5415
2b472aae 5416#: read-cache.c:1874
06991777
JX
5417#, c-format
5418msgid "multiple stage entries for merged file '%s'"
5419msgstr "合并文件 '%s' 有多个暂存条目"
5420
2b472aae 5421#: read-cache.c:1877
06991777
JX
5422#, c-format
5423msgid "unordered stage entries for '%s'"
5424msgstr "'%s' 的未排序暂存条目"
5425
2b472aae
JX
5426#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
5427#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
5428#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
5429#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
5430#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
5431#: builtin/submodule--helper.c:332
4c27fcb5
JX
5432msgid "index file corrupt"
5433msgstr "索引文件损坏"
5434
2b472aae 5435#: read-cache.c:2124
4c27fcb5
JX
5436#, c-format
5437msgid "unable to create load_cache_entries thread: %s"
5438msgstr "无法创建 load_cache_entries 线程:%s"
5439
2b472aae 5440#: read-cache.c:2137
4c27fcb5
JX
5441#, c-format
5442msgid "unable to join load_cache_entries thread: %s"
5443msgstr "无法加入 load_cache_entries 线程:%s"
5444
2b472aae 5445#: read-cache.c:2170
06991777
JX
5446#, c-format
5447msgid "%s: index file open failed"
5448msgstr "%s:打开索引文件失败"
5449
2b472aae 5450#: read-cache.c:2174
06991777
JX
5451#, c-format
5452msgid "%s: cannot stat the open index"
5453msgstr "%s:不能对打开的索引执行 stat 操作"
5454
2b472aae 5455#: read-cache.c:2178
06991777
JX
5456#, c-format
5457msgid "%s: index file smaller than expected"
5458msgstr "%s:索引文件比预期的小"
5459
2b472aae 5460#: read-cache.c:2182
06991777
JX
5461#, c-format
5462msgid "%s: unable to map index file"
5463msgstr "%s:无法对索引文件执行 map 操作"
5464
2b472aae 5465#: read-cache.c:2224
4c27fcb5
JX
5466#, c-format
5467msgid "unable to create load_index_extensions thread: %s"
5468msgstr "无法创建 load_index_extensions 线程:%s"
5469
2b472aae 5470#: read-cache.c:2251
4c27fcb5
JX
5471#, c-format
5472msgid "unable to join load_index_extensions thread: %s"
5473msgstr "无法加入 load_index_extensions 线程:%s"
5474
2b472aae 5475#: read-cache.c:2283
06991777
JX
5476#, c-format
5477msgid "could not freshen shared index '%s'"
5478msgstr "无法刷新共享索引 '%s'"
5479
2b472aae 5480#: read-cache.c:2330
06991777
JX
5481#, c-format
5482msgid "broken index, expect %s in %s, got %s"
5483msgstr "损坏的索引,期望在 %2$s 中的 %1$s,得到 %3$s"
5484
2b472aae 5485#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
a4f16749
JX
5486#, c-format
5487msgid "could not close '%s'"
5488msgstr "不能关闭 '%s'"
5489
2b472aae 5490#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
87cb7997 5491#, c-format
60638e98 5492msgid "could not stat '%s'"
65e2041e 5493msgstr "不能对 '%s' 调用 stat"
87cb7997 5494
2b472aae 5495#: read-cache.c:3142
87cb7997
JX
5496#, c-format
5497msgid "unable to open git dir: %s"
5498msgstr "不能打开 git 目录:%s"
5499
2b472aae 5500#: read-cache.c:3154
87cb7997
JX
5501#, c-format
5502msgid "unable to unlink: %s"
5503msgstr "无法删除:%s"
5504
2b472aae 5505#: read-cache.c:3179
06991777
JX
5506#, c-format
5507msgid "cannot fix permission bits on '%s'"
5508msgstr "不能修复 '%s' 的权限位"
5509
2b472aae 5510#: read-cache.c:3328
06991777
JX
5511#, c-format
5512msgid "%s: cannot drop to stage #0"
5513msgstr "%s:不能落到暂存区 #0"
5514
2b472aae
JX
5515#: rebase-interactive.c:11
5516msgid ""
5517"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
5518"continue'.\n"
5519"Or you can abort the rebase with 'git rebase --abort'.\n"
5520msgstr ""
5521"您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n"
5522"或者您可以用 'git rebase --abort' 终止变基。\n"
5523
5524#: rebase-interactive.c:33
d46c5519
JX
5525#, c-format
5526msgid ""
5527"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
5528msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
5529
2b472aae 5530#: rebase-interactive.c:42
4c27fcb5
JX
5531msgid ""
5532"\n"
5533"Commands:\n"
5534"p, pick <commit> = use commit\n"
5535"r, reword <commit> = use commit, but edit the commit message\n"
5536"e, edit <commit> = use commit, but stop for amending\n"
5537"s, squash <commit> = use commit, but meld into previous commit\n"
5538"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
5539"x, exec <command> = run command (the rest of the line) using shell\n"
5540"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
5541"d, drop <commit> = remove commit\n"
5542"l, label <label> = label current HEAD with a name\n"
5543"t, reset <label> = reset HEAD to a label\n"
5544"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
5545". create a merge commit using the original merge commit's\n"
5546". message (or the oneline, if no original merge commit was\n"
5547". specified). Use -c <commit> to reword the commit message.\n"
5548"\n"
5549"These lines can be re-ordered; they are executed from top to bottom.\n"
5550msgstr ""
5551"\n"
5552"命令:\n"
5553"p, pick <提交> = 使用提交\n"
5554"r, reword <提交> = 使用提交,但修改提交说明\n"
5555"e, edit <提交> = 使用提交,进入 shell 以便进行提交修补\n"
5556"s, squash <提交> = 使用提交,但融合到前一个提交\n"
5557"f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
5558"x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
5559"b, break = 在此处停止(使用 'git rebase --continue' 继续变基)\n"
5560"d, drop <提交> = 删除提交\n"
5561"l, label <label> = 为当前 HEAD 打上标记\n"
5562"t, reset <label> = 重置 HEAD 到该标记\n"
5563"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
5564". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
5565". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
5566". -c <提交> 可以编辑提交说明。\n"
5567"\n"
5568"可以对这些行重新排序,将从上至下执行。\n"
5569
2b472aae 5570#: rebase-interactive.c:63
d46c5519
JX
5571#, c-format
5572msgid "Rebase %s onto %s (%d command)"
5573msgid_plural "Rebase %s onto %s (%d commands)"
5574msgstr[0] "变基 %s 到 %s(%d 个提交)"
5575msgstr[1] "变基 %s 到 %s(%d 个提交)"
5576
2b472aae 5577#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
4c27fcb5
JX
5578msgid ""
5579"\n"
5580"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
5581msgstr ""
5582"\n"
5583"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
5584
2b472aae 5585#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
4c27fcb5
JX
5586msgid ""
5587"\n"
5588"If you remove a line here THAT COMMIT WILL BE LOST.\n"
5589msgstr ""
5590"\n"
5591"如果您在这里删除一行,对应的提交将会丢失。\n"
5592
2b472aae 5593#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
4c27fcb5
JX
5594msgid ""
5595"\n"
5596"You are editing the todo file of an ongoing interactive rebase.\n"
5597"To continue rebase after editing, run:\n"
5598" git rebase --continue\n"
5599"\n"
5600msgstr ""
5601"\n"
5602"您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基,\n"
5603"请执行:\n"
5604" git rebase --continue\n"
5605"\n"
5606
2b472aae 5607#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
4c27fcb5
JX
5608msgid ""
5609"\n"
5610"However, if you remove everything, the rebase will be aborted.\n"
5611"\n"
5612msgstr ""
5613"\n"
5614"然而,如果您删除全部内容,变基操作将会终止。\n"
5615"\n"
5616
2b472aae
JX
5617#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
5618#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
4c27fcb5 5619#, c-format
d46c5519
JX
5620msgid "could not write '%s'"
5621msgstr "不能写入 '%s'"
5622
2b472aae
JX
5623#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
5624#: builtin/rebase.c:234
d46c5519 5625#, c-format
2b472aae
JX
5626msgid "could not write '%s'."
5627msgstr "不能写入 '%s'。"
d46c5519 5628
2b472aae 5629#: rebase-interactive.c:193
d46c5519
JX
5630#, c-format
5631msgid ""
5632"Warning: some commits may have been dropped accidentally.\n"
5633"Dropped commits (newer to older):\n"
5634msgstr ""
5635"警告:一些提交可能被意外丢弃。\n"
5636"丢弃的提交(从新到旧):\n"
5637
2b472aae 5638#: rebase-interactive.c:200
d46c5519
JX
5639#, c-format
5640msgid ""
5641"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
5642"\n"
5643"Use 'git config rebase.missingCommitsCheck' to change the level of "
5644"warnings.\n"
5645"The possible behaviours are: ignore, warn, error.\n"
5646"\n"
5647msgstr ""
5648"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
5649"\n"
5650"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
5651"可选值有:ignore、warn、error。\n"
5652"\n"
4c27fcb5 5653
2b472aae
JX
5654#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
5655#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
5656#: builtin/rebase.c:246
5657#, c-format
5658msgid "could not read '%s'."
5659msgstr "不能读取 '%s'。"
5660
a6cd2cc4 5661#: refs.c:262
c1ac5258
JX
5662#, c-format
5663msgid "%s does not point to a valid object!"
5664msgstr "%s 没有指向一个有效的对象!"
5665
a6cd2cc4 5666#: refs.c:667
c1ac5258
JX
5667#, c-format
5668msgid "ignoring dangling symref %s"
e640d114 5669msgstr "忽略悬空符号引用 %s"
c1ac5258 5670
a5cd71ca 5671#: refs.c:669 ref-filter.c:2098
c1ac5258
JX
5672#, c-format
5673msgid "ignoring broken ref %s"
5674msgstr "忽略损坏的引用 %s"
5675
a6cd2cc4 5676#: refs.c:804
c1ac5258
JX
5677#, c-format
5678msgid "could not open '%s' for writing: %s"
5679msgstr "无法为写入打开 '%s':%s"
5680
a6cd2cc4 5681#: refs.c:814 refs.c:865
c1ac5258
JX
5682#, c-format
5683msgid "could not read ref '%s'"
5684msgstr "无法读取引用 '%s'"
5685
a6cd2cc4 5686#: refs.c:820
c1ac5258
JX
5687#, c-format
5688msgid "ref '%s' already exists"
5689msgstr "引用 '%s' 已经存在"
5690
a6cd2cc4 5691#: refs.c:825
c1ac5258
JX
5692#, c-format
5693msgid "unexpected object ID when writing '%s'"
5694msgstr "写入 '%s' 时意外的对象 ID"
5695
2b472aae
JX
5696#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
5697#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
ddc12c42 5698#: wrapper.c:620
c1ac5258
JX
5699#, c-format
5700msgid "could not write to '%s'"
5701msgstr "不能写入 '%s'"
5702
2b472aae
JX
5703#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
5704#: builtin/rebase.c:1029
5b04ee3b 5705#, c-format
fd8cb379 5706msgid "could not open '%s' for writing"
a0b6b246 5707msgstr "无法打开 '%s' 进行写入"
5b04ee3b 5708
a6cd2cc4 5709#: refs.c:867
c1ac5258
JX
5710#, c-format
5711msgid "unexpected object ID when deleting '%s'"
5712msgstr "删除 '%s' 时意外的对象 ID"
5713
a6cd2cc4 5714#: refs.c:998
c1ac5258
JX
5715#, c-format
5716msgid "log for ref %s has gap after %s"
5717msgstr "引用 %s 的日志在 %s 之后有缺口"
5718
a6cd2cc4 5719#: refs.c:1004
c1ac5258
JX
5720#, c-format
5721msgid "log for ref %s unexpectedly ended on %s"
5722msgstr "引用 %s 的日志意外终止于 %s "
5723
a6cd2cc4 5724#: refs.c:1063
c1ac5258
JX
5725#, c-format
5726msgid "log for %s is empty"
5727msgstr "%s 的日志为空"
5728
a6cd2cc4 5729#: refs.c:1155
c1ac5258
JX
5730#, c-format
5731msgid "refusing to update ref with bad name '%s'"
5732msgstr "拒绝更新有错误名称 '%s' 的引用"
5733
a6cd2cc4 5734#: refs.c:1231
c1ac5258
JX
5735#, c-format
5736msgid "update_ref failed for ref '%s': %s"
5737msgstr "对引用 '%s' 执行 update_ref 失败:%s"
5738
a5cd71ca 5739#: refs.c:2023
c1ac5258
JX
5740#, c-format
5741msgid "multiple updates for ref '%s' not allowed"
5742msgstr "不允许对引用 '%s' 多次更新"
5743
a5cd71ca 5744#: refs.c:2055
60638e98
JX
5745msgid "ref updates forbidden inside quarantine environment"
5746msgstr "在隔离环境中禁止更新引用"
5747
a5cd71ca 5748#: refs.c:2151 refs.c:2181
c1ac5258
JX
5749#, c-format
5750msgid "'%s' exists; cannot create '%s'"
5751msgstr "'%s' 已存在,无法创建 '%s'"
5752
a5cd71ca 5753#: refs.c:2157 refs.c:2192
c1ac5258
JX
5754#, c-format
5755msgid "cannot process '%s' and '%s' at the same time"
5756msgstr "无法同时处理 '%s' 和 '%s'"
5757
2b472aae 5758#: refs/files-backend.c:1233
6937cb4e
JX
5759#, c-format
5760msgid "could not remove reference %s"
5761msgstr "无法删除引用 %s"
5762
2b472aae 5763#: refs/files-backend.c:1247 refs/packed-backend.c:1541
a5cd71ca 5764#: refs/packed-backend.c:1551
5b04ee3b 5765#, c-format
a0b6b246
JX
5766msgid "could not delete reference %s: %s"
5767msgstr "无法删除引用 %s:%s"
5b04ee3b 5768
2b472aae 5769#: refs/files-backend.c:1250 refs/packed-backend.c:1554
5b04ee3b 5770#, c-format
a0b6b246
JX
5771msgid "could not delete references: %s"
5772msgstr "无法删除引用:%s"
5b04ee3b 5773
c1ac5258
JX
5774#: refspec.c:137
5775#, c-format
5776msgid "invalid refspec '%s'"
5777msgstr "无效的引用表达式:'%s'"
5778
a5cd71ca 5779#: ref-filter.c:42 wt-status.c:1938
87cb7997
JX
5780msgid "gone"
5781msgstr "丢失"
5782
a6cd2cc4 5783#: ref-filter.c:43
87cb7997
JX
5784#, c-format
5785msgid "ahead %d"
5786msgstr "领先 %d"
5787
a6cd2cc4 5788#: ref-filter.c:44
87cb7997
JX
5789#, c-format
5790msgid "behind %d"
5791msgstr "落后 %d"
5792
a6cd2cc4 5793#: ref-filter.c:45
87cb7997
JX
5794#, c-format
5795msgid "ahead %d, behind %d"
5796msgstr "领先 %d,落后 %d"
5797
a5cd71ca 5798#: ref-filter.c:165
5b04ee3b 5799#, c-format
a0b6b246 5800msgid "expected format: %%(color:<color>)"
58b6f078 5801msgstr "期望的格式:%%(color:<颜色>)"
5b04ee3b 5802
a5cd71ca 5803#: ref-filter.c:167
5b04ee3b 5804#, c-format
a0b6b246
JX
5805msgid "unrecognized color: %%(color:%s)"
5806msgstr "未能识别的颜色:%%(color:%s)"
6c94aba5 5807
a5cd71ca 5808#: ref-filter.c:189
a0b6b246 5809#, c-format
87cb7997
JX
5810msgid "Integer value expected refname:lstrip=%s"
5811msgstr "期望整数值 refname:lstrip=%s"
90314792 5812
a5cd71ca 5813#: ref-filter.c:193
87cb7997
JX
5814#, c-format
5815msgid "Integer value expected refname:rstrip=%s"
5816msgstr "期望整数值 refname:rstrip=%s"
5817
a5cd71ca 5818#: ref-filter.c:195
87cb7997
JX
5819#, c-format
5820msgid "unrecognized %%(%s) argument: %s"
5821msgstr "未能识别的 %%(%s) 参数:%s"
5822
a5cd71ca 5823#: ref-filter.c:250
c1ac5258
JX
5824#, c-format
5825msgid "%%(objecttype) does not take arguments"
5826msgstr "%%(objecttype) 不带参数"
5827
a5cd71ca 5828#: ref-filter.c:272
06991777
JX
5829#, c-format
5830msgid "unrecognized %%(objectsize) argument: %s"
5831msgstr "未能识别的 %%(objectsize) 参数:%s"
5832
a5cd71ca 5833#: ref-filter.c:280
c1ac5258 5834#, c-format
06991777
JX
5835msgid "%%(deltabase) does not take arguments"
5836msgstr "%%(deltabase) 不带参数"
c1ac5258 5837
a5cd71ca 5838#: ref-filter.c:292
90314792 5839#, c-format
a0b6b246
JX
5840msgid "%%(body) does not take arguments"
5841msgstr "%%(body) 不带参数"
90314792 5842
a5cd71ca 5843#: ref-filter.c:301
a0b6b246
JX
5844#, c-format
5845msgid "%%(subject) does not take arguments"
5846msgstr "%%(subject) 不带参数"
90314792 5847
a5cd71ca 5848#: ref-filter.c:323
1a79b2f1 5849#, c-format
6937cb4e
JX
5850msgid "unknown %%(trailers) argument: %s"
5851msgstr "未知的 %%(trailers) 参数:%s"
1a79b2f1 5852
a5cd71ca 5853#: ref-filter.c:352
a0b6b246
JX
5854#, c-format
5855msgid "positive value expected contents:lines=%s"
87cb7997 5856msgstr "期望一个正数 contents:lines=%s"
90314792 5857
a5cd71ca 5858#: ref-filter.c:354
a0b6b246
JX
5859#, c-format
5860msgid "unrecognized %%(contents) argument: %s"
5861msgstr "未能识别的 %%(contents) 参数:%s"
90314792 5862
a5cd71ca 5863#: ref-filter.c:369
87cb7997
JX
5864#, c-format
5865msgid "positive value expected objectname:short=%s"
5866msgstr "期望一个正数 objectname:short=%s"
5867
a5cd71ca 5868#: ref-filter.c:373
a0b6b246
JX
5869#, c-format
5870msgid "unrecognized %%(objectname) argument: %s"
5871msgstr "未能识别的 %%(objectname) 参数:%s"
90314792 5872
a5cd71ca 5873#: ref-filter.c:403
a0b6b246
JX
5874#, c-format
5875msgid "expected format: %%(align:<width>,<position>)"
58b6f078 5876msgstr "期望的格式:%%(align:<宽度>,<位置>)"
90314792 5877
a5cd71ca 5878#: ref-filter.c:415
5c57d762 5879#, c-format
a0b6b246
JX
5880msgid "unrecognized position:%s"
5881msgstr "未能识别的位置:%s"
5c57d762 5882
a5cd71ca 5883#: ref-filter.c:422
1b7f4a34 5884#, c-format
a0b6b246
JX
5885msgid "unrecognized width:%s"
5886msgstr "未能识别的宽度:%s"
1b7f4a34 5887
a5cd71ca 5888#: ref-filter.c:431
1b7f4a34 5889#, c-format
a0b6b246
JX
5890msgid "unrecognized %%(align) argument: %s"
5891msgstr "未能识别的 %%(align) 参数:%s"
1b7f4a34 5892
a5cd71ca 5893#: ref-filter.c:439
1b7f4a34 5894#, c-format
a0b6b246
JX
5895msgid "positive width expected with the %%(align) atom"
5896msgstr "元素 %%(align) 需要一个正数的宽度"
1b7f4a34 5897
a5cd71ca 5898#: ref-filter.c:457
87cb7997
JX
5899#, c-format
5900msgid "unrecognized %%(if) argument: %s"
5901msgstr "未能识别的 %%(if) 参数:%s"
5902
a5cd71ca 5903#: ref-filter.c:559
07432cef 5904#, c-format
a0b6b246 5905msgid "malformed field name: %.*s"
fd8cb379 5906msgstr "格式错误的字段名:%.*s"
ef317cd5 5907
a5cd71ca 5908#: ref-filter.c:586
a0b6b246
JX
5909#, c-format
5910msgid "unknown field name: %.*s"
5911msgstr "未知的字段名:%.*s"
220c313c 5912
a5cd71ca 5913#: ref-filter.c:590
4c27fcb5
JX
5914#, c-format
5915msgid ""
5916"not a git repository, but the field '%.*s' requires access to object data"
5917msgstr "不是一个 git 仓库,但是字段 '%.*s' 需要访问对象数据"
5918
a5cd71ca 5919#: ref-filter.c:714
87cb7997
JX
5920#, c-format
5921msgid "format: %%(if) atom used without a %%(then) atom"
5922msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
5923
a5cd71ca 5924#: ref-filter.c:777
87cb7997
JX
5925#, c-format
5926msgid "format: %%(then) atom used without an %%(if) atom"
5927msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
5928
a5cd71ca 5929#: ref-filter.c:779
87cb7997
JX
5930#, c-format
5931msgid "format: %%(then) atom used more than once"
5932msgstr "格式:%%(then) 元素用了多次"
5933
a5cd71ca 5934#: ref-filter.c:781
87cb7997
JX
5935#, c-format
5936msgid "format: %%(then) atom used after %%(else)"
5937msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
5938
a5cd71ca 5939#: ref-filter.c:809
87cb7997
JX
5940#, c-format
5941msgid "format: %%(else) atom used without an %%(if) atom"
5942msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
5943
a5cd71ca 5944#: ref-filter.c:811
87cb7997
JX
5945#, c-format
5946msgid "format: %%(else) atom used without a %%(then) atom"
5947msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
5948
a5cd71ca 5949#: ref-filter.c:813
87cb7997
JX
5950#, c-format
5951msgid "format: %%(else) atom used more than once"
5952msgstr "格式:%%(else) 元素用了多次"
5953
a5cd71ca 5954#: ref-filter.c:828
7aea43ff 5955#, c-format
a0b6b246
JX
5956msgid "format: %%(end) atom used without corresponding atom"
5957msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
7aea43ff 5958
a5cd71ca 5959#: ref-filter.c:885
7aea43ff 5960#, c-format
a0b6b246 5961msgid "malformed format string %s"
fd8cb379 5962msgstr "错误的格式化字符串 %s"
7aea43ff 5963
a5cd71ca 5964#: ref-filter.c:1488
87cb7997 5965#, c-format
a6cd2cc4
JX
5966msgid "no branch, rebasing %s"
5967msgstr "非分支,正变基 %s"
c04f5ac3 5968
a5cd71ca 5969#: ref-filter.c:1491
c04f5ac3 5970#, c-format
a6cd2cc4
JX
5971msgid "no branch, rebasing detached HEAD %s"
5972msgstr "非分支,正变基分离头指针 %s"
c04f5ac3 5973
a5cd71ca 5974#: ref-filter.c:1494
a0b6b246 5975#, c-format
a6cd2cc4
JX
5976msgid "no branch, bisect started on %s"
5977msgstr "非分支,二分查找开始于 %s"
6792b93b 5978
a5cd71ca 5979#: ref-filter.c:1504
a6cd2cc4
JX
5980msgid "no branch"
5981msgstr "非分支"
87cb7997 5982
a5cd71ca 5983#: ref-filter.c:1540 ref-filter.c:1749
a0b6b246
JX
5984#, c-format
5985msgid "missing object %s for %s"
5986msgstr "缺失 %2$s 的对象 %1$s"
c04f5ac3 5987
a5cd71ca 5988#: ref-filter.c:1550
a0b6b246
JX
5989#, c-format
5990msgid "parse_object_buffer failed on %s for %s"
5991msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
6792b93b 5992
a5cd71ca 5993#: ref-filter.c:2004
a0b6b246
JX
5994#, c-format
5995msgid "malformed object at '%s'"
fd8cb379 5996msgstr "格式错误的对象 '%s'"
c04f5ac3 5997
a5cd71ca 5998#: ref-filter.c:2093
a0b6b246
JX
5999#, c-format
6000msgid "ignoring ref with broken name %s"
6001msgstr "忽略带有错误名称 %s 的引用"
c04f5ac3 6002
a5cd71ca 6003#: ref-filter.c:2389
a0b6b246
JX
6004#, c-format
6005msgid "format: %%(end) atom missing"
6006msgstr "格式:缺少 %%(end) 元素"
c04f5ac3 6007
a5cd71ca 6008#: ref-filter.c:2489
06991777
JX
6009#, c-format
6010msgid "option `%s' is incompatible with --merged"
6011msgstr "选项 `%s' 和 --merged 不兼容"
6012
a5cd71ca 6013#: ref-filter.c:2492
06991777
JX
6014#, c-format
6015msgid "option `%s' is incompatible with --no-merged"
6016msgstr "选项 `%s' 和 --no-merged 不兼容"
6017
a5cd71ca 6018#: ref-filter.c:2502
a0b6b246
JX
6019#, c-format
6020msgid "malformed object name %s"
fd8cb379 6021msgstr "格式错误的对象名 %s"
c04f5ac3 6022
a5cd71ca 6023#: ref-filter.c:2507
06991777
JX
6024#, c-format
6025msgid "option `%s' must point to a commit"
6026msgstr "选项 `%s' 必须指向一个提交"
6027
a5cd71ca 6028#: remote.c:366
06991777
JX
6029#, c-format
6030msgid "config remote shorthand cannot begin with '/': %s"
5b533632 6031msgstr "配置的远程短名称不能以 '/' 开始:%s"
06991777 6032
2b472aae 6033#: remote.c:414
06991777
JX
6034msgid "more than one receivepack given, using the first"
6035msgstr "提供了一个以上的 receivepack,使用第一个"
6036
2b472aae 6037#: remote.c:422
06991777
JX
6038msgid "more than one uploadpack given, using the first"
6039msgstr "提供了一个以上的 uploadpack,使用第一个"
6040
2b472aae 6041#: remote.c:612
a0b6b246
JX
6042#, c-format
6043msgid "Cannot fetch both %s and %s to %s"
6044msgstr "不能同时获取 %s 和 %s 至 %s"
c04f5ac3 6045
2b472aae 6046#: remote.c:616
c04f5ac3 6047#, c-format
a0b6b246
JX
6048msgid "%s usually tracks %s, not %s"
6049msgstr "%s 通常跟踪 %s,而非 %s"
c04f5ac3 6050
2b472aae 6051#: remote.c:620
a0b6b246
JX
6052#, c-format
6053msgid "%s tracks both %s and %s"
6054msgstr "%s 同时跟踪 %s 和 %s"
c04f5ac3 6055
2b472aae 6056#: remote.c:688
06991777
JX
6057#, c-format
6058msgid "key '%s' of pattern had no '*'"
6059msgstr "模式的键 '%s' 没有 '*'"
6060
2b472aae 6061#: remote.c:698
06991777
JX
6062#, c-format
6063msgid "value '%s' of pattern has no '*'"
6064msgstr "模式的值 '%s' 没有 '*'"
6065
2b472aae 6066#: remote.c:1004
06991777
JX
6067#, c-format
6068msgid "src refspec %s does not match any"
6069msgstr "源引用表达式 %s 没有匹配"
6070
2b472aae 6071#: remote.c:1009
06991777
JX
6072#, c-format
6073msgid "src refspec %s matches more than one"
6074msgstr "源引用表达式 %s 匹配超过一个"
6075
6076#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
6077#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
6078#. the <src>.
6079#.
2b472aae 6080#: remote.c:1024
06991777
JX
6081#, c-format
6082msgid ""
6083"The destination you provided is not a full refname (i.e.,\n"
6084"starting with \"refs/\"). We tried to guess what you meant by:\n"
6085"\n"
6086"- Looking for a ref that matches '%s' on the remote side.\n"
6087"- Checking if the <src> being pushed ('%s')\n"
6088" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
6089" refs/{heads,tags}/ prefix on the remote side.\n"
6090"\n"
6091"Neither worked, so we gave up. You must fully qualify the ref."
6092msgstr ""
6093"您提供的目标不是一个完整的引用名称(即以 \"refs/\" 开头)。我们\n"
6094"试着猜测您的想法:\n"
6095"\n"
6096"- 在远端查询和 '%s' 匹配的引用。\n"
6097"- 检查要推送的 <src>('%s')是不是在 \"refs/{heads,tags}/\" 中的\n"
6098" 引用。如果是,我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n"
6099"\n"
6100"都不行,所以我们已放弃。您必须给出完整的引用。"
6101
2b472aae 6102#: remote.c:1044
06991777
JX
6103#, c-format
6104msgid ""
6105"The <src> part of the refspec is a commit object.\n"
6106"Did you mean to create a new branch by pushing to\n"
6107"'%s:refs/heads/%s'?"
6108msgstr ""
6109"引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
6110"'%s:refs/heads/%s' 推送么?"
6111
2b472aae 6112#: remote.c:1049
06991777
JX
6113#, c-format
6114msgid ""
6115"The <src> part of the refspec is a tag object.\n"
6116"Did you mean to create a new tag by pushing to\n"
6117"'%s:refs/tags/%s'?"
6118msgstr ""
6119"引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
6120"'%s:refs/tags/%s' 推送么?"
6121
2b472aae 6122#: remote.c:1054
06991777
JX
6123#, c-format
6124msgid ""
6125"The <src> part of the refspec is a tree object.\n"
6126"Did you mean to tag a new tree by pushing to\n"
6127"'%s:refs/tags/%s'?"
6128msgstr ""
6129"引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
6130"'%s:refs/tags/%s' 推送么?"
6131
2b472aae 6132#: remote.c:1059
06991777
JX
6133#, c-format
6134msgid ""
6135"The <src> part of the refspec is a blob object.\n"
6136"Did you mean to tag a new blob by pushing to\n"
6137"'%s:refs/tags/%s'?"
6138msgstr ""
6139"引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
6140"'%s:refs/tags/%s' 推送么?"
6141
2b472aae 6142#: remote.c:1095
06991777
JX
6143#, c-format
6144msgid "%s cannot be resolved to branch"
6145msgstr "%s 无法被解析为分支"
6146
2b472aae 6147#: remote.c:1106
06991777
JX
6148#, c-format
6149msgid "unable to delete '%s': remote ref does not exist"
8e4e0555 6150msgstr "无法删除 '%s':远程引用不存在"
06991777 6151
2b472aae 6152#: remote.c:1118
06991777
JX
6153#, c-format
6154msgid "dst refspec %s matches more than one"
6155msgstr "目标引用表达式 %s 匹配超过一个"
6156
2b472aae 6157#: remote.c:1125
06991777
JX
6158#, c-format
6159msgid "dst ref %s receives from more than one src"
6160msgstr "目标引用 %s 接收超过一个源"
c04f5ac3 6161
2b472aae 6162#: remote.c:1628 remote.c:1729
a0b6b246
JX
6163msgid "HEAD does not point to a branch"
6164msgstr "HEAD 没有指向一个分支"
c04f5ac3 6165
2b472aae 6166#: remote.c:1637
a0b6b246
JX
6167#, c-format
6168msgid "no such branch: '%s'"
6169msgstr "没有此分支:'%s'"
c04f5ac3 6170
2b472aae 6171#: remote.c:1640
a0b6b246
JX
6172#, c-format
6173msgid "no upstream configured for branch '%s'"
6174msgstr "尚未给分支 '%s' 设置上游"
c04f5ac3 6175
2b472aae 6176#: remote.c:1646
a0b6b246
JX
6177#, c-format
6178msgid "upstream branch '%s' not stored as a remote-tracking branch"
6179msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
c04f5ac3 6180
2b472aae 6181#: remote.c:1661
a0b6b246
JX
6182#, c-format
6183msgid "push destination '%s' on remote '%s' has no local tracking branch"
6184msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
c04f5ac3 6185
2b472aae 6186#: remote.c:1673
a0b6b246
JX
6187#, c-format
6188msgid "branch '%s' has no remote for pushing"
6189msgstr "分支 '%s' 没有设置要推送的远程服务器"
cfff71a9 6190
2b472aae 6191#: remote.c:1683
a0b6b246
JX
6192#, c-format
6193msgid "push refspecs for '%s' do not include '%s'"
6194msgstr "向 '%s' 推送引用规格未包含 '%s'"
cfff71a9 6195
2b472aae 6196#: remote.c:1696
a0b6b246
JX
6197msgid "push has no destination (push.default is 'nothing')"
6198msgstr "推送无目标(push.default 是 'nothing')"
cfff71a9 6199
2b472aae 6200#: remote.c:1718
a0b6b246
JX
6201msgid "cannot resolve 'simple' push to a single destination"
6202msgstr "无法解析 'simple' 推送至一个单独的目标"
6c94aba5 6203
2b472aae 6204#: remote.c:1844
06991777
JX
6205#, c-format
6206msgid "couldn't find remote ref %s"
8e4e0555 6207msgstr "无法找到远程引用 %s"
06991777 6208
2b472aae 6209#: remote.c:1857
06991777
JX
6210#, c-format
6211msgid "* Ignoring funny ref '%s' locally"
6212msgstr "* 在本地忽略可笑的引用 '%s'"
6213
2b472aae 6214#: remote.c:2020
a0b6b246
JX
6215#, c-format
6216msgid "Your branch is based on '%s', but the upstream is gone.\n"
6217msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
6c94aba5 6218
2b472aae 6219#: remote.c:2024
a0b6b246
JX
6220msgid " (use \"git branch --unset-upstream\" to fixup)\n"
6221msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
6c94aba5 6222
2b472aae 6223#: remote.c:2027
a0b6b246 6224#, c-format
6937cb4e 6225msgid "Your branch is up to date with '%s'.\n"
a0b6b246 6226msgstr "您的分支与上游分支 '%s' 一致。\n"
cfff71a9 6227
2b472aae 6228#: remote.c:2031
31e5e17b
JX
6229#, c-format
6230msgid "Your branch and '%s' refer to different commits.\n"
6231msgstr "您的分支和 '%s' 指向不同的提交。\n"
6232
2b472aae 6233#: remote.c:2034
31e5e17b
JX
6234#, c-format
6235msgid " (use \"%s\" for details)\n"
6236msgstr " (使用 \"%s\" 查看详情)\n"
6237
2b472aae 6238#: remote.c:2038
a0b6b246
JX
6239#, c-format
6240msgid "Your branch is ahead of '%s' by %d commit.\n"
6241msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
6242msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
6243msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
cfff71a9 6244
2b472aae 6245#: remote.c:2044
a0b6b246
JX
6246msgid " (use \"git push\" to publish your local commits)\n"
6247msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
c04f5ac3 6248
2b472aae 6249#: remote.c:2047
a0b6b246
JX
6250#, c-format
6251msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
6252msgid_plural ""
6253"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
6254msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
6255msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 6256
a0b6b246 6257# 译者:注意保持前导空格
2b472aae 6258#: remote.c:2055
a0b6b246
JX
6259msgid " (use \"git pull\" to update your local branch)\n"
6260msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
c04f5ac3 6261
2b472aae 6262#: remote.c:2058
a0b6b246
JX
6263#, c-format
6264msgid ""
6265"Your branch and '%s' have diverged,\n"
6266"and have %d and %d different commit each, respectively.\n"
6267msgid_plural ""
6268"Your branch and '%s' have diverged,\n"
6269"and have %d and %d different commits each, respectively.\n"
6270msgstr[0] ""
6271"您的分支和 '%s' 出现了偏离,\n"
6272"并且分别有 %d 和 %d 处不同的提交。\n"
6273msgstr[1] ""
6274"您的分支和 '%s' 出现了偏离,\n"
6275"并且分别有 %d 和 %d 处不同的提交。\n"
90314792 6276
a0b6b246 6277# 译者:注意保持前导空格
2b472aae 6278#: remote.c:2068
a0b6b246
JX
6279msgid " (use \"git pull\" to merge the remote branch into yours)\n"
6280msgstr " (使用 \"git pull\" 来合并远程分支)\n"
90314792 6281
2b472aae 6282#: remote.c:2251
06991777
JX
6283#, c-format
6284msgid "cannot parse expected object name '%s'"
6285msgstr "无法解析期望的对象名 '%s'"
6286
4c27fcb5 6287#: replace-object.c:21
c1ac5258
JX
6288#, c-format
6289msgid "bad replace ref name: %s"
6290msgstr "错误的替换引用名称:%s"
6291
4c27fcb5 6292#: replace-object.c:30
c1ac5258
JX
6293#, c-format
6294msgid "duplicate replace ref: %s"
6295msgstr "重复的替换引用:%s"
6296
2b472aae 6297#: replace-object.c:82
c1ac5258
JX
6298#, c-format
6299msgid "replace depth too high for object %s"
6300msgstr "对象 %s 的替换层级太深"
6301
4c27fcb5
JX
6302#: rerere.c:217 rerere.c:226 rerere.c:229
6303msgid "corrupt MERGE_RR"
6304msgstr "损坏的 MERGE_RR"
6305
6306#: rerere.c:264 rerere.c:269
6307msgid "unable to write rerere record"
6308msgstr "无法写入 rerere 记录"
cfff71a9 6309
4c27fcb5
JX
6310#: rerere.c:495
6311#, c-format
6312msgid "there were errors while writing '%s' (%s)"
6313msgstr "写入 '%s' (%s) 时出错"
6792b93b 6314
4c27fcb5
JX
6315#: rerere.c:498
6316#, c-format
6317msgid "failed to flush '%s'"
6318msgstr "刷新 '%s' 失败"
5c57d762 6319
4c27fcb5 6320#: rerere.c:503 rerere.c:1039
5809aa05 6321#, c-format
4c27fcb5
JX
6322msgid "could not parse conflict hunks in '%s'"
6323msgstr "不能解析 '%s' 中的冲突块"
5809aa05 6324
4c27fcb5
JX
6325#: rerere.c:684
6326#, c-format
6327msgid "failed utime() on '%s'"
6328msgstr "在 '%s' 上调用 utime() 失败"
31e5e17b 6329
4c27fcb5 6330#: rerere.c:694
87cb7997 6331#, c-format
4c27fcb5
JX
6332msgid "writing '%s' failed"
6333msgstr "写入 '%s' 失败"
87cb7997 6334
4c27fcb5 6335#: rerere.c:714
87cb7997 6336#, c-format
4c27fcb5
JX
6337msgid "Staged '%s' using previous resolution."
6338msgstr "使用之前的解决方案暂存 '%s'。"
87cb7997 6339
4c27fcb5
JX
6340#: rerere.c:753
6341#, c-format
6342msgid "Recorded resolution for '%s'."
6343msgstr "已记录 '%s' 的解决方案。"
6792b93b 6344
4c27fcb5
JX
6345#: rerere.c:788
6346#, c-format
6347msgid "Resolved '%s' using previous resolution."
6348msgstr "使用之前的解决方案解决 '%s'。"
6349
6350#: rerere.c:803
6351#, c-format
6352msgid "cannot unlink stray '%s'"
6353msgstr "不能删除 stray '%s'"
6354
6355#: rerere.c:807
6356#, c-format
6357msgid "Recorded preimage for '%s'"
6358msgstr "为 '%s' 记录 preimage"
6359
2b472aae
JX
6360#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
6361#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
4c27fcb5
JX
6362#, c-format
6363msgid "could not create directory '%s'"
6364msgstr "不能创建目录 '%s'"
6365
6366#: rerere.c:1057
6367#, c-format
6368msgid "failed to update conflicted state in '%s'"
6369msgstr "更新 '%s' 中的冲突状态失败"
6370
6371#: rerere.c:1068 rerere.c:1075
6372#, c-format
6373msgid "no remembered resolution for '%s'"
6374msgstr "没有为 '%s' 记忆的解决方案"
6375
6376#: rerere.c:1077
6377#, c-format
6378msgid "cannot unlink '%s'"
6379msgstr "不能删除 '%s'"
6380
6381#: rerere.c:1087
6382#, c-format
6383msgid "Updated preimage for '%s'"
6384msgstr "已为 '%s' 更新 preimage"
6385
6386#: rerere.c:1096
6387#, c-format
6388msgid "Forgot resolution for '%s'\n"
6389msgstr "忘记 '%s' 的解决方案\n"
6390
6391#: rerere.c:1199
6392msgid "unable to open rr-cache directory"
6393msgstr "不能打开 rr-cache 目录"
6394
ddc12c42 6395#: revision.c:2497
4c27fcb5
JX
6396msgid "your current branch appears to be broken"
6397msgstr "您的当前分支好像被损坏"
6398
ddc12c42 6399#: revision.c:2500
4c27fcb5
JX
6400#, c-format
6401msgid "your current branch '%s' does not have any commits yet"
6402msgstr "您的当前分支 '%s' 尚无任何提交"
6403
ddc12c42 6404#: revision.c:2708
4c27fcb5
JX
6405msgid "--first-parent is incompatible with --bisect"
6406msgstr "--first-parent 与 --bisect 不兼容"
6407
ddc12c42 6408#: revision.c:2712
d46c5519
JX
6409msgid "-L does not yet support diff formats besides -p and -s"
6410msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
6411
2b472aae 6412#: run-command.c:763
4c27fcb5
JX
6413msgid "open /dev/null failed"
6414msgstr "不能打开 /dev/null"
6415
2b472aae 6416#: run-command.c:1269
4c27fcb5
JX
6417#, c-format
6418msgid "cannot create async thread: %s"
6419msgstr "不能创建 async 线程:%s"
6420
2b472aae 6421#: run-command.c:1333
4c27fcb5
JX
6422#, c-format
6423msgid ""
6424"The '%s' hook was ignored because it's not set as executable.\n"
6425"You can disable this warning with `git config advice.ignoredHook false`."
6426msgstr ""
6427"因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n"
6428"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
6429
ddc12c42 6430#: send-pack.c:144
4c27fcb5
JX
6431msgid "unexpected flush packet while reading remote unpack status"
6432msgstr "读取远程解包状态时收到意外的 flush 包"
6433
ddc12c42 6434#: send-pack.c:146
4c27fcb5
JX
6435#, c-format
6436msgid "unable to parse remote unpack status: %s"
6437msgstr "不能解析远程解包状态:%s"
6438
ddc12c42 6439#: send-pack.c:148
4c27fcb5
JX
6440#, c-format
6441msgid "remote unpack failed: %s"
6442msgstr "远程解包失败:%s"
6443
ddc12c42 6444#: send-pack.c:309
4c27fcb5
JX
6445msgid "failed to sign the push certificate"
6446msgstr "为推送证书签名失败"
6447
ddc12c42 6448#: send-pack.c:423
a0b6b246
JX
6449msgid "the receiving end does not support --signed push"
6450msgstr "接收端不支持签名推送"
6792b93b 6451
ddc12c42 6452#: send-pack.c:425
a0b6b246
JX
6453msgid ""
6454"not sending a push certificate since the receiving end does not support --"
6455"signed push"
6456msgstr "未发送推送证书,因为接收端不支持签名推送"
6792b93b 6457
ddc12c42 6458#: send-pack.c:437
a0b6b246
JX
6459msgid "the receiving end does not support --atomic push"
6460msgstr "接收端不支持原子推送"
6792b93b 6461
ddc12c42 6462#: send-pack.c:442
a0b6b246
JX
6463msgid "the receiving end does not support push options"
6464msgstr "接收端不支持推送选项"
6792b93b 6465
2b472aae 6466#: sequencer.c:191
31e5e17b
JX
6467#, c-format
6468msgid "invalid commit message cleanup mode '%s'"
6469msgstr "无效的提交信息清理模式 '%s'"
6470
2b472aae 6471#: sequencer.c:296
fd8cb379
JX
6472#, c-format
6473msgid "could not delete '%s'"
6474msgstr "无法删除 '%s'"
6475
2b472aae 6476#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
a6cd2cc4
JX
6477#, c-format
6478msgid "could not remove '%s'"
6479msgstr "无法删除 '%s'"
6480
2b472aae 6481#: sequencer.c:325
a0b6b246
JX
6482msgid "revert"
6483msgstr "还原"
6792b93b 6484
2b472aae 6485#: sequencer.c:327
a0b6b246
JX
6486msgid "cherry-pick"
6487msgstr "拣选"
6488
ddc12c42 6489#: sequencer.c:329
2b472aae
JX
6490msgid "rebase"
6491msgstr "变基"
6492
6493#: sequencer.c:331
1a79b2f1 6494#, c-format
c1ac5258 6495msgid "unknown action: %d"
1a79b2f1
JX
6496msgstr "未知动作:%d"
6497
2b472aae 6498#: sequencer.c:389
a0b6b246
JX
6499msgid ""
6500"after resolving the conflicts, mark the corrected paths\n"
6501"with 'git add <paths>' or 'git rm <paths>'"
6502msgstr ""
6503"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
6504"命令标记修正后的文件"
6505
2b472aae 6506#: sequencer.c:392
a0b6b246
JX
6507msgid ""
6508"after resolving the conflicts, mark the corrected paths\n"
6509"with 'git add <paths>' or 'git rm <paths>'\n"
6510"and commit the result with 'git commit'"
6511msgstr ""
6512"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
6513"对修正后的文件做标记,然后用 'git commit' 提交"
1b7f4a34 6514
2b472aae 6515#: sequencer.c:405 sequencer.c:2901
1b7f4a34 6516#, c-format
a0b6b246
JX
6517msgid "could not lock '%s'"
6518msgstr "不能锁定 '%s'"
1b7f4a34 6519
2b472aae 6520#: sequencer.c:412
a0b6b246 6521#, c-format
72351d7d 6522msgid "could not write eol to '%s'"
a0b6b246 6523msgstr "不能将换行符写入 '%s'"
1b7f4a34 6524
2b472aae
JX
6525#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
6526#: sequencer.c:3185
1b7f4a34 6527#, c-format
31e5e17b
JX
6528msgid "failed to finalize '%s'"
6529msgstr "无法完成 '%s'"
1b7f4a34 6530
2b472aae
JX
6531#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
6532#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
6533#: builtin/rebase.c:593
a0b6b246
JX
6534#, c-format
6535msgid "could not read '%s'"
6536msgstr "不能读取 '%s'"
1b7f4a34 6537
2b472aae 6538#: sequencer.c:466
63af42fe 6539#, c-format
a0b6b246
JX
6540msgid "your local changes would be overwritten by %s."
6541msgstr "您的本地修改将被%s覆盖。"
63af42fe 6542
2b472aae 6543#: sequencer.c:470
a0b6b246 6544msgid "commit your changes or stash them to proceed."
a4f16749 6545msgstr "提交您的修改或贮藏后再继续。"
6792b93b 6546
2b472aae 6547#: sequencer.c:502
a0b6b246
JX
6548#, c-format
6549msgid "%s: fast-forward"
6550msgstr "%s:快进"
6792b93b 6551
2b472aae 6552#: sequencer.c:541 builtin/tag.c:565
d46c5519
JX
6553#, c-format
6554msgid "Invalid cleanup mode %s"
6555msgstr "无效的清理模式 %s"
6556
1a79b2f1 6557#. TRANSLATORS: %s will be "revert", "cherry-pick" or
2b472aae 6558#. "rebase".
1a79b2f1 6559#.
2b472aae 6560#: sequencer.c:635
a0b6b246
JX
6561#, c-format
6562msgid "%s: Unable to write new index file"
6563msgstr "%s:无法写入新索引文件"
6792b93b 6564
2b472aae 6565#: sequencer.c:652
5809aa05
JX
6566msgid "unable to update cache tree"
6567msgstr "不能更新缓存树"
6792b93b 6568
2b472aae 6569#: sequencer.c:666
fd8cb379
JX
6570msgid "could not resolve HEAD commit"
6571msgstr "不能解析 HEAD 提交"
6572
2b472aae 6573#: sequencer.c:746
4c27fcb5
JX
6574#, c-format
6575msgid "no key present in '%.*s'"
6576msgstr "在 '%.*s' 中没有 key"
6577
2b472aae 6578#: sequencer.c:757
c1ac5258 6579#, c-format
4c27fcb5
JX
6580msgid "unable to dequote value of '%s'"
6581msgstr "无法为 '%s' 的值去引号"
c1ac5258 6582
2b472aae
JX
6583#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
6584#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
c1ac5258 6585#, c-format
4c27fcb5
JX
6586msgid "could not open '%s' for reading"
6587msgstr "无法打开 '%s' 进行读取"
6588
2b472aae 6589#: sequencer.c:804
4c27fcb5
JX
6590msgid "'GIT_AUTHOR_NAME' already given"
6591msgstr "已经给出 'GIT_AUTHOR_NAME'"
c1ac5258 6592
2b472aae 6593#: sequencer.c:809
4c27fcb5
JX
6594msgid "'GIT_AUTHOR_EMAIL' already given"
6595msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
6596
2b472aae 6597#: sequencer.c:814
4c27fcb5
JX
6598msgid "'GIT_AUTHOR_DATE' already given"
6599msgstr "已经给出 'GIT_AUTHOR_DATE'"
6600
2b472aae 6601#: sequencer.c:818
4c27fcb5
JX
6602#, c-format
6603msgid "unknown variable '%s'"
6604msgstr "未知变量 '%s'"
6605
2b472aae 6606#: sequencer.c:823
4c27fcb5
JX
6607msgid "missing 'GIT_AUTHOR_NAME'"
6608msgstr "缺少 'GIT_AUTHOR_NAME'"
6609
2b472aae 6610#: sequencer.c:825
4c27fcb5
JX
6611msgid "missing 'GIT_AUTHOR_EMAIL'"
6612msgstr "缺少 'GIT_AUTHOR_EMAIL'"
6613
2b472aae 6614#: sequencer.c:827
4c27fcb5
JX
6615msgid "missing 'GIT_AUTHOR_DATE'"
6616msgstr "缺少 'GIT_AUTHOR_DATE'"
6617
2b472aae 6618#: sequencer.c:876
63af42fe
JX
6619#, c-format
6620msgid ""
a0b6b246
JX
6621"you have staged changes in your working tree\n"
6622"If these changes are meant to be squashed into the previous commit, run:\n"
6623"\n"
6624" git commit --amend %s\n"
6625"\n"
6626"If they are meant to go into a new commit, run:\n"
6627"\n"
6628" git commit %s\n"
6629"\n"
6630"In both cases, once you're done, continue with:\n"
6631"\n"
6632" git rebase --continue\n"
6633msgstr ""
1a79b2f1
JX
6634"您的工作区中存在已暂存的修改\n"
6635"如果这些修改需要被并入前一个提交,执行:\n"
a0b6b246
JX
6636"\n"
6637" git commit --amend %s\n"
6638"\n"
29004bbb 6639"如果这些修改要形成一个新提交,执行:\n"
a0b6b246
JX
6640"\n"
6641" git commit %s\n"
6642"\n"
6643"无论哪种情况,当您完成提交,继续执行:\n"
6644"\n"
6645" git rebase --continue\n"
6792b93b 6646
2b472aae 6647#: sequencer.c:1148
31e5e17b
JX
6648msgid "'prepare-commit-msg' hook failed"
6649msgstr "'prepare-commit-msg' 钩子失败"
6650
2b472aae 6651#: sequencer.c:1154
31e5e17b
JX
6652msgid ""
6653"Your name and email address were configured automatically based\n"
6654"on your username and hostname. Please check that they are accurate.\n"
6655"You can suppress this message by setting them explicitly. Run the\n"
6656"following command and follow the instructions in your editor to edit\n"
6657"your configuration file:\n"
6658"\n"
6659" git config --global --edit\n"
6660"\n"
6661"After doing this, you may fix the identity used for this commit with:\n"
6662"\n"
6663" git commit --amend --reset-author\n"
6664msgstr ""
6665"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6666"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
6667"中编辑您的配置文件:\n"
6668"\n"
6669" git config --global --edit\n"
6670"\n"
6671"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6672"\n"
6673" git commit --amend --reset-author\n"
6674
2b472aae 6675#: sequencer.c:1167
31e5e17b
JX
6676msgid ""
6677"Your name and email address were configured automatically based\n"
6678"on your username and hostname. Please check that they are accurate.\n"
6679"You can suppress this message by setting them explicitly:\n"
6680"\n"
6681" git config --global user.name \"Your Name\"\n"
6682" git config --global user.email you@example.com\n"
6683"\n"
6684"After doing this, you may fix the identity used for this commit with:\n"
6685"\n"
6686" git commit --amend --reset-author\n"
6687msgstr ""
6688"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6689"与否。您可以对其进行设置以免再出现本提示信息:\n"
6690"\n"
6691" git config --global user.name \"Your Name\"\n"
6692" git config --global user.email you@example.com\n"
6693"\n"
6694"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6695"\n"
6696" git commit --amend --reset-author\n"
6697
2b472aae 6698#: sequencer.c:1209
31e5e17b
JX
6699msgid "couldn't look up newly created commit"
6700msgstr "无法找到新创建的提交"
6701
2b472aae 6702#: sequencer.c:1211
31e5e17b
JX
6703msgid "could not parse newly created commit"
6704msgstr "不能解析新创建的提交"
6705
2b472aae 6706#: sequencer.c:1257
31e5e17b
JX
6707msgid "unable to resolve HEAD after creating commit"
6708msgstr "创建提交后,不能解析 HEAD"
6709
2b472aae 6710#: sequencer.c:1259
31e5e17b
JX
6711msgid "detached HEAD"
6712msgstr "分离头指针"
6713
6714# 译者:中文字符串拼接,可删除前导空格
2b472aae 6715#: sequencer.c:1263
31e5e17b
JX
6716msgid " (root-commit)"
6717msgstr "(根提交)"
6718
2b472aae 6719#: sequencer.c:1284
31e5e17b
JX
6720msgid "could not parse HEAD"
6721msgstr "不能解析 HEAD"
6722
2b472aae 6723#: sequencer.c:1286
31e5e17b
JX
6724#, c-format
6725msgid "HEAD %s is not a commit!"
6726msgstr "HEAD %s 不是一个提交!"
6727
2b472aae 6728#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
31e5e17b
JX
6729msgid "could not parse HEAD commit"
6730msgstr "不能解析 HEAD 提交"
6731
2b472aae 6732#: sequencer.c:1342 sequencer.c:1968
31e5e17b
JX
6733msgid "unable to parse commit author"
6734msgstr "不能解析提交作者"
6735
2b472aae 6736#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
31e5e17b
JX
6737msgid "git write-tree failed to write a tree"
6738msgstr "git write-tree 无法写入树对象"
6739
2b472aae 6740#: sequencer.c:1386 sequencer.c:1447
31e5e17b
JX
6741#, c-format
6742msgid "unable to read commit message from '%s'"
6743msgstr "不能从 '%s' 读取提交说明"
6744
2b472aae
JX
6745#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
6746#: builtin/merge.c:911
31e5e17b 6747msgid "failed to write commit object"
c1ac5258 6748msgstr "写提交对象失败"
31e5e17b 6749
2b472aae 6750#: sequencer.c:1474
a0b6b246 6751#, c-format
5809aa05
JX
6752msgid "could not parse commit %s"
6753msgstr "不能解析提交 %s"
6792b93b 6754
2b472aae 6755#: sequencer.c:1479
63af42fe 6756#, c-format
5809aa05
JX
6757msgid "could not parse parent commit %s"
6758msgstr "不能解析父提交 %s"
63af42fe 6759
2b472aae 6760#: sequencer.c:1562 sequencer.c:1673
c1ac5258
JX
6761#, c-format
6762msgid "unknown command: %d"
6763msgstr "未知命令:%d"
6764
2b472aae 6765#: sequencer.c:1620 sequencer.c:1645
1a79b2f1
JX
6766#, c-format
6767msgid "This is a combination of %d commits."
6768msgstr "这是一个 %d 个提交的组合。"
6769
2b472aae 6770#: sequencer.c:1630
1a79b2f1
JX
6771msgid "need a HEAD to fixup"
6772msgstr "需要一个 HEAD 来修复"
6773
2b472aae 6774#: sequencer.c:1632 sequencer.c:3212
1a79b2f1
JX
6775msgid "could not read HEAD"
6776msgstr "不能读取 HEAD"
6777
2b472aae 6778#: sequencer.c:1634
1a79b2f1
JX
6779msgid "could not read HEAD's commit message"
6780msgstr "不能读取 HEAD 的提交说明"
6781
2b472aae 6782#: sequencer.c:1640
1a79b2f1
JX
6783#, c-format
6784msgid "cannot write '%s'"
6785msgstr "不能写 '%s'"
6786
2b472aae 6787#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
1a79b2f1
JX
6788msgid "This is the 1st commit message:"
6789msgstr "这是第一个提交说明:"
6790
2b472aae 6791#: sequencer.c:1655
1a79b2f1
JX
6792#, c-format
6793msgid "could not read commit message of %s"
6794msgstr "不能读取 %s 的提交说明"
6795
2b472aae 6796#: sequencer.c:1662
1a79b2f1
JX
6797#, c-format
6798msgid "This is the commit message #%d:"
6799msgstr "这是提交说明 #%d:"
6800
2b472aae 6801#: sequencer.c:1668
1a79b2f1
JX
6802#, c-format
6803msgid "The commit message #%d will be skipped:"
6804msgstr "提交说明 #%d 将被跳过:"
6805
2b472aae 6806#: sequencer.c:1756
a0b6b246
JX
6807msgid "your index file is unmerged."
6808msgstr "您的索引文件未完成合并。"
6792b93b 6809
2b472aae 6810#: sequencer.c:1763
fd8cb379
JX
6811msgid "cannot fixup root commit"
6812msgstr "不能修复根提交"
6813
2b472aae 6814#: sequencer.c:1782
a0b6b246
JX
6815#, c-format
6816msgid "commit %s is a merge but no -m option was given."
6817msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
6792b93b 6818
2b472aae 6819#: sequencer.c:1790 sequencer.c:1798
a0b6b246
JX
6820#, c-format
6821msgid "commit %s does not have parent %d"
6822msgstr "提交 %s 没有第 %d 个父提交"
6823
2b472aae 6824#: sequencer.c:1804
1a79b2f1
JX
6825#, c-format
6826msgid "cannot get commit message for %s"
6827msgstr "不能得到 %s 的提交说明"
6828
a0b6b246
JX
6829#. TRANSLATORS: The first %s will be a "todo" command like
6830#. "revert" or "pick", the second %s a SHA1.
2b472aae 6831#: sequencer.c:1823
a0b6b246
JX
6832#, c-format
6833msgid "%s: cannot parse parent commit %s"
6834msgstr "%s:不能解析父提交 %s"
6835
2b472aae 6836#: sequencer.c:1888
a0b6b246 6837#, c-format
1a79b2f1
JX
6838msgid "could not rename '%s' to '%s'"
6839msgstr "不能将 '%s' 重命名为 '%s'"
a0b6b246 6840
2b472aae 6841#: sequencer.c:1943
a0b6b246
JX
6842#, c-format
6843msgid "could not revert %s... %s"
6844msgstr "不能还原 %s... %s"
6845
2b472aae 6846#: sequencer.c:1944
a0b6b246
JX
6847#, c-format
6848msgid "could not apply %s... %s"
6849msgstr "不能应用 %s... %s"
6850
2b472aae
JX
6851#: sequencer.c:1961
6852#, c-format
6853msgid "dropping %s %s -- patch contents already upstream\n"
6854msgstr "丢弃 %s %s -- 补丁内容已在上游\n"
6855
6856#: sequencer.c:2018
a0b6b246
JX
6857#, c-format
6858msgid "git %s: failed to read the index"
6859msgstr "git %s:无法读取索引"
6860
2b472aae 6861#: sequencer.c:2025
a0b6b246
JX
6862#, c-format
6863msgid "git %s: failed to refresh the index"
6864msgstr "git %s:无法刷新索引"
6865
2b472aae 6866#: sequencer.c:2102
5809aa05
JX
6867#, c-format
6868msgid "%s does not accept arguments: '%s'"
6869msgstr "%s 不接受参数:'%s'"
6870
2b472aae 6871#: sequencer.c:2111
5809aa05
JX
6872#, c-format
6873msgid "missing arguments for %s"
6874msgstr "缺少 %s 的参数"
6875
2b472aae 6876#: sequencer.c:2142
d46c5519 6877#, c-format
2b472aae
JX
6878msgid "could not parse '%s'"
6879msgstr "无法解析 '%s'"
d46c5519 6880
2b472aae 6881#: sequencer.c:2203
a0b6b246
JX
6882#, c-format
6883msgid "invalid line %d: %.*s"
6884msgstr "无效行 %d:%.*s"
6885
2b472aae 6886#: sequencer.c:2214
1a79b2f1
JX
6887#, c-format
6888msgid "cannot '%s' without a previous commit"
6889msgstr "没有父提交的情况下不能 '%s'"
a0b6b246 6890
2b472aae 6891#: sequencer.c:2298
a6cd2cc4
JX
6892msgid "cancelling a cherry picking in progress"
6893msgstr "正在取消一个进行中的拣选"
6894
2b472aae 6895#: sequencer.c:2305
a6cd2cc4
JX
6896msgid "cancelling a revert in progress"
6897msgstr "正在取消一个进行中的还原"
6898
2b472aae 6899#: sequencer.c:2349
1a79b2f1
JX
6900msgid "please fix this using 'git rebase --edit-todo'."
6901msgstr "请用 'git rebase --edit-todo' 来修改。"
6902
2b472aae 6903#: sequencer.c:2351
a0b6b246
JX
6904#, c-format
6905msgid "unusable instruction sheet: '%s'"
29004bbb 6906msgstr "不可用的指令清单:'%s'"
a0b6b246 6907
2b472aae 6908#: sequencer.c:2356
1a79b2f1
JX
6909msgid "no commits parsed."
6910msgstr "没有解析提交。"
6911
2b472aae 6912#: sequencer.c:2367
a0b6b246
JX
6913msgid "cannot cherry-pick during a revert."
6914msgstr "不能在回退中执行拣选。"
6915
2b472aae 6916#: sequencer.c:2369
a0b6b246
JX
6917msgid "cannot revert during a cherry-pick."
6918msgstr "不能在拣选中执行回退。"
6919
2b472aae 6920#: sequencer.c:2447
a0b6b246
JX
6921#, c-format
6922msgid "invalid value for %s: %s"
6923msgstr "%s 的值无效:%s"
6924
2b472aae 6925#: sequencer.c:2540
fd8cb379
JX
6926msgid "unusable squash-onto"
6927msgstr "不可用的 squash-onto"
6928
2b472aae 6929#: sequencer.c:2556
a0b6b246
JX
6930#, c-format
6931msgid "malformed options sheet: '%s'"
fd8cb379 6932msgstr "格式错误的选项清单:'%s'"
a0b6b246 6933
2b472aae 6934#: sequencer.c:2644 sequencer.c:4361
c1ac5258
JX
6935msgid "empty commit set passed"
6936msgstr "提供了空的提交集"
6937
2b472aae 6938#: sequencer.c:2660
a6cd2cc4
JX
6939msgid "revert is already in progress"
6940msgstr "一个还原操作已在进行"
a0b6b246 6941
2b472aae 6942#: sequencer.c:2662
a6cd2cc4
JX
6943#, c-format
6944msgid "try \"git revert (--continue | %s--abort | --quit)\""
6945msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
6946
2b472aae 6947#: sequencer.c:2665
a6cd2cc4
JX
6948msgid "cherry-pick is already in progress"
6949msgstr "拣选操作已在进行"
6950
2b472aae 6951#: sequencer.c:2667
a6cd2cc4
JX
6952#, c-format
6953msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
6954msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
a0b6b246 6955
2b472aae 6956#: sequencer.c:2681
a0b6b246
JX
6957#, c-format
6958msgid "could not create sequencer directory '%s'"
6959msgstr "不能创建序列目录 '%s'"
6960
2b472aae 6961#: sequencer.c:2696
a0b6b246
JX
6962msgid "could not lock HEAD"
6963msgstr "不能锁定 HEAD"
6964
2b472aae 6965#: sequencer.c:2756 sequencer.c:4099
a0b6b246
JX
6966msgid "no cherry-pick or revert in progress"
6967msgstr "拣选或还原操作并未进行"
6968
2b472aae 6969#: sequencer.c:2758 sequencer.c:2769
a0b6b246
JX
6970msgid "cannot resolve HEAD"
6971msgstr "不能解析 HEAD"
6972
2b472aae 6973#: sequencer.c:2760 sequencer.c:2804
a0b6b246
JX
6974msgid "cannot abort from a branch yet to be born"
6975msgstr "不能从尚未建立的分支终止"
6976
2b472aae 6977#: sequencer.c:2790 builtin/grep.c:724
a0b6b246
JX
6978#, c-format
6979msgid "cannot open '%s'"
6980msgstr "不能打开 '%s'"
6981
2b472aae 6982#: sequencer.c:2792
a0b6b246
JX
6983#, c-format
6984msgid "cannot read '%s': %s"
6985msgstr "不能读取 '%s':%s"
6986
2b472aae 6987#: sequencer.c:2793
a0b6b246
JX
6988msgid "unexpected end of file"
6989msgstr "意外的文件结束"
6990
2b472aae 6991#: sequencer.c:2799
a0b6b246
JX
6992#, c-format
6993msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
6994msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
6995
2b472aae 6996#: sequencer.c:2810
1a79b2f1
JX
6997msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
6998msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
6999
2b472aae 7000#: sequencer.c:2851
a6cd2cc4
JX
7001msgid "no revert in progress"
7002msgstr "没有正在进行的还原"
7003
2b472aae 7004#: sequencer.c:2859
a6cd2cc4
JX
7005msgid "no cherry-pick in progress"
7006msgstr "没有正在进行的拣选"
7007
2b472aae 7008#: sequencer.c:2869
a6cd2cc4
JX
7009msgid "failed to skip the commit"
7010msgstr "无法跳过这个提交"
7011
2b472aae 7012#: sequencer.c:2876
a6cd2cc4
JX
7013msgid "there is nothing to skip"
7014msgstr "没有要跳过的"
7015
2b472aae 7016#: sequencer.c:2879
a6cd2cc4
JX
7017#, c-format
7018msgid ""
7019"have you committed already?\n"
7020"try \"git %s --continue\""
7021msgstr ""
7022"您已经提交了么?\n"
7023"试试 \"git %s --continue\""
7024
2b472aae 7025#: sequencer.c:3003 sequencer.c:4011
31e5e17b
JX
7026#, c-format
7027msgid "could not update %s"
7028msgstr "不能更新 %s"
7029
2b472aae 7030#: sequencer.c:3042 sequencer.c:3991
1a79b2f1
JX
7031msgid "cannot read HEAD"
7032msgstr "不能读取 HEAD"
7033
2b472aae 7034#: sequencer.c:3059
c1ac5258
JX
7035#, c-format
7036msgid "unable to copy '%s' to '%s'"
7037msgstr "无法拷贝 '%s' 至 '%s'"
7038
2b472aae 7039#: sequencer.c:3067
c1ac5258
JX
7040#, c-format
7041msgid ""
7042"You can amend the commit now, with\n"
7043"\n"
7044" git commit --amend %s\n"
7045"\n"
7046"Once you are satisfied with your changes, run\n"
7047"\n"
7048" git rebase --continue\n"
7049msgstr ""
7050"您现在可以修补这个提交,使用\n"
7051"\n"
7052" git commit --amend %s\n"
7053"\n"
7054"当您对变更感到满意,执行\n"
7055"\n"
7056" git rebase --continue\n"
7057
2b472aae 7058#: sequencer.c:3077
c1ac5258
JX
7059#, c-format
7060msgid "Could not apply %s... %.*s"
7061msgstr "不能应用 %s... %.*s"
7062
2b472aae 7063#: sequencer.c:3084
c1ac5258
JX
7064#, c-format
7065msgid "Could not merge %.*s"
7066msgstr "不能合并 %.*s"
7067
2b472aae 7068#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
1a79b2f1
JX
7069#, c-format
7070msgid "could not copy '%s' to '%s'"
7071msgstr "不能拷贝 '%s' 至 '%s'"
7072
1a79b2f1 7073# 译者:注意保持前导空格
2b472aae 7074#: sequencer.c:3129
1a79b2f1
JX
7075#, c-format
7076msgid ""
7077"execution failed: %s\n"
7078"%sYou can fix the problem, and then run\n"
7079"\n"
7080" git rebase --continue\n"
7081"\n"
7082msgstr ""
7083"执行失败:%s\n"
7084"%s您可以改正该问题,然后运行\n"
7085"\n"
7086" git rebase --continue\n"
7087"\n"
7088
2b472aae 7089#: sequencer.c:3135
1a79b2f1
JX
7090msgid "and made changes to the index and/or the working tree\n"
7091msgstr "并且修改索引和/或工作区\n"
7092
2b472aae 7093#: sequencer.c:3141
1a79b2f1
JX
7094#, c-format
7095msgid ""
7096"execution succeeded: %s\n"
7097"but left changes to the index and/or the working tree\n"
7098"Commit or stash your changes, and then run\n"
7099"\n"
7100" git rebase --continue\n"
7101"\n"
7102msgstr ""
7103"执行成功:%s\n"
7104"但是在索引和/或工作区中存在变更\n"
a4f16749 7105"提交或贮藏修改,然后运行\n"
1a79b2f1
JX
7106"\n"
7107" git rebase --continue\n"
7108"\n"
7109
2b472aae 7110#: sequencer.c:3202
c1ac5258
JX
7111#, c-format
7112msgid "illegal label name: '%.*s'"
7113msgstr "非法的标签名称:'%.*s'"
7114
2b472aae 7115#: sequencer.c:3256
fd8cb379
JX
7116msgid "writing fake root commit"
7117msgstr "写伪根提交"
7118
2b472aae 7119#: sequencer.c:3261
fd8cb379
JX
7120msgid "writing squash-onto"
7121msgstr "写入 squash-onto"
7122
2b472aae 7123#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
fd8cb379
JX
7124#, c-format
7125msgid "failed to find tree of %s"
7126msgstr "无法找到 %s 指向的树。"
7127
2b472aae 7128#: sequencer.c:3344
c1ac5258
JX
7129#, c-format
7130msgid "could not resolve '%s'"
7131msgstr "无法解析 '%s'"
7132
2b472aae 7133#: sequencer.c:3375
fd8cb379
JX
7134msgid "cannot merge without a current revision"
7135msgstr "没有当前版本不能合并"
7136
2b472aae 7137#: sequencer.c:3397
fd8cb379 7138#, c-format
c1ac5258
JX
7139msgid "unable to parse '%.*s'"
7140msgstr "无法解析 '%.*s'"
7141
2b472aae 7142#: sequencer.c:3406
c1ac5258
JX
7143#, c-format
7144msgid "nothing to merge: '%.*s'"
7145msgstr "无可用合并:'%.*s'"
7146
2b472aae 7147#: sequencer.c:3418
c1ac5258
JX
7148msgid "octopus merge cannot be executed on top of a [new root]"
7149msgstr "章鱼合并不能在一个新的根提交上执行"
fd8cb379 7150
2b472aae 7151#: sequencer.c:3434
fd8cb379
JX
7152#, c-format
7153msgid "could not get commit message of '%s'"
7154msgstr "不能获取 '%s' 的提交说明"
7155
2b472aae 7156#: sequencer.c:3594
fd8cb379
JX
7157#, c-format
7158msgid "could not even attempt to merge '%.*s'"
7159msgstr "甚至不能尝试合并 '%.*s'"
7160
2b472aae 7161#: sequencer.c:3610
fd8cb379
JX
7162msgid "merge: Unable to write new index file"
7163msgstr "合并:无法写入新索引文件"
7164
2b472aae 7165#: sequencer.c:3679 builtin/rebase.c:737
1a79b2f1 7166#, c-format
a4f16749
JX
7167msgid "Applied autostash.\n"
7168msgstr "已应用 autostash。\n"
1a79b2f1 7169
2b472aae 7170#: sequencer.c:3691
1a79b2f1
JX
7171#, c-format
7172msgid "cannot store %s"
7173msgstr "不能存储 %s"
7174
2b472aae 7175#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
1a79b2f1
JX
7176#, c-format
7177msgid ""
7178"Applying autostash resulted in conflicts.\n"
7179"Your changes are safe in the stash.\n"
7180"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
7181msgstr ""
7182"应用 autostash 导致冲突。\n"
a4f16749 7183"您的修改安全地保存在贮藏区中。\n"
1a79b2f1
JX
7184"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
7185
2b472aae 7186#: sequencer.c:3755
4c27fcb5
JX
7187#, c-format
7188msgid "%s: not a valid OID"
5b533632 7189msgstr "%s:不是一个有效的对象 ID"
4c27fcb5 7190
2b472aae 7191#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
4c27fcb5
JX
7192msgid "could not detach HEAD"
7193msgstr "不能分离头指针"
7194
2b472aae 7195#: sequencer.c:3775
4c27fcb5
JX
7196#, c-format
7197msgid "Stopped at HEAD\n"
7198msgstr "停止在 HEAD\n"
7199
2b472aae 7200#: sequencer.c:3777
4c27fcb5
JX
7201#, c-format
7202msgid "Stopped at %s\n"
7203msgstr "停止在 %s\n"
7204
2b472aae 7205#: sequencer.c:3785
fd8cb379
JX
7206#, c-format
7207msgid ""
7208"Could not execute the todo command\n"
7209"\n"
7210" %.*s\n"
7211"It has been rescheduled; To edit the command before continuing, please\n"
7212"edit the todo list first:\n"
7213"\n"
7214" git rebase --edit-todo\n"
7215" git rebase --continue\n"
7216msgstr ""
7217"无法执行待办命令\n"
7218"\n"
7219" %.*s\n"
7220"已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n"
7221"\n"
7222" git rebase --edit-todo\n"
7223" git rebase --continue\n"
7224
2b472aae 7225#: sequencer.c:3869
1a79b2f1 7226#, c-format
87cb7997
JX
7227msgid "Stopped at %s... %.*s\n"
7228msgstr "停止在 %s... %.*s\n"
1a79b2f1 7229
2b472aae 7230#: sequencer.c:3940
1a79b2f1
JX
7231#, c-format
7232msgid "unknown command %d"
7233msgstr "未知命令 %d"
7234
2b472aae 7235#: sequencer.c:3999
1a79b2f1
JX
7236msgid "could not read orig-head"
7237msgstr "不能读取 orig-head"
7238
2b472aae 7239#: sequencer.c:4004
1a79b2f1
JX
7240msgid "could not read 'onto'"
7241msgstr "不能读取 'onto'"
7242
2b472aae 7243#: sequencer.c:4018
1a79b2f1
JX
7244#, c-format
7245msgid "could not update HEAD to %s"
7246msgstr "不能更新 HEAD 为 %s"
7247
2b472aae 7248#: sequencer.c:4111
1a79b2f1
JX
7249msgid "cannot rebase: You have unstaged changes."
7250msgstr "不能变基:您有未暂存的变更。"
7251
2b472aae 7252#: sequencer.c:4120
1a79b2f1
JX
7253msgid "cannot amend non-existing commit"
7254msgstr "不能修补不存在的提交"
7255
2b472aae 7256#: sequencer.c:4122
1a79b2f1
JX
7257#, c-format
7258msgid "invalid file: '%s'"
7259msgstr "无效文件:'%s'"
7260
2b472aae 7261#: sequencer.c:4124
1a79b2f1
JX
7262#, c-format
7263msgid "invalid contents: '%s'"
7264msgstr "无效内容:'%s'"
7265
2b472aae 7266#: sequencer.c:4127
1a79b2f1
JX
7267msgid ""
7268"\n"
7269"You have uncommitted changes in your working tree. Please, commit them\n"
7270"first and then run 'git rebase --continue' again."
87cb7997
JX
7271msgstr ""
7272"\n"
7273"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
1a79b2f1 7274
2b472aae 7275#: sequencer.c:4163 sequencer.c:4202
fd8cb379
JX
7276#, c-format
7277msgid "could not write file: '%s'"
7278msgstr "不能写入文件:'%s'"
7279
2b472aae 7280#: sequencer.c:4217
fd8cb379
JX
7281msgid "could not remove CHERRY_PICK_HEAD"
7282msgstr "不能删除 CHERRY_PICK_HEAD"
7283
2b472aae 7284#: sequencer.c:4224
1a79b2f1
JX
7285msgid "could not commit staged changes."
7286msgstr "不能提交暂存的修改。"
7287
2b472aae 7288#: sequencer.c:4338
a0b6b246
JX
7289#, c-format
7290msgid "%s: can't cherry-pick a %s"
7291msgstr "%s:不能拣选一个%s"
7292
2b472aae 7293#: sequencer.c:4342
a0b6b246
JX
7294#, c-format
7295msgid "%s: bad revision"
7296msgstr "%s:错误的版本"
7297
2b472aae 7298#: sequencer.c:4377
a0b6b246
JX
7299msgid "can't revert as initial commit"
7300msgstr "不能作为初始提交回退"
7301
2b472aae 7302#: sequencer.c:4846
6937cb4e
JX
7303msgid "make_script: unhandled options"
7304msgstr "make_script:有未能处理的选项"
7305
2b472aae 7306#: sequencer.c:4849
6937cb4e
JX
7307msgid "make_script: error preparing revisions"
7308msgstr "make_script:准备版本时错误"
7309
2b472aae 7310#: sequencer.c:5083 sequencer.c:5100
4c27fcb5
JX
7311msgid "nothing to do"
7312msgstr "无事可做"
7313
2b472aae 7314#: sequencer.c:5119
4c27fcb5
JX
7315msgid "could not skip unnecessary pick commands"
7316msgstr "无法跳过不必要的拣选"
7317
2b472aae 7318#: sequencer.c:5213
6937cb4e
JX
7319msgid "the script was already rearranged."
7320msgstr "脚本已经重新编排。"
7321
a5cd71ca 7322#: setup.c:124
31e5e17b 7323#, c-format
2b472aae 7324msgid "'%s' is outside repository at '%s'"
440e7442 7325msgstr "'%s' 在位于 '%s' 的仓库之外"
31e5e17b 7326
2b472aae 7327#: setup.c:175
a0b6b246 7328#, c-format
6792b93b 7329msgid ""
a0b6b246
JX
7330"%s: no such path in the working tree.\n"
7331"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
7332msgstr ""
7333"%s:工作区中无此路径。\n"
58b6f078 7334"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
6792b93b 7335
2b472aae 7336#: setup.c:188
90314792 7337#, c-format
a0b6b246
JX
7338msgid ""
7339"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
7340"Use '--' to separate paths from revisions, like this:\n"
7341"'git <command> [<revision>...] -- [<file>...]'"
7342msgstr ""
7343"有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
7344"使用 '--' 来分隔版本和路径,例如:\n"
58b6f078 7345"'git <命令> [<版本>...] -- [<文件>...]'"
6792b93b 7346
2b472aae 7347#: setup.c:254
31e5e17b
JX
7348#, c-format
7349msgid "option '%s' must come before non-option arguments"
7350msgstr "选项 '%s' 必须在其他非选项参数之前"
7351
2b472aae 7352#: setup.c:273
a0b6b246
JX
7353#, c-format
7354msgid ""
7355"ambiguous argument '%s': both revision and filename\n"
7356"Use '--' to separate paths from revisions, like this:\n"
7357"'git <command> [<revision>...] -- [<file>...]'"
7358msgstr ""
7359"有歧义的参数 '%s':可同时是版本和文件\n"
7360"使用 '--' 来分隔版本和路径,例如:\n"
58b6f078 7361"'git <命令> [<版本>...] -- [<文件>...]'"
2e8451e8 7362
2b472aae 7363#: setup.c:409
31e5e17b
JX
7364msgid "unable to set up work tree using invalid config"
7365msgstr "无法使用无效配置来创建工作区"
7366
2b472aae 7367#: setup.c:413
31e5e17b 7368msgid "this operation must be run in a work tree"
610f8099 7369msgstr "该操作必须在一个工作区中运行"
31e5e17b 7370
2b472aae 7371#: setup.c:559
a0b6b246
JX
7372#, c-format
7373msgid "Expected git repo version <= %d, found %d"
7374msgstr "期望 git 仓库版本 <= %d,却得到 %d"
6792b93b 7375
2b472aae 7376#: setup.c:567
a0b6b246
JX
7377msgid "unknown repository extensions found:"
7378msgstr "发现未知的仓库扩展:"
2e8451e8 7379
2b472aae 7380#: setup.c:586
1003b3a5 7381#, c-format
31e5e17b 7382msgid "error opening '%s'"
c1ac5258 7383msgstr "打开 '%s' 出错"
1003b3a5 7384
2b472aae 7385#: setup.c:588
31e5e17b
JX
7386#, c-format
7387msgid "too large to be a .git file: '%s'"
610f8099 7388msgstr "文件太大,无法作为 .git 文件:'%s'"
31e5e17b 7389
2b472aae 7390#: setup.c:590
31e5e17b
JX
7391#, c-format
7392msgid "error reading %s"
c1ac5258 7393msgstr "读取 %s 出错"
31e5e17b 7394
2b472aae 7395#: setup.c:592
31e5e17b
JX
7396#, c-format
7397msgid "invalid gitfile format: %s"
7398msgstr "无效的 gitfile 格式:%s"
7399
2b472aae 7400#: setup.c:594
31e5e17b
JX
7401#, c-format
7402msgid "no path in gitfile: %s"
7403msgstr "在 gitfile 中没有路径:%s"
7404
2b472aae 7405#: setup.c:596
31e5e17b
JX
7406#, c-format
7407msgid "not a git repository: %s"
7408msgstr "不是一个 git 仓库:%s"
7409
2b472aae 7410#: setup.c:695
31e5e17b
JX
7411#, c-format
7412msgid "'$%s' too big"
7413msgstr "'$%s' 太大"
7414
2b472aae 7415#: setup.c:709
31e5e17b
JX
7416#, c-format
7417msgid "not a git repository: '%s'"
7418msgstr "不是一个 git 仓库:'%s'"
7419
2b472aae 7420#: setup.c:738 setup.c:740 setup.c:771
31e5e17b
JX
7421#, c-format
7422msgid "cannot chdir to '%s'"
7423msgstr "不能切换目录到 '%s'"
7424
2b472aae 7425#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
31e5e17b 7426msgid "cannot come back to cwd"
a0b6b246 7427msgstr "无法返回当前工作目录"
1003b3a5 7428
2b472aae 7429#: setup.c:870
31e5e17b
JX
7430#, c-format
7431msgid "failed to stat '%*s%s%s'"
c1ac5258 7432msgstr "获取 '%*s%s%s' 状态(stat)失败"
31e5e17b 7433
2b472aae 7434#: setup.c:1108
a0b6b246
JX
7435msgid "Unable to read current working directory"
7436msgstr "不能读取当前工作目录"
1003b3a5 7437
2b472aae 7438#: setup.c:1117 setup.c:1123
87cb7997 7439#, c-format
31e5e17b 7440msgid "cannot change to '%s'"
87cb7997
JX
7441msgstr "不能切换到 '%s'"
7442
2b472aae 7443#: setup.c:1128
06991777
JX
7444#, c-format
7445msgid "not a git repository (or any of the parent directories): %s"
7446msgstr "不是一个 git 仓库(或者任何父目录):%s"
7447
2b472aae 7448#: setup.c:1134
a0b6b246
JX
7449#, c-format
7450msgid ""
31e5e17b 7451"not a git repository (or any parent up to mount point %s)\n"
a0b6b246
JX
7452"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
7453msgstr ""
31e5e17b 7454"不是一个 git 仓库(或者直至挂载点 %s 的任何父目录)\n"
a0b6b246 7455"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
1003b3a5 7456
2b472aae 7457#: setup.c:1245
a0b6b246
JX
7458#, c-format
7459msgid ""
31e5e17b 7460"problem with core.sharedRepository filemode value (0%.3o).\n"
a0b6b246
JX
7461"The owner of files must always have read and write permissions."
7462msgstr ""
31e5e17b 7463"参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n"
a0b6b246 7464"文件属主必须始终拥有读写权限。"
6792b93b 7465
2b472aae 7466#: setup.c:1289
31e5e17b
JX
7467msgid "open /dev/null or dup failed"
7468msgstr "不能打开或者复制 /dev/null"
7469
2b472aae 7470#: setup.c:1304
31e5e17b
JX
7471msgid "fork failed"
7472msgstr "fork 失败"
7473
2b472aae 7474#: setup.c:1309
31e5e17b
JX
7475msgid "setsid failed"
7476msgstr "setsid 失败"
7477
a5cd71ca 7478#: sha1-file.c:452
c1ac5258
JX
7479#, c-format
7480msgid "object directory %s does not exist; check .git/objects/info/alternates"
7481msgstr "对象目录 %s 不存在,检查 .git/objects/info/alternates"
7482
a5cd71ca 7483#: sha1-file.c:503
c1ac5258
JX
7484#, c-format
7485msgid "unable to normalize alternate object path: %s"
7486msgstr "无法规范化备用对象路径:%s"
7487
a5cd71ca 7488#: sha1-file.c:575
c1ac5258
JX
7489#, c-format
7490msgid "%s: ignoring alternate object stores, nesting too deep"
7491msgstr "%s:忽略备用对象库,嵌套太深"
7492
a5cd71ca 7493#: sha1-file.c:582
c1ac5258
JX
7494#, c-format
7495msgid "unable to normalize object directory: %s"
7496msgstr "无法规范化对象目录: %s"
7497
a5cd71ca 7498#: sha1-file.c:625
c1ac5258
JX
7499msgid "unable to fdopen alternates lockfile"
7500msgstr "无法 fdopen 替换锁文件"
7501
a5cd71ca 7502#: sha1-file.c:643
c1ac5258
JX
7503msgid "unable to read alternates file"
7504msgstr "无法读取替代文件"
7505
a5cd71ca 7506#: sha1-file.c:650
c1ac5258
JX
7507msgid "unable to move new alternates file into place"
7508msgstr "无法将新的替代文件移动到位"
7509
a5cd71ca 7510#: sha1-file.c:685
a0b6b246
JX
7511#, c-format
7512msgid "path '%s' does not exist"
7513msgstr "路径 '%s' 不存在"
7514
a5cd71ca 7515#: sha1-file.c:711
a0b6b246
JX
7516#, c-format
7517msgid "reference repository '%s' as a linked checkout is not supported yet."
7518msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
7519
a5cd71ca 7520#: sha1-file.c:717
a0b6b246
JX
7521#, c-format
7522msgid "reference repository '%s' is not a local repository."
7523msgstr "参考仓库 '%s' 不是一个本地仓库。"
7524
a5cd71ca 7525#: sha1-file.c:723
a0b6b246
JX
7526#, c-format
7527msgid "reference repository '%s' is shallow"
7528msgstr "参考仓库 '%s' 是一个浅克隆"
7529
a5cd71ca 7530#: sha1-file.c:731
a0b6b246
JX
7531#, c-format
7532msgid "reference repository '%s' is grafted"
fd8cb379 7533msgstr "参考仓库 '%s' 已被移植"
a0b6b246 7534
a5cd71ca 7535#: sha1-file.c:791
a6cd2cc4
JX
7536#, c-format
7537msgid "invalid line while parsing alternate refs: %s"
7538msgstr "解析备用引用时无效的行:%s"
7539
a5cd71ca 7540#: sha1-file.c:943
c1ac5258
JX
7541#, c-format
7542msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
7543msgstr "尝试 mmap %<PRIuMAX>,超过了最大值 %<PRIuMAX>"
7544
a5cd71ca 7545#: sha1-file.c:964
c1ac5258
JX
7546msgid "mmap failed"
7547msgstr "mmap 失败"
7548
a5cd71ca 7549#: sha1-file.c:1128
c1ac5258
JX
7550#, c-format
7551msgid "object file %s is empty"
7552msgstr "对象文件 %s 为空"
7553
2b472aae 7554#: sha1-file.c:1263 sha1-file.c:2443
c1ac5258
JX
7555#, c-format
7556msgid "corrupt loose object '%s'"
7557msgstr "损坏的松散对象 '%s'"
7558
2b472aae 7559#: sha1-file.c:1265 sha1-file.c:2447
c1ac5258
JX
7560#, c-format
7561msgid "garbage at end of loose object '%s'"
7562msgstr "松散对象 '%s' 后面有垃圾数据"
7563
2b472aae 7564#: sha1-file.c:1307
c1ac5258
JX
7565msgid "invalid object type"
7566msgstr "无效的对象类型"
7567
2b472aae 7568#: sha1-file.c:1391
c1ac5258
JX
7569#, c-format
7570msgid "unable to unpack %s header with --allow-unknown-type"
7571msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
7572
2b472aae 7573#: sha1-file.c:1394
c1ac5258
JX
7574#, c-format
7575msgid "unable to unpack %s header"
7576msgstr "无法解开 %s 头部"
7577
2b472aae 7578#: sha1-file.c:1400
c1ac5258
JX
7579#, c-format
7580msgid "unable to parse %s header with --allow-unknown-type"
7581msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
7582
2b472aae 7583#: sha1-file.c:1403
c1ac5258
JX
7584#, c-format
7585msgid "unable to parse %s header"
7586msgstr "无法解析 %s 头部"
7587
2b472aae 7588#: sha1-file.c:1629
c1ac5258
JX
7589#, c-format
7590msgid "failed to read object %s"
7591msgstr "读取对象 %s 失败"
7592
2b472aae 7593#: sha1-file.c:1633
c1ac5258
JX
7594#, c-format
7595msgid "replacement %s not found for %s"
7596msgstr "找不到 %2$s 的替代 %1$s"
7597
2b472aae 7598#: sha1-file.c:1637
c1ac5258
JX
7599#, c-format
7600msgid "loose object %s (stored in %s) is corrupt"
7601msgstr "松散对象 %s(保存在 %s)已损坏"
7602
2b472aae 7603#: sha1-file.c:1641
c1ac5258
JX
7604#, c-format
7605msgid "packed object %s (stored in %s) is corrupt"
7606msgstr "打包对象 %s(保存在 %s)已损坏"
7607
2b472aae 7608#: sha1-file.c:1746
c1ac5258 7609#, c-format
06991777
JX
7610msgid "unable to write file %s"
7611msgstr "无法写文件 %s"
c1ac5258 7612
2b472aae 7613#: sha1-file.c:1753
c1ac5258
JX
7614#, c-format
7615msgid "unable to set permission to '%s'"
7616msgstr "无法为 '%s' 设置权限"
7617
2b472aae 7618#: sha1-file.c:1760
c1ac5258
JX
7619msgid "file write error"
7620msgstr "文件写错误"
7621
2b472aae 7622#: sha1-file.c:1780
06991777
JX
7623msgid "error when closing loose object file"
7624msgstr "关闭松散对象文件时出错"
c1ac5258 7625
2b472aae 7626#: sha1-file.c:1845
c1ac5258
JX
7627#, c-format
7628msgid "insufficient permission for adding an object to repository database %s"
7629msgstr "权限不足,无法在仓库对象库 %s 中添加对象"
7630
2b472aae 7631#: sha1-file.c:1847
c1ac5258
JX
7632msgid "unable to create temporary file"
7633msgstr "无法创建临时文件"
7634
2b472aae 7635#: sha1-file.c:1871
06991777
JX
7636msgid "unable to write loose object file"
7637msgstr "不能写松散对象文件"
c1ac5258 7638
2b472aae 7639#: sha1-file.c:1877
c1ac5258
JX
7640#, c-format
7641msgid "unable to deflate new object %s (%d)"
7642msgstr "不能压缩新对象 %s(%d)"
7643
2b472aae 7644#: sha1-file.c:1881
c1ac5258
JX
7645#, c-format
7646msgid "deflateEnd on object %s failed (%d)"
7647msgstr "在对象 %s 上调用 deflateEnd 失败(%d)"
7648
2b472aae 7649#: sha1-file.c:1885
c1ac5258
JX
7650#, c-format
7651msgid "confused by unstable object source data for %s"
7652msgstr "被 %s 的不稳定对象源数据搞糊涂了"
7653
2b472aae 7654#: sha1-file.c:1895 builtin/pack-objects.c:1054
c1ac5258
JX
7655#, c-format
7656msgid "failed utime() on %s"
7657msgstr "在 %s 上调用 utime() 失败"
7658
2b472aae 7659#: sha1-file.c:1972
c1ac5258 7660#, c-format
06991777
JX
7661msgid "cannot read object for %s"
7662msgstr "不能读取对象 %s"
c1ac5258 7663
2b472aae 7664#: sha1-file.c:2011
c1ac5258
JX
7665msgid "corrupt commit"
7666msgstr "损坏的提交"
7667
2b472aae 7668#: sha1-file.c:2019
c1ac5258
JX
7669msgid "corrupt tag"
7670msgstr "损坏的标签"
7671
2b472aae 7672#: sha1-file.c:2119
c1ac5258
JX
7673#, c-format
7674msgid "read error while indexing %s"
7675msgstr "索引 %s 时读取错误"
7676
2b472aae 7677#: sha1-file.c:2122
c1ac5258
JX
7678#, c-format
7679msgid "short read while indexing %s"
7680msgstr "索引 %s 时读入不完整"
7681
2b472aae 7682#: sha1-file.c:2195 sha1-file.c:2205
c1ac5258
JX
7683#, c-format
7684msgid "%s: failed to insert into database"
7685msgstr "%s:插入数据库失败"
7686
2b472aae 7687#: sha1-file.c:2211
c1ac5258
JX
7688#, c-format
7689msgid "%s: unsupported file type"
7690msgstr "%s:不支持的文件类型"
7691
2b472aae 7692#: sha1-file.c:2235
c1ac5258
JX
7693#, c-format
7694msgid "%s is not a valid object"
7695msgstr "%s 不是一个有效的对象"
7696
2b472aae 7697#: sha1-file.c:2237
c1ac5258
JX
7698#, c-format
7699msgid "%s is not a valid '%s' object"
7700msgstr "%s 不是一个有效的 '%s' 对象"
7701
2b472aae 7702#: sha1-file.c:2264 builtin/index-pack.c:155
c1ac5258
JX
7703#, c-format
7704msgid "unable to open %s"
7705msgstr "不能打开 %s"
7706
2b472aae 7707#: sha1-file.c:2454 sha1-file.c:2507
c1ac5258 7708#, c-format
06991777
JX
7709msgid "hash mismatch for %s (expected %s)"
7710msgstr "%s 的哈希值不匹配(预期 %s)"
c1ac5258 7711
2b472aae 7712#: sha1-file.c:2478
c1ac5258
JX
7713#, c-format
7714msgid "unable to mmap %s"
7715msgstr "不能 mmap %s"
7716
2b472aae 7717#: sha1-file.c:2483
c1ac5258
JX
7718#, c-format
7719msgid "unable to unpack header of %s"
7720msgstr "无法解压缩 %s 的头部"
7721
2b472aae 7722#: sha1-file.c:2489
c1ac5258
JX
7723#, c-format
7724msgid "unable to parse header of %s"
7725msgstr "无法解析 %s 的头部"
7726
2b472aae 7727#: sha1-file.c:2500
c1ac5258
JX
7728#, c-format
7729msgid "unable to unpack contents of %s"
7730msgstr "无法解压缩 %s 的内容"
7731
2b472aae 7732#: sha1-name.c:486
a0b6b246
JX
7733#, c-format
7734msgid "short SHA1 %s is ambiguous"
29004bbb 7735msgstr "短 SHA1 %s 存在歧义"
a0b6b246 7736
2b472aae 7737#: sha1-name.c:497
a0b6b246
JX
7738msgid "The candidates are:"
7739msgstr "候选者有:"
7740
2b472aae 7741#: sha1-name.c:796
a0b6b246
JX
7742msgid ""
7743"Git normally never creates a ref that ends with 40 hex characters\n"
7744"because it will be ignored when you just specify 40-hex. These refs\n"
7745"may be created by mistake. For example,\n"
7746"\n"
a6cd2cc4 7747" git switch -c $br $(git rev-parse ...)\n"
a0b6b246
JX
7748"\n"
7749"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
7750"examine these refs and maybe delete them. Turn this message off by\n"
7751"running \"git config advice.objectNameWarning false\""
7752msgstr ""
a6cd2cc4
JX
7753"Git 通常不会创建一个以40个十六进制字符结尾的引用,因为当您只提供40\n"
7754"个十六进制字符时将被忽略。这些引用可能被错误地创建。例如:\n"
a0b6b246 7755"\n"
a6cd2cc4 7756" git switch -c $br $(git rev-parse ...)\n"
a0b6b246 7757"\n"
a6cd2cc4
JX
7758"当 \"$br\" 某种原因空白时,一个40位十六进制的引用将被创建。请检查这些\n"
7759"引用,可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
7760"false\" 命令关闭本消息通知。"
7761
2b472aae
JX
7762#: sha1-name.c:916
7763#, c-format
7764msgid "log for '%.*s' only goes back to %s"
7765msgstr "'%.*s' 的日志仅能回到 %s"
7766
7767#: sha1-name.c:924
7768#, c-format
7769msgid "log for '%.*s' only has %d entries"
7770msgstr "'%.*s' 的日志仅有 %d 个条目"
7771
7772#: sha1-name.c:1689
7773#, c-format
7774msgid "path '%s' exists on disk, but not in '%.*s'"
7775msgstr "路径 '%s' 在磁盘上,但是不在 '%.*s' 中"
7776
7777#: sha1-name.c:1695
7778#, c-format
7779msgid ""
7780"path '%s' exists, but not '%s'\n"
7781"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
7782msgstr ""
440e7442 7783"路径 '%s' 存在,而 '%s' 不存在\n"
2b472aae
JX
7784"提示:您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'?"
7785
7786#: sha1-name.c:1704
7787#, c-format
7788msgid "path '%s' does not exist in '%.*s'"
7789msgstr "路径 '%s' 不在 '%.*s' 中"
7790
7791#: sha1-name.c:1732
7792#, c-format
7793msgid ""
7794"path '%s' is in the index, but not at stage %d\n"
7795"hint: Did you mean ':%d:%s'?"
7796msgstr ""
7797"路径 '%s' 在索引中,但不在暂存区 %d 中\n"
7798"提示:您的意思是 ':%d:%s'?"
7799
7800#: sha1-name.c:1748
7801#, c-format
7802msgid ""
7803"path '%s' is in the index, but not '%s'\n"
7804"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
7805msgstr ""
440e7442 7806"路径 '%s' 在索引中,但 '%s' 不在\n"
2b472aae
JX
7807"提示:您的意思是 ':%d:%s' 亦即 ':%d:./%s'?"
7808
7809#: sha1-name.c:1756
7810#, c-format
7811msgid "path '%s' exists on disk, but not in the index"
440e7442 7812msgstr "路径 '%s' 在磁盘上,但不在索引里"
2b472aae
JX
7813
7814#: sha1-name.c:1758
7815#, c-format
7816msgid "path '%s' does not exist (neither on disk nor in the index)"
440e7442 7817msgstr "路径 '%s' 不存在(既不在磁盘上,也不在索引中)"
2b472aae
JX
7818
7819#: sha1-name.c:1771
7820msgid "relative path syntax can't be used outside working tree"
7821msgstr "不能在工作区之外使用相对路径语法"
7822
7823#: sha1-name.c:1909
7824#, c-format
7825msgid "invalid object name '%.*s'."
7826msgstr "无效的对象名 '%.*s'。"
7827
a6cd2cc4 7828#. TRANSLATORS: IEC 80000-13:2008 gibibyte
2b472aae 7829#: strbuf.c:837
a6cd2cc4
JX
7830#, c-format
7831msgid "%u.%2.2u GiB"
7832msgstr "%u.%2.2u GiB"
7833
7834#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
2b472aae 7835#: strbuf.c:839
a6cd2cc4
JX
7836#, c-format
7837msgid "%u.%2.2u GiB/s"
7838msgstr "%u.%2.2u GiB/s"
7839
7840#. TRANSLATORS: IEC 80000-13:2008 mebibyte
2b472aae 7841#: strbuf.c:847
a6cd2cc4
JX
7842#, c-format
7843msgid "%u.%2.2u MiB"
7844msgstr "%u.%2.2u MiB"
7845
7846#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
2b472aae 7847#: strbuf.c:849
a6cd2cc4
JX
7848#, c-format
7849msgid "%u.%2.2u MiB/s"
7850msgstr "%u.%2.2u MiB/s"
7851
7852#. TRANSLATORS: IEC 80000-13:2008 kibibyte
2b472aae 7853#: strbuf.c:856
a6cd2cc4
JX
7854#, c-format
7855msgid "%u.%2.2u KiB"
7856msgstr "%u.%2.2u KiB"
7857
7858#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
2b472aae 7859#: strbuf.c:858
a6cd2cc4
JX
7860#, c-format
7861msgid "%u.%2.2u KiB/s"
7862msgstr "%u.%2.2u KiB/s"
7863
7864#. TRANSLATORS: IEC 80000-13:2008 byte
2b472aae 7865#: strbuf.c:864
a6cd2cc4
JX
7866#, c-format
7867msgid "%u byte"
7868msgid_plural "%u bytes"
7869msgstr[0] "%u 字节"
7870msgstr[1] "%u 字节"
7871
7872#. TRANSLATORS: IEC 80000-13:2008 byte/second
2b472aae 7873#: strbuf.c:866
a6cd2cc4
JX
7874#, c-format
7875msgid "%u byte/s"
7876msgid_plural "%u bytes/s"
7877msgstr[0] "%u 字节/秒"
7878msgstr[1] "%u 字节/秒"
a0b6b246 7879
2b472aae 7880#: strbuf.c:1164
ddc12c42
JX
7881#, c-format
7882msgid "could not edit '%s'"
7883msgstr "不能编辑 '%s'"
7884
06991777 7885#: submodule.c:114 submodule.c:143
a0b6b246
JX
7886msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
7887msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
7888
06991777 7889#: submodule.c:118 submodule.c:147
a0b6b246
JX
7890#, c-format
7891msgid "Could not find section in .gitmodules where path=%s"
7892msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
7893
06991777 7894#: submodule.c:154
a0b6b246
JX
7895#, c-format
7896msgid "Could not remove .gitmodules entry for %s"
7897msgstr "无法移除 %s 的 .gitmodules 条目"
7898
06991777 7899#: submodule.c:165
a0b6b246
JX
7900msgid "staging updated .gitmodules failed"
7901msgstr "将更新后 .gitmodules 添加暂存区失败"
7902
06991777 7903#: submodule.c:327
a4f16749
JX
7904#, c-format
7905msgid "in unpopulated submodule '%s'"
7906msgstr "位于未检出的子模组 '%s'"
7907
06991777 7908#: submodule.c:358
a4f16749
JX
7909#, c-format
7910msgid "Pathspec '%s' is in submodule '%.*s'"
7911msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
7912
2b472aae
JX
7913#: submodule.c:434
7914#, c-format
7915msgid "bad --ignore-submodules argument: %s"
7916msgstr "坏的 --ignore-submodules 参数:%s"
7917
7918#: submodule.c:815
7919#, c-format
7920msgid ""
7921"Submodule in commit %s at path: '%s' collides with a submodule named the "
7922"same. Skipping it."
440e7442 7923msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。"
2b472aae 7924
d46c5519 7925#: submodule.c:910
6937cb4e
JX
7926#, c-format
7927msgid "submodule entry '%s' (%s) is a %s, not a commit"
493a9322 7928msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交"
6937cb4e 7929
2b472aae
JX
7930#: submodule.c:995
7931#, c-format
7932msgid ""
7933"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
7934"submodule %s"
440e7442 7935msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes -n 1'"
2b472aae
JX
7936
7937#: submodule.c:1118
7938#, c-format
7939msgid "process for submodule '%s' failed"
440e7442 7940msgstr "处理子模组 '%s' 失败"
2b472aae
JX
7941
7942#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
6937cb4e
JX
7943msgid "Failed to resolve HEAD as a valid ref."
7944msgstr "无法将 HEAD 解析为有效引用。"
7945
2b472aae 7946#: submodule.c:1158
06991777 7947#, c-format
2b472aae
JX
7948msgid "Pushing submodule '%s'\n"
7949msgstr "正在推送子模组 '%s'\n"
06991777 7950
2b472aae
JX
7951#: submodule.c:1161
7952#, c-format
7953msgid "Unable to push submodule '%s'\n"
7954msgstr "无法推送子模组 '%s'\n"
7955
7956#: submodule.c:1453
7957#, c-format
7958msgid "Fetching submodule %s%s\n"
7959msgstr "正在获取子模组 %s%s\n"
7960
7961#: submodule.c:1483
7962#, c-format
7963msgid "Could not access submodule '%s'\n"
7964msgstr "无法访问子模组 '%s'\n"
7965
7966#: submodule.c:1637
7967#, c-format
7968msgid ""
7969"Errors during submodule fetch:\n"
7970"%s"
7971msgstr ""
7972"获取子模组时的错误:\n"
7973"%s"
7974
7975#: submodule.c:1662
1a79b2f1 7976#, c-format
87cb7997 7977msgid "'%s' not recognized as a git repository"
65e2041e 7978msgstr "无法将 '%s' 识别为一个 git 仓库"
1a79b2f1 7979
2b472aae
JX
7980#: submodule.c:1679
7981#, c-format
7982msgid "Could not run 'git status --porcelain=2' in submodule %s"
7983msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'"
7984
7985#: submodule.c:1720
7986#, c-format
7987msgid "'git status --porcelain=2' failed in submodule %s"
7988msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败"
7989
7990#: submodule.c:1800
1a79b2f1 7991#, c-format
87cb7997
JX
7992msgid "could not start 'git status' in submodule '%s'"
7993msgstr "无法在子模组 '%s' 中启动 'git status'"
1a79b2f1 7994
2b472aae 7995#: submodule.c:1813
87cb7997
JX
7996#, c-format
7997msgid "could not run 'git status' in submodule '%s'"
7998msgstr "无法在子模组 '%s' 中执行 'git status'"
7999
2b472aae 8000#: submodule.c:1828
06991777
JX
8001#, c-format
8002msgid "Could not unset core.worktree setting in submodule '%s'"
8003msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
8004
2b472aae
JX
8005#: submodule.c:1855 submodule.c:2165
8006#, c-format
8007msgid "could not recurse into submodule '%s'"
8008msgstr "无法递归进子模组路径 '%s'"
8009
8010#: submodule.c:1876
8011msgid "could not reset submodule index"
8012msgstr "无法重置子模组索引"
8013
8014#: submodule.c:1918
87cb7997
JX
8015#, c-format
8016msgid "submodule '%s' has dirty index"
8017msgstr "子模组 '%s' 中有脏索引"
8018
2b472aae 8019#: submodule.c:1970
c1ac5258
JX
8020#, c-format
8021msgid "Submodule '%s' could not be updated."
8022msgstr "子模组 '%s' 无法被更新。"
8023
2b472aae 8024#: submodule.c:2038
ddc12c42
JX
8025#, c-format
8026msgid "submodule git dir '%s' is inside git dir '%.*s'"
8027msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中"
8028
2b472aae 8029#: submodule.c:2059
1a79b2f1
JX
8030#, c-format
8031msgid ""
8032"relocate_gitdir for submodule '%s' with more than one worktree not supported"
8033msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
8034
2b472aae 8035#: submodule.c:2071 submodule.c:2130
1a79b2f1
JX
8036#, c-format
8037msgid "could not lookup name for submodule '%s'"
8038msgstr "不能查询子模组 '%s' 的名称"
8039
2b472aae 8040#: submodule.c:2075
ddc12c42
JX
8041#, c-format
8042msgid "refusing to move '%s' into an existing git dir"
8043msgstr "禁止移动 '%s' 到现存 git 目录中"
8044
2b472aae 8045#: submodule.c:2082
1a79b2f1
JX
8046#, c-format
8047msgid ""
8048"Migrating git directory of '%s%s' from\n"
8049"'%s' to\n"
8050"'%s'\n"
8051msgstr ""
8052"将 '%s%s' 的 git 目录从\n"
8053"'%s' 迁移至\n"
8054"'%s'\n"
8055
2b472aae 8056#: submodule.c:2209
87cb7997
JX
8057msgid "could not start ls-files in .."
8058msgstr "无法在 .. 中启动 ls-files"
8059
2b472aae 8060#: submodule.c:2248
87cb7997
JX
8061#, c-format
8062msgid "ls-tree returned unexpected return code %d"
8063msgstr "ls-tree 返回未知返回值 %d"
8064
a5cd71ca 8065#: submodule-config.c:236
fd8cb379
JX
8066#, c-format
8067msgid "ignoring suspicious submodule name: %s"
8068msgstr "忽略可疑的子模组名称:%s"
8069
a5cd71ca 8070#: submodule-config.c:303
6937cb4e
JX
8071msgid "negative values not allowed for submodule.fetchjobs"
8072msgstr "submodule.fetchjobs 不允许为负值"
8073
a5cd71ca 8074#: submodule-config.c:401
4c27fcb5
JX
8075#, c-format
8076msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
8077msgstr "忽略可能被解析为命令行选项的 '%s':%s"
8078
ddc12c42 8079#: submodule-config.c:498
a0b6b246
JX
8080#, c-format
8081msgid "invalid value for %s"
8082msgstr "%s 的值无效"
8083
2b472aae 8084#: submodule-config.c:765
4c27fcb5
JX
8085#, c-format
8086msgid "Could not update .gitmodules entry %s"
8087msgstr "不能更新 .gitmodules 条目 %s"
8088
6937cb4e 8089#: trailer.c:238
a0b6b246
JX
8090#, c-format
8091msgid "running trailer command '%s' failed"
8092msgstr "执行 trailer 命令 '%s' 失败"
8093
6937cb4e
JX
8094#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
8095#: trailer.c:557
a0b6b246
JX
8096#, c-format
8097msgid "unknown value '%s' for key '%s'"
8098msgstr "键 '%2$s' 的未知取值 '%1$s'"
8099
2b472aae 8100#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
a0b6b246
JX
8101#, c-format
8102msgid "more than one %s"
8103msgstr "多于一个 %s"
8104
6937cb4e 8105#: trailer.c:730
a0b6b246
JX
8106#, c-format
8107msgid "empty trailer token in trailer '%.*s'"
8108msgstr "签名 '%.*s' 的键为空"
8109
6937cb4e 8110#: trailer.c:750
a0b6b246
JX
8111#, c-format
8112msgid "could not read input file '%s'"
8113msgstr "不能读取输入文件 '%s'"
8114
6937cb4e 8115#: trailer.c:753
a0b6b246
JX
8116msgid "could not read from stdin"
8117msgstr "不能自标准输入读取"
8118
a5cd71ca 8119#: trailer.c:1011 wrapper.c:665
a0b6b246
JX
8120#, c-format
8121msgid "could not stat %s"
65e2041e 8122msgstr "不能对 %s 调用 stat"
a0b6b246 8123
4c27fcb5 8124#: trailer.c:1013
a0b6b246
JX
8125#, c-format
8126msgid "file %s is not a regular file"
8127msgstr "文件 %s 不是一个正规文件"
8128
4c27fcb5 8129#: trailer.c:1015
a0b6b246
JX
8130#, c-format
8131msgid "file %s is not writable by user"
8132msgstr "文件 %s 用户不可写"
8133
4c27fcb5 8134#: trailer.c:1027
a0b6b246
JX
8135msgid "could not open temporary file"
8136msgstr "不能打开临时文件"
8137
4c27fcb5 8138#: trailer.c:1067
a0b6b246
JX
8139#, c-format
8140msgid "could not rename temporary file to %s"
8141msgstr "不能重命名临时文件为 %s"
8142
fd8cb379 8143#: transport.c:116
a0b6b246
JX
8144#, c-format
8145msgid "Would set upstream of '%s' to '%s' of '%s'\n"
8146msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
8147
a5cd71ca 8148#: transport.c:145
c1ac5258
JX
8149#, c-format
8150msgid "could not read bundle '%s'"
8151msgstr "无法读取 bundle '%s'"
8152
a5cd71ca 8153#: transport.c:214
a0b6b246
JX
8154#, c-format
8155msgid "transport: invalid depth option '%s'"
8156msgstr "传输:无效的深度选项 '%s'"
8157
a5cd71ca 8158#: transport.c:266
d46c5519
JX
8159msgid "see protocol.version in 'git help config' for more details"
8160msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
8161
a5cd71ca 8162#: transport.c:267
d46c5519
JX
8163msgid "server options require protocol version 2 or later"
8164msgstr "服务端选项需要版本 2 协议或更高"
8165
a5cd71ca 8166#: transport.c:632
fd8cb379
JX
8167msgid "could not parse transport.color.* config"
8168msgstr "不能解析 transport.color.* 配置"
8169
a5cd71ca 8170#: transport.c:705
c1ac5258
JX
8171msgid "support for protocol v2 not implemented yet"
8172msgstr "协议 v2 的支持尚未实现"
8173
a5cd71ca 8174#: transport.c:831
c1ac5258
JX
8175#, c-format
8176msgid "unknown value for config '%s': %s"
8177msgstr "配置 '%s' 的取值未知:%s"
8178
a5cd71ca 8179#: transport.c:897
c1ac5258
JX
8180#, c-format
8181msgid "transport '%s' not allowed"
8182msgstr "传输 '%s' 不允许"
8183
a5cd71ca 8184#: transport.c:949
c1ac5258
JX
8185msgid "git-over-rsync is no longer supported"
8186msgstr "不再支持 git-over-rsync"
8187
a5cd71ca 8188#: transport.c:1044
a0b6b246
JX
8189#, c-format
8190msgid ""
8191"The following submodule paths contain changes that can\n"
8192"not be found on any remote:\n"
8193msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
8194
a5cd71ca 8195#: transport.c:1048
a0b6b246
JX
8196#, c-format
8197msgid ""
8198"\n"
8199"Please try\n"
8200"\n"
8201"\tgit push --recurse-submodules=on-demand\n"
8202"\n"
8203"or cd to the path and use\n"
8204"\n"
8205"\tgit push\n"
8206"\n"
8207"to push them to a remote.\n"
8208"\n"
8209msgstr ""
8210"\n"
8211"请尝试\n"
8212"\n"
8213"\tgit push --recurse-submodules=on-demand\n"
8214"\n"
8215"或者进入到子目录执行\n"
8216"\n"
8217"\tgit push\n"
8218"\n"
8219"以推送至远程。\n"
8220"\n"
8221
a5cd71ca 8222#: transport.c:1056
a0b6b246
JX
8223msgid "Aborting."
8224msgstr "正在终止。"
8225
a5cd71ca 8226#: transport.c:1201
c1ac5258
JX
8227msgid "failed to push all needed submodules"
8228msgstr "不能推送全部需要的子模组"
8229
2b472aae 8230#: transport.c:1345 transport-helper.c:657
c1ac5258
JX
8231msgid "operation not supported by protocol"
8232msgstr "协议不支持该操作"
8233
a5cd71ca 8234#: transport-helper.c:61 transport-helper.c:90
c1ac5258
JX
8235msgid "full write to remote helper failed"
8236msgstr "完整写入远程助手失败"
8237
a5cd71ca 8238#: transport-helper.c:144
c1ac5258
JX
8239#, c-format
8240msgid "unable to find remote helper for '%s'"
8241msgstr "无法为 '%s' 找到远程助手"
8242
2b472aae 8243#: transport-helper.c:160 transport-helper.c:571
c1ac5258
JX
8244msgid "can't dup helper output fd"
8245msgstr "无法复制助手输出文件句柄"
8246
a5cd71ca 8247#: transport-helper.c:211
c1ac5258
JX
8248#, c-format
8249msgid ""
8250"unknown mandatory capability %s; this remote helper probably needs newer "
8251"version of Git"
8252msgstr "未知的强制能力 %s,该远程助手可能需要新版本的Git"
8253
a5cd71ca 8254#: transport-helper.c:217
c1ac5258
JX
8255msgid "this remote helper should implement refspec capability"
8256msgstr "远程助手需要实现 refspec 能力"
8257
2b472aae 8258#: transport-helper.c:284 transport-helper.c:425
c1ac5258
JX
8259#, c-format
8260msgid "%s unexpectedly said: '%s'"
8261msgstr "%s 意外地说:'%s'"
8262
2b472aae 8263#: transport-helper.c:414
c1ac5258
JX
8264#, c-format
8265msgid "%s also locked %s"
8266msgstr "%s 也锁定了 %s"
8267
2b472aae 8268#: transport-helper.c:493
c1ac5258
JX
8269msgid "couldn't run fast-import"
8270msgstr "不能执行 fast-import"
8271
2b472aae 8272#: transport-helper.c:516
c1ac5258
JX
8273msgid "error while running fast-import"
8274msgstr "执行 fast-import 出错"
8275
2b472aae 8276#: transport-helper.c:545 transport-helper.c:1134
c1ac5258
JX
8277#, c-format
8278msgid "could not read ref %s"
8279msgstr "无法读取引用 %s"
8280
2b472aae 8281#: transport-helper.c:590
c1ac5258
JX
8282#, c-format
8283msgid "unknown response to connect: %s"
8284msgstr "连接时未知的响应:%s"
8285
2b472aae 8286#: transport-helper.c:612
c1ac5258
JX
8287msgid "setting remote service path not supported by protocol"
8288msgstr "协议不支持设置远程服务路径"
8289
2b472aae 8290#: transport-helper.c:614
c1ac5258
JX
8291msgid "invalid remote service path"
8292msgstr "无效的远程服务路径"
8293
2b472aae 8294#: transport-helper.c:660
c1ac5258
JX
8295#, c-format
8296msgid "can't connect to subservice %s"
8297msgstr "不能连接到子服务 %s"
8298
2b472aae 8299#: transport-helper.c:736
c1ac5258
JX
8300#, c-format
8301msgid "expected ok/error, helper said '%s'"
8302msgstr "预期 ok/error,助手说 '%s'"
8303
2b472aae 8304#: transport-helper.c:789
c1ac5258
JX
8305#, c-format
8306msgid "helper reported unexpected status of %s"
8307msgstr "助手报告 %s 的意外状态"
8308
2b472aae 8309#: transport-helper.c:850
a0b6b246 8310#, c-format
c1ac5258
JX
8311msgid "helper %s does not support dry-run"
8312msgstr "助手 %s 不支持 dry-run"
a0b6b246 8313
2b472aae 8314#: transport-helper.c:853
c1ac5258
JX
8315#, c-format
8316msgid "helper %s does not support --signed"
8317msgstr "助手 %s 不支持 --signed"
8318
2b472aae 8319#: transport-helper.c:856
c1ac5258
JX
8320#, c-format
8321msgid "helper %s does not support --signed=if-asked"
8322msgstr "助手 %s 不支持 --signed=if-asked"
8323
2b472aae 8324#: transport-helper.c:861
a5cd71ca
JX
8325#, c-format
8326msgid "helper %s does not support --atomic"
8327msgstr "助手 %s 不支持 --atomic"
8328
2b472aae 8329#: transport-helper.c:867
c1ac5258
JX
8330#, c-format
8331msgid "helper %s does not support 'push-option'"
8332msgstr "助手 %s 不支持 'push-option'"
8333
2b472aae 8334#: transport-helper.c:965
c1ac5258
JX
8335msgid "remote-helper doesn't support push; refspec needed"
8336msgstr "remote-heper 不支持 push,需要引用表达式"
8337
2b472aae 8338#: transport-helper.c:970
c1ac5258
JX
8339#, c-format
8340msgid "helper %s does not support 'force'"
8341msgstr "助手 %s 不支持 'force'"
8342
2b472aae 8343#: transport-helper.c:1017
c1ac5258
JX
8344msgid "couldn't run fast-export"
8345msgstr "无法执行 fast-export"
8346
2b472aae 8347#: transport-helper.c:1022
c1ac5258
JX
8348msgid "error while running fast-export"
8349msgstr "执行 fast-export 时出错"
8350
2b472aae 8351#: transport-helper.c:1047
c1ac5258
JX
8352#, c-format
8353msgid ""
8354"No refs in common and none specified; doing nothing.\n"
8355"Perhaps you should specify a branch such as 'master'.\n"
8356msgstr ""
8357"没有共同的引用并且也没有指定,什么也不会做。\n"
8358"可能您应该指定一个分支如 'master'。\n"
8359
2b472aae 8360#: transport-helper.c:1120
c1ac5258
JX
8361#, c-format
8362msgid "malformed response in ref list: %s"
8363msgstr "引用列表中格式错误的响应:%s"
8364
2b472aae 8365#: transport-helper.c:1272
c1ac5258
JX
8366#, c-format
8367msgid "read(%s) failed"
8368msgstr "读取(%s)失败"
8369
2b472aae 8370#: transport-helper.c:1299
c1ac5258
JX
8371#, c-format
8372msgid "write(%s) failed"
8373msgstr "写(%s)失败"
8374
2b472aae 8375#: transport-helper.c:1348
c1ac5258
JX
8376#, c-format
8377msgid "%s thread failed"
8378msgstr "%s 线程失败"
8379
2b472aae 8380#: transport-helper.c:1352
c1ac5258
JX
8381#, c-format
8382msgid "%s thread failed to join: %s"
e640d114 8383msgstr "%s 线程等待失败:%s"
c1ac5258 8384
2b472aae 8385#: transport-helper.c:1371 transport-helper.c:1375
c1ac5258
JX
8386#, c-format
8387msgid "can't start thread for copying data: %s"
8388msgstr "不能启动线程来拷贝数据:%s"
8389
2b472aae 8390#: transport-helper.c:1412
c1ac5258
JX
8391#, c-format
8392msgid "%s process failed to wait"
8393msgstr "%s 进程等待失败"
8394
2b472aae 8395#: transport-helper.c:1416
c1ac5258
JX
8396#, c-format
8397msgid "%s process failed"
8398msgstr "%s 进程失败"
8399
2b472aae 8400#: transport-helper.c:1434 transport-helper.c:1443
c1ac5258
JX
8401msgid "can't start thread for copying data"
8402msgstr "不能启动线程来拷贝数据"
8403
2b472aae 8404#: tree-walk.c:32
a0b6b246
JX
8405msgid "too-short tree object"
8406msgstr "太短的树对象"
8407
2b472aae 8408#: tree-walk.c:38
a0b6b246 8409msgid "malformed mode in tree entry"
29004bbb 8410msgstr "树对象中的条目模式错误"
a0b6b246 8411
2b472aae 8412#: tree-walk.c:42
a0b6b246
JX
8413msgid "empty filename in tree entry"
8414msgstr "树对象条目中空的文件名"
8415
2b472aae 8416#: tree-walk.c:117
a0b6b246
JX
8417msgid "too-short tree file"
8418msgstr "太短的树文件"
8419
a5cd71ca 8420#: unpack-trees.c:110
a0b6b246
JX
8421#, c-format
8422msgid ""
8423"Your local changes to the following files would be overwritten by checkout:\n"
8424"%%sPlease commit your changes or stash them before you switch branches."
8425msgstr ""
8426"您对下列文件的本地修改将被检出操作覆盖:\n"
a4f16749 8427"%%s请在切换分支前提交或贮藏您的修改。"
a0b6b246 8428
a5cd71ca 8429#: unpack-trees.c:112
a0b6b246
JX
8430#, c-format
8431msgid ""
8432"Your local changes to the following files would be overwritten by checkout:\n"
8433"%%s"
8434msgstr ""
8435"您对下列文件的本地修改将被检出操作覆盖:\n"
8436"%%s"
8437
a5cd71ca 8438#: unpack-trees.c:115
a0b6b246
JX
8439#, c-format
8440msgid ""
8441"Your local changes to the following files would be overwritten by merge:\n"
8442"%%sPlease commit your changes or stash them before you merge."
8443msgstr ""
8444"您对下列文件的本地修改将被合并操作覆盖:\n"
a4f16749 8445"%%s请在合并前提交或贮藏您的修改。"
a0b6b246 8446
a5cd71ca 8447#: unpack-trees.c:117
a0b6b246
JX
8448#, c-format
8449msgid ""
8450"Your local changes to the following files would be overwritten by merge:\n"
8451"%%s"
8452msgstr ""
8453"您对下列文件的本地修改将被合并操作覆盖:\n"
8454"%%s"
8455
a5cd71ca 8456#: unpack-trees.c:120
a0b6b246
JX
8457#, c-format
8458msgid ""
8459"Your local changes to the following files would be overwritten by %s:\n"
8460"%%sPlease commit your changes or stash them before you %s."
8461msgstr ""
8462"您对下列文件的本地修改将被 %s 覆盖:\n"
a4f16749 8463"%%s请在 %s 之前提交或贮藏您的修改。"
6792b93b 8464
a5cd71ca 8465#: unpack-trees.c:122
a0b6b246
JX
8466#, c-format
8467msgid ""
8468"Your local changes to the following files would be overwritten by %s:\n"
8469"%%s"
8470msgstr ""
8471"您对下列文件的本地修改将被 %s 覆盖:\n"
8472"%%s"
c04f5ac3 8473
a5cd71ca 8474#: unpack-trees.c:127
a0b6b246
JX
8475#, c-format
8476msgid ""
1a79b2f1 8477"Updating the following directories would lose untracked files in them:\n"
a0b6b246
JX
8478"%s"
8479msgstr ""
8480"更新如下目录将会丢失其中未跟踪的文件:\n"
8481"%s"
1b7f4a34 8482
a5cd71ca 8483#: unpack-trees.c:131
a0b6b246
JX
8484#, c-format
8485msgid ""
8486"The following untracked working tree files would be removed by checkout:\n"
8487"%%sPlease move or remove them before you switch branches."
8488msgstr ""
8489"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
8490"%%s请在切换分支之前移动或删除。"
2e8451e8 8491
a5cd71ca 8492#: unpack-trees.c:133
a0b6b246
JX
8493#, c-format
8494msgid ""
8495"The following untracked working tree files would be removed by checkout:\n"
8496"%%s"
8497msgstr ""
8498"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
8499"%%s"
1003b3a5 8500
a5cd71ca 8501#: unpack-trees.c:136
a0b6b246
JX
8502#, c-format
8503msgid ""
8504"The following untracked working tree files would be removed by merge:\n"
8505"%%sPlease move or remove them before you merge."
8506msgstr ""
8507"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
8508"%%s请在合并前移动或删除。"
1003b3a5 8509
a5cd71ca 8510#: unpack-trees.c:138
a0b6b246
JX
8511#, c-format
8512msgid ""
8513"The following untracked working tree files would be removed by merge:\n"
8514"%%s"
8515msgstr ""
8516"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
8517"%%s"
c04f5ac3 8518
a5cd71ca 8519#: unpack-trees.c:141
a0b6b246
JX
8520#, c-format
8521msgid ""
8522"The following untracked working tree files would be removed by %s:\n"
8523"%%sPlease move or remove them before you %s."
8524msgstr ""
8525"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
8526"%%s请在 %s 前移动或删除。"
c04f5ac3 8527
a5cd71ca 8528#: unpack-trees.c:143
a0b6b246
JX
8529#, c-format
8530msgid ""
8531"The following untracked working tree files would be removed by %s:\n"
8532"%%s"
8533msgstr ""
8534"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
8535"%%s"
c04f5ac3 8536
a5cd71ca 8537#: unpack-trees.c:149
a0b6b246
JX
8538#, c-format
8539msgid ""
8540"The following untracked working tree files would be overwritten by "
8541"checkout:\n"
8542"%%sPlease move or remove them before you switch branches."
8543msgstr ""
8544"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
8545"%%s请在切换分支前移动或删除。"
c04f5ac3 8546
a5cd71ca 8547#: unpack-trees.c:151
1003b3a5 8548#, c-format
4dcdc3d8 8549msgid ""
a0b6b246
JX
8550"The following untracked working tree files would be overwritten by "
8551"checkout:\n"
8552"%%s"
4dcdc3d8 8553msgstr ""
a0b6b246
JX
8554"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
8555"%%s"
1003b3a5 8556
a5cd71ca 8557#: unpack-trees.c:154
c04f5ac3 8558#, c-format
a0b6b246
JX
8559msgid ""
8560"The following untracked working tree files would be overwritten by merge:\n"
8561"%%sPlease move or remove them before you merge."
8562msgstr ""
8563"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
8564"%%s请在合并前移动或删除。"
c04f5ac3 8565
a5cd71ca 8566#: unpack-trees.c:156
a0b6b246
JX
8567#, c-format
8568msgid ""
8569"The following untracked working tree files would be overwritten by merge:\n"
8570"%%s"
8571msgstr ""
8572"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
8573"%%s"
c04f5ac3 8574
a5cd71ca 8575#: unpack-trees.c:159
a0b6b246
JX
8576#, c-format
8577msgid ""
8578"The following untracked working tree files would be overwritten by %s:\n"
8579"%%sPlease move or remove them before you %s."
8580msgstr ""
8581"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
8582"%%s请在 %s 前移动或删除。"
c04f5ac3 8583
a5cd71ca 8584#: unpack-trees.c:161
07432cef 8585#, c-format
a0b6b246
JX
8586msgid ""
8587"The following untracked working tree files would be overwritten by %s:\n"
8588"%%s"
8589msgstr ""
8590"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
8591"%%s"
c04f5ac3 8592
a5cd71ca 8593#: unpack-trees.c:169
07432cef 8594#, c-format
a0b6b246
JX
8595msgid "Entry '%s' overlaps with '%s'. Cannot bind."
8596msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
c04f5ac3 8597
a5cd71ca 8598#: unpack-trees.c:172
07432cef 8599#, c-format
ef317cd5 8600msgid ""
6937cb4e 8601"Cannot update sparse checkout: the following entries are not up to date:\n"
a0b6b246
JX
8602"%s"
8603msgstr ""
8604"无法更新稀疏检出:如下条目不是最新:\n"
8605"%s"
c04f5ac3 8606
a5cd71ca 8607#: unpack-trees.c:174
07432cef 8608#, c-format
a0b6b246
JX
8609msgid ""
8610"The following working tree files would be overwritten by sparse checkout "
8611"update:\n"
8612"%s"
8613msgstr ""
8614"工作区中下列文件将被稀疏检出更新所覆盖:\n"
8615"%s"
c04f5ac3 8616
a5cd71ca 8617#: unpack-trees.c:176
07432cef 8618#, c-format
a0b6b246
JX
8619msgid ""
8620"The following working tree files would be removed by sparse checkout "
8621"update:\n"
8622"%s"
8623msgstr ""
8624"工作区中下列文件将被稀疏检出更新所删除:\n"
8625"%s"
c04f5ac3 8626
a5cd71ca 8627#: unpack-trees.c:178
87cb7997
JX
8628#, c-format
8629msgid ""
8630"Cannot update submodule:\n"
8631"%s"
8632msgstr ""
8633"无法更新子模组:\n"
8634"%s"
8635
a5cd71ca 8636#: unpack-trees.c:255
07432cef 8637#, c-format
a0b6b246 8638msgid "Aborting\n"
a6cd2cc4 8639msgstr "正在终止\n"
ef317cd5 8640
a5cd71ca 8641#: unpack-trees.c:317
a6cd2cc4
JX
8642msgid "Updating files"
8643msgstr "正在更新文件"
c04f5ac3 8644
a5cd71ca 8645#: unpack-trees.c:349
4c27fcb5
JX
8646msgid ""
8647"the following paths have collided (e.g. case-sensitive paths\n"
8648"on a case-insensitive filesystem) and only one from the same\n"
8649"colliding group is in the working tree:\n"
8650msgstr ""
8651"以下路径发生碰撞(如:在不区分大小写的文件系统上的区分大小写的路径),\n"
8652"并且碰撞组中只有一个文件存在工作区中:\n"
8653
2b472aae 8654#: unpack-trees.c:1445
ddc12c42
JX
8655msgid "Updating index flags"
8656msgstr "正在更新索引标志"
8657
87cb7997 8658#: urlmatch.c:163
a0b6b246
JX
8659msgid "invalid URL scheme name or missing '://' suffix"
8660msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
8661
87cb7997 8662#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
07432cef 8663#, c-format
a0b6b246
JX
8664msgid "invalid %XX escape sequence"
8665msgstr "无效的 %XX 转义序列"
c04f5ac3 8666
87cb7997 8667#: urlmatch.c:215
a0b6b246
JX
8668msgid "missing host and scheme is not 'file:'"
8669msgstr "缺失主机名且 URL 方案不是 'file:'"
c04f5ac3 8670
87cb7997 8671#: urlmatch.c:232
a0b6b246
JX
8672msgid "a 'file:' URL may not have a port number"
8673msgstr "一个 'file:' URL 不应该包含端口号"
94550ed3 8674
87cb7997 8675#: urlmatch.c:247
a0b6b246
JX
8676msgid "invalid characters in host name"
8677msgstr "主机名中包含无效的字符"
90314792 8678
87cb7997 8679#: urlmatch.c:292 urlmatch.c:303
a0b6b246
JX
8680msgid "invalid port number"
8681msgstr "无效的端口号"
c04f5ac3 8682
87cb7997 8683#: urlmatch.c:371
a0b6b246
JX
8684msgid "invalid '..' path segment"
8685msgstr "无效的 '..' 路径片段"
5c0c220c 8686
2b472aae
JX
8687#: walker.c:170
8688msgid "Fetching objects"
8689msgstr "正在获取对象"
8690
8691#: worktree.c:259 builtin/am.c:2099
a77c07d9 8692#, c-format
a0b6b246 8693msgid "failed to read '%s'"
c1ac5258 8694msgstr "读取 '%s' 失败"
ef317cd5 8695
2b472aae 8696#: worktree.c:305
31e5e17b
JX
8697#, c-format
8698msgid "'%s' at main working tree is not the repository directory"
8699msgstr "在主工作区的 '%s' 不是仓库目录"
8700
2b472aae 8701#: worktree.c:316
31e5e17b
JX
8702#, c-format
8703msgid "'%s' file does not contain absolute path to the working tree location"
8704msgstr "文件 '%s' 不包含工作区的绝对路径"
8705
2b472aae 8706#: worktree.c:328
31e5e17b
JX
8707#, c-format
8708msgid "'%s' does not exist"
8709msgstr "'%s' 不存在"
8710
2b472aae 8711#: worktree.c:334
31e5e17b
JX
8712#, c-format
8713msgid "'%s' is not a .git file, error code %d"
8714msgstr "'%s' 不是一个 .git 文件,错误码 %d"
8715
2b472aae 8716#: worktree.c:342
31e5e17b
JX
8717#, c-format
8718msgid "'%s' does not point back to '%s'"
8719msgstr "'%s' 没有指回到 '%s'"
8720
a5cd71ca 8721#: wrapper.c:186 wrapper.c:356
c04f5ac3 8722#, c-format
a0b6b246
JX
8723msgid "could not open '%s' for reading and writing"
8724msgstr "无法打开 '%s' 进行读写"
c04f5ac3 8725
a5cd71ca 8726#: wrapper.c:387 wrapper.c:588
a0b6b246
JX
8727#, c-format
8728msgid "unable to access '%s'"
8729msgstr "不能访问 '%s'"
c04f5ac3 8730
a5cd71ca 8731#: wrapper.c:596
a0b6b246
JX
8732msgid "unable to get current working directory"
8733msgstr "不能获取当前工作目录"
c04f5ac3 8734
a6cd2cc4 8735#: wt-status.c:158
a0b6b246
JX
8736msgid "Unmerged paths:"
8737msgstr "未合并的路径:"
7aea43ff 8738
a0b6b246 8739# 译者:注意保持前导空格
a6cd2cc4
JX
8740#: wt-status.c:187 wt-status.c:219
8741msgid " (use \"git restore --staged <file>...\" to unstage)"
8742msgstr " (使用 \"git restore --staged <文件>...\" 以取消暂存)"
8743
8744# 译者:注意保持前导空格
8745#: wt-status.c:190 wt-status.c:222
c04f5ac3 8746#, c-format
a6cd2cc4
JX
8747msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
8748msgstr " (使用 \"git restore --source=%s --staged <文件>...\" 以取消暂存)"
c04f5ac3 8749
a0b6b246 8750# 译者:注意保持前导空格
a6cd2cc4 8751#: wt-status.c:193 wt-status.c:225
a0b6b246
JX
8752msgid " (use \"git rm --cached <file>...\" to unstage)"
8753msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
c04f5ac3 8754
a0b6b246 8755# 译者:注意保持前导空格
a6cd2cc4 8756#: wt-status.c:197
a0b6b246
JX
8757msgid " (use \"git add <file>...\" to mark resolution)"
8758msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
8ada9598 8759
a0b6b246 8760# 译者:注意保持前导空格
a6cd2cc4 8761#: wt-status.c:199 wt-status.c:203
a0b6b246
JX
8762msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
8763msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
8ada9598 8764
a0b6b246 8765# 译者:注意保持前导空格
a6cd2cc4 8766#: wt-status.c:201
a0b6b246
JX
8767msgid " (use \"git rm <file>...\" to mark resolution)"
8768msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
ef317cd5 8769
a6cd2cc4 8770#: wt-status.c:211 wt-status.c:1074
a0b6b246
JX
8771msgid "Changes to be committed:"
8772msgstr "要提交的变更:"
ef317cd5 8773
a6cd2cc4 8774#: wt-status.c:234 wt-status.c:1083
a0b6b246
JX
8775msgid "Changes not staged for commit:"
8776msgstr "尚未暂存以备提交的变更:"
ef317cd5 8777
a0b6b246 8778# 译者:注意保持前导空格
a6cd2cc4 8779#: wt-status.c:238
a0b6b246
JX
8780msgid " (use \"git add <file>...\" to update what will be committed)"
8781msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
ef317cd5 8782
a0b6b246 8783# 译者:注意保持前导空格
a6cd2cc4 8784#: wt-status.c:240
a0b6b246
JX
8785msgid " (use \"git add/rm <file>...\" to update what will be committed)"
8786msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
ef317cd5 8787
a0b6b246 8788# 译者:注意保持前导空格
a6cd2cc4 8789#: wt-status.c:241
a0b6b246 8790msgid ""
a6cd2cc4
JX
8791" (use \"git restore <file>...\" to discard changes in working directory)"
8792msgstr " (使用 \"git restore <文件>...\" 丢弃工作区的改动)"
ef317cd5 8793
a0b6b246 8794# 译者:注意保持前导空格
a6cd2cc4 8795#: wt-status.c:243
a0b6b246
JX
8796msgid " (commit or discard the untracked or modified content in submodules)"
8797msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
ef317cd5 8798
a0b6b246 8799# 译者:注意保持前导空格
a6cd2cc4 8800#: wt-status.c:254
a0b6b246
JX
8801#, c-format
8802msgid " (use \"git %s <file>...\" to include in what will be committed)"
8803msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
ef317cd5 8804
a6cd2cc4 8805#: wt-status.c:268
a0b6b246
JX
8806msgid "both deleted:"
8807msgstr "双方删除:"
ef317cd5 8808
a6cd2cc4 8809#: wt-status.c:270
a0b6b246
JX
8810msgid "added by us:"
8811msgstr "由我们添加:"
4dcdc3d8 8812
a6cd2cc4 8813#: wt-status.c:272
a0b6b246
JX
8814msgid "deleted by them:"
8815msgstr "由他们删除:"
ef317cd5 8816
a6cd2cc4 8817#: wt-status.c:274
a0b6b246
JX
8818msgid "added by them:"
8819msgstr "由他们添加:"
ef317cd5 8820
a6cd2cc4 8821#: wt-status.c:276
a0b6b246
JX
8822msgid "deleted by us:"
8823msgstr "由我们删除:"
ef317cd5 8824
a6cd2cc4 8825#: wt-status.c:278
a0b6b246
JX
8826msgid "both added:"
8827msgstr "双方添加:"
5c57d762 8828
a6cd2cc4 8829#: wt-status.c:280
a0b6b246
JX
8830msgid "both modified:"
8831msgstr "双方修改:"
5c57d762 8832
a6cd2cc4 8833#: wt-status.c:290
a0b6b246
JX
8834msgid "new file:"
8835msgstr "新文件:"
8ada9598 8836
a6cd2cc4 8837#: wt-status.c:292
a0b6b246
JX
8838msgid "copied:"
8839msgstr "拷贝:"
8ada9598 8840
a6cd2cc4 8841#: wt-status.c:294
a0b6b246
JX
8842msgid "deleted:"
8843msgstr "删除:"
8ada9598 8844
a6cd2cc4 8845#: wt-status.c:296
a0b6b246
JX
8846msgid "modified:"
8847msgstr "修改:"
8ada9598 8848
a6cd2cc4 8849#: wt-status.c:298
a0b6b246
JX
8850msgid "renamed:"
8851msgstr "重命名:"
5c57d762 8852
a6cd2cc4 8853#: wt-status.c:300
a0b6b246
JX
8854msgid "typechange:"
8855msgstr "类型变更:"
8ada9598 8856
a6cd2cc4 8857#: wt-status.c:302
a0b6b246
JX
8858msgid "unknown:"
8859msgstr "未知:"
8ada9598 8860
a6cd2cc4 8861#: wt-status.c:304
a0b6b246
JX
8862msgid "unmerged:"
8863msgstr "未合并:"
8ada9598 8864
a0b6b246 8865# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
a6cd2cc4 8866#: wt-status.c:384
a0b6b246
JX
8867msgid "new commits, "
8868msgstr "新提交, "
8ada9598 8869
a0b6b246 8870# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
a6cd2cc4 8871#: wt-status.c:386
a0b6b246
JX
8872msgid "modified content, "
8873msgstr "修改的内容, "
1b7f4a34 8874
a0b6b246 8875# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
a6cd2cc4 8876#: wt-status.c:388
a0b6b246
JX
8877msgid "untracked content, "
8878msgstr "未跟踪的内容, "
1b7f4a34 8879
a6cd2cc4 8880#: wt-status.c:906
a4f16749
JX
8881#, c-format
8882msgid "Your stash currently has %d entry"
8883msgid_plural "Your stash currently has %d entries"
8884msgstr[0] "您的贮藏区当前有 %d 条记录"
8885msgstr[1] "您的贮藏区当前有 %d 条记录"
8886
a6cd2cc4 8887#: wt-status.c:938
a0b6b246
JX
8888msgid "Submodules changed but not updated:"
8889msgstr "子模组已修改但尚未更新:"
1b7f4a34 8890
a6cd2cc4 8891#: wt-status.c:940
a0b6b246
JX
8892msgid "Submodule changes to be committed:"
8893msgstr "要提交的子模组变更:"
1b7f4a34 8894
a6cd2cc4 8895#: wt-status.c:1022
a0b6b246 8896msgid ""
6937cb4e
JX
8897"Do not modify or remove the line above.\n"
8898"Everything below it will be ignored."
a0b6b246 8899msgstr ""
6937cb4e
JX
8900"不要改动或删除上面的一行。\n"
8901"其下所有内容都将被忽略。"
1b7f4a34 8902
a6cd2cc4
JX
8903#: wt-status.c:1114
8904#, c-format
8905msgid ""
8906"\n"
8907"It took %.2f seconds to compute the branch ahead/behind values.\n"
8908"You can use '--no-ahead-behind' to avoid this.\n"
8909msgstr ""
8910"\n"
8911"花了 %.2f 秒才计算出分支的领先/落后范围。\n"
8912"为避免,您可以使用 '--no-ahead-behind'。\n"
8913
8914#: wt-status.c:1144
a0b6b246
JX
8915msgid "You have unmerged paths."
8916msgstr "您有尚未合并的路径。"
1b7f4a34 8917
a0b6b246 8918# 译者:注意保持前导空格
a6cd2cc4 8919#: wt-status.c:1147
a0b6b246
JX
8920msgid " (fix conflicts and run \"git commit\")"
8921msgstr " (解决冲突并运行 \"git commit\")"
1b7f4a34 8922
a0b6b246 8923# 译者:注意保持前导空格
a6cd2cc4 8924#: wt-status.c:1149
a0b6b246
JX
8925msgid " (use \"git merge --abort\" to abort the merge)"
8926msgstr " (使用 \"git merge --abort\" 终止合并)"
1b7f4a34 8927
a6cd2cc4 8928#: wt-status.c:1153
a0b6b246
JX
8929msgid "All conflicts fixed but you are still merging."
8930msgstr "所有冲突已解决但您仍处于合并中。"
1b7f4a34 8931
a0b6b246 8932# 译者:注意保持前导空格
a6cd2cc4 8933#: wt-status.c:1156
a0b6b246
JX
8934msgid " (use \"git commit\" to conclude merge)"
8935msgstr " (使用 \"git commit\" 结束合并)"
1b7f4a34 8936
a6cd2cc4 8937#: wt-status.c:1165
a0b6b246
JX
8938msgid "You are in the middle of an am session."
8939msgstr "您正处于 am 操作过程中。"
1b7f4a34 8940
a6cd2cc4 8941#: wt-status.c:1168
a0b6b246
JX
8942msgid "The current patch is empty."
8943msgstr "当前的补丁为空。"
1b7f4a34 8944
a0b6b246 8945# 译者:注意保持前导空格
a6cd2cc4 8946#: wt-status.c:1172
a0b6b246
JX
8947msgid " (fix conflicts and then run \"git am --continue\")"
8948msgstr " (解决冲突,然后运行 \"git am --continue\")"
1b7f4a34 8949
a0b6b246 8950# 译者:注意保持前导空格
a6cd2cc4 8951#: wt-status.c:1174
a0b6b246
JX
8952msgid " (use \"git am --skip\" to skip this patch)"
8953msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1b7f4a34 8954
a0b6b246 8955# 译者:注意保持前导空格
a6cd2cc4 8956#: wt-status.c:1176
a0b6b246
JX
8957msgid " (use \"git am --abort\" to restore the original branch)"
8958msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1b7f4a34 8959
a6cd2cc4 8960#: wt-status.c:1309
1a79b2f1
JX
8961msgid "git-rebase-todo is missing."
8962msgstr "git-rebase-todo 丢失。"
8963
a6cd2cc4 8964#: wt-status.c:1311
a0b6b246
JX
8965msgid "No commands done."
8966msgstr "没有命令被执行。"
8967
a6cd2cc4 8968#: wt-status.c:1314
1b7f4a34 8969#, c-format
a0b6b246
JX
8970msgid "Last command done (%d command done):"
8971msgid_plural "Last commands done (%d commands done):"
8972msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
8973msgstr[1] "最后的命令已完成(%d 条命令被执行):"
1b7f4a34 8974
a6cd2cc4 8975#: wt-status.c:1325
1b7f4a34 8976#, c-format
a0b6b246
JX
8977msgid " (see more in file %s)"
8978msgstr " (更多参见文件 %s)"
8979
a6cd2cc4 8980#: wt-status.c:1330
a0b6b246
JX
8981msgid "No commands remaining."
8982msgstr "未剩下任何命令。"
1b7f4a34 8983
a6cd2cc4 8984#: wt-status.c:1333
1b7f4a34 8985#, c-format
a0b6b246
JX
8986msgid "Next command to do (%d remaining command):"
8987msgid_plural "Next commands to do (%d remaining commands):"
8988msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
8989msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
1b7f4a34 8990
a0b6b246 8991# 译者:注意保持前导空格
a6cd2cc4 8992#: wt-status.c:1341
a0b6b246
JX
8993msgid " (use \"git rebase --edit-todo\" to view and edit)"
8994msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
1b7f4a34 8995
a6cd2cc4 8996#: wt-status.c:1353
1b7f4a34 8997#, c-format
a0b6b246
JX
8998msgid "You are currently rebasing branch '%s' on '%s'."
8999msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1b7f4a34 9000
a6cd2cc4 9001#: wt-status.c:1358
a0b6b246
JX
9002msgid "You are currently rebasing."
9003msgstr "您在执行变基操作。"
1b7f4a34 9004
a0b6b246 9005# 译者:注意保持前导空格
a6cd2cc4 9006#: wt-status.c:1371
a0b6b246
JX
9007msgid " (fix conflicts and then run \"git rebase --continue\")"
9008msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1b7f4a34 9009
a0b6b246 9010# 译者:注意保持前导空格
a6cd2cc4 9011#: wt-status.c:1373
a0b6b246
JX
9012msgid " (use \"git rebase --skip\" to skip this patch)"
9013msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
9014
9015# 译者:注意保持前导空格
a6cd2cc4 9016#: wt-status.c:1375
a0b6b246
JX
9017msgid " (use \"git rebase --abort\" to check out the original branch)"
9018msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
9019
9020# 译者:注意保持前导空格
a6cd2cc4 9021#: wt-status.c:1382
a0b6b246
JX
9022msgid " (all conflicts fixed: run \"git rebase --continue\")"
9023msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1b7f4a34 9024
a6cd2cc4 9025#: wt-status.c:1386
a0b6b246 9026#, c-format
1b7f4a34 9027msgid ""
a0b6b246
JX
9028"You are currently splitting a commit while rebasing branch '%s' on '%s'."
9029msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1b7f4a34 9030
a6cd2cc4 9031#: wt-status.c:1391
a0b6b246
JX
9032msgid "You are currently splitting a commit during a rebase."
9033msgstr "您在执行变基操作时拆分提交。"
1b7f4a34 9034
a0b6b246 9035# 译者:注意保持前导空格
a6cd2cc4 9036#: wt-status.c:1394
a0b6b246
JX
9037msgid " (Once your working directory is clean, run \"git rebase --continue\")"
9038msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1b7f4a34 9039
a6cd2cc4 9040#: wt-status.c:1398
a0b6b246
JX
9041#, c-format
9042msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
9043msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1b7f4a34 9044
a6cd2cc4 9045#: wt-status.c:1403
a0b6b246
JX
9046msgid "You are currently editing a commit during a rebase."
9047msgstr "您在执行变基操作时编辑提交。"
1b7f4a34 9048
a0b6b246 9049# 译者:注意保持前导空格
a6cd2cc4 9050#: wt-status.c:1406
a0b6b246
JX
9051msgid " (use \"git commit --amend\" to amend the current commit)"
9052msgstr " (使用 \"git commit --amend\" 修补当前提交)"
9053
9054# 译者:注意保持前导空格
a6cd2cc4 9055#: wt-status.c:1408
a0b6b246
JX
9056msgid ""
9057" (use \"git rebase --continue\" once you are satisfied with your changes)"
9058msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1b7f4a34 9059
a6cd2cc4 9060#: wt-status.c:1419
d46c5519
JX
9061msgid "Cherry-pick currently in progress."
9062msgstr "拣选操作正在进行中。"
9063
a6cd2cc4 9064#: wt-status.c:1422
1b7f4a34 9065#, c-format
a0b6b246
JX
9066msgid "You are currently cherry-picking commit %s."
9067msgstr "您在执行拣选提交 %s 的操作。"
1b7f4a34 9068
a0b6b246 9069# 译者:注意保持前导空格
a6cd2cc4 9070#: wt-status.c:1429
a0b6b246
JX
9071msgid " (fix conflicts and run \"git cherry-pick --continue\")"
9072msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1b7f4a34 9073
a0b6b246 9074# 译者:注意保持前导空格
a6cd2cc4 9075#: wt-status.c:1432
d46c5519
JX
9076msgid " (run \"git cherry-pick --continue\" to continue)"
9077msgstr " (执行 \"git cherry-pick --continue\" 以继续)"
9078
9079# 译者:注意保持前导空格
a6cd2cc4 9080#: wt-status.c:1435
a0b6b246
JX
9081msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
9082msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1b7f4a34 9083
a0b6b246 9084# 译者:注意保持前导空格
a6cd2cc4 9085#: wt-status.c:1437
a5cd71ca
JX
9086msgid " (use \"git cherry-pick --skip\" to skip this patch)"
9087msgstr " (使用 \"git cherry-pick --skip\" 跳过此补丁)"
9088
9089# 译者:注意保持前导空格
9090#: wt-status.c:1439
a0b6b246
JX
9091msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
9092msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1b7f4a34 9093
a5cd71ca 9094#: wt-status.c:1449
d46c5519
JX
9095msgid "Revert currently in progress."
9096msgstr "还原操作正在行中。"
9097
a5cd71ca 9098#: wt-status.c:1452
1b7f4a34 9099#, c-format
a0b6b246
JX
9100msgid "You are currently reverting commit %s."
9101msgstr "您在执行反转提交 %s 的操作。"
1b7f4a34 9102
a0b6b246 9103# 译者:注意保持前导空格
a5cd71ca 9104#: wt-status.c:1458
a0b6b246 9105msgid " (fix conflicts and run \"git revert --continue\")"
5b533632 9106msgstr " (解决冲突并执行 \"git revert --continue\")"
1b7f4a34 9107
a0b6b246 9108# 译者:注意保持前导空格
a5cd71ca 9109#: wt-status.c:1461
d46c5519 9110msgid " (run \"git revert --continue\" to continue)"
5b533632 9111msgstr " (执行 \"git revert --continue\" 以继续)"
d46c5519
JX
9112
9113# 译者:注意保持前导空格
a5cd71ca 9114#: wt-status.c:1464
a0b6b246 9115msgid " (all conflicts fixed: run \"git revert --continue\")"
5b533632 9116msgstr " (所有冲突已解决:执行 \"git revert --continue\")"
1b7f4a34 9117
a0b6b246 9118# 译者:注意保持前导空格
a5cd71ca
JX
9119#: wt-status.c:1466
9120msgid " (use \"git revert --skip\" to skip this patch)"
9121msgstr " (使用 \"git revert --skip\" 跳过此补丁)"
9122
9123# 译者:注意保持前导空格
9124#: wt-status.c:1468
a0b6b246
JX
9125msgid " (use \"git revert --abort\" to cancel the revert operation)"
9126msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1b7f4a34 9127
a5cd71ca 9128#: wt-status.c:1478
1b7f4a34 9129#, c-format
a0b6b246
JX
9130msgid "You are currently bisecting, started from branch '%s'."
9131msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1b7f4a34 9132
a5cd71ca 9133#: wt-status.c:1482
a0b6b246
JX
9134msgid "You are currently bisecting."
9135msgstr "您在执行二分查找操作。"
1b7f4a34 9136
a0b6b246 9137# 译者:注意保持前导空格
a5cd71ca 9138#: wt-status.c:1485
a0b6b246
JX
9139msgid " (use \"git bisect reset\" to get back to the original branch)"
9140msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1b7f4a34 9141
a5cd71ca 9142#: wt-status.c:1694
a0b6b246
JX
9143msgid "On branch "
9144msgstr "位于分支 "
1b7f4a34 9145
a5cd71ca 9146#: wt-status.c:1701
a0b6b246
JX
9147msgid "interactive rebase in progress; onto "
9148msgstr "交互式变基操作正在进行中;至 "
1b7f4a34 9149
a5cd71ca 9150#: wt-status.c:1703
a0b6b246
JX
9151msgid "rebase in progress; onto "
9152msgstr "变基操作正在进行中;至 "
1b7f4a34 9153
a5cd71ca 9154#: wt-status.c:1713
a0b6b246
JX
9155msgid "Not currently on any branch."
9156msgstr "当前不在任何分支上。"
1b7f4a34 9157
a5cd71ca 9158#: wt-status.c:1730
a0b6b246
JX
9159msgid "Initial commit"
9160msgstr "初始提交"
1b7f4a34 9161
a5cd71ca 9162#: wt-status.c:1731
a4f16749
JX
9163msgid "No commits yet"
9164msgstr "尚无提交"
9165
a5cd71ca 9166#: wt-status.c:1745
a0b6b246
JX
9167msgid "Untracked files"
9168msgstr "未跟踪的文件"
1b7f4a34 9169
a5cd71ca 9170#: wt-status.c:1747
a0b6b246
JX
9171msgid "Ignored files"
9172msgstr "忽略的文件"
1b7f4a34 9173
a5cd71ca 9174#: wt-status.c:1751
a0b6b246
JX
9175#, c-format
9176msgid ""
9177"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
9178"may speed it up, but you have to be careful not to forget to add\n"
9179"new files yourself (see 'git help status')."
9180msgstr ""
9181"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
9182"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1b7f4a34 9183
a5cd71ca 9184#: wt-status.c:1757
a0b6b246
JX
9185#, c-format
9186msgid "Untracked files not listed%s"
9187msgstr "未跟踪的文件没有列出%s"
1b7f4a34 9188
a0b6b246 9189# 译者:中文字符串拼接,可删除前导空格
a5cd71ca 9190#: wt-status.c:1759
a0b6b246
JX
9191msgid " (use -u option to show untracked files)"
9192msgstr "(使用 -u 参数显示未跟踪的文件)"
1b7f4a34 9193
a5cd71ca 9194#: wt-status.c:1765
a0b6b246
JX
9195msgid "No changes"
9196msgstr "没有修改"
1b7f4a34 9197
a5cd71ca 9198#: wt-status.c:1770
a0b6b246
JX
9199#, c-format
9200msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
9201msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1b7f4a34 9202
a5cd71ca 9203#: wt-status.c:1773
a0b6b246
JX
9204#, c-format
9205msgid "no changes added to commit\n"
9206msgstr "修改尚未加入提交\n"
1b7f4a34 9207
a5cd71ca 9208#: wt-status.c:1776
a0b6b246
JX
9209#, c-format
9210msgid ""
9211"nothing added to commit but untracked files present (use \"git add\" to "
9212"track)\n"
9213msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1b7f4a34 9214
a5cd71ca 9215#: wt-status.c:1779
a0b6b246
JX
9216#, c-format
9217msgid "nothing added to commit but untracked files present\n"
9218msgstr "提交为空,但是存在尚未跟踪的文件\n"
1b7f4a34 9219
a0b6b246 9220# 译者:中文字符串拼接,可删除前导空格
a5cd71ca 9221#: wt-status.c:1782
a0b6b246
JX
9222#, c-format
9223msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
9224msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1b7f4a34 9225
a5cd71ca 9226#: wt-status.c:1785 wt-status.c:1790
a0b6b246
JX
9227#, c-format
9228msgid "nothing to commit\n"
9229msgstr "无文件要提交\n"
1b7f4a34 9230
a0b6b246 9231# 译者:中文字符串拼接,可删除前导空格
a5cd71ca 9232#: wt-status.c:1788
a0b6b246
JX
9233#, c-format
9234msgid "nothing to commit (use -u to show untracked files)\n"
9235msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1b7f4a34 9236
a0b6b246 9237# 译者:中文字符串拼接,可删除前导空格
a5cd71ca 9238#: wt-status.c:1792
a0b6b246
JX
9239#, c-format
9240msgid "nothing to commit, working tree clean\n"
9241msgstr "无文件要提交,干净的工作区\n"
9242
a5cd71ca 9243#: wt-status.c:1905
a4f16749
JX
9244msgid "No commits yet on "
9245msgstr "尚无提交在 "
1b7f4a34 9246
a5cd71ca 9247#: wt-status.c:1909
a0b6b246
JX
9248msgid "HEAD (no branch)"
9249msgstr "HEAD(非分支)"
1b7f4a34 9250
a5cd71ca 9251#: wt-status.c:1940
31e5e17b
JX
9252msgid "different"
9253msgstr "不同"
9254
a0b6b246 9255# 译者:注意保持句尾空格
a5cd71ca 9256#: wt-status.c:1942 wt-status.c:1950
a0b6b246
JX
9257msgid "behind "
9258msgstr "落后 "
1b7f4a34 9259
a5cd71ca 9260#: wt-status.c:1945 wt-status.c:1948
a0b6b246
JX
9261msgid "ahead "
9262msgstr "领先 "
1b7f4a34 9263
a0b6b246 9264#. TRANSLATORS: the action is e.g. "pull with rebase"
a5cd71ca 9265#: wt-status.c:2470
a0b6b246
JX
9266#, c-format
9267msgid "cannot %s: You have unstaged changes."
9268msgstr "不能%s:您有未暂存的变更。"
1b7f4a34 9269
a5cd71ca 9270#: wt-status.c:2476
a0b6b246 9271msgid "additionally, your index contains uncommitted changes."
29004bbb 9272msgstr "另外,您的索引中包含未提交的变更。"
1b7f4a34 9273
a5cd71ca 9274#: wt-status.c:2478
a0b6b246
JX
9275#, c-format
9276msgid "cannot %s: Your index contains uncommitted changes."
9277msgstr "不能%s:您的索引中包含未提交的变更。"
1b7f4a34 9278
ddc12c42 9279#: compat/precompose_utf8.c:58 builtin/clone.c:455
a5cd71ca
JX
9280#, c-format
9281msgid "failed to unlink '%s'"
9282msgstr "删除 '%s' 失败"
9283
ddc12c42 9284#: builtin/add.c:26
a0b6b246
JX
9285msgid "git add [<options>] [--] <pathspec>..."
9286msgstr "git add [<选项>] [--] <路径规格>..."
1b7f4a34 9287
2b472aae 9288#: builtin/add.c:88
a0b6b246
JX
9289#, c-format
9290msgid "unexpected diff status %c"
9291msgstr "意外的差异状态 %c"
1b7f4a34 9292
2b472aae 9293#: builtin/add.c:93 builtin/commit.c:288
a0b6b246
JX
9294msgid "updating files failed"
9295msgstr "更新文件失败"
1b7f4a34 9296
2b472aae 9297#: builtin/add.c:103
a0b6b246
JX
9298#, c-format
9299msgid "remove '%s'\n"
9300msgstr "删除 '%s'\n"
1b7f4a34 9301
2b472aae 9302#: builtin/add.c:178
a0b6b246
JX
9303msgid "Unstaged changes after refreshing the index:"
9304msgstr "刷新索引之后尚未被暂存的变更:"
1b7f4a34 9305
2b472aae 9306#: builtin/add.c:266 builtin/rev-parse.c:899
a0b6b246
JX
9307msgid "Could not read the index"
9308msgstr "不能读取索引"
1b7f4a34 9309
2b472aae 9310#: builtin/add.c:277
a0b6b246
JX
9311#, c-format
9312msgid "Could not open '%s' for writing."
c1ac5258 9313msgstr "无法为写入打开 '%s'。"
1b7f4a34 9314
2b472aae 9315#: builtin/add.c:281
a0b6b246
JX
9316msgid "Could not write patch"
9317msgstr "不能生成补丁"
1b7f4a34 9318
2b472aae 9319#: builtin/add.c:284
a0b6b246
JX
9320msgid "editing patch failed"
9321msgstr "编辑补丁失败"
1b7f4a34 9322
2b472aae 9323#: builtin/add.c:287
1b7f4a34 9324#, c-format
a0b6b246 9325msgid "Could not stat '%s'"
65e2041e 9326msgstr "不能对 '%s' 调用 stat"
1b7f4a34 9327
2b472aae 9328#: builtin/add.c:289
a0b6b246
JX
9329msgid "Empty patch. Aborted."
9330msgstr "空补丁。异常终止。"
1b7f4a34 9331
2b472aae 9332#: builtin/add.c:294
a0b6b246
JX
9333#, c-format
9334msgid "Could not apply '%s'"
9335msgstr "不能应用 '%s'"
1b7f4a34 9336
2b472aae 9337#: builtin/add.c:302
a0b6b246
JX
9338msgid "The following paths are ignored by one of your .gitignore files:\n"
9339msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 9340
2b472aae
JX
9341#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
9342#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
9343#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
a0b6b246
JX
9344msgid "dry run"
9345msgstr "演习"
8ada9598 9346
2b472aae 9347#: builtin/add.c:325
a0b6b246
JX
9348msgid "interactive picking"
9349msgstr "交互式拣选"
8ada9598 9350
2b472aae 9351#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
a0b6b246
JX
9352msgid "select hunks interactively"
9353msgstr "交互式挑选数据块"
8ada9598 9354
2b472aae 9355#: builtin/add.c:327
a0b6b246
JX
9356msgid "edit current diff and apply"
9357msgstr "编辑当前差异并应用"
8ada9598 9358
2b472aae 9359#: builtin/add.c:328
a0b6b246
JX
9360msgid "allow adding otherwise ignored files"
9361msgstr "允许添加忽略的文件"
8ada9598 9362
2b472aae 9363#: builtin/add.c:329
a0b6b246
JX
9364msgid "update tracked files"
9365msgstr "更新已跟踪的文件"
8ada9598 9366
2b472aae 9367#: builtin/add.c:330
5809aa05
JX
9368msgid "renormalize EOL of tracked files (implies -u)"
9369msgstr "对已跟踪文件(暗含 -u)重新归一换行符"
9370
2b472aae 9371#: builtin/add.c:331
a0b6b246
JX
9372msgid "record only the fact that the path will be added later"
9373msgstr "只记录,该路径稍后再添加"
8ada9598 9374
2b472aae 9375#: builtin/add.c:332
a0b6b246
JX
9376msgid "add changes from all tracked and untracked files"
9377msgstr "添加所有改变的已跟踪文件和未跟踪文件"
8ada9598 9378
2b472aae 9379#: builtin/add.c:335
a0b6b246
JX
9380msgid "ignore paths removed in the working tree (same as --no-all)"
9381msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
8ada9598 9382
2b472aae 9383#: builtin/add.c:337
a0b6b246
JX
9384msgid "don't add, only refresh the index"
9385msgstr "不添加,只刷新索引"
8ada9598 9386
2b472aae 9387#: builtin/add.c:338
a0b6b246
JX
9388msgid "just skip files which cannot be added because of errors"
9389msgstr "跳过因出错不能添加的文件"
8ada9598 9390
2b472aae 9391#: builtin/add.c:339
a0b6b246
JX
9392msgid "check if - even missing - files are ignored in dry run"
9393msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
8ada9598 9394
2b472aae 9395#: builtin/add.c:341 builtin/update-index.c:1004
a0b6b246
JX
9396msgid "override the executable bit of the listed files"
9397msgstr "覆盖列表里文件的可执行位"
8ada9598 9398
2b472aae 9399#: builtin/add.c:343
a4f16749
JX
9400msgid "warn when adding an embedded repository"
9401msgstr "创建一个嵌入式仓库时给予警告"
9402
2b472aae
JX
9403#: builtin/add.c:345
9404msgid "backend for `git stash -p`"
9405msgstr "`git stash -p` 的后端"
9406
9407#: builtin/add.c:363
a4f16749
JX
9408#, c-format
9409msgid ""
9410"You've added another git repository inside your current repository.\n"
9411"Clones of the outer repository will not contain the contents of\n"
9412"the embedded repository and will not know how to obtain it.\n"
9413"If you meant to add a submodule, use:\n"
9414"\n"
9415"\tgit submodule add <url> %s\n"
9416"\n"
9417"If you added this path by mistake, you can remove it from the\n"
9418"index with:\n"
9419"\n"
9420"\tgit rm --cached %s\n"
9421"\n"
9422"See \"git help submodule\" for more information."
9423msgstr ""
ddc12c42
JX
9424"您在当前仓库中添加了另一个Git仓库。克隆外层的仓库将不包含嵌入仓库的\n"
9425"内容,并且不知道该如何获取它。如果您要添加一个子模组,使用:\n"
a4f16749
JX
9426"\n"
9427"\tgit submodule add <url> %s\n"
9428"\n"
9429"如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n"
9430"\n"
9431"\tgit rm --cached %s\n"
9432"\n"
9433"参见 \"git help submodule\" 获取更多信息。"
9434
2b472aae 9435#: builtin/add.c:391
a4f16749
JX
9436#, c-format
9437msgid "adding embedded git repository: %s"
9438msgstr "正在添加嵌入式 git 仓库:%s"
9439
2b472aae
JX
9440#: builtin/add.c:410
9441msgid ""
9442"Use -f if you really want to add them.\n"
9443"Turn this message off by running\n"
9444"\"git config advice.addIgnoredFile false\""
9445msgstr ""
440e7442 9446"如果您确实要添加它们,使用 -f 参数。\n"
2b472aae
JX
9447"运行下面的命令来关闭本消息\n"
9448"\"git config advice.addIgnoredFile false\""
8ada9598 9449
2b472aae 9450#: builtin/add.c:419
a0b6b246
JX
9451msgid "adding files failed"
9452msgstr "添加文件失败"
8ada9598 9453
2b472aae 9454#: builtin/add.c:447 builtin/commit.c:348
ddc12c42
JX
9455msgid "--pathspec-from-file is incompatible with --interactive/--patch"
9456msgstr "--pathspec-from-file 与 --interactive/--patch 不兼容"
9457
2b472aae 9458#: builtin/add.c:464
ddc12c42
JX
9459msgid "--pathspec-from-file is incompatible with --edit"
9460msgstr "--pathspec-from-file 与 --edit 不兼容"
9461
2b472aae 9462#: builtin/add.c:476
a0b6b246
JX
9463msgid "-A and -u are mutually incompatible"
9464msgstr "-A 和 -u 选项互斥"
8ada9598 9465
2b472aae 9466#: builtin/add.c:479
a0b6b246
JX
9467msgid "Option --ignore-missing can only be used together with --dry-run"
9468msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 9469
2b472aae 9470#: builtin/add.c:483
8ada9598 9471#, c-format
a0b6b246
JX
9472msgid "--chmod param '%s' must be either -x or +x"
9473msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
8ada9598 9474
2b472aae
JX
9475#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
9476#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
ddc12c42
JX
9477msgid "--pathspec-from-file is incompatible with pathspec arguments"
9478msgstr "--pathspec-from-file 与路径表达式参数不兼容"
9479
2b472aae
JX
9480#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
9481#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
ddc12c42
JX
9482msgid "--pathspec-file-nul requires --pathspec-from-file"
9483msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
9484
2b472aae 9485#: builtin/add.c:512
8ada9598 9486#, c-format
a0b6b246
JX
9487msgid "Nothing specified, nothing added.\n"
9488msgstr "没有指定文件,也没有文件被添加。\n"
8ada9598 9489
2b472aae
JX
9490#: builtin/add.c:514
9491msgid ""
9492"Maybe you wanted to say 'git add .'?\n"
9493"Turn this message off by running\n"
9494"\"git config advice.addEmptyPathspec false\""
9495msgstr ""
9496"也许您想要执行 'git add .'?\n"
9497"运行下面的命令来关闭本消息\n"
9498"\"git config advice.addEmptyPathspec false\""
8ada9598 9499
2b472aae 9500#: builtin/am.c:352
a0b6b246
JX
9501msgid "could not parse author script"
9502msgstr "不能解析作者脚本"
8ada9598 9503
2b472aae 9504#: builtin/am.c:436
81809b99 9505#, c-format
a0b6b246
JX
9506msgid "'%s' was deleted by the applypatch-msg hook"
9507msgstr "'%s' 被 applypatch-msg 钩子删除"
8ada9598 9508
2b472aae 9509#: builtin/am.c:478
8ada9598 9510#, c-format
a0b6b246
JX
9511msgid "Malformed input line: '%s'."
9512msgstr "非法的输入行:'%s'。"
8ada9598 9513
2b472aae 9514#: builtin/am.c:516
8ada9598 9515#, c-format
a0b6b246
JX
9516msgid "Failed to copy notes from '%s' to '%s'"
9517msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
8ada9598 9518
2b472aae 9519#: builtin/am.c:542
a0b6b246
JX
9520msgid "fseek failed"
9521msgstr "fseek 失败"
8ada9598 9522
2b472aae 9523#: builtin/am.c:730
8ada9598 9524#, c-format
a0b6b246
JX
9525msgid "could not parse patch '%s'"
9526msgstr "无法解析补丁 '%s'"
8ada9598 9527
2b472aae 9528#: builtin/am.c:795
a0b6b246
JX
9529msgid "Only one StGIT patch series can be applied at once"
9530msgstr "一次只能有一个 StGIT 补丁队列被应用"
9531
2b472aae 9532#: builtin/am.c:843
a0b6b246
JX
9533msgid "invalid timestamp"
9534msgstr "无效的时间戳"
9535
2b472aae 9536#: builtin/am.c:848 builtin/am.c:860
a0b6b246
JX
9537msgid "invalid Date line"
9538msgstr "无效的日期行"
8ada9598 9539
2b472aae 9540#: builtin/am.c:855
a0b6b246
JX
9541msgid "invalid timezone offset"
9542msgstr "无效的时区偏移值"
8ada9598 9543
2b472aae 9544#: builtin/am.c:948
a0b6b246 9545msgid "Patch format detection failed."
87cb7997 9546msgstr "补丁格式探测失败。"
8ada9598 9547
2b472aae 9548#: builtin/am.c:953 builtin/clone.c:409
8ada9598 9549#, c-format
a0b6b246 9550msgid "failed to create directory '%s'"
c1ac5258 9551msgstr "创建目录 '%s' 失败"
8ada9598 9552
2b472aae 9553#: builtin/am.c:958
a0b6b246 9554msgid "Failed to split patches."
c1ac5258 9555msgstr "拆分补丁失败。"
814ff314 9556
2b472aae 9557#: builtin/am.c:1089
8ada9598 9558#, c-format
a0b6b246
JX
9559msgid "When you have resolved this problem, run \"%s --continue\"."
9560msgstr "当您解决这一问题,执行 \"%s --continue\"。"
8ada9598 9561
2b472aae 9562#: builtin/am.c:1090
81809b99 9563#, c-format
a0b6b246
JX
9564msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
9565msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
8ada9598 9566
2b472aae 9567#: builtin/am.c:1091
81809b99 9568#, c-format
a0b6b246
JX
9569msgid "To restore the original branch and stop patching, run \"%s --abort\"."
9570msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
8ada9598 9571
2b472aae 9572#: builtin/am.c:1174
4c27fcb5
JX
9573msgid "Patch sent with format=flowed; space at the end of lines might be lost."
9574msgstr "补丁使用 format=flowed 格式发送,行尾的空格可能会丢失。"
9575
2b472aae 9576#: builtin/am.c:1202
a4f16749
JX
9577msgid "Patch is empty."
9578msgstr "补丁为空。"
23ff3338 9579
2b472aae 9580#: builtin/am.c:1267
a5cd71ca
JX
9581#, c-format
9582msgid "missing author line in commit %s"
9583msgstr "在提交 %s 中缺失作者行"
9584
2b472aae 9585#: builtin/am.c:1270
8ada9598 9586#, c-format
a4f16749
JX
9587msgid "invalid ident line: %.*s"
9588msgstr "无效的身份标识:%.*s"
8ada9598 9589
2b472aae 9590#: builtin/am.c:1489
a0b6b246
JX
9591msgid "Repository lacks necessary blobs to fall back on 3-way merge."
9592msgstr "仓库缺乏必要的数据对象以进行三方合并。"
814ff314 9593
2b472aae 9594#: builtin/am.c:1491
a0b6b246
JX
9595msgid "Using index info to reconstruct a base tree..."
9596msgstr "使用索引来重建一个(三方合并的)基础目录树..."
8ada9598 9597
2b472aae 9598#: builtin/am.c:1510
a0b6b246
JX
9599msgid ""
9600"Did you hand edit your patch?\n"
9601"It does not apply to blobs recorded in its index."
9602msgstr ""
9603"您是否曾手动编辑过您的补丁?\n"
9604"无法应用补丁到索引中的数据对象上。"
23ff3338 9605
2b472aae 9606#: builtin/am.c:1516
a0b6b246
JX
9607msgid "Falling back to patching base and 3-way merge..."
9608msgstr "回落到基础版本上打补丁及进行三方合并..."
8ada9598 9609
2b472aae 9610#: builtin/am.c:1542
a0b6b246
JX
9611msgid "Failed to merge in the changes."
9612msgstr "无法合并变更。"
d691f479 9613
2b472aae 9614#: builtin/am.c:1574
a0b6b246
JX
9615msgid "applying to an empty history"
9616msgstr "正应用到一个空历史上"
8ada9598 9617
2b472aae 9618#: builtin/am.c:1621 builtin/am.c:1625
8ada9598 9619#, c-format
a0b6b246
JX
9620msgid "cannot resume: %s does not exist."
9621msgstr "无法继续:%s 不存在。"
8ada9598 9622
2b472aae 9623#: builtin/am.c:1643
a0b6b246
JX
9624msgid "Commit Body is:"
9625msgstr "提交内容为:"
8ada9598 9626
a0b6b246
JX
9627# 译者:注意保持句尾空格
9628#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9629#. in your translation. The program will only accept English
9630#. input at this point.
9631#.
2b472aae 9632#: builtin/am.c:1653
a6cd2cc4 9633#, c-format
a0b6b246
JX
9634msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
9635msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
8ada9598 9636
2b472aae 9637#: builtin/am.c:1700 builtin/commit.c:398
a5cd71ca
JX
9638msgid "unable to write index file"
9639msgstr "无法写入索引文件"
9640
2b472aae 9641#: builtin/am.c:1704
8ada9598 9642#, c-format
a0b6b246
JX
9643msgid "Dirty index: cannot apply patches (dirty: %s)"
9644msgstr "脏索引:不能应用补丁(脏文件:%s)"
8ada9598 9645
2b472aae 9646#: builtin/am.c:1744 builtin/am.c:1812
81809b99 9647#, c-format
a0b6b246
JX
9648msgid "Applying: %.*s"
9649msgstr "应用:%.*s"
8ada9598 9650
2b472aae 9651#: builtin/am.c:1761
a0b6b246
JX
9652msgid "No changes -- Patch already applied."
9653msgstr "没有变更 —— 补丁已经应用过。"
8ada9598 9654
2b472aae 9655#: builtin/am.c:1767
81809b99 9656#, c-format
a0b6b246
JX
9657msgid "Patch failed at %s %.*s"
9658msgstr "打补丁失败于 %s %.*s"
8ada9598 9659
2b472aae
JX
9660#: builtin/am.c:1771
9661msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
9662msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁"
8ada9598 9663
2b472aae 9664#: builtin/am.c:1815
a0b6b246
JX
9665msgid ""
9666"No changes - did you forget to use 'git add'?\n"
9667"If there is nothing left to stage, chances are that something else\n"
9668"already introduced the same changes; you might want to skip this patch."
9669msgstr ""
9670"没有变更 —— 您是不是忘了执行 'git add'?\n"
9671"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
9672"您也许想要跳过这个补丁。"
8ada9598 9673
2b472aae 9674#: builtin/am.c:1822
a0b6b246
JX
9675msgid ""
9676"You still have unmerged paths in your index.\n"
a4f16749
JX
9677"You should 'git add' each file with resolved conflicts to mark them as "
9678"such.\n"
9679"You might run `git rm` on a file to accept \"deleted by them\" for it."
a0b6b246 9680msgstr ""
a4f16749
JX
9681"在您的索引中仍存在未合并的路径。\n"
9682"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
9683"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
8ada9598 9684
2b472aae 9685#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
ddc12c42 9686#: builtin/reset.c:354
8ada9598 9687#, c-format
a0b6b246
JX
9688msgid "Could not parse object '%s'."
9689msgstr "不能解析对象 '%s'。"
8ada9598 9690
2b472aae 9691#: builtin/am.c:1981
a0b6b246 9692msgid "failed to clean index"
c1ac5258 9693msgstr "清空索引失败"
5b04ee3b 9694
2b472aae 9695#: builtin/am.c:2025
a0b6b246
JX
9696msgid ""
9697"You seem to have moved HEAD since the last 'am' failure.\n"
9698"Not rewinding to ORIG_HEAD"
9699msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
8ada9598 9700
2b472aae 9701#: builtin/am.c:2132
8ada9598 9702#, c-format
a0b6b246
JX
9703msgid "Invalid value for --patch-format: %s"
9704msgstr "无效的 --patch-format 值:%s"
8ada9598 9705
2b472aae
JX
9706#: builtin/am.c:2172
9707#, c-format
9708msgid "Invalid value for --show-current-patch: %s"
9709msgstr "无效的 --show-current-patch 值:%s"
9710
9711#: builtin/am.c:2176
9712#, c-format
9713msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
9714msgstr "--show-current-patch=%s 和 --show-current-patch=%s 不兼容"
9715
9716#: builtin/am.c:2207
a0b6b246
JX
9717msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
9718msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
5b04ee3b 9719
2b472aae 9720#: builtin/am.c:2208
a0b6b246
JX
9721msgid "git am [<options>] (--continue | --skip | --abort)"
9722msgstr "git am [<选项>] (--continue | --skip | --abort)"
8ada9598 9723
2b472aae 9724#: builtin/am.c:2214
a0b6b246
JX
9725msgid "run interactively"
9726msgstr "以交互式方式运行"
8ada9598 9727
2b472aae 9728#: builtin/am.c:2216
a0b6b246
JX
9729msgid "historical option -- no-op"
9730msgstr "老的参数 —— 无作用"
8ada9598 9731
2b472aae 9732#: builtin/am.c:2218
a0b6b246
JX
9733msgid "allow fall back on 3way merging if needed"
9734msgstr "如果必要,允许使用三方合并。"
8ada9598 9735
2b472aae
JX
9736#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
9737#: builtin/repack.c:304 builtin/stash.c:812
a0b6b246
JX
9738msgid "be quiet"
9739msgstr "静默模式"
8ada9598 9740
2b472aae 9741#: builtin/am.c:2221
a0b6b246
JX
9742msgid "add a Signed-off-by line to the commit message"
9743msgstr "在提交说明中添加一个 Signed-off-by 签名"
5c57d762 9744
2b472aae 9745#: builtin/am.c:2224
a0b6b246
JX
9746msgid "recode into utf8 (default)"
9747msgstr "使用 utf8 字符集(默认)"
5c57d762 9748
2b472aae 9749#: builtin/am.c:2226
a0b6b246
JX
9750msgid "pass -k flag to git-mailinfo"
9751msgstr "向 git-mailinfo 传递 -k 参数"
5c57d762 9752
2b472aae 9753#: builtin/am.c:2228
a0b6b246
JX
9754msgid "pass -b flag to git-mailinfo"
9755msgstr "向 git-mailinfo 传递 -b 参数"
5c57d762 9756
2b472aae 9757#: builtin/am.c:2230
a0b6b246
JX
9758msgid "pass -m flag to git-mailinfo"
9759msgstr "向 git-mailinfo 传递 -m 参数"
5c57d762 9760
2b472aae 9761#: builtin/am.c:2232
a0b6b246
JX
9762msgid "pass --keep-cr flag to git-mailsplit for mbox format"
9763msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
5c57d762 9764
2b472aae 9765#: builtin/am.c:2235
a0b6b246
JX
9766msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
9767msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
8ada9598 9768
2b472aae 9769#: builtin/am.c:2238
a0b6b246
JX
9770msgid "strip everything before a scissors line"
9771msgstr "丢弃裁切线前的所有内容"
8ada9598 9772
2b472aae
JX
9773#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
9774#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
9775#: builtin/am.c:2267
a0b6b246
JX
9776msgid "pass it through git-apply"
9777msgstr "传递给 git-apply"
8ada9598 9778
2b472aae
JX
9779#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
9780#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
9781#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
ddc12c42 9782#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
a6cd2cc4 9783#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
ddc12c42 9784#: parse-options.h:154 parse-options.h:175 parse-options.h:316
a0b6b246
JX
9785msgid "n"
9786msgstr "n"
8ada9598 9787
2b472aae
JX
9788#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
9789#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
a0b6b246
JX
9790msgid "format"
9791msgstr "格式"
8ada9598 9792
2b472aae 9793#: builtin/am.c:2264
a0b6b246
JX
9794msgid "format the patch(es) are in"
9795msgstr "补丁的格式"
8ada9598 9796
2b472aae 9797#: builtin/am.c:2270
a0b6b246
JX
9798msgid "override error message when patch failure occurs"
9799msgstr "打补丁失败时显示的错误信息"
8ada9598 9800
2b472aae 9801#: builtin/am.c:2272
a0b6b246
JX
9802msgid "continue applying patches after resolving a conflict"
9803msgstr "冲突解决后继续应用补丁"
814ff314 9804
2b472aae 9805#: builtin/am.c:2275
a0b6b246
JX
9806msgid "synonyms for --continue"
9807msgstr "和 --continue 同义"
8ada9598 9808
2b472aae 9809#: builtin/am.c:2278
a0b6b246
JX
9810msgid "skip the current patch"
9811msgstr "跳过当前补丁"
23ff3338 9812
2b472aae 9813#: builtin/am.c:2281
a0b6b246
JX
9814msgid "restore the original branch and abort the patching operation."
9815msgstr "恢复原始分支并终止打补丁操作。"
8ada9598 9816
2b472aae 9817#: builtin/am.c:2284
31e5e17b
JX
9818msgid "abort the patching operation but keep HEAD where it is."
9819msgstr "终止补丁操作但保持 HEAD 不变。"
9820
2b472aae
JX
9821#: builtin/am.c:2288
9822msgid "show the patch being applied"
9823msgstr "显示正在应用的补丁"
31e5e17b 9824
2b472aae 9825#: builtin/am.c:2293
a0b6b246
JX
9826msgid "lie about committer date"
9827msgstr "将作者日期作为提交日期"
8ada9598 9828
2b472aae 9829#: builtin/am.c:2295
a0b6b246
JX
9830msgid "use current timestamp for author date"
9831msgstr "用当前时间作为作者日期"
8ada9598 9832
2b472aae
JX
9833#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
9834#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
9835#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
a0b6b246
JX
9836msgid "key-id"
9837msgstr "key-id"
8ada9598 9838
2b472aae 9839#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
a0b6b246
JX
9840msgid "GPG-sign commits"
9841msgstr "使用 GPG 签名提交"
8ada9598 9842
2b472aae 9843#: builtin/am.c:2301
a0b6b246
JX
9844msgid "(internal use for git-rebase)"
9845msgstr "(内部使用,用于 git-rebase)"
8ada9598 9846
2b472aae 9847#: builtin/am.c:2319
a0b6b246
JX
9848msgid ""
9849"The -b/--binary option has been a no-op for long time, and\n"
9850"it will be removed. Please do not use it anymore."
9851msgstr ""
9852"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
9853"请不要再使用它了。"
8ada9598 9854
2b472aae 9855#: builtin/am.c:2326
a0b6b246 9856msgid "failed to read the index"
c1ac5258 9857msgstr "读取索引失败"
8ada9598 9858
2b472aae 9859#: builtin/am.c:2341
a0b6b246
JX
9860#, c-format
9861msgid "previous rebase directory %s still exists but mbox given."
9862msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
8ada9598 9863
2b472aae 9864#: builtin/am.c:2365
a0b6b246
JX
9865#, c-format
9866msgid ""
9867"Stray %s directory found.\n"
9868"Use \"git am --abort\" to remove it."
9869msgstr ""
9870"发现了错误的 %s 目录。\n"
9871"使用 \"git am --abort\" 删除它。"
c04f5ac3 9872
2b472aae 9873#: builtin/am.c:2371
a0b6b246
JX
9874msgid "Resolve operation not in progress, we are not resuming."
9875msgstr "解决操作未进行,我们不会继续。"
c04f5ac3 9876
2b472aae 9877#: builtin/am.c:2381
a6cd2cc4
JX
9878msgid "interactive mode requires patches on the command line"
9879msgstr "交互式模式需要命令行上提供补丁"
9880
a0b6b246
JX
9881#: builtin/apply.c:8
9882msgid "git apply [<options>] [<patch>...]"
9883msgstr "git apply [<选项>] [<补丁>...]"
c04f5ac3 9884
c04f5ac3
JX
9885#: builtin/archive.c:17
9886#, c-format
9887msgid "could not create archive file '%s'"
90e6ef53 9888msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
9889
9890#: builtin/archive.c:20
9891msgid "could not redirect output"
195febda 9892msgstr "不能重定向输出"
c04f5ac3
JX
9893
9894#: builtin/archive.c:37
9895msgid "git archive: Remote with no URL"
4375c10e 9896msgstr "git archive:未提供远程 URL"
c04f5ac3 9897
06991777 9898#: builtin/archive.c:61
31e5e17b
JX
9899msgid "git archive: expected ACK/NAK, got a flush packet"
9900msgstr "git archive:期望是 ACK/NAK,却得到 flush 包"
c04f5ac3 9901
06991777 9902#: builtin/archive.c:64
c04f5ac3
JX
9903#, c-format
9904msgid "git archive: NACK %s"
90e6ef53 9905msgstr "git archive:NACK %s"
c04f5ac3 9906
06991777 9907#: builtin/archive.c:65
c04f5ac3 9908msgid "git archive: protocol error"
90e6ef53 9909msgstr "git archive:协议错误"
c04f5ac3 9910
06991777 9911#: builtin/archive.c:69
c04f5ac3 9912msgid "git archive: expected a flush"
31e5e17b 9913msgstr "git archive:应有一个 flush 包"
c04f5ac3 9914
06991777 9915#: builtin/bisect--helper.c:22
ef317cd5 9916msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 9917msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5 9918
06991777 9919#: builtin/bisect--helper.c:23
5809aa05
JX
9920msgid "git bisect--helper --write-terms <bad_term> <good_term>"
9921msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>"
9922
06991777 9923#: builtin/bisect--helper.c:24
5809aa05
JX
9924msgid "git bisect--helper --bisect-clean-state"
9925msgstr "git bisect--helper --bisect-clean-state"
9926
06991777
JX
9927#: builtin/bisect--helper.c:25
9928msgid "git bisect--helper --bisect-reset [<commit>]"
9929msgstr "git bisect--helper --bisect-reset [<提交>]"
9930
9931#: builtin/bisect--helper.c:26
9932msgid ""
9933"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
9934"<bad_term>"
9935msgstr ""
9936"git bisect--helper --bisect-write [--no-log] <状态> <版本> <好-术语> <坏-术语"
9937">"
9938
9939#: builtin/bisect--helper.c:27
9940msgid ""
9941"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
9942"<bad_term>"
9943msgstr ""
9944"git bisect--helper --bisect-check-and-set-terms <命令> <好-术语> <坏-术语>"
9945
9946#: builtin/bisect--helper.c:28
9947msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
9948msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]"
9949
9950#: builtin/bisect--helper.c:29
9951msgid ""
9952"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
9953"term-new]"
9954msgstr ""
9955"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
9956"term-new]"
9957
9958#: builtin/bisect--helper.c:30
9959msgid ""
9960"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
9961"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
9962msgstr ""
9963"git bisect--helper --bisect-start [--term-{old,good}=<术语> --term-{new,bad}"
9964"=<术语>][--no-checkout] [<坏> [<好>...]] [--] [<路径>...]"
9965
9966#: builtin/bisect--helper.c:86
5809aa05
JX
9967#, c-format
9968msgid "'%s' is not a valid term"
9969msgstr "'%s' 不是一个有效的术语"
9970
06991777 9971#: builtin/bisect--helper.c:90
5809aa05
JX
9972#, c-format
9973msgid "can't use the builtin command '%s' as a term"
9974msgstr "不能使用内置命令 '%s' 作为术语"
9975
06991777 9976#: builtin/bisect--helper.c:100
5809aa05
JX
9977#, c-format
9978msgid "can't change the meaning of the term '%s'"
9979msgstr "不能修改术语 '%s' 的含义"
9980
06991777 9981#: builtin/bisect--helper.c:111
5809aa05
JX
9982msgid "please use two different terms"
9983msgstr "请使用两个不同的术语"
9984
06991777 9985#: builtin/bisect--helper.c:118
5809aa05
JX
9986msgid "could not open the file BISECT_TERMS"
9987msgstr "不能打开文件 BISECT_TERMS"
9988
06991777
JX
9989#: builtin/bisect--helper.c:155
9990#, c-format
9991msgid "We are not bisecting.\n"
9992msgstr "我们没有在二分查找。\n"
9993
9994#: builtin/bisect--helper.c:163
9995#, c-format
9996msgid "'%s' is not a valid commit"
9997msgstr "'%s' 不是一个有效的提交"
9998
ddc12c42 9999#: builtin/bisect--helper.c:172
06991777
JX
10000#, c-format
10001msgid ""
10002"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
10003msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
10004
ddc12c42 10005#: builtin/bisect--helper.c:216
06991777
JX
10006#, c-format
10007msgid "Bad bisect_write argument: %s"
10008msgstr "坏的 bisect_write 参数:%s"
10009
ddc12c42 10010#: builtin/bisect--helper.c:221
06991777
JX
10011#, c-format
10012msgid "couldn't get the oid of the rev '%s'"
5b533632 10013msgstr "无法获取版本 '%s' 的对象 ID"
06991777 10014
ddc12c42 10015#: builtin/bisect--helper.c:233
06991777
JX
10016#, c-format
10017msgid "couldn't open the file '%s'"
10018msgstr "无法打开文件 '%s'"
10019
ddc12c42 10020#: builtin/bisect--helper.c:259
06991777
JX
10021#, c-format
10022msgid "Invalid command: you're currently in a %s/%s bisect"
10023msgstr "无效的命令:您当前正处于一个 %s/%s 二分查找中"
10024
ddc12c42 10025#: builtin/bisect--helper.c:286
06991777
JX
10026#, c-format
10027msgid ""
10028"You need to give me at least one %s and %s revision.\n"
10029"You can use \"git bisect %s\" and \"git bisect %s\" for that."
10030msgstr ""
10031"您需要给我至少一个 %s 和一个 %s 版本。\n"
10032"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
10033
ddc12c42 10034#: builtin/bisect--helper.c:290
06991777
JX
10035#, c-format
10036msgid ""
10037"You need to start by \"git bisect start\".\n"
10038"You then need to give me at least one %s and %s revision.\n"
10039"You can use \"git bisect %s\" and \"git bisect %s\" for that."
10040msgstr ""
10041"您需要执行 \"git bisect start\" 来开始。\n"
10042"然后需要提供我至少一个 %s 和一个 %s 版本。\n"
10043"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
10044
2b472aae 10045#: builtin/bisect--helper.c:310
06991777
JX
10046#, c-format
10047msgid "bisecting only with a %s commit"
5b533632 10048msgstr "在只有一个 %s 提交的情况下二分查找"
06991777
JX
10049
10050# 译者:注意保持句尾空格
10051#. TRANSLATORS: Make sure to include [Y] and [n] in your
10052#. translation. The program will only accept English input
10053#. at this point.
10054#.
2b472aae 10055#: builtin/bisect--helper.c:318
06991777
JX
10056msgid "Are you sure [Y/n]? "
10057msgstr "您确认么[Y/n]? "
10058
2b472aae 10059#: builtin/bisect--helper.c:379
06991777
JX
10060msgid "no terms defined"
10061msgstr "未定义术语"
10062
2b472aae 10063#: builtin/bisect--helper.c:382
06991777
JX
10064#, c-format
10065msgid ""
10066"Your current terms are %s for the old state\n"
10067"and %s for the new state.\n"
10068msgstr "您当前针对旧状态的术语是 %s,对新状态的术语是 %s。\n"
10069
2b472aae 10070#: builtin/bisect--helper.c:392
06991777
JX
10071#, c-format
10072msgid ""
10073"invalid argument %s for 'git bisect terms'.\n"
10074"Supported options are: --term-good|--term-old and --term-bad|--term-new."
10075msgstr ""
10076"命令 'git bisect terms' 的参数 %s 无效。\n"
10077"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
10078
2b472aae 10079#: builtin/bisect--helper.c:478
06991777
JX
10080#, c-format
10081msgid "unrecognized option: '%s'"
10082msgstr "未识别的选项:'%s'"
10083
2b472aae 10084#: builtin/bisect--helper.c:482
06991777
JX
10085#, c-format
10086msgid "'%s' does not appear to be a valid revision"
8e4e0555 10087msgstr "'%s' 看起来不是一个有效的版本"
06991777 10088
2b472aae 10089#: builtin/bisect--helper.c:514
06991777
JX
10090msgid "bad HEAD - I need a HEAD"
10091msgstr "坏的 HEAD - 我需要一个 HEAD"
10092
2b472aae 10093#: builtin/bisect--helper.c:529
06991777
JX
10094#, c-format
10095msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
10096msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
10097
2b472aae 10098#: builtin/bisect--helper.c:550
06991777
JX
10099msgid "won't bisect on cg-seek'ed tree"
10100msgstr "不会在做了 cg-seek 的树上做二分查找"
10101
2b472aae 10102#: builtin/bisect--helper.c:553
06991777
JX
10103msgid "bad HEAD - strange symbolic ref"
10104msgstr "坏的 HEAD - 奇怪的符号引用"
10105
2b472aae 10106#: builtin/bisect--helper.c:577
a6cd2cc4
JX
10107#, c-format
10108msgid "invalid ref: '%s'"
10109msgstr "无效的引用:'%s'"
10110
2b472aae 10111#: builtin/bisect--helper.c:633
ef317cd5 10112msgid "perform 'git bisect next'"
07432cef 10113msgstr "执行 'git bisect next'"
ef317cd5 10114
2b472aae 10115#: builtin/bisect--helper.c:635
5809aa05
JX
10116msgid "write the terms to .git/BISECT_TERMS"
10117msgstr "将术语写入 .git/BISECT_TERMS"
10118
2b472aae 10119#: builtin/bisect--helper.c:637
5809aa05
JX
10120msgid "cleanup the bisection state"
10121msgstr "清除二分查找状态"
10122
2b472aae 10123#: builtin/bisect--helper.c:639
5809aa05
JX
10124msgid "check for expected revs"
10125msgstr "检查预期的版本"
10126
2b472aae 10127#: builtin/bisect--helper.c:641
06991777
JX
10128msgid "reset the bisection state"
10129msgstr "清除二分查找状态"
10130
2b472aae 10131#: builtin/bisect--helper.c:643
06991777
JX
10132msgid "write out the bisection state in BISECT_LOG"
10133msgstr "将二分查找的状态写入 BISECT_LOG"
10134
2b472aae 10135#: builtin/bisect--helper.c:645
06991777
JX
10136msgid "check and set terms in a bisection state"
10137msgstr "在一个二分查找状态中检查和设置术语"
10138
2b472aae 10139#: builtin/bisect--helper.c:647
06991777
JX
10140msgid "check whether bad or good terms exist"
10141msgstr "检查坏的或好的术语是否存在"
10142
2b472aae 10143#: builtin/bisect--helper.c:649
06991777
JX
10144msgid "print out the bisect terms"
10145msgstr "打印二分查找术语"
10146
2b472aae 10147#: builtin/bisect--helper.c:651
06991777 10148msgid "start the bisect session"
5b533632 10149msgstr "启动二分查找过程"
06991777 10150
2b472aae 10151#: builtin/bisect--helper.c:653
ef317cd5 10152msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 10153msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5 10154
2b472aae 10155#: builtin/bisect--helper.c:655
06991777
JX
10156msgid "no log for BISECT_WRITE"
10157msgstr "BISECT_WRITE 无日志"
10158
2b472aae 10159#: builtin/bisect--helper.c:673
5809aa05
JX
10160msgid "--write-terms requires two arguments"
10161msgstr "--write-terms 需要两个参数"
10162
2b472aae 10163#: builtin/bisect--helper.c:677
5809aa05 10164msgid "--bisect-clean-state requires no arguments"
8e4e0555 10165msgstr "--bisect-clean-state 不带参数"
5809aa05 10166
2b472aae 10167#: builtin/bisect--helper.c:684
06991777
JX
10168msgid "--bisect-reset requires either no argument or a commit"
10169msgstr "--bisect-reset 无需参数或者需要一个提交"
10170
2b472aae 10171#: builtin/bisect--helper.c:688
06991777
JX
10172msgid "--bisect-write requires either 4 or 5 arguments"
10173msgstr "--bisect-write 需要 4 或 5 个参数"
10174
2b472aae 10175#: builtin/bisect--helper.c:694
06991777
JX
10176msgid "--check-and-set-terms requires 3 arguments"
10177msgstr "--check-and-set-terms 需要 3 个参数"
10178
2b472aae 10179#: builtin/bisect--helper.c:700
06991777
JX
10180msgid "--bisect-next-check requires 2 or 3 arguments"
10181msgstr "--bisect-next-check 需要 2 或 3 个参数"
10182
2b472aae 10183#: builtin/bisect--helper.c:706
06991777
JX
10184msgid "--bisect-terms requires 0 or 1 argument"
10185msgstr "--bisect-terms 需要 0 或 1 个参数"
10186
a5cd71ca 10187#: builtin/blame.c:31
7aea43ff
JX
10188msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
10189msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
ef317cd5 10190
a5cd71ca 10191#: builtin/blame.c:36
814ff314
JX
10192msgid "<rev-opts> are documented in git-rev-list(1)"
10193msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
ef317cd5 10194
a5cd71ca 10195#: builtin/blame.c:409
fd8cb379
JX
10196#, c-format
10197msgid "expecting a color: %s"
10198msgstr "期望一个颜色:%s"
10199
a5cd71ca 10200#: builtin/blame.c:416
fd8cb379
JX
10201msgid "must end with a color"
10202msgstr "必须以一个颜色结尾"
10203
a5cd71ca 10204#: builtin/blame.c:729
fd8cb379
JX
10205#, c-format
10206msgid "invalid color '%s' in color.blame.repeatedLines"
10207msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
10208
a5cd71ca 10209#: builtin/blame.c:747
fd8cb379
JX
10210msgid "invalid value for blame.coloring"
10211msgstr "设置 blame.coloring 中的无效取值"
10212
a5cd71ca 10213#: builtin/blame.c:822
a6cd2cc4
JX
10214#, c-format
10215msgid "cannot find revision %s to ignore"
10216msgstr "不能找到要忽略的版本 %s"
10217
a5cd71ca 10218#: builtin/blame.c:844
ef317cd5 10219msgid "Show blame entries as we find them, incrementally"
07432cef 10220msgstr "增量式地显示发现的 blame 条目"
ef317cd5 10221
a5cd71ca 10222#: builtin/blame.c:845
ef317cd5 10223msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 10224msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 10225
a5cd71ca 10226#: builtin/blame.c:846
ef317cd5 10227msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 10228msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 10229
a5cd71ca 10230#: builtin/blame.c:847
ef317cd5 10231msgid "Show work cost statistics"
07432cef 10232msgstr "显示命令消耗统计"
ef317cd5 10233
a5cd71ca 10234#: builtin/blame.c:848
276ceeaa
JX
10235msgid "Force progress reporting"
10236msgstr "强制进度显示"
10237
a5cd71ca 10238#: builtin/blame.c:849
ef317cd5 10239msgid "Show output score for blame entries"
07432cef 10240msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 10241
a5cd71ca 10242#: builtin/blame.c:850
ef317cd5 10243msgid "Show original filename (Default: auto)"
07432cef 10244msgstr "显示原始文件名(默认:自动)"
ef317cd5 10245
a5cd71ca 10246#: builtin/blame.c:851
ef317cd5 10247msgid "Show original linenumber (Default: off)"
07432cef 10248msgstr "显示原始的行号(默认:关闭)"
ef317cd5 10249
a5cd71ca 10250#: builtin/blame.c:852
ef317cd5 10251msgid "Show in a format designed for machine consumption"
07432cef 10252msgstr "显示为一个适合机器读取的格式"
ef317cd5 10253
a5cd71ca 10254#: builtin/blame.c:853
ef317cd5 10255msgid "Show porcelain format with per-line commit information"
07432cef 10256msgstr "为每一行显示机器适用的提交信息"
ef317cd5 10257
a5cd71ca 10258#: builtin/blame.c:854
ef317cd5 10259msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 10260msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 10261
a5cd71ca 10262#: builtin/blame.c:855
ef317cd5 10263msgid "Show raw timestamp (Default: off)"
07432cef 10264msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 10265
a5cd71ca 10266#: builtin/blame.c:856
ef317cd5 10267msgid "Show long commit SHA1 (Default: off)"
4375c10e 10268msgstr "显示长的 SHA1 提交号(默认:关闭)"
ef317cd5 10269
a5cd71ca 10270#: builtin/blame.c:857
ef317cd5 10271msgid "Suppress author name and timestamp (Default: off)"
07432cef 10272msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 10273
a5cd71ca 10274#: builtin/blame.c:858
ef317cd5 10275msgid "Show author email instead of name (Default: off)"
07432cef 10276msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 10277
a5cd71ca 10278#: builtin/blame.c:859
ef317cd5 10279msgid "Ignore whitespace differences"
07432cef 10280msgstr "忽略空白差异"
ef317cd5 10281
ddc12c42 10282#: builtin/blame.c:860 builtin/log.c:1702
a6cd2cc4
JX
10283msgid "rev"
10284msgstr "版本"
10285
a5cd71ca 10286#: builtin/blame.c:860
a6cd2cc4
JX
10287msgid "Ignore <rev> when blaming"
10288msgstr "在执行 blame 操作时忽略 <版本>"
10289
a5cd71ca 10290#: builtin/blame.c:861
a6cd2cc4
JX
10291msgid "Ignore revisions from <file>"
10292msgstr "忽略来自 <文件> 中的版本"
10293
a5cd71ca 10294#: builtin/blame.c:862
fd8cb379
JX
10295msgid "color redundant metadata from previous line differently"
10296msgstr "使用颜色间隔输出与前一行不同的重复元信息"
10297
a5cd71ca 10298#: builtin/blame.c:863
fd8cb379
JX
10299msgid "color lines by age"
10300msgstr "依据时间着色"
10301
ddc12c42 10302#: builtin/blame.c:864
ef317cd5 10303msgid "Spend extra cycles to find better match"
07432cef 10304msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 10305
ddc12c42 10306#: builtin/blame.c:865
ef317cd5 10307msgid "Use revisions from <file> instead of calling git-rev-list"
d9d56b23 10308msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
ef317cd5 10309
ddc12c42 10310#: builtin/blame.c:866
ef317cd5 10311msgid "Use <file>'s contents as the final image"
d9d56b23 10312msgstr "使用 <文件> 的内容作为最终的图片"
ef317cd5 10313
ddc12c42 10314#: builtin/blame.c:867 builtin/blame.c:868
ef317cd5 10315msgid "score"
07432cef 10316msgstr "得分"
ef317cd5 10317
ddc12c42 10318#: builtin/blame.c:867
ef317cd5 10319msgid "Find line copies within and across files"
07432cef 10320msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 10321
ddc12c42 10322#: builtin/blame.c:868
ef317cd5 10323msgid "Find line movements within and across files"
07432cef 10324msgstr "找到文件内及跨文件的行移动"
ef317cd5 10325
ddc12c42 10326#: builtin/blame.c:869
ef317cd5 10327msgid "n,m"
07432cef 10328msgstr "n,m"
ef317cd5 10329
ddc12c42 10330#: builtin/blame.c:869
ef317cd5 10331msgid "Process only line range n,m, counting from 1"
07432cef 10332msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 10333
ddc12c42 10334#: builtin/blame.c:921
a0b6b246
JX
10335msgid "--progress can't be used with --incremental or porcelain formats"
10336msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
10337
a4f16749
JX
10338#. TRANSLATORS: This string is used to tell us the
10339#. maximum display width for a relative timestamp in
10340#. "git blame" output. For C locale, "4 years, 11
10341#. months ago", which takes 22 places, is the longest
10342#. among various forms of relative timestamps, but
10343#. your language may need more or fewer display
10344#. columns.
10345#.
ddc12c42 10346#: builtin/blame.c:972
6c94aba5
JX
10347msgid "4 years, 11 months ago"
10348msgstr "4 年 11 个月前"
10349
ddc12c42 10350#: builtin/blame.c:1079
a0b6b246
JX
10351#, c-format
10352msgid "file %s has only %lu line"
10353msgid_plural "file %s has only %lu lines"
10354msgstr[0] "文件 %s 只有 %lu 行"
10355msgstr[1] "文件 %s 只有 %lu 行"
10356
ddc12c42 10357#: builtin/blame.c:1125
a4f16749
JX
10358msgid "Blaming lines"
10359msgstr "追踪代码行"
10360
4c27fcb5 10361#: builtin/branch.c:29
814ff314
JX
10362msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
10363msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
ef317cd5 10364
4c27fcb5 10365#: builtin/branch.c:30
814ff314
JX
10366msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
10367msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 10368
4c27fcb5 10369#: builtin/branch.c:31
814ff314
JX
10370msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
10371msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
ef317cd5 10372
4c27fcb5 10373#: builtin/branch.c:32
814ff314
JX
10374msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
10375msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 10376
4c27fcb5 10377#: builtin/branch.c:33
6937cb4e
JX
10378msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
10379msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
10380
4c27fcb5 10381#: builtin/branch.c:34
94550ed3
JX
10382msgid "git branch [<options>] [-r | -a] [--points-at]"
10383msgstr "git branch [<选项>] [-r | -a] [--points-at]"
10384
4c27fcb5 10385#: builtin/branch.c:35
87cb7997
JX
10386msgid "git branch [<options>] [-r | -a] [--format]"
10387msgstr "git branch [<选项>] [-r | -a] [--format]"
10388
90e6ef53 10389# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
a6cd2cc4 10390#: builtin/branch.c:154
c04f5ac3
JX
10391#, c-format
10392msgid ""
10393"deleting branch '%s' that has been merged to\n"
10394" '%s', but not yet merged to HEAD."
10395msgstr ""
70fc47bf 10396"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
10397" '%s',但未合并到 HEAD。"
10398
90e6ef53 10399# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
a6cd2cc4 10400#: builtin/branch.c:158
c04f5ac3
JX
10401#, c-format
10402msgid ""
10403"not deleting branch '%s' that is not yet merged to\n"
10404" '%s', even though it is merged to HEAD."
10405msgstr ""
70fc47bf
T
10406"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
10407" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 10408
a6cd2cc4 10409#: builtin/branch.c:172
07432cef
WS
10410#, c-format
10411msgid "Couldn't look up commit object for '%s'"
10412msgstr "无法查询 '%s' 指向的提交对象"
10413
a6cd2cc4 10414#: builtin/branch.c:176
07432cef
WS
10415#, c-format
10416msgid ""
10417"The branch '%s' is not fully merged.\n"
10418"If you are sure you want to delete it, run 'git branch -D %s'."
10419msgstr ""
10420"分支 '%s' 没有完全合并。\n"
10421"如果您确认要删除它,执行 'git branch -D %s'。"
10422
a6cd2cc4 10423#: builtin/branch.c:189
07432cef 10424msgid "Update of config-file failed"
6937cb4e 10425msgstr "更新配置文件失败"
07432cef 10426
a6cd2cc4 10427#: builtin/branch.c:220
c04f5ac3 10428msgid "cannot use -a with -d"
649900bc 10429msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 10430
a6cd2cc4 10431#: builtin/branch.c:226
c04f5ac3
JX
10432msgid "Couldn't look up commit object for HEAD"
10433msgstr "无法查询 HEAD 指向的提交对象"
10434
a6cd2cc4 10435#: builtin/branch.c:240
c04f5ac3 10436#, c-format
5b04ee3b
JX
10437msgid "Cannot delete branch '%s' checked out at '%s'"
10438msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
c04f5ac3 10439
a6cd2cc4 10440#: builtin/branch.c:255
5ae481e0 10441#, c-format
7aea43ff
JX
10442msgid "remote-tracking branch '%s' not found."
10443msgstr "未能找到远程跟踪分支 '%s'。"
c04f5ac3 10444
a6cd2cc4 10445#: builtin/branch.c:256
81809b99 10446#, c-format
8ada9598 10447msgid "branch '%s' not found."
81809b99 10448msgstr "分支 '%s' 未发现。"
8ada9598 10449
a6cd2cc4 10450#: builtin/branch.c:271
81809b99 10451#, c-format
7aea43ff
JX
10452msgid "Error deleting remote-tracking branch '%s'"
10453msgstr "无法删除远程跟踪分支 '%s'"
c04f5ac3 10454
a6cd2cc4 10455#: builtin/branch.c:272
81809b99 10456#, c-format
8ada9598 10457msgid "Error deleting branch '%s'"
7aea43ff 10458msgstr "无法删除分支 '%s'"
8ada9598 10459
a6cd2cc4 10460#: builtin/branch.c:279
81809b99 10461#, c-format
7aea43ff
JX
10462msgid "Deleted remote-tracking branch %s (was %s).\n"
10463msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
c04f5ac3 10464
a6cd2cc4 10465#: builtin/branch.c:280
81809b99 10466#, c-format
8ada9598 10467msgid "Deleted branch %s (was %s).\n"
81809b99 10468msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 10469
a6cd2cc4 10470#: builtin/branch.c:429 builtin/tag.c:61
6937cb4e
JX
10471msgid "unable to parse format string"
10472msgstr "不能解析格式化字符串"
10473
a6cd2cc4 10474#: builtin/branch.c:460
d46c5519
JX
10475msgid "could not resolve HEAD"
10476msgstr "不能解析 HEAD 提交"
10477
a6cd2cc4 10478#: builtin/branch.c:466
5b04ee3b 10479#, c-format
d46c5519
JX
10480msgid "HEAD (%s) points outside of refs/heads/"
10481msgstr "HEAD (%s) 指向 refs/heads/ 之外"
10482
a6cd2cc4 10483#: builtin/branch.c:481
d46c5519 10484#, c-format
5b04ee3b
JX
10485msgid "Branch %s is being rebased at %s"
10486msgstr "分支 %s 正被变基到 %s"
10487
a6cd2cc4 10488#: builtin/branch.c:485
5b04ee3b
JX
10489#, c-format
10490msgid "Branch %s is being bisected at %s"
10491msgstr "分支 %s 正被二分查找于 %s"
10492
a6cd2cc4 10493#: builtin/branch.c:502
6937cb4e
JX
10494msgid "cannot copy the current branch while not on any."
10495msgstr "无法拷贝当前分支因为不处于任何分支上。"
10496
a6cd2cc4 10497#: builtin/branch.c:504
c04f5ac3 10498msgid "cannot rename the current branch while not on any."
90e6ef53 10499msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 10500
a6cd2cc4 10501#: builtin/branch.c:515
c04f5ac3
JX
10502#, c-format
10503msgid "Invalid branch name: '%s'"
10504msgstr "无效的分支名:'%s'"
10505
a6cd2cc4 10506#: builtin/branch.c:542
c04f5ac3
JX
10507msgid "Branch rename failed"
10508msgstr "分支重命名失败"
10509
a6cd2cc4 10510#: builtin/branch.c:544
6937cb4e
JX
10511msgid "Branch copy failed"
10512msgstr "分支拷贝失败"
10513
a6cd2cc4 10514#: builtin/branch.c:548
6937cb4e 10515#, c-format
5809aa05
JX
10516msgid "Created a copy of a misnamed branch '%s'"
10517msgstr "已为错误命名的分支 '%s' 创建了一个副本"
6937cb4e 10518
a6cd2cc4 10519#: builtin/branch.c:551
c04f5ac3
JX
10520#, c-format
10521msgid "Renamed a misnamed branch '%s' away"
6937cb4e 10522msgstr "已将错误命名的分支 '%s' 重命名"
c04f5ac3 10523
a6cd2cc4 10524#: builtin/branch.c:557
c04f5ac3
JX
10525#, c-format
10526msgid "Branch renamed to %s, but HEAD is not updated!"
10527msgstr "分支重命名为 %s,但 HEAD 没有更新!"
10528
a6cd2cc4 10529#: builtin/branch.c:566
c04f5ac3 10530msgid "Branch is renamed, but update of config-file failed"
6937cb4e
JX
10531msgstr "分支被重命名,但更新配置文件失败"
10532
a6cd2cc4 10533#: builtin/branch.c:568
6937cb4e
JX
10534msgid "Branch is copied, but update of config-file failed"
10535msgstr "分支已拷贝,但更新配置文件失败"
c04f5ac3 10536
a6cd2cc4 10537#: builtin/branch.c:584
5c57d762
JX
10538#, c-format
10539msgid ""
10540"Please edit the description for the branch\n"
10541" %s\n"
10542"Lines starting with '%c' will be stripped.\n"
10543msgstr ""
10544"请编辑分支的描述\n"
10545" %s\n"
10546"以 '%c' 开头的行将被过滤。\n"
c04f5ac3 10547
a6cd2cc4 10548#: builtin/branch.c:618
ef317cd5 10549msgid "Generic options"
07432cef 10550msgstr "通用选项"
c04f5ac3 10551
a6cd2cc4 10552#: builtin/branch.c:620
ef317cd5 10553msgid "show hash and subject, give twice for upstream branch"
07432cef 10554msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 10555
a6cd2cc4 10556#: builtin/branch.c:621
ef317cd5 10557msgid "suppress informational messages"
07432cef 10558msgstr "不显示信息"
8ada9598 10559
a6cd2cc4 10560#: builtin/branch.c:622
ef317cd5 10561msgid "set up tracking mode (see git-pull(1))"
07432cef 10562msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 10563
a6cd2cc4 10564#: builtin/branch.c:624
6937cb4e
JX
10565msgid "do not use"
10566msgstr "不要使用"
c04f5ac3 10567
2b472aae 10568#: builtin/branch.c:626 builtin/rebase.c:513
5b04ee3b
JX
10569msgid "upstream"
10570msgstr "上游"
10571
a6cd2cc4 10572#: builtin/branch.c:626
5b04ee3b
JX
10573msgid "change the upstream info"
10574msgstr "改变上游信息"
10575
a6cd2cc4 10576#: builtin/branch.c:627
ddc12c42 10577msgid "unset the upstream info"
a0b6b246
JX
10578msgstr "取消上游信息的设置"
10579
a6cd2cc4 10580#: builtin/branch.c:628
ef317cd5 10581msgid "use colored output"
07432cef 10582msgstr "使用彩色输出"
c04f5ac3 10583
a6cd2cc4 10584#: builtin/branch.c:629
ef317cd5 10585msgid "act on remote-tracking branches"
07432cef 10586msgstr "作用于远程跟踪分支"
c04f5ac3 10587
a6cd2cc4 10588#: builtin/branch.c:631 builtin/branch.c:633
ef317cd5 10589msgid "print only branches that contain the commit"
07432cef 10590msgstr "只打印包含该提交的分支"
c04f5ac3 10591
a6cd2cc4 10592#: builtin/branch.c:632 builtin/branch.c:634
87cb7997
JX
10593msgid "print only branches that don't contain the commit"
10594msgstr "只打印不包含该提交的分支"
10595
a6cd2cc4 10596#: builtin/branch.c:637
ef317cd5 10597msgid "Specific git-branch actions:"
07432cef 10598msgstr "具体的 git-branch 动作:"
c04f5ac3 10599
a6cd2cc4 10600#: builtin/branch.c:638
ef317cd5 10601msgid "list both remote-tracking and local branches"
07432cef 10602msgstr "列出远程跟踪及本地分支"
c04f5ac3 10603
a6cd2cc4 10604#: builtin/branch.c:640
ef317cd5 10605msgid "delete fully merged branch"
07432cef 10606msgstr "删除完全合并的分支"
c04f5ac3 10607
a6cd2cc4 10608#: builtin/branch.c:641
ef317cd5 10609msgid "delete branch (even if not merged)"
07432cef 10610msgstr "删除分支(即使没有合并)"
c04f5ac3 10611
a6cd2cc4 10612#: builtin/branch.c:642
ef317cd5 10613msgid "move/rename a branch and its reflog"
07432cef 10614msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 10615
a6cd2cc4 10616#: builtin/branch.c:643
ef317cd5 10617msgid "move/rename a branch, even if target exists"
07432cef 10618msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 10619
a6cd2cc4 10620#: builtin/branch.c:644
6937cb4e
JX
10621msgid "copy a branch and its reflog"
10622msgstr "拷贝一个分支和它的引用日志"
10623
a6cd2cc4 10624#: builtin/branch.c:645
6937cb4e
JX
10625msgid "copy a branch, even if target exists"
10626msgstr "拷贝一个分支,即使目标已存在"
10627
a6cd2cc4 10628#: builtin/branch.c:646
ef317cd5 10629msgid "list branch names"
07432cef 10630msgstr "列出分支名"
c04f5ac3 10631
a6cd2cc4 10632#: builtin/branch.c:647
d46c5519
JX
10633msgid "show current branch name"
10634msgstr "显示当前分支名"
10635
a6cd2cc4 10636#: builtin/branch.c:648
ef317cd5 10637msgid "create the branch's reflog"
07432cef 10638msgstr "创建分支的引用日志"
ef317cd5 10639
a6cd2cc4 10640#: builtin/branch.c:650
ef317cd5 10641msgid "edit the description for the branch"
07432cef 10642msgstr "标记分支的描述"
ef317cd5 10643
a6cd2cc4 10644#: builtin/branch.c:651
04cb2f28
JX
10645msgid "force creation, move/rename, deletion"
10646msgstr "强制创建、移动/重命名、删除"
ef317cd5 10647
a6cd2cc4 10648#: builtin/branch.c:652
94550ed3
JX
10649msgid "print only branches that are merged"
10650msgstr "只打印已经合并的分支"
ef317cd5 10651
a6cd2cc4 10652#: builtin/branch.c:653
94550ed3
JX
10653msgid "print only branches that are not merged"
10654msgstr "只打印尚未合并的分支"
ef317cd5 10655
a6cd2cc4 10656#: builtin/branch.c:654
ef317cd5 10657msgid "list branches in columns"
07432cef 10658msgstr "以列的方式显示分支"
ef317cd5 10659
a6cd2cc4 10660#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
06991777 10661#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
a6cd2cc4 10662#: builtin/tag.c:433
94550ed3
JX
10663msgid "object"
10664msgstr "对象"
10665
a6cd2cc4 10666#: builtin/branch.c:658
94550ed3
JX
10667msgid "print only branches of the object"
10668msgstr "只打印指向该对象的分支"
10669
a6cd2cc4 10670#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
1a79b2f1
JX
10671msgid "sorting and filtering are case insensitive"
10672msgstr "排序和过滤属于大小写不敏感"
10673
a6cd2cc4
JX
10674#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
10675#: builtin/verify-tag.c:38
87cb7997
JX
10676msgid "format to use for the output"
10677msgstr "输出格式"
10678
2b472aae 10679#: builtin/branch.c:684 builtin/clone.c:785
c04f5ac3 10680msgid "HEAD not found below refs/heads!"
90e6ef53 10681msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 10682
a6cd2cc4 10683#: builtin/branch.c:708
8ada9598 10684msgid "--column and --verbose are incompatible"
81809b99 10685msgstr "--column 和 --verbose 不兼容"
8ada9598 10686
a6cd2cc4 10687#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
a77c07d9
JX
10688msgid "branch name required"
10689msgstr "必须提供分支名"
10690
a6cd2cc4 10691#: builtin/branch.c:753
a77c07d9
JX
10692msgid "Cannot give description to detached HEAD"
10693msgstr "不能向分离头指针提供描述"
10694
a6cd2cc4 10695#: builtin/branch.c:758
a77c07d9
JX
10696msgid "cannot edit description of more than one branch"
10697msgstr "不能为一个以上的分支编辑描述"
10698
a6cd2cc4 10699#: builtin/branch.c:765
a77c07d9
JX
10700#, c-format
10701msgid "No commit on branch '%s' yet."
10702msgstr "分支 '%s' 尚无提交。"
10703
a6cd2cc4 10704#: builtin/branch.c:768
a77c07d9
JX
10705#, c-format
10706msgid "No branch named '%s'."
10707msgstr "没有分支 '%s'。"
10708
a6cd2cc4 10709#: builtin/branch.c:783
6937cb4e
JX
10710msgid "too many branches for a copy operation"
10711msgstr "为拷贝操作提供了太多的分支名"
a77c07d9 10712
a6cd2cc4 10713#: builtin/branch.c:792
6937cb4e
JX
10714msgid "too many arguments for a rename operation"
10715msgstr "为重命名操作提供了太多的参数"
1003b3a5 10716
a6cd2cc4 10717#: builtin/branch.c:797
6937cb4e
JX
10718msgid "too many arguments to set new upstream"
10719msgstr "为设置新上游提供了太多的参数"
10720
a6cd2cc4 10721#: builtin/branch.c:801
1003b3a5
JX
10722#, c-format
10723msgid ""
10724"could not set upstream of HEAD to %s when it does not point to any branch."
10725msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
10726
a6cd2cc4 10727#: builtin/branch.c:804 builtin/branch.c:827
1003b3a5
JX
10728#, c-format
10729msgid "no such branch '%s'"
10730msgstr "没有此分支 '%s'"
10731
a6cd2cc4 10732#: builtin/branch.c:808
07432cef 10733#, c-format
ef317cd5 10734msgid "branch '%s' does not exist"
07432cef 10735msgstr "分支 '%s' 不存在"
ef317cd5 10736
a6cd2cc4 10737#: builtin/branch.c:821
6937cb4e
JX
10738msgid "too many arguments to unset upstream"
10739msgstr "为取消上游设置操作提供了太多的参数"
1003b3a5 10740
a6cd2cc4 10741#: builtin/branch.c:825
1003b3a5
JX
10742msgid "could not unset upstream of HEAD when it does not point to any branch."
10743msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
10744
a6cd2cc4 10745#: builtin/branch.c:831
ef317cd5
JX
10746#, c-format
10747msgid "Branch '%s' has no upstream information"
07432cef 10748msgstr "分支 '%s' 没有上游信息"
ef317cd5 10749
a6cd2cc4
JX
10750#: builtin/branch.c:841
10751msgid ""
10752"The -a, and -r, options to 'git branch' do not take a branch name.\n"
10753"Did you mean to use: -a|-r --list <pattern>?"
10754msgstr ""
10755"'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
10756"您是否想要使用:-a|-r --list <模式>?"
c04f5ac3 10757
ddc12c42
JX
10758#: builtin/branch.c:845
10759msgid ""
10760"the '--set-upstream' option is no longer supported. Please use '--track' or "
10761"'--set-upstream-to' instead."
10762msgstr ""
10763"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
10764
10765#: builtin/bundle.c:15 builtin/bundle.c:23
10766msgid "git bundle create [<options>] <file> <git-rev-list args>"
10767msgstr "git bundle create [<选项>] <文件> <git-rev-list 参数>"
10768
10769#: builtin/bundle.c:16 builtin/bundle.c:28
10770msgid "git bundle verify [<options>] <file>"
10771msgstr "git bundle verify [<选项>] <文件>"
10772
10773#: builtin/bundle.c:17 builtin/bundle.c:33
10774msgid "git bundle list-heads <file> [<refname>...]"
10775msgstr "git bundle list-heads <文件> [<引用名>...]"
10776
10777#: builtin/bundle.c:18 builtin/bundle.c:38
10778msgid "git bundle unbundle <file> [<refname>...]"
10779msgstr "git bundle unbundle <文件> [<引用名>...]"
10780
2b472aae 10781#: builtin/bundle.c:66 builtin/pack-objects.c:3375
ddc12c42
JX
10782msgid "do not show progress meter"
10783msgstr "不显示进度表"
10784
2b472aae 10785#: builtin/bundle.c:68 builtin/pack-objects.c:3377
ddc12c42
JX
10786msgid "show progress meter"
10787msgstr "显示进度表"
10788
2b472aae 10789#: builtin/bundle.c:70 builtin/pack-objects.c:3379
ddc12c42
JX
10790msgid "show progress meter during object writing phase"
10791msgstr "在对象写入阶段显示进度表"
10792
2b472aae 10793#: builtin/bundle.c:73 builtin/pack-objects.c:3382
ddc12c42
JX
10794msgid "similar to --all-progress when progress meter is shown"
10795msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 10796
ddc12c42
JX
10797#: builtin/bundle.c:93
10798msgid "Need a repository to create a bundle."
10799msgstr "需要一个仓库来创建包。"
10800
10801#: builtin/bundle.c:104
10802msgid "do not show bundle details"
10803msgstr "不显示 bundle 细节"
10804
10805#: builtin/bundle.c:119
c04f5ac3
JX
10806#, c-format
10807msgid "%s is okay\n"
10808msgstr "%s 可以\n"
10809
ddc12c42 10810#: builtin/bundle.c:160
c04f5ac3 10811msgid "Need a repository to unbundle."
160fb2b2 10812msgstr "需要一个仓库来解包。"
c04f5ac3 10813
2b472aae 10814#: builtin/bundle.c:168 builtin/remote.c:1686
ddc12c42
JX
10815msgid "be verbose; must be placed before a subcommand"
10816msgstr "冗长输出;必须置于子命令之前"
10817
2b472aae 10818#: builtin/bundle.c:190 builtin/remote.c:1717
ddc12c42
JX
10819#, c-format
10820msgid "Unknown subcommand: %s"
10821msgstr "未知子命令:%s"
10822
a5cd71ca 10823#: builtin/cat-file.c:595
7aea43ff 10824msgid ""
a0b6b246
JX
10825"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
10826"p | <type> | --textconv | --filters) [--path=<path>] <object>"
275588f9
JX
10827msgstr ""
10828"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
10829"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
ef317cd5 10830
a5cd71ca 10831#: builtin/cat-file.c:596
a0b6b246
JX
10832msgid ""
10833"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
10834"filters]"
275588f9
JX
10835msgstr ""
10836"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
10837"filters]"
ef317cd5 10838
a5cd71ca 10839#: builtin/cat-file.c:617
4c27fcb5
JX
10840msgid "only one batch option may be specified"
10841msgstr "只能指定一个批处理选项"
10842
a5cd71ca 10843#: builtin/cat-file.c:635
ef317cd5 10844msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 10845msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 10846
a5cd71ca 10847#: builtin/cat-file.c:636
ef317cd5 10848msgid "show object type"
07432cef 10849msgstr "显示对象类型"
ef317cd5 10850
a5cd71ca 10851#: builtin/cat-file.c:637
ef317cd5 10852msgid "show object size"
07432cef 10853msgstr "显示对象大小"
ef317cd5 10854
a5cd71ca 10855#: builtin/cat-file.c:639
ef317cd5 10856msgid "exit with zero when there's no error"
07432cef 10857msgstr "当没有错误时退出并返回零"
ef317cd5 10858
a5cd71ca 10859#: builtin/cat-file.c:640
ef317cd5 10860msgid "pretty-print object's content"
07432cef 10861msgstr "美观地打印对象的内容"
ef317cd5 10862
a5cd71ca 10863#: builtin/cat-file.c:642
ef317cd5 10864msgid "for blob objects, run textconv on object's content"
a0b6b246
JX
10865msgstr "对于数据对象,对其内容做文本转换"
10866
a5cd71ca 10867#: builtin/cat-file.c:644
a0b6b246
JX
10868msgid "for blob objects, run filters on object's content"
10869msgstr "对于数据对象,对其内容做过滤"
10870
2b472aae 10871#: builtin/cat-file.c:645 git-submodule.sh:1002
a0b6b246
JX
10872msgid "blob"
10873msgstr "数据对象"
10874
a5cd71ca 10875#: builtin/cat-file.c:646
a0b6b246
JX
10876msgid "use a specific path for --textconv/--filters"
10877msgstr "对于 --textconv/--filters 使用一个特定的路径"
ef317cd5 10878
a5cd71ca 10879#: builtin/cat-file.c:648
7aea43ff
JX
10880msgid "allow -s and -t to work with broken/corrupt objects"
10881msgstr "允许 -s 和 -t 对损坏的对象生效"
10882
a5cd71ca 10883#: builtin/cat-file.c:649
1b7f4a34
JX
10884msgid "buffer --batch output"
10885msgstr "缓冲 --batch 的输出"
10886
a5cd71ca 10887#: builtin/cat-file.c:651
ef317cd5 10888msgid "show info and content of objects fed from the standard input"
07432cef 10889msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 10890
a5cd71ca 10891#: builtin/cat-file.c:655
ef317cd5 10892msgid "show info about objects fed from the standard input"
07432cef 10893msgstr "显示从标准输入提供的对象的信息"
ef317cd5 10894
a5cd71ca 10895#: builtin/cat-file.c:659
7aea43ff
JX
10896msgid "follow in-tree symlinks (used with --batch or --batch-check)"
10897msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
10898
a5cd71ca 10899#: builtin/cat-file.c:661
1b7f4a34
JX
10900msgid "show all objects with --batch or --batch-check"
10901msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
10902
a5cd71ca 10903#: builtin/cat-file.c:663
c1ac5258
JX
10904msgid "do not order --batch-all-objects output"
10905msgstr "不要对 --batch-all-objects 的输出排序"
10906
06991777 10907#: builtin/check-attr.c:13
814ff314
JX
10908msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
10909msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
ef317cd5 10910
06991777 10911#: builtin/check-attr.c:14
94550ed3
JX
10912msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
10913msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
ef317cd5 10914
06991777 10915#: builtin/check-attr.c:21
ef317cd5 10916msgid "report all attributes set on file"
07432cef 10917msgstr "报告设置在文件上的所有属性"
ef317cd5 10918
06991777 10919#: builtin/check-attr.c:22
ef317cd5 10920msgid "use .gitattributes only from the index"
07432cef 10921msgstr "只使用索引中的 .gitattributes"
ef317cd5 10922
06991777 10923#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
ef317cd5 10924msgid "read file names from stdin"
07432cef 10925msgstr "从标准输入读出文件名"
ef317cd5 10926
06991777 10927#: builtin/check-attr.c:25 builtin/check-ignore.c:27
90314792
JX
10928msgid "terminate input and output records by a NUL character"
10929msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 10930
2b472aae
JX
10931#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
10932#: builtin/worktree.c:499
a77c07d9
JX
10933msgid "suppress progress reporting"
10934msgstr "不显示进度报告"
10935
06991777 10936#: builtin/check-ignore.c:29
2e8451e8
JX
10937msgid "show non-matching input paths"
10938msgstr "显示未匹配的输入路径"
10939
06991777 10940#: builtin/check-ignore.c:31
90314792
JX
10941msgid "ignore index when checking"
10942msgstr "检查时忽略索引"
10943
2b472aae 10944#: builtin/check-ignore.c:163
a77c07d9 10945msgid "cannot specify pathnames with --stdin"
1b7f4a34 10946msgstr "不能同时指定路径及 --stdin 参数"
a77c07d9 10947
2b472aae 10948#: builtin/check-ignore.c:166
a77c07d9
JX
10949msgid "-z only makes sense with --stdin"
10950msgstr "-z 需要和 --stdin 参数共用才有意义"
10951
2b472aae 10952#: builtin/check-ignore.c:168
a77c07d9
JX
10953msgid "no path specified"
10954msgstr "未指定路径"
10955
2b472aae 10956#: builtin/check-ignore.c:172
a77c07d9
JX
10957msgid "--quiet is only valid with a single pathname"
10958msgstr "参数 --quiet 只在提供一个路径名时有效"
10959
2b472aae 10960#: builtin/check-ignore.c:174
a77c07d9
JX
10961msgid "cannot have both --quiet and --verbose"
10962msgstr "不能同时提供 --quiet 和 --verbose 参数"
10963
2b472aae 10964#: builtin/check-ignore.c:177
2e8451e8
JX
10965msgid "--non-matching is only valid with --verbose"
10966msgstr "--non-matching 选项只在使用 --verbose 时有效"
10967
a4f16749 10968#: builtin/check-mailmap.c:9
814ff314
JX
10969msgid "git check-mailmap [<options>] <contact>..."
10970msgstr "git check-mailmap [<选项>] <联系地址>..."
2e8451e8 10971
a4f16749 10972#: builtin/check-mailmap.c:14
2e8451e8
JX
10973msgid "also read contacts from stdin"
10974msgstr "还从标准输入读取联系地址"
10975
a4f16749 10976#: builtin/check-mailmap.c:25
2e8451e8
JX
10977#, c-format
10978msgid "unable to parse contact: %s"
10979msgstr "不能解析联系地址:%s"
10980
a4f16749 10981#: builtin/check-mailmap.c:48
2e8451e8
JX
10982msgid "no contacts specified"
10983msgstr "未指定联系地址"
10984
06991777 10985#: builtin/checkout-index.c:131
814ff314
JX
10986msgid "git checkout-index [<options>] [--] [<file>...]"
10987msgstr "git checkout-index [<选项>] [--] [<文件>...]"
ef317cd5 10988
06991777 10989#: builtin/checkout-index.c:148
276ceeaa
JX
10990msgid "stage should be between 1 and 3 or all"
10991msgstr "索引值应该取值 1 到 3 或者 all"
10992
06991777 10993#: builtin/checkout-index.c:164
ef317cd5 10994msgid "check out all files in the index"
07432cef 10995msgstr "检出索引区的所有文件"
ef317cd5 10996
06991777 10997#: builtin/checkout-index.c:165
ef317cd5 10998msgid "force overwrite of existing files"
07432cef 10999msgstr "强制覆盖现有的文件"
ef317cd5 11000
06991777 11001#: builtin/checkout-index.c:167
ef317cd5 11002msgid "no warning for existing files and files not in index"
07432cef 11003msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 11004
06991777 11005#: builtin/checkout-index.c:169
ef317cd5 11006msgid "don't checkout new files"
07432cef 11007msgstr "不检出新文件"
ef317cd5 11008
06991777 11009#: builtin/checkout-index.c:171
ef317cd5 11010msgid "update stat information in the index file"
07432cef 11011msgstr "更新索引中文件的状态信息"
ef317cd5 11012
06991777 11013#: builtin/checkout-index.c:175
ef317cd5 11014msgid "read list of paths from the standard input"
07432cef 11015msgstr "从标准输入读取路径列表"
ef317cd5 11016
06991777 11017#: builtin/checkout-index.c:177
ef317cd5 11018msgid "write the content to temporary files"
07432cef 11019msgstr "将内容写入临时文件"
ef317cd5 11020
06991777 11021#: builtin/checkout-index.c:178 builtin/column.c:31
2b472aae
JX
11022#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
11023#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
11024#: builtin/worktree.c:672
ef317cd5 11025msgid "string"
07432cef 11026msgstr "字符串"
ef317cd5 11027
06991777 11028#: builtin/checkout-index.c:179
ef317cd5 11029msgid "when creating files, prepend <string>"
4375c10e 11030msgstr "在创建文件时,在前面加上 <字符串>"
ef317cd5 11031
06991777 11032#: builtin/checkout-index.c:181
ef317cd5 11033msgid "copy out the files from named stage"
07432cef 11034msgstr "从指定暂存区中拷出文件"
ef317cd5 11035
a6cd2cc4 11036#: builtin/checkout.c:31
814ff314
JX
11037msgid "git checkout [<options>] <branch>"
11038msgstr "git checkout [<选项>] <分支>"
ef317cd5 11039
a6cd2cc4 11040#: builtin/checkout.c:32
814ff314
JX
11041msgid "git checkout [<options>] [<branch>] -- <file>..."
11042msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
ef317cd5 11043
a6cd2cc4
JX
11044#: builtin/checkout.c:37
11045msgid "git switch [<options>] [<branch>]"
11046msgstr "git switch [<选项>] [<分支>]"
11047
11048#: builtin/checkout.c:42
11049msgid "git restore [<options>] [--source=<branch>] <file>..."
11050msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
11051
ddc12c42 11052#: builtin/checkout.c:175 builtin/checkout.c:214
c04f5ac3
JX
11053#, c-format
11054msgid "path '%s' does not have our version"
11055msgstr "路径 '%s' 没有我们的版本"
11056
ddc12c42 11057#: builtin/checkout.c:177 builtin/checkout.c:216
c04f5ac3
JX
11058#, c-format
11059msgid "path '%s' does not have their version"
11060msgstr "路径 '%s' 没有他们的版本"
11061
ddc12c42 11062#: builtin/checkout.c:193
c04f5ac3
JX
11063#, c-format
11064msgid "path '%s' does not have all necessary versions"
e640d114 11065msgstr "路径 '%s' 没有全部必需的版本"
c04f5ac3 11066
ddc12c42 11067#: builtin/checkout.c:243
c04f5ac3
JX
11068#, c-format
11069msgid "path '%s' does not have necessary versions"
e640d114 11070msgstr "路径 '%s' 没有必需的版本"
c04f5ac3 11071
ddc12c42 11072#: builtin/checkout.c:261
c04f5ac3
JX
11073#, c-format
11074msgid "path '%s': cannot merge"
90e6ef53 11075msgstr "path '%s':无法合并"
c04f5ac3 11076
ddc12c42 11077#: builtin/checkout.c:277
c04f5ac3
JX
11078#, c-format
11079msgid "Unable to add merge result for '%s'"
11080msgstr "无法为 '%s' 添加合并结果"
11081
ddc12c42 11082#: builtin/checkout.c:377
a6cd2cc4
JX
11083#, c-format
11084msgid "Recreated %d merge conflict"
11085msgid_plural "Recreated %d merge conflicts"
11086msgstr[0] "重新创建了 %d 个合并冲突"
11087msgstr[1] "重新创建了 %d 个合并冲突"
11088
ddc12c42 11089#: builtin/checkout.c:382
a6cd2cc4
JX
11090#, c-format
11091msgid "Updated %d path from %s"
11092msgid_plural "Updated %d paths from %s"
11093msgstr[0] "从 %2$s 更新了 %1$d 个路径"
11094msgstr[1] "从 %2$s 更新了 %1$d 个路径"
11095
ddc12c42 11096#: builtin/checkout.c:389
a6cd2cc4
JX
11097#, c-format
11098msgid "Updated %d path from the index"
11099msgid_plural "Updated %d paths from the index"
11100msgstr[0] "从索引区更新了 %d 个路径"
11101msgstr[1] "从索引区更新了 %d 个路径"
11102
ddc12c42
JX
11103#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418
11104#: builtin/checkout.c:422
07432cef 11105#, c-format
ef317cd5 11106msgid "'%s' cannot be used with updating paths"
07432cef 11107msgstr "'%s' 不能在更新路径时使用"
ef317cd5 11108
ddc12c42 11109#: builtin/checkout.c:425 builtin/checkout.c:428
07432cef 11110#, c-format
ef317cd5 11111msgid "'%s' cannot be used with %s"
07432cef 11112msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 11113
ddc12c42 11114#: builtin/checkout.c:432
ef317cd5
JX
11115#, c-format
11116msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 11117msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 11118
ddc12c42 11119#: builtin/checkout.c:436
c04f5ac3 11120#, c-format
a6cd2cc4
JX
11121msgid "neither '%s' or '%s' is specified"
11122msgstr "'%s' 或 '%s' 都没有指定"
c04f5ac3 11123
ddc12c42 11124#: builtin/checkout.c:440
06991777 11125#, c-format
a6cd2cc4
JX
11126msgid "'%s' must be used when '%s' is not specified"
11127msgstr "未指定 '%2$s' 时,必须使用 '%1$s'"
06991777 11128
ddc12c42 11129#: builtin/checkout.c:445 builtin/checkout.c:450
06991777 11130#, c-format
a6cd2cc4
JX
11131msgid "'%s' or '%s' cannot be used with %s"
11132msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
06991777 11133
ddc12c42 11134#: builtin/checkout.c:509 builtin/checkout.c:516
06991777 11135#, c-format
a6cd2cc4
JX
11136msgid "path '%s' is unmerged"
11137msgstr "路径 '%s' 未合并"
06991777 11138
2b472aae 11139#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
c04f5ac3 11140msgid "you need to resolve your current index first"
90e6ef53 11141msgstr "您需要先解决当前索引的冲突"
c04f5ac3 11142
2b472aae 11143#: builtin/checkout.c:734
d46c5519
JX
11144#, c-format
11145msgid ""
11146"cannot continue with staged changes in the following files:\n"
11147"%s"
11148msgstr ""
11149"不能继续,下列文件有暂存的修改:\n"
11150"%s"
11151
2b472aae 11152#: builtin/checkout.c:837
c04f5ac3 11153#, c-format
1b7f4a34
JX
11154msgid "Can not do reflog for '%s': %s\n"
11155msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
c04f5ac3 11156
2b472aae 11157#: builtin/checkout.c:879
c04f5ac3
JX
11158msgid "HEAD is now at"
11159msgstr "HEAD 目前位于"
11160
2b472aae 11161#: builtin/checkout.c:883 builtin/clone.c:717
3495628d
JX
11162msgid "unable to update HEAD"
11163msgstr "不能更新 HEAD"
11164
2b472aae 11165#: builtin/checkout.c:887
c04f5ac3
JX
11166#, c-format
11167msgid "Reset branch '%s'\n"
11168msgstr "重置分支 '%s'\n"
11169
2b472aae 11170#: builtin/checkout.c:890
c04f5ac3
JX
11171#, c-format
11172msgid "Already on '%s'\n"
11173msgstr "已经位于 '%s'\n"
11174
2b472aae 11175#: builtin/checkout.c:894
c04f5ac3
JX
11176#, c-format
11177msgid "Switched to and reset branch '%s'\n"
11178msgstr "切换并重置分支 '%s'\n"
11179
2b472aae 11180#: builtin/checkout.c:896 builtin/checkout.c:1320
c04f5ac3
JX
11181#, c-format
11182msgid "Switched to a new branch '%s'\n"
11183msgstr "切换到一个新分支 '%s'\n"
11184
2b472aae 11185#: builtin/checkout.c:898
c04f5ac3
JX
11186#, c-format
11187msgid "Switched to branch '%s'\n"
11188msgstr "切换到分支 '%s'\n"
11189
90e6ef53 11190# 译者:注意保持前导空格
2b472aae 11191#: builtin/checkout.c:949
c04f5ac3
JX
11192#, c-format
11193msgid " ... and %d more.\n"
90e6ef53 11194msgstr " ... 及其它 %d 个。\n"
c04f5ac3 11195
2b472aae 11196#: builtin/checkout.c:955
c04f5ac3
JX
11197#, c-format
11198msgid ""
11199"Warning: you are leaving %d commit behind, not connected to\n"
11200"any of your branches:\n"
11201"\n"
11202"%s\n"
11203msgid_plural ""
11204"Warning: you are leaving %d commits behind, not connected to\n"
11205"any of your branches:\n"
11206"\n"
11207"%s\n"
11208msgstr[0] ""
11209"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
11210"\n"
11211"%s\n"
5ae481e0
JX
11212msgstr[1] ""
11213"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
11214"\n"
11215"%s\n"
c04f5ac3 11216
2b472aae 11217#: builtin/checkout.c:974
c04f5ac3
JX
11218#, c-format
11219msgid ""
7aea43ff
JX
11220"If you want to keep it by creating a new branch, this may be a good time\n"
11221"to do so with:\n"
11222"\n"
11223" git branch <new-branch-name> %s\n"
11224"\n"
11225msgid_plural ""
c04f5ac3
JX
11226"If you want to keep them by creating a new branch, this may be a good time\n"
11227"to do so with:\n"
11228"\n"
814ff314 11229" git branch <new-branch-name> %s\n"
c04f5ac3 11230"\n"
7aea43ff
JX
11231msgstr[0] ""
11232"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
11233"如下操作:\n"
11234"\n"
11235" git branch <新分支名> %s\n"
11236"\n"
11237msgstr[1] ""
11238"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
c04f5ac3
JX
11239"如下操作:\n"
11240"\n"
814ff314 11241" git branch <新分支名> %s\n"
c04f5ac3
JX
11242"\n"
11243
2b472aae 11244#: builtin/checkout.c:1009
c04f5ac3
JX
11245msgid "internal error in revision walk"
11246msgstr "在版本遍历时遇到内部错误"
11247
2b472aae 11248#: builtin/checkout.c:1013
c04f5ac3
JX
11249msgid "Previous HEAD position was"
11250msgstr "之前的 HEAD 位置是"
11251
2b472aae 11252#: builtin/checkout.c:1053 builtin/checkout.c:1315
c04f5ac3 11253msgid "You are on a branch yet to be born"
90e6ef53 11254msgstr "您位于一个尚未初始化的分支"
c04f5ac3 11255
2b472aae 11256#: builtin/checkout.c:1128
06991777
JX
11257#, c-format
11258msgid ""
11259"'%s' could be both a local file and a tracking branch.\n"
11260"Please use -- (and optionally --no-guess) to disambiguate"
11261msgstr ""
11262"'%s' 既可以是一个本地文件,也可以是一个跟踪分支。\n"
11263"请使用 --(和可选的 --no-guess)来消除歧义"
11264
2b472aae
JX
11265#: builtin/checkout.c:1135
11266msgid ""
11267"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
11268"you can do so by fully qualifying the name with the --track option:\n"
11269"\n"
11270" git checkout --track origin/<name>\n"
11271"\n"
11272"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
11273"one remote, e.g. the 'origin' remote, consider setting\n"
11274"checkout.defaultRemote=origin in your config."
11275msgstr ""
11276"如果您想要检出一个远程跟踪分支,例如在 'origin' 上的,您可以使用分支\n"
11277"全名和 --track 选项:\n"
11278"\n"
440e7442 11279" git checkout --track origin/<名称>\n"
2b472aae 11280"\n"
440e7442 11281"如果您总是喜欢使用模糊的简短分支名 <名称>,而不喜欢如 'origin' 的远程\n"
2b472aae
JX
11282"名称,可以在配置中设置 checkout.defaultRemote=origin。"
11283
11284#: builtin/checkout.c:1145
11285#, c-format
11286msgid "'%s' matched multiple (%d) remote tracking branches"
440e7442 11287msgstr "'%s' 匹配多个(%d 个)远程跟踪分支"
2b472aae
JX
11288
11289#: builtin/checkout.c:1211
11290msgid "only one reference expected"
440e7442 11291msgstr "只期望一个引用"
2b472aae
JX
11292
11293#: builtin/checkout.c:1228
11294#, c-format
11295msgid "only one reference expected, %d given."
11296msgstr "应只有一个引用,却给出了 %d 个"
11297
11298#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
c04f5ac3
JX
11299#, c-format
11300msgid "invalid reference: %s"
11301msgstr "无效引用:%s"
11302
2b472aae 11303#: builtin/checkout.c:1287 builtin/checkout.c:1649
c04f5ac3
JX
11304#, c-format
11305msgid "reference is not a tree: %s"
11306msgstr "引用不是一个树:%s"
11307
2b472aae 11308#: builtin/checkout.c:1334
a6cd2cc4
JX
11309#, c-format
11310msgid "a branch is expected, got tag '%s'"
11311msgstr "期望一个分支,得到标签 '%s'"
11312
2b472aae 11313#: builtin/checkout.c:1336
a6cd2cc4
JX
11314#, c-format
11315msgid "a branch is expected, got remote branch '%s'"
11316msgstr "期望一个分支,得到远程分支 '%s'"
11317
2b472aae 11318#: builtin/checkout.c:1337 builtin/checkout.c:1345
a6cd2cc4
JX
11319#, c-format
11320msgid "a branch is expected, got '%s'"
11321msgstr "期望一个分支,得到 '%s'"
11322
2b472aae 11323#: builtin/checkout.c:1340
a6cd2cc4
JX
11324#, c-format
11325msgid "a branch is expected, got commit '%s'"
11326msgstr "期望一个分支,得到提交 '%s'"
11327
2b472aae 11328#: builtin/checkout.c:1356
a6cd2cc4
JX
11329msgid ""
11330"cannot switch branch while merging\n"
11331"Consider \"git merge --quit\" or \"git worktree add\"."
11332msgstr ""
11333"不能在合并时切换分支\n"
11334"考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
11335
2b472aae 11336#: builtin/checkout.c:1360
a6cd2cc4
JX
11337msgid ""
11338"cannot switch branch in the middle of an am session\n"
11339"Consider \"git am --quit\" or \"git worktree add\"."
11340msgstr ""
11341"不能在一个 am 会话期间切换分支\n"
11342"考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
11343
2b472aae 11344#: builtin/checkout.c:1364
a6cd2cc4
JX
11345msgid ""
11346"cannot switch branch while rebasing\n"
11347"Consider \"git rebase --quit\" or \"git worktree add\"."
11348msgstr ""
11349"不能在变基时切换分支\n"
11350"考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
11351
2b472aae 11352#: builtin/checkout.c:1368
a6cd2cc4
JX
11353msgid ""
11354"cannot switch branch while cherry-picking\n"
11355"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
11356msgstr ""
11357"不能在拣选时切换分支\n"
11358"考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
11359
2b472aae 11360#: builtin/checkout.c:1372
a6cd2cc4
JX
11361msgid ""
11362"cannot switch branch while reverting\n"
11363"Consider \"git revert --quit\" or \"git worktree add\"."
11364msgstr ""
11365"不能在还原时切换分支\n"
11366"考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
11367
2b472aae 11368#: builtin/checkout.c:1376
a6cd2cc4
JX
11369msgid "you are switching branch while bisecting"
11370msgstr "您在执行二分查找时切换分支"
11371
2b472aae 11372#: builtin/checkout.c:1383
ef317cd5 11373msgid "paths cannot be used with switching branches"
07432cef 11374msgstr "路径不能和切换分支同时使用"
c04f5ac3 11375
2b472aae 11376#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
07432cef 11377#, c-format
ef317cd5 11378msgid "'%s' cannot be used with switching branches"
07432cef 11379msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 11380
2b472aae
JX
11381#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
11382#: builtin/checkout.c:1409 builtin/checkout.c:1414
07432cef 11383#, c-format
ef317cd5 11384msgid "'%s' cannot be used with '%s'"
07432cef 11385msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 11386
2b472aae 11387#: builtin/checkout.c:1411
a6cd2cc4
JX
11388#, c-format
11389msgid "'%s' cannot take <start-point>"
11390msgstr "'%s' 不带 <起始点>"
11391
2b472aae 11392#: builtin/checkout.c:1419
07432cef 11393#, c-format
ef317cd5 11394msgid "Cannot switch branch to a non-commit '%s'"
07432cef 11395msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 11396
2b472aae 11397#: builtin/checkout.c:1426
a6cd2cc4
JX
11398msgid "missing branch or commit argument"
11399msgstr "缺少分支或提交参数"
c04f5ac3 11400
2b472aae
JX
11401#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
11402#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
11403#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
ddc12c42 11404#: builtin/send-pack.c:174
a6cd2cc4
JX
11405msgid "force progress reporting"
11406msgstr "强制显示进度报告"
c04f5ac3 11407
2b472aae 11408#: builtin/checkout.c:1469
a6cd2cc4
JX
11409msgid "perform a 3-way merge with the new branch"
11410msgstr "和新的分支执行三方合并"
c04f5ac3 11411
2b472aae 11412#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
a6cd2cc4
JX
11413msgid "style"
11414msgstr "风格"
ef317cd5 11415
2b472aae 11416#: builtin/checkout.c:1471
a6cd2cc4
JX
11417msgid "conflict style (merge or diff3)"
11418msgstr "冲突输出风格(merge 或 diff3)"
11419
2b472aae 11420#: builtin/checkout.c:1483 builtin/worktree.c:496
5c57d762
JX
11421msgid "detach HEAD at named commit"
11422msgstr "HEAD 从指定的提交分离"
ef317cd5 11423
2b472aae 11424#: builtin/checkout.c:1484
ef317cd5 11425msgid "set upstream info for new branch"
07432cef 11426msgstr "为新的分支设置上游信息"
ef317cd5 11427
2b472aae 11428#: builtin/checkout.c:1486
a6cd2cc4
JX
11429msgid "force checkout (throw away local modifications)"
11430msgstr "强制检出(丢弃本地修改)"
11431
2b472aae 11432#: builtin/checkout.c:1488
6c94aba5 11433msgid "new-branch"
07432cef 11434msgstr "新分支"
ef317cd5 11435
2b472aae 11436#: builtin/checkout.c:1488
ef317cd5 11437msgid "new unparented branch"
07432cef 11438msgstr "新的没有父提交的分支"
ef317cd5 11439
2b472aae 11440#: builtin/checkout.c:1490 builtin/merge.c:289
a6cd2cc4
JX
11441msgid "update ignored files (default)"
11442msgstr "更新忽略的文件(默认)"
11443
2b472aae 11444#: builtin/checkout.c:1493
a6cd2cc4
JX
11445msgid "do not check if another worktree is holding the given ref"
11446msgstr "不检查指定的引用是否被其他工作区所占用"
11447
2b472aae 11448#: builtin/checkout.c:1506
ef317cd5 11449msgid "checkout our version for unmerged files"
07432cef 11450msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 11451
2b472aae 11452#: builtin/checkout.c:1509
ef317cd5 11453msgid "checkout their version for unmerged files"
07432cef 11454msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 11455
2b472aae 11456#: builtin/checkout.c:1513
4dcdc3d8
JX
11457msgid "do not limit pathspecs to sparse entries only"
11458msgstr "对路径不做稀疏检出的限制"
11459
2b472aae 11460#: builtin/checkout.c:1565
ef317cd5 11461msgid "-b, -B and --orphan are mutually exclusive"
07432cef 11462msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 11463
2b472aae 11464#: builtin/checkout.c:1568
d46c5519
JX
11465msgid "-p and --overlay are mutually exclusive"
11466msgstr "-p 和 --overlay 互斥"
11467
2b472aae 11468#: builtin/checkout.c:1605
ef317cd5
JX
11469msgid "--track needs a branch name"
11470msgstr "--track 需要一个分支名"
11471
2b472aae 11472#: builtin/checkout.c:1610
c1ac5258
JX
11473msgid "missing branch name; try -b"
11474msgstr "缺少分支名,尝试 -b"
ef317cd5 11475
2b472aae 11476#: builtin/checkout.c:1642
a6cd2cc4
JX
11477#, c-format
11478msgid "could not resolve %s"
11479msgstr "无法解析 %s"
11480
2b472aae 11481#: builtin/checkout.c:1658
c04f5ac3 11482msgid "invalid path specification"
90e6ef53 11483msgstr "无效的路径规格"
c04f5ac3 11484
2b472aae 11485#: builtin/checkout.c:1665
07432cef 11486#, c-format
a4f16749
JX
11487msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
11488msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'"
c04f5ac3 11489
2b472aae 11490#: builtin/checkout.c:1669
07432cef 11491#, c-format
ef317cd5 11492msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 11493msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 11494
2b472aae 11495#: builtin/checkout.c:1678
ddc12c42
JX
11496msgid "--pathspec-from-file is incompatible with --detach"
11497msgstr "--pathspec-from-file 与 --detach 不兼容"
11498
2b472aae 11499#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
ddc12c42
JX
11500msgid "--pathspec-from-file is incompatible with --patch"
11501msgstr "--pathspec-from-file 与 --patch 不兼容"
11502
2b472aae 11503#: builtin/checkout.c:1692
c04f5ac3
JX
11504msgid ""
11505"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
11506"checking out of the index."
11507msgstr ""
90e6ef53 11508"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 11509
2b472aae 11510#: builtin/checkout.c:1697
ddc12c42
JX
11511msgid "you must specify path(s) to restore"
11512msgstr "您必须指定一个要恢复的路径"
11513
2b472aae
JX
11514#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
11515#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
11516#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
a6cd2cc4
JX
11517msgid "branch"
11518msgstr "分支"
11519
2b472aae 11520#: builtin/checkout.c:1724
a6cd2cc4
JX
11521msgid "create and checkout a new branch"
11522msgstr "创建并检出一个新的分支"
11523
2b472aae 11524#: builtin/checkout.c:1726
a6cd2cc4
JX
11525msgid "create/reset and checkout a branch"
11526msgstr "创建/重置并检出一个分支"
11527
2b472aae 11528#: builtin/checkout.c:1727
a6cd2cc4
JX
11529msgid "create reflog for new branch"
11530msgstr "为新的分支创建引用日志"
11531
2b472aae 11532#: builtin/checkout.c:1729
a6cd2cc4
JX
11533msgid "second guess 'git checkout <no-such-branch>' (default)"
11534msgstr "二次猜测 'git checkout <无此分支>'(默认)"
11535
2b472aae 11536#: builtin/checkout.c:1730
a6cd2cc4
JX
11537msgid "use overlay mode (default)"
11538msgstr "使用叠加模式(默认)"
11539
2b472aae 11540#: builtin/checkout.c:1775
a6cd2cc4
JX
11541msgid "create and switch to a new branch"
11542msgstr "创建并切换一个新分支"
11543
2b472aae 11544#: builtin/checkout.c:1777
a6cd2cc4
JX
11545msgid "create/reset and switch to a branch"
11546msgstr "创建/重置并切换一个分支"
11547
2b472aae 11548#: builtin/checkout.c:1779
a6cd2cc4
JX
11549msgid "second guess 'git switch <no-such-branch>'"
11550msgstr "二次猜测 'git switch <无此分支>'"
11551
2b472aae 11552#: builtin/checkout.c:1781
a6cd2cc4
JX
11553msgid "throw away local modifications"
11554msgstr "丢弃本地修改"
11555
2b472aae 11556#: builtin/checkout.c:1813
a6cd2cc4
JX
11557msgid "which tree-ish to checkout from"
11558msgstr "要检出哪一个树"
11559
2b472aae 11560#: builtin/checkout.c:1815
a6cd2cc4
JX
11561msgid "restore the index"
11562msgstr "恢复索引"
11563
2b472aae 11564#: builtin/checkout.c:1817
a6cd2cc4
JX
11565msgid "restore the working tree (default)"
11566msgstr "恢复工作区(默认)"
11567
2b472aae 11568#: builtin/checkout.c:1819
a6cd2cc4
JX
11569msgid "ignore unmerged entries"
11570msgstr "忽略未合并条目"
11571
2b472aae 11572#: builtin/checkout.c:1820
a6cd2cc4
JX
11573msgid "use overlay mode"
11574msgstr "使用叠加模式"
11575
06991777 11576#: builtin/clean.c:28
2e8451e8
JX
11577msgid ""
11578"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
11579msgstr ""
11580"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 11581
06991777 11582#: builtin/clean.c:32
07432cef
WS
11583#, c-format
11584msgid "Removing %s\n"
11585msgstr "正删除 %s\n"
11586
06991777 11587#: builtin/clean.c:33
07432cef
WS
11588#, c-format
11589msgid "Would remove %s\n"
11590msgstr "将删除 %s\n"
11591
06991777 11592#: builtin/clean.c:34
07432cef
WS
11593#, c-format
11594msgid "Skipping repository %s\n"
160fb2b2 11595msgstr "忽略仓库 %s\n"
07432cef 11596
06991777 11597#: builtin/clean.c:35
07432cef
WS
11598#, c-format
11599msgid "Would skip repository %s\n"
160fb2b2 11600msgstr "将忽略仓库 %s\n"
07432cef 11601
06991777 11602#: builtin/clean.c:36
07432cef
WS
11603#, c-format
11604msgid "failed to remove %s"
c1ac5258 11605msgstr "删除 %s 失败"
07432cef 11606
a6cd2cc4
JX
11607#: builtin/clean.c:37
11608#, c-format
11609msgid "could not lstat %s\n"
11610msgstr "不能对 %s 调用 lstat\n"
11611
ddc12c42 11612#: builtin/clean.c:301 git-add--interactive.perl:595
1a79b2f1 11613#, c-format
2e8451e8
JX
11614msgid ""
11615"Prompt help:\n"
11616"1 - select a numbered item\n"
11617"foo - select item based on unique prefix\n"
1a79b2f1 11618" - (empty) select nothing\n"
2e8451e8
JX
11619msgstr ""
11620"帮助:\n"
11621"1 - 通过编号选择一个选项\n"
1a79b2f1
JX
11622"foo - 通过唯一前缀选择一个选项\n"
11623" - (空)什么也不选择\n"
2e8451e8 11624
ddc12c42 11625#: builtin/clean.c:305 git-add--interactive.perl:604
1a79b2f1 11626#, c-format
2e8451e8
JX
11627msgid ""
11628"Prompt help:\n"
11629"1 - select a single item\n"
11630"3-5 - select a range of items\n"
11631"2-3,6-9 - select multiple ranges\n"
11632"foo - select item based on unique prefix\n"
11633"-... - unselect specified items\n"
11634"* - choose all items\n"
1a79b2f1 11635" - (empty) finish selecting\n"
2e8451e8
JX
11636msgstr ""
11637"帮助:\n"
11638"1 - 选择一个选项\n"
11639"3-5 - 选择一个范围内的所有选项\n"
11640"2-3,6-9 - 选择多个范围内的所有选项\n"
1a79b2f1 11641"foo - 通过唯一前缀选择一个选项\n"
2e8451e8
JX
11642"-... - 反选特定的选项\n"
11643"* - 选择所有选项\n"
1a79b2f1 11644" - (空)结束选择\n"
2e8451e8 11645
ddc12c42
JX
11646#: builtin/clean.c:521 git-add--interactive.perl:570
11647#: git-add--interactive.perl:575
1a79b2f1
JX
11648#, c-format, perl-format
11649msgid "Huh (%s)?\n"
11650msgstr "嗯(%s)?\n"
2e8451e8 11651
a5cd71ca 11652#: builtin/clean.c:663
2e8451e8
JX
11653#, c-format
11654msgid "Input ignore patterns>> "
11655msgstr "输入模版以排除条目>> "
11656
a5cd71ca 11657#: builtin/clean.c:700
2e8451e8
JX
11658#, c-format
11659msgid "WARNING: Cannot find items matched by: %s"
11660msgstr "警告:无法找到和 %s 匹配的条目"
11661
a5cd71ca 11662#: builtin/clean.c:721
2e8451e8
JX
11663msgid "Select items to delete"
11664msgstr "选择要删除的条目"
11665
814ff314 11666#. TRANSLATORS: Make sure to keep [y/N] as is
a5cd71ca 11667#: builtin/clean.c:762
2e8451e8 11668#, c-format
814ff314
JX
11669msgid "Remove %s [y/N]? "
11670msgstr "删除 %s [y/N]?"
2e8451e8 11671
a5cd71ca 11672#: builtin/clean.c:795
2e8451e8
JX
11673msgid ""
11674"clean - start cleaning\n"
11675"filter by pattern - exclude items from deletion\n"
11676"select by numbers - select items to be deleted by numbers\n"
11677"ask each - confirm each deletion (like \"rm -i\")\n"
11678"quit - stop cleaning\n"
11679"help - this screen\n"
11680"? - help for prompt selection"
11681msgstr ""
11682"clean - 开始清理\n"
11683"filter by pattern - 通过模版排除要删除的条目\n"
11684"select by numbers - 通过数字选择要删除的条目\n"
11685"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
11686"quit - 停止删除并退出\n"
11687"help - 显示本帮助\n"
11688"? - 显示如何在提示符下选择的帮助"
11689
a5cd71ca 11690#: builtin/clean.c:831
2e8451e8
JX
11691msgid "Would remove the following item:"
11692msgid_plural "Would remove the following items:"
11693msgstr[0] "将删除如下条目:"
11694msgstr[1] "将删除如下条目:"
11695
a5cd71ca 11696#: builtin/clean.c:847
2e8451e8
JX
11697msgid "No more files to clean, exiting."
11698msgstr "没有要清理的文件,退出。"
11699
a5cd71ca 11700#: builtin/clean.c:909
ef317cd5 11701msgid "do not print names of files removed"
07432cef 11702msgstr "不打印删除文件的名称"
ef317cd5 11703
a5cd71ca 11704#: builtin/clean.c:911
ef317cd5 11705msgid "force"
07432cef 11706msgstr "强制"
ef317cd5 11707
a5cd71ca 11708#: builtin/clean.c:912
2e8451e8
JX
11709msgid "interactive cleaning"
11710msgstr "交互式清除"
11711
a5cd71ca 11712#: builtin/clean.c:914
ef317cd5 11713msgid "remove whole directories"
07432cef 11714msgstr "删除整个目录"
ef317cd5 11715
2b472aae
JX
11716#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
11717#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
11718#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
d46c5519 11719#: builtin/show-ref.c:179
ef317cd5 11720msgid "pattern"
07432cef 11721msgstr "模式"
ef317cd5 11722
a5cd71ca 11723#: builtin/clean.c:916
ef317cd5 11724msgid "add <pattern> to ignore rules"
4375c10e 11725msgstr "添加 <模式> 到忽略规则"
ef317cd5 11726
a5cd71ca 11727#: builtin/clean.c:917
ef317cd5 11728msgid "remove ignored files, too"
07432cef 11729msgstr "也删除忽略的文件"
ef317cd5 11730
a5cd71ca 11731#: builtin/clean.c:919
ef317cd5 11732msgid "remove only ignored files"
07432cef 11733msgstr "只删除忽略的文件"
c04f5ac3 11734
a5cd71ca 11735#: builtin/clean.c:937
c04f5ac3 11736msgid "-x and -X cannot be used together"
649900bc 11737msgstr "-x 和 -X 不能同时使用"
c04f5ac3 11738
a5cd71ca 11739#: builtin/clean.c:941
c04f5ac3 11740msgid ""
6c94aba5 11741"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 11742"clean"
c04f5ac3 11743msgstr ""
2e8451e8 11744"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 11745
a5cd71ca 11746#: builtin/clean.c:944
c04f5ac3 11747msgid ""
6c94aba5 11748"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 11749"refusing to clean"
c04f5ac3 11750msgstr ""
2e8451e8 11751"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 11752
a5cd71ca 11753#: builtin/clone.c:45
814ff314 11754msgid "git clone [<options>] [--] <repo> [<dir>]"
160fb2b2 11755msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
ef317cd5 11756
ddc12c42 11757#: builtin/clone.c:93
ef317cd5 11758msgid "don't create a checkout"
07432cef 11759msgstr "不创建一个检出"
ef317cd5 11760
ddc12c42 11761#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
ef317cd5 11762msgid "create a bare repository"
160fb2b2 11763msgstr "创建一个纯仓库"
ef317cd5 11764
ddc12c42 11765#: builtin/clone.c:98
ef317cd5 11766msgid "create a mirror repository (implies bare)"
160fb2b2 11767msgstr "创建一个镜像仓库(也是纯仓库)"
ef317cd5 11768
ddc12c42 11769#: builtin/clone.c:100
ef317cd5 11770msgid "to clone from a local repository"
160fb2b2 11771msgstr "从本地仓库克隆"
ef317cd5 11772
ddc12c42 11773#: builtin/clone.c:102
ef317cd5 11774msgid "don't use local hardlinks, always copy"
07432cef 11775msgstr "不使用本地硬链接,始终复制"
ef317cd5 11776
ddc12c42 11777#: builtin/clone.c:104
ef317cd5 11778msgid "setup as shared repository"
160fb2b2 11779msgstr "设置为共享仓库"
ef317cd5 11780
ddc12c42 11781#: builtin/clone.c:107
87cb7997 11782msgid "pathspec"
65e2041e 11783msgstr "路径规格"
87cb7997 11784
ddc12c42 11785#: builtin/clone.c:107
ef317cd5 11786msgid "initialize submodules in the clone"
07432cef 11787msgstr "在克隆时初始化子模组"
ef317cd5 11788
ddc12c42 11789#: builtin/clone.c:110
5b04ee3b
JX
11790msgid "number of submodules cloned in parallel"
11791msgstr "并发克隆的子模组的数量"
11792
ddc12c42 11793#: builtin/clone.c:111 builtin/init-db.c:486
ef317cd5 11794msgid "template-directory"
07432cef 11795msgstr "模板目录"
ef317cd5 11796
ddc12c42 11797#: builtin/clone.c:112 builtin/init-db.c:487
ef317cd5 11798msgid "directory from which templates will be used"
07432cef 11799msgstr "模板目录将被使用"
ef317cd5 11800
2b472aae
JX
11801#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
11802#: builtin/submodule--helper.c:1912
ef317cd5 11803msgid "reference repository"
160fb2b2 11804msgstr "参考仓库"
ef317cd5 11805
2b472aae
JX
11806#: builtin/clone.c:118 builtin/submodule--helper.c:1409
11807#: builtin/submodule--helper.c:1914
7aea43ff 11808msgid "use --reference only while cloning"
160fb2b2 11809msgstr "仅在克隆时参考 --reference 指向的本地仓库"
7aea43ff 11810
ddc12c42 11811#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
2b472aae 11812#: builtin/pack-objects.c:3441 builtin/repack.c:327
ef317cd5 11813msgid "name"
07432cef 11814msgstr "名称"
ef317cd5 11815
ddc12c42 11816#: builtin/clone.c:120
ef317cd5 11817msgid "use <name> instead of 'origin' to track upstream"
4375c10e 11818msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
ef317cd5 11819
ddc12c42 11820#: builtin/clone.c:122
ef317cd5 11821msgid "checkout <branch> instead of the remote's HEAD"
4375c10e 11822msgstr "检出 <分支> 而不是远程 HEAD"
ef317cd5 11823
ddc12c42 11824#: builtin/clone.c:124
ef317cd5 11825msgid "path to git-upload-pack on the remote"
07432cef 11826msgstr "远程 git-upload-pack 路径"
ef317cd5 11827
2b472aae
JX
11828#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
11829#: builtin/pull.c:207
ef317cd5 11830msgid "depth"
07432cef 11831msgstr "深度"
ef317cd5 11832
ddc12c42 11833#: builtin/clone.c:126
ef317cd5 11834msgid "create a shallow clone of that depth"
07432cef 11835msgstr "创建一个指定深度的浅克隆"
ef317cd5 11836
2b472aae 11837#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
a0b6b246
JX
11838msgid "time"
11839msgstr "时间"
11840
ddc12c42 11841#: builtin/clone.c:128
a0b6b246
JX
11842msgid "create a shallow clone since a specific time"
11843msgstr "从一个特定时间创建一个浅克隆"
11844
ddc12c42 11845#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
2b472aae 11846#: builtin/rebase.c:1480
a0b6b246
JX
11847msgid "revision"
11848msgstr "版本"
11849
ddc12c42 11850#: builtin/clone.c:130 builtin/fetch.c:173
1a79b2f1
JX
11851msgid "deepen history of shallow clone, excluding rev"
11852msgstr "深化浅克隆的历史,除了特定版本"
a0b6b246 11853
2b472aae
JX
11854#: builtin/clone.c:132 builtin/submodule--helper.c:1419
11855#: builtin/submodule--helper.c:1928
ef317cd5 11856msgid "clone only one branch, HEAD or --branch"
07432cef 11857msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 11858
ddc12c42 11859#: builtin/clone.c:134
a4f16749
JX
11860msgid "don't clone any tags, and make later fetches not to follow them"
11861msgstr "不要克隆任何标签,并且后续获取操作也不下载它们"
11862
ddc12c42 11863#: builtin/clone.c:136
5b04ee3b
JX
11864msgid "any cloned submodules will be shallow"
11865msgstr "子模组将以浅下载模式克隆"
11866
ddc12c42 11867#: builtin/clone.c:137 builtin/init-db.c:495
ef317cd5 11868msgid "gitdir"
07432cef 11869msgstr "git目录"
ef317cd5 11870
ddc12c42 11871#: builtin/clone.c:138 builtin/init-db.c:496
ef317cd5 11872msgid "separate git dir from working tree"
07432cef 11873msgstr "git目录和工作区分离"
ef317cd5 11874
ddc12c42 11875#: builtin/clone.c:139
ef317cd5 11876msgid "key=value"
07432cef 11877msgstr "key=value"
ef317cd5 11878
ddc12c42 11879#: builtin/clone.c:140
ef317cd5 11880msgid "set config inside the new repository"
160fb2b2 11881msgstr "在新仓库中设置配置信息"
ef317cd5 11882
ddc12c42
JX
11883#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
11884#: builtin/push.c:573 builtin/send-pack.c:172
d46c5519
JX
11885msgid "server-specific"
11886msgstr "server-specific"
11887
ddc12c42
JX
11888#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
11889#: builtin/push.c:573 builtin/send-pack.c:173
d46c5519
JX
11890msgid "option to transmit"
11891msgstr "传输选项"
11892
2b472aae 11893#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
ddc12c42 11894#: builtin/push.c:574
276ceeaa
JX
11895msgid "use IPv4 addresses only"
11896msgstr "只使用 IPv4 地址"
11897
2b472aae 11898#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
ddc12c42 11899#: builtin/push.c:576
276ceeaa
JX
11900msgid "use IPv6 addresses only"
11901msgstr "只使用 IPv6 地址"
11902
ddc12c42 11903#: builtin/clone.c:149
a6cd2cc4
JX
11904msgid "any cloned submodules will use their remote-tracking branch"
11905msgstr "任何克隆的子模组将使用它们的远程跟踪分支"
11906
ddc12c42
JX
11907#: builtin/clone.c:151
11908msgid "initialize sparse-checkout file to include only files at root"
11909msgstr "初始化稀疏检出文件,只包含根目录文件"
11910
11911#: builtin/clone.c:287
3495628d
JX
11912msgid ""
11913"No directory name could be guessed.\n"
11914"Please specify a directory on the command line"
11915msgstr ""
11916"无法猜到目录名。\n"
26e4cbec 11917"请在命令行指定一个目录"
3495628d 11918
ddc12c42 11919#: builtin/clone.c:340
cfff71a9 11920#, c-format
a0b6b246
JX
11921msgid "info: Could not add alternate for '%s': %s\n"
11922msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
cfff71a9 11923
ddc12c42 11924#: builtin/clone.c:413
c04f5ac3
JX
11925#, c-format
11926msgid "%s exists and is not a directory"
11927msgstr "%s 存在且不是一个目录"
11928
ddc12c42 11929#: builtin/clone.c:430
c04f5ac3 11930#, c-format
a6cd2cc4
JX
11931msgid "failed to start iterator over '%s'"
11932msgstr "无法在 '%s' 上启动迭代器"
c04f5ac3 11933
ddc12c42 11934#: builtin/clone.c:460
c04f5ac3
JX
11935#, c-format
11936msgid "failed to create link '%s'"
c1ac5258 11937msgstr "创建链接 '%s' 失败"
c04f5ac3 11938
ddc12c42 11939#: builtin/clone.c:464
c04f5ac3
JX
11940#, c-format
11941msgid "failed to copy file to '%s'"
c1ac5258 11942msgstr "拷贝文件至 '%s' 失败"
c04f5ac3 11943
ddc12c42 11944#: builtin/clone.c:469
a6cd2cc4
JX
11945#, c-format
11946msgid "failed to iterate over '%s'"
11947msgstr "无法在 '%s' 上迭代"
11948
ddc12c42 11949#: builtin/clone.c:494
c04f5ac3
JX
11950#, c-format
11951msgid "done.\n"
11952msgstr "完成。\n"
11953
ddc12c42 11954#: builtin/clone.c:508
1003b3a5
JX
11955msgid ""
11956"Clone succeeded, but checkout failed.\n"
11957"You can inspect what was checked out with 'git status'\n"
a6cd2cc4 11958"and retry with 'git restore --source=HEAD :/'\n"
1003b3a5
JX
11959msgstr ""
11960"克隆成功,但是检出失败。\n"
11961"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
a6cd2cc4 11962"'git restore --source=HEAD :/' 重试\n"
1003b3a5 11963
ddc12c42 11964#: builtin/clone.c:585
c04f5ac3
JX
11965#, c-format
11966msgid "Could not find remote branch %s to clone."
90e6ef53 11967msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 11968
2b472aae 11969#: builtin/clone.c:705
3495628d
JX
11970#, c-format
11971msgid "unable to update %s"
11972msgstr "不能更新 %s"
11973
2b472aae 11974#: builtin/clone.c:753
ddc12c42
JX
11975msgid "failed to initialize sparse-checkout"
11976msgstr "无法初始化稀疏检出"
11977
2b472aae 11978#: builtin/clone.c:776
c04f5ac3
JX
11979msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
11980msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
11981
2b472aae 11982#: builtin/clone.c:807
1003b3a5
JX
11983msgid "unable to checkout working tree"
11984msgstr "不能检出工作区"
11985
2b472aae 11986#: builtin/clone.c:862
3495628d
JX
11987msgid "unable to write parameters to config file"
11988msgstr "无法将参数写入配置文件"
11989
2b472aae 11990#: builtin/clone.c:925
04cb2f28
JX
11991msgid "cannot repack to clean up"
11992msgstr "无法执行 repack 来清理"
11993
2b472aae 11994#: builtin/clone.c:927
04cb2f28
JX
11995msgid "cannot unlink temporary alternates file"
11996msgstr "无法删除临时的 alternates 文件"
11997
2b472aae 11998#: builtin/clone.c:965 builtin/receive-pack.c:1950
c04f5ac3
JX
11999msgid "Too many arguments."
12000msgstr "太多参数。"
12001
2b472aae 12002#: builtin/clone.c:969
c04f5ac3 12003msgid "You must specify a repository to clone."
160fb2b2 12004msgstr "您必须指定一个仓库来克隆。"
c04f5ac3 12005
2b472aae 12006#: builtin/clone.c:982
c04f5ac3
JX
12007#, c-format
12008msgid "--bare and --origin %s options are incompatible."
12009msgstr "--bare 和 --origin %s 选项不兼容。"
12010
2b472aae 12011#: builtin/clone.c:985
07432cef
WS
12012msgid "--bare and --separate-git-dir are incompatible."
12013msgstr "--bare 和 --separate-git-dir 选项不兼容。"
12014
2b472aae 12015#: builtin/clone.c:998
c04f5ac3
JX
12016#, c-format
12017msgid "repository '%s' does not exist"
160fb2b2 12018msgstr "仓库 '%s' 不存在"
c04f5ac3 12019
2b472aae 12020#: builtin/clone.c:1004 builtin/fetch.c:1796
cfff71a9
JX
12021#, c-format
12022msgid "depth %s is not a positive number"
12023msgstr "深度 %s 不是一个正数"
12024
2b472aae 12025#: builtin/clone.c:1014
c04f5ac3
JX
12026#, c-format
12027msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 12028msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 12029
2b472aae 12030#: builtin/clone.c:1024
c04f5ac3
JX
12031#, c-format
12032msgid "working tree '%s' already exists."
12033msgstr "工作区 '%s' 已经存在。"
12034
2b472aae
JX
12035#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
12036#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
5bb01d4f
JX
12037#, c-format
12038msgid "could not create leading directories of '%s'"
12039msgstr "不能为 '%s' 创建先导目录"
12040
2b472aae 12041#: builtin/clone.c:1044
c04f5ac3 12042#, c-format
814ff314
JX
12043msgid "could not create work tree dir '%s'"
12044msgstr "不能创建工作区目录 '%s'"
c04f5ac3 12045
2b472aae 12046#: builtin/clone.c:1064
c04f5ac3
JX
12047#, c-format
12048msgid "Cloning into bare repository '%s'...\n"
160fb2b2 12049msgstr "克隆到纯仓库 '%s'...\n"
c04f5ac3 12050
2b472aae 12051#: builtin/clone.c:1066
c04f5ac3
JX
12052#, c-format
12053msgid "Cloning into '%s'...\n"
12054msgstr "正克隆到 '%s'...\n"
12055
2b472aae 12056#: builtin/clone.c:1090
a0b6b246
JX
12057msgid ""
12058"clone --recursive is not compatible with both --reference and --reference-if-"
12059"able"
12060msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
12061
2b472aae 12062#: builtin/clone.c:1154
6acbf033 12063msgid "--depth is ignored in local clones; use file:// instead."
a0b6b246
JX
12064msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
12065
2b472aae 12066#: builtin/clone.c:1156
a0b6b246
JX
12067msgid "--shallow-since is ignored in local clones; use file:// instead."
12068msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
6acbf033 12069
2b472aae 12070#: builtin/clone.c:1158
a0b6b246
JX
12071msgid "--shallow-exclude is ignored in local clones; use file:// instead."
12072msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
12073
2b472aae 12074#: builtin/clone.c:1160
31e5e17b
JX
12075msgid "--filter is ignored in local clones; use file:// instead."
12076msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。"
12077
2b472aae 12078#: builtin/clone.c:1163
6acbf033 12079msgid "source repository is shallow, ignoring --local"
160fb2b2 12080msgstr "源仓库是浅克隆,忽略 --local"
6acbf033 12081
2b472aae 12082#: builtin/clone.c:1168
6acbf033
JX
12083msgid "--local is ignored"
12084msgstr "--local 被忽略"
12085
2b472aae 12086#: builtin/clone.c:1243 builtin/clone.c:1251
c04f5ac3
JX
12087#, c-format
12088msgid "Remote branch %s not found in upstream %s"
12089msgstr "远程分支 %s 在上游 %s 未发现"
12090
2b472aae 12091#: builtin/clone.c:1254
c04f5ac3 12092msgid "You appear to have cloned an empty repository."
160fb2b2 12093msgstr "您似乎克隆了一个空仓库。"
c04f5ac3 12094
a4f16749 12095#: builtin/column.c:10
814ff314
JX
12096msgid "git column [<options>]"
12097msgstr "git column [<选项>]"
ef317cd5 12098
a4f16749 12099#: builtin/column.c:27
ef317cd5 12100msgid "lookup config vars"
07432cef 12101msgstr "查找配置变量"
ef317cd5 12102
a4f16749 12103#: builtin/column.c:28 builtin/column.c:29
ef317cd5 12104msgid "layout to use"
07432cef 12105msgstr "要使用的布局"
ef317cd5 12106
a4f16749 12107#: builtin/column.c:30
ef317cd5 12108msgid "Maximum width"
07432cef 12109msgstr "最大宽度"
ef317cd5 12110
a4f16749 12111#: builtin/column.c:31
ef317cd5 12112msgid "Padding space on left border"
07432cef 12113msgstr "左边框的填充空间"
ef317cd5 12114
a4f16749 12115#: builtin/column.c:32
ef317cd5 12116msgid "Padding space on right border"
07432cef 12117msgstr "右边框的填充空间"
ef317cd5 12118
a4f16749 12119#: builtin/column.c:33
ef317cd5 12120msgid "Padding space between columns"
07432cef 12121msgstr "两列之间的填充空间"
ef317cd5 12122
fd8cb379 12123#: builtin/column.c:51
8ada9598 12124msgid "--command must be the first argument"
81809b99 12125msgstr "--command 必须是第一个参数"
8ada9598 12126
d46c5519
JX
12127#: builtin/commit-tree.c:18
12128msgid ""
12129"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
12130"<file>)...] <tree>"
12131msgstr ""
12132"git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件"
12133">)...] <树>"
12134
12135#: builtin/commit-tree.c:31
12136#, c-format
12137msgid "duplicate parent %s ignored"
12138msgstr "忽略重复的父提交 %s"
12139
ddc12c42 12140#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
d46c5519
JX
12141#, c-format
12142msgid "not a valid object name %s"
12143msgstr "不是一个有效的对象名 %s"
12144
12145#: builtin/commit-tree.c:93
12146#, c-format
12147msgid "git commit-tree: failed to open '%s'"
12148msgstr "git commit-tree:无法打开 '%s'"
12149
12150#: builtin/commit-tree.c:96
12151#, c-format
12152msgid "git commit-tree: failed to read '%s'"
12153msgstr "git commit-tree:无法读取 '%s'"
12154
12155#: builtin/commit-tree.c:98
12156#, c-format
12157msgid "git commit-tree: failed to close '%s'"
12158msgstr "git commit-tree:无法关闭 '%s'"
12159
12160#: builtin/commit-tree.c:111
12161msgid "parent"
12162msgstr "父提交"
12163
12164#: builtin/commit-tree.c:112
12165msgid "id of a parent commit object"
5b533632 12166msgstr "父提交对象 ID"
d46c5519 12167
2b472aae
JX
12168#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
12169#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
a6cd2cc4 12170#: builtin/tag.c:412
d46c5519
JX
12171msgid "message"
12172msgstr "说明"
12173
2b472aae 12174#: builtin/commit-tree.c:115 builtin/commit.c:1501
d46c5519
JX
12175msgid "commit message"
12176msgstr "提交说明"
12177
12178#: builtin/commit-tree.c:118
12179msgid "read commit log message from file"
12180msgstr "从文件中读取提交说明"
12181
2b472aae
JX
12182#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
12183#: builtin/pull.c:175 builtin/revert.c:118
d46c5519
JX
12184msgid "GPG sign commit"
12185msgstr "GPG 提交签名"
12186
12187#: builtin/commit-tree.c:133
12188msgid "must give exactly one tree"
12189msgstr "必须精确地提供一个树"
12190
12191#: builtin/commit-tree.c:140
12192msgid "git commit-tree: failed to read"
12193msgstr "git commit-tree:读取失败"
12194
06991777 12195#: builtin/commit.c:41
814ff314 12196msgid "git commit [<options>] [--] <pathspec>..."
160fb2b2 12197msgstr "git commit [<选项>] [--] <路径规格>..."
ef317cd5 12198
06991777 12199#: builtin/commit.c:46
814ff314 12200msgid "git status [<options>] [--] <pathspec>..."
160fb2b2 12201msgstr "git status [<选项>] [--] <路径规格>..."
ef317cd5 12202
06991777 12203#: builtin/commit.c:51
c04f5ac3
JX
12204msgid ""
12205"You asked to amend the most recent commit, but doing so would make\n"
12206"it empty. You can repeat your command with --allow-empty, or you can\n"
12207"remove the commit entirely with \"git reset HEAD^\".\n"
12208msgstr ""
1b150dc9
T
12209"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
12210"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 12211
06991777 12212#: builtin/commit.c:56
c04f5ac3
JX
12213msgid ""
12214"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
12215"If you wish to commit it anyway, use:\n"
12216"\n"
12217" git commit --allow-empty\n"
12218"\n"
c04f5ac3 12219msgstr ""
a9ce4543
T
12220"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
12221"也要提交,使用命令:\n"
c04f5ac3
JX
12222"\n"
12223" git commit --allow-empty\n"
12224"\n"
c04f5ac3 12225
06991777 12226#: builtin/commit.c:63
a6cd2cc4
JX
12227msgid "Otherwise, please use 'git cherry-pick --skip'\n"
12228msgstr "否则,请使用 'git cherry-pick --skip'\n"
b1894384 12229
06991777 12230#: builtin/commit.c:66
b1894384 12231msgid ""
a6cd2cc4
JX
12232"and then use:\n"
12233"\n"
12234" git cherry-pick --continue\n"
12235"\n"
12236"to resume cherry-picking the remaining commits.\n"
b1894384
JX
12237"If you wish to skip this commit, use:\n"
12238"\n"
a6cd2cc4 12239" git cherry-pick --skip\n"
b1894384 12240"\n"
b1894384 12241msgstr ""
a6cd2cc4
JX
12242"然后使用:\n"
12243"\n"
12244" git cherry-pick --continue\n"
b1894384 12245"\n"
a6cd2cc4
JX
12246"来继续拣选剩余提交。如果您想跳过此提交,使用:\n"
12247"\n"
12248" git cherry-pick --skip\n"
b1894384 12249"\n"
b1894384 12250
a6cd2cc4 12251#: builtin/commit.c:315
c04f5ac3 12252msgid "failed to unpack HEAD tree object"
c1ac5258 12253msgstr "解包 HEAD 树对象失败"
c04f5ac3 12254
ddc12c42
JX
12255#: builtin/commit.c:351
12256msgid "--pathspec-from-file with -a does not make sense"
12257msgstr "--pathspec-from-file 和 -a 在一起没有意义"
12258
12259#: builtin/commit.c:364
12260msgid "No paths with --include/--only does not make sense."
12261msgstr "参数 --include/--only 不跟路径没有意义。"
12262
12263#: builtin/commit.c:376
c04f5ac3 12264msgid "unable to create temporary index"
90e6ef53 12265msgstr "不能创建临时索引"
c04f5ac3 12266
2b472aae 12267#: builtin/commit.c:385
c04f5ac3
JX
12268msgid "interactive add failed"
12269msgstr "交互式添加失败"
12270
2b472aae 12271#: builtin/commit.c:400
220c313c
JX
12272msgid "unable to update temporary index"
12273msgstr "无法更新临时索引"
12274
2b472aae 12275#: builtin/commit.c:402
220c313c
JX
12276msgid "Failed to update main cache tree"
12277msgstr "不能更新树的主缓存"
12278
2b472aae 12279#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
c04f5ac3 12280msgid "unable to write new_index file"
90e6ef53 12281msgstr "无法写 new_index 文件"
c04f5ac3 12282
2b472aae 12283#: builtin/commit.c:479
8ada9598 12284msgid "cannot do a partial commit during a merge."
81809b99 12285msgstr "在合并过程中不能做部分提交。"
c04f5ac3 12286
2b472aae 12287#: builtin/commit.c:481
8ada9598 12288msgid "cannot do a partial commit during a cherry-pick."
81809b99 12289msgstr "在拣选过程中不能做部分提交。"
8ada9598 12290
2b472aae 12291#: builtin/commit.c:489
c04f5ac3 12292msgid "cannot read the index"
90e6ef53 12293msgstr "无法读取索引"
c04f5ac3 12294
2b472aae 12295#: builtin/commit.c:508
c04f5ac3 12296msgid "unable to write temporary index file"
90e6ef53 12297msgstr "无法写临时索引文件"
c04f5ac3 12298
2b472aae 12299#: builtin/commit.c:606
220c313c
JX
12300#, c-format
12301msgid "commit '%s' lacks author header"
12302msgstr "提交 '%s' 缺少作者信息"
12303
2b472aae 12304#: builtin/commit.c:608
c04f5ac3 12305#, c-format
220c313c 12306msgid "commit '%s' has malformed author line"
fd8cb379 12307msgstr "提交 '%s' 有格式错误的作者信息"
c04f5ac3 12308
2b472aae 12309#: builtin/commit.c:627
c04f5ac3 12310msgid "malformed --author parameter"
fd8cb379 12311msgstr "格式错误的 --author 参数"
c04f5ac3 12312
2b472aae 12313#: builtin/commit.c:680
6acbf033
JX
12314msgid ""
12315"unable to select a comment character that is not used\n"
12316"in the current commit message"
12317msgstr "无法选择一个未被当前提交说明使用的注释字符"
12318
2b472aae 12319#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
c04f5ac3
JX
12320#, c-format
12321msgid "could not lookup commit %s"
12322msgstr "不能查询提交 %s"
12323
2b472aae 12324#: builtin/commit.c:730 builtin/shortlog.c:319
c04f5ac3
JX
12325#, c-format
12326msgid "(reading log message from standard input)\n"
90e6ef53 12327msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 12328
2b472aae 12329#: builtin/commit.c:732
c04f5ac3 12330msgid "could not read log from standard input"
90e6ef53 12331msgstr "不能从标准输入中读取日志信息"
c04f5ac3 12332
2b472aae 12333#: builtin/commit.c:736
c04f5ac3
JX
12334#, c-format
12335msgid "could not read log file '%s'"
90e6ef53 12336msgstr "不能读取日志文件 '%s'"
c04f5ac3 12337
2b472aae 12338#: builtin/commit.c:767 builtin/commit.c:783
c04f5ac3 12339msgid "could not read SQUASH_MSG"
90e6ef53 12340msgstr "不能读取 SQUASH_MSG"
c04f5ac3 12341
2b472aae 12342#: builtin/commit.c:774
5b04ee3b
JX
12343msgid "could not read MERGE_MSG"
12344msgstr "不能读取 MERGE_MSG"
12345
2b472aae 12346#: builtin/commit.c:834
c04f5ac3 12347msgid "could not write commit template"
90e6ef53 12348msgstr "不能写提交模版"
c04f5ac3 12349
2b472aae 12350#: builtin/commit.c:853
81809b99 12351#, c-format
c04f5ac3
JX
12352msgid ""
12353"\n"
8ada9598 12354"It looks like you may be committing a merge.\n"
c04f5ac3
JX
12355"If this is not correct, please remove the file\n"
12356"\t%s\n"
12357"and try again.\n"
12358msgstr ""
12359"\n"
649900bc 12360"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
12361"\t%s\n"
12362"然后重试。\n"
12363
2b472aae 12364#: builtin/commit.c:858
81809b99 12365#, c-format
8ada9598
JX
12366msgid ""
12367"\n"
12368"It looks like you may be committing a cherry-pick.\n"
12369"If this is not correct, please remove the file\n"
12370"\t%s\n"
12371"and try again.\n"
12372msgstr ""
12373"\n"
649900bc 12374"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
12375"\t%s\n"
12376"然后重试。\n"
c04f5ac3 12377
2b472aae 12378#: builtin/commit.c:871
a77c07d9 12379#, c-format
c04f5ac3 12380msgid ""
8ada9598 12381"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 12382"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 12383msgstr ""
a77c07d9 12384"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 12385"说明将会终止提交。\n"
c04f5ac3 12386
2b472aae 12387#: builtin/commit.c:879
a77c07d9 12388#, c-format
c04f5ac3 12389msgid ""
8ada9598 12390"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 12391"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
12392"An empty message aborts the commit.\n"
12393msgstr ""
a77c07d9
JX
12394"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
12395"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 12396
90e6ef53 12397# 译者:为保证在输出中对齐,注意调整句中空格!
2b472aae 12398#: builtin/commit.c:896
6acbf033
JX
12399#, c-format
12400msgid "%sAuthor: %.*s <%.*s>"
12401msgstr "%s作者: %.*s <%.*s>"
12402
12403# 译者:为保证在输出中对齐,注意调整句中空格!
2b472aae 12404#: builtin/commit.c:904
c04f5ac3 12405#, c-format
6acbf033
JX
12406msgid "%sDate: %s"
12407msgstr "%s日期: %s"
c04f5ac3 12408
90e6ef53 12409# 译者:为保证在输出中对齐,注意调整句中空格!
2b472aae 12410#: builtin/commit.c:911
c04f5ac3 12411#, c-format
6acbf033
JX
12412msgid "%sCommitter: %.*s <%.*s>"
12413msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 12414
2b472aae 12415#: builtin/commit.c:929
c04f5ac3 12416msgid "Cannot read index"
90e6ef53 12417msgstr "无法读取索引"
c04f5ac3 12418
2b472aae 12419#: builtin/commit.c:997
c04f5ac3
JX
12420msgid "Error building trees"
12421msgstr "无法创建树对象"
12422
2b472aae 12423#: builtin/commit.c:1011 builtin/tag.c:275
c04f5ac3
JX
12424#, c-format
12425msgid "Please supply the message using either -m or -F option.\n"
07432cef 12426msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 12427
2b472aae 12428#: builtin/commit.c:1055
c04f5ac3 12429#, c-format
814ff314 12430msgid "--author '%s' is not 'Name <email>' and matches no existing author"
58b6f078 12431msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配"
c04f5ac3 12432
2b472aae 12433#: builtin/commit.c:1069
5809aa05
JX
12434#, c-format
12435msgid "Invalid ignored mode '%s'"
12436msgstr "无效的忽略模式 '%s'"
12437
2b472aae 12438#: builtin/commit.c:1087 builtin/commit.c:1327
c04f5ac3
JX
12439#, c-format
12440msgid "Invalid untracked files mode '%s'"
90e6ef53 12441msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 12442
2b472aae 12443#: builtin/commit.c:1127
2e8451e8
JX
12444msgid "--long and -z are incompatible"
12445msgstr "--long 和 -z 选项不兼容"
12446
2b472aae 12447#: builtin/commit.c:1171
c04f5ac3
JX
12448msgid "Using both --reset-author and --author does not make sense"
12449msgstr "同时使用 --reset-author 和 --author 没有意义"
12450
2b472aae 12451#: builtin/commit.c:1180
c04f5ac3 12452msgid "You have nothing to amend."
90e6ef53 12453msgstr "您没有可修补的提交。"
c04f5ac3 12454
2b472aae 12455#: builtin/commit.c:1183
8ada9598 12456msgid "You are in the middle of a merge -- cannot amend."
81809b99 12457msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 12458
2b472aae 12459#: builtin/commit.c:1185
8ada9598 12460msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 12461msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 12462
2b472aae 12463#: builtin/commit.c:1188
c04f5ac3 12464msgid "Options --squash and --fixup cannot be used together"
649900bc 12465msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 12466
2b472aae 12467#: builtin/commit.c:1198
c04f5ac3
JX
12468msgid "Only one of -c/-C/-F/--fixup can be used."
12469msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
12470
2b472aae 12471#: builtin/commit.c:1200
31e5e17b
JX
12472msgid "Option -m cannot be combined with -c/-C/-F."
12473msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
c04f5ac3 12474
2b472aae 12475#: builtin/commit.c:1208
c04f5ac3 12476msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 12477msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 12478
2b472aae 12479#: builtin/commit.c:1225
c04f5ac3
JX
12480msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
12481msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
12482
2b472aae 12483#: builtin/commit.c:1231
c04f5ac3 12484#, c-format
d46c5519
JX
12485msgid "paths '%s ...' with -a does not make sense"
12486msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"
c04f5ac3 12487
2b472aae 12488#: builtin/commit.c:1362 builtin/commit.c:1524
ef317cd5 12489msgid "show status concisely"
07432cef 12490msgstr "以简洁的格式显示状态"
ef317cd5 12491
2b472aae 12492#: builtin/commit.c:1364 builtin/commit.c:1526
ef317cd5 12493msgid "show branch information"
07432cef 12494msgstr "显示分支信息"
ef317cd5 12495
2b472aae 12496#: builtin/commit.c:1366
a4f16749
JX
12497msgid "show stash information"
12498msgstr "显示贮藏区信息"
12499
2b472aae 12500#: builtin/commit.c:1368 builtin/commit.c:1528
31e5e17b
JX
12501msgid "compute full ahead/behind values"
12502msgstr "计算完整的领先/落后值"
12503
2b472aae 12504#: builtin/commit.c:1370
a0b6b246
JX
12505msgid "version"
12506msgstr "版本"
12507
2b472aae
JX
12508#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
12509#: builtin/worktree.c:643
ef317cd5 12510msgid "machine-readable output"
07432cef
WS
12511msgstr "机器可读的输出"
12512
2b472aae 12513#: builtin/commit.c:1373 builtin/commit.c:1532
07432cef
WS
12514msgid "show status in long format (default)"
12515msgstr "以长格式显示状态(默认)"
ef317cd5 12516
2b472aae 12517#: builtin/commit.c:1376 builtin/commit.c:1535
ef317cd5 12518msgid "terminate entries with NUL"
4375c10e 12519msgstr "条目以 NUL 字符结尾"
ef317cd5 12520
2b472aae 12521#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
a5cd71ca 12522#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
2b472aae 12523#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
ef317cd5 12524msgid "mode"
07432cef 12525msgstr "模式"
ef317cd5 12526
2b472aae 12527#: builtin/commit.c:1379 builtin/commit.c:1538
ef317cd5 12528msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 12529msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 12530
2b472aae 12531#: builtin/commit.c:1383
5809aa05
JX
12532msgid ""
12533"show ignored files, optional modes: traditional, matching, no. (Default: "
12534"traditional)"
31e5e17b
JX
12535msgstr ""
12536"显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)"
ef317cd5 12537
2b472aae 12538#: builtin/commit.c:1385 parse-options.h:192
ef317cd5
JX
12539msgid "when"
12540msgstr "何时"
12541
2b472aae 12542#: builtin/commit.c:1386
ef317cd5
JX
12543msgid ""
12544"ignore changes to submodules, optional when: all, dirty, untracked. "
12545"(Default: all)"
12546msgstr ""
07432cef 12547"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 12548
2b472aae 12549#: builtin/commit.c:1388
ef317cd5 12550msgid "list untracked files in columns"
07432cef 12551msgstr "以列的方式显示未跟踪的文件"
ef317cd5 12552
2b472aae 12553#: builtin/commit.c:1389
fd8cb379
JX
12554msgid "do not detect renames"
12555msgstr "不检测重命名"
12556
2b472aae 12557#: builtin/commit.c:1391
fd8cb379
JX
12558msgid "detect renames, optionally set similarity index"
12559msgstr "检测重命名,可以设置索引相似度"
12560
2b472aae 12561#: builtin/commit.c:1411
5809aa05
JX
12562msgid "Unsupported combination of ignored and untracked-files arguments"
12563msgstr "不支持已忽略和未跟踪文件参数的组合"
12564
2b472aae 12565#: builtin/commit.c:1494
ef317cd5 12566msgid "suppress summary after successful commit"
07432cef 12567msgstr "提交成功后不显示概述信息"
c04f5ac3 12568
2b472aae 12569#: builtin/commit.c:1495
ef317cd5 12570msgid "show diff in commit message template"
07432cef 12571msgstr "在提交说明模板里显示差异"
c04f5ac3 12572
2b472aae 12573#: builtin/commit.c:1497
ef317cd5 12574msgid "Commit message options"
07432cef 12575msgstr "提交说明选项"
c04f5ac3 12576
2b472aae 12577#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
ef317cd5 12578msgid "read message from file"
07432cef 12579msgstr "从文件中读取提交说明"
c04f5ac3 12580
2b472aae 12581#: builtin/commit.c:1499
ef317cd5 12582msgid "author"
07432cef 12583msgstr "作者"
c04f5ac3 12584
2b472aae 12585#: builtin/commit.c:1499
ef317cd5 12586msgid "override author for commit"
07432cef 12587msgstr "提交时覆盖作者"
73a60cd2 12588
2b472aae 12589#: builtin/commit.c:1500 builtin/gc.c:538
ef317cd5 12590msgid "date"
07432cef 12591msgstr "日期"
c04f5ac3 12592
2b472aae 12593#: builtin/commit.c:1500
ef317cd5 12594msgid "override date for commit"
07432cef 12595msgstr "提交时覆盖日期"
c04f5ac3 12596
2b472aae
JX
12597#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
12598#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
94550ed3
JX
12599msgid "commit"
12600msgstr "提交"
12601
2b472aae 12602#: builtin/commit.c:1502
ef317cd5 12603msgid "reuse and edit message from specified commit"
07432cef 12604msgstr "重用并编辑指定提交的提交说明"
ef317cd5 12605
2b472aae 12606#: builtin/commit.c:1503
ef317cd5 12607msgid "reuse message from specified commit"
07432cef 12608msgstr "重用指定提交的提交说明"
ef317cd5 12609
2b472aae 12610#: builtin/commit.c:1504
ef317cd5 12611msgid "use autosquash formatted message to fixup specified commit"
07432cef 12612msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 12613
2b472aae 12614#: builtin/commit.c:1505
ef317cd5 12615msgid "use autosquash formatted message to squash specified commit"
07432cef 12616msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 12617
2b472aae 12618#: builtin/commit.c:1506
ef317cd5 12619msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 12620msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 12621
2b472aae
JX
12622#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
12623#: builtin/pull.c:144 builtin/revert.c:110
ef317cd5 12624msgid "add Signed-off-by:"
07432cef 12625msgstr "添加 Signed-off-by: 签名"
ef317cd5 12626
2b472aae 12627#: builtin/commit.c:1508
ef317cd5 12628msgid "use specified template file"
07432cef 12629msgstr "使用指定的模板文件"
ef317cd5 12630
2b472aae 12631#: builtin/commit.c:1509
ef317cd5 12632msgid "force edit of commit"
07432cef 12633msgstr "强制编辑提交"
ef317cd5 12634
2b472aae 12635#: builtin/commit.c:1511
ef317cd5 12636msgid "include status in commit message template"
07432cef 12637msgstr "在提交说明模板里包含状态信息"
ef317cd5 12638
2b472aae 12639#: builtin/commit.c:1516
ef317cd5 12640msgid "Commit contents options"
07432cef 12641msgstr "提交内容选项"
ef317cd5 12642
2b472aae 12643#: builtin/commit.c:1517
ef317cd5 12644msgid "commit all changed files"
07432cef 12645msgstr "提交所有改动的文件"
ef317cd5 12646
2b472aae 12647#: builtin/commit.c:1518
ef317cd5 12648msgid "add specified files to index for commit"
07432cef 12649msgstr "添加指定的文件到索引区等待提交"
ef317cd5 12650
2b472aae 12651#: builtin/commit.c:1519
ef317cd5 12652msgid "interactively add files"
07432cef 12653msgstr "交互式添加文件"
ef317cd5 12654
2b472aae 12655#: builtin/commit.c:1520
ef317cd5 12656msgid "interactively add changes"
07432cef 12657msgstr "交互式添加变更"
ef317cd5 12658
2b472aae 12659#: builtin/commit.c:1521
ef317cd5 12660msgid "commit only specified files"
07432cef 12661msgstr "只提交指定的文件"
ef317cd5 12662
2b472aae 12663#: builtin/commit.c:1522
5c57d762
JX
12664msgid "bypass pre-commit and commit-msg hooks"
12665msgstr "绕过 pre-commit 和 commit-msg 钩子"
12666
2b472aae 12667#: builtin/commit.c:1523
ef317cd5 12668msgid "show what would be committed"
07432cef 12669msgstr "显示将要提交的内容"
ef317cd5 12670
2b472aae 12671#: builtin/commit.c:1536
ef317cd5 12672msgid "amend previous commit"
07432cef 12673msgstr "修改先前的提交"
ef317cd5 12674
2b472aae 12675#: builtin/commit.c:1537
ef317cd5 12676msgid "bypass post-rewrite hook"
07432cef 12677msgstr "绕过 post-rewrite 钩子"
ef317cd5 12678
2b472aae 12679#: builtin/commit.c:1544
ef317cd5 12680msgid "ok to record an empty change"
07432cef 12681msgstr "允许一个空提交"
ef317cd5 12682
2b472aae 12683#: builtin/commit.c:1546
ef317cd5 12684msgid "ok to record a change with an empty message"
07432cef 12685msgstr "允许空的提交说明"
ef317cd5 12686
2b472aae 12687#: builtin/commit.c:1619
c04f5ac3
JX
12688#, c-format
12689msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 12690msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 12691
2b472aae 12692#: builtin/commit.c:1626
c04f5ac3 12693msgid "could not read MERGE_MODE"
90e6ef53 12694msgstr "不能读取 MERGE_MODE"
c04f5ac3 12695
2b472aae 12696#: builtin/commit.c:1645
c04f5ac3
JX
12697#, c-format
12698msgid "could not read commit message: %s"
90e6ef53 12699msgstr "不能读取提交说明:%s"
c04f5ac3 12700
2b472aae 12701#: builtin/commit.c:1652
c04f5ac3
JX
12702#, c-format
12703msgid "Aborting commit due to empty commit message.\n"
12704msgstr "终止提交因为提交说明为空。\n"
12705
2b472aae 12706#: builtin/commit.c:1657
6937cb4e
JX
12707#, c-format
12708msgid "Aborting commit; you did not edit the message.\n"
12709msgstr "终止提交;您未更改来自模版的提交说明。\n"
12710
2b472aae 12711#: builtin/commit.c:1691
c04f5ac3 12712msgid ""
c1ac5258 12713"repository has been updated, but unable to write\n"
220c313c 12714"new_index file. Check that disk is not full and quota is\n"
a6cd2cc4 12715"not exceeded, and then \"git restore --staged :/\" to recover."
c04f5ac3 12716msgstr ""
a6cd2cc4
JX
12717"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满或\n"
12718"磁盘配额已耗尽,然后执行 \"git restore --staged :/\" 恢复。"
c04f5ac3 12719
ddc12c42 12720#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
a5cd71ca
JX
12721msgid ""
12722"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
12723msgstr ""
12724"git commit-graph verify [--object-dir <对象目录>] [--shallow] [--"
12725"[no-]progress]"
c1ac5258 12726
ddc12c42 12727#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
fd8cb379 12728msgid ""
a6cd2cc4 12729"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
a5cd71ca
JX
12730"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
12731msgstr ""
12732"git commit-graph write [--object-dir <对象目录>] [--append|--split] [--"
12733"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
fd8cb379 12734
2b472aae
JX
12735#: builtin/commit-graph.c:52
12736#, c-format
12737msgid "could not find object directory matching %s"
12738msgstr "无法找到和 %s 匹配的对象目录"
12739
12740#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
12741#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
fd8cb379
JX
12742msgid "dir"
12743msgstr "目录"
12744
2b472aae
JX
12745#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
12746#: builtin/commit-graph.c:211
fd8cb379
JX
12747msgid "The object directory to store the graph"
12748msgstr "保存图形的对象目录"
12749
2b472aae 12750#: builtin/commit-graph.c:71
a6cd2cc4
JX
12751msgid "if the commit-graph is split, only verify the tip file"
12752msgstr "如果提交图形被拆分,只验证头一个文件"
12753
2b472aae 12754#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
d46c5519
JX
12755#, c-format
12756msgid "Could not open commit-graph '%s'"
12757msgstr "无法打开提交图形 '%s'"
12758
2b472aae 12759#: builtin/commit-graph.c:128
c1ac5258
JX
12760msgid "start walk at all refs"
12761msgstr "开始遍历所有引用"
12762
2b472aae 12763#: builtin/commit-graph.c:130
fd8cb379
JX
12764msgid "scan pack-indexes listed by stdin for commits"
12765msgstr "从标准输入中的包索引文件列表中扫描提交"
12766
2b472aae 12767#: builtin/commit-graph.c:132
fd8cb379
JX
12768msgid "start walk at commits listed by stdin"
12769msgstr "从标准输入中的提交开始扫描"
12770
2b472aae 12771#: builtin/commit-graph.c:134
fd8cb379
JX
12772msgid "include all commits already in the commit-graph file"
12773msgstr "包含 commit-graph 文件中已有所有提交"
12774
2b472aae 12775#: builtin/commit-graph.c:137
a6cd2cc4
JX
12776msgid "allow writing an incremental commit-graph file"
12777msgstr "允许写一个增量提交图形文件"
12778
2b472aae 12779#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
a6cd2cc4
JX
12780msgid "maximum number of commits in a non-base split commit-graph"
12781msgstr "在非基本拆分提交图形中的最大提交数"
12782
2b472aae 12783#: builtin/commit-graph.c:141
a6cd2cc4
JX
12784msgid "maximum ratio between two levels of a split commit-graph"
12785msgstr "一个拆分提交图形的两个级别之间的最大比率"
12786
2b472aae 12787#: builtin/commit-graph.c:159
c1ac5258
JX
12788msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
12789msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
fd8cb379 12790
4c27fcb5 12791#: builtin/config.c:11
814ff314
JX
12792msgid "git config [<options>]"
12793msgstr "git config [<选项>]"
ef317cd5 12794
2b472aae 12795#: builtin/config.c:104 builtin/env--helper.c:23
fd8cb379
JX
12796#, c-format
12797msgid "unrecognized --type argument, %s"
12798msgstr "未能识别的 --type 参数,%s"
12799
2b472aae 12800#: builtin/config.c:116
c1ac5258
JX
12801msgid "only one type at a time"
12802msgstr "一次只能一个类型"
12803
2b472aae 12804#: builtin/config.c:125
ef317cd5 12805msgid "Config file location"
07432cef 12806msgstr "配置文件位置"
ef317cd5 12807
2b472aae 12808#: builtin/config.c:126
ef317cd5 12809msgid "use global config file"
07432cef 12810msgstr "使用全局配置文件"
ef317cd5 12811
2b472aae 12812#: builtin/config.c:127
ef317cd5 12813msgid "use system config file"
07432cef 12814msgstr "使用系统级配置文件"
ef317cd5 12815
2b472aae 12816#: builtin/config.c:128
ef317cd5 12817msgid "use repository config file"
160fb2b2 12818msgstr "使用仓库级配置文件"
ef317cd5 12819
2b472aae 12820#: builtin/config.c:129
4c27fcb5
JX
12821msgid "use per-worktree config file"
12822msgstr "使用工作区级别的配置文件"
12823
2b472aae 12824#: builtin/config.c:130
ef317cd5 12825msgid "use given config file"
07432cef 12826msgstr "使用指定的配置文件"
ef317cd5 12827
2b472aae 12828#: builtin/config.c:131
2e8451e8 12829msgid "blob-id"
4375c10e 12830msgstr "数据对象 ID"
2e8451e8 12831
2b472aae 12832#: builtin/config.c:131
2e8451e8
JX
12833msgid "read config from given blob object"
12834msgstr "从给定的数据对象读取配置"
12835
2b472aae 12836#: builtin/config.c:132
ef317cd5 12837msgid "Action"
07432cef 12838msgstr "操作"
ef317cd5 12839
2b472aae 12840#: builtin/config.c:133
ef317cd5 12841msgid "get value: name [value-regex]"
07432cef 12842msgstr "获取值:name [value-regex]"
ef317cd5 12843
2b472aae 12844#: builtin/config.c:134
ef317cd5 12845msgid "get all values: key [value-regex]"
07432cef 12846msgstr "获得所有的值:key [value-regex]"
ef317cd5 12847
2b472aae 12848#: builtin/config.c:135
ef317cd5 12849msgid "get values for regexp: name-regex [value-regex]"
07432cef 12850msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 12851
2b472aae 12852#: builtin/config.c:136
90314792
JX
12853msgid "get value specific for the URL: section[.var] URL"
12854msgstr "获得 URL 取值:section[.var] URL"
12855
2b472aae 12856#: builtin/config.c:137
ef317cd5 12857msgid "replace all matching variables: name value [value_regex]"
07432cef 12858msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 12859
2b472aae 12860#: builtin/config.c:138
ef317cd5 12861msgid "add a new variable: name value"
07432cef 12862msgstr "添加一个新的变量:name value"
ef317cd5 12863
2b472aae 12864#: builtin/config.c:139
ef317cd5 12865msgid "remove a variable: name [value-regex]"
07432cef 12866msgstr "删除一个变量:name [value-regex]"
ef317cd5 12867
2b472aae 12868#: builtin/config.c:140
ef317cd5 12869msgid "remove all matches: name [value-regex]"
07432cef 12870msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 12871
2b472aae 12872#: builtin/config.c:141
ef317cd5 12873msgid "rename section: old-name new-name"
07432cef 12874msgstr "重命名小节:old-name new-name"
ef317cd5 12875
2b472aae 12876#: builtin/config.c:142
ef317cd5 12877msgid "remove a section: name"
07432cef 12878msgstr "删除一个小节:name"
ef317cd5 12879
2b472aae 12880#: builtin/config.c:143
ef317cd5 12881msgid "list all"
07432cef 12882msgstr "列出所有"
ef317cd5 12883
2b472aae 12884#: builtin/config.c:144
ef317cd5 12885msgid "open an editor"
07432cef 12886msgstr "打开一个编辑器"
ef317cd5 12887
2b472aae 12888#: builtin/config.c:145
04cb2f28
JX
12889msgid "find the color configured: slot [default]"
12890msgstr "获得配置的颜色:配置 [默认]"
ef317cd5 12891
2b472aae 12892#: builtin/config.c:146
04cb2f28
JX
12893msgid "find the color setting: slot [stdout-is-tty]"
12894msgstr "获得颜色设置:配置 [stdout-is-tty]"
ef317cd5 12895
2b472aae 12896#: builtin/config.c:147
ef317cd5 12897msgid "Type"
07432cef 12898msgstr "类型"
ef317cd5 12899
2b472aae 12900#: builtin/config.c:148 builtin/env--helper.c:38
fd8cb379
JX
12901msgid "value is given this type"
12902msgstr "取值为该类型"
12903
2b472aae 12904#: builtin/config.c:149
ef317cd5 12905msgid "value is \"true\" or \"false\""
07432cef 12906msgstr "值是 \"true\" 或 \"false\""
ef317cd5 12907
2b472aae 12908#: builtin/config.c:150
ef317cd5 12909msgid "value is decimal number"
07432cef 12910msgstr "值是十进制数"
ef317cd5 12911
2b472aae 12912#: builtin/config.c:151
ef317cd5 12913msgid "value is --bool or --int"
07432cef 12914msgstr "值是 --bool or --int"
ef317cd5 12915
2b472aae 12916#: builtin/config.c:152
ef317cd5 12917msgid "value is a path (file or directory name)"
07432cef 12918msgstr "值是一个路径(文件或目录名)"
ef317cd5 12919
2b472aae 12920#: builtin/config.c:153
5809aa05
JX
12921msgid "value is an expiry date"
12922msgstr "值是一个到期日期"
12923
2b472aae 12924#: builtin/config.c:154
ef317cd5 12925msgid "Other"
07432cef 12926msgstr "其它"
ef317cd5 12927
2b472aae 12928#: builtin/config.c:155
ef317cd5 12929msgid "terminate values with NUL byte"
4375c10e 12930msgstr "终止值是 NUL 字节"
ef317cd5 12931
2b472aae 12932#: builtin/config.c:156
1b7f4a34
JX
12933msgid "show variable names only"
12934msgstr "只显示变量名"
12935
2b472aae 12936#: builtin/config.c:157
ef317cd5 12937msgid "respect include directives on lookup"
07432cef 12938msgstr "查询时参照 include 指令递归查找"
ef317cd5 12939
2b472aae 12940#: builtin/config.c:158
276ceeaa
JX
12941msgid "show origin of config (file, standard input, blob, command line)"
12942msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
12943
2b472aae
JX
12944#: builtin/config.c:159
12945msgid "show scope of config (worktree, local, global, system, command)"
440e7442 12946msgstr "显示配置的作用域(工作区、本地、全局、系统、命令)"
2b472aae
JX
12947
12948#: builtin/config.c:160 builtin/env--helper.c:40
fd8cb379
JX
12949msgid "value"
12950msgstr "取值"
12951
2b472aae 12952#: builtin/config.c:160
fd8cb379
JX
12953msgid "with --get, use default value when missing entry"
12954msgstr "使用 --get 参数,当缺少设置时使用默认值"
12955
2b472aae 12956#: builtin/config.c:174
c1ac5258
JX
12957#, c-format
12958msgid "wrong number of arguments, should be %d"
12959msgstr "错误的参数个数,应该为 %d 个"
12960
2b472aae 12961#: builtin/config.c:176
c1ac5258
JX
12962#, c-format
12963msgid "wrong number of arguments, should be from %d to %d"
12964msgstr "错误的参数个数,应该为从 %d 个到 %d 个"
12965
2b472aae 12966#: builtin/config.c:324
c1ac5258
JX
12967#, c-format
12968msgid "invalid key pattern: %s"
12969msgstr "无效键名模式:%s"
12970
2b472aae 12971#: builtin/config.c:360
fd8cb379
JX
12972#, c-format
12973msgid "failed to format default config value: %s"
c1ac5258
JX
12974msgstr "格式化默认配置值失败:%s"
12975
2b472aae 12976#: builtin/config.c:417
c1ac5258
JX
12977#, c-format
12978msgid "cannot parse color '%s'"
12979msgstr "无法解析颜色 '%s'"
fd8cb379 12980
2b472aae 12981#: builtin/config.c:459
220c313c 12982msgid "unable to parse default color value"
c1ac5258
JX
12983msgstr "无法解析默认颜色值"
12984
2b472aae 12985#: builtin/config.c:512 builtin/config.c:768
c1ac5258
JX
12986msgid "not in a git directory"
12987msgstr "不在 git 仓库中"
12988
2b472aae 12989#: builtin/config.c:515
c1ac5258
JX
12990msgid "writing to stdin is not supported"
12991msgstr "不支持写到标准输入"
12992
2b472aae 12993#: builtin/config.c:518
c1ac5258
JX
12994msgid "writing config blobs is not supported"
12995msgstr "不支持写到配置数据对象"
220c313c 12996
2b472aae 12997#: builtin/config.c:603
220c313c
JX
12998#, c-format
12999msgid ""
13000"# This is Git's per-user configuration file.\n"
7aea43ff 13001"[user]\n"
220c313c 13002"# Please adapt and uncomment the following lines:\n"
7aea43ff 13003"#\tname = %s\n"
220c313c
JX
13004"#\temail = %s\n"
13005msgstr ""
13006"# This is Git's per-user configuration file.\n"
7aea43ff 13007"[user]\n"
220c313c 13008"# Please adapt and uncomment the following lines:\n"
7aea43ff 13009"#\tname = %s\n"
220c313c
JX
13010"#\temail = %s\n"
13011
2b472aae 13012#: builtin/config.c:627
c1ac5258
JX
13013msgid "only one config file at a time"
13014msgstr "一次只能有一个配置文件"
13015
2b472aae 13016#: builtin/config.c:632
a4f16749
JX
13017msgid "--local can only be used inside a git repository"
13018msgstr "--local 只能在一个仓库内使用"
13019
2b472aae 13020#: builtin/config.c:635
fd8cb379
JX
13021msgid "--blob can only be used inside a git repository"
13022msgstr "--blob 只能在一个仓库内使用"
13023
2b472aae 13024#: builtin/config.c:655
c1ac5258
JX
13025msgid "$HOME not set"
13026msgstr "$HOME 未设置"
13027
2b472aae 13028#: builtin/config.c:679
4c27fcb5
JX
13029msgid ""
13030"--worktree cannot be used with multiple working trees unless the config\n"
13031"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
13032"section in \"git help worktree\" for details"
13033msgstr ""
13034"不能和多个工作区一起使用 --worktree,除非启用 worktreeConfig 配置扩展。\n"
13035"详情请阅读“git help worktree”的“CONFIGURATION FILE”小节"
13036
2b472aae 13037#: builtin/config.c:714
c1ac5258
JX
13038msgid "--get-color and variable type are incoherent"
13039msgstr "--get-color 和变量类型不兼容"
13040
2b472aae 13041#: builtin/config.c:719
c1ac5258
JX
13042msgid "only one action at a time"
13043msgstr "一次只能有一个动作"
13044
2b472aae 13045#: builtin/config.c:732
c1ac5258
JX
13046msgid "--name-only is only applicable to --list or --get-regexp"
13047msgstr "--name-only 仅适用于 --list 或 --get-regexp"
13048
2b472aae 13049#: builtin/config.c:738
c1ac5258
JX
13050msgid ""
13051"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
13052"list"
13053msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
13054
2b472aae 13055#: builtin/config.c:744
c1ac5258
JX
13056msgid "--default is only applicable to --get"
13057msgstr "--default 仅适用于 --get"
13058
2b472aae 13059#: builtin/config.c:757
c1ac5258
JX
13060#, c-format
13061msgid "unable to read config file '%s'"
13062msgstr "无法读取配置文件 '%s'"
13063
2b472aae 13064#: builtin/config.c:760
c1ac5258
JX
13065msgid "error processing config file(s)"
13066msgstr "处理配置文件出错"
13067
2b472aae 13068#: builtin/config.c:770
c1ac5258
JX
13069msgid "editing stdin is not supported"
13070msgstr "不支持编辑标准输入"
13071
2b472aae 13072#: builtin/config.c:772
c1ac5258
JX
13073msgid "editing blobs is not supported"
13074msgstr "不支持编辑数据对象"
13075
2b472aae 13076#: builtin/config.c:786
220c313c
JX
13077#, c-format
13078msgid "cannot create configuration file %s"
13079msgstr "不能创建配置文件 %s"
13080
2b472aae 13081#: builtin/config.c:799
a0b6b246
JX
13082#, c-format
13083msgid ""
13084"cannot overwrite multiple values with a single value\n"
13085" Use a regexp, --add or --replace-all to change %s."
13086msgstr ""
13087"无法用一个值覆盖多个值\n"
13088" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
13089
2b472aae 13090#: builtin/config.c:873 builtin/config.c:884
c1ac5258
JX
13091#, c-format
13092msgid "no such section: %s"
13093msgstr "无此小节:%s"
13094
fd8cb379 13095#: builtin/count-objects.c:90
4dcdc3d8
JX
13096msgid "git count-objects [-v] [-H | --human-readable]"
13097msgstr "git count-objects [-v] [-H | --human-readable]"
13098
fd8cb379 13099#: builtin/count-objects.c:100
4dcdc3d8
JX
13100msgid "print sizes in human readable format"
13101msgstr "以用户可读的格式显示大小"
ef317cd5 13102
a5cd71ca 13103#: builtin/describe.c:26
814ff314
JX
13104msgid "git describe [<options>] [<commit-ish>...]"
13105msgstr "git describe [<选项>] [<提交号>...]"
ef317cd5 13106
a5cd71ca 13107#: builtin/describe.c:27
814ff314
JX
13108msgid "git describe [<options>] --dirty"
13109msgstr "git describe [<选项>] --dirty"
ef317cd5 13110
a5cd71ca 13111#: builtin/describe.c:62
87cb7997
JX
13112msgid "head"
13113msgstr "头"
13114
a5cd71ca 13115#: builtin/describe.c:62
87cb7997
JX
13116msgid "lightweight"
13117msgstr "轻量级的"
13118
a5cd71ca 13119#: builtin/describe.c:62
87cb7997
JX
13120msgid "annotated"
13121msgstr "附注的"
13122
a5cd71ca 13123#: builtin/describe.c:275
c04f5ac3
JX
13124#, c-format
13125msgid "annotated tag %s not available"
55a16ee4 13126msgstr "附注标签 %s 无效"
c04f5ac3 13127
a5cd71ca 13128#: builtin/describe.c:279
c04f5ac3
JX
13129#, c-format
13130msgid "annotated tag %s has no embedded name"
55a16ee4 13131msgstr "附注标签 %s 没有嵌入名称"
c04f5ac3 13132
a5cd71ca 13133#: builtin/describe.c:281
c04f5ac3
JX
13134#, c-format
13135msgid "tag '%s' is really '%s' here"
55a16ee4 13136msgstr "标签 '%s' 的确是在 '%s'"
c04f5ac3 13137
a5cd71ca 13138#: builtin/describe.c:325
c04f5ac3
JX
13139#, c-format
13140msgid "no tag exactly matches '%s'"
55a16ee4 13141msgstr "没有标签准确匹配 '%s'"
c04f5ac3 13142
a5cd71ca 13143#: builtin/describe.c:327
c04f5ac3 13144#, c-format
5809aa05
JX
13145msgid "No exact match on refs or tags, searching to describe\n"
13146msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n"
c04f5ac3 13147
2b472aae 13148#: builtin/describe.c:394
c04f5ac3
JX
13149#, c-format
13150msgid "finished search at %s\n"
13151msgstr "完成搜索 %s\n"
13152
2b472aae 13153#: builtin/describe.c:421
c04f5ac3
JX
13154#, c-format
13155msgid ""
13156"No annotated tags can describe '%s'.\n"
13157"However, there were unannotated tags: try --tags."
13158msgstr ""
55a16ee4
RC
13159"没有附注标签能描述 '%s'。\n"
13160"然而,存在未附注标签:尝试 --tags。"
c04f5ac3 13161
2b472aae 13162#: builtin/describe.c:425
c04f5ac3
JX
13163#, c-format
13164msgid ""
13165"No tags can describe '%s'.\n"
13166"Try --always, or create some tags."
13167msgstr ""
55a16ee4
RC
13168"没有标签能描述 '%s'。\n"
13169"尝试 --always,或者创建一些标签。"
c04f5ac3 13170
2b472aae 13171#: builtin/describe.c:455
c04f5ac3
JX
13172#, c-format
13173msgid "traversed %lu commits\n"
13174msgstr "已遍历 %lu 个提交\n"
13175
2b472aae 13176#: builtin/describe.c:458
c04f5ac3
JX
13177#, c-format
13178msgid ""
13179"more than %i tags found; listed %i most recent\n"
13180"gave up search at %s\n"
13181msgstr ""
55a16ee4 13182"发现多于 %i 个标签,列出最近的 %i 个\n"
90e6ef53 13183"在 %s 放弃搜索\n"
c04f5ac3 13184
2b472aae 13185#: builtin/describe.c:526
5809aa05
JX
13186#, c-format
13187msgid "describe %s\n"
13188msgstr "描述 %s\n"
13189
2b472aae 13190#: builtin/describe.c:529
5809aa05
JX
13191#, c-format
13192msgid "Not a valid object name %s"
13193msgstr "不是一个有效的对象名 %s"
13194
2b472aae 13195#: builtin/describe.c:537
5809aa05
JX
13196#, c-format
13197msgid "%s is neither a commit nor blob"
13198msgstr "%s 既不是提交也不是数据对象"
13199
2b472aae 13200#: builtin/describe.c:551
ef317cd5 13201msgid "find the tag that comes after the commit"
55a16ee4 13202msgstr "寻找该提交之后的标签"
ef317cd5 13203
2b472aae 13204#: builtin/describe.c:552
ef317cd5 13205msgid "debug search strategy on stderr"
07432cef 13206msgstr "在标准错误上调试搜索策略"
ef317cd5 13207
2b472aae 13208#: builtin/describe.c:553
1003b3a5
JX
13209msgid "use any ref"
13210msgstr "使用任意引用"
13211
2b472aae 13212#: builtin/describe.c:554
1003b3a5 13213msgid "use any tag, even unannotated"
55a16ee4 13214msgstr "使用任意标签,即使未附带注释"
ef317cd5 13215
2b472aae 13216#: builtin/describe.c:555
ef317cd5 13217msgid "always use long format"
07432cef 13218msgstr "始终使用长提交号格式"
ef317cd5 13219
2b472aae 13220#: builtin/describe.c:556
2e8451e8
JX
13221msgid "only follow first parent"
13222msgstr "只跟随第一个父提交"
13223
2b472aae 13224#: builtin/describe.c:559
ef317cd5 13225msgid "only output exact matches"
07432cef 13226msgstr "只输出精确匹配"
ef317cd5 13227
2b472aae 13228#: builtin/describe.c:561
ef317cd5 13229msgid "consider <n> most recent tags (default: 10)"
55a16ee4 13230msgstr "考虑最近 <n> 个标签(默认:10)"
ef317cd5 13231
2b472aae 13232#: builtin/describe.c:563
ef317cd5 13233msgid "only consider tags matching <pattern>"
55a16ee4 13234msgstr "只考虑匹配 <模式> 的标签"
ef317cd5 13235
2b472aae 13236#: builtin/describe.c:565
87cb7997
JX
13237msgid "do not consider tags matching <pattern>"
13238msgstr "不考虑匹配 <模式> 的标签"
13239
2b472aae 13240#: builtin/describe.c:567 builtin/name-rev.c:535
ef317cd5 13241msgid "show abbreviated commit object as fallback"
07432cef 13242msgstr "显示简写的提交号作为后备"
ef317cd5 13243
2b472aae 13244#: builtin/describe.c:568 builtin/describe.c:571
ef317cd5 13245msgid "mark"
07432cef 13246msgstr "标记"
ef317cd5 13247
2b472aae 13248#: builtin/describe.c:569
ef317cd5 13249msgid "append <mark> on dirty working tree (default: \"-dirty\")"
160fb2b2 13250msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
ef317cd5 13251
2b472aae 13252#: builtin/describe.c:572
87cb7997
JX
13253msgid "append <mark> on broken working tree (default: \"-broken\")"
13254msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
13255
2b472aae 13256#: builtin/describe.c:590
c04f5ac3
JX
13257msgid "--long is incompatible with --abbrev=0"
13258msgstr "--long 与 --abbrev=0 不兼容"
13259
2b472aae 13260#: builtin/describe.c:619
c04f5ac3 13261msgid "No names found, cannot describe anything."
90e6ef53 13262msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 13263
2b472aae 13264#: builtin/describe.c:670
a8a5406a 13265msgid "--dirty is incompatible with commit-ishes"
87cb7997
JX
13266msgstr "--dirty 与提交号不兼容"
13267
2b472aae 13268#: builtin/describe.c:672
87cb7997
JX
13269msgid "--broken is incompatible with commit-ishes"
13270msgstr "--broken 与提交号不兼容"
c04f5ac3 13271
06991777 13272#: builtin/diff.c:84
c04f5ac3
JX
13273#, c-format
13274msgid "'%s': not a regular file or symlink"
13275msgstr "'%s':不是一个正规文件或符号链接"
13276
06991777 13277#: builtin/diff.c:235
c04f5ac3
JX
13278#, c-format
13279msgid "invalid option: %s"
13280msgstr "无效选项:%s"
13281
d46c5519 13282#: builtin/diff.c:350
c04f5ac3 13283msgid "Not a git repository"
160fb2b2 13284msgstr "不是一个 git 仓库"
c04f5ac3 13285
d46c5519 13286#: builtin/diff.c:394
c04f5ac3
JX
13287#, c-format
13288msgid "invalid object '%s' given."
13289msgstr "提供了无效对象 '%s'。"
13290
d46c5519 13291#: builtin/diff.c:403
c04f5ac3
JX
13292#, c-format
13293msgid "more than two blobs given: '%s'"
160fb2b2 13294msgstr "提供了超过两个数据对象:'%s'"
c04f5ac3 13295
d46c5519 13296#: builtin/diff.c:408
c04f5ac3
JX
13297#, c-format
13298msgid "unhandled object '%s' given."
6c94aba5 13299msgstr "无法处理的对象 '%s'。"
c04f5ac3 13300
d46c5519 13301#: builtin/difftool.c:30
1a79b2f1
JX
13302msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
13303msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
13304
a5cd71ca 13305#: builtin/difftool.c:260
1a79b2f1
JX
13306#, c-format
13307msgid "failed: %d"
13308msgstr "失败:%d"
13309
a5cd71ca 13310#: builtin/difftool.c:302
87cb7997
JX
13311#, c-format
13312msgid "could not read symlink %s"
13313msgstr "无法读取符号链接 %s"
13314
a5cd71ca 13315#: builtin/difftool.c:304
87cb7997
JX
13316#, c-format
13317msgid "could not read symlink file %s"
13318msgstr "无法读取符号链接文件 %s"
13319
a5cd71ca 13320#: builtin/difftool.c:312
87cb7997
JX
13321#, c-format
13322msgid "could not read object %s for symlink %s"
13323msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
13324
a5cd71ca 13325#: builtin/difftool.c:413
1a79b2f1
JX
13326msgid ""
13327"combined diff formats('-c' and '--cc') are not supported in\n"
13328"directory diff mode('-d' and '--dir-diff')."
87cb7997
JX
13329msgstr ""
13330"不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
13331"cc')。"
1a79b2f1 13332
a5cd71ca 13333#: builtin/difftool.c:634
1a79b2f1
JX
13334#, c-format
13335msgid "both files modified: '%s' and '%s'."
13336msgstr "两个文件都被修改:'%s' 和 '%s'。"
13337
a5cd71ca 13338#: builtin/difftool.c:636
1a79b2f1
JX
13339msgid "working tree file has been left."
13340msgstr "工作区文件被留了下来。"
13341
a5cd71ca 13342#: builtin/difftool.c:647
1a79b2f1
JX
13343#, c-format
13344msgid "temporary files exist in '%s'."
13345msgstr "临时文件存在于 '%s'。"
13346
a5cd71ca 13347#: builtin/difftool.c:648
1a79b2f1
JX
13348msgid "you may want to cleanup or recover these."
13349msgstr "您可能想要清理或者恢复它们。"
13350
a5cd71ca 13351#: builtin/difftool.c:697
1a79b2f1
JX
13352msgid "use `diff.guitool` instead of `diff.tool`"
13353msgstr "使用 `diff.guitool` 代替 `diff.tool`"
13354
a5cd71ca 13355#: builtin/difftool.c:699
1a79b2f1
JX
13356msgid "perform a full-directory diff"
13357msgstr "执行一个全目录差异比较"
13358
a5cd71ca 13359#: builtin/difftool.c:701
1a79b2f1
JX
13360msgid "do not prompt before launching a diff tool"
13361msgstr "启动差异比较工具之前不提示"
13362
a5cd71ca 13363#: builtin/difftool.c:706
1a79b2f1
JX
13364msgid "use symlinks in dir-diff mode"
13365msgstr "在 dir-diff 模式中使用符号链接"
13366
a5cd71ca 13367#: builtin/difftool.c:707
c1ac5258
JX
13368msgid "tool"
13369msgstr "工具"
13370
a5cd71ca 13371#: builtin/difftool.c:708
1a79b2f1
JX
13372msgid "use the specified diff tool"
13373msgstr "使用指定的差异比较工具"
13374
a5cd71ca 13375#: builtin/difftool.c:710
1a79b2f1
JX
13376msgid "print a list of diff tools that may be used with `--tool`"
13377msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
13378
a5cd71ca 13379#: builtin/difftool.c:713
1a79b2f1
JX
13380msgid ""
13381"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
13382"code"
13383msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出"
13384
a5cd71ca 13385#: builtin/difftool.c:716
1a79b2f1
JX
13386msgid "specify a custom command for viewing diffs"
13387msgstr "指定一个用于查看差异的自定义命令"
13388
a5cd71ca 13389#: builtin/difftool.c:717
d46c5519
JX
13390msgid "passed to `diff`"
13391msgstr "传递给 `diff`"
13392
a5cd71ca 13393#: builtin/difftool.c:732
d46c5519
JX
13394msgid "difftool requires worktree or --no-index"
13395msgstr "difftool 要求工作区或者 --no-index"
13396
a5cd71ca 13397#: builtin/difftool.c:739
d46c5519
JX
13398msgid "--dir-diff is incompatible with --no-index"
13399msgstr "--dir-diff 和 --no-index 不兼容"
13400
a5cd71ca 13401#: builtin/difftool.c:742
d46c5519
JX
13402msgid "--gui, --tool and --extcmd are mutually exclusive"
13403msgstr "--gui、--tool 和 --extcmd 互斥"
13404
a5cd71ca 13405#: builtin/difftool.c:750
1a79b2f1
JX
13406msgid "no <tool> given for --tool=<tool>"
13407msgstr "没有为 --tool=<工具> 参数提供 <工具>"
13408
a5cd71ca 13409#: builtin/difftool.c:757
1a79b2f1
JX
13410msgid "no <cmd> given for --extcmd=<cmd>"
13411msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
13412
a6cd2cc4
JX
13413#: builtin/env--helper.c:6
13414msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
13415msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>"
13416
13417#: builtin/env--helper.c:37 builtin/hash-object.c:98
13418msgid "type"
13419msgstr "类型"
13420
13421#: builtin/env--helper.c:41
13422msgid "default for git_env_*(...) to fall back on"
13423msgstr "git_env_*(...) 的默认值"
13424
13425#: builtin/env--helper.c:43
13426msgid "be quiet only use git_env_*() value as exit code"
13427msgstr "安静模式,只使用 git_env_*() 的值作为退出码"
13428
13429#: builtin/env--helper.c:62
13430#, c-format
13431msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
13432msgstr "选项 `--default' 和 `type=bool` 期望一个布尔值,不是 `%s`"
13433
13434#: builtin/env--helper.c:77
13435#, c-format
13436msgid ""
13437"option `--default' expects an unsigned long value with `--type=ulong`, not `"
13438"%s`"
13439msgstr "选项 `--default' 和 `type=ulong` 期望一个无符号长整型,不是 `%s`"
13440
c1ac5258 13441#: builtin/fast-export.c:29
ef317cd5 13442msgid "git fast-export [rev-list-opts]"
07432cef 13443msgstr "git fast-export [rev-list-opts]"
ef317cd5 13444
2b472aae 13445#: builtin/fast-export.c:853
a5cd71ca
JX
13446msgid "Error: Cannot export nested tags unless --mark-tags is specified."
13447msgstr "错误:除非指定 --mark-tags,否则无法导出嵌套标签。"
13448
13449#: builtin/fast-export.c:1152
ef317cd5 13450msgid "show progress after <n> objects"
07432cef 13451msgstr "在 <n> 个对象之后显示进度"
ef317cd5 13452
a5cd71ca 13453#: builtin/fast-export.c:1154
ef317cd5 13454msgid "select handling of signed tags"
55a16ee4 13455msgstr "选择如何处理签名标签"
ef317cd5 13456
a5cd71ca 13457#: builtin/fast-export.c:1157
ef317cd5 13458msgid "select handling of tags that tag filtered objects"
55a16ee4 13459msgstr "选择当标签指向被过滤对象时该标签的处理方式"
ef317cd5 13460
a5cd71ca 13461#: builtin/fast-export.c:1160
a6cd2cc4
JX
13462msgid "select handling of commit messages in an alternate encoding"
13463msgstr "选择使用备用编码处理提交说明"
13464
a5cd71ca 13465#: builtin/fast-export.c:1163
ef317cd5 13466msgid "Dump marks to this file"
07432cef 13467msgstr "把标记存储到这个文件"
ef317cd5 13468
a5cd71ca 13469#: builtin/fast-export.c:1165
ef317cd5 13470msgid "Import marks from this file"
07432cef 13471msgstr "从这个文件导入标记"
ef317cd5 13472
a5cd71ca
JX
13473#: builtin/fast-export.c:1169
13474msgid "Import marks from this file if it exists"
13475msgstr "从该文件导入标记(如果存在的话)"
13476
13477#: builtin/fast-export.c:1171
ef317cd5 13478msgid "Fake a tagger when tags lack one"
55a16ee4 13479msgstr "当标签缺少标记者字段时,假装提供一个"
ef317cd5 13480
a5cd71ca 13481#: builtin/fast-export.c:1173
ef317cd5 13482msgid "Output full tree for each commit"
07432cef 13483msgstr "每次提交都输出整个树"
ef317cd5 13484
a5cd71ca 13485#: builtin/fast-export.c:1175
ef317cd5 13486msgid "Use the done feature to terminate the stream"
07432cef 13487msgstr "使用 done 功能来终止流"
ef317cd5 13488
a5cd71ca 13489#: builtin/fast-export.c:1176
ef317cd5 13490msgid "Skip output of blob data"
07432cef 13491msgstr "跳过数据对象的输出"
ef317cd5 13492
ddc12c42 13493#: builtin/fast-export.c:1177 builtin/log.c:1705
6acbf033 13494msgid "refspec"
160fb2b2 13495msgstr "引用规格"
6acbf033 13496
a5cd71ca 13497#: builtin/fast-export.c:1178
6acbf033 13498msgid "Apply refspec to exported refs"
160fb2b2 13499msgstr "对导出的引用应用引用规格"
6acbf033 13500
a5cd71ca 13501#: builtin/fast-export.c:1179
220c313c
JX
13502msgid "anonymize output"
13503msgstr "匿名输出"
13504
a5cd71ca 13505#: builtin/fast-export.c:1181
06991777 13506msgid "Reference parents which are not in fast-export stream by object id"
5b533632 13507msgstr "引用父对象 ID 不在 fast-export 流中"
06991777 13508
a5cd71ca 13509#: builtin/fast-export.c:1183
06991777 13510msgid "Show original object ids of blobs/commits"
5b533632 13511msgstr "显示数据对象/提交的原始对象 ID"
06991777 13512
a5cd71ca
JX
13513#: builtin/fast-export.c:1185
13514msgid "Label tags with mark ids"
13515msgstr "对带有标记 ID 的标签做标记"
13516
13517#: builtin/fast-export.c:1220
13518msgid "Cannot pass both --import-marks and --import-marks-if-exists"
13519msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists"
13520
13521#: builtin/fetch.c:34
ef317cd5 13522msgid "git fetch [<options>] [<repository> [<refspec>...]]"
160fb2b2 13523msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
ef317cd5 13524
a5cd71ca 13525#: builtin/fetch.c:35
ef317cd5 13526msgid "git fetch [<options>] <group>"
07432cef 13527msgstr "git fetch [<选项>] <组>"
ef317cd5 13528
a5cd71ca 13529#: builtin/fetch.c:36
ef317cd5 13530msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
160fb2b2 13531msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
ef317cd5 13532
a5cd71ca 13533#: builtin/fetch.c:37
ef317cd5 13534msgid "git fetch --all [<options>]"
07432cef 13535msgstr "git fetch --all [<选项>]"
ef317cd5 13536
ddc12c42 13537#: builtin/fetch.c:116
a5cd71ca
JX
13538msgid "fetch.parallel cannot be negative"
13539msgstr "fetch.parallel 不能为负数"
13540
2b472aae 13541#: builtin/fetch.c:139 builtin/pull.c:184
ef317cd5 13542msgid "fetch from all remotes"
07432cef 13543msgstr "从所有的远程抓取"
ef317cd5 13544
2b472aae 13545#: builtin/fetch.c:141 builtin/pull.c:228
a5cd71ca
JX
13546msgid "set upstream for git pull/fetch"
13547msgstr "为 git pull/fetch 设置上游"
13548
2b472aae 13549#: builtin/fetch.c:143 builtin/pull.c:187
ef317cd5 13550msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 13551msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 13552
2b472aae 13553#: builtin/fetch.c:145 builtin/pull.c:190
ef317cd5 13554msgid "path to upload pack on remote end"
07432cef 13555msgstr "上传包到远程的路径"
ef317cd5 13556
ddc12c42 13557#: builtin/fetch.c:146
4c27fcb5
JX
13558msgid "force overwrite of local reference"
13559msgstr "强制覆盖本地引用"
ef317cd5 13560
ddc12c42 13561#: builtin/fetch.c:148
ef317cd5 13562msgid "fetch from multiple remotes"
07432cef 13563msgstr "从多个远程抓取"
ef317cd5 13564
2b472aae 13565#: builtin/fetch.c:150 builtin/pull.c:194
ef317cd5 13566msgid "fetch all tags and associated objects"
55a16ee4 13567msgstr "抓取所有的标签和关联对象"
ef317cd5 13568
ddc12c42 13569#: builtin/fetch.c:152
ef317cd5 13570msgid "do not fetch all tags (--no-tags)"
55a16ee4 13571msgstr "不抓取任何标签(--no-tags)"
ef317cd5 13572
ddc12c42 13573#: builtin/fetch.c:154
276ceeaa
JX
13574msgid "number of submodules fetched in parallel"
13575msgstr "子模组获取的并发数"
13576
2b472aae 13577#: builtin/fetch.c:156 builtin/pull.c:197
ef317cd5 13578msgid "prune remote-tracking branches no longer on remote"
07432cef 13579msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 13580
ddc12c42 13581#: builtin/fetch.c:158
31e5e17b
JX
13582msgid "prune local tags no longer on remote and clobber changed tags"
13583msgstr "清除远程不存在的本地标签,并且替换变更标签"
13584
07432cef 13585# 译者:可选值,不能翻译
2b472aae 13586#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
ef317cd5 13587msgid "on-demand"
07432cef 13588msgstr "on-demand"
ef317cd5 13589
ddc12c42 13590#: builtin/fetch.c:160
ef317cd5 13591msgid "control recursive fetching of submodules"
07432cef 13592msgstr "控制子模组的递归抓取"
ef317cd5 13593
2b472aae 13594#: builtin/fetch.c:164 builtin/pull.c:205
ef317cd5 13595msgid "keep downloaded pack"
07432cef 13596msgstr "保持下载包"
ef317cd5 13597
ddc12c42 13598#: builtin/fetch.c:166
ef317cd5 13599msgid "allow updating of HEAD ref"
07432cef 13600msgstr "允许更新 HEAD 引用"
ef317cd5 13601
2b472aae 13602#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
ef317cd5 13603msgid "deepen history of shallow clone"
07432cef 13604msgstr "深化浅克隆的历史"
ef317cd5 13605
ddc12c42 13606#: builtin/fetch.c:171
a0b6b246
JX
13607msgid "deepen history of shallow repository based on time"
13608msgstr "基于时间来深化浅克隆的历史"
13609
2b472aae 13610#: builtin/fetch.c:177 builtin/pull.c:211
a77c07d9 13611msgid "convert to a complete repository"
160fb2b2 13612msgstr "转换为一个完整的仓库"
a77c07d9 13613
ddc12c42 13614#: builtin/fetch.c:180
ef317cd5 13615msgid "prepend this to submodule path output"
07432cef 13616msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 13617
ddc12c42 13618#: builtin/fetch.c:183
a4f16749
JX
13619msgid ""
13620"default for recursive fetching of submodules (lower priority than config "
13621"files)"
13622msgstr "递归获取子模组的缺省值(比配置文件优先级低)"
ef317cd5 13623
2b472aae 13624#: builtin/fetch.c:187 builtin/pull.c:214
cfff71a9
JX
13625msgid "accept refs that update .git/shallow"
13626msgstr "接受更新 .git/shallow 的引用"
13627
2b472aae 13628#: builtin/fetch.c:188 builtin/pull.c:216
6acbf033
JX
13629msgid "refmap"
13630msgstr "引用映射"
13631
2b472aae 13632#: builtin/fetch.c:189 builtin/pull.c:217
6acbf033
JX
13633msgid "specify fetch refmap"
13634msgstr "指定获取操作的引用映射"
13635
ddc12c42 13636#: builtin/fetch.c:196
c1ac5258
JX
13637msgid "report that we have only objects reachable from this object"
13638msgstr "报告我们只拥有从该对象开始可达的对象"
13639
ddc12c42 13640#: builtin/fetch.c:199
a6cd2cc4
JX
13641msgid "run 'gc --auto' after fetching"
13642msgstr "获取后执行 'gc --auto'"
13643
2b472aae 13644#: builtin/fetch.c:201 builtin/pull.c:226
a6cd2cc4
JX
13645msgid "check for forced-updates on all updated branches"
13646msgstr "在所有更新分支上检查强制更新"
13647
ddc12c42
JX
13648#: builtin/fetch.c:203
13649msgid "write the commit-graph after fetching"
13650msgstr "抓取后写提交图"
13651
13652#: builtin/fetch.c:513
c04f5ac3
JX
13653msgid "Couldn't find remote ref HEAD"
13654msgstr "无法发现远程 HEAD 引用"
13655
ddc12c42 13656#: builtin/fetch.c:653
5c57d762
JX
13657#, c-format
13658msgid "configuration fetch.output contains invalid value %s"
13659msgstr "配置变量 fetch.output 包含无效值 %s"
13660
ddc12c42 13661#: builtin/fetch.c:751
c04f5ac3
JX
13662#, c-format
13663msgid "object %s not found"
13664msgstr "对象 %s 未发现"
13665
ddc12c42 13666#: builtin/fetch.c:755
c04f5ac3
JX
13667msgid "[up to date]"
13668msgstr "[最新]"
13669
ddc12c42 13670#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
c04f5ac3
JX
13671msgid "[rejected]"
13672msgstr "[已拒绝]"
13673
ddc12c42 13674#: builtin/fetch.c:769
5c57d762 13675msgid "can't fetch in current branch"
9a4b694c 13676msgstr "当前分支下不能执行获取操作"
5c57d762 13677
ddc12c42 13678#: builtin/fetch.c:779
c04f5ac3 13679msgid "[tag update]"
55a16ee4 13680msgstr "[标签更新]"
c04f5ac3 13681
ddc12c42
JX
13682#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
13683#: builtin/fetch.c:851
5c57d762
JX
13684msgid "unable to update local ref"
13685msgstr "不能更新本地引用"
c04f5ac3 13686
ddc12c42 13687#: builtin/fetch.c:784
4c27fcb5
JX
13688msgid "would clobber existing tag"
13689msgstr "会破坏现有的标签"
13690
ddc12c42 13691#: builtin/fetch.c:806
c04f5ac3 13692msgid "[new tag]"
55a16ee4 13693msgstr "[新标签]"
c04f5ac3 13694
ddc12c42 13695#: builtin/fetch.c:809
c04f5ac3
JX
13696msgid "[new branch]"
13697msgstr "[新分支]"
13698
ddc12c42 13699#: builtin/fetch.c:812
170e9899
JX
13700msgid "[new ref]"
13701msgstr "[新引用]"
13702
ddc12c42 13703#: builtin/fetch.c:851
c04f5ac3
JX
13704msgid "forced update"
13705msgstr "强制更新"
13706
ddc12c42 13707#: builtin/fetch.c:856
5c57d762
JX
13708msgid "non-fast-forward"
13709msgstr "非快进"
c04f5ac3 13710
ddc12c42 13711#: builtin/fetch.c:877
a6cd2cc4
JX
13712msgid ""
13713"Fetch normally indicates which branches had a forced update,\n"
13714"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
13715"flag or run 'git config fetch.showForcedUpdates true'."
13716msgstr ""
13717"获取操作通常显示哪些分支发生了强制更新,但该检查已被禁用。\n"
13718"要重新启用,请使用 '--show-forced-updates' 选项或运行\n"
13719"'git config fetch.showForcedUpdates true'。"
13720
ddc12c42 13721#: builtin/fetch.c:881
a6cd2cc4
JX
13722#, c-format
13723msgid ""
13724"It took %.2f seconds to check forced updates. You can use\n"
13725"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
13726"false'\n"
13727" to avoid this check.\n"
13728msgstr ""
13729"花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n"
13730"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n"
13731
2b472aae 13732#: builtin/fetch.c:920
c04f5ac3
JX
13733#, c-format
13734msgid "%s did not send all necessary objects\n"
e640d114 13735msgstr "%s 未发送所有必需的对象\n"
c04f5ac3 13736
2b472aae 13737#: builtin/fetch.c:941
cfff71a9
JX
13738#, c-format
13739msgid "reject %s because shallow roots are not allowed to be updated"
13740msgstr "拒绝 %s 因为浅克隆不允许被更新"
13741
2b472aae 13742#: builtin/fetch.c:1026 builtin/fetch.c:1164
c04f5ac3
JX
13743#, c-format
13744msgid "From %.*s\n"
13745msgstr "来自 %.*s\n"
13746
2b472aae 13747#: builtin/fetch.c:1037
c04f5ac3
JX
13748#, c-format
13749msgid ""
13750"some local refs could not be updated; try running\n"
13751" 'git remote prune %s' to remove any old, conflicting branches"
13752msgstr ""
13753"一些本地引用不能被更新;尝试运行\n"
13754" 'git remote prune %s' 来删除旧的、有冲突的分支"
13755
90e6ef53 13756# 译者:注意保持前导空格
2b472aae 13757#: builtin/fetch.c:1134
81809b99 13758#, c-format
8ada9598 13759msgid " (%s will become dangling)"
e640d114 13760msgstr " (%s 将成为悬空状态)"
c04f5ac3 13761
90e6ef53 13762# 译者:注意保持前导空格
2b472aae 13763#: builtin/fetch.c:1135
81809b99 13764#, c-format
8ada9598 13765msgid " (%s has become dangling)"
e640d114 13766msgstr " (%s 已成为悬空状态)"
c04f5ac3 13767
2b472aae 13768#: builtin/fetch.c:1167
c04f5ac3
JX
13769msgid "[deleted]"
13770msgstr "[已删除]"
13771
2b472aae 13772#: builtin/fetch.c:1168 builtin/remote.c:1112
c04f5ac3
JX
13773msgid "(none)"
13774msgstr "(无)"
13775
2b472aae 13776#: builtin/fetch.c:1191
c04f5ac3
JX
13777#, c-format
13778msgid "Refusing to fetch into current branch %s of non-bare repository"
160fb2b2 13779msgstr "拒绝获取到非纯仓库的当前分支 %s"
c04f5ac3 13780
2b472aae 13781#: builtin/fetch.c:1210
c04f5ac3
JX
13782#, c-format
13783msgid "Option \"%s\" value \"%s\" is not valid for %s"
13784msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
13785
2b472aae 13786#: builtin/fetch.c:1213
c04f5ac3
JX
13787#, c-format
13788msgid "Option \"%s\" is ignored for %s\n"
81809b99 13789msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 13790
2b472aae 13791#: builtin/fetch.c:1421
ddc12c42 13792msgid "multiple branches detected, incompatible with --set-upstream"
a5cd71ca
JX
13793msgstr "检测到多分支,和 --set-upstream 不兼容"
13794
2b472aae 13795#: builtin/fetch.c:1436
a5cd71ca
JX
13796msgid "not setting upstream for a remote remote-tracking branch"
13797msgstr "没有为一个远程跟踪分支设置上游"
13798
2b472aae 13799#: builtin/fetch.c:1438
a5cd71ca
JX
13800msgid "not setting upstream for a remote tag"
13801msgstr "没有为一个远程标签设置上游"
13802
2b472aae 13803#: builtin/fetch.c:1440
a5cd71ca
JX
13804msgid "unknown branch type"
13805msgstr "未知的分支类型"
13806
2b472aae 13807#: builtin/fetch.c:1442
a5cd71ca
JX
13808msgid ""
13809"no source branch found.\n"
13810"you need to specify exactly one branch with the --set-upstream option."
13811msgstr ""
13812"未发现源分支。\n"
13813"您需要使用 --set-upstream 选项指定一个分支。"
13814
2b472aae 13815#: builtin/fetch.c:1568 builtin/fetch.c:1631
c04f5ac3
JX
13816#, c-format
13817msgid "Fetching %s\n"
d4a8e00b 13818msgstr "正在获取 %s\n"
c04f5ac3 13819
2b472aae 13820#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
c04f5ac3
JX
13821#, c-format
13822msgid "Could not fetch %s"
13823msgstr "不能获取 %s"
13824
2b472aae 13825#: builtin/fetch.c:1590
a5cd71ca
JX
13826#, c-format
13827msgid "could not fetch '%s' (exit code: %d)\n"
13828msgstr "无法获取 '%s'(退出码:%d)\n"
31e5e17b 13829
2b472aae 13830#: builtin/fetch.c:1693
c04f5ac3
JX
13831msgid ""
13832"No remote repository specified. Please, specify either a URL or a\n"
13833"remote name from which new revisions should be fetched."
4375c10e 13834msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
c04f5ac3 13835
2b472aae 13836#: builtin/fetch.c:1730
c04f5ac3 13837msgid "You need to specify a tag name."
55a16ee4 13838msgstr "您需要指定一个标签名称。"
c04f5ac3 13839
2b472aae 13840#: builtin/fetch.c:1780
a0b6b246
JX
13841msgid "Negative depth in --deepen is not supported"
13842msgstr "--deepen 不支持负数深度"
13843
2b472aae 13844#: builtin/fetch.c:1782
a0b6b246
JX
13845msgid "--deepen and --depth are mutually exclusive"
13846msgstr "--deepen 和 --depth 是互斥的"
13847
2b472aae 13848#: builtin/fetch.c:1787
a77c07d9
JX
13849msgid "--depth and --unshallow cannot be used together"
13850msgstr "--depth 和 --unshallow 不能同时使用"
13851
2b472aae 13852#: builtin/fetch.c:1789
a77c07d9 13853msgid "--unshallow on a complete repository does not make sense"
160fb2b2 13854msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
a77c07d9 13855
2b472aae 13856#: builtin/fetch.c:1805
c04f5ac3 13857msgid "fetch --all does not take a repository argument"
160fb2b2 13858msgstr "fetch --all 不能带一个仓库参数"
c04f5ac3 13859
2b472aae 13860#: builtin/fetch.c:1807
c04f5ac3 13861msgid "fetch --all does not make sense with refspecs"
160fb2b2 13862msgstr "fetch --all 带引用规格没有任何意义"
c04f5ac3 13863
2b472aae 13864#: builtin/fetch.c:1816
c04f5ac3
JX
13865#, c-format
13866msgid "No such remote or remote group: %s"
13867msgstr "没有这样的远程或远程组:%s"
13868
2b472aae 13869#: builtin/fetch.c:1823
c04f5ac3 13870msgid "Fetching a group and specifying refspecs does not make sense"
160fb2b2 13871msgstr "获取组并指定引用规格没有意义"
c04f5ac3 13872
2b472aae 13873#: builtin/fetch.c:1841
06991777
JX
13874msgid ""
13875"--filter can only be used with the remote configured in extensions."
13876"partialclone"
13877msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
13878
4c27fcb5 13879#: builtin/fmt-merge-msg.c:18
814ff314
JX
13880msgid ""
13881"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
13882msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
c04f5ac3 13883
2b472aae 13884#: builtin/fmt-merge-msg.c:671
ef317cd5 13885msgid "populate log with at most <n> entries from shortlog"
07432cef 13886msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 13887
2b472aae 13888#: builtin/fmt-merge-msg.c:674
ef317cd5 13889msgid "alias for --log (deprecated)"
07432cef 13890msgstr "参数 --log 的别名(已弃用)"
ef317cd5 13891
2b472aae 13892#: builtin/fmt-merge-msg.c:677
ef317cd5 13893msgid "text"
07432cef 13894msgstr "文本"
ef317cd5 13895
2b472aae 13896#: builtin/fmt-merge-msg.c:678
ef317cd5 13897msgid "use <text> as start of message"
07432cef 13898msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 13899
2b472aae 13900#: builtin/fmt-merge-msg.c:679
ef317cd5 13901msgid "file to read from"
07432cef 13902msgstr "从文件中读取"
ef317cd5 13903
a4f16749 13904#: builtin/for-each-ref.c:10
814ff314
JX
13905msgid "git for-each-ref [<options>] [<pattern>]"
13906msgstr "git for-each-ref [<选项>] [<模式>]"
ef317cd5 13907
a4f16749 13908#: builtin/for-each-ref.c:11
94550ed3
JX
13909msgid "git for-each-ref [--points-at <object>]"
13910msgstr "git for-each-ref [--points-at <对象>]"
13911
a4f16749 13912#: builtin/for-each-ref.c:12
87cb7997
JX
13913msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
13914msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
94550ed3 13915
a4f16749 13916#: builtin/for-each-ref.c:13
87cb7997
JX
13917msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
13918msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
94550ed3 13919
a4f16749 13920#: builtin/for-each-ref.c:28
ef317cd5 13921msgid "quote placeholders suitably for shells"
07432cef 13922msgstr "引用占位符适用于 shells"
ef317cd5 13923
a4f16749 13924#: builtin/for-each-ref.c:30
ef317cd5 13925msgid "quote placeholders suitably for perl"
07432cef 13926msgstr "引用占位符适用于 perl"
ef317cd5 13927
a4f16749 13928#: builtin/for-each-ref.c:32
ef317cd5 13929msgid "quote placeholders suitably for python"
07432cef 13930msgstr "引用占位符适用于 python"
ef317cd5 13931
a4f16749 13932#: builtin/for-each-ref.c:34
04cb2f28
JX
13933msgid "quote placeholders suitably for Tcl"
13934msgstr "引用占位符适用于 Tcl"
ef317cd5 13935
a4f16749 13936#: builtin/for-each-ref.c:37
ef317cd5 13937msgid "show only <n> matched refs"
07432cef 13938msgstr "只显示 <n> 个匹配的引用"
ef317cd5 13939
a6cd2cc4 13940#: builtin/for-each-ref.c:39 builtin/tag.c:439
6937cb4e
JX
13941msgid "respect format colors"
13942msgstr "遵照格式中的颜色输出"
13943
d46c5519 13944#: builtin/for-each-ref.c:42
94550ed3
JX
13945msgid "print only refs which points at the given object"
13946msgstr "只打印指向给定对象的引用"
ef317cd5 13947
d46c5519 13948#: builtin/for-each-ref.c:44
94550ed3
JX
13949msgid "print only refs that are merged"
13950msgstr "只打印已经合并的引用"
13951
d46c5519 13952#: builtin/for-each-ref.c:45
94550ed3
JX
13953msgid "print only refs that are not merged"
13954msgstr "只打印没有合并的引用"
ef317cd5 13955
d46c5519 13956#: builtin/for-each-ref.c:46
94550ed3
JX
13957msgid "print only refs which contain the commit"
13958msgstr "只打印包含该提交的引用"
13959
d46c5519 13960#: builtin/for-each-ref.c:47
87cb7997
JX
13961msgid "print only refs which don't contain the commit"
13962msgstr "只打印不包含该提交的引用"
13963
ddc12c42 13964#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
06991777
JX
13965msgid "unknown"
13966msgstr "未知"
13967
13968#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
ddc12c42 13969#: builtin/fsck.c:100 builtin/fsck.c:120
06991777
JX
13970#, c-format
13971msgid "error in %s %s: %s"
13972msgstr "%s %s 错误:%s"
13973
13974#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
ddc12c42 13975#: builtin/fsck.c:114
06991777
JX
13976#, c-format
13977msgid "warning in %s %s: %s"
13978msgstr "%s %s 警告:%s"
13979
ddc12c42 13980#: builtin/fsck.c:143 builtin/fsck.c:146
06991777
JX
13981#, c-format
13982msgid "broken link from %7s %s"
13983msgstr "来自 %7s %s 的损坏的链接"
13984
ddc12c42 13985#: builtin/fsck.c:155
06991777
JX
13986msgid "wrong object type in link"
13987msgstr "链接中错误的对象类型"
13988
ddc12c42 13989#: builtin/fsck.c:171
06991777
JX
13990#, c-format
13991msgid ""
13992"broken link from %7s %s\n"
13993" to %7s %s"
13994msgstr ""
13995"损坏的链接来自于 %7s %s\n"
13996" 到 %7s %s"
13997
ddc12c42 13998#: builtin/fsck.c:282
06991777
JX
13999#, c-format
14000msgid "missing %s %s"
14001msgstr "缺失 %s %s"
14002
ddc12c42 14003#: builtin/fsck.c:309
06991777
JX
14004#, c-format
14005msgid "unreachable %s %s"
5b533632 14006msgstr "不可达 %s %s"
06991777 14007
ddc12c42 14008#: builtin/fsck.c:329
06991777
JX
14009#, c-format
14010msgid "dangling %s %s"
14011msgstr "悬空 %s %s"
14012
ddc12c42 14013#: builtin/fsck.c:339
06991777
JX
14014msgid "could not create lost-found"
14015msgstr "不能创建 lost-found"
14016
ddc12c42 14017#: builtin/fsck.c:350
06991777
JX
14018#, c-format
14019msgid "could not finish '%s'"
14020msgstr "不能完成 '%s'"
14021
ddc12c42 14022#: builtin/fsck.c:367
06991777
JX
14023#, c-format
14024msgid "Checking %s"
14025msgstr "正在检查 %s"
14026
ddc12c42 14027#: builtin/fsck.c:405
06991777
JX
14028#, c-format
14029msgid "Checking connectivity (%d objects)"
14030msgstr "正在检查连通性(%d 个对象)"
14031
ddc12c42 14032#: builtin/fsck.c:424
06991777
JX
14033#, c-format
14034msgid "Checking %s %s"
14035msgstr "正在检查 %s %s"
14036
ddc12c42 14037#: builtin/fsck.c:429
06991777
JX
14038msgid "broken links"
14039msgstr "损坏的链接"
14040
ddc12c42 14041#: builtin/fsck.c:438
06991777
JX
14042#, c-format
14043msgid "root %s"
14044msgstr "根 %s"
14045
ddc12c42 14046#: builtin/fsck.c:446
06991777
JX
14047#, c-format
14048msgid "tagged %s %s (%s) in %s"
14049msgstr "标记 %s %s (%s) 于 %s"
14050
ddc12c42 14051#: builtin/fsck.c:475
06991777
JX
14052#, c-format
14053msgid "%s: object corrupt or missing"
14054msgstr "%s:对象损坏或丢失"
14055
ddc12c42 14056#: builtin/fsck.c:500
06991777
JX
14057#, c-format
14058msgid "%s: invalid reflog entry %s"
14059msgstr "%s:无效的引用日志条目 %s"
14060
ddc12c42 14061#: builtin/fsck.c:514
06991777
JX
14062#, c-format
14063msgid "Checking reflog %s->%s"
14064msgstr "正在检查引用日志 %s->%s"
14065
ddc12c42 14066#: builtin/fsck.c:548
06991777
JX
14067#, c-format
14068msgid "%s: invalid sha1 pointer %s"
14069msgstr "%s:无效的 sha1 指针 %s"
14070
ddc12c42 14071#: builtin/fsck.c:555
06991777
JX
14072#, c-format
14073msgid "%s: not a commit"
14074msgstr "%s:不是一个提交"
14075
ddc12c42 14076#: builtin/fsck.c:609
06991777
JX
14077msgid "notice: No default references"
14078msgstr "注意:无默认引用"
14079
ddc12c42 14080#: builtin/fsck.c:624
06991777
JX
14081#, c-format
14082msgid "%s: object corrupt or missing: %s"
14083msgstr "%s:对象损坏或丢失:%s"
14084
ddc12c42 14085#: builtin/fsck.c:637
06991777
JX
14086#, c-format
14087msgid "%s: object could not be parsed: %s"
14088msgstr "%s:不能解析对象:%s"
14089
ddc12c42 14090#: builtin/fsck.c:657
06991777
JX
14091#, c-format
14092msgid "bad sha1 file: %s"
14093msgstr "坏的 sha1 文件:%s"
14094
ddc12c42 14095#: builtin/fsck.c:672
06991777
JX
14096msgid "Checking object directory"
14097msgstr "正在检查对象目录"
14098
ddc12c42 14099#: builtin/fsck.c:675
6c94aba5 14100msgid "Checking object directories"
06991777
JX
14101msgstr "正在检查对象目录"
14102
ddc12c42 14103#: builtin/fsck.c:690
06991777
JX
14104#, c-format
14105msgid "Checking %s link"
14106msgstr "正在检查 %s 链接"
14107
2b472aae 14108#: builtin/fsck.c:695 builtin/index-pack.c:843
06991777
JX
14109#, c-format
14110msgid "invalid %s"
14111msgstr "无效的 %s"
14112
ddc12c42 14113#: builtin/fsck.c:702
06991777
JX
14114#, c-format
14115msgid "%s points to something strange (%s)"
14116msgstr "%s 指向奇怪的东西(%s)"
14117
ddc12c42 14118#: builtin/fsck.c:708
06991777
JX
14119#, c-format
14120msgid "%s: detached HEAD points at nothing"
14121msgstr "%s:分离头指针的指向不存在"
14122
ddc12c42 14123#: builtin/fsck.c:712
06991777
JX
14124#, c-format
14125msgid "notice: %s points to an unborn branch (%s)"
14126msgstr "注意:%s 指向一个尚未诞生的分支(%s)"
14127
ddc12c42 14128#: builtin/fsck.c:724
06991777
JX
14129msgid "Checking cache tree"
14130msgstr "正在检查缓存树"
14131
ddc12c42 14132#: builtin/fsck.c:729
06991777
JX
14133#, c-format
14134msgid "%s: invalid sha1 pointer in cache-tree"
14135msgstr "%s:cache-tree 中无效的 sha1 指针"
6c94aba5 14136
ddc12c42 14137#: builtin/fsck.c:738
06991777
JX
14138msgid "non-tree in cache-tree"
14139msgstr "cache-tree 中非树对象"
14140
ddc12c42 14141#: builtin/fsck.c:769
814ff314
JX
14142msgid "git fsck [<options>] [<object>...]"
14143msgstr "git fsck [<选项>] [<对象>...]"
ef317cd5 14144
ddc12c42 14145#: builtin/fsck.c:775
ef317cd5 14146msgid "show unreachable objects"
07432cef 14147msgstr "显示不可达的对象"
ef317cd5 14148
ddc12c42 14149#: builtin/fsck.c:776
ef317cd5 14150msgid "show dangling objects"
e640d114 14151msgstr "显示悬空的对象"
ef317cd5 14152
ddc12c42 14153#: builtin/fsck.c:777
ef317cd5 14154msgid "report tags"
55a16ee4 14155msgstr "报告标签"
ef317cd5 14156
ddc12c42 14157#: builtin/fsck.c:778
ef317cd5 14158msgid "report root nodes"
07432cef 14159msgstr "报告根节点"
ef317cd5 14160
ddc12c42 14161#: builtin/fsck.c:779
ef317cd5 14162msgid "make index objects head nodes"
07432cef 14163msgstr "将索引亦作为检查的头节点"
ef317cd5 14164
ddc12c42 14165#: builtin/fsck.c:780
ef317cd5 14166msgid "make reflogs head nodes (default)"
07432cef 14167msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 14168
ddc12c42 14169#: builtin/fsck.c:781
ef317cd5 14170msgid "also consider packs and alternate objects"
07432cef 14171msgstr "也考虑包和备用对象"
ef317cd5 14172
ddc12c42 14173#: builtin/fsck.c:782
1b7f4a34
JX
14174msgid "check only connectivity"
14175msgstr "仅检查连通性"
14176
ddc12c42 14177#: builtin/fsck.c:783
ef317cd5 14178msgid "enable more strict checking"
07432cef 14179msgstr "启用更严格的检查"
ef317cd5 14180
ddc12c42 14181#: builtin/fsck.c:785
ef317cd5 14182msgid "write dangling objects in .git/lost-found"
e640d114 14183msgstr "将悬空对象写入 .git/lost-found 中"
ef317cd5 14184
ddc12c42 14185#: builtin/fsck.c:786 builtin/prune.c:132
ef317cd5 14186msgid "show progress"
07432cef 14187msgstr "显示进度"
ef317cd5 14188
ddc12c42 14189#: builtin/fsck.c:787
5c57d762
JX
14190msgid "show verbose names for reachable objects"
14191msgstr "显示可达对象的详细名称"
14192
ddc12c42 14193#: builtin/fsck.c:846 builtin/index-pack.c:225
6c94aba5 14194msgid "Checking objects"
06991777
JX
14195msgstr "正在检查对象"
14196
ddc12c42 14197#: builtin/fsck.c:874
06991777
JX
14198#, c-format
14199msgid "%s: object missing"
14200msgstr "%s:对象缺失"
14201
ddc12c42 14202#: builtin/fsck.c:885
06991777
JX
14203#, c-format
14204msgid "invalid parameter: expected sha1, got '%s'"
14205msgstr "无效的参数:期望 sha1,得到 '%s'"
6c94aba5 14206
a5cd71ca 14207#: builtin/gc.c:35
814ff314
JX
14208msgid "git gc [<options>]"
14209msgstr "git gc [<选项>]"
ef317cd5 14210
c1ac5258 14211#: builtin/gc.c:90
c04f5ac3 14212#, c-format
87cb7997 14213msgid "Failed to fstat %s: %s"
65e2041e 14214msgstr "对 %s 调用 fstat 失败:%s"
c04f5ac3 14215
d46c5519
JX
14216#: builtin/gc.c:126
14217#, c-format
14218msgid "failed to parse '%s' value '%s'"
14219msgstr "无法解析 '%s' 值 '%s'"
14220
a5cd71ca 14221#: builtin/gc.c:475 builtin/init-db.c:55
c04f5ac3 14222#, c-format
4c27fcb5
JX
14223msgid "cannot stat '%s'"
14224msgstr "不能对 '%s' 调用 stat"
14225
a5cd71ca 14226#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
4c27fcb5
JX
14227#, c-format
14228msgid "cannot read '%s'"
14229msgstr "不能读取 '%s'"
c04f5ac3 14230
a5cd71ca 14231#: builtin/gc.c:491
94550ed3
JX
14232#, c-format
14233msgid ""
14234"The last gc run reported the following. Please correct the root cause\n"
14235"and remove %s.\n"
14236"Automatic cleanup will not be performed until the file is removed.\n"
14237"\n"
14238"%s"
14239msgstr ""
14240"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
14241"在该文件被删除之前,自动清理将不会执行。\n"
14242"\n"
14243"%s"
14244
a5cd71ca 14245#: builtin/gc.c:539
ef317cd5 14246msgid "prune unreferenced objects"
07432cef 14247msgstr "清除未引用的对象"
ef317cd5 14248
a5cd71ca 14249#: builtin/gc.c:541
ef317cd5 14250msgid "be more thorough (increased runtime)"
07432cef 14251msgstr "更彻底(增加运行时间)"
ef317cd5 14252
a5cd71ca 14253#: builtin/gc.c:542
ef317cd5 14254msgid "enable auto-gc mode"
07432cef 14255msgstr "启用自动垃圾回收模式"
ef317cd5 14256
a5cd71ca 14257#: builtin/gc.c:545
90314792
JX
14258msgid "force running gc even if there may be another gc running"
14259msgstr "强制执行 gc 即使另外一个 gc 正在执行"
14260
a5cd71ca 14261#: builtin/gc.c:548
fd8cb379
JX
14262msgid "repack all other packs except the largest pack"
14263msgstr "除了最大的包之外,对所有其它包文件重新打包"
14264
a5cd71ca 14265#: builtin/gc.c:565
fd8cb379
JX
14266#, c-format
14267msgid "failed to parse gc.logexpiry value %s"
c1ac5258 14268msgstr "解析 gc.logexpiry 的值 %s 失败"
fd8cb379 14269
a5cd71ca 14270#: builtin/gc.c:576
87cb7997 14271#, c-format
fd8cb379 14272msgid "failed to parse prune expiry value %s"
c1ac5258 14273msgstr "解析清除期限值 %s 失败"
87cb7997 14274
a5cd71ca 14275#: builtin/gc.c:596
c04f5ac3 14276#, c-format
6c94aba5 14277msgid "Auto packing the repository in background for optimum performance.\n"
160fb2b2 14278msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6c94aba5 14279
a5cd71ca 14280#: builtin/gc.c:598
6c94aba5
JX
14281#, c-format
14282msgid "Auto packing the repository for optimum performance.\n"
160fb2b2 14283msgstr "自动打包仓库以求最佳性能。\n"
6c94aba5 14284
a5cd71ca 14285#: builtin/gc.c:599
6c94aba5
JX
14286#, c-format
14287msgid "See \"git help gc\" for manual housekeeping.\n"
14288msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 14289
a5cd71ca 14290#: builtin/gc.c:639
90314792
JX
14291#, c-format
14292msgid ""
14293"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
14294msgstr ""
29004bbb 14295"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)"
90314792 14296
a5cd71ca 14297#: builtin/gc.c:694
c04f5ac3
JX
14298msgid ""
14299"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 14300msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 14301
2b472aae 14302#: builtin/grep.c:30
814ff314
JX
14303msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
14304msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
ef317cd5 14305
06991777 14306#: builtin/grep.c:225
c04f5ac3
JX
14307#, c-format
14308msgid "grep: failed to create thread: %s"
90e6ef53 14309msgstr "grep:无法创建线程:%s"
c04f5ac3 14310
06991777 14311#: builtin/grep.c:279
276ceeaa
JX
14312#, c-format
14313msgid "invalid number of threads specified (%d) for %s"
14314msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
14315
a4f16749
JX
14316#. TRANSLATORS: %s is the configuration
14317#. variable for tweaking threads, currently
14318#. grep.threads
14319#.
2b472aae
JX
14320#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
14321#: builtin/pack-objects.c:2854
a4f16749
JX
14322#, c-format
14323msgid "no threads support, ignoring %s"
14324msgstr "没有线程支持,忽略 %s"
14325
2b472aae 14326#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
c04f5ac3
JX
14327#, c-format
14328msgid "unable to read tree (%s)"
90e6ef53 14329msgstr "无法读取树(%s)"
c04f5ac3 14330
2b472aae 14331#: builtin/grep.c:633
c04f5ac3
JX
14332#, c-format
14333msgid "unable to grep from object of type %s"
14334msgstr "无法抓取来自于 %s 类型的对象"
14335
2b472aae 14336#: builtin/grep.c:704
c04f5ac3
JX
14337#, c-format
14338msgid "switch `%c' expects a numerical value"
14339msgstr "开关 `%c' 期望一个数字值"
14340
2b472aae 14341#: builtin/grep.c:803
ef317cd5 14342msgid "search in index instead of in the work tree"
07432cef 14343msgstr "在索引区搜索而不是在工作区"
ef317cd5 14344
2b472aae 14345#: builtin/grep.c:805
ef317cd5 14346msgid "find in contents not managed by git"
07432cef 14347msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
14348
14349# 译者:中文字符串拼接,可删除前导空格
2b472aae 14350#: builtin/grep.c:807
ef317cd5 14351msgid "search in both tracked and untracked files"
07432cef 14352msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 14353
2b472aae 14354#: builtin/grep.c:809
814ff314
JX
14355msgid "ignore files specified via '.gitignore'"
14356msgstr "忽略 '.gitignore' 包含的文件"
ef317cd5 14357
2b472aae 14358#: builtin/grep.c:811
87cb7997 14359msgid "recursively search in each submodule"
1a79b2f1
JX
14360msgstr "在每一个子模组中递归搜索"
14361
2b472aae 14362#: builtin/grep.c:814
ef317cd5 14363msgid "show non-matching lines"
07432cef 14364msgstr "显示未匹配的行"
ef317cd5 14365
2b472aae 14366#: builtin/grep.c:816
ef317cd5 14367msgid "case insensitive matching"
07432cef 14368msgstr "不区分大小写匹配"
ef317cd5 14369
2b472aae 14370#: builtin/grep.c:818
ef317cd5 14371msgid "match patterns only at word boundaries"
07432cef 14372msgstr "只在单词边界匹配模式"
ef317cd5 14373
2b472aae 14374#: builtin/grep.c:820
ef317cd5 14375msgid "process binary files as text"
07432cef 14376msgstr "把二进制文件当做文本处理"
ef317cd5 14377
2b472aae 14378#: builtin/grep.c:822
ef317cd5 14379msgid "don't match patterns in binary files"
07432cef 14380msgstr "不在二进制文件中匹配模式"
ef317cd5 14381
2b472aae 14382#: builtin/grep.c:825
90314792
JX
14383msgid "process binary files with textconv filters"
14384msgstr "用 textconv 过滤器处理二进制文件"
14385
2b472aae 14386#: builtin/grep.c:827
4c27fcb5
JX
14387msgid "search in subdirectories (default)"
14388msgstr "在子目录中寻找(默认)"
14389
2b472aae 14390#: builtin/grep.c:829
ef317cd5 14391msgid "descend at most <depth> levels"
07432cef 14392msgstr "最多以指定的深度向下寻找"
ef317cd5 14393
2b472aae 14394#: builtin/grep.c:833
ef317cd5 14395msgid "use extended POSIX regular expressions"
07432cef 14396msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 14397
2b472aae 14398#: builtin/grep.c:836
ef317cd5 14399msgid "use basic POSIX regular expressions (default)"
07432cef 14400msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 14401
2b472aae 14402#: builtin/grep.c:839
ef317cd5 14403msgid "interpret patterns as fixed strings"
07432cef 14404msgstr "把模式解析为固定的字符串"
ef317cd5 14405
2b472aae 14406#: builtin/grep.c:842
ef317cd5 14407msgid "use Perl-compatible regular expressions"
07432cef 14408msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 14409
2b472aae 14410#: builtin/grep.c:845
ef317cd5 14411msgid "show line numbers"
07432cef 14412msgstr "显示行号"
ef317cd5 14413
2b472aae 14414#: builtin/grep.c:846
c1ac5258
JX
14415msgid "show column number of first match"
14416msgstr "显示第一个匹配的列号"
14417
2b472aae 14418#: builtin/grep.c:847
ef317cd5 14419msgid "don't show filenames"
07432cef 14420msgstr "不显示文件名"
ef317cd5 14421
2b472aae 14422#: builtin/grep.c:848
ef317cd5 14423msgid "show filenames"
07432cef 14424msgstr "显示文件名"
ef317cd5 14425
2b472aae 14426#: builtin/grep.c:850
ef317cd5 14427msgid "show filenames relative to top directory"
07432cef 14428msgstr "显示相对于顶级目录的文件名"
ef317cd5 14429
2b472aae 14430#: builtin/grep.c:852
ef317cd5 14431msgid "show only filenames instead of matching lines"
07432cef 14432msgstr "只显示文件名而不显示匹配的行"
ef317cd5 14433
2b472aae 14434#: builtin/grep.c:854
ef317cd5 14435msgid "synonym for --files-with-matches"
07432cef 14436msgstr "和 --files-with-matches 同义"
ef317cd5 14437
2b472aae 14438#: builtin/grep.c:857
ef317cd5 14439msgid "show only the names of files without match"
07432cef 14440msgstr "只显示未匹配的文件名"
ef317cd5 14441
2b472aae 14442#: builtin/grep.c:859
ef317cd5 14443msgid "print NUL after filenames"
07432cef 14444msgstr "在文件名后输出 NUL 字符"
ef317cd5 14445
2b472aae 14446#: builtin/grep.c:862
c1ac5258
JX
14447msgid "show only matching parts of a line"
14448msgstr "只显示行中的匹配的部分"
14449
2b472aae 14450#: builtin/grep.c:864
ef317cd5 14451msgid "show the number of matches instead of matching lines"
07432cef 14452msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 14453
2b472aae 14454#: builtin/grep.c:865
ef317cd5 14455msgid "highlight matches"
07432cef 14456msgstr "高亮显示匹配项"
ef317cd5 14457
2b472aae 14458#: builtin/grep.c:867
ef317cd5 14459msgid "print empty line between matches from different files"
07432cef 14460msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 14461
2b472aae 14462#: builtin/grep.c:869
ef317cd5 14463msgid "show filename only once above matches from same file"
07432cef 14464msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 14465
2b472aae 14466#: builtin/grep.c:872
ef317cd5 14467msgid "show <n> context lines before and after matches"
07432cef 14468msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 14469
2b472aae 14470#: builtin/grep.c:875
ef317cd5 14471msgid "show <n> context lines before matches"
07432cef 14472msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 14473
2b472aae 14474#: builtin/grep.c:877
ef317cd5 14475msgid "show <n> context lines after matches"
07432cef 14476msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 14477
2b472aae 14478#: builtin/grep.c:879
276ceeaa
JX
14479msgid "use <n> worker threads"
14480msgstr "使用 <n> 个工作线程"
14481
2b472aae 14482#: builtin/grep.c:880
ef317cd5 14483msgid "shortcut for -C NUM"
07432cef 14484msgstr "快捷键 -C 数字"
ef317cd5 14485
2b472aae 14486#: builtin/grep.c:883
ef317cd5 14487msgid "show a line with the function name before matches"
07432cef 14488msgstr "在匹配的前面显示一行函数名"
ef317cd5 14489
2b472aae 14490#: builtin/grep.c:885
ef317cd5 14491msgid "show the surrounding function"
07432cef 14492msgstr "显示所在函数的前后内容"
ef317cd5 14493
2b472aae 14494#: builtin/grep.c:888
ef317cd5 14495msgid "read patterns from file"
07432cef 14496msgstr "从文件读取模式"
ef317cd5 14497
2b472aae 14498#: builtin/grep.c:890
ef317cd5 14499msgid "match <pattern>"
07432cef 14500msgstr "匹配 <模式>"
ef317cd5 14501
2b472aae 14502#: builtin/grep.c:892
ef317cd5 14503msgid "combine patterns specified with -e"
07432cef 14504msgstr "组合用 -e 参数设定的模式"
ef317cd5 14505
2b472aae 14506#: builtin/grep.c:904
ef317cd5 14507msgid "indicate hit with exit status without output"
07432cef 14508msgstr "不输出,而用退出码标识命中状态"
ef317cd5 14509
2b472aae 14510#: builtin/grep.c:906
ef317cd5 14511msgid "show only matches from files that match all patterns"
07432cef 14512msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 14513
2b472aae 14514#: builtin/grep.c:908
07432cef
WS
14515msgid "show parse tree for grep expression"
14516msgstr "显示 grep 表达式的解析树"
14517
2b472aae 14518#: builtin/grep.c:912
ef317cd5 14519msgid "pager"
07432cef 14520msgstr "分页"
ef317cd5 14521
2b472aae 14522#: builtin/grep.c:912
ef317cd5 14523msgid "show matching files in the pager"
07432cef 14524msgstr "分页显示匹配的文件"
ef317cd5 14525
2b472aae 14526#: builtin/grep.c:916
ef317cd5 14527msgid "allow calling of grep(1) (ignored by this build)"
07432cef 14528msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 14529
2b472aae 14530#: builtin/grep.c:983
c1ac5258
JX
14531msgid "no pattern given"
14532msgstr "未提供匹配模式"
c04f5ac3 14533
2b472aae 14534#: builtin/grep.c:1019
87cb7997
JX
14535msgid "--no-index or --untracked cannot be used with revs"
14536msgstr "--no-index 或 --untracked 不能和版本同时使用"
14537
2b472aae 14538#: builtin/grep.c:1027
87cb7997
JX
14539#, c-format
14540msgid "unable to resolve revision: %s"
14541msgstr "不能解析版本:%s"
14542
2b472aae
JX
14543#: builtin/grep.c:1057
14544msgid "--untracked not supported with --recurse-submodules"
14545msgstr "--untracked 不支持和 --recurse-submodules 共用"
14546
14547#: builtin/grep.c:1061
4c27fcb5
JX
14548msgid "invalid option combination, ignoring --threads"
14549msgstr "无效的选项组合,忽略 --threads"
276ceeaa 14550
2b472aae 14551#: builtin/grep.c:1064 builtin/pack-objects.c:3547
a4f16749
JX
14552msgid "no threads support, ignoring --threads"
14553msgstr "没有线程支持,忽略 --threads"
14554
2b472aae 14555#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
4c27fcb5
JX
14556#, c-format
14557msgid "invalid number of threads specified (%d)"
14558msgstr "指定的线程数无效(%d)"
14559
2b472aae 14560#: builtin/grep.c:1101
c04f5ac3
JX
14561msgid "--open-files-in-pager only works on the worktree"
14562msgstr "--open-files-in-pager 仅用于工作区"
14563
2b472aae 14564#: builtin/grep.c:1127
c1ac5258
JX
14565msgid "--cached or --untracked cannot be used with --no-index"
14566msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
c04f5ac3 14567
2b472aae 14568#: builtin/grep.c:1133
c1ac5258
JX
14569msgid "--[no-]exclude-standard cannot be used for tracked contents"
14570msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
c04f5ac3 14571
2b472aae 14572#: builtin/grep.c:1141
c1ac5258
JX
14573msgid "both --cached and trees are given"
14574msgstr "同时给出了 --cached 和树对象"
14575
06991777 14576#: builtin/hash-object.c:85
ef317cd5 14577msgid ""
814ff314
JX
14578"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
14579"[--] <file>..."
ef317cd5 14580msgstr ""
814ff314
JX
14581"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
14582"[--] <文件>..."
ef317cd5 14583
06991777 14584#: builtin/hash-object.c:86
94550ed3
JX
14585msgid "git hash-object --stdin-paths"
14586msgstr "git hash-object --stdin-paths"
ef317cd5 14587
06991777 14588#: builtin/hash-object.c:98
ef317cd5 14589msgid "object type"
07432cef 14590msgstr "对象类型"
ef317cd5 14591
06991777 14592#: builtin/hash-object.c:99
ef317cd5 14593msgid "write the object into the object database"
07432cef 14594msgstr "将对象写入对象数据库"
ef317cd5 14595
06991777 14596#: builtin/hash-object.c:101
ef317cd5 14597msgid "read the object from stdin"
07432cef 14598msgstr "从标准输入读取对象"
ef317cd5 14599
06991777 14600#: builtin/hash-object.c:103
ef317cd5 14601msgid "store file as is without filters"
07432cef 14602msgstr "原样存储文件不使用过滤器"
ef317cd5 14603
06991777 14604#: builtin/hash-object.c:104
220c313c
JX
14605msgid ""
14606"just hash any random garbage to create corrupt objects for debugging Git"
14607msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
14608
06991777 14609#: builtin/hash-object.c:105
ef317cd5 14610msgid "process file as it were from this path"
07432cef 14611msgstr "处理文件并假设其来自于此路径"
ef317cd5 14612
c1ac5258 14613#: builtin/help.c:46
ef317cd5 14614msgid "print all available commands"
07432cef 14615msgstr "打印所有可用的命令"
ef317cd5 14616
c1ac5258 14617#: builtin/help.c:47
a0b6b246
JX
14618msgid "exclude guides"
14619msgstr "排除向导"
14620
c1ac5258 14621#: builtin/help.c:48
4dcdc3d8
JX
14622msgid "print list of useful guides"
14623msgstr "显示有用的指南列表"
14624
c1ac5258
JX
14625#: builtin/help.c:49
14626msgid "print all configuration variable names"
14627msgstr "打印所有配置变量名称"
14628
14629#: builtin/help.c:51
ef317cd5 14630msgid "show man page"
07432cef 14631msgstr "显示 man 手册"
ef317cd5 14632
c1ac5258 14633#: builtin/help.c:52
ef317cd5 14634msgid "show manual in web browser"
07432cef 14635msgstr "在 web 浏览器中显示手册"
ef317cd5 14636
c1ac5258 14637#: builtin/help.c:54
ef317cd5 14638msgid "show info page"
07432cef 14639msgstr "显示 info 手册"
ef317cd5 14640
c1ac5258 14641#: builtin/help.c:56
fd8cb379
JX
14642msgid "print command description"
14643msgstr "打印命令描述"
14644
c1ac5258 14645#: builtin/help.c:61
814ff314
JX
14646msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
14647msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
ef317cd5 14648
d46c5519 14649#: builtin/help.c:77
81809b99 14650#, c-format
8ada9598 14651msgid "unrecognized help format '%s'"
81809b99 14652msgstr "未能识别的帮助格式 '%s'"
8ada9598 14653
d46c5519 14654#: builtin/help.c:104
8ada9598 14655msgid "Failed to start emacsclient."
81809b99 14656msgstr "无法启动 emacsclient。"
8ada9598 14657
d46c5519 14658#: builtin/help.c:117
8ada9598 14659msgid "Failed to parse emacsclient version."
81809b99 14660msgstr "无法解析 emacsclient 版本。"
8ada9598 14661
d46c5519 14662#: builtin/help.c:125
8ada9598
JX
14663#, c-format
14664msgid "emacsclient version '%d' too old (< 22)."
07432cef 14665msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 14666
d46c5519 14667#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
81809b99 14668#, c-format
5b04ee3b 14669msgid "failed to exec '%s'"
c1ac5258 14670msgstr "执行 '%s' 失败"
8ada9598 14671
d46c5519 14672#: builtin/help.c:221
8ada9598
JX
14673#, c-format
14674msgid ""
14675"'%s': path for unsupported man viewer.\n"
14676"Please consider using 'man.<tool>.cmd' instead."
14677msgstr ""
81809b99 14678"'%s':不支持的 man 手册查看器的路径。\n"
d9d56b23 14679"请使用 'man.<工具>.cmd'。"
8ada9598 14680
d46c5519 14681#: builtin/help.c:233
8ada9598
JX
14682#, c-format
14683msgid ""
14684"'%s': cmd for supported man viewer.\n"
14685"Please consider using 'man.<tool>.path' instead."
14686msgstr ""
81809b99 14687"'%s': 支持的 man 手册查看器命令。\n"
d9d56b23 14688"请使用 'man.<工具>.path'。"
8ada9598 14689
d46c5519 14690#: builtin/help.c:350
8ada9598
JX
14691#, c-format
14692msgid "'%s': unknown man viewer."
81809b99 14693msgstr "'%s':未知的 man 查看器。"
8ada9598 14694
d46c5519 14695#: builtin/help.c:367
8ada9598 14696msgid "no man viewer handled the request"
81809b99 14697msgstr "没有 man 查看器处理此请求"
8ada9598 14698
d46c5519 14699#: builtin/help.c:375
8ada9598 14700msgid "no info viewer handled the request"
81809b99 14701msgstr "没有 info 查看器处理此请求"
8ada9598 14702
a6cd2cc4 14703#: builtin/help.c:434 builtin/help.c:445 git.c:336
fd8cb379
JX
14704#, c-format
14705msgid "'%s' is aliased to '%s'"
14706msgstr "'%s' 是 '%s' 的别名"
220c313c 14707
a6cd2cc4 14708#: builtin/help.c:448 git.c:365
4c27fcb5
JX
14709#, c-format
14710msgid "bad alias.%s string: %s"
14711msgstr "坏的 alias.%s 字符串:%s"
14712
d46c5519 14713#: builtin/help.c:477 builtin/help.c:507
fd8cb379
JX
14714#, c-format
14715msgid "usage: %s%s"
14716msgstr "用法:%s%s"
4dcdc3d8 14717
d46c5519 14718#: builtin/help.c:491
c1ac5258
JX
14719msgid "'git help config' for more information"
14720msgstr "'git help config' 获取更多信息"
4dcdc3d8 14721
a6cd2cc4 14722#: builtin/index-pack.c:185
8ada9598
JX
14723#, c-format
14724msgid "object type mismatch at %s"
81809b99 14725msgstr "%s 的对象类型不匹配"
8ada9598 14726
a6cd2cc4 14727#: builtin/index-pack.c:205
6acbf033
JX
14728#, c-format
14729msgid "did not receive expected object %s"
a0b6b246 14730msgstr "未能获取预期的对象 %s"
8ada9598 14731
a6cd2cc4 14732#: builtin/index-pack.c:208
6acbf033
JX
14733#, c-format
14734msgid "object %s: expected type %s, found %s"
a0b6b246 14735msgstr "对象 %s:应为类型 %s,却是 %s"
6acbf033 14736
a6cd2cc4 14737#: builtin/index-pack.c:258
81809b99 14738#, c-format
8ada9598
JX
14739msgid "cannot fill %d byte"
14740msgid_plural "cannot fill %d bytes"
81809b99 14741msgstr[0] "无法填充 %d 字节"
5ae481e0 14742msgstr[1] "无法填充 %d 字节"
8ada9598 14743
a6cd2cc4 14744#: builtin/index-pack.c:268
8ada9598 14745msgid "early EOF"
81809b99 14746msgstr "过早的文件结束符(EOF)"
8ada9598 14747
a6cd2cc4 14748#: builtin/index-pack.c:269
8ada9598 14749msgid "read error on input"
81809b99 14750msgstr "输入上的读错误"
8ada9598 14751
a6cd2cc4 14752#: builtin/index-pack.c:281
8ada9598 14753msgid "used more bytes than were available"
81809b99 14754msgstr "用掉了超过可用的字节"
8ada9598 14755
2b472aae 14756#: builtin/index-pack.c:288 builtin/pack-objects.c:606
8ada9598 14757msgid "pack too large for current definition of off_t"
81809b99 14758msgstr "包太大超过了当前 off_t 的定义"
8ada9598 14759
ddc12c42 14760#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
a0b6b246
JX
14761msgid "pack exceeds maximum allowed size"
14762msgstr "包超过了最大允许值"
14763
a6cd2cc4 14764#: builtin/index-pack.c:312
81809b99 14765#, c-format
8ada9598 14766msgid "cannot open packfile '%s'"
81809b99 14767msgstr "无法打开包文件 '%s'"
8ada9598 14768
a6cd2cc4 14769#: builtin/index-pack.c:326
8ada9598 14770msgid "pack signature mismatch"
81809b99 14771msgstr "包签名不匹配"
8ada9598 14772
a6cd2cc4 14773#: builtin/index-pack.c:328
ef317cd5
JX
14774#, c-format
14775msgid "pack version %<PRIu32> unsupported"
07432cef 14776msgstr "不支持包版本 %<PRIu32>"
ef317cd5 14777
a6cd2cc4 14778#: builtin/index-pack.c:346
8ada9598 14779#, c-format
5c57d762
JX
14780msgid "pack has bad object at offset %<PRIuMAX>: %s"
14781msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
8ada9598 14782
a6cd2cc4 14783#: builtin/index-pack.c:466
8ada9598
JX
14784#, c-format
14785msgid "inflate returned %d"
81809b99 14786msgstr "解压缩返回 %d"
8ada9598 14787
a6cd2cc4 14788#: builtin/index-pack.c:515
8ada9598 14789msgid "offset value overflow for delta base object"
81809b99 14790msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 14791
a6cd2cc4 14792#: builtin/index-pack.c:523
8ada9598 14793msgid "delta base offset is out of bound"
81809b99 14794msgstr "delta 基准偏移越界"
8ada9598 14795
a6cd2cc4 14796#: builtin/index-pack.c:531
81809b99 14797#, c-format
8ada9598 14798msgid "unknown object type %d"
81809b99 14799msgstr "未知对象类型 %d"
8ada9598 14800
a6cd2cc4 14801#: builtin/index-pack.c:562
8ada9598 14802msgid "cannot pread pack file"
81809b99 14803msgstr "无法读取包文件"
8ada9598 14804
a6cd2cc4 14805#: builtin/index-pack.c:564
8ada9598 14806#, c-format
5c57d762
JX
14807msgid "premature end of pack file, %<PRIuMAX> byte missing"
14808msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
14809msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
14810msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8ada9598 14811
a6cd2cc4 14812#: builtin/index-pack.c:590
8ada9598 14813msgid "serious inflate inconsistency"
81809b99 14814msgstr "解压缩严重的不一致"
8ada9598 14815
2b472aae
JX
14816#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765
14817#: builtin/index-pack.c:804 builtin/index-pack.c:813
8ada9598
JX
14818#, c-format
14819msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 14820msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 14821
2b472aae
JX
14822#: builtin/index-pack.c:738 builtin/pack-objects.c:158
14823#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
6792b93b
JX
14824#, c-format
14825msgid "unable to read %s"
14826msgstr "不能读 %s"
14827
2b472aae 14828#: builtin/index-pack.c:802
87cb7997
JX
14829#, c-format
14830msgid "cannot read existing object info %s"
14831msgstr "不能读取现存对象信息 %s"
14832
2b472aae 14833#: builtin/index-pack.c:810
6792b93b
JX
14834#, c-format
14835msgid "cannot read existing object %s"
14836msgstr "不能读取现存对象 %s"
14837
2b472aae 14838#: builtin/index-pack.c:824
81809b99 14839#, c-format
8ada9598 14840msgid "invalid blob object %s"
160fb2b2 14841msgstr "无效的数据对象 %s"
8ada9598 14842
2b472aae 14843#: builtin/index-pack.c:827 builtin/index-pack.c:846
fd8cb379
JX
14844msgid "fsck error in packed object"
14845msgstr "对打包对象 fsck 检查出错"
14846
2b472aae 14847#: builtin/index-pack.c:848
8ada9598
JX
14848#, c-format
14849msgid "Not all child objects of %s are reachable"
81809b99 14850msgstr "%s 的所有子对象并非都可达"
8ada9598 14851
2b472aae 14852#: builtin/index-pack.c:920 builtin/index-pack.c:951
8ada9598 14853msgid "failed to apply delta"
c1ac5258 14854msgstr "应用 delta 失败"
8ada9598 14855
2b472aae 14856#: builtin/index-pack.c:1121
8ada9598 14857msgid "Receiving objects"
81809b99 14858msgstr "接收对象中"
8ada9598 14859
2b472aae 14860#: builtin/index-pack.c:1121
8ada9598 14861msgid "Indexing objects"
81809b99 14862msgstr "索引对象中"
8ada9598 14863
2b472aae 14864#: builtin/index-pack.c:1155
8ada9598 14865msgid "pack is corrupted (SHA1 mismatch)"
81809b99 14866msgstr "包冲突(SHA1 不匹配)"
8ada9598 14867
2b472aae 14868#: builtin/index-pack.c:1160
8ada9598 14869msgid "cannot fstat packfile"
65e2041e 14870msgstr "不能对包文件调用 fstat"
8ada9598 14871
2b472aae 14872#: builtin/index-pack.c:1163
8ada9598 14873msgid "pack has junk at the end"
81809b99 14874msgstr "包的结尾有垃圾数据"
8ada9598 14875
2b472aae 14876#: builtin/index-pack.c:1175
6792b93b
JX
14877msgid "confusion beyond insanity in parse_pack_objects()"
14878msgstr "parse_pack_objects() 中遇到不可理喻的问题"
14879
2b472aae 14880#: builtin/index-pack.c:1198
8ada9598 14881msgid "Resolving deltas"
81809b99 14882msgstr "处理 delta 中"
8ada9598 14883
2b472aae 14884#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
07432cef 14885#, c-format
ef317cd5 14886msgid "unable to create thread: %s"
07432cef 14887msgstr "不能创建线程:%s"
ef317cd5 14888
2b472aae 14889#: builtin/index-pack.c:1249
8ada9598 14890msgid "confusion beyond insanity"
81809b99 14891msgstr "不可理喻"
8ada9598 14892
2b472aae 14893#: builtin/index-pack.c:1255
ef317cd5 14894#, c-format
5b04ee3b
JX
14895msgid "completed with %d local object"
14896msgid_plural "completed with %d local objects"
14897msgstr[0] "完成 %d 个本地对象"
14898msgstr[1] "完成 %d 个本地对象"
ef317cd5 14899
2b472aae 14900#: builtin/index-pack.c:1267
ef317cd5
JX
14901#, c-format
14902msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 14903msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 14904
2b472aae 14905#: builtin/index-pack.c:1271
8ada9598
JX
14906#, c-format
14907msgid "pack has %d unresolved delta"
14908msgid_plural "pack has %d unresolved deltas"
81809b99 14909msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 14910msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 14911
2b472aae 14912#: builtin/index-pack.c:1295
81809b99 14913#, c-format
8ada9598 14914msgid "unable to deflate appended object (%d)"
07432cef 14915msgstr "不能压缩附加对象(%d)"
8ada9598 14916
2b472aae 14917#: builtin/index-pack.c:1392
8ada9598
JX
14918#, c-format
14919msgid "local object %s is corrupt"
81809b99 14920msgstr "本地对象 %s 已损坏"
8ada9598 14921
2b472aae 14922#: builtin/index-pack.c:1406
31e5e17b
JX
14923#, c-format
14924msgid "packfile name '%s' does not end with '.pack'"
14925msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
8ada9598 14926
2b472aae 14927#: builtin/index-pack.c:1431
81809b99 14928#, c-format
31e5e17b
JX
14929msgid "cannot write %s file '%s'"
14930msgstr "无法写入 %s 文件 '%s'"
8ada9598 14931
2b472aae 14932#: builtin/index-pack.c:1439
81809b99 14933#, c-format
31e5e17b
JX
14934msgid "cannot close written %s file '%s'"
14935msgstr "无法关闭已写入的 %s 文件 '%s'"
14936
2b472aae 14937#: builtin/index-pack.c:1463
31e5e17b
JX
14938msgid "error while closing pack file"
14939msgstr "关闭包文件时出错"
8ada9598 14940
2b472aae 14941#: builtin/index-pack.c:1477
8ada9598 14942msgid "cannot store pack file"
81809b99 14943msgstr "无法存储包文件"
8ada9598 14944
2b472aae 14945#: builtin/index-pack.c:1485
8ada9598 14946msgid "cannot store index file"
81809b99 14947msgstr "无法存储索引文件"
8ada9598 14948
2b472aae 14949#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
07432cef 14950#, c-format
ef317cd5 14951msgid "bad pack.indexversion=%<PRIu32>"
07432cef 14952msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 14953
2b472aae 14954#: builtin/index-pack.c:1597
81809b99 14955#, c-format
8ada9598 14956msgid "Cannot open existing pack file '%s'"
81809b99 14957msgstr "无法打开现存包文件 '%s'"
8ada9598 14958
2b472aae 14959#: builtin/index-pack.c:1599
81809b99 14960#, c-format
8ada9598 14961msgid "Cannot open existing pack idx file for '%s'"
81809b99 14962msgstr "无法为 %s 打开包索引文件"
8ada9598 14963
2b472aae 14964#: builtin/index-pack.c:1647
81809b99 14965#, c-format
8ada9598
JX
14966msgid "non delta: %d object"
14967msgid_plural "non delta: %d objects"
81809b99 14968msgstr[0] "非 delta:%d 个对象"
5ae481e0 14969msgstr[1] "非 delta:%d 个对象"
8ada9598 14970
2b472aae 14971#: builtin/index-pack.c:1654
8ada9598
JX
14972#, c-format
14973msgid "chain length = %d: %lu object"
14974msgid_plural "chain length = %d: %lu objects"
81809b99 14975msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 14976msgstr[1] "链长 = %d: %lu 对象"
8ada9598 14977
2b472aae 14978#: builtin/index-pack.c:1693
31e5e17b
JX
14979msgid "Cannot come back to cwd"
14980msgstr "无法返回当前工作目录"
5b04ee3b 14981
2b472aae
JX
14982#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
14983#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
81809b99 14984#, c-format
8ada9598 14985msgid "bad %s"
81809b99 14986msgstr "错误选项 %s"
8ada9598 14987
2b472aae 14988#: builtin/index-pack.c:1781
8ada9598 14989msgid "--fix-thin cannot be used without --stdin"
649900bc 14990msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 14991
2b472aae 14992#: builtin/index-pack.c:1783
1a79b2f1
JX
14993msgid "--stdin requires a git repository"
14994msgstr "--stdin 需要一个 git 仓库"
14995
2b472aae 14996#: builtin/index-pack.c:1789
8ada9598 14997msgid "--verify with no packfile name given"
dbd6cced 14998msgstr "--verify 没有提供包文件名参数"
8ada9598 14999
2b472aae 15000#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
fd8cb379
JX
15001msgid "fsck error in pack objects"
15002msgstr "在打包对象中 fsck 检查出错"
15003
a4f16749 15004#: builtin/init-db.c:61
c04f5ac3
JX
15005#, c-format
15006msgid "cannot stat template '%s'"
65e2041e 15007msgstr "不能对模版 '%s' 调用 stat"
c04f5ac3 15008
a4f16749 15009#: builtin/init-db.c:66
c04f5ac3
JX
15010#, c-format
15011msgid "cannot opendir '%s'"
15012msgstr "不能打开目录 '%s'"
15013
c1ac5258 15014#: builtin/init-db.c:78
c04f5ac3
JX
15015#, c-format
15016msgid "cannot readlink '%s'"
15017msgstr "不能读取链接 '%s'"
15018
c1ac5258 15019#: builtin/init-db.c:80
c04f5ac3
JX
15020#, c-format
15021msgid "cannot symlink '%s' '%s'"
90e6ef53 15022msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3 15023
c1ac5258 15024#: builtin/init-db.c:86
c04f5ac3
JX
15025#, c-format
15026msgid "cannot copy '%s' to '%s'"
15027msgstr "不能拷贝 '%s' 至 '%s'"
15028
c1ac5258 15029#: builtin/init-db.c:90
c04f5ac3
JX
15030#, c-format
15031msgid "ignoring template %s"
15032msgstr "忽略模版 %s"
15033
c1ac5258 15034#: builtin/init-db.c:121
c04f5ac3 15035#, c-format
fd8cb379
JX
15036msgid "templates not found in %s"
15037msgstr "没有在 %s 中找到模版"
c04f5ac3 15038
c1ac5258 15039#: builtin/init-db.c:136
c04f5ac3 15040#, c-format
5b04ee3b
JX
15041msgid "not copying templates from '%s': %s"
15042msgstr "没有从 '%s' 复制模版:%s"
c04f5ac3 15043
d46c5519 15044#: builtin/init-db.c:334
c04f5ac3
JX
15045#, c-format
15046msgid "unable to handle file type %d"
15047msgstr "不能处理 %d 类型的文件"
15048
d46c5519 15049#: builtin/init-db.c:337
c04f5ac3
JX
15050#, c-format
15051msgid "unable to move %s to %s"
15052msgstr "不能移动 %s 至 %s"
15053
d46c5519 15054#: builtin/init-db.c:354 builtin/init-db.c:357
a0b6b246
JX
15055#, c-format
15056msgid "%s already exists"
15057msgstr "%s 已经存在"
15058
d46c5519 15059#: builtin/init-db.c:413
c04f5ac3 15060#, c-format
5c57d762
JX
15061msgid "Reinitialized existing shared Git repository in %s%s\n"
15062msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
c04f5ac3 15063
d46c5519 15064#: builtin/init-db.c:414
5c57d762
JX
15065#, c-format
15066msgid "Reinitialized existing Git repository in %s%s\n"
15067msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
c04f5ac3 15068
d46c5519 15069#: builtin/init-db.c:418
5c57d762
JX
15070#, c-format
15071msgid "Initialized empty shared Git repository in %s%s\n"
9a4b694c 15072msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
c04f5ac3 15073
d46c5519 15074#: builtin/init-db.c:419
5c57d762
JX
15075#, c-format
15076msgid "Initialized empty Git repository in %s%s\n"
9a4b694c 15077msgstr "已初始化空的 Git 仓库于 %s%s\n"
c04f5ac3 15078
d46c5519 15079#: builtin/init-db.c:468
ef317cd5 15080msgid ""
a77c07d9 15081"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
814ff314 15082"shared[=<permissions>]] [<directory>]"
ef317cd5 15083msgstr ""
07432cef 15084"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
814ff314 15085"[<目录>]"
ef317cd5 15086
d46c5519 15087#: builtin/init-db.c:491
ef317cd5 15088msgid "permissions"
07432cef 15089msgstr "权限"
ef317cd5 15090
d46c5519 15091#: builtin/init-db.c:492
ef317cd5 15092msgid "specify that the git repository is to be shared amongst several users"
160fb2b2 15093msgstr "指定 git 仓库是多个用户之间共享的"
ef317cd5 15094
a6cd2cc4 15095#: builtin/init-db.c:529 builtin/init-db.c:534
c1ac5258
JX
15096#, c-format
15097msgid "cannot mkdir %s"
15098msgstr "不能创建目录 %s"
15099
a6cd2cc4 15100#: builtin/init-db.c:538
c04f5ac3
JX
15101#, c-format
15102msgid "cannot chdir to %s"
15103msgstr "不能切换目录到 %s"
15104
a6cd2cc4 15105#: builtin/init-db.c:559
c04f5ac3
JX
15106#, c-format
15107msgid ""
15108"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
15109"dir=<directory>)"
1e607449 15110msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
c04f5ac3 15111
a6cd2cc4 15112#: builtin/init-db.c:587
c04f5ac3
JX
15113#, c-format
15114msgid "Cannot access work tree '%s'"
15115msgstr "不能访问工作区 '%s'"
15116
a6cd2cc4 15117#: builtin/interpret-trailers.c:16
220c313c 15118msgid ""
276ceeaa
JX
15119"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
15120"<token>[(=|:)<value>])...] [<file>...]"
3495628d
JX
15121msgstr ""
15122"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
15123">])...] [<文件>...]"
276ceeaa 15124
a6cd2cc4 15125#: builtin/interpret-trailers.c:95
276ceeaa
JX
15126msgid "edit files in place"
15127msgstr "在原位编辑文件"
220c313c 15128
a6cd2cc4 15129#: builtin/interpret-trailers.c:96
220c313c 15130msgid "trim empty trailers"
6937cb4e
JX
15131msgstr "删除空的尾部署名"
15132
a6cd2cc4 15133#: builtin/interpret-trailers.c:99
6937cb4e
JX
15134msgid "where to place the new trailer"
15135msgstr "在哪里放置新的尾部署名"
220c313c 15136
a6cd2cc4 15137#: builtin/interpret-trailers.c:101
6937cb4e
JX
15138msgid "action if trailer already exists"
15139msgstr "当尾部署名已经存在时所采取的动作"
15140
a6cd2cc4 15141#: builtin/interpret-trailers.c:103
6937cb4e
JX
15142msgid "action if trailer is missing"
15143msgstr "当尾部署名缺失时所采取的动作"
15144
a6cd2cc4 15145#: builtin/interpret-trailers.c:105
6937cb4e
JX
15146msgid "output only the trailers"
15147msgstr "只输出尾部署名"
15148
a6cd2cc4 15149#: builtin/interpret-trailers.c:106
6937cb4e
JX
15150msgid "do not apply config rules"
15151msgstr "不要应用配置规则"
15152
a6cd2cc4 15153#: builtin/interpret-trailers.c:107
6937cb4e
JX
15154msgid "join whitespace-continued values"
15155msgstr "连接空白折行的值"
15156
a6cd2cc4 15157#: builtin/interpret-trailers.c:108
6937cb4e
JX
15158msgid "set parsing options"
15159msgstr "设置解析选项"
15160
a6cd2cc4 15161#: builtin/interpret-trailers.c:110
4c27fcb5
JX
15162msgid "do not treat --- specially"
15163msgstr "不要对 --- 特殊处理"
15164
a6cd2cc4 15165#: builtin/interpret-trailers.c:111
220c313c 15166msgid "trailer"
6937cb4e 15167msgstr "尾部署名"
220c313c 15168
a6cd2cc4 15169#: builtin/interpret-trailers.c:112
220c313c 15170msgid "trailer(s) to add"
6937cb4e 15171msgstr "要添加的尾部署名"
220c313c 15172
a6cd2cc4 15173#: builtin/interpret-trailers.c:123
6937cb4e
JX
15174msgid "--trailer with --only-input does not make sense"
15175msgstr "--trailer 和 --only-input 同时使用没有意义"
15176
a6cd2cc4 15177#: builtin/interpret-trailers.c:133
276ceeaa
JX
15178msgid "no input file given for in-place editing"
15179msgstr "没有给出要原位编辑的文件"
15180
ddc12c42 15181#: builtin/log.c:56
7aea43ff 15182msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
d9d56b23 15183msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
ef317cd5 15184
ddc12c42 15185#: builtin/log.c:57
814ff314
JX
15186msgid "git show [<options>] <object>..."
15187msgstr "git show [<选项>] <对象>..."
ef317cd5 15188
ddc12c42 15189#: builtin/log.c:110
220c313c
JX
15190#, c-format
15191msgid "invalid --decorate option: %s"
15192msgstr "无效的 --decorate 选项:%s"
15193
ddc12c42 15194#: builtin/log.c:174
ef317cd5 15195msgid "show source"
07432cef 15196msgstr "显示源"
ef317cd5 15197
ddc12c42 15198#: builtin/log.c:175
07432cef
WS
15199msgid "Use mail map file"
15200msgstr "使用邮件映射文件"
15201
ddc12c42 15202#: builtin/log.c:177
5809aa05
JX
15203msgid "only decorate refs that match <pattern>"
15204msgstr "只修饰与 <模式> 匹配的引用"
15205
ddc12c42 15206#: builtin/log.c:179
5809aa05
JX
15207msgid "do not decorate refs that match <pattern>"
15208msgstr "不修饰和 <模式> 匹配的引用"
15209
ddc12c42 15210#: builtin/log.c:180
ef317cd5 15211msgid "decorate options"
07432cef 15212msgstr "修饰选项"
ef317cd5 15213
ddc12c42 15214#: builtin/log.c:183
220c313c
JX
15215msgid "Process line range n,m in file, counting from 1"
15216msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
15217
ddc12c42 15218#: builtin/log.c:281
c04f5ac3
JX
15219#, c-format
15220msgid "Final output: %d %s\n"
15221msgstr "最终输出:%d %s\n"
15222
ddc12c42 15223#: builtin/log.c:535
220c313c
JX
15224#, c-format
15225msgid "git show %s: bad file"
15226msgstr "git show %s: 损坏的文件"
15227
ddc12c42 15228#: builtin/log.c:550 builtin/log.c:645
c04f5ac3 15229#, c-format
d46c5519 15230msgid "could not read object %s"
90e6ef53 15231msgstr "不能读取对象 %s"
c04f5ac3 15232
ddc12c42 15233#: builtin/log.c:670
c04f5ac3 15234#, c-format
d46c5519 15235msgid "unknown type: %d"
c04f5ac3
JX
15236msgstr "未知类型:%d"
15237
ddc12c42
JX
15238#: builtin/log.c:814
15239#, c-format
15240msgid "%s: invalid cover from description mode"
15241msgstr "%s:从描述生成附函的模式无效"
15242
15243#: builtin/log.c:821
c04f5ac3
JX
15244msgid "format.headers without value"
15245msgstr "format.headers 没有值"
15246
ddc12c42 15247#: builtin/log.c:936
c04f5ac3
JX
15248msgid "name of output directory is too long"
15249msgstr "输出目录名太长"
15250
ddc12c42 15251#: builtin/log.c:952
c04f5ac3 15252#, c-format
d46c5519 15253msgid "cannot open patch file %s"
c04f5ac3
JX
15254msgstr "无法打开补丁文件 %s"
15255
ddc12c42 15256#: builtin/log.c:969
d46c5519
JX
15257msgid "need exactly one range"
15258msgstr "只需要一个范围"
c04f5ac3 15259
ddc12c42 15260#: builtin/log.c:979
d46c5519
JX
15261msgid "not a range"
15262msgstr "不是一个范围"
c04f5ac3 15263
ddc12c42 15264#: builtin/log.c:1143
d46c5519
JX
15265msgid "cover letter needs email format"
15266msgstr "附函需要邮件地址格式"
c04f5ac3 15267
ddc12c42 15268#: builtin/log.c:1149
d46c5519
JX
15269msgid "failed to create cover-letter file"
15270msgstr "无法创建附函文件"
15271
ddc12c42 15272#: builtin/log.c:1228
c04f5ac3
JX
15273#, c-format
15274msgid "insane in-reply-to: %s"
15275msgstr "不正常的 in-reply-to:%s"
15276
ddc12c42 15277#: builtin/log.c:1255
814ff314
JX
15278msgid "git format-patch [<options>] [<since> | <revision-range>]"
15279msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
ef317cd5 15280
ddc12c42 15281#: builtin/log.c:1313
d46c5519 15282msgid "two output directories?"
c04f5ac3
JX
15283msgstr "两个输出目录?"
15284
ddc12c42 15285#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
5b04ee3b 15286#, c-format
d46c5519 15287msgid "unknown commit %s"
5b04ee3b
JX
15288msgstr "未知提交 %s"
15289
ddc12c42 15290#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
d46c5519 15291#: builtin/replace.c:210
5b04ee3b 15292#, c-format
d46c5519
JX
15293msgid "failed to resolve '%s' as a valid ref"
15294msgstr "无法将 '%s' 解析为一个有效引用"
5b04ee3b 15295
ddc12c42 15296#: builtin/log.c:1439
d46c5519
JX
15297msgid "could not find exact merge base"
15298msgstr "不能找到准确的合并基线"
5b04ee3b 15299
ddc12c42 15300#: builtin/log.c:1443
5b04ee3b 15301msgid ""
d46c5519 15302"failed to get upstream, if you want to record base commit automatically,\n"
5b04ee3b 15303"please use git branch --set-upstream-to to track a remote branch.\n"
d46c5519 15304"Or you could specify base commit by --base=<base-commit-id> manually"
5b04ee3b
JX
15305msgstr ""
15306"无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
aef18cc6 15307"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
d46c5519 15308"参数 --base=<基线提交> 手动指定一个基线提交"
5b04ee3b 15309
ddc12c42 15310#: builtin/log.c:1463
d46c5519 15311msgid "failed to find exact merge base"
5b04ee3b
JX
15312msgstr "无法找到准确的合并基线"
15313
ddc12c42 15314#: builtin/log.c:1474
5b04ee3b
JX
15315msgid "base commit should be the ancestor of revision list"
15316msgstr "基线提交应该是版本列表的祖先"
15317
ddc12c42 15318#: builtin/log.c:1478
5b04ee3b
JX
15319msgid "base commit shouldn't be in revision list"
15320msgstr "基线提交不应该出现在版本列表中"
15321
ddc12c42 15322#: builtin/log.c:1531
5b04ee3b 15323msgid "cannot get patch id"
aef18cc6 15324msgstr "无法得到补丁 id"
5b04ee3b 15325
ddc12c42 15326#: builtin/log.c:1583
4c27fcb5
JX
15327msgid "failed to infer range-diff ranges"
15328msgstr "无法推断 range-diff 范围"
15329
ddc12c42 15330#: builtin/log.c:1629
ef317cd5 15331msgid "use [PATCH n/m] even with a single patch"
07432cef 15332msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 15333
ddc12c42 15334#: builtin/log.c:1632
ef317cd5 15335msgid "use [PATCH] even with multiple patches"
07432cef 15336msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 15337
ddc12c42 15338#: builtin/log.c:1636
ef317cd5 15339msgid "print patches to standard out"
07432cef 15340msgstr "打印补丁到标准输出"
c04f5ac3 15341
ddc12c42 15342#: builtin/log.c:1638
ef317cd5 15343msgid "generate a cover letter"
d46c5519 15344msgstr "生成一封附函"
c04f5ac3 15345
ddc12c42 15346#: builtin/log.c:1640
ef317cd5 15347msgid "use simple number sequence for output file names"
07432cef 15348msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 15349
ddc12c42 15350#: builtin/log.c:1641
ef317cd5 15351msgid "sfx"
07432cef 15352msgstr "后缀"
ef317cd5 15353
ddc12c42 15354#: builtin/log.c:1642
ef317cd5 15355msgid "use <sfx> instead of '.patch'"
07432cef 15356msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 15357
ddc12c42 15358#: builtin/log.c:1644
ef317cd5 15359msgid "start numbering patches at <n> instead of 1"
07432cef
WS
15360msgstr "补丁以 <n> 开始编号,而不是1"
15361
ddc12c42 15362#: builtin/log.c:1646
07432cef
WS
15363msgid "mark the series as Nth re-roll"
15364msgstr "标记补丁系列是第几次重制"
ef317cd5 15365
ddc12c42 15366#: builtin/log.c:1648
a0b6b246
JX
15367msgid "Use [RFC PATCH] instead of [PATCH]"
15368msgstr "使用 [RFC PATCH] 代替 [PATCH]"
15369
ddc12c42
JX
15370#: builtin/log.c:1651
15371msgid "cover-from-description-mode"
15372msgstr "从分支描述获取附函的模式"
15373
15374#: builtin/log.c:1652
15375msgid "generate parts of a cover letter based on a branch's description"
15376msgstr "基于一个分支描述生成部分附函"
15377
15378#: builtin/log.c:1654
ef317cd5 15379msgid "Use [<prefix>] instead of [PATCH]"
07432cef 15380msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 15381
ddc12c42 15382#: builtin/log.c:1657
ef317cd5 15383msgid "store resulting files in <dir>"
d9d56b23 15384msgstr "把结果文件存储在 <目录>"
ef317cd5 15385
ddc12c42 15386#: builtin/log.c:1660
ef317cd5 15387msgid "don't strip/add [PATCH]"
07432cef 15388msgstr "不删除/添加 [PATCH]"
ef317cd5 15389
ddc12c42 15390#: builtin/log.c:1663
ef317cd5 15391msgid "don't output binary diffs"
07432cef 15392msgstr "不输出二进制差异"
ef317cd5 15393
ddc12c42 15394#: builtin/log.c:1665
89f80d72
JX
15395msgid "output all-zero hash in From header"
15396msgstr "在 From 头信息中输出全为零的哈希值"
15397
ddc12c42 15398#: builtin/log.c:1667
ef317cd5 15399msgid "don't include a patch matching a commit upstream"
07432cef 15400msgstr "不包含已在上游提交中的补丁"
ef317cd5 15401
ddc12c42 15402#: builtin/log.c:1669
ef317cd5 15403msgid "show patch format instead of default (patch + stat)"
07432cef 15404msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 15405
ddc12c42 15406#: builtin/log.c:1671
ef317cd5 15407msgid "Messaging"
07432cef 15408msgstr "邮件发送"
ef317cd5 15409
ddc12c42 15410#: builtin/log.c:1672
ef317cd5 15411msgid "header"
07432cef 15412msgstr "header"
ef317cd5 15413
ddc12c42 15414#: builtin/log.c:1673
ef317cd5 15415msgid "add email header"
07432cef 15416msgstr "添加邮件头"
ef317cd5 15417
ddc12c42 15418#: builtin/log.c:1674 builtin/log.c:1676
ef317cd5 15419msgid "email"
07432cef 15420msgstr "邮件地址"
ef317cd5 15421
ddc12c42 15422#: builtin/log.c:1674
ef317cd5 15423msgid "add To: header"
07432cef 15424msgstr "添加收件人"
ef317cd5 15425
ddc12c42 15426#: builtin/log.c:1676
ef317cd5 15427msgid "add Cc: header"
07432cef 15428msgstr "添加抄送"
ef317cd5 15429
ddc12c42 15430#: builtin/log.c:1678
2e8451e8 15431msgid "ident"
d9d56b23 15432msgstr "标识"
2e8451e8 15433
ddc12c42 15434#: builtin/log.c:1679
2e8451e8 15435msgid "set From address to <ident> (or committer ident if absent)"
4375c10e 15436msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
2e8451e8 15437
ddc12c42 15438#: builtin/log.c:1681
ef317cd5 15439msgid "message-id"
d9d56b23 15440msgstr "邮件标识"
ef317cd5 15441
ddc12c42 15442#: builtin/log.c:1682
ef317cd5 15443msgid "make first mail a reply to <message-id>"
d9d56b23 15444msgstr "使第一封邮件作为对 <邮件标识> 的回复"
ef317cd5 15445
ddc12c42 15446#: builtin/log.c:1683 builtin/log.c:1686
ef317cd5 15447msgid "boundary"
07432cef 15448msgstr "边界"
ef317cd5 15449
ddc12c42 15450#: builtin/log.c:1684
ef317cd5 15451msgid "attach the patch"
07432cef 15452msgstr "附件方式添加补丁"
ef317cd5 15453
ddc12c42 15454#: builtin/log.c:1687
ef317cd5 15455msgid "inline the patch"
07432cef 15456msgstr "内联显示补丁"
ef317cd5 15457
ddc12c42 15458#: builtin/log.c:1691
ef317cd5 15459msgid "enable message threading, styles: shallow, deep"
07432cef 15460msgstr "启用邮件线索,风格:浅,深"
ef317cd5 15461
ddc12c42 15462#: builtin/log.c:1693
ef317cd5 15463msgid "signature"
07432cef 15464msgstr "签名"
ef317cd5 15465
ddc12c42 15466#: builtin/log.c:1694
ef317cd5 15467msgid "add a signature"
07432cef 15468msgstr "添加一个签名"
ef317cd5 15469
ddc12c42 15470#: builtin/log.c:1695
5b04ee3b
JX
15471msgid "base-commit"
15472msgstr "基线提交"
15473
ddc12c42 15474#: builtin/log.c:1696
5b04ee3b
JX
15475msgid "add prerequisite tree info to the patch series"
15476msgstr "为补丁列表添加前置树信息"
15477
ddc12c42 15478#: builtin/log.c:1698
6acbf033
JX
15479msgid "add a signature from a file"
15480msgstr "从文件添加一个签名"
15481
ddc12c42 15482#: builtin/log.c:1699
ef317cd5 15483msgid "don't print the patch filenames"
07432cef 15484msgstr "不要打印补丁文件名"
ef317cd5 15485
ddc12c42 15486#: builtin/log.c:1701
6937cb4e
JX
15487msgid "show progress while generating patches"
15488msgstr "在生成补丁时显示进度"
15489
ddc12c42 15490#: builtin/log.c:1703
4c27fcb5
JX
15491msgid "show changes against <rev> in cover letter or single patch"
15492msgstr "在附函或单个补丁中显示和 <rev> 的差异"
15493
ddc12c42 15494#: builtin/log.c:1706
4c27fcb5
JX
15495msgid "show changes against <refspec> in cover letter or single patch"
15496msgstr "在附函或单个补丁中显示和 <refspec> 的差异"
15497
ddc12c42 15498#: builtin/log.c:1708
4c27fcb5
JX
15499msgid "percentage by which creation is weighted"
15500msgstr "创建权重的百分比"
15501
ddc12c42 15502#: builtin/log.c:1792
a4f16749
JX
15503#, c-format
15504msgid "invalid ident line: %s"
15505msgstr "包含无效的身份标识:%s"
15506
ddc12c42 15507#: builtin/log.c:1807
c1ac5258
JX
15508msgid "-n and -k are mutually exclusive"
15509msgstr "-n 和 -k 互斥"
c04f5ac3 15510
ddc12c42 15511#: builtin/log.c:1809
c1ac5258
JX
15512msgid "--subject-prefix/--rfc and -k are mutually exclusive"
15513msgstr "--subject-prefix/--rfc 和 -k 互斥"
c04f5ac3 15514
ddc12c42 15515#: builtin/log.c:1817
c04f5ac3
JX
15516msgid "--name-only does not make sense"
15517msgstr "--name-only 无意义"
15518
ddc12c42 15519#: builtin/log.c:1819
c04f5ac3
JX
15520msgid "--name-status does not make sense"
15521msgstr "--name-status 无意义"
15522
ddc12c42 15523#: builtin/log.c:1821
c04f5ac3
JX
15524msgid "--check does not make sense"
15525msgstr "--check 无意义"
15526
ddc12c42 15527#: builtin/log.c:1854
c04f5ac3
JX
15528msgid "standard output, or directory, which one?"
15529msgstr "标准输出或目录,哪一个?"
15530
ddc12c42 15531#: builtin/log.c:1958
4c27fcb5
JX
15532msgid "--interdiff requires --cover-letter or single patch"
15533msgstr "--interdiff 需要 --cover-letter 或单一补丁"
15534
ddc12c42 15535#: builtin/log.c:1962
4c27fcb5
JX
15536msgid "Interdiff:"
15537msgstr "版本间差异:"
15538
ddc12c42 15539#: builtin/log.c:1963
4c27fcb5
JX
15540#, c-format
15541msgid "Interdiff against v%d:"
15542msgstr "对 v%d 的版本差异:"
15543
ddc12c42 15544#: builtin/log.c:1969
4c27fcb5
JX
15545msgid "--creation-factor requires --range-diff"
15546msgstr "--creation-factor 需要 --range-diff"
15547
ddc12c42 15548#: builtin/log.c:1973
4c27fcb5
JX
15549msgid "--range-diff requires --cover-letter or single patch"
15550msgstr "--range-diff 需要 --cover-letter 或单一补丁"
15551
ddc12c42 15552#: builtin/log.c:1981
4c27fcb5
JX
15553msgid "Range-diff:"
15554msgstr "范围差异:"
15555
ddc12c42 15556#: builtin/log.c:1982
4c27fcb5
JX
15557#, c-format
15558msgid "Range-diff against v%d:"
15559msgstr "对 v%d 的范围差异:"
15560
ddc12c42 15561#: builtin/log.c:1993
6acbf033
JX
15562#, c-format
15563msgid "unable to read signature file '%s'"
15564msgstr "无法读取签名文件 '%s'"
15565
ddc12c42 15566#: builtin/log.c:2029
6937cb4e
JX
15567msgid "Generating patches"
15568msgstr "生成补丁"
15569
ddc12c42 15570#: builtin/log.c:2073
d46c5519 15571msgid "failed to create output files"
c04f5ac3
JX
15572msgstr "无法创建输出文件"
15573
ddc12c42 15574#: builtin/log.c:2132
ef317cd5 15575msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 15576msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 15577
ddc12c42 15578#: builtin/log.c:2186
c04f5ac3
JX
15579#, c-format
15580msgid ""
15581"Could not find a tracked remote branch, please specify <upstream> manually.\n"
d9d56b23 15582msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
c04f5ac3 15583
06991777 15584#: builtin/ls-files.c:470
814ff314
JX
15585msgid "git ls-files [<options>] [<file>...]"
15586msgstr "git ls-files [<选项>] [<文件>...]"
ef317cd5 15587
06991777 15588#: builtin/ls-files.c:526
ef317cd5 15589msgid "identify the file status with tags"
07432cef 15590msgstr "用标签标识文件的状态"
ef317cd5 15591
06991777 15592#: builtin/ls-files.c:528
ef317cd5 15593msgid "use lowercase letters for 'assume unchanged' files"
07432cef 15594msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 15595
06991777 15596#: builtin/ls-files.c:530
5809aa05
JX
15597msgid "use lowercase letters for 'fsmonitor clean' files"
15598msgstr "使用小写字母表示 'fsmonitor clean' 文件"
15599
06991777 15600#: builtin/ls-files.c:532
ef317cd5 15601msgid "show cached files in the output (default)"
07432cef 15602msgstr "显示缓存的文件(默认)"
ef317cd5 15603
06991777 15604#: builtin/ls-files.c:534
ef317cd5 15605msgid "show deleted files in the output"
07432cef 15606msgstr "显示已删除的文件"
ef317cd5 15607
06991777 15608#: builtin/ls-files.c:536
ef317cd5 15609msgid "show modified files in the output"
07432cef 15610msgstr "显示已修改的文件"
ef317cd5 15611
06991777 15612#: builtin/ls-files.c:538
ef317cd5 15613msgid "show other files in the output"
07432cef 15614msgstr "显示其它文件"
ef317cd5 15615
06991777 15616#: builtin/ls-files.c:540
ef317cd5 15617msgid "show ignored files in the output"
07432cef 15618msgstr "显示忽略的文件"
ef317cd5 15619
06991777 15620#: builtin/ls-files.c:543
ef317cd5 15621msgid "show staged contents' object name in the output"
07432cef 15622msgstr "显示暂存区内容的对象名称"
ef317cd5 15623
06991777 15624#: builtin/ls-files.c:545
ef317cd5 15625msgid "show files on the filesystem that need to be removed"
07432cef 15626msgstr "显示文件系统需要删除的文件"
ef317cd5 15627
06991777 15628#: builtin/ls-files.c:547
220c313c 15629msgid "show 'other' directories' names only"
07432cef 15630msgstr "只显示“其他”目录的名称"
ef317cd5 15631
06991777 15632#: builtin/ls-files.c:549
276ceeaa
JX
15633msgid "show line endings of files"
15634msgstr "显示文件换行符格式"
15635
06991777 15636#: builtin/ls-files.c:551
ef317cd5 15637msgid "don't show empty directories"
07432cef 15638msgstr "不显示空目录"
ef317cd5 15639
06991777 15640#: builtin/ls-files.c:554
ef317cd5 15641msgid "show unmerged files in the output"
07432cef 15642msgstr "显示未合并的文件"
ef317cd5 15643
06991777 15644#: builtin/ls-files.c:556
ef317cd5 15645msgid "show resolve-undo information"
07432cef 15646msgstr "显示 resolve-undo 信息"
ef317cd5 15647
06991777 15648#: builtin/ls-files.c:558
ef317cd5 15649msgid "skip files matching pattern"
07432cef 15650msgstr "匹配排除文件的模式"
ef317cd5 15651
06991777 15652#: builtin/ls-files.c:561
ef317cd5 15653msgid "exclude patterns are read from <file>"
07432cef 15654msgstr "从 <文件> 中读取排除模式"
ef317cd5 15655
06991777 15656#: builtin/ls-files.c:564
ef317cd5 15657msgid "read additional per-directory exclude patterns in <file>"
07432cef 15658msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 15659
06991777 15660#: builtin/ls-files.c:566
ef317cd5 15661msgid "add the standard git exclusions"
07432cef 15662msgstr "添加标准的 git 排除"
ef317cd5 15663
06991777 15664#: builtin/ls-files.c:570
ef317cd5 15665msgid "make the output relative to the project top directory"
07432cef 15666msgstr "显示相对于顶级目录的文件名"
ef317cd5 15667
06991777 15668#: builtin/ls-files.c:573
a0b6b246
JX
15669msgid "recurse through submodules"
15670msgstr "在子模组中递归"
15671
06991777 15672#: builtin/ls-files.c:575
ef317cd5 15673msgid "if any <file> is not in the index, treat this as an error"
07432cef 15674msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 15675
06991777 15676#: builtin/ls-files.c:576
ef317cd5 15677msgid "tree-ish"
ddc12c42 15678msgstr "树对象"
ef317cd5 15679
06991777 15680#: builtin/ls-files.c:577
ef317cd5 15681msgid "pretend that paths removed since <tree-ish> are still present"
ddc12c42 15682msgstr "假装自从 <树对象> 之后删除的路径仍然存在"
ef317cd5 15683
06991777 15684#: builtin/ls-files.c:579
ef317cd5 15685msgid "show debugging data"
07432cef 15686msgstr "显示调试数据"
ef317cd5 15687
fd8cb379 15688#: builtin/ls-remote.c:9
276ceeaa
JX
15689msgid ""
15690"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
15691" [-q | --quiet] [--exit-code] [--get-url]\n"
15692" [--symref] [<repository> [<refs>...]]"
15693msgstr ""
15694"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
15695" [-q | --quiet] [--exit-code] [--get-url]\n"
15696" [--symref] [<仓库> [<引用>...]]"
15697
fd8cb379 15698#: builtin/ls-remote.c:59
276ceeaa
JX
15699msgid "do not print remote URL"
15700msgstr "不打印远程 URL"
15701
2b472aae 15702#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
276ceeaa
JX
15703msgid "exec"
15704msgstr "exec"
15705
fd8cb379 15706#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
276ceeaa
JX
15707msgid "path of git-upload-pack on the remote host"
15708msgstr "远程主机上的 git-upload-pack 路径"
15709
fd8cb379 15710#: builtin/ls-remote.c:65
276ceeaa
JX
15711msgid "limit to tags"
15712msgstr "仅限于标签"
15713
fd8cb379 15714#: builtin/ls-remote.c:66
276ceeaa
JX
15715msgid "limit to heads"
15716msgstr "仅限于分支"
15717
fd8cb379 15718#: builtin/ls-remote.c:67
276ceeaa
JX
15719msgid "do not show peeled tags"
15720msgstr "不显示已解析的标签"
15721
fd8cb379 15722#: builtin/ls-remote.c:69
276ceeaa
JX
15723msgid "take url.<base>.insteadOf into account"
15724msgstr "参考 url.<base>.insteadOf 设置"
15725
d46c5519 15726#: builtin/ls-remote.c:72
276ceeaa
JX
15727msgid "exit with exit code 2 if no matching refs are found"
15728msgstr "若未找到匹配的引用则以退出码2退出"
15729
d46c5519 15730#: builtin/ls-remote.c:75
276ceeaa
JX
15731msgid "show underlying ref in addition to the object pointed by it"
15732msgstr "除了显示指向的对象外,显示指向的引用名"
15733
c1ac5258 15734#: builtin/ls-tree.c:30
ef317cd5 15735msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
ddc12c42 15736msgstr "git ls-tree [<选项>] <树对象> [<路径>...]"
ef317cd5 15737
c1ac5258 15738#: builtin/ls-tree.c:128
ef317cd5 15739msgid "only show trees"
07432cef 15740msgstr "只显示树"
ef317cd5 15741
c1ac5258 15742#: builtin/ls-tree.c:130
ef317cd5 15743msgid "recurse into subtrees"
07432cef 15744msgstr "递归到子树"
ef317cd5 15745
c1ac5258 15746#: builtin/ls-tree.c:132
ef317cd5 15747msgid "show trees when recursing"
07432cef 15748msgstr "当递归时显示树"
ef317cd5 15749
c1ac5258 15750#: builtin/ls-tree.c:135
ef317cd5 15751msgid "terminate entries with NUL byte"
4375c10e 15752msgstr "条目以 NUL 字符终止"
ef317cd5 15753
c1ac5258 15754#: builtin/ls-tree.c:136
ef317cd5 15755msgid "include object size"
07432cef 15756msgstr "包括对象大小"
ef317cd5 15757
c1ac5258 15758#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
ef317cd5 15759msgid "list only filenames"
07432cef 15760msgstr "只列出文件名"
ef317cd5 15761
c1ac5258 15762#: builtin/ls-tree.c:143
ef317cd5 15763msgid "use full path names"
07432cef 15764msgstr "使用文件的全路径"
ef317cd5 15765
c1ac5258 15766#: builtin/ls-tree.c:145
ef317cd5 15767msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 15768msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5 15769
a4f16749
JX
15770#: builtin/mailsplit.c:241
15771#, c-format
15772msgid "empty mbox: '%s'"
15773msgstr "空的 mbox:'%s'"
15774
a6cd2cc4 15775#: builtin/merge.c:55
814ff314
JX
15776msgid "git merge [<options>] [<commit>...]"
15777msgstr "git merge [<选项>] [<提交>...]"
ef317cd5 15778
a6cd2cc4 15779#: builtin/merge.c:56
ef317cd5 15780msgid "git merge --abort"
07432cef 15781msgstr "git merge --abort"
ef317cd5 15782
a6cd2cc4 15783#: builtin/merge.c:57
1a79b2f1
JX
15784msgid "git merge --continue"
15785msgstr "git merge --continue"
15786
2b472aae 15787#: builtin/merge.c:119
c04f5ac3
JX
15788msgid "switch `m' requires a value"
15789msgstr "开关 `m' 需要一个值"
15790
2b472aae 15791#: builtin/merge.c:142
06991777
JX
15792#, c-format
15793msgid "option `%s' requires a value"
15794msgstr "选项 `%s' 需要一个值"
15795
2b472aae 15796#: builtin/merge.c:188
c04f5ac3
JX
15797#, c-format
15798msgid "Could not find merge strategy '%s'.\n"
90e6ef53 15799msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 15800
2b472aae 15801#: builtin/merge.c:189
c04f5ac3
JX
15802#, c-format
15803msgid "Available strategies are:"
15804msgstr "可用的策略有:"
15805
2b472aae 15806#: builtin/merge.c:194
c04f5ac3
JX
15807#, c-format
15808msgid "Available custom strategies are:"
15809msgstr "可用的自定义策略有:"
15810
2b472aae 15811#: builtin/merge.c:245 builtin/pull.c:132
ef317cd5 15812msgid "do not show a diffstat at the end of the merge"
07432cef 15813msgstr "在合并的最后不显示差异统计"
ef317cd5 15814
2b472aae 15815#: builtin/merge.c:248 builtin/pull.c:135
ef317cd5 15816msgid "show a diffstat at the end of the merge"
07432cef 15817msgstr "在合并的最后显示差异统计"
ef317cd5 15818
2b472aae 15819#: builtin/merge.c:249 builtin/pull.c:138
ef317cd5 15820msgid "(synonym to --stat)"
07432cef 15821msgstr "(和 --stat 同义)"
ef317cd5 15822
2b472aae 15823#: builtin/merge.c:251 builtin/pull.c:141
ef317cd5 15824msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 15825msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 15826
2b472aae 15827#: builtin/merge.c:254 builtin/pull.c:147
ef317cd5 15828msgid "create a single commit instead of doing a merge"
07432cef 15829msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 15830
2b472aae 15831#: builtin/merge.c:256 builtin/pull.c:150
ef317cd5 15832msgid "perform a commit if the merge succeeds (default)"
07432cef 15833msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 15834
2b472aae 15835#: builtin/merge.c:258 builtin/pull.c:153
ef317cd5 15836msgid "edit message before committing"
07432cef 15837msgstr "在提交前编辑提交说明"
ef317cd5 15838
2b472aae 15839#: builtin/merge.c:260
ef317cd5 15840msgid "allow fast-forward (default)"
07432cef 15841msgstr "允许快进(默认)"
ef317cd5 15842
2b472aae 15843#: builtin/merge.c:262 builtin/pull.c:160
ef317cd5 15844msgid "abort if fast-forward is not possible"
07432cef 15845msgstr "如果不能快进就放弃合并"
ef317cd5 15846
2b472aae 15847#: builtin/merge.c:266 builtin/pull.c:163
5c57d762 15848msgid "verify that the named commit has a valid GPG signature"
1003b3a5
JX
15849msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
15850
2b472aae
JX
15851#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
15852#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
ef317cd5 15853msgid "strategy"
07432cef 15854msgstr "策略"
ef317cd5 15855
2b472aae 15856#: builtin/merge.c:268 builtin/pull.c:168
ef317cd5 15857msgid "merge strategy to use"
07432cef 15858msgstr "要使用的合并策略"
ef317cd5 15859
2b472aae 15860#: builtin/merge.c:269 builtin/pull.c:171
ef317cd5 15861msgid "option=value"
07432cef 15862msgstr "option=value"
ef317cd5 15863
2b472aae 15864#: builtin/merge.c:270 builtin/pull.c:172
ef317cd5 15865msgid "option for selected merge strategy"
07432cef 15866msgstr "所选的合并策略的选项"
ef317cd5 15867
2b472aae 15868#: builtin/merge.c:272
ef317cd5 15869msgid "merge commit message (for a non-fast-forward merge)"
07432cef 15870msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 15871
2b472aae 15872#: builtin/merge.c:279
ef317cd5 15873msgid "abort the current in-progress merge"
07432cef 15874msgstr "放弃当前正在进行的合并"
ef317cd5 15875
a6cd2cc4 15876#
2b472aae 15877#: builtin/merge.c:281
a6cd2cc4
JX
15878msgid "--abort but leave index and working tree alone"
15879msgstr "--abort,但是保留索引和工作区"
15880
2b472aae 15881#: builtin/merge.c:283
1a79b2f1
JX
15882msgid "continue the current in-progress merge"
15883msgstr "继续当前正在进行的合并"
15884
2b472aae 15885#: builtin/merge.c:285 builtin/pull.c:179
5b04ee3b
JX
15886msgid "allow merging unrelated histories"
15887msgstr "允许合并不相关的历史"
15888
2b472aae 15889#: builtin/merge.c:291
a5cd71ca
JX
15890msgid "bypass pre-merge-commit and commit-msg hooks"
15891msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"
6937cb4e 15892
2b472aae 15893#: builtin/merge.c:308
c04f5ac3 15894msgid "could not run stash."
a4f16749 15895msgstr "不能运行贮藏。"
c04f5ac3 15896
2b472aae 15897#: builtin/merge.c:313
c04f5ac3 15898msgid "stash failed"
a4f16749 15899msgstr "贮藏失败"
c04f5ac3 15900
2b472aae 15901#: builtin/merge.c:318
c04f5ac3
JX
15902#, c-format
15903msgid "not a valid object: %s"
15904msgstr "不是一个有效对象:%s"
15905
2b472aae 15906#: builtin/merge.c:340 builtin/merge.c:357
c04f5ac3
JX
15907msgid "read-tree failed"
15908msgstr "读取树失败"
15909
90e6ef53 15910# 译者:注意保持前导空格
2b472aae 15911#: builtin/merge.c:387
c04f5ac3
JX
15912msgid " (nothing to squash)"
15913msgstr " (无可压缩)"
15914
2b472aae 15915#: builtin/merge.c:398
c04f5ac3
JX
15916#, c-format
15917msgid "Squash commit -- not updating HEAD\n"
15918msgstr "压缩提交 -- 未更新 HEAD\n"
15919
2b472aae 15920#: builtin/merge.c:448
c04f5ac3
JX
15921#, c-format
15922msgid "No merge message -- not updating HEAD\n"
15923msgstr "无合并信息 -- 未更新 HEAD\n"
15924
2b472aae 15925#: builtin/merge.c:499
c04f5ac3
JX
15926#, c-format
15927msgid "'%s' does not point to a commit"
15928msgstr "'%s' 没有指向一个提交"
15929
2b472aae 15930#: builtin/merge.c:586
c04f5ac3
JX
15931#, c-format
15932msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 15933msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 15934
2b472aae 15935#: builtin/merge.c:708
c04f5ac3 15936msgid "Not handling anything other than two heads merge."
29004bbb 15937msgstr "未处理两个头合并之外的任何操作。"
c04f5ac3 15938
2b472aae 15939#: builtin/merge.c:722
c04f5ac3
JX
15940#, c-format
15941msgid "Unknown option for merge-recursive: -X%s"
15942msgstr "merge-recursive 的未知选项:-X%s"
15943
2b472aae 15944#: builtin/merge.c:737
c04f5ac3
JX
15945#, c-format
15946msgid "unable to write %s"
15947msgstr "不能写 %s"
15948
2b472aae 15949#: builtin/merge.c:789
c04f5ac3
JX
15950#, c-format
15951msgid "Could not read from '%s'"
15952msgstr "不能从 '%s' 读取"
15953
2b472aae 15954#: builtin/merge.c:798
c04f5ac3
JX
15955#, c-format
15956msgid "Not committing merge; use 'git commit' to complete the merge.\n"
15957msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
15958
2b472aae 15959#: builtin/merge.c:804
c04f5ac3
JX
15960msgid ""
15961"Please enter a commit message to explain why this merge is necessary,\n"
15962"especially if it merges an updated upstream into a topic branch.\n"
15963"\n"
c04f5ac3
JX
15964msgstr ""
15965"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
15966"合并到主题分支。\n"
15967"\n"
c04f5ac3 15968
2b472aae 15969#: builtin/merge.c:809
d46c5519 15970msgid "An empty message aborts the commit.\n"
5b533632 15971msgstr "空的提交说明会终止提交。\n"
d46c5519 15972
2b472aae 15973#: builtin/merge.c:812
d46c5519
JX
15974#, c-format
15975msgid ""
15976"Lines starting with '%c' will be ignored, and an empty message aborts\n"
15977"the commit.\n"
5b533632 15978msgstr "以 '%c' 开始的行将被忽略,而空的提交说明将终止提交。\n"
d46c5519 15979
2b472aae 15980#: builtin/merge.c:865
c04f5ac3
JX
15981msgid "Empty commit message."
15982msgstr "空提交信息。"
15983
2b472aae 15984#: builtin/merge.c:880
c04f5ac3
JX
15985#, c-format
15986msgid "Wonderful.\n"
15987msgstr "太棒了。\n"
15988
2b472aae 15989#: builtin/merge.c:941
c04f5ac3
JX
15990#, c-format
15991msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
15992msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
15993
2b472aae 15994#: builtin/merge.c:980
c04f5ac3 15995msgid "No current branch."
90e6ef53 15996msgstr "没有当前分支。"
c04f5ac3 15997
2b472aae 15998#: builtin/merge.c:982
c04f5ac3 15999msgid "No remote for the current branch."
160fb2b2 16000msgstr "当前分支没有对应的远程仓库。"
c04f5ac3 16001
2b472aae 16002#: builtin/merge.c:984
c04f5ac3 16003msgid "No default upstream defined for the current branch."
90e6ef53 16004msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 16005
2b472aae 16006#: builtin/merge.c:989
170e9899 16007#, c-format
2e8451e8
JX
16008msgid "No remote-tracking branch for %s from %s"
16009msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 16010
2b472aae 16011#: builtin/merge.c:1046
5c57d762
JX
16012#, c-format
16013msgid "Bad value '%s' in environment '%s'"
9a4b694c 16014msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
5c57d762 16015
2b472aae 16016#: builtin/merge.c:1149
5c57d762
JX
16017#, c-format
16018msgid "not something we can merge in %s: %s"
16019msgstr "不能在 %s 中合并:%s"
16020
2b472aae 16021#: builtin/merge.c:1183
5c57d762
JX
16022msgid "not something we can merge"
16023msgstr "不能合并"
16024
2b472aae 16025#: builtin/merge.c:1286
1a79b2f1
JX
16026msgid "--abort expects no arguments"
16027msgstr "--abort 不带参数"
16028
2b472aae 16029#: builtin/merge.c:1290
c04f5ac3 16030msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 16031msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 16032
2b472aae 16033#: builtin/merge.c:1299
a6cd2cc4
JX
16034msgid "--quit expects no arguments"
16035msgstr "--quit 不带参数"
16036
2b472aae 16037#: builtin/merge.c:1312
1a79b2f1
JX
16038msgid "--continue expects no arguments"
16039msgstr "--continue 不带参数"
16040
2b472aae 16041#: builtin/merge.c:1316
1a79b2f1
JX
16042msgid "There is no merge in progress (MERGE_HEAD missing)."
16043msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
16044
2b472aae 16045#: builtin/merge.c:1332
c04f5ac3
JX
16046msgid ""
16047"You have not concluded your merge (MERGE_HEAD exists).\n"
220c313c 16048"Please, commit your changes before you merge."
c04f5ac3
JX
16049msgstr ""
16050"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 16051"请在合并前先提交您的修改。"
c04f5ac3 16052
2b472aae 16053#: builtin/merge.c:1339
c04f5ac3
JX
16054msgid ""
16055"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
220c313c 16056"Please, commit your changes before you merge."
c04f5ac3
JX
16057msgstr ""
16058"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 16059"请在合并前先提交您的修改。"
c04f5ac3 16060
2b472aae 16061#: builtin/merge.c:1342
c04f5ac3
JX
16062msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
16063msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
16064
2b472aae 16065#: builtin/merge.c:1356
c04f5ac3 16066msgid "You cannot combine --squash with --no-ff."
a6cd2cc4 16067msgstr "您不能将 --squash 和 --no-ff 组合使用。"
c04f5ac3 16068
2b472aae 16069#: builtin/merge.c:1358
a6cd2cc4
JX
16070msgid "You cannot combine --squash with --commit."
16071msgstr "您不能将 --squash 和 --commit 组合使用。"
16072
2b472aae 16073#: builtin/merge.c:1374
c04f5ac3 16074msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 16075msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 16076
2b472aae 16077#: builtin/merge.c:1391
c04f5ac3
JX
16078msgid "Squash commit into empty head not supported yet"
16079msgstr "尚不支持到空分支的压缩提交"
16080
2b472aae 16081#: builtin/merge.c:1393
c04f5ac3
JX
16082msgid "Non-fast-forward commit does not make sense into an empty head"
16083msgstr "到空分支的非快进式提交没有意义"
16084
2b472aae 16085#: builtin/merge.c:1398
2e8451e8
JX
16086#, c-format
16087msgid "%s - not something we can merge"
16088msgstr "%s - 不能被合并"
16089
2b472aae 16090#: builtin/merge.c:1400
7aea43ff
JX
16091msgid "Can merge only exactly one commit into empty head"
16092msgstr "只能将一个提交合并到空分支上"
16093
2b472aae 16094#: builtin/merge.c:1481
5b04ee3b
JX
16095msgid "refusing to merge unrelated histories"
16096msgstr "拒绝合并无关的历史"
16097
2b472aae 16098#: builtin/merge.c:1490
6937cb4e 16099msgid "Already up to date."
5c57d762
JX
16100msgstr "已经是最新的。"
16101
2b472aae 16102#: builtin/merge.c:1500
c04f5ac3
JX
16103#, c-format
16104msgid "Updating %s..%s\n"
16105msgstr "更新 %s..%s\n"
16106
2b472aae 16107#: builtin/merge.c:1542
c04f5ac3
JX
16108#, c-format
16109msgid "Trying really trivial in-index merge...\n"
90e6ef53 16110msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 16111
2b472aae 16112#: builtin/merge.c:1549
c04f5ac3
JX
16113#, c-format
16114msgid "Nope.\n"
16115msgstr "无。\n"
16116
2b472aae 16117#: builtin/merge.c:1574
6937cb4e 16118msgid "Already up to date. Yeeah!"
5c57d762
JX
16119msgstr "已经是最新的。耶!"
16120
2b472aae 16121#: builtin/merge.c:1580
c04f5ac3 16122msgid "Not possible to fast-forward, aborting."
1aabac65 16123msgstr "无法快进,终止。"
c04f5ac3 16124
2b472aae 16125#: builtin/merge.c:1603 builtin/merge.c:1668
c04f5ac3
JX
16126#, c-format
16127msgid "Rewinding the tree to pristine...\n"
16128msgstr "将树回滚至原始状态...\n"
16129
2b472aae 16130#: builtin/merge.c:1607
c04f5ac3
JX
16131#, c-format
16132msgid "Trying merge strategy %s...\n"
16133msgstr "尝试合并策略 %s...\n"
16134
2b472aae 16135#: builtin/merge.c:1659
c04f5ac3
JX
16136#, c-format
16137msgid "No merge strategy handled the merge.\n"
16138msgstr "没有合并策略处理此合并。\n"
16139
2b472aae 16140#: builtin/merge.c:1661
c04f5ac3
JX
16141#, c-format
16142msgid "Merge with strategy %s failed.\n"
16143msgstr "使用策略 %s 合并失败。\n"
16144
2b472aae 16145#: builtin/merge.c:1670
c04f5ac3
JX
16146#, c-format
16147msgid "Using the %s to prepare resolving by hand.\n"
16148msgstr "使用 %s 以准备手工解决。\n"
16149
2b472aae 16150#: builtin/merge.c:1682
c04f5ac3
JX
16151#, c-format
16152msgid "Automatic merge went well; stopped before committing as requested\n"
16153msgstr "自动合并进展顺利,按要求在提交前停止\n"
16154
4c27fcb5 16155#: builtin/merge-base.c:32
814ff314
JX
16156msgid "git merge-base [-a | --all] <commit> <commit>..."
16157msgstr "git merge-base [-a | --all] <提交> <提交>..."
ef317cd5 16158
4c27fcb5 16159#: builtin/merge-base.c:33
814ff314
JX
16160msgid "git merge-base [-a | --all] --octopus <commit>..."
16161msgstr "git merge-base [-a | --all] --octopus <提交>..."
ef317cd5 16162
4c27fcb5 16163#: builtin/merge-base.c:34
ef317cd5 16164msgid "git merge-base --independent <commit>..."
07432cef 16165msgstr "git merge-base --independent <提交>..."
ef317cd5 16166
4c27fcb5 16167#: builtin/merge-base.c:35
ef317cd5 16168msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 16169msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5 16170
4c27fcb5 16171#: builtin/merge-base.c:36
cfff71a9 16172msgid "git merge-base --fork-point <ref> [<commit>]"
d9d56b23 16173msgstr "git merge-base --fork-point <引用> [<提交>]"
cfff71a9 16174
4c27fcb5 16175#: builtin/merge-base.c:153
ef317cd5 16176msgid "output all common ancestors"
07432cef 16177msgstr "输出所有共同的祖先"
ef317cd5 16178
4c27fcb5 16179#: builtin/merge-base.c:155
ef317cd5 16180msgid "find ancestors for a single n-way merge"
07432cef 16181msgstr "查找一个多路合并的祖先提交"
ef317cd5 16182
4c27fcb5 16183#: builtin/merge-base.c:157
ef317cd5 16184msgid "list revs not reachable from others"
07432cef 16185msgstr "显示不能被其他访问到的版本"
ef317cd5 16186
4c27fcb5 16187#: builtin/merge-base.c:159
ef317cd5 16188msgid "is the first one ancestor of the other?"
07432cef 16189msgstr "第一个是其他的祖先提交么?"
ef317cd5 16190
4c27fcb5 16191#: builtin/merge-base.c:161
cfff71a9 16192msgid "find where <commit> forked from reflog of <ref>"
e397e7e3 16193msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
cfff71a9 16194
a4f16749 16195#: builtin/merge-file.c:9
ef317cd5 16196msgid ""
814ff314
JX
16197"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
16198"<orig-file> <file2>"
ef317cd5 16199msgstr ""
814ff314
JX
16200"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
16201"件> <文件2>"
ef317cd5 16202
4c27fcb5 16203#: builtin/merge-file.c:35
ef317cd5 16204msgid "send results to standard output"
07432cef 16205msgstr "将结果发送到标准输出"
ef317cd5 16206
4c27fcb5 16207#: builtin/merge-file.c:36
ef317cd5 16208msgid "use a diff3 based merge"
07432cef 16209msgstr "使用基于 diff3 的合并"
ef317cd5 16210
4c27fcb5 16211#: builtin/merge-file.c:37
ef317cd5 16212msgid "for conflicts, use our version"
07432cef 16213msgstr "如果冲突,使用我们的版本"
ef317cd5 16214
4c27fcb5 16215#: builtin/merge-file.c:39
ef317cd5 16216msgid "for conflicts, use their version"
07432cef 16217msgstr "如果冲突,使用他们的版本"
ef317cd5 16218
4c27fcb5 16219#: builtin/merge-file.c:41
ef317cd5 16220msgid "for conflicts, use a union version"
07432cef 16221msgstr "如果冲突,使用联合版本"
ef317cd5 16222
4c27fcb5 16223#: builtin/merge-file.c:44
ef317cd5 16224msgid "for conflicts, use this marker size"
07432cef 16225msgstr "如果冲突,使用指定长度的标记"
ef317cd5 16226
4c27fcb5 16227#: builtin/merge-file.c:45
ef317cd5 16228msgid "do not warn about conflicts"
07432cef 16229msgstr "不要警告冲突"
ef317cd5 16230
4c27fcb5 16231#: builtin/merge-file.c:47
814ff314
JX
16232msgid "set labels for file1/orig-file/file2"
16233msgstr "为 文件1/初始文件/文件2 设置标签"
c04f5ac3 16234
a5cd71ca 16235#: builtin/merge-recursive.c:47
a0b6b246
JX
16236#, c-format
16237msgid "unknown option %s"
16238msgstr "未知选项 %s"
16239
a5cd71ca 16240#: builtin/merge-recursive.c:53
a0b6b246
JX
16241#, c-format
16242msgid "could not parse object '%s'"
16243msgstr "不能解析对象 '%s'"
16244
a5cd71ca 16245#: builtin/merge-recursive.c:57
a0b6b246
JX
16246#, c-format
16247msgid "cannot handle more than %d base. Ignoring %s."
16248msgid_plural "cannot handle more than %d bases. Ignoring %s."
16249msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
16250msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
16251
a5cd71ca 16252#: builtin/merge-recursive.c:65
a0b6b246
JX
16253msgid "not handling anything other than two heads merge."
16254msgstr "不能处理两个头合并之外的任何操作。"
16255
a5cd71ca 16256#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
a0b6b246
JX
16257#, c-format
16258msgid "could not resolve ref '%s'"
16259msgstr "无法解析引用 '%s'"
16260
a5cd71ca 16261#: builtin/merge-recursive.c:82
a0b6b246
JX
16262#, c-format
16263msgid "Merging %s with %s\n"
16264msgstr "合并 %s 和 %s\n"
16265
c1ac5258 16266#: builtin/mktree.c:66
ef317cd5 16267msgid "git mktree [-z] [--missing] [--batch]"
07432cef 16268msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 16269
c1ac5258 16270#: builtin/mktree.c:154
ef317cd5 16271msgid "input is NUL terminated"
07432cef 16272msgstr "输入以 NUL 字符终止"
c04f5ac3 16273
06991777 16274#: builtin/mktree.c:155 builtin/write-tree.c:26
ef317cd5 16275msgid "allow missing objects"
07432cef 16276msgstr "允许丢失的对象"
c04f5ac3 16277
c1ac5258 16278#: builtin/mktree.c:156
ef317cd5 16279msgid "allow creation of more than one tree"
07432cef 16280msgstr "允许创建一个以上的树"
c04f5ac3 16281
d46c5519 16282#: builtin/multi-pack-index.c:9
a6cd2cc4 16283msgid ""
ddc12c42
JX
16284"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
16285"size=<size>)"
2b472aae
JX
16286msgstr ""
16287"git multi-pack-index [<选项>] (write|verify|expire|repack --batch-size=<大小"
16288">)"
4c27fcb5 16289
ddc12c42 16290#: builtin/multi-pack-index.c:26
4c27fcb5
JX
16291msgid "object directory containing set of packfile and pack-index pairs"
16292msgstr "包含成对包文件和包索引的对象目录"
16293
ddc12c42 16294#: builtin/multi-pack-index.c:29
a6cd2cc4
JX
16295msgid ""
16296"during repack, collect pack-files of smaller size into a batch that is "
16297"larger than this size"
16298msgstr "在 repack 期间,将较小尺寸的包文件收集到大于此大小的批次中"
16299
ddc12c42 16300#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
4c27fcb5
JX
16301msgid "too many arguments"
16302msgstr "太多参数"
16303
ddc12c42 16304#: builtin/multi-pack-index.c:60
a6cd2cc4
JX
16305msgid "--batch-size option is only for 'repack' subcommand"
16306msgstr "--batch-size 选项仅用于 'repack' 子命令"
16307
ddc12c42 16308#: builtin/multi-pack-index.c:69
4c27fcb5 16309#, c-format
a6cd2cc4
JX
16310msgid "unrecognized subcommand: %s"
16311msgstr "未识别的子命令:%s"
4c27fcb5 16312
06991777 16313#: builtin/mv.c:18
814ff314
JX
16314msgid "git mv [<options>] <source>... <destination>"
16315msgstr "git mv [<选项>] <源>... <目标>"
c04f5ac3 16316
06991777 16317#: builtin/mv.c:83
220c313c
JX
16318#, c-format
16319msgid "Directory %s is in index and no submodule?"
16320msgstr "目录 %s 在索引中并且不是子模组?"
16321
06991777 16322#: builtin/mv.c:85
220c313c 16323msgid "Please stage your changes to .gitmodules or stash them to proceed"
a4f16749 16324msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
220c313c 16325
06991777 16326#: builtin/mv.c:103
220c313c
JX
16327#, c-format
16328msgid "%.*s is in index"
16329msgstr "%.*s 在索引中"
16330
06991777 16331#: builtin/mv.c:125
ef317cd5 16332msgid "force move/rename even if target exists"
07432cef 16333msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 16334
06991777 16335#: builtin/mv.c:127
ef317cd5 16336msgid "skip move/rename errors"
07432cef 16337msgstr "跳过移动/重命名错误"
c04f5ac3 16338
06991777 16339#: builtin/mv.c:169
220c313c
JX
16340#, c-format
16341msgid "destination '%s' is not a directory"
16342msgstr "目标 '%s' 不是一个目录"
16343
06991777 16344#: builtin/mv.c:180
c04f5ac3
JX
16345#, c-format
16346msgid "Checking rename of '%s' to '%s'\n"
16347msgstr "检查 '%s' 到 '%s' 的重命名\n"
16348
06991777 16349#: builtin/mv.c:184
c04f5ac3
JX
16350msgid "bad source"
16351msgstr "坏的源"
16352
06991777 16353#: builtin/mv.c:187
c04f5ac3
JX
16354msgid "can not move directory into itself"
16355msgstr "不能将目录移动到自身"
16356
06991777 16357#: builtin/mv.c:190
c04f5ac3
JX
16358msgid "cannot move directory over file"
16359msgstr "不能将目录移动到文件"
16360
06991777 16361#: builtin/mv.c:199
c04f5ac3
JX
16362msgid "source directory is empty"
16363msgstr "源目录为空"
16364
06991777 16365#: builtin/mv.c:224
c04f5ac3
JX
16366msgid "not under version control"
16367msgstr "不在版本控制之下"
16368
06991777 16369#: builtin/mv.c:227
c04f5ac3
JX
16370msgid "destination exists"
16371msgstr "目标已存在"
16372
06991777 16373#: builtin/mv.c:235
c04f5ac3
JX
16374#, c-format
16375msgid "overwriting '%s'"
16376msgstr "覆盖 '%s'"
16377
06991777 16378#: builtin/mv.c:238
c04f5ac3
JX
16379msgid "Cannot overwrite"
16380msgstr "不能覆盖"
16381
06991777 16382#: builtin/mv.c:241
c04f5ac3
JX
16383msgid "multiple sources for the same target"
16384msgstr "同一目标具有多个源"
16385
06991777 16386#: builtin/mv.c:243
cfff71a9
JX
16387msgid "destination directory does not exist"
16388msgstr "目标目录不存在"
16389
06991777 16390#: builtin/mv.c:250
c04f5ac3
JX
16391#, c-format
16392msgid "%s, source=%s, destination=%s"
16393msgstr "%s,源=%s,目标=%s"
16394
06991777 16395#: builtin/mv.c:271
c04f5ac3
JX
16396#, c-format
16397msgid "Renaming %s to %s\n"
16398msgstr "重命名 %s 至 %s\n"
16399
2b472aae 16400#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
c04f5ac3
JX
16401#, c-format
16402msgid "renaming '%s' failed"
16403msgstr "重命名 '%s' 失败"
16404
2b472aae 16405#: builtin/name-rev.c:465
814ff314
JX
16406msgid "git name-rev [<options>] <commit>..."
16407msgstr "git name-rev [<选项>] <提交>..."
ef317cd5 16408
2b472aae 16409#: builtin/name-rev.c:466
814ff314
JX
16410msgid "git name-rev [<options>] --all"
16411msgstr "git name-rev [<选项>] --all"
ef317cd5 16412
2b472aae 16413#: builtin/name-rev.c:467
814ff314
JX
16414msgid "git name-rev [<options>] --stdin"
16415msgstr "git name-rev [<选项>] --stdin"
ef317cd5 16416
2b472aae 16417#: builtin/name-rev.c:524
ef317cd5 16418msgid "print only names (no SHA-1)"
07432cef 16419msgstr "只打印名称(无 SHA-1)"
ef317cd5 16420
2b472aae 16421#: builtin/name-rev.c:525
ef317cd5 16422msgid "only use tags to name the commits"
55a16ee4 16423msgstr "只使用标签来命名提交"
ef317cd5 16424
2b472aae 16425#: builtin/name-rev.c:527
ef317cd5 16426msgid "only use refs matching <pattern>"
07432cef 16427msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 16428
2b472aae 16429#: builtin/name-rev.c:529
87cb7997
JX
16430msgid "ignore refs matching <pattern>"
16431msgstr "忽略和 <模式> 相匹配的引用"
16432
2b472aae 16433#: builtin/name-rev.c:531
ef317cd5 16434msgid "list all commits reachable from all refs"
07432cef 16435msgstr "列出可以从所有引用访问的提交"
ef317cd5 16436
2b472aae 16437#: builtin/name-rev.c:532
ef317cd5 16438msgid "read from stdin"
07432cef 16439msgstr "从标准输入读取"
ef317cd5 16440
2b472aae 16441#: builtin/name-rev.c:533
90314792
JX
16442msgid "allow to print `undefined` names (default)"
16443msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 16444
2b472aae 16445#: builtin/name-rev.c:539
2e8451e8 16446msgid "dereference tags in the input (internal use)"
55a16ee4 16447msgstr "反向解析输入中的标签(内部使用)"
2e8451e8 16448
c1ac5258 16449#: builtin/notes.c:28
814ff314 16450msgid "git notes [--ref <notes-ref>] [list [<object>]]"
07432cef 16451msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 16452
c1ac5258 16453#: builtin/notes.c:29
ef317cd5 16454msgid ""
814ff314 16455"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
04cb2f28 16456"| (-c | -C) <object>] [<object>]"
ef317cd5 16457msgstr ""
04cb2f28
JX
16458"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
16459"| (-c | -C) <对象>] [<对象>]"
ef317cd5 16460
c1ac5258 16461#: builtin/notes.c:30
814ff314 16462msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
07432cef 16463msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 16464
c1ac5258 16465#: builtin/notes.c:31
ef317cd5 16466msgid ""
814ff314 16467"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
04cb2f28 16468"(-c | -C) <object>] [<object>]"
ef317cd5 16469msgstr ""
04cb2f28
JX
16470"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
16471"(-c | -C) <对象>] [<对象>]"
ef317cd5 16472
c1ac5258 16473#: builtin/notes.c:32
814ff314 16474msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
04cb2f28 16475msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
ef317cd5 16476
c1ac5258 16477#: builtin/notes.c:33
814ff314 16478msgid "git notes [--ref <notes-ref>] show [<object>]"
07432cef 16479msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 16480
c1ac5258 16481#: builtin/notes.c:34
ef317cd5 16482msgid ""
814ff314 16483"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
07432cef 16484msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 16485
c1ac5258 16486#: builtin/notes.c:35
ef317cd5 16487msgid "git notes merge --commit [-v | -q]"
07432cef 16488msgstr "git notes merge --commit [-v | -q]"
ef317cd5 16489
c1ac5258 16490#: builtin/notes.c:36
ef317cd5 16491msgid "git notes merge --abort [-v | -q]"
07432cef 16492msgstr "git notes merge --abort [-v | -q]"
ef317cd5 16493
c1ac5258 16494#: builtin/notes.c:37
814ff314 16495msgid "git notes [--ref <notes-ref>] remove [<object>...]"
07432cef 16496msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 16497
c1ac5258 16498#: builtin/notes.c:38
5809aa05
JX
16499msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
16500msgstr "git notes [--ref <注解引用>] prune [-n] [-v]"
ef317cd5 16501
c1ac5258 16502#: builtin/notes.c:39
814ff314 16503msgid "git notes [--ref <notes-ref>] get-ref"
07432cef 16504msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 16505
c1ac5258 16506#: builtin/notes.c:44
ef317cd5 16507msgid "git notes [list [<object>]]"
07432cef 16508msgstr "git notes [list [<对象>]]"
ef317cd5 16509
c1ac5258 16510#: builtin/notes.c:49
ef317cd5 16511msgid "git notes add [<options>] [<object>]"
07432cef 16512msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 16513
c1ac5258 16514#: builtin/notes.c:54
ef317cd5 16515msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 16516msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 16517
c1ac5258 16518#: builtin/notes.c:55
ef317cd5 16519msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 16520msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 16521
c1ac5258 16522#: builtin/notes.c:60
ef317cd5 16523msgid "git notes append [<options>] [<object>]"
07432cef 16524msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 16525
c1ac5258 16526#: builtin/notes.c:65
ef317cd5 16527msgid "git notes edit [<object>]"
07432cef 16528msgstr "git notes edit [<对象>]"
ef317cd5 16529
c1ac5258 16530#: builtin/notes.c:70
ef317cd5 16531msgid "git notes show [<object>]"
07432cef 16532msgstr "git notes show [<对象>]"
ef317cd5 16533
c1ac5258 16534#: builtin/notes.c:75
814ff314 16535msgid "git notes merge [<options>] <notes-ref>"
07432cef 16536msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 16537
c1ac5258 16538#: builtin/notes.c:76
ef317cd5 16539msgid "git notes merge --commit [<options>]"
07432cef 16540msgstr "git notes merge --commit [<选项>]"
ef317cd5 16541
c1ac5258 16542#: builtin/notes.c:77
ef317cd5 16543msgid "git notes merge --abort [<options>]"
07432cef 16544msgstr "git notes merge --abort [<选项>]"
ef317cd5 16545
c1ac5258 16546#: builtin/notes.c:82
ef317cd5 16547msgid "git notes remove [<object>]"
07432cef 16548msgstr "git notes remove [<对象>]"
ef317cd5 16549
c1ac5258 16550#: builtin/notes.c:87
ef317cd5 16551msgid "git notes prune [<options>]"
07432cef 16552msgstr "git notes prune [<选项>]"
ef317cd5 16553
c1ac5258 16554#: builtin/notes.c:92
ef317cd5 16555msgid "git notes get-ref"
07432cef 16556msgstr "git notes get-ref"
ef317cd5 16557
c1ac5258 16558#: builtin/notes.c:97
5c57d762
JX
16559msgid "Write/edit the notes for the following object:"
16560msgstr "为下面的对象写/编辑说明:"
16561
c1ac5258 16562#: builtin/notes.c:150
c04f5ac3
JX
16563#, c-format
16564msgid "unable to start 'show' for object '%s'"
16565msgstr "不能为对象 '%s' 开始 'show'"
16566
c1ac5258 16567#: builtin/notes.c:154
a77c07d9
JX
16568msgid "could not read 'show' output"
16569msgstr "不能读取 'show' 的输出"
c04f5ac3 16570
c1ac5258 16571#: builtin/notes.c:162
c04f5ac3
JX
16572#, c-format
16573msgid "failed to finish 'show' for object '%s'"
16574msgstr "无法为对象 '%s' 完成 'show'"
16575
c1ac5258 16576#: builtin/notes.c:197
a0b6b246 16577msgid "please supply the note contents using either -m or -F option"
c04f5ac3
JX
16578msgstr "请通过 -m 或 -F 选项为注解提供内容"
16579
c1ac5258 16580#: builtin/notes.c:206
c04f5ac3
JX
16581msgid "unable to write note object"
16582msgstr "不能写注解对象"
16583
c1ac5258 16584#: builtin/notes.c:208
c04f5ac3 16585#, c-format
a0b6b246 16586msgid "the note contents have been left in %s"
220c313c 16587msgstr "注解内容被留在 %s 中"
c04f5ac3 16588
a6cd2cc4 16589#: builtin/notes.c:242 builtin/tag.c:532
c04f5ac3
JX
16590#, c-format
16591msgid "could not open or read '%s'"
16592msgstr "不能打开或读取 '%s'"
16593
4c27fcb5 16594#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
06991777
JX
16595#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
16596#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
a0b6b246
JX
16597#, c-format
16598msgid "failed to resolve '%s' as a valid ref."
16599msgstr "无法解析 '%s' 为一个有效引用。"
16600
4c27fcb5 16601#: builtin/notes.c:265
c04f5ac3 16602#, c-format
a0b6b246 16603msgid "failed to read object '%s'."
c1ac5258 16604msgstr "读取对象 '%s' 失败。"
c04f5ac3 16605
4c27fcb5 16606#: builtin/notes.c:268
6c94aba5 16607#, c-format
a0b6b246
JX
16608msgid "cannot read note data from non-blob object '%s'."
16609msgstr "不能从非数据对象 '%s' 中读取注解数据。"
16610
4c27fcb5 16611#: builtin/notes.c:309
a0b6b246
JX
16612#, c-format
16613msgid "malformed input line: '%s'."
fd8cb379 16614msgstr "格式错误的输入行:'%s'。"
a0b6b246 16615
4c27fcb5 16616#: builtin/notes.c:324
a0b6b246
JX
16617#, c-format
16618msgid "failed to copy notes from '%s' to '%s'"
16619msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
6c94aba5 16620
a4f16749
JX
16621#. TRANSLATORS: the first %s will be replaced by a git
16622#. notes command: 'add', 'merge', 'remove', etc.
16623#.
4c27fcb5 16624#: builtin/notes.c:356
a0b6b246
JX
16625#, c-format
16626msgid "refusing to %s notes in %s (outside of refs/notes/)"
16627msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
16628
06991777
JX
16629#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
16630#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
16631#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
c04f5ac3
JX
16632msgid "too many parameters"
16633msgstr "参数太多"
16634
06991777 16635#: builtin/notes.c:389 builtin/notes.c:678
c04f5ac3 16636#, c-format
a0b6b246 16637msgid "no note found for object %s."
c04f5ac3
JX
16638msgstr "未发现对象 %s 的注解。"
16639
06991777 16640#: builtin/notes.c:410 builtin/notes.c:576
ef317cd5 16641msgid "note contents as a string"
07432cef 16642msgstr "注解内容作为一个字符串"
ef317cd5 16643
06991777 16644#: builtin/notes.c:413 builtin/notes.c:579
ef317cd5 16645msgid "note contents in a file"
07432cef 16646msgstr "注解内容到一个文件中"
ef317cd5 16647
06991777 16648#: builtin/notes.c:416 builtin/notes.c:582
ef317cd5 16649msgid "reuse and edit specified note object"
07432cef 16650msgstr "重用和编辑指定的注解对象"
ef317cd5 16651
06991777 16652#: builtin/notes.c:419 builtin/notes.c:585
ef317cd5 16653msgid "reuse specified note object"
07432cef 16654msgstr "重用指定的注解对象"
ef317cd5 16655
06991777 16656#: builtin/notes.c:422 builtin/notes.c:588
04cb2f28
JX
16657msgid "allow storing empty note"
16658msgstr "允许保存空白注释"
16659
06991777 16660#: builtin/notes.c:423 builtin/notes.c:496
ef317cd5 16661msgid "replace existing notes"
07432cef 16662msgstr "替换已存在的注解"
ef317cd5 16663
4c27fcb5 16664#: builtin/notes.c:448
c04f5ac3
JX
16665#, c-format
16666msgid ""
16667"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
16668"existing notes"
16669msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
16670
06991777 16671#: builtin/notes.c:463 builtin/notes.c:544
c04f5ac3
JX
16672#, c-format
16673msgid "Overwriting existing notes for object %s\n"
16674msgstr "覆盖对象 %s 现存注解\n"
16675
06991777 16676#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
04cb2f28
JX
16677#, c-format
16678msgid "Removing note for object %s\n"
16679msgstr "删除对象 %s 的注解\n"
16680
06991777 16681#: builtin/notes.c:497
ef317cd5 16682msgid "read objects from stdin"
07432cef 16683msgstr "从标准输入读取对象"
ef317cd5 16684
06991777 16685#: builtin/notes.c:499
ef317cd5 16686msgid "load rewriting config for <command> (implies --stdin)"
07432cef 16687msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 16688
06991777 16689#: builtin/notes.c:517
c04f5ac3
JX
16690msgid "too few parameters"
16691msgstr "参数太少"
16692
06991777 16693#: builtin/notes.c:538
c04f5ac3
JX
16694#, c-format
16695msgid ""
16696"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
16697"existing notes"
16698msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
16699
06991777 16700#: builtin/notes.c:550
c04f5ac3 16701#, c-format
a0b6b246 16702msgid "missing notes on source object %s. Cannot copy."
c04f5ac3
JX
16703msgstr "源对象 %s 缺少注解。不能拷贝。"
16704
06991777 16705#: builtin/notes.c:603
ef317cd5
JX
16706#, c-format
16707msgid ""
16708"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
16709"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
16710msgstr ""
16711"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
16712"请换用 'git notes add -f -m/-F/-c/-C'。\n"
16713
06991777 16714#: builtin/notes.c:698
a0b6b246 16715msgid "failed to delete ref NOTES_MERGE_PARTIAL"
c1ac5258 16716msgstr "删除引用 NOTES_MERGE_PARTIAL 失败"
a0b6b246 16717
06991777 16718#: builtin/notes.c:700
a0b6b246 16719msgid "failed to delete ref NOTES_MERGE_REF"
c1ac5258 16720msgstr "删除引用 NOTES_MERGE_REF 失败"
a0b6b246 16721
06991777 16722#: builtin/notes.c:702
a0b6b246 16723msgid "failed to remove 'git notes merge' worktree"
c1ac5258 16724msgstr "删除 'git notes merge' 工作区失败"
a0b6b246 16725
06991777 16726#: builtin/notes.c:722
a0b6b246 16727msgid "failed to read ref NOTES_MERGE_PARTIAL"
c1ac5258 16728msgstr "读取引用 NOTES_MERGE_PARTIAL 失败"
a0b6b246 16729
06991777 16730#: builtin/notes.c:724
a0b6b246
JX
16731msgid "could not find commit from NOTES_MERGE_PARTIAL."
16732msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
16733
06991777 16734#: builtin/notes.c:726
a0b6b246
JX
16735msgid "could not parse commit from NOTES_MERGE_PARTIAL."
16736msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
16737
06991777 16738#: builtin/notes.c:739
a0b6b246 16739msgid "failed to resolve NOTES_MERGE_REF"
c1ac5258 16740msgstr "解析 NOTES_MERGE_REF 失败"
a0b6b246 16741
06991777 16742#: builtin/notes.c:742
a0b6b246
JX
16743msgid "failed to finalize notes merge"
16744msgstr "无法完成注解合并"
16745
06991777 16746#: builtin/notes.c:768
5c57d762
JX
16747#, c-format
16748msgid "unknown notes merge strategy %s"
16749msgstr "未知的注解合并策略 %s"
16750
06991777 16751#: builtin/notes.c:784
ef317cd5 16752msgid "General options"
07432cef 16753msgstr "通用选项"
ef317cd5 16754
06991777 16755#: builtin/notes.c:786
ef317cd5 16756msgid "Merge options"
07432cef 16757msgstr "合并选项"
ef317cd5 16758
06991777 16759#: builtin/notes.c:788
ef317cd5
JX
16760msgid ""
16761"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
16762"cat_sort_uniq)"
07432cef 16763msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 16764
06991777 16765#: builtin/notes.c:790
ef317cd5 16766msgid "Committing unmerged notes"
07432cef 16767msgstr "提交未合并的注解"
ef317cd5 16768
06991777 16769#: builtin/notes.c:792
ef317cd5 16770msgid "finalize notes merge by committing unmerged notes"
07432cef 16771msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 16772
06991777 16773#: builtin/notes.c:794
ef317cd5 16774msgid "Aborting notes merge resolution"
07432cef 16775msgstr "中止注解合并的方案"
ef317cd5 16776
06991777 16777#: builtin/notes.c:796
ef317cd5 16778msgid "abort notes merge"
07432cef 16779msgstr "中止注解合并"
ef317cd5 16780
06991777 16781#: builtin/notes.c:807
5c57d762
JX
16782msgid "cannot mix --commit, --abort or -s/--strategy"
16783msgstr "不能混用 --commit、--abort 或 -s/--strategy"
16784
06991777 16785#: builtin/notes.c:812
a0b6b246 16786msgid "must specify a notes ref to merge"
9a4b694c 16787msgstr "必须指定一个注解引用来合并"
5c57d762 16788
06991777 16789#: builtin/notes.c:836
5c57d762 16790#, c-format
a0b6b246 16791msgid "unknown -s/--strategy: %s"
5c57d762
JX
16792msgstr "未知的 -s/--strategy:%s"
16793
06991777 16794#: builtin/notes.c:873
1b7f4a34 16795#, c-format
a0b6b246
JX
16796msgid "a notes merge into %s is already in-progress at %s"
16797msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
1b7f4a34 16798
06991777 16799#: builtin/notes.c:876
5c57d762 16800#, c-format
a0b6b246
JX
16801msgid "failed to store link to current notes ref (%s)"
16802msgstr "无法存储链接到当前的注解引用(%s)"
5c57d762 16803
06991777 16804#: builtin/notes.c:878
5c57d762
JX
16805#, c-format
16806msgid ""
16807"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
16808"'git notes merge --commit', or abort the merge with 'git notes merge --"
16809"abort'.\n"
a0b6b246
JX
16810msgstr ""
16811"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
16812"交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
5c57d762 16813
a6cd2cc4 16814#: builtin/notes.c:897 builtin/tag.c:545
d46c5519
JX
16815#, c-format
16816msgid "Failed to resolve '%s' as a valid ref."
16817msgstr "无法解析 '%s' 为一个有效引用。"
16818
06991777 16819#: builtin/notes.c:900
ef317cd5
JX
16820#, c-format
16821msgid "Object %s has no note\n"
16822msgstr "对象 %s 没有注解\n"
16823
06991777 16824#: builtin/notes.c:912
ef317cd5 16825msgid "attempt to remove non-existent note is not an error"
07432cef 16826msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 16827
06991777 16828#: builtin/notes.c:915
ef317cd5 16829msgid "read object names from the standard input"
07432cef 16830msgstr "从标准输入读取对象名称"
ef317cd5 16831
a5cd71ca 16832#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
5c57d762
JX
16833msgid "do not remove, show only"
16834msgstr "不删除,只显示"
16835
06991777 16836#: builtin/notes.c:955
5c57d762
JX
16837msgid "report pruned notes"
16838msgstr "报告清除的注解"
16839
06991777 16840#: builtin/notes.c:998
6c94aba5 16841msgid "notes-ref"
07432cef 16842msgstr "注解引用"
ef317cd5 16843
06991777 16844#: builtin/notes.c:999
814ff314 16845msgid "use notes from <notes-ref>"
07432cef 16846msgstr "从 <注解引用> 使用注解"
ef317cd5 16847
2b472aae 16848#: builtin/notes.c:1034 builtin/stash.c:1643
ef317cd5 16849#, c-format
a0b6b246 16850msgid "unknown subcommand: %s"
ef317cd5
JX
16851msgstr "未知子命令:%s"
16852
d46c5519 16853#: builtin/pack-objects.c:52
1b7f4a34
JX
16854msgid ""
16855"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
16856msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
ef317cd5 16857
d46c5519 16858#: builtin/pack-objects.c:53
1b7f4a34
JX
16859msgid ""
16860"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
58b6f078 16861msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
ef317cd5 16862
2b472aae 16863#: builtin/pack-objects.c:430
ef317cd5 16864#, c-format
c1ac5258
JX
16865msgid "bad packed object CRC for %s"
16866msgstr "%s 错的包对象 CRC"
16867
2b472aae 16868#: builtin/pack-objects.c:441
c1ac5258
JX
16869#, c-format
16870msgid "corrupt packed object for %s"
16871msgstr "%s 损坏的包对象"
16872
2b472aae 16873#: builtin/pack-objects.c:572
c1ac5258
JX
16874#, c-format
16875msgid "recursive delta detected for object %s"
16876msgstr "发现对象 %s 递归 delta"
16877
2b472aae 16878#: builtin/pack-objects.c:783
c1ac5258
JX
16879#, c-format
16880msgid "ordered %u objects, expected %<PRIu32>"
16881msgstr "排序了 %u 个对象,预期 %<PRIu32> 个"
16882
2b472aae 16883#: builtin/pack-objects.c:972
5b04ee3b
JX
16884msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
16885msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
16886
2b472aae 16887#: builtin/pack-objects.c:985
6c94aba5
JX
16888msgid "Writing objects"
16889msgstr "写入对象中"
16890
2b472aae 16891#: builtin/pack-objects.c:1046 builtin/update-index.c:90
c1ac5258
JX
16892#, c-format
16893msgid "failed to stat %s"
16894msgstr "对 %s 调用 stat 失败"
16895
2b472aae 16896#: builtin/pack-objects.c:1099
c1ac5258
JX
16897#, c-format
16898msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
16899msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
16900
2b472aae 16901#: builtin/pack-objects.c:1297
6c94aba5
JX
16902msgid "disabling bitmap writing, as some objects are not being packed"
16903msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
16904
2b472aae 16905#: builtin/pack-objects.c:1724
c1ac5258
JX
16906#, c-format
16907msgid "delta base offset overflow in pack for %s"
16908msgstr "%s 压缩中 delta 基准偏移越界"
16909
2b472aae 16910#: builtin/pack-objects.c:1733
c1ac5258
JX
16911#, c-format
16912msgid "delta base offset out of bound for %s"
16913msgstr "%s 的 delta 基准偏移越界"
16914
2b472aae 16915#: builtin/pack-objects.c:2004
fd8cb379
JX
16916msgid "Counting objects"
16917msgstr "对象计数中"
16918
2b472aae 16919#: builtin/pack-objects.c:2149
fd8cb379
JX
16920#, c-format
16921msgid "unable to parse object header of %s"
16922msgstr "无法解析对象 %s 头信息"
16923
2b472aae
JX
16924#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
16925#: builtin/pack-objects.c:2245
c1ac5258
JX
16926#, c-format
16927msgid "object %s cannot be read"
16928msgstr "对象 %s 无法读取"
16929
2b472aae 16930#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
c1ac5258 16931#, c-format
4c27fcb5
JX
16932msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
16933msgstr "对象 %s 不一致的对象长度(%<PRIuMAX> vs %<PRIuMAX>)"
c1ac5258 16934
2b472aae 16935#: builtin/pack-objects.c:2259
c1ac5258
JX
16936msgid "suboptimal pack - out of memory"
16937msgstr "次优(suboptimal)打包 - 内存不足"
16938
2b472aae 16939#: builtin/pack-objects.c:2574
c1ac5258
JX
16940#, c-format
16941msgid "Delta compression using up to %d threads"
16942msgstr "使用 %d 个线程进行压缩"
16943
2b472aae 16944#: builtin/pack-objects.c:2713
c1ac5258
JX
16945#, c-format
16946msgid "unable to pack objects reachable from tag %s"
16947msgstr "无法为标签 %s 压缩对象"
16948
2b472aae 16949#: builtin/pack-objects.c:2801
6c94aba5
JX
16950msgid "Compressing objects"
16951msgstr "压缩对象中"
16952
2b472aae 16953#: builtin/pack-objects.c:2807
c1ac5258
JX
16954msgid "inconsistency with delta count"
16955msgstr "不一致的差异计数"
16956
2b472aae 16957#: builtin/pack-objects.c:2888
c1ac5258
JX
16958#, c-format
16959msgid ""
16960"expected edge object ID, got garbage:\n"
16961" %s"
16962msgstr ""
16963"预期边界对象(edge object)ID,却得到垃圾数据:\n"
16964" %s"
16965
2b472aae 16966#: builtin/pack-objects.c:2894
c1ac5258
JX
16967#, c-format
16968msgid ""
16969"expected object ID, got garbage:\n"
16970" %s"
16971msgstr ""
16972"预期对象 ID,却得到垃圾数据:\n"
16973" %s"
16974
2b472aae 16975#: builtin/pack-objects.c:2992
5809aa05
JX
16976msgid "invalid value for --missing"
16977msgstr "选项 --missing 的值无效"
16978
2b472aae 16979#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
c1ac5258
JX
16980msgid "cannot open pack index"
16981msgstr "无法打开包文件索引"
16982
2b472aae 16983#: builtin/pack-objects.c:3082
c1ac5258
JX
16984#, c-format
16985msgid "loose object at %s could not be examined"
16986msgstr "无法检查 %s 处的松散对象"
16987
2b472aae 16988#: builtin/pack-objects.c:3167
c1ac5258
JX
16989msgid "unable to force loose object"
16990msgstr "无法强制松散对象"
16991
2b472aae 16992#: builtin/pack-objects.c:3260
c1ac5258
JX
16993#, c-format
16994msgid "not a rev '%s'"
16995msgstr "不是一个版本 '%s'"
16996
2b472aae 16997#: builtin/pack-objects.c:3263
c1ac5258
JX
16998#, c-format
16999msgid "bad revision '%s'"
17000msgstr "坏的版本 '%s'"
17001
2b472aae 17002#: builtin/pack-objects.c:3288
c1ac5258
JX
17003msgid "unable to add recent objects"
17004msgstr "无法添加最近的对象"
17005
2b472aae 17006#: builtin/pack-objects.c:3341
ef317cd5
JX
17007#, c-format
17008msgid "unsupported index version %s"
17009msgstr "不支持的索引版本 %s"
17010
2b472aae 17011#: builtin/pack-objects.c:3345
ef317cd5
JX
17012#, c-format
17013msgid "bad index version '%s'"
17014msgstr "坏的索引版本 '%s'"
17015
2b472aae 17016#: builtin/pack-objects.c:3383
c1ac5258
JX
17017msgid "<version>[,<offset>]"
17018msgstr "<版本>[,<偏移>]"
ef317cd5 17019
2b472aae 17020#: builtin/pack-objects.c:3384
ef317cd5 17021msgid "write the pack index file in the specified idx format version"
07432cef 17022msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 17023
2b472aae 17024#: builtin/pack-objects.c:3387
ef317cd5 17025msgid "maximum size of each output pack file"
07432cef 17026msgstr "每个输出包的最大尺寸"
ef317cd5 17027
2b472aae 17028#: builtin/pack-objects.c:3389
ef317cd5 17029msgid "ignore borrowed objects from alternate object store"
160fb2b2 17030msgstr "忽略从备用对象存储里借用对象"
ef317cd5 17031
2b472aae 17032#: builtin/pack-objects.c:3391
ef317cd5 17033msgid "ignore packed objects"
07432cef 17034msgstr "忽略包对象"
ef317cd5 17035
2b472aae 17036#: builtin/pack-objects.c:3393
ef317cd5 17037msgid "limit pack window by objects"
07432cef 17038msgstr "限制打包窗口的对象数"
ef317cd5 17039
2b472aae 17040#: builtin/pack-objects.c:3395
ef317cd5 17041msgid "limit pack window by memory in addition to object limit"
07432cef 17042msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 17043
2b472aae 17044#: builtin/pack-objects.c:3397
ef317cd5 17045msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 17046msgstr "打包允许的 delta 链的最大长度"
ef317cd5 17047
2b472aae 17048#: builtin/pack-objects.c:3399
ef317cd5 17049msgid "reuse existing deltas"
07432cef 17050msgstr "重用已存在的 deltas"
ef317cd5 17051
2b472aae 17052#: builtin/pack-objects.c:3401
ef317cd5 17053msgid "reuse existing objects"
07432cef 17054msgstr "重用已存在的对象"
ef317cd5 17055
2b472aae 17056#: builtin/pack-objects.c:3403
ef317cd5 17057msgid "use OFS_DELTA objects"
07432cef 17058msgstr "使用 OFS_DELTA 对象"
ef317cd5 17059
2b472aae 17060#: builtin/pack-objects.c:3405
ef317cd5 17061msgid "use threads when searching for best delta matches"
07432cef 17062msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 17063
2b472aae 17064#: builtin/pack-objects.c:3407
ef317cd5 17065msgid "do not create an empty pack output"
07432cef 17066msgstr "不创建空的包输出"
ef317cd5 17067
2b472aae 17068#: builtin/pack-objects.c:3409
ef317cd5 17069msgid "read revision arguments from standard input"
d9d56b23 17070msgstr "从标准输入读取版本号参数"
ef317cd5 17071
2b472aae 17072#: builtin/pack-objects.c:3411
ef317cd5 17073msgid "limit the objects to those that are not yet packed"
07432cef 17074msgstr "限制那些尚未打包的对象"
ef317cd5 17075
2b472aae 17076#: builtin/pack-objects.c:3414
ef317cd5 17077msgid "include objects reachable from any reference"
07432cef 17078msgstr "包括可以从任何引用访问到的对象"
ef317cd5 17079
2b472aae 17080#: builtin/pack-objects.c:3417
ef317cd5 17081msgid "include objects referred by reflog entries"
07432cef 17082msgstr "包括被引用日志引用到的对象"
ef317cd5 17083
2b472aae 17084#: builtin/pack-objects.c:3420
220c313c
JX
17085msgid "include objects referred to by the index"
17086msgstr "包括被索引引用到的对象"
17087
2b472aae 17088#: builtin/pack-objects.c:3423
ef317cd5 17089msgid "output pack to stdout"
07432cef 17090msgstr "输出包到标准输出"
ef317cd5 17091
2b472aae 17092#: builtin/pack-objects.c:3425
ef317cd5 17093msgid "include tag objects that refer to objects to be packed"
53438e8f 17094msgstr "包括那些引用了待打包对象的标签对象"
ef317cd5 17095
2b472aae 17096#: builtin/pack-objects.c:3427
ef317cd5 17097msgid "keep unreachable objects"
07432cef 17098msgstr "维持不可达的对象"
ef317cd5 17099
2b472aae 17100#: builtin/pack-objects.c:3429
5c57d762
JX
17101msgid "pack loose unreachable objects"
17102msgstr "打包松散的不可达对象"
17103
2b472aae 17104#: builtin/pack-objects.c:3431
ef317cd5 17105msgid "unpack unreachable objects newer than <time>"
07432cef 17106msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 17107
2b472aae 17108#: builtin/pack-objects.c:3434
06991777
JX
17109msgid "use the sparse reachability algorithm"
17110msgstr "使用稀疏可达性算法"
17111
2b472aae 17112#: builtin/pack-objects.c:3436
ef317cd5 17113msgid "create thin packs"
07432cef 17114msgstr "创建精简包"
ef317cd5 17115
2b472aae 17116#: builtin/pack-objects.c:3438
04cb2f28 17117msgid "create packs suitable for shallow fetches"
160fb2b2 17118msgstr "创建适合浅克隆仓库获取的包"
04cb2f28 17119
2b472aae 17120#: builtin/pack-objects.c:3440
ef317cd5 17121msgid "ignore packs that have companion .keep file"
07432cef 17122msgstr "忽略配有 .keep 文件的包"
ef317cd5 17123
2b472aae 17124#: builtin/pack-objects.c:3442
fd8cb379
JX
17125msgid "ignore this pack"
17126msgstr "忽略该 pack"
17127
2b472aae 17128#: builtin/pack-objects.c:3444
ef317cd5 17129msgid "pack compression level"
07432cef 17130msgstr "打包压缩级别"
ef317cd5 17131
2b472aae 17132#: builtin/pack-objects.c:3446
ef317cd5 17133msgid "do not hide commits by grafts"
fd8cb379 17134msgstr "显示被移植隐藏的提交"
ef317cd5 17135
2b472aae 17136#: builtin/pack-objects.c:3448
6c94aba5
JX
17137msgid "use a bitmap index if available to speed up counting objects"
17138msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
17139
2b472aae 17140#: builtin/pack-objects.c:3450
6c94aba5
JX
17141msgid "write a bitmap index together with the pack index"
17142msgstr "在建立包索引的同时创建 bitmap 索引"
17143
2b472aae 17144#: builtin/pack-objects.c:3454
a6cd2cc4
JX
17145msgid "write a bitmap index if possible"
17146msgstr "如果可能,写 bitmap 索引"
17147
2b472aae 17148#: builtin/pack-objects.c:3458
5809aa05
JX
17149msgid "handling for missing objects"
17150msgstr "处理丢失的对象"
17151
2b472aae 17152#: builtin/pack-objects.c:3461
31e5e17b
JX
17153msgid "do not pack objects in promisor packfiles"
17154msgstr "不要打包 promisor 包文件中的对象"
17155
2b472aae 17156#: builtin/pack-objects.c:3463
4c27fcb5
JX
17157msgid "respect islands during delta compression"
17158msgstr "在增量压缩时参考数据岛"
17159
2b472aae 17160#: builtin/pack-objects.c:3492
fd8cb379
JX
17161#, c-format
17162msgid "delta chain depth %d is too deep, forcing %d"
17163msgstr "增量链深度 %d 太深了,强制为 %d"
17164
2b472aae 17165#: builtin/pack-objects.c:3497
fd8cb379
JX
17166#, c-format
17167msgid "pack.deltaCacheLimit is too high, forcing %d"
17168msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d"
6c94aba5 17169
2b472aae 17170#: builtin/pack-objects.c:3551
c1ac5258
JX
17171msgid "--max-pack-size cannot be used to build a pack for transfer"
17172msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
17173
2b472aae 17174#: builtin/pack-objects.c:3553
c1ac5258 17175msgid "minimum pack size limit is 1 MiB"
e640d114 17176msgstr "最小的包文件大小是 1 MiB"
c1ac5258 17177
2b472aae 17178#: builtin/pack-objects.c:3558
c1ac5258
JX
17179msgid "--thin cannot be used to build an indexable pack"
17180msgstr "--thin 不能用于创建一个可索引包"
17181
2b472aae 17182#: builtin/pack-objects.c:3561
c1ac5258
JX
17183msgid "--keep-unreachable and --unpack-unreachable are incompatible"
17184msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
17185
2b472aae 17186#: builtin/pack-objects.c:3567
c1ac5258 17187msgid "cannot use --filter without --stdout"
e640d114 17188msgstr "不能在没有 --stdout 的情况下使用 --filter"
c1ac5258 17189
2b472aae 17190#: builtin/pack-objects.c:3627
fd8cb379
JX
17191msgid "Enumerating objects"
17192msgstr "枚举对象"
17193
2b472aae 17194#: builtin/pack-objects.c:3657
c1ac5258 17195#, c-format
2b472aae
JX
17196msgid ""
17197"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
17198"reused %<PRIu32>"
17199msgstr ""
17200"总共 %<PRIu32>(差异 %<PRIu32>),复用 %<PRIu32>(差异 %<PRIu32>),包复用 "
17201"%<PRIu32>"
c1ac5258 17202
d46c5519 17203#: builtin/pack-refs.c:8
814ff314
JX
17204msgid "git pack-refs [<options>]"
17205msgstr "git pack-refs [<选项>]"
c04f5ac3 17206
d46c5519 17207#: builtin/pack-refs.c:16
ef317cd5 17208msgid "pack everything"
07432cef 17209msgstr "打包一切"
c04f5ac3 17210
d46c5519 17211#: builtin/pack-refs.c:17
ef317cd5 17212msgid "prune loose refs (default)"
07432cef 17213msgstr "清除松散的引用(默认)"
c04f5ac3 17214
c1ac5258 17215#: builtin/prune-packed.c:9
814ff314
JX
17216msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
17217msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
6792b93b 17218
c1ac5258 17219#: builtin/prune-packed.c:42
6c94aba5
JX
17220msgid "Removing duplicate objects"
17221msgstr "正在删除重复对象"
17222
c1ac5258 17223#: builtin/prune.c:12
5809aa05
JX
17224msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
17225msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
7ac1c0ad 17226
d46c5519 17227#: builtin/prune.c:131
1b7f4a34
JX
17228msgid "report pruned objects"
17229msgstr "报告清除的对象"
17230
d46c5519 17231#: builtin/prune.c:134
1b7f4a34
JX
17232msgid "expire objects older than <time>"
17233msgstr "使早于给定时间的对象过期"
17234
d46c5519 17235#: builtin/prune.c:136
31e5e17b
JX
17236msgid "limit traversal to objects outside promisor packfiles"
17237msgstr "限制遍历 promisor 包以外的对象"
17238
d46c5519 17239#: builtin/prune.c:150
94550ed3
JX
17240msgid "cannot prune in a precious-objects repo"
17241msgstr "不能在珍品仓库中执行清理操作"
17242
2b472aae 17243#: builtin/pull.c:45 builtin/pull.c:47
a0b6b246
JX
17244#, c-format
17245msgid "Invalid value for %s: %s"
17246msgstr "%s 的值无效:%s"
17247
2b472aae 17248#: builtin/pull.c:67
94550ed3 17249msgid "git pull [<options>] [<repository> [<refspec>...]]"
1b7f4a34
JX
17250msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
17251
2b472aae 17252#: builtin/pull.c:122
a4f16749
JX
17253msgid "control for recursive fetching of submodules"
17254msgstr "控制子模组的递归获取"
17255
2b472aae 17256#: builtin/pull.c:126
1b7f4a34
JX
17257msgid "Options related to merging"
17258msgstr "和合并相关的选项"
17259
2b472aae 17260#: builtin/pull.c:129
1b7f4a34
JX
17261msgid "incorporate changes by rebasing rather than merging"
17262msgstr "使用变基操作取代合并操作以合入修改"
17263
2b472aae 17264#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
1b7f4a34
JX
17265msgid "allow fast-forward"
17266msgstr "允许快进式"
17267
2b472aae 17268#: builtin/pull.c:166
5b04ee3b 17269msgid "automatically stash/stash pop before and after rebase"
554e8501 17270msgstr "变基操作前后执行自动贮藏和弹出贮藏"
5b04ee3b 17271
2b472aae 17272#: builtin/pull.c:182
1b7f4a34
JX
17273msgid "Options related to fetching"
17274msgstr "和获取相关的参数"
17275
2b472aae 17276#: builtin/pull.c:192
4c27fcb5
JX
17277msgid "force overwrite of local branch"
17278msgstr "强制覆盖本地分支"
17279
2b472aae 17280#: builtin/pull.c:200
276ceeaa
JX
17281msgid "number of submodules pulled in parallel"
17282msgstr "并发拉取的子模组的数量"
17283
2b472aae 17284#: builtin/pull.c:300
1b7f4a34
JX
17285#, c-format
17286msgid "Invalid value for pull.ff: %s"
17287msgstr "pull.ff 的取值无效:%s"
17288
2b472aae 17289#: builtin/pull.c:426
1b7f4a34
JX
17290msgid ""
17291"There is no candidate for rebasing against among the refs that you just "
17292"fetched."
17293msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
17294
2b472aae 17295#: builtin/pull.c:428
1b7f4a34
JX
17296msgid ""
17297"There are no candidates for merging among the refs that you just fetched."
17298msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
17299
2b472aae 17300#: builtin/pull.c:429
1b7f4a34
JX
17301msgid ""
17302"Generally this means that you provided a wildcard refspec which had no\n"
17303"matches on the remote end."
17304msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
17305
2b472aae 17306#: builtin/pull.c:432
1b7f4a34
JX
17307#, c-format
17308msgid ""
17309"You asked to pull from the remote '%s', but did not specify\n"
17310"a branch. Because this is not the default configured remote\n"
17311"for your current branch, you must specify a branch on the command line."
17312msgstr ""
17313"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
17314"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
17315
2b472aae 17316#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
1b7f4a34
JX
17317msgid "You are not currently on a branch."
17318msgstr "您当前不在一个分支上。"
17319
2b472aae 17320#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
1b7f4a34
JX
17321msgid "Please specify which branch you want to rebase against."
17322msgstr "请指定您要变基到哪一个分支。"
17323
2b472aae 17324#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
1b7f4a34
JX
17325msgid "Please specify which branch you want to merge with."
17326msgstr "请指定您要合并哪一个分支。"
17327
2b472aae 17328#: builtin/pull.c:442 builtin/pull.c:457
1b7f4a34
JX
17329msgid "See git-pull(1) for details."
17330msgstr "详见 git-pull(1)。"
17331
2b472aae
JX
17332#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
17333#: builtin/rebase.c:1415 git-parse-remote.sh:64
5b04ee3b
JX
17334msgid "<remote>"
17335msgstr "<远程>"
17336
2b472aae 17337#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
d46c5519 17338#: git-parse-remote.sh:65
5b04ee3b
JX
17339msgid "<branch>"
17340msgstr "<分支>"
17341
2b472aae 17342#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
1b7f4a34
JX
17343msgid "There is no tracking information for the current branch."
17344msgstr "当前分支没有跟踪信息。"
17345
2b472aae 17346#: builtin/pull.c:461 git-parse-remote.sh:95
1b7f4a34 17347msgid ""
5b04ee3b
JX
17348"If you wish to set tracking information for this branch you can do so with:"
17349msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
7ac1c0ad 17350
2b472aae 17351#: builtin/pull.c:466
1b7f4a34
JX
17352#, c-format
17353msgid ""
17354"Your configuration specifies to merge with the ref '%s'\n"
17355"from the remote, but no such ref was fetched."
17356msgstr ""
17357"您的配置中指定要合并远程的引用 '%s',\n"
17358"但是没有获取到这个引用。"
7ac1c0ad 17359
2b472aae 17360#: builtin/pull.c:576
4c27fcb5
JX
17361#, c-format
17362msgid "unable to access commit %s"
17363msgstr "无法访问提交 %s"
17364
2b472aae 17365#: builtin/pull.c:857
5c57d762
JX
17366msgid "ignoring --verify-signatures for rebase"
17367msgstr "为变基操作忽略 --verify-signatures"
17368
2b472aae 17369#: builtin/pull.c:912
5b04ee3b
JX
17370msgid "--[no-]autostash option is only valid with --rebase."
17371msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
17372
2b472aae 17373#: builtin/pull.c:920
1b7f4a34
JX
17374msgid "Updating an unborn branch with changes added to the index."
17375msgstr "更新尚未诞生的分支,变更添加至索引。"
17376
2b472aae 17377#: builtin/pull.c:924
a0b6b246
JX
17378msgid "pull with rebase"
17379msgstr "变基式拉取"
17380
2b472aae 17381#: builtin/pull.c:925
a0b6b246 17382msgid "please commit or stash them."
554e8501 17383msgstr "请提交或贮藏它们。"
a0b6b246 17384
2b472aae 17385#: builtin/pull.c:950
1b7f4a34
JX
17386#, c-format
17387msgid ""
17388"fetch updated the current branch head.\n"
17389"fast-forwarding your working tree from\n"
17390"commit %s."
17391msgstr ""
17392"fetch 更新了当前的分支。快进您的工作区\n"
17393"至提交 %s。"
ef317cd5 17394
2b472aae 17395#: builtin/pull.c:956
1b7f4a34
JX
17396#, c-format
17397msgid ""
17398"Cannot fast-forward your working tree.\n"
17399"After making sure that you saved anything precious from\n"
17400"$ git diff %s\n"
17401"output, run\n"
17402"$ git reset --hard\n"
17403"to recover."
17404msgstr ""
17405"您当前的工作区无法执行快进操作。\n"
17406"首先执行如下命令:\n"
17407"$ git diff %s\n"
17408"以确认所有有用的数据均已保存。然后执行下面的命令\n"
17409"$ git reset --hard\n"
17410"恢复之前的状态。"
17411
2b472aae 17412#: builtin/pull.c:971
1b7f4a34
JX
17413msgid "Cannot merge multiple branches into empty head."
17414msgstr "无法将多个分支合并到空分支。"
17415
2b472aae 17416#: builtin/pull.c:975
1b7f4a34
JX
17417msgid "Cannot rebase onto multiple branches."
17418msgstr "无法变基到多个分支。"
17419
2b472aae 17420#: builtin/pull.c:982
a4f16749
JX
17421msgid "cannot rebase with locally recorded submodule modifications"
17422msgstr "本地子模组中有修改,无法变基"
17423
fd8cb379 17424#: builtin/push.c:19
ef317cd5 17425msgid "git push [<options>] [<repository> [<refspec>...]]"
160fb2b2 17426msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
7ac1c0ad 17427
ddc12c42 17428#: builtin/push.c:112
c04f5ac3 17429msgid "tag shorthand without <tag>"
55a16ee4 17430msgstr "标签后面未提供 <标签> 参数"
c04f5ac3 17431
ddc12c42 17432#: builtin/push.c:122
c04f5ac3 17433msgid "--delete only accepts plain target ref names"
90e6ef53 17434msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 17435
ddc12c42 17436#: builtin/push.c:168
8ada9598
JX
17437msgid ""
17438"\n"
17439"To choose either option permanently, see push.default in 'git help config'."
17440msgstr ""
81809b99
JX
17441"\n"
17442"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 17443
ddc12c42 17444#: builtin/push.c:171
8ada9598
JX
17445#, c-format
17446msgid ""
17447"The upstream branch of your current branch does not match\n"
17448"the name of your current branch. To push to the upstream branch\n"
17449"on the remote, use\n"
17450"\n"
17451" git push %s HEAD:%s\n"
17452"\n"
17453"To push to the branch of the same name on the remote, use\n"
17454"\n"
4c27fcb5 17455" git push %s HEAD\n"
8ada9598
JX
17456"%s"
17457msgstr ""
4c27fcb5
JX
17458"您当前分支的上游分支和您当前分支名不匹配,为推送到远程的上游分支,\n"
17459"使用\n"
81809b99
JX
17460"\n"
17461" git push %s HEAD:%s\n"
17462"\n"
17463"为推送至远程同名分支,使用\n"
17464"\n"
4c27fcb5 17465" git push %s HEAD\n"
81809b99 17466"%s"
8ada9598 17467
ddc12c42 17468#: builtin/push.c:186
c04f5ac3
JX
17469#, c-format
17470msgid ""
17471"You are not currently on a branch.\n"
17472"To push the history leading to the current (detached HEAD)\n"
17473"state now, use\n"
17474"\n"
17475" git push %s HEAD:<name-of-remote-branch>\n"
17476msgstr ""
17477"您当前不在一个分支上。\n"
90e6ef53 17478"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3 17479"\n"
d9d56b23 17480" git push %s HEAD:<远程分支名字>\n"
c04f5ac3 17481
ddc12c42 17482#: builtin/push.c:200
c04f5ac3
JX
17483#, c-format
17484msgid ""
17485"The current branch %s has no upstream branch.\n"
17486"To push the current branch and set the remote as upstream, use\n"
17487"\n"
17488" git push --set-upstream %s %s\n"
17489msgstr ""
17490"当前分支 %s 没有对应的上游分支。\n"
17491"为推送当前分支并建立与远程上游的跟踪,使用\n"
17492"\n"
17493" git push --set-upstream %s %s\n"
17494
ddc12c42 17495#: builtin/push.c:208
c04f5ac3
JX
17496#, c-format
17497msgid "The current branch %s has multiple upstream branches, refusing to push."
17498msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
17499
ddc12c42 17500#: builtin/push.c:211
73a60cd2
JX
17501#, c-format
17502msgid ""
17503"You are pushing to remote '%s', which is not the upstream of\n"
17504"your current branch '%s', without telling me what to push\n"
17505"to update which remote branch."
17506msgstr ""
17507"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
17508"而没有告诉我要推送什么、更新哪个远程分支。"
17509
ddc12c42 17510#: builtin/push.c:270
c04f5ac3
JX
17511msgid ""
17512"You didn't specify any refspecs to push, and push.default is \"nothing\"."
160fb2b2 17513msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
c04f5ac3 17514
ddc12c42 17515#: builtin/push.c:277
170e9899
JX
17516msgid ""
17517"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
17518"its remote counterpart. Integrate the remote changes (e.g.\n"
17519"'git pull ...') before pushing again.\n"
170e9899
JX
17520"See the 'Note about fast-forwards' in 'git push --help' for details."
17521msgstr ""
eff6d3a9 17522"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 17523"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 17524"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 17525
ddc12c42 17526#: builtin/push.c:283
170e9899
JX
17527msgid ""
17528"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
17529"counterpart. Check out this branch and integrate the remote changes\n"
17530"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
17531"See the 'Note about fast-forwards' in 'git push --help' for details."
17532msgstr ""
eff6d3a9 17533"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 17534"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 17535"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 17536
ddc12c42 17537#: builtin/push.c:289
07432cef 17538msgid ""
a77c07d9
JX
17539"Updates were rejected because the remote contains work that you do\n"
17540"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
17541"to the same ref. You may want to first integrate the remote changes\n"
17542"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
17543"See the 'Note about fast-forwards' in 'git push --help' for details."
17544msgstr ""
160fb2b2
JX
17545"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
17546"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
2e8451e8 17547"(如 'git pull ...')。\n"
a77c07d9
JX
17548"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
17549
ddc12c42 17550#: builtin/push.c:296
a77c07d9 17551msgid "Updates were rejected because the tag already exists in the remote."
55a16ee4 17552msgstr "更新被拒绝,因为该标签在远程已经存在。"
a77c07d9 17553
ddc12c42 17554#: builtin/push.c:299
a77c07d9
JX
17555msgid ""
17556"You cannot update a remote ref that points at a non-commit object,\n"
17557"or update a remote ref to make it point at a non-commit object,\n"
17558"without using the '--force' option.\n"
17559msgstr ""
17560"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
17561"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 17562
ddc12c42 17563#: builtin/push.c:360
c04f5ac3
JX
17564#, c-format
17565msgid "Pushing to %s\n"
17566msgstr "推送到 %s\n"
17567
ddc12c42 17568#: builtin/push.c:367
c04f5ac3
JX
17569#, c-format
17570msgid "failed to push some refs to '%s'"
c1ac5258 17571msgstr "推送一些引用到 '%s' 失败"
c04f5ac3 17572
ddc12c42 17573#: builtin/push.c:542
ef317cd5 17574msgid "repository"
160fb2b2 17575msgstr "仓库"
ef317cd5 17576
ddc12c42 17577#: builtin/push.c:543 builtin/send-pack.c:164
ef317cd5 17578msgid "push all refs"
07432cef 17579msgstr "推送所有引用"
ef317cd5 17580
ddc12c42 17581#: builtin/push.c:544 builtin/send-pack.c:166
ef317cd5 17582msgid "mirror all refs"
07432cef 17583msgstr "镜像所有引用"
ef317cd5 17584
ddc12c42 17585#: builtin/push.c:546
ef317cd5 17586msgid "delete refs"
07432cef 17587msgstr "删除引用"
ef317cd5 17588
ddc12c42 17589#: builtin/push.c:547
ef317cd5 17590msgid "push tags (can't be used with --all or --mirror)"
55a16ee4 17591msgstr "推送标签(不能使用 --all or --mirror)"
ef317cd5 17592
ddc12c42 17593#: builtin/push.c:550 builtin/send-pack.c:167
ef317cd5
JX
17594msgid "force updates"
17595msgstr "强制更新"
17596
ddc12c42 17597#: builtin/push.c:552 builtin/send-pack.c:181
c1ac5258
JX
17598msgid "<refname>:<expect>"
17599msgstr "<引用名>:<期望值>"
90314792 17600
ddc12c42 17601#: builtin/push.c:553 builtin/send-pack.c:182
90314792
JX
17602msgid "require old value of ref to be at this value"
17603msgstr "要求引用旧的取值为设定值"
17604
ddc12c42 17605#: builtin/push.c:556
ef317cd5 17606msgid "control recursive pushing of submodules"
07432cef 17607msgstr "控制子模组的递归推送"
ef317cd5 17608
ddc12c42 17609#: builtin/push.c:558 builtin/send-pack.c:175
ef317cd5 17610msgid "use thin pack"
07432cef 17611msgstr "使用精简打包"
ef317cd5 17612
ddc12c42 17613#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
fd8cb379 17614#: builtin/send-pack.c:162
ef317cd5 17615msgid "receive pack program"
07432cef 17616msgstr "接收包程序"
ef317cd5 17617
ddc12c42 17618#: builtin/push.c:561
ef317cd5 17619msgid "set upstream for git pull/status"
07432cef 17620msgstr "设置 git pull/status 的上游"
ef317cd5 17621
ddc12c42 17622#: builtin/push.c:564
ef317cd5 17623msgid "prune locally removed refs"
07432cef 17624msgstr "清除本地删除的引用"
ef317cd5 17625
ddc12c42 17626#: builtin/push.c:566
a77c07d9
JX
17627msgid "bypass pre-push hook"
17628msgstr "绕过 pre-push 钩子"
17629
ddc12c42 17630#: builtin/push.c:567
1003b3a5 17631msgid "push missing but relevant tags"
55a16ee4 17632msgstr "推送缺失但有关的标签"
1003b3a5 17633
ddc12c42 17634#: builtin/push.c:570 builtin/send-pack.c:169
220c313c
JX
17635msgid "GPG sign the push"
17636msgstr "用 GPG 为推送签名"
17637
ddc12c42 17638#: builtin/push.c:572 builtin/send-pack.c:176
814ff314
JX
17639msgid "request atomic transaction on remote side"
17640msgstr "需要远端支持原子事务"
17641
ddc12c42 17642#: builtin/push.c:590
c04f5ac3
JX
17643msgid "--delete is incompatible with --all, --mirror and --tags"
17644msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
17645
ddc12c42 17646#: builtin/push.c:592
c04f5ac3
JX
17647msgid "--delete doesn't make sense without any refs"
17648msgstr "--delete 未接任何引用没有意义"
17649
ddc12c42 17650#: builtin/push.c:612
a5cd71ca
JX
17651#, c-format
17652msgid "bad repository '%s'"
17653msgstr "坏的仓库 '%s'"
17654
ddc12c42 17655#: builtin/push.c:613
a5cd71ca
JX
17656msgid ""
17657"No configured push destination.\n"
17658"Either specify the URL from the command-line or configure a remote "
17659"repository using\n"
17660"\n"
17661" git remote add <name> <url>\n"
17662"\n"
17663"and then push using the remote name\n"
17664"\n"
17665" git push <name>\n"
17666msgstr ""
17667"没有配置推送目标。\n"
17668"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
17669"\n"
17670" git remote add <名称> <地址>\n"
17671"\n"
17672"然后使用该远程仓库名执行推送\n"
17673"\n"
17674" git push <名称>\n"
17675
ddc12c42 17676#: builtin/push.c:628
fd8cb379
JX
17677msgid "--all and --tags are incompatible"
17678msgstr "--all 和 --tags 不兼容"
17679
ddc12c42 17680#: builtin/push.c:630
fd8cb379
JX
17681msgid "--all can't be combined with refspecs"
17682msgstr "--all 不能和引用规格同时使用"
17683
ddc12c42 17684#: builtin/push.c:634
fd8cb379
JX
17685msgid "--mirror and --tags are incompatible"
17686msgstr "--mirror 和 --tags 不兼容"
17687
ddc12c42 17688#: builtin/push.c:636
fd8cb379
JX
17689msgid "--mirror can't be combined with refspecs"
17690msgstr "--mirror 不能和引用规格同时使用"
17691
ddc12c42 17692#: builtin/push.c:639
fd8cb379
JX
17693msgid "--all and --mirror are incompatible"
17694msgstr "--all 和 --mirror 不兼容"
17695
ddc12c42 17696#: builtin/push.c:643
5c57d762
JX
17697msgid "push options must not have new line characters"
17698msgstr "推送选项不能有换行符"
17699
c1ac5258
JX
17700#: builtin/range-diff.c:8
17701msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
17702msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>"
17703
17704#: builtin/range-diff.c:9
17705msgid "git range-diff [<options>] <old-tip>...<new-tip>"
17706msgstr "git range-diff [<选项>] <old-tip>...<new-tip>"
17707
17708#: builtin/range-diff.c:10
17709msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
17710msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>"
17711
ddc12c42 17712#: builtin/range-diff.c:22
c1ac5258
JX
17713msgid "Percentage by which creation is weighted"
17714msgstr "创建权重的百分比"
17715
ddc12c42 17716#: builtin/range-diff.c:24
c1ac5258
JX
17717msgid "use simple diff colors"
17718msgstr "使用简单差异颜色"
17719
ddc12c42
JX
17720#: builtin/range-diff.c:26
17721msgid "notes"
17722msgstr "注解"
17723
17724#: builtin/range-diff.c:26
17725msgid "passed to 'git log'"
17726msgstr "传递给 'git log'"
17727
17728#: builtin/range-diff.c:50 builtin/range-diff.c:54
c1ac5258
JX
17729#, c-format
17730msgid "no .. in range: '%s'"
17731msgstr "没有在范围中使用 ..:'%s'"
17732
ddc12c42 17733#: builtin/range-diff.c:64
c1ac5258
JX
17734msgid "single arg format must be symmetric range"
17735msgstr "单个参数格式必须是对称范围(即包含...)"
17736
ddc12c42 17737#: builtin/range-diff.c:79
c1ac5258
JX
17738msgid "need two commit ranges"
17739msgstr "需要两个提交范围"
17740
06991777 17741#: builtin/read-tree.c:41
ef317cd5 17742msgid ""
1b7f4a34 17743"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
ef317cd5
JX
17744"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
17745"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
17746msgstr ""
1b7f4a34 17747"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
07432cef 17748"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
1b7f4a34 17749"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
ef317cd5 17750
06991777 17751#: builtin/read-tree.c:124
ef317cd5 17752msgid "write resulting index to <file>"
d9d56b23 17753msgstr "将索引结果写入 <文件>"
ef317cd5 17754
06991777 17755#: builtin/read-tree.c:127
ef317cd5 17756msgid "only empty the index"
07432cef 17757msgstr "只是清空索引"
ef317cd5 17758
06991777 17759#: builtin/read-tree.c:129
ef317cd5 17760msgid "Merging"
07432cef 17761msgstr "合并"
ef317cd5 17762
06991777 17763#: builtin/read-tree.c:131
ef317cd5 17764msgid "perform a merge in addition to a read"
07432cef 17765msgstr "读取之余再执行一个合并"
ef317cd5 17766
06991777 17767#: builtin/read-tree.c:133
ef317cd5 17768msgid "3-way merge if no file level merging required"
160fb2b2 17769msgstr "如果没有文件级合并需要,执行三方合并"
ef317cd5 17770
06991777 17771#: builtin/read-tree.c:135
ef317cd5 17772msgid "3-way merge in presence of adds and removes"
160fb2b2 17773msgstr "存在添加和删除时,也执行三方合并"
ef317cd5 17774
06991777 17775#: builtin/read-tree.c:137
ef317cd5 17776msgid "same as -m, but discard unmerged entries"
07432cef 17777msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 17778
06991777 17779#: builtin/read-tree.c:138
ef317cd5 17780msgid "<subdirectory>/"
07432cef 17781msgstr "<子目录>/"
ef317cd5 17782
06991777 17783#: builtin/read-tree.c:139
ef317cd5 17784msgid "read the tree into the index under <subdirectory>/"
07432cef 17785msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 17786
06991777 17787#: builtin/read-tree.c:142
ef317cd5 17788msgid "update working tree with merge result"
07432cef 17789msgstr "用合并的结果更新工作区"
ef317cd5 17790
06991777 17791#: builtin/read-tree.c:144
ef317cd5 17792msgid "gitignore"
07432cef 17793msgstr "gitignore"
ef317cd5 17794
06991777 17795#: builtin/read-tree.c:145
ef317cd5 17796msgid "allow explicitly ignored files to be overwritten"
07432cef 17797msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 17798
06991777 17799#: builtin/read-tree.c:148
ef317cd5 17800msgid "don't check the working tree after merging"
07432cef 17801msgstr "合并后不检查工作区"
ef317cd5 17802
06991777 17803#: builtin/read-tree.c:149
ef317cd5 17804msgid "don't update the index or the work tree"
07432cef 17805msgstr "不更新索引区和工作区"
ef317cd5 17806
06991777 17807#: builtin/read-tree.c:151
ef317cd5 17808msgid "skip applying sparse checkout filter"
07432cef 17809msgstr "跳过应用稀疏检出过滤器"
ef317cd5 17810
06991777 17811#: builtin/read-tree.c:153
ef317cd5 17812msgid "debug unpack-trees"
07432cef 17813msgstr "调试 unpack-trees"
ef317cd5 17814
d46c5519
JX
17815#: builtin/read-tree.c:157
17816msgid "suppress feedback messages"
17817msgstr "抑制反馈信息"
17818
ddc12c42
JX
17819#: builtin/read-tree.c:188
17820msgid "You need to resolve your current index first"
17821msgstr "您需要先解决当前索引的冲突"
17822
d46c5519 17823#: builtin/rebase.c:32
4c27fcb5 17824msgid ""
a5cd71ca
JX
17825"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
17826"[<upstream> [<branch>]]"
ddc12c42
JX
17827msgstr ""
17828"git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<"
17829"上游> [<分支>]]"
4c27fcb5 17830
d46c5519 17831#: builtin/rebase.c:34
4c27fcb5
JX
17832msgid ""
17833"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
17834msgstr ""
17835"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]"
17836
d46c5519 17837#: builtin/rebase.c:36
4c27fcb5
JX
17838msgid "git rebase --continue | --abort | --skip | --edit-todo"
17839msgstr "git rebase --continue | --abort | --skip | --edit-todo"
17840
2b472aae 17841#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226
d46c5519
JX
17842#, c-format
17843msgid "unusable todo list: '%s'"
17844msgstr "不可用的待办列表:'%s'"
17845
2b472aae 17846#: builtin/rebase.c:292
d46c5519
JX
17847#, c-format
17848msgid "could not create temporary %s"
17849msgstr "无法创建临时的 %s"
17850
2b472aae 17851#: builtin/rebase.c:298
d46c5519
JX
17852msgid "could not mark as interactive"
17853msgstr "无法标记为交互式"
17854
2b472aae 17855#: builtin/rebase.c:352
d46c5519
JX
17856msgid "could not generate todo list"
17857msgstr "无法生成待办列表"
17858
2b472aae 17859#: builtin/rebase.c:391
d46c5519
JX
17860msgid "a base commit must be provided with --upstream or --onto"
17861msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
17862
2b472aae 17863#: builtin/rebase.c:461
d46c5519
JX
17864msgid "git rebase--interactive [<options>]"
17865msgstr "git rebase--interactive [<选项>]"
17866
2b472aae
JX
17867#: builtin/rebase.c:474 builtin/rebase.c:1550
17868msgid "(DEPRECATED) keep empty commits"
17869msgstr "(已弃用)保留空提交"
d46c5519 17870
2b472aae 17871#: builtin/rebase.c:478 builtin/revert.c:128
d46c5519
JX
17872msgid "allow commits with empty messages"
17873msgstr "允许提交说明为空"
17874
2b472aae 17875#: builtin/rebase.c:480
d46c5519
JX
17876msgid "rebase merge commits"
17877msgstr "对合并提交变基"
17878
2b472aae 17879#: builtin/rebase.c:482
d46c5519
JX
17880msgid "keep original branch points of cousins"
17881msgstr "保持兄弟提交的原始分支点"
17882
2b472aae 17883#: builtin/rebase.c:484
d46c5519
JX
17884msgid "move commits that begin with squash!/fixup!"
17885msgstr "移动以 squash!/fixup! 开头的提交"
17886
2b472aae 17887#: builtin/rebase.c:485
d46c5519
JX
17888msgid "sign commits"
17889msgstr "签名提交"
17890
2b472aae 17891#: builtin/rebase.c:487 builtin/rebase.c:1490
d46c5519 17892msgid "display a diffstat of what changed upstream"
5b533632 17893msgstr "显示上游变化的差异统计"
d46c5519 17894
2b472aae 17895#: builtin/rebase.c:489
d46c5519
JX
17896msgid "continue rebase"
17897msgstr "继续变基"
17898
2b472aae 17899#: builtin/rebase.c:491
d46c5519
JX
17900msgid "skip commit"
17901msgstr "跳过提交"
17902
2b472aae 17903#: builtin/rebase.c:492
d46c5519
JX
17904msgid "edit the todo list"
17905msgstr "变基待办列表"
17906
2b472aae 17907#: builtin/rebase.c:494
d46c5519
JX
17908msgid "show the current patch"
17909msgstr "显示当前补丁"
17910
2b472aae 17911#: builtin/rebase.c:497
d46c5519
JX
17912msgid "shorten commit ids in the todo list"
17913msgstr "缩短待办列表中的提交号"
17914
2b472aae 17915#: builtin/rebase.c:499
d46c5519
JX
17916msgid "expand commit ids in the todo list"
17917msgstr "扩展待办列表中的提交号"
17918
2b472aae 17919#: builtin/rebase.c:501
d46c5519
JX
17920msgid "check the todo list"
17921msgstr "检查待办列表"
17922
2b472aae 17923#: builtin/rebase.c:503
d46c5519
JX
17924msgid "rearrange fixup/squash lines"
17925msgstr "重新排列 fixup/squash 行"
17926
2b472aae 17927#: builtin/rebase.c:505
d46c5519
JX
17928msgid "insert exec commands in todo list"
17929msgstr "在待办列表中插入 exec 执行命令"
17930
2b472aae 17931#: builtin/rebase.c:506
d46c5519
JX
17932msgid "onto"
17933msgstr "onto"
17934
2b472aae 17935#: builtin/rebase.c:509
d46c5519
JX
17936msgid "restrict-revision"
17937msgstr "restrict-revision"
17938
2b472aae 17939#: builtin/rebase.c:509
d46c5519
JX
17940msgid "restrict revision"
17941msgstr "限制版本"
17942
2b472aae 17943#: builtin/rebase.c:511
d46c5519
JX
17944msgid "squash-onto"
17945msgstr "squash-onto"
17946
2b472aae 17947#: builtin/rebase.c:512
d46c5519
JX
17948msgid "squash onto"
17949msgstr "squash onto"
17950
2b472aae 17951#: builtin/rebase.c:514
d46c5519
JX
17952msgid "the upstream commit"
17953msgstr "上游提交"
17954
2b472aae 17955#: builtin/rebase.c:516
d46c5519
JX
17956msgid "head-name"
17957msgstr "head-name"
17958
2b472aae 17959#: builtin/rebase.c:516
d46c5519
JX
17960msgid "head name"
17961msgstr "head 名称"
17962
2b472aae 17963#: builtin/rebase.c:521
d46c5519
JX
17964msgid "rebase strategy"
17965msgstr "变基策略"
17966
2b472aae 17967#: builtin/rebase.c:522
d46c5519
JX
17968msgid "strategy-opts"
17969msgstr "strategy-opts"
17970
2b472aae 17971#: builtin/rebase.c:523
d46c5519
JX
17972msgid "strategy options"
17973msgstr "策略选项"
17974
2b472aae 17975#: builtin/rebase.c:524
d46c5519
JX
17976msgid "switch-to"
17977msgstr "切换到"
17978
2b472aae 17979#: builtin/rebase.c:525
d46c5519
JX
17980msgid "the branch or commit to checkout"
17981msgstr "要检出的分支或提交"
17982
2b472aae 17983#: builtin/rebase.c:526
d46c5519
JX
17984msgid "onto-name"
17985msgstr "onto-name"
17986
2b472aae 17987#: builtin/rebase.c:526
d46c5519
JX
17988msgid "onto name"
17989msgstr "onto name"
17990
2b472aae 17991#: builtin/rebase.c:527
d46c5519
JX
17992msgid "cmd"
17993msgstr "cmd"
17994
2b472aae 17995#: builtin/rebase.c:527
d46c5519
JX
17996msgid "the command to run"
17997msgstr "要执行的命令"
17998
2b472aae 17999#: builtin/rebase.c:530 builtin/rebase.c:1584
d46c5519
JX
18000msgid "automatically re-schedule any `exec` that fails"
18001msgstr "自动重新安排任何失败的 `exec`"
18002
2b472aae 18003#: builtin/rebase.c:546
d46c5519
JX
18004msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
18005msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果"
18006
2b472aae 18007#: builtin/rebase.c:562
4c27fcb5
JX
18008#, c-format
18009msgid "%s requires an interactive rebase"
18010msgstr "%s 需要交互式变基"
18011
2b472aae 18012#: builtin/rebase.c:612
4c27fcb5
JX
18013#, c-format
18014msgid "could not get 'onto': '%s'"
18015msgstr "无法获取 'onto':'%s'"
18016
2b472aae 18017#: builtin/rebase.c:627
4c27fcb5
JX
18018#, c-format
18019msgid "invalid orig-head: '%s'"
18020msgstr "无效的原始 head:'%s'"
18021
2b472aae 18022#: builtin/rebase.c:652
4c27fcb5
JX
18023#, c-format
18024msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
18025msgstr "忽略无效的 allow_rerere_autoupdate:'%s'"
18026
2b472aae 18027#: builtin/rebase.c:728
4c27fcb5
JX
18028#, c-format
18029msgid "Could not read '%s'"
18030msgstr "不能读取 '%s'"
18031
2b472aae 18032#: builtin/rebase.c:746
4c27fcb5
JX
18033#, c-format
18034msgid "Cannot store %s"
18035msgstr "不能存储 %s"
18036
2b472aae 18037#: builtin/rebase.c:853
06991777
JX
18038msgid "could not determine HEAD revision"
18039msgstr "不能确定 HEAD 版本"
18040
2b472aae 18041#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
4c27fcb5
JX
18042msgid ""
18043"Resolve all conflicts manually, mark them as resolved with\n"
18044"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
18045"You can instead skip this commit: run \"git rebase --skip\".\n"
18046"To abort and get back to the state before \"git rebase\", run \"git rebase --"
18047"abort\"."
18048msgstr ""
18049"手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n"
18050"冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n"
18051"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
18052"\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。"
18053
2b472aae 18054#: builtin/rebase.c:1058
06991777
JX
18055#, c-format
18056msgid ""
18057"\n"
18058"git encountered an error while preparing the patches to replay\n"
18059"these revisions:\n"
18060"\n"
18061" %s\n"
18062"\n"
18063"As a result, git cannot rebase them."
18064msgstr ""
18065"\n"
18066"在为重放这些版本而准备补丁时,git 遇到了一个错误:\n"
18067"\n"
18068" %s\n"
18069"\n"
18070"因此 git 无法对其变基。"
4c27fcb5 18071
2b472aae
JX
18072#: builtin/rebase.c:1383
18073#, c-format
18074msgid ""
18075"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
18076"\"."
440e7442 18077msgstr "无法识别的空类型 '%s';有效值有 \"drop\"、\"keep\" 和 \"ask\"。"
2b472aae
JX
18078
18079#: builtin/rebase.c:1401
4c27fcb5
JX
18080#, c-format
18081msgid ""
18082"%s\n"
18083"Please specify which branch you want to rebase against.\n"
18084"See git-rebase(1) for details.\n"
18085"\n"
18086" git rebase '<branch>'\n"
18087"\n"
18088msgstr ""
18089"%s\n"
18090"请指定您要变基到哪个分支。\n"
18091"详见 git-rebase(1)。\n"
18092"\n"
18093" git rebase '<branch>'\n"
18094"\n"
18095
2b472aae 18096#: builtin/rebase.c:1417
4c27fcb5
JX
18097#, c-format
18098msgid ""
18099"If you wish to set tracking information for this branch you can do so with:\n"
18100"\n"
18101" git branch --set-upstream-to=%s/<branch> %s\n"
18102"\n"
18103msgstr ""
18104"如果您想要为此分支创建跟踪信息,您可以执行:\n"
18105"\n"
18106" git branch --set-upstream-to=%s/<branch> %s\n"
18107"\n"
18108
2b472aae 18109#: builtin/rebase.c:1447
06991777
JX
18110msgid "exec commands cannot contain newlines"
18111msgstr "exec 命令不能包含换行符"
18112
2b472aae 18113#: builtin/rebase.c:1451
06991777
JX
18114msgid "empty exec command"
18115msgstr "空的 exec 命令"
18116
2b472aae 18117#: builtin/rebase.c:1481
4c27fcb5
JX
18118msgid "rebase onto given branch instead of upstream"
18119msgstr "变基到给定的分支而非上游"
18120
2b472aae 18121#: builtin/rebase.c:1483
a5cd71ca
JX
18122msgid "use the merge-base of upstream and branch as the current base"
18123msgstr "使用上游和分支的合并基线做为当前基线"
18124
2b472aae 18125#: builtin/rebase.c:1485
4c27fcb5
JX
18126msgid "allow pre-rebase hook to run"
18127msgstr "允许执行 pre-rebase 钩子"
18128
2b472aae 18129#: builtin/rebase.c:1487
4c27fcb5
JX
18130msgid "be quiet. implies --no-stat"
18131msgstr "安静。暗示 --no-stat"
18132
2b472aae 18133#: builtin/rebase.c:1493
4c27fcb5 18134msgid "do not show diffstat of what changed upstream"
5b533632 18135msgstr "不显示上游变化的差异统计"
4c27fcb5 18136
2b472aae 18137#: builtin/rebase.c:1496
4c27fcb5
JX
18138msgid "add a Signed-off-by: line to each commit"
18139msgstr "为每一个提交添加一个 Signed-off-by: 签名"
18140
2b472aae
JX
18141#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
18142msgid "passed to 'git am'"
18143msgstr "传递给 'git am"
4c27fcb5 18144
2b472aae 18145#: builtin/rebase.c:1506 builtin/rebase.c:1508
4c27fcb5
JX
18146msgid "passed to 'git apply'"
18147msgstr "传递给 'git apply'"
18148
2b472aae 18149#: builtin/rebase.c:1510 builtin/rebase.c:1513
4c27fcb5
JX
18150msgid "cherry-pick all commits, even if unchanged"
18151msgstr "拣选所有提交,即使未修改"
18152
2b472aae 18153#: builtin/rebase.c:1515
4c27fcb5
JX
18154msgid "continue"
18155msgstr "继续"
18156
2b472aae 18157#: builtin/rebase.c:1518
4c27fcb5
JX
18158msgid "skip current patch and continue"
18159msgstr "跳过当前补丁并继续"
18160
18161# 译者:注意保持前导空格
2b472aae 18162#: builtin/rebase.c:1520
4c27fcb5
JX
18163msgid "abort and check out the original branch"
18164msgstr "终止并检出原有分支"
18165
2b472aae 18166#: builtin/rebase.c:1523
4c27fcb5
JX
18167msgid "abort but keep HEAD where it is"
18168msgstr "终止但保持 HEAD 不变"
18169
2b472aae 18170#: builtin/rebase.c:1524
4c27fcb5
JX
18171msgid "edit the todo list during an interactive rebase"
18172msgstr "在交互式变基中编辑待办列表"
18173
2b472aae 18174#: builtin/rebase.c:1527
4c27fcb5
JX
18175msgid "show the patch file being applied or merged"
18176msgstr "显示正在应用或合并的补丁文件"
18177
2b472aae
JX
18178#: builtin/rebase.c:1530
18179msgid "use apply strategies to rebase"
18180msgstr "使用应用策略进行变基"
18181
18182#: builtin/rebase.c:1534
4c27fcb5
JX
18183msgid "use merging strategies to rebase"
18184msgstr "使用合并策略进行变基"
18185
2b472aae 18186#: builtin/rebase.c:1538
4c27fcb5
JX
18187msgid "let the user edit the list of commits to rebase"
18188msgstr "让用户编辑要变基的提交列表"
18189
2b472aae 18190#: builtin/rebase.c:1542
d46c5519
JX
18191msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
18192msgstr "(已弃用)尝试重建合并提交而非忽略它们"
4c27fcb5 18193
2b472aae
JX
18194#: builtin/rebase.c:1547
18195msgid "how to handle commits that become empty"
440e7442 18196msgstr "如何处理成为空提交的提交"
4c27fcb5 18197
2b472aae 18198#: builtin/rebase.c:1554
4c27fcb5
JX
18199msgid "move commits that begin with squash!/fixup! under -i"
18200msgstr "在 -i 交互模式下,移动以 squash!/fixup! 开头的提交"
18201
2b472aae 18202#: builtin/rebase.c:1560
4c27fcb5
JX
18203msgid "automatically stash/stash pop before and after"
18204msgstr "在操作前后执行自动贮藏和弹出贮藏"
18205
2b472aae 18206#: builtin/rebase.c:1562
4c27fcb5
JX
18207msgid "add exec lines after each commit of the editable list"
18208msgstr "可编辑列表的每一个提交下面增加一行 exec"
18209
2b472aae 18210#: builtin/rebase.c:1566
4c27fcb5
JX
18211msgid "allow rebasing commits with empty messages"
18212msgstr "允许针对空提交说明的提交变基"
18213
2b472aae 18214#: builtin/rebase.c:1570
4c27fcb5
JX
18215msgid "try to rebase merges instead of skipping them"
18216msgstr "尝试对合并提交变基而不是忽略它们"
18217
2b472aae 18218#: builtin/rebase.c:1573
4c27fcb5
JX
18219msgid "use 'merge-base --fork-point' to refine upstream"
18220msgstr "使用 'merge-base --fork-point' 来优化上游"
18221
2b472aae 18222#: builtin/rebase.c:1575
4c27fcb5
JX
18223msgid "use the given merge strategy"
18224msgstr "使用给定的合并策略"
18225
2b472aae 18226#: builtin/rebase.c:1577 builtin/revert.c:115
4c27fcb5
JX
18227msgid "option"
18228msgstr "选项"
18229
2b472aae 18230#: builtin/rebase.c:1578
4c27fcb5
JX
18231msgid "pass the argument through to the merge strategy"
18232msgstr "将参数传递给合并策略"
18233
2b472aae 18234#: builtin/rebase.c:1581
4c27fcb5
JX
18235msgid "rebase all reachable commits up to the root(s)"
18236msgstr "将所有可达的提交变基到根提交"
18237
2b472aae 18238#: builtin/rebase.c:1598
d46c5519
JX
18239msgid ""
18240"the rebase.useBuiltin support has been removed!\n"
18241"See its entry in 'git help config' for details."
18242msgstr ""
18243"对 rebase.useBuiltin 的支持已被删除!\n"
18244"详见 'git help config' 中的条目。"
4c27fcb5 18245
2b472aae 18246#: builtin/rebase.c:1604
4c27fcb5
JX
18247msgid "It looks like 'git am' is in progress. Cannot rebase."
18248msgstr "看起来 'git-am' 正在执行中。无法变基。"
18249
2b472aae 18250#: builtin/rebase.c:1645
d46c5519
JX
18251msgid ""
18252"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
18253msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。"
18254
2b472aae 18255#: builtin/rebase.c:1650
a5cd71ca
JX
18256msgid "cannot combine '--keep-base' with '--onto'"
18257msgstr "不能将 '--keep-base' 和 '--onto' 组合使用"
18258
2b472aae 18259#: builtin/rebase.c:1652
a5cd71ca
JX
18260msgid "cannot combine '--keep-base' with '--root'"
18261msgstr "不能将 '--keep-base' 和 '--root' 组合使用"
18262
2b472aae 18263#: builtin/rebase.c:1656
4c27fcb5
JX
18264msgid "No rebase in progress?"
18265msgstr "没有正在进行的变基?"
18266
2b472aae 18267#: builtin/rebase.c:1660
4c27fcb5
JX
18268msgid "The --edit-todo action can only be used during interactive rebase."
18269msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
18270
2b472aae 18271#: builtin/rebase.c:1683
4c27fcb5
JX
18272msgid "Cannot read HEAD"
18273msgstr "不能读取 HEAD"
18274
2b472aae 18275#: builtin/rebase.c:1695
4c27fcb5
JX
18276msgid ""
18277"You must edit all merge conflicts and then\n"
18278"mark them as resolved using git add"
18279msgstr ""
18280"您必须编辑所有的合并冲突,然后通过 git add\n"
18281"命令将它们标记为已解决"
18282
2b472aae 18283#: builtin/rebase.c:1714
4c27fcb5
JX
18284msgid "could not discard worktree changes"
18285msgstr "无法丢弃工作区变更"
18286
2b472aae 18287#: builtin/rebase.c:1733
4c27fcb5
JX
18288#, c-format
18289msgid "could not move back to %s"
18290msgstr "无法移回 %s"
18291
2b472aae 18292#: builtin/rebase.c:1778
4c27fcb5
JX
18293#, c-format
18294msgid ""
18295"It seems that there is already a %s directory, and\n"
18296"I wonder if you are in the middle of another rebase. If that is the\n"
18297"case, please try\n"
18298"\t%s\n"
18299"If that is not the case, please\n"
18300"\t%s\n"
18301"and run me again. I am stopping in case you still have something\n"
18302"valuable there.\n"
18303msgstr ""
18304"似乎已有一个 %s 目录,我怀疑您正处于另外一个变基操作过程中。\n"
18305"如果是这样,请执行\n"
18306"\t%s\n"
18307"如果不是这样,请执行\n"
18308"\t%s\n"
18309"然后再重新执行。 为避免丢失重要数据,我已经停止当前操作。\n"
18310
2b472aae 18311#: builtin/rebase.c:1806
4c27fcb5
JX
18312msgid "switch `C' expects a numerical value"
18313msgstr "开关 `C' 期望一个数字值"
18314
2b472aae 18315#: builtin/rebase.c:1847
4c27fcb5
JX
18316#, c-format
18317msgid "Unknown mode: %s"
18318msgstr "未知模式:%s"
18319
2b472aae 18320#: builtin/rebase.c:1869
4c27fcb5
JX
18321msgid "--strategy requires --merge or --interactive"
18322msgstr "--strategy 需要 --merge 或 --interactive"
18323
2b472aae
JX
18324#: builtin/rebase.c:1899
18325msgid "cannot combine apply options with merge options"
18326msgstr "不能组合使用应用选项和合并选项"
18327
18328#: builtin/rebase.c:1912
18329#, c-format
18330msgid "Unknown rebase backend: %s"
18331msgstr "未知的变基后端:%s"
18332
18333#: builtin/rebase.c:1937
a6cd2cc4
JX
18334msgid "--reschedule-failed-exec requires --exec or --interactive"
18335msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
18336
2b472aae 18337#: builtin/rebase.c:1957
06991777 18338msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
5b533632 18339msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"
4c27fcb5 18340
2b472aae 18341#: builtin/rebase.c:1961
06991777
JX
18342msgid ""
18343"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
18344msgstr ""
5b533632 18345"错误:不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"
4c27fcb5 18346
2b472aae 18347#: builtin/rebase.c:1985
4c27fcb5
JX
18348#, c-format
18349msgid "invalid upstream '%s'"
18350msgstr "无效的上游 '%s'"
18351
2b472aae 18352#: builtin/rebase.c:1991
4c27fcb5
JX
18353msgid "Could not create new root commit"
18354msgstr "不能创建新的根提交"
18355
2b472aae 18356#: builtin/rebase.c:2017
a5cd71ca
JX
18357#, c-format
18358msgid "'%s': need exactly one merge base with branch"
18359msgstr "'%s':只需要与分支的一个合并基线"
18360
2b472aae 18361#: builtin/rebase.c:2020
4c27fcb5
JX
18362#, c-format
18363msgid "'%s': need exactly one merge base"
18364msgstr "'%s':只需要一个合并基线"
18365
2b472aae 18366#: builtin/rebase.c:2028
4c27fcb5
JX
18367#, c-format
18368msgid "Does not point to a valid commit '%s'"
18369msgstr "没有指向一个有效的提交 '%s'"
18370
2b472aae 18371#: builtin/rebase.c:2054
4c27fcb5
JX
18372#, c-format
18373msgid "fatal: no such branch/commit '%s'"
06991777 18374msgstr "致命错误:无此分支/提交 '%s'"
4c27fcb5 18375
2b472aae
JX
18376#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
18377#: builtin/submodule--helper.c:1990
4c27fcb5
JX
18378#, c-format
18379msgid "No such ref: %s"
18380msgstr "没有这样的引用:%s"
18381
2b472aae 18382#: builtin/rebase.c:2073
4c27fcb5
JX
18383msgid "Could not resolve HEAD to a revision"
18384msgstr "无法将 HEAD 解析为一个版本"
18385
2b472aae 18386#: builtin/rebase.c:2111
4c27fcb5
JX
18387msgid "Cannot autostash"
18388msgstr "无法 autostash"
18389
2b472aae 18390#: builtin/rebase.c:2114
4c27fcb5
JX
18391#, c-format
18392msgid "Unexpected stash response: '%s'"
18393msgstr "意外的 stash 响应:'%s'"
18394
2b472aae 18395#: builtin/rebase.c:2120
4c27fcb5
JX
18396#, c-format
18397msgid "Could not create directory for '%s'"
18398msgstr "不能为 '%s' 创建目录"
18399
2b472aae 18400#: builtin/rebase.c:2123
4c27fcb5
JX
18401#, c-format
18402msgid "Created autostash: %s\n"
18403msgstr "创建了 autostash:%s\n"
18404
2b472aae 18405#: builtin/rebase.c:2126
4c27fcb5
JX
18406msgid "could not reset --hard"
18407msgstr "无法 reset --hard"
18408
2b472aae 18409#: builtin/rebase.c:2135
4c27fcb5
JX
18410msgid "Please commit or stash them."
18411msgstr "请提交或贮藏修改。"
18412
2b472aae 18413#: builtin/rebase.c:2169
4c27fcb5
JX
18414#, c-format
18415msgid "could not switch to %s"
18416msgstr "无法切换到 %s"
18417
2b472aae 18418#: builtin/rebase.c:2180
4c27fcb5
JX
18419msgid "HEAD is up to date."
18420msgstr "HEAD 是最新的。"
18421
2b472aae 18422#: builtin/rebase.c:2182
4c27fcb5
JX
18423#, c-format
18424msgid "Current branch %s is up to date.\n"
18425msgstr "当前分支 %s 是最新的。\n"
18426
2b472aae 18427#: builtin/rebase.c:2190
4c27fcb5
JX
18428msgid "HEAD is up to date, rebase forced."
18429msgstr "HEAD 是最新的,强制变基。"
18430
2b472aae 18431#: builtin/rebase.c:2192
4c27fcb5
JX
18432#, c-format
18433msgid "Current branch %s is up to date, rebase forced.\n"
18434msgstr "当前分支 %s 是最新的,强制变基。\n"
18435
2b472aae 18436#: builtin/rebase.c:2200
4c27fcb5
JX
18437msgid "The pre-rebase hook refused to rebase."
18438msgstr "pre-rebase 钩子拒绝了变基操作。"
18439
2b472aae 18440#: builtin/rebase.c:2207
4c27fcb5
JX
18441#, c-format
18442msgid "Changes to %s:\n"
18443msgstr "到 %s 的变更:\n"
18444
2b472aae 18445#: builtin/rebase.c:2210
4c27fcb5
JX
18446#, c-format
18447msgid "Changes from %s to %s:\n"
18448msgstr "从 %s 到 %s 的变更:\n"
18449
2b472aae 18450#: builtin/rebase.c:2235
4c27fcb5
JX
18451#, c-format
18452msgid "First, rewinding head to replay your work on top of it...\n"
18453msgstr "首先,回退头指针以便在其上重放您的工作...\n"
18454
2b472aae 18455#: builtin/rebase.c:2244
4c27fcb5
JX
18456msgid "Could not detach HEAD"
18457msgstr "无法分离头指针"
18458
2b472aae 18459#: builtin/rebase.c:2253
4c27fcb5
JX
18460#, c-format
18461msgid "Fast-forwarded %s to %s.\n"
18462msgstr "快进 %s 到 %s。\n"
18463
2b472aae 18464#: builtin/receive-pack.c:33
5b04ee3b 18465msgid "git receive-pack <git-dir>"
58b6f078 18466msgstr "git receive-pack <仓库目录>"
5b04ee3b 18467
2b472aae 18468#: builtin/receive-pack.c:821
a0b6b246
JX
18469msgid ""
18470"By default, updating the current branch in a non-bare repository\n"
18471"is denied, because it will make the index and work tree inconsistent\n"
18472"with what you pushed, and will require 'git reset --hard' to match\n"
18473"the work tree to HEAD.\n"
18474"\n"
1a79b2f1
JX
18475"You can set the 'receive.denyCurrentBranch' configuration variable\n"
18476"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
a0b6b246
JX
18477"its current branch; however, this is not recommended unless you\n"
18478"arranged to update its work tree to match what you pushed in some\n"
18479"other way.\n"
18480"\n"
18481"To squelch this message and still keep the default behaviour, set\n"
18482"'receive.denyCurrentBranch' configuration variable to 'refuse'."
18483msgstr ""
18484"默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
18485"不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
18486"\n"
18487"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
18488"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
18489"用某种方式将其工作区更新至您推送的状态。\n"
18490"\n"
18491"若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
18492"配置变量为 'refuse'。"
18493
2b472aae 18494#: builtin/receive-pack.c:841
a0b6b246
JX
18495msgid ""
18496"By default, deleting the current branch is denied, because the next\n"
18497"'git clone' won't result in any file checked out, causing confusion.\n"
18498"\n"
18499"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
18500"'warn' or 'ignore' in the remote repository to allow deleting the\n"
18501"current branch, with or without a warning message.\n"
18502"\n"
18503"To squelch this message, you can set it to 'refuse'."
18504msgstr ""
18505"默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
29004bbb 18506"导致困惑。\n"
a0b6b246
JX
18507"\n"
18508"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
29004bbb 18509"'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
a0b6b246
JX
18510"\n"
18511"若要屏蔽此信息,您可以设置它为 'refuse'。"
18512
2b472aae 18513#: builtin/receive-pack.c:1938
5b04ee3b
JX
18514msgid "quiet"
18515msgstr "静默模式"
18516
2b472aae 18517#: builtin/receive-pack.c:1952
5b04ee3b
JX
18518msgid "You must specify a directory."
18519msgstr "您必须指定一个目录。"
18520
06991777
JX
18521#: builtin/reflog.c:17
18522msgid ""
18523"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
18524"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
18525"<refs>..."
18526msgstr ""
18527"git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>] [--"
18528"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引"
18529"用>..."
18530
18531#: builtin/reflog.c:22
18532msgid ""
18533"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
18534"<refs>..."
18535msgstr ""
18536"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引"
18537"用>..."
18538
18539#: builtin/reflog.c:25
18540msgid "git reflog exists <ref>"
18541msgstr "git reflog exists <引用>"
18542
2b472aae 18543#: builtin/reflog.c:568 builtin/reflog.c:573
2e8451e8
JX
18544#, c-format
18545msgid "'%s' is not a valid timestamp"
18546msgstr "'%s' 不是一个有效的时间戳"
18547
2b472aae 18548#: builtin/reflog.c:606
06991777
JX
18549#, c-format
18550msgid "Marking reachable objects..."
18551msgstr "正在标记可达对象..."
18552
2b472aae 18553#: builtin/reflog.c:644
06991777
JX
18554#, c-format
18555msgid "%s points nowhere!"
18556msgstr "%s 指向不存在!"
18557
2b472aae 18558#: builtin/reflog.c:696
06991777
JX
18559msgid "no reflog specified to delete"
18560msgstr "未指定要删除的引用日志"
18561
2b472aae 18562#: builtin/reflog.c:705
06991777
JX
18563#, c-format
18564msgid "not a reflog: %s"
18565msgstr "不是一个引用日志:%s"
18566
2b472aae 18567#: builtin/reflog.c:710
06991777
JX
18568#, c-format
18569msgid "no reflog for '%s'"
18570msgstr "没有 '%s' 的引用日志"
18571
2b472aae 18572#: builtin/reflog.c:756
06991777
JX
18573#, c-format
18574msgid "invalid ref format: %s"
18575msgstr "无效的引用格式:%s"
18576
2b472aae 18577#: builtin/reflog.c:765
06991777
JX
18578msgid "git reflog [ show | expire | delete | exists ]"
18579msgstr "git reflog [ show | expire | delete | exists ]"
18580
2b472aae 18581#: builtin/remote.c:17
ef317cd5 18582msgid "git remote [-v | --verbose]"
07432cef 18583msgstr "git remote [-v | --verbose]"
ef317cd5 18584
2b472aae 18585#: builtin/remote.c:18
ef317cd5 18586msgid ""
814ff314 18587"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
ef317cd5
JX
18588"mirror=<fetch|push>] <name> <url>"
18589msgstr ""
814ff314 18590"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
d9d56b23 18591"mirror=<fetch|push>] <名称> <地址>"
ef317cd5 18592
2b472aae 18593#: builtin/remote.c:19 builtin/remote.c:39
ef317cd5 18594msgid "git remote rename <old> <new>"
07432cef 18595msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 18596
2b472aae 18597#: builtin/remote.c:20 builtin/remote.c:44
ef317cd5 18598msgid "git remote remove <name>"
07432cef 18599msgstr "git remote remove <名称>"
ef317cd5 18600
2b472aae 18601#: builtin/remote.c:21 builtin/remote.c:49
814ff314
JX
18602msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
18603msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
ef317cd5 18604
2b472aae 18605#: builtin/remote.c:22
ef317cd5 18606msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 18607msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 18608
2b472aae 18609#: builtin/remote.c:23
ef317cd5 18610msgid "git remote prune [-n | --dry-run] <name>"
07432cef 18611msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 18612
2b472aae 18613#: builtin/remote.c:24
ef317cd5
JX
18614msgid ""
18615"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 18616msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 18617
2b472aae 18618#: builtin/remote.c:25
ef317cd5 18619msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 18620msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 18621
2b472aae 18622#: builtin/remote.c:26 builtin/remote.c:75
94550ed3
JX
18623msgid "git remote get-url [--push] [--all] <name>"
18624msgstr "git remote get-url [--push] [--all] <名称>"
18625
2b472aae 18626#: builtin/remote.c:27 builtin/remote.c:80
ef317cd5 18627msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 18628msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 18629
2b472aae 18630#: builtin/remote.c:28 builtin/remote.c:81
ef317cd5 18631msgid "git remote set-url --add <name> <newurl>"
07432cef 18632msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 18633
2b472aae 18634#: builtin/remote.c:29 builtin/remote.c:82
ef317cd5 18635msgid "git remote set-url --delete <name> <url>"
07432cef 18636msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 18637
2b472aae 18638#: builtin/remote.c:34
ef317cd5 18639msgid "git remote add [<options>] <name> <url>"
07432cef 18640msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 18641
2b472aae 18642#: builtin/remote.c:54
ef317cd5 18643msgid "git remote set-branches <name> <branch>..."
07432cef 18644msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 18645
2b472aae 18646#: builtin/remote.c:55
ef317cd5 18647msgid "git remote set-branches --add <name> <branch>..."
07432cef 18648msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 18649
2b472aae 18650#: builtin/remote.c:60
ef317cd5 18651msgid "git remote show [<options>] <name>"
07432cef 18652msgstr "git remote show [<选项>] <名称>"
ef317cd5 18653
2b472aae 18654#: builtin/remote.c:65
ef317cd5 18655msgid "git remote prune [<options>] <name>"
07432cef 18656msgstr "git remote prune [<选项>] <名称>"
ef317cd5 18657
2b472aae 18658#: builtin/remote.c:70
ef317cd5 18659msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 18660msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 18661
2b472aae 18662#: builtin/remote.c:99
81809b99 18663#, c-format
8ada9598 18664msgid "Updating %s"
81809b99 18665msgstr "更新 %s 中"
8ada9598 18666
2b472aae 18667#: builtin/remote.c:131
8ada9598
JX
18668msgid ""
18669"--mirror is dangerous and deprecated; please\n"
18670"\t use --mirror=fetch or --mirror=push instead"
18671msgstr ""
81809b99
JX
18672"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
18673"\t 或 --mirror=push"
8ada9598 18674
2b472aae 18675#: builtin/remote.c:148
81809b99 18676#, c-format
8ada9598 18677msgid "unknown mirror argument: %s"
81809b99 18678msgstr "未知的镜像参数:%s"
8ada9598 18679
2b472aae 18680#: builtin/remote.c:164
ef317cd5 18681msgid "fetch the remote branches"
07432cef 18682msgstr "抓取远程的分支"
ef317cd5 18683
2b472aae 18684#: builtin/remote.c:166
ef317cd5 18685msgid "import all tags and associated objects when fetching"
55a16ee4 18686msgstr "抓取时导入所有的标签和关联对象"
ef317cd5 18687
2b472aae 18688#: builtin/remote.c:169
ef317cd5 18689msgid "or do not fetch any tag at all (--no-tags)"
55a16ee4 18690msgstr "或不抓取任何标签(--no-tags)"
ef317cd5 18691
2b472aae 18692#: builtin/remote.c:171
ef317cd5 18693msgid "branch(es) to track"
07432cef 18694msgstr "跟踪的分支"
ef317cd5 18695
2b472aae 18696#: builtin/remote.c:172
ef317cd5 18697msgid "master branch"
07432cef 18698msgstr "主线分支"
ef317cd5 18699
2b472aae 18700#: builtin/remote.c:174
ef317cd5 18701msgid "set up remote as a mirror to push to or fetch from"
07432cef 18702msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 18703
2b472aae 18704#: builtin/remote.c:186
8ada9598 18705msgid "specifying a master branch makes no sense with --mirror"
81809b99 18706msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 18707
2b472aae 18708#: builtin/remote.c:188
8ada9598 18709msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 18710msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 18711
2b472aae 18712#: builtin/remote.c:195 builtin/remote.c:696
81809b99 18713#, c-format
8ada9598 18714msgid "remote %s already exists."
81809b99 18715msgstr "远程 %s 已经存在。"
8ada9598 18716
2b472aae 18717#: builtin/remote.c:199 builtin/remote.c:700
81809b99 18718#, c-format
8ada9598 18719msgid "'%s' is not a valid remote name"
81809b99 18720msgstr "'%s' 不是一个有效的远程名称"
8ada9598 18721
2b472aae 18722#: builtin/remote.c:239
81809b99 18723#, c-format
8ada9598 18724msgid "Could not setup master '%s'"
81809b99 18725msgstr "无法设置 master '%s'"
8ada9598 18726
2b472aae 18727#: builtin/remote.c:354
81809b99 18728#, c-format
8ada9598 18729msgid "Could not get fetch map for refspec %s"
160fb2b2 18730msgstr "无法得到引用规格 %s 的获取列表"
8ada9598 18731
2b472aae 18732#: builtin/remote.c:453 builtin/remote.c:461
8ada9598 18733msgid "(matching)"
81809b99 18734msgstr "(匹配)"
8ada9598 18735
2b472aae 18736#: builtin/remote.c:465
8ada9598 18737msgid "(delete)"
81809b99 18738msgstr "(删除)"
8ada9598 18739
2b472aae
JX
18740#: builtin/remote.c:653
18741#, c-format
18742msgid "could not set '%s'"
18743msgstr "不能设置 '%s'"
18744
18745#: builtin/remote.c:658
18746#, c-format
18747msgid ""
18748"The %s configuration remote.pushDefault in:\n"
18749"\t%s:%d\n"
18750"now names the non-existent remote '%s'"
18751msgstr ""
18752"配置(%s)remote.pushDefault 位于:\n"
18753"\t%s:%d\n"
18754"现在在为不存在的远程名 '%s' 命名"
18755
18756#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
81809b99 18757#, c-format
4c27fcb5
JX
18758msgid "No such remote: '%s'"
18759msgstr "没有此远程仓库:'%s'"
8ada9598 18760
2b472aae 18761#: builtin/remote.c:706
81809b99 18762#, c-format
8ada9598 18763msgid "Could not rename config section '%s' to '%s'"
81809b99 18764msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 18765
2b472aae 18766#: builtin/remote.c:726
8ada9598
JX
18767#, c-format
18768msgid ""
d691f479 18769"Not updating non-default fetch refspec\n"
8ada9598
JX
18770"\t%s\n"
18771"\tPlease update the configuration manually if necessary."
18772msgstr ""
160fb2b2 18773"没有更新非默认的获取引用规格\n"
81809b99
JX
18774"\t%s\n"
18775"\t如果必要请手动更新配置。"
8ada9598 18776
2b472aae 18777#: builtin/remote.c:766
81809b99 18778#, c-format
8ada9598 18779msgid "deleting '%s' failed"
81809b99 18780msgstr "删除 '%s' 失败"
8ada9598 18781
2b472aae 18782#: builtin/remote.c:800
81809b99 18783#, c-format
8ada9598 18784msgid "creating '%s' failed"
81809b99 18785msgstr "创建 '%s' 失败"
8ada9598 18786
2b472aae 18787#: builtin/remote.c:876
8ada9598
JX
18788msgid ""
18789"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
18790"to delete it, use:"
18791msgid_plural ""
18792"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
18793"to delete them, use:"
5ae481e0
JX
18794msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
18795msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 18796
2b472aae 18797#: builtin/remote.c:890
276ceeaa
JX
18798#, c-format
18799msgid "Could not remove config section '%s'"
18800msgstr "不能移除配置小节 '%s'"
18801
2b472aae 18802#: builtin/remote.c:993
8ada9598
JX
18803#, c-format
18804msgid " new (next fetch will store in remotes/%s)"
81809b99 18805msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 18806
2b472aae 18807#: builtin/remote.c:996
8ada9598 18808msgid " tracked"
81809b99 18809msgstr " 已跟踪"
8ada9598 18810
2b472aae 18811#: builtin/remote.c:998
8ada9598 18812msgid " stale (use 'git remote prune' to remove)"
81809b99 18813msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 18814
2b472aae 18815#: builtin/remote.c:1000
8ada9598 18816msgid " ???"
81809b99 18817msgstr " ???"
8ada9598 18818
2b472aae 18819#: builtin/remote.c:1041
8ada9598
JX
18820#, c-format
18821msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 18822msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 18823
2b472aae 18824#: builtin/remote.c:1050
81809b99 18825#, c-format
276ceeaa
JX
18826msgid "rebases interactively onto remote %s"
18827msgstr "交互式变基到远程 %s"
8ada9598 18828
2b472aae 18829#: builtin/remote.c:1052
fd8cb379
JX
18830#, c-format
18831msgid "rebases interactively (with merges) onto remote %s"
18832msgstr "交互式变基(含合并提交)到远程 %s"
18833
2b472aae 18834#: builtin/remote.c:1055
5c57d762
JX
18835#, c-format
18836msgid "rebases onto remote %s"
18837msgstr "变基到远程 %s"
18838
2b472aae 18839#: builtin/remote.c:1059
81809b99 18840#, c-format
8ada9598 18841msgid " merges with remote %s"
81809b99 18842msgstr " 与远程 %s 合并"
8ada9598 18843
2b472aae 18844#: builtin/remote.c:1062
81809b99 18845#, c-format
8ada9598 18846msgid "merges with remote %s"
81809b99 18847msgstr "与远程 %s 合并"
8ada9598 18848
2b472aae 18849#: builtin/remote.c:1065
5c57d762
JX
18850#, c-format
18851msgid "%-*s and with remote %s\n"
18852msgstr "%-*s 以及和远程 %s\n"
8ada9598 18853
2b472aae 18854#: builtin/remote.c:1108
8ada9598 18855msgid "create"
81809b99 18856msgstr "创建"
8ada9598 18857
2b472aae 18858#: builtin/remote.c:1111
8ada9598 18859msgid "delete"
81809b99 18860msgstr "删除"
8ada9598 18861
2b472aae 18862#: builtin/remote.c:1115
8ada9598 18863msgid "up to date"
81809b99 18864msgstr "最新"
8ada9598 18865
2b472aae 18866#: builtin/remote.c:1118
8ada9598 18867msgid "fast-forwardable"
81809b99 18868msgstr "可快进"
8ada9598 18869
2b472aae 18870#: builtin/remote.c:1121
8ada9598 18871msgid "local out of date"
81809b99 18872msgstr "本地已过时"
8ada9598 18873
2b472aae 18874#: builtin/remote.c:1128
8ada9598
JX
18875#, c-format
18876msgid " %-*s forces to %-*s (%s)"
81809b99 18877msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 18878
2b472aae 18879#: builtin/remote.c:1131
8ada9598
JX
18880#, c-format
18881msgid " %-*s pushes to %-*s (%s)"
81809b99 18882msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 18883
2b472aae 18884#: builtin/remote.c:1135
8ada9598
JX
18885#, c-format
18886msgid " %-*s forces to %s"
81809b99 18887msgstr " %-*s 强制推送至 %s"
8ada9598 18888
2b472aae 18889#: builtin/remote.c:1138
8ada9598
JX
18890#, c-format
18891msgid " %-*s pushes to %s"
81809b99 18892msgstr " %-*s 推送至 %s"
8ada9598 18893
2b472aae 18894#: builtin/remote.c:1206
ef317cd5 18895msgid "do not query remotes"
07432cef 18896msgstr "不查询远程"
ef317cd5 18897
2b472aae 18898#: builtin/remote.c:1233
81809b99 18899#, c-format
8ada9598 18900msgid "* remote %s"
81809b99 18901msgstr "* 远程 %s"
8ada9598 18902
2b472aae 18903#: builtin/remote.c:1234
8ada9598
JX
18904#, c-format
18905msgid " Fetch URL: %s"
81809b99 18906msgstr " 获取地址:%s"
8ada9598 18907
2b472aae 18908#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
8ada9598 18909msgid "(no URL)"
81809b99 18910msgstr "(无 URL)"
8ada9598 18911
a4f16749
JX
18912#. TRANSLATORS: the colon ':' should align
18913#. with the one in " Fetch URL: %s"
18914#. translation.
18915#.
2b472aae 18916#: builtin/remote.c:1249 builtin/remote.c:1251
8ada9598
JX
18917#, c-format
18918msgid " Push URL: %s"
81809b99 18919msgstr " 推送地址:%s"
8ada9598 18920
2b472aae 18921#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
81809b99 18922#, c-format
8ada9598 18923msgid " HEAD branch: %s"
4375c10e 18924msgstr " HEAD 分支:%s"
8ada9598 18925
5c57d762 18926# 译者:中文字符串拼接,可删除前导空格
2b472aae 18927#: builtin/remote.c:1253
5c57d762
JX
18928msgid "(not queried)"
18929msgstr "(未查询)"
18930
2b472aae 18931#: builtin/remote.c:1255
5c57d762
JX
18932msgid "(unknown)"
18933msgstr "(未知)"
18934
2b472aae 18935#: builtin/remote.c:1259
8ada9598
JX
18936#, c-format
18937msgid ""
18938" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 18939msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 18940
2b472aae 18941#: builtin/remote.c:1271
81809b99 18942#, c-format
8ada9598
JX
18943msgid " Remote branch:%s"
18944msgid_plural " Remote branches:%s"
81809b99 18945msgstr[0] " 远程分支:%s"
5ae481e0 18946msgstr[1] " 远程分支:%s"
8ada9598 18947
81809b99 18948# 译者:中文字符串拼接,可删除前导空格
2b472aae 18949#: builtin/remote.c:1274 builtin/remote.c:1300
8ada9598 18950msgid " (status not queried)"
81809b99 18951msgstr "(状态未查询)"
8ada9598 18952
2b472aae 18953#: builtin/remote.c:1283
8ada9598
JX
18954msgid " Local branch configured for 'git pull':"
18955msgid_plural " Local branches configured for 'git pull':"
81809b99 18956msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 18957msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 18958
2b472aae 18959#: builtin/remote.c:1291
8ada9598 18960msgid " Local refs will be mirrored by 'git push'"
81809b99 18961msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 18962
2b472aae 18963#: builtin/remote.c:1297
81809b99 18964#, c-format
8ada9598
JX
18965msgid " Local ref configured for 'git push'%s:"
18966msgid_plural " Local refs configured for 'git push'%s:"
81809b99 18967msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 18968msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 18969
2b472aae 18970#: builtin/remote.c:1318
ef317cd5 18971msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 18972msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 18973
2b472aae 18974#: builtin/remote.c:1320
ef317cd5 18975msgid "delete refs/remotes/<name>/HEAD"
07432cef 18976msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 18977
2b472aae 18978#: builtin/remote.c:1335
8ada9598 18979msgid "Cannot determine remote HEAD"
81809b99 18980msgstr "无法确定远程 HEAD"
8ada9598 18981
2b472aae 18982#: builtin/remote.c:1337
8ada9598 18983msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 18984msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 18985
2b472aae 18986#: builtin/remote.c:1347
81809b99 18987#, c-format
8ada9598 18988msgid "Could not delete %s"
81809b99 18989msgstr "无法删除 %s"
8ada9598 18990
2b472aae 18991#: builtin/remote.c:1355
81809b99 18992#, c-format
8ada9598 18993msgid "Not a valid ref: %s"
81809b99 18994msgstr "不是一个有效引用:%s"
8ada9598 18995
2b472aae 18996#: builtin/remote.c:1357
81809b99 18997#, c-format
8ada9598 18998msgid "Could not setup %s"
81809b99 18999msgstr "不能设置 %s"
8ada9598
JX
19000
19001# 译者:注意保持前导空格
2b472aae 19002#: builtin/remote.c:1375
81809b99 19003#, c-format
8ada9598 19004msgid " %s will become dangling!"
e640d114 19005msgstr " %s 将成为悬空状态!"
8ada9598
JX
19006
19007# 译者:注意保持前导空格
2b472aae 19008#: builtin/remote.c:1376
81809b99 19009#, c-format
8ada9598 19010msgid " %s has become dangling!"
e640d114 19011msgstr " %s 已成为悬空状态!"
8ada9598 19012
2b472aae 19013#: builtin/remote.c:1386
81809b99 19014#, c-format
8ada9598 19015msgid "Pruning %s"
81809b99 19016msgstr "修剪 %s"
8ada9598 19017
2b472aae 19018#: builtin/remote.c:1387
8ada9598
JX
19019#, c-format
19020msgid "URL: %s"
81809b99 19021msgstr "URL:%s"
8ada9598 19022
2b472aae 19023#: builtin/remote.c:1403
8ada9598
JX
19024#, c-format
19025msgid " * [would prune] %s"
81809b99 19026msgstr " * [将删除] %s"
8ada9598 19027
2b472aae 19028#: builtin/remote.c:1406
8ada9598
JX
19029#, c-format
19030msgid " * [pruned] %s"
81809b99 19031msgstr " * [已删除] %s"
8ada9598 19032
2b472aae 19033#: builtin/remote.c:1451
ef317cd5 19034msgid "prune remotes after fetching"
07432cef 19035msgstr "抓取后清除远程"
ef317cd5 19036
2b472aae 19037#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
81809b99 19038#, c-format
8ada9598 19039msgid "No such remote '%s'"
81809b99 19040msgstr "没有此远程 '%s'"
8ada9598 19041
2b472aae 19042#: builtin/remote.c:1530
ef317cd5 19043msgid "add branch"
07432cef 19044msgstr "添加分支"
ef317cd5 19045
2b472aae 19046#: builtin/remote.c:1537
8ada9598 19047msgid "no remote specified"
81809b99 19048msgstr "未指定远程"
8ada9598 19049
2b472aae 19050#: builtin/remote.c:1554
94550ed3
JX
19051msgid "query push URLs rather than fetch URLs"
19052msgstr "查询推送 URL 地址,而非获取 URL 地址"
19053
2b472aae 19054#: builtin/remote.c:1556
94550ed3
JX
19055msgid "return all URLs"
19056msgstr "返回所有 URL 地址"
19057
2b472aae 19058#: builtin/remote.c:1584
94550ed3
JX
19059#, c-format
19060msgid "no URLs configured for remote '%s'"
19061msgstr "没有给远程仓库 '%s' 设定 URL"
19062
2b472aae 19063#: builtin/remote.c:1610
ef317cd5 19064msgid "manipulate push URLs"
07432cef 19065msgstr "操作推送 URLS"
ef317cd5 19066
2b472aae 19067#: builtin/remote.c:1612
ef317cd5 19068msgid "add URL"
07432cef 19069msgstr "添加 URL"
ef317cd5 19070
2b472aae 19071#: builtin/remote.c:1614
ef317cd5 19072msgid "delete URLs"
07432cef 19073msgstr "删除 URLS"
ef317cd5 19074
2b472aae 19075#: builtin/remote.c:1621
8ada9598 19076msgid "--add --delete doesn't make sense"
81809b99 19077msgstr "--add --delete 无意义"
8ada9598 19078
2b472aae 19079#: builtin/remote.c:1660
81809b99 19080#, c-format
8ada9598 19081msgid "Invalid old URL pattern: %s"
4375c10e 19082msgstr "无效的旧 URL 匹配模版:%s"
8ada9598 19083
2b472aae 19084#: builtin/remote.c:1668
81809b99 19085#, c-format
8ada9598 19086msgid "No such URL found: %s"
4375c10e 19087msgstr "未找到此 URL:%s"
8ada9598 19088
2b472aae 19089#: builtin/remote.c:1670
8ada9598 19090msgid "Will not delete all non-push URLs"
4375c10e 19091msgstr "将不会删除所有非推送 URL 地址"
8ada9598 19092
a5cd71ca 19093#: builtin/repack.c:23
814ff314
JX
19094msgid "git repack [<options>]"
19095msgstr "git repack [<选项>]"
90314792 19096
a5cd71ca 19097#: builtin/repack.c:28
1a79b2f1
JX
19098msgid ""
19099"Incremental repacks are incompatible with bitmap indexes. Use\n"
19100"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
19101msgstr ""
19102"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
19103"或禁用 pack.writebitmaps 配置。"
19104
a5cd71ca 19105#: builtin/repack.c:191
06991777 19106msgid "could not start pack-objects to repack promisor objects"
5b533632 19107msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
06991777 19108
ddc12c42 19109#: builtin/repack.c:230 builtin/repack.c:416
06991777 19110msgid "repack: Expecting full hex object ID lines only from pack-objects."
5b533632 19111msgstr "repack:期望来自 pack-objects 的完整十六进制对象 ID。"
06991777 19112
ddc12c42 19113#: builtin/repack.c:254
06991777 19114msgid "could not finish pack-objects to repack promisor objects"
5b533632 19115msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
06991777 19116
ddc12c42 19117#: builtin/repack.c:292
90314792
JX
19118msgid "pack everything in a single pack"
19119msgstr "所有内容打包到一个包文件中"
19120
ddc12c42 19121#: builtin/repack.c:294
90314792
JX
19122msgid "same as -a, and turn unreachable objects loose"
19123msgstr "和 -a 相同,并将不可达的对象设为松散对象"
19124
ddc12c42 19125#: builtin/repack.c:297
90314792
JX
19126msgid "remove redundant packs, and run git-prune-packed"
19127msgstr "删除多余的包,运行 git-prune-packed"
19128
ddc12c42 19129#: builtin/repack.c:299
90314792
JX
19130msgid "pass --no-reuse-delta to git-pack-objects"
19131msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
19132
ddc12c42 19133#: builtin/repack.c:301
90314792
JX
19134msgid "pass --no-reuse-object to git-pack-objects"
19135msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
19136
ddc12c42 19137#: builtin/repack.c:303
90314792
JX
19138msgid "do not run git-update-server-info"
19139msgstr "不运行 git-update-server-info"
19140
ddc12c42 19141#: builtin/repack.c:306
90314792
JX
19142msgid "pass --local to git-pack-objects"
19143msgstr "向 git-pack-objects 传递参数 --local"
19144
ddc12c42 19145#: builtin/repack.c:308
6c94aba5
JX
19146msgid "write bitmap index"
19147msgstr "写 bitmap 索引"
19148
ddc12c42 19149#: builtin/repack.c:310
4c27fcb5
JX
19150msgid "pass --delta-islands to git-pack-objects"
19151msgstr "向 git-pack-objects 传递参数 --delta-islands"
19152
ddc12c42 19153#: builtin/repack.c:311
90314792
JX
19154msgid "approxidate"
19155msgstr "近似日期"
19156
ddc12c42 19157#: builtin/repack.c:312
90314792
JX
19158msgid "with -A, do not loosen objects older than this"
19159msgstr "使用 -A,不要将早于给定时间的对象过期"
19160
ddc12c42 19161#: builtin/repack.c:314
5c57d762
JX
19162msgid "with -a, repack unreachable objects"
19163msgstr "使用 -a ,重新对不可达对象打包"
19164
ddc12c42 19165#: builtin/repack.c:316
90314792
JX
19166msgid "size of the window used for delta compression"
19167msgstr "用于增量压缩的窗口值"
19168
ddc12c42 19169#: builtin/repack.c:317 builtin/repack.c:323
8376b58d
JX
19170msgid "bytes"
19171msgstr "字节"
19172
ddc12c42 19173#: builtin/repack.c:318
90314792
JX
19174msgid "same as the above, but limit memory size instead of entries count"
19175msgstr "和上面的相似,但限制内存大小而非条目数"
19176
ddc12c42 19177#: builtin/repack.c:320
90314792
JX
19178msgid "limits the maximum delta depth"
19179msgstr "限制最大增量深度"
19180
ddc12c42 19181#: builtin/repack.c:322
a4f16749
JX
19182msgid "limits the maximum number of threads"
19183msgstr "限制最大线程数"
19184
ddc12c42 19185#: builtin/repack.c:324
90314792 19186msgid "maximum size of each packfile"
dbd6cced 19187msgstr "每个包文件的最大尺寸"
90314792 19188
ddc12c42 19189#: builtin/repack.c:326
6c94aba5
JX
19190msgid "repack objects in packs marked with .keep"
19191msgstr "对标记为 .keep 的包中的对象重新打包"
19192
ddc12c42 19193#: builtin/repack.c:328
fd8cb379
JX
19194msgid "do not repack this pack"
19195msgstr "不要对该包文件重新打包"
19196
ddc12c42 19197#: builtin/repack.c:338
94550ed3
JX
19198msgid "cannot delete packs in a precious-objects repo"
19199msgstr "不能删除珍品仓库中的打包文件"
19200
ddc12c42 19201#: builtin/repack.c:342
5c57d762
JX
19202msgid "--keep-unreachable and -A are incompatible"
19203msgstr "--keep-unreachable 和 -A 不兼容"
19204
ddc12c42 19205#: builtin/repack.c:425
06991777
JX
19206msgid "Nothing new to pack."
19207msgstr "没有新的要打包。"
19208
ddc12c42 19209#: builtin/repack.c:486
06991777
JX
19210#, c-format
19211msgid ""
19212"WARNING: Some packs in use have been renamed by\n"
19213"WARNING: prefixing old- to their name, in order to\n"
19214"WARNING: replace them with the new version of the\n"
19215"WARNING: file. But the operation failed, and the\n"
19216"WARNING: attempt to rename them back to their\n"
19217"WARNING: original names also failed.\n"
19218"WARNING: Please rename them in %s manually:\n"
19219msgstr ""
19220"警告:为了将包文件替换为新版本,一些使用中的包已经\n"
19221"警告:通过添加 old- 前缀的方式重命名。但是操作失败,\n"
19222"警告:并且尝试重命名改回原有文件名的操作也失败。\n"
19223"警告:请手动将 %s 下的这些文件重命名:\n"
19224
ddc12c42 19225#: builtin/repack.c:534
90314792 19226#, c-format
5c57d762 19227msgid "failed to remove '%s'"
c1ac5258 19228msgstr "删除 '%s' 失败"
90314792 19229
fd8cb379 19230#: builtin/replace.c:22
ef317cd5 19231msgid "git replace [-f] <object> <replacement>"
07432cef 19232msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 19233
fd8cb379 19234#: builtin/replace.c:23
6acbf033
JX
19235msgid "git replace [-f] --edit <object>"
19236msgstr "git replace [-f] --edit <对象>"
19237
fd8cb379 19238#: builtin/replace.c:24
6acbf033
JX
19239msgid "git replace [-f] --graft <commit> [<parent>...]"
19240msgstr "git replace [-f] --graft <提交> [<父提交>...]"
19241
fd8cb379
JX
19242#: builtin/replace.c:25
19243msgid "git replace [-f] --convert-graft-file"
19244msgstr "git replace [-f] --convert-graft-file"
19245
19246#: builtin/replace.c:26
ef317cd5 19247msgid "git replace -d <object>..."
07432cef 19248msgstr "git replace -d <对象>..."
ef317cd5 19249
fd8cb379 19250#: builtin/replace.c:27
cfff71a9
JX
19251msgid "git replace [--format=<format>] [-l [<pattern>]]"
19252msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 19253
d46c5519 19254#: builtin/replace.c:90
c1ac5258
JX
19255#, c-format
19256msgid ""
19257"invalid replace format '%s'\n"
19258"valid formats are 'short', 'medium' and 'long'"
19259msgstr ""
19260"无效的替换格式 '%s'\n"
19261"有效的格式有 'short'、'medium' 和 'long'"
19262
d46c5519 19263#: builtin/replace.c:125
c1ac5258
JX
19264#, c-format
19265msgid "replace ref '%s' not found"
19266msgstr "未发现替换引用 '%s'"
19267
d46c5519 19268#: builtin/replace.c:141
c1ac5258
JX
19269#, c-format
19270msgid "Deleted replace ref '%s'"
e640d114 19271msgstr "已删除替换引用 '%s'"
c1ac5258 19272
d46c5519 19273#: builtin/replace.c:153
c1ac5258
JX
19274#, c-format
19275msgid "'%s' is not a valid ref name"
19276msgstr "'%s' 不是一个有效的引用名"
19277
d46c5519 19278#: builtin/replace.c:158
c1ac5258
JX
19279#, c-format
19280msgid "replace ref '%s' already exists"
19281msgstr "替换引用 '%s' 已经存在"
19282
d46c5519 19283#: builtin/replace.c:178
c1ac5258
JX
19284#, c-format
19285msgid ""
19286"Objects must be of the same type.\n"
19287"'%s' points to a replaced object of type '%s'\n"
19288"while '%s' points to a replacement object of type '%s'."
19289msgstr ""
19290"对象必须属于同一类型。\n"
19291"'%s' 指向 '%s' 类型的替换对象\n"
19292"而 '%s' 指向 '%s' 类型的替换对象。"
19293
d46c5519 19294#: builtin/replace.c:229
c1ac5258
JX
19295#, c-format
19296msgid "unable to open %s for writing"
19297msgstr "无法为写入打开 %s"
19298
d46c5519 19299#: builtin/replace.c:242
c1ac5258
JX
19300msgid "cat-file reported failure"
19301msgstr "cat-file 报告失败"
19302
d46c5519 19303#: builtin/replace.c:258
c1ac5258
JX
19304#, c-format
19305msgid "unable to open %s for reading"
19306msgstr "无法为读取打开 %s"
19307
d46c5519 19308#: builtin/replace.c:272
c1ac5258
JX
19309msgid "unable to spawn mktree"
19310msgstr "无法启动 mktree"
19311
d46c5519 19312#: builtin/replace.c:276
c1ac5258
JX
19313msgid "unable to read from mktree"
19314msgstr "无法从 mktree 读取"
19315
d46c5519 19316#: builtin/replace.c:285
c1ac5258
JX
19317msgid "mktree reported failure"
19318msgstr "mktree 报告失败"
19319
d46c5519 19320#: builtin/replace.c:289
c1ac5258
JX
19321msgid "mktree did not return an object name"
19322msgstr "mktree 没有返回一个对象名"
19323
d46c5519 19324#: builtin/replace.c:298
c1ac5258
JX
19325#, c-format
19326msgid "unable to fstat %s"
19327msgstr "无法对 %s 执行 fstat"
19328
d46c5519 19329#: builtin/replace.c:303
c1ac5258
JX
19330msgid "unable to write object to database"
19331msgstr "无法向数据库写入对象"
19332
2b472aae
JX
19333#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
19334#: builtin/replace.c:454
c1ac5258
JX
19335#, c-format
19336msgid "not a valid object name: '%s'"
6acbf033
JX
19337msgstr "不是一个有效的对象名:'%s'"
19338
d46c5519 19339#: builtin/replace.c:326
c1ac5258
JX
19340#, c-format
19341msgid "unable to get object type for %s"
19342msgstr "无法得到 %s 的对象类型"
19343
d46c5519 19344#: builtin/replace.c:342
c1ac5258
JX
19345msgid "editing object file failed"
19346msgstr "编辑对象文件失败"
19347
d46c5519 19348#: builtin/replace.c:351
c1ac5258
JX
19349#, c-format
19350msgid "new object is the same as the old one: '%s'"
19351msgstr "新对象和旧对象相同:'%s'"
19352
a5cd71ca 19353#: builtin/replace.c:384
d46c5519
JX
19354#, c-format
19355msgid "could not parse %s as a commit"
19356msgstr "无法将 %s 解析为一个提交"
19357
2b472aae 19358#: builtin/replace.c:416
6acbf033
JX
19359#, c-format
19360msgid "bad mergetag in commit '%s'"
55a16ee4 19361msgstr "提交 '%s' 中含有损坏的合并标签"
6acbf033 19362
2b472aae 19363#: builtin/replace.c:418
6acbf033
JX
19364#, c-format
19365msgid "malformed mergetag in commit '%s'"
fd8cb379 19366msgstr "提交 '%s' 中含有格式错误的合并标签"
6acbf033 19367
2b472aae 19368#: builtin/replace.c:430
6acbf033
JX
19369#, c-format
19370msgid ""
19371"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
19372"instead of --graft"
55a16ee4 19373msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
6acbf033 19374
2b472aae 19375#: builtin/replace.c:469
6acbf033 19376#, c-format
c1ac5258
JX
19377msgid "the original commit '%s' has a gpg signature"
19378msgstr "原始提交 '%s' 中有一个 gpg 签名"
6acbf033 19379
2b472aae 19380#: builtin/replace.c:470
6acbf033
JX
19381msgid "the signature will be removed in the replacement commit!"
19382msgstr "在替换的提交中签名将被移除!"
19383
2b472aae 19384#: builtin/replace.c:480
6acbf033
JX
19385#, c-format
19386msgid "could not write replacement commit for: '%s'"
19387msgstr "不能为 '%s' 写替换提交"
19388
2b472aae 19389#: builtin/replace.c:488
c1ac5258
JX
19390#, c-format
19391msgid "graft for '%s' unnecessary"
19392msgstr "对 '%s' 移植没有必要"
19393
2b472aae 19394#: builtin/replace.c:492
c1ac5258
JX
19395#, c-format
19396msgid "new commit is the same as the old one: '%s'"
19397msgstr "新提交和旧的一样:'%s'"
19398
2b472aae 19399#: builtin/replace.c:527
fd8cb379
JX
19400#, c-format
19401msgid ""
19402"could not convert the following graft(s):\n"
19403"%s"
19404msgstr ""
19405"不能转换下列移植:\n"
19406"%s"
19407
2b472aae 19408#: builtin/replace.c:548
ef317cd5 19409msgid "list replace refs"
07432cef 19410msgstr "列出替换的引用"
ef317cd5 19411
2b472aae 19412#: builtin/replace.c:549
ef317cd5 19413msgid "delete replace refs"
07432cef 19414msgstr "删除替换的引用"
ef317cd5 19415
2b472aae 19416#: builtin/replace.c:550
6acbf033
JX
19417msgid "edit existing object"
19418msgstr "编辑现存的对象"
19419
2b472aae 19420#: builtin/replace.c:551
6acbf033
JX
19421msgid "change a commit's parents"
19422msgstr "修改一个提交的父提交"
19423
2b472aae 19424#: builtin/replace.c:552
fd8cb379
JX
19425msgid "convert existing graft file"
19426msgstr "转换现存的移植文件"
19427
2b472aae 19428#: builtin/replace.c:553
ef317cd5 19429msgid "replace the ref if it exists"
07432cef 19430msgstr "如果存在则替换引用"
ef317cd5 19431
2b472aae 19432#: builtin/replace.c:555
6acbf033
JX
19433msgid "do not pretty-print contents for --edit"
19434msgstr "不要为 --edit 操作美观显示内容"
19435
2b472aae 19436#: builtin/replace.c:556
cfff71a9
JX
19437msgid "use this format"
19438msgstr "使用此格式"
19439
2b472aae 19440#: builtin/replace.c:569
c1ac5258 19441msgid "--format cannot be used when not listing"
e640d114 19442msgstr "不列出时不能使用 --format"
c1ac5258 19443
2b472aae 19444#: builtin/replace.c:577
c1ac5258
JX
19445msgid "-f only makes sense when writing a replacement"
19446msgstr "只有写一个替换时 -f 才有意义"
19447
2b472aae 19448#: builtin/replace.c:581
c1ac5258
JX
19449msgid "--raw only makes sense with --edit"
19450msgstr "--raw 只有和 --edit 共用才有意义"
19451
2b472aae 19452#: builtin/replace.c:587
c1ac5258
JX
19453msgid "-d needs at least one argument"
19454msgstr "-d 需要至少一个参数"
19455
2b472aae 19456#: builtin/replace.c:593
c1ac5258
JX
19457msgid "bad number of arguments"
19458msgstr "错误的参数个数"
19459
2b472aae 19460#: builtin/replace.c:599
c1ac5258 19461msgid "-e needs exactly one argument"
e640d114 19462msgstr "-e 需要且仅需要一个参数"
c1ac5258 19463
2b472aae 19464#: builtin/replace.c:605
c1ac5258
JX
19465msgid "-g needs at least one argument"
19466msgstr "-g 需要至少一个参数"
19467
2b472aae 19468#: builtin/replace.c:611
c1ac5258
JX
19469msgid "--convert-graft-file takes no argument"
19470msgstr "--convert-graft-file 不带参数"
19471
2b472aae 19472#: builtin/replace.c:617
c1ac5258
JX
19473msgid "only one pattern can be given with -l"
19474msgstr "只能为 -l 提供一个模式"
19475
a4f16749 19476#: builtin/rerere.c:13
814ff314
JX
19477msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
19478msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
ef317cd5 19479
4c27fcb5 19480#: builtin/rerere.c:60
ef317cd5 19481msgid "register clean resolutions in index"
07432cef 19482msgstr "在索引中注册干净的解决方案"
ef317cd5 19483
4c27fcb5
JX
19484#: builtin/rerere.c:79
19485msgid "'git rerere forget' without paths is deprecated"
19486msgstr "没有路径的 'git rerere forget' 已经过时"
19487
06991777 19488#: builtin/rerere.c:113
4c27fcb5
JX
19489#, c-format
19490msgid "unable to generate diff for '%s'"
19491msgstr "无法为 '%s' 生成差异"
19492
06991777 19493#: builtin/reset.c:32
ef317cd5
JX
19494msgid ""
19495"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 19496msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5 19497
06991777 19498#: builtin/reset.c:33
ddc12c42
JX
19499msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
19500msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..."
ef317cd5 19501
06991777 19502#: builtin/reset.c:34
ddc12c42
JX
19503msgid ""
19504"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
2b472aae 19505msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]"
ef317cd5 19506
ddc12c42
JX
19507#: builtin/reset.c:35
19508msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
19509msgstr "git reset --patch [<树对象>] [--] [<路径表达式>...]"
19510
19511#: builtin/reset.c:41
c04f5ac3
JX
19512msgid "mixed"
19513msgstr "混杂"
19514
ddc12c42 19515#: builtin/reset.c:41
c04f5ac3
JX
19516msgid "soft"
19517msgstr "软性"
19518
ddc12c42 19519#: builtin/reset.c:41
c04f5ac3
JX
19520msgid "hard"
19521msgstr "硬性"
19522
ddc12c42 19523#: builtin/reset.c:41
8ada9598
JX
19524msgid "merge"
19525msgstr "合并"
19526
ddc12c42 19527#: builtin/reset.c:41
c04f5ac3
JX
19528msgid "keep"
19529msgstr "保持"
19530
ddc12c42 19531#: builtin/reset.c:82
c04f5ac3
JX
19532msgid "You do not have a valid HEAD."
19533msgstr "您没有一个有效的 HEAD。"
19534
ddc12c42 19535#: builtin/reset.c:84
c04f5ac3
JX
19536msgid "Failed to find tree of HEAD."
19537msgstr "无法找到 HEAD 指向的树。"
19538
ddc12c42 19539#: builtin/reset.c:90
c04f5ac3
JX
19540#, c-format
19541msgid "Failed to find tree of %s."
19542msgstr "无法找到 %s 指向的树。"
19543
ddc12c42 19544#: builtin/reset.c:115
a5cd71ca
JX
19545#, c-format
19546msgid "HEAD is now at %s"
19547msgstr "HEAD 现在位于 %s"
19548
90e6ef53 19549# 译者:汉字之间无空格,故删除%s前后空格
ddc12c42 19550#: builtin/reset.c:194
c04f5ac3
JX
19551#, c-format
19552msgid "Cannot do a %s reset in the middle of a merge."
19553msgstr "在合并过程中不能做%s重置操作。"
19554
2b472aae
JX
19555#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
19556#: builtin/stash.c:619
ef317cd5 19557msgid "be quiet, only report errors"
07432cef 19558msgstr "安静模式,只报告错误"
ef317cd5 19559
ddc12c42 19560#: builtin/reset.c:296
ef317cd5 19561msgid "reset HEAD and index"
07432cef 19562msgstr "重置 HEAD 和索引"
ef317cd5 19563
ddc12c42 19564#: builtin/reset.c:297
ef317cd5 19565msgid "reset only HEAD"
07432cef 19566msgstr "只重置 HEAD"
ef317cd5 19567
ddc12c42 19568#: builtin/reset.c:299 builtin/reset.c:301
ef317cd5 19569msgid "reset HEAD, index and working tree"
07432cef 19570msgstr "重置 HEAD、索引和工作区"
ef317cd5 19571
ddc12c42 19572#: builtin/reset.c:303
ef317cd5 19573msgid "reset HEAD but keep local changes"
07432cef 19574msgstr "重置 HEAD 但保存本地变更"
ef317cd5 19575
ddc12c42 19576#: builtin/reset.c:309
6c94aba5
JX
19577msgid "record only the fact that removed paths will be added later"
19578msgstr "将删除的路径标记为稍后添加"
19579
ddc12c42 19580#: builtin/reset.c:343
07432cef
WS
19581#, c-format
19582msgid "Failed to resolve '%s' as a valid revision."
19583msgstr "无法将 '%s' 解析为一个有效的版本。"
19584
ddc12c42 19585#: builtin/reset.c:351
07432cef
WS
19586#, c-format
19587msgid "Failed to resolve '%s' as a valid tree."
19588msgstr "无法将 '%s' 解析为一个有效的树对象。"
19589
ddc12c42 19590#: builtin/reset.c:360
c04f5ac3 19591msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 19592msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 19593
ddc12c42 19594#: builtin/reset.c:370
c04f5ac3 19595msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
d9d56b23 19596msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
c04f5ac3 19597
90e6ef53 19598# 译者:汉字之间无空格,故删除%s前后空格
ddc12c42 19599#: builtin/reset.c:372
c04f5ac3
JX
19600#, c-format
19601msgid "Cannot do %s reset with paths."
19602msgstr "不能带路径进行%s重置。"
19603
90e6ef53 19604# 译者:汉字之间无空格,故删除%s前后空格
ddc12c42 19605#: builtin/reset.c:387
c04f5ac3
JX
19606#, c-format
19607msgid "%s reset is not allowed in a bare repository"
160fb2b2 19608msgstr "不能对纯仓库进行%s重置"
c04f5ac3 19609
ddc12c42 19610#: builtin/reset.c:391
6c94aba5
JX
19611msgid "-N can only be used with --mixed"
19612msgstr "-N 只能和 --mixed 同时使用"
19613
ddc12c42 19614#: builtin/reset.c:412
90314792 19615msgid "Unstaged changes after reset:"
160fb2b2 19616msgstr "重置后取消暂存的变更:"
90314792 19617
ddc12c42 19618#: builtin/reset.c:415
4c27fcb5
JX
19619#, c-format
19620msgid ""
19621"\n"
19622"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
19623"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
19624"to make this the default.\n"
19625msgstr ""
19626"\n"
19627"重置后,枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n"
19628"将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n"
19629
ddc12c42 19630#: builtin/reset.c:425
ef317cd5
JX
19631#, c-format
19632msgid "Could not reset index file to revision '%s'."
19633msgstr "不能重置索引文件至版本 '%s'。"
19634
ddc12c42 19635#: builtin/reset.c:429
07432cef
WS
19636msgid "Could not write new index file."
19637msgstr "不能写入新的索引文件。"
19638
2b472aae 19639#: builtin/rev-list.c:499
31e5e17b
JX
19640msgid "cannot combine --exclude-promisor-objects and --missing"
19641msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
19642
2b472aae 19643#: builtin/rev-list.c:560
5809aa05
JX
19644msgid "object filtering requires --objects"
19645msgstr "对象过滤需要 --objects"
19646
2b472aae 19647#: builtin/rev-list.c:610
1b7f4a34
JX
19648msgid "rev-list does not support display of notes"
19649msgstr "rev-list 不支持显示注解"
19650
2b472aae
JX
19651#: builtin/rev-list.c:615
19652msgid "marked counting is incompatible with --objects"
19653msgstr "标记计数和 --objects 不兼容"
5809aa05 19654
06991777 19655#: builtin/rev-parse.c:408
814ff314
JX
19656msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
19657msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
ef317cd5 19658
06991777 19659#: builtin/rev-parse.c:413
ef317cd5 19660msgid "keep the `--` passed as an arg"
07432cef 19661msgstr "保持 `--` 作为一个参数传递"
ef317cd5 19662
06991777 19663#: builtin/rev-parse.c:415
ef317cd5 19664msgid "stop parsing after the first non-option argument"
07432cef 19665msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 19666
06991777 19667#: builtin/rev-parse.c:418
cfff71a9
JX
19668msgid "output in stuck long form"
19669msgstr "以固定长格式输出"
19670
06991777 19671#: builtin/rev-parse.c:551
ef317cd5 19672msgid ""
814ff314 19673"git rev-parse --parseopt [<options>] -- [<args>...]\n"
ef317cd5 19674" or: git rev-parse --sq-quote [<arg>...]\n"
814ff314 19675" or: git rev-parse [<options>] [<arg>...]\n"
ef317cd5
JX
19676"\n"
19677"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
19678msgstr ""
814ff314 19679"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
90314792 19680" 或者:git rev-parse --sq-quote [<参数>...]\n"
814ff314 19681" 或者:git rev-parse [<选项>] [<参数>...]\n"
07432cef
WS
19682"\n"
19683"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5 19684
c1ac5258 19685#: builtin/revert.c:24
814ff314
JX
19686msgid "git revert [<options>] <commit-ish>..."
19687msgstr "git revert [<选项>] <提交号>..."
ef317cd5 19688
c1ac5258 19689#: builtin/revert.c:25
ef317cd5 19690msgid "git revert <subcommand>"
07432cef 19691msgstr "git revert <子命令>"
ef317cd5 19692
c1ac5258 19693#: builtin/revert.c:30
814ff314
JX
19694msgid "git cherry-pick [<options>] <commit-ish>..."
19695msgstr "git cherry-pick [<选项>] <提交号>..."
ef317cd5 19696
c1ac5258 19697#: builtin/revert.c:31
ef317cd5 19698msgid "git cherry-pick <subcommand>"
07432cef 19699msgstr "git cherry-pick <子命令>"
ef317cd5 19700
06991777
JX
19701#: builtin/revert.c:72
19702#, c-format
19703msgid "option `%s' expects a number greater than zero"
19704msgstr "选项 `%s' 期望一个大于零的数字"
19705
19706#: builtin/revert.c:92
ef317cd5
JX
19707#, c-format
19708msgid "%s: %s cannot be used with %s"
19709msgstr "%s:%s 不能和 %s 同时使用"
19710
d46c5519 19711#: builtin/revert.c:102
ef317cd5 19712msgid "end revert or cherry-pick sequence"
07432cef 19713msgstr "终止反转或拣选操作"
ef317cd5 19714
d46c5519 19715#: builtin/revert.c:103
ef317cd5 19716msgid "resume revert or cherry-pick sequence"
07432cef 19717msgstr "继续反转或拣选操作"
ef317cd5 19718
d46c5519 19719#: builtin/revert.c:104
ef317cd5 19720msgid "cancel revert or cherry-pick sequence"
07432cef 19721msgstr "取消反转或拣选操作"
ef317cd5 19722
a6cd2cc4
JX
19723#: builtin/revert.c:105
19724msgid "skip current commit and continue"
19725msgstr "跳过当前提交并继续"
19726
19727#: builtin/revert.c:107
ef317cd5 19728msgid "don't automatically commit"
07432cef 19729msgstr "不要自动提交"
ef317cd5 19730
a6cd2cc4 19731#: builtin/revert.c:108
ef317cd5 19732msgid "edit the commit message"
07432cef 19733msgstr "编辑提交说明"
ef317cd5 19734
a6cd2cc4 19735#: builtin/revert.c:111
87cb7997 19736msgid "parent-number"
07432cef 19737msgstr "父编号"
ef317cd5 19738
a6cd2cc4 19739#: builtin/revert.c:112
87cb7997
JX
19740msgid "select mainline parent"
19741msgstr "选择主干父提交编号"
19742
a6cd2cc4 19743#: builtin/revert.c:114
ef317cd5 19744msgid "merge strategy"
07432cef 19745msgstr "合并策略"
ef317cd5 19746
a6cd2cc4 19747#: builtin/revert.c:116
ef317cd5 19748msgid "option for merge strategy"
07432cef 19749msgstr "合并策略的选项"
ef317cd5 19750
a6cd2cc4 19751#: builtin/revert.c:125
ef317cd5 19752msgid "append commit name"
07432cef 19753msgstr "追加提交名称"
ef317cd5 19754
a6cd2cc4 19755#: builtin/revert.c:127
ef317cd5 19756msgid "preserve initially empty commits"
07432cef 19757msgstr "保留初始化的空提交"
ef317cd5 19758
a6cd2cc4 19759#: builtin/revert.c:129
ef317cd5 19760msgid "keep redundant, empty commits"
07432cef 19761msgstr "保持多余的、空的提交"
ef317cd5 19762
a6cd2cc4 19763#: builtin/revert.c:232
c04f5ac3
JX
19764msgid "revert failed"
19765msgstr "还原失败"
19766
a6cd2cc4 19767#: builtin/revert.c:245
c04f5ac3
JX
19768msgid "cherry-pick failed"
19769msgstr "拣选失败"
19770
06991777 19771#: builtin/rm.c:19
814ff314
JX
19772msgid "git rm [<options>] [--] <file>..."
19773msgstr "git rm [<选项>] [--] <文件>..."
07432cef 19774
06991777 19775#: builtin/rm.c:207
c04f5ac3 19776msgid ""
2e8451e8
JX
19777"the following file has staged content different from both the\n"
19778"file and the HEAD:"
19779msgid_plural ""
19780"the following files have staged content different from both the\n"
19781"file and the HEAD:"
19782msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
19783msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
19784
06991777 19785#: builtin/rm.c:212
2e8451e8
JX
19786msgid ""
19787"\n"
c04f5ac3
JX
19788"(use -f to force removal)"
19789msgstr ""
2e8451e8 19790"\n"
c04f5ac3
JX
19791"(使用 -f 强制删除)"
19792
06991777 19793#: builtin/rm.c:216
2e8451e8
JX
19794msgid "the following file has changes staged in the index:"
19795msgid_plural "the following files have changes staged in the index:"
160fb2b2
JX
19796msgstr[0] "下列文件索引中有变更"
19797msgstr[1] "下列文件索引中有变更"
c04f5ac3 19798
06991777 19799#: builtin/rm.c:220 builtin/rm.c:229
c04f5ac3 19800msgid ""
2e8451e8 19801"\n"
c04f5ac3
JX
19802"(use --cached to keep the file, or -f to force removal)"
19803msgstr ""
2e8451e8
JX
19804"\n"
19805"(使用 --cached 保留本地文件,或用 -f 强制删除)"
19806
06991777 19807#: builtin/rm.c:226
2e8451e8
JX
19808msgid "the following file has local modifications:"
19809msgid_plural "the following files have local modifications:"
19810msgstr[0] "如下文件有本地修改:"
19811msgstr[1] "如下文件有本地修改:"
c04f5ac3 19812
2b472aae 19813#: builtin/rm.c:243
ef317cd5 19814msgid "do not list removed files"
07432cef 19815msgstr "不列出删除的文件"
ef317cd5 19816
2b472aae 19817#: builtin/rm.c:244
ef317cd5 19818msgid "only remove from the index"
07432cef 19819msgstr "只从索引区删除"
ef317cd5 19820
2b472aae 19821#: builtin/rm.c:245
ef317cd5 19822msgid "override the up-to-date check"
07432cef 19823msgstr "忽略文件更新状态检查"
ef317cd5 19824
2b472aae 19825#: builtin/rm.c:246
ef317cd5 19826msgid "allow recursive removal"
07432cef 19827msgstr "允许递归删除"
ef317cd5 19828
2b472aae 19829#: builtin/rm.c:248
ef317cd5 19830msgid "exit with a zero status even if nothing matched"
07432cef 19831msgstr "即使没有匹配,也以零状态退出"
ef317cd5 19832
2b472aae
JX
19833#: builtin/rm.c:282
19834msgid "No pathspec was given. Which files should I remove?"
440e7442 19835msgstr "没有提供路径规格。我应该删除哪些文件?"
2b472aae
JX
19836
19837#: builtin/rm.c:305
c1ac5258
JX
19838msgid "please stage your changes to .gitmodules or stash them to proceed"
19839msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
19840
2b472aae 19841#: builtin/rm.c:323
c04f5ac3
JX
19842#, c-format
19843msgid "not removing '%s' recursively without -r"
19844msgstr "未提供 -r 选项不会递归删除 '%s'"
19845
2b472aae 19846#: builtin/rm.c:362
c04f5ac3
JX
19847#, c-format
19848msgid "git rm: unable to remove %s"
19849msgstr "git rm:不能删除 %s"
19850
fd8cb379 19851#: builtin/send-pack.c:20
1b7f4a34
JX
19852msgid ""
19853"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
19854"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
19855"[<ref>...]\n"
19856" --all and explicit <ref> specification are mutually exclusive."
19857msgstr ""
19858"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
19859"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
19860" --all 和明确的 <引用> 互斥。"
19861
fd8cb379 19862#: builtin/send-pack.c:163
1b7f4a34
JX
19863msgid "remote name"
19864msgstr "远程名称"
19865
fd8cb379 19866#: builtin/send-pack.c:177
1b7f4a34
JX
19867msgid "use stateless RPC protocol"
19868msgstr "使用无状态的 RPC 协议"
19869
fd8cb379 19870#: builtin/send-pack.c:178
1b7f4a34
JX
19871msgid "read refs from stdin"
19872msgstr "从标准输入读取引用"
19873
fd8cb379 19874#: builtin/send-pack.c:179
1b7f4a34
JX
19875msgid "print status from remote helper"
19876msgstr "打印来自远程 helper 的状态"
19877
a4f16749 19878#: builtin/shortlog.c:14
fd8cb379
JX
19879msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
19880msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
19881
19882#: builtin/shortlog.c:15
19883msgid "git log --pretty=short | git shortlog [<options>]"
19884msgstr "git log --pretty=short | git shortlog [<选项>]"
ef317cd5 19885
fd8cb379 19886#: builtin/shortlog.c:264
1a79b2f1
JX
19887msgid "Group by committer rather than author"
19888msgstr "按照提交者分组而不是作者"
19889
fd8cb379 19890#: builtin/shortlog.c:266
ef317cd5 19891msgid "sort output according to the number of commits per author"
07432cef 19892msgstr "根据每个作者的提交数量排序"
ef317cd5 19893
fd8cb379 19894#: builtin/shortlog.c:268
ef317cd5 19895msgid "Suppress commit descriptions, only provides commit count"
07432cef 19896msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 19897
fd8cb379 19898#: builtin/shortlog.c:270
ef317cd5 19899msgid "Show the email address of each author"
07432cef 19900msgstr "显示每个作者的电子邮件地址"
ef317cd5 19901
fd8cb379 19902#: builtin/shortlog.c:271
c1ac5258
JX
19903msgid "<w>[,<i1>[,<i2>]]"
19904msgstr "<w>[,<i1>[,<i2>]]"
ef317cd5 19905
fd8cb379 19906#: builtin/shortlog.c:272
ef317cd5 19907msgid "Linewrap output"
07432cef 19908msgstr "折行输出"
ef317cd5 19909
06991777 19910#: builtin/shortlog.c:301
fd8cb379
JX
19911msgid "too many arguments given outside repository"
19912msgstr "仓库外执行提供了太多的参数"
19913
c1ac5258 19914#: builtin/show-branch.c:13
ef317cd5 19915msgid ""
814ff314 19916"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
19917"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
19918"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
19919"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
ef317cd5 19920msgstr ""
814ff314 19921"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
19922"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
19923"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
19924"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
ef317cd5 19925
c1ac5258 19926#: builtin/show-branch.c:17
814ff314 19927msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
58b6f078 19928msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
ef317cd5 19929
c1ac5258 19930#: builtin/show-branch.c:395
a0b6b246
JX
19931#, c-format
19932msgid "ignoring %s; cannot handle more than %d ref"
19933msgid_plural "ignoring %s; cannot handle more than %d refs"
19934msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
19935msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
19936
a6cd2cc4 19937#: builtin/show-branch.c:548
a0b6b246
JX
19938#, c-format
19939msgid "no matching refs with %s"
19940msgstr "没有和 %s 匹配的引用"
19941
a6cd2cc4 19942#: builtin/show-branch.c:645
ef317cd5 19943msgid "show remote-tracking and local branches"
07432cef 19944msgstr "显示远程跟踪的和本地的分支"
ef317cd5 19945
a6cd2cc4 19946#: builtin/show-branch.c:647
ef317cd5 19947msgid "show remote-tracking branches"
07432cef 19948msgstr "显示远程跟踪的分支"
ef317cd5 19949
a6cd2cc4 19950#: builtin/show-branch.c:649
ef317cd5 19951msgid "color '*!+-' corresponding to the branch"
07432cef 19952msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 19953
a6cd2cc4 19954#: builtin/show-branch.c:651
ef317cd5 19955msgid "show <n> more commits after the common ancestor"
07432cef 19956msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 19957
a6cd2cc4 19958#: builtin/show-branch.c:653
ef317cd5 19959msgid "synonym to more=-1"
07432cef 19960msgstr "和 more=-1 同义"
ef317cd5 19961
a6cd2cc4 19962#: builtin/show-branch.c:654
ef317cd5 19963msgid "suppress naming strings"
07432cef 19964msgstr "不显示字符串命名"
ef317cd5 19965
a6cd2cc4 19966#: builtin/show-branch.c:656
ef317cd5 19967msgid "include the current branch"
07432cef 19968msgstr "包括当前分支"
ef317cd5 19969
a6cd2cc4 19970#: builtin/show-branch.c:658
ef317cd5 19971msgid "name commits with their object names"
07432cef 19972msgstr "以对象名字命名提交"
ef317cd5 19973
a6cd2cc4 19974#: builtin/show-branch.c:660
ef317cd5 19975msgid "show possible merge bases"
07432cef 19976msgstr "显示可能合并的基线"
ef317cd5 19977
a6cd2cc4 19978#: builtin/show-branch.c:662
ef317cd5 19979msgid "show refs unreachable from any other ref"
07432cef 19980msgstr "显示没有任何引用的的引用"
ef317cd5 19981
a6cd2cc4 19982#: builtin/show-branch.c:664
ef317cd5 19983msgid "show commits in topological order"
07432cef 19984msgstr "以拓扑顺序显示提交"
ef317cd5 19985
a6cd2cc4 19986#: builtin/show-branch.c:667
ef317cd5 19987msgid "show only commits not on the first branch"
07432cef 19988msgstr "只显示不在第一个分支上的提交"
ef317cd5 19989
a6cd2cc4 19990#: builtin/show-branch.c:669
ef317cd5 19991msgid "show merges reachable from only one tip"
07432cef 19992msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 19993
a6cd2cc4 19994#: builtin/show-branch.c:671
2e8451e8
JX
19995msgid "topologically sort, maintaining date order where possible"
19996msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 19997
a6cd2cc4 19998#: builtin/show-branch.c:674
ef317cd5 19999msgid "<n>[,<base>]"
07432cef 20000msgstr "<n>[,<base>]"
ef317cd5 20001
a6cd2cc4 20002#: builtin/show-branch.c:675
ef317cd5 20003msgid "show <n> most recent ref-log entries starting at base"
58b6f078 20004msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
ef317cd5 20005
a6cd2cc4 20006#: builtin/show-branch.c:711
a0b6b246
JX
20007msgid ""
20008"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
20009msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
20010
a6cd2cc4 20011#: builtin/show-branch.c:735
a0b6b246
JX
20012msgid "no branches given, and HEAD is not valid"
20013msgstr "未提供分支,且 HEAD 无效"
20014
a6cd2cc4 20015#: builtin/show-branch.c:738
a0b6b246
JX
20016msgid "--reflog option needs one branch name"
20017msgstr "选项 --reflog 需要一个分支名"
20018
a6cd2cc4 20019#: builtin/show-branch.c:741
a0b6b246
JX
20020#, c-format
20021msgid "only %d entry can be shown at one time."
20022msgid_plural "only %d entries can be shown at one time."
20023msgstr[0] "一次只能显示 %d 个条目。"
20024msgstr[1] "一次只能显示 %d 个条目。"
20025
a6cd2cc4 20026#: builtin/show-branch.c:745
a0b6b246
JX
20027#, c-format
20028msgid "no such ref %s"
20029msgstr "无此引用 %s"
20030
a6cd2cc4 20031#: builtin/show-branch.c:831
a0b6b246
JX
20032#, c-format
20033msgid "cannot handle more than %d rev."
20034msgid_plural "cannot handle more than %d revs."
20035msgstr[0] "不能处理 %d 个以上的版本。"
20036msgstr[1] "不能处理 %d 个以上的版本。"
20037
a6cd2cc4 20038#: builtin/show-branch.c:835
a0b6b246
JX
20039#, c-format
20040msgid "'%s' is not a valid ref."
20041msgstr "'%s' 不是一个有效的引用。"
20042
a6cd2cc4 20043#: builtin/show-branch.c:838
a0b6b246
JX
20044#, c-format
20045msgid "cannot find commit %s (%s)"
29004bbb 20046msgstr "不能找到提交 %s(%s)"
a0b6b246 20047
d46c5519 20048#: builtin/show-ref.c:12
ef317cd5 20049msgid ""
814ff314
JX
20050"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
20051"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
ef317cd5 20052msgstr ""
814ff314
JX
20053"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
20054"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
ef317cd5 20055
d46c5519 20056#: builtin/show-ref.c:13
94550ed3
JX
20057msgid "git show-ref --exclude-existing[=<pattern>]"
20058msgstr "git show-ref --exclude-existing[=<模式>]"
ef317cd5 20059
d46c5519 20060#: builtin/show-ref.c:162
ef317cd5 20061msgid "only show tags (can be combined with heads)"
55a16ee4 20062msgstr "只显示标签(可以和头共用)"
ef317cd5 20063
d46c5519 20064#: builtin/show-ref.c:163
ef317cd5 20065msgid "only show heads (can be combined with tags)"
55a16ee4 20066msgstr "只显示头(可以和标签共用)"
ef317cd5 20067
d46c5519 20068#: builtin/show-ref.c:164
ef317cd5 20069msgid "stricter reference checking, requires exact ref path"
07432cef 20070msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 20071
d46c5519 20072#: builtin/show-ref.c:167 builtin/show-ref.c:169
2e8451e8
JX
20073msgid "show the HEAD reference, even if it would be filtered out"
20074msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 20075
d46c5519 20076#: builtin/show-ref.c:171
ef317cd5 20077msgid "dereference tags into object IDs"
4375c10e 20078msgstr "转换标签到对象 ID"
ef317cd5 20079
d46c5519
JX
20080#: builtin/show-ref.c:173
20081msgid "only show SHA1 hash using <n> digits"
20082msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
20083
20084#: builtin/show-ref.c:177
20085msgid "do not print results to stdout (useful with --verify)"
20086msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
20087
20088#: builtin/show-ref.c:179
20089msgid "show refs from stdin that aren't in local repository"
20090msgstr "显示从标准输入中读入的不在本地仓库中的引用"
20091
2b472aae
JX
20092#: builtin/sparse-checkout.c:21
20093msgid "git sparse-checkout (init|list|set|add|disable) <options>"
20094msgstr "git sparse-checkout (init|list|set|add|disable) <选项>"
ddc12c42 20095
2b472aae 20096#: builtin/sparse-checkout.c:64
ddc12c42
JX
20097msgid "this worktree is not sparse (sparse-checkout file may not exist)"
20098msgstr "本工作区不是稀疏模式(稀疏检出文件可能不存在)"
20099
2b472aae
JX
20100#: builtin/sparse-checkout.c:225
20101msgid "failed to create directory for sparse-checkout file"
20102msgstr "无法为稀疏检出文件创建目录"
20103
20104#: builtin/sparse-checkout.c:266
ddc12c42
JX
20105msgid "failed to set extensions.worktreeConfig setting"
20106msgstr "无法设置 extensions.worktreeConfig"
20107
2b472aae 20108#: builtin/sparse-checkout.c:283
ddc12c42
JX
20109msgid "git sparse-checkout init [--cone]"
20110msgstr "git sparse-checkout init [--cone]"
20111
2b472aae 20112#: builtin/sparse-checkout.c:302
ddc12c42
JX
20113msgid "initialize the sparse-checkout in cone mode"
20114msgstr "初始化稀疏检出为 cone 模式"
20115
2b472aae 20116#: builtin/sparse-checkout.c:308
ddc12c42
JX
20117msgid "initialize sparse-checkout"
20118msgstr "初始化稀疏检出"
20119
2b472aae 20120#: builtin/sparse-checkout.c:341
ddc12c42
JX
20121#, c-format
20122msgid "failed to open '%s'"
20123msgstr "无法打开 '%s'"
20124
2b472aae
JX
20125#: builtin/sparse-checkout.c:398
20126#, c-format
20127msgid "could not normalize path %s"
20128msgstr "无法规范化路径 %s"
20129
20130#: builtin/sparse-checkout.c:410
20131msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
20132msgstr "git sparse-checkout (set|add) (--stdin | <模式>)"
20133
20134#: builtin/sparse-checkout.c:435
20135#, c-format
20136msgid "unable to unquote C-style string '%s'"
440e7442 20137msgstr "无法为 C 语言风格的字符串 '%s' 去引号"
2b472aae
JX
20138
20139#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
20140msgid "unable to load existing sparse-checkout patterns"
20141msgstr "无法加载现存的稀疏检出模式"
ddc12c42 20142
2b472aae 20143#: builtin/sparse-checkout.c:558
ddc12c42
JX
20144msgid "read patterns from standard in"
20145msgstr "从标准输入读取模式"
20146
2b472aae 20147#: builtin/sparse-checkout.c:564
ddc12c42
JX
20148msgid "set sparse-checkout patterns"
20149msgstr "设置稀疏检出模式"
20150
2b472aae 20151#: builtin/sparse-checkout.c:581
ddc12c42
JX
20152msgid "disable sparse-checkout"
20153msgstr "禁用稀疏检出"
20154
2b472aae 20155#: builtin/sparse-checkout.c:593
ddc12c42
JX
20156msgid "error while refreshing working directory"
20157msgstr "刷新工作目录时出错"
20158
2b472aae 20159#: builtin/stash.c:22 builtin/stash.c:38
d46c5519
JX
20160msgid "git stash list [<options>]"
20161msgstr "git stash list [<选项>]"
20162
2b472aae 20163#: builtin/stash.c:23 builtin/stash.c:43
d46c5519
JX
20164msgid "git stash show [<options>] [<stash>]"
20165msgstr "git stash show [<选项>] [<stash>]"
20166
2b472aae 20167#: builtin/stash.c:24 builtin/stash.c:48
d46c5519
JX
20168msgid "git stash drop [-q|--quiet] [<stash>]"
20169msgstr "git stash drop [-q|--quiet] [<stash>]"
20170
20171#: builtin/stash.c:25
20172msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
20173msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
20174
2b472aae 20175#: builtin/stash.c:26 builtin/stash.c:63
d46c5519
JX
20176msgid "git stash branch <branchname> [<stash>]"
20177msgstr "git stash branch <分支名> [<stash>]"
20178
2b472aae 20179#: builtin/stash.c:27 builtin/stash.c:68
d46c5519
JX
20180msgid "git stash clear"
20181msgstr "git stash clear"
20182
2b472aae 20183#: builtin/stash.c:28
d46c5519
JX
20184msgid ""
20185"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20186" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
2b472aae 20187" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
d46c5519
JX
20188" [--] [<pathspec>...]]"
20189msgstr ""
20190"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20191" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
2b472aae 20192" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
d46c5519
JX
20193" [--] [<路径规格>...]]"
20194
2b472aae 20195#: builtin/stash.c:32 builtin/stash.c:85
d46c5519
JX
20196msgid ""
20197"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20198" [-u|--include-untracked] [-a|--all] [<message>]"
20199msgstr ""
20200"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20201" [-u|--include-untracked] [-a|--all] [<消息>]"
20202
2b472aae 20203#: builtin/stash.c:53
d46c5519
JX
20204msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
20205msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
20206
2b472aae 20207#: builtin/stash.c:58
d46c5519
JX
20208msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
20209msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
20210
2b472aae 20211#: builtin/stash.c:73
d46c5519
JX
20212msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
20213msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>"
20214
2b472aae
JX
20215#: builtin/stash.c:78
20216msgid ""
20217"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20218" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
20219" [--] [<pathspec>...]]"
20220msgstr ""
20221"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20222" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
20223" [--] [<路径规格>...]]"
20224
20225#: builtin/stash.c:128
d46c5519
JX
20226#, c-format
20227msgid "'%s' is not a stash-like commit"
20228msgstr "'%s' 不像是一个贮藏提交"
20229
2b472aae 20230#: builtin/stash.c:148
d46c5519
JX
20231#, c-format
20232msgid "Too many revisions specified:%s"
20233msgstr "指定了太多的版本:%s"
20234
2b472aae 20235#: builtin/stash.c:162 git-legacy-stash.sh:549
d46c5519
JX
20236msgid "No stash entries found."
20237msgstr "未发现贮藏条目。"
20238
2b472aae 20239#: builtin/stash.c:176
d46c5519
JX
20240#, c-format
20241msgid "%s is not a valid reference"
20242msgstr "%s 不是一个有效的引用名"
20243
2b472aae 20244#: builtin/stash.c:225 git-legacy-stash.sh:75
d46c5519
JX
20245msgid "git stash clear with parameters is unimplemented"
20246msgstr "git stash clear 不支持参数"
20247
2b472aae 20248#: builtin/stash.c:404
d46c5519
JX
20249msgid "cannot apply a stash in the middle of a merge"
20250msgstr "无法在合并过程应用贮藏"
20251
2b472aae 20252#: builtin/stash.c:415
d46c5519
JX
20253#, c-format
20254msgid "could not generate diff %s^!."
20255msgstr "无法生成差异 %s^!."
20256
2b472aae 20257#: builtin/stash.c:422
d46c5519
JX
20258msgid "conflicts in index.Try without --index."
20259msgstr "索引中有冲突。尝试不用 --index。"
20260
2b472aae 20261#: builtin/stash.c:428
d46c5519
JX
20262msgid "could not save index tree"
20263msgstr "不能保存索引树"
20264
2b472aae 20265#: builtin/stash.c:437
d46c5519
JX
20266msgid "could not restore untracked files from stash"
20267msgstr "无法从贮藏条目中恢复未跟踪文件"
20268
2b472aae 20269#: builtin/stash.c:451
d46c5519
JX
20270#, c-format
20271msgid "Merging %s with %s"
20272msgstr "正在合并 %s 和 %s"
20273
2b472aae 20274#: builtin/stash.c:461 git-legacy-stash.sh:681
d46c5519
JX
20275msgid "Index was not unstashed."
20276msgstr "索引未从贮藏中恢复。"
20277
2b472aae 20278#: builtin/stash.c:522 builtin/stash.c:621
d46c5519
JX
20279msgid "attempt to recreate the index"
20280msgstr "尝试重建索引"
20281
2b472aae 20282#: builtin/stash.c:555
d46c5519
JX
20283#, c-format
20284msgid "Dropped %s (%s)"
20285msgstr "丢弃了 %s(%s)"
20286
2b472aae 20287#: builtin/stash.c:558
d46c5519
JX
20288#, c-format
20289msgid "%s: Could not drop stash entry"
20290msgstr "%s:无法丢弃贮藏条目"
20291
2b472aae 20292#: builtin/stash.c:583
d46c5519
JX
20293#, c-format
20294msgid "'%s' is not a stash reference"
20295msgstr "'%s' 不是一个贮藏引用"
20296
2b472aae 20297#: builtin/stash.c:633 git-legacy-stash.sh:695
d46c5519
JX
20298msgid "The stash entry is kept in case you need it again."
20299msgstr "贮藏条目被保留以备您再次需要。"
20300
2b472aae 20301#: builtin/stash.c:656 git-legacy-stash.sh:713
d46c5519
JX
20302msgid "No branch name specified"
20303msgstr "未指定分支名"
20304
2b472aae 20305#: builtin/stash.c:796 builtin/stash.c:833
d46c5519
JX
20306#, c-format
20307msgid "Cannot update %s with %s"
20308msgstr "无法用 %2$s 更新 %1$s"
20309
2b472aae 20310#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
d46c5519
JX
20311msgid "stash message"
20312msgstr "贮藏说明"
20313
2b472aae 20314#: builtin/stash.c:824
d46c5519
JX
20315msgid "\"git stash store\" requires one <commit> argument"
20316msgstr "\"git stash store\" 需要一个 <提交> 参数"
20317
2b472aae 20318#: builtin/stash.c:1049 git-legacy-stash.sh:218
d46c5519
JX
20319msgid "No changes selected"
20320msgstr "没有选择变更"
20321
2b472aae 20322#: builtin/stash.c:1149 git-legacy-stash.sh:150
d46c5519
JX
20323msgid "You do not have the initial commit yet"
20324msgstr "您尚未建立初始提交"
20325
2b472aae 20326#: builtin/stash.c:1176 git-legacy-stash.sh:165
d46c5519
JX
20327msgid "Cannot save the current index state"
20328msgstr "无法保存当前索引状态"
20329
2b472aae 20330#: builtin/stash.c:1185 git-legacy-stash.sh:180
d46c5519
JX
20331msgid "Cannot save the untracked files"
20332msgstr "无法保存未跟踪文件"
20333
2b472aae 20334#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
ddc12c42 20335#: git-legacy-stash.sh:214
d46c5519
JX
20336msgid "Cannot save the current worktree state"
20337msgstr "无法保存当前工作区状态"
20338
2b472aae 20339#: builtin/stash.c:1233 git-legacy-stash.sh:234
d46c5519
JX
20340msgid "Cannot record working tree state"
20341msgstr "不能记录工作区状态"
20342
2b472aae 20343#: builtin/stash.c:1282 git-legacy-stash.sh:338
d46c5519
JX
20344msgid "Can't use --patch and --include-untracked or --all at the same time"
20345msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
20346
2b472aae 20347#: builtin/stash.c:1298
d46c5519
JX
20348msgid "Did you forget to 'git add'?"
20349msgstr "您是否忘了执行 'git add'?"
20350
2b472aae 20351#: builtin/stash.c:1313 git-legacy-stash.sh:346
d46c5519
JX
20352msgid "No local changes to save"
20353msgstr "没有要保存的本地修改"
20354
2b472aae 20355#: builtin/stash.c:1320 git-legacy-stash.sh:351
d46c5519
JX
20356msgid "Cannot initialize stash"
20357msgstr "无法初始化贮藏"
20358
2b472aae 20359#: builtin/stash.c:1335 git-legacy-stash.sh:355
d46c5519
JX
20360msgid "Cannot save the current status"
20361msgstr "无法保存当前状态"
20362
2b472aae 20363#: builtin/stash.c:1340
d46c5519
JX
20364#, c-format
20365msgid "Saved working directory and index state %s"
20366msgstr "保存工作目录和索引状态 %s"
20367
2b472aae 20368#: builtin/stash.c:1430 git-legacy-stash.sh:385
d46c5519
JX
20369msgid "Cannot remove worktree changes"
20370msgstr "无法删除工作区变更"
20371
2b472aae 20372#: builtin/stash.c:1469 builtin/stash.c:1534
d46c5519
JX
20373msgid "keep index"
20374msgstr "保持索引"
20375
2b472aae 20376#: builtin/stash.c:1471 builtin/stash.c:1536
d46c5519
JX
20377msgid "stash in patch mode"
20378msgstr "以补丁模式贮藏"
20379
2b472aae 20380#: builtin/stash.c:1472 builtin/stash.c:1537
d46c5519
JX
20381msgid "quiet mode"
20382msgstr "静默模式"
20383
2b472aae 20384#: builtin/stash.c:1474 builtin/stash.c:1539
d46c5519
JX
20385msgid "include untracked files in stash"
20386msgstr "贮藏中包含未跟踪文件"
ef317cd5 20387
2b472aae 20388#: builtin/stash.c:1476 builtin/stash.c:1541
d46c5519
JX
20389msgid "include ignore files"
20390msgstr "包含忽略的文件"
ef317cd5 20391
2b472aae 20392#: builtin/stash.c:1600
d46c5519
JX
20393#, c-format
20394msgid "could not exec %s"
20395msgstr "不能执行 %s"
ef317cd5 20396
a4f16749 20397#: builtin/stripspace.c:18
94550ed3
JX
20398msgid "git stripspace [-s | --strip-comments]"
20399msgstr "git stripspace [-s | --strip-comments]"
20400
a4f16749 20401#: builtin/stripspace.c:19
94550ed3
JX
20402msgid "git stripspace [-c | --comment-lines]"
20403msgstr "git stripspace [-c | --comment-lines]"
20404
06991777 20405#: builtin/stripspace.c:37
94550ed3
JX
20406msgid "skip and remove all lines starting with comment character"
20407msgstr "跳过和移除所有的注释行"
20408
06991777 20409#: builtin/stripspace.c:40
276ceeaa 20410msgid "prepend comment character and space to each line"
94550ed3
JX
20411msgstr "为每一行的行首添加注释符和空格"
20412
2b472aae 20413#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
5b04ee3b
JX
20414#, c-format
20415msgid "Expecting a full ref name, got %s"
20416msgstr "期望一个完整的引用名称,却得到 %s"
20417
ddc12c42 20418#: builtin/submodule--helper.c:64
31e5e17b
JX
20419msgid "submodule--helper print-default-remote takes no arguments"
20420msgstr "submodule--helper print-default-remote 不带参数"
20421
ddc12c42 20422#: builtin/submodule--helper.c:102
5b04ee3b
JX
20423#, c-format
20424msgid "cannot strip one component off url '%s'"
20425msgstr "无法从 url '%s' 剥离一个组件"
20426
2b472aae 20427#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
94550ed3
JX
20428msgid "alternative anchor for relative paths"
20429msgstr "相对路径的替代锚记(anchor)"
20430
ddc12c42 20431#: builtin/submodule--helper.c:415
94550ed3
JX
20432msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
20433msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
20434
ddc12c42
JX
20435#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
20436#: builtin/submodule--helper.c:653
5b04ee3b
JX
20437#, c-format
20438msgid "No url found for submodule path '%s' in .gitmodules"
20439msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
20440
ddc12c42 20441#: builtin/submodule--helper.c:524
c1ac5258
JX
20442#, c-format
20443msgid "Entering '%s'\n"
20444msgstr "进入 '%s'\n"
20445
ddc12c42 20446#: builtin/submodule--helper.c:527
c1ac5258
JX
20447#, c-format
20448msgid ""
20449"run_command returned non-zero status for %s\n"
20450"."
4c27fcb5
JX
20451msgstr ""
20452"对 %s 执行 run_command 返回非零值。\n"
20453"."
c1ac5258 20454
ddc12c42 20455#: builtin/submodule--helper.c:549
c1ac5258
JX
20456#, c-format
20457msgid ""
20458"run_command returned non-zero status while recursing in the nested "
20459"submodules of %s\n"
20460"."
4c27fcb5
JX
20461msgstr ""
20462"在递归 %s 的子模组执行 run_command 时返回非零值。\n"
20463"."
c1ac5258 20464
ddc12c42 20465#: builtin/submodule--helper.c:565
c1ac5258
JX
20466msgid "Suppress output of entering each submodule command"
20467msgstr "阻止进入每一个子模组命令的输出"
20468
2b472aae 20469#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
c1ac5258
JX
20470msgid "Recurse into nested submodules"
20471msgstr "递归进入嵌套子模组中"
20472
ddc12c42 20473#: builtin/submodule--helper.c:572
d46c5519
JX
20474msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
20475msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
c1ac5258 20476
ddc12c42 20477#: builtin/submodule--helper.c:599
87cb7997
JX
20478#, c-format
20479msgid ""
4c27fcb5 20480"could not look up configuration '%s'. Assuming this repository is its own "
87cb7997
JX
20481"authoritative upstream."
20482msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
20483
ddc12c42 20484#: builtin/submodule--helper.c:667
5b04ee3b
JX
20485#, c-format
20486msgid "Failed to register url for submodule path '%s'"
20487msgstr "无法为子模组 '%s' 注册 url"
20488
ddc12c42 20489#: builtin/submodule--helper.c:671
5b04ee3b
JX
20490#, c-format
20491msgid "Submodule '%s' (%s) registered for path '%s'\n"
25c75902 20492msgstr "子模组 '%s'(%s)已对路径 '%s' 注册\n"
5b04ee3b 20493
ddc12c42 20494#: builtin/submodule--helper.c:681
aef18cc6 20495#, c-format
5b04ee3b 20496msgid "warning: command update mode suggested for submodule '%s'\n"
aef18cc6 20497msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
5b04ee3b 20498
ddc12c42 20499#: builtin/submodule--helper.c:688
5b04ee3b
JX
20500#, c-format
20501msgid "Failed to register update mode for submodule path '%s'"
20502msgstr "无法为子模组 '%s' 注册更新模式"
20503
ddc12c42 20504#: builtin/submodule--helper.c:710
5b04ee3b 20505msgid "Suppress output for initializing a submodule"
31e5e17b 20506msgstr "阻止子模组初始化的输出"
5b04ee3b 20507
ddc12c42 20508#: builtin/submodule--helper.c:715
d46c5519
JX
20509msgid "git submodule--helper init [<options>] [<path>]"
20510msgstr "git submodule--helper init [<选项>] [<路径>]"
5b04ee3b 20511
2b472aae 20512#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
94550ed3
JX
20513#, c-format
20514msgid "no submodule mapping found in .gitmodules for path '%s'"
20515msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
20516
2b472aae 20517#: builtin/submodule--helper.c:837
5809aa05
JX
20518#, c-format
20519msgid "could not resolve HEAD ref inside the submodule '%s'"
20520msgstr "无法解析子模组 '%s' 的 HEAD 引用"
20521
2b472aae 20522#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
5809aa05
JX
20523#, c-format
20524msgid "failed to recurse into submodule '%s'"
c1ac5258 20525msgstr "递归子模组 '%s' 失败"
5809aa05 20526
2b472aae 20527#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
5809aa05 20528msgid "Suppress submodule status output"
31e5e17b 20529msgstr "阻止子模组状态输出"
5809aa05 20530
2b472aae 20531#: builtin/submodule--helper.c:889
5809aa05
JX
20532msgid ""
20533"Use commit stored in the index instead of the one stored in the submodule "
20534"HEAD"
20535msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交"
20536
2b472aae 20537#: builtin/submodule--helper.c:890
5809aa05 20538msgid "recurse into nested submodules"
31e5e17b 20539msgstr "递归进入嵌套子模组中"
5809aa05 20540
2b472aae 20541#: builtin/submodule--helper.c:895
5809aa05
JX
20542msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
20543msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
20544
2b472aae 20545#: builtin/submodule--helper.c:919
5809aa05
JX
20546msgid "git submodule--helper name <path>"
20547msgstr "git submodule--helper name <路径>"
20548
2b472aae 20549#: builtin/submodule--helper.c:983
31e5e17b
JX
20550#, c-format
20551msgid "Synchronizing submodule url for '%s'\n"
20552msgstr "为 '%s' 同步子模组 url\n"
20553
2b472aae 20554#: builtin/submodule--helper.c:989
31e5e17b
JX
20555#, c-format
20556msgid "failed to register url for submodule path '%s'"
20557msgstr "无法为子模组路径 '%s' 注册 url"
20558
2b472aae 20559#: builtin/submodule--helper.c:1003
31e5e17b
JX
20560#, c-format
20561msgid "failed to get the default remote for submodule '%s'"
20562msgstr "无法得到子模组 '%s' 的默认远程关联"
20563
2b472aae 20564#: builtin/submodule--helper.c:1014
31e5e17b
JX
20565#, c-format
20566msgid "failed to update remote for submodule '%s'"
20567msgstr "无法为子模组 '%s' 更新远程关联"
20568
2b472aae 20569#: builtin/submodule--helper.c:1061
31e5e17b
JX
20570msgid "Suppress output of synchronizing submodule url"
20571msgstr "阻止子模组 url 同步的输出"
20572
2b472aae 20573#: builtin/submodule--helper.c:1068
31e5e17b
JX
20574msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
20575msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
20576
2b472aae 20577#: builtin/submodule--helper.c:1122
31e5e17b
JX
20578#, c-format
20579msgid ""
20580"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
20581"really want to remove it including all of its history)"
20582msgstr ""
fd8cb379
JX
20583"子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm "
20584"-rf' 命令)"
31e5e17b 20585
2b472aae 20586#: builtin/submodule--helper.c:1134
31e5e17b
JX
20587#, c-format
20588msgid ""
20589"Submodule work tree '%s' contains local modifications; use '-f' to discard "
20590"them"
20591msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们"
20592
2b472aae 20593#: builtin/submodule--helper.c:1142
31e5e17b
JX
20594#, c-format
20595msgid "Cleared directory '%s'\n"
20596msgstr "已清除目录 '%s'\n"
20597
2b472aae 20598#: builtin/submodule--helper.c:1144
31e5e17b
JX
20599#, c-format
20600msgid "Could not remove submodule work tree '%s'\n"
20601msgstr "无法移除子模组工作区 '%s'\n"
20602
2b472aae 20603#: builtin/submodule--helper.c:1155
31e5e17b
JX
20604#, c-format
20605msgid "could not create empty submodule directory %s"
20606msgstr "不能创建空的子模组目录 %s"
20607
2b472aae 20608#: builtin/submodule--helper.c:1171
31e5e17b
JX
20609#, c-format
20610msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
20611msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
20612
2b472aae 20613#: builtin/submodule--helper.c:1200
31e5e17b
JX
20614msgid "Remove submodule working trees even if they contain local changes"
20615msgstr "删除子模组工作区,即使包含本地修改"
20616
2b472aae 20617#: builtin/submodule--helper.c:1201
31e5e17b
JX
20618msgid "Unregister all submodules"
20619msgstr "将所有子模组取消注册"
20620
2b472aae 20621#: builtin/submodule--helper.c:1206
31e5e17b
JX
20622msgid ""
20623"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
20624msgstr ""
20625"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
20626
2b472aae 20627#: builtin/submodule--helper.c:1220
31e5e17b
JX
20628msgid "Use '--all' if you really want to deinitialize all submodules"
20629msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
20630
2b472aae 20631#: builtin/submodule--helper.c:1289
ddc12c42
JX
20632msgid ""
20633"An alternate computed from a superproject's alternate is invalid.\n"
20634"To allow Git to clone without an alternate in such a case, set\n"
20635"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
20636"'--reference-if-able' instead of '--reference'."
20637msgstr ""
20638"从一个父项目的备用仓库中计算出的备用仓库无效。\n"
20639"此场景下,设置 submodule.alternateErrorStrategy 为 'info',以允许\n"
20640"Git 不使用备用仓库克隆,或者等效地使用 '--reference-if-able' 而非\n"
20641"'--reference' 来克隆。"
20642
2b472aae 20643#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
a0b6b246
JX
20644#, c-format
20645msgid "submodule '%s' cannot add alternate: %s"
20646msgstr "子模组 '%s' 不能添加仓库备选:%s"
20647
2b472aae 20648#: builtin/submodule--helper.c:1367
a0b6b246
JX
20649#, c-format
20650msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
20651msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
20652
2b472aae 20653#: builtin/submodule--helper.c:1374
a0b6b246
JX
20654#, c-format
20655msgid "Value '%s' for submodule.alternateLocation is not recognized"
20656msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
20657
2b472aae 20658#: builtin/submodule--helper.c:1398
94550ed3
JX
20659msgid "where the new submodule will be cloned to"
20660msgstr "新的子模组将要克隆的路径"
20661
2b472aae 20662#: builtin/submodule--helper.c:1401
94550ed3
JX
20663msgid "name of the new submodule"
20664msgstr "新子模组的名称"
20665
2b472aae 20666#: builtin/submodule--helper.c:1404
94550ed3
JX
20667msgid "url where to clone the submodule from"
20668msgstr "克隆子模组的 url 地址"
20669
2b472aae 20670#: builtin/submodule--helper.c:1412
94550ed3
JX
20671msgid "depth for shallow clones"
20672msgstr "浅克隆的深度"
20673
2b472aae 20674#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
a0b6b246 20675msgid "force cloning progress"
29004bbb 20676msgstr "强制显示克隆进度"
a0b6b246 20677
2b472aae 20678#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
ddc12c42
JX
20679msgid "disallow cloning into non-empty directory"
20680msgstr "不允许克隆到一个非空目录"
20681
2b472aae 20682#: builtin/submodule--helper.c:1424
94550ed3
JX
20683msgid ""
20684"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
2b472aae
JX
20685"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
20686"<url> --path <path>"
5c57d762
JX
20687msgstr ""
20688"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
2b472aae 20689"[--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>"
94550ed3 20690
2b472aae 20691#: builtin/submodule--helper.c:1449
ddc12c42
JX
20692#, c-format
20693msgid "refusing to create/use '%s' in another submodule's git dir"
20694msgstr "拒绝在另一个子模组的 git dir 中创建/使用 '%s'"
20695
2b472aae 20696#: builtin/submodule--helper.c:1460
94550ed3
JX
20697#, c-format
20698msgid "clone of '%s' into submodule path '%s' failed"
20699msgstr "无法克隆 '%s' 到子模组路径 '%s'"
20700
2b472aae 20701#: builtin/submodule--helper.c:1464
ddc12c42
JX
20702#, c-format
20703msgid "directory not empty: '%s'"
20704msgstr "目录非空:'%s'"
20705
2b472aae 20706#: builtin/submodule--helper.c:1476
94550ed3
JX
20707#, c-format
20708msgid "could not get submodule directory for '%s'"
20709msgstr "无法得到 '%s' 的子模组目录"
20710
2b472aae 20711#: builtin/submodule--helper.c:1512
4c27fcb5
JX
20712#, c-format
20713msgid "Invalid update mode '%s' for submodule path '%s'"
20714msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效"
20715
2b472aae 20716#: builtin/submodule--helper.c:1516
4c27fcb5
JX
20717#, c-format
20718msgid "Invalid update mode '%s' configured for submodule path '%s'"
20719msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效"
20720
2b472aae 20721#: builtin/submodule--helper.c:1617
5b04ee3b
JX
20722#, c-format
20723msgid "Submodule path '%s' not initialized"
20724msgstr "子模组 '%s' 尚未初始化"
20725
2b472aae 20726#: builtin/submodule--helper.c:1621
5b04ee3b
JX
20727msgid "Maybe you want to use 'update --init'?"
20728msgstr "也许您想要执行 'update --init'?"
20729
2b472aae 20730#: builtin/submodule--helper.c:1651
5b04ee3b
JX
20731#, c-format
20732msgid "Skipping unmerged submodule %s"
20733msgstr "略过未合并的子模组 %s"
20734
2b472aae 20735#: builtin/submodule--helper.c:1680
5b04ee3b
JX
20736#, c-format
20737msgid "Skipping submodule '%s'"
20738msgstr "略过子模组 '%s'"
20739
2b472aae 20740#: builtin/submodule--helper.c:1830
5c57d762
JX
20741#, c-format
20742msgid "Failed to clone '%s'. Retry scheduled"
20743msgstr "克隆 '%s' 失败。按计划重试"
20744
2b472aae 20745#: builtin/submodule--helper.c:1841
5c57d762
JX
20746#, c-format
20747msgid "Failed to clone '%s' a second time, aborting"
20748msgstr "第二次尝试克隆 '%s' 失败,退出"
20749
2b472aae 20750#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
5b04ee3b
JX
20751msgid "path into the working tree"
20752msgstr "到工作区的路径"
20753
2b472aae 20754#: builtin/submodule--helper.c:1906
5b04ee3b
JX
20755msgid "path into the working tree, across nested submodule boundaries"
20756msgstr "工作区中的路径,递归嵌套子模组"
20757
2b472aae 20758#: builtin/submodule--helper.c:1910
5b04ee3b
JX
20759msgid "rebase, merge, checkout or none"
20760msgstr "rebase、merge、checkout 或 none"
20761
2b472aae 20762#: builtin/submodule--helper.c:1916
5b04ee3b
JX
20763msgid "Create a shallow clone truncated to the specified number of revisions"
20764msgstr "创建一个指定深度的浅克隆"
20765
2b472aae 20766#: builtin/submodule--helper.c:1919
5b04ee3b
JX
20767msgid "parallel jobs"
20768msgstr "并发任务"
20769
2b472aae 20770#: builtin/submodule--helper.c:1921
5c57d762 20771msgid "whether the initial clone should follow the shallow recommendation"
9a4b694c 20772msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
5c57d762 20773
2b472aae 20774#: builtin/submodule--helper.c:1922
5b04ee3b
JX
20775msgid "don't print cloning progress"
20776msgstr "不要输出克隆进度"
94550ed3 20777
2b472aae 20778#: builtin/submodule--helper.c:1933
a5cd71ca
JX
20779msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
20780msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]"
5b04ee3b 20781
2b472aae 20782#: builtin/submodule--helper.c:1946
5b04ee3b
JX
20783msgid "bad value for update parameter"
20784msgstr "update 参数取值错误"
20785
2b472aae 20786#: builtin/submodule--helper.c:1994
5c57d762
JX
20787#, c-format
20788msgid ""
20789"Submodule (%s) branch configured to inherit branch from superproject, but "
20790"the superproject is not on any branch"
20791msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
20792
2b472aae 20793#: builtin/submodule--helper.c:2117
4c27fcb5
JX
20794#, c-format
20795msgid "could not get a repository handle for submodule '%s'"
20796msgstr "无法获得子模组 '%s' 的仓库句柄"
20797
2b472aae 20798#: builtin/submodule--helper.c:2150
1a79b2f1
JX
20799msgid "recurse into submodules"
20800msgstr "在子模组中递归"
20801
2b472aae 20802#: builtin/submodule--helper.c:2156
d46c5519
JX
20803msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
20804msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
1a79b2f1 20805
2b472aae 20806#: builtin/submodule--helper.c:2212
4c27fcb5
JX
20807msgid "check if it is safe to write to the .gitmodules file"
20808msgstr "检查写入 .gitmodules 文件是否安全"
20809
2b472aae 20810#: builtin/submodule--helper.c:2215
d46c5519
JX
20811msgid "unset the config in the .gitmodules file"
20812msgstr "取消 .gitmodules 文件中的设置"
20813
2b472aae 20814#: builtin/submodule--helper.c:2220
d46c5519
JX
20815msgid "git submodule--helper config <name> [<value>]"
20816msgstr "git submodule--helper config <名称> [<值>]"
4c27fcb5 20817
2b472aae 20818#: builtin/submodule--helper.c:2221
d46c5519
JX
20819msgid "git submodule--helper config --unset <name>"
20820msgstr "git submodule--helper config --unset <名称>"
20821
2b472aae 20822#: builtin/submodule--helper.c:2222
4c27fcb5
JX
20823msgid "git submodule--helper config --check-writeable"
20824msgstr "git submodule--helper config --check-writeable"
20825
2b472aae 20826#: builtin/submodule--helper.c:2241 git-submodule.sh:174
4c27fcb5
JX
20827#, sh-format
20828msgid "please make sure that the .gitmodules file is in the working tree"
20829msgstr "请确认 .gitmodules 文件在工作区里"
20830
2b472aae 20831#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
1a79b2f1
JX
20832#, c-format
20833msgid "%s doesn't support --super-prefix"
20834msgstr "%s 不支持 --super-prefix"
20835
2b472aae 20836#: builtin/submodule--helper.c:2297
94550ed3 20837#, c-format
5b04ee3b
JX
20838msgid "'%s' is not a valid submodule--helper subcommand"
20839msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
94550ed3 20840
a4f16749 20841#: builtin/symbolic-ref.c:8
814ff314
JX
20842msgid "git symbolic-ref [<options>] <name> [<ref>]"
20843msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
07432cef 20844
a4f16749 20845#: builtin/symbolic-ref.c:9
814ff314
JX
20846msgid "git symbolic-ref -d [-q] <name>"
20847msgstr "git symbolic-ref -d [-q] <名称>"
ef317cd5 20848
6937cb4e 20849#: builtin/symbolic-ref.c:40
ef317cd5 20850msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
20851msgstr "不显示非符号(分离的)引用的错误信息"
20852
6937cb4e 20853#: builtin/symbolic-ref.c:41
07432cef
WS
20854msgid "delete symbolic ref"
20855msgstr "删除符号引用"
ef317cd5 20856
6937cb4e 20857#: builtin/symbolic-ref.c:42
ef317cd5 20858msgid "shorten ref output"
6937cb4e 20859msgstr "缩短引用输出"
ef317cd5 20860
c1ac5258 20861#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
ef317cd5 20862msgid "reason"
07432cef 20863msgstr "原因"
ef317cd5 20864
c1ac5258 20865#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
ef317cd5 20866msgid "reason of the update"
07432cef 20867msgstr "更新的原因"
ef317cd5 20868
c1ac5258 20869#: builtin/tag.c:25
ef317cd5 20870msgid ""
d46c5519
JX
20871"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
20872"\t\t<tagname> [<head>]"
814ff314 20873msgstr ""
d46c5519
JX
20874"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n"
20875"\t\t<标签名> [<头>]"
ef317cd5 20876
d46c5519 20877#: builtin/tag.c:27
ef317cd5 20878msgid "git tag -d <tagname>..."
07432cef 20879msgstr "git tag -d <标签名>..."
ef317cd5 20880
d46c5519 20881#: builtin/tag.c:28
ef317cd5 20882msgid ""
87cb7997
JX
20883"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
20884"points-at <object>]\n"
94550ed3 20885"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
ef317cd5 20886msgstr ""
87cb7997
JX
20887"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
20888"at <对象>]\n"
94550ed3 20889"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
ef317cd5 20890
d46c5519 20891#: builtin/tag.c:30
1a79b2f1
JX
20892msgid "git tag -v [--format=<format>] <tagname>..."
20893msgstr "git tag -v [--format=<格式>] <标签名>..."
ef317cd5 20894
a6cd2cc4 20895#: builtin/tag.c:89
c04f5ac3
JX
20896#, c-format
20897msgid "tag '%s' not found."
55a16ee4 20898msgstr "未发现标签 '%s'。"
c04f5ac3 20899
a6cd2cc4 20900#: builtin/tag.c:105
c04f5ac3
JX
20901#, c-format
20902msgid "Deleted tag '%s' (was %s)\n"
55a16ee4 20903msgstr "已删除标签 '%s'(曾为 %s)\n"
c04f5ac3 20904
a6cd2cc4 20905#: builtin/tag.c:135
a77c07d9 20906#, c-format
c04f5ac3
JX
20907msgid ""
20908"\n"
6acbf033
JX
20909"Write a message for tag:\n"
20910" %s\n"
a77c07d9 20911"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
20912msgstr ""
20913"\n"
55a16ee4 20914"输入一个标签说明:\n"
6acbf033 20915" %s\n"
a77c07d9 20916"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 20917
a6cd2cc4 20918#: builtin/tag.c:139
a77c07d9 20919#, c-format
c04f5ac3
JX
20920msgid ""
20921"\n"
6acbf033
JX
20922"Write a message for tag:\n"
20923" %s\n"
a77c07d9 20924"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 20925"want to.\n"
c04f5ac3
JX
20926msgstr ""
20927"\n"
55a16ee4 20928"输入一个标签说明:\n"
6acbf033 20929" %s\n"
a77c07d9 20930"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 20931
a6cd2cc4 20932#: builtin/tag.c:198
c04f5ac3 20933msgid "unable to sign the tag"
55a16ee4 20934msgstr "无法签署标签"
c04f5ac3 20935
a6cd2cc4 20936#: builtin/tag.c:200
c04f5ac3 20937msgid "unable to write tag file"
55a16ee4 20938msgstr "无法写标签文件"
c04f5ac3 20939
a6cd2cc4 20940#: builtin/tag.c:216
d46c5519
JX
20941#, c-format
20942msgid ""
20943"You have created a nested tag. The object referred to by your new tag is\n"
20944"already a tag. If you meant to tag the object that it points to, use:\n"
20945"\n"
20946"\tgit tag -f %s %s^{}"
20947msgstr ""
20948"您创建了一个嵌套的标签。您的新标签指向的对象已经是一个标签。如果您想要\n"
20949"对其指向的目标创建标签,使用:\n"
20950"\n"
20951"\tgit tag -f %s %s^{}"
20952
a6cd2cc4 20953#: builtin/tag.c:232
c04f5ac3 20954msgid "bad object type."
90e6ef53 20955msgstr "坏的对象类型。"
c04f5ac3 20956
a6cd2cc4 20957#: builtin/tag.c:284
c04f5ac3 20958msgid "no tag message?"
55a16ee4 20959msgstr "无标签说明?"
c04f5ac3 20960
a6cd2cc4 20961#: builtin/tag.c:291
c04f5ac3
JX
20962#, c-format
20963msgid "The tag message has been left in %s\n"
55a16ee4 20964msgstr "标签说明被保留在 %s\n"
c04f5ac3 20965
a6cd2cc4 20966#: builtin/tag.c:402
ef317cd5 20967msgid "list tag names"
55a16ee4 20968msgstr "列出标签名称"
ef317cd5 20969
a6cd2cc4 20970#: builtin/tag.c:404
ef317cd5 20971msgid "print <n> lines of each tag message"
55a16ee4 20972msgstr "每个标签信息打印 <n> 行"
ef317cd5 20973
a6cd2cc4 20974#: builtin/tag.c:406
ef317cd5 20975msgid "delete tags"
55a16ee4 20976msgstr "删除标签"
ef317cd5 20977
a6cd2cc4 20978#: builtin/tag.c:407
ef317cd5 20979msgid "verify tags"
55a16ee4 20980msgstr "验证标签"
ef317cd5 20981
a6cd2cc4 20982#: builtin/tag.c:409
ef317cd5 20983msgid "Tag creation options"
55a16ee4 20984msgstr "标签创建选项"
ef317cd5 20985
a6cd2cc4 20986#: builtin/tag.c:411
ef317cd5 20987msgid "annotated tag, needs a message"
55a16ee4 20988msgstr "附注标签,需要一个说明"
ef317cd5 20989
a6cd2cc4 20990#: builtin/tag.c:413
ef317cd5 20991msgid "tag message"
55a16ee4 20992msgstr "标签说明"
ef317cd5 20993
a6cd2cc4 20994#: builtin/tag.c:415
31e5e17b
JX
20995msgid "force edit of tag message"
20996msgstr "强制编辑标签说明"
20997
a6cd2cc4 20998#: builtin/tag.c:416
ef317cd5 20999msgid "annotated and GPG-signed tag"
55a16ee4 21000msgstr "附注并附加 GPG 签名的标签"
ef317cd5 21001
a6cd2cc4 21002#: builtin/tag.c:419
ef317cd5 21003msgid "use another key to sign the tag"
55a16ee4 21004msgstr "使用另外的私钥签名该标签"
ef317cd5 21005
a6cd2cc4 21006#: builtin/tag.c:420
ef317cd5 21007msgid "replace the tag if exists"
55a16ee4 21008msgstr "如果存在,替换现有的标签"
ef317cd5 21009
a6cd2cc4 21010#: builtin/tag.c:421 builtin/update-ref.c:369
03ea3327 21011msgid "create a reflog"
1b7f4a34
JX
21012msgstr "创建引用日志"
21013
a6cd2cc4 21014#: builtin/tag.c:423
814ff314 21015msgid "Tag listing options"
55a16ee4 21016msgstr "标签列表选项"
814ff314 21017
a6cd2cc4 21018#: builtin/tag.c:424
ef317cd5 21019msgid "show tag list in columns"
55a16ee4 21020msgstr "以列的方式显示标签列表"
ef317cd5 21021
a6cd2cc4 21022#: builtin/tag.c:425 builtin/tag.c:427
ef317cd5 21023msgid "print only tags that contain the commit"
87cb7997 21024msgstr "只打印包含该提交的标签"
ef317cd5 21025
a6cd2cc4 21026#: builtin/tag.c:426 builtin/tag.c:428
87cb7997
JX
21027msgid "print only tags that don't contain the commit"
21028msgstr "只打印不包含该提交的标签"
21029
a6cd2cc4 21030#: builtin/tag.c:429
94550ed3
JX
21031msgid "print only tags that are merged"
21032msgstr "只打印已经合并的标签"
21033
a6cd2cc4 21034#: builtin/tag.c:430
94550ed3
JX
21035msgid "print only tags that are not merged"
21036msgstr "只打印尚未合并的标签"
21037
a6cd2cc4 21038#: builtin/tag.c:434
ef317cd5 21039msgid "print only tags of the object"
87cb7997 21040msgstr "只打印指向该对象的标签"
ef317cd5 21041
a6cd2cc4 21042#: builtin/tag.c:482
8ada9598 21043msgid "--column and -n are incompatible"
81809b99 21044msgstr "--column 和 -n 不兼容"
8ada9598 21045
a6cd2cc4 21046#: builtin/tag.c:504
87cb7997
JX
21047msgid "-n option is only allowed in list mode"
21048msgstr "-n 选项只允许用在列表显示模式"
c04f5ac3 21049
a6cd2cc4 21050#: builtin/tag.c:506
87cb7997
JX
21051msgid "--contains option is only allowed in list mode"
21052msgstr "--contains 选项只允许用在列表显示模式"
c04f5ac3 21053
a6cd2cc4 21054#: builtin/tag.c:508
87cb7997
JX
21055msgid "--no-contains option is only allowed in list mode"
21056msgstr "--no-contains 选项只允许用在列表显示模式"
7ac1c0ad 21057
a6cd2cc4 21058#: builtin/tag.c:510
87cb7997
JX
21059msgid "--points-at option is only allowed in list mode"
21060msgstr "--points-at 选项只允许用在列表显示模式"
94550ed3 21061
a6cd2cc4 21062#: builtin/tag.c:512
87cb7997
JX
21063msgid "--merged and --no-merged options are only allowed in list mode"
21064msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
21065
a6cd2cc4 21066#: builtin/tag.c:523
c04f5ac3
JX
21067msgid "only one -F or -m option is allowed."
21068msgstr "只允许一个 -F 或 -m 选项。"
21069
a6cd2cc4 21070#: builtin/tag.c:542
c04f5ac3
JX
21071msgid "too many params"
21072msgstr "太多参数"
21073
a6cd2cc4 21074#: builtin/tag.c:548
c04f5ac3
JX
21075#, c-format
21076msgid "'%s' is not a valid tag name."
55a16ee4 21077msgstr "'%s' 不是一个有效的标签名称。"
c04f5ac3 21078
a6cd2cc4 21079#: builtin/tag.c:553
c04f5ac3
JX
21080#, c-format
21081msgid "tag '%s' already exists"
55a16ee4 21082msgstr "标签 '%s' 已存在"
c04f5ac3 21083
a6cd2cc4 21084#: builtin/tag.c:584
c04f5ac3
JX
21085#, c-format
21086msgid "Updated tag '%s' (was %s)\n"
55a16ee4 21087msgstr "已更新标签 '%s'(曾为 %s)\n"
c04f5ac3 21088
2b472aae 21089#: builtin/unpack-objects.c:502
6c94aba5
JX
21090msgid "Unpacking objects"
21091msgstr "展开对象中"
21092
ddc12c42 21093#: builtin/update-index.c:84
7aea43ff
JX
21094#, c-format
21095msgid "failed to create directory %s"
c1ac5258 21096msgstr "创建目录 %s 失败"
7aea43ff 21097
ddc12c42 21098#: builtin/update-index.c:100
7aea43ff
JX
21099#, c-format
21100msgid "failed to create file %s"
c1ac5258 21101msgstr "创建文件 %s 失败"
7aea43ff 21102
ddc12c42 21103#: builtin/update-index.c:108
7aea43ff
JX
21104#, c-format
21105msgid "failed to delete file %s"
c1ac5258 21106msgstr "删除文件 %s 失败"
7aea43ff 21107
ddc12c42 21108#: builtin/update-index.c:115 builtin/update-index.c:221
7aea43ff
JX
21109#, c-format
21110msgid "failed to delete directory %s"
c1ac5258 21111msgstr "删除目录 %s 失败"
7aea43ff 21112
ddc12c42 21113#: builtin/update-index.c:140
7aea43ff 21114#, c-format
276ceeaa
JX
21115msgid "Testing mtime in '%s' "
21116msgstr "在 '%s' 中测试 mtime "
7aea43ff 21117
ddc12c42 21118#: builtin/update-index.c:154
7aea43ff
JX
21119msgid "directory stat info does not change after adding a new file"
21120msgstr "添加一个新文件后,目录的状态信息未改变"
21121
ddc12c42 21122#: builtin/update-index.c:167
7aea43ff
JX
21123msgid "directory stat info does not change after adding a new directory"
21124msgstr "添加一个新目录后,目录的状态信息未改变"
21125
ddc12c42 21126#: builtin/update-index.c:180
7aea43ff
JX
21127msgid "directory stat info changes after updating a file"
21128msgstr "更新一个文件后,目录的状态信息被修改"
21129
ddc12c42 21130#: builtin/update-index.c:191
7aea43ff
JX
21131msgid "directory stat info changes after adding a file inside subdirectory"
21132msgstr "在子目录中添加文件后,目录的状态信息被修改"
21133
ddc12c42 21134#: builtin/update-index.c:202
7aea43ff
JX
21135msgid "directory stat info does not change after deleting a file"
21136msgstr "删除一个文件后,目录的状态信息未改变"
21137
ddc12c42 21138#: builtin/update-index.c:215
7aea43ff
JX
21139msgid "directory stat info does not change after deleting a directory"
21140msgstr "删除一个目录后,目录的状态信息未改变"
21141
ddc12c42 21142#: builtin/update-index.c:222
7aea43ff
JX
21143msgid " OK"
21144msgstr " OK"
21145
ddc12c42 21146#: builtin/update-index.c:591
814ff314
JX
21147msgid "git update-index [<options>] [--] [<file>...]"
21148msgstr "git update-index [<选项>] [--] [<文件>...]"
8ada9598 21149
ddc12c42 21150#: builtin/update-index.c:974
ef317cd5 21151msgid "continue refresh even when index needs update"
07432cef 21152msgstr "当索引需要更新时继续刷新"
8ada9598 21153
ddc12c42 21154#: builtin/update-index.c:977
ef317cd5 21155msgid "refresh: ignore submodules"
07432cef 21156msgstr "刷新:忽略子模组"
8ada9598 21157
ddc12c42 21158#: builtin/update-index.c:980
ef317cd5 21159msgid "do not ignore new files"
07432cef 21160msgstr "不忽略新的文件"
8ada9598 21161
ddc12c42 21162#: builtin/update-index.c:982
ef317cd5 21163msgid "let files replace directories and vice-versa"
07432cef 21164msgstr "让文件替换目录(反之亦然)"
ef317cd5 21165
ddc12c42 21166#: builtin/update-index.c:984
ef317cd5 21167msgid "notice files missing from worktree"
07432cef 21168msgstr "通知文件从工作区丢失"
ef317cd5 21169
ddc12c42 21170#: builtin/update-index.c:986
ef317cd5 21171msgid "refresh even if index contains unmerged entries"
07432cef 21172msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 21173
ddc12c42 21174#: builtin/update-index.c:989
ef317cd5 21175msgid "refresh stat information"
07432cef 21176msgstr "刷新统计信息"
ef317cd5 21177
ddc12c42 21178#: builtin/update-index.c:993
ef317cd5 21179msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 21180msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 21181
ddc12c42 21182#: builtin/update-index.c:997
6c94aba5 21183msgid "<mode>,<object>,<path>"
d9d56b23 21184msgstr "<存取模式>,<对象>,<路径>"
ef317cd5 21185
ddc12c42 21186#: builtin/update-index.c:998
ef317cd5 21187msgid "add the specified entry to the index"
07432cef 21188msgstr "添加指定的条目到索引区"
ef317cd5 21189
ddc12c42 21190#: builtin/update-index.c:1008
ef317cd5 21191msgid "mark files as \"not changing\""
07432cef 21192msgstr "把文件标记为 \"没有变更\""
ef317cd5 21193
ddc12c42 21194#: builtin/update-index.c:1011
ef317cd5 21195msgid "clear assumed-unchanged bit"
07432cef 21196msgstr "清除 assumed-unchanged 位"
ef317cd5 21197
ddc12c42 21198#: builtin/update-index.c:1014
ef317cd5 21199msgid "mark files as \"index-only\""
07432cef 21200msgstr "把文件标记为 \"仅索引\""
ef317cd5 21201
ddc12c42 21202#: builtin/update-index.c:1017
ef317cd5 21203msgid "clear skip-worktree bit"
07432cef 21204msgstr "清除 skip-worktree 位"
ef317cd5 21205
ddc12c42
JX
21206#: builtin/update-index.c:1020
21207msgid "do not touch index-only entries"
21208msgstr "不要触碰仅索引条目"
21209
21210#: builtin/update-index.c:1022
ef317cd5 21211msgid "add to index only; do not add content to object database"
07432cef 21212msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 21213
ddc12c42 21214#: builtin/update-index.c:1024
ef317cd5 21215msgid "remove named paths even if present in worktree"
07432cef 21216msgstr "即使存在工作区里,也删除路径"
ef317cd5 21217
ddc12c42 21218#: builtin/update-index.c:1026
ef317cd5 21219msgid "with --stdin: input lines are terminated by null bytes"
07432cef 21220msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 21221
ddc12c42 21222#: builtin/update-index.c:1028
ef317cd5 21223msgid "read list of paths to be updated from standard input"
07432cef 21224msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 21225
ddc12c42 21226#: builtin/update-index.c:1032
ef317cd5 21227msgid "add entries from standard input to the index"
07432cef 21228msgstr "从标准输入添加条目到索引区"
ef317cd5 21229
ddc12c42 21230#: builtin/update-index.c:1036
ef317cd5 21231msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 21232msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 21233
ddc12c42 21234#: builtin/update-index.c:1040
ef317cd5 21235msgid "only update entries that differ from HEAD"
07432cef 21236msgstr "只更新与 HEAD 不同的条目"
ef317cd5 21237
ddc12c42 21238#: builtin/update-index.c:1044
ef317cd5 21239msgid "ignore files missing from worktree"
07432cef 21240msgstr "忽略工作区丢失的文件"
ef317cd5 21241
ddc12c42 21242#: builtin/update-index.c:1047
ef317cd5 21243msgid "report actions to standard output"
07432cef 21244msgstr "在标准输出显示操作"
ef317cd5 21245
ddc12c42 21246#: builtin/update-index.c:1049
ef317cd5 21247msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 21248msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 21249
ddc12c42 21250#: builtin/update-index.c:1053
ef317cd5 21251msgid "write index in this format"
07432cef 21252msgstr "以这种格式写入索引区"
ef317cd5 21253
ddc12c42 21254#: builtin/update-index.c:1055
6acbf033
JX
21255msgid "enable or disable split index"
21256msgstr "启用或禁用索引拆分"
21257
ddc12c42 21258#: builtin/update-index.c:1057
7aea43ff
JX
21259msgid "enable/disable untracked cache"
21260msgstr "启用/禁用对未跟踪文件的缓存"
21261
ddc12c42 21262#: builtin/update-index.c:1059
276ceeaa
JX
21263msgid "test if the filesystem supports untracked cache"
21264msgstr "测试文件系统是否支持未跟踪文件缓存"
21265
ddc12c42 21266#: builtin/update-index.c:1061
7aea43ff
JX
21267msgid "enable untracked cache without testing the filesystem"
21268msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
21269
ddc12c42 21270#: builtin/update-index.c:1063
5809aa05
JX
21271msgid "write out the index even if is not flagged as changed"
21272msgstr "即使没有被标记为已更改,也要写出索引"
21273
ddc12c42 21274#: builtin/update-index.c:1065
5809aa05
JX
21275msgid "enable or disable file system monitor"
21276msgstr "启用或禁用文件系统监控"
21277
ddc12c42 21278#: builtin/update-index.c:1067
5809aa05
JX
21279msgid "mark files as fsmonitor valid"
21280msgstr "标记文件为 fsmonitor 有效"
21281
ddc12c42 21282#: builtin/update-index.c:1070
5809aa05
JX
21283msgid "clear fsmonitor valid bit"
21284msgstr "清除 fsmonitor 有效位"
21285
ddc12c42 21286#: builtin/update-index.c:1173
87cb7997
JX
21287msgid ""
21288"core.splitIndex is set to false; remove or change it, if you really want to "
21289"enable split index"
21290msgstr ""
21291"core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。"
21292
ddc12c42 21293#: builtin/update-index.c:1182
87cb7997
JX
21294msgid ""
21295"core.splitIndex is set to true; remove or change it, if you really want to "
21296"disable split index"
21297msgstr ""
21298"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。"
21299
ddc12c42 21300#: builtin/update-index.c:1194
a0b6b246
JX
21301msgid ""
21302"core.untrackedCache is set to true; remove or change it, if you really want "
21303"to disable the untracked cache"
275588f9
JX
21304msgstr ""
21305"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
21306"改它。"
a0b6b246 21307
ddc12c42 21308#: builtin/update-index.c:1198
276ceeaa
JX
21309msgid "Untracked cache disabled"
21310msgstr "缓存未跟踪文件被禁用"
21311
ddc12c42 21312#: builtin/update-index.c:1206
a0b6b246
JX
21313msgid ""
21314"core.untrackedCache is set to false; remove or change it, if you really want "
21315"to enable the untracked cache"
275588f9
JX
21316msgstr ""
21317"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
21318"修改它。"
a0b6b246 21319
ddc12c42 21320#: builtin/update-index.c:1210
276ceeaa
JX
21321#, c-format
21322msgid "Untracked cache enabled for '%s'"
21323msgstr "缓存未跟踪文件在 '%s' 启用"
21324
ddc12c42 21325#: builtin/update-index.c:1218
5809aa05 21326msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
31e5e17b 21327msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项"
5809aa05 21328
ddc12c42 21329#: builtin/update-index.c:1222
5809aa05
JX
21330msgid "fsmonitor enabled"
21331msgstr "fsmonitor 被启用"
21332
ddc12c42 21333#: builtin/update-index.c:1225
5809aa05
JX
21334msgid ""
21335"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
31e5e17b 21336msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项"
5809aa05 21337
ddc12c42 21338#: builtin/update-index.c:1229
5809aa05
JX
21339msgid "fsmonitor disabled"
21340msgstr "fsmonitor 被禁用"
21341
a4f16749 21342#: builtin/update-ref.c:10
814ff314
JX
21343msgid "git update-ref [<options>] -d <refname> [<old-val>]"
21344msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
ef317cd5 21345
a4f16749 21346#: builtin/update-ref.c:11
814ff314
JX
21347msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
21348msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
90314792 21349
a4f16749 21350#: builtin/update-ref.c:12
814ff314
JX
21351msgid "git update-ref [<options>] --stdin [-z]"
21352msgstr "git update-ref [<选项>] --stdin [-z]"
ef317cd5 21353
c1ac5258 21354#: builtin/update-ref.c:364
ef317cd5 21355msgid "delete the reference"
07432cef 21356msgstr "删除引用"
ef317cd5 21357
c1ac5258 21358#: builtin/update-ref.c:366
ef317cd5 21359msgid "update <refname> not the one it points to"
07432cef 21360msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 21361
c1ac5258 21362#: builtin/update-ref.c:367
90314792
JX
21363msgid "stdin has NUL-terminated arguments"
21364msgstr "标准输入有以 NUL 字符终止的参数"
21365
c1ac5258 21366#: builtin/update-ref.c:368
90314792
JX
21367msgid "read updates from stdin"
21368msgstr "从标准输入读取更新"
21369
a4f16749 21370#: builtin/update-server-info.c:7
ef317cd5 21371msgid "git update-server-info [--force]"
07432cef 21372msgstr "git update-server-info [--force]"
ef317cd5 21373
a4f16749 21374#: builtin/update-server-info.c:15
ef317cd5 21375msgid "update the info files from scratch"
07432cef 21376msgstr "从头开始更新文件信息"
ef317cd5 21377
fd8cb379
JX
21378#: builtin/upload-pack.c:11
21379msgid "git upload-pack [<options>] <dir>"
21380msgstr "git upload-pack [<选项>] <目录>"
21381
d46c5519
JX
21382#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
21383msgid "quit after a single request/response exchange"
21384msgstr "在一次单独的请求/响应之后退出"
21385
fd8cb379
JX
21386#: builtin/upload-pack.c:25
21387msgid "exit immediately after initial ref advertisement"
21388msgstr "在初始的引用广告后立即退出"
21389
21390#: builtin/upload-pack.c:27
21391msgid "do not try <directory>/.git/ if <directory> is no Git directory"
21392msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/"
21393
21394#: builtin/upload-pack.c:29
21395msgid "interrupt transfer after <n> seconds of inactivity"
21396msgstr "不活动 <n> 秒钟后终止传输"
21397
a6cd2cc4 21398#: builtin/verify-commit.c:19
814ff314
JX
21399msgid "git verify-commit [-v | --verbose] <commit>..."
21400msgstr "git verify-commit [-v | --verbose] <提交>..."
6acbf033 21401
a6cd2cc4 21402#: builtin/verify-commit.c:68
6acbf033
JX
21403msgid "print commit contents"
21404msgstr "打印提交内容"
21405
a6cd2cc4 21406#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
1b7f4a34
JX
21407msgid "print raw gpg status output"
21408msgstr "打印原始 gpg 状态输出"
21409
a4f16749 21410#: builtin/verify-pack.c:55
814ff314
JX
21411msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
21412msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
ef317cd5 21413
a4f16749 21414#: builtin/verify-pack.c:65
ef317cd5
JX
21415msgid "verbose"
21416msgstr "冗长输出"
21417
a4f16749 21418#: builtin/verify-pack.c:67
ef317cd5 21419msgid "show statistics only"
07432cef 21420msgstr "只显示统计"
ef317cd5 21421
a6cd2cc4 21422#: builtin/verify-tag.c:18
1a79b2f1
JX
21423msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
21424msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
ef317cd5 21425
a6cd2cc4 21426#: builtin/verify-tag.c:36
ef317cd5 21427msgid "print tag contents"
55a16ee4 21428msgstr "打印标签内容"
ef317cd5 21429
a5cd71ca 21430#: builtin/worktree.c:17
31e5e17b
JX
21431msgid "git worktree add [<options>] <path> [<commit-ish>]"
21432msgstr "git worktree add [<选项>] <路径> [<提交>]"
5bb01d4f 21433
a5cd71ca 21434#: builtin/worktree.c:18
5c57d762
JX
21435msgid "git worktree list [<options>]"
21436msgstr "git worktree list [<选项>]"
21437
a5cd71ca 21438#: builtin/worktree.c:19
5c57d762
JX
21439msgid "git worktree lock [<options>] <path>"
21440msgstr "git worktree lock [<选项>] <路径>"
21441
a5cd71ca 21442#: builtin/worktree.c:20
31e5e17b
JX
21443msgid "git worktree move <worktree> <new-path>"
21444msgstr "git worktree move <工作区> <新路径>"
21445
a5cd71ca 21446#: builtin/worktree.c:21
5bb01d4f
JX
21447msgid "git worktree prune [<options>]"
21448msgstr "git worktree prune [<选项>]"
21449
a5cd71ca 21450#: builtin/worktree.c:22
31e5e17b
JX
21451msgid "git worktree remove [<options>] <worktree>"
21452msgstr "git worktree remove [<选项>] <工作区>"
21453
a5cd71ca 21454#: builtin/worktree.c:23
5c57d762
JX
21455msgid "git worktree unlock <path>"
21456msgstr "git worktree unlock <路径>"
94550ed3 21457
2b472aae 21458#: builtin/worktree.c:60 builtin/worktree.c:891
4c27fcb5
JX
21459#, c-format
21460msgid "failed to delete '%s'"
21461msgstr "删除 '%s' 失败"
21462
a5cd71ca 21463#: builtin/worktree.c:79
5bb01d4f
JX
21464#, c-format
21465msgid "Removing worktrees/%s: not a valid directory"
21466msgstr "删除工作区/%s:不是一个有效的目录"
21467
a5cd71ca 21468#: builtin/worktree.c:85
5bb01d4f
JX
21469#, c-format
21470msgid "Removing worktrees/%s: gitdir file does not exist"
21471msgstr "删除 worktrees/%s:gitdir 文件不存在"
21472
a5cd71ca 21473#: builtin/worktree.c:90 builtin/worktree.c:99
5bb01d4f
JX
21474#, c-format
21475msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
21476msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
21477
a5cd71ca 21478#: builtin/worktree.c:109
6937cb4e
JX
21479#, c-format
21480msgid ""
21481"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
21482"%<PRIuMAX>)"
21483msgstr "删除工作树/%s:读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)"
21484
a5cd71ca 21485#: builtin/worktree.c:117
5bb01d4f
JX
21486#, c-format
21487msgid "Removing worktrees/%s: invalid gitdir file"
21488msgstr "删除 worktrees/%s:无效的 gitdir 文件"
21489
a5cd71ca 21490#: builtin/worktree.c:126
5bb01d4f
JX
21491#, c-format
21492msgid "Removing worktrees/%s: gitdir file points to non-existent location"
21493msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
21494
a5cd71ca 21495#: builtin/worktree.c:165
1a79b2f1
JX
21496msgid "report pruned working trees"
21497msgstr "报告清除的工作区"
21498
a5cd71ca 21499#: builtin/worktree.c:167
1a79b2f1 21500msgid "expire working trees older than <time>"
58b6f078 21501msgstr "将早于 <时间> 的工作区过期"
1a79b2f1 21502
a5cd71ca 21503#: builtin/worktree.c:234
5bb01d4f
JX
21504#, c-format
21505msgid "'%s' already exists"
21506msgstr "'%s' 已经存在"
21507
2b472aae 21508#: builtin/worktree.c:244
4c27fcb5
JX
21509#, c-format
21510msgid "unable to re-add worktree '%s'"
21511msgstr "无法再次添加工作区 '%s'"
21512
2b472aae 21513#: builtin/worktree.c:249
4c27fcb5
JX
21514#, c-format
21515msgid ""
21516"'%s' is a missing but locked worktree;\n"
21517"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
21518msgstr ""
21519"'%s' 是一个丢失但锁定的工作区,使用\n"
21520"'add -f -f' 覆盖,或 'unlock' 和 'prune' 或 'remove' 清除"
21521
2b472aae 21522#: builtin/worktree.c:251
4c27fcb5
JX
21523#, c-format
21524msgid ""
21525"'%s' is a missing but already registered worktree;\n"
21526"use 'add -f' to override, or 'prune' or 'remove' to clear"
21527msgstr ""
21528"'%s' 是一个丢失但已经注册的工作区,使用\n"
21529"'add -f' 覆盖,或 'prune' 或 'remove' 清除"
21530
2b472aae 21531#: builtin/worktree.c:301
5bb01d4f
JX
21532#, c-format
21533msgid "could not create directory of '%s'"
21534msgstr "不能创建目录 '%s'"
21535
2b472aae 21536#: builtin/worktree.c:432 builtin/worktree.c:438
fd8cb379
JX
21537#, c-format
21538msgid "Preparing worktree (new branch '%s')"
21539msgstr "准备工作区(新分支 '%s')"
21540
2b472aae 21541#: builtin/worktree.c:434
fd8cb379
JX
21542#, c-format
21543msgid "Preparing worktree (resetting branch '%s'; was at %s)"
21544msgstr "准备工作区(重置分支 '%s',之前为 %s)"
21545
2b472aae 21546#: builtin/worktree.c:443
fd8cb379
JX
21547#, c-format
21548msgid "Preparing worktree (checking out '%s')"
21549msgstr "准备工作区(检出 '%s')"
21550
2b472aae 21551#: builtin/worktree.c:449
5bb01d4f 21552#, c-format
fd8cb379
JX
21553msgid "Preparing worktree (detached HEAD %s)"
21554msgstr "准备工作区(分离头指针 %s)"
5bb01d4f 21555
2b472aae 21556#: builtin/worktree.c:490
5bb01d4f 21557msgid "checkout <branch> even if already checked out in other worktree"
58b6f078 21558msgstr "检出 <分支>,即使已经被检出到其它工作区"
5bb01d4f 21559
2b472aae 21560#: builtin/worktree.c:493
5bb01d4f
JX
21561msgid "create a new branch"
21562msgstr "创建一个新分支"
21563
2b472aae 21564#: builtin/worktree.c:495
5bb01d4f
JX
21565msgid "create or reset a branch"
21566msgstr "创建或重置一个分支"
21567
2b472aae 21568#: builtin/worktree.c:497
5b04ee3b
JX
21569msgid "populate the new working tree"
21570msgstr "生成新的工作区"
21571
2b472aae 21572#: builtin/worktree.c:498
60638e98
JX
21573msgid "keep the new working tree locked"
21574msgstr "锁定新工作区"
21575
2b472aae 21576#: builtin/worktree.c:501
5809aa05
JX
21577msgid "set up tracking mode (see git-branch(1))"
21578msgstr "设置跟踪模式(参见 git-branch(1))"
21579
2b472aae 21580#: builtin/worktree.c:504
5809aa05
JX
21581msgid "try to match the new branch name with a remote-tracking branch"
21582msgstr "尝试为新分支名匹配一个远程跟踪分支"
21583
2b472aae 21584#: builtin/worktree.c:512
1b7f4a34
JX
21585msgid "-b, -B, and --detach are mutually exclusive"
21586msgstr "-b、-B 和 --detach 是互斥的"
5bb01d4f 21587
2b472aae 21588#: builtin/worktree.c:573
5809aa05
JX
21589msgid "--[no-]track can only be used if a new branch is created"
21590msgstr "只能在创建新分支时使用选项 --[no-]track "
21591
2b472aae 21592#: builtin/worktree.c:673
5c57d762
JX
21593msgid "reason for locking"
21594msgstr "锁定原因"
21595
2b472aae
JX
21596#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
21597#: builtin/worktree.c:919
5c57d762
JX
21598#, c-format
21599msgid "'%s' is not a working tree"
21600msgstr "'%s' 不是一个工作区"
21601
2b472aae 21602#: builtin/worktree.c:687 builtin/worktree.c:720
5c57d762
JX
21603msgid "The main working tree cannot be locked or unlocked"
21604msgstr "主工作区无法被加锁或解锁"
21605
2b472aae 21606#: builtin/worktree.c:692
5c57d762
JX
21607#, c-format
21608msgid "'%s' is already locked, reason: %s"
21609msgstr "'%s' 已被锁定,原因:%s"
21610
2b472aae 21611#: builtin/worktree.c:694
5c57d762
JX
21612#, c-format
21613msgid "'%s' is already locked"
21614msgstr "'%s' 已被锁定"
21615
2b472aae 21616#: builtin/worktree.c:722
5c57d762
JX
21617#, c-format
21618msgid "'%s' is not locked"
21619msgstr "'%s' 未被锁定"
21620
2b472aae 21621#: builtin/worktree.c:763
31e5e17b 21622msgid "working trees containing submodules cannot be moved or removed"
610f8099 21623msgstr "不能移动或删除包含子模组的工作区"
31e5e17b 21624
2b472aae 21625#: builtin/worktree.c:771
4c27fcb5
JX
21626msgid "force move even if worktree is dirty or locked"
21627msgstr "强制移动,即使工作区是脏的或已锁定"
21628
2b472aae 21629#: builtin/worktree.c:794 builtin/worktree.c:921
31e5e17b
JX
21630#, c-format
21631msgid "'%s' is a main working tree"
21632msgstr "'%s' 是一个主工作区"
21633
2b472aae 21634#: builtin/worktree.c:799
31e5e17b
JX
21635#, c-format
21636msgid "could not figure out destination name from '%s'"
21637msgstr "无法从 '%s' 算出目标名称"
21638
2b472aae 21639#: builtin/worktree.c:805
31e5e17b
JX
21640#, c-format
21641msgid "target '%s' already exists"
21642msgstr "目标 '%s' 已存在"
21643
2b472aae 21644#: builtin/worktree.c:813
31e5e17b 21645#, c-format
4c27fcb5
JX
21646msgid ""
21647"cannot move a locked working tree, lock reason: %s\n"
21648"use 'move -f -f' to override or unlock first"
21649msgstr ""
21650"无法移动一个锁定的工作区,锁定原因:%s\n"
21651"使用 'move -f -f' 覆盖或先解锁"
31e5e17b 21652
2b472aae 21653#: builtin/worktree.c:815
4c27fcb5
JX
21654msgid ""
21655"cannot move a locked working tree;\n"
21656"use 'move -f -f' to override or unlock first"
21657msgstr ""
21658"无法移动一个锁定的工作区,\n"
21659"使用 'move -f -f' 覆盖或先解锁"
31e5e17b 21660
2b472aae 21661#: builtin/worktree.c:818
31e5e17b
JX
21662#, c-format
21663msgid "validation failed, cannot move working tree: %s"
21664msgstr "验证失败,无法移动工作区:%s"
21665
2b472aae 21666#: builtin/worktree.c:823
31e5e17b
JX
21667#, c-format
21668msgid "failed to move '%s' to '%s'"
c1ac5258 21669msgstr "移动 '%s' 到 '%s' 失败"
31e5e17b 21670
2b472aae 21671#: builtin/worktree.c:871
31e5e17b
JX
21672#, c-format
21673msgid "failed to run 'git status' on '%s'"
c1ac5258 21674msgstr "在 '%s' 中执行 'git status' 失败"
31e5e17b 21675
2b472aae 21676#: builtin/worktree.c:875
31e5e17b 21677#, c-format
a5cd71ca
JX
21678msgid "'%s' contains modified or untracked files, use --force to delete it"
21679msgstr "'%s' 包含修改或未跟踪的文件,使用 --force 删除"
31e5e17b 21680
2b472aae 21681#: builtin/worktree.c:880
31e5e17b
JX
21682#, c-format
21683msgid "failed to run 'git status' on '%s', code %d"
c1ac5258 21684msgstr "在 '%s' 中执行 'git status' 失败,退出码 %d"
31e5e17b 21685
2b472aae 21686#: builtin/worktree.c:903
4c27fcb5
JX
21687msgid "force removal even if worktree is dirty or locked"
21688msgstr "强制删除,即使工作区是脏的或已锁定"
31e5e17b 21689
2b472aae 21690#: builtin/worktree.c:926
31e5e17b 21691#, c-format
4c27fcb5
JX
21692msgid ""
21693"cannot remove a locked working tree, lock reason: %s\n"
21694"use 'remove -f -f' to override or unlock first"
21695msgstr ""
21696"无法删除一个锁定的工作区,锁定原因:%s\n"
21697"使用 'remove -f -f' 覆盖或先解锁"
31e5e17b 21698
2b472aae 21699#: builtin/worktree.c:928
4c27fcb5
JX
21700msgid ""
21701"cannot remove a locked working tree;\n"
21702"use 'remove -f -f' to override or unlock first"
21703msgstr ""
21704"无法删除一个锁定的工作区,\n"
21705"使用 'remove -f -f' 覆盖或先解锁"
31e5e17b 21706
2b472aae 21707#: builtin/worktree.c:931
31e5e17b
JX
21708#, c-format
21709msgid "validation failed, cannot remove working tree: %s"
21710msgstr "验证失败,无法删除工作区:%s"
21711
06991777 21712#: builtin/write-tree.c:15
ef317cd5 21713msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 21714msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5 21715
06991777 21716#: builtin/write-tree.c:28
ef317cd5 21717msgid "<prefix>/"
07432cef 21718msgstr "<前缀>/"
ef317cd5 21719
06991777 21720#: builtin/write-tree.c:29
ef317cd5 21721msgid "write tree object for a subdirectory <prefix>"
07432cef 21722msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5 21723
06991777 21724#: builtin/write-tree.c:31
ef317cd5 21725msgid "only useful for debugging"
07432cef 21726msgstr "只对调试有用"
ef317cd5 21727
ddc12c42 21728#: fast-import.c:3125
a5cd71ca
JX
21729#, c-format
21730msgid "Expected 'mark' command, got %s"
21731msgstr "预期 'mark' 命令,得到 %s"
21732
ddc12c42 21733#: fast-import.c:3130
a5cd71ca
JX
21734#, c-format
21735msgid "Expected 'to' command, got %s"
21736msgstr "预期 'to' 命令,得到 %s"
21737
ddc12c42
JX
21738#: fast-import.c:3254
21739#, c-format
21740msgid "feature '%s' forbidden in input without --allow-unsafe-features"
21741msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'"
21742
06991777 21743#: credential-cache--daemon.c:223
a0b6b246
JX
21744#, c-format
21745msgid ""
21746"The permissions on your socket directory are too loose; other\n"
21747"users may be able to read your cached credentials. Consider running:\n"
21748"\n"
21749"\tchmod 0700 %s"
21750msgstr ""
1a79b2f1
JX
21751"您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
21752"行:\n"
a0b6b246
JX
21753"\n"
21754"\tchmod 0700 %s"
21755
06991777 21756#: credential-cache--daemon.c:272
220c313c
JX
21757msgid "print debugging messages to stderr"
21758msgstr "调试信息输出到标准错误"
21759
4c27fcb5
JX
21760#: t/helper/test-reach.c:152
21761#, c-format
21762msgid "commit %s is not marked reachable"
21763msgstr "提交 %s 没有标记为可达"
21764
21765#: t/helper/test-reach.c:162
21766msgid "too many commits marked reachable"
21767msgstr "太多提交标记为可达"
21768
d46c5519
JX
21769#: t/helper/test-serve-v2.c:7
21770msgid "test-tool serve-v2 [<options>]"
21771msgstr "test-tool serve-v2 [<选项>]"
21772
21773#: t/helper/test-serve-v2.c:19
21774msgid "exit immediately after advertising capabilities"
21775msgstr "对能力广告之后立即退出"
21776
fd8cb379 21777#: git.c:27
31e5e17b
JX
21778msgid ""
21779"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
21780" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
fd8cb379
JX
21781" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
21782"bare]\n"
31e5e17b
JX
21783" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
21784" <command> [<args>]"
21785msgstr ""
fd8cb379 21786"git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n"
31e5e17b 21787" [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
fd8cb379
JX
21788" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
21789"bare]\n"
31e5e17b
JX
21790" [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
21791" <命令> [<参数>]"
21792
fd8cb379 21793#: git.c:34
4dcdc3d8 21794msgid ""
220c313c 21795"'git help -a' and 'git help -g' list available subcommands and some\n"
4dcdc3d8 21796"concept guides. See 'git help <command>' or 'git help <concept>'\n"
a6cd2cc4
JX
21797"to read about a specific subcommand or concept.\n"
21798"See 'git help git' for an overview of the system."
4dcdc3d8 21799msgstr ""
220c313c
JX
21800"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
21801"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
a6cd2cc4
JX
21802"帮助。\n"
21803"有关系统的概述,查看 'git help git'。"
8ada9598 21804
a6cd2cc4 21805#: git.c:186
31e5e17b
JX
21806#, c-format
21807msgid "no directory given for --git-dir\n"
21808msgstr "没有为 --git-dir 提供目录\n"
21809
a6cd2cc4 21810#: git.c:200
31e5e17b
JX
21811#, c-format
21812msgid "no namespace given for --namespace\n"
21813msgstr "没有为 --namespace 提供命名空间\n"
21814
a6cd2cc4 21815#: git.c:214
31e5e17b
JX
21816#, c-format
21817msgid "no directory given for --work-tree\n"
21818msgstr "没有为 --work-tree 提供目录\n"
21819
a6cd2cc4 21820#: git.c:228
31e5e17b
JX
21821#, c-format
21822msgid "no prefix given for --super-prefix\n"
21823msgstr "没有为 --super-prefix 提供前缀\n"
21824
a6cd2cc4 21825#: git.c:250
31e5e17b
JX
21826#, c-format
21827msgid "-c expects a configuration string\n"
21828msgstr "应为 -c 提供一个配置字符串\n"
21829
a6cd2cc4 21830#: git.c:288
31e5e17b
JX
21831#, c-format
21832msgid "no directory given for -C\n"
21833msgstr "没有为 -C 提供目录\n"
21834
a6cd2cc4 21835#: git.c:314
31e5e17b
JX
21836#, c-format
21837msgid "unknown option: %s\n"
21838msgstr "未知选项:%s\n"
21839
a6cd2cc4 21840#: git.c:360
06991777
JX
21841#, c-format
21842msgid "while expanding alias '%s': '%s'"
5b533632 21843msgstr "在扩展别名 '%s' 时:'%s'"
06991777 21844
a6cd2cc4 21845#: git.c:369
06991777
JX
21846#, c-format
21847msgid ""
21848"alias '%s' changes environment variables.\n"
21849"You can use '!git' in the alias to do this"
21850msgstr ""
21851"别名 '%s' 修改环境变量。您可以使用在别名中\n"
21852"使用 '!git'"
21853
a5cd71ca 21854#: git.c:376
06991777
JX
21855#, c-format
21856msgid "empty alias for %s"
21857msgstr "%s 的空别名"
21858
a5cd71ca 21859#: git.c:379
06991777
JX
21860#, c-format
21861msgid "recursive alias: %s"
5b533632 21862msgstr "递归的别名:%s"
06991777 21863
a5cd71ca 21864#: git.c:459
06991777
JX
21865msgid "write failure on standard output"
21866msgstr "在标准输出写入失败"
21867
a5cd71ca 21868#: git.c:461
06991777
JX
21869msgid "unknown write failure on standard output"
21870msgstr "到标准输出的未知写入错误"
21871
a5cd71ca 21872#: git.c:463
06991777
JX
21873msgid "close failed on standard output"
21874msgstr "标准输出关闭失败"
21875
ddc12c42 21876#: git.c:793
4c27fcb5
JX
21877#, c-format
21878msgid "alias loop detected: expansion of '%s' does not terminate:%s"
21879msgstr "检测到别名循环:'%s'的扩展未终止:%s"
21880
ddc12c42 21881#: git.c:843
06991777
JX
21882#, c-format
21883msgid "cannot handle %s as a builtin"
21884msgstr "不能作为内置命令处理 %s"
21885
ddc12c42 21886#: git.c:856
06991777
JX
21887#, c-format
21888msgid ""
21889"usage: %s\n"
21890"\n"
21891msgstr ""
21892"用法:%s\n"
21893"\n"
21894
ddc12c42 21895#: git.c:876
31e5e17b
JX
21896#, c-format
21897msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
21898msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n"
21899
ddc12c42 21900#: git.c:888
31e5e17b
JX
21901#, c-format
21902msgid "failed to run command '%s': %s\n"
c1ac5258 21903msgstr "运行命令 '%s' 失败:%s\n"
31e5e17b 21904
06991777 21905#: http.c:378
60638e98
JX
21906#, c-format
21907msgid "negative value for http.postbuffer; defaulting to %d"
21908msgstr "http.postbuffer 为负值,默认为 %d"
21909
06991777 21910#: http.c:399
a0b6b246 21911msgid "Delegation control is not supported with cURL < 7.22.0"
4c27fcb5 21912msgstr "不支持委托控制,因为 cURL < 7.22.0"
a0b6b246 21913
06991777 21914#: http.c:408
276ceeaa
JX
21915msgid "Public key pinning not supported with cURL < 7.44.0"
21916msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
21917
ddc12c42 21918#: http.c:876
4c27fcb5
JX
21919msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
21920msgstr "不支持 CURLSSLOPT_NO_REVOKE,因为 cURL < 7.44.0"
21921
ddc12c42 21922#: http.c:949
4c27fcb5
JX
21923msgid "Protocol restrictions not supported with cURL < 7.19.4"
21924msgstr "不支持协议限制,因为 cURL < 7.19.4"
21925
ddc12c42 21926#: http.c:1086
4c27fcb5
JX
21927#, c-format
21928msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
21929msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端:"
21930
ddc12c42 21931#: http.c:1093
4c27fcb5
JX
21932#, c-format
21933msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
21934msgstr "无法设置 SSL 后端为 '%s':cURL: cURL 没有使用 SSL 后端构建"
21935
ddc12c42 21936#: http.c:1097
4c27fcb5
JX
21937#, c-format
21938msgid "Could not set SSL backend to '%s': already set"
21939msgstr "无法将 SSL 后端设置为 '%s':已经设置"
21940
ddc12c42 21941#: http.c:1966
1a79b2f1
JX
21942#, c-format
21943msgid ""
21944"unable to update url base from redirection:\n"
21945" asked for: %s\n"
21946" redirect: %s"
21947msgstr ""
21948"不能更新重定向的 url base:\n"
21949" 请求:%s\n"
21950" 重定向:%s"
21951
a5cd71ca 21952#: remote-curl.c:166
d46c5519
JX
21953#, c-format
21954msgid "invalid quoting in push-option value: '%s'"
5b533632 21955msgstr "在 push-option 取值中无效的引号:'%s'"
d46c5519 21956
a5cd71ca 21957#: remote-curl.c:263
d46c5519
JX
21958#, c-format
21959msgid "%sinfo/refs not valid: is this a git repository?"
21960msgstr "%sinfo/refs 无效:这是一个 git 仓库么?"
21961
a5cd71ca 21962#: remote-curl.c:364
d46c5519
JX
21963msgid "invalid server response; expected service, got flush packet"
21964msgstr "无效的服务端响应。预期服务,得到 flush 包"
21965
a5cd71ca 21966#: remote-curl.c:395
d46c5519
JX
21967#, c-format
21968msgid "invalid server response; got '%s'"
21969msgstr "无效的服务端响应,得到 '%s'"
21970
a5cd71ca 21971#: remote-curl.c:455
d46c5519
JX
21972#, c-format
21973msgid "repository '%s' not found"
21974msgstr "仓库 '%s' 未找到"
21975
a5cd71ca 21976#: remote-curl.c:459
d46c5519
JX
21977#, c-format
21978msgid "Authentication failed for '%s'"
21979msgstr "'%s' 鉴权失败"
21980
a5cd71ca 21981#: remote-curl.c:463
d46c5519
JX
21982#, c-format
21983msgid "unable to access '%s': %s"
21984msgstr "无法访问 '%s':%s"
21985
a5cd71ca 21986#: remote-curl.c:469
1a79b2f1
JX
21987#, c-format
21988msgid "redirecting to %s"
21989msgstr "重定向到 %s"
21990
a5cd71ca 21991#: remote-curl.c:593
d46c5519 21992msgid "shouldn't have EOF when not gentle on EOF"
5b533632 21993msgstr "当没有设置温和处理文件结束符(EOF)时,不应该有文件结束符"
d46c5519 21994
a5cd71ca 21995#: remote-curl.c:673
d46c5519
JX
21996msgid "unable to rewind rpc post data - try increasing http.postBuffer"
21997msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
21998
a5cd71ca 21999#: remote-curl.c:733
d46c5519
JX
22000#, c-format
22001msgid "RPC failed; %s"
22002msgstr "RPC 失败。%s"
22003
a5cd71ca 22004#: remote-curl.c:773
d46c5519
JX
22005msgid "cannot handle pushes this big"
22006msgstr "不能处理这么大的推送"
22007
a5cd71ca 22008#: remote-curl.c:888
d46c5519
JX
22009#, c-format
22010msgid "cannot deflate request; zlib deflate error %d"
22011msgstr "不能压缩请求,zlib 压缩错误 %d"
22012
a5cd71ca 22013#: remote-curl.c:892
d46c5519
JX
22014#, c-format
22015msgid "cannot deflate request; zlib end error %d"
22016msgstr "不能压缩请求,zlib 结束错误 %d"
22017
a5cd71ca 22018#: remote-curl.c:1023
d46c5519
JX
22019msgid "dumb http transport does not support shallow capabilities"
22020msgstr "哑 http 传输不支持 shalllow 能力"
22021
2b472aae 22022#: remote-curl.c:1038
d46c5519
JX
22023msgid "fetch failed."
22024msgstr "获取失败。"
22025
2b472aae 22026#: remote-curl.c:1086
d46c5519
JX
22027msgid "cannot fetch by sha1 over smart http"
22028msgstr "无法通过智能 HTTP 获取 sha1"
22029
2b472aae 22030#: remote-curl.c:1130 remote-curl.c:1136
d46c5519
JX
22031#, c-format
22032msgid "protocol error: expected sha/ref, got '%s'"
22033msgstr "协议错误:期望 sha/ref,却得到 '%s'"
22034
2b472aae 22035#: remote-curl.c:1148 remote-curl.c:1263
d46c5519
JX
22036#, c-format
22037msgid "http transport does not support %s"
22038msgstr "http 传输协议不支持 %s"
22039
2b472aae 22040#: remote-curl.c:1184
d46c5519
JX
22041msgid "git-http-push failed"
22042msgstr "git-http-push 失败"
22043
2b472aae 22044#: remote-curl.c:1369
d46c5519
JX
22045msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
22046msgstr "remote-curl:用法:git remote-curl <远程> [<url>]"
22047
2b472aae 22048#: remote-curl.c:1401
d46c5519
JX
22049msgid "remote-curl: error reading command stream from git"
22050msgstr "remote-curl:错误读取来自 git 的命令流"
22051
2b472aae 22052#: remote-curl.c:1408
d46c5519
JX
22053msgid "remote-curl: fetch attempted without a local repo"
22054msgstr "remote-curl:尝试没有本地仓库下获取"
22055
2b472aae 22056#: remote-curl.c:1448
d46c5519
JX
22057#, c-format
22058msgid "remote-curl: unknown command '%s' from git"
22059msgstr "remote-curl:未知的来自 git 的命令 '%s'"
22060
a5cd71ca 22061#: list-objects-filter-options.h:85
d46c5519
JX
22062msgid "args"
22063msgstr "参数"
22064
a5cd71ca 22065#: list-objects-filter-options.h:86
d46c5519
JX
22066msgid "object filtering"
22067msgstr "对象过滤"
22068
ddc12c42 22069#: parse-options.h:183
fd8cb379
JX
22070msgid "expiry-date"
22071msgstr "到期时间"
7aea43ff 22072
ddc12c42 22073#: parse-options.h:197
fd8cb379
JX
22074msgid "no-op (backward compatibility)"
22075msgstr "空操作(向后兼容)"
7aea43ff 22076
ddc12c42 22077#: parse-options.h:309
fd8cb379
JX
22078msgid "be more verbose"
22079msgstr "更加详细"
7aea43ff 22080
ddc12c42 22081#: parse-options.h:311
fd8cb379
JX
22082msgid "be more quiet"
22083msgstr "更加安静"
7aea43ff 22084
ddc12c42 22085#: parse-options.h:317
fd8cb379
JX
22086msgid "use <n> digits to display SHA-1s"
22087msgstr "用 <n> 位数字显示 SHA-1 哈希值"
7aea43ff 22088
ddc12c42 22089#: parse-options.h:336
d46c5519
JX
22090msgid "how to strip spaces and #comments from message"
22091msgstr "设置如何删除提交说明里的空格和#注释"
22092
ddc12c42
JX
22093#: parse-options.h:337
22094msgid "read pathspec from file"
22095msgstr "从文件读取路径表达式"
22096
22097#: parse-options.h:338
22098msgid ""
22099"with --pathspec-from-file, pathspec elements are separated with NUL character"
22100msgstr "使用 --pathspec-from-file,路径表达式用空字符分隔"
22101
d46c5519
JX
22102#: ref-filter.h:101
22103msgid "key"
22104msgstr "key"
22105
22106#: ref-filter.h:101
22107msgid "field name to sort on"
22108msgstr "排序的字段名"
22109
22110#: rerere.h:44
22111msgid "update the index with reused conflict resolution if possible"
22112msgstr "如果可能,重用冲突解决更新索引"
22113
a6cd2cc4
JX
22114#: wt-status.h:67
22115msgid "HEAD detached at "
22116msgstr "头指针分离于 "
22117
22118#: wt-status.h:68
22119msgid "HEAD detached from "
22120msgstr "头指针分离自 "
22121
fd8cb379 22122#: command-list.h:50
8ada9598 22123msgid "Add file contents to the index"
81809b99 22124msgstr "添加文件内容至索引"
8ada9598 22125
fd8cb379
JX
22126#: command-list.h:51
22127msgid "Apply a series of patches from a mailbox"
22128msgstr "应用邮箱格式的系列补丁"
22129
22130#: command-list.h:52
22131msgid "Annotate file lines with commit information"
22132msgstr "使用提交信息注释文件行"
22133
22134#: command-list.h:53
22135msgid "Apply a patch to files and/or to the index"
22136msgstr "应用一个补丁到文件和/或索引区"
22137
22138#: command-list.h:54
4c27fcb5
JX
22139msgid "Import a GNU Arch repository into Git"
22140msgstr "将一个 GNU Arch 仓库导入到 Git"
fd8cb379
JX
22141
22142#: command-list.h:55
22143msgid "Create an archive of files from a named tree"
22144msgstr "基于一个指定的树创建文件存档"
22145
22146#: command-list.h:56
1b7f4a34
JX
22147msgid "Use binary search to find the commit that introduced a bug"
22148msgstr "通过二分查找定位引入 bug 的提交"
8ada9598 22149
fd8cb379
JX
22150#: command-list.h:57
22151msgid "Show what revision and author last modified each line of a file"
22152msgstr "显示文件每一行最后修改的版本和修改者"
22153
22154#: command-list.h:58
8ada9598 22155msgid "List, create, or delete branches"
81809b99 22156msgstr "列出、创建或删除分支"
8ada9598 22157
fd8cb379
JX
22158#: command-list.h:59
22159msgid "Move objects and refs by archive"
22160msgstr "通过归档移动对象和引用"
22161
22162#: command-list.h:60
22163msgid "Provide content or type and size information for repository objects"
22164msgstr "提供仓库对象的内容、类型或大小"
22165
22166#: command-list.h:61
22167msgid "Display gitattributes information"
22168msgstr "显示 gitattributes 信息"
22169
22170#: command-list.h:62
22171msgid "Debug gitignore / exclude files"
22172msgstr "调试 gitignore / exclude 文件"
22173
22174#: command-list.h:63
22175msgid "Show canonical names and email addresses of contacts"
22176msgstr "显示联系人的规范名称和电子邮件"
22177
22178#: command-list.h:64
5bb01d4f
JX
22179msgid "Switch branches or restore working tree files"
22180msgstr "切换分支或恢复工作区文件"
8ada9598 22181
fd8cb379
JX
22182#: command-list.h:65
22183msgid "Copy files from the index to the working tree"
22184msgstr "从索引拷贝文件到工作区"
22185
22186#: command-list.h:66
22187msgid "Ensures that a reference name is well formed"
22188msgstr "确保引用名称格式正确"
22189
22190#: command-list.h:67
22191msgid "Find commits yet to be applied to upstream"
22192msgstr "查找尚未应用到上游的提交"
22193
22194#: command-list.h:68
22195msgid "Apply the changes introduced by some existing commits"
22196msgstr "应用一些现存提交引入的修改"
22197
22198#: command-list.h:69
22199msgid "Graphical alternative to git-commit"
22200msgstr "git-commit 的图形替代界面"
22201
22202#: command-list.h:70
22203msgid "Remove untracked files from the working tree"
22204msgstr "从工作区中删除未跟踪文件"
22205
22206#: command-list.h:71
8ada9598 22207msgid "Clone a repository into a new directory"
06991777 22208msgstr "克隆仓库到一个新目录"
8ada9598 22209
fd8cb379
JX
22210#: command-list.h:72
22211msgid "Display data in columns"
22212msgstr "以列的方式显示数据"
22213
22214#: command-list.h:73
8ada9598 22215msgid "Record changes to the repository"
160fb2b2 22216msgstr "记录变更到仓库"
8ada9598 22217
fd8cb379 22218#: command-list.h:74
4c27fcb5
JX
22219msgid "Write and verify Git commit-graph files"
22220msgstr "写入和校验 Git 提交图文件"
fd8cb379
JX
22221
22222#: command-list.h:75
22223msgid "Create a new commit object"
22224msgstr "创建一个新的提交对象"
22225
22226#: command-list.h:76
22227msgid "Get and set repository or global options"
22228msgstr "获取和设置仓库或者全局选项"
22229
22230#: command-list.h:77
22231msgid "Count unpacked number of objects and their disk consumption"
22232msgstr "计算未打包对象的数量和磁盘空间占用"
22233
22234#: command-list.h:78
22235msgid "Retrieve and store user credentials"
22236msgstr "检索和存储用户密码"
22237
22238#: command-list.h:79
22239msgid "Helper to temporarily store passwords in memory"
22240msgstr "在内存中临时存储密码的助手"
22241
22242#: command-list.h:80
22243msgid "Helper to store credentials on disk"
22244msgstr "在磁盘存储密码的助手"
22245
22246#: command-list.h:81
22247msgid "Export a single commit to a CVS checkout"
22248msgstr "将一个提交导出到 CVS 检出中"
22249
22250#: command-list.h:82
22251msgid "Salvage your data out of another SCM people love to hate"
22252msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据"
22253
22254#: command-list.h:83
22255msgid "A CVS server emulator for Git"
22256msgstr "Git 的一个 CVS 服务模拟器"
22257
22258#: command-list.h:84
22259msgid "A really simple server for Git repositories"
22260msgstr "一个非常简单的 Git 仓库服务器"
22261
22262#: command-list.h:85
22263msgid "Give an object a human readable name based on an available ref"
22264msgstr "基于一个现存的引用为一个对象起一个可读的名称"
22265
22266#: command-list.h:86
8ada9598 22267msgid "Show changes between commits, commit and working tree, etc"
81809b99 22268msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598 22269
fd8cb379
JX
22270#: command-list.h:87
22271msgid "Compares files in the working tree and the index"
22272msgstr "比较工作区和索引区中的文件"
22273
22274#: command-list.h:88
22275msgid "Compare a tree to the working tree or index"
22276msgstr "将一个树和工作区或索引做比较"
22277
22278#: command-list.h:89
22279msgid "Compares the content and mode of blobs found via two tree objects"
22280msgstr "比较两个树对象的文件内容和模式"
22281
22282#: command-list.h:90
22283msgid "Show changes using common diff tools"
22284msgstr "使用常见的差异工具显示更改"
22285
22286#: command-list.h:91
22287msgid "Git data exporter"
22288msgstr "Git 数据导出器"
22289
22290#: command-list.h:92
22291msgid "Backend for fast Git data importers"
22292msgstr "Git 快速数据导入器后端"
22293
22294#: command-list.h:93
8ada9598 22295msgid "Download objects and refs from another repository"
160fb2b2 22296msgstr "从另外一个仓库下载对象和引用"
8ada9598 22297
fd8cb379
JX
22298#: command-list.h:94
22299msgid "Receive missing objects from another repository"
22300msgstr "从另一个仓库获取缺失的对象"
22301
22302#: command-list.h:95
22303msgid "Rewrite branches"
22304msgstr "重写分支"
22305
22306#: command-list.h:96
22307msgid "Produce a merge commit message"
22308msgstr "生成一个合并提交信息"
22309
22310#: command-list.h:97
22311msgid "Output information on each ref"
22312msgstr "对每一个引用输出信息 "
22313
22314#: command-list.h:98
22315msgid "Prepare patches for e-mail submission"
22316msgstr "准备电子邮件提交的补丁"
22317
22318#: command-list.h:99
22319msgid "Verifies the connectivity and validity of the objects in the database"
22320msgstr "验证仓库中对象的连通性和有效性"
22321
22322#: command-list.h:100
22323msgid "Cleanup unnecessary files and optimize the local repository"
22324msgstr "清除不必要的文件和优化本地仓库"
22325
22326#: command-list.h:101
22327msgid "Extract commit ID from an archive created using git-archive"
5b533632 22328msgstr "从 git-archive 创建的归档文件中提取提交 ID"
fd8cb379
JX
22329
22330#: command-list.h:102
8ada9598 22331msgid "Print lines matching a pattern"
81809b99 22332msgstr "输出和模式匹配的行"
8ada9598 22333
fd8cb379
JX
22334#: command-list.h:103
22335msgid "A portable graphical interface to Git"
22336msgstr "一个便携的 Git 图形客户端"
22337
22338#: command-list.h:104
22339msgid "Compute object ID and optionally creates a blob from a file"
5b533632 22340msgstr "从一个文件计算对象 ID,并可以创建 blob 数据对象"
fd8cb379
JX
22341
22342#: command-list.h:105
22343msgid "Display help information about Git"
22344msgstr "显示 Git 的帮助信息"
22345
22346#: command-list.h:106
22347msgid "Server side implementation of Git over HTTP"
22348msgstr "Git HTTP 协议的服务端实现"
22349
22350#: command-list.h:107
22351msgid "Download from a remote Git repository via HTTP"
22352msgstr "通过 HTTP 从远程 Git 仓库下载"
22353
22354#: command-list.h:108
22355msgid "Push objects over HTTP/DAV to another repository"
22356msgstr "通过 HTTP/DAV 推送对象另一个仓库"
22357
22358#: command-list.h:109
22359msgid "Send a collection of patches from stdin to an IMAP folder"
22360msgstr "从标准输入将一组补丁发送到IMAP文件夹"
22361
22362#: command-list.h:110
22363msgid "Build pack index file for an existing packed archive"
22364msgstr "从一个现存的包存档文件创建包索引"
22365
22366#: command-list.h:111
a77c07d9 22367msgid "Create an empty Git repository or reinitialize an existing one"
160fb2b2 22368msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
8ada9598 22369
fd8cb379
JX
22370#: command-list.h:112
22371msgid "Instantly browse your working repository in gitweb"
22372msgstr "在 gitweb 中即时浏览您的工作仓库"
22373
22374#: command-list.h:113
d46c5519 22375msgid "Add or parse structured information in commit messages"
fd8cb379
JX
22376msgstr "添加或解析提交说明中的结构化信息"
22377
22378#: command-list.h:114
22379msgid "The Git repository browser"
22380msgstr "Git 仓库浏览器"
22381
22382#: command-list.h:115
8ada9598 22383msgid "Show commit logs"
81809b99 22384msgstr "显示提交日志"
8ada9598 22385
fd8cb379
JX
22386#: command-list.h:116
22387msgid "Show information about files in the index and the working tree"
22388msgstr "显示索引和工作区中文件的信息"
22389
22390#: command-list.h:117
22391msgid "List references in a remote repository"
22392msgstr "显示一个远程仓库的引用"
22393
22394#: command-list.h:118
22395msgid "List the contents of a tree object"
22396msgstr "显示一个树对象的内容"
22397
22398#: command-list.h:119
22399msgid "Extracts patch and authorship from a single e-mail message"
22400msgstr "从单个电子邮件中提取补丁和作者身份"
22401
22402#: command-list.h:120
22403msgid "Simple UNIX mbox splitter program"
22404msgstr "简单的 UNIX mbox 邮箱切分程序"
22405
22406#: command-list.h:121
8ada9598 22407msgid "Join two or more development histories together"
81809b99 22408msgstr "合并两个或更多开发历史"
8ada9598 22409
fd8cb379
JX
22410#: command-list.h:122
22411msgid "Find as good common ancestors as possible for a merge"
22412msgstr "为了合并查找尽可能好的公共祖先提交"
22413
22414#: command-list.h:123
22415msgid "Run a three-way file merge"
22416msgstr "运行一个三路文件合并"
22417
22418#: command-list.h:124
22419msgid "Run a merge for files needing merging"
22420msgstr "对于需要合并的文件执行合并"
22421
22422#: command-list.h:125
22423msgid "The standard helper program to use with git-merge-index"
22424msgstr "与 git-merge-index 一起使用的标准向导程序"
22425
22426#: command-list.h:126
22427msgid "Run merge conflict resolution tools to resolve merge conflicts"
22428msgstr "运行合并冲突解决工具以解决合并冲突"
22429
22430#: command-list.h:127
22431msgid "Show three-way merge without touching index"
22432msgstr "显示三路合并而不动索引"
22433
22434#: command-list.h:128
4c27fcb5
JX
22435msgid "Write and verify multi-pack-indexes"
22436msgstr "写入和校验多包索引"
22437
22438#: command-list.h:129
fd8cb379
JX
22439msgid "Creates a tag object"
22440msgstr "创建一个标签对象"
22441
4c27fcb5 22442#: command-list.h:130
fd8cb379
JX
22443msgid "Build a tree-object from ls-tree formatted text"
22444msgstr "基于 ls-tree 的格式化文本创建一个树对象"
22445
4c27fcb5 22446#: command-list.h:131
8ada9598 22447msgid "Move or rename a file, a directory, or a symlink"
81809b99 22448msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598 22449
fd8cb379 22450# 查找给定版本的符号名称
4c27fcb5 22451#: command-list.h:132
fd8cb379
JX
22452msgid "Find symbolic names for given revs"
22453msgstr "查找给定版本的符号名称"
22454
4c27fcb5 22455#: command-list.h:133
fd8cb379
JX
22456msgid "Add or inspect object notes"
22457msgstr "添加或检查对象注释"
22458
4c27fcb5 22459#: command-list.h:134
fd8cb379
JX
22460msgid "Import from and submit to Perforce repositories"
22461msgstr "导入和提交到 Perforce 仓库中"
22462
4c27fcb5 22463#: command-list.h:135
fd8cb379
JX
22464msgid "Create a packed archive of objects"
22465msgstr "创建对象的存档包"
22466
4c27fcb5 22467#: command-list.h:136
fd8cb379
JX
22468msgid "Find redundant pack files"
22469msgstr "查找冗余的包文件"
22470
4c27fcb5 22471#: command-list.h:137
fd8cb379
JX
22472msgid "Pack heads and tags for efficient repository access"
22473msgstr "打包头和标签以实现高效的仓库访问"
22474
4c27fcb5 22475#: command-list.h:138
fd8cb379
JX
22476msgid "Routines to help parsing remote repository access parameters"
22477msgstr "帮助解析远程仓库访问参数的例程"
22478
4c27fcb5 22479#: command-list.h:139
fd8cb379 22480msgid "Compute unique ID for a patch"
5b533632 22481msgstr "计算一个补丁的唯一 ID"
fd8cb379 22482
4c27fcb5 22483#: command-list.h:140
fd8cb379
JX
22484msgid "Prune all unreachable objects from the object database"
22485msgstr "删除对象库中所有不可达对象"
22486
4c27fcb5 22487#: command-list.h:141
fd8cb379
JX
22488msgid "Remove extra objects that are already in pack files"
22489msgstr "删除已经在包文件中的多余对象"
22490
4c27fcb5 22491#: command-list.h:142
2e8451e8 22492msgid "Fetch from and integrate with another repository or a local branch"
160fb2b2 22493msgstr "获取并整合另外的仓库或一个本地分支"
8ada9598 22494
4c27fcb5 22495#: command-list.h:143
8ada9598 22496msgid "Update remote refs along with associated objects"
81809b99 22497msgstr "更新远程引用和相关的对象"
8ada9598 22498
4c27fcb5 22499#: command-list.h:144
fd8cb379
JX
22500msgid "Applies a quilt patchset onto the current branch"
22501msgstr "将一个 quilt 补丁集应用到当前分支。"
22502
4c27fcb5 22503#: command-list.h:145
c1ac5258
JX
22504msgid "Compare two commit ranges (e.g. two versions of a branch)"
22505msgstr "比较两个提交范围(如一个分支的两个版本)"
22506
4c27fcb5 22507#: command-list.h:146
fd8cb379
JX
22508msgid "Reads tree information into the index"
22509msgstr "将树信息读取到索引"
22510
4c27fcb5 22511#: command-list.h:147
3495628d
JX
22512msgid "Reapply commits on top of another base tip"
22513msgstr "在另一个分支上重新应用提交"
8ada9598 22514
4c27fcb5 22515#: command-list.h:148
fd8cb379
JX
22516msgid "Receive what is pushed into the repository"
22517msgstr "接收推送到仓库中的对象"
22518
4c27fcb5 22519#: command-list.h:149
fd8cb379
JX
22520msgid "Manage reflog information"
22521msgstr "管理 reflog 信息"
22522
4c27fcb5 22523#: command-list.h:150
fd8cb379
JX
22524msgid "Manage set of tracked repositories"
22525msgstr "管理已跟踪仓库"
22526
4c27fcb5 22527#: command-list.h:151
fd8cb379
JX
22528msgid "Pack unpacked objects in a repository"
22529msgstr "打包仓库中未打包对象"
22530
4c27fcb5 22531#: command-list.h:152
fd8cb379
JX
22532msgid "Create, list, delete refs to replace objects"
22533msgstr "创建、列出、删除对象替换引用"
22534
4c27fcb5 22535#: command-list.h:153
fd8cb379
JX
22536msgid "Generates a summary of pending changes"
22537msgstr "生成待定更改的摘要"
22538
4c27fcb5 22539#: command-list.h:154
fd8cb379
JX
22540msgid "Reuse recorded resolution of conflicted merges"
22541msgstr "重用冲突合并的解决方案记录"
22542
4c27fcb5 22543#: command-list.h:155
8ada9598 22544msgid "Reset current HEAD to the specified state"
4375c10e 22545msgstr "重置当前 HEAD 到指定状态"
8ada9598 22546
4c27fcb5 22547#: command-list.h:156
a6cd2cc4
JX
22548msgid "Restore working tree files"
22549msgstr "恢复工作区文件"
22550
22551#: command-list.h:157
fd8cb379
JX
22552msgid "Revert some existing commits"
22553msgstr "回退一些现存提交"
22554
a6cd2cc4 22555#: command-list.h:158
fd8cb379
JX
22556msgid "Lists commit objects in reverse chronological order"
22557msgstr "按时间顺序列出提交对象"
22558
a6cd2cc4 22559#: command-list.h:159
fd8cb379
JX
22560msgid "Pick out and massage parameters"
22561msgstr "选出并处理参数"
22562
a6cd2cc4 22563#: command-list.h:160
8ada9598 22564msgid "Remove files from the working tree and from the index"
81809b99 22565msgstr "从工作区和索引中删除文件"
8ada9598 22566
a6cd2cc4 22567#: command-list.h:161
fd8cb379
JX
22568msgid "Send a collection of patches as emails"
22569msgstr "通过电子邮件发送一组补丁"
22570
a6cd2cc4 22571#: command-list.h:162
fd8cb379
JX
22572msgid "Push objects over Git protocol to another repository"
22573msgstr "使用 Git 协议推送对象到另一个仓库"
22574
a6cd2cc4 22575#: command-list.h:163
fd8cb379
JX
22576msgid "Restricted login shell for Git-only SSH access"
22577msgstr "只允许 Git SSH 访问的受限登录shell"
22578
a6cd2cc4 22579#: command-list.h:164
fd8cb379
JX
22580msgid "Summarize 'git log' output"
22581msgstr "'git log' 输出摘要"
22582
a6cd2cc4 22583#: command-list.h:165
8ada9598 22584msgid "Show various types of objects"
81809b99 22585msgstr "显示各种类型的对象"
8ada9598 22586
a6cd2cc4 22587#: command-list.h:166
fd8cb379
JX
22588msgid "Show branches and their commits"
22589msgstr "显示分支和提交"
22590
a6cd2cc4 22591#: command-list.h:167
fd8cb379
JX
22592msgid "Show packed archive index"
22593msgstr "显示打包归档索引"
22594
a6cd2cc4 22595#: command-list.h:168
fd8cb379
JX
22596msgid "List references in a local repository"
22597msgstr "显示本地仓库中的引用"
22598
a6cd2cc4 22599#: command-list.h:169
fd8cb379
JX
22600msgid "Git's i18n setup code for shell scripts"
22601msgstr "为 shell 脚本准备的 Git 国际化设置代码"
22602
a6cd2cc4 22603#: command-list.h:170
fd8cb379
JX
22604msgid "Common Git shell script setup code"
22605msgstr "常用的 Git shell 脚本设置代码"
22606
a6cd2cc4 22607#: command-list.h:171
ddc12c42
JX
22608msgid "Initialize and modify the sparse-checkout"
22609msgstr "初始化及修改稀疏检出"
22610
22611#: command-list.h:172
fd8cb379
JX
22612msgid "Stash the changes in a dirty working directory away"
22613msgstr "贮藏脏工作区中的修改"
22614
ddc12c42 22615#: command-list.h:173
fd8cb379
JX
22616msgid "Add file contents to the staging area"
22617msgstr "将文件内容添加到索引"
22618
ddc12c42 22619#: command-list.h:174
8ada9598 22620msgid "Show the working tree status"
81809b99 22621msgstr "显示工作区状态"
8ada9598 22622
ddc12c42 22623#: command-list.h:175
fd8cb379
JX
22624msgid "Remove unnecessary whitespace"
22625msgstr "删除不必要的空白字符"
22626
ddc12c42 22627#: command-list.h:176
fd8cb379
JX
22628msgid "Initialize, update or inspect submodules"
22629msgstr "初始化、更新或检查子模组"
22630
ddc12c42 22631#: command-list.h:177
fd8cb379
JX
22632msgid "Bidirectional operation between a Subversion repository and Git"
22633msgstr "Subersion 仓库和 Git 之间的双向操作"
22634
ddc12c42 22635#: command-list.h:178
a6cd2cc4
JX
22636msgid "Switch branches"
22637msgstr "切换分支"
22638
ddc12c42 22639#: command-list.h:179
fd8cb379
JX
22640msgid "Read, modify and delete symbolic refs"
22641msgstr "读取、修改和删除符号引用"
22642
ddc12c42 22643#: command-list.h:180
8ada9598 22644msgid "Create, list, delete or verify a tag object signed with GPG"
4375c10e 22645msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
8ada9598 22646
ddc12c42 22647#: command-list.h:181
fd8cb379
JX
22648msgid "Creates a temporary file with a blob's contents"
22649msgstr "用 blob 数据对象的内容创建一个临时文件"
220c313c 22650
ddc12c42 22651#: command-list.h:182
fd8cb379
JX
22652msgid "Unpack objects from a packed archive"
22653msgstr "从打包文件中解压缩对象"
220c313c 22654
ddc12c42 22655#: command-list.h:183
fd8cb379
JX
22656msgid "Register file contents in the working tree to the index"
22657msgstr "将工作区的文件内容注册到索引"
220c313c 22658
ddc12c42 22659#: command-list.h:184
fd8cb379
JX
22660msgid "Update the object name stored in a ref safely"
22661msgstr "安全地更新存储于引用中的对象名称"
220c313c 22662
ddc12c42 22663#: command-list.h:185
fd8cb379
JX
22664msgid "Update auxiliary info file to help dumb servers"
22665msgstr "更新辅助信息文件以帮助哑协议服务"
22666
ddc12c42 22667#: command-list.h:186
fd8cb379
JX
22668msgid "Send archive back to git-archive"
22669msgstr "将存档发送回 git-archive"
22670
ddc12c42 22671#: command-list.h:187
fd8cb379
JX
22672msgid "Send objects packed back to git-fetch-pack"
22673msgstr "将对象压缩包发送回 git-fetch-pack"
22674
ddc12c42 22675#: command-list.h:188
fd8cb379
JX
22676msgid "Show a Git logical variable"
22677msgstr "显示一个Git逻辑变量"
22678
ddc12c42 22679#: command-list.h:189
fd8cb379
JX
22680msgid "Check the GPG signature of commits"
22681msgstr "检查 GPG 提交签名"
22682
ddc12c42 22683#: command-list.h:190
fd8cb379
JX
22684msgid "Validate packed Git archive files"
22685msgstr "校验打包的Git存仓文件"
22686
ddc12c42 22687#: command-list.h:191
fd8cb379
JX
22688msgid "Check the GPG signature of tags"
22689msgstr "检查标签的 GPG 签名"
22690
ddc12c42 22691#: command-list.h:192
fd8cb379
JX
22692msgid "Git web interface (web frontend to Git repositories)"
22693msgstr "Git web 界面(Git 仓库的 web 前端)"
22694
ddc12c42 22695#: command-list.h:193
fd8cb379
JX
22696msgid "Show logs with difference each commit introduces"
22697msgstr "显示每一个提交引入的差异日志"
22698
ddc12c42 22699#: command-list.h:194
fd8cb379
JX
22700msgid "Manage multiple working trees"
22701msgstr "管理多个工作区"
22702
ddc12c42 22703#: command-list.h:195
fd8cb379
JX
22704msgid "Create a tree object from the current index"
22705msgstr "从当前索引创建一个树对象"
22706
ddc12c42 22707#: command-list.h:196
fd8cb379
JX
22708msgid "Defining attributes per path"
22709msgstr "定义路径的属性"
22710
ddc12c42 22711#: command-list.h:197
fd8cb379
JX
22712msgid "Git command-line interface and conventions"
22713msgstr "Git 命令行界面和约定"
22714
ddc12c42 22715#: command-list.h:198
fd8cb379
JX
22716msgid "A Git core tutorial for developers"
22717msgstr "面向开发人员的 Git 核心教程"
22718
ddc12c42 22719#: command-list.h:199
fd8cb379
JX
22720msgid "Git for CVS users"
22721msgstr "适合 CVS 用户的 Git 帮助"
22722
ddc12c42 22723#: command-list.h:200
fd8cb379
JX
22724msgid "Tweaking diff output"
22725msgstr "调整差异输出"
22726
ddc12c42 22727#: command-list.h:201
fd8cb379
JX
22728msgid "A useful minimum set of commands for Everyday Git"
22729msgstr "每一天 Git 的一组有用的最小命令集合"
22730
ddc12c42 22731#: command-list.h:202
fd8cb379
JX
22732msgid "A Git Glossary"
22733msgstr "Git 词汇表"
22734
ddc12c42 22735#: command-list.h:203
fd8cb379
JX
22736msgid "Hooks used by Git"
22737msgstr "Git 使用的钩子"
22738
ddc12c42 22739#: command-list.h:204
fd8cb379
JX
22740msgid "Specifies intentionally untracked files to ignore"
22741msgstr "忽略指定的未跟踪文件"
22742
ddc12c42 22743#: command-list.h:205
fd8cb379
JX
22744msgid "Defining submodule properties"
22745msgstr "定义子模组属性"
22746
ddc12c42 22747#: command-list.h:206
fd8cb379
JX
22748msgid "Git namespaces"
22749msgstr "Git 名字空间"
22750
ddc12c42 22751#: command-list.h:207
fd8cb379
JX
22752msgid "Git Repository Layout"
22753msgstr "Git 仓库布局"
22754
ddc12c42 22755#: command-list.h:208
fd8cb379
JX
22756msgid "Specifying revisions and ranges for Git"
22757msgstr "指定 Git 的版本和版本范围"
22758
ddc12c42
JX
22759#: command-list.h:209
22760msgid "Mounting one repository inside another"
22761msgstr "将一个仓库安装到另外一个仓库中"
22762
22763#: command-list.h:210
fd8cb379
JX
22764msgid "A tutorial introduction to Git: part two"
22765msgstr "一个 Git 教程:第二部分"
22766
ddc12c42 22767#: command-list.h:211
fd8cb379
JX
22768msgid "A tutorial introduction to Git"
22769msgstr "一个 Git 教程"
22770
ddc12c42 22771#: command-list.h:212
fd8cb379
JX
22772msgid "An overview of recommended workflows with Git"
22773msgstr "Git 推荐的工作流概览"
220c313c 22774
5c57d762 22775#: git-bisect.sh:54
b694fbb1
JX
22776msgid "You need to start by \"git bisect start\""
22777msgstr "您需要执行 \"git bisect start\" 来开始"
22778
90e6ef53 22779# 译者:注意保持句尾空格
c04f5ac3
JX
22780#. TRANSLATORS: Make sure to include [Y] and [n] in your
22781#. translation. The program will only accept English input
22782#. at this point.
5c57d762 22783#: git-bisect.sh:60
c04f5ac3
JX
22784msgid "Do you want me to do it for you [Y/n]? "
22785msgstr "您想让我为您这样做么[Y/n]? "
22786
06991777 22787#: git-bisect.sh:101
c04f5ac3
JX
22788#, sh-format
22789msgid "Bad rev input: $arg"
9a4b694c 22790msgstr "坏的输入版本:$arg"
c04f5ac3 22791
06991777 22792#: git-bisect.sh:121
5c57d762
JX
22793#, sh-format
22794msgid "Bad rev input: $bisected_head"
9a4b694c 22795msgstr "坏的输入版本:$bisected_head"
c04f5ac3 22796
06991777 22797#: git-bisect.sh:130
c04f5ac3
JX
22798#, sh-format
22799msgid "Bad rev input: $rev"
9a4b694c 22800msgstr "坏的输入版本:$rev"
c04f5ac3 22801
06991777 22802#: git-bisect.sh:139
1b7f4a34
JX
22803#, sh-format
22804msgid "'git bisect $TERM_BAD' can take only one argument."
22805msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
22806
06991777 22807#: git-bisect.sh:209
c04f5ac3
JX
22808msgid "No logfile given"
22809msgstr "未提供日志文件"
22810
06991777 22811#: git-bisect.sh:210
c04f5ac3
JX
22812#, sh-format
22813msgid "cannot read $file for replaying"
22814msgstr "不能读取 $file 来重放"
22815
06991777 22816#: git-bisect.sh:232
c04f5ac3
JX
22817msgid "?? what are you talking about?"
22818msgstr "?? 您在说什么?"
22819
06991777 22820#: git-bisect.sh:241
5809aa05
JX
22821msgid "bisect run failed: no command provided."
22822msgstr "二分查找运行失败:没有提供命令。"
22823
06991777 22824#: git-bisect.sh:246
b694fbb1
JX
22825#, sh-format
22826msgid "running $command"
22827msgstr "运行 $command"
22828
06991777 22829#: git-bisect.sh:253
b694fbb1
JX
22830#, sh-format
22831msgid ""
22832"bisect run failed:\n"
22833"exit code $res from '$command' is < 0 or >= 128"
22834msgstr ""
22835"二分查找运行失败:\n"
07432cef 22836"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 22837
06991777 22838#: git-bisect.sh:279
b694fbb1
JX
22839msgid "bisect run cannot continue any more"
22840msgstr "二分查找不能继续运行"
22841
06991777 22842#: git-bisect.sh:285
b694fbb1
JX
22843#, sh-format
22844msgid ""
22845"bisect run failed:\n"
22846"'bisect_state $state' exited with error code $res"
22847msgstr ""
22848"二分查找运行失败:\n"
22849"'bisect_state $state' 退出码为 $res"
22850
06991777 22851#: git-bisect.sh:292
b694fbb1
JX
22852msgid "bisect run success"
22853msgstr "二分查找运行成功"
c04f5ac3 22854
06991777
JX
22855#: git-bisect.sh:300
22856msgid "We are not bisecting."
22857msgstr "我们没有在二分查找。"
94550ed3 22858
5c57d762
JX
22859#: git-merge-octopus.sh:46
22860msgid ""
22861"Error: Your local changes to the following files would be overwritten by "
22862"merge"
22863msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
22864
22865#: git-merge-octopus.sh:61
22866msgid "Automated merge did not work."
9a4b694c 22867msgstr "自动合并未生效。"
5c57d762
JX
22868
22869#: git-merge-octopus.sh:62
a0b6b246 22870msgid "Should not be doing an octopus."
5c57d762
JX
22871msgstr "不应该执行章鱼式合并。"
22872
22873#: git-merge-octopus.sh:73
22874#, sh-format
22875msgid "Unable to find common commit with $pretty_name"
22876msgstr "无法找到和 $pretty_name 的基线提交"
22877
22878#: git-merge-octopus.sh:77
22879#, sh-format
6937cb4e 22880msgid "Already up to date with $pretty_name"
5c57d762
JX
22881msgstr "已经和 $pretty_name 保持一致"
22882
22883#: git-merge-octopus.sh:89
22884#, sh-format
22885msgid "Fast-forwarding to: $pretty_name"
22886msgstr "快进至:$pretty_name"
22887
22888#: git-merge-octopus.sh:97
22889#, sh-format
22890msgid "Trying simple merge with $pretty_name"
22891msgstr "尝试和 $pretty_name 的简单合并"
22892
22893#: git-merge-octopus.sh:102
22894msgid "Simple merge did not work, trying automatic merge."
9a4b694c 22895msgstr "简单合并未生效,尝试自动合并。"
5c57d762 22896
ddc12c42 22897#: git-legacy-stash.sh:221
c04f5ac3 22898msgid "Cannot remove temporary index (can't happen)"
90e6ef53 22899msgstr "无法删除临时索引(不应发生)"
c04f5ac3 22900
ddc12c42 22901#: git-legacy-stash.sh:272
2e8451e8
JX
22902#, sh-format
22903msgid "Cannot update $ref_stash with $w_commit"
22904msgstr "无法用 $w_commit 更新 $ref_stash"
22905
ddc12c42 22906#: git-legacy-stash.sh:324
b694fbb1 22907#, sh-format
5809aa05
JX
22908msgid "error: unknown option for 'stash push': $option"
22909msgstr "错误:'stash push' 的未知选项:$option"
b694fbb1 22910
ddc12c42 22911#: git-legacy-stash.sh:356
5c57d762
JX
22912#, sh-format
22913msgid "Saved working directory and index state $stash_msg"
22914msgstr "保存工作目录和索引状态 $stash_msg"
22915
ddc12c42 22916#: git-legacy-stash.sh:536
7aea43ff
JX
22917#, sh-format
22918msgid "unknown option: $opt"
22919msgstr "未知选项: $opt"
22920
ddc12c42 22921#: git-legacy-stash.sh:556
c04f5ac3
JX
22922#, sh-format
22923msgid "Too many revisions specified: $REV"
90e6ef53 22924msgstr "指定了太多的版本:$REV"
c04f5ac3 22925
ddc12c42 22926#: git-legacy-stash.sh:571
c04f5ac3 22927#, sh-format
220c313c
JX
22928msgid "$reference is not a valid reference"
22929msgstr "$reference 不是一个有效的引用"
c04f5ac3 22930
ddc12c42 22931#: git-legacy-stash.sh:599
c04f5ac3
JX
22932#, sh-format
22933msgid "'$args' is not a stash-like commit"
a4f16749 22934msgstr "'$args' 不是贮藏式提交"
c04f5ac3 22935
ddc12c42 22936#: git-legacy-stash.sh:610
c04f5ac3
JX
22937#, sh-format
22938msgid "'$args' is not a stash reference"
a4f16749 22939msgstr "'$args' 不是一个贮藏引用"
c04f5ac3 22940
ddc12c42 22941#: git-legacy-stash.sh:618
c04f5ac3 22942msgid "unable to refresh index"
90e6ef53 22943msgstr "无法刷新索引"
c04f5ac3 22944
ddc12c42 22945#: git-legacy-stash.sh:622
c04f5ac3 22946msgid "Cannot apply a stash in the middle of a merge"
a4f16749 22947msgstr "无法在合并过程应用贮藏"
c04f5ac3 22948
ddc12c42 22949#: git-legacy-stash.sh:630
c04f5ac3 22950msgid "Conflicts in index. Try without --index."
90e6ef53 22951msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3 22952
ddc12c42 22953#: git-legacy-stash.sh:632
c04f5ac3 22954msgid "Could not save index tree"
90e6ef53 22955msgstr "不能保存索引树"
c04f5ac3 22956
ddc12c42 22957#: git-legacy-stash.sh:641
a4f16749
JX
22958msgid "Could not restore untracked files from stash entry"
22959msgstr "无法从贮藏条目中恢复未跟踪文件"
a0b6b246 22960
ddc12c42 22961#: git-legacy-stash.sh:666
c04f5ac3 22962msgid "Cannot unstage modified files"
160fb2b2 22963msgstr "无法将修改的文件取消暂存"
c04f5ac3 22964
ddc12c42 22965#: git-legacy-stash.sh:704
c04f5ac3
JX
22966#, sh-format
22967msgid "Dropped ${REV} ($s)"
22968msgstr "丢弃了 ${REV} ($s)"
22969
ddc12c42 22970#: git-legacy-stash.sh:705
c04f5ac3
JX
22971#, sh-format
22972msgid "${REV}: Could not drop stash entry"
a4f16749 22973msgstr "${REV}:无法丢弃贮藏条目"
c04f5ac3 22974
ddc12c42 22975#: git-legacy-stash.sh:792
c04f5ac3
JX
22976msgid "(To restore them type \"git stash apply\")"
22977msgstr "(为恢复数据输入 \"git stash apply\")"
22978
2b472aae 22979#: git-submodule.sh:203
2e8451e8
JX
22980msgid "Relative path can only be used from the toplevel of the working tree"
22981msgstr "只能在工作区的顶级目录中使用相对路径"
22982
2b472aae 22983#: git-submodule.sh:213
c04f5ac3
JX
22984#, sh-format
22985msgid "repo URL: '$repo' must be absolute or begin with ./|../"
4375c10e 22986msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
c04f5ac3 22987
2b472aae 22988#: git-submodule.sh:232
c04f5ac3 22989#, sh-format
170e9899
JX
22990msgid "'$sm_path' already exists in the index"
22991msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 22992
2b472aae 22993#: git-submodule.sh:235
1a79b2f1
JX
22994#, sh-format
22995msgid "'$sm_path' already exists in the index and is not a submodule"
22996msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
22997
2b472aae 22998#: git-submodule.sh:242
d46c5519
JX
22999#, sh-format
23000msgid "'$sm_path' does not have a commit checked out"
5b533632 23001msgstr "'$sm_path' 没有检出的提交"
d46c5519 23002
2b472aae 23003#: git-submodule.sh:273
b694fbb1
JX
23004#, sh-format
23005msgid "Adding existing repo at '$sm_path' to the index"
160fb2b2 23006msgstr "添加位于 '$sm_path' 的现存仓库到索引"
b694fbb1 23007
2b472aae 23008#: git-submodule.sh:275
c04f5ac3 23009#, sh-format
170e9899 23010msgid "'$sm_path' already exists and is not a valid git repo"
160fb2b2 23011msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
c04f5ac3 23012
2b472aae 23013#: git-submodule.sh:283
07432cef
WS
23014#, sh-format
23015msgid "A git directory for '$sm_name' is found locally with remote(s):"
160fb2b2 23016msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
07432cef 23017
2b472aae 23018#: git-submodule.sh:285
07432cef
WS
23019#, sh-format
23020msgid ""
5c57d762
JX
23021"If you want to reuse this local git directory instead of cloning again from\n"
23022" $realrepo\n"
23023"use the '--force' option. If the local git directory is not the correct "
23024"repo\n"
07432cef
WS
23025"or you are unsure what this means choose another name with the '--name' "
23026"option."
5c57d762
JX
23027msgstr ""
23028"如果您想要重用这个本地 git 目录而非重新克隆自\n"
23029" $realrepo\n"
23030"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
23031"或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
07432cef 23032
2b472aae 23033#: git-submodule.sh:291
07432cef
WS
23034#, sh-format
23035msgid "Reactivating local git directory for submodule '$sm_name'."
23036msgstr "激活本地 git 目录到子模组 '$sm_name'。"
23037
2b472aae 23038#: git-submodule.sh:303
c04f5ac3 23039#, sh-format
170e9899
JX
23040msgid "Unable to checkout submodule '$sm_path'"
23041msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 23042
2b472aae 23043#: git-submodule.sh:308
c04f5ac3 23044#, sh-format
170e9899
JX
23045msgid "Failed to add submodule '$sm_path'"
23046msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 23047
2b472aae 23048#: git-submodule.sh:317
c04f5ac3 23049#, sh-format
170e9899
JX
23050msgid "Failed to register submodule '$sm_path'"
23051msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 23052
2b472aae 23053#: git-submodule.sh:590
c04f5ac3 23054#, sh-format
2e8451e8
JX
23055msgid "Unable to find current revision in submodule path '$displaypath'"
23056msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 23057
2b472aae 23058#: git-submodule.sh:600
c04f5ac3 23059#, sh-format
170e9899
JX
23060msgid "Unable to fetch in submodule path '$sm_path'"
23061msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 23062
2b472aae 23063#: git-submodule.sh:605
5c57d762
JX
23064#, sh-format
23065msgid ""
23066"Unable to find current ${remote_name}/${branch} revision in submodule path "
23067"'$sm_path'"
9a4b694c 23068msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
5c57d762 23069
2b472aae 23070#: git-submodule.sh:623
2e8451e8 23071#, sh-format
d46c5519
JX
23072msgid ""
23073"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
23074"$sha1:"
23075msgstr "无法在子模组路径 '$displaypath' 中获取,尝试直接获取 $sha1:"
2e8451e8 23076
2b472aae 23077#: git-submodule.sh:629
5c57d762
JX
23078#, sh-format
23079msgid ""
23080"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
23081"Direct fetching of that commit failed."
a0b6b246
JX
23082msgstr ""
23083"获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
5c57d762 23084
2b472aae 23085#: git-submodule.sh:636
6c94aba5
JX
23086#, sh-format
23087msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
23088msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
23089
2b472aae 23090#: git-submodule.sh:637
c04f5ac3 23091#, sh-format
6c94aba5
JX
23092msgid "Submodule path '$displaypath': checked out '$sha1'"
23093msgstr "子模组路径 '$displaypath':检出 '$sha1'"
23094
2b472aae 23095#: git-submodule.sh:641
6c94aba5 23096#, sh-format
2e8451e8
JX
23097msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
23098msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 23099
2b472aae 23100#: git-submodule.sh:642
c04f5ac3 23101#, sh-format
2e8451e8
JX
23102msgid "Submodule path '$displaypath': rebased into '$sha1'"
23103msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 23104
2b472aae 23105#: git-submodule.sh:647
c04f5ac3 23106#, sh-format
2e8451e8
JX
23107msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
23108msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 23109
2b472aae 23110#: git-submodule.sh:648
c04f5ac3 23111#, sh-format
2e8451e8
JX
23112msgid "Submodule path '$displaypath': merged in '$sha1'"
23113msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 23114
2b472aae 23115#: git-submodule.sh:653
c04f5ac3 23116#, sh-format
5b04ee3b
JX
23117msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
23118msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
c04f5ac3 23119
2b472aae 23120#: git-submodule.sh:654
c04f5ac3 23121#, sh-format
5b04ee3b 23122msgid "Submodule path '$displaypath': '$command $sha1'"
aef18cc6 23123msgstr "子模组 '$displaypath':'$command $sha1'"
c04f5ac3 23124
2b472aae 23125#: git-submodule.sh:685
2e8451e8
JX
23126#, sh-format
23127msgid "Failed to recurse into submodule path '$displaypath'"
23128msgstr "无法递归进子模组路径 '$displaypath'"
23129
2b472aae 23130#: git-submodule.sh:896
649900bc
JX
23131msgid "The --cached option cannot be used with the --files option"
23132msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1 23133
2b472aae 23134#: git-submodule.sh:948
b694fbb1
JX
23135#, sh-format
23136msgid "unexpected mode $mod_dst"
23137msgstr "意外的模式 $mod_dst"
c04f5ac3 23138
90e6ef53 23139# 译者:注意保持前导空格
2b472aae 23140#: git-submodule.sh:968
c04f5ac3 23141#, sh-format
2e8451e8
JX
23142msgid " Warn: $display_name doesn't contain commit $sha1_src"
23143msgstr " 警告:$display_name 未包含提交 $sha1_src"
c04f5ac3 23144
90e6ef53 23145# 译者:注意保持前导空格
2b472aae 23146#: git-submodule.sh:971
c04f5ac3 23147#, sh-format
2e8451e8
JX
23148msgid " Warn: $display_name doesn't contain commit $sha1_dst"
23149msgstr " 警告:$display_name 未包含提交 $sha1_dst"
c04f5ac3 23150
90e6ef53 23151# 译者:注意保持前导空格
2b472aae 23152#: git-submodule.sh:974
c04f5ac3 23153#, sh-format
2e8451e8
JX
23154msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
23155msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
c04f5ac3 23156
5b04ee3b
JX
23157#: git-parse-remote.sh:89
23158#, sh-format
23159msgid "See git-${cmd}(1) for details."
23160msgstr "详见 git-${cmd}(1)。"
5c57d762 23161
a6cd2cc4
JX
23162#: git-rebase--preserve-merges.sh:109
23163msgid "Applied autostash."
23164msgstr "已应用 autostash。"
23165
23166#: git-rebase--preserve-merges.sh:112
23167#, sh-format
23168msgid "Cannot store $stash_sha1"
23169msgstr "不能存储 $stash_sha1"
23170
23171#: git-rebase--preserve-merges.sh:191
c1ac5258
JX
23172#, sh-format
23173msgid "Rebasing ($new_count/$total)"
23174msgstr "变基中($new_count/$total)"
23175
a6cd2cc4 23176#: git-rebase--preserve-merges.sh:207
c1ac5258
JX
23177msgid ""
23178"\n"
23179"Commands:\n"
23180"p, pick <commit> = use commit\n"
23181"r, reword <commit> = use commit, but edit the commit message\n"
23182"e, edit <commit> = use commit, but stop for amending\n"
23183"s, squash <commit> = use commit, but meld into previous commit\n"
23184"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
23185"x, exec <commit> = run command (the rest of the line) using shell\n"
23186"d, drop <commit> = remove commit\n"
23187"l, label <label> = label current HEAD with a name\n"
23188"t, reset <label> = reset HEAD to a label\n"
23189"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
23190". create a merge commit using the original merge commit's\n"
23191". message (or the oneline, if no original merge commit was\n"
23192". specified). Use -c <commit> to reword the commit message.\n"
23193"\n"
23194"These lines can be re-ordered; they are executed from top to bottom.\n"
23195msgstr ""
23196"\n"
23197"命令:\n"
23198"p, pick <提交> = 使用提交\n"
23199"r, reword <提交> = 使用提交,但修改提交说明\n"
23200"e, edit <提交> = 使用提交,但停下来修补\n"
23201"s, squash <提交> = 使用提交,但融合到前一个提交\n"
23202"f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
23203"x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
23204"d, drop <提交> = 删除提交\n"
23205"l, label <标签> = 为当前 HEAD 打上标签\n"
23206"t, reset <标签> = 重置 HEAD 到该标签\n"
23207"m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n"
23208". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
23209". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
23210". -c <提交> 可以编辑提交说明。\n"
23211"\n"
23212"可以对这些行重新排序,将从上至下执行。\n"
23213
a6cd2cc4 23214#: git-rebase--preserve-merges.sh:270
5c57d762
JX
23215#, sh-format
23216msgid ""
23217"You can amend the commit now, with\n"
23218"\n"
23219"\tgit commit --amend $gpg_sign_opt_quoted\n"
23220"\n"
23221"Once you are satisfied with your changes, run\n"
23222"\n"
23223"\tgit rebase --continue"
23224msgstr ""
23225"您现在可以修补这个提交,使用\n"
23226"\n"
23227"\tgit commit --amend $gpg_sign_opt_quoted\n"
23228"\n"
9a4b694c 23229"当您对变更感到满意,执行\n"
5c57d762
JX
23230"\n"
23231"\tgit rebase --continue"
23232
a6cd2cc4 23233#: git-rebase--preserve-merges.sh:295
5c57d762
JX
23234#, sh-format
23235msgid "$sha1: not a commit that can be picked"
23236msgstr "$sha1:不是一个可以被拣选的提交"
23237
a6cd2cc4 23238#: git-rebase--preserve-merges.sh:334
5c57d762
JX
23239#, sh-format
23240msgid "Invalid commit name: $sha1"
23241msgstr "无效的提交名:$sha1"
23242
a6cd2cc4 23243#: git-rebase--preserve-merges.sh:364
5c57d762
JX
23244msgid "Cannot write current commit's replacement sha1"
23245msgstr "不能写入当前提交的替代 sha1"
23246
a6cd2cc4 23247#: git-rebase--preserve-merges.sh:415
5c57d762
JX
23248#, sh-format
23249msgid "Fast-forward to $sha1"
23250msgstr "快进到 $sha1"
23251
a6cd2cc4 23252#: git-rebase--preserve-merges.sh:417
5c57d762
JX
23253#, sh-format
23254msgid "Cannot fast-forward to $sha1"
23255msgstr "不能快进到 $sha1"
23256
a6cd2cc4 23257#: git-rebase--preserve-merges.sh:426
5c57d762
JX
23258#, sh-format
23259msgid "Cannot move HEAD to $first_parent"
23260msgstr "不能移动 HEAD 到 $first_parent"
23261
a6cd2cc4 23262#: git-rebase--preserve-merges.sh:431
5c57d762
JX
23263#, sh-format
23264msgid "Refusing to squash a merge: $sha1"
23265msgstr "拒绝压缩一个合并:$sha1"
23266
a6cd2cc4 23267#: git-rebase--preserve-merges.sh:449
5c57d762
JX
23268#, sh-format
23269msgid "Error redoing merge $sha1"
23270msgstr "无法重做合并 $sha1"
23271
a6cd2cc4 23272#: git-rebase--preserve-merges.sh:458
5c57d762
JX
23273#, sh-format
23274msgid "Could not pick $sha1"
23275msgstr "不能拣选 $sha1"
23276
a6cd2cc4 23277#: git-rebase--preserve-merges.sh:467
5c57d762
JX
23278#, sh-format
23279msgid "This is the commit message #${n}:"
9a4b694c 23280msgstr "这是提交说明 #${n}:"
5c57d762 23281
a6cd2cc4 23282#: git-rebase--preserve-merges.sh:472
5c57d762
JX
23283#, sh-format
23284msgid "The commit message #${n} will be skipped:"
9a4b694c 23285msgstr "提交说明 #${n} 将被跳过:"
5c57d762 23286
a6cd2cc4 23287#: git-rebase--preserve-merges.sh:483
5c57d762
JX
23288#, sh-format
23289msgid "This is a combination of $count commit."
23290msgid_plural "This is a combination of $count commits."
23291msgstr[0] "这是一个 $count 个提交的组合。"
23292msgstr[1] "这是一个 $count 个提交的组合。"
23293
a6cd2cc4 23294#: git-rebase--preserve-merges.sh:492
5c57d762
JX
23295#, sh-format
23296msgid "Cannot write $fixup_msg"
23297msgstr "不能写入 $fixup_msg"
23298
a6cd2cc4 23299#: git-rebase--preserve-merges.sh:495
5c57d762
JX
23300msgid "This is a combination of 2 commits."
23301msgstr "这是一个 2 个提交的组合。"
23302
a6cd2cc4
JX
23303#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
23304#: git-rebase--preserve-merges.sh:582
5c57d762
JX
23305#, sh-format
23306msgid "Could not apply $sha1... $rest"
23307msgstr "不能应用 $sha1... $rest"
23308
a6cd2cc4 23309#: git-rebase--preserve-merges.sh:611
5c57d762
JX
23310#, sh-format
23311msgid ""
23312"Could not amend commit after successfully picking $sha1... $rest\n"
23313"This is most likely due to an empty commit message, or the pre-commit hook\n"
23314"failed. If the pre-commit hook failed, you may need to resolve the issue "
23315"before\n"
23316"you are able to reword the commit."
23317msgstr ""
23318"不能在成功拣选 $sha1... $rest 之后修补提交\n"
23319"这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
23320"钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
23321
a6cd2cc4 23322#: git-rebase--preserve-merges.sh:626
5c57d762
JX
23323#, sh-format
23324msgid "Stopped at $sha1_abbrev... $rest"
23325msgstr "停止在 $sha1_abbrev... $rest"
23326
a6cd2cc4 23327#: git-rebase--preserve-merges.sh:641
5c57d762
JX
23328#, sh-format
23329msgid "Cannot '$squash_style' without a previous commit"
9a4b694c 23330msgstr "没有父提交的情况下不能 '$squash_style'"
5c57d762 23331
a6cd2cc4 23332#: git-rebase--preserve-merges.sh:683
5c57d762
JX
23333#, sh-format
23334msgid "Executing: $rest"
23335msgstr "执行:$rest"
23336
a6cd2cc4 23337#: git-rebase--preserve-merges.sh:691
5c57d762
JX
23338#, sh-format
23339msgid "Execution failed: $rest"
23340msgstr "执行失败:$rest"
23341
a6cd2cc4 23342#: git-rebase--preserve-merges.sh:693
5c57d762
JX
23343msgid "and made changes to the index and/or the working tree"
23344msgstr "并且修改索引和/或工作区"
23345
23346# 译者:注意保持前导空格
a6cd2cc4 23347#: git-rebase--preserve-merges.sh:695
5c57d762
JX
23348msgid ""
23349"You can fix the problem, and then run\n"
23350"\n"
23351"\tgit rebase --continue"
23352msgstr ""
23353"您可以解决这个问题,然后运行\n"
23354"\n"
23355"\tgit rebase --continue"
23356
23357#. TRANSLATORS: after these lines is a command to be issued by the user
a6cd2cc4 23358#: git-rebase--preserve-merges.sh:708
5c57d762
JX
23359#, sh-format
23360msgid ""
23361"Execution succeeded: $rest\n"
23362"but left changes to the index and/or the working tree\n"
23363"Commit or stash your changes, and then run\n"
23364"\n"
23365"\tgit rebase --continue"
23366msgstr ""
23367"执行成功:$rest\n"
a4f16749 23368"但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n"
5c57d762
JX
23369"\n"
23370"\tgit rebase --continue"
23371
a6cd2cc4 23372#: git-rebase--preserve-merges.sh:719
5c57d762
JX
23373#, sh-format
23374msgid "Unknown command: $command $sha1 $rest"
23375msgstr "未知命令:$command $sha1 $rest"
23376
a6cd2cc4 23377#: git-rebase--preserve-merges.sh:720
5c57d762
JX
23378msgid "Please fix this using 'git rebase --edit-todo'."
23379msgstr "要修改请使用命令 'git rebase --edit-todo'。"
23380
a6cd2cc4 23381#: git-rebase--preserve-merges.sh:755
5c57d762
JX
23382#, sh-format
23383msgid "Successfully rebased and updated $head_name."
9a4b694c 23384msgstr "成功变基并更新 $head_name。"
5c57d762 23385
a6cd2cc4 23386#: git-rebase--preserve-merges.sh:812
5c57d762
JX
23387msgid "Could not remove CHERRY_PICK_HEAD"
23388msgstr "不能删除 CHERRY_PICK_HEAD"
23389
a6cd2cc4 23390#: git-rebase--preserve-merges.sh:817
5c57d762
JX
23391#, sh-format
23392msgid ""
23393"You have staged changes in your working tree.\n"
23394"If these changes are meant to be\n"
23395"squashed into the previous commit, run:\n"
23396"\n"
23397" git commit --amend $gpg_sign_opt_quoted\n"
23398"\n"
23399"If they are meant to go into a new commit, run:\n"
23400"\n"
23401" git commit $gpg_sign_opt_quoted\n"
23402"\n"
a0b6b246 23403"In both cases, once you're done, continue with:\n"
5c57d762
JX
23404"\n"
23405" git rebase --continue\n"
23406msgstr ""
23407"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
23408"\n"
23409" git commit --amend $gpg_sign_opt_quoted\n"
23410"\n"
23411"如果这些变更要形成一个新提交,执行:\n"
23412"\n"
23413" git commit $gpg_sign_opt_quoted\n"
23414"\n"
9a4b694c 23415"无论哪种情况,当您完成提交,继续执行:\n"
5c57d762
JX
23416"\n"
23417" git rebase --continue\n"
23418
a6cd2cc4 23419#: git-rebase--preserve-merges.sh:834
5c57d762 23420msgid "Error trying to find the author identity to amend commit"
9a4b694c 23421msgstr "在修补提交中查找作者信息时遇到错误"
5c57d762 23422
a6cd2cc4 23423#: git-rebase--preserve-merges.sh:839
5c57d762
JX
23424msgid ""
23425"You have uncommitted changes in your working tree. Please commit them\n"
23426"first and then run 'git rebase --continue' again."
a0b6b246
JX
23427msgstr ""
23428"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
5c57d762 23429
a6cd2cc4 23430#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
5c57d762
JX
23431msgid "Could not commit staged changes."
23432msgstr "不能提交暂存的修改。"
23433
a6cd2cc4 23434#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
4c27fcb5
JX
23435msgid "Could not execute editor"
23436msgstr "无法运行编辑器"
23437
a6cd2cc4 23438#: git-rebase--preserve-merges.sh:900
4c27fcb5
JX
23439#, sh-format
23440msgid "Could not checkout $switch_to"
23441msgstr "不能检出 $switch_to"
23442
a6cd2cc4 23443#: git-rebase--preserve-merges.sh:907
4c27fcb5
JX
23444msgid "No HEAD?"
23445msgstr "没有 HEAD?"
23446
a6cd2cc4 23447#: git-rebase--preserve-merges.sh:908
4c27fcb5
JX
23448#, sh-format
23449msgid "Could not create temporary $state_dir"
23450msgstr "不能创建临时 $state_dir"
23451
a6cd2cc4 23452#: git-rebase--preserve-merges.sh:911
4c27fcb5
JX
23453msgid "Could not mark as interactive"
23454msgstr "不能标记为交互式"
23455
a6cd2cc4 23456#: git-rebase--preserve-merges.sh:943
4c27fcb5
JX
23457#, sh-format
23458msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
23459msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
23460msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
23461msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
5c57d762 23462
2b472aae
JX
23463#: git-rebase--preserve-merges.sh:955
23464msgid "Note that empty commits are commented out"
23465msgstr "注意空提交已被注释掉"
23466
a6cd2cc4 23467#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
fd8cb379
JX
23468msgid "Could not init rewritten commits"
23469msgstr "不能对重写提交进行初始化"
23470
5c57d762
JX
23471#: git-sh-setup.sh:89 git-sh-setup.sh:94
23472#, sh-format
23473msgid "usage: $dashless $USAGE"
23474msgstr "用法:$dashless $USAGE"
23475
d46c5519 23476#: git-sh-setup.sh:191
5c57d762
JX
23477#, sh-format
23478msgid "Cannot chdir to $cdup, the toplevel of the working tree"
9a4b694c 23479msgstr "不能切换目录到 $cdup,工作区的顶级目录"
5c57d762 23480
d46c5519 23481#: git-sh-setup.sh:200 git-sh-setup.sh:207
5c57d762
JX
23482#, sh-format
23483msgid "fatal: $program_name cannot be used without a working tree."
06991777 23484msgstr "致命错误:$program_name 不能在没有工作区的情况下使用"
5c57d762 23485
d46c5519 23486#: git-sh-setup.sh:221
5c57d762
JX
23487msgid "Cannot rebase: You have unstaged changes."
23488msgstr "不能变基:您有未暂存的变更。"
23489
d46c5519 23490#: git-sh-setup.sh:224
5c57d762
JX
23491msgid "Cannot rewrite branches: You have unstaged changes."
23492msgstr "不能重写分支:您有未暂存的变更。"
23493
d46c5519 23494#: git-sh-setup.sh:227
a0b6b246
JX
23495msgid "Cannot pull with rebase: You have unstaged changes."
23496msgstr "无法通过变基方式拉取:您有未暂存的变更。"
23497
d46c5519 23498#: git-sh-setup.sh:230
5c57d762
JX
23499#, sh-format
23500msgid "Cannot $action: You have unstaged changes."
23501msgstr "不能 $action:您有未暂存的变更。"
23502
d46c5519 23503#: git-sh-setup.sh:243
5c57d762
JX
23504msgid "Cannot rebase: Your index contains uncommitted changes."
23505msgstr "不能变基:您的索引中包含未提交的变更。"
23506
d46c5519 23507#: git-sh-setup.sh:246
a0b6b246
JX
23508msgid "Cannot pull with rebase: Your index contains uncommitted changes."
23509msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
23510
d46c5519 23511#: git-sh-setup.sh:249
5c57d762
JX
23512#, sh-format
23513msgid "Cannot $action: Your index contains uncommitted changes."
23514msgstr "不能 $action:您的索引中包含未提交的变更。"
23515
d46c5519 23516#: git-sh-setup.sh:253
a0b6b246
JX
23517msgid "Additionally, your index contains uncommitted changes."
23518msgstr "而且您的索引中包含未提交的变更。"
23519
d46c5519 23520#: git-sh-setup.sh:373
5c57d762
JX
23521msgid "You need to run this command from the toplevel of the working tree."
23522msgstr "您需要在工作区的顶级目录中运行这个命令。"
23523
d46c5519 23524#: git-sh-setup.sh:378
5c57d762
JX
23525msgid "Unable to determine absolute path of git directory"
23526msgstr "不能确定 git 目录的绝对路径"
a0b6b246 23527
1a79b2f1 23528#. TRANSLATORS: you can adjust this to align "git add -i" status menu
ddc12c42 23529#: git-add--interactive.perl:212
1a79b2f1
JX
23530#, perl-format
23531msgid "%12s %12s %s"
23532msgstr "%12s %12s %s"
23533
ddc12c42 23534#: git-add--interactive.perl:634
1a79b2f1
JX
23535#, perl-format
23536msgid "touched %d path\n"
23537msgid_plural "touched %d paths\n"
23538msgstr[0] "触碰了 %d 个路径\n"
23539msgstr[1] "触碰了 %d 个路径\n"
23540
ddc12c42 23541#: git-add--interactive.perl:1053
1a79b2f1
JX
23542msgid ""
23543"If the patch applies cleanly, the edited hunk will immediately be\n"
23544"marked for staging."
23545msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
23546
ddc12c42 23547#: git-add--interactive.perl:1056
1a79b2f1
JX
23548msgid ""
23549"If the patch applies cleanly, the edited hunk will immediately be\n"
23550"marked for stashing."
a4f16749 23551msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。"
1a79b2f1 23552
ddc12c42 23553#: git-add--interactive.perl:1059
1a79b2f1
JX
23554msgid ""
23555"If the patch applies cleanly, the edited hunk will immediately be\n"
23556"marked for unstaging."
23557msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
23558
ddc12c42
JX
23559#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
23560#: git-add--interactive.perl:1077
1a79b2f1
JX
23561msgid ""
23562"If the patch applies cleanly, the edited hunk will immediately be\n"
23563"marked for applying."
23564msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
23565
ddc12c42
JX
23566#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
23567#: git-add--interactive.perl:1074
1a79b2f1
JX
23568msgid ""
23569"If the patch applies cleanly, the edited hunk will immediately be\n"
23570"marked for discarding."
23571msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
23572
ddc12c42 23573#: git-add--interactive.perl:1111
1a79b2f1
JX
23574#, perl-format
23575msgid "failed to open hunk edit file for writing: %s"
c1ac5258 23576msgstr "为写入打开块编辑文件失败:%s"
1a79b2f1 23577
ddc12c42 23578#: git-add--interactive.perl:1118
1a79b2f1
JX
23579#, perl-format
23580msgid ""
23581"---\n"
23582"To remove '%s' lines, make them ' ' lines (context).\n"
23583"To remove '%s' lines, delete them.\n"
23584"Lines starting with %s will be removed.\n"
23585msgstr ""
23586"---\n"
23587"要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
23588"要删除 '%s' 开始的行,删除它们。\n"
23589"以 %s 开始的行将被删除。\n"
23590
ddc12c42 23591#: git-add--interactive.perl:1140
1a79b2f1
JX
23592#, perl-format
23593msgid "failed to open hunk edit file for reading: %s"
23594msgstr "无法读取块编辑文件:%s"
23595
ddc12c42 23596#: git-add--interactive.perl:1248
1a79b2f1
JX
23597msgid ""
23598"y - stage this hunk\n"
23599"n - do not stage this hunk\n"
23600"q - quit; do not stage this hunk or any of the remaining ones\n"
23601"a - stage this hunk and all later hunks in the file\n"
23602"d - do not stage this hunk or any of the later hunks in the file"
23603msgstr ""
23604"y - 暂存该块\n"
23605"n - 不要暂存该块\n"
23606"q - 退出。不暂存该块及后面的全部块\n"
23607"a - 暂存该块和本文件中后面的全部块\n"
23608"d - 不暂存该块和本文件中后面的全部块"
23609
ddc12c42 23610#: git-add--interactive.perl:1254
1a79b2f1
JX
23611msgid ""
23612"y - stash this hunk\n"
23613"n - do not stash this hunk\n"
23614"q - quit; do not stash this hunk or any of the remaining ones\n"
23615"a - stash this hunk and all later hunks in the file\n"
23616"d - do not stash this hunk or any of the later hunks in the file"
23617msgstr ""
23618"y - 贮藏该块\n"
23619"n - 不要贮藏该块\n"
23620"q - 退出。不贮藏该块及后面的全部块\n"
23621"a - 贮藏该块和本文件中后面的全部块\n"
23622"d - 不贮藏该块和本文件中后面的全部块"
23623
ddc12c42 23624#: git-add--interactive.perl:1260
1a79b2f1
JX
23625msgid ""
23626"y - unstage this hunk\n"
23627"n - do not unstage this hunk\n"
23628"q - quit; do not unstage this hunk or any of the remaining ones\n"
23629"a - unstage this hunk and all later hunks in the file\n"
23630"d - do not unstage this hunk or any of the later hunks in the file"
23631msgstr ""
23632"y - 不暂存该块\n"
23633"n - 不要不暂存该块\n"
23634"q - 退出。不要不暂存该块及后面的全部块\n"
23635"a - 不暂存该块和本文件中后面的全部块\n"
23636"d - 不要不暂存该块和本文件中后面的全部块"
23637
ddc12c42 23638#: git-add--interactive.perl:1266
1a79b2f1
JX
23639msgid ""
23640"y - apply this hunk to index\n"
23641"n - do not apply this hunk to index\n"
23642"q - quit; do not apply this hunk or any of the remaining ones\n"
23643"a - apply this hunk and all later hunks in the file\n"
23644"d - do not apply this hunk or any of the later hunks in the file"
23645msgstr ""
23646"y - 在索引中应用该块\n"
23647"n - 不要在索引中应用该块\n"
23648"q - 退出。不要应用该块及后面的全部块\n"
23649"a - 应用该块和本文件中后面的全部块\n"
23650"d - 不要应用该块和本文件中后面的全部块"
23651
ddc12c42 23652#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
1a79b2f1
JX
23653msgid ""
23654"y - discard this hunk from worktree\n"
23655"n - do not discard this hunk from worktree\n"
23656"q - quit; do not discard this hunk or any of the remaining ones\n"
23657"a - discard this hunk and all later hunks in the file\n"
23658"d - do not discard this hunk or any of the later hunks in the file"
23659msgstr ""
23660"y - 在工作区中丢弃该块\n"
23661"n - 不要在工作区中丢弃该块\n"
23662"q - 退出。不要丢弃该块及后面的全部块\n"
23663"a - 丢弃该块和本文件中后面的全部块\n"
23664"d - 不要丢弃该块和本文件中后面的全部块"
23665
ddc12c42 23666#: git-add--interactive.perl:1278
1a79b2f1
JX
23667msgid ""
23668"y - discard this hunk from index and worktree\n"
23669"n - do not discard this hunk from index and worktree\n"
23670"q - quit; do not discard this hunk or any of the remaining ones\n"
23671"a - discard this hunk and all later hunks in the file\n"
23672"d - do not discard this hunk or any of the later hunks in the file"
23673msgstr ""
23674"y - 在索引和工作区中丢弃该块\n"
23675"n - 不要在索引和工作区中丢弃该块\n"
23676"q - 退出。不要丢弃该块及后面的全部块\n"
23677"a - 丢弃该块和本文件中后面的全部块\n"
23678"d - 不要丢弃该块和本文件中后面的全部块"
23679
ddc12c42 23680#: git-add--interactive.perl:1284
1a79b2f1
JX
23681msgid ""
23682"y - apply this hunk to index and worktree\n"
23683"n - do not apply this hunk to index and worktree\n"
23684"q - quit; do not apply this hunk or any of the remaining ones\n"
23685"a - apply this hunk and all later hunks in the file\n"
23686"d - do not apply this hunk or any of the later hunks in the file"
23687msgstr ""
23688"y - 在索引和工作区中应用该块\n"
23689"n - 不要在索引和工作区中应用该块\n"
23690"q - 退出。不要应用该块及后面的全部块\n"
23691"a - 应用该块和本文件中后面的全部块\n"
23692"d - 不要应用该块和本文件中后面的全部块"
23693
ddc12c42 23694#: git-add--interactive.perl:1296
a6cd2cc4
JX
23695msgid ""
23696"y - apply this hunk to worktree\n"
23697"n - do not apply this hunk to worktree\n"
23698"q - quit; do not apply this hunk or any of the remaining ones\n"
23699"a - apply this hunk and all later hunks in the file\n"
23700"d - do not apply this hunk or any of the later hunks in the file"
23701msgstr ""
23702"y - 在工作区中应用该块\n"
23703"n - 不要在工作区中应用该块\n"
23704"q - 退出。不要应用该块及后面的全部块\n"
23705"a - 应用该块和本文件中后面的全部块\n"
23706"d - 不要应用该块和本文件中后面的全部块"
23707
ddc12c42 23708#: git-add--interactive.perl:1311
1a79b2f1
JX
23709msgid ""
23710"g - select a hunk to go to\n"
23711"/ - search for a hunk matching the given regex\n"
23712"j - leave this hunk undecided, see next undecided hunk\n"
23713"J - leave this hunk undecided, see next hunk\n"
23714"k - leave this hunk undecided, see previous undecided hunk\n"
23715"K - leave this hunk undecided, see previous hunk\n"
23716"s - split the current hunk into smaller hunks\n"
23717"e - manually edit the current hunk\n"
23718"? - print help\n"
23719msgstr ""
23720"g - 选择跳转到一个块\n"
23721"/ - 查找和给定正则表达式匹配的块\n"
23722"j - 维持该块未决状态,查看下一个未决块\n"
23723"J - 维持该块未决状态,查看下一个块\n"
23724"k - 维持该块未决状态,查看上一个未决块\n"
23725"K - 维持该块未决状态,查看上一个块\n"
23726"s - 拆分当前块为更小的块\n"
23727"e - 手动编辑当前块\n"
23728"? - 显示帮助\n"
23729
ddc12c42 23730#: git-add--interactive.perl:1342
1a79b2f1
JX
23731msgid "The selected hunks do not apply to the index!\n"
23732msgstr "选中的块不能应用到索引!\n"
23733
ddc12c42 23734#: git-add--interactive.perl:1357
1a79b2f1
JX
23735#, perl-format
23736msgid "ignoring unmerged: %s\n"
23737msgstr "忽略未合入的:%s\n"
23738
ddc12c42 23739#: git-add--interactive.perl:1468
a6cd2cc4
JX
23740#, perl-format
23741msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
23742msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
23743
ddc12c42 23744#: git-add--interactive.perl:1469
a6cd2cc4
JX
23745#, perl-format
23746msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
23747msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
23748
ddc12c42 23749#: git-add--interactive.perl:1470
a6cd2cc4
JX
23750#, perl-format
23751msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
23752msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
23753
ddc12c42 23754#: git-add--interactive.perl:1570
31e5e17b
JX
23755msgid "No other hunks to goto\n"
23756msgstr "没有其它可供跳转的块\n"
1a79b2f1 23757
ddc12c42 23758#: git-add--interactive.perl:1588
1a79b2f1
JX
23759#, perl-format
23760msgid "Invalid number: '%s'\n"
23761msgstr "无效数字:'%s'\n"
23762
ddc12c42 23763#: git-add--interactive.perl:1593
1a79b2f1
JX
23764#, perl-format
23765msgid "Sorry, only %d hunk available.\n"
23766msgid_plural "Sorry, only %d hunks available.\n"
23767msgstr[0] "对不起,只有 %d 个可用块。\n"
23768msgstr[1] "对不起,只有 %d 个可用块。\n"
23769
ddc12c42 23770#: git-add--interactive.perl:1619
31e5e17b
JX
23771msgid "No other hunks to search\n"
23772msgstr "没有其它可供查找的块\n"
23773
ddc12c42 23774#: git-add--interactive.perl:1636
1a79b2f1
JX
23775#, perl-format
23776msgid "Malformed search regexp %s: %s\n"
23777msgstr "错误的正则表达式 %s:%s\n"
23778
ddc12c42 23779#: git-add--interactive.perl:1646
1a79b2f1 23780msgid "No hunk matches the given pattern\n"
ddc12c42 23781msgstr "没有和给定模式相匹配的块\n"
1a79b2f1 23782
ddc12c42 23783#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
1a79b2f1
JX
23784msgid "No previous hunk\n"
23785msgstr "没有前一个块\n"
23786
ddc12c42 23787#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
1a79b2f1
JX
23788msgid "No next hunk\n"
23789msgstr "没有下一个块\n"
23790
ddc12c42 23791#: git-add--interactive.perl:1692
31e5e17b
JX
23792msgid "Sorry, cannot split this hunk\n"
23793msgstr "对不起,不能拆分这个块\n"
23794
ddc12c42 23795#: git-add--interactive.perl:1698
1a79b2f1
JX
23796#, perl-format
23797msgid "Split into %d hunk.\n"
23798msgid_plural "Split into %d hunks.\n"
23799msgstr[0] "拆分为 %d 块。\n"
23800msgstr[1] "拆分为 %d 块。\n"
23801
ddc12c42 23802#: git-add--interactive.perl:1708
31e5e17b
JX
23803msgid "Sorry, cannot edit this hunk\n"
23804msgstr "对不起,不能编辑这个块\n"
23805
1a79b2f1
JX
23806#. TRANSLATORS: please do not translate the command names
23807#. 'status', 'update', 'revert', etc.
ddc12c42 23808#: git-add--interactive.perl:1773
1a79b2f1
JX
23809msgid ""
23810"status - show paths with changes\n"
23811"update - add working tree state to the staged set of changes\n"
23812"revert - revert staged set of changes back to the HEAD version\n"
23813"patch - pick hunks and update selectively\n"
87cb7997 23814"diff - view diff between HEAD and index\n"
1a79b2f1
JX
23815"add untracked - add contents of untracked files to the staged set of "
23816"changes\n"
23817msgstr ""
23818"status - 显示含变更的路径\n"
23819"update - 添加工作区状态至暂存列表\n"
23820"revert - 还原修改的暂存集至 HEAD 版本\n"
23821"patch - 挑选块并且有选择地更新\n"
23822"diff - 显示 HEAD 和索引间差异\n"
23823"add untracked - 添加未跟踪文件的内容至暂存列表\n"
23824
ddc12c42
JX
23825#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
23826#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
23827#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
23828#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
1a79b2f1
JX
23829msgid "missing --"
23830msgstr "缺失 --"
23831
ddc12c42 23832#: git-add--interactive.perl:1821
1a79b2f1
JX
23833#, perl-format
23834msgid "unknown --patch mode: %s"
23835msgstr "未知的 --patch 模式:%s"
23836
ddc12c42 23837#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
1a79b2f1
JX
23838#, perl-format
23839msgid "invalid argument %s, expecting --"
23840msgstr "无效的参数 %s,期望是 --"
23841
4c27fcb5 23842#: git-send-email.perl:138
1a79b2f1
JX
23843msgid "local zone differs from GMT by a non-minute interval\n"
23844msgstr "本地时间和 GMT 有不到一分钟间隔\n"
23845
4c27fcb5 23846#: git-send-email.perl:145 git-send-email.perl:151
1a79b2f1
JX
23847msgid "local time offset greater than or equal to 24 hours\n"
23848msgstr "本地时间偏移量大于等于 24 小时\n"
23849
a6cd2cc4 23850#: git-send-email.perl:223 git-send-email.perl:229
1a79b2f1
JX
23851msgid "the editor exited uncleanly, aborting everything"
23852msgstr "编辑器非正常退出,终止所有操作"
23853
a6cd2cc4 23854#: git-send-email.perl:310
1a79b2f1
JX
23855#, perl-format
23856msgid ""
23857"'%s' contains an intermediate version of the email you were composing.\n"
23858msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
23859
a6cd2cc4 23860#: git-send-email.perl:315
1a79b2f1
JX
23861#, perl-format
23862msgid "'%s.final' contains the composed email.\n"
23863msgstr "'%s.final' 包含编辑的邮件。\n"
23864
a6cd2cc4 23865#: git-send-email.perl:408
1a79b2f1
JX
23866msgid "--dump-aliases incompatible with other options\n"
23867msgstr "--dump-aliases 和其它选项不兼容\n"
23868
a6cd2cc4 23869#: git-send-email.perl:481 git-send-email.perl:683
1a79b2f1
JX
23870msgid "Cannot run git format-patch from outside a repository\n"
23871msgstr "不能在仓库之外运行 git format-patch\n"
23872
a6cd2cc4 23873#: git-send-email.perl:484
31e5e17b
JX
23874msgid ""
23875"`batch-size` and `relogin` must be specified together (via command-line or "
23876"configuration option)\n"
23877msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n"
23878
a6cd2cc4 23879#: git-send-email.perl:497
1a79b2f1
JX
23880#, perl-format
23881msgid "Unknown --suppress-cc field: '%s'\n"
23882msgstr "未知的 --suppress-cc 字段:'%s'\n"
23883
a6cd2cc4 23884#: git-send-email.perl:528
1a79b2f1
JX
23885#, perl-format
23886msgid "Unknown --confirm setting: '%s'\n"
23887msgstr "未知的 --confirm 设置:'%s'\n"
23888
a6cd2cc4 23889#: git-send-email.perl:556
1a79b2f1
JX
23890#, perl-format
23891msgid "warning: sendmail alias with quotes is not supported: %s\n"
23892msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
23893
a6cd2cc4 23894#: git-send-email.perl:558
1a79b2f1
JX
23895#, perl-format
23896msgid "warning: `:include:` not supported: %s\n"
23897msgstr "警告:不支持 `:include:`:%s\n"
23898
a6cd2cc4 23899#: git-send-email.perl:560
1a79b2f1
JX
23900#, perl-format
23901msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
23902msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
23903
a6cd2cc4 23904#: git-send-email.perl:565
1a79b2f1
JX
23905#, perl-format
23906msgid "warning: sendmail line is not recognized: %s\n"
23907msgstr "警告:不能识别的 sendmail 行:%s\n"
23908
a6cd2cc4 23909#: git-send-email.perl:649
1a79b2f1
JX
23910#, perl-format
23911msgid ""
23912"File '%s' exists but it could also be the range of commits\n"
23913"to produce patches for. Please disambiguate by...\n"
23914"\n"
23915" * Saying \"./%s\" if you mean a file; or\n"
23916" * Giving --format-patch option if you mean a range.\n"
23917msgstr ""
87cb7997
JX
23918"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
23919"歧义:\n"
1a79b2f1
JX
23920"\n"
23921" * 如果含义为一个文件,使用 \"./%s\",或者\n"
23922" * 如果含义为一个范围,使用 --format-patch 选项。\n"
23923
a6cd2cc4 23924#: git-send-email.perl:670
1a79b2f1
JX
23925#, perl-format
23926msgid "Failed to opendir %s: %s"
23927msgstr "无法打开目录 %s: %s"
23928
a6cd2cc4 23929#: git-send-email.perl:694
1a79b2f1
JX
23930#, perl-format
23931msgid ""
23932"fatal: %s: %s\n"
23933"warning: no patches were sent\n"
23934msgstr ""
06991777 23935"致命错误:%s:%s\n"
1a79b2f1
JX
23936"警告:补丁未能发送\n"
23937
a6cd2cc4 23938#: git-send-email.perl:705
1a79b2f1
JX
23939msgid ""
23940"\n"
23941"No patch files specified!\n"
23942"\n"
87cb7997
JX
23943msgstr ""
23944"\n"
23945"未指定补丁文件!\n"
23946"\n"
1a79b2f1 23947
a6cd2cc4 23948#: git-send-email.perl:718
1a79b2f1
JX
23949#, perl-format
23950msgid "No subject line in %s?"
23951msgstr "在 %s 中没有标题行?"
23952
a6cd2cc4 23953#: git-send-email.perl:728
1a79b2f1
JX
23954#, perl-format
23955msgid "Failed to open for writing %s: %s"
c1ac5258 23956msgstr "为写入打开 %s 失败: %s"
1a79b2f1 23957
a6cd2cc4 23958#: git-send-email.perl:739
1a79b2f1
JX
23959msgid ""
23960"Lines beginning in \"GIT:\" will be removed.\n"
23961"Consider including an overall diffstat or table of contents\n"
23962"for the patch you are writing.\n"
23963"\n"
23964"Clear the body content if you don't wish to send a summary.\n"
23965msgstr ""
23966"以 \"GIT:\" 开头的行将被删除。\n"
5b533632 23967"考虑包含一个整体的差异统计或者您正在写的补丁的目录。\n"
1a79b2f1
JX
23968"\n"
23969"如果您不想发送摘要,清除内容。\n"
23970
a6cd2cc4 23971#: git-send-email.perl:763
1a79b2f1
JX
23972#, perl-format
23973msgid "Failed to open %s: %s"
23974msgstr "无法打开 %s: %s"
23975
a6cd2cc4 23976#: git-send-email.perl:780
31e5e17b
JX
23977#, perl-format
23978msgid "Failed to open %s.final: %s"
23979msgstr "无法打开 %s.final: %s"
1a79b2f1 23980
a6cd2cc4 23981#: git-send-email.perl:823
1a79b2f1
JX
23982msgid "Summary email is empty, skipping it\n"
23983msgstr "摘要邮件为空,跳过\n"
23984
23985#. TRANSLATORS: please keep [y/N] as is.
a6cd2cc4 23986#: git-send-email.perl:858
1a79b2f1
JX
23987#, perl-format
23988msgid "Are you sure you want to use <%s> [y/N]? "
23989msgstr "您确认要使用 <%s> [y/N]?"
23990
a6cd2cc4 23991#: git-send-email.perl:913
1a79b2f1
JX
23992msgid ""
23993"The following files are 8bit, but do not declare a Content-Transfer-"
23994"Encoding.\n"
23995msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
23996
a6cd2cc4 23997#: git-send-email.perl:918
1a79b2f1
JX
23998msgid "Which 8bit encoding should I declare [UTF-8]? "
23999msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?"
24000
a6cd2cc4 24001#: git-send-email.perl:926
1a79b2f1
JX
24002#, perl-format
24003msgid ""
24004"Refusing to send because the patch\n"
24005"\t%s\n"
24006"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
24007"want to send.\n"
24008msgstr ""
24009"拒绝发送,因为补丁\n"
24010"\t%s\n"
24011"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
24012
a6cd2cc4 24013#: git-send-email.perl:945
1a79b2f1
JX
24014msgid "To whom should the emails be sent (if anyone)?"
24015msgstr "邮件将要发送给谁?"
24016
a6cd2cc4 24017#: git-send-email.perl:963
1a79b2f1
JX
24018#, perl-format
24019msgid "fatal: alias '%s' expands to itself\n"
06991777 24020msgstr "致命错误:别名 '%s' 扩展为它自己\n"
1a79b2f1 24021
a6cd2cc4 24022#: git-send-email.perl:975
1a79b2f1
JX
24023msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
24024msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?"
24025
a6cd2cc4 24026#: git-send-email.perl:1033 git-send-email.perl:1041
1a79b2f1
JX
24027#, perl-format
24028msgid "error: unable to extract a valid address from: %s\n"
24029msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
24030
24031#. TRANSLATORS: Make sure to include [q] [d] [e] in your
24032#. translation. The program will only accept English input
24033#. at this point.
a6cd2cc4 24034#: git-send-email.perl:1045
1a79b2f1
JX
24035msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
24036msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):"
24037
a6cd2cc4 24038#: git-send-email.perl:1362
1a79b2f1
JX
24039#, perl-format
24040msgid "CA path \"%s\" does not exist"
24041msgstr "CA 路径 \"%s\" 不存在"
24042
a6cd2cc4 24043#: git-send-email.perl:1445
1a79b2f1
JX
24044msgid ""
24045" The Cc list above has been expanded by additional\n"
24046" addresses found in the patch commit message. By default\n"
24047" send-email prompts before sending whenever this occurs.\n"
24048" This behavior is controlled by the sendemail.confirm\n"
24049" configuration setting.\n"
24050"\n"
24051" For additional information, run 'git send-email --help'.\n"
24052" To retain the current behavior, but squelch this message,\n"
24053" run 'git config --global sendemail.confirm auto'.\n"
24054"\n"
24055msgstr ""
24056" 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n"
24057" 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
24058" sendemail.confirm 配置设置。\n"
24059"\n"
24060" 更多信息,执行 'git send-email --help'。\n"
24061" 要保持当前行为,但不显示此信息,运行 'git config --global\n"
24062" sendemail.confirm auto'。\n"
24063"\n"
24064
fd8cb379 24065#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
1a79b2f1
JX
24066#. translation. The program will only accept English input
24067#. at this point.
a6cd2cc4 24068#: git-send-email.perl:1460
fd8cb379
JX
24069msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
24070msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
1a79b2f1 24071
a6cd2cc4 24072#: git-send-email.perl:1463
1a79b2f1
JX
24073msgid "Send this email reply required"
24074msgstr "发送要求的邮件回复"
24075
a6cd2cc4 24076#: git-send-email.perl:1491
1a79b2f1
JX
24077msgid "The required SMTP server is not properly defined."
24078msgstr "要求的 SMTP 服务器未被正确定义。"
24079
a6cd2cc4 24080#: git-send-email.perl:1538
1a79b2f1
JX
24081#, perl-format
24082msgid "Server does not support STARTTLS! %s"
24083msgstr "服务器不支持 STARTTLS!%s"
24084
a6cd2cc4 24085#: git-send-email.perl:1543 git-send-email.perl:1547
a4f16749
JX
24086#, perl-format
24087msgid "STARTTLS failed! %s"
24088msgstr "STARTTLS 失败!%s"
24089
a6cd2cc4 24090#: git-send-email.perl:1556
1a79b2f1
JX
24091msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
24092msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
24093
a6cd2cc4 24094#: git-send-email.perl:1574
1a79b2f1
JX
24095#, perl-format
24096msgid "Failed to send %s\n"
24097msgstr "无法发送 %s\n"
24098
a6cd2cc4 24099#: git-send-email.perl:1577
1a79b2f1
JX
24100#, perl-format
24101msgid "Dry-Sent %s\n"
24102msgstr "演习发送 %s\n"
24103
a6cd2cc4 24104#: git-send-email.perl:1577
1a79b2f1
JX
24105#, perl-format
24106msgid "Sent %s\n"
24107msgstr "正发送 %s\n"
24108
a6cd2cc4 24109#: git-send-email.perl:1579
1a79b2f1
JX
24110msgid "Dry-OK. Log says:\n"
24111msgstr "演习成功。日志说:\n"
24112
a6cd2cc4 24113#: git-send-email.perl:1579
1a79b2f1
JX
24114msgid "OK. Log says:\n"
24115msgstr "OK。日志说:\n"
24116
a6cd2cc4 24117#: git-send-email.perl:1591
1a79b2f1
JX
24118msgid "Result: "
24119msgstr "结果:"
24120
a6cd2cc4 24121#: git-send-email.perl:1594
1a79b2f1
JX
24122msgid "Result: OK\n"
24123msgstr "结果:OK\n"
24124
a6cd2cc4 24125#: git-send-email.perl:1612
1a79b2f1
JX
24126#, perl-format
24127msgid "can't open file %s"
24128msgstr "无法打开文件 %s"
24129
a6cd2cc4 24130#: git-send-email.perl:1659 git-send-email.perl:1679
1a79b2f1
JX
24131#, perl-format
24132msgid "(mbox) Adding cc: %s from line '%s'\n"
24133msgstr "(mbox) 添加 cc:%s 自行 '%s'\n"
24134
a6cd2cc4 24135#: git-send-email.perl:1665
1a79b2f1
JX
24136#, perl-format
24137msgid "(mbox) Adding to: %s from line '%s'\n"
24138msgstr "(mbox) 添加 to:%s 自行 '%s'\n"
24139
a6cd2cc4 24140#: git-send-email.perl:1718
1a79b2f1
JX
24141#, perl-format
24142msgid "(non-mbox) Adding cc: %s from line '%s'\n"
24143msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n"
24144
a6cd2cc4 24145#: git-send-email.perl:1753
1a79b2f1
JX
24146#, perl-format
24147msgid "(body) Adding cc: %s from line '%s'\n"
24148msgstr "(body) 添加 cc: %s 自行 '%s'\n"
24149
a6cd2cc4 24150#: git-send-email.perl:1864
1a79b2f1
JX
24151#, perl-format
24152msgid "(%s) Could not execute '%s'"
24153msgstr "(%s) 不能执行 '%s'"
24154
a6cd2cc4 24155#: git-send-email.perl:1871
1a79b2f1
JX
24156#, perl-format
24157msgid "(%s) Adding %s: %s from: '%s'\n"
24158msgstr "(%s) 添加 %s: %s 自:'%s'\n"
24159
a6cd2cc4 24160#: git-send-email.perl:1875
1a79b2f1
JX
24161#, perl-format
24162msgid "(%s) failed to close pipe to '%s'"
24163msgstr "(%s) 无法关闭管道至 '%s'"
24164
a6cd2cc4 24165#: git-send-email.perl:1905
1a79b2f1
JX
24166msgid "cannot send message as 7bit"
24167msgstr "不能以 7bit 形式发送信息"
24168
a6cd2cc4 24169#: git-send-email.perl:1913
1a79b2f1
JX
24170msgid "invalid transfer encoding"
24171msgstr "无效的传送编码"
24172
a6cd2cc4 24173#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
1a79b2f1
JX
24174#, perl-format
24175msgid "unable to open %s: %s\n"
24176msgstr "不能打开 %s:%s\n"
24177
a6cd2cc4 24178#: git-send-email.perl:1957
1a79b2f1
JX
24179#, perl-format
24180msgid "%s: patch contains a line longer than 998 characters"
24181msgstr "%s:补丁包含一个超过 998 字符的行"
24182
a6cd2cc4 24183#: git-send-email.perl:1974
1a79b2f1
JX
24184#, perl-format
24185msgid "Skipping %s with backup suffix '%s'.\n"
24186msgstr "略过 %s 含备份后缀 '%s'。\n"
24187
24188#. TRANSLATORS: please keep "[y|N]" as is.
a6cd2cc4 24189#: git-send-email.perl:1978
1a79b2f1
JX
24190#, perl-format
24191msgid "Do you really want to send %s? [y|N]: "
24192msgstr "您真的要发送 %s?[y|N]:"