]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
Merge branch 'l10n/zh_TW/201223' of github.com:l10n-tw/git-po
[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 | 数据对象
d9488fea 31# bloom filter | 布隆过滤器
160fb2b2 32# branch | 分支
d9488fea 33# bundle | 归档包
160fb2b2
JX
34# bypass | 绕过
35# cache | 索引(的别称)
36# chain | (提交)链
37# changeset | 变更集
38# checkout | 检出
39# checksum | 校验,校验和
40# cherry-picking | 拣选
41# clean | 干净(的工作区)
42# clone | 克隆
43# commit | 提交
667599e8 44# commit message | 提交说明
160fb2b2
JX
45# commit object | 提交对象
46# commit-ish (also committish) | 提交号
47# conflict | 冲突
48# core Git | 核心 Git 工具
d46c5519 49# cover letter | 附函
160fb2b2 50# DAG | 有向无环图
e640d114 51# dangling object | 悬空对象
160fb2b2
JX
52# detached HEAD | 分离头指针
53# directory | 目录
54# dirty | 脏(的工作区)
755c831b 55# dumb HTTP protocol | 哑 HTTP 协议
160fb2b2
JX
56# evil merge | 坏合并(合并引入了父提交没有的修改)
57# fast-forward | 快进
58# fetch | 获取
59# file system | 文件系统
e397e7e3 60# fork | 派生
160fb2b2
JX
61# Git archive | 仓库(对于 arch 用户)
62# gitfile | gitfile(仓库链接文件)
fd8cb379 63# grafts | (提交)移植
160fb2b2
JX
64# hash | 哈希值
65# HEAD | HEAD(头指针,亦即当前分支)
66# head | 头、分支
67# head ref | 分支
68# header | 头信息
69# hook | 钩子
70# hunk | 补丁片段
71# index | 索引
72# index entry | 索引条目
73# loose object | 松散对象
74# loose refs | 松散引用
75# master | master(默认分支名)
76# merge | 合并
77# object | 对象
78# object database | 对象库
79# object identifier | 对象标识符
80# object name | 对象名称
81# object type | 对象类型
82# octopus | 章鱼式合并(两分支以上的合并)
83# origin | origin(默认的远程名称)
84# pack | 包
85# pack index | 包索引
86# packfile | 包文件
87# parent | 父提交
88# patch | 补丁
89# pathspec | 路径规格
90# pattern | 模式
12e59059 91# pickaxe | 挖掘
160fb2b2
JX
92# plumbing | 管件(Git 底层核心命令的别称)
93# porcelain | 瓷件(Git 上层封装命令的别称)
94550ed3 94# precious-objects repo | 珍品仓库
160fb2b2
JX
95# prune | 清除
96# pull | 拉,拉取
97# push | 推,推送
98# reachable | 可达
99# rebase | 变基
100# ref | 引用
101# reflog | 引用日志
102# refspec | 引用规格
103# remote | 远程,远程仓库
104# remote-tracking branch | 远程跟踪分支
105# replay | 重放
106# repo | 仓库
107# repository | 仓库
108# resolve | (冲突)解决
109# revert | 还原
110# revision | 版本
111# rewind | 回退
112# SCM | 源代码管理(工具)
ee7589bb 113# SHA-1 | SHA-1(安全哈希算法1)
160fb2b2
JX
114# shallow repository | 浅(克隆)仓库
115# signed tag | 签名标签
755c831b 116# smart HTTP protocol | 智能 HTTP 协议
160fb2b2
JX
117# squash | 压缩
118# stage | n. 暂存区(即索引); v. 暂存
a4f16749 119# stash | n. 贮藏区; v. 贮藏
160fb2b2
JX
120# submodule | 子模组
121# symref | 符号引用
933c015e 122# tag | n. 标签; v. 打标签
160fb2b2
JX
123# tag object | 标签对象
124# tagger | 打标签者
125# topic branch | 主题分支
126# track | 跟踪
6937cb4e 127# trailer | 尾部署名
160fb2b2
JX
128# tree | 树(工作区或树对象)
129# tree object | 树对象
130# tree-ish (also treeish) | 树对象(或可以解析为一树对象)
131# unmerged index | 未合并索引
132# unpack | 解包
133# unreachable object | 不可达对象
134# unstage | 取消暂存
135# upstream | 上游
136# upstream branch | 上游分支
137# working tree | 工作区
138#
c04f5ac3
JX
139msgid ""
140msgstr ""
141"Project-Id-Version: Git\n"
142"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
d9488fea
JX
143"POT-Creation-Date: 2020-10-10 09:32+0800\n"
144"PO-Revision-Date: 2020-10-10 09:43+0800\n"
c04f5ac3 145"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
7aea43ff 146"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
c04f5ac3
JX
147"Language: zh_CN\n"
148"MIME-Version: 1.0\n"
149"Content-Type: text/plain; charset=UTF-8\n"
150"Content-Transfer-Encoding: 8bit\n"
5ae481e0 151"Plural-Forms: nplurals=2; plural=(n != 1);\n"
c04f5ac3 152
2b472aae 153#: add-interactive.c:368
ddc12c42
JX
154#, c-format
155msgid "Huh (%s)?"
156msgstr "嗯(%s)?"
157
d9488fea
JX
158#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250
159#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526
160#: builtin/rebase.c:1944
ddc12c42
JX
161msgid "could not read index"
162msgstr "不能读取索引"
163
2b472aae 164#: add-interactive.c:576 git-add--interactive.perl:269
ddc12c42
JX
165#: git-add--interactive.perl:294
166msgid "binary"
167msgstr "二进制"
168
2b472aae 169#: add-interactive.c:634 git-add--interactive.perl:278
ddc12c42
JX
170#: git-add--interactive.perl:332
171msgid "nothing"
172msgstr "无"
173
2b472aae 174#: add-interactive.c:635 git-add--interactive.perl:314
ddc12c42
JX
175#: git-add--interactive.perl:329
176msgid "unchanged"
177msgstr "没有修改"
178
2b472aae 179#: add-interactive.c:672 git-add--interactive.perl:643
ddc12c42
JX
180msgid "Update"
181msgstr "更新"
182
2b472aae 183#: add-interactive.c:689 add-interactive.c:877
ddc12c42
JX
184#, c-format
185msgid "could not stage '%s'"
186msgstr "不能暂存 '%s'"
187
d9488fea 188#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444
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
d9488fea 204#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295
349ede6a 205#: builtin/reset.c:145
ddc12c42
JX
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
d9488fea 246#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371
ddc12c42
JX
247#, c-format
248msgid "Only binary files changed.\n"
249msgstr "只有二进制文件被修改。\n"
250
d9488fea 251#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373
ddc12c42
JX
252#, c-format
253msgid "No changes.\n"
254msgstr "没有修改。\n"
255
d9488fea 256#: add-interactive.c:935 git-add--interactive.perl:1381
ddc12c42
JX
257msgid "Patch update"
258msgstr "补丁更新"
259
d9488fea 260#: add-interactive.c:974 git-add--interactive.perl:1794
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
d9488fea 328#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891
ddc12c42
JX
329msgid "*** Commands ***"
330msgstr "*** 命令 ***"
331
d9488fea 332#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888
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
d9488fea
JX
344#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270
345#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123
346#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190
347#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818
348#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
349#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
349ede6a 350#: git-add--interactive.perl:213
ddc12c42
JX
351msgid "path"
352msgstr "路径"
353
2b472aae 354#: add-interactive.c:1143
ddc12c42
JX
355msgid "could not refresh index"
356msgstr "不能刷新索引"
357
d9488fea 358#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805
ddc12c42
JX
359#, c-format
360msgid "Bye.\n"
361msgstr "再见。\n"
362
d9488fea 363#: add-patch.c:34 git-add--interactive.perl:1433
2b472aae
JX
364#, c-format, perl-format
365msgid "Stage mode change [y,n,q,a,d%s,?]? "
366msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
ddc12c42 367
d9488fea 368#: add-patch.c:35 git-add--interactive.perl:1434
2b472aae
JX
369#, c-format, perl-format
370msgid "Stage deletion [y,n,q,a,d%s,?]? "
371msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
ddc12c42 372
d9488fea 373#: add-patch.c:36 git-add--interactive.perl:1435
7157c2b5
JX
374#, c-format, perl-format
375msgid "Stage addition [y,n,q,a,d%s,?]? "
376msgstr "暂存添加动作 [y,n,q,a,d%s,?]? "
377
d9488fea 378#: add-patch.c:37 git-add--interactive.perl:1436
2b472aae
JX
379#, c-format, perl-format
380msgid "Stage this hunk [y,n,q,a,d%s,?]? "
381msgstr "暂存该块 [y,n,q,a,d%s,?]? "
382
7157c2b5 383#: add-patch.c:39
2b472aae
JX
384msgid ""
385"If the patch applies cleanly, the edited hunk will immediately be marked for "
386"staging."
387msgstr "如果补丁能正确地应用,编辑块将立即标记为暂存。"
388
7157c2b5 389#: add-patch.c:42
2b472aae
JX
390msgid ""
391"y - stage this hunk\n"
392"n - do not stage this hunk\n"
393"q - quit; do not stage this hunk or any of the remaining ones\n"
394"a - stage this hunk and all later hunks in the file\n"
395"d - do not stage this hunk or any of the later hunks in the file\n"
396msgstr ""
397"y - 暂存该块\n"
398"n - 不要暂存该块\n"
399"q - 退出。不暂存该块及后面的全部块\n"
400"a - 暂存该块和本文件中后面的全部块\n"
401"d - 不暂存该块和本文件中后面的全部块\n"
402
d9488fea 403#: add-patch.c:56 git-add--interactive.perl:1439
2b472aae
JX
404#, c-format, perl-format
405msgid "Stash mode change [y,n,q,a,d%s,?]? "
406msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
407
d9488fea 408#: add-patch.c:57 git-add--interactive.perl:1440
2b472aae
JX
409#, c-format, perl-format
410msgid "Stash deletion [y,n,q,a,d%s,?]? "
411msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
412
d9488fea 413#: add-patch.c:58 git-add--interactive.perl:1441
7157c2b5
JX
414#, c-format, perl-format
415msgid "Stash addition [y,n,q,a,d%s,?]? "
416msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? "
417
d9488fea 418#: add-patch.c:59 git-add--interactive.perl:1442
2b472aae
JX
419#, c-format, perl-format
420msgid "Stash this hunk [y,n,q,a,d%s,?]? "
421msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
422
7157c2b5 423#: add-patch.c:61
2b472aae
JX
424msgid ""
425"If the patch applies cleanly, the edited hunk will immediately be marked for "
426"stashing."
427msgstr "如果补丁能正确地应用,编辑块将立即标记为贮藏。"
428
7157c2b5 429#: add-patch.c:64
2b472aae
JX
430msgid ""
431"y - stash this hunk\n"
432"n - do not stash this hunk\n"
433"q - quit; do not stash this hunk or any of the remaining ones\n"
434"a - stash this hunk and all later hunks in the file\n"
435"d - do not stash this hunk or any of the later hunks in the file\n"
436msgstr ""
437"y - 贮藏该块\n"
438"n - 不要贮藏该块\n"
439"q - 退出。不贮藏该块及后面的全部块\n"
440"a - 贮藏该块和本文件中后面的全部块\n"
441"d - 不贮藏该块和本文件中后面的全部块\n"
442
d9488fea 443#: add-patch.c:80 git-add--interactive.perl:1445
2b472aae
JX
444#, c-format, perl-format
445msgid "Unstage mode change [y,n,q,a,d%s,?]? "
446msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
447
d9488fea 448#: add-patch.c:81 git-add--interactive.perl:1446
2b472aae
JX
449#, c-format, perl-format
450msgid "Unstage deletion [y,n,q,a,d%s,?]? "
451msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
452
d9488fea 453#: add-patch.c:82 git-add--interactive.perl:1447
7157c2b5
JX
454#, c-format, perl-format
455msgid "Unstage addition [y,n,q,a,d%s,?]? "
456msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? "
457
d9488fea 458#: add-patch.c:83 git-add--interactive.perl:1448
2b472aae
JX
459#, c-format, perl-format
460msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
461msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
462
7157c2b5 463#: add-patch.c:85
2b472aae
JX
464msgid ""
465"If the patch applies cleanly, the edited hunk will immediately be marked for "
466"unstaging."
467msgstr "如果补丁能正确地应用,编辑块将立即标记为未暂存。"
468
7157c2b5 469#: add-patch.c:88
2b472aae
JX
470msgid ""
471"y - unstage this hunk\n"
472"n - do not unstage this hunk\n"
473"q - quit; do not unstage this hunk or any of the remaining ones\n"
474"a - unstage this hunk and all later hunks in the file\n"
475"d - do not unstage this hunk or any of the later hunks in the file\n"
476msgstr ""
440e7442
FZ
477"y - 取消暂存该块\n"
478"n - 不要取消暂存该块\n"
479"q - 退出。不要取消暂存该块及后面的全部块\n"
480"a - 取消暂存该块和本文件中后面的全部块\n"
481"d - 不要取消暂存该块和本文件中后面的全部块\n"
2b472aae 482
d9488fea 483#: add-patch.c:103 git-add--interactive.perl:1451
2b472aae
JX
484#, c-format, perl-format
485msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
486msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
487
d9488fea 488#: add-patch.c:104 git-add--interactive.perl:1452
2b472aae
JX
489#, c-format, perl-format
490msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
491msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
492
d9488fea 493#: add-patch.c:105 git-add--interactive.perl:1453
7157c2b5
JX
494#, c-format, perl-format
495msgid "Apply addition to index [y,n,q,a,d%s,?]? "
496msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? "
497
d9488fea 498#: add-patch.c:106 git-add--interactive.perl:1454
2b472aae
JX
499#, c-format, perl-format
500msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
501msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
502
7157c2b5 503#: add-patch.c:108 add-patch.c:176 add-patch.c:221
2b472aae
JX
504msgid ""
505"If the patch applies cleanly, the edited hunk will immediately be marked for "
506"applying."
507msgstr "如果补丁能正确地应用,编辑块将立即标记为应用。"
508
7157c2b5 509#: add-patch.c:111
2b472aae
JX
510msgid ""
511"y - apply this hunk to index\n"
512"n - do not apply this hunk to index\n"
513"q - quit; do not apply this hunk or any of the remaining ones\n"
514"a - apply this hunk and all later hunks in the file\n"
515"d - do not apply this hunk or any of the later hunks in the file\n"
516msgstr ""
517"y - 在索引中应用该块\n"
518"n - 不要在索引中应用该块\n"
519"q - 退出。不要应用该块及后面的全部块\n"
520"a - 应用该块和本文件中后面的全部块\n"
521"d - 不要应用该块和本文件中后面的全部块\n"
522
d9488fea
JX
523#: add-patch.c:126 git-add--interactive.perl:1457
524#: git-add--interactive.perl:1475
2b472aae
JX
525#, c-format, perl-format
526msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
527msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
528
d9488fea
JX
529#: add-patch.c:127 git-add--interactive.perl:1458
530#: git-add--interactive.perl:1476
2b472aae
JX
531#, c-format, perl-format
532msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
533msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
ddc12c42 534
d9488fea
JX
535#: add-patch.c:128 git-add--interactive.perl:1459
536#: git-add--interactive.perl:1477
7157c2b5
JX
537#, c-format, perl-format
538msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
539msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
540
d9488fea
JX
541#: add-patch.c:129 git-add--interactive.perl:1460
542#: git-add--interactive.perl:1478
2b472aae
JX
543#, c-format, perl-format
544msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
545msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
546
7157c2b5 547#: add-patch.c:131 add-patch.c:154 add-patch.c:199
2b472aae
JX
548msgid ""
549"If the patch applies cleanly, the edited hunk will immediately be marked for "
550"discarding."
551msgstr "如果补丁能正确地应用,编辑块将立即标记为丢弃。"
552
7157c2b5 553#: add-patch.c:134 add-patch.c:202
2b472aae
JX
554msgid ""
555"y - discard this hunk from worktree\n"
556"n - do not discard this hunk from worktree\n"
557"q - quit; do not discard this hunk or any of the remaining ones\n"
558"a - discard this hunk and all later hunks in the file\n"
559"d - do not discard this hunk or any of the later hunks in the file\n"
560msgstr ""
561"y - 在工作区中丢弃该块\n"
562"n - 不要在工作区中丢弃该块\n"
563"q - 退出。不要丢弃该块及后面的全部块\n"
564"a - 丢弃该块和本文件中后面的全部块\n"
565"d - 不要丢弃该块和本文件中后面的全部块\n"
566
d9488fea 567#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
2b472aae
JX
568#, c-format, perl-format
569msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
570msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
571
d9488fea 572#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
2b472aae
JX
573#, c-format, perl-format
574msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
7157c2b5 575msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
2b472aae 576
d9488fea 577#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
7157c2b5
JX
578#, c-format, perl-format
579msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
580msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
581
d9488fea 582#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
2b472aae
JX
583#, c-format, perl-format
584msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
585msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
586
7157c2b5 587#: add-patch.c:157
2b472aae
JX
588msgid ""
589"y - discard this hunk from index and worktree\n"
590"n - do not discard this hunk from index and worktree\n"
591"q - quit; do not discard this hunk or any of the remaining ones\n"
592"a - discard this hunk and all later hunks in the file\n"
593"d - do not discard this hunk or any of the later hunks in the file\n"
594msgstr ""
595"y - 在索引和工作区中丢弃该块\n"
596"n - 不要在索引和工作区中丢弃该块\n"
597"q - 退出。不要丢弃该块及后面的全部块\n"
598"a - 丢弃该块和本文件中后面的全部块\n"
599"d - 不要丢弃该块和本文件中后面的全部块\n"
600
d9488fea 601#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
2b472aae
JX
602#, c-format, perl-format
603msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
604msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
605
d9488fea 606#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
2b472aae
JX
607#, c-format, perl-format
608msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
609msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
610
d9488fea 611#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
7157c2b5
JX
612#, c-format, perl-format
613msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
614msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
615
d9488fea 616#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
2b472aae
JX
617#, c-format, perl-format
618msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
619msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
620
7157c2b5 621#: add-patch.c:179
2b472aae
JX
622msgid ""
623"y - apply this hunk to index and worktree\n"
624"n - do not apply this hunk to index and worktree\n"
625"q - quit; do not apply this hunk or any of the remaining ones\n"
626"a - apply this hunk and all later hunks in the file\n"
627"d - do not apply this hunk or any of the later hunks in the file\n"
628msgstr ""
629"y - 在索引和工作区中应用该块\n"
630"n - 不要在索引和工作区中应用该块\n"
631"q - 退出。不要应用该块及后面的全部块\n"
632"a - 应用该块和本文件中后面的全部块\n"
633"d - 不要应用该块和本文件中后面的全部块\n"
634
7157c2b5 635#: add-patch.c:224
2b472aae
JX
636msgid ""
637"y - apply this hunk to worktree\n"
638"n - do not apply this hunk to worktree\n"
639"q - quit; do not apply this hunk or any of the remaining ones\n"
640"a - apply this hunk and all later hunks in the file\n"
641"d - do not apply this hunk or any of the later hunks in the file\n"
642msgstr ""
643"y - 在工作区中应用该块\n"
644"n - 不要在工作区中应用该块\n"
645"q - 退出。不要应用该块及后面的全部块\n"
646"a - 应用该块和本文件中后面的全部块\n"
647"d - 不要应用该块和本文件中后面的全部块\n"
648
d9488fea 649#: add-patch.c:342
ddc12c42
JX
650#, c-format
651msgid "could not parse hunk header '%.*s'"
652msgstr "无法解析数据块头信息 '%.*s'"
653
d9488fea 654#: add-patch.c:361 add-patch.c:365
ddc12c42
JX
655#, c-format
656msgid "could not parse colored hunk header '%.*s'"
657msgstr "无法解析彩色数据块头信息 '%.*s'"
658
d9488fea 659#: add-patch.c:419
ddc12c42
JX
660msgid "could not parse diff"
661msgstr "不能解析差异信息"
662
d9488fea 663#: add-patch.c:438
ddc12c42
JX
664msgid "could not parse colored diff"
665msgstr "不能解析彩色差异信息"
666
d9488fea 667#: add-patch.c:452
2b472aae
JX
668#, c-format
669msgid "failed to run '%s'"
670msgstr "运行 '%s' 失败"
671
d9488fea 672#: add-patch.c:611
2b472aae
JX
673msgid "mismatched output from interactive.diffFilter"
674msgstr "interactive.diffFilter 的输出不匹配"
675
d9488fea 676#: add-patch.c:612
2b472aae
JX
677msgid ""
678"Your filter must maintain a one-to-one correspondence\n"
679"between its input and output lines."
680msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"
681
d9488fea 682#: add-patch.c:785
ddc12c42
JX
683#, c-format
684msgid ""
685"expected context line #%d in\n"
686"%.*s"
687msgstr ""
688"预期上下文行 #%d 于\n"
689"%.*s"
690
d9488fea 691#: add-patch.c:800
ddc12c42
JX
692#, c-format
693msgid ""
694"hunks do not overlap:\n"
695"%.*s\n"
696"\tdoes not end with:\n"
697"%.*s"
698msgstr ""
699"块不重叠:\n"
700"%.*s\n"
701"\t不是结尾于:\n"
702"%.*s"
703
d9488fea 704#: add-patch.c:1076 git-add--interactive.perl:1117
ddc12c42
JX
705msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
706msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
707
d9488fea 708#: add-patch.c:1080
ddc12c42
JX
709#, c-format
710msgid ""
711"---\n"
712"To remove '%c' lines, make them ' ' lines (context).\n"
713"To remove '%c' lines, delete them.\n"
714"Lines starting with %c will be removed.\n"
715msgstr ""
716"---\n"
717"要删除 '%c' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
718"要删除 '%c' 开始的行,删除它们。\n"
719"以 %c 开始的行将被删除。\n"
720
ddc12c42 721#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
d9488fea 722#: add-patch.c:1094 git-add--interactive.perl:1131
ddc12c42
JX
723msgid ""
724"If it does not apply cleanly, you will be given an opportunity to\n"
725"edit again. If all lines of the hunk are removed, then the edit is\n"
726"aborted and the hunk is left unchanged.\n"
727msgstr ""
728"如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
729"此次编辑被终止,该块不会被修改。\n"
730
d9488fea 731#: add-patch.c:1127
ddc12c42
JX
732msgid "could not parse hunk header"
733msgstr "无法解析数据块头信息"
734
d9488fea 735#: add-patch.c:1172
ddc12c42
JX
736msgid "'git apply --cached' failed"
737msgstr "'git apply --cached' 失败"
738
739#. TRANSLATORS: do not translate [y/n]
740#. The program will only accept that input at this point.
741#. Consider translating (saying "no" discards!) as
742#. (saying "n" for "no" discards!) if the translation
743#. of the word "no" does not start with n.
744#.
745#. TRANSLATORS: do not translate [y/n]
746#. The program will only accept that input
747#. at this point.
748#. Consider translating (saying "no" discards!) as
749#. (saying "n" for "no" discards!) if the translation
750#. of the word "no" does not start with n.
d9488fea 751#: add-patch.c:1241 git-add--interactive.perl:1244
ddc12c42
JX
752msgid ""
753"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
754msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
755
d9488fea 756#: add-patch.c:1284
2b472aae
JX
757msgid "The selected hunks do not apply to the index!"
758msgstr "选中的块不能应用到索引!"
759
d9488fea 760#: add-patch.c:1285 git-add--interactive.perl:1348
2b472aae
JX
761msgid "Apply them to the worktree anyway? "
762msgstr "无论如何都要应用到工作区么?"
763
d9488fea 764#: add-patch.c:1292 git-add--interactive.perl:1351
2b472aae
JX
765msgid "Nothing was applied.\n"
766msgstr "未应用。\n"
ddc12c42 767
d9488fea 768#: add-patch.c:1349
ddc12c42
JX
769msgid ""
770"j - leave this hunk undecided, see next undecided hunk\n"
771"J - leave this hunk undecided, see next hunk\n"
772"k - leave this hunk undecided, see previous undecided hunk\n"
773"K - leave this hunk undecided, see previous hunk\n"
774"g - select a hunk to go to\n"
775"/ - search for a hunk matching the given regex\n"
776"s - split the current hunk into smaller hunks\n"
777"e - manually edit the current hunk\n"
778"? - print help\n"
779msgstr ""
780"j - 维持该块未决状态,查看下一个未决块\n"
781"J - 维持该块未决状态,查看下一个块\n"
782"k - 维持该块未决状态,查看上一个未决块\n"
783"K - 维持该块未决状态,查看上一个块\n"
784"g - 选择跳转到一个块\n"
785"/ - 查找和给定正则表达式匹配的块\n"
786"s - 拆分当前块为更小的块\n"
787"e - 手动编辑当前块\n"
788"? - 显示帮助\n"
789
d9488fea 790#: add-patch.c:1511 add-patch.c:1521
ddc12c42
JX
791msgid "No previous hunk"
792msgstr "没有前一个块"
793
d9488fea 794#: add-patch.c:1516 add-patch.c:1526
ddc12c42
JX
795msgid "No next hunk"
796msgstr "没有下一个块"
797
d9488fea 798#: add-patch.c:1532
ddc12c42
JX
799msgid "No other hunks to goto"
800msgstr "没有其它可供跳转的块"
801
d9488fea 802#: add-patch.c:1543 git-add--interactive.perl:1608
ddc12c42
JX
803msgid "go to which hunk (<ret> to see more)? "
804msgstr "跳转到哪个块(<回车> 查看更多)? "
805
d9488fea 806#: add-patch.c:1544 git-add--interactive.perl:1610
ddc12c42
JX
807msgid "go to which hunk? "
808msgstr "跳转到哪个块?"
809
d9488fea 810#: add-patch.c:1555
ddc12c42
JX
811#, c-format
812msgid "Invalid number: '%s'"
813msgstr "无效数字:'%s'"
814
d9488fea 815#: add-patch.c:1560
ddc12c42
JX
816#, c-format
817msgid "Sorry, only %d hunk available."
818msgid_plural "Sorry, only %d hunks available."
819msgstr[0] "对不起,只有 %d 个可用块。"
820msgstr[1] "对不起,只有 %d 个可用块。"
821
d9488fea 822#: add-patch.c:1569
ddc12c42
JX
823msgid "No other hunks to search"
824msgstr "没有其它可供查找的块"
825
d9488fea 826#: add-patch.c:1575 git-add--interactive.perl:1663
ddc12c42
JX
827msgid "search for regex? "
828msgstr "使用正则表达式搜索?"
829
d9488fea 830#: add-patch.c:1590
ddc12c42
JX
831#, c-format
832msgid "Malformed search regexp %s: %s"
833msgstr "错误的正则表达式 %s:%s"
834
d9488fea 835#: add-patch.c:1607
ddc12c42
JX
836msgid "No hunk matches the given pattern"
837msgstr "没有和给定模式相匹配的块"
838
d9488fea 839#: add-patch.c:1614
ddc12c42
JX
840msgid "Sorry, cannot split this hunk"
841msgstr "对不起,不能拆分这个块"
842
d9488fea 843#: add-patch.c:1618
ddc12c42
JX
844#, c-format
845msgid "Split into %d hunks."
846msgstr "拆分为 %d 块。"
847
d9488fea 848#: add-patch.c:1622
ddc12c42
JX
849msgid "Sorry, cannot edit this hunk"
850msgstr "对不起,不能编辑这个块"
851
d9488fea 852#: add-patch.c:1674
2b472aae
JX
853msgid "'git apply' failed"
854msgstr "'git apply' 失败"
855
349ede6a
JX
856#: advice.c:140
857#, c-format
858msgid ""
859"\n"
860"Disable this message with \"git config advice.%s false\""
861msgstr ""
862"\n"
863"使用 \"git config advice.%s false\" 来关闭此消息"
864
865#: advice.c:156
c04f5ac3 866#, c-format
fd8cb379
JX
867msgid "%shint: %.*s%s\n"
868msgstr "%s提示:%.*s%s\n"
c04f5ac3 869
349ede6a 870#: advice.c:247
5c57d762
JX
871msgid "Cherry-picking is not possible because you have unmerged files."
872msgstr "无法拣选,因为您有未合并的文件。"
873
349ede6a 874#: advice.c:249
5c57d762
JX
875msgid "Committing is not possible because you have unmerged files."
876msgstr "无法提交,因为您有未合并的文件。"
877
349ede6a 878#: advice.c:251
5c57d762
JX
879msgid "Merging is not possible because you have unmerged files."
880msgstr "无法合并,因为您有未合并的文件。"
881
349ede6a 882#: advice.c:253
5c57d762
JX
883msgid "Pulling is not possible because you have unmerged files."
884msgstr "无法拉取,因为您有未合并的文件。"
885
349ede6a 886#: advice.c:255
5c57d762
JX
887msgid "Reverting is not possible because you have unmerged files."
888msgstr "无法回退,因为您有未合并的文件。"
889
349ede6a 890#: advice.c:257
5c57d762
JX
891#, c-format
892msgid "It is not possible to %s because you have unmerged files."
893msgstr "无法 %s,因为您有未合并的文件。"
894
349ede6a 895#: advice.c:265
c04f5ac3 896msgid ""
6acbf033 897"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 898"as appropriate to mark resolution and make a commit."
c04f5ac3 899msgstr ""
d9d56b23 900"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
220c313c 901"解决方案并提交。"
c04f5ac3 902
349ede6a 903#: advice.c:273
5c57d762
JX
904msgid "Exiting because of an unresolved conflict."
905msgstr "因为存在未解决的冲突而退出。"
906
d9488fea 907#: advice.c:278 builtin/merge.c:1349
1b7f4a34
JX
908msgid "You have not concluded your merge (MERGE_HEAD exists)."
909msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
910
349ede6a 911#: advice.c:280
94550ed3 912msgid "Please, commit your changes before merging."
1b7f4a34
JX
913msgstr "请在合并前先提交您的修改。"
914
349ede6a 915#: advice.c:281
1b7f4a34
JX
916msgid "Exiting because of unfinished merge."
917msgstr "因为存在未完成的合并而退出。"
918
349ede6a 919#: advice.c:287
5c57d762
JX
920#, c-format
921msgid ""
a6cd2cc4 922"Note: switching to '%s'.\n"
5c57d762
JX
923"\n"
924"You are in 'detached HEAD' state. You can look around, make experimental\n"
925"changes and commit them, and you can discard any commits you make in this\n"
a6cd2cc4 926"state without impacting any branches by switching back to a branch.\n"
5c57d762
JX
927"\n"
928"If you want to create a new branch to retain commits you create, you may\n"
a6cd2cc4 929"do so (now or later) by using -c with the switch command. Example:\n"
5c57d762 930"\n"
a6cd2cc4
JX
931" git switch -c <new-branch-name>\n"
932"\n"
933"Or undo this operation with:\n"
934"\n"
935" git switch -\n"
936"\n"
937"Turn off this advice by setting config variable advice.detachedHead to "
938"false\n"
5c57d762
JX
939"\n"
940msgstr ""
a6cd2cc4
JX
941"注意:正在切换到 '%s'。\n"
942"\n"
943"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以在切换\n"
944"回一个分支时,丢弃在此状态下所做的提交而不对分支造成影响。\n"
5c57d762 945"\n"
a6cd2cc4
JX
946"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在 switch 命令\n"
947"中添加参数 -c 来实现(现在或稍后)。例如:\n"
5c57d762 948"\n"
a6cd2cc4 949" git switch -c <新分支名>\n"
5c57d762 950"\n"
a6cd2cc4
JX
951"或者撤销此操作:\n"
952"\n"
953" git switch -\n"
954"\n"
955"通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n"
5c57d762
JX
956"\n"
957
06991777
JX
958#: alias.c:50
959msgid "cmdline ends with \\"
960msgstr "命令行以 \\ 结尾"
961
962#: alias.c:51
963msgid "unclosed quote"
964msgstr "未关闭的引号"
965
a6cd2cc4 966#: apply.c:69
a0b6b246
JX
967#, c-format
968msgid "unrecognized whitespace option '%s'"
969msgstr "未能识别的空白字符选项 '%s'"
ef317cd5 970
a6cd2cc4 971#: apply.c:85
90314792 972#, c-format
a0b6b246
JX
973msgid "unrecognized whitespace ignore option '%s'"
974msgstr "未能识别的空白字符忽略选项 '%s'"
90314792 975
a6cd2cc4 976#: apply.c:135
a0b6b246 977msgid "--reject and --3way cannot be used together."
2090d5b4 978msgstr "--reject 和 --3way 不能同时使用。"
ef317cd5 979
a6cd2cc4 980#: apply.c:137
a0b6b246
JX
981msgid "--cached and --3way cannot be used together."
982msgstr "--cached 和 --3way 不能同时使用。"
ef317cd5 983
a6cd2cc4 984#: apply.c:140
a0b6b246
JX
985msgid "--3way outside a repository"
986msgstr "--3way 在一个仓库之外"
ef317cd5 987
a6cd2cc4 988#: apply.c:151
a0b6b246
JX
989msgid "--index outside a repository"
990msgstr "--index 在一个仓库之外"
ef317cd5 991
a6cd2cc4 992#: apply.c:154
a0b6b246
JX
993msgid "--cached outside a repository"
994msgstr "--cached 在一个仓库之外"
ef317cd5 995
a6cd2cc4 996#: apply.c:801
a0b6b246
JX
997#, c-format
998msgid "Cannot prepare timestamp regexp %s"
999msgstr "无法准备时间戳正则表达式 %s"
ef317cd5 1000
a6cd2cc4 1001#: apply.c:810
a0b6b246
JX
1002#, c-format
1003msgid "regexec returned %d for input: %s"
1004msgstr "regexec 返回 %d,输入为:%s"
ef317cd5 1005
a6cd2cc4 1006#: apply.c:884
a0b6b246
JX
1007#, c-format
1008msgid "unable to find filename in patch at line %d"
1009msgstr "不能在补丁的第 %d 行找到文件名"
ef317cd5 1010
a6cd2cc4 1011#: apply.c:922
a0b6b246
JX
1012#, c-format
1013msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1014msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
ef317cd5 1015
a6cd2cc4 1016#: apply.c:928
a0b6b246
JX
1017#, c-format
1018msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1019msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
ef317cd5 1020
a6cd2cc4 1021#: apply.c:929
a0b6b246
JX
1022#, c-format
1023msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1024msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
ef317cd5 1025
a6cd2cc4 1026#: apply.c:934
a0b6b246
JX
1027#, c-format
1028msgid "git apply: bad git-diff - expected /dev/null on line %d"
1029msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
ef317cd5 1030
a6cd2cc4 1031#: apply.c:963
a4f16749
JX
1032#, c-format
1033msgid "invalid mode on line %d: %s"
1034msgstr "第 %d 行包含无效文件模式:%s"
1035
a6cd2cc4 1036#: apply.c:1282
a4f16749
JX
1037#, c-format
1038msgid "inconsistent header lines %d and %d"
1039msgstr "不一致的文件头,%d 行和 %d 行"
1040
a5cd71ca 1041#: apply.c:1372
a0b6b246
JX
1042#, c-format
1043msgid ""
1044"git diff header lacks filename information when removing %d leading pathname "
1045"component (line %d)"
1046msgid_plural ""
1047"git diff header lacks filename information when removing %d leading pathname "
1048"components (line %d)"
1049msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1050msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
ef317cd5 1051
a5cd71ca 1052#: apply.c:1385
a0b6b246
JX
1053#, c-format
1054msgid "git diff header lacks filename information (line %d)"
1055msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
07432cef 1056
a5cd71ca
JX
1057#: apply.c:1481
1058#, c-format
1059msgid "recount: unexpected line: %.*s"
1060msgstr "recount:意外的行:%.*s"
1061
1062#: apply.c:1550
1063#, c-format
1064msgid "patch fragment without header at line %d: %.*s"
1065msgstr "第 %d 行的补丁片段没有头信息:%.*s"
1066
1067#: apply.c:1753
a0b6b246
JX
1068msgid "new file depends on old contents"
1069msgstr "新文件依赖旧内容"
5c57d762 1070
a5cd71ca 1071#: apply.c:1755
a0b6b246
JX
1072msgid "deleted file still has contents"
1073msgstr "删除的文件仍有内容"
5c57d762 1074
a5cd71ca 1075#: apply.c:1789
a0b6b246
JX
1076#, c-format
1077msgid "corrupt patch at line %d"
1078msgstr "补丁在第 %d 行损坏"
5c57d762 1079
a5cd71ca 1080#: apply.c:1826
5c57d762 1081#, c-format
a0b6b246
JX
1082msgid "new file %s depends on old contents"
1083msgstr "新文件 %s 依赖旧内容"
5c57d762 1084
a5cd71ca 1085#: apply.c:1828
5c57d762 1086#, c-format
a0b6b246
JX
1087msgid "deleted file %s still has contents"
1088msgstr "删除的文件 %s 仍有内容"
5c57d762 1089
a5cd71ca 1090#: apply.c:1831
a0b6b246
JX
1091#, c-format
1092msgid "** warning: file %s becomes empty but is not deleted"
1093msgstr "** 警告:文件 %s 成为空文件但并未删除"
ef317cd5 1094
a5cd71ca 1095#: apply.c:1978
5c57d762 1096#, c-format
a0b6b246
JX
1097msgid "corrupt binary patch at line %d: %.*s"
1098msgstr "二进制补丁在第 %d 行损坏:%.*s"
5c57d762 1099
a5cd71ca 1100#: apply.c:2015
5c57d762 1101#, c-format
a0b6b246
JX
1102msgid "unrecognized binary patch at line %d"
1103msgstr "未能识别的二进制补丁位于第 %d 行"
5c57d762 1104
a5cd71ca 1105#: apply.c:2177
5c57d762 1106#, c-format
a0b6b246
JX
1107msgid "patch with only garbage at line %d"
1108msgstr "补丁文件的第 %d 行只有垃圾数据"
5c57d762 1109
a5cd71ca 1110#: apply.c:2263
5c57d762 1111#, c-format
a0b6b246
JX
1112msgid "unable to read symlink %s"
1113msgstr "无法读取符号链接 %s"
5c57d762 1114
a5cd71ca 1115#: apply.c:2267
5c57d762 1116#, c-format
a0b6b246
JX
1117msgid "unable to open or read %s"
1118msgstr "不能打开或读取 %s"
5c57d762 1119
ddc12c42 1120#: apply.c:2936
5c57d762 1121#, c-format
a0b6b246
JX
1122msgid "invalid start of line: '%c'"
1123msgstr "无效的行首字符:'%c'"
5c57d762 1124
ddc12c42 1125#: apply.c:3057
5c57d762 1126#, c-format
a0b6b246
JX
1127msgid "Hunk #%d succeeded at %d (offset %d line)."
1128msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1129msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
1130msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
5c57d762 1131
ddc12c42 1132#: apply.c:3069
5c57d762 1133#, c-format
a0b6b246
JX
1134msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1135msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
5c57d762 1136
ddc12c42 1137#: apply.c:3075
5c57d762
JX
1138#, c-format
1139msgid ""
a0b6b246
JX
1140"while searching for:\n"
1141"%.*s"
5c57d762 1142msgstr ""
a0b6b246
JX
1143"当查询:\n"
1144"%.*s"
5c57d762 1145
ddc12c42 1146#: apply.c:3097
5c57d762 1147#, c-format
a0b6b246
JX
1148msgid "missing binary patch data for '%s'"
1149msgstr "缺失 '%s' 的二进制补丁数据"
5c57d762 1150
ddc12c42 1151#: apply.c:3105
5c57d762 1152#, c-format
a0b6b246 1153msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
29004bbb 1154msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
5c57d762 1155
ddc12c42 1156#: apply.c:3152
5c57d762 1157#, c-format
a0b6b246
JX
1158msgid "cannot apply binary patch to '%s' without full index line"
1159msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
5c57d762 1160
2b472aae 1161#: apply.c:3163
5c57d762 1162#, c-format
a0b6b246
JX
1163msgid ""
1164"the patch applies to '%s' (%s), which does not match the current contents."
29004bbb 1165msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
5c57d762 1166
2b472aae 1167#: apply.c:3171
a0b6b246
JX
1168#, c-format
1169msgid "the patch applies to an empty '%s' but it is not empty"
29004bbb 1170msgstr "补丁应用到空文件 '%s',但其并非空文件"
5c57d762 1171
2b472aae 1172#: apply.c:3189
5c57d762 1173#, c-format
a0b6b246 1174msgid "the necessary postimage %s for '%s' cannot be read"
e640d114 1175msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
5c57d762 1176
2b472aae 1177#: apply.c:3202
5c57d762 1178#, c-format
a0b6b246
JX
1179msgid "binary patch does not apply to '%s'"
1180msgstr "二进制补丁未应用到 '%s'"
5c57d762 1181
2b472aae 1182#: apply.c:3209
5c57d762 1183#, c-format
a0b6b246
JX
1184msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1185msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
5c57d762 1186
2b472aae 1187#: apply.c:3230
276ceeaa 1188#, c-format
a0b6b246
JX
1189msgid "patch failed: %s:%ld"
1190msgstr "打补丁失败:%s:%ld"
276ceeaa 1191
2b472aae 1192#: apply.c:3353
4dcdc3d8 1193#, c-format
a0b6b246
JX
1194msgid "cannot checkout %s"
1195msgstr "不能检出 %s"
4dcdc3d8 1196
d9488fea 1197#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308
4dcdc3d8 1198#, c-format
a0b6b246
JX
1199msgid "failed to read %s"
1200msgstr "无法读取 %s"
4dcdc3d8 1201
2b472aae 1202#: apply.c:3413
4dcdc3d8 1203#, c-format
a0b6b246
JX
1204msgid "reading from '%s' beyond a symbolic link"
1205msgstr "读取位于符号链接中的 '%s'"
4dcdc3d8 1206
2b472aae 1207#: apply.c:3442 apply.c:3685
4dcdc3d8 1208#, c-format
a0b6b246
JX
1209msgid "path %s has been renamed/deleted"
1210msgstr "路径 %s 已经被重命名/删除"
4dcdc3d8 1211
2b472aae 1212#: apply.c:3528 apply.c:3700
4dcdc3d8 1213#, c-format
a0b6b246
JX
1214msgid "%s: does not exist in index"
1215msgstr "%s:不存在于索引中"
4dcdc3d8 1216
d9488fea 1217#: apply.c:3537 apply.c:3708 apply.c:3953
4dcdc3d8 1218#, c-format
a0b6b246
JX
1219msgid "%s: does not match index"
1220msgstr "%s:和索引不匹配"
4dcdc3d8 1221
2b472aae 1222#: apply.c:3572
a0b6b246
JX
1223msgid "repository lacks the necessary blob to fall back on 3-way merge."
1224msgstr "仓库缺乏必要的数据对象以进行三方合并。"
4dcdc3d8 1225
2b472aae 1226#: apply.c:3575
4dcdc3d8 1227#, c-format
a0b6b246
JX
1228msgid "Falling back to three-way merge...\n"
1229msgstr "回落到三方合并...\n"
4dcdc3d8 1230
2b472aae 1231#: apply.c:3591 apply.c:3595
4dcdc3d8 1232#, c-format
a0b6b246
JX
1233msgid "cannot read the current contents of '%s'"
1234msgstr "无法读取 '%s' 的当前内容"
276ceeaa 1235
2b472aae 1236#: apply.c:3607
4dcdc3d8 1237#, c-format
a0b6b246
JX
1238msgid "Failed to fall back on three-way merge...\n"
1239msgstr "无法回落到三方合并...\n"
4dcdc3d8 1240
2b472aae 1241#: apply.c:3621
4dcdc3d8 1242#, c-format
a0b6b246
JX
1243msgid "Applied patch to '%s' with conflicts.\n"
1244msgstr "应用补丁到 '%s' 存在冲突。\n"
4dcdc3d8 1245
2b472aae 1246#: apply.c:3626
4dcdc3d8 1247#, c-format
a0b6b246
JX
1248msgid "Applied patch to '%s' cleanly.\n"
1249msgstr "成功应用补丁到 '%s'。\n"
4dcdc3d8 1250
2b472aae 1251#: apply.c:3652
a0b6b246
JX
1252msgid "removal patch leaves file contents"
1253msgstr "移除补丁仍留下了文件内容"
4dcdc3d8 1254
2b472aae 1255#: apply.c:3725
1003b3a5 1256#, c-format
a0b6b246
JX
1257msgid "%s: wrong type"
1258msgstr "%s:错误类型"
1003b3a5 1259
2b472aae 1260#: apply.c:3727
1003b3a5 1261#, c-format
a0b6b246
JX
1262msgid "%s has type %o, expected %o"
1263msgstr "%s 的类型是 %o,应为 %o"
1003b3a5 1264
d9488fea
JX
1265#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858
1266#: read-cache.c:1313
4dcdc3d8 1267#, c-format
a0b6b246
JX
1268msgid "invalid path '%s'"
1269msgstr "无效路径 '%s'"
4dcdc3d8 1270
d9488fea 1271#: apply.c:3950
4dcdc3d8 1272#, c-format
a0b6b246
JX
1273msgid "%s: already exists in index"
1274msgstr "%s:已经存在于索引中"
4dcdc3d8 1275
d9488fea 1276#: apply.c:3956
4dcdc3d8 1277#, c-format
a0b6b246
JX
1278msgid "%s: already exists in working directory"
1279msgstr "%s:已经存在于工作区中"
4dcdc3d8 1280
d9488fea 1281#: apply.c:3976
1b7f4a34 1282#, c-format
a0b6b246
JX
1283msgid "new mode (%o) of %s does not match old mode (%o)"
1284msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1b7f4a34 1285
d9488fea 1286#: apply.c:3981
5b04ee3b 1287#, c-format
a0b6b246
JX
1288msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1289msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
5b04ee3b 1290
d9488fea 1291#: apply.c:4001
8ada9598 1292#, c-format
a0b6b246
JX
1293msgid "affected file '%s' is beyond a symbolic link"
1294msgstr "受影响的文件 '%s' 位于符号链接中"
8ada9598 1295
d9488fea 1296#: apply.c:4005
81809b99 1297#, c-format
a0b6b246
JX
1298msgid "%s: patch does not apply"
1299msgstr "%s:补丁未应用"
8ada9598 1300
d9488fea 1301#: apply.c:4020
8ada9598 1302#, c-format
a0b6b246 1303msgid "Checking patch %s..."
06991777 1304msgstr "正在检查补丁 %s..."
8ada9598 1305
d9488fea 1306#: apply.c:4112
a0b6b246
JX
1307#, c-format
1308msgid "sha1 information is lacking or useless for submodule %s"
1309msgstr "子模组 %s 的 sha1 信息缺失或无效"
8ada9598 1310
d9488fea 1311#: apply.c:4119
8ada9598 1312#, c-format
a0b6b246 1313msgid "mode change for %s, which is not in current HEAD"
31e5e17b 1314msgstr "%s 的模式变更,但它不在当前 HEAD 中"
8ada9598 1315
d9488fea 1316#: apply.c:4122
a0b6b246
JX
1317#, c-format
1318msgid "sha1 information is lacking or useless (%s)."
1319msgstr "sha1 信息缺失或无效(%s)。"
6792b93b 1320
d9488fea 1321#: apply.c:4131
a0b6b246
JX
1322#, c-format
1323msgid "could not add %s to temporary index"
1324msgstr "不能在临时索引中添加 %s"
9aeb4c2b 1325
d9488fea 1326#: apply.c:4141
a0b6b246
JX
1327#, c-format
1328msgid "could not write temporary index to %s"
1329msgstr "不能把临时索引写入到 %s"
9aeb4c2b 1330
d9488fea 1331#: apply.c:4279
a0b6b246
JX
1332#, c-format
1333msgid "unable to remove %s from index"
1334msgstr "不能从索引中移除 %s"
8ada9598 1335
d9488fea 1336#: apply.c:4313
8ada9598 1337#, c-format
a0b6b246
JX
1338msgid "corrupt patch for submodule %s"
1339msgstr "子模组 %s 损坏的补丁"
8ada9598 1340
d9488fea 1341#: apply.c:4319
9aeb4c2b 1342#, c-format
a0b6b246 1343msgid "unable to stat newly created file '%s'"
65e2041e 1344msgstr "不能对新建文件 '%s' 调用 stat"
9aeb4c2b 1345
d9488fea 1346#: apply.c:4327
a0b6b246
JX
1347#, c-format
1348msgid "unable to create backing store for newly created file %s"
1349msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 1350
d9488fea 1351#: apply.c:4333 apply.c:4478
81809b99 1352#, c-format
a0b6b246
JX
1353msgid "unable to add cache entry for %s"
1354msgstr "无法为 %s 添加缓存条目"
8ada9598 1355
d9488fea 1356#: apply.c:4376 builtin/bisect--helper.c:537
a0b6b246
JX
1357#, c-format
1358msgid "failed to write to '%s'"
c1ac5258 1359msgstr "写入 '%s' 失败"
8ada9598 1360
d9488fea 1361#: apply.c:4380
220c313c 1362#, c-format
a0b6b246
JX
1363msgid "closing file '%s'"
1364msgstr "关闭文件 '%s'"
220c313c 1365
d9488fea 1366#: apply.c:4450
c04f5ac3 1367#, c-format
a0b6b246
JX
1368msgid "unable to write file '%s' mode %o"
1369msgstr "不能写文件 '%s' 权限 %o"
c04f5ac3 1370
d9488fea 1371#: apply.c:4548
c04f5ac3 1372#, c-format
a0b6b246
JX
1373msgid "Applied patch %s cleanly."
1374msgstr "成功应用补丁 %s。"
c04f5ac3 1375
d9488fea 1376#: apply.c:4556
a0b6b246
JX
1377msgid "internal error"
1378msgstr "内部错误"
c04f5ac3 1379
d9488fea 1380#: apply.c:4559
5c57d762 1381#, c-format
a0b6b246
JX
1382msgid "Applying patch %%s with %d reject..."
1383msgid_plural "Applying patch %%s with %d rejects..."
1384msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1385msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
5c57d762 1386
d9488fea 1387#: apply.c:4570
5c57d762 1388#, c-format
a0b6b246
JX
1389msgid "truncating .rej filename to %.*s.rej"
1390msgstr "截短 .rej 文件名为 %.*s.rej"
5c57d762 1391
d9488fea 1392#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228
220c313c 1393#, c-format
a0b6b246
JX
1394msgid "cannot open %s"
1395msgstr "不能打开 %s"
220c313c 1396
d9488fea 1397#: apply.c:4592
220c313c 1398#, c-format
a0b6b246
JX
1399msgid "Hunk #%d applied cleanly."
1400msgstr "第 #%d 个片段成功应用。"
220c313c 1401
d9488fea 1402#: apply.c:4596
5c57d762 1403#, c-format
a0b6b246
JX
1404msgid "Rejected hunk #%d."
1405msgstr "拒绝第 #%d 个片段。"
5c57d762 1406
d9488fea 1407#: apply.c:4715
5c57d762 1408#, c-format
a0b6b246
JX
1409msgid "Skipped patch '%s'."
1410msgstr "略过补丁 '%s'。"
5c57d762 1411
d9488fea 1412#: apply.c:4723
a0b6b246
JX
1413msgid "unrecognized input"
1414msgstr "未能识别的输入"
5c57d762 1415
d9488fea 1416#: apply.c:4743
a0b6b246
JX
1417msgid "unable to read index file"
1418msgstr "无法读取索引文件"
5c57d762 1419
d9488fea 1420#: apply.c:4900
220c313c 1421#, c-format
a0b6b246
JX
1422msgid "can't open patch '%s': %s"
1423msgstr "不能打开补丁 '%s':%s"
220c313c 1424
d9488fea 1425#: apply.c:4927
5c57d762 1426#, c-format
a0b6b246
JX
1427msgid "squelched %d whitespace error"
1428msgid_plural "squelched %d whitespace errors"
1429msgstr[0] "抑制下仍有 %d 个空白字符误用"
1430msgstr[1] "抑制下仍有 %d 个空白字符误用"
5c57d762 1431
d9488fea 1432#: apply.c:4933 apply.c:4948
5c57d762 1433#, c-format
a0b6b246
JX
1434msgid "%d line adds whitespace errors."
1435msgid_plural "%d lines add whitespace errors."
a4f16749
JX
1436msgstr[0] "%d 行新增了空白字符误用。"
1437msgstr[1] "%d 行新增了空白字符误用。"
5c57d762 1438
d9488fea 1439#: apply.c:4941
5c57d762 1440#, c-format
a0b6b246
JX
1441msgid "%d line applied after fixing whitespace errors."
1442msgid_plural "%d lines applied after fixing whitespace errors."
1443msgstr[0] "修复空白错误后,应用了 %d 行。"
1444msgstr[1] "修复空白错误后,应用了 %d 行。"
5c57d762 1445
d9488fea 1446#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406
a0b6b246
JX
1447msgid "Unable to write new index file"
1448msgstr "无法写入新索引文件"
5c57d762 1449
d9488fea 1450#: apply.c:4985
a0b6b246
JX
1451msgid "don't apply changes matching the given path"
1452msgstr "不要应用与给出路径向匹配的变更"
5c57d762 1453
d9488fea 1454#: apply.c:4988
a0b6b246
JX
1455msgid "apply changes matching the given path"
1456msgstr "应用与给出路径向匹配的变更"
220c313c 1457
d9488fea 1458#: apply.c:4990 builtin/am.c:2279
a0b6b246
JX
1459msgid "num"
1460msgstr "数字"
220c313c 1461
d9488fea 1462#: apply.c:4991
a0b6b246
JX
1463msgid "remove <num> leading slashes from traditional diff paths"
1464msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
220c313c 1465
d9488fea 1466#: apply.c:4994
a0b6b246
JX
1467msgid "ignore additions made by the patch"
1468msgstr "忽略补丁中的添加的文件"
220c313c 1469
d9488fea 1470#: apply.c:4996
a0b6b246
JX
1471msgid "instead of applying the patch, output diffstat for the input"
1472msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
220c313c 1473
d9488fea 1474#: apply.c:5000
a0b6b246
JX
1475msgid "show number of added and deleted lines in decimal notation"
1476msgstr "以十进制数显示添加和删除的行数"
220c313c 1477
d9488fea 1478#: apply.c:5002
a0b6b246
JX
1479msgid "instead of applying the patch, output a summary for the input"
1480msgstr "不应用补丁,而是显示输入的概要"
220c313c 1481
d9488fea 1482#: apply.c:5004
a0b6b246
JX
1483msgid "instead of applying the patch, see if the patch is applicable"
1484msgstr "不应用补丁,而是查看补丁是否可应用"
220c313c 1485
d9488fea 1486#: apply.c:5006
a0b6b246
JX
1487msgid "make sure the patch is applicable to the current index"
1488msgstr "确认补丁可以应用到当前索引"
276ceeaa 1489
d9488fea 1490#: apply.c:5008
c1ac5258
JX
1491msgid "mark new files with `git add --intent-to-add`"
1492msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
1493
d9488fea 1494#: apply.c:5010
a0b6b246
JX
1495msgid "apply a patch without touching the working tree"
1496msgstr "应用补丁而不修改工作区"
5b04ee3b 1497
d9488fea 1498#: apply.c:5012
a0b6b246
JX
1499msgid "accept a patch that touches outside the working area"
1500msgstr "接受修改工作区之外文件的补丁"
5c57d762 1501
d9488fea 1502#: apply.c:5015
a0b6b246
JX
1503msgid "also apply the patch (use with --stat/--summary/--check)"
1504msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
c04f5ac3 1505
d9488fea 1506#: apply.c:5017
a0b6b246
JX
1507msgid "attempt three-way merge if a patch does not apply"
1508msgstr "如果一个补丁不能应用则尝试三方合并"
c04f5ac3 1509
d9488fea 1510#: apply.c:5019
a0b6b246
JX
1511msgid "build a temporary index based on embedded index information"
1512msgstr "创建一个临时索引基于嵌入的索引信息"
c04f5ac3 1513
d9488fea 1514#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525
a0b6b246
JX
1515msgid "paths are separated with NUL character"
1516msgstr "路径以 NUL 字符分隔"
8ada9598 1517
d9488fea 1518#: apply.c:5024
a0b6b246
JX
1519msgid "ensure at least <n> lines of context match"
1520msgstr "确保至少匹配 <n> 行上下文"
8ada9598 1521
d9488fea 1522#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98
a6cd2cc4 1523#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
d9488fea 1524#: builtin/pack-objects.c:3562 builtin/rebase.c:1340
a0b6b246
JX
1525msgid "action"
1526msgstr "动作"
8ada9598 1527
d9488fea 1528#: apply.c:5026
a0b6b246
JX
1529msgid "detect new or modified lines that have whitespace errors"
1530msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 1531
d9488fea 1532#: apply.c:5029 apply.c:5032
a0b6b246
JX
1533msgid "ignore changes in whitespace when finding context"
1534msgstr "查找上下文时忽略空白字符的变更"
8ada9598 1535
d9488fea 1536#: apply.c:5035
a0b6b246
JX
1537msgid "apply the patch in reverse"
1538msgstr "反向应用补丁"
8ada9598 1539
d9488fea 1540#: apply.c:5037
a0b6b246
JX
1541msgid "don't expect at least one line of context"
1542msgstr "无需至少一行上下文"
8ada9598 1543
d9488fea 1544#: apply.c:5039
a0b6b246
JX
1545msgid "leave the rejected hunks in corresponding *.rej files"
1546msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 1547
d9488fea 1548#: apply.c:5041
a0b6b246
JX
1549msgid "allow overlapping hunks"
1550msgstr "允许重叠的补丁片段"
8ada9598 1551
d9488fea
JX
1552#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22
1553#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775
1554#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128
a0b6b246
JX
1555msgid "be verbose"
1556msgstr "冗长输出"
8ada9598 1557
d9488fea 1558#: apply.c:5044
a0b6b246
JX
1559msgid "tolerate incorrectly detected missing new-line at the end of file"
1560msgstr "允许不正确的文件末尾换行符"
cfff71a9 1561
d9488fea 1562#: apply.c:5047
a0b6b246
JX
1563msgid "do not trust the line counts in the hunk headers"
1564msgstr "不信任补丁片段的头信息中的行号"
6c94aba5 1565
d9488fea 1566#: apply.c:5049 builtin/am.c:2267
a0b6b246
JX
1567msgid "root"
1568msgstr "根目录"
c04f5ac3 1569
d9488fea 1570#: apply.c:5050
a0b6b246
JX
1571msgid "prepend <root> to all filenames"
1572msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 1573
d9488fea 1574#: archive-tar.c:125 archive-zip.c:345
349ede6a
JX
1575#, c-format
1576msgid "cannot stream blob %s"
1577msgstr "不能打开数据对象 %s"
1578
d9488fea 1579#: archive-tar.c:265 archive-zip.c:358
349ede6a
JX
1580#, c-format
1581msgid "unsupported file mode: 0%o (SHA1: %s)"
1582msgstr "不支持的文件模式:0%o (SHA1: %s)"
1583
d9488fea 1584#: archive-tar.c:449
349ede6a
JX
1585#, c-format
1586msgid "unable to start '%s' filter"
1587msgstr "无法启动 '%s' 过滤器"
1588
d9488fea 1589#: archive-tar.c:452
349ede6a
JX
1590msgid "unable to redirect descriptor"
1591msgstr "无法重定向描述符"
1592
d9488fea 1593#: archive-tar.c:459
349ede6a
JX
1594#, c-format
1595msgid "'%s' filter reported error"
1596msgstr "'%s' 过滤器报告了错误"
1597
d9488fea 1598#: archive-zip.c:318
349ede6a
JX
1599#, c-format
1600msgid "path is not valid UTF-8: %s"
1601msgstr "路径不是有效的 UTF-8:%s"
1602
d9488fea 1603#: archive-zip.c:322
349ede6a
JX
1604#, c-format
1605msgid "path too long (%d chars, SHA1: %s): %s"
1606msgstr "路径太长(%d 字符,SHA1:%s):%s"
1607
d9488fea 1608#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
349ede6a
JX
1609#, c-format
1610msgid "deflate error (%d)"
1611msgstr "压缩错误 (%d)"
1612
d9488fea 1613#: archive-zip.c:603
349ede6a
JX
1614#, c-format
1615msgid "timestamp too large for this system: %<PRIuMAX>"
1616msgstr "对于本系统时间戳太大:%<PRIuMAX>"
1617
c1ac5258 1618#: archive.c:14
a0b6b246 1619msgid "git archive [<options>] <tree-ish> [<path>...]"
ddc12c42 1620msgstr "git archive [<选项>] <树对象> [<路径>...]"
07432cef 1621
c1ac5258 1622#: archive.c:15
a0b6b246
JX
1623msgid "git archive --list"
1624msgstr "git archive --list"
1625
c1ac5258 1626#: archive.c:16
c04f5ac3 1627msgid ""
a0b6b246 1628"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
c04f5ac3 1629msgstr ""
ddc12c42 1630"git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]"
6acbf033 1631
c1ac5258 1632#: archive.c:17
a0b6b246
JX
1633msgid "git archive --remote <repo> [--exec <cmd>] --list"
1634msgstr "git archive --remote <仓库> [--exec <命令>] --list"
6acbf033 1635
d9488fea
JX
1636#: archive.c:192
1637#, c-format
1638msgid "cannot read %s"
1639msgstr "不能读取 %s"
1640
1641#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852
1642#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786
1643#: builtin/merge.c:1124
1644#, c-format
1645msgid "could not read '%s'"
1646msgstr "不能读取 '%s'"
1647
1648#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315
c04f5ac3 1649#, c-format
a0b6b246
JX
1650msgid "pathspec '%s' did not match any files"
1651msgstr "路径规格 '%s' 未匹配任何文件"
c04f5ac3 1652
d9488fea 1653#: archive.c:454
06991777
JX
1654#, c-format
1655msgid "no such ref: %.*s"
1656msgstr "无此引用:%.*s"
1657
d9488fea 1658#: archive.c:460
06991777
JX
1659#, c-format
1660msgid "not a valid object name: %s"
1661msgstr "不是一个有效的对象名:%s"
1662
d9488fea 1663#: archive.c:473
06991777
JX
1664#, c-format
1665msgid "not a tree object: %s"
1666msgstr "不是一个树对象:%s"
1667
d9488fea 1668#: archive.c:485
06991777
JX
1669msgid "current working directory is untracked"
1670msgstr "当前工作目录未被跟踪"
1671
d9488fea
JX
1672#: archive.c:526
1673#, c-format
1674msgid "File not found: %s"
1675msgstr "文件未找到:%s"
1676
1677#: archive.c:528
1678#, c-format
1679msgid "Not a regular file: %s"
1680msgstr "不是一个常规文件:%s"
1681
1682#: archive.c:553
a0b6b246
JX
1683msgid "fmt"
1684msgstr "格式"
07432cef 1685
d9488fea 1686#: archive.c:553
a0b6b246
JX
1687msgid "archive format"
1688msgstr "归档格式"
7aea43ff 1689
d9488fea 1690#: archive.c:554 builtin/log.c:1760
a0b6b246
JX
1691msgid "prefix"
1692msgstr "前缀"
7aea43ff 1693
d9488fea 1694#: archive.c:555
a0b6b246
JX
1695msgid "prepend prefix to each pathname in the archive"
1696msgstr "为归档中每个路径名加上前缀"
c04f5ac3 1697
d9488fea
JX
1698#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888
1699#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133
1700#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
1701#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105
1702#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412
1703#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
a0b6b246
JX
1704msgid "file"
1705msgstr "文件"
a77c07d9 1706
d9488fea
JX
1707#: archive.c:557
1708msgid "add untracked file to archive"
1709msgstr "将未跟踪文件添加到归档"
1710
1711#: archive.c:560 builtin/archive.c:90
a0b6b246
JX
1712msgid "write the archive to this file"
1713msgstr "归档写入此文件"
a77c07d9 1714
d9488fea 1715#: archive.c:562
a0b6b246
JX
1716msgid "read .gitattributes in working directory"
1717msgstr "读取工作区中的 .gitattributes"
7ac1c0ad 1718
d9488fea 1719#: archive.c:563
a0b6b246
JX
1720msgid "report archived files on stderr"
1721msgstr "在标准错误上报告归档文件"
7ac1c0ad 1722
d9488fea 1723#: archive.c:564
a0b6b246
JX
1724msgid "store only"
1725msgstr "只存储"
7ac1c0ad 1726
d9488fea 1727#: archive.c:565
a0b6b246
JX
1728msgid "compress faster"
1729msgstr "压缩速度更快"
8ada9598 1730
d9488fea 1731#: archive.c:573
a0b6b246
JX
1732msgid "compress better"
1733msgstr "压缩效果更好"
8ada9598 1734
d9488fea 1735#: archive.c:576
a0b6b246
JX
1736msgid "list supported archive formats"
1737msgstr "列出支持的归档格式"
a77c07d9 1738
d9488fea
JX
1739#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
1740#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
a0b6b246
JX
1741msgid "repo"
1742msgstr "仓库"
c04f5ac3 1743
d9488fea 1744#: archive.c:579 builtin/archive.c:92
a0b6b246
JX
1745msgid "retrieve the archive from remote repository <repo>"
1746msgstr "从远程仓库(<仓库>)提取归档文件"
8ada9598 1747
d9488fea 1748#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715
06991777 1749#: builtin/notes.c:498
a0b6b246
JX
1750msgid "command"
1751msgstr "命令"
1752
d9488fea 1753#: archive.c:581 builtin/archive.c:94
a0b6b246
JX
1754msgid "path to the remote git-upload-archive command"
1755msgstr "远程 git-upload-archive 命令的路径"
1756
d9488fea 1757#: archive.c:588
a0b6b246
JX
1758msgid "Unexpected option --remote"
1759msgstr "未知参数 --remote"
1760
d9488fea 1761#: archive.c:590
a0b6b246
JX
1762msgid "Option --exec can only be used together with --remote"
1763msgstr "选项 --exec 只能和 --remote 同时使用"
1764
d9488fea 1765#: archive.c:592
a0b6b246
JX
1766msgid "Unexpected option --output"
1767msgstr "未知参数 --output"
1768
d9488fea
JX
1769#: archive.c:594
1770msgid "Options --add-file and --remote cannot be used together"
1771msgstr "选项 --add-file 和 --remote 不能同时使用"
1772
1773#: archive.c:616
a0b6b246
JX
1774#, c-format
1775msgid "Unknown archive format '%s'"
1776msgstr "未知归档格式 '%s'"
1777
d9488fea 1778#: archive.c:623
8ada9598 1779#, c-format
a0b6b246
JX
1780msgid "Argument not supported for format '%s': -%d"
1781msgstr "参数不支持此格式 '%s':-%d"
1782
ddc12c42 1783#: attr.c:212
87cb7997
JX
1784#, c-format
1785msgid "%.*s is not a valid attribute name"
1786msgstr "%.*s 不是一个有效的属性名"
1787
ddc12c42 1788#: attr.c:369
06991777
JX
1789#, c-format
1790msgid "%s not allowed: %s:%d"
5b533632 1791msgstr "不允许 %s:%s:%d"
06991777 1792
ddc12c42 1793#: attr.c:409
8ada9598 1794msgid ""
a0b6b246
JX
1795"Negative patterns are ignored in git attributes\n"
1796"Use '\\!' for literal leading exclamation."
8ada9598 1797msgstr ""
a0b6b246
JX
1798"负值模版在 git attributes 中被忽略\n"
1799"当字符串确实要以感叹号开始时,使用 '\\!'。"
8ada9598 1800
d9488fea 1801#: bisect.c:476
8ada9598 1802#, c-format
a0b6b246
JX
1803msgid "Badly quoted content in file '%s': %s"
1804msgstr "文件 '%s' 包含错误的引用格式:%s"
8ada9598 1805
d9488fea 1806#: bisect.c:686
a0b6b246
JX
1807#, c-format
1808msgid "We cannot bisect more!\n"
1809msgstr "我们无法进行更多的二分查找!\n"
8ada9598 1810
d9488fea 1811#: bisect.c:753
2e8451e8 1812#, c-format
a0b6b246
JX
1813msgid "Not a valid commit name %s"
1814msgstr "不是一个有效的提交名 %s"
2e8451e8 1815
d9488fea 1816#: bisect.c:778
5b04ee3b
JX
1817#, c-format
1818msgid ""
a0b6b246
JX
1819"The merge base %s is bad.\n"
1820"This means the bug has been fixed between %s and [%s].\n"
5b04ee3b 1821msgstr ""
a0b6b246
JX
1822"合并基线 %s 是坏的。\n"
1823"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
5b04ee3b 1824
d9488fea 1825#: bisect.c:783
5b04ee3b 1826#, c-format
a0b6b246
JX
1827msgid ""
1828"The merge base %s is new.\n"
1829"The property has changed between %s and [%s].\n"
1830msgstr ""
1831"合并基线 %s 是新的。\n"
1832"介于 %s 和 [%s] 之间的属性已经被修改。\n"
5b04ee3b 1833
d9488fea 1834#: bisect.c:788
a0b6b246
JX
1835#, c-format
1836msgid ""
1837"The merge base %s is %s.\n"
1838"This means the first '%s' commit is between %s and [%s].\n"
1839msgstr ""
1840"合并基线 %s 是 %s。\n"
1841"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
07432cef 1842
d9488fea 1843#: bisect.c:796
a0b6b246
JX
1844#, c-format
1845msgid ""
1a79b2f1 1846"Some %s revs are not ancestors of the %s rev.\n"
a0b6b246
JX
1847"git bisect cannot work properly in this case.\n"
1848"Maybe you mistook %s and %s revs?\n"
1849msgstr ""
1850"一些 %s 版本不是 %s 版本的祖先。\n"
1851"这种情况下 git 二分查找无法正常工作。\n"
1852"您可能弄错了 %s 和 %s 版本?\n"
07432cef 1853
d9488fea 1854#: bisect.c:809
a0b6b246
JX
1855#, c-format
1856msgid ""
1857"the merge base between %s and [%s] must be skipped.\n"
1858"So we cannot be sure the first %s commit is between %s and %s.\n"
1859"We continue anyway."
1860msgstr ""
1861"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1862"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1863"我们仍旧继续。"
649900bc 1864
d9488fea 1865#: bisect.c:848
649900bc 1866#, c-format
a0b6b246
JX
1867msgid "Bisecting: a merge base must be tested\n"
1868msgstr "二分查找中:合并基线必须是经过测试的\n"
649900bc 1869
d9488fea 1870#: bisect.c:898
a0b6b246
JX
1871#, c-format
1872msgid "a %s revision is needed"
1873msgstr "需要一个 %s 版本"
649900bc 1874
d9488fea 1875#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255
649900bc 1876#, c-format
a0b6b246
JX
1877msgid "could not create file '%s'"
1878msgstr "不能创建文件 '%s'"
649900bc 1879
d9488fea 1880#: bisect.c:974 builtin/merge.c:150
649900bc 1881#, c-format
a0b6b246
JX
1882msgid "could not read file '%s'"
1883msgstr "不能读取文件 '%s'"
649900bc 1884
d9488fea 1885#: bisect.c:1014
a0b6b246
JX
1886msgid "reading bisect refs failed"
1887msgstr "读取二分查找引用失败"
649900bc 1888
d9488fea 1889#: bisect.c:1044
649900bc 1890#, c-format
a0b6b246
JX
1891msgid "%s was both %s and %s\n"
1892msgstr "%s 同时为 %s 和 %s\n"
649900bc 1893
d9488fea 1894#: bisect.c:1053
649900bc 1895#, c-format
a0b6b246
JX
1896msgid ""
1897"No testable commit found.\n"
1898"Maybe you started with bad path parameters?\n"
1899msgstr ""
1900"没有发现可测试的提交。\n"
1901"可能您在运行时使用了错误的路径参数?\n"
649900bc 1902
d9488fea 1903#: bisect.c:1082
649900bc 1904#, c-format
a0b6b246
JX
1905msgid "(roughly %d step)"
1906msgid_plural "(roughly %d steps)"
1907msgstr[0] "(大概 %d 步)"
1908msgstr[1] "(大概 %d 步)"
649900bc 1909
a4f16749
JX
1910#. TRANSLATORS: the last %s will be replaced with "(roughly %d
1911#. steps)" translation.
1912#.
d9488fea 1913#: bisect.c:1088
649900bc 1914#, c-format
a0b6b246
JX
1915msgid "Bisecting: %d revision left to test after this %s\n"
1916msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1917msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1918msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
649900bc 1919
d9488fea 1920#: blame.c:2778
a4f16749
JX
1921msgid "--contents and --reverse do not blend well."
1922msgstr "--contents 和 --reverse 不能混用。"
1923
d9488fea 1924#: blame.c:2792
a4f16749
JX
1925msgid "cannot use --contents with final commit object name"
1926msgstr "不能将 --contents 和最终的提交对象名共用"
1927
d9488fea 1928#: blame.c:2813
a4f16749
JX
1929msgid "--reverse and --first-parent together require specified latest commit"
1930msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
1931
d9488fea
JX
1932#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105
1933#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404
1934#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319
1935#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395
1936#: builtin/shortlog.c:320
a4f16749
JX
1937msgid "revision walk setup failed"
1938msgstr "版本遍历设置失败"
1939
d9488fea 1940#: blame.c:2840
a4f16749
JX
1941msgid ""
1942"--reverse --first-parent together require range along first-parent chain"
1943msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
1944
d9488fea 1945#: blame.c:2851
a4f16749
JX
1946#, c-format
1947msgid "no such path %s in %s"
1948msgstr "在 %2$s 中无此路径 %1$s"
1949
d9488fea 1950#: blame.c:2862
a4f16749
JX
1951#, c-format
1952msgid "cannot read blob %s for path %s"
1953msgstr "不能为路径 %2$s 读取数据对象 %1$s"
1954
d46c5519 1955#: branch.c:53
649900bc 1956#, c-format
a0b6b246
JX
1957msgid ""
1958"\n"
1959"After fixing the error cause you may try to fix up\n"
1960"the remote tracking information by invoking\n"
1961"\"git branch --set-upstream-to=%s%s%s\"."
1962msgstr ""
1963"\n"
1964"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1965"\"git branch --set-upstream-to=%s%s%s\" 。"
649900bc 1966
d46c5519 1967#: branch.c:67
649900bc 1968#, c-format
a0b6b246
JX
1969msgid "Not setting branch %s as its own upstream."
1970msgstr "未设置分支 %s 作为它自己的上游。"
649900bc 1971
d46c5519 1972#: branch.c:93
649900bc 1973#, c-format
6937cb4e
JX
1974msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
1975msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 1976
d46c5519 1977#: branch.c:94
649900bc 1978#, c-format
6937cb4e
JX
1979msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
1980msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 1981
d46c5519 1982#: branch.c:98
649900bc 1983#, c-format
6937cb4e
JX
1984msgid "Branch '%s' set up to track local branch '%s' by rebasing."
1985msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
649900bc 1986
d46c5519 1987#: branch.c:99
649900bc 1988#, c-format
6937cb4e 1989msgid "Branch '%s' set up to track local branch '%s'."
493a9322 1990msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
649900bc 1991
d46c5519 1992#: branch.c:104
649900bc 1993#, c-format
6937cb4e
JX
1994msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
1995msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
649900bc 1996
d46c5519 1997#: branch.c:105
649900bc 1998#, c-format
6937cb4e
JX
1999msgid "Branch '%s' set up to track remote ref '%s'."
2000msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
649900bc 2001
d46c5519 2002#: branch.c:109
649900bc 2003#, c-format
6937cb4e
JX
2004msgid "Branch '%s' set up to track local ref '%s' by rebasing."
2005msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
649900bc 2006
d46c5519 2007#: branch.c:110
649900bc 2008#, c-format
6937cb4e
JX
2009msgid "Branch '%s' set up to track local ref '%s'."
2010msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
649900bc 2011
d46c5519 2012#: branch.c:119
a0b6b246
JX
2013msgid "Unable to write upstream branch configuration"
2014msgstr "无法写入上游分支配置"
649900bc 2015
d46c5519 2016#: branch.c:156
649900bc 2017#, c-format
a0b6b246
JX
2018msgid "Not tracking: ambiguous information for ref %s"
2019msgstr "未跟踪:引用 %s 有歧义"
649900bc 2020
d46c5519 2021#: branch.c:189
649900bc 2022#, c-format
a0b6b246
JX
2023msgid "'%s' is not a valid branch name."
2024msgstr "'%s' 不是一个有效的分支名称。"
649900bc 2025
d46c5519 2026#: branch.c:208
649900bc 2027#, c-format
a0b6b246
JX
2028msgid "A branch named '%s' already exists."
2029msgstr "一个分支名 '%s' 已经存在。"
649900bc 2030
d46c5519 2031#: branch.c:213
a0b6b246
JX
2032msgid "Cannot force update the current branch."
2033msgstr "无法强制更新当前分支。"
649900bc 2034
d46c5519 2035#: branch.c:233
649900bc 2036#, c-format
a0b6b246
JX
2037msgid "Cannot setup tracking information; starting point '%s' is not a branch."
2038msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
649900bc 2039
d46c5519 2040#: branch.c:235
649900bc 2041#, c-format
a0b6b246
JX
2042msgid "the requested upstream branch '%s' does not exist"
2043msgstr "请求的上游分支 '%s' 不存在"
649900bc 2044
d46c5519 2045#: branch.c:237
a0b6b246
JX
2046msgid ""
2047"\n"
2048"If you are planning on basing your work on an upstream\n"
2049"branch that already exists at the remote, you may need to\n"
2050"run \"git fetch\" to retrieve it.\n"
2051"\n"
2052"If you are planning to push out a new local branch that\n"
2053"will track its remote counterpart, you may want to use\n"
2054"\"git push -u\" to set the upstream config as you push."
2055msgstr ""
2056"\n"
2057"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
2058"您可能需要执行 \"git fetch\" 来获取分支。\n"
2059"\n"
2060"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
2061"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
649900bc 2062
d46c5519 2063#: branch.c:281
649900bc 2064#, c-format
a0b6b246
JX
2065msgid "Not a valid object name: '%s'."
2066msgstr "不是一个有效的对象名:'%s'。"
649900bc 2067
d46c5519 2068#: branch.c:301
649900bc 2069#, c-format
a0b6b246
JX
2070msgid "Ambiguous object name: '%s'."
2071msgstr "歧义的对象名:'%s'。"
649900bc 2072
d46c5519 2073#: branch.c:306
649900bc 2074#, c-format
a0b6b246
JX
2075msgid "Not a valid branch point: '%s'."
2076msgstr "无效的分支点:'%s'。"
649900bc 2077
349ede6a 2078#: branch.c:365
649900bc 2079#, c-format
a0b6b246
JX
2080msgid "'%s' is already checked out at '%s'"
2081msgstr "'%s' 已经检出到 '%s'"
649900bc 2082
349ede6a 2083#: branch.c:388
a0b6b246
JX
2084#, c-format
2085msgid "HEAD of working tree %s is not updated"
2086msgstr "工作区 %s 的 HEAD 指向没有被更新"
649900bc 2087
d9488fea
JX
2088#: bundle.c:41
2089#, c-format
2090msgid "unrecognized bundle hash algorithm: %s"
2091msgstr "未能识别的归档包哈希算法:%s"
2092
2093#: bundle.c:45
649900bc 2094#, c-format
d9488fea
JX
2095msgid "unknown capability '%s'"
2096msgstr "未知能力 '%s'"
649900bc 2097
d9488fea
JX
2098#: bundle.c:71
2099#, c-format
2100msgid "'%s' does not look like a v2 or v3 bundle file"
2101msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件"
7157c2b5 2102
d9488fea 2103#: bundle.c:110
a0b6b246
JX
2104#, c-format
2105msgid "unrecognized header: %s%s (%d)"
2106msgstr "未能识别的包头:%s%s (%d)"
649900bc 2107
d9488fea 2108#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142
349ede6a 2109#: builtin/commit.c:814
649900bc 2110#, c-format
a0b6b246
JX
2111msgid "could not open '%s'"
2112msgstr "不能打开 '%s'"
649900bc 2113
d9488fea 2114#: bundle.c:189
a0b6b246
JX
2115msgid "Repository lacks these prerequisite commits:"
2116msgstr "仓库中缺少这些必备的提交:"
649900bc 2117
d9488fea 2118#: bundle.c:192
a6cd2cc4 2119msgid "need a repository to verify a bundle"
d9488fea 2120msgstr "需要一个仓库来校验一个归档包"
a6cd2cc4 2121
d9488fea 2122#: bundle.c:243
2e8451e8 2123#, c-format
a0b6b246
JX
2124msgid "The bundle contains this ref:"
2125msgid_plural "The bundle contains these %d refs:"
d9488fea
JX
2126msgstr[0] "这个归档包中含有这个引用:"
2127msgstr[1] "这个归档包中含有 %d 个引用:"
2e8451e8 2128
d9488fea 2129#: bundle.c:250
a0b6b246 2130msgid "The bundle records a complete history."
d9488fea 2131msgstr "这个归档包记录一个完整历史。"
2e8451e8 2132
d9488fea 2133#: bundle.c:252
2e8451e8 2134#, c-format
a0b6b246
JX
2135msgid "The bundle requires this ref:"
2136msgid_plural "The bundle requires these %d refs:"
d9488fea
JX
2137msgstr[0] "这个归档包需要这个引用:"
2138msgstr[1] "这个归档包需要 %d 个引用:"
2e8451e8 2139
d9488fea 2140#: bundle.c:319
4c27fcb5 2141msgid "unable to dup bundle descriptor"
d9488fea 2142msgstr "无法复制归档包描述符"
4c27fcb5 2143
d9488fea 2144#: bundle.c:326
a0b6b246
JX
2145msgid "Could not spawn pack-objects"
2146msgstr "不能生成 pack-objects 进程"
1003b3a5 2147
d9488fea 2148#: bundle.c:337
a0b6b246
JX
2149msgid "pack-objects died"
2150msgstr "pack-objects 终止"
8ada9598 2151
d9488fea 2152#: bundle.c:379
a0b6b246
JX
2153msgid "rev-list died"
2154msgstr "rev-list 终止"
2155
d9488fea 2156#: bundle.c:428
81809b99 2157#, c-format
a0b6b246
JX
2158msgid "ref '%s' is excluded by the rev-list options"
2159msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 2160
d9488fea
JX
2161#: bundle.c:498
2162#, c-format
2163msgid "unsupported bundle version %d"
2164msgstr "不支持的归档包版本 %d"
2165
2166#: bundle.c:500
2167#, c-format
2168msgid "cannot write bundle version %d with algorithm %s"
2169msgstr "不能写入,归档包版本 %d 不支持算法 %s"
2170
2171#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461
81809b99 2172#, c-format
a0b6b246
JX
2173msgid "unrecognized argument: %s"
2174msgstr "未能识别的参数:%s"
8ada9598 2175
d9488fea 2176#: bundle.c:530
a0b6b246 2177msgid "Refusing to create empty bundle."
d9488fea 2178msgstr "不能创建空的归档包。"
a0b6b246 2179
d9488fea 2180#: bundle.c:540
81809b99 2181#, c-format
a0b6b246
JX
2182msgid "cannot create '%s'"
2183msgstr "不能创建 '%s'"
8ada9598 2184
d9488fea 2185#: bundle.c:565
a0b6b246
JX
2186msgid "index-pack died"
2187msgstr "index-pack 终止"
63af42fe 2188
2b472aae 2189#: color.c:329
94550ed3 2190#, c-format
a0b6b246
JX
2191msgid "invalid color value: %.*s"
2192msgstr "无效的颜色值:%.*s"
94550ed3 2193
d9488fea
JX
2194#: commit-graph.c:188 midx.c:46
2195msgid "invalid hash version"
2196msgstr "无效的哈希版本"
2197
2198#: commit-graph.c:246
d46c5519
JX
2199msgid "commit-graph file is too small"
2200msgstr "提交图形文件太小"
c1ac5258 2201
d9488fea 2202#: commit-graph.c:311
c1ac5258 2203#, c-format
d46c5519
JX
2204msgid "commit-graph signature %X does not match signature %X"
2205msgstr "提交图形签名 %X 和签名 %X 不匹配"
c1ac5258 2206
d9488fea 2207#: commit-graph.c:318
c1ac5258 2208#, c-format
d46c5519
JX
2209msgid "commit-graph version %X does not match version %X"
2210msgstr "提交图形版本 %X 和版本 %X 不匹配"
c1ac5258 2211
d9488fea 2212#: commit-graph.c:325
c1ac5258 2213#, c-format
d46c5519
JX
2214msgid "commit-graph hash version %X does not match version %X"
2215msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
c1ac5258 2216
d9488fea
JX
2217#: commit-graph.c:342
2218#, c-format
2219msgid "commit-graph file is too small to hold %u chunks"
2220msgstr "提交图形文件太小,容不下 %u 个块"
06991777 2221
d9488fea 2222#: commit-graph.c:361
c1ac5258 2223#, c-format
d46c5519
JX
2224msgid "commit-graph improper chunk offset %08x%08x"
2225msgstr "提交图形不正确的块偏移 %08x%08x"
c1ac5258 2226
d9488fea 2227#: commit-graph.c:433
c1ac5258 2228#, c-format
d46c5519
JX
2229msgid "commit-graph chunk id %08x appears multiple times"
2230msgstr "提交图形块 id %08x 出现了多次"
c1ac5258 2231
d9488fea 2232#: commit-graph.c:499
a6cd2cc4
JX
2233msgid "commit-graph has no base graphs chunk"
2234msgstr "提交图形没有基础图形块"
2235
d9488fea 2236#: commit-graph.c:509
a6cd2cc4
JX
2237msgid "commit-graph chain does not match"
2238msgstr "提交图形链不匹配"
2239
d9488fea 2240#: commit-graph.c:557
a6cd2cc4
JX
2241#, c-format
2242msgid "invalid commit-graph chain: line '%s' not a hash"
2243msgstr "无效的提交图形链:行 '%s' 不是一个哈希值"
2244
d9488fea 2245#: commit-graph.c:581
a6cd2cc4
JX
2246msgid "unable to find all commit-graph files"
2247msgstr "无法找到所有提交图形文件"
2248
d9488fea 2249#: commit-graph.c:721 commit-graph.c:785
a6cd2cc4
JX
2250msgid "invalid commit position. commit-graph is likely corrupt"
2251msgstr "无效的提交位置。提交图形可能已损坏"
2252
d9488fea 2253#: commit-graph.c:742
c1ac5258
JX
2254#, c-format
2255msgid "could not find commit %s"
2256msgstr "无法找到提交 %s"
2257
d9488fea 2258#: commit-graph.c:1042 builtin/am.c:1306
a5cd71ca
JX
2259#, c-format
2260msgid "unable to parse commit %s"
2261msgstr "不能解析提交 %s"
2262
d9488fea 2263#: commit-graph.c:1265 builtin/pack-objects.c:2864
c1ac5258
JX
2264#, c-format
2265msgid "unable to get type of object %s"
2266msgstr "无法获得对象 %s 类型"
2267
d9488fea 2268#: commit-graph.c:1301
06991777
JX
2269msgid "Loading known commits in commit graph"
2270msgstr "正在加载提交图中的已知提交"
2271
d9488fea 2272#: commit-graph.c:1318
06991777
JX
2273msgid "Expanding reachable commits in commit graph"
2274msgstr "正在扩展提交图中的可达提交"
2275
d9488fea 2276#: commit-graph.c:1338
06991777
JX
2277msgid "Clearing commit marks in commit graph"
2278msgstr "正在清除提交图中的提交标记"
4c27fcb5 2279
d9488fea 2280#: commit-graph.c:1357
4c27fcb5
JX
2281msgid "Computing commit graph generation numbers"
2282msgstr "正在计算提交图世代数字"
2283
d9488fea 2284#: commit-graph.c:1424
349ede6a 2285msgid "Computing commit changed paths Bloom filters"
d9488fea 2286msgstr "计算提交变更路径的布隆过滤器"
349ede6a 2287
d9488fea 2288#: commit-graph.c:1501
7157c2b5
JX
2289msgid "Collecting referenced commits"
2290msgstr "正在收集引用的提交"
2291
d9488fea 2292#: commit-graph.c:1526
06991777
JX
2293#, c-format
2294msgid "Finding commits for commit graph in %d pack"
2295msgid_plural "Finding commits for commit graph in %d packs"
2296msgstr[0] "正在 %d 个包中查找提交图的提交"
2297msgstr[1] "正在 %d 个包中查找提交图的提交"
4c27fcb5 2298
d9488fea 2299#: commit-graph.c:1539
c1ac5258
JX
2300#, c-format
2301msgid "error adding pack %s"
2302msgstr "添加包 %s 出错"
2303
d9488fea 2304#: commit-graph.c:1543
c1ac5258
JX
2305#, c-format
2306msgid "error opening index for %s"
2307msgstr "为 %s 打开索引出错"
2308
d9488fea 2309#: commit-graph.c:1582
06991777
JX
2310msgid "Finding commits for commit graph among packed objects"
2311msgstr "正在打包对象中查找提交图的提交"
2312
d9488fea 2313#: commit-graph.c:1597
06991777 2314msgid "Counting distinct commits in commit graph"
8e4e0555 2315msgstr "正在计算提交图中不同的提交"
06991777 2316
d9488fea 2317#: commit-graph.c:1629
06991777 2318msgid "Finding extra edges in commit graph"
8e4e0555 2319msgstr "正在查找提交图中额外的边"
06991777 2320
d9488fea 2321#: commit-graph.c:1678
a6cd2cc4
JX
2322msgid "failed to write correct number of base graph ids"
2323msgstr "无法写入正确数量的基础图形 ID"
fd8cb379 2324
d9488fea 2325#: commit-graph.c:1720 midx.c:826
fd8cb379 2326#, c-format
c1ac5258
JX
2327msgid "unable to create leading directories of %s"
2328msgstr "不能为 %s 创建先导目录"
2329
d9488fea 2330#: commit-graph.c:1733
349ede6a
JX
2331msgid "unable to create temporary graph layer"
2332msgstr "无法创建临时图层"
2333
d9488fea 2334#: commit-graph.c:1738
a6cd2cc4 2335#, c-format
349ede6a
JX
2336msgid "unable to adjust shared permissions for '%s'"
2337msgstr "无法为 '%s' 调整共享权限"
a6cd2cc4 2338
d9488fea 2339#: commit-graph.c:1808
06991777
JX
2340#, c-format
2341msgid "Writing out commit graph in %d pass"
2342msgid_plural "Writing out commit graph in %d passes"
8e4e0555
FZ
2343msgstr[0] "正在用 %d 步写出提交图"
2344msgstr[1] "正在用 %d 步写出提交图"
06991777 2345
d9488fea 2346#: commit-graph.c:1853
a6cd2cc4
JX
2347msgid "unable to open commit-graph chain file"
2348msgstr "无法打开提交图形链文件"
2349
d9488fea 2350#: commit-graph.c:1869
a6cd2cc4
JX
2351msgid "failed to rename base commit-graph file"
2352msgstr "无法重命名基础提交图形文件"
2353
d9488fea 2354#: commit-graph.c:1889
a6cd2cc4
JX
2355msgid "failed to rename temporary commit-graph file"
2356msgstr "无法重命名临时提交图形文件"
2357
d9488fea 2358#: commit-graph.c:2015
a6cd2cc4
JX
2359msgid "Scanning merged commits"
2360msgstr "正在扫描合并提交"
2361
d9488fea 2362#: commit-graph.c:2026
a6cd2cc4
JX
2363#, c-format
2364msgid "unexpected duplicate commit id %s"
2365msgstr "意外的重复提交 ID %s"
2366
d9488fea 2367#: commit-graph.c:2049
a6cd2cc4
JX
2368msgid "Merging commit-graph"
2369msgstr "正在合并提交图形"
2370
d9488fea 2371#: commit-graph.c:2259
a6cd2cc4
JX
2372#, c-format
2373msgid "the commit graph format cannot write %d commits"
2374msgstr "提交图格式不能写入 %d 个提交"
2375
d9488fea 2376#: commit-graph.c:2270
a6cd2cc4
JX
2377msgid "too many commits to write graph"
2378msgstr "提交太多不能画图"
2379
d9488fea 2380#: commit-graph.c:2363
c1ac5258 2381msgid "the commit-graph file has incorrect checksum and is likely corrupt"
4c27fcb5
JX
2382msgstr "提交图文件的校验码错误,可能已经损坏"
2383
d9488fea 2384#: commit-graph.c:2373
d46c5519
JX
2385#, c-format
2386msgid "commit-graph has incorrect OID order: %s then %s"
5b533632 2387msgstr "提交图形的对象 ID 顺序不正确:%s 然后 %s"
d46c5519 2388
d9488fea 2389#: commit-graph.c:2383 commit-graph.c:2398
d46c5519
JX
2390#, c-format
2391msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2392msgstr "提交图形有不正确的扇出值:fanout[%d] = %u != %u"
2393
d9488fea 2394#: commit-graph.c:2390
d46c5519
JX
2395#, c-format
2396msgid "failed to parse commit %s from commit-graph"
2397msgstr "无法从提交图形中解析提交 %s"
2398
d9488fea 2399#: commit-graph.c:2408
4c27fcb5 2400msgid "Verifying commits in commit graph"
8e4e0555 2401msgstr "正在校验提交图中的提交"
fd8cb379 2402
d9488fea 2403#: commit-graph.c:2423
d46c5519
JX
2404#, c-format
2405msgid "failed to parse commit %s from object database for commit-graph"
2406msgstr "无法从提交图形的对象库中解析提交 %s"
2407
d9488fea 2408#: commit-graph.c:2430
d46c5519
JX
2409#, c-format
2410msgid "root tree OID for commit %s in commit-graph is %s != %s"
5b533632 2411msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
d46c5519 2412
d9488fea 2413#: commit-graph.c:2440
d46c5519
JX
2414#, c-format
2415msgid "commit-graph parent list for commit %s is too long"
2416msgstr "提交 %s 的提交图形父提交列表太长了"
2417
d9488fea 2418#: commit-graph.c:2449
d46c5519
JX
2419#, c-format
2420msgid "commit-graph parent for %s is %s != %s"
2421msgstr "%s 的提交图形父提交是 %s != %s"
2422
d9488fea 2423#: commit-graph.c:2463
d46c5519
JX
2424#, c-format
2425msgid "commit-graph parent list for commit %s terminates early"
2426msgstr "提交 %s 的提交图形父提交列表过早终止"
2427
d9488fea 2428#: commit-graph.c:2468
d46c5519
JX
2429#, c-format
2430msgid ""
2431"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2432msgstr "提交图形中提交 %s 的世代号是零,但其它地方非零"
2433
d9488fea 2434#: commit-graph.c:2472
d46c5519
JX
2435#, c-format
2436msgid ""
2437"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2438msgstr "提交图形中提交 %s 的世代号非零,但其它地方是零"
2439
d9488fea 2440#: commit-graph.c:2488
d46c5519
JX
2441#, c-format
2442msgid "commit-graph generation for commit %s is %u != %u"
2443msgstr "提交图形中的提交 %s 的世代号是 %u != %u"
2444
d9488fea 2445#: commit-graph.c:2494
d46c5519
JX
2446#, c-format
2447msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2448msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
2449
d9488fea
JX
2450#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417
2451#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457
349ede6a
JX
2452#, c-format
2453msgid "could not parse %s"
2454msgstr "不能解析 %s"
2455
2456#: commit.c:54
2457#, c-format
2458msgid "%s %s is not a commit!"
2459msgstr "%s %s 不是一个提交!"
2460
2461#: commit.c:194
2462msgid ""
2463"Support for <GIT_DIR>/info/grafts is deprecated\n"
2464"and will be removed in a future Git version.\n"
2465"\n"
2466"Please use \"git replace --convert-graft-file\"\n"
2467"to convert the grafts into replace refs.\n"
2468"\n"
2469"Turn this message off by running\n"
2470"\"git config advice.graftFileDeprecated false\""
2471msgstr ""
2472"对 <GIT_DIR>/info/grafts 的支持已过时,并将在\n"
2473"未来的Git版本中被移除。\n"
2474"\n"
2475"请使用 \"git replace --convert-graft-file\" 将\n"
2476"grafts 转换为替换引用。\n"
2477"\n"
2478"设置 \"git config advice.graftFileDeprecated false\"\n"
2479"可关闭本消息"
2480
7157c2b5 2481#: commit.c:1172
349ede6a
JX
2482#, c-format
2483msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2484msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
2485
7157c2b5 2486#: commit.c:1176
349ede6a
JX
2487#, c-format
2488msgid "Commit %s has a bad GPG signature allegedly by %s."
2489msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
2490
7157c2b5 2491#: commit.c:1179
349ede6a
JX
2492#, c-format
2493msgid "Commit %s does not have a GPG signature."
2494msgstr "提交 %s 没有 GPG 签名。"
2495
7157c2b5 2496#: commit.c:1182
349ede6a
JX
2497#, c-format
2498msgid "Commit %s has a good GPG signature by %s\n"
2499msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
2500
7157c2b5 2501#: commit.c:1436
349ede6a
JX
2502msgid ""
2503"Warning: commit message did not conform to UTF-8.\n"
2504"You may want to amend it after fixing the message, or set the config\n"
2505"variable i18n.commitencoding to the encoding your project uses.\n"
2506msgstr ""
2507"警告:提交说明不符合 UTF-8 字符编码。\n"
2508"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
2509"设置为您项目所用的字符编码。\n"
2510
06991777 2511#: compat/obstack.c:406 compat/obstack.c:408
a0b6b246
JX
2512msgid "memory exhausted"
2513msgstr "内存耗尽"
90314792 2514
349ede6a 2515#: config.c:125
c1ac5258
JX
2516#, c-format
2517msgid ""
2518"exceeded maximum include depth (%d) while including\n"
2519"\t%s\n"
2520"from\n"
2521"\t%s\n"
2522"This might be due to circular includes."
2523msgstr ""
e640d114 2524"超过了最大包含深度(%1$d),当从\n"
c1ac5258
JX
2525"\t%3$s\n"
2526"包含\n"
2527"\t%2$s\n"
e640d114 2528"这可能是因为循环包含。"
c1ac5258 2529
349ede6a 2530#: config.c:141
c1ac5258
JX
2531#, c-format
2532msgid "could not expand include path '%s'"
2533msgstr "无法扩展包含路径 '%s'"
2534
349ede6a 2535#: config.c:152
c1ac5258
JX
2536msgid "relative config includes must come from files"
2537msgstr "相对路径的配置文件引用必须来自于文件"
2538
349ede6a 2539#: config.c:198
87cb7997 2540msgid "relative config include conditionals must come from files"
c1ac5258
JX
2541msgstr "相对路径的配置文件条件引用必须来自于文件"
2542
349ede6a 2543#: config.c:378
c1ac5258
JX
2544#, c-format
2545msgid "key does not contain a section: %s"
2546msgstr "键名没有包含一个小节名称:%s"
87cb7997 2547
349ede6a 2548#: config.c:384
c1ac5258
JX
2549#, c-format
2550msgid "key does not contain variable name: %s"
2551msgstr "键名没有包含变量名:%s"
2552
d9488fea 2553#: config.c:408 sequencer.c:2547
c1ac5258
JX
2554#, c-format
2555msgid "invalid key: %s"
2556msgstr "无效键名:%s"
2557
349ede6a 2558#: config.c:414
c1ac5258
JX
2559#, c-format
2560msgid "invalid key (newline): %s"
2561msgstr "无效键名(有换行符):%s"
2562
349ede6a 2563#: config.c:450 config.c:462
c1ac5258
JX
2564#, c-format
2565msgid "bogus config parameter: %s"
2566msgstr "伪配置参数:%s"
2567
349ede6a 2568#: config.c:497
c1ac5258
JX
2569#, c-format
2570msgid "bogus format in %s"
2571msgstr "%s 中格式错误"
2572
349ede6a 2573#: config.c:836
90314792 2574#, c-format
a0b6b246
JX
2575msgid "bad config line %d in blob %s"
2576msgstr "数据对象 %2$s 中错误的配置行 %1$d"
90314792 2577
349ede6a 2578#: config.c:840
a77c07d9 2579#, c-format
a0b6b246
JX
2580msgid "bad config line %d in file %s"
2581msgstr "文件 %2$s 中错误的配置行 %1$d"
a77c07d9 2582
349ede6a 2583#: config.c:844
a77c07d9 2584#, c-format
a0b6b246
JX
2585msgid "bad config line %d in standard input"
2586msgstr "标准输入中错误的配置行 %d"
a77c07d9 2587
349ede6a 2588#: config.c:848
90314792 2589#, c-format
a0b6b246
JX
2590msgid "bad config line %d in submodule-blob %s"
2591msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
90314792 2592
349ede6a 2593#: config.c:852
90314792 2594#, c-format
a0b6b246
JX
2595msgid "bad config line %d in command line %s"
2596msgstr "命令行 %2$s 中错误的配置行 %1$d"
90314792 2597
349ede6a 2598#: config.c:856
90314792 2599#, c-format
a0b6b246
JX
2600msgid "bad config line %d in %s"
2601msgstr "在 %2$s 中错误的配置行 %1$d"
220c313c 2602
349ede6a 2603#: config.c:993
a0b6b246
JX
2604msgid "out of range"
2605msgstr "超出范围"
6c94aba5 2606
349ede6a 2607#: config.c:993
a0b6b246
JX
2608msgid "invalid unit"
2609msgstr "无效的单位"
6c94aba5 2610
349ede6a 2611#: config.c:994
6c94aba5 2612#, c-format
a0b6b246
JX
2613msgid "bad numeric config value '%s' for '%s': %s"
2614msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
6c94aba5 2615
349ede6a 2616#: config.c:1013
1b7f4a34 2617#, c-format
a0b6b246
JX
2618msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
2619msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 2620
349ede6a 2621#: config.c:1016
1b7f4a34 2622#, c-format
a0b6b246
JX
2623msgid "bad numeric config value '%s' for '%s' in file %s: %s"
2624msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 2625
349ede6a 2626#: config.c:1019
1b7f4a34 2627#, c-format
a0b6b246
JX
2628msgid "bad numeric config value '%s' for '%s' in standard input: %s"
2629msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
1b7f4a34 2630
349ede6a 2631#: config.c:1022
1b7f4a34 2632#, c-format
a0b6b246
JX
2633msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
2634msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 2635
349ede6a 2636#: config.c:1025
94550ed3 2637#, c-format
a0b6b246
JX
2638msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
2639msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 2640
349ede6a 2641#: config.c:1028
276ceeaa 2642#, c-format
a0b6b246
JX
2643msgid "bad numeric config value '%s' for '%s' in %s: %s"
2644msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 2645
349ede6a 2646#: config.c:1123
276ceeaa 2647#, c-format
a0b6b246 2648msgid "failed to expand user dir in: '%s'"
c1ac5258 2649msgstr "无法扩展用户目录:'%s'"
94550ed3 2650
349ede6a 2651#: config.c:1132
5809aa05
JX
2652#, c-format
2653msgid "'%s' for '%s' is not a valid timestamp"
2654msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
2655
349ede6a 2656#: config.c:1223
c1ac5258
JX
2657#, c-format
2658msgid "abbrev length out of range: %d"
2659msgstr "缩写长度超出范围:%d"
2660
349ede6a 2661#: config.c:1237 config.c:1248
3495628d 2662#, c-format
a0b6b246
JX
2663msgid "bad zlib compression level %d"
2664msgstr "错误的 zlib 压缩级别 %d"
3495628d 2665
349ede6a 2666#: config.c:1340
c1ac5258
JX
2667msgid "core.commentChar should only be one character"
2668msgstr "core.commentChar 应该是一个字符"
2669
349ede6a 2670#: config.c:1373
3495628d 2671#, c-format
a0b6b246
JX
2672msgid "invalid mode for object creation: %s"
2673msgstr "无效的对象创建模式:%s"
3495628d 2674
349ede6a 2675#: config.c:1445
c1ac5258
JX
2676#, c-format
2677msgid "malformed value for %s"
2678msgstr "%s 的取值格式错误"
2679
349ede6a 2680#: config.c:1471
c1ac5258
JX
2681#, c-format
2682msgid "malformed value for %s: %s"
2683msgstr "%s 的取值格式错误:%s"
2684
349ede6a 2685#: config.c:1472
c1ac5258
JX
2686msgid "must be one of nothing, matching, simple, upstream or current"
2687msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current"
2688
d9488fea 2689#: config.c:1533 builtin/pack-objects.c:3649
1a79b2f1
JX
2690#, c-format
2691msgid "bad pack compression level %d"
2692msgstr "错误的打包压缩级别 %d"
2693
349ede6a 2694#: config.c:1655
c1ac5258
JX
2695#, c-format
2696msgid "unable to load config blob object '%s'"
2697msgstr "无法从数据对象 '%s' 加载配置"
2698
349ede6a 2699#: config.c:1658
c1ac5258
JX
2700#, c-format
2701msgid "reference '%s' does not point to a blob"
2702msgstr "引用 '%s' 没有指向一个数据对象"
2703
349ede6a 2704#: config.c:1675
c1ac5258
JX
2705#, c-format
2706msgid "unable to resolve config blob '%s'"
2707msgstr "不能解析配置对象 '%s'"
2708
349ede6a 2709#: config.c:1705
c1ac5258
JX
2710#, c-format
2711msgid "failed to parse %s"
2712msgstr "解析 %s 失败"
2713
349ede6a 2714#: config.c:1759
a0b6b246
JX
2715msgid "unable to parse command-line config"
2716msgstr "无法解析命令行中的配置"
94550ed3 2717
d9488fea 2718#: config.c:2122
a0b6b246
JX
2719msgid "unknown error occurred while reading the configuration files"
2720msgstr "在读取配置文件时遇到未知错误"
94550ed3 2721
d9488fea 2722#: config.c:2296
87cb7997
JX
2723#, c-format
2724msgid "Invalid %s: '%s'"
2725msgstr "无效 %s:'%s'"
2726
d9488fea 2727#: config.c:2341
87cb7997
JX
2728#, c-format
2729msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2730msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
2731
d9488fea 2732#: config.c:2387
276ceeaa 2733#, c-format
a0b6b246
JX
2734msgid "unable to parse '%s' from command-line config"
2735msgstr "无法解析命令行配置中的 '%s'"
1b7f4a34 2736
d9488fea 2737#: config.c:2389
94550ed3 2738#, c-format
a0b6b246
JX
2739msgid "bad config variable '%s' in file '%s' at line %d"
2740msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
94550ed3 2741
d9488fea 2742#: config.c:2470
c1ac5258
JX
2743#, c-format
2744msgid "invalid section name '%s'"
2745msgstr "无效的小节名称 '%s'"
2746
d9488fea 2747#: config.c:2502
276ceeaa 2748#, c-format
a0b6b246
JX
2749msgid "%s has multiple values"
2750msgstr "%s 有多个取值"
276ceeaa 2751
d9488fea 2752#: config.c:2531
c1ac5258
JX
2753#, c-format
2754msgid "failed to write new configuration file %s"
2755msgstr "写入新的配置文件 %s 失败"
2756
d9488fea 2757#: config.c:2783 config.c:3107
c1ac5258
JX
2758#, c-format
2759msgid "could not lock config file %s"
2760msgstr "不能锁定配置文件 %s"
2761
d9488fea 2762#: config.c:2794
c1ac5258
JX
2763#, c-format
2764msgid "opening %s"
2765msgstr "打开 %s"
2766
d9488fea 2767#: config.c:2829 builtin/config.c:354
c1ac5258
JX
2768#, c-format
2769msgid "invalid pattern: %s"
2770msgstr "无效模式:%s"
2771
d9488fea 2772#: config.c:2854
c1ac5258
JX
2773#, c-format
2774msgid "invalid config file %s"
2775msgstr "无效的配置文件 %s"
2776
d9488fea 2777#: config.c:2867 config.c:3120
1a79b2f1
JX
2778#, c-format
2779msgid "fstat on %s failed"
65e2041e 2780msgstr "对 %s 调用 fstat 失败"
1a79b2f1 2781
d9488fea 2782#: config.c:2878
c1ac5258
JX
2783#, c-format
2784msgid "unable to mmap '%s'"
2785msgstr "不能 mmap '%s'"
2786
d9488fea 2787#: config.c:2887 config.c:3125
c1ac5258
JX
2788#, c-format
2789msgid "chmod on %s failed"
2790msgstr "对 %s 调用 chmod 失败"
2791
d9488fea 2792#: config.c:2972 config.c:3222
c1ac5258
JX
2793#, c-format
2794msgid "could not write config file %s"
2795msgstr "不能写入配置文件 %s"
2796
d9488fea 2797#: config.c:3006
94550ed3 2798#, c-format
a0b6b246
JX
2799msgid "could not set '%s' to '%s'"
2800msgstr "不能设置 '%s' 为 '%s'"
94550ed3 2801
d9488fea 2802#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858
276ceeaa 2803#, c-format
a0b6b246
JX
2804msgid "could not unset '%s'"
2805msgstr "不能取消设置 '%s'"
276ceeaa 2806
d9488fea 2807#: config.c:3098
c1ac5258
JX
2808#, c-format
2809msgid "invalid section name: %s"
2810msgstr "无效的小节名称:%s"
2811
d9488fea 2812#: config.c:3265
c1ac5258
JX
2813#, c-format
2814msgid "missing value for '%s'"
2815msgstr "%s 的取值缺失"
2816
fd8cb379 2817#: connect.c:61
c1ac5258
JX
2818msgid "the remote end hung up upon initial contact"
2819msgstr "远端在初始连接时即挂断"
94550ed3 2820
fd8cb379 2821#: connect.c:63
a0b6b246
JX
2822msgid ""
2823"Could not read from remote repository.\n"
2824"\n"
2825"Please make sure you have the correct access rights\n"
2826"and the repository exists."
2827msgstr ""
2828"无法读取远程仓库。\n"
2829"\n"
2830"请确认您有正确的访问权限并且仓库存在。"
2831
c1ac5258
JX
2832#: connect.c:81
2833#, c-format
2834msgid "server doesn't support '%s'"
2835msgstr "服务器不支持 '%s'"
2836
7157c2b5 2837#: connect.c:118
c1ac5258
JX
2838#, c-format
2839msgid "server doesn't support feature '%s'"
2840msgstr "服务器不支持特性 '%s'"
2841
7157c2b5 2842#: connect.c:129
c1ac5258
JX
2843msgid "expected flush after capabilities"
2844msgstr "在能力之后应为一个 flush 包"
2845
7157c2b5 2846#: connect.c:263
c1ac5258
JX
2847#, c-format
2848msgid "ignoring capabilities after first line '%s'"
e640d114 2849msgstr "忽略第一行 '%s' 之后的能力字段"
c1ac5258 2850
7157c2b5 2851#: connect.c:284
c1ac5258
JX
2852msgid "protocol error: unexpected capabilities^{}"
2853msgstr "协议错误:意外的 capabilities^{}"
2854
7157c2b5 2855#: connect.c:306
c1ac5258
JX
2856#, c-format
2857msgid "protocol error: expected shallow sha-1, got '%s'"
2858msgstr "协议错误:预期浅克隆 sha-1,却得到 '%s'"
2859
7157c2b5 2860#: connect.c:308
c1ac5258
JX
2861msgid "repository on the other end cannot be shallow"
2862msgstr "另一端的仓库不能是浅克隆仓库"
2863
7157c2b5 2864#: connect.c:347
c1ac5258
JX
2865msgid "invalid packet"
2866msgstr "无效数据包"
2867
7157c2b5 2868#: connect.c:367
c1ac5258
JX
2869#, c-format
2870msgid "protocol error: unexpected '%s'"
2871msgstr "协议错误:意外的 '%s'"
2872
7157c2b5
JX
2873#: connect.c:473
2874#, c-format
2875msgid "unknown object format '%s' specified by server"
2876msgstr "服务器给出未知的对象格式 '%s'"
2877
2878#: connect.c:500
c1ac5258
JX
2879#, c-format
2880msgid "invalid ls-refs response: %s"
2881msgstr "无效的 ls-refs 响应:%s"
2882
7157c2b5 2883#: connect.c:504
c1ac5258
JX
2884msgid "expected flush after ref listing"
2885msgstr "在引用列表之后应该有一个 flush 包"
2886
7157c2b5
JX
2887#: connect.c:507
2888msgid "expected response end packet after ref listing"
2889msgstr "在引用列表之后应该有响应结束包"
2890
2891#: connect.c:640
c1ac5258
JX
2892#, c-format
2893msgid "protocol '%s' is not supported"
2894msgstr "不支持 '%s' 协议"
2895
7157c2b5 2896#: connect.c:691
c1ac5258
JX
2897msgid "unable to set SO_KEEPALIVE on socket"
2898msgstr "无法为 socket 设置 SO_KEEPALIVE"
2899
7157c2b5 2900#: connect.c:731 connect.c:794
c1ac5258
JX
2901#, c-format
2902msgid "Looking up %s ... "
2903msgstr "查找 %s ..."
2904
7157c2b5 2905#: connect.c:735
c1ac5258
JX
2906#, c-format
2907msgid "unable to look up %s (port %s) (%s)"
2908msgstr "无法查找 %s(端口 %s)(%s)"
2909
2910#. TRANSLATORS: this is the end of "Looking up %s ... "
7157c2b5 2911#: connect.c:739 connect.c:810
c1ac5258
JX
2912#, c-format
2913msgid ""
2914"done.\n"
2915"Connecting to %s (port %s) ... "
2916msgstr ""
2917"完成。\n"
2918"连接到 %s(端口 %s)... "
2919
7157c2b5 2920#: connect.c:761 connect.c:838
c1ac5258
JX
2921#, c-format
2922msgid ""
2923"unable to connect to %s:\n"
2924"%s"
2925msgstr ""
2926"无法连接到 %s:\n"
2927"%s"
2928
2929#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
7157c2b5 2930#: connect.c:767 connect.c:844
c1ac5258
JX
2931msgid "done."
2932msgstr "完成。"
2933
7157c2b5 2934#: connect.c:798
c1ac5258
JX
2935#, c-format
2936msgid "unable to look up %s (%s)"
2937msgstr "无法查找 %s(%s)"
2938
7157c2b5 2939#: connect.c:804
c1ac5258
JX
2940#, c-format
2941msgid "unknown port %s"
2942msgstr "未知端口 %s"
2943
7157c2b5 2944#: connect.c:941 connect.c:1271
c1ac5258
JX
2945#, c-format
2946msgid "strange hostname '%s' blocked"
2947msgstr "已阻止奇怪的主机名 '%s'"
2948
7157c2b5 2949#: connect.c:943
c1ac5258
JX
2950#, c-format
2951msgid "strange port '%s' blocked"
2952msgstr "已阻止奇怪的端口号 '%s'"
2953
7157c2b5 2954#: connect.c:953
c1ac5258
JX
2955#, c-format
2956msgid "cannot start proxy %s"
2957msgstr "不能启动代理 %s"
2958
7157c2b5 2959#: connect.c:1024
c1ac5258
JX
2960msgid "no path specified; see 'git help pull' for valid url syntax"
2961msgstr "未指定路径,执行 'git help pull' 查看有效的 url 语法"
2962
7157c2b5 2963#: connect.c:1219
c1ac5258
JX
2964msgid "ssh variant 'simple' does not support -4"
2965msgstr "ssh 变体 'simple' 不支持 -4"
2966
7157c2b5 2967#: connect.c:1231
c1ac5258
JX
2968msgid "ssh variant 'simple' does not support -6"
2969msgstr "ssh 变体 'simple' 不支持 -6"
2970
7157c2b5 2971#: connect.c:1248
c1ac5258 2972msgid "ssh variant 'simple' does not support setting port"
e640d114 2973msgstr "ssh 变体 'simple' 不支持设置端口"
c1ac5258 2974
7157c2b5 2975#: connect.c:1360
c1ac5258
JX
2976#, c-format
2977msgid "strange pathname '%s' blocked"
2978msgstr "已阻止奇怪的路径名 '%s'"
2979
d9488fea 2980#: connect.c:1408
c1ac5258
JX
2981msgid "unable to fork"
2982msgstr "无法 fork"
2983
d9488fea 2984#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45
a0b6b246 2985msgid "Checking connectivity"
06991777 2986msgstr "正在检查连通性"
a0b6b246 2987
d9488fea 2988#: connected.c:120
a0b6b246
JX
2989msgid "Could not run 'git rev-list'"
2990msgstr "不能执行 'git rev-list'"
2991
d9488fea 2992#: connected.c:144
a0b6b246 2993msgid "failed write to rev-list"
c1ac5258 2994msgstr "写入 rev-list 失败"
a0b6b246 2995
d9488fea 2996#: connected.c:149
a0b6b246 2997msgid "failed to close rev-list's stdin"
c1ac5258
JX
2998msgstr "关闭 rev-list 的标准输入失败"
2999
a5cd71ca 3000#: convert.c:194
c1ac5258
JX
3001#, c-format
3002msgid "illegal crlf_action %d"
3003msgstr "非法的 crlf 动作 %d"
a0b6b246 3004
a5cd71ca 3005#: convert.c:207
3495628d 3006#, c-format
c1ac5258
JX
3007msgid "CRLF would be replaced by LF in %s"
3008msgstr "%s 中的 CRLF 将被 LF 替换"
31e5e17b 3009
a5cd71ca 3010#: convert.c:209
31e5e17b 3011#, c-format
a0b6b246
JX
3012msgid ""
3013"CRLF will be replaced by LF in %s.\n"
c1ac5258 3014"The file will have its original line endings in your working directory"
a0b6b246 3015msgstr ""
c1ac5258 3016"%s 中的 CRLF 将被 LF 替换。<\n"
a0b6b246 3017"在工作区中该文件仍保持原有的换行符。"
3495628d 3018
a5cd71ca 3019#: convert.c:217
3495628d 3020#, c-format
31e5e17b
JX
3021msgid "LF would be replaced by CRLF in %s"
3022msgstr "文件 %s 中的 LF 将被 CRLF 替换"
3495628d 3023
a5cd71ca 3024#: convert.c:219
276ceeaa 3025#, c-format
a0b6b246
JX
3026msgid ""
3027"LF will be replaced by CRLF in %s.\n"
c1ac5258 3028"The file will have its original line endings in your working directory"
a0b6b246 3029msgstr ""
c1ac5258
JX
3030"%s 中的 LF 将被 CRLF 替换。\n"
3031"在工作区中该文件仍保持原有的换行符"
276ceeaa 3032
ddc12c42 3033#: convert.c:284
fd8cb379
JX
3034#, c-format
3035msgid "BOM is prohibited in '%s' if encoded as %s"
3036msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM"
3037
ddc12c42 3038#: convert.c:291
fd8cb379
JX
3039#, c-format
3040msgid ""
ddc12c42
JX
3041"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
3042"working-tree-encoding."
2b472aae
JX
3043msgstr ""
3044"文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%.*s 作为工作区编码。"
fd8cb379 3045
ddc12c42 3046#: convert.c:304
fd8cb379
JX
3047#, c-format
3048msgid "BOM is required in '%s' if encoded as %s"
3049msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM"
3050
ddc12c42 3051#: convert.c:306
fd8cb379
JX
3052#, c-format
3053msgid ""
3054"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
3055"%sLE (depending on the byte order) as working-tree-encoding."
3056msgstr ""
3057"文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字"
3058"节序)作为工作区编码。"
3059
ddc12c42 3060#: convert.c:419 convert.c:490
fd8cb379
JX
3061#, c-format
3062msgid "failed to encode '%s' from %s to %s"
3063msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
3064
ddc12c42 3065#: convert.c:462
fd8cb379
JX
3066#, c-format
3067msgid "encoding '%s' from %s to %s and back is not the same"
3068msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
3069
d9488fea 3070#: convert.c:665
c1ac5258
JX
3071#, c-format
3072msgid "cannot fork to run external filter '%s'"
e640d114 3073msgstr "不能 fork 以执行外部过滤器 '%s'"
c1ac5258 3074
d9488fea 3075#: convert.c:685
c1ac5258
JX
3076#, c-format
3077msgid "cannot feed the input to external filter '%s'"
e640d114 3078msgstr "不能将输入传递给外部过滤器 '%s'"
c1ac5258 3079
d9488fea 3080#: convert.c:692
c1ac5258
JX
3081#, c-format
3082msgid "external filter '%s' failed %d"
e640d114 3083msgstr "外部过滤器 '%s' 失败码 %d"
c1ac5258 3084
d9488fea 3085#: convert.c:727 convert.c:730
c1ac5258
JX
3086#, c-format
3087msgid "read from external filter '%s' failed"
3088msgstr "从外部过滤器 '%s' 读取失败"
3089
d9488fea 3090#: convert.c:733 convert.c:788
c1ac5258
JX
3091#, c-format
3092msgid "external filter '%s' failed"
3093msgstr "外部过滤器 '%s' 失败"
3094
d9488fea 3095#: convert.c:837
c1ac5258
JX
3096msgid "unexpected filter type"
3097msgstr "意外的过滤类型"
3098
d9488fea 3099#: convert.c:848
c1ac5258
JX
3100msgid "path name too long for external filter"
3101msgstr "外部过滤器的路径名太长"
3102
d9488fea 3103#: convert.c:940
c1ac5258
JX
3104#, c-format
3105msgid ""
3106"external filter '%s' is not available anymore although not all paths have "
3107"been filtered"
3108msgstr "外部过滤器 '%s' 不再可用,但并非所有路径都已过滤"
3109
d9488fea 3110#: convert.c:1240
fd8cb379
JX
3111msgid "true/false are no valid working-tree-encodings"
3112msgstr "true/false 不是有效的工作区编码"
3113
d9488fea 3114#: convert.c:1428 convert.c:1462
c1ac5258
JX
3115#, c-format
3116msgid "%s: clean filter '%s' failed"
3117msgstr "%s:clean 过滤器 '%s' 失败"
3118
d9488fea 3119#: convert.c:1508
c1ac5258
JX
3120#, c-format
3121msgid "%s: smudge filter %s failed"
3122msgstr "%s:smudge 过滤器 %s 失败"
3123
349ede6a
JX
3124#: credential.c:96
3125#, c-format
3126msgid "skipping credential lookup for key: credential.%s"
3127msgstr "跳过凭据查询:credential.%s"
3128
3129#: credential.c:112
3130msgid "refusing to work with credential missing host field"
3131msgstr "拒绝使用缺少主机字段的凭据"
3132
3133#: credential.c:114
3134msgid "refusing to work with credential missing protocol field"
3135msgstr "拒绝使用缺少协议字段的凭据"
3136
d9488fea 3137#: credential.c:394
349ede6a
JX
3138#, c-format
3139msgid "url contains a newline in its %s component: %s"
3140msgstr "URL 的 %s 组件中包含换行符:%s"
3141
d9488fea 3142#: credential.c:438
349ede6a
JX
3143#, c-format
3144msgid "url has no scheme: %s"
3145msgstr "URL 没有 scheme:%s"
3146
d9488fea 3147#: credential.c:511
349ede6a
JX
3148#, c-format
3149msgid "credential url cannot be parsed: %s"
3150msgstr "不能解析凭据 URL:%s"
3151
a5cd71ca 3152#: date.c:138
a0b6b246
JX
3153msgid "in the future"
3154msgstr "在将来"
3495628d 3155
a5cd71ca 3156#: date.c:144
3495628d 3157#, c-format
a4f16749
JX
3158msgid "%<PRIuMAX> second ago"
3159msgid_plural "%<PRIuMAX> seconds ago"
3160msgstr[0] "%<PRIuMAX> 秒钟前"
3161msgstr[1] "%<PRIuMAX> 秒钟前"
3495628d 3162
a5cd71ca 3163#: date.c:151
3495628d 3164#, c-format
a4f16749
JX
3165msgid "%<PRIuMAX> minute ago"
3166msgid_plural "%<PRIuMAX> minutes ago"
3167msgstr[0] "%<PRIuMAX> 分钟前"
3168msgstr[1] "%<PRIuMAX> 分钟前"
3495628d 3169
a5cd71ca 3170#: date.c:158
3495628d 3171#, c-format
a4f16749
JX
3172msgid "%<PRIuMAX> hour ago"
3173msgid_plural "%<PRIuMAX> hours ago"
3174msgstr[0] "%<PRIuMAX> 小时前"
3175msgstr[1] "%<PRIuMAX> 小时前"
3495628d 3176
a5cd71ca 3177#: date.c:165
3495628d 3178#, c-format
a4f16749
JX
3179msgid "%<PRIuMAX> day ago"
3180msgid_plural "%<PRIuMAX> days ago"
3181msgstr[0] "%<PRIuMAX> 天前"
3182msgstr[1] "%<PRIuMAX> 天前"
3495628d 3183
a5cd71ca 3184#: date.c:171
94550ed3 3185#, c-format
a4f16749
JX
3186msgid "%<PRIuMAX> week ago"
3187msgid_plural "%<PRIuMAX> weeks ago"
3188msgstr[0] "%<PRIuMAX> 周前"
3189msgstr[1] "%<PRIuMAX> 周前"
94550ed3 3190
a5cd71ca 3191#: date.c:178
3495628d 3192#, c-format
a4f16749
JX
3193msgid "%<PRIuMAX> month ago"
3194msgid_plural "%<PRIuMAX> months ago"
3195msgstr[0] "%<PRIuMAX> 个月前"
3196msgstr[1] "%<PRIuMAX> 个月前"
3495628d 3197
a5cd71ca 3198#: date.c:189
3495628d 3199#, c-format
a4f16749
JX
3200msgid "%<PRIuMAX> year"
3201msgid_plural "%<PRIuMAX> years"
3202msgstr[0] "%<PRIuMAX> 年"
3203msgstr[1] "%<PRIuMAX> 年"
3495628d 3204
a0b6b246 3205#. TRANSLATORS: "%s" is "<n> years"
a5cd71ca 3206#: date.c:192
94550ed3 3207#, c-format
a4f16749
JX
3208msgid "%s, %<PRIuMAX> month ago"
3209msgid_plural "%s, %<PRIuMAX> months ago"
3210msgstr[0] "%s %<PRIuMAX> 个月前"
3211msgstr[1] "%s %<PRIuMAX> 个月前"
94550ed3 3212
a5cd71ca 3213#: date.c:197 date.c:202
94550ed3 3214#, c-format
a4f16749
JX
3215msgid "%<PRIuMAX> year ago"
3216msgid_plural "%<PRIuMAX> years ago"
3217msgstr[0] "%<PRIuMAX> 年前"
3218msgstr[1] "%<PRIuMAX> 年前"
94550ed3 3219
06991777 3220#: delta-islands.c:272
4c27fcb5
JX
3221msgid "Propagating island marks"
3222msgstr "正在传播数据岛标记"
3223
06991777 3224#: delta-islands.c:290
4c27fcb5
JX
3225#, c-format
3226msgid "bad tree object %s"
3227msgstr "坏的树对象 %s"
3228
06991777 3229#: delta-islands.c:334
4c27fcb5
JX
3230#, c-format
3231msgid "failed to load island regex for '%s': %s"
3232msgstr "未能加载 '%s' 的数据岛正则表达式:%s"
3233
06991777 3234#: delta-islands.c:390
4c27fcb5
JX
3235#, c-format
3236msgid "island regex from config has too many capture groups (max=%d)"
3237msgstr "来自 config 的数据岛正则表达式有太多的捕获组(最多 %d 个)"
3238
a6cd2cc4 3239#: delta-islands.c:467
4c27fcb5
JX
3240#, c-format
3241msgid "Marked %d islands, done.\n"
3242msgstr "已标记 %d 个数据岛,结束。\n"
3243
d46c5519
JX
3244#: diff-no-index.c:238
3245msgid "git diff --no-index [<options>] <path> <path>"
3246msgstr "git diff --no-index [<选项>] <路径> <路径>"
3247
3248#: diff-no-index.c:263
3249msgid ""
3250"Not a git repository. Use --no-index to compare two paths outside a working "
3251"tree"
d9488fea 3252msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径"
cfff71a9 3253
a0b6b246 3254# 译者:注意保持前导空格
7157c2b5 3255#: diff.c:156
a0b6b246
JX
3256#, c-format
3257msgid " Failed to parse dirstat cut-off percentage '%s'\n"
3258msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
cfff71a9 3259
a0b6b246 3260# 译者:注意保持前导空格
7157c2b5 3261#: diff.c:161
a0b6b246
JX
3262#, c-format
3263msgid " Unknown dirstat parameter '%s'\n"
3264msgstr " 未知的 dirstat 参数 '%s'\n"
7aea43ff 3265
7157c2b5 3266#: diff.c:297
6937cb4e 3267msgid ""
c1ac5258
JX
3268"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
3269"'dimmed-zebra', 'plain'"
5809aa05 3270msgstr ""
c1ac5258
JX
3271"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "
3272"'plain'"
3273
7157c2b5 3274#: diff.c:325
c1ac5258 3275#, c-format
06991777
JX
3276msgid ""
3277"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
3278"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
3279msgstr ""
3280"未知的 color-moved-ws 模式 '%s',可能的取值有 'ignore-space-change'、'ignore-"
3281"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
c1ac5258 3282
7157c2b5 3283#: diff.c:333
c1ac5258 3284msgid ""
06991777
JX
3285"color-moved-ws: allow-indentation-change cannot be combined with other "
3286"whitespace modes"
c1ac5258 3287msgstr "color-moved-ws:allow-indentation-change 不能与其它空白字符模式共用"
6937cb4e 3288
7157c2b5 3289#: diff.c:410
7aea43ff 3290#, c-format
a0b6b246
JX
3291msgid "Unknown value for 'diff.submodule' config variable: '%s'"
3292msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
7aea43ff 3293
7157c2b5 3294#: diff.c:470
7aea43ff 3295#, c-format
a0b6b246
JX
3296msgid ""
3297"Found errors in 'diff.dirstat' config variable:\n"
3298"%s"
3299msgstr ""
3300"发现配置变量 'diff.dirstat' 中的错误:\n"
3301"%s"
7aea43ff 3302
d9488fea 3303#: diff.c:4269
7aea43ff 3304#, c-format
a0b6b246
JX
3305msgid "external diff died, stopping at %s"
3306msgstr "外部 diff 退出,停止在 %s"
7aea43ff 3307
d9488fea 3308#: diff.c:4618
a0b6b246
JX
3309msgid "--name-only, --name-status, --check and -s are mutually exclusive"
3310msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
3311
d9488fea 3312#: diff.c:4621
31e5e17b
JX
3313msgid "-G, -S and --find-object are mutually exclusive"
3314msgstr "-G、-S 和 --find-object 是互斥的"
3315
d9488fea 3316#: diff.c:4699
a0b6b246
JX
3317msgid "--follow requires exactly one pathspec"
3318msgstr "--follow 明确要求只跟一个路径规格"
3319
d9488fea 3320#: diff.c:4747
d46c5519
JX
3321#, c-format
3322msgid "invalid --stat value: %s"
3323msgstr "无效的 --stat 值:%s"
3324
d9488fea
JX
3325#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279
3326#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
d46c5519
JX
3327#, c-format
3328msgid "%s expects a numerical value"
3329msgstr "%s 期望一个数字值"
3330
d9488fea 3331#: diff.c:4784
7aea43ff 3332#, c-format
a0b6b246
JX
3333msgid ""
3334"Failed to parse --dirstat/-X option parameter:\n"
3335"%s"
3336msgstr ""
3337"无法解析 --dirstat/-X 选项的参数:\n"
3338"%s"
7aea43ff 3339
d9488fea 3340#: diff.c:4869
d46c5519
JX
3341#, c-format
3342msgid "unknown change class '%c' in --diff-filter=%s"
3343msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
3344
d9488fea 3345#: diff.c:4893
d46c5519
JX
3346#, c-format
3347msgid "unknown value after ws-error-highlight=%.*s"
3348msgstr "ws-error-highlight=%.*s 之后未知的值"
3349
d9488fea 3350#: diff.c:4907
7aea43ff 3351#, c-format
d46c5519
JX
3352msgid "unable to resolve '%s'"
3353msgstr "不能解析 '%s'"
3354
d9488fea 3355#: diff.c:4957 diff.c:4963
d46c5519
JX
3356#, c-format
3357msgid "%s expects <n>/<m> form"
3358msgstr "%s 期望 <n>/<m> 格式"
3359
d9488fea 3360#: diff.c:4975
d46c5519
JX
3361#, c-format
3362msgid "%s expects a character, got '%s'"
3363msgstr "%s 期望一个字符,得到 '%s'"
3364
d9488fea 3365#: diff.c:4996
d46c5519
JX
3366#, c-format
3367msgid "bad --color-moved argument: %s"
3368msgstr "坏的 --color-moved 参数:%s"
3369
d9488fea 3370#: diff.c:5015
d46c5519
JX
3371#, c-format
3372msgid "invalid mode '%s' in --color-moved-ws"
3373msgstr "--color-moved-ws 中的无效模式 '%s' "
3374
d9488fea 3375#: diff.c:5055
d46c5519
JX
3376msgid ""
3377"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3378"\"histogram\""
3379msgstr ""
3380"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3381
d9488fea 3382#: diff.c:5091 diff.c:5111
d46c5519
JX
3383#, c-format
3384msgid "invalid argument to %s"
3385msgstr "%s 的参数无效"
3386
d9488fea 3387#: diff.c:5248
d46c5519
JX
3388#, c-format
3389msgid "failed to parse --submodule option parameter: '%s'"
a0b6b246 3390msgstr "无法解析 --submodule 选项的参数:'%s'"
7aea43ff 3391
d9488fea 3392#: diff.c:5304
d46c5519
JX
3393#, c-format
3394msgid "bad --word-diff argument: %s"
3395msgstr "坏的 --word-diff 参数:%s"
3396
d9488fea 3397#: diff.c:5327
d46c5519
JX
3398msgid "Diff output format options"
3399msgstr "差异输出格式化选项"
3400
d9488fea 3401#: diff.c:5329 diff.c:5335
d46c5519
JX
3402msgid "generate patch"
3403msgstr "生成补丁"
3404
d9488fea 3405#: diff.c:5332 builtin/log.c:176
d46c5519
JX
3406msgid "suppress diff output"
3407msgstr "不显示差异输出"
3408
d9488fea 3409#: diff.c:5337 diff.c:5451 diff.c:5458
d46c5519
JX
3410msgid "<n>"
3411msgstr "<n>"
3412
d9488fea 3413#: diff.c:5338 diff.c:5341
d46c5519
JX
3414msgid "generate diffs with <n> lines context"
3415msgstr "生成含 <n> 行上下文的差异"
3416
d9488fea 3417#: diff.c:5343
d46c5519
JX
3418msgid "generate the diff in raw format"
3419msgstr "生成原始格式的差异"
3420
d9488fea 3421#: diff.c:5346
d46c5519
JX
3422msgid "synonym for '-p --raw'"
3423msgstr "和 '-p --raw' 同义"
3424
d9488fea 3425#: diff.c:5350
d46c5519
JX
3426msgid "synonym for '-p --stat'"
3427msgstr "和 '-p --stat' 同义"
3428
d9488fea 3429#: diff.c:5354
d46c5519
JX
3430msgid "machine friendly --stat"
3431msgstr "机器友好的 --stat"
3432
d9488fea 3433#: diff.c:5357
d46c5519
JX
3434msgid "output only the last line of --stat"
3435msgstr "只输出 --stat 的最后一行"
3436
d9488fea 3437#: diff.c:5359 diff.c:5367
d46c5519
JX
3438msgid "<param1,param2>..."
3439msgstr "<参数1,参数2>..."
3440
d9488fea 3441#: diff.c:5360
d46c5519
JX
3442msgid ""
3443"output the distribution of relative amount of changes for each sub-directory"
3444msgstr "输出每个子目录相对变更的分布"
3445
d9488fea 3446#: diff.c:5364
d46c5519
JX
3447msgid "synonym for --dirstat=cumulative"
3448msgstr "和 --dirstat=cumulative 同义"
3449
d9488fea 3450#: diff.c:5368
d46c5519
JX
3451msgid "synonym for --dirstat=files,param1,param2..."
3452msgstr "是 --dirstat=files,param1,param2... 的同义词"
3453
d9488fea 3454#: diff.c:5372
d46c5519
JX
3455msgid "warn if changes introduce conflict markers or whitespace errors"
3456msgstr "如果变更中引入冲突定界符或空白错误,给出警告"
3457
d9488fea 3458#: diff.c:5375
d46c5519
JX
3459msgid "condensed summary such as creations, renames and mode changes"
3460msgstr "精简摘要,例如创建、重命名和模式变更"
3461
d9488fea 3462#: diff.c:5378
d46c5519
JX
3463msgid "show only names of changed files"
3464msgstr "只显示变更文件的文件名"
3465
d9488fea 3466#: diff.c:5381
d46c5519
JX
3467msgid "show only names and status of changed files"
3468msgstr "只显示变更文件的文件名和状态"
3469
d9488fea 3470#: diff.c:5383
d46c5519
JX
3471msgid "<width>[,<name-width>[,<count>]]"
3472msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
3473
d9488fea 3474#: diff.c:5384
d46c5519 3475msgid "generate diffstat"
5b533632 3476msgstr "生成差异统计(diffstat)"
d46c5519 3477
d9488fea 3478#: diff.c:5386 diff.c:5389 diff.c:5392
d46c5519
JX
3479msgid "<width>"
3480msgstr "<宽度>"
3481
d9488fea 3482#: diff.c:5387
d46c5519
JX
3483msgid "generate diffstat with a given width"
3484msgstr "使用给定的长度生成差异统计"
3485
d9488fea 3486#: diff.c:5390
d46c5519
JX
3487msgid "generate diffstat with a given name width"
3488msgstr "使用给定的文件名长度生成差异统计"
3489
d9488fea 3490#: diff.c:5393
d46c5519
JX
3491msgid "generate diffstat with a given graph width"
3492msgstr "使用给定的图形长度生成差异统计"
3493
d9488fea 3494#: diff.c:5395
d46c5519
JX
3495msgid "<count>"
3496msgstr "<次数>"
3497
d9488fea 3498#: diff.c:5396
d46c5519
JX
3499msgid "generate diffstat with limited lines"
3500msgstr "生成有限行数的差异统计"
3501
d9488fea 3502#: diff.c:5399
d46c5519
JX
3503msgid "generate compact summary in diffstat"
3504msgstr "生成差异统计的简洁摘要"
3505
d9488fea 3506#: diff.c:5402
d46c5519
JX
3507msgid "output a binary diff that can be applied"
3508msgstr "输出一个可以应用的二进制差异"
3509
d9488fea 3510#: diff.c:5405
d46c5519
JX
3511msgid "show full pre- and post-image object names on the \"index\" lines"
3512msgstr "在 \"index\" 行显示完整的前后对象名称"
3513
d9488fea 3514#: diff.c:5407
d46c5519
JX
3515msgid "show colored diff"
3516msgstr "显示带颜色的差异"
3517
d9488fea 3518#: diff.c:5408
d46c5519
JX
3519msgid "<kind>"
3520msgstr "<类型>"
3521
d9488fea 3522#: diff.c:5409
d46c5519
JX
3523msgid ""
3524"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3525"diff"
3526msgstr "对于差异中的上下文、旧的和新的行,加亮显示错误的空白字符"
3527
d9488fea 3528#: diff.c:5412
d46c5519
JX
3529msgid ""
3530"do not munge pathnames and use NULs as output field terminators in --raw or "
3531"--numstat"
3532msgstr ""
3533"在 --raw 或者 --numstat 中,不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
3534"符"
3535
d9488fea 3536#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527
d46c5519
JX
3537msgid "<prefix>"
3538msgstr "<前缀>"
3539
d9488fea 3540#: diff.c:5416
d46c5519
JX
3541msgid "show the given source prefix instead of \"a/\""
3542msgstr "显示给定的源前缀取代 \"a/\""
3543
d9488fea 3544#: diff.c:5419
d46c5519
JX
3545msgid "show the given destination prefix instead of \"b/\""
3546msgstr "显示给定的目标前缀取代 \"b/\""
3547
d9488fea 3548#: diff.c:5422
d46c5519
JX
3549msgid "prepend an additional prefix to every line of output"
3550msgstr "输出的每一行附加前缀"
3551
d9488fea 3552#: diff.c:5425
d46c5519
JX
3553msgid "do not show any source or destination prefix"
3554msgstr "不显示任何源和目标前缀"
3555
d9488fea 3556#: diff.c:5428
d46c5519
JX
3557msgid "show context between diff hunks up to the specified number of lines"
3558msgstr "显示指定行数的差异块间的上下文"
3559
d9488fea 3560#: diff.c:5432 diff.c:5437 diff.c:5442
d46c5519
JX
3561msgid "<char>"
3562msgstr "<字符>"
3563
d9488fea 3564#: diff.c:5433
d46c5519
JX
3565msgid "specify the character to indicate a new line instead of '+'"
3566msgstr "指定一个字符取代 '+' 来表示新的一行"
3567
d9488fea 3568#: diff.c:5438
d46c5519
JX
3569msgid "specify the character to indicate an old line instead of '-'"
3570msgstr "指定一个字符取代 '-' 来表示旧的一行"
3571
d9488fea 3572#: diff.c:5443
d46c5519
JX
3573msgid "specify the character to indicate a context instead of ' '"
3574msgstr "指定一个字符取代 ' ' 来表示一行上下文"
3575
d9488fea 3576#: diff.c:5446
d46c5519
JX
3577msgid "Diff rename options"
3578msgstr "差异重命名选项"
3579
d9488fea 3580#: diff.c:5447
d46c5519
JX
3581msgid "<n>[/<m>]"
3582msgstr "<n>[/<m>]"
3583
d9488fea 3584#: diff.c:5448
d46c5519 3585msgid "break complete rewrite changes into pairs of delete and create"
5b533632 3586msgstr "将完全重写的变更打破为成对的删除和创建"
d46c5519 3587
d9488fea 3588#: diff.c:5452
d46c5519
JX
3589msgid "detect renames"
3590msgstr "检测重命名"
3591
d9488fea 3592#: diff.c:5456
d46c5519
JX
3593msgid "omit the preimage for deletes"
3594msgstr "省略删除操作的差异输出"
3595
d9488fea 3596#: diff.c:5459
d46c5519
JX
3597msgid "detect copies"
3598msgstr "检测拷贝"
3599
d9488fea 3600#: diff.c:5463
d46c5519
JX
3601msgid "use unmodified files as source to find copies"
3602msgstr "使用未修改的文件做为发现拷贝的源"
3603
d9488fea 3604#: diff.c:5465
d46c5519
JX
3605msgid "disable rename detection"
3606msgstr "禁用重命名探测"
3607
d9488fea 3608#: diff.c:5468
d46c5519
JX
3609msgid "use empty blobs as rename source"
3610msgstr "使用空的数据对象做为重命名的源"
3611
d9488fea 3612#: diff.c:5470
d46c5519
JX
3613msgid "continue listing the history of a file beyond renames"
3614msgstr "继续列出文件重命名以外的历史记录"
3615
d9488fea 3616#: diff.c:5473
d46c5519
JX
3617msgid ""
3618"prevent rename/copy detection if the number of rename/copy targets exceeds "
3619"given limit"
3620msgstr "如果重命名/拷贝目标超过给定的限制,禁止重命名/拷贝检测"
3621
d9488fea 3622#: diff.c:5475
d46c5519
JX
3623msgid "Diff algorithm options"
3624msgstr "差异算法选项"
3625
d9488fea 3626#: diff.c:5477
d46c5519
JX
3627msgid "produce the smallest possible diff"
3628msgstr "生成尽可能小的差异"
3629
d9488fea 3630#: diff.c:5480
d46c5519
JX
3631msgid "ignore whitespace when comparing lines"
3632msgstr "行比较时忽略空白字符"
3633
d9488fea 3634#: diff.c:5483
d46c5519
JX
3635msgid "ignore changes in amount of whitespace"
3636msgstr "忽略空白字符的变更"
3637
d9488fea 3638#: diff.c:5486
d46c5519
JX
3639msgid "ignore changes in whitespace at EOL"
3640msgstr "忽略行尾的空白字符变更"
3641
d9488fea 3642#: diff.c:5489
d46c5519
JX
3643msgid "ignore carrier-return at the end of line"
3644msgstr "忽略行尾的回车符(CR)"
3645
d9488fea 3646#: diff.c:5492
d46c5519
JX
3647msgid "ignore changes whose lines are all blank"
3648msgstr "忽略整行都是空白的变更"
3649
d9488fea 3650#: diff.c:5495
d46c5519
JX
3651msgid "heuristic to shift diff hunk boundaries for easy reading"
3652msgstr "启发式转换差异边界以便阅读"
3653
d9488fea 3654#: diff.c:5498
d46c5519
JX
3655msgid "generate diff using the \"patience diff\" algorithm"
3656msgstr "使用 \"patience diff\" 算法生成差异"
3657
d9488fea 3658#: diff.c:5502
d46c5519
JX
3659msgid "generate diff using the \"histogram diff\" algorithm"
3660msgstr "使用 \"histogram diff\" 算法生成差异"
3661
d9488fea 3662#: diff.c:5504
d46c5519
JX
3663msgid "<algorithm>"
3664msgstr "<算法>"
3665
d9488fea 3666#: diff.c:5505
d46c5519
JX
3667msgid "choose a diff algorithm"
3668msgstr "选择一个差异算法"
3669
d9488fea 3670#: diff.c:5507
d46c5519
JX
3671msgid "<text>"
3672msgstr "<文本>"
3673
d9488fea 3674#: diff.c:5508
d46c5519 3675msgid "generate diff using the \"anchored diff\" algorithm"
5b533632 3676msgstr "使用 \"anchored diff\" 算法生成差异"
d46c5519 3677
d9488fea 3678#: diff.c:5510 diff.c:5519 diff.c:5522
d46c5519
JX
3679msgid "<mode>"
3680msgstr "<模式>"
3681
d9488fea 3682#: diff.c:5511
d46c5519
JX
3683msgid "show word diff, using <mode> to delimit changed words"
3684msgstr "显示单词差异,使用 <模式> 分隔变更的单词"
3685
d9488fea 3686#: diff.c:5513 diff.c:5516 diff.c:5561
d46c5519
JX
3687msgid "<regex>"
3688msgstr "<正则>"
3689
d9488fea 3690#: diff.c:5514
d46c5519
JX
3691msgid "use <regex> to decide what a word is"
3692msgstr "使用 <正则表达式> 确定何为一个词"
3693
d9488fea 3694#: diff.c:5517
d46c5519
JX
3695msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3696msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
3697
d9488fea 3698#: diff.c:5520
d46c5519
JX
3699msgid "moved lines of code are colored differently"
3700msgstr "移动的代码行用不同方式着色"
3701
d9488fea 3702#: diff.c:5523
d46c5519
JX
3703msgid "how white spaces are ignored in --color-moved"
3704msgstr "在 --color-moved 下如何忽略空白字符"
3705
d9488fea 3706#: diff.c:5526
d46c5519
JX
3707msgid "Other diff options"
3708msgstr "其它差异选项"
3709
d9488fea 3710#: diff.c:5528
d46c5519
JX
3711msgid "when run from subdir, exclude changes outside and show relative paths"
3712msgstr "当从子目录运行,排除目录之外的变更并显示相对路径"
3713
d9488fea 3714#: diff.c:5532
d46c5519
JX
3715msgid "treat all files as text"
3716msgstr "把所有文件当做文本处理"
3717
d9488fea 3718#: diff.c:5534
d46c5519
JX
3719msgid "swap two inputs, reverse the diff"
3720msgstr "交换两个输入,反转差异"
3721
d9488fea 3722#: diff.c:5536
d46c5519
JX
3723msgid "exit with 1 if there were differences, 0 otherwise"
3724msgstr "有差异时退出码为 1,否则为 0"
3725
d9488fea 3726#: diff.c:5538
d46c5519
JX
3727msgid "disable all output of the program"
3728msgstr "禁用本程序的所有输出"
3729
d9488fea 3730#: diff.c:5540
d46c5519
JX
3731msgid "allow an external diff helper to be executed"
3732msgstr "允许执行一个外置的差异助手"
3733
d9488fea 3734#: diff.c:5542
d46c5519
JX
3735msgid "run external text conversion filters when comparing binary files"
3736msgstr "当比较二进制文件时,运行外部的文本转换过滤器"
3737
d9488fea 3738#: diff.c:5544
d46c5519
JX
3739msgid "<when>"
3740msgstr "<何时>"
3741
d9488fea 3742#: diff.c:5545
d46c5519
JX
3743msgid "ignore changes to submodules in the diff generation"
3744msgstr "在生成差异时,忽略子模组的更改"
3745
d9488fea 3746#: diff.c:5548
d46c5519
JX
3747msgid "<format>"
3748msgstr "<格式>"
3749
d9488fea 3750#: diff.c:5549
d46c5519
JX
3751msgid "specify how differences in submodules are shown"
3752msgstr "指定子模组的差异如何显示"
3753
d9488fea 3754#: diff.c:5553
d46c5519
JX
3755msgid "hide 'git add -N' entries from the index"
3756msgstr "隐藏索引中 'git add -N' 条目"
3757
d9488fea 3758#: diff.c:5556
d46c5519
JX
3759msgid "treat 'git add -N' entries as real in the index"
3760msgstr "将索引中 'git add -N' 条目当做真实的"
3761
d9488fea 3762#: diff.c:5558
d46c5519
JX
3763msgid "<string>"
3764msgstr "<字符串>"
3765
d9488fea 3766#: diff.c:5559
d46c5519
JX
3767msgid ""
3768"look for differences that change the number of occurrences of the specified "
3769"string"
3770msgstr "查找改变了指定字符串出现次数的差异"
3771
d9488fea 3772#: diff.c:5562
d46c5519
JX
3773msgid ""
3774"look for differences that change the number of occurrences of the specified "
3775"regex"
3776msgstr "查找改变指定正则匹配出现次数的差异"
3777
d9488fea 3778#: diff.c:5565
d46c5519
JX
3779msgid "show all changes in the changeset with -S or -G"
3780msgstr "显示使用 -S 或 -G 的变更集的所有变更"
3781
d9488fea 3782#: diff.c:5568
d46c5519
JX
3783msgid "treat <string> in -S as extended POSIX regular expression"
3784msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
3785
d9488fea 3786#: diff.c:5571
d46c5519
JX
3787msgid "control the order in which files appear in the output"
3788msgstr "控制输出中的文件显示顺序"
3789
d9488fea 3790#: diff.c:5572
d46c5519 3791msgid "<object-id>"
5b533632 3792msgstr "<对象 ID>"
d46c5519 3793
d9488fea 3794#: diff.c:5573
d46c5519
JX
3795msgid ""
3796"look for differences that change the number of occurrences of the specified "
3797"object"
3798msgstr "查找改变指定对象出现次数的差异"
3799
d9488fea 3800#: diff.c:5575
d46c5519
JX
3801msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3802msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
3803
d9488fea 3804#: diff.c:5576
d46c5519
JX
3805msgid "select files by diff type"
3806msgstr "通过差异类型选择文件"
3807
d9488fea 3808#: diff.c:5578
d46c5519
JX
3809msgid "<file>"
3810msgstr "<文件>"
3811
d9488fea 3812#: diff.c:5579
d46c5519
JX
3813msgid "Output to a specific file"
3814msgstr "输出到一个指定的文件"
3815
d9488fea 3816#: diff.c:6236
a0b6b246
JX
3817msgid "inexact rename detection was skipped due to too many files."
3818msgstr "因为文件太多,略过不严格的重命名检查。"
3819
d9488fea 3820#: diff.c:6239
a0b6b246
JX
3821msgid "only found copies from modified paths due to too many files."
3822msgstr "因为文件太多,只在修改的路径中查找拷贝。"
3823
d9488fea 3824#: diff.c:6242
7aea43ff 3825#, c-format
a0b6b246
JX
3826msgid ""
3827"you may want to set your %s variable to at least %d and retry the command."
29004bbb 3828msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
7aea43ff 3829
349ede6a
JX
3830#: diffcore-order.c:24
3831#, c-format
3832msgid "failed to read orderfile '%s'"
3833msgstr "读取排序文件 '%s' 失败"
3834
3835#: diffcore-rename.c:592
3836msgid "Performing inexact rename detection"
3837msgstr "正在进行非精确的重命名探测"
3838
d9488fea 3839#: dir.c:578
c1ac5258
JX
3840#, c-format
3841msgid "pathspec '%s' did not match any file(s) known to git"
3842msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
3843
d9488fea 3844#: dir.c:718 dir.c:747 dir.c:760
ddc12c42
JX
3845#, c-format
3846msgid "unrecognized pattern: '%s'"
3847msgstr "未识别的模式:'%s'"
3848
d9488fea 3849#: dir.c:777 dir.c:791
ddc12c42
JX
3850#, c-format
3851msgid "unrecognized negative pattern: '%s'"
3852msgstr "未识别的反向模式:'%s'"
3853
d9488fea 3854#: dir.c:809
ddc12c42
JX
3855#, c-format
3856msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
3857msgstr "您的 sparse-checkout 文件可能有问题:重复的模式 '%s'"
3858
d9488fea 3859#: dir.c:819
ddc12c42
JX
3860msgid "disabling cone pattern matching"
3861msgstr "禁止 cone 模式匹配"
3862
d9488fea 3863#: dir.c:1198
c1ac5258
JX
3864#, c-format
3865msgid "cannot use %s as an exclude file"
3866msgstr "不能将 %s 用作排除文件"
3867
d9488fea 3868#: dir.c:2305
31e5e17b
JX
3869#, c-format
3870msgid "could not open directory '%s'"
3871msgstr "不能打开目录 '%s'"
3872
d9488fea 3873#: dir.c:2605
a0b6b246
JX
3874msgid "failed to get kernel name and information"
3875msgstr "无法获得内核名称和信息"
7aea43ff 3876
d9488fea 3877#: dir.c:2729
c1ac5258
JX
3878msgid "untracked cache is disabled on this system or location"
3879msgstr "缓存未跟踪文件在本系统或位置中被禁用"
3880
d9488fea 3881#: dir.c:3520
c1ac5258
JX
3882#, c-format
3883msgid "index file corrupt in repo %s"
3884msgstr "仓库 %s 中的索引文件损坏"
7aea43ff 3885
d9488fea 3886#: dir.c:3565 dir.c:3570
87cb7997
JX
3887#, c-format
3888msgid "could not create directories for %s"
3889msgstr "不能为 %s 创建目录"
3890
d9488fea 3891#: dir.c:3599
1a79b2f1
JX
3892#, c-format
3893msgid "could not migrate git directory from '%s' to '%s'"
3894msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
3895
349ede6a 3896#: editor.c:74
5809aa05
JX
3897#, c-format
3898msgid "hint: Waiting for your editor to close the file...%c"
3899msgstr "提示:等待您的编辑器关闭文件...%c"
3900
7157c2b5 3901#: entry.c:177
6937cb4e
JX
3902msgid "Filtering content"
3903msgstr "过滤内容"
3904
7157c2b5 3905#: entry.c:478
87cb7997
JX
3906#, c-format
3907msgid "could not stat file '%s'"
65e2041e 3908msgstr "不能对文件 '%s' 调用 stat"
87cb7997 3909
349ede6a 3910#: environment.c:150
c1ac5258
JX
3911#, c-format
3912msgid "bad git namespace path \"%s\""
e640d114 3913msgstr "错误的 git 名字空间路径 \"%s\""
c1ac5258 3914
349ede6a 3915#: environment.c:337
c1ac5258
JX
3916#, c-format
3917msgid "could not set GIT_DIR to '%s'"
3918msgstr "不能设置 GIT_DIR 为 '%s'"
3919
d46c5519 3920#: exec-cmd.c:363
c1ac5258
JX
3921#, c-format
3922msgid "too many args to run %s"
3923msgstr "执行 %s 的参数太多"
3924
d9488fea 3925#: fetch-pack.c:176
a0b6b246
JX
3926msgid "git fetch-pack: expected shallow list"
3927msgstr "git fetch-pack:应为 shallow 列表"
3928
d9488fea 3929#: fetch-pack.c:179
06991777
JX
3930msgid "git fetch-pack: expected a flush packet after shallow list"
3931msgstr "git fetch-pack:在浅克隆列表之后期望一个 flush 包"
3932
d9488fea 3933#: fetch-pack.c:190
31e5e17b
JX
3934msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
3935msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包"
a0b6b246 3936
d9488fea 3937#: fetch-pack.c:210
90314792 3938#, c-format
275588f9 3939msgid "git fetch-pack: expected ACK/NAK, got '%s'"
a0b6b246 3940msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
90314792 3941
d9488fea 3942#: fetch-pack.c:221
d46c5519
JX
3943msgid "unable to write to remote"
3944msgstr "无法写到远程"
3945
d9488fea 3946#: fetch-pack.c:282
a0b6b246
JX
3947msgid "--stateless-rpc requires multi_ack_detailed"
3948msgstr "--stateless-rpc 需要 multi_ack_detailed"
90314792 3949
d9488fea 3950#: fetch-pack.c:375 fetch-pack.c:1397
90314792 3951#, c-format
a0b6b246
JX
3952msgid "invalid shallow line: %s"
3953msgstr "无效的 shallow 信息:%s"
90314792 3954
d9488fea 3955#: fetch-pack.c:381 fetch-pack.c:1403
c04f5ac3 3956#, c-format
a0b6b246
JX
3957msgid "invalid unshallow line: %s"
3958msgstr "无效的 unshallow 信息:%s"
c04f5ac3 3959
d9488fea 3960#: fetch-pack.c:383 fetch-pack.c:1405
a0b6b246
JX
3961#, c-format
3962msgid "object not found: %s"
3963msgstr "对象未找到:%s"
07432cef 3964
d9488fea 3965#: fetch-pack.c:386 fetch-pack.c:1408
c04f5ac3 3966#, c-format
a0b6b246
JX
3967msgid "error in object: %s"
3968msgstr "对象中出错:%s"
07432cef 3969
d9488fea 3970#: fetch-pack.c:388 fetch-pack.c:1410
c04f5ac3 3971#, c-format
a0b6b246
JX
3972msgid "no shallow found: %s"
3973msgstr "未发现 shallow:%s"
c04f5ac3 3974
d9488fea 3975#: fetch-pack.c:391 fetch-pack.c:1414
a0b6b246
JX
3976#, c-format
3977msgid "expected shallow/unshallow, got %s"
3978msgstr "应为 shallow/unshallow,却得到 %s"
07432cef 3979
d9488fea 3980#: fetch-pack.c:431
a0b6b246
JX
3981#, c-format
3982msgid "got %s %d %s"
3983msgstr "得到 %s %d %s"
1b7f4a34 3984
d9488fea 3985#: fetch-pack.c:448
1b7f4a34 3986#, c-format
a0b6b246
JX
3987msgid "invalid commit %s"
3988msgstr "无效提交 %s"
1b7f4a34 3989
d9488fea 3990#: fetch-pack.c:479
a0b6b246
JX
3991msgid "giving up"
3992msgstr "放弃"
814ff314 3993
d9488fea 3994#: fetch-pack.c:492 progress.c:339
a0b6b246
JX
3995msgid "done"
3996msgstr "完成"
2e8451e8 3997
d9488fea 3998#: fetch-pack.c:504
2e8451e8 3999#, c-format
a0b6b246
JX
4000msgid "got %s (%d) %s"
4001msgstr "得到 %s (%d) %s"
2e8451e8 4002
d9488fea 4003#: fetch-pack.c:540
a0b6b246
JX
4004#, c-format
4005msgid "Marking %s as complete"
4006msgstr "标记 %s 为完成"
220c313c 4007
d9488fea 4008#: fetch-pack.c:755
a0b6b246
JX
4009#, c-format
4010msgid "already have %s (%s)"
29004bbb 4011msgstr "已经有 %s(%s)"
220c313c 4012
d9488fea 4013#: fetch-pack.c:824
a0b6b246
JX
4014msgid "fetch-pack: unable to fork off sideband demultiplexer"
4015msgstr "fetch-pack:无法派生 sideband 多路输出"
1b7f4a34 4016
d9488fea 4017#: fetch-pack.c:832
a0b6b246
JX
4018msgid "protocol error: bad pack header"
4019msgstr "协议错误:坏的包头"
814ff314 4020
d9488fea 4021#: fetch-pack.c:916
a0b6b246
JX
4022#, c-format
4023msgid "fetch-pack: unable to fork off %s"
4024msgstr "fetch-pack:无法派生进程 %s"
5c57d762 4025
d9488fea 4026#: fetch-pack.c:933
a0b6b246
JX
4027#, c-format
4028msgid "%s failed"
4029msgstr "%s 失败"
14c8bced 4030
d9488fea 4031#: fetch-pack.c:935
a0b6b246
JX
4032msgid "error in sideband demultiplexer"
4033msgstr "sideband 多路输出出错"
c04f5ac3 4034
d9488fea 4035#: fetch-pack.c:978
81809b99 4036#, c-format
a0b6b246
JX
4037msgid "Server version is %.*s"
4038msgstr "服务器版本 %.*s"
8ada9598 4039
d9488fea
JX
4040#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998
4041#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014
4042#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030
4043#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052
a6cd2cc4
JX
4044#, c-format
4045msgid "Server supports %s"
4046msgstr "服务器支持 %s"
4047
d9488fea 4048#: fetch-pack.c:985
a6cd2cc4
JX
4049msgid "Server does not support shallow clients"
4050msgstr "服务器不支持 shalllow 客户端"
4051
d9488fea 4052#: fetch-pack.c:1045
a0b6b246
JX
4053msgid "Server does not support --shallow-since"
4054msgstr "服务器不支持 --shallow-since"
8ada9598 4055
d9488fea 4056#: fetch-pack.c:1050
a0b6b246
JX
4057msgid "Server does not support --shallow-exclude"
4058msgstr "服务器不支持 --shallow-exclude"
c04f5ac3 4059
d9488fea 4060#: fetch-pack.c:1054
a0b6b246
JX
4061msgid "Server does not support --deepen"
4062msgstr "服务器不支持 --deepen"
c04f5ac3 4063
d9488fea 4064#: fetch-pack.c:1056
7157c2b5
JX
4065msgid "Server does not support this repository's object format"
4066msgstr "服务器不支持这个仓库的对象格式"
4067
d9488fea 4068#: fetch-pack.c:1069
a0b6b246
JX
4069msgid "no common commits"
4070msgstr "没有共同的提交"
c04f5ac3 4071
d9488fea 4072#: fetch-pack.c:1081 fetch-pack.c:1619
a0b6b246
JX
4073msgid "git fetch-pack: fetch failed."
4074msgstr "git fetch-pack:获取失败。"
c04f5ac3 4075
d9488fea 4076#: fetch-pack.c:1205
7157c2b5
JX
4077#, c-format
4078msgid "mismatched algorithms: client %s; server %s"
4079msgstr "不匹配的算法:客户端 %s,服务端 %s"
4080
d9488fea 4081#: fetch-pack.c:1209
7157c2b5
JX
4082#, c-format
4083msgid "the server does not support algorithm '%s'"
4084msgstr "服务器不支持算法 '%s'"
4085
d9488fea 4086#: fetch-pack.c:1229
fd8cb379
JX
4087msgid "Server does not support shallow requests"
4088msgstr "服务器不支持 shalllow 请求"
4089
d9488fea 4090#: fetch-pack.c:1236
a6cd2cc4
JX
4091msgid "Server supports filter"
4092msgstr "服务器支持 filter"
4093
d9488fea 4094#: fetch-pack.c:1275
d46c5519
JX
4095msgid "unable to write request to remote"
4096msgstr "无法将请求写到远程"
4097
d9488fea 4098#: fetch-pack.c:1293
c1ac5258
JX
4099#, c-format
4100msgid "error reading section header '%s'"
4101msgstr "读取节标题 '%s' 出错"
4102
d9488fea 4103#: fetch-pack.c:1299
c1ac5258
JX
4104#, c-format
4105msgid "expected '%s', received '%s'"
4106msgstr "预期 '%s',得到 '%s'"
4107
d9488fea 4108#: fetch-pack.c:1360
c1ac5258
JX
4109#, c-format
4110msgid "unexpected acknowledgment line: '%s'"
4111msgstr "意外的确认行:'%s'"
4112
d9488fea 4113#: fetch-pack.c:1365
c1ac5258
JX
4114#, c-format
4115msgid "error processing acks: %d"
4116msgstr "处理 ack 出错:%d"
4117
d9488fea 4118#: fetch-pack.c:1375
4c27fcb5
JX
4119msgid "expected packfile to be sent after 'ready'"
4120msgstr "预期在 'ready' 之后发送 packfile"
4121
d9488fea 4122#: fetch-pack.c:1377
4c27fcb5
JX
4123msgid "expected no other sections to be sent after no 'ready'"
4124msgstr "在没有 'ready' 不应该发送其它小节"
4125
d9488fea 4126#: fetch-pack.c:1419
c1ac5258
JX
4127#, c-format
4128msgid "error processing shallow info: %d"
4129msgstr "处理浅克隆信息出错:%d"
4130
d9488fea 4131#: fetch-pack.c:1466
c1ac5258
JX
4132#, c-format
4133msgid "expected wanted-ref, got '%s'"
4134msgstr "预期 wanted-ref,得到 '%s'"
4135
d9488fea 4136#: fetch-pack.c:1471
c1ac5258
JX
4137#, c-format
4138msgid "unexpected wanted-ref: '%s'"
4139msgstr "意外的 wanted-ref:'%s'"
4140
d9488fea 4141#: fetch-pack.c:1476
c1ac5258
JX
4142#, c-format
4143msgid "error processing wanted refs: %d"
4144msgstr "处理要获取的引用出错:%d"
4145
d9488fea 4146#: fetch-pack.c:1506
7157c2b5
JX
4147msgid "git fetch-pack: expected response end packet"
4148msgstr "git fetch-pack:预期响应结束包"
4149
d9488fea 4150#: fetch-pack.c:1887
a0b6b246
JX
4151msgid "no matching remote head"
4152msgstr "没有匹配的远程分支"
c04f5ac3 4153
d9488fea 4154#: fetch-pack.c:1910 builtin/clone.c:692
c1ac5258 4155msgid "remote did not send all necessary objects"
e640d114 4156msgstr "远程没有发送所有必需的对象"
c1ac5258 4157
d9488fea 4158#: fetch-pack.c:1937
87cb7997
JX
4159#, c-format
4160msgid "no such remote ref %s"
4161msgstr "没有这样的远程引用 %s"
4162
d9488fea 4163#: fetch-pack.c:1940
87cb7997
JX
4164#, c-format
4165msgid "Server does not allow request for unadvertised object %s"
4166msgstr "服务器不允许请求未公开的对象 %s"
4167
349ede6a 4168#: gpg-interface.c:272
a0b6b246
JX
4169msgid "could not create temporary file"
4170msgstr "不能创建临时文件"
c04f5ac3 4171
349ede6a 4172#: gpg-interface.c:275
c04f5ac3 4173#, c-format
a0b6b246
JX
4174msgid "failed writing detached signature to '%s'"
4175msgstr "无法将分离式签名写入 '%s'"
c04f5ac3 4176
349ede6a
JX
4177#: gpg-interface.c:457
4178msgid "gpg failed to sign the data"
4179msgstr "gpg 数据签名失败"
4180
ddc12c42 4181#: graph.c:98
1a79b2f1
JX
4182#, c-format
4183msgid "ignore invalid color '%.*s' in log.graphColors"
4184msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
4185
a5cd71ca
JX
4186#: grep.c:668
4187msgid ""
4188"given pattern contains NULL byte (via -f <file>). This is only supported "
4189"with -P under PCRE v2"
4190msgstr ""
ddc12c42
JX
4191"给定的模式包含 NULL 字符(通过 -f <文件> 参数)。只有 PCRE v2 下的 -P 支持此"
4192"功能"
a5cd71ca 4193
2b472aae 4194#: grep.c:2128
c04f5ac3 4195#, c-format
a0b6b246
JX
4196msgid "'%s': unable to read %s"
4197msgstr "'%s':无法读取 %s"
c04f5ac3 4198
7157c2b5 4199#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89
06991777 4200#: builtin/rm.c:135
c04f5ac3 4201#, c-format
a0b6b246 4202msgid "failed to stat '%s'"
65e2041e 4203msgstr "对 '%s' 调用 stat 失败"
c04f5ac3 4204
2b472aae 4205#: grep.c:2156
a0b6b246
JX
4206#, c-format
4207msgid "'%s': short read"
4208msgstr "'%s':读取不完整"
5c57d762 4209
fd8cb379
JX
4210#: help.c:23
4211msgid "start a working area (see also: git help tutorial)"
4212msgstr "开始一个工作区(参见:git help tutorial)"
4213
4214#: help.c:24
4215msgid "work on the current change (see also: git help everyday)"
4216msgstr "在当前变更上工作(参见:git help everyday)"
4217
4218#: help.c:25
4219msgid "examine the history and state (see also: git help revisions)"
4220msgstr "检查历史和状态(参见:git help revisions)"
4221
4222#: help.c:26
4223msgid "grow, mark and tweak your common history"
4224msgstr "扩展、标记和调校您的历史记录"
4225
4226#: help.c:27
4227msgid "collaborate (see also: git help workflows)"
4228msgstr "协同(参见:git help workflows)"
4229
4230#: help.c:31
4231msgid "Main Porcelain Commands"
4232msgstr "主要的上层命令"
4233
4234#: help.c:32
4235msgid "Ancillary Commands / Manipulators"
4236msgstr "辅助命令/操作者"
4237
4238#: help.c:33
4239msgid "Ancillary Commands / Interrogators"
4240msgstr "辅助命令/询问者"
4241
4242#: help.c:34
4243msgid "Interacting with Others"
4244msgstr "与其它系统交互"
4245
4246#: help.c:35
4247msgid "Low-level Commands / Manipulators"
4248msgstr "低级命令/操作者"
4249
4250#: help.c:36
4251msgid "Low-level Commands / Interrogators"
4252msgstr "低级命令/询问者"
4253
4254#: help.c:37
ddc12c42 4255msgid "Low-level Commands / Syncing Repositories"
fd8cb379
JX
4256msgstr "低级命令/同步仓库"
4257
4258#: help.c:38
4259msgid "Low-level Commands / Internal Helpers"
4260msgstr "低级命令/内部助手"
4261
d9488fea 4262#: help.c:300
a0b6b246
JX
4263#, c-format
4264msgid "available git commands in '%s'"
4265msgstr "在 '%s' 下可用的 git 命令"
c04f5ac3 4266
d9488fea 4267#: help.c:307
a0b6b246
JX
4268msgid "git commands available from elsewhere on your $PATH"
4269msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
5c57d762 4270
d9488fea 4271#: help.c:316
a0b6b246
JX
4272msgid "These are common Git commands used in various situations:"
4273msgstr "这些是各种场合常见的 Git 命令:"
5c57d762 4274
d9488fea 4275#: help.c:365 git.c:99
fd8cb379
JX
4276#, c-format
4277msgid "unsupported command listing type '%s'"
4278msgstr "不支持的命令列表类型 '%s'"
4279
d9488fea
JX
4280#: help.c:405
4281msgid "The Git concept guides are:"
4282msgstr "Git 概念向导有:"
fd8cb379 4283
d9488fea 4284#: help.c:429
4c27fcb5
JX
4285msgid "See 'git help <command>' to read about a specific subcommand"
4286msgstr "执行 'git help <command>' 来查看特定子命令"
4287
d9488fea 4288#: help.c:434
4c27fcb5
JX
4289msgid "External commands"
4290msgstr "外部命令"
4291
d9488fea 4292#: help.c:449
4c27fcb5
JX
4293msgid "Command aliases"
4294msgstr "命令别名"
4295
d9488fea 4296#: help.c:513
c04f5ac3 4297#, c-format
a0b6b246
JX
4298msgid ""
4299"'%s' appears to be a git command, but we were not\n"
4300"able to execute it. Maybe git-%s is broken?"
4301msgstr ""
4302"'%s' 像是一个 git 命令,但却无法运行。\n"
4303"可能是 git-%s 受损?"
c04f5ac3 4304
d9488fea 4305#: help.c:572
a0b6b246
JX
4306msgid "Uh oh. Your system reports no Git commands at all."
4307msgstr "唉呀,您的系统中未发现 Git 命令。"
c04f5ac3 4308
d9488fea 4309#: help.c:594
c04f5ac3 4310#, c-format
a4f16749 4311msgid "WARNING: You called a Git command named '%s', which does not exist."
554e8501 4312msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。"
a4f16749 4313
d9488fea 4314#: help.c:599
a4f16749
JX
4315#, c-format
4316msgid "Continuing under the assumption that you meant '%s'."
554e8501 4317msgstr "假定你想要的是 '%s' 并继续。"
c04f5ac3 4318
d9488fea 4319#: help.c:604
c04f5ac3 4320#, c-format
a4f16749 4321msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
554e8501 4322msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。"
c04f5ac3 4323
d9488fea 4324#: help.c:612
c04f5ac3 4325#, c-format
a0b6b246
JX
4326msgid "git: '%s' is not a git command. See 'git --help'."
4327msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
c04f5ac3 4328
d9488fea 4329#: help.c:616
a4f16749
JX
4330msgid ""
4331"\n"
4332"The most similar command is"
4333msgid_plural ""
4334"\n"
4335"The most similar commands are"
6937cb4e
JX
4336msgstr[0] ""
4337"\n"
4338"最相似的命令是"
4339msgstr[1] ""
4340"\n"
4341"最相似的命令是"
a4f16749 4342
d9488fea 4343#: help.c:656
a4f16749
JX
4344msgid "git version [<options>]"
4345msgstr "git version [<选项>]"
4346
d9488fea 4347#: help.c:711
a4f16749
JX
4348#, c-format
4349msgid "%s: %s - %s"
4350msgstr "%s:%s - %s"
4351
d9488fea 4352#: help.c:715
a0b6b246
JX
4353msgid ""
4354"\n"
4355"Did you mean this?"
4356msgid_plural ""
4357"\n"
4358"Did you mean one of these?"
4359msgstr[0] ""
4360"\n"
4361"您指的是这个么?"
4362msgstr[1] ""
4363"\n"
4364"您指的是这其中的某一个么?"
c04f5ac3 4365
d9488fea
JX
4366#: ident.c:353
4367msgid "Author identity unknown\n"
4368msgstr "作者身份未知\n"
4369
4370#: ident.c:356
4371msgid "Committer identity unknown\n"
4372msgstr "提交者身份未知\n"
4373
4374#: ident.c:362
a0b6b246
JX
4375msgid ""
4376"\n"
4377"*** Please tell me who you are.\n"
4378"\n"
4379"Run\n"
4380"\n"
4381" git config --global user.email \"you@example.com\"\n"
4382" git config --global user.name \"Your Name\"\n"
4383"\n"
4384"to set your account's default identity.\n"
4385"Omit --global to set the identity only in this repository.\n"
4386"\n"
4387msgstr ""
4388"\n"
4389"*** 请告诉我你是谁。\n"
4390"\n"
4391"运行\n"
4392"\n"
4393" git config --global user.email \"you@example.com\"\n"
4394" git config --global user.name \"Your Name\"\n"
4395"\n"
4396"来设置您账号的缺省身份标识。\n"
4397"如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
c04f5ac3 4398
d9488fea 4399#: ident.c:397
87cb7997 4400msgid "no email was given and auto-detection is disabled"
65e2041e 4401msgstr "未提供邮件地址且自动探测被禁用"
87cb7997 4402
d9488fea 4403#: ident.c:402
87cb7997
JX
4404#, c-format
4405msgid "unable to auto-detect email address (got '%s')"
4406msgstr "无法自动探测邮件地址(得到 '%s')"
4407
d9488fea 4408#: ident.c:419
87cb7997
JX
4409msgid "no name was given and auto-detection is disabled"
4410msgstr "未提供姓名且自动探测被禁用"
4411
d9488fea 4412#: ident.c:425
87cb7997
JX
4413#, c-format
4414msgid "unable to auto-detect name (got '%s')"
4415msgstr "无法自动探测姓名(得到 '%s')"
4416
d9488fea 4417#: ident.c:433
87cb7997
JX
4418#, c-format
4419msgid "empty ident name (for <%s>) not allowed"
4420msgstr "不允许空的姓名(对于 <%s>)"
4421
d9488fea 4422#: ident.c:439
87cb7997
JX
4423#, c-format
4424msgid "name consists only of disallowed characters: %s"
4425msgstr "姓名中仅包含禁用字符:%s"
4426
d9488fea 4427#: ident.c:454 builtin/commit.c:634
87cb7997
JX
4428#, c-format
4429msgid "invalid date format: %s"
4430msgstr "无效的日期格式:%s"
4431
d9488fea 4432#: list-objects-filter-options.c:81
06991777
JX
4433msgid "expected 'tree:<depth>'"
4434msgstr "期望 'tree:<深度>'"
4c27fcb5 4435
d9488fea 4436#: list-objects-filter-options.c:96
d46c5519
JX
4437msgid "sparse:path filters support has been dropped"
4438msgstr "sparse:path 过滤器支持已被删除"
4439
d9488fea 4440#: list-objects-filter-options.c:109
a6cd2cc4
JX
4441#, c-format
4442msgid "invalid filter-spec '%s'"
4443msgstr "无效的过滤器表达式 '%s'"
4444
d9488fea 4445#: list-objects-filter-options.c:125
a5cd71ca
JX
4446#, c-format
4447msgid "must escape char in sub-filter-spec: '%c'"
4448msgstr "必须对 sub-filter-spec 中的字符进行转义:'%c'"
4449
d9488fea 4450#: list-objects-filter-options.c:167
a5cd71ca
JX
4451msgid "expected something after combine:"
4452msgstr "期望在组合后有一些东西:"
4453
d9488fea 4454#: list-objects-filter-options.c:249
a5cd71ca
JX
4455msgid "multiple filter-specs cannot be combined"
4456msgstr "不能混用多种过滤规格"
5809aa05 4457
d9488fea 4458#: list-objects-filter-options.c:361
7157c2b5
JX
4459msgid "unable to upgrade repository format to support partial clone"
4460msgstr "无法升级仓库格式以支持部分克隆"
4461
349ede6a
JX
4462#: list-objects-filter.c:492
4463#, c-format
4464msgid "unable to access sparse blob in '%s'"
4465msgstr "不能访问 '%s' 中的稀疏数据对象"
4466
4467#: list-objects-filter.c:495
4468#, c-format
4469msgid "unable to parse sparse filter data in %s"
4470msgstr "无法解析 %s 中的稀疏过滤器数据"
4471
4472#: list-objects.c:127
4473#, c-format
4474msgid "entry '%s' in tree %s has tree mode, but is not a tree"
4475msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式,但不是一个树对象"
4476
4477#: list-objects.c:140
4478#, c-format
4479msgid "entry '%s' in tree %s has blob mode, but is not a blob"
4480msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式,但不是一个数据对象"
4481
4482#: list-objects.c:375
4483#, c-format
4484msgid "unable to load root tree for commit %s"
4485msgstr "无法为提交 %s 加载根树"
4486
4487#: lockfile.c:152
c04f5ac3 4488#, c-format
a0b6b246
JX
4489msgid ""
4490"Unable to create '%s.lock': %s.\n"
4491"\n"
4492"Another git process seems to be running in this repository, e.g.\n"
4493"an editor opened by 'git commit'. Please make sure all processes\n"
4494"are terminated then try again. If it still fails, a git process\n"
4495"may have crashed in this repository earlier:\n"
4496"remove the file manually to continue."
4497msgstr ""
4498"无法创建 '%s.lock':%s。\n"
4499"\n"
4500"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
4501"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
4502"可能之前有一个 git 进程在这个仓库中异常退出:\n"
4503"手动删除这个文件再继续。"
c04f5ac3 4504
349ede6a 4505#: lockfile.c:160
a0b6b246
JX
4506#, c-format
4507msgid "Unable to create '%s.lock': %s"
4508msgstr "不能创建 '%s.lock':%s"
c04f5ac3 4509
349ede6a
JX
4510#: ls-refs.c:109
4511msgid "expected flush after ls-refs arguments"
4512msgstr "在 ls-refs 参数后应该有一个 flush 包"
c04f5ac3 4513
2b472aae 4514#: merge-recursive.c:356
a0b6b246
JX
4515msgid "(bad commit)\n"
4516msgstr "(坏提交)\n"
c04f5ac3 4517
2b472aae 4518#: merge-recursive.c:379
a0b6b246 4519#, c-format
fd8cb379 4520msgid "add_cacheinfo failed for path '%s'; merge aborting."
0fcd668f 4521msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。"
c04f5ac3 4522
2b472aae 4523#: merge-recursive.c:388
fd8cb379
JX
4524#, c-format
4525msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
0fcd668f 4526msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。"
fd8cb379 4527
2b472aae 4528#: merge-recursive.c:874
c04f5ac3 4529#, c-format
a0b6b246 4530msgid "failed to create path '%s'%s"
c1ac5258 4531msgstr "创建路径 '%s'%s 失败"
c04f5ac3 4532
2b472aae 4533#: merge-recursive.c:885
c04f5ac3 4534#, c-format
a0b6b246
JX
4535msgid "Removing %s to make room for subdirectory\n"
4536msgstr "删除 %s 以便为子目录留出空间\n"
c04f5ac3 4537
2b472aae 4538#: merge-recursive.c:899 merge-recursive.c:918
a0b6b246
JX
4539msgid ": perhaps a D/F conflict?"
4540msgstr ":可能是一个目录/文件冲突?"
c04f5ac3 4541
2b472aae 4542#: merge-recursive.c:908
c04f5ac3 4543#, c-format
a0b6b246
JX
4544msgid "refusing to lose untracked file at '%s'"
4545msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
c04f5ac3 4546
2b472aae 4547#: merge-recursive.c:949 builtin/cat-file.c:41
c04f5ac3 4548#, c-format
a0b6b246
JX
4549msgid "cannot read object %s '%s'"
4550msgstr "不能读取对象 %s '%s'"
c04f5ac3 4551
2b472aae 4552#: merge-recursive.c:954
4dcdc3d8 4553#, c-format
a0b6b246
JX
4554msgid "blob expected for %s '%s'"
4555msgstr "%s '%s' 应为数据对象"
4dcdc3d8 4556
2b472aae 4557#: merge-recursive.c:979
4dcdc3d8 4558#, c-format
a0b6b246 4559msgid "failed to open '%s': %s"
c1ac5258 4560msgstr "打开 '%s' 失败:%s"
4dcdc3d8 4561
2b472aae 4562#: merge-recursive.c:990
a0b6b246
JX
4563#, c-format
4564msgid "failed to symlink '%s': %s"
c1ac5258 4565msgstr "创建符号链接 '%s' 失败:%s"
c04f5ac3 4566
2b472aae 4567#: merge-recursive.c:995
5c57d762 4568#, c-format
a0b6b246
JX
4569msgid "do not know what to do with %06o %s '%s'"
4570msgstr "不知道如何处理 %06o %s '%s'"
5c57d762 4571
2b472aae 4572#: merge-recursive.c:1191
fd8cb379
JX
4573#, c-format
4574msgid "Failed to merge submodule %s (not checked out)"
4575msgstr "无法合并子模组 %s (没有检出)"
4576
2b472aae 4577#: merge-recursive.c:1198
fd8cb379
JX
4578#, c-format
4579msgid "Failed to merge submodule %s (commits not present)"
4580msgstr "无法合并子模组 %s(提交不存在)"
4581
2b472aae 4582#: merge-recursive.c:1205
fd8cb379
JX
4583#, c-format
4584msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4585msgstr "无法合并子模组 %s (提交未跟随合并基线)"
4586
2b472aae 4587#: merge-recursive.c:1213 merge-recursive.c:1225
fd8cb379
JX
4588#, c-format
4589msgid "Fast-forwarding submodule %s to the following commit:"
4590msgstr "子模组 %s 快进到如下提交:"
4591
2b472aae 4592#: merge-recursive.c:1216 merge-recursive.c:1228
fd8cb379
JX
4593#, c-format
4594msgid "Fast-forwarding submodule %s"
4595msgstr "快进子模组 %s"
4596
2b472aae 4597#: merge-recursive.c:1251
fd8cb379
JX
4598#, c-format
4599msgid "Failed to merge submodule %s (merge following commits not found)"
4600msgstr "无法合并子模组 %s (没发现合并跟随的提交)"
4601
2b472aae 4602#: merge-recursive.c:1255
fd8cb379
JX
4603#, c-format
4604msgid "Failed to merge submodule %s (not fast-forward)"
4605msgstr "无法合并子模组 %s(非快进)"
4606
2b472aae 4607#: merge-recursive.c:1256
fd8cb379
JX
4608msgid "Found a possible merge resolution for the submodule:\n"
4609msgstr "找到子模组的一个可能的合并方案:\n"
4610
2b472aae 4611#: merge-recursive.c:1259
fd8cb379
JX
4612#, c-format
4613msgid ""
4614"If this is correct simply add it to the index for example\n"
4615"by using:\n"
4616"\n"
4617" git update-index --cacheinfo 160000 %s \"%s\"\n"
4618"\n"
4619"which will accept this suggestion.\n"
4620msgstr ""
4621"如果这个正确,将其添加到索引,例如使用命令:\n"
4622"\n"
4623" git update-index --cacheinfo 160000 %s \"%s\"\n"
4624"\n"
4625"以接受此建议。\n"
4626
2b472aae 4627#: merge-recursive.c:1268
fd8cb379
JX
4628#, c-format
4629msgid "Failed to merge submodule %s (multiple merges found)"
4630msgstr "无法合并子模组 %s (发现多个合并)"
4631
2b472aae 4632#: merge-recursive.c:1341
a0b6b246
JX
4633msgid "Failed to execute internal merge"
4634msgstr "无法执行内部合并"
4635
2b472aae 4636#: merge-recursive.c:1346
5c57d762 4637#, c-format
a0b6b246
JX
4638msgid "Unable to add %s to database"
4639msgstr "不能添加 %s 至对象库"
5c57d762 4640
2b472aae 4641#: merge-recursive.c:1378
fd8cb379
JX
4642#, c-format
4643msgid "Auto-merging %s"
4644msgstr "自动合并 %s"
4645
2b472aae 4646#: merge-recursive.c:1402
fd8cb379
JX
4647#, c-format
4648msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
4649msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。"
4650
2b472aae 4651#: merge-recursive.c:1474
5c57d762
JX
4652#, c-format
4653msgid ""
a0b6b246
JX
4654"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4655"in tree."
5c57d762 4656msgstr ""
87cb7997
JX
4657"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
4658"本被保留。"
4659
2b472aae 4660#: merge-recursive.c:1479
87cb7997
JX
4661#, c-format
4662msgid ""
4663"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4664"left in tree."
4665msgstr ""
4666"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
4667"%7$s 版本被保留。"
c04f5ac3 4668
2b472aae 4669#: merge-recursive.c:1486
7aea43ff 4670#, c-format
a0b6b246
JX
4671msgid ""
4672"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
4673"in tree at %s."
4674msgstr ""
87cb7997
JX
4675"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
4676"本保留在 %8$s 中。"
7aea43ff 4677
2b472aae 4678#: merge-recursive.c:1491
87cb7997
JX
4679#, c-format
4680msgid ""
4681"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
4682"left in tree at %s."
4683msgstr ""
4684"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
4685"%7$s 版本保留在 %9$s 中。"
4686
2b472aae 4687#: merge-recursive.c:1526
a0b6b246
JX
4688msgid "rename"
4689msgstr "重命名"
5b04ee3b 4690
2b472aae 4691#: merge-recursive.c:1526
a0b6b246
JX
4692msgid "renamed"
4693msgstr "重命名"
5b04ee3b 4694
349ede6a 4695#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
fd8cb379
JX
4696#, c-format
4697msgid "Refusing to lose dirty file at %s"
4698msgstr "拒绝丢失脏文件 '%s'"
4699
2b472aae 4700#: merge-recursive.c:1587
06991777
JX
4701#, c-format
4702msgid "Refusing to lose untracked file at %s, even though it's in the way."
4703msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。"
4704
2b472aae 4705#: merge-recursive.c:1645
06991777
JX
4706#, c-format
4707msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
4708msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
4709
2b472aae 4710#: merge-recursive.c:1676
5c57d762 4711#, c-format
a0b6b246
JX
4712msgid "%s is a directory in %s adding as %s instead"
4713msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
5c57d762 4714
2b472aae 4715#: merge-recursive.c:1681
fd8cb379
JX
4716#, c-format
4717msgid "Refusing to lose untracked file at %s; adding as %s instead"
4718msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s"
4719
2b472aae 4720#: merge-recursive.c:1708
5c57d762
JX
4721#, c-format
4722msgid ""
a0b6b246
JX
4723"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
4724"\"->\"%s\" in \"%s\"%s"
5c57d762 4725msgstr ""
a0b6b246
JX
4726"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
4727"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
5c57d762 4728
2b472aae 4729#: merge-recursive.c:1713
a0b6b246
JX
4730msgid " (left unresolved)"
4731msgstr "(留下未解决)"
5c57d762 4732
349ede6a 4733#: merge-recursive.c:1805
5c57d762 4734#, c-format
a0b6b246 4735msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
5c57d762 4736msgstr ""
a0b6b246
JX
4737"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
4738"%5$s"
3495628d 4739
349ede6a 4740#: merge-recursive.c:2068
fd8cb379
JX
4741#, c-format
4742msgid ""
4743"CONFLICT (directory rename split): Unclear where to place %s because "
4744"directory %s was renamed to multiple other directories, with no destination "
4745"getting a majority of the files."
c1ac5258
JX
4746msgstr ""
4747"冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个"
4748"其它目录,没有目录包含大部分文件。"
fd8cb379 4749
349ede6a 4750#: merge-recursive.c:2100
fd8cb379
JX
4751#, c-format
4752msgid ""
4753"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
4754"implicit directory rename(s) putting the following path(s) there: %s."
4755msgstr ""
4756"冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放"
4757"在:%s。"
4758
349ede6a 4759#: merge-recursive.c:2110
fd8cb379
JX
4760#, c-format
4761msgid ""
4762"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
4763"implicit directory renames tried to put these paths there: %s"
4764msgstr ""
4765"冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路"
4766"径放置于此:%s"
4767
349ede6a 4768#: merge-recursive.c:2202
fd8cb379
JX
4769#, c-format
4770msgid ""
4771"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
4772">%s in %s"
4773msgstr ""
4774"冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 "
4775"%4$s->%5$s"
4776
349ede6a 4777#: merge-recursive.c:2447
fd8cb379
JX
4778#, c-format
4779msgid ""
4780"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4781"renamed."
4782msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。"
4783
349ede6a 4784#: merge-recursive.c:2973
90314792 4785#, c-format
a0b6b246
JX
4786msgid "cannot read object %s"
4787msgstr "不能读取对象 %s"
90314792 4788
349ede6a 4789#: merge-recursive.c:2976
90314792 4790#, c-format
a0b6b246
JX
4791msgid "object %s is not a blob"
4792msgstr "对象 %s 不是一个数据对象"
90314792 4793
349ede6a 4794#: merge-recursive.c:3040
a0b6b246
JX
4795msgid "modify"
4796msgstr "修改"
90314792 4797
349ede6a 4798#: merge-recursive.c:3040
a0b6b246
JX
4799msgid "modified"
4800msgstr "修改"
5b04ee3b 4801
349ede6a 4802#: merge-recursive.c:3052
a0b6b246
JX
4803msgid "content"
4804msgstr "内容"
5b04ee3b 4805
349ede6a 4806#: merge-recursive.c:3056
a0b6b246
JX
4807msgid "add/add"
4808msgstr "添加/添加"
3495628d 4809
349ede6a 4810#: merge-recursive.c:3079
220c313c 4811#, c-format
a0b6b246
JX
4812msgid "Skipped %s (merged same as existing)"
4813msgstr "略过 %s(已经做过相同合并)"
220c313c 4814
d9488fea 4815#: merge-recursive.c:3101
a0b6b246
JX
4816msgid "submodule"
4817msgstr "子模组"
4818
349ede6a 4819#: merge-recursive.c:3102
220c313c 4820#, c-format
a0b6b246
JX
4821msgid "CONFLICT (%s): Merge conflict in %s"
4822msgstr "冲突(%s):合并冲突于 %s"
220c313c 4823
349ede6a 4824#: merge-recursive.c:3132
220c313c 4825#, c-format
06991777
JX
4826msgid "Adding as %s instead"
4827msgstr "而是以 %s 为名添加"
4828
349ede6a 4829#: merge-recursive.c:3215
06991777 4830#, c-format
d46c5519
JX
4831msgid ""
4832"Path updated: %s added in %s inside a directory that was renamed in %s; "
4833"moving it to %s."
4834msgstr ""
5b533632 4835"路径已更新:%s 添加到 %s,位于一个被重命名到 %s 的目录中,将其移动到 %s。"
220c313c 4836
349ede6a 4837#: merge-recursive.c:3218
d46c5519
JX
4838#, c-format
4839msgid ""
4840"CONFLICT (file location): %s added in %s inside a directory that was renamed "
4841"in %s, suggesting it should perhaps be moved to %s."
4842msgstr ""
4843"冲突(文件位置):%s 添加到 %s,位于一个被重命名为 %s 的目录中,建议将其移动"
4844"到 %s。"
4845
349ede6a 4846#: merge-recursive.c:3222
d46c5519
JX
4847#, c-format
4848msgid ""
4849"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
4850"%s; moving it to %s."
4851msgstr ""
5b533632
FZ
4852"路径已更新:%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,将其移"
4853"动到 %5$s。"
d46c5519 4854
349ede6a 4855#: merge-recursive.c:3225
d46c5519
JX
4856#, c-format
4857msgid ""
4858"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
4859"was renamed in %s, suggesting it should perhaps be moved to %s."
4860msgstr ""
5b533632 4861"冲突(文件位置):%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,"
d46c5519
JX
4862"建议将其移动到 %5$s。"
4863
349ede6a 4864#: merge-recursive.c:3339
d46c5519
JX
4865#, c-format
4866msgid "Removing %s"
4867msgstr "删除 %s"
4868
349ede6a 4869#: merge-recursive.c:3362
d46c5519
JX
4870msgid "file/directory"
4871msgstr "文件/目录"
220c313c 4872
349ede6a 4873#: merge-recursive.c:3367
a0b6b246
JX
4874msgid "directory/file"
4875msgstr "目录/文件"
276ceeaa 4876
349ede6a 4877#: merge-recursive.c:3374
276ceeaa 4878#, c-format
a0b6b246
JX
4879msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
4880msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
276ceeaa 4881
349ede6a 4882#: merge-recursive.c:3383
276ceeaa 4883#, c-format
a0b6b246
JX
4884msgid "Adding %s"
4885msgstr "添加 %s"
276ceeaa 4886
349ede6a 4887#: merge-recursive.c:3392
06991777
JX
4888#, c-format
4889msgid "CONFLICT (add/add): Merge conflict in %s"
4890msgstr "冲突(add/add):合并冲突于 %s"
4891
349ede6a 4892#: merge-recursive.c:3436
6937cb4e 4893msgid "Already up to date!"
a0b6b246 4894msgstr "已经是最新的!"
276ceeaa 4895
349ede6a 4896#: merge-recursive.c:3445
276ceeaa 4897#, c-format
a0b6b246
JX
4898msgid "merging of trees %s and %s failed"
4899msgstr "无法合并树 %s 和 %s"
276ceeaa 4900
d9488fea 4901#: merge-recursive.c:3550
a0b6b246
JX
4902msgid "Merging:"
4903msgstr "合并:"
5c57d762 4904
d9488fea 4905#: merge-recursive.c:3563
5c57d762 4906#, c-format
a0b6b246
JX
4907msgid "found %u common ancestor:"
4908msgid_plural "found %u common ancestors:"
4909msgstr[0] "发现 %u 个共同祖先:"
4910msgstr[1] "发现 %u 个共同祖先:"
4911
d9488fea 4912#: merge-recursive.c:3613
a0b6b246
JX
4913msgid "merge returned no commit"
4914msgstr "合并未返回提交"
4915
d9488fea 4916#: merge-recursive.c:3672
a5cd71ca
JX
4917#, c-format
4918msgid ""
4919"Your local changes to the following files would be overwritten by merge:\n"
4920" %s"
4921msgstr ""
4922"您对下列文件的本地修改将被合并操作覆盖:\n"
4923" %s"
4924
d9488fea 4925#: merge-recursive.c:3769
5c57d762 4926#, c-format
a0b6b246
JX
4927msgid "Could not parse object '%s'"
4928msgstr "不能解析对象 '%s'"
5c57d762 4929
d9488fea 4930#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881
a0b6b246
JX
4931msgid "Unable to write index."
4932msgstr "不能写入索引。"
4933
349ede6a
JX
4934#: merge.c:41
4935msgid "failed to read the cache"
4936msgstr "读取缓存失败"
4937
d9488fea
JX
4938#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930
4939#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816
349ede6a
JX
4940#: builtin/stash.c:265
4941msgid "unable to write new index file"
4942msgstr "无法写新的索引文件"
4943
d9488fea 4944#: midx.c:79
4c27fcb5
JX
4945#, c-format
4946msgid "multi-pack-index file %s is too small"
4947msgstr "多包索引文件 %s 太小"
4948
d9488fea 4949#: midx.c:95
4c27fcb5
JX
4950#, c-format
4951msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
4952msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
4953
d9488fea 4954#: midx.c:100
4c27fcb5
JX
4955#, c-format
4956msgid "multi-pack-index version %d not recognized"
4957msgstr "multi-pack-index 版本 %d 不能被识别"
4958
d9488fea 4959#: midx.c:105
4c27fcb5 4960#, c-format
d9488fea
JX
4961msgid "multi-pack-index hash version %u does not match version %u"
4962msgstr "多包索引哈希版本 %u 和版本 %u 不匹配"
4c27fcb5 4963
d9488fea 4964#: midx.c:122
4c27fcb5
JX
4965msgid "invalid chunk offset (too large)"
4966msgstr "无效的块偏移(太大)"
4967
d9488fea 4968#: midx.c:146
4c27fcb5
JX
4969msgid "terminating multi-pack-index chunk id appears earlier than expected"
4970msgstr "终止多包索引块 id 出现时间早于预期"
4971
d9488fea 4972#: midx.c:159
4c27fcb5
JX
4973msgid "multi-pack-index missing required pack-name chunk"
4974msgstr "多包索引缺少必需的包名块"
4975
d9488fea 4976#: midx.c:161
4c27fcb5 4977msgid "multi-pack-index missing required OID fanout chunk"
5b533632 4978msgstr "多包索引缺少必需的对象 ID 扇出块"
4c27fcb5 4979
d9488fea 4980#: midx.c:163
4c27fcb5 4981msgid "multi-pack-index missing required OID lookup chunk"
5b533632 4982msgstr "多包索引缺少必需的对象 ID 查询块"
4c27fcb5 4983
d9488fea 4984#: midx.c:165
4c27fcb5
JX
4985msgid "multi-pack-index missing required object offsets chunk"
4986msgstr "多包索引缺少必需的对象偏移块"
4987
d9488fea 4988#: midx.c:179
4c27fcb5
JX
4989#, c-format
4990msgid "multi-pack-index pack names out of order: '%s' before '%s'"
4991msgstr "多包索引包名无序:'%s' 在 '%s' 之前"
4992
d9488fea 4993#: midx.c:222
4c27fcb5
JX
4994#, c-format
4995msgid "bad pack-int-id: %u (%u total packs)"
4996msgstr "错的 pack-int-id:%u(共有 %u 个包)"
4997
d9488fea 4998#: midx.c:272
4c27fcb5
JX
4999msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
5000msgstr "多包索引存储一个64位偏移,但是 off_t 太小"
5001
d9488fea 5002#: midx.c:300
4c27fcb5
JX
5003msgid "error preparing packfile from multi-pack-index"
5004msgstr "从多包索引准备 packfile 出错"
5005
d9488fea 5006#: midx.c:485
4c27fcb5
JX
5007#, c-format
5008msgid "failed to add packfile '%s'"
5009msgstr "添加包文件 '%s' 失败"
5010
d9488fea 5011#: midx.c:491
4c27fcb5
JX
5012#, c-format
5013msgid "failed to open pack-index '%s'"
5014msgstr "打开包索引 '%s' 失败"
5015
d9488fea 5016#: midx.c:551
4c27fcb5
JX
5017#, c-format
5018msgid "failed to locate object %d in packfile"
5019msgstr "在包文件中定位对象 %d 失败"
5020
d9488fea 5021#: midx.c:853
ddc12c42
JX
5022msgid "Adding packfiles to multi-pack-index"
5023msgstr "添加包文件到多包索引"
5024
d9488fea 5025#: midx.c:886
a6cd2cc4
JX
5026#, c-format
5027msgid "did not see pack-file %s to drop"
5028msgstr "没有看到要丢弃的包文件 %s"
5029
d9488fea 5030#: midx.c:938
349ede6a
JX
5031msgid "no pack files to index."
5032msgstr "没有要索引的包文件。"
5033
d9488fea 5034#: midx.c:990
ddc12c42
JX
5035msgid "Writing chunks to multi-pack-index"
5036msgstr "写入块到多包索引"
5037
d9488fea 5038#: midx.c:1068
4c27fcb5
JX
5039#, c-format
5040msgid "failed to clear multi-pack-index at %s"
5041msgstr "清理位于 %s 的多包索引失败"
5042
d9488fea
JX
5043#: midx.c:1124
5044msgid "multi-pack-index file exists, but failed to parse"
5045msgstr "多包索引文件存在,但无法解析"
5046
5047#: midx.c:1132
d46c5519
JX
5048msgid "Looking for referenced packfiles"
5049msgstr "正在查找引用的包文件"
5050
d9488fea 5051#: midx.c:1147
4c27fcb5
JX
5052#, c-format
5053msgid ""
5054"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
5b533632 5055msgstr "对象 ID 扇出无序:fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
4c27fcb5 5056
d9488fea 5057#: midx.c:1152
349ede6a
JX
5058msgid "the midx contains no oid"
5059msgstr "midx 不包含 oid"
5060
d9488fea 5061#: midx.c:1161
ddc12c42
JX
5062msgid "Verifying OID order in multi-pack-index"
5063msgstr "校验多包索引中的 OID 顺序"
d46c5519 5064
d9488fea 5065#: midx.c:1170
4c27fcb5
JX
5066#, c-format
5067msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
5b533632 5068msgstr "对象 ID 查询无序:oid[%d] = %s >= %s = oid[%d]"
4c27fcb5 5069
d9488fea 5070#: midx.c:1190
d46c5519
JX
5071msgid "Sorting objects by packfile"
5072msgstr "通过包文件为对象排序"
5073
d9488fea 5074#: midx.c:1197
4c27fcb5
JX
5075msgid "Verifying object offsets"
5076msgstr "校验对象偏移"
5077
d9488fea 5078#: midx.c:1213
4c27fcb5
JX
5079#, c-format
5080msgid "failed to load pack entry for oid[%d] = %s"
5081msgstr "为 oid[%d] = %s 加载包条目失败"
5082
d9488fea 5083#: midx.c:1219
4c27fcb5
JX
5084#, c-format
5085msgid "failed to load pack-index for packfile %s"
5086msgstr "为包文件 %s 加载包索引失败"
5087
d9488fea 5088#: midx.c:1228
4c27fcb5
JX
5089#, c-format
5090msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
5091msgstr "oid[%d] = %s 错误的对象偏移:%<PRIx64> != %<PRIx64>"
5092
d9488fea 5093#: midx.c:1253
ddc12c42
JX
5094msgid "Counting referenced objects"
5095msgstr "正在对引用对象计数"
5096
d9488fea 5097#: midx.c:1263
ddc12c42
JX
5098msgid "Finding and deleting unreferenced packfiles"
5099msgstr "正在查找和删除未引用的包文件"
5100
d9488fea 5101#: midx.c:1454
a6cd2cc4
JX
5102msgid "could not start pack-objects"
5103msgstr "不能开始 pack-objects"
5104
d9488fea 5105#: midx.c:1474
a6cd2cc4
JX
5106msgid "could not finish pack-objects"
5107msgstr "不能结束 pack-objects"
5108
a5cd71ca 5109#: name-hash.c:537
4c27fcb5
JX
5110#, c-format
5111msgid "unable to create lazy_dir thread: %s"
5112msgstr "不能创建 lazy_dir 线程:%s"
5113
a5cd71ca 5114#: name-hash.c:559
4c27fcb5
JX
5115#, c-format
5116msgid "unable to create lazy_name thread: %s"
5117msgstr "不能创建 lazy_name 线程:%s"
5118
a5cd71ca 5119#: name-hash.c:565
4c27fcb5
JX
5120#, c-format
5121msgid "unable to join lazy_name thread: %s"
5122msgstr "不能加入 lasy_name 线程:%s"
5123
06991777 5124#: notes-merge.c:277
5c57d762
JX
5125#, c-format
5126msgid ""
a0b6b246
JX
5127"You have not concluded your previous notes merge (%s exists).\n"
5128"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
5129"commit/abort the previous merge before you start a new notes merge."
5c57d762 5130msgstr ""
29004bbb 5131"您的前一次注释合并尚未结束(存在 %s)。\n"
1a79b2f1
JX
5132"在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
5133"notes merge --abort' 来提交/终止前一次合并。"
5c57d762 5134
06991777 5135#: notes-merge.c:284
a0b6b246
JX
5136#, c-format
5137msgid "You have not concluded your notes merge (%s exists)."
5138msgstr "您尚未结束注释合并(存在 %s)。"
5139
06991777 5140#: notes-utils.c:46
a0b6b246
JX
5141msgid "Cannot commit uninitialized/unreferenced notes tree"
5142msgstr "不能提交未初始化/未引用的注解树"
5c57d762 5143
06991777 5144#: notes-utils.c:105
1b7f4a34 5145#, c-format
a0b6b246
JX
5146msgid "Bad notes.rewriteMode value: '%s'"
5147msgstr "坏的 notes.rewriteMode 值:'%s'"
1b7f4a34 5148
06991777 5149#: notes-utils.c:115
5b04ee3b 5150#, c-format
a0b6b246
JX
5151msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
5152msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
5b04ee3b 5153
a4f16749
JX
5154#. TRANSLATORS: The first %s is the name of
5155#. the environment variable, the second %s is
5156#. its value.
5157#.
06991777 5158#: notes-utils.c:145
5b04ee3b 5159#, c-format
a0b6b246
JX
5160msgid "Bad %s value: '%s'"
5161msgstr "坏的 %s 值:'%s'"
5b04ee3b 5162
a5cd71ca 5163#: object.c:53
c1ac5258
JX
5164#, c-format
5165msgid "invalid object type \"%s\""
5166msgstr "无效的对象类型 \"%s\""
5167
a5cd71ca 5168#: object.c:173
c1ac5258
JX
5169#, c-format
5170msgid "object %s is a %s, not a %s"
5171msgstr "对象 %s 是一个 %s,不是一个 %s"
5172
a5cd71ca 5173#: object.c:233
c1ac5258
JX
5174#, c-format
5175msgid "object %s has unknown type id %d"
5176msgstr "对象 %s 有未知的类型 id %d"
5177
a5cd71ca 5178#: object.c:246
5b04ee3b 5179#, c-format
a0b6b246
JX
5180msgid "unable to parse object: %s"
5181msgstr "不能解析对象:%s"
5b04ee3b 5182
2b472aae 5183#: object.c:266 object.c:278
c1ac5258 5184#, c-format
06991777
JX
5185msgid "hash mismatch %s"
5186msgstr "哈希值与 %s 不匹配"
c1ac5258 5187
d9488fea 5188#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216
349ede6a
JX
5189#, c-format
5190msgid "unable to get size of %s"
5191msgstr "无法得到 %s 的大小"
5192
7157c2b5 5193#: packfile.c:630
6937cb4e
JX
5194msgid "offset before end of packfile (broken .idx?)"
5195msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
5196
d9488fea 5197#: packfile.c:1922
6937cb4e
JX
5198#, c-format
5199msgid "offset before start of pack index for %s (corrupt index?)"
5200msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
5201
d9488fea 5202#: packfile.c:1926
6937cb4e
JX
5203#, c-format
5204msgid "offset beyond end of pack index for %s (truncated index?)"
5205msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
5206
349ede6a 5207#: parse-options-cb.c:20 parse-options-cb.c:24
2b472aae 5208#, c-format
349ede6a
JX
5209msgid "option `%s' expects a numerical value"
5210msgstr "选项 `%s' 期望一个数字值"
5211
5212#: parse-options-cb.c:41
5213#, c-format
5214msgid "malformed expiration date '%s'"
5215msgstr "格式错误的到期时间:'%s'"
5216
5217#: parse-options-cb.c:54
5218#, c-format
5219msgid "option `%s' expects \"always\", \"auto\", or \"never\""
5220msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
5221
d9488fea 5222#: parse-options-cb.c:132 parse-options-cb.c:149
349ede6a
JX
5223#, c-format
5224msgid "malformed object name '%s'"
5225msgstr "格式错误的对象名 '%s'"
2b472aae 5226
d46c5519 5227#: parse-options.c:38
06991777
JX
5228#, c-format
5229msgid "%s requires a value"
8e4e0555 5230msgstr "%s 需要一个值"
06991777 5231
d46c5519 5232#: parse-options.c:73
06991777
JX
5233#, c-format
5234msgid "%s is incompatible with %s"
5235msgstr "%s 与 %s 不兼容"
5236
d46c5519 5237#: parse-options.c:78
06991777
JX
5238#, c-format
5239msgid "%s : incompatible with something else"
5240msgstr "%s:和其它的不兼容"
5241
2b472aae 5242#: parse-options.c:92 parse-options.c:96 parse-options.c:317
06991777
JX
5243#, c-format
5244msgid "%s takes no value"
8e4e0555 5245msgstr "%s 不取值"
06991777 5246
d46c5519 5247#: parse-options.c:94
06991777
JX
5248#, c-format
5249msgid "%s isn't available"
5250msgstr "%s 不可用"
5251
2b472aae 5252#: parse-options.c:217
06991777
JX
5253#, c-format
5254msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
5255msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
5256
2b472aae 5257#: parse-options.c:386
06991777
JX
5258#, c-format
5259msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
8e4e0555 5260msgstr "有歧义的选项:%s(可以是 --%s%s 或 --%s%s)"
06991777 5261
2b472aae 5262#: parse-options.c:420 parse-options.c:428
06991777 5263#, c-format
2b472aae
JX
5264msgid "did you mean `--%s` (with two dashes)?"
5265msgstr "你的意思是 `--%s`(有两个短线)?"
06991777 5266
d9488fea 5267#: parse-options.c:666 parse-options.c:971
349ede6a
JX
5268#, c-format
5269msgid "alias of --%s"
5270msgstr "--%s 的别名"
5271
d9488fea 5272#: parse-options.c:862
06991777
JX
5273#, c-format
5274msgid "unknown option `%s'"
5275msgstr "未知选项 `%s'"
5276
d9488fea 5277#: parse-options.c:864
06991777
JX
5278#, c-format
5279msgid "unknown switch `%c'"
5280msgstr "未知开关 `%c'"
5281
d9488fea 5282#: parse-options.c:866
06991777
JX
5283#, c-format
5284msgid "unknown non-ascii option in string: `%s'"
5b533632 5285msgstr "字符串中未知的非 ascii 字符选项:`%s'"
06991777 5286
d9488fea 5287#: parse-options.c:890
a0b6b246
JX
5288msgid "..."
5289msgstr "..."
5290
d9488fea 5291#: parse-options.c:909
5b04ee3b 5292#, c-format
a0b6b246
JX
5293msgid "usage: %s"
5294msgstr "用法:%s"
5b04ee3b 5295
a0b6b246 5296#. TRANSLATORS: the colon here should align with the
a4f16749
JX
5297#. one in "usage: %s" translation.
5298#.
d9488fea 5299#: parse-options.c:915
5b04ee3b 5300#, c-format
a0b6b246
JX
5301msgid " or: %s"
5302msgstr " 或:%s"
5b04ee3b 5303
a0b6b246 5304# 译者:为保证在输出中对齐,注意调整句中空格!
d9488fea 5305#: parse-options.c:918
5b04ee3b 5306#, c-format
a0b6b246
JX
5307msgid " %s"
5308msgstr " %s"
5b04ee3b 5309
d9488fea 5310#: parse-options.c:957
a0b6b246
JX
5311msgid "-NUM"
5312msgstr "-数字"
5313
ddc12c42 5314#: path.c:915
5b04ee3b 5315#, c-format
a0b6b246
JX
5316msgid "Could not make %s writable by group"
5317msgstr "不能设置 %s 为组可写"
5318
ddc12c42 5319#: pathspec.c:130
87cb7997
JX
5320msgid "Escape character '\\' not allowed as last character in attr value"
5321msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
5322
ddc12c42 5323#: pathspec.c:148
87cb7997
JX
5324msgid "Only one 'attr:' specification is allowed."
5325msgstr "只允许一个 'attr:' 规格。"
5326
ddc12c42 5327#: pathspec.c:151
87cb7997
JX
5328msgid "attr spec must not be empty"
5329msgstr "属性规格不能为空"
5330
ddc12c42 5331#: pathspec.c:194
87cb7997
JX
5332#, c-format
5333msgid "invalid attribute name %s"
5334msgstr "无效的属性名 %s"
5335
ddc12c42 5336#: pathspec.c:259
a0b6b246
JX
5337msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
5338msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
5339
ddc12c42 5340#: pathspec.c:266
5b04ee3b 5341msgid ""
a0b6b246
JX
5342"global 'literal' pathspec setting is incompatible with all other global "
5343"pathspec settings"
5344msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
5b04ee3b 5345
ddc12c42 5346#: pathspec.c:306
a0b6b246
JX
5347msgid "invalid parameter for pathspec magic 'prefix'"
5348msgstr "路径规格包含无效的神奇前缀"
5349
ddc12c42 5350#: pathspec.c:327
5b04ee3b 5351#, c-format
a0b6b246
JX
5352msgid "Invalid pathspec magic '%.*s' in '%s'"
5353msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
5b04ee3b 5354
ddc12c42 5355#: pathspec.c:332
5b04ee3b 5356#, c-format
a0b6b246
JX
5357msgid "Missing ')' at the end of pathspec magic in '%s'"
5358msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
5b04ee3b 5359
ddc12c42 5360#: pathspec.c:370
5b04ee3b 5361#, c-format
a0b6b246
JX
5362msgid "Unimplemented pathspec magic '%c' in '%s'"
5363msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
5b04ee3b 5364
ddc12c42 5365#: pathspec.c:429
5b04ee3b 5366#, c-format
a0b6b246
JX
5367msgid "%s: 'literal' and 'glob' are incompatible"
5368msgstr "%s:'literal' 和 'glob' 不兼容"
5b04ee3b 5369
349ede6a 5370#: pathspec.c:445
5b04ee3b 5371#, c-format
2b472aae 5372msgid "%s: '%s' is outside repository at '%s'"
440e7442 5373msgstr "%s:'%s' 在位于 '%s' 的仓库之外"
5b04ee3b 5374
349ede6a 5375#: pathspec.c:521
5b04ee3b 5376#, c-format
1a79b2f1
JX
5377msgid "'%s' (mnemonic: '%c')"
5378msgstr "'%s'(助记符:'%c')"
5b04ee3b 5379
349ede6a 5380#: pathspec.c:531
5b04ee3b 5381#, c-format
a0b6b246
JX
5382msgid "%s: pathspec magic not supported by this command: %s"
5383msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
5384
349ede6a 5385#: pathspec.c:598
5b04ee3b 5386#, c-format
a0b6b246
JX
5387msgid "pathspec '%s' is beyond a symbolic link"
5388msgstr "路径规格 '%s' 位于符号链接中"
5389
349ede6a 5390#: pathspec.c:643
ddc12c42
JX
5391#, c-format
5392msgid "line is badly quoted: %s"
5393msgstr "行被错误地引用:%s"
5394
d46c5519
JX
5395#: pkt-line.c:92
5396msgid "unable to write flush packet"
5397msgstr "无法写 flush 包"
5398
5399#: pkt-line.c:99
5400msgid "unable to write delim packet"
5401msgstr "无法写 delim 包"
5402
5403#: pkt-line.c:106
7157c2b5
JX
5404msgid "unable to write stateless separator packet"
5405msgstr "无法写入无状态分隔符数据包"
5406
5407#: pkt-line.c:113
c1ac5258
JX
5408msgid "flush packet write failed"
5409msgstr "flush 包写错误"
5410
7157c2b5 5411#: pkt-line.c:153 pkt-line.c:239
c1ac5258
JX
5412msgid "protocol error: impossibly long line"
5413msgstr "协议错误:不可能的长行"
5414
7157c2b5 5415#: pkt-line.c:169 pkt-line.c:171
c1ac5258
JX
5416msgid "packet write with format failed"
5417msgstr "格式化包写入错误"
5418
7157c2b5 5419#: pkt-line.c:203
c1ac5258
JX
5420msgid "packet write failed - data exceeds max packet size"
5421msgstr "写数据包失败:数据超过了包的最大长度"
5422
7157c2b5 5423#: pkt-line.c:210 pkt-line.c:217
c1ac5258
JX
5424msgid "packet write failed"
5425msgstr "数据包写入失败"
5426
7157c2b5 5427#: pkt-line.c:302
c1ac5258
JX
5428msgid "read error"
5429msgstr "读取错误"
5430
7157c2b5 5431#: pkt-line.c:310
c1ac5258
JX
5432msgid "the remote end hung up unexpectedly"
5433msgstr "远端意外挂断了"
5434
7157c2b5 5435#: pkt-line.c:338
c1ac5258
JX
5436#, c-format
5437msgid "protocol error: bad line length character: %.4s"
5438msgstr "协议错误:错误的行长度字符串:%.4s"
5439
7157c2b5 5440#: pkt-line.c:352 pkt-line.c:357
c1ac5258
JX
5441#, c-format
5442msgid "protocol error: bad line length %d"
5443msgstr "协议错误:错误的行长度 %d"
5444
d9488fea 5445#: pkt-line.c:373 sideband.c:150
06991777
JX
5446#, c-format
5447msgid "remote error: %s"
5448msgstr "远程错误:%s"
5449
5450#: preload-index.c:119
4c27fcb5
JX
5451msgid "Refreshing index"
5452msgstr "正在刷新索引"
5453
06991777 5454#: preload-index.c:138
4c27fcb5
JX
5455#, c-format
5456msgid "unable to create threaded lstat: %s"
5457msgstr "无法创建线程 lstat:%s"
5458
d9488fea 5459#: pretty.c:983
a0b6b246
JX
5460msgid "unable to parse --pretty format"
5461msgstr "不能解析 --pretty 格式"
5462
d9488fea
JX
5463#: promisor-remote.c:30
5464msgid "promisor-remote: unable to fork off fetch subprocess"
5465msgstr "promisor-remote:无法派生 fetch 子进程"
5466
5467#: promisor-remote.c:35 promisor-remote.c:37
5468msgid "promisor-remote: could not write to fetch subprocess"
5469msgstr "promisor-remote:无法向 fetch 子进程写入"
a5cd71ca 5470
d9488fea
JX
5471#: promisor-remote.c:41
5472msgid "promisor-remote: could not close stdin to fetch subprocess"
5473msgstr "promisor-remote:无法关闭至 fetch 子进程的标准输入"
5474
5475#: promisor-remote.c:53
a5cd71ca
JX
5476#, c-format
5477msgid "promisor remote name cannot begin with '/': %s"
5478msgstr "promisor 远程名称不能以 '/' 开始:%s"
5479
349ede6a
JX
5480#: prune-packed.c:35
5481msgid "Removing duplicate objects"
5482msgstr "正在删除重复对象"
5483
5484#: range-diff.c:77
c1ac5258
JX
5485msgid "could not start `log`"
5486msgstr "不能启动 `log`"
5487
349ede6a 5488#: range-diff.c:79
c1ac5258
JX
5489msgid "could not read `log` output"
5490msgstr "不能读取 `log` 的输出"
5491
d9488fea 5492#: range-diff.c:98 sequencer.c:5283
c1ac5258
JX
5493#, c-format
5494msgid "could not parse commit '%s'"
5495msgstr "不能解析提交 '%s'"
5496
349ede6a
JX
5497#: range-diff.c:112
5498#, c-format
5499msgid ""
5500"could not parse first line of `log` output: did not start with 'commit ': "
5501"'%s'"
5502msgstr "无法解析 `log` 输出的首行:不是以 'commit ' 开头:'%s'"
5503
5504#: range-diff.c:137
a6cd2cc4
JX
5505#, c-format
5506msgid "could not parse git header '%.*s'"
5507msgstr "无法解析 git 头 '%.*s'"
5508
349ede6a 5509#: range-diff.c:301
c1ac5258
JX
5510msgid "failed to generate diff"
5511msgstr "生成 diff 失败"
5512
349ede6a 5513#: range-diff.c:534 range-diff.c:536
c1ac5258
JX
5514#, c-format
5515msgid "could not parse log for '%s'"
5516msgstr "不能解析 '%s' 的日志"
5517
d9488fea 5518#: read-cache.c:682
06991777
JX
5519#, c-format
5520msgid "will not add file alias '%s' ('%s' already exists in index)"
5521msgstr "将不会添加文件别名 '%s'('%s' 已经存在于索引中)"
5522
d9488fea 5523#: read-cache.c:698
06991777
JX
5524msgid "cannot create an empty blob in the object database"
5525msgstr "不能在对象数据库中创建空的数据对象"
5526
d9488fea 5527#: read-cache.c:720
06991777
JX
5528#, c-format
5529msgid "%s: can only add regular files, symbolic links or git-directories"
5530msgstr "%s:只能添加常规文件、符号链接或 git 目录"
5531
d9488fea 5532#: read-cache.c:725
d46c5519
JX
5533#, c-format
5534msgid "'%s' does not have a commit checked out"
5535msgstr "'%s' 没有检出一个提交"
5536
d9488fea 5537#: read-cache.c:777
06991777
JX
5538#, c-format
5539msgid "unable to index file '%s'"
5540msgstr "无法索引文件 '%s'"
5541
d9488fea 5542#: read-cache.c:796
06991777
JX
5543#, c-format
5544msgid "unable to add '%s' to index"
5545msgstr "无法在索引中添加 '%s'"
5546
d9488fea 5547#: read-cache.c:807
06991777
JX
5548#, c-format
5549msgid "unable to stat '%s'"
5550msgstr "无法对 %s 执行 stat"
5551
d9488fea 5552#: read-cache.c:1318
06991777
JX
5553#, c-format
5554msgid "'%s' appears as both a file and as a directory"
5b533632 5555msgstr "'%s' 看起来既是文件又是目录"
06991777 5556
d9488fea 5557#: read-cache.c:1524
4c27fcb5
JX
5558msgid "Refresh index"
5559msgstr "刷新索引"
5560
d9488fea 5561#: read-cache.c:1639
5b04ee3b
JX
5562#, c-format
5563msgid ""
a0b6b246
JX
5564"index.version set, but the value is invalid.\n"
5565"Using version %i"
5b04ee3b 5566msgstr ""
a0b6b246
JX
5567"设置了 index.version,但是取值无效。\n"
5568"使用版本 %i"
5b04ee3b 5569
d9488fea 5570#: read-cache.c:1649
5b04ee3b
JX
5571#, c-format
5572msgid ""
a0b6b246
JX
5573"GIT_INDEX_VERSION set, but the value is invalid.\n"
5574"Using version %i"
5b04ee3b 5575msgstr ""
a0b6b246
JX
5576"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
5577"使用版本 %i"
5b04ee3b 5578
d9488fea 5579#: read-cache.c:1705
06991777
JX
5580#, c-format
5581msgid "bad signature 0x%08x"
5582msgstr "坏的签名 0x%08x"
5583
d9488fea 5584#: read-cache.c:1708
06991777
JX
5585#, c-format
5586msgid "bad index version %d"
5587msgstr "坏的索引版本 %d"
5588
d9488fea 5589#: read-cache.c:1717
06991777 5590msgid "bad index file sha1 signature"
5b533632 5591msgstr "坏的索引文件 sha1 签名"
06991777 5592
d9488fea 5593#: read-cache.c:1747
06991777
JX
5594#, c-format
5595msgid "index uses %.4s extension, which we do not understand"
5596msgstr "索引使用不被支持的 %.4s 扩展"
5597
5598#
d9488fea 5599#: read-cache.c:1749
06991777
JX
5600#, c-format
5601msgid "ignoring %.4s extension"
5602msgstr "忽略 %.4s 扩展"
5603
d9488fea 5604#: read-cache.c:1786
06991777
JX
5605#, c-format
5606msgid "unknown index entry format 0x%08x"
5607msgstr "未知的索引条目格式 0x%08x"
5608
d9488fea 5609#: read-cache.c:1802
4c27fcb5
JX
5610#, c-format
5611msgid "malformed name field in the index, near path '%s'"
5612msgstr "索引中靠近路径 '%s' 有错误的名称字段"
5613
d9488fea 5614#: read-cache.c:1859
06991777
JX
5615msgid "unordered stage entries in index"
5616msgstr "索引中有未排序的暂存条目"
5617
d9488fea 5618#: read-cache.c:1862
06991777
JX
5619#, c-format
5620msgid "multiple stage entries for merged file '%s'"
5621msgstr "合并文件 '%s' 有多个暂存条目"
5622
d9488fea 5623#: read-cache.c:1865
06991777
JX
5624#, c-format
5625msgid "unordered stage entries for '%s'"
5626msgstr "'%s' 的未排序暂存条目"
5627
d9488fea
JX
5628#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111
5629#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181
5630#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991
349ede6a 5631#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
d9488fea 5632#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290
2b472aae 5633#: builtin/submodule--helper.c:332
4c27fcb5
JX
5634msgid "index file corrupt"
5635msgstr "索引文件损坏"
5636
d9488fea 5637#: read-cache.c:2115
4c27fcb5
JX
5638#, c-format
5639msgid "unable to create load_cache_entries thread: %s"
5640msgstr "无法创建 load_cache_entries 线程:%s"
5641
d9488fea 5642#: read-cache.c:2128
4c27fcb5
JX
5643#, c-format
5644msgid "unable to join load_cache_entries thread: %s"
5645msgstr "无法加入 load_cache_entries 线程:%s"
5646
d9488fea 5647#: read-cache.c:2161
06991777
JX
5648#, c-format
5649msgid "%s: index file open failed"
5650msgstr "%s:打开索引文件失败"
5651
d9488fea 5652#: read-cache.c:2165
06991777
JX
5653#, c-format
5654msgid "%s: cannot stat the open index"
5655msgstr "%s:不能对打开的索引执行 stat 操作"
5656
d9488fea 5657#: read-cache.c:2169
06991777
JX
5658#, c-format
5659msgid "%s: index file smaller than expected"
5660msgstr "%s:索引文件比预期的小"
5661
d9488fea 5662#: read-cache.c:2173
06991777
JX
5663#, c-format
5664msgid "%s: unable to map index file"
5665msgstr "%s:无法对索引文件执行 map 操作"
5666
d9488fea 5667#: read-cache.c:2215
4c27fcb5
JX
5668#, c-format
5669msgid "unable to create load_index_extensions thread: %s"
5670msgstr "无法创建 load_index_extensions 线程:%s"
5671
d9488fea 5672#: read-cache.c:2242
4c27fcb5
JX
5673#, c-format
5674msgid "unable to join load_index_extensions thread: %s"
5675msgstr "无法加入 load_index_extensions 线程:%s"
5676
d9488fea 5677#: read-cache.c:2274
06991777
JX
5678#, c-format
5679msgid "could not freshen shared index '%s'"
5680msgstr "无法刷新共享索引 '%s'"
5681
d9488fea 5682#: read-cache.c:2321
06991777
JX
5683#, c-format
5684msgid "broken index, expect %s in %s, got %s"
5685msgstr "损坏的索引,期望在 %2$s 中的 %1$s,得到 %3$s"
5686
d9488fea 5687#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126
a4f16749
JX
5688#, c-format
5689msgid "could not close '%s'"
5690msgstr "不能关闭 '%s'"
5691
d9488fea 5692#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185
87cb7997 5693#, c-format
60638e98 5694msgid "could not stat '%s'"
65e2041e 5695msgstr "不能对 '%s' 调用 stat"
87cb7997 5696
d9488fea 5697#: read-cache.c:3133
87cb7997
JX
5698#, c-format
5699msgid "unable to open git dir: %s"
5700msgstr "不能打开 git 目录:%s"
5701
d9488fea 5702#: read-cache.c:3145
87cb7997
JX
5703#, c-format
5704msgid "unable to unlink: %s"
5705msgstr "无法删除:%s"
5706
d9488fea 5707#: read-cache.c:3170
06991777
JX
5708#, c-format
5709msgid "cannot fix permission bits on '%s'"
5710msgstr "不能修复 '%s' 的权限位"
5711
d9488fea 5712#: read-cache.c:3319
06991777
JX
5713#, c-format
5714msgid "%s: cannot drop to stage #0"
5715msgstr "%s:不能落到暂存区 #0"
5716
2b472aae
JX
5717#: rebase-interactive.c:11
5718msgid ""
5719"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
5720"continue'.\n"
5721"Or you can abort the rebase with 'git rebase --abort'.\n"
5722msgstr ""
5723"您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n"
5724"或者您可以用 'git rebase --abort' 终止变基。\n"
5725
5726#: rebase-interactive.c:33
d46c5519
JX
5727#, c-format
5728msgid ""
5729"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
5730msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
5731
2b472aae 5732#: rebase-interactive.c:42
4c27fcb5
JX
5733msgid ""
5734"\n"
5735"Commands:\n"
5736"p, pick <commit> = use commit\n"
5737"r, reword <commit> = use commit, but edit the commit message\n"
5738"e, edit <commit> = use commit, but stop for amending\n"
5739"s, squash <commit> = use commit, but meld into previous commit\n"
5740"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
5741"x, exec <command> = run command (the rest of the line) using shell\n"
5742"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
5743"d, drop <commit> = remove commit\n"
5744"l, label <label> = label current HEAD with a name\n"
5745"t, reset <label> = reset HEAD to a label\n"
5746"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
5747". create a merge commit using the original merge commit's\n"
5748". message (or the oneline, if no original merge commit was\n"
5749". specified). Use -c <commit> to reword the commit message.\n"
5750"\n"
5751"These lines can be re-ordered; they are executed from top to bottom.\n"
5752msgstr ""
5753"\n"
5754"命令:\n"
5755"p, pick <提交> = 使用提交\n"
5756"r, reword <提交> = 使用提交,但修改提交说明\n"
5757"e, edit <提交> = 使用提交,进入 shell 以便进行提交修补\n"
5758"s, squash <提交> = 使用提交,但融合到前一个提交\n"
5759"f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
5760"x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
5761"b, break = 在此处停止(使用 'git rebase --continue' 继续变基)\n"
5762"d, drop <提交> = 删除提交\n"
5763"l, label <label> = 为当前 HEAD 打上标记\n"
5764"t, reset <label> = 重置 HEAD 到该标记\n"
5765"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
5766". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
5767". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
5768". -c <提交> 可以编辑提交说明。\n"
5769"\n"
5770"可以对这些行重新排序,将从上至下执行。\n"
5771
2b472aae 5772#: rebase-interactive.c:63
d46c5519
JX
5773#, c-format
5774msgid "Rebase %s onto %s (%d command)"
5775msgid_plural "Rebase %s onto %s (%d commands)"
5776msgstr[0] "变基 %s 到 %s(%d 个提交)"
5777msgstr[1] "变基 %s 到 %s(%d 个提交)"
5778
d9488fea 5779#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218
4c27fcb5
JX
5780msgid ""
5781"\n"
5782"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
5783msgstr ""
5784"\n"
5785"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
5786
d9488fea 5787#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
4c27fcb5
JX
5788msgid ""
5789"\n"
5790"If you remove a line here THAT COMMIT WILL BE LOST.\n"
5791msgstr ""
5792"\n"
5793"如果您在这里删除一行,对应的提交将会丢失。\n"
5794
d9488fea 5795#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
4c27fcb5
JX
5796msgid ""
5797"\n"
5798"You are editing the todo file of an ongoing interactive rebase.\n"
5799"To continue rebase after editing, run:\n"
5800" git rebase --continue\n"
5801"\n"
5802msgstr ""
5803"\n"
5804"您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基,\n"
5805"请执行:\n"
5806" git rebase --continue\n"
5807"\n"
5808
d9488fea 5809#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938
4c27fcb5
JX
5810msgid ""
5811"\n"
5812"However, if you remove everything, the rebase will be aborted.\n"
5813"\n"
5814msgstr ""
5815"\n"
5816"然而,如果您删除全部内容,变基操作将会终止。\n"
5817"\n"
5818
d9488fea
JX
5819#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571
5820#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264
4c27fcb5 5821#, c-format
d46c5519
JX
5822msgid "could not write '%s'"
5823msgstr "不能写入 '%s'"
5824
d9488fea
JX
5825#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222
5826#: builtin/rebase.c:246
d46c5519 5827#, c-format
2b472aae
JX
5828msgid "could not write '%s'."
5829msgstr "不能写入 '%s'。"
d46c5519 5830
2b472aae 5831#: rebase-interactive.c:193
d46c5519
JX
5832#, c-format
5833msgid ""
5834"Warning: some commits may have been dropped accidentally.\n"
5835"Dropped commits (newer to older):\n"
5836msgstr ""
5837"警告:一些提交可能被意外丢弃。\n"
5838"丢弃的提交(从新到旧):\n"
5839
2b472aae 5840#: rebase-interactive.c:200
d46c5519
JX
5841#, c-format
5842msgid ""
5843"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
5844"\n"
5845"Use 'git config rebase.missingCommitsCheck' to change the level of "
5846"warnings.\n"
5847"The possible behaviours are: ignore, warn, error.\n"
5848"\n"
5849msgstr ""
5850"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
5851"\n"
5852"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
5853"可选值有:ignore、warn、error。\n"
5854"\n"
4c27fcb5 5855
d9488fea
JX
5856#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361
5857#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233
5858#: builtin/rebase.c:258
2b472aae
JX
5859#, c-format
5860msgid "could not read '%s'."
5861msgstr "不能读取 '%s'。"
5862
d9488fea 5863#: ref-filter.c:42 wt-status.c:1973
349ede6a
JX
5864msgid "gone"
5865msgstr "丢失"
c1ac5258 5866
349ede6a 5867#: ref-filter.c:43
c1ac5258 5868#, c-format
349ede6a
JX
5869msgid "ahead %d"
5870msgstr "领先 %d"
c1ac5258 5871
349ede6a 5872#: ref-filter.c:44
c1ac5258 5873#, c-format
349ede6a
JX
5874msgid "behind %d"
5875msgstr "落后 %d"
c1ac5258 5876
349ede6a 5877#: ref-filter.c:45
c1ac5258 5878#, c-format
349ede6a
JX
5879msgid "ahead %d, behind %d"
5880msgstr "领先 %d,落后 %d"
c1ac5258 5881
d9488fea 5882#: ref-filter.c:169
c1ac5258 5883#, c-format
349ede6a
JX
5884msgid "expected format: %%(color:<color>)"
5885msgstr "期望的格式:%%(color:<颜色>)"
c1ac5258 5886
d9488fea 5887#: ref-filter.c:171
c1ac5258 5888#, c-format
349ede6a
JX
5889msgid "unrecognized color: %%(color:%s)"
5890msgstr "未能识别的颜色:%%(color:%s)"
c1ac5258 5891
d9488fea 5892#: ref-filter.c:193
c1ac5258 5893#, c-format
349ede6a
JX
5894msgid "Integer value expected refname:lstrip=%s"
5895msgstr "期望整数值 refname:lstrip=%s"
c1ac5258 5896
d9488fea 5897#: ref-filter.c:197
c1ac5258 5898#, c-format
349ede6a
JX
5899msgid "Integer value expected refname:rstrip=%s"
5900msgstr "期望整数值 refname:rstrip=%s"
c1ac5258 5901
d9488fea 5902#: ref-filter.c:199
5b04ee3b 5903#, c-format
349ede6a
JX
5904msgid "unrecognized %%(%s) argument: %s"
5905msgstr "未能识别的 %%(%s) 参数:%s"
5b04ee3b 5906
d9488fea 5907#: ref-filter.c:254
c1ac5258 5908#, c-format
349ede6a
JX
5909msgid "%%(objecttype) does not take arguments"
5910msgstr "%%(objecttype) 不带参数"
c1ac5258 5911
d9488fea 5912#: ref-filter.c:276
c1ac5258 5913#, c-format
349ede6a
JX
5914msgid "unrecognized %%(objectsize) argument: %s"
5915msgstr "未能识别的 %%(objectsize) 参数:%s"
c1ac5258 5916
d9488fea 5917#: ref-filter.c:284
c1ac5258 5918#, c-format
349ede6a
JX
5919msgid "%%(deltabase) does not take arguments"
5920msgstr "%%(deltabase) 不带参数"
c1ac5258 5921
d9488fea 5922#: ref-filter.c:296
c1ac5258 5923#, c-format
349ede6a
JX
5924msgid "%%(body) does not take arguments"
5925msgstr "%%(body) 不带参数"
c1ac5258 5926
d9488fea 5927#: ref-filter.c:309
c1ac5258 5928#, c-format
d9488fea
JX
5929msgid "unrecognized %%(subject) argument: %s"
5930msgstr "未能识别的 %%(subject) 参数:%s"
c1ac5258 5931
d9488fea 5932#: ref-filter.c:330
1a79b2f1 5933#, c-format
6937cb4e
JX
5934msgid "unknown %%(trailers) argument: %s"
5935msgstr "未知的 %%(trailers) 参数:%s"
1a79b2f1 5936
d9488fea 5937#: ref-filter.c:363
a0b6b246
JX
5938#, c-format
5939msgid "positive value expected contents:lines=%s"
87cb7997 5940msgstr "期望一个正数 contents:lines=%s"
90314792 5941
d9488fea 5942#: ref-filter.c:365
a0b6b246
JX
5943#, c-format
5944msgid "unrecognized %%(contents) argument: %s"
5945msgstr "未能识别的 %%(contents) 参数:%s"
90314792 5946
d9488fea
JX
5947#: ref-filter.c:380
5948#, c-format
5949msgid "positive value expected '%s' in %%(%s)"
5950msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数"
5951
5952#: ref-filter.c:384
87cb7997 5953#, c-format
d9488fea
JX
5954msgid "unrecognized argument '%s' in %%(%s)"
5955msgstr "未能识别 %%(%2$s) 中的参数 '%1$s'"
87cb7997 5956
d9488fea 5957#: ref-filter.c:398
a0b6b246 5958#, c-format
d9488fea
JX
5959msgid "unrecognized email option: %s"
5960msgstr "未识别的邮件选项:%s"
90314792 5961
d9488fea 5962#: ref-filter.c:428
a0b6b246
JX
5963#, c-format
5964msgid "expected format: %%(align:<width>,<position>)"
58b6f078 5965msgstr "期望的格式:%%(align:<宽度>,<位置>)"
90314792 5966
d9488fea 5967#: ref-filter.c:440
5c57d762 5968#, c-format
a0b6b246
JX
5969msgid "unrecognized position:%s"
5970msgstr "未能识别的位置:%s"
5c57d762 5971
d9488fea 5972#: ref-filter.c:447
1b7f4a34 5973#, c-format
a0b6b246
JX
5974msgid "unrecognized width:%s"
5975msgstr "未能识别的宽度:%s"
1b7f4a34 5976
d9488fea 5977#: ref-filter.c:456
1b7f4a34 5978#, c-format
a0b6b246
JX
5979msgid "unrecognized %%(align) argument: %s"
5980msgstr "未能识别的 %%(align) 参数:%s"
1b7f4a34 5981
d9488fea 5982#: ref-filter.c:464
1b7f4a34 5983#, c-format
a0b6b246
JX
5984msgid "positive width expected with the %%(align) atom"
5985msgstr "元素 %%(align) 需要一个正数的宽度"
1b7f4a34 5986
d9488fea 5987#: ref-filter.c:482
87cb7997
JX
5988#, c-format
5989msgid "unrecognized %%(if) argument: %s"
5990msgstr "未能识别的 %%(if) 参数:%s"
5991
d9488fea 5992#: ref-filter.c:584
07432cef 5993#, c-format
a0b6b246 5994msgid "malformed field name: %.*s"
fd8cb379 5995msgstr "格式错误的字段名:%.*s"
ef317cd5 5996
d9488fea 5997#: ref-filter.c:611
a0b6b246
JX
5998#, c-format
5999msgid "unknown field name: %.*s"
6000msgstr "未知的字段名:%.*s"
220c313c 6001
d9488fea 6002#: ref-filter.c:615
4c27fcb5
JX
6003#, c-format
6004msgid ""
6005"not a git repository, but the field '%.*s' requires access to object data"
d9488fea 6006msgstr "不是 git 仓库,但是字段 '%.*s' 需要访问对象数据"
4c27fcb5 6007
d9488fea 6008#: ref-filter.c:739
87cb7997
JX
6009#, c-format
6010msgid "format: %%(if) atom used without a %%(then) atom"
6011msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
6012
d9488fea 6013#: ref-filter.c:802
87cb7997
JX
6014#, c-format
6015msgid "format: %%(then) atom used without an %%(if) atom"
6016msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
6017
d9488fea 6018#: ref-filter.c:804
87cb7997
JX
6019#, c-format
6020msgid "format: %%(then) atom used more than once"
6021msgstr "格式:%%(then) 元素用了多次"
6022
d9488fea 6023#: ref-filter.c:806
87cb7997
JX
6024#, c-format
6025msgid "format: %%(then) atom used after %%(else)"
6026msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
6027
d9488fea 6028#: ref-filter.c:834
87cb7997
JX
6029#, c-format
6030msgid "format: %%(else) atom used without an %%(if) atom"
6031msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
6032
d9488fea 6033#: ref-filter.c:836
87cb7997
JX
6034#, c-format
6035msgid "format: %%(else) atom used without a %%(then) atom"
6036msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
6037
d9488fea 6038#: ref-filter.c:838
87cb7997
JX
6039#, c-format
6040msgid "format: %%(else) atom used more than once"
6041msgstr "格式:%%(else) 元素用了多次"
6042
d9488fea 6043#: ref-filter.c:853
7aea43ff 6044#, c-format
a0b6b246
JX
6045msgid "format: %%(end) atom used without corresponding atom"
6046msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
7aea43ff 6047
d9488fea 6048#: ref-filter.c:910
7aea43ff 6049#, c-format
a0b6b246 6050msgid "malformed format string %s"
fd8cb379 6051msgstr "错误的格式化字符串 %s"
7aea43ff 6052
d9488fea 6053#: ref-filter.c:1541
87cb7997 6054#, c-format
a6cd2cc4
JX
6055msgid "no branch, rebasing %s"
6056msgstr "非分支,正变基 %s"
c04f5ac3 6057
d9488fea 6058#: ref-filter.c:1544
c04f5ac3 6059#, c-format
a6cd2cc4
JX
6060msgid "no branch, rebasing detached HEAD %s"
6061msgstr "非分支,正变基分离头指针 %s"
c04f5ac3 6062
d9488fea 6063#: ref-filter.c:1547
a0b6b246 6064#, c-format
a6cd2cc4
JX
6065msgid "no branch, bisect started on %s"
6066msgstr "非分支,二分查找开始于 %s"
6792b93b 6067
d9488fea 6068#: ref-filter.c:1557
a6cd2cc4
JX
6069msgid "no branch"
6070msgstr "非分支"
87cb7997 6071
d9488fea 6072#: ref-filter.c:1591 ref-filter.c:1800
a0b6b246
JX
6073#, c-format
6074msgid "missing object %s for %s"
6075msgstr "缺失 %2$s 的对象 %1$s"
c04f5ac3 6076
d9488fea 6077#: ref-filter.c:1601
a0b6b246
JX
6078#, c-format
6079msgid "parse_object_buffer failed on %s for %s"
6080msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
6792b93b 6081
d9488fea 6082#: ref-filter.c:2054
a0b6b246
JX
6083#, c-format
6084msgid "malformed object at '%s'"
fd8cb379 6085msgstr "格式错误的对象 '%s'"
c04f5ac3 6086
d9488fea 6087#: ref-filter.c:2143
a0b6b246
JX
6088#, c-format
6089msgid "ignoring ref with broken name %s"
6090msgstr "忽略带有错误名称 %s 的引用"
c04f5ac3 6091
d9488fea 6092#: ref-filter.c:2148 refs.c:657
349ede6a
JX
6093#, c-format
6094msgid "ignoring broken ref %s"
6095msgstr "忽略损坏的引用 %s"
6096
d9488fea 6097#: ref-filter.c:2464
a0b6b246
JX
6098#, c-format
6099msgid "format: %%(end) atom missing"
6100msgstr "格式:缺少 %%(end) 元素"
c04f5ac3 6101
d9488fea 6102#: ref-filter.c:2563
a0b6b246
JX
6103#, c-format
6104msgid "malformed object name %s"
fd8cb379 6105msgstr "格式错误的对象名 %s"
c04f5ac3 6106
d9488fea 6107#: ref-filter.c:2568
06991777
JX
6108#, c-format
6109msgid "option `%s' must point to a commit"
6110msgstr "选项 `%s' 必须指向一个提交"
6111
7157c2b5 6112#: refs.c:264
349ede6a
JX
6113#, c-format
6114msgid "%s does not point to a valid object!"
6115msgstr "%s 没有指向一个有效的对象!"
6116
7157c2b5
JX
6117#: refs.c:572
6118#, c-format
6119msgid "could not retrieve `%s`"
6120msgstr "无法获取 `%s`"
6121
6122#: refs.c:579
6123#, c-format
6124msgid "invalid branch name: %s = %s"
6125msgstr "无效的分支名:%s = %s"
6126
6127#: refs.c:655
349ede6a
JX
6128#, c-format
6129msgid "ignoring dangling symref %s"
6130msgstr "忽略悬空符号引用 %s"
6131
d9488fea 6132#: refs.c:892
349ede6a
JX
6133#, c-format
6134msgid "log for ref %s has gap after %s"
6135msgstr "引用 %s 的日志在 %s 之后有缺口"
6136
d9488fea 6137#: refs.c:898
349ede6a
JX
6138#, c-format
6139msgid "log for ref %s unexpectedly ended on %s"
6140msgstr "引用 %s 的日志意外终止于 %s "
6141
d9488fea 6142#: refs.c:957
349ede6a
JX
6143#, c-format
6144msgid "log for %s is empty"
6145msgstr "%s 的日志为空"
6146
d9488fea 6147#: refs.c:1049
349ede6a
JX
6148#, c-format
6149msgid "refusing to update ref with bad name '%s'"
6150msgstr "拒绝更新有错误名称 '%s' 的引用"
6151
d9488fea 6152#: refs.c:1120
349ede6a
JX
6153#, c-format
6154msgid "update_ref failed for ref '%s': %s"
6155msgstr "对引用 '%s' 执行 update_ref 失败:%s"
6156
d9488fea 6157#: refs.c:1944
349ede6a
JX
6158#, c-format
6159msgid "multiple updates for ref '%s' not allowed"
6160msgstr "不允许对引用 '%s' 多次更新"
6161
d9488fea 6162#: refs.c:2024
349ede6a
JX
6163msgid "ref updates forbidden inside quarantine environment"
6164msgstr "在隔离环境中禁止更新引用"
6165
d9488fea 6166#: refs.c:2035
7157c2b5
JX
6167msgid "ref updates aborted by hook"
6168msgstr "引用更新被钩子中止"
6169
d9488fea 6170#: refs.c:2135 refs.c:2165
349ede6a
JX
6171#, c-format
6172msgid "'%s' exists; cannot create '%s'"
6173msgstr "'%s' 已存在,无法创建 '%s'"
6174
d9488fea 6175#: refs.c:2141 refs.c:2176
349ede6a
JX
6176#, c-format
6177msgid "cannot process '%s' and '%s' at the same time"
6178msgstr "无法同时处理 '%s' 和 '%s'"
6179
d9488fea 6180#: refs/files-backend.c:1228
349ede6a
JX
6181#, c-format
6182msgid "could not remove reference %s"
6183msgstr "无法删除引用 %s"
6184
d9488fea
JX
6185#: refs/files-backend.c:1242 refs/packed-backend.c:1542
6186#: refs/packed-backend.c:1552
349ede6a
JX
6187#, c-format
6188msgid "could not delete reference %s: %s"
6189msgstr "无法删除引用 %s:%s"
6190
d9488fea 6191#: refs/files-backend.c:1245 refs/packed-backend.c:1555
349ede6a
JX
6192#, c-format
6193msgid "could not delete references: %s"
6194msgstr "无法删除引用:%s"
6195
d9488fea 6196#: refspec.c:167
349ede6a
JX
6197#, c-format
6198msgid "invalid refspec '%s'"
6199msgstr "无效的引用表达式:'%s'"
6200
d9488fea 6201#: remote.c:351
06991777
JX
6202#, c-format
6203msgid "config remote shorthand cannot begin with '/': %s"
5b533632 6204msgstr "配置的远程短名称不能以 '/' 开始:%s"
06991777 6205
d9488fea 6206#: remote.c:399
06991777
JX
6207msgid "more than one receivepack given, using the first"
6208msgstr "提供了一个以上的 receivepack,使用第一个"
6209
d9488fea 6210#: remote.c:407
06991777
JX
6211msgid "more than one uploadpack given, using the first"
6212msgstr "提供了一个以上的 uploadpack,使用第一个"
6213
d9488fea 6214#: remote.c:590
a0b6b246
JX
6215#, c-format
6216msgid "Cannot fetch both %s and %s to %s"
6217msgstr "不能同时获取 %s 和 %s 至 %s"
c04f5ac3 6218
d9488fea 6219#: remote.c:594
c04f5ac3 6220#, c-format
a0b6b246
JX
6221msgid "%s usually tracks %s, not %s"
6222msgstr "%s 通常跟踪 %s,而非 %s"
c04f5ac3 6223
d9488fea 6224#: remote.c:598
a0b6b246
JX
6225#, c-format
6226msgid "%s tracks both %s and %s"
6227msgstr "%s 同时跟踪 %s 和 %s"
c04f5ac3 6228
d9488fea 6229#: remote.c:666
06991777
JX
6230#, c-format
6231msgid "key '%s' of pattern had no '*'"
6232msgstr "模式的键 '%s' 没有 '*'"
6233
d9488fea 6234#: remote.c:676
06991777
JX
6235#, c-format
6236msgid "value '%s' of pattern has no '*'"
6237msgstr "模式的值 '%s' 没有 '*'"
6238
d9488fea 6239#: remote.c:1073
06991777
JX
6240#, c-format
6241msgid "src refspec %s does not match any"
6242msgstr "源引用表达式 %s 没有匹配"
6243
d9488fea 6244#: remote.c:1078
06991777
JX
6245#, c-format
6246msgid "src refspec %s matches more than one"
6247msgstr "源引用表达式 %s 匹配超过一个"
6248
6249#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
6250#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
6251#. the <src>.
6252#.
d9488fea 6253#: remote.c:1093
06991777
JX
6254#, c-format
6255msgid ""
6256"The destination you provided is not a full refname (i.e.,\n"
6257"starting with \"refs/\"). We tried to guess what you meant by:\n"
6258"\n"
6259"- Looking for a ref that matches '%s' on the remote side.\n"
6260"- Checking if the <src> being pushed ('%s')\n"
6261" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
6262" refs/{heads,tags}/ prefix on the remote side.\n"
6263"\n"
6264"Neither worked, so we gave up. You must fully qualify the ref."
6265msgstr ""
6266"您提供的目标不是一个完整的引用名称(即以 \"refs/\" 开头)。我们\n"
6267"试着猜测您的想法:\n"
6268"\n"
6269"- 在远端查询和 '%s' 匹配的引用。\n"
6270"- 检查要推送的 <src>('%s')是不是在 \"refs/{heads,tags}/\" 中的\n"
6271" 引用。如果是,我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n"
6272"\n"
6273"都不行,所以我们已放弃。您必须给出完整的引用。"
6274
d9488fea 6275#: remote.c:1113
06991777
JX
6276#, c-format
6277msgid ""
6278"The <src> part of the refspec is a commit object.\n"
6279"Did you mean to create a new branch by pushing to\n"
6280"'%s:refs/heads/%s'?"
6281msgstr ""
6282"引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
6283"'%s:refs/heads/%s' 推送么?"
6284
d9488fea 6285#: remote.c:1118
06991777
JX
6286#, c-format
6287msgid ""
6288"The <src> part of the refspec is a tag object.\n"
6289"Did you mean to create a new tag by pushing to\n"
6290"'%s:refs/tags/%s'?"
6291msgstr ""
6292"引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
6293"'%s:refs/tags/%s' 推送么?"
6294
d9488fea 6295#: remote.c:1123
06991777
JX
6296#, c-format
6297msgid ""
6298"The <src> part of the refspec is a tree object.\n"
6299"Did you mean to tag a new tree by pushing to\n"
6300"'%s:refs/tags/%s'?"
6301msgstr ""
6302"引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
6303"'%s:refs/tags/%s' 推送么?"
6304
d9488fea 6305#: remote.c:1128
06991777
JX
6306#, c-format
6307msgid ""
6308"The <src> part of the refspec is a blob object.\n"
6309"Did you mean to tag a new blob by pushing to\n"
6310"'%s:refs/tags/%s'?"
6311msgstr ""
6312"引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
6313"'%s:refs/tags/%s' 推送么?"
6314
d9488fea 6315#: remote.c:1164
06991777
JX
6316#, c-format
6317msgid "%s cannot be resolved to branch"
6318msgstr "%s 无法被解析为分支"
6319
d9488fea 6320#: remote.c:1175
06991777
JX
6321#, c-format
6322msgid "unable to delete '%s': remote ref does not exist"
8e4e0555 6323msgstr "无法删除 '%s':远程引用不存在"
06991777 6324
d9488fea 6325#: remote.c:1187
06991777
JX
6326#, c-format
6327msgid "dst refspec %s matches more than one"
6328msgstr "目标引用表达式 %s 匹配超过一个"
6329
d9488fea 6330#: remote.c:1194
06991777
JX
6331#, c-format
6332msgid "dst ref %s receives from more than one src"
6333msgstr "目标引用 %s 接收超过一个源"
c04f5ac3 6334
d9488fea 6335#: remote.c:1703 remote.c:1804
a0b6b246
JX
6336msgid "HEAD does not point to a branch"
6337msgstr "HEAD 没有指向一个分支"
c04f5ac3 6338
d9488fea 6339#: remote.c:1712
a0b6b246
JX
6340#, c-format
6341msgid "no such branch: '%s'"
6342msgstr "没有此分支:'%s'"
c04f5ac3 6343
d9488fea 6344#: remote.c:1715
a0b6b246
JX
6345#, c-format
6346msgid "no upstream configured for branch '%s'"
6347msgstr "尚未给分支 '%s' 设置上游"
c04f5ac3 6348
d9488fea 6349#: remote.c:1721
a0b6b246
JX
6350#, c-format
6351msgid "upstream branch '%s' not stored as a remote-tracking branch"
6352msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
c04f5ac3 6353
d9488fea 6354#: remote.c:1736
a0b6b246
JX
6355#, c-format
6356msgid "push destination '%s' on remote '%s' has no local tracking branch"
6357msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
c04f5ac3 6358
d9488fea 6359#: remote.c:1748
a0b6b246
JX
6360#, c-format
6361msgid "branch '%s' has no remote for pushing"
6362msgstr "分支 '%s' 没有设置要推送的远程服务器"
cfff71a9 6363
d9488fea 6364#: remote.c:1758
a0b6b246
JX
6365#, c-format
6366msgid "push refspecs for '%s' do not include '%s'"
6367msgstr "向 '%s' 推送引用规格未包含 '%s'"
cfff71a9 6368
d9488fea 6369#: remote.c:1771
a0b6b246
JX
6370msgid "push has no destination (push.default is 'nothing')"
6371msgstr "推送无目标(push.default 是 'nothing')"
cfff71a9 6372
d9488fea 6373#: remote.c:1793
a0b6b246
JX
6374msgid "cannot resolve 'simple' push to a single destination"
6375msgstr "无法解析 'simple' 推送至一个单独的目标"
6c94aba5 6376
d9488fea 6377#: remote.c:1922
06991777
JX
6378#, c-format
6379msgid "couldn't find remote ref %s"
8e4e0555 6380msgstr "无法找到远程引用 %s"
06991777 6381
d9488fea 6382#: remote.c:1935
06991777
JX
6383#, c-format
6384msgid "* Ignoring funny ref '%s' locally"
6385msgstr "* 在本地忽略可笑的引用 '%s'"
6386
d9488fea 6387#: remote.c:2098
a0b6b246
JX
6388#, c-format
6389msgid "Your branch is based on '%s', but the upstream is gone.\n"
6390msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
6c94aba5 6391
d9488fea 6392#: remote.c:2102
a0b6b246
JX
6393msgid " (use \"git branch --unset-upstream\" to fixup)\n"
6394msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
6c94aba5 6395
d9488fea 6396#: remote.c:2105
a0b6b246 6397#, c-format
6937cb4e 6398msgid "Your branch is up to date with '%s'.\n"
a0b6b246 6399msgstr "您的分支与上游分支 '%s' 一致。\n"
cfff71a9 6400
d9488fea 6401#: remote.c:2109
31e5e17b
JX
6402#, c-format
6403msgid "Your branch and '%s' refer to different commits.\n"
6404msgstr "您的分支和 '%s' 指向不同的提交。\n"
6405
d9488fea 6406#: remote.c:2112
31e5e17b
JX
6407#, c-format
6408msgid " (use \"%s\" for details)\n"
6409msgstr " (使用 \"%s\" 查看详情)\n"
6410
d9488fea 6411#: remote.c:2116
a0b6b246
JX
6412#, c-format
6413msgid "Your branch is ahead of '%s' by %d commit.\n"
6414msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
6415msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
6416msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
cfff71a9 6417
d9488fea 6418#: remote.c:2122
a0b6b246
JX
6419msgid " (use \"git push\" to publish your local commits)\n"
6420msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
c04f5ac3 6421
d9488fea 6422#: remote.c:2125
a0b6b246
JX
6423#, c-format
6424msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
6425msgid_plural ""
6426"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
6427msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
6428msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 6429
a0b6b246 6430# 译者:注意保持前导空格
d9488fea 6431#: remote.c:2133
a0b6b246
JX
6432msgid " (use \"git pull\" to update your local branch)\n"
6433msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
c04f5ac3 6434
d9488fea 6435#: remote.c:2136
a0b6b246
JX
6436#, c-format
6437msgid ""
6438"Your branch and '%s' have diverged,\n"
6439"and have %d and %d different commit each, respectively.\n"
6440msgid_plural ""
6441"Your branch and '%s' have diverged,\n"
6442"and have %d and %d different commits each, respectively.\n"
6443msgstr[0] ""
6444"您的分支和 '%s' 出现了偏离,\n"
6445"并且分别有 %d 和 %d 处不同的提交。\n"
6446msgstr[1] ""
6447"您的分支和 '%s' 出现了偏离,\n"
6448"并且分别有 %d 和 %d 处不同的提交。\n"
90314792 6449
a0b6b246 6450# 译者:注意保持前导空格
d9488fea 6451#: remote.c:2146
a0b6b246
JX
6452msgid " (use \"git pull\" to merge the remote branch into yours)\n"
6453msgstr " (使用 \"git pull\" 来合并远程分支)\n"
90314792 6454
d9488fea 6455#: remote.c:2337
06991777
JX
6456#, c-format
6457msgid "cannot parse expected object name '%s'"
6458msgstr "无法解析期望的对象名 '%s'"
6459
4c27fcb5 6460#: replace-object.c:21
c1ac5258
JX
6461#, c-format
6462msgid "bad replace ref name: %s"
6463msgstr "错误的替换引用名称:%s"
6464
4c27fcb5 6465#: replace-object.c:30
c1ac5258
JX
6466#, c-format
6467msgid "duplicate replace ref: %s"
6468msgstr "重复的替换引用:%s"
6469
2b472aae 6470#: replace-object.c:82
c1ac5258
JX
6471#, c-format
6472msgid "replace depth too high for object %s"
6473msgstr "对象 %s 的替换层级太深"
6474
4c27fcb5
JX
6475#: rerere.c:217 rerere.c:226 rerere.c:229
6476msgid "corrupt MERGE_RR"
6477msgstr "损坏的 MERGE_RR"
6478
6479#: rerere.c:264 rerere.c:269
6480msgid "unable to write rerere record"
6481msgstr "无法写入 rerere 记录"
cfff71a9 6482
4c27fcb5
JX
6483#: rerere.c:495
6484#, c-format
6485msgid "there were errors while writing '%s' (%s)"
6486msgstr "写入 '%s' (%s) 时出错"
6792b93b 6487
4c27fcb5
JX
6488#: rerere.c:498
6489#, c-format
6490msgid "failed to flush '%s'"
6491msgstr "刷新 '%s' 失败"
5c57d762 6492
4c27fcb5 6493#: rerere.c:503 rerere.c:1039
5809aa05 6494#, c-format
4c27fcb5
JX
6495msgid "could not parse conflict hunks in '%s'"
6496msgstr "不能解析 '%s' 中的冲突块"
5809aa05 6497
4c27fcb5
JX
6498#: rerere.c:684
6499#, c-format
6500msgid "failed utime() on '%s'"
6501msgstr "在 '%s' 上调用 utime() 失败"
31e5e17b 6502
4c27fcb5 6503#: rerere.c:694
87cb7997 6504#, c-format
4c27fcb5
JX
6505msgid "writing '%s' failed"
6506msgstr "写入 '%s' 失败"
87cb7997 6507
4c27fcb5 6508#: rerere.c:714
87cb7997 6509#, c-format
4c27fcb5
JX
6510msgid "Staged '%s' using previous resolution."
6511msgstr "使用之前的解决方案暂存 '%s'。"
87cb7997 6512
4c27fcb5
JX
6513#: rerere.c:753
6514#, c-format
6515msgid "Recorded resolution for '%s'."
6516msgstr "已记录 '%s' 的解决方案。"
6792b93b 6517
4c27fcb5
JX
6518#: rerere.c:788
6519#, c-format
6520msgid "Resolved '%s' using previous resolution."
6521msgstr "使用之前的解决方案解决 '%s'。"
6522
6523#: rerere.c:803
6524#, c-format
6525msgid "cannot unlink stray '%s'"
6526msgstr "不能删除 stray '%s'"
6527
6528#: rerere.c:807
6529#, c-format
6530msgid "Recorded preimage for '%s'"
6531msgstr "为 '%s' 记录 preimage"
6532
d9488fea
JX
6533#: rerere.c:881 submodule.c:2082 builtin/log.c:1975
6534#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
4c27fcb5
JX
6535#, c-format
6536msgid "could not create directory '%s'"
6537msgstr "不能创建目录 '%s'"
6538
6539#: rerere.c:1057
6540#, c-format
6541msgid "failed to update conflicted state in '%s'"
6542msgstr "更新 '%s' 中的冲突状态失败"
6543
6544#: rerere.c:1068 rerere.c:1075
6545#, c-format
6546msgid "no remembered resolution for '%s'"
6547msgstr "没有为 '%s' 记忆的解决方案"
6548
6549#: rerere.c:1077
6550#, c-format
6551msgid "cannot unlink '%s'"
6552msgstr "不能删除 '%s'"
6553
6554#: rerere.c:1087
6555#, c-format
6556msgid "Updated preimage for '%s'"
6557msgstr "已为 '%s' 更新 preimage"
6558
6559#: rerere.c:1096
6560#, c-format
6561msgid "Forgot resolution for '%s'\n"
6562msgstr "忘记 '%s' 的解决方案\n"
6563
6564#: rerere.c:1199
6565msgid "unable to open rr-cache directory"
6566msgstr "不能打开 rr-cache 目录"
6567
349ede6a
JX
6568#: reset.c:42
6569msgid "could not determine HEAD revision"
6570msgstr "不能确定 HEAD 版本"
6571
d9488fea 6572#: reset.c:70 reset.c:76 sequencer.c:3426
349ede6a
JX
6573#, c-format
6574msgid "failed to find tree of %s"
6575msgstr "无法找到 %s 指向的树。"
6576
d9488fea
JX
6577#: revision.c:2344
6578msgid "--unpacked=<packfile> no longer supported"
6579msgstr "不再支持 --unpacked=<packfile>"
6580
6581#: revision.c:2364
6582#, c-format
6583msgid "unknown value for --diff-merges: %s"
6584msgstr "未知的 --diff-merges 取值:%s"
6585
6586#: revision.c:2702
4c27fcb5
JX
6587msgid "your current branch appears to be broken"
6588msgstr "您的当前分支好像被损坏"
6589
d9488fea 6590#: revision.c:2705
4c27fcb5
JX
6591#, c-format
6592msgid "your current branch '%s' does not have any commits yet"
6593msgstr "您的当前分支 '%s' 尚无任何提交"
6594
d9488fea 6595#: revision.c:2915
d46c5519
JX
6596msgid "-L does not yet support diff formats besides -p and -s"
6597msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
6598
2b472aae 6599#: run-command.c:763
4c27fcb5
JX
6600msgid "open /dev/null failed"
6601msgstr "不能打开 /dev/null"
6602
d9488fea 6603#: run-command.c:1270
4c27fcb5
JX
6604#, c-format
6605msgid "cannot create async thread: %s"
6606msgstr "不能创建 async 线程:%s"
6607
d9488fea 6608#: run-command.c:1334
4c27fcb5
JX
6609#, c-format
6610msgid ""
6611"The '%s' hook was ignored because it's not set as executable.\n"
6612"You can disable this warning with `git config advice.ignoredHook false`."
6613msgstr ""
6614"因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n"
6615"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
6616
349ede6a 6617#: send-pack.c:145
4c27fcb5
JX
6618msgid "unexpected flush packet while reading remote unpack status"
6619msgstr "读取远程解包状态时收到意外的 flush 包"
6620
349ede6a 6621#: send-pack.c:147
4c27fcb5
JX
6622#, c-format
6623msgid "unable to parse remote unpack status: %s"
6624msgstr "不能解析远程解包状态:%s"
6625
349ede6a 6626#: send-pack.c:149
4c27fcb5
JX
6627#, c-format
6628msgid "remote unpack failed: %s"
6629msgstr "远程解包失败:%s"
6630
d9488fea 6631#: send-pack.c:372
4c27fcb5
JX
6632msgid "failed to sign the push certificate"
6633msgstr "为推送证书签名失败"
6634
d9488fea 6635#: send-pack.c:460
7157c2b5
JX
6636msgid "the receiving end does not support this repository's hash algorithm"
6637msgstr "接收端不支持这个仓库的哈希算法"
6638
d9488fea 6639#: send-pack.c:469
a0b6b246
JX
6640msgid "the receiving end does not support --signed push"
6641msgstr "接收端不支持签名推送"
6792b93b 6642
d9488fea 6643#: send-pack.c:471
a0b6b246
JX
6644msgid ""
6645"not sending a push certificate since the receiving end does not support --"
6646"signed push"
6647msgstr "未发送推送证书,因为接收端不支持签名推送"
6792b93b 6648
d9488fea 6649#: send-pack.c:483
a0b6b246
JX
6650msgid "the receiving end does not support --atomic push"
6651msgstr "接收端不支持原子推送"
6792b93b 6652
d9488fea 6653#: send-pack.c:488
a0b6b246
JX
6654msgid "the receiving end does not support push options"
6655msgstr "接收端不支持推送选项"
6792b93b 6656
d9488fea 6657#: sequencer.c:194
31e5e17b
JX
6658#, c-format
6659msgid "invalid commit message cleanup mode '%s'"
6660msgstr "无效的提交信息清理模式 '%s'"
6661
d9488fea 6662#: sequencer.c:308
fd8cb379
JX
6663#, c-format
6664msgid "could not delete '%s'"
6665msgstr "无法删除 '%s'"
6666
d9488fea 6667#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385
a6cd2cc4
JX
6668#, c-format
6669msgid "could not remove '%s'"
6670msgstr "无法删除 '%s'"
6671
d9488fea 6672#: sequencer.c:339
a0b6b246
JX
6673msgid "revert"
6674msgstr "还原"
6792b93b 6675
d9488fea 6676#: sequencer.c:341
a0b6b246
JX
6677msgid "cherry-pick"
6678msgstr "拣选"
6679
d9488fea 6680#: sequencer.c:343
2b472aae
JX
6681msgid "rebase"
6682msgstr "变基"
6683
d9488fea 6684#: sequencer.c:345
1a79b2f1 6685#, c-format
c1ac5258 6686msgid "unknown action: %d"
1a79b2f1
JX
6687msgstr "未知动作:%d"
6688
d9488fea 6689#: sequencer.c:404
a0b6b246
JX
6690msgid ""
6691"after resolving the conflicts, mark the corrected paths\n"
6692"with 'git add <paths>' or 'git rm <paths>'"
6693msgstr ""
6694"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
6695"命令标记修正后的文件"
6696
d9488fea 6697#: sequencer.c:407
a0b6b246
JX
6698msgid ""
6699"after resolving the conflicts, mark the corrected paths\n"
6700"with 'git add <paths>' or 'git rm <paths>'\n"
6701"and commit the result with 'git commit'"
6702msgstr ""
6703"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
6704"对修正后的文件做标记,然后用 'git commit' 提交"
1b7f4a34 6705
d9488fea 6706#: sequencer.c:420 sequencer.c:3028
1b7f4a34 6707#, c-format
a0b6b246
JX
6708msgid "could not lock '%s'"
6709msgstr "不能锁定 '%s'"
1b7f4a34 6710
d9488fea
JX
6711#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046
6712#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631
6713#, c-format
6714msgid "could not write to '%s'"
6715msgstr "不能写入 '%s'"
6716
6717#: sequencer.c:427
a0b6b246 6718#, c-format
72351d7d 6719msgid "could not write eol to '%s'"
a0b6b246 6720msgstr "不能将换行符写入 '%s'"
1b7f4a34 6721
d9488fea
JX
6722#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048
6723#: sequencer.c:3311
1b7f4a34 6724#, c-format
31e5e17b
JX
6725msgid "failed to finalize '%s'"
6726msgstr "无法完成 '%s'"
1b7f4a34 6727
d9488fea 6728#: sequencer.c:471
63af42fe 6729#, c-format
a0b6b246
JX
6730msgid "your local changes would be overwritten by %s."
6731msgstr "您的本地修改将被%s覆盖。"
63af42fe 6732
d9488fea 6733#: sequencer.c:475
a0b6b246 6734msgid "commit your changes or stash them to proceed."
a4f16749 6735msgstr "提交您的修改或贮藏后再继续。"
6792b93b 6736
d9488fea 6737#: sequencer.c:507
a0b6b246
JX
6738#, c-format
6739msgid "%s: fast-forward"
6740msgstr "%s:快进"
6792b93b 6741
d9488fea 6742#: sequencer.c:546 builtin/tag.c:566
d46c5519
JX
6743#, c-format
6744msgid "Invalid cleanup mode %s"
6745msgstr "无效的清理模式 %s"
6746
1a79b2f1 6747#. TRANSLATORS: %s will be "revert", "cherry-pick" or
2b472aae 6748#. "rebase".
1a79b2f1 6749#.
d9488fea 6750#: sequencer.c:640
a0b6b246
JX
6751#, c-format
6752msgid "%s: Unable to write new index file"
6753msgstr "%s:无法写入新索引文件"
6792b93b 6754
d9488fea 6755#: sequencer.c:657
5809aa05
JX
6756msgid "unable to update cache tree"
6757msgstr "不能更新缓存树"
6792b93b 6758
d9488fea 6759#: sequencer.c:671
fd8cb379
JX
6760msgid "could not resolve HEAD commit"
6761msgstr "不能解析 HEAD 提交"
6762
d9488fea 6763#: sequencer.c:751
4c27fcb5
JX
6764#, c-format
6765msgid "no key present in '%.*s'"
6766msgstr "在 '%.*s' 中没有 key"
6767
d9488fea 6768#: sequencer.c:762
c1ac5258 6769#, c-format
4c27fcb5
JX
6770msgid "unable to dequote value of '%s'"
6771msgstr "无法为 '%s' 的值去引号"
c1ac5258 6772
d9488fea
JX
6773#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724
6774#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902
c1ac5258 6775#, c-format
4c27fcb5
JX
6776msgid "could not open '%s' for reading"
6777msgstr "无法打开 '%s' 进行读取"
6778
d9488fea 6779#: sequencer.c:809
4c27fcb5
JX
6780msgid "'GIT_AUTHOR_NAME' already given"
6781msgstr "已经给出 'GIT_AUTHOR_NAME'"
c1ac5258 6782
d9488fea 6783#: sequencer.c:814
4c27fcb5
JX
6784msgid "'GIT_AUTHOR_EMAIL' already given"
6785msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
6786
d9488fea 6787#: sequencer.c:819
4c27fcb5
JX
6788msgid "'GIT_AUTHOR_DATE' already given"
6789msgstr "已经给出 'GIT_AUTHOR_DATE'"
6790
d9488fea 6791#: sequencer.c:823
4c27fcb5
JX
6792#, c-format
6793msgid "unknown variable '%s'"
6794msgstr "未知变量 '%s'"
6795
d9488fea 6796#: sequencer.c:828
4c27fcb5
JX
6797msgid "missing 'GIT_AUTHOR_NAME'"
6798msgstr "缺少 'GIT_AUTHOR_NAME'"
6799
d9488fea 6800#: sequencer.c:830
4c27fcb5
JX
6801msgid "missing 'GIT_AUTHOR_EMAIL'"
6802msgstr "缺少 'GIT_AUTHOR_EMAIL'"
6803
d9488fea 6804#: sequencer.c:832
4c27fcb5
JX
6805msgid "missing 'GIT_AUTHOR_DATE'"
6806msgstr "缺少 'GIT_AUTHOR_DATE'"
6807
d9488fea 6808#: sequencer.c:897
63af42fe
JX
6809#, c-format
6810msgid ""
a0b6b246
JX
6811"you have staged changes in your working tree\n"
6812"If these changes are meant to be squashed into the previous commit, run:\n"
6813"\n"
6814" git commit --amend %s\n"
6815"\n"
6816"If they are meant to go into a new commit, run:\n"
6817"\n"
6818" git commit %s\n"
6819"\n"
6820"In both cases, once you're done, continue with:\n"
6821"\n"
6822" git rebase --continue\n"
6823msgstr ""
1a79b2f1
JX
6824"您的工作区中存在已暂存的修改\n"
6825"如果这些修改需要被并入前一个提交,执行:\n"
a0b6b246
JX
6826"\n"
6827" git commit --amend %s\n"
6828"\n"
29004bbb 6829"如果这些修改要形成一个新提交,执行:\n"
a0b6b246
JX
6830"\n"
6831" git commit %s\n"
6832"\n"
6833"无论哪种情况,当您完成提交,继续执行:\n"
6834"\n"
6835" git rebase --continue\n"
6792b93b 6836
d9488fea 6837#: sequencer.c:1178
31e5e17b
JX
6838msgid "'prepare-commit-msg' hook failed"
6839msgstr "'prepare-commit-msg' 钩子失败"
6840
d9488fea 6841#: sequencer.c:1184
31e5e17b
JX
6842msgid ""
6843"Your name and email address were configured automatically based\n"
6844"on your username and hostname. Please check that they are accurate.\n"
6845"You can suppress this message by setting them explicitly. Run the\n"
6846"following command and follow the instructions in your editor to edit\n"
6847"your configuration file:\n"
6848"\n"
6849" git config --global --edit\n"
6850"\n"
6851"After doing this, you may fix the identity used for this commit with:\n"
6852"\n"
6853" git commit --amend --reset-author\n"
6854msgstr ""
6855"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6856"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
6857"中编辑您的配置文件:\n"
6858"\n"
6859" git config --global --edit\n"
6860"\n"
6861"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6862"\n"
6863" git commit --amend --reset-author\n"
6864
d9488fea 6865#: sequencer.c:1197
31e5e17b
JX
6866msgid ""
6867"Your name and email address were configured automatically based\n"
6868"on your username and hostname. Please check that they are accurate.\n"
6869"You can suppress this message by setting them explicitly:\n"
6870"\n"
6871" git config --global user.name \"Your Name\"\n"
6872" git config --global user.email you@example.com\n"
6873"\n"
6874"After doing this, you may fix the identity used for this commit with:\n"
6875"\n"
6876" git commit --amend --reset-author\n"
6877msgstr ""
6878"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
6879"与否。您可以对其进行设置以免再出现本提示信息:\n"
6880"\n"
6881" git config --global user.name \"Your Name\"\n"
6882" git config --global user.email you@example.com\n"
6883"\n"
6884"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
6885"\n"
6886" git commit --amend --reset-author\n"
6887
d9488fea 6888#: sequencer.c:1239
31e5e17b
JX
6889msgid "couldn't look up newly created commit"
6890msgstr "无法找到新创建的提交"
6891
d9488fea 6892#: sequencer.c:1241
31e5e17b
JX
6893msgid "could not parse newly created commit"
6894msgstr "不能解析新创建的提交"
6895
d9488fea 6896#: sequencer.c:1287
31e5e17b
JX
6897msgid "unable to resolve HEAD after creating commit"
6898msgstr "创建提交后,不能解析 HEAD"
6899
d9488fea 6900#: sequencer.c:1289
31e5e17b
JX
6901msgid "detached HEAD"
6902msgstr "分离头指针"
6903
6904# 译者:中文字符串拼接,可删除前导空格
d9488fea 6905#: sequencer.c:1293
31e5e17b
JX
6906msgid " (root-commit)"
6907msgstr "(根提交)"
6908
d9488fea 6909#: sequencer.c:1314
31e5e17b
JX
6910msgid "could not parse HEAD"
6911msgstr "不能解析 HEAD"
6912
d9488fea 6913#: sequencer.c:1316
31e5e17b
JX
6914#, c-format
6915msgid "HEAD %s is not a commit!"
6916msgstr "HEAD %s 不是一个提交!"
6917
d9488fea 6918#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577
31e5e17b
JX
6919msgid "could not parse HEAD commit"
6920msgstr "不能解析 HEAD 提交"
6921
d9488fea 6922#: sequencer.c:1373 sequencer.c:2067
31e5e17b
JX
6923msgid "unable to parse commit author"
6924msgstr "不能解析提交作者"
6925
d9488fea 6926#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692
31e5e17b
JX
6927msgid "git write-tree failed to write a tree"
6928msgstr "git write-tree 无法写入树对象"
6929
d9488fea 6930#: sequencer.c:1417 sequencer.c:1535
31e5e17b
JX
6931#, c-format
6932msgid "unable to read commit message from '%s'"
6933msgstr "不能从 '%s' 读取提交说明"
6934
d9488fea
JX
6935#: sequencer.c:1446 sequencer.c:1478
6936#, c-format
6937msgid "invalid author identity '%s'"
6938msgstr "无效的作者身份 '%s'"
6939
6940#: sequencer.c:1452
6941msgid "corrupt author: missing date information"
6942msgstr "损坏的作者:缺失日期信息"
6943
6944#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890
6945#: builtin/merge.c:915
31e5e17b 6946msgid "failed to write commit object"
c1ac5258 6947msgstr "写提交对象失败"
31e5e17b 6948
d9488fea 6949#: sequencer.c:1518 sequencer.c:4237
349ede6a
JX
6950#, c-format
6951msgid "could not update %s"
6952msgstr "不能更新 %s"
6953
d9488fea 6954#: sequencer.c:1567
a0b6b246 6955#, c-format
5809aa05
JX
6956msgid "could not parse commit %s"
6957msgstr "不能解析提交 %s"
6792b93b 6958
d9488fea 6959#: sequencer.c:1572
63af42fe 6960#, c-format
5809aa05
JX
6961msgid "could not parse parent commit %s"
6962msgstr "不能解析父提交 %s"
63af42fe 6963
d9488fea 6964#: sequencer.c:1655 sequencer.c:1766
c1ac5258
JX
6965#, c-format
6966msgid "unknown command: %d"
6967msgstr "未知命令:%d"
6968
d9488fea 6969#: sequencer.c:1713 sequencer.c:1738
1a79b2f1
JX
6970#, c-format
6971msgid "This is a combination of %d commits."
6972msgstr "这是一个 %d 个提交的组合。"
6973
d9488fea 6974#: sequencer.c:1723
1a79b2f1
JX
6975msgid "need a HEAD to fixup"
6976msgstr "需要一个 HEAD 来修复"
6977
d9488fea 6978#: sequencer.c:1725 sequencer.c:3338
1a79b2f1
JX
6979msgid "could not read HEAD"
6980msgstr "不能读取 HEAD"
6981
d9488fea 6982#: sequencer.c:1727
1a79b2f1
JX
6983msgid "could not read HEAD's commit message"
6984msgstr "不能读取 HEAD 的提交说明"
6985
d9488fea 6986#: sequencer.c:1733
1a79b2f1
JX
6987#, c-format
6988msgid "cannot write '%s'"
6989msgstr "不能写 '%s'"
6990
d9488fea 6991#: sequencer.c:1740 git-rebase--preserve-merges.sh:486
1a79b2f1
JX
6992msgid "This is the 1st commit message:"
6993msgstr "这是第一个提交说明:"
6994
d9488fea 6995#: sequencer.c:1748
1a79b2f1
JX
6996#, c-format
6997msgid "could not read commit message of %s"
6998msgstr "不能读取 %s 的提交说明"
6999
d9488fea 7000#: sequencer.c:1755
1a79b2f1
JX
7001#, c-format
7002msgid "This is the commit message #%d:"
7003msgstr "这是提交说明 #%d:"
7004
d9488fea 7005#: sequencer.c:1761
1a79b2f1
JX
7006#, c-format
7007msgid "The commit message #%d will be skipped:"
7008msgstr "提交说明 #%d 将被跳过:"
7009
d9488fea 7010#: sequencer.c:1849
a0b6b246
JX
7011msgid "your index file is unmerged."
7012msgstr "您的索引文件未完成合并。"
6792b93b 7013
d9488fea 7014#: sequencer.c:1856
fd8cb379
JX
7015msgid "cannot fixup root commit"
7016msgstr "不能修复根提交"
7017
d9488fea 7018#: sequencer.c:1875
a0b6b246
JX
7019#, c-format
7020msgid "commit %s is a merge but no -m option was given."
7021msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
6792b93b 7022
d9488fea 7023#: sequencer.c:1883 sequencer.c:1891
a0b6b246
JX
7024#, c-format
7025msgid "commit %s does not have parent %d"
7026msgstr "提交 %s 没有第 %d 个父提交"
7027
d9488fea 7028#: sequencer.c:1897
1a79b2f1
JX
7029#, c-format
7030msgid "cannot get commit message for %s"
7031msgstr "不能得到 %s 的提交说明"
7032
a0b6b246
JX
7033#. TRANSLATORS: The first %s will be a "todo" command like
7034#. "revert" or "pick", the second %s a SHA1.
d9488fea 7035#: sequencer.c:1916
a0b6b246
JX
7036#, c-format
7037msgid "%s: cannot parse parent commit %s"
7038msgstr "%s:不能解析父提交 %s"
7039
d9488fea 7040#: sequencer.c:1981
a0b6b246 7041#, c-format
1a79b2f1
JX
7042msgid "could not rename '%s' to '%s'"
7043msgstr "不能将 '%s' 重命名为 '%s'"
a0b6b246 7044
d9488fea 7045#: sequencer.c:2038
a0b6b246
JX
7046#, c-format
7047msgid "could not revert %s... %s"
7048msgstr "不能还原 %s... %s"
7049
d9488fea 7050#: sequencer.c:2039
a0b6b246
JX
7051#, c-format
7052msgid "could not apply %s... %s"
7053msgstr "不能应用 %s... %s"
7054
d9488fea 7055#: sequencer.c:2059
2b472aae
JX
7056#, c-format
7057msgid "dropping %s %s -- patch contents already upstream\n"
7058msgstr "丢弃 %s %s -- 补丁内容已在上游\n"
7059
d9488fea 7060#: sequencer.c:2117
a0b6b246
JX
7061#, c-format
7062msgid "git %s: failed to read the index"
7063msgstr "git %s:无法读取索引"
7064
d9488fea 7065#: sequencer.c:2124
a0b6b246
JX
7066#, c-format
7067msgid "git %s: failed to refresh the index"
7068msgstr "git %s:无法刷新索引"
7069
d9488fea 7070#: sequencer.c:2201
5809aa05
JX
7071#, c-format
7072msgid "%s does not accept arguments: '%s'"
7073msgstr "%s 不接受参数:'%s'"
7074
d9488fea 7075#: sequencer.c:2210
5809aa05
JX
7076#, c-format
7077msgid "missing arguments for %s"
7078msgstr "缺少 %s 的参数"
7079
d9488fea 7080#: sequencer.c:2241
d46c5519 7081#, c-format
2b472aae
JX
7082msgid "could not parse '%s'"
7083msgstr "无法解析 '%s'"
d46c5519 7084
d9488fea 7085#: sequencer.c:2302
a0b6b246
JX
7086#, c-format
7087msgid "invalid line %d: %.*s"
7088msgstr "无效行 %d:%.*s"
7089
d9488fea 7090#: sequencer.c:2313
1a79b2f1
JX
7091#, c-format
7092msgid "cannot '%s' without a previous commit"
7093msgstr "没有父提交的情况下不能 '%s'"
a0b6b246 7094
d9488fea 7095#: sequencer.c:2399
a6cd2cc4
JX
7096msgid "cancelling a cherry picking in progress"
7097msgstr "正在取消一个进行中的拣选"
7098
d9488fea 7099#: sequencer.c:2408
a6cd2cc4
JX
7100msgid "cancelling a revert in progress"
7101msgstr "正在取消一个进行中的还原"
7102
d9488fea 7103#: sequencer.c:2452
1a79b2f1
JX
7104msgid "please fix this using 'git rebase --edit-todo'."
7105msgstr "请用 'git rebase --edit-todo' 来修改。"
7106
d9488fea 7107#: sequencer.c:2454
a0b6b246
JX
7108#, c-format
7109msgid "unusable instruction sheet: '%s'"
29004bbb 7110msgstr "不可用的指令清单:'%s'"
a0b6b246 7111
d9488fea 7112#: sequencer.c:2459
1a79b2f1
JX
7113msgid "no commits parsed."
7114msgstr "没有解析提交。"
7115
d9488fea 7116#: sequencer.c:2470
a0b6b246
JX
7117msgid "cannot cherry-pick during a revert."
7118msgstr "不能在回退中执行拣选。"
7119
d9488fea 7120#: sequencer.c:2472
a0b6b246
JX
7121msgid "cannot revert during a cherry-pick."
7122msgstr "不能在拣选中执行回退。"
7123
d9488fea 7124#: sequencer.c:2550
a0b6b246
JX
7125#, c-format
7126msgid "invalid value for %s: %s"
7127msgstr "%s 的值无效:%s"
7128
d9488fea 7129#: sequencer.c:2657
fd8cb379
JX
7130msgid "unusable squash-onto"
7131msgstr "不可用的 squash-onto"
7132
d9488fea 7133#: sequencer.c:2677
a0b6b246
JX
7134#, c-format
7135msgid "malformed options sheet: '%s'"
fd8cb379 7136msgstr "格式错误的选项清单:'%s'"
a0b6b246 7137
d9488fea 7138#: sequencer.c:2769 sequencer.c:4609
c1ac5258
JX
7139msgid "empty commit set passed"
7140msgstr "提供了空的提交集"
7141
d9488fea 7142#: sequencer.c:2786
a6cd2cc4
JX
7143msgid "revert is already in progress"
7144msgstr "一个还原操作已在进行"
a0b6b246 7145
d9488fea 7146#: sequencer.c:2788
a6cd2cc4
JX
7147#, c-format
7148msgid "try \"git revert (--continue | %s--abort | --quit)\""
7149msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
7150
d9488fea 7151#: sequencer.c:2791
a6cd2cc4
JX
7152msgid "cherry-pick is already in progress"
7153msgstr "拣选操作已在进行"
7154
d9488fea 7155#: sequencer.c:2793
a6cd2cc4
JX
7156#, c-format
7157msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
7158msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
a0b6b246 7159
d9488fea 7160#: sequencer.c:2807
a0b6b246
JX
7161#, c-format
7162msgid "could not create sequencer directory '%s'"
7163msgstr "不能创建序列目录 '%s'"
7164
d9488fea 7165#: sequencer.c:2822
a0b6b246
JX
7166msgid "could not lock HEAD"
7167msgstr "不能锁定 HEAD"
7168
d9488fea 7169#: sequencer.c:2882 sequencer.c:4325
a0b6b246
JX
7170msgid "no cherry-pick or revert in progress"
7171msgstr "拣选或还原操作并未进行"
7172
d9488fea 7173#: sequencer.c:2884 sequencer.c:2895
a0b6b246
JX
7174msgid "cannot resolve HEAD"
7175msgstr "不能解析 HEAD"
7176
d9488fea 7177#: sequencer.c:2886 sequencer.c:2930
a0b6b246
JX
7178msgid "cannot abort from a branch yet to be born"
7179msgstr "不能从尚未建立的分支终止"
7180
d9488fea 7181#: sequencer.c:2916 builtin/grep.c:745
a0b6b246
JX
7182#, c-format
7183msgid "cannot open '%s'"
7184msgstr "不能打开 '%s'"
7185
d9488fea 7186#: sequencer.c:2918
a0b6b246
JX
7187#, c-format
7188msgid "cannot read '%s': %s"
7189msgstr "不能读取 '%s':%s"
7190
d9488fea 7191#: sequencer.c:2919
a0b6b246
JX
7192msgid "unexpected end of file"
7193msgstr "意外的文件结束"
7194
d9488fea 7195#: sequencer.c:2925
a0b6b246
JX
7196#, c-format
7197msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
7198msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
7199
d9488fea 7200#: sequencer.c:2936
1a79b2f1
JX
7201msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
7202msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
7203
d9488fea 7204#: sequencer.c:2977
a6cd2cc4
JX
7205msgid "no revert in progress"
7206msgstr "没有正在进行的还原"
7207
d9488fea 7208#: sequencer.c:2986
a6cd2cc4
JX
7209msgid "no cherry-pick in progress"
7210msgstr "没有正在进行的拣选"
7211
d9488fea 7212#: sequencer.c:2996
a6cd2cc4
JX
7213msgid "failed to skip the commit"
7214msgstr "无法跳过这个提交"
7215
d9488fea 7216#: sequencer.c:3003
a6cd2cc4
JX
7217msgid "there is nothing to skip"
7218msgstr "没有要跳过的"
7219
d9488fea 7220#: sequencer.c:3006
a6cd2cc4
JX
7221#, c-format
7222msgid ""
7223"have you committed already?\n"
7224"try \"git %s --continue\""
7225msgstr ""
7226"您已经提交了么?\n"
7227"试试 \"git %s --continue\""
7228
d9488fea 7229#: sequencer.c:3168 sequencer.c:4217
1a79b2f1
JX
7230msgid "cannot read HEAD"
7231msgstr "不能读取 HEAD"
7232
d9488fea 7233#: sequencer.c:3185
c1ac5258
JX
7234#, c-format
7235msgid "unable to copy '%s' to '%s'"
7236msgstr "无法拷贝 '%s' 至 '%s'"
7237
d9488fea 7238#: sequencer.c:3193
c1ac5258
JX
7239#, c-format
7240msgid ""
7241"You can amend the commit now, with\n"
7242"\n"
7243" git commit --amend %s\n"
7244"\n"
7245"Once you are satisfied with your changes, run\n"
7246"\n"
7247" git rebase --continue\n"
7248msgstr ""
7249"您现在可以修补这个提交,使用\n"
7250"\n"
7251" git commit --amend %s\n"
7252"\n"
7253"当您对变更感到满意,执行\n"
7254"\n"
7255" git rebase --continue\n"
7256
d9488fea 7257#: sequencer.c:3203
c1ac5258
JX
7258#, c-format
7259msgid "Could not apply %s... %.*s"
7260msgstr "不能应用 %s... %.*s"
7261
d9488fea 7262#: sequencer.c:3210
c1ac5258
JX
7263#, c-format
7264msgid "Could not merge %.*s"
7265msgstr "不能合并 %.*s"
7266
d9488fea 7267#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641
1a79b2f1
JX
7268#, c-format
7269msgid "could not copy '%s' to '%s'"
7270msgstr "不能拷贝 '%s' 至 '%s'"
7271
d9488fea 7272#: sequencer.c:3240
349ede6a
JX
7273#, c-format
7274msgid "Executing: %s\n"
7275msgstr "正在执行:%s\n"
7276
1a79b2f1 7277# 译者:注意保持前导空格
d9488fea 7278#: sequencer.c:3255
1a79b2f1
JX
7279#, c-format
7280msgid ""
7281"execution failed: %s\n"
7282"%sYou can fix the problem, and then run\n"
7283"\n"
7284" git rebase --continue\n"
7285"\n"
7286msgstr ""
7287"执行失败:%s\n"
7288"%s您可以改正该问题,然后运行\n"
7289"\n"
7290" git rebase --continue\n"
7291"\n"
7292
d9488fea 7293#: sequencer.c:3261
1a79b2f1
JX
7294msgid "and made changes to the index and/or the working tree\n"
7295msgstr "并且修改索引和/或工作区\n"
7296
d9488fea 7297#: sequencer.c:3267
1a79b2f1
JX
7298#, c-format
7299msgid ""
7300"execution succeeded: %s\n"
7301"but left changes to the index and/or the working tree\n"
7302"Commit or stash your changes, and then run\n"
7303"\n"
7304" git rebase --continue\n"
7305"\n"
7306msgstr ""
7307"执行成功:%s\n"
7308"但是在索引和/或工作区中存在变更\n"
a4f16749 7309"提交或贮藏修改,然后运行\n"
1a79b2f1
JX
7310"\n"
7311" git rebase --continue\n"
7312"\n"
7313
d9488fea 7314#: sequencer.c:3328
c1ac5258
JX
7315#, c-format
7316msgid "illegal label name: '%.*s'"
7317msgstr "非法的标签名称:'%.*s'"
7318
d9488fea 7319#: sequencer.c:3382
fd8cb379
JX
7320msgid "writing fake root commit"
7321msgstr "写伪根提交"
7322
d9488fea 7323#: sequencer.c:3387
fd8cb379
JX
7324msgid "writing squash-onto"
7325msgstr "写入 squash-onto"
7326
d9488fea 7327#: sequencer.c:3471
c1ac5258
JX
7328#, c-format
7329msgid "could not resolve '%s'"
7330msgstr "无法解析 '%s'"
7331
d9488fea 7332#: sequencer.c:3502
fd8cb379
JX
7333msgid "cannot merge without a current revision"
7334msgstr "没有当前版本不能合并"
7335
d9488fea 7336#: sequencer.c:3524
fd8cb379 7337#, c-format
c1ac5258
JX
7338msgid "unable to parse '%.*s'"
7339msgstr "无法解析 '%.*s'"
7340
d9488fea 7341#: sequencer.c:3533
c1ac5258
JX
7342#, c-format
7343msgid "nothing to merge: '%.*s'"
7344msgstr "无可用合并:'%.*s'"
7345
d9488fea 7346#: sequencer.c:3545
c1ac5258
JX
7347msgid "octopus merge cannot be executed on top of a [new root]"
7348msgstr "章鱼合并不能在一个新的根提交上执行"
fd8cb379 7349
d9488fea 7350#: sequencer.c:3561
fd8cb379
JX
7351#, c-format
7352msgid "could not get commit message of '%s'"
7353msgstr "不能获取 '%s' 的提交说明"
7354
d9488fea 7355#: sequencer.c:3730
fd8cb379
JX
7356#, c-format
7357msgid "could not even attempt to merge '%.*s'"
7358msgstr "甚至不能尝试合并 '%.*s'"
7359
d9488fea 7360#: sequencer.c:3746
fd8cb379
JX
7361msgid "merge: Unable to write new index file"
7362msgstr "合并:无法写入新索引文件"
7363
d9488fea 7364#: sequencer.c:3820
349ede6a
JX
7365msgid "Cannot autostash"
7366msgstr "无法 autostash"
7367
d9488fea 7368#: sequencer.c:3823
1a79b2f1 7369#, c-format
349ede6a
JX
7370msgid "Unexpected stash response: '%s'"
7371msgstr "意外的 stash 响应:'%s'"
1a79b2f1 7372
d9488fea 7373#: sequencer.c:3829
1a79b2f1 7374#, c-format
349ede6a
JX
7375msgid "Could not create directory for '%s'"
7376msgstr "不能为 '%s' 创建目录"
7377
d9488fea 7378#: sequencer.c:3832
349ede6a
JX
7379#, c-format
7380msgid "Created autostash: %s\n"
7381msgstr "创建了 autostash:%s\n"
7382
d9488fea 7383#: sequencer.c:3836
349ede6a
JX
7384msgid "could not reset --hard"
7385msgstr "无法 reset --hard"
7386
d9488fea 7387#: sequencer.c:3861
349ede6a
JX
7388#, c-format
7389msgid "Applied autostash.\n"
7390msgstr "已应用 autostash。\n"
7391
d9488fea 7392#: sequencer.c:3873
349ede6a
JX
7393#, c-format
7394msgid "cannot store %s"
1a79b2f1
JX
7395msgstr "不能存储 %s"
7396
d9488fea 7397#: sequencer.c:3876
1a79b2f1
JX
7398#, c-format
7399msgid ""
349ede6a 7400"%s\n"
1a79b2f1
JX
7401"Your changes are safe in the stash.\n"
7402"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
7403msgstr ""
349ede6a
JX
7404"%s\n"
7405"您的修改在贮藏区中很安全。\n"
1a79b2f1
JX
7406"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
7407
d9488fea 7408#: sequencer.c:3881
349ede6a
JX
7409msgid "Applying autostash resulted in conflicts."
7410msgstr "应用自动贮藏导致冲突。"
7411
d9488fea 7412#: sequencer.c:3882
349ede6a
JX
7413msgid "Autostash exists; creating a new stash entry."
7414msgstr "自动贮藏已经存在;正在创建一个新的贮藏条目。"
7415
d9488fea 7416#: sequencer.c:3974
4c27fcb5
JX
7417#, c-format
7418msgid "%s: not a valid OID"
5b533632 7419msgstr "%s:不是一个有效的对象 ID"
4c27fcb5 7420
d9488fea 7421#: sequencer.c:3979 git-rebase--preserve-merges.sh:769
4c27fcb5
JX
7422msgid "could not detach HEAD"
7423msgstr "不能分离头指针"
7424
d9488fea 7425#: sequencer.c:3994
4c27fcb5
JX
7426#, c-format
7427msgid "Stopped at HEAD\n"
7428msgstr "停止在 HEAD\n"
7429
d9488fea 7430#: sequencer.c:3996
4c27fcb5
JX
7431#, c-format
7432msgid "Stopped at %s\n"
7433msgstr "停止在 %s\n"
7434
d9488fea 7435#: sequencer.c:4004
fd8cb379
JX
7436#, c-format
7437msgid ""
7438"Could not execute the todo command\n"
7439"\n"
7440" %.*s\n"
7441"It has been rescheduled; To edit the command before continuing, please\n"
7442"edit the todo list first:\n"
7443"\n"
7444" git rebase --edit-todo\n"
7445" git rebase --continue\n"
7446msgstr ""
7447"无法执行待办命令\n"
7448"\n"
7449" %.*s\n"
7450"已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n"
7451"\n"
7452" git rebase --edit-todo\n"
7453" git rebase --continue\n"
7454
d9488fea 7455#: sequencer.c:4050
349ede6a
JX
7456#, c-format
7457msgid "Rebasing (%d/%d)%s"
7458msgstr "正在变基(%d/%d)%s"
7459
d9488fea 7460#: sequencer.c:4095
1a79b2f1 7461#, c-format
87cb7997
JX
7462msgid "Stopped at %s... %.*s\n"
7463msgstr "停止在 %s... %.*s\n"
1a79b2f1 7464
d9488fea 7465#: sequencer.c:4166
1a79b2f1
JX
7466#, c-format
7467msgid "unknown command %d"
7468msgstr "未知命令 %d"
7469
d9488fea 7470#: sequencer.c:4225
1a79b2f1
JX
7471msgid "could not read orig-head"
7472msgstr "不能读取 orig-head"
7473
d9488fea 7474#: sequencer.c:4230
1a79b2f1
JX
7475msgid "could not read 'onto'"
7476msgstr "不能读取 'onto'"
7477
d9488fea 7478#: sequencer.c:4244
1a79b2f1
JX
7479#, c-format
7480msgid "could not update HEAD to %s"
7481msgstr "不能更新 HEAD 为 %s"
7482
d9488fea 7483#: sequencer.c:4304
349ede6a
JX
7484#, c-format
7485msgid "Successfully rebased and updated %s.\n"
7486msgstr "成功变基并更新 %s。\n"
7487
d9488fea 7488#: sequencer.c:4337
1a79b2f1
JX
7489msgid "cannot rebase: You have unstaged changes."
7490msgstr "不能变基:您有未暂存的变更。"
7491
d9488fea 7492#: sequencer.c:4346
1a79b2f1
JX
7493msgid "cannot amend non-existing commit"
7494msgstr "不能修补不存在的提交"
7495
d9488fea 7496#: sequencer.c:4348
1a79b2f1
JX
7497#, c-format
7498msgid "invalid file: '%s'"
7499msgstr "无效文件:'%s'"
7500
d9488fea 7501#: sequencer.c:4350
1a79b2f1
JX
7502#, c-format
7503msgid "invalid contents: '%s'"
7504msgstr "无效内容:'%s'"
7505
d9488fea 7506#: sequencer.c:4353
1a79b2f1
JX
7507msgid ""
7508"\n"
7509"You have uncommitted changes in your working tree. Please, commit them\n"
7510"first and then run 'git rebase --continue' again."
87cb7997
JX
7511msgstr ""
7512"\n"
7513"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
1a79b2f1 7514
d9488fea 7515#: sequencer.c:4389 sequencer.c:4428
fd8cb379
JX
7516#, c-format
7517msgid "could not write file: '%s'"
7518msgstr "不能写入文件:'%s'"
7519
d9488fea 7520#: sequencer.c:4444
fd8cb379
JX
7521msgid "could not remove CHERRY_PICK_HEAD"
7522msgstr "不能删除 CHERRY_PICK_HEAD"
7523
d9488fea 7524#: sequencer.c:4451
1a79b2f1
JX
7525msgid "could not commit staged changes."
7526msgstr "不能提交暂存的修改。"
7527
d9488fea
JX
7528#: sequencer.c:4477
7529#, c-format
7530msgid "invalid committer '%s'"
7531msgstr "无效的提交者 '%s'"
7532
7533#: sequencer.c:4586
a0b6b246
JX
7534#, c-format
7535msgid "%s: can't cherry-pick a %s"
7536msgstr "%s:不能拣选一个%s"
7537
d9488fea 7538#: sequencer.c:4590
a0b6b246
JX
7539#, c-format
7540msgid "%s: bad revision"
7541msgstr "%s:错误的版本"
7542
d9488fea 7543#: sequencer.c:4625
a0b6b246
JX
7544msgid "can't revert as initial commit"
7545msgstr "不能作为初始提交回退"
7546
d9488fea 7547#: sequencer.c:5102
6937cb4e
JX
7548msgid "make_script: unhandled options"
7549msgstr "make_script:有未能处理的选项"
7550
d9488fea 7551#: sequencer.c:5105
6937cb4e
JX
7552msgid "make_script: error preparing revisions"
7553msgstr "make_script:准备版本时错误"
7554
d9488fea 7555#: sequencer.c:5347 sequencer.c:5364
4c27fcb5
JX
7556msgid "nothing to do"
7557msgstr "无事可做"
7558
d9488fea 7559#: sequencer.c:5383
4c27fcb5
JX
7560msgid "could not skip unnecessary pick commands"
7561msgstr "无法跳过不必要的拣选"
7562
d9488fea 7563#: sequencer.c:5480
6937cb4e
JX
7564msgid "the script was already rearranged."
7565msgstr "脚本已经重新编排。"
7566
349ede6a 7567#: setup.c:133
31e5e17b 7568#, c-format
2b472aae 7569msgid "'%s' is outside repository at '%s'"
440e7442 7570msgstr "'%s' 在位于 '%s' 的仓库之外"
31e5e17b 7571
349ede6a 7572#: setup.c:185
a0b6b246 7573#, c-format
6792b93b 7574msgid ""
a0b6b246
JX
7575"%s: no such path in the working tree.\n"
7576"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
7577msgstr ""
7578"%s:工作区中无此路径。\n"
58b6f078 7579"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
6792b93b 7580
349ede6a 7581#: setup.c:198
90314792 7582#, c-format
a0b6b246
JX
7583msgid ""
7584"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
7585"Use '--' to separate paths from revisions, like this:\n"
7586"'git <command> [<revision>...] -- [<file>...]'"
7587msgstr ""
7588"有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
7589"使用 '--' 来分隔版本和路径,例如:\n"
58b6f078 7590"'git <命令> [<版本>...] -- [<文件>...]'"
6792b93b 7591
349ede6a 7592#: setup.c:264
31e5e17b
JX
7593#, c-format
7594msgid "option '%s' must come before non-option arguments"
7595msgstr "选项 '%s' 必须在其他非选项参数之前"
7596
349ede6a 7597#: setup.c:283
a0b6b246
JX
7598#, c-format
7599msgid ""
7600"ambiguous argument '%s': both revision and filename\n"
7601"Use '--' to separate paths from revisions, like this:\n"
7602"'git <command> [<revision>...] -- [<file>...]'"
7603msgstr ""
7604"有歧义的参数 '%s':可同时是版本和文件\n"
7605"使用 '--' 来分隔版本和路径,例如:\n"
58b6f078 7606"'git <命令> [<版本>...] -- [<文件>...]'"
2e8451e8 7607
349ede6a 7608#: setup.c:419
31e5e17b
JX
7609msgid "unable to set up work tree using invalid config"
7610msgstr "无法使用无效配置来创建工作区"
7611
349ede6a 7612#: setup.c:423
31e5e17b 7613msgid "this operation must be run in a work tree"
610f8099 7614msgstr "该操作必须在一个工作区中运行"
31e5e17b 7615
d9488fea 7616#: setup.c:661
a0b6b246
JX
7617#, c-format
7618msgid "Expected git repo version <= %d, found %d"
7619msgstr "期望 git 仓库版本 <= %d,却得到 %d"
6792b93b 7620
d9488fea 7621#: setup.c:669
a0b6b246
JX
7622msgid "unknown repository extensions found:"
7623msgstr "发现未知的仓库扩展:"
2e8451e8 7624
d9488fea
JX
7625#: setup.c:681
7626msgid "repo version is 0, but v1-only extensions found:"
7627msgstr "仓库的版本是 0,但是发现仅用于 v1 的扩展:"
7628
7629#: setup.c:700
1003b3a5 7630#, c-format
31e5e17b 7631msgid "error opening '%s'"
c1ac5258 7632msgstr "打开 '%s' 出错"
1003b3a5 7633
d9488fea 7634#: setup.c:702
31e5e17b
JX
7635#, c-format
7636msgid "too large to be a .git file: '%s'"
610f8099 7637msgstr "文件太大,无法作为 .git 文件:'%s'"
31e5e17b 7638
d9488fea 7639#: setup.c:704
31e5e17b
JX
7640#, c-format
7641msgid "error reading %s"
c1ac5258 7642msgstr "读取 %s 出错"
31e5e17b 7643
d9488fea 7644#: setup.c:706
31e5e17b
JX
7645#, c-format
7646msgid "invalid gitfile format: %s"
7647msgstr "无效的 gitfile 格式:%s"
7648
d9488fea 7649#: setup.c:708
31e5e17b
JX
7650#, c-format
7651msgid "no path in gitfile: %s"
7652msgstr "在 gitfile 中没有路径:%s"
7653
d9488fea 7654#: setup.c:710
31e5e17b
JX
7655#, c-format
7656msgid "not a git repository: %s"
d9488fea 7657msgstr "不是 git 仓库:%s"
31e5e17b 7658
d9488fea 7659#: setup.c:812
31e5e17b
JX
7660#, c-format
7661msgid "'$%s' too big"
7662msgstr "'$%s' 太大"
7663
d9488fea 7664#: setup.c:826
31e5e17b
JX
7665#, c-format
7666msgid "not a git repository: '%s'"
d9488fea 7667msgstr "不是 git 仓库:'%s'"
31e5e17b 7668
d9488fea 7669#: setup.c:855 setup.c:857 setup.c:888
31e5e17b
JX
7670#, c-format
7671msgid "cannot chdir to '%s'"
7672msgstr "不能切换目录到 '%s'"
7673
d9488fea 7674#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
31e5e17b 7675msgid "cannot come back to cwd"
a0b6b246 7676msgstr "无法返回当前工作目录"
1003b3a5 7677
d9488fea 7678#: setup.c:987
31e5e17b
JX
7679#, c-format
7680msgid "failed to stat '%*s%s%s'"
c1ac5258 7681msgstr "获取 '%*s%s%s' 状态(stat)失败"
31e5e17b 7682
d9488fea 7683#: setup.c:1225
a0b6b246
JX
7684msgid "Unable to read current working directory"
7685msgstr "不能读取当前工作目录"
1003b3a5 7686
d9488fea 7687#: setup.c:1234 setup.c:1240
87cb7997 7688#, c-format
31e5e17b 7689msgid "cannot change to '%s'"
87cb7997
JX
7690msgstr "不能切换到 '%s'"
7691
d9488fea 7692#: setup.c:1245
06991777
JX
7693#, c-format
7694msgid "not a git repository (or any of the parent directories): %s"
d9488fea 7695msgstr "不是 git 仓库(或者任何父目录):%s"
06991777 7696
d9488fea 7697#: setup.c:1251
a0b6b246
JX
7698#, c-format
7699msgid ""
31e5e17b 7700"not a git repository (or any parent up to mount point %s)\n"
a0b6b246
JX
7701"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
7702msgstr ""
d9488fea 7703"不是 git 仓库(或者直至挂载点 %s 的任何父目录)\n"
a0b6b246 7704"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
1003b3a5 7705
d9488fea 7706#: setup.c:1362
a0b6b246
JX
7707#, c-format
7708msgid ""
31e5e17b 7709"problem with core.sharedRepository filemode value (0%.3o).\n"
a0b6b246
JX
7710"The owner of files must always have read and write permissions."
7711msgstr ""
31e5e17b 7712"参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n"
a0b6b246 7713"文件属主必须始终拥有读写权限。"
6792b93b 7714
d9488fea 7715#: setup.c:1409
31e5e17b
JX
7716msgid "open /dev/null or dup failed"
7717msgstr "不能打开或者复制 /dev/null"
7718
d9488fea 7719#: setup.c:1424
31e5e17b
JX
7720msgid "fork failed"
7721msgstr "fork 失败"
7722
d9488fea 7723#: setup.c:1429
31e5e17b
JX
7724msgid "setsid failed"
7725msgstr "setsid 失败"
7726
349ede6a 7727#: sha1-file.c:470
c1ac5258
JX
7728#, c-format
7729msgid "object directory %s does not exist; check .git/objects/info/alternates"
7730msgstr "对象目录 %s 不存在,检查 .git/objects/info/alternates"
7731
349ede6a 7732#: sha1-file.c:521
c1ac5258
JX
7733#, c-format
7734msgid "unable to normalize alternate object path: %s"
7735msgstr "无法规范化备用对象路径:%s"
7736
349ede6a 7737#: sha1-file.c:593
c1ac5258
JX
7738#, c-format
7739msgid "%s: ignoring alternate object stores, nesting too deep"
7740msgstr "%s:忽略备用对象库,嵌套太深"
7741
349ede6a 7742#: sha1-file.c:600
c1ac5258
JX
7743#, c-format
7744msgid "unable to normalize object directory: %s"
7745msgstr "无法规范化对象目录: %s"
7746
349ede6a 7747#: sha1-file.c:643
c1ac5258
JX
7748msgid "unable to fdopen alternates lockfile"
7749msgstr "无法 fdopen 替换锁文件"
7750
349ede6a 7751#: sha1-file.c:661
c1ac5258
JX
7752msgid "unable to read alternates file"
7753msgstr "无法读取替代文件"
7754
349ede6a 7755#: sha1-file.c:668
c1ac5258
JX
7756msgid "unable to move new alternates file into place"
7757msgstr "无法将新的替代文件移动到位"
7758
349ede6a 7759#: sha1-file.c:703
a0b6b246
JX
7760#, c-format
7761msgid "path '%s' does not exist"
7762msgstr "路径 '%s' 不存在"
7763
349ede6a 7764#: sha1-file.c:724
a0b6b246
JX
7765#, c-format
7766msgid "reference repository '%s' as a linked checkout is not supported yet."
7767msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
7768
349ede6a 7769#: sha1-file.c:730
a0b6b246
JX
7770#, c-format
7771msgid "reference repository '%s' is not a local repository."
7772msgstr "参考仓库 '%s' 不是一个本地仓库。"
7773
349ede6a 7774#: sha1-file.c:736
a0b6b246
JX
7775#, c-format
7776msgid "reference repository '%s' is shallow"
7777msgstr "参考仓库 '%s' 是一个浅克隆"
7778
349ede6a 7779#: sha1-file.c:744
a0b6b246
JX
7780#, c-format
7781msgid "reference repository '%s' is grafted"
fd8cb379 7782msgstr "参考仓库 '%s' 已被移植"
a0b6b246 7783
349ede6a 7784#: sha1-file.c:804
a6cd2cc4
JX
7785#, c-format
7786msgid "invalid line while parsing alternate refs: %s"
7787msgstr "解析备用引用时无效的行:%s"
7788
349ede6a 7789#: sha1-file.c:954
c1ac5258
JX
7790#, c-format
7791msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
7792msgstr "尝试 mmap %<PRIuMAX>,超过了最大值 %<PRIuMAX>"
7793
349ede6a 7794#: sha1-file.c:975
c1ac5258
JX
7795msgid "mmap failed"
7796msgstr "mmap 失败"
7797
349ede6a 7798#: sha1-file.c:1139
c1ac5258
JX
7799#, c-format
7800msgid "object file %s is empty"
7801msgstr "对象文件 %s 为空"
7802
d9488fea 7803#: sha1-file.c:1274 sha1-file.c:2467
c1ac5258
JX
7804#, c-format
7805msgid "corrupt loose object '%s'"
7806msgstr "损坏的松散对象 '%s'"
7807
d9488fea 7808#: sha1-file.c:1276 sha1-file.c:2471
c1ac5258
JX
7809#, c-format
7810msgid "garbage at end of loose object '%s'"
7811msgstr "松散对象 '%s' 后面有垃圾数据"
7812
349ede6a 7813#: sha1-file.c:1318
c1ac5258
JX
7814msgid "invalid object type"
7815msgstr "无效的对象类型"
7816
349ede6a 7817#: sha1-file.c:1402
c1ac5258
JX
7818#, c-format
7819msgid "unable to unpack %s header with --allow-unknown-type"
7820msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
7821
349ede6a 7822#: sha1-file.c:1405
c1ac5258
JX
7823#, c-format
7824msgid "unable to unpack %s header"
7825msgstr "无法解开 %s 头部"
7826
349ede6a 7827#: sha1-file.c:1411
c1ac5258
JX
7828#, c-format
7829msgid "unable to parse %s header with --allow-unknown-type"
7830msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
7831
349ede6a 7832#: sha1-file.c:1414
c1ac5258
JX
7833#, c-format
7834msgid "unable to parse %s header"
7835msgstr "无法解析 %s 头部"
7836
d9488fea 7837#: sha1-file.c:1641
c1ac5258
JX
7838#, c-format
7839msgid "failed to read object %s"
7840msgstr "读取对象 %s 失败"
7841
d9488fea 7842#: sha1-file.c:1645
c1ac5258
JX
7843#, c-format
7844msgid "replacement %s not found for %s"
7845msgstr "找不到 %2$s 的替代 %1$s"
7846
d9488fea 7847#: sha1-file.c:1649
c1ac5258
JX
7848#, c-format
7849msgid "loose object %s (stored in %s) is corrupt"
7850msgstr "松散对象 %s(保存在 %s)已损坏"
7851
d9488fea 7852#: sha1-file.c:1653
c1ac5258
JX
7853#, c-format
7854msgid "packed object %s (stored in %s) is corrupt"
7855msgstr "打包对象 %s(保存在 %s)已损坏"
7856
d9488fea 7857#: sha1-file.c:1758
c1ac5258 7858#, c-format
06991777
JX
7859msgid "unable to write file %s"
7860msgstr "无法写文件 %s"
c1ac5258 7861
d9488fea 7862#: sha1-file.c:1765
c1ac5258
JX
7863#, c-format
7864msgid "unable to set permission to '%s'"
7865msgstr "无法为 '%s' 设置权限"
7866
d9488fea 7867#: sha1-file.c:1772
c1ac5258
JX
7868msgid "file write error"
7869msgstr "文件写错误"
7870
d9488fea 7871#: sha1-file.c:1792
06991777
JX
7872msgid "error when closing loose object file"
7873msgstr "关闭松散对象文件时出错"
c1ac5258 7874
d9488fea 7875#: sha1-file.c:1857
c1ac5258
JX
7876#, c-format
7877msgid "insufficient permission for adding an object to repository database %s"
7878msgstr "权限不足,无法在仓库对象库 %s 中添加对象"
7879
d9488fea 7880#: sha1-file.c:1859
c1ac5258
JX
7881msgid "unable to create temporary file"
7882msgstr "无法创建临时文件"
7883
d9488fea 7884#: sha1-file.c:1883
06991777
JX
7885msgid "unable to write loose object file"
7886msgstr "不能写松散对象文件"
c1ac5258 7887
d9488fea 7888#: sha1-file.c:1889
c1ac5258
JX
7889#, c-format
7890msgid "unable to deflate new object %s (%d)"
7891msgstr "不能压缩新对象 %s(%d)"
7892
d9488fea 7893#: sha1-file.c:1893
c1ac5258
JX
7894#, c-format
7895msgid "deflateEnd on object %s failed (%d)"
7896msgstr "在对象 %s 上调用 deflateEnd 失败(%d)"
7897
d9488fea 7898#: sha1-file.c:1897
c1ac5258
JX
7899#, c-format
7900msgid "confused by unstable object source data for %s"
7901msgstr "被 %s 的不稳定对象源数据搞糊涂了"
7902
d9488fea 7903#: sha1-file.c:1907 builtin/pack-objects.c:1086
c1ac5258
JX
7904#, c-format
7905msgid "failed utime() on %s"
7906msgstr "在 %s 上调用 utime() 失败"
7907
d9488fea 7908#: sha1-file.c:1984
c1ac5258 7909#, c-format
06991777
JX
7910msgid "cannot read object for %s"
7911msgstr "不能读取对象 %s"
c1ac5258 7912
d9488fea 7913#: sha1-file.c:2035
c1ac5258
JX
7914msgid "corrupt commit"
7915msgstr "损坏的提交"
7916
d9488fea 7917#: sha1-file.c:2043
c1ac5258
JX
7918msgid "corrupt tag"
7919msgstr "损坏的标签"
7920
d9488fea 7921#: sha1-file.c:2143
c1ac5258
JX
7922#, c-format
7923msgid "read error while indexing %s"
7924msgstr "索引 %s 时读取错误"
7925
d9488fea 7926#: sha1-file.c:2146
c1ac5258
JX
7927#, c-format
7928msgid "short read while indexing %s"
7929msgstr "索引 %s 时读入不完整"
7930
d9488fea 7931#: sha1-file.c:2219 sha1-file.c:2229
c1ac5258
JX
7932#, c-format
7933msgid "%s: failed to insert into database"
7934msgstr "%s:插入数据库失败"
7935
d9488fea 7936#: sha1-file.c:2235
c1ac5258
JX
7937#, c-format
7938msgid "%s: unsupported file type"
7939msgstr "%s:不支持的文件类型"
7940
d9488fea 7941#: sha1-file.c:2259
c1ac5258
JX
7942#, c-format
7943msgid "%s is not a valid object"
7944msgstr "%s 不是一个有效的对象"
7945
d9488fea 7946#: sha1-file.c:2261
c1ac5258
JX
7947#, c-format
7948msgid "%s is not a valid '%s' object"
7949msgstr "%s 不是一个有效的 '%s' 对象"
7950
d9488fea 7951#: sha1-file.c:2288 builtin/index-pack.c:192
c1ac5258
JX
7952#, c-format
7953msgid "unable to open %s"
7954msgstr "不能打开 %s"
7955
d9488fea 7956#: sha1-file.c:2478 sha1-file.c:2531
c1ac5258 7957#, c-format
06991777
JX
7958msgid "hash mismatch for %s (expected %s)"
7959msgstr "%s 的哈希值不匹配(预期 %s)"
c1ac5258 7960
d9488fea 7961#: sha1-file.c:2502
c1ac5258
JX
7962#, c-format
7963msgid "unable to mmap %s"
7964msgstr "不能 mmap %s"
7965
d9488fea 7966#: sha1-file.c:2507
c1ac5258
JX
7967#, c-format
7968msgid "unable to unpack header of %s"
7969msgstr "无法解压缩 %s 的头部"
7970
d9488fea 7971#: sha1-file.c:2513
c1ac5258
JX
7972#, c-format
7973msgid "unable to parse header of %s"
7974msgstr "无法解析 %s 的头部"
7975
d9488fea 7976#: sha1-file.c:2524
c1ac5258
JX
7977#, c-format
7978msgid "unable to unpack contents of %s"
7979msgstr "无法解压缩 %s 的内容"
7980
2b472aae 7981#: sha1-name.c:486
a0b6b246
JX
7982#, c-format
7983msgid "short SHA1 %s is ambiguous"
29004bbb 7984msgstr "短 SHA1 %s 存在歧义"
a0b6b246 7985
2b472aae 7986#: sha1-name.c:497
a0b6b246
JX
7987msgid "The candidates are:"
7988msgstr "候选者有:"
7989
2b472aae 7990#: sha1-name.c:796
a0b6b246
JX
7991msgid ""
7992"Git normally never creates a ref that ends with 40 hex characters\n"
7993"because it will be ignored when you just specify 40-hex. These refs\n"
7994"may be created by mistake. For example,\n"
7995"\n"
a6cd2cc4 7996" git switch -c $br $(git rev-parse ...)\n"
a0b6b246
JX
7997"\n"
7998"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
7999"examine these refs and maybe delete them. Turn this message off by\n"
8000"running \"git config advice.objectNameWarning false\""
8001msgstr ""
a6cd2cc4
JX
8002"Git 通常不会创建一个以40个十六进制字符结尾的引用,因为当您只提供40\n"
8003"个十六进制字符时将被忽略。这些引用可能被错误地创建。例如:\n"
a0b6b246 8004"\n"
a6cd2cc4 8005" git switch -c $br $(git rev-parse ...)\n"
a0b6b246 8006"\n"
a6cd2cc4
JX
8007"当 \"$br\" 某种原因空白时,一个40位十六进制的引用将被创建。请检查这些\n"
8008"引用,可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
8009"false\" 命令关闭本消息通知。"
8010
2b472aae
JX
8011#: sha1-name.c:916
8012#, c-format
8013msgid "log for '%.*s' only goes back to %s"
8014msgstr "'%.*s' 的日志仅能回到 %s"
8015
8016#: sha1-name.c:924
8017#, c-format
8018msgid "log for '%.*s' only has %d entries"
8019msgstr "'%.*s' 的日志仅有 %d 个条目"
8020
d9488fea 8021#: sha1-name.c:1702
2b472aae
JX
8022#, c-format
8023msgid "path '%s' exists on disk, but not in '%.*s'"
8024msgstr "路径 '%s' 在磁盘上,但是不在 '%.*s' 中"
8025
d9488fea 8026#: sha1-name.c:1708
2b472aae
JX
8027#, c-format
8028msgid ""
8029"path '%s' exists, but not '%s'\n"
8030"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
8031msgstr ""
440e7442 8032"路径 '%s' 存在,而 '%s' 不存在\n"
2b472aae
JX
8033"提示:您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'?"
8034
d9488fea 8035#: sha1-name.c:1717
2b472aae
JX
8036#, c-format
8037msgid "path '%s' does not exist in '%.*s'"
8038msgstr "路径 '%s' 不在 '%.*s' 中"
8039
d9488fea 8040#: sha1-name.c:1745
2b472aae
JX
8041#, c-format
8042msgid ""
8043"path '%s' is in the index, but not at stage %d\n"
8044"hint: Did you mean ':%d:%s'?"
8045msgstr ""
8046"路径 '%s' 在索引中,但不在暂存区 %d 中\n"
8047"提示:您的意思是 ':%d:%s'?"
8048
d9488fea 8049#: sha1-name.c:1761
2b472aae
JX
8050#, c-format
8051msgid ""
8052"path '%s' is in the index, but not '%s'\n"
8053"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
8054msgstr ""
440e7442 8055"路径 '%s' 在索引中,但 '%s' 不在\n"
2b472aae
JX
8056"提示:您的意思是 ':%d:%s' 亦即 ':%d:./%s'?"
8057
d9488fea 8058#: sha1-name.c:1769
2b472aae
JX
8059#, c-format
8060msgid "path '%s' exists on disk, but not in the index"
440e7442 8061msgstr "路径 '%s' 在磁盘上,但不在索引里"
2b472aae 8062
d9488fea 8063#: sha1-name.c:1771
2b472aae
JX
8064#, c-format
8065msgid "path '%s' does not exist (neither on disk nor in the index)"
440e7442 8066msgstr "路径 '%s' 不存在(既不在磁盘上,也不在索引中)"
2b472aae 8067
d9488fea 8068#: sha1-name.c:1784
2b472aae
JX
8069msgid "relative path syntax can't be used outside working tree"
8070msgstr "不能在工作区之外使用相对路径语法"
8071
d9488fea 8072#: sha1-name.c:1922
2b472aae
JX
8073#, c-format
8074msgid "invalid object name '%.*s'."
8075msgstr "无效的对象名 '%.*s'。"
8076
a6cd2cc4 8077#. TRANSLATORS: IEC 80000-13:2008 gibibyte
7157c2b5 8078#: strbuf.c:848
a6cd2cc4
JX
8079#, c-format
8080msgid "%u.%2.2u GiB"
8081msgstr "%u.%2.2u GiB"
8082
8083#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
7157c2b5 8084#: strbuf.c:850
a6cd2cc4
JX
8085#, c-format
8086msgid "%u.%2.2u GiB/s"
8087msgstr "%u.%2.2u GiB/s"
8088
8089#. TRANSLATORS: IEC 80000-13:2008 mebibyte
7157c2b5 8090#: strbuf.c:858
a6cd2cc4
JX
8091#, c-format
8092msgid "%u.%2.2u MiB"
8093msgstr "%u.%2.2u MiB"
8094
8095#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
7157c2b5 8096#: strbuf.c:860
a6cd2cc4
JX
8097#, c-format
8098msgid "%u.%2.2u MiB/s"
8099msgstr "%u.%2.2u MiB/s"
8100
8101#. TRANSLATORS: IEC 80000-13:2008 kibibyte
7157c2b5 8102#: strbuf.c:867
a6cd2cc4
JX
8103#, c-format
8104msgid "%u.%2.2u KiB"
8105msgstr "%u.%2.2u KiB"
8106
8107#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
7157c2b5 8108#: strbuf.c:869
a6cd2cc4
JX
8109#, c-format
8110msgid "%u.%2.2u KiB/s"
8111msgstr "%u.%2.2u KiB/s"
8112
8113#. TRANSLATORS: IEC 80000-13:2008 byte
7157c2b5 8114#: strbuf.c:875
a6cd2cc4
JX
8115#, c-format
8116msgid "%u byte"
8117msgid_plural "%u bytes"
8118msgstr[0] "%u 字节"
8119msgstr[1] "%u 字节"
8120
8121#. TRANSLATORS: IEC 80000-13:2008 byte/second
7157c2b5 8122#: strbuf.c:877
a6cd2cc4
JX
8123#, c-format
8124msgid "%u byte/s"
8125msgid_plural "%u bytes/s"
8126msgstr[0] "%u 字节/秒"
8127msgstr[1] "%u 字节/秒"
a0b6b246 8128
d9488fea
JX
8129#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733
8130#: builtin/rebase.c:858
8131#, c-format
8132msgid "could not open '%s' for writing"
8133msgstr "无法打开 '%s' 进行写入"
8134
7157c2b5 8135#: strbuf.c:1175
ddc12c42
JX
8136#, c-format
8137msgid "could not edit '%s'"
8138msgstr "不能编辑 '%s'"
8139
349ede6a
JX
8140#: submodule-config.c:237
8141#, c-format
8142msgid "ignoring suspicious submodule name: %s"
8143msgstr "忽略可疑的子模组名称:%s"
8144
8145#: submodule-config.c:304
8146msgid "negative values not allowed for submodule.fetchjobs"
8147msgstr "submodule.fetchjobs 不允许为负值"
8148
8149#: submodule-config.c:402
8150#, c-format
8151msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
8152msgstr "忽略可能被解析为命令行选项的 '%s':%s"
8153
8154#: submodule-config.c:499
8155#, c-format
8156msgid "invalid value for %s"
8157msgstr "%s 的值无效"
8158
8159#: submodule-config.c:766
8160#, c-format
8161msgid "Could not update .gitmodules entry %s"
8162msgstr "不能更新 .gitmodules 条目 %s"
8163
06991777 8164#: submodule.c:114 submodule.c:143
a0b6b246
JX
8165msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
8166msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
8167
06991777 8168#: submodule.c:118 submodule.c:147
a0b6b246
JX
8169#, c-format
8170msgid "Could not find section in .gitmodules where path=%s"
8171msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
8172
06991777 8173#: submodule.c:154
a0b6b246
JX
8174#, c-format
8175msgid "Could not remove .gitmodules entry for %s"
8176msgstr "无法移除 %s 的 .gitmodules 条目"
8177
06991777 8178#: submodule.c:165
a0b6b246
JX
8179msgid "staging updated .gitmodules failed"
8180msgstr "将更新后 .gitmodules 添加暂存区失败"
8181
06991777 8182#: submodule.c:327
a4f16749
JX
8183#, c-format
8184msgid "in unpopulated submodule '%s'"
8185msgstr "位于未检出的子模组 '%s'"
8186
06991777 8187#: submodule.c:358
a4f16749
JX
8188#, c-format
8189msgid "Pathspec '%s' is in submodule '%.*s'"
8190msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
8191
2b472aae
JX
8192#: submodule.c:434
8193#, c-format
8194msgid "bad --ignore-submodules argument: %s"
8195msgstr "坏的 --ignore-submodules 参数:%s"
8196
d9488fea 8197#: submodule.c:816
2b472aae
JX
8198#, c-format
8199msgid ""
8200"Submodule in commit %s at path: '%s' collides with a submodule named the "
8201"same. Skipping it."
440e7442 8202msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。"
2b472aae 8203
d9488fea 8204#: submodule.c:919
6937cb4e
JX
8205#, c-format
8206msgid "submodule entry '%s' (%s) is a %s, not a commit"
493a9322 8207msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交"
6937cb4e 8208
d9488fea 8209#: submodule.c:1004
2b472aae
JX
8210#, c-format
8211msgid ""
8212"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
8213"submodule %s"
440e7442 8214msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes -n 1'"
2b472aae 8215
d9488fea 8216#: submodule.c:1127
2b472aae
JX
8217#, c-format
8218msgid "process for submodule '%s' failed"
440e7442 8219msgstr "处理子模组 '%s' 失败"
2b472aae 8220
d9488fea 8221#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469
6937cb4e
JX
8222msgid "Failed to resolve HEAD as a valid ref."
8223msgstr "无法将 HEAD 解析为有效引用。"
8224
d9488fea 8225#: submodule.c:1167
06991777 8226#, c-format
2b472aae
JX
8227msgid "Pushing submodule '%s'\n"
8228msgstr "正在推送子模组 '%s'\n"
06991777 8229
d9488fea 8230#: submodule.c:1170
2b472aae
JX
8231#, c-format
8232msgid "Unable to push submodule '%s'\n"
8233msgstr "无法推送子模组 '%s'\n"
8234
d9488fea 8235#: submodule.c:1462
2b472aae
JX
8236#, c-format
8237msgid "Fetching submodule %s%s\n"
8238msgstr "正在获取子模组 %s%s\n"
8239
d9488fea 8240#: submodule.c:1492
2b472aae
JX
8241#, c-format
8242msgid "Could not access submodule '%s'\n"
8243msgstr "无法访问子模组 '%s'\n"
8244
d9488fea 8245#: submodule.c:1646
2b472aae
JX
8246#, c-format
8247msgid ""
8248"Errors during submodule fetch:\n"
8249"%s"
8250msgstr ""
8251"获取子模组时的错误:\n"
8252"%s"
8253
d9488fea 8254#: submodule.c:1671
1a79b2f1 8255#, c-format
87cb7997 8256msgid "'%s' not recognized as a git repository"
d9488fea 8257msgstr "无法将 '%s' 识别为 git 仓库"
1a79b2f1 8258
d9488fea 8259#: submodule.c:1688
2b472aae
JX
8260#, c-format
8261msgid "Could not run 'git status --porcelain=2' in submodule %s"
8262msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'"
8263
d9488fea 8264#: submodule.c:1729
2b472aae
JX
8265#, c-format
8266msgid "'git status --porcelain=2' failed in submodule %s"
8267msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败"
8268
d9488fea 8269#: submodule.c:1804
1a79b2f1 8270#, c-format
87cb7997
JX
8271msgid "could not start 'git status' in submodule '%s'"
8272msgstr "无法在子模组 '%s' 中启动 'git status'"
1a79b2f1 8273
d9488fea 8274#: submodule.c:1817
87cb7997
JX
8275#, c-format
8276msgid "could not run 'git status' in submodule '%s'"
8277msgstr "无法在子模组 '%s' 中执行 'git status'"
8278
d9488fea 8279#: submodule.c:1832
06991777
JX
8280#, c-format
8281msgid "Could not unset core.worktree setting in submodule '%s'"
8282msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
8283
d9488fea 8284#: submodule.c:1859 submodule.c:2169
2b472aae
JX
8285#, c-format
8286msgid "could not recurse into submodule '%s'"
8287msgstr "无法递归进子模组路径 '%s'"
8288
d9488fea 8289#: submodule.c:1880
2b472aae
JX
8290msgid "could not reset submodule index"
8291msgstr "无法重置子模组索引"
8292
d9488fea 8293#: submodule.c:1922
87cb7997
JX
8294#, c-format
8295msgid "submodule '%s' has dirty index"
8296msgstr "子模组 '%s' 中有脏索引"
8297
d9488fea 8298#: submodule.c:1974
c1ac5258
JX
8299#, c-format
8300msgid "Submodule '%s' could not be updated."
8301msgstr "子模组 '%s' 无法被更新。"
8302
d9488fea 8303#: submodule.c:2042
ddc12c42
JX
8304#, c-format
8305msgid "submodule git dir '%s' is inside git dir '%.*s'"
8306msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中"
8307
d9488fea 8308#: submodule.c:2063
1a79b2f1
JX
8309#, c-format
8310msgid ""
8311"relocate_gitdir for submodule '%s' with more than one worktree not supported"
8312msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
8313
d9488fea 8314#: submodule.c:2075 submodule.c:2134
1a79b2f1
JX
8315#, c-format
8316msgid "could not lookup name for submodule '%s'"
8317msgstr "不能查询子模组 '%s' 的名称"
8318
d9488fea 8319#: submodule.c:2079
ddc12c42
JX
8320#, c-format
8321msgid "refusing to move '%s' into an existing git dir"
8322msgstr "禁止移动 '%s' 到现存 git 目录中"
8323
d9488fea 8324#: submodule.c:2086
1a79b2f1
JX
8325#, c-format
8326msgid ""
8327"Migrating git directory of '%s%s' from\n"
8328"'%s' to\n"
8329"'%s'\n"
8330msgstr ""
8331"将 '%s%s' 的 git 目录从\n"
8332"'%s' 迁移至\n"
8333"'%s'\n"
8334
d9488fea 8335#: submodule.c:2214
87cb7997
JX
8336msgid "could not start ls-files in .."
8337msgstr "无法在 .. 中启动 ls-files"
8338
d9488fea 8339#: submodule.c:2254
87cb7997
JX
8340#, c-format
8341msgid "ls-tree returned unexpected return code %d"
8342msgstr "ls-tree 返回未知返回值 %d"
8343
d9488fea 8344#: trailer.c:236
a0b6b246
JX
8345#, c-format
8346msgid "running trailer command '%s' failed"
8347msgstr "执行 trailer 命令 '%s' 失败"
8348
d9488fea
JX
8349#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551
8350#: trailer.c:555
a0b6b246
JX
8351#, c-format
8352msgid "unknown value '%s' for key '%s'"
8353msgstr "键 '%2$s' 的未知取值 '%1$s'"
8354
d9488fea 8355#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323
a0b6b246
JX
8356#, c-format
8357msgid "more than one %s"
8358msgstr "多于一个 %s"
8359
d9488fea 8360#: trailer.c:728
a0b6b246
JX
8361#, c-format
8362msgid "empty trailer token in trailer '%.*s'"
8363msgstr "签名 '%.*s' 的键为空"
8364
d9488fea 8365#: trailer.c:748
a0b6b246
JX
8366#, c-format
8367msgid "could not read input file '%s'"
8368msgstr "不能读取输入文件 '%s'"
8369
d9488fea 8370#: trailer.c:751
a0b6b246
JX
8371msgid "could not read from stdin"
8372msgstr "不能自标准输入读取"
8373
d9488fea 8374#: trailer.c:1009 wrapper.c:676
a0b6b246
JX
8375#, c-format
8376msgid "could not stat %s"
65e2041e 8377msgstr "不能对 %s 调用 stat"
a0b6b246 8378
d9488fea 8379#: trailer.c:1011
a0b6b246
JX
8380#, c-format
8381msgid "file %s is not a regular file"
8382msgstr "文件 %s 不是一个正规文件"
8383
d9488fea 8384#: trailer.c:1013
a0b6b246
JX
8385#, c-format
8386msgid "file %s is not writable by user"
8387msgstr "文件 %s 用户不可写"
8388
d9488fea 8389#: trailer.c:1025
a0b6b246
JX
8390msgid "could not open temporary file"
8391msgstr "不能打开临时文件"
8392
d9488fea 8393#: trailer.c:1065
a0b6b246
JX
8394#, c-format
8395msgid "could not rename temporary file to %s"
8396msgstr "不能重命名临时文件为 %s"
8397
7157c2b5 8398#: transport-helper.c:62 transport-helper.c:91
c1ac5258
JX
8399msgid "full write to remote helper failed"
8400msgstr "完整写入远程助手失败"
8401
7157c2b5 8402#: transport-helper.c:145
c1ac5258
JX
8403#, c-format
8404msgid "unable to find remote helper for '%s'"
8405msgstr "无法为 '%s' 找到远程助手"
8406
7157c2b5 8407#: transport-helper.c:161 transport-helper.c:575
c1ac5258
JX
8408msgid "can't dup helper output fd"
8409msgstr "无法复制助手输出文件句柄"
8410
7157c2b5 8411#: transport-helper.c:214
c1ac5258
JX
8412#, c-format
8413msgid ""
8414"unknown mandatory capability %s; this remote helper probably needs newer "
8415"version of Git"
8416msgstr "未知的强制能力 %s,该远程助手可能需要新版本的Git"
8417
7157c2b5 8418#: transport-helper.c:220
c1ac5258
JX
8419msgid "this remote helper should implement refspec capability"
8420msgstr "远程助手需要实现 refspec 能力"
8421
7157c2b5 8422#: transport-helper.c:287 transport-helper.c:429
c1ac5258
JX
8423#, c-format
8424msgid "%s unexpectedly said: '%s'"
8425msgstr "%s 意外地说:'%s'"
8426
7157c2b5 8427#: transport-helper.c:417
c1ac5258
JX
8428#, c-format
8429msgid "%s also locked %s"
8430msgstr "%s 也锁定了 %s"
8431
7157c2b5 8432#: transport-helper.c:497
c1ac5258
JX
8433msgid "couldn't run fast-import"
8434msgstr "不能执行 fast-import"
8435
7157c2b5 8436#: transport-helper.c:520
c1ac5258
JX
8437msgid "error while running fast-import"
8438msgstr "执行 fast-import 出错"
8439
d9488fea 8440#: transport-helper.c:549 transport-helper.c:1226
c1ac5258
JX
8441#, c-format
8442msgid "could not read ref %s"
8443msgstr "无法读取引用 %s"
8444
7157c2b5 8445#: transport-helper.c:594
c1ac5258
JX
8446#, c-format
8447msgid "unknown response to connect: %s"
8448msgstr "连接时未知的响应:%s"
8449
7157c2b5 8450#: transport-helper.c:616
c1ac5258
JX
8451msgid "setting remote service path not supported by protocol"
8452msgstr "协议不支持设置远程服务路径"
8453
7157c2b5 8454#: transport-helper.c:618
c1ac5258
JX
8455msgid "invalid remote service path"
8456msgstr "无效的远程服务路径"
8457
d9488fea 8458#: transport-helper.c:661 transport.c:1428
349ede6a
JX
8459msgid "operation not supported by protocol"
8460msgstr "协议不支持该操作"
8461
7157c2b5 8462#: transport-helper.c:664
c1ac5258
JX
8463#, c-format
8464msgid "can't connect to subservice %s"
8465msgstr "不能连接到子服务 %s"
8466
d9488fea
JX
8467#: transport-helper.c:745
8468msgid "'option' without a matching 'ok/error' directive"
8469msgstr "'option' 缺乏一个匹配的 'ok/error' 指令"
8470
8471#: transport-helper.c:788
c1ac5258
JX
8472#, c-format
8473msgid "expected ok/error, helper said '%s'"
8474msgstr "预期 ok/error,助手说 '%s'"
8475
d9488fea 8476#: transport-helper.c:841
c1ac5258
JX
8477#, c-format
8478msgid "helper reported unexpected status of %s"
8479msgstr "助手报告 %s 的意外状态"
8480
d9488fea 8481#: transport-helper.c:924
a0b6b246 8482#, c-format
c1ac5258
JX
8483msgid "helper %s does not support dry-run"
8484msgstr "助手 %s 不支持 dry-run"
a0b6b246 8485
d9488fea 8486#: transport-helper.c:927
c1ac5258
JX
8487#, c-format
8488msgid "helper %s does not support --signed"
8489msgstr "助手 %s 不支持 --signed"
8490
d9488fea 8491#: transport-helper.c:930
c1ac5258
JX
8492#, c-format
8493msgid "helper %s does not support --signed=if-asked"
8494msgstr "助手 %s 不支持 --signed=if-asked"
8495
d9488fea 8496#: transport-helper.c:935
a5cd71ca
JX
8497#, c-format
8498msgid "helper %s does not support --atomic"
8499msgstr "助手 %s 不支持 --atomic"
8500
d9488fea 8501#: transport-helper.c:941
c1ac5258
JX
8502#, c-format
8503msgid "helper %s does not support 'push-option'"
8504msgstr "助手 %s 不支持 'push-option'"
8505
d9488fea 8506#: transport-helper.c:1040
c1ac5258
JX
8507msgid "remote-helper doesn't support push; refspec needed"
8508msgstr "remote-heper 不支持 push,需要引用表达式"
8509
d9488fea 8510#: transport-helper.c:1045
c1ac5258
JX
8511#, c-format
8512msgid "helper %s does not support 'force'"
8513msgstr "助手 %s 不支持 'force'"
8514
d9488fea 8515#: transport-helper.c:1092
c1ac5258
JX
8516msgid "couldn't run fast-export"
8517msgstr "无法执行 fast-export"
8518
d9488fea 8519#: transport-helper.c:1097
c1ac5258
JX
8520msgid "error while running fast-export"
8521msgstr "执行 fast-export 时出错"
8522
d9488fea 8523#: transport-helper.c:1122
c1ac5258
JX
8524#, c-format
8525msgid ""
8526"No refs in common and none specified; doing nothing.\n"
7157c2b5 8527"Perhaps you should specify a branch.\n"
c1ac5258
JX
8528msgstr ""
8529"没有共同的引用并且也没有指定,什么也不会做。\n"
7157c2b5
JX
8530"也许您应该指定一个分支。\n"
8531
d9488fea 8532#: transport-helper.c:1203
7157c2b5
JX
8533#, c-format
8534msgid "unsupported object format '%s'"
8535msgstr "不支持的对象格式 '%s'"
c1ac5258 8536
d9488fea 8537#: transport-helper.c:1212
c1ac5258
JX
8538#, c-format
8539msgid "malformed response in ref list: %s"
8540msgstr "引用列表中格式错误的响应:%s"
8541
d9488fea 8542#: transport-helper.c:1364
c1ac5258
JX
8543#, c-format
8544msgid "read(%s) failed"
8545msgstr "读取(%s)失败"
8546
d9488fea 8547#: transport-helper.c:1391
c1ac5258
JX
8548#, c-format
8549msgid "write(%s) failed"
8550msgstr "写(%s)失败"
8551
d9488fea 8552#: transport-helper.c:1440
c1ac5258
JX
8553#, c-format
8554msgid "%s thread failed"
8555msgstr "%s 线程失败"
8556
d9488fea 8557#: transport-helper.c:1444
c1ac5258
JX
8558#, c-format
8559msgid "%s thread failed to join: %s"
e640d114 8560msgstr "%s 线程等待失败:%s"
c1ac5258 8561
d9488fea 8562#: transport-helper.c:1463 transport-helper.c:1467
c1ac5258
JX
8563#, c-format
8564msgid "can't start thread for copying data: %s"
8565msgstr "不能启动线程来拷贝数据:%s"
8566
d9488fea 8567#: transport-helper.c:1504
c1ac5258
JX
8568#, c-format
8569msgid "%s process failed to wait"
8570msgstr "%s 进程等待失败"
8571
d9488fea 8572#: transport-helper.c:1508
c1ac5258
JX
8573#, c-format
8574msgid "%s process failed"
8575msgstr "%s 进程失败"
8576
d9488fea 8577#: transport-helper.c:1526 transport-helper.c:1535
c1ac5258
JX
8578msgid "can't start thread for copying data"
8579msgstr "不能启动线程来拷贝数据"
8580
349ede6a
JX
8581#: transport.c:116
8582#, c-format
8583msgid "Would set upstream of '%s' to '%s' of '%s'\n"
8584msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
8585
8586#: transport.c:145
8587#, c-format
8588msgid "could not read bundle '%s'"
d9488fea 8589msgstr "无法读取归档包 '%s'"
349ede6a 8590
7157c2b5 8591#: transport.c:220
349ede6a
JX
8592#, c-format
8593msgid "transport: invalid depth option '%s'"
8594msgstr "传输:无效的深度选项 '%s'"
8595
d9488fea 8596#: transport.c:269
349ede6a
JX
8597msgid "see protocol.version in 'git help config' for more details"
8598msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
8599
d9488fea 8600#: transport.c:270
349ede6a
JX
8601msgid "server options require protocol version 2 or later"
8602msgstr "服务端选项需要版本 2 协议或更高"
8603
d9488fea 8604#: transport.c:712
349ede6a
JX
8605msgid "could not parse transport.color.* config"
8606msgstr "不能解析 transport.color.* 配置"
8607
d9488fea 8608#: transport.c:785
349ede6a
JX
8609msgid "support for protocol v2 not implemented yet"
8610msgstr "协议 v2 的支持尚未实现"
8611
d9488fea 8612#: transport.c:919
349ede6a
JX
8613#, c-format
8614msgid "unknown value for config '%s': %s"
8615msgstr "配置 '%s' 的取值未知:%s"
8616
d9488fea 8617#: transport.c:985
349ede6a
JX
8618#, c-format
8619msgid "transport '%s' not allowed"
8620msgstr "传输 '%s' 不允许"
8621
d9488fea 8622#: transport.c:1038
349ede6a
JX
8623msgid "git-over-rsync is no longer supported"
8624msgstr "不再支持 git-over-rsync"
8625
d9488fea 8626#: transport.c:1140
349ede6a
JX
8627#, c-format
8628msgid ""
8629"The following submodule paths contain changes that can\n"
8630"not be found on any remote:\n"
8631msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
8632
d9488fea 8633#: transport.c:1144
349ede6a
JX
8634#, c-format
8635msgid ""
8636"\n"
8637"Please try\n"
8638"\n"
8639"\tgit push --recurse-submodules=on-demand\n"
8640"\n"
8641"or cd to the path and use\n"
8642"\n"
8643"\tgit push\n"
8644"\n"
8645"to push them to a remote.\n"
8646"\n"
8647msgstr ""
8648"\n"
8649"请尝试\n"
8650"\n"
8651"\tgit push --recurse-submodules=on-demand\n"
8652"\n"
8653"或者进入到子目录执行\n"
8654"\n"
8655"\tgit push\n"
8656"\n"
8657"以推送至远程。\n"
8658"\n"
8659
d9488fea 8660#: transport.c:1152
349ede6a
JX
8661msgid "Aborting."
8662msgstr "正在终止。"
8663
d9488fea 8664#: transport.c:1297
349ede6a
JX
8665msgid "failed to push all needed submodules"
8666msgstr "不能推送全部需要的子模组"
8667
2b472aae 8668#: tree-walk.c:32
a0b6b246
JX
8669msgid "too-short tree object"
8670msgstr "太短的树对象"
8671
2b472aae 8672#: tree-walk.c:38
a0b6b246 8673msgid "malformed mode in tree entry"
29004bbb 8674msgstr "树对象中的条目模式错误"
a0b6b246 8675
2b472aae 8676#: tree-walk.c:42
a0b6b246
JX
8677msgid "empty filename in tree entry"
8678msgstr "树对象条目中空的文件名"
8679
2b472aae 8680#: tree-walk.c:117
a0b6b246
JX
8681msgid "too-short tree file"
8682msgstr "太短的树文件"
8683
349ede6a 8684#: unpack-trees.c:113
a0b6b246
JX
8685#, c-format
8686msgid ""
8687"Your local changes to the following files would be overwritten by checkout:\n"
8688"%%sPlease commit your changes or stash them before you switch branches."
8689msgstr ""
8690"您对下列文件的本地修改将被检出操作覆盖:\n"
a4f16749 8691"%%s请在切换分支前提交或贮藏您的修改。"
a0b6b246 8692
349ede6a 8693#: unpack-trees.c:115
a0b6b246
JX
8694#, c-format
8695msgid ""
8696"Your local changes to the following files would be overwritten by checkout:\n"
8697"%%s"
8698msgstr ""
8699"您对下列文件的本地修改将被检出操作覆盖:\n"
8700"%%s"
8701
349ede6a 8702#: unpack-trees.c:118
a0b6b246
JX
8703#, c-format
8704msgid ""
8705"Your local changes to the following files would be overwritten by merge:\n"
8706"%%sPlease commit your changes or stash them before you merge."
8707msgstr ""
8708"您对下列文件的本地修改将被合并操作覆盖:\n"
a4f16749 8709"%%s请在合并前提交或贮藏您的修改。"
a0b6b246 8710
349ede6a 8711#: unpack-trees.c:120
a0b6b246
JX
8712#, c-format
8713msgid ""
8714"Your local changes to the following files would be overwritten by merge:\n"
8715"%%s"
8716msgstr ""
8717"您对下列文件的本地修改将被合并操作覆盖:\n"
8718"%%s"
8719
349ede6a 8720#: unpack-trees.c:123
a0b6b246
JX
8721#, c-format
8722msgid ""
8723"Your local changes to the following files would be overwritten by %s:\n"
8724"%%sPlease commit your changes or stash them before you %s."
8725msgstr ""
8726"您对下列文件的本地修改将被 %s 覆盖:\n"
a4f16749 8727"%%s请在 %s 之前提交或贮藏您的修改。"
6792b93b 8728
349ede6a 8729#: unpack-trees.c:125
a0b6b246
JX
8730#, c-format
8731msgid ""
8732"Your local changes to the following files would be overwritten by %s:\n"
8733"%%s"
8734msgstr ""
8735"您对下列文件的本地修改将被 %s 覆盖:\n"
8736"%%s"
c04f5ac3 8737
349ede6a 8738#: unpack-trees.c:130
a0b6b246
JX
8739#, c-format
8740msgid ""
1a79b2f1 8741"Updating the following directories would lose untracked files in them:\n"
a0b6b246
JX
8742"%s"
8743msgstr ""
8744"更新如下目录将会丢失其中未跟踪的文件:\n"
8745"%s"
1b7f4a34 8746
349ede6a 8747#: unpack-trees.c:134
a0b6b246
JX
8748#, c-format
8749msgid ""
8750"The following untracked working tree files would be removed by checkout:\n"
8751"%%sPlease move or remove them before you switch branches."
8752msgstr ""
8753"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
8754"%%s请在切换分支之前移动或删除。"
2e8451e8 8755
349ede6a 8756#: unpack-trees.c:136
a0b6b246
JX
8757#, c-format
8758msgid ""
8759"The following untracked working tree files would be removed by checkout:\n"
8760"%%s"
8761msgstr ""
8762"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
8763"%%s"
1003b3a5 8764
349ede6a 8765#: unpack-trees.c:139
a0b6b246
JX
8766#, c-format
8767msgid ""
8768"The following untracked working tree files would be removed by merge:\n"
8769"%%sPlease move or remove them before you merge."
8770msgstr ""
8771"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
8772"%%s请在合并前移动或删除。"
1003b3a5 8773
349ede6a 8774#: unpack-trees.c:141
a0b6b246
JX
8775#, c-format
8776msgid ""
8777"The following untracked working tree files would be removed by merge:\n"
8778"%%s"
8779msgstr ""
8780"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
8781"%%s"
c04f5ac3 8782
349ede6a 8783#: unpack-trees.c:144
a0b6b246
JX
8784#, c-format
8785msgid ""
8786"The following untracked working tree files would be removed by %s:\n"
8787"%%sPlease move or remove them before you %s."
8788msgstr ""
8789"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
8790"%%s请在 %s 前移动或删除。"
c04f5ac3 8791
349ede6a 8792#: unpack-trees.c:146
a0b6b246
JX
8793#, c-format
8794msgid ""
8795"The following untracked working tree files would be removed by %s:\n"
8796"%%s"
8797msgstr ""
8798"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
8799"%%s"
c04f5ac3 8800
349ede6a 8801#: unpack-trees.c:152
a0b6b246
JX
8802#, c-format
8803msgid ""
8804"The following untracked working tree files would be overwritten by "
8805"checkout:\n"
8806"%%sPlease move or remove them before you switch branches."
8807msgstr ""
8808"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
8809"%%s请在切换分支前移动或删除。"
c04f5ac3 8810
349ede6a 8811#: unpack-trees.c:154
1003b3a5 8812#, c-format
4dcdc3d8 8813msgid ""
a0b6b246
JX
8814"The following untracked working tree files would be overwritten by "
8815"checkout:\n"
8816"%%s"
4dcdc3d8 8817msgstr ""
a0b6b246
JX
8818"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
8819"%%s"
1003b3a5 8820
349ede6a 8821#: unpack-trees.c:157
c04f5ac3 8822#, c-format
a0b6b246
JX
8823msgid ""
8824"The following untracked working tree files would be overwritten by merge:\n"
8825"%%sPlease move or remove them before you merge."
8826msgstr ""
8827"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
8828"%%s请在合并前移动或删除。"
c04f5ac3 8829
349ede6a 8830#: unpack-trees.c:159
a0b6b246
JX
8831#, c-format
8832msgid ""
8833"The following untracked working tree files would be overwritten by merge:\n"
8834"%%s"
8835msgstr ""
8836"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
8837"%%s"
c04f5ac3 8838
349ede6a 8839#: unpack-trees.c:162
a0b6b246
JX
8840#, c-format
8841msgid ""
8842"The following untracked working tree files would be overwritten by %s:\n"
8843"%%sPlease move or remove them before you %s."
8844msgstr ""
8845"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
8846"%%s请在 %s 前移动或删除。"
c04f5ac3 8847
349ede6a 8848#: unpack-trees.c:164
07432cef 8849#, c-format
a0b6b246
JX
8850msgid ""
8851"The following untracked working tree files would be overwritten by %s:\n"
8852"%%s"
8853msgstr ""
8854"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
8855"%%s"
c04f5ac3 8856
349ede6a 8857#: unpack-trees.c:172
07432cef 8858#, c-format
a0b6b246
JX
8859msgid "Entry '%s' overlaps with '%s'. Cannot bind."
8860msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
c04f5ac3 8861
349ede6a 8862#: unpack-trees.c:175
07432cef 8863#, c-format
ef317cd5 8864msgid ""
349ede6a 8865"Cannot update submodule:\n"
a0b6b246
JX
8866"%s"
8867msgstr ""
349ede6a 8868"无法更新子模组:\n"
a0b6b246 8869"%s"
c04f5ac3 8870
349ede6a 8871#: unpack-trees.c:178
07432cef 8872#, c-format
a0b6b246 8873msgid ""
349ede6a
JX
8874"The following paths are not up to date and were left despite sparse "
8875"patterns:\n"
a0b6b246
JX
8876"%s"
8877msgstr ""
349ede6a 8878"尽管存在稀疏检出模板,以下路径不是最新,因而保留:\n"
a0b6b246 8879"%s"
c04f5ac3 8880
349ede6a 8881#: unpack-trees.c:180
07432cef 8882#, c-format
a0b6b246 8883msgid ""
349ede6a 8884"The following paths are unmerged and were left despite sparse patterns:\n"
a0b6b246
JX
8885"%s"
8886msgstr ""
349ede6a 8887"尽管存在稀疏检出模板,以下路径处于未合并状态,因而保留:\n"
a0b6b246 8888"%s"
c04f5ac3 8889
349ede6a 8890#: unpack-trees.c:182
87cb7997
JX
8891#, c-format
8892msgid ""
349ede6a
JX
8893"The following paths were already present and thus not updated despite sparse "
8894"patterns:\n"
87cb7997
JX
8895"%s"
8896msgstr ""
349ede6a 8897"尽管存在稀疏检出模板,以下路径已经存在,因而未更新:\n"
87cb7997
JX
8898"%s"
8899
349ede6a 8900#: unpack-trees.c:262
07432cef 8901#, c-format
a0b6b246 8902msgid "Aborting\n"
a6cd2cc4 8903msgstr "正在终止\n"
ef317cd5 8904
349ede6a
JX
8905#: unpack-trees.c:289
8906#, c-format
8907msgid ""
8908"After fixing the above paths, you may want to run `git sparse-checkout "
8909"reapply`.\n"
8910msgstr "在修复上述路径之后,你可能要执行 `git sparse-checkout reapply`。\n"
8911
8912#: unpack-trees.c:350
a6cd2cc4
JX
8913msgid "Updating files"
8914msgstr "正在更新文件"
c04f5ac3 8915
349ede6a 8916#: unpack-trees.c:382
4c27fcb5
JX
8917msgid ""
8918"the following paths have collided (e.g. case-sensitive paths\n"
8919"on a case-insensitive filesystem) and only one from the same\n"
8920"colliding group is in the working tree:\n"
8921msgstr ""
8922"以下路径发生碰撞(如:在不区分大小写的文件系统上的区分大小写的路径),\n"
8923"并且碰撞组中只有一个文件存在工作区中:\n"
8924
349ede6a 8925#: unpack-trees.c:1498
ddc12c42
JX
8926msgid "Updating index flags"
8927msgstr "正在更新索引标志"
8928
d9488fea 8929#: upload-pack.c:1516
349ede6a
JX
8930msgid "expected flush after fetch arguments"
8931msgstr "在 fetch 参数之后应该有一个 flush 包"
8932
87cb7997 8933#: urlmatch.c:163
a0b6b246
JX
8934msgid "invalid URL scheme name or missing '://' suffix"
8935msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
8936
87cb7997 8937#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
07432cef 8938#, c-format
a0b6b246
JX
8939msgid "invalid %XX escape sequence"
8940msgstr "无效的 %XX 转义序列"
c04f5ac3 8941
87cb7997 8942#: urlmatch.c:215
a0b6b246
JX
8943msgid "missing host and scheme is not 'file:'"
8944msgstr "缺失主机名且 URL 方案不是 'file:'"
c04f5ac3 8945
87cb7997 8946#: urlmatch.c:232
a0b6b246
JX
8947msgid "a 'file:' URL may not have a port number"
8948msgstr "一个 'file:' URL 不应该包含端口号"
94550ed3 8949
87cb7997 8950#: urlmatch.c:247
a0b6b246
JX
8951msgid "invalid characters in host name"
8952msgstr "主机名中包含无效的字符"
90314792 8953
87cb7997 8954#: urlmatch.c:292 urlmatch.c:303
a0b6b246
JX
8955msgid "invalid port number"
8956msgstr "无效的端口号"
c04f5ac3 8957
87cb7997 8958#: urlmatch.c:371
a0b6b246
JX
8959msgid "invalid '..' path segment"
8960msgstr "无效的 '..' 路径片段"
5c0c220c 8961
2b472aae
JX
8962#: walker.c:170
8963msgid "Fetching objects"
8964msgstr "正在获取对象"
8965
d9488fea 8966#: worktree.c:236 builtin/am.c:2116
a77c07d9 8967#, c-format
a0b6b246 8968msgid "failed to read '%s'"
c1ac5258 8969msgstr "读取 '%s' 失败"
ef317cd5 8970
d9488fea 8971#: worktree.c:283
31e5e17b
JX
8972#, c-format
8973msgid "'%s' at main working tree is not the repository directory"
8974msgstr "在主工作区的 '%s' 不是仓库目录"
8975
d9488fea 8976#: worktree.c:294
31e5e17b
JX
8977#, c-format
8978msgid "'%s' file does not contain absolute path to the working tree location"
8979msgstr "文件 '%s' 不包含工作区的绝对路径"
8980
d9488fea 8981#: worktree.c:306
31e5e17b
JX
8982#, c-format
8983msgid "'%s' does not exist"
8984msgstr "'%s' 不存在"
8985
d9488fea 8986#: worktree.c:312
31e5e17b
JX
8987#, c-format
8988msgid "'%s' is not a .git file, error code %d"
8989msgstr "'%s' 不是一个 .git 文件,错误码 %d"
8990
d9488fea 8991#: worktree.c:321
31e5e17b
JX
8992#, c-format
8993msgid "'%s' does not point back to '%s'"
8994msgstr "'%s' 没有指回到 '%s'"
8995
d9488fea
JX
8996#: worktree.c:587
8997msgid "not a directory"
8998msgstr "不是一个目录"
8999
9000#: worktree.c:596
9001msgid ".git is not a file"
9002msgstr ".git 不是一个文件"
9003
9004#: worktree.c:598
9005msgid ".git file broken"
9006msgstr ".git 文件损坏"
9007
9008#: worktree.c:600
9009msgid ".git file incorrect"
9010msgstr ".git 文件不正确"
9011
9012#: worktree.c:670
9013msgid "not a valid path"
9014msgstr "不是一个有效的路径"
9015
9016#: worktree.c:676
9017msgid "unable to locate repository; .git is not a file"
9018msgstr "无法定位仓库,.git 不是一个文件"
9019
9020#: worktree.c:679
9021msgid "unable to locate repository; .git file broken"
9022msgstr "无法定位仓库,.git 文件损坏"
9023
9024#: worktree.c:685
9025msgid "gitdir unreadable"
9026msgstr "gitdir 不可读"
9027
9028#: worktree.c:689
9029msgid "gitdir incorrect"
9030msgstr "gitdir 不正确"
9031
9032#: wrapper.c:197 wrapper.c:367
c04f5ac3 9033#, c-format
a0b6b246
JX
9034msgid "could not open '%s' for reading and writing"
9035msgstr "无法打开 '%s' 进行读写"
c04f5ac3 9036
d9488fea 9037#: wrapper.c:398 wrapper.c:599
a0b6b246
JX
9038#, c-format
9039msgid "unable to access '%s'"
9040msgstr "不能访问 '%s'"
c04f5ac3 9041
d9488fea 9042#: wrapper.c:607
a0b6b246
JX
9043msgid "unable to get current working directory"
9044msgstr "不能获取当前工作目录"
c04f5ac3 9045
a6cd2cc4 9046#: wt-status.c:158
a0b6b246
JX
9047msgid "Unmerged paths:"
9048msgstr "未合并的路径:"
7aea43ff 9049
a0b6b246 9050# 译者:注意保持前导空格
a6cd2cc4
JX
9051#: wt-status.c:187 wt-status.c:219
9052msgid " (use \"git restore --staged <file>...\" to unstage)"
9053msgstr " (使用 \"git restore --staged <文件>...\" 以取消暂存)"
9054
9055# 译者:注意保持前导空格
9056#: wt-status.c:190 wt-status.c:222
c04f5ac3 9057#, c-format
a6cd2cc4
JX
9058msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
9059msgstr " (使用 \"git restore --source=%s --staged <文件>...\" 以取消暂存)"
c04f5ac3 9060
a0b6b246 9061# 译者:注意保持前导空格
a6cd2cc4 9062#: wt-status.c:193 wt-status.c:225
a0b6b246
JX
9063msgid " (use \"git rm --cached <file>...\" to unstage)"
9064msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
c04f5ac3 9065
a0b6b246 9066# 译者:注意保持前导空格
a6cd2cc4 9067#: wt-status.c:197
a0b6b246
JX
9068msgid " (use \"git add <file>...\" to mark resolution)"
9069msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
8ada9598 9070
a0b6b246 9071# 译者:注意保持前导空格
a6cd2cc4 9072#: wt-status.c:199 wt-status.c:203
a0b6b246
JX
9073msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
9074msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
8ada9598 9075
a0b6b246 9076# 译者:注意保持前导空格
a6cd2cc4 9077#: wt-status.c:201
a0b6b246
JX
9078msgid " (use \"git rm <file>...\" to mark resolution)"
9079msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
ef317cd5 9080
d9488fea 9081#: wt-status.c:211 wt-status.c:1070
a0b6b246
JX
9082msgid "Changes to be committed:"
9083msgstr "要提交的变更:"
ef317cd5 9084
d9488fea 9085#: wt-status.c:234 wt-status.c:1079
a0b6b246
JX
9086msgid "Changes not staged for commit:"
9087msgstr "尚未暂存以备提交的变更:"
ef317cd5 9088
a0b6b246 9089# 译者:注意保持前导空格
a6cd2cc4 9090#: wt-status.c:238
a0b6b246
JX
9091msgid " (use \"git add <file>...\" to update what will be committed)"
9092msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
ef317cd5 9093
a0b6b246 9094# 译者:注意保持前导空格
a6cd2cc4 9095#: wt-status.c:240
a0b6b246
JX
9096msgid " (use \"git add/rm <file>...\" to update what will be committed)"
9097msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
ef317cd5 9098
a0b6b246 9099# 译者:注意保持前导空格
a6cd2cc4 9100#: wt-status.c:241
a0b6b246 9101msgid ""
a6cd2cc4
JX
9102" (use \"git restore <file>...\" to discard changes in working directory)"
9103msgstr " (使用 \"git restore <文件>...\" 丢弃工作区的改动)"
ef317cd5 9104
a0b6b246 9105# 译者:注意保持前导空格
a6cd2cc4 9106#: wt-status.c:243
a0b6b246
JX
9107msgid " (commit or discard the untracked or modified content in submodules)"
9108msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
ef317cd5 9109
a0b6b246 9110# 译者:注意保持前导空格
a6cd2cc4 9111#: wt-status.c:254
a0b6b246
JX
9112#, c-format
9113msgid " (use \"git %s <file>...\" to include in what will be committed)"
9114msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
ef317cd5 9115
d9488fea 9116#: wt-status.c:266
a0b6b246
JX
9117msgid "both deleted:"
9118msgstr "双方删除:"
ef317cd5 9119
d9488fea 9120#: wt-status.c:268
a0b6b246
JX
9121msgid "added by us:"
9122msgstr "由我们添加:"
4dcdc3d8 9123
d9488fea 9124#: wt-status.c:270
a0b6b246
JX
9125msgid "deleted by them:"
9126msgstr "由他们删除:"
ef317cd5 9127
d9488fea 9128#: wt-status.c:272
a0b6b246
JX
9129msgid "added by them:"
9130msgstr "由他们添加:"
ef317cd5 9131
d9488fea 9132#: wt-status.c:274
a0b6b246
JX
9133msgid "deleted by us:"
9134msgstr "由我们删除:"
ef317cd5 9135
d9488fea 9136#: wt-status.c:276
a0b6b246
JX
9137msgid "both added:"
9138msgstr "双方添加:"
5c57d762 9139
d9488fea 9140#: wt-status.c:278
a0b6b246
JX
9141msgid "both modified:"
9142msgstr "双方修改:"
5c57d762 9143
d9488fea 9144#: wt-status.c:288
a0b6b246
JX
9145msgid "new file:"
9146msgstr "新文件:"
8ada9598 9147
d9488fea 9148#: wt-status.c:290
a0b6b246
JX
9149msgid "copied:"
9150msgstr "拷贝:"
8ada9598 9151
d9488fea 9152#: wt-status.c:292
a0b6b246
JX
9153msgid "deleted:"
9154msgstr "删除:"
8ada9598 9155
d9488fea 9156#: wt-status.c:294
a0b6b246
JX
9157msgid "modified:"
9158msgstr "修改:"
8ada9598 9159
d9488fea 9160#: wt-status.c:296
a0b6b246
JX
9161msgid "renamed:"
9162msgstr "重命名:"
5c57d762 9163
d9488fea 9164#: wt-status.c:298
a0b6b246
JX
9165msgid "typechange:"
9166msgstr "类型变更:"
8ada9598 9167
d9488fea 9168#: wt-status.c:300
a0b6b246
JX
9169msgid "unknown:"
9170msgstr "未知:"
8ada9598 9171
d9488fea 9172#: wt-status.c:302
a0b6b246
JX
9173msgid "unmerged:"
9174msgstr "未合并:"
8ada9598 9175
a0b6b246 9176# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
d9488fea 9177#: wt-status.c:382
a0b6b246
JX
9178msgid "new commits, "
9179msgstr "新提交, "
8ada9598 9180
a0b6b246 9181# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
d9488fea 9182#: wt-status.c:384
a0b6b246
JX
9183msgid "modified content, "
9184msgstr "修改的内容, "
1b7f4a34 9185
a0b6b246 9186# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
d9488fea 9187#: wt-status.c:386
a0b6b246
JX
9188msgid "untracked content, "
9189msgstr "未跟踪的内容, "
1b7f4a34 9190
d9488fea 9191#: wt-status.c:903
a4f16749
JX
9192#, c-format
9193msgid "Your stash currently has %d entry"
9194msgid_plural "Your stash currently has %d entries"
9195msgstr[0] "您的贮藏区当前有 %d 条记录"
9196msgstr[1] "您的贮藏区当前有 %d 条记录"
9197
d9488fea 9198#: wt-status.c:934
a0b6b246
JX
9199msgid "Submodules changed but not updated:"
9200msgstr "子模组已修改但尚未更新:"
1b7f4a34 9201
d9488fea 9202#: wt-status.c:936
a0b6b246
JX
9203msgid "Submodule changes to be committed:"
9204msgstr "要提交的子模组变更:"
1b7f4a34 9205
d9488fea 9206#: wt-status.c:1018
a0b6b246 9207msgid ""
6937cb4e
JX
9208"Do not modify or remove the line above.\n"
9209"Everything below it will be ignored."
a0b6b246 9210msgstr ""
6937cb4e
JX
9211"不要改动或删除上面的一行。\n"
9212"其下所有内容都将被忽略。"
1b7f4a34 9213
d9488fea 9214#: wt-status.c:1110
a6cd2cc4
JX
9215#, c-format
9216msgid ""
9217"\n"
9218"It took %.2f seconds to compute the branch ahead/behind values.\n"
9219"You can use '--no-ahead-behind' to avoid this.\n"
9220msgstr ""
9221"\n"
9222"花了 %.2f 秒才计算出分支的领先/落后范围。\n"
9223"为避免,您可以使用 '--no-ahead-behind'。\n"
9224
d9488fea 9225#: wt-status.c:1140
a0b6b246
JX
9226msgid "You have unmerged paths."
9227msgstr "您有尚未合并的路径。"
1b7f4a34 9228
a0b6b246 9229# 译者:注意保持前导空格
d9488fea 9230#: wt-status.c:1143
a0b6b246
JX
9231msgid " (fix conflicts and run \"git commit\")"
9232msgstr " (解决冲突并运行 \"git commit\")"
1b7f4a34 9233
a0b6b246 9234# 译者:注意保持前导空格
d9488fea 9235#: wt-status.c:1145
a0b6b246
JX
9236msgid " (use \"git merge --abort\" to abort the merge)"
9237msgstr " (使用 \"git merge --abort\" 终止合并)"
1b7f4a34 9238
d9488fea 9239#: wt-status.c:1149
a0b6b246
JX
9240msgid "All conflicts fixed but you are still merging."
9241msgstr "所有冲突已解决但您仍处于合并中。"
1b7f4a34 9242
a0b6b246 9243# 译者:注意保持前导空格
d9488fea 9244#: wt-status.c:1152
a0b6b246
JX
9245msgid " (use \"git commit\" to conclude merge)"
9246msgstr " (使用 \"git commit\" 结束合并)"
1b7f4a34 9247
d9488fea 9248#: wt-status.c:1161
a0b6b246
JX
9249msgid "You are in the middle of an am session."
9250msgstr "您正处于 am 操作过程中。"
1b7f4a34 9251
d9488fea 9252#: wt-status.c:1164
a0b6b246
JX
9253msgid "The current patch is empty."
9254msgstr "当前的补丁为空。"
1b7f4a34 9255
a0b6b246 9256# 译者:注意保持前导空格
d9488fea 9257#: wt-status.c:1168
a0b6b246
JX
9258msgid " (fix conflicts and then run \"git am --continue\")"
9259msgstr " (解决冲突,然后运行 \"git am --continue\")"
1b7f4a34 9260
a0b6b246 9261# 译者:注意保持前导空格
d9488fea 9262#: wt-status.c:1170
a0b6b246
JX
9263msgid " (use \"git am --skip\" to skip this patch)"
9264msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1b7f4a34 9265
a0b6b246 9266# 译者:注意保持前导空格
d9488fea 9267#: wt-status.c:1172
a0b6b246
JX
9268msgid " (use \"git am --abort\" to restore the original branch)"
9269msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1b7f4a34 9270
d9488fea 9271#: wt-status.c:1305
1a79b2f1
JX
9272msgid "git-rebase-todo is missing."
9273msgstr "git-rebase-todo 丢失。"
9274
d9488fea 9275#: wt-status.c:1307
a0b6b246
JX
9276msgid "No commands done."
9277msgstr "没有命令被执行。"
9278
d9488fea 9279#: wt-status.c:1310
1b7f4a34 9280#, c-format
a0b6b246
JX
9281msgid "Last command done (%d command done):"
9282msgid_plural "Last commands done (%d commands done):"
9283msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
9284msgstr[1] "最后的命令已完成(%d 条命令被执行):"
1b7f4a34 9285
d9488fea 9286#: wt-status.c:1321
1b7f4a34 9287#, c-format
a0b6b246
JX
9288msgid " (see more in file %s)"
9289msgstr " (更多参见文件 %s)"
9290
d9488fea 9291#: wt-status.c:1326
a0b6b246
JX
9292msgid "No commands remaining."
9293msgstr "未剩下任何命令。"
1b7f4a34 9294
d9488fea 9295#: wt-status.c:1329
1b7f4a34 9296#, c-format
a0b6b246
JX
9297msgid "Next command to do (%d remaining command):"
9298msgid_plural "Next commands to do (%d remaining commands):"
9299msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
9300msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
1b7f4a34 9301
a0b6b246 9302# 译者:注意保持前导空格
d9488fea 9303#: wt-status.c:1337
a0b6b246
JX
9304msgid " (use \"git rebase --edit-todo\" to view and edit)"
9305msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
1b7f4a34 9306
d9488fea 9307#: wt-status.c:1349
1b7f4a34 9308#, c-format
a0b6b246
JX
9309msgid "You are currently rebasing branch '%s' on '%s'."
9310msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1b7f4a34 9311
d9488fea 9312#: wt-status.c:1354
a0b6b246
JX
9313msgid "You are currently rebasing."
9314msgstr "您在执行变基操作。"
1b7f4a34 9315
a0b6b246 9316# 译者:注意保持前导空格
d9488fea 9317#: wt-status.c:1367
a0b6b246
JX
9318msgid " (fix conflicts and then run \"git rebase --continue\")"
9319msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1b7f4a34 9320
a0b6b246 9321# 译者:注意保持前导空格
d9488fea 9322#: wt-status.c:1369
a0b6b246
JX
9323msgid " (use \"git rebase --skip\" to skip this patch)"
9324msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
9325
9326# 译者:注意保持前导空格
d9488fea 9327#: wt-status.c:1371
a0b6b246
JX
9328msgid " (use \"git rebase --abort\" to check out the original branch)"
9329msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
9330
9331# 译者:注意保持前导空格
d9488fea 9332#: wt-status.c:1378
a0b6b246
JX
9333msgid " (all conflicts fixed: run \"git rebase --continue\")"
9334msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1b7f4a34 9335
d9488fea 9336#: wt-status.c:1382
a0b6b246 9337#, c-format
1b7f4a34 9338msgid ""
a0b6b246
JX
9339"You are currently splitting a commit while rebasing branch '%s' on '%s'."
9340msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1b7f4a34 9341
d9488fea 9342#: wt-status.c:1387
a0b6b246
JX
9343msgid "You are currently splitting a commit during a rebase."
9344msgstr "您在执行变基操作时拆分提交。"
1b7f4a34 9345
a0b6b246 9346# 译者:注意保持前导空格
d9488fea 9347#: wt-status.c:1390
a0b6b246
JX
9348msgid " (Once your working directory is clean, run \"git rebase --continue\")"
9349msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1b7f4a34 9350
d9488fea 9351#: wt-status.c:1394
a0b6b246
JX
9352#, c-format
9353msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
9354msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1b7f4a34 9355
d9488fea 9356#: wt-status.c:1399
a0b6b246
JX
9357msgid "You are currently editing a commit during a rebase."
9358msgstr "您在执行变基操作时编辑提交。"
1b7f4a34 9359
a0b6b246 9360# 译者:注意保持前导空格
d9488fea 9361#: wt-status.c:1402
a0b6b246
JX
9362msgid " (use \"git commit --amend\" to amend the current commit)"
9363msgstr " (使用 \"git commit --amend\" 修补当前提交)"
9364
9365# 译者:注意保持前导空格
d9488fea 9366#: wt-status.c:1404
a0b6b246
JX
9367msgid ""
9368" (use \"git rebase --continue\" once you are satisfied with your changes)"
9369msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1b7f4a34 9370
d9488fea 9371#: wt-status.c:1415
d46c5519
JX
9372msgid "Cherry-pick currently in progress."
9373msgstr "拣选操作正在进行中。"
9374
d9488fea 9375#: wt-status.c:1418
1b7f4a34 9376#, c-format
a0b6b246
JX
9377msgid "You are currently cherry-picking commit %s."
9378msgstr "您在执行拣选提交 %s 的操作。"
1b7f4a34 9379
a0b6b246 9380# 译者:注意保持前导空格
d9488fea 9381#: wt-status.c:1425
a0b6b246
JX
9382msgid " (fix conflicts and run \"git cherry-pick --continue\")"
9383msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1b7f4a34 9384
a0b6b246 9385# 译者:注意保持前导空格
d9488fea 9386#: wt-status.c:1428
d46c5519
JX
9387msgid " (run \"git cherry-pick --continue\" to continue)"
9388msgstr " (执行 \"git cherry-pick --continue\" 以继续)"
9389
9390# 译者:注意保持前导空格
d9488fea 9391#: wt-status.c:1431
a0b6b246
JX
9392msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
9393msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1b7f4a34 9394
a0b6b246 9395# 译者:注意保持前导空格
d9488fea 9396#: wt-status.c:1433
a5cd71ca
JX
9397msgid " (use \"git cherry-pick --skip\" to skip this patch)"
9398msgstr " (使用 \"git cherry-pick --skip\" 跳过此补丁)"
9399
9400# 译者:注意保持前导空格
d9488fea 9401#: wt-status.c:1435
a0b6b246
JX
9402msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
9403msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1b7f4a34 9404
d9488fea 9405#: wt-status.c:1445
d46c5519
JX
9406msgid "Revert currently in progress."
9407msgstr "还原操作正在行中。"
9408
d9488fea 9409#: wt-status.c:1448
1b7f4a34 9410#, c-format
a0b6b246
JX
9411msgid "You are currently reverting commit %s."
9412msgstr "您在执行反转提交 %s 的操作。"
1b7f4a34 9413
a0b6b246 9414# 译者:注意保持前导空格
d9488fea 9415#: wt-status.c:1454
a0b6b246 9416msgid " (fix conflicts and run \"git revert --continue\")"
5b533632 9417msgstr " (解决冲突并执行 \"git revert --continue\")"
1b7f4a34 9418
a0b6b246 9419# 译者:注意保持前导空格
d9488fea 9420#: wt-status.c:1457
d46c5519 9421msgid " (run \"git revert --continue\" to continue)"
5b533632 9422msgstr " (执行 \"git revert --continue\" 以继续)"
d46c5519
JX
9423
9424# 译者:注意保持前导空格
d9488fea 9425#: wt-status.c:1460
a0b6b246 9426msgid " (all conflicts fixed: run \"git revert --continue\")"
5b533632 9427msgstr " (所有冲突已解决:执行 \"git revert --continue\")"
1b7f4a34 9428
a0b6b246 9429# 译者:注意保持前导空格
d9488fea 9430#: wt-status.c:1462
a5cd71ca
JX
9431msgid " (use \"git revert --skip\" to skip this patch)"
9432msgstr " (使用 \"git revert --skip\" 跳过此补丁)"
9433
9434# 译者:注意保持前导空格
d9488fea 9435#: wt-status.c:1464
a0b6b246
JX
9436msgid " (use \"git revert --abort\" to cancel the revert operation)"
9437msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1b7f4a34 9438
d9488fea 9439#: wt-status.c:1474
1b7f4a34 9440#, c-format
a0b6b246
JX
9441msgid "You are currently bisecting, started from branch '%s'."
9442msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1b7f4a34 9443
d9488fea 9444#: wt-status.c:1478
a0b6b246
JX
9445msgid "You are currently bisecting."
9446msgstr "您在执行二分查找操作。"
1b7f4a34 9447
a0b6b246 9448# 译者:注意保持前导空格
d9488fea 9449#: wt-status.c:1481
a0b6b246
JX
9450msgid " (use \"git bisect reset\" to get back to the original branch)"
9451msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1b7f4a34 9452
d9488fea 9453#: wt-status.c:1492
7157c2b5
JX
9454#, c-format
9455msgid "You are in a sparse checkout with %d%% of tracked files present."
9456msgstr "您处于稀疏签出状态,包含 %d%% 的跟踪文件"
9457
d9488fea 9458#: wt-status.c:1731
a0b6b246
JX
9459msgid "On branch "
9460msgstr "位于分支 "
1b7f4a34 9461
d9488fea 9462#: wt-status.c:1738
a0b6b246
JX
9463msgid "interactive rebase in progress; onto "
9464msgstr "交互式变基操作正在进行中;至 "
1b7f4a34 9465
d9488fea 9466#: wt-status.c:1740
a0b6b246
JX
9467msgid "rebase in progress; onto "
9468msgstr "变基操作正在进行中;至 "
1b7f4a34 9469
d9488fea 9470#: wt-status.c:1750
a0b6b246
JX
9471msgid "Not currently on any branch."
9472msgstr "当前不在任何分支上。"
1b7f4a34 9473
d9488fea 9474#: wt-status.c:1767
a0b6b246
JX
9475msgid "Initial commit"
9476msgstr "初始提交"
1b7f4a34 9477
d9488fea 9478#: wt-status.c:1768
a4f16749
JX
9479msgid "No commits yet"
9480msgstr "尚无提交"
9481
d9488fea 9482#: wt-status.c:1782
a0b6b246
JX
9483msgid "Untracked files"
9484msgstr "未跟踪的文件"
1b7f4a34 9485
d9488fea 9486#: wt-status.c:1784
a0b6b246
JX
9487msgid "Ignored files"
9488msgstr "忽略的文件"
1b7f4a34 9489
d9488fea 9490#: wt-status.c:1788
a0b6b246
JX
9491#, c-format
9492msgid ""
9493"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
9494"may speed it up, but you have to be careful not to forget to add\n"
9495"new files yourself (see 'git help status')."
9496msgstr ""
9497"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
9498"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1b7f4a34 9499
d9488fea 9500#: wt-status.c:1794
a0b6b246
JX
9501#, c-format
9502msgid "Untracked files not listed%s"
9503msgstr "未跟踪的文件没有列出%s"
1b7f4a34 9504
a0b6b246 9505# 译者:中文字符串拼接,可删除前导空格
d9488fea 9506#: wt-status.c:1796
a0b6b246
JX
9507msgid " (use -u option to show untracked files)"
9508msgstr "(使用 -u 参数显示未跟踪的文件)"
1b7f4a34 9509
d9488fea 9510#: wt-status.c:1802
a0b6b246
JX
9511msgid "No changes"
9512msgstr "没有修改"
1b7f4a34 9513
d9488fea 9514#: wt-status.c:1807
a0b6b246
JX
9515#, c-format
9516msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
9517msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1b7f4a34 9518
d9488fea 9519#: wt-status.c:1811
a0b6b246
JX
9520#, c-format
9521msgid "no changes added to commit\n"
9522msgstr "修改尚未加入提交\n"
1b7f4a34 9523
7157c2b5 9524#: wt-status.c:1815
a0b6b246
JX
9525#, c-format
9526msgid ""
9527"nothing added to commit but untracked files present (use \"git add\" to "
9528"track)\n"
9529msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1b7f4a34 9530
d9488fea 9531#: wt-status.c:1819
a0b6b246
JX
9532#, c-format
9533msgid "nothing added to commit but untracked files present\n"
9534msgstr "提交为空,但是存在尚未跟踪的文件\n"
1b7f4a34 9535
a0b6b246 9536# 译者:中文字符串拼接,可删除前导空格
d9488fea 9537#: wt-status.c:1823
a0b6b246
JX
9538#, c-format
9539msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
9540msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1b7f4a34 9541
d9488fea 9542#: wt-status.c:1827 wt-status.c:1833
a0b6b246
JX
9543#, c-format
9544msgid "nothing to commit\n"
9545msgstr "无文件要提交\n"
1b7f4a34 9546
a0b6b246 9547# 译者:中文字符串拼接,可删除前导空格
d9488fea 9548#: wt-status.c:1830
a0b6b246
JX
9549#, c-format
9550msgid "nothing to commit (use -u to show untracked files)\n"
9551msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1b7f4a34 9552
a0b6b246 9553# 译者:中文字符串拼接,可删除前导空格
d9488fea 9554#: wt-status.c:1835
a0b6b246
JX
9555#, c-format
9556msgid "nothing to commit, working tree clean\n"
9557msgstr "无文件要提交,干净的工作区\n"
9558
d9488fea 9559#: wt-status.c:1940
a4f16749
JX
9560msgid "No commits yet on "
9561msgstr "尚无提交在 "
1b7f4a34 9562
d9488fea 9563#: wt-status.c:1944
a0b6b246
JX
9564msgid "HEAD (no branch)"
9565msgstr "HEAD(非分支)"
1b7f4a34 9566
d9488fea 9567#: wt-status.c:1975
31e5e17b
JX
9568msgid "different"
9569msgstr "不同"
9570
a0b6b246 9571# 译者:注意保持句尾空格
d9488fea 9572#: wt-status.c:1977 wt-status.c:1985
a0b6b246
JX
9573msgid "behind "
9574msgstr "落后 "
1b7f4a34 9575
d9488fea 9576#: wt-status.c:1980 wt-status.c:1983
a0b6b246
JX
9577msgid "ahead "
9578msgstr "领先 "
1b7f4a34 9579
a0b6b246 9580#. TRANSLATORS: the action is e.g. "pull with rebase"
d9488fea 9581#: wt-status.c:2505
a0b6b246
JX
9582#, c-format
9583msgid "cannot %s: You have unstaged changes."
9584msgstr "不能%s:您有未暂存的变更。"
1b7f4a34 9585
d9488fea 9586#: wt-status.c:2511
a0b6b246 9587msgid "additionally, your index contains uncommitted changes."
29004bbb 9588msgstr "另外,您的索引中包含未提交的变更。"
1b7f4a34 9589
d9488fea 9590#: wt-status.c:2513
a0b6b246
JX
9591#, c-format
9592msgid "cannot %s: Your index contains uncommitted changes."
9593msgstr "不能%s:您的索引中包含未提交的变更。"
1b7f4a34 9594
349ede6a 9595#: compat/precompose_utf8.c:58 builtin/clone.c:456
a5cd71ca
JX
9596#, c-format
9597msgid "failed to unlink '%s'"
9598msgstr "删除 '%s' 失败"
9599
ddc12c42 9600#: builtin/add.c:26
a0b6b246
JX
9601msgid "git add [<options>] [--] <pathspec>..."
9602msgstr "git add [<选项>] [--] <路径规格>..."
1b7f4a34 9603
2b472aae 9604#: builtin/add.c:88
a0b6b246
JX
9605#, c-format
9606msgid "unexpected diff status %c"
9607msgstr "意外的差异状态 %c"
1b7f4a34 9608
349ede6a 9609#: builtin/add.c:93 builtin/commit.c:285
a0b6b246
JX
9610msgid "updating files failed"
9611msgstr "更新文件失败"
1b7f4a34 9612
2b472aae 9613#: builtin/add.c:103
a0b6b246
JX
9614#, c-format
9615msgid "remove '%s'\n"
9616msgstr "删除 '%s'\n"
1b7f4a34 9617
2b472aae 9618#: builtin/add.c:178
a0b6b246
JX
9619msgid "Unstaged changes after refreshing the index:"
9620msgstr "刷新索引之后尚未被暂存的变更:"
1b7f4a34 9621
d9488fea 9622#: builtin/add.c:272 builtin/rev-parse.c:904
a0b6b246
JX
9623msgid "Could not read the index"
9624msgstr "不能读取索引"
1b7f4a34 9625
d9488fea 9626#: builtin/add.c:283
a0b6b246
JX
9627#, c-format
9628msgid "Could not open '%s' for writing."
c1ac5258 9629msgstr "无法为写入打开 '%s'。"
1b7f4a34 9630
d9488fea 9631#: builtin/add.c:287
a0b6b246
JX
9632msgid "Could not write patch"
9633msgstr "不能生成补丁"
1b7f4a34 9634
d9488fea 9635#: builtin/add.c:290
a0b6b246
JX
9636msgid "editing patch failed"
9637msgstr "编辑补丁失败"
1b7f4a34 9638
d9488fea 9639#: builtin/add.c:293
1b7f4a34 9640#, c-format
a0b6b246 9641msgid "Could not stat '%s'"
65e2041e 9642msgstr "不能对 '%s' 调用 stat"
1b7f4a34 9643
d9488fea 9644#: builtin/add.c:295
a0b6b246
JX
9645msgid "Empty patch. Aborted."
9646msgstr "空补丁。异常终止。"
1b7f4a34 9647
d9488fea 9648#: builtin/add.c:300
a0b6b246
JX
9649#, c-format
9650msgid "Could not apply '%s'"
9651msgstr "不能应用 '%s'"
1b7f4a34 9652
d9488fea 9653#: builtin/add.c:308
a0b6b246
JX
9654msgid "The following paths are ignored by one of your .gitignore files:\n"
9655msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 9656
d9488fea
JX
9657#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124
9658#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538
9659#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184
a0b6b246
JX
9660msgid "dry run"
9661msgstr "演习"
8ada9598 9662
d9488fea 9663#: builtin/add.c:331
a0b6b246
JX
9664msgid "interactive picking"
9665msgstr "交互式拣选"
8ada9598 9666
d9488fea 9667#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308
a0b6b246
JX
9668msgid "select hunks interactively"
9669msgstr "交互式挑选数据块"
8ada9598 9670
d9488fea 9671#: builtin/add.c:333
a0b6b246
JX
9672msgid "edit current diff and apply"
9673msgstr "编辑当前差异并应用"
8ada9598 9674
d9488fea 9675#: builtin/add.c:334
a0b6b246
JX
9676msgid "allow adding otherwise ignored files"
9677msgstr "允许添加忽略的文件"
8ada9598 9678
d9488fea 9679#: builtin/add.c:335
a0b6b246
JX
9680msgid "update tracked files"
9681msgstr "更新已跟踪的文件"
8ada9598 9682
d9488fea 9683#: builtin/add.c:336
5809aa05
JX
9684msgid "renormalize EOL of tracked files (implies -u)"
9685msgstr "对已跟踪文件(暗含 -u)重新归一换行符"
9686
d9488fea 9687#: builtin/add.c:337
a0b6b246
JX
9688msgid "record only the fact that the path will be added later"
9689msgstr "只记录,该路径稍后再添加"
8ada9598 9690
d9488fea 9691#: builtin/add.c:338
a0b6b246
JX
9692msgid "add changes from all tracked and untracked files"
9693msgstr "添加所有改变的已跟踪文件和未跟踪文件"
8ada9598 9694
d9488fea 9695#: builtin/add.c:341
a0b6b246
JX
9696msgid "ignore paths removed in the working tree (same as --no-all)"
9697msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
8ada9598 9698
d9488fea 9699#: builtin/add.c:343
a0b6b246
JX
9700msgid "don't add, only refresh the index"
9701msgstr "不添加,只刷新索引"
8ada9598 9702
d9488fea 9703#: builtin/add.c:344
a0b6b246
JX
9704msgid "just skip files which cannot be added because of errors"
9705msgstr "跳过因出错不能添加的文件"
8ada9598 9706
d9488fea 9707#: builtin/add.c:345
a0b6b246
JX
9708msgid "check if - even missing - files are ignored in dry run"
9709msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
8ada9598 9710
d9488fea 9711#: builtin/add.c:347 builtin/update-index.c:1004
a0b6b246
JX
9712msgid "override the executable bit of the listed files"
9713msgstr "覆盖列表里文件的可执行位"
8ada9598 9714
d9488fea 9715#: builtin/add.c:349
a4f16749
JX
9716msgid "warn when adding an embedded repository"
9717msgstr "创建一个嵌入式仓库时给予警告"
9718
d9488fea 9719#: builtin/add.c:351
2b472aae
JX
9720msgid "backend for `git stash -p`"
9721msgstr "`git stash -p` 的后端"
9722
d9488fea 9723#: builtin/add.c:369
a4f16749
JX
9724#, c-format
9725msgid ""
9726"You've added another git repository inside your current repository.\n"
9727"Clones of the outer repository will not contain the contents of\n"
9728"the embedded repository and will not know how to obtain it.\n"
9729"If you meant to add a submodule, use:\n"
9730"\n"
9731"\tgit submodule add <url> %s\n"
9732"\n"
9733"If you added this path by mistake, you can remove it from the\n"
9734"index with:\n"
9735"\n"
9736"\tgit rm --cached %s\n"
9737"\n"
9738"See \"git help submodule\" for more information."
9739msgstr ""
ddc12c42
JX
9740"您在当前仓库中添加了另一个Git仓库。克隆外层的仓库将不包含嵌入仓库的\n"
9741"内容,并且不知道该如何获取它。如果您要添加一个子模组,使用:\n"
a4f16749
JX
9742"\n"
9743"\tgit submodule add <url> %s\n"
9744"\n"
9745"如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n"
9746"\n"
9747"\tgit rm --cached %s\n"
9748"\n"
9749"参见 \"git help submodule\" 获取更多信息。"
9750
d9488fea 9751#: builtin/add.c:397
a4f16749
JX
9752#, c-format
9753msgid "adding embedded git repository: %s"
9754msgstr "正在添加嵌入式 git 仓库:%s"
9755
d9488fea 9756#: builtin/add.c:416
2b472aae
JX
9757msgid ""
9758"Use -f if you really want to add them.\n"
9759"Turn this message off by running\n"
9760"\"git config advice.addIgnoredFile false\""
9761msgstr ""
440e7442 9762"如果您确实要添加它们,使用 -f 参数。\n"
2b472aae
JX
9763"运行下面的命令来关闭本消息\n"
9764"\"git config advice.addIgnoredFile false\""
8ada9598 9765
d9488fea 9766#: builtin/add.c:425
a0b6b246
JX
9767msgid "adding files failed"
9768msgstr "添加文件失败"
8ada9598 9769
d9488fea 9770#: builtin/add.c:453 builtin/commit.c:345
ddc12c42
JX
9771msgid "--pathspec-from-file is incompatible with --interactive/--patch"
9772msgstr "--pathspec-from-file 与 --interactive/--patch 不兼容"
9773
d9488fea 9774#: builtin/add.c:470
ddc12c42
JX
9775msgid "--pathspec-from-file is incompatible with --edit"
9776msgstr "--pathspec-from-file 与 --edit 不兼容"
9777
d9488fea 9778#: builtin/add.c:482
a0b6b246
JX
9779msgid "-A and -u are mutually incompatible"
9780msgstr "-A 和 -u 选项互斥"
8ada9598 9781
d9488fea 9782#: builtin/add.c:485
a0b6b246
JX
9783msgid "Option --ignore-missing can only be used together with --dry-run"
9784msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 9785
d9488fea 9786#: builtin/add.c:489
8ada9598 9787#, c-format
a0b6b246
JX
9788msgid "--chmod param '%s' must be either -x or +x"
9789msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
8ada9598 9790
d9488fea
JX
9791#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351
9792#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503
ddc12c42
JX
9793msgid "--pathspec-from-file is incompatible with pathspec arguments"
9794msgstr "--pathspec-from-file 与路径表达式参数不兼容"
9795
d9488fea
JX
9796#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357
9797#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509
ddc12c42
JX
9798msgid "--pathspec-file-nul requires --pathspec-from-file"
9799msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
9800
d9488fea 9801#: builtin/add.c:518
8ada9598 9802#, c-format
a0b6b246
JX
9803msgid "Nothing specified, nothing added.\n"
9804msgstr "没有指定文件,也没有文件被添加。\n"
8ada9598 9805
d9488fea 9806#: builtin/add.c:520
2b472aae
JX
9807msgid ""
9808"Maybe you wanted to say 'git add .'?\n"
9809"Turn this message off by running\n"
9810"\"git config advice.addEmptyPathspec false\""
9811msgstr ""
9812"也许您想要执行 'git add .'?\n"
9813"运行下面的命令来关闭本消息\n"
9814"\"git config advice.addEmptyPathspec false\""
8ada9598 9815
d9488fea
JX
9816#: builtin/am.c:160
9817#, c-format
9818msgid "invalid committer: %s"
9819msgstr "无效的提交者:%s"
9820
9821#: builtin/am.c:366
a0b6b246
JX
9822msgid "could not parse author script"
9823msgstr "不能解析作者脚本"
8ada9598 9824
d9488fea 9825#: builtin/am.c:450
81809b99 9826#, c-format
a0b6b246
JX
9827msgid "'%s' was deleted by the applypatch-msg hook"
9828msgstr "'%s' 被 applypatch-msg 钩子删除"
8ada9598 9829
d9488fea 9830#: builtin/am.c:492
8ada9598 9831#, c-format
a0b6b246
JX
9832msgid "Malformed input line: '%s'."
9833msgstr "非法的输入行:'%s'。"
8ada9598 9834
d9488fea 9835#: builtin/am.c:530
8ada9598 9836#, c-format
a0b6b246
JX
9837msgid "Failed to copy notes from '%s' to '%s'"
9838msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
8ada9598 9839
d9488fea 9840#: builtin/am.c:556
a0b6b246
JX
9841msgid "fseek failed"
9842msgstr "fseek 失败"
8ada9598 9843
d9488fea 9844#: builtin/am.c:744
8ada9598 9845#, c-format
a0b6b246
JX
9846msgid "could not parse patch '%s'"
9847msgstr "无法解析补丁 '%s'"
8ada9598 9848
d9488fea 9849#: builtin/am.c:809
a0b6b246
JX
9850msgid "Only one StGIT patch series can be applied at once"
9851msgstr "一次只能有一个 StGIT 补丁队列被应用"
9852
d9488fea 9853#: builtin/am.c:857
a0b6b246
JX
9854msgid "invalid timestamp"
9855msgstr "无效的时间戳"
9856
d9488fea 9857#: builtin/am.c:862 builtin/am.c:874
a0b6b246
JX
9858msgid "invalid Date line"
9859msgstr "无效的日期行"
8ada9598 9860
d9488fea 9861#: builtin/am.c:869
a0b6b246
JX
9862msgid "invalid timezone offset"
9863msgstr "无效的时区偏移值"
8ada9598 9864
d9488fea 9865#: builtin/am.c:962
a0b6b246 9866msgid "Patch format detection failed."
87cb7997 9867msgstr "补丁格式探测失败。"
8ada9598 9868
d9488fea 9869#: builtin/am.c:967 builtin/clone.c:409
8ada9598 9870#, c-format
a0b6b246 9871msgid "failed to create directory '%s'"
c1ac5258 9872msgstr "创建目录 '%s' 失败"
8ada9598 9873
d9488fea 9874#: builtin/am.c:972
a0b6b246 9875msgid "Failed to split patches."
c1ac5258 9876msgstr "拆分补丁失败。"
814ff314 9877
d9488fea 9878#: builtin/am.c:1103
8ada9598 9879#, c-format
a0b6b246
JX
9880msgid "When you have resolved this problem, run \"%s --continue\"."
9881msgstr "当您解决这一问题,执行 \"%s --continue\"。"
8ada9598 9882
d9488fea 9883#: builtin/am.c:1104
81809b99 9884#, c-format
a0b6b246
JX
9885msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
9886msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
8ada9598 9887
d9488fea 9888#: builtin/am.c:1105
81809b99 9889#, c-format
a0b6b246
JX
9890msgid "To restore the original branch and stop patching, run \"%s --abort\"."
9891msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
8ada9598 9892
d9488fea 9893#: builtin/am.c:1188
4c27fcb5
JX
9894msgid "Patch sent with format=flowed; space at the end of lines might be lost."
9895msgstr "补丁使用 format=flowed 格式发送,行尾的空格可能会丢失。"
9896
d9488fea 9897#: builtin/am.c:1216
a4f16749
JX
9898msgid "Patch is empty."
9899msgstr "补丁为空。"
23ff3338 9900
d9488fea 9901#: builtin/am.c:1281
a5cd71ca
JX
9902#, c-format
9903msgid "missing author line in commit %s"
9904msgstr "在提交 %s 中缺失作者行"
9905
d9488fea 9906#: builtin/am.c:1284
8ada9598 9907#, c-format
a4f16749
JX
9908msgid "invalid ident line: %.*s"
9909msgstr "无效的身份标识:%.*s"
8ada9598 9910
d9488fea 9911#: builtin/am.c:1503
a0b6b246
JX
9912msgid "Repository lacks necessary blobs to fall back on 3-way merge."
9913msgstr "仓库缺乏必要的数据对象以进行三方合并。"
814ff314 9914
d9488fea 9915#: builtin/am.c:1505
a0b6b246
JX
9916msgid "Using index info to reconstruct a base tree..."
9917msgstr "使用索引来重建一个(三方合并的)基础目录树..."
8ada9598 9918
d9488fea 9919#: builtin/am.c:1524
a0b6b246
JX
9920msgid ""
9921"Did you hand edit your patch?\n"
9922"It does not apply to blobs recorded in its index."
9923msgstr ""
9924"您是否曾手动编辑过您的补丁?\n"
9925"无法应用补丁到索引中的数据对象上。"
23ff3338 9926
d9488fea 9927#: builtin/am.c:1530
a0b6b246
JX
9928msgid "Falling back to patching base and 3-way merge..."
9929msgstr "回落到基础版本上打补丁及进行三方合并..."
8ada9598 9930
d9488fea 9931#: builtin/am.c:1556
a0b6b246
JX
9932msgid "Failed to merge in the changes."
9933msgstr "无法合并变更。"
d691f479 9934
d9488fea 9935#: builtin/am.c:1588
a0b6b246
JX
9936msgid "applying to an empty history"
9937msgstr "正应用到一个空历史上"
8ada9598 9938
d9488fea 9939#: builtin/am.c:1639 builtin/am.c:1643
8ada9598 9940#, c-format
a0b6b246
JX
9941msgid "cannot resume: %s does not exist."
9942msgstr "无法继续:%s 不存在。"
8ada9598 9943
d9488fea 9944#: builtin/am.c:1661
a0b6b246
JX
9945msgid "Commit Body is:"
9946msgstr "提交内容为:"
8ada9598 9947
a0b6b246
JX
9948# 译者:注意保持句尾空格
9949#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9950#. in your translation. The program will only accept English
9951#. input at this point.
9952#.
d9488fea 9953#: builtin/am.c:1671
a6cd2cc4 9954#, c-format
a0b6b246
JX
9955msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
9956msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
8ada9598 9957
d9488fea 9958#: builtin/am.c:1717 builtin/commit.c:395
a5cd71ca
JX
9959msgid "unable to write index file"
9960msgstr "无法写入索引文件"
9961
d9488fea 9962#: builtin/am.c:1721
8ada9598 9963#, c-format
a0b6b246
JX
9964msgid "Dirty index: cannot apply patches (dirty: %s)"
9965msgstr "脏索引:不能应用补丁(脏文件:%s)"
8ada9598 9966
d9488fea 9967#: builtin/am.c:1761 builtin/am.c:1829
81809b99 9968#, c-format
a0b6b246
JX
9969msgid "Applying: %.*s"
9970msgstr "应用:%.*s"
8ada9598 9971
d9488fea 9972#: builtin/am.c:1778
a0b6b246
JX
9973msgid "No changes -- Patch already applied."
9974msgstr "没有变更 —— 补丁已经应用过。"
8ada9598 9975
d9488fea 9976#: builtin/am.c:1784
81809b99 9977#, c-format
a0b6b246
JX
9978msgid "Patch failed at %s %.*s"
9979msgstr "打补丁失败于 %s %.*s"
8ada9598 9980
d9488fea 9981#: builtin/am.c:1788
2b472aae
JX
9982msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
9983msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁"
8ada9598 9984
d9488fea 9985#: builtin/am.c:1832
a0b6b246
JX
9986msgid ""
9987"No changes - did you forget to use 'git add'?\n"
9988"If there is nothing left to stage, chances are that something else\n"
9989"already introduced the same changes; you might want to skip this patch."
9990msgstr ""
9991"没有变更 —— 您是不是忘了执行 'git add'?\n"
9992"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
9993"您也许想要跳过这个补丁。"
8ada9598 9994
d9488fea 9995#: builtin/am.c:1839
a0b6b246
JX
9996msgid ""
9997"You still have unmerged paths in your index.\n"
a4f16749
JX
9998"You should 'git add' each file with resolved conflicts to mark them as "
9999"such.\n"
10000"You might run `git rm` on a file to accept \"deleted by them\" for it."
a0b6b246 10001msgstr ""
a4f16749
JX
10002"在您的索引中仍存在未合并的路径。\n"
10003"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
10004"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
8ada9598 10005
d9488fea 10006#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347
349ede6a 10007#: builtin/reset.c:355
8ada9598 10008#, c-format
a0b6b246
JX
10009msgid "Could not parse object '%s'."
10010msgstr "不能解析对象 '%s'。"
8ada9598 10011
d9488fea 10012#: builtin/am.c:1998
a0b6b246 10013msgid "failed to clean index"
c1ac5258 10014msgstr "清空索引失败"
5b04ee3b 10015
d9488fea 10016#: builtin/am.c:2042
a0b6b246
JX
10017msgid ""
10018"You seem to have moved HEAD since the last 'am' failure.\n"
10019"Not rewinding to ORIG_HEAD"
10020msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
8ada9598 10021
d9488fea 10022#: builtin/am.c:2149
8ada9598 10023#, c-format
a0b6b246
JX
10024msgid "Invalid value for --patch-format: %s"
10025msgstr "无效的 --patch-format 值:%s"
8ada9598 10026
d9488fea 10027#: builtin/am.c:2191
2b472aae
JX
10028#, c-format
10029msgid "Invalid value for --show-current-patch: %s"
10030msgstr "无效的 --show-current-patch 值:%s"
10031
d9488fea 10032#: builtin/am.c:2195
2b472aae
JX
10033#, c-format
10034msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
10035msgstr "--show-current-patch=%s 和 --show-current-patch=%s 不兼容"
10036
d9488fea 10037#: builtin/am.c:2226
a0b6b246
JX
10038msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
10039msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
5b04ee3b 10040
d9488fea 10041#: builtin/am.c:2227
a0b6b246
JX
10042msgid "git am [<options>] (--continue | --skip | --abort)"
10043msgstr "git am [<选项>] (--continue | --skip | --abort)"
8ada9598 10044
d9488fea 10045#: builtin/am.c:2233
a0b6b246
JX
10046msgid "run interactively"
10047msgstr "以交互式方式运行"
8ada9598 10048
d9488fea 10049#: builtin/am.c:2235
a0b6b246
JX
10050msgid "historical option -- no-op"
10051msgstr "老的参数 —— 无作用"
8ada9598 10052
d9488fea 10053#: builtin/am.c:2237
a0b6b246
JX
10054msgid "allow fall back on 3way merging if needed"
10055msgstr "如果必要,允许使用三方合并。"
8ada9598 10056
d9488fea
JX
10057#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16
10058#: builtin/repack.c:309 builtin/stash.c:816
a0b6b246
JX
10059msgid "be quiet"
10060msgstr "静默模式"
8ada9598 10061
d9488fea 10062#: builtin/am.c:2240
a0b6b246
JX
10063msgid "add a Signed-off-by line to the commit message"
10064msgstr "在提交说明中添加一个 Signed-off-by 签名"
5c57d762 10065
d9488fea 10066#: builtin/am.c:2243
a0b6b246
JX
10067msgid "recode into utf8 (default)"
10068msgstr "使用 utf8 字符集(默认)"
5c57d762 10069
d9488fea 10070#: builtin/am.c:2245
a0b6b246
JX
10071msgid "pass -k flag to git-mailinfo"
10072msgstr "向 git-mailinfo 传递 -k 参数"
5c57d762 10073
d9488fea 10074#: builtin/am.c:2247
a0b6b246
JX
10075msgid "pass -b flag to git-mailinfo"
10076msgstr "向 git-mailinfo 传递 -b 参数"
5c57d762 10077
d9488fea 10078#: builtin/am.c:2249
a0b6b246
JX
10079msgid "pass -m flag to git-mailinfo"
10080msgstr "向 git-mailinfo 传递 -m 参数"
5c57d762 10081
d9488fea 10082#: builtin/am.c:2251
a0b6b246
JX
10083msgid "pass --keep-cr flag to git-mailsplit for mbox format"
10084msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
5c57d762 10085
d9488fea 10086#: builtin/am.c:2254
a0b6b246
JX
10087msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
10088msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
8ada9598 10089
d9488fea 10090#: builtin/am.c:2257
a0b6b246
JX
10091msgid "strip everything before a scissors line"
10092msgstr "丢弃裁切线前的所有内容"
8ada9598 10093
d9488fea
JX
10094#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268
10095#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
10096#: builtin/am.c:2286
a0b6b246
JX
10097msgid "pass it through git-apply"
10098msgstr "传递给 git-apply"
8ada9598 10099
d9488fea
JX
10100#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
10101#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251
349ede6a 10102#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
d9488fea
JX
10103#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324
10104#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172
349ede6a
JX
10105#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175
10106#: parse-options.h:316
a0b6b246
JX
10107msgid "n"
10108msgstr "n"
8ada9598 10109
d9488fea
JX
10110#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135
10111#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438
10112#: builtin/verify-tag.c:38
a0b6b246
JX
10113msgid "format"
10114msgstr "格式"
8ada9598 10115
d9488fea 10116#: builtin/am.c:2283
a0b6b246
JX
10117msgid "format the patch(es) are in"
10118msgstr "补丁的格式"
8ada9598 10119
d9488fea 10120#: builtin/am.c:2289
a0b6b246
JX
10121msgid "override error message when patch failure occurs"
10122msgstr "打补丁失败时显示的错误信息"
8ada9598 10123
d9488fea 10124#: builtin/am.c:2291
a0b6b246
JX
10125msgid "continue applying patches after resolving a conflict"
10126msgstr "冲突解决后继续应用补丁"
814ff314 10127
d9488fea 10128#: builtin/am.c:2294
a0b6b246
JX
10129msgid "synonyms for --continue"
10130msgstr "和 --continue 同义"
8ada9598 10131
d9488fea 10132#: builtin/am.c:2297
a0b6b246
JX
10133msgid "skip the current patch"
10134msgstr "跳过当前补丁"
23ff3338 10135
d9488fea 10136#: builtin/am.c:2300
a0b6b246
JX
10137msgid "restore the original branch and abort the patching operation."
10138msgstr "恢复原始分支并终止打补丁操作。"
8ada9598 10139
d9488fea 10140#: builtin/am.c:2303
31e5e17b
JX
10141msgid "abort the patching operation but keep HEAD where it is."
10142msgstr "终止补丁操作但保持 HEAD 不变。"
10143
d9488fea 10144#: builtin/am.c:2307
2b472aae
JX
10145msgid "show the patch being applied"
10146msgstr "显示正在应用的补丁"
31e5e17b 10147
d9488fea 10148#: builtin/am.c:2312
a0b6b246
JX
10149msgid "lie about committer date"
10150msgstr "将作者日期作为提交日期"
8ada9598 10151
d9488fea 10152#: builtin/am.c:2314
a0b6b246
JX
10153msgid "use current timestamp for author date"
10154msgstr "用当前时间作为作者日期"
8ada9598 10155
d9488fea
JX
10156#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515
10157#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530
10158#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419
a0b6b246
JX
10159msgid "key-id"
10160msgstr "key-id"
8ada9598 10161
d9488fea 10162#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389
a0b6b246
JX
10163msgid "GPG-sign commits"
10164msgstr "使用 GPG 签名提交"
8ada9598 10165
d9488fea 10166#: builtin/am.c:2320
a0b6b246
JX
10167msgid "(internal use for git-rebase)"
10168msgstr "(内部使用,用于 git-rebase)"
8ada9598 10169
d9488fea 10170#: builtin/am.c:2338
a0b6b246
JX
10171msgid ""
10172"The -b/--binary option has been a no-op for long time, and\n"
10173"it will be removed. Please do not use it anymore."
10174msgstr ""
10175"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
10176"请不要再使用它了。"
8ada9598 10177
d9488fea 10178#: builtin/am.c:2345
a0b6b246 10179msgid "failed to read the index"
c1ac5258 10180msgstr "读取索引失败"
8ada9598 10181
d9488fea 10182#: builtin/am.c:2360
a0b6b246
JX
10183#, c-format
10184msgid "previous rebase directory %s still exists but mbox given."
10185msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
8ada9598 10186
d9488fea 10187#: builtin/am.c:2384
a0b6b246
JX
10188#, c-format
10189msgid ""
10190"Stray %s directory found.\n"
10191"Use \"git am --abort\" to remove it."
10192msgstr ""
10193"发现了错误的 %s 目录。\n"
10194"使用 \"git am --abort\" 删除它。"
c04f5ac3 10195
d9488fea 10196#: builtin/am.c:2390
a0b6b246
JX
10197msgid "Resolve operation not in progress, we are not resuming."
10198msgstr "解决操作未进行,我们不会继续。"
c04f5ac3 10199
d9488fea 10200#: builtin/am.c:2400
a6cd2cc4
JX
10201msgid "interactive mode requires patches on the command line"
10202msgstr "交互式模式需要命令行上提供补丁"
10203
a0b6b246
JX
10204#: builtin/apply.c:8
10205msgid "git apply [<options>] [<patch>...]"
10206msgstr "git apply [<选项>] [<补丁>...]"
c04f5ac3 10207
c04f5ac3
JX
10208#: builtin/archive.c:17
10209#, c-format
10210msgid "could not create archive file '%s'"
90e6ef53 10211msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
10212
10213#: builtin/archive.c:20
10214msgid "could not redirect output"
195febda 10215msgstr "不能重定向输出"
c04f5ac3
JX
10216
10217#: builtin/archive.c:37
10218msgid "git archive: Remote with no URL"
4375c10e 10219msgstr "git archive:未提供远程 URL"
c04f5ac3 10220
06991777 10221#: builtin/archive.c:61
31e5e17b
JX
10222msgid "git archive: expected ACK/NAK, got a flush packet"
10223msgstr "git archive:期望是 ACK/NAK,却得到 flush 包"
c04f5ac3 10224
06991777 10225#: builtin/archive.c:64
c04f5ac3
JX
10226#, c-format
10227msgid "git archive: NACK %s"
90e6ef53 10228msgstr "git archive:NACK %s"
c04f5ac3 10229
06991777 10230#: builtin/archive.c:65
c04f5ac3 10231msgid "git archive: protocol error"
90e6ef53 10232msgstr "git archive:协议错误"
c04f5ac3 10233
06991777 10234#: builtin/archive.c:69
c04f5ac3 10235msgid "git archive: expected a flush"
31e5e17b 10236msgstr "git archive:应有一个 flush 包"
c04f5ac3 10237
06991777 10238#: builtin/bisect--helper.c:23
d9488fea
JX
10239msgid "git bisect--helper --next-all"
10240msgstr "git bisect--helper --next-all"
10241
10242#: builtin/bisect--helper.c:24
5809aa05
JX
10243msgid "git bisect--helper --write-terms <bad_term> <good_term>"
10244msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>"
10245
d9488fea 10246#: builtin/bisect--helper.c:25
5809aa05
JX
10247msgid "git bisect--helper --bisect-clean-state"
10248msgstr "git bisect--helper --bisect-clean-state"
10249
d9488fea 10250#: builtin/bisect--helper.c:26
06991777
JX
10251msgid "git bisect--helper --bisect-reset [<commit>]"
10252msgstr "git bisect--helper --bisect-reset [<提交>]"
10253
d9488fea 10254#: builtin/bisect--helper.c:27
06991777
JX
10255msgid ""
10256"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
10257"<bad_term>"
10258msgstr ""
10259"git bisect--helper --bisect-write [--no-log] <状态> <版本> <好-术语> <坏-术语"
10260">"
10261
d9488fea 10262#: builtin/bisect--helper.c:28
06991777
JX
10263msgid ""
10264"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
10265"<bad_term>"
10266msgstr ""
10267"git bisect--helper --bisect-check-and-set-terms <命令> <好-术语> <坏-术语>"
10268
d9488fea 10269#: builtin/bisect--helper.c:29
06991777
JX
10270msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
10271msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]"
10272
d9488fea 10273#: builtin/bisect--helper.c:30
06991777
JX
10274msgid ""
10275"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
10276"term-new]"
10277msgstr ""
10278"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
10279"term-new]"
10280
d9488fea 10281#: builtin/bisect--helper.c:31
06991777 10282msgid ""
d9488fea
JX
10283"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
10284"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
10285"[<paths>...]"
06991777 10286msgstr ""
d9488fea
JX
10287"git bisect--helper --bisect-start [--term-{new,bad}=<术语> --term-{old,good}"
10288"=<术语>] [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径>...]"
10289
10290#: builtin/bisect--helper.c:33
10291msgid "git bisect--helper --bisect-next"
10292msgstr "git bisect--helper --bisect-next"
10293
10294#: builtin/bisect--helper.c:34
10295msgid "git bisect--helper --bisect-auto-next"
10296msgstr "git bisect--helper --bisect-auto-next"
06991777 10297
d9488fea
JX
10298#: builtin/bisect--helper.c:35
10299msgid "git bisect--helper --bisect-autostart"
10300msgstr "git bisect--helper --bisect-autostart"
10301
10302#: builtin/bisect--helper.c:97
10303#, c-format
10304msgid "cannot open file '%s' in mode '%s'"
10305msgstr "不能以 '%2$s' 模式打开文件 '%1$s'"
10306
10307#: builtin/bisect--helper.c:104
10308#, c-format
10309msgid "could not write to file '%s'"
10310msgstr "不能写入文件 '%s'"
10311
10312#: builtin/bisect--helper.c:143
5809aa05
JX
10313#, c-format
10314msgid "'%s' is not a valid term"
10315msgstr "'%s' 不是一个有效的术语"
10316
d9488fea 10317#: builtin/bisect--helper.c:147
5809aa05
JX
10318#, c-format
10319msgid "can't use the builtin command '%s' as a term"
10320msgstr "不能使用内置命令 '%s' 作为术语"
10321
d9488fea 10322#: builtin/bisect--helper.c:157
5809aa05
JX
10323#, c-format
10324msgid "can't change the meaning of the term '%s'"
10325msgstr "不能修改术语 '%s' 的含义"
10326
d9488fea 10327#: builtin/bisect--helper.c:167
5809aa05
JX
10328msgid "please use two different terms"
10329msgstr "请使用两个不同的术语"
10330
d9488fea 10331#: builtin/bisect--helper.c:207
06991777
JX
10332#, c-format
10333msgid "We are not bisecting.\n"
10334msgstr "我们没有在二分查找。\n"
10335
d9488fea 10336#: builtin/bisect--helper.c:215
06991777
JX
10337#, c-format
10338msgid "'%s' is not a valid commit"
10339msgstr "'%s' 不是一个有效的提交"
10340
d9488fea 10341#: builtin/bisect--helper.c:224
06991777
JX
10342#, c-format
10343msgid ""
10344"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
10345msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
10346
d9488fea 10347#: builtin/bisect--helper.c:268
06991777
JX
10348#, c-format
10349msgid "Bad bisect_write argument: %s"
10350msgstr "坏的 bisect_write 参数:%s"
10351
d9488fea 10352#: builtin/bisect--helper.c:273
06991777
JX
10353#, c-format
10354msgid "couldn't get the oid of the rev '%s'"
5b533632 10355msgstr "无法获取版本 '%s' 的对象 ID"
06991777 10356
d9488fea 10357#: builtin/bisect--helper.c:285
06991777
JX
10358#, c-format
10359msgid "couldn't open the file '%s'"
10360msgstr "无法打开文件 '%s'"
10361
d9488fea 10362#: builtin/bisect--helper.c:311
06991777
JX
10363#, c-format
10364msgid "Invalid command: you're currently in a %s/%s bisect"
10365msgstr "无效的命令:您当前正处于一个 %s/%s 二分查找中"
10366
d9488fea 10367#: builtin/bisect--helper.c:338
06991777
JX
10368#, c-format
10369msgid ""
10370"You need to give me at least one %s and %s revision.\n"
10371"You can use \"git bisect %s\" and \"git bisect %s\" for that."
10372msgstr ""
10373"您需要给我至少一个 %s 和一个 %s 版本。\n"
10374"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
10375
d9488fea 10376#: builtin/bisect--helper.c:342
06991777
JX
10377#, c-format
10378msgid ""
10379"You need to start by \"git bisect start\".\n"
10380"You then need to give me at least one %s and %s revision.\n"
10381"You can use \"git bisect %s\" and \"git bisect %s\" for that."
10382msgstr ""
10383"您需要执行 \"git bisect start\" 来开始。\n"
10384"然后需要提供我至少一个 %s 和一个 %s 版本。\n"
10385"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
10386
d9488fea 10387#: builtin/bisect--helper.c:362
06991777
JX
10388#, c-format
10389msgid "bisecting only with a %s commit"
5b533632 10390msgstr "在只有一个 %s 提交的情况下二分查找"
06991777
JX
10391
10392# 译者:注意保持句尾空格
10393#. TRANSLATORS: Make sure to include [Y] and [n] in your
10394#. translation. The program will only accept English input
10395#. at this point.
10396#.
d9488fea 10397#: builtin/bisect--helper.c:370
06991777
JX
10398msgid "Are you sure [Y/n]? "
10399msgstr "您确认么[Y/n]? "
10400
d9488fea 10401#: builtin/bisect--helper.c:431
06991777
JX
10402msgid "no terms defined"
10403msgstr "未定义术语"
10404
d9488fea 10405#: builtin/bisect--helper.c:434
06991777
JX
10406#, c-format
10407msgid ""
10408"Your current terms are %s for the old state\n"
10409"and %s for the new state.\n"
10410msgstr "您当前针对旧状态的术语是 %s,对新状态的术语是 %s。\n"
10411
d9488fea 10412#: builtin/bisect--helper.c:444
06991777
JX
10413#, c-format
10414msgid ""
10415"invalid argument %s for 'git bisect terms'.\n"
10416"Supported options are: --term-good|--term-old and --term-bad|--term-new."
10417msgstr ""
10418"命令 'git bisect terms' 的参数 %s 无效。\n"
10419"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
10420
d9488fea
JX
10421#: builtin/bisect--helper.c:511
10422msgid "revision walk setup failed\n"
10423msgstr "版本遍历设置失败\n"
10424
10425#: builtin/bisect--helper.c:533
10426#, c-format
10427msgid "could not open '%s' for appending"
10428msgstr "无法打开 '%s' 进行追加"
10429
10430#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664
7157c2b5
JX
10431msgid "'' is not a valid term"
10432msgstr "'' 不是一个有效的术语"
10433
d9488fea 10434#: builtin/bisect--helper.c:674
06991777
JX
10435#, c-format
10436msgid "unrecognized option: '%s'"
10437msgstr "未识别的选项:'%s'"
10438
d9488fea 10439#: builtin/bisect--helper.c:678
06991777
JX
10440#, c-format
10441msgid "'%s' does not appear to be a valid revision"
8e4e0555 10442msgstr "'%s' 看起来不是一个有效的版本"
06991777 10443
d9488fea 10444#: builtin/bisect--helper.c:709
06991777
JX
10445msgid "bad HEAD - I need a HEAD"
10446msgstr "坏的 HEAD - 我需要一个 HEAD"
10447
d9488fea 10448#: builtin/bisect--helper.c:724
06991777
JX
10449#, c-format
10450msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
10451msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
10452
d9488fea 10453#: builtin/bisect--helper.c:745
06991777
JX
10454msgid "won't bisect on cg-seek'ed tree"
10455msgstr "不会在做了 cg-seek 的树上做二分查找"
10456
d9488fea 10457#: builtin/bisect--helper.c:748
06991777
JX
10458msgid "bad HEAD - strange symbolic ref"
10459msgstr "坏的 HEAD - 奇怪的符号引用"
10460
d9488fea 10461#: builtin/bisect--helper.c:775
a6cd2cc4
JX
10462#, c-format
10463msgid "invalid ref: '%s'"
10464msgstr "无效的引用:'%s'"
10465
d9488fea
JX
10466#: builtin/bisect--helper.c:827
10467msgid "You need to start by \"git bisect start\"\n"
10468msgstr "您需要执行 \"git bisect start\" 来开始\n"
10469
10470# 译者:注意保持句尾空格
10471#. TRANSLATORS: Make sure to include [Y] and [n] in your
10472#. translation. The program will only accept English input
10473#. at this point.
10474#.
10475#: builtin/bisect--helper.c:838
10476msgid "Do you want me to do it for you [Y/n]? "
10477msgstr "您想让我为您这样做么[Y/n]? "
10478
10479#: builtin/bisect--helper.c:866
ef317cd5 10480msgid "perform 'git bisect next'"
07432cef 10481msgstr "执行 'git bisect next'"
ef317cd5 10482
d9488fea 10483#: builtin/bisect--helper.c:868
5809aa05
JX
10484msgid "write the terms to .git/BISECT_TERMS"
10485msgstr "将术语写入 .git/BISECT_TERMS"
10486
d9488fea 10487#: builtin/bisect--helper.c:870
5809aa05
JX
10488msgid "cleanup the bisection state"
10489msgstr "清除二分查找状态"
10490
d9488fea 10491#: builtin/bisect--helper.c:872
5809aa05
JX
10492msgid "check for expected revs"
10493msgstr "检查预期的版本"
10494
d9488fea 10495#: builtin/bisect--helper.c:874
06991777
JX
10496msgid "reset the bisection state"
10497msgstr "清除二分查找状态"
10498
d9488fea 10499#: builtin/bisect--helper.c:876
06991777
JX
10500msgid "write out the bisection state in BISECT_LOG"
10501msgstr "将二分查找的状态写入 BISECT_LOG"
10502
d9488fea 10503#: builtin/bisect--helper.c:878
06991777
JX
10504msgid "check and set terms in a bisection state"
10505msgstr "在一个二分查找状态中检查和设置术语"
10506
d9488fea 10507#: builtin/bisect--helper.c:880
06991777
JX
10508msgid "check whether bad or good terms exist"
10509msgstr "检查坏的或好的术语是否存在"
10510
d9488fea 10511#: builtin/bisect--helper.c:882
06991777
JX
10512msgid "print out the bisect terms"
10513msgstr "打印二分查找术语"
10514
d9488fea 10515#: builtin/bisect--helper.c:884
06991777 10516msgid "start the bisect session"
5b533632 10517msgstr "启动二分查找过程"
06991777 10518
d9488fea
JX
10519#: builtin/bisect--helper.c:886
10520msgid "find the next bisection commit"
10521msgstr "查询下一个二分查找提交"
10522
10523#: builtin/bisect--helper.c:888
10524msgid "verify the next bisection state then checkout the next bisection commit"
10525msgstr "校验下一个二分查找状态然后检出下一个二分查找提交"
ef317cd5 10526
d9488fea
JX
10527#: builtin/bisect--helper.c:890
10528msgid "start the bisection if it has not yet been started"
10529msgstr "如果二分查找尚未启动,则启动之"
10530
10531#: builtin/bisect--helper.c:892
06991777
JX
10532msgid "no log for BISECT_WRITE"
10533msgstr "BISECT_WRITE 无日志"
10534
d9488fea 10535#: builtin/bisect--helper.c:910
5809aa05
JX
10536msgid "--write-terms requires two arguments"
10537msgstr "--write-terms 需要两个参数"
10538
d9488fea 10539#: builtin/bisect--helper.c:914
5809aa05 10540msgid "--bisect-clean-state requires no arguments"
8e4e0555 10541msgstr "--bisect-clean-state 不带参数"
5809aa05 10542
d9488fea 10543#: builtin/bisect--helper.c:921
06991777
JX
10544msgid "--bisect-reset requires either no argument or a commit"
10545msgstr "--bisect-reset 无需参数或者需要一个提交"
10546
d9488fea 10547#: builtin/bisect--helper.c:925
06991777
JX
10548msgid "--bisect-write requires either 4 or 5 arguments"
10549msgstr "--bisect-write 需要 4 或 5 个参数"
10550
d9488fea 10551#: builtin/bisect--helper.c:931
06991777
JX
10552msgid "--check-and-set-terms requires 3 arguments"
10553msgstr "--check-and-set-terms 需要 3 个参数"
10554
d9488fea 10555#: builtin/bisect--helper.c:937
06991777
JX
10556msgid "--bisect-next-check requires 2 or 3 arguments"
10557msgstr "--bisect-next-check 需要 2 或 3 个参数"
10558
d9488fea 10559#: builtin/bisect--helper.c:943
06991777
JX
10560msgid "--bisect-terms requires 0 or 1 argument"
10561msgstr "--bisect-terms 需要 0 或 1 个参数"
10562
d9488fea
JX
10563#: builtin/bisect--helper.c:952
10564msgid "--bisect-next requires 0 arguments"
10565msgstr "--bisect-next 需要 0 个参数"
10566
10567#: builtin/bisect--helper.c:958
10568msgid "--bisect-auto-next requires 0 arguments"
10569msgstr "--bisect-auto-next 需要 0 个参数"
10570
10571#: builtin/bisect--helper.c:964
10572msgid "--bisect-autostart does not accept arguments"
10573msgstr "--bisect-autostart 不带参数"
10574
10575#: builtin/blame.c:32
7aea43ff
JX
10576msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
10577msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
ef317cd5 10578
d9488fea 10579#: builtin/blame.c:37
814ff314
JX
10580msgid "<rev-opts> are documented in git-rev-list(1)"
10581msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
ef317cd5 10582
d9488fea 10583#: builtin/blame.c:410
fd8cb379
JX
10584#, c-format
10585msgid "expecting a color: %s"
10586msgstr "期望一个颜色:%s"
10587
d9488fea 10588#: builtin/blame.c:417
fd8cb379
JX
10589msgid "must end with a color"
10590msgstr "必须以一个颜色结尾"
10591
d9488fea 10592#: builtin/blame.c:730
fd8cb379
JX
10593#, c-format
10594msgid "invalid color '%s' in color.blame.repeatedLines"
10595msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
10596
d9488fea 10597#: builtin/blame.c:748
fd8cb379
JX
10598msgid "invalid value for blame.coloring"
10599msgstr "设置 blame.coloring 中的无效取值"
10600
d9488fea 10601#: builtin/blame.c:845
a6cd2cc4
JX
10602#, c-format
10603msgid "cannot find revision %s to ignore"
10604msgstr "不能找到要忽略的版本 %s"
10605
d9488fea 10606#: builtin/blame.c:867
ef317cd5 10607msgid "Show blame entries as we find them, incrementally"
07432cef 10608msgstr "增量式地显示发现的 blame 条目"
ef317cd5 10609
d9488fea
JX
10610#: builtin/blame.c:868
10611msgid "Do not show object names of boundary commits (Default: off)"
10612msgstr "不显示边界提交的对象名(默认:关闭)"
ef317cd5 10613
d9488fea 10614#: builtin/blame.c:869
ef317cd5 10615msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 10616msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 10617
d9488fea 10618#: builtin/blame.c:870
ef317cd5 10619msgid "Show work cost statistics"
07432cef 10620msgstr "显示命令消耗统计"
ef317cd5 10621
d9488fea 10622#: builtin/blame.c:871
276ceeaa
JX
10623msgid "Force progress reporting"
10624msgstr "强制进度显示"
10625
d9488fea 10626#: builtin/blame.c:872
ef317cd5 10627msgid "Show output score for blame entries"
07432cef 10628msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 10629
d9488fea 10630#: builtin/blame.c:873
ef317cd5 10631msgid "Show original filename (Default: auto)"
07432cef 10632msgstr "显示原始文件名(默认:自动)"
ef317cd5 10633
d9488fea 10634#: builtin/blame.c:874
ef317cd5 10635msgid "Show original linenumber (Default: off)"
07432cef 10636msgstr "显示原始的行号(默认:关闭)"
ef317cd5 10637
d9488fea 10638#: builtin/blame.c:875
ef317cd5 10639msgid "Show in a format designed for machine consumption"
07432cef 10640msgstr "显示为一个适合机器读取的格式"
ef317cd5 10641
d9488fea 10642#: builtin/blame.c:876
ef317cd5 10643msgid "Show porcelain format with per-line commit information"
07432cef 10644msgstr "为每一行显示机器适用的提交信息"
ef317cd5 10645
d9488fea 10646#: builtin/blame.c:877
ef317cd5 10647msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 10648msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 10649
d9488fea 10650#: builtin/blame.c:878
ef317cd5 10651msgid "Show raw timestamp (Default: off)"
07432cef 10652msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 10653
d9488fea 10654#: builtin/blame.c:879
ef317cd5 10655msgid "Show long commit SHA1 (Default: off)"
4375c10e 10656msgstr "显示长的 SHA1 提交号(默认:关闭)"
ef317cd5 10657
d9488fea 10658#: builtin/blame.c:880
ef317cd5 10659msgid "Suppress author name and timestamp (Default: off)"
07432cef 10660msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 10661
d9488fea 10662#: builtin/blame.c:881
ef317cd5 10663msgid "Show author email instead of name (Default: off)"
07432cef 10664msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 10665
d9488fea 10666#: builtin/blame.c:882
ef317cd5 10667msgid "Ignore whitespace differences"
07432cef 10668msgstr "忽略空白差异"
ef317cd5 10669
d9488fea 10670#: builtin/blame.c:883 builtin/log.c:1808
a6cd2cc4
JX
10671msgid "rev"
10672msgstr "版本"
10673
d9488fea 10674#: builtin/blame.c:883
a6cd2cc4
JX
10675msgid "Ignore <rev> when blaming"
10676msgstr "在执行 blame 操作时忽略 <版本>"
10677
d9488fea 10678#: builtin/blame.c:884
a6cd2cc4
JX
10679msgid "Ignore revisions from <file>"
10680msgstr "忽略来自 <文件> 中的版本"
10681
d9488fea 10682#: builtin/blame.c:885
fd8cb379
JX
10683msgid "color redundant metadata from previous line differently"
10684msgstr "使用颜色间隔输出与前一行不同的重复元信息"
10685
d9488fea 10686#: builtin/blame.c:886
fd8cb379
JX
10687msgid "color lines by age"
10688msgstr "依据时间着色"
10689
d9488fea 10690#: builtin/blame.c:887
ef317cd5 10691msgid "Spend extra cycles to find better match"
07432cef 10692msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 10693
d9488fea 10694#: builtin/blame.c:888
ef317cd5 10695msgid "Use revisions from <file> instead of calling git-rev-list"
d9d56b23 10696msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
ef317cd5 10697
d9488fea 10698#: builtin/blame.c:889
ef317cd5 10699msgid "Use <file>'s contents as the final image"
d9d56b23 10700msgstr "使用 <文件> 的内容作为最终的图片"
ef317cd5 10701
d9488fea 10702#: builtin/blame.c:890 builtin/blame.c:891
ef317cd5 10703msgid "score"
07432cef 10704msgstr "得分"
ef317cd5 10705
d9488fea 10706#: builtin/blame.c:890
ef317cd5 10707msgid "Find line copies within and across files"
07432cef 10708msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 10709
d9488fea 10710#: builtin/blame.c:891
ef317cd5 10711msgid "Find line movements within and across files"
07432cef 10712msgstr "找到文件内及跨文件的行移动"
ef317cd5 10713
d9488fea 10714#: builtin/blame.c:892
ef317cd5 10715msgid "n,m"
07432cef 10716msgstr "n,m"
ef317cd5 10717
d9488fea 10718#: builtin/blame.c:892
ef317cd5 10719msgid "Process only line range n,m, counting from 1"
07432cef 10720msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 10721
d9488fea 10722#: builtin/blame.c:944
a0b6b246
JX
10723msgid "--progress can't be used with --incremental or porcelain formats"
10724msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
10725
a4f16749
JX
10726#. TRANSLATORS: This string is used to tell us the
10727#. maximum display width for a relative timestamp in
10728#. "git blame" output. For C locale, "4 years, 11
10729#. months ago", which takes 22 places, is the longest
10730#. among various forms of relative timestamps, but
10731#. your language may need more or fewer display
10732#. columns.
10733#.
d9488fea 10734#: builtin/blame.c:995
6c94aba5
JX
10735msgid "4 years, 11 months ago"
10736msgstr "4 年 11 个月前"
10737
d9488fea 10738#: builtin/blame.c:1110
a0b6b246
JX
10739#, c-format
10740msgid "file %s has only %lu line"
10741msgid_plural "file %s has only %lu lines"
10742msgstr[0] "文件 %s 只有 %lu 行"
10743msgstr[1] "文件 %s 只有 %lu 行"
10744
d9488fea 10745#: builtin/blame.c:1156
a4f16749
JX
10746msgid "Blaming lines"
10747msgstr "追踪代码行"
10748
4c27fcb5 10749#: builtin/branch.c:29
d9488fea
JX
10750msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
10751msgstr "git branch [<选项>] [-r | -a] [--merged] [--no-merged]"
ef317cd5 10752
4c27fcb5 10753#: builtin/branch.c:30
814ff314
JX
10754msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
10755msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 10756
4c27fcb5 10757#: builtin/branch.c:31
814ff314
JX
10758msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
10759msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
ef317cd5 10760
4c27fcb5 10761#: builtin/branch.c:32
814ff314
JX
10762msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
10763msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 10764
4c27fcb5 10765#: builtin/branch.c:33
6937cb4e
JX
10766msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
10767msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
10768
4c27fcb5 10769#: builtin/branch.c:34
94550ed3
JX
10770msgid "git branch [<options>] [-r | -a] [--points-at]"
10771msgstr "git branch [<选项>] [-r | -a] [--points-at]"
10772
4c27fcb5 10773#: builtin/branch.c:35
87cb7997
JX
10774msgid "git branch [<options>] [-r | -a] [--format]"
10775msgstr "git branch [<选项>] [-r | -a] [--format]"
10776
90e6ef53 10777# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
a6cd2cc4 10778#: builtin/branch.c:154
c04f5ac3
JX
10779#, c-format
10780msgid ""
10781"deleting branch '%s' that has been merged to\n"
10782" '%s', but not yet merged to HEAD."
10783msgstr ""
70fc47bf 10784"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
10785" '%s',但未合并到 HEAD。"
10786
90e6ef53 10787# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
a6cd2cc4 10788#: builtin/branch.c:158
c04f5ac3
JX
10789#, c-format
10790msgid ""
10791"not deleting branch '%s' that is not yet merged to\n"
10792" '%s', even though it is merged to HEAD."
10793msgstr ""
70fc47bf
T
10794"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
10795" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 10796
a6cd2cc4 10797#: builtin/branch.c:172
07432cef
WS
10798#, c-format
10799msgid "Couldn't look up commit object for '%s'"
10800msgstr "无法查询 '%s' 指向的提交对象"
10801
a6cd2cc4 10802#: builtin/branch.c:176
07432cef
WS
10803#, c-format
10804msgid ""
10805"The branch '%s' is not fully merged.\n"
10806"If you are sure you want to delete it, run 'git branch -D %s'."
10807msgstr ""
10808"分支 '%s' 没有完全合并。\n"
10809"如果您确认要删除它,执行 'git branch -D %s'。"
10810
a6cd2cc4 10811#: builtin/branch.c:189
07432cef 10812msgid "Update of config-file failed"
6937cb4e 10813msgstr "更新配置文件失败"
07432cef 10814
a6cd2cc4 10815#: builtin/branch.c:220
c04f5ac3 10816msgid "cannot use -a with -d"
649900bc 10817msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 10818
a6cd2cc4 10819#: builtin/branch.c:226
c04f5ac3
JX
10820msgid "Couldn't look up commit object for HEAD"
10821msgstr "无法查询 HEAD 指向的提交对象"
10822
a6cd2cc4 10823#: builtin/branch.c:240
c04f5ac3 10824#, c-format
5b04ee3b
JX
10825msgid "Cannot delete branch '%s' checked out at '%s'"
10826msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
c04f5ac3 10827
a6cd2cc4 10828#: builtin/branch.c:255
5ae481e0 10829#, c-format
7aea43ff
JX
10830msgid "remote-tracking branch '%s' not found."
10831msgstr "未能找到远程跟踪分支 '%s'。"
c04f5ac3 10832
a6cd2cc4 10833#: builtin/branch.c:256
81809b99 10834#, c-format
8ada9598 10835msgid "branch '%s' not found."
81809b99 10836msgstr "分支 '%s' 未发现。"
8ada9598 10837
a6cd2cc4 10838#: builtin/branch.c:271
81809b99 10839#, c-format
7aea43ff
JX
10840msgid "Error deleting remote-tracking branch '%s'"
10841msgstr "无法删除远程跟踪分支 '%s'"
c04f5ac3 10842
a6cd2cc4 10843#: builtin/branch.c:272
81809b99 10844#, c-format
8ada9598 10845msgid "Error deleting branch '%s'"
7aea43ff 10846msgstr "无法删除分支 '%s'"
8ada9598 10847
a6cd2cc4 10848#: builtin/branch.c:279
81809b99 10849#, c-format
7aea43ff
JX
10850msgid "Deleted remote-tracking branch %s (was %s).\n"
10851msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
c04f5ac3 10852
a6cd2cc4 10853#: builtin/branch.c:280
81809b99 10854#, c-format
8ada9598 10855msgid "Deleted branch %s (was %s).\n"
81809b99 10856msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 10857
a6cd2cc4 10858#: builtin/branch.c:429 builtin/tag.c:61
6937cb4e
JX
10859msgid "unable to parse format string"
10860msgstr "不能解析格式化字符串"
10861
a6cd2cc4 10862#: builtin/branch.c:460
d46c5519
JX
10863msgid "could not resolve HEAD"
10864msgstr "不能解析 HEAD 提交"
10865
a6cd2cc4 10866#: builtin/branch.c:466
5b04ee3b 10867#, c-format
d46c5519
JX
10868msgid "HEAD (%s) points outside of refs/heads/"
10869msgstr "HEAD (%s) 指向 refs/heads/ 之外"
10870
a6cd2cc4 10871#: builtin/branch.c:481
d46c5519 10872#, c-format
5b04ee3b
JX
10873msgid "Branch %s is being rebased at %s"
10874msgstr "分支 %s 正被变基到 %s"
10875
a6cd2cc4 10876#: builtin/branch.c:485
5b04ee3b
JX
10877#, c-format
10878msgid "Branch %s is being bisected at %s"
10879msgstr "分支 %s 正被二分查找于 %s"
10880
a6cd2cc4 10881#: builtin/branch.c:502
6937cb4e
JX
10882msgid "cannot copy the current branch while not on any."
10883msgstr "无法拷贝当前分支因为不处于任何分支上。"
10884
a6cd2cc4 10885#: builtin/branch.c:504
c04f5ac3 10886msgid "cannot rename the current branch while not on any."
90e6ef53 10887msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 10888
a6cd2cc4 10889#: builtin/branch.c:515
c04f5ac3
JX
10890#, c-format
10891msgid "Invalid branch name: '%s'"
10892msgstr "无效的分支名:'%s'"
10893
a6cd2cc4 10894#: builtin/branch.c:542
c04f5ac3
JX
10895msgid "Branch rename failed"
10896msgstr "分支重命名失败"
10897
a6cd2cc4 10898#: builtin/branch.c:544
6937cb4e
JX
10899msgid "Branch copy failed"
10900msgstr "分支拷贝失败"
10901
a6cd2cc4 10902#: builtin/branch.c:548
6937cb4e 10903#, c-format
5809aa05
JX
10904msgid "Created a copy of a misnamed branch '%s'"
10905msgstr "已为错误命名的分支 '%s' 创建了一个副本"
6937cb4e 10906
a6cd2cc4 10907#: builtin/branch.c:551
c04f5ac3
JX
10908#, c-format
10909msgid "Renamed a misnamed branch '%s' away"
6937cb4e 10910msgstr "已将错误命名的分支 '%s' 重命名"
c04f5ac3 10911
a6cd2cc4 10912#: builtin/branch.c:557
c04f5ac3
JX
10913#, c-format
10914msgid "Branch renamed to %s, but HEAD is not updated!"
10915msgstr "分支重命名为 %s,但 HEAD 没有更新!"
10916
a6cd2cc4 10917#: builtin/branch.c:566
c04f5ac3 10918msgid "Branch is renamed, but update of config-file failed"
6937cb4e
JX
10919msgstr "分支被重命名,但更新配置文件失败"
10920
a6cd2cc4 10921#: builtin/branch.c:568
6937cb4e
JX
10922msgid "Branch is copied, but update of config-file failed"
10923msgstr "分支已拷贝,但更新配置文件失败"
c04f5ac3 10924
a6cd2cc4 10925#: builtin/branch.c:584
5c57d762
JX
10926#, c-format
10927msgid ""
10928"Please edit the description for the branch\n"
10929" %s\n"
10930"Lines starting with '%c' will be stripped.\n"
10931msgstr ""
10932"请编辑分支的描述\n"
10933" %s\n"
10934"以 '%c' 开头的行将被过滤。\n"
c04f5ac3 10935
a6cd2cc4 10936#: builtin/branch.c:618
ef317cd5 10937msgid "Generic options"
07432cef 10938msgstr "通用选项"
c04f5ac3 10939
a6cd2cc4 10940#: builtin/branch.c:620
ef317cd5 10941msgid "show hash and subject, give twice for upstream branch"
07432cef 10942msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 10943
a6cd2cc4 10944#: builtin/branch.c:621
ef317cd5 10945msgid "suppress informational messages"
07432cef 10946msgstr "不显示信息"
8ada9598 10947
a6cd2cc4 10948#: builtin/branch.c:622
ef317cd5 10949msgid "set up tracking mode (see git-pull(1))"
07432cef 10950msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 10951
a6cd2cc4 10952#: builtin/branch.c:624
6937cb4e
JX
10953msgid "do not use"
10954msgstr "不要使用"
c04f5ac3 10955
d9488fea 10956#: builtin/branch.c:626 builtin/rebase.c:526
5b04ee3b
JX
10957msgid "upstream"
10958msgstr "上游"
10959
a6cd2cc4 10960#: builtin/branch.c:626
5b04ee3b
JX
10961msgid "change the upstream info"
10962msgstr "改变上游信息"
10963
a6cd2cc4 10964#: builtin/branch.c:627
ddc12c42 10965msgid "unset the upstream info"
a0b6b246
JX
10966msgstr "取消上游信息的设置"
10967
a6cd2cc4 10968#: builtin/branch.c:628
ef317cd5 10969msgid "use colored output"
07432cef 10970msgstr "使用彩色输出"
c04f5ac3 10971
a6cd2cc4 10972#: builtin/branch.c:629
ef317cd5 10973msgid "act on remote-tracking branches"
07432cef 10974msgstr "作用于远程跟踪分支"
c04f5ac3 10975
a6cd2cc4 10976#: builtin/branch.c:631 builtin/branch.c:633
ef317cd5 10977msgid "print only branches that contain the commit"
07432cef 10978msgstr "只打印包含该提交的分支"
c04f5ac3 10979
a6cd2cc4 10980#: builtin/branch.c:632 builtin/branch.c:634
87cb7997
JX
10981msgid "print only branches that don't contain the commit"
10982msgstr "只打印不包含该提交的分支"
10983
a6cd2cc4 10984#: builtin/branch.c:637
ef317cd5 10985msgid "Specific git-branch actions:"
07432cef 10986msgstr "具体的 git-branch 动作:"
c04f5ac3 10987
a6cd2cc4 10988#: builtin/branch.c:638
ef317cd5 10989msgid "list both remote-tracking and local branches"
07432cef 10990msgstr "列出远程跟踪及本地分支"
c04f5ac3 10991
a6cd2cc4 10992#: builtin/branch.c:640
ef317cd5 10993msgid "delete fully merged branch"
07432cef 10994msgstr "删除完全合并的分支"
c04f5ac3 10995
a6cd2cc4 10996#: builtin/branch.c:641
ef317cd5 10997msgid "delete branch (even if not merged)"
07432cef 10998msgstr "删除分支(即使没有合并)"
c04f5ac3 10999
a6cd2cc4 11000#: builtin/branch.c:642
ef317cd5 11001msgid "move/rename a branch and its reflog"
07432cef 11002msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 11003
a6cd2cc4 11004#: builtin/branch.c:643
ef317cd5 11005msgid "move/rename a branch, even if target exists"
07432cef 11006msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 11007
a6cd2cc4 11008#: builtin/branch.c:644
6937cb4e
JX
11009msgid "copy a branch and its reflog"
11010msgstr "拷贝一个分支和它的引用日志"
11011
a6cd2cc4 11012#: builtin/branch.c:645
6937cb4e
JX
11013msgid "copy a branch, even if target exists"
11014msgstr "拷贝一个分支,即使目标已存在"
11015
a6cd2cc4 11016#: builtin/branch.c:646
ef317cd5 11017msgid "list branch names"
07432cef 11018msgstr "列出分支名"
c04f5ac3 11019
a6cd2cc4 11020#: builtin/branch.c:647
d46c5519
JX
11021msgid "show current branch name"
11022msgstr "显示当前分支名"
11023
a6cd2cc4 11024#: builtin/branch.c:648
ef317cd5 11025msgid "create the branch's reflog"
07432cef 11026msgstr "创建分支的引用日志"
ef317cd5 11027
a6cd2cc4 11028#: builtin/branch.c:650
ef317cd5 11029msgid "edit the description for the branch"
07432cef 11030msgstr "标记分支的描述"
ef317cd5 11031
a6cd2cc4 11032#: builtin/branch.c:651
04cb2f28
JX
11033msgid "force creation, move/rename, deletion"
11034msgstr "强制创建、移动/重命名、删除"
ef317cd5 11035
a6cd2cc4 11036#: builtin/branch.c:652
94550ed3
JX
11037msgid "print only branches that are merged"
11038msgstr "只打印已经合并的分支"
ef317cd5 11039
a6cd2cc4 11040#: builtin/branch.c:653
94550ed3
JX
11041msgid "print only branches that are not merged"
11042msgstr "只打印尚未合并的分支"
ef317cd5 11043
a6cd2cc4 11044#: builtin/branch.c:654
ef317cd5 11045msgid "list branches in columns"
07432cef 11046msgstr "以列的方式显示分支"
ef317cd5 11047
349ede6a 11048#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415
06991777 11049#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
349ede6a 11050#: builtin/tag.c:434
94550ed3
JX
11051msgid "object"
11052msgstr "对象"
11053
349ede6a 11054#: builtin/branch.c:657
94550ed3
JX
11055msgid "print only branches of the object"
11056msgstr "只打印指向该对象的分支"
11057
349ede6a 11058#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441
1a79b2f1
JX
11059msgid "sorting and filtering are case insensitive"
11060msgstr "排序和过滤属于大小写不敏感"
11061
349ede6a 11062#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439
a6cd2cc4 11063#: builtin/verify-tag.c:38
87cb7997
JX
11064msgid "format to use for the output"
11065msgstr "输出格式"
11066
349ede6a 11067#: builtin/branch.c:682 builtin/clone.c:789
c04f5ac3 11068msgid "HEAD not found below refs/heads!"
90e6ef53 11069msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 11070
349ede6a 11071#: builtin/branch.c:706
8ada9598 11072msgid "--column and --verbose are incompatible"
81809b99 11073msgstr "--column 和 --verbose 不兼容"
8ada9598 11074
349ede6a 11075#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784
a77c07d9
JX
11076msgid "branch name required"
11077msgstr "必须提供分支名"
11078
349ede6a 11079#: builtin/branch.c:751
a77c07d9
JX
11080msgid "Cannot give description to detached HEAD"
11081msgstr "不能向分离头指针提供描述"
11082
349ede6a 11083#: builtin/branch.c:756
a77c07d9
JX
11084msgid "cannot edit description of more than one branch"
11085msgstr "不能为一个以上的分支编辑描述"
11086
349ede6a 11087#: builtin/branch.c:763
a77c07d9
JX
11088#, c-format
11089msgid "No commit on branch '%s' yet."
11090msgstr "分支 '%s' 尚无提交。"
11091
349ede6a 11092#: builtin/branch.c:766
a77c07d9
JX
11093#, c-format
11094msgid "No branch named '%s'."
11095msgstr "没有分支 '%s'。"
11096
349ede6a 11097#: builtin/branch.c:781
6937cb4e
JX
11098msgid "too many branches for a copy operation"
11099msgstr "为拷贝操作提供了太多的分支名"
a77c07d9 11100
349ede6a 11101#: builtin/branch.c:790
6937cb4e
JX
11102msgid "too many arguments for a rename operation"
11103msgstr "为重命名操作提供了太多的参数"
1003b3a5 11104
349ede6a 11105#: builtin/branch.c:795
6937cb4e
JX
11106msgid "too many arguments to set new upstream"
11107msgstr "为设置新上游提供了太多的参数"
11108
349ede6a 11109#: builtin/branch.c:799
1003b3a5
JX
11110#, c-format
11111msgid ""
11112"could not set upstream of HEAD to %s when it does not point to any branch."
11113msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
11114
349ede6a 11115#: builtin/branch.c:802 builtin/branch.c:825
1003b3a5
JX
11116#, c-format
11117msgid "no such branch '%s'"
11118msgstr "没有此分支 '%s'"
11119
349ede6a 11120#: builtin/branch.c:806
07432cef 11121#, c-format
ef317cd5 11122msgid "branch '%s' does not exist"
07432cef 11123msgstr "分支 '%s' 不存在"
ef317cd5 11124
349ede6a 11125#: builtin/branch.c:819
6937cb4e
JX
11126msgid "too many arguments to unset upstream"
11127msgstr "为取消上游设置操作提供了太多的参数"
1003b3a5 11128
349ede6a 11129#: builtin/branch.c:823
1003b3a5
JX
11130msgid "could not unset upstream of HEAD when it does not point to any branch."
11131msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
11132
349ede6a 11133#: builtin/branch.c:829
ef317cd5
JX
11134#, c-format
11135msgid "Branch '%s' has no upstream information"
07432cef 11136msgstr "分支 '%s' 没有上游信息"
ef317cd5 11137
349ede6a 11138#: builtin/branch.c:839
a6cd2cc4
JX
11139msgid ""
11140"The -a, and -r, options to 'git branch' do not take a branch name.\n"
11141"Did you mean to use: -a|-r --list <pattern>?"
11142msgstr ""
11143"'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
11144"您是否想要使用:-a|-r --list <模式>?"
c04f5ac3 11145
349ede6a 11146#: builtin/branch.c:843
ddc12c42
JX
11147msgid ""
11148"the '--set-upstream' option is no longer supported. Please use '--track' or "
11149"'--set-upstream-to' instead."
11150msgstr ""
11151"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
11152
d9488fea
JX
11153#: builtin/bugreport.c:15
11154msgid "git version:\n"
11155msgstr "git 版本:\n"
11156
11157#: builtin/bugreport.c:21
11158#, c-format
11159msgid "uname() failed with error '%s' (%d)\n"
11160msgstr "uname() 失败,错误为 '%s'(%d)\n"
11161
11162#: builtin/bugreport.c:31
11163msgid "compiler info: "
11164msgstr "编译器信息:"
11165
11166#: builtin/bugreport.c:34
11167msgid "libc info: "
11168msgstr "libc 信息:"
11169
11170#: builtin/bugreport.c:80
11171msgid "not run from a git repository - no hooks to show\n"
11172msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n"
11173
11174#: builtin/bugreport.c:90
11175msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
11176msgstr "git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>]"
11177
11178#: builtin/bugreport.c:97
11179msgid ""
11180"Thank you for filling out a Git bug report!\n"
11181"Please answer the following questions to help us understand your issue.\n"
11182"\n"
11183"What did you do before the bug happened? (Steps to reproduce your issue)\n"
11184"\n"
11185"What did you expect to happen? (Expected behavior)\n"
11186"\n"
11187"What happened instead? (Actual behavior)\n"
11188"\n"
11189"What's different between what you expected and what actually happened?\n"
11190"\n"
11191"Anything else you want to add:\n"
11192"\n"
11193"Please review the rest of the bug report below.\n"
11194"You can delete any lines you don't wish to share.\n"
11195msgstr ""
11196"感谢您填写 Git 错误报告!\n"
11197"请填写以下问卷,以帮助我们了解您的问题。\n"
11198"\n"
11199"在错误发生之前,您做了什么?(重现问题的步骤)\n"
11200"\n"
11201"您期望发生什么?(预期行为)\n"
11202"\n"
11203"实际发生了什么?(实际行为)\n"
11204"\n"
11205"您所期望的与实际发生的有什么不同?\n"
11206"\n"
11207"您想要补充的其它内容:\n"
11208"\n"
11209"请检查下面错误报告中余下的内容。\n"
11210"您可以删除任何您不想共享的内容。\n"
11211
11212#: builtin/bugreport.c:134
11213msgid "specify a destination for the bugreport file"
11214msgstr "指定错误报告文件的目标位置"
11215
11216#: builtin/bugreport.c:136
11217msgid "specify a strftime format suffix for the filename"
11218msgstr "指定文件的 strftime 格式后缀"
11219
11220#: builtin/bugreport.c:158
11221#, c-format
11222msgid "could not create leading directories for '%s'"
11223msgstr "不能为 '%s' 创建先导目录"
11224
11225#: builtin/bugreport.c:165
11226msgid "System Info"
11227msgstr "系统信息"
11228
11229#: builtin/bugreport.c:168
11230msgid "Enabled Hooks"
11231msgstr "启用的钩子"
11232
11233#: builtin/bugreport.c:175
11234#, c-format
11235msgid "couldn't create a new file at '%s'"
11236msgstr "不能在 '%s' 创建新文件"
11237
11238#: builtin/bugreport.c:178
11239#, c-format
11240msgid "unable to write to %s"
11241msgstr "无法写入 %s"
11242
11243#: builtin/bugreport.c:188
11244#, c-format
11245msgid "Created new report at '%s'.\n"
11246msgstr "在 '%s' 创建了新报告。\n"
11247
ddc12c42
JX
11248#: builtin/bundle.c:15 builtin/bundle.c:23
11249msgid "git bundle create [<options>] <file> <git-rev-list args>"
11250msgstr "git bundle create [<选项>] <文件> <git-rev-list 参数>"
11251
11252#: builtin/bundle.c:16 builtin/bundle.c:28
11253msgid "git bundle verify [<options>] <file>"
11254msgstr "git bundle verify [<选项>] <文件>"
11255
11256#: builtin/bundle.c:17 builtin/bundle.c:33
11257msgid "git bundle list-heads <file> [<refname>...]"
11258msgstr "git bundle list-heads <文件> [<引用名>...]"
11259
11260#: builtin/bundle.c:18 builtin/bundle.c:38
11261msgid "git bundle unbundle <file> [<refname>...]"
11262msgstr "git bundle unbundle <文件> [<引用名>...]"
11263
d9488fea 11264#: builtin/bundle.c:67 builtin/pack-objects.c:3480
ddc12c42
JX
11265msgid "do not show progress meter"
11266msgstr "不显示进度表"
11267
d9488fea 11268#: builtin/bundle.c:69 builtin/pack-objects.c:3482
ddc12c42
JX
11269msgid "show progress meter"
11270msgstr "显示进度表"
11271
d9488fea 11272#: builtin/bundle.c:71 builtin/pack-objects.c:3484
ddc12c42
JX
11273msgid "show progress meter during object writing phase"
11274msgstr "在对象写入阶段显示进度表"
11275
d9488fea 11276#: builtin/bundle.c:74 builtin/pack-objects.c:3487
ddc12c42
JX
11277msgid "similar to --all-progress when progress meter is shown"
11278msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 11279
d9488fea
JX
11280#: builtin/bundle.c:76
11281msgid "specify bundle format version"
11282msgstr "指定归档包的格式版本"
11283
11284#: builtin/bundle.c:96
ddc12c42 11285msgid "Need a repository to create a bundle."
d9488fea 11286msgstr "需要一个仓库来创建归档包。"
ddc12c42 11287
d9488fea 11288#: builtin/bundle.c:107
ddc12c42 11289msgid "do not show bundle details"
d9488fea 11290msgstr "不显示归档包的细节"
ddc12c42 11291
d9488fea 11292#: builtin/bundle.c:122
c04f5ac3
JX
11293#, c-format
11294msgid "%s is okay\n"
11295msgstr "%s 可以\n"
11296
d9488fea 11297#: builtin/bundle.c:163
c04f5ac3 11298msgid "Need a repository to unbundle."
d9488fea 11299msgstr "需要一个仓库来解开归档包。"
c04f5ac3 11300
d9488fea 11301#: builtin/bundle.c:171 builtin/remote.c:1687
ddc12c42
JX
11302msgid "be verbose; must be placed before a subcommand"
11303msgstr "冗长输出;必须置于子命令之前"
11304
d9488fea 11305#: builtin/bundle.c:193 builtin/remote.c:1718
ddc12c42
JX
11306#, c-format
11307msgid "Unknown subcommand: %s"
11308msgstr "未知子命令:%s"
11309
349ede6a 11310#: builtin/cat-file.c:598
7aea43ff 11311msgid ""
a0b6b246
JX
11312"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
11313"p | <type> | --textconv | --filters) [--path=<path>] <object>"
275588f9
JX
11314msgstr ""
11315"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
11316"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
ef317cd5 11317
349ede6a 11318#: builtin/cat-file.c:599
a0b6b246 11319msgid ""
7157c2b5
JX
11320"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
11321"symlinks] [--textconv | --filters]"
d9488fea
JX
11322msgstr ""
11323"git cat-file (--batch[=<格式>] | --batch-check[=<格式>]) [--follow-symlinks] "
11324"[--textconv | --filters]"
ef317cd5 11325
349ede6a 11326#: builtin/cat-file.c:620
4c27fcb5
JX
11327msgid "only one batch option may be specified"
11328msgstr "只能指定一个批处理选项"
11329
349ede6a 11330#: builtin/cat-file.c:638
ef317cd5 11331msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 11332msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 11333
349ede6a 11334#: builtin/cat-file.c:639
ef317cd5 11335msgid "show object type"
07432cef 11336msgstr "显示对象类型"
ef317cd5 11337
349ede6a 11338#: builtin/cat-file.c:640
ef317cd5 11339msgid "show object size"
07432cef 11340msgstr "显示对象大小"
ef317cd5 11341
349ede6a 11342#: builtin/cat-file.c:642
ef317cd5 11343msgid "exit with zero when there's no error"
07432cef 11344msgstr "当没有错误时退出并返回零"
ef317cd5 11345
349ede6a 11346#: builtin/cat-file.c:643
ef317cd5 11347msgid "pretty-print object's content"
07432cef 11348msgstr "美观地打印对象的内容"
ef317cd5 11349
349ede6a 11350#: builtin/cat-file.c:645
ef317cd5 11351msgid "for blob objects, run textconv on object's content"
a0b6b246
JX
11352msgstr "对于数据对象,对其内容做文本转换"
11353
349ede6a 11354#: builtin/cat-file.c:647
a0b6b246
JX
11355msgid "for blob objects, run filters on object's content"
11356msgstr "对于数据对象,对其内容做过滤"
11357
d9488fea 11358#: builtin/cat-file.c:648
a0b6b246
JX
11359msgid "blob"
11360msgstr "数据对象"
11361
349ede6a 11362#: builtin/cat-file.c:649
a0b6b246
JX
11363msgid "use a specific path for --textconv/--filters"
11364msgstr "对于 --textconv/--filters 使用一个特定的路径"
ef317cd5 11365
349ede6a 11366#: builtin/cat-file.c:651
7aea43ff
JX
11367msgid "allow -s and -t to work with broken/corrupt objects"
11368msgstr "允许 -s 和 -t 对损坏的对象生效"
11369
349ede6a 11370#: builtin/cat-file.c:652
1b7f4a34
JX
11371msgid "buffer --batch output"
11372msgstr "缓冲 --batch 的输出"
11373
349ede6a 11374#: builtin/cat-file.c:654
ef317cd5 11375msgid "show info and content of objects fed from the standard input"
07432cef 11376msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 11377
349ede6a 11378#: builtin/cat-file.c:658
ef317cd5 11379msgid "show info about objects fed from the standard input"
07432cef 11380msgstr "显示从标准输入提供的对象的信息"
ef317cd5 11381
349ede6a 11382#: builtin/cat-file.c:662
7aea43ff
JX
11383msgid "follow in-tree symlinks (used with --batch or --batch-check)"
11384msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
11385
349ede6a 11386#: builtin/cat-file.c:664
1b7f4a34
JX
11387msgid "show all objects with --batch or --batch-check"
11388msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
11389
349ede6a 11390#: builtin/cat-file.c:666
c1ac5258
JX
11391msgid "do not order --batch-all-objects output"
11392msgstr "不要对 --batch-all-objects 的输出排序"
11393
06991777 11394#: builtin/check-attr.c:13
814ff314
JX
11395msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
11396msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
ef317cd5 11397
06991777 11398#: builtin/check-attr.c:14
94550ed3
JX
11399msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
11400msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
ef317cd5 11401
06991777 11402#: builtin/check-attr.c:21
ef317cd5 11403msgid "report all attributes set on file"
07432cef 11404msgstr "报告设置在文件上的所有属性"
ef317cd5 11405
06991777 11406#: builtin/check-attr.c:22
ef317cd5 11407msgid "use .gitattributes only from the index"
07432cef 11408msgstr "只使用索引中的 .gitattributes"
ef317cd5 11409
06991777 11410#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
ef317cd5 11411msgid "read file names from stdin"
07432cef 11412msgstr "从标准输入读出文件名"
ef317cd5 11413
06991777 11414#: builtin/check-attr.c:25 builtin/check-ignore.c:27
90314792
JX
11415msgid "terminate input and output records by a NUL character"
11416msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 11417
d9488fea 11418#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538
7157c2b5 11419#: builtin/worktree.c:561
a77c07d9
JX
11420msgid "suppress progress reporting"
11421msgstr "不显示进度报告"
11422
06991777 11423#: builtin/check-ignore.c:29
2e8451e8
JX
11424msgid "show non-matching input paths"
11425msgstr "显示未匹配的输入路径"
11426
06991777 11427#: builtin/check-ignore.c:31
90314792
JX
11428msgid "ignore index when checking"
11429msgstr "检查时忽略索引"
11430
2b472aae 11431#: builtin/check-ignore.c:163
a77c07d9 11432msgid "cannot specify pathnames with --stdin"
1b7f4a34 11433msgstr "不能同时指定路径及 --stdin 参数"
a77c07d9 11434
2b472aae 11435#: builtin/check-ignore.c:166
a77c07d9
JX
11436msgid "-z only makes sense with --stdin"
11437msgstr "-z 需要和 --stdin 参数共用才有意义"
11438
2b472aae 11439#: builtin/check-ignore.c:168
a77c07d9
JX
11440msgid "no path specified"
11441msgstr "未指定路径"
11442
2b472aae 11443#: builtin/check-ignore.c:172
a77c07d9
JX
11444msgid "--quiet is only valid with a single pathname"
11445msgstr "参数 --quiet 只在提供一个路径名时有效"
11446
2b472aae 11447#: builtin/check-ignore.c:174
a77c07d9
JX
11448msgid "cannot have both --quiet and --verbose"
11449msgstr "不能同时提供 --quiet 和 --verbose 参数"
11450
2b472aae 11451#: builtin/check-ignore.c:177
2e8451e8
JX
11452msgid "--non-matching is only valid with --verbose"
11453msgstr "--non-matching 选项只在使用 --verbose 时有效"
11454
a4f16749 11455#: builtin/check-mailmap.c:9
814ff314
JX
11456msgid "git check-mailmap [<options>] <contact>..."
11457msgstr "git check-mailmap [<选项>] <联系地址>..."
2e8451e8 11458
a4f16749 11459#: builtin/check-mailmap.c:14
2e8451e8
JX
11460msgid "also read contacts from stdin"
11461msgstr "还从标准输入读取联系地址"
11462
a4f16749 11463#: builtin/check-mailmap.c:25
2e8451e8
JX
11464#, c-format
11465msgid "unable to parse contact: %s"
11466msgstr "不能解析联系地址:%s"
11467
a4f16749 11468#: builtin/check-mailmap.c:48
2e8451e8
JX
11469msgid "no contacts specified"
11470msgstr "未指定联系地址"
11471
06991777 11472#: builtin/checkout-index.c:131
814ff314
JX
11473msgid "git checkout-index [<options>] [--] [<file>...]"
11474msgstr "git checkout-index [<选项>] [--] [<文件>...]"
ef317cd5 11475
06991777 11476#: builtin/checkout-index.c:148
276ceeaa
JX
11477msgid "stage should be between 1 and 3 or all"
11478msgstr "索引值应该取值 1 到 3 或者 all"
11479
06991777 11480#: builtin/checkout-index.c:164
ef317cd5 11481msgid "check out all files in the index"
07432cef 11482msgstr "检出索引区的所有文件"
ef317cd5 11483
06991777 11484#: builtin/checkout-index.c:165
ef317cd5 11485msgid "force overwrite of existing files"
07432cef 11486msgstr "强制覆盖现有的文件"
ef317cd5 11487
06991777 11488#: builtin/checkout-index.c:167
ef317cd5 11489msgid "no warning for existing files and files not in index"
07432cef 11490msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 11491
06991777 11492#: builtin/checkout-index.c:169
ef317cd5 11493msgid "don't checkout new files"
07432cef 11494msgstr "不检出新文件"
ef317cd5 11495
06991777 11496#: builtin/checkout-index.c:171
ef317cd5 11497msgid "update stat information in the index file"
07432cef 11498msgstr "更新索引中文件的状态信息"
ef317cd5 11499
06991777 11500#: builtin/checkout-index.c:175
ef317cd5 11501msgid "read list of paths from the standard input"
07432cef 11502msgstr "从标准输入读取路径列表"
ef317cd5 11503
06991777 11504#: builtin/checkout-index.c:177
ef317cd5 11505msgid "write the content to temporary files"
07432cef 11506msgstr "将内容写入临时文件"
ef317cd5 11507
06991777 11508#: builtin/checkout-index.c:178 builtin/column.c:31
d9488fea
JX
11509#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827
11510#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333
7157c2b5 11511#: builtin/worktree.c:754
ef317cd5 11512msgid "string"
07432cef 11513msgstr "字符串"
ef317cd5 11514
06991777 11515#: builtin/checkout-index.c:179
ef317cd5 11516msgid "when creating files, prepend <string>"
4375c10e 11517msgstr "在创建文件时,在前面加上 <字符串>"
ef317cd5 11518
06991777 11519#: builtin/checkout-index.c:181
ef317cd5 11520msgid "copy out the files from named stage"
07432cef 11521msgstr "从指定暂存区中拷出文件"
ef317cd5 11522
a6cd2cc4 11523#: builtin/checkout.c:31
814ff314
JX
11524msgid "git checkout [<options>] <branch>"
11525msgstr "git checkout [<选项>] <分支>"
ef317cd5 11526
a6cd2cc4 11527#: builtin/checkout.c:32
814ff314
JX
11528msgid "git checkout [<options>] [<branch>] -- <file>..."
11529msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
ef317cd5 11530
a6cd2cc4
JX
11531#: builtin/checkout.c:37
11532msgid "git switch [<options>] [<branch>]"
11533msgstr "git switch [<选项>] [<分支>]"
11534
11535#: builtin/checkout.c:42
11536msgid "git restore [<options>] [--source=<branch>] <file>..."
11537msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
11538
349ede6a 11539#: builtin/checkout.c:188 builtin/checkout.c:227
c04f5ac3
JX
11540#, c-format
11541msgid "path '%s' does not have our version"
11542msgstr "路径 '%s' 没有我们的版本"
11543
349ede6a 11544#: builtin/checkout.c:190 builtin/checkout.c:229
c04f5ac3
JX
11545#, c-format
11546msgid "path '%s' does not have their version"
11547msgstr "路径 '%s' 没有他们的版本"
11548
349ede6a 11549#: builtin/checkout.c:206
c04f5ac3
JX
11550#, c-format
11551msgid "path '%s' does not have all necessary versions"
e640d114 11552msgstr "路径 '%s' 没有全部必需的版本"
c04f5ac3 11553
d9488fea 11554#: builtin/checkout.c:258
c04f5ac3
JX
11555#, c-format
11556msgid "path '%s' does not have necessary versions"
e640d114 11557msgstr "路径 '%s' 没有必需的版本"
c04f5ac3 11558
d9488fea 11559#: builtin/checkout.c:275
c04f5ac3
JX
11560#, c-format
11561msgid "path '%s': cannot merge"
90e6ef53 11562msgstr "path '%s':无法合并"
c04f5ac3 11563
d9488fea 11564#: builtin/checkout.c:291
c04f5ac3
JX
11565#, c-format
11566msgid "Unable to add merge result for '%s'"
11567msgstr "无法为 '%s' 添加合并结果"
11568
d9488fea 11569#: builtin/checkout.c:396
a6cd2cc4
JX
11570#, c-format
11571msgid "Recreated %d merge conflict"
11572msgid_plural "Recreated %d merge conflicts"
11573msgstr[0] "重新创建了 %d 个合并冲突"
11574msgstr[1] "重新创建了 %d 个合并冲突"
11575
d9488fea 11576#: builtin/checkout.c:401
a6cd2cc4
JX
11577#, c-format
11578msgid "Updated %d path from %s"
11579msgid_plural "Updated %d paths from %s"
11580msgstr[0] "从 %2$s 更新了 %1$d 个路径"
11581msgstr[1] "从 %2$s 更新了 %1$d 个路径"
11582
d9488fea 11583#: builtin/checkout.c:408
a6cd2cc4
JX
11584#, c-format
11585msgid "Updated %d path from the index"
11586msgid_plural "Updated %d paths from the index"
11587msgstr[0] "从索引区更新了 %d 个路径"
11588msgstr[1] "从索引区更新了 %d 个路径"
11589
d9488fea
JX
11590#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437
11591#: builtin/checkout.c:441
07432cef 11592#, c-format
ef317cd5 11593msgid "'%s' cannot be used with updating paths"
07432cef 11594msgstr "'%s' 不能在更新路径时使用"
ef317cd5 11595
d9488fea 11596#: builtin/checkout.c:444 builtin/checkout.c:447
07432cef 11597#, c-format
ef317cd5 11598msgid "'%s' cannot be used with %s"
07432cef 11599msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 11600
d9488fea 11601#: builtin/checkout.c:451
ef317cd5
JX
11602#, c-format
11603msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 11604msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 11605
d9488fea 11606#: builtin/checkout.c:455
c04f5ac3 11607#, c-format
a6cd2cc4
JX
11608msgid "neither '%s' or '%s' is specified"
11609msgstr "'%s' 或 '%s' 都没有指定"
c04f5ac3 11610
d9488fea 11611#: builtin/checkout.c:459
06991777 11612#, c-format
a6cd2cc4
JX
11613msgid "'%s' must be used when '%s' is not specified"
11614msgstr "未指定 '%2$s' 时,必须使用 '%1$s'"
06991777 11615
d9488fea 11616#: builtin/checkout.c:464 builtin/checkout.c:469
06991777 11617#, c-format
a6cd2cc4
JX
11618msgid "'%s' or '%s' cannot be used with %s"
11619msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
06991777 11620
d9488fea 11621#: builtin/checkout.c:528 builtin/checkout.c:535
06991777 11622#, c-format
a6cd2cc4
JX
11623msgid "path '%s' is unmerged"
11624msgstr "路径 '%s' 未合并"
06991777 11625
d9488fea 11626#: builtin/checkout.c:703
c04f5ac3 11627msgid "you need to resolve your current index first"
90e6ef53 11628msgstr "您需要先解决当前索引的冲突"
c04f5ac3 11629
d9488fea 11630#: builtin/checkout.c:757
d46c5519
JX
11631#, c-format
11632msgid ""
11633"cannot continue with staged changes in the following files:\n"
11634"%s"
11635msgstr ""
11636"不能继续,下列文件有暂存的修改:\n"
11637"%s"
11638
d9488fea 11639#: builtin/checkout.c:853
c04f5ac3 11640#, c-format
1b7f4a34
JX
11641msgid "Can not do reflog for '%s': %s\n"
11642msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
c04f5ac3 11643
d9488fea 11644#: builtin/checkout.c:895
c04f5ac3
JX
11645msgid "HEAD is now at"
11646msgstr "HEAD 目前位于"
11647
d9488fea 11648#: builtin/checkout.c:899 builtin/clone.c:720
3495628d
JX
11649msgid "unable to update HEAD"
11650msgstr "不能更新 HEAD"
11651
d9488fea 11652#: builtin/checkout.c:903
c04f5ac3
JX
11653#, c-format
11654msgid "Reset branch '%s'\n"
11655msgstr "重置分支 '%s'\n"
11656
d9488fea 11657#: builtin/checkout.c:906
c04f5ac3
JX
11658#, c-format
11659msgid "Already on '%s'\n"
11660msgstr "已经位于 '%s'\n"
11661
d9488fea 11662#: builtin/checkout.c:910
c04f5ac3
JX
11663#, c-format
11664msgid "Switched to and reset branch '%s'\n"
11665msgstr "切换并重置分支 '%s'\n"
11666
d9488fea 11667#: builtin/checkout.c:912 builtin/checkout.c:1338
c04f5ac3
JX
11668#, c-format
11669msgid "Switched to a new branch '%s'\n"
11670msgstr "切换到一个新分支 '%s'\n"
11671
d9488fea 11672#: builtin/checkout.c:914
c04f5ac3
JX
11673#, c-format
11674msgid "Switched to branch '%s'\n"
11675msgstr "切换到分支 '%s'\n"
11676
90e6ef53 11677# 译者:注意保持前导空格
d9488fea 11678#: builtin/checkout.c:965
c04f5ac3
JX
11679#, c-format
11680msgid " ... and %d more.\n"
90e6ef53 11681msgstr " ... 及其它 %d 个。\n"
c04f5ac3 11682
d9488fea 11683#: builtin/checkout.c:971
c04f5ac3
JX
11684#, c-format
11685msgid ""
11686"Warning: you are leaving %d commit behind, not connected to\n"
11687"any of your branches:\n"
11688"\n"
11689"%s\n"
11690msgid_plural ""
11691"Warning: you are leaving %d commits behind, not connected to\n"
11692"any of your branches:\n"
11693"\n"
11694"%s\n"
11695msgstr[0] ""
11696"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
11697"\n"
11698"%s\n"
5ae481e0
JX
11699msgstr[1] ""
11700"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
11701"\n"
11702"%s\n"
c04f5ac3 11703
d9488fea 11704#: builtin/checkout.c:990
c04f5ac3
JX
11705#, c-format
11706msgid ""
7aea43ff
JX
11707"If you want to keep it by creating a new branch, this may be a good time\n"
11708"to do so with:\n"
11709"\n"
11710" git branch <new-branch-name> %s\n"
11711"\n"
11712msgid_plural ""
c04f5ac3
JX
11713"If you want to keep them by creating a new branch, this may be a good time\n"
11714"to do so with:\n"
11715"\n"
814ff314 11716" git branch <new-branch-name> %s\n"
c04f5ac3 11717"\n"
7aea43ff
JX
11718msgstr[0] ""
11719"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
11720"如下操作:\n"
11721"\n"
11722" git branch <新分支名> %s\n"
11723"\n"
11724msgstr[1] ""
11725"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
c04f5ac3
JX
11726"如下操作:\n"
11727"\n"
814ff314 11728" git branch <新分支名> %s\n"
c04f5ac3
JX
11729"\n"
11730
d9488fea 11731#: builtin/checkout.c:1025
c04f5ac3
JX
11732msgid "internal error in revision walk"
11733msgstr "在版本遍历时遇到内部错误"
11734
d9488fea 11735#: builtin/checkout.c:1029
c04f5ac3
JX
11736msgid "Previous HEAD position was"
11737msgstr "之前的 HEAD 位置是"
11738
d9488fea 11739#: builtin/checkout.c:1069 builtin/checkout.c:1333
c04f5ac3 11740msgid "You are on a branch yet to be born"
90e6ef53 11741msgstr "您位于一个尚未初始化的分支"
c04f5ac3 11742
d9488fea 11743#: builtin/checkout.c:1146
06991777
JX
11744#, c-format
11745msgid ""
11746"'%s' could be both a local file and a tracking branch.\n"
11747"Please use -- (and optionally --no-guess) to disambiguate"
11748msgstr ""
11749"'%s' 既可以是一个本地文件,也可以是一个跟踪分支。\n"
11750"请使用 --(和可选的 --no-guess)来消除歧义"
11751
d9488fea 11752#: builtin/checkout.c:1153
2b472aae
JX
11753msgid ""
11754"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
11755"you can do so by fully qualifying the name with the --track option:\n"
11756"\n"
11757" git checkout --track origin/<name>\n"
11758"\n"
11759"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
11760"one remote, e.g. the 'origin' remote, consider setting\n"
11761"checkout.defaultRemote=origin in your config."
11762msgstr ""
11763"如果您想要检出一个远程跟踪分支,例如在 'origin' 上的,您可以使用分支\n"
11764"全名和 --track 选项:\n"
11765"\n"
440e7442 11766" git checkout --track origin/<名称>\n"
2b472aae 11767"\n"
440e7442 11768"如果您总是喜欢使用模糊的简短分支名 <名称>,而不喜欢如 'origin' 的远程\n"
2b472aae
JX
11769"名称,可以在配置中设置 checkout.defaultRemote=origin。"
11770
d9488fea 11771#: builtin/checkout.c:1163
2b472aae
JX
11772#, c-format
11773msgid "'%s' matched multiple (%d) remote tracking branches"
440e7442 11774msgstr "'%s' 匹配多个(%d 个)远程跟踪分支"
2b472aae 11775
d9488fea 11776#: builtin/checkout.c:1229
2b472aae 11777msgid "only one reference expected"
440e7442 11778msgstr "只期望一个引用"
2b472aae 11779
d9488fea 11780#: builtin/checkout.c:1246
2b472aae
JX
11781#, c-format
11782msgid "only one reference expected, %d given."
11783msgstr "应只有一个引用,却给出了 %d 个"
11784
d9488fea 11785#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510
c04f5ac3
JX
11786#, c-format
11787msgid "invalid reference: %s"
11788msgstr "无效引用:%s"
11789
d9488fea 11790#: builtin/checkout.c:1305 builtin/checkout.c:1671
c04f5ac3
JX
11791#, c-format
11792msgid "reference is not a tree: %s"
11793msgstr "引用不是一个树:%s"
11794
d9488fea 11795#: builtin/checkout.c:1352
a6cd2cc4
JX
11796#, c-format
11797msgid "a branch is expected, got tag '%s'"
11798msgstr "期望一个分支,得到标签 '%s'"
11799
d9488fea 11800#: builtin/checkout.c:1354
a6cd2cc4
JX
11801#, c-format
11802msgid "a branch is expected, got remote branch '%s'"
11803msgstr "期望一个分支,得到远程分支 '%s'"
11804
d9488fea 11805#: builtin/checkout.c:1355 builtin/checkout.c:1363
a6cd2cc4
JX
11806#, c-format
11807msgid "a branch is expected, got '%s'"
11808msgstr "期望一个分支,得到 '%s'"
11809
d9488fea 11810#: builtin/checkout.c:1358
a6cd2cc4
JX
11811#, c-format
11812msgid "a branch is expected, got commit '%s'"
11813msgstr "期望一个分支,得到提交 '%s'"
11814
d9488fea 11815#: builtin/checkout.c:1374
a6cd2cc4
JX
11816msgid ""
11817"cannot switch branch while merging\n"
11818"Consider \"git merge --quit\" or \"git worktree add\"."
11819msgstr ""
11820"不能在合并时切换分支\n"
11821"考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
11822
d9488fea 11823#: builtin/checkout.c:1378
a6cd2cc4
JX
11824msgid ""
11825"cannot switch branch in the middle of an am session\n"
11826"Consider \"git am --quit\" or \"git worktree add\"."
11827msgstr ""
11828"不能在一个 am 会话期间切换分支\n"
11829"考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
11830
d9488fea 11831#: builtin/checkout.c:1382
a6cd2cc4
JX
11832msgid ""
11833"cannot switch branch while rebasing\n"
11834"Consider \"git rebase --quit\" or \"git worktree add\"."
11835msgstr ""
11836"不能在变基时切换分支\n"
11837"考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
11838
d9488fea 11839#: builtin/checkout.c:1386
a6cd2cc4
JX
11840msgid ""
11841"cannot switch branch while cherry-picking\n"
11842"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
11843msgstr ""
11844"不能在拣选时切换分支\n"
11845"考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
11846
d9488fea 11847#: builtin/checkout.c:1390
a6cd2cc4
JX
11848msgid ""
11849"cannot switch branch while reverting\n"
11850"Consider \"git revert --quit\" or \"git worktree add\"."
11851msgstr ""
11852"不能在还原时切换分支\n"
11853"考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
11854
d9488fea 11855#: builtin/checkout.c:1394
a6cd2cc4
JX
11856msgid "you are switching branch while bisecting"
11857msgstr "您在执行二分查找时切换分支"
11858
d9488fea 11859#: builtin/checkout.c:1401
ef317cd5 11860msgid "paths cannot be used with switching branches"
07432cef 11861msgstr "路径不能和切换分支同时使用"
c04f5ac3 11862
d9488fea 11863#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412
07432cef 11864#, c-format
ef317cd5 11865msgid "'%s' cannot be used with switching branches"
07432cef 11866msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 11867
d9488fea
JX
11868#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422
11869#: builtin/checkout.c:1427 builtin/checkout.c:1432
07432cef 11870#, c-format
ef317cd5 11871msgid "'%s' cannot be used with '%s'"
07432cef 11872msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 11873
d9488fea 11874#: builtin/checkout.c:1429
a6cd2cc4
JX
11875#, c-format
11876msgid "'%s' cannot take <start-point>"
11877msgstr "'%s' 不带 <起始点>"
11878
d9488fea 11879#: builtin/checkout.c:1437
07432cef 11880#, c-format
ef317cd5 11881msgid "Cannot switch branch to a non-commit '%s'"
07432cef 11882msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 11883
d9488fea 11884#: builtin/checkout.c:1444
a6cd2cc4
JX
11885msgid "missing branch or commit argument"
11886msgstr "缺少分支或提交参数"
c04f5ac3 11887
d9488fea
JX
11888#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84
11889#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287
11890#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551
11891#: builtin/send-pack.c:192
a6cd2cc4
JX
11892msgid "force progress reporting"
11893msgstr "强制显示进度报告"
c04f5ac3 11894
d9488fea 11895#: builtin/checkout.c:1487
a6cd2cc4
JX
11896msgid "perform a 3-way merge with the new branch"
11897msgstr "和新的分支执行三方合并"
c04f5ac3 11898
d9488fea 11899#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322
a6cd2cc4
JX
11900msgid "style"
11901msgstr "风格"
ef317cd5 11902
d9488fea 11903#: builtin/checkout.c:1489
a6cd2cc4
JX
11904msgid "conflict style (merge or diff3)"
11905msgstr "冲突输出风格(merge 或 diff3)"
11906
d9488fea 11907#: builtin/checkout.c:1501 builtin/worktree.c:558
5c57d762
JX
11908msgid "detach HEAD at named commit"
11909msgstr "HEAD 从指定的提交分离"
ef317cd5 11910
d9488fea 11911#: builtin/checkout.c:1502
ef317cd5 11912msgid "set upstream info for new branch"
07432cef 11913msgstr "为新的分支设置上游信息"
ef317cd5 11914
d9488fea 11915#: builtin/checkout.c:1504
a6cd2cc4
JX
11916msgid "force checkout (throw away local modifications)"
11917msgstr "强制检出(丢弃本地修改)"
11918
d9488fea 11919#: builtin/checkout.c:1506
6c94aba5 11920msgid "new-branch"
07432cef 11921msgstr "新分支"
ef317cd5 11922
d9488fea 11923#: builtin/checkout.c:1506
ef317cd5 11924msgid "new unparented branch"
07432cef 11925msgstr "新的没有父提交的分支"
ef317cd5 11926
d9488fea 11927#: builtin/checkout.c:1508 builtin/merge.c:291
a6cd2cc4
JX
11928msgid "update ignored files (default)"
11929msgstr "更新忽略的文件(默认)"
11930
d9488fea 11931#: builtin/checkout.c:1511
a6cd2cc4
JX
11932msgid "do not check if another worktree is holding the given ref"
11933msgstr "不检查指定的引用是否被其他工作区所占用"
11934
d9488fea 11935#: builtin/checkout.c:1524
ef317cd5 11936msgid "checkout our version for unmerged files"
07432cef 11937msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 11938
d9488fea 11939#: builtin/checkout.c:1527
ef317cd5 11940msgid "checkout their version for unmerged files"
07432cef 11941msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 11942
d9488fea 11943#: builtin/checkout.c:1531
4dcdc3d8
JX
11944msgid "do not limit pathspecs to sparse entries only"
11945msgstr "对路径不做稀疏检出的限制"
11946
d9488fea 11947#: builtin/checkout.c:1586
349ede6a
JX
11948#, c-format
11949msgid "-%c, -%c and --orphan are mutually exclusive"
11950msgstr "-%c、-%c 和 --orphan 是互斥的"
ef317cd5 11951
d9488fea 11952#: builtin/checkout.c:1590
d46c5519
JX
11953msgid "-p and --overlay are mutually exclusive"
11954msgstr "-p 和 --overlay 互斥"
11955
d9488fea 11956#: builtin/checkout.c:1627
ef317cd5
JX
11957msgid "--track needs a branch name"
11958msgstr "--track 需要一个分支名"
11959
d9488fea 11960#: builtin/checkout.c:1632
349ede6a
JX
11961#, c-format
11962msgid "missing branch name; try -%c"
11963msgstr "缺少分支名,尝试 -%c"
ef317cd5 11964
d9488fea 11965#: builtin/checkout.c:1664
a6cd2cc4
JX
11966#, c-format
11967msgid "could not resolve %s"
11968msgstr "无法解析 %s"
11969
d9488fea 11970#: builtin/checkout.c:1680
c04f5ac3 11971msgid "invalid path specification"
90e6ef53 11972msgstr "无效的路径规格"
c04f5ac3 11973
d9488fea 11974#: builtin/checkout.c:1687
07432cef 11975#, c-format
a4f16749
JX
11976msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
11977msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'"
c04f5ac3 11978
d9488fea 11979#: builtin/checkout.c:1691
07432cef 11980#, c-format
ef317cd5 11981msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 11982msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 11983
d9488fea 11984#: builtin/checkout.c:1700
ddc12c42
JX
11985msgid "--pathspec-from-file is incompatible with --detach"
11986msgstr "--pathspec-from-file 与 --detach 不兼容"
11987
d9488fea 11988#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500
ddc12c42
JX
11989msgid "--pathspec-from-file is incompatible with --patch"
11990msgstr "--pathspec-from-file 与 --patch 不兼容"
11991
d9488fea 11992#: builtin/checkout.c:1716
c04f5ac3
JX
11993msgid ""
11994"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
11995"checking out of the index."
11996msgstr ""
90e6ef53 11997"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 11998
d9488fea 11999#: builtin/checkout.c:1721
ddc12c42
JX
12000msgid "you must specify path(s) to restore"
12001msgstr "您必须指定一个要恢复的路径"
12002
d9488fea
JX
12003#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798
12004#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170
12005#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554
7157c2b5 12006#: builtin/worktree.c:556
a6cd2cc4
JX
12007msgid "branch"
12008msgstr "分支"
12009
d9488fea 12010#: builtin/checkout.c:1748
a6cd2cc4
JX
12011msgid "create and checkout a new branch"
12012msgstr "创建并检出一个新的分支"
12013
d9488fea 12014#: builtin/checkout.c:1750
a6cd2cc4
JX
12015msgid "create/reset and checkout a branch"
12016msgstr "创建/重置并检出一个分支"
12017
d9488fea 12018#: builtin/checkout.c:1751
a6cd2cc4
JX
12019msgid "create reflog for new branch"
12020msgstr "为新的分支创建引用日志"
12021
d9488fea 12022#: builtin/checkout.c:1753
a6cd2cc4
JX
12023msgid "second guess 'git checkout <no-such-branch>' (default)"
12024msgstr "二次猜测 'git checkout <无此分支>'(默认)"
12025
d9488fea 12026#: builtin/checkout.c:1754
a6cd2cc4
JX
12027msgid "use overlay mode (default)"
12028msgstr "使用叠加模式(默认)"
12029
d9488fea 12030#: builtin/checkout.c:1799
a6cd2cc4
JX
12031msgid "create and switch to a new branch"
12032msgstr "创建并切换一个新分支"
12033
d9488fea 12034#: builtin/checkout.c:1801
a6cd2cc4
JX
12035msgid "create/reset and switch to a branch"
12036msgstr "创建/重置并切换一个分支"
12037
d9488fea 12038#: builtin/checkout.c:1803
a6cd2cc4
JX
12039msgid "second guess 'git switch <no-such-branch>'"
12040msgstr "二次猜测 'git switch <无此分支>'"
12041
d9488fea 12042#: builtin/checkout.c:1805
a6cd2cc4
JX
12043msgid "throw away local modifications"
12044msgstr "丢弃本地修改"
12045
d9488fea 12046#: builtin/checkout.c:1839
a6cd2cc4
JX
12047msgid "which tree-ish to checkout from"
12048msgstr "要检出哪一个树"
12049
d9488fea 12050#: builtin/checkout.c:1841
a6cd2cc4
JX
12051msgid "restore the index"
12052msgstr "恢复索引"
12053
d9488fea 12054#: builtin/checkout.c:1843
a6cd2cc4
JX
12055msgid "restore the working tree (default)"
12056msgstr "恢复工作区(默认)"
12057
d9488fea 12058#: builtin/checkout.c:1845
a6cd2cc4
JX
12059msgid "ignore unmerged entries"
12060msgstr "忽略未合并条目"
12061
d9488fea 12062#: builtin/checkout.c:1846
a6cd2cc4
JX
12063msgid "use overlay mode"
12064msgstr "使用叠加模式"
12065
349ede6a 12066#: builtin/clean.c:29
2e8451e8
JX
12067msgid ""
12068"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
12069msgstr ""
12070"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 12071
349ede6a 12072#: builtin/clean.c:33
07432cef
WS
12073#, c-format
12074msgid "Removing %s\n"
12075msgstr "正删除 %s\n"
12076
349ede6a 12077#: builtin/clean.c:34
07432cef
WS
12078#, c-format
12079msgid "Would remove %s\n"
12080msgstr "将删除 %s\n"
12081
349ede6a 12082#: builtin/clean.c:35
07432cef
WS
12083#, c-format
12084msgid "Skipping repository %s\n"
160fb2b2 12085msgstr "忽略仓库 %s\n"
07432cef 12086
349ede6a 12087#: builtin/clean.c:36
07432cef
WS
12088#, c-format
12089msgid "Would skip repository %s\n"
160fb2b2 12090msgstr "将忽略仓库 %s\n"
07432cef 12091
349ede6a 12092#: builtin/clean.c:37
07432cef
WS
12093#, c-format
12094msgid "failed to remove %s"
c1ac5258 12095msgstr "删除 %s 失败"
07432cef 12096
349ede6a 12097#: builtin/clean.c:38
a6cd2cc4
JX
12098#, c-format
12099msgid "could not lstat %s\n"
12100msgstr "不能对 %s 调用 lstat\n"
12101
349ede6a 12102#: builtin/clean.c:302 git-add--interactive.perl:595
1a79b2f1 12103#, c-format
2e8451e8
JX
12104msgid ""
12105"Prompt help:\n"
12106"1 - select a numbered item\n"
12107"foo - select item based on unique prefix\n"
1a79b2f1 12108" - (empty) select nothing\n"
2e8451e8
JX
12109msgstr ""
12110"帮助:\n"
12111"1 - 通过编号选择一个选项\n"
1a79b2f1
JX
12112"foo - 通过唯一前缀选择一个选项\n"
12113" - (空)什么也不选择\n"
2e8451e8 12114
349ede6a 12115#: builtin/clean.c:306 git-add--interactive.perl:604
1a79b2f1 12116#, c-format
2e8451e8
JX
12117msgid ""
12118"Prompt help:\n"
12119"1 - select a single item\n"
12120"3-5 - select a range of items\n"
12121"2-3,6-9 - select multiple ranges\n"
12122"foo - select item based on unique prefix\n"
12123"-... - unselect specified items\n"
12124"* - choose all items\n"
1a79b2f1 12125" - (empty) finish selecting\n"
2e8451e8
JX
12126msgstr ""
12127"帮助:\n"
12128"1 - 选择一个选项\n"
12129"3-5 - 选择一个范围内的所有选项\n"
12130"2-3,6-9 - 选择多个范围内的所有选项\n"
1a79b2f1 12131"foo - 通过唯一前缀选择一个选项\n"
2e8451e8
JX
12132"-... - 反选特定的选项\n"
12133"* - 选择所有选项\n"
1a79b2f1 12134" - (空)结束选择\n"
2e8451e8 12135
ddc12c42
JX
12136#: builtin/clean.c:521 git-add--interactive.perl:570
12137#: git-add--interactive.perl:575
1a79b2f1
JX
12138#, c-format, perl-format
12139msgid "Huh (%s)?\n"
12140msgstr "嗯(%s)?\n"
2e8451e8 12141
349ede6a 12142#: builtin/clean.c:661
2e8451e8
JX
12143#, c-format
12144msgid "Input ignore patterns>> "
12145msgstr "输入模版以排除条目>> "
12146
349ede6a 12147#: builtin/clean.c:696
2e8451e8
JX
12148#, c-format
12149msgid "WARNING: Cannot find items matched by: %s"
12150msgstr "警告:无法找到和 %s 匹配的条目"
12151
349ede6a 12152#: builtin/clean.c:717
2e8451e8
JX
12153msgid "Select items to delete"
12154msgstr "选择要删除的条目"
12155
814ff314 12156#. TRANSLATORS: Make sure to keep [y/N] as is
349ede6a 12157#: builtin/clean.c:758
2e8451e8 12158#, c-format
814ff314
JX
12159msgid "Remove %s [y/N]? "
12160msgstr "删除 %s [y/N]?"
2e8451e8 12161
349ede6a 12162#: builtin/clean.c:789
2e8451e8
JX
12163msgid ""
12164"clean - start cleaning\n"
12165"filter by pattern - exclude items from deletion\n"
12166"select by numbers - select items to be deleted by numbers\n"
12167"ask each - confirm each deletion (like \"rm -i\")\n"
12168"quit - stop cleaning\n"
12169"help - this screen\n"
12170"? - help for prompt selection"
12171msgstr ""
12172"clean - 开始清理\n"
12173"filter by pattern - 通过模版排除要删除的条目\n"
12174"select by numbers - 通过数字选择要删除的条目\n"
12175"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
12176"quit - 停止删除并退出\n"
12177"help - 显示本帮助\n"
12178"? - 显示如何在提示符下选择的帮助"
12179
349ede6a 12180#: builtin/clean.c:825
2e8451e8
JX
12181msgid "Would remove the following item:"
12182msgid_plural "Would remove the following items:"
12183msgstr[0] "将删除如下条目:"
12184msgstr[1] "将删除如下条目:"
12185
349ede6a 12186#: builtin/clean.c:841
2e8451e8
JX
12187msgid "No more files to clean, exiting."
12188msgstr "没有要清理的文件,退出。"
12189
349ede6a 12190#: builtin/clean.c:903
ef317cd5 12191msgid "do not print names of files removed"
07432cef 12192msgstr "不打印删除文件的名称"
ef317cd5 12193
349ede6a 12194#: builtin/clean.c:905
ef317cd5 12195msgid "force"
07432cef 12196msgstr "强制"
ef317cd5 12197
349ede6a 12198#: builtin/clean.c:906
2e8451e8
JX
12199msgid "interactive cleaning"
12200msgstr "交互式清除"
12201
349ede6a 12202#: builtin/clean.c:908
ef317cd5 12203msgid "remove whole directories"
07432cef 12204msgstr "删除整个目录"
ef317cd5 12205
349ede6a 12206#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
d9488fea 12207#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183
349ede6a 12208#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528
d46c5519 12209#: builtin/show-ref.c:179
ef317cd5 12210msgid "pattern"
07432cef 12211msgstr "模式"
ef317cd5 12212
349ede6a 12213#: builtin/clean.c:910
ef317cd5 12214msgid "add <pattern> to ignore rules"
4375c10e 12215msgstr "添加 <模式> 到忽略规则"
ef317cd5 12216
349ede6a 12217#: builtin/clean.c:911
ef317cd5 12218msgid "remove ignored files, too"
07432cef 12219msgstr "也删除忽略的文件"
ef317cd5 12220
349ede6a 12221#: builtin/clean.c:913
ef317cd5 12222msgid "remove only ignored files"
07432cef 12223msgstr "只删除忽略的文件"
c04f5ac3 12224
7157c2b5 12225#: builtin/clean.c:929
c04f5ac3 12226msgid ""
6c94aba5 12227"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 12228"clean"
c04f5ac3 12229msgstr ""
2e8451e8 12230"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 12231
7157c2b5 12232#: builtin/clean.c:932
c04f5ac3 12233msgid ""
6c94aba5 12234"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 12235"refusing to clean"
c04f5ac3 12236msgstr ""
2e8451e8 12237"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 12238
7157c2b5
JX
12239#: builtin/clean.c:944
12240msgid "-x and -X cannot be used together"
12241msgstr "-x 和 -X 不能同时使用"
12242
a5cd71ca 12243#: builtin/clone.c:45
814ff314 12244msgid "git clone [<options>] [--] <repo> [<dir>]"
160fb2b2 12245msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
ef317cd5 12246
ddc12c42 12247#: builtin/clone.c:93
ef317cd5 12248msgid "don't create a checkout"
07432cef 12249msgstr "不创建一个检出"
ef317cd5 12250
d9488fea 12251#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553
ef317cd5 12252msgid "create a bare repository"
160fb2b2 12253msgstr "创建一个纯仓库"
ef317cd5 12254
ddc12c42 12255#: builtin/clone.c:98
ef317cd5 12256msgid "create a mirror repository (implies bare)"
160fb2b2 12257msgstr "创建一个镜像仓库(也是纯仓库)"
ef317cd5 12258
ddc12c42 12259#: builtin/clone.c:100
ef317cd5 12260msgid "to clone from a local repository"
160fb2b2 12261msgstr "从本地仓库克隆"
ef317cd5 12262
ddc12c42 12263#: builtin/clone.c:102
ef317cd5 12264msgid "don't use local hardlinks, always copy"
07432cef 12265msgstr "不使用本地硬链接,始终复制"
ef317cd5 12266
ddc12c42 12267#: builtin/clone.c:104
ef317cd5 12268msgid "setup as shared repository"
160fb2b2 12269msgstr "设置为共享仓库"
ef317cd5 12270
349ede6a 12271#: builtin/clone.c:106
87cb7997 12272msgid "pathspec"
65e2041e 12273msgstr "路径规格"
87cb7997 12274
349ede6a 12275#: builtin/clone.c:106
ef317cd5 12276msgid "initialize submodules in the clone"
07432cef 12277msgstr "在克隆时初始化子模组"
ef317cd5 12278
ddc12c42 12279#: builtin/clone.c:110
5b04ee3b
JX
12280msgid "number of submodules cloned in parallel"
12281msgstr "并发克隆的子模组的数量"
12282
d9488fea 12283#: builtin/clone.c:111 builtin/init-db.c:550
ef317cd5 12284msgid "template-directory"
07432cef 12285msgstr "模板目录"
ef317cd5 12286
d9488fea 12287#: builtin/clone.c:112 builtin/init-db.c:551
ef317cd5 12288msgid "directory from which templates will be used"
07432cef 12289msgstr "模板目录将被使用"
ef317cd5 12290
d9488fea
JX
12291#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831
12292#: builtin/submodule--helper.c:2336
ef317cd5 12293msgid "reference repository"
160fb2b2 12294msgstr "参考仓库"
ef317cd5 12295
d9488fea
JX
12296#: builtin/clone.c:118 builtin/submodule--helper.c:1833
12297#: builtin/submodule--helper.c:2338
7aea43ff 12298msgid "use --reference only while cloning"
160fb2b2 12299msgstr "仅在克隆时参考 --reference 指向的本地仓库"
7aea43ff 12300
d9488fea
JX
12301#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561
12302#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332
ef317cd5 12303msgid "name"
07432cef 12304msgstr "名称"
ef317cd5 12305
ddc12c42 12306#: builtin/clone.c:120
ef317cd5 12307msgid "use <name> instead of 'origin' to track upstream"
4375c10e 12308msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
ef317cd5 12309
ddc12c42 12310#: builtin/clone.c:122
ef317cd5 12311msgid "checkout <branch> instead of the remote's HEAD"
4375c10e 12312msgstr "检出 <分支> 而不是远程 HEAD"
ef317cd5 12313
ddc12c42 12314#: builtin/clone.c:124
ef317cd5 12315msgid "path to git-upload-pack on the remote"
07432cef 12316msgstr "远程 git-upload-pack 路径"
ef317cd5 12317
d9488fea 12318#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849
349ede6a 12319#: builtin/pull.c:208
ef317cd5 12320msgid "depth"
07432cef 12321msgstr "深度"
ef317cd5 12322
ddc12c42 12323#: builtin/clone.c:126
ef317cd5 12324msgid "create a shallow clone of that depth"
07432cef 12325msgstr "创建一个指定深度的浅克隆"
ef317cd5 12326
d9488fea 12327#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535
349ede6a 12328#: builtin/pull.c:211
a0b6b246
JX
12329msgid "time"
12330msgstr "时间"
12331
ddc12c42 12332#: builtin/clone.c:128
a0b6b246
JX
12333msgid "create a shallow clone since a specific time"
12334msgstr "从一个特定时间创建一个浅克隆"
12335
d9488fea
JX
12336#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200
12337#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311
a0b6b246
JX
12338msgid "revision"
12339msgstr "版本"
12340
d9488fea 12341#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215
1a79b2f1
JX
12342msgid "deepen history of shallow clone, excluding rev"
12343msgstr "深化浅克隆的历史,除了特定版本"
a0b6b246 12344
d9488fea
JX
12345#: builtin/clone.c:132 builtin/submodule--helper.c:1843
12346#: builtin/submodule--helper.c:2352
ef317cd5 12347msgid "clone only one branch, HEAD or --branch"
07432cef 12348msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 12349
ddc12c42 12350#: builtin/clone.c:134
a4f16749
JX
12351msgid "don't clone any tags, and make later fetches not to follow them"
12352msgstr "不要克隆任何标签,并且后续获取操作也不下载它们"
12353
ddc12c42 12354#: builtin/clone.c:136
5b04ee3b
JX
12355msgid "any cloned submodules will be shallow"
12356msgstr "子模组将以浅下载模式克隆"
12357
d9488fea 12358#: builtin/clone.c:137 builtin/init-db.c:559
ef317cd5 12359msgid "gitdir"
07432cef 12360msgstr "git目录"
ef317cd5 12361
d9488fea 12362#: builtin/clone.c:138 builtin/init-db.c:560
ef317cd5 12363msgid "separate git dir from working tree"
07432cef 12364msgstr "git目录和工作区分离"
ef317cd5 12365
ddc12c42 12366#: builtin/clone.c:139
ef317cd5 12367msgid "key=value"
07432cef 12368msgstr "key=value"
ef317cd5 12369
ddc12c42 12370#: builtin/clone.c:140
ef317cd5 12371msgid "set config inside the new repository"
160fb2b2 12372msgstr "在新仓库中设置配置信息"
ef317cd5 12373
d9488fea
JX
12374#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76
12375#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190
d46c5519
JX
12376msgid "server-specific"
12377msgstr "server-specific"
12378
d9488fea
JX
12379#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76
12380#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191
d46c5519
JX
12381msgid "option to transmit"
12382msgstr "传输选项"
12383
d9488fea
JX
12384#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234
12385#: builtin/push.c:561
276ceeaa
JX
12386msgid "use IPv4 addresses only"
12387msgstr "只使用 IPv4 地址"
12388
d9488fea
JX
12389#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237
12390#: builtin/push.c:563
276ceeaa
JX
12391msgid "use IPv6 addresses only"
12392msgstr "只使用 IPv6 地址"
12393
ddc12c42 12394#: builtin/clone.c:149
a6cd2cc4
JX
12395msgid "any cloned submodules will use their remote-tracking branch"
12396msgstr "任何克隆的子模组将使用它们的远程跟踪分支"
12397
ddc12c42
JX
12398#: builtin/clone.c:151
12399msgid "initialize sparse-checkout file to include only files at root"
12400msgstr "初始化稀疏检出文件,只包含根目录文件"
12401
12402#: builtin/clone.c:287
3495628d
JX
12403msgid ""
12404"No directory name could be guessed.\n"
12405"Please specify a directory on the command line"
12406msgstr ""
12407"无法猜到目录名。\n"
26e4cbec 12408"请在命令行指定一个目录"
3495628d 12409
ddc12c42 12410#: builtin/clone.c:340
cfff71a9 12411#, c-format
a0b6b246
JX
12412msgid "info: Could not add alternate for '%s': %s\n"
12413msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
cfff71a9 12414
ddc12c42 12415#: builtin/clone.c:413
c04f5ac3
JX
12416#, c-format
12417msgid "%s exists and is not a directory"
12418msgstr "%s 存在且不是一个目录"
12419
349ede6a 12420#: builtin/clone.c:431
c04f5ac3 12421#, c-format
a6cd2cc4
JX
12422msgid "failed to start iterator over '%s'"
12423msgstr "无法在 '%s' 上启动迭代器"
c04f5ac3 12424
349ede6a 12425#: builtin/clone.c:462
c04f5ac3
JX
12426#, c-format
12427msgid "failed to create link '%s'"
c1ac5258 12428msgstr "创建链接 '%s' 失败"
c04f5ac3 12429
349ede6a 12430#: builtin/clone.c:466
c04f5ac3
JX
12431#, c-format
12432msgid "failed to copy file to '%s'"
c1ac5258 12433msgstr "拷贝文件至 '%s' 失败"
c04f5ac3 12434
349ede6a 12435#: builtin/clone.c:471
a6cd2cc4
JX
12436#, c-format
12437msgid "failed to iterate over '%s'"
12438msgstr "无法在 '%s' 上迭代"
12439
349ede6a 12440#: builtin/clone.c:498
c04f5ac3
JX
12441#, c-format
12442msgid "done.\n"
12443msgstr "完成。\n"
12444
349ede6a 12445#: builtin/clone.c:512
1003b3a5
JX
12446msgid ""
12447"Clone succeeded, but checkout failed.\n"
12448"You can inspect what was checked out with 'git status'\n"
a6cd2cc4 12449"and retry with 'git restore --source=HEAD :/'\n"
1003b3a5
JX
12450msgstr ""
12451"克隆成功,但是检出失败。\n"
12452"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
a6cd2cc4 12453"'git restore --source=HEAD :/' 重试\n"
1003b3a5 12454
349ede6a 12455#: builtin/clone.c:589
c04f5ac3
JX
12456#, c-format
12457msgid "Could not find remote branch %s to clone."
90e6ef53 12458msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 12459
349ede6a 12460#: builtin/clone.c:708
3495628d
JX
12461#, c-format
12462msgid "unable to update %s"
12463msgstr "不能更新 %s"
12464
349ede6a 12465#: builtin/clone.c:756
ddc12c42
JX
12466msgid "failed to initialize sparse-checkout"
12467msgstr "无法初始化稀疏检出"
12468
349ede6a 12469#: builtin/clone.c:779
c04f5ac3
JX
12470msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
12471msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
12472
349ede6a 12473#: builtin/clone.c:811
1003b3a5
JX
12474msgid "unable to checkout working tree"
12475msgstr "不能检出工作区"
12476
349ede6a 12477#: builtin/clone.c:868
3495628d
JX
12478msgid "unable to write parameters to config file"
12479msgstr "无法将参数写入配置文件"
12480
349ede6a 12481#: builtin/clone.c:931
04cb2f28
JX
12482msgid "cannot repack to clean up"
12483msgstr "无法执行 repack 来清理"
12484
349ede6a 12485#: builtin/clone.c:933
04cb2f28
JX
12486msgid "cannot unlink temporary alternates file"
12487msgstr "无法删除临时的 alternates 文件"
12488
d9488fea 12489#: builtin/clone.c:970 builtin/receive-pack.c:2434
c04f5ac3
JX
12490msgid "Too many arguments."
12491msgstr "太多参数。"
12492
d9488fea 12493#: builtin/clone.c:974
c04f5ac3 12494msgid "You must specify a repository to clone."
160fb2b2 12495msgstr "您必须指定一个仓库来克隆。"
c04f5ac3 12496
d9488fea 12497#: builtin/clone.c:987
c04f5ac3
JX
12498#, c-format
12499msgid "--bare and --origin %s options are incompatible."
12500msgstr "--bare 和 --origin %s 选项不兼容。"
12501
d9488fea 12502#: builtin/clone.c:990
07432cef
WS
12503msgid "--bare and --separate-git-dir are incompatible."
12504msgstr "--bare 和 --separate-git-dir 选项不兼容。"
12505
d9488fea 12506#: builtin/clone.c:1006
c04f5ac3
JX
12507#, c-format
12508msgid "repository '%s' does not exist"
160fb2b2 12509msgstr "仓库 '%s' 不存在"
c04f5ac3 12510
d9488fea 12511#: builtin/clone.c:1010 builtin/fetch.c:1841
cfff71a9
JX
12512#, c-format
12513msgid "depth %s is not a positive number"
12514msgstr "深度 %s 不是一个正数"
12515
d9488fea 12516#: builtin/clone.c:1020
c04f5ac3
JX
12517#, c-format
12518msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 12519msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 12520
d9488fea
JX
12521#: builtin/clone.c:1026
12522#, c-format
12523msgid "repository path '%s' already exists and is not an empty directory."
12524msgstr "仓库路径 '%s' 已经存在,并且不是一个空目录。"
12525
12526#: builtin/clone.c:1040
c04f5ac3
JX
12527#, c-format
12528msgid "working tree '%s' already exists."
12529msgstr "工作区 '%s' 已经存在。"
12530
d9488fea
JX
12531#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271
12532#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386
5bb01d4f
JX
12533#, c-format
12534msgid "could not create leading directories of '%s'"
12535msgstr "不能为 '%s' 创建先导目录"
12536
d9488fea 12537#: builtin/clone.c:1060
c04f5ac3 12538#, c-format
814ff314
JX
12539msgid "could not create work tree dir '%s'"
12540msgstr "不能创建工作区目录 '%s'"
c04f5ac3 12541
d9488fea 12542#: builtin/clone.c:1080
c04f5ac3
JX
12543#, c-format
12544msgid "Cloning into bare repository '%s'...\n"
160fb2b2 12545msgstr "克隆到纯仓库 '%s'...\n"
c04f5ac3 12546
d9488fea 12547#: builtin/clone.c:1082
c04f5ac3
JX
12548#, c-format
12549msgid "Cloning into '%s'...\n"
12550msgstr "正克隆到 '%s'...\n"
12551
d9488fea 12552#: builtin/clone.c:1106
a0b6b246
JX
12553msgid ""
12554"clone --recursive is not compatible with both --reference and --reference-if-"
12555"able"
12556msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
12557
d9488fea 12558#: builtin/clone.c:1170
6acbf033 12559msgid "--depth is ignored in local clones; use file:// instead."
a0b6b246
JX
12560msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
12561
d9488fea 12562#: builtin/clone.c:1172
a0b6b246
JX
12563msgid "--shallow-since is ignored in local clones; use file:// instead."
12564msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
6acbf033 12565
d9488fea 12566#: builtin/clone.c:1174
a0b6b246
JX
12567msgid "--shallow-exclude is ignored in local clones; use file:// instead."
12568msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
12569
d9488fea 12570#: builtin/clone.c:1176
31e5e17b
JX
12571msgid "--filter is ignored in local clones; use file:// instead."
12572msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。"
12573
d9488fea 12574#: builtin/clone.c:1179
6acbf033 12575msgid "source repository is shallow, ignoring --local"
160fb2b2 12576msgstr "源仓库是浅克隆,忽略 --local"
6acbf033 12577
d9488fea 12578#: builtin/clone.c:1184
6acbf033
JX
12579msgid "--local is ignored"
12580msgstr "--local 被忽略"
12581
d9488fea 12582#: builtin/clone.c:1268 builtin/clone.c:1276
c04f5ac3
JX
12583#, c-format
12584msgid "Remote branch %s not found in upstream %s"
12585msgstr "远程分支 %s 在上游 %s 未发现"
12586
d9488fea 12587#: builtin/clone.c:1279
c04f5ac3 12588msgid "You appear to have cloned an empty repository."
160fb2b2 12589msgstr "您似乎克隆了一个空仓库。"
c04f5ac3 12590
a4f16749 12591#: builtin/column.c:10
814ff314
JX
12592msgid "git column [<options>]"
12593msgstr "git column [<选项>]"
ef317cd5 12594
a4f16749 12595#: builtin/column.c:27
ef317cd5 12596msgid "lookup config vars"
07432cef 12597msgstr "查找配置变量"
ef317cd5 12598
a4f16749 12599#: builtin/column.c:28 builtin/column.c:29
ef317cd5 12600msgid "layout to use"
07432cef 12601msgstr "要使用的布局"
ef317cd5 12602
a4f16749 12603#: builtin/column.c:30
ef317cd5 12604msgid "Maximum width"
07432cef 12605msgstr "最大宽度"
ef317cd5 12606
a4f16749 12607#: builtin/column.c:31
ef317cd5 12608msgid "Padding space on left border"
07432cef 12609msgstr "左边框的填充空间"
ef317cd5 12610
a4f16749 12611#: builtin/column.c:32
ef317cd5 12612msgid "Padding space on right border"
07432cef 12613msgstr "右边框的填充空间"
ef317cd5 12614
a4f16749 12615#: builtin/column.c:33
ef317cd5 12616msgid "Padding space between columns"
07432cef 12617msgstr "两列之间的填充空间"
ef317cd5 12618
fd8cb379 12619#: builtin/column.c:51
8ada9598 12620msgid "--command must be the first argument"
81809b99 12621msgstr "--command 必须是第一个参数"
8ada9598 12622
d9488fea 12623#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
349ede6a
JX
12624msgid ""
12625"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
12626msgstr ""
12627"git commit-graph verify [--object-dir <对象目录>] [--shallow] [--"
12628"[no-]progress]"
12629
d9488fea 12630#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
349ede6a
JX
12631msgid ""
12632"git commit-graph write [--object-dir <objdir>] [--append] [--"
12633"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
d9488fea 12634"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
349ede6a
JX
12635msgstr ""
12636"git commit-graph write [--object-dir <对象目录>] [--append] [--split[=<策略"
12637">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--"
d9488fea 12638"[no-]max-new-filters <n>] [--[no-]progress] <切分选项>"
349ede6a 12639
d9488fea 12640#: builtin/commit-graph.c:64
349ede6a
JX
12641#, c-format
12642msgid "could not find object directory matching %s"
12643msgstr "无法找到和 %s 匹配的对象目录"
12644
d9488fea
JX
12645#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
12646#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764
349ede6a
JX
12647msgid "dir"
12648msgstr "目录"
12649
d9488fea
JX
12650#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
12651#: builtin/commit-graph.c:317
349ede6a
JX
12652msgid "The object directory to store the graph"
12653msgstr "保存图形的对象目录"
12654
d9488fea 12655#: builtin/commit-graph.c:83
349ede6a
JX
12656msgid "if the commit-graph is split, only verify the tip file"
12657msgstr "如果提交图形被拆分,只验证头一个文件"
12658
d9488fea 12659#: builtin/commit-graph.c:106
349ede6a
JX
12660#, c-format
12661msgid "Could not open commit-graph '%s'"
12662msgstr "无法打开提交图形 '%s'"
12663
d9488fea 12664#: builtin/commit-graph.c:142
349ede6a
JX
12665#, c-format
12666msgid "unrecognized --split argument, %s"
12667msgstr "未能识别的 --split 参数,%s"
12668
d9488fea 12669#: builtin/commit-graph.c:155
7157c2b5
JX
12670#, c-format
12671msgid "unexpected non-hex object ID: %s"
12672msgstr "意外的非十六进制对象 ID:%s"
12673
d9488fea 12674#: builtin/commit-graph.c:160
7157c2b5
JX
12675#, c-format
12676msgid "invalid object: %s"
12677msgstr "无效对象:%s"
12678
d9488fea 12679#: builtin/commit-graph.c:213
349ede6a
JX
12680msgid "start walk at all refs"
12681msgstr "开始遍历所有引用"
12682
d9488fea 12683#: builtin/commit-graph.c:215
349ede6a
JX
12684msgid "scan pack-indexes listed by stdin for commits"
12685msgstr "从标准输入中的包索引文件列表中扫描提交"
12686
d9488fea 12687#: builtin/commit-graph.c:217
349ede6a
JX
12688msgid "start walk at commits listed by stdin"
12689msgstr "从标准输入中的提交开始扫描"
12690
d9488fea 12691#: builtin/commit-graph.c:219
349ede6a
JX
12692msgid "include all commits already in the commit-graph file"
12693msgstr "包含 commit-graph 文件中已有所有提交"
12694
d9488fea 12695#: builtin/commit-graph.c:221
349ede6a
JX
12696msgid "enable computation for changed paths"
12697msgstr "启用变更路径的计算"
12698
d9488fea 12699#: builtin/commit-graph.c:224
349ede6a
JX
12700msgid "allow writing an incremental commit-graph file"
12701msgstr "允许写一个增量提交图形文件"
12702
d9488fea 12703#: builtin/commit-graph.c:228
349ede6a
JX
12704msgid "maximum number of commits in a non-base split commit-graph"
12705msgstr "在非基本拆分提交图形中的最大提交数"
12706
d9488fea 12707#: builtin/commit-graph.c:230
349ede6a
JX
12708msgid "maximum ratio between two levels of a split commit-graph"
12709msgstr "一个拆分提交图形的两个级别之间的最大比率"
12710
d9488fea 12711#: builtin/commit-graph.c:232
349ede6a
JX
12712msgid "only expire files older than a given date-time"
12713msgstr "只让早于给定时间的文件过期"
12714
d9488fea
JX
12715#: builtin/commit-graph.c:234
12716msgid "maximum number of changed-path Bloom filters to compute"
12717msgstr "要计算的变更路径布隆过滤器的最大数"
12718
12719#: builtin/commit-graph.c:255
349ede6a
JX
12720msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
12721msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
12722
d9488fea 12723#: builtin/commit-graph.c:287
7157c2b5
JX
12724msgid "Collecting commits from input"
12725msgstr "正从标准输入收集提交"
349ede6a 12726
d46c5519
JX
12727#: builtin/commit-tree.c:18
12728msgid ""
12729"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
12730"<file>)...] <tree>"
12731msgstr ""
12732"git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件"
12733">)...] <树>"
12734
12735#: builtin/commit-tree.c:31
12736#, c-format
12737msgid "duplicate parent %s ignored"
12738msgstr "忽略重复的父提交 %s"
12739
d9488fea 12740#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546
d46c5519
JX
12741#, c-format
12742msgid "not a valid object name %s"
12743msgstr "不是一个有效的对象名 %s"
12744
12745#: builtin/commit-tree.c:93
12746#, c-format
12747msgid "git commit-tree: failed to open '%s'"
12748msgstr "git commit-tree:无法打开 '%s'"
12749
12750#: builtin/commit-tree.c:96
12751#, c-format
12752msgid "git commit-tree: failed to read '%s'"
12753msgstr "git commit-tree:无法读取 '%s'"
12754
12755#: builtin/commit-tree.c:98
12756#, c-format
12757msgid "git commit-tree: failed to close '%s'"
12758msgstr "git commit-tree:无法关闭 '%s'"
12759
12760#: builtin/commit-tree.c:111
12761msgid "parent"
12762msgstr "父提交"
12763
12764#: builtin/commit-tree.c:112
12765msgid "id of a parent commit object"
5b533632 12766msgstr "父提交对象 ID"
d46c5519 12767
d9488fea
JX
12768#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272
12769#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471
349ede6a 12770#: builtin/tag.c:413
d46c5519
JX
12771msgid "message"
12772msgstr "说明"
12773
d9488fea 12774#: builtin/commit-tree.c:115 builtin/commit.c:1504
d46c5519
JX
12775msgid "commit message"
12776msgstr "提交说明"
12777
12778#: builtin/commit-tree.c:118
12779msgid "read commit log message from file"
12780msgstr "从文件中读取提交说明"
12781
d9488fea 12782#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289
349ede6a 12783#: builtin/pull.c:176 builtin/revert.c:118
d46c5519
JX
12784msgid "GPG sign commit"
12785msgstr "GPG 提交签名"
12786
12787#: builtin/commit-tree.c:133
12788msgid "must give exactly one tree"
12789msgstr "必须精确地提供一个树"
12790
12791#: builtin/commit-tree.c:140
12792msgid "git commit-tree: failed to read"
12793msgstr "git commit-tree:读取失败"
12794
06991777 12795#: builtin/commit.c:41
814ff314 12796msgid "git commit [<options>] [--] <pathspec>..."
160fb2b2 12797msgstr "git commit [<选项>] [--] <路径规格>..."
ef317cd5 12798
06991777 12799#: builtin/commit.c:46
814ff314 12800msgid "git status [<options>] [--] <pathspec>..."
160fb2b2 12801msgstr "git status [<选项>] [--] <路径规格>..."
ef317cd5 12802
06991777 12803#: builtin/commit.c:51
c04f5ac3
JX
12804msgid ""
12805"You asked to amend the most recent commit, but doing so would make\n"
12806"it empty. You can repeat your command with --allow-empty, or you can\n"
12807"remove the commit entirely with \"git reset HEAD^\".\n"
12808msgstr ""
1b150dc9
T
12809"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
12810"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 12811
06991777 12812#: builtin/commit.c:56
c04f5ac3
JX
12813msgid ""
12814"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
12815"If you wish to commit it anyway, use:\n"
12816"\n"
12817" git commit --allow-empty\n"
12818"\n"
c04f5ac3 12819msgstr ""
a9ce4543
T
12820"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
12821"也要提交,使用命令:\n"
c04f5ac3
JX
12822"\n"
12823" git commit --allow-empty\n"
12824"\n"
c04f5ac3 12825
06991777 12826#: builtin/commit.c:63
349ede6a
JX
12827msgid "Otherwise, please use 'git rebase --skip'\n"
12828msgstr "否则,请使用 'git rebase --skip'\n"
12829
12830#: builtin/commit.c:66
a6cd2cc4
JX
12831msgid "Otherwise, please use 'git cherry-pick --skip'\n"
12832msgstr "否则,请使用 'git cherry-pick --skip'\n"
b1894384 12833
349ede6a 12834#: builtin/commit.c:69
b1894384 12835msgid ""
a6cd2cc4
JX
12836"and then use:\n"
12837"\n"
12838" git cherry-pick --continue\n"
12839"\n"
12840"to resume cherry-picking the remaining commits.\n"
b1894384
JX
12841"If you wish to skip this commit, use:\n"
12842"\n"
a6cd2cc4 12843" git cherry-pick --skip\n"
b1894384 12844"\n"
b1894384 12845msgstr ""
a6cd2cc4
JX
12846"然后使用:\n"
12847"\n"
12848" git cherry-pick --continue\n"
b1894384 12849"\n"
a6cd2cc4
JX
12850"来继续拣选剩余提交。如果您想跳过此提交,使用:\n"
12851"\n"
12852" git cherry-pick --skip\n"
b1894384 12853"\n"
b1894384 12854
349ede6a 12855#: builtin/commit.c:312
c04f5ac3 12856msgid "failed to unpack HEAD tree object"
c1ac5258 12857msgstr "解包 HEAD 树对象失败"
c04f5ac3 12858
349ede6a 12859#: builtin/commit.c:348
ddc12c42
JX
12860msgid "--pathspec-from-file with -a does not make sense"
12861msgstr "--pathspec-from-file 和 -a 在一起没有意义"
12862
349ede6a 12863#: builtin/commit.c:361
ddc12c42
JX
12864msgid "No paths with --include/--only does not make sense."
12865msgstr "参数 --include/--only 不跟路径没有意义。"
12866
349ede6a 12867#: builtin/commit.c:373
c04f5ac3 12868msgid "unable to create temporary index"
90e6ef53 12869msgstr "不能创建临时索引"
c04f5ac3 12870
349ede6a 12871#: builtin/commit.c:382
c04f5ac3
JX
12872msgid "interactive add failed"
12873msgstr "交互式添加失败"
12874
349ede6a 12875#: builtin/commit.c:397
220c313c
JX
12876msgid "unable to update temporary index"
12877msgstr "无法更新临时索引"
12878
349ede6a 12879#: builtin/commit.c:399
220c313c
JX
12880msgid "Failed to update main cache tree"
12881msgstr "不能更新树的主缓存"
12882
349ede6a 12883#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
c04f5ac3 12884msgid "unable to write new_index file"
90e6ef53 12885msgstr "无法写 new_index 文件"
c04f5ac3 12886
349ede6a 12887#: builtin/commit.c:476
8ada9598 12888msgid "cannot do a partial commit during a merge."
81809b99 12889msgstr "在合并过程中不能做部分提交。"
c04f5ac3 12890
349ede6a 12891#: builtin/commit.c:478
8ada9598 12892msgid "cannot do a partial commit during a cherry-pick."
81809b99 12893msgstr "在拣选过程中不能做部分提交。"
8ada9598 12894
349ede6a
JX
12895#: builtin/commit.c:480
12896msgid "cannot do a partial commit during a rebase."
12897msgstr "在变基过程中不能做部分提交。"
12898
12899#: builtin/commit.c:488
c04f5ac3 12900msgid "cannot read the index"
90e6ef53 12901msgstr "无法读取索引"
c04f5ac3 12902
349ede6a 12903#: builtin/commit.c:507
c04f5ac3 12904msgid "unable to write temporary index file"
90e6ef53 12905msgstr "无法写临时索引文件"
c04f5ac3 12906
349ede6a 12907#: builtin/commit.c:605
220c313c
JX
12908#, c-format
12909msgid "commit '%s' lacks author header"
12910msgstr "提交 '%s' 缺少作者信息"
12911
349ede6a 12912#: builtin/commit.c:607
c04f5ac3 12913#, c-format
220c313c 12914msgid "commit '%s' has malformed author line"
fd8cb379 12915msgstr "提交 '%s' 有格式错误的作者信息"
c04f5ac3 12916
349ede6a 12917#: builtin/commit.c:626
c04f5ac3 12918msgid "malformed --author parameter"
fd8cb379 12919msgstr "格式错误的 --author 参数"
c04f5ac3 12920
349ede6a 12921#: builtin/commit.c:679
6acbf033
JX
12922msgid ""
12923"unable to select a comment character that is not used\n"
12924"in the current commit message"
12925msgstr "无法选择一个未被当前提交说明使用的注释字符"
12926
d9488fea 12927#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097
c04f5ac3
JX
12928#, c-format
12929msgid "could not lookup commit %s"
12930msgstr "不能查询提交 %s"
12931
d9488fea 12932#: builtin/commit.c:729 builtin/shortlog.c:478
c04f5ac3
JX
12933#, c-format
12934msgid "(reading log message from standard input)\n"
90e6ef53 12935msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 12936
349ede6a 12937#: builtin/commit.c:731
c04f5ac3 12938msgid "could not read log from standard input"
90e6ef53 12939msgstr "不能从标准输入中读取日志信息"
c04f5ac3 12940
349ede6a 12941#: builtin/commit.c:735
c04f5ac3
JX
12942#, c-format
12943msgid "could not read log file '%s'"
90e6ef53 12944msgstr "不能读取日志文件 '%s'"
c04f5ac3 12945
349ede6a 12946#: builtin/commit.c:766 builtin/commit.c:782
c04f5ac3 12947msgid "could not read SQUASH_MSG"
90e6ef53 12948msgstr "不能读取 SQUASH_MSG"
c04f5ac3 12949
349ede6a 12950#: builtin/commit.c:773
5b04ee3b
JX
12951msgid "could not read MERGE_MSG"
12952msgstr "不能读取 MERGE_MSG"
12953
349ede6a 12954#: builtin/commit.c:833
c04f5ac3 12955msgid "could not write commit template"
90e6ef53 12956msgstr "不能写提交模版"
c04f5ac3 12957
d9488fea 12958#: builtin/commit.c:853
c04f5ac3
JX
12959msgid ""
12960"\n"
8ada9598 12961"It looks like you may be committing a merge.\n"
d9488fea
JX
12962"If this is not correct, please run\n"
12963"\tgit update-ref -d MERGE_HEAD\n"
c04f5ac3
JX
12964"and try again.\n"
12965msgstr ""
12966"\n"
d9488fea
JX
12967"似乎您正在做一个合并提交。如果不对,请运行\n"
12968"\tgit update-ref -d MERGE_HEAD\n"
c04f5ac3
JX
12969"然后重试。\n"
12970
d9488fea 12971#: builtin/commit.c:858
8ada9598
JX
12972msgid ""
12973"\n"
12974"It looks like you may be committing a cherry-pick.\n"
d9488fea
JX
12975"If this is not correct, please run\n"
12976"\tgit update-ref -d CHERRY_PICK_HEAD\n"
8ada9598
JX
12977"and try again.\n"
12978msgstr ""
12979"\n"
d9488fea
JX
12980"似乎您正在做一个拣选提交。如果不对,请运行\n"
12981"\tgit update-ref -d CHERRY_PICK_HEAD\n"
8ada9598 12982"然后重试。\n"
c04f5ac3 12983
d9488fea 12984#: builtin/commit.c:868
a77c07d9 12985#, c-format
c04f5ac3 12986msgid ""
8ada9598 12987"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 12988"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 12989msgstr ""
a77c07d9 12990"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 12991"说明将会终止提交。\n"
c04f5ac3 12992
d9488fea 12993#: builtin/commit.c:876
a77c07d9 12994#, c-format
c04f5ac3 12995msgid ""
8ada9598 12996"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 12997"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
12998"An empty message aborts the commit.\n"
12999msgstr ""
a77c07d9
JX
13000"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
13001"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 13002
90e6ef53 13003# 译者:为保证在输出中对齐,注意调整句中空格!
d9488fea 13004#: builtin/commit.c:893
6acbf033
JX
13005#, c-format
13006msgid "%sAuthor: %.*s <%.*s>"
13007msgstr "%s作者: %.*s <%.*s>"
13008
13009# 译者:为保证在输出中对齐,注意调整句中空格!
d9488fea 13010#: builtin/commit.c:901
c04f5ac3 13011#, c-format
6acbf033
JX
13012msgid "%sDate: %s"
13013msgstr "%s日期: %s"
c04f5ac3 13014
90e6ef53 13015# 译者:为保证在输出中对齐,注意调整句中空格!
d9488fea 13016#: builtin/commit.c:908
c04f5ac3 13017#, c-format
6acbf033
JX
13018msgid "%sCommitter: %.*s <%.*s>"
13019msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 13020
d9488fea 13021#: builtin/commit.c:926
c04f5ac3 13022msgid "Cannot read index"
90e6ef53 13023msgstr "无法读取索引"
c04f5ac3 13024
d9488fea 13025#: builtin/commit.c:997
c04f5ac3
JX
13026msgid "Error building trees"
13027msgstr "无法创建树对象"
13028
d9488fea 13029#: builtin/commit.c:1011 builtin/tag.c:276
c04f5ac3
JX
13030#, c-format
13031msgid "Please supply the message using either -m or -F option.\n"
07432cef 13032msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 13033
d9488fea 13034#: builtin/commit.c:1055
c04f5ac3 13035#, c-format
814ff314 13036msgid "--author '%s' is not 'Name <email>' and matches no existing author"
58b6f078 13037msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配"
c04f5ac3 13038
d9488fea 13039#: builtin/commit.c:1069
5809aa05
JX
13040#, c-format
13041msgid "Invalid ignored mode '%s'"
13042msgstr "无效的忽略模式 '%s'"
13043
d9488fea 13044#: builtin/commit.c:1087 builtin/commit.c:1331
c04f5ac3
JX
13045#, c-format
13046msgid "Invalid untracked files mode '%s'"
90e6ef53 13047msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 13048
d9488fea 13049#: builtin/commit.c:1127
2e8451e8
JX
13050msgid "--long and -z are incompatible"
13051msgstr "--long 和 -z 选项不兼容"
13052
d9488fea 13053#: builtin/commit.c:1171
c04f5ac3
JX
13054msgid "Using both --reset-author and --author does not make sense"
13055msgstr "同时使用 --reset-author 和 --author 没有意义"
13056
d9488fea 13057#: builtin/commit.c:1180
c04f5ac3 13058msgid "You have nothing to amend."
90e6ef53 13059msgstr "您没有可修补的提交。"
c04f5ac3 13060
d9488fea 13061#: builtin/commit.c:1183
8ada9598 13062msgid "You are in the middle of a merge -- cannot amend."
81809b99 13063msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 13064
d9488fea 13065#: builtin/commit.c:1185
8ada9598 13066msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 13067msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 13068
d9488fea 13069#: builtin/commit.c:1187
349ede6a
JX
13070msgid "You are in the middle of a rebase -- cannot amend."
13071msgstr "您正处于一个变基过程中 -- 无法修补提交。"
13072
d9488fea 13073#: builtin/commit.c:1190
c04f5ac3 13074msgid "Options --squash and --fixup cannot be used together"
649900bc 13075msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 13076
d9488fea 13077#: builtin/commit.c:1200
c04f5ac3
JX
13078msgid "Only one of -c/-C/-F/--fixup can be used."
13079msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
13080
d9488fea 13081#: builtin/commit.c:1202
31e5e17b
JX
13082msgid "Option -m cannot be combined with -c/-C/-F."
13083msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
c04f5ac3 13084
d9488fea 13085#: builtin/commit.c:1211
c04f5ac3 13086msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 13087msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 13088
d9488fea 13089#: builtin/commit.c:1229
c04f5ac3
JX
13090msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
13091msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
13092
d9488fea 13093#: builtin/commit.c:1235
c04f5ac3 13094#, c-format
d46c5519
JX
13095msgid "paths '%s ...' with -a does not make sense"
13096msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"
c04f5ac3 13097
d9488fea 13098#: builtin/commit.c:1366 builtin/commit.c:1527
ef317cd5 13099msgid "show status concisely"
07432cef 13100msgstr "以简洁的格式显示状态"
ef317cd5 13101
d9488fea 13102#: builtin/commit.c:1368 builtin/commit.c:1529
ef317cd5 13103msgid "show branch information"
07432cef 13104msgstr "显示分支信息"
ef317cd5 13105
d9488fea 13106#: builtin/commit.c:1370
a4f16749
JX
13107msgid "show stash information"
13108msgstr "显示贮藏区信息"
13109
d9488fea 13110#: builtin/commit.c:1372 builtin/commit.c:1531
31e5e17b
JX
13111msgid "compute full ahead/behind values"
13112msgstr "计算完整的领先/落后值"
13113
d9488fea 13114#: builtin/commit.c:1374
a0b6b246
JX
13115msgid "version"
13116msgstr "版本"
13117
d9488fea 13118#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539
7157c2b5 13119#: builtin/worktree.c:722
ef317cd5 13120msgid "machine-readable output"
07432cef
WS
13121msgstr "机器可读的输出"
13122
d9488fea 13123#: builtin/commit.c:1377 builtin/commit.c:1535
07432cef
WS
13124msgid "show status in long format (default)"
13125msgstr "以长格式显示状态(默认)"
ef317cd5 13126
d9488fea 13127#: builtin/commit.c:1380 builtin/commit.c:1538
ef317cd5 13128msgid "terminate entries with NUL"
4375c10e 13129msgstr "条目以 NUL 字符结尾"
ef317cd5 13130
d9488fea 13131#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
7157c2b5 13132#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
d9488fea 13133#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336
ef317cd5 13134msgid "mode"
07432cef 13135msgstr "模式"
ef317cd5 13136
d9488fea 13137#: builtin/commit.c:1383 builtin/commit.c:1541
ef317cd5 13138msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 13139msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 13140
d9488fea 13141#: builtin/commit.c:1387
5809aa05
JX
13142msgid ""
13143"show ignored files, optional modes: traditional, matching, no. (Default: "
13144"traditional)"
31e5e17b
JX
13145msgstr ""
13146"显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)"
ef317cd5 13147
d9488fea 13148#: builtin/commit.c:1389 parse-options.h:192
ef317cd5
JX
13149msgid "when"
13150msgstr "何时"
13151
d9488fea 13152#: builtin/commit.c:1390
ef317cd5
JX
13153msgid ""
13154"ignore changes to submodules, optional when: all, dirty, untracked. "
13155"(Default: all)"
13156msgstr ""
07432cef 13157"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 13158
d9488fea 13159#: builtin/commit.c:1392
ef317cd5 13160msgid "list untracked files in columns"
07432cef 13161msgstr "以列的方式显示未跟踪的文件"
ef317cd5 13162
d9488fea 13163#: builtin/commit.c:1393
fd8cb379
JX
13164msgid "do not detect renames"
13165msgstr "不检测重命名"
13166
d9488fea 13167#: builtin/commit.c:1395
fd8cb379
JX
13168msgid "detect renames, optionally set similarity index"
13169msgstr "检测重命名,可以设置索引相似度"
13170
d9488fea 13171#: builtin/commit.c:1415
5809aa05
JX
13172msgid "Unsupported combination of ignored and untracked-files arguments"
13173msgstr "不支持已忽略和未跟踪文件参数的组合"
13174
d9488fea 13175#: builtin/commit.c:1497
ef317cd5 13176msgid "suppress summary after successful commit"
07432cef 13177msgstr "提交成功后不显示概述信息"
c04f5ac3 13178
d9488fea 13179#: builtin/commit.c:1498
ef317cd5 13180msgid "show diff in commit message template"
07432cef 13181msgstr "在提交说明模板里显示差异"
c04f5ac3 13182
d9488fea 13183#: builtin/commit.c:1500
ef317cd5 13184msgid "Commit message options"
07432cef 13185msgstr "提交说明选项"
c04f5ac3 13186
d9488fea 13187#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415
ef317cd5 13188msgid "read message from file"
07432cef 13189msgstr "从文件中读取提交说明"
c04f5ac3 13190
d9488fea 13191#: builtin/commit.c:1502
ef317cd5 13192msgid "author"
07432cef 13193msgstr "作者"
c04f5ac3 13194
d9488fea 13195#: builtin/commit.c:1502
ef317cd5 13196msgid "override author for commit"
07432cef 13197msgstr "提交时覆盖作者"
73a60cd2 13198
d9488fea 13199#: builtin/commit.c:1503 builtin/gc.c:539
ef317cd5 13200msgid "date"
07432cef 13201msgstr "日期"
c04f5ac3 13202
d9488fea 13203#: builtin/commit.c:1503
ef317cd5 13204msgid "override date for commit"
07432cef 13205msgstr "提交时覆盖日期"
c04f5ac3 13206
d9488fea
JX
13207#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
13208#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87
94550ed3
JX
13209msgid "commit"
13210msgstr "提交"
13211
d9488fea 13212#: builtin/commit.c:1505
ef317cd5 13213msgid "reuse and edit message from specified commit"
07432cef 13214msgstr "重用并编辑指定提交的提交说明"
ef317cd5 13215
d9488fea 13216#: builtin/commit.c:1506
ef317cd5 13217msgid "reuse message from specified commit"
07432cef 13218msgstr "重用指定提交的提交说明"
ef317cd5 13219
d9488fea 13220#: builtin/commit.c:1507
ef317cd5 13221msgid "use autosquash formatted message to fixup specified commit"
07432cef 13222msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 13223
d9488fea 13224#: builtin/commit.c:1508
ef317cd5 13225msgid "use autosquash formatted message to squash specified commit"
07432cef 13226msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 13227
d9488fea 13228#: builtin/commit.c:1509
ef317cd5 13229msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 13230msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 13231
d9488fea 13232#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292
349ede6a 13233#: builtin/pull.c:145 builtin/revert.c:110
ef317cd5 13234msgid "add Signed-off-by:"
07432cef 13235msgstr "添加 Signed-off-by: 签名"
ef317cd5 13236
d9488fea 13237#: builtin/commit.c:1511
ef317cd5 13238msgid "use specified template file"
07432cef 13239msgstr "使用指定的模板文件"
ef317cd5 13240
d9488fea 13241#: builtin/commit.c:1512
ef317cd5 13242msgid "force edit of commit"
07432cef 13243msgstr "强制编辑提交"
ef317cd5 13244
d9488fea 13245#: builtin/commit.c:1514
ef317cd5 13246msgid "include status in commit message template"
07432cef 13247msgstr "在提交说明模板里包含状态信息"
ef317cd5 13248
d9488fea 13249#: builtin/commit.c:1519
ef317cd5 13250msgid "Commit contents options"
07432cef 13251msgstr "提交内容选项"
ef317cd5 13252
d9488fea 13253#: builtin/commit.c:1520
ef317cd5 13254msgid "commit all changed files"
07432cef 13255msgstr "提交所有改动的文件"
ef317cd5 13256
d9488fea 13257#: builtin/commit.c:1521
ef317cd5 13258msgid "add specified files to index for commit"
07432cef 13259msgstr "添加指定的文件到索引区等待提交"
ef317cd5 13260
d9488fea 13261#: builtin/commit.c:1522
ef317cd5 13262msgid "interactively add files"
07432cef 13263msgstr "交互式添加文件"
ef317cd5 13264
d9488fea 13265#: builtin/commit.c:1523
ef317cd5 13266msgid "interactively add changes"
07432cef 13267msgstr "交互式添加变更"
ef317cd5 13268
d9488fea 13269#: builtin/commit.c:1524
ef317cd5 13270msgid "commit only specified files"
07432cef 13271msgstr "只提交指定的文件"
ef317cd5 13272
d9488fea 13273#: builtin/commit.c:1525
5c57d762
JX
13274msgid "bypass pre-commit and commit-msg hooks"
13275msgstr "绕过 pre-commit 和 commit-msg 钩子"
13276
d9488fea 13277#: builtin/commit.c:1526
ef317cd5 13278msgid "show what would be committed"
07432cef 13279msgstr "显示将要提交的内容"
ef317cd5 13280
d9488fea 13281#: builtin/commit.c:1539
ef317cd5 13282msgid "amend previous commit"
07432cef 13283msgstr "修改先前的提交"
ef317cd5 13284
d9488fea 13285#: builtin/commit.c:1540
ef317cd5 13286msgid "bypass post-rewrite hook"
07432cef 13287msgstr "绕过 post-rewrite 钩子"
ef317cd5 13288
d9488fea 13289#: builtin/commit.c:1547
ef317cd5 13290msgid "ok to record an empty change"
07432cef 13291msgstr "允许一个空提交"
ef317cd5 13292
d9488fea 13293#: builtin/commit.c:1549
ef317cd5 13294msgid "ok to record a change with an empty message"
07432cef 13295msgstr "允许空的提交说明"
ef317cd5 13296
d9488fea 13297#: builtin/commit.c:1622
c04f5ac3
JX
13298#, c-format
13299msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 13300msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 13301
d9488fea 13302#: builtin/commit.c:1629
c04f5ac3 13303msgid "could not read MERGE_MODE"
90e6ef53 13304msgstr "不能读取 MERGE_MODE"
c04f5ac3 13305
d9488fea 13306#: builtin/commit.c:1650
c04f5ac3
JX
13307#, c-format
13308msgid "could not read commit message: %s"
90e6ef53 13309msgstr "不能读取提交说明:%s"
c04f5ac3 13310
d9488fea 13311#: builtin/commit.c:1657
c04f5ac3
JX
13312#, c-format
13313msgid "Aborting commit due to empty commit message.\n"
13314msgstr "终止提交因为提交说明为空。\n"
13315
d9488fea 13316#: builtin/commit.c:1662
6937cb4e
JX
13317#, c-format
13318msgid "Aborting commit; you did not edit the message.\n"
13319msgstr "终止提交;您未更改来自模版的提交说明。\n"
13320
d9488fea 13321#: builtin/commit.c:1696
c04f5ac3 13322msgid ""
c1ac5258 13323"repository has been updated, but unable to write\n"
220c313c 13324"new_index file. Check that disk is not full and quota is\n"
a6cd2cc4 13325"not exceeded, and then \"git restore --staged :/\" to recover."
c04f5ac3 13326msgstr ""
a6cd2cc4
JX
13327"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满或\n"
13328"磁盘配额已耗尽,然后执行 \"git restore --staged :/\" 恢复。"
c04f5ac3 13329
4c27fcb5 13330#: builtin/config.c:11
814ff314
JX
13331msgid "git config [<options>]"
13332msgstr "git config [<选项>]"
ef317cd5 13333
d9488fea 13334#: builtin/config.c:107 builtin/env--helper.c:27
fd8cb379
JX
13335#, c-format
13336msgid "unrecognized --type argument, %s"
13337msgstr "未能识别的 --type 参数,%s"
13338
d9488fea 13339#: builtin/config.c:119
c1ac5258
JX
13340msgid "only one type at a time"
13341msgstr "一次只能一个类型"
13342
d9488fea 13343#: builtin/config.c:128
ef317cd5 13344msgid "Config file location"
07432cef 13345msgstr "配置文件位置"
ef317cd5 13346
d9488fea 13347#: builtin/config.c:129
ef317cd5 13348msgid "use global config file"
07432cef 13349msgstr "使用全局配置文件"
ef317cd5 13350
d9488fea 13351#: builtin/config.c:130
ef317cd5 13352msgid "use system config file"
07432cef 13353msgstr "使用系统级配置文件"
ef317cd5 13354
d9488fea 13355#: builtin/config.c:131
ef317cd5 13356msgid "use repository config file"
160fb2b2 13357msgstr "使用仓库级配置文件"
ef317cd5 13358
d9488fea 13359#: builtin/config.c:132
4c27fcb5
JX
13360msgid "use per-worktree config file"
13361msgstr "使用工作区级别的配置文件"
13362
d9488fea 13363#: builtin/config.c:133
ef317cd5 13364msgid "use given config file"
07432cef 13365msgstr "使用指定的配置文件"
ef317cd5 13366
d9488fea 13367#: builtin/config.c:134
2e8451e8 13368msgid "blob-id"
4375c10e 13369msgstr "数据对象 ID"
2e8451e8 13370
d9488fea 13371#: builtin/config.c:134
2e8451e8
JX
13372msgid "read config from given blob object"
13373msgstr "从给定的数据对象读取配置"
13374
d9488fea 13375#: builtin/config.c:135
ef317cd5 13376msgid "Action"
07432cef 13377msgstr "操作"
ef317cd5 13378
d9488fea 13379#: builtin/config.c:136
ef317cd5 13380msgid "get value: name [value-regex]"
07432cef 13381msgstr "获取值:name [value-regex]"
ef317cd5 13382
d9488fea 13383#: builtin/config.c:137
ef317cd5 13384msgid "get all values: key [value-regex]"
07432cef 13385msgstr "获得所有的值:key [value-regex]"
ef317cd5 13386
d9488fea 13387#: builtin/config.c:138
ef317cd5 13388msgid "get values for regexp: name-regex [value-regex]"
07432cef 13389msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 13390
d9488fea 13391#: builtin/config.c:139
90314792
JX
13392msgid "get value specific for the URL: section[.var] URL"
13393msgstr "获得 URL 取值:section[.var] URL"
13394
d9488fea 13395#: builtin/config.c:140
ef317cd5 13396msgid "replace all matching variables: name value [value_regex]"
07432cef 13397msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 13398
d9488fea 13399#: builtin/config.c:141
ef317cd5 13400msgid "add a new variable: name value"
07432cef 13401msgstr "添加一个新的变量:name value"
ef317cd5 13402
d9488fea 13403#: builtin/config.c:142
ef317cd5 13404msgid "remove a variable: name [value-regex]"
07432cef 13405msgstr "删除一个变量:name [value-regex]"
ef317cd5 13406
d9488fea 13407#: builtin/config.c:143
ef317cd5 13408msgid "remove all matches: name [value-regex]"
07432cef 13409msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 13410
d9488fea 13411#: builtin/config.c:144
ef317cd5 13412msgid "rename section: old-name new-name"
07432cef 13413msgstr "重命名小节:old-name new-name"
ef317cd5 13414
d9488fea 13415#: builtin/config.c:145
ef317cd5 13416msgid "remove a section: name"
07432cef 13417msgstr "删除一个小节:name"
ef317cd5 13418
d9488fea 13419#: builtin/config.c:146
ef317cd5 13420msgid "list all"
07432cef 13421msgstr "列出所有"
ef317cd5 13422
d9488fea 13423#: builtin/config.c:147
ef317cd5 13424msgid "open an editor"
07432cef 13425msgstr "打开一个编辑器"
ef317cd5 13426
d9488fea 13427#: builtin/config.c:148
04cb2f28
JX
13428msgid "find the color configured: slot [default]"
13429msgstr "获得配置的颜色:配置 [默认]"
ef317cd5 13430
d9488fea 13431#: builtin/config.c:149
04cb2f28
JX
13432msgid "find the color setting: slot [stdout-is-tty]"
13433msgstr "获得颜色设置:配置 [stdout-is-tty]"
ef317cd5 13434
d9488fea 13435#: builtin/config.c:150
ef317cd5 13436msgid "Type"
07432cef 13437msgstr "类型"
ef317cd5 13438
d9488fea 13439#: builtin/config.c:151 builtin/env--helper.c:43
fd8cb379
JX
13440msgid "value is given this type"
13441msgstr "取值为该类型"
13442
d9488fea 13443#: builtin/config.c:152
ef317cd5 13444msgid "value is \"true\" or \"false\""
07432cef 13445msgstr "值是 \"true\" 或 \"false\""
ef317cd5 13446
d9488fea 13447#: builtin/config.c:153
ef317cd5 13448msgid "value is decimal number"
07432cef 13449msgstr "值是十进制数"
ef317cd5 13450
d9488fea 13451#: builtin/config.c:154
ef317cd5 13452msgid "value is --bool or --int"
d9488fea 13453msgstr "值是 --bool 或 --int"
ef317cd5 13454
d9488fea
JX
13455#: builtin/config.c:155
13456msgid "value is --bool or string"
13457msgstr "值是 --bool 或字符串"
13458
13459#: builtin/config.c:156
ef317cd5 13460msgid "value is a path (file or directory name)"
07432cef 13461msgstr "值是一个路径(文件或目录名)"
ef317cd5 13462
d9488fea 13463#: builtin/config.c:157
5809aa05
JX
13464msgid "value is an expiry date"
13465msgstr "值是一个到期日期"
13466
d9488fea 13467#: builtin/config.c:158
ef317cd5 13468msgid "Other"
07432cef 13469msgstr "其它"
ef317cd5 13470
d9488fea 13471#: builtin/config.c:159
ef317cd5 13472msgid "terminate values with NUL byte"
4375c10e 13473msgstr "终止值是 NUL 字节"
ef317cd5 13474
d9488fea 13475#: builtin/config.c:160
1b7f4a34
JX
13476msgid "show variable names only"
13477msgstr "只显示变量名"
13478
d9488fea 13479#: builtin/config.c:161
ef317cd5 13480msgid "respect include directives on lookup"
07432cef 13481msgstr "查询时参照 include 指令递归查找"
ef317cd5 13482
d9488fea 13483#: builtin/config.c:162
276ceeaa
JX
13484msgid "show origin of config (file, standard input, blob, command line)"
13485msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
13486
d9488fea 13487#: builtin/config.c:163
2b472aae 13488msgid "show scope of config (worktree, local, global, system, command)"
440e7442 13489msgstr "显示配置的作用域(工作区、本地、全局、系统、命令)"
2b472aae 13490
d9488fea 13491#: builtin/config.c:164 builtin/env--helper.c:45
fd8cb379
JX
13492msgid "value"
13493msgstr "取值"
13494
d9488fea 13495#: builtin/config.c:164
fd8cb379
JX
13496msgid "with --get, use default value when missing entry"
13497msgstr "使用 --get 参数,当缺少设置时使用默认值"
13498
d9488fea 13499#: builtin/config.c:178
c1ac5258
JX
13500#, c-format
13501msgid "wrong number of arguments, should be %d"
13502msgstr "错误的参数个数,应该为 %d 个"
13503
d9488fea 13504#: builtin/config.c:180
c1ac5258
JX
13505#, c-format
13506msgid "wrong number of arguments, should be from %d to %d"
13507msgstr "错误的参数个数,应该为从 %d 个到 %d 个"
13508
d9488fea 13509#: builtin/config.c:334
c1ac5258
JX
13510#, c-format
13511msgid "invalid key pattern: %s"
13512msgstr "无效键名模式:%s"
13513
d9488fea 13514#: builtin/config.c:370
fd8cb379
JX
13515#, c-format
13516msgid "failed to format default config value: %s"
c1ac5258
JX
13517msgstr "格式化默认配置值失败:%s"
13518
d9488fea 13519#: builtin/config.c:434
c1ac5258
JX
13520#, c-format
13521msgid "cannot parse color '%s'"
13522msgstr "无法解析颜色 '%s'"
fd8cb379 13523
d9488fea 13524#: builtin/config.c:476
220c313c 13525msgid "unable to parse default color value"
c1ac5258
JX
13526msgstr "无法解析默认颜色值"
13527
d9488fea 13528#: builtin/config.c:529 builtin/config.c:789
c1ac5258
JX
13529msgid "not in a git directory"
13530msgstr "不在 git 仓库中"
13531
d9488fea 13532#: builtin/config.c:532
c1ac5258
JX
13533msgid "writing to stdin is not supported"
13534msgstr "不支持写到标准输入"
13535
d9488fea 13536#: builtin/config.c:535
c1ac5258
JX
13537msgid "writing config blobs is not supported"
13538msgstr "不支持写到配置数据对象"
220c313c 13539
d9488fea 13540#: builtin/config.c:620
220c313c
JX
13541#, c-format
13542msgid ""
13543"# This is Git's per-user configuration file.\n"
7aea43ff 13544"[user]\n"
220c313c 13545"# Please adapt and uncomment the following lines:\n"
7aea43ff 13546"#\tname = %s\n"
220c313c
JX
13547"#\temail = %s\n"
13548msgstr ""
13549"# This is Git's per-user configuration file.\n"
7aea43ff 13550"[user]\n"
220c313c 13551"# Please adapt and uncomment the following lines:\n"
7aea43ff 13552"#\tname = %s\n"
220c313c
JX
13553"#\temail = %s\n"
13554
d9488fea 13555#: builtin/config.c:644
c1ac5258
JX
13556msgid "only one config file at a time"
13557msgstr "一次只能有一个配置文件"
13558
d9488fea 13559#: builtin/config.c:650
a4f16749 13560msgid "--local can only be used inside a git repository"
d9488fea 13561msgstr "--local 只能在 git 仓库内使用"
a4f16749 13562
d9488fea 13563#: builtin/config.c:652
fd8cb379 13564msgid "--blob can only be used inside a git repository"
d9488fea
JX
13565msgstr "--blob 只能在 git 仓库内使用"
13566
13567#: builtin/config.c:654
13568msgid "--worktree can only be used inside a git repository"
13569msgstr "--worktree 只能在 git 仓库内使用"
fd8cb379 13570
d9488fea 13571#: builtin/config.c:676
c1ac5258
JX
13572msgid "$HOME not set"
13573msgstr "$HOME 未设置"
13574
d9488fea 13575#: builtin/config.c:700
4c27fcb5
JX
13576msgid ""
13577"--worktree cannot be used with multiple working trees unless the config\n"
13578"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
13579"section in \"git help worktree\" for details"
13580msgstr ""
13581"不能和多个工作区一起使用 --worktree,除非启用 worktreeConfig 配置扩展。\n"
13582"详情请阅读“git help worktree”的“CONFIGURATION FILE”小节"
13583
d9488fea 13584#: builtin/config.c:735
c1ac5258
JX
13585msgid "--get-color and variable type are incoherent"
13586msgstr "--get-color 和变量类型不兼容"
13587
d9488fea 13588#: builtin/config.c:740
c1ac5258
JX
13589msgid "only one action at a time"
13590msgstr "一次只能有一个动作"
13591
d9488fea 13592#: builtin/config.c:753
c1ac5258
JX
13593msgid "--name-only is only applicable to --list or --get-regexp"
13594msgstr "--name-only 仅适用于 --list 或 --get-regexp"
13595
d9488fea 13596#: builtin/config.c:759
c1ac5258
JX
13597msgid ""
13598"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
13599"list"
13600msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
13601
d9488fea 13602#: builtin/config.c:765
c1ac5258
JX
13603msgid "--default is only applicable to --get"
13604msgstr "--default 仅适用于 --get"
13605
d9488fea 13606#: builtin/config.c:778
c1ac5258
JX
13607#, c-format
13608msgid "unable to read config file '%s'"
13609msgstr "无法读取配置文件 '%s'"
13610
d9488fea 13611#: builtin/config.c:781
c1ac5258
JX
13612msgid "error processing config file(s)"
13613msgstr "处理配置文件出错"
13614
d9488fea 13615#: builtin/config.c:791
c1ac5258
JX
13616msgid "editing stdin is not supported"
13617msgstr "不支持编辑标准输入"
13618
d9488fea 13619#: builtin/config.c:793
c1ac5258
JX
13620msgid "editing blobs is not supported"
13621msgstr "不支持编辑数据对象"
13622
d9488fea 13623#: builtin/config.c:807
220c313c
JX
13624#, c-format
13625msgid "cannot create configuration file %s"
13626msgstr "不能创建配置文件 %s"
13627
d9488fea 13628#: builtin/config.c:820
a0b6b246
JX
13629#, c-format
13630msgid ""
13631"cannot overwrite multiple values with a single value\n"
13632" Use a regexp, --add or --replace-all to change %s."
13633msgstr ""
13634"无法用一个值覆盖多个值\n"
13635" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
13636
d9488fea 13637#: builtin/config.c:894 builtin/config.c:905
c1ac5258
JX
13638#, c-format
13639msgid "no such section: %s"
13640msgstr "无此小节:%s"
13641
fd8cb379 13642#: builtin/count-objects.c:90
4dcdc3d8
JX
13643msgid "git count-objects [-v] [-H | --human-readable]"
13644msgstr "git count-objects [-v] [-H | --human-readable]"
13645
fd8cb379 13646#: builtin/count-objects.c:100
4dcdc3d8
JX
13647msgid "print sizes in human readable format"
13648msgstr "以用户可读的格式显示大小"
ef317cd5 13649
d9488fea
JX
13650#: builtin/credential-cache--daemon.c:226
13651#, c-format
13652msgid ""
13653"The permissions on your socket directory are too loose; other\n"
13654"users may be able to read your cached credentials. Consider running:\n"
13655"\n"
13656"\tchmod 0700 %s"
13657msgstr ""
13658"您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
13659"行:\n"
13660"\n"
13661"\tchmod 0700 %s"
13662
13663#: builtin/credential-cache--daemon.c:275
13664msgid "print debugging messages to stderr"
13665msgstr "输出调试信息到标准错误"
13666
13667#: builtin/credential-cache--daemon.c:315
13668msgid "credential-cache--daemon unavailable; no unix socket support"
13669msgstr "credential-cache--daemon 不可用,不支持 unix 套接字"
13670
13671#: builtin/credential-cache.c:154
13672msgid "credential-cache unavailable; no unix socket support"
13673msgstr "credential-cache 不可用,不支持 unix 套接字"
13674
a5cd71ca 13675#: builtin/describe.c:26
814ff314
JX
13676msgid "git describe [<options>] [<commit-ish>...]"
13677msgstr "git describe [<选项>] [<提交号>...]"
ef317cd5 13678
a5cd71ca 13679#: builtin/describe.c:27
814ff314
JX
13680msgid "git describe [<options>] --dirty"
13681msgstr "git describe [<选项>] --dirty"
ef317cd5 13682
349ede6a 13683#: builtin/describe.c:63
87cb7997
JX
13684msgid "head"
13685msgstr "头"
13686
349ede6a 13687#: builtin/describe.c:63
87cb7997
JX
13688msgid "lightweight"
13689msgstr "轻量级的"
13690
349ede6a 13691#: builtin/describe.c:63
87cb7997
JX
13692msgid "annotated"
13693msgstr "附注的"
13694
349ede6a 13695#: builtin/describe.c:277
c04f5ac3
JX
13696#, c-format
13697msgid "annotated tag %s not available"
55a16ee4 13698msgstr "附注标签 %s 无效"
c04f5ac3 13699
a5cd71ca 13700#: builtin/describe.c:281
c04f5ac3 13701#, c-format
349ede6a
JX
13702msgid "tag '%s' is externally known as '%s'"
13703msgstr "标签 '%s' 在外部被认为是 '%s'"
c04f5ac3 13704
349ede6a 13705#: builtin/describe.c:328
c04f5ac3
JX
13706#, c-format
13707msgid "no tag exactly matches '%s'"
55a16ee4 13708msgstr "没有标签准确匹配 '%s'"
c04f5ac3 13709
349ede6a 13710#: builtin/describe.c:330
c04f5ac3 13711#, c-format
5809aa05
JX
13712msgid "No exact match on refs or tags, searching to describe\n"
13713msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n"
c04f5ac3 13714
349ede6a 13715#: builtin/describe.c:397
c04f5ac3
JX
13716#, c-format
13717msgid "finished search at %s\n"
13718msgstr "完成搜索 %s\n"
13719
349ede6a 13720#: builtin/describe.c:424
c04f5ac3
JX
13721#, c-format
13722msgid ""
13723"No annotated tags can describe '%s'.\n"
13724"However, there were unannotated tags: try --tags."
13725msgstr ""
55a16ee4
RC
13726"没有附注标签能描述 '%s'。\n"
13727"然而,存在未附注标签:尝试 --tags。"
c04f5ac3 13728
349ede6a 13729#: builtin/describe.c:428
c04f5ac3
JX
13730#, c-format
13731msgid ""
13732"No tags can describe '%s'.\n"
13733"Try --always, or create some tags."
13734msgstr ""
55a16ee4
RC
13735"没有标签能描述 '%s'。\n"
13736"尝试 --always,或者创建一些标签。"
c04f5ac3 13737
349ede6a 13738#: builtin/describe.c:458
c04f5ac3
JX
13739#, c-format
13740msgid "traversed %lu commits\n"
13741msgstr "已遍历 %lu 个提交\n"
13742
349ede6a 13743#: builtin/describe.c:461
c04f5ac3
JX
13744#, c-format
13745msgid ""
13746"more than %i tags found; listed %i most recent\n"
13747"gave up search at %s\n"
13748msgstr ""
55a16ee4 13749"发现多于 %i 个标签,列出最近的 %i 个\n"
90e6ef53 13750"在 %s 放弃搜索\n"
c04f5ac3 13751
349ede6a 13752#: builtin/describe.c:529
5809aa05
JX
13753#, c-format
13754msgid "describe %s\n"
13755msgstr "描述 %s\n"
13756
349ede6a 13757#: builtin/describe.c:532
5809aa05
JX
13758#, c-format
13759msgid "Not a valid object name %s"
13760msgstr "不是一个有效的对象名 %s"
13761
349ede6a 13762#: builtin/describe.c:540
5809aa05
JX
13763#, c-format
13764msgid "%s is neither a commit nor blob"
13765msgstr "%s 既不是提交也不是数据对象"
13766
349ede6a 13767#: builtin/describe.c:554
ef317cd5 13768msgid "find the tag that comes after the commit"
55a16ee4 13769msgstr "寻找该提交之后的标签"
ef317cd5 13770
349ede6a 13771#: builtin/describe.c:555
ef317cd5 13772msgid "debug search strategy on stderr"
07432cef 13773msgstr "在标准错误上调试搜索策略"
ef317cd5 13774
349ede6a 13775#: builtin/describe.c:556
1003b3a5
JX
13776msgid "use any ref"
13777msgstr "使用任意引用"
13778
349ede6a 13779#: builtin/describe.c:557
1003b3a5 13780msgid "use any tag, even unannotated"
55a16ee4 13781msgstr "使用任意标签,即使未附带注释"
ef317cd5 13782
349ede6a 13783#: builtin/describe.c:558
ef317cd5 13784msgid "always use long format"
07432cef 13785msgstr "始终使用长提交号格式"
ef317cd5 13786
349ede6a 13787#: builtin/describe.c:559
2e8451e8
JX
13788msgid "only follow first parent"
13789msgstr "只跟随第一个父提交"
13790
349ede6a 13791#: builtin/describe.c:562
ef317cd5 13792msgid "only output exact matches"
07432cef 13793msgstr "只输出精确匹配"
ef317cd5 13794
349ede6a 13795#: builtin/describe.c:564
ef317cd5 13796msgid "consider <n> most recent tags (default: 10)"
55a16ee4 13797msgstr "考虑最近 <n> 个标签(默认:10)"
ef317cd5 13798
349ede6a 13799#: builtin/describe.c:566
ef317cd5 13800msgid "only consider tags matching <pattern>"
55a16ee4 13801msgstr "只考虑匹配 <模式> 的标签"
ef317cd5 13802
349ede6a 13803#: builtin/describe.c:568
87cb7997
JX
13804msgid "do not consider tags matching <pattern>"
13805msgstr "不考虑匹配 <模式> 的标签"
13806
349ede6a 13807#: builtin/describe.c:570 builtin/name-rev.c:535
ef317cd5 13808msgid "show abbreviated commit object as fallback"
07432cef 13809msgstr "显示简写的提交号作为后备"
ef317cd5 13810
349ede6a 13811#: builtin/describe.c:571 builtin/describe.c:574
ef317cd5 13812msgid "mark"
07432cef 13813msgstr "标记"
ef317cd5 13814
349ede6a 13815#: builtin/describe.c:572
ef317cd5 13816msgid "append <mark> on dirty working tree (default: \"-dirty\")"
160fb2b2 13817msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
ef317cd5 13818
349ede6a 13819#: builtin/describe.c:575
87cb7997
JX
13820msgid "append <mark> on broken working tree (default: \"-broken\")"
13821msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
13822
349ede6a 13823#: builtin/describe.c:593
c04f5ac3
JX
13824msgid "--long is incompatible with --abbrev=0"
13825msgstr "--long 与 --abbrev=0 不兼容"
13826
349ede6a 13827#: builtin/describe.c:622
c04f5ac3 13828msgid "No names found, cannot describe anything."
90e6ef53 13829msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 13830
349ede6a 13831#: builtin/describe.c:673
a8a5406a 13832msgid "--dirty is incompatible with commit-ishes"
87cb7997
JX
13833msgstr "--dirty 与提交号不兼容"
13834
349ede6a 13835#: builtin/describe.c:675
87cb7997
JX
13836msgid "--broken is incompatible with commit-ishes"
13837msgstr "--broken 与提交号不兼容"
c04f5ac3 13838
7157c2b5 13839#: builtin/diff.c:91
c04f5ac3
JX
13840#, c-format
13841msgid "'%s': not a regular file or symlink"
13842msgstr "'%s':不是一个正规文件或符号链接"
13843
d9488fea 13844#: builtin/diff.c:241
c04f5ac3
JX
13845#, c-format
13846msgid "invalid option: %s"
13847msgstr "无效选项:%s"
13848
d9488fea 13849#: builtin/diff.c:358
7157c2b5
JX
13850#, c-format
13851msgid "%s...%s: no merge base"
13852msgstr "%s...%s:无合并基线"
13853
d9488fea 13854#: builtin/diff.c:468
c04f5ac3 13855msgid "Not a git repository"
d9488fea 13856msgstr "不是 git 仓库"
c04f5ac3 13857
d9488fea 13858#: builtin/diff.c:513
c04f5ac3
JX
13859#, c-format
13860msgid "invalid object '%s' given."
13861msgstr "提供了无效对象 '%s'。"
13862
d9488fea 13863#: builtin/diff.c:524
c04f5ac3
JX
13864#, c-format
13865msgid "more than two blobs given: '%s'"
160fb2b2 13866msgstr "提供了超过两个数据对象:'%s'"
c04f5ac3 13867
d9488fea 13868#: builtin/diff.c:529
c04f5ac3
JX
13869#, c-format
13870msgid "unhandled object '%s' given."
6c94aba5 13871msgstr "无法处理的对象 '%s'。"
c04f5ac3 13872
d9488fea 13873#: builtin/diff.c:563
7157c2b5
JX
13874#, c-format
13875msgid "%s...%s: multiple merge bases, using %s"
13876msgstr "%s...%s:多条合并基线,使用 %s"
13877
d46c5519 13878#: builtin/difftool.c:30
1a79b2f1
JX
13879msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
13880msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
13881
a5cd71ca 13882#: builtin/difftool.c:260
1a79b2f1
JX
13883#, c-format
13884msgid "failed: %d"
13885msgstr "失败:%d"
13886
a5cd71ca 13887#: builtin/difftool.c:302
87cb7997
JX
13888#, c-format
13889msgid "could not read symlink %s"
13890msgstr "无法读取符号链接 %s"
13891
a5cd71ca 13892#: builtin/difftool.c:304
87cb7997
JX
13893#, c-format
13894msgid "could not read symlink file %s"
13895msgstr "无法读取符号链接文件 %s"
13896
a5cd71ca 13897#: builtin/difftool.c:312
87cb7997
JX
13898#, c-format
13899msgid "could not read object %s for symlink %s"
13900msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
13901
a5cd71ca 13902#: builtin/difftool.c:413
1a79b2f1
JX
13903msgid ""
13904"combined diff formats('-c' and '--cc') are not supported in\n"
13905"directory diff mode('-d' and '--dir-diff')."
87cb7997
JX
13906msgstr ""
13907"不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
13908"cc')。"
1a79b2f1 13909
a5cd71ca 13910#: builtin/difftool.c:634
1a79b2f1
JX
13911#, c-format
13912msgid "both files modified: '%s' and '%s'."
13913msgstr "两个文件都被修改:'%s' 和 '%s'。"
13914
a5cd71ca 13915#: builtin/difftool.c:636
1a79b2f1
JX
13916msgid "working tree file has been left."
13917msgstr "工作区文件被留了下来。"
13918
a5cd71ca 13919#: builtin/difftool.c:647
1a79b2f1
JX
13920#, c-format
13921msgid "temporary files exist in '%s'."
13922msgstr "临时文件存在于 '%s'。"
13923
a5cd71ca 13924#: builtin/difftool.c:648
1a79b2f1
JX
13925msgid "you may want to cleanup or recover these."
13926msgstr "您可能想要清理或者恢复它们。"
13927
a5cd71ca 13928#: builtin/difftool.c:697
1a79b2f1
JX
13929msgid "use `diff.guitool` instead of `diff.tool`"
13930msgstr "使用 `diff.guitool` 代替 `diff.tool`"
13931
a5cd71ca 13932#: builtin/difftool.c:699
1a79b2f1
JX
13933msgid "perform a full-directory diff"
13934msgstr "执行一个全目录差异比较"
13935
a5cd71ca 13936#: builtin/difftool.c:701
1a79b2f1
JX
13937msgid "do not prompt before launching a diff tool"
13938msgstr "启动差异比较工具之前不提示"
13939
a5cd71ca 13940#: builtin/difftool.c:706
1a79b2f1
JX
13941msgid "use symlinks in dir-diff mode"
13942msgstr "在 dir-diff 模式中使用符号链接"
13943
a5cd71ca 13944#: builtin/difftool.c:707
c1ac5258
JX
13945msgid "tool"
13946msgstr "工具"
13947
a5cd71ca 13948#: builtin/difftool.c:708
1a79b2f1
JX
13949msgid "use the specified diff tool"
13950msgstr "使用指定的差异比较工具"
13951
a5cd71ca 13952#: builtin/difftool.c:710
1a79b2f1
JX
13953msgid "print a list of diff tools that may be used with `--tool`"
13954msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
13955
a5cd71ca 13956#: builtin/difftool.c:713
1a79b2f1
JX
13957msgid ""
13958"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
13959"code"
13960msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出"
13961
a5cd71ca 13962#: builtin/difftool.c:716
1a79b2f1
JX
13963msgid "specify a custom command for viewing diffs"
13964msgstr "指定一个用于查看差异的自定义命令"
13965
a5cd71ca 13966#: builtin/difftool.c:717
d46c5519
JX
13967msgid "passed to `diff`"
13968msgstr "传递给 `diff`"
13969
a5cd71ca 13970#: builtin/difftool.c:732
d46c5519
JX
13971msgid "difftool requires worktree or --no-index"
13972msgstr "difftool 要求工作区或者 --no-index"
13973
a5cd71ca 13974#: builtin/difftool.c:739
d46c5519
JX
13975msgid "--dir-diff is incompatible with --no-index"
13976msgstr "--dir-diff 和 --no-index 不兼容"
13977
a5cd71ca 13978#: builtin/difftool.c:742
d46c5519
JX
13979msgid "--gui, --tool and --extcmd are mutually exclusive"
13980msgstr "--gui、--tool 和 --extcmd 互斥"
13981
a5cd71ca 13982#: builtin/difftool.c:750
1a79b2f1
JX
13983msgid "no <tool> given for --tool=<tool>"
13984msgstr "没有为 --tool=<工具> 参数提供 <工具>"
13985
a5cd71ca 13986#: builtin/difftool.c:757
1a79b2f1
JX
13987msgid "no <cmd> given for --extcmd=<cmd>"
13988msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
13989
a6cd2cc4
JX
13990#: builtin/env--helper.c:6
13991msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
13992msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>"
13993
d9488fea 13994#: builtin/env--helper.c:42 builtin/hash-object.c:98
a6cd2cc4
JX
13995msgid "type"
13996msgstr "类型"
13997
d9488fea 13998#: builtin/env--helper.c:46
a6cd2cc4
JX
13999msgid "default for git_env_*(...) to fall back on"
14000msgstr "git_env_*(...) 的默认值"
14001
d9488fea 14002#: builtin/env--helper.c:48
a6cd2cc4
JX
14003msgid "be quiet only use git_env_*() value as exit code"
14004msgstr "安静模式,只使用 git_env_*() 的值作为退出码"
14005
d9488fea 14006#: builtin/env--helper.c:67
a6cd2cc4
JX
14007#, c-format
14008msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
14009msgstr "选项 `--default' 和 `type=bool` 期望一个布尔值,不是 `%s`"
14010
d9488fea 14011#: builtin/env--helper.c:82
a6cd2cc4
JX
14012#, c-format
14013msgid ""
14014"option `--default' expects an unsigned long value with `--type=ulong`, not `"
14015"%s`"
14016msgstr "选项 `--default' 和 `type=ulong` 期望一个无符号长整型,不是 `%s`"
14017
c1ac5258 14018#: builtin/fast-export.c:29
ef317cd5 14019msgid "git fast-export [rev-list-opts]"
07432cef 14020msgstr "git fast-export [rev-list-opts]"
ef317cd5 14021
7157c2b5 14022#: builtin/fast-export.c:868
a5cd71ca
JX
14023msgid "Error: Cannot export nested tags unless --mark-tags is specified."
14024msgstr "错误:除非指定 --mark-tags,否则无法导出嵌套标签。"
14025
7157c2b5
JX
14026#: builtin/fast-export.c:1178
14027msgid "--anonymize-map token cannot be empty"
14028msgstr "--anonymize-map 取值不能为空"
14029
14030#: builtin/fast-export.c:1198
ef317cd5 14031msgid "show progress after <n> objects"
07432cef 14032msgstr "在 <n> 个对象之后显示进度"
ef317cd5 14033
7157c2b5 14034#: builtin/fast-export.c:1200
ef317cd5 14035msgid "select handling of signed tags"
55a16ee4 14036msgstr "选择如何处理签名标签"
ef317cd5 14037
7157c2b5 14038#: builtin/fast-export.c:1203
ef317cd5 14039msgid "select handling of tags that tag filtered objects"
55a16ee4 14040msgstr "选择当标签指向被过滤对象时该标签的处理方式"
ef317cd5 14041
7157c2b5 14042#: builtin/fast-export.c:1206
a6cd2cc4
JX
14043msgid "select handling of commit messages in an alternate encoding"
14044msgstr "选择使用备用编码处理提交说明"
14045
7157c2b5 14046#: builtin/fast-export.c:1209
ef317cd5 14047msgid "Dump marks to this file"
07432cef 14048msgstr "把标记存储到这个文件"
ef317cd5 14049
7157c2b5 14050#: builtin/fast-export.c:1211
ef317cd5 14051msgid "Import marks from this file"
07432cef 14052msgstr "从这个文件导入标记"
ef317cd5 14053
7157c2b5 14054#: builtin/fast-export.c:1215
a5cd71ca
JX
14055msgid "Import marks from this file if it exists"
14056msgstr "从该文件导入标记(如果存在的话)"
14057
7157c2b5 14058#: builtin/fast-export.c:1217
ef317cd5 14059msgid "Fake a tagger when tags lack one"
55a16ee4 14060msgstr "当标签缺少标记者字段时,假装提供一个"
ef317cd5 14061
7157c2b5 14062#: builtin/fast-export.c:1219
ef317cd5 14063msgid "Output full tree for each commit"
07432cef 14064msgstr "每次提交都输出整个树"
ef317cd5 14065
7157c2b5 14066#: builtin/fast-export.c:1221
ef317cd5 14067msgid "Use the done feature to terminate the stream"
07432cef 14068msgstr "使用 done 功能来终止流"
ef317cd5 14069
7157c2b5 14070#: builtin/fast-export.c:1222
ef317cd5 14071msgid "Skip output of blob data"
07432cef 14072msgstr "跳过数据对象的输出"
ef317cd5 14073
d9488fea 14074#: builtin/fast-export.c:1223 builtin/log.c:1811
6acbf033 14075msgid "refspec"
160fb2b2 14076msgstr "引用规格"
6acbf033 14077
7157c2b5 14078#: builtin/fast-export.c:1224
6acbf033 14079msgid "Apply refspec to exported refs"
160fb2b2 14080msgstr "对导出的引用应用引用规格"
6acbf033 14081
7157c2b5 14082#: builtin/fast-export.c:1225
220c313c
JX
14083msgid "anonymize output"
14084msgstr "匿名输出"
14085
7157c2b5
JX
14086#: builtin/fast-export.c:1226
14087msgid "from:to"
14088msgstr "from:to"
14089
14090#: builtin/fast-export.c:1227
14091msgid "convert <from> to <to> in anonymized output"
14092msgstr "在匿名输出中将 <from> 转换为 <to>"
14093
14094#: builtin/fast-export.c:1230
06991777 14095msgid "Reference parents which are not in fast-export stream by object id"
5b533632 14096msgstr "引用父对象 ID 不在 fast-export 流中"
06991777 14097
7157c2b5 14098#: builtin/fast-export.c:1232
06991777 14099msgid "Show original object ids of blobs/commits"
5b533632 14100msgstr "显示数据对象/提交的原始对象 ID"
06991777 14101
7157c2b5 14102#: builtin/fast-export.c:1234
a5cd71ca
JX
14103msgid "Label tags with mark ids"
14104msgstr "对带有标记 ID 的标签做标记"
14105
7157c2b5
JX
14106#: builtin/fast-export.c:1257
14107msgid "--anonymize-map without --anonymize does not make sense"
14108msgstr "--anonymize-map 而没有 --anonymize 没有意义"
14109
14110#: builtin/fast-export.c:1272
a5cd71ca
JX
14111msgid "Cannot pass both --import-marks and --import-marks-if-exists"
14112msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists"
14113
d9488fea
JX
14114#: builtin/fast-import.c:3086
14115#, c-format
14116msgid "Missing from marks for submodule '%s'"
14117msgstr "子模组 '%s' 缺少 from 标记"
14118
14119#: builtin/fast-import.c:3088
14120#, c-format
14121msgid "Missing to marks for submodule '%s'"
14122msgstr "子模组 '%s' 缺少 to 标记"
14123
14124#: builtin/fast-import.c:3223
14125#, c-format
14126msgid "Expected 'mark' command, got %s"
14127msgstr "预期 'mark' 命令,得到 %s"
14128
14129#: builtin/fast-import.c:3228
14130#, c-format
14131msgid "Expected 'to' command, got %s"
14132msgstr "预期 'to' 命令,得到 %s"
14133
14134#: builtin/fast-import.c:3320
14135msgid "Expected format name:filename for submodule rewrite option"
14136msgstr "子模组重写选项的预期格式为 name:filename"
14137
14138#: builtin/fast-import.c:3374
14139#, c-format
14140msgid "feature '%s' forbidden in input without --allow-unsafe-features"
14141msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'"
14142
14143#: builtin/fetch-pack.c:241
7157c2b5
JX
14144#, c-format
14145msgid "Lockfile created but not reported: %s"
14146msgstr "Lockfile 已创建但未报告:%s"
14147
349ede6a 14148#: builtin/fetch.c:35
ef317cd5 14149msgid "git fetch [<options>] [<repository> [<refspec>...]]"
160fb2b2 14150msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
ef317cd5 14151
349ede6a 14152#: builtin/fetch.c:36
ef317cd5 14153msgid "git fetch [<options>] <group>"
07432cef 14154msgstr "git fetch [<选项>] <组>"
ef317cd5 14155
349ede6a 14156#: builtin/fetch.c:37
ef317cd5 14157msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
160fb2b2 14158msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
ef317cd5 14159
349ede6a 14160#: builtin/fetch.c:38
ef317cd5 14161msgid "git fetch --all [<options>]"
07432cef 14162msgstr "git fetch --all [<选项>]"
ef317cd5 14163
d9488fea 14164#: builtin/fetch.c:119
a5cd71ca
JX
14165msgid "fetch.parallel cannot be negative"
14166msgstr "fetch.parallel 不能为负数"
14167
d9488fea 14168#: builtin/fetch.c:142 builtin/pull.c:185
ef317cd5 14169msgid "fetch from all remotes"
07432cef 14170msgstr "从所有的远程抓取"
ef317cd5 14171
d9488fea 14172#: builtin/fetch.c:144 builtin/pull.c:245
a5cd71ca
JX
14173msgid "set upstream for git pull/fetch"
14174msgstr "为 git pull/fetch 设置上游"
14175
d9488fea 14176#: builtin/fetch.c:146 builtin/pull.c:188
ef317cd5 14177msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 14178msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 14179
d9488fea 14180#: builtin/fetch.c:148 builtin/pull.c:191
ef317cd5 14181msgid "path to upload pack on remote end"
07432cef 14182msgstr "上传包到远程的路径"
ef317cd5 14183
d9488fea 14184#: builtin/fetch.c:149
4c27fcb5
JX
14185msgid "force overwrite of local reference"
14186msgstr "强制覆盖本地引用"
ef317cd5 14187
d9488fea 14188#: builtin/fetch.c:151
ef317cd5 14189msgid "fetch from multiple remotes"
07432cef 14190msgstr "从多个远程抓取"
ef317cd5 14191
d9488fea 14192#: builtin/fetch.c:153 builtin/pull.c:195
ef317cd5 14193msgid "fetch all tags and associated objects"
55a16ee4 14194msgstr "抓取所有的标签和关联对象"
ef317cd5 14195
d9488fea 14196#: builtin/fetch.c:155
ef317cd5 14197msgid "do not fetch all tags (--no-tags)"
55a16ee4 14198msgstr "不抓取任何标签(--no-tags)"
ef317cd5 14199
d9488fea 14200#: builtin/fetch.c:157
276ceeaa
JX
14201msgid "number of submodules fetched in parallel"
14202msgstr "子模组获取的并发数"
14203
d9488fea 14204#: builtin/fetch.c:159 builtin/pull.c:198
ef317cd5 14205msgid "prune remote-tracking branches no longer on remote"
07432cef 14206msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 14207
d9488fea 14208#: builtin/fetch.c:161
31e5e17b
JX
14209msgid "prune local tags no longer on remote and clobber changed tags"
14210msgstr "清除远程不存在的本地标签,并且替换变更标签"
14211
07432cef 14212# 译者:可选值,不能翻译
d9488fea 14213#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122
ef317cd5 14214msgid "on-demand"
07432cef 14215msgstr "on-demand"
ef317cd5 14216
d9488fea 14217#: builtin/fetch.c:163
ef317cd5 14218msgid "control recursive fetching of submodules"
07432cef 14219msgstr "控制子模组的递归抓取"
ef317cd5 14220
d9488fea
JX
14221#: builtin/fetch.c:168
14222msgid "write fetched references to the FETCH_HEAD file"
14223msgstr "将获取到的引用写入 FETCH_HEAD 文件"
14224
14225#: builtin/fetch.c:169 builtin/pull.c:206
ef317cd5 14226msgid "keep downloaded pack"
07432cef 14227msgstr "保持下载包"
ef317cd5 14228
d9488fea 14229#: builtin/fetch.c:171
ef317cd5 14230msgid "allow updating of HEAD ref"
07432cef 14231msgstr "允许更新 HEAD 引用"
ef317cd5 14232
d9488fea 14233#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209
349ede6a 14234#: builtin/pull.c:218
ef317cd5 14235msgid "deepen history of shallow clone"
07432cef 14236msgstr "深化浅克隆的历史"
ef317cd5 14237
d9488fea 14238#: builtin/fetch.c:176 builtin/pull.c:212
a0b6b246
JX
14239msgid "deepen history of shallow repository based on time"
14240msgstr "基于时间来深化浅克隆的历史"
14241
d9488fea 14242#: builtin/fetch.c:182 builtin/pull.c:221
a77c07d9 14243msgid "convert to a complete repository"
160fb2b2 14244msgstr "转换为一个完整的仓库"
a77c07d9 14245
d9488fea 14246#: builtin/fetch.c:185
ef317cd5 14247msgid "prepend this to submodule path output"
07432cef 14248msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 14249
d9488fea 14250#: builtin/fetch.c:188
a4f16749
JX
14251msgid ""
14252"default for recursive fetching of submodules (lower priority than config "
14253"files)"
14254msgstr "递归获取子模组的缺省值(比配置文件优先级低)"
ef317cd5 14255
d9488fea 14256#: builtin/fetch.c:192 builtin/pull.c:224
cfff71a9
JX
14257msgid "accept refs that update .git/shallow"
14258msgstr "接受更新 .git/shallow 的引用"
14259
d9488fea 14260#: builtin/fetch.c:193 builtin/pull.c:226
6acbf033
JX
14261msgid "refmap"
14262msgstr "引用映射"
14263
d9488fea 14264#: builtin/fetch.c:194 builtin/pull.c:227
6acbf033
JX
14265msgid "specify fetch refmap"
14266msgstr "指定获取操作的引用映射"
14267
d9488fea 14268#: builtin/fetch.c:201 builtin/pull.c:240
c1ac5258
JX
14269msgid "report that we have only objects reachable from this object"
14270msgstr "报告我们只拥有从该对象开始可达的对象"
14271
d9488fea
JX
14272#: builtin/fetch.c:204 builtin/fetch.c:206
14273msgid "run 'maintenance --auto' after fetching"
14274msgstr "获取后执行 'maintenance --auto'"
a6cd2cc4 14275
d9488fea 14276#: builtin/fetch.c:208 builtin/pull.c:243
a6cd2cc4
JX
14277msgid "check for forced-updates on all updated branches"
14278msgstr "在所有更新分支上检查强制更新"
14279
d9488fea 14280#: builtin/fetch.c:210
ddc12c42
JX
14281msgid "write the commit-graph after fetching"
14282msgstr "抓取后写提交图"
14283
d9488fea
JX
14284#: builtin/fetch.c:212
14285msgid "accept refspecs from stdin"
14286msgstr "从标准输入获取引用表达式"
14287
14288#: builtin/fetch.c:523
c04f5ac3
JX
14289msgid "Couldn't find remote ref HEAD"
14290msgstr "无法发现远程 HEAD 引用"
14291
d9488fea 14292#: builtin/fetch.c:677
5c57d762
JX
14293#, c-format
14294msgid "configuration fetch.output contains invalid value %s"
14295msgstr "配置变量 fetch.output 包含无效值 %s"
14296
d9488fea 14297#: builtin/fetch.c:775
c04f5ac3
JX
14298#, c-format
14299msgid "object %s not found"
14300msgstr "对象 %s 未发现"
14301
d9488fea 14302#: builtin/fetch.c:779
c04f5ac3
JX
14303msgid "[up to date]"
14304msgstr "[最新]"
14305
d9488fea 14306#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880
c04f5ac3
JX
14307msgid "[rejected]"
14308msgstr "[已拒绝]"
14309
d9488fea 14310#: builtin/fetch.c:793
5c57d762 14311msgid "can't fetch in current branch"
9a4b694c 14312msgstr "当前分支下不能执行获取操作"
5c57d762 14313
d9488fea 14314#: builtin/fetch.c:803
c04f5ac3 14315msgid "[tag update]"
55a16ee4 14316msgstr "[标签更新]"
c04f5ac3 14317
d9488fea
JX
14318#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863
14319#: builtin/fetch.c:875
5c57d762
JX
14320msgid "unable to update local ref"
14321msgstr "不能更新本地引用"
c04f5ac3 14322
d9488fea 14323#: builtin/fetch.c:808
4c27fcb5
JX
14324msgid "would clobber existing tag"
14325msgstr "会破坏现有的标签"
14326
d9488fea 14327#: builtin/fetch.c:830
c04f5ac3 14328msgid "[new tag]"
55a16ee4 14329msgstr "[新标签]"
c04f5ac3 14330
d9488fea 14331#: builtin/fetch.c:833
c04f5ac3
JX
14332msgid "[new branch]"
14333msgstr "[新分支]"
14334
d9488fea 14335#: builtin/fetch.c:836
170e9899
JX
14336msgid "[new ref]"
14337msgstr "[新引用]"
14338
d9488fea 14339#: builtin/fetch.c:875
c04f5ac3
JX
14340msgid "forced update"
14341msgstr "强制更新"
14342
d9488fea 14343#: builtin/fetch.c:880
5c57d762
JX
14344msgid "non-fast-forward"
14345msgstr "非快进"
c04f5ac3 14346
d9488fea 14347#: builtin/fetch.c:901
a6cd2cc4
JX
14348msgid ""
14349"Fetch normally indicates which branches had a forced update,\n"
14350"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
14351"flag or run 'git config fetch.showForcedUpdates true'."
14352msgstr ""
14353"获取操作通常显示哪些分支发生了强制更新,但该检查已被禁用。\n"
14354"要重新启用,请使用 '--show-forced-updates' 选项或运行\n"
14355"'git config fetch.showForcedUpdates true'。"
14356
d9488fea 14357#: builtin/fetch.c:905
a6cd2cc4
JX
14358#, c-format
14359msgid ""
14360"It took %.2f seconds to check forced updates. You can use\n"
14361"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
14362"false'\n"
14363" to avoid this check.\n"
14364msgstr ""
14365"花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n"
14366"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n"
14367
d9488fea 14368#: builtin/fetch.c:939
c04f5ac3
JX
14369#, c-format
14370msgid "%s did not send all necessary objects\n"
e640d114 14371msgstr "%s 未发送所有必需的对象\n"
c04f5ac3 14372
d9488fea 14373#: builtin/fetch.c:960
cfff71a9
JX
14374#, c-format
14375msgid "reject %s because shallow roots are not allowed to be updated"
14376msgstr "拒绝 %s 因为浅克隆不允许被更新"
14377
d9488fea 14378#: builtin/fetch.c:1053 builtin/fetch.c:1191
c04f5ac3
JX
14379#, c-format
14380msgid "From %.*s\n"
14381msgstr "来自 %.*s\n"
14382
d9488fea 14383#: builtin/fetch.c:1064
c04f5ac3
JX
14384#, c-format
14385msgid ""
14386"some local refs could not be updated; try running\n"
14387" 'git remote prune %s' to remove any old, conflicting branches"
14388msgstr ""
14389"一些本地引用不能被更新;尝试运行\n"
14390" 'git remote prune %s' 来删除旧的、有冲突的分支"
14391
90e6ef53 14392# 译者:注意保持前导空格
d9488fea 14393#: builtin/fetch.c:1161
81809b99 14394#, c-format
8ada9598 14395msgid " (%s will become dangling)"
e640d114 14396msgstr " (%s 将成为悬空状态)"
c04f5ac3 14397
90e6ef53 14398# 译者:注意保持前导空格
d9488fea 14399#: builtin/fetch.c:1162
81809b99 14400#, c-format
8ada9598 14401msgid " (%s has become dangling)"
e640d114 14402msgstr " (%s 已成为悬空状态)"
c04f5ac3 14403
d9488fea 14404#: builtin/fetch.c:1194
c04f5ac3
JX
14405msgid "[deleted]"
14406msgstr "[已删除]"
14407
d9488fea 14408#: builtin/fetch.c:1195 builtin/remote.c:1113
c04f5ac3
JX
14409msgid "(none)"
14410msgstr "(无)"
14411
d9488fea 14412#: builtin/fetch.c:1218
c04f5ac3
JX
14413#, c-format
14414msgid "Refusing to fetch into current branch %s of non-bare repository"
160fb2b2 14415msgstr "拒绝获取到非纯仓库的当前分支 %s"
c04f5ac3 14416
d9488fea 14417#: builtin/fetch.c:1237
c04f5ac3
JX
14418#, c-format
14419msgid "Option \"%s\" value \"%s\" is not valid for %s"
14420msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
14421
d9488fea 14422#: builtin/fetch.c:1240
c04f5ac3
JX
14423#, c-format
14424msgid "Option \"%s\" is ignored for %s\n"
81809b99 14425msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 14426
d9488fea 14427#: builtin/fetch.c:1448
ddc12c42 14428msgid "multiple branches detected, incompatible with --set-upstream"
a5cd71ca
JX
14429msgstr "检测到多分支,和 --set-upstream 不兼容"
14430
d9488fea 14431#: builtin/fetch.c:1463
a5cd71ca
JX
14432msgid "not setting upstream for a remote remote-tracking branch"
14433msgstr "没有为一个远程跟踪分支设置上游"
14434
d9488fea 14435#: builtin/fetch.c:1465
a5cd71ca
JX
14436msgid "not setting upstream for a remote tag"
14437msgstr "没有为一个远程标签设置上游"
14438
d9488fea 14439#: builtin/fetch.c:1467
a5cd71ca
JX
14440msgid "unknown branch type"
14441msgstr "未知的分支类型"
14442
d9488fea 14443#: builtin/fetch.c:1469
a5cd71ca
JX
14444msgid ""
14445"no source branch found.\n"
14446"you need to specify exactly one branch with the --set-upstream option."
14447msgstr ""
14448"未发现源分支。\n"
14449"您需要使用 --set-upstream 选项指定一个分支。"
14450
d9488fea 14451#: builtin/fetch.c:1598 builtin/fetch.c:1661
c04f5ac3
JX
14452#, c-format
14453msgid "Fetching %s\n"
d4a8e00b 14454msgstr "正在获取 %s\n"
c04f5ac3 14455
d9488fea 14456#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101
c04f5ac3
JX
14457#, c-format
14458msgid "Could not fetch %s"
14459msgstr "不能获取 %s"
14460
d9488fea 14461#: builtin/fetch.c:1620
a5cd71ca
JX
14462#, c-format
14463msgid "could not fetch '%s' (exit code: %d)\n"
14464msgstr "无法获取 '%s'(退出码:%d)\n"
31e5e17b 14465
d9488fea 14466#: builtin/fetch.c:1724
c04f5ac3
JX
14467msgid ""
14468"No remote repository specified. Please, specify either a URL or a\n"
14469"remote name from which new revisions should be fetched."
4375c10e 14470msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
c04f5ac3 14471
d9488fea 14472#: builtin/fetch.c:1760
c04f5ac3 14473msgid "You need to specify a tag name."
55a16ee4 14474msgstr "您需要指定一个标签名称。"
c04f5ac3 14475
d9488fea 14476#: builtin/fetch.c:1825
a0b6b246
JX
14477msgid "Negative depth in --deepen is not supported"
14478msgstr "--deepen 不支持负数深度"
14479
d9488fea 14480#: builtin/fetch.c:1827
a0b6b246
JX
14481msgid "--deepen and --depth are mutually exclusive"
14482msgstr "--deepen 和 --depth 是互斥的"
14483
d9488fea 14484#: builtin/fetch.c:1832
a77c07d9
JX
14485msgid "--depth and --unshallow cannot be used together"
14486msgstr "--depth 和 --unshallow 不能同时使用"
14487
d9488fea 14488#: builtin/fetch.c:1834
a77c07d9 14489msgid "--unshallow on a complete repository does not make sense"
160fb2b2 14490msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
a77c07d9 14491
d9488fea 14492#: builtin/fetch.c:1851
c04f5ac3 14493msgid "fetch --all does not take a repository argument"
160fb2b2 14494msgstr "fetch --all 不能带一个仓库参数"
c04f5ac3 14495
d9488fea 14496#: builtin/fetch.c:1853
c04f5ac3 14497msgid "fetch --all does not make sense with refspecs"
160fb2b2 14498msgstr "fetch --all 带引用规格没有任何意义"
c04f5ac3 14499
d9488fea 14500#: builtin/fetch.c:1862
c04f5ac3
JX
14501#, c-format
14502msgid "No such remote or remote group: %s"
14503msgstr "没有这样的远程或远程组:%s"
14504
d9488fea 14505#: builtin/fetch.c:1869
c04f5ac3 14506msgid "Fetching a group and specifying refspecs does not make sense"
160fb2b2 14507msgstr "获取组并指定引用规格没有意义"
c04f5ac3 14508
d9488fea 14509#: builtin/fetch.c:1887
06991777
JX
14510msgid ""
14511"--filter can only be used with the remote configured in extensions."
14512"partialclone"
14513msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
14514
d9488fea
JX
14515#: builtin/fetch.c:1891
14516msgid "--stdin can only be used when fetching from one remote"
14517msgstr "--stdin 仅在从一个远程仓库获取的时候可用"
14518
349ede6a 14519#: builtin/fmt-merge-msg.c:7
814ff314
JX
14520msgid ""
14521"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
14522msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
c04f5ac3 14523
349ede6a 14524#: builtin/fmt-merge-msg.c:18
ef317cd5 14525msgid "populate log with at most <n> entries from shortlog"
07432cef 14526msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 14527
349ede6a 14528#: builtin/fmt-merge-msg.c:21
ef317cd5 14529msgid "alias for --log (deprecated)"
07432cef 14530msgstr "参数 --log 的别名(已弃用)"
ef317cd5 14531
349ede6a 14532#: builtin/fmt-merge-msg.c:24
ef317cd5 14533msgid "text"
07432cef 14534msgstr "文本"
ef317cd5 14535
349ede6a 14536#: builtin/fmt-merge-msg.c:25
ef317cd5 14537msgid "use <text> as start of message"
07432cef 14538msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 14539
349ede6a 14540#: builtin/fmt-merge-msg.c:26
ef317cd5 14541msgid "file to read from"
07432cef 14542msgstr "从文件中读取"
ef317cd5 14543
a4f16749 14544#: builtin/for-each-ref.c:10
814ff314
JX
14545msgid "git for-each-ref [<options>] [<pattern>]"
14546msgstr "git for-each-ref [<选项>] [<模式>]"
ef317cd5 14547
a4f16749 14548#: builtin/for-each-ref.c:11
94550ed3
JX
14549msgid "git for-each-ref [--points-at <object>]"
14550msgstr "git for-each-ref [--points-at <对象>]"
14551
a4f16749 14552#: builtin/for-each-ref.c:12
d9488fea
JX
14553msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
14554msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]"
94550ed3 14555
a4f16749 14556#: builtin/for-each-ref.c:13
87cb7997
JX
14557msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
14558msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
94550ed3 14559
a4f16749 14560#: builtin/for-each-ref.c:28
ef317cd5 14561msgid "quote placeholders suitably for shells"
07432cef 14562msgstr "引用占位符适用于 shells"
ef317cd5 14563
a4f16749 14564#: builtin/for-each-ref.c:30
ef317cd5 14565msgid "quote placeholders suitably for perl"
07432cef 14566msgstr "引用占位符适用于 perl"
ef317cd5 14567
a4f16749 14568#: builtin/for-each-ref.c:32
ef317cd5 14569msgid "quote placeholders suitably for python"
07432cef 14570msgstr "引用占位符适用于 python"
ef317cd5 14571
a4f16749 14572#: builtin/for-each-ref.c:34
04cb2f28
JX
14573msgid "quote placeholders suitably for Tcl"
14574msgstr "引用占位符适用于 Tcl"
ef317cd5 14575
a4f16749 14576#: builtin/for-each-ref.c:37
ef317cd5 14577msgid "show only <n> matched refs"
07432cef 14578msgstr "只显示 <n> 个匹配的引用"
ef317cd5 14579
349ede6a 14580#: builtin/for-each-ref.c:39 builtin/tag.c:440
6937cb4e
JX
14581msgid "respect format colors"
14582msgstr "遵照格式中的颜色输出"
14583
d46c5519 14584#: builtin/for-each-ref.c:42
94550ed3
JX
14585msgid "print only refs which points at the given object"
14586msgstr "只打印指向给定对象的引用"
ef317cd5 14587
d46c5519 14588#: builtin/for-each-ref.c:44
94550ed3
JX
14589msgid "print only refs that are merged"
14590msgstr "只打印已经合并的引用"
14591
d46c5519 14592#: builtin/for-each-ref.c:45
94550ed3
JX
14593msgid "print only refs that are not merged"
14594msgstr "只打印没有合并的引用"
ef317cd5 14595
d46c5519 14596#: builtin/for-each-ref.c:46
94550ed3
JX
14597msgid "print only refs which contain the commit"
14598msgstr "只打印包含该提交的引用"
14599
d46c5519 14600#: builtin/for-each-ref.c:47
87cb7997
JX
14601msgid "print only refs which don't contain the commit"
14602msgstr "只打印不包含该提交的引用"
14603
349ede6a 14604#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149
06991777
JX
14605msgid "unknown"
14606msgstr "未知"
14607
14608#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
349ede6a 14609#: builtin/fsck.c:101 builtin/fsck.c:121
06991777
JX
14610#, c-format
14611msgid "error in %s %s: %s"
14612msgstr "%s %s 错误:%s"
14613
14614#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
349ede6a 14615#: builtin/fsck.c:115
06991777
JX
14616#, c-format
14617msgid "warning in %s %s: %s"
14618msgstr "%s %s 警告:%s"
14619
349ede6a 14620#: builtin/fsck.c:144 builtin/fsck.c:147
06991777
JX
14621#, c-format
14622msgid "broken link from %7s %s"
14623msgstr "来自 %7s %s 的损坏的链接"
14624
349ede6a 14625#: builtin/fsck.c:156
06991777
JX
14626msgid "wrong object type in link"
14627msgstr "链接中错误的对象类型"
14628
349ede6a 14629#: builtin/fsck.c:172
06991777
JX
14630#, c-format
14631msgid ""
14632"broken link from %7s %s\n"
14633" to %7s %s"
14634msgstr ""
14635"损坏的链接来自于 %7s %s\n"
14636" 到 %7s %s"
14637
349ede6a 14638#: builtin/fsck.c:283
06991777
JX
14639#, c-format
14640msgid "missing %s %s"
14641msgstr "缺失 %s %s"
14642
349ede6a 14643#: builtin/fsck.c:310
06991777
JX
14644#, c-format
14645msgid "unreachable %s %s"
5b533632 14646msgstr "不可达 %s %s"
06991777 14647
349ede6a 14648#: builtin/fsck.c:330
06991777
JX
14649#, c-format
14650msgid "dangling %s %s"
14651msgstr "悬空 %s %s"
14652
349ede6a 14653#: builtin/fsck.c:340
06991777
JX
14654msgid "could not create lost-found"
14655msgstr "不能创建 lost-found"
14656
349ede6a 14657#: builtin/fsck.c:351
06991777
JX
14658#, c-format
14659msgid "could not finish '%s'"
14660msgstr "不能完成 '%s'"
14661
349ede6a 14662#: builtin/fsck.c:368
06991777
JX
14663#, c-format
14664msgid "Checking %s"
14665msgstr "正在检查 %s"
14666
349ede6a 14667#: builtin/fsck.c:406
06991777
JX
14668#, c-format
14669msgid "Checking connectivity (%d objects)"
14670msgstr "正在检查连通性(%d 个对象)"
14671
349ede6a 14672#: builtin/fsck.c:425
06991777
JX
14673#, c-format
14674msgid "Checking %s %s"
14675msgstr "正在检查 %s %s"
14676
349ede6a 14677#: builtin/fsck.c:430
06991777
JX
14678msgid "broken links"
14679msgstr "损坏的链接"
14680
349ede6a 14681#: builtin/fsck.c:439
06991777
JX
14682#, c-format
14683msgid "root %s"
14684msgstr "根 %s"
14685
349ede6a 14686#: builtin/fsck.c:447
06991777
JX
14687#, c-format
14688msgid "tagged %s %s (%s) in %s"
14689msgstr "标记 %s %s (%s) 于 %s"
14690
349ede6a 14691#: builtin/fsck.c:476
06991777
JX
14692#, c-format
14693msgid "%s: object corrupt or missing"
14694msgstr "%s:对象损坏或丢失"
14695
349ede6a 14696#: builtin/fsck.c:501
06991777
JX
14697#, c-format
14698msgid "%s: invalid reflog entry %s"
14699msgstr "%s:无效的引用日志条目 %s"
14700
349ede6a 14701#: builtin/fsck.c:515
06991777
JX
14702#, c-format
14703msgid "Checking reflog %s->%s"
14704msgstr "正在检查引用日志 %s->%s"
14705
349ede6a 14706#: builtin/fsck.c:549
06991777
JX
14707#, c-format
14708msgid "%s: invalid sha1 pointer %s"
14709msgstr "%s:无效的 sha1 指针 %s"
14710
349ede6a 14711#: builtin/fsck.c:556
06991777
JX
14712#, c-format
14713msgid "%s: not a commit"
14714msgstr "%s:不是一个提交"
14715
349ede6a 14716#: builtin/fsck.c:610
06991777
JX
14717msgid "notice: No default references"
14718msgstr "注意:无默认引用"
14719
349ede6a 14720#: builtin/fsck.c:625
06991777
JX
14721#, c-format
14722msgid "%s: object corrupt or missing: %s"
14723msgstr "%s:对象损坏或丢失:%s"
14724
349ede6a 14725#: builtin/fsck.c:638
06991777
JX
14726#, c-format
14727msgid "%s: object could not be parsed: %s"
14728msgstr "%s:不能解析对象:%s"
14729
349ede6a 14730#: builtin/fsck.c:658
06991777
JX
14731#, c-format
14732msgid "bad sha1 file: %s"
14733msgstr "坏的 sha1 文件:%s"
14734
349ede6a 14735#: builtin/fsck.c:673
06991777
JX
14736msgid "Checking object directory"
14737msgstr "正在检查对象目录"
14738
349ede6a 14739#: builtin/fsck.c:676
6c94aba5 14740msgid "Checking object directories"
06991777
JX
14741msgstr "正在检查对象目录"
14742
349ede6a 14743#: builtin/fsck.c:691
06991777
JX
14744#, c-format
14745msgid "Checking %s link"
14746msgstr "正在检查 %s 链接"
14747
d9488fea 14748#: builtin/fsck.c:696 builtin/index-pack.c:865
06991777
JX
14749#, c-format
14750msgid "invalid %s"
14751msgstr "无效的 %s"
14752
349ede6a 14753#: builtin/fsck.c:703
06991777
JX
14754#, c-format
14755msgid "%s points to something strange (%s)"
14756msgstr "%s 指向奇怪的东西(%s)"
14757
349ede6a 14758#: builtin/fsck.c:709
06991777
JX
14759#, c-format
14760msgid "%s: detached HEAD points at nothing"
14761msgstr "%s:分离头指针的指向不存在"
14762
349ede6a 14763#: builtin/fsck.c:713
06991777
JX
14764#, c-format
14765msgid "notice: %s points to an unborn branch (%s)"
14766msgstr "注意:%s 指向一个尚未诞生的分支(%s)"
14767
349ede6a 14768#: builtin/fsck.c:725
06991777
JX
14769msgid "Checking cache tree"
14770msgstr "正在检查缓存树"
14771
349ede6a 14772#: builtin/fsck.c:730
06991777
JX
14773#, c-format
14774msgid "%s: invalid sha1 pointer in cache-tree"
14775msgstr "%s:cache-tree 中无效的 sha1 指针"
6c94aba5 14776
349ede6a 14777#: builtin/fsck.c:739
06991777
JX
14778msgid "non-tree in cache-tree"
14779msgstr "cache-tree 中非树对象"
14780
349ede6a 14781#: builtin/fsck.c:770
814ff314
JX
14782msgid "git fsck [<options>] [<object>...]"
14783msgstr "git fsck [<选项>] [<对象>...]"
ef317cd5 14784
349ede6a 14785#: builtin/fsck.c:776
ef317cd5 14786msgid "show unreachable objects"
07432cef 14787msgstr "显示不可达的对象"
ef317cd5 14788
349ede6a 14789#: builtin/fsck.c:777
ef317cd5 14790msgid "show dangling objects"
e640d114 14791msgstr "显示悬空的对象"
ef317cd5 14792
349ede6a 14793#: builtin/fsck.c:778
ef317cd5 14794msgid "report tags"
55a16ee4 14795msgstr "报告标签"
ef317cd5 14796
349ede6a 14797#: builtin/fsck.c:779
ef317cd5 14798msgid "report root nodes"
07432cef 14799msgstr "报告根节点"
ef317cd5 14800
349ede6a 14801#: builtin/fsck.c:780
ef317cd5 14802msgid "make index objects head nodes"
07432cef 14803msgstr "将索引亦作为检查的头节点"
ef317cd5 14804
349ede6a 14805#: builtin/fsck.c:781
ef317cd5 14806msgid "make reflogs head nodes (default)"
07432cef 14807msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 14808
349ede6a 14809#: builtin/fsck.c:782
ef317cd5 14810msgid "also consider packs and alternate objects"
07432cef 14811msgstr "也考虑包和备用对象"
ef317cd5 14812
349ede6a 14813#: builtin/fsck.c:783
1b7f4a34
JX
14814msgid "check only connectivity"
14815msgstr "仅检查连通性"
14816
349ede6a 14817#: builtin/fsck.c:784
ef317cd5 14818msgid "enable more strict checking"
07432cef 14819msgstr "启用更严格的检查"
ef317cd5 14820
349ede6a 14821#: builtin/fsck.c:786
ef317cd5 14822msgid "write dangling objects in .git/lost-found"
e640d114 14823msgstr "将悬空对象写入 .git/lost-found 中"
ef317cd5 14824
349ede6a 14825#: builtin/fsck.c:787 builtin/prune.c:134
ef317cd5 14826msgid "show progress"
07432cef 14827msgstr "显示进度"
ef317cd5 14828
349ede6a 14829#: builtin/fsck.c:788
5c57d762
JX
14830msgid "show verbose names for reachable objects"
14831msgstr "显示可达对象的详细名称"
14832
d9488fea 14833#: builtin/fsck.c:847 builtin/index-pack.c:261
6c94aba5 14834msgid "Checking objects"
06991777
JX
14835msgstr "正在检查对象"
14836
349ede6a 14837#: builtin/fsck.c:875
06991777
JX
14838#, c-format
14839msgid "%s: object missing"
14840msgstr "%s:对象缺失"
14841
349ede6a 14842#: builtin/fsck.c:886
06991777
JX
14843#, c-format
14844msgid "invalid parameter: expected sha1, got '%s'"
14845msgstr "无效的参数:期望 sha1,得到 '%s'"
6c94aba5 14846
d9488fea 14847#: builtin/gc.c:36
814ff314
JX
14848msgid "git gc [<options>]"
14849msgstr "git gc [<选项>]"
ef317cd5 14850
d9488fea 14851#: builtin/gc.c:91
c04f5ac3 14852#, c-format
87cb7997 14853msgid "Failed to fstat %s: %s"
65e2041e 14854msgstr "对 %s 调用 fstat 失败:%s"
c04f5ac3 14855
d9488fea 14856#: builtin/gc.c:127
d46c5519
JX
14857#, c-format
14858msgid "failed to parse '%s' value '%s'"
14859msgstr "无法解析 '%s' 值 '%s'"
14860
d9488fea 14861#: builtin/gc.c:476 builtin/init-db.c:58
c04f5ac3 14862#, c-format
4c27fcb5
JX
14863msgid "cannot stat '%s'"
14864msgstr "不能对 '%s' 调用 stat"
14865
d9488fea 14866#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530
4c27fcb5
JX
14867#, c-format
14868msgid "cannot read '%s'"
14869msgstr "不能读取 '%s'"
c04f5ac3 14870
d9488fea 14871#: builtin/gc.c:492
94550ed3
JX
14872#, c-format
14873msgid ""
14874"The last gc run reported the following. Please correct the root cause\n"
14875"and remove %s.\n"
14876"Automatic cleanup will not be performed until the file is removed.\n"
14877"\n"
14878"%s"
14879msgstr ""
14880"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
14881"在该文件被删除之前,自动清理将不会执行。\n"
14882"\n"
14883"%s"
14884
d9488fea 14885#: builtin/gc.c:540
ef317cd5 14886msgid "prune unreferenced objects"
07432cef 14887msgstr "清除未引用的对象"
ef317cd5 14888
d9488fea 14889#: builtin/gc.c:542
ef317cd5 14890msgid "be more thorough (increased runtime)"
07432cef 14891msgstr "更彻底(增加运行时间)"
ef317cd5 14892
d9488fea 14893#: builtin/gc.c:543
ef317cd5 14894msgid "enable auto-gc mode"
07432cef 14895msgstr "启用自动垃圾回收模式"
ef317cd5 14896
d9488fea 14897#: builtin/gc.c:546
90314792
JX
14898msgid "force running gc even if there may be another gc running"
14899msgstr "强制执行 gc 即使另外一个 gc 正在执行"
14900
d9488fea 14901#: builtin/gc.c:549
fd8cb379
JX
14902msgid "repack all other packs except the largest pack"
14903msgstr "除了最大的包之外,对所有其它包文件重新打包"
14904
d9488fea 14905#: builtin/gc.c:566
fd8cb379
JX
14906#, c-format
14907msgid "failed to parse gc.logexpiry value %s"
c1ac5258 14908msgstr "解析 gc.logexpiry 的值 %s 失败"
fd8cb379 14909
d9488fea 14910#: builtin/gc.c:577
87cb7997 14911#, c-format
fd8cb379 14912msgid "failed to parse prune expiry value %s"
c1ac5258 14913msgstr "解析清除期限值 %s 失败"
87cb7997 14914
d9488fea 14915#: builtin/gc.c:597
c04f5ac3 14916#, c-format
6c94aba5 14917msgid "Auto packing the repository in background for optimum performance.\n"
160fb2b2 14918msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6c94aba5 14919
d9488fea 14920#: builtin/gc.c:599
6c94aba5
JX
14921#, c-format
14922msgid "Auto packing the repository for optimum performance.\n"
160fb2b2 14923msgstr "自动打包仓库以求最佳性能。\n"
6c94aba5 14924
d9488fea 14925#: builtin/gc.c:600
6c94aba5
JX
14926#, c-format
14927msgid "See \"git help gc\" for manual housekeeping.\n"
14928msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 14929
d9488fea 14930#: builtin/gc.c:640
90314792
JX
14931#, c-format
14932msgid ""
14933"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
14934msgstr ""
29004bbb 14935"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)"
90314792 14936
d9488fea 14937#: builtin/gc.c:695
c04f5ac3
JX
14938msgid ""
14939"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 14940msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 14941
d9488fea
JX
14942#: builtin/gc.c:705
14943msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]"
14944msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=<任务>]"
14945
14946#: builtin/gc.c:812
14947msgid "failed to write commit-graph"
14948msgstr "无法写入提交图"
14949
14950#: builtin/gc.c:905
14951#, c-format
14952msgid "lock file '%s' exists, skipping maintenance"
14953msgstr "锁文件 '%s' 已存在,跳过维护"
14954
14955#: builtin/gc.c:932
14956#, c-format
14957msgid "task '%s' failed"
14958msgstr "任务 '%s' 失败"
14959
14960#: builtin/gc.c:979
14961#, c-format
14962msgid "'%s' is not a valid task"
14963msgstr "'%s' 不是一个有效的任务"
14964
14965#: builtin/gc.c:984
14966#, c-format
14967msgid "task '%s' cannot be selected multiple times"
14968msgstr "任务 '%s' 不能被多次选择"
14969
14970#: builtin/gc.c:999
14971msgid "run tasks based on the state of the repository"
14972msgstr "基于仓库状态来运行任务"
14973
14974#: builtin/gc.c:1001
14975msgid "do not report progress or other information over stderr"
14976msgstr "不通过标准错误报告进度或其它信息"
14977
14978#: builtin/gc.c:1002
14979msgid "task"
14980msgstr "任务"
14981
14982#: builtin/gc.c:1003
14983msgid "run a specific task"
14984msgstr "运行一个特定的任务"
14985
14986#: builtin/gc.c:1026
14987msgid "git maintenance run [<options>]"
14988msgstr "git maintenance run [<选项>]"
14989
14990#: builtin/gc.c:1037
14991#, c-format
14992msgid "invalid subcommand: %s"
14993msgstr "无效子命令:%s"
14994
2b472aae 14995#: builtin/grep.c:30
814ff314
JX
14996msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
14997msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
ef317cd5 14998
06991777 14999#: builtin/grep.c:225
c04f5ac3
JX
15000#, c-format
15001msgid "grep: failed to create thread: %s"
90e6ef53 15002msgstr "grep:无法创建线程:%s"
c04f5ac3 15003
06991777 15004#: builtin/grep.c:279
276ceeaa
JX
15005#, c-format
15006msgid "invalid number of threads specified (%d) for %s"
15007msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
15008
a4f16749
JX
15009#. TRANSLATORS: %s is the configuration
15010#. variable for tweaking threads, currently
15011#. grep.threads
15012#.
d9488fea
JX
15013#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766
15014#: builtin/pack-objects.c:2936
a4f16749
JX
15015#, c-format
15016msgid "no threads support, ignoring %s"
15017msgstr "没有线程支持,忽略 %s"
15018
349ede6a 15019#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640
c04f5ac3
JX
15020#, c-format
15021msgid "unable to read tree (%s)"
90e6ef53 15022msgstr "无法读取树(%s)"
c04f5ac3 15023
349ede6a 15024#: builtin/grep.c:655
c04f5ac3
JX
15025#, c-format
15026msgid "unable to grep from object of type %s"
15027msgstr "无法抓取来自于 %s 类型的对象"
15028
d9488fea 15029#: builtin/grep.c:725
c04f5ac3
JX
15030#, c-format
15031msgid "switch `%c' expects a numerical value"
15032msgstr "开关 `%c' 期望一个数字值"
15033
d9488fea 15034#: builtin/grep.c:824
ef317cd5 15035msgid "search in index instead of in the work tree"
07432cef 15036msgstr "在索引区搜索而不是在工作区"
ef317cd5 15037
d9488fea 15038#: builtin/grep.c:826
ef317cd5 15039msgid "find in contents not managed by git"
07432cef 15040msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
15041
15042# 译者:中文字符串拼接,可删除前导空格
d9488fea 15043#: builtin/grep.c:828
ef317cd5 15044msgid "search in both tracked and untracked files"
07432cef 15045msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 15046
d9488fea 15047#: builtin/grep.c:830
814ff314
JX
15048msgid "ignore files specified via '.gitignore'"
15049msgstr "忽略 '.gitignore' 包含的文件"
ef317cd5 15050
d9488fea 15051#: builtin/grep.c:832
87cb7997 15052msgid "recursively search in each submodule"
1a79b2f1
JX
15053msgstr "在每一个子模组中递归搜索"
15054
d9488fea 15055#: builtin/grep.c:835
ef317cd5 15056msgid "show non-matching lines"
07432cef 15057msgstr "显示未匹配的行"
ef317cd5 15058
d9488fea 15059#: builtin/grep.c:837
ef317cd5 15060msgid "case insensitive matching"
07432cef 15061msgstr "不区分大小写匹配"
ef317cd5 15062
d9488fea 15063#: builtin/grep.c:839
ef317cd5 15064msgid "match patterns only at word boundaries"
07432cef 15065msgstr "只在单词边界匹配模式"
ef317cd5 15066
d9488fea 15067#: builtin/grep.c:841
ef317cd5 15068msgid "process binary files as text"
07432cef 15069msgstr "把二进制文件当做文本处理"
ef317cd5 15070
d9488fea 15071#: builtin/grep.c:843
ef317cd5 15072msgid "don't match patterns in binary files"
07432cef 15073msgstr "不在二进制文件中匹配模式"
ef317cd5 15074
d9488fea 15075#: builtin/grep.c:846
90314792
JX
15076msgid "process binary files with textconv filters"
15077msgstr "用 textconv 过滤器处理二进制文件"
15078
d9488fea 15079#: builtin/grep.c:848
4c27fcb5
JX
15080msgid "search in subdirectories (default)"
15081msgstr "在子目录中寻找(默认)"
15082
d9488fea 15083#: builtin/grep.c:850
ef317cd5 15084msgid "descend at most <depth> levels"
07432cef 15085msgstr "最多以指定的深度向下寻找"
ef317cd5 15086
d9488fea 15087#: builtin/grep.c:854
ef317cd5 15088msgid "use extended POSIX regular expressions"
07432cef 15089msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 15090
d9488fea 15091#: builtin/grep.c:857
ef317cd5 15092msgid "use basic POSIX regular expressions (default)"
07432cef 15093msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 15094
d9488fea 15095#: builtin/grep.c:860
ef317cd5 15096msgid "interpret patterns as fixed strings"
07432cef 15097msgstr "把模式解析为固定的字符串"
ef317cd5 15098
d9488fea 15099#: builtin/grep.c:863
ef317cd5 15100msgid "use Perl-compatible regular expressions"
07432cef 15101msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 15102
d9488fea 15103#: builtin/grep.c:866
ef317cd5 15104msgid "show line numbers"
07432cef 15105msgstr "显示行号"
ef317cd5 15106
d9488fea 15107#: builtin/grep.c:867
c1ac5258
JX
15108msgid "show column number of first match"
15109msgstr "显示第一个匹配的列号"
15110
d9488fea 15111#: builtin/grep.c:868
ef317cd5 15112msgid "don't show filenames"
07432cef 15113msgstr "不显示文件名"
ef317cd5 15114
d9488fea 15115#: builtin/grep.c:869
ef317cd5 15116msgid "show filenames"
07432cef 15117msgstr "显示文件名"
ef317cd5 15118
d9488fea 15119#: builtin/grep.c:871
ef317cd5 15120msgid "show filenames relative to top directory"
07432cef 15121msgstr "显示相对于顶级目录的文件名"
ef317cd5 15122
d9488fea 15123#: builtin/grep.c:873
ef317cd5 15124msgid "show only filenames instead of matching lines"
07432cef 15125msgstr "只显示文件名而不显示匹配的行"
ef317cd5 15126
d9488fea 15127#: builtin/grep.c:875
ef317cd5 15128msgid "synonym for --files-with-matches"
07432cef 15129msgstr "和 --files-with-matches 同义"
ef317cd5 15130
d9488fea 15131#: builtin/grep.c:878
ef317cd5 15132msgid "show only the names of files without match"
07432cef 15133msgstr "只显示未匹配的文件名"
ef317cd5 15134
d9488fea 15135#: builtin/grep.c:880
ef317cd5 15136msgid "print NUL after filenames"
07432cef 15137msgstr "在文件名后输出 NUL 字符"
ef317cd5 15138
d9488fea 15139#: builtin/grep.c:883
c1ac5258
JX
15140msgid "show only matching parts of a line"
15141msgstr "只显示行中的匹配的部分"
15142
d9488fea 15143#: builtin/grep.c:885
ef317cd5 15144msgid "show the number of matches instead of matching lines"
07432cef 15145msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 15146
d9488fea 15147#: builtin/grep.c:886
ef317cd5 15148msgid "highlight matches"
07432cef 15149msgstr "高亮显示匹配项"
ef317cd5 15150
d9488fea 15151#: builtin/grep.c:888
ef317cd5 15152msgid "print empty line between matches from different files"
07432cef 15153msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 15154
d9488fea 15155#: builtin/grep.c:890
ef317cd5 15156msgid "show filename only once above matches from same file"
07432cef 15157msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 15158
d9488fea 15159#: builtin/grep.c:893
ef317cd5 15160msgid "show <n> context lines before and after matches"
07432cef 15161msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 15162
d9488fea 15163#: builtin/grep.c:896
ef317cd5 15164msgid "show <n> context lines before matches"
07432cef 15165msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 15166
d9488fea 15167#: builtin/grep.c:898
ef317cd5 15168msgid "show <n> context lines after matches"
07432cef 15169msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 15170
d9488fea 15171#: builtin/grep.c:900
276ceeaa
JX
15172msgid "use <n> worker threads"
15173msgstr "使用 <n> 个工作线程"
15174
d9488fea 15175#: builtin/grep.c:901
ef317cd5 15176msgid "shortcut for -C NUM"
07432cef 15177msgstr "快捷键 -C 数字"
ef317cd5 15178
d9488fea 15179#: builtin/grep.c:904
ef317cd5 15180msgid "show a line with the function name before matches"
07432cef 15181msgstr "在匹配的前面显示一行函数名"
ef317cd5 15182
d9488fea 15183#: builtin/grep.c:906
ef317cd5 15184msgid "show the surrounding function"
07432cef 15185msgstr "显示所在函数的前后内容"
ef317cd5 15186
d9488fea 15187#: builtin/grep.c:909
ef317cd5 15188msgid "read patterns from file"
07432cef 15189msgstr "从文件读取模式"
ef317cd5 15190
d9488fea 15191#: builtin/grep.c:911
ef317cd5 15192msgid "match <pattern>"
07432cef 15193msgstr "匹配 <模式>"
ef317cd5 15194
d9488fea 15195#: builtin/grep.c:913
ef317cd5 15196msgid "combine patterns specified with -e"
07432cef 15197msgstr "组合用 -e 参数设定的模式"
ef317cd5 15198
d9488fea 15199#: builtin/grep.c:925
ef317cd5 15200msgid "indicate hit with exit status without output"
07432cef 15201msgstr "不输出,而用退出码标识命中状态"
ef317cd5 15202
d9488fea 15203#: builtin/grep.c:927
ef317cd5 15204msgid "show only matches from files that match all patterns"
07432cef 15205msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 15206
d9488fea 15207#: builtin/grep.c:929
07432cef
WS
15208msgid "show parse tree for grep expression"
15209msgstr "显示 grep 表达式的解析树"
15210
d9488fea 15211#: builtin/grep.c:933
ef317cd5 15212msgid "pager"
07432cef 15213msgstr "分页"
ef317cd5 15214
d9488fea 15215#: builtin/grep.c:933
ef317cd5 15216msgid "show matching files in the pager"
07432cef 15217msgstr "分页显示匹配的文件"
ef317cd5 15218
d9488fea 15219#: builtin/grep.c:937
ef317cd5 15220msgid "allow calling of grep(1) (ignored by this build)"
07432cef 15221msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 15222
d9488fea 15223#: builtin/grep.c:1004
c1ac5258
JX
15224msgid "no pattern given"
15225msgstr "未提供匹配模式"
c04f5ac3 15226
d9488fea 15227#: builtin/grep.c:1040
87cb7997
JX
15228msgid "--no-index or --untracked cannot be used with revs"
15229msgstr "--no-index 或 --untracked 不能和版本同时使用"
15230
d9488fea 15231#: builtin/grep.c:1048
87cb7997
JX
15232#, c-format
15233msgid "unable to resolve revision: %s"
15234msgstr "不能解析版本:%s"
15235
d9488fea 15236#: builtin/grep.c:1078
2b472aae
JX
15237msgid "--untracked not supported with --recurse-submodules"
15238msgstr "--untracked 不支持和 --recurse-submodules 共用"
15239
d9488fea 15240#: builtin/grep.c:1082
4c27fcb5
JX
15241msgid "invalid option combination, ignoring --threads"
15242msgstr "无效的选项组合,忽略 --threads"
276ceeaa 15243
d9488fea 15244#: builtin/grep.c:1085 builtin/pack-objects.c:3655
a4f16749
JX
15245msgid "no threads support, ignoring --threads"
15246msgstr "没有线程支持,忽略 --threads"
15247
d9488fea 15248#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933
4c27fcb5
JX
15249#, c-format
15250msgid "invalid number of threads specified (%d)"
15251msgstr "指定的线程数无效(%d)"
15252
d9488fea 15253#: builtin/grep.c:1122
c04f5ac3
JX
15254msgid "--open-files-in-pager only works on the worktree"
15255msgstr "--open-files-in-pager 仅用于工作区"
15256
d9488fea 15257#: builtin/grep.c:1148
c1ac5258
JX
15258msgid "--cached or --untracked cannot be used with --no-index"
15259msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
c04f5ac3 15260
d9488fea 15261#: builtin/grep.c:1154
c1ac5258
JX
15262msgid "--[no-]exclude-standard cannot be used for tracked contents"
15263msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
c04f5ac3 15264
d9488fea 15265#: builtin/grep.c:1162
c1ac5258
JX
15266msgid "both --cached and trees are given"
15267msgstr "同时给出了 --cached 和树对象"
15268
06991777 15269#: builtin/hash-object.c:85
ef317cd5 15270msgid ""
814ff314
JX
15271"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
15272"[--] <file>..."
ef317cd5 15273msgstr ""
814ff314
JX
15274"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
15275"[--] <文件>..."
ef317cd5 15276
06991777 15277#: builtin/hash-object.c:86
94550ed3
JX
15278msgid "git hash-object --stdin-paths"
15279msgstr "git hash-object --stdin-paths"
ef317cd5 15280
06991777 15281#: builtin/hash-object.c:98
ef317cd5 15282msgid "object type"
07432cef 15283msgstr "对象类型"
ef317cd5 15284
06991777 15285#: builtin/hash-object.c:99
ef317cd5 15286msgid "write the object into the object database"
07432cef 15287msgstr "将对象写入对象数据库"
ef317cd5 15288
06991777 15289#: builtin/hash-object.c:101
ef317cd5 15290msgid "read the object from stdin"
07432cef 15291msgstr "从标准输入读取对象"
ef317cd5 15292
06991777 15293#: builtin/hash-object.c:103
ef317cd5 15294msgid "store file as is without filters"
07432cef 15295msgstr "原样存储文件不使用过滤器"
ef317cd5 15296
06991777 15297#: builtin/hash-object.c:104
220c313c
JX
15298msgid ""
15299"just hash any random garbage to create corrupt objects for debugging Git"
15300msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
15301
06991777 15302#: builtin/hash-object.c:105
ef317cd5 15303msgid "process file as it were from this path"
07432cef 15304msgstr "处理文件并假设其来自于此路径"
ef317cd5 15305
349ede6a 15306#: builtin/help.c:47
ef317cd5 15307msgid "print all available commands"
07432cef 15308msgstr "打印所有可用的命令"
ef317cd5 15309
349ede6a 15310#: builtin/help.c:48
a0b6b246
JX
15311msgid "exclude guides"
15312msgstr "排除向导"
15313
349ede6a 15314#: builtin/help.c:49
4dcdc3d8
JX
15315msgid "print list of useful guides"
15316msgstr "显示有用的指南列表"
15317
349ede6a 15318#: builtin/help.c:50
c1ac5258
JX
15319msgid "print all configuration variable names"
15320msgstr "打印所有配置变量名称"
15321
349ede6a 15322#: builtin/help.c:52
ef317cd5 15323msgid "show man page"
07432cef 15324msgstr "显示 man 手册"
ef317cd5 15325
349ede6a 15326#: builtin/help.c:53
ef317cd5 15327msgid "show manual in web browser"
07432cef 15328msgstr "在 web 浏览器中显示手册"
ef317cd5 15329
349ede6a 15330#: builtin/help.c:55
ef317cd5 15331msgid "show info page"
07432cef 15332msgstr "显示 info 手册"
ef317cd5 15333
349ede6a 15334#: builtin/help.c:57
fd8cb379
JX
15335msgid "print command description"
15336msgstr "打印命令描述"
15337
349ede6a 15338#: builtin/help.c:62
814ff314
JX
15339msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
15340msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
ef317cd5 15341
349ede6a 15342#: builtin/help.c:163
81809b99 15343#, c-format
8ada9598 15344msgid "unrecognized help format '%s'"
81809b99 15345msgstr "未能识别的帮助格式 '%s'"
8ada9598 15346
349ede6a 15347#: builtin/help.c:190
8ada9598 15348msgid "Failed to start emacsclient."
81809b99 15349msgstr "无法启动 emacsclient。"
8ada9598 15350
349ede6a 15351#: builtin/help.c:203
8ada9598 15352msgid "Failed to parse emacsclient version."
81809b99 15353msgstr "无法解析 emacsclient 版本。"
8ada9598 15354
349ede6a 15355#: builtin/help.c:211
8ada9598
JX
15356#, c-format
15357msgid "emacsclient version '%d' too old (< 22)."
07432cef 15358msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 15359
349ede6a 15360#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
81809b99 15361#, c-format
5b04ee3b 15362msgid "failed to exec '%s'"
c1ac5258 15363msgstr "执行 '%s' 失败"
8ada9598 15364
349ede6a 15365#: builtin/help.c:307
8ada9598
JX
15366#, c-format
15367msgid ""
15368"'%s': path for unsupported man viewer.\n"
15369"Please consider using 'man.<tool>.cmd' instead."
15370msgstr ""
81809b99 15371"'%s':不支持的 man 手册查看器的路径。\n"
d9d56b23 15372"请使用 'man.<工具>.cmd'。"
8ada9598 15373
349ede6a 15374#: builtin/help.c:319
8ada9598
JX
15375#, c-format
15376msgid ""
15377"'%s': cmd for supported man viewer.\n"
15378"Please consider using 'man.<tool>.path' instead."
15379msgstr ""
81809b99 15380"'%s': 支持的 man 手册查看器命令。\n"
d9d56b23 15381"请使用 'man.<工具>.path'。"
8ada9598 15382
349ede6a 15383#: builtin/help.c:436
8ada9598
JX
15384#, c-format
15385msgid "'%s': unknown man viewer."
81809b99 15386msgstr "'%s':未知的 man 查看器。"
8ada9598 15387
349ede6a 15388#: builtin/help.c:453
8ada9598 15389msgid "no man viewer handled the request"
81809b99 15390msgstr "没有 man 查看器处理此请求"
8ada9598 15391
349ede6a 15392#: builtin/help.c:461
8ada9598 15393msgid "no info viewer handled the request"
81809b99 15394msgstr "没有 info 查看器处理此请求"
8ada9598 15395
349ede6a 15396#: builtin/help.c:520 builtin/help.c:531 git.c:337
fd8cb379
JX
15397#, c-format
15398msgid "'%s' is aliased to '%s'"
15399msgstr "'%s' 是 '%s' 的别名"
220c313c 15400
d9488fea 15401#: builtin/help.c:534 git.c:369
4c27fcb5
JX
15402#, c-format
15403msgid "bad alias.%s string: %s"
15404msgstr "坏的 alias.%s 字符串:%s"
15405
349ede6a 15406#: builtin/help.c:563 builtin/help.c:593
fd8cb379
JX
15407#, c-format
15408msgid "usage: %s%s"
15409msgstr "用法:%s%s"
4dcdc3d8 15410
349ede6a 15411#: builtin/help.c:577
c1ac5258
JX
15412msgid "'git help config' for more information"
15413msgstr "'git help config' 获取更多信息"
4dcdc3d8 15414
d9488fea 15415#: builtin/index-pack.c:221
8ada9598
JX
15416#, c-format
15417msgid "object type mismatch at %s"
81809b99 15418msgstr "%s 的对象类型不匹配"
8ada9598 15419
d9488fea 15420#: builtin/index-pack.c:241
6acbf033
JX
15421#, c-format
15422msgid "did not receive expected object %s"
a0b6b246 15423msgstr "未能获取预期的对象 %s"
8ada9598 15424
d9488fea 15425#: builtin/index-pack.c:244
6acbf033
JX
15426#, c-format
15427msgid "object %s: expected type %s, found %s"
a0b6b246 15428msgstr "对象 %s:应为类型 %s,却是 %s"
6acbf033 15429
d9488fea 15430#: builtin/index-pack.c:294
81809b99 15431#, c-format
8ada9598
JX
15432msgid "cannot fill %d byte"
15433msgid_plural "cannot fill %d bytes"
81809b99 15434msgstr[0] "无法填充 %d 字节"
5ae481e0 15435msgstr[1] "无法填充 %d 字节"
8ada9598 15436
d9488fea 15437#: builtin/index-pack.c:304
8ada9598 15438msgid "early EOF"
81809b99 15439msgstr "过早的文件结束符(EOF)"
8ada9598 15440
d9488fea 15441#: builtin/index-pack.c:305
8ada9598 15442msgid "read error on input"
81809b99 15443msgstr "输入上的读错误"
8ada9598 15444
d9488fea 15445#: builtin/index-pack.c:317
8ada9598 15446msgid "used more bytes than were available"
81809b99 15447msgstr "用掉了超过可用的字节"
8ada9598 15448
d9488fea 15449#: builtin/index-pack.c:324 builtin/pack-objects.c:619
8ada9598 15450msgid "pack too large for current definition of off_t"
81809b99 15451msgstr "包太大超过了当前 off_t 的定义"
8ada9598 15452
d9488fea 15453#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
a0b6b246
JX
15454msgid "pack exceeds maximum allowed size"
15455msgstr "包超过了最大允许值"
15456
d9488fea 15457#: builtin/index-pack.c:342 builtin/repack.c:254
349ede6a
JX
15458#, c-format
15459msgid "unable to create '%s'"
15460msgstr "不能创建 '%s'"
15461
d9488fea 15462#: builtin/index-pack.c:348
81809b99 15463#, c-format
8ada9598 15464msgid "cannot open packfile '%s'"
81809b99 15465msgstr "无法打开包文件 '%s'"
8ada9598 15466
d9488fea 15467#: builtin/index-pack.c:362
8ada9598 15468msgid "pack signature mismatch"
81809b99 15469msgstr "包签名不匹配"
8ada9598 15470
d9488fea 15471#: builtin/index-pack.c:364
ef317cd5
JX
15472#, c-format
15473msgid "pack version %<PRIu32> unsupported"
07432cef 15474msgstr "不支持包版本 %<PRIu32>"
ef317cd5 15475
d9488fea 15476#: builtin/index-pack.c:382
8ada9598 15477#, c-format
5c57d762
JX
15478msgid "pack has bad object at offset %<PRIuMAX>: %s"
15479msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
8ada9598 15480
d9488fea 15481#: builtin/index-pack.c:488
8ada9598
JX
15482#, c-format
15483msgid "inflate returned %d"
81809b99 15484msgstr "解压缩返回 %d"
8ada9598 15485
d9488fea 15486#: builtin/index-pack.c:537
8ada9598 15487msgid "offset value overflow for delta base object"
81809b99 15488msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 15489
d9488fea 15490#: builtin/index-pack.c:545
8ada9598 15491msgid "delta base offset is out of bound"
81809b99 15492msgstr "delta 基准偏移越界"
8ada9598 15493
d9488fea 15494#: builtin/index-pack.c:553
81809b99 15495#, c-format
8ada9598 15496msgid "unknown object type %d"
81809b99 15497msgstr "未知对象类型 %d"
8ada9598 15498
d9488fea 15499#: builtin/index-pack.c:584
8ada9598 15500msgid "cannot pread pack file"
81809b99 15501msgstr "无法读取包文件"
8ada9598 15502
d9488fea 15503#: builtin/index-pack.c:586
8ada9598 15504#, c-format
5c57d762
JX
15505msgid "premature end of pack file, %<PRIuMAX> byte missing"
15506msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
15507msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
15508msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8ada9598 15509
d9488fea 15510#: builtin/index-pack.c:612
8ada9598 15511msgid "serious inflate inconsistency"
81809b99 15512msgstr "解压缩严重的不一致"
8ada9598 15513
d9488fea
JX
15514#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787
15515#: builtin/index-pack.c:826 builtin/index-pack.c:835
8ada9598
JX
15516#, c-format
15517msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 15518msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 15519
d9488fea
JX
15520#: builtin/index-pack.c:760 builtin/pack-objects.c:171
15521#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
6792b93b
JX
15522#, c-format
15523msgid "unable to read %s"
15524msgstr "不能读 %s"
15525
d9488fea 15526#: builtin/index-pack.c:824
87cb7997
JX
15527#, c-format
15528msgid "cannot read existing object info %s"
15529msgstr "不能读取现存对象信息 %s"
15530
d9488fea 15531#: builtin/index-pack.c:832
6792b93b
JX
15532#, c-format
15533msgid "cannot read existing object %s"
15534msgstr "不能读取现存对象 %s"
15535
d9488fea 15536#: builtin/index-pack.c:846
81809b99 15537#, c-format
8ada9598 15538msgid "invalid blob object %s"
160fb2b2 15539msgstr "无效的数据对象 %s"
8ada9598 15540
d9488fea 15541#: builtin/index-pack.c:849 builtin/index-pack.c:868
fd8cb379
JX
15542msgid "fsck error in packed object"
15543msgstr "对打包对象 fsck 检查出错"
15544
d9488fea 15545#: builtin/index-pack.c:870
8ada9598
JX
15546#, c-format
15547msgid "Not all child objects of %s are reachable"
81809b99 15548msgstr "%s 的所有子对象并非都可达"
8ada9598 15549
d9488fea 15550#: builtin/index-pack.c:931 builtin/index-pack.c:978
8ada9598 15551msgid "failed to apply delta"
c1ac5258 15552msgstr "应用 delta 失败"
8ada9598 15553
d9488fea 15554#: builtin/index-pack.c:1161
8ada9598 15555msgid "Receiving objects"
81809b99 15556msgstr "接收对象中"
8ada9598 15557
d9488fea 15558#: builtin/index-pack.c:1161
8ada9598 15559msgid "Indexing objects"
81809b99 15560msgstr "索引对象中"
8ada9598 15561
d9488fea 15562#: builtin/index-pack.c:1195
8ada9598 15563msgid "pack is corrupted (SHA1 mismatch)"
81809b99 15564msgstr "包冲突(SHA1 不匹配)"
8ada9598 15565
d9488fea 15566#: builtin/index-pack.c:1200
8ada9598 15567msgid "cannot fstat packfile"
65e2041e 15568msgstr "不能对包文件调用 fstat"
8ada9598 15569
d9488fea 15570#: builtin/index-pack.c:1203
8ada9598 15571msgid "pack has junk at the end"
81809b99 15572msgstr "包的结尾有垃圾数据"
8ada9598 15573
d9488fea 15574#: builtin/index-pack.c:1215
6792b93b
JX
15575msgid "confusion beyond insanity in parse_pack_objects()"
15576msgstr "parse_pack_objects() 中遇到不可理喻的问题"
15577
d9488fea 15578#: builtin/index-pack.c:1238
8ada9598 15579msgid "Resolving deltas"
81809b99 15580msgstr "处理 delta 中"
8ada9598 15581
d9488fea 15582#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697
07432cef 15583#, c-format
ef317cd5 15584msgid "unable to create thread: %s"
07432cef 15585msgstr "不能创建线程:%s"
ef317cd5 15586
d9488fea 15587#: builtin/index-pack.c:1282
8ada9598 15588msgid "confusion beyond insanity"
81809b99 15589msgstr "不可理喻"
8ada9598 15590
d9488fea 15591#: builtin/index-pack.c:1288
ef317cd5 15592#, c-format
5b04ee3b
JX
15593msgid "completed with %d local object"
15594msgid_plural "completed with %d local objects"
15595msgstr[0] "完成 %d 个本地对象"
15596msgstr[1] "完成 %d 个本地对象"
ef317cd5 15597
d9488fea 15598#: builtin/index-pack.c:1300
ef317cd5
JX
15599#, c-format
15600msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 15601msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 15602
d9488fea 15603#: builtin/index-pack.c:1304
8ada9598
JX
15604#, c-format
15605msgid "pack has %d unresolved delta"
15606msgid_plural "pack has %d unresolved deltas"
81809b99 15607msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 15608msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 15609
d9488fea 15610#: builtin/index-pack.c:1328
81809b99 15611#, c-format
8ada9598 15612msgid "unable to deflate appended object (%d)"
07432cef 15613msgstr "不能压缩附加对象(%d)"
8ada9598 15614
d9488fea 15615#: builtin/index-pack.c:1424
8ada9598
JX
15616#, c-format
15617msgid "local object %s is corrupt"
81809b99 15618msgstr "本地对象 %s 已损坏"
8ada9598 15619
d9488fea 15620#: builtin/index-pack.c:1444
31e5e17b
JX
15621#, c-format
15622msgid "packfile name '%s' does not end with '.pack'"
15623msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
8ada9598 15624
d9488fea 15625#: builtin/index-pack.c:1469
81809b99 15626#, c-format
31e5e17b
JX
15627msgid "cannot write %s file '%s'"
15628msgstr "无法写入 %s 文件 '%s'"
8ada9598 15629
d9488fea 15630#: builtin/index-pack.c:1477
81809b99 15631#, c-format
31e5e17b
JX
15632msgid "cannot close written %s file '%s'"
15633msgstr "无法关闭已写入的 %s 文件 '%s'"
15634
d9488fea 15635#: builtin/index-pack.c:1501
31e5e17b
JX
15636msgid "error while closing pack file"
15637msgstr "关闭包文件时出错"
8ada9598 15638
d9488fea 15639#: builtin/index-pack.c:1515
8ada9598 15640msgid "cannot store pack file"
81809b99 15641msgstr "无法存储包文件"
8ada9598 15642
d9488fea 15643#: builtin/index-pack.c:1523
8ada9598 15644msgid "cannot store index file"
81809b99 15645msgstr "无法存储索引文件"
8ada9598 15646
d9488fea 15647#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944
07432cef 15648#, c-format
ef317cd5 15649msgid "bad pack.indexversion=%<PRIu32>"
07432cef 15650msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 15651
d9488fea 15652#: builtin/index-pack.c:1631
81809b99 15653#, c-format
8ada9598 15654msgid "Cannot open existing pack file '%s'"
81809b99 15655msgstr "无法打开现存包文件 '%s'"
8ada9598 15656
d9488fea 15657#: builtin/index-pack.c:1633
81809b99 15658#, c-format
8ada9598 15659msgid "Cannot open existing pack idx file for '%s'"
81809b99 15660msgstr "无法为 %s 打开包索引文件"
8ada9598 15661
d9488fea 15662#: builtin/index-pack.c:1681
81809b99 15663#, c-format
8ada9598
JX
15664msgid "non delta: %d object"
15665msgid_plural "non delta: %d objects"
81809b99 15666msgstr[0] "非 delta:%d 个对象"
5ae481e0 15667msgstr[1] "非 delta:%d 个对象"
8ada9598 15668
d9488fea 15669#: builtin/index-pack.c:1688
8ada9598
JX
15670#, c-format
15671msgid "chain length = %d: %lu object"
15672msgid_plural "chain length = %d: %lu objects"
81809b99 15673msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 15674msgstr[1] "链长 = %d: %lu 对象"
8ada9598 15675
d9488fea 15676#: builtin/index-pack.c:1728
31e5e17b
JX
15677msgid "Cannot come back to cwd"
15678msgstr "无法返回当前工作目录"
5b04ee3b 15679
d9488fea
JX
15680#: builtin/index-pack.c:1777 builtin/index-pack.c:1780
15681#: builtin/index-pack.c:1796 builtin/index-pack.c:1800
81809b99 15682#, c-format
8ada9598 15683msgid "bad %s"
81809b99 15684msgstr "错误选项 %s"
8ada9598 15685
d9488fea 15686#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623
7157c2b5
JX
15687#, c-format
15688msgid "unknown hash algorithm '%s'"
15689msgstr "未知的哈希算法 '%s'"
15690
d9488fea 15691#: builtin/index-pack.c:1821
8ada9598 15692msgid "--fix-thin cannot be used without --stdin"
649900bc 15693msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 15694
d9488fea 15695#: builtin/index-pack.c:1823
1a79b2f1 15696msgid "--stdin requires a git repository"
d9488fea 15697msgstr "--stdin 需要 git 仓库"
1a79b2f1 15698
d9488fea 15699#: builtin/index-pack.c:1825
7157c2b5
JX
15700msgid "--object-format cannot be used with --stdin"
15701msgstr "--object-format 不能和 --stdin 同时使用"
15702
d9488fea 15703#: builtin/index-pack.c:1831
8ada9598 15704msgid "--verify with no packfile name given"
dbd6cced 15705msgstr "--verify 没有提供包文件名参数"
8ada9598 15706
d9488fea 15707#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582
fd8cb379
JX
15708msgid "fsck error in pack objects"
15709msgstr "在打包对象中 fsck 检查出错"
15710
d9488fea 15711#: builtin/init-db.c:64
c04f5ac3
JX
15712#, c-format
15713msgid "cannot stat template '%s'"
65e2041e 15714msgstr "不能对模版 '%s' 调用 stat"
c04f5ac3 15715
d9488fea 15716#: builtin/init-db.c:69
c04f5ac3
JX
15717#, c-format
15718msgid "cannot opendir '%s'"
15719msgstr "不能打开目录 '%s'"
15720
d9488fea 15721#: builtin/init-db.c:81
c04f5ac3
JX
15722#, c-format
15723msgid "cannot readlink '%s'"
15724msgstr "不能读取链接 '%s'"
15725
d9488fea 15726#: builtin/init-db.c:83
c04f5ac3
JX
15727#, c-format
15728msgid "cannot symlink '%s' '%s'"
90e6ef53 15729msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3 15730
d9488fea 15731#: builtin/init-db.c:89
c04f5ac3
JX
15732#, c-format
15733msgid "cannot copy '%s' to '%s'"
15734msgstr "不能拷贝 '%s' 至 '%s'"
15735
d9488fea 15736#: builtin/init-db.c:93
c04f5ac3
JX
15737#, c-format
15738msgid "ignoring template %s"
15739msgstr "忽略模版 %s"
15740
d9488fea 15741#: builtin/init-db.c:124
c04f5ac3 15742#, c-format
fd8cb379
JX
15743msgid "templates not found in %s"
15744msgstr "没有在 %s 中找到模版"
c04f5ac3 15745
d9488fea 15746#: builtin/init-db.c:139
c04f5ac3 15747#, c-format
5b04ee3b
JX
15748msgid "not copying templates from '%s': %s"
15749msgstr "没有从 '%s' 复制模版:%s"
c04f5ac3 15750
d9488fea 15751#: builtin/init-db.c:274
7157c2b5
JX
15752#, c-format
15753msgid "invalid initial branch name: '%s'"
15754msgstr "无效的初始分支名:'%s'"
15755
d9488fea 15756#: builtin/init-db.c:366
c04f5ac3
JX
15757#, c-format
15758msgid "unable to handle file type %d"
15759msgstr "不能处理 %d 类型的文件"
15760
d9488fea 15761#: builtin/init-db.c:369
c04f5ac3
JX
15762#, c-format
15763msgid "unable to move %s to %s"
15764msgstr "不能移动 %s 至 %s"
15765
d9488fea 15766#: builtin/init-db.c:385
349ede6a
JX
15767msgid "attempt to reinitialize repository with different hash"
15768msgstr "尝试用不同的哈希算法重新初始化仓库"
15769
d9488fea 15770#: builtin/init-db.c:409 builtin/init-db.c:412
a0b6b246
JX
15771#, c-format
15772msgid "%s already exists"
15773msgstr "%s 已经存在"
15774
d9488fea 15775#: builtin/init-db.c:443
7157c2b5
JX
15776#, c-format
15777msgid "re-init: ignored --initial-branch=%s"
15778msgstr "re-init:已忽略 --initial-branch=%s"
15779
d9488fea 15780#: builtin/init-db.c:474
c04f5ac3 15781#, c-format
5c57d762
JX
15782msgid "Reinitialized existing shared Git repository in %s%s\n"
15783msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
c04f5ac3 15784
d9488fea 15785#: builtin/init-db.c:475
5c57d762
JX
15786#, c-format
15787msgid "Reinitialized existing Git repository in %s%s\n"
15788msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
c04f5ac3 15789
d9488fea 15790#: builtin/init-db.c:479
5c57d762
JX
15791#, c-format
15792msgid "Initialized empty shared Git repository in %s%s\n"
9a4b694c 15793msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
c04f5ac3 15794
d9488fea 15795#: builtin/init-db.c:480
5c57d762
JX
15796#, c-format
15797msgid "Initialized empty Git repository in %s%s\n"
9a4b694c 15798msgstr "已初始化空的 Git 仓库于 %s%s\n"
c04f5ac3 15799
d9488fea 15800#: builtin/init-db.c:529
ef317cd5 15801msgid ""
a77c07d9 15802"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
814ff314 15803"shared[=<permissions>]] [<directory>]"
ef317cd5 15804msgstr ""
07432cef 15805"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
814ff314 15806"[<目录>]"
ef317cd5 15807
d9488fea 15808#: builtin/init-db.c:555
ef317cd5 15809msgid "permissions"
07432cef 15810msgstr "权限"
ef317cd5 15811
d9488fea 15812#: builtin/init-db.c:556
ef317cd5 15813msgid "specify that the git repository is to be shared amongst several users"
160fb2b2 15814msgstr "指定 git 仓库是多个用户之间共享的"
ef317cd5 15815
d9488fea 15816#: builtin/init-db.c:562
7157c2b5
JX
15817msgid "override the name of the initial branch"
15818msgstr "覆盖初始分支名称"
15819
d9488fea 15820#: builtin/init-db.c:563 builtin/verify-pack.c:74
349ede6a
JX
15821msgid "hash"
15822msgstr "hash"
15823
d9488fea 15824#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75
349ede6a
JX
15825msgid "specify the hash algorithm to use"
15826msgstr "指定要使用的哈希算法"
15827
d9488fea
JX
15828#: builtin/init-db.c:571
15829msgid "--separate-git-dir and --bare are mutually exclusive"
15830msgstr "--separate-git-dir 和 --bare 是互斥的"
15831
15832#: builtin/init-db.c:600 builtin/init-db.c:605
c1ac5258
JX
15833#, c-format
15834msgid "cannot mkdir %s"
15835msgstr "不能创建目录 %s"
15836
d9488fea 15837#: builtin/init-db.c:609 builtin/init-db.c:664
c04f5ac3
JX
15838#, c-format
15839msgid "cannot chdir to %s"
15840msgstr "不能切换目录到 %s"
15841
d9488fea 15842#: builtin/init-db.c:636
c04f5ac3
JX
15843#, c-format
15844msgid ""
15845"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
15846"dir=<directory>)"
1e607449 15847msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
c04f5ac3 15848
d9488fea 15849#: builtin/init-db.c:688
c04f5ac3
JX
15850#, c-format
15851msgid "Cannot access work tree '%s'"
15852msgstr "不能访问工作区 '%s'"
15853
d9488fea
JX
15854#: builtin/init-db.c:693
15855msgid "--separate-git-dir incompatible with bare repository"
15856msgstr "--separate-git-dir 不能用于纯仓库"
15857
a6cd2cc4 15858#: builtin/interpret-trailers.c:16
220c313c 15859msgid ""
276ceeaa
JX
15860"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
15861"<token>[(=|:)<value>])...] [<file>...]"
3495628d
JX
15862msgstr ""
15863"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
15864">])...] [<文件>...]"
276ceeaa 15865
a6cd2cc4 15866#: builtin/interpret-trailers.c:95
276ceeaa
JX
15867msgid "edit files in place"
15868msgstr "在原位编辑文件"
220c313c 15869
a6cd2cc4 15870#: builtin/interpret-trailers.c:96
220c313c 15871msgid "trim empty trailers"
6937cb4e
JX
15872msgstr "删除空的尾部署名"
15873
a6cd2cc4 15874#: builtin/interpret-trailers.c:99
6937cb4e
JX
15875msgid "where to place the new trailer"
15876msgstr "在哪里放置新的尾部署名"
220c313c 15877
a6cd2cc4 15878#: builtin/interpret-trailers.c:101
6937cb4e
JX
15879msgid "action if trailer already exists"
15880msgstr "当尾部署名已经存在时所采取的动作"
15881
a6cd2cc4 15882#: builtin/interpret-trailers.c:103
6937cb4e
JX
15883msgid "action if trailer is missing"
15884msgstr "当尾部署名缺失时所采取的动作"
15885
a6cd2cc4 15886#: builtin/interpret-trailers.c:105
6937cb4e
JX
15887msgid "output only the trailers"
15888msgstr "只输出尾部署名"
15889
a6cd2cc4 15890#: builtin/interpret-trailers.c:106
6937cb4e
JX
15891msgid "do not apply config rules"
15892msgstr "不要应用配置规则"
15893
a6cd2cc4 15894#: builtin/interpret-trailers.c:107
6937cb4e
JX
15895msgid "join whitespace-continued values"
15896msgstr "连接空白折行的值"
15897
a6cd2cc4 15898#: builtin/interpret-trailers.c:108
6937cb4e
JX
15899msgid "set parsing options"
15900msgstr "设置解析选项"
15901
a6cd2cc4 15902#: builtin/interpret-trailers.c:110
4c27fcb5
JX
15903msgid "do not treat --- specially"
15904msgstr "不要对 --- 特殊处理"
15905
a6cd2cc4 15906#: builtin/interpret-trailers.c:111
220c313c 15907msgid "trailer"
6937cb4e 15908msgstr "尾部署名"
220c313c 15909
a6cd2cc4 15910#: builtin/interpret-trailers.c:112
220c313c 15911msgid "trailer(s) to add"
6937cb4e 15912msgstr "要添加的尾部署名"
220c313c 15913
a6cd2cc4 15914#: builtin/interpret-trailers.c:123
6937cb4e
JX
15915msgid "--trailer with --only-input does not make sense"
15916msgstr "--trailer 和 --only-input 同时使用没有意义"
15917
a6cd2cc4 15918#: builtin/interpret-trailers.c:133
276ceeaa
JX
15919msgid "no input file given for in-place editing"
15920msgstr "没有给出要原位编辑的文件"
15921
d9488fea 15922#: builtin/log.c:56
7aea43ff 15923msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
d9d56b23 15924msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
ef317cd5 15925
d9488fea 15926#: builtin/log.c:57
814ff314
JX
15927msgid "git show [<options>] <object>..."
15928msgstr "git show [<选项>] <对象>..."
ef317cd5 15929
d9488fea 15930#: builtin/log.c:110
220c313c
JX
15931#, c-format
15932msgid "invalid --decorate option: %s"
15933msgstr "无效的 --decorate 选项:%s"
15934
d9488fea 15935#: builtin/log.c:177
ef317cd5 15936msgid "show source"
07432cef 15937msgstr "显示源"
ef317cd5 15938
d9488fea 15939#: builtin/log.c:178
07432cef
WS
15940msgid "Use mail map file"
15941msgstr "使用邮件映射文件"
15942
d9488fea 15943#: builtin/log.c:181
5809aa05
JX
15944msgid "only decorate refs that match <pattern>"
15945msgstr "只修饰与 <模式> 匹配的引用"
15946
d9488fea 15947#: builtin/log.c:183
5809aa05
JX
15948msgid "do not decorate refs that match <pattern>"
15949msgstr "不修饰和 <模式> 匹配的引用"
15950
d9488fea 15951#: builtin/log.c:184
ef317cd5 15952msgid "decorate options"
07432cef 15953msgstr "修饰选项"
ef317cd5 15954
d9488fea 15955#: builtin/log.c:187
220c313c
JX
15956msgid "Process line range n,m in file, counting from 1"
15957msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
15958
d9488fea 15959#: builtin/log.c:297
c04f5ac3
JX
15960#, c-format
15961msgid "Final output: %d %s\n"
15962msgstr "最终输出:%d %s\n"
15963
d9488fea 15964#: builtin/log.c:555
220c313c
JX
15965#, c-format
15966msgid "git show %s: bad file"
15967msgstr "git show %s: 损坏的文件"
15968
d9488fea 15969#: builtin/log.c:570 builtin/log.c:665
c04f5ac3 15970#, c-format
d46c5519 15971msgid "could not read object %s"
90e6ef53 15972msgstr "不能读取对象 %s"
c04f5ac3 15973
d9488fea 15974#: builtin/log.c:690
c04f5ac3 15975#, c-format
d46c5519 15976msgid "unknown type: %d"
c04f5ac3
JX
15977msgstr "未知类型:%d"
15978
d9488fea 15979#: builtin/log.c:839
ddc12c42
JX
15980#, c-format
15981msgid "%s: invalid cover from description mode"
15982msgstr "%s:从描述生成附函的模式无效"
15983
d9488fea 15984#: builtin/log.c:846
c04f5ac3
JX
15985msgid "format.headers without value"
15986msgstr "format.headers 没有值"
15987
d9488fea 15988#: builtin/log.c:965
c04f5ac3
JX
15989msgid "name of output directory is too long"
15990msgstr "输出目录名太长"
15991
d9488fea 15992#: builtin/log.c:981
c04f5ac3 15993#, c-format
d46c5519 15994msgid "cannot open patch file %s"
c04f5ac3
JX
15995msgstr "无法打开补丁文件 %s"
15996
d9488fea 15997#: builtin/log.c:998
d46c5519
JX
15998msgid "need exactly one range"
15999msgstr "只需要一个范围"
c04f5ac3 16000
d9488fea 16001#: builtin/log.c:1008
d46c5519
JX
16002msgid "not a range"
16003msgstr "不是一个范围"
c04f5ac3 16004
d9488fea 16005#: builtin/log.c:1172
d46c5519
JX
16006msgid "cover letter needs email format"
16007msgstr "附函需要邮件地址格式"
c04f5ac3 16008
d9488fea 16009#: builtin/log.c:1178
d46c5519
JX
16010msgid "failed to create cover-letter file"
16011msgstr "无法创建附函文件"
16012
d9488fea 16013#: builtin/log.c:1259
c04f5ac3
JX
16014#, c-format
16015msgid "insane in-reply-to: %s"
16016msgstr "不正常的 in-reply-to:%s"
16017
d9488fea 16018#: builtin/log.c:1286
814ff314
JX
16019msgid "git format-patch [<options>] [<since> | <revision-range>]"
16020msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
ef317cd5 16021
d9488fea 16022#: builtin/log.c:1344
d46c5519 16023msgid "two output directories?"
c04f5ac3
JX
16024msgstr "两个输出目录?"
16025
d9488fea 16026#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315
5b04ee3b 16027#, c-format
d46c5519 16028msgid "unknown commit %s"
5b04ee3b
JX
16029msgstr "未知提交 %s"
16030
d9488fea 16031#: builtin/log.c:1506 builtin/replace.c:58 builtin/replace.c:207
d46c5519 16032#: builtin/replace.c:210
5b04ee3b 16033#, c-format
d46c5519
JX
16034msgid "failed to resolve '%s' as a valid ref"
16035msgstr "无法将 '%s' 解析为一个有效引用"
5b04ee3b 16036
d9488fea 16037#: builtin/log.c:1515
d46c5519
JX
16038msgid "could not find exact merge base"
16039msgstr "不能找到准确的合并基线"
5b04ee3b 16040
d9488fea 16041#: builtin/log.c:1525
5b04ee3b 16042msgid ""
d46c5519 16043"failed to get upstream, if you want to record base commit automatically,\n"
5b04ee3b 16044"please use git branch --set-upstream-to to track a remote branch.\n"
d46c5519 16045"Or you could specify base commit by --base=<base-commit-id> manually"
5b04ee3b
JX
16046msgstr ""
16047"无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
aef18cc6 16048"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
d46c5519 16049"参数 --base=<基线提交> 手动指定一个基线提交"
5b04ee3b 16050
d9488fea 16051#: builtin/log.c:1548
d46c5519 16052msgid "failed to find exact merge base"
5b04ee3b
JX
16053msgstr "无法找到准确的合并基线"
16054
d9488fea 16055#: builtin/log.c:1565
5b04ee3b
JX
16056msgid "base commit should be the ancestor of revision list"
16057msgstr "基线提交应该是版本列表的祖先"
16058
d9488fea 16059#: builtin/log.c:1575
5b04ee3b
JX
16060msgid "base commit shouldn't be in revision list"
16061msgstr "基线提交不应该出现在版本列表中"
16062
d9488fea 16063#: builtin/log.c:1633
5b04ee3b 16064msgid "cannot get patch id"
aef18cc6 16065msgstr "无法得到补丁 id"
5b04ee3b 16066
d9488fea
JX
16067#: builtin/log.c:1690
16068msgid "failed to infer range-diff origin of current series"
16069msgstr "无法推断当前系列的 range-diff 起始"
16070
16071#: builtin/log.c:1692
16072#, c-format
16073msgid "using '%s' as range-diff origin of current series"
16074msgstr "使用 '%s' 作为当前系列的 range-diff 源"
4c27fcb5 16075
d9488fea 16076#: builtin/log.c:1736
ef317cd5 16077msgid "use [PATCH n/m] even with a single patch"
07432cef 16078msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 16079
d9488fea 16080#: builtin/log.c:1739
ef317cd5 16081msgid "use [PATCH] even with multiple patches"
07432cef 16082msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 16083
d9488fea 16084#: builtin/log.c:1743
ef317cd5 16085msgid "print patches to standard out"
07432cef 16086msgstr "打印补丁到标准输出"
c04f5ac3 16087
d9488fea 16088#: builtin/log.c:1745
ef317cd5 16089msgid "generate a cover letter"
d46c5519 16090msgstr "生成一封附函"
c04f5ac3 16091
d9488fea 16092#: builtin/log.c:1747
ef317cd5 16093msgid "use simple number sequence for output file names"
07432cef 16094msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 16095
d9488fea 16096#: builtin/log.c:1748
ef317cd5 16097msgid "sfx"
07432cef 16098msgstr "后缀"
ef317cd5 16099
d9488fea 16100#: builtin/log.c:1749
ef317cd5 16101msgid "use <sfx> instead of '.patch'"
07432cef 16102msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 16103
d9488fea 16104#: builtin/log.c:1751
ef317cd5 16105msgid "start numbering patches at <n> instead of 1"
07432cef
WS
16106msgstr "补丁以 <n> 开始编号,而不是1"
16107
d9488fea 16108#: builtin/log.c:1753
07432cef
WS
16109msgid "mark the series as Nth re-roll"
16110msgstr "标记补丁系列是第几次重制"
ef317cd5 16111
d9488fea 16112#: builtin/log.c:1755
a0b6b246
JX
16113msgid "Use [RFC PATCH] instead of [PATCH]"
16114msgstr "使用 [RFC PATCH] 代替 [PATCH]"
16115
d9488fea 16116#: builtin/log.c:1758
ddc12c42
JX
16117msgid "cover-from-description-mode"
16118msgstr "从分支描述获取附函的模式"
16119
d9488fea 16120#: builtin/log.c:1759
ddc12c42
JX
16121msgid "generate parts of a cover letter based on a branch's description"
16122msgstr "基于一个分支描述生成部分附函"
16123
d9488fea 16124#: builtin/log.c:1761
ef317cd5 16125msgid "Use [<prefix>] instead of [PATCH]"
07432cef 16126msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 16127
d9488fea 16128#: builtin/log.c:1764
ef317cd5 16129msgid "store resulting files in <dir>"
d9d56b23 16130msgstr "把结果文件存储在 <目录>"
ef317cd5 16131
d9488fea 16132#: builtin/log.c:1767
ef317cd5 16133msgid "don't strip/add [PATCH]"
07432cef 16134msgstr "不删除/添加 [PATCH]"
ef317cd5 16135
d9488fea 16136#: builtin/log.c:1770
ef317cd5 16137msgid "don't output binary diffs"
07432cef 16138msgstr "不输出二进制差异"
ef317cd5 16139
d9488fea 16140#: builtin/log.c:1772
89f80d72
JX
16141msgid "output all-zero hash in From header"
16142msgstr "在 From 头信息中输出全为零的哈希值"
16143
d9488fea 16144#: builtin/log.c:1774
ef317cd5 16145msgid "don't include a patch matching a commit upstream"
07432cef 16146msgstr "不包含已在上游提交中的补丁"
ef317cd5 16147
d9488fea 16148#: builtin/log.c:1776
ef317cd5 16149msgid "show patch format instead of default (patch + stat)"
07432cef 16150msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 16151
d9488fea 16152#: builtin/log.c:1778
ef317cd5 16153msgid "Messaging"
07432cef 16154msgstr "邮件发送"
ef317cd5 16155
d9488fea 16156#: builtin/log.c:1779
ef317cd5 16157msgid "header"
07432cef 16158msgstr "header"
ef317cd5 16159
d9488fea 16160#: builtin/log.c:1780
ef317cd5 16161msgid "add email header"
07432cef 16162msgstr "添加邮件头"
ef317cd5 16163
d9488fea 16164#: builtin/log.c:1781 builtin/log.c:1782
ef317cd5 16165msgid "email"
07432cef 16166msgstr "邮件地址"
ef317cd5 16167
d9488fea 16168#: builtin/log.c:1781
ef317cd5 16169msgid "add To: header"
07432cef 16170msgstr "添加收件人"
ef317cd5 16171
d9488fea 16172#: builtin/log.c:1782
ef317cd5 16173msgid "add Cc: header"
07432cef 16174msgstr "添加抄送"
ef317cd5 16175
d9488fea 16176#: builtin/log.c:1783
2e8451e8 16177msgid "ident"
d9d56b23 16178msgstr "标识"
2e8451e8 16179
d9488fea 16180#: builtin/log.c:1784
2e8451e8 16181msgid "set From address to <ident> (or committer ident if absent)"
4375c10e 16182msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
2e8451e8 16183
d9488fea 16184#: builtin/log.c:1786
ef317cd5 16185msgid "message-id"
d9d56b23 16186msgstr "邮件标识"
ef317cd5 16187
d9488fea 16188#: builtin/log.c:1787
ef317cd5 16189msgid "make first mail a reply to <message-id>"
d9d56b23 16190msgstr "使第一封邮件作为对 <邮件标识> 的回复"
ef317cd5 16191
d9488fea 16192#: builtin/log.c:1788 builtin/log.c:1791
ef317cd5 16193msgid "boundary"
07432cef 16194msgstr "边界"
ef317cd5 16195
d9488fea 16196#: builtin/log.c:1789
ef317cd5 16197msgid "attach the patch"
07432cef 16198msgstr "附件方式添加补丁"
ef317cd5 16199
d9488fea 16200#: builtin/log.c:1792
ef317cd5 16201msgid "inline the patch"
07432cef 16202msgstr "内联显示补丁"
ef317cd5 16203
d9488fea 16204#: builtin/log.c:1796
ef317cd5 16205msgid "enable message threading, styles: shallow, deep"
07432cef 16206msgstr "启用邮件线索,风格:浅,深"
ef317cd5 16207
d9488fea 16208#: builtin/log.c:1798
ef317cd5 16209msgid "signature"
07432cef 16210msgstr "签名"
ef317cd5 16211
d9488fea 16212#: builtin/log.c:1799
ef317cd5 16213msgid "add a signature"
07432cef 16214msgstr "添加一个签名"
ef317cd5 16215
d9488fea 16216#: builtin/log.c:1800
5b04ee3b
JX
16217msgid "base-commit"
16218msgstr "基线提交"
16219
d9488fea 16220#: builtin/log.c:1801
5b04ee3b
JX
16221msgid "add prerequisite tree info to the patch series"
16222msgstr "为补丁列表添加前置树信息"
16223
d9488fea 16224#: builtin/log.c:1804
6acbf033
JX
16225msgid "add a signature from a file"
16226msgstr "从文件添加一个签名"
16227
d9488fea 16228#: builtin/log.c:1805
ef317cd5 16229msgid "don't print the patch filenames"
07432cef 16230msgstr "不要打印补丁文件名"
ef317cd5 16231
d9488fea 16232#: builtin/log.c:1807
6937cb4e
JX
16233msgid "show progress while generating patches"
16234msgstr "在生成补丁时显示进度"
16235
d9488fea 16236#: builtin/log.c:1809
4c27fcb5
JX
16237msgid "show changes against <rev> in cover letter or single patch"
16238msgstr "在附函或单个补丁中显示和 <rev> 的差异"
16239
d9488fea 16240#: builtin/log.c:1812
4c27fcb5
JX
16241msgid "show changes against <refspec> in cover letter or single patch"
16242msgstr "在附函或单个补丁中显示和 <refspec> 的差异"
16243
d9488fea 16244#: builtin/log.c:1814
4c27fcb5
JX
16245msgid "percentage by which creation is weighted"
16246msgstr "创建权重的百分比"
16247
d9488fea 16248#: builtin/log.c:1896
a4f16749
JX
16249#, c-format
16250msgid "invalid ident line: %s"
16251msgstr "包含无效的身份标识:%s"
16252
d9488fea 16253#: builtin/log.c:1911
c1ac5258
JX
16254msgid "-n and -k are mutually exclusive"
16255msgstr "-n 和 -k 互斥"
c04f5ac3 16256
d9488fea 16257#: builtin/log.c:1913
c1ac5258
JX
16258msgid "--subject-prefix/--rfc and -k are mutually exclusive"
16259msgstr "--subject-prefix/--rfc 和 -k 互斥"
c04f5ac3 16260
d9488fea 16261#: builtin/log.c:1921
c04f5ac3
JX
16262msgid "--name-only does not make sense"
16263msgstr "--name-only 无意义"
16264
d9488fea 16265#: builtin/log.c:1923
c04f5ac3
JX
16266msgid "--name-status does not make sense"
16267msgstr "--name-status 无意义"
16268
d9488fea 16269#: builtin/log.c:1925
c04f5ac3
JX
16270msgid "--check does not make sense"
16271msgstr "--check 无意义"
16272
d9488fea 16273#: builtin/log.c:1958
c04f5ac3
JX
16274msgid "standard output, or directory, which one?"
16275msgstr "标准输出或目录,哪一个?"
16276
d9488fea 16277#: builtin/log.c:2062
4c27fcb5
JX
16278msgid "--interdiff requires --cover-letter or single patch"
16279msgstr "--interdiff 需要 --cover-letter 或单一补丁"
16280
d9488fea 16281#: builtin/log.c:2066
4c27fcb5
JX
16282msgid "Interdiff:"
16283msgstr "版本间差异:"
16284
d9488fea 16285#: builtin/log.c:2067
4c27fcb5
JX
16286#, c-format
16287msgid "Interdiff against v%d:"
16288msgstr "对 v%d 的版本差异:"
16289
d9488fea 16290#: builtin/log.c:2073
4c27fcb5
JX
16291msgid "--creation-factor requires --range-diff"
16292msgstr "--creation-factor 需要 --range-diff"
16293
d9488fea 16294#: builtin/log.c:2077
4c27fcb5
JX
16295msgid "--range-diff requires --cover-letter or single patch"
16296msgstr "--range-diff 需要 --cover-letter 或单一补丁"
16297
d9488fea 16298#: builtin/log.c:2085
4c27fcb5
JX
16299msgid "Range-diff:"
16300msgstr "范围差异:"
16301
d9488fea 16302#: builtin/log.c:2086
4c27fcb5
JX
16303#, c-format
16304msgid "Range-diff against v%d:"
16305msgstr "对 v%d 的范围差异:"
16306
d9488fea 16307#: builtin/log.c:2097
6acbf033
JX
16308#, c-format
16309msgid "unable to read signature file '%s'"
16310msgstr "无法读取签名文件 '%s'"
16311
d9488fea 16312#: builtin/log.c:2133
6937cb4e
JX
16313msgid "Generating patches"
16314msgstr "生成补丁"
16315
d9488fea 16316#: builtin/log.c:2177
d46c5519 16317msgid "failed to create output files"
c04f5ac3
JX
16318msgstr "无法创建输出文件"
16319
d9488fea 16320#: builtin/log.c:2236
ef317cd5 16321msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 16322msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 16323
d9488fea 16324#: builtin/log.c:2290
c04f5ac3
JX
16325#, c-format
16326msgid ""
16327"Could not find a tracked remote branch, please specify <upstream> manually.\n"
d9d56b23 16328msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
c04f5ac3 16329
349ede6a 16330#: builtin/ls-files.c:471
814ff314
JX
16331msgid "git ls-files [<options>] [<file>...]"
16332msgstr "git ls-files [<选项>] [<文件>...]"
ef317cd5 16333
349ede6a 16334#: builtin/ls-files.c:527
ef317cd5 16335msgid "identify the file status with tags"
07432cef 16336msgstr "用标签标识文件的状态"
ef317cd5 16337
349ede6a 16338#: builtin/ls-files.c:529
ef317cd5 16339msgid "use lowercase letters for 'assume unchanged' files"
07432cef 16340msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 16341
349ede6a 16342#: builtin/ls-files.c:531
5809aa05
JX
16343msgid "use lowercase letters for 'fsmonitor clean' files"
16344msgstr "使用小写字母表示 'fsmonitor clean' 文件"
16345
349ede6a 16346#: builtin/ls-files.c:533
ef317cd5 16347msgid "show cached files in the output (default)"
07432cef 16348msgstr "显示缓存的文件(默认)"
ef317cd5 16349
349ede6a 16350#: builtin/ls-files.c:535
ef317cd5 16351msgid "show deleted files in the output"
07432cef 16352msgstr "显示已删除的文件"
ef317cd5 16353
349ede6a 16354#: builtin/ls-files.c:537
ef317cd5 16355msgid "show modified files in the output"
07432cef 16356msgstr "显示已修改的文件"
ef317cd5 16357
349ede6a 16358#: builtin/ls-files.c:539
ef317cd5 16359msgid "show other files in the output"
07432cef 16360msgstr "显示其它文件"
ef317cd5 16361
349ede6a 16362#: builtin/ls-files.c:541
ef317cd5 16363msgid "show ignored files in the output"
07432cef 16364msgstr "显示忽略的文件"
ef317cd5 16365
349ede6a 16366#: builtin/ls-files.c:544
ef317cd5 16367msgid "show staged contents' object name in the output"
07432cef 16368msgstr "显示暂存区内容的对象名称"
ef317cd5 16369
349ede6a 16370#: builtin/ls-files.c:546
ef317cd5 16371msgid "show files on the filesystem that need to be removed"
07432cef 16372msgstr "显示文件系统需要删除的文件"
ef317cd5 16373
349ede6a 16374#: builtin/ls-files.c:548
220c313c 16375msgid "show 'other' directories' names only"
07432cef 16376msgstr "只显示“其他”目录的名称"
ef317cd5 16377
349ede6a 16378#: builtin/ls-files.c:550
276ceeaa
JX
16379msgid "show line endings of files"
16380msgstr "显示文件换行符格式"
16381
349ede6a 16382#: builtin/ls-files.c:552
ef317cd5 16383msgid "don't show empty directories"
07432cef 16384msgstr "不显示空目录"
ef317cd5 16385
349ede6a 16386#: builtin/ls-files.c:555
ef317cd5 16387msgid "show unmerged files in the output"
07432cef 16388msgstr "显示未合并的文件"
ef317cd5 16389
349ede6a 16390#: builtin/ls-files.c:557
ef317cd5 16391msgid "show resolve-undo information"
07432cef 16392msgstr "显示 resolve-undo 信息"
ef317cd5 16393
349ede6a 16394#: builtin/ls-files.c:559
ef317cd5 16395msgid "skip files matching pattern"
d9488fea 16396msgstr "跳过和模式匹配的文件"
ef317cd5 16397
349ede6a 16398#: builtin/ls-files.c:562
ef317cd5 16399msgid "exclude patterns are read from <file>"
07432cef 16400msgstr "从 <文件> 中读取排除模式"
ef317cd5 16401
349ede6a 16402#: builtin/ls-files.c:565
ef317cd5 16403msgid "read additional per-directory exclude patterns in <file>"
07432cef 16404msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 16405
349ede6a 16406#: builtin/ls-files.c:567
ef317cd5 16407msgid "add the standard git exclusions"
07432cef 16408msgstr "添加标准的 git 排除"
ef317cd5 16409
349ede6a 16410#: builtin/ls-files.c:571
ef317cd5 16411msgid "make the output relative to the project top directory"
07432cef 16412msgstr "显示相对于顶级目录的文件名"
ef317cd5 16413
349ede6a 16414#: builtin/ls-files.c:574
a0b6b246
JX
16415msgid "recurse through submodules"
16416msgstr "在子模组中递归"
16417
349ede6a 16418#: builtin/ls-files.c:576
ef317cd5 16419msgid "if any <file> is not in the index, treat this as an error"
07432cef 16420msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 16421
349ede6a 16422#: builtin/ls-files.c:577
ef317cd5 16423msgid "tree-ish"
ddc12c42 16424msgstr "树对象"
ef317cd5 16425
349ede6a 16426#: builtin/ls-files.c:578
ef317cd5 16427msgid "pretend that paths removed since <tree-ish> are still present"
ddc12c42 16428msgstr "假装自从 <树对象> 之后删除的路径仍然存在"
ef317cd5 16429
349ede6a 16430#: builtin/ls-files.c:580
ef317cd5 16431msgid "show debugging data"
07432cef 16432msgstr "显示调试数据"
ef317cd5 16433
fd8cb379 16434#: builtin/ls-remote.c:9
276ceeaa
JX
16435msgid ""
16436"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
16437" [-q | --quiet] [--exit-code] [--get-url]\n"
16438" [--symref] [<repository> [<refs>...]]"
16439msgstr ""
16440"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
16441" [-q | --quiet] [--exit-code] [--get-url]\n"
16442" [--symref] [<仓库> [<引用>...]]"
16443
fd8cb379 16444#: builtin/ls-remote.c:59
276ceeaa
JX
16445msgid "do not print remote URL"
16446msgstr "不打印远程 URL"
16447
d9488fea 16448#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392
276ceeaa
JX
16449msgid "exec"
16450msgstr "exec"
16451
fd8cb379 16452#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
276ceeaa
JX
16453msgid "path of git-upload-pack on the remote host"
16454msgstr "远程主机上的 git-upload-pack 路径"
16455
fd8cb379 16456#: builtin/ls-remote.c:65
276ceeaa
JX
16457msgid "limit to tags"
16458msgstr "仅限于标签"
16459
fd8cb379 16460#: builtin/ls-remote.c:66
276ceeaa
JX
16461msgid "limit to heads"
16462msgstr "仅限于分支"
16463
fd8cb379 16464#: builtin/ls-remote.c:67
276ceeaa
JX
16465msgid "do not show peeled tags"
16466msgstr "不显示已解析的标签"
16467
fd8cb379 16468#: builtin/ls-remote.c:69
276ceeaa
JX
16469msgid "take url.<base>.insteadOf into account"
16470msgstr "参考 url.<base>.insteadOf 设置"
16471
d46c5519 16472#: builtin/ls-remote.c:72
276ceeaa
JX
16473msgid "exit with exit code 2 if no matching refs are found"
16474msgstr "若未找到匹配的引用则以退出码2退出"
16475
d46c5519 16476#: builtin/ls-remote.c:75
276ceeaa
JX
16477msgid "show underlying ref in addition to the object pointed by it"
16478msgstr "除了显示指向的对象外,显示指向的引用名"
16479
c1ac5258 16480#: builtin/ls-tree.c:30
ef317cd5 16481msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
ddc12c42 16482msgstr "git ls-tree [<选项>] <树对象> [<路径>...]"
ef317cd5 16483
c1ac5258 16484#: builtin/ls-tree.c:128
ef317cd5 16485msgid "only show trees"
07432cef 16486msgstr "只显示树"
ef317cd5 16487
c1ac5258 16488#: builtin/ls-tree.c:130
ef317cd5 16489msgid "recurse into subtrees"
07432cef 16490msgstr "递归到子树"
ef317cd5 16491
c1ac5258 16492#: builtin/ls-tree.c:132
ef317cd5 16493msgid "show trees when recursing"
07432cef 16494msgstr "当递归时显示树"
ef317cd5 16495
c1ac5258 16496#: builtin/ls-tree.c:135
ef317cd5 16497msgid "terminate entries with NUL byte"
4375c10e 16498msgstr "条目以 NUL 字符终止"
ef317cd5 16499
c1ac5258 16500#: builtin/ls-tree.c:136
ef317cd5 16501msgid "include object size"
07432cef 16502msgstr "包括对象大小"
ef317cd5 16503
c1ac5258 16504#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
ef317cd5 16505msgid "list only filenames"
07432cef 16506msgstr "只列出文件名"
ef317cd5 16507
c1ac5258 16508#: builtin/ls-tree.c:143
ef317cd5 16509msgid "use full path names"
07432cef 16510msgstr "使用文件的全路径"
ef317cd5 16511
c1ac5258 16512#: builtin/ls-tree.c:145
ef317cd5 16513msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 16514msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5 16515
a4f16749
JX
16516#: builtin/mailsplit.c:241
16517#, c-format
16518msgid "empty mbox: '%s'"
16519msgstr "空的 mbox:'%s'"
16520
349ede6a
JX
16521#: builtin/merge-base.c:32
16522msgid "git merge-base [-a | --all] <commit> <commit>..."
16523msgstr "git merge-base [-a | --all] <提交> <提交>..."
16524
16525#: builtin/merge-base.c:33
16526msgid "git merge-base [-a | --all] --octopus <commit>..."
16527msgstr "git merge-base [-a | --all] --octopus <提交>..."
16528
16529#: builtin/merge-base.c:34
16530msgid "git merge-base --independent <commit>..."
16531msgstr "git merge-base --independent <提交>..."
16532
16533#: builtin/merge-base.c:35
16534msgid "git merge-base --is-ancestor <commit> <commit>"
16535msgstr "git merge-base --is-ancestor <提交> <提交>"
16536
16537#: builtin/merge-base.c:36
16538msgid "git merge-base --fork-point <ref> [<commit>]"
16539msgstr "git merge-base --fork-point <引用> [<提交>]"
16540
16541#: builtin/merge-base.c:143
16542msgid "output all common ancestors"
16543msgstr "输出所有共同的祖先"
16544
16545#: builtin/merge-base.c:145
16546msgid "find ancestors for a single n-way merge"
16547msgstr "查找一个多路合并的祖先提交"
16548
16549#: builtin/merge-base.c:147
16550msgid "list revs not reachable from others"
16551msgstr "显示不能被其他访问到的版本"
16552
16553#: builtin/merge-base.c:149
16554msgid "is the first one ancestor of the other?"
16555msgstr "第一个是其他的祖先提交么?"
16556
16557#: builtin/merge-base.c:151
16558msgid "find where <commit> forked from reflog of <ref>"
16559msgstr "根据 <引用> 的引用日志查找 <提交> 的分叉点"
16560
16561#: builtin/merge-file.c:9
16562msgid ""
16563"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
16564"<orig-file> <file2>"
16565msgstr ""
16566"git merge-file [<选项>] [-L <名字1> [-L <初始名字> [-L <名字2>]]] <文件1> <初"
16567"始文件> <文件2>"
16568
16569#: builtin/merge-file.c:35
16570msgid "send results to standard output"
16571msgstr "将结果发送到标准输出"
16572
16573#: builtin/merge-file.c:36
16574msgid "use a diff3 based merge"
16575msgstr "使用基于 diff3 的合并"
16576
16577#: builtin/merge-file.c:37
16578msgid "for conflicts, use our version"
16579msgstr "如果冲突,使用我们的版本"
16580
16581#: builtin/merge-file.c:39
16582msgid "for conflicts, use their version"
16583msgstr "如果冲突,使用他们的版本"
16584
16585#: builtin/merge-file.c:41
16586msgid "for conflicts, use a union version"
16587msgstr "如果冲突,使用联合版本"
16588
16589#: builtin/merge-file.c:44
16590msgid "for conflicts, use this marker size"
16591msgstr "如果冲突,使用指定长度的标记"
16592
16593#: builtin/merge-file.c:45
16594msgid "do not warn about conflicts"
16595msgstr "不要警告冲突"
16596
16597#: builtin/merge-file.c:47
16598msgid "set labels for file1/orig-file/file2"
16599msgstr "为 文件1/初始文件/文件2 设置标签"
16600
16601#: builtin/merge-recursive.c:47
16602#, c-format
16603msgid "unknown option %s"
16604msgstr "未知选项 %s"
16605
16606#: builtin/merge-recursive.c:53
16607#, c-format
16608msgid "could not parse object '%s'"
16609msgstr "不能解析对象 '%s'"
16610
16611#: builtin/merge-recursive.c:57
16612#, c-format
16613msgid "cannot handle more than %d base. Ignoring %s."
16614msgid_plural "cannot handle more than %d bases. Ignoring %s."
16615msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
16616msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
16617
16618#: builtin/merge-recursive.c:65
16619msgid "not handling anything other than two heads merge."
16620msgstr "不能处理两个头合并之外的任何操作。"
16621
16622#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
16623#, c-format
16624msgid "could not resolve ref '%s'"
16625msgstr "无法解析引用 '%s'"
16626
16627#: builtin/merge-recursive.c:82
16628#, c-format
16629msgid "Merging %s with %s\n"
16630msgstr "合并 %s 和 %s\n"
16631
16632#: builtin/merge.c:56
814ff314
JX
16633msgid "git merge [<options>] [<commit>...]"
16634msgstr "git merge [<选项>] [<提交>...]"
ef317cd5 16635
349ede6a 16636#: builtin/merge.c:57
ef317cd5 16637msgid "git merge --abort"
07432cef 16638msgstr "git merge --abort"
ef317cd5 16639
349ede6a 16640#: builtin/merge.c:58
1a79b2f1
JX
16641msgid "git merge --continue"
16642msgstr "git merge --continue"
16643
d9488fea 16644#: builtin/merge.c:120
c04f5ac3
JX
16645msgid "switch `m' requires a value"
16646msgstr "开关 `m' 需要一个值"
16647
d9488fea 16648#: builtin/merge.c:143
06991777
JX
16649#, c-format
16650msgid "option `%s' requires a value"
16651msgstr "选项 `%s' 需要一个值"
16652
d9488fea 16653#: builtin/merge.c:189
c04f5ac3
JX
16654#, c-format
16655msgid "Could not find merge strategy '%s'.\n"
90e6ef53 16656msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 16657
d9488fea 16658#: builtin/merge.c:190
c04f5ac3
JX
16659#, c-format
16660msgid "Available strategies are:"
16661msgstr "可用的策略有:"
16662
d9488fea 16663#: builtin/merge.c:195
c04f5ac3
JX
16664#, c-format
16665msgid "Available custom strategies are:"
16666msgstr "可用的自定义策略有:"
16667
d9488fea 16668#: builtin/merge.c:246 builtin/pull.c:133
ef317cd5 16669msgid "do not show a diffstat at the end of the merge"
07432cef 16670msgstr "在合并的最后不显示差异统计"
ef317cd5 16671
d9488fea 16672#: builtin/merge.c:249 builtin/pull.c:136
ef317cd5 16673msgid "show a diffstat at the end of the merge"
07432cef 16674msgstr "在合并的最后显示差异统计"
ef317cd5 16675
d9488fea 16676#: builtin/merge.c:250 builtin/pull.c:139
ef317cd5 16677msgid "(synonym to --stat)"
07432cef 16678msgstr "(和 --stat 同义)"
ef317cd5 16679
d9488fea 16680#: builtin/merge.c:252 builtin/pull.c:142
ef317cd5 16681msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 16682msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 16683
d9488fea 16684#: builtin/merge.c:255 builtin/pull.c:148
ef317cd5 16685msgid "create a single commit instead of doing a merge"
07432cef 16686msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 16687
d9488fea 16688#: builtin/merge.c:257 builtin/pull.c:151
ef317cd5 16689msgid "perform a commit if the merge succeeds (default)"
07432cef 16690msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 16691
d9488fea 16692#: builtin/merge.c:259 builtin/pull.c:154
ef317cd5 16693msgid "edit message before committing"
07432cef 16694msgstr "在提交前编辑提交说明"
ef317cd5 16695
d9488fea 16696#: builtin/merge.c:261
ef317cd5 16697msgid "allow fast-forward (default)"
07432cef 16698msgstr "允许快进(默认)"
ef317cd5 16699
d9488fea 16700#: builtin/merge.c:263 builtin/pull.c:161
ef317cd5 16701msgid "abort if fast-forward is not possible"
07432cef 16702msgstr "如果不能快进就放弃合并"
ef317cd5 16703
d9488fea 16704#: builtin/merge.c:267 builtin/pull.c:164
5c57d762 16705msgid "verify that the named commit has a valid GPG signature"
1003b3a5
JX
16706msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
16707
d9488fea
JX
16708#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168
16709#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114
ef317cd5 16710msgid "strategy"
07432cef 16711msgstr "策略"
ef317cd5 16712
d9488fea 16713#: builtin/merge.c:269 builtin/pull.c:169
ef317cd5 16714msgid "merge strategy to use"
07432cef 16715msgstr "要使用的合并策略"
ef317cd5 16716
d9488fea 16717#: builtin/merge.c:270 builtin/pull.c:172
ef317cd5 16718msgid "option=value"
07432cef 16719msgstr "option=value"
ef317cd5 16720
d9488fea 16721#: builtin/merge.c:271 builtin/pull.c:173
ef317cd5 16722msgid "option for selected merge strategy"
07432cef 16723msgstr "所选的合并策略的选项"
ef317cd5 16724
d9488fea 16725#: builtin/merge.c:273
ef317cd5 16726msgid "merge commit message (for a non-fast-forward merge)"
07432cef 16727msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 16728
d9488fea 16729#: builtin/merge.c:280
ef317cd5 16730msgid "abort the current in-progress merge"
07432cef 16731msgstr "放弃当前正在进行的合并"
ef317cd5 16732
a6cd2cc4 16733#
d9488fea 16734#: builtin/merge.c:282
a6cd2cc4
JX
16735msgid "--abort but leave index and working tree alone"
16736msgstr "--abort,但是保留索引和工作区"
16737
d9488fea 16738#: builtin/merge.c:284
1a79b2f1
JX
16739msgid "continue the current in-progress merge"
16740msgstr "继续当前正在进行的合并"
16741
d9488fea 16742#: builtin/merge.c:286 builtin/pull.c:180
5b04ee3b
JX
16743msgid "allow merging unrelated histories"
16744msgstr "允许合并不相关的历史"
16745
d9488fea 16746#: builtin/merge.c:293
a5cd71ca
JX
16747msgid "bypass pre-merge-commit and commit-msg hooks"
16748msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"
6937cb4e 16749
d9488fea 16750#: builtin/merge.c:310
c04f5ac3 16751msgid "could not run stash."
a4f16749 16752msgstr "不能运行贮藏。"
c04f5ac3 16753
d9488fea 16754#: builtin/merge.c:315
c04f5ac3 16755msgid "stash failed"
a4f16749 16756msgstr "贮藏失败"
c04f5ac3 16757
d9488fea 16758#: builtin/merge.c:320
c04f5ac3
JX
16759#, c-format
16760msgid "not a valid object: %s"
16761msgstr "不是一个有效对象:%s"
16762
d9488fea 16763#: builtin/merge.c:342 builtin/merge.c:359
c04f5ac3
JX
16764msgid "read-tree failed"
16765msgstr "读取树失败"
16766
90e6ef53 16767# 译者:注意保持前导空格
d9488fea 16768#: builtin/merge.c:389
c04f5ac3
JX
16769msgid " (nothing to squash)"
16770msgstr " (无可压缩)"
16771
d9488fea 16772#: builtin/merge.c:400
c04f5ac3
JX
16773#, c-format
16774msgid "Squash commit -- not updating HEAD\n"
16775msgstr "压缩提交 -- 未更新 HEAD\n"
16776
d9488fea 16777#: builtin/merge.c:450
c04f5ac3
JX
16778#, c-format
16779msgid "No merge message -- not updating HEAD\n"
16780msgstr "无合并信息 -- 未更新 HEAD\n"
16781
d9488fea 16782#: builtin/merge.c:501
c04f5ac3
JX
16783#, c-format
16784msgid "'%s' does not point to a commit"
16785msgstr "'%s' 没有指向一个提交"
16786
d9488fea 16787#: builtin/merge.c:588
c04f5ac3
JX
16788#, c-format
16789msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 16790msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 16791
d9488fea 16792#: builtin/merge.c:713
c04f5ac3 16793msgid "Not handling anything other than two heads merge."
29004bbb 16794msgstr "未处理两个头合并之外的任何操作。"
c04f5ac3 16795
d9488fea 16796#: builtin/merge.c:726
c04f5ac3
JX
16797#, c-format
16798msgid "Unknown option for merge-recursive: -X%s"
16799msgstr "merge-recursive 的未知选项:-X%s"
16800
d9488fea 16801#: builtin/merge.c:741
c04f5ac3
JX
16802#, c-format
16803msgid "unable to write %s"
16804msgstr "不能写 %s"
16805
d9488fea 16806#: builtin/merge.c:793
c04f5ac3
JX
16807#, c-format
16808msgid "Could not read from '%s'"
16809msgstr "不能从 '%s' 读取"
16810
d9488fea 16811#: builtin/merge.c:802
c04f5ac3
JX
16812#, c-format
16813msgid "Not committing merge; use 'git commit' to complete the merge.\n"
16814msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
16815
d9488fea 16816#: builtin/merge.c:808
c04f5ac3
JX
16817msgid ""
16818"Please enter a commit message to explain why this merge is necessary,\n"
16819"especially if it merges an updated upstream into a topic branch.\n"
16820"\n"
c04f5ac3
JX
16821msgstr ""
16822"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
16823"合并到主题分支。\n"
16824"\n"
c04f5ac3 16825
d9488fea 16826#: builtin/merge.c:813
d46c5519 16827msgid "An empty message aborts the commit.\n"
5b533632 16828msgstr "空的提交说明会终止提交。\n"
d46c5519 16829
d9488fea 16830#: builtin/merge.c:816
d46c5519
JX
16831#, c-format
16832msgid ""
16833"Lines starting with '%c' will be ignored, and an empty message aborts\n"
16834"the commit.\n"
5b533632 16835msgstr "以 '%c' 开始的行将被忽略,而空的提交说明将终止提交。\n"
d46c5519 16836
d9488fea 16837#: builtin/merge.c:869
c04f5ac3
JX
16838msgid "Empty commit message."
16839msgstr "空提交信息。"
16840
d9488fea 16841#: builtin/merge.c:884
c04f5ac3
JX
16842#, c-format
16843msgid "Wonderful.\n"
16844msgstr "太棒了。\n"
16845
d9488fea 16846#: builtin/merge.c:945
c04f5ac3
JX
16847#, c-format
16848msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
16849msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
16850
d9488fea 16851#: builtin/merge.c:984
c04f5ac3 16852msgid "No current branch."
90e6ef53 16853msgstr "没有当前分支。"
c04f5ac3 16854
d9488fea 16855#: builtin/merge.c:986
c04f5ac3 16856msgid "No remote for the current branch."
160fb2b2 16857msgstr "当前分支没有对应的远程仓库。"
c04f5ac3 16858
d9488fea 16859#: builtin/merge.c:988
c04f5ac3 16860msgid "No default upstream defined for the current branch."
90e6ef53 16861msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 16862
d9488fea 16863#: builtin/merge.c:993
170e9899 16864#, c-format
2e8451e8
JX
16865msgid "No remote-tracking branch for %s from %s"
16866msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 16867
d9488fea 16868#: builtin/merge.c:1050
5c57d762
JX
16869#, c-format
16870msgid "Bad value '%s' in environment '%s'"
9a4b694c 16871msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
5c57d762 16872
d9488fea 16873#: builtin/merge.c:1153
5c57d762
JX
16874#, c-format
16875msgid "not something we can merge in %s: %s"
16876msgstr "不能在 %s 中合并:%s"
16877
d9488fea 16878#: builtin/merge.c:1187
5c57d762
JX
16879msgid "not something we can merge"
16880msgstr "不能合并"
16881
d9488fea 16882#: builtin/merge.c:1291
1a79b2f1
JX
16883msgid "--abort expects no arguments"
16884msgstr "--abort 不带参数"
16885
d9488fea 16886#: builtin/merge.c:1295
c04f5ac3 16887msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 16888msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 16889
d9488fea 16890#: builtin/merge.c:1313
a6cd2cc4
JX
16891msgid "--quit expects no arguments"
16892msgstr "--quit 不带参数"
16893
d9488fea 16894#: builtin/merge.c:1326
1a79b2f1
JX
16895msgid "--continue expects no arguments"
16896msgstr "--continue 不带参数"
16897
d9488fea 16898#: builtin/merge.c:1330
1a79b2f1
JX
16899msgid "There is no merge in progress (MERGE_HEAD missing)."
16900msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
16901
d9488fea 16902#: builtin/merge.c:1346
c04f5ac3
JX
16903msgid ""
16904"You have not concluded your merge (MERGE_HEAD exists).\n"
220c313c 16905"Please, commit your changes before you merge."
c04f5ac3
JX
16906msgstr ""
16907"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 16908"请在合并前先提交您的修改。"
c04f5ac3 16909
d9488fea 16910#: builtin/merge.c:1353
c04f5ac3
JX
16911msgid ""
16912"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
220c313c 16913"Please, commit your changes before you merge."
c04f5ac3
JX
16914msgstr ""
16915"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 16916"请在合并前先提交您的修改。"
c04f5ac3 16917
d9488fea 16918#: builtin/merge.c:1356
c04f5ac3
JX
16919msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
16920msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
16921
d9488fea 16922#: builtin/merge.c:1370
c04f5ac3 16923msgid "You cannot combine --squash with --no-ff."
a6cd2cc4 16924msgstr "您不能将 --squash 和 --no-ff 组合使用。"
c04f5ac3 16925
d9488fea 16926#: builtin/merge.c:1372
a6cd2cc4
JX
16927msgid "You cannot combine --squash with --commit."
16928msgstr "您不能将 --squash 和 --commit 组合使用。"
16929
d9488fea 16930#: builtin/merge.c:1388
c04f5ac3 16931msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 16932msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 16933
d9488fea 16934#: builtin/merge.c:1405
c04f5ac3
JX
16935msgid "Squash commit into empty head not supported yet"
16936msgstr "尚不支持到空分支的压缩提交"
16937
d9488fea 16938#: builtin/merge.c:1407
c04f5ac3
JX
16939msgid "Non-fast-forward commit does not make sense into an empty head"
16940msgstr "到空分支的非快进式提交没有意义"
16941
d9488fea 16942#: builtin/merge.c:1412
2e8451e8
JX
16943#, c-format
16944msgid "%s - not something we can merge"
16945msgstr "%s - 不能被合并"
16946
d9488fea 16947#: builtin/merge.c:1414
7aea43ff
JX
16948msgid "Can merge only exactly one commit into empty head"
16949msgstr "只能将一个提交合并到空分支上"
16950
d9488fea 16951#: builtin/merge.c:1495
5b04ee3b
JX
16952msgid "refusing to merge unrelated histories"
16953msgstr "拒绝合并无关的历史"
16954
d9488fea 16955#: builtin/merge.c:1504
6937cb4e 16956msgid "Already up to date."
5c57d762
JX
16957msgstr "已经是最新的。"
16958
d9488fea 16959#: builtin/merge.c:1514
c04f5ac3
JX
16960#, c-format
16961msgid "Updating %s..%s\n"
16962msgstr "更新 %s..%s\n"
16963
d9488fea 16964#: builtin/merge.c:1560
c04f5ac3
JX
16965#, c-format
16966msgid "Trying really trivial in-index merge...\n"
90e6ef53 16967msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 16968
d9488fea 16969#: builtin/merge.c:1567
c04f5ac3
JX
16970#, c-format
16971msgid "Nope.\n"
16972msgstr "无。\n"
16973
d9488fea 16974#: builtin/merge.c:1592
6937cb4e 16975msgid "Already up to date. Yeeah!"
5c57d762
JX
16976msgstr "已经是最新的。耶!"
16977
d9488fea 16978#: builtin/merge.c:1598
c04f5ac3 16979msgid "Not possible to fast-forward, aborting."
1aabac65 16980msgstr "无法快进,终止。"
c04f5ac3 16981
d9488fea 16982#: builtin/merge.c:1626 builtin/merge.c:1691
c04f5ac3
JX
16983#, c-format
16984msgid "Rewinding the tree to pristine...\n"
16985msgstr "将树回滚至原始状态...\n"
16986
d9488fea 16987#: builtin/merge.c:1630
c04f5ac3
JX
16988#, c-format
16989msgid "Trying merge strategy %s...\n"
16990msgstr "尝试合并策略 %s...\n"
16991
d9488fea 16992#: builtin/merge.c:1682
c04f5ac3
JX
16993#, c-format
16994msgid "No merge strategy handled the merge.\n"
16995msgstr "没有合并策略处理此合并。\n"
16996
d9488fea 16997#: builtin/merge.c:1684
c04f5ac3
JX
16998#, c-format
16999msgid "Merge with strategy %s failed.\n"
17000msgstr "使用策略 %s 合并失败。\n"
17001
d9488fea 17002#: builtin/merge.c:1693
c04f5ac3
JX
17003#, c-format
17004msgid "Using the %s to prepare resolving by hand.\n"
17005msgstr "使用 %s 以准备手工解决。\n"
17006
d9488fea 17007#: builtin/merge.c:1707
c04f5ac3
JX
17008#, c-format
17009msgid "Automatic merge went well; stopped before committing as requested\n"
17010msgstr "自动合并进展顺利,按要求在提交前停止\n"
17011
349ede6a
JX
17012#: builtin/mktree.c:66
17013msgid "git mktree [-z] [--missing] [--batch]"
17014msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 17015
c1ac5258 17016#: builtin/mktree.c:154
ef317cd5 17017msgid "input is NUL terminated"
07432cef 17018msgstr "输入以 NUL 字符终止"
c04f5ac3 17019
06991777 17020#: builtin/mktree.c:155 builtin/write-tree.c:26
ef317cd5 17021msgid "allow missing objects"
07432cef 17022msgstr "允许丢失的对象"
c04f5ac3 17023
c1ac5258 17024#: builtin/mktree.c:156
ef317cd5 17025msgid "allow creation of more than one tree"
07432cef 17026msgstr "允许创建一个以上的树"
c04f5ac3 17027
d46c5519 17028#: builtin/multi-pack-index.c:9
a6cd2cc4 17029msgid ""
ddc12c42
JX
17030"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
17031"size=<size>)"
2b472aae
JX
17032msgstr ""
17033"git multi-pack-index [<选项>] (write|verify|expire|repack --batch-size=<大小"
17034">)"
4c27fcb5 17035
ddc12c42 17036#: builtin/multi-pack-index.c:26
4c27fcb5
JX
17037msgid "object directory containing set of packfile and pack-index pairs"
17038msgstr "包含成对包文件和包索引的对象目录"
17039
ddc12c42 17040#: builtin/multi-pack-index.c:29
a6cd2cc4
JX
17041msgid ""
17042"during repack, collect pack-files of smaller size into a batch that is "
17043"larger than this size"
17044msgstr "在 repack 期间,将较小尺寸的包文件收集到大于此大小的批次中"
17045
349ede6a 17046#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25
4c27fcb5
JX
17047msgid "too many arguments"
17048msgstr "太多参数"
17049
ddc12c42 17050#: builtin/multi-pack-index.c:60
a6cd2cc4
JX
17051msgid "--batch-size option is only for 'repack' subcommand"
17052msgstr "--batch-size 选项仅用于 'repack' 子命令"
17053
ddc12c42 17054#: builtin/multi-pack-index.c:69
4c27fcb5 17055#, c-format
a6cd2cc4
JX
17056msgid "unrecognized subcommand: %s"
17057msgstr "未识别的子命令:%s"
4c27fcb5 17058
06991777 17059#: builtin/mv.c:18
814ff314
JX
17060msgid "git mv [<options>] <source>... <destination>"
17061msgstr "git mv [<选项>] <源>... <目标>"
c04f5ac3 17062
06991777 17063#: builtin/mv.c:83
220c313c
JX
17064#, c-format
17065msgid "Directory %s is in index and no submodule?"
17066msgstr "目录 %s 在索引中并且不是子模组?"
17067
06991777 17068#: builtin/mv.c:85
220c313c 17069msgid "Please stage your changes to .gitmodules or stash them to proceed"
a4f16749 17070msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
220c313c 17071
06991777 17072#: builtin/mv.c:103
220c313c
JX
17073#, c-format
17074msgid "%.*s is in index"
17075msgstr "%.*s 在索引中"
17076
06991777 17077#: builtin/mv.c:125
ef317cd5 17078msgid "force move/rename even if target exists"
07432cef 17079msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 17080
06991777 17081#: builtin/mv.c:127
ef317cd5 17082msgid "skip move/rename errors"
07432cef 17083msgstr "跳过移动/重命名错误"
c04f5ac3 17084
d9488fea 17085#: builtin/mv.c:170
220c313c
JX
17086#, c-format
17087msgid "destination '%s' is not a directory"
17088msgstr "目标 '%s' 不是一个目录"
17089
d9488fea 17090#: builtin/mv.c:181
c04f5ac3
JX
17091#, c-format
17092msgid "Checking rename of '%s' to '%s'\n"
17093msgstr "检查 '%s' 到 '%s' 的重命名\n"
17094
d9488fea 17095#: builtin/mv.c:185
c04f5ac3
JX
17096msgid "bad source"
17097msgstr "坏的源"
17098
d9488fea 17099#: builtin/mv.c:188
c04f5ac3
JX
17100msgid "can not move directory into itself"
17101msgstr "不能将目录移动到自身"
17102
d9488fea 17103#: builtin/mv.c:191
c04f5ac3
JX
17104msgid "cannot move directory over file"
17105msgstr "不能将目录移动到文件"
17106
d9488fea 17107#: builtin/mv.c:200
c04f5ac3
JX
17108msgid "source directory is empty"
17109msgstr "源目录为空"
17110
d9488fea 17111#: builtin/mv.c:225
c04f5ac3
JX
17112msgid "not under version control"
17113msgstr "不在版本控制之下"
17114
06991777 17115#: builtin/mv.c:227
d9488fea
JX
17116msgid "conflicted"
17117msgstr "冲突"
17118
17119#: builtin/mv.c:230
c04f5ac3
JX
17120msgid "destination exists"
17121msgstr "目标已存在"
17122
d9488fea 17123#: builtin/mv.c:238
c04f5ac3
JX
17124#, c-format
17125msgid "overwriting '%s'"
17126msgstr "覆盖 '%s'"
17127
d9488fea 17128#: builtin/mv.c:241
c04f5ac3
JX
17129msgid "Cannot overwrite"
17130msgstr "不能覆盖"
17131
d9488fea 17132#: builtin/mv.c:244
c04f5ac3
JX
17133msgid "multiple sources for the same target"
17134msgstr "同一目标具有多个源"
17135
d9488fea 17136#: builtin/mv.c:246
cfff71a9
JX
17137msgid "destination directory does not exist"
17138msgstr "目标目录不存在"
17139
d9488fea 17140#: builtin/mv.c:253
c04f5ac3
JX
17141#, c-format
17142msgid "%s, source=%s, destination=%s"
17143msgstr "%s,源=%s,目标=%s"
17144
d9488fea 17145#: builtin/mv.c:274
c04f5ac3
JX
17146#, c-format
17147msgid "Renaming %s to %s\n"
17148msgstr "重命名 %s 至 %s\n"
17149
d9488fea 17150#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518
c04f5ac3
JX
17151#, c-format
17152msgid "renaming '%s' failed"
17153msgstr "重命名 '%s' 失败"
17154
2b472aae 17155#: builtin/name-rev.c:465
814ff314
JX
17156msgid "git name-rev [<options>] <commit>..."
17157msgstr "git name-rev [<选项>] <提交>..."
ef317cd5 17158
2b472aae 17159#: builtin/name-rev.c:466
814ff314
JX
17160msgid "git name-rev [<options>] --all"
17161msgstr "git name-rev [<选项>] --all"
ef317cd5 17162
2b472aae 17163#: builtin/name-rev.c:467
814ff314
JX
17164msgid "git name-rev [<options>] --stdin"
17165msgstr "git name-rev [<选项>] --stdin"
ef317cd5 17166
2b472aae 17167#: builtin/name-rev.c:524
d9488fea
JX
17168msgid "print only ref-based names (no object names)"
17169msgstr "只打印基于引用的名称(非对象名)"
ef317cd5 17170
2b472aae 17171#: builtin/name-rev.c:525
ef317cd5 17172msgid "only use tags to name the commits"
55a16ee4 17173msgstr "只使用标签来命名提交"
ef317cd5 17174
2b472aae 17175#: builtin/name-rev.c:527
ef317cd5 17176msgid "only use refs matching <pattern>"
07432cef 17177msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 17178
2b472aae 17179#: builtin/name-rev.c:529
87cb7997
JX
17180msgid "ignore refs matching <pattern>"
17181msgstr "忽略和 <模式> 相匹配的引用"
17182
2b472aae 17183#: builtin/name-rev.c:531
ef317cd5 17184msgid "list all commits reachable from all refs"
07432cef 17185msgstr "列出可以从所有引用访问的提交"
ef317cd5 17186
2b472aae 17187#: builtin/name-rev.c:532
ef317cd5 17188msgid "read from stdin"
07432cef 17189msgstr "从标准输入读取"
ef317cd5 17190
2b472aae 17191#: builtin/name-rev.c:533
90314792
JX
17192msgid "allow to print `undefined` names (default)"
17193msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 17194
2b472aae 17195#: builtin/name-rev.c:539
2e8451e8 17196msgid "dereference tags in the input (internal use)"
55a16ee4 17197msgstr "反向解析输入中的标签(内部使用)"
2e8451e8 17198
c1ac5258 17199#: builtin/notes.c:28
814ff314 17200msgid "git notes [--ref <notes-ref>] [list [<object>]]"
07432cef 17201msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 17202
c1ac5258 17203#: builtin/notes.c:29
ef317cd5 17204msgid ""
814ff314 17205"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
04cb2f28 17206"| (-c | -C) <object>] [<object>]"
ef317cd5 17207msgstr ""
04cb2f28
JX
17208"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
17209"| (-c | -C) <对象>] [<对象>]"
ef317cd5 17210
c1ac5258 17211#: builtin/notes.c:30
814ff314 17212msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
07432cef 17213msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 17214
c1ac5258 17215#: builtin/notes.c:31
ef317cd5 17216msgid ""
814ff314 17217"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
04cb2f28 17218"(-c | -C) <object>] [<object>]"
ef317cd5 17219msgstr ""
04cb2f28
JX
17220"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
17221"(-c | -C) <对象>] [<对象>]"
ef317cd5 17222
c1ac5258 17223#: builtin/notes.c:32
814ff314 17224msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
04cb2f28 17225msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
ef317cd5 17226
c1ac5258 17227#: builtin/notes.c:33
814ff314 17228msgid "git notes [--ref <notes-ref>] show [<object>]"
07432cef 17229msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 17230
c1ac5258 17231#: builtin/notes.c:34
ef317cd5 17232msgid ""
814ff314 17233"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
07432cef 17234msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 17235
c1ac5258 17236#: builtin/notes.c:35
ef317cd5 17237msgid "git notes merge --commit [-v | -q]"
07432cef 17238msgstr "git notes merge --commit [-v | -q]"
ef317cd5 17239
c1ac5258 17240#: builtin/notes.c:36
ef317cd5 17241msgid "git notes merge --abort [-v | -q]"
07432cef 17242msgstr "git notes merge --abort [-v | -q]"
ef317cd5 17243
c1ac5258 17244#: builtin/notes.c:37
814ff314 17245msgid "git notes [--ref <notes-ref>] remove [<object>...]"
07432cef 17246msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 17247
c1ac5258 17248#: builtin/notes.c:38
5809aa05
JX
17249msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
17250msgstr "git notes [--ref <注解引用>] prune [-n] [-v]"
ef317cd5 17251
c1ac5258 17252#: builtin/notes.c:39
814ff314 17253msgid "git notes [--ref <notes-ref>] get-ref"
07432cef 17254msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 17255
c1ac5258 17256#: builtin/notes.c:44
ef317cd5 17257msgid "git notes [list [<object>]]"
07432cef 17258msgstr "git notes [list [<对象>]]"
ef317cd5 17259
c1ac5258 17260#: builtin/notes.c:49
ef317cd5 17261msgid "git notes add [<options>] [<object>]"
07432cef 17262msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 17263
c1ac5258 17264#: builtin/notes.c:54
ef317cd5 17265msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 17266msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 17267
c1ac5258 17268#: builtin/notes.c:55
ef317cd5 17269msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 17270msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 17271
c1ac5258 17272#: builtin/notes.c:60
ef317cd5 17273msgid "git notes append [<options>] [<object>]"
07432cef 17274msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 17275
c1ac5258 17276#: builtin/notes.c:65
ef317cd5 17277msgid "git notes edit [<object>]"
07432cef 17278msgstr "git notes edit [<对象>]"
ef317cd5 17279
c1ac5258 17280#: builtin/notes.c:70
ef317cd5 17281msgid "git notes show [<object>]"
07432cef 17282msgstr "git notes show [<对象>]"
ef317cd5 17283
c1ac5258 17284#: builtin/notes.c:75
814ff314 17285msgid "git notes merge [<options>] <notes-ref>"
07432cef 17286msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 17287
c1ac5258 17288#: builtin/notes.c:76
ef317cd5 17289msgid "git notes merge --commit [<options>]"
07432cef 17290msgstr "git notes merge --commit [<选项>]"
ef317cd5 17291
c1ac5258 17292#: builtin/notes.c:77
ef317cd5 17293msgid "git notes merge --abort [<options>]"
07432cef 17294msgstr "git notes merge --abort [<选项>]"
ef317cd5 17295
c1ac5258 17296#: builtin/notes.c:82
ef317cd5 17297msgid "git notes remove [<object>]"
07432cef 17298msgstr "git notes remove [<对象>]"
ef317cd5 17299
c1ac5258 17300#: builtin/notes.c:87
ef317cd5 17301msgid "git notes prune [<options>]"
07432cef 17302msgstr "git notes prune [<选项>]"
ef317cd5 17303
c1ac5258 17304#: builtin/notes.c:92
ef317cd5 17305msgid "git notes get-ref"
07432cef 17306msgstr "git notes get-ref"
ef317cd5 17307
c1ac5258 17308#: builtin/notes.c:97
5c57d762
JX
17309msgid "Write/edit the notes for the following object:"
17310msgstr "为下面的对象写/编辑说明:"
17311
c1ac5258 17312#: builtin/notes.c:150
c04f5ac3
JX
17313#, c-format
17314msgid "unable to start 'show' for object '%s'"
17315msgstr "不能为对象 '%s' 开始 'show'"
17316
c1ac5258 17317#: builtin/notes.c:154
a77c07d9
JX
17318msgid "could not read 'show' output"
17319msgstr "不能读取 'show' 的输出"
c04f5ac3 17320
c1ac5258 17321#: builtin/notes.c:162
c04f5ac3
JX
17322#, c-format
17323msgid "failed to finish 'show' for object '%s'"
17324msgstr "无法为对象 '%s' 完成 'show'"
17325
c1ac5258 17326#: builtin/notes.c:197
a0b6b246 17327msgid "please supply the note contents using either -m or -F option"
c04f5ac3
JX
17328msgstr "请通过 -m 或 -F 选项为注解提供内容"
17329
c1ac5258 17330#: builtin/notes.c:206
c04f5ac3
JX
17331msgid "unable to write note object"
17332msgstr "不能写注解对象"
17333
c1ac5258 17334#: builtin/notes.c:208
c04f5ac3 17335#, c-format
a0b6b246 17336msgid "the note contents have been left in %s"
220c313c 17337msgstr "注解内容被留在 %s 中"
c04f5ac3 17338
349ede6a 17339#: builtin/notes.c:242 builtin/tag.c:533
c04f5ac3
JX
17340#, c-format
17341msgid "could not open or read '%s'"
17342msgstr "不能打开或读取 '%s'"
17343
4c27fcb5 17344#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
06991777
JX
17345#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
17346#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
a0b6b246
JX
17347#, c-format
17348msgid "failed to resolve '%s' as a valid ref."
17349msgstr "无法解析 '%s' 为一个有效引用。"
17350
4c27fcb5 17351#: builtin/notes.c:265
c04f5ac3 17352#, c-format
a0b6b246 17353msgid "failed to read object '%s'."
c1ac5258 17354msgstr "读取对象 '%s' 失败。"
c04f5ac3 17355
4c27fcb5 17356#: builtin/notes.c:268
6c94aba5 17357#, c-format
a0b6b246
JX
17358msgid "cannot read note data from non-blob object '%s'."
17359msgstr "不能从非数据对象 '%s' 中读取注解数据。"
17360
4c27fcb5 17361#: builtin/notes.c:309
a0b6b246
JX
17362#, c-format
17363msgid "malformed input line: '%s'."
fd8cb379 17364msgstr "格式错误的输入行:'%s'。"
a0b6b246 17365
4c27fcb5 17366#: builtin/notes.c:324
a0b6b246
JX
17367#, c-format
17368msgid "failed to copy notes from '%s' to '%s'"
17369msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
6c94aba5 17370
a4f16749
JX
17371#. TRANSLATORS: the first %s will be replaced by a git
17372#. notes command: 'add', 'merge', 'remove', etc.
17373#.
4c27fcb5 17374#: builtin/notes.c:356
a0b6b246
JX
17375#, c-format
17376msgid "refusing to %s notes in %s (outside of refs/notes/)"
17377msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
17378
06991777
JX
17379#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
17380#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
17381#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
c04f5ac3
JX
17382msgid "too many parameters"
17383msgstr "参数太多"
17384
06991777 17385#: builtin/notes.c:389 builtin/notes.c:678
c04f5ac3 17386#, c-format
a0b6b246 17387msgid "no note found for object %s."
c04f5ac3
JX
17388msgstr "未发现对象 %s 的注解。"
17389
06991777 17390#: builtin/notes.c:410 builtin/notes.c:576
ef317cd5 17391msgid "note contents as a string"
07432cef 17392msgstr "注解内容作为一个字符串"
ef317cd5 17393
06991777 17394#: builtin/notes.c:413 builtin/notes.c:579
ef317cd5 17395msgid "note contents in a file"
07432cef 17396msgstr "注解内容到一个文件中"
ef317cd5 17397
06991777 17398#: builtin/notes.c:416 builtin/notes.c:582
ef317cd5 17399msgid "reuse and edit specified note object"
07432cef 17400msgstr "重用和编辑指定的注解对象"
ef317cd5 17401
06991777 17402#: builtin/notes.c:419 builtin/notes.c:585
ef317cd5 17403msgid "reuse specified note object"
07432cef 17404msgstr "重用指定的注解对象"
ef317cd5 17405
06991777 17406#: builtin/notes.c:422 builtin/notes.c:588
04cb2f28
JX
17407msgid "allow storing empty note"
17408msgstr "允许保存空白注释"
17409
06991777 17410#: builtin/notes.c:423 builtin/notes.c:496
ef317cd5 17411msgid "replace existing notes"
07432cef 17412msgstr "替换已存在的注解"
ef317cd5 17413
4c27fcb5 17414#: builtin/notes.c:448
c04f5ac3
JX
17415#, c-format
17416msgid ""
17417"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
17418"existing notes"
17419msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
17420
06991777 17421#: builtin/notes.c:463 builtin/notes.c:544
c04f5ac3
JX
17422#, c-format
17423msgid "Overwriting existing notes for object %s\n"
17424msgstr "覆盖对象 %s 现存注解\n"
17425
06991777 17426#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
04cb2f28
JX
17427#, c-format
17428msgid "Removing note for object %s\n"
17429msgstr "删除对象 %s 的注解\n"
17430
06991777 17431#: builtin/notes.c:497
ef317cd5 17432msgid "read objects from stdin"
07432cef 17433msgstr "从标准输入读取对象"
ef317cd5 17434
06991777 17435#: builtin/notes.c:499
ef317cd5 17436msgid "load rewriting config for <command> (implies --stdin)"
07432cef 17437msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 17438
06991777 17439#: builtin/notes.c:517
c04f5ac3
JX
17440msgid "too few parameters"
17441msgstr "参数太少"
17442
06991777 17443#: builtin/notes.c:538
c04f5ac3
JX
17444#, c-format
17445msgid ""
17446"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
17447"existing notes"
17448msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
17449
06991777 17450#: builtin/notes.c:550
c04f5ac3 17451#, c-format
a0b6b246 17452msgid "missing notes on source object %s. Cannot copy."
c04f5ac3
JX
17453msgstr "源对象 %s 缺少注解。不能拷贝。"
17454
06991777 17455#: builtin/notes.c:603
ef317cd5
JX
17456#, c-format
17457msgid ""
17458"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
17459"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
17460msgstr ""
17461"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
17462"请换用 'git notes add -f -m/-F/-c/-C'。\n"
17463
06991777 17464#: builtin/notes.c:698
a0b6b246 17465msgid "failed to delete ref NOTES_MERGE_PARTIAL"
c1ac5258 17466msgstr "删除引用 NOTES_MERGE_PARTIAL 失败"
a0b6b246 17467
06991777 17468#: builtin/notes.c:700
a0b6b246 17469msgid "failed to delete ref NOTES_MERGE_REF"
c1ac5258 17470msgstr "删除引用 NOTES_MERGE_REF 失败"
a0b6b246 17471
06991777 17472#: builtin/notes.c:702
a0b6b246 17473msgid "failed to remove 'git notes merge' worktree"
c1ac5258 17474msgstr "删除 'git notes merge' 工作区失败"
a0b6b246 17475
06991777 17476#: builtin/notes.c:722
a0b6b246 17477msgid "failed to read ref NOTES_MERGE_PARTIAL"
c1ac5258 17478msgstr "读取引用 NOTES_MERGE_PARTIAL 失败"
a0b6b246 17479
06991777 17480#: builtin/notes.c:724
a0b6b246
JX
17481msgid "could not find commit from NOTES_MERGE_PARTIAL."
17482msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
17483
06991777 17484#: builtin/notes.c:726
a0b6b246
JX
17485msgid "could not parse commit from NOTES_MERGE_PARTIAL."
17486msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
17487
06991777 17488#: builtin/notes.c:739
a0b6b246 17489msgid "failed to resolve NOTES_MERGE_REF"
c1ac5258 17490msgstr "解析 NOTES_MERGE_REF 失败"
a0b6b246 17491
06991777 17492#: builtin/notes.c:742
a0b6b246
JX
17493msgid "failed to finalize notes merge"
17494msgstr "无法完成注解合并"
17495
06991777 17496#: builtin/notes.c:768
5c57d762
JX
17497#, c-format
17498msgid "unknown notes merge strategy %s"
17499msgstr "未知的注解合并策略 %s"
17500
06991777 17501#: builtin/notes.c:784
ef317cd5 17502msgid "General options"
07432cef 17503msgstr "通用选项"
ef317cd5 17504
06991777 17505#: builtin/notes.c:786
ef317cd5 17506msgid "Merge options"
07432cef 17507msgstr "合并选项"
ef317cd5 17508
06991777 17509#: builtin/notes.c:788
ef317cd5
JX
17510msgid ""
17511"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
17512"cat_sort_uniq)"
07432cef 17513msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 17514
06991777 17515#: builtin/notes.c:790
ef317cd5 17516msgid "Committing unmerged notes"
07432cef 17517msgstr "提交未合并的注解"
ef317cd5 17518
06991777 17519#: builtin/notes.c:792
ef317cd5 17520msgid "finalize notes merge by committing unmerged notes"
07432cef 17521msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 17522
06991777 17523#: builtin/notes.c:794
ef317cd5 17524msgid "Aborting notes merge resolution"
07432cef 17525msgstr "中止注解合并的方案"
ef317cd5 17526
06991777 17527#: builtin/notes.c:796
ef317cd5 17528msgid "abort notes merge"
07432cef 17529msgstr "中止注解合并"
ef317cd5 17530
06991777 17531#: builtin/notes.c:807
5c57d762
JX
17532msgid "cannot mix --commit, --abort or -s/--strategy"
17533msgstr "不能混用 --commit、--abort 或 -s/--strategy"
17534
06991777 17535#: builtin/notes.c:812
a0b6b246 17536msgid "must specify a notes ref to merge"
9a4b694c 17537msgstr "必须指定一个注解引用来合并"
5c57d762 17538
06991777 17539#: builtin/notes.c:836
5c57d762 17540#, c-format
a0b6b246 17541msgid "unknown -s/--strategy: %s"
5c57d762
JX
17542msgstr "未知的 -s/--strategy:%s"
17543
06991777 17544#: builtin/notes.c:873
1b7f4a34 17545#, c-format
a0b6b246
JX
17546msgid "a notes merge into %s is already in-progress at %s"
17547msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
1b7f4a34 17548
06991777 17549#: builtin/notes.c:876
5c57d762 17550#, c-format
a0b6b246
JX
17551msgid "failed to store link to current notes ref (%s)"
17552msgstr "无法存储链接到当前的注解引用(%s)"
5c57d762 17553
06991777 17554#: builtin/notes.c:878
5c57d762
JX
17555#, c-format
17556msgid ""
17557"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
17558"'git notes merge --commit', or abort the merge with 'git notes merge --"
17559"abort'.\n"
a0b6b246
JX
17560msgstr ""
17561"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
17562"交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
5c57d762 17563
349ede6a 17564#: builtin/notes.c:897 builtin/tag.c:546
d46c5519
JX
17565#, c-format
17566msgid "Failed to resolve '%s' as a valid ref."
17567msgstr "无法解析 '%s' 为一个有效引用。"
17568
06991777 17569#: builtin/notes.c:900
ef317cd5
JX
17570#, c-format
17571msgid "Object %s has no note\n"
17572msgstr "对象 %s 没有注解\n"
17573
06991777 17574#: builtin/notes.c:912
ef317cd5 17575msgid "attempt to remove non-existent note is not an error"
07432cef 17576msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 17577
06991777 17578#: builtin/notes.c:915
ef317cd5 17579msgid "read object names from the standard input"
07432cef 17580msgstr "从标准输入读取对象名称"
ef317cd5 17581
7157c2b5 17582#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220
5c57d762
JX
17583msgid "do not remove, show only"
17584msgstr "不删除,只显示"
17585
06991777 17586#: builtin/notes.c:955
5c57d762
JX
17587msgid "report pruned notes"
17588msgstr "报告清除的注解"
17589
06991777 17590#: builtin/notes.c:998
6c94aba5 17591msgid "notes-ref"
07432cef 17592msgstr "注解引用"
ef317cd5 17593
06991777 17594#: builtin/notes.c:999
814ff314 17595msgid "use notes from <notes-ref>"
07432cef 17596msgstr "从 <注解引用> 使用注解"
ef317cd5 17597
d9488fea 17598#: builtin/notes.c:1034 builtin/stash.c:1605
ef317cd5 17599#, c-format
a0b6b246 17600msgid "unknown subcommand: %s"
ef317cd5
JX
17601msgstr "未知子命令:%s"
17602
d9488fea 17603#: builtin/pack-objects.c:54
1b7f4a34
JX
17604msgid ""
17605"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
17606msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
ef317cd5 17607
d9488fea 17608#: builtin/pack-objects.c:55
1b7f4a34
JX
17609msgid ""
17610"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
58b6f078 17611msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
ef317cd5 17612
d9488fea 17613#: builtin/pack-objects.c:443
ef317cd5 17614#, c-format
c1ac5258
JX
17615msgid "bad packed object CRC for %s"
17616msgstr "%s 错的包对象 CRC"
17617
d9488fea 17618#: builtin/pack-objects.c:454
c1ac5258
JX
17619#, c-format
17620msgid "corrupt packed object for %s"
17621msgstr "%s 损坏的包对象"
17622
d9488fea 17623#: builtin/pack-objects.c:585
c1ac5258
JX
17624#, c-format
17625msgid "recursive delta detected for object %s"
17626msgstr "发现对象 %s 递归 delta"
17627
d9488fea 17628#: builtin/pack-objects.c:796
c1ac5258
JX
17629#, c-format
17630msgid "ordered %u objects, expected %<PRIu32>"
17631msgstr "排序了 %u 个对象,预期 %<PRIu32> 个"
17632
d9488fea 17633#: builtin/pack-objects.c:1004
5b04ee3b
JX
17634msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
17635msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
17636
d9488fea 17637#: builtin/pack-objects.c:1017
6c94aba5
JX
17638msgid "Writing objects"
17639msgstr "写入对象中"
17640
d9488fea 17641#: builtin/pack-objects.c:1078 builtin/update-index.c:90
c1ac5258
JX
17642#, c-format
17643msgid "failed to stat %s"
17644msgstr "对 %s 调用 stat 失败"
17645
d9488fea 17646#: builtin/pack-objects.c:1131
c1ac5258
JX
17647#, c-format
17648msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
17649msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
17650
d9488fea 17651#: builtin/pack-objects.c:1348
6c94aba5
JX
17652msgid "disabling bitmap writing, as some objects are not being packed"
17653msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
17654
d9488fea 17655#: builtin/pack-objects.c:1796
c1ac5258
JX
17656#, c-format
17657msgid "delta base offset overflow in pack for %s"
17658msgstr "%s 压缩中 delta 基准偏移越界"
17659
d9488fea 17660#: builtin/pack-objects.c:1805
c1ac5258
JX
17661#, c-format
17662msgid "delta base offset out of bound for %s"
17663msgstr "%s 的 delta 基准偏移越界"
17664
d9488fea 17665#: builtin/pack-objects.c:2086
fd8cb379
JX
17666msgid "Counting objects"
17667msgstr "对象计数中"
17668
d9488fea 17669#: builtin/pack-objects.c:2231
fd8cb379
JX
17670#, c-format
17671msgid "unable to parse object header of %s"
17672msgstr "无法解析对象 %s 头信息"
17673
d9488fea
JX
17674#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317
17675#: builtin/pack-objects.c:2327
c1ac5258
JX
17676#, c-format
17677msgid "object %s cannot be read"
17678msgstr "对象 %s 无法读取"
17679
d9488fea 17680#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331
c1ac5258 17681#, c-format
4c27fcb5
JX
17682msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
17683msgstr "对象 %s 不一致的对象长度(%<PRIuMAX> vs %<PRIuMAX>)"
c1ac5258 17684
d9488fea 17685#: builtin/pack-objects.c:2341
c1ac5258
JX
17686msgid "suboptimal pack - out of memory"
17687msgstr "次优(suboptimal)打包 - 内存不足"
17688
d9488fea 17689#: builtin/pack-objects.c:2656
c1ac5258
JX
17690#, c-format
17691msgid "Delta compression using up to %d threads"
17692msgstr "使用 %d 个线程进行压缩"
17693
d9488fea 17694#: builtin/pack-objects.c:2795
c1ac5258
JX
17695#, c-format
17696msgid "unable to pack objects reachable from tag %s"
17697msgstr "无法为标签 %s 压缩对象"
17698
d9488fea 17699#: builtin/pack-objects.c:2883
6c94aba5
JX
17700msgid "Compressing objects"
17701msgstr "压缩对象中"
17702
d9488fea 17703#: builtin/pack-objects.c:2889
c1ac5258
JX
17704msgid "inconsistency with delta count"
17705msgstr "不一致的差异计数"
17706
d9488fea 17707#: builtin/pack-objects.c:2961
7157c2b5
JX
17708#, c-format
17709msgid ""
17710"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
17711"hash> <uri>' (got '%s')"
d9488fea
JX
17712msgstr ""
17713"uploadpack.blobpackfileuri 的取值必须是 '<object-hash> <pack-hash> <uri>' 格"
17714"式(得到 '%s')"
7157c2b5 17715
d9488fea 17716#: builtin/pack-objects.c:2964
7157c2b5
JX
17717#, c-format
17718msgid ""
17719"object already configured in another uploadpack.blobpackfileuri (got '%s')"
17720msgstr "对象已经在另外的 uploadpack.blobpackfileuri 中配置(得到 '%s')"
17721
d9488fea 17722#: builtin/pack-objects.c:2993
c1ac5258
JX
17723#, c-format
17724msgid ""
17725"expected edge object ID, got garbage:\n"
17726" %s"
17727msgstr ""
17728"预期边界对象(edge object)ID,却得到垃圾数据:\n"
17729" %s"
17730
d9488fea 17731#: builtin/pack-objects.c:2999
c1ac5258
JX
17732#, c-format
17733msgid ""
17734"expected object ID, got garbage:\n"
17735" %s"
17736msgstr ""
17737"预期对象 ID,却得到垃圾数据:\n"
17738" %s"
17739
d9488fea 17740#: builtin/pack-objects.c:3097
5809aa05
JX
17741msgid "invalid value for --missing"
17742msgstr "选项 --missing 的值无效"
17743
d9488fea 17744#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264
c1ac5258
JX
17745msgid "cannot open pack index"
17746msgstr "无法打开包文件索引"
17747
d9488fea 17748#: builtin/pack-objects.c:3187
c1ac5258
JX
17749#, c-format
17750msgid "loose object at %s could not be examined"
17751msgstr "无法检查 %s 处的松散对象"
17752
d9488fea 17753#: builtin/pack-objects.c:3272
c1ac5258
JX
17754msgid "unable to force loose object"
17755msgstr "无法强制松散对象"
17756
d9488fea 17757#: builtin/pack-objects.c:3365
c1ac5258
JX
17758#, c-format
17759msgid "not a rev '%s'"
17760msgstr "不是一个版本 '%s'"
17761
d9488fea 17762#: builtin/pack-objects.c:3368
c1ac5258
JX
17763#, c-format
17764msgid "bad revision '%s'"
17765msgstr "坏的版本 '%s'"
17766
d9488fea 17767#: builtin/pack-objects.c:3393
c1ac5258
JX
17768msgid "unable to add recent objects"
17769msgstr "无法添加最近的对象"
17770
d9488fea 17771#: builtin/pack-objects.c:3446
ef317cd5
JX
17772#, c-format
17773msgid "unsupported index version %s"
17774msgstr "不支持的索引版本 %s"
17775
d9488fea 17776#: builtin/pack-objects.c:3450
ef317cd5
JX
17777#, c-format
17778msgid "bad index version '%s'"
17779msgstr "坏的索引版本 '%s'"
17780
d9488fea 17781#: builtin/pack-objects.c:3488
c1ac5258
JX
17782msgid "<version>[,<offset>]"
17783msgstr "<版本>[,<偏移>]"
ef317cd5 17784
d9488fea 17785#: builtin/pack-objects.c:3489
ef317cd5 17786msgid "write the pack index file in the specified idx format version"
07432cef 17787msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 17788
d9488fea 17789#: builtin/pack-objects.c:3492
ef317cd5 17790msgid "maximum size of each output pack file"
07432cef 17791msgstr "每个输出包的最大尺寸"
ef317cd5 17792
d9488fea 17793#: builtin/pack-objects.c:3494
ef317cd5 17794msgid "ignore borrowed objects from alternate object store"
160fb2b2 17795msgstr "忽略从备用对象存储里借用对象"
ef317cd5 17796
d9488fea 17797#: builtin/pack-objects.c:3496
ef317cd5 17798msgid "ignore packed objects"
07432cef 17799msgstr "忽略包对象"
ef317cd5 17800
d9488fea 17801#: builtin/pack-objects.c:3498
ef317cd5 17802msgid "limit pack window by objects"
07432cef 17803msgstr "限制打包窗口的对象数"
ef317cd5 17804
d9488fea 17805#: builtin/pack-objects.c:3500
ef317cd5 17806msgid "limit pack window by memory in addition to object limit"
07432cef 17807msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 17808
d9488fea 17809#: builtin/pack-objects.c:3502
ef317cd5 17810msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 17811msgstr "打包允许的 delta 链的最大长度"
ef317cd5 17812
d9488fea 17813#: builtin/pack-objects.c:3504
ef317cd5 17814msgid "reuse existing deltas"
07432cef 17815msgstr "重用已存在的 deltas"
ef317cd5 17816
d9488fea 17817#: builtin/pack-objects.c:3506
ef317cd5 17818msgid "reuse existing objects"
07432cef 17819msgstr "重用已存在的对象"
ef317cd5 17820
d9488fea 17821#: builtin/pack-objects.c:3508
ef317cd5 17822msgid "use OFS_DELTA objects"
07432cef 17823msgstr "使用 OFS_DELTA 对象"
ef317cd5 17824
d9488fea 17825#: builtin/pack-objects.c:3510
ef317cd5 17826msgid "use threads when searching for best delta matches"
07432cef 17827msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 17828
d9488fea 17829#: builtin/pack-objects.c:3512
ef317cd5 17830msgid "do not create an empty pack output"
07432cef 17831msgstr "不创建空的包输出"
ef317cd5 17832
d9488fea 17833#: builtin/pack-objects.c:3514
ef317cd5 17834msgid "read revision arguments from standard input"
d9d56b23 17835msgstr "从标准输入读取版本号参数"
ef317cd5 17836
d9488fea 17837#: builtin/pack-objects.c:3516
ef317cd5 17838msgid "limit the objects to those that are not yet packed"
07432cef 17839msgstr "限制那些尚未打包的对象"
ef317cd5 17840
d9488fea 17841#: builtin/pack-objects.c:3519
ef317cd5 17842msgid "include objects reachable from any reference"
07432cef 17843msgstr "包括可以从任何引用访问到的对象"
ef317cd5 17844
d9488fea 17845#: builtin/pack-objects.c:3522
ef317cd5 17846msgid "include objects referred by reflog entries"
07432cef 17847msgstr "包括被引用日志引用到的对象"
ef317cd5 17848
d9488fea 17849#: builtin/pack-objects.c:3525
220c313c
JX
17850msgid "include objects referred to by the index"
17851msgstr "包括被索引引用到的对象"
17852
d9488fea 17853#: builtin/pack-objects.c:3528
ef317cd5 17854msgid "output pack to stdout"
07432cef 17855msgstr "输出包到标准输出"
ef317cd5 17856
d9488fea 17857#: builtin/pack-objects.c:3530
ef317cd5 17858msgid "include tag objects that refer to objects to be packed"
53438e8f 17859msgstr "包括那些引用了待打包对象的标签对象"
ef317cd5 17860
d9488fea 17861#: builtin/pack-objects.c:3532
ef317cd5 17862msgid "keep unreachable objects"
07432cef 17863msgstr "维持不可达的对象"
ef317cd5 17864
d9488fea 17865#: builtin/pack-objects.c:3534
5c57d762
JX
17866msgid "pack loose unreachable objects"
17867msgstr "打包松散的不可达对象"
17868
d9488fea 17869#: builtin/pack-objects.c:3536
ef317cd5 17870msgid "unpack unreachable objects newer than <time>"
07432cef 17871msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 17872
d9488fea 17873#: builtin/pack-objects.c:3539
06991777
JX
17874msgid "use the sparse reachability algorithm"
17875msgstr "使用稀疏可达性算法"
17876
d9488fea 17877#: builtin/pack-objects.c:3541
ef317cd5 17878msgid "create thin packs"
07432cef 17879msgstr "创建精简包"
ef317cd5 17880
d9488fea 17881#: builtin/pack-objects.c:3543
04cb2f28 17882msgid "create packs suitable for shallow fetches"
160fb2b2 17883msgstr "创建适合浅克隆仓库获取的包"
04cb2f28 17884
d9488fea 17885#: builtin/pack-objects.c:3545
ef317cd5 17886msgid "ignore packs that have companion .keep file"
07432cef 17887msgstr "忽略配有 .keep 文件的包"
ef317cd5 17888
d9488fea 17889#: builtin/pack-objects.c:3547
fd8cb379
JX
17890msgid "ignore this pack"
17891msgstr "忽略该 pack"
17892
d9488fea 17893#: builtin/pack-objects.c:3549
ef317cd5 17894msgid "pack compression level"
07432cef 17895msgstr "打包压缩级别"
ef317cd5 17896
d9488fea 17897#: builtin/pack-objects.c:3551
ef317cd5 17898msgid "do not hide commits by grafts"
fd8cb379 17899msgstr "显示被移植隐藏的提交"
ef317cd5 17900
d9488fea 17901#: builtin/pack-objects.c:3553
6c94aba5
JX
17902msgid "use a bitmap index if available to speed up counting objects"
17903msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
17904
d9488fea 17905#: builtin/pack-objects.c:3555
6c94aba5
JX
17906msgid "write a bitmap index together with the pack index"
17907msgstr "在建立包索引的同时创建 bitmap 索引"
17908
d9488fea 17909#: builtin/pack-objects.c:3559
a6cd2cc4
JX
17910msgid "write a bitmap index if possible"
17911msgstr "如果可能,写 bitmap 索引"
17912
d9488fea 17913#: builtin/pack-objects.c:3563
5809aa05
JX
17914msgid "handling for missing objects"
17915msgstr "处理丢失的对象"
17916
d9488fea 17917#: builtin/pack-objects.c:3566
31e5e17b
JX
17918msgid "do not pack objects in promisor packfiles"
17919msgstr "不要打包 promisor 包文件中的对象"
17920
d9488fea 17921#: builtin/pack-objects.c:3568
4c27fcb5
JX
17922msgid "respect islands during delta compression"
17923msgstr "在增量压缩时参考数据岛"
17924
d9488fea 17925#: builtin/pack-objects.c:3570
7157c2b5
JX
17926msgid "protocol"
17927msgstr "协议"
17928
d9488fea 17929#: builtin/pack-objects.c:3571
7157c2b5
JX
17930msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
17931msgstr "使用此协议排除任何已配置的 uploadpack.blobpackfileuri"
17932
d9488fea 17933#: builtin/pack-objects.c:3600
fd8cb379
JX
17934#, c-format
17935msgid "delta chain depth %d is too deep, forcing %d"
17936msgstr "增量链深度 %d 太深了,强制为 %d"
17937
d9488fea 17938#: builtin/pack-objects.c:3605
fd8cb379
JX
17939#, c-format
17940msgid "pack.deltaCacheLimit is too high, forcing %d"
17941msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d"
6c94aba5 17942
d9488fea 17943#: builtin/pack-objects.c:3659
c1ac5258
JX
17944msgid "--max-pack-size cannot be used to build a pack for transfer"
17945msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
17946
d9488fea 17947#: builtin/pack-objects.c:3661
c1ac5258 17948msgid "minimum pack size limit is 1 MiB"
e640d114 17949msgstr "最小的包文件大小是 1 MiB"
c1ac5258 17950
d9488fea 17951#: builtin/pack-objects.c:3666
c1ac5258
JX
17952msgid "--thin cannot be used to build an indexable pack"
17953msgstr "--thin 不能用于创建一个可索引包"
17954
d9488fea 17955#: builtin/pack-objects.c:3669
c1ac5258
JX
17956msgid "--keep-unreachable and --unpack-unreachable are incompatible"
17957msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
17958
d9488fea 17959#: builtin/pack-objects.c:3675
c1ac5258 17960msgid "cannot use --filter without --stdout"
e640d114 17961msgstr "不能在没有 --stdout 的情况下使用 --filter"
c1ac5258 17962
d9488fea 17963#: builtin/pack-objects.c:3735
fd8cb379 17964msgid "Enumerating objects"
d9488fea 17965msgstr "枚举对象中"
fd8cb379 17966
d9488fea 17967#: builtin/pack-objects.c:3766
c1ac5258 17968#, c-format
2b472aae
JX
17969msgid ""
17970"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
17971"reused %<PRIu32>"
17972msgstr ""
17973"总共 %<PRIu32>(差异 %<PRIu32>),复用 %<PRIu32>(差异 %<PRIu32>),包复用 "
17974"%<PRIu32>"
c1ac5258 17975
d46c5519 17976#: builtin/pack-refs.c:8
814ff314
JX
17977msgid "git pack-refs [<options>]"
17978msgstr "git pack-refs [<选项>]"
c04f5ac3 17979
d46c5519 17980#: builtin/pack-refs.c:16
ef317cd5 17981msgid "pack everything"
07432cef 17982msgstr "打包一切"
c04f5ac3 17983
d46c5519 17984#: builtin/pack-refs.c:17
ef317cd5 17985msgid "prune loose refs (default)"
07432cef 17986msgstr "清除松散的引用(默认)"
c04f5ac3 17987
349ede6a 17988#: builtin/prune-packed.c:6
814ff314
JX
17989msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
17990msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
6792b93b 17991
349ede6a 17992#: builtin/prune.c:14
5809aa05
JX
17993msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
17994msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
7ac1c0ad 17995
349ede6a 17996#: builtin/prune.c:133
1b7f4a34
JX
17997msgid "report pruned objects"
17998msgstr "报告清除的对象"
17999
349ede6a 18000#: builtin/prune.c:136
1b7f4a34
JX
18001msgid "expire objects older than <time>"
18002msgstr "使早于给定时间的对象过期"
18003
349ede6a 18004#: builtin/prune.c:138
31e5e17b
JX
18005msgid "limit traversal to objects outside promisor packfiles"
18006msgstr "限制遍历 promisor 包以外的对象"
18007
349ede6a 18008#: builtin/prune.c:152
94550ed3
JX
18009msgid "cannot prune in a precious-objects repo"
18010msgstr "不能在珍品仓库中执行清理操作"
18011
2b472aae 18012#: builtin/pull.c:45 builtin/pull.c:47
a0b6b246
JX
18013#, c-format
18014msgid "Invalid value for %s: %s"
18015msgstr "%s 的值无效:%s"
18016
2b472aae 18017#: builtin/pull.c:67
94550ed3 18018msgid "git pull [<options>] [<repository> [<refspec>...]]"
1b7f4a34
JX
18019msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
18020
349ede6a 18021#: builtin/pull.c:123
a4f16749
JX
18022msgid "control for recursive fetching of submodules"
18023msgstr "控制子模组的递归获取"
18024
349ede6a 18025#: builtin/pull.c:127
1b7f4a34
JX
18026msgid "Options related to merging"
18027msgstr "和合并相关的选项"
18028
349ede6a 18029#: builtin/pull.c:130
1b7f4a34
JX
18030msgid "incorporate changes by rebasing rather than merging"
18031msgstr "使用变基操作取代合并操作以合入修改"
18032
d9488fea 18033#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126
1b7f4a34
JX
18034msgid "allow fast-forward"
18035msgstr "允许快进式"
18036
349ede6a
JX
18037#: builtin/pull.c:167 parse-options.h:339
18038msgid "automatically stash/stash pop before and after"
18039msgstr "在操作前后执行自动贮藏和弹出贮藏"
5b04ee3b 18040
349ede6a 18041#: builtin/pull.c:183
1b7f4a34
JX
18042msgid "Options related to fetching"
18043msgstr "和获取相关的参数"
18044
349ede6a 18045#: builtin/pull.c:193
4c27fcb5
JX
18046msgid "force overwrite of local branch"
18047msgstr "强制覆盖本地分支"
18048
349ede6a 18049#: builtin/pull.c:201
276ceeaa
JX
18050msgid "number of submodules pulled in parallel"
18051msgstr "并发拉取的子模组的数量"
18052
349ede6a 18053#: builtin/pull.c:317
1b7f4a34
JX
18054#, c-format
18055msgid "Invalid value for pull.ff: %s"
18056msgstr "pull.ff 的取值无效:%s"
18057
d9488fea 18058#: builtin/pull.c:348
349ede6a
JX
18059msgid ""
18060"Pulling without specifying how to reconcile divergent branches is\n"
18061"discouraged. You can squelch this message by running one of the following\n"
18062"commands sometime before your next pull:\n"
18063"\n"
18064" git config pull.rebase false # merge (the default strategy)\n"
18065" git config pull.rebase true # rebase\n"
18066" git config pull.ff only # fast-forward only\n"
18067"\n"
18068"You can replace \"git config\" with \"git config --global\" to set a "
18069"default\n"
18070"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
18071"or --ff-only on the command line to override the configured default per\n"
18072"invocation.\n"
18073msgstr ""
18074"不建议在没有为偏离分支指定合并策略时执行 pull 操作。 您可以在执行下一次\n"
18075"pull 操作之前执行下面一条命令来抑制本消息:\n"
18076"\n"
18077" git config pull.rebase false # 合并(缺省策略)\n"
18078" git config pull.rebase true # 变基\n"
18079" git config pull.ff only # 仅快进\n"
18080"\n"
18081"您可以将 \"git config\" 替换为 \"git config --global\" 以便为所有仓库设置\n"
18082"缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase,\n"
18083"或者 --ff-only 参数覆盖缺省设置。\n"
18084
d9488fea 18085#: builtin/pull.c:458
1b7f4a34
JX
18086msgid ""
18087"There is no candidate for rebasing against among the refs that you just "
18088"fetched."
18089msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
18090
d9488fea 18091#: builtin/pull.c:460
1b7f4a34
JX
18092msgid ""
18093"There are no candidates for merging among the refs that you just fetched."
18094msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
18095
d9488fea 18096#: builtin/pull.c:461
1b7f4a34
JX
18097msgid ""
18098"Generally this means that you provided a wildcard refspec which had no\n"
18099"matches on the remote end."
18100msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
18101
d9488fea 18102#: builtin/pull.c:464
1b7f4a34
JX
18103#, c-format
18104msgid ""
18105"You asked to pull from the remote '%s', but did not specify\n"
18106"a branch. Because this is not the default configured remote\n"
18107"for your current branch, you must specify a branch on the command line."
18108msgstr ""
18109"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
18110"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
18111
d9488fea 18112#: builtin/pull.c:469 builtin/rebase.c:1240 git-parse-remote.sh:73
1b7f4a34
JX
18113msgid "You are not currently on a branch."
18114msgstr "您当前不在一个分支上。"
18115
d9488fea 18116#: builtin/pull.c:471 builtin/pull.c:486 git-parse-remote.sh:79
1b7f4a34
JX
18117msgid "Please specify which branch you want to rebase against."
18118msgstr "请指定您要变基到哪一个分支。"
18119
d9488fea 18120#: builtin/pull.c:473 builtin/pull.c:488 git-parse-remote.sh:82
1b7f4a34
JX
18121msgid "Please specify which branch you want to merge with."
18122msgstr "请指定您要合并哪一个分支。"
18123
d9488fea 18124#: builtin/pull.c:474 builtin/pull.c:489
1b7f4a34
JX
18125msgid "See git-pull(1) for details."
18126msgstr "详见 git-pull(1)。"
18127
d9488fea
JX
18128#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491
18129#: builtin/rebase.c:1246 git-parse-remote.sh:64
5b04ee3b
JX
18130msgid "<remote>"
18131msgstr "<远程>"
18132
d9488fea 18133#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496
d46c5519 18134#: git-parse-remote.sh:65
5b04ee3b
JX
18135msgid "<branch>"
18136msgstr "<分支>"
18137
d9488fea 18138#: builtin/pull.c:484 builtin/rebase.c:1238 git-parse-remote.sh:75
1b7f4a34
JX
18139msgid "There is no tracking information for the current branch."
18140msgstr "当前分支没有跟踪信息。"
18141
d9488fea 18142#: builtin/pull.c:493 git-parse-remote.sh:95
1b7f4a34 18143msgid ""
5b04ee3b
JX
18144"If you wish to set tracking information for this branch you can do so with:"
18145msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
7ac1c0ad 18146
d9488fea 18147#: builtin/pull.c:498
1b7f4a34
JX
18148#, c-format
18149msgid ""
18150"Your configuration specifies to merge with the ref '%s'\n"
18151"from the remote, but no such ref was fetched."
18152msgstr ""
18153"您的配置中指定要合并远程的引用 '%s',\n"
18154"但是没有获取到这个引用。"
7ac1c0ad 18155
d9488fea 18156#: builtin/pull.c:609
4c27fcb5
JX
18157#, c-format
18158msgid "unable to access commit %s"
18159msgstr "无法访问提交 %s"
18160
d9488fea 18161#: builtin/pull.c:894
5c57d762
JX
18162msgid "ignoring --verify-signatures for rebase"
18163msgstr "为变基操作忽略 --verify-signatures"
18164
d9488fea 18165#: builtin/pull.c:954
1b7f4a34
JX
18166msgid "Updating an unborn branch with changes added to the index."
18167msgstr "更新尚未诞生的分支,变更添加至索引。"
18168
d9488fea 18169#: builtin/pull.c:958
a0b6b246
JX
18170msgid "pull with rebase"
18171msgstr "变基式拉取"
18172
d9488fea 18173#: builtin/pull.c:959
a0b6b246 18174msgid "please commit or stash them."
554e8501 18175msgstr "请提交或贮藏它们。"
a0b6b246 18176
d9488fea 18177#: builtin/pull.c:984
1b7f4a34
JX
18178#, c-format
18179msgid ""
18180"fetch updated the current branch head.\n"
18181"fast-forwarding your working tree from\n"
18182"commit %s."
18183msgstr ""
18184"fetch 更新了当前的分支。快进您的工作区\n"
18185"至提交 %s。"
ef317cd5 18186
d9488fea 18187#: builtin/pull.c:990
1b7f4a34
JX
18188#, c-format
18189msgid ""
18190"Cannot fast-forward your working tree.\n"
18191"After making sure that you saved anything precious from\n"
18192"$ git diff %s\n"
18193"output, run\n"
18194"$ git reset --hard\n"
18195"to recover."
18196msgstr ""
18197"您当前的工作区无法执行快进操作。\n"
18198"首先执行如下命令:\n"
18199"$ git diff %s\n"
18200"以确认所有有用的数据均已保存。然后执行下面的命令\n"
18201"$ git reset --hard\n"
18202"恢复之前的状态。"
18203
d9488fea 18204#: builtin/pull.c:1005
1b7f4a34
JX
18205msgid "Cannot merge multiple branches into empty head."
18206msgstr "无法将多个分支合并到空分支。"
18207
d9488fea 18208#: builtin/pull.c:1009
1b7f4a34
JX
18209msgid "Cannot rebase onto multiple branches."
18210msgstr "无法变基到多个分支。"
18211
d9488fea 18212#: builtin/pull.c:1017
a4f16749
JX
18213msgid "cannot rebase with locally recorded submodule modifications"
18214msgstr "本地子模组中有修改,无法变基"
18215
fd8cb379 18216#: builtin/push.c:19
ef317cd5 18217msgid "git push [<options>] [<repository> [<refspec>...]]"
160fb2b2 18218msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
7ac1c0ad 18219
d9488fea 18220#: builtin/push.c:111
c04f5ac3 18221msgid "tag shorthand without <tag>"
55a16ee4 18222msgstr "标签后面未提供 <标签> 参数"
c04f5ac3 18223
d9488fea 18224#: builtin/push.c:119
c04f5ac3 18225msgid "--delete only accepts plain target ref names"
90e6ef53 18226msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 18227
d9488fea 18228#: builtin/push.c:164
8ada9598
JX
18229msgid ""
18230"\n"
18231"To choose either option permanently, see push.default in 'git help config'."
18232msgstr ""
81809b99
JX
18233"\n"
18234"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 18235
d9488fea 18236#: builtin/push.c:167
8ada9598
JX
18237#, c-format
18238msgid ""
18239"The upstream branch of your current branch does not match\n"
18240"the name of your current branch. To push to the upstream branch\n"
18241"on the remote, use\n"
18242"\n"
18243" git push %s HEAD:%s\n"
18244"\n"
18245"To push to the branch of the same name on the remote, use\n"
18246"\n"
4c27fcb5 18247" git push %s HEAD\n"
8ada9598
JX
18248"%s"
18249msgstr ""
4c27fcb5
JX
18250"您当前分支的上游分支和您当前分支名不匹配,为推送到远程的上游分支,\n"
18251"使用\n"
81809b99
JX
18252"\n"
18253" git push %s HEAD:%s\n"
18254"\n"
18255"为推送至远程同名分支,使用\n"
18256"\n"
4c27fcb5 18257" git push %s HEAD\n"
81809b99 18258"%s"
8ada9598 18259
d9488fea 18260#: builtin/push.c:182
c04f5ac3
JX
18261#, c-format
18262msgid ""
18263"You are not currently on a branch.\n"
18264"To push the history leading to the current (detached HEAD)\n"
18265"state now, use\n"
18266"\n"
18267" git push %s HEAD:<name-of-remote-branch>\n"
18268msgstr ""
18269"您当前不在一个分支上。\n"
90e6ef53 18270"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3 18271"\n"
d9d56b23 18272" git push %s HEAD:<远程分支名字>\n"
c04f5ac3 18273
d9488fea 18274#: builtin/push.c:194
c04f5ac3
JX
18275#, c-format
18276msgid ""
18277"The current branch %s has no upstream branch.\n"
18278"To push the current branch and set the remote as upstream, use\n"
18279"\n"
18280" git push --set-upstream %s %s\n"
18281msgstr ""
18282"当前分支 %s 没有对应的上游分支。\n"
18283"为推送当前分支并建立与远程上游的跟踪,使用\n"
18284"\n"
18285" git push --set-upstream %s %s\n"
18286
d9488fea 18287#: builtin/push.c:202
c04f5ac3
JX
18288#, c-format
18289msgid "The current branch %s has multiple upstream branches, refusing to push."
18290msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
18291
d9488fea 18292#: builtin/push.c:205
73a60cd2
JX
18293#, c-format
18294msgid ""
18295"You are pushing to remote '%s', which is not the upstream of\n"
18296"your current branch '%s', without telling me what to push\n"
18297"to update which remote branch."
18298msgstr ""
18299"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
18300"而没有告诉我要推送什么、更新哪个远程分支。"
18301
d9488fea 18302#: builtin/push.c:260
c04f5ac3
JX
18303msgid ""
18304"You didn't specify any refspecs to push, and push.default is \"nothing\"."
160fb2b2 18305msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
c04f5ac3 18306
d9488fea 18307#: builtin/push.c:267
170e9899
JX
18308msgid ""
18309"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
18310"its remote counterpart. Integrate the remote changes (e.g.\n"
18311"'git pull ...') before pushing again.\n"
170e9899
JX
18312"See the 'Note about fast-forwards' in 'git push --help' for details."
18313msgstr ""
eff6d3a9 18314"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 18315"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 18316"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 18317
d9488fea 18318#: builtin/push.c:273
170e9899
JX
18319msgid ""
18320"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
18321"counterpart. Check out this branch and integrate the remote changes\n"
18322"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
18323"See the 'Note about fast-forwards' in 'git push --help' for details."
18324msgstr ""
eff6d3a9 18325"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 18326"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 18327"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 18328
d9488fea 18329#: builtin/push.c:279
07432cef 18330msgid ""
a77c07d9
JX
18331"Updates were rejected because the remote contains work that you do\n"
18332"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
18333"to the same ref. You may want to first integrate the remote changes\n"
18334"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
18335"See the 'Note about fast-forwards' in 'git push --help' for details."
18336msgstr ""
160fb2b2
JX
18337"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
18338"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
2e8451e8 18339"(如 'git pull ...')。\n"
a77c07d9
JX
18340"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
18341
d9488fea 18342#: builtin/push.c:286
a77c07d9 18343msgid "Updates were rejected because the tag already exists in the remote."
55a16ee4 18344msgstr "更新被拒绝,因为该标签在远程已经存在。"
a77c07d9 18345
d9488fea 18346#: builtin/push.c:289
a77c07d9
JX
18347msgid ""
18348"You cannot update a remote ref that points at a non-commit object,\n"
18349"or update a remote ref to make it point at a non-commit object,\n"
18350"without using the '--force' option.\n"
18351msgstr ""
18352"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
18353"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 18354
d9488fea 18355#: builtin/push.c:351
c04f5ac3
JX
18356#, c-format
18357msgid "Pushing to %s\n"
18358msgstr "推送到 %s\n"
18359
d9488fea 18360#: builtin/push.c:358
c04f5ac3
JX
18361#, c-format
18362msgid "failed to push some refs to '%s'"
c1ac5258 18363msgstr "推送一些引用到 '%s' 失败"
c04f5ac3 18364
d9488fea 18365#: builtin/push.c:532
ef317cd5 18366msgid "repository"
160fb2b2 18367msgstr "仓库"
ef317cd5 18368
d9488fea 18369#: builtin/push.c:533 builtin/send-pack.c:183
ef317cd5 18370msgid "push all refs"
07432cef 18371msgstr "推送所有引用"
ef317cd5 18372
d9488fea 18373#: builtin/push.c:534 builtin/send-pack.c:185
ef317cd5 18374msgid "mirror all refs"
07432cef 18375msgstr "镜像所有引用"
ef317cd5 18376
d9488fea 18377#: builtin/push.c:536
ef317cd5 18378msgid "delete refs"
07432cef 18379msgstr "删除引用"
ef317cd5 18380
d9488fea 18381#: builtin/push.c:537
ef317cd5 18382msgid "push tags (can't be used with --all or --mirror)"
55a16ee4 18383msgstr "推送标签(不能使用 --all or --mirror)"
ef317cd5 18384
d9488fea 18385#: builtin/push.c:540 builtin/send-pack.c:186
ef317cd5
JX
18386msgid "force updates"
18387msgstr "强制更新"
18388
d9488fea 18389#: builtin/push.c:541 builtin/send-pack.c:198
c1ac5258
JX
18390msgid "<refname>:<expect>"
18391msgstr "<引用名>:<期望值>"
90314792 18392
d9488fea 18393#: builtin/push.c:542 builtin/send-pack.c:199
90314792
JX
18394msgid "require old value of ref to be at this value"
18395msgstr "要求引用旧的取值为设定值"
18396
d9488fea 18397#: builtin/push.c:545
ef317cd5 18398msgid "control recursive pushing of submodules"
07432cef 18399msgstr "控制子模组的递归推送"
ef317cd5 18400
d9488fea 18401#: builtin/push.c:546 builtin/send-pack.c:193
ef317cd5 18402msgid "use thin pack"
07432cef 18403msgstr "使用精简打包"
ef317cd5 18404
d9488fea
JX
18405#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180
18406#: builtin/send-pack.c:181
ef317cd5 18407msgid "receive pack program"
07432cef 18408msgstr "接收包程序"
ef317cd5 18409
d9488fea 18410#: builtin/push.c:549
ef317cd5 18411msgid "set upstream for git pull/status"
07432cef 18412msgstr "设置 git pull/status 的上游"
ef317cd5 18413
d9488fea 18414#: builtin/push.c:552
ef317cd5 18415msgid "prune locally removed refs"
07432cef 18416msgstr "清除本地删除的引用"
ef317cd5 18417
d9488fea 18418#: builtin/push.c:554
a77c07d9
JX
18419msgid "bypass pre-push hook"
18420msgstr "绕过 pre-push 钩子"
18421
d9488fea 18422#: builtin/push.c:555
1003b3a5 18423msgid "push missing but relevant tags"
55a16ee4 18424msgstr "推送缺失但有关的标签"
1003b3a5 18425
d9488fea 18426#: builtin/push.c:557 builtin/send-pack.c:187
220c313c
JX
18427msgid "GPG sign the push"
18428msgstr "用 GPG 为推送签名"
18429
d9488fea 18430#: builtin/push.c:559 builtin/send-pack.c:194
814ff314
JX
18431msgid "request atomic transaction on remote side"
18432msgstr "需要远端支持原子事务"
18433
d9488fea 18434#: builtin/push.c:577
c04f5ac3
JX
18435msgid "--delete is incompatible with --all, --mirror and --tags"
18436msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
18437
d9488fea 18438#: builtin/push.c:579
c04f5ac3
JX
18439msgid "--delete doesn't make sense without any refs"
18440msgstr "--delete 未接任何引用没有意义"
18441
d9488fea 18442#: builtin/push.c:599
a5cd71ca
JX
18443#, c-format
18444msgid "bad repository '%s'"
18445msgstr "坏的仓库 '%s'"
18446
d9488fea 18447#: builtin/push.c:600
a5cd71ca
JX
18448msgid ""
18449"No configured push destination.\n"
18450"Either specify the URL from the command-line or configure a remote "
18451"repository using\n"
18452"\n"
18453" git remote add <name> <url>\n"
18454"\n"
18455"and then push using the remote name\n"
18456"\n"
18457" git push <name>\n"
18458msgstr ""
18459"没有配置推送目标。\n"
18460"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
18461"\n"
18462" git remote add <名称> <地址>\n"
18463"\n"
18464"然后使用该远程仓库名执行推送\n"
18465"\n"
18466" git push <名称>\n"
18467
d9488fea 18468#: builtin/push.c:615
fd8cb379
JX
18469msgid "--all and --tags are incompatible"
18470msgstr "--all 和 --tags 不兼容"
18471
d9488fea 18472#: builtin/push.c:617
fd8cb379
JX
18473msgid "--all can't be combined with refspecs"
18474msgstr "--all 不能和引用规格同时使用"
18475
d9488fea 18476#: builtin/push.c:621
fd8cb379
JX
18477msgid "--mirror and --tags are incompatible"
18478msgstr "--mirror 和 --tags 不兼容"
18479
d9488fea 18480#: builtin/push.c:623
fd8cb379
JX
18481msgid "--mirror can't be combined with refspecs"
18482msgstr "--mirror 不能和引用规格同时使用"
18483
d9488fea 18484#: builtin/push.c:626
fd8cb379
JX
18485msgid "--all and --mirror are incompatible"
18486msgstr "--all 和 --mirror 不兼容"
18487
d9488fea 18488#: builtin/push.c:630
5c57d762
JX
18489msgid "push options must not have new line characters"
18490msgstr "推送选项不能有换行符"
18491
c1ac5258
JX
18492#: builtin/range-diff.c:8
18493msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
18494msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>"
18495
18496#: builtin/range-diff.c:9
18497msgid "git range-diff [<options>] <old-tip>...<new-tip>"
18498msgstr "git range-diff [<选项>] <old-tip>...<new-tip>"
18499
18500#: builtin/range-diff.c:10
18501msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
18502msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>"
18503
ddc12c42 18504#: builtin/range-diff.c:22
c1ac5258
JX
18505msgid "Percentage by which creation is weighted"
18506msgstr "创建权重的百分比"
18507
ddc12c42 18508#: builtin/range-diff.c:24
c1ac5258
JX
18509msgid "use simple diff colors"
18510msgstr "使用简单差异颜色"
18511
ddc12c42
JX
18512#: builtin/range-diff.c:26
18513msgid "notes"
18514msgstr "注解"
18515
18516#: builtin/range-diff.c:26
18517msgid "passed to 'git log'"
18518msgstr "传递给 'git log'"
18519
18520#: builtin/range-diff.c:50 builtin/range-diff.c:54
c1ac5258
JX
18521#, c-format
18522msgid "no .. in range: '%s'"
18523msgstr "没有在范围中使用 ..:'%s'"
18524
ddc12c42 18525#: builtin/range-diff.c:64
c1ac5258
JX
18526msgid "single arg format must be symmetric range"
18527msgstr "单个参数格式必须是对称范围(即包含...)"
18528
ddc12c42 18529#: builtin/range-diff.c:79
c1ac5258
JX
18530msgid "need two commit ranges"
18531msgstr "需要两个提交范围"
18532
06991777 18533#: builtin/read-tree.c:41
ef317cd5 18534msgid ""
1b7f4a34 18535"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
ef317cd5
JX
18536"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
18537"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
18538msgstr ""
1b7f4a34 18539"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
07432cef 18540"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
1b7f4a34 18541"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
ef317cd5 18542
06991777 18543#: builtin/read-tree.c:124
ef317cd5 18544msgid "write resulting index to <file>"
d9d56b23 18545msgstr "将索引结果写入 <文件>"
ef317cd5 18546
06991777 18547#: builtin/read-tree.c:127
ef317cd5 18548msgid "only empty the index"
07432cef 18549msgstr "只是清空索引"
ef317cd5 18550
06991777 18551#: builtin/read-tree.c:129
ef317cd5 18552msgid "Merging"
07432cef 18553msgstr "合并"
ef317cd5 18554
06991777 18555#: builtin/read-tree.c:131
ef317cd5 18556msgid "perform a merge in addition to a read"
07432cef 18557msgstr "读取之余再执行一个合并"
ef317cd5 18558
06991777 18559#: builtin/read-tree.c:133
ef317cd5 18560msgid "3-way merge if no file level merging required"
160fb2b2 18561msgstr "如果没有文件级合并需要,执行三方合并"
ef317cd5 18562
06991777 18563#: builtin/read-tree.c:135
ef317cd5 18564msgid "3-way merge in presence of adds and removes"
160fb2b2 18565msgstr "存在添加和删除时,也执行三方合并"
ef317cd5 18566
06991777 18567#: builtin/read-tree.c:137
ef317cd5 18568msgid "same as -m, but discard unmerged entries"
07432cef 18569msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 18570
06991777 18571#: builtin/read-tree.c:138
ef317cd5 18572msgid "<subdirectory>/"
07432cef 18573msgstr "<子目录>/"
ef317cd5 18574
06991777 18575#: builtin/read-tree.c:139
ef317cd5 18576msgid "read the tree into the index under <subdirectory>/"
07432cef 18577msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 18578
06991777 18579#: builtin/read-tree.c:142
ef317cd5 18580msgid "update working tree with merge result"
07432cef 18581msgstr "用合并的结果更新工作区"
ef317cd5 18582
06991777 18583#: builtin/read-tree.c:144
ef317cd5 18584msgid "gitignore"
07432cef 18585msgstr "gitignore"
ef317cd5 18586
06991777 18587#: builtin/read-tree.c:145
ef317cd5 18588msgid "allow explicitly ignored files to be overwritten"
07432cef 18589msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 18590
06991777 18591#: builtin/read-tree.c:148
ef317cd5 18592msgid "don't check the working tree after merging"
07432cef 18593msgstr "合并后不检查工作区"
ef317cd5 18594
06991777 18595#: builtin/read-tree.c:149
ef317cd5 18596msgid "don't update the index or the work tree"
07432cef 18597msgstr "不更新索引区和工作区"
ef317cd5 18598
06991777 18599#: builtin/read-tree.c:151
ef317cd5 18600msgid "skip applying sparse checkout filter"
07432cef 18601msgstr "跳过应用稀疏检出过滤器"
ef317cd5 18602
06991777 18603#: builtin/read-tree.c:153
ef317cd5 18604msgid "debug unpack-trees"
07432cef 18605msgstr "调试 unpack-trees"
ef317cd5 18606
d46c5519
JX
18607#: builtin/read-tree.c:157
18608msgid "suppress feedback messages"
18609msgstr "抑制反馈信息"
18610
ddc12c42
JX
18611#: builtin/read-tree.c:188
18612msgid "You need to resolve your current index first"
18613msgstr "您需要先解决当前索引的冲突"
18614
349ede6a 18615#: builtin/rebase.c:35
4c27fcb5 18616msgid ""
a5cd71ca
JX
18617"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
18618"[<upstream> [<branch>]]"
ddc12c42
JX
18619msgstr ""
18620"git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<"
18621"上游> [<分支>]]"
4c27fcb5 18622
349ede6a 18623#: builtin/rebase.c:37
4c27fcb5
JX
18624msgid ""
18625"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
18626msgstr ""
18627"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]"
18628
349ede6a 18629#: builtin/rebase.c:39
4c27fcb5
JX
18630msgid "git rebase --continue | --abort | --skip | --edit-todo"
18631msgstr "git rebase --continue | --abort | --skip | --edit-todo"
18632
d9488fea 18633#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238
d46c5519
JX
18634#, c-format
18635msgid "unusable todo list: '%s'"
18636msgstr "不可用的待办列表:'%s'"
18637
d9488fea 18638#: builtin/rebase.c:304
d46c5519
JX
18639#, c-format
18640msgid "could not create temporary %s"
18641msgstr "无法创建临时的 %s"
18642
d9488fea 18643#: builtin/rebase.c:310
d46c5519
JX
18644msgid "could not mark as interactive"
18645msgstr "无法标记为交互式"
18646
d9488fea 18647#: builtin/rebase.c:364
d46c5519
JX
18648msgid "could not generate todo list"
18649msgstr "无法生成待办列表"
18650
d9488fea 18651#: builtin/rebase.c:405
d46c5519
JX
18652msgid "a base commit must be provided with --upstream or --onto"
18653msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
18654
d9488fea 18655#: builtin/rebase.c:474
d46c5519
JX
18656msgid "git rebase--interactive [<options>]"
18657msgstr "git rebase--interactive [<选项>]"
18658
d9488fea 18659#: builtin/rebase.c:487 builtin/rebase.c:1382
349ede6a
JX
18660msgid "keep commits which start empty"
18661msgstr "保留初始为空的提交"
d46c5519 18662
d9488fea 18663#: builtin/rebase.c:491 builtin/revert.c:128
d46c5519
JX
18664msgid "allow commits with empty messages"
18665msgstr "允许提交说明为空"
18666
d9488fea 18667#: builtin/rebase.c:493
d46c5519
JX
18668msgid "rebase merge commits"
18669msgstr "对合并提交变基"
18670
d9488fea 18671#: builtin/rebase.c:495
d46c5519
JX
18672msgid "keep original branch points of cousins"
18673msgstr "保持兄弟提交的原始分支点"
18674
d9488fea 18675#: builtin/rebase.c:497
d46c5519
JX
18676msgid "move commits that begin with squash!/fixup!"
18677msgstr "移动以 squash!/fixup! 开头的提交"
18678
d9488fea 18679#: builtin/rebase.c:498
d46c5519
JX
18680msgid "sign commits"
18681msgstr "签名提交"
18682
d9488fea 18683#: builtin/rebase.c:500 builtin/rebase.c:1321
d46c5519 18684msgid "display a diffstat of what changed upstream"
5b533632 18685msgstr "显示上游变化的差异统计"
d46c5519 18686
d9488fea 18687#: builtin/rebase.c:502
d46c5519
JX
18688msgid "continue rebase"
18689msgstr "继续变基"
18690
d9488fea 18691#: builtin/rebase.c:504
d46c5519
JX
18692msgid "skip commit"
18693msgstr "跳过提交"
18694
d9488fea 18695#: builtin/rebase.c:505
d46c5519
JX
18696msgid "edit the todo list"
18697msgstr "变基待办列表"
18698
d9488fea 18699#: builtin/rebase.c:507
d46c5519
JX
18700msgid "show the current patch"
18701msgstr "显示当前补丁"
18702
d9488fea 18703#: builtin/rebase.c:510
d46c5519
JX
18704msgid "shorten commit ids in the todo list"
18705msgstr "缩短待办列表中的提交号"
18706
d9488fea 18707#: builtin/rebase.c:512
d46c5519
JX
18708msgid "expand commit ids in the todo list"
18709msgstr "扩展待办列表中的提交号"
18710
d9488fea 18711#: builtin/rebase.c:514
d46c5519
JX
18712msgid "check the todo list"
18713msgstr "检查待办列表"
18714
d9488fea 18715#: builtin/rebase.c:516
d46c5519
JX
18716msgid "rearrange fixup/squash lines"
18717msgstr "重新排列 fixup/squash 行"
18718
d9488fea 18719#: builtin/rebase.c:518
d46c5519
JX
18720msgid "insert exec commands in todo list"
18721msgstr "在待办列表中插入 exec 执行命令"
18722
d9488fea 18723#: builtin/rebase.c:519
d46c5519
JX
18724msgid "onto"
18725msgstr "onto"
18726
d9488fea 18727#: builtin/rebase.c:522
d46c5519
JX
18728msgid "restrict-revision"
18729msgstr "restrict-revision"
18730
d9488fea 18731#: builtin/rebase.c:522
d46c5519
JX
18732msgid "restrict revision"
18733msgstr "限制版本"
18734
d9488fea 18735#: builtin/rebase.c:524
d46c5519
JX
18736msgid "squash-onto"
18737msgstr "squash-onto"
18738
d9488fea 18739#: builtin/rebase.c:525
d46c5519
JX
18740msgid "squash onto"
18741msgstr "squash onto"
18742
d9488fea 18743#: builtin/rebase.c:527
d46c5519
JX
18744msgid "the upstream commit"
18745msgstr "上游提交"
18746
d9488fea 18747#: builtin/rebase.c:529
d46c5519
JX
18748msgid "head-name"
18749msgstr "head-name"
18750
d9488fea 18751#: builtin/rebase.c:529
d46c5519
JX
18752msgid "head name"
18753msgstr "head 名称"
18754
d9488fea 18755#: builtin/rebase.c:534
d46c5519
JX
18756msgid "rebase strategy"
18757msgstr "变基策略"
18758
d9488fea 18759#: builtin/rebase.c:535
d46c5519
JX
18760msgid "strategy-opts"
18761msgstr "strategy-opts"
18762
d9488fea 18763#: builtin/rebase.c:536
d46c5519
JX
18764msgid "strategy options"
18765msgstr "策略选项"
18766
d9488fea 18767#: builtin/rebase.c:537
d46c5519
JX
18768msgid "switch-to"
18769msgstr "切换到"
18770
d9488fea 18771#: builtin/rebase.c:538
d46c5519
JX
18772msgid "the branch or commit to checkout"
18773msgstr "要检出的分支或提交"
18774
d9488fea 18775#: builtin/rebase.c:539
d46c5519
JX
18776msgid "onto-name"
18777msgstr "onto-name"
18778
d9488fea 18779#: builtin/rebase.c:539
d46c5519
JX
18780msgid "onto name"
18781msgstr "onto name"
18782
d9488fea 18783#: builtin/rebase.c:540
d46c5519
JX
18784msgid "cmd"
18785msgstr "cmd"
18786
d9488fea 18787#: builtin/rebase.c:540
d46c5519
JX
18788msgid "the command to run"
18789msgstr "要执行的命令"
18790
d9488fea 18791#: builtin/rebase.c:543 builtin/rebase.c:1415
d46c5519
JX
18792msgid "automatically re-schedule any `exec` that fails"
18793msgstr "自动重新安排任何失败的 `exec`"
18794
d9488fea 18795#: builtin/rebase.c:559
d46c5519
JX
18796msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
18797msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果"
18798
d9488fea 18799#: builtin/rebase.c:575
4c27fcb5 18800#, c-format
349ede6a
JX
18801msgid "%s requires the merge backend"
18802msgstr "%s 需要合并后端"
4c27fcb5 18803
d9488fea 18804#: builtin/rebase.c:618
4c27fcb5
JX
18805#, c-format
18806msgid "could not get 'onto': '%s'"
18807msgstr "无法获取 'onto':'%s'"
18808
d9488fea 18809#: builtin/rebase.c:635
4c27fcb5
JX
18810#, c-format
18811msgid "invalid orig-head: '%s'"
18812msgstr "无效的原始 head:'%s'"
18813
d9488fea 18814#: builtin/rebase.c:660
4c27fcb5
JX
18815#, c-format
18816msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
18817msgstr "忽略无效的 allow_rerere_autoupdate:'%s'"
18818
d9488fea 18819#: builtin/rebase.c:805 git-rebase--preserve-merges.sh:81
4c27fcb5
JX
18820msgid ""
18821"Resolve all conflicts manually, mark them as resolved with\n"
18822"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
18823"You can instead skip this commit: run \"git rebase --skip\".\n"
18824"To abort and get back to the state before \"git rebase\", run \"git rebase --"
18825"abort\"."
18826msgstr ""
18827"手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n"
18828"冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n"
18829"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
18830"\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。"
18831
d9488fea 18832#: builtin/rebase.c:888
06991777
JX
18833#, c-format
18834msgid ""
18835"\n"
18836"git encountered an error while preparing the patches to replay\n"
18837"these revisions:\n"
18838"\n"
18839" %s\n"
18840"\n"
18841"As a result, git cannot rebase them."
18842msgstr ""
18843"\n"
18844"在为重放这些版本而准备补丁时,git 遇到了一个错误:\n"
18845"\n"
18846" %s\n"
18847"\n"
18848"因此 git 无法对其变基。"
4c27fcb5 18849
d9488fea 18850#: builtin/rebase.c:1214
2b472aae
JX
18851#, c-format
18852msgid ""
18853"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
18854"\"."
440e7442 18855msgstr "无法识别的空类型 '%s';有效值有 \"drop\"、\"keep\" 和 \"ask\"。"
2b472aae 18856
d9488fea 18857#: builtin/rebase.c:1232
4c27fcb5
JX
18858#, c-format
18859msgid ""
18860"%s\n"
18861"Please specify which branch you want to rebase against.\n"
18862"See git-rebase(1) for details.\n"
18863"\n"
18864" git rebase '<branch>'\n"
18865"\n"
18866msgstr ""
18867"%s\n"
18868"请指定您要变基到哪个分支。\n"
18869"详见 git-rebase(1)。\n"
18870"\n"
18871" git rebase '<branch>'\n"
18872"\n"
18873
d9488fea 18874#: builtin/rebase.c:1248
4c27fcb5
JX
18875#, c-format
18876msgid ""
18877"If you wish to set tracking information for this branch you can do so with:\n"
18878"\n"
18879" git branch --set-upstream-to=%s/<branch> %s\n"
18880"\n"
18881msgstr ""
18882"如果您想要为此分支创建跟踪信息,您可以执行:\n"
18883"\n"
18884" git branch --set-upstream-to=%s/<branch> %s\n"
18885"\n"
18886
d9488fea 18887#: builtin/rebase.c:1278
06991777
JX
18888msgid "exec commands cannot contain newlines"
18889msgstr "exec 命令不能包含换行符"
18890
d9488fea 18891#: builtin/rebase.c:1282
06991777
JX
18892msgid "empty exec command"
18893msgstr "空的 exec 命令"
18894
d9488fea 18895#: builtin/rebase.c:1312
4c27fcb5
JX
18896msgid "rebase onto given branch instead of upstream"
18897msgstr "变基到给定的分支而非上游"
18898
d9488fea 18899#: builtin/rebase.c:1314
a5cd71ca
JX
18900msgid "use the merge-base of upstream and branch as the current base"
18901msgstr "使用上游和分支的合并基线做为当前基线"
18902
d9488fea 18903#: builtin/rebase.c:1316
4c27fcb5
JX
18904msgid "allow pre-rebase hook to run"
18905msgstr "允许执行 pre-rebase 钩子"
18906
d9488fea 18907#: builtin/rebase.c:1318
4c27fcb5
JX
18908msgid "be quiet. implies --no-stat"
18909msgstr "安静。暗示 --no-stat"
18910
d9488fea 18911#: builtin/rebase.c:1324
4c27fcb5 18912msgid "do not show diffstat of what changed upstream"
5b533632 18913msgstr "不显示上游变化的差异统计"
4c27fcb5 18914
d9488fea 18915#: builtin/rebase.c:1327
4c27fcb5
JX
18916msgid "add a Signed-off-by: line to each commit"
18917msgstr "为每一个提交添加一个 Signed-off-by: 签名"
18918
d9488fea
JX
18919#: builtin/rebase.c:1330
18920msgid "make committer date match author date"
18921msgstr "使提交者日期和作者日期一致"
18922
18923#: builtin/rebase.c:1332
18924msgid "ignore author date and use current date"
18925msgstr "忽略作者日期,使用当前日期"
18926
18927#: builtin/rebase.c:1334
18928msgid "synonym of --reset-author-date"
18929msgstr "--reset-author-date 的同义词"
4c27fcb5 18930
d9488fea 18931#: builtin/rebase.c:1336 builtin/rebase.c:1340
4c27fcb5
JX
18932msgid "passed to 'git apply'"
18933msgstr "传递给 'git apply'"
18934
d9488fea
JX
18935#: builtin/rebase.c:1338
18936msgid "ignore changes in whitespace"
18937msgstr "忽略空白字符的变更"
18938
18939#: builtin/rebase.c:1342 builtin/rebase.c:1345
4c27fcb5
JX
18940msgid "cherry-pick all commits, even if unchanged"
18941msgstr "拣选所有提交,即使未修改"
18942
d9488fea 18943#: builtin/rebase.c:1347
4c27fcb5
JX
18944msgid "continue"
18945msgstr "继续"
18946
d9488fea 18947#: builtin/rebase.c:1350
4c27fcb5
JX
18948msgid "skip current patch and continue"
18949msgstr "跳过当前补丁并继续"
18950
18951# 译者:注意保持前导空格
d9488fea 18952#: builtin/rebase.c:1352
4c27fcb5
JX
18953msgid "abort and check out the original branch"
18954msgstr "终止并检出原有分支"
18955
d9488fea 18956#: builtin/rebase.c:1355
4c27fcb5
JX
18957msgid "abort but keep HEAD where it is"
18958msgstr "终止但保持 HEAD 不变"
18959
d9488fea 18960#: builtin/rebase.c:1356
4c27fcb5
JX
18961msgid "edit the todo list during an interactive rebase"
18962msgstr "在交互式变基中编辑待办列表"
18963
d9488fea 18964#: builtin/rebase.c:1359
4c27fcb5
JX
18965msgid "show the patch file being applied or merged"
18966msgstr "显示正在应用或合并的补丁文件"
18967
d9488fea 18968#: builtin/rebase.c:1362
2b472aae
JX
18969msgid "use apply strategies to rebase"
18970msgstr "使用应用策略进行变基"
18971
d9488fea 18972#: builtin/rebase.c:1366
4c27fcb5
JX
18973msgid "use merging strategies to rebase"
18974msgstr "使用合并策略进行变基"
18975
d9488fea 18976#: builtin/rebase.c:1370
4c27fcb5
JX
18977msgid "let the user edit the list of commits to rebase"
18978msgstr "让用户编辑要变基的提交列表"
18979
d9488fea 18980#: builtin/rebase.c:1374
d46c5519
JX
18981msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
18982msgstr "(已弃用)尝试重建合并提交而非忽略它们"
4c27fcb5 18983
d9488fea 18984#: builtin/rebase.c:1379
2b472aae 18985msgid "how to handle commits that become empty"
440e7442 18986msgstr "如何处理成为空提交的提交"
4c27fcb5 18987
d9488fea 18988#: builtin/rebase.c:1386
4c27fcb5
JX
18989msgid "move commits that begin with squash!/fixup! under -i"
18990msgstr "在 -i 交互模式下,移动以 squash!/fixup! 开头的提交"
18991
d9488fea 18992#: builtin/rebase.c:1393
4c27fcb5
JX
18993msgid "add exec lines after each commit of the editable list"
18994msgstr "可编辑列表的每一个提交下面增加一行 exec"
18995
d9488fea 18996#: builtin/rebase.c:1397
4c27fcb5
JX
18997msgid "allow rebasing commits with empty messages"
18998msgstr "允许针对空提交说明的提交变基"
18999
d9488fea 19000#: builtin/rebase.c:1401
4c27fcb5
JX
19001msgid "try to rebase merges instead of skipping them"
19002msgstr "尝试对合并提交变基而不是忽略它们"
19003
d9488fea 19004#: builtin/rebase.c:1404
4c27fcb5
JX
19005msgid "use 'merge-base --fork-point' to refine upstream"
19006msgstr "使用 'merge-base --fork-point' 来优化上游"
19007
d9488fea 19008#: builtin/rebase.c:1406
4c27fcb5
JX
19009msgid "use the given merge strategy"
19010msgstr "使用给定的合并策略"
19011
d9488fea 19012#: builtin/rebase.c:1408 builtin/revert.c:115
4c27fcb5
JX
19013msgid "option"
19014msgstr "选项"
19015
d9488fea 19016#: builtin/rebase.c:1409
4c27fcb5
JX
19017msgid "pass the argument through to the merge strategy"
19018msgstr "将参数传递给合并策略"
19019
d9488fea 19020#: builtin/rebase.c:1412
4c27fcb5
JX
19021msgid "rebase all reachable commits up to the root(s)"
19022msgstr "将所有可达的提交变基到根提交"
19023
d9488fea 19024#: builtin/rebase.c:1417
349ede6a
JX
19025msgid "apply all changes, even those already present upstream"
19026msgstr "应用所有更改,甚至那些已在上游存在的"
19027
d9488fea 19028#: builtin/rebase.c:1434
d46c5519
JX
19029msgid ""
19030"the rebase.useBuiltin support has been removed!\n"
19031"See its entry in 'git help config' for details."
19032msgstr ""
19033"对 rebase.useBuiltin 的支持已被删除!\n"
19034"详见 'git help config' 中的条目。"
4c27fcb5 19035
d9488fea 19036#: builtin/rebase.c:1440
4c27fcb5
JX
19037msgid "It looks like 'git am' is in progress. Cannot rebase."
19038msgstr "看起来 'git-am' 正在执行中。无法变基。"
19039
d9488fea 19040#: builtin/rebase.c:1481
d46c5519
JX
19041msgid ""
19042"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
19043msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。"
19044
d9488fea 19045#: builtin/rebase.c:1486
a5cd71ca
JX
19046msgid "cannot combine '--keep-base' with '--onto'"
19047msgstr "不能将 '--keep-base' 和 '--onto' 组合使用"
19048
d9488fea 19049#: builtin/rebase.c:1488
a5cd71ca
JX
19050msgid "cannot combine '--keep-base' with '--root'"
19051msgstr "不能将 '--keep-base' 和 '--root' 组合使用"
19052
d9488fea 19053#: builtin/rebase.c:1492
349ede6a
JX
19054msgid "cannot combine '--root' with '--fork-point'"
19055msgstr "不能将 '--root' 和 '--fork-point' 组合使用"
19056
d9488fea 19057#: builtin/rebase.c:1495
4c27fcb5
JX
19058msgid "No rebase in progress?"
19059msgstr "没有正在进行的变基?"
19060
d9488fea 19061#: builtin/rebase.c:1499
4c27fcb5
JX
19062msgid "The --edit-todo action can only be used during interactive rebase."
19063msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
19064
d9488fea 19065#: builtin/rebase.c:1522
4c27fcb5
JX
19066msgid "Cannot read HEAD"
19067msgstr "不能读取 HEAD"
19068
d9488fea 19069#: builtin/rebase.c:1534
4c27fcb5
JX
19070msgid ""
19071"You must edit all merge conflicts and then\n"
19072"mark them as resolved using git add"
19073msgstr ""
19074"您必须编辑所有的合并冲突,然后通过 git add\n"
19075"命令将它们标记为已解决"
19076
d9488fea 19077#: builtin/rebase.c:1553
4c27fcb5
JX
19078msgid "could not discard worktree changes"
19079msgstr "无法丢弃工作区变更"
19080
d9488fea 19081#: builtin/rebase.c:1572
4c27fcb5
JX
19082#, c-format
19083msgid "could not move back to %s"
19084msgstr "无法移回 %s"
19085
d9488fea 19086#: builtin/rebase.c:1618
4c27fcb5
JX
19087#, c-format
19088msgid ""
19089"It seems that there is already a %s directory, and\n"
19090"I wonder if you are in the middle of another rebase. If that is the\n"
19091"case, please try\n"
19092"\t%s\n"
19093"If that is not the case, please\n"
19094"\t%s\n"
19095"and run me again. I am stopping in case you still have something\n"
19096"valuable there.\n"
19097msgstr ""
19098"似乎已有一个 %s 目录,我怀疑您正处于另外一个变基操作过程中。\n"
19099"如果是这样,请执行\n"
19100"\t%s\n"
19101"如果不是这样,请执行\n"
19102"\t%s\n"
19103"然后再重新执行。 为避免丢失重要数据,我已经停止当前操作。\n"
19104
d9488fea 19105#: builtin/rebase.c:1646
4c27fcb5
JX
19106msgid "switch `C' expects a numerical value"
19107msgstr "开关 `C' 期望一个数字值"
19108
d9488fea 19109#: builtin/rebase.c:1688
4c27fcb5
JX
19110#, c-format
19111msgid "Unknown mode: %s"
19112msgstr "未知模式:%s"
19113
d9488fea 19114#: builtin/rebase.c:1727
4c27fcb5
JX
19115msgid "--strategy requires --merge or --interactive"
19116msgstr "--strategy 需要 --merge 或 --interactive"
19117
d9488fea 19118#: builtin/rebase.c:1757
2b472aae
JX
19119msgid "cannot combine apply options with merge options"
19120msgstr "不能组合使用应用选项和合并选项"
19121
d9488fea 19122#: builtin/rebase.c:1770
2b472aae
JX
19123#, c-format
19124msgid "Unknown rebase backend: %s"
19125msgstr "未知的变基后端:%s"
19126
d9488fea 19127#: builtin/rebase.c:1795
a6cd2cc4
JX
19128msgid "--reschedule-failed-exec requires --exec or --interactive"
19129msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
19130
d9488fea 19131#: builtin/rebase.c:1815
06991777 19132msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
5b533632 19133msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"
4c27fcb5 19134
d9488fea 19135#: builtin/rebase.c:1819
06991777
JX
19136msgid ""
19137"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
19138msgstr ""
5b533632 19139"错误:不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"
4c27fcb5 19140
d9488fea 19141#: builtin/rebase.c:1843
4c27fcb5
JX
19142#, c-format
19143msgid "invalid upstream '%s'"
19144msgstr "无效的上游 '%s'"
19145
d9488fea 19146#: builtin/rebase.c:1849
4c27fcb5
JX
19147msgid "Could not create new root commit"
19148msgstr "不能创建新的根提交"
19149
d9488fea 19150#: builtin/rebase.c:1875
a5cd71ca
JX
19151#, c-format
19152msgid "'%s': need exactly one merge base with branch"
19153msgstr "'%s':只需要与分支的一个合并基线"
19154
d9488fea 19155#: builtin/rebase.c:1878
4c27fcb5
JX
19156#, c-format
19157msgid "'%s': need exactly one merge base"
19158msgstr "'%s':只需要一个合并基线"
19159
d9488fea 19160#: builtin/rebase.c:1886
4c27fcb5
JX
19161#, c-format
19162msgid "Does not point to a valid commit '%s'"
19163msgstr "没有指向一个有效的提交 '%s'"
19164
d9488fea 19165#: builtin/rebase.c:1912
4c27fcb5
JX
19166#, c-format
19167msgid "fatal: no such branch/commit '%s'"
06991777 19168msgstr "致命错误:无此分支/提交 '%s'"
4c27fcb5 19169
d9488fea
JX
19170#: builtin/rebase.c:1920 builtin/submodule--helper.c:40
19171#: builtin/submodule--helper.c:2414
4c27fcb5
JX
19172#, c-format
19173msgid "No such ref: %s"
19174msgstr "没有这样的引用:%s"
19175
d9488fea 19176#: builtin/rebase.c:1931
4c27fcb5
JX
19177msgid "Could not resolve HEAD to a revision"
19178msgstr "无法将 HEAD 解析为一个版本"
19179
d9488fea 19180#: builtin/rebase.c:1952
4c27fcb5
JX
19181msgid "Please commit or stash them."
19182msgstr "请提交或贮藏修改。"
19183
d9488fea 19184#: builtin/rebase.c:1988
4c27fcb5
JX
19185#, c-format
19186msgid "could not switch to %s"
19187msgstr "无法切换到 %s"
19188
d9488fea 19189#: builtin/rebase.c:1999
4c27fcb5
JX
19190msgid "HEAD is up to date."
19191msgstr "HEAD 是最新的。"
19192
d9488fea 19193#: builtin/rebase.c:2001
4c27fcb5
JX
19194#, c-format
19195msgid "Current branch %s is up to date.\n"
19196msgstr "当前分支 %s 是最新的。\n"
19197
d9488fea 19198#: builtin/rebase.c:2009
4c27fcb5
JX
19199msgid "HEAD is up to date, rebase forced."
19200msgstr "HEAD 是最新的,强制变基。"
19201
d9488fea 19202#: builtin/rebase.c:2011
4c27fcb5
JX
19203#, c-format
19204msgid "Current branch %s is up to date, rebase forced.\n"
19205msgstr "当前分支 %s 是最新的,强制变基。\n"
19206
d9488fea 19207#: builtin/rebase.c:2019
4c27fcb5
JX
19208msgid "The pre-rebase hook refused to rebase."
19209msgstr "pre-rebase 钩子拒绝了变基操作。"
19210
d9488fea 19211#: builtin/rebase.c:2026
4c27fcb5
JX
19212#, c-format
19213msgid "Changes to %s:\n"
19214msgstr "到 %s 的变更:\n"
19215
d9488fea 19216#: builtin/rebase.c:2029
4c27fcb5
JX
19217#, c-format
19218msgid "Changes from %s to %s:\n"
19219msgstr "从 %s 到 %s 的变更:\n"
19220
d9488fea 19221#: builtin/rebase.c:2054
4c27fcb5
JX
19222#, c-format
19223msgid "First, rewinding head to replay your work on top of it...\n"
19224msgstr "首先,回退头指针以便在其上重放您的工作...\n"
19225
d9488fea 19226#: builtin/rebase.c:2063
4c27fcb5
JX
19227msgid "Could not detach HEAD"
19228msgstr "无法分离头指针"
19229
d9488fea 19230#: builtin/rebase.c:2072
4c27fcb5
JX
19231#, c-format
19232msgid "Fast-forwarded %s to %s.\n"
19233msgstr "快进 %s 到 %s。\n"
19234
349ede6a 19235#: builtin/receive-pack.c:34
5b04ee3b 19236msgid "git receive-pack <git-dir>"
58b6f078 19237msgstr "git receive-pack <仓库目录>"
5b04ee3b 19238
d9488fea 19239#: builtin/receive-pack.c:1224
a0b6b246
JX
19240msgid ""
19241"By default, updating the current branch in a non-bare repository\n"
19242"is denied, because it will make the index and work tree inconsistent\n"
19243"with what you pushed, and will require 'git reset --hard' to match\n"
19244"the work tree to HEAD.\n"
19245"\n"
1a79b2f1
JX
19246"You can set the 'receive.denyCurrentBranch' configuration variable\n"
19247"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
a0b6b246
JX
19248"its current branch; however, this is not recommended unless you\n"
19249"arranged to update its work tree to match what you pushed in some\n"
19250"other way.\n"
19251"\n"
19252"To squelch this message and still keep the default behaviour, set\n"
19253"'receive.denyCurrentBranch' configuration variable to 'refuse'."
19254msgstr ""
19255"默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
19256"不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
19257"\n"
19258"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
19259"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
19260"用某种方式将其工作区更新至您推送的状态。\n"
19261"\n"
19262"若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
19263"配置变量为 'refuse'。"
19264
d9488fea 19265#: builtin/receive-pack.c:1244
a0b6b246
JX
19266msgid ""
19267"By default, deleting the current branch is denied, because the next\n"
19268"'git clone' won't result in any file checked out, causing confusion.\n"
19269"\n"
19270"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
19271"'warn' or 'ignore' in the remote repository to allow deleting the\n"
19272"current branch, with or without a warning message.\n"
19273"\n"
19274"To squelch this message, you can set it to 'refuse'."
19275msgstr ""
19276"默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
29004bbb 19277"导致困惑。\n"
a0b6b246
JX
19278"\n"
19279"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
29004bbb 19280"'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
a0b6b246
JX
19281"\n"
19282"若要屏蔽此信息,您可以设置它为 'refuse'。"
19283
d9488fea 19284#: builtin/receive-pack.c:2422
5b04ee3b
JX
19285msgid "quiet"
19286msgstr "静默模式"
19287
d9488fea 19288#: builtin/receive-pack.c:2436
5b04ee3b
JX
19289msgid "You must specify a directory."
19290msgstr "您必须指定一个目录。"
19291
06991777
JX
19292#: builtin/reflog.c:17
19293msgid ""
19294"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
19295"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
19296"<refs>..."
19297msgstr ""
19298"git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>] [--"
19299"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引"
19300"用>..."
19301
19302#: builtin/reflog.c:22
19303msgid ""
19304"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
19305"<refs>..."
19306msgstr ""
19307"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引"
19308"用>..."
19309
19310#: builtin/reflog.c:25
19311msgid "git reflog exists <ref>"
19312msgstr "git reflog exists <引用>"
19313
2b472aae 19314#: builtin/reflog.c:568 builtin/reflog.c:573
2e8451e8
JX
19315#, c-format
19316msgid "'%s' is not a valid timestamp"
19317msgstr "'%s' 不是一个有效的时间戳"
19318
2b472aae 19319#: builtin/reflog.c:606
06991777
JX
19320#, c-format
19321msgid "Marking reachable objects..."
19322msgstr "正在标记可达对象..."
19323
2b472aae 19324#: builtin/reflog.c:644
06991777
JX
19325#, c-format
19326msgid "%s points nowhere!"
19327msgstr "%s 指向不存在!"
19328
2b472aae 19329#: builtin/reflog.c:696
06991777
JX
19330msgid "no reflog specified to delete"
19331msgstr "未指定要删除的引用日志"
19332
2b472aae 19333#: builtin/reflog.c:705
06991777
JX
19334#, c-format
19335msgid "not a reflog: %s"
19336msgstr "不是一个引用日志:%s"
19337
2b472aae 19338#: builtin/reflog.c:710
06991777
JX
19339#, c-format
19340msgid "no reflog for '%s'"
19341msgstr "没有 '%s' 的引用日志"
19342
2b472aae 19343#: builtin/reflog.c:756
06991777
JX
19344#, c-format
19345msgid "invalid ref format: %s"
19346msgstr "无效的引用格式:%s"
19347
2b472aae 19348#: builtin/reflog.c:765
06991777
JX
19349msgid "git reflog [ show | expire | delete | exists ]"
19350msgstr "git reflog [ show | expire | delete | exists ]"
19351
2b472aae 19352#: builtin/remote.c:17
ef317cd5 19353msgid "git remote [-v | --verbose]"
07432cef 19354msgstr "git remote [-v | --verbose]"
ef317cd5 19355
2b472aae 19356#: builtin/remote.c:18
ef317cd5 19357msgid ""
814ff314 19358"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
ef317cd5
JX
19359"mirror=<fetch|push>] <name> <url>"
19360msgstr ""
814ff314 19361"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
d9d56b23 19362"mirror=<fetch|push>] <名称> <地址>"
ef317cd5 19363
2b472aae 19364#: builtin/remote.c:19 builtin/remote.c:39
ef317cd5 19365msgid "git remote rename <old> <new>"
07432cef 19366msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 19367
2b472aae 19368#: builtin/remote.c:20 builtin/remote.c:44
ef317cd5 19369msgid "git remote remove <name>"
07432cef 19370msgstr "git remote remove <名称>"
ef317cd5 19371
2b472aae 19372#: builtin/remote.c:21 builtin/remote.c:49
814ff314
JX
19373msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
19374msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
ef317cd5 19375
2b472aae 19376#: builtin/remote.c:22
ef317cd5 19377msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 19378msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 19379
2b472aae 19380#: builtin/remote.c:23
ef317cd5 19381msgid "git remote prune [-n | --dry-run] <name>"
07432cef 19382msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 19383
2b472aae 19384#: builtin/remote.c:24
ef317cd5
JX
19385msgid ""
19386"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 19387msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 19388
2b472aae 19389#: builtin/remote.c:25
ef317cd5 19390msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 19391msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 19392
2b472aae 19393#: builtin/remote.c:26 builtin/remote.c:75
94550ed3
JX
19394msgid "git remote get-url [--push] [--all] <name>"
19395msgstr "git remote get-url [--push] [--all] <名称>"
19396
2b472aae 19397#: builtin/remote.c:27 builtin/remote.c:80
ef317cd5 19398msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 19399msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 19400
2b472aae 19401#: builtin/remote.c:28 builtin/remote.c:81
ef317cd5 19402msgid "git remote set-url --add <name> <newurl>"
07432cef 19403msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 19404
2b472aae 19405#: builtin/remote.c:29 builtin/remote.c:82
ef317cd5 19406msgid "git remote set-url --delete <name> <url>"
07432cef 19407msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 19408
2b472aae 19409#: builtin/remote.c:34
ef317cd5 19410msgid "git remote add [<options>] <name> <url>"
07432cef 19411msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 19412
2b472aae 19413#: builtin/remote.c:54
ef317cd5 19414msgid "git remote set-branches <name> <branch>..."
07432cef 19415msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 19416
2b472aae 19417#: builtin/remote.c:55
ef317cd5 19418msgid "git remote set-branches --add <name> <branch>..."
07432cef 19419msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 19420
2b472aae 19421#: builtin/remote.c:60
ef317cd5 19422msgid "git remote show [<options>] <name>"
07432cef 19423msgstr "git remote show [<选项>] <名称>"
ef317cd5 19424
2b472aae 19425#: builtin/remote.c:65
ef317cd5 19426msgid "git remote prune [<options>] <name>"
07432cef 19427msgstr "git remote prune [<选项>] <名称>"
ef317cd5 19428
2b472aae 19429#: builtin/remote.c:70
ef317cd5 19430msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 19431msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 19432
2b472aae 19433#: builtin/remote.c:99
81809b99 19434#, c-format
8ada9598 19435msgid "Updating %s"
81809b99 19436msgstr "更新 %s 中"
8ada9598 19437
2b472aae 19438#: builtin/remote.c:131
8ada9598
JX
19439msgid ""
19440"--mirror is dangerous and deprecated; please\n"
19441"\t use --mirror=fetch or --mirror=push instead"
19442msgstr ""
81809b99
JX
19443"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
19444"\t 或 --mirror=push"
8ada9598 19445
2b472aae 19446#: builtin/remote.c:148
81809b99 19447#, c-format
8ada9598 19448msgid "unknown mirror argument: %s"
81809b99 19449msgstr "未知的镜像参数:%s"
8ada9598 19450
2b472aae 19451#: builtin/remote.c:164
ef317cd5 19452msgid "fetch the remote branches"
07432cef 19453msgstr "抓取远程的分支"
ef317cd5 19454
2b472aae 19455#: builtin/remote.c:166
ef317cd5 19456msgid "import all tags and associated objects when fetching"
55a16ee4 19457msgstr "抓取时导入所有的标签和关联对象"
ef317cd5 19458
2b472aae 19459#: builtin/remote.c:169
ef317cd5 19460msgid "or do not fetch any tag at all (--no-tags)"
55a16ee4 19461msgstr "或不抓取任何标签(--no-tags)"
ef317cd5 19462
2b472aae 19463#: builtin/remote.c:171
ef317cd5 19464msgid "branch(es) to track"
07432cef 19465msgstr "跟踪的分支"
ef317cd5 19466
2b472aae 19467#: builtin/remote.c:172
ef317cd5 19468msgid "master branch"
07432cef 19469msgstr "主线分支"
ef317cd5 19470
2b472aae 19471#: builtin/remote.c:174
ef317cd5 19472msgid "set up remote as a mirror to push to or fetch from"
07432cef 19473msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 19474
2b472aae 19475#: builtin/remote.c:186
8ada9598 19476msgid "specifying a master branch makes no sense with --mirror"
81809b99 19477msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 19478
2b472aae 19479#: builtin/remote.c:188
8ada9598 19480msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 19481msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 19482
d9488fea 19483#: builtin/remote.c:195 builtin/remote.c:697
81809b99 19484#, c-format
8ada9598 19485msgid "remote %s already exists."
81809b99 19486msgstr "远程 %s 已经存在。"
8ada9598 19487
d9488fea 19488#: builtin/remote.c:199 builtin/remote.c:701
81809b99 19489#, c-format
8ada9598 19490msgid "'%s' is not a valid remote name"
81809b99 19491msgstr "'%s' 不是一个有效的远程名称"
8ada9598 19492
2b472aae 19493#: builtin/remote.c:239
81809b99 19494#, c-format
8ada9598 19495msgid "Could not setup master '%s'"
81809b99 19496msgstr "无法设置 master '%s'"
8ada9598 19497
2b472aae 19498#: builtin/remote.c:354
81809b99 19499#, c-format
8ada9598 19500msgid "Could not get fetch map for refspec %s"
160fb2b2 19501msgstr "无法得到引用规格 %s 的获取列表"
8ada9598 19502
2b472aae 19503#: builtin/remote.c:453 builtin/remote.c:461
8ada9598 19504msgid "(matching)"
81809b99 19505msgstr "(匹配)"
8ada9598 19506
2b472aae 19507#: builtin/remote.c:465
8ada9598 19508msgid "(delete)"
81809b99 19509msgstr "(删除)"
8ada9598 19510
d9488fea 19511#: builtin/remote.c:654
2b472aae
JX
19512#, c-format
19513msgid "could not set '%s'"
19514msgstr "不能设置 '%s'"
19515
d9488fea 19516#: builtin/remote.c:659
2b472aae
JX
19517#, c-format
19518msgid ""
19519"The %s configuration remote.pushDefault in:\n"
19520"\t%s:%d\n"
19521"now names the non-existent remote '%s'"
19522msgstr ""
19523"配置(%s)remote.pushDefault 位于:\n"
19524"\t%s:%d\n"
19525"现在在为不存在的远程名 '%s' 命名"
19526
d9488fea 19527#: builtin/remote.c:690 builtin/remote.c:833 builtin/remote.c:941
81809b99 19528#, c-format
4c27fcb5
JX
19529msgid "No such remote: '%s'"
19530msgstr "没有此远程仓库:'%s'"
8ada9598 19531
d9488fea 19532#: builtin/remote.c:707
81809b99 19533#, c-format
8ada9598 19534msgid "Could not rename config section '%s' to '%s'"
81809b99 19535msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 19536
d9488fea 19537#: builtin/remote.c:727
8ada9598
JX
19538#, c-format
19539msgid ""
d691f479 19540"Not updating non-default fetch refspec\n"
8ada9598
JX
19541"\t%s\n"
19542"\tPlease update the configuration manually if necessary."
19543msgstr ""
160fb2b2 19544"没有更新非默认的获取引用规格\n"
81809b99
JX
19545"\t%s\n"
19546"\t如果必要请手动更新配置。"
8ada9598 19547
d9488fea 19548#: builtin/remote.c:767
81809b99 19549#, c-format
8ada9598 19550msgid "deleting '%s' failed"
81809b99 19551msgstr "删除 '%s' 失败"
8ada9598 19552
d9488fea 19553#: builtin/remote.c:801
81809b99 19554#, c-format
8ada9598 19555msgid "creating '%s' failed"
81809b99 19556msgstr "创建 '%s' 失败"
8ada9598 19557
d9488fea 19558#: builtin/remote.c:877
8ada9598
JX
19559msgid ""
19560"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
19561"to delete it, use:"
19562msgid_plural ""
19563"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
19564"to delete them, use:"
5ae481e0
JX
19565msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
19566msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 19567
d9488fea 19568#: builtin/remote.c:891
276ceeaa
JX
19569#, c-format
19570msgid "Could not remove config section '%s'"
19571msgstr "不能移除配置小节 '%s'"
19572
d9488fea 19573#: builtin/remote.c:994
8ada9598
JX
19574#, c-format
19575msgid " new (next fetch will store in remotes/%s)"
81809b99 19576msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 19577
d9488fea 19578#: builtin/remote.c:997
8ada9598 19579msgid " tracked"
81809b99 19580msgstr " 已跟踪"
8ada9598 19581
d9488fea 19582#: builtin/remote.c:999
8ada9598 19583msgid " stale (use 'git remote prune' to remove)"
81809b99 19584msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 19585
d9488fea 19586#: builtin/remote.c:1001
8ada9598 19587msgid " ???"
81809b99 19588msgstr " ???"
8ada9598 19589
d9488fea 19590#: builtin/remote.c:1042
8ada9598
JX
19591#, c-format
19592msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 19593msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 19594
d9488fea 19595#: builtin/remote.c:1051
81809b99 19596#, c-format
276ceeaa
JX
19597msgid "rebases interactively onto remote %s"
19598msgstr "交互式变基到远程 %s"
8ada9598 19599
d9488fea 19600#: builtin/remote.c:1053
fd8cb379
JX
19601#, c-format
19602msgid "rebases interactively (with merges) onto remote %s"
19603msgstr "交互式变基(含合并提交)到远程 %s"
19604
d9488fea 19605#: builtin/remote.c:1056
5c57d762
JX
19606#, c-format
19607msgid "rebases onto remote %s"
19608msgstr "变基到远程 %s"
19609
d9488fea 19610#: builtin/remote.c:1060
81809b99 19611#, c-format
8ada9598 19612msgid " merges with remote %s"
81809b99 19613msgstr " 与远程 %s 合并"
8ada9598 19614
d9488fea 19615#: builtin/remote.c:1063
81809b99 19616#, c-format
8ada9598 19617msgid "merges with remote %s"
81809b99 19618msgstr "与远程 %s 合并"
8ada9598 19619
d9488fea 19620#: builtin/remote.c:1066
5c57d762
JX
19621#, c-format
19622msgid "%-*s and with remote %s\n"
19623msgstr "%-*s 以及和远程 %s\n"
8ada9598 19624
d9488fea 19625#: builtin/remote.c:1109
8ada9598 19626msgid "create"
81809b99 19627msgstr "创建"
8ada9598 19628
d9488fea 19629#: builtin/remote.c:1112
8ada9598 19630msgid "delete"
81809b99 19631msgstr "删除"
8ada9598 19632
d9488fea 19633#: builtin/remote.c:1116
8ada9598 19634msgid "up to date"
81809b99 19635msgstr "最新"
8ada9598 19636
d9488fea 19637#: builtin/remote.c:1119
8ada9598 19638msgid "fast-forwardable"
81809b99 19639msgstr "可快进"
8ada9598 19640
d9488fea 19641#: builtin/remote.c:1122
8ada9598 19642msgid "local out of date"
81809b99 19643msgstr "本地已过时"
8ada9598 19644
d9488fea 19645#: builtin/remote.c:1129
8ada9598
JX
19646#, c-format
19647msgid " %-*s forces to %-*s (%s)"
81809b99 19648msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 19649
d9488fea 19650#: builtin/remote.c:1132
8ada9598
JX
19651#, c-format
19652msgid " %-*s pushes to %-*s (%s)"
81809b99 19653msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 19654
d9488fea 19655#: builtin/remote.c:1136
8ada9598
JX
19656#, c-format
19657msgid " %-*s forces to %s"
81809b99 19658msgstr " %-*s 强制推送至 %s"
8ada9598 19659
d9488fea 19660#: builtin/remote.c:1139
8ada9598
JX
19661#, c-format
19662msgid " %-*s pushes to %s"
81809b99 19663msgstr " %-*s 推送至 %s"
8ada9598 19664
d9488fea 19665#: builtin/remote.c:1207
ef317cd5 19666msgid "do not query remotes"
07432cef 19667msgstr "不查询远程"
ef317cd5 19668
d9488fea 19669#: builtin/remote.c:1234
81809b99 19670#, c-format
8ada9598 19671msgid "* remote %s"
81809b99 19672msgstr "* 远程 %s"
8ada9598 19673
d9488fea 19674#: builtin/remote.c:1235
8ada9598
JX
19675#, c-format
19676msgid " Fetch URL: %s"
81809b99 19677msgstr " 获取地址:%s"
8ada9598 19678
d9488fea 19679#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391
8ada9598 19680msgid "(no URL)"
81809b99 19681msgstr "(无 URL)"
8ada9598 19682
a4f16749
JX
19683#. TRANSLATORS: the colon ':' should align
19684#. with the one in " Fetch URL: %s"
19685#. translation.
19686#.
d9488fea 19687#: builtin/remote.c:1250 builtin/remote.c:1252
8ada9598
JX
19688#, c-format
19689msgid " Push URL: %s"
81809b99 19690msgstr " 推送地址:%s"
8ada9598 19691
d9488fea 19692#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258
81809b99 19693#, c-format
8ada9598 19694msgid " HEAD branch: %s"
4375c10e 19695msgstr " HEAD 分支:%s"
8ada9598 19696
5c57d762 19697# 译者:中文字符串拼接,可删除前导空格
d9488fea 19698#: builtin/remote.c:1254
5c57d762
JX
19699msgid "(not queried)"
19700msgstr "(未查询)"
19701
d9488fea 19702#: builtin/remote.c:1256
5c57d762
JX
19703msgid "(unknown)"
19704msgstr "(未知)"
19705
d9488fea 19706#: builtin/remote.c:1260
8ada9598
JX
19707#, c-format
19708msgid ""
19709" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 19710msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 19711
d9488fea 19712#: builtin/remote.c:1272
81809b99 19713#, c-format
8ada9598
JX
19714msgid " Remote branch:%s"
19715msgid_plural " Remote branches:%s"
81809b99 19716msgstr[0] " 远程分支:%s"
5ae481e0 19717msgstr[1] " 远程分支:%s"
8ada9598 19718
81809b99 19719# 译者:中文字符串拼接,可删除前导空格
d9488fea 19720#: builtin/remote.c:1275 builtin/remote.c:1301
8ada9598 19721msgid " (status not queried)"
81809b99 19722msgstr "(状态未查询)"
8ada9598 19723
d9488fea 19724#: builtin/remote.c:1284
8ada9598
JX
19725msgid " Local branch configured for 'git pull':"
19726msgid_plural " Local branches configured for 'git pull':"
81809b99 19727msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 19728msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 19729
d9488fea 19730#: builtin/remote.c:1292
8ada9598 19731msgid " Local refs will be mirrored by 'git push'"
81809b99 19732msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 19733
d9488fea 19734#: builtin/remote.c:1298
81809b99 19735#, c-format
8ada9598
JX
19736msgid " Local ref configured for 'git push'%s:"
19737msgid_plural " Local refs configured for 'git push'%s:"
81809b99 19738msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 19739msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 19740
d9488fea 19741#: builtin/remote.c:1319
ef317cd5 19742msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 19743msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 19744
d9488fea 19745#: builtin/remote.c:1321
ef317cd5 19746msgid "delete refs/remotes/<name>/HEAD"
07432cef 19747msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 19748
d9488fea 19749#: builtin/remote.c:1336
8ada9598 19750msgid "Cannot determine remote HEAD"
81809b99 19751msgstr "无法确定远程 HEAD"
8ada9598 19752
d9488fea 19753#: builtin/remote.c:1338
8ada9598 19754msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 19755msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 19756
d9488fea 19757#: builtin/remote.c:1348
81809b99 19758#, c-format
8ada9598 19759msgid "Could not delete %s"
81809b99 19760msgstr "无法删除 %s"
8ada9598 19761
d9488fea 19762#: builtin/remote.c:1356
81809b99 19763#, c-format
8ada9598 19764msgid "Not a valid ref: %s"
81809b99 19765msgstr "不是一个有效引用:%s"
8ada9598 19766
d9488fea 19767#: builtin/remote.c:1358
81809b99 19768#, c-format
8ada9598 19769msgid "Could not setup %s"
81809b99 19770msgstr "不能设置 %s"
8ada9598
JX
19771
19772# 译者:注意保持前导空格
d9488fea 19773#: builtin/remote.c:1376
81809b99 19774#, c-format
8ada9598 19775msgid " %s will become dangling!"
e640d114 19776msgstr " %s 将成为悬空状态!"
8ada9598
JX
19777
19778# 译者:注意保持前导空格
d9488fea 19779#: builtin/remote.c:1377
81809b99 19780#, c-format
8ada9598 19781msgid " %s has become dangling!"
e640d114 19782msgstr " %s 已成为悬空状态!"
8ada9598 19783
d9488fea 19784#: builtin/remote.c:1387
81809b99 19785#, c-format
8ada9598 19786msgid "Pruning %s"
81809b99 19787msgstr "修剪 %s"
8ada9598 19788
d9488fea 19789#: builtin/remote.c:1388
8ada9598
JX
19790#, c-format
19791msgid "URL: %s"
81809b99 19792msgstr "URL:%s"
8ada9598 19793
d9488fea 19794#: builtin/remote.c:1404
8ada9598
JX
19795#, c-format
19796msgid " * [would prune] %s"
81809b99 19797msgstr " * [将删除] %s"
8ada9598 19798
d9488fea 19799#: builtin/remote.c:1407
8ada9598
JX
19800#, c-format
19801msgid " * [pruned] %s"
81809b99 19802msgstr " * [已删除] %s"
8ada9598 19803
d9488fea 19804#: builtin/remote.c:1452
ef317cd5 19805msgid "prune remotes after fetching"
07432cef 19806msgstr "抓取后清除远程"
ef317cd5 19807
d9488fea 19808#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637
81809b99 19809#, c-format
8ada9598 19810msgid "No such remote '%s'"
81809b99 19811msgstr "没有此远程 '%s'"
8ada9598 19812
d9488fea 19813#: builtin/remote.c:1531
ef317cd5 19814msgid "add branch"
07432cef 19815msgstr "添加分支"
ef317cd5 19816
d9488fea 19817#: builtin/remote.c:1538
8ada9598 19818msgid "no remote specified"
81809b99 19819msgstr "未指定远程"
8ada9598 19820
d9488fea 19821#: builtin/remote.c:1555
94550ed3
JX
19822msgid "query push URLs rather than fetch URLs"
19823msgstr "查询推送 URL 地址,而非获取 URL 地址"
19824
d9488fea 19825#: builtin/remote.c:1557
94550ed3
JX
19826msgid "return all URLs"
19827msgstr "返回所有 URL 地址"
19828
d9488fea 19829#: builtin/remote.c:1585
94550ed3
JX
19830#, c-format
19831msgid "no URLs configured for remote '%s'"
19832msgstr "没有给远程仓库 '%s' 设定 URL"
19833
d9488fea 19834#: builtin/remote.c:1611
ef317cd5 19835msgid "manipulate push URLs"
07432cef 19836msgstr "操作推送 URLS"
ef317cd5 19837
d9488fea 19838#: builtin/remote.c:1613
ef317cd5 19839msgid "add URL"
07432cef 19840msgstr "添加 URL"
ef317cd5 19841
d9488fea 19842#: builtin/remote.c:1615
ef317cd5 19843msgid "delete URLs"
07432cef 19844msgstr "删除 URLS"
ef317cd5 19845
d9488fea 19846#: builtin/remote.c:1622
8ada9598 19847msgid "--add --delete doesn't make sense"
81809b99 19848msgstr "--add --delete 无意义"
8ada9598 19849
d9488fea 19850#: builtin/remote.c:1661
81809b99 19851#, c-format
8ada9598 19852msgid "Invalid old URL pattern: %s"
4375c10e 19853msgstr "无效的旧 URL 匹配模版:%s"
8ada9598 19854
d9488fea 19855#: builtin/remote.c:1669
81809b99 19856#, c-format
8ada9598 19857msgid "No such URL found: %s"
4375c10e 19858msgstr "未找到此 URL:%s"
8ada9598 19859
d9488fea 19860#: builtin/remote.c:1671
8ada9598 19861msgid "Will not delete all non-push URLs"
4375c10e 19862msgstr "将不会删除所有非推送 URL 地址"
8ada9598 19863
349ede6a 19864#: builtin/repack.c:25
814ff314
JX
19865msgid "git repack [<options>]"
19866msgstr "git repack [<选项>]"
90314792 19867
349ede6a 19868#: builtin/repack.c:30
1a79b2f1
JX
19869msgid ""
19870"Incremental repacks are incompatible with bitmap indexes. Use\n"
19871"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
19872msgstr ""
19873"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
19874"或禁用 pack.writebitmaps 配置。"
19875
d9488fea 19876#: builtin/repack.c:197
06991777 19877msgid "could not start pack-objects to repack promisor objects"
5b533632 19878msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
06991777 19879
d9488fea 19880#: builtin/repack.c:236 builtin/repack.c:421
06991777 19881msgid "repack: Expecting full hex object ID lines only from pack-objects."
5b533632 19882msgstr "repack:期望来自 pack-objects 的完整十六进制对象 ID。"
06991777 19883
d9488fea 19884#: builtin/repack.c:260
06991777 19885msgid "could not finish pack-objects to repack promisor objects"
5b533632 19886msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
06991777 19887
d9488fea 19888#: builtin/repack.c:297
90314792
JX
19889msgid "pack everything in a single pack"
19890msgstr "所有内容打包到一个包文件中"
19891
d9488fea 19892#: builtin/repack.c:299
90314792
JX
19893msgid "same as -a, and turn unreachable objects loose"
19894msgstr "和 -a 相同,并将不可达的对象设为松散对象"
19895
d9488fea 19896#: builtin/repack.c:302
90314792
JX
19897msgid "remove redundant packs, and run git-prune-packed"
19898msgstr "删除多余的包,运行 git-prune-packed"
19899
d9488fea 19900#: builtin/repack.c:304
90314792
JX
19901msgid "pass --no-reuse-delta to git-pack-objects"
19902msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
19903
d9488fea 19904#: builtin/repack.c:306
90314792
JX
19905msgid "pass --no-reuse-object to git-pack-objects"
19906msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
19907
d9488fea 19908#: builtin/repack.c:308
90314792
JX
19909msgid "do not run git-update-server-info"
19910msgstr "不运行 git-update-server-info"
19911
d9488fea 19912#: builtin/repack.c:311
90314792
JX
19913msgid "pass --local to git-pack-objects"
19914msgstr "向 git-pack-objects 传递参数 --local"
19915
d9488fea 19916#: builtin/repack.c:313
6c94aba5
JX
19917msgid "write bitmap index"
19918msgstr "写 bitmap 索引"
19919
d9488fea 19920#: builtin/repack.c:315
4c27fcb5
JX
19921msgid "pass --delta-islands to git-pack-objects"
19922msgstr "向 git-pack-objects 传递参数 --delta-islands"
19923
d9488fea 19924#: builtin/repack.c:316
90314792
JX
19925msgid "approxidate"
19926msgstr "近似日期"
19927
d9488fea 19928#: builtin/repack.c:317
90314792
JX
19929msgid "with -A, do not loosen objects older than this"
19930msgstr "使用 -A,不要将早于给定时间的对象过期"
19931
d9488fea 19932#: builtin/repack.c:319
5c57d762
JX
19933msgid "with -a, repack unreachable objects"
19934msgstr "使用 -a ,重新对不可达对象打包"
19935
d9488fea 19936#: builtin/repack.c:321
90314792
JX
19937msgid "size of the window used for delta compression"
19938msgstr "用于增量压缩的窗口值"
19939
d9488fea 19940#: builtin/repack.c:322 builtin/repack.c:328
8376b58d
JX
19941msgid "bytes"
19942msgstr "字节"
19943
d9488fea 19944#: builtin/repack.c:323
90314792
JX
19945msgid "same as the above, but limit memory size instead of entries count"
19946msgstr "和上面的相似,但限制内存大小而非条目数"
19947
d9488fea 19948#: builtin/repack.c:325
90314792
JX
19949msgid "limits the maximum delta depth"
19950msgstr "限制最大增量深度"
19951
d9488fea 19952#: builtin/repack.c:327
a4f16749
JX
19953msgid "limits the maximum number of threads"
19954msgstr "限制最大线程数"
19955
d9488fea 19956#: builtin/repack.c:329
90314792 19957msgid "maximum size of each packfile"
dbd6cced 19958msgstr "每个包文件的最大尺寸"
90314792 19959
d9488fea 19960#: builtin/repack.c:331
6c94aba5
JX
19961msgid "repack objects in packs marked with .keep"
19962msgstr "对标记为 .keep 的包中的对象重新打包"
19963
d9488fea 19964#: builtin/repack.c:333
fd8cb379
JX
19965msgid "do not repack this pack"
19966msgstr "不要对该包文件重新打包"
19967
d9488fea 19968#: builtin/repack.c:343
94550ed3
JX
19969msgid "cannot delete packs in a precious-objects repo"
19970msgstr "不能删除珍品仓库中的打包文件"
19971
d9488fea 19972#: builtin/repack.c:347
5c57d762
JX
19973msgid "--keep-unreachable and -A are incompatible"
19974msgstr "--keep-unreachable 和 -A 不兼容"
19975
d9488fea 19976#: builtin/repack.c:430
06991777
JX
19977msgid "Nothing new to pack."
19978msgstr "没有新的要打包。"
19979
d9488fea 19980#: builtin/repack.c:486
06991777
JX
19981#, c-format
19982msgid ""
19983"WARNING: Some packs in use have been renamed by\n"
19984"WARNING: prefixing old- to their name, in order to\n"
19985"WARNING: replace them with the new version of the\n"
19986"WARNING: file. But the operation failed, and the\n"
19987"WARNING: attempt to rename them back to their\n"
19988"WARNING: original names also failed.\n"
19989"WARNING: Please rename them in %s manually:\n"
19990msgstr ""
19991"警告:为了将包文件替换为新版本,一些使用中的包已经\n"
19992"警告:通过添加 old- 前缀的方式重命名。但是操作失败,\n"
19993"警告:并且尝试重命名改回原有文件名的操作也失败。\n"
19994"警告:请手动将 %s 下的这些文件重命名:\n"
19995
d9488fea 19996#: builtin/repack.c:534
90314792 19997#, c-format
5c57d762 19998msgid "failed to remove '%s'"
c1ac5258 19999msgstr "删除 '%s' 失败"
90314792 20000
fd8cb379 20001#: builtin/replace.c:22
ef317cd5 20002msgid "git replace [-f] <object> <replacement>"
07432cef 20003msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 20004
fd8cb379 20005#: builtin/replace.c:23
6acbf033
JX
20006msgid "git replace [-f] --edit <object>"
20007msgstr "git replace [-f] --edit <对象>"
20008
fd8cb379 20009#: builtin/replace.c:24
6acbf033
JX
20010msgid "git replace [-f] --graft <commit> [<parent>...]"
20011msgstr "git replace [-f] --graft <提交> [<父提交>...]"
20012
fd8cb379
JX
20013#: builtin/replace.c:25
20014msgid "git replace [-f] --convert-graft-file"
20015msgstr "git replace [-f] --convert-graft-file"
20016
20017#: builtin/replace.c:26
ef317cd5 20018msgid "git replace -d <object>..."
07432cef 20019msgstr "git replace -d <对象>..."
ef317cd5 20020
fd8cb379 20021#: builtin/replace.c:27
cfff71a9
JX
20022msgid "git replace [--format=<format>] [-l [<pattern>]]"
20023msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 20024
d46c5519 20025#: builtin/replace.c:90
c1ac5258
JX
20026#, c-format
20027msgid ""
20028"invalid replace format '%s'\n"
20029"valid formats are 'short', 'medium' and 'long'"
20030msgstr ""
20031"无效的替换格式 '%s'\n"
20032"有效的格式有 'short'、'medium' 和 'long'"
20033
d46c5519 20034#: builtin/replace.c:125
c1ac5258
JX
20035#, c-format
20036msgid "replace ref '%s' not found"
20037msgstr "未发现替换引用 '%s'"
20038
d46c5519 20039#: builtin/replace.c:141
c1ac5258
JX
20040#, c-format
20041msgid "Deleted replace ref '%s'"
e640d114 20042msgstr "已删除替换引用 '%s'"
c1ac5258 20043
d46c5519 20044#: builtin/replace.c:153
c1ac5258
JX
20045#, c-format
20046msgid "'%s' is not a valid ref name"
20047msgstr "'%s' 不是一个有效的引用名"
20048
d46c5519 20049#: builtin/replace.c:158
c1ac5258
JX
20050#, c-format
20051msgid "replace ref '%s' already exists"
20052msgstr "替换引用 '%s' 已经存在"
20053
d46c5519 20054#: builtin/replace.c:178
c1ac5258
JX
20055#, c-format
20056msgid ""
20057"Objects must be of the same type.\n"
20058"'%s' points to a replaced object of type '%s'\n"
20059"while '%s' points to a replacement object of type '%s'."
20060msgstr ""
20061"对象必须属于同一类型。\n"
20062"'%s' 指向 '%s' 类型的替换对象\n"
20063"而 '%s' 指向 '%s' 类型的替换对象。"
20064
d46c5519 20065#: builtin/replace.c:229
c1ac5258
JX
20066#, c-format
20067msgid "unable to open %s for writing"
20068msgstr "无法为写入打开 %s"
20069
d46c5519 20070#: builtin/replace.c:242
c1ac5258
JX
20071msgid "cat-file reported failure"
20072msgstr "cat-file 报告失败"
20073
d46c5519 20074#: builtin/replace.c:258
c1ac5258
JX
20075#, c-format
20076msgid "unable to open %s for reading"
20077msgstr "无法为读取打开 %s"
20078
d46c5519 20079#: builtin/replace.c:272
c1ac5258
JX
20080msgid "unable to spawn mktree"
20081msgstr "无法启动 mktree"
20082
d46c5519 20083#: builtin/replace.c:276
c1ac5258
JX
20084msgid "unable to read from mktree"
20085msgstr "无法从 mktree 读取"
20086
d46c5519 20087#: builtin/replace.c:285
c1ac5258
JX
20088msgid "mktree reported failure"
20089msgstr "mktree 报告失败"
20090
d46c5519 20091#: builtin/replace.c:289
c1ac5258
JX
20092msgid "mktree did not return an object name"
20093msgstr "mktree 没有返回一个对象名"
20094
d46c5519 20095#: builtin/replace.c:298
c1ac5258
JX
20096#, c-format
20097msgid "unable to fstat %s"
20098msgstr "无法对 %s 执行 fstat"
20099
d46c5519 20100#: builtin/replace.c:303
c1ac5258
JX
20101msgid "unable to write object to database"
20102msgstr "无法向数据库写入对象"
20103
2b472aae
JX
20104#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
20105#: builtin/replace.c:454
c1ac5258
JX
20106#, c-format
20107msgid "not a valid object name: '%s'"
6acbf033
JX
20108msgstr "不是一个有效的对象名:'%s'"
20109
d46c5519 20110#: builtin/replace.c:326
c1ac5258
JX
20111#, c-format
20112msgid "unable to get object type for %s"
20113msgstr "无法得到 %s 的对象类型"
20114
d46c5519 20115#: builtin/replace.c:342
c1ac5258
JX
20116msgid "editing object file failed"
20117msgstr "编辑对象文件失败"
20118
d46c5519 20119#: builtin/replace.c:351
c1ac5258
JX
20120#, c-format
20121msgid "new object is the same as the old one: '%s'"
20122msgstr "新对象和旧对象相同:'%s'"
20123
a5cd71ca 20124#: builtin/replace.c:384
d46c5519
JX
20125#, c-format
20126msgid "could not parse %s as a commit"
20127msgstr "无法将 %s 解析为一个提交"
20128
2b472aae 20129#: builtin/replace.c:416
6acbf033
JX
20130#, c-format
20131msgid "bad mergetag in commit '%s'"
55a16ee4 20132msgstr "提交 '%s' 中含有损坏的合并标签"
6acbf033 20133
2b472aae 20134#: builtin/replace.c:418
6acbf033
JX
20135#, c-format
20136msgid "malformed mergetag in commit '%s'"
fd8cb379 20137msgstr "提交 '%s' 中含有格式错误的合并标签"
6acbf033 20138
2b472aae 20139#: builtin/replace.c:430
6acbf033
JX
20140#, c-format
20141msgid ""
20142"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
20143"instead of --graft"
55a16ee4 20144msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
6acbf033 20145
2b472aae 20146#: builtin/replace.c:469
6acbf033 20147#, c-format
c1ac5258
JX
20148msgid "the original commit '%s' has a gpg signature"
20149msgstr "原始提交 '%s' 中有一个 gpg 签名"
6acbf033 20150
2b472aae 20151#: builtin/replace.c:470
6acbf033
JX
20152msgid "the signature will be removed in the replacement commit!"
20153msgstr "在替换的提交中签名将被移除!"
20154
2b472aae 20155#: builtin/replace.c:480
6acbf033
JX
20156#, c-format
20157msgid "could not write replacement commit for: '%s'"
20158msgstr "不能为 '%s' 写替换提交"
20159
2b472aae 20160#: builtin/replace.c:488
c1ac5258
JX
20161#, c-format
20162msgid "graft for '%s' unnecessary"
20163msgstr "对 '%s' 移植没有必要"
20164
2b472aae 20165#: builtin/replace.c:492
c1ac5258
JX
20166#, c-format
20167msgid "new commit is the same as the old one: '%s'"
20168msgstr "新提交和旧的一样:'%s'"
20169
2b472aae 20170#: builtin/replace.c:527
fd8cb379
JX
20171#, c-format
20172msgid ""
20173"could not convert the following graft(s):\n"
20174"%s"
20175msgstr ""
20176"不能转换下列移植:\n"
20177"%s"
20178
2b472aae 20179#: builtin/replace.c:548
ef317cd5 20180msgid "list replace refs"
07432cef 20181msgstr "列出替换的引用"
ef317cd5 20182
2b472aae 20183#: builtin/replace.c:549
ef317cd5 20184msgid "delete replace refs"
07432cef 20185msgstr "删除替换的引用"
ef317cd5 20186
2b472aae 20187#: builtin/replace.c:550
6acbf033
JX
20188msgid "edit existing object"
20189msgstr "编辑现存的对象"
20190
2b472aae 20191#: builtin/replace.c:551
6acbf033
JX
20192msgid "change a commit's parents"
20193msgstr "修改一个提交的父提交"
20194
2b472aae 20195#: builtin/replace.c:552
fd8cb379
JX
20196msgid "convert existing graft file"
20197msgstr "转换现存的移植文件"
20198
2b472aae 20199#: builtin/replace.c:553
ef317cd5 20200msgid "replace the ref if it exists"
07432cef 20201msgstr "如果存在则替换引用"
ef317cd5 20202
2b472aae 20203#: builtin/replace.c:555
6acbf033
JX
20204msgid "do not pretty-print contents for --edit"
20205msgstr "不要为 --edit 操作美观显示内容"
20206
2b472aae 20207#: builtin/replace.c:556
cfff71a9
JX
20208msgid "use this format"
20209msgstr "使用此格式"
20210
2b472aae 20211#: builtin/replace.c:569
c1ac5258 20212msgid "--format cannot be used when not listing"
e640d114 20213msgstr "不列出时不能使用 --format"
c1ac5258 20214
2b472aae 20215#: builtin/replace.c:577
c1ac5258
JX
20216msgid "-f only makes sense when writing a replacement"
20217msgstr "只有写一个替换时 -f 才有意义"
20218
2b472aae 20219#: builtin/replace.c:581
c1ac5258
JX
20220msgid "--raw only makes sense with --edit"
20221msgstr "--raw 只有和 --edit 共用才有意义"
20222
2b472aae 20223#: builtin/replace.c:587
c1ac5258
JX
20224msgid "-d needs at least one argument"
20225msgstr "-d 需要至少一个参数"
20226
2b472aae 20227#: builtin/replace.c:593
c1ac5258
JX
20228msgid "bad number of arguments"
20229msgstr "错误的参数个数"
20230
2b472aae 20231#: builtin/replace.c:599
c1ac5258 20232msgid "-e needs exactly one argument"
e640d114 20233msgstr "-e 需要且仅需要一个参数"
c1ac5258 20234
2b472aae 20235#: builtin/replace.c:605
c1ac5258
JX
20236msgid "-g needs at least one argument"
20237msgstr "-g 需要至少一个参数"
20238
2b472aae 20239#: builtin/replace.c:611
c1ac5258
JX
20240msgid "--convert-graft-file takes no argument"
20241msgstr "--convert-graft-file 不带参数"
20242
2b472aae 20243#: builtin/replace.c:617
c1ac5258
JX
20244msgid "only one pattern can be given with -l"
20245msgstr "只能为 -l 提供一个模式"
20246
a4f16749 20247#: builtin/rerere.c:13
814ff314
JX
20248msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
20249msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
ef317cd5 20250
4c27fcb5 20251#: builtin/rerere.c:60
ef317cd5 20252msgid "register clean resolutions in index"
07432cef 20253msgstr "在索引中注册干净的解决方案"
ef317cd5 20254
4c27fcb5
JX
20255#: builtin/rerere.c:79
20256msgid "'git rerere forget' without paths is deprecated"
20257msgstr "没有路径的 'git rerere forget' 已经过时"
20258
06991777 20259#: builtin/rerere.c:113
4c27fcb5
JX
20260#, c-format
20261msgid "unable to generate diff for '%s'"
20262msgstr "无法为 '%s' 生成差异"
20263
06991777 20264#: builtin/reset.c:32
ef317cd5
JX
20265msgid ""
20266"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 20267msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5 20268
06991777 20269#: builtin/reset.c:33
ddc12c42
JX
20270msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
20271msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..."
ef317cd5 20272
06991777 20273#: builtin/reset.c:34
ddc12c42
JX
20274msgid ""
20275"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
2b472aae 20276msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]"
ef317cd5 20277
ddc12c42
JX
20278#: builtin/reset.c:35
20279msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
20280msgstr "git reset --patch [<树对象>] [--] [<路径表达式>...]"
20281
20282#: builtin/reset.c:41
c04f5ac3
JX
20283msgid "mixed"
20284msgstr "混杂"
20285
ddc12c42 20286#: builtin/reset.c:41
c04f5ac3
JX
20287msgid "soft"
20288msgstr "软性"
20289
ddc12c42 20290#: builtin/reset.c:41
c04f5ac3
JX
20291msgid "hard"
20292msgstr "硬性"
20293
ddc12c42 20294#: builtin/reset.c:41
8ada9598
JX
20295msgid "merge"
20296msgstr "合并"
20297
ddc12c42 20298#: builtin/reset.c:41
c04f5ac3
JX
20299msgid "keep"
20300msgstr "保持"
20301
349ede6a 20302#: builtin/reset.c:83
c04f5ac3
JX
20303msgid "You do not have a valid HEAD."
20304msgstr "您没有一个有效的 HEAD。"
20305
349ede6a 20306#: builtin/reset.c:85
c04f5ac3
JX
20307msgid "Failed to find tree of HEAD."
20308msgstr "无法找到 HEAD 指向的树。"
20309
349ede6a 20310#: builtin/reset.c:91
c04f5ac3
JX
20311#, c-format
20312msgid "Failed to find tree of %s."
20313msgstr "无法找到 %s 指向的树。"
20314
349ede6a 20315#: builtin/reset.c:116
a5cd71ca
JX
20316#, c-format
20317msgid "HEAD is now at %s"
20318msgstr "HEAD 现在位于 %s"
20319
90e6ef53 20320# 译者:汉字之间无空格,故删除%s前后空格
349ede6a 20321#: builtin/reset.c:195
c04f5ac3
JX
20322#, c-format
20323msgid "Cannot do a %s reset in the middle of a merge."
20324msgstr "在合并过程中不能做%s重置操作。"
20325
349ede6a 20326#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595
2b472aae 20327#: builtin/stash.c:619
ef317cd5 20328msgid "be quiet, only report errors"
07432cef 20329msgstr "安静模式,只报告错误"
ef317cd5 20330
349ede6a 20331#: builtin/reset.c:297
ef317cd5 20332msgid "reset HEAD and index"
07432cef 20333msgstr "重置 HEAD 和索引"
ef317cd5 20334
349ede6a 20335#: builtin/reset.c:298
ef317cd5 20336msgid "reset only HEAD"
07432cef 20337msgstr "只重置 HEAD"
ef317cd5 20338
349ede6a 20339#: builtin/reset.c:300 builtin/reset.c:302
ef317cd5 20340msgid "reset HEAD, index and working tree"
07432cef 20341msgstr "重置 HEAD、索引和工作区"
ef317cd5 20342
349ede6a 20343#: builtin/reset.c:304
ef317cd5 20344msgid "reset HEAD but keep local changes"
07432cef 20345msgstr "重置 HEAD 但保存本地变更"
ef317cd5 20346
349ede6a 20347#: builtin/reset.c:310
6c94aba5
JX
20348msgid "record only the fact that removed paths will be added later"
20349msgstr "将删除的路径标记为稍后添加"
20350
349ede6a 20351#: builtin/reset.c:344
07432cef
WS
20352#, c-format
20353msgid "Failed to resolve '%s' as a valid revision."
20354msgstr "无法将 '%s' 解析为一个有效的版本。"
20355
349ede6a 20356#: builtin/reset.c:352
07432cef
WS
20357#, c-format
20358msgid "Failed to resolve '%s' as a valid tree."
20359msgstr "无法将 '%s' 解析为一个有效的树对象。"
20360
349ede6a 20361#: builtin/reset.c:361
c04f5ac3 20362msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 20363msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 20364
349ede6a 20365#: builtin/reset.c:371
c04f5ac3 20366msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
d9d56b23 20367msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
c04f5ac3 20368
90e6ef53 20369# 译者:汉字之间无空格,故删除%s前后空格
349ede6a 20370#: builtin/reset.c:373
c04f5ac3
JX
20371#, c-format
20372msgid "Cannot do %s reset with paths."
20373msgstr "不能带路径进行%s重置。"
20374
90e6ef53 20375# 译者:汉字之间无空格,故删除%s前后空格
349ede6a 20376#: builtin/reset.c:388
c04f5ac3
JX
20377#, c-format
20378msgid "%s reset is not allowed in a bare repository"
160fb2b2 20379msgstr "不能对纯仓库进行%s重置"
c04f5ac3 20380
349ede6a 20381#: builtin/reset.c:392
6c94aba5
JX
20382msgid "-N can only be used with --mixed"
20383msgstr "-N 只能和 --mixed 同时使用"
20384
349ede6a 20385#: builtin/reset.c:413
90314792 20386msgid "Unstaged changes after reset:"
160fb2b2 20387msgstr "重置后取消暂存的变更:"
90314792 20388
349ede6a 20389#: builtin/reset.c:416
4c27fcb5
JX
20390#, c-format
20391msgid ""
20392"\n"
20393"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
20394"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
20395"to make this the default.\n"
20396msgstr ""
20397"\n"
20398"重置后,枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n"
20399"将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n"
20400
349ede6a 20401#: builtin/reset.c:434
ef317cd5
JX
20402#, c-format
20403msgid "Could not reset index file to revision '%s'."
20404msgstr "不能重置索引文件至版本 '%s'。"
20405
349ede6a 20406#: builtin/reset.c:439
07432cef
WS
20407msgid "Could not write new index file."
20408msgstr "不能写入新的索引文件。"
20409
2b472aae 20410#: builtin/rev-list.c:499
31e5e17b
JX
20411msgid "cannot combine --exclude-promisor-objects and --missing"
20412msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
20413
2b472aae 20414#: builtin/rev-list.c:560
5809aa05
JX
20415msgid "object filtering requires --objects"
20416msgstr "对象过滤需要 --objects"
20417
2b472aae 20418#: builtin/rev-list.c:610
1b7f4a34
JX
20419msgid "rev-list does not support display of notes"
20420msgstr "rev-list 不支持显示注解"
20421
2b472aae
JX
20422#: builtin/rev-list.c:615
20423msgid "marked counting is incompatible with --objects"
20424msgstr "标记计数和 --objects 不兼容"
5809aa05 20425
349ede6a 20426#: builtin/rev-parse.c:409
814ff314
JX
20427msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
20428msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
ef317cd5 20429
349ede6a 20430#: builtin/rev-parse.c:414
ef317cd5 20431msgid "keep the `--` passed as an arg"
07432cef 20432msgstr "保持 `--` 作为一个参数传递"
ef317cd5 20433
349ede6a 20434#: builtin/rev-parse.c:416
ef317cd5 20435msgid "stop parsing after the first non-option argument"
07432cef 20436msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 20437
349ede6a 20438#: builtin/rev-parse.c:419
cfff71a9
JX
20439msgid "output in stuck long form"
20440msgstr "以固定长格式输出"
20441
349ede6a 20442#: builtin/rev-parse.c:552
ef317cd5 20443msgid ""
814ff314 20444"git rev-parse --parseopt [<options>] -- [<args>...]\n"
ef317cd5 20445" or: git rev-parse --sq-quote [<arg>...]\n"
814ff314 20446" or: git rev-parse [<options>] [<arg>...]\n"
ef317cd5
JX
20447"\n"
20448"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
20449msgstr ""
814ff314 20450"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
90314792 20451" 或者:git rev-parse --sq-quote [<参数>...]\n"
814ff314 20452" 或者:git rev-parse [<选项>] [<参数>...]\n"
07432cef
WS
20453"\n"
20454"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5 20455
c1ac5258 20456#: builtin/revert.c:24
814ff314
JX
20457msgid "git revert [<options>] <commit-ish>..."
20458msgstr "git revert [<选项>] <提交号>..."
ef317cd5 20459
c1ac5258 20460#: builtin/revert.c:25
ef317cd5 20461msgid "git revert <subcommand>"
07432cef 20462msgstr "git revert <子命令>"
ef317cd5 20463
c1ac5258 20464#: builtin/revert.c:30
814ff314
JX
20465msgid "git cherry-pick [<options>] <commit-ish>..."
20466msgstr "git cherry-pick [<选项>] <提交号>..."
ef317cd5 20467
c1ac5258 20468#: builtin/revert.c:31
ef317cd5 20469msgid "git cherry-pick <subcommand>"
07432cef 20470msgstr "git cherry-pick <子命令>"
ef317cd5 20471
06991777
JX
20472#: builtin/revert.c:72
20473#, c-format
20474msgid "option `%s' expects a number greater than zero"
20475msgstr "选项 `%s' 期望一个大于零的数字"
20476
20477#: builtin/revert.c:92
ef317cd5
JX
20478#, c-format
20479msgid "%s: %s cannot be used with %s"
20480msgstr "%s:%s 不能和 %s 同时使用"
20481
d46c5519 20482#: builtin/revert.c:102
ef317cd5 20483msgid "end revert or cherry-pick sequence"
07432cef 20484msgstr "终止反转或拣选操作"
ef317cd5 20485
d46c5519 20486#: builtin/revert.c:103
ef317cd5 20487msgid "resume revert or cherry-pick sequence"
07432cef 20488msgstr "继续反转或拣选操作"
ef317cd5 20489
d46c5519 20490#: builtin/revert.c:104
ef317cd5 20491msgid "cancel revert or cherry-pick sequence"
07432cef 20492msgstr "取消反转或拣选操作"
ef317cd5 20493
a6cd2cc4
JX
20494#: builtin/revert.c:105
20495msgid "skip current commit and continue"
20496msgstr "跳过当前提交并继续"
20497
20498#: builtin/revert.c:107
ef317cd5 20499msgid "don't automatically commit"
07432cef 20500msgstr "不要自动提交"
ef317cd5 20501
a6cd2cc4 20502#: builtin/revert.c:108
ef317cd5 20503msgid "edit the commit message"
07432cef 20504msgstr "编辑提交说明"
ef317cd5 20505
a6cd2cc4 20506#: builtin/revert.c:111
87cb7997 20507msgid "parent-number"
07432cef 20508msgstr "父编号"
ef317cd5 20509
a6cd2cc4 20510#: builtin/revert.c:112
87cb7997
JX
20511msgid "select mainline parent"
20512msgstr "选择主干父提交编号"
20513
a6cd2cc4 20514#: builtin/revert.c:114
ef317cd5 20515msgid "merge strategy"
07432cef 20516msgstr "合并策略"
ef317cd5 20517
a6cd2cc4 20518#: builtin/revert.c:116
ef317cd5 20519msgid "option for merge strategy"
07432cef 20520msgstr "合并策略的选项"
ef317cd5 20521
a6cd2cc4 20522#: builtin/revert.c:125
ef317cd5 20523msgid "append commit name"
07432cef 20524msgstr "追加提交名称"
ef317cd5 20525
a6cd2cc4 20526#: builtin/revert.c:127
ef317cd5 20527msgid "preserve initially empty commits"
07432cef 20528msgstr "保留初始化的空提交"
ef317cd5 20529
a6cd2cc4 20530#: builtin/revert.c:129
ef317cd5 20531msgid "keep redundant, empty commits"
07432cef 20532msgstr "保持多余的、空的提交"
ef317cd5 20533
a6cd2cc4 20534#: builtin/revert.c:232
c04f5ac3
JX
20535msgid "revert failed"
20536msgstr "还原失败"
20537
a6cd2cc4 20538#: builtin/revert.c:245
c04f5ac3
JX
20539msgid "cherry-pick failed"
20540msgstr "拣选失败"
20541
06991777 20542#: builtin/rm.c:19
814ff314
JX
20543msgid "git rm [<options>] [--] <file>..."
20544msgstr "git rm [<选项>] [--] <文件>..."
07432cef 20545
06991777 20546#: builtin/rm.c:207
c04f5ac3 20547msgid ""
2e8451e8
JX
20548"the following file has staged content different from both the\n"
20549"file and the HEAD:"
20550msgid_plural ""
20551"the following files have staged content different from both the\n"
20552"file and the HEAD:"
20553msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
20554msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
20555
06991777 20556#: builtin/rm.c:212
2e8451e8
JX
20557msgid ""
20558"\n"
c04f5ac3
JX
20559"(use -f to force removal)"
20560msgstr ""
2e8451e8 20561"\n"
c04f5ac3
JX
20562"(使用 -f 强制删除)"
20563
06991777 20564#: builtin/rm.c:216
2e8451e8
JX
20565msgid "the following file has changes staged in the index:"
20566msgid_plural "the following files have changes staged in the index:"
160fb2b2
JX
20567msgstr[0] "下列文件索引中有变更"
20568msgstr[1] "下列文件索引中有变更"
c04f5ac3 20569
06991777 20570#: builtin/rm.c:220 builtin/rm.c:229
c04f5ac3 20571msgid ""
2e8451e8 20572"\n"
c04f5ac3
JX
20573"(use --cached to keep the file, or -f to force removal)"
20574msgstr ""
2e8451e8
JX
20575"\n"
20576"(使用 --cached 保留本地文件,或用 -f 强制删除)"
20577
06991777 20578#: builtin/rm.c:226
2e8451e8
JX
20579msgid "the following file has local modifications:"
20580msgid_plural "the following files have local modifications:"
20581msgstr[0] "如下文件有本地修改:"
20582msgstr[1] "如下文件有本地修改:"
c04f5ac3 20583
2b472aae 20584#: builtin/rm.c:243
ef317cd5 20585msgid "do not list removed files"
07432cef 20586msgstr "不列出删除的文件"
ef317cd5 20587
2b472aae 20588#: builtin/rm.c:244
ef317cd5 20589msgid "only remove from the index"
07432cef 20590msgstr "只从索引区删除"
ef317cd5 20591
2b472aae 20592#: builtin/rm.c:245
ef317cd5 20593msgid "override the up-to-date check"
07432cef 20594msgstr "忽略文件更新状态检查"
ef317cd5 20595
2b472aae 20596#: builtin/rm.c:246
ef317cd5 20597msgid "allow recursive removal"
07432cef 20598msgstr "允许递归删除"
ef317cd5 20599
2b472aae 20600#: builtin/rm.c:248
ef317cd5 20601msgid "exit with a zero status even if nothing matched"
07432cef 20602msgstr "即使没有匹配,也以零状态退出"
ef317cd5 20603
2b472aae
JX
20604#: builtin/rm.c:282
20605msgid "No pathspec was given. Which files should I remove?"
440e7442 20606msgstr "没有提供路径规格。我应该删除哪些文件?"
2b472aae
JX
20607
20608#: builtin/rm.c:305
c1ac5258
JX
20609msgid "please stage your changes to .gitmodules or stash them to proceed"
20610msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
20611
2b472aae 20612#: builtin/rm.c:323
c04f5ac3
JX
20613#, c-format
20614msgid "not removing '%s' recursively without -r"
20615msgstr "未提供 -r 选项不会递归删除 '%s'"
20616
2b472aae 20617#: builtin/rm.c:362
c04f5ac3
JX
20618#, c-format
20619msgid "git rm: unable to remove %s"
20620msgstr "git rm:不能删除 %s"
20621
fd8cb379 20622#: builtin/send-pack.c:20
1b7f4a34
JX
20623msgid ""
20624"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
20625"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
20626"[<ref>...]\n"
20627" --all and explicit <ref> specification are mutually exclusive."
20628msgstr ""
20629"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
20630"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
20631" --all 和明确的 <引用> 互斥。"
20632
d9488fea 20633#: builtin/send-pack.c:182
1b7f4a34
JX
20634msgid "remote name"
20635msgstr "远程名称"
20636
d9488fea 20637#: builtin/send-pack.c:195
1b7f4a34
JX
20638msgid "use stateless RPC protocol"
20639msgstr "使用无状态的 RPC 协议"
20640
d9488fea 20641#: builtin/send-pack.c:196
1b7f4a34
JX
20642msgid "read refs from stdin"
20643msgstr "从标准输入读取引用"
20644
d9488fea 20645#: builtin/send-pack.c:197
1b7f4a34
JX
20646msgid "print status from remote helper"
20647msgstr "打印来自远程 helper 的状态"
20648
d9488fea 20649#: builtin/shortlog.c:15
fd8cb379
JX
20650msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
20651msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
20652
d9488fea 20653#: builtin/shortlog.c:16
fd8cb379
JX
20654msgid "git log --pretty=short | git shortlog [<options>]"
20655msgstr "git log --pretty=short | git shortlog [<选项>]"
ef317cd5 20656
d9488fea
JX
20657#: builtin/shortlog.c:134
20658msgid "using multiple --group options with stdin is not supported"
20659msgstr "不支持和标准输入一起使用多个 --group 选项"
20660
20661#: builtin/shortlog.c:144
20662msgid "using --group=trailer with stdin is not supported"
20663msgstr "不支持和标准输入一起使用 --group=trailer"
20664
20665#: builtin/shortlog.c:388
20666#, c-format
20667msgid "unknown group type: %s"
20668msgstr "未知分组类型:%s"
20669
20670#: builtin/shortlog.c:416
1a79b2f1
JX
20671msgid "Group by committer rather than author"
20672msgstr "按照提交者分组而不是作者"
20673
d9488fea 20674#: builtin/shortlog.c:419
ef317cd5 20675msgid "sort output according to the number of commits per author"
07432cef 20676msgstr "根据每个作者的提交数量排序"
ef317cd5 20677
d9488fea 20678#: builtin/shortlog.c:421
ef317cd5 20679msgid "Suppress commit descriptions, only provides commit count"
07432cef 20680msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 20681
d9488fea 20682#: builtin/shortlog.c:423
ef317cd5 20683msgid "Show the email address of each author"
07432cef 20684msgstr "显示每个作者的电子邮件地址"
ef317cd5 20685
d9488fea 20686#: builtin/shortlog.c:424
c1ac5258
JX
20687msgid "<w>[,<i1>[,<i2>]]"
20688msgstr "<w>[,<i1>[,<i2>]]"
ef317cd5 20689
d9488fea 20690#: builtin/shortlog.c:425
ef317cd5 20691msgid "Linewrap output"
07432cef 20692msgstr "折行输出"
ef317cd5 20693
d9488fea
JX
20694#: builtin/shortlog.c:427
20695msgid "field"
20696msgstr "字段"
20697
20698#: builtin/shortlog.c:428
20699msgid "Group by field"
20700msgstr "按字段分组"
20701
20702#: builtin/shortlog.c:456
fd8cb379
JX
20703msgid "too many arguments given outside repository"
20704msgstr "仓库外执行提供了太多的参数"
20705
c1ac5258 20706#: builtin/show-branch.c:13
ef317cd5 20707msgid ""
814ff314 20708"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
20709"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
20710"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
20711"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
ef317cd5 20712msgstr ""
814ff314 20713"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
20714"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
20715"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
20716"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
ef317cd5 20717
c1ac5258 20718#: builtin/show-branch.c:17
814ff314 20719msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
58b6f078 20720msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
ef317cd5 20721
c1ac5258 20722#: builtin/show-branch.c:395
a0b6b246
JX
20723#, c-format
20724msgid "ignoring %s; cannot handle more than %d ref"
20725msgid_plural "ignoring %s; cannot handle more than %d refs"
20726msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
20727msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
20728
a6cd2cc4 20729#: builtin/show-branch.c:548
a0b6b246
JX
20730#, c-format
20731msgid "no matching refs with %s"
20732msgstr "没有和 %s 匹配的引用"
20733
a6cd2cc4 20734#: builtin/show-branch.c:645
ef317cd5 20735msgid "show remote-tracking and local branches"
07432cef 20736msgstr "显示远程跟踪的和本地的分支"
ef317cd5 20737
a6cd2cc4 20738#: builtin/show-branch.c:647
ef317cd5 20739msgid "show remote-tracking branches"
07432cef 20740msgstr "显示远程跟踪的分支"
ef317cd5 20741
a6cd2cc4 20742#: builtin/show-branch.c:649
ef317cd5 20743msgid "color '*!+-' corresponding to the branch"
07432cef 20744msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 20745
a6cd2cc4 20746#: builtin/show-branch.c:651
ef317cd5 20747msgid "show <n> more commits after the common ancestor"
07432cef 20748msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 20749
a6cd2cc4 20750#: builtin/show-branch.c:653
ef317cd5 20751msgid "synonym to more=-1"
07432cef 20752msgstr "和 more=-1 同义"
ef317cd5 20753
a6cd2cc4 20754#: builtin/show-branch.c:654
ef317cd5 20755msgid "suppress naming strings"
07432cef 20756msgstr "不显示字符串命名"
ef317cd5 20757
a6cd2cc4 20758#: builtin/show-branch.c:656
ef317cd5 20759msgid "include the current branch"
07432cef 20760msgstr "包括当前分支"
ef317cd5 20761
a6cd2cc4 20762#: builtin/show-branch.c:658
ef317cd5 20763msgid "name commits with their object names"
07432cef 20764msgstr "以对象名字命名提交"
ef317cd5 20765
a6cd2cc4 20766#: builtin/show-branch.c:660
ef317cd5 20767msgid "show possible merge bases"
07432cef 20768msgstr "显示可能合并的基线"
ef317cd5 20769
a6cd2cc4 20770#: builtin/show-branch.c:662
ef317cd5 20771msgid "show refs unreachable from any other ref"
07432cef 20772msgstr "显示没有任何引用的的引用"
ef317cd5 20773
a6cd2cc4 20774#: builtin/show-branch.c:664
ef317cd5 20775msgid "show commits in topological order"
07432cef 20776msgstr "以拓扑顺序显示提交"
ef317cd5 20777
a6cd2cc4 20778#: builtin/show-branch.c:667
ef317cd5 20779msgid "show only commits not on the first branch"
07432cef 20780msgstr "只显示不在第一个分支上的提交"
ef317cd5 20781
a6cd2cc4 20782#: builtin/show-branch.c:669
ef317cd5 20783msgid "show merges reachable from only one tip"
07432cef 20784msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 20785
a6cd2cc4 20786#: builtin/show-branch.c:671
2e8451e8
JX
20787msgid "topologically sort, maintaining date order where possible"
20788msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 20789
a6cd2cc4 20790#: builtin/show-branch.c:674
ef317cd5 20791msgid "<n>[,<base>]"
07432cef 20792msgstr "<n>[,<base>]"
ef317cd5 20793
a6cd2cc4 20794#: builtin/show-branch.c:675
ef317cd5 20795msgid "show <n> most recent ref-log entries starting at base"
58b6f078 20796msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
ef317cd5 20797
a6cd2cc4 20798#: builtin/show-branch.c:711
a0b6b246
JX
20799msgid ""
20800"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
20801msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
20802
a6cd2cc4 20803#: builtin/show-branch.c:735
a0b6b246
JX
20804msgid "no branches given, and HEAD is not valid"
20805msgstr "未提供分支,且 HEAD 无效"
20806
a6cd2cc4 20807#: builtin/show-branch.c:738
a0b6b246
JX
20808msgid "--reflog option needs one branch name"
20809msgstr "选项 --reflog 需要一个分支名"
20810
a6cd2cc4 20811#: builtin/show-branch.c:741
a0b6b246
JX
20812#, c-format
20813msgid "only %d entry can be shown at one time."
20814msgid_plural "only %d entries can be shown at one time."
20815msgstr[0] "一次只能显示 %d 个条目。"
20816msgstr[1] "一次只能显示 %d 个条目。"
20817
a6cd2cc4 20818#: builtin/show-branch.c:745
a0b6b246
JX
20819#, c-format
20820msgid "no such ref %s"
20821msgstr "无此引用 %s"
20822
a6cd2cc4 20823#: builtin/show-branch.c:831
a0b6b246
JX
20824#, c-format
20825msgid "cannot handle more than %d rev."
20826msgid_plural "cannot handle more than %d revs."
20827msgstr[0] "不能处理 %d 个以上的版本。"
20828msgstr[1] "不能处理 %d 个以上的版本。"
20829
a6cd2cc4 20830#: builtin/show-branch.c:835
a0b6b246
JX
20831#, c-format
20832msgid "'%s' is not a valid ref."
20833msgstr "'%s' 不是一个有效的引用。"
20834
a6cd2cc4 20835#: builtin/show-branch.c:838
a0b6b246
JX
20836#, c-format
20837msgid "cannot find commit %s (%s)"
29004bbb 20838msgstr "不能找到提交 %s(%s)"
a0b6b246 20839
7157c2b5
JX
20840#: builtin/show-index.c:21
20841msgid "hash-algorithm"
20842msgstr "哈希算法"
20843
20844#: builtin/show-index.c:31
20845msgid "Unknown hash algorithm"
20846msgstr "未知的哈希算法"
20847
d46c5519 20848#: builtin/show-ref.c:12
ef317cd5 20849msgid ""
814ff314
JX
20850"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
20851"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
ef317cd5 20852msgstr ""
814ff314
JX
20853"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
20854"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
ef317cd5 20855
d46c5519 20856#: builtin/show-ref.c:13
94550ed3
JX
20857msgid "git show-ref --exclude-existing[=<pattern>]"
20858msgstr "git show-ref --exclude-existing[=<模式>]"
ef317cd5 20859
d46c5519 20860#: builtin/show-ref.c:162
ef317cd5 20861msgid "only show tags (can be combined with heads)"
55a16ee4 20862msgstr "只显示标签(可以和头共用)"
ef317cd5 20863
d46c5519 20864#: builtin/show-ref.c:163
ef317cd5 20865msgid "only show heads (can be combined with tags)"
55a16ee4 20866msgstr "只显示头(可以和标签共用)"
ef317cd5 20867
d46c5519 20868#: builtin/show-ref.c:164
ef317cd5 20869msgid "stricter reference checking, requires exact ref path"
07432cef 20870msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 20871
d46c5519 20872#: builtin/show-ref.c:167 builtin/show-ref.c:169
2e8451e8
JX
20873msgid "show the HEAD reference, even if it would be filtered out"
20874msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 20875
d46c5519 20876#: builtin/show-ref.c:171
ef317cd5 20877msgid "dereference tags into object IDs"
4375c10e 20878msgstr "转换标签到对象 ID"
ef317cd5 20879
d46c5519
JX
20880#: builtin/show-ref.c:173
20881msgid "only show SHA1 hash using <n> digits"
20882msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
20883
20884#: builtin/show-ref.c:177
20885msgid "do not print results to stdout (useful with --verify)"
20886msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
20887
20888#: builtin/show-ref.c:179
20889msgid "show refs from stdin that aren't in local repository"
20890msgstr "显示从标准输入中读入的不在本地仓库中的引用"
20891
2b472aae 20892#: builtin/sparse-checkout.c:21
349ede6a
JX
20893msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
20894msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <选项>"
ddc12c42 20895
d9488fea
JX
20896#: builtin/sparse-checkout.c:50
20897msgid "git sparse-checkout list"
20898msgstr "git sparse-checkout list"
20899
20900#: builtin/sparse-checkout.c:76
ddc12c42
JX
20901msgid "this worktree is not sparse (sparse-checkout file may not exist)"
20902msgstr "本工作区不是稀疏模式(稀疏检出文件可能不存在)"
20903
d9488fea 20904#: builtin/sparse-checkout.c:228
2b472aae
JX
20905msgid "failed to create directory for sparse-checkout file"
20906msgstr "无法为稀疏检出文件创建目录"
20907
d9488fea 20908#: builtin/sparse-checkout.c:269
7157c2b5
JX
20909msgid "unable to upgrade repository format to enable worktreeConfig"
20910msgstr "无法升级仓库格式以启用 worktreeConfig"
20911
d9488fea 20912#: builtin/sparse-checkout.c:271
ddc12c42
JX
20913msgid "failed to set extensions.worktreeConfig setting"
20914msgstr "无法设置 extensions.worktreeConfig"
20915
d9488fea 20916#: builtin/sparse-checkout.c:288
ddc12c42
JX
20917msgid "git sparse-checkout init [--cone]"
20918msgstr "git sparse-checkout init [--cone]"
20919
d9488fea 20920#: builtin/sparse-checkout.c:307
ddc12c42
JX
20921msgid "initialize the sparse-checkout in cone mode"
20922msgstr "初始化稀疏检出为 cone 模式"
20923
d9488fea 20924#: builtin/sparse-checkout.c:344
ddc12c42
JX
20925#, c-format
20926msgid "failed to open '%s'"
20927msgstr "无法打开 '%s'"
20928
d9488fea 20929#: builtin/sparse-checkout.c:401
2b472aae
JX
20930#, c-format
20931msgid "could not normalize path %s"
20932msgstr "无法规范化路径 %s"
20933
d9488fea 20934#: builtin/sparse-checkout.c:413
2b472aae
JX
20935msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
20936msgstr "git sparse-checkout (set|add) (--stdin | <模式>)"
20937
d9488fea 20938#: builtin/sparse-checkout.c:438
2b472aae
JX
20939#, c-format
20940msgid "unable to unquote C-style string '%s'"
440e7442 20941msgstr "无法为 C 语言风格的字符串 '%s' 去引号"
2b472aae 20942
d9488fea 20943#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516
2b472aae
JX
20944msgid "unable to load existing sparse-checkout patterns"
20945msgstr "无法加载现存的稀疏检出模式"
ddc12c42 20946
d9488fea 20947#: builtin/sparse-checkout.c:561
ddc12c42
JX
20948msgid "read patterns from standard in"
20949msgstr "从标准输入读取模式"
20950
d9488fea
JX
20951#: builtin/sparse-checkout.c:576
20952msgid "git sparse-checkout reapply"
20953msgstr "git sparse-checkout reapply"
20954
20955#: builtin/sparse-checkout.c:595
20956msgid "git sparse-checkout disable"
20957msgstr "git sparse-checkout disable"
20958
20959#: builtin/sparse-checkout.c:623
ddc12c42
JX
20960msgid "error while refreshing working directory"
20961msgstr "刷新工作目录时出错"
20962
2b472aae 20963#: builtin/stash.c:22 builtin/stash.c:38
d46c5519
JX
20964msgid "git stash list [<options>]"
20965msgstr "git stash list [<选项>]"
20966
2b472aae 20967#: builtin/stash.c:23 builtin/stash.c:43
d46c5519
JX
20968msgid "git stash show [<options>] [<stash>]"
20969msgstr "git stash show [<选项>] [<stash>]"
20970
2b472aae 20971#: builtin/stash.c:24 builtin/stash.c:48
d46c5519
JX
20972msgid "git stash drop [-q|--quiet] [<stash>]"
20973msgstr "git stash drop [-q|--quiet] [<stash>]"
20974
20975#: builtin/stash.c:25
20976msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
20977msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
20978
2b472aae 20979#: builtin/stash.c:26 builtin/stash.c:63
d46c5519
JX
20980msgid "git stash branch <branchname> [<stash>]"
20981msgstr "git stash branch <分支名> [<stash>]"
20982
2b472aae 20983#: builtin/stash.c:27 builtin/stash.c:68
d46c5519
JX
20984msgid "git stash clear"
20985msgstr "git stash clear"
20986
2b472aae 20987#: builtin/stash.c:28
d46c5519
JX
20988msgid ""
20989"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20990" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
2b472aae 20991" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
d46c5519
JX
20992" [--] [<pathspec>...]]"
20993msgstr ""
20994"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20995" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
2b472aae 20996" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
d46c5519
JX
20997" [--] [<路径规格>...]]"
20998
2b472aae 20999#: builtin/stash.c:32 builtin/stash.c:85
d46c5519
JX
21000msgid ""
21001"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
21002" [-u|--include-untracked] [-a|--all] [<message>]"
21003msgstr ""
21004"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
21005" [-u|--include-untracked] [-a|--all] [<消息>]"
21006
2b472aae 21007#: builtin/stash.c:53
d46c5519
JX
21008msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
21009msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
21010
2b472aae 21011#: builtin/stash.c:58
d46c5519
JX
21012msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
21013msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
21014
2b472aae 21015#: builtin/stash.c:73
d46c5519
JX
21016msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
21017msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>"
21018
2b472aae
JX
21019#: builtin/stash.c:78
21020msgid ""
21021"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
21022" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
21023" [--] [<pathspec>...]]"
21024msgstr ""
21025"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
21026" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
21027" [--] [<路径规格>...]]"
21028
21029#: builtin/stash.c:128
d46c5519
JX
21030#, c-format
21031msgid "'%s' is not a stash-like commit"
21032msgstr "'%s' 不像是一个贮藏提交"
21033
2b472aae 21034#: builtin/stash.c:148
d46c5519
JX
21035#, c-format
21036msgid "Too many revisions specified:%s"
21037msgstr "指定了太多的版本:%s"
21038
349ede6a 21039#: builtin/stash.c:162
d46c5519
JX
21040msgid "No stash entries found."
21041msgstr "未发现贮藏条目。"
21042
2b472aae 21043#: builtin/stash.c:176
d46c5519
JX
21044#, c-format
21045msgid "%s is not a valid reference"
21046msgstr "%s 不是一个有效的引用名"
21047
349ede6a 21048#: builtin/stash.c:225
d46c5519
JX
21049msgid "git stash clear with parameters is unimplemented"
21050msgstr "git stash clear 不支持参数"
21051
2b472aae 21052#: builtin/stash.c:404
d46c5519 21053msgid "cannot apply a stash in the middle of a merge"
349ede6a 21054msgstr "无法在合并过程中应用贮藏"
d46c5519 21055
2b472aae 21056#: builtin/stash.c:415
d46c5519
JX
21057#, c-format
21058msgid "could not generate diff %s^!."
21059msgstr "无法生成差异 %s^!."
21060
2b472aae 21061#: builtin/stash.c:422
d46c5519
JX
21062msgid "conflicts in index.Try without --index."
21063msgstr "索引中有冲突。尝试不用 --index。"
21064
2b472aae 21065#: builtin/stash.c:428
d46c5519
JX
21066msgid "could not save index tree"
21067msgstr "不能保存索引树"
21068
2b472aae 21069#: builtin/stash.c:437
d46c5519
JX
21070msgid "could not restore untracked files from stash"
21071msgstr "无法从贮藏条目中恢复未跟踪文件"
21072
2b472aae 21073#: builtin/stash.c:451
d46c5519
JX
21074#, c-format
21075msgid "Merging %s with %s"
21076msgstr "正在合并 %s 和 %s"
21077
349ede6a 21078#: builtin/stash.c:461
d46c5519
JX
21079msgid "Index was not unstashed."
21080msgstr "索引未从贮藏中恢复。"
21081
2b472aae 21082#: builtin/stash.c:522 builtin/stash.c:621
d46c5519
JX
21083msgid "attempt to recreate the index"
21084msgstr "尝试重建索引"
21085
2b472aae 21086#: builtin/stash.c:555
d46c5519
JX
21087#, c-format
21088msgid "Dropped %s (%s)"
21089msgstr "丢弃了 %s(%s)"
21090
2b472aae 21091#: builtin/stash.c:558
d46c5519
JX
21092#, c-format
21093msgid "%s: Could not drop stash entry"
21094msgstr "%s:无法丢弃贮藏条目"
21095
2b472aae 21096#: builtin/stash.c:583
d46c5519
JX
21097#, c-format
21098msgid "'%s' is not a stash reference"
21099msgstr "'%s' 不是一个贮藏引用"
21100
349ede6a 21101#: builtin/stash.c:633
d46c5519
JX
21102msgid "The stash entry is kept in case you need it again."
21103msgstr "贮藏条目被保留以备您再次需要。"
21104
349ede6a 21105#: builtin/stash.c:656
d46c5519
JX
21106msgid "No branch name specified"
21107msgstr "未指定分支名"
21108
349ede6a 21109#: builtin/stash.c:800 builtin/stash.c:837
d46c5519
JX
21110#, c-format
21111msgid "Cannot update %s with %s"
21112msgstr "无法用 %2$s 更新 %1$s"
21113
d9488fea 21114#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537
d46c5519
JX
21115msgid "stash message"
21116msgstr "贮藏说明"
21117
349ede6a 21118#: builtin/stash.c:828
d46c5519
JX
21119msgid "\"git stash store\" requires one <commit> argument"
21120msgstr "\"git stash store\" 需要一个 <提交> 参数"
21121
d9488fea 21122#: builtin/stash.c:1043
d46c5519
JX
21123msgid "No changes selected"
21124msgstr "没有选择变更"
21125
d9488fea 21126#: builtin/stash.c:1143
d46c5519
JX
21127msgid "You do not have the initial commit yet"
21128msgstr "您尚未建立初始提交"
21129
d9488fea 21130#: builtin/stash.c:1170
d46c5519
JX
21131msgid "Cannot save the current index state"
21132msgstr "无法保存当前索引状态"
21133
d9488fea 21134#: builtin/stash.c:1179
d46c5519
JX
21135msgid "Cannot save the untracked files"
21136msgstr "无法保存未跟踪文件"
21137
d9488fea 21138#: builtin/stash.c:1190 builtin/stash.c:1199
d46c5519
JX
21139msgid "Cannot save the current worktree state"
21140msgstr "无法保存当前工作区状态"
21141
d9488fea 21142#: builtin/stash.c:1227
d46c5519
JX
21143msgid "Cannot record working tree state"
21144msgstr "不能记录工作区状态"
21145
d9488fea 21146#: builtin/stash.c:1276
d46c5519
JX
21147msgid "Can't use --patch and --include-untracked or --all at the same time"
21148msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
21149
d9488fea 21150#: builtin/stash.c:1292
d46c5519
JX
21151msgid "Did you forget to 'git add'?"
21152msgstr "您是否忘了执行 'git add'?"
21153
d9488fea 21154#: builtin/stash.c:1307
d46c5519
JX
21155msgid "No local changes to save"
21156msgstr "没有要保存的本地修改"
21157
d9488fea 21158#: builtin/stash.c:1314
d46c5519
JX
21159msgid "Cannot initialize stash"
21160msgstr "无法初始化贮藏"
21161
d9488fea 21162#: builtin/stash.c:1329
d46c5519
JX
21163msgid "Cannot save the current status"
21164msgstr "无法保存当前状态"
21165
d9488fea 21166#: builtin/stash.c:1334
d46c5519
JX
21167#, c-format
21168msgid "Saved working directory and index state %s"
21169msgstr "保存工作目录和索引状态 %s"
21170
d9488fea 21171#: builtin/stash.c:1424
d46c5519
JX
21172msgid "Cannot remove worktree changes"
21173msgstr "无法删除工作区变更"
21174
d9488fea 21175#: builtin/stash.c:1463 builtin/stash.c:1528
d46c5519
JX
21176msgid "keep index"
21177msgstr "保持索引"
21178
d9488fea 21179#: builtin/stash.c:1465 builtin/stash.c:1530
d46c5519
JX
21180msgid "stash in patch mode"
21181msgstr "以补丁模式贮藏"
21182
d9488fea 21183#: builtin/stash.c:1466 builtin/stash.c:1531
d46c5519
JX
21184msgid "quiet mode"
21185msgstr "静默模式"
21186
d9488fea 21187#: builtin/stash.c:1468 builtin/stash.c:1533
d46c5519
JX
21188msgid "include untracked files in stash"
21189msgstr "贮藏中包含未跟踪文件"
ef317cd5 21190
d9488fea 21191#: builtin/stash.c:1470 builtin/stash.c:1535
d46c5519
JX
21192msgid "include ignore files"
21193msgstr "包含忽略的文件"
ef317cd5 21194
d9488fea 21195#: builtin/stash.c:1570
349ede6a
JX
21196msgid ""
21197"the stash.useBuiltin support has been removed!\n"
21198"See its entry in 'git help config' for details."
21199msgstr ""
21200"对 stash.useBuiltin 的支持已被删除!\n"
21201"详见 'git help config' 中的条目。"
ef317cd5 21202
a4f16749 21203#: builtin/stripspace.c:18
94550ed3
JX
21204msgid "git stripspace [-s | --strip-comments]"
21205msgstr "git stripspace [-s | --strip-comments]"
21206
a4f16749 21207#: builtin/stripspace.c:19
94550ed3
JX
21208msgid "git stripspace [-c | --comment-lines]"
21209msgstr "git stripspace [-c | --comment-lines]"
21210
06991777 21211#: builtin/stripspace.c:37
94550ed3
JX
21212msgid "skip and remove all lines starting with comment character"
21213msgstr "跳过和移除所有的注释行"
21214
06991777 21215#: builtin/stripspace.c:40
276ceeaa 21216msgid "prepend comment character and space to each line"
94550ed3
JX
21217msgstr "为每一行的行首添加注释符和空格"
21218
d9488fea 21219#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
5b04ee3b
JX
21220#, c-format
21221msgid "Expecting a full ref name, got %s"
21222msgstr "期望一个完整的引用名称,却得到 %s"
21223
ddc12c42 21224#: builtin/submodule--helper.c:64
31e5e17b
JX
21225msgid "submodule--helper print-default-remote takes no arguments"
21226msgstr "submodule--helper print-default-remote 不带参数"
21227
ddc12c42 21228#: builtin/submodule--helper.c:102
5b04ee3b
JX
21229#, c-format
21230msgid "cannot strip one component off url '%s'"
21231msgstr "无法从 url '%s' 剥离一个组件"
21232
d9488fea 21233#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
94550ed3
JX
21234msgid "alternative anchor for relative paths"
21235msgstr "相对路径的替代锚记(anchor)"
21236
ddc12c42 21237#: builtin/submodule--helper.c:415
94550ed3
JX
21238msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
21239msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
21240
d9488fea
JX
21241#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
21242#: builtin/submodule--helper.c:652
5b04ee3b
JX
21243#, c-format
21244msgid "No url found for submodule path '%s' in .gitmodules"
21245msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
21246
ddc12c42 21247#: builtin/submodule--helper.c:524
c1ac5258
JX
21248#, c-format
21249msgid "Entering '%s'\n"
21250msgstr "进入 '%s'\n"
21251
ddc12c42 21252#: builtin/submodule--helper.c:527
c1ac5258
JX
21253#, c-format
21254msgid ""
21255"run_command returned non-zero status for %s\n"
21256"."
4c27fcb5
JX
21257msgstr ""
21258"对 %s 执行 run_command 返回非零值。\n"
21259"."
c1ac5258 21260
ddc12c42 21261#: builtin/submodule--helper.c:549
c1ac5258
JX
21262#, c-format
21263msgid ""
21264"run_command returned non-zero status while recursing in the nested "
21265"submodules of %s\n"
21266"."
4c27fcb5
JX
21267msgstr ""
21268"在递归 %s 的子模组执行 run_command 时返回非零值。\n"
21269"."
c1ac5258 21270
ddc12c42 21271#: builtin/submodule--helper.c:565
c1ac5258
JX
21272msgid "Suppress output of entering each submodule command"
21273msgstr "阻止进入每一个子模组命令的输出"
21274
d9488fea 21275#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487
c1ac5258
JX
21276msgid "Recurse into nested submodules"
21277msgstr "递归进入嵌套子模组中"
21278
ddc12c42 21279#: builtin/submodule--helper.c:572
d46c5519
JX
21280msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
21281msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
c1ac5258 21282
ddc12c42 21283#: builtin/submodule--helper.c:599
87cb7997
JX
21284#, c-format
21285msgid ""
4c27fcb5 21286"could not look up configuration '%s'. Assuming this repository is its own "
87cb7997
JX
21287"authoritative upstream."
21288msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
21289
d9488fea 21290#: builtin/submodule--helper.c:666
5b04ee3b
JX
21291#, c-format
21292msgid "Failed to register url for submodule path '%s'"
21293msgstr "无法为子模组 '%s' 注册 url"
21294
d9488fea 21295#: builtin/submodule--helper.c:670
5b04ee3b
JX
21296#, c-format
21297msgid "Submodule '%s' (%s) registered for path '%s'\n"
25c75902 21298msgstr "子模组 '%s'(%s)已对路径 '%s' 注册\n"
5b04ee3b 21299
d9488fea 21300#: builtin/submodule--helper.c:680
aef18cc6 21301#, c-format
5b04ee3b 21302msgid "warning: command update mode suggested for submodule '%s'\n"
aef18cc6 21303msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
5b04ee3b 21304
d9488fea 21305#: builtin/submodule--helper.c:687
5b04ee3b
JX
21306#, c-format
21307msgid "Failed to register update mode for submodule path '%s'"
21308msgstr "无法为子模组 '%s' 注册更新模式"
21309
d9488fea 21310#: builtin/submodule--helper.c:709
5b04ee3b 21311msgid "Suppress output for initializing a submodule"
31e5e17b 21312msgstr "阻止子模组初始化的输出"
5b04ee3b 21313
d9488fea 21314#: builtin/submodule--helper.c:714
d46c5519
JX
21315msgid "git submodule--helper init [<options>] [<path>]"
21316msgstr "git submodule--helper init [<选项>] [<路径>]"
5b04ee3b 21317
d9488fea 21318#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
94550ed3
JX
21319#, c-format
21320msgid "no submodule mapping found in .gitmodules for path '%s'"
21321msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
21322
d9488fea 21323#: builtin/submodule--helper.c:835
5809aa05
JX
21324#, c-format
21325msgid "could not resolve HEAD ref inside the submodule '%s'"
21326msgstr "无法解析子模组 '%s' 的 HEAD 引用"
21327
d9488fea 21328#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
5809aa05
JX
21329#, c-format
21330msgid "failed to recurse into submodule '%s'"
c1ac5258 21331msgstr "递归子模组 '%s' 失败"
5809aa05 21332
d9488fea 21333#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
5809aa05 21334msgid "Suppress submodule status output"
31e5e17b 21335msgstr "阻止子模组状态输出"
5809aa05 21336
d9488fea 21337#: builtin/submodule--helper.c:887
5809aa05
JX
21338msgid ""
21339"Use commit stored in the index instead of the one stored in the submodule "
21340"HEAD"
21341msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交"
21342
d9488fea 21343#: builtin/submodule--helper.c:888
5809aa05 21344msgid "recurse into nested submodules"
31e5e17b 21345msgstr "递归进入嵌套子模组中"
5809aa05 21346
d9488fea 21347#: builtin/submodule--helper.c:893
5809aa05
JX
21348msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
21349msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
21350
d9488fea 21351#: builtin/submodule--helper.c:917
5809aa05
JX
21352msgid "git submodule--helper name <path>"
21353msgstr "git submodule--helper name <路径>"
21354
d9488fea
JX
21355#: builtin/submodule--helper.c:989
21356#, c-format
21357msgid "* %s %s(blob)->%s(submodule)"
21358msgstr "* %s %s(数据对象)->%s(子模组)"
21359
21360#: builtin/submodule--helper.c:992
21361#, c-format
21362msgid "* %s %s(submodule)->%s(blob)"
21363msgstr "* %s %s(子模组)->%s(数据对象)"
21364
21365#: builtin/submodule--helper.c:1005
21366#, c-format
21367msgid "%s"
21368msgstr "%s"
21369
21370#: builtin/submodule--helper.c:1055
21371#, c-format
21372msgid "couldn't hash object from '%s'"
21373msgstr "不能从 '%s' 创建哈希对象"
21374
21375#: builtin/submodule--helper.c:1059
21376#, c-format
21377msgid "unexpected mode %o\n"
21378msgstr "意外的模式 %o\n"
21379
21380#: builtin/submodule--helper.c:1300
21381msgid "use the commit stored in the index instead of the submodule HEAD"
21382msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交"
21383
21384#: builtin/submodule--helper.c:1302
21385msgid "to compare the commit in the index with that in the submodule HEAD"
21386msgstr "比较存储在索引和子模组 HEAD 中的提交"
21387
21388#: builtin/submodule--helper.c:1304
21389msgid "skip submodules with 'ignore_config' value set to 'all'"
21390msgstr "跳过设置了 'ignore_config' 为 'all' 的子模组"
21391
21392#: builtin/submodule--helper.c:1306
21393msgid "limit the summary size"
21394msgstr "限制总结的大小"
21395
21396#: builtin/submodule--helper.c:1311
21397msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
21398msgstr "git submodule--helper summary [<选项>] [<提交>] [--] [<路径>]"
21399
21400#: builtin/submodule--helper.c:1335
21401msgid "could not fetch a revision for HEAD"
21402msgstr "不能为 HEAD 获取一个版本"
21403
21404#: builtin/submodule--helper.c:1340
21405msgid "--cached and --files are mutually exclusive"
21406msgstr "--cached 和 --files 是互斥的"
21407
21408#: builtin/submodule--helper.c:1407
31e5e17b
JX
21409#, c-format
21410msgid "Synchronizing submodule url for '%s'\n"
21411msgstr "为 '%s' 同步子模组 url\n"
21412
d9488fea 21413#: builtin/submodule--helper.c:1413
31e5e17b
JX
21414#, c-format
21415msgid "failed to register url for submodule path '%s'"
21416msgstr "无法为子模组路径 '%s' 注册 url"
21417
d9488fea 21418#: builtin/submodule--helper.c:1427
31e5e17b
JX
21419#, c-format
21420msgid "failed to get the default remote for submodule '%s'"
21421msgstr "无法得到子模组 '%s' 的默认远程关联"
21422
d9488fea 21423#: builtin/submodule--helper.c:1438
31e5e17b
JX
21424#, c-format
21425msgid "failed to update remote for submodule '%s'"
21426msgstr "无法为子模组 '%s' 更新远程关联"
21427
d9488fea 21428#: builtin/submodule--helper.c:1485
31e5e17b
JX
21429msgid "Suppress output of synchronizing submodule url"
21430msgstr "阻止子模组 url 同步的输出"
21431
d9488fea 21432#: builtin/submodule--helper.c:1492
31e5e17b
JX
21433msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
21434msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
21435
d9488fea 21436#: builtin/submodule--helper.c:1546
31e5e17b
JX
21437#, c-format
21438msgid ""
21439"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
21440"really want to remove it including all of its history)"
21441msgstr ""
fd8cb379
JX
21442"子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm "
21443"-rf' 命令)"
31e5e17b 21444
d9488fea 21445#: builtin/submodule--helper.c:1558
31e5e17b
JX
21446#, c-format
21447msgid ""
21448"Submodule work tree '%s' contains local modifications; use '-f' to discard "
21449"them"
21450msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们"
21451
d9488fea 21452#: builtin/submodule--helper.c:1566
31e5e17b
JX
21453#, c-format
21454msgid "Cleared directory '%s'\n"
21455msgstr "已清除目录 '%s'\n"
21456
d9488fea 21457#: builtin/submodule--helper.c:1568
31e5e17b
JX
21458#, c-format
21459msgid "Could not remove submodule work tree '%s'\n"
21460msgstr "无法移除子模组工作区 '%s'\n"
21461
d9488fea 21462#: builtin/submodule--helper.c:1579
31e5e17b
JX
21463#, c-format
21464msgid "could not create empty submodule directory %s"
21465msgstr "不能创建空的子模组目录 %s"
21466
d9488fea 21467#: builtin/submodule--helper.c:1595
31e5e17b
JX
21468#, c-format
21469msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
21470msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
21471
d9488fea 21472#: builtin/submodule--helper.c:1624
31e5e17b
JX
21473msgid "Remove submodule working trees even if they contain local changes"
21474msgstr "删除子模组工作区,即使包含本地修改"
21475
d9488fea 21476#: builtin/submodule--helper.c:1625
31e5e17b
JX
21477msgid "Unregister all submodules"
21478msgstr "将所有子模组取消注册"
21479
d9488fea 21480#: builtin/submodule--helper.c:1630
31e5e17b
JX
21481msgid ""
21482"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
21483msgstr ""
21484"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
21485
d9488fea 21486#: builtin/submodule--helper.c:1644
31e5e17b
JX
21487msgid "Use '--all' if you really want to deinitialize all submodules"
21488msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
21489
d9488fea 21490#: builtin/submodule--helper.c:1713
ddc12c42
JX
21491msgid ""
21492"An alternate computed from a superproject's alternate is invalid.\n"
21493"To allow Git to clone without an alternate in such a case, set\n"
21494"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
21495"'--reference-if-able' instead of '--reference'."
21496msgstr ""
21497"从一个父项目的备用仓库中计算出的备用仓库无效。\n"
21498"此场景下,设置 submodule.alternateErrorStrategy 为 'info',以允许\n"
21499"Git 不使用备用仓库克隆,或者等效地使用 '--reference-if-able' 而非\n"
21500"'--reference' 来克隆。"
21501
d9488fea 21502#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
a0b6b246
JX
21503#, c-format
21504msgid "submodule '%s' cannot add alternate: %s"
21505msgstr "子模组 '%s' 不能添加仓库备选:%s"
21506
d9488fea 21507#: builtin/submodule--helper.c:1791
a0b6b246
JX
21508#, c-format
21509msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
21510msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
21511
d9488fea 21512#: builtin/submodule--helper.c:1798
a0b6b246
JX
21513#, c-format
21514msgid "Value '%s' for submodule.alternateLocation is not recognized"
21515msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
21516
d9488fea 21517#: builtin/submodule--helper.c:1822
94550ed3
JX
21518msgid "where the new submodule will be cloned to"
21519msgstr "新的子模组将要克隆的路径"
21520
d9488fea 21521#: builtin/submodule--helper.c:1825
94550ed3
JX
21522msgid "name of the new submodule"
21523msgstr "新子模组的名称"
21524
d9488fea 21525#: builtin/submodule--helper.c:1828
94550ed3
JX
21526msgid "url where to clone the submodule from"
21527msgstr "克隆子模组的 url 地址"
21528
d9488fea 21529#: builtin/submodule--helper.c:1836
94550ed3
JX
21530msgid "depth for shallow clones"
21531msgstr "浅克隆的深度"
21532
d9488fea 21533#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
a0b6b246 21534msgid "force cloning progress"
29004bbb 21535msgstr "强制显示克隆进度"
a0b6b246 21536
d9488fea 21537#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
ddc12c42
JX
21538msgid "disallow cloning into non-empty directory"
21539msgstr "不允许克隆到一个非空目录"
21540
d9488fea 21541#: builtin/submodule--helper.c:1848
94550ed3
JX
21542msgid ""
21543"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
2b472aae
JX
21544"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
21545"<url> --path <path>"
5c57d762
JX
21546msgstr ""
21547"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
2b472aae 21548"[--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>"
94550ed3 21549
d9488fea 21550#: builtin/submodule--helper.c:1873
ddc12c42
JX
21551#, c-format
21552msgid "refusing to create/use '%s' in another submodule's git dir"
21553msgstr "拒绝在另一个子模组的 git dir 中创建/使用 '%s'"
21554
d9488fea 21555#: builtin/submodule--helper.c:1884
94550ed3
JX
21556#, c-format
21557msgid "clone of '%s' into submodule path '%s' failed"
21558msgstr "无法克隆 '%s' 到子模组路径 '%s'"
21559
d9488fea 21560#: builtin/submodule--helper.c:1888
ddc12c42
JX
21561#, c-format
21562msgid "directory not empty: '%s'"
21563msgstr "目录非空:'%s'"
21564
d9488fea 21565#: builtin/submodule--helper.c:1900
94550ed3
JX
21566#, c-format
21567msgid "could not get submodule directory for '%s'"
21568msgstr "无法得到 '%s' 的子模组目录"
21569
d9488fea 21570#: builtin/submodule--helper.c:1936
4c27fcb5
JX
21571#, c-format
21572msgid "Invalid update mode '%s' for submodule path '%s'"
21573msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效"
21574
d9488fea 21575#: builtin/submodule--helper.c:1940
4c27fcb5
JX
21576#, c-format
21577msgid "Invalid update mode '%s' configured for submodule path '%s'"
21578msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效"
21579
d9488fea 21580#: builtin/submodule--helper.c:2041
5b04ee3b
JX
21581#, c-format
21582msgid "Submodule path '%s' not initialized"
21583msgstr "子模组 '%s' 尚未初始化"
21584
d9488fea 21585#: builtin/submodule--helper.c:2045
5b04ee3b
JX
21586msgid "Maybe you want to use 'update --init'?"
21587msgstr "也许您想要执行 'update --init'?"
21588
d9488fea 21589#: builtin/submodule--helper.c:2075
5b04ee3b
JX
21590#, c-format
21591msgid "Skipping unmerged submodule %s"
21592msgstr "略过未合并的子模组 %s"
21593
d9488fea 21594#: builtin/submodule--helper.c:2104
5b04ee3b
JX
21595#, c-format
21596msgid "Skipping submodule '%s'"
21597msgstr "略过子模组 '%s'"
21598
d9488fea 21599#: builtin/submodule--helper.c:2254
5c57d762
JX
21600#, c-format
21601msgid "Failed to clone '%s'. Retry scheduled"
21602msgstr "克隆 '%s' 失败。按计划重试"
21603
d9488fea 21604#: builtin/submodule--helper.c:2265
5c57d762
JX
21605#, c-format
21606msgid "Failed to clone '%s' a second time, aborting"
21607msgstr "第二次尝试克隆 '%s' 失败,退出"
21608
d9488fea 21609#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
5b04ee3b
JX
21610msgid "path into the working tree"
21611msgstr "到工作区的路径"
21612
d9488fea 21613#: builtin/submodule--helper.c:2330
5b04ee3b
JX
21614msgid "path into the working tree, across nested submodule boundaries"
21615msgstr "工作区中的路径,递归嵌套子模组"
21616
d9488fea 21617#: builtin/submodule--helper.c:2334
5b04ee3b
JX
21618msgid "rebase, merge, checkout or none"
21619msgstr "rebase、merge、checkout 或 none"
21620
d9488fea 21621#: builtin/submodule--helper.c:2340
5b04ee3b
JX
21622msgid "Create a shallow clone truncated to the specified number of revisions"
21623msgstr "创建一个指定深度的浅克隆"
21624
d9488fea 21625#: builtin/submodule--helper.c:2343
5b04ee3b
JX
21626msgid "parallel jobs"
21627msgstr "并发任务"
21628
d9488fea 21629#: builtin/submodule--helper.c:2345
5c57d762 21630msgid "whether the initial clone should follow the shallow recommendation"
9a4b694c 21631msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
5c57d762 21632
d9488fea 21633#: builtin/submodule--helper.c:2346
5b04ee3b
JX
21634msgid "don't print cloning progress"
21635msgstr "不要输出克隆进度"
94550ed3 21636
d9488fea 21637#: builtin/submodule--helper.c:2357
a5cd71ca
JX
21638msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
21639msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]"
5b04ee3b 21640
d9488fea 21641#: builtin/submodule--helper.c:2370
5b04ee3b
JX
21642msgid "bad value for update parameter"
21643msgstr "update 参数取值错误"
21644
d9488fea 21645#: builtin/submodule--helper.c:2418
5c57d762
JX
21646#, c-format
21647msgid ""
21648"Submodule (%s) branch configured to inherit branch from superproject, but "
21649"the superproject is not on any branch"
21650msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
21651
d9488fea 21652#: builtin/submodule--helper.c:2541
4c27fcb5
JX
21653#, c-format
21654msgid "could not get a repository handle for submodule '%s'"
21655msgstr "无法获得子模组 '%s' 的仓库句柄"
21656
d9488fea 21657#: builtin/submodule--helper.c:2574
1a79b2f1
JX
21658msgid "recurse into submodules"
21659msgstr "在子模组中递归"
21660
d9488fea 21661#: builtin/submodule--helper.c:2580
d46c5519
JX
21662msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
21663msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
1a79b2f1 21664
d9488fea 21665#: builtin/submodule--helper.c:2636
4c27fcb5
JX
21666msgid "check if it is safe to write to the .gitmodules file"
21667msgstr "检查写入 .gitmodules 文件是否安全"
21668
d9488fea 21669#: builtin/submodule--helper.c:2639
d46c5519
JX
21670msgid "unset the config in the .gitmodules file"
21671msgstr "取消 .gitmodules 文件中的设置"
21672
d9488fea 21673#: builtin/submodule--helper.c:2644
d46c5519
JX
21674msgid "git submodule--helper config <name> [<value>]"
21675msgstr "git submodule--helper config <名称> [<值>]"
4c27fcb5 21676
d9488fea 21677#: builtin/submodule--helper.c:2645
d46c5519
JX
21678msgid "git submodule--helper config --unset <name>"
21679msgstr "git submodule--helper config --unset <名称>"
21680
d9488fea 21681#: builtin/submodule--helper.c:2646
4c27fcb5
JX
21682msgid "git submodule--helper config --check-writeable"
21683msgstr "git submodule--helper config --check-writeable"
21684
d9488fea 21685#: builtin/submodule--helper.c:2665 git-submodule.sh:151
4c27fcb5
JX
21686#, sh-format
21687msgid "please make sure that the .gitmodules file is in the working tree"
21688msgstr "请确认 .gitmodules 文件在工作区里"
21689
d9488fea 21690#: builtin/submodule--helper.c:2681
349ede6a
JX
21691msgid "Suppress output for setting url of a submodule"
21692msgstr "阻止设置子模组 URL 的输出"
21693
d9488fea 21694#: builtin/submodule--helper.c:2685
349ede6a
JX
21695msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
21696msgstr "git submodule--helper set-url [--quiet] <路径> <新地址>"
21697
d9488fea 21698#: builtin/submodule--helper.c:2718
7157c2b5
JX
21699msgid "set the default tracking branch to master"
21700msgstr "设置默认跟踪分支为 master"
21701
d9488fea 21702#: builtin/submodule--helper.c:2720
7157c2b5
JX
21703msgid "set the default tracking branch"
21704msgstr "设置默认跟踪分支"
21705
d9488fea 21706#: builtin/submodule--helper.c:2724
7157c2b5
JX
21707msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
21708msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <路径>"
21709
d9488fea 21710#: builtin/submodule--helper.c:2725
7157c2b5
JX
21711msgid ""
21712"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
d9488fea
JX
21713msgstr ""
21714"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <分支> <路径>"
7157c2b5 21715
d9488fea 21716#: builtin/submodule--helper.c:2732
7157c2b5
JX
21717msgid "--branch or --default required"
21718msgstr "需要 --branch 或 --default"
21719
d9488fea 21720#: builtin/submodule--helper.c:2735
7157c2b5
JX
21721msgid "--branch and --default are mutually exclusive"
21722msgstr "--branch 和 --default 是互斥的"
21723
d9488fea 21724#: builtin/submodule--helper.c:2792 git.c:438 git.c:710
1a79b2f1
JX
21725#, c-format
21726msgid "%s doesn't support --super-prefix"
21727msgstr "%s 不支持 --super-prefix"
21728
d9488fea 21729#: builtin/submodule--helper.c:2798
94550ed3 21730#, c-format
5b04ee3b
JX
21731msgid "'%s' is not a valid submodule--helper subcommand"
21732msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
94550ed3 21733
a4f16749 21734#: builtin/symbolic-ref.c:8
814ff314
JX
21735msgid "git symbolic-ref [<options>] <name> [<ref>]"
21736msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
07432cef 21737
a4f16749 21738#: builtin/symbolic-ref.c:9
814ff314
JX
21739msgid "git symbolic-ref -d [-q] <name>"
21740msgstr "git symbolic-ref -d [-q] <名称>"
ef317cd5 21741
6937cb4e 21742#: builtin/symbolic-ref.c:40
ef317cd5 21743msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
21744msgstr "不显示非符号(分离的)引用的错误信息"
21745
6937cb4e 21746#: builtin/symbolic-ref.c:41
07432cef
WS
21747msgid "delete symbolic ref"
21748msgstr "删除符号引用"
ef317cd5 21749
6937cb4e 21750#: builtin/symbolic-ref.c:42
ef317cd5 21751msgid "shorten ref output"
6937cb4e 21752msgstr "缩短引用输出"
ef317cd5 21753
349ede6a 21754#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
ef317cd5 21755msgid "reason"
07432cef 21756msgstr "原因"
ef317cd5 21757
349ede6a 21758#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
ef317cd5 21759msgid "reason of the update"
07432cef 21760msgstr "更新的原因"
ef317cd5 21761
c1ac5258 21762#: builtin/tag.c:25
ef317cd5 21763msgid ""
d46c5519
JX
21764"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
21765"\t\t<tagname> [<head>]"
814ff314 21766msgstr ""
d46c5519
JX
21767"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n"
21768"\t\t<标签名> [<头>]"
ef317cd5 21769
d46c5519 21770#: builtin/tag.c:27
ef317cd5 21771msgid "git tag -d <tagname>..."
07432cef 21772msgstr "git tag -d <标签名>..."
ef317cd5 21773
d46c5519 21774#: builtin/tag.c:28
ef317cd5 21775msgid ""
87cb7997
JX
21776"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
21777"points-at <object>]\n"
d9488fea
JX
21778"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
21779"[<pattern>...]"
ef317cd5 21780msgstr ""
87cb7997
JX
21781"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
21782"at <对象>]\n"
d9488fea 21783"\t\t[--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]"
ef317cd5 21784
d46c5519 21785#: builtin/tag.c:30
1a79b2f1
JX
21786msgid "git tag -v [--format=<format>] <tagname>..."
21787msgstr "git tag -v [--format=<格式>] <标签名>..."
ef317cd5 21788
a6cd2cc4 21789#: builtin/tag.c:89
c04f5ac3
JX
21790#, c-format
21791msgid "tag '%s' not found."
55a16ee4 21792msgstr "未发现标签 '%s'。"
c04f5ac3 21793
a6cd2cc4 21794#: builtin/tag.c:105
c04f5ac3
JX
21795#, c-format
21796msgid "Deleted tag '%s' (was %s)\n"
55a16ee4 21797msgstr "已删除标签 '%s'(曾为 %s)\n"
c04f5ac3 21798
a6cd2cc4 21799#: builtin/tag.c:135
a77c07d9 21800#, c-format
c04f5ac3
JX
21801msgid ""
21802"\n"
6acbf033
JX
21803"Write a message for tag:\n"
21804" %s\n"
a77c07d9 21805"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
21806msgstr ""
21807"\n"
55a16ee4 21808"输入一个标签说明:\n"
6acbf033 21809" %s\n"
a77c07d9 21810"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 21811
a6cd2cc4 21812#: builtin/tag.c:139
a77c07d9 21813#, c-format
c04f5ac3
JX
21814msgid ""
21815"\n"
6acbf033
JX
21816"Write a message for tag:\n"
21817" %s\n"
a77c07d9 21818"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 21819"want to.\n"
c04f5ac3
JX
21820msgstr ""
21821"\n"
55a16ee4 21822"输入一个标签说明:\n"
6acbf033 21823" %s\n"
a77c07d9 21824"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 21825
a6cd2cc4 21826#: builtin/tag.c:198
c04f5ac3 21827msgid "unable to sign the tag"
55a16ee4 21828msgstr "无法签署标签"
c04f5ac3 21829
a6cd2cc4 21830#: builtin/tag.c:200
c04f5ac3 21831msgid "unable to write tag file"
55a16ee4 21832msgstr "无法写标签文件"
c04f5ac3 21833
a6cd2cc4 21834#: builtin/tag.c:216
d46c5519
JX
21835#, c-format
21836msgid ""
21837"You have created a nested tag. The object referred to by your new tag is\n"
21838"already a tag. If you meant to tag the object that it points to, use:\n"
21839"\n"
21840"\tgit tag -f %s %s^{}"
21841msgstr ""
21842"您创建了一个嵌套的标签。您的新标签指向的对象已经是一个标签。如果您想要\n"
21843"对其指向的目标创建标签,使用:\n"
21844"\n"
21845"\tgit tag -f %s %s^{}"
21846
a6cd2cc4 21847#: builtin/tag.c:232
c04f5ac3 21848msgid "bad object type."
90e6ef53 21849msgstr "坏的对象类型。"
c04f5ac3 21850
349ede6a 21851#: builtin/tag.c:285
c04f5ac3 21852msgid "no tag message?"
55a16ee4 21853msgstr "无标签说明?"
c04f5ac3 21854
349ede6a 21855#: builtin/tag.c:292
c04f5ac3
JX
21856#, c-format
21857msgid "The tag message has been left in %s\n"
55a16ee4 21858msgstr "标签说明被保留在 %s\n"
c04f5ac3 21859
349ede6a 21860#: builtin/tag.c:403
ef317cd5 21861msgid "list tag names"
55a16ee4 21862msgstr "列出标签名称"
ef317cd5 21863
349ede6a 21864#: builtin/tag.c:405
ef317cd5 21865msgid "print <n> lines of each tag message"
55a16ee4 21866msgstr "每个标签信息打印 <n> 行"
ef317cd5 21867
349ede6a 21868#: builtin/tag.c:407
ef317cd5 21869msgid "delete tags"
55a16ee4 21870msgstr "删除标签"
ef317cd5 21871
349ede6a 21872#: builtin/tag.c:408
ef317cd5 21873msgid "verify tags"
55a16ee4 21874msgstr "验证标签"
ef317cd5 21875
349ede6a 21876#: builtin/tag.c:410
ef317cd5 21877msgid "Tag creation options"
55a16ee4 21878msgstr "标签创建选项"
ef317cd5 21879
349ede6a 21880#: builtin/tag.c:412
ef317cd5 21881msgid "annotated tag, needs a message"
55a16ee4 21882msgstr "附注标签,需要一个说明"
ef317cd5 21883
349ede6a 21884#: builtin/tag.c:414
ef317cd5 21885msgid "tag message"
55a16ee4 21886msgstr "标签说明"
ef317cd5 21887
349ede6a 21888#: builtin/tag.c:416
31e5e17b
JX
21889msgid "force edit of tag message"
21890msgstr "强制编辑标签说明"
21891
349ede6a 21892#: builtin/tag.c:417
ef317cd5 21893msgid "annotated and GPG-signed tag"
55a16ee4 21894msgstr "附注并附加 GPG 签名的标签"
ef317cd5 21895
349ede6a 21896#: builtin/tag.c:420
ef317cd5 21897msgid "use another key to sign the tag"
55a16ee4 21898msgstr "使用另外的私钥签名该标签"
ef317cd5 21899
349ede6a 21900#: builtin/tag.c:421
ef317cd5 21901msgid "replace the tag if exists"
55a16ee4 21902msgstr "如果存在,替换现有的标签"
ef317cd5 21903
349ede6a 21904#: builtin/tag.c:422 builtin/update-ref.c:492
03ea3327 21905msgid "create a reflog"
1b7f4a34
JX
21906msgstr "创建引用日志"
21907
349ede6a 21908#: builtin/tag.c:424
814ff314 21909msgid "Tag listing options"
55a16ee4 21910msgstr "标签列表选项"
814ff314 21911
349ede6a 21912#: builtin/tag.c:425
ef317cd5 21913msgid "show tag list in columns"
55a16ee4 21914msgstr "以列的方式显示标签列表"
ef317cd5 21915
349ede6a 21916#: builtin/tag.c:426 builtin/tag.c:428
ef317cd5 21917msgid "print only tags that contain the commit"
87cb7997 21918msgstr "只打印包含该提交的标签"
ef317cd5 21919
349ede6a 21920#: builtin/tag.c:427 builtin/tag.c:429
87cb7997
JX
21921msgid "print only tags that don't contain the commit"
21922msgstr "只打印不包含该提交的标签"
21923
349ede6a 21924#: builtin/tag.c:430
94550ed3
JX
21925msgid "print only tags that are merged"
21926msgstr "只打印已经合并的标签"
21927
349ede6a 21928#: builtin/tag.c:431
94550ed3
JX
21929msgid "print only tags that are not merged"
21930msgstr "只打印尚未合并的标签"
21931
349ede6a 21932#: builtin/tag.c:435
ef317cd5 21933msgid "print only tags of the object"
87cb7997 21934msgstr "只打印指向该对象的标签"
ef317cd5 21935
349ede6a 21936#: builtin/tag.c:483
8ada9598 21937msgid "--column and -n are incompatible"
81809b99 21938msgstr "--column 和 -n 不兼容"
8ada9598 21939
349ede6a 21940#: builtin/tag.c:505
87cb7997
JX
21941msgid "-n option is only allowed in list mode"
21942msgstr "-n 选项只允许用在列表显示模式"
c04f5ac3 21943
349ede6a 21944#: builtin/tag.c:507
87cb7997
JX
21945msgid "--contains option is only allowed in list mode"
21946msgstr "--contains 选项只允许用在列表显示模式"
c04f5ac3 21947
349ede6a 21948#: builtin/tag.c:509
87cb7997
JX
21949msgid "--no-contains option is only allowed in list mode"
21950msgstr "--no-contains 选项只允许用在列表显示模式"
7ac1c0ad 21951
349ede6a 21952#: builtin/tag.c:511
87cb7997
JX
21953msgid "--points-at option is only allowed in list mode"
21954msgstr "--points-at 选项只允许用在列表显示模式"
94550ed3 21955
349ede6a 21956#: builtin/tag.c:513
87cb7997
JX
21957msgid "--merged and --no-merged options are only allowed in list mode"
21958msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
21959
349ede6a 21960#: builtin/tag.c:524
c04f5ac3
JX
21961msgid "only one -F or -m option is allowed."
21962msgstr "只允许一个 -F 或 -m 选项。"
21963
349ede6a 21964#: builtin/tag.c:543
c04f5ac3
JX
21965msgid "too many params"
21966msgstr "太多参数"
21967
349ede6a 21968#: builtin/tag.c:549
c04f5ac3
JX
21969#, c-format
21970msgid "'%s' is not a valid tag name."
55a16ee4 21971msgstr "'%s' 不是一个有效的标签名称。"
c04f5ac3 21972
349ede6a 21973#: builtin/tag.c:554
c04f5ac3
JX
21974#, c-format
21975msgid "tag '%s' already exists"
55a16ee4 21976msgstr "标签 '%s' 已存在"
c04f5ac3 21977
349ede6a 21978#: builtin/tag.c:585
c04f5ac3
JX
21979#, c-format
21980msgid "Updated tag '%s' (was %s)\n"
55a16ee4 21981msgstr "已更新标签 '%s'(曾为 %s)\n"
c04f5ac3 21982
2b472aae 21983#: builtin/unpack-objects.c:502
6c94aba5
JX
21984msgid "Unpacking objects"
21985msgstr "展开对象中"
21986
ddc12c42 21987#: builtin/update-index.c:84
7aea43ff
JX
21988#, c-format
21989msgid "failed to create directory %s"
c1ac5258 21990msgstr "创建目录 %s 失败"
7aea43ff 21991
ddc12c42 21992#: builtin/update-index.c:100
7aea43ff
JX
21993#, c-format
21994msgid "failed to create file %s"
c1ac5258 21995msgstr "创建文件 %s 失败"
7aea43ff 21996
ddc12c42 21997#: builtin/update-index.c:108
7aea43ff
JX
21998#, c-format
21999msgid "failed to delete file %s"
c1ac5258 22000msgstr "删除文件 %s 失败"
7aea43ff 22001
ddc12c42 22002#: builtin/update-index.c:115 builtin/update-index.c:221
7aea43ff
JX
22003#, c-format
22004msgid "failed to delete directory %s"
c1ac5258 22005msgstr "删除目录 %s 失败"
7aea43ff 22006
ddc12c42 22007#: builtin/update-index.c:140
7aea43ff 22008#, c-format
276ceeaa
JX
22009msgid "Testing mtime in '%s' "
22010msgstr "在 '%s' 中测试 mtime "
7aea43ff 22011
ddc12c42 22012#: builtin/update-index.c:154
7aea43ff
JX
22013msgid "directory stat info does not change after adding a new file"
22014msgstr "添加一个新文件后,目录的状态信息未改变"
22015
ddc12c42 22016#: builtin/update-index.c:167
7aea43ff
JX
22017msgid "directory stat info does not change after adding a new directory"
22018msgstr "添加一个新目录后,目录的状态信息未改变"
22019
ddc12c42 22020#: builtin/update-index.c:180
7aea43ff
JX
22021msgid "directory stat info changes after updating a file"
22022msgstr "更新一个文件后,目录的状态信息被修改"
22023
ddc12c42 22024#: builtin/update-index.c:191
7aea43ff
JX
22025msgid "directory stat info changes after adding a file inside subdirectory"
22026msgstr "在子目录中添加文件后,目录的状态信息被修改"
22027
ddc12c42 22028#: builtin/update-index.c:202
7aea43ff
JX
22029msgid "directory stat info does not change after deleting a file"
22030msgstr "删除一个文件后,目录的状态信息未改变"
22031
ddc12c42 22032#: builtin/update-index.c:215
7aea43ff
JX
22033msgid "directory stat info does not change after deleting a directory"
22034msgstr "删除一个目录后,目录的状态信息未改变"
22035
ddc12c42 22036#: builtin/update-index.c:222
7aea43ff
JX
22037msgid " OK"
22038msgstr " OK"
22039
ddc12c42 22040#: builtin/update-index.c:591
814ff314
JX
22041msgid "git update-index [<options>] [--] [<file>...]"
22042msgstr "git update-index [<选项>] [--] [<文件>...]"
8ada9598 22043
ddc12c42 22044#: builtin/update-index.c:974
ef317cd5 22045msgid "continue refresh even when index needs update"
07432cef 22046msgstr "当索引需要更新时继续刷新"
8ada9598 22047
ddc12c42 22048#: builtin/update-index.c:977
ef317cd5 22049msgid "refresh: ignore submodules"
07432cef 22050msgstr "刷新:忽略子模组"
8ada9598 22051
ddc12c42 22052#: builtin/update-index.c:980
ef317cd5 22053msgid "do not ignore new files"
07432cef 22054msgstr "不忽略新的文件"
8ada9598 22055
ddc12c42 22056#: builtin/update-index.c:982
ef317cd5 22057msgid "let files replace directories and vice-versa"
07432cef 22058msgstr "让文件替换目录(反之亦然)"
ef317cd5 22059
ddc12c42 22060#: builtin/update-index.c:984
ef317cd5 22061msgid "notice files missing from worktree"
07432cef 22062msgstr "通知文件从工作区丢失"
ef317cd5 22063
ddc12c42 22064#: builtin/update-index.c:986
ef317cd5 22065msgid "refresh even if index contains unmerged entries"
07432cef 22066msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 22067
ddc12c42 22068#: builtin/update-index.c:989
ef317cd5 22069msgid "refresh stat information"
07432cef 22070msgstr "刷新统计信息"
ef317cd5 22071
ddc12c42 22072#: builtin/update-index.c:993
ef317cd5 22073msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 22074msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 22075
ddc12c42 22076#: builtin/update-index.c:997
6c94aba5 22077msgid "<mode>,<object>,<path>"
d9d56b23 22078msgstr "<存取模式>,<对象>,<路径>"
ef317cd5 22079
ddc12c42 22080#: builtin/update-index.c:998
ef317cd5 22081msgid "add the specified entry to the index"
07432cef 22082msgstr "添加指定的条目到索引区"
ef317cd5 22083
ddc12c42 22084#: builtin/update-index.c:1008
ef317cd5 22085msgid "mark files as \"not changing\""
07432cef 22086msgstr "把文件标记为 \"没有变更\""
ef317cd5 22087
ddc12c42 22088#: builtin/update-index.c:1011
ef317cd5 22089msgid "clear assumed-unchanged bit"
07432cef 22090msgstr "清除 assumed-unchanged 位"
ef317cd5 22091
ddc12c42 22092#: builtin/update-index.c:1014
ef317cd5 22093msgid "mark files as \"index-only\""
07432cef 22094msgstr "把文件标记为 \"仅索引\""
ef317cd5 22095
ddc12c42 22096#: builtin/update-index.c:1017
ef317cd5 22097msgid "clear skip-worktree bit"
07432cef 22098msgstr "清除 skip-worktree 位"
ef317cd5 22099
ddc12c42
JX
22100#: builtin/update-index.c:1020
22101msgid "do not touch index-only entries"
22102msgstr "不要触碰仅索引条目"
22103
22104#: builtin/update-index.c:1022
ef317cd5 22105msgid "add to index only; do not add content to object database"
07432cef 22106msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 22107
ddc12c42 22108#: builtin/update-index.c:1024
ef317cd5 22109msgid "remove named paths even if present in worktree"
07432cef 22110msgstr "即使存在工作区里,也删除路径"
ef317cd5 22111
ddc12c42 22112#: builtin/update-index.c:1026
ef317cd5 22113msgid "with --stdin: input lines are terminated by null bytes"
07432cef 22114msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 22115
ddc12c42 22116#: builtin/update-index.c:1028
ef317cd5 22117msgid "read list of paths to be updated from standard input"
07432cef 22118msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 22119
ddc12c42 22120#: builtin/update-index.c:1032
ef317cd5 22121msgid "add entries from standard input to the index"
07432cef 22122msgstr "从标准输入添加条目到索引区"
ef317cd5 22123
ddc12c42 22124#: builtin/update-index.c:1036
ef317cd5 22125msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 22126msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 22127
ddc12c42 22128#: builtin/update-index.c:1040
ef317cd5 22129msgid "only update entries that differ from HEAD"
07432cef 22130msgstr "只更新与 HEAD 不同的条目"
ef317cd5 22131
ddc12c42 22132#: builtin/update-index.c:1044
ef317cd5 22133msgid "ignore files missing from worktree"
07432cef 22134msgstr "忽略工作区丢失的文件"
ef317cd5 22135
ddc12c42 22136#: builtin/update-index.c:1047
ef317cd5 22137msgid "report actions to standard output"
07432cef 22138msgstr "在标准输出显示操作"
ef317cd5 22139
ddc12c42 22140#: builtin/update-index.c:1049
ef317cd5 22141msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 22142msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 22143
ddc12c42 22144#: builtin/update-index.c:1053
ef317cd5 22145msgid "write index in this format"
07432cef 22146msgstr "以这种格式写入索引区"
ef317cd5 22147
ddc12c42 22148#: builtin/update-index.c:1055
6acbf033
JX
22149msgid "enable or disable split index"
22150msgstr "启用或禁用索引拆分"
22151
ddc12c42 22152#: builtin/update-index.c:1057
7aea43ff
JX
22153msgid "enable/disable untracked cache"
22154msgstr "启用/禁用对未跟踪文件的缓存"
22155
ddc12c42 22156#: builtin/update-index.c:1059
276ceeaa
JX
22157msgid "test if the filesystem supports untracked cache"
22158msgstr "测试文件系统是否支持未跟踪文件缓存"
22159
ddc12c42 22160#: builtin/update-index.c:1061
7aea43ff
JX
22161msgid "enable untracked cache without testing the filesystem"
22162msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
22163
ddc12c42 22164#: builtin/update-index.c:1063
5809aa05
JX
22165msgid "write out the index even if is not flagged as changed"
22166msgstr "即使没有被标记为已更改,也要写出索引"
22167
ddc12c42 22168#: builtin/update-index.c:1065
5809aa05
JX
22169msgid "enable or disable file system monitor"
22170msgstr "启用或禁用文件系统监控"
22171
ddc12c42 22172#: builtin/update-index.c:1067
5809aa05
JX
22173msgid "mark files as fsmonitor valid"
22174msgstr "标记文件为 fsmonitor 有效"
22175
ddc12c42 22176#: builtin/update-index.c:1070
5809aa05
JX
22177msgid "clear fsmonitor valid bit"
22178msgstr "清除 fsmonitor 有效位"
22179
ddc12c42 22180#: builtin/update-index.c:1173
87cb7997
JX
22181msgid ""
22182"core.splitIndex is set to false; remove or change it, if you really want to "
22183"enable split index"
22184msgstr ""
22185"core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。"
22186
ddc12c42 22187#: builtin/update-index.c:1182
87cb7997
JX
22188msgid ""
22189"core.splitIndex is set to true; remove or change it, if you really want to "
22190"disable split index"
22191msgstr ""
22192"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。"
22193
ddc12c42 22194#: builtin/update-index.c:1194
a0b6b246
JX
22195msgid ""
22196"core.untrackedCache is set to true; remove or change it, if you really want "
22197"to disable the untracked cache"
275588f9
JX
22198msgstr ""
22199"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
22200"改它。"
a0b6b246 22201
ddc12c42 22202#: builtin/update-index.c:1198
276ceeaa
JX
22203msgid "Untracked cache disabled"
22204msgstr "缓存未跟踪文件被禁用"
22205
ddc12c42 22206#: builtin/update-index.c:1206
a0b6b246
JX
22207msgid ""
22208"core.untrackedCache is set to false; remove or change it, if you really want "
22209"to enable the untracked cache"
275588f9
JX
22210msgstr ""
22211"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
22212"修改它。"
a0b6b246 22213
ddc12c42 22214#: builtin/update-index.c:1210
276ceeaa
JX
22215#, c-format
22216msgid "Untracked cache enabled for '%s'"
22217msgstr "缓存未跟踪文件在 '%s' 启用"
22218
ddc12c42 22219#: builtin/update-index.c:1218
5809aa05 22220msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
31e5e17b 22221msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项"
5809aa05 22222
ddc12c42 22223#: builtin/update-index.c:1222
5809aa05
JX
22224msgid "fsmonitor enabled"
22225msgstr "fsmonitor 被启用"
22226
ddc12c42 22227#: builtin/update-index.c:1225
5809aa05
JX
22228msgid ""
22229"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
31e5e17b 22230msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项"
5809aa05 22231
ddc12c42 22232#: builtin/update-index.c:1229
5809aa05
JX
22233msgid "fsmonitor disabled"
22234msgstr "fsmonitor 被禁用"
22235
a4f16749 22236#: builtin/update-ref.c:10
814ff314
JX
22237msgid "git update-ref [<options>] -d <refname> [<old-val>]"
22238msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
ef317cd5 22239
a4f16749 22240#: builtin/update-ref.c:11
814ff314
JX
22241msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
22242msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
90314792 22243
a4f16749 22244#: builtin/update-ref.c:12
814ff314
JX
22245msgid "git update-ref [<options>] --stdin [-z]"
22246msgstr "git update-ref [<选项>] --stdin [-z]"
ef317cd5 22247
349ede6a 22248#: builtin/update-ref.c:487
ef317cd5 22249msgid "delete the reference"
07432cef 22250msgstr "删除引用"
ef317cd5 22251
349ede6a 22252#: builtin/update-ref.c:489
ef317cd5 22253msgid "update <refname> not the one it points to"
07432cef 22254msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 22255
349ede6a 22256#: builtin/update-ref.c:490
90314792
JX
22257msgid "stdin has NUL-terminated arguments"
22258msgstr "标准输入有以 NUL 字符终止的参数"
22259
349ede6a 22260#: builtin/update-ref.c:491
90314792
JX
22261msgid "read updates from stdin"
22262msgstr "从标准输入读取更新"
22263
a4f16749 22264#: builtin/update-server-info.c:7
ef317cd5 22265msgid "git update-server-info [--force]"
07432cef 22266msgstr "git update-server-info [--force]"
ef317cd5 22267
a4f16749 22268#: builtin/update-server-info.c:15
ef317cd5 22269msgid "update the info files from scratch"
07432cef 22270msgstr "从头开始更新文件信息"
ef317cd5 22271
fd8cb379
JX
22272#: builtin/upload-pack.c:11
22273msgid "git upload-pack [<options>] <dir>"
22274msgstr "git upload-pack [<选项>] <目录>"
22275
d46c5519
JX
22276#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
22277msgid "quit after a single request/response exchange"
22278msgstr "在一次单独的请求/响应之后退出"
22279
fd8cb379
JX
22280#: builtin/upload-pack.c:25
22281msgid "exit immediately after initial ref advertisement"
22282msgstr "在初始的引用广告后立即退出"
22283
22284#: builtin/upload-pack.c:27
22285msgid "do not try <directory>/.git/ if <directory> is no Git directory"
22286msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/"
22287
22288#: builtin/upload-pack.c:29
22289msgid "interrupt transfer after <n> seconds of inactivity"
22290msgstr "不活动 <n> 秒钟后终止传输"
22291
a6cd2cc4 22292#: builtin/verify-commit.c:19
814ff314
JX
22293msgid "git verify-commit [-v | --verbose] <commit>..."
22294msgstr "git verify-commit [-v | --verbose] <提交>..."
6acbf033 22295
a6cd2cc4 22296#: builtin/verify-commit.c:68
6acbf033
JX
22297msgid "print commit contents"
22298msgstr "打印提交内容"
22299
a6cd2cc4 22300#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
1b7f4a34
JX
22301msgid "print raw gpg status output"
22302msgstr "打印原始 gpg 状态输出"
22303
d9488fea 22304#: builtin/verify-pack.c:59
814ff314
JX
22305msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
22306msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
ef317cd5 22307
d9488fea 22308#: builtin/verify-pack.c:70
ef317cd5
JX
22309msgid "verbose"
22310msgstr "冗长输出"
22311
d9488fea 22312#: builtin/verify-pack.c:72
ef317cd5 22313msgid "show statistics only"
07432cef 22314msgstr "只显示统计"
ef317cd5 22315
a6cd2cc4 22316#: builtin/verify-tag.c:18
1a79b2f1
JX
22317msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
22318msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
ef317cd5 22319
a6cd2cc4 22320#: builtin/verify-tag.c:36
ef317cd5 22321msgid "print tag contents"
55a16ee4 22322msgstr "打印标签内容"
ef317cd5 22323
a5cd71ca 22324#: builtin/worktree.c:17
31e5e17b
JX
22325msgid "git worktree add [<options>] <path> [<commit-ish>]"
22326msgstr "git worktree add [<选项>] <路径> [<提交>]"
5bb01d4f 22327
a5cd71ca 22328#: builtin/worktree.c:18
5c57d762
JX
22329msgid "git worktree list [<options>]"
22330msgstr "git worktree list [<选项>]"
22331
a5cd71ca 22332#: builtin/worktree.c:19
5c57d762
JX
22333msgid "git worktree lock [<options>] <path>"
22334msgstr "git worktree lock [<选项>] <路径>"
22335
a5cd71ca 22336#: builtin/worktree.c:20
31e5e17b
JX
22337msgid "git worktree move <worktree> <new-path>"
22338msgstr "git worktree move <工作区> <新路径>"
22339
a5cd71ca 22340#: builtin/worktree.c:21
5bb01d4f
JX
22341msgid "git worktree prune [<options>]"
22342msgstr "git worktree prune [<选项>]"
22343
a5cd71ca 22344#: builtin/worktree.c:22
31e5e17b
JX
22345msgid "git worktree remove [<options>] <worktree>"
22346msgstr "git worktree remove [<选项>] <工作区>"
22347
a5cd71ca 22348#: builtin/worktree.c:23
5c57d762
JX
22349msgid "git worktree unlock <path>"
22350msgstr "git worktree unlock <路径>"
94550ed3 22351
d9488fea 22352#: builtin/worktree.c:60 builtin/worktree.c:970
4c27fcb5
JX
22353#, c-format
22354msgid "failed to delete '%s'"
22355msgstr "删除 '%s' 失败"
22356
a5cd71ca 22357#: builtin/worktree.c:85
7157c2b5
JX
22358msgid "not a valid directory"
22359msgstr "不是一个有效的目录"
5bb01d4f 22360
7157c2b5
JX
22361#: builtin/worktree.c:91
22362msgid "gitdir file does not exist"
22363msgstr "gitdir 文件不存在"
5bb01d4f 22364
7157c2b5 22365#: builtin/worktree.c:96 builtin/worktree.c:105
6937cb4e 22366#, c-format
7157c2b5
JX
22367msgid "unable to read gitdir file (%s)"
22368msgstr "无法读取 gitdir 文件(%s)"
6937cb4e 22369
7157c2b5 22370#: builtin/worktree.c:115
5bb01d4f 22371#, c-format
7157c2b5
JX
22372msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
22373msgstr "读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)"
22374
22375#: builtin/worktree.c:123
22376msgid "invalid gitdir file"
22377msgstr "无效的 gitdir 文件"
5bb01d4f 22378
7157c2b5
JX
22379#: builtin/worktree.c:131
22380msgid "gitdir file points to non-existent location"
22381msgstr "gitdir 文件指向一个不存在的位置"
22382
22383#: builtin/worktree.c:146
5bb01d4f 22384#, c-format
7157c2b5
JX
22385msgid "Removing %s/%s: %s"
22386msgstr "删除 %s/%s: %s"
5bb01d4f 22387
7157c2b5 22388#: builtin/worktree.c:221
1a79b2f1
JX
22389msgid "report pruned working trees"
22390msgstr "报告清除的工作区"
22391
7157c2b5 22392#: builtin/worktree.c:223
1a79b2f1 22393msgid "expire working trees older than <time>"
58b6f078 22394msgstr "将早于 <时间> 的工作区过期"
1a79b2f1 22395
7157c2b5 22396#: builtin/worktree.c:293
5bb01d4f
JX
22397#, c-format
22398msgid "'%s' already exists"
22399msgstr "'%s' 已经存在"
22400
7157c2b5 22401#: builtin/worktree.c:302
4c27fcb5 22402#, c-format
7157c2b5
JX
22403msgid "unusable worktree destination '%s'"
22404msgstr "无法使用的工作区目标 '%s'"
4c27fcb5 22405
7157c2b5 22406#: builtin/worktree.c:307
4c27fcb5
JX
22407#, c-format
22408msgid ""
22409"'%s' is a missing but locked worktree;\n"
7157c2b5 22410"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
4c27fcb5 22411msgstr ""
7157c2b5
JX
22412"'%s' 是一个丢失但锁定的工作区,\n"
22413"使用 '%s -f -f' 覆盖,或用 'unlock' 和 'prune' 或 'remove' 清除"
4c27fcb5 22414
7157c2b5 22415#: builtin/worktree.c:309
4c27fcb5
JX
22416#, c-format
22417msgid ""
22418"'%s' is a missing but already registered worktree;\n"
7157c2b5 22419"use '%s -f' to override, or 'prune' or 'remove' to clear"
4c27fcb5 22420msgstr ""
7157c2b5
JX
22421"'%s' 是一个丢失但已经注册的工作区,\n"
22422"使用 '%s -f' 覆盖,或用 'prune' 或 'remove' 清除"
4c27fcb5 22423
7157c2b5 22424#: builtin/worktree.c:360
5bb01d4f
JX
22425#, c-format
22426msgid "could not create directory of '%s'"
22427msgstr "不能创建目录 '%s'"
22428
7157c2b5 22429#: builtin/worktree.c:494 builtin/worktree.c:500
fd8cb379
JX
22430#, c-format
22431msgid "Preparing worktree (new branch '%s')"
22432msgstr "准备工作区(新分支 '%s')"
22433
7157c2b5 22434#: builtin/worktree.c:496
fd8cb379
JX
22435#, c-format
22436msgid "Preparing worktree (resetting branch '%s'; was at %s)"
22437msgstr "准备工作区(重置分支 '%s',之前为 %s)"
22438
7157c2b5 22439#: builtin/worktree.c:505
fd8cb379
JX
22440#, c-format
22441msgid "Preparing worktree (checking out '%s')"
22442msgstr "准备工作区(检出 '%s')"
22443
7157c2b5 22444#: builtin/worktree.c:511
5bb01d4f 22445#, c-format
fd8cb379
JX
22446msgid "Preparing worktree (detached HEAD %s)"
22447msgstr "准备工作区(分离头指针 %s)"
5bb01d4f 22448
7157c2b5 22449#: builtin/worktree.c:552
5bb01d4f 22450msgid "checkout <branch> even if already checked out in other worktree"
58b6f078 22451msgstr "检出 <分支>,即使已经被检出到其它工作区"
5bb01d4f 22452
7157c2b5 22453#: builtin/worktree.c:555
5bb01d4f
JX
22454msgid "create a new branch"
22455msgstr "创建一个新分支"
22456
7157c2b5 22457#: builtin/worktree.c:557
5bb01d4f
JX
22458msgid "create or reset a branch"
22459msgstr "创建或重置一个分支"
22460
7157c2b5 22461#: builtin/worktree.c:559
5b04ee3b
JX
22462msgid "populate the new working tree"
22463msgstr "生成新的工作区"
22464
7157c2b5 22465#: builtin/worktree.c:560
60638e98
JX
22466msgid "keep the new working tree locked"
22467msgstr "锁定新工作区"
22468
7157c2b5 22469#: builtin/worktree.c:563
5809aa05
JX
22470msgid "set up tracking mode (see git-branch(1))"
22471msgstr "设置跟踪模式(参见 git-branch(1))"
22472
7157c2b5 22473#: builtin/worktree.c:566
5809aa05
JX
22474msgid "try to match the new branch name with a remote-tracking branch"
22475msgstr "尝试为新分支名匹配一个远程跟踪分支"
22476
7157c2b5 22477#: builtin/worktree.c:574
1b7f4a34
JX
22478msgid "-b, -B, and --detach are mutually exclusive"
22479msgstr "-b、-B 和 --detach 是互斥的"
5bb01d4f 22480
7157c2b5 22481#: builtin/worktree.c:635
5809aa05
JX
22482msgid "--[no-]track can only be used if a new branch is created"
22483msgstr "只能在创建新分支时使用选项 --[no-]track "
22484
7157c2b5 22485#: builtin/worktree.c:755
5c57d762
JX
22486msgid "reason for locking"
22487msgstr "锁定原因"
22488
7157c2b5 22489#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874
d9488fea 22490#: builtin/worktree.c:998
5c57d762
JX
22491#, c-format
22492msgid "'%s' is not a working tree"
22493msgstr "'%s' 不是一个工作区"
22494
7157c2b5 22495#: builtin/worktree.c:769 builtin/worktree.c:802
5c57d762
JX
22496msgid "The main working tree cannot be locked or unlocked"
22497msgstr "主工作区无法被加锁或解锁"
22498
7157c2b5 22499#: builtin/worktree.c:774
5c57d762
JX
22500#, c-format
22501msgid "'%s' is already locked, reason: %s"
22502msgstr "'%s' 已被锁定,原因:%s"
22503
7157c2b5 22504#: builtin/worktree.c:776
5c57d762
JX
22505#, c-format
22506msgid "'%s' is already locked"
22507msgstr "'%s' 已被锁定"
22508
7157c2b5 22509#: builtin/worktree.c:804
5c57d762
JX
22510#, c-format
22511msgid "'%s' is not locked"
22512msgstr "'%s' 未被锁定"
22513
7157c2b5 22514#: builtin/worktree.c:845
31e5e17b 22515msgid "working trees containing submodules cannot be moved or removed"
610f8099 22516msgstr "不能移动或删除包含子模组的工作区"
31e5e17b 22517
7157c2b5 22518#: builtin/worktree.c:853
4c27fcb5
JX
22519msgid "force move even if worktree is dirty or locked"
22520msgstr "强制移动,即使工作区是脏的或已锁定"
22521
d9488fea 22522#: builtin/worktree.c:876 builtin/worktree.c:1000
31e5e17b
JX
22523#, c-format
22524msgid "'%s' is a main working tree"
22525msgstr "'%s' 是一个主工作区"
22526
7157c2b5 22527#: builtin/worktree.c:881
31e5e17b
JX
22528#, c-format
22529msgid "could not figure out destination name from '%s'"
22530msgstr "无法从 '%s' 算出目标名称"
22531
7157c2b5 22532#: builtin/worktree.c:894
31e5e17b 22533#, c-format
4c27fcb5
JX
22534msgid ""
22535"cannot move a locked working tree, lock reason: %s\n"
22536"use 'move -f -f' to override or unlock first"
22537msgstr ""
22538"无法移动一个锁定的工作区,锁定原因:%s\n"
22539"使用 'move -f -f' 覆盖或先解锁"
31e5e17b 22540
7157c2b5 22541#: builtin/worktree.c:896
4c27fcb5
JX
22542msgid ""
22543"cannot move a locked working tree;\n"
22544"use 'move -f -f' to override or unlock first"
22545msgstr ""
22546"无法移动一个锁定的工作区,\n"
22547"使用 'move -f -f' 覆盖或先解锁"
31e5e17b 22548
7157c2b5 22549#: builtin/worktree.c:899
31e5e17b
JX
22550#, c-format
22551msgid "validation failed, cannot move working tree: %s"
22552msgstr "验证失败,无法移动工作区:%s"
22553
7157c2b5 22554#: builtin/worktree.c:904
31e5e17b
JX
22555#, c-format
22556msgid "failed to move '%s' to '%s'"
c1ac5258 22557msgstr "移动 '%s' 到 '%s' 失败"
31e5e17b 22558
d9488fea 22559#: builtin/worktree.c:950
31e5e17b
JX
22560#, c-format
22561msgid "failed to run 'git status' on '%s'"
c1ac5258 22562msgstr "在 '%s' 中执行 'git status' 失败"
31e5e17b 22563
d9488fea 22564#: builtin/worktree.c:954
31e5e17b 22565#, c-format
a5cd71ca
JX
22566msgid "'%s' contains modified or untracked files, use --force to delete it"
22567msgstr "'%s' 包含修改或未跟踪的文件,使用 --force 删除"
31e5e17b 22568
d9488fea 22569#: builtin/worktree.c:959
31e5e17b
JX
22570#, c-format
22571msgid "failed to run 'git status' on '%s', code %d"
c1ac5258 22572msgstr "在 '%s' 中执行 'git status' 失败,退出码 %d"
31e5e17b 22573
d9488fea 22574#: builtin/worktree.c:982
4c27fcb5
JX
22575msgid "force removal even if worktree is dirty or locked"
22576msgstr "强制删除,即使工作区是脏的或已锁定"
31e5e17b 22577
d9488fea 22578#: builtin/worktree.c:1005
31e5e17b 22579#, c-format
4c27fcb5
JX
22580msgid ""
22581"cannot remove a locked working tree, lock reason: %s\n"
22582"use 'remove -f -f' to override or unlock first"
22583msgstr ""
22584"无法删除一个锁定的工作区,锁定原因:%s\n"
22585"使用 'remove -f -f' 覆盖或先解锁"
31e5e17b 22586
d9488fea 22587#: builtin/worktree.c:1007
4c27fcb5
JX
22588msgid ""
22589"cannot remove a locked working tree;\n"
22590"use 'remove -f -f' to override or unlock first"
22591msgstr ""
22592"无法删除一个锁定的工作区,\n"
22593"使用 'remove -f -f' 覆盖或先解锁"
31e5e17b 22594
d9488fea 22595#: builtin/worktree.c:1010
31e5e17b
JX
22596#, c-format
22597msgid "validation failed, cannot remove working tree: %s"
22598msgstr "验证失败,无法删除工作区:%s"
22599
d9488fea
JX
22600#: builtin/worktree.c:1034
22601#, c-format
22602msgid "repair: %s: %s"
22603msgstr "修理:%s:%s"
22604
22605#: builtin/worktree.c:1037
22606#, c-format
22607msgid "error: %s: %s"
22608msgstr "错误:%s:%s"
22609
06991777 22610#: builtin/write-tree.c:15
ef317cd5 22611msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 22612msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5 22613
06991777 22614#: builtin/write-tree.c:28
ef317cd5 22615msgid "<prefix>/"
07432cef 22616msgstr "<前缀>/"
ef317cd5 22617
06991777 22618#: builtin/write-tree.c:29
ef317cd5 22619msgid "write tree object for a subdirectory <prefix>"
07432cef 22620msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5 22621
06991777 22622#: builtin/write-tree.c:31
ef317cd5 22623msgid "only useful for debugging"
07432cef 22624msgstr "只对调试有用"
ef317cd5 22625
d9488fea 22626#: http-fetch.c:114
7157c2b5
JX
22627#, c-format
22628msgid "argument to --packfile must be a valid hash (got '%s')"
22629msgstr "--packfile 的参数必须是有效的哈希值(得到 '%s')"
22630
d9488fea
JX
22631#: http-fetch.c:122
22632msgid "not a git repository"
22633msgstr "不是 git 仓库"
220c313c 22634
d9488fea 22635#: t/helper/test-reach.c:154
4c27fcb5
JX
22636#, c-format
22637msgid "commit %s is not marked reachable"
22638msgstr "提交 %s 没有标记为可达"
22639
d9488fea 22640#: t/helper/test-reach.c:164
4c27fcb5
JX
22641msgid "too many commits marked reachable"
22642msgstr "太多提交标记为可达"
22643
d46c5519
JX
22644#: t/helper/test-serve-v2.c:7
22645msgid "test-tool serve-v2 [<options>]"
22646msgstr "test-tool serve-v2 [<选项>]"
22647
22648#: t/helper/test-serve-v2.c:19
22649msgid "exit immediately after advertising capabilities"
22650msgstr "对能力广告之后立即退出"
22651
349ede6a 22652#: git.c:28
31e5e17b
JX
22653msgid ""
22654"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
22655" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
fd8cb379
JX
22656" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
22657"bare]\n"
31e5e17b
JX
22658" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
22659" <command> [<args>]"
22660msgstr ""
fd8cb379 22661"git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n"
31e5e17b 22662" [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
fd8cb379
JX
22663" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
22664"bare]\n"
31e5e17b
JX
22665" [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
22666" <命令> [<参数>]"
22667
349ede6a 22668#: git.c:35
4dcdc3d8 22669msgid ""
220c313c 22670"'git help -a' and 'git help -g' list available subcommands and some\n"
4dcdc3d8 22671"concept guides. See 'git help <command>' or 'git help <concept>'\n"
a6cd2cc4
JX
22672"to read about a specific subcommand or concept.\n"
22673"See 'git help git' for an overview of the system."
4dcdc3d8 22674msgstr ""
220c313c
JX
22675"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
22676"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
a6cd2cc4
JX
22677"帮助。\n"
22678"有关系统的概述,查看 'git help git'。"
8ada9598 22679
349ede6a 22680#: git.c:187
31e5e17b
JX
22681#, c-format
22682msgid "no directory given for --git-dir\n"
22683msgstr "没有为 --git-dir 提供目录\n"
22684
349ede6a 22685#: git.c:201
31e5e17b
JX
22686#, c-format
22687msgid "no namespace given for --namespace\n"
22688msgstr "没有为 --namespace 提供命名空间\n"
22689
349ede6a 22690#: git.c:215
31e5e17b
JX
22691#, c-format
22692msgid "no directory given for --work-tree\n"
22693msgstr "没有为 --work-tree 提供目录\n"
22694
349ede6a 22695#: git.c:229
31e5e17b
JX
22696#, c-format
22697msgid "no prefix given for --super-prefix\n"
22698msgstr "没有为 --super-prefix 提供前缀\n"
22699
349ede6a 22700#: git.c:251
31e5e17b
JX
22701#, c-format
22702msgid "-c expects a configuration string\n"
22703msgstr "应为 -c 提供一个配置字符串\n"
22704
349ede6a 22705#: git.c:289
31e5e17b
JX
22706#, c-format
22707msgid "no directory given for -C\n"
22708msgstr "没有为 -C 提供目录\n"
22709
349ede6a 22710#: git.c:315
31e5e17b
JX
22711#, c-format
22712msgid "unknown option: %s\n"
22713msgstr "未知选项:%s\n"
22714
d9488fea 22715#: git.c:364
06991777
JX
22716#, c-format
22717msgid "while expanding alias '%s': '%s'"
5b533632 22718msgstr "在扩展别名 '%s' 时:'%s'"
06991777 22719
d9488fea 22720#: git.c:373
06991777
JX
22721#, c-format
22722msgid ""
22723"alias '%s' changes environment variables.\n"
22724"You can use '!git' in the alias to do this"
22725msgstr ""
22726"别名 '%s' 修改环境变量。您可以使用在别名中\n"
22727"使用 '!git'"
22728
d9488fea 22729#: git.c:380
06991777
JX
22730#, c-format
22731msgid "empty alias for %s"
22732msgstr "%s 的空别名"
22733
d9488fea 22734#: git.c:383
06991777
JX
22735#, c-format
22736msgid "recursive alias: %s"
5b533632 22737msgstr "递归的别名:%s"
06991777 22738
d9488fea 22739#: git.c:465
06991777
JX
22740msgid "write failure on standard output"
22741msgstr "在标准输出写入失败"
22742
d9488fea 22743#: git.c:467
06991777
JX
22744msgid "unknown write failure on standard output"
22745msgstr "到标准输出的未知写入错误"
22746
d9488fea 22747#: git.c:469
06991777
JX
22748msgid "close failed on standard output"
22749msgstr "标准输出关闭失败"
22750
d9488fea 22751#: git.c:819
4c27fcb5
JX
22752#, c-format
22753msgid "alias loop detected: expansion of '%s' does not terminate:%s"
22754msgstr "检测到别名循环:'%s'的扩展未终止:%s"
22755
d9488fea 22756#: git.c:869
06991777
JX
22757#, c-format
22758msgid "cannot handle %s as a builtin"
22759msgstr "不能作为内置命令处理 %s"
22760
d9488fea 22761#: git.c:882
06991777
JX
22762#, c-format
22763msgid ""
22764"usage: %s\n"
22765"\n"
22766msgstr ""
22767"用法:%s\n"
22768"\n"
22769
d9488fea 22770#: git.c:902
31e5e17b
JX
22771#, c-format
22772msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
22773msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n"
22774
d9488fea 22775#: git.c:914
31e5e17b
JX
22776#, c-format
22777msgid "failed to run command '%s': %s\n"
c1ac5258 22778msgstr "运行命令 '%s' 失败:%s\n"
31e5e17b 22779
349ede6a 22780#: http.c:399
60638e98
JX
22781#, c-format
22782msgid "negative value for http.postbuffer; defaulting to %d"
22783msgstr "http.postbuffer 为负值,默认为 %d"
22784
349ede6a 22785#: http.c:420
a0b6b246 22786msgid "Delegation control is not supported with cURL < 7.22.0"
4c27fcb5 22787msgstr "不支持委托控制,因为 cURL < 7.22.0"
a0b6b246 22788
349ede6a 22789#: http.c:429
276ceeaa
JX
22790msgid "Public key pinning not supported with cURL < 7.44.0"
22791msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
22792
7157c2b5 22793#: http.c:910
4c27fcb5
JX
22794msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
22795msgstr "不支持 CURLSSLOPT_NO_REVOKE,因为 cURL < 7.44.0"
22796
7157c2b5 22797#: http.c:989
4c27fcb5
JX
22798msgid "Protocol restrictions not supported with cURL < 7.19.4"
22799msgstr "不支持协议限制,因为 cURL < 7.19.4"
22800
7157c2b5 22801#: http.c:1132
4c27fcb5
JX
22802#, c-format
22803msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
22804msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端:"
22805
7157c2b5 22806#: http.c:1139
4c27fcb5
JX
22807#, c-format
22808msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
22809msgstr "无法设置 SSL 后端为 '%s':cURL: cURL 没有使用 SSL 后端构建"
22810
7157c2b5 22811#: http.c:1143
4c27fcb5
JX
22812#, c-format
22813msgid "Could not set SSL backend to '%s': already set"
22814msgstr "无法将 SSL 后端设置为 '%s':已经设置"
22815
7157c2b5 22816#: http.c:2025
1a79b2f1
JX
22817#, c-format
22818msgid ""
22819"unable to update url base from redirection:\n"
22820" asked for: %s\n"
22821" redirect: %s"
22822msgstr ""
22823"不能更新重定向的 url base:\n"
22824" 请求:%s\n"
22825" 重定向:%s"
22826
d9488fea 22827#: remote-curl.c:174
d46c5519
JX
22828#, c-format
22829msgid "invalid quoting in push-option value: '%s'"
5b533632 22830msgstr "在 push-option 取值中无效的引号:'%s'"
d46c5519 22831
d9488fea 22832#: remote-curl.c:298
d46c5519
JX
22833#, c-format
22834msgid "%sinfo/refs not valid: is this a git repository?"
d9488fea 22835msgstr "%sinfo/refs 无效:这是 git 仓库么?"
d46c5519 22836
d9488fea 22837#: remote-curl.c:399
d46c5519
JX
22838msgid "invalid server response; expected service, got flush packet"
22839msgstr "无效的服务端响应。预期服务,得到 flush 包"
22840
d9488fea 22841#: remote-curl.c:430
d46c5519
JX
22842#, c-format
22843msgid "invalid server response; got '%s'"
22844msgstr "无效的服务端响应,得到 '%s'"
22845
d9488fea 22846#: remote-curl.c:490
d46c5519
JX
22847#, c-format
22848msgid "repository '%s' not found"
22849msgstr "仓库 '%s' 未找到"
22850
d9488fea 22851#: remote-curl.c:494
d46c5519
JX
22852#, c-format
22853msgid "Authentication failed for '%s'"
22854msgstr "'%s' 鉴权失败"
22855
d9488fea 22856#: remote-curl.c:498
d46c5519
JX
22857#, c-format
22858msgid "unable to access '%s': %s"
22859msgstr "无法访问 '%s':%s"
22860
d9488fea 22861#: remote-curl.c:504
1a79b2f1
JX
22862#, c-format
22863msgid "redirecting to %s"
22864msgstr "重定向到 %s"
22865
d9488fea 22866#: remote-curl.c:633
d46c5519 22867msgid "shouldn't have EOF when not gentle on EOF"
5b533632 22868msgstr "当没有设置温和处理文件结束符(EOF)时,不应该有文件结束符"
d46c5519 22869
d9488fea 22870#: remote-curl.c:645
7157c2b5
JX
22871msgid "remote server sent stateless separator"
22872msgstr "远程服务器发送了无状态分隔符"
22873
d9488fea 22874#: remote-curl.c:715
d46c5519
JX
22875msgid "unable to rewind rpc post data - try increasing http.postBuffer"
22876msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
22877
d9488fea 22878#: remote-curl.c:745
7157c2b5
JX
22879#, c-format
22880msgid "remote-curl: bad line length character: %.4s"
22881msgstr "remote-curl:错误的行宽字符:%.4s"
22882
d9488fea 22883#: remote-curl.c:747
7157c2b5
JX
22884msgid "remote-curl: unexpected response end packet"
22885msgstr "remote-curl:意外响应结束包"
22886
d9488fea 22887#: remote-curl.c:823
d46c5519
JX
22888#, c-format
22889msgid "RPC failed; %s"
22890msgstr "RPC 失败。%s"
22891
d9488fea 22892#: remote-curl.c:863
d46c5519
JX
22893msgid "cannot handle pushes this big"
22894msgstr "不能处理这么大的推送"
22895
d9488fea 22896#: remote-curl.c:978
d46c5519
JX
22897#, c-format
22898msgid "cannot deflate request; zlib deflate error %d"
22899msgstr "不能压缩请求,zlib 压缩错误 %d"
22900
d9488fea 22901#: remote-curl.c:982
d46c5519
JX
22902#, c-format
22903msgid "cannot deflate request; zlib end error %d"
22904msgstr "不能压缩请求,zlib 结束错误 %d"
22905
d9488fea 22906#: remote-curl.c:1032
7157c2b5
JX
22907#, c-format
22908msgid "%d bytes of length header were received"
22909msgstr "收到了 %d 字节长度的头信息"
22910
d9488fea 22911#: remote-curl.c:1034
7157c2b5
JX
22912#, c-format
22913msgid "%d bytes of body are still expected"
22914msgstr "预期仍然需要 %d 个字节的正文"
22915
d9488fea 22916#: remote-curl.c:1123
d46c5519
JX
22917msgid "dumb http transport does not support shallow capabilities"
22918msgstr "哑 http 传输不支持 shalllow 能力"
22919
d9488fea 22920#: remote-curl.c:1138
d46c5519
JX
22921msgid "fetch failed."
22922msgstr "获取失败。"
22923
d9488fea 22924#: remote-curl.c:1184
d46c5519
JX
22925msgid "cannot fetch by sha1 over smart http"
22926msgstr "无法通过智能 HTTP 获取 sha1"
22927
d9488fea 22928#: remote-curl.c:1228 remote-curl.c:1234
d46c5519
JX
22929#, c-format
22930msgid "protocol error: expected sha/ref, got '%s'"
22931msgstr "协议错误:期望 sha/ref,却得到 '%s'"
22932
d9488fea 22933#: remote-curl.c:1246 remote-curl.c:1361
d46c5519
JX
22934#, c-format
22935msgid "http transport does not support %s"
22936msgstr "http 传输协议不支持 %s"
22937
d9488fea 22938#: remote-curl.c:1282
d46c5519
JX
22939msgid "git-http-push failed"
22940msgstr "git-http-push 失败"
22941
d9488fea 22942#: remote-curl.c:1467
d46c5519
JX
22943msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
22944msgstr "remote-curl:用法:git remote-curl <远程> [<url>]"
22945
d9488fea 22946#: remote-curl.c:1499
d46c5519
JX
22947msgid "remote-curl: error reading command stream from git"
22948msgstr "remote-curl:错误读取来自 git 的命令流"
22949
d9488fea 22950#: remote-curl.c:1506
d46c5519
JX
22951msgid "remote-curl: fetch attempted without a local repo"
22952msgstr "remote-curl:尝试没有本地仓库下获取"
22953
d9488fea 22954#: remote-curl.c:1547
d46c5519
JX
22955#, c-format
22956msgid "remote-curl: unknown command '%s' from git"
22957msgstr "remote-curl:未知的来自 git 的命令 '%s'"
22958
349ede6a
JX
22959#: compat/compiler.h:26
22960msgid "no compiler information available\n"
22961msgstr "编译器信息不可用\n"
22962
22963#: compat/compiler.h:38
22964msgid "no libc information available\n"
22965msgstr "libc 信息不可用\n"
22966
d9488fea 22967#: list-objects-filter-options.h:91
d46c5519
JX
22968msgid "args"
22969msgstr "参数"
22970
d9488fea 22971#: list-objects-filter-options.h:92
d46c5519
JX
22972msgid "object filtering"
22973msgstr "对象过滤"
22974
ddc12c42 22975#: parse-options.h:183
fd8cb379
JX
22976msgid "expiry-date"
22977msgstr "到期时间"
7aea43ff 22978
ddc12c42 22979#: parse-options.h:197
fd8cb379
JX
22980msgid "no-op (backward compatibility)"
22981msgstr "空操作(向后兼容)"
7aea43ff 22982
ddc12c42 22983#: parse-options.h:309
fd8cb379
JX
22984msgid "be more verbose"
22985msgstr "更加详细"
7aea43ff 22986
ddc12c42 22987#: parse-options.h:311
fd8cb379
JX
22988msgid "be more quiet"
22989msgstr "更加安静"
7aea43ff 22990
ddc12c42 22991#: parse-options.h:317
d9488fea
JX
22992msgid "use <n> digits to display object names"
22993msgstr "用 <n> 位数字显示对象名"
7aea43ff 22994
ddc12c42 22995#: parse-options.h:336
d46c5519
JX
22996msgid "how to strip spaces and #comments from message"
22997msgstr "设置如何删除提交说明里的空格和#注释"
22998
ddc12c42
JX
22999#: parse-options.h:337
23000msgid "read pathspec from file"
23001msgstr "从文件读取路径表达式"
23002
23003#: parse-options.h:338
23004msgid ""
23005"with --pathspec-from-file, pathspec elements are separated with NUL character"
23006msgstr "使用 --pathspec-from-file,路径表达式用空字符分隔"
23007
d9488fea 23008#: ref-filter.h:96
d46c5519
JX
23009msgid "key"
23010msgstr "key"
23011
d9488fea 23012#: ref-filter.h:96
d46c5519
JX
23013msgid "field name to sort on"
23014msgstr "排序的字段名"
23015
23016#: rerere.h:44
23017msgid "update the index with reused conflict resolution if possible"
23018msgstr "如果可能,重用冲突解决更新索引"
23019
349ede6a 23020#: wt-status.h:80
a6cd2cc4
JX
23021msgid "HEAD detached at "
23022msgstr "头指针分离于 "
23023
349ede6a 23024#: wt-status.h:81
a6cd2cc4
JX
23025msgid "HEAD detached from "
23026msgstr "头指针分离自 "
23027
fd8cb379 23028#: command-list.h:50
8ada9598 23029msgid "Add file contents to the index"
81809b99 23030msgstr "添加文件内容至索引"
8ada9598 23031
fd8cb379
JX
23032#: command-list.h:51
23033msgid "Apply a series of patches from a mailbox"
23034msgstr "应用邮箱格式的系列补丁"
23035
23036#: command-list.h:52
23037msgid "Annotate file lines with commit information"
23038msgstr "使用提交信息注释文件行"
23039
23040#: command-list.h:53
23041msgid "Apply a patch to files and/or to the index"
23042msgstr "应用一个补丁到文件和/或索引区"
23043
23044#: command-list.h:54
4c27fcb5
JX
23045msgid "Import a GNU Arch repository into Git"
23046msgstr "将一个 GNU Arch 仓库导入到 Git"
fd8cb379
JX
23047
23048#: command-list.h:55
23049msgid "Create an archive of files from a named tree"
23050msgstr "基于一个指定的树创建文件存档"
23051
23052#: command-list.h:56
1b7f4a34
JX
23053msgid "Use binary search to find the commit that introduced a bug"
23054msgstr "通过二分查找定位引入 bug 的提交"
8ada9598 23055
fd8cb379
JX
23056#: command-list.h:57
23057msgid "Show what revision and author last modified each line of a file"
23058msgstr "显示文件每一行最后修改的版本和修改者"
23059
23060#: command-list.h:58
8ada9598 23061msgid "List, create, or delete branches"
81809b99 23062msgstr "列出、创建或删除分支"
8ada9598 23063
fd8cb379 23064#: command-list.h:59
349ede6a
JX
23065msgid "Collect information for user to file a bug report"
23066msgstr "收集信息以供用户提交错误报告"
23067
23068#: command-list.h:60
fd8cb379
JX
23069msgid "Move objects and refs by archive"
23070msgstr "通过归档移动对象和引用"
23071
349ede6a 23072#: command-list.h:61
fd8cb379
JX
23073msgid "Provide content or type and size information for repository objects"
23074msgstr "提供仓库对象的内容、类型或大小"
23075
349ede6a 23076#: command-list.h:62
fd8cb379
JX
23077msgid "Display gitattributes information"
23078msgstr "显示 gitattributes 信息"
23079
349ede6a 23080#: command-list.h:63
fd8cb379
JX
23081msgid "Debug gitignore / exclude files"
23082msgstr "调试 gitignore / exclude 文件"
23083
349ede6a 23084#: command-list.h:64
fd8cb379
JX
23085msgid "Show canonical names and email addresses of contacts"
23086msgstr "显示联系人的规范名称和电子邮件"
23087
349ede6a 23088#: command-list.h:65
5bb01d4f
JX
23089msgid "Switch branches or restore working tree files"
23090msgstr "切换分支或恢复工作区文件"
8ada9598 23091
349ede6a 23092#: command-list.h:66
fd8cb379
JX
23093msgid "Copy files from the index to the working tree"
23094msgstr "从索引拷贝文件到工作区"
23095
349ede6a 23096#: command-list.h:67
fd8cb379
JX
23097msgid "Ensures that a reference name is well formed"
23098msgstr "确保引用名称格式正确"
23099
349ede6a 23100#: command-list.h:68
fd8cb379
JX
23101msgid "Find commits yet to be applied to upstream"
23102msgstr "查找尚未应用到上游的提交"
23103
349ede6a 23104#: command-list.h:69
fd8cb379
JX
23105msgid "Apply the changes introduced by some existing commits"
23106msgstr "应用一些现存提交引入的修改"
23107
349ede6a 23108#: command-list.h:70
fd8cb379
JX
23109msgid "Graphical alternative to git-commit"
23110msgstr "git-commit 的图形替代界面"
23111
349ede6a 23112#: command-list.h:71
fd8cb379
JX
23113msgid "Remove untracked files from the working tree"
23114msgstr "从工作区中删除未跟踪文件"
23115
349ede6a 23116#: command-list.h:72
8ada9598 23117msgid "Clone a repository into a new directory"
06991777 23118msgstr "克隆仓库到一个新目录"
8ada9598 23119
349ede6a 23120#: command-list.h:73
fd8cb379
JX
23121msgid "Display data in columns"
23122msgstr "以列的方式显示数据"
23123
349ede6a 23124#: command-list.h:74
8ada9598 23125msgid "Record changes to the repository"
160fb2b2 23126msgstr "记录变更到仓库"
8ada9598 23127
349ede6a 23128#: command-list.h:75
4c27fcb5
JX
23129msgid "Write and verify Git commit-graph files"
23130msgstr "写入和校验 Git 提交图文件"
fd8cb379 23131
349ede6a 23132#: command-list.h:76
fd8cb379
JX
23133msgid "Create a new commit object"
23134msgstr "创建一个新的提交对象"
23135
349ede6a 23136#: command-list.h:77
fd8cb379
JX
23137msgid "Get and set repository or global options"
23138msgstr "获取和设置仓库或者全局选项"
23139
349ede6a 23140#: command-list.h:78
fd8cb379
JX
23141msgid "Count unpacked number of objects and their disk consumption"
23142msgstr "计算未打包对象的数量和磁盘空间占用"
23143
349ede6a 23144#: command-list.h:79
fd8cb379
JX
23145msgid "Retrieve and store user credentials"
23146msgstr "检索和存储用户密码"
23147
349ede6a 23148#: command-list.h:80
fd8cb379
JX
23149msgid "Helper to temporarily store passwords in memory"
23150msgstr "在内存中临时存储密码的助手"
23151
349ede6a 23152#: command-list.h:81
fd8cb379
JX
23153msgid "Helper to store credentials on disk"
23154msgstr "在磁盘存储密码的助手"
23155
349ede6a 23156#: command-list.h:82
fd8cb379
JX
23157msgid "Export a single commit to a CVS checkout"
23158msgstr "将一个提交导出到 CVS 检出中"
23159
349ede6a 23160#: command-list.h:83
fd8cb379
JX
23161msgid "Salvage your data out of another SCM people love to hate"
23162msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据"
23163
349ede6a 23164#: command-list.h:84
fd8cb379
JX
23165msgid "A CVS server emulator for Git"
23166msgstr "Git 的一个 CVS 服务模拟器"
23167
349ede6a 23168#: command-list.h:85
fd8cb379
JX
23169msgid "A really simple server for Git repositories"
23170msgstr "一个非常简单的 Git 仓库服务器"
23171
349ede6a 23172#: command-list.h:86
fd8cb379
JX
23173msgid "Give an object a human readable name based on an available ref"
23174msgstr "基于一个现存的引用为一个对象起一个可读的名称"
23175
349ede6a 23176#: command-list.h:87
8ada9598 23177msgid "Show changes between commits, commit and working tree, etc"
81809b99 23178msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598 23179
349ede6a 23180#: command-list.h:88
fd8cb379
JX
23181msgid "Compares files in the working tree and the index"
23182msgstr "比较工作区和索引区中的文件"
23183
349ede6a 23184#: command-list.h:89
fd8cb379
JX
23185msgid "Compare a tree to the working tree or index"
23186msgstr "将一个树和工作区或索引做比较"
23187
349ede6a 23188#: command-list.h:90
fd8cb379
JX
23189msgid "Compares the content and mode of blobs found via two tree objects"
23190msgstr "比较两个树对象的文件内容和模式"
23191
349ede6a 23192#: command-list.h:91
fd8cb379
JX
23193msgid "Show changes using common diff tools"
23194msgstr "使用常见的差异工具显示更改"
23195
349ede6a 23196#: command-list.h:92
fd8cb379
JX
23197msgid "Git data exporter"
23198msgstr "Git 数据导出器"
23199
349ede6a 23200#: command-list.h:93
fd8cb379
JX
23201msgid "Backend for fast Git data importers"
23202msgstr "Git 快速数据导入器后端"
23203
349ede6a 23204#: command-list.h:94
8ada9598 23205msgid "Download objects and refs from another repository"
160fb2b2 23206msgstr "从另外一个仓库下载对象和引用"
8ada9598 23207
349ede6a 23208#: command-list.h:95
fd8cb379
JX
23209msgid "Receive missing objects from another repository"
23210msgstr "从另一个仓库获取缺失的对象"
23211
349ede6a 23212#: command-list.h:96
fd8cb379
JX
23213msgid "Rewrite branches"
23214msgstr "重写分支"
23215
349ede6a 23216#: command-list.h:97
fd8cb379
JX
23217msgid "Produce a merge commit message"
23218msgstr "生成一个合并提交信息"
23219
349ede6a 23220#: command-list.h:98
fd8cb379
JX
23221msgid "Output information on each ref"
23222msgstr "对每一个引用输出信息 "
23223
349ede6a 23224#: command-list.h:99
fd8cb379
JX
23225msgid "Prepare patches for e-mail submission"
23226msgstr "准备电子邮件提交的补丁"
23227
349ede6a 23228#: command-list.h:100
fd8cb379
JX
23229msgid "Verifies the connectivity and validity of the objects in the database"
23230msgstr "验证仓库中对象的连通性和有效性"
23231
349ede6a 23232#: command-list.h:101
fd8cb379
JX
23233msgid "Cleanup unnecessary files and optimize the local repository"
23234msgstr "清除不必要的文件和优化本地仓库"
23235
349ede6a 23236#: command-list.h:102
fd8cb379 23237msgid "Extract commit ID from an archive created using git-archive"
5b533632 23238msgstr "从 git-archive 创建的归档文件中提取提交 ID"
fd8cb379 23239
349ede6a 23240#: command-list.h:103
8ada9598 23241msgid "Print lines matching a pattern"
81809b99 23242msgstr "输出和模式匹配的行"
8ada9598 23243
349ede6a 23244#: command-list.h:104
fd8cb379
JX
23245msgid "A portable graphical interface to Git"
23246msgstr "一个便携的 Git 图形客户端"
23247
349ede6a 23248#: command-list.h:105
fd8cb379 23249msgid "Compute object ID and optionally creates a blob from a file"
5b533632 23250msgstr "从一个文件计算对象 ID,并可以创建 blob 数据对象"
fd8cb379 23251
349ede6a 23252#: command-list.h:106
fd8cb379
JX
23253msgid "Display help information about Git"
23254msgstr "显示 Git 的帮助信息"
23255
349ede6a 23256#: command-list.h:107
fd8cb379
JX
23257msgid "Server side implementation of Git over HTTP"
23258msgstr "Git HTTP 协议的服务端实现"
23259
349ede6a 23260#: command-list.h:108
fd8cb379
JX
23261msgid "Download from a remote Git repository via HTTP"
23262msgstr "通过 HTTP 从远程 Git 仓库下载"
23263
349ede6a 23264#: command-list.h:109
fd8cb379
JX
23265msgid "Push objects over HTTP/DAV to another repository"
23266msgstr "通过 HTTP/DAV 推送对象另一个仓库"
23267
349ede6a 23268#: command-list.h:110
fd8cb379
JX
23269msgid "Send a collection of patches from stdin to an IMAP folder"
23270msgstr "从标准输入将一组补丁发送到IMAP文件夹"
23271
349ede6a 23272#: command-list.h:111
fd8cb379
JX
23273msgid "Build pack index file for an existing packed archive"
23274msgstr "从一个现存的包存档文件创建包索引"
23275
349ede6a 23276#: command-list.h:112
a77c07d9 23277msgid "Create an empty Git repository or reinitialize an existing one"
160fb2b2 23278msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
8ada9598 23279
349ede6a 23280#: command-list.h:113
fd8cb379
JX
23281msgid "Instantly browse your working repository in gitweb"
23282msgstr "在 gitweb 中即时浏览您的工作仓库"
23283
349ede6a 23284#: command-list.h:114
d46c5519 23285msgid "Add or parse structured information in commit messages"
fd8cb379
JX
23286msgstr "添加或解析提交说明中的结构化信息"
23287
349ede6a 23288#: command-list.h:115
fd8cb379
JX
23289msgid "The Git repository browser"
23290msgstr "Git 仓库浏览器"
23291
349ede6a 23292#: command-list.h:116
8ada9598 23293msgid "Show commit logs"
81809b99 23294msgstr "显示提交日志"
8ada9598 23295
349ede6a 23296#: command-list.h:117
fd8cb379
JX
23297msgid "Show information about files in the index and the working tree"
23298msgstr "显示索引和工作区中文件的信息"
23299
349ede6a 23300#: command-list.h:118
fd8cb379
JX
23301msgid "List references in a remote repository"
23302msgstr "显示一个远程仓库的引用"
23303
349ede6a 23304#: command-list.h:119
fd8cb379
JX
23305msgid "List the contents of a tree object"
23306msgstr "显示一个树对象的内容"
23307
349ede6a 23308#: command-list.h:120
fd8cb379
JX
23309msgid "Extracts patch and authorship from a single e-mail message"
23310msgstr "从单个电子邮件中提取补丁和作者身份"
23311
349ede6a 23312#: command-list.h:121
fd8cb379
JX
23313msgid "Simple UNIX mbox splitter program"
23314msgstr "简单的 UNIX mbox 邮箱切分程序"
23315
349ede6a 23316#: command-list.h:122
d9488fea
JX
23317msgid "Run tasks to optimize Git repository data"
23318msgstr "运行任务以优化仓库数据"
23319
23320#: command-list.h:123
8ada9598 23321msgid "Join two or more development histories together"
81809b99 23322msgstr "合并两个或更多开发历史"
8ada9598 23323
d9488fea 23324#: command-list.h:124
fd8cb379
JX
23325msgid "Find as good common ancestors as possible for a merge"
23326msgstr "为了合并查找尽可能好的公共祖先提交"
23327
d9488fea 23328#: command-list.h:125
fd8cb379
JX
23329msgid "Run a three-way file merge"
23330msgstr "运行一个三路文件合并"
23331
d9488fea 23332#: command-list.h:126
fd8cb379
JX
23333msgid "Run a merge for files needing merging"
23334msgstr "对于需要合并的文件执行合并"
23335
d9488fea 23336#: command-list.h:127
fd8cb379
JX
23337msgid "The standard helper program to use with git-merge-index"
23338msgstr "与 git-merge-index 一起使用的标准向导程序"
23339
d9488fea 23340#: command-list.h:128
fd8cb379
JX
23341msgid "Run merge conflict resolution tools to resolve merge conflicts"
23342msgstr "运行合并冲突解决工具以解决合并冲突"
23343
d9488fea 23344#: command-list.h:129
fd8cb379
JX
23345msgid "Show three-way merge without touching index"
23346msgstr "显示三路合并而不动索引"
23347
d9488fea 23348#: command-list.h:130
4c27fcb5
JX
23349msgid "Write and verify multi-pack-indexes"
23350msgstr "写入和校验多包索引"
23351
d9488fea 23352#: command-list.h:131
fd8cb379
JX
23353msgid "Creates a tag object"
23354msgstr "创建一个标签对象"
23355
d9488fea 23356#: command-list.h:132
fd8cb379
JX
23357msgid "Build a tree-object from ls-tree formatted text"
23358msgstr "基于 ls-tree 的格式化文本创建一个树对象"
23359
d9488fea 23360#: command-list.h:133
8ada9598 23361msgid "Move or rename a file, a directory, or a symlink"
81809b99 23362msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598 23363
fd8cb379 23364# 查找给定版本的符号名称
d9488fea 23365#: command-list.h:134
fd8cb379
JX
23366msgid "Find symbolic names for given revs"
23367msgstr "查找给定版本的符号名称"
23368
d9488fea 23369#: command-list.h:135
fd8cb379
JX
23370msgid "Add or inspect object notes"
23371msgstr "添加或检查对象注释"
23372
d9488fea 23373#: command-list.h:136
fd8cb379
JX
23374msgid "Import from and submit to Perforce repositories"
23375msgstr "导入和提交到 Perforce 仓库中"
23376
d9488fea 23377#: command-list.h:137
fd8cb379
JX
23378msgid "Create a packed archive of objects"
23379msgstr "创建对象的存档包"
23380
d9488fea 23381#: command-list.h:138
fd8cb379
JX
23382msgid "Find redundant pack files"
23383msgstr "查找冗余的包文件"
23384
d9488fea 23385#: command-list.h:139
fd8cb379
JX
23386msgid "Pack heads and tags for efficient repository access"
23387msgstr "打包头和标签以实现高效的仓库访问"
23388
d9488fea 23389#: command-list.h:140
fd8cb379
JX
23390msgid "Routines to help parsing remote repository access parameters"
23391msgstr "帮助解析远程仓库访问参数的例程"
23392
d9488fea 23393#: command-list.h:141
fd8cb379 23394msgid "Compute unique ID for a patch"
5b533632 23395msgstr "计算一个补丁的唯一 ID"
fd8cb379 23396
d9488fea 23397#: command-list.h:142
fd8cb379
JX
23398msgid "Prune all unreachable objects from the object database"
23399msgstr "删除对象库中所有不可达对象"
23400
d9488fea 23401#: command-list.h:143
fd8cb379
JX
23402msgid "Remove extra objects that are already in pack files"
23403msgstr "删除已经在包文件中的多余对象"
23404
d9488fea 23405#: command-list.h:144
2e8451e8 23406msgid "Fetch from and integrate with another repository or a local branch"
160fb2b2 23407msgstr "获取并整合另外的仓库或一个本地分支"
8ada9598 23408
d9488fea 23409#: command-list.h:145
8ada9598 23410msgid "Update remote refs along with associated objects"
81809b99 23411msgstr "更新远程引用和相关的对象"
8ada9598 23412
d9488fea 23413#: command-list.h:146
fd8cb379
JX
23414msgid "Applies a quilt patchset onto the current branch"
23415msgstr "将一个 quilt 补丁集应用到当前分支。"
23416
d9488fea 23417#: command-list.h:147
c1ac5258
JX
23418msgid "Compare two commit ranges (e.g. two versions of a branch)"
23419msgstr "比较两个提交范围(如一个分支的两个版本)"
23420
d9488fea 23421#: command-list.h:148
fd8cb379
JX
23422msgid "Reads tree information into the index"
23423msgstr "将树信息读取到索引"
23424
d9488fea 23425#: command-list.h:149
3495628d
JX
23426msgid "Reapply commits on top of another base tip"
23427msgstr "在另一个分支上重新应用提交"
8ada9598 23428
d9488fea 23429#: command-list.h:150
fd8cb379
JX
23430msgid "Receive what is pushed into the repository"
23431msgstr "接收推送到仓库中的对象"
23432
d9488fea 23433#: command-list.h:151
fd8cb379
JX
23434msgid "Manage reflog information"
23435msgstr "管理 reflog 信息"
23436
d9488fea 23437#: command-list.h:152
fd8cb379
JX
23438msgid "Manage set of tracked repositories"
23439msgstr "管理已跟踪仓库"
23440
d9488fea 23441#: command-list.h:153
fd8cb379
JX
23442msgid "Pack unpacked objects in a repository"
23443msgstr "打包仓库中未打包对象"
23444
d9488fea 23445#: command-list.h:154
fd8cb379
JX
23446msgid "Create, list, delete refs to replace objects"
23447msgstr "创建、列出、删除对象替换引用"
23448
d9488fea 23449#: command-list.h:155
fd8cb379
JX
23450msgid "Generates a summary of pending changes"
23451msgstr "生成待定更改的摘要"
23452
d9488fea 23453#: command-list.h:156
fd8cb379
JX
23454msgid "Reuse recorded resolution of conflicted merges"
23455msgstr "重用冲突合并的解决方案记录"
23456
d9488fea 23457#: command-list.h:157
8ada9598 23458msgid "Reset current HEAD to the specified state"
4375c10e 23459msgstr "重置当前 HEAD 到指定状态"
8ada9598 23460
d9488fea 23461#: command-list.h:158
a6cd2cc4
JX
23462msgid "Restore working tree files"
23463msgstr "恢复工作区文件"
23464
d9488fea 23465#: command-list.h:159
fd8cb379
JX
23466msgid "Revert some existing commits"
23467msgstr "回退一些现存提交"
23468
d9488fea 23469#: command-list.h:160
fd8cb379
JX
23470msgid "Lists commit objects in reverse chronological order"
23471msgstr "按时间顺序列出提交对象"
23472
d9488fea 23473#: command-list.h:161
fd8cb379
JX
23474msgid "Pick out and massage parameters"
23475msgstr "选出并处理参数"
23476
d9488fea 23477#: command-list.h:162
8ada9598 23478msgid "Remove files from the working tree and from the index"
81809b99 23479msgstr "从工作区和索引中删除文件"
8ada9598 23480
d9488fea 23481#: command-list.h:163
fd8cb379
JX
23482msgid "Send a collection of patches as emails"
23483msgstr "通过电子邮件发送一组补丁"
23484
d9488fea 23485#: command-list.h:164
fd8cb379
JX
23486msgid "Push objects over Git protocol to another repository"
23487msgstr "使用 Git 协议推送对象到另一个仓库"
23488
d9488fea 23489#: command-list.h:165
fd8cb379
JX
23490msgid "Restricted login shell for Git-only SSH access"
23491msgstr "只允许 Git SSH 访问的受限登录shell"
23492
d9488fea 23493#: command-list.h:166
fd8cb379
JX
23494msgid "Summarize 'git log' output"
23495msgstr "'git log' 输出摘要"
23496
d9488fea 23497#: command-list.h:167
8ada9598 23498msgid "Show various types of objects"
81809b99 23499msgstr "显示各种类型的对象"
8ada9598 23500
d9488fea 23501#: command-list.h:168
fd8cb379
JX
23502msgid "Show branches and their commits"
23503msgstr "显示分支和提交"
23504
d9488fea 23505#: command-list.h:169
fd8cb379
JX
23506msgid "Show packed archive index"
23507msgstr "显示打包归档索引"
23508
d9488fea 23509#: command-list.h:170
fd8cb379
JX
23510msgid "List references in a local repository"
23511msgstr "显示本地仓库中的引用"
23512
d9488fea 23513#: command-list.h:171
fd8cb379
JX
23514msgid "Git's i18n setup code for shell scripts"
23515msgstr "为 shell 脚本准备的 Git 国际化设置代码"
23516
d9488fea 23517#: command-list.h:172
fd8cb379
JX
23518msgid "Common Git shell script setup code"
23519msgstr "常用的 Git shell 脚本设置代码"
23520
d9488fea 23521#: command-list.h:173
ddc12c42
JX
23522msgid "Initialize and modify the sparse-checkout"
23523msgstr "初始化及修改稀疏检出"
23524
d9488fea 23525#: command-list.h:174
fd8cb379
JX
23526msgid "Stash the changes in a dirty working directory away"
23527msgstr "贮藏脏工作区中的修改"
23528
d9488fea 23529#: command-list.h:175
fd8cb379
JX
23530msgid "Add file contents to the staging area"
23531msgstr "将文件内容添加到索引"
23532
d9488fea 23533#: command-list.h:176
8ada9598 23534msgid "Show the working tree status"
81809b99 23535msgstr "显示工作区状态"
8ada9598 23536
d9488fea 23537#: command-list.h:177
fd8cb379
JX
23538msgid "Remove unnecessary whitespace"
23539msgstr "删除不必要的空白字符"
23540
d9488fea 23541#: command-list.h:178
fd8cb379
JX
23542msgid "Initialize, update or inspect submodules"
23543msgstr "初始化、更新或检查子模组"
23544
d9488fea 23545#: command-list.h:179
fd8cb379
JX
23546msgid "Bidirectional operation between a Subversion repository and Git"
23547msgstr "Subersion 仓库和 Git 之间的双向操作"
23548
d9488fea 23549#: command-list.h:180
a6cd2cc4
JX
23550msgid "Switch branches"
23551msgstr "切换分支"
23552
d9488fea 23553#: command-list.h:181
fd8cb379
JX
23554msgid "Read, modify and delete symbolic refs"
23555msgstr "读取、修改和删除符号引用"
23556
d9488fea 23557#: command-list.h:182
8ada9598 23558msgid "Create, list, delete or verify a tag object signed with GPG"
4375c10e 23559msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
8ada9598 23560
d9488fea 23561#: command-list.h:183
fd8cb379
JX
23562msgid "Creates a temporary file with a blob's contents"
23563msgstr "用 blob 数据对象的内容创建一个临时文件"
220c313c 23564
d9488fea 23565#: command-list.h:184
fd8cb379
JX
23566msgid "Unpack objects from a packed archive"
23567msgstr "从打包文件中解压缩对象"
220c313c 23568
d9488fea 23569#: command-list.h:185
fd8cb379
JX
23570msgid "Register file contents in the working tree to the index"
23571msgstr "将工作区的文件内容注册到索引"
220c313c 23572
d9488fea 23573#: command-list.h:186
fd8cb379
JX
23574msgid "Update the object name stored in a ref safely"
23575msgstr "安全地更新存储于引用中的对象名称"
220c313c 23576
d9488fea 23577#: command-list.h:187
fd8cb379
JX
23578msgid "Update auxiliary info file to help dumb servers"
23579msgstr "更新辅助信息文件以帮助哑协议服务"
23580
d9488fea 23581#: command-list.h:188
fd8cb379
JX
23582msgid "Send archive back to git-archive"
23583msgstr "将存档发送回 git-archive"
23584
d9488fea 23585#: command-list.h:189
fd8cb379
JX
23586msgid "Send objects packed back to git-fetch-pack"
23587msgstr "将对象压缩包发送回 git-fetch-pack"
23588
d9488fea 23589#: command-list.h:190
fd8cb379
JX
23590msgid "Show a Git logical variable"
23591msgstr "显示一个Git逻辑变量"
23592
d9488fea 23593#: command-list.h:191
fd8cb379
JX
23594msgid "Check the GPG signature of commits"
23595msgstr "检查 GPG 提交签名"
23596
d9488fea 23597#: command-list.h:192
fd8cb379
JX
23598msgid "Validate packed Git archive files"
23599msgstr "校验打包的Git存仓文件"
23600
d9488fea 23601#: command-list.h:193
fd8cb379
JX
23602msgid "Check the GPG signature of tags"
23603msgstr "检查标签的 GPG 签名"
23604
d9488fea 23605#: command-list.h:194
fd8cb379
JX
23606msgid "Git web interface (web frontend to Git repositories)"
23607msgstr "Git web 界面(Git 仓库的 web 前端)"
23608
d9488fea 23609#: command-list.h:195
fd8cb379
JX
23610msgid "Show logs with difference each commit introduces"
23611msgstr "显示每一个提交引入的差异日志"
23612
d9488fea 23613#: command-list.h:196
fd8cb379
JX
23614msgid "Manage multiple working trees"
23615msgstr "管理多个工作区"
23616
d9488fea 23617#: command-list.h:197
fd8cb379
JX
23618msgid "Create a tree object from the current index"
23619msgstr "从当前索引创建一个树对象"
23620
d9488fea 23621#: command-list.h:198
fd8cb379
JX
23622msgid "Defining attributes per path"
23623msgstr "定义路径的属性"
23624
d9488fea 23625#: command-list.h:199
fd8cb379
JX
23626msgid "Git command-line interface and conventions"
23627msgstr "Git 命令行界面和约定"
23628
d9488fea 23629#: command-list.h:200
fd8cb379
JX
23630msgid "A Git core tutorial for developers"
23631msgstr "面向开发人员的 Git 核心教程"
23632
d9488fea
JX
23633#: command-list.h:201
23634msgid "Providing usernames and passwords to Git"
23635msgstr "为 Git 提供用户名和口令"
23636
23637#: command-list.h:202
fd8cb379
JX
23638msgid "Git for CVS users"
23639msgstr "适合 CVS 用户的 Git 帮助"
23640
d9488fea 23641#: command-list.h:203
fd8cb379
JX
23642msgid "Tweaking diff output"
23643msgstr "调整差异输出"
23644
d9488fea 23645#: command-list.h:204
fd8cb379
JX
23646msgid "A useful minimum set of commands for Everyday Git"
23647msgstr "每一天 Git 的一组有用的最小命令集合"
23648
d9488fea 23649#: command-list.h:205
349ede6a
JX
23650msgid "Frequently asked questions about using Git"
23651msgstr "关于使用 Git 的常见问题"
23652
d9488fea 23653#: command-list.h:206
fd8cb379
JX
23654msgid "A Git Glossary"
23655msgstr "Git 词汇表"
23656
d9488fea 23657#: command-list.h:207
fd8cb379
JX
23658msgid "Hooks used by Git"
23659msgstr "Git 使用的钩子"
23660
d9488fea 23661#: command-list.h:208
fd8cb379
JX
23662msgid "Specifies intentionally untracked files to ignore"
23663msgstr "忽略指定的未跟踪文件"
23664
d9488fea 23665#: command-list.h:209
fd8cb379
JX
23666msgid "Defining submodule properties"
23667msgstr "定义子模组属性"
23668
d9488fea 23669#: command-list.h:210
fd8cb379
JX
23670msgid "Git namespaces"
23671msgstr "Git 名字空间"
23672
d9488fea
JX
23673#: command-list.h:211
23674msgid "Helper programs to interact with remote repositories"
23675msgstr "与远程仓库交互的助手程序"
23676
23677#: command-list.h:212
fd8cb379
JX
23678msgid "Git Repository Layout"
23679msgstr "Git 仓库布局"
23680
d9488fea 23681#: command-list.h:213
fd8cb379
JX
23682msgid "Specifying revisions and ranges for Git"
23683msgstr "指定 Git 的版本和版本范围"
23684
d9488fea 23685#: command-list.h:214
ddc12c42
JX
23686msgid "Mounting one repository inside another"
23687msgstr "将一个仓库安装到另外一个仓库中"
23688
d9488fea 23689#: command-list.h:215
fd8cb379
JX
23690msgid "A tutorial introduction to Git: part two"
23691msgstr "一个 Git 教程:第二部分"
23692
d9488fea 23693#: command-list.h:216
fd8cb379
JX
23694msgid "A tutorial introduction to Git"
23695msgstr "一个 Git 教程"
23696
d9488fea 23697#: command-list.h:217
fd8cb379
JX
23698msgid "An overview of recommended workflows with Git"
23699msgstr "Git 推荐的工作流概览"
220c313c 23700
d9488fea 23701#: git-bisect.sh:79
c04f5ac3
JX
23702#, sh-format
23703msgid "Bad rev input: $arg"
9a4b694c 23704msgstr "坏的输入版本:$arg"
c04f5ac3 23705
d9488fea 23706#: git-bisect.sh:99
5c57d762
JX
23707#, sh-format
23708msgid "Bad rev input: $bisected_head"
9a4b694c 23709msgstr "坏的输入版本:$bisected_head"
c04f5ac3 23710
d9488fea 23711#: git-bisect.sh:108
c04f5ac3
JX
23712#, sh-format
23713msgid "Bad rev input: $rev"
9a4b694c 23714msgstr "坏的输入版本:$rev"
c04f5ac3 23715
d9488fea 23716#: git-bisect.sh:117
1b7f4a34
JX
23717#, sh-format
23718msgid "'git bisect $TERM_BAD' can take only one argument."
23719msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
23720
d9488fea 23721#: git-bisect.sh:149
c04f5ac3
JX
23722msgid "No logfile given"
23723msgstr "未提供日志文件"
23724
d9488fea 23725#: git-bisect.sh:150
c04f5ac3
JX
23726#, sh-format
23727msgid "cannot read $file for replaying"
23728msgstr "不能读取 $file 来重放"
23729
d9488fea 23730#: git-bisect.sh:173
c04f5ac3
JX
23731msgid "?? what are you talking about?"
23732msgstr "?? 您在说什么?"
23733
d9488fea 23734#: git-bisect.sh:183
5809aa05
JX
23735msgid "bisect run failed: no command provided."
23736msgstr "二分查找运行失败:没有提供命令。"
23737
d9488fea 23738#: git-bisect.sh:188
b694fbb1
JX
23739#, sh-format
23740msgid "running $command"
23741msgstr "运行 $command"
23742
d9488fea 23743#: git-bisect.sh:195
b694fbb1
JX
23744#, sh-format
23745msgid ""
23746"bisect run failed:\n"
23747"exit code $res from '$command' is < 0 or >= 128"
23748msgstr ""
23749"二分查找运行失败:\n"
07432cef 23750"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 23751
d9488fea 23752#: git-bisect.sh:221
b694fbb1
JX
23753msgid "bisect run cannot continue any more"
23754msgstr "二分查找不能继续运行"
23755
d9488fea 23756#: git-bisect.sh:227
b694fbb1
JX
23757#, sh-format
23758msgid ""
23759"bisect run failed:\n"
23760"'bisect_state $state' exited with error code $res"
23761msgstr ""
23762"二分查找运行失败:\n"
23763"'bisect_state $state' 退出码为 $res"
23764
d9488fea 23765#: git-bisect.sh:234
b694fbb1
JX
23766msgid "bisect run success"
23767msgstr "二分查找运行成功"
c04f5ac3 23768
d9488fea 23769#: git-bisect.sh:242
06991777
JX
23770msgid "We are not bisecting."
23771msgstr "我们没有在二分查找。"
94550ed3 23772
5c57d762
JX
23773#: git-merge-octopus.sh:46
23774msgid ""
23775"Error: Your local changes to the following files would be overwritten by "
23776"merge"
23777msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
23778
23779#: git-merge-octopus.sh:61
23780msgid "Automated merge did not work."
9a4b694c 23781msgstr "自动合并未生效。"
5c57d762
JX
23782
23783#: git-merge-octopus.sh:62
a0b6b246 23784msgid "Should not be doing an octopus."
5c57d762
JX
23785msgstr "不应该执行章鱼式合并。"
23786
23787#: git-merge-octopus.sh:73
23788#, sh-format
23789msgid "Unable to find common commit with $pretty_name"
23790msgstr "无法找到和 $pretty_name 的基线提交"
23791
23792#: git-merge-octopus.sh:77
23793#, sh-format
6937cb4e 23794msgid "Already up to date with $pretty_name"
5c57d762
JX
23795msgstr "已经和 $pretty_name 保持一致"
23796
23797#: git-merge-octopus.sh:89
23798#, sh-format
23799msgid "Fast-forwarding to: $pretty_name"
23800msgstr "快进至:$pretty_name"
23801
23802#: git-merge-octopus.sh:97
23803#, sh-format
23804msgid "Trying simple merge with $pretty_name"
23805msgstr "尝试和 $pretty_name 的简单合并"
23806
23807#: git-merge-octopus.sh:102
23808msgid "Simple merge did not work, trying automatic merge."
9a4b694c 23809msgstr "简单合并未生效,尝试自动合并。"
5c57d762 23810
d9488fea 23811#: git-submodule.sh:180
2e8451e8
JX
23812msgid "Relative path can only be used from the toplevel of the working tree"
23813msgstr "只能在工作区的顶级目录中使用相对路径"
23814
d9488fea 23815#: git-submodule.sh:190
c04f5ac3
JX
23816#, sh-format
23817msgid "repo URL: '$repo' must be absolute or begin with ./|../"
4375c10e 23818msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
c04f5ac3 23819
d9488fea 23820#: git-submodule.sh:209
c04f5ac3 23821#, sh-format
170e9899
JX
23822msgid "'$sm_path' already exists in the index"
23823msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 23824
d9488fea 23825#: git-submodule.sh:212
1a79b2f1
JX
23826#, sh-format
23827msgid "'$sm_path' already exists in the index and is not a submodule"
23828msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
23829
d9488fea 23830#: git-submodule.sh:219
d46c5519
JX
23831#, sh-format
23832msgid "'$sm_path' does not have a commit checked out"
5b533632 23833msgstr "'$sm_path' 没有检出的提交"
d46c5519 23834
d9488fea 23835#: git-submodule.sh:250
b694fbb1
JX
23836#, sh-format
23837msgid "Adding existing repo at '$sm_path' to the index"
160fb2b2 23838msgstr "添加位于 '$sm_path' 的现存仓库到索引"
b694fbb1 23839
d9488fea 23840#: git-submodule.sh:252
c04f5ac3 23841#, sh-format
170e9899 23842msgid "'$sm_path' already exists and is not a valid git repo"
160fb2b2 23843msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
c04f5ac3 23844
d9488fea 23845#: git-submodule.sh:260
07432cef
WS
23846#, sh-format
23847msgid "A git directory for '$sm_name' is found locally with remote(s):"
160fb2b2 23848msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
07432cef 23849
d9488fea 23850#: git-submodule.sh:262
07432cef
WS
23851#, sh-format
23852msgid ""
5c57d762
JX
23853"If you want to reuse this local git directory instead of cloning again from\n"
23854" $realrepo\n"
23855"use the '--force' option. If the local git directory is not the correct "
23856"repo\n"
07432cef
WS
23857"or you are unsure what this means choose another name with the '--name' "
23858"option."
5c57d762
JX
23859msgstr ""
23860"如果您想要重用这个本地 git 目录而非重新克隆自\n"
23861" $realrepo\n"
23862"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
23863"或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
07432cef 23864
d9488fea 23865#: git-submodule.sh:268
07432cef
WS
23866#, sh-format
23867msgid "Reactivating local git directory for submodule '$sm_name'."
23868msgstr "激活本地 git 目录到子模组 '$sm_name'。"
23869
d9488fea 23870#: git-submodule.sh:280
c04f5ac3 23871#, sh-format
170e9899
JX
23872msgid "Unable to checkout submodule '$sm_path'"
23873msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 23874
d9488fea 23875#: git-submodule.sh:285
c04f5ac3 23876#, sh-format
170e9899
JX
23877msgid "Failed to add submodule '$sm_path'"
23878msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 23879
d9488fea 23880#: git-submodule.sh:294
c04f5ac3 23881#, sh-format
170e9899
JX
23882msgid "Failed to register submodule '$sm_path'"
23883msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 23884
d9488fea 23885#: git-submodule.sh:567
c04f5ac3 23886#, sh-format
2e8451e8
JX
23887msgid "Unable to find current revision in submodule path '$displaypath'"
23888msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 23889
d9488fea 23890#: git-submodule.sh:577
c04f5ac3 23891#, sh-format
170e9899
JX
23892msgid "Unable to fetch in submodule path '$sm_path'"
23893msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 23894
d9488fea 23895#: git-submodule.sh:582
5c57d762
JX
23896#, sh-format
23897msgid ""
23898"Unable to find current ${remote_name}/${branch} revision in submodule path "
23899"'$sm_path'"
9a4b694c 23900msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
5c57d762 23901
d9488fea 23902#: git-submodule.sh:600
2e8451e8 23903#, sh-format
d46c5519
JX
23904msgid ""
23905"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
23906"$sha1:"
23907msgstr "无法在子模组路径 '$displaypath' 中获取,尝试直接获取 $sha1:"
2e8451e8 23908
d9488fea 23909#: git-submodule.sh:606
5c57d762
JX
23910#, sh-format
23911msgid ""
23912"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
23913"Direct fetching of that commit failed."
a0b6b246
JX
23914msgstr ""
23915"获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
5c57d762 23916
d9488fea 23917#: git-submodule.sh:613
6c94aba5
JX
23918#, sh-format
23919msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
23920msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
23921
d9488fea 23922#: git-submodule.sh:614
c04f5ac3 23923#, sh-format
6c94aba5
JX
23924msgid "Submodule path '$displaypath': checked out '$sha1'"
23925msgstr "子模组路径 '$displaypath':检出 '$sha1'"
23926
d9488fea 23927#: git-submodule.sh:618
6c94aba5 23928#, sh-format
2e8451e8
JX
23929msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
23930msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 23931
d9488fea 23932#: git-submodule.sh:619
c04f5ac3 23933#, sh-format
2e8451e8
JX
23934msgid "Submodule path '$displaypath': rebased into '$sha1'"
23935msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 23936
d9488fea 23937#: git-submodule.sh:624
c04f5ac3 23938#, sh-format
2e8451e8
JX
23939msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
23940msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 23941
d9488fea 23942#: git-submodule.sh:625
c04f5ac3 23943#, sh-format
2e8451e8
JX
23944msgid "Submodule path '$displaypath': merged in '$sha1'"
23945msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 23946
d9488fea 23947#: git-submodule.sh:630
c04f5ac3 23948#, sh-format
5b04ee3b
JX
23949msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
23950msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
c04f5ac3 23951
d9488fea 23952#: git-submodule.sh:631
c04f5ac3 23953#, sh-format
5b04ee3b 23954msgid "Submodule path '$displaypath': '$command $sha1'"
aef18cc6 23955msgstr "子模组 '$displaypath':'$command $sha1'"
c04f5ac3 23956
d9488fea 23957#: git-submodule.sh:662
2e8451e8
JX
23958#, sh-format
23959msgid "Failed to recurse into submodule path '$displaypath'"
23960msgstr "无法递归进子模组路径 '$displaypath'"
23961
5b04ee3b
JX
23962#: git-parse-remote.sh:89
23963#, sh-format
23964msgid "See git-${cmd}(1) for details."
23965msgstr "详见 git-${cmd}(1)。"
5c57d762 23966
a6cd2cc4
JX
23967#: git-rebase--preserve-merges.sh:109
23968msgid "Applied autostash."
23969msgstr "已应用 autostash。"
23970
23971#: git-rebase--preserve-merges.sh:112
23972#, sh-format
23973msgid "Cannot store $stash_sha1"
23974msgstr "不能存储 $stash_sha1"
23975
349ede6a
JX
23976#: git-rebase--preserve-merges.sh:113
23977msgid ""
23978"Applying autostash resulted in conflicts.\n"
23979"Your changes are safe in the stash.\n"
23980"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
23981msgstr ""
23982"应用 autostash 导致了冲突。\n"
23983"您的修改安全地保存在贮藏区中。\n"
23984"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
23985
a6cd2cc4 23986#: git-rebase--preserve-merges.sh:191
c1ac5258
JX
23987#, sh-format
23988msgid "Rebasing ($new_count/$total)"
23989msgstr "变基中($new_count/$total)"
23990
d9488fea 23991#: git-rebase--preserve-merges.sh:197
c1ac5258
JX
23992msgid ""
23993"\n"
23994"Commands:\n"
23995"p, pick <commit> = use commit\n"
23996"r, reword <commit> = use commit, but edit the commit message\n"
23997"e, edit <commit> = use commit, but stop for amending\n"
23998"s, squash <commit> = use commit, but meld into previous commit\n"
23999"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
24000"x, exec <commit> = run command (the rest of the line) using shell\n"
24001"d, drop <commit> = remove commit\n"
24002"l, label <label> = label current HEAD with a name\n"
24003"t, reset <label> = reset HEAD to a label\n"
24004"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
24005". create a merge commit using the original merge commit's\n"
24006". message (or the oneline, if no original merge commit was\n"
24007". specified). Use -c <commit> to reword the commit message.\n"
24008"\n"
24009"These lines can be re-ordered; they are executed from top to bottom.\n"
24010msgstr ""
24011"\n"
24012"命令:\n"
24013"p, pick <提交> = 使用提交\n"
24014"r, reword <提交> = 使用提交,但修改提交说明\n"
24015"e, edit <提交> = 使用提交,但停下来修补\n"
24016"s, squash <提交> = 使用提交,但融合到前一个提交\n"
24017"f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
24018"x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
24019"d, drop <提交> = 删除提交\n"
24020"l, label <标签> = 为当前 HEAD 打上标签\n"
24021"t, reset <标签> = 重置 HEAD 到该标签\n"
24022"m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n"
24023". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
24024". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
24025". -c <提交> 可以编辑提交说明。\n"
24026"\n"
24027"可以对这些行重新排序,将从上至下执行。\n"
24028
d9488fea 24029#: git-rebase--preserve-merges.sh:260
5c57d762
JX
24030#, sh-format
24031msgid ""
24032"You can amend the commit now, with\n"
24033"\n"
24034"\tgit commit --amend $gpg_sign_opt_quoted\n"
24035"\n"
24036"Once you are satisfied with your changes, run\n"
24037"\n"
24038"\tgit rebase --continue"
24039msgstr ""
24040"您现在可以修补这个提交,使用\n"
24041"\n"
24042"\tgit commit --amend $gpg_sign_opt_quoted\n"
24043"\n"
9a4b694c 24044"当您对变更感到满意,执行\n"
5c57d762
JX
24045"\n"
24046"\tgit rebase --continue"
24047
d9488fea 24048#: git-rebase--preserve-merges.sh:285
5c57d762
JX
24049#, sh-format
24050msgid "$sha1: not a commit that can be picked"
24051msgstr "$sha1:不是一个可以被拣选的提交"
24052
d9488fea 24053#: git-rebase--preserve-merges.sh:324
5c57d762
JX
24054#, sh-format
24055msgid "Invalid commit name: $sha1"
24056msgstr "无效的提交名:$sha1"
24057
d9488fea 24058#: git-rebase--preserve-merges.sh:354
5c57d762
JX
24059msgid "Cannot write current commit's replacement sha1"
24060msgstr "不能写入当前提交的替代 sha1"
24061
d9488fea 24062#: git-rebase--preserve-merges.sh:405
5c57d762
JX
24063#, sh-format
24064msgid "Fast-forward to $sha1"
24065msgstr "快进到 $sha1"
24066
d9488fea 24067#: git-rebase--preserve-merges.sh:407
5c57d762
JX
24068#, sh-format
24069msgid "Cannot fast-forward to $sha1"
24070msgstr "不能快进到 $sha1"
24071
d9488fea 24072#: git-rebase--preserve-merges.sh:416
5c57d762
JX
24073#, sh-format
24074msgid "Cannot move HEAD to $first_parent"
24075msgstr "不能移动 HEAD 到 $first_parent"
24076
d9488fea 24077#: git-rebase--preserve-merges.sh:421
5c57d762
JX
24078#, sh-format
24079msgid "Refusing to squash a merge: $sha1"
24080msgstr "拒绝压缩一个合并:$sha1"
24081
d9488fea 24082#: git-rebase--preserve-merges.sh:439
5c57d762
JX
24083#, sh-format
24084msgid "Error redoing merge $sha1"
24085msgstr "无法重做合并 $sha1"
24086
d9488fea 24087#: git-rebase--preserve-merges.sh:448
5c57d762
JX
24088#, sh-format
24089msgid "Could not pick $sha1"
24090msgstr "不能拣选 $sha1"
24091
d9488fea 24092#: git-rebase--preserve-merges.sh:457
5c57d762
JX
24093#, sh-format
24094msgid "This is the commit message #${n}:"
9a4b694c 24095msgstr "这是提交说明 #${n}:"
5c57d762 24096
d9488fea 24097#: git-rebase--preserve-merges.sh:462
5c57d762
JX
24098#, sh-format
24099msgid "The commit message #${n} will be skipped:"
9a4b694c 24100msgstr "提交说明 #${n} 将被跳过:"
5c57d762 24101
d9488fea 24102#: git-rebase--preserve-merges.sh:473
5c57d762
JX
24103#, sh-format
24104msgid "This is a combination of $count commit."
24105msgid_plural "This is a combination of $count commits."
24106msgstr[0] "这是一个 $count 个提交的组合。"
24107msgstr[1] "这是一个 $count 个提交的组合。"
24108
d9488fea 24109#: git-rebase--preserve-merges.sh:482
5c57d762
JX
24110#, sh-format
24111msgid "Cannot write $fixup_msg"
24112msgstr "不能写入 $fixup_msg"
24113
d9488fea 24114#: git-rebase--preserve-merges.sh:485
5c57d762
JX
24115msgid "This is a combination of 2 commits."
24116msgstr "这是一个 2 个提交的组合。"
24117
d9488fea
JX
24118#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569
24119#: git-rebase--preserve-merges.sh:572
5c57d762
JX
24120#, sh-format
24121msgid "Could not apply $sha1... $rest"
24122msgstr "不能应用 $sha1... $rest"
24123
d9488fea 24124#: git-rebase--preserve-merges.sh:601
5c57d762
JX
24125#, sh-format
24126msgid ""
24127"Could not amend commit after successfully picking $sha1... $rest\n"
24128"This is most likely due to an empty commit message, or the pre-commit hook\n"
24129"failed. If the pre-commit hook failed, you may need to resolve the issue "
24130"before\n"
24131"you are able to reword the commit."
24132msgstr ""
24133"不能在成功拣选 $sha1... $rest 之后修补提交\n"
24134"这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
24135"钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
24136
d9488fea 24137#: git-rebase--preserve-merges.sh:616
5c57d762
JX
24138#, sh-format
24139msgid "Stopped at $sha1_abbrev... $rest"
24140msgstr "停止在 $sha1_abbrev... $rest"
24141
d9488fea 24142#: git-rebase--preserve-merges.sh:631
5c57d762
JX
24143#, sh-format
24144msgid "Cannot '$squash_style' without a previous commit"
9a4b694c 24145msgstr "没有父提交的情况下不能 '$squash_style'"
5c57d762 24146
d9488fea 24147#: git-rebase--preserve-merges.sh:673
5c57d762
JX
24148#, sh-format
24149msgid "Executing: $rest"
24150msgstr "执行:$rest"
24151
d9488fea 24152#: git-rebase--preserve-merges.sh:681
5c57d762
JX
24153#, sh-format
24154msgid "Execution failed: $rest"
24155msgstr "执行失败:$rest"
24156
d9488fea 24157#: git-rebase--preserve-merges.sh:683
5c57d762
JX
24158msgid "and made changes to the index and/or the working tree"
24159msgstr "并且修改索引和/或工作区"
24160
24161# 译者:注意保持前导空格
d9488fea 24162#: git-rebase--preserve-merges.sh:685
5c57d762
JX
24163msgid ""
24164"You can fix the problem, and then run\n"
24165"\n"
24166"\tgit rebase --continue"
24167msgstr ""
24168"您可以解决这个问题,然后运行\n"
24169"\n"
24170"\tgit rebase --continue"
24171
24172#. TRANSLATORS: after these lines is a command to be issued by the user
d9488fea 24173#: git-rebase--preserve-merges.sh:698
5c57d762
JX
24174#, sh-format
24175msgid ""
24176"Execution succeeded: $rest\n"
24177"but left changes to the index and/or the working tree\n"
24178"Commit or stash your changes, and then run\n"
24179"\n"
24180"\tgit rebase --continue"
24181msgstr ""
24182"执行成功:$rest\n"
a4f16749 24183"但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n"
5c57d762
JX
24184"\n"
24185"\tgit rebase --continue"
24186
d9488fea 24187#: git-rebase--preserve-merges.sh:709
5c57d762
JX
24188#, sh-format
24189msgid "Unknown command: $command $sha1 $rest"
24190msgstr "未知命令:$command $sha1 $rest"
24191
d9488fea 24192#: git-rebase--preserve-merges.sh:710
5c57d762
JX
24193msgid "Please fix this using 'git rebase --edit-todo'."
24194msgstr "要修改请使用命令 'git rebase --edit-todo'。"
24195
d9488fea 24196#: git-rebase--preserve-merges.sh:745
5c57d762
JX
24197#, sh-format
24198msgid "Successfully rebased and updated $head_name."
9a4b694c 24199msgstr "成功变基并更新 $head_name。"
5c57d762 24200
d9488fea 24201#: git-rebase--preserve-merges.sh:802
5c57d762
JX
24202msgid "Could not remove CHERRY_PICK_HEAD"
24203msgstr "不能删除 CHERRY_PICK_HEAD"
24204
d9488fea 24205#: git-rebase--preserve-merges.sh:807
5c57d762
JX
24206#, sh-format
24207msgid ""
24208"You have staged changes in your working tree.\n"
24209"If these changes are meant to be\n"
24210"squashed into the previous commit, run:\n"
24211"\n"
24212" git commit --amend $gpg_sign_opt_quoted\n"
24213"\n"
24214"If they are meant to go into a new commit, run:\n"
24215"\n"
24216" git commit $gpg_sign_opt_quoted\n"
24217"\n"
a0b6b246 24218"In both cases, once you're done, continue with:\n"
5c57d762
JX
24219"\n"
24220" git rebase --continue\n"
24221msgstr ""
24222"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
24223"\n"
24224" git commit --amend $gpg_sign_opt_quoted\n"
24225"\n"
24226"如果这些变更要形成一个新提交,执行:\n"
24227"\n"
24228" git commit $gpg_sign_opt_quoted\n"
24229"\n"
9a4b694c 24230"无论哪种情况,当您完成提交,继续执行:\n"
5c57d762
JX
24231"\n"
24232" git rebase --continue\n"
24233
d9488fea 24234#: git-rebase--preserve-merges.sh:824
5c57d762 24235msgid "Error trying to find the author identity to amend commit"
9a4b694c 24236msgstr "在修补提交中查找作者信息时遇到错误"
5c57d762 24237
d9488fea 24238#: git-rebase--preserve-merges.sh:829
5c57d762
JX
24239msgid ""
24240"You have uncommitted changes in your working tree. Please commit them\n"
24241"first and then run 'git rebase --continue' again."
a0b6b246
JX
24242msgstr ""
24243"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
5c57d762 24244
d9488fea 24245#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
5c57d762
JX
24246msgid "Could not commit staged changes."
24247msgstr "不能提交暂存的修改。"
24248
d9488fea 24249#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
4c27fcb5
JX
24250msgid "Could not execute editor"
24251msgstr "无法运行编辑器"
24252
d9488fea 24253#: git-rebase--preserve-merges.sh:890
4c27fcb5
JX
24254#, sh-format
24255msgid "Could not checkout $switch_to"
24256msgstr "不能检出 $switch_to"
24257
d9488fea 24258#: git-rebase--preserve-merges.sh:897
4c27fcb5
JX
24259msgid "No HEAD?"
24260msgstr "没有 HEAD?"
24261
d9488fea 24262#: git-rebase--preserve-merges.sh:898
4c27fcb5
JX
24263#, sh-format
24264msgid "Could not create temporary $state_dir"
24265msgstr "不能创建临时 $state_dir"
24266
d9488fea 24267#: git-rebase--preserve-merges.sh:901
4c27fcb5
JX
24268msgid "Could not mark as interactive"
24269msgstr "不能标记为交互式"
24270
d9488fea 24271#: git-rebase--preserve-merges.sh:933
4c27fcb5
JX
24272#, sh-format
24273msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
24274msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
24275msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
24276msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
5c57d762 24277
d9488fea 24278#: git-rebase--preserve-merges.sh:945
2b472aae
JX
24279msgid "Note that empty commits are commented out"
24280msgstr "注意空提交已被注释掉"
24281
d9488fea 24282#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
fd8cb379
JX
24283msgid "Could not init rewritten commits"
24284msgstr "不能对重写提交进行初始化"
24285
5c57d762
JX
24286#: git-sh-setup.sh:89 git-sh-setup.sh:94
24287#, sh-format
24288msgid "usage: $dashless $USAGE"
24289msgstr "用法:$dashless $USAGE"
24290
d46c5519 24291#: git-sh-setup.sh:191
5c57d762
JX
24292#, sh-format
24293msgid "Cannot chdir to $cdup, the toplevel of the working tree"
9a4b694c 24294msgstr "不能切换目录到 $cdup,工作区的顶级目录"
5c57d762 24295
d46c5519 24296#: git-sh-setup.sh:200 git-sh-setup.sh:207
5c57d762
JX
24297#, sh-format
24298msgid "fatal: $program_name cannot be used without a working tree."
06991777 24299msgstr "致命错误:$program_name 不能在没有工作区的情况下使用"
5c57d762 24300
d46c5519 24301#: git-sh-setup.sh:221
5c57d762
JX
24302msgid "Cannot rebase: You have unstaged changes."
24303msgstr "不能变基:您有未暂存的变更。"
24304
d46c5519 24305#: git-sh-setup.sh:224
5c57d762
JX
24306msgid "Cannot rewrite branches: You have unstaged changes."
24307msgstr "不能重写分支:您有未暂存的变更。"
24308
d46c5519 24309#: git-sh-setup.sh:227
a0b6b246
JX
24310msgid "Cannot pull with rebase: You have unstaged changes."
24311msgstr "无法通过变基方式拉取:您有未暂存的变更。"
24312
d46c5519 24313#: git-sh-setup.sh:230
5c57d762
JX
24314#, sh-format
24315msgid "Cannot $action: You have unstaged changes."
24316msgstr "不能 $action:您有未暂存的变更。"
24317
d46c5519 24318#: git-sh-setup.sh:243
5c57d762
JX
24319msgid "Cannot rebase: Your index contains uncommitted changes."
24320msgstr "不能变基:您的索引中包含未提交的变更。"
24321
d46c5519 24322#: git-sh-setup.sh:246
a0b6b246
JX
24323msgid "Cannot pull with rebase: Your index contains uncommitted changes."
24324msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
24325
d46c5519 24326#: git-sh-setup.sh:249
5c57d762
JX
24327#, sh-format
24328msgid "Cannot $action: Your index contains uncommitted changes."
24329msgstr "不能 $action:您的索引中包含未提交的变更。"
24330
d46c5519 24331#: git-sh-setup.sh:253
a0b6b246
JX
24332msgid "Additionally, your index contains uncommitted changes."
24333msgstr "而且您的索引中包含未提交的变更。"
24334
d46c5519 24335#: git-sh-setup.sh:373
5c57d762
JX
24336msgid "You need to run this command from the toplevel of the working tree."
24337msgstr "您需要在工作区的顶级目录中运行这个命令。"
24338
d46c5519 24339#: git-sh-setup.sh:378
5c57d762
JX
24340msgid "Unable to determine absolute path of git directory"
24341msgstr "不能确定 git 目录的绝对路径"
a0b6b246 24342
1a79b2f1 24343#. TRANSLATORS: you can adjust this to align "git add -i" status menu
ddc12c42 24344#: git-add--interactive.perl:212
1a79b2f1
JX
24345#, perl-format
24346msgid "%12s %12s %s"
24347msgstr "%12s %12s %s"
24348
ddc12c42 24349#: git-add--interactive.perl:634
1a79b2f1
JX
24350#, perl-format
24351msgid "touched %d path\n"
24352msgid_plural "touched %d paths\n"
24353msgstr[0] "触碰了 %d 个路径\n"
24354msgstr[1] "触碰了 %d 个路径\n"
24355
d9488fea 24356#: git-add--interactive.perl:1058
1a79b2f1
JX
24357msgid ""
24358"If the patch applies cleanly, the edited hunk will immediately be\n"
24359"marked for staging."
24360msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
24361
d9488fea 24362#: git-add--interactive.perl:1061
1a79b2f1
JX
24363msgid ""
24364"If the patch applies cleanly, the edited hunk will immediately be\n"
24365"marked for stashing."
a4f16749 24366msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。"
1a79b2f1 24367
d9488fea 24368#: git-add--interactive.perl:1064
1a79b2f1
JX
24369msgid ""
24370"If the patch applies cleanly, the edited hunk will immediately be\n"
24371"marked for unstaging."
24372msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
24373
d9488fea
JX
24374#: git-add--interactive.perl:1067 git-add--interactive.perl:1076
24375#: git-add--interactive.perl:1082
1a79b2f1
JX
24376msgid ""
24377"If the patch applies cleanly, the edited hunk will immediately be\n"
24378"marked for applying."
24379msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
24380
d9488fea
JX
24381#: git-add--interactive.perl:1070 git-add--interactive.perl:1073
24382#: git-add--interactive.perl:1079
1a79b2f1
JX
24383msgid ""
24384"If the patch applies cleanly, the edited hunk will immediately be\n"
24385"marked for discarding."
24386msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
24387
d9488fea 24388#: git-add--interactive.perl:1116
1a79b2f1
JX
24389#, perl-format
24390msgid "failed to open hunk edit file for writing: %s"
c1ac5258 24391msgstr "为写入打开块编辑文件失败:%s"
1a79b2f1 24392
d9488fea 24393#: git-add--interactive.perl:1123
1a79b2f1
JX
24394#, perl-format
24395msgid ""
24396"---\n"
24397"To remove '%s' lines, make them ' ' lines (context).\n"
24398"To remove '%s' lines, delete them.\n"
24399"Lines starting with %s will be removed.\n"
24400msgstr ""
24401"---\n"
24402"要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
24403"要删除 '%s' 开始的行,删除它们。\n"
24404"以 %s 开始的行将被删除。\n"
24405
d9488fea 24406#: git-add--interactive.perl:1145
1a79b2f1
JX
24407#, perl-format
24408msgid "failed to open hunk edit file for reading: %s"
24409msgstr "无法读取块编辑文件:%s"
24410
d9488fea 24411#: git-add--interactive.perl:1253
1a79b2f1
JX
24412msgid ""
24413"y - stage this hunk\n"
24414"n - do not stage this hunk\n"
24415"q - quit; do not stage this hunk or any of the remaining ones\n"
24416"a - stage this hunk and all later hunks in the file\n"
24417"d - do not stage this hunk or any of the later hunks in the file"
24418msgstr ""
24419"y - 暂存该块\n"
24420"n - 不要暂存该块\n"
24421"q - 退出。不暂存该块及后面的全部块\n"
24422"a - 暂存该块和本文件中后面的全部块\n"
24423"d - 不暂存该块和本文件中后面的全部块"
24424
d9488fea 24425#: git-add--interactive.perl:1259
1a79b2f1
JX
24426msgid ""
24427"y - stash this hunk\n"
24428"n - do not stash this hunk\n"
24429"q - quit; do not stash this hunk or any of the remaining ones\n"
24430"a - stash this hunk and all later hunks in the file\n"
24431"d - do not stash this hunk or any of the later hunks in the file"
24432msgstr ""
24433"y - 贮藏该块\n"
24434"n - 不要贮藏该块\n"
24435"q - 退出。不贮藏该块及后面的全部块\n"
24436"a - 贮藏该块和本文件中后面的全部块\n"
24437"d - 不贮藏该块和本文件中后面的全部块"
24438
d9488fea 24439#: git-add--interactive.perl:1265
1a79b2f1
JX
24440msgid ""
24441"y - unstage this hunk\n"
24442"n - do not unstage this hunk\n"
24443"q - quit; do not unstage this hunk or any of the remaining ones\n"
24444"a - unstage this hunk and all later hunks in the file\n"
24445"d - do not unstage this hunk or any of the later hunks in the file"
24446msgstr ""
24447"y - 不暂存该块\n"
24448"n - 不要不暂存该块\n"
24449"q - 退出。不要不暂存该块及后面的全部块\n"
24450"a - 不暂存该块和本文件中后面的全部块\n"
24451"d - 不要不暂存该块和本文件中后面的全部块"
24452
d9488fea 24453#: git-add--interactive.perl:1271
1a79b2f1
JX
24454msgid ""
24455"y - apply this hunk to index\n"
24456"n - do not apply this hunk to index\n"
24457"q - quit; do not apply this hunk or any of the remaining ones\n"
24458"a - apply this hunk and all later hunks in the file\n"
24459"d - do not apply this hunk or any of the later hunks in the file"
24460msgstr ""
24461"y - 在索引中应用该块\n"
24462"n - 不要在索引中应用该块\n"
24463"q - 退出。不要应用该块及后面的全部块\n"
24464"a - 应用该块和本文件中后面的全部块\n"
24465"d - 不要应用该块和本文件中后面的全部块"
24466
d9488fea 24467#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
1a79b2f1
JX
24468msgid ""
24469"y - discard this hunk from worktree\n"
24470"n - do not discard this hunk from worktree\n"
24471"q - quit; do not discard this hunk or any of the remaining ones\n"
24472"a - discard this hunk and all later hunks in the file\n"
24473"d - do not discard this hunk or any of the later hunks in the file"
24474msgstr ""
24475"y - 在工作区中丢弃该块\n"
24476"n - 不要在工作区中丢弃该块\n"
24477"q - 退出。不要丢弃该块及后面的全部块\n"
24478"a - 丢弃该块和本文件中后面的全部块\n"
24479"d - 不要丢弃该块和本文件中后面的全部块"
24480
d9488fea 24481#: git-add--interactive.perl:1283
1a79b2f1
JX
24482msgid ""
24483"y - discard this hunk from index and worktree\n"
24484"n - do not discard this hunk from index and worktree\n"
24485"q - quit; do not discard this hunk or any of the remaining ones\n"
24486"a - discard this hunk and all later hunks in the file\n"
24487"d - do not discard this hunk or any of the later hunks in the file"
24488msgstr ""
24489"y - 在索引和工作区中丢弃该块\n"
24490"n - 不要在索引和工作区中丢弃该块\n"
24491"q - 退出。不要丢弃该块及后面的全部块\n"
24492"a - 丢弃该块和本文件中后面的全部块\n"
24493"d - 不要丢弃该块和本文件中后面的全部块"
24494
d9488fea 24495#: git-add--interactive.perl:1289
1a79b2f1
JX
24496msgid ""
24497"y - apply this hunk to index and worktree\n"
24498"n - do not apply this hunk to index and worktree\n"
24499"q - quit; do not apply this hunk or any of the remaining ones\n"
24500"a - apply this hunk and all later hunks in the file\n"
24501"d - do not apply this hunk or any of the later hunks in the file"
24502msgstr ""
24503"y - 在索引和工作区中应用该块\n"
24504"n - 不要在索引和工作区中应用该块\n"
24505"q - 退出。不要应用该块及后面的全部块\n"
24506"a - 应用该块和本文件中后面的全部块\n"
24507"d - 不要应用该块和本文件中后面的全部块"
24508
d9488fea 24509#: git-add--interactive.perl:1301
a6cd2cc4
JX
24510msgid ""
24511"y - apply this hunk to worktree\n"
24512"n - do not apply this hunk to worktree\n"
24513"q - quit; do not apply this hunk or any of the remaining ones\n"
24514"a - apply this hunk and all later hunks in the file\n"
24515"d - do not apply this hunk or any of the later hunks in the file"
24516msgstr ""
24517"y - 在工作区中应用该块\n"
24518"n - 不要在工作区中应用该块\n"
24519"q - 退出。不要应用该块及后面的全部块\n"
24520"a - 应用该块和本文件中后面的全部块\n"
24521"d - 不要应用该块和本文件中后面的全部块"
24522
d9488fea 24523#: git-add--interactive.perl:1316
1a79b2f1
JX
24524msgid ""
24525"g - select a hunk to go to\n"
24526"/ - search for a hunk matching the given regex\n"
24527"j - leave this hunk undecided, see next undecided hunk\n"
24528"J - leave this hunk undecided, see next hunk\n"
24529"k - leave this hunk undecided, see previous undecided hunk\n"
24530"K - leave this hunk undecided, see previous hunk\n"
24531"s - split the current hunk into smaller hunks\n"
24532"e - manually edit the current hunk\n"
24533"? - print help\n"
24534msgstr ""
24535"g - 选择跳转到一个块\n"
24536"/ - 查找和给定正则表达式匹配的块\n"
24537"j - 维持该块未决状态,查看下一个未决块\n"
24538"J - 维持该块未决状态,查看下一个块\n"
24539"k - 维持该块未决状态,查看上一个未决块\n"
24540"K - 维持该块未决状态,查看上一个块\n"
24541"s - 拆分当前块为更小的块\n"
24542"e - 手动编辑当前块\n"
24543"? - 显示帮助\n"
24544
d9488fea 24545#: git-add--interactive.perl:1347
1a79b2f1
JX
24546msgid "The selected hunks do not apply to the index!\n"
24547msgstr "选中的块不能应用到索引!\n"
24548
d9488fea 24549#: git-add--interactive.perl:1362
1a79b2f1
JX
24550#, perl-format
24551msgid "ignoring unmerged: %s\n"
24552msgstr "忽略未合入的:%s\n"
24553
d9488fea 24554#: git-add--interactive.perl:1481
a6cd2cc4
JX
24555#, perl-format
24556msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
24557msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
24558
d9488fea 24559#: git-add--interactive.perl:1482
a6cd2cc4
JX
24560#, perl-format
24561msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
24562msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
24563
d9488fea 24564#: git-add--interactive.perl:1483
7157c2b5
JX
24565#, perl-format
24566msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
24567msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? "
24568
d9488fea 24569#: git-add--interactive.perl:1484
a6cd2cc4
JX
24570#, perl-format
24571msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
24572msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
24573
d9488fea 24574#: git-add--interactive.perl:1601
31e5e17b
JX
24575msgid "No other hunks to goto\n"
24576msgstr "没有其它可供跳转的块\n"
1a79b2f1 24577
d9488fea 24578#: git-add--interactive.perl:1619
1a79b2f1
JX
24579#, perl-format
24580msgid "Invalid number: '%s'\n"
24581msgstr "无效数字:'%s'\n"
24582
d9488fea 24583#: git-add--interactive.perl:1624
1a79b2f1
JX
24584#, perl-format
24585msgid "Sorry, only %d hunk available.\n"
24586msgid_plural "Sorry, only %d hunks available.\n"
24587msgstr[0] "对不起,只有 %d 个可用块。\n"
24588msgstr[1] "对不起,只有 %d 个可用块。\n"
24589
d9488fea 24590#: git-add--interactive.perl:1659
31e5e17b
JX
24591msgid "No other hunks to search\n"
24592msgstr "没有其它可供查找的块\n"
24593
d9488fea 24594#: git-add--interactive.perl:1676
1a79b2f1
JX
24595#, perl-format
24596msgid "Malformed search regexp %s: %s\n"
24597msgstr "错误的正则表达式 %s:%s\n"
24598
d9488fea 24599#: git-add--interactive.perl:1686
1a79b2f1 24600msgid "No hunk matches the given pattern\n"
ddc12c42 24601msgstr "没有和给定模式相匹配的块\n"
1a79b2f1 24602
d9488fea 24603#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
1a79b2f1
JX
24604msgid "No previous hunk\n"
24605msgstr "没有前一个块\n"
24606
d9488fea 24607#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
1a79b2f1
JX
24608msgid "No next hunk\n"
24609msgstr "没有下一个块\n"
24610
d9488fea 24611#: git-add--interactive.perl:1732
31e5e17b
JX
24612msgid "Sorry, cannot split this hunk\n"
24613msgstr "对不起,不能拆分这个块\n"
24614
d9488fea 24615#: git-add--interactive.perl:1738
1a79b2f1
JX
24616#, perl-format
24617msgid "Split into %d hunk.\n"
24618msgid_plural "Split into %d hunks.\n"
24619msgstr[0] "拆分为 %d 块。\n"
24620msgstr[1] "拆分为 %d 块。\n"
24621
d9488fea 24622#: git-add--interactive.perl:1748
31e5e17b
JX
24623msgid "Sorry, cannot edit this hunk\n"
24624msgstr "对不起,不能编辑这个块\n"
24625
1a79b2f1
JX
24626#. TRANSLATORS: please do not translate the command names
24627#. 'status', 'update', 'revert', etc.
d9488fea 24628#: git-add--interactive.perl:1813
1a79b2f1
JX
24629msgid ""
24630"status - show paths with changes\n"
24631"update - add working tree state to the staged set of changes\n"
24632"revert - revert staged set of changes back to the HEAD version\n"
24633"patch - pick hunks and update selectively\n"
87cb7997 24634"diff - view diff between HEAD and index\n"
1a79b2f1
JX
24635"add untracked - add contents of untracked files to the staged set of "
24636"changes\n"
24637msgstr ""
24638"status - 显示含变更的路径\n"
24639"update - 添加工作区状态至暂存列表\n"
24640"revert - 还原修改的暂存集至 HEAD 版本\n"
24641"patch - 挑选块并且有选择地更新\n"
24642"diff - 显示 HEAD 和索引间差异\n"
24643"add untracked - 添加未跟踪文件的内容至暂存列表\n"
24644
d9488fea
JX
24645#: git-add--interactive.perl:1830 git-add--interactive.perl:1835
24646#: git-add--interactive.perl:1838 git-add--interactive.perl:1845
24647#: git-add--interactive.perl:1848 git-add--interactive.perl:1855
24648#: git-add--interactive.perl:1859 git-add--interactive.perl:1865
1a79b2f1
JX
24649msgid "missing --"
24650msgstr "缺失 --"
24651
d9488fea 24652#: git-add--interactive.perl:1861
1a79b2f1
JX
24653#, perl-format
24654msgid "unknown --patch mode: %s"
24655msgstr "未知的 --patch 模式:%s"
24656
d9488fea 24657#: git-add--interactive.perl:1867 git-add--interactive.perl:1873
1a79b2f1
JX
24658#, perl-format
24659msgid "invalid argument %s, expecting --"
24660msgstr "无效的参数 %s,期望是 --"
24661
4c27fcb5 24662#: git-send-email.perl:138
1a79b2f1
JX
24663msgid "local zone differs from GMT by a non-minute interval\n"
24664msgstr "本地时间和 GMT 有不到一分钟间隔\n"
24665
4c27fcb5 24666#: git-send-email.perl:145 git-send-email.perl:151
1a79b2f1
JX
24667msgid "local time offset greater than or equal to 24 hours\n"
24668msgstr "本地时间偏移量大于等于 24 小时\n"
24669
a6cd2cc4 24670#: git-send-email.perl:223 git-send-email.perl:229
1a79b2f1
JX
24671msgid "the editor exited uncleanly, aborting everything"
24672msgstr "编辑器非正常退出,终止所有操作"
24673
d9488fea 24674#: git-send-email.perl:312
1a79b2f1
JX
24675#, perl-format
24676msgid ""
24677"'%s' contains an intermediate version of the email you were composing.\n"
24678msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
24679
d9488fea 24680#: git-send-email.perl:317
1a79b2f1
JX
24681#, perl-format
24682msgid "'%s.final' contains the composed email.\n"
24683msgstr "'%s.final' 包含编辑的邮件。\n"
24684
d9488fea 24685#: git-send-email.perl:410
1a79b2f1
JX
24686msgid "--dump-aliases incompatible with other options\n"
24687msgstr "--dump-aliases 和其它选项不兼容\n"
24688
d9488fea
JX
24689#: git-send-email.perl:484
24690msgid ""
24691"fatal: found configuration options for 'sendmail'\n"
24692"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
24693"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
24694msgstr ""
24695"致命错误:发现 'sendmail' 配置选项\n"
24696"git-send-email 通过 sendemail.* 选项进行设置,注意字母 'e'。\n"
24697"设置 sendemail.forbidSendmailVariables 为 false 来禁用这项检查。\n"
24698
24699#: git-send-email.perl:489 git-send-email.perl:691
1a79b2f1
JX
24700msgid "Cannot run git format-patch from outside a repository\n"
24701msgstr "不能在仓库之外运行 git format-patch\n"
24702
d9488fea 24703#: git-send-email.perl:492
31e5e17b
JX
24704msgid ""
24705"`batch-size` and `relogin` must be specified together (via command-line or "
24706"configuration option)\n"
24707msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n"
24708
d9488fea 24709#: git-send-email.perl:505
1a79b2f1
JX
24710#, perl-format
24711msgid "Unknown --suppress-cc field: '%s'\n"
24712msgstr "未知的 --suppress-cc 字段:'%s'\n"
24713
d9488fea 24714#: git-send-email.perl:536
1a79b2f1
JX
24715#, perl-format
24716msgid "Unknown --confirm setting: '%s'\n"
24717msgstr "未知的 --confirm 设置:'%s'\n"
24718
d9488fea 24719#: git-send-email.perl:564
1a79b2f1
JX
24720#, perl-format
24721msgid "warning: sendmail alias with quotes is not supported: %s\n"
24722msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
24723
d9488fea 24724#: git-send-email.perl:566
1a79b2f1
JX
24725#, perl-format
24726msgid "warning: `:include:` not supported: %s\n"
24727msgstr "警告:不支持 `:include:`:%s\n"
24728
d9488fea 24729#: git-send-email.perl:568
1a79b2f1
JX
24730#, perl-format
24731msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
24732msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
24733
d9488fea 24734#: git-send-email.perl:573
1a79b2f1
JX
24735#, perl-format
24736msgid "warning: sendmail line is not recognized: %s\n"
24737msgstr "警告:不能识别的 sendmail 行:%s\n"
24738
d9488fea 24739#: git-send-email.perl:657
1a79b2f1
JX
24740#, perl-format
24741msgid ""
24742"File '%s' exists but it could also be the range of commits\n"
24743"to produce patches for. Please disambiguate by...\n"
24744"\n"
24745" * Saying \"./%s\" if you mean a file; or\n"
24746" * Giving --format-patch option if you mean a range.\n"
24747msgstr ""
87cb7997
JX
24748"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
24749"歧义:\n"
1a79b2f1
JX
24750"\n"
24751" * 如果含义为一个文件,使用 \"./%s\",或者\n"
24752" * 如果含义为一个范围,使用 --format-patch 选项。\n"
24753
d9488fea 24754#: git-send-email.perl:678
1a79b2f1
JX
24755#, perl-format
24756msgid "Failed to opendir %s: %s"
24757msgstr "无法打开目录 %s: %s"
24758
d9488fea 24759#: git-send-email.perl:702
1a79b2f1
JX
24760#, perl-format
24761msgid ""
24762"fatal: %s: %s\n"
24763"warning: no patches were sent\n"
24764msgstr ""
06991777 24765"致命错误:%s:%s\n"
1a79b2f1
JX
24766"警告:补丁未能发送\n"
24767
d9488fea 24768#: git-send-email.perl:713
1a79b2f1
JX
24769msgid ""
24770"\n"
24771"No patch files specified!\n"
24772"\n"
87cb7997
JX
24773msgstr ""
24774"\n"
24775"未指定补丁文件!\n"
24776"\n"
1a79b2f1 24777
d9488fea 24778#: git-send-email.perl:726
1a79b2f1
JX
24779#, perl-format
24780msgid "No subject line in %s?"
24781msgstr "在 %s 中没有标题行?"
24782
d9488fea 24783#: git-send-email.perl:736
1a79b2f1
JX
24784#, perl-format
24785msgid "Failed to open for writing %s: %s"
c1ac5258 24786msgstr "为写入打开 %s 失败: %s"
1a79b2f1 24787
d9488fea 24788#: git-send-email.perl:747
1a79b2f1
JX
24789msgid ""
24790"Lines beginning in \"GIT:\" will be removed.\n"
24791"Consider including an overall diffstat or table of contents\n"
24792"for the patch you are writing.\n"
24793"\n"
24794"Clear the body content if you don't wish to send a summary.\n"
24795msgstr ""
24796"以 \"GIT:\" 开头的行将被删除。\n"
5b533632 24797"考虑包含一个整体的差异统计或者您正在写的补丁的目录。\n"
1a79b2f1
JX
24798"\n"
24799"如果您不想发送摘要,清除内容。\n"
24800
d9488fea 24801#: git-send-email.perl:771
1a79b2f1
JX
24802#, perl-format
24803msgid "Failed to open %s: %s"
24804msgstr "无法打开 %s: %s"
24805
d9488fea 24806#: git-send-email.perl:788
31e5e17b
JX
24807#, perl-format
24808msgid "Failed to open %s.final: %s"
24809msgstr "无法打开 %s.final: %s"
1a79b2f1 24810
d9488fea 24811#: git-send-email.perl:831
1a79b2f1
JX
24812msgid "Summary email is empty, skipping it\n"
24813msgstr "摘要邮件为空,跳过\n"
24814
24815#. TRANSLATORS: please keep [y/N] as is.
d9488fea 24816#: git-send-email.perl:866
1a79b2f1
JX
24817#, perl-format
24818msgid "Are you sure you want to use <%s> [y/N]? "
24819msgstr "您确认要使用 <%s> [y/N]?"
24820
d9488fea 24821#: git-send-email.perl:921
1a79b2f1
JX
24822msgid ""
24823"The following files are 8bit, but do not declare a Content-Transfer-"
24824"Encoding.\n"
24825msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
24826
d9488fea 24827#: git-send-email.perl:926
1a79b2f1
JX
24828msgid "Which 8bit encoding should I declare [UTF-8]? "
24829msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?"
24830
d9488fea 24831#: git-send-email.perl:934
1a79b2f1
JX
24832#, perl-format
24833msgid ""
24834"Refusing to send because the patch\n"
24835"\t%s\n"
24836"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
24837"want to send.\n"
24838msgstr ""
24839"拒绝发送,因为补丁\n"
24840"\t%s\n"
24841"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
24842
d9488fea 24843#: git-send-email.perl:953
1a79b2f1
JX
24844msgid "To whom should the emails be sent (if anyone)?"
24845msgstr "邮件将要发送给谁?"
24846
d9488fea 24847#: git-send-email.perl:971
1a79b2f1
JX
24848#, perl-format
24849msgid "fatal: alias '%s' expands to itself\n"
06991777 24850msgstr "致命错误:别名 '%s' 扩展为它自己\n"
1a79b2f1 24851
d9488fea 24852#: git-send-email.perl:983
1a79b2f1
JX
24853msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
24854msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?"
24855
d9488fea 24856#: git-send-email.perl:1041 git-send-email.perl:1049
1a79b2f1
JX
24857#, perl-format
24858msgid "error: unable to extract a valid address from: %s\n"
24859msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
24860
24861#. TRANSLATORS: Make sure to include [q] [d] [e] in your
24862#. translation. The program will only accept English input
24863#. at this point.
d9488fea 24864#: git-send-email.perl:1053
1a79b2f1
JX
24865msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
24866msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):"
24867
d9488fea 24868#: git-send-email.perl:1370
1a79b2f1
JX
24869#, perl-format
24870msgid "CA path \"%s\" does not exist"
24871msgstr "CA 路径 \"%s\" 不存在"
24872
d9488fea 24873#: git-send-email.perl:1453
1a79b2f1
JX
24874msgid ""
24875" The Cc list above has been expanded by additional\n"
24876" addresses found in the patch commit message. By default\n"
24877" send-email prompts before sending whenever this occurs.\n"
24878" This behavior is controlled by the sendemail.confirm\n"
24879" configuration setting.\n"
24880"\n"
24881" For additional information, run 'git send-email --help'.\n"
24882" To retain the current behavior, but squelch this message,\n"
24883" run 'git config --global sendemail.confirm auto'.\n"
24884"\n"
24885msgstr ""
24886" 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n"
24887" 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
24888" sendemail.confirm 配置设置。\n"
24889"\n"
24890" 更多信息,执行 'git send-email --help'。\n"
24891" 要保持当前行为,但不显示此信息,运行 'git config --global\n"
24892" sendemail.confirm auto'。\n"
24893"\n"
24894
fd8cb379 24895#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
1a79b2f1
JX
24896#. translation. The program will only accept English input
24897#. at this point.
d9488fea 24898#: git-send-email.perl:1468
fd8cb379
JX
24899msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
24900msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
1a79b2f1 24901
d9488fea 24902#: git-send-email.perl:1471
1a79b2f1
JX
24903msgid "Send this email reply required"
24904msgstr "发送要求的邮件回复"
24905
d9488fea 24906#: git-send-email.perl:1499
1a79b2f1
JX
24907msgid "The required SMTP server is not properly defined."
24908msgstr "要求的 SMTP 服务器未被正确定义。"
24909
d9488fea 24910#: git-send-email.perl:1546
1a79b2f1
JX
24911#, perl-format
24912msgid "Server does not support STARTTLS! %s"
24913msgstr "服务器不支持 STARTTLS!%s"
24914
d9488fea 24915#: git-send-email.perl:1551 git-send-email.perl:1555
a4f16749
JX
24916#, perl-format
24917msgid "STARTTLS failed! %s"
24918msgstr "STARTTLS 失败!%s"
24919
d9488fea 24920#: git-send-email.perl:1564
1a79b2f1
JX
24921msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
24922msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
24923
d9488fea 24924#: git-send-email.perl:1582
1a79b2f1
JX
24925#, perl-format
24926msgid "Failed to send %s\n"
24927msgstr "无法发送 %s\n"
24928
d9488fea 24929#: git-send-email.perl:1585
1a79b2f1
JX
24930#, perl-format
24931msgid "Dry-Sent %s\n"
24932msgstr "演习发送 %s\n"
24933
d9488fea 24934#: git-send-email.perl:1585
1a79b2f1
JX
24935#, perl-format
24936msgid "Sent %s\n"
24937msgstr "正发送 %s\n"
24938
d9488fea 24939#: git-send-email.perl:1587
1a79b2f1
JX
24940msgid "Dry-OK. Log says:\n"
24941msgstr "演习成功。日志说:\n"
24942
d9488fea 24943#: git-send-email.perl:1587
1a79b2f1
JX
24944msgid "OK. Log says:\n"
24945msgstr "OK。日志说:\n"
24946
d9488fea 24947#: git-send-email.perl:1599
1a79b2f1
JX
24948msgid "Result: "
24949msgstr "结果:"
24950
d9488fea 24951#: git-send-email.perl:1602
1a79b2f1
JX
24952msgid "Result: OK\n"
24953msgstr "结果:OK\n"
24954
d9488fea 24955#: git-send-email.perl:1620
1a79b2f1
JX
24956#, perl-format
24957msgid "can't open file %s"
24958msgstr "无法打开文件 %s"
24959
d9488fea 24960#: git-send-email.perl:1667 git-send-email.perl:1687
1a79b2f1
JX
24961#, perl-format
24962msgid "(mbox) Adding cc: %s from line '%s'\n"
24963msgstr "(mbox) 添加 cc:%s 自行 '%s'\n"
24964
d9488fea 24965#: git-send-email.perl:1673
1a79b2f1
JX
24966#, perl-format
24967msgid "(mbox) Adding to: %s from line '%s'\n"
24968msgstr "(mbox) 添加 to:%s 自行 '%s'\n"
24969
d9488fea 24970#: git-send-email.perl:1730
1a79b2f1
JX
24971#, perl-format
24972msgid "(non-mbox) Adding cc: %s from line '%s'\n"
24973msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n"
24974
d9488fea 24975#: git-send-email.perl:1765
1a79b2f1
JX
24976#, perl-format
24977msgid "(body) Adding cc: %s from line '%s'\n"
24978msgstr "(body) 添加 cc: %s 自行 '%s'\n"
24979
d9488fea 24980#: git-send-email.perl:1876
1a79b2f1
JX
24981#, perl-format
24982msgid "(%s) Could not execute '%s'"
24983msgstr "(%s) 不能执行 '%s'"
24984
d9488fea 24985#: git-send-email.perl:1883
1a79b2f1
JX
24986#, perl-format
24987msgid "(%s) Adding %s: %s from: '%s'\n"
24988msgstr "(%s) 添加 %s: %s 自:'%s'\n"
24989
d9488fea 24990#: git-send-email.perl:1887
1a79b2f1
JX
24991#, perl-format
24992msgid "(%s) failed to close pipe to '%s'"
24993msgstr "(%s) 无法关闭管道至 '%s'"
24994
d9488fea 24995#: git-send-email.perl:1917
1a79b2f1
JX
24996msgid "cannot send message as 7bit"
24997msgstr "不能以 7bit 形式发送信息"
24998
d9488fea 24999#: git-send-email.perl:1925
1a79b2f1
JX
25000msgid "invalid transfer encoding"
25001msgstr "无效的传送编码"
25002
d9488fea 25003#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028
1a79b2f1
JX
25004#, perl-format
25005msgid "unable to open %s: %s\n"
25006msgstr "不能打开 %s:%s\n"
25007
d9488fea 25008#: git-send-email.perl:1969
1a79b2f1
JX
25009#, perl-format
25010msgid "%s: patch contains a line longer than 998 characters"
25011msgstr "%s:补丁包含一个超过 998 字符的行"
25012
d9488fea 25013#: git-send-email.perl:1986
1a79b2f1
JX
25014#, perl-format
25015msgid "Skipping %s with backup suffix '%s'.\n"
25016msgstr "略过 %s 含备份后缀 '%s'。\n"
25017
25018#. TRANSLATORS: please keep "[y|N]" as is.
d9488fea 25019#: git-send-email.perl:1990
1a79b2f1
JX
25020#, perl-format
25021msgid "Do you really want to send %s? [y|N]: "
25022msgstr "您真的要发送 %s?[y|N]:"