]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
l10n: sv.po: Update Swedish translation (5211t0f0)
[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 | 珍品仓库
473eb541 95# promisor | 承诺者
160fb2b2
JX
96# prune | 清除
97# pull | 拉,拉取
98# push | 推,推送
99# reachable | 可达
100# rebase | 变基
101# ref | 引用
102# reflog | 引用日志
103# refspec | 引用规格
104# remote | 远程,远程仓库
105# remote-tracking branch | 远程跟踪分支
106# replay | 重放
107# repo | 仓库
108# repository | 仓库
109# resolve | (冲突)解决
110# revert | 还原
111# revision | 版本
112# rewind | 回退
113# SCM | 源代码管理(工具)
ee7589bb 114# SHA-1 | SHA-1(安全哈希算法1)
160fb2b2
JX
115# shallow repository | 浅(克隆)仓库
116# signed tag | 签名标签
755c831b 117# smart HTTP protocol | 智能 HTTP 协议
33b62fba 118# squash | 挤压
160fb2b2 119# stage | n. 暂存区(即索引); v. 暂存
a4f16749 120# stash | n. 贮藏区; v. 贮藏
160fb2b2
JX
121# submodule | 子模组
122# symref | 符号引用
933c015e 123# tag | n. 标签; v. 打标签
160fb2b2
JX
124# tag object | 标签对象
125# tagger | 打标签者
126# topic branch | 主题分支
127# track | 跟踪
d13389bf 128# trailer | 尾注
160fb2b2
JX
129# tree | 树(工作区或树对象)
130# tree object | 树对象
131# tree-ish (also treeish) | 树对象(或可以解析为一树对象)
132# unmerged index | 未合并索引
133# unpack | 解包
134# unreachable object | 不可达对象
135# unstage | 取消暂存
136# upstream | 上游
137# upstream branch | 上游分支
138# working tree | 工作区
7e6630a7 139# Fangyi Zhou <me@fangyi.io>, 2021.
160fb2b2 140#
c04f5ac3
JX
141msgid ""
142msgstr ""
143"Project-Id-Version: Git\n"
144"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
ffa14514
FZ
145"POT-Creation-Date: 2021-11-10 08:55+0800\n"
146"PO-Revision-Date: 2021-11-10 12:16+0000\n"
7e6630a7 147"Last-Translator: Fangyi Zhou <me@fangyi.io>\n"
7aea43ff 148"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
c04f5ac3
JX
149"Language: zh_CN\n"
150"MIME-Version: 1.0\n"
151"Content-Type: text/plain; charset=UTF-8\n"
152"Content-Transfer-Encoding: 8bit\n"
5ae481e0 153"Plural-Forms: nplurals=2; plural=(n != 1);\n"
7e6630a7 154"X-Generator: Gtranslator 41.0\n"
c04f5ac3 155
7e6630a7 156#: add-interactive.c:380
ddc12c42
JX
157#, c-format
158msgid "Huh (%s)?"
159msgstr "嗯(%s)?"
160
84bf71ea
FZ
161#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
162#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
7e6630a7 163#: builtin/rebase.c:1642
ddc12c42
JX
164msgid "could not read index"
165msgstr "不能读取索引"
166
7e6630a7 167#: add-interactive.c:588 git-add--interactive.perl:269
ddc12c42
JX
168#: git-add--interactive.perl:294
169msgid "binary"
170msgstr "二进制"
171
7e6630a7 172#: add-interactive.c:646 git-add--interactive.perl:278
ddc12c42
JX
173#: git-add--interactive.perl:332
174msgid "nothing"
175msgstr "无"
176
7e6630a7 177#: add-interactive.c:647 git-add--interactive.perl:314
ddc12c42
JX
178#: git-add--interactive.perl:329
179msgid "unchanged"
180msgstr "没有修改"
181
7e6630a7 182#: add-interactive.c:684 git-add--interactive.perl:641
ddc12c42
JX
183msgid "Update"
184msgstr "更新"
185
7e6630a7 186#: add-interactive.c:701 add-interactive.c:889
ddc12c42
JX
187#, c-format
188msgid "could not stage '%s'"
189msgstr "不能暂存 '%s'"
190
84bf71ea 191#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
ddc12c42
JX
192msgid "could not write index"
193msgstr "不能写入索引"
194
7e6630a7 195#: add-interactive.c:710 git-add--interactive.perl:626
ddc12c42
JX
196#, c-format, perl-format
197msgid "updated %d path\n"
198msgid_plural "updated %d paths\n"
199msgstr[0] "更新了 %d 个路径\n"
200msgstr[1] "更新了 %d 个路径\n"
201
7e6630a7 202#: add-interactive.c:728 git-add--interactive.perl:676
ddc12c42
JX
203#, c-format, perl-format
204msgid "note: %s is untracked now.\n"
205msgstr "说明:%s 现已成为未跟踪的。\n"
206
7e6630a7
FZ
207#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
208#: builtin/reset.c:151
ddc12c42
JX
209#, c-format
210msgid "make_cache_entry failed for path '%s'"
211msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
212
7e6630a7 213#: add-interactive.c:763 git-add--interactive.perl:653
ddc12c42
JX
214msgid "Revert"
215msgstr "还原"
216
7e6630a7 217#: add-interactive.c:779
ddc12c42
JX
218msgid "Could not parse HEAD^{tree}"
219msgstr "不能解析 HEAD^{tree}"
220
7e6630a7 221#: add-interactive.c:817 git-add--interactive.perl:629
ddc12c42
JX
222#, c-format, perl-format
223msgid "reverted %d path\n"
224msgid_plural "reverted %d paths\n"
225msgstr[0] "还原了 %d 个路径\n"
226msgstr[1] "还原了 %d 个路径\n"
227
7e6630a7 228#: add-interactive.c:868 git-add--interactive.perl:693
ddc12c42
JX
229#, c-format
230msgid "No untracked files.\n"
231msgstr "没有未跟踪的文件。\n"
232
7e6630a7 233#: add-interactive.c:872 git-add--interactive.perl:687
ddc12c42
JX
234msgid "Add untracked"
235msgstr "添加未跟踪的"
236
7e6630a7 237#: add-interactive.c:899 git-add--interactive.perl:623
ddc12c42
JX
238#, c-format, perl-format
239msgid "added %d path\n"
240msgid_plural "added %d paths\n"
241msgstr[0] "增加了 %d 个路径\n"
242msgstr[1] "增加了 %d 个路径\n"
243
7e6630a7 244#: add-interactive.c:929
ddc12c42
JX
245#, c-format
246msgid "ignoring unmerged: %s"
247msgstr "忽略未合入的:%s"
248
7e6630a7 249#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
ddc12c42
JX
250#, c-format
251msgid "Only binary files changed.\n"
252msgstr "只有二进制文件被修改。\n"
253
7e6630a7 254#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
ddc12c42
JX
255#, c-format
256msgid "No changes.\n"
257msgstr "没有修改。\n"
258
7e6630a7 259#: add-interactive.c:947 git-add--interactive.perl:1379
ddc12c42
JX
260msgid "Patch update"
261msgstr "补丁更新"
262
7e6630a7 263#: add-interactive.c:986 git-add--interactive.perl:1792
ddc12c42
JX
264msgid "Review diff"
265msgstr "检视 diff"
266
7e6630a7 267#: add-interactive.c:1014
ddc12c42
JX
268msgid "show paths with changes"
269msgstr "显示含变更的路径"
270
7e6630a7 271#: add-interactive.c:1016
ddc12c42
JX
272msgid "add working tree state to the staged set of changes"
273msgstr "将工作区状态添加到暂存区修改集中"
274
7e6630a7 275#: add-interactive.c:1018
ddc12c42
JX
276msgid "revert staged set of changes back to the HEAD version"
277msgstr "将暂存的修改集恢复为 HEAD 版本"
278
7e6630a7 279#: add-interactive.c:1020
ddc12c42
JX
280msgid "pick hunks and update selectively"
281msgstr "挑选数据块并有选择地更新"
282
7e6630a7 283#: add-interactive.c:1022
ddc12c42
JX
284msgid "view diff between HEAD and index"
285msgstr "显示 HEAD 和索引的差异"
286
7e6630a7 287#: add-interactive.c:1024
ddc12c42
JX
288msgid "add contents of untracked files to the staged set of changes"
289msgstr "将未跟踪文件的内容添加到暂存区修改集中"
290
7e6630a7 291#: add-interactive.c:1032 add-interactive.c:1081
ddc12c42
JX
292msgid "Prompt help:"
293msgstr "帮助:"
294
7e6630a7 295#: add-interactive.c:1034
ddc12c42
JX
296msgid "select a single item"
297msgstr "选择一个条目"
298
7e6630a7 299#: add-interactive.c:1036
ddc12c42
JX
300msgid "select a range of items"
301msgstr "选择一系列条目"
302
7e6630a7 303#: add-interactive.c:1038
ddc12c42
JX
304msgid "select multiple ranges"
305msgstr "选择多个范围"
306
7e6630a7 307#: add-interactive.c:1040 add-interactive.c:1085
ddc12c42
JX
308msgid "select item based on unique prefix"
309msgstr "基于唯一前缀选择条目"
310
7e6630a7 311#: add-interactive.c:1042
ddc12c42
JX
312msgid "unselect specified items"
313msgstr "反选指定的条目"
314
7e6630a7 315#: add-interactive.c:1044
ddc12c42
JX
316msgid "choose all items"
317msgstr "选择所有条目"
318
7e6630a7 319#: add-interactive.c:1046
ddc12c42
JX
320msgid "(empty) finish selecting"
321msgstr "(空)结束选择"
322
7e6630a7 323#: add-interactive.c:1083
ddc12c42
JX
324msgid "select a numbered item"
325msgstr "选择一个编号条目"
326
7e6630a7 327#: add-interactive.c:1087
ddc12c42
JX
328msgid "(empty) select nothing"
329msgstr "(空)不选择任何内容"
330
7e6630a7 331#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
ddc12c42
JX
332msgid "*** Commands ***"
333msgstr "*** 命令 ***"
334
7e6630a7 335#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
ddc12c42
JX
336msgid "What now"
337msgstr "请选择"
338
7e6630a7 339#: add-interactive.c:1148 git-add--interactive.perl:213
ddc12c42
JX
340msgid "staged"
341msgstr "缓存"
342
7e6630a7 343#: add-interactive.c:1148 git-add--interactive.perl:213
ddc12c42
JX
344msgid "unstaged"
345msgstr "未缓存"
346
7e6630a7
FZ
347#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
348#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
ffa14514 349#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
7e6630a7
FZ
350#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
351#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
352#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
353#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
349ede6a 354#: git-add--interactive.perl:213
ddc12c42
JX
355msgid "path"
356msgstr "路径"
357
7e6630a7 358#: add-interactive.c:1155
ddc12c42
JX
359msgid "could not refresh index"
360msgstr "不能刷新索引"
361
7e6630a7 362#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
ddc12c42
JX
363#, c-format
364msgid "Bye.\n"
365msgstr "再见。\n"
366
d13389bf 367#: add-patch.c:34 git-add--interactive.perl:1431
2b472aae
JX
368#, c-format, perl-format
369msgid "Stage mode change [y,n,q,a,d%s,?]? "
370msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
ddc12c42 371
d13389bf 372#: add-patch.c:35 git-add--interactive.perl:1432
2b472aae
JX
373#, c-format, perl-format
374msgid "Stage deletion [y,n,q,a,d%s,?]? "
375msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
ddc12c42 376
d13389bf 377#: add-patch.c:36 git-add--interactive.perl:1433
7157c2b5
JX
378#, c-format, perl-format
379msgid "Stage addition [y,n,q,a,d%s,?]? "
380msgstr "暂存添加动作 [y,n,q,a,d%s,?]? "
381
d13389bf 382#: add-patch.c:37 git-add--interactive.perl:1434
2b472aae
JX
383#, c-format, perl-format
384msgid "Stage this hunk [y,n,q,a,d%s,?]? "
385msgstr "暂存该块 [y,n,q,a,d%s,?]? "
386
7157c2b5 387#: add-patch.c:39
2b472aae
JX
388msgid ""
389"If the patch applies cleanly, the edited hunk will immediately be marked for "
390"staging."
391msgstr "如果补丁能正确地应用,编辑块将立即标记为暂存。"
392
7157c2b5 393#: add-patch.c:42
2b472aae
JX
394msgid ""
395"y - stage this hunk\n"
396"n - do not stage this hunk\n"
397"q - quit; do not stage this hunk or any of the remaining ones\n"
398"a - stage this hunk and all later hunks in the file\n"
399"d - do not stage this hunk or any of the later hunks in the file\n"
400msgstr ""
401"y - 暂存该块\n"
402"n - 不要暂存该块\n"
403"q - 退出。不暂存该块及后面的全部块\n"
404"a - 暂存该块和本文件中后面的全部块\n"
405"d - 不暂存该块和本文件中后面的全部块\n"
406
d13389bf 407#: add-patch.c:56 git-add--interactive.perl:1437
2b472aae
JX
408#, c-format, perl-format
409msgid "Stash mode change [y,n,q,a,d%s,?]? "
410msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
411
d13389bf 412#: add-patch.c:57 git-add--interactive.perl:1438
2b472aae
JX
413#, c-format, perl-format
414msgid "Stash deletion [y,n,q,a,d%s,?]? "
415msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
416
d13389bf 417#: add-patch.c:58 git-add--interactive.perl:1439
7157c2b5
JX
418#, c-format, perl-format
419msgid "Stash addition [y,n,q,a,d%s,?]? "
420msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? "
421
d13389bf 422#: add-patch.c:59 git-add--interactive.perl:1440
2b472aae
JX
423#, c-format, perl-format
424msgid "Stash this hunk [y,n,q,a,d%s,?]? "
425msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
426
7157c2b5 427#: add-patch.c:61
2b472aae
JX
428msgid ""
429"If the patch applies cleanly, the edited hunk will immediately be marked for "
430"stashing."
431msgstr "如果补丁能正确地应用,编辑块将立即标记为贮藏。"
432
7157c2b5 433#: add-patch.c:64
2b472aae
JX
434msgid ""
435"y - stash this hunk\n"
436"n - do not stash this hunk\n"
437"q - quit; do not stash this hunk or any of the remaining ones\n"
438"a - stash this hunk and all later hunks in the file\n"
439"d - do not stash this hunk or any of the later hunks in the file\n"
440msgstr ""
441"y - 贮藏该块\n"
442"n - 不要贮藏该块\n"
443"q - 退出。不贮藏该块及后面的全部块\n"
444"a - 贮藏该块和本文件中后面的全部块\n"
445"d - 不贮藏该块和本文件中后面的全部块\n"
446
d13389bf 447#: add-patch.c:80 git-add--interactive.perl:1443
2b472aae
JX
448#, c-format, perl-format
449msgid "Unstage mode change [y,n,q,a,d%s,?]? "
450msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
451
d13389bf 452#: add-patch.c:81 git-add--interactive.perl:1444
2b472aae
JX
453#, c-format, perl-format
454msgid "Unstage deletion [y,n,q,a,d%s,?]? "
455msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
456
d13389bf 457#: add-patch.c:82 git-add--interactive.perl:1445
7157c2b5
JX
458#, c-format, perl-format
459msgid "Unstage addition [y,n,q,a,d%s,?]? "
460msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? "
461
d13389bf 462#: add-patch.c:83 git-add--interactive.perl:1446
2b472aae
JX
463#, c-format, perl-format
464msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
465msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
466
7157c2b5 467#: add-patch.c:85
2b472aae
JX
468msgid ""
469"If the patch applies cleanly, the edited hunk will immediately be marked for "
470"unstaging."
471msgstr "如果补丁能正确地应用,编辑块将立即标记为未暂存。"
472
7157c2b5 473#: add-patch.c:88
2b472aae
JX
474msgid ""
475"y - unstage this hunk\n"
476"n - do not unstage this hunk\n"
477"q - quit; do not unstage this hunk or any of the remaining ones\n"
478"a - unstage this hunk and all later hunks in the file\n"
479"d - do not unstage this hunk or any of the later hunks in the file\n"
480msgstr ""
440e7442
FZ
481"y - 取消暂存该块\n"
482"n - 不要取消暂存该块\n"
483"q - 退出。不要取消暂存该块及后面的全部块\n"
484"a - 取消暂存该块和本文件中后面的全部块\n"
485"d - 不要取消暂存该块和本文件中后面的全部块\n"
2b472aae 486
d13389bf 487#: add-patch.c:103 git-add--interactive.perl:1449
2b472aae
JX
488#, c-format, perl-format
489msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
490msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
491
d13389bf 492#: add-patch.c:104 git-add--interactive.perl:1450
2b472aae
JX
493#, c-format, perl-format
494msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
495msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
496
d13389bf 497#: add-patch.c:105 git-add--interactive.perl:1451
7157c2b5
JX
498#, c-format, perl-format
499msgid "Apply addition to index [y,n,q,a,d%s,?]? "
500msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? "
501
d13389bf 502#: add-patch.c:106 git-add--interactive.perl:1452
2b472aae
JX
503#, c-format, perl-format
504msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
505msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
506
7157c2b5 507#: add-patch.c:108 add-patch.c:176 add-patch.c:221
2b472aae
JX
508msgid ""
509"If the patch applies cleanly, the edited hunk will immediately be marked for "
510"applying."
511msgstr "如果补丁能正确地应用,编辑块将立即标记为应用。"
512
7157c2b5 513#: add-patch.c:111
2b472aae
JX
514msgid ""
515"y - apply this hunk to index\n"
516"n - do not apply this hunk to index\n"
517"q - quit; do not apply this hunk or any of the remaining ones\n"
518"a - apply this hunk and all later hunks in the file\n"
519"d - do not apply this hunk or any of the later hunks in the file\n"
520msgstr ""
521"y - 在索引中应用该块\n"
522"n - 不要在索引中应用该块\n"
523"q - 退出。不要应用该块及后面的全部块\n"
524"a - 应用该块和本文件中后面的全部块\n"
525"d - 不要应用该块和本文件中后面的全部块\n"
526
d13389bf
JX
527#: add-patch.c:126 git-add--interactive.perl:1455
528#: git-add--interactive.perl:1473
2b472aae
JX
529#, c-format, perl-format
530msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
531msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
532
d13389bf
JX
533#: add-patch.c:127 git-add--interactive.perl:1456
534#: git-add--interactive.perl:1474
2b472aae
JX
535#, c-format, perl-format
536msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
537msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
ddc12c42 538
d13389bf
JX
539#: add-patch.c:128 git-add--interactive.perl:1457
540#: git-add--interactive.perl:1475
7157c2b5
JX
541#, c-format, perl-format
542msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
543msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
544
d13389bf
JX
545#: add-patch.c:129 git-add--interactive.perl:1458
546#: git-add--interactive.perl:1476
2b472aae
JX
547#, c-format, perl-format
548msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
549msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
550
7157c2b5 551#: add-patch.c:131 add-patch.c:154 add-patch.c:199
2b472aae
JX
552msgid ""
553"If the patch applies cleanly, the edited hunk will immediately be marked for "
554"discarding."
555msgstr "如果补丁能正确地应用,编辑块将立即标记为丢弃。"
556
7157c2b5 557#: add-patch.c:134 add-patch.c:202
2b472aae
JX
558msgid ""
559"y - discard this hunk from worktree\n"
560"n - do not discard this hunk from worktree\n"
561"q - quit; do not discard this hunk or any of the remaining ones\n"
562"a - discard this hunk and all later hunks in the file\n"
563"d - do not discard this hunk or any of the later hunks in the file\n"
564msgstr ""
565"y - 在工作区中丢弃该块\n"
566"n - 不要在工作区中丢弃该块\n"
567"q - 退出。不要丢弃该块及后面的全部块\n"
568"a - 丢弃该块和本文件中后面的全部块\n"
569"d - 不要丢弃该块和本文件中后面的全部块\n"
570
d13389bf 571#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
2b472aae
JX
572#, c-format, perl-format
573msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
574msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
575
d13389bf 576#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
2b472aae
JX
577#, c-format, perl-format
578msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
7157c2b5 579msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
2b472aae 580
d13389bf 581#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
7157c2b5
JX
582#, c-format, perl-format
583msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
584msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
585
d13389bf 586#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
2b472aae
JX
587#, c-format, perl-format
588msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
589msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
590
7157c2b5 591#: add-patch.c:157
2b472aae
JX
592msgid ""
593"y - discard this hunk from index and worktree\n"
594"n - do not discard this hunk from index and worktree\n"
595"q - quit; do not discard this hunk or any of the remaining ones\n"
596"a - discard this hunk and all later hunks in the file\n"
597"d - do not discard this hunk or any of the later hunks in the file\n"
598msgstr ""
599"y - 在索引和工作区中丢弃该块\n"
600"n - 不要在索引和工作区中丢弃该块\n"
601"q - 退出。不要丢弃该块及后面的全部块\n"
602"a - 丢弃该块和本文件中后面的全部块\n"
603"d - 不要丢弃该块和本文件中后面的全部块\n"
604
d13389bf 605#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
2b472aae
JX
606#, c-format, perl-format
607msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
608msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
609
d13389bf 610#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
2b472aae
JX
611#, c-format, perl-format
612msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
613msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
614
d13389bf 615#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
7157c2b5
JX
616#, c-format, perl-format
617msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
618msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
619
d13389bf 620#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
2b472aae
JX
621#, c-format, perl-format
622msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
623msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
624
7157c2b5 625#: add-patch.c:179
2b472aae
JX
626msgid ""
627"y - apply this hunk to index and worktree\n"
628"n - do not apply this hunk to index and worktree\n"
629"q - quit; do not apply this hunk or any of the remaining ones\n"
630"a - apply this hunk and all later hunks in the file\n"
631"d - do not apply this hunk or any of the later hunks in the file\n"
632msgstr ""
633"y - 在索引和工作区中应用该块\n"
634"n - 不要在索引和工作区中应用该块\n"
635"q - 退出。不要应用该块及后面的全部块\n"
636"a - 应用该块和本文件中后面的全部块\n"
637"d - 不要应用该块和本文件中后面的全部块\n"
638
7157c2b5 639#: add-patch.c:224
2b472aae
JX
640msgid ""
641"y - apply this hunk to worktree\n"
642"n - do not apply this hunk to worktree\n"
643"q - quit; do not apply this hunk or any of the remaining ones\n"
644"a - apply this hunk and all later hunks in the file\n"
645"d - do not apply this hunk or any of the later hunks in the file\n"
646msgstr ""
647"y - 在工作区中应用该块\n"
648"n - 不要在工作区中应用该块\n"
649"q - 退出。不要应用该块及后面的全部块\n"
650"a - 应用该块和本文件中后面的全部块\n"
651"d - 不要应用该块和本文件中后面的全部块\n"
652
ec3d4607 653#: add-patch.c:343
ddc12c42
JX
654#, c-format
655msgid "could not parse hunk header '%.*s'"
656msgstr "无法解析数据块头信息 '%.*s'"
657
ec3d4607 658#: add-patch.c:362 add-patch.c:366
ddc12c42
JX
659#, c-format
660msgid "could not parse colored hunk header '%.*s'"
661msgstr "无法解析彩色数据块头信息 '%.*s'"
662
ec3d4607 663#: add-patch.c:420
ddc12c42
JX
664msgid "could not parse diff"
665msgstr "不能解析差异信息"
666
ec3d4607 667#: add-patch.c:439
ddc12c42
JX
668msgid "could not parse colored diff"
669msgstr "不能解析彩色差异信息"
670
ec3d4607 671#: add-patch.c:453
2b472aae
JX
672#, c-format
673msgid "failed to run '%s'"
674msgstr "运行 '%s' 失败"
675
ec3d4607 676#: add-patch.c:612
2b472aae
JX
677msgid "mismatched output from interactive.diffFilter"
678msgstr "interactive.diffFilter 的输出不匹配"
679
ec3d4607 680#: add-patch.c:613
2b472aae
JX
681msgid ""
682"Your filter must maintain a one-to-one correspondence\n"
683"between its input and output lines."
684msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"
685
ec3d4607 686#: add-patch.c:791
ddc12c42
JX
687#, c-format
688msgid ""
689"expected context line #%d in\n"
690"%.*s"
691msgstr ""
692"预期上下文行 #%d 于\n"
693"%.*s"
694
ec3d4607 695#: add-patch.c:806
ddc12c42
JX
696#, c-format
697msgid ""
698"hunks do not overlap:\n"
699"%.*s\n"
700"\tdoes not end with:\n"
701"%.*s"
702msgstr ""
703"块不重叠:\n"
704"%.*s\n"
705"\t不是结尾于:\n"
706"%.*s"
707
ec3d4607 708#: add-patch.c:1082 git-add--interactive.perl:1115
ddc12c42
JX
709msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
710msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
711
ec3d4607 712#: add-patch.c:1086
ddc12c42
JX
713#, c-format
714msgid ""
715"---\n"
716"To remove '%c' lines, make them ' ' lines (context).\n"
717"To remove '%c' lines, delete them.\n"
718"Lines starting with %c will be removed.\n"
719msgstr ""
720"---\n"
721"要删除 '%c' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
722"要删除 '%c' 开始的行,删除它们。\n"
723"以 %c 开始的行将被删除。\n"
724
ddc12c42 725#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
ec3d4607 726#: add-patch.c:1100 git-add--interactive.perl:1129
ddc12c42
JX
727msgid ""
728"If it does not apply cleanly, you will be given an opportunity to\n"
729"edit again. If all lines of the hunk are removed, then the edit is\n"
730"aborted and the hunk is left unchanged.\n"
731msgstr ""
732"如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
733"此次编辑被终止,该块不会被修改。\n"
734
ec3d4607 735#: add-patch.c:1133
ddc12c42
JX
736msgid "could not parse hunk header"
737msgstr "无法解析数据块头信息"
738
ec3d4607 739#: add-patch.c:1178
ddc12c42
JX
740msgid "'git apply --cached' failed"
741msgstr "'git apply --cached' 失败"
742
743#. TRANSLATORS: do not translate [y/n]
744#. The program will only accept that input at this point.
745#. Consider translating (saying "no" discards!) as
746#. (saying "n" for "no" discards!) if the translation
747#. of the word "no" does not start with n.
748#.
749#. TRANSLATORS: do not translate [y/n]
750#. The program will only accept that input
751#. at this point.
752#. Consider translating (saying "no" discards!) as
753#. (saying "n" for "no" discards!) if the translation
754#. of the word "no" does not start with n.
ec3d4607 755#: add-patch.c:1247 git-add--interactive.perl:1242
ddc12c42
JX
756msgid ""
757"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
758msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
759
ec3d4607 760#: add-patch.c:1290
2b472aae
JX
761msgid "The selected hunks do not apply to the index!"
762msgstr "选中的块不能应用到索引!"
763
ec3d4607 764#: add-patch.c:1291 git-add--interactive.perl:1346
2b472aae
JX
765msgid "Apply them to the worktree anyway? "
766msgstr "无论如何都要应用到工作区么?"
767
ec3d4607 768#: add-patch.c:1298 git-add--interactive.perl:1349
2b472aae
JX
769msgid "Nothing was applied.\n"
770msgstr "未应用。\n"
ddc12c42 771
ec3d4607 772#: add-patch.c:1355
ddc12c42
JX
773msgid ""
774"j - leave this hunk undecided, see next undecided hunk\n"
775"J - leave this hunk undecided, see next hunk\n"
776"k - leave this hunk undecided, see previous undecided hunk\n"
777"K - leave this hunk undecided, see previous hunk\n"
778"g - select a hunk to go to\n"
779"/ - search for a hunk matching the given regex\n"
780"s - split the current hunk into smaller hunks\n"
781"e - manually edit the current hunk\n"
782"? - print help\n"
783msgstr ""
784"j - 维持该块未决状态,查看下一个未决块\n"
785"J - 维持该块未决状态,查看下一个块\n"
786"k - 维持该块未决状态,查看上一个未决块\n"
787"K - 维持该块未决状态,查看上一个块\n"
788"g - 选择跳转到一个块\n"
789"/ - 查找和给定正则表达式匹配的块\n"
790"s - 拆分当前块为更小的块\n"
791"e - 手动编辑当前块\n"
792"? - 显示帮助\n"
793
ec3d4607 794#: add-patch.c:1517 add-patch.c:1527
ddc12c42
JX
795msgid "No previous hunk"
796msgstr "没有前一个块"
797
ec3d4607 798#: add-patch.c:1522 add-patch.c:1532
ddc12c42
JX
799msgid "No next hunk"
800msgstr "没有下一个块"
801
ec3d4607 802#: add-patch.c:1538
ddc12c42
JX
803msgid "No other hunks to goto"
804msgstr "没有其它可供跳转的块"
805
ec3d4607 806#: add-patch.c:1549 git-add--interactive.perl:1606
ddc12c42
JX
807msgid "go to which hunk (<ret> to see more)? "
808msgstr "跳转到哪个块(<回车> 查看更多)? "
809
ec3d4607 810#: add-patch.c:1550 git-add--interactive.perl:1608
ddc12c42
JX
811msgid "go to which hunk? "
812msgstr "跳转到哪个块?"
813
ec3d4607 814#: add-patch.c:1561
ddc12c42
JX
815#, c-format
816msgid "Invalid number: '%s'"
817msgstr "无效数字:'%s'"
818
ec3d4607 819#: add-patch.c:1566
ddc12c42
JX
820#, c-format
821msgid "Sorry, only %d hunk available."
822msgid_plural "Sorry, only %d hunks available."
823msgstr[0] "对不起,只有 %d 个可用块。"
824msgstr[1] "对不起,只有 %d 个可用块。"
825
ec3d4607 826#: add-patch.c:1575
ddc12c42
JX
827msgid "No other hunks to search"
828msgstr "没有其它可供查找的块"
829
ec3d4607 830#: add-patch.c:1581 git-add--interactive.perl:1661
ddc12c42
JX
831msgid "search for regex? "
832msgstr "使用正则表达式搜索?"
833
ec3d4607 834#: add-patch.c:1596
ddc12c42
JX
835#, c-format
836msgid "Malformed search regexp %s: %s"
837msgstr "错误的正则表达式 %s:%s"
838
ec3d4607 839#: add-patch.c:1613
ddc12c42
JX
840msgid "No hunk matches the given pattern"
841msgstr "没有和给定模式相匹配的块"
842
ec3d4607 843#: add-patch.c:1620
ddc12c42
JX
844msgid "Sorry, cannot split this hunk"
845msgstr "对不起,不能拆分这个块"
846
ec3d4607 847#: add-patch.c:1624
ddc12c42
JX
848#, c-format
849msgid "Split into %d hunks."
850msgstr "拆分为 %d 块。"
851
ec3d4607 852#: add-patch.c:1628
ddc12c42
JX
853msgid "Sorry, cannot edit this hunk"
854msgstr "对不起,不能编辑这个块"
855
ec3d4607 856#: add-patch.c:1680
2b472aae
JX
857msgid "'git apply' failed"
858msgstr "'git apply' 失败"
859
7e6630a7 860#: advice.c:78
349ede6a
JX
861#, c-format
862msgid ""
863"\n"
864"Disable this message with \"git config advice.%s false\""
865msgstr ""
866"\n"
867"使用 \"git config advice.%s false\" 来关闭此消息"
868
7e6630a7 869#: advice.c:94
c04f5ac3 870#, c-format
fd8cb379
JX
871msgid "%shint: %.*s%s\n"
872msgstr "%s提示:%.*s%s\n"
c04f5ac3 873
7e6630a7 874#: advice.c:178
5c57d762
JX
875msgid "Cherry-picking is not possible because you have unmerged files."
876msgstr "无法拣选,因为您有未合并的文件。"
877
7e6630a7 878#: advice.c:180
5c57d762
JX
879msgid "Committing is not possible because you have unmerged files."
880msgstr "无法提交,因为您有未合并的文件。"
881
7e6630a7 882#: advice.c:182
5c57d762
JX
883msgid "Merging is not possible because you have unmerged files."
884msgstr "无法合并,因为您有未合并的文件。"
885
7e6630a7 886#: advice.c:184
5c57d762
JX
887msgid "Pulling is not possible because you have unmerged files."
888msgstr "无法拉取,因为您有未合并的文件。"
889
7e6630a7 890#: advice.c:186
5c57d762
JX
891msgid "Reverting is not possible because you have unmerged files."
892msgstr "无法回退,因为您有未合并的文件。"
893
7e6630a7 894#: advice.c:188
5c57d762
JX
895#, c-format
896msgid "It is not possible to %s because you have unmerged files."
897msgstr "无法 %s,因为您有未合并的文件。"
898
7e6630a7 899#: advice.c:196
c04f5ac3 900msgid ""
6acbf033 901"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 902"as appropriate to mark resolution and make a commit."
c04f5ac3 903msgstr ""
d9d56b23 904"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
220c313c 905"解决方案并提交。"
c04f5ac3 906
7e6630a7 907#: advice.c:204
5c57d762
JX
908msgid "Exiting because of an unresolved conflict."
909msgstr "因为存在未解决的冲突而退出。"
910
7e6630a7 911#: advice.c:209 builtin/merge.c:1379
1b7f4a34
JX
912msgid "You have not concluded your merge (MERGE_HEAD exists)."
913msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
914
7e6630a7 915#: advice.c:211
94550ed3 916msgid "Please, commit your changes before merging."
1b7f4a34
JX
917msgstr "请在合并前先提交您的修改。"
918
7e6630a7 919#: advice.c:212
1b7f4a34
JX
920msgid "Exiting because of unfinished merge."
921msgstr "因为存在未完成的合并而退出。"
922
7e6630a7
FZ
923#: advice.c:217
924msgid "Not possible to fast-forward, aborting."
925msgstr "无法快进,终止。"
926
927#: advice.c:227
33b62fba
JX
928#, c-format
929msgid ""
7e6630a7
FZ
930"The following paths and/or pathspecs matched paths that exist\n"
931"outside of your sparse-checkout definition, so will not be\n"
932"updated in the index:\n"
ec3d4607 933msgstr ""
7e6630a7
FZ
934"下面的路径和/或者路径规格匹配了您定义的稀疏检出以外的路径,\n"
935"所以不会在索引中更新:\n"
33b62fba 936
7e6630a7 937#: advice.c:234
33b62fba 938msgid ""
7e6630a7
FZ
939"If you intend to update such entries, try one of the following:\n"
940"* Use the --sparse option.\n"
941"* Disable or modify the sparsity rules."
942msgstr ""
943"如果您意图更新这些条目,请尝试下列其中之一:\n"
944"* 使用 --sparse 选项。\n"
945"* 禁用或者修改稀疏规则。"
33b62fba 946
7e6630a7 947#: advice.c:242
5c57d762
JX
948#, c-format
949msgid ""
a6cd2cc4 950"Note: switching to '%s'.\n"
5c57d762
JX
951"\n"
952"You are in 'detached HEAD' state. You can look around, make experimental\n"
953"changes and commit them, and you can discard any commits you make in this\n"
a6cd2cc4 954"state without impacting any branches by switching back to a branch.\n"
5c57d762
JX
955"\n"
956"If you want to create a new branch to retain commits you create, you may\n"
a6cd2cc4 957"do so (now or later) by using -c with the switch command. Example:\n"
5c57d762 958"\n"
a6cd2cc4
JX
959" git switch -c <new-branch-name>\n"
960"\n"
961"Or undo this operation with:\n"
962"\n"
963" git switch -\n"
964"\n"
965"Turn off this advice by setting config variable advice.detachedHead to "
966"false\n"
5c57d762
JX
967"\n"
968msgstr ""
a6cd2cc4
JX
969"注意:正在切换到 '%s'。\n"
970"\n"
971"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以在切换\n"
972"回一个分支时,丢弃在此状态下所做的提交而不对分支造成影响。\n"
5c57d762 973"\n"
a6cd2cc4
JX
974"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在 switch 命令\n"
975"中添加参数 -c 来实现(现在或稍后)。例如:\n"
5c57d762 976"\n"
a6cd2cc4 977" git switch -c <新分支名>\n"
5c57d762 978"\n"
a6cd2cc4
JX
979"或者撤销此操作:\n"
980"\n"
981" git switch -\n"
982"\n"
983"通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n"
5c57d762
JX
984"\n"
985
06991777
JX
986#: alias.c:50
987msgid "cmdline ends with \\"
988msgstr "命令行以 \\ 结尾"
989
990#: alias.c:51
991msgid "unclosed quote"
992msgstr "未关闭的引号"
993
33b62fba 994#: apply.c:70
a0b6b246
JX
995#, c-format
996msgid "unrecognized whitespace option '%s'"
997msgstr "未能识别的空白字符选项 '%s'"
ef317cd5 998
33b62fba 999#: apply.c:86
90314792 1000#, c-format
a0b6b246
JX
1001msgid "unrecognized whitespace ignore option '%s'"
1002msgstr "未能识别的空白字符忽略选项 '%s'"
90314792 1003
33b62fba 1004#: apply.c:136
a0b6b246 1005msgid "--reject and --3way cannot be used together."
2090d5b4 1006msgstr "--reject 和 --3way 不能同时使用。"
ef317cd5 1007
33b62fba 1008#: apply.c:139
a0b6b246
JX
1009msgid "--3way outside a repository"
1010msgstr "--3way 在一个仓库之外"
ef317cd5 1011
33b62fba 1012#: apply.c:150
a0b6b246
JX
1013msgid "--index outside a repository"
1014msgstr "--index 在一个仓库之外"
ef317cd5 1015
33b62fba 1016#: apply.c:153
a0b6b246
JX
1017msgid "--cached outside a repository"
1018msgstr "--cached 在一个仓库之外"
ef317cd5 1019
33b62fba 1020#: apply.c:800
a0b6b246
JX
1021#, c-format
1022msgid "Cannot prepare timestamp regexp %s"
1023msgstr "无法准备时间戳正则表达式 %s"
ef317cd5 1024
33b62fba 1025#: apply.c:809
a0b6b246
JX
1026#, c-format
1027msgid "regexec returned %d for input: %s"
1028msgstr "regexec 返回 %d,输入为:%s"
ef317cd5 1029
33b62fba 1030#: apply.c:883
a0b6b246
JX
1031#, c-format
1032msgid "unable to find filename in patch at line %d"
1033msgstr "不能在补丁的第 %d 行找到文件名"
ef317cd5 1034
33b62fba 1035#: apply.c:921
a0b6b246
JX
1036#, c-format
1037msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1038msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
ef317cd5 1039
33b62fba 1040#: apply.c:927
a0b6b246
JX
1041#, c-format
1042msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1043msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
ef317cd5 1044
33b62fba 1045#: apply.c:928
a0b6b246
JX
1046#, c-format
1047msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1048msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
ef317cd5 1049
33b62fba 1050#: apply.c:933
a0b6b246
JX
1051#, c-format
1052msgid "git apply: bad git-diff - expected /dev/null on line %d"
1053msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
ef317cd5 1054
33b62fba 1055#: apply.c:962
a4f16749
JX
1056#, c-format
1057msgid "invalid mode on line %d: %s"
1058msgstr "第 %d 行包含无效文件模式:%s"
1059
33b62fba 1060#: apply.c:1281
a4f16749
JX
1061#, c-format
1062msgid "inconsistent header lines %d and %d"
1063msgstr "不一致的文件头,%d 行和 %d 行"
1064
33b62fba 1065#: apply.c:1371
a0b6b246
JX
1066#, c-format
1067msgid ""
1068"git diff header lacks filename information when removing %d leading pathname "
1069"component (line %d)"
1070msgid_plural ""
1071"git diff header lacks filename information when removing %d leading pathname "
1072"components (line %d)"
1073msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1074msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
ef317cd5 1075
33b62fba 1076#: apply.c:1384
a0b6b246
JX
1077#, c-format
1078msgid "git diff header lacks filename information (line %d)"
1079msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
07432cef 1080
33b62fba 1081#: apply.c:1480
a5cd71ca
JX
1082#, c-format
1083msgid "recount: unexpected line: %.*s"
1084msgstr "recount:意外的行:%.*s"
1085
33b62fba 1086#: apply.c:1549
a5cd71ca
JX
1087#, c-format
1088msgid "patch fragment without header at line %d: %.*s"
1089msgstr "第 %d 行的补丁片段没有头信息:%.*s"
1090
33b62fba 1091#: apply.c:1752
a0b6b246
JX
1092msgid "new file depends on old contents"
1093msgstr "新文件依赖旧内容"
5c57d762 1094
33b62fba 1095#: apply.c:1754
a0b6b246
JX
1096msgid "deleted file still has contents"
1097msgstr "删除的文件仍有内容"
5c57d762 1098
33b62fba 1099#: apply.c:1788
a0b6b246
JX
1100#, c-format
1101msgid "corrupt patch at line %d"
1102msgstr "补丁在第 %d 行损坏"
5c57d762 1103
33b62fba 1104#: apply.c:1825
5c57d762 1105#, c-format
a0b6b246
JX
1106msgid "new file %s depends on old contents"
1107msgstr "新文件 %s 依赖旧内容"
5c57d762 1108
33b62fba 1109#: apply.c:1827
5c57d762 1110#, c-format
a0b6b246
JX
1111msgid "deleted file %s still has contents"
1112msgstr "删除的文件 %s 仍有内容"
5c57d762 1113
33b62fba 1114#: apply.c:1830
a0b6b246
JX
1115#, c-format
1116msgid "** warning: file %s becomes empty but is not deleted"
1117msgstr "** 警告:文件 %s 成为空文件但并未删除"
ef317cd5 1118
7e6630a7 1119#: apply.c:1978
5c57d762 1120#, c-format
a0b6b246
JX
1121msgid "corrupt binary patch at line %d: %.*s"
1122msgstr "二进制补丁在第 %d 行损坏:%.*s"
5c57d762 1123
7e6630a7 1124#: apply.c:2015
5c57d762 1125#, c-format
a0b6b246
JX
1126msgid "unrecognized binary patch at line %d"
1127msgstr "未能识别的二进制补丁位于第 %d 行"
5c57d762 1128
7e6630a7 1129#: apply.c:2177
5c57d762 1130#, c-format
a0b6b246
JX
1131msgid "patch with only garbage at line %d"
1132msgstr "补丁文件的第 %d 行只有垃圾数据"
5c57d762 1133
7e6630a7 1134#: apply.c:2263
5c57d762 1135#, c-format
a0b6b246
JX
1136msgid "unable to read symlink %s"
1137msgstr "无法读取符号链接 %s"
5c57d762 1138
7e6630a7 1139#: apply.c:2267
5c57d762 1140#, c-format
a0b6b246
JX
1141msgid "unable to open or read %s"
1142msgstr "不能打开或读取 %s"
5c57d762 1143
7e6630a7 1144#: apply.c:2936
5c57d762 1145#, c-format
a0b6b246
JX
1146msgid "invalid start of line: '%c'"
1147msgstr "无效的行首字符:'%c'"
5c57d762 1148
7e6630a7 1149#: apply.c:3057
5c57d762 1150#, c-format
a0b6b246
JX
1151msgid "Hunk #%d succeeded at %d (offset %d line)."
1152msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1153msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
1154msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
5c57d762 1155
7e6630a7 1156#: apply.c:3069
5c57d762 1157#, c-format
a0b6b246
JX
1158msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1159msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
5c57d762 1160
7e6630a7 1161#: apply.c:3075
5c57d762
JX
1162#, c-format
1163msgid ""
a0b6b246
JX
1164"while searching for:\n"
1165"%.*s"
5c57d762 1166msgstr ""
a0b6b246
JX
1167"当查询:\n"
1168"%.*s"
5c57d762 1169
7e6630a7 1170#: apply.c:3097
5c57d762 1171#, c-format
a0b6b246
JX
1172msgid "missing binary patch data for '%s'"
1173msgstr "缺失 '%s' 的二进制补丁数据"
5c57d762 1174
7e6630a7 1175#: apply.c:3105
5c57d762 1176#, c-format
a0b6b246 1177msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
29004bbb 1178msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
5c57d762 1179
7e6630a7 1180#: apply.c:3152
5c57d762 1181#, c-format
a0b6b246
JX
1182msgid "cannot apply binary patch to '%s' without full index line"
1183msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
5c57d762 1184
7e6630a7 1185#: apply.c:3163
5c57d762 1186#, c-format
a0b6b246
JX
1187msgid ""
1188"the patch applies to '%s' (%s), which does not match the current contents."
29004bbb 1189msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
5c57d762 1190
7e6630a7 1191#: apply.c:3171
a0b6b246
JX
1192#, c-format
1193msgid "the patch applies to an empty '%s' but it is not empty"
29004bbb 1194msgstr "补丁应用到空文件 '%s',但其并非空文件"
5c57d762 1195
7e6630a7 1196#: apply.c:3189
5c57d762 1197#, c-format
a0b6b246 1198msgid "the necessary postimage %s for '%s' cannot be read"
e640d114 1199msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
5c57d762 1200
7e6630a7 1201#: apply.c:3202
5c57d762 1202#, c-format
a0b6b246
JX
1203msgid "binary patch does not apply to '%s'"
1204msgstr "二进制补丁未应用到 '%s'"
5c57d762 1205
7e6630a7 1206#: apply.c:3209
5c57d762 1207#, c-format
a0b6b246
JX
1208msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1209msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
5c57d762 1210
7e6630a7 1211#: apply.c:3230
276ceeaa 1212#, c-format
a0b6b246
JX
1213msgid "patch failed: %s:%ld"
1214msgstr "打补丁失败:%s:%ld"
276ceeaa 1215
7e6630a7 1216#: apply.c:3353
4dcdc3d8 1217#, c-format
a0b6b246
JX
1218msgid "cannot checkout %s"
1219msgstr "不能检出 %s"
4dcdc3d8 1220
7e6630a7 1221#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
473eb541 1222#: setup.c:308
4dcdc3d8 1223#, c-format
a0b6b246
JX
1224msgid "failed to read %s"
1225msgstr "无法读取 %s"
4dcdc3d8 1226
7e6630a7 1227#: apply.c:3413
4dcdc3d8 1228#, c-format
a0b6b246
JX
1229msgid "reading from '%s' beyond a symbolic link"
1230msgstr "读取位于符号链接中的 '%s'"
4dcdc3d8 1231
7e6630a7 1232#: apply.c:3442 apply.c:3709
4dcdc3d8 1233#, c-format
a0b6b246
JX
1234msgid "path %s has been renamed/deleted"
1235msgstr "路径 %s 已经被重命名/删除"
4dcdc3d8 1236
7e6630a7 1237#: apply.c:3549 apply.c:3724
4dcdc3d8 1238#, c-format
a0b6b246
JX
1239msgid "%s: does not exist in index"
1240msgstr "%s:不存在于索引中"
4dcdc3d8 1241
7e6630a7 1242#: apply.c:3558 apply.c:3732 apply.c:3976
4dcdc3d8 1243#, c-format
a0b6b246
JX
1244msgid "%s: does not match index"
1245msgstr "%s:和索引不匹配"
4dcdc3d8 1246
7e6630a7 1247#: apply.c:3593
33b62fba
JX
1248msgid "repository lacks the necessary blob to perform 3-way merge."
1249msgstr "仓库缺乏执行三方合并所必需的数据对象。"
4dcdc3d8 1250
7e6630a7 1251#: apply.c:3596
4dcdc3d8 1252#, c-format
33b62fba
JX
1253msgid "Performing three-way merge...\n"
1254msgstr "执行三方合并...\n"
4dcdc3d8 1255
7e6630a7 1256#: apply.c:3612 apply.c:3616
4dcdc3d8 1257#, c-format
a0b6b246
JX
1258msgid "cannot read the current contents of '%s'"
1259msgstr "无法读取 '%s' 的当前内容"
276ceeaa 1260
7e6630a7 1261#: apply.c:3628
4dcdc3d8 1262#, c-format
33b62fba
JX
1263msgid "Failed to perform three-way merge...\n"
1264msgstr "无法执行三方合并...\n"
4dcdc3d8 1265
7e6630a7 1266#: apply.c:3642
4dcdc3d8 1267#, c-format
a0b6b246
JX
1268msgid "Applied patch to '%s' with conflicts.\n"
1269msgstr "应用补丁到 '%s' 存在冲突。\n"
4dcdc3d8 1270
7e6630a7 1271#: apply.c:3647
4dcdc3d8 1272#, c-format
a0b6b246
JX
1273msgid "Applied patch to '%s' cleanly.\n"
1274msgstr "成功应用补丁到 '%s'。\n"
4dcdc3d8 1275
7e6630a7 1276#: apply.c:3664
33b62fba
JX
1277#, c-format
1278msgid "Falling back to direct application...\n"
1279msgstr "回落到直接应用...\n"
1280
7e6630a7 1281#: apply.c:3676
a0b6b246
JX
1282msgid "removal patch leaves file contents"
1283msgstr "移除补丁仍留下了文件内容"
4dcdc3d8 1284
7e6630a7 1285#: apply.c:3749
1003b3a5 1286#, c-format
a0b6b246
JX
1287msgid "%s: wrong type"
1288msgstr "%s:错误类型"
1003b3a5 1289
7e6630a7 1290#: apply.c:3751
1003b3a5 1291#, c-format
a0b6b246
JX
1292msgid "%s has type %o, expected %o"
1293msgstr "%s 的类型是 %o,应为 %o"
1003b3a5 1294
7e6630a7
FZ
1295#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
1296#: read-cache.c:1368
4dcdc3d8 1297#, c-format
a0b6b246
JX
1298msgid "invalid path '%s'"
1299msgstr "无效路径 '%s'"
4dcdc3d8 1300
7e6630a7 1301#: apply.c:3974
4dcdc3d8 1302#, c-format
a0b6b246
JX
1303msgid "%s: already exists in index"
1304msgstr "%s:已经存在于索引中"
4dcdc3d8 1305
7e6630a7 1306#: apply.c:3978
4dcdc3d8 1307#, c-format
a0b6b246
JX
1308msgid "%s: already exists in working directory"
1309msgstr "%s:已经存在于工作区中"
4dcdc3d8 1310
7e6630a7 1311#: apply.c:3998
1b7f4a34 1312#, c-format
a0b6b246
JX
1313msgid "new mode (%o) of %s does not match old mode (%o)"
1314msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1b7f4a34 1315
7e6630a7 1316#: apply.c:4003
5b04ee3b 1317#, c-format
a0b6b246
JX
1318msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1319msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
5b04ee3b 1320
7e6630a7 1321#: apply.c:4023
8ada9598 1322#, c-format
a0b6b246
JX
1323msgid "affected file '%s' is beyond a symbolic link"
1324msgstr "受影响的文件 '%s' 位于符号链接中"
8ada9598 1325
7e6630a7 1326#: apply.c:4027
81809b99 1327#, c-format
a0b6b246
JX
1328msgid "%s: patch does not apply"
1329msgstr "%s:补丁未应用"
8ada9598 1330
7e6630a7 1331#: apply.c:4042
8ada9598 1332#, c-format
a0b6b246 1333msgid "Checking patch %s..."
06991777 1334msgstr "正在检查补丁 %s..."
8ada9598 1335
7e6630a7 1336#: apply.c:4134
a0b6b246
JX
1337#, c-format
1338msgid "sha1 information is lacking or useless for submodule %s"
1339msgstr "子模组 %s 的 sha1 信息缺失或无效"
8ada9598 1340
7e6630a7 1341#: apply.c:4141
8ada9598 1342#, c-format
a0b6b246 1343msgid "mode change for %s, which is not in current HEAD"
31e5e17b 1344msgstr "%s 的模式变更,但它不在当前 HEAD 中"
8ada9598 1345
7e6630a7 1346#: apply.c:4144
a0b6b246
JX
1347#, c-format
1348msgid "sha1 information is lacking or useless (%s)."
1349msgstr "sha1 信息缺失或无效(%s)。"
6792b93b 1350
7e6630a7 1351#: apply.c:4153
a0b6b246
JX
1352#, c-format
1353msgid "could not add %s to temporary index"
1354msgstr "不能在临时索引中添加 %s"
9aeb4c2b 1355
7e6630a7 1356#: apply.c:4163
a0b6b246
JX
1357#, c-format
1358msgid "could not write temporary index to %s"
1359msgstr "不能把临时索引写入到 %s"
9aeb4c2b 1360
7e6630a7 1361#: apply.c:4301
a0b6b246
JX
1362#, c-format
1363msgid "unable to remove %s from index"
1364msgstr "不能从索引中移除 %s"
8ada9598 1365
7e6630a7 1366#: apply.c:4335
8ada9598 1367#, c-format
a0b6b246
JX
1368msgid "corrupt patch for submodule %s"
1369msgstr "子模组 %s 损坏的补丁"
8ada9598 1370
7e6630a7 1371#: apply.c:4341
9aeb4c2b 1372#, c-format
a0b6b246 1373msgid "unable to stat newly created file '%s'"
65e2041e 1374msgstr "不能对新建文件 '%s' 调用 stat"
9aeb4c2b 1375
7e6630a7 1376#: apply.c:4349
a0b6b246
JX
1377#, c-format
1378msgid "unable to create backing store for newly created file %s"
1379msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 1380
7e6630a7 1381#: apply.c:4355 apply.c:4500
81809b99 1382#, c-format
a0b6b246
JX
1383msgid "unable to add cache entry for %s"
1384msgstr "无法为 %s 添加缓存条目"
8ada9598 1385
84bf71ea
FZ
1386#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
1387#: builtin/gc.c:2276
a0b6b246
JX
1388#, c-format
1389msgid "failed to write to '%s'"
c1ac5258 1390msgstr "写入 '%s' 失败"
8ada9598 1391
7e6630a7 1392#: apply.c:4402
220c313c 1393#, c-format
a0b6b246
JX
1394msgid "closing file '%s'"
1395msgstr "关闭文件 '%s'"
220c313c 1396
7e6630a7 1397#: apply.c:4472
c04f5ac3 1398#, c-format
a0b6b246
JX
1399msgid "unable to write file '%s' mode %o"
1400msgstr "不能写文件 '%s' 权限 %o"
c04f5ac3 1401
7e6630a7 1402#: apply.c:4570
c04f5ac3 1403#, c-format
a0b6b246
JX
1404msgid "Applied patch %s cleanly."
1405msgstr "成功应用补丁 %s。"
c04f5ac3 1406
7e6630a7 1407#: apply.c:4578
a0b6b246
JX
1408msgid "internal error"
1409msgstr "内部错误"
c04f5ac3 1410
7e6630a7 1411#: apply.c:4581
5c57d762 1412#, c-format
a0b6b246
JX
1413msgid "Applying patch %%s with %d reject..."
1414msgid_plural "Applying patch %%s with %d rejects..."
1415msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1416msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
5c57d762 1417
7e6630a7 1418#: apply.c:4592
5c57d762 1419#, c-format
a0b6b246
JX
1420msgid "truncating .rej filename to %.*s.rej"
1421msgstr "截短 .rej 文件名为 %.*s.rej"
5c57d762 1422
7e6630a7 1423#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
220c313c 1424#, c-format
a0b6b246
JX
1425msgid "cannot open %s"
1426msgstr "不能打开 %s"
220c313c 1427
7e6630a7 1428#: apply.c:4614
220c313c 1429#, c-format
a0b6b246
JX
1430msgid "Hunk #%d applied cleanly."
1431msgstr "第 #%d 个片段成功应用。"
220c313c 1432
7e6630a7 1433#: apply.c:4618
5c57d762 1434#, c-format
a0b6b246
JX
1435msgid "Rejected hunk #%d."
1436msgstr "拒绝第 #%d 个片段。"
5c57d762 1437
7e6630a7 1438#: apply.c:4747
5c57d762 1439#, c-format
a0b6b246
JX
1440msgid "Skipped patch '%s'."
1441msgstr "略过补丁 '%s'。"
5c57d762 1442
7e6630a7 1443#: apply.c:4755
a0b6b246
JX
1444msgid "unrecognized input"
1445msgstr "未能识别的输入"
5c57d762 1446
7e6630a7 1447#: apply.c:4775
a0b6b246
JX
1448msgid "unable to read index file"
1449msgstr "无法读取索引文件"
5c57d762 1450
7e6630a7 1451#: apply.c:4932
220c313c 1452#, c-format
a0b6b246
JX
1453msgid "can't open patch '%s': %s"
1454msgstr "不能打开补丁 '%s':%s"
220c313c 1455
7e6630a7 1456#: apply.c:4959
5c57d762 1457#, c-format
a0b6b246
JX
1458msgid "squelched %d whitespace error"
1459msgid_plural "squelched %d whitespace errors"
1460msgstr[0] "抑制下仍有 %d 个空白字符误用"
1461msgstr[1] "抑制下仍有 %d 个空白字符误用"
5c57d762 1462
7e6630a7 1463#: apply.c:4965 apply.c:4980
5c57d762 1464#, c-format
a0b6b246
JX
1465msgid "%d line adds whitespace errors."
1466msgid_plural "%d lines add whitespace errors."
a4f16749
JX
1467msgstr[0] "%d 行新增了空白字符误用。"
1468msgstr[1] "%d 行新增了空白字符误用。"
5c57d762 1469
7e6630a7 1470#: apply.c:4973
5c57d762 1471#, c-format
a0b6b246
JX
1472msgid "%d line applied after fixing whitespace errors."
1473msgid_plural "%d lines applied after fixing whitespace errors."
1474msgstr[0] "修复空白错误后,应用了 %d 行。"
1475msgstr[1] "修复空白错误后,应用了 %d 行。"
5c57d762 1476
7e6630a7 1477#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
a0b6b246
JX
1478msgid "Unable to write new index file"
1479msgstr "无法写入新索引文件"
5c57d762 1480
7e6630a7 1481#: apply.c:5017
a0b6b246
JX
1482msgid "don't apply changes matching the given path"
1483msgstr "不要应用与给出路径向匹配的变更"
5c57d762 1484
7e6630a7 1485#: apply.c:5020
a0b6b246
JX
1486msgid "apply changes matching the given path"
1487msgstr "应用与给出路径向匹配的变更"
220c313c 1488
7e6630a7 1489#: apply.c:5022 builtin/am.c:2320
a0b6b246
JX
1490msgid "num"
1491msgstr "数字"
220c313c 1492
7e6630a7 1493#: apply.c:5023
a0b6b246
JX
1494msgid "remove <num> leading slashes from traditional diff paths"
1495msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
220c313c 1496
7e6630a7 1497#: apply.c:5026
a0b6b246
JX
1498msgid "ignore additions made by the patch"
1499msgstr "忽略补丁中的添加的文件"
220c313c 1500
7e6630a7 1501#: apply.c:5028
a0b6b246
JX
1502msgid "instead of applying the patch, output diffstat for the input"
1503msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
220c313c 1504
7e6630a7 1505#: apply.c:5032
a0b6b246
JX
1506msgid "show number of added and deleted lines in decimal notation"
1507msgstr "以十进制数显示添加和删除的行数"
220c313c 1508
7e6630a7 1509#: apply.c:5034
a0b6b246
JX
1510msgid "instead of applying the patch, output a summary for the input"
1511msgstr "不应用补丁,而是显示输入的概要"
220c313c 1512
7e6630a7 1513#: apply.c:5036
a0b6b246
JX
1514msgid "instead of applying the patch, see if the patch is applicable"
1515msgstr "不应用补丁,而是查看补丁是否可应用"
220c313c 1516
7e6630a7 1517#: apply.c:5038
a0b6b246
JX
1518msgid "make sure the patch is applicable to the current index"
1519msgstr "确认补丁可以应用到当前索引"
276ceeaa 1520
7e6630a7 1521#: apply.c:5040
c1ac5258
JX
1522msgid "mark new files with `git add --intent-to-add`"
1523msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
1524
7e6630a7 1525#: apply.c:5042
a0b6b246
JX
1526msgid "apply a patch without touching the working tree"
1527msgstr "应用补丁而不修改工作区"
5b04ee3b 1528
7e6630a7 1529#: apply.c:5044
a0b6b246
JX
1530msgid "accept a patch that touches outside the working area"
1531msgstr "接受修改工作区之外文件的补丁"
5c57d762 1532
7e6630a7 1533#: apply.c:5047
a0b6b246
JX
1534msgid "also apply the patch (use with --stat/--summary/--check)"
1535msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
c04f5ac3 1536
7e6630a7 1537#: apply.c:5049
33b62fba 1538msgid "attempt three-way merge, fall back on normal patch if that fails"
523ccf5d 1539msgstr "尝试三路合并,如果失败则回落至正常补丁模式"
c04f5ac3 1540
7e6630a7 1541#: apply.c:5051
a0b6b246
JX
1542msgid "build a temporary index based on embedded index information"
1543msgstr "创建一个临时索引基于嵌入的索引信息"
c04f5ac3 1544
7e6630a7 1545#: apply.c:5054 builtin/checkout-index.c:196
a0b6b246
JX
1546msgid "paths are separated with NUL character"
1547msgstr "路径以 NUL 字符分隔"
8ada9598 1548
7e6630a7 1549#: apply.c:5056
a0b6b246
JX
1550msgid "ensure at least <n> lines of context match"
1551msgstr "确保至少匹配 <n> 行上下文"
8ada9598 1552
7e6630a7 1553#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
33b62fba 1554#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
7e6630a7
FZ
1555#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
1556#: builtin/rebase.c:1051
a0b6b246
JX
1557msgid "action"
1558msgstr "动作"
8ada9598 1559
7e6630a7 1560#: apply.c:5058
a0b6b246
JX
1561msgid "detect new or modified lines that have whitespace errors"
1562msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 1563
7e6630a7 1564#: apply.c:5061 apply.c:5064
a0b6b246
JX
1565msgid "ignore changes in whitespace when finding context"
1566msgstr "查找上下文时忽略空白字符的变更"
8ada9598 1567
7e6630a7 1568#: apply.c:5067
a0b6b246
JX
1569msgid "apply the patch in reverse"
1570msgstr "反向应用补丁"
8ada9598 1571
7e6630a7 1572#: apply.c:5069
a0b6b246
JX
1573msgid "don't expect at least one line of context"
1574msgstr "无需至少一行上下文"
8ada9598 1575
7e6630a7 1576#: apply.c:5071
a0b6b246
JX
1577msgid "leave the rejected hunks in corresponding *.rej files"
1578msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 1579
7e6630a7 1580#: apply.c:5073
a0b6b246
JX
1581msgid "allow overlapping hunks"
1582msgstr "允许重叠的补丁片段"
8ada9598 1583
7e6630a7
FZ
1584#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
1585#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
1586#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
a0b6b246
JX
1587msgid "be verbose"
1588msgstr "冗长输出"
8ada9598 1589
7e6630a7 1590#: apply.c:5076
a0b6b246
JX
1591msgid "tolerate incorrectly detected missing new-line at the end of file"
1592msgstr "允许不正确的文件末尾换行符"
cfff71a9 1593
7e6630a7 1594#: apply.c:5079
a0b6b246
JX
1595msgid "do not trust the line counts in the hunk headers"
1596msgstr "不信任补丁片段的头信息中的行号"
6c94aba5 1597
7e6630a7 1598#: apply.c:5081 builtin/am.c:2308
a0b6b246
JX
1599msgid "root"
1600msgstr "根目录"
c04f5ac3 1601
7e6630a7 1602#: apply.c:5082
a0b6b246
JX
1603msgid "prepend <root> to all filenames"
1604msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 1605
d9488fea 1606#: archive-tar.c:125 archive-zip.c:345
349ede6a
JX
1607#, c-format
1608msgid "cannot stream blob %s"
1609msgstr "不能打开数据对象 %s"
1610
d9488fea 1611#: archive-tar.c:265 archive-zip.c:358
349ede6a
JX
1612#, c-format
1613msgid "unsupported file mode: 0%o (SHA1: %s)"
1614msgstr "不支持的文件模式:0%o (SHA1: %s)"
1615
d13389bf 1616#: archive-tar.c:450
349ede6a
JX
1617#, c-format
1618msgid "unable to start '%s' filter"
1619msgstr "无法启动 '%s' 过滤器"
1620
d13389bf 1621#: archive-tar.c:453
349ede6a
JX
1622msgid "unable to redirect descriptor"
1623msgstr "无法重定向描述符"
1624
d13389bf 1625#: archive-tar.c:460
349ede6a
JX
1626#, c-format
1627msgid "'%s' filter reported error"
1628msgstr "'%s' 过滤器报告了错误"
1629
d9488fea 1630#: archive-zip.c:318
349ede6a
JX
1631#, c-format
1632msgid "path is not valid UTF-8: %s"
1633msgstr "路径不是有效的 UTF-8:%s"
1634
d9488fea 1635#: archive-zip.c:322
349ede6a
JX
1636#, c-format
1637msgid "path too long (%d chars, SHA1: %s): %s"
1638msgstr "路径太长(%d 字符,SHA1:%s):%s"
1639
ec3d4607 1640#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
349ede6a
JX
1641#, c-format
1642msgid "deflate error (%d)"
1643msgstr "压缩错误 (%d)"
1644
d9488fea 1645#: archive-zip.c:603
349ede6a
JX
1646#, c-format
1647msgid "timestamp too large for this system: %<PRIuMAX>"
1648msgstr "对于本系统时间戳太大:%<PRIuMAX>"
1649
c1ac5258 1650#: archive.c:14
a0b6b246 1651msgid "git archive [<options>] <tree-ish> [<path>...]"
ddc12c42 1652msgstr "git archive [<选项>] <树对象> [<路径>...]"
07432cef 1653
c1ac5258 1654#: archive.c:15
a0b6b246
JX
1655msgid "git archive --list"
1656msgstr "git archive --list"
1657
c1ac5258 1658#: archive.c:16
c04f5ac3 1659msgid ""
a0b6b246 1660"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
c04f5ac3 1661msgstr ""
ddc12c42 1662"git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]"
6acbf033 1663
c1ac5258 1664#: archive.c:17
a0b6b246
JX
1665msgid "git archive --remote <repo> [--exec <cmd>] --list"
1666msgstr "git archive --remote <仓库> [--exec <命令>] --list"
6acbf033 1667
33b62fba 1668#: archive.c:188
d9488fea
JX
1669#, c-format
1670msgid "cannot read %s"
1671msgstr "不能读取 %s"
1672
84bf71ea
FZ
1673#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
1674#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
7e6630a7 1675#: builtin/merge.c:1145
d9488fea
JX
1676#, c-format
1677msgid "could not read '%s'"
1678msgstr "不能读取 '%s'"
1679
7e6630a7 1680#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
c04f5ac3 1681#, c-format
a0b6b246
JX
1682msgid "pathspec '%s' did not match any files"
1683msgstr "路径规格 '%s' 未匹配任何文件"
c04f5ac3 1684
7e6630a7 1685#: archive.c:450
06991777
JX
1686#, c-format
1687msgid "no such ref: %.*s"
1688msgstr "无此引用:%.*s"
1689
7e6630a7 1690#: archive.c:456
06991777
JX
1691#, c-format
1692msgid "not a valid object name: %s"
1693msgstr "不是一个有效的对象名:%s"
1694
7e6630a7 1695#: archive.c:469
06991777
JX
1696#, c-format
1697msgid "not a tree object: %s"
1698msgstr "不是一个树对象:%s"
1699
7e6630a7 1700#: archive.c:481
06991777
JX
1701msgid "current working directory is untracked"
1702msgstr "当前工作目录未被跟踪"
1703
7e6630a7 1704#: archive.c:522
d9488fea
JX
1705#, c-format
1706msgid "File not found: %s"
1707msgstr "文件未找到:%s"
1708
7e6630a7 1709#: archive.c:524
d9488fea
JX
1710#, c-format
1711msgid "Not a regular file: %s"
1712msgstr "不是一个常规文件:%s"
1713
7e6630a7 1714#: archive.c:551
a0b6b246
JX
1715msgid "fmt"
1716msgstr "格式"
07432cef 1717
7e6630a7 1718#: archive.c:551
a0b6b246
JX
1719msgid "archive format"
1720msgstr "归档格式"
7aea43ff 1721
7e6630a7 1722#: archive.c:552 builtin/log.c:1775
a0b6b246
JX
1723msgid "prefix"
1724msgstr "前缀"
7aea43ff 1725
7e6630a7 1726#: archive.c:553
a0b6b246
JX
1727msgid "prepend prefix to each pathname in the archive"
1728msgstr "为归档中每个路径名加上前缀"
c04f5ac3 1729
7e6630a7
FZ
1730#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
1731#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
1732#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
1733#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
1734#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
1735#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
a0b6b246
JX
1736msgid "file"
1737msgstr "文件"
a77c07d9 1738
7e6630a7 1739#: archive.c:555
d9488fea
JX
1740msgid "add untracked file to archive"
1741msgstr "将未跟踪文件添加到归档"
1742
7e6630a7 1743#: archive.c:558 builtin/archive.c:88
a0b6b246
JX
1744msgid "write the archive to this file"
1745msgstr "归档写入此文件"
a77c07d9 1746
7e6630a7 1747#: archive.c:560
a0b6b246
JX
1748msgid "read .gitattributes in working directory"
1749msgstr "读取工作区中的 .gitattributes"
7ac1c0ad 1750
7e6630a7 1751#: archive.c:561
a0b6b246
JX
1752msgid "report archived files on stderr"
1753msgstr "在标准错误上报告归档文件"
7ac1c0ad 1754
7e6630a7 1755#: archive.c:563
d13389bf
JX
1756msgid "set compression level"
1757msgstr "设置压缩级别"
8ada9598 1758
7e6630a7 1759#: archive.c:566
a0b6b246
JX
1760msgid "list supported archive formats"
1761msgstr "列出支持的归档格式"
a77c07d9 1762
7e6630a7
FZ
1763#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
1764#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
a0b6b246
JX
1765msgid "repo"
1766msgstr "仓库"
c04f5ac3 1767
7e6630a7 1768#: archive.c:569 builtin/archive.c:90
a0b6b246
JX
1769msgid "retrieve the archive from remote repository <repo>"
1770msgstr "从远程仓库(<仓库>)提取归档文件"
8ada9598 1771
7e6630a7
FZ
1772#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
1773#: builtin/notes.c:496
a0b6b246
JX
1774msgid "command"
1775msgstr "命令"
1776
7e6630a7 1777#: archive.c:571 builtin/archive.c:92
a0b6b246
JX
1778msgid "path to the remote git-upload-archive command"
1779msgstr "远程 git-upload-archive 命令的路径"
1780
7e6630a7 1781#: archive.c:578
a0b6b246
JX
1782msgid "Unexpected option --remote"
1783msgstr "未知参数 --remote"
1784
7e6630a7 1785#: archive.c:580
a0b6b246
JX
1786msgid "Option --exec can only be used together with --remote"
1787msgstr "选项 --exec 只能和 --remote 同时使用"
1788
7e6630a7 1789#: archive.c:582
a0b6b246
JX
1790msgid "Unexpected option --output"
1791msgstr "未知参数 --output"
1792
7e6630a7 1793#: archive.c:584
d9488fea
JX
1794msgid "Options --add-file and --remote cannot be used together"
1795msgstr "选项 --add-file 和 --remote 不能同时使用"
1796
7e6630a7 1797#: archive.c:606
a0b6b246
JX
1798#, c-format
1799msgid "Unknown archive format '%s'"
1800msgstr "未知归档格式 '%s'"
1801
7e6630a7 1802#: archive.c:615
8ada9598 1803#, c-format
a0b6b246
JX
1804msgid "Argument not supported for format '%s': -%d"
1805msgstr "参数不支持此格式 '%s':-%d"
1806
7e6630a7 1807#: attr.c:203
87cb7997
JX
1808#, c-format
1809msgid "%.*s is not a valid attribute name"
1810msgstr "%.*s 不是一个有效的属性名"
1811
7e6630a7 1812#: attr.c:364
06991777
JX
1813#, c-format
1814msgid "%s not allowed: %s:%d"
5b533632 1815msgstr "不允许 %s:%s:%d"
06991777 1816
7e6630a7 1817#: attr.c:404
8ada9598 1818msgid ""
a0b6b246
JX
1819"Negative patterns are ignored in git attributes\n"
1820"Use '\\!' for literal leading exclamation."
8ada9598 1821msgstr ""
a0b6b246
JX
1822"负值模版在 git attributes 中被忽略\n"
1823"当字符串确实要以感叹号开始时,使用 '\\!'。"
8ada9598 1824
7e6630a7 1825#: bisect.c:488
8ada9598 1826#, c-format
a0b6b246
JX
1827msgid "Badly quoted content in file '%s': %s"
1828msgstr "文件 '%s' 包含错误的引用格式:%s"
8ada9598 1829
7e6630a7 1830#: bisect.c:698
a0b6b246
JX
1831#, c-format
1832msgid "We cannot bisect more!\n"
1833msgstr "我们无法进行更多的二分查找!\n"
8ada9598 1834
7e6630a7 1835#: bisect.c:764
2e8451e8 1836#, c-format
a0b6b246
JX
1837msgid "Not a valid commit name %s"
1838msgstr "不是一个有效的提交名 %s"
2e8451e8 1839
7e6630a7 1840#: bisect.c:789
5b04ee3b
JX
1841#, c-format
1842msgid ""
a0b6b246
JX
1843"The merge base %s is bad.\n"
1844"This means the bug has been fixed between %s and [%s].\n"
5b04ee3b 1845msgstr ""
a0b6b246
JX
1846"合并基线 %s 是坏的。\n"
1847"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
5b04ee3b 1848
7e6630a7 1849#: bisect.c:794
5b04ee3b 1850#, c-format
a0b6b246
JX
1851msgid ""
1852"The merge base %s is new.\n"
1853"The property has changed between %s and [%s].\n"
1854msgstr ""
1855"合并基线 %s 是新的。\n"
1856"介于 %s 和 [%s] 之间的属性已经被修改。\n"
5b04ee3b 1857
7e6630a7 1858#: bisect.c:799
a0b6b246
JX
1859#, c-format
1860msgid ""
1861"The merge base %s is %s.\n"
1862"This means the first '%s' commit is between %s and [%s].\n"
1863msgstr ""
1864"合并基线 %s 是 %s。\n"
1865"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
07432cef 1866
7e6630a7 1867#: bisect.c:807
a0b6b246
JX
1868#, c-format
1869msgid ""
1a79b2f1 1870"Some %s revs are not ancestors of the %s rev.\n"
a0b6b246
JX
1871"git bisect cannot work properly in this case.\n"
1872"Maybe you mistook %s and %s revs?\n"
1873msgstr ""
1874"一些 %s 版本不是 %s 版本的祖先。\n"
1875"这种情况下 git 二分查找无法正常工作。\n"
1876"您可能弄错了 %s 和 %s 版本?\n"
07432cef 1877
7e6630a7 1878#: bisect.c:820
a0b6b246
JX
1879#, c-format
1880msgid ""
1881"the merge base between %s and [%s] must be skipped.\n"
1882"So we cannot be sure the first %s commit is between %s and %s.\n"
1883"We continue anyway."
1884msgstr ""
1885"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1886"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1887"我们仍旧继续。"
649900bc 1888
7e6630a7 1889#: bisect.c:859
649900bc 1890#, c-format
a0b6b246
JX
1891msgid "Bisecting: a merge base must be tested\n"
1892msgstr "二分查找中:合并基线必须是经过测试的\n"
649900bc 1893
7e6630a7 1894#: bisect.c:909
a0b6b246
JX
1895#, c-format
1896msgid "a %s revision is needed"
1897msgstr "需要一个 %s 版本"
649900bc 1898
7e6630a7 1899#: bisect.c:939
649900bc 1900#, c-format
a0b6b246
JX
1901msgid "could not create file '%s'"
1902msgstr "不能创建文件 '%s'"
649900bc 1903
7e6630a7 1904#: bisect.c:985 builtin/merge.c:154
649900bc 1905#, c-format
a0b6b246
JX
1906msgid "could not read file '%s'"
1907msgstr "不能读取文件 '%s'"
649900bc 1908
7e6630a7 1909#: bisect.c:1025
a0b6b246
JX
1910msgid "reading bisect refs failed"
1911msgstr "读取二分查找引用失败"
649900bc 1912
7e6630a7 1913#: bisect.c:1055
649900bc 1914#, c-format
a0b6b246
JX
1915msgid "%s was both %s and %s\n"
1916msgstr "%s 同时为 %s 和 %s\n"
649900bc 1917
7e6630a7 1918#: bisect.c:1064
649900bc 1919#, c-format
a0b6b246
JX
1920msgid ""
1921"No testable commit found.\n"
473eb541 1922"Maybe you started with bad path arguments?\n"
a0b6b246
JX
1923msgstr ""
1924"没有发现可测试的提交。\n"
1925"可能您在运行时使用了错误的路径参数?\n"
649900bc 1926
7e6630a7 1927#: bisect.c:1093
649900bc 1928#, c-format
a0b6b246
JX
1929msgid "(roughly %d step)"
1930msgid_plural "(roughly %d steps)"
1931msgstr[0] "(大概 %d 步)"
1932msgstr[1] "(大概 %d 步)"
649900bc 1933
a4f16749
JX
1934#. TRANSLATORS: the last %s will be replaced with "(roughly %d
1935#. steps)" translation.
1936#.
7e6630a7 1937#: bisect.c:1099
649900bc 1938#, c-format
a0b6b246
JX
1939msgid "Bisecting: %d revision left to test after this %s\n"
1940msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1941msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1942msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
649900bc 1943
33b62fba 1944#: blame.c:2776
a4f16749
JX
1945msgid "--contents and --reverse do not blend well."
1946msgstr "--contents 和 --reverse 不能混用。"
1947
33b62fba 1948#: blame.c:2790
a4f16749
JX
1949msgid "cannot use --contents with final commit object name"
1950msgstr "不能将 --contents 和最终的提交对象名共用"
1951
33b62fba 1952#: blame.c:2811
a4f16749
JX
1953msgid "--reverse and --first-parent together require specified latest commit"
1954msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
1955
7e6630a7 1956#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
84bf71ea 1957#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
7e6630a7
FZ
1958#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
1959#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
1960#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
1961#: builtin/shortlog.c:255
a4f16749
JX
1962msgid "revision walk setup failed"
1963msgstr "版本遍历设置失败"
1964
33b62fba 1965#: blame.c:2838
a4f16749
JX
1966msgid ""
1967"--reverse --first-parent together require range along first-parent chain"
1968msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
1969
33b62fba 1970#: blame.c:2849
a4f16749
JX
1971#, c-format
1972msgid "no such path %s in %s"
1973msgstr "在 %2$s 中无此路径 %1$s"
1974
33b62fba 1975#: blame.c:2860
a4f16749
JX
1976#, c-format
1977msgid "cannot read blob %s for path %s"
1978msgstr "不能为路径 %2$s 读取数据对象 %1$s"
1979
d46c5519 1980#: branch.c:53
649900bc 1981#, c-format
a0b6b246
JX
1982msgid ""
1983"\n"
1984"After fixing the error cause you may try to fix up\n"
1985"the remote tracking information by invoking\n"
1986"\"git branch --set-upstream-to=%s%s%s\"."
1987msgstr ""
1988"\n"
1989"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
1990"\"git branch --set-upstream-to=%s%s%s\" 。"
649900bc 1991
d46c5519 1992#: branch.c:67
649900bc 1993#, c-format
a0b6b246
JX
1994msgid "Not setting branch %s as its own upstream."
1995msgstr "未设置分支 %s 作为它自己的上游。"
649900bc 1996
d46c5519 1997#: branch.c:93
649900bc 1998#, c-format
6937cb4e
JX
1999msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
2000msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 2001
d46c5519 2002#: branch.c:94
649900bc 2003#, c-format
6937cb4e
JX
2004msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
2005msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
649900bc 2006
d46c5519 2007#: branch.c:98
649900bc 2008#, c-format
6937cb4e
JX
2009msgid "Branch '%s' set up to track local branch '%s' by rebasing."
2010msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
649900bc 2011
d46c5519 2012#: branch.c:99
649900bc 2013#, c-format
6937cb4e 2014msgid "Branch '%s' set up to track local branch '%s'."
493a9322 2015msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
649900bc 2016
d46c5519 2017#: branch.c:104
649900bc 2018#, c-format
6937cb4e
JX
2019msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
2020msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
649900bc 2021
d46c5519 2022#: branch.c:105
649900bc 2023#, c-format
6937cb4e
JX
2024msgid "Branch '%s' set up to track remote ref '%s'."
2025msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
649900bc 2026
d46c5519 2027#: branch.c:109
649900bc 2028#, c-format
6937cb4e
JX
2029msgid "Branch '%s' set up to track local ref '%s' by rebasing."
2030msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
649900bc 2031
d46c5519 2032#: branch.c:110
649900bc 2033#, c-format
6937cb4e
JX
2034msgid "Branch '%s' set up to track local ref '%s'."
2035msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
649900bc 2036
d46c5519 2037#: branch.c:119
a0b6b246
JX
2038msgid "Unable to write upstream branch configuration"
2039msgstr "无法写入上游分支配置"
649900bc 2040
d46c5519 2041#: branch.c:156
649900bc 2042#, c-format
a0b6b246
JX
2043msgid "Not tracking: ambiguous information for ref %s"
2044msgstr "未跟踪:引用 %s 有歧义"
649900bc 2045
d46c5519 2046#: branch.c:189
649900bc 2047#, c-format
a0b6b246
JX
2048msgid "'%s' is not a valid branch name."
2049msgstr "'%s' 不是一个有效的分支名称。"
649900bc 2050
d46c5519 2051#: branch.c:208
649900bc 2052#, c-format
a0b6b246
JX
2053msgid "A branch named '%s' already exists."
2054msgstr "一个分支名 '%s' 已经存在。"
649900bc 2055
d46c5519 2056#: branch.c:213
a0b6b246
JX
2057msgid "Cannot force update the current branch."
2058msgstr "无法强制更新当前分支。"
649900bc 2059
d46c5519 2060#: branch.c:233
649900bc 2061#, c-format
a0b6b246
JX
2062msgid "Cannot setup tracking information; starting point '%s' is not a branch."
2063msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
649900bc 2064
d46c5519 2065#: branch.c:235
649900bc 2066#, c-format
a0b6b246
JX
2067msgid "the requested upstream branch '%s' does not exist"
2068msgstr "请求的上游分支 '%s' 不存在"
649900bc 2069
d46c5519 2070#: branch.c:237
a0b6b246
JX
2071msgid ""
2072"\n"
2073"If you are planning on basing your work on an upstream\n"
2074"branch that already exists at the remote, you may need to\n"
2075"run \"git fetch\" to retrieve it.\n"
2076"\n"
2077"If you are planning to push out a new local branch that\n"
2078"will track its remote counterpart, you may want to use\n"
2079"\"git push -u\" to set the upstream config as you push."
2080msgstr ""
2081"\n"
7e6630a7 2082"如果您正计划基于远程一个现存的上游分支开始您的工作,\n"
a0b6b246
JX
2083"您可能需要执行 \"git fetch\" 来获取分支。\n"
2084"\n"
2085"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
2086"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
649900bc 2087
d46c5519 2088#: branch.c:281
649900bc 2089#, c-format
a0b6b246
JX
2090msgid "Not a valid object name: '%s'."
2091msgstr "不是一个有效的对象名:'%s'。"
649900bc 2092
d46c5519 2093#: branch.c:301
649900bc 2094#, c-format
a0b6b246
JX
2095msgid "Ambiguous object name: '%s'."
2096msgstr "歧义的对象名:'%s'。"
649900bc 2097
d46c5519 2098#: branch.c:306
649900bc 2099#, c-format
a0b6b246
JX
2100msgid "Not a valid branch point: '%s'."
2101msgstr "无效的分支点:'%s'。"
649900bc 2102
33b62fba 2103#: branch.c:366
649900bc 2104#, c-format
a0b6b246
JX
2105msgid "'%s' is already checked out at '%s'"
2106msgstr "'%s' 已经检出到 '%s'"
649900bc 2107
33b62fba 2108#: branch.c:389
a0b6b246
JX
2109#, c-format
2110msgid "HEAD of working tree %s is not updated"
2111msgstr "工作区 %s 的 HEAD 指向没有被更新"
649900bc 2112
ec3d4607 2113#: bundle.c:44
d9488fea
JX
2114#, c-format
2115msgid "unrecognized bundle hash algorithm: %s"
2116msgstr "未能识别的归档包哈希算法:%s"
2117
ec3d4607 2118#: bundle.c:48
649900bc 2119#, c-format
d9488fea
JX
2120msgid "unknown capability '%s'"
2121msgstr "未知能力 '%s'"
649900bc 2122
ec3d4607 2123#: bundle.c:74
d9488fea
JX
2124#, c-format
2125msgid "'%s' does not look like a v2 or v3 bundle file"
2126msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件"
7157c2b5 2127
ec3d4607 2128#: bundle.c:113
a0b6b246
JX
2129#, c-format
2130msgid "unrecognized header: %s%s (%d)"
2131msgstr "未能识别的包头:%s%s (%d)"
649900bc 2132
84bf71ea 2133#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
7e6630a7 2134#: builtin/commit.c:862
649900bc 2135#, c-format
a0b6b246
JX
2136msgid "could not open '%s'"
2137msgstr "不能打开 '%s'"
649900bc 2138
ec3d4607 2139#: bundle.c:198
a0b6b246
JX
2140msgid "Repository lacks these prerequisite commits:"
2141msgstr "仓库中缺少这些必备的提交:"
649900bc 2142
ec3d4607 2143#: bundle.c:201
a6cd2cc4 2144msgid "need a repository to verify a bundle"
d9488fea 2145msgstr "需要一个仓库来校验一个归档包"
a6cd2cc4 2146
ec3d4607 2147#: bundle.c:257
2e8451e8 2148#, c-format
a0b6b246
JX
2149msgid "The bundle contains this ref:"
2150msgid_plural "The bundle contains these %d refs:"
d9488fea
JX
2151msgstr[0] "这个归档包中含有这个引用:"
2152msgstr[1] "这个归档包中含有 %d 个引用:"
2e8451e8 2153
ec3d4607 2154#: bundle.c:264
a0b6b246 2155msgid "The bundle records a complete history."
d9488fea 2156msgstr "这个归档包记录一个完整历史。"
2e8451e8 2157
ec3d4607 2158#: bundle.c:266
2e8451e8 2159#, c-format
a0b6b246
JX
2160msgid "The bundle requires this ref:"
2161msgid_plural "The bundle requires these %d refs:"
d9488fea
JX
2162msgstr[0] "这个归档包需要这个引用:"
2163msgstr[1] "这个归档包需要 %d 个引用:"
2e8451e8 2164
ec3d4607 2165#: bundle.c:333
4c27fcb5 2166msgid "unable to dup bundle descriptor"
d9488fea 2167msgstr "无法复制归档包描述符"
4c27fcb5 2168
ec3d4607 2169#: bundle.c:340
a0b6b246
JX
2170msgid "Could not spawn pack-objects"
2171msgstr "不能生成 pack-objects 进程"
1003b3a5 2172
ec3d4607 2173#: bundle.c:351
a0b6b246
JX
2174msgid "pack-objects died"
2175msgstr "pack-objects 终止"
8ada9598 2176
ec3d4607 2177#: bundle.c:400
81809b99 2178#, c-format
a0b6b246
JX
2179msgid "ref '%s' is excluded by the rev-list options"
2180msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 2181
ec3d4607 2182#: bundle.c:504
d9488fea
JX
2183#, c-format
2184msgid "unsupported bundle version %d"
2185msgstr "不支持的归档包版本 %d"
2186
ec3d4607 2187#: bundle.c:506
d9488fea
JX
2188#, c-format
2189msgid "cannot write bundle version %d with algorithm %s"
2190msgstr "不能写入,归档包版本 %d 不支持算法 %s"
2191
7e6630a7 2192#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
81809b99 2193#, c-format
a0b6b246
JX
2194msgid "unrecognized argument: %s"
2195msgstr "未能识别的参数:%s"
8ada9598 2196
ec3d4607 2197#: bundle.c:553
a0b6b246 2198msgid "Refusing to create empty bundle."
d9488fea 2199msgstr "不能创建空的归档包。"
a0b6b246 2200
ec3d4607 2201#: bundle.c:563
81809b99 2202#, c-format
a0b6b246
JX
2203msgid "cannot create '%s'"
2204msgstr "不能创建 '%s'"
8ada9598 2205
ec3d4607 2206#: bundle.c:588
a0b6b246
JX
2207msgid "index-pack died"
2208msgstr "index-pack 终止"
63af42fe 2209
ec3d4607 2210#: chunk-format.c:117
473eb541
JX
2211msgid "terminating chunk id appears earlier than expected"
2212msgstr "终止块 ID 比预期更早出现"
2213
ec3d4607 2214#: chunk-format.c:126
473eb541
JX
2215#, c-format
2216msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
2217msgstr "不正确的块偏移 %<PRIx64> 和 %<PRIx64>"
2218
ec3d4607 2219#: chunk-format.c:133
473eb541
JX
2220#, c-format
2221msgid "duplicate chunk ID %<PRIx32> found"
2222msgstr "发现重复的块ID %<PRIx32>"
2223
ec3d4607 2224#: chunk-format.c:147
473eb541
JX
2225#, c-format
2226msgid "final chunk has non-zero id %<PRIx32>"
2227msgstr "最终块有非零 ID %<PRIx32>"
2228
2b472aae 2229#: color.c:329
94550ed3 2230#, c-format
a0b6b246
JX
2231msgid "invalid color value: %.*s"
2232msgstr "无效的颜色值:%.*s"
94550ed3 2233
7e6630a7 2234#: commit-graph.c:204 midx.c:51
d9488fea
JX
2235msgid "invalid hash version"
2236msgstr "无效的哈希版本"
2237
33b62fba 2238#: commit-graph.c:262
d46c5519
JX
2239msgid "commit-graph file is too small"
2240msgstr "提交图形文件太小"
c1ac5258 2241
33b62fba 2242#: commit-graph.c:355
c1ac5258 2243#, c-format
d46c5519
JX
2244msgid "commit-graph signature %X does not match signature %X"
2245msgstr "提交图形签名 %X 和签名 %X 不匹配"
c1ac5258 2246
33b62fba 2247#: commit-graph.c:362
c1ac5258 2248#, c-format
d46c5519
JX
2249msgid "commit-graph version %X does not match version %X"
2250msgstr "提交图形版本 %X 和版本 %X 不匹配"
c1ac5258 2251
33b62fba 2252#: commit-graph.c:369
c1ac5258 2253#, c-format
d46c5519
JX
2254msgid "commit-graph hash version %X does not match version %X"
2255msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
c1ac5258 2256
33b62fba 2257#: commit-graph.c:386
d9488fea
JX
2258#, c-format
2259msgid "commit-graph file is too small to hold %u chunks"
2260msgstr "提交图形文件太小,容不下 %u 个块"
06991777 2261
33b62fba 2262#: commit-graph.c:482
a6cd2cc4
JX
2263msgid "commit-graph has no base graphs chunk"
2264msgstr "提交图形没有基础图形块"
2265
33b62fba 2266#: commit-graph.c:492
a6cd2cc4
JX
2267msgid "commit-graph chain does not match"
2268msgstr "提交图形链不匹配"
2269
33b62fba 2270#: commit-graph.c:540
a6cd2cc4
JX
2271#, c-format
2272msgid "invalid commit-graph chain: line '%s' not a hash"
2273msgstr "无效的提交图形链:行 '%s' 不是一个哈希值"
2274
33b62fba 2275#: commit-graph.c:564
a6cd2cc4
JX
2276msgid "unable to find all commit-graph files"
2277msgstr "无法找到所有提交图形文件"
2278
7e6630a7 2279#: commit-graph.c:746 commit-graph.c:783
a6cd2cc4
JX
2280msgid "invalid commit position. commit-graph is likely corrupt"
2281msgstr "无效的提交位置。提交图形可能已损坏"
2282
7e6630a7 2283#: commit-graph.c:767
c1ac5258
JX
2284#, c-format
2285msgid "could not find commit %s"
2286msgstr "无法找到提交 %s"
2287
7e6630a7 2288#: commit-graph.c:800
473eb541
JX
2289msgid "commit-graph requires overflow generation data but has none"
2290msgstr "提交图需要溢出世代数据,但是没有"
2291
7e6630a7 2292#: commit-graph.c:1105 builtin/am.c:1342
a5cd71ca
JX
2293#, c-format
2294msgid "unable to parse commit %s"
2295msgstr "不能解析提交 %s"
2296
7e6630a7 2297#: commit-graph.c:1367 builtin/pack-objects.c:3070
c1ac5258
JX
2298#, c-format
2299msgid "unable to get type of object %s"
2300msgstr "无法获得对象 %s 类型"
2301
7e6630a7 2302#: commit-graph.c:1398
06991777
JX
2303msgid "Loading known commits in commit graph"
2304msgstr "正在加载提交图中的已知提交"
2305
7e6630a7 2306#: commit-graph.c:1415
06991777
JX
2307msgid "Expanding reachable commits in commit graph"
2308msgstr "正在扩展提交图中的可达提交"
2309
7e6630a7 2310#: commit-graph.c:1435
06991777
JX
2311msgid "Clearing commit marks in commit graph"
2312msgstr "正在清除提交图中的提交标记"
4c27fcb5 2313
7e6630a7 2314#: commit-graph.c:1454
473eb541
JX
2315msgid "Computing commit graph topological levels"
2316msgstr "正在计算提交图拓扑级别"
2317
7e6630a7 2318#: commit-graph.c:1507
4c27fcb5
JX
2319msgid "Computing commit graph generation numbers"
2320msgstr "正在计算提交图世代数字"
2321
7e6630a7 2322#: commit-graph.c:1588
349ede6a 2323msgid "Computing commit changed paths Bloom filters"
d9488fea 2324msgstr "计算提交变更路径的布隆过滤器"
349ede6a 2325
7e6630a7 2326#: commit-graph.c:1665
7157c2b5
JX
2327msgid "Collecting referenced commits"
2328msgstr "正在收集引用的提交"
2329
7e6630a7 2330#: commit-graph.c:1690
06991777
JX
2331#, c-format
2332msgid "Finding commits for commit graph in %d pack"
2333msgid_plural "Finding commits for commit graph in %d packs"
2334msgstr[0] "正在 %d 个包中查找提交图的提交"
2335msgstr[1] "正在 %d 个包中查找提交图的提交"
4c27fcb5 2336
7e6630a7 2337#: commit-graph.c:1703
c1ac5258
JX
2338#, c-format
2339msgid "error adding pack %s"
2340msgstr "添加包 %s 出错"
2341
7e6630a7 2342#: commit-graph.c:1707
c1ac5258
JX
2343#, c-format
2344msgid "error opening index for %s"
2345msgstr "为 %s 打开索引出错"
2346
7e6630a7 2347#: commit-graph.c:1744
06991777
JX
2348msgid "Finding commits for commit graph among packed objects"
2349msgstr "正在打包对象中查找提交图的提交"
2350
7e6630a7 2351#: commit-graph.c:1762
06991777 2352msgid "Finding extra edges in commit graph"
8e4e0555 2353msgstr "正在查找提交图中额外的边"
06991777 2354
7e6630a7 2355#: commit-graph.c:1811
a6cd2cc4
JX
2356msgid "failed to write correct number of base graph ids"
2357msgstr "无法写入正确数量的基础图形 ID"
fd8cb379 2358
7e6630a7 2359#: commit-graph.c:1842 midx.c:1146
fd8cb379 2360#, c-format
c1ac5258
JX
2361msgid "unable to create leading directories of %s"
2362msgstr "不能为 %s 创建先导目录"
2363
7e6630a7 2364#: commit-graph.c:1855
349ede6a
JX
2365msgid "unable to create temporary graph layer"
2366msgstr "无法创建临时图层"
2367
7e6630a7 2368#: commit-graph.c:1860
a6cd2cc4 2369#, c-format
349ede6a
JX
2370msgid "unable to adjust shared permissions for '%s'"
2371msgstr "无法为 '%s' 调整共享权限"
a6cd2cc4 2372
7e6630a7 2373#: commit-graph.c:1917
06991777
JX
2374#, c-format
2375msgid "Writing out commit graph in %d pass"
2376msgid_plural "Writing out commit graph in %d passes"
8e4e0555
FZ
2377msgstr[0] "正在用 %d 步写出提交图"
2378msgstr[1] "正在用 %d 步写出提交图"
06991777 2379
7e6630a7 2380#: commit-graph.c:1953
a6cd2cc4
JX
2381msgid "unable to open commit-graph chain file"
2382msgstr "无法打开提交图形链文件"
2383
7e6630a7 2384#: commit-graph.c:1969
a6cd2cc4
JX
2385msgid "failed to rename base commit-graph file"
2386msgstr "无法重命名基础提交图形文件"
2387
7e6630a7 2388#: commit-graph.c:1989
a6cd2cc4
JX
2389msgid "failed to rename temporary commit-graph file"
2390msgstr "无法重命名临时提交图形文件"
2391
7e6630a7 2392#: commit-graph.c:2122
a6cd2cc4
JX
2393msgid "Scanning merged commits"
2394msgstr "正在扫描合并提交"
2395
7e6630a7 2396#: commit-graph.c:2166
a6cd2cc4
JX
2397msgid "Merging commit-graph"
2398msgstr "正在合并提交图形"
2399
7e6630a7 2400#: commit-graph.c:2274
d13389bf
JX
2401msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
2402msgstr "正尝试写提交图,但是 'core.commitGraph' 被禁用"
a6cd2cc4 2403
7e6630a7 2404#: commit-graph.c:2381
a6cd2cc4
JX
2405msgid "too many commits to write graph"
2406msgstr "提交太多不能画图"
2407
7e6630a7 2408#: commit-graph.c:2479
c1ac5258 2409msgid "the commit-graph file has incorrect checksum and is likely corrupt"
4c27fcb5
JX
2410msgstr "提交图文件的校验码错误,可能已经损坏"
2411
7e6630a7 2412#: commit-graph.c:2489
d46c5519
JX
2413#, c-format
2414msgid "commit-graph has incorrect OID order: %s then %s"
5b533632 2415msgstr "提交图形的对象 ID 顺序不正确:%s 然后 %s"
d46c5519 2416
7e6630a7 2417#: commit-graph.c:2499 commit-graph.c:2514
d46c5519
JX
2418#, c-format
2419msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2420msgstr "提交图形有不正确的扇出值:fanout[%d] = %u != %u"
2421
7e6630a7 2422#: commit-graph.c:2506
d46c5519
JX
2423#, c-format
2424msgid "failed to parse commit %s from commit-graph"
2425msgstr "无法从提交图形中解析提交 %s"
2426
7e6630a7 2427#: commit-graph.c:2524
4c27fcb5 2428msgid "Verifying commits in commit graph"
8e4e0555 2429msgstr "正在校验提交图中的提交"
fd8cb379 2430
7e6630a7 2431#: commit-graph.c:2539
d46c5519
JX
2432#, c-format
2433msgid "failed to parse commit %s from object database for commit-graph"
2434msgstr "无法从提交图形的对象库中解析提交 %s"
2435
7e6630a7 2436#: commit-graph.c:2546
d46c5519
JX
2437#, c-format
2438msgid "root tree OID for commit %s in commit-graph is %s != %s"
5b533632 2439msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
d46c5519 2440
7e6630a7 2441#: commit-graph.c:2556
d46c5519
JX
2442#, c-format
2443msgid "commit-graph parent list for commit %s is too long"
2444msgstr "提交 %s 的提交图形父提交列表太长了"
2445
7e6630a7 2446#: commit-graph.c:2565
d46c5519
JX
2447#, c-format
2448msgid "commit-graph parent for %s is %s != %s"
2449msgstr "%s 的提交图形父提交是 %s != %s"
2450
7e6630a7 2451#: commit-graph.c:2579
d46c5519
JX
2452#, c-format
2453msgid "commit-graph parent list for commit %s terminates early"
2454msgstr "提交 %s 的提交图形父提交列表过早终止"
2455
7e6630a7 2456#: commit-graph.c:2584
d46c5519
JX
2457#, c-format
2458msgid ""
2459"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2460msgstr "提交图形中提交 %s 的世代号是零,但其它地方非零"
2461
7e6630a7 2462#: commit-graph.c:2588
d46c5519
JX
2463#, c-format
2464msgid ""
2465"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2466msgstr "提交图形中提交 %s 的世代号非零,但其它地方是零"
2467
7e6630a7 2468#: commit-graph.c:2605
d46c5519 2469#, c-format
473eb541
JX
2470msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
2471msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"
d46c5519 2472
7e6630a7 2473#: commit-graph.c:2611
d46c5519
JX
2474#, c-format
2475msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2476msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
2477
84bf71ea 2478#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
7e6630a7 2479#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
349ede6a
JX
2480#, c-format
2481msgid "could not parse %s"
2482msgstr "不能解析 %s"
2483
7e6630a7 2484#: commit.c:55
349ede6a
JX
2485#, c-format
2486msgid "%s %s is not a commit!"
2487msgstr "%s %s 不是一个提交!"
2488
7e6630a7 2489#: commit.c:196
349ede6a
JX
2490msgid ""
2491"Support for <GIT_DIR>/info/grafts is deprecated\n"
2492"and will be removed in a future Git version.\n"
2493"\n"
2494"Please use \"git replace --convert-graft-file\"\n"
2495"to convert the grafts into replace refs.\n"
2496"\n"
2497"Turn this message off by running\n"
2498"\"git config advice.graftFileDeprecated false\""
2499msgstr ""
2500"对 <GIT_DIR>/info/grafts 的支持已过时,并将在\n"
2501"未来的Git版本中被移除。\n"
2502"\n"
2503"请使用 \"git replace --convert-graft-file\" 将\n"
2504"grafts 转换为替换引用。\n"
2505"\n"
2506"设置 \"git config advice.graftFileDeprecated false\"\n"
2507"可关闭本消息"
2508
7e6630a7 2509#: commit.c:1239
349ede6a
JX
2510#, c-format
2511msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2512msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
2513
7e6630a7 2514#: commit.c:1243
349ede6a
JX
2515#, c-format
2516msgid "Commit %s has a bad GPG signature allegedly by %s."
2517msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
2518
7e6630a7 2519#: commit.c:1246
349ede6a
JX
2520#, c-format
2521msgid "Commit %s does not have a GPG signature."
2522msgstr "提交 %s 没有 GPG 签名。"
2523
7e6630a7 2524#: commit.c:1249
349ede6a
JX
2525#, c-format
2526msgid "Commit %s has a good GPG signature by %s\n"
2527msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
2528
7e6630a7 2529#: commit.c:1503
349ede6a
JX
2530msgid ""
2531"Warning: commit message did not conform to UTF-8.\n"
2532"You may want to amend it after fixing the message, or set the config\n"
2533"variable i18n.commitencoding to the encoding your project uses.\n"
2534msgstr ""
2535"警告:提交说明不符合 UTF-8 字符编码。\n"
2536"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
2537"设置为您项目所用的字符编码。\n"
2538
06991777 2539#: compat/obstack.c:406 compat/obstack.c:408
a0b6b246
JX
2540msgid "memory exhausted"
2541msgstr "内存耗尽"
90314792 2542
7e6630a7 2543#: config.c:125
c1ac5258
JX
2544#, c-format
2545msgid ""
2546"exceeded maximum include depth (%d) while including\n"
2547"\t%s\n"
2548"from\n"
2549"\t%s\n"
2550"This might be due to circular includes."
2551msgstr ""
e640d114 2552"超过了最大包含深度(%1$d),当从\n"
c1ac5258
JX
2553"\t%3$s\n"
2554"包含\n"
2555"\t%2$s\n"
e640d114 2556"这可能是因为循环包含。"
c1ac5258 2557
7e6630a7 2558#: config.c:141
c1ac5258
JX
2559#, c-format
2560msgid "could not expand include path '%s'"
2561msgstr "无法扩展包含路径 '%s'"
2562
7e6630a7 2563#: config.c:152
c1ac5258
JX
2564msgid "relative config includes must come from files"
2565msgstr "相对路径的配置文件引用必须来自于文件"
2566
7e6630a7 2567#: config.c:201
87cb7997 2568msgid "relative config include conditionals must come from files"
c1ac5258
JX
2569msgstr "相对路径的配置文件条件引用必须来自于文件"
2570
7e6630a7 2571#: config.c:398
473eb541
JX
2572#, c-format
2573msgid "invalid config format: %s"
2574msgstr "无效的配置格式:%s"
2575
7e6630a7 2576#: config.c:402
473eb541
JX
2577#, c-format
2578msgid "missing environment variable name for configuration '%.*s'"
2579msgstr "配置 '%.*s' 缺少环境变量名称"
2580
7e6630a7 2581#: config.c:407
473eb541
JX
2582#, c-format
2583msgid "missing environment variable '%s' for configuration '%.*s'"
2584msgstr "缺少环境变量 '%s' 于配置 '%.*s' "
2585
7e6630a7 2586#: config.c:443
c1ac5258
JX
2587#, c-format
2588msgid "key does not contain a section: %s"
2589msgstr "键名没有包含一个小节名称:%s"
87cb7997 2590
473eb541 2591#: config.c:448
c1ac5258
JX
2592#, c-format
2593msgid "key does not contain variable name: %s"
2594msgstr "键名没有包含变量名:%s"
2595
84bf71ea 2596#: config.c:470 sequencer.c:2804
c1ac5258
JX
2597#, c-format
2598msgid "invalid key: %s"
2599msgstr "无效键名:%s"
2600
7e6630a7 2601#: config.c:475
c1ac5258
JX
2602#, c-format
2603msgid "invalid key (newline): %s"
2604msgstr "无效键名(有换行符):%s"
2605
7e6630a7 2606#: config.c:495
473eb541
JX
2607msgid "empty config key"
2608msgstr "空的配置键名"
2609
7e6630a7 2610#: config.c:513 config.c:525
c1ac5258
JX
2611#, c-format
2612msgid "bogus config parameter: %s"
2613msgstr "伪配置参数:%s"
2614
7e6630a7 2615#: config.c:539 config.c:556 config.c:563 config.c:572
c1ac5258
JX
2616#, c-format
2617msgid "bogus format in %s"
2618msgstr "%s 中格式错误"
2619
7e6630a7 2620#: config.c:606
473eb541
JX
2621#, c-format
2622msgid "bogus count in %s"
2623msgstr "%s 中错误计数"
2624
7e6630a7 2625#: config.c:610
473eb541
JX
2626#, c-format
2627msgid "too many entries in %s"
2628msgstr "%s 中太多的条目"
2629
7e6630a7 2630#: config.c:620
473eb541
JX
2631#, c-format
2632msgid "missing config key %s"
2633msgstr "缺失配置键名 %s"
2634
7e6630a7 2635#: config.c:628
473eb541
JX
2636#, c-format
2637msgid "missing config value %s"
2638msgstr "缺失配置取值 %s"
2639
7e6630a7 2640#: config.c:979
90314792 2641#, c-format
a0b6b246
JX
2642msgid "bad config line %d in blob %s"
2643msgstr "数据对象 %2$s 中错误的配置行 %1$d"
90314792 2644
7e6630a7 2645#: config.c:983
a77c07d9 2646#, c-format
a0b6b246
JX
2647msgid "bad config line %d in file %s"
2648msgstr "文件 %2$s 中错误的配置行 %1$d"
a77c07d9 2649
7e6630a7 2650#: config.c:987
a77c07d9 2651#, c-format
a0b6b246
JX
2652msgid "bad config line %d in standard input"
2653msgstr "标准输入中错误的配置行 %d"
a77c07d9 2654
7e6630a7 2655#: config.c:991
90314792 2656#, c-format
a0b6b246
JX
2657msgid "bad config line %d in submodule-blob %s"
2658msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
90314792 2659
7e6630a7 2660#: config.c:995
90314792 2661#, c-format
a0b6b246
JX
2662msgid "bad config line %d in command line %s"
2663msgstr "命令行 %2$s 中错误的配置行 %1$d"
90314792 2664
7e6630a7 2665#: config.c:999
90314792 2666#, c-format
a0b6b246
JX
2667msgid "bad config line %d in %s"
2668msgstr "在 %2$s 中错误的配置行 %1$d"
220c313c 2669
7e6630a7 2670#: config.c:1136
a0b6b246
JX
2671msgid "out of range"
2672msgstr "超出范围"
6c94aba5 2673
7e6630a7 2674#: config.c:1136
a0b6b246
JX
2675msgid "invalid unit"
2676msgstr "无效的单位"
6c94aba5 2677
7e6630a7 2678#: config.c:1137
6c94aba5 2679#, c-format
a0b6b246
JX
2680msgid "bad numeric config value '%s' for '%s': %s"
2681msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
6c94aba5 2682
7e6630a7 2683#: config.c:1147
1b7f4a34 2684#, c-format
a0b6b246
JX
2685msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
2686msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 2687
7e6630a7 2688#: config.c:1150
1b7f4a34 2689#, c-format
a0b6b246
JX
2690msgid "bad numeric config value '%s' for '%s' in file %s: %s"
2691msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 2692
7e6630a7 2693#: config.c:1153
1b7f4a34 2694#, c-format
a0b6b246
JX
2695msgid "bad numeric config value '%s' for '%s' in standard input: %s"
2696msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
1b7f4a34 2697
7e6630a7 2698#: config.c:1156
1b7f4a34 2699#, c-format
a0b6b246
JX
2700msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
2701msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 2702
7e6630a7 2703#: config.c:1159
94550ed3 2704#, c-format
a0b6b246
JX
2705msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
2706msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 2707
7e6630a7 2708#: config.c:1162
276ceeaa 2709#, c-format
a0b6b246
JX
2710msgid "bad numeric config value '%s' for '%s' in %s: %s"
2711msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 2712
7e6630a7 2713#: config.c:1241
473eb541
JX
2714#, c-format
2715msgid "bad boolean config value '%s' for '%s'"
2716msgstr "'%2$s' 的错误的布尔取值 '%1$s'"
2717
7e6630a7 2718#: config.c:1259
276ceeaa 2719#, c-format
a0b6b246 2720msgid "failed to expand user dir in: '%s'"
c1ac5258 2721msgstr "无法扩展用户目录:'%s'"
94550ed3 2722
7e6630a7 2723#: config.c:1268
5809aa05
JX
2724#, c-format
2725msgid "'%s' for '%s' is not a valid timestamp"
2726msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
2727
7e6630a7 2728#: config.c:1361
c1ac5258
JX
2729#, c-format
2730msgid "abbrev length out of range: %d"
2731msgstr "缩写长度超出范围:%d"
2732
7e6630a7 2733#: config.c:1375 config.c:1386
3495628d 2734#, c-format
a0b6b246
JX
2735msgid "bad zlib compression level %d"
2736msgstr "错误的 zlib 压缩级别 %d"
3495628d 2737
7e6630a7 2738#: config.c:1476
c1ac5258
JX
2739msgid "core.commentChar should only be one character"
2740msgstr "core.commentChar 应该是一个字符"
2741
7e6630a7 2742#: config.c:1509
3495628d 2743#, c-format
a0b6b246
JX
2744msgid "invalid mode for object creation: %s"
2745msgstr "无效的对象创建模式:%s"
3495628d 2746
7e6630a7 2747#: config.c:1581
c1ac5258
JX
2748#, c-format
2749msgid "malformed value for %s"
2750msgstr "%s 的取值格式错误"
2751
7e6630a7 2752#: config.c:1607
c1ac5258
JX
2753#, c-format
2754msgid "malformed value for %s: %s"
2755msgstr "%s 的取值格式错误:%s"
2756
7e6630a7 2757#: config.c:1608
c1ac5258
JX
2758msgid "must be one of nothing, matching, simple, upstream or current"
2759msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current"
2760
7e6630a7 2761#: config.c:1669 builtin/pack-objects.c:4053
1a79b2f1
JX
2762#, c-format
2763msgid "bad pack compression level %d"
2764msgstr "错误的打包压缩级别 %d"
2765
7e6630a7 2766#: config.c:1792
c1ac5258
JX
2767#, c-format
2768msgid "unable to load config blob object '%s'"
2769msgstr "无法从数据对象 '%s' 加载配置"
2770
7e6630a7 2771#: config.c:1795
c1ac5258
JX
2772#, c-format
2773msgid "reference '%s' does not point to a blob"
2774msgstr "引用 '%s' 没有指向一个数据对象"
2775
7e6630a7 2776#: config.c:1813
c1ac5258
JX
2777#, c-format
2778msgid "unable to resolve config blob '%s'"
2779msgstr "不能解析配置对象 '%s'"
2780
7e6630a7 2781#: config.c:1858
c1ac5258
JX
2782#, c-format
2783msgid "failed to parse %s"
2784msgstr "解析 %s 失败"
2785
7e6630a7 2786#: config.c:1914
a0b6b246
JX
2787msgid "unable to parse command-line config"
2788msgstr "无法解析命令行中的配置"
94550ed3 2789
7e6630a7 2790#: config.c:2282
a0b6b246
JX
2791msgid "unknown error occurred while reading the configuration files"
2792msgstr "在读取配置文件时遇到未知错误"
94550ed3 2793
7e6630a7 2794#: config.c:2456
87cb7997
JX
2795#, c-format
2796msgid "Invalid %s: '%s'"
2797msgstr "无效 %s:'%s'"
2798
7e6630a7 2799#: config.c:2501
87cb7997
JX
2800#, c-format
2801msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2802msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
2803
7e6630a7 2804#: config.c:2547
276ceeaa 2805#, c-format
a0b6b246
JX
2806msgid "unable to parse '%s' from command-line config"
2807msgstr "无法解析命令行配置中的 '%s'"
1b7f4a34 2808
7e6630a7 2809#: config.c:2549
94550ed3 2810#, c-format
a0b6b246
JX
2811msgid "bad config variable '%s' in file '%s' at line %d"
2812msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
94550ed3 2813
7e6630a7 2814#: config.c:2633
c1ac5258
JX
2815#, c-format
2816msgid "invalid section name '%s'"
2817msgstr "无效的小节名称 '%s'"
2818
7e6630a7 2819#: config.c:2665
276ceeaa 2820#, c-format
a0b6b246
JX
2821msgid "%s has multiple values"
2822msgstr "%s 有多个取值"
276ceeaa 2823
7e6630a7 2824#: config.c:2694
c1ac5258
JX
2825#, c-format
2826msgid "failed to write new configuration file %s"
2827msgstr "写入新的配置文件 %s 失败"
2828
7e6630a7 2829#: config.c:2946 config.c:3273
c1ac5258
JX
2830#, c-format
2831msgid "could not lock config file %s"
2832msgstr "不能锁定配置文件 %s"
2833
7e6630a7 2834#: config.c:2957
c1ac5258
JX
2835#, c-format
2836msgid "opening %s"
2837msgstr "打开 %s"
2838
7e6630a7 2839#: config.c:2994 builtin/config.c:361
c1ac5258
JX
2840#, c-format
2841msgid "invalid pattern: %s"
2842msgstr "无效模式:%s"
2843
7e6630a7 2844#: config.c:3019
c1ac5258
JX
2845#, c-format
2846msgid "invalid config file %s"
2847msgstr "无效的配置文件 %s"
2848
7e6630a7 2849#: config.c:3032 config.c:3286
1a79b2f1
JX
2850#, c-format
2851msgid "fstat on %s failed"
65e2041e 2852msgstr "对 %s 调用 fstat 失败"
1a79b2f1 2853
7e6630a7 2854#: config.c:3043
c1ac5258 2855#, c-format
ec3d4607
JX
2856msgid "unable to mmap '%s'%s"
2857msgstr "不能 mmap '%s'%s"
c1ac5258 2858
7e6630a7 2859#: config.c:3053 config.c:3291
c1ac5258
JX
2860#, c-format
2861msgid "chmod on %s failed"
2862msgstr "对 %s 调用 chmod 失败"
2863
7e6630a7 2864#: config.c:3138 config.c:3388
c1ac5258
JX
2865#, c-format
2866msgid "could not write config file %s"
2867msgstr "不能写入配置文件 %s"
2868
7e6630a7 2869#: config.c:3172
94550ed3 2870#, c-format
a0b6b246
JX
2871msgid "could not set '%s' to '%s'"
2872msgstr "不能设置 '%s' 为 '%s'"
94550ed3 2873
7e6630a7 2874#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
276ceeaa 2875#, c-format
a0b6b246
JX
2876msgid "could not unset '%s'"
2877msgstr "不能取消设置 '%s'"
276ceeaa 2878
7e6630a7 2879#: config.c:3264
c1ac5258
JX
2880#, c-format
2881msgid "invalid section name: %s"
2882msgstr "无效的小节名称:%s"
2883
7e6630a7 2884#: config.c:3431
c1ac5258
JX
2885#, c-format
2886msgid "missing value for '%s'"
2887msgstr "%s 的取值缺失"
2888
fd8cb379 2889#: connect.c:61
c1ac5258
JX
2890msgid "the remote end hung up upon initial contact"
2891msgstr "远端在初始连接时即挂断"
94550ed3 2892
fd8cb379 2893#: connect.c:63
a0b6b246
JX
2894msgid ""
2895"Could not read from remote repository.\n"
2896"\n"
2897"Please make sure you have the correct access rights\n"
2898"and the repository exists."
2899msgstr ""
2900"无法读取远程仓库。\n"
2901"\n"
2902"请确认您有正确的访问权限并且仓库存在。"
2903
c1ac5258
JX
2904#: connect.c:81
2905#, c-format
2906msgid "server doesn't support '%s'"
2907msgstr "服务器不支持 '%s'"
2908
7157c2b5 2909#: connect.c:118
c1ac5258
JX
2910#, c-format
2911msgid "server doesn't support feature '%s'"
2912msgstr "服务器不支持特性 '%s'"
2913
7157c2b5 2914#: connect.c:129
c1ac5258
JX
2915msgid "expected flush after capabilities"
2916msgstr "在能力之后应为一个 flush 包"
2917
7e6630a7 2918#: connect.c:265
c1ac5258
JX
2919#, c-format
2920msgid "ignoring capabilities after first line '%s'"
e640d114 2921msgstr "忽略第一行 '%s' 之后的能力字段"
c1ac5258 2922
7e6630a7 2923#: connect.c:286
c1ac5258
JX
2924msgid "protocol error: unexpected capabilities^{}"
2925msgstr "协议错误:意外的 capabilities^{}"
2926
7e6630a7 2927#: connect.c:308
c1ac5258
JX
2928#, c-format
2929msgid "protocol error: expected shallow sha-1, got '%s'"
2930msgstr "协议错误:预期浅克隆 sha-1,却得到 '%s'"
2931
7e6630a7 2932#: connect.c:310
c1ac5258
JX
2933msgid "repository on the other end cannot be shallow"
2934msgstr "另一端的仓库不能是浅克隆仓库"
2935
7e6630a7 2936#: connect.c:349
c1ac5258
JX
2937msgid "invalid packet"
2938msgstr "无效数据包"
2939
7e6630a7 2940#: connect.c:369
c1ac5258
JX
2941#, c-format
2942msgid "protocol error: unexpected '%s'"
2943msgstr "协议错误:意外的 '%s'"
2944
7e6630a7 2945#: connect.c:499
7157c2b5
JX
2946#, c-format
2947msgid "unknown object format '%s' specified by server"
2948msgstr "服务器给出未知的对象格式 '%s'"
2949
7e6630a7 2950#: connect.c:528
c1ac5258
JX
2951#, c-format
2952msgid "invalid ls-refs response: %s"
2953msgstr "无效的 ls-refs 响应:%s"
2954
7e6630a7 2955#: connect.c:532
c1ac5258
JX
2956msgid "expected flush after ref listing"
2957msgstr "在引用列表之后应该有一个 flush 包"
2958
7e6630a7 2959#: connect.c:535
7157c2b5
JX
2960msgid "expected response end packet after ref listing"
2961msgstr "在引用列表之后应该有响应结束包"
2962
7e6630a7 2963#: connect.c:670
c1ac5258
JX
2964#, c-format
2965msgid "protocol '%s' is not supported"
2966msgstr "不支持 '%s' 协议"
2967
7e6630a7 2968#: connect.c:721
c1ac5258
JX
2969msgid "unable to set SO_KEEPALIVE on socket"
2970msgstr "无法为 socket 设置 SO_KEEPALIVE"
2971
7e6630a7 2972#: connect.c:761 connect.c:824
c1ac5258
JX
2973#, c-format
2974msgid "Looking up %s ... "
2975msgstr "查找 %s ..."
2976
7e6630a7 2977#: connect.c:765
c1ac5258
JX
2978#, c-format
2979msgid "unable to look up %s (port %s) (%s)"
2980msgstr "无法查找 %s(端口 %s)(%s)"
2981
2982#. TRANSLATORS: this is the end of "Looking up %s ... "
7e6630a7 2983#: connect.c:769 connect.c:840
c1ac5258
JX
2984#, c-format
2985msgid ""
2986"done.\n"
2987"Connecting to %s (port %s) ... "
2988msgstr ""
2989"完成。\n"
2990"连接到 %s(端口 %s)... "
2991
7e6630a7 2992#: connect.c:791 connect.c:868
c1ac5258
JX
2993#, c-format
2994msgid ""
2995"unable to connect to %s:\n"
2996"%s"
2997msgstr ""
2998"无法连接到 %s:\n"
2999"%s"
3000
3001#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
7e6630a7 3002#: connect.c:797 connect.c:874
c1ac5258
JX
3003msgid "done."
3004msgstr "完成。"
3005
7e6630a7 3006#: connect.c:828
c1ac5258
JX
3007#, c-format
3008msgid "unable to look up %s (%s)"
3009msgstr "无法查找 %s(%s)"
3010
7e6630a7 3011#: connect.c:834
c1ac5258
JX
3012#, c-format
3013msgid "unknown port %s"
3014msgstr "未知端口 %s"
3015
7e6630a7 3016#: connect.c:971 connect.c:1303
c1ac5258
JX
3017#, c-format
3018msgid "strange hostname '%s' blocked"
3019msgstr "已阻止奇怪的主机名 '%s'"
3020
7e6630a7 3021#: connect.c:973
c1ac5258
JX
3022#, c-format
3023msgid "strange port '%s' blocked"
3024msgstr "已阻止奇怪的端口号 '%s'"
3025
7e6630a7 3026#: connect.c:983
c1ac5258
JX
3027#, c-format
3028msgid "cannot start proxy %s"
3029msgstr "不能启动代理 %s"
3030
7e6630a7 3031#: connect.c:1054
c1ac5258
JX
3032msgid "no path specified; see 'git help pull' for valid url syntax"
3033msgstr "未指定路径,执行 'git help pull' 查看有效的 url 语法"
3034
7e6630a7 3035#: connect.c:1194
473eb541
JX
3036msgid "newline is forbidden in git:// hosts and repo paths"
3037msgstr "在 git:// 主机和仓库路径中禁止使用换行符"
3038
7e6630a7 3039#: connect.c:1251
c1ac5258
JX
3040msgid "ssh variant 'simple' does not support -4"
3041msgstr "ssh 变体 'simple' 不支持 -4"
3042
7e6630a7 3043#: connect.c:1263
c1ac5258
JX
3044msgid "ssh variant 'simple' does not support -6"
3045msgstr "ssh 变体 'simple' 不支持 -6"
3046
7e6630a7 3047#: connect.c:1280
c1ac5258 3048msgid "ssh variant 'simple' does not support setting port"
e640d114 3049msgstr "ssh 变体 'simple' 不支持设置端口"
c1ac5258 3050
7e6630a7 3051#: connect.c:1392
c1ac5258
JX
3052#, c-format
3053msgid "strange pathname '%s' blocked"
3054msgstr "已阻止奇怪的路径名 '%s'"
3055
7e6630a7 3056#: connect.c:1440
c1ac5258
JX
3057msgid "unable to fork"
3058msgstr "无法 fork"
3059
7e6630a7 3060#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
a0b6b246 3061msgid "Checking connectivity"
06991777 3062msgstr "正在检查连通性"
a0b6b246 3063
7e6630a7 3064#: connected.c:122
a0b6b246
JX
3065msgid "Could not run 'git rev-list'"
3066msgstr "不能执行 'git rev-list'"
3067
7e6630a7 3068#: connected.c:146
a0b6b246 3069msgid "failed write to rev-list"
c1ac5258 3070msgstr "写入 rev-list 失败"
a0b6b246 3071
7e6630a7 3072#: connected.c:151
a0b6b246 3073msgid "failed to close rev-list's stdin"
c1ac5258
JX
3074msgstr "关闭 rev-list 的标准输入失败"
3075
33b62fba 3076#: convert.c:183
c1ac5258
JX
3077#, c-format
3078msgid "illegal crlf_action %d"
ae4e099e 3079msgstr "非法的 crlf_action %d"
a0b6b246 3080
33b62fba 3081#: convert.c:196
3495628d 3082#, c-format
c1ac5258
JX
3083msgid "CRLF would be replaced by LF in %s"
3084msgstr "%s 中的 CRLF 将被 LF 替换"
31e5e17b 3085
33b62fba 3086#: convert.c:198
31e5e17b 3087#, c-format
a0b6b246
JX
3088msgid ""
3089"CRLF will be replaced by LF in %s.\n"
c1ac5258 3090"The file will have its original line endings in your working directory"
a0b6b246 3091msgstr ""
c1ac5258 3092"%s 中的 CRLF 将被 LF 替换。<\n"
a0b6b246 3093"在工作区中该文件仍保持原有的换行符。"
3495628d 3094
33b62fba 3095#: convert.c:206
3495628d 3096#, c-format
31e5e17b
JX
3097msgid "LF would be replaced by CRLF in %s"
3098msgstr "文件 %s 中的 LF 将被 CRLF 替换"
3495628d 3099
33b62fba 3100#: convert.c:208
276ceeaa 3101#, c-format
a0b6b246
JX
3102msgid ""
3103"LF will be replaced by CRLF in %s.\n"
c1ac5258 3104"The file will have its original line endings in your working directory"
a0b6b246 3105msgstr ""
c1ac5258
JX
3106"%s 中的 LF 将被 CRLF 替换。\n"
3107"在工作区中该文件仍保持原有的换行符"
276ceeaa 3108
33b62fba 3109#: convert.c:273
fd8cb379
JX
3110#, c-format
3111msgid "BOM is prohibited in '%s' if encoded as %s"
3112msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM"
3113
33b62fba 3114#: convert.c:280
fd8cb379
JX
3115#, c-format
3116msgid ""
ddc12c42
JX
3117"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
3118"working-tree-encoding."
2b472aae
JX
3119msgstr ""
3120"文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%.*s 作为工作区编码。"
fd8cb379 3121
33b62fba 3122#: convert.c:293
fd8cb379
JX
3123#, c-format
3124msgid "BOM is required in '%s' if encoded as %s"
3125msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM"
3126
33b62fba 3127#: convert.c:295
fd8cb379
JX
3128#, c-format
3129msgid ""
3130"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
3131"%sLE (depending on the byte order) as working-tree-encoding."
3132msgstr ""
3133"文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字"
3134"节序)作为工作区编码。"
3135
33b62fba 3136#: convert.c:408 convert.c:479
fd8cb379
JX
3137#, c-format
3138msgid "failed to encode '%s' from %s to %s"
3139msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
3140
33b62fba 3141#: convert.c:451
fd8cb379
JX
3142#, c-format
3143msgid "encoding '%s' from %s to %s and back is not the same"
3144msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
3145
33b62fba 3146#: convert.c:654
c1ac5258
JX
3147#, c-format
3148msgid "cannot fork to run external filter '%s'"
e640d114 3149msgstr "不能 fork 以执行外部过滤器 '%s'"
c1ac5258 3150
33b62fba 3151#: convert.c:674
c1ac5258
JX
3152#, c-format
3153msgid "cannot feed the input to external filter '%s'"
e640d114 3154msgstr "不能将输入传递给外部过滤器 '%s'"
c1ac5258 3155
33b62fba 3156#: convert.c:681
c1ac5258
JX
3157#, c-format
3158msgid "external filter '%s' failed %d"
e640d114 3159msgstr "外部过滤器 '%s' 失败码 %d"
c1ac5258 3160
33b62fba 3161#: convert.c:716 convert.c:719
c1ac5258
JX
3162#, c-format
3163msgid "read from external filter '%s' failed"
3164msgstr "从外部过滤器 '%s' 读取失败"
3165
33b62fba 3166#: convert.c:722 convert.c:777
c1ac5258
JX
3167#, c-format
3168msgid "external filter '%s' failed"
3169msgstr "外部过滤器 '%s' 失败"
3170
33b62fba 3171#: convert.c:826
c1ac5258
JX
3172msgid "unexpected filter type"
3173msgstr "意外的过滤类型"
3174
33b62fba 3175#: convert.c:837
c1ac5258
JX
3176msgid "path name too long for external filter"
3177msgstr "外部过滤器的路径名太长"
3178
ec3d4607 3179#: convert.c:935
c1ac5258
JX
3180#, c-format
3181msgid ""
3182"external filter '%s' is not available anymore although not all paths have "
3183"been filtered"
3184msgstr "外部过滤器 '%s' 不再可用,但并非所有路径都已过滤"
3185
ec3d4607 3186#: convert.c:1236
fd8cb379
JX
3187msgid "true/false are no valid working-tree-encodings"
3188msgstr "true/false 不是有效的工作区编码"
3189
ec3d4607 3190#: convert.c:1416 convert.c:1449
c1ac5258
JX
3191#, c-format
3192msgid "%s: clean filter '%s' failed"
3193msgstr "%s:clean 过滤器 '%s' 失败"
3194
ec3d4607 3195#: convert.c:1492
c1ac5258
JX
3196#, c-format
3197msgid "%s: smudge filter %s failed"
3198msgstr "%s:smudge 过滤器 %s 失败"
3199
349ede6a
JX
3200#: credential.c:96
3201#, c-format
3202msgid "skipping credential lookup for key: credential.%s"
3203msgstr "跳过凭据查询:credential.%s"
3204
3205#: credential.c:112
3206msgid "refusing to work with credential missing host field"
3207msgstr "拒绝使用缺少主机字段的凭据"
3208
3209#: credential.c:114
3210msgid "refusing to work with credential missing protocol field"
3211msgstr "拒绝使用缺少协议字段的凭据"
3212
7e6630a7 3213#: credential.c:395
349ede6a
JX
3214#, c-format
3215msgid "url contains a newline in its %s component: %s"
3216msgstr "URL 的 %s 组件中包含换行符:%s"
3217
7e6630a7 3218#: credential.c:439
349ede6a
JX
3219#, c-format
3220msgid "url has no scheme: %s"
3221msgstr "URL 没有 scheme:%s"
3222
7e6630a7 3223#: credential.c:512
349ede6a
JX
3224#, c-format
3225msgid "credential url cannot be parsed: %s"
3226msgstr "不能解析凭据 URL:%s"
3227
a5cd71ca 3228#: date.c:138
a0b6b246
JX
3229msgid "in the future"
3230msgstr "在将来"
3495628d 3231
a5cd71ca 3232#: date.c:144
3495628d 3233#, c-format
a4f16749
JX
3234msgid "%<PRIuMAX> second ago"
3235msgid_plural "%<PRIuMAX> seconds ago"
3236msgstr[0] "%<PRIuMAX> 秒钟前"
3237msgstr[1] "%<PRIuMAX> 秒钟前"
3495628d 3238
a5cd71ca 3239#: date.c:151
3495628d 3240#, c-format
a4f16749
JX
3241msgid "%<PRIuMAX> minute ago"
3242msgid_plural "%<PRIuMAX> minutes ago"
3243msgstr[0] "%<PRIuMAX> 分钟前"
3244msgstr[1] "%<PRIuMAX> 分钟前"
3495628d 3245
a5cd71ca 3246#: date.c:158
3495628d 3247#, c-format
a4f16749
JX
3248msgid "%<PRIuMAX> hour ago"
3249msgid_plural "%<PRIuMAX> hours ago"
3250msgstr[0] "%<PRIuMAX> 小时前"
3251msgstr[1] "%<PRIuMAX> 小时前"
3495628d 3252
a5cd71ca 3253#: date.c:165
3495628d 3254#, c-format
a4f16749
JX
3255msgid "%<PRIuMAX> day ago"
3256msgid_plural "%<PRIuMAX> days ago"
3257msgstr[0] "%<PRIuMAX> 天前"
3258msgstr[1] "%<PRIuMAX> 天前"
3495628d 3259
a5cd71ca 3260#: date.c:171
94550ed3 3261#, c-format
a4f16749
JX
3262msgid "%<PRIuMAX> week ago"
3263msgid_plural "%<PRIuMAX> weeks ago"
3264msgstr[0] "%<PRIuMAX> 周前"
3265msgstr[1] "%<PRIuMAX> 周前"
94550ed3 3266
a5cd71ca 3267#: date.c:178
3495628d 3268#, c-format
a4f16749
JX
3269msgid "%<PRIuMAX> month ago"
3270msgid_plural "%<PRIuMAX> months ago"
3271msgstr[0] "%<PRIuMAX> 个月前"
3272msgstr[1] "%<PRIuMAX> 个月前"
3495628d 3273
a5cd71ca 3274#: date.c:189
3495628d 3275#, c-format
a4f16749
JX
3276msgid "%<PRIuMAX> year"
3277msgid_plural "%<PRIuMAX> years"
3278msgstr[0] "%<PRIuMAX> 年"
3279msgstr[1] "%<PRIuMAX> 年"
3495628d 3280
a0b6b246 3281#. TRANSLATORS: "%s" is "<n> years"
a5cd71ca 3282#: date.c:192
94550ed3 3283#, c-format
a4f16749
JX
3284msgid "%s, %<PRIuMAX> month ago"
3285msgid_plural "%s, %<PRIuMAX> months ago"
3286msgstr[0] "%s %<PRIuMAX> 个月前"
3287msgstr[1] "%s %<PRIuMAX> 个月前"
94550ed3 3288
a5cd71ca 3289#: date.c:197 date.c:202
94550ed3 3290#, c-format
a4f16749
JX
3291msgid "%<PRIuMAX> year ago"
3292msgid_plural "%<PRIuMAX> years ago"
3293msgstr[0] "%<PRIuMAX> 年前"
3294msgstr[1] "%<PRIuMAX> 年前"
94550ed3 3295
06991777 3296#: delta-islands.c:272
4c27fcb5
JX
3297msgid "Propagating island marks"
3298msgstr "正在传播数据岛标记"
3299
06991777 3300#: delta-islands.c:290
4c27fcb5
JX
3301#, c-format
3302msgid "bad tree object %s"
3303msgstr "坏的树对象 %s"
3304
06991777 3305#: delta-islands.c:334
4c27fcb5
JX
3306#, c-format
3307msgid "failed to load island regex for '%s': %s"
3308msgstr "未能加载 '%s' 的数据岛正则表达式:%s"
3309
06991777 3310#: delta-islands.c:390
4c27fcb5
JX
3311#, c-format
3312msgid "island regex from config has too many capture groups (max=%d)"
3313msgstr "来自 config 的数据岛正则表达式有太多的捕获组(最多 %d 个)"
3314
a6cd2cc4 3315#: delta-islands.c:467
4c27fcb5
JX
3316#, c-format
3317msgid "Marked %d islands, done.\n"
3318msgstr "已标记 %d 个数据岛,结束。\n"
3319
ec3d4607 3320#: diff-merges.c:70
473eb541
JX
3321#, c-format
3322msgid "unknown value for --diff-merges: %s"
3323msgstr "未知的 --diff-merges 取值:%s"
3324
7e6630a7 3325#: diff-lib.c:561
d13389bf
JX
3326msgid "--merge-base does not work with ranges"
3327msgstr "--merge-base 不适用于范围"
3328
7e6630a7 3329#: diff-lib.c:563
d13389bf
JX
3330msgid "--merge-base only works with commits"
3331msgstr "--merge-base 仅适用于提交"
3332
7e6630a7 3333#: diff-lib.c:580
d13389bf
JX
3334msgid "unable to get HEAD"
3335msgstr "不能解析 HEAD"
3336
7e6630a7 3337#: diff-lib.c:587
d13389bf
JX
3338msgid "no merge base found"
3339msgstr "未找到合并基线"
3340
7e6630a7 3341#: diff-lib.c:589
d13389bf
JX
3342msgid "multiple merge bases found"
3343msgstr "找到了多条合并基线"
3344
ec3d4607 3345#: diff-no-index.c:237
d46c5519
JX
3346msgid "git diff --no-index [<options>] <path> <path>"
3347msgstr "git diff --no-index [<选项>] <路径> <路径>"
3348
ec3d4607 3349#: diff-no-index.c:262
d46c5519
JX
3350msgid ""
3351"Not a git repository. Use --no-index to compare two paths outside a working "
3352"tree"
d9488fea 3353msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径"
cfff71a9 3354
a0b6b246 3355# 译者:注意保持前导空格
7e6630a7 3356#: diff.c:157
a0b6b246
JX
3357#, c-format
3358msgid " Failed to parse dirstat cut-off percentage '%s'\n"
3359msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
cfff71a9 3360
a0b6b246 3361# 译者:注意保持前导空格
7e6630a7 3362#: diff.c:162
a0b6b246
JX
3363#, c-format
3364msgid " Unknown dirstat parameter '%s'\n"
3365msgstr " 未知的 dirstat 参数 '%s'\n"
7aea43ff 3366
7e6630a7 3367#: diff.c:298
6937cb4e 3368msgid ""
c1ac5258
JX
3369"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
3370"'dimmed-zebra', 'plain'"
5809aa05 3371msgstr ""
ec3d4607 3372"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed-zebra' 或 "
c1ac5258
JX
3373"'plain'"
3374
7e6630a7 3375#: diff.c:326
c1ac5258 3376#, c-format
06991777
JX
3377msgid ""
3378"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
3379"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
3380msgstr ""
3381"未知的 color-moved-ws 模式 '%s',可能的取值有 'ignore-space-change'、'ignore-"
3382"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
c1ac5258 3383
7e6630a7 3384#: diff.c:334
c1ac5258 3385msgid ""
06991777
JX
3386"color-moved-ws: allow-indentation-change cannot be combined with other "
3387"whitespace modes"
c1ac5258 3388msgstr "color-moved-ws:allow-indentation-change 不能与其它空白字符模式共用"
6937cb4e 3389
7e6630a7 3390#: diff.c:411
7aea43ff 3391#, c-format
a0b6b246
JX
3392msgid "Unknown value for 'diff.submodule' config variable: '%s'"
3393msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
7aea43ff 3394
7e6630a7 3395#: diff.c:471
7aea43ff 3396#, c-format
a0b6b246
JX
3397msgid ""
3398"Found errors in 'diff.dirstat' config variable:\n"
3399"%s"
3400msgstr ""
3401"发现配置变量 'diff.dirstat' 中的错误:\n"
3402"%s"
7aea43ff 3403
7e6630a7 3404#: diff.c:4290
7aea43ff 3405#, c-format
a0b6b246
JX
3406msgid "external diff died, stopping at %s"
3407msgstr "外部 diff 退出,停止在 %s"
7aea43ff 3408
7e6630a7 3409#: diff.c:4642
a0b6b246
JX
3410msgid "--name-only, --name-status, --check and -s are mutually exclusive"
3411msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
3412
7e6630a7 3413#: diff.c:4645
31e5e17b
JX
3414msgid "-G, -S and --find-object are mutually exclusive"
3415msgstr "-G、-S 和 --find-object 是互斥的"
3416
7e6630a7 3417#: diff.c:4648
ec3d4607
JX
3418msgid ""
3419"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
3420msgstr "-G 和 --pickaxe-regex 互斥,使用 --pickaxe-regex 和 -S"
3421
7e6630a7 3422#: diff.c:4651
ec3d4607
JX
3423msgid ""
3424"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
3425"with -G and -S"
ffa14514 3426msgstr "--pickaxe-all 和 --find-object 互斥,使用 --pickaxe-all 与 -G 和 -S"
ec3d4607 3427
7e6630a7 3428#: diff.c:4730
a0b6b246
JX
3429msgid "--follow requires exactly one pathspec"
3430msgstr "--follow 明确要求只跟一个路径规格"
3431
7e6630a7 3432#: diff.c:4778
d46c5519
JX
3433#, c-format
3434msgid "invalid --stat value: %s"
3435msgstr "无效的 --stat 值:%s"
3436
7e6630a7
FZ
3437#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
3438#: parse-options.c:217 parse-options.c:221
d46c5519
JX
3439#, c-format
3440msgid "%s expects a numerical value"
3441msgstr "%s 期望一个数字值"
3442
7e6630a7 3443#: diff.c:4815
7aea43ff 3444#, c-format
a0b6b246
JX
3445msgid ""
3446"Failed to parse --dirstat/-X option parameter:\n"
3447"%s"
3448msgstr ""
3449"无法解析 --dirstat/-X 选项的参数:\n"
3450"%s"
7aea43ff 3451
7e6630a7 3452#: diff.c:4900
d46c5519
JX
3453#, c-format
3454msgid "unknown change class '%c' in --diff-filter=%s"
3455msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
3456
7e6630a7 3457#: diff.c:4924
d46c5519
JX
3458#, c-format
3459msgid "unknown value after ws-error-highlight=%.*s"
3460msgstr "ws-error-highlight=%.*s 之后未知的值"
3461
7e6630a7 3462#: diff.c:4938
7aea43ff 3463#, c-format
d46c5519
JX
3464msgid "unable to resolve '%s'"
3465msgstr "不能解析 '%s'"
3466
7e6630a7 3467#: diff.c:4988 diff.c:4994
d46c5519
JX
3468#, c-format
3469msgid "%s expects <n>/<m> form"
3470msgstr "%s 期望 <n>/<m> 格式"
3471
7e6630a7 3472#: diff.c:5006
d46c5519
JX
3473#, c-format
3474msgid "%s expects a character, got '%s'"
3475msgstr "%s 期望一个字符,得到 '%s'"
3476
7e6630a7 3477#: diff.c:5027
d46c5519
JX
3478#, c-format
3479msgid "bad --color-moved argument: %s"
3480msgstr "坏的 --color-moved 参数:%s"
3481
7e6630a7 3482#: diff.c:5046
d46c5519
JX
3483#, c-format
3484msgid "invalid mode '%s' in --color-moved-ws"
3485msgstr "--color-moved-ws 中的无效模式 '%s' "
3486
7e6630a7 3487#: diff.c:5086
d46c5519
JX
3488msgid ""
3489"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3490"\"histogram\""
3491msgstr ""
3492"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3493
7e6630a7 3494#: diff.c:5122 diff.c:5142
d46c5519
JX
3495#, c-format
3496msgid "invalid argument to %s"
3497msgstr "%s 的参数无效"
3498
7e6630a7 3499#: diff.c:5246
d13389bf
JX
3500#, c-format
3501msgid "invalid regex given to -I: '%s'"
3502msgstr "选项 -I 的正则表达式无效:'%s'"
3503
7e6630a7 3504#: diff.c:5295
d46c5519
JX
3505#, c-format
3506msgid "failed to parse --submodule option parameter: '%s'"
a0b6b246 3507msgstr "无法解析 --submodule 选项的参数:'%s'"
7aea43ff 3508
7e6630a7 3509#: diff.c:5351
d46c5519
JX
3510#, c-format
3511msgid "bad --word-diff argument: %s"
3512msgstr "坏的 --word-diff 参数:%s"
3513
7e6630a7 3514#: diff.c:5387
d46c5519
JX
3515msgid "Diff output format options"
3516msgstr "差异输出格式化选项"
3517
7e6630a7 3518#: diff.c:5389 diff.c:5395
d46c5519
JX
3519msgid "generate patch"
3520msgstr "生成补丁"
3521
7e6630a7 3522#: diff.c:5392 builtin/log.c:179
d46c5519
JX
3523msgid "suppress diff output"
3524msgstr "不显示差异输出"
3525
7e6630a7 3526#: diff.c:5397 diff.c:5511 diff.c:5518
d46c5519
JX
3527msgid "<n>"
3528msgstr "<n>"
3529
7e6630a7 3530#: diff.c:5398 diff.c:5401
d46c5519
JX
3531msgid "generate diffs with <n> lines context"
3532msgstr "生成含 <n> 行上下文的差异"
3533
7e6630a7 3534#: diff.c:5403
d46c5519
JX
3535msgid "generate the diff in raw format"
3536msgstr "生成原始格式的差异"
3537
7e6630a7 3538#: diff.c:5406
d46c5519
JX
3539msgid "synonym for '-p --raw'"
3540msgstr "和 '-p --raw' 同义"
3541
7e6630a7 3542#: diff.c:5410
d46c5519
JX
3543msgid "synonym for '-p --stat'"
3544msgstr "和 '-p --stat' 同义"
3545
7e6630a7 3546#: diff.c:5414
d46c5519
JX
3547msgid "machine friendly --stat"
3548msgstr "机器友好的 --stat"
3549
7e6630a7 3550#: diff.c:5417
d46c5519
JX
3551msgid "output only the last line of --stat"
3552msgstr "只输出 --stat 的最后一行"
3553
7e6630a7 3554#: diff.c:5419 diff.c:5427
d46c5519
JX
3555msgid "<param1,param2>..."
3556msgstr "<参数1,参数2>..."
3557
7e6630a7 3558#: diff.c:5420
d46c5519
JX
3559msgid ""
3560"output the distribution of relative amount of changes for each sub-directory"
3561msgstr "输出每个子目录相对变更的分布"
3562
7e6630a7 3563#: diff.c:5424
d46c5519
JX
3564msgid "synonym for --dirstat=cumulative"
3565msgstr "和 --dirstat=cumulative 同义"
3566
7e6630a7 3567#: diff.c:5428
d46c5519
JX
3568msgid "synonym for --dirstat=files,param1,param2..."
3569msgstr "是 --dirstat=files,param1,param2... 的同义词"
3570
7e6630a7 3571#: diff.c:5432
d46c5519
JX
3572msgid "warn if changes introduce conflict markers or whitespace errors"
3573msgstr "如果变更中引入冲突定界符或空白错误,给出警告"
3574
7e6630a7 3575#: diff.c:5435
d46c5519
JX
3576msgid "condensed summary such as creations, renames and mode changes"
3577msgstr "精简摘要,例如创建、重命名和模式变更"
3578
7e6630a7 3579#: diff.c:5438
d46c5519
JX
3580msgid "show only names of changed files"
3581msgstr "只显示变更文件的文件名"
3582
7e6630a7 3583#: diff.c:5441
d46c5519
JX
3584msgid "show only names and status of changed files"
3585msgstr "只显示变更文件的文件名和状态"
3586
7e6630a7 3587#: diff.c:5443
d46c5519
JX
3588msgid "<width>[,<name-width>[,<count>]]"
3589msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
3590
7e6630a7 3591#: diff.c:5444
d46c5519 3592msgid "generate diffstat"
5b533632 3593msgstr "生成差异统计(diffstat)"
d46c5519 3594
7e6630a7 3595#: diff.c:5446 diff.c:5449 diff.c:5452
d46c5519
JX
3596msgid "<width>"
3597msgstr "<宽度>"
3598
7e6630a7 3599#: diff.c:5447
d46c5519
JX
3600msgid "generate diffstat with a given width"
3601msgstr "使用给定的长度生成差异统计"
3602
7e6630a7 3603#: diff.c:5450
d46c5519
JX
3604msgid "generate diffstat with a given name width"
3605msgstr "使用给定的文件名长度生成差异统计"
3606
7e6630a7 3607#: diff.c:5453
d46c5519
JX
3608msgid "generate diffstat with a given graph width"
3609msgstr "使用给定的图形长度生成差异统计"
3610
7e6630a7 3611#: diff.c:5455
d46c5519
JX
3612msgid "<count>"
3613msgstr "<次数>"
3614
7e6630a7 3615#: diff.c:5456
d46c5519
JX
3616msgid "generate diffstat with limited lines"
3617msgstr "生成有限行数的差异统计"
3618
7e6630a7 3619#: diff.c:5459
d46c5519
JX
3620msgid "generate compact summary in diffstat"
3621msgstr "生成差异统计的简洁摘要"
3622
7e6630a7 3623#: diff.c:5462
d46c5519
JX
3624msgid "output a binary diff that can be applied"
3625msgstr "输出一个可以应用的二进制差异"
3626
7e6630a7 3627#: diff.c:5465
d46c5519
JX
3628msgid "show full pre- and post-image object names on the \"index\" lines"
3629msgstr "在 \"index\" 行显示完整的前后对象名称"
3630
7e6630a7 3631#: diff.c:5467
d46c5519
JX
3632msgid "show colored diff"
3633msgstr "显示带颜色的差异"
3634
7e6630a7 3635#: diff.c:5468
d46c5519
JX
3636msgid "<kind>"
3637msgstr "<类型>"
3638
7e6630a7 3639#: diff.c:5469
d46c5519
JX
3640msgid ""
3641"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3642"diff"
3643msgstr "对于差异中的上下文、旧的和新的行,加亮显示错误的空白字符"
3644
7e6630a7 3645#: diff.c:5472
d46c5519
JX
3646msgid ""
3647"do not munge pathnames and use NULs as output field terminators in --raw or "
3648"--numstat"
3649msgstr ""
3650"在 --raw 或者 --numstat 中,不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
3651"符"
3652
7e6630a7 3653#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
d46c5519
JX
3654msgid "<prefix>"
3655msgstr "<前缀>"
3656
7e6630a7 3657#: diff.c:5476
d46c5519
JX
3658msgid "show the given source prefix instead of \"a/\""
3659msgstr "显示给定的源前缀取代 \"a/\""
3660
7e6630a7 3661#: diff.c:5479
d46c5519
JX
3662msgid "show the given destination prefix instead of \"b/\""
3663msgstr "显示给定的目标前缀取代 \"b/\""
3664
7e6630a7 3665#: diff.c:5482
d46c5519
JX
3666msgid "prepend an additional prefix to every line of output"
3667msgstr "输出的每一行附加前缀"
3668
7e6630a7 3669#: diff.c:5485
d46c5519
JX
3670msgid "do not show any source or destination prefix"
3671msgstr "不显示任何源和目标前缀"
3672
7e6630a7 3673#: diff.c:5488
d46c5519
JX
3674msgid "show context between diff hunks up to the specified number of lines"
3675msgstr "显示指定行数的差异块间的上下文"
3676
7e6630a7 3677#: diff.c:5492 diff.c:5497 diff.c:5502
d46c5519
JX
3678msgid "<char>"
3679msgstr "<字符>"
3680
7e6630a7 3681#: diff.c:5493
d46c5519
JX
3682msgid "specify the character to indicate a new line instead of '+'"
3683msgstr "指定一个字符取代 '+' 来表示新的一行"
3684
7e6630a7 3685#: diff.c:5498
d46c5519
JX
3686msgid "specify the character to indicate an old line instead of '-'"
3687msgstr "指定一个字符取代 '-' 来表示旧的一行"
3688
7e6630a7 3689#: diff.c:5503
d46c5519
JX
3690msgid "specify the character to indicate a context instead of ' '"
3691msgstr "指定一个字符取代 ' ' 来表示一行上下文"
3692
7e6630a7 3693#: diff.c:5506
d46c5519
JX
3694msgid "Diff rename options"
3695msgstr "差异重命名选项"
3696
7e6630a7 3697#: diff.c:5507
d46c5519
JX
3698msgid "<n>[/<m>]"
3699msgstr "<n>[/<m>]"
3700
7e6630a7 3701#: diff.c:5508
d46c5519 3702msgid "break complete rewrite changes into pairs of delete and create"
5b533632 3703msgstr "将完全重写的变更打破为成对的删除和创建"
d46c5519 3704
7e6630a7 3705#: diff.c:5512
d46c5519
JX
3706msgid "detect renames"
3707msgstr "检测重命名"
3708
7e6630a7 3709#: diff.c:5516
d46c5519
JX
3710msgid "omit the preimage for deletes"
3711msgstr "省略删除操作的差异输出"
3712
7e6630a7 3713#: diff.c:5519
d46c5519
JX
3714msgid "detect copies"
3715msgstr "检测拷贝"
3716
7e6630a7 3717#: diff.c:5523
d46c5519
JX
3718msgid "use unmodified files as source to find copies"
3719msgstr "使用未修改的文件做为发现拷贝的源"
3720
7e6630a7 3721#: diff.c:5525
d46c5519
JX
3722msgid "disable rename detection"
3723msgstr "禁用重命名探测"
3724
7e6630a7 3725#: diff.c:5528
d46c5519
JX
3726msgid "use empty blobs as rename source"
3727msgstr "使用空的数据对象做为重命名的源"
3728
7e6630a7 3729#: diff.c:5530
d46c5519
JX
3730msgid "continue listing the history of a file beyond renames"
3731msgstr "继续列出文件重命名以外的历史记录"
3732
7e6630a7 3733#: diff.c:5533
d46c5519
JX
3734msgid ""
3735"prevent rename/copy detection if the number of rename/copy targets exceeds "
3736"given limit"
3737msgstr "如果重命名/拷贝目标超过给定的限制,禁止重命名/拷贝检测"
3738
7e6630a7 3739#: diff.c:5535
d46c5519
JX
3740msgid "Diff algorithm options"
3741msgstr "差异算法选项"
3742
7e6630a7 3743#: diff.c:5537
d46c5519
JX
3744msgid "produce the smallest possible diff"
3745msgstr "生成尽可能小的差异"
3746
7e6630a7 3747#: diff.c:5540
d46c5519
JX
3748msgid "ignore whitespace when comparing lines"
3749msgstr "行比较时忽略空白字符"
3750
7e6630a7 3751#: diff.c:5543
d46c5519
JX
3752msgid "ignore changes in amount of whitespace"
3753msgstr "忽略空白字符的变更"
3754
7e6630a7 3755#: diff.c:5546
d46c5519
JX
3756msgid "ignore changes in whitespace at EOL"
3757msgstr "忽略行尾的空白字符变更"
3758
7e6630a7 3759#: diff.c:5549
d46c5519
JX
3760msgid "ignore carrier-return at the end of line"
3761msgstr "忽略行尾的回车符(CR)"
3762
7e6630a7 3763#: diff.c:5552
d46c5519
JX
3764msgid "ignore changes whose lines are all blank"
3765msgstr "忽略整行都是空白的变更"
3766
7e6630a7 3767#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
d13389bf
JX
3768msgid "<regex>"
3769msgstr "<正则>"
3770
7e6630a7 3771#: diff.c:5555
d13389bf
JX
3772msgid "ignore changes whose all lines match <regex>"
3773msgstr "忽略所有行都和正则表达式匹配的变更"
3774
7e6630a7 3775#: diff.c:5558
d46c5519
JX
3776msgid "heuristic to shift diff hunk boundaries for easy reading"
3777msgstr "启发式转换差异边界以便阅读"
3778
7e6630a7 3779#: diff.c:5561
d46c5519
JX
3780msgid "generate diff using the \"patience diff\" algorithm"
3781msgstr "使用 \"patience diff\" 算法生成差异"
3782
7e6630a7 3783#: diff.c:5565
d46c5519
JX
3784msgid "generate diff using the \"histogram diff\" algorithm"
3785msgstr "使用 \"histogram diff\" 算法生成差异"
3786
7e6630a7 3787#: diff.c:5567
d46c5519
JX
3788msgid "<algorithm>"
3789msgstr "<算法>"
3790
7e6630a7 3791#: diff.c:5568
d46c5519
JX
3792msgid "choose a diff algorithm"
3793msgstr "选择一个差异算法"
3794
7e6630a7 3795#: diff.c:5570
d46c5519
JX
3796msgid "<text>"
3797msgstr "<文本>"
3798
7e6630a7 3799#: diff.c:5571
d46c5519 3800msgid "generate diff using the \"anchored diff\" algorithm"
5b533632 3801msgstr "使用 \"anchored diff\" 算法生成差异"
d46c5519 3802
7e6630a7 3803#: diff.c:5573 diff.c:5582 diff.c:5585
d46c5519
JX
3804msgid "<mode>"
3805msgstr "<模式>"
3806
7e6630a7 3807#: diff.c:5574
d46c5519
JX
3808msgid "show word diff, using <mode> to delimit changed words"
3809msgstr "显示单词差异,使用 <模式> 分隔变更的单词"
3810
7e6630a7 3811#: diff.c:5577
d46c5519
JX
3812msgid "use <regex> to decide what a word is"
3813msgstr "使用 <正则表达式> 确定何为一个词"
3814
7e6630a7 3815#: diff.c:5580
d46c5519
JX
3816msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3817msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
3818
7e6630a7 3819#: diff.c:5583
d46c5519
JX
3820msgid "moved lines of code are colored differently"
3821msgstr "移动的代码行用不同方式着色"
3822
7e6630a7 3823#: diff.c:5586
d46c5519
JX
3824msgid "how white spaces are ignored in --color-moved"
3825msgstr "在 --color-moved 下如何忽略空白字符"
3826
7e6630a7 3827#: diff.c:5589
d46c5519
JX
3828msgid "Other diff options"
3829msgstr "其它差异选项"
3830
7e6630a7 3831#: diff.c:5591
d46c5519
JX
3832msgid "when run from subdir, exclude changes outside and show relative paths"
3833msgstr "当从子目录运行,排除目录之外的变更并显示相对路径"
3834
7e6630a7 3835#: diff.c:5595
d46c5519
JX
3836msgid "treat all files as text"
3837msgstr "把所有文件当做文本处理"
3838
7e6630a7 3839#: diff.c:5597
d46c5519
JX
3840msgid "swap two inputs, reverse the diff"
3841msgstr "交换两个输入,反转差异"
3842
7e6630a7 3843#: diff.c:5599
d46c5519
JX
3844msgid "exit with 1 if there were differences, 0 otherwise"
3845msgstr "有差异时退出码为 1,否则为 0"
3846
7e6630a7 3847#: diff.c:5601
d46c5519
JX
3848msgid "disable all output of the program"
3849msgstr "禁用本程序的所有输出"
3850
7e6630a7 3851#: diff.c:5603
d46c5519
JX
3852msgid "allow an external diff helper to be executed"
3853msgstr "允许执行一个外置的差异助手"
3854
7e6630a7 3855#: diff.c:5605
d46c5519
JX
3856msgid "run external text conversion filters when comparing binary files"
3857msgstr "当比较二进制文件时,运行外部的文本转换过滤器"
3858
7e6630a7 3859#: diff.c:5607
d46c5519
JX
3860msgid "<when>"
3861msgstr "<何时>"
3862
7e6630a7 3863#: diff.c:5608
d46c5519
JX
3864msgid "ignore changes to submodules in the diff generation"
3865msgstr "在生成差异时,忽略子模组的更改"
3866
7e6630a7 3867#: diff.c:5611
d46c5519
JX
3868msgid "<format>"
3869msgstr "<格式>"
3870
7e6630a7 3871#: diff.c:5612
d46c5519
JX
3872msgid "specify how differences in submodules are shown"
3873msgstr "指定子模组的差异如何显示"
3874
7e6630a7 3875#: diff.c:5616
d46c5519
JX
3876msgid "hide 'git add -N' entries from the index"
3877msgstr "隐藏索引中 'git add -N' 条目"
3878
7e6630a7 3879#: diff.c:5619
d46c5519
JX
3880msgid "treat 'git add -N' entries as real in the index"
3881msgstr "将索引中 'git add -N' 条目当做真实的"
3882
7e6630a7 3883#: diff.c:5621
d46c5519
JX
3884msgid "<string>"
3885msgstr "<字符串>"
3886
7e6630a7 3887#: diff.c:5622
d46c5519
JX
3888msgid ""
3889"look for differences that change the number of occurrences of the specified "
3890"string"
3891msgstr "查找改变了指定字符串出现次数的差异"
3892
7e6630a7 3893#: diff.c:5625
d46c5519
JX
3894msgid ""
3895"look for differences that change the number of occurrences of the specified "
3896"regex"
3897msgstr "查找改变指定正则匹配出现次数的差异"
3898
7e6630a7 3899#: diff.c:5628
d46c5519
JX
3900msgid "show all changes in the changeset with -S or -G"
3901msgstr "显示使用 -S 或 -G 的变更集的所有变更"
3902
7e6630a7 3903#: diff.c:5631
d46c5519
JX
3904msgid "treat <string> in -S as extended POSIX regular expression"
3905msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
3906
7e6630a7 3907#: diff.c:5634
d46c5519
JX
3908msgid "control the order in which files appear in the output"
3909msgstr "控制输出中的文件显示顺序"
3910
7e6630a7 3911#: diff.c:5635 diff.c:5638
473eb541
JX
3912msgid "<path>"
3913msgstr "<路径>"
3914
7e6630a7 3915#: diff.c:5636
473eb541
JX
3916msgid "show the change in the specified path first"
3917msgstr "先显示指定路径的变更"
3918
7e6630a7 3919#: diff.c:5639
473eb541
JX
3920msgid "skip the output to the specified path"
3921msgstr "跳过指定路径的输出"
3922
7e6630a7 3923#: diff.c:5641
d46c5519 3924msgid "<object-id>"
5b533632 3925msgstr "<对象 ID>"
d46c5519 3926
7e6630a7 3927#: diff.c:5642
d46c5519
JX
3928msgid ""
3929"look for differences that change the number of occurrences of the specified "
3930"object"
3931msgstr "查找改变指定对象出现次数的差异"
3932
7e6630a7 3933#: diff.c:5644
d46c5519
JX
3934msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3935msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
3936
7e6630a7 3937#: diff.c:5645
d46c5519
JX
3938msgid "select files by diff type"
3939msgstr "通过差异类型选择文件"
3940
7e6630a7 3941#: diff.c:5647
d46c5519
JX
3942msgid "<file>"
3943msgstr "<文件>"
3944
7e6630a7 3945#: diff.c:5648
d46c5519
JX
3946msgid "Output to a specific file"
3947msgstr "输出到一个指定的文件"
3948
7e6630a7 3949#: diff.c:6306
ec3d4607
JX
3950msgid "exhaustive rename detection was skipped due to too many files."
3951msgstr "由于文件太多,跳过详尽的重命名检查。"
a0b6b246 3952
7e6630a7 3953#: diff.c:6309
a0b6b246 3954msgid "only found copies from modified paths due to too many files."
ec3d4607 3955msgstr "由于文件太多,只在修改的路径中找到了拷贝。"
a0b6b246 3956
7e6630a7 3957#: diff.c:6312
7aea43ff 3958#, c-format
a0b6b246
JX
3959msgid ""
3960"you may want to set your %s variable to at least %d and retry the command."
29004bbb 3961msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
7aea43ff 3962
349ede6a
JX
3963#: diffcore-order.c:24
3964#, c-format
3965msgid "failed to read orderfile '%s'"
3966msgstr "读取排序文件 '%s' 失败"
3967
7e6630a7 3968#: diffcore-rename.c:1564
349ede6a
JX
3969msgid "Performing inexact rename detection"
3970msgstr "正在进行非精确的重命名探测"
3971
473eb541
JX
3972#: diffcore-rotate.c:29
3973#, c-format
3974msgid "No such path '%s' in the diff"
3975msgstr "在差异中无此路径 '%s'"
3976
ec3d4607 3977#: dir.c:593
c1ac5258
JX
3978#, c-format
3979msgid "pathspec '%s' did not match any file(s) known to git"
3980msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
3981
ec3d4607 3982#: dir.c:733 dir.c:762 dir.c:775
ddc12c42
JX
3983#, c-format
3984msgid "unrecognized pattern: '%s'"
3985msgstr "未识别的模式:'%s'"
3986
ec3d4607 3987#: dir.c:790 dir.c:804
ddc12c42
JX
3988#, c-format
3989msgid "unrecognized negative pattern: '%s'"
3990msgstr "未识别的反向模式:'%s'"
3991
ec3d4607 3992#: dir.c:820
ddc12c42
JX
3993#, c-format
3994msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
3995msgstr "您的 sparse-checkout 文件可能有问题:重复的模式 '%s'"
3996
ec3d4607 3997#: dir.c:830
ddc12c42
JX
3998msgid "disabling cone pattern matching"
3999msgstr "禁止 cone 模式匹配"
4000
ec3d4607 4001#: dir.c:1214
c1ac5258
JX
4002#, c-format
4003msgid "cannot use %s as an exclude file"
4004msgstr "不能将 %s 用作排除文件"
4005
7e6630a7 4006#: dir.c:2464
31e5e17b
JX
4007#, c-format
4008msgid "could not open directory '%s'"
4009msgstr "不能打开目录 '%s'"
4010
7e6630a7 4011#: dir.c:2766
a0b6b246
JX
4012msgid "failed to get kernel name and information"
4013msgstr "无法获得内核名称和信息"
7aea43ff 4014
7e6630a7 4015#: dir.c:2890
c1ac5258
JX
4016msgid "untracked cache is disabled on this system or location"
4017msgstr "缓存未跟踪文件在本系统或位置中被禁用"
4018
7e6630a7
FZ
4019#: dir.c:3158
4020msgid ""
4021"No directory name could be guessed.\n"
4022"Please specify a directory on the command line"
4023msgstr ""
4024"无法猜到目录名。\n"
4025"请在命令行指定一个目录"
4026
4027#: dir.c:3837
c1ac5258
JX
4028#, c-format
4029msgid "index file corrupt in repo %s"
4030msgstr "仓库 %s 中的索引文件损坏"
7aea43ff 4031
7e6630a7 4032#: dir.c:3884 dir.c:3889
87cb7997
JX
4033#, c-format
4034msgid "could not create directories for %s"
4035msgstr "不能为 %s 创建目录"
4036
7e6630a7 4037#: dir.c:3918
1a79b2f1
JX
4038#, c-format
4039msgid "could not migrate git directory from '%s' to '%s'"
4040msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
4041
7e6630a7 4042#: editor.c:77
5809aa05
JX
4043#, c-format
4044msgid "hint: Waiting for your editor to close the file...%c"
4045msgstr "提示:等待您的编辑器关闭文件...%c"
4046
7e6630a7 4047#: entry.c:177
6937cb4e
JX
4048msgid "Filtering content"
4049msgstr "过滤内容"
4050
7e6630a7 4051#: entry.c:498
87cb7997
JX
4052#, c-format
4053msgid "could not stat file '%s'"
65e2041e 4054msgstr "不能对文件 '%s' 调用 stat"
87cb7997 4055
7e6630a7 4056#: environment.c:143
c1ac5258
JX
4057#, c-format
4058msgid "bad git namespace path \"%s\""
e640d114 4059msgstr "错误的 git 名字空间路径 \"%s\""
c1ac5258 4060
d46c5519 4061#: exec-cmd.c:363
c1ac5258
JX
4062#, c-format
4063msgid "too many args to run %s"
4064msgstr "执行 %s 的参数太多"
4065
7e6630a7 4066#: fetch-pack.c:193
a0b6b246
JX
4067msgid "git fetch-pack: expected shallow list"
4068msgstr "git fetch-pack:应为 shallow 列表"
4069
7e6630a7 4070#: fetch-pack.c:196
06991777
JX
4071msgid "git fetch-pack: expected a flush packet after shallow list"
4072msgstr "git fetch-pack:在浅克隆列表之后期望一个 flush 包"
4073
7e6630a7 4074#: fetch-pack.c:207
31e5e17b
JX
4075msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
4076msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包"
a0b6b246 4077
7e6630a7 4078#: fetch-pack.c:227
90314792 4079#, c-format
275588f9 4080msgid "git fetch-pack: expected ACK/NAK, got '%s'"
a0b6b246 4081msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
90314792 4082
7e6630a7 4083#: fetch-pack.c:238
d46c5519
JX
4084msgid "unable to write to remote"
4085msgstr "无法写到远程"
4086
7e6630a7 4087#: fetch-pack.c:299
a0b6b246
JX
4088msgid "--stateless-rpc requires multi_ack_detailed"
4089msgstr "--stateless-rpc 需要 multi_ack_detailed"
90314792 4090
7e6630a7 4091#: fetch-pack.c:394 fetch-pack.c:1434
90314792 4092#, c-format
a0b6b246
JX
4093msgid "invalid shallow line: %s"
4094msgstr "无效的 shallow 信息:%s"
90314792 4095
7e6630a7 4096#: fetch-pack.c:400 fetch-pack.c:1440
c04f5ac3 4097#, c-format
a0b6b246
JX
4098msgid "invalid unshallow line: %s"
4099msgstr "无效的 unshallow 信息:%s"
c04f5ac3 4100
7e6630a7 4101#: fetch-pack.c:402 fetch-pack.c:1442
a0b6b246
JX
4102#, c-format
4103msgid "object not found: %s"
4104msgstr "对象未找到:%s"
07432cef 4105
7e6630a7 4106#: fetch-pack.c:405 fetch-pack.c:1445
c04f5ac3 4107#, c-format
a0b6b246
JX
4108msgid "error in object: %s"
4109msgstr "对象中出错:%s"
07432cef 4110
7e6630a7 4111#: fetch-pack.c:407 fetch-pack.c:1447
c04f5ac3 4112#, c-format
a0b6b246
JX
4113msgid "no shallow found: %s"
4114msgstr "未发现 shallow:%s"
c04f5ac3 4115
7e6630a7 4116#: fetch-pack.c:410 fetch-pack.c:1451
a0b6b246
JX
4117#, c-format
4118msgid "expected shallow/unshallow, got %s"
4119msgstr "应为 shallow/unshallow,却得到 %s"
07432cef 4120
7e6630a7 4121#: fetch-pack.c:450
a0b6b246
JX
4122#, c-format
4123msgid "got %s %d %s"
4124msgstr "得到 %s %d %s"
1b7f4a34 4125
7e6630a7 4126#: fetch-pack.c:467
1b7f4a34 4127#, c-format
a0b6b246
JX
4128msgid "invalid commit %s"
4129msgstr "无效提交 %s"
1b7f4a34 4130
7e6630a7 4131#: fetch-pack.c:498
a0b6b246
JX
4132msgid "giving up"
4133msgstr "放弃"
814ff314 4134
7e6630a7 4135#: fetch-pack.c:511 progress.c:339
a0b6b246
JX
4136msgid "done"
4137msgstr "完成"
2e8451e8 4138
7e6630a7 4139#: fetch-pack.c:523
2e8451e8 4140#, c-format
a0b6b246
JX
4141msgid "got %s (%d) %s"
4142msgstr "得到 %s (%d) %s"
2e8451e8 4143
7e6630a7 4144#: fetch-pack.c:559
a0b6b246
JX
4145#, c-format
4146msgid "Marking %s as complete"
4147msgstr "标记 %s 为完成"
220c313c 4148
7e6630a7 4149#: fetch-pack.c:774
a0b6b246
JX
4150#, c-format
4151msgid "already have %s (%s)"
29004bbb 4152msgstr "已经有 %s(%s)"
220c313c 4153
7e6630a7 4154#: fetch-pack.c:860
a0b6b246
JX
4155msgid "fetch-pack: unable to fork off sideband demultiplexer"
4156msgstr "fetch-pack:无法派生 sideband 多路输出"
1b7f4a34 4157
7e6630a7 4158#: fetch-pack.c:868
a0b6b246
JX
4159msgid "protocol error: bad pack header"
4160msgstr "协议错误:坏的包头"
814ff314 4161
7e6630a7 4162#: fetch-pack.c:962
a0b6b246
JX
4163#, c-format
4164msgid "fetch-pack: unable to fork off %s"
4165msgstr "fetch-pack:无法派生进程 %s"
5c57d762 4166
7e6630a7 4167#: fetch-pack.c:968
473eb541
JX
4168msgid "fetch-pack: invalid index-pack output"
4169msgstr "fetch-pack:无效的 index-pack 输出"
4170
7e6630a7 4171#: fetch-pack.c:985
a0b6b246
JX
4172#, c-format
4173msgid "%s failed"
4174msgstr "%s 失败"
14c8bced 4175
7e6630a7 4176#: fetch-pack.c:987
a0b6b246
JX
4177msgid "error in sideband demultiplexer"
4178msgstr "sideband 多路输出出错"
c04f5ac3 4179
7e6630a7 4180#: fetch-pack.c:1030
81809b99 4181#, c-format
a0b6b246
JX
4182msgid "Server version is %.*s"
4183msgstr "服务器版本 %.*s"
8ada9598 4184
7e6630a7
FZ
4185#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
4186#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
4187#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
4188#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
a6cd2cc4
JX
4189#, c-format
4190msgid "Server supports %s"
4191msgstr "服务器支持 %s"
4192
7e6630a7 4193#: fetch-pack.c:1040
a6cd2cc4 4194msgid "Server does not support shallow clients"
9146ef75 4195msgstr "服务器不支持浅客户端"
a6cd2cc4 4196
7e6630a7 4197#: fetch-pack.c:1100
a0b6b246
JX
4198msgid "Server does not support --shallow-since"
4199msgstr "服务器不支持 --shallow-since"
8ada9598 4200
7e6630a7 4201#: fetch-pack.c:1105
a0b6b246
JX
4202msgid "Server does not support --shallow-exclude"
4203msgstr "服务器不支持 --shallow-exclude"
c04f5ac3 4204
7e6630a7 4205#: fetch-pack.c:1109
a0b6b246
JX
4206msgid "Server does not support --deepen"
4207msgstr "服务器不支持 --deepen"
c04f5ac3 4208
7e6630a7 4209#: fetch-pack.c:1111
7157c2b5
JX
4210msgid "Server does not support this repository's object format"
4211msgstr "服务器不支持这个仓库的对象格式"
4212
7e6630a7 4213#: fetch-pack.c:1124
a0b6b246
JX
4214msgid "no common commits"
4215msgstr "没有共同的提交"
c04f5ac3 4216
7e6630a7 4217#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
33b62fba
JX
4218msgid "source repository is shallow, reject to clone."
4219msgstr "源仓库是浅克隆,拒绝克隆。"
4220
7e6630a7 4221#: fetch-pack.c:1139 fetch-pack.c:1671
a0b6b246
JX
4222msgid "git fetch-pack: fetch failed."
4223msgstr "git fetch-pack:获取失败。"
c04f5ac3 4224
7e6630a7 4225#: fetch-pack.c:1253
7157c2b5
JX
4226#, c-format
4227msgid "mismatched algorithms: client %s; server %s"
4228msgstr "不匹配的算法:客户端 %s,服务端 %s"
4229
7e6630a7 4230#: fetch-pack.c:1257
7157c2b5
JX
4231#, c-format
4232msgid "the server does not support algorithm '%s'"
4233msgstr "服务器不支持算法 '%s'"
4234
7e6630a7 4235#: fetch-pack.c:1290
fd8cb379 4236msgid "Server does not support shallow requests"
9146ef75 4237msgstr "服务器不支持浅克隆请求"
fd8cb379 4238
7e6630a7 4239#: fetch-pack.c:1297
a6cd2cc4
JX
4240msgid "Server supports filter"
4241msgstr "服务器支持 filter"
4242
7e6630a7 4243#: fetch-pack.c:1340 fetch-pack.c:2053
d46c5519
JX
4244msgid "unable to write request to remote"
4245msgstr "无法将请求写到远程"
4246
7e6630a7 4247#: fetch-pack.c:1358
c1ac5258
JX
4248#, c-format
4249msgid "error reading section header '%s'"
4250msgstr "读取节标题 '%s' 出错"
4251
7e6630a7 4252#: fetch-pack.c:1364
c1ac5258
JX
4253#, c-format
4254msgid "expected '%s', received '%s'"
4255msgstr "预期 '%s',得到 '%s'"
4256
7e6630a7 4257#: fetch-pack.c:1398
c1ac5258
JX
4258#, c-format
4259msgid "unexpected acknowledgment line: '%s'"
4260msgstr "意外的确认行:'%s'"
4261
7e6630a7 4262#: fetch-pack.c:1403
c1ac5258
JX
4263#, c-format
4264msgid "error processing acks: %d"
4265msgstr "处理 ack 出错:%d"
4266
7e6630a7 4267#: fetch-pack.c:1413
4c27fcb5
JX
4268msgid "expected packfile to be sent after 'ready'"
4269msgstr "预期在 'ready' 之后发送 packfile"
4270
7e6630a7 4271#: fetch-pack.c:1415
4c27fcb5
JX
4272msgid "expected no other sections to be sent after no 'ready'"
4273msgstr "在没有 'ready' 不应该发送其它小节"
4274
7e6630a7 4275#: fetch-pack.c:1456
c1ac5258
JX
4276#, c-format
4277msgid "error processing shallow info: %d"
4278msgstr "处理浅克隆信息出错:%d"
4279
7e6630a7 4280#: fetch-pack.c:1505
c1ac5258
JX
4281#, c-format
4282msgid "expected wanted-ref, got '%s'"
4283msgstr "预期 wanted-ref,得到 '%s'"
4284
7e6630a7 4285#: fetch-pack.c:1510
c1ac5258
JX
4286#, c-format
4287msgid "unexpected wanted-ref: '%s'"
4288msgstr "意外的 wanted-ref:'%s'"
4289
7e6630a7 4290#: fetch-pack.c:1515
c1ac5258
JX
4291#, c-format
4292msgid "error processing wanted refs: %d"
4293msgstr "处理要获取的引用出错:%d"
4294
7e6630a7 4295#: fetch-pack.c:1545
7157c2b5
JX
4296msgid "git fetch-pack: expected response end packet"
4297msgstr "git fetch-pack:预期响应结束包"
4298
7e6630a7 4299#: fetch-pack.c:1949
a0b6b246
JX
4300msgid "no matching remote head"
4301msgstr "没有匹配的远程分支"
c04f5ac3 4302
7e6630a7 4303#: fetch-pack.c:1972 builtin/clone.c:581
c1ac5258 4304msgid "remote did not send all necessary objects"
e640d114 4305msgstr "远程没有发送所有必需的对象"
c1ac5258 4306
7e6630a7 4307#: fetch-pack.c:2075
33b62fba
JX
4308msgid "unexpected 'ready' from remote"
4309msgstr "来自远程的意外的 'ready'"
4310
7e6630a7 4311#: fetch-pack.c:2098
87cb7997
JX
4312#, c-format
4313msgid "no such remote ref %s"
4314msgstr "没有这样的远程引用 %s"
4315
7e6630a7 4316#: fetch-pack.c:2101
87cb7997
JX
4317#, c-format
4318msgid "Server does not allow request for unadvertised object %s"
4319msgstr "服务器不允许请求未公开的对象 %s"
4320
84bf71ea
FZ
4321#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
4322#: gpg-interface.c:918
a0b6b246
JX
4323msgid "could not create temporary file"
4324msgstr "不能创建临时文件"
c04f5ac3 4325
84bf71ea 4326#: gpg-interface.c:332 gpg-interface.c:454
c04f5ac3 4327#, c-format
a0b6b246
JX
4328msgid "failed writing detached signature to '%s'"
4329msgstr "无法将分离式签名写入 '%s'"
c04f5ac3 4330
84bf71ea 4331#: gpg-interface.c:445
7e6630a7
FZ
4332msgid ""
4333"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
4334"signature verification"
4335msgstr "ssh 签名验证需要 gpg.ssh.allowedSignersFile 被设置且存在"
4336
84bf71ea 4337#: gpg-interface.c:469
7e6630a7
FZ
4338msgid ""
4339"ssh-keygen -Y find-principals/verify is needed for ssh signature "
4340"verification (available in openssh version 8.2p1+)"
4341msgstr ""
4342"ssh 签名验证需要 ssh-keygen -Y find-principals/verify \n"
4343"(openssh 8.2p1+ 版本可用)"
4344
84bf71ea 4345#: gpg-interface.c:523
7e6630a7
FZ
4346#, c-format
4347msgid "ssh signing revocation file configured but not found: %s"
4348msgstr "设置了 ssh 签名吊销文件但无法找到:%s"
4349
84bf71ea 4350#: gpg-interface.c:576
7e6630a7
FZ
4351#, c-format
4352msgid "bad/incompatible signature '%s'"
4353msgstr "坏的/不兼容的签名 '%s‘"
4354
84bf71ea 4355#: gpg-interface.c:735 gpg-interface.c:740
7e6630a7
FZ
4356#, c-format
4357msgid "failed to get the ssh fingerprint for key '%s'"
4358msgstr "无法得到密钥 '%s' 的 ssh 指纹"
4359
84bf71ea 4360#: gpg-interface.c:762
7e6630a7
FZ
4361msgid ""
4362"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
4363msgstr "需要配置 user.signingkey 或者 gpg.ssh.defaultKeyCommand 其中之一"
4364
84bf71ea 4365#: gpg-interface.c:780
7e6630a7 4366#, c-format
84bf71ea 4367msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
7e6630a7
FZ
4368msgstr "gpg.ssh.defaultKeyCommand 成功,但没有返回密钥:%s %s"
4369
84bf71ea 4370#: gpg-interface.c:786
7e6630a7
FZ
4371#, c-format
4372msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
4373msgstr "gpg.ssh.defaultKeyCommand 失败:%s %s"
4374
84bf71ea 4375#: gpg-interface.c:874
349ede6a
JX
4376msgid "gpg failed to sign the data"
4377msgstr "gpg 数据签名失败"
4378
84bf71ea 4379#: gpg-interface.c:895
7e6630a7
FZ
4380msgid "user.signingkey needs to be set for ssh signing"
4381msgstr "ssh 签名需要设置 user.signingkey"
4382
84bf71ea 4383#: gpg-interface.c:906
7e6630a7
FZ
4384#, c-format
4385msgid "failed writing ssh signing key to '%s'"
4386msgstr "无法将 ssh 签名密钥写入 '%s'"
4387
84bf71ea 4388#: gpg-interface.c:924
7e6630a7
FZ
4389#, c-format
4390msgid "failed writing ssh signing key buffer to '%s'"
4391msgstr "无法将 ssh 签名密钥缓冲区写入 '%s'"
4392
84bf71ea 4393#: gpg-interface.c:942
7e6630a7
FZ
4394msgid ""
4395"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
4396"8.2p1+)"
4397msgstr "ssh 签名需要 ssh-keygen -Y sign (openssh 8.2p1+ 版本可用)"
4398
84bf71ea 4399#: gpg-interface.c:954
7e6630a7
FZ
4400#, c-format
4401msgid "failed reading ssh signing data buffer from '%s'"
4402msgstr "无法从 '%s' 读入 ssh 签名数据"
4403
ddc12c42 4404#: graph.c:98
1a79b2f1 4405#, c-format
ec3d4607 4406msgid "ignored invalid color '%.*s' in log.graphColors"
1a79b2f1
JX
4407msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
4408
84bf71ea 4409#: grep.c:533
a5cd71ca
JX
4410msgid ""
4411"given pattern contains NULL byte (via -f <file>). This is only supported "
4412"with -P under PCRE v2"
4413msgstr ""
ddc12c42
JX
4414"给定的模式包含 NULL 字符(通过 -f <文件> 参数)。只有 PCRE v2 下的 -P 支持此"
4415"功能"
a5cd71ca 4416
84bf71ea 4417#: grep.c:1928
c04f5ac3 4418#, c-format
a0b6b246
JX
4419msgid "'%s': unable to read %s"
4420msgstr "'%s':无法读取 %s"
c04f5ac3 4421
84bf71ea 4422#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
33b62fba 4423#: builtin/rm.c:136
c04f5ac3 4424#, c-format
a0b6b246 4425msgid "failed to stat '%s'"
65e2041e 4426msgstr "对 '%s' 调用 stat 失败"
c04f5ac3 4427
84bf71ea 4428#: grep.c:1956
a0b6b246
JX
4429#, c-format
4430msgid "'%s': short read"
4431msgstr "'%s':读取不完整"
5c57d762 4432
7e6630a7 4433#: help.c:24
fd8cb379
JX
4434msgid "start a working area (see also: git help tutorial)"
4435msgstr "开始一个工作区(参见:git help tutorial)"
4436
7e6630a7 4437#: help.c:25
fd8cb379
JX
4438msgid "work on the current change (see also: git help everyday)"
4439msgstr "在当前变更上工作(参见:git help everyday)"
4440
7e6630a7 4441#: help.c:26
fd8cb379
JX
4442msgid "examine the history and state (see also: git help revisions)"
4443msgstr "检查历史和状态(参见:git help revisions)"
4444
7e6630a7 4445#: help.c:27
fd8cb379
JX
4446msgid "grow, mark and tweak your common history"
4447msgstr "扩展、标记和调校您的历史记录"
4448
7e6630a7 4449#: help.c:28
fd8cb379
JX
4450msgid "collaborate (see also: git help workflows)"
4451msgstr "协同(参见:git help workflows)"
4452
7e6630a7 4453#: help.c:32
fd8cb379
JX
4454msgid "Main Porcelain Commands"
4455msgstr "主要的上层命令"
4456
7e6630a7 4457#: help.c:33
fd8cb379
JX
4458msgid "Ancillary Commands / Manipulators"
4459msgstr "辅助命令/操作者"
4460
7e6630a7 4461#: help.c:34
fd8cb379
JX
4462msgid "Ancillary Commands / Interrogators"
4463msgstr "辅助命令/询问者"
4464
7e6630a7 4465#: help.c:35
fd8cb379
JX
4466msgid "Interacting with Others"
4467msgstr "与其它系统交互"
4468
7e6630a7 4469#: help.c:36
fd8cb379
JX
4470msgid "Low-level Commands / Manipulators"
4471msgstr "低级命令/操作者"
4472
7e6630a7 4473#: help.c:37
fd8cb379
JX
4474msgid "Low-level Commands / Interrogators"
4475msgstr "低级命令/询问者"
4476
7e6630a7 4477#: help.c:38
ddc12c42 4478msgid "Low-level Commands / Syncing Repositories"
fd8cb379
JX
4479msgstr "低级命令/同步仓库"
4480
7e6630a7 4481#: help.c:39
fd8cb379
JX
4482msgid "Low-level Commands / Internal Helpers"
4483msgstr "低级命令/内部助手"
4484
7e6630a7 4485#: help.c:313
a0b6b246
JX
4486#, c-format
4487msgid "available git commands in '%s'"
4488msgstr "在 '%s' 下可用的 git 命令"
c04f5ac3 4489
7e6630a7 4490#: help.c:320
a0b6b246
JX
4491msgid "git commands available from elsewhere on your $PATH"
4492msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
5c57d762 4493
7e6630a7 4494#: help.c:329
a0b6b246
JX
4495msgid "These are common Git commands used in various situations:"
4496msgstr "这些是各种场合常见的 Git 命令:"
5c57d762 4497
7e6630a7 4498#: help.c:378 git.c:100
fd8cb379
JX
4499#, c-format
4500msgid "unsupported command listing type '%s'"
4501msgstr "不支持的命令列表类型 '%s'"
4502
7e6630a7 4503#: help.c:418
d9488fea
JX
4504msgid "The Git concept guides are:"
4505msgstr "Git 概念向导有:"
fd8cb379 4506
7e6630a7 4507#: help.c:442
4c27fcb5
JX
4508msgid "See 'git help <command>' to read about a specific subcommand"
4509msgstr "执行 'git help <command>' 来查看特定子命令"
4510
7e6630a7 4511#: help.c:447
4c27fcb5
JX
4512msgid "External commands"
4513msgstr "外部命令"
4514
7e6630a7 4515#: help.c:462
4c27fcb5
JX
4516msgid "Command aliases"
4517msgstr "命令别名"
4518
7e6630a7 4519#: help.c:543
c04f5ac3 4520#, c-format
a0b6b246
JX
4521msgid ""
4522"'%s' appears to be a git command, but we were not\n"
4523"able to execute it. Maybe git-%s is broken?"
4524msgstr ""
4525"'%s' 像是一个 git 命令,但却无法运行。\n"
4526"可能是 git-%s 受损?"
c04f5ac3 4527
7e6630a7 4528#: help.c:565 help.c:662
d13389bf
JX
4529#, c-format
4530msgid "git: '%s' is not a git command. See 'git --help'."
4531msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
4532
7e6630a7 4533#: help.c:613
a0b6b246
JX
4534msgid "Uh oh. Your system reports no Git commands at all."
4535msgstr "唉呀,您的系统中未发现 Git 命令。"
c04f5ac3 4536
7e6630a7 4537#: help.c:635
c04f5ac3 4538#, c-format
a4f16749 4539msgid "WARNING: You called a Git command named '%s', which does not exist."
554e8501 4540msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。"
a4f16749 4541
7e6630a7 4542#: help.c:640
a4f16749
JX
4543#, c-format
4544msgid "Continuing under the assumption that you meant '%s'."
7e6630a7
FZ
4545msgstr "假定您想要的是 '%s' 并继续。"
4546
4547#: help.c:646
4548#, c-format
4549msgid "Run '%s' instead? (y/N)"
4550msgstr "取而代之运行 '%s' ? (y/N)"
c04f5ac3 4551
7e6630a7 4552#: help.c:654
c04f5ac3 4553#, c-format
a4f16749 4554msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
7e6630a7 4555msgstr "假定您想要的是 '%2$s',在 %1$0.1f 秒钟后继续。"
c04f5ac3 4556
7e6630a7 4557#: help.c:666
a4f16749
JX
4558msgid ""
4559"\n"
4560"The most similar command is"
4561msgid_plural ""
4562"\n"
4563"The most similar commands are"
6937cb4e
JX
4564msgstr[0] ""
4565"\n"
4566"最相似的命令是"
4567msgstr[1] ""
4568"\n"
4569"最相似的命令是"
a4f16749 4570
7e6630a7 4571#: help.c:706
a4f16749
JX
4572msgid "git version [<options>]"
4573msgstr "git version [<选项>]"
4574
7e6630a7 4575#: help.c:761
a4f16749
JX
4576#, c-format
4577msgid "%s: %s - %s"
4578msgstr "%s:%s - %s"
4579
7e6630a7 4580#: help.c:765
a0b6b246
JX
4581msgid ""
4582"\n"
4583"Did you mean this?"
4584msgid_plural ""
4585"\n"
4586"Did you mean one of these?"
4587msgstr[0] ""
4588"\n"
4589"您指的是这个么?"
4590msgstr[1] ""
4591"\n"
4592"您指的是这其中的某一个么?"
c04f5ac3 4593
7e6630a7
FZ
4594#: hook.c:27
4595#, c-format
4596msgid ""
4597"The '%s' hook was ignored because it's not set as executable.\n"
4598"You can disable this warning with `git config advice.ignoredHook false`."
4599msgstr ""
4600"因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n"
4601"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
4602
d9488fea
JX
4603#: ident.c:353
4604msgid "Author identity unknown\n"
4605msgstr "作者身份未知\n"
4606
4607#: ident.c:356
4608msgid "Committer identity unknown\n"
4609msgstr "提交者身份未知\n"
4610
4611#: ident.c:362
a0b6b246
JX
4612msgid ""
4613"\n"
4614"*** Please tell me who you are.\n"
4615"\n"
4616"Run\n"
4617"\n"
4618" git config --global user.email \"you@example.com\"\n"
4619" git config --global user.name \"Your Name\"\n"
4620"\n"
4621"to set your account's default identity.\n"
4622"Omit --global to set the identity only in this repository.\n"
4623"\n"
4624msgstr ""
4625"\n"
7e6630a7 4626"*** 请告诉我您是谁。\n"
a0b6b246
JX
4627"\n"
4628"运行\n"
4629"\n"
4630" git config --global user.email \"you@example.com\"\n"
4631" git config --global user.name \"Your Name\"\n"
4632"\n"
4633"来设置您账号的缺省身份标识。\n"
4634"如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
c04f5ac3 4635
d9488fea 4636#: ident.c:397
87cb7997 4637msgid "no email was given and auto-detection is disabled"
65e2041e 4638msgstr "未提供邮件地址且自动探测被禁用"
87cb7997 4639
d9488fea 4640#: ident.c:402
87cb7997
JX
4641#, c-format
4642msgid "unable to auto-detect email address (got '%s')"
4643msgstr "无法自动探测邮件地址(得到 '%s')"
4644
d9488fea 4645#: ident.c:419
87cb7997
JX
4646msgid "no name was given and auto-detection is disabled"
4647msgstr "未提供姓名且自动探测被禁用"
4648
d9488fea 4649#: ident.c:425
87cb7997
JX
4650#, c-format
4651msgid "unable to auto-detect name (got '%s')"
4652msgstr "无法自动探测姓名(得到 '%s')"
4653
d9488fea 4654#: ident.c:433
87cb7997
JX
4655#, c-format
4656msgid "empty ident name (for <%s>) not allowed"
4657msgstr "不允许空的姓名(对于 <%s>)"
4658
d9488fea 4659#: ident.c:439
87cb7997
JX
4660#, c-format
4661msgid "name consists only of disallowed characters: %s"
4662msgstr "姓名中仅包含禁用字符:%s"
4663
7e6630a7 4664#: ident.c:454 builtin/commit.c:648
87cb7997
JX
4665#, c-format
4666msgid "invalid date format: %s"
4667msgstr "无效的日期格式:%s"
4668
33b62fba 4669#: list-objects-filter-options.c:83
06991777
JX
4670msgid "expected 'tree:<depth>'"
4671msgstr "期望 'tree:<深度>'"
4c27fcb5 4672
33b62fba 4673#: list-objects-filter-options.c:98
d46c5519
JX
4674msgid "sparse:path filters support has been dropped"
4675msgstr "sparse:path 过滤器支持已被删除"
4676
33b62fba
JX
4677#: list-objects-filter-options.c:105
4678#, c-format
ec3d4607 4679msgid "'%s' for 'object:type=<type>' is not a valid object type"
33b62fba
JX
4680msgstr "'object:type=<type>' 的值 '%s' 不是有效的对象类型"
4681
4682#: list-objects-filter-options.c:124
a6cd2cc4
JX
4683#, c-format
4684msgid "invalid filter-spec '%s'"
4685msgstr "无效的过滤器表达式 '%s'"
4686
33b62fba 4687#: list-objects-filter-options.c:140
a5cd71ca
JX
4688#, c-format
4689msgid "must escape char in sub-filter-spec: '%c'"
4690msgstr "必须对 sub-filter-spec 中的字符进行转义:'%c'"
4691
33b62fba 4692#: list-objects-filter-options.c:182
a5cd71ca
JX
4693msgid "expected something after combine:"
4694msgstr "期望在组合后有一些东西:"
4695
33b62fba 4696#: list-objects-filter-options.c:264
a5cd71ca
JX
4697msgid "multiple filter-specs cannot be combined"
4698msgstr "不能混用多种过滤规格"
5809aa05 4699
33b62fba 4700#: list-objects-filter-options.c:376
7157c2b5
JX
4701msgid "unable to upgrade repository format to support partial clone"
4702msgstr "无法升级仓库格式以支持部分克隆"
4703
33b62fba 4704#: list-objects-filter.c:532
349ede6a
JX
4705#, c-format
4706msgid "unable to access sparse blob in '%s'"
4707msgstr "不能访问 '%s' 中的稀疏数据对象"
4708
33b62fba 4709#: list-objects-filter.c:535
349ede6a
JX
4710#, c-format
4711msgid "unable to parse sparse filter data in %s"
4712msgstr "无法解析 %s 中的稀疏过滤器数据"
4713
4714#: list-objects.c:127
4715#, c-format
4716msgid "entry '%s' in tree %s has tree mode, but is not a tree"
4717msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式,但不是一个树对象"
4718
4719#: list-objects.c:140
4720#, c-format
4721msgid "entry '%s' in tree %s has blob mode, but is not a blob"
4722msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式,但不是一个数据对象"
4723
ec3d4607 4724#: list-objects.c:398
349ede6a
JX
4725#, c-format
4726msgid "unable to load root tree for commit %s"
4727msgstr "无法为提交 %s 加载根树"
4728
4729#: lockfile.c:152
c04f5ac3 4730#, c-format
a0b6b246
JX
4731msgid ""
4732"Unable to create '%s.lock': %s.\n"
4733"\n"
4734"Another git process seems to be running in this repository, e.g.\n"
4735"an editor opened by 'git commit'. Please make sure all processes\n"
4736"are terminated then try again. If it still fails, a git process\n"
4737"may have crashed in this repository earlier:\n"
4738"remove the file manually to continue."
4739msgstr ""
4740"无法创建 '%s.lock':%s。\n"
4741"\n"
4742"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
4743"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
4744"可能之前有一个 git 进程在这个仓库中异常退出:\n"
4745"手动删除这个文件再继续。"
c04f5ac3 4746
349ede6a 4747#: lockfile.c:160
a0b6b246
JX
4748#, c-format
4749msgid "Unable to create '%s.lock': %s"
4750msgstr "不能创建 '%s.lock':%s"
c04f5ac3 4751
473eb541
JX
4752#: ls-refs.c:37
4753#, c-format
4754msgid "invalid value '%s' for lsrefs.unborn"
4755msgstr "lsrefs.unborn 的取值 '%s' 无效"
4756
7e6630a7
FZ
4757#: ls-refs.c:174
4758#, c-format
4759msgid "unexpected line: '%s'"
4760msgstr "意外的行:'%s'"
4761
4762#: ls-refs.c:178
349ede6a
JX
4763msgid "expected flush after ls-refs arguments"
4764msgstr "在 ls-refs 参数后应该有一个 flush 包"
c04f5ac3 4765
33b62fba
JX
4766#: mailinfo.c:1050
4767msgid "quoted CRLF detected"
7b4d4954 4768msgstr "检测到被引用的 CRLF"
33b62fba 4769
7e6630a7 4770#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
33b62fba
JX
4771#, c-format
4772msgid "bad action '%s' for '%s'"
4773msgstr "'%2$s' 的错误动作 '%1$s'"
4774
7e6630a7 4775#: merge-ort.c:1584 merge-recursive.c:1211
473eb541
JX
4776#, c-format
4777msgid "Failed to merge submodule %s (not checked out)"
4778msgstr "无法合并子模组 %s (没有检出)"
4779
7e6630a7 4780#: merge-ort.c:1593 merge-recursive.c:1218
473eb541
JX
4781#, c-format
4782msgid "Failed to merge submodule %s (commits not present)"
4783msgstr "无法合并子模组 %s(提交不存在)"
4784
7e6630a7 4785#: merge-ort.c:1602 merge-recursive.c:1225
473eb541
JX
4786#, c-format
4787msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4788msgstr "无法合并子模组 %s (提交未跟随合并基线)"
4789
7e6630a7 4790#: merge-ort.c:1612 merge-ort.c:1620
473eb541
JX
4791#, c-format
4792msgid "Note: Fast-forwarding submodule %s to %s"
4793msgstr "注意:快进子模组 %s 到 %s"
4794
7e6630a7 4795#: merge-ort.c:1642
473eb541
JX
4796#, c-format
4797msgid "Failed to merge submodule %s"
4798msgstr "无法合并子模组 %s"
4799
7e6630a7 4800#: merge-ort.c:1649
473eb541
JX
4801#, c-format
4802msgid ""
4803"Failed to merge submodule %s, but a possible merge resolution exists:\n"
4804"%s\n"
4805msgstr ""
4806"无法合并子模组 %s,但是存在一个可能的合并方案:\n"
4807"%s\n"
4808
7e6630a7 4809#: merge-ort.c:1653 merge-recursive.c:1281
473eb541
JX
4810#, c-format
4811msgid ""
4812"If this is correct simply add it to the index for example\n"
4813"by using:\n"
4814"\n"
4815" git update-index --cacheinfo 160000 %s \"%s\"\n"
4816"\n"
4817"which will accept this suggestion.\n"
4818msgstr ""
4819"如果这个正确,将其添加到索引,例如使用命令:\n"
4820"\n"
4821" git update-index --cacheinfo 160000 %s \"%s\"\n"
4822"\n"
4823"以接受此建议。\n"
4824
7e6630a7 4825#: merge-ort.c:1666
473eb541
JX
4826#, c-format
4827msgid ""
4828"Failed to merge submodule %s, but multiple possible merges exist:\n"
4829"%s"
4830msgstr ""
4831"无法合并子模组 %s,但是存在多个可能的合并:\n"
4832"%s"
4833
7e6630a7 4834#: merge-ort.c:1887 merge-recursive.c:1372
473eb541
JX
4835msgid "Failed to execute internal merge"
4836msgstr "无法执行内部合并"
4837
7e6630a7 4838#: merge-ort.c:1892 merge-recursive.c:1377
473eb541
JX
4839#, c-format
4840msgid "Unable to add %s to database"
4841msgstr "不能添加 %s 至对象库"
4842
7e6630a7 4843#: merge-ort.c:1899 merge-recursive.c:1410
473eb541
JX
4844#, c-format
4845msgid "Auto-merging %s"
4846msgstr "自动合并 %s"
4847
7e6630a7 4848#: merge-ort.c:2038 merge-recursive.c:2132
473eb541
JX
4849#, c-format
4850msgid ""
4851"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
4852"implicit directory rename(s) putting the following path(s) there: %s."
4853msgstr ""
4854"冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放"
4855"在:%s。"
4856
7e6630a7 4857#: merge-ort.c:2048 merge-recursive.c:2142
473eb541
JX
4858#, c-format
4859msgid ""
4860"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
4861"implicit directory renames tried to put these paths there: %s"
4862msgstr ""
4863"冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路"
4864"径放置于此:%s"
4865
7e6630a7 4866#: merge-ort.c:2106
473eb541
JX
4867#, c-format
4868msgid ""
4869"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
4870"renamed to multiple other directories, with no destination getting a "
4871"majority of the files."
33b62fba
JX
4872msgstr ""
4873"冲突(分割的目录重命名):不清楚重命名 %s 到哪里,因为它被重命名到多个其他目"
4874"录中,没有一个目标目录中包含多数文件。"
473eb541 4875
7e6630a7 4876#: merge-ort.c:2260 merge-recursive.c:2478
473eb541
JX
4877#, c-format
4878msgid ""
4879"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4880"renamed."
4881msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。"
4882
7e6630a7 4883#: merge-ort.c:2400 merge-recursive.c:3261
473eb541
JX
4884#, c-format
4885msgid ""
4886"Path updated: %s added in %s inside a directory that was renamed in %s; "
4887"moving it to %s."
4888msgstr ""
4889"路径已更新:%s 添加到 %s,位于一个被重命名到 %s 的目录中,将其移动到 %s。"
4890
7e6630a7 4891#: merge-ort.c:2407 merge-recursive.c:3268
473eb541
JX
4892#, c-format
4893msgid ""
4894"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
4895"%s; moving it to %s."
4896msgstr ""
4897"路径已更新:%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,将其移"
4898"动到 %5$s。"
4899
7e6630a7 4900#: merge-ort.c:2420 merge-recursive.c:3264
473eb541
JX
4901#, c-format
4902msgid ""
4903"CONFLICT (file location): %s added in %s inside a directory that was renamed "
4904"in %s, suggesting it should perhaps be moved to %s."
4905msgstr ""
4906"冲突(文件位置):%s 添加到 %s,位于一个被重命名为 %s 的目录中,建议将其移动"
4907"到 %s。"
4908
7e6630a7 4909#: merge-ort.c:2428 merge-recursive.c:3271
473eb541
JX
4910#, c-format
4911msgid ""
4912"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
4913"was renamed in %s, suggesting it should perhaps be moved to %s."
4914msgstr ""
4915"冲突(文件位置):%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,"
4916"建议将其移动到 %5$s。"
4917
7e6630a7 4918#: merge-ort.c:2584
473eb541
JX
4919#, c-format
4920msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
33b62fba
JX
4921msgstr ""
4922"冲突(重命名/重命名):%1$s 重命名为 %3$s 中的 %2$s,以及在 %5$s 中的 %4$s。"
473eb541 4923
7e6630a7 4924#: merge-ort.c:2679
473eb541
JX
4925#, c-format
4926msgid ""
4927"CONFLICT (rename involved in collision): rename of %s -> %s has content "
4928"conflicts AND collides with another path; this may result in nested conflict "
4929"markers."
33b62fba
JX
4930msgstr ""
4931"冲突(重命名卷入冲突):重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞,这"
4932"可能导致嵌套的冲突标签。"
473eb541 4933
7e6630a7 4934#: merge-ort.c:2698 merge-ort.c:2722
473eb541
JX
4935#, c-format
4936msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
4937msgstr "冲突(重命名/删除):%1$s 在 %3$s 中重命名为 %2$s,但在 %4$s 中删除。"
4938
7e6630a7 4939#: merge-ort.c:3212 merge-recursive.c:3022
33b62fba
JX
4940#, c-format
4941msgid "cannot read object %s"
4942msgstr "不能读取对象 %s"
4943
7e6630a7 4944#: merge-ort.c:3215 merge-recursive.c:3025
33b62fba
JX
4945#, c-format
4946msgid "object %s is not a blob"
4947msgstr "对象 %s 不是一个数据对象"
4948
7e6630a7 4949#: merge-ort.c:3644
473eb541
JX
4950#, c-format
4951msgid ""
4952"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
4953"%s instead."
4954msgstr "冲突(文件/目录):目录已存在于 %2$s 中的 %1$s,将其移动到 %3$s。"
4955
7e6630a7 4956#: merge-ort.c:3721
473eb541
JX
4957#, c-format
4958msgid ""
33b62fba 4959"CONFLICT (distinct types): %s had different types on each side; renamed both "
473eb541 4960"of them so each can be recorded somewhere."
ec3d4607
JX
4961msgstr ""
4962"冲突(不同类型):%s 在两侧有不同的类型,将两者都重命名以便它们能记录在不同位"
4963"置。"
473eb541 4964
7e6630a7 4965#: merge-ort.c:3728
33b62fba
JX
4966#, c-format
4967msgid ""
4968"CONFLICT (distinct types): %s had different types on each side; renamed one "
4969"of them so each can be recorded somewhere."
ec3d4607
JX
4970msgstr ""
4971"冲突(不同类型):%s 在两侧有不同的类型,将其中之一重命名以便它们能记录在不同"
4972"位置。"
473eb541 4973
7e6630a7 4974#: merge-ort.c:3819 merge-recursive.c:3101
473eb541
JX
4975msgid "content"
4976msgstr "内容"
4977
7e6630a7 4978#: merge-ort.c:3821 merge-recursive.c:3105
473eb541
JX
4979msgid "add/add"
4980msgstr "添加/添加"
4981
7e6630a7 4982#: merge-ort.c:3823 merge-recursive.c:3150
473eb541
JX
4983msgid "submodule"
4984msgstr "子模组"
4985
7e6630a7 4986#: merge-ort.c:3825 merge-recursive.c:3151
473eb541
JX
4987#, c-format
4988msgid "CONFLICT (%s): Merge conflict in %s"
4989msgstr "冲突(%s):合并冲突于 %s"
4990
7e6630a7 4991#: merge-ort.c:3856
473eb541
JX
4992#, c-format
4993msgid ""
4994"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
4995"of %s left in tree."
33b62fba
JX
4996msgstr ""
4997"冲突(修改/删除):%1$s 在 %2$s 中被删除,在 %3$s 中被修改。%5$s 的 %4$s 版本"
4998"在树中被保留。"
4999
7e6630a7 5000#: merge-ort.c:4152
33b62fba
JX
5001#, c-format
5002msgid ""
5003"Note: %s not up to date and in way of checking out conflicted version; old "
5004"copy renamed to %s"
7b4d4954 5005msgstr "注意:%s 不是最新的,并且与要检出的版本冲突。旧副本重命名为 %s"
473eb541
JX
5006
5007#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
5008#. base, and 2-3) the trees for the two trees we're merging.
5009#.
7e6630a7 5010#: merge-ort.c:4521
473eb541
JX
5011#, c-format
5012msgid "collecting merge info failed for trees %s, %s, %s"
5013msgstr "无法收集树 %s、%s、%s 的合并信息"
5014
7e6630a7 5015#: merge-ort-wrappers.c:13 merge-recursive.c:3716
d13389bf
JX
5016#, c-format
5017msgid ""
5018"Your local changes to the following files would be overwritten by merge:\n"
5019" %s"
5020msgstr ""
5021"您对下列文件的本地修改将被合并操作覆盖:\n"
5022" %s"
5023
7e6630a7 5024#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
33b62fba
JX
5025msgid "Already up to date."
5026msgstr "已经是最新的。"
d13389bf 5027
7e6630a7 5028#: merge-recursive.c:353
a0b6b246
JX
5029msgid "(bad commit)\n"
5030msgstr "(坏提交)\n"
c04f5ac3 5031
7e6630a7 5032#: merge-recursive.c:381
a0b6b246 5033#, c-format
fd8cb379 5034msgid "add_cacheinfo failed for path '%s'; merge aborting."
0fcd668f 5035msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。"
c04f5ac3 5036
7e6630a7 5037#: merge-recursive.c:390
fd8cb379
JX
5038#, c-format
5039msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
0fcd668f 5040msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。"
fd8cb379 5041
7e6630a7 5042#: merge-recursive.c:881
c04f5ac3 5043#, c-format
a0b6b246 5044msgid "failed to create path '%s'%s"
c1ac5258 5045msgstr "创建路径 '%s'%s 失败"
c04f5ac3 5046
7e6630a7 5047#: merge-recursive.c:892
c04f5ac3 5048#, c-format
a0b6b246
JX
5049msgid "Removing %s to make room for subdirectory\n"
5050msgstr "删除 %s 以便为子目录留出空间\n"
c04f5ac3 5051
7e6630a7 5052#: merge-recursive.c:906 merge-recursive.c:925
a0b6b246
JX
5053msgid ": perhaps a D/F conflict?"
5054msgstr ":可能是一个目录/文件冲突?"
c04f5ac3 5055
7e6630a7 5056#: merge-recursive.c:915
c04f5ac3 5057#, c-format
a0b6b246
JX
5058msgid "refusing to lose untracked file at '%s'"
5059msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
c04f5ac3 5060
7e6630a7 5061#: merge-recursive.c:956 builtin/cat-file.c:41
c04f5ac3 5062#, c-format
a0b6b246
JX
5063msgid "cannot read object %s '%s'"
5064msgstr "不能读取对象 %s '%s'"
c04f5ac3 5065
7e6630a7 5066#: merge-recursive.c:961
4dcdc3d8 5067#, c-format
a0b6b246
JX
5068msgid "blob expected for %s '%s'"
5069msgstr "%s '%s' 应为数据对象"
4dcdc3d8 5070
7e6630a7 5071#: merge-recursive.c:986
4dcdc3d8 5072#, c-format
a0b6b246 5073msgid "failed to open '%s': %s"
c1ac5258 5074msgstr "打开 '%s' 失败:%s"
4dcdc3d8 5075
7e6630a7 5076#: merge-recursive.c:997
a0b6b246
JX
5077#, c-format
5078msgid "failed to symlink '%s': %s"
c1ac5258 5079msgstr "创建符号链接 '%s' 失败:%s"
c04f5ac3 5080
7e6630a7 5081#: merge-recursive.c:1002
5c57d762 5082#, c-format
a0b6b246
JX
5083msgid "do not know what to do with %06o %s '%s'"
5084msgstr "不知道如何处理 %06o %s '%s'"
5c57d762 5085
7e6630a7 5086#: merge-recursive.c:1233 merge-recursive.c:1246
fd8cb379
JX
5087#, c-format
5088msgid "Fast-forwarding submodule %s to the following commit:"
5089msgstr "子模组 %s 快进到如下提交:"
5090
7e6630a7 5091#: merge-recursive.c:1236 merge-recursive.c:1249
fd8cb379
JX
5092#, c-format
5093msgid "Fast-forwarding submodule %s"
5094msgstr "快进子模组 %s"
5095
7e6630a7 5096#: merge-recursive.c:1273
fd8cb379
JX
5097#, c-format
5098msgid "Failed to merge submodule %s (merge following commits not found)"
5099msgstr "无法合并子模组 %s (没发现合并跟随的提交)"
5100
7e6630a7 5101#: merge-recursive.c:1277
fd8cb379
JX
5102#, c-format
5103msgid "Failed to merge submodule %s (not fast-forward)"
5104msgstr "无法合并子模组 %s(非快进)"
5105
7e6630a7 5106#: merge-recursive.c:1278
fd8cb379
JX
5107msgid "Found a possible merge resolution for the submodule:\n"
5108msgstr "找到子模组的一个可能的合并方案:\n"
5109
7e6630a7 5110#: merge-recursive.c:1290
fd8cb379
JX
5111#, c-format
5112msgid "Failed to merge submodule %s (multiple merges found)"
5113msgstr "无法合并子模组 %s (发现多个合并)"
5114
7e6630a7 5115#: merge-recursive.c:1434
fd8cb379
JX
5116#, c-format
5117msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
5118msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。"
5119
7e6630a7 5120#: merge-recursive.c:1506
5c57d762
JX
5121#, c-format
5122msgid ""
a0b6b246
JX
5123"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
5124"in tree."
5c57d762 5125msgstr ""
87cb7997
JX
5126"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
5127"本被保留。"
5128
7e6630a7 5129#: merge-recursive.c:1511
87cb7997
JX
5130#, c-format
5131msgid ""
5132"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
5133"left in tree."
5134msgstr ""
5135"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
5136"%7$s 版本被保留。"
c04f5ac3 5137
7e6630a7 5138#: merge-recursive.c:1518
7aea43ff 5139#, c-format
a0b6b246
JX
5140msgid ""
5141"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
5142"in tree at %s."
5143msgstr ""
87cb7997
JX
5144"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
5145"本保留在 %8$s 中。"
7aea43ff 5146
7e6630a7 5147#: merge-recursive.c:1523
87cb7997
JX
5148#, c-format
5149msgid ""
5150"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
5151"left in tree at %s."
5152msgstr ""
5153"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
5154"%7$s 版本保留在 %9$s 中。"
5155
7e6630a7 5156#: merge-recursive.c:1558
a0b6b246
JX
5157msgid "rename"
5158msgstr "重命名"
5b04ee3b 5159
7e6630a7 5160#: merge-recursive.c:1558
a0b6b246
JX
5161msgid "renamed"
5162msgstr "重命名"
5b04ee3b 5163
7e6630a7 5164#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
fd8cb379
JX
5165#, c-format
5166msgid "Refusing to lose dirty file at %s"
5167msgstr "拒绝丢失脏文件 '%s'"
5168
7e6630a7 5169#: merge-recursive.c:1619
06991777
JX
5170#, c-format
5171msgid "Refusing to lose untracked file at %s, even though it's in the way."
5172msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。"
5173
7e6630a7 5174#: merge-recursive.c:1677
06991777
JX
5175#, c-format
5176msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
5177msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
5178
7e6630a7 5179#: merge-recursive.c:1708
5c57d762 5180#, c-format
a0b6b246
JX
5181msgid "%s is a directory in %s adding as %s instead"
5182msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
5c57d762 5183
7e6630a7 5184#: merge-recursive.c:1713
fd8cb379
JX
5185#, c-format
5186msgid "Refusing to lose untracked file at %s; adding as %s instead"
5187msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s"
5188
7e6630a7 5189#: merge-recursive.c:1740
5c57d762
JX
5190#, c-format
5191msgid ""
a0b6b246
JX
5192"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
5193"\"->\"%s\" in \"%s\"%s"
5c57d762 5194msgstr ""
a0b6b246
JX
5195"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
5196"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
5c57d762 5197
7e6630a7 5198#: merge-recursive.c:1745
a0b6b246
JX
5199msgid " (left unresolved)"
5200msgstr "(留下未解决)"
5c57d762 5201
7e6630a7 5202#: merge-recursive.c:1837
5c57d762 5203#, c-format
a0b6b246 5204msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
5c57d762 5205msgstr ""
a0b6b246
JX
5206"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
5207"%5$s"
3495628d 5208
7e6630a7 5209#: merge-recursive.c:2100
fd8cb379
JX
5210#, c-format
5211msgid ""
5212"CONFLICT (directory rename split): Unclear where to place %s because "
5213"directory %s was renamed to multiple other directories, with no destination "
5214"getting a majority of the files."
c1ac5258
JX
5215msgstr ""
5216"冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个"
5217"其它目录,没有目录包含大部分文件。"
fd8cb379 5218
7e6630a7 5219#: merge-recursive.c:2234
fd8cb379
JX
5220#, c-format
5221msgid ""
5222"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
5223">%s in %s"
5224msgstr ""
5225"冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 "
5226"%4$s->%5$s"
5227
7e6630a7 5228#: merge-recursive.c:3089
a0b6b246
JX
5229msgid "modify"
5230msgstr "修改"
90314792 5231
7e6630a7 5232#: merge-recursive.c:3089
a0b6b246
JX
5233msgid "modified"
5234msgstr "修改"
5b04ee3b 5235
7e6630a7 5236#: merge-recursive.c:3128
220c313c 5237#, c-format
a0b6b246
JX
5238msgid "Skipped %s (merged same as existing)"
5239msgstr "略过 %s(已经做过相同合并)"
220c313c 5240
7e6630a7 5241#: merge-recursive.c:3181
220c313c 5242#, c-format
06991777
JX
5243msgid "Adding as %s instead"
5244msgstr "而是以 %s 为名添加"
5245
7e6630a7 5246#: merge-recursive.c:3385
d46c5519
JX
5247#, c-format
5248msgid "Removing %s"
5249msgstr "删除 %s"
5250
7e6630a7 5251#: merge-recursive.c:3408
d46c5519
JX
5252msgid "file/directory"
5253msgstr "文件/目录"
220c313c 5254
7e6630a7 5255#: merge-recursive.c:3413
a0b6b246
JX
5256msgid "directory/file"
5257msgstr "目录/文件"
276ceeaa 5258
7e6630a7 5259#: merge-recursive.c:3420
276ceeaa 5260#, c-format
a0b6b246
JX
5261msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
5262msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
276ceeaa 5263
7e6630a7 5264#: merge-recursive.c:3429
276ceeaa 5265#, c-format
a0b6b246
JX
5266msgid "Adding %s"
5267msgstr "添加 %s"
276ceeaa 5268
7e6630a7 5269#: merge-recursive.c:3438
06991777
JX
5270#, c-format
5271msgid "CONFLICT (add/add): Merge conflict in %s"
5272msgstr "冲突(add/add):合并冲突于 %s"
5273
7e6630a7 5274#: merge-recursive.c:3491
276ceeaa 5275#, c-format
a0b6b246
JX
5276msgid "merging of trees %s and %s failed"
5277msgstr "无法合并树 %s 和 %s"
276ceeaa 5278
7e6630a7 5279#: merge-recursive.c:3585
a0b6b246
JX
5280msgid "Merging:"
5281msgstr "合并:"
5c57d762 5282
7e6630a7 5283#: merge-recursive.c:3598
5c57d762 5284#, c-format
a0b6b246
JX
5285msgid "found %u common ancestor:"
5286msgid_plural "found %u common ancestors:"
5287msgstr[0] "发现 %u 个共同祖先:"
5288msgstr[1] "发现 %u 个共同祖先:"
5289
7e6630a7 5290#: merge-recursive.c:3648
a0b6b246
JX
5291msgid "merge returned no commit"
5292msgstr "合并未返回提交"
5293
7e6630a7 5294#: merge-recursive.c:3816
5c57d762 5295#, c-format
a0b6b246
JX
5296msgid "Could not parse object '%s'"
5297msgstr "不能解析对象 '%s'"
5c57d762 5298
7e6630a7
FZ
5299#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
5300#: builtin/stash.c:489
a0b6b246
JX
5301msgid "Unable to write index."
5302msgstr "不能写入索引。"
5303
349ede6a
JX
5304#: merge.c:41
5305msgid "failed to read the cache"
5306msgstr "读取缓存失败"
5307
7e6630a7
FZ
5308#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
5309#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
5310#: builtin/stash.c:269
349ede6a
JX
5311msgid "unable to write new index file"
5312msgstr "无法写新的索引文件"
5313
7e6630a7 5314#: midx.c:78
473eb541
JX
5315msgid "multi-pack-index OID fanout is of the wrong size"
5316msgstr "多包索引的对象ID扇出表大小错误"
5317
7e6630a7 5318#: midx.c:109
4c27fcb5
JX
5319#, c-format
5320msgid "multi-pack-index file %s is too small"
5321msgstr "多包索引文件 %s 太小"
5322
7e6630a7 5323#: midx.c:125
4c27fcb5
JX
5324#, c-format
5325msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
5326msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
5327
7e6630a7 5328#: midx.c:130
4c27fcb5
JX
5329#, c-format
5330msgid "multi-pack-index version %d not recognized"
5331msgstr "multi-pack-index 版本 %d 不能被识别"
5332
7e6630a7 5333#: midx.c:135
4c27fcb5 5334#, c-format
d9488fea
JX
5335msgid "multi-pack-index hash version %u does not match version %u"
5336msgstr "多包索引哈希版本 %u 和版本 %u 不匹配"
4c27fcb5 5337
7e6630a7 5338#: midx.c:152
4c27fcb5
JX
5339msgid "multi-pack-index missing required pack-name chunk"
5340msgstr "多包索引缺少必需的包名块"
5341
7e6630a7 5342#: midx.c:154
4c27fcb5 5343msgid "multi-pack-index missing required OID fanout chunk"
5b533632 5344msgstr "多包索引缺少必需的对象 ID 扇出块"
4c27fcb5 5345
7e6630a7 5346#: midx.c:156
4c27fcb5 5347msgid "multi-pack-index missing required OID lookup chunk"
5b533632 5348msgstr "多包索引缺少必需的对象 ID 查询块"
4c27fcb5 5349
7e6630a7 5350#: midx.c:158
4c27fcb5
JX
5351msgid "multi-pack-index missing required object offsets chunk"
5352msgstr "多包索引缺少必需的对象偏移块"
5353
7e6630a7 5354#: midx.c:174
4c27fcb5
JX
5355#, c-format
5356msgid "multi-pack-index pack names out of order: '%s' before '%s'"
5357msgstr "多包索引包名无序:'%s' 在 '%s' 之前"
5358
7e6630a7 5359#: midx.c:221
4c27fcb5
JX
5360#, c-format
5361msgid "bad pack-int-id: %u (%u total packs)"
5362msgstr "错的 pack-int-id:%u(共有 %u 个包)"
5363
7e6630a7 5364#: midx.c:271
4c27fcb5
JX
5365msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
5366msgstr "多包索引存储一个64位偏移,但是 off_t 太小"
5367
7e6630a7 5368#: midx.c:502
4c27fcb5
JX
5369#, c-format
5370msgid "failed to add packfile '%s'"
5371msgstr "添加包文件 '%s' 失败"
5372
7e6630a7 5373#: midx.c:508
4c27fcb5
JX
5374#, c-format
5375msgid "failed to open pack-index '%s'"
5376msgstr "打开包索引 '%s' 失败"
5377
7e6630a7 5378#: midx.c:576
4c27fcb5
JX
5379#, c-format
5380msgid "failed to locate object %d in packfile"
5381msgstr "在包文件中定位对象 %d 失败"
5382
7e6630a7 5383#: midx.c:892
33b62fba
JX
5384msgid "cannot store reverse index file"
5385msgstr "无法存储反向索引文件"
5386
7e6630a7
FZ
5387#: midx.c:990
5388#, c-format
5389msgid "could not parse line: %s"
5390msgstr "不能解析行: %s"
5391
5392#: midx.c:992
5393#, c-format
5394msgid "malformed line: %s"
5395msgstr "格式错误的行:%s"
5396
5397#: midx.c:1159
ec3d4607
JX
5398msgid "ignoring existing multi-pack-index; checksum mismatch"
5399msgstr "忽略已存在的多包索引,校验码不匹配"
5400
7e6630a7
FZ
5401#: midx.c:1184
5402msgid "could not load pack"
5403msgstr "不能载入包"
ddc12c42 5404
7e6630a7 5405#: midx.c:1190
a6cd2cc4 5406#, c-format
7e6630a7
FZ
5407msgid "could not open index for %s"
5408msgstr "不能打开 %s 的索引"
a6cd2cc4 5409
7e6630a7
FZ
5410#: midx.c:1201
5411msgid "Adding packfiles to multi-pack-index"
5412msgstr "添加包文件到多包索引"
5413
5414#: midx.c:1244
33b62fba
JX
5415#, c-format
5416msgid "unknown preferred pack: '%s'"
5417msgstr "未知的首选包:'%s'"
5418
7e6630a7
FZ
5419#: midx.c:1289
5420#, c-format
5421msgid "cannot select preferred pack %s with no objects"
5422msgstr "不能选择没有对象的首选包 %s"
5423
5424#: midx.c:1321
5425#, c-format
5426msgid "did not see pack-file %s to drop"
5427msgstr "没有看到要丢弃的包文件 %s"
5428
5429#: midx.c:1367
33b62fba
JX
5430#, c-format
5431msgid "preferred pack '%s' is expired"
5432msgstr "首选包 '%s' 已过期"
5433
7e6630a7 5434#: midx.c:1380
349ede6a
JX
5435msgid "no pack files to index."
5436msgstr "没有要索引的包文件。"
5437
7e6630a7
FZ
5438#: midx.c:1417
5439msgid "could not write multi-pack bitmap"
5440msgstr "无法写入多包位图"
5441
5442#: midx.c:1427
5443msgid "could not write multi-pack-index"
5444msgstr "无法写入多包索引"
5445
5446#: midx.c:1486 builtin/clean.c:37
33b62fba
JX
5447#, c-format
5448msgid "failed to remove %s"
5449msgstr "删除 %s 失败"
5450
7e6630a7 5451#: midx.c:1517
4c27fcb5
JX
5452#, c-format
5453msgid "failed to clear multi-pack-index at %s"
5454msgstr "清理位于 %s 的多包索引失败"
5455
7e6630a7 5456#: midx.c:1577
d9488fea
JX
5457msgid "multi-pack-index file exists, but failed to parse"
5458msgstr "多包索引文件存在,但无法解析"
5459
7e6630a7 5460#: midx.c:1585
ec3d4607
JX
5461msgid "incorrect checksum"
5462msgstr "不正确的校验码"
5463
7e6630a7 5464#: midx.c:1588
d46c5519
JX
5465msgid "Looking for referenced packfiles"
5466msgstr "正在查找引用的包文件"
5467
7e6630a7 5468#: midx.c:1603
4c27fcb5
JX
5469#, c-format
5470msgid ""
5471"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
5b533632 5472msgstr "对象 ID 扇出无序:fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
4c27fcb5 5473
7e6630a7 5474#: midx.c:1608
349ede6a
JX
5475msgid "the midx contains no oid"
5476msgstr "midx 不包含 oid"
5477
7e6630a7 5478#: midx.c:1617
ddc12c42
JX
5479msgid "Verifying OID order in multi-pack-index"
5480msgstr "校验多包索引中的 OID 顺序"
d46c5519 5481
7e6630a7 5482#: midx.c:1626
4c27fcb5
JX
5483#, c-format
5484msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
5b533632 5485msgstr "对象 ID 查询无序:oid[%d] = %s >= %s = oid[%d]"
4c27fcb5 5486
7e6630a7 5487#: midx.c:1646
d46c5519
JX
5488msgid "Sorting objects by packfile"
5489msgstr "通过包文件为对象排序"
5490
7e6630a7 5491#: midx.c:1653
4c27fcb5
JX
5492msgid "Verifying object offsets"
5493msgstr "校验对象偏移"
5494
7e6630a7 5495#: midx.c:1669
4c27fcb5
JX
5496#, c-format
5497msgid "failed to load pack entry for oid[%d] = %s"
5498msgstr "为 oid[%d] = %s 加载包条目失败"
5499
7e6630a7 5500#: midx.c:1675
4c27fcb5
JX
5501#, c-format
5502msgid "failed to load pack-index for packfile %s"
5503msgstr "为包文件 %s 加载包索引失败"
5504
7e6630a7 5505#: midx.c:1684
4c27fcb5
JX
5506#, c-format
5507msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
5508msgstr "oid[%d] = %s 错误的对象偏移:%<PRIx64> != %<PRIx64>"
5509
7e6630a7 5510#: midx.c:1709
ddc12c42
JX
5511msgid "Counting referenced objects"
5512msgstr "正在对引用对象计数"
5513
7e6630a7 5514#: midx.c:1719
ddc12c42
JX
5515msgid "Finding and deleting unreferenced packfiles"
5516msgstr "正在查找和删除未引用的包文件"
5517
7e6630a7 5518#: midx.c:1911
a6cd2cc4
JX
5519msgid "could not start pack-objects"
5520msgstr "不能开始 pack-objects"
5521
7e6630a7 5522#: midx.c:1931
a6cd2cc4
JX
5523msgid "could not finish pack-objects"
5524msgstr "不能结束 pack-objects"
5525
33b62fba 5526#: name-hash.c:542
4c27fcb5
JX
5527#, c-format
5528msgid "unable to create lazy_dir thread: %s"
5529msgstr "不能创建 lazy_dir 线程:%s"
5530
33b62fba 5531#: name-hash.c:564
4c27fcb5
JX
5532#, c-format
5533msgid "unable to create lazy_name thread: %s"
5534msgstr "不能创建 lazy_name 线程:%s"
5535
33b62fba 5536#: name-hash.c:570
4c27fcb5
JX
5537#, c-format
5538msgid "unable to join lazy_name thread: %s"
ae4e099e 5539msgstr "不能加入 lazy_name 线程:%s"
4c27fcb5 5540
06991777 5541#: notes-merge.c:277
5c57d762
JX
5542#, c-format
5543msgid ""
a0b6b246
JX
5544"You have not concluded your previous notes merge (%s exists).\n"
5545"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
5546"commit/abort the previous merge before you start a new notes merge."
5c57d762 5547msgstr ""
29004bbb 5548"您的前一次注释合并尚未结束(存在 %s)。\n"
1a79b2f1
JX
5549"在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
5550"notes merge --abort' 来提交/终止前一次合并。"
5c57d762 5551
06991777 5552#: notes-merge.c:284
a0b6b246
JX
5553#, c-format
5554msgid "You have not concluded your notes merge (%s exists)."
5555msgstr "您尚未结束注释合并(存在 %s)。"
5556
06991777 5557#: notes-utils.c:46
a0b6b246
JX
5558msgid "Cannot commit uninitialized/unreferenced notes tree"
5559msgstr "不能提交未初始化/未引用的注解树"
5c57d762 5560
06991777 5561#: notes-utils.c:105
1b7f4a34 5562#, c-format
a0b6b246
JX
5563msgid "Bad notes.rewriteMode value: '%s'"
5564msgstr "坏的 notes.rewriteMode 值:'%s'"
1b7f4a34 5565
06991777 5566#: notes-utils.c:115
5b04ee3b 5567#, c-format
a0b6b246
JX
5568msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
5569msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
5b04ee3b 5570
a4f16749
JX
5571#. TRANSLATORS: The first %s is the name of
5572#. the environment variable, the second %s is
5573#. its value.
5574#.
06991777 5575#: notes-utils.c:145
5b04ee3b 5576#, c-format
a0b6b246
JX
5577msgid "Bad %s value: '%s'"
5578msgstr "坏的 %s 值:'%s'"
5b04ee3b 5579
7e6630a7 5580#: object-file.c:459
c1ac5258 5581#, c-format
473eb541
JX
5582msgid "object directory %s does not exist; check .git/objects/info/alternates"
5583msgstr "对象目录 %s 不存在,检查 .git/objects/info/alternates"
c1ac5258 5584
7e6630a7 5585#: object-file.c:517
c1ac5258 5586#, c-format
473eb541
JX
5587msgid "unable to normalize alternate object path: %s"
5588msgstr "无法规范化备用对象路径:%s"
c1ac5258 5589
7e6630a7 5590#: object-file.c:591
c1ac5258 5591#, c-format
473eb541
JX
5592msgid "%s: ignoring alternate object stores, nesting too deep"
5593msgstr "%s:忽略备用对象库,嵌套太深"
c1ac5258 5594
7e6630a7 5595#: object-file.c:598
5b04ee3b 5596#, c-format
473eb541
JX
5597msgid "unable to normalize object directory: %s"
5598msgstr "无法规范化对象目录: %s"
5b04ee3b 5599
7e6630a7 5600#: object-file.c:641
473eb541
JX
5601msgid "unable to fdopen alternates lockfile"
5602msgstr "无法 fdopen 替换锁文件"
c1ac5258 5603
7e6630a7 5604#: object-file.c:659
473eb541
JX
5605msgid "unable to read alternates file"
5606msgstr "无法读取替代文件"
349ede6a 5607
7e6630a7 5608#: object-file.c:666
473eb541
JX
5609msgid "unable to move new alternates file into place"
5610msgstr "无法将新的替代文件移动到位"
6937cb4e 5611
7e6630a7 5612#: object-file.c:701
6937cb4e 5613#, c-format
473eb541
JX
5614msgid "path '%s' does not exist"
5615msgstr "路径 '%s' 不存在"
6937cb4e 5616
7e6630a7 5617#: object-file.c:722
6937cb4e 5618#, c-format
473eb541
JX
5619msgid "reference repository '%s' as a linked checkout is not supported yet."
5620msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
6937cb4e 5621
7e6630a7 5622#: object-file.c:728
2b472aae 5623#, c-format
473eb541
JX
5624msgid "reference repository '%s' is not a local repository."
5625msgstr "参考仓库 '%s' 不是一个本地仓库。"
349ede6a 5626
7e6630a7 5627#: object-file.c:734
349ede6a 5628#, c-format
473eb541
JX
5629msgid "reference repository '%s' is shallow"
5630msgstr "参考仓库 '%s' 是一个浅克隆"
349ede6a 5631
7e6630a7 5632#: object-file.c:742
349ede6a 5633#, c-format
473eb541
JX
5634msgid "reference repository '%s' is grafted"
5635msgstr "参考仓库 '%s' 已被移植"
349ede6a 5636
7e6630a7
FZ
5637#: object-file.c:773
5638#, c-format
5639msgid "could not find object directory matching %s"
5640msgstr "无法找到和 %s 匹配的对象目录"
5641
5642#: object-file.c:823
349ede6a 5643#, c-format
473eb541
JX
5644msgid "invalid line while parsing alternate refs: %s"
5645msgstr "解析备用引用时无效的行:%s"
2b472aae 5646
7e6630a7 5647#: object-file.c:973
06991777 5648#, c-format
473eb541
JX
5649msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
5650msgstr "尝试 mmap %<PRIuMAX>,超过了最大值 %<PRIuMAX>"
06991777 5651
7e6630a7 5652#: object-file.c:1008
ec3d4607
JX
5653#, c-format
5654msgid "mmap failed%s"
5655msgstr "mmap 失败%s"
06991777 5656
7e6630a7 5657#: object-file.c:1174
06991777 5658#, c-format
473eb541
JX
5659msgid "object file %s is empty"
5660msgstr "对象文件 %s 为空"
06991777 5661
7e6630a7 5662#: object-file.c:1293 object-file.c:2499
06991777 5663#, c-format
473eb541
JX
5664msgid "corrupt loose object '%s'"
5665msgstr "损坏的松散对象 '%s'"
06991777 5666
7e6630a7 5667#: object-file.c:1295 object-file.c:2503
06991777 5668#, c-format
473eb541
JX
5669msgid "garbage at end of loose object '%s'"
5670msgstr "松散对象 '%s' 后面有垃圾数据"
06991777 5671
7e6630a7
FZ
5672#: object-file.c:1417
5673#, c-format
5674msgid "unable to parse %s header"
5675msgstr "无法解析 %s 头部"
5676
5677#: object-file.c:1419
473eb541
JX
5678msgid "invalid object type"
5679msgstr "无效的对象类型"
06991777 5680
7e6630a7 5681#: object-file.c:1430
06991777 5682#, c-format
473eb541
JX
5683msgid "unable to unpack %s header"
5684msgstr "无法解开 %s 头部"
06991777 5685
7e6630a7 5686#: object-file.c:1434
349ede6a 5687#, c-format
7e6630a7
FZ
5688msgid "header for %s too long, exceeds %d bytes"
5689msgstr "%s 的头部太长,超出了 %d 字节"
349ede6a 5690
7e6630a7 5691#: object-file.c:1664
06991777 5692#, c-format
473eb541
JX
5693msgid "failed to read object %s"
5694msgstr "读取对象 %s 失败"
06991777 5695
7e6630a7 5696#: object-file.c:1668
06991777 5697#, c-format
473eb541
JX
5698msgid "replacement %s not found for %s"
5699msgstr "找不到 %2$s 的替代 %1$s"
06991777 5700
7e6630a7 5701#: object-file.c:1672
473eb541
JX
5702#, c-format
5703msgid "loose object %s (stored in %s) is corrupt"
5704msgstr "松散对象 %s(保存在 %s)已损坏"
a0b6b246 5705
7e6630a7 5706#: object-file.c:1676
5b04ee3b 5707#, c-format
473eb541
JX
5708msgid "packed object %s (stored in %s) is corrupt"
5709msgstr "打包对象 %s(保存在 %s)已损坏"
5b04ee3b 5710
7e6630a7 5711#: object-file.c:1781
5b04ee3b 5712#, c-format
473eb541
JX
5713msgid "unable to write file %s"
5714msgstr "无法写文件 %s"
5b04ee3b 5715
7e6630a7 5716#: object-file.c:1788
5b04ee3b 5717#, c-format
473eb541
JX
5718msgid "unable to set permission to '%s'"
5719msgstr "无法为 '%s' 设置权限"
5b04ee3b 5720
7e6630a7 5721#: object-file.c:1795
473eb541
JX
5722msgid "file write error"
5723msgstr "文件写错误"
a0b6b246 5724
7e6630a7 5725#: object-file.c:1815
473eb541
JX
5726msgid "error when closing loose object file"
5727msgstr "关闭松散对象文件时出错"
5728
7e6630a7 5729#: object-file.c:1882
5b04ee3b 5730#, c-format
473eb541
JX
5731msgid "insufficient permission for adding an object to repository database %s"
5732msgstr "权限不足,无法在仓库对象库 %s 中添加对象"
a0b6b246 5733
7e6630a7 5734#: object-file.c:1884
473eb541
JX
5735msgid "unable to create temporary file"
5736msgstr "无法创建临时文件"
87cb7997 5737
7e6630a7 5738#: object-file.c:1908
473eb541
JX
5739msgid "unable to write loose object file"
5740msgstr "不能写松散对象文件"
87cb7997 5741
7e6630a7 5742#: object-file.c:1914
473eb541
JX
5743#, c-format
5744msgid "unable to deflate new object %s (%d)"
5745msgstr "不能压缩新对象 %s(%d)"
87cb7997 5746
7e6630a7 5747#: object-file.c:1918
87cb7997 5748#, c-format
473eb541
JX
5749msgid "deflateEnd on object %s failed (%d)"
5750msgstr "在对象 %s 上调用 deflateEnd 失败(%d)"
87cb7997 5751
7e6630a7 5752#: object-file.c:1922
473eb541
JX
5753#, c-format
5754msgid "confused by unstable object source data for %s"
5755msgstr "被 %s 的不稳定对象源数据搞糊涂了"
a0b6b246 5756
7e6630a7 5757#: object-file.c:1933 builtin/pack-objects.c:1243
473eb541
JX
5758#, c-format
5759msgid "failed utime() on %s"
5760msgstr "在 %s 上调用 utime() 失败"
5b04ee3b 5761
7e6630a7 5762#: object-file.c:2011
473eb541
JX
5763#, c-format
5764msgid "cannot read object for %s"
5765msgstr "不能读取对象 %s"
a0b6b246 5766
7e6630a7 5767#: object-file.c:2062
473eb541
JX
5768msgid "corrupt commit"
5769msgstr "损坏的提交"
5770
7e6630a7 5771#: object-file.c:2070
473eb541
JX
5772msgid "corrupt tag"
5773msgstr "损坏的标签"
5774
7e6630a7 5775#: object-file.c:2170
5b04ee3b 5776#, c-format
473eb541
JX
5777msgid "read error while indexing %s"
5778msgstr "索引 %s 时读取错误"
5b04ee3b 5779
7e6630a7 5780#: object-file.c:2173
5b04ee3b 5781#, c-format
473eb541
JX
5782msgid "short read while indexing %s"
5783msgstr "索引 %s 时读入不完整"
5b04ee3b 5784
7e6630a7 5785#: object-file.c:2246 object-file.c:2256
5b04ee3b 5786#, c-format
473eb541
JX
5787msgid "%s: failed to insert into database"
5788msgstr "%s:插入数据库失败"
5b04ee3b 5789
7e6630a7 5790#: object-file.c:2262
5b04ee3b 5791#, c-format
473eb541
JX
5792msgid "%s: unsupported file type"
5793msgstr "%s:不支持的文件类型"
5b04ee3b 5794
7e6630a7 5795#: object-file.c:2286 builtin/fetch.c:1445
5b04ee3b 5796#, c-format
473eb541
JX
5797msgid "%s is not a valid object"
5798msgstr "%s 不是一个有效的对象"
5b04ee3b 5799
7e6630a7 5800#: object-file.c:2288
5b04ee3b 5801#, c-format
473eb541
JX
5802msgid "%s is not a valid '%s' object"
5803msgstr "%s 不是一个有效的 '%s' 对象"
5b04ee3b 5804
7e6630a7 5805#: object-file.c:2315
5b04ee3b 5806#, c-format
473eb541
JX
5807msgid "unable to open %s"
5808msgstr "不能打开 %s"
a0b6b246 5809
7e6630a7 5810#: object-file.c:2510
5b04ee3b 5811#, c-format
473eb541
JX
5812msgid "hash mismatch for %s (expected %s)"
5813msgstr "%s 的哈希值不匹配(预期 %s)"
a0b6b246 5814
7e6630a7 5815#: object-file.c:2533
ddc12c42 5816#, c-format
473eb541
JX
5817msgid "unable to mmap %s"
5818msgstr "不能 mmap %s"
ddc12c42 5819
7e6630a7 5820#: object-file.c:2539
473eb541
JX
5821#, c-format
5822msgid "unable to unpack header of %s"
5823msgstr "无法解压缩 %s 的头部"
d46c5519 5824
7e6630a7 5825#: object-file.c:2544
473eb541
JX
5826#, c-format
5827msgid "unable to parse header of %s"
5828msgstr "无法解析 %s 的头部"
d46c5519 5829
7e6630a7 5830#: object-file.c:2555
473eb541
JX
5831#, c-format
5832msgid "unable to unpack contents of %s"
5833msgstr "无法解压缩 %s 的内容"
7157c2b5 5834
ec3d4607 5835#: object-name.c:480
473eb541
JX
5836#, c-format
5837msgid "short object ID %s is ambiguous"
5838msgstr "短对象ID %s 存在歧义"
c1ac5258 5839
ec3d4607 5840#: object-name.c:491
473eb541
JX
5841msgid "The candidates are:"
5842msgstr "候选者有:"
c1ac5258 5843
ec3d4607 5844#: object-name.c:790
473eb541
JX
5845msgid ""
5846"Git normally never creates a ref that ends with 40 hex characters\n"
5847"because it will be ignored when you just specify 40-hex. These refs\n"
5848"may be created by mistake. For example,\n"
5849"\n"
5850" git switch -c $br $(git rev-parse ...)\n"
5851"\n"
5852"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
5853"examine these refs and maybe delete them. Turn this message off by\n"
5854"running \"git config advice.objectNameWarning false\""
5855msgstr ""
5856"Git 通常不会创建一个以40个十六进制字符结尾的引用,因为当您只提供40\n"
5857"个十六进制字符时将被忽略。这些引用可能被错误地创建。例如:\n"
5858"\n"
5859" git switch -c $br $(git rev-parse ...)\n"
5860"\n"
5861"当 \"$br\" 某种原因空白时,一个40位十六进制的引用将被创建。请检查这些\n"
5862"引用,可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
5863"false\" 命令关闭本消息通知。"
c1ac5258 5864
ec3d4607 5865#: object-name.c:910
473eb541
JX
5866#, c-format
5867msgid "log for '%.*s' only goes back to %s"
5868msgstr "'%.*s' 的日志仅能回到 %s"
c1ac5258 5869
ec3d4607 5870#: object-name.c:918
473eb541
JX
5871#, c-format
5872msgid "log for '%.*s' only has %d entries"
5873msgstr "'%.*s' 的日志仅有 %d 个条目"
c1ac5258 5874
ec3d4607 5875#: object-name.c:1696
473eb541
JX
5876#, c-format
5877msgid "path '%s' exists on disk, but not in '%.*s'"
5878msgstr "路径 '%s' 在磁盘上,但是不在 '%.*s' 中"
c1ac5258 5879
ec3d4607 5880#: object-name.c:1702
473eb541
JX
5881#, c-format
5882msgid ""
5883"path '%s' exists, but not '%s'\n"
5884"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
5885msgstr ""
5886"路径 '%s' 存在,而 '%s' 不存在\n"
5887"提示:您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'?"
c1ac5258 5888
ec3d4607 5889#: object-name.c:1711
c1ac5258 5890#, c-format
473eb541
JX
5891msgid "path '%s' does not exist in '%.*s'"
5892msgstr "路径 '%s' 不在 '%.*s' 中"
c1ac5258 5893
ec3d4607 5894#: object-name.c:1739
c1ac5258 5895#, c-format
473eb541
JX
5896msgid ""
5897"path '%s' is in the index, but not at stage %d\n"
5898"hint: Did you mean ':%d:%s'?"
5899msgstr ""
5900"路径 '%s' 在索引中,但不在暂存区 %d 中\n"
5901"提示:您的意思是 ':%d:%s'?"
c1ac5258 5902
ec3d4607 5903#: object-name.c:1755
06991777 5904#, c-format
473eb541
JX
5905msgid ""
5906"path '%s' is in the index, but not '%s'\n"
5907"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
5908msgstr ""
5909"路径 '%s' 在索引中,但 '%s' 不在\n"
5910"提示:您的意思是 ':%d:%s' 亦即 ':%d:./%s'?"
06991777 5911
ec3d4607 5912#: object-name.c:1763
473eb541
JX
5913#, c-format
5914msgid "path '%s' exists on disk, but not in the index"
5915msgstr "路径 '%s' 在磁盘上,但不在索引里"
4c27fcb5 5916
ec3d4607 5917#: object-name.c:1765
4c27fcb5 5918#, c-format
473eb541
JX
5919msgid "path '%s' does not exist (neither on disk nor in the index)"
5920msgstr "路径 '%s' 不存在(既不在磁盘上,也不在索引中)"
4c27fcb5 5921
ec3d4607 5922#: object-name.c:1778
473eb541
JX
5923msgid "relative path syntax can't be used outside working tree"
5924msgstr "不能在工作区之外使用相对路径语法"
a0b6b246 5925
ec3d4607 5926#: object-name.c:1916
473eb541
JX
5927#, c-format
5928msgid "invalid object name '%.*s'."
5929msgstr "无效的对象名 '%.*s'。"
d9488fea 5930
473eb541
JX
5931#: object.c:53
5932#, c-format
5933msgid "invalid object type \"%s\""
5934msgstr "无效的对象类型 \"%s\""
a5cd71ca 5935
473eb541
JX
5936#: object.c:173
5937#, c-format
5938msgid "object %s is a %s, not a %s"
5939msgstr "对象 %s 是一个 %s,不是一个 %s"
d9488fea 5940
ec3d4607 5941#: object.c:250
a5cd71ca 5942#, c-format
473eb541
JX
5943msgid "object %s has unknown type id %d"
5944msgstr "对象 %s 有未知的类型 id %d"
a5cd71ca 5945
ec3d4607 5946#: object.c:263
473eb541
JX
5947#, c-format
5948msgid "unable to parse object: %s"
5949msgstr "不能解析对象:%s"
349ede6a 5950
ec3d4607 5951#: object.c:283 object.c:295
473eb541
JX
5952#, c-format
5953msgid "hash mismatch %s"
5954msgstr "哈希值与 %s 不匹配"
c1ac5258 5955
7e6630a7
FZ
5956#: pack-bitmap.c:348
5957msgid "multi-pack bitmap is missing required reverse index"
5958msgstr "多包位图缺少必需的反向索引"
5959
5960#: pack-bitmap.c:424
5961msgid "load_reverse_index: could not open pack"
5962msgstr "load_reverse_index:无法打开包"
5963
5964#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
473eb541
JX
5965#, c-format
5966msgid "unable to get size of %s"
5967msgstr "无法得到 %s 的大小"
c1ac5258 5968
7e6630a7
FZ
5969#: pack-bitmap.c:1916
5970#, c-format
5971msgid "could not find %s in pack %s at offset %<PRIuMAX>"
5972msgstr "在包 %2$s 偏移 %3$<PRIuMAX> 中无法找到 %1$s"
5973
5974#: pack-bitmap.c:1952 builtin/rev-list.c:92
c1ac5258 5975#, c-format
473eb541
JX
5976msgid "unable to get disk usage of %s"
5977msgstr "无法得到 %s 的磁盘使用量"
c1ac5258 5978
33b62fba 5979#: pack-revindex.c:221
349ede6a 5980#, c-format
473eb541
JX
5981msgid "reverse-index file %s is too small"
5982msgstr "反向索引文件 %s 太小"
349ede6a 5983
33b62fba 5984#: pack-revindex.c:226
a6cd2cc4 5985#, c-format
473eb541
JX
5986msgid "reverse-index file %s is corrupt"
5987msgstr "反向索引文件 %s 损坏"
a6cd2cc4 5988
33b62fba 5989#: pack-revindex.c:234
473eb541
JX
5990#, c-format
5991msgid "reverse-index file %s has unknown signature"
5992msgstr "反向索引文件 %s 有错误的签名"
c1ac5258 5993
33b62fba 5994#: pack-revindex.c:238
c1ac5258 5995#, c-format
473eb541
JX
5996msgid "reverse-index file %s has unsupported version %<PRIu32>"
5997msgstr "反向索引文件 %s 不支持的版本 %<PRIu32>"
c1ac5258 5998
33b62fba 5999#: pack-revindex.c:243
06991777 6000#, c-format
473eb541
JX
6001msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
6002msgstr "反向索引文件 %s 有不支持的哈希 ID %<PRIu32>"
06991777 6003
7e6630a7 6004#: pack-write.c:251
473eb541
JX
6005msgid "cannot both write and verify reverse index"
6006msgstr "无法同时写入和校验反向索引"
06991777 6007
7e6630a7 6008#: pack-write.c:270
06991777 6009#, c-format
473eb541
JX
6010msgid "could not stat: %s"
6011msgstr "不能调用 stat:%s"
06991777 6012
7e6630a7 6013#: pack-write.c:282
d46c5519 6014#, c-format
473eb541
JX
6015msgid "failed to make %s readable"
6016msgstr "无法设置 %s 为可读"
d46c5519 6017
7e6630a7 6018#: pack-write.c:520
06991777 6019#, c-format
473eb541
JX
6020msgid "could not write '%s' promisor file"
6021msgstr "无法写入 '%s' 承诺者文件"
06991777 6022
7e6630a7 6023#: packfile.c:626
473eb541
JX
6024msgid "offset before end of packfile (broken .idx?)"
6025msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
06991777 6026
7e6630a7 6027#: packfile.c:656
ec3d4607
JX
6028#, c-format
6029msgid "packfile %s cannot be mapped%s"
6030msgstr "包文件 %s 不能被映射%s"
6031
7e6630a7 6032#: packfile.c:1923
06991777 6033#, c-format
473eb541
JX
6034msgid "offset before start of pack index for %s (corrupt index?)"
6035msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
06991777 6036
7e6630a7 6037#: packfile.c:1927
06991777 6038#, c-format
473eb541
JX
6039msgid "offset beyond end of pack index for %s (truncated index?)"
6040msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
06991777 6041
7e6630a7 6042#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
473eb541
JX
6043#, c-format
6044msgid "option `%s' expects a numerical value"
6045msgstr "选项 `%s' 期望一个数字值"
4c27fcb5 6046
473eb541 6047#: parse-options-cb.c:41
5b04ee3b 6048#, c-format
473eb541
JX
6049msgid "malformed expiration date '%s'"
6050msgstr "格式错误的到期时间:'%s'"
5b04ee3b 6051
473eb541 6052#: parse-options-cb.c:54
5b04ee3b 6053#, c-format
473eb541
JX
6054msgid "option `%s' expects \"always\", \"auto\", or \"never\""
6055msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
5b04ee3b 6056
473eb541 6057#: parse-options-cb.c:132 parse-options-cb.c:149
06991777 6058#, c-format
473eb541
JX
6059msgid "malformed object name '%s'"
6060msgstr "格式错误的对象名 '%s'"
06991777 6061
7e6630a7 6062#: parse-options.c:58
06991777 6063#, c-format
473eb541
JX
6064msgid "%s requires a value"
6065msgstr "%s 需要一个值"
06991777 6066
7e6630a7 6067#: parse-options.c:93
473eb541
JX
6068#, c-format
6069msgid "%s is incompatible with %s"
6070msgstr "%s 与 %s 不兼容"
06991777 6071
7e6630a7 6072#: parse-options.c:98
06991777 6073#, c-format
473eb541
JX
6074msgid "%s : incompatible with something else"
6075msgstr "%s:和其它的不兼容"
06991777 6076
7e6630a7 6077#: parse-options.c:112 parse-options.c:116
06991777 6078#, c-format
473eb541
JX
6079msgid "%s takes no value"
6080msgstr "%s 不取值"
06991777 6081
7e6630a7 6082#: parse-options.c:114
06991777 6083#, c-format
473eb541
JX
6084msgid "%s isn't available"
6085msgstr "%s 不可用"
06991777 6086
7e6630a7 6087#: parse-options.c:237
4c27fcb5 6088#, c-format
473eb541
JX
6089msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
6090msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
4c27fcb5 6091
7e6630a7 6092#: parse-options.c:393
473eb541
JX
6093#, c-format
6094msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
6095msgstr "有歧义的选项:%s(可以是 --%s%s 或 --%s%s)"
06991777 6096
7e6630a7 6097#: parse-options.c:427 parse-options.c:435
06991777 6098#, c-format
473eb541 6099msgid "did you mean `--%s` (with two dashes)?"
7e6630a7 6100msgstr "您的意思是 `--%s`(有两个短线)?"
06991777 6101
7e6630a7 6102#: parse-options.c:677 parse-options.c:1053
06991777 6103#, c-format
473eb541
JX
6104msgid "alias of --%s"
6105msgstr "--%s 的别名"
06991777 6106
7e6630a7 6107#: parse-options.c:891
473eb541
JX
6108#, c-format
6109msgid "unknown option `%s'"
6110msgstr "未知选项 `%s'"
4c27fcb5 6111
7e6630a7 6112#: parse-options.c:893
4c27fcb5 6113#, c-format
473eb541
JX
6114msgid "unknown switch `%c'"
6115msgstr "未知开关 `%c'"
4c27fcb5 6116
7e6630a7 6117#: parse-options.c:895
4c27fcb5 6118#, c-format
473eb541
JX
6119msgid "unknown non-ascii option in string: `%s'"
6120msgstr "字符串中未知的非 ascii 字符选项:`%s'"
6121
7e6630a7 6122#: parse-options.c:919
473eb541
JX
6123msgid "..."
6124msgstr "..."
4c27fcb5 6125
7e6630a7 6126#: parse-options.c:933
06991777 6127#, c-format
473eb541
JX
6128msgid "usage: %s"
6129msgstr "用法:%s"
06991777 6130
473eb541
JX
6131#. TRANSLATORS: the colon here should align with the
6132#. one in "usage: %s" translation.
6133#.
7e6630a7 6134#: parse-options.c:948
06991777 6135#, c-format
473eb541
JX
6136msgid " or: %s"
6137msgstr " 或:%s"
06991777 6138
7e6630a7
FZ
6139#. TRANSLATORS: You should only need to translate this format
6140#. string if your language is a RTL language (e.g. Arabic,
6141#. Hebrew etc.), not if it's a LTR language (e.g. German,
6142#. Russian, Chinese etc.).
6143#. *
6144#. When a translated usage string has an embedded "\n" it's
6145#. because options have wrapped to the next line. The line
6146#. after the "\n" will then be padded to align with the
6147#. command name, such as N_("git cmd [opt]\n<8
6148#. spaces>[opt2]"), where the 8 spaces are the same length as
6149#. "git cmd ".
6150#. *
6151#. This format string prints out that already-translated
6152#. line. The "%*s" is whitespace padding to account for the
6153#. padding at the start of the line that we add in this
6154#. function. The "%s" is a line in the (hopefully already
6155#. translated) N_() usage string, which contained embedded
6156#. newlines before we split it up.
6157#.
6158#: parse-options.c:969
6159#, c-format
6160msgid "%*s%s"
6161msgstr "%*s%s"
6162
473eb541 6163# 译者:为保证在输出中对齐,注意调整句中空格!
7e6630a7 6164#: parse-options.c:992
06991777 6165#, c-format
473eb541
JX
6166msgid " %s"
6167msgstr " %s"
6168
7e6630a7 6169#: parse-options.c:1039
473eb541
JX
6170msgid "-NUM"
6171msgstr "-数字"
06991777 6172
7e6630a7 6173#: path.c:922
06991777 6174#, c-format
473eb541
JX
6175msgid "Could not make %s writable by group"
6176msgstr "不能设置 %s 为组可写"
6177
7e6630a7 6178#: pathspec.c:150
473eb541
JX
6179msgid "Escape character '\\' not allowed as last character in attr value"
6180msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
6181
7e6630a7 6182#: pathspec.c:168
473eb541
JX
6183msgid "Only one 'attr:' specification is allowed."
6184msgstr "只允许一个 'attr:' 规格。"
6185
7e6630a7 6186#: pathspec.c:171
473eb541
JX
6187msgid "attr spec must not be empty"
6188msgstr "属性规格不能为空"
06991777 6189
7e6630a7 6190#: pathspec.c:214
4c27fcb5 6191#, c-format
473eb541
JX
6192msgid "invalid attribute name %s"
6193msgstr "无效的属性名 %s"
6194
7e6630a7 6195#: pathspec.c:279
473eb541
JX
6196msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
6197msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
6198
7e6630a7 6199#: pathspec.c:286
473eb541
JX
6200msgid ""
6201"global 'literal' pathspec setting is incompatible with all other global "
6202"pathspec settings"
6203msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
6204
7e6630a7 6205#: pathspec.c:326
473eb541
JX
6206msgid "invalid parameter for pathspec magic 'prefix'"
6207msgstr "路径规格包含无效的神奇前缀"
4c27fcb5 6208
7e6630a7 6209#: pathspec.c:347
4c27fcb5 6210#, c-format
473eb541
JX
6211msgid "Invalid pathspec magic '%.*s' in '%s'"
6212msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
4c27fcb5 6213
7e6630a7 6214#: pathspec.c:352
06991777 6215#, c-format
473eb541
JX
6216msgid "Missing ')' at the end of pathspec magic in '%s'"
6217msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
06991777 6218
7e6630a7 6219#: pathspec.c:390
06991777 6220#, c-format
473eb541
JX
6221msgid "Unimplemented pathspec magic '%c' in '%s'"
6222msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
06991777 6223
7e6630a7 6224#: pathspec.c:449
a4f16749 6225#, c-format
473eb541
JX
6226msgid "%s: 'literal' and 'glob' are incompatible"
6227msgstr "%s:'literal' 和 'glob' 不兼容"
a4f16749 6228
7e6630a7 6229#: pathspec.c:465
87cb7997 6230#, c-format
473eb541
JX
6231msgid "%s: '%s' is outside repository at '%s'"
6232msgstr "%s:'%s' 在位于 '%s' 的仓库之外"
87cb7997 6233
7e6630a7 6234#: pathspec.c:541
87cb7997 6235#, c-format
473eb541
JX
6236msgid "'%s' (mnemonic: '%c')"
6237msgstr "'%s'(助记符:'%c')"
87cb7997 6238
7e6630a7 6239#: pathspec.c:551
87cb7997 6240#, c-format
473eb541
JX
6241msgid "%s: pathspec magic not supported by this command: %s"
6242msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
87cb7997 6243
7e6630a7 6244#: pathspec.c:618
06991777 6245#, c-format
473eb541
JX
6246msgid "pathspec '%s' is beyond a symbolic link"
6247msgstr "路径规格 '%s' 位于符号链接中"
06991777 6248
7e6630a7 6249#: pathspec.c:663
06991777 6250#, c-format
473eb541
JX
6251msgid "line is badly quoted: %s"
6252msgstr "行被错误地引用:%s"
06991777 6253
473eb541
JX
6254#: pkt-line.c:92
6255msgid "unable to write flush packet"
6256msgstr "无法写 flush 包"
2b472aae 6257
473eb541
JX
6258#: pkt-line.c:99
6259msgid "unable to write delim packet"
6260msgstr "无法写 delim 包"
d46c5519 6261
473eb541 6262#: pkt-line.c:106
ec3d4607
JX
6263msgid "unable to write response end packet"
6264msgstr "无法写入响应结束数据包"
4c27fcb5 6265
473eb541
JX
6266#: pkt-line.c:113
6267msgid "flush packet write failed"
6268msgstr "flush 包写错误"
d46c5519 6269
7e6630a7 6270#: pkt-line.c:153
473eb541
JX
6271msgid "protocol error: impossibly long line"
6272msgstr "协议错误:不可能的长行"
4c27fcb5 6273
473eb541
JX
6274#: pkt-line.c:169 pkt-line.c:171
6275msgid "packet write with format failed"
6276msgstr "格式化包写入错误"
4c27fcb5 6277
7e6630a7 6278#: pkt-line.c:204 pkt-line.c:252
473eb541
JX
6279msgid "packet write failed - data exceeds max packet size"
6280msgstr "写数据包失败:数据超过了包的最大长度"
4c27fcb5 6281
33b62fba
JX
6282#: pkt-line.c:222
6283#, c-format
6284msgid "packet write failed: %s"
6285msgstr "数据包写入失败:%s"
4c27fcb5 6286
7e6630a7 6287#: pkt-line.c:349 pkt-line.c:350
473eb541
JX
6288msgid "read error"
6289msgstr "读取错误"
d46c5519 6290
7e6630a7 6291#: pkt-line.c:360 pkt-line.c:361
473eb541
JX
6292msgid "the remote end hung up unexpectedly"
6293msgstr "远端意外挂断了"
d46c5519 6294
7e6630a7 6295#: pkt-line.c:390 pkt-line.c:392
d46c5519 6296#, c-format
473eb541
JX
6297msgid "protocol error: bad line length character: %.4s"
6298msgstr "协议错误:错误的行长度字符串:%.4s"
d46c5519 6299
7e6630a7 6300#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
d46c5519 6301#, c-format
473eb541
JX
6302msgid "protocol error: bad line length %d"
6303msgstr "协议错误:错误的行长度 %d"
4c27fcb5 6304
7e6630a7 6305#: pkt-line.c:434 sideband.c:165
2b472aae 6306#, c-format
473eb541
JX
6307msgid "remote error: %s"
6308msgstr "远程错误:%s"
2b472aae 6309
473eb541
JX
6310#: preload-index.c:125
6311msgid "Refreshing index"
6312msgstr "正在刷新索引"
c1ac5258 6313
473eb541 6314#: preload-index.c:144
c1ac5258 6315#, c-format
473eb541
JX
6316msgid "unable to create threaded lstat: %s"
6317msgstr "无法创建线程 lstat:%s"
c1ac5258 6318
84bf71ea 6319#: pretty.c:1051
473eb541
JX
6320msgid "unable to parse --pretty format"
6321msgstr "不能解析 --pretty 格式"
c1ac5258 6322
ec3d4607 6323#: promisor-remote.c:31
473eb541
JX
6324msgid "promisor-remote: unable to fork off fetch subprocess"
6325msgstr "promisor-remote:无法派生 fetch 子进程"
c1ac5258 6326
ec3d4607 6327#: promisor-remote.c:38 promisor-remote.c:40
473eb541
JX
6328msgid "promisor-remote: could not write to fetch subprocess"
6329msgstr "promisor-remote:无法向 fetch 子进程写入"
c1ac5258 6330
ec3d4607 6331#: promisor-remote.c:44
473eb541
JX
6332msgid "promisor-remote: could not close stdin to fetch subprocess"
6333msgstr "promisor-remote:无法关闭至 fetch 子进程的标准输入"
c1ac5258 6334
ec3d4607 6335#: promisor-remote.c:54
c1ac5258 6336#, c-format
473eb541
JX
6337msgid "promisor remote name cannot begin with '/': %s"
6338msgstr "promisor 远程名称不能以 '/' 开始:%s"
c1ac5258 6339
33b62fba
JX
6340#: protocol-caps.c:103
6341msgid "object-info: expected flush after arguments"
6342msgstr "object-info:在参数之后应有一个 flush"
6343
473eb541
JX
6344#: prune-packed.c:35
6345msgid "Removing duplicate objects"
6346msgstr "正在删除重复对象"
c1ac5258 6347
7e6630a7 6348#: range-diff.c:67
473eb541
JX
6349msgid "could not start `log`"
6350msgstr "不能启动 `log`"
5b04ee3b 6351
7e6630a7 6352#: range-diff.c:69
473eb541
JX
6353msgid "could not read `log` output"
6354msgstr "不能读取 `log` 的输出"
c1ac5258 6355
84bf71ea 6356#: range-diff.c:97 sequencer.c:5605
c1ac5258 6357#, c-format
473eb541
JX
6358msgid "could not parse commit '%s'"
6359msgstr "不能解析提交 '%s'"
c1ac5258 6360
7e6630a7 6361#: range-diff.c:111
c1ac5258 6362#, c-format
473eb541
JX
6363msgid ""
6364"could not parse first line of `log` output: did not start with 'commit ': "
6365"'%s'"
6366msgstr "无法解析 `log` 输出的首行:不是以 'commit ' 开头:'%s'"
c1ac5258 6367
7e6630a7 6368#: range-diff.c:137
c1ac5258 6369#, c-format
473eb541
JX
6370msgid "could not parse git header '%.*s'"
6371msgstr "无法解析 git 头 '%.*s'"
c1ac5258 6372
7e6630a7 6373#: range-diff.c:304
473eb541
JX
6374msgid "failed to generate diff"
6375msgstr "生成 diff 失败"
c1ac5258 6376
ec3d4607 6377#: range-diff.c:559
473eb541
JX
6378msgid "--left-only and --right-only are mutually exclusive"
6379msgstr "--left-only 和 --right-only 互斥"
1a79b2f1 6380
ec3d4607 6381#: range-diff.c:562 range-diff.c:564
a0b6b246 6382#, c-format
473eb541
JX
6383msgid "could not parse log for '%s'"
6384msgstr "不能解析 '%s' 的日志"
90314792 6385
ec3d4607 6386#: read-cache.c:710
a0b6b246 6387#, c-format
473eb541
JX
6388msgid "will not add file alias '%s' ('%s' already exists in index)"
6389msgstr "将不会添加文件别名 '%s'('%s' 已经存在于索引中)"
6390
ec3d4607 6391#: read-cache.c:726
473eb541
JX
6392msgid "cannot create an empty blob in the object database"
6393msgstr "不能在对象数据库中创建空的数据对象"
90314792 6394
ec3d4607 6395#: read-cache.c:748
d9488fea 6396#, c-format
473eb541
JX
6397msgid "%s: can only add regular files, symbolic links or git-directories"
6398msgstr "%s:只能添加常规文件、符号链接或 git 目录"
d9488fea 6399
7e6630a7 6400#: read-cache.c:753 builtin/submodule--helper.c:3241
87cb7997 6401#, c-format
473eb541
JX
6402msgid "'%s' does not have a commit checked out"
6403msgstr "'%s' 没有检出一个提交"
87cb7997 6404
ec3d4607 6405#: read-cache.c:805
a0b6b246 6406#, c-format
473eb541
JX
6407msgid "unable to index file '%s'"
6408msgstr "无法索引文件 '%s'"
90314792 6409
ec3d4607 6410#: read-cache.c:824
a0b6b246 6411#, c-format
473eb541
JX
6412msgid "unable to add '%s' to index"
6413msgstr "无法在索引中添加 '%s'"
90314792 6414
ec3d4607 6415#: read-cache.c:835
5c57d762 6416#, c-format
473eb541
JX
6417msgid "unable to stat '%s'"
6418msgstr "无法对 %s 执行 stat"
5c57d762 6419
7e6630a7 6420#: read-cache.c:1373
1b7f4a34 6421#, c-format
473eb541
JX
6422msgid "'%s' appears as both a file and as a directory"
6423msgstr "'%s' 看起来既是文件又是目录"
1b7f4a34 6424
7e6630a7 6425#: read-cache.c:1588
473eb541
JX
6426msgid "Refresh index"
6427msgstr "刷新索引"
1b7f4a34 6428
7e6630a7 6429#: read-cache.c:1720
1b7f4a34 6430#, c-format
473eb541
JX
6431msgid ""
6432"index.version set, but the value is invalid.\n"
6433"Using version %i"
6434msgstr ""
6435"设置了 index.version,但是取值无效。\n"
6436"使用版本 %i"
1b7f4a34 6437
7e6630a7 6438#: read-cache.c:1730
87cb7997 6439#, c-format
473eb541
JX
6440msgid ""
6441"GIT_INDEX_VERSION set, but the value is invalid.\n"
6442"Using version %i"
6443msgstr ""
6444"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
6445"使用版本 %i"
87cb7997 6446
7e6630a7 6447#: read-cache.c:1786
07432cef 6448#, c-format
473eb541
JX
6449msgid "bad signature 0x%08x"
6450msgstr "坏的签名 0x%08x"
ef317cd5 6451
7e6630a7 6452#: read-cache.c:1789
a0b6b246 6453#, c-format
473eb541
JX
6454msgid "bad index version %d"
6455msgstr "坏的索引版本 %d"
220c313c 6456
7e6630a7 6457#: read-cache.c:1798
473eb541
JX
6458msgid "bad index file sha1 signature"
6459msgstr "坏的索引文件 sha1 签名"
4c27fcb5 6460
7e6630a7 6461#: read-cache.c:1832
87cb7997 6462#, c-format
473eb541
JX
6463msgid "index uses %.4s extension, which we do not understand"
6464msgstr "索引使用不被支持的 %.4s 扩展"
87cb7997 6465
473eb541 6466#
7e6630a7 6467#: read-cache.c:1834
87cb7997 6468#, c-format
473eb541
JX
6469msgid "ignoring %.4s extension"
6470msgstr "忽略 %.4s 扩展"
87cb7997 6471
7e6630a7 6472#: read-cache.c:1871
87cb7997 6473#, c-format
473eb541
JX
6474msgid "unknown index entry format 0x%08x"
6475msgstr "未知的索引条目格式 0x%08x"
87cb7997 6476
7e6630a7 6477#: read-cache.c:1887
87cb7997 6478#, c-format
473eb541
JX
6479msgid "malformed name field in the index, near path '%s'"
6480msgstr "索引中靠近路径 '%s' 有错误的名称字段"
6481
7e6630a7 6482#: read-cache.c:1944
473eb541
JX
6483msgid "unordered stage entries in index"
6484msgstr "索引中有未排序的暂存条目"
87cb7997 6485
7e6630a7 6486#: read-cache.c:1947
87cb7997 6487#, c-format
473eb541
JX
6488msgid "multiple stage entries for merged file '%s'"
6489msgstr "合并文件 '%s' 有多个暂存条目"
87cb7997 6490
7e6630a7 6491#: read-cache.c:1950
87cb7997 6492#, c-format
473eb541
JX
6493msgid "unordered stage entries for '%s'"
6494msgstr "'%s' 的未排序暂存条目"
87cb7997 6495
7e6630a7
FZ
6496#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
6497#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
6498#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
6499#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
6500#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
6501#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
473eb541
JX
6502msgid "index file corrupt"
6503msgstr "索引文件损坏"
6504
7e6630a7 6505#: read-cache.c:2209
87cb7997 6506#, c-format
473eb541
JX
6507msgid "unable to create load_cache_entries thread: %s"
6508msgstr "无法创建 load_cache_entries 线程:%s"
87cb7997 6509
7e6630a7 6510#: read-cache.c:2222
7aea43ff 6511#, c-format
473eb541
JX
6512msgid "unable to join load_cache_entries thread: %s"
6513msgstr "无法加入 load_cache_entries 线程:%s"
7aea43ff 6514
7e6630a7 6515#: read-cache.c:2255
7aea43ff 6516#, c-format
473eb541
JX
6517msgid "%s: index file open failed"
6518msgstr "%s:打开索引文件失败"
7aea43ff 6519
7e6630a7 6520#: read-cache.c:2259
87cb7997 6521#, c-format
473eb541
JX
6522msgid "%s: cannot stat the open index"
6523msgstr "%s:不能对打开的索引执行 stat 操作"
c04f5ac3 6524
7e6630a7 6525#: read-cache.c:2263
c04f5ac3 6526#, c-format
473eb541
JX
6527msgid "%s: index file smaller than expected"
6528msgstr "%s:索引文件比预期的小"
c04f5ac3 6529
7e6630a7 6530#: read-cache.c:2267
a0b6b246 6531#, c-format
ec3d4607
JX
6532msgid "%s: unable to map index file%s"
6533msgstr "%s:无法映射索引文件%s"
6792b93b 6534
7e6630a7 6535#: read-cache.c:2310
473eb541
JX
6536#, c-format
6537msgid "unable to create load_index_extensions thread: %s"
6538msgstr "无法创建 load_index_extensions 线程:%s"
87cb7997 6539
7e6630a7 6540#: read-cache.c:2337
a0b6b246 6541#, c-format
473eb541
JX
6542msgid "unable to join load_index_extensions thread: %s"
6543msgstr "无法加入 load_index_extensions 线程:%s"
c04f5ac3 6544
7e6630a7 6545#: read-cache.c:2375
a0b6b246 6546#, c-format
473eb541
JX
6547msgid "could not freshen shared index '%s'"
6548msgstr "无法刷新共享索引 '%s'"
6792b93b 6549
7e6630a7 6550#: read-cache.c:2434
a0b6b246 6551#, c-format
473eb541
JX
6552msgid "broken index, expect %s in %s, got %s"
6553msgstr "损坏的索引,期望在 %2$s 中的 %1$s,得到 %3$s"
c04f5ac3 6554
7e6630a7 6555#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
a0b6b246 6556#, c-format
473eb541
JX
6557msgid "could not close '%s'"
6558msgstr "不能关闭 '%s'"
c04f5ac3 6559
7e6630a7 6560#: read-cache.c:3108
33b62fba
JX
6561msgid "failed to convert to a sparse-index"
6562msgstr "无法转换为稀疏索引"
6563
7e6630a7 6564#: read-cache.c:3179
349ede6a 6565#, c-format
473eb541
JX
6566msgid "could not stat '%s'"
6567msgstr "不能对 '%s' 调用 stat"
349ede6a 6568
7e6630a7 6569#: read-cache.c:3192
a0b6b246 6570#, c-format
473eb541
JX
6571msgid "unable to open git dir: %s"
6572msgstr "不能打开 git 目录:%s"
c04f5ac3 6573
7e6630a7 6574#: read-cache.c:3204
a0b6b246 6575#, c-format
473eb541
JX
6576msgid "unable to unlink: %s"
6577msgstr "无法删除:%s"
c04f5ac3 6578
7e6630a7 6579#: read-cache.c:3233
06991777 6580#, c-format
473eb541
JX
6581msgid "cannot fix permission bits on '%s'"
6582msgstr "不能修复 '%s' 的权限位"
06991777 6583
7e6630a7 6584#: read-cache.c:3390
349ede6a 6585#, c-format
473eb541
JX
6586msgid "%s: cannot drop to stage #0"
6587msgstr "%s:不能落到暂存区 #0"
349ede6a 6588
473eb541
JX
6589#: rebase-interactive.c:11
6590msgid ""
6591"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
6592"continue'.\n"
6593"Or you can abort the rebase with 'git rebase --abort'.\n"
6594msgstr ""
6595"您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n"
6596"或者您可以用 'git rebase --abort' 终止变基。\n"
6597
6598#: rebase-interactive.c:33
d13389bf
JX
6599#, c-format
6600msgid ""
473eb541
JX
6601"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
6602msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
6603
6604#: rebase-interactive.c:42
6605msgid ""
d13389bf 6606"\n"
473eb541
JX
6607"Commands:\n"
6608"p, pick <commit> = use commit\n"
6609"r, reword <commit> = use commit, but edit the commit message\n"
6610"e, edit <commit> = use commit, but stop for amending\n"
6611"s, squash <commit> = use commit, but meld into previous commit\n"
33b62fba
JX
6612"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n"
6613" commit's log message, unless -C is used, in which case\n"
6614" keep only this commit's message; -c is same as -C but\n"
6615" opens the editor\n"
473eb541
JX
6616"x, exec <command> = run command (the rest of the line) using shell\n"
6617"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
6618"d, drop <commit> = remove commit\n"
6619"l, label <label> = label current HEAD with a name\n"
6620"t, reset <label> = reset HEAD to a label\n"
6621"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
6622". create a merge commit using the original merge commit's\n"
6623". message (or the oneline, if no original merge commit was\n"
33b62fba 6624". specified); use -c <commit> to reword the commit message\n"
d13389bf 6625"\n"
473eb541 6626"These lines can be re-ordered; they are executed from top to bottom.\n"
d13389bf 6627msgstr ""
d13389bf 6628"\n"
473eb541
JX
6629"命令:\n"
6630"p, pick <提交> = 使用提交\n"
33b62fba
JX
6631"r, reword <提交> = 使用提交,但编辑提交说明\n"
6632"e, edit <提交> = 使用提交,但停止以便在 shell 中修补提交\n"
6633"s, squash <提交> = 使用提交,但挤压到前一个提交\n"
6634"f, fixup [-C | -c] <提交> = 类似于 \"squash\",但只保留前一个提交\n"
6635" 的提交说明,除非使用了 -C 参数,此情况下则只\n"
6636" 保留本提交说明。使用 -c 和 -C 类似,但会打开\n"
6637" 编辑器修改提交说明\n"
473eb541
JX
6638"x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
6639"b, break = 在此处停止(使用 'git rebase --continue' 继续变基)\n"
6640"d, drop <提交> = 删除提交\n"
6641"l, label <label> = 为当前 HEAD 打上标记\n"
6642"t, reset <label> = 重置 HEAD 到该标记\n"
6643"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
6644". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
6645". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
6646". -c <提交> 可以编辑提交说明。\n"
d13389bf 6647"\n"
473eb541 6648"可以对这些行重新排序,将从上至下执行。\n"
7157c2b5 6649
33b62fba 6650#: rebase-interactive.c:66
7157c2b5 6651#, c-format
473eb541
JX
6652msgid "Rebase %s onto %s (%d command)"
6653msgid_plural "Rebase %s onto %s (%d commands)"
6654msgstr[0] "变基 %s 到 %s(%d 个提交)"
6655msgstr[1] "变基 %s 到 %s(%d 个提交)"
7157c2b5 6656
7e6630a7 6657#: rebase-interactive.c:75
473eb541
JX
6658msgid ""
6659"\n"
6660"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
6661msgstr ""
6662"\n"
6663"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
349ede6a 6664
7e6630a7 6665#: rebase-interactive.c:78
473eb541
JX
6666msgid ""
6667"\n"
6668"If you remove a line here THAT COMMIT WILL BE LOST.\n"
6669msgstr ""
6670"\n"
6671"如果您在这里删除一行,对应的提交将会丢失。\n"
349ede6a 6672
7e6630a7 6673#: rebase-interactive.c:84
473eb541
JX
6674msgid ""
6675"\n"
6676"You are editing the todo file of an ongoing interactive rebase.\n"
6677"To continue rebase after editing, run:\n"
6678" git rebase --continue\n"
6679"\n"
6680msgstr ""
6681"\n"
6682"您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基,\n"
6683"请执行:\n"
6684" git rebase --continue\n"
6685"\n"
349ede6a 6686
7e6630a7 6687#: rebase-interactive.c:89
473eb541
JX
6688msgid ""
6689"\n"
6690"However, if you remove everything, the rebase will be aborted.\n"
6691"\n"
6692msgstr ""
6693"\n"
6694"然而,如果您删除全部内容,变基操作将会终止。\n"
6695"\n"
349ede6a 6696
84bf71ea
FZ
6697#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
6698#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
7e6630a7 6699#: builtin/rebase.c:190
349ede6a 6700#, c-format
473eb541
JX
6701msgid "could not write '%s'"
6702msgstr "不能写入 '%s'"
349ede6a 6703
7e6630a7 6704#: rebase-interactive.c:119
349ede6a 6705#, c-format
473eb541
JX
6706msgid "could not write '%s'."
6707msgstr "不能写入 '%s'。"
349ede6a 6708
33b62fba 6709#: rebase-interactive.c:196
349ede6a 6710#, c-format
473eb541
JX
6711msgid ""
6712"Warning: some commits may have been dropped accidentally.\n"
6713"Dropped commits (newer to older):\n"
6714msgstr ""
6715"警告:一些提交可能被意外丢弃。\n"
6716"丢弃的提交(从新到旧):\n"
7157c2b5 6717
33b62fba 6718#: rebase-interactive.c:203
349ede6a 6719#, c-format
473eb541
JX
6720msgid ""
6721"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
6722"\n"
6723"Use 'git config rebase.missingCommitsCheck' to change the level of "
6724"warnings.\n"
6725"The possible behaviours are: ignore, warn, error.\n"
6726"\n"
6727msgstr ""
6728"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
6729"\n"
6730"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
6731"可选值有:ignore、warn、error。\n"
6732"\n"
349ede6a 6733
7e6630a7 6734#: rebase.c:29
349ede6a 6735#, c-format
7e6630a7
FZ
6736msgid "%s: 'preserve' superseded by 'merges'"
6737msgstr "%s: 'preserve' 被 'merges' 取代"
349ede6a 6738
ec3d4607 6739#: ref-filter.c:42 wt-status.c:2036
473eb541
JX
6740msgid "gone"
6741msgstr "丢失"
349ede6a 6742
473eb541 6743#: ref-filter.c:43
349ede6a 6744#, c-format
473eb541
JX
6745msgid "ahead %d"
6746msgstr "领先 %d"
349ede6a 6747
473eb541 6748#: ref-filter.c:44
349ede6a 6749#, c-format
473eb541
JX
6750msgid "behind %d"
6751msgstr "落后 %d"
349ede6a 6752
473eb541 6753#: ref-filter.c:45
349ede6a 6754#, c-format
473eb541
JX
6755msgid "ahead %d, behind %d"
6756msgstr "领先 %d,落后 %d"
349ede6a 6757
7e6630a7 6758#: ref-filter.c:235
06991777 6759#, c-format
473eb541
JX
6760msgid "expected format: %%(color:<color>)"
6761msgstr "期望的格式:%%(color:<颜色>)"
06991777 6762
7e6630a7 6763#: ref-filter.c:237
a0b6b246 6764#, c-format
473eb541
JX
6765msgid "unrecognized color: %%(color:%s)"
6766msgstr "未能识别的颜色:%%(color:%s)"
c04f5ac3 6767
7e6630a7 6768#: ref-filter.c:259
c04f5ac3 6769#, c-format
473eb541
JX
6770msgid "Integer value expected refname:lstrip=%s"
6771msgstr "期望整数值 refname:lstrip=%s"
c04f5ac3 6772
7e6630a7 6773#: ref-filter.c:263
a0b6b246 6774#, c-format
473eb541
JX
6775msgid "Integer value expected refname:rstrip=%s"
6776msgstr "期望整数值 refname:rstrip=%s"
c04f5ac3 6777
7e6630a7 6778#: ref-filter.c:265
06991777 6779#, c-format
473eb541
JX
6780msgid "unrecognized %%(%s) argument: %s"
6781msgstr "未能识别的 %%(%s) 参数:%s"
06991777 6782
7e6630a7 6783#: ref-filter.c:320
06991777 6784#, c-format
473eb541
JX
6785msgid "%%(objecttype) does not take arguments"
6786msgstr "%%(objecttype) 不带参数"
06991777 6787
7e6630a7 6788#: ref-filter.c:344
06991777 6789#, c-format
473eb541
JX
6790msgid "unrecognized %%(objectsize) argument: %s"
6791msgstr "未能识别的 %%(objectsize) 参数:%s"
06991777 6792
7e6630a7 6793#: ref-filter.c:352
06991777 6794#, c-format
473eb541
JX
6795msgid "%%(deltabase) does not take arguments"
6796msgstr "%%(deltabase) 不带参数"
06991777 6797
7e6630a7 6798#: ref-filter.c:364
06991777 6799#, c-format
473eb541
JX
6800msgid "%%(body) does not take arguments"
6801msgstr "%%(body) 不带参数"
06991777 6802
7e6630a7 6803#: ref-filter.c:377
06991777 6804#, c-format
473eb541
JX
6805msgid "unrecognized %%(subject) argument: %s"
6806msgstr "未能识别的 %%(subject) 参数:%s"
06991777 6807
7e6630a7 6808#: ref-filter.c:396
06991777 6809#, c-format
473eb541
JX
6810msgid "expected %%(trailers:key=<value>)"
6811msgstr "预期 %%(trailers:key=<值>)"
06991777 6812
7e6630a7 6813#: ref-filter.c:398
06991777 6814#, c-format
473eb541
JX
6815msgid "unknown %%(trailers) argument: %s"
6816msgstr "未知的 %%(trailers) 参数:%s"
06991777 6817
7e6630a7 6818#: ref-filter.c:429
06991777 6819#, c-format
473eb541
JX
6820msgid "positive value expected contents:lines=%s"
6821msgstr "期望一个正数 contents:lines=%s"
06991777 6822
7e6630a7 6823#: ref-filter.c:431
06991777 6824#, c-format
473eb541
JX
6825msgid "unrecognized %%(contents) argument: %s"
6826msgstr "未能识别的 %%(contents) 参数:%s"
06991777 6827
7e6630a7
FZ
6828#: ref-filter.c:443
6829#, c-format
6830msgid "unrecognized %%(raw) argument: %s"
6831msgstr "未能识别的 %%(raw) 参数:%s"
6832
6833#: ref-filter.c:458
06991777 6834#, c-format
473eb541
JX
6835msgid "positive value expected '%s' in %%(%s)"
6836msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数"
06991777 6837
7e6630a7 6838#: ref-filter.c:462
06991777 6839#, c-format
473eb541
JX
6840msgid "unrecognized argument '%s' in %%(%s)"
6841msgstr "未能识别 %%(%2$s) 中的参数 '%1$s'"
06991777 6842
7e6630a7 6843#: ref-filter.c:476
06991777 6844#, c-format
473eb541
JX
6845msgid "unrecognized email option: %s"
6846msgstr "未识别的邮件选项:%s"
c04f5ac3 6847
7e6630a7 6848#: ref-filter.c:506
a0b6b246 6849#, c-format
473eb541
JX
6850msgid "expected format: %%(align:<width>,<position>)"
6851msgstr "期望的格式:%%(align:<宽度>,<位置>)"
c04f5ac3 6852
7e6630a7 6853#: ref-filter.c:518
a0b6b246 6854#, c-format
473eb541
JX
6855msgid "unrecognized position:%s"
6856msgstr "未能识别的位置:%s"
c04f5ac3 6857
7e6630a7 6858#: ref-filter.c:525
a0b6b246 6859#, c-format
473eb541
JX
6860msgid "unrecognized width:%s"
6861msgstr "未能识别的宽度:%s"
c04f5ac3 6862
7e6630a7 6863#: ref-filter.c:534
a0b6b246 6864#, c-format
473eb541
JX
6865msgid "unrecognized %%(align) argument: %s"
6866msgstr "未能识别的 %%(align) 参数:%s"
c04f5ac3 6867
7e6630a7 6868#: ref-filter.c:542
a0b6b246 6869#, c-format
473eb541
JX
6870msgid "positive width expected with the %%(align) atom"
6871msgstr "元素 %%(align) 需要一个正数的宽度"
cfff71a9 6872
7e6630a7 6873#: ref-filter.c:560
a0b6b246 6874#, c-format
473eb541
JX
6875msgid "unrecognized %%(if) argument: %s"
6876msgstr "未能识别的 %%(if) 参数:%s"
6c94aba5 6877
7e6630a7
FZ
6878#: ref-filter.c:568
6879#, c-format
6880msgid "%%(rest) does not take arguments"
6881msgstr "%%(rest) 不带参数"
6882
6883#: ref-filter.c:680
06991777 6884#, c-format
473eb541
JX
6885msgid "malformed field name: %.*s"
6886msgstr "格式错误的字段名:%.*s"
06991777 6887
7e6630a7 6888#: ref-filter.c:707
06991777 6889#, c-format
473eb541
JX
6890msgid "unknown field name: %.*s"
6891msgstr "未知的字段名:%.*s"
06991777 6892
7e6630a7 6893#: ref-filter.c:711
a0b6b246 6894#, c-format
473eb541
JX
6895msgid ""
6896"not a git repository, but the field '%.*s' requires access to object data"
6897msgstr "不是 git 仓库,但是字段 '%.*s' 需要访问对象数据"
6c94aba5 6898
7e6630a7 6899#: ref-filter.c:844
a0b6b246 6900#, c-format
473eb541
JX
6901msgid "format: %%(if) atom used without a %%(then) atom"
6902msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
cfff71a9 6903
7e6630a7 6904#: ref-filter.c:910
31e5e17b 6905#, c-format
473eb541
JX
6906msgid "format: %%(then) atom used without an %%(if) atom"
6907msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
31e5e17b 6908
7e6630a7 6909#: ref-filter.c:912
31e5e17b 6910#, c-format
473eb541
JX
6911msgid "format: %%(then) atom used more than once"
6912msgstr "格式:%%(then) 元素用了多次"
31e5e17b 6913
7e6630a7 6914#: ref-filter.c:914
a0b6b246 6915#, c-format
473eb541
JX
6916msgid "format: %%(then) atom used after %%(else)"
6917msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
cfff71a9 6918
7e6630a7 6919#: ref-filter.c:946
473eb541
JX
6920#, c-format
6921msgid "format: %%(else) atom used without an %%(if) atom"
6922msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
c04f5ac3 6923
7e6630a7 6924#: ref-filter.c:948
a0b6b246 6925#, c-format
473eb541
JX
6926msgid "format: %%(else) atom used without a %%(then) atom"
6927msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
c04f5ac3 6928
7e6630a7 6929#: ref-filter.c:950
473eb541
JX
6930#, c-format
6931msgid "format: %%(else) atom used more than once"
6932msgstr "格式:%%(else) 元素用了多次"
c04f5ac3 6933
7e6630a7 6934#: ref-filter.c:965
a0b6b246 6935#, c-format
473eb541
JX
6936msgid "format: %%(end) atom used without corresponding atom"
6937msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
90314792 6938
7e6630a7 6939#: ref-filter.c:1027
473eb541
JX
6940#, c-format
6941msgid "malformed format string %s"
6942msgstr "错误的格式化字符串 %s"
90314792 6943
7e6630a7
FZ
6944#: ref-filter.c:1033
6945#, c-format
6946msgid "this command reject atom %%(%.*s)"
6947msgstr "这个命令拒绝元素 %%(%.*s)"
6948
6949#: ref-filter.c:1040
6950#, c-format
84bf71ea 6951msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
7e6630a7
FZ
6952msgstr "--format=%.*s 不能和 --python、--shell、--tcl 同时使用"
6953
6954#: ref-filter.c:1706
06991777 6955#, c-format
473eb541
JX
6956msgid "(no branch, rebasing %s)"
6957msgstr "(非分支,正变基 %s)"
06991777 6958
7e6630a7 6959#: ref-filter.c:1709
c1ac5258 6960#, c-format
473eb541
JX
6961msgid "(no branch, rebasing detached HEAD %s)"
6962msgstr "(非分支,正变基分离头指针 %s)"
c1ac5258 6963
7e6630a7 6964#: ref-filter.c:1712
c1ac5258 6965#, c-format
473eb541
JX
6966msgid "(no branch, bisect started on %s)"
6967msgstr "(非分支,二分查找开始于 %s)"
c1ac5258 6968
7e6630a7 6969#: ref-filter.c:1716
c1ac5258 6970#, c-format
473eb541
JX
6971msgid "(HEAD detached at %s)"
6972msgstr "(头指针在 %s 分离)"
c1ac5258 6973
7e6630a7 6974#: ref-filter.c:1719
473eb541
JX
6975#, c-format
6976msgid "(HEAD detached from %s)"
6977msgstr "(头指针自 %s 分离)"
4c27fcb5 6978
7e6630a7 6979#: ref-filter.c:1722
473eb541
JX
6980msgid "(no branch)"
6981msgstr "(非分支)"
cfff71a9 6982
7e6630a7 6983#: ref-filter.c:1754 ref-filter.c:1972
4c27fcb5 6984#, c-format
473eb541
JX
6985msgid "missing object %s for %s"
6986msgstr "缺失 %2$s 的对象 %1$s"
6792b93b 6987
7e6630a7 6988#: ref-filter.c:1764
4c27fcb5 6989#, c-format
473eb541
JX
6990msgid "parse_object_buffer failed on %s for %s"
6991msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
5c57d762 6992
7e6630a7 6993#: ref-filter.c:2155
5809aa05 6994#, c-format
473eb541
JX
6995msgid "malformed object at '%s'"
6996msgstr "格式错误的对象 '%s'"
5809aa05 6997
7e6630a7 6998#: ref-filter.c:2245
4c27fcb5 6999#, c-format
473eb541
JX
7000msgid "ignoring ref with broken name %s"
7001msgstr "忽略带有错误名称 %s 的引用"
31e5e17b 7002
7e6630a7 7003#: ref-filter.c:2250 refs.c:673
87cb7997 7004#, c-format
473eb541
JX
7005msgid "ignoring broken ref %s"
7006msgstr "忽略损坏的引用 %s"
87cb7997 7007
7e6630a7 7008#: ref-filter.c:2623
87cb7997 7009#, c-format
473eb541
JX
7010msgid "format: %%(end) atom missing"
7011msgstr "格式:缺少 %%(end) 元素"
87cb7997 7012
7e6630a7 7013#: ref-filter.c:2726
4c27fcb5 7014#, c-format
473eb541
JX
7015msgid "malformed object name %s"
7016msgstr "格式错误的对象名 %s"
6792b93b 7017
7e6630a7 7018#: ref-filter.c:2731
4c27fcb5 7019#, c-format
473eb541
JX
7020msgid "option `%s' must point to a commit"
7021msgstr "选项 `%s' 必须指向一个提交"
4c27fcb5 7022
7e6630a7 7023#: refs.c:261
4c27fcb5 7024#, c-format
473eb541
JX
7025msgid "%s does not point to a valid object!"
7026msgstr "%s 没有指向一个有效的对象!"
4c27fcb5 7027
7e6630a7 7028#: refs.c:563
4c27fcb5 7029#, c-format
473eb541
JX
7030msgid ""
7031"Using '%s' as the name for the initial branch. This default branch name\n"
7032"is subject to change. To configure the initial branch name to use in all\n"
7033"of your new repositories, which will suppress this warning, call:\n"
7034"\n"
7035"\tgit config --global init.defaultBranch <name>\n"
7036"\n"
7037"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
7038"'development'. The just-created branch can be renamed via this command:\n"
7039"\n"
7040"\tgit branch -m <name>\n"
7041msgstr ""
7042"使用 '%s' 作为初始分支的名称。这个默认分支名称可能会更改。要在新仓库中\n"
7043"配置使用初始分支名,并消除这条警告,请执行:\n"
7044"\n"
7045"\tgit config --global init.defaultBranch <名称>\n"
7046"\n"
7047"除了 'master' 之外,通常选定的名字有 'main'、'trunk' 和 'development'。\n"
7048"可以通过以下命令重命名刚创建的分支:\n"
7049"\n"
7050"\tgit branch -m <name>\n"
4c27fcb5 7051
7e6630a7 7052#: refs.c:585
4c27fcb5 7053#, c-format
473eb541
JX
7054msgid "could not retrieve `%s`"
7055msgstr "无法获取 `%s`"
4c27fcb5 7056
7e6630a7 7057#: refs.c:595
4c27fcb5 7058#, c-format
473eb541
JX
7059msgid "invalid branch name: %s = %s"
7060msgstr "无效的分支名:%s = %s"
4c27fcb5 7061
7e6630a7 7062#: refs.c:671
4c27fcb5 7063#, c-format
473eb541
JX
7064msgid "ignoring dangling symref %s"
7065msgstr "忽略悬空符号引用 %s"
4c27fcb5 7066
7e6630a7 7067#: refs.c:920
4c27fcb5 7068#, c-format
473eb541
JX
7069msgid "log for ref %s has gap after %s"
7070msgstr "引用 %s 的日志在 %s 之后有缺口"
4c27fcb5 7071
7e6630a7 7072#: refs.c:927
4c27fcb5 7073#, c-format
473eb541
JX
7074msgid "log for ref %s unexpectedly ended on %s"
7075msgstr "引用 %s 的日志意外终止于 %s "
4c27fcb5 7076
7e6630a7 7077#: refs.c:992
4c27fcb5 7078#, c-format
473eb541
JX
7079msgid "log for %s is empty"
7080msgstr "%s 的日志为空"
349ede6a 7081
7e6630a7 7082#: refs.c:1084
349ede6a 7083#, c-format
473eb541
JX
7084msgid "refusing to update ref with bad name '%s'"
7085msgstr "拒绝更新有错误名称 '%s' 的引用"
d9488fea 7086
7e6630a7 7087#: refs.c:1155
d9488fea 7088#, c-format
473eb541
JX
7089msgid "update_ref failed for ref '%s': %s"
7090msgstr "对引用 '%s' 执行 update_ref 失败:%s"
4c27fcb5 7091
7e6630a7 7092#: refs.c:2062
4c27fcb5 7093#, c-format
473eb541
JX
7094msgid "multiple updates for ref '%s' not allowed"
7095msgstr "不允许对引用 '%s' 多次更新"
4c27fcb5 7096
7e6630a7 7097#: refs.c:2142
473eb541
JX
7098msgid "ref updates forbidden inside quarantine environment"
7099msgstr "在隔离环境中禁止更新引用"
d46c5519 7100
7e6630a7 7101#: refs.c:2153
473eb541
JX
7102msgid "ref updates aborted by hook"
7103msgstr "引用更新被钩子中止"
4c27fcb5 7104
7e6630a7 7105#: refs.c:2253 refs.c:2283
4c27fcb5 7106#, c-format
473eb541
JX
7107msgid "'%s' exists; cannot create '%s'"
7108msgstr "'%s' 已存在,无法创建 '%s'"
4c27fcb5 7109
7e6630a7 7110#: refs.c:2259 refs.c:2294
4c27fcb5 7111#, c-format
473eb541
JX
7112msgid "cannot process '%s' and '%s' at the same time"
7113msgstr "无法同时处理 '%s' 和 '%s'"
4c27fcb5 7114
7e6630a7 7115#: refs/files-backend.c:1271
4c27fcb5 7116#, c-format
473eb541
JX
7117msgid "could not remove reference %s"
7118msgstr "无法删除引用 %s"
4c27fcb5 7119
7e6630a7
FZ
7120#: refs/files-backend.c:1285 refs/packed-backend.c:1549
7121#: refs/packed-backend.c:1559
4c27fcb5 7122#, c-format
473eb541
JX
7123msgid "could not delete reference %s: %s"
7124msgstr "无法删除引用 %s:%s"
4c27fcb5 7125
7e6630a7 7126#: refs/files-backend.c:1288 refs/packed-backend.c:1562
473eb541
JX
7127#, c-format
7128msgid "could not delete references: %s"
7129msgstr "无法删除引用:%s"
7157c2b5 7130
473eb541
JX
7131#: refspec.c:170
7132#, c-format
7133msgid "invalid refspec '%s'"
33b62fba 7134msgstr "无效的引用规格:'%s'"
6792b93b 7135
473eb541
JX
7136#: remote.c:351
7137#, c-format
7138msgid "config remote shorthand cannot begin with '/': %s"
7139msgstr "配置的远程短名称不能以 '/' 开始:%s"
6792b93b 7140
473eb541
JX
7141#: remote.c:399
7142msgid "more than one receivepack given, using the first"
7143msgstr "提供了一个以上的 receivepack,使用第一个"
6792b93b 7144
473eb541
JX
7145#: remote.c:407
7146msgid "more than one uploadpack given, using the first"
7147msgstr "提供了一个以上的 uploadpack,使用第一个"
6792b93b 7148
473eb541 7149#: remote.c:590
31e5e17b 7150#, c-format
473eb541
JX
7151msgid "Cannot fetch both %s and %s to %s"
7152msgstr "不能同时获取 %s 和 %s 至 %s"
31e5e17b 7153
473eb541 7154#: remote.c:594
fd8cb379 7155#, c-format
473eb541
JX
7156msgid "%s usually tracks %s, not %s"
7157msgstr "%s 通常跟踪 %s,而非 %s"
fd8cb379 7158
473eb541 7159#: remote.c:598
a6cd2cc4 7160#, c-format
473eb541
JX
7161msgid "%s tracks both %s and %s"
7162msgstr "%s 同时跟踪 %s 和 %s"
a6cd2cc4 7163
473eb541
JX
7164#: remote.c:666
7165#, c-format
7166msgid "key '%s' of pattern had no '*'"
7167msgstr "模式的键 '%s' 没有 '*'"
6792b93b 7168
473eb541
JX
7169#: remote.c:676
7170#, c-format
7171msgid "value '%s' of pattern has no '*'"
7172msgstr "模式的值 '%s' 没有 '*'"
a0b6b246 7173
473eb541
JX
7174#: remote.c:1083
7175#, c-format
7176msgid "src refspec %s does not match any"
33b62fba 7177msgstr "源引用规格 %s 没有匹配"
2b472aae 7178
473eb541 7179#: remote.c:1088
1a79b2f1 7180#, c-format
473eb541 7181msgid "src refspec %s matches more than one"
33b62fba 7182msgstr "源引用规格 %s 匹配超过一个"
1a79b2f1 7183
473eb541
JX
7184#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
7185#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
7186#. the <src>.
7187#.
7188#: remote.c:1103
7189#, c-format
a0b6b246 7190msgid ""
473eb541
JX
7191"The destination you provided is not a full refname (i.e.,\n"
7192"starting with \"refs/\"). We tried to guess what you meant by:\n"
7193"\n"
7194"- Looking for a ref that matches '%s' on the remote side.\n"
7195"- Checking if the <src> being pushed ('%s')\n"
7196" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
7197" refs/{heads,tags}/ prefix on the remote side.\n"
7198"\n"
7199"Neither worked, so we gave up. You must fully qualify the ref."
a0b6b246 7200msgstr ""
473eb541
JX
7201"您提供的目标不是一个完整的引用名称(即以 \"refs/\" 开头)。我们\n"
7202"试着猜测您的想法:\n"
7203"\n"
7204"- 在远端查询和 '%s' 匹配的引用。\n"
7205"- 检查要推送的 <src>('%s')是不是在 \"refs/{heads,tags}/\" 中的\n"
7206" 引用。如果是,我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n"
7207"\n"
7208"都不行,所以我们已放弃。您必须给出完整的引用。"
a0b6b246 7209
473eb541
JX
7210#: remote.c:1123
7211#, c-format
a0b6b246 7212msgid ""
473eb541
JX
7213"The <src> part of the refspec is a commit object.\n"
7214"Did you mean to create a new branch by pushing to\n"
7215"'%s:refs/heads/%s'?"
a0b6b246 7216msgstr ""
33b62fba 7217"引用规格的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
473eb541 7218"'%s:refs/heads/%s' 推送么?"
1b7f4a34 7219
473eb541 7220#: remote.c:1128
d9488fea 7221#, c-format
473eb541
JX
7222msgid ""
7223"The <src> part of the refspec is a tag object.\n"
7224"Did you mean to create a new tag by pushing to\n"
7225"'%s:refs/tags/%s'?"
7226msgstr ""
33b62fba 7227"引用规格的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
473eb541 7228"'%s:refs/tags/%s' 推送么?"
d9488fea 7229
473eb541 7230#: remote.c:1133
a0b6b246 7231#, c-format
473eb541
JX
7232msgid ""
7233"The <src> part of the refspec is a tree object.\n"
7234"Did you mean to tag a new tree by pushing to\n"
7235"'%s:refs/tags/%s'?"
7236msgstr ""
33b62fba 7237"引用规格的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
473eb541 7238"'%s:refs/tags/%s' 推送么?"
1b7f4a34 7239
473eb541 7240#: remote.c:1138
1b7f4a34 7241#, c-format
473eb541
JX
7242msgid ""
7243"The <src> part of the refspec is a blob object.\n"
7244"Did you mean to tag a new blob by pushing to\n"
7245"'%s:refs/tags/%s'?"
7246msgstr ""
33b62fba 7247"引用规格的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
473eb541 7248"'%s:refs/tags/%s' 推送么?"
1b7f4a34 7249
473eb541 7250#: remote.c:1174
63af42fe 7251#, c-format
473eb541
JX
7252msgid "%s cannot be resolved to branch"
7253msgstr "%s 无法被解析为分支"
6792b93b 7254
473eb541 7255#: remote.c:1185
a0b6b246 7256#, c-format
473eb541
JX
7257msgid "unable to delete '%s': remote ref does not exist"
7258msgstr "无法删除 '%s':远程引用不存在"
6792b93b 7259
473eb541 7260#: remote.c:1197
d46c5519 7261#, c-format
473eb541 7262msgid "dst refspec %s matches more than one"
33b62fba 7263msgstr "目标引用规格 %s 匹配超过一个"
d46c5519 7264
473eb541 7265#: remote.c:1204
a0b6b246 7266#, c-format
473eb541
JX
7267msgid "dst ref %s receives from more than one src"
7268msgstr "目标引用 %s 接收超过一个源"
6792b93b 7269
473eb541
JX
7270#: remote.c:1724 remote.c:1825
7271msgid "HEAD does not point to a branch"
7272msgstr "HEAD 没有指向一个分支"
fd8cb379 7273
473eb541 7274#: remote.c:1733
4c27fcb5 7275#, c-format
473eb541
JX
7276msgid "no such branch: '%s'"
7277msgstr "没有此分支:'%s'"
4c27fcb5 7278
473eb541 7279#: remote.c:1736
c1ac5258 7280#, c-format
473eb541
JX
7281msgid "no upstream configured for branch '%s'"
7282msgstr "尚未给分支 '%s' 设置上游"
c1ac5258 7283
473eb541 7284#: remote.c:1742
c1ac5258 7285#, c-format
473eb541
JX
7286msgid "upstream branch '%s' not stored as a remote-tracking branch"
7287msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
4c27fcb5 7288
473eb541 7289#: remote.c:1757
4c27fcb5 7290#, c-format
473eb541
JX
7291msgid "push destination '%s' on remote '%s' has no local tracking branch"
7292msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
4c27fcb5 7293
473eb541
JX
7294#: remote.c:1769
7295#, c-format
7296msgid "branch '%s' has no remote for pushing"
7297msgstr "分支 '%s' 没有设置要推送的远程服务器"
4c27fcb5 7298
473eb541 7299#: remote.c:1779
63af42fe 7300#, c-format
473eb541
JX
7301msgid "push refspecs for '%s' do not include '%s'"
7302msgstr "向 '%s' 推送引用规格未包含 '%s'"
6792b93b 7303
473eb541
JX
7304#: remote.c:1792
7305msgid "push has no destination (push.default is 'nothing')"
7306msgstr "推送无目标(push.default 是 'nothing')"
31e5e17b 7307
473eb541
JX
7308#: remote.c:1814
7309msgid "cannot resolve 'simple' push to a single destination"
7310msgstr "无法解析 'simple' 推送至一个单独的目标"
31e5e17b 7311
473eb541
JX
7312#: remote.c:1943
7313#, c-format
7314msgid "couldn't find remote ref %s"
7315msgstr "无法找到远程引用 %s"
31e5e17b 7316
473eb541
JX
7317#: remote.c:1956
7318#, c-format
7319msgid "* Ignoring funny ref '%s' locally"
7320msgstr "* 在本地忽略可笑的引用 '%s'"
31e5e17b 7321
473eb541
JX
7322#: remote.c:2119
7323#, c-format
7324msgid "Your branch is based on '%s', but the upstream is gone.\n"
7325msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
31e5e17b 7326
473eb541
JX
7327#: remote.c:2123
7328msgid " (use \"git branch --unset-upstream\" to fixup)\n"
7329msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
31e5e17b 7330
473eb541
JX
7331#: remote.c:2126
7332#, c-format
7333msgid "Your branch is up to date with '%s'.\n"
7334msgstr "您的分支与上游分支 '%s' 一致。\n"
31e5e17b 7335
473eb541
JX
7336#: remote.c:2130
7337#, c-format
7338msgid "Your branch and '%s' refer to different commits.\n"
7339msgstr "您的分支和 '%s' 指向不同的提交。\n"
31e5e17b 7340
473eb541
JX
7341#: remote.c:2133
7342#, c-format
7343msgid " (use \"%s\" for details)\n"
7344msgstr " (使用 \"%s\" 查看详情)\n"
31e5e17b 7345
473eb541 7346#: remote.c:2137
31e5e17b 7347#, c-format
473eb541
JX
7348msgid "Your branch is ahead of '%s' by %d commit.\n"
7349msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
7350msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
7351msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
31e5e17b 7352
473eb541
JX
7353#: remote.c:2143
7354msgid " (use \"git push\" to publish your local commits)\n"
7355msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
31e5e17b 7356
473eb541
JX
7357#: remote.c:2146
7358#, c-format
7359msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
7360msgid_plural ""
7361"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
7362msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
7363msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
31e5e17b 7364
473eb541
JX
7365# 译者:注意保持前导空格
7366#: remote.c:2154
7367msgid " (use \"git pull\" to update your local branch)\n"
7368msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
31e5e17b 7369
473eb541 7370#: remote.c:2157
31e5e17b 7371#, c-format
473eb541
JX
7372msgid ""
7373"Your branch and '%s' have diverged,\n"
7374"and have %d and %d different commit each, respectively.\n"
7375msgid_plural ""
7376"Your branch and '%s' have diverged,\n"
7377"and have %d and %d different commits each, respectively.\n"
7378msgstr[0] ""
7379"您的分支和 '%s' 出现了偏离,\n"
7380"并且分别有 %d 和 %d 处不同的提交。\n"
7381msgstr[1] ""
7382"您的分支和 '%s' 出现了偏离,\n"
7383"并且分别有 %d 和 %d 处不同的提交。\n"
7384
7385# 译者:注意保持前导空格
7386#: remote.c:2167
7387msgid " (use \"git pull\" to merge the remote branch into yours)\n"
7388msgstr " (使用 \"git pull\" 来合并远程分支)\n"
31e5e17b 7389
473eb541 7390#: remote.c:2359
d9488fea 7391#, c-format
473eb541
JX
7392msgid "cannot parse expected object name '%s'"
7393msgstr "无法解析期望的对象名 '%s'"
d9488fea 7394
473eb541
JX
7395#: replace-object.c:21
7396#, c-format
7397msgid "bad replace ref name: %s"
7398msgstr "错误的替换引用名称:%s"
d9488fea 7399
473eb541
JX
7400#: replace-object.c:30
7401#, c-format
7402msgid "duplicate replace ref: %s"
7403msgstr "重复的替换引用:%s"
31e5e17b 7404
473eb541 7405#: replace-object.c:82
349ede6a 7406#, c-format
473eb541
JX
7407msgid "replace depth too high for object %s"
7408msgstr "对象 %s 的替换层级太深"
349ede6a 7409
473eb541
JX
7410#: rerere.c:201 rerere.c:210 rerere.c:213
7411msgid "corrupt MERGE_RR"
7412msgstr "损坏的 MERGE_RR"
7413
7414#: rerere.c:248 rerere.c:253
7415msgid "unable to write rerere record"
7416msgstr "无法写入 rerere 记录"
7417
7418#: rerere.c:479
a0b6b246 7419#, c-format
473eb541
JX
7420msgid "there were errors while writing '%s' (%s)"
7421msgstr "写入 '%s' (%s) 时出错"
6792b93b 7422
84bf71ea 7423#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
63af42fe 7424#, c-format
473eb541
JX
7425msgid "failed to flush '%s'"
7426msgstr "刷新 '%s' 失败"
63af42fe 7427
473eb541 7428#: rerere.c:487 rerere.c:1023
c1ac5258 7429#, c-format
473eb541
JX
7430msgid "could not parse conflict hunks in '%s'"
7431msgstr "不能解析 '%s' 中的冲突块"
c1ac5258 7432
473eb541 7433#: rerere.c:668
1a79b2f1 7434#, c-format
473eb541
JX
7435msgid "failed utime() on '%s'"
7436msgstr "在 '%s' 上调用 utime() 失败"
1a79b2f1 7437
473eb541
JX
7438#: rerere.c:678
7439#, c-format
7440msgid "writing '%s' failed"
7441msgstr "写入 '%s' 失败"
1a79b2f1 7442
473eb541
JX
7443#: rerere.c:698
7444#, c-format
7445msgid "Staged '%s' using previous resolution."
7446msgstr "使用之前的解决方案暂存 '%s'。"
1a79b2f1 7447
473eb541
JX
7448#: rerere.c:737
7449#, c-format
7450msgid "Recorded resolution for '%s'."
7451msgstr "已记录 '%s' 的解决方案。"
1a79b2f1 7452
473eb541 7453#: rerere.c:772
1a79b2f1 7454#, c-format
473eb541
JX
7455msgid "Resolved '%s' using previous resolution."
7456msgstr "使用之前的解决方案解决 '%s'。"
1a79b2f1 7457
473eb541
JX
7458#: rerere.c:787
7459#, c-format
7460msgid "cannot unlink stray '%s'"
7461msgstr "不能删除 stray '%s'"
1a79b2f1 7462
473eb541 7463#: rerere.c:791
1a79b2f1 7464#, c-format
473eb541
JX
7465msgid "Recorded preimage for '%s'"
7466msgstr "为 '%s' 记录 preimage"
1a79b2f1 7467
7e6630a7
FZ
7468#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
7469#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
1a79b2f1 7470#, c-format
473eb541
JX
7471msgid "could not create directory '%s'"
7472msgstr "不能创建目录 '%s'"
1a79b2f1 7473
473eb541 7474#: rerere.c:1041
1a79b2f1 7475#, c-format
473eb541
JX
7476msgid "failed to update conflicted state in '%s'"
7477msgstr "更新 '%s' 中的冲突状态失败"
1a79b2f1 7478
473eb541
JX
7479#: rerere.c:1052 rerere.c:1059
7480#, c-format
7481msgid "no remembered resolution for '%s'"
7482msgstr "没有为 '%s' 记忆的解决方案"
6792b93b 7483
473eb541
JX
7484#: rerere.c:1061
7485#, c-format
7486msgid "cannot unlink '%s'"
7487msgstr "不能删除 '%s'"
fd8cb379 7488
473eb541 7489#: rerere.c:1071
a0b6b246 7490#, c-format
473eb541
JX
7491msgid "Updated preimage for '%s'"
7492msgstr "已为 '%s' 更新 preimage"
6792b93b 7493
473eb541 7494#: rerere.c:1080
a0b6b246 7495#, c-format
473eb541
JX
7496msgid "Forgot resolution for '%s'\n"
7497msgstr "忘记 '%s' 的解决方案\n"
7498
7499#: rerere.c:1191
7500msgid "unable to open rr-cache directory"
7501msgstr "不能打开 rr-cache 目录"
a0b6b246 7502
473eb541
JX
7503#: reset.c:42
7504msgid "could not determine HEAD revision"
7505msgstr "不能确定 HEAD 版本"
7506
84bf71ea 7507#: reset.c:70 reset.c:76 sequencer.c:3705
1a79b2f1 7508#, c-format
473eb541 7509msgid "failed to find tree of %s"
7e6630a7 7510msgstr "无法找到 %s 指向的树"
1a79b2f1 7511
7e6630a7
FZ
7512#: revision.c:2259
7513msgid "--unsorted-input is incompatible with --no-walk"
7514msgstr "--unsorted-input 和 --no-walk 不兼容"
7515
7516#: revision.c:2346
473eb541
JX
7517msgid "--unpacked=<packfile> no longer supported"
7518msgstr "不再支持 --unpacked=<packfile>"
7519
7e6630a7
FZ
7520#: revision.c:2655 revision.c:2659
7521msgid "--no-walk is incompatible with --unsorted-input"
7522msgstr "--no-walk 和 --unsorted-input 不兼容"
7523
7524#: revision.c:2690
473eb541
JX
7525msgid "your current branch appears to be broken"
7526msgstr "您的当前分支好像被损坏"
7527
7e6630a7 7528#: revision.c:2693
a0b6b246 7529#, c-format
473eb541
JX
7530msgid "your current branch '%s' does not have any commits yet"
7531msgstr "您的当前分支 '%s' 尚无任何提交"
7532
7e6630a7 7533#: revision.c:2895
473eb541
JX
7534msgid "-L does not yet support diff formats besides -p and -s"
7535msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
7536
7e6630a7 7537#: run-command.c:1278
a0b6b246 7538#, c-format
473eb541
JX
7539msgid "cannot create async thread: %s"
7540msgstr "不能创建 async 线程:%s"
a0b6b246 7541
33b62fba 7542#: send-pack.c:150
473eb541
JX
7543msgid "unexpected flush packet while reading remote unpack status"
7544msgstr "读取远程解包状态时收到意外的 flush 包"
a0b6b246 7545
33b62fba 7546#: send-pack.c:152
a0b6b246 7547#, c-format
473eb541
JX
7548msgid "unable to parse remote unpack status: %s"
7549msgstr "不能解析远程解包状态:%s"
7550
33b62fba 7551#: send-pack.c:154
473eb541
JX
7552#, c-format
7553msgid "remote unpack failed: %s"
7554msgstr "远程解包失败:%s"
7555
33b62fba 7556#: send-pack.c:378
473eb541
JX
7557msgid "failed to sign the push certificate"
7558msgstr "为推送证书签名失败"
a0b6b246 7559
7e6630a7 7560#: send-pack.c:435
33b62fba
JX
7561msgid "send-pack: unable to fork off fetch subprocess"
7562msgstr "send-pack:无法派生 fetch 子进程"
7563
7e6630a7 7564#: send-pack.c:457
33b62fba 7565msgid "push negotiation failed; proceeding anyway with push"
7b4d4954 7566msgstr "推送协商失败,但还是继续推送"
33b62fba 7567
7e6630a7 7568#: send-pack.c:528
473eb541
JX
7569msgid "the receiving end does not support this repository's hash algorithm"
7570msgstr "接收端不支持这个仓库的哈希算法"
2b472aae 7571
7e6630a7 7572#: send-pack.c:537
473eb541 7573msgid "the receiving end does not support --signed push"
ec3d4607 7574msgstr "接收端不支持签名推送(--signed)"
a0b6b246 7575
7e6630a7 7576#: send-pack.c:539
473eb541
JX
7577msgid ""
7578"not sending a push certificate since the receiving end does not support --"
7579"signed push"
ec3d4607 7580msgstr "未发送推送证书,因为接收端不支持签名推送(--signed)"
a0b6b246 7581
7e6630a7 7582#: send-pack.c:546
473eb541 7583msgid "the receiving end does not support --atomic push"
ec3d4607 7584msgstr "接收端不支持原子推送(--atomic)"
5809aa05 7585
7e6630a7 7586#: send-pack.c:551
473eb541
JX
7587msgid "the receiving end does not support push options"
7588msgstr "接收端不支持推送选项"
5809aa05 7589
7e6630a7 7590#: sequencer.c:197
d46c5519 7591#, c-format
473eb541
JX
7592msgid "invalid commit message cleanup mode '%s'"
7593msgstr "无效的提交信息清理模式 '%s'"
d46c5519 7594
7e6630a7 7595#: sequencer.c:325
a0b6b246 7596#, c-format
473eb541
JX
7597msgid "could not delete '%s'"
7598msgstr "无法删除 '%s'"
a0b6b246 7599
84bf71ea 7600#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
7e6630a7 7601#: builtin/rm.c:408
1a79b2f1 7602#, c-format
473eb541
JX
7603msgid "could not remove '%s'"
7604msgstr "无法删除 '%s'"
a0b6b246 7605
7e6630a7 7606#: sequencer.c:355
473eb541
JX
7607msgid "revert"
7608msgstr "还原"
a6cd2cc4 7609
7e6630a7 7610#: sequencer.c:357
473eb541
JX
7611msgid "cherry-pick"
7612msgstr "拣选"
a6cd2cc4 7613
7e6630a7 7614#: sequencer.c:359
473eb541
JX
7615msgid "rebase"
7616msgstr "变基"
1a79b2f1 7617
7e6630a7 7618#: sequencer.c:361
a0b6b246 7619#, c-format
473eb541
JX
7620msgid "unknown action: %d"
7621msgstr "未知动作:%d"
1a79b2f1 7622
7e6630a7 7623#: sequencer.c:420
473eb541
JX
7624msgid ""
7625"after resolving the conflicts, mark the corrected paths\n"
7626"with 'git add <paths>' or 'git rm <paths>'"
7627msgstr ""
7628"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
7629"命令标记修正后的文件"
a0b6b246 7630
7e6630a7 7631#: sequencer.c:423
473eb541 7632msgid ""
7e6630a7
FZ
7633"After resolving the conflicts, mark them with\n"
7634"\"git add/rm <pathspec>\", then run\n"
7635"\"git cherry-pick --continue\".\n"
7636"You can instead skip this commit with \"git cherry-pick --skip\".\n"
7637"To abort and get back to the state before \"git cherry-pick\",\n"
7638"run \"git cherry-pick --abort\"."
473eb541 7639msgstr ""
7e6630a7
FZ
7640"解决所有冲突之后,用 \"git add/rm <路径规格>\" 标记它们,\n"
7641"然后执行 \"git cherry-pick --continue\"。您也可以执行\n"
7642"\"git cherry-pick --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
7643"执行 \"git cherry-pick\" 之前的状态,执行 \"git cherry-pick --abort\"。"
7644
7645#: sequencer.c:430
7646msgid ""
7647"After resolving the conflicts, mark them with\n"
7648"\"git add/rm <pathspec>\", then run\n"
7649"\"git revert --continue\".\n"
7650"You can instead skip this commit with \"git revert --skip\".\n"
7651"To abort and get back to the state before \"git revert\",\n"
7652"run \"git revert --abort\"."
7653msgstr ""
7654"解决所有冲突之后,用 \"git add/rm <路径规格>\" 标记它们,\n"
7655"然后执行 \"git revert --continue\"。您也可以执行\n"
7656"\"git revert --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
7657"执行 \"git revert\" 之前的状态,执行 \"git revert --abort\"。"
a0b6b246 7658
84bf71ea 7659#: sequencer.c:448 sequencer.c:3290
a0b6b246 7660#, c-format
473eb541
JX
7661msgid "could not lock '%s'"
7662msgstr "不能锁定 '%s'"
fd8cb379 7663
84bf71ea
FZ
7664#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
7665#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
a0b6b246 7666#, c-format
473eb541
JX
7667msgid "could not write to '%s'"
7668msgstr "不能写入 '%s'"
a0b6b246 7669
7e6630a7 7670#: sequencer.c:455
473eb541
JX
7671#, c-format
7672msgid "could not write eol to '%s'"
7673msgstr "不能将换行符写入 '%s'"
c1ac5258 7674
84bf71ea
FZ
7675#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
7676#: sequencer.c:3574
473eb541
JX
7677#, c-format
7678msgid "failed to finalize '%s'"
7679msgstr "无法完成 '%s'"
a0b6b246 7680
7e6630a7 7681#: sequencer.c:499
a6cd2cc4 7682#, c-format
473eb541
JX
7683msgid "your local changes would be overwritten by %s."
7684msgstr "您的本地修改将被%s覆盖。"
a6cd2cc4 7685
7e6630a7 7686#: sequencer.c:503
473eb541
JX
7687msgid "commit your changes or stash them to proceed."
7688msgstr "提交您的修改或贮藏后再继续。"
a6cd2cc4 7689
7e6630a7 7690#: sequencer.c:535
a6cd2cc4 7691#, c-format
473eb541
JX
7692msgid "%s: fast-forward"
7693msgstr "%s:快进"
a0b6b246 7694
7e6630a7 7695#: sequencer.c:574 builtin/tag.c:610
a0b6b246 7696#, c-format
473eb541
JX
7697msgid "Invalid cleanup mode %s"
7698msgstr "无效的清理模式 %s"
a0b6b246 7699
473eb541
JX
7700#. TRANSLATORS: %s will be "revert", "cherry-pick" or
7701#. "rebase".
7702#.
7e6630a7 7703#: sequencer.c:685
473eb541
JX
7704#, c-format
7705msgid "%s: Unable to write new index file"
7706msgstr "%s:无法写入新索引文件"
a0b6b246 7707
7e6630a7 7708#: sequencer.c:699
473eb541
JX
7709msgid "unable to update cache tree"
7710msgstr "不能更新缓存树"
a0b6b246 7711
7e6630a7 7712#: sequencer.c:713
473eb541
JX
7713msgid "could not resolve HEAD commit"
7714msgstr "不能解析 HEAD 提交"
a0b6b246 7715
7e6630a7 7716#: sequencer.c:793
a0b6b246 7717#, c-format
473eb541
JX
7718msgid "no key present in '%.*s'"
7719msgstr "在 '%.*s' 中没有 key"
a0b6b246 7720
7e6630a7 7721#: sequencer.c:804
a0b6b246 7722#, c-format
473eb541
JX
7723msgid "unable to dequote value of '%s'"
7724msgstr "无法为 '%s' 的值去引号"
a0b6b246 7725
7e6630a7
FZ
7726#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
7727#: builtin/am.c:822 builtin/rebase.c:694
a0b6b246 7728#, c-format
473eb541
JX
7729msgid "could not open '%s' for reading"
7730msgstr "无法打开 '%s' 进行读取"
a6cd2cc4 7731
7e6630a7 7732#: sequencer.c:851
473eb541
JX
7733msgid "'GIT_AUTHOR_NAME' already given"
7734msgstr "已经给出 'GIT_AUTHOR_NAME'"
a6cd2cc4 7735
7e6630a7 7736#: sequencer.c:856
473eb541
JX
7737msgid "'GIT_AUTHOR_EMAIL' already given"
7738msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
a6cd2cc4 7739
7e6630a7 7740#: sequencer.c:861
473eb541
JX
7741msgid "'GIT_AUTHOR_DATE' already given"
7742msgstr "已经给出 'GIT_AUTHOR_DATE'"
a6cd2cc4 7743
7e6630a7 7744#: sequencer.c:865
a6cd2cc4 7745#, c-format
473eb541
JX
7746msgid "unknown variable '%s'"
7747msgstr "未知变量 '%s'"
a6cd2cc4 7748
7e6630a7 7749#: sequencer.c:870
473eb541
JX
7750msgid "missing 'GIT_AUTHOR_NAME'"
7751msgstr "缺少 'GIT_AUTHOR_NAME'"
1a79b2f1 7752
7e6630a7 7753#: sequencer.c:872
473eb541
JX
7754msgid "missing 'GIT_AUTHOR_EMAIL'"
7755msgstr "缺少 'GIT_AUTHOR_EMAIL'"
c1ac5258 7756
7e6630a7 7757#: sequencer.c:874
473eb541
JX
7758msgid "missing 'GIT_AUTHOR_DATE'"
7759msgstr "缺少 'GIT_AUTHOR_DATE'"
7760
7e6630a7 7761#: sequencer.c:939
c1ac5258
JX
7762#, c-format
7763msgid ""
473eb541
JX
7764"you have staged changes in your working tree\n"
7765"If these changes are meant to be squashed into the previous commit, run:\n"
c1ac5258
JX
7766"\n"
7767" git commit --amend %s\n"
7768"\n"
473eb541
JX
7769"If they are meant to go into a new commit, run:\n"
7770"\n"
7771" git commit %s\n"
7772"\n"
7773"In both cases, once you're done, continue with:\n"
c1ac5258
JX
7774"\n"
7775" git rebase --continue\n"
7776msgstr ""
473eb541 7777"您的工作区中存在已暂存的修改\n"
33b62fba 7778"如果这些修改需要被挤压到前一个提交,执行:\n"
c1ac5258
JX
7779"\n"
7780" git commit --amend %s\n"
7781"\n"
473eb541
JX
7782"如果这些修改要形成一个新提交,执行:\n"
7783"\n"
7784" git commit %s\n"
7785"\n"
7786"无论哪种情况,当您完成提交,继续执行:\n"
c1ac5258
JX
7787"\n"
7788" git rebase --continue\n"
7789
84bf71ea 7790#: sequencer.c:1229
473eb541
JX
7791msgid "'prepare-commit-msg' hook failed"
7792msgstr "'prepare-commit-msg' 钩子失败"
349ede6a 7793
84bf71ea 7794#: sequencer.c:1235
1a79b2f1 7795msgid ""
473eb541
JX
7796"Your name and email address were configured automatically based\n"
7797"on your username and hostname. Please check that they are accurate.\n"
7798"You can suppress this message by setting them explicitly. Run the\n"
7799"following command and follow the instructions in your editor to edit\n"
7800"your configuration file:\n"
1a79b2f1 7801"\n"
473eb541
JX
7802" git config --global --edit\n"
7803"\n"
7804"After doing this, you may fix the identity used for this commit with:\n"
7805"\n"
7806" git commit --amend --reset-author\n"
7807msgstr ""
7808"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
7809"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
7810"中编辑您的配置文件:\n"
1a79b2f1 7811"\n"
473eb541 7812" git config --global --edit\n"
1a79b2f1 7813"\n"
473eb541 7814"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
1a79b2f1 7815"\n"
473eb541 7816" git commit --amend --reset-author\n"
1a79b2f1 7817
84bf71ea 7818#: sequencer.c:1248
1a79b2f1 7819msgid ""
473eb541
JX
7820"Your name and email address were configured automatically based\n"
7821"on your username and hostname. Please check that they are accurate.\n"
7822"You can suppress this message by setting them explicitly:\n"
1a79b2f1 7823"\n"
473eb541
JX
7824" git config --global user.name \"Your Name\"\n"
7825" git config --global user.email you@example.com\n"
7826"\n"
7827"After doing this, you may fix the identity used for this commit with:\n"
1a79b2f1 7828"\n"
473eb541 7829" git commit --amend --reset-author\n"
1a79b2f1 7830msgstr ""
473eb541
JX
7831"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
7832"与否。您可以对其进行设置以免再出现本提示信息:\n"
1a79b2f1 7833"\n"
473eb541
JX
7834" git config --global user.name \"Your Name\"\n"
7835" git config --global user.email you@example.com\n"
1a79b2f1 7836"\n"
473eb541
JX
7837"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
7838"\n"
7839" git commit --amend --reset-author\n"
1a79b2f1 7840
84bf71ea 7841#: sequencer.c:1290
473eb541
JX
7842msgid "couldn't look up newly created commit"
7843msgstr "无法找到新创建的提交"
c1ac5258 7844
84bf71ea 7845#: sequencer.c:1292
473eb541
JX
7846msgid "could not parse newly created commit"
7847msgstr "不能解析新创建的提交"
fd8cb379 7848
84bf71ea 7849#: sequencer.c:1338
473eb541
JX
7850msgid "unable to resolve HEAD after creating commit"
7851msgstr "创建提交后,不能解析 HEAD"
fd8cb379 7852
84bf71ea 7853#: sequencer.c:1340
473eb541
JX
7854msgid "detached HEAD"
7855msgstr "分离头指针"
c1ac5258 7856
473eb541 7857# 译者:中文字符串拼接,可删除前导空格
84bf71ea 7858#: sequencer.c:1344
473eb541
JX
7859msgid " (root-commit)"
7860msgstr "(根提交)"
fd8cb379 7861
84bf71ea 7862#: sequencer.c:1365
473eb541
JX
7863msgid "could not parse HEAD"
7864msgstr "不能解析 HEAD"
c1ac5258 7865
84bf71ea 7866#: sequencer.c:1367
c1ac5258 7867#, c-format
473eb541
JX
7868msgid "HEAD %s is not a commit!"
7869msgstr "HEAD %s 不是一个提交!"
c1ac5258 7870
84bf71ea 7871#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
473eb541
JX
7872msgid "could not parse HEAD commit"
7873msgstr "不能解析 HEAD 提交"
7874
84bf71ea 7875#: sequencer.c:1427 sequencer.c:2312
473eb541
JX
7876msgid "unable to parse commit author"
7877msgstr "不能解析提交作者"
7878
84bf71ea 7879#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
473eb541
JX
7880msgid "git write-tree failed to write a tree"
7881msgstr "git write-tree 无法写入树对象"
fd8cb379 7882
84bf71ea 7883#: sequencer.c:1471 sequencer.c:1591
fd8cb379 7884#, c-format
473eb541
JX
7885msgid "unable to read commit message from '%s'"
7886msgstr "不能从 '%s' 读取提交说明"
fd8cb379 7887
84bf71ea 7888#: sequencer.c:1502 sequencer.c:1534
fd8cb379 7889#, c-format
473eb541
JX
7890msgid "invalid author identity '%s'"
7891msgstr "无效的作者身份 '%s'"
fd8cb379 7892
84bf71ea 7893#: sequencer.c:1508
473eb541
JX
7894msgid "corrupt author: missing date information"
7895msgstr "损坏的作者:缺失日期信息"
fd8cb379 7896
84bf71ea 7897#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
7e6630a7 7898#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
473eb541
JX
7899msgid "failed to write commit object"
7900msgstr "写提交对象失败"
349ede6a 7901
84bf71ea 7902#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
ec3d4607 7903#: t/helper/test-fast-rebase.c:217
1a79b2f1 7904#, c-format
473eb541
JX
7905msgid "could not update %s"
7906msgstr "不能更新 %s"
1a79b2f1 7907
84bf71ea 7908#: sequencer.c:1623
1a79b2f1 7909#, c-format
473eb541
JX
7910msgid "could not parse commit %s"
7911msgstr "不能解析提交 %s"
349ede6a 7912
84bf71ea 7913#: sequencer.c:1628
349ede6a 7914#, c-format
473eb541
JX
7915msgid "could not parse parent commit %s"
7916msgstr "不能解析父提交 %s"
349ede6a 7917
84bf71ea 7918#: sequencer.c:1711 sequencer.c:1992
349ede6a 7919#, c-format
473eb541
JX
7920msgid "unknown command: %d"
7921msgstr "未知命令:%d"
349ede6a 7922
84bf71ea 7923#: sequencer.c:1753
33b62fba
JX
7924msgid "This is the 1st commit message:"
7925msgstr "这是第一个提交说明:"
7926
84bf71ea 7927#: sequencer.c:1754
33b62fba
JX
7928#, c-format
7929msgid "This is the commit message #%d:"
7930msgstr "这是提交说明 #%d:"
7931
84bf71ea 7932#: sequencer.c:1755
33b62fba
JX
7933msgid "The 1st commit message will be skipped:"
7934msgstr "第一个提交说明将被跳过:"
7935
84bf71ea 7936#: sequencer.c:1756
33b62fba
JX
7937#, c-format
7938msgid "The commit message #%d will be skipped:"
7939msgstr "提交说明 #%d 将被跳过:"
7940
84bf71ea 7941#: sequencer.c:1757
349ede6a 7942#, c-format
473eb541
JX
7943msgid "This is a combination of %d commits."
7944msgstr "这是一个 %d 个提交的组合。"
7945
84bf71ea 7946#: sequencer.c:1904 sequencer.c:1961
33b62fba
JX
7947#, c-format
7948msgid "cannot write '%s'"
7949msgstr "不能写 '%s'"
7950
84bf71ea 7951#: sequencer.c:1951
473eb541
JX
7952msgid "need a HEAD to fixup"
7953msgstr "需要一个 HEAD 来修复"
7954
84bf71ea 7955#: sequencer.c:1953 sequencer.c:3601
473eb541
JX
7956msgid "could not read HEAD"
7957msgstr "不能读取 HEAD"
7958
84bf71ea 7959#: sequencer.c:1955
473eb541
JX
7960msgid "could not read HEAD's commit message"
7961msgstr "不能读取 HEAD 的提交说明"
1a79b2f1 7962
84bf71ea 7963#: sequencer.c:1979
473eb541
JX
7964#, c-format
7965msgid "could not read commit message of %s"
7966msgstr "不能读取 %s 的提交说明"
349ede6a 7967
84bf71ea 7968#: sequencer.c:2089
473eb541
JX
7969msgid "your index file is unmerged."
7970msgstr "您的索引文件未完成合并。"
7971
84bf71ea 7972#: sequencer.c:2096
473eb541
JX
7973msgid "cannot fixup root commit"
7974msgstr "不能修复根提交"
4c27fcb5 7975
84bf71ea 7976#: sequencer.c:2115
4c27fcb5 7977#, c-format
473eb541
JX
7978msgid "commit %s is a merge but no -m option was given."
7979msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
4c27fcb5 7980
84bf71ea 7981#: sequencer.c:2123 sequencer.c:2131
fd8cb379 7982#, c-format
473eb541
JX
7983msgid "commit %s does not have parent %d"
7984msgstr "提交 %s 没有第 %d 个父提交"
fd8cb379 7985
84bf71ea 7986#: sequencer.c:2137
349ede6a 7987#, c-format
473eb541
JX
7988msgid "cannot get commit message for %s"
7989msgstr "不能得到 %s 的提交说明"
349ede6a 7990
473eb541
JX
7991#. TRANSLATORS: The first %s will be a "todo" command like
7992#. "revert" or "pick", the second %s a SHA1.
84bf71ea 7993#: sequencer.c:2156
1a79b2f1 7994#, c-format
473eb541
JX
7995msgid "%s: cannot parse parent commit %s"
7996msgstr "%s:不能解析父提交 %s"
1a79b2f1 7997
84bf71ea 7998#: sequencer.c:2222
1a79b2f1 7999#, c-format
473eb541
JX
8000msgid "could not rename '%s' to '%s'"
8001msgstr "不能将 '%s' 重命名为 '%s'"
1a79b2f1 8002
84bf71ea 8003#: sequencer.c:2282
473eb541
JX
8004#, c-format
8005msgid "could not revert %s... %s"
8006msgstr "不能还原 %s... %s"
1a79b2f1 8007
84bf71ea 8008#: sequencer.c:2283
473eb541
JX
8009#, c-format
8010msgid "could not apply %s... %s"
8011msgstr "不能应用 %s... %s"
1a79b2f1 8012
84bf71ea 8013#: sequencer.c:2304
1a79b2f1 8014#, c-format
473eb541
JX
8015msgid "dropping %s %s -- patch contents already upstream\n"
8016msgstr "丢弃 %s %s -- 补丁内容已在上游\n"
1a79b2f1 8017
84bf71ea 8018#: sequencer.c:2362
349ede6a 8019#, c-format
473eb541
JX
8020msgid "git %s: failed to read the index"
8021msgstr "git %s:无法读取索引"
349ede6a 8022
84bf71ea 8023#: sequencer.c:2370
473eb541
JX
8024#, c-format
8025msgid "git %s: failed to refresh the index"
8026msgstr "git %s:无法刷新索引"
1a79b2f1 8027
84bf71ea 8028#: sequencer.c:2450
473eb541
JX
8029#, c-format
8030msgid "%s does not accept arguments: '%s'"
8031msgstr "%s 不接受参数:'%s'"
1a79b2f1 8032
84bf71ea 8033#: sequencer.c:2459
1a79b2f1 8034#, c-format
473eb541
JX
8035msgid "missing arguments for %s"
8036msgstr "缺少 %s 的参数"
1a79b2f1 8037
84bf71ea 8038#: sequencer.c:2502
1a79b2f1 8039#, c-format
473eb541
JX
8040msgid "could not parse '%s'"
8041msgstr "无法解析 '%s'"
1a79b2f1 8042
84bf71ea 8043#: sequencer.c:2563
473eb541
JX
8044#, c-format
8045msgid "invalid line %d: %.*s"
8046msgstr "无效行 %d:%.*s"
1a79b2f1 8047
84bf71ea 8048#: sequencer.c:2574
fd8cb379 8049#, c-format
473eb541
JX
8050msgid "cannot '%s' without a previous commit"
8051msgstr "没有父提交的情况下不能 '%s'"
fd8cb379 8052
84bf71ea 8053#: sequencer.c:2622 builtin/rebase.c:184
7e6630a7
FZ
8054#, c-format
8055msgid "could not read '%s'."
8056msgstr "不能读取 '%s'。"
8057
84bf71ea 8058#: sequencer.c:2660
473eb541
JX
8059msgid "cancelling a cherry picking in progress"
8060msgstr "正在取消一个进行中的拣选"
fd8cb379 8061
84bf71ea 8062#: sequencer.c:2669
473eb541
JX
8063msgid "cancelling a revert in progress"
8064msgstr "正在取消一个进行中的还原"
1a79b2f1 8065
84bf71ea 8066#: sequencer.c:2709
473eb541
JX
8067msgid "please fix this using 'git rebase --edit-todo'."
8068msgstr "请用 'git rebase --edit-todo' 来修改。"
a0b6b246 8069
84bf71ea 8070#: sequencer.c:2711
a0b6b246 8071#, c-format
473eb541
JX
8072msgid "unusable instruction sheet: '%s'"
8073msgstr "不可用的指令清单:'%s'"
a0b6b246 8074
84bf71ea 8075#: sequencer.c:2716
473eb541
JX
8076msgid "no commits parsed."
8077msgstr "没有解析提交。"
6937cb4e 8078
84bf71ea 8079#: sequencer.c:2727
473eb541
JX
8080msgid "cannot cherry-pick during a revert."
8081msgstr "不能在回退中执行拣选。"
6937cb4e 8082
84bf71ea 8083#: sequencer.c:2729
473eb541
JX
8084msgid "cannot revert during a cherry-pick."
8085msgstr "不能在拣选中执行回退。"
4c27fcb5 8086
84bf71ea 8087#: sequencer.c:2807
473eb541
JX
8088#, c-format
8089msgid "invalid value for %s: %s"
8090msgstr "%s 的值无效:%s"
4c27fcb5 8091
84bf71ea 8092#: sequencer.c:2916
473eb541
JX
8093msgid "unusable squash-onto"
8094msgstr "不可用的 squash-onto"
6937cb4e 8095
84bf71ea 8096#: sequencer.c:2936
31e5e17b 8097#, c-format
473eb541
JX
8098msgid "malformed options sheet: '%s'"
8099msgstr "格式错误的选项清单:'%s'"
31e5e17b 8100
84bf71ea 8101#: sequencer.c:3031 sequencer.c:4905
473eb541
JX
8102msgid "empty commit set passed"
8103msgstr "提供了空的提交集"
6792b93b 8104
84bf71ea 8105#: sequencer.c:3048
473eb541
JX
8106msgid "revert is already in progress"
8107msgstr "一个还原操作已在进行"
6792b93b 8108
84bf71ea 8109#: sequencer.c:3050
31e5e17b 8110#, c-format
473eb541
JX
8111msgid "try \"git revert (--continue | %s--abort | --quit)\""
8112msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
31e5e17b 8113
84bf71ea 8114#: sequencer.c:3053
473eb541
JX
8115msgid "cherry-pick is already in progress"
8116msgstr "拣选操作已在进行"
8117
84bf71ea 8118#: sequencer.c:3055
a0b6b246 8119#, c-format
473eb541
JX
8120msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
8121msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
2e8451e8 8122
84bf71ea 8123#: sequencer.c:3069
473eb541
JX
8124#, c-format
8125msgid "could not create sequencer directory '%s'"
8126msgstr "不能创建序列目录 '%s'"
31e5e17b 8127
84bf71ea 8128#: sequencer.c:3084
473eb541
JX
8129msgid "could not lock HEAD"
8130msgstr "不能锁定 HEAD"
31e5e17b 8131
84bf71ea 8132#: sequencer.c:3144 sequencer.c:4615
473eb541
JX
8133msgid "no cherry-pick or revert in progress"
8134msgstr "拣选或还原操作并未进行"
6792b93b 8135
84bf71ea 8136#: sequencer.c:3146 sequencer.c:3157
473eb541
JX
8137msgid "cannot resolve HEAD"
8138msgstr "不能解析 HEAD"
2e8451e8 8139
84bf71ea 8140#: sequencer.c:3148 sequencer.c:3192
473eb541
JX
8141msgid "cannot abort from a branch yet to be born"
8142msgstr "不能从尚未建立的分支终止"
d9488fea 8143
84bf71ea 8144#: sequencer.c:3178 builtin/grep.c:772
1003b3a5 8145#, c-format
473eb541
JX
8146msgid "cannot open '%s'"
8147msgstr "不能打开 '%s'"
1003b3a5 8148
84bf71ea 8149#: sequencer.c:3180
31e5e17b 8150#, c-format
473eb541
JX
8151msgid "cannot read '%s': %s"
8152msgstr "不能读取 '%s':%s"
31e5e17b 8153
84bf71ea 8154#: sequencer.c:3181
473eb541
JX
8155msgid "unexpected end of file"
8156msgstr "意外的文件结束"
31e5e17b 8157
84bf71ea 8158#: sequencer.c:3187
31e5e17b 8159#, c-format
473eb541
JX
8160msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
8161msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
31e5e17b 8162
84bf71ea 8163#: sequencer.c:3198
473eb541
JX
8164msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
8165msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
31e5e17b 8166
84bf71ea 8167#: sequencer.c:3239
473eb541
JX
8168msgid "no revert in progress"
8169msgstr "没有正在进行的还原"
31e5e17b 8170
84bf71ea 8171#: sequencer.c:3248
473eb541
JX
8172msgid "no cherry-pick in progress"
8173msgstr "没有正在进行的拣选"
31e5e17b 8174
84bf71ea 8175#: sequencer.c:3258
473eb541
JX
8176msgid "failed to skip the commit"
8177msgstr "无法跳过这个提交"
8178
84bf71ea 8179#: sequencer.c:3265
473eb541
JX
8180msgid "there is nothing to skip"
8181msgstr "没有要跳过的"
8182
84bf71ea 8183#: sequencer.c:3268
31e5e17b 8184#, c-format
473eb541
JX
8185msgid ""
8186"have you committed already?\n"
8187"try \"git %s --continue\""
8188msgstr ""
8189"您已经提交了么?\n"
8190"试试 \"git %s --continue\""
31e5e17b 8191
84bf71ea 8192#: sequencer.c:3430 sequencer.c:4506
473eb541
JX
8193msgid "cannot read HEAD"
8194msgstr "不能读取 HEAD"
8195
84bf71ea 8196#: sequencer.c:3447
31e5e17b 8197#, c-format
473eb541
JX
8198msgid "unable to copy '%s' to '%s'"
8199msgstr "无法拷贝 '%s' 至 '%s'"
31e5e17b 8200
84bf71ea 8201#: sequencer.c:3455
473eb541
JX
8202#, c-format
8203msgid ""
8204"You can amend the commit now, with\n"
8205"\n"
8206" git commit --amend %s\n"
8207"\n"
8208"Once you are satisfied with your changes, run\n"
8209"\n"
8210" git rebase --continue\n"
8211msgstr ""
8212"您现在可以修补这个提交,使用\n"
8213"\n"
8214" git commit --amend %s\n"
8215"\n"
8216"当您对变更感到满意,执行\n"
8217"\n"
8218" git rebase --continue\n"
1003b3a5 8219
84bf71ea 8220#: sequencer.c:3465
31e5e17b 8221#, c-format
473eb541
JX
8222msgid "Could not apply %s... %.*s"
8223msgstr "不能应用 %s... %.*s"
31e5e17b 8224
84bf71ea 8225#: sequencer.c:3472
473eb541
JX
8226#, c-format
8227msgid "Could not merge %.*s"
8228msgstr "不能合并 %.*s"
1003b3a5 8229
84bf71ea 8230#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
87cb7997 8231#, c-format
473eb541
JX
8232msgid "could not copy '%s' to '%s'"
8233msgstr "不能拷贝 '%s' 至 '%s'"
87cb7997 8234
84bf71ea 8235#: sequencer.c:3502
06991777 8236#, c-format
473eb541
JX
8237msgid "Executing: %s\n"
8238msgstr "正在执行:%s\n"
06991777 8239
84bf71ea 8240#: sequencer.c:3517
a0b6b246
JX
8241#, c-format
8242msgid ""
473eb541
JX
8243"execution failed: %s\n"
8244"%sYou can fix the problem, and then run\n"
8245"\n"
8246" git rebase --continue\n"
8247"\n"
a0b6b246 8248msgstr ""
473eb541
JX
8249"执行失败:%s\n"
8250"%s您可以改正该问题,然后运行\n"
8251"\n"
8252" git rebase --continue\n"
8253"\n"
1003b3a5 8254
84bf71ea 8255#: sequencer.c:3523
473eb541
JX
8256msgid "and made changes to the index and/or the working tree\n"
8257msgstr "并且修改索引和/或工作区\n"
8258
84bf71ea 8259#: sequencer.c:3529
a0b6b246
JX
8260#, c-format
8261msgid ""
473eb541
JX
8262"execution succeeded: %s\n"
8263"but left changes to the index and/or the working tree\n"
8264"Commit or stash your changes, and then run\n"
8265"\n"
8266" git rebase --continue\n"
8267"\n"
a0b6b246 8268msgstr ""
473eb541
JX
8269"执行成功:%s\n"
8270"但是在索引和/或工作区中存在变更\n"
8271"提交或贮藏修改,然后运行\n"
8272"\n"
8273" git rebase --continue\n"
8274"\n"
6792b93b 8275
84bf71ea 8276#: sequencer.c:3591
473eb541
JX
8277#, c-format
8278msgid "illegal label name: '%.*s'"
8279msgstr "非法的标签名称:'%.*s'"
31e5e17b 8280
84bf71ea 8281#: sequencer.c:3664
473eb541
JX
8282msgid "writing fake root commit"
8283msgstr "写伪根提交"
31e5e17b 8284
84bf71ea 8285#: sequencer.c:3669
473eb541
JX
8286msgid "writing squash-onto"
8287msgstr "写入 squash-onto"
31e5e17b 8288
84bf71ea 8289#: sequencer.c:3748
c1ac5258 8290#, c-format
473eb541
JX
8291msgid "could not resolve '%s'"
8292msgstr "无法解析 '%s'"
8293
84bf71ea 8294#: sequencer.c:3780
473eb541
JX
8295msgid "cannot merge without a current revision"
8296msgstr "没有当前版本不能合并"
c1ac5258 8297
84bf71ea 8298#: sequencer.c:3802
c1ac5258 8299#, c-format
473eb541
JX
8300msgid "unable to parse '%.*s'"
8301msgstr "无法解析 '%.*s'"
c1ac5258 8302
84bf71ea 8303#: sequencer.c:3811
c1ac5258 8304#, c-format
473eb541
JX
8305msgid "nothing to merge: '%.*s'"
8306msgstr "无可用合并:'%.*s'"
8307
84bf71ea 8308#: sequencer.c:3823
473eb541
JX
8309msgid "octopus merge cannot be executed on top of a [new root]"
8310msgstr "章鱼合并不能在一个新的根提交上执行"
c1ac5258 8311
84bf71ea 8312#: sequencer.c:3878
c1ac5258 8313#, c-format
473eb541
JX
8314msgid "could not get commit message of '%s'"
8315msgstr "不能获取 '%s' 的提交说明"
c1ac5258 8316
84bf71ea 8317#: sequencer.c:4024
473eb541
JX
8318#, c-format
8319msgid "could not even attempt to merge '%.*s'"
8320msgstr "甚至不能尝试合并 '%.*s'"
c1ac5258 8321
84bf71ea 8322#: sequencer.c:4040
473eb541
JX
8323msgid "merge: Unable to write new index file"
8324msgstr "合并:无法写入新索引文件"
c1ac5258 8325
84bf71ea 8326#: sequencer.c:4121
473eb541 8327msgid "Cannot autostash"
ec3d4607 8328msgstr "无法自动贮藏"
c1ac5258 8329
84bf71ea 8330#: sequencer.c:4124
a0b6b246 8331#, c-format
473eb541 8332msgid "Unexpected stash response: '%s'"
ec3d4607 8333msgstr "意外的贮藏响应:'%s'"
a0b6b246 8334
84bf71ea 8335#: sequencer.c:4130
a0b6b246 8336#, c-format
473eb541
JX
8337msgid "Could not create directory for '%s'"
8338msgstr "不能为 '%s' 创建目录"
a0b6b246 8339
84bf71ea 8340#: sequencer.c:4133
a0b6b246 8341#, c-format
473eb541 8342msgid "Created autostash: %s\n"
ec3d4607 8343msgstr "创建了自动贮藏:%s\n"
a0b6b246 8344
84bf71ea 8345#: sequencer.c:4137
473eb541 8346msgid "could not reset --hard"
ec3d4607 8347msgstr "无法硬性重置(reset --hard)"
a0b6b246 8348
84bf71ea 8349#: sequencer.c:4162
a0b6b246 8350#, c-format
473eb541 8351msgid "Applied autostash.\n"
ec3d4607 8352msgstr "已应用自动贮藏。\n"
a0b6b246 8353
84bf71ea 8354#: sequencer.c:4174
a6cd2cc4 8355#, c-format
473eb541
JX
8356msgid "cannot store %s"
8357msgstr "不能存储 %s"
a6cd2cc4 8358
84bf71ea 8359#: sequencer.c:4177
c1ac5258 8360#, c-format
473eb541
JX
8361msgid ""
8362"%s\n"
8363"Your changes are safe in the stash.\n"
8364"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
8365msgstr ""
8366"%s\n"
8367"您的修改在贮藏区中很安全。\n"
8368"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
c1ac5258 8369
84bf71ea 8370#: sequencer.c:4182
473eb541
JX
8371msgid "Applying autostash resulted in conflicts."
8372msgstr "应用自动贮藏导致冲突。"
c1ac5258 8373
84bf71ea 8374#: sequencer.c:4183
473eb541
JX
8375msgid "Autostash exists; creating a new stash entry."
8376msgstr "自动贮藏已经存在;正在创建一个新的贮藏条目。"
8377
84bf71ea 8378#: sequencer.c:4255
473eb541
JX
8379msgid "could not detach HEAD"
8380msgstr "不能分离头指针"
c1ac5258 8381
84bf71ea 8382#: sequencer.c:4270
c1ac5258 8383#, c-format
473eb541
JX
8384msgid "Stopped at HEAD\n"
8385msgstr "停止在 HEAD\n"
c1ac5258 8386
84bf71ea 8387#: sequencer.c:4272
c1ac5258 8388#, c-format
473eb541
JX
8389msgid "Stopped at %s\n"
8390msgstr "停止在 %s\n"
c1ac5258 8391
84bf71ea 8392#: sequencer.c:4304
473eb541
JX
8393#, c-format
8394msgid ""
8395"Could not execute the todo command\n"
8396"\n"
8397" %.*s\n"
8398"It has been rescheduled; To edit the command before continuing, please\n"
8399"edit the todo list first:\n"
8400"\n"
8401" git rebase --edit-todo\n"
8402" git rebase --continue\n"
8403msgstr ""
8404"无法执行待办命令\n"
8405"\n"
8406" %.*s\n"
8407"已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n"
8408"\n"
8409" git rebase --edit-todo\n"
8410" git rebase --continue\n"
c1ac5258 8411
84bf71ea 8412#: sequencer.c:4350
c1ac5258 8413#, c-format
473eb541
JX
8414msgid "Rebasing (%d/%d)%s"
8415msgstr "正在变基(%d/%d)%s"
c1ac5258 8416
84bf71ea 8417#: sequencer.c:4396
c1ac5258 8418#, c-format
473eb541
JX
8419msgid "Stopped at %s... %.*s\n"
8420msgstr "停止在 %s... %.*s\n"
c1ac5258 8421
84bf71ea 8422#: sequencer.c:4466
c1ac5258 8423#, c-format
473eb541
JX
8424msgid "unknown command %d"
8425msgstr "未知命令 %d"
8426
84bf71ea 8427#: sequencer.c:4514
473eb541
JX
8428msgid "could not read orig-head"
8429msgstr "不能读取 orig-head"
8430
84bf71ea 8431#: sequencer.c:4519
473eb541
JX
8432msgid "could not read 'onto'"
8433msgstr "不能读取 'onto'"
c1ac5258 8434
84bf71ea 8435#: sequencer.c:4533
c1ac5258 8436#, c-format
473eb541
JX
8437msgid "could not update HEAD to %s"
8438msgstr "不能更新 HEAD 为 %s"
c1ac5258 8439
84bf71ea 8440#: sequencer.c:4593
c1ac5258 8441#, c-format
473eb541
JX
8442msgid "Successfully rebased and updated %s.\n"
8443msgstr "成功变基并更新 %s。\n"
c1ac5258 8444
84bf71ea 8445#: sequencer.c:4645
473eb541
JX
8446msgid "cannot rebase: You have unstaged changes."
8447msgstr "不能变基:您有未暂存的变更。"
8448
84bf71ea 8449#: sequencer.c:4654
473eb541
JX
8450msgid "cannot amend non-existing commit"
8451msgstr "不能修补不存在的提交"
8452
84bf71ea 8453#: sequencer.c:4656
c1ac5258 8454#, c-format
473eb541
JX
8455msgid "invalid file: '%s'"
8456msgstr "无效文件:'%s'"
c1ac5258 8457
84bf71ea 8458#: sequencer.c:4658
c1ac5258 8459#, c-format
473eb541
JX
8460msgid "invalid contents: '%s'"
8461msgstr "无效内容:'%s'"
8462
84bf71ea 8463#: sequencer.c:4661
473eb541
JX
8464msgid ""
8465"\n"
8466"You have uncommitted changes in your working tree. Please, commit them\n"
8467"first and then run 'git rebase --continue' again."
8468msgstr ""
8469"\n"
8470"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
c1ac5258 8471
84bf71ea 8472#: sequencer.c:4697 sequencer.c:4736
c1ac5258 8473#, c-format
473eb541
JX
8474msgid "could not write file: '%s'"
8475msgstr "不能写入文件:'%s'"
8476
84bf71ea 8477#: sequencer.c:4752
473eb541
JX
8478msgid "could not remove CHERRY_PICK_HEAD"
8479msgstr "不能删除 CHERRY_PICK_HEAD"
8480
84bf71ea 8481#: sequencer.c:4762
473eb541
JX
8482msgid "could not commit staged changes."
8483msgstr "不能提交暂存的修改。"
c1ac5258 8484
84bf71ea 8485#: sequencer.c:4882
c1ac5258 8486#, c-format
473eb541
JX
8487msgid "%s: can't cherry-pick a %s"
8488msgstr "%s:不能拣选一个%s"
c1ac5258 8489
84bf71ea 8490#: sequencer.c:4886
c1ac5258 8491#, c-format
473eb541
JX
8492msgid "%s: bad revision"
8493msgstr "%s:错误的版本"
c1ac5258 8494
84bf71ea 8495#: sequencer.c:4921
473eb541
JX
8496msgid "can't revert as initial commit"
8497msgstr "不能作为初始提交回退"
c1ac5258 8498
84bf71ea 8499#: sequencer.c:5192 sequencer.c:5421
7e6630a7
FZ
8500#, c-format
8501msgid "skipped previously applied commit %s"
8502msgstr "跳过了先前已应用的提交 %s"
8503
84bf71ea 8504#: sequencer.c:5262 sequencer.c:5437
7e6630a7
FZ
8505msgid "use --reapply-cherry-picks to include skipped commits"
8506msgstr "使用 --reapply-cherry-picks 来包括跳过的提交"
8507
84bf71ea 8508#: sequencer.c:5408
473eb541
JX
8509msgid "make_script: unhandled options"
8510msgstr "make_script:有未能处理的选项"
c1ac5258 8511
84bf71ea 8512#: sequencer.c:5411
473eb541
JX
8513msgid "make_script: error preparing revisions"
8514msgstr "make_script:准备版本时错误"
c1ac5258 8515
84bf71ea 8516#: sequencer.c:5669 sequencer.c:5686
473eb541
JX
8517msgid "nothing to do"
8518msgstr "无事可做"
c1ac5258 8519
84bf71ea 8520#: sequencer.c:5705
473eb541
JX
8521msgid "could not skip unnecessary pick commands"
8522msgstr "无法跳过不必要的拣选"
c1ac5258 8523
84bf71ea 8524#: sequencer.c:5805
473eb541
JX
8525msgid "the script was already rearranged."
8526msgstr "脚本已经重新编排。"
c1ac5258 8527
473eb541 8528#: setup.c:133
c1ac5258 8529#, c-format
473eb541
JX
8530msgid "'%s' is outside repository at '%s'"
8531msgstr "'%s' 在位于 '%s' 的仓库之外"
c1ac5258 8532
473eb541 8533#: setup.c:185
c1ac5258 8534#, c-format
473eb541
JX
8535msgid ""
8536"%s: no such path in the working tree.\n"
8537"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
8538msgstr ""
8539"%s:工作区中无此路径。\n"
8540"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
c1ac5258 8541
473eb541 8542#: setup.c:198
c1ac5258 8543#, c-format
473eb541
JX
8544msgid ""
8545"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
8546"Use '--' to separate paths from revisions, like this:\n"
8547"'git <command> [<revision>...] -- [<file>...]'"
8548msgstr ""
8549"有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
8550"使用 '--' 来分隔版本和路径,例如:\n"
8551"'git <命令> [<版本>...] -- [<文件>...]'"
c1ac5258 8552
473eb541 8553#: setup.c:264
c1ac5258 8554#, c-format
473eb541
JX
8555msgid "option '%s' must come before non-option arguments"
8556msgstr "选项 '%s' 必须在其他非选项参数之前"
c1ac5258 8557
473eb541
JX
8558#: setup.c:283
8559#, c-format
8560msgid ""
8561"ambiguous argument '%s': both revision and filename\n"
8562"Use '--' to separate paths from revisions, like this:\n"
8563"'git <command> [<revision>...] -- [<file>...]'"
8564msgstr ""
8565"有歧义的参数 '%s':可同时是版本和文件\n"
8566"使用 '--' 来分隔版本和路径,例如:\n"
8567"'git <命令> [<版本>...] -- [<文件>...]'"
c1ac5258 8568
473eb541
JX
8569#: setup.c:419
8570msgid "unable to set up work tree using invalid config"
8571msgstr "无法使用无效配置来创建工作区"
c1ac5258 8572
ec3d4607 8573#: setup.c:423 builtin/rev-parse.c:895
473eb541
JX
8574msgid "this operation must be run in a work tree"
8575msgstr "该操作必须在一个工作区中运行"
c1ac5258 8576
ec3d4607 8577#: setup.c:658
c1ac5258 8578#, c-format
473eb541
JX
8579msgid "Expected git repo version <= %d, found %d"
8580msgstr "期望 git 仓库版本 <= %d,却得到 %d"
c1ac5258 8581
ec3d4607
JX
8582#: setup.c:666
8583msgid "unknown repository extension found:"
8584msgid_plural "unknown repository extensions found:"
8585msgstr[0] "发现未知的仓库扩展:"
8586msgstr[1] "发现未知的仓库扩展:"
c1ac5258 8587
ec3d4607
JX
8588#: setup.c:680
8589msgid "repo version is 0, but v1-only extension found:"
8590msgid_plural "repo version is 0, but v1-only extensions found:"
8591msgstr[0] "仓库的版本是 0,但是发现仅用于 v1 的扩展:"
8592msgstr[1] "仓库的版本是 0,但是发现仅用于 v1 的扩展:"
c1ac5258 8593
ec3d4607 8594#: setup.c:701
c1ac5258 8595#, c-format
473eb541
JX
8596msgid "error opening '%s'"
8597msgstr "打开 '%s' 出错"
c1ac5258 8598
ec3d4607 8599#: setup.c:703
c1ac5258 8600#, c-format
473eb541
JX
8601msgid "too large to be a .git file: '%s'"
8602msgstr "文件太大,无法作为 .git 文件:'%s'"
c1ac5258 8603
ec3d4607 8604#: setup.c:705
c1ac5258 8605#, c-format
473eb541
JX
8606msgid "error reading %s"
8607msgstr "读取 %s 出错"
c1ac5258 8608
ec3d4607 8609#: setup.c:707
c1ac5258 8610#, c-format
473eb541
JX
8611msgid "invalid gitfile format: %s"
8612msgstr "无效的 gitfile 格式:%s"
c1ac5258 8613
ec3d4607 8614#: setup.c:709
c1ac5258 8615#, c-format
473eb541
JX
8616msgid "no path in gitfile: %s"
8617msgstr "在 gitfile 中没有路径:%s"
c1ac5258 8618
ec3d4607 8619#: setup.c:711
c1ac5258 8620#, c-format
473eb541
JX
8621msgid "not a git repository: %s"
8622msgstr "不是 git 仓库:%s"
c1ac5258 8623
ec3d4607 8624#: setup.c:813
c1ac5258 8625#, c-format
473eb541
JX
8626msgid "'$%s' too big"
8627msgstr "'$%s' 太大"
c1ac5258 8628
ec3d4607 8629#: setup.c:827
c1ac5258 8630#, c-format
473eb541
JX
8631msgid "not a git repository: '%s'"
8632msgstr "不是 git 仓库:'%s'"
c1ac5258 8633
ec3d4607 8634#: setup.c:856 setup.c:858 setup.c:889
a0b6b246 8635#, c-format
473eb541
JX
8636msgid "cannot chdir to '%s'"
8637msgstr "不能切换目录到 '%s'"
a6cd2cc4 8638
ec3d4607 8639#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
473eb541
JX
8640msgid "cannot come back to cwd"
8641msgstr "无法返回当前工作目录"
2b472aae 8642
ec3d4607 8643#: setup.c:988
2b472aae 8644#, c-format
473eb541
JX
8645msgid "failed to stat '%*s%s%s'"
8646msgstr "获取 '%*s%s%s' 状态(stat)失败"
2b472aae 8647
ec3d4607 8648#: setup.c:1231
473eb541
JX
8649msgid "Unable to read current working directory"
8650msgstr "不能读取当前工作目录"
2b472aae 8651
ec3d4607 8652#: setup.c:1240 setup.c:1246
2b472aae 8653#, c-format
473eb541
JX
8654msgid "cannot change to '%s'"
8655msgstr "不能切换到 '%s'"
2b472aae 8656
ec3d4607 8657#: setup.c:1251
2b472aae 8658#, c-format
473eb541
JX
8659msgid "not a git repository (or any of the parent directories): %s"
8660msgstr "不是 git 仓库(或者任何父目录):%s"
2b472aae 8661
ec3d4607 8662#: setup.c:1257
2b472aae
JX
8663#, c-format
8664msgid ""
473eb541
JX
8665"not a git repository (or any parent up to mount point %s)\n"
8666"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
2b472aae 8667msgstr ""
473eb541
JX
8668"不是 git 仓库(或者直至挂载点 %s 的任何父目录)\n"
8669"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
2b472aae 8670
ec3d4607 8671#: setup.c:1381
2b472aae
JX
8672#, c-format
8673msgid ""
473eb541
JX
8674"problem with core.sharedRepository filemode value (0%.3o).\n"
8675"The owner of files must always have read and write permissions."
2b472aae 8676msgstr ""
473eb541
JX
8677"参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n"
8678"文件属主必须始终拥有读写权限。"
2b472aae 8679
7e6630a7 8680#: setup.c:1443
473eb541
JX
8681msgid "fork failed"
8682msgstr "fork 失败"
2b472aae 8683
7e6630a7 8684#: setup.c:1448
473eb541
JX
8685msgid "setsid failed"
8686msgstr "setsid 失败"
2b472aae 8687
7e6630a7 8688#: sparse-index.c:273
33b62fba
JX
8689#, c-format
8690msgid "index entry is a directory, but not sparse (%08x)"
8691msgstr "索引条目是一个目录,但不是稀疏的 (%08x)"
8692
a6cd2cc4 8693#. TRANSLATORS: IEC 80000-13:2008 gibibyte
33b62fba 8694#: strbuf.c:850
a6cd2cc4
JX
8695#, c-format
8696msgid "%u.%2.2u GiB"
8697msgstr "%u.%2.2u GiB"
8698
8699#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
33b62fba 8700#: strbuf.c:852
a6cd2cc4
JX
8701#, c-format
8702msgid "%u.%2.2u GiB/s"
8703msgstr "%u.%2.2u GiB/s"
8704
8705#. TRANSLATORS: IEC 80000-13:2008 mebibyte
33b62fba 8706#: strbuf.c:860
a6cd2cc4
JX
8707#, c-format
8708msgid "%u.%2.2u MiB"
8709msgstr "%u.%2.2u MiB"
8710
8711#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
33b62fba 8712#: strbuf.c:862
a6cd2cc4
JX
8713#, c-format
8714msgid "%u.%2.2u MiB/s"
8715msgstr "%u.%2.2u MiB/s"
8716
8717#. TRANSLATORS: IEC 80000-13:2008 kibibyte
33b62fba 8718#: strbuf.c:869
a6cd2cc4
JX
8719#, c-format
8720msgid "%u.%2.2u KiB"
8721msgstr "%u.%2.2u KiB"
8722
8723#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
33b62fba 8724#: strbuf.c:871
a6cd2cc4
JX
8725#, c-format
8726msgid "%u.%2.2u KiB/s"
8727msgstr "%u.%2.2u KiB/s"
8728
8729#. TRANSLATORS: IEC 80000-13:2008 byte
33b62fba 8730#: strbuf.c:877
a6cd2cc4
JX
8731#, c-format
8732msgid "%u byte"
8733msgid_plural "%u bytes"
8734msgstr[0] "%u 字节"
8735msgstr[1] "%u 字节"
8736
8737#. TRANSLATORS: IEC 80000-13:2008 byte/second
33b62fba 8738#: strbuf.c:879
a6cd2cc4
JX
8739#, c-format
8740msgid "%u byte/s"
8741msgid_plural "%u bytes/s"
8742msgstr[0] "%u 字节/秒"
8743msgstr[1] "%u 字节/秒"
a0b6b246 8744
7e6630a7
FZ
8745#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
8746#: builtin/rebase.c:650
d9488fea
JX
8747#, c-format
8748msgid "could not open '%s' for writing"
8749msgstr "无法打开 '%s' 进行写入"
8750
7e6630a7 8751#: strbuf.c:1183
ddc12c42
JX
8752#, c-format
8753msgid "could not edit '%s'"
8754msgstr "不能编辑 '%s'"
8755
349ede6a
JX
8756#: submodule-config.c:237
8757#, c-format
8758msgid "ignoring suspicious submodule name: %s"
8759msgstr "忽略可疑的子模组名称:%s"
8760
8761#: submodule-config.c:304
8762msgid "negative values not allowed for submodule.fetchjobs"
8763msgstr "submodule.fetchjobs 不允许为负值"
8764
8765#: submodule-config.c:402
8766#, c-format
8767msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
8768msgstr "忽略可能被解析为命令行选项的 '%s':%s"
8769
8770#: submodule-config.c:499
8771#, c-format
8772msgid "invalid value for %s"
8773msgstr "%s 的值无效"
8774
7e6630a7 8775#: submodule-config.c:767
349ede6a
JX
8776#, c-format
8777msgid "Could not update .gitmodules entry %s"
8778msgstr "不能更新 .gitmodules 条目 %s"
8779
06991777 8780#: submodule.c:114 submodule.c:143
a0b6b246
JX
8781msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
8782msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
8783
06991777 8784#: submodule.c:118 submodule.c:147
a0b6b246
JX
8785#, c-format
8786msgid "Could not find section in .gitmodules where path=%s"
8787msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
8788
06991777 8789#: submodule.c:154
a0b6b246
JX
8790#, c-format
8791msgid "Could not remove .gitmodules entry for %s"
8792msgstr "无法移除 %s 的 .gitmodules 条目"
8793
06991777 8794#: submodule.c:165
a0b6b246
JX
8795msgid "staging updated .gitmodules failed"
8796msgstr "将更新后 .gitmodules 添加暂存区失败"
8797
7e6630a7 8798#: submodule.c:358
a4f16749
JX
8799#, c-format
8800msgid "in unpopulated submodule '%s'"
8801msgstr "位于未检出的子模组 '%s'"
8802
7e6630a7 8803#: submodule.c:389
a4f16749
JX
8804#, c-format
8805msgid "Pathspec '%s' is in submodule '%.*s'"
8806msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
8807
7e6630a7 8808#: submodule.c:466
2b472aae
JX
8809#, c-format
8810msgid "bad --ignore-submodules argument: %s"
8811msgstr "坏的 --ignore-submodules 参数:%s"
8812
7e6630a7 8813#: submodule.c:844
2b472aae
JX
8814#, c-format
8815msgid ""
8816"Submodule in commit %s at path: '%s' collides with a submodule named the "
8817"same. Skipping it."
440e7442 8818msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。"
2b472aae 8819
7e6630a7 8820#: submodule.c:954
6937cb4e
JX
8821#, c-format
8822msgid "submodule entry '%s' (%s) is a %s, not a commit"
493a9322 8823msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交"
6937cb4e 8824
7e6630a7 8825#: submodule.c:1042
2b472aae
JX
8826#, c-format
8827msgid ""
8828"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
8829"submodule %s"
440e7442 8830msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes -n 1'"
2b472aae 8831
7e6630a7 8832#: submodule.c:1165
2b472aae
JX
8833#, c-format
8834msgid "process for submodule '%s' failed"
440e7442 8835msgstr "处理子模组 '%s' 失败"
2b472aae 8836
7e6630a7 8837#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
6937cb4e
JX
8838msgid "Failed to resolve HEAD as a valid ref."
8839msgstr "无法将 HEAD 解析为有效引用。"
8840
7e6630a7 8841#: submodule.c:1205
06991777 8842#, c-format
2b472aae
JX
8843msgid "Pushing submodule '%s'\n"
8844msgstr "正在推送子模组 '%s'\n"
06991777 8845
7e6630a7 8846#: submodule.c:1208
2b472aae
JX
8847#, c-format
8848msgid "Unable to push submodule '%s'\n"
8849msgstr "无法推送子模组 '%s'\n"
8850
7e6630a7 8851#: submodule.c:1491
2b472aae
JX
8852#, c-format
8853msgid "Fetching submodule %s%s\n"
8854msgstr "正在获取子模组 %s%s\n"
8855
7e6630a7 8856#: submodule.c:1525
2b472aae
JX
8857#, c-format
8858msgid "Could not access submodule '%s'\n"
8859msgstr "无法访问子模组 '%s'\n"
8860
7e6630a7 8861#: submodule.c:1680
2b472aae
JX
8862#, c-format
8863msgid ""
8864"Errors during submodule fetch:\n"
8865"%s"
8866msgstr ""
8867"获取子模组时的错误:\n"
8868"%s"
8869
7e6630a7 8870#: submodule.c:1705
1a79b2f1 8871#, c-format
87cb7997 8872msgid "'%s' not recognized as a git repository"
d9488fea 8873msgstr "无法将 '%s' 识别为 git 仓库"
1a79b2f1 8874
7e6630a7 8875#: submodule.c:1722
2b472aae
JX
8876#, c-format
8877msgid "Could not run 'git status --porcelain=2' in submodule %s"
8878msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'"
8879
7e6630a7 8880#: submodule.c:1763
2b472aae
JX
8881#, c-format
8882msgid "'git status --porcelain=2' failed in submodule %s"
8883msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败"
8884
7e6630a7 8885#: submodule.c:1838
1a79b2f1 8886#, c-format
87cb7997
JX
8887msgid "could not start 'git status' in submodule '%s'"
8888msgstr "无法在子模组 '%s' 中启动 'git status'"
1a79b2f1 8889
7e6630a7 8890#: submodule.c:1851
87cb7997
JX
8891#, c-format
8892msgid "could not run 'git status' in submodule '%s'"
8893msgstr "无法在子模组 '%s' 中执行 'git status'"
8894
7e6630a7 8895#: submodule.c:1868
06991777
JX
8896#, c-format
8897msgid "Could not unset core.worktree setting in submodule '%s'"
8898msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
8899
7e6630a7 8900#: submodule.c:1895 submodule.c:2210
2b472aae
JX
8901#, c-format
8902msgid "could not recurse into submodule '%s'"
8903msgstr "无法递归进子模组路径 '%s'"
8904
7e6630a7 8905#: submodule.c:1917
2b472aae
JX
8906msgid "could not reset submodule index"
8907msgstr "无法重置子模组索引"
8908
7e6630a7 8909#: submodule.c:1959
87cb7997
JX
8910#, c-format
8911msgid "submodule '%s' has dirty index"
8912msgstr "子模组 '%s' 中有脏索引"
8913
7e6630a7 8914#: submodule.c:2013
c1ac5258
JX
8915#, c-format
8916msgid "Submodule '%s' could not be updated."
8917msgstr "子模组 '%s' 无法被更新。"
8918
7e6630a7 8919#: submodule.c:2081
ddc12c42
JX
8920#, c-format
8921msgid "submodule git dir '%s' is inside git dir '%.*s'"
8922msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中"
8923
7e6630a7 8924#: submodule.c:2102
1a79b2f1
JX
8925#, c-format
8926msgid ""
8927"relocate_gitdir for submodule '%s' with more than one worktree not supported"
8928msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
8929
7e6630a7 8930#: submodule.c:2114 submodule.c:2174
1a79b2f1
JX
8931#, c-format
8932msgid "could not lookup name for submodule '%s'"
8933msgstr "不能查询子模组 '%s' 的名称"
8934
7e6630a7 8935#: submodule.c:2118
ddc12c42
JX
8936#, c-format
8937msgid "refusing to move '%s' into an existing git dir"
8938msgstr "禁止移动 '%s' 到现存 git 目录中"
8939
7e6630a7 8940#: submodule.c:2124
1a79b2f1
JX
8941#, c-format
8942msgid ""
8943"Migrating git directory of '%s%s' from\n"
8944"'%s' to\n"
8945"'%s'\n"
8946msgstr ""
8947"将 '%s%s' 的 git 目录从\n"
8948"'%s' 迁移至\n"
8949"'%s'\n"
8950
7e6630a7 8951#: submodule.c:2255
87cb7997
JX
8952msgid "could not start ls-files in .."
8953msgstr "无法在 .. 中启动 ls-files"
8954
7e6630a7 8955#: submodule.c:2295
87cb7997
JX
8956#, c-format
8957msgid "ls-tree returned unexpected return code %d"
8958msgstr "ls-tree 返回未知返回值 %d"
8959
33b62fba
JX
8960#: symlinks.c:244
8961#, c-format
8962msgid "failed to lstat '%s'"
8963msgstr "无法执行 lstat '%s'"
8964
8965#: trailer.c:244
a0b6b246
JX
8966#, c-format
8967msgid "running trailer command '%s' failed"
8968msgstr "执行 trailer 命令 '%s' 失败"
8969
33b62fba
JX
8970#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566
8971#: trailer.c:570
a0b6b246
JX
8972#, c-format
8973msgid "unknown value '%s' for key '%s'"
8974msgstr "键 '%2$s' 的未知取值 '%1$s'"
8975
33b62fba 8976#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
7e6630a7 8977#: builtin/remote.c:327
a0b6b246
JX
8978#, c-format
8979msgid "more than one %s"
8980msgstr "多于一个 %s"
8981
33b62fba 8982#: trailer.c:743
a0b6b246
JX
8983#, c-format
8984msgid "empty trailer token in trailer '%.*s'"
d13389bf 8985msgstr "尾注 '%.*s' 的键为空"
a0b6b246 8986
33b62fba 8987#: trailer.c:763
a0b6b246
JX
8988#, c-format
8989msgid "could not read input file '%s'"
8990msgstr "不能读取输入文件 '%s'"
8991
7e6630a7 8992#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
a0b6b246
JX
8993msgid "could not read from stdin"
8994msgstr "不能自标准输入读取"
8995
7e6630a7 8996#: trailer.c:1024 wrapper.c:684
a0b6b246
JX
8997#, c-format
8998msgid "could not stat %s"
65e2041e 8999msgstr "不能对 %s 调用 stat"
a0b6b246 9000
33b62fba 9001#: trailer.c:1026
a0b6b246
JX
9002#, c-format
9003msgid "file %s is not a regular file"
9004msgstr "文件 %s 不是一个正规文件"
9005
33b62fba 9006#: trailer.c:1028
a0b6b246
JX
9007#, c-format
9008msgid "file %s is not writable by user"
9009msgstr "文件 %s 用户不可写"
9010
33b62fba 9011#: trailer.c:1040
a0b6b246
JX
9012msgid "could not open temporary file"
9013msgstr "不能打开临时文件"
9014
33b62fba 9015#: trailer.c:1080
a0b6b246
JX
9016#, c-format
9017msgid "could not rename temporary file to %s"
9018msgstr "不能重命名临时文件为 %s"
9019
7157c2b5 9020#: transport-helper.c:62 transport-helper.c:91
c1ac5258
JX
9021msgid "full write to remote helper failed"
9022msgstr "完整写入远程助手失败"
9023
7157c2b5 9024#: transport-helper.c:145
c1ac5258
JX
9025#, c-format
9026msgid "unable to find remote helper for '%s'"
9027msgstr "无法为 '%s' 找到远程助手"
9028
7157c2b5 9029#: transport-helper.c:161 transport-helper.c:575
c1ac5258
JX
9030msgid "can't dup helper output fd"
9031msgstr "无法复制助手输出文件句柄"
9032
7157c2b5 9033#: transport-helper.c:214
c1ac5258
JX
9034#, c-format
9035msgid ""
9036"unknown mandatory capability %s; this remote helper probably needs newer "
9037"version of Git"
9038msgstr "未知的强制能力 %s,该远程助手可能需要新版本的Git"
9039
7157c2b5 9040#: transport-helper.c:220
c1ac5258
JX
9041msgid "this remote helper should implement refspec capability"
9042msgstr "远程助手需要实现 refspec 能力"
9043
7157c2b5 9044#: transport-helper.c:287 transport-helper.c:429
c1ac5258
JX
9045#, c-format
9046msgid "%s unexpectedly said: '%s'"
9047msgstr "%s 意外地说:'%s'"
9048
7157c2b5 9049#: transport-helper.c:417
c1ac5258
JX
9050#, c-format
9051msgid "%s also locked %s"
9052msgstr "%s 也锁定了 %s"
9053
7157c2b5 9054#: transport-helper.c:497
c1ac5258
JX
9055msgid "couldn't run fast-import"
9056msgstr "不能执行 fast-import"
9057
7157c2b5 9058#: transport-helper.c:520
c1ac5258
JX
9059msgid "error while running fast-import"
9060msgstr "执行 fast-import 出错"
9061
7e6630a7 9062#: transport-helper.c:549 transport-helper.c:1251
c1ac5258
JX
9063#, c-format
9064msgid "could not read ref %s"
9065msgstr "无法读取引用 %s"
9066
7157c2b5 9067#: transport-helper.c:594
c1ac5258
JX
9068#, c-format
9069msgid "unknown response to connect: %s"
9070msgstr "连接时未知的响应:%s"
9071
7157c2b5 9072#: transport-helper.c:616
c1ac5258
JX
9073msgid "setting remote service path not supported by protocol"
9074msgstr "协议不支持设置远程服务路径"
9075
7157c2b5 9076#: transport-helper.c:618
c1ac5258
JX
9077msgid "invalid remote service path"
9078msgstr "无效的远程服务路径"
9079
7e6630a7 9080#: transport-helper.c:661 transport.c:1475
349ede6a
JX
9081msgid "operation not supported by protocol"
9082msgstr "协议不支持该操作"
9083
7157c2b5 9084#: transport-helper.c:664
c1ac5258
JX
9085#, c-format
9086msgid "can't connect to subservice %s"
9087msgstr "不能连接到子服务 %s"
9088
7e6630a7 9089#: transport-helper.c:693 transport.c:404
33b62fba
JX
9090msgid "--negotiate-only requires protocol v2"
9091msgstr "--negotiate-only 需要协议 v2"
9092
9093#: transport-helper.c:755
d9488fea
JX
9094msgid "'option' without a matching 'ok/error' directive"
9095msgstr "'option' 缺乏一个匹配的 'ok/error' 指令"
9096
33b62fba 9097#: transport-helper.c:798
c1ac5258
JX
9098#, c-format
9099msgid "expected ok/error, helper said '%s'"
9100msgstr "预期 ok/error,助手说 '%s'"
9101
7e6630a7 9102#: transport-helper.c:859
c1ac5258
JX
9103#, c-format
9104msgid "helper reported unexpected status of %s"
9105msgstr "助手报告 %s 的意外状态"
9106
7e6630a7 9107#: transport-helper.c:942
a0b6b246 9108#, c-format
c1ac5258
JX
9109msgid "helper %s does not support dry-run"
9110msgstr "助手 %s 不支持 dry-run"
a0b6b246 9111
7e6630a7 9112#: transport-helper.c:945
c1ac5258
JX
9113#, c-format
9114msgid "helper %s does not support --signed"
9115msgstr "助手 %s 不支持 --signed"
9116
7e6630a7 9117#: transport-helper.c:948
c1ac5258
JX
9118#, c-format
9119msgid "helper %s does not support --signed=if-asked"
9120msgstr "助手 %s 不支持 --signed=if-asked"
9121
7e6630a7 9122#: transport-helper.c:953
a5cd71ca
JX
9123#, c-format
9124msgid "helper %s does not support --atomic"
9125msgstr "助手 %s 不支持 --atomic"
9126
7e6630a7 9127#: transport-helper.c:957
d13389bf
JX
9128#, c-format
9129msgid "helper %s does not support --%s"
9130msgstr "助手 %s 不支持 --%s"
9131
7e6630a7 9132#: transport-helper.c:964
c1ac5258
JX
9133#, c-format
9134msgid "helper %s does not support 'push-option'"
9135msgstr "助手 %s 不支持 'push-option'"
9136
7e6630a7 9137#: transport-helper.c:1064
c1ac5258 9138msgid "remote-helper doesn't support push; refspec needed"
33b62fba 9139msgstr "remote-heper 不支持推送,需要引用规格"
c1ac5258 9140
7e6630a7 9141#: transport-helper.c:1069
c1ac5258
JX
9142#, c-format
9143msgid "helper %s does not support 'force'"
9144msgstr "助手 %s 不支持 'force'"
9145
7e6630a7 9146#: transport-helper.c:1116
c1ac5258
JX
9147msgid "couldn't run fast-export"
9148msgstr "无法执行 fast-export"
9149
7e6630a7 9150#: transport-helper.c:1121
c1ac5258
JX
9151msgid "error while running fast-export"
9152msgstr "执行 fast-export 时出错"
9153
7e6630a7 9154#: transport-helper.c:1146
c1ac5258
JX
9155#, c-format
9156msgid ""
9157"No refs in common and none specified; doing nothing.\n"
7157c2b5 9158"Perhaps you should specify a branch.\n"
c1ac5258
JX
9159msgstr ""
9160"没有共同的引用并且也没有指定,什么也不会做。\n"
7157c2b5
JX
9161"也许您应该指定一个分支。\n"
9162
7e6630a7 9163#: transport-helper.c:1228
7157c2b5
JX
9164#, c-format
9165msgid "unsupported object format '%s'"
9166msgstr "不支持的对象格式 '%s'"
c1ac5258 9167
7e6630a7 9168#: transport-helper.c:1237
c1ac5258
JX
9169#, c-format
9170msgid "malformed response in ref list: %s"
9171msgstr "引用列表中格式错误的响应:%s"
9172
7e6630a7 9173#: transport-helper.c:1389
c1ac5258
JX
9174#, c-format
9175msgid "read(%s) failed"
9176msgstr "读取(%s)失败"
9177
7e6630a7 9178#: transport-helper.c:1416
c1ac5258
JX
9179#, c-format
9180msgid "write(%s) failed"
9181msgstr "写(%s)失败"
9182
7e6630a7 9183#: transport-helper.c:1465
c1ac5258
JX
9184#, c-format
9185msgid "%s thread failed"
9186msgstr "%s 线程失败"
9187
7e6630a7 9188#: transport-helper.c:1469
c1ac5258
JX
9189#, c-format
9190msgid "%s thread failed to join: %s"
e640d114 9191msgstr "%s 线程等待失败:%s"
c1ac5258 9192
7e6630a7 9193#: transport-helper.c:1488 transport-helper.c:1492
c1ac5258
JX
9194#, c-format
9195msgid "can't start thread for copying data: %s"
9196msgstr "不能启动线程来拷贝数据:%s"
9197
7e6630a7 9198#: transport-helper.c:1529
c1ac5258
JX
9199#, c-format
9200msgid "%s process failed to wait"
9201msgstr "%s 进程等待失败"
9202
7e6630a7 9203#: transport-helper.c:1533
c1ac5258
JX
9204#, c-format
9205msgid "%s process failed"
9206msgstr "%s 进程失败"
9207
7e6630a7 9208#: transport-helper.c:1551 transport-helper.c:1560
c1ac5258
JX
9209msgid "can't start thread for copying data"
9210msgstr "不能启动线程来拷贝数据"
9211
349ede6a
JX
9212#: transport.c:116
9213#, c-format
9214msgid "Would set upstream of '%s' to '%s' of '%s'\n"
9215msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
9216
9217#: transport.c:145
9218#, c-format
9219msgid "could not read bundle '%s'"
d9488fea 9220msgstr "无法读取归档包 '%s'"
349ede6a 9221
7e6630a7 9222#: transport.c:227
349ede6a
JX
9223#, c-format
9224msgid "transport: invalid depth option '%s'"
9225msgstr "传输:无效的深度选项 '%s'"
9226
7e6630a7 9227#: transport.c:279
349ede6a
JX
9228msgid "see protocol.version in 'git help config' for more details"
9229msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
9230
7e6630a7 9231#: transport.c:280
349ede6a
JX
9232msgid "server options require protocol version 2 or later"
9233msgstr "服务端选项需要版本 2 协议或更高"
9234
7e6630a7 9235#: transport.c:407
33b62fba
JX
9236msgid "server does not support wait-for-done"
9237msgstr "服务器不支持 wait-for-done"
9238
7e6630a7 9239#: transport.c:759
349ede6a
JX
9240msgid "could not parse transport.color.* config"
9241msgstr "不能解析 transport.color.* 配置"
9242
7e6630a7 9243#: transport.c:834
349ede6a
JX
9244msgid "support for protocol v2 not implemented yet"
9245msgstr "协议 v2 的支持尚未实现"
9246
7e6630a7 9247#: transport.c:967
349ede6a
JX
9248#, c-format
9249msgid "unknown value for config '%s': %s"
9250msgstr "配置 '%s' 的取值未知:%s"
9251
7e6630a7 9252#: transport.c:1033
349ede6a
JX
9253#, c-format
9254msgid "transport '%s' not allowed"
9255msgstr "传输 '%s' 不允许"
9256
7e6630a7 9257#: transport.c:1082
349ede6a
JX
9258msgid "git-over-rsync is no longer supported"
9259msgstr "不再支持 git-over-rsync"
9260
7e6630a7 9261#: transport.c:1185
349ede6a
JX
9262#, c-format
9263msgid ""
9264"The following submodule paths contain changes that can\n"
9265"not be found on any remote:\n"
9266msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
9267
7e6630a7 9268#: transport.c:1189
349ede6a
JX
9269#, c-format
9270msgid ""
9271"\n"
9272"Please try\n"
9273"\n"
9274"\tgit push --recurse-submodules=on-demand\n"
9275"\n"
9276"or cd to the path and use\n"
9277"\n"
9278"\tgit push\n"
9279"\n"
9280"to push them to a remote.\n"
9281"\n"
9282msgstr ""
9283"\n"
9284"请尝试\n"
9285"\n"
9286"\tgit push --recurse-submodules=on-demand\n"
9287"\n"
9288"或者进入到子目录执行\n"
9289"\n"
9290"\tgit push\n"
9291"\n"
9292"以推送至远程。\n"
9293"\n"
9294
7e6630a7 9295#: transport.c:1197
349ede6a
JX
9296msgid "Aborting."
9297msgstr "正在终止。"
9298
7e6630a7 9299#: transport.c:1344
349ede6a
JX
9300msgid "failed to push all needed submodules"
9301msgstr "不能推送全部需要的子模组"
9302
473eb541 9303#: tree-walk.c:33
a0b6b246
JX
9304msgid "too-short tree object"
9305msgstr "太短的树对象"
9306
473eb541 9307#: tree-walk.c:39
a0b6b246 9308msgid "malformed mode in tree entry"
29004bbb 9309msgstr "树对象中的条目模式错误"
a0b6b246 9310
473eb541 9311#: tree-walk.c:43
a0b6b246
JX
9312msgid "empty filename in tree entry"
9313msgstr "树对象条目中空的文件名"
9314
473eb541 9315#: tree-walk.c:118
a0b6b246
JX
9316msgid "too-short tree file"
9317msgstr "太短的树文件"
9318
33b62fba 9319#: unpack-trees.c:115
a0b6b246
JX
9320#, c-format
9321msgid ""
9322"Your local changes to the following files would be overwritten by checkout:\n"
9323"%%sPlease commit your changes or stash them before you switch branches."
9324msgstr ""
9325"您对下列文件的本地修改将被检出操作覆盖:\n"
a4f16749 9326"%%s请在切换分支前提交或贮藏您的修改。"
a0b6b246 9327
33b62fba 9328#: unpack-trees.c:117
a0b6b246
JX
9329#, c-format
9330msgid ""
9331"Your local changes to the following files would be overwritten by checkout:\n"
9332"%%s"
9333msgstr ""
9334"您对下列文件的本地修改将被检出操作覆盖:\n"
9335"%%s"
9336
33b62fba 9337#: unpack-trees.c:120
a0b6b246
JX
9338#, c-format
9339msgid ""
9340"Your local changes to the following files would be overwritten by merge:\n"
9341"%%sPlease commit your changes or stash them before you merge."
9342msgstr ""
9343"您对下列文件的本地修改将被合并操作覆盖:\n"
a4f16749 9344"%%s请在合并前提交或贮藏您的修改。"
a0b6b246 9345
33b62fba 9346#: unpack-trees.c:122
a0b6b246
JX
9347#, c-format
9348msgid ""
9349"Your local changes to the following files would be overwritten by merge:\n"
9350"%%s"
9351msgstr ""
9352"您对下列文件的本地修改将被合并操作覆盖:\n"
9353"%%s"
9354
33b62fba 9355#: unpack-trees.c:125
a0b6b246
JX
9356#, c-format
9357msgid ""
9358"Your local changes to the following files would be overwritten by %s:\n"
9359"%%sPlease commit your changes or stash them before you %s."
9360msgstr ""
9361"您对下列文件的本地修改将被 %s 覆盖:\n"
a4f16749 9362"%%s请在 %s 之前提交或贮藏您的修改。"
6792b93b 9363
33b62fba 9364#: unpack-trees.c:127
a0b6b246
JX
9365#, c-format
9366msgid ""
9367"Your local changes to the following files would be overwritten by %s:\n"
9368"%%s"
9369msgstr ""
9370"您对下列文件的本地修改将被 %s 覆盖:\n"
9371"%%s"
c04f5ac3 9372
33b62fba 9373#: unpack-trees.c:132
a0b6b246
JX
9374#, c-format
9375msgid ""
1a79b2f1 9376"Updating the following directories would lose untracked files in them:\n"
a0b6b246
JX
9377"%s"
9378msgstr ""
9379"更新如下目录将会丢失其中未跟踪的文件:\n"
9380"%s"
1b7f4a34 9381
33b62fba 9382#: unpack-trees.c:136
a0b6b246
JX
9383#, c-format
9384msgid ""
9385"The following untracked working tree files would be removed by checkout:\n"
9386"%%sPlease move or remove them before you switch branches."
9387msgstr ""
9388"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
9389"%%s请在切换分支之前移动或删除。"
2e8451e8 9390
33b62fba 9391#: unpack-trees.c:138
a0b6b246
JX
9392#, c-format
9393msgid ""
9394"The following untracked working tree files would be removed by checkout:\n"
9395"%%s"
9396msgstr ""
9397"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
9398"%%s"
1003b3a5 9399
33b62fba 9400#: unpack-trees.c:141
a0b6b246
JX
9401#, c-format
9402msgid ""
9403"The following untracked working tree files would be removed by merge:\n"
9404"%%sPlease move or remove them before you merge."
9405msgstr ""
9406"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
9407"%%s请在合并前移动或删除。"
1003b3a5 9408
33b62fba 9409#: unpack-trees.c:143
a0b6b246
JX
9410#, c-format
9411msgid ""
9412"The following untracked working tree files would be removed by merge:\n"
9413"%%s"
9414msgstr ""
9415"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
9416"%%s"
c04f5ac3 9417
33b62fba 9418#: unpack-trees.c:146
a0b6b246
JX
9419#, c-format
9420msgid ""
9421"The following untracked working tree files would be removed by %s:\n"
9422"%%sPlease move or remove them before you %s."
9423msgstr ""
9424"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
9425"%%s请在 %s 前移动或删除。"
c04f5ac3 9426
33b62fba 9427#: unpack-trees.c:148
a0b6b246
JX
9428#, c-format
9429msgid ""
9430"The following untracked working tree files would be removed by %s:\n"
9431"%%s"
9432msgstr ""
9433"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
9434"%%s"
c04f5ac3 9435
33b62fba 9436#: unpack-trees.c:154
a0b6b246
JX
9437#, c-format
9438msgid ""
9439"The following untracked working tree files would be overwritten by "
9440"checkout:\n"
9441"%%sPlease move or remove them before you switch branches."
9442msgstr ""
9443"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
9444"%%s请在切换分支前移动或删除。"
c04f5ac3 9445
33b62fba 9446#: unpack-trees.c:156
1003b3a5 9447#, c-format
4dcdc3d8 9448msgid ""
a0b6b246
JX
9449"The following untracked working tree files would be overwritten by "
9450"checkout:\n"
9451"%%s"
4dcdc3d8 9452msgstr ""
a0b6b246
JX
9453"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
9454"%%s"
1003b3a5 9455
33b62fba 9456#: unpack-trees.c:159
c04f5ac3 9457#, c-format
a0b6b246
JX
9458msgid ""
9459"The following untracked working tree files would be overwritten by merge:\n"
9460"%%sPlease move or remove them before you merge."
9461msgstr ""
9462"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
9463"%%s请在合并前移动或删除。"
c04f5ac3 9464
33b62fba 9465#: unpack-trees.c:161
a0b6b246
JX
9466#, c-format
9467msgid ""
9468"The following untracked working tree files would be overwritten by merge:\n"
9469"%%s"
9470msgstr ""
9471"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
9472"%%s"
c04f5ac3 9473
33b62fba 9474#: unpack-trees.c:164
a0b6b246
JX
9475#, c-format
9476msgid ""
9477"The following untracked working tree files would be overwritten by %s:\n"
9478"%%sPlease move or remove them before you %s."
9479msgstr ""
9480"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
9481"%%s请在 %s 前移动或删除。"
c04f5ac3 9482
33b62fba 9483#: unpack-trees.c:166
07432cef 9484#, c-format
a0b6b246
JX
9485msgid ""
9486"The following untracked working tree files would be overwritten by %s:\n"
9487"%%s"
9488msgstr ""
9489"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
9490"%%s"
c04f5ac3 9491
33b62fba 9492#: unpack-trees.c:174
07432cef 9493#, c-format
a0b6b246
JX
9494msgid "Entry '%s' overlaps with '%s'. Cannot bind."
9495msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
c04f5ac3 9496
33b62fba 9497#: unpack-trees.c:177
07432cef 9498#, c-format
ef317cd5 9499msgid ""
349ede6a 9500"Cannot update submodule:\n"
a0b6b246
JX
9501"%s"
9502msgstr ""
349ede6a 9503"无法更新子模组:\n"
a0b6b246 9504"%s"
c04f5ac3 9505
33b62fba 9506#: unpack-trees.c:180
07432cef 9507#, c-format
a0b6b246 9508msgid ""
349ede6a
JX
9509"The following paths are not up to date and were left despite sparse "
9510"patterns:\n"
a0b6b246
JX
9511"%s"
9512msgstr ""
349ede6a 9513"尽管存在稀疏检出模板,以下路径不是最新,因而保留:\n"
a0b6b246 9514"%s"
c04f5ac3 9515
33b62fba 9516#: unpack-trees.c:182
07432cef 9517#, c-format
a0b6b246 9518msgid ""
349ede6a 9519"The following paths are unmerged and were left despite sparse patterns:\n"
a0b6b246
JX
9520"%s"
9521msgstr ""
349ede6a 9522"尽管存在稀疏检出模板,以下路径处于未合并状态,因而保留:\n"
a0b6b246 9523"%s"
c04f5ac3 9524
33b62fba 9525#: unpack-trees.c:184
87cb7997
JX
9526#, c-format
9527msgid ""
349ede6a
JX
9528"The following paths were already present and thus not updated despite sparse "
9529"patterns:\n"
87cb7997
JX
9530"%s"
9531msgstr ""
349ede6a 9532"尽管存在稀疏检出模板,以下路径已经存在,因而未更新:\n"
87cb7997
JX
9533"%s"
9534
33b62fba 9535#: unpack-trees.c:264
07432cef 9536#, c-format
a0b6b246 9537msgid "Aborting\n"
a6cd2cc4 9538msgstr "正在终止\n"
ef317cd5 9539
33b62fba 9540#: unpack-trees.c:291
349ede6a
JX
9541#, c-format
9542msgid ""
9543"After fixing the above paths, you may want to run `git sparse-checkout "
9544"reapply`.\n"
7e6630a7 9545msgstr "在修复上述路径之后,您可能要执行 `git sparse-checkout reapply`。\n"
349ede6a 9546
33b62fba 9547#: unpack-trees.c:352
a6cd2cc4
JX
9548msgid "Updating files"
9549msgstr "正在更新文件"
c04f5ac3 9550
33b62fba 9551#: unpack-trees.c:384
4c27fcb5
JX
9552msgid ""
9553"the following paths have collided (e.g. case-sensitive paths\n"
9554"on a case-insensitive filesystem) and only one from the same\n"
9555"colliding group is in the working tree:\n"
9556msgstr ""
9557"以下路径发生碰撞(如:在不区分大小写的文件系统上的区分大小写的路径),\n"
9558"并且碰撞组中只有一个文件存在工作区中:\n"
9559
7e6630a7 9560#: unpack-trees.c:1620
ddc12c42
JX
9561msgid "Updating index flags"
9562msgstr "正在更新索引标志"
9563
7e6630a7 9564#: unpack-trees.c:2772
33b62fba
JX
9565#, c-format
9566msgid "worktree and untracked commit have duplicate entries: %s"
9567msgstr "工作树和未跟踪提交具有重复条目:%s"
9568
7e6630a7 9569#: upload-pack.c:1561
349ede6a
JX
9570msgid "expected flush after fetch arguments"
9571msgstr "在 fetch 参数之后应该有一个 flush 包"
9572
87cb7997 9573#: urlmatch.c:163
a0b6b246
JX
9574msgid "invalid URL scheme name or missing '://' suffix"
9575msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
9576
87cb7997 9577#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
07432cef 9578#, c-format
a0b6b246
JX
9579msgid "invalid %XX escape sequence"
9580msgstr "无效的 %XX 转义序列"
c04f5ac3 9581
87cb7997 9582#: urlmatch.c:215
a0b6b246
JX
9583msgid "missing host and scheme is not 'file:'"
9584msgstr "缺失主机名且 URL 方案不是 'file:'"
c04f5ac3 9585
87cb7997 9586#: urlmatch.c:232
a0b6b246
JX
9587msgid "a 'file:' URL may not have a port number"
9588msgstr "一个 'file:' URL 不应该包含端口号"
94550ed3 9589
87cb7997 9590#: urlmatch.c:247
a0b6b246
JX
9591msgid "invalid characters in host name"
9592msgstr "主机名中包含无效的字符"
90314792 9593
87cb7997 9594#: urlmatch.c:292 urlmatch.c:303
a0b6b246
JX
9595msgid "invalid port number"
9596msgstr "无效的端口号"
c04f5ac3 9597
87cb7997 9598#: urlmatch.c:371
a0b6b246
JX
9599msgid "invalid '..' path segment"
9600msgstr "无效的 '..' 路径片段"
5c0c220c 9601
2b472aae
JX
9602#: walker.c:170
9603msgid "Fetching objects"
9604msgstr "正在获取对象"
9605
7e6630a7 9606#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
a77c07d9 9607#, c-format
a0b6b246 9608msgid "failed to read '%s'"
c1ac5258 9609msgstr "读取 '%s' 失败"
ef317cd5 9610
ec3d4607 9611#: worktree.c:303
31e5e17b
JX
9612#, c-format
9613msgid "'%s' at main working tree is not the repository directory"
9614msgstr "在主工作区的 '%s' 不是仓库目录"
9615
ec3d4607 9616#: worktree.c:314
31e5e17b
JX
9617#, c-format
9618msgid "'%s' file does not contain absolute path to the working tree location"
9619msgstr "文件 '%s' 不包含工作区的绝对路径"
9620
ec3d4607 9621#: worktree.c:326
31e5e17b
JX
9622#, c-format
9623msgid "'%s' does not exist"
9624msgstr "'%s' 不存在"
9625
ec3d4607 9626#: worktree.c:332
31e5e17b
JX
9627#, c-format
9628msgid "'%s' is not a .git file, error code %d"
9629msgstr "'%s' 不是一个 .git 文件,错误码 %d"
9630
ec3d4607 9631#: worktree.c:341
31e5e17b
JX
9632#, c-format
9633msgid "'%s' does not point back to '%s'"
9634msgstr "'%s' 没有指回到 '%s'"
9635
ec3d4607 9636#: worktree.c:603
d9488fea
JX
9637msgid "not a directory"
9638msgstr "不是一个目录"
9639
ec3d4607 9640#: worktree.c:612
d9488fea
JX
9641msgid ".git is not a file"
9642msgstr ".git 不是一个文件"
9643
ec3d4607 9644#: worktree.c:614
d9488fea
JX
9645msgid ".git file broken"
9646msgstr ".git 文件损坏"
9647
ec3d4607 9648#: worktree.c:616
d9488fea
JX
9649msgid ".git file incorrect"
9650msgstr ".git 文件不正确"
9651
ec3d4607 9652#: worktree.c:722
d9488fea
JX
9653msgid "not a valid path"
9654msgstr "不是一个有效的路径"
9655
ec3d4607 9656#: worktree.c:728
d9488fea
JX
9657msgid "unable to locate repository; .git is not a file"
9658msgstr "无法定位仓库,.git 不是一个文件"
9659
ec3d4607 9660#: worktree.c:732
473eb541
JX
9661msgid "unable to locate repository; .git file does not reference a repository"
9662msgstr "无法定位仓库,.git 文件没有指向一个仓库"
9663
ec3d4607 9664#: worktree.c:736
d9488fea
JX
9665msgid "unable to locate repository; .git file broken"
9666msgstr "无法定位仓库,.git 文件损坏"
9667
ec3d4607 9668#: worktree.c:742
d9488fea
JX
9669msgid "gitdir unreadable"
9670msgstr "gitdir 不可读"
9671
ec3d4607 9672#: worktree.c:746
d9488fea
JX
9673msgid "gitdir incorrect"
9674msgstr "gitdir 不正确"
9675
ec3d4607 9676#: worktree.c:771
473eb541
JX
9677msgid "not a valid directory"
9678msgstr "不是一个有效的目录"
9679
ec3d4607 9680#: worktree.c:777
473eb541
JX
9681msgid "gitdir file does not exist"
9682msgstr "gitdir 文件不存在"
9683
ec3d4607 9684#: worktree.c:782 worktree.c:791
473eb541
JX
9685#, c-format
9686msgid "unable to read gitdir file (%s)"
9687msgstr "无法读取 gitdir 文件(%s)"
9688
ec3d4607 9689#: worktree.c:801
473eb541
JX
9690#, c-format
9691msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
9692msgstr "读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)"
9693
ec3d4607 9694#: worktree.c:809
473eb541
JX
9695msgid "invalid gitdir file"
9696msgstr "无效的 gitdir 文件"
9697
ec3d4607 9698#: worktree.c:817
473eb541
JX
9699msgid "gitdir file points to non-existent location"
9700msgstr "gitdir 文件指向一个不存在的位置"
9701
7e6630a7
FZ
9702#: wrapper.c:151
9703#, c-format
9704msgid "could not setenv '%s'"
9705msgstr "不能设置环境变量 '%s'"
9706
9707#: wrapper.c:203
9708#, c-format
9709msgid "unable to create '%s'"
9710msgstr "不能创建 '%s'"
9711
9712#: wrapper.c:205 wrapper.c:375
c04f5ac3 9713#, c-format
a0b6b246
JX
9714msgid "could not open '%s' for reading and writing"
9715msgstr "无法打开 '%s' 进行读写"
c04f5ac3 9716
7e6630a7 9717#: wrapper.c:406 wrapper.c:607
a0b6b246
JX
9718#, c-format
9719msgid "unable to access '%s'"
9720msgstr "不能访问 '%s'"
c04f5ac3 9721
7e6630a7 9722#: wrapper.c:615
a0b6b246
JX
9723msgid "unable to get current working directory"
9724msgstr "不能获取当前工作目录"
c04f5ac3 9725
a6cd2cc4 9726#: wt-status.c:158
a0b6b246
JX
9727msgid "Unmerged paths:"
9728msgstr "未合并的路径:"
7aea43ff 9729
a0b6b246 9730# 译者:注意保持前导空格
a6cd2cc4
JX
9731#: wt-status.c:187 wt-status.c:219
9732msgid " (use \"git restore --staged <file>...\" to unstage)"
9733msgstr " (使用 \"git restore --staged <文件>...\" 以取消暂存)"
9734
9735# 译者:注意保持前导空格
9736#: wt-status.c:190 wt-status.c:222
c04f5ac3 9737#, c-format
a6cd2cc4
JX
9738msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
9739msgstr " (使用 \"git restore --source=%s --staged <文件>...\" 以取消暂存)"
c04f5ac3 9740
a0b6b246 9741# 译者:注意保持前导空格
a6cd2cc4 9742#: wt-status.c:193 wt-status.c:225
a0b6b246
JX
9743msgid " (use \"git rm --cached <file>...\" to unstage)"
9744msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
c04f5ac3 9745
a0b6b246 9746# 译者:注意保持前导空格
a6cd2cc4 9747#: wt-status.c:197
a0b6b246
JX
9748msgid " (use \"git add <file>...\" to mark resolution)"
9749msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
8ada9598 9750
a0b6b246 9751# 译者:注意保持前导空格
a6cd2cc4 9752#: wt-status.c:199 wt-status.c:203
a0b6b246
JX
9753msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
9754msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
8ada9598 9755
a0b6b246 9756# 译者:注意保持前导空格
a6cd2cc4 9757#: wt-status.c:201
a0b6b246
JX
9758msgid " (use \"git rm <file>...\" to mark resolution)"
9759msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
ef317cd5 9760
ec3d4607 9761#: wt-status.c:211 wt-status.c:1125
a0b6b246
JX
9762msgid "Changes to be committed:"
9763msgstr "要提交的变更:"
ef317cd5 9764
ec3d4607 9765#: wt-status.c:234 wt-status.c:1134
a0b6b246
JX
9766msgid "Changes not staged for commit:"
9767msgstr "尚未暂存以备提交的变更:"
ef317cd5 9768
a0b6b246 9769# 译者:注意保持前导空格
a6cd2cc4 9770#: wt-status.c:238
a0b6b246
JX
9771msgid " (use \"git add <file>...\" to update what will be committed)"
9772msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
ef317cd5 9773
a0b6b246 9774# 译者:注意保持前导空格
a6cd2cc4 9775#: wt-status.c:240
a0b6b246
JX
9776msgid " (use \"git add/rm <file>...\" to update what will be committed)"
9777msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
ef317cd5 9778
a0b6b246 9779# 译者:注意保持前导空格
a6cd2cc4 9780#: wt-status.c:241
a0b6b246 9781msgid ""
a6cd2cc4
JX
9782" (use \"git restore <file>...\" to discard changes in working directory)"
9783msgstr " (使用 \"git restore <文件>...\" 丢弃工作区的改动)"
ef317cd5 9784
a0b6b246 9785# 译者:注意保持前导空格
a6cd2cc4 9786#: wt-status.c:243
a0b6b246
JX
9787msgid " (commit or discard the untracked or modified content in submodules)"
9788msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
ef317cd5 9789
a0b6b246 9790# 译者:注意保持前导空格
a6cd2cc4 9791#: wt-status.c:254
a0b6b246
JX
9792#, c-format
9793msgid " (use \"git %s <file>...\" to include in what will be committed)"
9794msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
ef317cd5 9795
d9488fea 9796#: wt-status.c:266
a0b6b246
JX
9797msgid "both deleted:"
9798msgstr "双方删除:"
ef317cd5 9799
d9488fea 9800#: wt-status.c:268
a0b6b246
JX
9801msgid "added by us:"
9802msgstr "由我们添加:"
4dcdc3d8 9803
d9488fea 9804#: wt-status.c:270
a0b6b246
JX
9805msgid "deleted by them:"
9806msgstr "由他们删除:"
ef317cd5 9807
d9488fea 9808#: wt-status.c:272
a0b6b246
JX
9809msgid "added by them:"
9810msgstr "由他们添加:"
ef317cd5 9811
d9488fea 9812#: wt-status.c:274
a0b6b246
JX
9813msgid "deleted by us:"
9814msgstr "由我们删除:"
ef317cd5 9815
d9488fea 9816#: wt-status.c:276
a0b6b246
JX
9817msgid "both added:"
9818msgstr "双方添加:"
5c57d762 9819
d9488fea 9820#: wt-status.c:278
a0b6b246
JX
9821msgid "both modified:"
9822msgstr "双方修改:"
5c57d762 9823
d9488fea 9824#: wt-status.c:288
a0b6b246
JX
9825msgid "new file:"
9826msgstr "新文件:"
8ada9598 9827
d9488fea 9828#: wt-status.c:290
a0b6b246
JX
9829msgid "copied:"
9830msgstr "拷贝:"
8ada9598 9831
d9488fea 9832#: wt-status.c:292
a0b6b246
JX
9833msgid "deleted:"
9834msgstr "删除:"
8ada9598 9835
d9488fea 9836#: wt-status.c:294
a0b6b246
JX
9837msgid "modified:"
9838msgstr "修改:"
8ada9598 9839
d9488fea 9840#: wt-status.c:296
a0b6b246
JX
9841msgid "renamed:"
9842msgstr "重命名:"
5c57d762 9843
d9488fea 9844#: wt-status.c:298
a0b6b246
JX
9845msgid "typechange:"
9846msgstr "类型变更:"
8ada9598 9847
d9488fea 9848#: wt-status.c:300
a0b6b246
JX
9849msgid "unknown:"
9850msgstr "未知:"
8ada9598 9851
d9488fea 9852#: wt-status.c:302
a0b6b246
JX
9853msgid "unmerged:"
9854msgstr "未合并:"
8ada9598 9855
a0b6b246 9856# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
d9488fea 9857#: wt-status.c:382
a0b6b246
JX
9858msgid "new commits, "
9859msgstr "新提交, "
8ada9598 9860
a0b6b246 9861# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
d9488fea 9862#: wt-status.c:384
a0b6b246
JX
9863msgid "modified content, "
9864msgstr "修改的内容, "
1b7f4a34 9865
a0b6b246 9866# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
d9488fea 9867#: wt-status.c:386
a0b6b246
JX
9868msgid "untracked content, "
9869msgstr "未跟踪的内容, "
1b7f4a34 9870
ec3d4607 9871#: wt-status.c:958
a4f16749
JX
9872#, c-format
9873msgid "Your stash currently has %d entry"
9874msgid_plural "Your stash currently has %d entries"
9875msgstr[0] "您的贮藏区当前有 %d 条记录"
9876msgstr[1] "您的贮藏区当前有 %d 条记录"
9877
ec3d4607 9878#: wt-status.c:989
a0b6b246
JX
9879msgid "Submodules changed but not updated:"
9880msgstr "子模组已修改但尚未更新:"
1b7f4a34 9881
ec3d4607 9882#: wt-status.c:991
a0b6b246
JX
9883msgid "Submodule changes to be committed:"
9884msgstr "要提交的子模组变更:"
1b7f4a34 9885
ec3d4607 9886#: wt-status.c:1073
a0b6b246 9887msgid ""
6937cb4e
JX
9888"Do not modify or remove the line above.\n"
9889"Everything below it will be ignored."
a0b6b246 9890msgstr ""
6937cb4e
JX
9891"不要改动或删除上面的一行。\n"
9892"其下所有内容都将被忽略。"
1b7f4a34 9893
ec3d4607 9894#: wt-status.c:1165
a6cd2cc4
JX
9895#, c-format
9896msgid ""
9897"\n"
9898"It took %.2f seconds to compute the branch ahead/behind values.\n"
9899"You can use '--no-ahead-behind' to avoid this.\n"
9900msgstr ""
9901"\n"
9902"花了 %.2f 秒才计算出分支的领先/落后范围。\n"
9903"为避免,您可以使用 '--no-ahead-behind'。\n"
9904
ec3d4607 9905#: wt-status.c:1195
a0b6b246
JX
9906msgid "You have unmerged paths."
9907msgstr "您有尚未合并的路径。"
1b7f4a34 9908
a0b6b246 9909# 译者:注意保持前导空格
ec3d4607 9910#: wt-status.c:1198
a0b6b246
JX
9911msgid " (fix conflicts and run \"git commit\")"
9912msgstr " (解决冲突并运行 \"git commit\")"
1b7f4a34 9913
a0b6b246 9914# 译者:注意保持前导空格
ec3d4607 9915#: wt-status.c:1200
a0b6b246
JX
9916msgid " (use \"git merge --abort\" to abort the merge)"
9917msgstr " (使用 \"git merge --abort\" 终止合并)"
1b7f4a34 9918
ec3d4607 9919#: wt-status.c:1204
a0b6b246
JX
9920msgid "All conflicts fixed but you are still merging."
9921msgstr "所有冲突已解决但您仍处于合并中。"
1b7f4a34 9922
a0b6b246 9923# 译者:注意保持前导空格
ec3d4607 9924#: wt-status.c:1207
a0b6b246
JX
9925msgid " (use \"git commit\" to conclude merge)"
9926msgstr " (使用 \"git commit\" 结束合并)"
1b7f4a34 9927
ec3d4607 9928#: wt-status.c:1216
a0b6b246
JX
9929msgid "You are in the middle of an am session."
9930msgstr "您正处于 am 操作过程中。"
1b7f4a34 9931
ec3d4607 9932#: wt-status.c:1219
a0b6b246
JX
9933msgid "The current patch is empty."
9934msgstr "当前的补丁为空。"
1b7f4a34 9935
a0b6b246 9936# 译者:注意保持前导空格
ec3d4607 9937#: wt-status.c:1223
a0b6b246
JX
9938msgid " (fix conflicts and then run \"git am --continue\")"
9939msgstr " (解决冲突,然后运行 \"git am --continue\")"
1b7f4a34 9940
a0b6b246 9941# 译者:注意保持前导空格
ec3d4607 9942#: wt-status.c:1225
a0b6b246
JX
9943msgid " (use \"git am --skip\" to skip this patch)"
9944msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1b7f4a34 9945
a0b6b246 9946# 译者:注意保持前导空格
ec3d4607 9947#: wt-status.c:1227
a0b6b246
JX
9948msgid " (use \"git am --abort\" to restore the original branch)"
9949msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1b7f4a34 9950
ec3d4607 9951#: wt-status.c:1360
1a79b2f1
JX
9952msgid "git-rebase-todo is missing."
9953msgstr "git-rebase-todo 丢失。"
9954
ec3d4607 9955#: wt-status.c:1362
a0b6b246
JX
9956msgid "No commands done."
9957msgstr "没有命令被执行。"
9958
ec3d4607 9959#: wt-status.c:1365
1b7f4a34 9960#, c-format
a0b6b246
JX
9961msgid "Last command done (%d command done):"
9962msgid_plural "Last commands done (%d commands done):"
9963msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
9964msgstr[1] "最后的命令已完成(%d 条命令被执行):"
1b7f4a34 9965
ec3d4607 9966#: wt-status.c:1376
1b7f4a34 9967#, c-format
a0b6b246
JX
9968msgid " (see more in file %s)"
9969msgstr " (更多参见文件 %s)"
9970
ec3d4607 9971#: wt-status.c:1381
a0b6b246
JX
9972msgid "No commands remaining."
9973msgstr "未剩下任何命令。"
1b7f4a34 9974
ec3d4607 9975#: wt-status.c:1384
1b7f4a34 9976#, c-format
a0b6b246
JX
9977msgid "Next command to do (%d remaining command):"
9978msgid_plural "Next commands to do (%d remaining commands):"
9979msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
9980msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
1b7f4a34 9981
a0b6b246 9982# 译者:注意保持前导空格
ec3d4607 9983#: wt-status.c:1392
a0b6b246
JX
9984msgid " (use \"git rebase --edit-todo\" to view and edit)"
9985msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
1b7f4a34 9986
ec3d4607 9987#: wt-status.c:1404
1b7f4a34 9988#, c-format
a0b6b246
JX
9989msgid "You are currently rebasing branch '%s' on '%s'."
9990msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1b7f4a34 9991
ec3d4607 9992#: wt-status.c:1409
a0b6b246
JX
9993msgid "You are currently rebasing."
9994msgstr "您在执行变基操作。"
1b7f4a34 9995
a0b6b246 9996# 译者:注意保持前导空格
ec3d4607 9997#: wt-status.c:1422
a0b6b246
JX
9998msgid " (fix conflicts and then run \"git rebase --continue\")"
9999msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1b7f4a34 10000
a0b6b246 10001# 译者:注意保持前导空格
ec3d4607 10002#: wt-status.c:1424
a0b6b246
JX
10003msgid " (use \"git rebase --skip\" to skip this patch)"
10004msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
10005
10006# 译者:注意保持前导空格
ec3d4607 10007#: wt-status.c:1426
a0b6b246
JX
10008msgid " (use \"git rebase --abort\" to check out the original branch)"
10009msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
10010
10011# 译者:注意保持前导空格
ec3d4607 10012#: wt-status.c:1433
a0b6b246
JX
10013msgid " (all conflicts fixed: run \"git rebase --continue\")"
10014msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1b7f4a34 10015
ec3d4607 10016#: wt-status.c:1437
a0b6b246 10017#, c-format
1b7f4a34 10018msgid ""
a0b6b246
JX
10019"You are currently splitting a commit while rebasing branch '%s' on '%s'."
10020msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1b7f4a34 10021
ec3d4607 10022#: wt-status.c:1442
a0b6b246
JX
10023msgid "You are currently splitting a commit during a rebase."
10024msgstr "您在执行变基操作时拆分提交。"
1b7f4a34 10025
a0b6b246 10026# 译者:注意保持前导空格
ec3d4607 10027#: wt-status.c:1445
a0b6b246
JX
10028msgid " (Once your working directory is clean, run \"git rebase --continue\")"
10029msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1b7f4a34 10030
ec3d4607 10031#: wt-status.c:1449
a0b6b246
JX
10032#, c-format
10033msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
10034msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1b7f4a34 10035
ec3d4607 10036#: wt-status.c:1454
a0b6b246
JX
10037msgid "You are currently editing a commit during a rebase."
10038msgstr "您在执行变基操作时编辑提交。"
1b7f4a34 10039
a0b6b246 10040# 译者:注意保持前导空格
ec3d4607 10041#: wt-status.c:1457
a0b6b246
JX
10042msgid " (use \"git commit --amend\" to amend the current commit)"
10043msgstr " (使用 \"git commit --amend\" 修补当前提交)"
10044
10045# 译者:注意保持前导空格
ec3d4607 10046#: wt-status.c:1459
a0b6b246
JX
10047msgid ""
10048" (use \"git rebase --continue\" once you are satisfied with your changes)"
10049msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1b7f4a34 10050
ec3d4607 10051#: wt-status.c:1470
d46c5519
JX
10052msgid "Cherry-pick currently in progress."
10053msgstr "拣选操作正在进行中。"
10054
ec3d4607 10055#: wt-status.c:1473
1b7f4a34 10056#, c-format
a0b6b246
JX
10057msgid "You are currently cherry-picking commit %s."
10058msgstr "您在执行拣选提交 %s 的操作。"
1b7f4a34 10059
a0b6b246 10060# 译者:注意保持前导空格
ec3d4607 10061#: wt-status.c:1480
a0b6b246
JX
10062msgid " (fix conflicts and run \"git cherry-pick --continue\")"
10063msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1b7f4a34 10064
a0b6b246 10065# 译者:注意保持前导空格
ec3d4607 10066#: wt-status.c:1483
d46c5519
JX
10067msgid " (run \"git cherry-pick --continue\" to continue)"
10068msgstr " (执行 \"git cherry-pick --continue\" 以继续)"
10069
10070# 译者:注意保持前导空格
ec3d4607 10071#: wt-status.c:1486
a0b6b246
JX
10072msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
10073msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1b7f4a34 10074
a0b6b246 10075# 译者:注意保持前导空格
ec3d4607 10076#: wt-status.c:1488
a5cd71ca
JX
10077msgid " (use \"git cherry-pick --skip\" to skip this patch)"
10078msgstr " (使用 \"git cherry-pick --skip\" 跳过此补丁)"
10079
10080# 译者:注意保持前导空格
ec3d4607 10081#: wt-status.c:1490
a0b6b246
JX
10082msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
10083msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1b7f4a34 10084
ec3d4607 10085#: wt-status.c:1500
d46c5519
JX
10086msgid "Revert currently in progress."
10087msgstr "还原操作正在行中。"
10088
ec3d4607 10089#: wt-status.c:1503
1b7f4a34 10090#, c-format
a0b6b246
JX
10091msgid "You are currently reverting commit %s."
10092msgstr "您在执行反转提交 %s 的操作。"
1b7f4a34 10093
a0b6b246 10094# 译者:注意保持前导空格
ec3d4607 10095#: wt-status.c:1509
a0b6b246 10096msgid " (fix conflicts and run \"git revert --continue\")"
5b533632 10097msgstr " (解决冲突并执行 \"git revert --continue\")"
1b7f4a34 10098
a0b6b246 10099# 译者:注意保持前导空格
ec3d4607 10100#: wt-status.c:1512
d46c5519 10101msgid " (run \"git revert --continue\" to continue)"
5b533632 10102msgstr " (执行 \"git revert --continue\" 以继续)"
d46c5519
JX
10103
10104# 译者:注意保持前导空格
ec3d4607 10105#: wt-status.c:1515
a0b6b246 10106msgid " (all conflicts fixed: run \"git revert --continue\")"
5b533632 10107msgstr " (所有冲突已解决:执行 \"git revert --continue\")"
1b7f4a34 10108
a0b6b246 10109# 译者:注意保持前导空格
ec3d4607 10110#: wt-status.c:1517
a5cd71ca
JX
10111msgid " (use \"git revert --skip\" to skip this patch)"
10112msgstr " (使用 \"git revert --skip\" 跳过此补丁)"
10113
10114# 译者:注意保持前导空格
ec3d4607 10115#: wt-status.c:1519
a0b6b246
JX
10116msgid " (use \"git revert --abort\" to cancel the revert operation)"
10117msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1b7f4a34 10118
ec3d4607 10119#: wt-status.c:1529
1b7f4a34 10120#, c-format
a0b6b246
JX
10121msgid "You are currently bisecting, started from branch '%s'."
10122msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1b7f4a34 10123
ec3d4607 10124#: wt-status.c:1533
a0b6b246
JX
10125msgid "You are currently bisecting."
10126msgstr "您在执行二分查找操作。"
1b7f4a34 10127
a0b6b246 10128# 译者:注意保持前导空格
ec3d4607 10129#: wt-status.c:1536
a0b6b246
JX
10130msgid " (use \"git bisect reset\" to get back to the original branch)"
10131msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1b7f4a34 10132
ec3d4607
JX
10133#: wt-status.c:1547
10134msgid "You are in a sparse checkout."
10135msgstr "您处于一个稀疏检出中。"
10136
10137#: wt-status.c:1550
7157c2b5
JX
10138#, c-format
10139msgid "You are in a sparse checkout with %d%% of tracked files present."
ec3d4607 10140msgstr "您处于稀疏检出状态,包含 %d%% 的跟踪文件"
7157c2b5 10141
ec3d4607 10142#: wt-status.c:1794
a0b6b246
JX
10143msgid "On branch "
10144msgstr "位于分支 "
1b7f4a34 10145
ec3d4607 10146#: wt-status.c:1801
a0b6b246
JX
10147msgid "interactive rebase in progress; onto "
10148msgstr "交互式变基操作正在进行中;至 "
1b7f4a34 10149
ec3d4607 10150#: wt-status.c:1803
a0b6b246
JX
10151msgid "rebase in progress; onto "
10152msgstr "变基操作正在进行中;至 "
1b7f4a34 10153
ec3d4607 10154#: wt-status.c:1808
473eb541
JX
10155msgid "HEAD detached at "
10156msgstr "头指针分离于 "
10157
ec3d4607 10158#: wt-status.c:1810
473eb541
JX
10159msgid "HEAD detached from "
10160msgstr "头指针分离自 "
10161
ec3d4607 10162#: wt-status.c:1813
a0b6b246
JX
10163msgid "Not currently on any branch."
10164msgstr "当前不在任何分支上。"
1b7f4a34 10165
ec3d4607 10166#: wt-status.c:1830
a0b6b246
JX
10167msgid "Initial commit"
10168msgstr "初始提交"
1b7f4a34 10169
ec3d4607 10170#: wt-status.c:1831
a4f16749
JX
10171msgid "No commits yet"
10172msgstr "尚无提交"
10173
ec3d4607 10174#: wt-status.c:1845
a0b6b246
JX
10175msgid "Untracked files"
10176msgstr "未跟踪的文件"
1b7f4a34 10177
ec3d4607 10178#: wt-status.c:1847
a0b6b246
JX
10179msgid "Ignored files"
10180msgstr "忽略的文件"
1b7f4a34 10181
ec3d4607 10182#: wt-status.c:1851
a0b6b246
JX
10183#, c-format
10184msgid ""
10185"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
10186"may speed it up, but you have to be careful not to forget to add\n"
10187"new files yourself (see 'git help status')."
10188msgstr ""
10189"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
10190"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1b7f4a34 10191
ec3d4607 10192#: wt-status.c:1857
a0b6b246
JX
10193#, c-format
10194msgid "Untracked files not listed%s"
10195msgstr "未跟踪的文件没有列出%s"
1b7f4a34 10196
a0b6b246 10197# 译者:中文字符串拼接,可删除前导空格
ec3d4607 10198#: wt-status.c:1859
a0b6b246
JX
10199msgid " (use -u option to show untracked files)"
10200msgstr "(使用 -u 参数显示未跟踪的文件)"
1b7f4a34 10201
ec3d4607 10202#: wt-status.c:1865
a0b6b246
JX
10203msgid "No changes"
10204msgstr "没有修改"
1b7f4a34 10205
ec3d4607 10206#: wt-status.c:1870
a0b6b246
JX
10207#, c-format
10208msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
10209msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1b7f4a34 10210
ec3d4607 10211#: wt-status.c:1874
a0b6b246
JX
10212#, c-format
10213msgid "no changes added to commit\n"
10214msgstr "修改尚未加入提交\n"
1b7f4a34 10215
ec3d4607 10216#: wt-status.c:1878
a0b6b246
JX
10217#, c-format
10218msgid ""
10219"nothing added to commit but untracked files present (use \"git add\" to "
10220"track)\n"
10221msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1b7f4a34 10222
ec3d4607 10223#: wt-status.c:1882
a0b6b246
JX
10224#, c-format
10225msgid "nothing added to commit but untracked files present\n"
10226msgstr "提交为空,但是存在尚未跟踪的文件\n"
1b7f4a34 10227
ec3d4607 10228#: wt-status.c:1886
a0b6b246
JX
10229#, c-format
10230msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
10231msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1b7f4a34 10232
ec3d4607 10233#: wt-status.c:1890 wt-status.c:1896
a0b6b246
JX
10234#, c-format
10235msgid "nothing to commit\n"
10236msgstr "无文件要提交\n"
1b7f4a34 10237
ec3d4607 10238#: wt-status.c:1893
a0b6b246
JX
10239#, c-format
10240msgid "nothing to commit (use -u to show untracked files)\n"
10241msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1b7f4a34 10242
ec3d4607 10243#: wt-status.c:1898
a0b6b246
JX
10244#, c-format
10245msgid "nothing to commit, working tree clean\n"
10246msgstr "无文件要提交,干净的工作区\n"
10247
ec3d4607 10248#: wt-status.c:2003
a4f16749
JX
10249msgid "No commits yet on "
10250msgstr "尚无提交在 "
1b7f4a34 10251
ec3d4607 10252#: wt-status.c:2007
a0b6b246
JX
10253msgid "HEAD (no branch)"
10254msgstr "HEAD(非分支)"
1b7f4a34 10255
ec3d4607 10256#: wt-status.c:2038
31e5e17b
JX
10257msgid "different"
10258msgstr "不同"
10259
a0b6b246 10260# 译者:注意保持句尾空格
ec3d4607 10261#: wt-status.c:2040 wt-status.c:2048
a0b6b246
JX
10262msgid "behind "
10263msgstr "落后 "
1b7f4a34 10264
ec3d4607 10265#: wt-status.c:2043 wt-status.c:2046
a0b6b246
JX
10266msgid "ahead "
10267msgstr "领先 "
1b7f4a34 10268
a0b6b246 10269#. TRANSLATORS: the action is e.g. "pull with rebase"
ec3d4607 10270#: wt-status.c:2569
a0b6b246
JX
10271#, c-format
10272msgid "cannot %s: You have unstaged changes."
10273msgstr "不能%s:您有未暂存的变更。"
1b7f4a34 10274
ec3d4607 10275#: wt-status.c:2575
a0b6b246 10276msgid "additionally, your index contains uncommitted changes."
29004bbb 10277msgstr "另外,您的索引中包含未提交的变更。"
1b7f4a34 10278
ec3d4607 10279#: wt-status.c:2577
a0b6b246
JX
10280#, c-format
10281msgid "cannot %s: Your index contains uncommitted changes."
10282msgstr "不能%s:您的索引中包含未提交的变更。"
1b7f4a34 10283
7e6630a7 10284#: compat/simple-ipc/ipc-unix-socket.c:183
33b62fba
JX
10285msgid "could not send IPC command"
10286msgstr "无法发送 IPC 命令"
10287
7e6630a7 10288#: compat/simple-ipc/ipc-unix-socket.c:190
33b62fba
JX
10289msgid "could not read IPC response"
10290msgstr "无法读取 IPC 响应"
10291
7e6630a7 10292#: compat/simple-ipc/ipc-unix-socket.c:870
33b62fba
JX
10293#, c-format
10294msgid "could not start accept_thread '%s'"
7b4d4954 10295msgstr "无法启动 accept_thread '%s'"
33b62fba 10296
7e6630a7 10297#: compat/simple-ipc/ipc-unix-socket.c:882
33b62fba
JX
10298#, c-format
10299msgid "could not start worker[0] for '%s'"
10300msgstr "无法启动 '%s' 的 worker[0]"
10301
7e6630a7 10302#: compat/precompose_utf8.c:58 builtin/clone.c:347
a5cd71ca
JX
10303#, c-format
10304msgid "failed to unlink '%s'"
10305msgstr "删除 '%s' 失败"
10306
ddc12c42 10307#: builtin/add.c:26
a0b6b246
JX
10308msgid "git add [<options>] [--] <pathspec>..."
10309msgstr "git add [<选项>] [--] <路径规格>..."
1b7f4a34 10310
7e6630a7 10311#: builtin/add.c:64
473eb541
JX
10312#, c-format
10313msgid "cannot chmod %cx '%s'"
10314msgstr "不能 chmod %cx '%s'"
10315
7e6630a7 10316#: builtin/add.c:106
a0b6b246
JX
10317#, c-format
10318msgid "unexpected diff status %c"
10319msgstr "意外的差异状态 %c"
1b7f4a34 10320
7e6630a7 10321#: builtin/add.c:111 builtin/commit.c:298
a0b6b246
JX
10322msgid "updating files failed"
10323msgstr "更新文件失败"
1b7f4a34 10324
7e6630a7 10325#: builtin/add.c:121
a0b6b246
JX
10326#, c-format
10327msgid "remove '%s'\n"
10328msgstr "删除 '%s'\n"
1b7f4a34 10329
7e6630a7 10330#: builtin/add.c:205
a0b6b246
JX
10331msgid "Unstaged changes after refreshing the index:"
10332msgstr "刷新索引之后尚未被暂存的变更:"
1b7f4a34 10333
7e6630a7 10334#: builtin/add.c:317 builtin/rev-parse.c:993
a0b6b246
JX
10335msgid "Could not read the index"
10336msgstr "不能读取索引"
1b7f4a34 10337
7e6630a7 10338#: builtin/add.c:330
a0b6b246
JX
10339msgid "Could not write patch"
10340msgstr "不能生成补丁"
1b7f4a34 10341
7e6630a7 10342#: builtin/add.c:333
a0b6b246
JX
10343msgid "editing patch failed"
10344msgstr "编辑补丁失败"
1b7f4a34 10345
7e6630a7 10346#: builtin/add.c:336
1b7f4a34 10347#, c-format
a0b6b246 10348msgid "Could not stat '%s'"
65e2041e 10349msgstr "不能对 '%s' 调用 stat"
1b7f4a34 10350
7e6630a7 10351#: builtin/add.c:338
a0b6b246
JX
10352msgid "Empty patch. Aborted."
10353msgstr "空补丁。异常终止。"
1b7f4a34 10354
7e6630a7 10355#: builtin/add.c:343
a0b6b246
JX
10356#, c-format
10357msgid "Could not apply '%s'"
10358msgstr "不能应用 '%s'"
1b7f4a34 10359
7e6630a7 10360#: builtin/add.c:351
a0b6b246
JX
10361msgid "The following paths are ignored by one of your .gitignore files:\n"
10362msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 10363
7e6630a7 10364#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
ffa14514 10365#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
7e6630a7 10366#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
a0b6b246
JX
10367msgid "dry run"
10368msgstr "演习"
8ada9598 10369
7e6630a7 10370#: builtin/add.c:374
a0b6b246
JX
10371msgid "interactive picking"
10372msgstr "交互式拣选"
8ada9598 10373
7e6630a7 10374#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
a0b6b246
JX
10375msgid "select hunks interactively"
10376msgstr "交互式挑选数据块"
8ada9598 10377
7e6630a7 10378#: builtin/add.c:376
a0b6b246
JX
10379msgid "edit current diff and apply"
10380msgstr "编辑当前差异并应用"
8ada9598 10381
7e6630a7 10382#: builtin/add.c:377
a0b6b246
JX
10383msgid "allow adding otherwise ignored files"
10384msgstr "允许添加忽略的文件"
8ada9598 10385
7e6630a7 10386#: builtin/add.c:378
a0b6b246
JX
10387msgid "update tracked files"
10388msgstr "更新已跟踪的文件"
8ada9598 10389
7e6630a7 10390#: builtin/add.c:379
5809aa05
JX
10391msgid "renormalize EOL of tracked files (implies -u)"
10392msgstr "对已跟踪文件(暗含 -u)重新归一换行符"
10393
7e6630a7 10394#: builtin/add.c:380
a0b6b246
JX
10395msgid "record only the fact that the path will be added later"
10396msgstr "只记录,该路径稍后再添加"
8ada9598 10397
7e6630a7 10398#: builtin/add.c:381
a0b6b246
JX
10399msgid "add changes from all tracked and untracked files"
10400msgstr "添加所有改变的已跟踪文件和未跟踪文件"
8ada9598 10401
7e6630a7 10402#: builtin/add.c:384
a0b6b246
JX
10403msgid "ignore paths removed in the working tree (same as --no-all)"
10404msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
8ada9598 10405
7e6630a7 10406#: builtin/add.c:386
a0b6b246
JX
10407msgid "don't add, only refresh the index"
10408msgstr "不添加,只刷新索引"
8ada9598 10409
7e6630a7 10410#: builtin/add.c:387
a0b6b246
JX
10411msgid "just skip files which cannot be added because of errors"
10412msgstr "跳过因出错不能添加的文件"
8ada9598 10413
7e6630a7 10414#: builtin/add.c:388
a0b6b246
JX
10415msgid "check if - even missing - files are ignored in dry run"
10416msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
8ada9598 10417
7e6630a7
FZ
10418#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
10419msgid "allow updating entries outside of the sparse-checkout cone"
10420msgstr "允许更新稀疏检出 cone 以外的条目"
10421
10422#: builtin/add.c:391 builtin/update-index.c:1004
a0b6b246
JX
10423msgid "override the executable bit of the listed files"
10424msgstr "覆盖列表里文件的可执行位"
8ada9598 10425
7e6630a7 10426#: builtin/add.c:393
a4f16749
JX
10427msgid "warn when adding an embedded repository"
10428msgstr "创建一个嵌入式仓库时给予警告"
10429
7e6630a7 10430#: builtin/add.c:395
2b472aae
JX
10431msgid "backend for `git stash -p`"
10432msgstr "`git stash -p` 的后端"
10433
7e6630a7 10434#: builtin/add.c:413
a4f16749
JX
10435#, c-format
10436msgid ""
10437"You've added another git repository inside your current repository.\n"
10438"Clones of the outer repository will not contain the contents of\n"
10439"the embedded repository and will not know how to obtain it.\n"
10440"If you meant to add a submodule, use:\n"
10441"\n"
10442"\tgit submodule add <url> %s\n"
10443"\n"
10444"If you added this path by mistake, you can remove it from the\n"
10445"index with:\n"
10446"\n"
10447"\tgit rm --cached %s\n"
10448"\n"
10449"See \"git help submodule\" for more information."
10450msgstr ""
ddc12c42
JX
10451"您在当前仓库中添加了另一个Git仓库。克隆外层的仓库将不包含嵌入仓库的\n"
10452"内容,并且不知道该如何获取它。如果您要添加一个子模组,使用:\n"
a4f16749
JX
10453"\n"
10454"\tgit submodule add <url> %s\n"
10455"\n"
10456"如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n"
10457"\n"
10458"\tgit rm --cached %s\n"
10459"\n"
10460"参见 \"git help submodule\" 获取更多信息。"
10461
7e6630a7 10462#: builtin/add.c:442
a4f16749
JX
10463#, c-format
10464msgid "adding embedded git repository: %s"
10465msgstr "正在添加嵌入式 git 仓库:%s"
10466
7e6630a7 10467#: builtin/add.c:462
2b472aae
JX
10468msgid ""
10469"Use -f if you really want to add them.\n"
10470"Turn this message off by running\n"
10471"\"git config advice.addIgnoredFile false\""
10472msgstr ""
440e7442 10473"如果您确实要添加它们,使用 -f 参数。\n"
2b472aae
JX
10474"运行下面的命令来关闭本消息\n"
10475"\"git config advice.addIgnoredFile false\""
8ada9598 10476
7e6630a7 10477#: builtin/add.c:477
a0b6b246
JX
10478msgid "adding files failed"
10479msgstr "添加文件失败"
8ada9598 10480
7e6630a7 10481#: builtin/add.c:513
33b62fba
JX
10482msgid "--dry-run is incompatible with --interactive/--patch"
10483msgstr "--dry-run 与 --interactive/--patch 不兼容"
10484
7e6630a7 10485#: builtin/add.c:515 builtin/commit.c:358
ddc12c42
JX
10486msgid "--pathspec-from-file is incompatible with --interactive/--patch"
10487msgstr "--pathspec-from-file 与 --interactive/--patch 不兼容"
10488
7e6630a7 10489#: builtin/add.c:532
ddc12c42
JX
10490msgid "--pathspec-from-file is incompatible with --edit"
10491msgstr "--pathspec-from-file 与 --edit 不兼容"
10492
7e6630a7 10493#: builtin/add.c:544
a0b6b246
JX
10494msgid "-A and -u are mutually incompatible"
10495msgstr "-A 和 -u 选项互斥"
8ada9598 10496
7e6630a7 10497#: builtin/add.c:547
a0b6b246
JX
10498msgid "Option --ignore-missing can only be used together with --dry-run"
10499msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 10500
7e6630a7 10501#: builtin/add.c:551
8ada9598 10502#, c-format
a0b6b246
JX
10503msgid "--chmod param '%s' must be either -x or +x"
10504msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
8ada9598 10505
7e6630a7
FZ
10506#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
10507#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
ddc12c42
JX
10508msgid "--pathspec-from-file is incompatible with pathspec arguments"
10509msgstr "--pathspec-from-file 与路径表达式参数不兼容"
10510
7e6630a7
FZ
10511#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
10512#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
ddc12c42
JX
10513msgid "--pathspec-file-nul requires --pathspec-from-file"
10514msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
10515
7e6630a7 10516#: builtin/add.c:583
8ada9598 10517#, c-format
a0b6b246
JX
10518msgid "Nothing specified, nothing added.\n"
10519msgstr "没有指定文件,也没有文件被添加。\n"
8ada9598 10520
7e6630a7 10521#: builtin/add.c:585
2b472aae
JX
10522msgid ""
10523"Maybe you wanted to say 'git add .'?\n"
10524"Turn this message off by running\n"
10525"\"git config advice.addEmptyPathspec false\""
10526msgstr ""
10527"也许您想要执行 'git add .'?\n"
10528"运行下面的命令来关闭本消息\n"
10529"\"git config advice.addEmptyPathspec false\""
8ada9598 10530
7e6630a7 10531#: builtin/am.c:366
a0b6b246
JX
10532msgid "could not parse author script"
10533msgstr "不能解析作者脚本"
8ada9598 10534
7e6630a7 10535#: builtin/am.c:456
81809b99 10536#, c-format
a0b6b246
JX
10537msgid "'%s' was deleted by the applypatch-msg hook"
10538msgstr "'%s' 被 applypatch-msg 钩子删除"
8ada9598 10539
7e6630a7 10540#: builtin/am.c:498
8ada9598 10541#, c-format
a0b6b246
JX
10542msgid "Malformed input line: '%s'."
10543msgstr "非法的输入行:'%s'。"
8ada9598 10544
7e6630a7 10545#: builtin/am.c:536
8ada9598 10546#, c-format
a0b6b246
JX
10547msgid "Failed to copy notes from '%s' to '%s'"
10548msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
8ada9598 10549
7e6630a7 10550#: builtin/am.c:562
a0b6b246
JX
10551msgid "fseek failed"
10552msgstr "fseek 失败"
8ada9598 10553
7e6630a7 10554#: builtin/am.c:750
8ada9598 10555#, c-format
a0b6b246
JX
10556msgid "could not parse patch '%s'"
10557msgstr "无法解析补丁 '%s'"
8ada9598 10558
7e6630a7 10559#: builtin/am.c:815
a0b6b246
JX
10560msgid "Only one StGIT patch series can be applied at once"
10561msgstr "一次只能有一个 StGIT 补丁队列被应用"
10562
7e6630a7 10563#: builtin/am.c:863
a0b6b246
JX
10564msgid "invalid timestamp"
10565msgstr "无效的时间戳"
10566
7e6630a7 10567#: builtin/am.c:868 builtin/am.c:880
a0b6b246
JX
10568msgid "invalid Date line"
10569msgstr "无效的日期行"
8ada9598 10570
7e6630a7 10571#: builtin/am.c:875
a0b6b246
JX
10572msgid "invalid timezone offset"
10573msgstr "无效的时区偏移值"
8ada9598 10574
7e6630a7 10575#: builtin/am.c:968
a0b6b246 10576msgid "Patch format detection failed."
87cb7997 10577msgstr "补丁格式探测失败。"
8ada9598 10578
7e6630a7 10579#: builtin/am.c:973 builtin/clone.c:300
8ada9598 10580#, c-format
a0b6b246 10581msgid "failed to create directory '%s'"
c1ac5258 10582msgstr "创建目录 '%s' 失败"
8ada9598 10583
7e6630a7 10584#: builtin/am.c:978
a0b6b246 10585msgid "Failed to split patches."
c1ac5258 10586msgstr "拆分补丁失败。"
814ff314 10587
7e6630a7 10588#: builtin/am.c:1127
8ada9598 10589#, c-format
a0b6b246
JX
10590msgid "When you have resolved this problem, run \"%s --continue\"."
10591msgstr "当您解决这一问题,执行 \"%s --continue\"。"
8ada9598 10592
7e6630a7 10593#: builtin/am.c:1128
81809b99 10594#, c-format
a0b6b246
JX
10595msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
10596msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
8ada9598 10597
7e6630a7 10598#: builtin/am.c:1129
81809b99 10599#, c-format
a0b6b246
JX
10600msgid "To restore the original branch and stop patching, run \"%s --abort\"."
10601msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
8ada9598 10602
7e6630a7 10603#: builtin/am.c:1224
4c27fcb5
JX
10604msgid "Patch sent with format=flowed; space at the end of lines might be lost."
10605msgstr "补丁使用 format=flowed 格式发送,行尾的空格可能会丢失。"
10606
7e6630a7 10607#: builtin/am.c:1252
a4f16749
JX
10608msgid "Patch is empty."
10609msgstr "补丁为空。"
23ff3338 10610
7e6630a7 10611#: builtin/am.c:1317
a5cd71ca
JX
10612#, c-format
10613msgid "missing author line in commit %s"
10614msgstr "在提交 %s 中缺失作者行"
10615
7e6630a7 10616#: builtin/am.c:1320
8ada9598 10617#, c-format
a4f16749
JX
10618msgid "invalid ident line: %.*s"
10619msgstr "无效的身份标识:%.*s"
8ada9598 10620
7e6630a7 10621#: builtin/am.c:1539
a0b6b246
JX
10622msgid "Repository lacks necessary blobs to fall back on 3-way merge."
10623msgstr "仓库缺乏必要的数据对象以进行三方合并。"
814ff314 10624
7e6630a7 10625#: builtin/am.c:1541
a0b6b246
JX
10626msgid "Using index info to reconstruct a base tree..."
10627msgstr "使用索引来重建一个(三方合并的)基础目录树..."
8ada9598 10628
7e6630a7 10629#: builtin/am.c:1560
a0b6b246
JX
10630msgid ""
10631"Did you hand edit your patch?\n"
10632"It does not apply to blobs recorded in its index."
10633msgstr ""
10634"您是否曾手动编辑过您的补丁?\n"
10635"无法应用补丁到索引中的数据对象上。"
23ff3338 10636
7e6630a7 10637#: builtin/am.c:1566
a0b6b246
JX
10638msgid "Falling back to patching base and 3-way merge..."
10639msgstr "回落到基础版本上打补丁及进行三方合并..."
8ada9598 10640
7e6630a7 10641#: builtin/am.c:1592
a0b6b246
JX
10642msgid "Failed to merge in the changes."
10643msgstr "无法合并变更。"
d691f479 10644
7e6630a7 10645#: builtin/am.c:1624
a0b6b246
JX
10646msgid "applying to an empty history"
10647msgstr "正应用到一个空历史上"
8ada9598 10648
7e6630a7 10649#: builtin/am.c:1676 builtin/am.c:1680
8ada9598 10650#, c-format
a0b6b246
JX
10651msgid "cannot resume: %s does not exist."
10652msgstr "无法继续:%s 不存在。"
8ada9598 10653
7e6630a7 10654#: builtin/am.c:1698
a0b6b246
JX
10655msgid "Commit Body is:"
10656msgstr "提交内容为:"
8ada9598 10657
a0b6b246
JX
10658#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
10659#. in your translation. The program will only accept English
10660#. input at this point.
10661#.
7e6630a7 10662#: builtin/am.c:1708
a6cd2cc4 10663#, c-format
a0b6b246
JX
10664msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
10665msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
8ada9598 10666
7e6630a7 10667#: builtin/am.c:1754 builtin/commit.c:409
a5cd71ca
JX
10668msgid "unable to write index file"
10669msgstr "无法写入索引文件"
10670
7e6630a7 10671#: builtin/am.c:1758
8ada9598 10672#, c-format
a0b6b246
JX
10673msgid "Dirty index: cannot apply patches (dirty: %s)"
10674msgstr "脏索引:不能应用补丁(脏文件:%s)"
8ada9598 10675
7e6630a7 10676#: builtin/am.c:1798 builtin/am.c:1865
81809b99 10677#, c-format
a0b6b246
JX
10678msgid "Applying: %.*s"
10679msgstr "应用:%.*s"
8ada9598 10680
7e6630a7 10681#: builtin/am.c:1815
a0b6b246
JX
10682msgid "No changes -- Patch already applied."
10683msgstr "没有变更 —— 补丁已经应用过。"
8ada9598 10684
7e6630a7 10685#: builtin/am.c:1821
81809b99 10686#, c-format
a0b6b246
JX
10687msgid "Patch failed at %s %.*s"
10688msgstr "打补丁失败于 %s %.*s"
8ada9598 10689
7e6630a7 10690#: builtin/am.c:1825
2b472aae
JX
10691msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
10692msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁"
8ada9598 10693
ec3d4607 10694#: builtin/am.c:1868
a0b6b246
JX
10695msgid ""
10696"No changes - did you forget to use 'git add'?\n"
10697"If there is nothing left to stage, chances are that something else\n"
10698"already introduced the same changes; you might want to skip this patch."
10699msgstr ""
10700"没有变更 —— 您是不是忘了执行 'git add'?\n"
10701"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
10702"您也许想要跳过这个补丁。"
8ada9598 10703
ec3d4607 10704#: builtin/am.c:1875
a0b6b246
JX
10705msgid ""
10706"You still have unmerged paths in your index.\n"
a4f16749
JX
10707"You should 'git add' each file with resolved conflicts to mark them as "
10708"such.\n"
10709"You might run `git rm` on a file to accept \"deleted by them\" for it."
a0b6b246 10710msgstr ""
a4f16749
JX
10711"在您的索引中仍存在未合并的路径。\n"
10712"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
7e6630a7 10713"您可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
8ada9598 10714
7e6630a7
FZ
10715#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
10716#: builtin/reset.c:361
8ada9598 10717#, c-format
a0b6b246
JX
10718msgid "Could not parse object '%s'."
10719msgstr "不能解析对象 '%s'。"
8ada9598 10720
7e6630a7 10721#: builtin/am.c:2035 builtin/am.c:2111
a0b6b246 10722msgid "failed to clean index"
c1ac5258 10723msgstr "清空索引失败"
5b04ee3b 10724
7e6630a7 10725#: builtin/am.c:2079
a0b6b246
JX
10726msgid ""
10727"You seem to have moved HEAD since the last 'am' failure.\n"
10728"Not rewinding to ORIG_HEAD"
10729msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
8ada9598 10730
7e6630a7 10731#: builtin/am.c:2187
8ada9598 10732#, c-format
a0b6b246
JX
10733msgid "Invalid value for --patch-format: %s"
10734msgstr "无效的 --patch-format 值:%s"
8ada9598 10735
7e6630a7 10736#: builtin/am.c:2229
2b472aae
JX
10737#, c-format
10738msgid "Invalid value for --show-current-patch: %s"
10739msgstr "无效的 --show-current-patch 值:%s"
10740
7e6630a7 10741#: builtin/am.c:2233
2b472aae
JX
10742#, c-format
10743msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
10744msgstr "--show-current-patch=%s 和 --show-current-patch=%s 不兼容"
10745
7e6630a7 10746#: builtin/am.c:2264
a0b6b246
JX
10747msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
10748msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
5b04ee3b 10749
7e6630a7 10750#: builtin/am.c:2265
a0b6b246
JX
10751msgid "git am [<options>] (--continue | --skip | --abort)"
10752msgstr "git am [<选项>] (--continue | --skip | --abort)"
8ada9598 10753
7e6630a7 10754#: builtin/am.c:2271
a0b6b246
JX
10755msgid "run interactively"
10756msgstr "以交互式方式运行"
8ada9598 10757
7e6630a7 10758#: builtin/am.c:2273
a0b6b246
JX
10759msgid "historical option -- no-op"
10760msgstr "老的参数 —— 无作用"
8ada9598 10761
7e6630a7 10762#: builtin/am.c:2275
a0b6b246
JX
10763msgid "allow fall back on 3way merging if needed"
10764msgstr "如果必要,允许使用三方合并。"
8ada9598 10765
7e6630a7
FZ
10766#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
10767#: builtin/repack.c:640 builtin/stash.c:961
a0b6b246
JX
10768msgid "be quiet"
10769msgstr "静默模式"
8ada9598 10770
7e6630a7 10771#: builtin/am.c:2278
d13389bf
JX
10772msgid "add a Signed-off-by trailer to the commit message"
10773msgstr "在提交说明中添加 Signed-off-by 尾注"
5c57d762 10774
7e6630a7 10775#: builtin/am.c:2281
a0b6b246
JX
10776msgid "recode into utf8 (default)"
10777msgstr "使用 utf8 字符集(默认)"
5c57d762 10778
7e6630a7 10779#: builtin/am.c:2283
a0b6b246
JX
10780msgid "pass -k flag to git-mailinfo"
10781msgstr "向 git-mailinfo 传递 -k 参数"
5c57d762 10782
7e6630a7 10783#: builtin/am.c:2285
a0b6b246
JX
10784msgid "pass -b flag to git-mailinfo"
10785msgstr "向 git-mailinfo 传递 -b 参数"
5c57d762 10786
7e6630a7 10787#: builtin/am.c:2287
a0b6b246
JX
10788msgid "pass -m flag to git-mailinfo"
10789msgstr "向 git-mailinfo 传递 -m 参数"
5c57d762 10790
7e6630a7 10791#: builtin/am.c:2289
a0b6b246
JX
10792msgid "pass --keep-cr flag to git-mailsplit for mbox format"
10793msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
5c57d762 10794
7e6630a7 10795#: builtin/am.c:2292
a0b6b246
JX
10796msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
10797msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
8ada9598 10798
7e6630a7 10799#: builtin/am.c:2295
a0b6b246
JX
10800msgid "strip everything before a scissors line"
10801msgstr "丢弃裁切线前的所有内容"
8ada9598 10802
7e6630a7 10803#: builtin/am.c:2297
33b62fba
JX
10804msgid "pass it through git-mailinfo"
10805msgstr "传递给 git-mailinfo"
10806
7e6630a7
FZ
10807#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
10808#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
10809#: builtin/am.c:2327
a0b6b246
JX
10810msgid "pass it through git-apply"
10811msgstr "传递给 git-apply"
8ada9598 10812
7e6630a7
FZ
10813#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
10814#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
ffa14514 10815#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
7e6630a7
FZ
10816#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
10817#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
10818#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
ffa14514 10819#: parse-options.h:315
a0b6b246
JX
10820msgid "n"
10821msgstr "n"
8ada9598 10822
7e6630a7
FZ
10823#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
10824#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
d9488fea 10825#: builtin/verify-tag.c:38
a0b6b246
JX
10826msgid "format"
10827msgstr "格式"
8ada9598 10828
7e6630a7 10829#: builtin/am.c:2324
a0b6b246
JX
10830msgid "format the patch(es) are in"
10831msgstr "补丁的格式"
8ada9598 10832
7e6630a7 10833#: builtin/am.c:2330
a0b6b246
JX
10834msgid "override error message when patch failure occurs"
10835msgstr "打补丁失败时显示的错误信息"
8ada9598 10836
7e6630a7 10837#: builtin/am.c:2332
a0b6b246
JX
10838msgid "continue applying patches after resolving a conflict"
10839msgstr "冲突解决后继续应用补丁"
814ff314 10840
7e6630a7 10841#: builtin/am.c:2335
a0b6b246
JX
10842msgid "synonyms for --continue"
10843msgstr "和 --continue 同义"
8ada9598 10844
7e6630a7 10845#: builtin/am.c:2338
a0b6b246
JX
10846msgid "skip the current patch"
10847msgstr "跳过当前补丁"
23ff3338 10848
7e6630a7 10849#: builtin/am.c:2341
473eb541
JX
10850msgid "restore the original branch and abort the patching operation"
10851msgstr "恢复原始分支并终止打补丁操作"
8ada9598 10852
7e6630a7 10853#: builtin/am.c:2344
473eb541
JX
10854msgid "abort the patching operation but keep HEAD where it is"
10855msgstr "终止补丁操作但保持 HEAD 不变"
31e5e17b 10856
7e6630a7 10857#: builtin/am.c:2348
2b472aae
JX
10858msgid "show the patch being applied"
10859msgstr "显示正在应用的补丁"
31e5e17b 10860
7e6630a7 10861#: builtin/am.c:2353
a0b6b246
JX
10862msgid "lie about committer date"
10863msgstr "将作者日期作为提交日期"
8ada9598 10864
7e6630a7 10865#: builtin/am.c:2355
a0b6b246
JX
10866msgid "use current timestamp for author date"
10867msgstr "用当前时间作为作者日期"
8ada9598 10868
7e6630a7 10869#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
ffa14514 10870#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
7e6630a7 10871#: builtin/revert.c:117 builtin/tag.c:460
a0b6b246
JX
10872msgid "key-id"
10873msgstr "key-id"
8ada9598 10874
7e6630a7 10875#: builtin/am.c:2358 builtin/rebase.c:1100
a0b6b246
JX
10876msgid "GPG-sign commits"
10877msgstr "使用 GPG 签名提交"
8ada9598 10878
7e6630a7 10879#: builtin/am.c:2361
a0b6b246
JX
10880msgid "(internal use for git-rebase)"
10881msgstr "(内部使用,用于 git-rebase)"
8ada9598 10882
7e6630a7 10883#: builtin/am.c:2379
a0b6b246
JX
10884msgid ""
10885"The -b/--binary option has been a no-op for long time, and\n"
10886"it will be removed. Please do not use it anymore."
10887msgstr ""
10888"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
10889"请不要再使用它了。"
8ada9598 10890
7e6630a7 10891#: builtin/am.c:2386
a0b6b246 10892msgid "failed to read the index"
c1ac5258 10893msgstr "读取索引失败"
8ada9598 10894
7e6630a7 10895#: builtin/am.c:2401
a0b6b246
JX
10896#, c-format
10897msgid "previous rebase directory %s still exists but mbox given."
10898msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
8ada9598 10899
7e6630a7 10900#: builtin/am.c:2425
a0b6b246
JX
10901#, c-format
10902msgid ""
10903"Stray %s directory found.\n"
10904"Use \"git am --abort\" to remove it."
10905msgstr ""
10906"发现了错误的 %s 目录。\n"
10907"使用 \"git am --abort\" 删除它。"
c04f5ac3 10908
7e6630a7 10909#: builtin/am.c:2431
a0b6b246
JX
10910msgid "Resolve operation not in progress, we are not resuming."
10911msgstr "解决操作未进行,我们不会继续。"
c04f5ac3 10912
7e6630a7 10913#: builtin/am.c:2441
a6cd2cc4
JX
10914msgid "interactive mode requires patches on the command line"
10915msgstr "交互式模式需要命令行上提供补丁"
10916
a0b6b246
JX
10917#: builtin/apply.c:8
10918msgid "git apply [<options>] [<patch>...]"
10919msgstr "git apply [<选项>] [<补丁>...]"
c04f5ac3 10920
7e6630a7 10921#: builtin/archive.c:18
c04f5ac3 10922msgid "could not redirect output"
195febda 10923msgstr "不能重定向输出"
c04f5ac3 10924
7e6630a7 10925#: builtin/archive.c:35
c04f5ac3 10926msgid "git archive: Remote with no URL"
4375c10e 10927msgstr "git archive:未提供远程 URL"
c04f5ac3 10928
7e6630a7 10929#: builtin/archive.c:59
31e5e17b
JX
10930msgid "git archive: expected ACK/NAK, got a flush packet"
10931msgstr "git archive:期望是 ACK/NAK,却得到 flush 包"
c04f5ac3 10932
7e6630a7 10933#: builtin/archive.c:62
c04f5ac3
JX
10934#, c-format
10935msgid "git archive: NACK %s"
90e6ef53 10936msgstr "git archive:NACK %s"
c04f5ac3 10937
7e6630a7 10938#: builtin/archive.c:63
c04f5ac3 10939msgid "git archive: protocol error"
90e6ef53 10940msgstr "git archive:协议错误"
c04f5ac3 10941
7e6630a7 10942#: builtin/archive.c:67
c04f5ac3 10943msgid "git archive: expected a flush"
31e5e17b 10944msgstr "git archive:应有一个 flush 包"
c04f5ac3 10945
7e6630a7 10946#: builtin/bisect--helper.c:24
06991777
JX
10947msgid "git bisect--helper --bisect-reset [<commit>]"
10948msgstr "git bisect--helper --bisect-reset [<提交>]"
10949
473eb541 10950#: builtin/bisect--helper.c:25
06991777
JX
10951msgid ""
10952"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
10953"term-new]"
10954msgstr ""
10955"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
10956"term-new]"
10957
473eb541 10958#: builtin/bisect--helper.c:26
06991777 10959msgid ""
d9488fea
JX
10960"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
10961"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
10962"[<paths>...]"
06991777 10963msgstr ""
d9488fea
JX
10964"git bisect--helper --bisect-start [--term-{new,bad}=<术语> --term-{old,good}"
10965"=<术语>] [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径>...]"
10966
473eb541 10967#: builtin/bisect--helper.c:28
d9488fea
JX
10968msgid "git bisect--helper --bisect-next"
10969msgstr "git bisect--helper --bisect-next"
10970
473eb541 10971#: builtin/bisect--helper.c:29
d13389bf
JX
10972msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
10973msgstr "git bisect--helper --bisect-state (bad|new) [<版本>]"
10974
473eb541 10975#: builtin/bisect--helper.c:30
d13389bf
JX
10976msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
10977msgstr "git bisect--helper --bisect-state (good|old) [<版本>...]"
d9488fea 10978
473eb541
JX
10979#: builtin/bisect--helper.c:31
10980msgid "git bisect--helper --bisect-replay <filename>"
10981msgstr "git bisect--helper --bisect-replay <文件>"
10982
10983#: builtin/bisect--helper.c:32
10984msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
10985msgstr "git bisect--helper --bisect-skip [(<版本>|<范围>)...]"
10986
7e6630a7
FZ
10987#: builtin/bisect--helper.c:33
10988msgid "git bisect--helper --bisect-visualize"
10989msgstr "git bisect--helper --bisect-visualize"
10990
10991#: builtin/bisect--helper.c:34
10992msgid "git bisect--helper --bisect-run <cmd>..."
10993msgstr "git bisect--helper --bisect-run <命令>..."
10994
10995#: builtin/bisect--helper.c:109
d9488fea
JX
10996#, c-format
10997msgid "cannot open file '%s' in mode '%s'"
10998msgstr "不能以 '%2$s' 模式打开文件 '%1$s'"
10999
7e6630a7 11000#: builtin/bisect--helper.c:116
d9488fea
JX
11001#, c-format
11002msgid "could not write to file '%s'"
11003msgstr "不能写入文件 '%s'"
11004
7e6630a7
FZ
11005#: builtin/bisect--helper.c:154
11006#, c-format
11007msgid "cannot open file '%s' for reading"
11008msgstr "不能打开文件 '%s' 来读取"
11009
11010#: builtin/bisect--helper.c:170
5809aa05
JX
11011#, c-format
11012msgid "'%s' is not a valid term"
11013msgstr "'%s' 不是一个有效的术语"
11014
7e6630a7 11015#: builtin/bisect--helper.c:174
5809aa05
JX
11016#, c-format
11017msgid "can't use the builtin command '%s' as a term"
11018msgstr "不能使用内置命令 '%s' 作为术语"
11019
7e6630a7 11020#: builtin/bisect--helper.c:184
5809aa05
JX
11021#, c-format
11022msgid "can't change the meaning of the term '%s'"
11023msgstr "不能修改术语 '%s' 的含义"
11024
7e6630a7 11025#: builtin/bisect--helper.c:194
5809aa05
JX
11026msgid "please use two different terms"
11027msgstr "请使用两个不同的术语"
11028
7e6630a7 11029#: builtin/bisect--helper.c:210
06991777
JX
11030#, c-format
11031msgid "We are not bisecting.\n"
11032msgstr "我们没有在二分查找。\n"
11033
7e6630a7 11034#: builtin/bisect--helper.c:218
06991777
JX
11035#, c-format
11036msgid "'%s' is not a valid commit"
11037msgstr "'%s' 不是一个有效的提交"
11038
7e6630a7 11039#: builtin/bisect--helper.c:227
06991777
JX
11040#, c-format
11041msgid ""
11042"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
11043msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
11044
7e6630a7 11045#: builtin/bisect--helper.c:271
06991777
JX
11046#, c-format
11047msgid "Bad bisect_write argument: %s"
11048msgstr "坏的 bisect_write 参数:%s"
11049
7e6630a7 11050#: builtin/bisect--helper.c:276
06991777
JX
11051#, c-format
11052msgid "couldn't get the oid of the rev '%s'"
5b533632 11053msgstr "无法获取版本 '%s' 的对象 ID"
06991777 11054
7e6630a7 11055#: builtin/bisect--helper.c:288
06991777
JX
11056#, c-format
11057msgid "couldn't open the file '%s'"
11058msgstr "无法打开文件 '%s'"
11059
7e6630a7 11060#: builtin/bisect--helper.c:314
06991777
JX
11061#, c-format
11062msgid "Invalid command: you're currently in a %s/%s bisect"
11063msgstr "无效的命令:您当前正处于一个 %s/%s 二分查找中"
11064
7e6630a7 11065#: builtin/bisect--helper.c:341
06991777
JX
11066#, c-format
11067msgid ""
11068"You need to give me at least one %s and %s revision.\n"
11069"You can use \"git bisect %s\" and \"git bisect %s\" for that."
11070msgstr ""
11071"您需要给我至少一个 %s 和一个 %s 版本。\n"
11072"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
11073
7e6630a7 11074#: builtin/bisect--helper.c:345
06991777
JX
11075#, c-format
11076msgid ""
11077"You need to start by \"git bisect start\".\n"
11078"You then need to give me at least one %s and %s revision.\n"
11079"You can use \"git bisect %s\" and \"git bisect %s\" for that."
11080msgstr ""
11081"您需要执行 \"git bisect start\" 来开始。\n"
11082"然后需要提供我至少一个 %s 和一个 %s 版本。\n"
11083"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
11084
7e6630a7 11085#: builtin/bisect--helper.c:365
06991777
JX
11086#, c-format
11087msgid "bisecting only with a %s commit"
5b533632 11088msgstr "在只有一个 %s 提交的情况下二分查找"
06991777 11089
06991777
JX
11090#. TRANSLATORS: Make sure to include [Y] and [n] in your
11091#. translation. The program will only accept English input
11092#. at this point.
11093#.
7e6630a7 11094#: builtin/bisect--helper.c:373
06991777
JX
11095msgid "Are you sure [Y/n]? "
11096msgstr "您确认么[Y/n]? "
11097
7e6630a7 11098#: builtin/bisect--helper.c:434
06991777
JX
11099msgid "no terms defined"
11100msgstr "未定义术语"
11101
7e6630a7 11102#: builtin/bisect--helper.c:437
06991777
JX
11103#, c-format
11104msgid ""
11105"Your current terms are %s for the old state\n"
11106"and %s for the new state.\n"
11107msgstr "您当前针对旧状态的术语是 %s,对新状态的术语是 %s。\n"
11108
7e6630a7 11109#: builtin/bisect--helper.c:447
06991777
JX
11110#, c-format
11111msgid ""
11112"invalid argument %s for 'git bisect terms'.\n"
11113"Supported options are: --term-good|--term-old and --term-bad|--term-new."
11114msgstr ""
11115"命令 'git bisect terms' 的参数 %s 无效。\n"
11116"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
11117
7e6630a7 11118#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
d9488fea
JX
11119msgid "revision walk setup failed\n"
11120msgstr "版本遍历设置失败\n"
11121
7e6630a7 11122#: builtin/bisect--helper.c:536
d9488fea
JX
11123#, c-format
11124msgid "could not open '%s' for appending"
11125msgstr "无法打开 '%s' 进行追加"
11126
7e6630a7 11127#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
7157c2b5
JX
11128msgid "'' is not a valid term"
11129msgstr "'' 不是一个有效的术语"
11130
7e6630a7 11131#: builtin/bisect--helper.c:678
06991777
JX
11132#, c-format
11133msgid "unrecognized option: '%s'"
11134msgstr "未识别的选项:'%s'"
11135
7e6630a7 11136#: builtin/bisect--helper.c:682
06991777
JX
11137#, c-format
11138msgid "'%s' does not appear to be a valid revision"
8e4e0555 11139msgstr "'%s' 看起来不是一个有效的版本"
06991777 11140
7e6630a7 11141#: builtin/bisect--helper.c:713
06991777
JX
11142msgid "bad HEAD - I need a HEAD"
11143msgstr "坏的 HEAD - 我需要一个 HEAD"
11144
7e6630a7 11145#: builtin/bisect--helper.c:728
06991777
JX
11146#, c-format
11147msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
11148msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
11149
7e6630a7 11150#: builtin/bisect--helper.c:749
06991777
JX
11151msgid "won't bisect on cg-seek'ed tree"
11152msgstr "不会在做了 cg-seek 的树上做二分查找"
11153
7e6630a7 11154#: builtin/bisect--helper.c:752
06991777
JX
11155msgid "bad HEAD - strange symbolic ref"
11156msgstr "坏的 HEAD - 奇怪的符号引用"
11157
7e6630a7 11158#: builtin/bisect--helper.c:772
a6cd2cc4
JX
11159#, c-format
11160msgid "invalid ref: '%s'"
11161msgstr "无效的引用:'%s'"
11162
7e6630a7 11163#: builtin/bisect--helper.c:830
d9488fea
JX
11164msgid "You need to start by \"git bisect start\"\n"
11165msgstr "您需要执行 \"git bisect start\" 来开始\n"
11166
d9488fea
JX
11167#. TRANSLATORS: Make sure to include [Y] and [n] in your
11168#. translation. The program will only accept English input
11169#. at this point.
11170#.
7e6630a7 11171#: builtin/bisect--helper.c:841
d9488fea
JX
11172msgid "Do you want me to do it for you [Y/n]? "
11173msgstr "您想让我为您这样做么[Y/n]? "
11174
7e6630a7 11175#: builtin/bisect--helper.c:859
d13389bf
JX
11176msgid "Please call `--bisect-state` with at least one argument"
11177msgstr "请使用至少一个参数调用 `--bisect-state`"
ef317cd5 11178
7e6630a7 11179#: builtin/bisect--helper.c:872
d13389bf
JX
11180#, c-format
11181msgid "'git bisect %s' can take only one argument."
11182msgstr "'git bisect %s' 只能带一个参数。"
5809aa05 11183
7e6630a7 11184#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
d13389bf
JX
11185#, c-format
11186msgid "Bad rev input: %s"
11187msgstr "坏的版本输入:%s"
5809aa05 11188
7e6630a7 11189#: builtin/bisect--helper.c:904
33b62fba
JX
11190#, c-format
11191msgid "Bad rev input (not a commit): %s"
11192msgstr "坏的版本输入(不是提交):%s"
11193
7e6630a7 11194#: builtin/bisect--helper.c:936
473eb541
JX
11195msgid "We are not bisecting."
11196msgstr "我们没有在二分查找。"
11197
7e6630a7 11198#: builtin/bisect--helper.c:986
473eb541
JX
11199#, c-format
11200msgid "'%s'?? what are you talking about?"
11201msgstr "'%s'?? 您在说什么?"
06991777 11202
7e6630a7 11203#: builtin/bisect--helper.c:998
473eb541
JX
11204#, c-format
11205msgid "cannot read file '%s' for replaying"
11206msgstr "不能读取文件 '%s' 来重放"
06991777 11207
7e6630a7
FZ
11208#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
11209msgid "bisect run failed: no command provided."
11210msgstr "二分查找运行失败:没有提供命令。"
11211
11212#: builtin/bisect--helper.c:1116
11213#, c-format
11214msgid "running %s\n"
11215msgstr "正在执行 %s\n"
11216
11217#: builtin/bisect--helper.c:1120
11218#, c-format
11219msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
11220msgstr "二分查找运行失败:命令 '%2$s' 的退出码 %1$d < 0 或 >= 128"
11221
11222#: builtin/bisect--helper.c:1136
11223#, c-format
11224msgid "cannot open file '%s' for writing"
11225msgstr "无法打开文件 '%s' 进行写入"
11226
11227#: builtin/bisect--helper.c:1152
11228msgid "bisect run cannot continue any more"
11229msgstr "二分查找不能继续运行"
11230
11231#: builtin/bisect--helper.c:1154
11232#, c-format
11233msgid "bisect run success"
11234msgstr "二分查找运行成功"
11235
11236#: builtin/bisect--helper.c:1157
11237#, c-format
11238msgid "bisect found first bad commit"
11239msgstr "二分查找找到了第一个坏的提交"
11240
11241#: builtin/bisect--helper.c:1160
11242#, c-format
11243msgid ""
11244"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
11245"code %d"
11246msgstr "二分查找运行失败:'git bisect--helper --bisect-state %s' 退出码为 %d"
11247
11248#: builtin/bisect--helper.c:1192
473eb541
JX
11249msgid "reset the bisection state"
11250msgstr "清除二分查找状态"
06991777 11251
7e6630a7 11252#: builtin/bisect--helper.c:1194
06991777
JX
11253msgid "check whether bad or good terms exist"
11254msgstr "检查坏的或好的术语是否存在"
11255
7e6630a7 11256#: builtin/bisect--helper.c:1196
06991777
JX
11257msgid "print out the bisect terms"
11258msgstr "打印二分查找术语"
11259
7e6630a7 11260#: builtin/bisect--helper.c:1198
06991777 11261msgid "start the bisect session"
5b533632 11262msgstr "启动二分查找过程"
06991777 11263
7e6630a7 11264#: builtin/bisect--helper.c:1200
d9488fea
JX
11265msgid "find the next bisection commit"
11266msgstr "查询下一个二分查找提交"
11267
7e6630a7 11268#: builtin/bisect--helper.c:1202
d13389bf
JX
11269msgid "mark the state of ref (or refs)"
11270msgstr "标记引用的状态"
d9488fea 11271
7e6630a7 11272#: builtin/bisect--helper.c:1204
473eb541
JX
11273msgid "list the bisection steps so far"
11274msgstr "列出到目前为止的二分查找步骤"
11275
7e6630a7 11276#: builtin/bisect--helper.c:1206
473eb541
JX
11277msgid "replay the bisection process from the given file"
11278msgstr "从给定文件重放二分查找进程"
11279
7e6630a7 11280#: builtin/bisect--helper.c:1208
473eb541
JX
11281msgid "skip some commits for checkout"
11282msgstr "跳过要检出的一些提交"
11283
7e6630a7
FZ
11284#: builtin/bisect--helper.c:1210
11285msgid "visualize the bisection"
11286msgstr "可视化二分查找过程"
11287
11288#: builtin/bisect--helper.c:1212
11289msgid "use <cmd>... to automatically bisect."
11290msgstr "使用 <命令>... 来自动二分查找。"
11291
11292#: builtin/bisect--helper.c:1214
06991777
JX
11293msgid "no log for BISECT_WRITE"
11294msgstr "BISECT_WRITE 无日志"
11295
7e6630a7 11296#: builtin/bisect--helper.c:1229
06991777
JX
11297msgid "--bisect-reset requires either no argument or a commit"
11298msgstr "--bisect-reset 无需参数或者需要一个提交"
11299
7e6630a7 11300#: builtin/bisect--helper.c:1234
06991777
JX
11301msgid "--bisect-terms requires 0 or 1 argument"
11302msgstr "--bisect-terms 需要 0 或 1 个参数"
11303
7e6630a7 11304#: builtin/bisect--helper.c:1243
d9488fea
JX
11305msgid "--bisect-next requires 0 arguments"
11306msgstr "--bisect-next 需要 0 个参数"
11307
7e6630a7 11308#: builtin/bisect--helper.c:1254
473eb541
JX
11309msgid "--bisect-log requires 0 arguments"
11310msgstr "--bisect-log 需要 0 个参数"
11311
7e6630a7 11312#: builtin/bisect--helper.c:1259
473eb541
JX
11313msgid "no logfile given"
11314msgstr "未提供日志文件"
d9488fea 11315
d9488fea 11316#: builtin/blame.c:32
7aea43ff
JX
11317msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
11318msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
ef317cd5 11319
d9488fea 11320#: builtin/blame.c:37
814ff314
JX
11321msgid "<rev-opts> are documented in git-rev-list(1)"
11322msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
ef317cd5 11323
7e6630a7 11324#: builtin/blame.c:406
fd8cb379
JX
11325#, c-format
11326msgid "expecting a color: %s"
11327msgstr "期望一个颜色:%s"
11328
7e6630a7 11329#: builtin/blame.c:413
fd8cb379
JX
11330msgid "must end with a color"
11331msgstr "必须以一个颜色结尾"
11332
7e6630a7 11333#: builtin/blame.c:724
fd8cb379
JX
11334#, c-format
11335msgid "invalid color '%s' in color.blame.repeatedLines"
11336msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
11337
7e6630a7 11338#: builtin/blame.c:742
fd8cb379
JX
11339msgid "invalid value for blame.coloring"
11340msgstr "设置 blame.coloring 中的无效取值"
11341
7e6630a7 11342#: builtin/blame.c:841
a6cd2cc4
JX
11343#, c-format
11344msgid "cannot find revision %s to ignore"
11345msgstr "不能找到要忽略的版本 %s"
11346
7e6630a7 11347#: builtin/blame.c:863
473eb541 11348msgid "show blame entries as we find them, incrementally"
07432cef 11349msgstr "增量式地显示发现的 blame 条目"
ef317cd5 11350
7e6630a7 11351#: builtin/blame.c:864
473eb541 11352msgid "do not show object names of boundary commits (Default: off)"
d9488fea 11353msgstr "不显示边界提交的对象名(默认:关闭)"
ef317cd5 11354
7e6630a7 11355#: builtin/blame.c:865
473eb541 11356msgid "do not treat root commits as boundaries (Default: off)"
07432cef 11357msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 11358
7e6630a7 11359#: builtin/blame.c:866
473eb541
JX
11360msgid "show work cost statistics"
11361msgstr "显示工作消耗统计"
ef317cd5 11362
7e6630a7
FZ
11363#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
11364#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
11365#: builtin/merge.c:298 builtin/multi-pack-index.c:103
11366#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
ffa14514 11367#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
7e6630a7 11368#: builtin/send-pack.c:202
473eb541
JX
11369msgid "force progress reporting"
11370msgstr "强制显示进度报告"
276ceeaa 11371
7e6630a7 11372#: builtin/blame.c:868
473eb541
JX
11373msgid "show output score for blame entries"
11374msgstr "显示 blame 条目的输出得分"
ef317cd5 11375
7e6630a7 11376#: builtin/blame.c:869
473eb541 11377msgid "show original filename (Default: auto)"
07432cef 11378msgstr "显示原始文件名(默认:自动)"
ef317cd5 11379
7e6630a7 11380#: builtin/blame.c:870
473eb541 11381msgid "show original linenumber (Default: off)"
07432cef 11382msgstr "显示原始的行号(默认:关闭)"
ef317cd5 11383
7e6630a7 11384#: builtin/blame.c:871
473eb541 11385msgid "show in a format designed for machine consumption"
07432cef 11386msgstr "显示为一个适合机器读取的格式"
ef317cd5 11387
7e6630a7 11388#: builtin/blame.c:872
473eb541 11389msgid "show porcelain format with per-line commit information"
07432cef 11390msgstr "为每一行显示机器适用的提交信息"
ef317cd5 11391
7e6630a7 11392#: builtin/blame.c:873
473eb541 11393msgid "use the same output mode as git-annotate (Default: off)"
07432cef 11394msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 11395
7e6630a7 11396#: builtin/blame.c:874
473eb541 11397msgid "show raw timestamp (Default: off)"
07432cef 11398msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 11399
7e6630a7 11400#: builtin/blame.c:875
473eb541 11401msgid "show long commit SHA1 (Default: off)"
4375c10e 11402msgstr "显示长的 SHA1 提交号(默认:关闭)"
ef317cd5 11403
7e6630a7 11404#: builtin/blame.c:876
473eb541 11405msgid "suppress author name and timestamp (Default: off)"
07432cef 11406msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 11407
7e6630a7 11408#: builtin/blame.c:877
473eb541 11409msgid "show author email instead of name (Default: off)"
07432cef 11410msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 11411
7e6630a7 11412#: builtin/blame.c:878
473eb541 11413msgid "ignore whitespace differences"
07432cef 11414msgstr "忽略空白差异"
ef317cd5 11415
7e6630a7 11416#: builtin/blame.c:879 builtin/log.c:1823
a6cd2cc4
JX
11417msgid "rev"
11418msgstr "版本"
11419
7e6630a7 11420#: builtin/blame.c:879
473eb541 11421msgid "ignore <rev> when blaming"
a6cd2cc4
JX
11422msgstr "在执行 blame 操作时忽略 <版本>"
11423
7e6630a7 11424#: builtin/blame.c:880
473eb541 11425msgid "ignore revisions from <file>"
a6cd2cc4
JX
11426msgstr "忽略来自 <文件> 中的版本"
11427
7e6630a7 11428#: builtin/blame.c:881
fd8cb379
JX
11429msgid "color redundant metadata from previous line differently"
11430msgstr "使用颜色间隔输出与前一行不同的重复元信息"
11431
7e6630a7 11432#: builtin/blame.c:882
fd8cb379
JX
11433msgid "color lines by age"
11434msgstr "依据时间着色"
11435
7e6630a7 11436#: builtin/blame.c:883
473eb541 11437msgid "spend extra cycles to find better match"
07432cef 11438msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 11439
7e6630a7 11440#: builtin/blame.c:884
473eb541 11441msgid "use revisions from <file> instead of calling git-rev-list"
d9d56b23 11442msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
ef317cd5 11443
7e6630a7 11444#: builtin/blame.c:885
473eb541
JX
11445msgid "use <file>'s contents as the final image"
11446msgstr "使用 <文件> 的内容作为最终的镜像"
ef317cd5 11447
7e6630a7 11448#: builtin/blame.c:886 builtin/blame.c:887
ef317cd5 11449msgid "score"
07432cef 11450msgstr "得分"
ef317cd5 11451
7e6630a7 11452#: builtin/blame.c:886
473eb541 11453msgid "find line copies within and across files"
07432cef 11454msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 11455
7e6630a7 11456#: builtin/blame.c:887
473eb541 11457msgid "find line movements within and across files"
07432cef 11458msgstr "找到文件内及跨文件的行移动"
ef317cd5 11459
7e6630a7 11460#: builtin/blame.c:888
d13389bf
JX
11461msgid "range"
11462msgstr "范围"
ef317cd5 11463
7e6630a7 11464#: builtin/blame.c:889
473eb541 11465msgid "process only line range <start>,<end> or function :<funcname>"
d13389bf 11466msgstr "只处理在 <开始>,<结束> 范围内的行,或者函数:<函数名>"
ef317cd5 11467
7e6630a7 11468#: builtin/blame.c:944
a0b6b246 11469msgid "--progress can't be used with --incremental or porcelain formats"
ec3d4607 11470msgstr "--progress 不能和 --incremental 或机器内部格式一起使用"
a0b6b246 11471
a4f16749
JX
11472#. TRANSLATORS: This string is used to tell us the
11473#. maximum display width for a relative timestamp in
11474#. "git blame" output. For C locale, "4 years, 11
11475#. months ago", which takes 22 places, is the longest
11476#. among various forms of relative timestamps, but
11477#. your language may need more or fewer display
11478#. columns.
11479#.
7e6630a7 11480#: builtin/blame.c:995
6c94aba5
JX
11481msgid "4 years, 11 months ago"
11482msgstr "4 年 11 个月前"
11483
7e6630a7 11484#: builtin/blame.c:1111
a0b6b246
JX
11485#, c-format
11486msgid "file %s has only %lu line"
11487msgid_plural "file %s has only %lu lines"
11488msgstr[0] "文件 %s 只有 %lu 行"
11489msgstr[1] "文件 %s 只有 %lu 行"
11490
7e6630a7 11491#: builtin/blame.c:1156
a4f16749
JX
11492msgid "Blaming lines"
11493msgstr "追踪代码行"
11494
4c27fcb5 11495#: builtin/branch.c:29
d9488fea
JX
11496msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
11497msgstr "git branch [<选项>] [-r | -a] [--merged] [--no-merged]"
ef317cd5 11498
4c27fcb5 11499#: builtin/branch.c:30
814ff314
JX
11500msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
11501msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 11502
4c27fcb5 11503#: builtin/branch.c:31
814ff314
JX
11504msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
11505msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
ef317cd5 11506
4c27fcb5 11507#: builtin/branch.c:32
814ff314
JX
11508msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
11509msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 11510
4c27fcb5 11511#: builtin/branch.c:33
6937cb4e
JX
11512msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
11513msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
11514
4c27fcb5 11515#: builtin/branch.c:34
94550ed3
JX
11516msgid "git branch [<options>] [-r | -a] [--points-at]"
11517msgstr "git branch [<选项>] [-r | -a] [--points-at]"
11518
4c27fcb5 11519#: builtin/branch.c:35
87cb7997
JX
11520msgid "git branch [<options>] [-r | -a] [--format]"
11521msgstr "git branch [<选项>] [-r | -a] [--format]"
11522
90e6ef53 11523# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
a6cd2cc4 11524#: builtin/branch.c:154
c04f5ac3
JX
11525#, c-format
11526msgid ""
11527"deleting branch '%s' that has been merged to\n"
11528" '%s', but not yet merged to HEAD."
11529msgstr ""
70fc47bf 11530"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
11531" '%s',但未合并到 HEAD。"
11532
90e6ef53 11533# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
a6cd2cc4 11534#: builtin/branch.c:158
c04f5ac3
JX
11535#, c-format
11536msgid ""
11537"not deleting branch '%s' that is not yet merged to\n"
11538" '%s', even though it is merged to HEAD."
11539msgstr ""
70fc47bf
T
11540"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
11541" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 11542
a6cd2cc4 11543#: builtin/branch.c:172
07432cef
WS
11544#, c-format
11545msgid "Couldn't look up commit object for '%s'"
11546msgstr "无法查询 '%s' 指向的提交对象"
11547
a6cd2cc4 11548#: builtin/branch.c:176
07432cef
WS
11549#, c-format
11550msgid ""
11551"The branch '%s' is not fully merged.\n"
11552"If you are sure you want to delete it, run 'git branch -D %s'."
11553msgstr ""
11554"分支 '%s' 没有完全合并。\n"
11555"如果您确认要删除它,执行 'git branch -D %s'。"
11556
a6cd2cc4 11557#: builtin/branch.c:189
07432cef 11558msgid "Update of config-file failed"
6937cb4e 11559msgstr "更新配置文件失败"
07432cef 11560
473eb541 11561#: builtin/branch.c:223
c04f5ac3 11562msgid "cannot use -a with -d"
649900bc 11563msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 11564
473eb541 11565#: builtin/branch.c:230
c04f5ac3
JX
11566msgid "Couldn't look up commit object for HEAD"
11567msgstr "无法查询 HEAD 指向的提交对象"
11568
473eb541 11569#: builtin/branch.c:244
c04f5ac3 11570#, c-format
5b04ee3b
JX
11571msgid "Cannot delete branch '%s' checked out at '%s'"
11572msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
c04f5ac3 11573
473eb541 11574#: builtin/branch.c:259
5ae481e0 11575#, c-format
7aea43ff
JX
11576msgid "remote-tracking branch '%s' not found."
11577msgstr "未能找到远程跟踪分支 '%s'。"
c04f5ac3 11578
473eb541 11579#: builtin/branch.c:260
81809b99 11580#, c-format
8ada9598 11581msgid "branch '%s' not found."
81809b99 11582msgstr "分支 '%s' 未发现。"
8ada9598 11583
473eb541 11584#: builtin/branch.c:291
81809b99 11585#, c-format
7aea43ff
JX
11586msgid "Deleted remote-tracking branch %s (was %s).\n"
11587msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
c04f5ac3 11588
473eb541 11589#: builtin/branch.c:292
81809b99 11590#, c-format
8ada9598 11591msgid "Deleted branch %s (was %s).\n"
81809b99 11592msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 11593
7e6630a7 11594#: builtin/branch.c:441 builtin/tag.c:63
6937cb4e
JX
11595msgid "unable to parse format string"
11596msgstr "不能解析格式化字符串"
11597
7e6630a7 11598#: builtin/branch.c:472
d46c5519
JX
11599msgid "could not resolve HEAD"
11600msgstr "不能解析 HEAD 提交"
11601
7e6630a7 11602#: builtin/branch.c:478
5b04ee3b 11603#, c-format
d46c5519
JX
11604msgid "HEAD (%s) points outside of refs/heads/"
11605msgstr "HEAD (%s) 指向 refs/heads/ 之外"
11606
7e6630a7 11607#: builtin/branch.c:493
d46c5519 11608#, c-format
5b04ee3b
JX
11609msgid "Branch %s is being rebased at %s"
11610msgstr "分支 %s 正被变基到 %s"
11611
7e6630a7 11612#: builtin/branch.c:497
5b04ee3b
JX
11613#, c-format
11614msgid "Branch %s is being bisected at %s"
11615msgstr "分支 %s 正被二分查找于 %s"
11616
7e6630a7 11617#: builtin/branch.c:514
6937cb4e
JX
11618msgid "cannot copy the current branch while not on any."
11619msgstr "无法拷贝当前分支因为不处于任何分支上。"
11620
7e6630a7 11621#: builtin/branch.c:516
c04f5ac3 11622msgid "cannot rename the current branch while not on any."
90e6ef53 11623msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 11624
7e6630a7 11625#: builtin/branch.c:527
c04f5ac3
JX
11626#, c-format
11627msgid "Invalid branch name: '%s'"
11628msgstr "无效的分支名:'%s'"
11629
7e6630a7 11630#: builtin/branch.c:556
c04f5ac3
JX
11631msgid "Branch rename failed"
11632msgstr "分支重命名失败"
11633
7e6630a7 11634#: builtin/branch.c:558
6937cb4e
JX
11635msgid "Branch copy failed"
11636msgstr "分支拷贝失败"
11637
7e6630a7 11638#: builtin/branch.c:562
6937cb4e 11639#, c-format
5809aa05
JX
11640msgid "Created a copy of a misnamed branch '%s'"
11641msgstr "已为错误命名的分支 '%s' 创建了一个副本"
6937cb4e 11642
7e6630a7 11643#: builtin/branch.c:565
c04f5ac3
JX
11644#, c-format
11645msgid "Renamed a misnamed branch '%s' away"
6937cb4e 11646msgstr "已将错误命名的分支 '%s' 重命名"
c04f5ac3 11647
7e6630a7 11648#: builtin/branch.c:571
c04f5ac3
JX
11649#, c-format
11650msgid "Branch renamed to %s, but HEAD is not updated!"
11651msgstr "分支重命名为 %s,但 HEAD 没有更新!"
11652
7e6630a7 11653#: builtin/branch.c:580
c04f5ac3 11654msgid "Branch is renamed, but update of config-file failed"
6937cb4e
JX
11655msgstr "分支被重命名,但更新配置文件失败"
11656
7e6630a7 11657#: builtin/branch.c:582
6937cb4e
JX
11658msgid "Branch is copied, but update of config-file failed"
11659msgstr "分支已拷贝,但更新配置文件失败"
c04f5ac3 11660
7e6630a7 11661#: builtin/branch.c:598
5c57d762
JX
11662#, c-format
11663msgid ""
11664"Please edit the description for the branch\n"
11665" %s\n"
11666"Lines starting with '%c' will be stripped.\n"
11667msgstr ""
11668"请编辑分支的描述\n"
11669" %s\n"
11670"以 '%c' 开头的行将被过滤。\n"
c04f5ac3 11671
7e6630a7 11672#: builtin/branch.c:632
ef317cd5 11673msgid "Generic options"
07432cef 11674msgstr "通用选项"
c04f5ac3 11675
7e6630a7 11676#: builtin/branch.c:634
ef317cd5 11677msgid "show hash and subject, give twice for upstream branch"
07432cef 11678msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 11679
7e6630a7 11680#: builtin/branch.c:635
ef317cd5 11681msgid "suppress informational messages"
07432cef 11682msgstr "不显示信息"
8ada9598 11683
7e6630a7 11684#: builtin/branch.c:636
ef317cd5 11685msgid "set up tracking mode (see git-pull(1))"
07432cef 11686msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 11687
7e6630a7 11688#: builtin/branch.c:638
6937cb4e
JX
11689msgid "do not use"
11690msgstr "不要使用"
c04f5ac3 11691
7e6630a7 11692#: builtin/branch.c:640
5b04ee3b
JX
11693msgid "upstream"
11694msgstr "上游"
11695
7e6630a7 11696#: builtin/branch.c:640
5b04ee3b
JX
11697msgid "change the upstream info"
11698msgstr "改变上游信息"
11699
7e6630a7 11700#: builtin/branch.c:641
ddc12c42 11701msgid "unset the upstream info"
a0b6b246
JX
11702msgstr "取消上游信息的设置"
11703
7e6630a7 11704#: builtin/branch.c:642
ef317cd5 11705msgid "use colored output"
07432cef 11706msgstr "使用彩色输出"
c04f5ac3 11707
7e6630a7 11708#: builtin/branch.c:643
ef317cd5 11709msgid "act on remote-tracking branches"
07432cef 11710msgstr "作用于远程跟踪分支"
c04f5ac3 11711
7e6630a7 11712#: builtin/branch.c:645 builtin/branch.c:647
ef317cd5 11713msgid "print only branches that contain the commit"
07432cef 11714msgstr "只打印包含该提交的分支"
c04f5ac3 11715
7e6630a7 11716#: builtin/branch.c:646 builtin/branch.c:648
87cb7997
JX
11717msgid "print only branches that don't contain the commit"
11718msgstr "只打印不包含该提交的分支"
11719
7e6630a7 11720#: builtin/branch.c:651
ef317cd5 11721msgid "Specific git-branch actions:"
07432cef 11722msgstr "具体的 git-branch 动作:"
c04f5ac3 11723
7e6630a7 11724#: builtin/branch.c:652
ef317cd5 11725msgid "list both remote-tracking and local branches"
07432cef 11726msgstr "列出远程跟踪及本地分支"
c04f5ac3 11727
7e6630a7 11728#: builtin/branch.c:654
ef317cd5 11729msgid "delete fully merged branch"
07432cef 11730msgstr "删除完全合并的分支"
c04f5ac3 11731
7e6630a7 11732#: builtin/branch.c:655
ef317cd5 11733msgid "delete branch (even if not merged)"
07432cef 11734msgstr "删除分支(即使没有合并)"
c04f5ac3 11735
7e6630a7 11736#: builtin/branch.c:656
ef317cd5 11737msgid "move/rename a branch and its reflog"
07432cef 11738msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 11739
7e6630a7 11740#: builtin/branch.c:657
ef317cd5 11741msgid "move/rename a branch, even if target exists"
07432cef 11742msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 11743
7e6630a7 11744#: builtin/branch.c:658
6937cb4e
JX
11745msgid "copy a branch and its reflog"
11746msgstr "拷贝一个分支和它的引用日志"
11747
7e6630a7 11748#: builtin/branch.c:659
6937cb4e
JX
11749msgid "copy a branch, even if target exists"
11750msgstr "拷贝一个分支,即使目标已存在"
11751
7e6630a7 11752#: builtin/branch.c:660
ef317cd5 11753msgid "list branch names"
07432cef 11754msgstr "列出分支名"
c04f5ac3 11755
7e6630a7 11756#: builtin/branch.c:661
d46c5519
JX
11757msgid "show current branch name"
11758msgstr "显示当前分支名"
11759
7e6630a7 11760#: builtin/branch.c:662
ef317cd5 11761msgid "create the branch's reflog"
07432cef 11762msgstr "创建分支的引用日志"
ef317cd5 11763
7e6630a7 11764#: builtin/branch.c:664
ef317cd5 11765msgid "edit the description for the branch"
07432cef 11766msgstr "标记分支的描述"
ef317cd5 11767
7e6630a7 11768#: builtin/branch.c:665
04cb2f28
JX
11769msgid "force creation, move/rename, deletion"
11770msgstr "强制创建、移动/重命名、删除"
ef317cd5 11771
7e6630a7 11772#: builtin/branch.c:666
94550ed3
JX
11773msgid "print only branches that are merged"
11774msgstr "只打印已经合并的分支"
ef317cd5 11775
7e6630a7 11776#: builtin/branch.c:667
94550ed3
JX
11777msgid "print only branches that are not merged"
11778msgstr "只打印尚未合并的分支"
ef317cd5 11779
7e6630a7 11780#: builtin/branch.c:668
ef317cd5 11781msgid "list branches in columns"
07432cef 11782msgstr "以列的方式显示分支"
ef317cd5 11783
7e6630a7
FZ
11784#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
11785#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
11786#: builtin/tag.c:475
94550ed3
JX
11787msgid "object"
11788msgstr "对象"
11789
7e6630a7 11790#: builtin/branch.c:671
94550ed3
JX
11791msgid "print only branches of the object"
11792msgstr "只打印指向该对象的分支"
11793
7e6630a7 11794#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
1a79b2f1
JX
11795msgid "sorting and filtering are case insensitive"
11796msgstr "排序和过滤属于大小写不敏感"
11797
7e6630a7 11798#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
a6cd2cc4 11799#: builtin/verify-tag.c:38
87cb7997
JX
11800msgid "format to use for the output"
11801msgstr "输出格式"
11802
7e6630a7 11803#: builtin/branch.c:696 builtin/clone.c:678
c04f5ac3 11804msgid "HEAD not found below refs/heads!"
90e6ef53 11805msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 11806
7e6630a7 11807#: builtin/branch.c:720
8ada9598 11808msgid "--column and --verbose are incompatible"
81809b99 11809msgstr "--column 和 --verbose 不兼容"
8ada9598 11810
7e6630a7 11811#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
a77c07d9
JX
11812msgid "branch name required"
11813msgstr "必须提供分支名"
11814
7e6630a7 11815#: builtin/branch.c:768
a77c07d9
JX
11816msgid "Cannot give description to detached HEAD"
11817msgstr "不能向分离头指针提供描述"
11818
7e6630a7 11819#: builtin/branch.c:773
a77c07d9
JX
11820msgid "cannot edit description of more than one branch"
11821msgstr "不能为一个以上的分支编辑描述"
11822
7e6630a7 11823#: builtin/branch.c:780
a77c07d9
JX
11824#, c-format
11825msgid "No commit on branch '%s' yet."
11826msgstr "分支 '%s' 尚无提交。"
11827
7e6630a7 11828#: builtin/branch.c:783
a77c07d9
JX
11829#, c-format
11830msgid "No branch named '%s'."
11831msgstr "没有分支 '%s'。"
11832
7e6630a7 11833#: builtin/branch.c:798
6937cb4e
JX
11834msgid "too many branches for a copy operation"
11835msgstr "为拷贝操作提供了太多的分支名"
a77c07d9 11836
7e6630a7 11837#: builtin/branch.c:807
6937cb4e
JX
11838msgid "too many arguments for a rename operation"
11839msgstr "为重命名操作提供了太多的参数"
1003b3a5 11840
7e6630a7 11841#: builtin/branch.c:812
6937cb4e
JX
11842msgid "too many arguments to set new upstream"
11843msgstr "为设置新上游提供了太多的参数"
11844
7e6630a7 11845#: builtin/branch.c:816
1003b3a5
JX
11846#, c-format
11847msgid ""
11848"could not set upstream of HEAD to %s when it does not point to any branch."
11849msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
11850
7e6630a7 11851#: builtin/branch.c:819 builtin/branch.c:842
1003b3a5
JX
11852#, c-format
11853msgid "no such branch '%s'"
11854msgstr "没有此分支 '%s'"
11855
7e6630a7 11856#: builtin/branch.c:823
07432cef 11857#, c-format
ef317cd5 11858msgid "branch '%s' does not exist"
07432cef 11859msgstr "分支 '%s' 不存在"
ef317cd5 11860
7e6630a7 11861#: builtin/branch.c:836
6937cb4e
JX
11862msgid "too many arguments to unset upstream"
11863msgstr "为取消上游设置操作提供了太多的参数"
1003b3a5 11864
7e6630a7 11865#: builtin/branch.c:840
1003b3a5
JX
11866msgid "could not unset upstream of HEAD when it does not point to any branch."
11867msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
11868
7e6630a7 11869#: builtin/branch.c:846
ef317cd5
JX
11870#, c-format
11871msgid "Branch '%s' has no upstream information"
07432cef 11872msgstr "分支 '%s' 没有上游信息"
ef317cd5 11873
7e6630a7 11874#: builtin/branch.c:856
a6cd2cc4
JX
11875msgid ""
11876"The -a, and -r, options to 'git branch' do not take a branch name.\n"
11877"Did you mean to use: -a|-r --list <pattern>?"
11878msgstr ""
11879"'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
11880"您是否想要使用:-a|-r --list <模式>?"
c04f5ac3 11881
7e6630a7 11882#: builtin/branch.c:860
ddc12c42
JX
11883msgid ""
11884"the '--set-upstream' option is no longer supported. Please use '--track' or "
11885"'--set-upstream-to' instead."
11886msgstr ""
11887"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
11888
7e6630a7 11889#: builtin/bugreport.c:16
d9488fea
JX
11890msgid "git version:\n"
11891msgstr "git 版本:\n"
11892
7e6630a7 11893#: builtin/bugreport.c:22
d9488fea
JX
11894#, c-format
11895msgid "uname() failed with error '%s' (%d)\n"
11896msgstr "uname() 失败,错误为 '%s'(%d)\n"
11897
7e6630a7 11898#: builtin/bugreport.c:32
d9488fea
JX
11899msgid "compiler info: "
11900msgstr "编译器信息:"
11901
7e6630a7 11902#: builtin/bugreport.c:35
d9488fea
JX
11903msgid "libc info: "
11904msgstr "libc 信息:"
11905
7e6630a7 11906#: builtin/bugreport.c:49
d9488fea
JX
11907msgid "not run from a git repository - no hooks to show\n"
11908msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n"
11909
7e6630a7 11910#: builtin/bugreport.c:62
d9488fea
JX
11911msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
11912msgstr "git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>]"
11913
7e6630a7 11914#: builtin/bugreport.c:69
d9488fea
JX
11915msgid ""
11916"Thank you for filling out a Git bug report!\n"
11917"Please answer the following questions to help us understand your issue.\n"
11918"\n"
11919"What did you do before the bug happened? (Steps to reproduce your issue)\n"
11920"\n"
11921"What did you expect to happen? (Expected behavior)\n"
11922"\n"
11923"What happened instead? (Actual behavior)\n"
11924"\n"
11925"What's different between what you expected and what actually happened?\n"
11926"\n"
11927"Anything else you want to add:\n"
11928"\n"
11929"Please review the rest of the bug report below.\n"
11930"You can delete any lines you don't wish to share.\n"
11931msgstr ""
11932"感谢您填写 Git 错误报告!\n"
11933"请填写以下问卷,以帮助我们了解您的问题。\n"
11934"\n"
11935"在错误发生之前,您做了什么?(重现问题的步骤)\n"
11936"\n"
11937"您期望发生什么?(预期行为)\n"
11938"\n"
11939"实际发生了什么?(实际行为)\n"
11940"\n"
11941"您所期望的与实际发生的有什么不同?\n"
11942"\n"
11943"您想要补充的其它内容:\n"
11944"\n"
11945"请检查下面错误报告中余下的内容。\n"
11946"您可以删除任何您不想共享的内容。\n"
11947
7e6630a7 11948#: builtin/bugreport.c:108
d9488fea
JX
11949msgid "specify a destination for the bugreport file"
11950msgstr "指定错误报告文件的目标位置"
11951
7e6630a7 11952#: builtin/bugreport.c:110
d9488fea
JX
11953msgid "specify a strftime format suffix for the filename"
11954msgstr "指定文件的 strftime 格式后缀"
11955
7e6630a7 11956#: builtin/bugreport.c:132
d9488fea
JX
11957#, c-format
11958msgid "could not create leading directories for '%s'"
11959msgstr "不能为 '%s' 创建先导目录"
11960
7e6630a7 11961#: builtin/bugreport.c:139
d9488fea
JX
11962msgid "System Info"
11963msgstr "系统信息"
11964
7e6630a7 11965#: builtin/bugreport.c:142
d9488fea
JX
11966msgid "Enabled Hooks"
11967msgstr "启用的钩子"
11968
7e6630a7 11969#: builtin/bugreport.c:149
d9488fea
JX
11970#, c-format
11971msgid "unable to write to %s"
11972msgstr "无法写入 %s"
11973
7e6630a7 11974#: builtin/bugreport.c:159
d9488fea
JX
11975#, c-format
11976msgid "Created new report at '%s'.\n"
11977msgstr "在 '%s' 创建了新报告。\n"
11978
ddc12c42
JX
11979#: builtin/bundle.c:15 builtin/bundle.c:23
11980msgid "git bundle create [<options>] <file> <git-rev-list args>"
11981msgstr "git bundle create [<选项>] <文件> <git-rev-list 参数>"
11982
11983#: builtin/bundle.c:16 builtin/bundle.c:28
11984msgid "git bundle verify [<options>] <file>"
11985msgstr "git bundle verify [<选项>] <文件>"
11986
11987#: builtin/bundle.c:17 builtin/bundle.c:33
11988msgid "git bundle list-heads <file> [<refname>...]"
11989msgstr "git bundle list-heads <文件> [<引用名>...]"
11990
11991#: builtin/bundle.c:18 builtin/bundle.c:38
11992msgid "git bundle unbundle <file> [<refname>...]"
11993msgstr "git bundle unbundle <文件> [<引用名>...]"
11994
7e6630a7 11995#: builtin/bundle.c:65 builtin/pack-objects.c:3876
ddc12c42
JX
11996msgid "do not show progress meter"
11997msgstr "不显示进度表"
11998
7e6630a7 11999#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
ddc12c42
JX
12000msgid "show progress meter"
12001msgstr "显示进度表"
12002
7e6630a7 12003#: builtin/bundle.c:69 builtin/pack-objects.c:3880
ddc12c42
JX
12004msgid "show progress meter during object writing phase"
12005msgstr "在对象写入阶段显示进度表"
12006
7e6630a7 12007#: builtin/bundle.c:72 builtin/pack-objects.c:3883
ddc12c42
JX
12008msgid "similar to --all-progress when progress meter is shown"
12009msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 12010
7e6630a7 12011#: builtin/bundle.c:74
d9488fea
JX
12012msgid "specify bundle format version"
12013msgstr "指定归档包的格式版本"
12014
7e6630a7 12015#: builtin/bundle.c:94
ddc12c42 12016msgid "Need a repository to create a bundle."
d9488fea 12017msgstr "需要一个仓库来创建归档包。"
ddc12c42 12018
7e6630a7 12019#: builtin/bundle.c:107
ddc12c42 12020msgid "do not show bundle details"
d9488fea 12021msgstr "不显示归档包的细节"
ddc12c42 12022
7e6630a7 12023#: builtin/bundle.c:126
c04f5ac3
JX
12024#, c-format
12025msgid "%s is okay\n"
12026msgstr "%s 可以\n"
12027
7e6630a7 12028#: builtin/bundle.c:182
c04f5ac3 12029msgid "Need a repository to unbundle."
d9488fea 12030msgstr "需要一个仓库来解开归档包。"
c04f5ac3 12031
7e6630a7
FZ
12032#: builtin/bundle.c:185
12033msgid "Unbundling objects"
12034msgstr "解包对象中"
ddc12c42 12035
7e6630a7 12036#: builtin/bundle.c:219 builtin/remote.c:1733
ddc12c42
JX
12037#, c-format
12038msgid "Unknown subcommand: %s"
12039msgstr "未知子命令:%s"
12040
7e6630a7 12041#: builtin/cat-file.c:622
7aea43ff 12042msgid ""
a0b6b246
JX
12043"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
12044"p | <type> | --textconv | --filters) [--path=<path>] <object>"
275588f9
JX
12045msgstr ""
12046"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
12047"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
ef317cd5 12048
7e6630a7 12049#: builtin/cat-file.c:623
a0b6b246 12050msgid ""
7157c2b5
JX
12051"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
12052"symlinks] [--textconv | --filters]"
d9488fea
JX
12053msgstr ""
12054"git cat-file (--batch[=<格式>] | --batch-check[=<格式>]) [--follow-symlinks] "
12055"[--textconv | --filters]"
ef317cd5 12056
7e6630a7 12057#: builtin/cat-file.c:644
4c27fcb5
JX
12058msgid "only one batch option may be specified"
12059msgstr "只能指定一个批处理选项"
12060
7e6630a7 12061#: builtin/cat-file.c:662
ef317cd5 12062msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 12063msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 12064
7e6630a7 12065#: builtin/cat-file.c:663
ef317cd5 12066msgid "show object type"
07432cef 12067msgstr "显示对象类型"
ef317cd5 12068
7e6630a7 12069#: builtin/cat-file.c:664
ef317cd5 12070msgid "show object size"
07432cef 12071msgstr "显示对象大小"
ef317cd5 12072
7e6630a7 12073#: builtin/cat-file.c:666
ef317cd5 12074msgid "exit with zero when there's no error"
07432cef 12075msgstr "当没有错误时退出并返回零"
ef317cd5 12076
7e6630a7 12077#: builtin/cat-file.c:667
ef317cd5 12078msgid "pretty-print object's content"
07432cef 12079msgstr "美观地打印对象的内容"
ef317cd5 12080
7e6630a7 12081#: builtin/cat-file.c:669
ef317cd5 12082msgid "for blob objects, run textconv on object's content"
a0b6b246
JX
12083msgstr "对于数据对象,对其内容做文本转换"
12084
7e6630a7 12085#: builtin/cat-file.c:671
a0b6b246
JX
12086msgid "for blob objects, run filters on object's content"
12087msgstr "对于数据对象,对其内容做过滤"
12088
7e6630a7 12089#: builtin/cat-file.c:672
a0b6b246
JX
12090msgid "blob"
12091msgstr "数据对象"
12092
7e6630a7 12093#: builtin/cat-file.c:673
a0b6b246
JX
12094msgid "use a specific path for --textconv/--filters"
12095msgstr "对于 --textconv/--filters 使用一个特定的路径"
ef317cd5 12096
7e6630a7 12097#: builtin/cat-file.c:675
7aea43ff
JX
12098msgid "allow -s and -t to work with broken/corrupt objects"
12099msgstr "允许 -s 和 -t 对损坏的对象生效"
12100
7e6630a7 12101#: builtin/cat-file.c:676
1b7f4a34
JX
12102msgid "buffer --batch output"
12103msgstr "缓冲 --batch 的输出"
12104
7e6630a7 12105#: builtin/cat-file.c:678
ef317cd5 12106msgid "show info and content of objects fed from the standard input"
07432cef 12107msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 12108
7e6630a7 12109#: builtin/cat-file.c:682
ef317cd5 12110msgid "show info about objects fed from the standard input"
07432cef 12111msgstr "显示从标准输入提供的对象的信息"
ef317cd5 12112
7e6630a7 12113#: builtin/cat-file.c:686
7aea43ff
JX
12114msgid "follow in-tree symlinks (used with --batch or --batch-check)"
12115msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
12116
7e6630a7 12117#: builtin/cat-file.c:688
1b7f4a34
JX
12118msgid "show all objects with --batch or --batch-check"
12119msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
12120
7e6630a7 12121#: builtin/cat-file.c:690
c1ac5258
JX
12122msgid "do not order --batch-all-objects output"
12123msgstr "不要对 --batch-all-objects 的输出排序"
12124
06991777 12125#: builtin/check-attr.c:13
814ff314
JX
12126msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
12127msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
ef317cd5 12128
06991777 12129#: builtin/check-attr.c:14
94550ed3
JX
12130msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
12131msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
ef317cd5 12132
06991777 12133#: builtin/check-attr.c:21
ef317cd5 12134msgid "report all attributes set on file"
07432cef 12135msgstr "报告设置在文件上的所有属性"
ef317cd5 12136
06991777 12137#: builtin/check-attr.c:22
ef317cd5 12138msgid "use .gitattributes only from the index"
07432cef 12139msgstr "只使用索引中的 .gitattributes"
ef317cd5 12140
7e6630a7 12141#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
ef317cd5 12142msgid "read file names from stdin"
07432cef 12143msgstr "从标准输入读出文件名"
ef317cd5 12144
06991777 12145#: builtin/check-attr.c:25 builtin/check-ignore.c:27
90314792
JX
12146msgid "terminate input and output records by a NUL character"
12147msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 12148
7e6630a7
FZ
12149#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
12150#: builtin/worktree.c:494
a77c07d9
JX
12151msgid "suppress progress reporting"
12152msgstr "不显示进度报告"
12153
06991777 12154#: builtin/check-ignore.c:29
2e8451e8
JX
12155msgid "show non-matching input paths"
12156msgstr "显示未匹配的输入路径"
12157
06991777 12158#: builtin/check-ignore.c:31
90314792
JX
12159msgid "ignore index when checking"
12160msgstr "检查时忽略索引"
12161
33b62fba 12162#: builtin/check-ignore.c:165
a77c07d9 12163msgid "cannot specify pathnames with --stdin"
1b7f4a34 12164msgstr "不能同时指定路径及 --stdin 参数"
a77c07d9 12165
33b62fba 12166#: builtin/check-ignore.c:168
a77c07d9
JX
12167msgid "-z only makes sense with --stdin"
12168msgstr "-z 需要和 --stdin 参数共用才有意义"
12169
33b62fba 12170#: builtin/check-ignore.c:170
a77c07d9
JX
12171msgid "no path specified"
12172msgstr "未指定路径"
12173
33b62fba 12174#: builtin/check-ignore.c:174
a77c07d9
JX
12175msgid "--quiet is only valid with a single pathname"
12176msgstr "参数 --quiet 只在提供一个路径名时有效"
12177
33b62fba 12178#: builtin/check-ignore.c:176
a77c07d9
JX
12179msgid "cannot have both --quiet and --verbose"
12180msgstr "不能同时提供 --quiet 和 --verbose 参数"
12181
33b62fba 12182#: builtin/check-ignore.c:179
2e8451e8
JX
12183msgid "--non-matching is only valid with --verbose"
12184msgstr "--non-matching 选项只在使用 --verbose 时有效"
12185
a4f16749 12186#: builtin/check-mailmap.c:9
814ff314
JX
12187msgid "git check-mailmap [<options>] <contact>..."
12188msgstr "git check-mailmap [<选项>] <联系地址>..."
2e8451e8 12189
a4f16749 12190#: builtin/check-mailmap.c:14
2e8451e8
JX
12191msgid "also read contacts from stdin"
12192msgstr "还从标准输入读取联系地址"
12193
a4f16749 12194#: builtin/check-mailmap.c:25
2e8451e8
JX
12195#, c-format
12196msgid "unable to parse contact: %s"
12197msgstr "不能解析联系地址:%s"
12198
a4f16749 12199#: builtin/check-mailmap.c:48
2e8451e8
JX
12200msgid "no contacts specified"
12201msgstr "未指定联系地址"
12202
33b62fba
JX
12203#: builtin/checkout--worker.c:110
12204msgid "git checkout--worker [<options>]"
12205msgstr "git checkout--worker [<选项>]"
12206
12207#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
7e6630a7
FZ
12208#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
12209#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
12210#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
12211#: builtin/worktree.c:492 builtin/worktree.c:729
33b62fba
JX
12212msgid "string"
12213msgstr "字符串"
12214
12215#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
12216msgid "when creating files, prepend <string>"
12217msgstr "在创建文件时,在前面加上 <字符串>"
12218
473eb541 12219#: builtin/checkout-index.c:152
814ff314
JX
12220msgid "git checkout-index [<options>] [--] [<file>...]"
12221msgstr "git checkout-index [<选项>] [--] [<文件>...]"
ef317cd5 12222
473eb541 12223#: builtin/checkout-index.c:169
276ceeaa
JX
12224msgid "stage should be between 1 and 3 or all"
12225msgstr "索引值应该取值 1 到 3 或者 all"
12226
33b62fba 12227#: builtin/checkout-index.c:187
ef317cd5 12228msgid "check out all files in the index"
07432cef 12229msgstr "检出索引区的所有文件"
ef317cd5 12230
33b62fba 12231#: builtin/checkout-index.c:188
ef317cd5 12232msgid "force overwrite of existing files"
07432cef 12233msgstr "强制覆盖现有的文件"
ef317cd5 12234
33b62fba 12235#: builtin/checkout-index.c:190
ef317cd5 12236msgid "no warning for existing files and files not in index"
07432cef 12237msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 12238
33b62fba 12239#: builtin/checkout-index.c:192
ef317cd5 12240msgid "don't checkout new files"
07432cef 12241msgstr "不检出新文件"
ef317cd5 12242
33b62fba 12243#: builtin/checkout-index.c:194
ef317cd5 12244msgid "update stat information in the index file"
07432cef 12245msgstr "更新索引中文件的状态信息"
ef317cd5 12246
33b62fba 12247#: builtin/checkout-index.c:198
ef317cd5 12248msgid "read list of paths from the standard input"
07432cef 12249msgstr "从标准输入读取路径列表"
ef317cd5 12250
33b62fba 12251#: builtin/checkout-index.c:200
ef317cd5 12252msgid "write the content to temporary files"
07432cef 12253msgstr "将内容写入临时文件"
ef317cd5 12254
33b62fba 12255#: builtin/checkout-index.c:204
ef317cd5 12256msgid "copy out the files from named stage"
07432cef 12257msgstr "从指定暂存区中拷出文件"
ef317cd5 12258
33b62fba 12259#: builtin/checkout.c:33
814ff314
JX
12260msgid "git checkout [<options>] <branch>"
12261msgstr "git checkout [<选项>] <分支>"
ef317cd5 12262
33b62fba 12263#: builtin/checkout.c:34
814ff314
JX
12264msgid "git checkout [<options>] [<branch>] -- <file>..."
12265msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
ef317cd5 12266
33b62fba 12267#: builtin/checkout.c:39
a6cd2cc4
JX
12268msgid "git switch [<options>] [<branch>]"
12269msgstr "git switch [<选项>] [<分支>]"
12270
33b62fba 12271#: builtin/checkout.c:44
a6cd2cc4
JX
12272msgid "git restore [<options>] [--source=<branch>] <file>..."
12273msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
12274
33b62fba 12275#: builtin/checkout.c:190 builtin/checkout.c:229
c04f5ac3
JX
12276#, c-format
12277msgid "path '%s' does not have our version"
12278msgstr "路径 '%s' 没有我们的版本"
12279
33b62fba 12280#: builtin/checkout.c:192 builtin/checkout.c:231
c04f5ac3
JX
12281#, c-format
12282msgid "path '%s' does not have their version"
12283msgstr "路径 '%s' 没有他们的版本"
12284
33b62fba 12285#: builtin/checkout.c:208
c04f5ac3
JX
12286#, c-format
12287msgid "path '%s' does not have all necessary versions"
e640d114 12288msgstr "路径 '%s' 没有全部必需的版本"
c04f5ac3 12289
33b62fba 12290#: builtin/checkout.c:261
c04f5ac3
JX
12291#, c-format
12292msgid "path '%s' does not have necessary versions"
e640d114 12293msgstr "路径 '%s' 没有必需的版本"
c04f5ac3 12294
33b62fba 12295#: builtin/checkout.c:278
c04f5ac3
JX
12296#, c-format
12297msgid "path '%s': cannot merge"
90e6ef53 12298msgstr "path '%s':无法合并"
c04f5ac3 12299
33b62fba 12300#: builtin/checkout.c:294
c04f5ac3
JX
12301#, c-format
12302msgid "Unable to add merge result for '%s'"
12303msgstr "无法为 '%s' 添加合并结果"
12304
ec3d4607 12305#: builtin/checkout.c:411
a6cd2cc4
JX
12306#, c-format
12307msgid "Recreated %d merge conflict"
12308msgid_plural "Recreated %d merge conflicts"
12309msgstr[0] "重新创建了 %d 个合并冲突"
12310msgstr[1] "重新创建了 %d 个合并冲突"
12311
ec3d4607 12312#: builtin/checkout.c:416
a6cd2cc4
JX
12313#, c-format
12314msgid "Updated %d path from %s"
12315msgid_plural "Updated %d paths from %s"
12316msgstr[0] "从 %2$s 更新了 %1$d 个路径"
12317msgstr[1] "从 %2$s 更新了 %1$d 个路径"
12318
ec3d4607 12319#: builtin/checkout.c:423
a6cd2cc4
JX
12320#, c-format
12321msgid "Updated %d path from the index"
12322msgid_plural "Updated %d paths from the index"
12323msgstr[0] "从索引区更新了 %d 个路径"
12324msgstr[1] "从索引区更新了 %d 个路径"
12325
ec3d4607
JX
12326#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
12327#: builtin/checkout.c:456
07432cef 12328#, c-format
ef317cd5 12329msgid "'%s' cannot be used with updating paths"
07432cef 12330msgstr "'%s' 不能在更新路径时使用"
ef317cd5 12331
ec3d4607 12332#: builtin/checkout.c:459 builtin/checkout.c:462
07432cef 12333#, c-format
ef317cd5 12334msgid "'%s' cannot be used with %s"
07432cef 12335msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 12336
ec3d4607 12337#: builtin/checkout.c:466
ef317cd5
JX
12338#, c-format
12339msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 12340msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 12341
ec3d4607 12342#: builtin/checkout.c:470
c04f5ac3 12343#, c-format
a6cd2cc4
JX
12344msgid "neither '%s' or '%s' is specified"
12345msgstr "'%s' 或 '%s' 都没有指定"
c04f5ac3 12346
ec3d4607 12347#: builtin/checkout.c:474
06991777 12348#, c-format
a6cd2cc4
JX
12349msgid "'%s' must be used when '%s' is not specified"
12350msgstr "未指定 '%2$s' 时,必须使用 '%1$s'"
06991777 12351
ec3d4607 12352#: builtin/checkout.c:479 builtin/checkout.c:484
06991777 12353#, c-format
a6cd2cc4
JX
12354msgid "'%s' or '%s' cannot be used with %s"
12355msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
06991777 12356
ec3d4607 12357#: builtin/checkout.c:558 builtin/checkout.c:565
06991777 12358#, c-format
a6cd2cc4
JX
12359msgid "path '%s' is unmerged"
12360msgstr "路径 '%s' 未合并"
06991777 12361
7e6630a7 12362#: builtin/checkout.c:736
c04f5ac3 12363msgid "you need to resolve your current index first"
90e6ef53 12364msgstr "您需要先解决当前索引的冲突"
c04f5ac3 12365
7e6630a7 12366#: builtin/checkout.c:786
d46c5519
JX
12367#, c-format
12368msgid ""
12369"cannot continue with staged changes in the following files:\n"
12370"%s"
12371msgstr ""
12372"不能继续,下列文件有暂存的修改:\n"
12373"%s"
12374
7e6630a7 12375#: builtin/checkout.c:879
c04f5ac3 12376#, c-format
1b7f4a34
JX
12377msgid "Can not do reflog for '%s': %s\n"
12378msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
c04f5ac3 12379
7e6630a7 12380#: builtin/checkout.c:921
c04f5ac3
JX
12381msgid "HEAD is now at"
12382msgstr "HEAD 目前位于"
12383
7e6630a7 12384#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
3495628d
JX
12385msgid "unable to update HEAD"
12386msgstr "不能更新 HEAD"
12387
7e6630a7 12388#: builtin/checkout.c:929
c04f5ac3
JX
12389#, c-format
12390msgid "Reset branch '%s'\n"
12391msgstr "重置分支 '%s'\n"
12392
7e6630a7 12393#: builtin/checkout.c:932
c04f5ac3
JX
12394#, c-format
12395msgid "Already on '%s'\n"
12396msgstr "已经位于 '%s'\n"
12397
7e6630a7 12398#: builtin/checkout.c:936
c04f5ac3
JX
12399#, c-format
12400msgid "Switched to and reset branch '%s'\n"
12401msgstr "切换并重置分支 '%s'\n"
12402
7e6630a7 12403#: builtin/checkout.c:938 builtin/checkout.c:1369
c04f5ac3
JX
12404#, c-format
12405msgid "Switched to a new branch '%s'\n"
12406msgstr "切换到一个新分支 '%s'\n"
12407
7e6630a7 12408#: builtin/checkout.c:940
c04f5ac3
JX
12409#, c-format
12410msgid "Switched to branch '%s'\n"
12411msgstr "切换到分支 '%s'\n"
12412
90e6ef53 12413# 译者:注意保持前导空格
7e6630a7 12414#: builtin/checkout.c:991
c04f5ac3
JX
12415#, c-format
12416msgid " ... and %d more.\n"
90e6ef53 12417msgstr " ... 及其它 %d 个。\n"
c04f5ac3 12418
7e6630a7 12419#: builtin/checkout.c:997
c04f5ac3
JX
12420#, c-format
12421msgid ""
12422"Warning: you are leaving %d commit behind, not connected to\n"
12423"any of your branches:\n"
12424"\n"
12425"%s\n"
12426msgid_plural ""
12427"Warning: you are leaving %d commits behind, not connected to\n"
12428"any of your branches:\n"
12429"\n"
12430"%s\n"
12431msgstr[0] ""
12432"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
12433"\n"
12434"%s\n"
5ae481e0
JX
12435msgstr[1] ""
12436"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
12437"\n"
12438"%s\n"
c04f5ac3 12439
7e6630a7 12440#: builtin/checkout.c:1016
c04f5ac3
JX
12441#, c-format
12442msgid ""
7aea43ff
JX
12443"If you want to keep it by creating a new branch, this may be a good time\n"
12444"to do so with:\n"
12445"\n"
12446" git branch <new-branch-name> %s\n"
12447"\n"
12448msgid_plural ""
c04f5ac3
JX
12449"If you want to keep them by creating a new branch, this may be a good time\n"
12450"to do so with:\n"
12451"\n"
814ff314 12452" git branch <new-branch-name> %s\n"
c04f5ac3 12453"\n"
7aea43ff
JX
12454msgstr[0] ""
12455"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
12456"如下操作:\n"
12457"\n"
12458" git branch <新分支名> %s\n"
12459"\n"
12460msgstr[1] ""
12461"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
c04f5ac3
JX
12462"如下操作:\n"
12463"\n"
814ff314 12464" git branch <新分支名> %s\n"
c04f5ac3
JX
12465"\n"
12466
7e6630a7 12467#: builtin/checkout.c:1051
c04f5ac3
JX
12468msgid "internal error in revision walk"
12469msgstr "在版本遍历时遇到内部错误"
12470
7e6630a7 12471#: builtin/checkout.c:1055
c04f5ac3
JX
12472msgid "Previous HEAD position was"
12473msgstr "之前的 HEAD 位置是"
12474
7e6630a7 12475#: builtin/checkout.c:1095 builtin/checkout.c:1364
c04f5ac3 12476msgid "You are on a branch yet to be born"
90e6ef53 12477msgstr "您位于一个尚未初始化的分支"
c04f5ac3 12478
7e6630a7 12479#: builtin/checkout.c:1177
06991777
JX
12480#, c-format
12481msgid ""
12482"'%s' could be both a local file and a tracking branch.\n"
12483"Please use -- (and optionally --no-guess) to disambiguate"
12484msgstr ""
12485"'%s' 既可以是一个本地文件,也可以是一个跟踪分支。\n"
12486"请使用 --(和可选的 --no-guess)来消除歧义"
12487
7e6630a7 12488#: builtin/checkout.c:1184
2b472aae
JX
12489msgid ""
12490"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
12491"you can do so by fully qualifying the name with the --track option:\n"
12492"\n"
12493" git checkout --track origin/<name>\n"
12494"\n"
12495"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
12496"one remote, e.g. the 'origin' remote, consider setting\n"
12497"checkout.defaultRemote=origin in your config."
12498msgstr ""
12499"如果您想要检出一个远程跟踪分支,例如在 'origin' 上的,您可以使用分支\n"
12500"全名和 --track 选项:\n"
12501"\n"
440e7442 12502" git checkout --track origin/<名称>\n"
2b472aae 12503"\n"
440e7442 12504"如果您总是喜欢使用模糊的简短分支名 <名称>,而不喜欢如 'origin' 的远程\n"
2b472aae
JX
12505"名称,可以在配置中设置 checkout.defaultRemote=origin。"
12506
7e6630a7 12507#: builtin/checkout.c:1194
2b472aae
JX
12508#, c-format
12509msgid "'%s' matched multiple (%d) remote tracking branches"
440e7442 12510msgstr "'%s' 匹配多个(%d 个)远程跟踪分支"
2b472aae 12511
7e6630a7 12512#: builtin/checkout.c:1260
2b472aae 12513msgid "only one reference expected"
440e7442 12514msgstr "只期望一个引用"
2b472aae 12515
7e6630a7 12516#: builtin/checkout.c:1277
2b472aae
JX
12517#, c-format
12518msgid "only one reference expected, %d given."
12519msgstr "应只有一个引用,却给出了 %d 个"
12520
7e6630a7 12521#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
c04f5ac3
JX
12522#, c-format
12523msgid "invalid reference: %s"
12524msgstr "无效引用:%s"
12525
7e6630a7 12526#: builtin/checkout.c:1336 builtin/checkout.c:1705
c04f5ac3
JX
12527#, c-format
12528msgid "reference is not a tree: %s"
12529msgstr "引用不是一个树:%s"
12530
7e6630a7 12531#: builtin/checkout.c:1383
a6cd2cc4
JX
12532#, c-format
12533msgid "a branch is expected, got tag '%s'"
12534msgstr "期望一个分支,得到标签 '%s'"
12535
7e6630a7 12536#: builtin/checkout.c:1385
a6cd2cc4
JX
12537#, c-format
12538msgid "a branch is expected, got remote branch '%s'"
12539msgstr "期望一个分支,得到远程分支 '%s'"
12540
7e6630a7 12541#: builtin/checkout.c:1386 builtin/checkout.c:1394
a6cd2cc4
JX
12542#, c-format
12543msgid "a branch is expected, got '%s'"
12544msgstr "期望一个分支,得到 '%s'"
12545
7e6630a7 12546#: builtin/checkout.c:1389
a6cd2cc4
JX
12547#, c-format
12548msgid "a branch is expected, got commit '%s'"
12549msgstr "期望一个分支,得到提交 '%s'"
12550
7e6630a7 12551#: builtin/checkout.c:1405
a6cd2cc4
JX
12552msgid ""
12553"cannot switch branch while merging\n"
12554"Consider \"git merge --quit\" or \"git worktree add\"."
12555msgstr ""
12556"不能在合并时切换分支\n"
12557"考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
12558
7e6630a7 12559#: builtin/checkout.c:1409
a6cd2cc4
JX
12560msgid ""
12561"cannot switch branch in the middle of an am session\n"
12562"Consider \"git am --quit\" or \"git worktree add\"."
12563msgstr ""
12564"不能在一个 am 会话期间切换分支\n"
12565"考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
12566
7e6630a7 12567#: builtin/checkout.c:1413
a6cd2cc4
JX
12568msgid ""
12569"cannot switch branch while rebasing\n"
12570"Consider \"git rebase --quit\" or \"git worktree add\"."
12571msgstr ""
12572"不能在变基时切换分支\n"
12573"考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
12574
7e6630a7 12575#: builtin/checkout.c:1417
a6cd2cc4
JX
12576msgid ""
12577"cannot switch branch while cherry-picking\n"
12578"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
12579msgstr ""
12580"不能在拣选时切换分支\n"
12581"考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
12582
7e6630a7 12583#: builtin/checkout.c:1421
a6cd2cc4
JX
12584msgid ""
12585"cannot switch branch while reverting\n"
12586"Consider \"git revert --quit\" or \"git worktree add\"."
12587msgstr ""
12588"不能在还原时切换分支\n"
12589"考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
12590
7e6630a7 12591#: builtin/checkout.c:1425
a6cd2cc4
JX
12592msgid "you are switching branch while bisecting"
12593msgstr "您在执行二分查找时切换分支"
12594
7e6630a7 12595#: builtin/checkout.c:1432
ef317cd5 12596msgid "paths cannot be used with switching branches"
07432cef 12597msgstr "路径不能和切换分支同时使用"
c04f5ac3 12598
7e6630a7 12599#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
07432cef 12600#, c-format
ef317cd5 12601msgid "'%s' cannot be used with switching branches"
07432cef 12602msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 12603
7e6630a7
FZ
12604#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
12605#: builtin/checkout.c:1458 builtin/checkout.c:1463
07432cef 12606#, c-format
ef317cd5 12607msgid "'%s' cannot be used with '%s'"
07432cef 12608msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 12609
7e6630a7 12610#: builtin/checkout.c:1460
a6cd2cc4
JX
12611#, c-format
12612msgid "'%s' cannot take <start-point>"
12613msgstr "'%s' 不带 <起始点>"
12614
7e6630a7 12615#: builtin/checkout.c:1468
07432cef 12616#, c-format
ef317cd5 12617msgid "Cannot switch branch to a non-commit '%s'"
07432cef 12618msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 12619
7e6630a7 12620#: builtin/checkout.c:1475
a6cd2cc4
JX
12621msgid "missing branch or commit argument"
12622msgstr "缺少分支或提交参数"
c04f5ac3 12623
7e6630a7 12624#: builtin/checkout.c:1518
a6cd2cc4
JX
12625msgid "perform a 3-way merge with the new branch"
12626msgstr "和新的分支执行三方合并"
c04f5ac3 12627
ffa14514 12628#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
a6cd2cc4
JX
12629msgid "style"
12630msgstr "风格"
ef317cd5 12631
7e6630a7 12632#: builtin/checkout.c:1520
a6cd2cc4
JX
12633msgid "conflict style (merge or diff3)"
12634msgstr "冲突输出风格(merge 或 diff3)"
12635
7e6630a7 12636#: builtin/checkout.c:1532 builtin/worktree.c:489
5c57d762
JX
12637msgid "detach HEAD at named commit"
12638msgstr "HEAD 从指定的提交分离"
ef317cd5 12639
7e6630a7 12640#: builtin/checkout.c:1533
ef317cd5 12641msgid "set upstream info for new branch"
07432cef 12642msgstr "为新的分支设置上游信息"
ef317cd5 12643
7e6630a7 12644#: builtin/checkout.c:1535
a6cd2cc4
JX
12645msgid "force checkout (throw away local modifications)"
12646msgstr "强制检出(丢弃本地修改)"
12647
7e6630a7 12648#: builtin/checkout.c:1537
6c94aba5 12649msgid "new-branch"
07432cef 12650msgstr "新分支"
ef317cd5 12651
7e6630a7 12652#: builtin/checkout.c:1537
ef317cd5 12653msgid "new unparented branch"
07432cef 12654msgstr "新的没有父提交的分支"
ef317cd5 12655
7e6630a7 12656#: builtin/checkout.c:1539 builtin/merge.c:302
a6cd2cc4
JX
12657msgid "update ignored files (default)"
12658msgstr "更新忽略的文件(默认)"
12659
7e6630a7 12660#: builtin/checkout.c:1542
a6cd2cc4
JX
12661msgid "do not check if another worktree is holding the given ref"
12662msgstr "不检查指定的引用是否被其他工作区所占用"
12663
7e6630a7 12664#: builtin/checkout.c:1555
ef317cd5 12665msgid "checkout our version for unmerged files"
07432cef 12666msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 12667
7e6630a7 12668#: builtin/checkout.c:1558
ef317cd5 12669msgid "checkout their version for unmerged files"
07432cef 12670msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 12671
7e6630a7 12672#: builtin/checkout.c:1562
4dcdc3d8
JX
12673msgid "do not limit pathspecs to sparse entries only"
12674msgstr "对路径不做稀疏检出的限制"
12675
7e6630a7 12676#: builtin/checkout.c:1620
349ede6a
JX
12677#, c-format
12678msgid "-%c, -%c and --orphan are mutually exclusive"
12679msgstr "-%c、-%c 和 --orphan 是互斥的"
ef317cd5 12680
7e6630a7 12681#: builtin/checkout.c:1624
d46c5519
JX
12682msgid "-p and --overlay are mutually exclusive"
12683msgstr "-p 和 --overlay 互斥"
12684
7e6630a7 12685#: builtin/checkout.c:1661
ef317cd5
JX
12686msgid "--track needs a branch name"
12687msgstr "--track 需要一个分支名"
12688
7e6630a7 12689#: builtin/checkout.c:1666
349ede6a
JX
12690#, c-format
12691msgid "missing branch name; try -%c"
12692msgstr "缺少分支名,尝试 -%c"
ef317cd5 12693
7e6630a7 12694#: builtin/checkout.c:1698
a6cd2cc4
JX
12695#, c-format
12696msgid "could not resolve %s"
12697msgstr "无法解析 %s"
12698
7e6630a7 12699#: builtin/checkout.c:1714
c04f5ac3 12700msgid "invalid path specification"
90e6ef53 12701msgstr "无效的路径规格"
c04f5ac3 12702
7e6630a7 12703#: builtin/checkout.c:1721
07432cef 12704#, c-format
a4f16749
JX
12705msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
12706msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'"
c04f5ac3 12707
7e6630a7 12708#: builtin/checkout.c:1725
07432cef 12709#, c-format
ef317cd5 12710msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 12711msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 12712
7e6630a7 12713#: builtin/checkout.c:1734
ddc12c42
JX
12714msgid "--pathspec-from-file is incompatible with --detach"
12715msgstr "--pathspec-from-file 与 --detach 不兼容"
12716
7e6630a7 12717#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
ddc12c42
JX
12718msgid "--pathspec-from-file is incompatible with --patch"
12719msgstr "--pathspec-from-file 与 --patch 不兼容"
12720
7e6630a7 12721#: builtin/checkout.c:1750
c04f5ac3
JX
12722msgid ""
12723"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
12724"checking out of the index."
12725msgstr ""
90e6ef53 12726"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 12727
7e6630a7 12728#: builtin/checkout.c:1755
ddc12c42
JX
12729msgid "you must specify path(s) to restore"
12730msgstr "您必须指定一个要恢复的路径"
12731
7e6630a7
FZ
12732#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
12733#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
12734#: builtin/remote.c:172 builtin/submodule--helper.c:2958
12735#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
12736#: builtin/worktree.c:487
a6cd2cc4
JX
12737msgid "branch"
12738msgstr "分支"
12739
7e6630a7 12740#: builtin/checkout.c:1782
a6cd2cc4
JX
12741msgid "create and checkout a new branch"
12742msgstr "创建并检出一个新的分支"
12743
7e6630a7 12744#: builtin/checkout.c:1784
a6cd2cc4
JX
12745msgid "create/reset and checkout a branch"
12746msgstr "创建/重置并检出一个分支"
12747
7e6630a7 12748#: builtin/checkout.c:1785
a6cd2cc4
JX
12749msgid "create reflog for new branch"
12750msgstr "为新的分支创建引用日志"
12751
7e6630a7 12752#: builtin/checkout.c:1787
a6cd2cc4
JX
12753msgid "second guess 'git checkout <no-such-branch>' (default)"
12754msgstr "二次猜测 'git checkout <无此分支>'(默认)"
12755
7e6630a7 12756#: builtin/checkout.c:1788
a6cd2cc4
JX
12757msgid "use overlay mode (default)"
12758msgstr "使用叠加模式(默认)"
12759
7e6630a7 12760#: builtin/checkout.c:1833
a6cd2cc4
JX
12761msgid "create and switch to a new branch"
12762msgstr "创建并切换一个新分支"
12763
7e6630a7 12764#: builtin/checkout.c:1835
a6cd2cc4
JX
12765msgid "create/reset and switch to a branch"
12766msgstr "创建/重置并切换一个分支"
12767
7e6630a7 12768#: builtin/checkout.c:1837
a6cd2cc4
JX
12769msgid "second guess 'git switch <no-such-branch>'"
12770msgstr "二次猜测 'git switch <无此分支>'"
12771
7e6630a7 12772#: builtin/checkout.c:1839
a6cd2cc4
JX
12773msgid "throw away local modifications"
12774msgstr "丢弃本地修改"
12775
7e6630a7 12776#: builtin/checkout.c:1873
a6cd2cc4
JX
12777msgid "which tree-ish to checkout from"
12778msgstr "要检出哪一个树"
12779
7e6630a7 12780#: builtin/checkout.c:1875
a6cd2cc4
JX
12781msgid "restore the index"
12782msgstr "恢复索引"
12783
7e6630a7 12784#: builtin/checkout.c:1877
a6cd2cc4
JX
12785msgid "restore the working tree (default)"
12786msgstr "恢复工作区(默认)"
12787
7e6630a7 12788#: builtin/checkout.c:1879
a6cd2cc4
JX
12789msgid "ignore unmerged entries"
12790msgstr "忽略未合并条目"
12791
7e6630a7 12792#: builtin/checkout.c:1880
a6cd2cc4
JX
12793msgid "use overlay mode"
12794msgstr "使用叠加模式"
12795
349ede6a 12796#: builtin/clean.c:29
2e8451e8
JX
12797msgid ""
12798"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
12799msgstr ""
12800"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 12801
349ede6a 12802#: builtin/clean.c:33
07432cef
WS
12803#, c-format
12804msgid "Removing %s\n"
12805msgstr "正删除 %s\n"
12806
349ede6a 12807#: builtin/clean.c:34
07432cef
WS
12808#, c-format
12809msgid "Would remove %s\n"
12810msgstr "将删除 %s\n"
12811
349ede6a 12812#: builtin/clean.c:35
07432cef
WS
12813#, c-format
12814msgid "Skipping repository %s\n"
160fb2b2 12815msgstr "忽略仓库 %s\n"
07432cef 12816
349ede6a 12817#: builtin/clean.c:36
07432cef
WS
12818#, c-format
12819msgid "Would skip repository %s\n"
160fb2b2 12820msgstr "将忽略仓库 %s\n"
07432cef 12821
349ede6a 12822#: builtin/clean.c:38
a6cd2cc4
JX
12823#, c-format
12824msgid "could not lstat %s\n"
12825msgstr "不能对 %s 调用 lstat\n"
12826
ec3d4607 12827#: builtin/clean.c:300 git-add--interactive.perl:593
1a79b2f1 12828#, c-format
2e8451e8
JX
12829msgid ""
12830"Prompt help:\n"
12831"1 - select a numbered item\n"
12832"foo - select item based on unique prefix\n"
1a79b2f1 12833" - (empty) select nothing\n"
2e8451e8
JX
12834msgstr ""
12835"帮助:\n"
12836"1 - 通过编号选择一个选项\n"
1a79b2f1
JX
12837"foo - 通过唯一前缀选择一个选项\n"
12838" - (空)什么也不选择\n"
2e8451e8 12839
ec3d4607 12840#: builtin/clean.c:304 git-add--interactive.perl:602
1a79b2f1 12841#, c-format
2e8451e8
JX
12842msgid ""
12843"Prompt help:\n"
12844"1 - select a single item\n"
12845"3-5 - select a range of items\n"
12846"2-3,6-9 - select multiple ranges\n"
12847"foo - select item based on unique prefix\n"
12848"-... - unselect specified items\n"
12849"* - choose all items\n"
1a79b2f1 12850" - (empty) finish selecting\n"
2e8451e8
JX
12851msgstr ""
12852"帮助:\n"
12853"1 - 选择一个选项\n"
12854"3-5 - 选择一个范围内的所有选项\n"
12855"2-3,6-9 - 选择多个范围内的所有选项\n"
1a79b2f1 12856"foo - 通过唯一前缀选择一个选项\n"
2e8451e8
JX
12857"-... - 反选特定的选项\n"
12858"* - 选择所有选项\n"
1a79b2f1 12859" - (空)结束选择\n"
2e8451e8 12860
ec3d4607 12861#: builtin/clean.c:519 git-add--interactive.perl:568
d13389bf 12862#: git-add--interactive.perl:573
1a79b2f1
JX
12863#, c-format, perl-format
12864msgid "Huh (%s)?\n"
12865msgstr "嗯(%s)?\n"
2e8451e8 12866
ec3d4607 12867#: builtin/clean.c:659
2e8451e8
JX
12868#, c-format
12869msgid "Input ignore patterns>> "
12870msgstr "输入模版以排除条目>> "
12871
ec3d4607 12872#: builtin/clean.c:693
2e8451e8
JX
12873#, c-format
12874msgid "WARNING: Cannot find items matched by: %s"
12875msgstr "警告:无法找到和 %s 匹配的条目"
12876
ec3d4607 12877#: builtin/clean.c:714
2e8451e8
JX
12878msgid "Select items to delete"
12879msgstr "选择要删除的条目"
12880
814ff314 12881#. TRANSLATORS: Make sure to keep [y/N] as is
ec3d4607 12882#: builtin/clean.c:755
2e8451e8 12883#, c-format
814ff314
JX
12884msgid "Remove %s [y/N]? "
12885msgstr "删除 %s [y/N]?"
2e8451e8 12886
ec3d4607 12887#: builtin/clean.c:786
2e8451e8
JX
12888msgid ""
12889"clean - start cleaning\n"
12890"filter by pattern - exclude items from deletion\n"
12891"select by numbers - select items to be deleted by numbers\n"
12892"ask each - confirm each deletion (like \"rm -i\")\n"
12893"quit - stop cleaning\n"
12894"help - this screen\n"
12895"? - help for prompt selection"
12896msgstr ""
12897"clean - 开始清理\n"
12898"filter by pattern - 通过模版排除要删除的条目\n"
12899"select by numbers - 通过数字选择要删除的条目\n"
12900"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
12901"quit - 停止删除并退出\n"
12902"help - 显示本帮助\n"
12903"? - 显示如何在提示符下选择的帮助"
12904
ec3d4607 12905#: builtin/clean.c:822
2e8451e8
JX
12906msgid "Would remove the following item:"
12907msgid_plural "Would remove the following items:"
12908msgstr[0] "将删除如下条目:"
12909msgstr[1] "将删除如下条目:"
12910
ec3d4607 12911#: builtin/clean.c:838
2e8451e8
JX
12912msgid "No more files to clean, exiting."
12913msgstr "没有要清理的文件,退出。"
12914
ec3d4607 12915#: builtin/clean.c:900
ef317cd5 12916msgid "do not print names of files removed"
07432cef 12917msgstr "不打印删除文件的名称"
ef317cd5 12918
ec3d4607 12919#: builtin/clean.c:902
ef317cd5 12920msgid "force"
07432cef 12921msgstr "强制"
ef317cd5 12922
ec3d4607 12923#: builtin/clean.c:903
2e8451e8
JX
12924msgid "interactive cleaning"
12925msgstr "交互式清除"
12926
ec3d4607 12927#: builtin/clean.c:905
ef317cd5 12928msgid "remove whole directories"
07432cef 12929msgstr "删除整个目录"
ef317cd5 12930
ec3d4607 12931#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
7e6630a7
FZ
12932#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
12933#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
d46c5519 12934#: builtin/show-ref.c:179
ef317cd5 12935msgid "pattern"
07432cef 12936msgstr "模式"
ef317cd5 12937
ec3d4607 12938#: builtin/clean.c:907
ef317cd5 12939msgid "add <pattern> to ignore rules"
4375c10e 12940msgstr "添加 <模式> 到忽略规则"
ef317cd5 12941
ec3d4607 12942#: builtin/clean.c:908
ef317cd5 12943msgid "remove ignored files, too"
07432cef 12944msgstr "也删除忽略的文件"
ef317cd5 12945
ec3d4607 12946#: builtin/clean.c:910
ef317cd5 12947msgid "remove only ignored files"
07432cef 12948msgstr "只删除忽略的文件"
c04f5ac3 12949
ec3d4607 12950#: builtin/clean.c:925
c04f5ac3 12951msgid ""
6c94aba5 12952"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 12953"clean"
c04f5ac3 12954msgstr ""
2e8451e8 12955"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 12956
ec3d4607 12957#: builtin/clean.c:928
c04f5ac3 12958msgid ""
6c94aba5 12959"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 12960"refusing to clean"
c04f5ac3 12961msgstr ""
2e8451e8 12962"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 12963
ec3d4607 12964#: builtin/clean.c:940
7157c2b5
JX
12965msgid "-x and -X cannot be used together"
12966msgstr "-x 和 -X 不能同时使用"
12967
a5cd71ca 12968#: builtin/clone.c:45
814ff314 12969msgid "git clone [<options>] [--] <repo> [<dir>]"
160fb2b2 12970msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
ef317cd5 12971
33b62fba
JX
12972#: builtin/clone.c:96
12973msgid "don't clone shallow repository"
12974msgstr "不克隆浅仓库"
12975
12976#: builtin/clone.c:98
ef317cd5 12977msgid "don't create a checkout"
07432cef 12978msgstr "不创建一个检出"
ef317cd5 12979
ec3d4607 12980#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
ef317cd5 12981msgid "create a bare repository"
160fb2b2 12982msgstr "创建一个纯仓库"
ef317cd5 12983
33b62fba 12984#: builtin/clone.c:103
ef317cd5 12985msgid "create a mirror repository (implies bare)"
160fb2b2 12986msgstr "创建一个镜像仓库(也是纯仓库)"
ef317cd5 12987
33b62fba 12988#: builtin/clone.c:105
ef317cd5 12989msgid "to clone from a local repository"
160fb2b2 12990msgstr "从本地仓库克隆"
ef317cd5 12991
33b62fba 12992#: builtin/clone.c:107
ef317cd5 12993msgid "don't use local hardlinks, always copy"
07432cef 12994msgstr "不使用本地硬链接,始终复制"
ef317cd5 12995
33b62fba 12996#: builtin/clone.c:109
ef317cd5 12997msgid "setup as shared repository"
160fb2b2 12998msgstr "设置为共享仓库"
ef317cd5 12999
33b62fba 13000#: builtin/clone.c:111
87cb7997 13001msgid "pathspec"
65e2041e 13002msgstr "路径规格"
87cb7997 13003
33b62fba 13004#: builtin/clone.c:111
ef317cd5 13005msgid "initialize submodules in the clone"
07432cef 13006msgstr "在克隆时初始化子模组"
ef317cd5 13007
33b62fba 13008#: builtin/clone.c:115
5b04ee3b
JX
13009msgid "number of submodules cloned in parallel"
13010msgstr "并发克隆的子模组的数量"
13011
ec3d4607 13012#: builtin/clone.c:116 builtin/init-db.c:539
ef317cd5 13013msgid "template-directory"
07432cef 13014msgstr "模板目录"
ef317cd5 13015
ec3d4607 13016#: builtin/clone.c:117 builtin/init-db.c:540
ef317cd5 13017msgid "directory from which templates will be used"
07432cef 13018msgstr "模板目录将被使用"
ef317cd5 13019
7e6630a7
FZ
13020#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
13021#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
ef317cd5 13022msgid "reference repository"
160fb2b2 13023msgstr "参考仓库"
ef317cd5 13024
7e6630a7
FZ
13025#: builtin/clone.c:123 builtin/submodule--helper.c:1872
13026#: builtin/submodule--helper.c:2515
7aea43ff 13027msgid "use --reference only while cloning"
160fb2b2 13028msgstr "仅在克隆时参考 --reference 指向的本地仓库"
7aea43ff 13029
ec3d4607 13030#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
7e6630a7
FZ
13031#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
13032#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
13033#: t/helper/test-simple-ipc.c:597
ef317cd5 13034msgid "name"
07432cef 13035msgstr "名称"
ef317cd5 13036
33b62fba 13037#: builtin/clone.c:125
ef317cd5 13038msgid "use <name> instead of 'origin' to track upstream"
4375c10e 13039msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
ef317cd5 13040
33b62fba 13041#: builtin/clone.c:127
ef317cd5 13042msgid "checkout <branch> instead of the remote's HEAD"
4375c10e 13043msgstr "检出 <分支> 而不是远程 HEAD"
ef317cd5 13044
33b62fba 13045#: builtin/clone.c:129
ef317cd5 13046msgid "path to git-upload-pack on the remote"
07432cef 13047msgstr "远程 git-upload-pack 路径"
ef317cd5 13048
7e6630a7 13049#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
ffa14514 13050#: builtin/pull.c:212
ef317cd5 13051msgid "depth"
07432cef 13052msgstr "深度"
ef317cd5 13053
33b62fba 13054#: builtin/clone.c:131
ef317cd5 13055msgid "create a shallow clone of that depth"
07432cef 13056msgstr "创建一个指定深度的浅克隆"
ef317cd5 13057
7e6630a7 13058#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
ffa14514 13059#: builtin/pull.c:215
a0b6b246
JX
13060msgid "time"
13061msgstr "时间"
13062
33b62fba 13063#: builtin/clone.c:133
a0b6b246
JX
13064msgid "create a shallow clone since a specific time"
13065msgstr "从一个特定时间创建一个浅克隆"
13066
33b62fba 13067#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
ffa14514 13068#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
a0b6b246
JX
13069msgid "revision"
13070msgstr "版本"
13071
ffa14514 13072#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
1a79b2f1
JX
13073msgid "deepen history of shallow clone, excluding rev"
13074msgstr "深化浅克隆的历史,除了特定版本"
a0b6b246 13075
7e6630a7
FZ
13076#: builtin/clone.c:137 builtin/submodule--helper.c:1882
13077#: builtin/submodule--helper.c:2529
ef317cd5 13078msgid "clone only one branch, HEAD or --branch"
07432cef 13079msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 13080
33b62fba 13081#: builtin/clone.c:139
a4f16749
JX
13082msgid "don't clone any tags, and make later fetches not to follow them"
13083msgstr "不要克隆任何标签,并且后续获取操作也不下载它们"
13084
33b62fba 13085#: builtin/clone.c:141
5b04ee3b
JX
13086msgid "any cloned submodules will be shallow"
13087msgstr "子模组将以浅下载模式克隆"
13088
ec3d4607 13089#: builtin/clone.c:142 builtin/init-db.c:548
ef317cd5 13090msgid "gitdir"
07432cef 13091msgstr "git目录"
ef317cd5 13092
ec3d4607 13093#: builtin/clone.c:143 builtin/init-db.c:549
ef317cd5 13094msgid "separate git dir from working tree"
07432cef 13095msgstr "git目录和工作区分离"
ef317cd5 13096
33b62fba 13097#: builtin/clone.c:144
ef317cd5 13098msgid "key=value"
07432cef 13099msgstr "key=value"
ef317cd5 13100
33b62fba 13101#: builtin/clone.c:145
ef317cd5 13102msgid "set config inside the new repository"
160fb2b2 13103msgstr "在新仓库中设置配置信息"
ef317cd5 13104
33b62fba 13105#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
ffa14514 13106#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
d46c5519
JX
13107msgid "server-specific"
13108msgstr "server-specific"
13109
33b62fba 13110#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
ffa14514 13111#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
d46c5519
JX
13112msgid "option to transmit"
13113msgstr "传输选项"
13114
ffa14514 13115#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
ec3d4607 13116#: builtin/push.c:576
276ceeaa
JX
13117msgid "use IPv4 addresses only"
13118msgstr "只使用 IPv4 地址"
13119
ffa14514 13120#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
ec3d4607 13121#: builtin/push.c:578
276ceeaa
JX
13122msgid "use IPv6 addresses only"
13123msgstr "只使用 IPv6 地址"
13124
33b62fba 13125#: builtin/clone.c:154
a6cd2cc4
JX
13126msgid "any cloned submodules will use their remote-tracking branch"
13127msgstr "任何克隆的子模组将使用它们的远程跟踪分支"
13128
33b62fba 13129#: builtin/clone.c:156
ddc12c42
JX
13130msgid "initialize sparse-checkout file to include only files at root"
13131msgstr "初始化稀疏检出文件,只包含根目录文件"
13132
7e6630a7 13133#: builtin/clone.c:231
cfff71a9 13134#, c-format
a0b6b246
JX
13135msgid "info: Could not add alternate for '%s': %s\n"
13136msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
cfff71a9 13137
7e6630a7 13138#: builtin/clone.c:304
c04f5ac3
JX
13139#, c-format
13140msgid "%s exists and is not a directory"
13141msgstr "%s 存在且不是一个目录"
13142
7e6630a7 13143#: builtin/clone.c:322
c04f5ac3 13144#, c-format
a6cd2cc4
JX
13145msgid "failed to start iterator over '%s'"
13146msgstr "无法在 '%s' 上启动迭代器"
c04f5ac3 13147
7e6630a7 13148#: builtin/clone.c:353
c04f5ac3
JX
13149#, c-format
13150msgid "failed to create link '%s'"
c1ac5258 13151msgstr "创建链接 '%s' 失败"
c04f5ac3 13152
7e6630a7 13153#: builtin/clone.c:357
c04f5ac3
JX
13154#, c-format
13155msgid "failed to copy file to '%s'"
c1ac5258 13156msgstr "拷贝文件至 '%s' 失败"
c04f5ac3 13157
7e6630a7 13158#: builtin/clone.c:362
a6cd2cc4
JX
13159#, c-format
13160msgid "failed to iterate over '%s'"
13161msgstr "无法在 '%s' 上迭代"
13162
7e6630a7 13163#: builtin/clone.c:389
c04f5ac3
JX
13164#, c-format
13165msgid "done.\n"
13166msgstr "完成。\n"
13167
7e6630a7 13168#: builtin/clone.c:403
1003b3a5
JX
13169msgid ""
13170"Clone succeeded, but checkout failed.\n"
13171"You can inspect what was checked out with 'git status'\n"
a6cd2cc4 13172"and retry with 'git restore --source=HEAD :/'\n"
1003b3a5
JX
13173msgstr ""
13174"克隆成功,但是检出失败。\n"
13175"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
a6cd2cc4 13176"'git restore --source=HEAD :/' 重试\n"
1003b3a5 13177
7e6630a7 13178#: builtin/clone.c:480
c04f5ac3
JX
13179#, c-format
13180msgid "Could not find remote branch %s to clone."
90e6ef53 13181msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 13182
7e6630a7 13183#: builtin/clone.c:597
3495628d
JX
13184#, c-format
13185msgid "unable to update %s"
13186msgstr "不能更新 %s"
13187
7e6630a7 13188#: builtin/clone.c:645
ddc12c42
JX
13189msgid "failed to initialize sparse-checkout"
13190msgstr "无法初始化稀疏检出"
13191
7e6630a7 13192#: builtin/clone.c:668
c04f5ac3
JX
13193msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
13194msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
13195
7e6630a7 13196#: builtin/clone.c:701
1003b3a5
JX
13197msgid "unable to checkout working tree"
13198msgstr "不能检出工作区"
13199
7e6630a7 13200#: builtin/clone.c:779
3495628d
JX
13201msgid "unable to write parameters to config file"
13202msgstr "无法将参数写入配置文件"
13203
7e6630a7 13204#: builtin/clone.c:842
04cb2f28
JX
13205msgid "cannot repack to clean up"
13206msgstr "无法执行 repack 来清理"
13207
7e6630a7 13208#: builtin/clone.c:844
04cb2f28
JX
13209msgid "cannot unlink temporary alternates file"
13210msgstr "无法删除临时的 alternates 文件"
13211
7e6630a7 13212#: builtin/clone.c:886 builtin/receive-pack.c:2493
c04f5ac3
JX
13213msgid "Too many arguments."
13214msgstr "太多参数。"
13215
7e6630a7 13216#: builtin/clone.c:890
c04f5ac3 13217msgid "You must specify a repository to clone."
160fb2b2 13218msgstr "您必须指定一个仓库来克隆。"
c04f5ac3 13219
7e6630a7 13220#: builtin/clone.c:903
c04f5ac3
JX
13221#, c-format
13222msgid "--bare and --origin %s options are incompatible."
13223msgstr "--bare 和 --origin %s 选项不兼容。"
13224
7e6630a7 13225#: builtin/clone.c:906
07432cef
WS
13226msgid "--bare and --separate-git-dir are incompatible."
13227msgstr "--bare 和 --separate-git-dir 选项不兼容。"
13228
7e6630a7 13229#: builtin/clone.c:920
c04f5ac3
JX
13230#, c-format
13231msgid "repository '%s' does not exist"
160fb2b2 13232msgstr "仓库 '%s' 不存在"
c04f5ac3 13233
7e6630a7 13234#: builtin/clone.c:924 builtin/fetch.c:2029
cfff71a9
JX
13235#, c-format
13236msgid "depth %s is not a positive number"
13237msgstr "深度 %s 不是一个正数"
13238
7e6630a7 13239#: builtin/clone.c:934
c04f5ac3
JX
13240#, c-format
13241msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 13242msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 13243
7e6630a7 13244#: builtin/clone.c:940
d9488fea
JX
13245#, c-format
13246msgid "repository path '%s' already exists and is not an empty directory."
13247msgstr "仓库路径 '%s' 已经存在,并且不是一个空目录。"
13248
7e6630a7 13249#: builtin/clone.c:954
c04f5ac3
JX
13250#, c-format
13251msgid "working tree '%s' already exists."
13252msgstr "工作区 '%s' 已经存在。"
13253
7e6630a7
FZ
13254#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
13255#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
5bb01d4f
JX
13256#, c-format
13257msgid "could not create leading directories of '%s'"
13258msgstr "不能为 '%s' 创建先导目录"
13259
7e6630a7 13260#: builtin/clone.c:974
c04f5ac3 13261#, c-format
814ff314
JX
13262msgid "could not create work tree dir '%s'"
13263msgstr "不能创建工作区目录 '%s'"
c04f5ac3 13264
7e6630a7 13265#: builtin/clone.c:994
c04f5ac3
JX
13266#, c-format
13267msgid "Cloning into bare repository '%s'...\n"
160fb2b2 13268msgstr "克隆到纯仓库 '%s'...\n"
c04f5ac3 13269
7e6630a7 13270#: builtin/clone.c:996
c04f5ac3
JX
13271#, c-format
13272msgid "Cloning into '%s'...\n"
13273msgstr "正克隆到 '%s'...\n"
13274
7e6630a7 13275#: builtin/clone.c:1025
a0b6b246
JX
13276msgid ""
13277"clone --recursive is not compatible with both --reference and --reference-if-"
13278"able"
13279msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
13280
7e6630a7 13281#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
d13389bf
JX
13282#, c-format
13283msgid "'%s' is not a valid remote name"
13284msgstr "'%s' 不是一个有效的远程名称"
13285
7e6630a7 13286#: builtin/clone.c:1121
6acbf033 13287msgid "--depth is ignored in local clones; use file:// instead."
a0b6b246
JX
13288msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
13289
7e6630a7 13290#: builtin/clone.c:1123
a0b6b246
JX
13291msgid "--shallow-since is ignored in local clones; use file:// instead."
13292msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
6acbf033 13293
7e6630a7 13294#: builtin/clone.c:1125
a0b6b246
JX
13295msgid "--shallow-exclude is ignored in local clones; use file:// instead."
13296msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
13297
7e6630a7 13298#: builtin/clone.c:1127
31e5e17b
JX
13299msgid "--filter is ignored in local clones; use file:// instead."
13300msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。"
13301
7e6630a7 13302#: builtin/clone.c:1132
6acbf033 13303msgid "source repository is shallow, ignoring --local"
160fb2b2 13304msgstr "源仓库是浅克隆,忽略 --local"
6acbf033 13305
7e6630a7 13306#: builtin/clone.c:1137
6acbf033
JX
13307msgid "--local is ignored"
13308msgstr "--local 被忽略"
13309
7e6630a7 13310#: builtin/clone.c:1216 builtin/clone.c:1276
ec3d4607
JX
13311msgid "remote transport reported error"
13312msgstr "远程传输报告错误"
13313
7e6630a7 13314#: builtin/clone.c:1228 builtin/clone.c:1239
c04f5ac3
JX
13315#, c-format
13316msgid "Remote branch %s not found in upstream %s"
13317msgstr "远程分支 %s 在上游 %s 未发现"
13318
7e6630a7 13319#: builtin/clone.c:1242
c04f5ac3 13320msgid "You appear to have cloned an empty repository."
160fb2b2 13321msgstr "您似乎克隆了一个空仓库。"
c04f5ac3 13322
a4f16749 13323#: builtin/column.c:10
814ff314
JX
13324msgid "git column [<options>]"
13325msgstr "git column [<选项>]"
ef317cd5 13326
a4f16749 13327#: builtin/column.c:27
ef317cd5 13328msgid "lookup config vars"
07432cef 13329msgstr "查找配置变量"
ef317cd5 13330
a4f16749 13331#: builtin/column.c:28 builtin/column.c:29
ef317cd5 13332msgid "layout to use"
07432cef 13333msgstr "要使用的布局"
ef317cd5 13334
a4f16749 13335#: builtin/column.c:30
33b62fba 13336msgid "maximum width"
07432cef 13337msgstr "最大宽度"
ef317cd5 13338
a4f16749 13339#: builtin/column.c:31
33b62fba 13340msgid "padding space on left border"
07432cef 13341msgstr "左边框的填充空间"
ef317cd5 13342
a4f16749 13343#: builtin/column.c:32
33b62fba 13344msgid "padding space on right border"
07432cef 13345msgstr "右边框的填充空间"
ef317cd5 13346
a4f16749 13347#: builtin/column.c:33
33b62fba 13348msgid "padding space between columns"
07432cef 13349msgstr "两列之间的填充空间"
ef317cd5 13350
fd8cb379 13351#: builtin/column.c:51
8ada9598 13352msgid "--command must be the first argument"
81809b99 13353msgstr "--command 必须是第一个参数"
8ada9598 13354
7e6630a7 13355#: builtin/commit-graph.c:13
349ede6a
JX
13356msgid ""
13357"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
13358msgstr ""
13359"git commit-graph verify [--object-dir <对象目录>] [--shallow] [--"
13360"[no-]progress]"
13361
7e6630a7 13362#: builtin/commit-graph.c:16
349ede6a
JX
13363msgid ""
13364"git commit-graph write [--object-dir <objdir>] [--append] [--"
13365"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
d9488fea 13366"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
349ede6a
JX
13367msgstr ""
13368"git commit-graph write [--object-dir <对象目录>] [--append] [--split[=<策略"
13369">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--"
d9488fea 13370"[no-]max-new-filters <n>] [--[no-]progress] <切分选项>"
349ede6a 13371
7e6630a7 13372#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
349ede6a
JX
13373msgid "dir"
13374msgstr "目录"
13375
7e6630a7 13376#: builtin/commit-graph.c:52
473eb541 13377msgid "the object directory to store the graph"
349ede6a
JX
13378msgstr "保存图形的对象目录"
13379
7e6630a7 13380#: builtin/commit-graph.c:73
349ede6a
JX
13381msgid "if the commit-graph is split, only verify the tip file"
13382msgstr "如果提交图形被拆分,只验证头一个文件"
13383
7e6630a7 13384#: builtin/commit-graph.c:100
349ede6a
JX
13385#, c-format
13386msgid "Could not open commit-graph '%s'"
13387msgstr "无法打开提交图形 '%s'"
13388
7e6630a7 13389#: builtin/commit-graph.c:137
349ede6a
JX
13390#, c-format
13391msgid "unrecognized --split argument, %s"
13392msgstr "未能识别的 --split 参数,%s"
13393
7e6630a7 13394#: builtin/commit-graph.c:150
7157c2b5
JX
13395#, c-format
13396msgid "unexpected non-hex object ID: %s"
13397msgstr "意外的非十六进制对象 ID:%s"
13398
7e6630a7 13399#: builtin/commit-graph.c:155
7157c2b5
JX
13400#, c-format
13401msgid "invalid object: %s"
13402msgstr "无效对象:%s"
13403
7e6630a7 13404#: builtin/commit-graph.c:205
349ede6a
JX
13405msgid "start walk at all refs"
13406msgstr "开始遍历所有引用"
13407
7e6630a7 13408#: builtin/commit-graph.c:207
349ede6a
JX
13409msgid "scan pack-indexes listed by stdin for commits"
13410msgstr "从标准输入中的包索引文件列表中扫描提交"
13411
7e6630a7 13412#: builtin/commit-graph.c:209
349ede6a
JX
13413msgid "start walk at commits listed by stdin"
13414msgstr "从标准输入中的提交开始扫描"
13415
7e6630a7 13416#: builtin/commit-graph.c:211
349ede6a
JX
13417msgid "include all commits already in the commit-graph file"
13418msgstr "包含 commit-graph 文件中已有所有提交"
13419
7e6630a7 13420#: builtin/commit-graph.c:213
349ede6a
JX
13421msgid "enable computation for changed paths"
13422msgstr "启用变更路径的计算"
13423
7e6630a7 13424#: builtin/commit-graph.c:215
349ede6a
JX
13425msgid "allow writing an incremental commit-graph file"
13426msgstr "允许写一个增量提交图形文件"
13427
7e6630a7 13428#: builtin/commit-graph.c:219
349ede6a
JX
13429msgid "maximum number of commits in a non-base split commit-graph"
13430msgstr "在非基本拆分提交图形中的最大提交数"
13431
7e6630a7 13432#: builtin/commit-graph.c:221
349ede6a
JX
13433msgid "maximum ratio between two levels of a split commit-graph"
13434msgstr "一个拆分提交图形的两个级别之间的最大比率"
13435
7e6630a7 13436#: builtin/commit-graph.c:223
349ede6a
JX
13437msgid "only expire files older than a given date-time"
13438msgstr "只让早于给定时间的文件过期"
13439
7e6630a7 13440#: builtin/commit-graph.c:225
d9488fea
JX
13441msgid "maximum number of changed-path Bloom filters to compute"
13442msgstr "要计算的变更路径布隆过滤器的最大数"
13443
7e6630a7 13444#: builtin/commit-graph.c:251
349ede6a
JX
13445msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
13446msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
13447
84bf71ea 13448#: builtin/commit-graph.c:282
7157c2b5
JX
13449msgid "Collecting commits from input"
13450msgstr "正从标准输入收集提交"
349ede6a 13451
7e6630a7
FZ
13452#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
13453#, c-format
13454msgid "unrecognized subcommand: %s"
13455msgstr "未识别的子命令:%s"
13456
d46c5519
JX
13457#: builtin/commit-tree.c:18
13458msgid ""
13459"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
13460"<file>)...] <tree>"
13461msgstr ""
13462"git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件"
13463">)...] <树>"
13464
13465#: builtin/commit-tree.c:31
13466#, c-format
13467msgid "duplicate parent %s ignored"
13468msgstr "忽略重复的父提交 %s"
13469
7e6630a7 13470#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
d46c5519
JX
13471#, c-format
13472msgid "not a valid object name %s"
13473msgstr "不是一个有效的对象名 %s"
13474
7e6630a7 13475#: builtin/commit-tree.c:94
d46c5519
JX
13476#, c-format
13477msgid "git commit-tree: failed to read '%s'"
13478msgstr "git commit-tree:无法读取 '%s'"
13479
7e6630a7 13480#: builtin/commit-tree.c:96
d46c5519
JX
13481#, c-format
13482msgid "git commit-tree: failed to close '%s'"
13483msgstr "git commit-tree:无法关闭 '%s'"
13484
7e6630a7 13485#: builtin/commit-tree.c:109
d46c5519
JX
13486msgid "parent"
13487msgstr "父提交"
13488
7e6630a7 13489#: builtin/commit-tree.c:110
d46c5519 13490msgid "id of a parent commit object"
5b533632 13491msgstr "父提交对象 ID"
d46c5519 13492
7e6630a7
FZ
13493#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
13494#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
13495#: builtin/tag.c:454
d46c5519
JX
13496msgid "message"
13497msgstr "说明"
13498
7e6630a7 13499#: builtin/commit-tree.c:113 builtin/commit.c:1626
d46c5519
JX
13500msgid "commit message"
13501msgstr "提交说明"
13502
7e6630a7 13503#: builtin/commit-tree.c:116
d46c5519
JX
13504msgid "read commit log message from file"
13505msgstr "从文件中读取提交说明"
13506
7e6630a7 13507#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
ffa14514 13508#: builtin/pull.c:180 builtin/revert.c:118
d46c5519
JX
13509msgid "GPG sign commit"
13510msgstr "GPG 提交签名"
13511
7e6630a7 13512#: builtin/commit-tree.c:131
d46c5519
JX
13513msgid "must give exactly one tree"
13514msgstr "必须精确地提供一个树"
13515
7e6630a7 13516#: builtin/commit-tree.c:138
d46c5519
JX
13517msgid "git commit-tree: failed to read"
13518msgstr "git commit-tree:读取失败"
13519
7e6630a7 13520#: builtin/commit.c:42
814ff314 13521msgid "git commit [<options>] [--] <pathspec>..."
160fb2b2 13522msgstr "git commit [<选项>] [--] <路径规格>..."
ef317cd5 13523
7e6630a7 13524#: builtin/commit.c:47
814ff314 13525msgid "git status [<options>] [--] <pathspec>..."
160fb2b2 13526msgstr "git status [<选项>] [--] <路径规格>..."
ef317cd5 13527
7e6630a7 13528#: builtin/commit.c:52
c04f5ac3
JX
13529msgid ""
13530"You asked to amend the most recent commit, but doing so would make\n"
13531"it empty. You can repeat your command with --allow-empty, or you can\n"
13532"remove the commit entirely with \"git reset HEAD^\".\n"
13533msgstr ""
1b150dc9
T
13534"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
13535"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 13536
7e6630a7 13537#: builtin/commit.c:57
c04f5ac3
JX
13538msgid ""
13539"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
13540"If you wish to commit it anyway, use:\n"
13541"\n"
13542" git commit --allow-empty\n"
13543"\n"
c04f5ac3 13544msgstr ""
a9ce4543
T
13545"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
13546"也要提交,使用命令:\n"
c04f5ac3
JX
13547"\n"
13548" git commit --allow-empty\n"
13549"\n"
c04f5ac3 13550
7e6630a7 13551#: builtin/commit.c:64
349ede6a
JX
13552msgid "Otherwise, please use 'git rebase --skip'\n"
13553msgstr "否则,请使用 'git rebase --skip'\n"
13554
7e6630a7 13555#: builtin/commit.c:67
a6cd2cc4
JX
13556msgid "Otherwise, please use 'git cherry-pick --skip'\n"
13557msgstr "否则,请使用 'git cherry-pick --skip'\n"
b1894384 13558
7e6630a7 13559#: builtin/commit.c:70
b1894384 13560msgid ""
a6cd2cc4
JX
13561"and then use:\n"
13562"\n"
13563" git cherry-pick --continue\n"
13564"\n"
13565"to resume cherry-picking the remaining commits.\n"
b1894384
JX
13566"If you wish to skip this commit, use:\n"
13567"\n"
a6cd2cc4 13568" git cherry-pick --skip\n"
b1894384 13569"\n"
b1894384 13570msgstr ""
a6cd2cc4
JX
13571"然后使用:\n"
13572"\n"
13573" git cherry-pick --continue\n"
b1894384 13574"\n"
a6cd2cc4
JX
13575"来继续拣选剩余提交。如果您想跳过此提交,使用:\n"
13576"\n"
13577" git cherry-pick --skip\n"
b1894384 13578"\n"
b1894384 13579
7e6630a7 13580#: builtin/commit.c:325
c04f5ac3 13581msgid "failed to unpack HEAD tree object"
c1ac5258 13582msgstr "解包 HEAD 树对象失败"
c04f5ac3 13583
7e6630a7 13584#: builtin/commit.c:361
ddc12c42
JX
13585msgid "--pathspec-from-file with -a does not make sense"
13586msgstr "--pathspec-from-file 和 -a 在一起没有意义"
13587
7e6630a7 13588#: builtin/commit.c:375
ddc12c42
JX
13589msgid "No paths with --include/--only does not make sense."
13590msgstr "参数 --include/--only 不跟路径没有意义。"
13591
7e6630a7 13592#: builtin/commit.c:387
c04f5ac3 13593msgid "unable to create temporary index"
90e6ef53 13594msgstr "不能创建临时索引"
c04f5ac3 13595
7e6630a7 13596#: builtin/commit.c:396
c04f5ac3
JX
13597msgid "interactive add failed"
13598msgstr "交互式添加失败"
13599
7e6630a7 13600#: builtin/commit.c:411
220c313c
JX
13601msgid "unable to update temporary index"
13602msgstr "无法更新临时索引"
13603
7e6630a7 13604#: builtin/commit.c:413
220c313c
JX
13605msgid "Failed to update main cache tree"
13606msgstr "不能更新树的主缓存"
13607
7e6630a7 13608#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
c04f5ac3 13609msgid "unable to write new_index file"
90e6ef53 13610msgstr "无法写 new_index 文件"
c04f5ac3 13611
7e6630a7 13612#: builtin/commit.c:490
8ada9598 13613msgid "cannot do a partial commit during a merge."
81809b99 13614msgstr "在合并过程中不能做部分提交。"
c04f5ac3 13615
7e6630a7 13616#: builtin/commit.c:492
8ada9598 13617msgid "cannot do a partial commit during a cherry-pick."
81809b99 13618msgstr "在拣选过程中不能做部分提交。"
8ada9598 13619
7e6630a7 13620#: builtin/commit.c:494
349ede6a
JX
13621msgid "cannot do a partial commit during a rebase."
13622msgstr "在变基过程中不能做部分提交。"
13623
7e6630a7 13624#: builtin/commit.c:502
c04f5ac3 13625msgid "cannot read the index"
90e6ef53 13626msgstr "无法读取索引"
c04f5ac3 13627
7e6630a7 13628#: builtin/commit.c:521
c04f5ac3 13629msgid "unable to write temporary index file"
90e6ef53 13630msgstr "无法写临时索引文件"
c04f5ac3 13631
7e6630a7 13632#: builtin/commit.c:619
220c313c
JX
13633#, c-format
13634msgid "commit '%s' lacks author header"
13635msgstr "提交 '%s' 缺少作者信息"
13636
7e6630a7 13637#: builtin/commit.c:621
c04f5ac3 13638#, c-format
220c313c 13639msgid "commit '%s' has malformed author line"
fd8cb379 13640msgstr "提交 '%s' 有格式错误的作者信息"
c04f5ac3 13641
7e6630a7 13642#: builtin/commit.c:640
c04f5ac3 13643msgid "malformed --author parameter"
fd8cb379 13644msgstr "格式错误的 --author 参数"
c04f5ac3 13645
7e6630a7 13646#: builtin/commit.c:693
6acbf033
JX
13647msgid ""
13648"unable to select a comment character that is not used\n"
13649"in the current commit message"
13650msgstr "无法选择一个未被当前提交说明使用的注释字符"
13651
7e6630a7 13652#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
c04f5ac3
JX
13653#, c-format
13654msgid "could not lookup commit %s"
13655msgstr "不能查询提交 %s"
13656
7e6630a7 13657#: builtin/commit.c:759 builtin/shortlog.c:416
c04f5ac3
JX
13658#, c-format
13659msgid "(reading log message from standard input)\n"
90e6ef53 13660msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 13661
7e6630a7 13662#: builtin/commit.c:761
c04f5ac3 13663msgid "could not read log from standard input"
90e6ef53 13664msgstr "不能从标准输入中读取日志信息"
c04f5ac3 13665
7e6630a7 13666#: builtin/commit.c:765
c04f5ac3
JX
13667#, c-format
13668msgid "could not read log file '%s'"
90e6ef53 13669msgstr "不能读取日志文件 '%s'"
c04f5ac3 13670
7e6630a7 13671#: builtin/commit.c:802
33b62fba
JX
13672#, c-format
13673msgid "cannot combine -m with --fixup:%s"
13674msgstr "不能将 -m 和 --fixup 组合使用:%s"
13675
7e6630a7 13676#: builtin/commit.c:814 builtin/commit.c:830
c04f5ac3 13677msgid "could not read SQUASH_MSG"
90e6ef53 13678msgstr "不能读取 SQUASH_MSG"
c04f5ac3 13679
7e6630a7 13680#: builtin/commit.c:821
5b04ee3b
JX
13681msgid "could not read MERGE_MSG"
13682msgstr "不能读取 MERGE_MSG"
13683
7e6630a7 13684#: builtin/commit.c:881
c04f5ac3 13685msgid "could not write commit template"
90e6ef53 13686msgstr "不能写提交模版"
c04f5ac3 13687
7e6630a7 13688#: builtin/commit.c:894
ec3d4607
JX
13689#, c-format
13690msgid ""
13691"Please enter the commit message for your changes. Lines starting\n"
13692"with '%c' will be ignored.\n"
13693msgstr "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略。\n"
13694
7e6630a7 13695#: builtin/commit.c:896
ec3d4607
JX
13696#, c-format
13697msgid ""
13698"Please enter the commit message for your changes. Lines starting\n"
13699"with '%c' will be ignored, and an empty message aborts the commit.\n"
13700msgstr ""
13701"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
13702"说明将会终止提交。\n"
13703
7e6630a7 13704#: builtin/commit.c:900
ec3d4607
JX
13705#, c-format
13706msgid ""
13707"Please enter the commit message for your changes. Lines starting\n"
13708"with '%c' will be kept; you may remove them yourself if you want to.\n"
13709msgstr ""
13710"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您愿意\n"
13711"也可以删除它们。\n"
13712
7e6630a7 13713#: builtin/commit.c:904
ec3d4607
JX
13714#, c-format
13715msgid ""
13716"Please enter the commit message for your changes. Lines starting\n"
13717"with '%c' will be kept; you may remove them yourself if you want to.\n"
13718"An empty message aborts the commit.\n"
13719msgstr ""
13720"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您愿意\n"
13721"也可以删除它们。一个空的提交说明将会终止提交。\n"
13722
7e6630a7 13723#: builtin/commit.c:916
c04f5ac3
JX
13724msgid ""
13725"\n"
8ada9598 13726"It looks like you may be committing a merge.\n"
d9488fea
JX
13727"If this is not correct, please run\n"
13728"\tgit update-ref -d MERGE_HEAD\n"
c04f5ac3
JX
13729"and try again.\n"
13730msgstr ""
13731"\n"
d9488fea
JX
13732"似乎您正在做一个合并提交。如果不对,请运行\n"
13733"\tgit update-ref -d MERGE_HEAD\n"
c04f5ac3
JX
13734"然后重试。\n"
13735
7e6630a7 13736#: builtin/commit.c:921
8ada9598
JX
13737msgid ""
13738"\n"
13739"It looks like you may be committing a cherry-pick.\n"
d9488fea
JX
13740"If this is not correct, please run\n"
13741"\tgit update-ref -d CHERRY_PICK_HEAD\n"
8ada9598
JX
13742"and try again.\n"
13743msgstr ""
13744"\n"
d9488fea
JX
13745"似乎您正在做一个拣选提交。如果不对,请运行\n"
13746"\tgit update-ref -d CHERRY_PICK_HEAD\n"
8ada9598 13747"然后重试。\n"
c04f5ac3 13748
90e6ef53 13749# 译者:为保证在输出中对齐,注意调整句中空格!
7e6630a7 13750#: builtin/commit.c:948
6acbf033
JX
13751#, c-format
13752msgid "%sAuthor: %.*s <%.*s>"
13753msgstr "%s作者: %.*s <%.*s>"
13754
13755# 译者:为保证在输出中对齐,注意调整句中空格!
7e6630a7 13756#: builtin/commit.c:956
c04f5ac3 13757#, c-format
6acbf033
JX
13758msgid "%sDate: %s"
13759msgstr "%s日期: %s"
c04f5ac3 13760
90e6ef53 13761# 译者:为保证在输出中对齐,注意调整句中空格!
7e6630a7 13762#: builtin/commit.c:963
c04f5ac3 13763#, c-format
6acbf033
JX
13764msgid "%sCommitter: %.*s <%.*s>"
13765msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 13766
7e6630a7 13767#: builtin/commit.c:981
c04f5ac3 13768msgid "Cannot read index"
90e6ef53 13769msgstr "无法读取索引"
c04f5ac3 13770
7e6630a7 13771#: builtin/commit.c:1026
33b62fba
JX
13772msgid "unable to pass trailers to --trailers"
13773msgstr "无法将尾注传递给 --trailers"
13774
7e6630a7 13775#: builtin/commit.c:1066
c04f5ac3
JX
13776msgid "Error building trees"
13777msgstr "无法创建树对象"
13778
7e6630a7 13779#: builtin/commit.c:1080 builtin/tag.c:317
c04f5ac3
JX
13780#, c-format
13781msgid "Please supply the message using either -m or -F option.\n"
07432cef 13782msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 13783
7e6630a7 13784#: builtin/commit.c:1124
c04f5ac3 13785#, c-format
814ff314 13786msgid "--author '%s' is not 'Name <email>' and matches no existing author"
58b6f078 13787msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配"
c04f5ac3 13788
7e6630a7 13789#: builtin/commit.c:1138
5809aa05
JX
13790#, c-format
13791msgid "Invalid ignored mode '%s'"
13792msgstr "无效的忽略模式 '%s'"
13793
7e6630a7 13794#: builtin/commit.c:1156 builtin/commit.c:1450
c04f5ac3
JX
13795#, c-format
13796msgid "Invalid untracked files mode '%s'"
90e6ef53 13797msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 13798
7e6630a7 13799#: builtin/commit.c:1196
2e8451e8
JX
13800msgid "--long and -z are incompatible"
13801msgstr "--long 和 -z 选项不兼容"
13802
7e6630a7 13803#: builtin/commit.c:1227
33b62fba
JX
13804msgid "You are in the middle of a merge -- cannot reword."
13805msgstr "您正处于一个合并过程中 -- 无法改写说明。"
13806
7e6630a7 13807#: builtin/commit.c:1229
33b62fba
JX
13808msgid "You are in the middle of a cherry-pick -- cannot reword."
13809msgstr "您正处于一个拣选过程中 -- 无法改写说明。"
13810
7e6630a7 13811#: builtin/commit.c:1232
33b62fba
JX
13812#, c-format
13813msgid "cannot combine reword option of --fixup with path '%s'"
523ccf5d 13814msgstr "不能将 --fixup 的改写说明选项和路径 '%s' 组合使用"
33b62fba 13815
7e6630a7 13816#: builtin/commit.c:1234
33b62fba
JX
13817msgid ""
13818"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
13819"all/--include/--only"
ec3d4607
JX
13820msgstr ""
13821"--fixup 的 reword 选项和 --patch/--interactive/--all/--include/--only 互斥"
33b62fba 13822
7e6630a7 13823#: builtin/commit.c:1253
c04f5ac3
JX
13824msgid "Using both --reset-author and --author does not make sense"
13825msgstr "同时使用 --reset-author 和 --author 没有意义"
13826
7e6630a7 13827#: builtin/commit.c:1260
c04f5ac3 13828msgid "You have nothing to amend."
90e6ef53 13829msgstr "您没有可修补的提交。"
c04f5ac3 13830
7e6630a7 13831#: builtin/commit.c:1263
8ada9598 13832msgid "You are in the middle of a merge -- cannot amend."
81809b99 13833msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 13834
7e6630a7 13835#: builtin/commit.c:1265
8ada9598 13836msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 13837msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 13838
7e6630a7 13839#: builtin/commit.c:1267
349ede6a
JX
13840msgid "You are in the middle of a rebase -- cannot amend."
13841msgstr "您正处于一个变基过程中 -- 无法修补提交。"
13842
7e6630a7 13843#: builtin/commit.c:1270
c04f5ac3 13844msgid "Options --squash and --fixup cannot be used together"
649900bc 13845msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 13846
7e6630a7 13847#: builtin/commit.c:1280
c04f5ac3
JX
13848msgid "Only one of -c/-C/-F/--fixup can be used."
13849msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
13850
7e6630a7 13851#: builtin/commit.c:1282
31e5e17b
JX
13852msgid "Option -m cannot be combined with -c/-C/-F."
13853msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
c04f5ac3 13854
7e6630a7 13855#: builtin/commit.c:1291
c04f5ac3 13856msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 13857msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 13858
7e6630a7 13859#: builtin/commit.c:1309
c04f5ac3
JX
13860msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
13861msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
13862
7e6630a7 13863#: builtin/commit.c:1337
33b62fba
JX
13864#, c-format
13865msgid "unknown option: --fixup=%s:%s"
13866msgstr "未知选项:--fixup=%s:%s"
13867
7e6630a7 13868#: builtin/commit.c:1354
c04f5ac3 13869#, c-format
d46c5519
JX
13870msgid "paths '%s ...' with -a does not make sense"
13871msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"
c04f5ac3 13872
7e6630a7 13873#: builtin/commit.c:1485 builtin/commit.c:1654
ef317cd5 13874msgid "show status concisely"
07432cef 13875msgstr "以简洁的格式显示状态"
ef317cd5 13876
7e6630a7 13877#: builtin/commit.c:1487 builtin/commit.c:1656
ef317cd5 13878msgid "show branch information"
07432cef 13879msgstr "显示分支信息"
ef317cd5 13880
7e6630a7 13881#: builtin/commit.c:1489
a4f16749
JX
13882msgid "show stash information"
13883msgstr "显示贮藏区信息"
13884
7e6630a7 13885#: builtin/commit.c:1491 builtin/commit.c:1658
31e5e17b
JX
13886msgid "compute full ahead/behind values"
13887msgstr "计算完整的领先/落后值"
13888
7e6630a7 13889#: builtin/commit.c:1493
a0b6b246
JX
13890msgid "version"
13891msgstr "版本"
13892
7e6630a7
FZ
13893#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
13894#: builtin/worktree.c:691
ef317cd5 13895msgid "machine-readable output"
07432cef
WS
13896msgstr "机器可读的输出"
13897
7e6630a7 13898#: builtin/commit.c:1496 builtin/commit.c:1662
07432cef
WS
13899msgid "show status in long format (default)"
13900msgstr "以长格式显示状态(默认)"
ef317cd5 13901
7e6630a7 13902#: builtin/commit.c:1499 builtin/commit.c:1665
ef317cd5 13903msgid "terminate entries with NUL"
4375c10e 13904msgstr "条目以 NUL 字符结尾"
ef317cd5 13905
7e6630a7
FZ
13906#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
13907#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
ffa14514 13908#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
ef317cd5 13909msgid "mode"
07432cef 13910msgstr "模式"
ef317cd5 13911
7e6630a7 13912#: builtin/commit.c:1502 builtin/commit.c:1668
ef317cd5 13913msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 13914msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 13915
7e6630a7 13916#: builtin/commit.c:1506
5809aa05
JX
13917msgid ""
13918"show ignored files, optional modes: traditional, matching, no. (Default: "
13919"traditional)"
31e5e17b
JX
13920msgstr ""
13921"显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)"
ef317cd5 13922
7e6630a7 13923#: builtin/commit.c:1508 parse-options.h:192
ef317cd5
JX
13924msgid "when"
13925msgstr "何时"
13926
7e6630a7 13927#: builtin/commit.c:1509
ef317cd5
JX
13928msgid ""
13929"ignore changes to submodules, optional when: all, dirty, untracked. "
13930"(Default: all)"
13931msgstr ""
07432cef 13932"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 13933
7e6630a7 13934#: builtin/commit.c:1511
ef317cd5 13935msgid "list untracked files in columns"
07432cef 13936msgstr "以列的方式显示未跟踪的文件"
ef317cd5 13937
7e6630a7 13938#: builtin/commit.c:1512
fd8cb379
JX
13939msgid "do not detect renames"
13940msgstr "不检测重命名"
13941
7e6630a7 13942#: builtin/commit.c:1514
fd8cb379
JX
13943msgid "detect renames, optionally set similarity index"
13944msgstr "检测重命名,可以设置索引相似度"
13945
7e6630a7 13946#: builtin/commit.c:1537
5809aa05
JX
13947msgid "Unsupported combination of ignored and untracked-files arguments"
13948msgstr "不支持已忽略和未跟踪文件参数的组合"
13949
7e6630a7 13950#: builtin/commit.c:1619
ef317cd5 13951msgid "suppress summary after successful commit"
07432cef 13952msgstr "提交成功后不显示概述信息"
c04f5ac3 13953
7e6630a7 13954#: builtin/commit.c:1620
ef317cd5 13955msgid "show diff in commit message template"
07432cef 13956msgstr "在提交说明模板里显示差异"
c04f5ac3 13957
7e6630a7 13958#: builtin/commit.c:1622
ef317cd5 13959msgid "Commit message options"
07432cef 13960msgstr "提交说明选项"
c04f5ac3 13961
7e6630a7 13962#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
ef317cd5 13963msgid "read message from file"
07432cef 13964msgstr "从文件中读取提交说明"
c04f5ac3 13965
7e6630a7 13966#: builtin/commit.c:1624
ef317cd5 13967msgid "author"
07432cef 13968msgstr "作者"
c04f5ac3 13969
7e6630a7 13970#: builtin/commit.c:1624
ef317cd5 13971msgid "override author for commit"
07432cef 13972msgstr "提交时覆盖作者"
73a60cd2 13973
7e6630a7 13974#: builtin/commit.c:1625 builtin/gc.c:550
ef317cd5 13975msgid "date"
07432cef 13976msgstr "日期"
c04f5ac3 13977
7e6630a7 13978#: builtin/commit.c:1625
ef317cd5 13979msgid "override date for commit"
07432cef 13980msgstr "提交时覆盖日期"
c04f5ac3 13981
7e6630a7 13982#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
ffa14514 13983#: parse-options.h:327 ref-filter.h:92
94550ed3
JX
13984msgid "commit"
13985msgstr "提交"
13986
7e6630a7 13987#: builtin/commit.c:1627
ef317cd5 13988msgid "reuse and edit message from specified commit"
07432cef 13989msgstr "重用并编辑指定提交的提交说明"
ef317cd5 13990
7e6630a7 13991#: builtin/commit.c:1628
ef317cd5 13992msgid "reuse message from specified commit"
07432cef 13993msgstr "重用指定提交的提交说明"
ef317cd5 13994
33b62fba
JX
13995#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
13996#. and only translate <commit>.
13997#.
7e6630a7 13998#: builtin/commit.c:1633
33b62fba
JX
13999msgid "[(amend|reword):]commit"
14000msgstr "[(amend|reword):]提交"
14001
7e6630a7 14002#: builtin/commit.c:1633
33b62fba
JX
14003msgid ""
14004"use autosquash formatted message to fixup or amend/reword specified commit"
14005msgstr "使用自动挤压格式的提交说明对指定的提交进行修正、修补或改写说明"
ef317cd5 14006
7e6630a7 14007#: builtin/commit.c:1634
ef317cd5 14008msgid "use autosquash formatted message to squash specified commit"
33b62fba 14009msgstr "使用自动挤压格式的提交说明用以挤压至指定的提交"
ef317cd5 14010
7e6630a7 14011#: builtin/commit.c:1635
ef317cd5 14012msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 14013msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 14014
7e6630a7 14015#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
33b62fba
JX
14016msgid "trailer"
14017msgstr "尾注"
14018
7e6630a7 14019#: builtin/commit.c:1636
33b62fba
JX
14020msgid "add custom trailer(s)"
14021msgstr "添加自定义尾注"
14022
7e6630a7 14023#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
ffa14514 14024#: builtin/pull.c:146 builtin/revert.c:110
d13389bf
JX
14025msgid "add a Signed-off-by trailer"
14026msgstr "添加 Signed-off-by 尾注"
ef317cd5 14027
7e6630a7 14028#: builtin/commit.c:1638
ef317cd5 14029msgid "use specified template file"
07432cef 14030msgstr "使用指定的模板文件"
ef317cd5 14031
7e6630a7 14032#: builtin/commit.c:1639
ef317cd5 14033msgid "force edit of commit"
07432cef 14034msgstr "强制编辑提交"
ef317cd5 14035
7e6630a7 14036#: builtin/commit.c:1641
ef317cd5 14037msgid "include status in commit message template"
07432cef 14038msgstr "在提交说明模板里包含状态信息"
ef317cd5 14039
7e6630a7 14040#: builtin/commit.c:1646
ef317cd5 14041msgid "Commit contents options"
07432cef 14042msgstr "提交内容选项"
ef317cd5 14043
7e6630a7 14044#: builtin/commit.c:1647
ef317cd5 14045msgid "commit all changed files"
07432cef 14046msgstr "提交所有改动的文件"
ef317cd5 14047
7e6630a7 14048#: builtin/commit.c:1648
ef317cd5 14049msgid "add specified files to index for commit"
07432cef 14050msgstr "添加指定的文件到索引区等待提交"
ef317cd5 14051
7e6630a7 14052#: builtin/commit.c:1649
ef317cd5 14053msgid "interactively add files"
07432cef 14054msgstr "交互式添加文件"
ef317cd5 14055
7e6630a7 14056#: builtin/commit.c:1650
ef317cd5 14057msgid "interactively add changes"
07432cef 14058msgstr "交互式添加变更"
ef317cd5 14059
7e6630a7 14060#: builtin/commit.c:1651
ef317cd5 14061msgid "commit only specified files"
07432cef 14062msgstr "只提交指定的文件"
ef317cd5 14063
7e6630a7 14064#: builtin/commit.c:1652
5c57d762
JX
14065msgid "bypass pre-commit and commit-msg hooks"
14066msgstr "绕过 pre-commit 和 commit-msg 钩子"
14067
7e6630a7 14068#: builtin/commit.c:1653
ef317cd5 14069msgid "show what would be committed"
07432cef 14070msgstr "显示将要提交的内容"
ef317cd5 14071
7e6630a7 14072#: builtin/commit.c:1666
ef317cd5 14073msgid "amend previous commit"
07432cef 14074msgstr "修改先前的提交"
ef317cd5 14075
7e6630a7 14076#: builtin/commit.c:1667
ef317cd5 14077msgid "bypass post-rewrite hook"
07432cef 14078msgstr "绕过 post-rewrite 钩子"
ef317cd5 14079
7e6630a7 14080#: builtin/commit.c:1674
ef317cd5 14081msgid "ok to record an empty change"
07432cef 14082msgstr "允许一个空提交"
ef317cd5 14083
7e6630a7 14084#: builtin/commit.c:1676
ef317cd5 14085msgid "ok to record a change with an empty message"
07432cef 14086msgstr "允许空的提交说明"
ef317cd5 14087
7e6630a7 14088#: builtin/commit.c:1752
c04f5ac3
JX
14089#, c-format
14090msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 14091msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 14092
7e6630a7 14093#: builtin/commit.c:1759
c04f5ac3 14094msgid "could not read MERGE_MODE"
90e6ef53 14095msgstr "不能读取 MERGE_MODE"
c04f5ac3 14096
7e6630a7 14097#: builtin/commit.c:1780
c04f5ac3
JX
14098#, c-format
14099msgid "could not read commit message: %s"
90e6ef53 14100msgstr "不能读取提交说明:%s"
c04f5ac3 14101
7e6630a7 14102#: builtin/commit.c:1787
c04f5ac3
JX
14103#, c-format
14104msgid "Aborting commit due to empty commit message.\n"
14105msgstr "终止提交因为提交说明为空。\n"
14106
7e6630a7 14107#: builtin/commit.c:1792
6937cb4e
JX
14108#, c-format
14109msgid "Aborting commit; you did not edit the message.\n"
14110msgstr "终止提交;您未更改来自模版的提交说明。\n"
14111
7e6630a7 14112#: builtin/commit.c:1803
33b62fba
JX
14113#, c-format
14114msgid "Aborting commit due to empty commit message body.\n"
7b4d4954 14115msgstr "因提交说明的正文为空而终止提交。\n"
33b62fba 14116
7e6630a7 14117#: builtin/commit.c:1839
c04f5ac3 14118msgid ""
c1ac5258 14119"repository has been updated, but unable to write\n"
220c313c 14120"new_index file. Check that disk is not full and quota is\n"
a6cd2cc4 14121"not exceeded, and then \"git restore --staged :/\" to recover."
c04f5ac3 14122msgstr ""
a6cd2cc4
JX
14123"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满或\n"
14124"磁盘配额已耗尽,然后执行 \"git restore --staged :/\" 恢复。"
c04f5ac3 14125
4c27fcb5 14126#: builtin/config.c:11
814ff314
JX
14127msgid "git config [<options>]"
14128msgstr "git config [<选项>]"
ef317cd5 14129
d13389bf 14130#: builtin/config.c:109 builtin/env--helper.c:27
fd8cb379
JX
14131#, c-format
14132msgid "unrecognized --type argument, %s"
14133msgstr "未能识别的 --type 参数,%s"
14134
d13389bf 14135#: builtin/config.c:121
c1ac5258
JX
14136msgid "only one type at a time"
14137msgstr "一次只能一个类型"
14138
d13389bf 14139#: builtin/config.c:130
ef317cd5 14140msgid "Config file location"
07432cef 14141msgstr "配置文件位置"
ef317cd5 14142
d13389bf 14143#: builtin/config.c:131
ef317cd5 14144msgid "use global config file"
07432cef 14145msgstr "使用全局配置文件"
ef317cd5 14146
d13389bf 14147#: builtin/config.c:132
ef317cd5 14148msgid "use system config file"
07432cef 14149msgstr "使用系统级配置文件"
ef317cd5 14150
d13389bf 14151#: builtin/config.c:133
ef317cd5 14152msgid "use repository config file"
160fb2b2 14153msgstr "使用仓库级配置文件"
ef317cd5 14154
d13389bf 14155#: builtin/config.c:134
4c27fcb5
JX
14156msgid "use per-worktree config file"
14157msgstr "使用工作区级别的配置文件"
14158
d13389bf 14159#: builtin/config.c:135
ef317cd5 14160msgid "use given config file"
07432cef 14161msgstr "使用指定的配置文件"
ef317cd5 14162
d13389bf 14163#: builtin/config.c:136
2e8451e8 14164msgid "blob-id"
4375c10e 14165msgstr "数据对象 ID"
2e8451e8 14166
d13389bf 14167#: builtin/config.c:136
2e8451e8
JX
14168msgid "read config from given blob object"
14169msgstr "从给定的数据对象读取配置"
14170
d13389bf 14171#: builtin/config.c:137
ef317cd5 14172msgid "Action"
07432cef 14173msgstr "操作"
ef317cd5 14174
d9488fea 14175#: builtin/config.c:138
d13389bf
JX
14176msgid "get value: name [value-pattern]"
14177msgstr "获取值:名称 [值模式]"
ef317cd5 14178
d9488fea 14179#: builtin/config.c:139
d13389bf
JX
14180msgid "get all values: key [value-pattern]"
14181msgstr "获得所有的值:键 [值模式]"
90314792 14182
d9488fea 14183#: builtin/config.c:140
d13389bf
JX
14184msgid "get values for regexp: name-regex [value-pattern]"
14185msgstr "根据正则表达式获得值:名称正则 [值模式]"
ef317cd5 14186
d9488fea 14187#: builtin/config.c:141
d13389bf
JX
14188msgid "get value specific for the URL: section[.var] URL"
14189msgstr "获得 URL 取值:section[.var] URL"
ef317cd5 14190
d9488fea 14191#: builtin/config.c:142
d13389bf
JX
14192msgid "replace all matching variables: name value [value-pattern]"
14193msgstr "替换所有匹配的变量:名称 值 [值模式]"
ef317cd5 14194
d9488fea 14195#: builtin/config.c:143
d13389bf
JX
14196msgid "add a new variable: name value"
14197msgstr "添加一个新的变量:名称 值"
ef317cd5 14198
d9488fea 14199#: builtin/config.c:144
d13389bf
JX
14200msgid "remove a variable: name [value-pattern]"
14201msgstr "删除一个变量:名称 [值模式]"
14202
14203#: builtin/config.c:145
14204msgid "remove all matches: name [value-pattern]"
14205msgstr "删除所有匹配项:名称 [值模式]"
14206
14207#: builtin/config.c:146
ef317cd5 14208msgid "rename section: old-name new-name"
07432cef 14209msgstr "重命名小节:old-name new-name"
ef317cd5 14210
d13389bf 14211#: builtin/config.c:147
ef317cd5 14212msgid "remove a section: name"
07432cef 14213msgstr "删除一个小节:name"
ef317cd5 14214
d13389bf 14215#: builtin/config.c:148
ef317cd5 14216msgid "list all"
07432cef 14217msgstr "列出所有"
ef317cd5 14218
d13389bf
JX
14219#: builtin/config.c:149
14220msgid "use string equality when comparing values to 'value-pattern'"
14221msgstr "在比较值与 '值模式' 时,使用字符串字面比较"
14222
14223#: builtin/config.c:150
ef317cd5 14224msgid "open an editor"
07432cef 14225msgstr "打开一个编辑器"
ef317cd5 14226
d13389bf 14227#: builtin/config.c:151
04cb2f28
JX
14228msgid "find the color configured: slot [default]"
14229msgstr "获得配置的颜色:配置 [默认]"
ef317cd5 14230
d13389bf 14231#: builtin/config.c:152
04cb2f28
JX
14232msgid "find the color setting: slot [stdout-is-tty]"
14233msgstr "获得颜色设置:配置 [stdout-is-tty]"
ef317cd5 14234
d13389bf 14235#: builtin/config.c:153
ef317cd5 14236msgid "Type"
07432cef 14237msgstr "类型"
ef317cd5 14238
d13389bf 14239#: builtin/config.c:154 builtin/env--helper.c:43
fd8cb379
JX
14240msgid "value is given this type"
14241msgstr "取值为该类型"
14242
d13389bf 14243#: builtin/config.c:155
ef317cd5 14244msgid "value is \"true\" or \"false\""
07432cef 14245msgstr "值是 \"true\" 或 \"false\""
ef317cd5 14246
d13389bf 14247#: builtin/config.c:156
ef317cd5 14248msgid "value is decimal number"
07432cef 14249msgstr "值是十进制数"
ef317cd5 14250
d13389bf 14251#: builtin/config.c:157
ef317cd5 14252msgid "value is --bool or --int"
d9488fea 14253msgstr "值是 --bool 或 --int"
ef317cd5 14254
d13389bf 14255#: builtin/config.c:158
d9488fea
JX
14256msgid "value is --bool or string"
14257msgstr "值是 --bool 或字符串"
14258
d13389bf 14259#: builtin/config.c:159
ef317cd5 14260msgid "value is a path (file or directory name)"
07432cef 14261msgstr "值是一个路径(文件或目录名)"
ef317cd5 14262
d13389bf 14263#: builtin/config.c:160
5809aa05
JX
14264msgid "value is an expiry date"
14265msgstr "值是一个到期日期"
14266
d13389bf 14267#: builtin/config.c:161
ef317cd5 14268msgid "Other"
07432cef 14269msgstr "其它"
ef317cd5 14270
d13389bf 14271#: builtin/config.c:162
ef317cd5 14272msgid "terminate values with NUL byte"
4375c10e 14273msgstr "终止值是 NUL 字节"
ef317cd5 14274
d13389bf 14275#: builtin/config.c:163
1b7f4a34
JX
14276msgid "show variable names only"
14277msgstr "只显示变量名"
14278
d13389bf 14279#: builtin/config.c:164
ef317cd5 14280msgid "respect include directives on lookup"
07432cef 14281msgstr "查询时参照 include 指令递归查找"
ef317cd5 14282
d13389bf 14283#: builtin/config.c:165
276ceeaa
JX
14284msgid "show origin of config (file, standard input, blob, command line)"
14285msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
14286
d13389bf 14287#: builtin/config.c:166
2b472aae 14288msgid "show scope of config (worktree, local, global, system, command)"
440e7442 14289msgstr "显示配置的作用域(工作区、本地、全局、系统、命令)"
2b472aae 14290
d13389bf 14291#: builtin/config.c:167 builtin/env--helper.c:45
fd8cb379
JX
14292msgid "value"
14293msgstr "取值"
14294
d13389bf 14295#: builtin/config.c:167
fd8cb379
JX
14296msgid "with --get, use default value when missing entry"
14297msgstr "使用 --get 参数,当缺少设置时使用默认值"
14298
d13389bf 14299#: builtin/config.c:181
c1ac5258
JX
14300#, c-format
14301msgid "wrong number of arguments, should be %d"
14302msgstr "错误的参数个数,应该为 %d 个"
14303
d13389bf 14304#: builtin/config.c:183
c1ac5258
JX
14305#, c-format
14306msgid "wrong number of arguments, should be from %d to %d"
14307msgstr "错误的参数个数,应该为从 %d 个到 %d 个"
14308
d13389bf 14309#: builtin/config.c:339
c1ac5258
JX
14310#, c-format
14311msgid "invalid key pattern: %s"
14312msgstr "无效键名模式:%s"
14313
d13389bf 14314#: builtin/config.c:377
fd8cb379
JX
14315#, c-format
14316msgid "failed to format default config value: %s"
c1ac5258
JX
14317msgstr "格式化默认配置值失败:%s"
14318
d13389bf 14319#: builtin/config.c:441
c1ac5258
JX
14320#, c-format
14321msgid "cannot parse color '%s'"
14322msgstr "无法解析颜色 '%s'"
fd8cb379 14323
d13389bf 14324#: builtin/config.c:483
220c313c 14325msgid "unable to parse default color value"
c1ac5258
JX
14326msgstr "无法解析默认颜色值"
14327
d13389bf 14328#: builtin/config.c:536 builtin/config.c:833
c1ac5258
JX
14329msgid "not in a git directory"
14330msgstr "不在 git 仓库中"
14331
d13389bf 14332#: builtin/config.c:539
c1ac5258
JX
14333msgid "writing to stdin is not supported"
14334msgstr "不支持写到标准输入"
14335
d13389bf 14336#: builtin/config.c:542
c1ac5258
JX
14337msgid "writing config blobs is not supported"
14338msgstr "不支持写到配置数据对象"
220c313c 14339
d13389bf 14340#: builtin/config.c:627
220c313c
JX
14341#, c-format
14342msgid ""
14343"# This is Git's per-user configuration file.\n"
7aea43ff 14344"[user]\n"
220c313c 14345"# Please adapt and uncomment the following lines:\n"
7aea43ff 14346"#\tname = %s\n"
220c313c
JX
14347"#\temail = %s\n"
14348msgstr ""
14349"# This is Git's per-user configuration file.\n"
7aea43ff 14350"[user]\n"
220c313c 14351"# Please adapt and uncomment the following lines:\n"
7aea43ff 14352"#\tname = %s\n"
220c313c
JX
14353"#\temail = %s\n"
14354
d13389bf 14355#: builtin/config.c:652
c1ac5258
JX
14356msgid "only one config file at a time"
14357msgstr "一次只能有一个配置文件"
14358
d13389bf 14359#: builtin/config.c:658
a4f16749 14360msgid "--local can only be used inside a git repository"
d9488fea 14361msgstr "--local 只能在 git 仓库内使用"
a4f16749 14362
d13389bf 14363#: builtin/config.c:660
fd8cb379 14364msgid "--blob can only be used inside a git repository"
d9488fea
JX
14365msgstr "--blob 只能在 git 仓库内使用"
14366
d13389bf 14367#: builtin/config.c:662
d9488fea
JX
14368msgid "--worktree can only be used inside a git repository"
14369msgstr "--worktree 只能在 git 仓库内使用"
fd8cb379 14370
d13389bf 14371#: builtin/config.c:684
c1ac5258
JX
14372msgid "$HOME not set"
14373msgstr "$HOME 未设置"
14374
d13389bf 14375#: builtin/config.c:708
4c27fcb5
JX
14376msgid ""
14377"--worktree cannot be used with multiple working trees unless the config\n"
14378"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
14379"section in \"git help worktree\" for details"
14380msgstr ""
14381"不能和多个工作区一起使用 --worktree,除非启用 worktreeConfig 配置扩展。\n"
14382"详情请阅读“git help worktree”的“CONFIGURATION FILE”小节"
14383
d13389bf 14384#: builtin/config.c:743
c1ac5258
JX
14385msgid "--get-color and variable type are incoherent"
14386msgstr "--get-color 和变量类型不兼容"
14387
d13389bf 14388#: builtin/config.c:748
c1ac5258
JX
14389msgid "only one action at a time"
14390msgstr "一次只能有一个动作"
14391
d13389bf 14392#: builtin/config.c:761
c1ac5258
JX
14393msgid "--name-only is only applicable to --list or --get-regexp"
14394msgstr "--name-only 仅适用于 --list 或 --get-regexp"
14395
d13389bf 14396#: builtin/config.c:767
c1ac5258
JX
14397msgid ""
14398"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
14399"list"
14400msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
14401
d13389bf 14402#: builtin/config.c:773
c1ac5258
JX
14403msgid "--default is only applicable to --get"
14404msgstr "--default 仅适用于 --get"
14405
d13389bf
JX
14406#: builtin/config.c:806
14407msgid "--fixed-value only applies with 'value-pattern'"
14408msgstr "--fixed-value 仅适用于有 '值模式'"
14409
14410#: builtin/config.c:822
c1ac5258
JX
14411#, c-format
14412msgid "unable to read config file '%s'"
14413msgstr "无法读取配置文件 '%s'"
14414
d13389bf 14415#: builtin/config.c:825
c1ac5258
JX
14416msgid "error processing config file(s)"
14417msgstr "处理配置文件出错"
14418
d13389bf 14419#: builtin/config.c:835
c1ac5258
JX
14420msgid "editing stdin is not supported"
14421msgstr "不支持编辑标准输入"
14422
d13389bf 14423#: builtin/config.c:837
c1ac5258
JX
14424msgid "editing blobs is not supported"
14425msgstr "不支持编辑数据对象"
14426
d13389bf 14427#: builtin/config.c:851
220c313c
JX
14428#, c-format
14429msgid "cannot create configuration file %s"
14430msgstr "不能创建配置文件 %s"
14431
d13389bf 14432#: builtin/config.c:864
a0b6b246
JX
14433#, c-format
14434msgid ""
14435"cannot overwrite multiple values with a single value\n"
14436" Use a regexp, --add or --replace-all to change %s."
14437msgstr ""
14438"无法用一个值覆盖多个值\n"
14439" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
14440
d13389bf 14441#: builtin/config.c:943 builtin/config.c:954
c1ac5258
JX
14442#, c-format
14443msgid "no such section: %s"
14444msgstr "无此小节:%s"
14445
fd8cb379 14446#: builtin/count-objects.c:90
4dcdc3d8
JX
14447msgid "git count-objects [-v] [-H | --human-readable]"
14448msgstr "git count-objects [-v] [-H | --human-readable]"
14449
fd8cb379 14450#: builtin/count-objects.c:100
4dcdc3d8
JX
14451msgid "print sizes in human readable format"
14452msgstr "以用户可读的格式显示大小"
ef317cd5 14453
33b62fba 14454#: builtin/credential-cache--daemon.c:227
d9488fea
JX
14455#, c-format
14456msgid ""
14457"The permissions on your socket directory are too loose; other\n"
14458"users may be able to read your cached credentials. Consider running:\n"
14459"\n"
14460"\tchmod 0700 %s"
14461msgstr ""
14462"您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
14463"行:\n"
14464"\n"
14465"\tchmod 0700 %s"
14466
33b62fba 14467#: builtin/credential-cache--daemon.c:276
d9488fea
JX
14468msgid "print debugging messages to stderr"
14469msgstr "输出调试信息到标准错误"
14470
33b62fba 14471#: builtin/credential-cache--daemon.c:316
d9488fea
JX
14472msgid "credential-cache--daemon unavailable; no unix socket support"
14473msgstr "credential-cache--daemon 不可用,不支持 unix 套接字"
14474
7e6630a7 14475#: builtin/credential-cache.c:180
d9488fea
JX
14476msgid "credential-cache unavailable; no unix socket support"
14477msgstr "credential-cache 不可用,不支持 unix 套接字"
14478
d13389bf
JX
14479#: builtin/credential-store.c:66
14480#, c-format
14481msgid "unable to get credential storage lock in %d ms"
14482msgstr "无法在 %d ms 获得凭证存储锁"
14483
a5cd71ca 14484#: builtin/describe.c:26
814ff314
JX
14485msgid "git describe [<options>] [<commit-ish>...]"
14486msgstr "git describe [<选项>] [<提交号>...]"
ef317cd5 14487
a5cd71ca 14488#: builtin/describe.c:27
814ff314
JX
14489msgid "git describe [<options>] --dirty"
14490msgstr "git describe [<选项>] --dirty"
ef317cd5 14491
349ede6a 14492#: builtin/describe.c:63
87cb7997
JX
14493msgid "head"
14494msgstr "头"
14495
349ede6a 14496#: builtin/describe.c:63
87cb7997
JX
14497msgid "lightweight"
14498msgstr "轻量级的"
14499
349ede6a 14500#: builtin/describe.c:63
87cb7997
JX
14501msgid "annotated"
14502msgstr "附注的"
14503
349ede6a 14504#: builtin/describe.c:277
c04f5ac3
JX
14505#, c-format
14506msgid "annotated tag %s not available"
55a16ee4 14507msgstr "附注标签 %s 无效"
c04f5ac3 14508
a5cd71ca 14509#: builtin/describe.c:281
c04f5ac3 14510#, c-format
349ede6a
JX
14511msgid "tag '%s' is externally known as '%s'"
14512msgstr "标签 '%s' 在外部被认为是 '%s'"
c04f5ac3 14513
349ede6a 14514#: builtin/describe.c:328
c04f5ac3
JX
14515#, c-format
14516msgid "no tag exactly matches '%s'"
55a16ee4 14517msgstr "没有标签准确匹配 '%s'"
c04f5ac3 14518
349ede6a 14519#: builtin/describe.c:330
c04f5ac3 14520#, c-format
5809aa05
JX
14521msgid "No exact match on refs or tags, searching to describe\n"
14522msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n"
c04f5ac3 14523
349ede6a 14524#: builtin/describe.c:397
c04f5ac3
JX
14525#, c-format
14526msgid "finished search at %s\n"
14527msgstr "完成搜索 %s\n"
14528
349ede6a 14529#: builtin/describe.c:424
c04f5ac3
JX
14530#, c-format
14531msgid ""
14532"No annotated tags can describe '%s'.\n"
14533"However, there were unannotated tags: try --tags."
14534msgstr ""
55a16ee4
RC
14535"没有附注标签能描述 '%s'。\n"
14536"然而,存在未附注标签:尝试 --tags。"
c04f5ac3 14537
349ede6a 14538#: builtin/describe.c:428
c04f5ac3
JX
14539#, c-format
14540msgid ""
14541"No tags can describe '%s'.\n"
14542"Try --always, or create some tags."
14543msgstr ""
55a16ee4
RC
14544"没有标签能描述 '%s'。\n"
14545"尝试 --always,或者创建一些标签。"
c04f5ac3 14546
349ede6a 14547#: builtin/describe.c:458
c04f5ac3
JX
14548#, c-format
14549msgid "traversed %lu commits\n"
14550msgstr "已遍历 %lu 个提交\n"
14551
349ede6a 14552#: builtin/describe.c:461
c04f5ac3
JX
14553#, c-format
14554msgid ""
14555"more than %i tags found; listed %i most recent\n"
14556"gave up search at %s\n"
14557msgstr ""
55a16ee4 14558"发现多于 %i 个标签,列出最近的 %i 个\n"
90e6ef53 14559"在 %s 放弃搜索\n"
c04f5ac3 14560
349ede6a 14561#: builtin/describe.c:529
5809aa05
JX
14562#, c-format
14563msgid "describe %s\n"
14564msgstr "描述 %s\n"
14565
349ede6a 14566#: builtin/describe.c:532
5809aa05
JX
14567#, c-format
14568msgid "Not a valid object name %s"
14569msgstr "不是一个有效的对象名 %s"
14570
349ede6a 14571#: builtin/describe.c:540
5809aa05
JX
14572#, c-format
14573msgid "%s is neither a commit nor blob"
14574msgstr "%s 既不是提交也不是数据对象"
14575
349ede6a 14576#: builtin/describe.c:554
ef317cd5 14577msgid "find the tag that comes after the commit"
55a16ee4 14578msgstr "寻找该提交之后的标签"
ef317cd5 14579
349ede6a 14580#: builtin/describe.c:555
ef317cd5 14581msgid "debug search strategy on stderr"
07432cef 14582msgstr "在标准错误上调试搜索策略"
ef317cd5 14583
349ede6a 14584#: builtin/describe.c:556
1003b3a5
JX
14585msgid "use any ref"
14586msgstr "使用任意引用"
14587
349ede6a 14588#: builtin/describe.c:557
1003b3a5 14589msgid "use any tag, even unannotated"
55a16ee4 14590msgstr "使用任意标签,即使未附带注释"
ef317cd5 14591
349ede6a 14592#: builtin/describe.c:558
ef317cd5 14593msgid "always use long format"
07432cef 14594msgstr "始终使用长提交号格式"
ef317cd5 14595
349ede6a 14596#: builtin/describe.c:559
2e8451e8
JX
14597msgid "only follow first parent"
14598msgstr "只跟随第一个父提交"
14599
349ede6a 14600#: builtin/describe.c:562
ef317cd5 14601msgid "only output exact matches"
07432cef 14602msgstr "只输出精确匹配"
ef317cd5 14603
349ede6a 14604#: builtin/describe.c:564
ef317cd5 14605msgid "consider <n> most recent tags (default: 10)"
55a16ee4 14606msgstr "考虑最近 <n> 个标签(默认:10)"
ef317cd5 14607
349ede6a 14608#: builtin/describe.c:566
ef317cd5 14609msgid "only consider tags matching <pattern>"
55a16ee4 14610msgstr "只考虑匹配 <模式> 的标签"
ef317cd5 14611
349ede6a 14612#: builtin/describe.c:568
87cb7997
JX
14613msgid "do not consider tags matching <pattern>"
14614msgstr "不考虑匹配 <模式> 的标签"
14615
349ede6a 14616#: builtin/describe.c:570 builtin/name-rev.c:535
ef317cd5 14617msgid "show abbreviated commit object as fallback"
07432cef 14618msgstr "显示简写的提交号作为后备"
ef317cd5 14619
349ede6a 14620#: builtin/describe.c:571 builtin/describe.c:574
ef317cd5 14621msgid "mark"
07432cef 14622msgstr "标记"
ef317cd5 14623
349ede6a 14624#: builtin/describe.c:572
ef317cd5 14625msgid "append <mark> on dirty working tree (default: \"-dirty\")"
160fb2b2 14626msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
ef317cd5 14627
349ede6a 14628#: builtin/describe.c:575
87cb7997
JX
14629msgid "append <mark> on broken working tree (default: \"-broken\")"
14630msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
14631
349ede6a 14632#: builtin/describe.c:593
c04f5ac3
JX
14633msgid "--long is incompatible with --abbrev=0"
14634msgstr "--long 与 --abbrev=0 不兼容"
14635
349ede6a 14636#: builtin/describe.c:622
c04f5ac3 14637msgid "No names found, cannot describe anything."
90e6ef53 14638msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 14639
349ede6a 14640#: builtin/describe.c:673
a8a5406a 14641msgid "--dirty is incompatible with commit-ishes"
87cb7997
JX
14642msgstr "--dirty 与提交号不兼容"
14643
349ede6a 14644#: builtin/describe.c:675
87cb7997
JX
14645msgid "--broken is incompatible with commit-ishes"
14646msgstr "--broken 与提交号不兼容"
c04f5ac3 14647
d13389bf
JX
14648#: builtin/diff-tree.c:155
14649msgid "--stdin and --merge-base are mutually exclusive"
14650msgstr "--stdin 和 --merge-base 是互斥的"
14651
14652#: builtin/diff-tree.c:157
14653msgid "--merge-base only works with two commits"
14654msgstr "--merge-base 仅适用于两个提交"
14655
473eb541 14656#: builtin/diff.c:92
c04f5ac3
JX
14657#, c-format
14658msgid "'%s': not a regular file or symlink"
14659msgstr "'%s':不是一个正规文件或符号链接"
14660
473eb541 14661#: builtin/diff.c:259
c04f5ac3
JX
14662#, c-format
14663msgid "invalid option: %s"
14664msgstr "无效选项:%s"
14665
473eb541 14666#: builtin/diff.c:376
7157c2b5
JX
14667#, c-format
14668msgid "%s...%s: no merge base"
14669msgstr "%s...%s:无合并基线"
14670
473eb541 14671#: builtin/diff.c:486
c04f5ac3 14672msgid "Not a git repository"
d9488fea 14673msgstr "不是 git 仓库"
c04f5ac3 14674
7e6630a7 14675#: builtin/diff.c:532 builtin/grep.c:698
c04f5ac3
JX
14676#, c-format
14677msgid "invalid object '%s' given."
14678msgstr "提供了无效对象 '%s'。"
14679
473eb541 14680#: builtin/diff.c:543
c04f5ac3
JX
14681#, c-format
14682msgid "more than two blobs given: '%s'"
160fb2b2 14683msgstr "提供了超过两个数据对象:'%s'"
c04f5ac3 14684
473eb541 14685#: builtin/diff.c:548
c04f5ac3
JX
14686#, c-format
14687msgid "unhandled object '%s' given."
6c94aba5 14688msgstr "无法处理的对象 '%s'。"
c04f5ac3 14689
473eb541 14690#: builtin/diff.c:582
7157c2b5
JX
14691#, c-format
14692msgid "%s...%s: multiple merge bases, using %s"
14693msgstr "%s...%s:多条合并基线,使用 %s"
14694
33b62fba 14695#: builtin/difftool.c:31
1a79b2f1
JX
14696msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
14697msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
14698
7e6630a7 14699#: builtin/difftool.c:293
87cb7997
JX
14700#, c-format
14701msgid "could not read symlink %s"
14702msgstr "无法读取符号链接 %s"
14703
7e6630a7 14704#: builtin/difftool.c:295
87cb7997
JX
14705#, c-format
14706msgid "could not read symlink file %s"
14707msgstr "无法读取符号链接文件 %s"
14708
7e6630a7 14709#: builtin/difftool.c:303
87cb7997
JX
14710#, c-format
14711msgid "could not read object %s for symlink %s"
14712msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
14713
7e6630a7 14714#: builtin/difftool.c:427
1a79b2f1 14715msgid ""
7e6630a7
FZ
14716"combined diff formats ('-c' and '--cc') are not supported in\n"
14717"directory diff mode ('-d' and '--dir-diff')."
87cb7997
JX
14718msgstr ""
14719"不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
14720"cc')。"
1a79b2f1 14721
7e6630a7 14722#: builtin/difftool.c:632
1a79b2f1
JX
14723#, c-format
14724msgid "both files modified: '%s' and '%s'."
14725msgstr "两个文件都被修改:'%s' 和 '%s'。"
14726
7e6630a7 14727#: builtin/difftool.c:634
1a79b2f1
JX
14728msgid "working tree file has been left."
14729msgstr "工作区文件被留了下来。"
14730
7e6630a7 14731#: builtin/difftool.c:645
1a79b2f1
JX
14732#, c-format
14733msgid "temporary files exist in '%s'."
14734msgstr "临时文件存在于 '%s'。"
14735
7e6630a7 14736#: builtin/difftool.c:646
1a79b2f1
JX
14737msgid "you may want to cleanup or recover these."
14738msgstr "您可能想要清理或者恢复它们。"
14739
7e6630a7
FZ
14740#: builtin/difftool.c:651
14741#, c-format
14742msgid "failed: %d"
14743msgstr "失败:%d"
14744
14745#: builtin/difftool.c:696
1a79b2f1
JX
14746msgid "use `diff.guitool` instead of `diff.tool`"
14747msgstr "使用 `diff.guitool` 代替 `diff.tool`"
14748
7e6630a7 14749#: builtin/difftool.c:698
1a79b2f1
JX
14750msgid "perform a full-directory diff"
14751msgstr "执行一个全目录差异比较"
14752
7e6630a7 14753#: builtin/difftool.c:700
1a79b2f1
JX
14754msgid "do not prompt before launching a diff tool"
14755msgstr "启动差异比较工具之前不提示"
14756
7e6630a7 14757#: builtin/difftool.c:705
1a79b2f1
JX
14758msgid "use symlinks in dir-diff mode"
14759msgstr "在 dir-diff 模式中使用符号链接"
14760
7e6630a7 14761#: builtin/difftool.c:706
c1ac5258
JX
14762msgid "tool"
14763msgstr "工具"
14764
7e6630a7 14765#: builtin/difftool.c:707
1a79b2f1
JX
14766msgid "use the specified diff tool"
14767msgstr "使用指定的差异比较工具"
14768
7e6630a7 14769#: builtin/difftool.c:709
1a79b2f1
JX
14770msgid "print a list of diff tools that may be used with `--tool`"
14771msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
14772
7e6630a7 14773#: builtin/difftool.c:712
1a79b2f1 14774msgid ""
7e6630a7 14775"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
1a79b2f1 14776"code"
7e6630a7 14777msgstr "当执行的 diff 工具返回非零退出码时,使 'git-difftool' 退出"
1a79b2f1 14778
7e6630a7 14779#: builtin/difftool.c:715
1a79b2f1
JX
14780msgid "specify a custom command for viewing diffs"
14781msgstr "指定一个用于查看差异的自定义命令"
14782
7e6630a7 14783#: builtin/difftool.c:716
d46c5519
JX
14784msgid "passed to `diff`"
14785msgstr "传递给 `diff`"
14786
7e6630a7 14787#: builtin/difftool.c:732
d46c5519
JX
14788msgid "difftool requires worktree or --no-index"
14789msgstr "difftool 要求工作区或者 --no-index"
14790
7e6630a7 14791#: builtin/difftool.c:739
d46c5519
JX
14792msgid "--dir-diff is incompatible with --no-index"
14793msgstr "--dir-diff 和 --no-index 不兼容"
14794
7e6630a7 14795#: builtin/difftool.c:742
d46c5519
JX
14796msgid "--gui, --tool and --extcmd are mutually exclusive"
14797msgstr "--gui、--tool 和 --extcmd 互斥"
14798
7e6630a7 14799#: builtin/difftool.c:750
1a79b2f1
JX
14800msgid "no <tool> given for --tool=<tool>"
14801msgstr "没有为 --tool=<工具> 参数提供 <工具>"
14802
7e6630a7 14803#: builtin/difftool.c:757
1a79b2f1
JX
14804msgid "no <cmd> given for --extcmd=<cmd>"
14805msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
14806
a6cd2cc4
JX
14807#: builtin/env--helper.c:6
14808msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
14809msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>"
14810
7e6630a7 14811#: builtin/env--helper.c:42 builtin/hash-object.c:96
a6cd2cc4
JX
14812msgid "type"
14813msgstr "类型"
14814
d9488fea 14815#: builtin/env--helper.c:46
a6cd2cc4
JX
14816msgid "default for git_env_*(...) to fall back on"
14817msgstr "git_env_*(...) 的默认值"
14818
d9488fea 14819#: builtin/env--helper.c:48
a6cd2cc4
JX
14820msgid "be quiet only use git_env_*() value as exit code"
14821msgstr "安静模式,只使用 git_env_*() 的值作为退出码"
14822
d9488fea 14823#: builtin/env--helper.c:67
a6cd2cc4
JX
14824#, c-format
14825msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
ec3d4607 14826msgstr "选项 `--default' 和 `--type=bool` 期望一个布尔值,不是 `%s`"
a6cd2cc4 14827
d9488fea 14828#: builtin/env--helper.c:82
a6cd2cc4
JX
14829#, c-format
14830msgid ""
14831"option `--default' expects an unsigned long value with `--type=ulong`, not `"
14832"%s`"
ec3d4607 14833msgstr "选项 `--default' 和 `--type=ulong` 期望一个无符号长整型,不是 `%s`"
a6cd2cc4 14834
c1ac5258 14835#: builtin/fast-export.c:29
ef317cd5 14836msgid "git fast-export [rev-list-opts]"
07432cef 14837msgstr "git fast-export [rev-list-opts]"
ef317cd5 14838
7e6630a7 14839#: builtin/fast-export.c:869
a5cd71ca
JX
14840msgid "Error: Cannot export nested tags unless --mark-tags is specified."
14841msgstr "错误:除非指定 --mark-tags,否则无法导出嵌套标签。"
14842
7e6630a7 14843#: builtin/fast-export.c:1178
7157c2b5
JX
14844msgid "--anonymize-map token cannot be empty"
14845msgstr "--anonymize-map 取值不能为空"
14846
7e6630a7 14847#: builtin/fast-export.c:1198
ef317cd5 14848msgid "show progress after <n> objects"
07432cef 14849msgstr "在 <n> 个对象之后显示进度"
ef317cd5 14850
7e6630a7 14851#: builtin/fast-export.c:1200
ef317cd5 14852msgid "select handling of signed tags"
55a16ee4 14853msgstr "选择如何处理签名标签"
ef317cd5 14854
7e6630a7 14855#: builtin/fast-export.c:1203
ef317cd5 14856msgid "select handling of tags that tag filtered objects"
55a16ee4 14857msgstr "选择当标签指向被过滤对象时该标签的处理方式"
ef317cd5 14858
7e6630a7 14859#: builtin/fast-export.c:1206
a6cd2cc4
JX
14860msgid "select handling of commit messages in an alternate encoding"
14861msgstr "选择使用备用编码处理提交说明"
14862
7e6630a7 14863#: builtin/fast-export.c:1209
473eb541 14864msgid "dump marks to this file"
07432cef 14865msgstr "把标记存储到这个文件"
ef317cd5 14866
7e6630a7 14867#: builtin/fast-export.c:1211
473eb541 14868msgid "import marks from this file"
07432cef 14869msgstr "从这个文件导入标记"
ef317cd5 14870
7e6630a7 14871#: builtin/fast-export.c:1215
473eb541
JX
14872msgid "import marks from this file if it exists"
14873msgstr "如果文件存在,从该文件导入标记"
a5cd71ca 14874
7e6630a7 14875#: builtin/fast-export.c:1217
473eb541
JX
14876msgid "fake a tagger when tags lack one"
14877msgstr "当标签缺少标记人字段时,假装提供一个"
ef317cd5 14878
7e6630a7 14879#: builtin/fast-export.c:1219
473eb541 14880msgid "output full tree for each commit"
07432cef 14881msgstr "每次提交都输出整个树"
ef317cd5 14882
7e6630a7 14883#: builtin/fast-export.c:1221
473eb541 14884msgid "use the done feature to terminate the stream"
07432cef 14885msgstr "使用 done 功能来终止流"
ef317cd5 14886
7e6630a7 14887#: builtin/fast-export.c:1222
473eb541 14888msgid "skip output of blob data"
07432cef 14889msgstr "跳过数据对象的输出"
ef317cd5 14890
7e6630a7 14891#: builtin/fast-export.c:1223 builtin/log.c:1826
6acbf033 14892msgid "refspec"
160fb2b2 14893msgstr "引用规格"
6acbf033 14894
7e6630a7 14895#: builtin/fast-export.c:1224
473eb541 14896msgid "apply refspec to exported refs"
160fb2b2 14897msgstr "对导出的引用应用引用规格"
6acbf033 14898
7e6630a7 14899#: builtin/fast-export.c:1225
220c313c
JX
14900msgid "anonymize output"
14901msgstr "匿名输出"
14902
7e6630a7 14903#: builtin/fast-export.c:1226
7157c2b5
JX
14904msgid "from:to"
14905msgstr "from:to"
14906
7e6630a7 14907#: builtin/fast-export.c:1227
7157c2b5
JX
14908msgid "convert <from> to <to> in anonymized output"
14909msgstr "在匿名输出中将 <from> 转换为 <to>"
14910
7e6630a7 14911#: builtin/fast-export.c:1230
473eb541 14912msgid "reference parents which are not in fast-export stream by object id"
5b533632 14913msgstr "引用父对象 ID 不在 fast-export 流中"
06991777 14914
7e6630a7 14915#: builtin/fast-export.c:1232
473eb541 14916msgid "show original object ids of blobs/commits"
5b533632 14917msgstr "显示数据对象/提交的原始对象 ID"
06991777 14918
7e6630a7 14919#: builtin/fast-export.c:1234
473eb541 14920msgid "label tags with mark ids"
a5cd71ca
JX
14921msgstr "对带有标记 ID 的标签做标记"
14922
7e6630a7 14923#: builtin/fast-export.c:1257
7157c2b5
JX
14924msgid "--anonymize-map without --anonymize does not make sense"
14925msgstr "--anonymize-map 而没有 --anonymize 没有意义"
14926
7e6630a7 14927#: builtin/fast-export.c:1272
a5cd71ca
JX
14928msgid "Cannot pass both --import-marks and --import-marks-if-exists"
14929msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists"
14930
d13389bf 14931#: builtin/fast-import.c:3088
d9488fea
JX
14932#, c-format
14933msgid "Missing from marks for submodule '%s'"
14934msgstr "子模组 '%s' 缺少 from 标记"
14935
d13389bf 14936#: builtin/fast-import.c:3090
d9488fea
JX
14937#, c-format
14938msgid "Missing to marks for submodule '%s'"
14939msgstr "子模组 '%s' 缺少 to 标记"
14940
d13389bf 14941#: builtin/fast-import.c:3225
d9488fea
JX
14942#, c-format
14943msgid "Expected 'mark' command, got %s"
14944msgstr "预期 'mark' 命令,得到 %s"
14945
d13389bf 14946#: builtin/fast-import.c:3230
d9488fea
JX
14947#, c-format
14948msgid "Expected 'to' command, got %s"
14949msgstr "预期 'to' 命令,得到 %s"
14950
d13389bf 14951#: builtin/fast-import.c:3322
d9488fea
JX
14952msgid "Expected format name:filename for submodule rewrite option"
14953msgstr "子模组重写选项的预期格式为 name:filename"
14954
d13389bf 14955#: builtin/fast-import.c:3377
d9488fea
JX
14956#, c-format
14957msgid "feature '%s' forbidden in input without --allow-unsafe-features"
14958msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'"
14959
473eb541 14960#: builtin/fetch-pack.c:242
7157c2b5
JX
14961#, c-format
14962msgid "Lockfile created but not reported: %s"
14963msgstr "Lockfile 已创建但未报告:%s"
14964
349ede6a 14965#: builtin/fetch.c:35
ef317cd5 14966msgid "git fetch [<options>] [<repository> [<refspec>...]]"
160fb2b2 14967msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
ef317cd5 14968
349ede6a 14969#: builtin/fetch.c:36
ef317cd5 14970msgid "git fetch [<options>] <group>"
07432cef 14971msgstr "git fetch [<选项>] <组>"
ef317cd5 14972
349ede6a 14973#: builtin/fetch.c:37
ef317cd5 14974msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
160fb2b2 14975msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
ef317cd5 14976
349ede6a 14977#: builtin/fetch.c:38
ef317cd5 14978msgid "git fetch --all [<options>]"
07432cef 14979msgstr "git fetch --all [<选项>]"
ef317cd5 14980
33b62fba 14981#: builtin/fetch.c:122
a5cd71ca
JX
14982msgid "fetch.parallel cannot be negative"
14983msgstr "fetch.parallel 不能为负数"
14984
ffa14514 14985#: builtin/fetch.c:145 builtin/pull.c:189
ef317cd5 14986msgid "fetch from all remotes"
07432cef 14987msgstr "从所有的远程抓取"
ef317cd5 14988
ffa14514 14989#: builtin/fetch.c:147 builtin/pull.c:249
a5cd71ca
JX
14990msgid "set upstream for git pull/fetch"
14991msgstr "为 git pull/fetch 设置上游"
14992
ffa14514 14993#: builtin/fetch.c:149 builtin/pull.c:192
ef317cd5 14994msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 14995msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 14996
33b62fba 14997#: builtin/fetch.c:151
473eb541
JX
14998msgid "use atomic transaction to update references"
14999msgstr "使用原子事务更新引用"
15000
ffa14514 15001#: builtin/fetch.c:153 builtin/pull.c:195
ef317cd5 15002msgid "path to upload pack on remote end"
07432cef 15003msgstr "上传包到远程的路径"
ef317cd5 15004
33b62fba 15005#: builtin/fetch.c:154
4c27fcb5
JX
15006msgid "force overwrite of local reference"
15007msgstr "强制覆盖本地引用"
ef317cd5 15008
33b62fba 15009#: builtin/fetch.c:156
ef317cd5 15010msgid "fetch from multiple remotes"
07432cef 15011msgstr "从多个远程抓取"
ef317cd5 15012
ffa14514 15013#: builtin/fetch.c:158 builtin/pull.c:199
ef317cd5 15014msgid "fetch all tags and associated objects"
55a16ee4 15015msgstr "抓取所有的标签和关联对象"
ef317cd5 15016
33b62fba 15017#: builtin/fetch.c:160
ef317cd5 15018msgid "do not fetch all tags (--no-tags)"
55a16ee4 15019msgstr "不抓取任何标签(--no-tags)"
ef317cd5 15020
33b62fba 15021#: builtin/fetch.c:162
276ceeaa
JX
15022msgid "number of submodules fetched in parallel"
15023msgstr "子模组获取的并发数"
15024
33b62fba
JX
15025#: builtin/fetch.c:164
15026msgid "modify the refspec to place all refs within refs/prefetch/"
15027msgstr "修改引用规格以将所有引用放入 refs/prefetch/"
15028
ffa14514 15029#: builtin/fetch.c:166 builtin/pull.c:202
ef317cd5 15030msgid "prune remote-tracking branches no longer on remote"
07432cef 15031msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 15032
33b62fba 15033#: builtin/fetch.c:168
31e5e17b
JX
15034msgid "prune local tags no longer on remote and clobber changed tags"
15035msgstr "清除远程不存在的本地标签,并且替换变更标签"
15036
07432cef 15037# 译者:可选值,不能翻译
ffa14514 15038#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
ef317cd5 15039msgid "on-demand"
07432cef 15040msgstr "on-demand"
ef317cd5 15041
33b62fba 15042#: builtin/fetch.c:170
ef317cd5 15043msgid "control recursive fetching of submodules"
07432cef 15044msgstr "控制子模组的递归抓取"
ef317cd5 15045
33b62fba 15046#: builtin/fetch.c:175
d9488fea
JX
15047msgid "write fetched references to the FETCH_HEAD file"
15048msgstr "将获取到的引用写入 FETCH_HEAD 文件"
15049
ffa14514 15050#: builtin/fetch.c:176 builtin/pull.c:210
ef317cd5 15051msgid "keep downloaded pack"
07432cef 15052msgstr "保持下载包"
ef317cd5 15053
33b62fba 15054#: builtin/fetch.c:178
ef317cd5 15055msgid "allow updating of HEAD ref"
07432cef 15056msgstr "允许更新 HEAD 引用"
ef317cd5 15057
ffa14514
FZ
15058#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
15059#: builtin/pull.c:222
ef317cd5 15060msgid "deepen history of shallow clone"
07432cef 15061msgstr "深化浅克隆的历史"
ef317cd5 15062
ffa14514 15063#: builtin/fetch.c:183 builtin/pull.c:216
a0b6b246
JX
15064msgid "deepen history of shallow repository based on time"
15065msgstr "基于时间来深化浅克隆的历史"
15066
ffa14514 15067#: builtin/fetch.c:189 builtin/pull.c:225
a77c07d9 15068msgid "convert to a complete repository"
160fb2b2 15069msgstr "转换为一个完整的仓库"
a77c07d9 15070
33b62fba 15071#: builtin/fetch.c:192
ef317cd5 15072msgid "prepend this to submodule path output"
07432cef 15073msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 15074
33b62fba 15075#: builtin/fetch.c:195
a4f16749
JX
15076msgid ""
15077"default for recursive fetching of submodules (lower priority than config "
15078"files)"
15079msgstr "递归获取子模组的缺省值(比配置文件优先级低)"
ef317cd5 15080
ffa14514 15081#: builtin/fetch.c:199 builtin/pull.c:228
cfff71a9
JX
15082msgid "accept refs that update .git/shallow"
15083msgstr "接受更新 .git/shallow 的引用"
15084
ffa14514 15085#: builtin/fetch.c:200 builtin/pull.c:230
6acbf033
JX
15086msgid "refmap"
15087msgstr "引用映射"
15088
ffa14514 15089#: builtin/fetch.c:201 builtin/pull.c:231
6acbf033
JX
15090msgid "specify fetch refmap"
15091msgstr "指定获取操作的引用映射"
15092
ffa14514 15093#: builtin/fetch.c:208 builtin/pull.c:244
c1ac5258
JX
15094msgid "report that we have only objects reachable from this object"
15095msgstr "报告我们只拥有从该对象开始可达的对象"
15096
33b62fba
JX
15097#: builtin/fetch.c:210
15098msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
15099msgstr "不获取包文件;而是打印协商的祖先提交"
15100
15101#: builtin/fetch.c:213 builtin/fetch.c:215
d9488fea
JX
15102msgid "run 'maintenance --auto' after fetching"
15103msgstr "获取后执行 'maintenance --auto'"
a6cd2cc4 15104
ffa14514 15105#: builtin/fetch.c:217 builtin/pull.c:247
a6cd2cc4
JX
15106msgid "check for forced-updates on all updated branches"
15107msgstr "在所有更新分支上检查强制更新"
15108
33b62fba 15109#: builtin/fetch.c:219
ddc12c42
JX
15110msgid "write the commit-graph after fetching"
15111msgstr "抓取后写提交图"
15112
33b62fba 15113#: builtin/fetch.c:221
d9488fea 15114msgid "accept refspecs from stdin"
33b62fba 15115msgstr "从标准输入获取引用规格"
d9488fea 15116
33b62fba 15117#: builtin/fetch.c:586
c04f5ac3
JX
15118msgid "Couldn't find remote ref HEAD"
15119msgstr "无法发现远程 HEAD 引用"
15120
7e6630a7 15121#: builtin/fetch.c:760
5c57d762
JX
15122#, c-format
15123msgid "configuration fetch.output contains invalid value %s"
15124msgstr "配置变量 fetch.output 包含无效值 %s"
15125
7e6630a7 15126#: builtin/fetch.c:862
c04f5ac3
JX
15127#, c-format
15128msgid "object %s not found"
15129msgstr "对象 %s 未发现"
15130
7e6630a7 15131#: builtin/fetch.c:866
c04f5ac3
JX
15132msgid "[up to date]"
15133msgstr "[最新]"
15134
7e6630a7 15135#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
c04f5ac3
JX
15136msgid "[rejected]"
15137msgstr "[已拒绝]"
15138
7e6630a7 15139#: builtin/fetch.c:880
5c57d762 15140msgid "can't fetch in current branch"
9a4b694c 15141msgstr "当前分支下不能执行获取操作"
5c57d762 15142
7e6630a7 15143#: builtin/fetch.c:890
c04f5ac3 15144msgid "[tag update]"
55a16ee4 15145msgstr "[标签更新]"
c04f5ac3 15146
7e6630a7
FZ
15147#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
15148#: builtin/fetch.c:962
5c57d762
JX
15149msgid "unable to update local ref"
15150msgstr "不能更新本地引用"
c04f5ac3 15151
7e6630a7 15152#: builtin/fetch.c:895
4c27fcb5
JX
15153msgid "would clobber existing tag"
15154msgstr "会破坏现有的标签"
15155
7e6630a7 15156#: builtin/fetch.c:917
c04f5ac3 15157msgid "[new tag]"
55a16ee4 15158msgstr "[新标签]"
c04f5ac3 15159
7e6630a7 15160#: builtin/fetch.c:920
c04f5ac3
JX
15161msgid "[new branch]"
15162msgstr "[新分支]"
15163
7e6630a7 15164#: builtin/fetch.c:923
170e9899
JX
15165msgid "[new ref]"
15166msgstr "[新引用]"
15167
7e6630a7 15168#: builtin/fetch.c:962
c04f5ac3
JX
15169msgid "forced update"
15170msgstr "强制更新"
15171
7e6630a7 15172#: builtin/fetch.c:967
5c57d762
JX
15173msgid "non-fast-forward"
15174msgstr "非快进"
c04f5ac3 15175
7e6630a7 15176#: builtin/fetch.c:1070
a6cd2cc4
JX
15177msgid ""
15178"Fetch normally indicates which branches had a forced update,\n"
15179"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
15180"flag or run 'git config fetch.showForcedUpdates true'."
15181msgstr ""
15182"获取操作通常显示哪些分支发生了强制更新,但该检查已被禁用。\n"
15183"要重新启用,请使用 '--show-forced-updates' 选项或运行\n"
15184"'git config fetch.showForcedUpdates true'。"
15185
7e6630a7 15186#: builtin/fetch.c:1074
a6cd2cc4
JX
15187#, c-format
15188msgid ""
15189"It took %.2f seconds to check forced updates. You can use\n"
15190"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
15191"false'\n"
15192" to avoid this check.\n"
15193msgstr ""
15194"花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n"
15195"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n"
15196
7e6630a7 15197#: builtin/fetch.c:1105
c04f5ac3
JX
15198#, c-format
15199msgid "%s did not send all necessary objects\n"
e640d114 15200msgstr "%s 未发送所有必需的对象\n"
c04f5ac3 15201
7e6630a7 15202#: builtin/fetch.c:1134
cfff71a9 15203#, c-format
ec3d4607
JX
15204msgid "rejected %s because shallow roots are not allowed to be updated"
15205msgstr "拒绝 %s 因为浅克隆的根不允许被更新"
cfff71a9 15206
7e6630a7 15207#: builtin/fetch.c:1223 builtin/fetch.c:1371
c04f5ac3
JX
15208#, c-format
15209msgid "From %.*s\n"
15210msgstr "来自 %.*s\n"
15211
7e6630a7 15212#: builtin/fetch.c:1244
c04f5ac3
JX
15213#, c-format
15214msgid ""
15215"some local refs could not be updated; try running\n"
15216" 'git remote prune %s' to remove any old, conflicting branches"
15217msgstr ""
15218"一些本地引用不能被更新;尝试运行\n"
15219" 'git remote prune %s' 来删除旧的、有冲突的分支"
15220
90e6ef53 15221# 译者:注意保持前导空格
7e6630a7 15222#: builtin/fetch.c:1341
81809b99 15223#, c-format
8ada9598 15224msgid " (%s will become dangling)"
e640d114 15225msgstr " (%s 将成为悬空状态)"
c04f5ac3 15226
90e6ef53 15227# 译者:注意保持前导空格
7e6630a7 15228#: builtin/fetch.c:1342
81809b99 15229#, c-format
8ada9598 15230msgid " (%s has become dangling)"
e640d114 15231msgstr " (%s 已成为悬空状态)"
c04f5ac3 15232
7e6630a7 15233#: builtin/fetch.c:1374
c04f5ac3
JX
15234msgid "[deleted]"
15235msgstr "[已删除]"
15236
7e6630a7 15237#: builtin/fetch.c:1375 builtin/remote.c:1128
c04f5ac3
JX
15238msgid "(none)"
15239msgstr "(无)"
15240
7e6630a7 15241#: builtin/fetch.c:1398
c04f5ac3
JX
15242#, c-format
15243msgid "Refusing to fetch into current branch %s of non-bare repository"
160fb2b2 15244msgstr "拒绝获取到非纯仓库的当前分支 %s"
c04f5ac3 15245
7e6630a7 15246#: builtin/fetch.c:1417
c04f5ac3
JX
15247#, c-format
15248msgid "Option \"%s\" value \"%s\" is not valid for %s"
15249msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
15250
7e6630a7 15251#: builtin/fetch.c:1420
c04f5ac3
JX
15252#, c-format
15253msgid "Option \"%s\" is ignored for %s\n"
81809b99 15254msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 15255
7e6630a7
FZ
15256#: builtin/fetch.c:1447
15257#, c-format
15258msgid "the object %s does not exist"
15259msgstr "对象 '%s' 不存在"
15260
15261#: builtin/fetch.c:1633
ddc12c42 15262msgid "multiple branches detected, incompatible with --set-upstream"
a5cd71ca
JX
15263msgstr "检测到多分支,和 --set-upstream 不兼容"
15264
7e6630a7 15265#: builtin/fetch.c:1648
a5cd71ca
JX
15266msgid "not setting upstream for a remote remote-tracking branch"
15267msgstr "没有为一个远程跟踪分支设置上游"
15268
7e6630a7 15269#: builtin/fetch.c:1650
a5cd71ca
JX
15270msgid "not setting upstream for a remote tag"
15271msgstr "没有为一个远程标签设置上游"
15272
7e6630a7 15273#: builtin/fetch.c:1652
a5cd71ca
JX
15274msgid "unknown branch type"
15275msgstr "未知的分支类型"
15276
7e6630a7 15277#: builtin/fetch.c:1654
a5cd71ca
JX
15278msgid ""
15279"no source branch found.\n"
15280"you need to specify exactly one branch with the --set-upstream option."
15281msgstr ""
15282"未发现源分支。\n"
15283"您需要使用 --set-upstream 选项指定一个分支。"
15284
7e6630a7 15285#: builtin/fetch.c:1783 builtin/fetch.c:1846
c04f5ac3
JX
15286#, c-format
15287msgid "Fetching %s\n"
d4a8e00b 15288msgstr "正在获取 %s\n"
c04f5ac3 15289
7e6630a7 15290#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
c04f5ac3
JX
15291#, c-format
15292msgid "Could not fetch %s"
15293msgstr "不能获取 %s"
15294
7e6630a7 15295#: builtin/fetch.c:1805
a5cd71ca
JX
15296#, c-format
15297msgid "could not fetch '%s' (exit code: %d)\n"
15298msgstr "无法获取 '%s'(退出码:%d)\n"
31e5e17b 15299
7e6630a7 15300#: builtin/fetch.c:1909
c04f5ac3
JX
15301msgid ""
15302"No remote repository specified. Please, specify either a URL or a\n"
15303"remote name from which new revisions should be fetched."
4375c10e 15304msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
c04f5ac3 15305
7e6630a7 15306#: builtin/fetch.c:1945
c04f5ac3 15307msgid "You need to specify a tag name."
55a16ee4 15308msgstr "您需要指定一个标签名称。"
c04f5ac3 15309
7e6630a7 15310#: builtin/fetch.c:2009
ec3d4607
JX
15311msgid "--negotiate-only needs one or more --negotiate-tip=*"
15312msgstr "--negotiate-only 需要一个或多个 --negotiate-tip=*"
15313
7e6630a7 15314#: builtin/fetch.c:2013
a0b6b246
JX
15315msgid "Negative depth in --deepen is not supported"
15316msgstr "--deepen 不支持负数深度"
15317
7e6630a7 15318#: builtin/fetch.c:2015
a0b6b246
JX
15319msgid "--deepen and --depth are mutually exclusive"
15320msgstr "--deepen 和 --depth 是互斥的"
15321
7e6630a7 15322#: builtin/fetch.c:2020
a77c07d9
JX
15323msgid "--depth and --unshallow cannot be used together"
15324msgstr "--depth 和 --unshallow 不能同时使用"
15325
7e6630a7 15326#: builtin/fetch.c:2022
a77c07d9 15327msgid "--unshallow on a complete repository does not make sense"
160fb2b2 15328msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
a77c07d9 15329
7e6630a7 15330#: builtin/fetch.c:2039
c04f5ac3 15331msgid "fetch --all does not take a repository argument"
160fb2b2 15332msgstr "fetch --all 不能带一个仓库参数"
c04f5ac3 15333
7e6630a7 15334#: builtin/fetch.c:2041
c04f5ac3 15335msgid "fetch --all does not make sense with refspecs"
160fb2b2 15336msgstr "fetch --all 带引用规格没有任何意义"
c04f5ac3 15337
7e6630a7 15338#: builtin/fetch.c:2050
c04f5ac3
JX
15339#, c-format
15340msgid "No such remote or remote group: %s"
15341msgstr "没有这样的远程或远程组:%s"
15342
7e6630a7 15343#: builtin/fetch.c:2057
c04f5ac3 15344msgid "Fetching a group and specifying refspecs does not make sense"
160fb2b2 15345msgstr "获取组并指定引用规格没有意义"
c04f5ac3 15346
7e6630a7 15347#: builtin/fetch.c:2073
33b62fba
JX
15348msgid "must supply remote when using --negotiate-only"
15349msgstr "在使用 --negotiate-only 时必须提供远程仓库"
15350
7e6630a7 15351#: builtin/fetch.c:2078
33b62fba
JX
15352msgid "Protocol does not support --negotiate-only, exiting."
15353msgstr "协议不支持 --negotiate-only,退出。"
15354
7e6630a7 15355#: builtin/fetch.c:2097
06991777
JX
15356msgid ""
15357"--filter can only be used with the remote configured in extensions."
15358"partialclone"
ae4e099e 15359msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库"
06991777 15360
7e6630a7 15361#: builtin/fetch.c:2101
473eb541
JX
15362msgid "--atomic can only be used when fetching from one remote"
15363msgstr "--atomic 仅在从一个远程仓库获取的时候可用"
15364
7e6630a7 15365#: builtin/fetch.c:2105
d9488fea
JX
15366msgid "--stdin can only be used when fetching from one remote"
15367msgstr "--stdin 仅在从一个远程仓库获取的时候可用"
15368
349ede6a 15369#: builtin/fmt-merge-msg.c:7
814ff314
JX
15370msgid ""
15371"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
15372msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
c04f5ac3 15373
349ede6a 15374#: builtin/fmt-merge-msg.c:18
ef317cd5 15375msgid "populate log with at most <n> entries from shortlog"
07432cef 15376msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 15377
349ede6a 15378#: builtin/fmt-merge-msg.c:21
ef317cd5 15379msgid "alias for --log (deprecated)"
07432cef 15380msgstr "参数 --log 的别名(已弃用)"
ef317cd5 15381
349ede6a 15382#: builtin/fmt-merge-msg.c:24
ef317cd5 15383msgid "text"
07432cef 15384msgstr "文本"
ef317cd5 15385
349ede6a 15386#: builtin/fmt-merge-msg.c:25
ef317cd5 15387msgid "use <text> as start of message"
07432cef 15388msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 15389
349ede6a 15390#: builtin/fmt-merge-msg.c:26
ef317cd5 15391msgid "file to read from"
07432cef 15392msgstr "从文件中读取"
ef317cd5 15393
a4f16749 15394#: builtin/for-each-ref.c:10
814ff314
JX
15395msgid "git for-each-ref [<options>] [<pattern>]"
15396msgstr "git for-each-ref [<选项>] [<模式>]"
ef317cd5 15397
a4f16749 15398#: builtin/for-each-ref.c:11
94550ed3
JX
15399msgid "git for-each-ref [--points-at <object>]"
15400msgstr "git for-each-ref [--points-at <对象>]"
15401
a4f16749 15402#: builtin/for-each-ref.c:12
d9488fea
JX
15403msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
15404msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]"
94550ed3 15405
a4f16749 15406#: builtin/for-each-ref.c:13
87cb7997
JX
15407msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
15408msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
94550ed3 15409
33b62fba 15410#: builtin/for-each-ref.c:30
ef317cd5 15411msgid "quote placeholders suitably for shells"
07432cef 15412msgstr "引用占位符适用于 shells"
ef317cd5 15413
33b62fba 15414#: builtin/for-each-ref.c:32
ef317cd5 15415msgid "quote placeholders suitably for perl"
07432cef 15416msgstr "引用占位符适用于 perl"
ef317cd5 15417
33b62fba 15418#: builtin/for-each-ref.c:34
ef317cd5 15419msgid "quote placeholders suitably for python"
07432cef 15420msgstr "引用占位符适用于 python"
ef317cd5 15421
33b62fba 15422#: builtin/for-each-ref.c:36
04cb2f28
JX
15423msgid "quote placeholders suitably for Tcl"
15424msgstr "引用占位符适用于 Tcl"
ef317cd5 15425
33b62fba 15426#: builtin/for-each-ref.c:39
ef317cd5 15427msgid "show only <n> matched refs"
07432cef 15428msgstr "只显示 <n> 个匹配的引用"
ef317cd5 15429
7e6630a7 15430#: builtin/for-each-ref.c:41 builtin/tag.c:481
6937cb4e
JX
15431msgid "respect format colors"
15432msgstr "遵照格式中的颜色输出"
15433
33b62fba 15434#: builtin/for-each-ref.c:44
94550ed3
JX
15435msgid "print only refs which points at the given object"
15436msgstr "只打印指向给定对象的引用"
ef317cd5 15437
33b62fba 15438#: builtin/for-each-ref.c:46
94550ed3
JX
15439msgid "print only refs that are merged"
15440msgstr "只打印已经合并的引用"
15441
33b62fba 15442#: builtin/for-each-ref.c:47
94550ed3
JX
15443msgid "print only refs that are not merged"
15444msgstr "只打印没有合并的引用"
ef317cd5 15445
33b62fba 15446#: builtin/for-each-ref.c:48
94550ed3
JX
15447msgid "print only refs which contain the commit"
15448msgstr "只打印包含该提交的引用"
15449
33b62fba 15450#: builtin/for-each-ref.c:49
87cb7997
JX
15451msgid "print only refs which don't contain the commit"
15452msgstr "只打印不包含该提交的引用"
15453
d13389bf
JX
15454#: builtin/for-each-repo.c:9
15455msgid "git for-each-repo --config=<config> <command-args>"
15456msgstr "git for-each-repo --config=<配置> <命令参数>"
15457
ec3d4607 15458#: builtin/for-each-repo.c:34
d13389bf
JX
15459msgid "config"
15460msgstr "配置"
15461
ec3d4607 15462#: builtin/for-each-repo.c:35
d13389bf
JX
15463msgid "config key storing a list of repository paths"
15464msgstr "存储着仓库路径列表的配置项键名"
15465
ec3d4607 15466#: builtin/for-each-repo.c:43
d13389bf
JX
15467msgid "missing --config=<config>"
15468msgstr "缺少 --config=<配置>"
15469
ec3d4607 15470#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
06991777
JX
15471msgid "unknown"
15472msgstr "未知"
15473
15474#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
33b62fba 15475#: builtin/fsck.c:78 builtin/fsck.c:100
06991777
JX
15476#, c-format
15477msgid "error in %s %s: %s"
15478msgstr "%s %s 错误:%s"
15479
15480#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
33b62fba 15481#: builtin/fsck.c:94
06991777
JX
15482#, c-format
15483msgid "warning in %s %s: %s"
15484msgstr "%s %s 警告:%s"
15485
ec3d4607 15486#: builtin/fsck.c:124 builtin/fsck.c:127
06991777
JX
15487#, c-format
15488msgid "broken link from %7s %s"
15489msgstr "来自 %7s %s 的损坏的链接"
15490
ec3d4607 15491#: builtin/fsck.c:136
06991777
JX
15492msgid "wrong object type in link"
15493msgstr "链接中错误的对象类型"
15494
ec3d4607 15495#: builtin/fsck.c:152
06991777
JX
15496#, c-format
15497msgid ""
15498"broken link from %7s %s\n"
15499" to %7s %s"
15500msgstr ""
15501"损坏的链接来自于 %7s %s\n"
15502" 到 %7s %s"
15503
ec3d4607 15504#: builtin/fsck.c:264
06991777
JX
15505#, c-format
15506msgid "missing %s %s"
15507msgstr "缺失 %s %s"
15508
ec3d4607 15509#: builtin/fsck.c:291
06991777
JX
15510#, c-format
15511msgid "unreachable %s %s"
5b533632 15512msgstr "不可达 %s %s"
06991777 15513
ec3d4607 15514#: builtin/fsck.c:311
06991777
JX
15515#, c-format
15516msgid "dangling %s %s"
15517msgstr "悬空 %s %s"
15518
ec3d4607 15519#: builtin/fsck.c:321
06991777
JX
15520msgid "could not create lost-found"
15521msgstr "不能创建 lost-found"
15522
ec3d4607 15523#: builtin/fsck.c:332
06991777
JX
15524#, c-format
15525msgid "could not finish '%s'"
15526msgstr "不能完成 '%s'"
15527
ec3d4607 15528#: builtin/fsck.c:349
06991777
JX
15529#, c-format
15530msgid "Checking %s"
15531msgstr "正在检查 %s"
15532
ec3d4607 15533#: builtin/fsck.c:387
06991777
JX
15534#, c-format
15535msgid "Checking connectivity (%d objects)"
15536msgstr "正在检查连通性(%d 个对象)"
15537
ec3d4607 15538#: builtin/fsck.c:406
06991777
JX
15539#, c-format
15540msgid "Checking %s %s"
15541msgstr "正在检查 %s %s"
15542
ec3d4607 15543#: builtin/fsck.c:411
06991777
JX
15544msgid "broken links"
15545msgstr "损坏的链接"
15546
ec3d4607 15547#: builtin/fsck.c:420
06991777
JX
15548#, c-format
15549msgid "root %s"
15550msgstr "根 %s"
15551
ec3d4607 15552#: builtin/fsck.c:428
06991777
JX
15553#, c-format
15554msgid "tagged %s %s (%s) in %s"
15555msgstr "标记 %s %s (%s) 于 %s"
15556
ec3d4607 15557#: builtin/fsck.c:457
06991777
JX
15558#, c-format
15559msgid "%s: object corrupt or missing"
15560msgstr "%s:对象损坏或丢失"
15561
ec3d4607 15562#: builtin/fsck.c:482
06991777
JX
15563#, c-format
15564msgid "%s: invalid reflog entry %s"
15565msgstr "%s:无效的引用日志条目 %s"
15566
ec3d4607 15567#: builtin/fsck.c:496
06991777
JX
15568#, c-format
15569msgid "Checking reflog %s->%s"
15570msgstr "正在检查引用日志 %s->%s"
15571
ec3d4607 15572#: builtin/fsck.c:530
06991777
JX
15573#, c-format
15574msgid "%s: invalid sha1 pointer %s"
15575msgstr "%s:无效的 sha1 指针 %s"
15576
ec3d4607 15577#: builtin/fsck.c:537
06991777
JX
15578#, c-format
15579msgid "%s: not a commit"
15580msgstr "%s:不是一个提交"
15581
ec3d4607 15582#: builtin/fsck.c:591
06991777
JX
15583msgid "notice: No default references"
15584msgstr "注意:无默认引用"
15585
7e6630a7
FZ
15586#: builtin/fsck.c:621
15587#, c-format
15588msgid "%s: hash-path mismatch, found at: %s"
15589msgstr "%s: 哈希路径不匹配,在 %s 被找到"
15590
15591#: builtin/fsck.c:624
06991777
JX
15592#, c-format
15593msgid "%s: object corrupt or missing: %s"
15594msgstr "%s:对象损坏或丢失:%s"
15595
7e6630a7
FZ
15596#: builtin/fsck.c:628
15597#, c-format
15598msgid "%s: object is of unknown type '%s': %s"
15599msgstr "%s: 对象有未知的类型 '%s': %s"
15600
15601#: builtin/fsck.c:644
06991777
JX
15602#, c-format
15603msgid "%s: object could not be parsed: %s"
15604msgstr "%s:不能解析对象:%s"
15605
7e6630a7 15606#: builtin/fsck.c:664
06991777
JX
15607#, c-format
15608msgid "bad sha1 file: %s"
15609msgstr "坏的 sha1 文件:%s"
15610
7e6630a7 15611#: builtin/fsck.c:685
06991777
JX
15612msgid "Checking object directory"
15613msgstr "正在检查对象目录"
15614
7e6630a7 15615#: builtin/fsck.c:688
6c94aba5 15616msgid "Checking object directories"
06991777
JX
15617msgstr "正在检查对象目录"
15618
7e6630a7 15619#: builtin/fsck.c:704
06991777
JX
15620#, c-format
15621msgid "Checking %s link"
15622msgstr "正在检查 %s 链接"
15623
7e6630a7 15624#: builtin/fsck.c:709 builtin/index-pack.c:859
06991777
JX
15625#, c-format
15626msgid "invalid %s"
15627msgstr "无效的 %s"
15628
7e6630a7 15629#: builtin/fsck.c:716
06991777
JX
15630#, c-format
15631msgid "%s points to something strange (%s)"
15632msgstr "%s 指向奇怪的东西(%s)"
15633
7e6630a7 15634#: builtin/fsck.c:722
06991777
JX
15635#, c-format
15636msgid "%s: detached HEAD points at nothing"
15637msgstr "%s:分离头指针的指向不存在"
15638
7e6630a7 15639#: builtin/fsck.c:726
06991777
JX
15640#, c-format
15641msgid "notice: %s points to an unborn branch (%s)"
15642msgstr "注意:%s 指向一个尚未诞生的分支(%s)"
15643
7e6630a7 15644#: builtin/fsck.c:738
06991777
JX
15645msgid "Checking cache tree"
15646msgstr "正在检查缓存树"
15647
7e6630a7 15648#: builtin/fsck.c:743
06991777
JX
15649#, c-format
15650msgid "%s: invalid sha1 pointer in cache-tree"
15651msgstr "%s:cache-tree 中无效的 sha1 指针"
6c94aba5 15652
7e6630a7 15653#: builtin/fsck.c:752
06991777
JX
15654msgid "non-tree in cache-tree"
15655msgstr "cache-tree 中非树对象"
15656
7e6630a7 15657#: builtin/fsck.c:783
814ff314
JX
15658msgid "git fsck [<options>] [<object>...]"
15659msgstr "git fsck [<选项>] [<对象>...]"
ef317cd5 15660
7e6630a7 15661#: builtin/fsck.c:789
ef317cd5 15662msgid "show unreachable objects"
07432cef 15663msgstr "显示不可达的对象"
ef317cd5 15664
7e6630a7 15665#: builtin/fsck.c:790
ef317cd5 15666msgid "show dangling objects"
e640d114 15667msgstr "显示悬空的对象"
ef317cd5 15668
7e6630a7 15669#: builtin/fsck.c:791
ef317cd5 15670msgid "report tags"
55a16ee4 15671msgstr "报告标签"
ef317cd5 15672
7e6630a7 15673#: builtin/fsck.c:792
ef317cd5 15674msgid "report root nodes"
07432cef 15675msgstr "报告根节点"
ef317cd5 15676
7e6630a7 15677#: builtin/fsck.c:793
ef317cd5 15678msgid "make index objects head nodes"
07432cef 15679msgstr "将索引亦作为检查的头节点"
ef317cd5 15680
7e6630a7 15681#: builtin/fsck.c:794
ef317cd5 15682msgid "make reflogs head nodes (default)"
07432cef 15683msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 15684
7e6630a7 15685#: builtin/fsck.c:795
ef317cd5 15686msgid "also consider packs and alternate objects"
07432cef 15687msgstr "也考虑包和备用对象"
ef317cd5 15688
7e6630a7 15689#: builtin/fsck.c:796
1b7f4a34
JX
15690msgid "check only connectivity"
15691msgstr "仅检查连通性"
15692
7e6630a7 15693#: builtin/fsck.c:797 builtin/mktag.c:76
ef317cd5 15694msgid "enable more strict checking"
07432cef 15695msgstr "启用更严格的检查"
ef317cd5 15696
7e6630a7 15697#: builtin/fsck.c:799
ef317cd5 15698msgid "write dangling objects in .git/lost-found"
e640d114 15699msgstr "将悬空对象写入 .git/lost-found 中"
ef317cd5 15700
7e6630a7 15701#: builtin/fsck.c:800 builtin/prune.c:134
ef317cd5 15702msgid "show progress"
07432cef 15703msgstr "显示进度"
ef317cd5 15704
7e6630a7 15705#: builtin/fsck.c:801
5c57d762
JX
15706msgid "show verbose names for reachable objects"
15707msgstr "显示可达对象的详细名称"
15708
84bf71ea 15709#: builtin/fsck.c:861 builtin/index-pack.c:261
6c94aba5 15710msgid "Checking objects"
06991777
JX
15711msgstr "正在检查对象"
15712
84bf71ea 15713#: builtin/fsck.c:889
06991777
JX
15714#, c-format
15715msgid "%s: object missing"
15716msgstr "%s:对象缺失"
15717
84bf71ea 15718#: builtin/fsck.c:900
06991777
JX
15719#, c-format
15720msgid "invalid parameter: expected sha1, got '%s'"
15721msgstr "无效的参数:期望 sha1,得到 '%s'"
6c94aba5 15722
d13389bf 15723#: builtin/gc.c:39
814ff314
JX
15724msgid "git gc [<options>]"
15725msgstr "git gc [<选项>]"
ef317cd5 15726
473eb541 15727#: builtin/gc.c:93
c04f5ac3 15728#, c-format
87cb7997 15729msgid "Failed to fstat %s: %s"
65e2041e 15730msgstr "对 %s 调用 fstat 失败:%s"
c04f5ac3 15731
473eb541 15732#: builtin/gc.c:129
d46c5519
JX
15733#, c-format
15734msgid "failed to parse '%s' value '%s'"
15735msgstr "无法解析 '%s' 值 '%s'"
15736
33b62fba 15737#: builtin/gc.c:487 builtin/init-db.c:57
c04f5ac3 15738#, c-format
4c27fcb5
JX
15739msgid "cannot stat '%s'"
15740msgstr "不能对 '%s' 调用 stat"
15741
7e6630a7 15742#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
4c27fcb5
JX
15743#, c-format
15744msgid "cannot read '%s'"
15745msgstr "不能读取 '%s'"
c04f5ac3 15746
473eb541 15747#: builtin/gc.c:503
94550ed3
JX
15748#, c-format
15749msgid ""
15750"The last gc run reported the following. Please correct the root cause\n"
7e6630a7 15751"and remove %s\n"
94550ed3
JX
15752"Automatic cleanup will not be performed until the file is removed.\n"
15753"\n"
15754"%s"
15755msgstr ""
7e6630a7 15756"最后一次 gc 操作报告如下信息。请检查原因并删除 %s\n"
94550ed3
JX
15757"在该文件被删除之前,自动清理将不会执行。\n"
15758"\n"
15759"%s"
15760
473eb541 15761#: builtin/gc.c:551
ef317cd5 15762msgid "prune unreferenced objects"
07432cef 15763msgstr "清除未引用的对象"
ef317cd5 15764
473eb541 15765#: builtin/gc.c:553
ef317cd5 15766msgid "be more thorough (increased runtime)"
07432cef 15767msgstr "更彻底(增加运行时间)"
ef317cd5 15768
473eb541 15769#: builtin/gc.c:554
ef317cd5 15770msgid "enable auto-gc mode"
07432cef 15771msgstr "启用自动垃圾回收模式"
ef317cd5 15772
473eb541 15773#: builtin/gc.c:557
90314792
JX
15774msgid "force running gc even if there may be another gc running"
15775msgstr "强制执行 gc 即使另外一个 gc 正在执行"
15776
473eb541 15777#: builtin/gc.c:560
fd8cb379
JX
15778msgid "repack all other packs except the largest pack"
15779msgstr "除了最大的包之外,对所有其它包文件重新打包"
15780
473eb541 15781#: builtin/gc.c:576
fd8cb379
JX
15782#, c-format
15783msgid "failed to parse gc.logexpiry value %s"
c1ac5258 15784msgstr "解析 gc.logexpiry 的值 %s 失败"
fd8cb379 15785
473eb541 15786#: builtin/gc.c:587
87cb7997 15787#, c-format
fd8cb379 15788msgid "failed to parse prune expiry value %s"
c1ac5258 15789msgstr "解析清除期限值 %s 失败"
87cb7997 15790
473eb541 15791#: builtin/gc.c:607
c04f5ac3 15792#, c-format
6c94aba5 15793msgid "Auto packing the repository in background for optimum performance.\n"
160fb2b2 15794msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6c94aba5 15795
473eb541 15796#: builtin/gc.c:609
6c94aba5
JX
15797#, c-format
15798msgid "Auto packing the repository for optimum performance.\n"
160fb2b2 15799msgstr "自动打包仓库以求最佳性能。\n"
6c94aba5 15800
473eb541 15801#: builtin/gc.c:610
6c94aba5
JX
15802#, c-format
15803msgid "See \"git help gc\" for manual housekeeping.\n"
15804msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 15805
473eb541 15806#: builtin/gc.c:650
90314792
JX
15807#, c-format
15808msgid ""
15809"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
15810msgstr ""
29004bbb 15811"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)"
90314792 15812
473eb541 15813#: builtin/gc.c:705
c04f5ac3
JX
15814msgid ""
15815"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 15816msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 15817
473eb541 15818#: builtin/gc.c:715
d13389bf
JX
15819msgid ""
15820"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
15821msgstr ""
15822"git maintenance run [--auto] [--[no-]quiet] [--task=<任务>] [--schedule]"
15823
473eb541 15824#: builtin/gc.c:745
d13389bf
JX
15825msgid "--no-schedule is not allowed"
15826msgstr "--no-schedule 不被允许"
15827
473eb541 15828#: builtin/gc.c:750
d13389bf
JX
15829#, c-format
15830msgid "unrecognized --schedule argument '%s'"
15831msgstr "无法识别的 --schedule 参数 '%s'"
d9488fea 15832
7e6630a7 15833#: builtin/gc.c:868
d9488fea
JX
15834msgid "failed to write commit-graph"
15835msgstr "无法写入提交图"
15836
7e6630a7 15837#: builtin/gc.c:904
33b62fba
JX
15838msgid "failed to prefetch remotes"
15839msgstr "无法预先获取远程仓库"
d13389bf 15840
7e6630a7 15841#: builtin/gc.c:1020
d13389bf
JX
15842msgid "failed to start 'git pack-objects' process"
15843msgstr "无法启动 'git pack-objects' 进程"
15844
7e6630a7 15845#: builtin/gc.c:1037
d13389bf
JX
15846msgid "failed to finish 'git pack-objects' process"
15847msgstr "无法完成 'git pack-objects' 进程"
15848
84bf71ea 15849#: builtin/gc.c:1088
d13389bf
JX
15850msgid "failed to write multi-pack-index"
15851msgstr "无法写入多包索引"
15852
84bf71ea 15853#: builtin/gc.c:1104
d13389bf
JX
15854msgid "'git multi-pack-index expire' failed"
15855msgstr "'git multi-pack-index expire' 失败"
15856
84bf71ea 15857#: builtin/gc.c:1163
d13389bf
JX
15858msgid "'git multi-pack-index repack' failed"
15859msgstr "'git multi-pack-index repack' 失败"
15860
84bf71ea 15861#: builtin/gc.c:1172
d13389bf
JX
15862msgid ""
15863"skipping incremental-repack task because core.multiPackIndex is disabled"
15864msgstr "跳过增量重新打包任务,因为 core.multiPackIndex 被禁用"
15865
84bf71ea 15866#: builtin/gc.c:1276
d9488fea
JX
15867#, c-format
15868msgid "lock file '%s' exists, skipping maintenance"
15869msgstr "锁文件 '%s' 已存在,跳过维护"
15870
84bf71ea 15871#: builtin/gc.c:1306
d9488fea
JX
15872#, c-format
15873msgid "task '%s' failed"
15874msgstr "任务 '%s' 失败"
15875
84bf71ea 15876#: builtin/gc.c:1388
d9488fea
JX
15877#, c-format
15878msgid "'%s' is not a valid task"
15879msgstr "'%s' 不是一个有效的任务"
15880
84bf71ea 15881#: builtin/gc.c:1393
d9488fea
JX
15882#, c-format
15883msgid "task '%s' cannot be selected multiple times"
15884msgstr "任务 '%s' 不能被多次选择"
15885
84bf71ea 15886#: builtin/gc.c:1408
d9488fea
JX
15887msgid "run tasks based on the state of the repository"
15888msgstr "基于仓库状态来运行任务"
15889
84bf71ea 15890#: builtin/gc.c:1409
d13389bf
JX
15891msgid "frequency"
15892msgstr "频率"
15893
84bf71ea 15894#: builtin/gc.c:1410
d13389bf
JX
15895msgid "run tasks based on frequency"
15896msgstr "基于频率运行任务"
15897
84bf71ea 15898#: builtin/gc.c:1413
d9488fea
JX
15899msgid "do not report progress or other information over stderr"
15900msgstr "不通过标准错误报告进度或其它信息"
15901
84bf71ea 15902#: builtin/gc.c:1414
d9488fea
JX
15903msgid "task"
15904msgstr "任务"
15905
84bf71ea 15906#: builtin/gc.c:1415
d9488fea
JX
15907msgid "run a specific task"
15908msgstr "运行一个特定的任务"
15909
84bf71ea 15910#: builtin/gc.c:1432
d13389bf
JX
15911msgid "use at most one of --auto and --schedule=<frequency>"
15912msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一"
15913
84bf71ea 15914#: builtin/gc.c:1475
d13389bf
JX
15915msgid "failed to run 'git config'"
15916msgstr "无法运行 'git config'"
15917
84bf71ea 15918#: builtin/gc.c:1627
473eb541
JX
15919#, c-format
15920msgid "failed to expand path '%s'"
15921msgstr "无法扩展路径 '%s'"
15922
84bf71ea 15923#: builtin/gc.c:1654 builtin/gc.c:1692
473eb541
JX
15924msgid "failed to start launchctl"
15925msgstr "无法启动 launchctl"
d9488fea 15926
84bf71ea 15927#: builtin/gc.c:1767 builtin/gc.c:2220
473eb541
JX
15928#, c-format
15929msgid "failed to create directories for '%s'"
15930msgstr "无法为 '%s' 创建目录"
15931
84bf71ea 15932#: builtin/gc.c:1794
473eb541
JX
15933#, c-format
15934msgid "failed to bootstrap service %s"
15935msgstr "无法引导服务 %s"
15936
84bf71ea 15937#: builtin/gc.c:1887
473eb541
JX
15938msgid "failed to create temp xml file"
15939msgstr "无法创建临时 XML 文件"
15940
84bf71ea 15941#: builtin/gc.c:1977
473eb541
JX
15942msgid "failed to start schtasks"
15943msgstr "无法启动计划任务"
15944
84bf71ea 15945#: builtin/gc.c:2046
d13389bf
JX
15946msgid "failed to run 'crontab -l'; your system might not support 'cron'"
15947msgstr "无法执行 'crontab -l',您的系统可能不支持 'cron'"
15948
84bf71ea 15949#: builtin/gc.c:2063
d13389bf
JX
15950msgid "failed to run 'crontab'; your system might not support 'cron'"
15951msgstr "无法运行 'crontab',您的系统可能不支持 'cron'"
15952
84bf71ea 15953#: builtin/gc.c:2067
d13389bf
JX
15954msgid "failed to open stdin of 'crontab'"
15955msgstr "无法打开 'crontab' 的标准输入"
15956
84bf71ea 15957#: builtin/gc.c:2109
d13389bf
JX
15958msgid "'crontab' died"
15959msgstr "'crontab' 终止"
15960
84bf71ea 15961#: builtin/gc.c:2174
7e6630a7
FZ
15962msgid "failed to start systemctl"
15963msgstr "无法启动 systemctl"
15964
84bf71ea 15965#: builtin/gc.c:2184
7e6630a7
FZ
15966msgid "failed to run systemctl"
15967msgstr "无法运行 systemctl"
15968
84bf71ea 15969#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
7e6630a7
FZ
15970#: builtin/worktree.c:945
15971#, c-format
15972msgid "failed to delete '%s'"
15973msgstr "删除 '%s' 失败"
15974
84bf71ea 15975#: builtin/gc.c:2378
7e6630a7
FZ
15976#, c-format
15977msgid "unrecognized --scheduler argument '%s'"
15978msgstr "无法识别的 --scheduler 参数 '%s'"
15979
84bf71ea 15980#: builtin/gc.c:2403
7e6630a7
FZ
15981msgid "neither systemd timers nor crontab are available"
15982msgstr "systemd 和 crontab 的定时器都不可用"
15983
84bf71ea 15984#: builtin/gc.c:2418
7e6630a7
FZ
15985#, c-format
15986msgid "%s scheduler is not available"
15987msgstr "%s 调度器不可用"
15988
84bf71ea 15989#: builtin/gc.c:2432
473eb541
JX
15990msgid "another process is scheduling background maintenance"
15991msgstr "另外一个进程正运行于后台维护"
15992
84bf71ea 15993#: builtin/gc.c:2454
7e6630a7
FZ
15994msgid "git maintenance start [--scheduler=<scheduler>]"
15995msgstr "git maintenance start [--scheduler=<调度器>]"
15996
84bf71ea 15997#: builtin/gc.c:2463
7e6630a7
FZ
15998msgid "scheduler"
15999msgstr "调度器"
16000
84bf71ea 16001#: builtin/gc.c:2464
7e6630a7
FZ
16002msgid "scheduler to trigger git maintenance run"
16003msgstr "触发 git maintenance 执行的调度器"
16004
84bf71ea 16005#: builtin/gc.c:2478
d13389bf
JX
16006msgid "failed to add repo to global config"
16007msgstr "无法将仓库添加到全局配置"
16008
84bf71ea 16009#: builtin/gc.c:2487
d13389bf
JX
16010msgid "git maintenance <subcommand> [<options>]"
16011msgstr "git maintenance <子命令> [<选项>]"
16012
84bf71ea 16013#: builtin/gc.c:2506
d9488fea
JX
16014#, c-format
16015msgid "invalid subcommand: %s"
16016msgstr "无效子命令:%s"
16017
2b472aae 16018#: builtin/grep.c:30
814ff314
JX
16019msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
16020msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
ef317cd5 16021
7e6630a7 16022#: builtin/grep.c:239
c04f5ac3
JX
16023#, c-format
16024msgid "grep: failed to create thread: %s"
90e6ef53 16025msgstr "grep:无法创建线程:%s"
c04f5ac3 16026
7e6630a7 16027#: builtin/grep.c:293
276ceeaa
JX
16028#, c-format
16029msgid "invalid number of threads specified (%d) for %s"
16030msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
16031
a4f16749
JX
16032#. TRANSLATORS: %s is the configuration
16033#. variable for tweaking threads, currently
16034#. grep.threads
16035#.
7e6630a7
FZ
16036#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
16037#: builtin/pack-objects.c:3142
a4f16749
JX
16038#, c-format
16039msgid "no threads support, ignoring %s"
16040msgstr "没有线程支持,忽略 %s"
16041
7e6630a7 16042#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
c04f5ac3
JX
16043#, c-format
16044msgid "unable to read tree (%s)"
90e6ef53 16045msgstr "无法读取树(%s)"
c04f5ac3 16046
7e6630a7 16047#: builtin/grep.c:672
c04f5ac3
JX
16048#, c-format
16049msgid "unable to grep from object of type %s"
16050msgstr "无法抓取来自于 %s 类型的对象"
16051
7e6630a7 16052#: builtin/grep.c:752
c04f5ac3
JX
16053#, c-format
16054msgid "switch `%c' expects a numerical value"
16055msgstr "开关 `%c' 期望一个数字值"
16056
7e6630a7 16057#: builtin/grep.c:851
ef317cd5 16058msgid "search in index instead of in the work tree"
07432cef 16059msgstr "在索引区搜索而不是在工作区"
ef317cd5 16060
7e6630a7 16061#: builtin/grep.c:853
ef317cd5 16062msgid "find in contents not managed by git"
07432cef 16063msgstr "在未被 git 管理的内容中查找"
ef317cd5 16064
7e6630a7 16065#: builtin/grep.c:855
ef317cd5 16066msgid "search in both tracked and untracked files"
07432cef 16067msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 16068
7e6630a7 16069#: builtin/grep.c:857
814ff314
JX
16070msgid "ignore files specified via '.gitignore'"
16071msgstr "忽略 '.gitignore' 包含的文件"
ef317cd5 16072
7e6630a7 16073#: builtin/grep.c:859
87cb7997 16074msgid "recursively search in each submodule"
1a79b2f1
JX
16075msgstr "在每一个子模组中递归搜索"
16076
7e6630a7 16077#: builtin/grep.c:862
ef317cd5 16078msgid "show non-matching lines"
07432cef 16079msgstr "显示未匹配的行"
ef317cd5 16080
7e6630a7 16081#: builtin/grep.c:864
ef317cd5 16082msgid "case insensitive matching"
07432cef 16083msgstr "不区分大小写匹配"
ef317cd5 16084
7e6630a7 16085#: builtin/grep.c:866
ef317cd5 16086msgid "match patterns only at word boundaries"
07432cef 16087msgstr "只在单词边界匹配模式"
ef317cd5 16088
7e6630a7 16089#: builtin/grep.c:868
ef317cd5 16090msgid "process binary files as text"
07432cef 16091msgstr "把二进制文件当做文本处理"
ef317cd5 16092
7e6630a7 16093#: builtin/grep.c:870
ef317cd5 16094msgid "don't match patterns in binary files"
07432cef 16095msgstr "不在二进制文件中匹配模式"
ef317cd5 16096
7e6630a7 16097#: builtin/grep.c:873
90314792
JX
16098msgid "process binary files with textconv filters"
16099msgstr "用 textconv 过滤器处理二进制文件"
16100
7e6630a7 16101#: builtin/grep.c:875
4c27fcb5
JX
16102msgid "search in subdirectories (default)"
16103msgstr "在子目录中寻找(默认)"
16104
7e6630a7 16105#: builtin/grep.c:877
ef317cd5 16106msgid "descend at most <depth> levels"
07432cef 16107msgstr "最多以指定的深度向下寻找"
ef317cd5 16108
7e6630a7 16109#: builtin/grep.c:881
ef317cd5 16110msgid "use extended POSIX regular expressions"
07432cef 16111msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 16112
7e6630a7 16113#: builtin/grep.c:884
ef317cd5 16114msgid "use basic POSIX regular expressions (default)"
07432cef 16115msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 16116
7e6630a7 16117#: builtin/grep.c:887
ef317cd5 16118msgid "interpret patterns as fixed strings"
07432cef 16119msgstr "把模式解析为固定的字符串"
ef317cd5 16120
7e6630a7 16121#: builtin/grep.c:890
ef317cd5 16122msgid "use Perl-compatible regular expressions"
07432cef 16123msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 16124
7e6630a7 16125#: builtin/grep.c:893
ef317cd5 16126msgid "show line numbers"
07432cef 16127msgstr "显示行号"
ef317cd5 16128
7e6630a7 16129#: builtin/grep.c:894
c1ac5258
JX
16130msgid "show column number of first match"
16131msgstr "显示第一个匹配的列号"
16132
7e6630a7 16133#: builtin/grep.c:895
ef317cd5 16134msgid "don't show filenames"
07432cef 16135msgstr "不显示文件名"
ef317cd5 16136
7e6630a7 16137#: builtin/grep.c:896
ef317cd5 16138msgid "show filenames"
07432cef 16139msgstr "显示文件名"
ef317cd5 16140
7e6630a7 16141#: builtin/grep.c:898
ef317cd5 16142msgid "show filenames relative to top directory"
07432cef 16143msgstr "显示相对于顶级目录的文件名"
ef317cd5 16144
7e6630a7 16145#: builtin/grep.c:900
ef317cd5 16146msgid "show only filenames instead of matching lines"
07432cef 16147msgstr "只显示文件名而不显示匹配的行"
ef317cd5 16148
7e6630a7 16149#: builtin/grep.c:902
ef317cd5 16150msgid "synonym for --files-with-matches"
07432cef 16151msgstr "和 --files-with-matches 同义"
ef317cd5 16152
7e6630a7 16153#: builtin/grep.c:905
ef317cd5 16154msgid "show only the names of files without match"
07432cef 16155msgstr "只显示未匹配的文件名"
ef317cd5 16156
7e6630a7 16157#: builtin/grep.c:907
ef317cd5 16158msgid "print NUL after filenames"
07432cef 16159msgstr "在文件名后输出 NUL 字符"
ef317cd5 16160
7e6630a7 16161#: builtin/grep.c:910
c1ac5258
JX
16162msgid "show only matching parts of a line"
16163msgstr "只显示行中的匹配的部分"
16164
7e6630a7 16165#: builtin/grep.c:912
ef317cd5 16166msgid "show the number of matches instead of matching lines"
07432cef 16167msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 16168
7e6630a7 16169#: builtin/grep.c:913
ef317cd5 16170msgid "highlight matches"
07432cef 16171msgstr "高亮显示匹配项"
ef317cd5 16172
7e6630a7 16173#: builtin/grep.c:915
ef317cd5 16174msgid "print empty line between matches from different files"
07432cef 16175msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 16176
7e6630a7 16177#: builtin/grep.c:917
ef317cd5 16178msgid "show filename only once above matches from same file"
07432cef 16179msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 16180
7e6630a7 16181#: builtin/grep.c:920
ef317cd5 16182msgid "show <n> context lines before and after matches"
07432cef 16183msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 16184
7e6630a7 16185#: builtin/grep.c:923
ef317cd5 16186msgid "show <n> context lines before matches"
07432cef 16187msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 16188
7e6630a7 16189#: builtin/grep.c:925
ef317cd5 16190msgid "show <n> context lines after matches"
07432cef 16191msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 16192
7e6630a7 16193#: builtin/grep.c:927
276ceeaa
JX
16194msgid "use <n> worker threads"
16195msgstr "使用 <n> 个工作线程"
16196
7e6630a7 16197#: builtin/grep.c:928
ef317cd5 16198msgid "shortcut for -C NUM"
07432cef 16199msgstr "快捷键 -C 数字"
ef317cd5 16200
7e6630a7 16201#: builtin/grep.c:931
ef317cd5 16202msgid "show a line with the function name before matches"
07432cef 16203msgstr "在匹配的前面显示一行函数名"
ef317cd5 16204
7e6630a7 16205#: builtin/grep.c:933
ef317cd5 16206msgid "show the surrounding function"
07432cef 16207msgstr "显示所在函数的前后内容"
ef317cd5 16208
7e6630a7 16209#: builtin/grep.c:936
ef317cd5 16210msgid "read patterns from file"
07432cef 16211msgstr "从文件读取模式"
ef317cd5 16212
7e6630a7 16213#: builtin/grep.c:938
ef317cd5 16214msgid "match <pattern>"
07432cef 16215msgstr "匹配 <模式>"
ef317cd5 16216
7e6630a7 16217#: builtin/grep.c:940
ef317cd5 16218msgid "combine patterns specified with -e"
07432cef 16219msgstr "组合用 -e 参数设定的模式"
ef317cd5 16220
7e6630a7 16221#: builtin/grep.c:952
ef317cd5 16222msgid "indicate hit with exit status without output"
07432cef 16223msgstr "不输出,而用退出码标识命中状态"
ef317cd5 16224
7e6630a7 16225#: builtin/grep.c:954
ef317cd5 16226msgid "show only matches from files that match all patterns"
07432cef 16227msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 16228
7e6630a7 16229#: builtin/grep.c:957
ef317cd5 16230msgid "pager"
07432cef 16231msgstr "分页"
ef317cd5 16232
7e6630a7 16233#: builtin/grep.c:957
ef317cd5 16234msgid "show matching files in the pager"
07432cef 16235msgstr "分页显示匹配的文件"
ef317cd5 16236
7e6630a7 16237#: builtin/grep.c:961
ef317cd5 16238msgid "allow calling of grep(1) (ignored by this build)"
07432cef 16239msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 16240
7e6630a7 16241#: builtin/grep.c:1027
c1ac5258
JX
16242msgid "no pattern given"
16243msgstr "未提供匹配模式"
c04f5ac3 16244
7e6630a7 16245#: builtin/grep.c:1063
87cb7997
JX
16246msgid "--no-index or --untracked cannot be used with revs"
16247msgstr "--no-index 或 --untracked 不能和版本同时使用"
16248
7e6630a7 16249#: builtin/grep.c:1071
87cb7997
JX
16250#, c-format
16251msgid "unable to resolve revision: %s"
16252msgstr "不能解析版本:%s"
16253
7e6630a7 16254#: builtin/grep.c:1101
2b472aae
JX
16255msgid "--untracked not supported with --recurse-submodules"
16256msgstr "--untracked 不支持和 --recurse-submodules 共用"
16257
7e6630a7 16258#: builtin/grep.c:1105
4c27fcb5
JX
16259msgid "invalid option combination, ignoring --threads"
16260msgstr "无效的选项组合,忽略 --threads"
276ceeaa 16261
7e6630a7 16262#: builtin/grep.c:1108 builtin/pack-objects.c:4059
a4f16749
JX
16263msgid "no threads support, ignoring --threads"
16264msgstr "没有线程支持,忽略 --threads"
16265
7e6630a7 16266#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
4c27fcb5
JX
16267#, c-format
16268msgid "invalid number of threads specified (%d)"
16269msgstr "指定的线程数无效(%d)"
16270
7e6630a7 16271#: builtin/grep.c:1145
c04f5ac3
JX
16272msgid "--open-files-in-pager only works on the worktree"
16273msgstr "--open-files-in-pager 仅用于工作区"
16274
7e6630a7 16275#: builtin/grep.c:1171
c1ac5258
JX
16276msgid "--cached or --untracked cannot be used with --no-index"
16277msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
c04f5ac3 16278
7e6630a7 16279#: builtin/grep.c:1174
473eb541
JX
16280msgid "--untracked cannot be used with --cached"
16281msgstr "--untracked 不能与 --cached 同时使用"
16282
7e6630a7 16283#: builtin/grep.c:1180
c1ac5258
JX
16284msgid "--[no-]exclude-standard cannot be used for tracked contents"
16285msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
c04f5ac3 16286
7e6630a7 16287#: builtin/grep.c:1188
c1ac5258
JX
16288msgid "both --cached and trees are given"
16289msgstr "同时给出了 --cached 和树对象"
16290
7e6630a7 16291#: builtin/hash-object.c:83
ef317cd5 16292msgid ""
814ff314
JX
16293"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
16294"[--] <file>..."
ef317cd5 16295msgstr ""
814ff314
JX
16296"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
16297"[--] <文件>..."
ef317cd5 16298
7e6630a7 16299#: builtin/hash-object.c:84
94550ed3
JX
16300msgid "git hash-object --stdin-paths"
16301msgstr "git hash-object --stdin-paths"
ef317cd5 16302
7e6630a7 16303#: builtin/hash-object.c:96
ef317cd5 16304msgid "object type"
07432cef 16305msgstr "对象类型"
ef317cd5 16306
7e6630a7 16307#: builtin/hash-object.c:97
ef317cd5 16308msgid "write the object into the object database"
07432cef 16309msgstr "将对象写入对象数据库"
ef317cd5 16310
7e6630a7 16311#: builtin/hash-object.c:99
ef317cd5 16312msgid "read the object from stdin"
07432cef 16313msgstr "从标准输入读取对象"
ef317cd5 16314
7e6630a7 16315#: builtin/hash-object.c:101
ef317cd5 16316msgid "store file as is without filters"
07432cef 16317msgstr "原样存储文件不使用过滤器"
ef317cd5 16318
7e6630a7 16319#: builtin/hash-object.c:102
220c313c
JX
16320msgid ""
16321"just hash any random garbage to create corrupt objects for debugging Git"
16322msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
16323
7e6630a7 16324#: builtin/hash-object.c:103
ef317cd5 16325msgid "process file as it were from this path"
07432cef 16326msgstr "处理文件并假设其来自于此路径"
ef317cd5 16327
7e6630a7 16328#: builtin/help.c:55
ef317cd5 16329msgid "print all available commands"
07432cef 16330msgstr "打印所有可用的命令"
ef317cd5 16331
7e6630a7 16332#: builtin/help.c:57
a0b6b246
JX
16333msgid "exclude guides"
16334msgstr "排除向导"
16335
7e6630a7 16336#: builtin/help.c:58
ef317cd5 16337msgid "show man page"
07432cef 16338msgstr "显示 man 手册"
ef317cd5 16339
7e6630a7 16340#: builtin/help.c:59
ef317cd5 16341msgid "show manual in web browser"
07432cef 16342msgstr "在 web 浏览器中显示手册"
ef317cd5 16343
7e6630a7 16344#: builtin/help.c:61
ef317cd5 16345msgid "show info page"
07432cef 16346msgstr "显示 info 手册"
ef317cd5 16347
7e6630a7 16348#: builtin/help.c:63
fd8cb379
JX
16349msgid "print command description"
16350msgstr "打印命令描述"
16351
7e6630a7
FZ
16352#: builtin/help.c:65
16353msgid "print list of useful guides"
16354msgstr "显示有用的指南列表"
16355
16356#: builtin/help.c:67
16357msgid "print all configuration variable names"
16358msgstr "打印所有配置变量名称"
16359
16360#: builtin/help.c:78
16361msgid ""
16362"git help [-a|--all] [--[no-]verbose]]\n"
16363" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
16364msgstr ""
16365"git help [-a|--all] [--[no-]verbose]]\n"
16366" [[-i|--info] [-m|--man] [-w|--web]] [<命令>]"
16367
16368#: builtin/help.c:80
16369msgid "git help [-g|--guides]"
16370msgstr "git help [-g|--guides]"
16371
16372#: builtin/help.c:81
16373msgid "git help [-c|--config]"
16374msgstr "git help [-c|--config]"
ef317cd5 16375
7e6630a7 16376#: builtin/help.c:196
81809b99 16377#, c-format
8ada9598 16378msgid "unrecognized help format '%s'"
81809b99 16379msgstr "未能识别的帮助格式 '%s'"
8ada9598 16380
7e6630a7 16381#: builtin/help.c:223
8ada9598 16382msgid "Failed to start emacsclient."
81809b99 16383msgstr "无法启动 emacsclient。"
8ada9598 16384
7e6630a7 16385#: builtin/help.c:236
8ada9598 16386msgid "Failed to parse emacsclient version."
81809b99 16387msgstr "无法解析 emacsclient 版本。"
8ada9598 16388
7e6630a7 16389#: builtin/help.c:244
8ada9598
JX
16390#, c-format
16391msgid "emacsclient version '%d' too old (< 22)."
07432cef 16392msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 16393
7e6630a7 16394#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
81809b99 16395#, c-format
5b04ee3b 16396msgid "failed to exec '%s'"
c1ac5258 16397msgstr "执行 '%s' 失败"
8ada9598 16398
7e6630a7 16399#: builtin/help.c:340
8ada9598
JX
16400#, c-format
16401msgid ""
16402"'%s': path for unsupported man viewer.\n"
16403"Please consider using 'man.<tool>.cmd' instead."
16404msgstr ""
81809b99 16405"'%s':不支持的 man 手册查看器的路径。\n"
d9d56b23 16406"请使用 'man.<工具>.cmd'。"
8ada9598 16407
7e6630a7 16408#: builtin/help.c:352
8ada9598
JX
16409#, c-format
16410msgid ""
16411"'%s': cmd for supported man viewer.\n"
16412"Please consider using 'man.<tool>.path' instead."
16413msgstr ""
81809b99 16414"'%s': 支持的 man 手册查看器命令。\n"
d9d56b23 16415"请使用 'man.<工具>.path'。"
8ada9598 16416
7e6630a7 16417#: builtin/help.c:467
8ada9598
JX
16418#, c-format
16419msgid "'%s': unknown man viewer."
81809b99 16420msgstr "'%s':未知的 man 查看器。"
8ada9598 16421
7e6630a7 16422#: builtin/help.c:483
8ada9598 16423msgid "no man viewer handled the request"
81809b99 16424msgstr "没有 man 查看器处理此请求"
8ada9598 16425
7e6630a7 16426#: builtin/help.c:490
8ada9598 16427msgid "no info viewer handled the request"
81809b99 16428msgstr "没有 info 查看器处理此请求"
8ada9598 16429
7e6630a7 16430#: builtin/help.c:551 builtin/help.c:562 git.c:348
fd8cb379
JX
16431#, c-format
16432msgid "'%s' is aliased to '%s'"
16433msgstr "'%s' 是 '%s' 的别名"
220c313c 16434
7e6630a7 16435#: builtin/help.c:565 git.c:380
4c27fcb5
JX
16436#, c-format
16437msgid "bad alias.%s string: %s"
16438msgstr "坏的 alias.%s 字符串:%s"
16439
7e6630a7
FZ
16440#: builtin/help.c:581
16441msgid "this option doesn't take any other arguments"
16442msgstr "这个选项不带其他参数"
16443
16444#: builtin/help.c:602 builtin/help.c:629
fd8cb379
JX
16445#, c-format
16446msgid "usage: %s%s"
16447msgstr "用法:%s%s"
4dcdc3d8 16448
7e6630a7 16449#: builtin/help.c:624
c1ac5258
JX
16450msgid "'git help config' for more information"
16451msgstr "'git help config' 获取更多信息"
4dcdc3d8 16452
7e6630a7 16453#: builtin/index-pack.c:221
8ada9598
JX
16454#, c-format
16455msgid "object type mismatch at %s"
81809b99 16456msgstr "%s 的对象类型不匹配"
8ada9598 16457
7e6630a7 16458#: builtin/index-pack.c:241
6acbf033
JX
16459#, c-format
16460msgid "did not receive expected object %s"
a0b6b246 16461msgstr "未能获取预期的对象 %s"
8ada9598 16462
7e6630a7 16463#: builtin/index-pack.c:244
6acbf033
JX
16464#, c-format
16465msgid "object %s: expected type %s, found %s"
a0b6b246 16466msgstr "对象 %s:应为类型 %s,却是 %s"
6acbf033 16467
7e6630a7 16468#: builtin/index-pack.c:294
81809b99 16469#, c-format
8ada9598
JX
16470msgid "cannot fill %d byte"
16471msgid_plural "cannot fill %d bytes"
81809b99 16472msgstr[0] "无法填充 %d 字节"
5ae481e0 16473msgstr[1] "无法填充 %d 字节"
8ada9598 16474
7e6630a7 16475#: builtin/index-pack.c:304
8ada9598 16476msgid "early EOF"
81809b99 16477msgstr "过早的文件结束符(EOF)"
8ada9598 16478
7e6630a7 16479#: builtin/index-pack.c:305
8ada9598 16480msgid "read error on input"
81809b99 16481msgstr "输入上的读错误"
8ada9598 16482
7e6630a7 16483#: builtin/index-pack.c:317
8ada9598 16484msgid "used more bytes than were available"
81809b99 16485msgstr "用掉了超过可用的字节"
8ada9598 16486
7e6630a7 16487#: builtin/index-pack.c:324 builtin/pack-objects.c:756
8ada9598 16488msgid "pack too large for current definition of off_t"
81809b99 16489msgstr "包太大超过了当前 off_t 的定义"
8ada9598 16490
7e6630a7 16491#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
a0b6b246
JX
16492msgid "pack exceeds maximum allowed size"
16493msgstr "包超过了最大允许值"
16494
7e6630a7 16495#: builtin/index-pack.c:358
8ada9598 16496msgid "pack signature mismatch"
81809b99 16497msgstr "包签名不匹配"
8ada9598 16498
7e6630a7 16499#: builtin/index-pack.c:360
ef317cd5
JX
16500#, c-format
16501msgid "pack version %<PRIu32> unsupported"
07432cef 16502msgstr "不支持包版本 %<PRIu32>"
ef317cd5 16503
7e6630a7 16504#: builtin/index-pack.c:376
8ada9598 16505#, c-format
5c57d762
JX
16506msgid "pack has bad object at offset %<PRIuMAX>: %s"
16507msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
8ada9598 16508
7e6630a7 16509#: builtin/index-pack.c:482
8ada9598
JX
16510#, c-format
16511msgid "inflate returned %d"
81809b99 16512msgstr "解压缩返回 %d"
8ada9598 16513
7e6630a7 16514#: builtin/index-pack.c:531
8ada9598 16515msgid "offset value overflow for delta base object"
81809b99 16516msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 16517
7e6630a7 16518#: builtin/index-pack.c:539
8ada9598 16519msgid "delta base offset is out of bound"
81809b99 16520msgstr "delta 基准偏移越界"
8ada9598 16521
7e6630a7 16522#: builtin/index-pack.c:547
81809b99 16523#, c-format
8ada9598 16524msgid "unknown object type %d"
81809b99 16525msgstr "未知对象类型 %d"
8ada9598 16526
7e6630a7 16527#: builtin/index-pack.c:578
8ada9598 16528msgid "cannot pread pack file"
81809b99 16529msgstr "无法读取包文件"
8ada9598 16530
7e6630a7 16531#: builtin/index-pack.c:580
8ada9598 16532#, c-format
5c57d762
JX
16533msgid "premature end of pack file, %<PRIuMAX> byte missing"
16534msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
16535msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
16536msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8ada9598 16537
7e6630a7 16538#: builtin/index-pack.c:606
8ada9598 16539msgid "serious inflate inconsistency"
81809b99 16540msgstr "解压缩严重的不一致"
8ada9598 16541
7e6630a7
FZ
16542#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
16543#: builtin/index-pack.c:820 builtin/index-pack.c:829
8ada9598
JX
16544#, c-format
16545msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 16546msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 16547
7e6630a7 16548#: builtin/index-pack.c:754 builtin/pack-objects.c:292
ec3d4607 16549#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
6792b93b
JX
16550#, c-format
16551msgid "unable to read %s"
16552msgstr "不能读 %s"
16553
7e6630a7 16554#: builtin/index-pack.c:818
87cb7997
JX
16555#, c-format
16556msgid "cannot read existing object info %s"
16557msgstr "不能读取现存对象信息 %s"
16558
7e6630a7 16559#: builtin/index-pack.c:826
6792b93b
JX
16560#, c-format
16561msgid "cannot read existing object %s"
16562msgstr "不能读取现存对象 %s"
16563
7e6630a7 16564#: builtin/index-pack.c:840
81809b99 16565#, c-format
8ada9598 16566msgid "invalid blob object %s"
160fb2b2 16567msgstr "无效的数据对象 %s"
8ada9598 16568
7e6630a7 16569#: builtin/index-pack.c:843 builtin/index-pack.c:862
fd8cb379
JX
16570msgid "fsck error in packed object"
16571msgstr "对打包对象 fsck 检查出错"
16572
7e6630a7 16573#: builtin/index-pack.c:864
8ada9598
JX
16574#, c-format
16575msgid "Not all child objects of %s are reachable"
81809b99 16576msgstr "%s 的所有子对象并非都可达"
8ada9598 16577
7e6630a7 16578#: builtin/index-pack.c:925 builtin/index-pack.c:972
8ada9598 16579msgid "failed to apply delta"
c1ac5258 16580msgstr "应用 delta 失败"
8ada9598 16581
7e6630a7 16582#: builtin/index-pack.c:1156
8ada9598 16583msgid "Receiving objects"
81809b99 16584msgstr "接收对象中"
8ada9598 16585
7e6630a7 16586#: builtin/index-pack.c:1156
8ada9598 16587msgid "Indexing objects"
81809b99 16588msgstr "索引对象中"
8ada9598 16589
7e6630a7 16590#: builtin/index-pack.c:1190
8ada9598 16591msgid "pack is corrupted (SHA1 mismatch)"
81809b99 16592msgstr "包冲突(SHA1 不匹配)"
8ada9598 16593
7e6630a7 16594#: builtin/index-pack.c:1195
8ada9598 16595msgid "cannot fstat packfile"
65e2041e 16596msgstr "不能对包文件调用 fstat"
8ada9598 16597
7e6630a7 16598#: builtin/index-pack.c:1198
8ada9598 16599msgid "pack has junk at the end"
81809b99 16600msgstr "包的结尾有垃圾数据"
8ada9598 16601
7e6630a7 16602#: builtin/index-pack.c:1210
6792b93b
JX
16603msgid "confusion beyond insanity in parse_pack_objects()"
16604msgstr "parse_pack_objects() 中遇到不可理喻的问题"
16605
7e6630a7 16606#: builtin/index-pack.c:1233
8ada9598 16607msgid "Resolving deltas"
81809b99 16608msgstr "处理 delta 中"
8ada9598 16609
7e6630a7 16610#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
07432cef 16611#, c-format
ef317cd5 16612msgid "unable to create thread: %s"
07432cef 16613msgstr "不能创建线程:%s"
ef317cd5 16614
7e6630a7 16615#: builtin/index-pack.c:1277
8ada9598 16616msgid "confusion beyond insanity"
81809b99 16617msgstr "不可理喻"
8ada9598 16618
7e6630a7 16619#: builtin/index-pack.c:1283
ef317cd5 16620#, c-format
5b04ee3b
JX
16621msgid "completed with %d local object"
16622msgid_plural "completed with %d local objects"
16623msgstr[0] "完成 %d 个本地对象"
16624msgstr[1] "完成 %d 个本地对象"
ef317cd5 16625
7e6630a7 16626#: builtin/index-pack.c:1295
ef317cd5
JX
16627#, c-format
16628msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 16629msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 16630
7e6630a7 16631#: builtin/index-pack.c:1299
8ada9598
JX
16632#, c-format
16633msgid "pack has %d unresolved delta"
16634msgid_plural "pack has %d unresolved deltas"
81809b99 16635msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 16636msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 16637
7e6630a7 16638#: builtin/index-pack.c:1323
81809b99 16639#, c-format
8ada9598 16640msgid "unable to deflate appended object (%d)"
07432cef 16641msgstr "不能压缩附加对象(%d)"
8ada9598 16642
7e6630a7 16643#: builtin/index-pack.c:1419
8ada9598
JX
16644#, c-format
16645msgid "local object %s is corrupt"
81809b99 16646msgstr "本地对象 %s 已损坏"
8ada9598 16647
7e6630a7 16648#: builtin/index-pack.c:1440
31e5e17b 16649#, c-format
473eb541
JX
16650msgid "packfile name '%s' does not end with '.%s'"
16651msgstr "包文件名 '%s' 没有以 '.%s' 结尾"
8ada9598 16652
7e6630a7 16653#: builtin/index-pack.c:1464
81809b99 16654#, c-format
31e5e17b
JX
16655msgid "cannot write %s file '%s'"
16656msgstr "无法写入 %s 文件 '%s'"
8ada9598 16657
7e6630a7 16658#: builtin/index-pack.c:1472
81809b99 16659#, c-format
31e5e17b
JX
16660msgid "cannot close written %s file '%s'"
16661msgstr "无法关闭已写入的 %s 文件 '%s'"
16662
7e6630a7
FZ
16663#: builtin/index-pack.c:1489
16664#, c-format
84bf71ea
FZ
16665msgid "unable to rename temporary '*.%s' file to '%s'"
16666msgstr "不能重命名临时文件 '*.%s' 为 '%s'"
7e6630a7
FZ
16667
16668#: builtin/index-pack.c:1514
31e5e17b
JX
16669msgid "error while closing pack file"
16670msgstr "关闭包文件时出错"
8ada9598 16671
7e6630a7 16672#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
07432cef 16673#, c-format
ef317cd5 16674msgid "bad pack.indexversion=%<PRIu32>"
07432cef 16675msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 16676
7e6630a7 16677#: builtin/index-pack.c:1643
81809b99 16678#, c-format
8ada9598 16679msgid "Cannot open existing pack file '%s'"
81809b99 16680msgstr "无法打开现存包文件 '%s'"
8ada9598 16681
7e6630a7 16682#: builtin/index-pack.c:1645
81809b99 16683#, c-format
8ada9598 16684msgid "Cannot open existing pack idx file for '%s'"
81809b99 16685msgstr "无法为 %s 打开包索引文件"
8ada9598 16686
7e6630a7 16687#: builtin/index-pack.c:1693
81809b99 16688#, c-format
8ada9598
JX
16689msgid "non delta: %d object"
16690msgid_plural "non delta: %d objects"
81809b99 16691msgstr[0] "非 delta:%d 个对象"
5ae481e0 16692msgstr[1] "非 delta:%d 个对象"
8ada9598 16693
7e6630a7 16694#: builtin/index-pack.c:1700
8ada9598
JX
16695#, c-format
16696msgid "chain length = %d: %lu object"
16697msgid_plural "chain length = %d: %lu objects"
81809b99 16698msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 16699msgstr[1] "链长 = %d: %lu 对象"
8ada9598 16700
7e6630a7 16701#: builtin/index-pack.c:1742
31e5e17b
JX
16702msgid "Cannot come back to cwd"
16703msgstr "无法返回当前工作目录"
5b04ee3b 16704
7e6630a7
FZ
16705#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
16706#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
81809b99 16707#, c-format
8ada9598 16708msgid "bad %s"
81809b99 16709msgstr "错误选项 %s"
8ada9598 16710
7e6630a7 16711#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
7157c2b5
JX
16712#, c-format
16713msgid "unknown hash algorithm '%s'"
16714msgstr "未知的哈希算法 '%s'"
16715
7e6630a7 16716#: builtin/index-pack.c:1848
8ada9598 16717msgid "--fix-thin cannot be used without --stdin"
649900bc 16718msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 16719
7e6630a7 16720#: builtin/index-pack.c:1850
1a79b2f1 16721msgid "--stdin requires a git repository"
d9488fea 16722msgstr "--stdin 需要 git 仓库"
1a79b2f1 16723
7e6630a7 16724#: builtin/index-pack.c:1852
7157c2b5
JX
16725msgid "--object-format cannot be used with --stdin"
16726msgstr "--object-format 不能和 --stdin 同时使用"
16727
7e6630a7 16728#: builtin/index-pack.c:1867
8ada9598 16729msgid "--verify with no packfile name given"
dbd6cced 16730msgstr "--verify 没有提供包文件名参数"
8ada9598 16731
7e6630a7 16732#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
fd8cb379
JX
16733msgid "fsck error in pack objects"
16734msgstr "在打包对象中 fsck 检查出错"
16735
33b62fba 16736#: builtin/init-db.c:63
c04f5ac3
JX
16737#, c-format
16738msgid "cannot stat template '%s'"
65e2041e 16739msgstr "不能对模版 '%s' 调用 stat"
c04f5ac3 16740
33b62fba 16741#: builtin/init-db.c:68
c04f5ac3
JX
16742#, c-format
16743msgid "cannot opendir '%s'"
16744msgstr "不能打开目录 '%s'"
16745
33b62fba 16746#: builtin/init-db.c:80
c04f5ac3
JX
16747#, c-format
16748msgid "cannot readlink '%s'"
16749msgstr "不能读取链接 '%s'"
16750
33b62fba 16751#: builtin/init-db.c:82
c04f5ac3
JX
16752#, c-format
16753msgid "cannot symlink '%s' '%s'"
90e6ef53 16754msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3 16755
33b62fba 16756#: builtin/init-db.c:88
c04f5ac3
JX
16757#, c-format
16758msgid "cannot copy '%s' to '%s'"
16759msgstr "不能拷贝 '%s' 至 '%s'"
16760
33b62fba 16761#: builtin/init-db.c:92
c04f5ac3
JX
16762#, c-format
16763msgid "ignoring template %s"
16764msgstr "忽略模版 %s"
16765
33b62fba 16766#: builtin/init-db.c:123
c04f5ac3 16767#, c-format
fd8cb379
JX
16768msgid "templates not found in %s"
16769msgstr "没有在 %s 中找到模版"
c04f5ac3 16770
33b62fba 16771#: builtin/init-db.c:138
c04f5ac3 16772#, c-format
5b04ee3b
JX
16773msgid "not copying templates from '%s': %s"
16774msgstr "没有从 '%s' 复制模版:%s"
c04f5ac3 16775
ec3d4607 16776#: builtin/init-db.c:263
7157c2b5
JX
16777#, c-format
16778msgid "invalid initial branch name: '%s'"
16779msgstr "无效的初始分支名:'%s'"
16780
ec3d4607 16781#: builtin/init-db.c:354
c04f5ac3
JX
16782#, c-format
16783msgid "unable to handle file type %d"
16784msgstr "不能处理 %d 类型的文件"
16785
ec3d4607 16786#: builtin/init-db.c:357
c04f5ac3
JX
16787#, c-format
16788msgid "unable to move %s to %s"
16789msgstr "不能移动 %s 至 %s"
16790
ec3d4607 16791#: builtin/init-db.c:373
349ede6a
JX
16792msgid "attempt to reinitialize repository with different hash"
16793msgstr "尝试用不同的哈希算法重新初始化仓库"
16794
ec3d4607 16795#: builtin/init-db.c:397 builtin/init-db.c:400
a0b6b246
JX
16796#, c-format
16797msgid "%s already exists"
16798msgstr "%s 已经存在"
16799
ec3d4607 16800#: builtin/init-db.c:432
7157c2b5
JX
16801#, c-format
16802msgid "re-init: ignored --initial-branch=%s"
16803msgstr "re-init:已忽略 --initial-branch=%s"
16804
ec3d4607 16805#: builtin/init-db.c:463
c04f5ac3 16806#, c-format
5c57d762
JX
16807msgid "Reinitialized existing shared Git repository in %s%s\n"
16808msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
c04f5ac3 16809
ec3d4607 16810#: builtin/init-db.c:464
5c57d762
JX
16811#, c-format
16812msgid "Reinitialized existing Git repository in %s%s\n"
ec3d4607 16813msgstr "已重新初始化已存在的 Git 仓库于 %s%s\n"
c04f5ac3 16814
ec3d4607 16815#: builtin/init-db.c:468
5c57d762
JX
16816#, c-format
16817msgid "Initialized empty shared Git repository in %s%s\n"
9a4b694c 16818msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
c04f5ac3 16819
ec3d4607 16820#: builtin/init-db.c:469
5c57d762
JX
16821#, c-format
16822msgid "Initialized empty Git repository in %s%s\n"
9a4b694c 16823msgstr "已初始化空的 Git 仓库于 %s%s\n"
c04f5ac3 16824
ec3d4607 16825#: builtin/init-db.c:518
ef317cd5 16826msgid ""
a77c07d9 16827"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
814ff314 16828"shared[=<permissions>]] [<directory>]"
ef317cd5 16829msgstr ""
07432cef 16830"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
814ff314 16831"[<目录>]"
ef317cd5 16832
ec3d4607 16833#: builtin/init-db.c:544
ef317cd5 16834msgid "permissions"
07432cef 16835msgstr "权限"
ef317cd5 16836
ec3d4607 16837#: builtin/init-db.c:545
ef317cd5 16838msgid "specify that the git repository is to be shared amongst several users"
160fb2b2 16839msgstr "指定 git 仓库是多个用户之间共享的"
ef317cd5 16840
ec3d4607 16841#: builtin/init-db.c:551
7157c2b5
JX
16842msgid "override the name of the initial branch"
16843msgstr "覆盖初始分支名称"
16844
ec3d4607 16845#: builtin/init-db.c:552 builtin/verify-pack.c:74
349ede6a
JX
16846msgid "hash"
16847msgstr "hash"
16848
ec3d4607 16849#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
349ede6a
JX
16850msgid "specify the hash algorithm to use"
16851msgstr "指定要使用的哈希算法"
16852
ec3d4607 16853#: builtin/init-db.c:560
d9488fea
JX
16854msgid "--separate-git-dir and --bare are mutually exclusive"
16855msgstr "--separate-git-dir 和 --bare 是互斥的"
16856
ec3d4607 16857#: builtin/init-db.c:591 builtin/init-db.c:596
c1ac5258
JX
16858#, c-format
16859msgid "cannot mkdir %s"
16860msgstr "不能创建目录 %s"
16861
ec3d4607 16862#: builtin/init-db.c:600 builtin/init-db.c:655
c04f5ac3
JX
16863#, c-format
16864msgid "cannot chdir to %s"
16865msgstr "不能切换目录到 %s"
16866
ec3d4607 16867#: builtin/init-db.c:627
c04f5ac3
JX
16868#, c-format
16869msgid ""
16870"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
16871"dir=<directory>)"
1e607449 16872msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
c04f5ac3 16873
ec3d4607 16874#: builtin/init-db.c:679
c04f5ac3
JX
16875#, c-format
16876msgid "Cannot access work tree '%s'"
16877msgstr "不能访问工作区 '%s'"
16878
ec3d4607 16879#: builtin/init-db.c:684
d9488fea
JX
16880msgid "--separate-git-dir incompatible with bare repository"
16881msgstr "--separate-git-dir 不能用于纯仓库"
16882
a6cd2cc4 16883#: builtin/interpret-trailers.c:16
220c313c 16884msgid ""
276ceeaa
JX
16885"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
16886"<token>[(=|:)<value>])...] [<file>...]"
3495628d
JX
16887msgstr ""
16888"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
16889">])...] [<文件>...]"
276ceeaa 16890
a6cd2cc4 16891#: builtin/interpret-trailers.c:95
276ceeaa
JX
16892msgid "edit files in place"
16893msgstr "在原位编辑文件"
220c313c 16894
a6cd2cc4 16895#: builtin/interpret-trailers.c:96
220c313c 16896msgid "trim empty trailers"
d13389bf 16897msgstr "删除空的尾注"
6937cb4e 16898
a6cd2cc4 16899#: builtin/interpret-trailers.c:99
6937cb4e 16900msgid "where to place the new trailer"
d13389bf 16901msgstr "在哪里放置新的尾注"
220c313c 16902
a6cd2cc4 16903#: builtin/interpret-trailers.c:101
6937cb4e 16904msgid "action if trailer already exists"
d13389bf 16905msgstr "当尾注已经存在时所采取的动作"
6937cb4e 16906
a6cd2cc4 16907#: builtin/interpret-trailers.c:103
6937cb4e 16908msgid "action if trailer is missing"
d13389bf 16909msgstr "当尾注缺失时所采取的动作"
6937cb4e 16910
a6cd2cc4 16911#: builtin/interpret-trailers.c:105
6937cb4e 16912msgid "output only the trailers"
d13389bf 16913msgstr "只输出尾注"
6937cb4e 16914
a6cd2cc4 16915#: builtin/interpret-trailers.c:106
6937cb4e
JX
16916msgid "do not apply config rules"
16917msgstr "不要应用配置规则"
16918
a6cd2cc4 16919#: builtin/interpret-trailers.c:107
6937cb4e
JX
16920msgid "join whitespace-continued values"
16921msgstr "连接空白折行的值"
16922
a6cd2cc4 16923#: builtin/interpret-trailers.c:108
6937cb4e
JX
16924msgid "set parsing options"
16925msgstr "设置解析选项"
16926
a6cd2cc4 16927#: builtin/interpret-trailers.c:110
4c27fcb5
JX
16928msgid "do not treat --- specially"
16929msgstr "不要对 --- 特殊处理"
16930
a6cd2cc4 16931#: builtin/interpret-trailers.c:112
220c313c 16932msgid "trailer(s) to add"
d13389bf 16933msgstr "要添加的尾注"
220c313c 16934
a6cd2cc4 16935#: builtin/interpret-trailers.c:123
6937cb4e
JX
16936msgid "--trailer with --only-input does not make sense"
16937msgstr "--trailer 和 --only-input 同时使用没有意义"
16938
a6cd2cc4 16939#: builtin/interpret-trailers.c:133
276ceeaa
JX
16940msgid "no input file given for in-place editing"
16941msgstr "没有给出要原位编辑的文件"
16942
473eb541 16943#: builtin/log.c:59
7aea43ff 16944msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
d9d56b23 16945msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
ef317cd5 16946
473eb541 16947#: builtin/log.c:60
814ff314
JX
16948msgid "git show [<options>] <object>..."
16949msgstr "git show [<选项>] <对象>..."
ef317cd5 16950
473eb541 16951#: builtin/log.c:113
220c313c
JX
16952#, c-format
16953msgid "invalid --decorate option: %s"
16954msgstr "无效的 --decorate 选项:%s"
16955
473eb541 16956#: builtin/log.c:180
ef317cd5 16957msgid "show source"
07432cef 16958msgstr "显示源"
ef317cd5 16959
473eb541
JX
16960#: builtin/log.c:181
16961msgid "use mail map file"
07432cef
WS
16962msgstr "使用邮件映射文件"
16963
473eb541 16964#: builtin/log.c:184
5809aa05
JX
16965msgid "only decorate refs that match <pattern>"
16966msgstr "只修饰与 <模式> 匹配的引用"
16967
473eb541 16968#: builtin/log.c:186
5809aa05
JX
16969msgid "do not decorate refs that match <pattern>"
16970msgstr "不修饰和 <模式> 匹配的引用"
16971
473eb541 16972#: builtin/log.c:187
ef317cd5 16973msgid "decorate options"
07432cef 16974msgstr "修饰选项"
ef317cd5 16975
473eb541 16976#: builtin/log.c:190
d13389bf 16977msgid ""
473eb541 16978"trace the evolution of line range <start>,<end> or function :<funcname> in "
d13389bf
JX
16979"<file>"
16980msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数名> 的演变"
16981
473eb541 16982#: builtin/log.c:213
d13389bf
JX
16983msgid "-L<range>:<file> cannot be used with pathspec"
16984msgstr "-L<范围>:<文件> 不能和路径表达式共用"
220c313c 16985
ec3d4607 16986#: builtin/log.c:306
c04f5ac3
JX
16987#, c-format
16988msgid "Final output: %d %s\n"
16989msgstr "最终输出:%d %s\n"
16990
ec3d4607 16991#: builtin/log.c:571
220c313c
JX
16992#, c-format
16993msgid "git show %s: bad file"
16994msgstr "git show %s: 损坏的文件"
16995
ec3d4607 16996#: builtin/log.c:586 builtin/log.c:676
c04f5ac3 16997#, c-format
d46c5519 16998msgid "could not read object %s"
90e6ef53 16999msgstr "不能读取对象 %s"
c04f5ac3 17000
ec3d4607 17001#: builtin/log.c:701
c04f5ac3 17002#, c-format
d46c5519 17003msgid "unknown type: %d"
c04f5ac3
JX
17004msgstr "未知类型:%d"
17005
ec3d4607 17006#: builtin/log.c:846
ddc12c42
JX
17007#, c-format
17008msgid "%s: invalid cover from description mode"
17009msgstr "%s:从描述生成附函的模式无效"
17010
ec3d4607 17011#: builtin/log.c:853
c04f5ac3
JX
17012msgid "format.headers without value"
17013msgstr "format.headers 没有值"
17014
ec3d4607 17015#: builtin/log.c:982
c04f5ac3 17016#, c-format
d46c5519 17017msgid "cannot open patch file %s"
c04f5ac3
JX
17018msgstr "无法打开补丁文件 %s"
17019
ec3d4607 17020#: builtin/log.c:999
d46c5519
JX
17021msgid "need exactly one range"
17022msgstr "只需要一个范围"
c04f5ac3 17023
ec3d4607 17024#: builtin/log.c:1009
d46c5519
JX
17025msgid "not a range"
17026msgstr "不是一个范围"
c04f5ac3 17027
ec3d4607 17028#: builtin/log.c:1173
d46c5519
JX
17029msgid "cover letter needs email format"
17030msgstr "附函需要邮件地址格式"
c04f5ac3 17031
ec3d4607 17032#: builtin/log.c:1179
d46c5519
JX
17033msgid "failed to create cover-letter file"
17034msgstr "无法创建附函文件"
17035
ec3d4607 17036#: builtin/log.c:1266
c04f5ac3
JX
17037#, c-format
17038msgid "insane in-reply-to: %s"
17039msgstr "不正常的 in-reply-to:%s"
17040
ec3d4607 17041#: builtin/log.c:1293
814ff314
JX
17042msgid "git format-patch [<options>] [<since> | <revision-range>]"
17043msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
ef317cd5 17044
ec3d4607 17045#: builtin/log.c:1351
d46c5519 17046msgid "two output directories?"
c04f5ac3
JX
17047msgstr "两个输出目录?"
17048
ec3d4607 17049#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
5b04ee3b 17050#, c-format
d46c5519 17051msgid "unknown commit %s"
5b04ee3b
JX
17052msgstr "未知提交 %s"
17053
ec3d4607 17054#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
d46c5519 17055#: builtin/replace.c:210
5b04ee3b 17056#, c-format
d46c5519
JX
17057msgid "failed to resolve '%s' as a valid ref"
17058msgstr "无法将 '%s' 解析为一个有效引用"
5b04ee3b 17059
ec3d4607 17060#: builtin/log.c:1522
d46c5519
JX
17061msgid "could not find exact merge base"
17062msgstr "不能找到准确的合并基线"
5b04ee3b 17063
ec3d4607 17064#: builtin/log.c:1532
5b04ee3b 17065msgid ""
d46c5519 17066"failed to get upstream, if you want to record base commit automatically,\n"
5b04ee3b 17067"please use git branch --set-upstream-to to track a remote branch.\n"
d46c5519 17068"Or you could specify base commit by --base=<base-commit-id> manually"
5b04ee3b 17069msgstr ""
7e6630a7
FZ
17070"无法得到上游地址,如果您想自动记录基线提交,请使用命令\n"
17071"git branch --set-upstream-to 来跟踪一个远程分支。或者您可以通过\n"
d46c5519 17072"参数 --base=<基线提交> 手动指定一个基线提交"
5b04ee3b 17073
ec3d4607 17074#: builtin/log.c:1555
d46c5519 17075msgid "failed to find exact merge base"
5b04ee3b
JX
17076msgstr "无法找到准确的合并基线"
17077
ec3d4607 17078#: builtin/log.c:1572
5b04ee3b
JX
17079msgid "base commit should be the ancestor of revision list"
17080msgstr "基线提交应该是版本列表的祖先"
17081
ec3d4607 17082#: builtin/log.c:1582
5b04ee3b
JX
17083msgid "base commit shouldn't be in revision list"
17084msgstr "基线提交不应该出现在版本列表中"
17085
ec3d4607 17086#: builtin/log.c:1640
5b04ee3b 17087msgid "cannot get patch id"
aef18cc6 17088msgstr "无法得到补丁 id"
5b04ee3b 17089
ec3d4607 17090#: builtin/log.c:1703
d9488fea
JX
17091msgid "failed to infer range-diff origin of current series"
17092msgstr "无法推断当前系列的 range-diff 起始"
17093
ec3d4607 17094#: builtin/log.c:1705
d9488fea
JX
17095#, c-format
17096msgid "using '%s' as range-diff origin of current series"
17097msgstr "使用 '%s' 作为当前系列的 range-diff 源"
4c27fcb5 17098
ec3d4607 17099#: builtin/log.c:1749
ef317cd5 17100msgid "use [PATCH n/m] even with a single patch"
07432cef 17101msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 17102
ec3d4607 17103#: builtin/log.c:1752
ef317cd5 17104msgid "use [PATCH] even with multiple patches"
07432cef 17105msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 17106
ec3d4607 17107#: builtin/log.c:1756
ef317cd5 17108msgid "print patches to standard out"
07432cef 17109msgstr "打印补丁到标准输出"
c04f5ac3 17110
ec3d4607 17111#: builtin/log.c:1758
ef317cd5 17112msgid "generate a cover letter"
d46c5519 17113msgstr "生成一封附函"
c04f5ac3 17114
ec3d4607 17115#: builtin/log.c:1760
ef317cd5 17116msgid "use simple number sequence for output file names"
07432cef 17117msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 17118
ec3d4607 17119#: builtin/log.c:1761
ef317cd5 17120msgid "sfx"
07432cef 17121msgstr "后缀"
ef317cd5 17122
ec3d4607 17123#: builtin/log.c:1762
ef317cd5 17124msgid "use <sfx> instead of '.patch'"
07432cef 17125msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 17126
ec3d4607 17127#: builtin/log.c:1764
ef317cd5 17128msgid "start numbering patches at <n> instead of 1"
07432cef
WS
17129msgstr "补丁以 <n> 开始编号,而不是1"
17130
ec3d4607 17131#: builtin/log.c:1765
33b62fba
JX
17132msgid "reroll-count"
17133msgstr "重制-计数"
17134
ec3d4607 17135#: builtin/log.c:1766
07432cef
WS
17136msgid "mark the series as Nth re-roll"
17137msgstr "标记补丁系列是第几次重制"
ef317cd5 17138
ec3d4607 17139#: builtin/log.c:1768
d13389bf
JX
17140msgid "max length of output filename"
17141msgstr "输出文件名的最大长度"
17142
ec3d4607 17143#: builtin/log.c:1770
473eb541 17144msgid "use [RFC PATCH] instead of [PATCH]"
a0b6b246
JX
17145msgstr "使用 [RFC PATCH] 代替 [PATCH]"
17146
ec3d4607 17147#: builtin/log.c:1773
ddc12c42
JX
17148msgid "cover-from-description-mode"
17149msgstr "从分支描述获取附函的模式"
17150
ec3d4607 17151#: builtin/log.c:1774
ddc12c42
JX
17152msgid "generate parts of a cover letter based on a branch's description"
17153msgstr "基于一个分支描述生成部分附函"
17154
ec3d4607 17155#: builtin/log.c:1776
473eb541 17156msgid "use [<prefix>] instead of [PATCH]"
07432cef 17157msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 17158
ec3d4607 17159#: builtin/log.c:1779
ef317cd5 17160msgid "store resulting files in <dir>"
d9d56b23 17161msgstr "把结果文件存储在 <目录>"
ef317cd5 17162
ec3d4607 17163#: builtin/log.c:1782
ef317cd5 17164msgid "don't strip/add [PATCH]"
07432cef 17165msgstr "不删除/添加 [PATCH]"
ef317cd5 17166
ec3d4607 17167#: builtin/log.c:1785
ef317cd5 17168msgid "don't output binary diffs"
07432cef 17169msgstr "不输出二进制差异"
ef317cd5 17170
ec3d4607 17171#: builtin/log.c:1787
89f80d72
JX
17172msgid "output all-zero hash in From header"
17173msgstr "在 From 头信息中输出全为零的哈希值"
17174
ec3d4607 17175#: builtin/log.c:1789
ef317cd5 17176msgid "don't include a patch matching a commit upstream"
07432cef 17177msgstr "不包含已在上游提交中的补丁"
ef317cd5 17178
ec3d4607 17179#: builtin/log.c:1791
ef317cd5 17180msgid "show patch format instead of default (patch + stat)"
07432cef 17181msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 17182
ec3d4607 17183#: builtin/log.c:1793
ef317cd5 17184msgid "Messaging"
07432cef 17185msgstr "邮件发送"
ef317cd5 17186
ec3d4607 17187#: builtin/log.c:1794
ef317cd5 17188msgid "header"
07432cef 17189msgstr "header"
ef317cd5 17190
ec3d4607 17191#: builtin/log.c:1795
ef317cd5 17192msgid "add email header"
07432cef 17193msgstr "添加邮件头"
ef317cd5 17194
ec3d4607 17195#: builtin/log.c:1796 builtin/log.c:1797
ef317cd5 17196msgid "email"
07432cef 17197msgstr "邮件地址"
ef317cd5 17198
ec3d4607 17199#: builtin/log.c:1796
ef317cd5 17200msgid "add To: header"
07432cef 17201msgstr "添加收件人"
ef317cd5 17202
ec3d4607 17203#: builtin/log.c:1797
ef317cd5 17204msgid "add Cc: header"
07432cef 17205msgstr "添加抄送"
ef317cd5 17206
ec3d4607 17207#: builtin/log.c:1798
2e8451e8 17208msgid "ident"
d9d56b23 17209msgstr "标识"
2e8451e8 17210
ec3d4607 17211#: builtin/log.c:1799
2e8451e8 17212msgid "set From address to <ident> (or committer ident if absent)"
4375c10e 17213msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
2e8451e8 17214
ec3d4607 17215#: builtin/log.c:1801
ef317cd5 17216msgid "message-id"
d9d56b23 17217msgstr "邮件标识"
ef317cd5 17218
ec3d4607 17219#: builtin/log.c:1802
ef317cd5 17220msgid "make first mail a reply to <message-id>"
d9d56b23 17221msgstr "使第一封邮件作为对 <邮件标识> 的回复"
ef317cd5 17222
ec3d4607 17223#: builtin/log.c:1803 builtin/log.c:1806
ef317cd5 17224msgid "boundary"
07432cef 17225msgstr "边界"
ef317cd5 17226
ec3d4607 17227#: builtin/log.c:1804
ef317cd5 17228msgid "attach the patch"
07432cef 17229msgstr "附件方式添加补丁"
ef317cd5 17230
ec3d4607 17231#: builtin/log.c:1807
ef317cd5 17232msgid "inline the patch"
07432cef 17233msgstr "内联显示补丁"
ef317cd5 17234
ec3d4607 17235#: builtin/log.c:1811
ef317cd5 17236msgid "enable message threading, styles: shallow, deep"
07432cef 17237msgstr "启用邮件线索,风格:浅,深"
ef317cd5 17238
ec3d4607 17239#: builtin/log.c:1813
ef317cd5 17240msgid "signature"
07432cef 17241msgstr "签名"
ef317cd5 17242
ec3d4607 17243#: builtin/log.c:1814
ef317cd5 17244msgid "add a signature"
07432cef 17245msgstr "添加一个签名"
ef317cd5 17246
ec3d4607 17247#: builtin/log.c:1815
5b04ee3b
JX
17248msgid "base-commit"
17249msgstr "基线提交"
17250
ec3d4607 17251#: builtin/log.c:1816
5b04ee3b
JX
17252msgid "add prerequisite tree info to the patch series"
17253msgstr "为补丁列表添加前置树信息"
17254
ec3d4607 17255#: builtin/log.c:1819
6acbf033
JX
17256msgid "add a signature from a file"
17257msgstr "从文件添加一个签名"
17258
ec3d4607 17259#: builtin/log.c:1820
ef317cd5 17260msgid "don't print the patch filenames"
07432cef 17261msgstr "不要打印补丁文件名"
ef317cd5 17262
ec3d4607 17263#: builtin/log.c:1822
6937cb4e
JX
17264msgid "show progress while generating patches"
17265msgstr "在生成补丁时显示进度"
17266
ec3d4607 17267#: builtin/log.c:1824
4c27fcb5 17268msgid "show changes against <rev> in cover letter or single patch"
ec3d4607 17269msgstr "在附函或单个补丁中显示和 <版本> 的差异"
4c27fcb5 17270
ec3d4607 17271#: builtin/log.c:1827
4c27fcb5 17272msgid "show changes against <refspec> in cover letter or single patch"
ec3d4607 17273msgstr "在附函或单个补丁中显示和 <引用规格> 的差异"
4c27fcb5 17274
ec3d4607 17275#: builtin/log.c:1829 builtin/range-diff.c:28
4c27fcb5
JX
17276msgid "percentage by which creation is weighted"
17277msgstr "创建权重的百分比"
17278
ec3d4607 17279#: builtin/log.c:1916
a4f16749
JX
17280#, c-format
17281msgid "invalid ident line: %s"
17282msgstr "包含无效的身份标识:%s"
17283
ec3d4607 17284#: builtin/log.c:1931
c1ac5258
JX
17285msgid "-n and -k are mutually exclusive"
17286msgstr "-n 和 -k 互斥"
c04f5ac3 17287
ec3d4607 17288#: builtin/log.c:1933
c1ac5258
JX
17289msgid "--subject-prefix/--rfc and -k are mutually exclusive"
17290msgstr "--subject-prefix/--rfc 和 -k 互斥"
c04f5ac3 17291
ec3d4607 17292#: builtin/log.c:1941
c04f5ac3
JX
17293msgid "--name-only does not make sense"
17294msgstr "--name-only 无意义"
17295
ec3d4607 17296#: builtin/log.c:1943
c04f5ac3
JX
17297msgid "--name-status does not make sense"
17298msgstr "--name-status 无意义"
17299
ec3d4607 17300#: builtin/log.c:1945
c04f5ac3
JX
17301msgid "--check does not make sense"
17302msgstr "--check 无意义"
17303
ec3d4607 17304#: builtin/log.c:1967
d13389bf
JX
17305msgid "--stdout, --output, and --output-directory are mutually exclusive"
17306msgstr "--stdout、--output 和 --output-directory 是互斥的"
c04f5ac3 17307
ec3d4607 17308#: builtin/log.c:2089
4c27fcb5
JX
17309msgid "--interdiff requires --cover-letter or single patch"
17310msgstr "--interdiff 需要 --cover-letter 或单一补丁"
17311
ec3d4607 17312#: builtin/log.c:2093
4c27fcb5
JX
17313msgid "Interdiff:"
17314msgstr "版本间差异:"
17315
ec3d4607 17316#: builtin/log.c:2094
4c27fcb5
JX
17317#, c-format
17318msgid "Interdiff against v%d:"
17319msgstr "对 v%d 的版本差异:"
17320
ec3d4607 17321#: builtin/log.c:2100
4c27fcb5
JX
17322msgid "--creation-factor requires --range-diff"
17323msgstr "--creation-factor 需要 --range-diff"
17324
ec3d4607 17325#: builtin/log.c:2104
4c27fcb5
JX
17326msgid "--range-diff requires --cover-letter or single patch"
17327msgstr "--range-diff 需要 --cover-letter 或单一补丁"
17328
ec3d4607 17329#: builtin/log.c:2112
4c27fcb5
JX
17330msgid "Range-diff:"
17331msgstr "范围差异:"
17332
ec3d4607 17333#: builtin/log.c:2113
4c27fcb5
JX
17334#, c-format
17335msgid "Range-diff against v%d:"
17336msgstr "对 v%d 的范围差异:"
17337
ec3d4607 17338#: builtin/log.c:2124
6acbf033
JX
17339#, c-format
17340msgid "unable to read signature file '%s'"
17341msgstr "无法读取签名文件 '%s'"
17342
ec3d4607 17343#: builtin/log.c:2160
6937cb4e
JX
17344msgid "Generating patches"
17345msgstr "生成补丁"
17346
ec3d4607 17347#: builtin/log.c:2204
d46c5519 17348msgid "failed to create output files"
c04f5ac3
JX
17349msgstr "无法创建输出文件"
17350
ec3d4607 17351#: builtin/log.c:2263
ef317cd5 17352msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 17353msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 17354
ec3d4607 17355#: builtin/log.c:2317
c04f5ac3
JX
17356#, c-format
17357msgid ""
17358"Could not find a tracked remote branch, please specify <upstream> manually.\n"
d9d56b23 17359msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
c04f5ac3 17360
7e6630a7 17361#: builtin/ls-files.c:561
814ff314
JX
17362msgid "git ls-files [<options>] [<file>...]"
17363msgstr "git ls-files [<选项>] [<文件>...]"
ef317cd5 17364
7e6630a7
FZ
17365#: builtin/ls-files.c:615
17366msgid "separate paths with the NUL character"
17367msgstr "用 NUL 字符分隔路径"
17368
17369#: builtin/ls-files.c:617
ef317cd5 17370msgid "identify the file status with tags"
07432cef 17371msgstr "用标签标识文件的状态"
ef317cd5 17372
7e6630a7 17373#: builtin/ls-files.c:619
ef317cd5 17374msgid "use lowercase letters for 'assume unchanged' files"
07432cef 17375msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 17376
7e6630a7 17377#: builtin/ls-files.c:621
5809aa05
JX
17378msgid "use lowercase letters for 'fsmonitor clean' files"
17379msgstr "使用小写字母表示 'fsmonitor clean' 文件"
17380
7e6630a7 17381#: builtin/ls-files.c:623
ef317cd5 17382msgid "show cached files in the output (default)"
07432cef 17383msgstr "显示缓存的文件(默认)"
ef317cd5 17384
7e6630a7 17385#: builtin/ls-files.c:625
ef317cd5 17386msgid "show deleted files in the output"
07432cef 17387msgstr "显示已删除的文件"
ef317cd5 17388
7e6630a7 17389#: builtin/ls-files.c:627
ef317cd5 17390msgid "show modified files in the output"
07432cef 17391msgstr "显示已修改的文件"
ef317cd5 17392
7e6630a7 17393#: builtin/ls-files.c:629
ef317cd5 17394msgid "show other files in the output"
07432cef 17395msgstr "显示其它文件"
ef317cd5 17396
7e6630a7 17397#: builtin/ls-files.c:631
ef317cd5 17398msgid "show ignored files in the output"
07432cef 17399msgstr "显示忽略的文件"
ef317cd5 17400
7e6630a7 17401#: builtin/ls-files.c:634
ef317cd5 17402msgid "show staged contents' object name in the output"
07432cef 17403msgstr "显示暂存区内容的对象名称"
ef317cd5 17404
7e6630a7 17405#: builtin/ls-files.c:636
ef317cd5 17406msgid "show files on the filesystem that need to be removed"
07432cef 17407msgstr "显示文件系统需要删除的文件"
ef317cd5 17408
7e6630a7 17409#: builtin/ls-files.c:638
220c313c 17410msgid "show 'other' directories' names only"
07432cef 17411msgstr "只显示“其他”目录的名称"
ef317cd5 17412
7e6630a7 17413#: builtin/ls-files.c:640
276ceeaa
JX
17414msgid "show line endings of files"
17415msgstr "显示文件换行符格式"
17416
7e6630a7 17417#: builtin/ls-files.c:642
ef317cd5 17418msgid "don't show empty directories"
07432cef 17419msgstr "不显示空目录"
ef317cd5 17420
7e6630a7 17421#: builtin/ls-files.c:645
ef317cd5 17422msgid "show unmerged files in the output"
07432cef 17423msgstr "显示未合并的文件"
ef317cd5 17424
7e6630a7 17425#: builtin/ls-files.c:647
ef317cd5 17426msgid "show resolve-undo information"
07432cef 17427msgstr "显示 resolve-undo 信息"
ef317cd5 17428
7e6630a7 17429#: builtin/ls-files.c:649
ef317cd5 17430msgid "skip files matching pattern"
d9488fea 17431msgstr "跳过和模式匹配的文件"
ef317cd5 17432
7e6630a7
FZ
17433#: builtin/ls-files.c:652
17434msgid "read exclude patterns from <file>"
17435msgstr "从 <文件> 读取排除模式"
ef317cd5 17436
7e6630a7 17437#: builtin/ls-files.c:655
ef317cd5 17438msgid "read additional per-directory exclude patterns in <file>"
07432cef 17439msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 17440
7e6630a7 17441#: builtin/ls-files.c:657
ef317cd5 17442msgid "add the standard git exclusions"
07432cef 17443msgstr "添加标准的 git 排除"
ef317cd5 17444
7e6630a7 17445#: builtin/ls-files.c:661
ef317cd5 17446msgid "make the output relative to the project top directory"
07432cef 17447msgstr "显示相对于顶级目录的文件名"
ef317cd5 17448
7e6630a7 17449#: builtin/ls-files.c:664
a0b6b246
JX
17450msgid "recurse through submodules"
17451msgstr "在子模组中递归"
17452
7e6630a7 17453#: builtin/ls-files.c:666
ef317cd5 17454msgid "if any <file> is not in the index, treat this as an error"
07432cef 17455msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 17456
7e6630a7 17457#: builtin/ls-files.c:667
ef317cd5 17458msgid "tree-ish"
ddc12c42 17459msgstr "树对象"
ef317cd5 17460
7e6630a7 17461#: builtin/ls-files.c:668
ef317cd5 17462msgid "pretend that paths removed since <tree-ish> are still present"
ddc12c42 17463msgstr "假装自从 <树对象> 之后删除的路径仍然存在"
ef317cd5 17464
7e6630a7 17465#: builtin/ls-files.c:670
ef317cd5 17466msgid "show debugging data"
07432cef 17467msgstr "显示调试数据"
ef317cd5 17468
7e6630a7 17469#: builtin/ls-files.c:672
473eb541
JX
17470msgid "suppress duplicate entries"
17471msgstr "抑制重复条目"
17472
fd8cb379 17473#: builtin/ls-remote.c:9
276ceeaa
JX
17474msgid ""
17475"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
7e6630a7
FZ
17476" [-q | --quiet] [--exit-code] [--get-url]\n"
17477" [--symref] [<repository> [<refs>...]]"
276ceeaa
JX
17478msgstr ""
17479"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
7e6630a7
FZ
17480" [-q | --quiet] [--exit-code] [--get-url]\n"
17481" [--symref] [<仓库> [<引用>...]]"
276ceeaa 17482
473eb541 17483#: builtin/ls-remote.c:60
276ceeaa
JX
17484msgid "do not print remote URL"
17485msgstr "不打印远程 URL"
17486
7e6630a7 17487#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
276ceeaa
JX
17488msgid "exec"
17489msgstr "exec"
17490
473eb541 17491#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
276ceeaa
JX
17492msgid "path of git-upload-pack on the remote host"
17493msgstr "远程主机上的 git-upload-pack 路径"
17494
473eb541 17495#: builtin/ls-remote.c:66
276ceeaa
JX
17496msgid "limit to tags"
17497msgstr "仅限于标签"
17498
473eb541 17499#: builtin/ls-remote.c:67
276ceeaa
JX
17500msgid "limit to heads"
17501msgstr "仅限于分支"
17502
473eb541 17503#: builtin/ls-remote.c:68
276ceeaa
JX
17504msgid "do not show peeled tags"
17505msgstr "不显示已解析的标签"
17506
473eb541 17507#: builtin/ls-remote.c:70
276ceeaa
JX
17508msgid "take url.<base>.insteadOf into account"
17509msgstr "参考 url.<base>.insteadOf 设置"
17510
473eb541 17511#: builtin/ls-remote.c:73
276ceeaa
JX
17512msgid "exit with exit code 2 if no matching refs are found"
17513msgstr "若未找到匹配的引用则以退出码2退出"
17514
473eb541 17515#: builtin/ls-remote.c:76
276ceeaa
JX
17516msgid "show underlying ref in addition to the object pointed by it"
17517msgstr "除了显示指向的对象外,显示指向的引用名"
17518
c1ac5258 17519#: builtin/ls-tree.c:30
ef317cd5 17520msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
ddc12c42 17521msgstr "git ls-tree [<选项>] <树对象> [<路径>...]"
ef317cd5 17522
c1ac5258 17523#: builtin/ls-tree.c:128
ef317cd5 17524msgid "only show trees"
07432cef 17525msgstr "只显示树"
ef317cd5 17526
c1ac5258 17527#: builtin/ls-tree.c:130
ef317cd5 17528msgid "recurse into subtrees"
07432cef 17529msgstr "递归到子树"
ef317cd5 17530
c1ac5258 17531#: builtin/ls-tree.c:132
ef317cd5 17532msgid "show trees when recursing"
07432cef 17533msgstr "当递归时显示树"
ef317cd5 17534
c1ac5258 17535#: builtin/ls-tree.c:135
ef317cd5 17536msgid "terminate entries with NUL byte"
4375c10e 17537msgstr "条目以 NUL 字符终止"
ef317cd5 17538
c1ac5258 17539#: builtin/ls-tree.c:136
ef317cd5 17540msgid "include object size"
07432cef 17541msgstr "包括对象大小"
ef317cd5 17542
c1ac5258 17543#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
ef317cd5 17544msgid "list only filenames"
07432cef 17545msgstr "只列出文件名"
ef317cd5 17546
c1ac5258 17547#: builtin/ls-tree.c:143
ef317cd5 17548msgid "use full path names"
07432cef 17549msgstr "使用文件的全路径"
ef317cd5 17550
c1ac5258 17551#: builtin/ls-tree.c:145
ef317cd5 17552msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 17553msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5 17554
33b62fba
JX
17555#. TRANSLATORS: keep <> in "<" mail ">" info.
17556#: builtin/mailinfo.c:14
17557msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
17558msgstr "git mailinfo [<选项>] <消息> <补丁> < mail >info"
17559
17560#: builtin/mailinfo.c:58
17561msgid "keep subject"
17562msgstr "保持主题"
17563
17564#: builtin/mailinfo.c:60
17565msgid "keep non patch brackets in subject"
7b4d4954 17566msgstr "在主题中保持无补丁括号标注"
33b62fba
JX
17567
17568#: builtin/mailinfo.c:62
17569msgid "copy Message-ID to the end of commit message"
17570msgstr "拷贝 Message-ID 至提交说明结尾"
17571
17572#: builtin/mailinfo.c:64
17573msgid "re-code metadata to i18n.commitEncoding"
17574msgstr "将元数据重新编码为 i18n.commitEncoding"
17575
17576#: builtin/mailinfo.c:67
17577msgid "disable charset re-coding of metadata"
17578msgstr "禁用元数据的字符集重新编码"
17579
17580#: builtin/mailinfo.c:69
17581msgid "encoding"
17582msgstr "编码"
17583
17584#: builtin/mailinfo.c:70
17585msgid "re-code metadata to this encoding"
17586msgstr "将元数据用此编码重新编码"
17587
17588#: builtin/mailinfo.c:72
17589msgid "use scissors"
17590msgstr "使用剪刀标记"
17591
17592#: builtin/mailinfo.c:73
17593msgid "<action>"
17594msgstr "<动作>"
17595
17596#: builtin/mailinfo.c:74
17597msgid "action when quoted CR is found"
523ccf5d 17598msgstr "找到引号中的 CR 时的操作"
33b62fba
JX
17599
17600#: builtin/mailinfo.c:77
17601msgid "use headers in message's body"
7b4d4954 17602msgstr "在消息正文中使用标头"
33b62fba 17603
7e6630a7 17604#: builtin/mailsplit.c:239
a4f16749
JX
17605#, c-format
17606msgid "empty mbox: '%s'"
17607msgstr "空的 mbox:'%s'"
17608
349ede6a
JX
17609#: builtin/merge-base.c:32
17610msgid "git merge-base [-a | --all] <commit> <commit>..."
17611msgstr "git merge-base [-a | --all] <提交> <提交>..."
17612
17613#: builtin/merge-base.c:33
17614msgid "git merge-base [-a | --all] --octopus <commit>..."
17615msgstr "git merge-base [-a | --all] --octopus <提交>..."
17616
17617#: builtin/merge-base.c:34
17618msgid "git merge-base --independent <commit>..."
17619msgstr "git merge-base --independent <提交>..."
17620
17621#: builtin/merge-base.c:35
17622msgid "git merge-base --is-ancestor <commit> <commit>"
17623msgstr "git merge-base --is-ancestor <提交> <提交>"
17624
17625#: builtin/merge-base.c:36
17626msgid "git merge-base --fork-point <ref> [<commit>]"
17627msgstr "git merge-base --fork-point <引用> [<提交>]"
17628
17629#: builtin/merge-base.c:143
17630msgid "output all common ancestors"
17631msgstr "输出所有共同的祖先"
17632
17633#: builtin/merge-base.c:145
17634msgid "find ancestors for a single n-way merge"
17635msgstr "查找一个多路合并的祖先提交"
17636
17637#: builtin/merge-base.c:147
17638msgid "list revs not reachable from others"
17639msgstr "显示不能被其他访问到的版本"
17640
17641#: builtin/merge-base.c:149
17642msgid "is the first one ancestor of the other?"
17643msgstr "第一个是其他的祖先提交么?"
17644
17645#: builtin/merge-base.c:151
17646msgid "find where <commit> forked from reflog of <ref>"
17647msgstr "根据 <引用> 的引用日志查找 <提交> 的分叉点"
17648
17649#: builtin/merge-file.c:9
17650msgid ""
17651"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
17652"<orig-file> <file2>"
17653msgstr ""
17654"git merge-file [<选项>] [-L <名字1> [-L <初始名字> [-L <名字2>]]] <文件1> <初"
17655"始文件> <文件2>"
17656
17657#: builtin/merge-file.c:35
17658msgid "send results to standard output"
17659msgstr "将结果发送到标准输出"
17660
17661#: builtin/merge-file.c:36
17662msgid "use a diff3 based merge"
17663msgstr "使用基于 diff3 的合并"
17664
17665#: builtin/merge-file.c:37
17666msgid "for conflicts, use our version"
17667msgstr "如果冲突,使用我们的版本"
17668
17669#: builtin/merge-file.c:39
17670msgid "for conflicts, use their version"
17671msgstr "如果冲突,使用他们的版本"
17672
17673#: builtin/merge-file.c:41
17674msgid "for conflicts, use a union version"
17675msgstr "如果冲突,使用联合版本"
17676
17677#: builtin/merge-file.c:44
17678msgid "for conflicts, use this marker size"
17679msgstr "如果冲突,使用指定长度的标记"
17680
17681#: builtin/merge-file.c:45
17682msgid "do not warn about conflicts"
17683msgstr "不要警告冲突"
17684
17685#: builtin/merge-file.c:47
17686msgid "set labels for file1/orig-file/file2"
17687msgstr "为 文件1/初始文件/文件2 设置标签"
17688
17689#: builtin/merge-recursive.c:47
17690#, c-format
17691msgid "unknown option %s"
17692msgstr "未知选项 %s"
17693
17694#: builtin/merge-recursive.c:53
17695#, c-format
17696msgid "could not parse object '%s'"
17697msgstr "不能解析对象 '%s'"
17698
17699#: builtin/merge-recursive.c:57
17700#, c-format
17701msgid "cannot handle more than %d base. Ignoring %s."
17702msgid_plural "cannot handle more than %d bases. Ignoring %s."
17703msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
17704msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
17705
17706#: builtin/merge-recursive.c:65
17707msgid "not handling anything other than two heads merge."
17708msgstr "不能处理两个头合并之外的任何操作。"
17709
17710#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
17711#, c-format
17712msgid "could not resolve ref '%s'"
17713msgstr "无法解析引用 '%s'"
17714
17715#: builtin/merge-recursive.c:82
17716#, c-format
17717msgid "Merging %s with %s\n"
17718msgstr "合并 %s 和 %s\n"
17719
7e6630a7 17720#: builtin/merge.c:59
814ff314
JX
17721msgid "git merge [<options>] [<commit>...]"
17722msgstr "git merge [<选项>] [<提交>...]"
ef317cd5 17723
7e6630a7 17724#: builtin/merge.c:124
c04f5ac3
JX
17725msgid "switch `m' requires a value"
17726msgstr "开关 `m' 需要一个值"
17727
7e6630a7 17728#: builtin/merge.c:147
06991777
JX
17729#, c-format
17730msgid "option `%s' requires a value"
17731msgstr "选项 `%s' 需要一个值"
17732
7e6630a7 17733#: builtin/merge.c:200
c04f5ac3
JX
17734#, c-format
17735msgid "Could not find merge strategy '%s'.\n"
90e6ef53 17736msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 17737
7e6630a7 17738#: builtin/merge.c:201
c04f5ac3
JX
17739#, c-format
17740msgid "Available strategies are:"
17741msgstr "可用的策略有:"
17742
7e6630a7 17743#: builtin/merge.c:206
c04f5ac3
JX
17744#, c-format
17745msgid "Available custom strategies are:"
17746msgstr "可用的自定义策略有:"
17747
ffa14514 17748#: builtin/merge.c:257 builtin/pull.c:134
ef317cd5 17749msgid "do not show a diffstat at the end of the merge"
07432cef 17750msgstr "在合并的最后不显示差异统计"
ef317cd5 17751
ffa14514 17752#: builtin/merge.c:260 builtin/pull.c:137
ef317cd5 17753msgid "show a diffstat at the end of the merge"
07432cef 17754msgstr "在合并的最后显示差异统计"
ef317cd5 17755
ffa14514 17756#: builtin/merge.c:261 builtin/pull.c:140
ef317cd5 17757msgid "(synonym to --stat)"
07432cef 17758msgstr "(和 --stat 同义)"
ef317cd5 17759
ffa14514 17760#: builtin/merge.c:263 builtin/pull.c:143
ef317cd5 17761msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 17762msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 17763
ffa14514 17764#: builtin/merge.c:266 builtin/pull.c:149
ef317cd5 17765msgid "create a single commit instead of doing a merge"
07432cef 17766msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 17767
ffa14514 17768#: builtin/merge.c:268 builtin/pull.c:152
ef317cd5 17769msgid "perform a commit if the merge succeeds (default)"
07432cef 17770msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 17771
ffa14514 17772#: builtin/merge.c:270 builtin/pull.c:155
ef317cd5 17773msgid "edit message before committing"
07432cef 17774msgstr "在提交前编辑提交说明"
ef317cd5 17775
7e6630a7 17776#: builtin/merge.c:272
ef317cd5 17777msgid "allow fast-forward (default)"
07432cef 17778msgstr "允许快进(默认)"
ef317cd5 17779
ffa14514 17780#: builtin/merge.c:274 builtin/pull.c:162
ef317cd5 17781msgid "abort if fast-forward is not possible"
07432cef 17782msgstr "如果不能快进就放弃合并"
ef317cd5 17783
ffa14514 17784#: builtin/merge.c:278 builtin/pull.c:168
5c57d762 17785msgid "verify that the named commit has a valid GPG signature"
1003b3a5
JX
17786msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
17787
ffa14514 17788#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
7e6630a7 17789#: builtin/rebase.c:1117 builtin/revert.c:114
ef317cd5 17790msgid "strategy"
07432cef 17791msgstr "策略"
ef317cd5 17792
ffa14514 17793#: builtin/merge.c:280 builtin/pull.c:173
ef317cd5 17794msgid "merge strategy to use"
07432cef 17795msgstr "要使用的合并策略"
ef317cd5 17796
ffa14514 17797#: builtin/merge.c:281 builtin/pull.c:176
ef317cd5 17798msgid "option=value"
07432cef 17799msgstr "option=value"
ef317cd5 17800
ffa14514 17801#: builtin/merge.c:282 builtin/pull.c:177
ef317cd5 17802msgid "option for selected merge strategy"
07432cef 17803msgstr "所选的合并策略的选项"
ef317cd5 17804
7e6630a7 17805#: builtin/merge.c:284
ef317cd5 17806msgid "merge commit message (for a non-fast-forward merge)"
07432cef 17807msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 17808
7e6630a7 17809#: builtin/merge.c:291
ef317cd5 17810msgid "abort the current in-progress merge"
07432cef 17811msgstr "放弃当前正在进行的合并"
ef317cd5 17812
a6cd2cc4 17813#
7e6630a7 17814#: builtin/merge.c:293
a6cd2cc4
JX
17815msgid "--abort but leave index and working tree alone"
17816msgstr "--abort,但是保留索引和工作区"
17817
7e6630a7 17818#: builtin/merge.c:295
1a79b2f1
JX
17819msgid "continue the current in-progress merge"
17820msgstr "继续当前正在进行的合并"
17821
ffa14514 17822#: builtin/merge.c:297 builtin/pull.c:184
5b04ee3b
JX
17823msgid "allow merging unrelated histories"
17824msgstr "允许合并不相关的历史"
17825
7e6630a7 17826#: builtin/merge.c:304
a5cd71ca
JX
17827msgid "bypass pre-merge-commit and commit-msg hooks"
17828msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"
6937cb4e 17829
7e6630a7 17830#: builtin/merge.c:321
c04f5ac3 17831msgid "could not run stash."
a4f16749 17832msgstr "不能运行贮藏。"
c04f5ac3 17833
7e6630a7 17834#: builtin/merge.c:326
c04f5ac3 17835msgid "stash failed"
a4f16749 17836msgstr "贮藏失败"
c04f5ac3 17837
7e6630a7 17838#: builtin/merge.c:331
c04f5ac3
JX
17839#, c-format
17840msgid "not a valid object: %s"
17841msgstr "不是一个有效对象:%s"
17842
7e6630a7 17843#: builtin/merge.c:353 builtin/merge.c:370
c04f5ac3
JX
17844msgid "read-tree failed"
17845msgstr "读取树失败"
17846
7e6630a7 17847#: builtin/merge.c:401
33b62fba
JX
17848msgid "Already up to date. (nothing to squash)"
17849msgstr "已经是最新的。(无可挤压)"
c04f5ac3 17850
7e6630a7 17851#: builtin/merge.c:415
c04f5ac3
JX
17852#, c-format
17853msgid "Squash commit -- not updating HEAD\n"
33b62fba 17854msgstr "挤压提交 -- 未更新 HEAD\n"
c04f5ac3 17855
7e6630a7 17856#: builtin/merge.c:465
c04f5ac3
JX
17857#, c-format
17858msgid "No merge message -- not updating HEAD\n"
17859msgstr "无合并信息 -- 未更新 HEAD\n"
17860
33b62fba 17861#: builtin/merge.c:515
c04f5ac3
JX
17862#, c-format
17863msgid "'%s' does not point to a commit"
17864msgstr "'%s' 没有指向一个提交"
17865
ec3d4607 17866#: builtin/merge.c:603
c04f5ac3
JX
17867#, c-format
17868msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 17869msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 17870
7e6630a7 17871#: builtin/merge.c:730
c04f5ac3 17872msgid "Not handling anything other than two heads merge."
29004bbb 17873msgstr "未处理两个头合并之外的任何操作。"
c04f5ac3 17874
7e6630a7 17875#: builtin/merge.c:743
c04f5ac3 17876#, c-format
7e6630a7
FZ
17877msgid "unknown strategy option: -X%s"
17878msgstr "未知的策略选项:-X%s"
c04f5ac3 17879
7e6630a7 17880#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
c04f5ac3
JX
17881#, c-format
17882msgid "unable to write %s"
17883msgstr "不能写 %s"
17884
7e6630a7 17885#: builtin/merge.c:814
c04f5ac3
JX
17886#, c-format
17887msgid "Could not read from '%s'"
17888msgstr "不能从 '%s' 读取"
17889
7e6630a7 17890#: builtin/merge.c:823
c04f5ac3
JX
17891#, c-format
17892msgid "Not committing merge; use 'git commit' to complete the merge.\n"
17893msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
17894
7e6630a7 17895#: builtin/merge.c:829
c04f5ac3
JX
17896msgid ""
17897"Please enter a commit message to explain why this merge is necessary,\n"
17898"especially if it merges an updated upstream into a topic branch.\n"
17899"\n"
c04f5ac3
JX
17900msgstr ""
17901"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
17902"合并到主题分支。\n"
17903"\n"
c04f5ac3 17904
7e6630a7 17905#: builtin/merge.c:834
d46c5519 17906msgid "An empty message aborts the commit.\n"
5b533632 17907msgstr "空的提交说明会终止提交。\n"
d46c5519 17908
7e6630a7 17909#: builtin/merge.c:837
d46c5519
JX
17910#, c-format
17911msgid ""
17912"Lines starting with '%c' will be ignored, and an empty message aborts\n"
17913"the commit.\n"
5b533632 17914msgstr "以 '%c' 开始的行将被忽略,而空的提交说明将终止提交。\n"
d46c5519 17915
7e6630a7 17916#: builtin/merge.c:892
c04f5ac3
JX
17917msgid "Empty commit message."
17918msgstr "空提交信息。"
17919
7e6630a7 17920#: builtin/merge.c:907
c04f5ac3
JX
17921#, c-format
17922msgid "Wonderful.\n"
17923msgstr "太棒了。\n"
17924
7e6630a7 17925#: builtin/merge.c:968
c04f5ac3
JX
17926#, c-format
17927msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
17928msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
17929
7e6630a7 17930#: builtin/merge.c:1007
c04f5ac3 17931msgid "No current branch."
90e6ef53 17932msgstr "没有当前分支。"
c04f5ac3 17933
7e6630a7 17934#: builtin/merge.c:1009
c04f5ac3 17935msgid "No remote for the current branch."
160fb2b2 17936msgstr "当前分支没有对应的远程仓库。"
c04f5ac3 17937
7e6630a7 17938#: builtin/merge.c:1011
c04f5ac3 17939msgid "No default upstream defined for the current branch."
90e6ef53 17940msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 17941
7e6630a7 17942#: builtin/merge.c:1016
170e9899 17943#, c-format
2e8451e8
JX
17944msgid "No remote-tracking branch for %s from %s"
17945msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 17946
7e6630a7 17947#: builtin/merge.c:1073
5c57d762
JX
17948#, c-format
17949msgid "Bad value '%s' in environment '%s'"
9a4b694c 17950msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
5c57d762 17951
7e6630a7 17952#: builtin/merge.c:1174
5c57d762
JX
17953#, c-format
17954msgid "not something we can merge in %s: %s"
17955msgstr "不能在 %s 中合并:%s"
17956
7e6630a7 17957#: builtin/merge.c:1208
5c57d762
JX
17958msgid "not something we can merge"
17959msgstr "不能合并"
17960
7e6630a7 17961#: builtin/merge.c:1321
1a79b2f1
JX
17962msgid "--abort expects no arguments"
17963msgstr "--abort 不带参数"
17964
7e6630a7 17965#: builtin/merge.c:1325
c04f5ac3 17966msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 17967msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 17968
7e6630a7 17969#: builtin/merge.c:1343
a6cd2cc4
JX
17970msgid "--quit expects no arguments"
17971msgstr "--quit 不带参数"
17972
7e6630a7 17973#: builtin/merge.c:1356
1a79b2f1
JX
17974msgid "--continue expects no arguments"
17975msgstr "--continue 不带参数"
17976
7e6630a7 17977#: builtin/merge.c:1360
1a79b2f1
JX
17978msgid "There is no merge in progress (MERGE_HEAD missing)."
17979msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
17980
7e6630a7 17981#: builtin/merge.c:1376
c04f5ac3
JX
17982msgid ""
17983"You have not concluded your merge (MERGE_HEAD exists).\n"
220c313c 17984"Please, commit your changes before you merge."
c04f5ac3
JX
17985msgstr ""
17986"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 17987"请在合并前先提交您的修改。"
c04f5ac3 17988
7e6630a7 17989#: builtin/merge.c:1383
c04f5ac3
JX
17990msgid ""
17991"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
220c313c 17992"Please, commit your changes before you merge."
c04f5ac3
JX
17993msgstr ""
17994"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 17995"请在合并前先提交您的修改。"
c04f5ac3 17996
7e6630a7 17997#: builtin/merge.c:1386
c04f5ac3
JX
17998msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
17999msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
18000
7e6630a7 18001#: builtin/merge.c:1400
c04f5ac3 18002msgid "You cannot combine --squash with --no-ff."
a6cd2cc4 18003msgstr "您不能将 --squash 和 --no-ff 组合使用。"
c04f5ac3 18004
7e6630a7 18005#: builtin/merge.c:1402
a6cd2cc4
JX
18006msgid "You cannot combine --squash with --commit."
18007msgstr "您不能将 --squash 和 --commit 组合使用。"
18008
7e6630a7 18009#: builtin/merge.c:1418
c04f5ac3 18010msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 18011msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 18012
7e6630a7 18013#: builtin/merge.c:1435
c04f5ac3
JX
18014msgid "Squash commit into empty head not supported yet"
18015msgstr "尚不支持到空分支的压缩提交"
18016
7e6630a7 18017#: builtin/merge.c:1437
c04f5ac3
JX
18018msgid "Non-fast-forward commit does not make sense into an empty head"
18019msgstr "到空分支的非快进式提交没有意义"
18020
7e6630a7 18021#: builtin/merge.c:1442
2e8451e8
JX
18022#, c-format
18023msgid "%s - not something we can merge"
18024msgstr "%s - 不能被合并"
18025
7e6630a7 18026#: builtin/merge.c:1444
7aea43ff
JX
18027msgid "Can merge only exactly one commit into empty head"
18028msgstr "只能将一个提交合并到空分支上"
18029
7e6630a7 18030#: builtin/merge.c:1531
5b04ee3b
JX
18031msgid "refusing to merge unrelated histories"
18032msgstr "拒绝合并无关的历史"
18033
7e6630a7 18034#: builtin/merge.c:1550
c04f5ac3
JX
18035#, c-format
18036msgid "Updating %s..%s\n"
18037msgstr "更新 %s..%s\n"
18038
7e6630a7 18039#: builtin/merge.c:1598
c04f5ac3
JX
18040#, c-format
18041msgid "Trying really trivial in-index merge...\n"
90e6ef53 18042msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 18043
7e6630a7 18044#: builtin/merge.c:1605
c04f5ac3
JX
18045#, c-format
18046msgid "Nope.\n"
18047msgstr "无。\n"
18048
7e6630a7 18049#: builtin/merge.c:1664 builtin/merge.c:1730
c04f5ac3
JX
18050#, c-format
18051msgid "Rewinding the tree to pristine...\n"
18052msgstr "将树回滚至原始状态...\n"
18053
7e6630a7 18054#: builtin/merge.c:1668
c04f5ac3
JX
18055#, c-format
18056msgid "Trying merge strategy %s...\n"
18057msgstr "尝试合并策略 %s...\n"
18058
7e6630a7 18059#: builtin/merge.c:1720
c04f5ac3
JX
18060#, c-format
18061msgid "No merge strategy handled the merge.\n"
18062msgstr "没有合并策略处理此合并。\n"
18063
7e6630a7 18064#: builtin/merge.c:1722
c04f5ac3
JX
18065#, c-format
18066msgid "Merge with strategy %s failed.\n"
18067msgstr "使用策略 %s 合并失败。\n"
18068
7e6630a7 18069#: builtin/merge.c:1732
c04f5ac3 18070#, c-format
ec3d4607
JX
18071msgid "Using the %s strategy to prepare resolving by hand.\n"
18072msgstr "使用 %s 策略以准备手工解决。\n"
c04f5ac3 18073
7e6630a7 18074#: builtin/merge.c:1746
c04f5ac3
JX
18075#, c-format
18076msgid "Automatic merge went well; stopped before committing as requested\n"
18077msgstr "自动合并进展顺利,按要求在提交前停止\n"
18078
473eb541
JX
18079#: builtin/mktag.c:10
18080msgid "git mktag"
18081msgstr "git mktag"
18082
33b62fba 18083#: builtin/mktag.c:27
473eb541
JX
18084#, c-format
18085msgid "warning: tag input does not pass fsck: %s"
18086msgstr "警告:标签输入未通过 fsck:%s"
18087
33b62fba 18088#: builtin/mktag.c:38
473eb541
JX
18089#, c-format
18090msgid "error: tag input does not pass fsck: %s"
18091msgstr "错误:标签输入未通过 fsck:%s"
18092
33b62fba 18093#: builtin/mktag.c:41
473eb541
JX
18094#, c-format
18095msgid "%d (FSCK_IGNORE?) should never trigger this callback"
ae4e099e 18096msgstr "%d (FSCK_IGNORE?) 永远不应该触发这个回调"
473eb541 18097
33b62fba 18098#: builtin/mktag.c:56
473eb541
JX
18099#, c-format
18100msgid "could not read tagged object '%s'"
18101msgstr "不能读取被标记的对象 '%s'"
18102
33b62fba 18103#: builtin/mktag.c:59
473eb541
JX
18104#, c-format
18105msgid "object '%s' tagged as '%s', but is a '%s' type"
18106msgstr "对象 '%s' 被标记为 '%s',然而是一个 '%s' 类型"
18107
7e6630a7 18108#: builtin/mktag.c:98
473eb541
JX
18109msgid "tag on stdin did not pass our strict fsck check"
18110msgstr "标准输入上的标签未通过我们严格的 fsck 检查"
18111
7e6630a7 18112#: builtin/mktag.c:101
473eb541
JX
18113msgid "tag on stdin did not refer to a valid object"
18114msgstr "标准输入上的标签未指向一个有效的对象"
18115
7e6630a7 18116#: builtin/mktag.c:104 builtin/tag.c:243
473eb541
JX
18117msgid "unable to write tag file"
18118msgstr "无法写标签文件"
18119
349ede6a
JX
18120#: builtin/mktree.c:66
18121msgid "git mktree [-z] [--missing] [--batch]"
18122msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 18123
c1ac5258 18124#: builtin/mktree.c:154
ef317cd5 18125msgid "input is NUL terminated"
07432cef 18126msgstr "输入以 NUL 字符终止"
c04f5ac3 18127
06991777 18128#: builtin/mktree.c:155 builtin/write-tree.c:26
ef317cd5 18129msgid "allow missing objects"
07432cef 18130msgstr "允许丢失的对象"
c04f5ac3 18131
c1ac5258 18132#: builtin/mktree.c:156
ef317cd5 18133msgid "allow creation of more than one tree"
07432cef 18134msgstr "允许创建一个以上的树"
c04f5ac3 18135
33b62fba 18136#: builtin/multi-pack-index.c:10
7e6630a7
FZ
18137msgid ""
18138"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
18139"snapshot=<path>]"
18140msgstr ""
18141"git multi-pack-index [<选项>] write [--preferred-pack=<包>][--refs-snapshot=<"
18142"路径>]"
33b62fba 18143
7e6630a7 18144#: builtin/multi-pack-index.c:14
33b62fba
JX
18145msgid "git multi-pack-index [<options>] verify"
18146msgstr "git multi-pack-index [<选项>] verify"
18147
7e6630a7 18148#: builtin/multi-pack-index.c:17
33b62fba
JX
18149msgid "git multi-pack-index [<options>] expire"
18150msgstr "git multi-pack-index [<选项>] expire"
4c27fcb5 18151
7e6630a7 18152#: builtin/multi-pack-index.c:20
33b62fba
JX
18153msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
18154msgstr "git multi-pack-index [<选项>] repack [--batch-size=<尺寸>]"
18155
7e6630a7 18156#: builtin/multi-pack-index.c:57
4c27fcb5
JX
18157msgid "object directory containing set of packfile and pack-index pairs"
18158msgstr "包含成对包文件和包索引的对象目录"
18159
7e6630a7 18160#: builtin/multi-pack-index.c:98
33b62fba
JX
18161msgid "preferred-pack"
18162msgstr "首选包"
18163
7e6630a7 18164#: builtin/multi-pack-index.c:99
33b62fba
JX
18165msgid "pack for reuse when computing a multi-pack bitmap"
18166msgstr "在计算多包位图时打包以供重用"
18167
7e6630a7
FZ
18168#: builtin/multi-pack-index.c:100
18169msgid "write multi-pack bitmap"
18170msgstr "写入多包位图"
18171
18172#: builtin/multi-pack-index.c:105
18173msgid "write multi-pack index containing only given indexes"
18174msgstr "写入只包括给定索引的多包索引"
18175
18176#: builtin/multi-pack-index.c:107
18177msgid "refs snapshot for selecting bitmap commits"
18178msgstr "用于选择位图提交的引用快照"
18179
18180#: builtin/multi-pack-index.c:202
a6cd2cc4
JX
18181msgid ""
18182"during repack, collect pack-files of smaller size into a batch that is "
18183"larger than this size"
18184msgstr "在 repack 期间,将较小尺寸的包文件收集到大于此大小的批次中"
18185
06991777 18186#: builtin/mv.c:18
814ff314
JX
18187msgid "git mv [<options>] <source>... <destination>"
18188msgstr "git mv [<选项>] <源>... <目标>"
c04f5ac3 18189
06991777 18190#: builtin/mv.c:83
220c313c
JX
18191#, c-format
18192msgid "Directory %s is in index and no submodule?"
18193msgstr "目录 %s 在索引中并且不是子模组?"
18194
06991777 18195#: builtin/mv.c:85
220c313c 18196msgid "Please stage your changes to .gitmodules or stash them to proceed"
a4f16749 18197msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
220c313c 18198
06991777 18199#: builtin/mv.c:103
220c313c
JX
18200#, c-format
18201msgid "%.*s is in index"
18202msgstr "%.*s 在索引中"
18203
06991777 18204#: builtin/mv.c:125
ef317cd5 18205msgid "force move/rename even if target exists"
07432cef 18206msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 18207
06991777 18208#: builtin/mv.c:127
ef317cd5 18209msgid "skip move/rename errors"
07432cef 18210msgstr "跳过移动/重命名错误"
c04f5ac3 18211
7e6630a7 18212#: builtin/mv.c:172
220c313c
JX
18213#, c-format
18214msgid "destination '%s' is not a directory"
18215msgstr "目标 '%s' 不是一个目录"
18216
7e6630a7 18217#: builtin/mv.c:184
c04f5ac3
JX
18218#, c-format
18219msgid "Checking rename of '%s' to '%s'\n"
18220msgstr "检查 '%s' 到 '%s' 的重命名\n"
18221
7e6630a7 18222#: builtin/mv.c:190
c04f5ac3
JX
18223msgid "bad source"
18224msgstr "坏的源"
18225
7e6630a7 18226#: builtin/mv.c:193
c04f5ac3
JX
18227msgid "can not move directory into itself"
18228msgstr "不能将目录移动到自身"
18229
7e6630a7 18230#: builtin/mv.c:196
c04f5ac3
JX
18231msgid "cannot move directory over file"
18232msgstr "不能将目录移动到文件"
18233
7e6630a7 18234#: builtin/mv.c:205
c04f5ac3
JX
18235msgid "source directory is empty"
18236msgstr "源目录为空"
18237
7e6630a7 18238#: builtin/mv.c:231
c04f5ac3
JX
18239msgid "not under version control"
18240msgstr "不在版本控制之下"
18241
7e6630a7 18242#: builtin/mv.c:233
d9488fea
JX
18243msgid "conflicted"
18244msgstr "冲突"
18245
7e6630a7 18246#: builtin/mv.c:236
c04f5ac3
JX
18247msgid "destination exists"
18248msgstr "目标已存在"
18249
7e6630a7 18250#: builtin/mv.c:244
c04f5ac3
JX
18251#, c-format
18252msgid "overwriting '%s'"
18253msgstr "覆盖 '%s'"
18254
7e6630a7 18255#: builtin/mv.c:247
c04f5ac3
JX
18256msgid "Cannot overwrite"
18257msgstr "不能覆盖"
18258
7e6630a7 18259#: builtin/mv.c:250
c04f5ac3
JX
18260msgid "multiple sources for the same target"
18261msgstr "同一目标具有多个源"
18262
7e6630a7 18263#: builtin/mv.c:252
cfff71a9
JX
18264msgid "destination directory does not exist"
18265msgstr "目标目录不存在"
18266
7e6630a7 18267#: builtin/mv.c:280
c04f5ac3
JX
18268#, c-format
18269msgid "%s, source=%s, destination=%s"
18270msgstr "%s,源=%s,目标=%s"
18271
7e6630a7 18272#: builtin/mv.c:308
c04f5ac3
JX
18273#, c-format
18274msgid "Renaming %s to %s\n"
18275msgstr "重命名 %s 至 %s\n"
18276
7e6630a7 18277#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
c04f5ac3
JX
18278#, c-format
18279msgid "renaming '%s' failed"
18280msgstr "重命名 '%s' 失败"
18281
2b472aae 18282#: builtin/name-rev.c:465
814ff314
JX
18283msgid "git name-rev [<options>] <commit>..."
18284msgstr "git name-rev [<选项>] <提交>..."
ef317cd5 18285
2b472aae 18286#: builtin/name-rev.c:466
814ff314
JX
18287msgid "git name-rev [<options>] --all"
18288msgstr "git name-rev [<选项>] --all"
ef317cd5 18289
2b472aae 18290#: builtin/name-rev.c:467
814ff314
JX
18291msgid "git name-rev [<options>] --stdin"
18292msgstr "git name-rev [<选项>] --stdin"
ef317cd5 18293
2b472aae 18294#: builtin/name-rev.c:524
d9488fea
JX
18295msgid "print only ref-based names (no object names)"
18296msgstr "只打印基于引用的名称(非对象名)"
ef317cd5 18297
2b472aae 18298#: builtin/name-rev.c:525
ef317cd5 18299msgid "only use tags to name the commits"
55a16ee4 18300msgstr "只使用标签来命名提交"
ef317cd5 18301
2b472aae 18302#: builtin/name-rev.c:527
ef317cd5 18303msgid "only use refs matching <pattern>"
07432cef 18304msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 18305
2b472aae 18306#: builtin/name-rev.c:529
87cb7997
JX
18307msgid "ignore refs matching <pattern>"
18308msgstr "忽略和 <模式> 相匹配的引用"
18309
2b472aae 18310#: builtin/name-rev.c:531
ef317cd5 18311msgid "list all commits reachable from all refs"
07432cef 18312msgstr "列出可以从所有引用访问的提交"
ef317cd5 18313
2b472aae 18314#: builtin/name-rev.c:532
ef317cd5 18315msgid "read from stdin"
07432cef 18316msgstr "从标准输入读取"
ef317cd5 18317
2b472aae 18318#: builtin/name-rev.c:533
90314792
JX
18319msgid "allow to print `undefined` names (default)"
18320msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 18321
2b472aae 18322#: builtin/name-rev.c:539
2e8451e8 18323msgid "dereference tags in the input (internal use)"
55a16ee4 18324msgstr "反向解析输入中的标签(内部使用)"
2e8451e8 18325
c1ac5258 18326#: builtin/notes.c:28
814ff314 18327msgid "git notes [--ref <notes-ref>] [list [<object>]]"
07432cef 18328msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 18329
c1ac5258 18330#: builtin/notes.c:29
ef317cd5 18331msgid ""
814ff314 18332"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
04cb2f28 18333"| (-c | -C) <object>] [<object>]"
ef317cd5 18334msgstr ""
04cb2f28
JX
18335"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
18336"| (-c | -C) <对象>] [<对象>]"
ef317cd5 18337
c1ac5258 18338#: builtin/notes.c:30
814ff314 18339msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
07432cef 18340msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 18341
c1ac5258 18342#: builtin/notes.c:31
ef317cd5 18343msgid ""
814ff314 18344"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
04cb2f28 18345"(-c | -C) <object>] [<object>]"
ef317cd5 18346msgstr ""
04cb2f28
JX
18347"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
18348"(-c | -C) <对象>] [<对象>]"
ef317cd5 18349
c1ac5258 18350#: builtin/notes.c:32
814ff314 18351msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
04cb2f28 18352msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
ef317cd5 18353
c1ac5258 18354#: builtin/notes.c:33
814ff314 18355msgid "git notes [--ref <notes-ref>] show [<object>]"
07432cef 18356msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 18357
c1ac5258 18358#: builtin/notes.c:34
ef317cd5 18359msgid ""
814ff314 18360"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
07432cef 18361msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 18362
c1ac5258 18363#: builtin/notes.c:35
ef317cd5 18364msgid "git notes merge --commit [-v | -q]"
07432cef 18365msgstr "git notes merge --commit [-v | -q]"
ef317cd5 18366
c1ac5258 18367#: builtin/notes.c:36
ef317cd5 18368msgid "git notes merge --abort [-v | -q]"
07432cef 18369msgstr "git notes merge --abort [-v | -q]"
ef317cd5 18370
c1ac5258 18371#: builtin/notes.c:37
814ff314 18372msgid "git notes [--ref <notes-ref>] remove [<object>...]"
07432cef 18373msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 18374
c1ac5258 18375#: builtin/notes.c:38
5809aa05
JX
18376msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
18377msgstr "git notes [--ref <注解引用>] prune [-n] [-v]"
ef317cd5 18378
c1ac5258 18379#: builtin/notes.c:39
814ff314 18380msgid "git notes [--ref <notes-ref>] get-ref"
07432cef 18381msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 18382
c1ac5258 18383#: builtin/notes.c:44
ef317cd5 18384msgid "git notes [list [<object>]]"
07432cef 18385msgstr "git notes [list [<对象>]]"
ef317cd5 18386
c1ac5258 18387#: builtin/notes.c:49
ef317cd5 18388msgid "git notes add [<options>] [<object>]"
07432cef 18389msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 18390
c1ac5258 18391#: builtin/notes.c:54
ef317cd5 18392msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 18393msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 18394
c1ac5258 18395#: builtin/notes.c:55
ef317cd5 18396msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 18397msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 18398
c1ac5258 18399#: builtin/notes.c:60
ef317cd5 18400msgid "git notes append [<options>] [<object>]"
07432cef 18401msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 18402
c1ac5258 18403#: builtin/notes.c:65
ef317cd5 18404msgid "git notes edit [<object>]"
07432cef 18405msgstr "git notes edit [<对象>]"
ef317cd5 18406
c1ac5258 18407#: builtin/notes.c:70
ef317cd5 18408msgid "git notes show [<object>]"
07432cef 18409msgstr "git notes show [<对象>]"
ef317cd5 18410
c1ac5258 18411#: builtin/notes.c:75
814ff314 18412msgid "git notes merge [<options>] <notes-ref>"
07432cef 18413msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 18414
c1ac5258 18415#: builtin/notes.c:76
ef317cd5 18416msgid "git notes merge --commit [<options>]"
07432cef 18417msgstr "git notes merge --commit [<选项>]"
ef317cd5 18418
c1ac5258 18419#: builtin/notes.c:77
ef317cd5 18420msgid "git notes merge --abort [<options>]"
07432cef 18421msgstr "git notes merge --abort [<选项>]"
ef317cd5 18422
c1ac5258 18423#: builtin/notes.c:82
ef317cd5 18424msgid "git notes remove [<object>]"
07432cef 18425msgstr "git notes remove [<对象>]"
ef317cd5 18426
c1ac5258 18427#: builtin/notes.c:87
ef317cd5 18428msgid "git notes prune [<options>]"
07432cef 18429msgstr "git notes prune [<选项>]"
ef317cd5 18430
c1ac5258 18431#: builtin/notes.c:92
ef317cd5 18432msgid "git notes get-ref"
07432cef 18433msgstr "git notes get-ref"
ef317cd5 18434
c1ac5258 18435#: builtin/notes.c:97
5c57d762
JX
18436msgid "Write/edit the notes for the following object:"
18437msgstr "为下面的对象写/编辑说明:"
18438
c1ac5258 18439#: builtin/notes.c:150
c04f5ac3
JX
18440#, c-format
18441msgid "unable to start 'show' for object '%s'"
18442msgstr "不能为对象 '%s' 开始 'show'"
18443
c1ac5258 18444#: builtin/notes.c:154
a77c07d9
JX
18445msgid "could not read 'show' output"
18446msgstr "不能读取 'show' 的输出"
c04f5ac3 18447
c1ac5258 18448#: builtin/notes.c:162
c04f5ac3
JX
18449#, c-format
18450msgid "failed to finish 'show' for object '%s'"
18451msgstr "无法为对象 '%s' 完成 'show'"
18452
7e6630a7 18453#: builtin/notes.c:195
a0b6b246 18454msgid "please supply the note contents using either -m or -F option"
c04f5ac3
JX
18455msgstr "请通过 -m 或 -F 选项为注解提供内容"
18456
7e6630a7 18457#: builtin/notes.c:204
c04f5ac3
JX
18458msgid "unable to write note object"
18459msgstr "不能写注解对象"
18460
7e6630a7 18461#: builtin/notes.c:206
c04f5ac3 18462#, c-format
a0b6b246 18463msgid "the note contents have been left in %s"
220c313c 18464msgstr "注解内容被留在 %s 中"
c04f5ac3 18465
7e6630a7 18466#: builtin/notes.c:240 builtin/tag.c:577
c04f5ac3
JX
18467#, c-format
18468msgid "could not open or read '%s'"
18469msgstr "不能打开或读取 '%s'"
18470
7e6630a7
FZ
18471#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
18472#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
18473#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
a0b6b246
JX
18474#, c-format
18475msgid "failed to resolve '%s' as a valid ref."
18476msgstr "无法解析 '%s' 为一个有效引用。"
18477
7e6630a7 18478#: builtin/notes.c:263
c04f5ac3 18479#, c-format
a0b6b246 18480msgid "failed to read object '%s'."
c1ac5258 18481msgstr "读取对象 '%s' 失败。"
c04f5ac3 18482
7e6630a7 18483#: builtin/notes.c:266
6c94aba5 18484#, c-format
a0b6b246
JX
18485msgid "cannot read note data from non-blob object '%s'."
18486msgstr "不能从非数据对象 '%s' 中读取注解数据。"
18487
7e6630a7 18488#: builtin/notes.c:307
a0b6b246
JX
18489#, c-format
18490msgid "malformed input line: '%s'."
fd8cb379 18491msgstr "格式错误的输入行:'%s'。"
a0b6b246 18492
7e6630a7 18493#: builtin/notes.c:322
a0b6b246
JX
18494#, c-format
18495msgid "failed to copy notes from '%s' to '%s'"
18496msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
6c94aba5 18497
a4f16749
JX
18498#. TRANSLATORS: the first %s will be replaced by a git
18499#. notes command: 'add', 'merge', 'remove', etc.
18500#.
7e6630a7 18501#: builtin/notes.c:354
a0b6b246
JX
18502#, c-format
18503msgid "refusing to %s notes in %s (outside of refs/notes/)"
18504msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
18505
7e6630a7
FZ
18506#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
18507#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
18508#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
18509#: builtin/prune-packed.c:25 builtin/tag.c:587
33b62fba
JX
18510msgid "too many arguments"
18511msgstr "太多参数"
18512
7e6630a7 18513#: builtin/notes.c:387 builtin/notes.c:676
c04f5ac3 18514#, c-format
a0b6b246 18515msgid "no note found for object %s."
c04f5ac3
JX
18516msgstr "未发现对象 %s 的注解。"
18517
7e6630a7 18518#: builtin/notes.c:408 builtin/notes.c:574
ef317cd5 18519msgid "note contents as a string"
07432cef 18520msgstr "注解内容作为一个字符串"
ef317cd5 18521
7e6630a7 18522#: builtin/notes.c:411 builtin/notes.c:577
ef317cd5 18523msgid "note contents in a file"
07432cef 18524msgstr "注解内容到一个文件中"
ef317cd5 18525
7e6630a7 18526#: builtin/notes.c:414 builtin/notes.c:580
ef317cd5 18527msgid "reuse and edit specified note object"
07432cef 18528msgstr "重用和编辑指定的注解对象"
ef317cd5 18529
7e6630a7 18530#: builtin/notes.c:417 builtin/notes.c:583
ef317cd5 18531msgid "reuse specified note object"
07432cef 18532msgstr "重用指定的注解对象"
ef317cd5 18533
7e6630a7 18534#: builtin/notes.c:420 builtin/notes.c:586
04cb2f28
JX
18535msgid "allow storing empty note"
18536msgstr "允许保存空白注释"
18537
7e6630a7 18538#: builtin/notes.c:421 builtin/notes.c:494
ef317cd5 18539msgid "replace existing notes"
07432cef 18540msgstr "替换已存在的注解"
ef317cd5 18541
7e6630a7 18542#: builtin/notes.c:446
c04f5ac3
JX
18543#, c-format
18544msgid ""
18545"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
18546"existing notes"
18547msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
18548
7e6630a7 18549#: builtin/notes.c:461 builtin/notes.c:542
c04f5ac3
JX
18550#, c-format
18551msgid "Overwriting existing notes for object %s\n"
18552msgstr "覆盖对象 %s 现存注解\n"
18553
7e6630a7 18554#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
04cb2f28
JX
18555#, c-format
18556msgid "Removing note for object %s\n"
18557msgstr "删除对象 %s 的注解\n"
18558
7e6630a7 18559#: builtin/notes.c:495
ef317cd5 18560msgid "read objects from stdin"
07432cef 18561msgstr "从标准输入读取对象"
ef317cd5 18562
7e6630a7 18563#: builtin/notes.c:497
ef317cd5 18564msgid "load rewriting config for <command> (implies --stdin)"
07432cef 18565msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 18566
7e6630a7 18567#: builtin/notes.c:515
473eb541 18568msgid "too few arguments"
c04f5ac3
JX
18569msgstr "参数太少"
18570
7e6630a7 18571#: builtin/notes.c:536
c04f5ac3
JX
18572#, c-format
18573msgid ""
18574"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
18575"existing notes"
18576msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
18577
7e6630a7 18578#: builtin/notes.c:548
c04f5ac3 18579#, c-format
a0b6b246 18580msgid "missing notes on source object %s. Cannot copy."
c04f5ac3
JX
18581msgstr "源对象 %s 缺少注解。不能拷贝。"
18582
7e6630a7 18583#: builtin/notes.c:601
ef317cd5
JX
18584#, c-format
18585msgid ""
18586"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
18587"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
18588msgstr ""
18589"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
18590"请换用 'git notes add -f -m/-F/-c/-C'。\n"
18591
7e6630a7 18592#: builtin/notes.c:696
a0b6b246 18593msgid "failed to delete ref NOTES_MERGE_PARTIAL"
c1ac5258 18594msgstr "删除引用 NOTES_MERGE_PARTIAL 失败"
a0b6b246 18595
7e6630a7 18596#: builtin/notes.c:698
a0b6b246 18597msgid "failed to delete ref NOTES_MERGE_REF"
c1ac5258 18598msgstr "删除引用 NOTES_MERGE_REF 失败"
a0b6b246 18599
7e6630a7 18600#: builtin/notes.c:700
a0b6b246 18601msgid "failed to remove 'git notes merge' worktree"
c1ac5258 18602msgstr "删除 'git notes merge' 工作区失败"
a0b6b246 18603
7e6630a7 18604#: builtin/notes.c:720
a0b6b246 18605msgid "failed to read ref NOTES_MERGE_PARTIAL"
c1ac5258 18606msgstr "读取引用 NOTES_MERGE_PARTIAL 失败"
a0b6b246 18607
7e6630a7 18608#: builtin/notes.c:722
a0b6b246
JX
18609msgid "could not find commit from NOTES_MERGE_PARTIAL."
18610msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
18611
7e6630a7 18612#: builtin/notes.c:724
a0b6b246
JX
18613msgid "could not parse commit from NOTES_MERGE_PARTIAL."
18614msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
18615
7e6630a7 18616#: builtin/notes.c:737
a0b6b246 18617msgid "failed to resolve NOTES_MERGE_REF"
c1ac5258 18618msgstr "解析 NOTES_MERGE_REF 失败"
a0b6b246 18619
7e6630a7 18620#: builtin/notes.c:740
a0b6b246
JX
18621msgid "failed to finalize notes merge"
18622msgstr "无法完成注解合并"
18623
7e6630a7 18624#: builtin/notes.c:766
5c57d762
JX
18625#, c-format
18626msgid "unknown notes merge strategy %s"
18627msgstr "未知的注解合并策略 %s"
18628
7e6630a7 18629#: builtin/notes.c:782
ef317cd5 18630msgid "General options"
07432cef 18631msgstr "通用选项"
ef317cd5 18632
7e6630a7 18633#: builtin/notes.c:784
ef317cd5 18634msgid "Merge options"
07432cef 18635msgstr "合并选项"
ef317cd5 18636
7e6630a7 18637#: builtin/notes.c:786
ef317cd5
JX
18638msgid ""
18639"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
18640"cat_sort_uniq)"
07432cef 18641msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 18642
7e6630a7 18643#: builtin/notes.c:788
ef317cd5 18644msgid "Committing unmerged notes"
07432cef 18645msgstr "提交未合并的注解"
ef317cd5 18646
7e6630a7 18647#: builtin/notes.c:790
ef317cd5 18648msgid "finalize notes merge by committing unmerged notes"
07432cef 18649msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 18650
7e6630a7 18651#: builtin/notes.c:792
ef317cd5 18652msgid "Aborting notes merge resolution"
07432cef 18653msgstr "中止注解合并的方案"
ef317cd5 18654
7e6630a7 18655#: builtin/notes.c:794
ef317cd5 18656msgid "abort notes merge"
07432cef 18657msgstr "中止注解合并"
ef317cd5 18658
7e6630a7 18659#: builtin/notes.c:805
5c57d762
JX
18660msgid "cannot mix --commit, --abort or -s/--strategy"
18661msgstr "不能混用 --commit、--abort 或 -s/--strategy"
18662
7e6630a7 18663#: builtin/notes.c:810
a0b6b246 18664msgid "must specify a notes ref to merge"
9a4b694c 18665msgstr "必须指定一个注解引用来合并"
5c57d762 18666
7e6630a7 18667#: builtin/notes.c:834
5c57d762 18668#, c-format
a0b6b246 18669msgid "unknown -s/--strategy: %s"
5c57d762
JX
18670msgstr "未知的 -s/--strategy:%s"
18671
7e6630a7 18672#: builtin/notes.c:871
1b7f4a34 18673#, c-format
a0b6b246
JX
18674msgid "a notes merge into %s is already in-progress at %s"
18675msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
1b7f4a34 18676
7e6630a7 18677#: builtin/notes.c:874
5c57d762 18678#, c-format
a0b6b246
JX
18679msgid "failed to store link to current notes ref (%s)"
18680msgstr "无法存储链接到当前的注解引用(%s)"
5c57d762 18681
7e6630a7 18682#: builtin/notes.c:876
5c57d762
JX
18683#, c-format
18684msgid ""
18685"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
18686"'git notes merge --commit', or abort the merge with 'git notes merge --"
18687"abort'.\n"
a0b6b246
JX
18688msgstr ""
18689"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
18690"交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
5c57d762 18691
7e6630a7 18692#: builtin/notes.c:895 builtin/tag.c:590
d46c5519
JX
18693#, c-format
18694msgid "Failed to resolve '%s' as a valid ref."
18695msgstr "无法解析 '%s' 为一个有效引用。"
18696
7e6630a7 18697#: builtin/notes.c:898
ef317cd5
JX
18698#, c-format
18699msgid "Object %s has no note\n"
18700msgstr "对象 %s 没有注解\n"
18701
7e6630a7 18702#: builtin/notes.c:910
ef317cd5 18703msgid "attempt to remove non-existent note is not an error"
07432cef 18704msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 18705
7e6630a7 18706#: builtin/notes.c:913
ef317cd5 18707msgid "read object names from the standard input"
07432cef 18708msgstr "从标准输入读取对象名称"
ef317cd5 18709
7e6630a7 18710#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
5c57d762
JX
18711msgid "do not remove, show only"
18712msgstr "不删除,只显示"
18713
7e6630a7 18714#: builtin/notes.c:953
5c57d762
JX
18715msgid "report pruned notes"
18716msgstr "报告清除的注解"
18717
7e6630a7 18718#: builtin/notes.c:996
6c94aba5 18719msgid "notes-ref"
07432cef 18720msgstr "注解引用"
ef317cd5 18721
7e6630a7 18722#: builtin/notes.c:997
814ff314 18723msgid "use notes from <notes-ref>"
07432cef 18724msgstr "从 <注解引用> 使用注解"
ef317cd5 18725
7e6630a7 18726#: builtin/notes.c:1032 builtin/stash.c:1752
ef317cd5 18727#, c-format
a0b6b246 18728msgid "unknown subcommand: %s"
ef317cd5
JX
18729msgstr "未知子命令:%s"
18730
ec3d4607 18731#: builtin/pack-objects.c:182
1b7f4a34
JX
18732msgid ""
18733"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
18734msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
ef317cd5 18735
ec3d4607 18736#: builtin/pack-objects.c:183
1b7f4a34
JX
18737msgid ""
18738"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
58b6f078 18739msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
ef317cd5 18740
ec3d4607 18741#: builtin/pack-objects.c:572
473eb541
JX
18742#, c-format
18743msgid ""
18744"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
18745"pack %s"
33b62fba
JX
18746msgstr ""
18747"write_reuse_object:无法定位 %1$s,预期在包 %3$s 中的偏移量 %2$<PRIuMAX> 上"
473eb541 18748
ec3d4607 18749#: builtin/pack-objects.c:580
ef317cd5 18750#, c-format
c1ac5258
JX
18751msgid "bad packed object CRC for %s"
18752msgstr "%s 错的包对象 CRC"
18753
ec3d4607 18754#: builtin/pack-objects.c:591
c1ac5258
JX
18755#, c-format
18756msgid "corrupt packed object for %s"
18757msgstr "%s 损坏的包对象"
18758
ec3d4607 18759#: builtin/pack-objects.c:722
c1ac5258
JX
18760#, c-format
18761msgid "recursive delta detected for object %s"
18762msgstr "发现对象 %s 递归 delta"
18763
ec3d4607 18764#: builtin/pack-objects.c:941
c1ac5258
JX
18765#, c-format
18766msgid "ordered %u objects, expected %<PRIu32>"
18767msgstr "排序了 %u 个对象,预期 %<PRIu32> 个"
18768
ec3d4607 18769#: builtin/pack-objects.c:1036
473eb541
JX
18770#, c-format
18771msgid "expected object at offset %<PRIuMAX> in pack %s"
18772msgstr "预期对象在包文件 %2$s 的偏移量 %1$<PRIuMAX> 上"
18773
7e6630a7 18774#: builtin/pack-objects.c:1160
5b04ee3b
JX
18775msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
18776msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
18777
7e6630a7 18778#: builtin/pack-objects.c:1173
6c94aba5
JX
18779msgid "Writing objects"
18780msgstr "写入对象中"
18781
7e6630a7 18782#: builtin/pack-objects.c:1235 builtin/update-index.c:90
c1ac5258
JX
18783#, c-format
18784msgid "failed to stat %s"
18785msgstr "对 %s 调用 stat 失败"
18786
7e6630a7
FZ
18787#: builtin/pack-objects.c:1268
18788msgid "failed to write bitmap index"
18789msgstr "写入位图索引失败"
18790
18791#: builtin/pack-objects.c:1294
c1ac5258
JX
18792#, c-format
18793msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
18794msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
18795
7e6630a7 18796#: builtin/pack-objects.c:1536
6c94aba5
JX
18797msgid "disabling bitmap writing, as some objects are not being packed"
18798msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
18799
7e6630a7 18800#: builtin/pack-objects.c:1984
c1ac5258
JX
18801#, c-format
18802msgid "delta base offset overflow in pack for %s"
18803msgstr "%s 压缩中 delta 基准偏移越界"
18804
7e6630a7 18805#: builtin/pack-objects.c:1993
c1ac5258
JX
18806#, c-format
18807msgid "delta base offset out of bound for %s"
18808msgstr "%s 的 delta 基准偏移越界"
18809
7e6630a7 18810#: builtin/pack-objects.c:2274
fd8cb379
JX
18811msgid "Counting objects"
18812msgstr "对象计数中"
18813
7e6630a7 18814#: builtin/pack-objects.c:2439
fd8cb379
JX
18815#, c-format
18816msgid "unable to parse object header of %s"
18817msgstr "无法解析对象 %s 头信息"
18818
7e6630a7
FZ
18819#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
18820#: builtin/pack-objects.c:2535
c1ac5258
JX
18821#, c-format
18822msgid "object %s cannot be read"
18823msgstr "对象 %s 无法读取"
18824
7e6630a7 18825#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
c1ac5258 18826#, c-format
4c27fcb5
JX
18827msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
18828msgstr "对象 %s 不一致的对象长度(%<PRIuMAX> vs %<PRIuMAX>)"
c1ac5258 18829
7e6630a7 18830#: builtin/pack-objects.c:2549
c1ac5258
JX
18831msgid "suboptimal pack - out of memory"
18832msgstr "次优(suboptimal)打包 - 内存不足"
18833
7e6630a7 18834#: builtin/pack-objects.c:2864
c1ac5258
JX
18835#, c-format
18836msgid "Delta compression using up to %d threads"
18837msgstr "使用 %d 个线程进行压缩"
18838
7e6630a7 18839#: builtin/pack-objects.c:3003
c1ac5258
JX
18840#, c-format
18841msgid "unable to pack objects reachable from tag %s"
18842msgstr "无法为标签 %s 压缩对象"
18843
7e6630a7 18844#: builtin/pack-objects.c:3089
6c94aba5
JX
18845msgid "Compressing objects"
18846msgstr "压缩对象中"
18847
7e6630a7 18848#: builtin/pack-objects.c:3095
c1ac5258
JX
18849msgid "inconsistency with delta count"
18850msgstr "不一致的差异计数"
18851
7e6630a7 18852#: builtin/pack-objects.c:3174
7157c2b5
JX
18853#, c-format
18854msgid ""
18855"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
18856"hash> <uri>' (got '%s')"
d9488fea
JX
18857msgstr ""
18858"uploadpack.blobpackfileuri 的取值必须是 '<object-hash> <pack-hash> <uri>' 格"
18859"式(得到 '%s')"
7157c2b5 18860
7e6630a7 18861#: builtin/pack-objects.c:3177
7157c2b5
JX
18862#, c-format
18863msgid ""
18864"object already configured in another uploadpack.blobpackfileuri (got '%s')"
18865msgstr "对象已经在另外的 uploadpack.blobpackfileuri 中配置(得到 '%s')"
18866
7e6630a7 18867#: builtin/pack-objects.c:3212
33b62fba
JX
18868#, c-format
18869msgid "could not get type of object %s in pack %s"
18870msgstr "无法获得包 %2$s 中对象 %1$s 的类型"
18871
7e6630a7
FZ
18872#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
18873#: builtin/pack-objects.c:3365
33b62fba
JX
18874#, c-format
18875msgid "could not find pack '%s'"
18876msgstr "不能找到包 '%s'"
18877
7e6630a7 18878#: builtin/pack-objects.c:3408
c1ac5258
JX
18879#, c-format
18880msgid ""
18881"expected edge object ID, got garbage:\n"
18882" %s"
18883msgstr ""
18884"预期边界对象(edge object)ID,却得到垃圾数据:\n"
18885" %s"
18886
7e6630a7 18887#: builtin/pack-objects.c:3414
c1ac5258
JX
18888#, c-format
18889msgid ""
18890"expected object ID, got garbage:\n"
18891" %s"
18892msgstr ""
18893"预期对象 ID,却得到垃圾数据:\n"
18894" %s"
18895
7e6630a7 18896#: builtin/pack-objects.c:3507
5809aa05
JX
18897msgid "invalid value for --missing"
18898msgstr "选项 --missing 的值无效"
18899
7e6630a7 18900#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
c1ac5258
JX
18901msgid "cannot open pack index"
18902msgstr "无法打开包文件索引"
18903
7e6630a7 18904#: builtin/pack-objects.c:3541
c1ac5258
JX
18905#, c-format
18906msgid "loose object at %s could not be examined"
18907msgstr "无法检查 %s 处的松散对象"
18908
7e6630a7 18909#: builtin/pack-objects.c:3627
c1ac5258
JX
18910msgid "unable to force loose object"
18911msgstr "无法强制松散对象"
18912
7e6630a7 18913#: builtin/pack-objects.c:3757
c1ac5258
JX
18914#, c-format
18915msgid "not a rev '%s'"
18916msgstr "不是一个版本 '%s'"
18917
7e6630a7 18918#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
c1ac5258
JX
18919#, c-format
18920msgid "bad revision '%s'"
18921msgstr "坏的版本 '%s'"
18922
7e6630a7 18923#: builtin/pack-objects.c:3788
c1ac5258
JX
18924msgid "unable to add recent objects"
18925msgstr "无法添加最近的对象"
18926
7e6630a7 18927#: builtin/pack-objects.c:3841
ef317cd5
JX
18928#, c-format
18929msgid "unsupported index version %s"
18930msgstr "不支持的索引版本 %s"
18931
7e6630a7 18932#: builtin/pack-objects.c:3845
ef317cd5
JX
18933#, c-format
18934msgid "bad index version '%s'"
18935msgstr "坏的索引版本 '%s'"
18936
7e6630a7 18937#: builtin/pack-objects.c:3884
c1ac5258
JX
18938msgid "<version>[,<offset>]"
18939msgstr "<版本>[,<偏移>]"
ef317cd5 18940
7e6630a7 18941#: builtin/pack-objects.c:3885
ef317cd5 18942msgid "write the pack index file in the specified idx format version"
07432cef 18943msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 18944
7e6630a7 18945#: builtin/pack-objects.c:3888
ef317cd5 18946msgid "maximum size of each output pack file"
07432cef 18947msgstr "每个输出包的最大尺寸"
ef317cd5 18948
7e6630a7 18949#: builtin/pack-objects.c:3890
ef317cd5 18950msgid "ignore borrowed objects from alternate object store"
160fb2b2 18951msgstr "忽略从备用对象存储里借用对象"
ef317cd5 18952
7e6630a7 18953#: builtin/pack-objects.c:3892
ef317cd5 18954msgid "ignore packed objects"
07432cef 18955msgstr "忽略包对象"
ef317cd5 18956
7e6630a7 18957#: builtin/pack-objects.c:3894
ef317cd5 18958msgid "limit pack window by objects"
07432cef 18959msgstr "限制打包窗口的对象数"
ef317cd5 18960
7e6630a7 18961#: builtin/pack-objects.c:3896
ef317cd5 18962msgid "limit pack window by memory in addition to object limit"
07432cef 18963msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 18964
7e6630a7 18965#: builtin/pack-objects.c:3898
ef317cd5 18966msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 18967msgstr "打包允许的 delta 链的最大长度"
ef317cd5 18968
7e6630a7 18969#: builtin/pack-objects.c:3900
ef317cd5 18970msgid "reuse existing deltas"
07432cef 18971msgstr "重用已存在的 deltas"
ef317cd5 18972
7e6630a7 18973#: builtin/pack-objects.c:3902
ef317cd5 18974msgid "reuse existing objects"
07432cef 18975msgstr "重用已存在的对象"
ef317cd5 18976
7e6630a7 18977#: builtin/pack-objects.c:3904
ef317cd5 18978msgid "use OFS_DELTA objects"
07432cef 18979msgstr "使用 OFS_DELTA 对象"
ef317cd5 18980
7e6630a7 18981#: builtin/pack-objects.c:3906
ef317cd5 18982msgid "use threads when searching for best delta matches"
07432cef 18983msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 18984
7e6630a7 18985#: builtin/pack-objects.c:3908
ef317cd5 18986msgid "do not create an empty pack output"
07432cef 18987msgstr "不创建空的包输出"
ef317cd5 18988
7e6630a7 18989#: builtin/pack-objects.c:3910
ef317cd5 18990msgid "read revision arguments from standard input"
d9d56b23 18991msgstr "从标准输入读取版本号参数"
ef317cd5 18992
7e6630a7 18993#: builtin/pack-objects.c:3912
ef317cd5 18994msgid "limit the objects to those that are not yet packed"
07432cef 18995msgstr "限制那些尚未打包的对象"
ef317cd5 18996
7e6630a7 18997#: builtin/pack-objects.c:3915
ef317cd5 18998msgid "include objects reachable from any reference"
07432cef 18999msgstr "包括可以从任何引用访问到的对象"
ef317cd5 19000
7e6630a7 19001#: builtin/pack-objects.c:3918
ef317cd5 19002msgid "include objects referred by reflog entries"
07432cef 19003msgstr "包括被引用日志引用到的对象"
ef317cd5 19004
7e6630a7 19005#: builtin/pack-objects.c:3921
220c313c
JX
19006msgid "include objects referred to by the index"
19007msgstr "包括被索引引用到的对象"
19008
7e6630a7 19009#: builtin/pack-objects.c:3924
33b62fba
JX
19010msgid "read packs from stdin"
19011msgstr "从标准输入读取包"
19012
7e6630a7 19013#: builtin/pack-objects.c:3926
ef317cd5 19014msgid "output pack to stdout"
07432cef 19015msgstr "输出包到标准输出"
ef317cd5 19016
7e6630a7 19017#: builtin/pack-objects.c:3928
ef317cd5 19018msgid "include tag objects that refer to objects to be packed"
53438e8f 19019msgstr "包括那些引用了待打包对象的标签对象"
ef317cd5 19020
7e6630a7 19021#: builtin/pack-objects.c:3930
ef317cd5 19022msgid "keep unreachable objects"
07432cef 19023msgstr "维持不可达的对象"
ef317cd5 19024
7e6630a7 19025#: builtin/pack-objects.c:3932
5c57d762
JX
19026msgid "pack loose unreachable objects"
19027msgstr "打包松散的不可达对象"
19028
7e6630a7 19029#: builtin/pack-objects.c:3934
ef317cd5 19030msgid "unpack unreachable objects newer than <time>"
07432cef 19031msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 19032
7e6630a7 19033#: builtin/pack-objects.c:3937
06991777
JX
19034msgid "use the sparse reachability algorithm"
19035msgstr "使用稀疏可达性算法"
19036
7e6630a7 19037#: builtin/pack-objects.c:3939
ef317cd5 19038msgid "create thin packs"
07432cef 19039msgstr "创建精简包"
ef317cd5 19040
7e6630a7 19041#: builtin/pack-objects.c:3941
04cb2f28 19042msgid "create packs suitable for shallow fetches"
160fb2b2 19043msgstr "创建适合浅克隆仓库获取的包"
04cb2f28 19044
7e6630a7 19045#: builtin/pack-objects.c:3943
ef317cd5 19046msgid "ignore packs that have companion .keep file"
07432cef 19047msgstr "忽略配有 .keep 文件的包"
ef317cd5 19048
7e6630a7 19049#: builtin/pack-objects.c:3945
fd8cb379
JX
19050msgid "ignore this pack"
19051msgstr "忽略该 pack"
19052
7e6630a7 19053#: builtin/pack-objects.c:3947
ef317cd5 19054msgid "pack compression level"
07432cef 19055msgstr "打包压缩级别"
ef317cd5 19056
7e6630a7 19057#: builtin/pack-objects.c:3949
ef317cd5 19058msgid "do not hide commits by grafts"
fd8cb379 19059msgstr "显示被移植隐藏的提交"
ef317cd5 19060
7e6630a7 19061#: builtin/pack-objects.c:3951
6c94aba5
JX
19062msgid "use a bitmap index if available to speed up counting objects"
19063msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
19064
7e6630a7 19065#: builtin/pack-objects.c:3953
6c94aba5
JX
19066msgid "write a bitmap index together with the pack index"
19067msgstr "在建立包索引的同时创建 bitmap 索引"
19068
7e6630a7 19069#: builtin/pack-objects.c:3957
a6cd2cc4
JX
19070msgid "write a bitmap index if possible"
19071msgstr "如果可能,写 bitmap 索引"
19072
7e6630a7 19073#: builtin/pack-objects.c:3961
5809aa05
JX
19074msgid "handling for missing objects"
19075msgstr "处理丢失的对象"
19076
7e6630a7 19077#: builtin/pack-objects.c:3964
31e5e17b
JX
19078msgid "do not pack objects in promisor packfiles"
19079msgstr "不要打包 promisor 包文件中的对象"
19080
7e6630a7 19081#: builtin/pack-objects.c:3966
4c27fcb5
JX
19082msgid "respect islands during delta compression"
19083msgstr "在增量压缩时参考数据岛"
19084
7e6630a7 19085#: builtin/pack-objects.c:3968
7157c2b5
JX
19086msgid "protocol"
19087msgstr "协议"
19088
7e6630a7 19089#: builtin/pack-objects.c:3969
7157c2b5
JX
19090msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
19091msgstr "使用此协议排除任何已配置的 uploadpack.blobpackfileuri"
19092
7e6630a7 19093#: builtin/pack-objects.c:4002
fd8cb379
JX
19094#, c-format
19095msgid "delta chain depth %d is too deep, forcing %d"
19096msgstr "增量链深度 %d 太深了,强制为 %d"
19097
7e6630a7 19098#: builtin/pack-objects.c:4007
fd8cb379
JX
19099#, c-format
19100msgid "pack.deltaCacheLimit is too high, forcing %d"
19101msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d"
6c94aba5 19102
7e6630a7 19103#: builtin/pack-objects.c:4063
c1ac5258
JX
19104msgid "--max-pack-size cannot be used to build a pack for transfer"
19105msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
19106
7e6630a7 19107#: builtin/pack-objects.c:4065
c1ac5258 19108msgid "minimum pack size limit is 1 MiB"
e640d114 19109msgstr "最小的包文件大小是 1 MiB"
c1ac5258 19110
7e6630a7 19111#: builtin/pack-objects.c:4070
c1ac5258
JX
19112msgid "--thin cannot be used to build an indexable pack"
19113msgstr "--thin 不能用于创建一个可索引包"
19114
7e6630a7 19115#: builtin/pack-objects.c:4073
c1ac5258
JX
19116msgid "--keep-unreachable and --unpack-unreachable are incompatible"
19117msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
19118
7e6630a7 19119#: builtin/pack-objects.c:4079
c1ac5258 19120msgid "cannot use --filter without --stdout"
e640d114 19121msgstr "不能在没有 --stdout 的情况下使用 --filter"
c1ac5258 19122
7e6630a7 19123#: builtin/pack-objects.c:4081
33b62fba
JX
19124msgid "cannot use --filter with --stdin-packs"
19125msgstr "不能同时使用 --filter 和 --stdin-packs"
19126
7e6630a7 19127#: builtin/pack-objects.c:4085
33b62fba
JX
19128msgid "cannot use internal rev list with --stdin-packs"
19129msgstr "不能同时使用内部版本列表和 --stdin-packs"
19130
7e6630a7 19131#: builtin/pack-objects.c:4144
fd8cb379 19132msgid "Enumerating objects"
d9488fea 19133msgstr "枚举对象中"
fd8cb379 19134
7e6630a7 19135#: builtin/pack-objects.c:4181
c1ac5258 19136#, c-format
2b472aae
JX
19137msgid ""
19138"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
19139"reused %<PRIu32>"
19140msgstr ""
19141"总共 %<PRIu32>(差异 %<PRIu32>),复用 %<PRIu32>(差异 %<PRIu32>),包复用 "
19142"%<PRIu32>"
c1ac5258 19143
473eb541
JX
19144#: builtin/pack-redundant.c:601
19145msgid ""
19146"'git pack-redundant' is nominated for removal.\n"
19147"If you still use this command, please add an extra\n"
19148"option, '--i-still-use-this', on the command line\n"
19149"and let us know you still use it by sending an e-mail\n"
19150"to <git@vger.kernel.org>. Thanks.\n"
19151msgstr ""
19152"准备移除 'git pack-redundant' 命令。如果您仍旧使用这个\n"
19153"命令,请在命令行中添加额外参数:'--i-still-use-this',\n"
19154"并通过发送邮件到 <git@vger.kernel.org> 让我们知道您仍旧\n"
19155"使用它。 谢谢。\n"
19156
d46c5519 19157#: builtin/pack-refs.c:8
814ff314
JX
19158msgid "git pack-refs [<options>]"
19159msgstr "git pack-refs [<选项>]"
c04f5ac3 19160
d46c5519 19161#: builtin/pack-refs.c:16
ef317cd5 19162msgid "pack everything"
07432cef 19163msgstr "打包一切"
c04f5ac3 19164
d46c5519 19165#: builtin/pack-refs.c:17
ef317cd5 19166msgid "prune loose refs (default)"
07432cef 19167msgstr "清除松散的引用(默认)"
c04f5ac3 19168
349ede6a 19169#: builtin/prune-packed.c:6
814ff314
JX
19170msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
19171msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
6792b93b 19172
349ede6a 19173#: builtin/prune.c:14
5809aa05
JX
19174msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
19175msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
7ac1c0ad 19176
349ede6a 19177#: builtin/prune.c:133
1b7f4a34
JX
19178msgid "report pruned objects"
19179msgstr "报告清除的对象"
19180
349ede6a 19181#: builtin/prune.c:136
1b7f4a34
JX
19182msgid "expire objects older than <time>"
19183msgstr "使早于给定时间的对象过期"
19184
349ede6a 19185#: builtin/prune.c:138
31e5e17b
JX
19186msgid "limit traversal to objects outside promisor packfiles"
19187msgstr "限制遍历 promisor 包以外的对象"
19188
7e6630a7 19189#: builtin/prune.c:151
94550ed3
JX
19190msgid "cannot prune in a precious-objects repo"
19191msgstr "不能在珍品仓库中执行清理操作"
19192
2b472aae 19193#: builtin/pull.c:45 builtin/pull.c:47
a0b6b246
JX
19194#, c-format
19195msgid "Invalid value for %s: %s"
19196msgstr "%s 的值无效:%s"
19197
2b472aae 19198#: builtin/pull.c:67
94550ed3 19199msgid "git pull [<options>] [<repository> [<refspec>...]]"
1b7f4a34
JX
19200msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
19201
ffa14514 19202#: builtin/pull.c:124
a4f16749
JX
19203msgid "control for recursive fetching of submodules"
19204msgstr "控制子模组的递归获取"
19205
ffa14514 19206#: builtin/pull.c:128
1b7f4a34
JX
19207msgid "Options related to merging"
19208msgstr "和合并相关的选项"
19209
ffa14514 19210#: builtin/pull.c:131
1b7f4a34
JX
19211msgid "incorporate changes by rebasing rather than merging"
19212msgstr "使用变基操作取代合并操作以合入修改"
19213
ffa14514 19214#: builtin/pull.c:159 builtin/revert.c:126
1b7f4a34
JX
19215msgid "allow fast-forward"
19216msgstr "允许快进式"
19217
ffa14514
FZ
19218#: builtin/pull.c:165
19219msgid "control use of pre-merge-commit and commit-msg hooks"
19220msgstr "控制 pre-merge-commit 和 commit-msg 钩子的使用"
19221
19222#: builtin/pull.c:171 parse-options.h:338
349ede6a
JX
19223msgid "automatically stash/stash pop before and after"
19224msgstr "在操作前后执行自动贮藏和弹出贮藏"
5b04ee3b 19225
ffa14514 19226#: builtin/pull.c:187
1b7f4a34
JX
19227msgid "Options related to fetching"
19228msgstr "和获取相关的参数"
19229
ffa14514 19230#: builtin/pull.c:197
4c27fcb5
JX
19231msgid "force overwrite of local branch"
19232msgstr "强制覆盖本地分支"
19233
ffa14514 19234#: builtin/pull.c:205
276ceeaa
JX
19235msgid "number of submodules pulled in parallel"
19236msgstr "并发拉取的子模组的数量"
19237
ffa14514 19238#: builtin/pull.c:321
1b7f4a34
JX
19239#, c-format
19240msgid "Invalid value for pull.ff: %s"
19241msgstr "pull.ff 的取值无效:%s"
19242
ffa14514 19243#: builtin/pull.c:449
1b7f4a34
JX
19244msgid ""
19245"There is no candidate for rebasing against among the refs that you just "
19246"fetched."
19247msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
19248
ffa14514 19249#: builtin/pull.c:451
1b7f4a34
JX
19250msgid ""
19251"There are no candidates for merging among the refs that you just fetched."
19252msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
19253
ffa14514 19254#: builtin/pull.c:452
1b7f4a34
JX
19255msgid ""
19256"Generally this means that you provided a wildcard refspec which had no\n"
19257"matches on the remote end."
19258msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
19259
ffa14514 19260#: builtin/pull.c:455
1b7f4a34
JX
19261#, c-format
19262msgid ""
19263"You asked to pull from the remote '%s', but did not specify\n"
19264"a branch. Because this is not the default configured remote\n"
19265"for your current branch, you must specify a branch on the command line."
19266msgstr ""
19267"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
19268"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
19269
ffa14514 19270#: builtin/pull.c:460 builtin/rebase.c:951
1b7f4a34
JX
19271msgid "You are not currently on a branch."
19272msgstr "您当前不在一个分支上。"
19273
ffa14514 19274#: builtin/pull.c:462 builtin/pull.c:477
1b7f4a34
JX
19275msgid "Please specify which branch you want to rebase against."
19276msgstr "请指定您要变基到哪一个分支。"
19277
ffa14514 19278#: builtin/pull.c:464 builtin/pull.c:479
1b7f4a34
JX
19279msgid "Please specify which branch you want to merge with."
19280msgstr "请指定您要合并哪一个分支。"
19281
ffa14514 19282#: builtin/pull.c:465 builtin/pull.c:480
1b7f4a34
JX
19283msgid "See git-pull(1) for details."
19284msgstr "详见 git-pull(1)。"
19285
ffa14514 19286#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
7e6630a7 19287#: builtin/rebase.c:957
5b04ee3b
JX
19288msgid "<remote>"
19289msgstr "<远程>"
19290
ffa14514 19291#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
5b04ee3b
JX
19292msgid "<branch>"
19293msgstr "<分支>"
19294
ffa14514 19295#: builtin/pull.c:475 builtin/rebase.c:949
1b7f4a34
JX
19296msgid "There is no tracking information for the current branch."
19297msgstr "当前分支没有跟踪信息。"
19298
ffa14514 19299#: builtin/pull.c:484
1b7f4a34 19300msgid ""
5b04ee3b
JX
19301"If you wish to set tracking information for this branch you can do so with:"
19302msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
7ac1c0ad 19303
ffa14514 19304#: builtin/pull.c:489
1b7f4a34
JX
19305#, c-format
19306msgid ""
19307"Your configuration specifies to merge with the ref '%s'\n"
19308"from the remote, but no such ref was fetched."
19309msgstr ""
19310"您的配置中指定要合并远程的引用 '%s',\n"
19311"但是没有获取到这个引用。"
7ac1c0ad 19312
ffa14514 19313#: builtin/pull.c:600
4c27fcb5
JX
19314#, c-format
19315msgid "unable to access commit %s"
19316msgstr "无法访问提交 %s"
19317
ffa14514 19318#: builtin/pull.c:908
5c57d762
JX
19319msgid "ignoring --verify-signatures for rebase"
19320msgstr "为变基操作忽略 --verify-signatures"
19321
ffa14514 19322#: builtin/pull.c:942
473eb541 19323msgid ""
7e6630a7
FZ
19324"You have divergent branches and need to specify how to reconcile them.\n"
19325"You can do so by running one of the following commands sometime before\n"
19326"your next pull:\n"
473eb541
JX
19327"\n"
19328" git config pull.rebase false # merge (the default strategy)\n"
19329" git config pull.rebase true # rebase\n"
19330" git config pull.ff only # fast-forward only\n"
19331"\n"
19332"You can replace \"git config\" with \"git config --global\" to set a "
19333"default\n"
19334"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
19335"or --ff-only on the command line to override the configured default per\n"
19336"invocation.\n"
19337msgstr ""
7e6630a7 19338"您有偏离的分支,需要指定如何调和它们。您可以在执行下一次\n"
473eb541
JX
19339"pull 操作之前执行下面一条命令来抑制本消息:\n"
19340"\n"
19341" git config pull.rebase false # 合并(缺省策略)\n"
19342" git config pull.rebase true # 变基\n"
19343" git config pull.ff only # 仅快进\n"
19344"\n"
19345"您可以将 \"git config\" 替换为 \"git config --global\" 以便为所有仓库设置\n"
19346"缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase,\n"
19347"或者 --ff-only 参数覆盖缺省设置。\n"
19348
ffa14514 19349#: builtin/pull.c:1016
1b7f4a34
JX
19350msgid "Updating an unborn branch with changes added to the index."
19351msgstr "更新尚未诞生的分支,变更添加至索引。"
19352
ffa14514 19353#: builtin/pull.c:1020
a0b6b246
JX
19354msgid "pull with rebase"
19355msgstr "变基式拉取"
19356
ffa14514 19357#: builtin/pull.c:1021
a0b6b246 19358msgid "please commit or stash them."
554e8501 19359msgstr "请提交或贮藏它们。"
a0b6b246 19360
ffa14514 19361#: builtin/pull.c:1046
1b7f4a34
JX
19362#, c-format
19363msgid ""
19364"fetch updated the current branch head.\n"
19365"fast-forwarding your working tree from\n"
19366"commit %s."
19367msgstr ""
19368"fetch 更新了当前的分支。快进您的工作区\n"
19369"至提交 %s。"
ef317cd5 19370
ffa14514 19371#: builtin/pull.c:1052
1b7f4a34
JX
19372#, c-format
19373msgid ""
19374"Cannot fast-forward your working tree.\n"
19375"After making sure that you saved anything precious from\n"
19376"$ git diff %s\n"
19377"output, run\n"
19378"$ git reset --hard\n"
19379"to recover."
19380msgstr ""
19381"您当前的工作区无法执行快进操作。\n"
19382"首先执行如下命令:\n"
19383"$ git diff %s\n"
19384"以确认所有有用的数据均已保存。然后执行下面的命令\n"
19385"$ git reset --hard\n"
19386"恢复之前的状态。"
19387
ffa14514 19388#: builtin/pull.c:1067
1b7f4a34
JX
19389msgid "Cannot merge multiple branches into empty head."
19390msgstr "无法将多个分支合并到空分支。"
19391
ffa14514 19392#: builtin/pull.c:1072
1b7f4a34
JX
19393msgid "Cannot rebase onto multiple branches."
19394msgstr "无法变基到多个分支。"
19395
ffa14514 19396#: builtin/pull.c:1074
7e6630a7
FZ
19397msgid "Cannot fast-forward to multiple branches."
19398msgstr "无法快进到多个分支。"
19399
ffa14514 19400#: builtin/pull.c:1088
7e6630a7
FZ
19401msgid "Need to specify how to reconcile divergent branches."
19402msgstr "需要指定如何调和偏离的分支。"
19403
ffa14514 19404#: builtin/pull.c:1102
a4f16749
JX
19405msgid "cannot rebase with locally recorded submodule modifications"
19406msgstr "本地子模组中有修改,无法变基"
19407
fd8cb379 19408#: builtin/push.c:19
ef317cd5 19409msgid "git push [<options>] [<repository> [<refspec>...]]"
160fb2b2 19410msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
7ac1c0ad 19411
d9488fea 19412#: builtin/push.c:111
c04f5ac3 19413msgid "tag shorthand without <tag>"
55a16ee4 19414msgstr "标签后面未提供 <标签> 参数"
c04f5ac3 19415
d9488fea 19416#: builtin/push.c:119
c04f5ac3 19417msgid "--delete only accepts plain target ref names"
90e6ef53 19418msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 19419
d9488fea 19420#: builtin/push.c:164
8ada9598
JX
19421msgid ""
19422"\n"
19423"To choose either option permanently, see push.default in 'git help config'."
19424msgstr ""
81809b99
JX
19425"\n"
19426"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 19427
d9488fea 19428#: builtin/push.c:167
8ada9598
JX
19429#, c-format
19430msgid ""
19431"The upstream branch of your current branch does not match\n"
19432"the name of your current branch. To push to the upstream branch\n"
19433"on the remote, use\n"
19434"\n"
19435" git push %s HEAD:%s\n"
19436"\n"
19437"To push to the branch of the same name on the remote, use\n"
19438"\n"
4c27fcb5 19439" git push %s HEAD\n"
8ada9598
JX
19440"%s"
19441msgstr ""
4c27fcb5
JX
19442"您当前分支的上游分支和您当前分支名不匹配,为推送到远程的上游分支,\n"
19443"使用\n"
81809b99
JX
19444"\n"
19445" git push %s HEAD:%s\n"
19446"\n"
19447"为推送至远程同名分支,使用\n"
19448"\n"
4c27fcb5 19449" git push %s HEAD\n"
81809b99 19450"%s"
8ada9598 19451
d9488fea 19452#: builtin/push.c:182
c04f5ac3
JX
19453#, c-format
19454msgid ""
19455"You are not currently on a branch.\n"
19456"To push the history leading to the current (detached HEAD)\n"
19457"state now, use\n"
19458"\n"
19459" git push %s HEAD:<name-of-remote-branch>\n"
19460msgstr ""
19461"您当前不在一个分支上。\n"
90e6ef53 19462"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3 19463"\n"
d9d56b23 19464" git push %s HEAD:<远程分支名字>\n"
c04f5ac3 19465
ec3d4607 19466#: builtin/push.c:191
c04f5ac3
JX
19467#, c-format
19468msgid ""
19469"The current branch %s has no upstream branch.\n"
19470"To push the current branch and set the remote as upstream, use\n"
19471"\n"
19472" git push --set-upstream %s %s\n"
19473msgstr ""
19474"当前分支 %s 没有对应的上游分支。\n"
19475"为推送当前分支并建立与远程上游的跟踪,使用\n"
19476"\n"
19477" git push --set-upstream %s %s\n"
19478
ec3d4607 19479#: builtin/push.c:199
c04f5ac3
JX
19480#, c-format
19481msgid "The current branch %s has multiple upstream branches, refusing to push."
19482msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
19483
ec3d4607
JX
19484#: builtin/push.c:217
19485msgid ""
19486"You didn't specify any refspecs to push, and push.default is \"nothing\"."
19487msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
19488
19489#: builtin/push.c:243
73a60cd2
JX
19490#, c-format
19491msgid ""
19492"You are pushing to remote '%s', which is not the upstream of\n"
19493"your current branch '%s', without telling me what to push\n"
19494"to update which remote branch."
19495msgstr ""
19496"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
19497"而没有告诉我要推送什么、更新哪个远程分支。"
19498
ec3d4607 19499#: builtin/push.c:258
170e9899
JX
19500msgid ""
19501"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
19502"its remote counterpart. Integrate the remote changes (e.g.\n"
19503"'git pull ...') before pushing again.\n"
170e9899
JX
19504"See the 'Note about fast-forwards' in 'git push --help' for details."
19505msgstr ""
eff6d3a9 19506"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 19507"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 19508"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 19509
ec3d4607 19510#: builtin/push.c:264
170e9899
JX
19511msgid ""
19512"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
19513"counterpart. Check out this branch and integrate the remote changes\n"
19514"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
19515"See the 'Note about fast-forwards' in 'git push --help' for details."
19516msgstr ""
eff6d3a9 19517"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 19518"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 19519"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 19520
ec3d4607 19521#: builtin/push.c:270
07432cef 19522msgid ""
a77c07d9
JX
19523"Updates were rejected because the remote contains work that you do\n"
19524"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
19525"to the same ref. You may want to first integrate the remote changes\n"
19526"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
19527"See the 'Note about fast-forwards' in 'git push --help' for details."
19528msgstr ""
160fb2b2
JX
19529"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
19530"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
2e8451e8 19531"(如 'git pull ...')。\n"
a77c07d9
JX
19532"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
19533
ec3d4607 19534#: builtin/push.c:277
a77c07d9 19535msgid "Updates were rejected because the tag already exists in the remote."
55a16ee4 19536msgstr "更新被拒绝,因为该标签在远程已经存在。"
a77c07d9 19537
ec3d4607 19538#: builtin/push.c:280
a77c07d9
JX
19539msgid ""
19540"You cannot update a remote ref that points at a non-commit object,\n"
19541"or update a remote ref to make it point at a non-commit object,\n"
19542"without using the '--force' option.\n"
19543msgstr ""
19544"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
19545"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 19546
ec3d4607 19547#: builtin/push.c:285
d13389bf
JX
19548msgid ""
19549"Updates were rejected because the tip of the remote-tracking\n"
19550"branch has been updated since the last checkout. You may want\n"
19551"to integrate those changes locally (e.g., 'git pull ...')\n"
19552"before forcing an update.\n"
19553msgstr ""
19554"更新被拒绝,因为远程跟踪分支的最新提交自从上次检出之后已被更新。\n"
19555"在强制更新前,您可能想将这些变更整合到本地(如 'git pull ...')。\n"
19556
ec3d4607 19557#: builtin/push.c:355
c04f5ac3
JX
19558#, c-format
19559msgid "Pushing to %s\n"
19560msgstr "推送到 %s\n"
19561
ec3d4607 19562#: builtin/push.c:362
c04f5ac3
JX
19563#, c-format
19564msgid "failed to push some refs to '%s'"
c1ac5258 19565msgstr "推送一些引用到 '%s' 失败"
c04f5ac3 19566
7e6630a7 19567#: builtin/push.c:544 builtin/submodule--helper.c:3258
ef317cd5 19568msgid "repository"
160fb2b2 19569msgstr "仓库"
ef317cd5 19570
7e6630a7 19571#: builtin/push.c:545 builtin/send-pack.c:193
ef317cd5 19572msgid "push all refs"
07432cef 19573msgstr "推送所有引用"
ef317cd5 19574
7e6630a7 19575#: builtin/push.c:546 builtin/send-pack.c:195
ef317cd5 19576msgid "mirror all refs"
07432cef 19577msgstr "镜像所有引用"
ef317cd5 19578
ec3d4607 19579#: builtin/push.c:548
ef317cd5 19580msgid "delete refs"
07432cef 19581msgstr "删除引用"
ef317cd5 19582
ec3d4607 19583#: builtin/push.c:549
ef317cd5 19584msgid "push tags (can't be used with --all or --mirror)"
55a16ee4 19585msgstr "推送标签(不能使用 --all or --mirror)"
ef317cd5 19586
7e6630a7 19587#: builtin/push.c:552 builtin/send-pack.c:196
ef317cd5
JX
19588msgid "force updates"
19589msgstr "强制更新"
19590
7e6630a7 19591#: builtin/push.c:553 builtin/send-pack.c:208
c1ac5258
JX
19592msgid "<refname>:<expect>"
19593msgstr "<引用名>:<期望值>"
90314792 19594
7e6630a7 19595#: builtin/push.c:554 builtin/send-pack.c:209
90314792
JX
19596msgid "require old value of ref to be at this value"
19597msgstr "要求引用旧的取值为设定值"
19598
7e6630a7 19599#: builtin/push.c:557 builtin/send-pack.c:212
d13389bf
JX
19600msgid "require remote updates to be integrated locally"
19601msgstr "要求远程更新在本地被整合"
19602
ec3d4607 19603#: builtin/push.c:560
ef317cd5 19604msgid "control recursive pushing of submodules"
07432cef 19605msgstr "控制子模组的递归推送"
ef317cd5 19606
7e6630a7 19607#: builtin/push.c:561 builtin/send-pack.c:203
ef317cd5 19608msgid "use thin pack"
07432cef 19609msgstr "使用精简打包"
ef317cd5 19610
7e6630a7
FZ
19611#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
19612#: builtin/send-pack.c:191
ef317cd5 19613msgid "receive pack program"
07432cef 19614msgstr "接收包程序"
ef317cd5 19615
ec3d4607 19616#: builtin/push.c:564
ef317cd5 19617msgid "set upstream for git pull/status"
07432cef 19618msgstr "设置 git pull/status 的上游"
ef317cd5 19619
ec3d4607 19620#: builtin/push.c:567
ef317cd5 19621msgid "prune locally removed refs"
07432cef 19622msgstr "清除本地删除的引用"
ef317cd5 19623
ec3d4607 19624#: builtin/push.c:569
a77c07d9
JX
19625msgid "bypass pre-push hook"
19626msgstr "绕过 pre-push 钩子"
19627
ec3d4607 19628#: builtin/push.c:570
1003b3a5 19629msgid "push missing but relevant tags"
55a16ee4 19630msgstr "推送缺失但有关的标签"
1003b3a5 19631
7e6630a7 19632#: builtin/push.c:572 builtin/send-pack.c:197
220c313c
JX
19633msgid "GPG sign the push"
19634msgstr "用 GPG 为推送签名"
19635
7e6630a7 19636#: builtin/push.c:574 builtin/send-pack.c:204
814ff314
JX
19637msgid "request atomic transaction on remote side"
19638msgstr "需要远端支持原子事务"
19639
ec3d4607 19640#: builtin/push.c:592
c04f5ac3
JX
19641msgid "--delete is incompatible with --all, --mirror and --tags"
19642msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
19643
ec3d4607 19644#: builtin/push.c:594
c04f5ac3
JX
19645msgid "--delete doesn't make sense without any refs"
19646msgstr "--delete 未接任何引用没有意义"
19647
ec3d4607 19648#: builtin/push.c:614
a5cd71ca
JX
19649#, c-format
19650msgid "bad repository '%s'"
19651msgstr "坏的仓库 '%s'"
19652
ec3d4607 19653#: builtin/push.c:615
a5cd71ca
JX
19654msgid ""
19655"No configured push destination.\n"
19656"Either specify the URL from the command-line or configure a remote "
19657"repository using\n"
19658"\n"
19659" git remote add <name> <url>\n"
19660"\n"
19661"and then push using the remote name\n"
19662"\n"
19663" git push <name>\n"
19664msgstr ""
19665"没有配置推送目标。\n"
19666"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
19667"\n"
19668" git remote add <名称> <地址>\n"
19669"\n"
19670"然后使用该远程仓库名执行推送\n"
19671"\n"
19672" git push <名称>\n"
19673
ec3d4607 19674#: builtin/push.c:630
fd8cb379
JX
19675msgid "--all and --tags are incompatible"
19676msgstr "--all 和 --tags 不兼容"
19677
ec3d4607 19678#: builtin/push.c:632
fd8cb379
JX
19679msgid "--all can't be combined with refspecs"
19680msgstr "--all 不能和引用规格同时使用"
19681
ec3d4607 19682#: builtin/push.c:636
fd8cb379
JX
19683msgid "--mirror and --tags are incompatible"
19684msgstr "--mirror 和 --tags 不兼容"
19685
ec3d4607 19686#: builtin/push.c:638
fd8cb379
JX
19687msgid "--mirror can't be combined with refspecs"
19688msgstr "--mirror 不能和引用规格同时使用"
19689
ec3d4607 19690#: builtin/push.c:641
fd8cb379
JX
19691msgid "--all and --mirror are incompatible"
19692msgstr "--all 和 --mirror 不兼容"
19693
ec3d4607 19694#: builtin/push.c:648
5c57d762
JX
19695msgid "push options must not have new line characters"
19696msgstr "推送选项不能有换行符"
19697
473eb541 19698#: builtin/range-diff.c:9
c1ac5258
JX
19699msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
19700msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>"
19701
473eb541 19702#: builtin/range-diff.c:10
c1ac5258
JX
19703msgid "git range-diff [<options>] <old-tip>...<new-tip>"
19704msgstr "git range-diff [<选项>] <old-tip>...<new-tip>"
19705
473eb541 19706#: builtin/range-diff.c:11
c1ac5258
JX
19707msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
19708msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>"
19709
473eb541 19710#: builtin/range-diff.c:30
c1ac5258
JX
19711msgid "use simple diff colors"
19712msgstr "使用简单差异颜色"
19713
473eb541 19714#: builtin/range-diff.c:32
ddc12c42
JX
19715msgid "notes"
19716msgstr "注解"
19717
473eb541 19718#: builtin/range-diff.c:32
ddc12c42
JX
19719msgid "passed to 'git log'"
19720msgstr "传递给 'git log'"
19721
473eb541
JX
19722#: builtin/range-diff.c:35
19723msgid "only emit output related to the first range"
19724msgstr "仅显示与第一个范围有关的输出"
19725
19726#: builtin/range-diff.c:37
19727msgid "only emit output related to the second range"
19728msgstr "仅显示与第二个范围有关的输出"
19729
19730#: builtin/range-diff.c:60 builtin/range-diff.c:64
c1ac5258 19731#, c-format
473eb541
JX
19732msgid "not a commit range: '%s'"
19733msgstr "不是一个提交范围:'%s'"
c1ac5258 19734
473eb541 19735#: builtin/range-diff.c:74
c1ac5258
JX
19736msgid "single arg format must be symmetric range"
19737msgstr "单个参数格式必须是对称范围(即包含...)"
19738
473eb541 19739#: builtin/range-diff.c:89
c1ac5258
JX
19740msgid "need two commit ranges"
19741msgstr "需要两个提交范围"
19742
06991777 19743#: builtin/read-tree.c:41
ef317cd5 19744msgid ""
1b7f4a34 19745"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
7e6630a7
FZ
19746"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
19747"ish1> [<tree-ish2> [<tree-ish3>]])"
ef317cd5 19748msgstr ""
1b7f4a34 19749"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
7e6630a7
FZ
19750"u | -i]] [--no-sparse-checkout] [--index-output=<文件>] (--empty | <树对象一"
19751"> [<树对象二> [<树对象三>]])"
ef317cd5 19752
7e6630a7 19753#: builtin/read-tree.c:116
ef317cd5 19754msgid "write resulting index to <file>"
d9d56b23 19755msgstr "将索引结果写入 <文件>"
ef317cd5 19756
7e6630a7 19757#: builtin/read-tree.c:119
ef317cd5 19758msgid "only empty the index"
07432cef 19759msgstr "只是清空索引"
ef317cd5 19760
7e6630a7 19761#: builtin/read-tree.c:121
ef317cd5 19762msgid "Merging"
07432cef 19763msgstr "合并"
ef317cd5 19764
7e6630a7 19765#: builtin/read-tree.c:123
ef317cd5 19766msgid "perform a merge in addition to a read"
07432cef 19767msgstr "读取之余再执行一个合并"
ef317cd5 19768
7e6630a7 19769#: builtin/read-tree.c:125
ef317cd5 19770msgid "3-way merge if no file level merging required"
160fb2b2 19771msgstr "如果没有文件级合并需要,执行三方合并"
ef317cd5 19772
7e6630a7 19773#: builtin/read-tree.c:127
ef317cd5 19774msgid "3-way merge in presence of adds and removes"
160fb2b2 19775msgstr "存在添加和删除时,也执行三方合并"
ef317cd5 19776
7e6630a7 19777#: builtin/read-tree.c:129
ef317cd5 19778msgid "same as -m, but discard unmerged entries"
07432cef 19779msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 19780
7e6630a7 19781#: builtin/read-tree.c:130
ef317cd5 19782msgid "<subdirectory>/"
07432cef 19783msgstr "<子目录>/"
ef317cd5 19784
7e6630a7 19785#: builtin/read-tree.c:131
ef317cd5 19786msgid "read the tree into the index under <subdirectory>/"
07432cef 19787msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 19788
7e6630a7 19789#: builtin/read-tree.c:134
ef317cd5 19790msgid "update working tree with merge result"
07432cef 19791msgstr "用合并的结果更新工作区"
ef317cd5 19792
7e6630a7 19793#: builtin/read-tree.c:136
ef317cd5 19794msgid "gitignore"
07432cef 19795msgstr "gitignore"
ef317cd5 19796
7e6630a7 19797#: builtin/read-tree.c:137
ef317cd5 19798msgid "allow explicitly ignored files to be overwritten"
07432cef 19799msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 19800
7e6630a7 19801#: builtin/read-tree.c:140
ef317cd5 19802msgid "don't check the working tree after merging"
07432cef 19803msgstr "合并后不检查工作区"
ef317cd5 19804
7e6630a7 19805#: builtin/read-tree.c:141
ef317cd5 19806msgid "don't update the index or the work tree"
07432cef 19807msgstr "不更新索引区和工作区"
ef317cd5 19808
7e6630a7 19809#: builtin/read-tree.c:143
ef317cd5 19810msgid "skip applying sparse checkout filter"
07432cef 19811msgstr "跳过应用稀疏检出过滤器"
ef317cd5 19812
7e6630a7 19813#: builtin/read-tree.c:145
ef317cd5 19814msgid "debug unpack-trees"
07432cef 19815msgstr "调试 unpack-trees"
ef317cd5 19816
7e6630a7 19817#: builtin/read-tree.c:149
d46c5519
JX
19818msgid "suppress feedback messages"
19819msgstr "抑制反馈信息"
19820
7e6630a7 19821#: builtin/read-tree.c:183
ddc12c42
JX
19822msgid "You need to resolve your current index first"
19823msgstr "您需要先解决当前索引的冲突"
19824
349ede6a 19825#: builtin/rebase.c:35
4c27fcb5 19826msgid ""
a5cd71ca
JX
19827"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
19828"[<upstream> [<branch>]]"
ddc12c42
JX
19829msgstr ""
19830"git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<"
19831"上游> [<分支>]]"
4c27fcb5 19832
349ede6a 19833#: builtin/rebase.c:37
4c27fcb5
JX
19834msgid ""
19835"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
19836msgstr ""
19837"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]"
19838
349ede6a 19839#: builtin/rebase.c:39
4c27fcb5
JX
19840msgid "git rebase --continue | --abort | --skip | --edit-todo"
19841msgstr "git rebase --continue | --abort | --skip | --edit-todo"
19842
7e6630a7 19843#: builtin/rebase.c:230
d46c5519
JX
19844#, c-format
19845msgid "could not create temporary %s"
19846msgstr "无法创建临时的 %s"
19847
7e6630a7 19848#: builtin/rebase.c:236
d46c5519
JX
19849msgid "could not mark as interactive"
19850msgstr "无法标记为交互式"
19851
7e6630a7 19852#: builtin/rebase.c:289
d46c5519
JX
19853msgid "could not generate todo list"
19854msgstr "无法生成待办列表"
19855
7e6630a7 19856#: builtin/rebase.c:331
d46c5519
JX
19857msgid "a base commit must be provided with --upstream or --onto"
19858msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
19859
7e6630a7 19860#: builtin/rebase.c:390
4c27fcb5 19861#, c-format
349ede6a
JX
19862msgid "%s requires the merge backend"
19863msgstr "%s 需要合并后端"
4c27fcb5 19864
7e6630a7 19865#: builtin/rebase.c:432
4c27fcb5
JX
19866#, c-format
19867msgid "could not get 'onto': '%s'"
19868msgstr "无法获取 'onto':'%s'"
19869
7e6630a7 19870#: builtin/rebase.c:449
4c27fcb5
JX
19871#, c-format
19872msgid "invalid orig-head: '%s'"
19873msgstr "无效的原始 head:'%s'"
19874
7e6630a7 19875#: builtin/rebase.c:474
4c27fcb5
JX
19876#, c-format
19877msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
19878msgstr "忽略无效的 allow_rerere_autoupdate:'%s'"
19879
7e6630a7 19880#: builtin/rebase.c:597
4c27fcb5
JX
19881msgid ""
19882"Resolve all conflicts manually, mark them as resolved with\n"
19883"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
19884"You can instead skip this commit: run \"git rebase --skip\".\n"
19885"To abort and get back to the state before \"git rebase\", run \"git rebase --"
19886"abort\"."
19887msgstr ""
19888"手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n"
19889"冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n"
19890"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
19891"\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。"
19892
7e6630a7 19893#: builtin/rebase.c:680
06991777
JX
19894#, c-format
19895msgid ""
19896"\n"
19897"git encountered an error while preparing the patches to replay\n"
19898"these revisions:\n"
19899"\n"
19900" %s\n"
19901"\n"
19902"As a result, git cannot rebase them."
19903msgstr ""
19904"\n"
19905"在为重放这些版本而准备补丁时,git 遇到了一个错误:\n"
19906"\n"
19907" %s\n"
19908"\n"
19909"因此 git 无法对其变基。"
4c27fcb5 19910
7e6630a7 19911#: builtin/rebase.c:925
2b472aae
JX
19912#, c-format
19913msgid ""
19914"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
19915"\"."
440e7442 19916msgstr "无法识别的空类型 '%s';有效值有 \"drop\"、\"keep\" 和 \"ask\"。"
2b472aae 19917
7e6630a7 19918#: builtin/rebase.c:943
4c27fcb5
JX
19919#, c-format
19920msgid ""
19921"%s\n"
19922"Please specify which branch you want to rebase against.\n"
19923"See git-rebase(1) for details.\n"
19924"\n"
19925" git rebase '<branch>'\n"
19926"\n"
19927msgstr ""
19928"%s\n"
19929"请指定您要变基到哪个分支。\n"
19930"详见 git-rebase(1)。\n"
19931"\n"
19932" git rebase '<branch>'\n"
19933"\n"
19934
7e6630a7 19935#: builtin/rebase.c:959
4c27fcb5
JX
19936#, c-format
19937msgid ""
19938"If you wish to set tracking information for this branch you can do so with:\n"
19939"\n"
19940" git branch --set-upstream-to=%s/<branch> %s\n"
19941"\n"
19942msgstr ""
19943"如果您想要为此分支创建跟踪信息,您可以执行:\n"
19944"\n"
19945" git branch --set-upstream-to=%s/<branch> %s\n"
19946"\n"
19947
7e6630a7 19948#: builtin/rebase.c:989
06991777
JX
19949msgid "exec commands cannot contain newlines"
19950msgstr "exec 命令不能包含换行符"
19951
7e6630a7 19952#: builtin/rebase.c:993
06991777
JX
19953msgid "empty exec command"
19954msgstr "空的 exec 命令"
19955
7e6630a7 19956#: builtin/rebase.c:1023
4c27fcb5
JX
19957msgid "rebase onto given branch instead of upstream"
19958msgstr "变基到给定的分支而非上游"
19959
7e6630a7 19960#: builtin/rebase.c:1025
a5cd71ca
JX
19961msgid "use the merge-base of upstream and branch as the current base"
19962msgstr "使用上游和分支的合并基线做为当前基线"
19963
7e6630a7 19964#: builtin/rebase.c:1027
4c27fcb5
JX
19965msgid "allow pre-rebase hook to run"
19966msgstr "允许执行 pre-rebase 钩子"
19967
7e6630a7 19968#: builtin/rebase.c:1029
4c27fcb5
JX
19969msgid "be quiet. implies --no-stat"
19970msgstr "安静。暗示 --no-stat"
19971
7e6630a7
FZ
19972#: builtin/rebase.c:1032
19973msgid "display a diffstat of what changed upstream"
19974msgstr "显示上游变化的差异统计"
19975
19976#: builtin/rebase.c:1035
4c27fcb5 19977msgid "do not show diffstat of what changed upstream"
5b533632 19978msgstr "不显示上游变化的差异统计"
4c27fcb5 19979
7e6630a7 19980#: builtin/rebase.c:1038
d13389bf
JX
19981msgid "add a Signed-off-by trailer to each commit"
19982msgstr "为每一个提交添加 Signed-off-by 尾注"
4c27fcb5 19983
7e6630a7 19984#: builtin/rebase.c:1041
d9488fea
JX
19985msgid "make committer date match author date"
19986msgstr "使提交者日期和作者日期一致"
19987
7e6630a7 19988#: builtin/rebase.c:1043
d9488fea
JX
19989msgid "ignore author date and use current date"
19990msgstr "忽略作者日期,使用当前日期"
19991
7e6630a7 19992#: builtin/rebase.c:1045
d9488fea
JX
19993msgid "synonym of --reset-author-date"
19994msgstr "--reset-author-date 的同义词"
4c27fcb5 19995
7e6630a7 19996#: builtin/rebase.c:1047 builtin/rebase.c:1051
4c27fcb5
JX
19997msgid "passed to 'git apply'"
19998msgstr "传递给 'git apply'"
19999
7e6630a7 20000#: builtin/rebase.c:1049
d9488fea
JX
20001msgid "ignore changes in whitespace"
20002msgstr "忽略空白字符的变更"
20003
7e6630a7 20004#: builtin/rebase.c:1053 builtin/rebase.c:1056
4c27fcb5
JX
20005msgid "cherry-pick all commits, even if unchanged"
20006msgstr "拣选所有提交,即使未修改"
20007
7e6630a7 20008#: builtin/rebase.c:1058
4c27fcb5
JX
20009msgid "continue"
20010msgstr "继续"
20011
7e6630a7 20012#: builtin/rebase.c:1061
4c27fcb5
JX
20013msgid "skip current patch and continue"
20014msgstr "跳过当前补丁并继续"
20015
7e6630a7 20016#: builtin/rebase.c:1063
4c27fcb5
JX
20017msgid "abort and check out the original branch"
20018msgstr "终止并检出原有分支"
20019
7e6630a7 20020#: builtin/rebase.c:1066
4c27fcb5
JX
20021msgid "abort but keep HEAD where it is"
20022msgstr "终止但保持 HEAD 不变"
20023
7e6630a7 20024#: builtin/rebase.c:1067
4c27fcb5
JX
20025msgid "edit the todo list during an interactive rebase"
20026msgstr "在交互式变基中编辑待办列表"
20027
7e6630a7 20028#: builtin/rebase.c:1070
4c27fcb5
JX
20029msgid "show the patch file being applied or merged"
20030msgstr "显示正在应用或合并的补丁文件"
20031
7e6630a7 20032#: builtin/rebase.c:1073
2b472aae
JX
20033msgid "use apply strategies to rebase"
20034msgstr "使用应用策略进行变基"
20035
7e6630a7 20036#: builtin/rebase.c:1077
4c27fcb5
JX
20037msgid "use merging strategies to rebase"
20038msgstr "使用合并策略进行变基"
20039
7e6630a7 20040#: builtin/rebase.c:1081
4c27fcb5
JX
20041msgid "let the user edit the list of commits to rebase"
20042msgstr "让用户编辑要变基的提交列表"
20043
7e6630a7 20044#: builtin/rebase.c:1085
d46c5519
JX
20045msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
20046msgstr "(已弃用)尝试重建合并提交而非忽略它们"
4c27fcb5 20047
7e6630a7 20048#: builtin/rebase.c:1090
2b472aae 20049msgid "how to handle commits that become empty"
440e7442 20050msgstr "如何处理成为空提交的提交"
4c27fcb5 20051
7e6630a7
FZ
20052#: builtin/rebase.c:1093
20053msgid "keep commits which start empty"
20054msgstr "保留初始为空的提交"
20055
20056#: builtin/rebase.c:1097
4c27fcb5
JX
20057msgid "move commits that begin with squash!/fixup! under -i"
20058msgstr "在 -i 交互模式下,移动以 squash!/fixup! 开头的提交"
20059
7e6630a7 20060#: builtin/rebase.c:1104
4c27fcb5
JX
20061msgid "add exec lines after each commit of the editable list"
20062msgstr "可编辑列表的每一个提交下面增加一行 exec"
20063
7e6630a7 20064#: builtin/rebase.c:1108
4c27fcb5
JX
20065msgid "allow rebasing commits with empty messages"
20066msgstr "允许针对空提交说明的提交变基"
20067
7e6630a7 20068#: builtin/rebase.c:1112
4c27fcb5
JX
20069msgid "try to rebase merges instead of skipping them"
20070msgstr "尝试对合并提交变基而不是忽略它们"
20071
7e6630a7 20072#: builtin/rebase.c:1115
4c27fcb5
JX
20073msgid "use 'merge-base --fork-point' to refine upstream"
20074msgstr "使用 'merge-base --fork-point' 来优化上游"
20075
7e6630a7 20076#: builtin/rebase.c:1117
4c27fcb5
JX
20077msgid "use the given merge strategy"
20078msgstr "使用给定的合并策略"
20079
7e6630a7 20080#: builtin/rebase.c:1119 builtin/revert.c:115
4c27fcb5
JX
20081msgid "option"
20082msgstr "选项"
20083
7e6630a7 20084#: builtin/rebase.c:1120
4c27fcb5
JX
20085msgid "pass the argument through to the merge strategy"
20086msgstr "将参数传递给合并策略"
20087
7e6630a7 20088#: builtin/rebase.c:1123
4c27fcb5
JX
20089msgid "rebase all reachable commits up to the root(s)"
20090msgstr "将所有可达的提交变基到根提交"
20091
7e6630a7
FZ
20092#: builtin/rebase.c:1126
20093msgid "automatically re-schedule any `exec` that fails"
20094msgstr "自动重新安排任何失败的 `exec`"
20095
20096#: builtin/rebase.c:1128
349ede6a
JX
20097msgid "apply all changes, even those already present upstream"
20098msgstr "应用所有更改,甚至那些已在上游存在的"
20099
7e6630a7 20100#: builtin/rebase.c:1149
4c27fcb5 20101msgid "It looks like 'git am' is in progress. Cannot rebase."
ec3d4607 20102msgstr "看起来 'git am' 正在执行中。无法变基。"
4c27fcb5 20103
7e6630a7
FZ
20104#: builtin/rebase.c:1180
20105msgid "--preserve-merges was replaced by --rebase-merges"
20106msgstr "--preserve-merges 被 --rebase-merges 代替。"
d46c5519 20107
7e6630a7 20108#: builtin/rebase.c:1193
a5cd71ca
JX
20109msgid "cannot combine '--keep-base' with '--onto'"
20110msgstr "不能将 '--keep-base' 和 '--onto' 组合使用"
20111
7e6630a7 20112#: builtin/rebase.c:1195
a5cd71ca
JX
20113msgid "cannot combine '--keep-base' with '--root'"
20114msgstr "不能将 '--keep-base' 和 '--root' 组合使用"
20115
7e6630a7 20116#: builtin/rebase.c:1199
349ede6a
JX
20117msgid "cannot combine '--root' with '--fork-point'"
20118msgstr "不能将 '--root' 和 '--fork-point' 组合使用"
20119
7e6630a7 20120#: builtin/rebase.c:1202
4c27fcb5
JX
20121msgid "No rebase in progress?"
20122msgstr "没有正在进行的变基?"
20123
7e6630a7 20124#: builtin/rebase.c:1206
4c27fcb5
JX
20125msgid "The --edit-todo action can only be used during interactive rebase."
20126msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
20127
7e6630a7 20128#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
4c27fcb5
JX
20129msgid "Cannot read HEAD"
20130msgstr "不能读取 HEAD"
20131
7e6630a7 20132#: builtin/rebase.c:1241
4c27fcb5
JX
20133msgid ""
20134"You must edit all merge conflicts and then\n"
20135"mark them as resolved using git add"
20136msgstr ""
20137"您必须编辑所有的合并冲突,然后通过 git add\n"
20138"命令将它们标记为已解决"
20139
7e6630a7 20140#: builtin/rebase.c:1260
4c27fcb5
JX
20141msgid "could not discard worktree changes"
20142msgstr "无法丢弃工作区变更"
20143
7e6630a7 20144#: builtin/rebase.c:1279
4c27fcb5
JX
20145#, c-format
20146msgid "could not move back to %s"
20147msgstr "无法移回 %s"
20148
7e6630a7 20149#: builtin/rebase.c:1325
4c27fcb5
JX
20150#, c-format
20151msgid ""
20152"It seems that there is already a %s directory, and\n"
20153"I wonder if you are in the middle of another rebase. If that is the\n"
20154"case, please try\n"
20155"\t%s\n"
20156"If that is not the case, please\n"
20157"\t%s\n"
20158"and run me again. I am stopping in case you still have something\n"
20159"valuable there.\n"
20160msgstr ""
20161"似乎已有一个 %s 目录,我怀疑您正处于另外一个变基操作过程中。\n"
20162"如果是这样,请执行\n"
20163"\t%s\n"
20164"如果不是这样,请执行\n"
20165"\t%s\n"
20166"然后再重新执行。 为避免丢失重要数据,我已经停止当前操作。\n"
20167
7e6630a7 20168#: builtin/rebase.c:1353
4c27fcb5
JX
20169msgid "switch `C' expects a numerical value"
20170msgstr "开关 `C' 期望一个数字值"
20171
7e6630a7 20172#: builtin/rebase.c:1395
4c27fcb5
JX
20173#, c-format
20174msgid "Unknown mode: %s"
20175msgstr "未知模式:%s"
20176
7e6630a7 20177#: builtin/rebase.c:1434
4c27fcb5
JX
20178msgid "--strategy requires --merge or --interactive"
20179msgstr "--strategy 需要 --merge 或 --interactive"
20180
7e6630a7 20181#: builtin/rebase.c:1463
2b472aae
JX
20182msgid "cannot combine apply options with merge options"
20183msgstr "不能组合使用应用选项和合并选项"
20184
7e6630a7 20185#: builtin/rebase.c:1476
2b472aae
JX
20186#, c-format
20187msgid "Unknown rebase backend: %s"
20188msgstr "未知的变基后端:%s"
20189
7e6630a7 20190#: builtin/rebase.c:1505
a6cd2cc4
JX
20191msgid "--reschedule-failed-exec requires --exec or --interactive"
20192msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
20193
7e6630a7 20194#: builtin/rebase.c:1536
4c27fcb5
JX
20195#, c-format
20196msgid "invalid upstream '%s'"
20197msgstr "无效的上游 '%s'"
20198
7e6630a7 20199#: builtin/rebase.c:1542
4c27fcb5
JX
20200msgid "Could not create new root commit"
20201msgstr "不能创建新的根提交"
20202
7e6630a7 20203#: builtin/rebase.c:1568
a5cd71ca
JX
20204#, c-format
20205msgid "'%s': need exactly one merge base with branch"
20206msgstr "'%s':只需要与分支的一个合并基线"
20207
7e6630a7 20208#: builtin/rebase.c:1571
4c27fcb5
JX
20209#, c-format
20210msgid "'%s': need exactly one merge base"
20211msgstr "'%s':只需要一个合并基线"
20212
7e6630a7 20213#: builtin/rebase.c:1580
4c27fcb5
JX
20214#, c-format
20215msgid "Does not point to a valid commit '%s'"
20216msgstr "没有指向一个有效的提交 '%s'"
20217
7e6630a7 20218#: builtin/rebase.c:1607
4c27fcb5 20219#, c-format
7e6630a7
FZ
20220msgid "no such branch/commit '%s'"
20221msgstr "无此分支/提交 '%s'"
4c27fcb5 20222
7e6630a7
FZ
20223#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
20224#: builtin/submodule--helper.c:2658
4c27fcb5
JX
20225#, c-format
20226msgid "No such ref: %s"
20227msgstr "没有这样的引用:%s"
20228
7e6630a7 20229#: builtin/rebase.c:1629
4c27fcb5
JX
20230msgid "Could not resolve HEAD to a revision"
20231msgstr "无法将 HEAD 解析为一个版本"
20232
7e6630a7 20233#: builtin/rebase.c:1650
4c27fcb5
JX
20234msgid "Please commit or stash them."
20235msgstr "请提交或贮藏修改。"
20236
7e6630a7 20237#: builtin/rebase.c:1686
4c27fcb5
JX
20238#, c-format
20239msgid "could not switch to %s"
20240msgstr "无法切换到 %s"
20241
7e6630a7 20242#: builtin/rebase.c:1697
4c27fcb5
JX
20243msgid "HEAD is up to date."
20244msgstr "HEAD 是最新的。"
20245
7e6630a7 20246#: builtin/rebase.c:1699
4c27fcb5
JX
20247#, c-format
20248msgid "Current branch %s is up to date.\n"
20249msgstr "当前分支 %s 是最新的。\n"
20250
7e6630a7 20251#: builtin/rebase.c:1707
4c27fcb5
JX
20252msgid "HEAD is up to date, rebase forced."
20253msgstr "HEAD 是最新的,强制变基。"
20254
7e6630a7 20255#: builtin/rebase.c:1709
4c27fcb5
JX
20256#, c-format
20257msgid "Current branch %s is up to date, rebase forced.\n"
20258msgstr "当前分支 %s 是最新的,强制变基。\n"
20259
7e6630a7 20260#: builtin/rebase.c:1717
4c27fcb5
JX
20261msgid "The pre-rebase hook refused to rebase."
20262msgstr "pre-rebase 钩子拒绝了变基操作。"
20263
7e6630a7 20264#: builtin/rebase.c:1724
4c27fcb5
JX
20265#, c-format
20266msgid "Changes to %s:\n"
20267msgstr "到 %s 的变更:\n"
20268
7e6630a7 20269#: builtin/rebase.c:1727
4c27fcb5
JX
20270#, c-format
20271msgid "Changes from %s to %s:\n"
20272msgstr "从 %s 到 %s 的变更:\n"
20273
7e6630a7 20274#: builtin/rebase.c:1752
4c27fcb5
JX
20275#, c-format
20276msgid "First, rewinding head to replay your work on top of it...\n"
20277msgstr "首先,回退头指针以便在其上重放您的工作...\n"
20278
7e6630a7 20279#: builtin/rebase.c:1761
4c27fcb5
JX
20280msgid "Could not detach HEAD"
20281msgstr "无法分离头指针"
20282
7e6630a7 20283#: builtin/rebase.c:1770
4c27fcb5
JX
20284#, c-format
20285msgid "Fast-forwarded %s to %s.\n"
20286msgstr "快进 %s 到 %s。\n"
20287
7e6630a7 20288#: builtin/receive-pack.c:35
5b04ee3b 20289msgid "git receive-pack <git-dir>"
58b6f078 20290msgstr "git receive-pack <仓库目录>"
5b04ee3b 20291
7e6630a7 20292#: builtin/receive-pack.c:1280
a0b6b246
JX
20293msgid ""
20294"By default, updating the current branch in a non-bare repository\n"
20295"is denied, because it will make the index and work tree inconsistent\n"
20296"with what you pushed, and will require 'git reset --hard' to match\n"
20297"the work tree to HEAD.\n"
20298"\n"
1a79b2f1
JX
20299"You can set the 'receive.denyCurrentBranch' configuration variable\n"
20300"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
a0b6b246
JX
20301"its current branch; however, this is not recommended unless you\n"
20302"arranged to update its work tree to match what you pushed in some\n"
20303"other way.\n"
20304"\n"
20305"To squelch this message and still keep the default behaviour, set\n"
20306"'receive.denyCurrentBranch' configuration variable to 'refuse'."
20307msgstr ""
20308"默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
20309"不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
20310"\n"
20311"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
20312"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
20313"用某种方式将其工作区更新至您推送的状态。\n"
20314"\n"
20315"若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
20316"配置变量为 'refuse'。"
20317
7e6630a7 20318#: builtin/receive-pack.c:1300
a0b6b246
JX
20319msgid ""
20320"By default, deleting the current branch is denied, because the next\n"
20321"'git clone' won't result in any file checked out, causing confusion.\n"
20322"\n"
20323"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
20324"'warn' or 'ignore' in the remote repository to allow deleting the\n"
20325"current branch, with or without a warning message.\n"
20326"\n"
20327"To squelch this message, you can set it to 'refuse'."
20328msgstr ""
20329"默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
29004bbb 20330"导致困惑。\n"
a0b6b246
JX
20331"\n"
20332"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
29004bbb 20333"'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
a0b6b246
JX
20334"\n"
20335"若要屏蔽此信息,您可以设置它为 'refuse'。"
20336
7e6630a7 20337#: builtin/receive-pack.c:2480
5b04ee3b
JX
20338msgid "quiet"
20339msgstr "静默模式"
20340
7e6630a7 20341#: builtin/receive-pack.c:2495
5b04ee3b
JX
20342msgid "You must specify a directory."
20343msgstr "您必须指定一个目录。"
20344
06991777
JX
20345#: builtin/reflog.c:17
20346msgid ""
20347"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
20348"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
20349"<refs>..."
20350msgstr ""
20351"git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>] [--"
20352"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引"
20353"用>..."
20354
20355#: builtin/reflog.c:22
20356msgid ""
20357"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
20358"<refs>..."
20359msgstr ""
20360"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引"
20361"用>..."
20362
20363#: builtin/reflog.c:25
20364msgid "git reflog exists <ref>"
20365msgstr "git reflog exists <引用>"
20366
2b472aae 20367#: builtin/reflog.c:568 builtin/reflog.c:573
2e8451e8
JX
20368#, c-format
20369msgid "'%s' is not a valid timestamp"
20370msgstr "'%s' 不是一个有效的时间戳"
20371
473eb541 20372#: builtin/reflog.c:609
06991777
JX
20373#, c-format
20374msgid "Marking reachable objects..."
20375msgstr "正在标记可达对象..."
20376
473eb541 20377#: builtin/reflog.c:647
06991777
JX
20378#, c-format
20379msgid "%s points nowhere!"
20380msgstr "%s 指向不存在!"
20381
7e6630a7 20382#: builtin/reflog.c:700
06991777
JX
20383msgid "no reflog specified to delete"
20384msgstr "未指定要删除的引用日志"
20385
473eb541 20386#: builtin/reflog.c:708
06991777
JX
20387#, c-format
20388msgid "not a reflog: %s"
20389msgstr "不是一个引用日志:%s"
20390
473eb541 20391#: builtin/reflog.c:713
06991777
JX
20392#, c-format
20393msgid "no reflog for '%s'"
20394msgstr "没有 '%s' 的引用日志"
20395
473eb541 20396#: builtin/reflog.c:759
06991777
JX
20397#, c-format
20398msgid "invalid ref format: %s"
20399msgstr "无效的引用格式:%s"
20400
473eb541 20401#: builtin/reflog.c:768
06991777
JX
20402msgid "git reflog [ show | expire | delete | exists ]"
20403msgstr "git reflog [ show | expire | delete | exists ]"
20404
2b472aae 20405#: builtin/remote.c:17
ef317cd5 20406msgid "git remote [-v | --verbose]"
07432cef 20407msgstr "git remote [-v | --verbose]"
ef317cd5 20408
2b472aae 20409#: builtin/remote.c:18
ef317cd5 20410msgid ""
814ff314 20411"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
ef317cd5
JX
20412"mirror=<fetch|push>] <name> <url>"
20413msgstr ""
814ff314 20414"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
d9d56b23 20415"mirror=<fetch|push>] <名称> <地址>"
ef317cd5 20416
2b472aae 20417#: builtin/remote.c:19 builtin/remote.c:39
ef317cd5 20418msgid "git remote rename <old> <new>"
07432cef 20419msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 20420
2b472aae 20421#: builtin/remote.c:20 builtin/remote.c:44
ef317cd5 20422msgid "git remote remove <name>"
07432cef 20423msgstr "git remote remove <名称>"
ef317cd5 20424
2b472aae 20425#: builtin/remote.c:21 builtin/remote.c:49
814ff314
JX
20426msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
20427msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
ef317cd5 20428
2b472aae 20429#: builtin/remote.c:22
ef317cd5 20430msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 20431msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 20432
2b472aae 20433#: builtin/remote.c:23
ef317cd5 20434msgid "git remote prune [-n | --dry-run] <name>"
07432cef 20435msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 20436
2b472aae 20437#: builtin/remote.c:24
ef317cd5
JX
20438msgid ""
20439"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 20440msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 20441
2b472aae 20442#: builtin/remote.c:25
ef317cd5 20443msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 20444msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 20445
2b472aae 20446#: builtin/remote.c:26 builtin/remote.c:75
94550ed3
JX
20447msgid "git remote get-url [--push] [--all] <name>"
20448msgstr "git remote get-url [--push] [--all] <名称>"
20449
2b472aae 20450#: builtin/remote.c:27 builtin/remote.c:80
ef317cd5 20451msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 20452msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 20453
2b472aae 20454#: builtin/remote.c:28 builtin/remote.c:81
ef317cd5 20455msgid "git remote set-url --add <name> <newurl>"
07432cef 20456msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 20457
2b472aae 20458#: builtin/remote.c:29 builtin/remote.c:82
ef317cd5 20459msgid "git remote set-url --delete <name> <url>"
07432cef 20460msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 20461
2b472aae 20462#: builtin/remote.c:34
ef317cd5 20463msgid "git remote add [<options>] <name> <url>"
07432cef 20464msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 20465
2b472aae 20466#: builtin/remote.c:54
ef317cd5 20467msgid "git remote set-branches <name> <branch>..."
07432cef 20468msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 20469
2b472aae 20470#: builtin/remote.c:55
ef317cd5 20471msgid "git remote set-branches --add <name> <branch>..."
07432cef 20472msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 20473
2b472aae 20474#: builtin/remote.c:60
ef317cd5 20475msgid "git remote show [<options>] <name>"
07432cef 20476msgstr "git remote show [<选项>] <名称>"
ef317cd5 20477
2b472aae 20478#: builtin/remote.c:65
ef317cd5 20479msgid "git remote prune [<options>] <name>"
07432cef 20480msgstr "git remote prune [<选项>] <名称>"
ef317cd5 20481
2b472aae 20482#: builtin/remote.c:70
ef317cd5 20483msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 20484msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 20485
2b472aae 20486#: builtin/remote.c:99
81809b99 20487#, c-format
8ada9598 20488msgid "Updating %s"
81809b99 20489msgstr "更新 %s 中"
8ada9598 20490
2b472aae 20491#: builtin/remote.c:131
8ada9598
JX
20492msgid ""
20493"--mirror is dangerous and deprecated; please\n"
20494"\t use --mirror=fetch or --mirror=push instead"
20495msgstr ""
81809b99
JX
20496"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
20497"\t 或 --mirror=push"
8ada9598 20498
2b472aae 20499#: builtin/remote.c:148
81809b99 20500#, c-format
8ada9598 20501msgid "unknown mirror argument: %s"
81809b99 20502msgstr "未知的镜像参数:%s"
8ada9598 20503
2b472aae 20504#: builtin/remote.c:164
ef317cd5 20505msgid "fetch the remote branches"
07432cef 20506msgstr "抓取远程的分支"
ef317cd5 20507
2b472aae 20508#: builtin/remote.c:166
ef317cd5 20509msgid "import all tags and associated objects when fetching"
55a16ee4 20510msgstr "抓取时导入所有的标签和关联对象"
ef317cd5 20511
2b472aae 20512#: builtin/remote.c:169
ef317cd5 20513msgid "or do not fetch any tag at all (--no-tags)"
55a16ee4 20514msgstr "或不抓取任何标签(--no-tags)"
ef317cd5 20515
2b472aae 20516#: builtin/remote.c:171
ef317cd5 20517msgid "branch(es) to track"
07432cef 20518msgstr "跟踪的分支"
ef317cd5 20519
2b472aae 20520#: builtin/remote.c:172
ef317cd5 20521msgid "master branch"
07432cef 20522msgstr "主线分支"
ef317cd5 20523
2b472aae 20524#: builtin/remote.c:174
ef317cd5 20525msgid "set up remote as a mirror to push to or fetch from"
07432cef 20526msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 20527
2b472aae 20528#: builtin/remote.c:186
8ada9598 20529msgid "specifying a master branch makes no sense with --mirror"
81809b99 20530msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 20531
2b472aae 20532#: builtin/remote.c:188
8ada9598 20533msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 20534msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 20535
7e6630a7 20536#: builtin/remote.c:195 builtin/remote.c:705
81809b99 20537#, c-format
8ada9598 20538msgid "remote %s already exists."
81809b99 20539msgstr "远程 %s 已经存在。"
8ada9598 20540
d13389bf 20541#: builtin/remote.c:240
81809b99 20542#, c-format
8ada9598 20543msgid "Could not setup master '%s'"
81809b99 20544msgstr "无法设置 master '%s'"
8ada9598 20545
7e6630a7
FZ
20546#: builtin/remote.c:322
20547#, c-format
20548msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
20549msgstr "未处理的 branch.%s.rebase=%s; 假定为 'true'"
20550
20551#: builtin/remote.c:366
81809b99 20552#, c-format
8ada9598 20553msgid "Could not get fetch map for refspec %s"
160fb2b2 20554msgstr "无法得到引用规格 %s 的获取列表"
8ada9598 20555
7e6630a7 20556#: builtin/remote.c:460 builtin/remote.c:468
8ada9598 20557msgid "(matching)"
81809b99 20558msgstr "(匹配)"
8ada9598 20559
7e6630a7 20560#: builtin/remote.c:472
8ada9598 20561msgid "(delete)"
81809b99 20562msgstr "(删除)"
8ada9598 20563
7e6630a7 20564#: builtin/remote.c:660
2b472aae
JX
20565#, c-format
20566msgid "could not set '%s'"
20567msgstr "不能设置 '%s'"
20568
7e6630a7 20569#: builtin/remote.c:665
2b472aae
JX
20570#, c-format
20571msgid ""
20572"The %s configuration remote.pushDefault in:\n"
20573"\t%s:%d\n"
20574"now names the non-existent remote '%s'"
20575msgstr ""
20576"配置(%s)remote.pushDefault 位于:\n"
20577"\t%s:%d\n"
20578"现在在为不存在的远程名 '%s' 命名"
20579
7e6630a7 20580#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
81809b99 20581#, c-format
4c27fcb5
JX
20582msgid "No such remote: '%s'"
20583msgstr "没有此远程仓库:'%s'"
8ada9598 20584
7e6630a7 20585#: builtin/remote.c:715
81809b99 20586#, c-format
8ada9598 20587msgid "Could not rename config section '%s' to '%s'"
81809b99 20588msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 20589
7e6630a7 20590#: builtin/remote.c:735
8ada9598
JX
20591#, c-format
20592msgid ""
d691f479 20593"Not updating non-default fetch refspec\n"
8ada9598
JX
20594"\t%s\n"
20595"\tPlease update the configuration manually if necessary."
20596msgstr ""
160fb2b2 20597"没有更新非默认的获取引用规格\n"
81809b99
JX
20598"\t%s\n"
20599"\t如果必要请手动更新配置。"
8ada9598 20600
7e6630a7 20601#: builtin/remote.c:775
81809b99 20602#, c-format
8ada9598 20603msgid "deleting '%s' failed"
81809b99 20604msgstr "删除 '%s' 失败"
8ada9598 20605
7e6630a7 20606#: builtin/remote.c:809
81809b99 20607#, c-format
8ada9598 20608msgid "creating '%s' failed"
81809b99 20609msgstr "创建 '%s' 失败"
8ada9598 20610
7e6630a7 20611#: builtin/remote.c:887
8ada9598
JX
20612msgid ""
20613"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
20614"to delete it, use:"
20615msgid_plural ""
20616"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
20617"to delete them, use:"
5ae481e0
JX
20618msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
20619msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 20620
7e6630a7 20621#: builtin/remote.c:901
276ceeaa
JX
20622#, c-format
20623msgid "Could not remove config section '%s'"
20624msgstr "不能移除配置小节 '%s'"
20625
7e6630a7 20626#: builtin/remote.c:1009
8ada9598
JX
20627#, c-format
20628msgid " new (next fetch will store in remotes/%s)"
81809b99 20629msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 20630
7e6630a7 20631#: builtin/remote.c:1012
8ada9598 20632msgid " tracked"
81809b99 20633msgstr " 已跟踪"
8ada9598 20634
7e6630a7 20635#: builtin/remote.c:1014
8ada9598 20636msgid " stale (use 'git remote prune' to remove)"
81809b99 20637msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 20638
7e6630a7 20639#: builtin/remote.c:1016
8ada9598 20640msgid " ???"
81809b99 20641msgstr " ???"
8ada9598 20642
7e6630a7 20643#: builtin/remote.c:1057
8ada9598
JX
20644#, c-format
20645msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 20646msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 20647
7e6630a7 20648#: builtin/remote.c:1066
81809b99 20649#, c-format
276ceeaa
JX
20650msgid "rebases interactively onto remote %s"
20651msgstr "交互式变基到远程 %s"
8ada9598 20652
7e6630a7 20653#: builtin/remote.c:1068
fd8cb379
JX
20654#, c-format
20655msgid "rebases interactively (with merges) onto remote %s"
20656msgstr "交互式变基(含合并提交)到远程 %s"
20657
7e6630a7 20658#: builtin/remote.c:1071
5c57d762
JX
20659#, c-format
20660msgid "rebases onto remote %s"
20661msgstr "变基到远程 %s"
20662
7e6630a7 20663#: builtin/remote.c:1075
81809b99 20664#, c-format
8ada9598 20665msgid " merges with remote %s"
81809b99 20666msgstr " 与远程 %s 合并"
8ada9598 20667
7e6630a7 20668#: builtin/remote.c:1078
81809b99 20669#, c-format
8ada9598 20670msgid "merges with remote %s"
81809b99 20671msgstr "与远程 %s 合并"
8ada9598 20672
7e6630a7 20673#: builtin/remote.c:1081
5c57d762
JX
20674#, c-format
20675msgid "%-*s and with remote %s\n"
20676msgstr "%-*s 以及和远程 %s\n"
8ada9598 20677
7e6630a7 20678#: builtin/remote.c:1124
8ada9598 20679msgid "create"
81809b99 20680msgstr "创建"
8ada9598 20681
7e6630a7 20682#: builtin/remote.c:1127
8ada9598 20683msgid "delete"
81809b99 20684msgstr "删除"
8ada9598 20685
7e6630a7 20686#: builtin/remote.c:1131
8ada9598 20687msgid "up to date"
81809b99 20688msgstr "最新"
8ada9598 20689
7e6630a7 20690#: builtin/remote.c:1134
8ada9598 20691msgid "fast-forwardable"
81809b99 20692msgstr "可快进"
8ada9598 20693
7e6630a7 20694#: builtin/remote.c:1137
8ada9598 20695msgid "local out of date"
81809b99 20696msgstr "本地已过时"
8ada9598 20697
7e6630a7 20698#: builtin/remote.c:1144
8ada9598
JX
20699#, c-format
20700msgid " %-*s forces to %-*s (%s)"
81809b99 20701msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 20702
7e6630a7 20703#: builtin/remote.c:1147
8ada9598
JX
20704#, c-format
20705msgid " %-*s pushes to %-*s (%s)"
81809b99 20706msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 20707
7e6630a7 20708#: builtin/remote.c:1151
8ada9598
JX
20709#, c-format
20710msgid " %-*s forces to %s"
81809b99 20711msgstr " %-*s 强制推送至 %s"
8ada9598 20712
7e6630a7 20713#: builtin/remote.c:1154
8ada9598
JX
20714#, c-format
20715msgid " %-*s pushes to %s"
81809b99 20716msgstr " %-*s 推送至 %s"
8ada9598 20717
7e6630a7 20718#: builtin/remote.c:1222
ef317cd5 20719msgid "do not query remotes"
07432cef 20720msgstr "不查询远程"
ef317cd5 20721
7e6630a7 20722#: builtin/remote.c:1243
81809b99 20723#, c-format
8ada9598 20724msgid "* remote %s"
81809b99 20725msgstr "* 远程 %s"
8ada9598 20726
7e6630a7 20727#: builtin/remote.c:1244
8ada9598
JX
20728#, c-format
20729msgid " Fetch URL: %s"
81809b99 20730msgstr " 获取地址:%s"
8ada9598 20731
7e6630a7 20732#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
8ada9598 20733msgid "(no URL)"
81809b99 20734msgstr "(无 URL)"
8ada9598 20735
a4f16749
JX
20736#. TRANSLATORS: the colon ':' should align
20737#. with the one in " Fetch URL: %s"
20738#. translation.
20739#.
7e6630a7 20740#: builtin/remote.c:1259 builtin/remote.c:1261
8ada9598
JX
20741#, c-format
20742msgid " Push URL: %s"
81809b99 20743msgstr " 推送地址:%s"
8ada9598 20744
7e6630a7 20745#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
81809b99 20746#, c-format
8ada9598 20747msgid " HEAD branch: %s"
4375c10e 20748msgstr " HEAD 分支:%s"
8ada9598 20749
7e6630a7 20750#: builtin/remote.c:1263
5c57d762
JX
20751msgid "(not queried)"
20752msgstr "(未查询)"
20753
7e6630a7 20754#: builtin/remote.c:1265
5c57d762
JX
20755msgid "(unknown)"
20756msgstr "(未知)"
20757
7e6630a7 20758#: builtin/remote.c:1269
8ada9598
JX
20759#, c-format
20760msgid ""
20761" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 20762msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 20763
7e6630a7 20764#: builtin/remote.c:1281
81809b99 20765#, c-format
8ada9598
JX
20766msgid " Remote branch:%s"
20767msgid_plural " Remote branches:%s"
81809b99 20768msgstr[0] " 远程分支:%s"
5ae481e0 20769msgstr[1] " 远程分支:%s"
8ada9598 20770
81809b99 20771# 译者:中文字符串拼接,可删除前导空格
7e6630a7 20772#: builtin/remote.c:1284 builtin/remote.c:1310
8ada9598 20773msgid " (status not queried)"
81809b99 20774msgstr "(状态未查询)"
8ada9598 20775
7e6630a7 20776#: builtin/remote.c:1293
8ada9598
JX
20777msgid " Local branch configured for 'git pull':"
20778msgid_plural " Local branches configured for 'git pull':"
81809b99 20779msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 20780msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 20781
7e6630a7 20782#: builtin/remote.c:1301
8ada9598 20783msgid " Local refs will be mirrored by 'git push'"
81809b99 20784msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 20785
7e6630a7 20786#: builtin/remote.c:1307
81809b99 20787#, c-format
8ada9598
JX
20788msgid " Local ref configured for 'git push'%s:"
20789msgid_plural " Local refs configured for 'git push'%s:"
81809b99 20790msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 20791msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 20792
7e6630a7 20793#: builtin/remote.c:1328
ef317cd5 20794msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 20795msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 20796
7e6630a7 20797#: builtin/remote.c:1330
ef317cd5 20798msgid "delete refs/remotes/<name>/HEAD"
07432cef 20799msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 20800
7e6630a7 20801#: builtin/remote.c:1344
8ada9598 20802msgid "Cannot determine remote HEAD"
81809b99 20803msgstr "无法确定远程 HEAD"
8ada9598 20804
7e6630a7 20805#: builtin/remote.c:1346
8ada9598 20806msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 20807msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 20808
7e6630a7 20809#: builtin/remote.c:1356
81809b99 20810#, c-format
8ada9598 20811msgid "Could not delete %s"
81809b99 20812msgstr "无法删除 %s"
8ada9598 20813
7e6630a7 20814#: builtin/remote.c:1364
81809b99 20815#, c-format
8ada9598 20816msgid "Not a valid ref: %s"
81809b99 20817msgstr "不是一个有效引用:%s"
8ada9598 20818
7e6630a7 20819#: builtin/remote.c:1366
81809b99 20820#, c-format
8ada9598 20821msgid "Could not setup %s"
81809b99 20822msgstr "不能设置 %s"
8ada9598
JX
20823
20824# 译者:注意保持前导空格
7e6630a7 20825#: builtin/remote.c:1384
81809b99 20826#, c-format
8ada9598 20827msgid " %s will become dangling!"
e640d114 20828msgstr " %s 将成为悬空状态!"
8ada9598
JX
20829
20830# 译者:注意保持前导空格
7e6630a7 20831#: builtin/remote.c:1385
81809b99 20832#, c-format
8ada9598 20833msgid " %s has become dangling!"
e640d114 20834msgstr " %s 已成为悬空状态!"
8ada9598 20835
7e6630a7 20836#: builtin/remote.c:1394
81809b99 20837#, c-format
8ada9598 20838msgid "Pruning %s"
81809b99 20839msgstr "修剪 %s"
8ada9598 20840
7e6630a7 20841#: builtin/remote.c:1395
8ada9598
JX
20842#, c-format
20843msgid "URL: %s"
81809b99 20844msgstr "URL:%s"
8ada9598 20845
7e6630a7 20846#: builtin/remote.c:1411
8ada9598
JX
20847#, c-format
20848msgid " * [would prune] %s"
81809b99 20849msgstr " * [将删除] %s"
8ada9598 20850
7e6630a7 20851#: builtin/remote.c:1414
8ada9598
JX
20852#, c-format
20853msgid " * [pruned] %s"
81809b99 20854msgstr " * [已删除] %s"
8ada9598 20855
7e6630a7 20856#: builtin/remote.c:1459
ef317cd5 20857msgid "prune remotes after fetching"
07432cef 20858msgstr "抓取后清除远程"
ef317cd5 20859
7e6630a7 20860#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
81809b99 20861#, c-format
8ada9598 20862msgid "No such remote '%s'"
81809b99 20863msgstr "没有此远程 '%s'"
8ada9598 20864
7e6630a7 20865#: builtin/remote.c:1541
ef317cd5 20866msgid "add branch"
07432cef 20867msgstr "添加分支"
ef317cd5 20868
7e6630a7 20869#: builtin/remote.c:1548
8ada9598 20870msgid "no remote specified"
81809b99 20871msgstr "未指定远程"
8ada9598 20872
7e6630a7 20873#: builtin/remote.c:1565
94550ed3
JX
20874msgid "query push URLs rather than fetch URLs"
20875msgstr "查询推送 URL 地址,而非获取 URL 地址"
20876
7e6630a7 20877#: builtin/remote.c:1567
94550ed3
JX
20878msgid "return all URLs"
20879msgstr "返回所有 URL 地址"
20880
7e6630a7 20881#: builtin/remote.c:1597
94550ed3
JX
20882#, c-format
20883msgid "no URLs configured for remote '%s'"
20884msgstr "没有给远程仓库 '%s' 设定 URL"
20885
7e6630a7 20886#: builtin/remote.c:1623
ef317cd5 20887msgid "manipulate push URLs"
07432cef 20888msgstr "操作推送 URLS"
ef317cd5 20889
7e6630a7 20890#: builtin/remote.c:1625
ef317cd5 20891msgid "add URL"
07432cef 20892msgstr "添加 URL"
ef317cd5 20893
7e6630a7 20894#: builtin/remote.c:1627
ef317cd5 20895msgid "delete URLs"
07432cef 20896msgstr "删除 URLS"
ef317cd5 20897
7e6630a7 20898#: builtin/remote.c:1634
8ada9598 20899msgid "--add --delete doesn't make sense"
81809b99 20900msgstr "--add --delete 无意义"
8ada9598 20901
7e6630a7 20902#: builtin/remote.c:1675
81809b99 20903#, c-format
8ada9598 20904msgid "Invalid old URL pattern: %s"
4375c10e 20905msgstr "无效的旧 URL 匹配模版:%s"
8ada9598 20906
7e6630a7 20907#: builtin/remote.c:1683
81809b99 20908#, c-format
8ada9598 20909msgid "No such URL found: %s"
4375c10e 20910msgstr "未找到此 URL:%s"
8ada9598 20911
7e6630a7 20912#: builtin/remote.c:1685
8ada9598 20913msgid "Will not delete all non-push URLs"
4375c10e 20914msgstr "将不会删除所有非推送 URL 地址"
8ada9598 20915
7e6630a7
FZ
20916#: builtin/remote.c:1702
20917msgid "be verbose; must be placed before a subcommand"
20918msgstr "冗长输出;必须置于子命令之前"
20919
20920#: builtin/repack.c:28
814ff314
JX
20921msgid "git repack [<options>]"
20922msgstr "git repack [<选项>]"
90314792 20923
7e6630a7 20924#: builtin/repack.c:33
1a79b2f1
JX
20925msgid ""
20926"Incremental repacks are incompatible with bitmap indexes. Use\n"
20927"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
20928msgstr ""
20929"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
20930"或禁用 pack.writebitmaps 配置。"
20931
7e6630a7 20932#: builtin/repack.c:201
06991777 20933msgid "could not start pack-objects to repack promisor objects"
5b533632 20934msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
06991777 20935
7e6630a7 20936#: builtin/repack.c:273 builtin/repack.c:816
06991777 20937msgid "repack: Expecting full hex object ID lines only from pack-objects."
5b533632 20938msgstr "repack:期望来自 pack-objects 的完整十六进制对象 ID。"
06991777 20939
7e6630a7 20940#: builtin/repack.c:297
06991777 20941msgid "could not finish pack-objects to repack promisor objects"
5b533632 20942msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
06991777 20943
7e6630a7 20944#: builtin/repack.c:312
33b62fba
JX
20945#, c-format
20946msgid "cannot open index for %s"
20947msgstr "不能打开 %s 的索引"
20948
7e6630a7 20949#: builtin/repack.c:371
33b62fba
JX
20950#, c-format
20951msgid "pack %s too large to consider in geometric progression"
20952msgstr "包 %s 太大,不在几何级数中考虑"
20953
7e6630a7 20954#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
33b62fba
JX
20955#, c-format
20956msgid "pack %s too large to roll up"
20957msgstr "包 %s 太大导致数字溢出"
20958
7e6630a7
FZ
20959#: builtin/repack.c:496
20960#, c-format
20961msgid "could not open tempfile %s for writing"
20962msgstr "无法打开临时文件 %s 进行写入"
20963
20964#: builtin/repack.c:514
20965msgid "could not close refs snapshot tempfile"
20966msgstr "不能关闭引用快照临时文件"
20967
20968#: builtin/repack.c:628
90314792
JX
20969msgid "pack everything in a single pack"
20970msgstr "所有内容打包到一个包文件中"
20971
7e6630a7 20972#: builtin/repack.c:630
90314792
JX
20973msgid "same as -a, and turn unreachable objects loose"
20974msgstr "和 -a 相同,并将不可达的对象设为松散对象"
20975
7e6630a7 20976#: builtin/repack.c:633
90314792
JX
20977msgid "remove redundant packs, and run git-prune-packed"
20978msgstr "删除多余的包,运行 git-prune-packed"
20979
7e6630a7 20980#: builtin/repack.c:635
90314792
JX
20981msgid "pass --no-reuse-delta to git-pack-objects"
20982msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
20983
7e6630a7 20984#: builtin/repack.c:637
90314792
JX
20985msgid "pass --no-reuse-object to git-pack-objects"
20986msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
20987
7e6630a7 20988#: builtin/repack.c:639
90314792
JX
20989msgid "do not run git-update-server-info"
20990msgstr "不运行 git-update-server-info"
20991
7e6630a7 20992#: builtin/repack.c:642
90314792
JX
20993msgid "pass --local to git-pack-objects"
20994msgstr "向 git-pack-objects 传递参数 --local"
20995
7e6630a7 20996#: builtin/repack.c:644
6c94aba5
JX
20997msgid "write bitmap index"
20998msgstr "写 bitmap 索引"
20999
7e6630a7 21000#: builtin/repack.c:646
4c27fcb5
JX
21001msgid "pass --delta-islands to git-pack-objects"
21002msgstr "向 git-pack-objects 传递参数 --delta-islands"
21003
7e6630a7 21004#: builtin/repack.c:647
90314792
JX
21005msgid "approxidate"
21006msgstr "近似日期"
21007
7e6630a7 21008#: builtin/repack.c:648
90314792
JX
21009msgid "with -A, do not loosen objects older than this"
21010msgstr "使用 -A,不要将早于给定时间的对象过期"
21011
7e6630a7 21012#: builtin/repack.c:650
5c57d762
JX
21013msgid "with -a, repack unreachable objects"
21014msgstr "使用 -a ,重新对不可达对象打包"
21015
7e6630a7 21016#: builtin/repack.c:652
90314792
JX
21017msgid "size of the window used for delta compression"
21018msgstr "用于增量压缩的窗口值"
21019
7e6630a7 21020#: builtin/repack.c:653 builtin/repack.c:659
8376b58d
JX
21021msgid "bytes"
21022msgstr "字节"
21023
7e6630a7 21024#: builtin/repack.c:654
90314792
JX
21025msgid "same as the above, but limit memory size instead of entries count"
21026msgstr "和上面的相似,但限制内存大小而非条目数"
21027
7e6630a7 21028#: builtin/repack.c:656
90314792
JX
21029msgid "limits the maximum delta depth"
21030msgstr "限制最大增量深度"
21031
7e6630a7 21032#: builtin/repack.c:658
a4f16749
JX
21033msgid "limits the maximum number of threads"
21034msgstr "限制最大线程数"
21035
7e6630a7 21036#: builtin/repack.c:660
90314792 21037msgid "maximum size of each packfile"
dbd6cced 21038msgstr "每个包文件的最大尺寸"
90314792 21039
7e6630a7 21040#: builtin/repack.c:662
6c94aba5
JX
21041msgid "repack objects in packs marked with .keep"
21042msgstr "对标记为 .keep 的包中的对象重新打包"
21043
7e6630a7 21044#: builtin/repack.c:664
fd8cb379
JX
21045msgid "do not repack this pack"
21046msgstr "不要对该包文件重新打包"
21047
7e6630a7 21048#: builtin/repack.c:666
33b62fba
JX
21049msgid "find a geometric progression with factor <N>"
21050msgstr "使用因子 <n> 查找几何级数"
21051
7e6630a7
FZ
21052#: builtin/repack.c:668
21053msgid "write a multi-pack index of the resulting packs"
21054msgstr "写入结果包的多包索引"
21055
21056#: builtin/repack.c:678
94550ed3
JX
21057msgid "cannot delete packs in a precious-objects repo"
21058msgstr "不能删除珍品仓库中的打包文件"
21059
7e6630a7 21060#: builtin/repack.c:682
5c57d762
JX
21061msgid "--keep-unreachable and -A are incompatible"
21062msgstr "--keep-unreachable 和 -A 不兼容"
21063
7e6630a7 21064#: builtin/repack.c:713
33b62fba
JX
21065msgid "--geometric is incompatible with -A, -a"
21066msgstr "--geometric 和 -A、-a 不兼容"
21067
7e6630a7 21068#: builtin/repack.c:825
06991777
JX
21069msgid "Nothing new to pack."
21070msgstr "没有新的要打包。"
21071
7e6630a7 21072#: builtin/repack.c:855
06991777 21073#, c-format
d13389bf
JX
21074msgid "missing required file: %s"
21075msgstr "缺少需要的文件:%s"
06991777 21076
7e6630a7 21077#: builtin/repack.c:857
90314792 21078#, c-format
d13389bf
JX
21079msgid "could not unlink: %s"
21080msgstr "不能删除:%s"
90314792 21081
fd8cb379 21082#: builtin/replace.c:22
ef317cd5 21083msgid "git replace [-f] <object> <replacement>"
07432cef 21084msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 21085
fd8cb379 21086#: builtin/replace.c:23
6acbf033
JX
21087msgid "git replace [-f] --edit <object>"
21088msgstr "git replace [-f] --edit <对象>"
21089
fd8cb379 21090#: builtin/replace.c:24
6acbf033
JX
21091msgid "git replace [-f] --graft <commit> [<parent>...]"
21092msgstr "git replace [-f] --graft <提交> [<父提交>...]"
21093
fd8cb379
JX
21094#: builtin/replace.c:25
21095msgid "git replace [-f] --convert-graft-file"
21096msgstr "git replace [-f] --convert-graft-file"
21097
21098#: builtin/replace.c:26
ef317cd5 21099msgid "git replace -d <object>..."
07432cef 21100msgstr "git replace -d <对象>..."
ef317cd5 21101
fd8cb379 21102#: builtin/replace.c:27
cfff71a9
JX
21103msgid "git replace [--format=<format>] [-l [<pattern>]]"
21104msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 21105
d46c5519 21106#: builtin/replace.c:90
c1ac5258
JX
21107#, c-format
21108msgid ""
21109"invalid replace format '%s'\n"
21110"valid formats are 'short', 'medium' and 'long'"
21111msgstr ""
21112"无效的替换格式 '%s'\n"
21113"有效的格式有 'short'、'medium' 和 'long'"
21114
d46c5519 21115#: builtin/replace.c:125
c1ac5258
JX
21116#, c-format
21117msgid "replace ref '%s' not found"
21118msgstr "未发现替换引用 '%s'"
21119
d46c5519 21120#: builtin/replace.c:141
c1ac5258
JX
21121#, c-format
21122msgid "Deleted replace ref '%s'"
e640d114 21123msgstr "已删除替换引用 '%s'"
c1ac5258 21124
d46c5519 21125#: builtin/replace.c:153
c1ac5258
JX
21126#, c-format
21127msgid "'%s' is not a valid ref name"
21128msgstr "'%s' 不是一个有效的引用名"
21129
d46c5519 21130#: builtin/replace.c:158
c1ac5258
JX
21131#, c-format
21132msgid "replace ref '%s' already exists"
21133msgstr "替换引用 '%s' 已经存在"
21134
d46c5519 21135#: builtin/replace.c:178
c1ac5258
JX
21136#, c-format
21137msgid ""
21138"Objects must be of the same type.\n"
21139"'%s' points to a replaced object of type '%s'\n"
21140"while '%s' points to a replacement object of type '%s'."
21141msgstr ""
21142"对象必须属于同一类型。\n"
21143"'%s' 指向 '%s' 类型的替换对象\n"
21144"而 '%s' 指向 '%s' 类型的替换对象。"
21145
d46c5519 21146#: builtin/replace.c:229
c1ac5258
JX
21147#, c-format
21148msgid "unable to open %s for writing"
21149msgstr "无法为写入打开 %s"
21150
d46c5519 21151#: builtin/replace.c:242
c1ac5258
JX
21152msgid "cat-file reported failure"
21153msgstr "cat-file 报告失败"
21154
d46c5519 21155#: builtin/replace.c:258
c1ac5258
JX
21156#, c-format
21157msgid "unable to open %s for reading"
21158msgstr "无法为读取打开 %s"
21159
d46c5519 21160#: builtin/replace.c:272
c1ac5258
JX
21161msgid "unable to spawn mktree"
21162msgstr "无法启动 mktree"
21163
d46c5519 21164#: builtin/replace.c:276
c1ac5258
JX
21165msgid "unable to read from mktree"
21166msgstr "无法从 mktree 读取"
21167
d46c5519 21168#: builtin/replace.c:285
c1ac5258
JX
21169msgid "mktree reported failure"
21170msgstr "mktree 报告失败"
21171
d46c5519 21172#: builtin/replace.c:289
c1ac5258
JX
21173msgid "mktree did not return an object name"
21174msgstr "mktree 没有返回一个对象名"
21175
d46c5519 21176#: builtin/replace.c:298
c1ac5258
JX
21177#, c-format
21178msgid "unable to fstat %s"
21179msgstr "无法对 %s 执行 fstat"
21180
d46c5519 21181#: builtin/replace.c:303
c1ac5258
JX
21182msgid "unable to write object to database"
21183msgstr "无法向数据库写入对象"
21184
2b472aae
JX
21185#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
21186#: builtin/replace.c:454
c1ac5258
JX
21187#, c-format
21188msgid "not a valid object name: '%s'"
6acbf033
JX
21189msgstr "不是一个有效的对象名:'%s'"
21190
d46c5519 21191#: builtin/replace.c:326
c1ac5258
JX
21192#, c-format
21193msgid "unable to get object type for %s"
21194msgstr "无法得到 %s 的对象类型"
21195
d46c5519 21196#: builtin/replace.c:342
c1ac5258
JX
21197msgid "editing object file failed"
21198msgstr "编辑对象文件失败"
21199
d46c5519 21200#: builtin/replace.c:351
c1ac5258
JX
21201#, c-format
21202msgid "new object is the same as the old one: '%s'"
21203msgstr "新对象和旧对象相同:'%s'"
21204
a5cd71ca 21205#: builtin/replace.c:384
d46c5519
JX
21206#, c-format
21207msgid "could not parse %s as a commit"
21208msgstr "无法将 %s 解析为一个提交"
21209
2b472aae 21210#: builtin/replace.c:416
6acbf033
JX
21211#, c-format
21212msgid "bad mergetag in commit '%s'"
55a16ee4 21213msgstr "提交 '%s' 中含有损坏的合并标签"
6acbf033 21214
2b472aae 21215#: builtin/replace.c:418
6acbf033
JX
21216#, c-format
21217msgid "malformed mergetag in commit '%s'"
fd8cb379 21218msgstr "提交 '%s' 中含有格式错误的合并标签"
6acbf033 21219
2b472aae 21220#: builtin/replace.c:430
6acbf033
JX
21221#, c-format
21222msgid ""
21223"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
21224"instead of --graft"
55a16ee4 21225msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
6acbf033 21226
2b472aae 21227#: builtin/replace.c:469
6acbf033 21228#, c-format
c1ac5258
JX
21229msgid "the original commit '%s' has a gpg signature"
21230msgstr "原始提交 '%s' 中有一个 gpg 签名"
6acbf033 21231
2b472aae 21232#: builtin/replace.c:470
6acbf033
JX
21233msgid "the signature will be removed in the replacement commit!"
21234msgstr "在替换的提交中签名将被移除!"
21235
2b472aae 21236#: builtin/replace.c:480
6acbf033
JX
21237#, c-format
21238msgid "could not write replacement commit for: '%s'"
21239msgstr "不能为 '%s' 写替换提交"
21240
2b472aae 21241#: builtin/replace.c:488
c1ac5258
JX
21242#, c-format
21243msgid "graft for '%s' unnecessary"
21244msgstr "对 '%s' 移植没有必要"
21245
2b472aae 21246#: builtin/replace.c:492
c1ac5258
JX
21247#, c-format
21248msgid "new commit is the same as the old one: '%s'"
21249msgstr "新提交和旧的一样:'%s'"
21250
2b472aae 21251#: builtin/replace.c:527
fd8cb379
JX
21252#, c-format
21253msgid ""
21254"could not convert the following graft(s):\n"
21255"%s"
21256msgstr ""
21257"不能转换下列移植:\n"
21258"%s"
21259
2b472aae 21260#: builtin/replace.c:548
ef317cd5 21261msgid "list replace refs"
07432cef 21262msgstr "列出替换的引用"
ef317cd5 21263
2b472aae 21264#: builtin/replace.c:549
ef317cd5 21265msgid "delete replace refs"
07432cef 21266msgstr "删除替换的引用"
ef317cd5 21267
2b472aae 21268#: builtin/replace.c:550
6acbf033
JX
21269msgid "edit existing object"
21270msgstr "编辑现存的对象"
21271
2b472aae 21272#: builtin/replace.c:551
6acbf033
JX
21273msgid "change a commit's parents"
21274msgstr "修改一个提交的父提交"
21275
2b472aae 21276#: builtin/replace.c:552
fd8cb379
JX
21277msgid "convert existing graft file"
21278msgstr "转换现存的移植文件"
21279
2b472aae 21280#: builtin/replace.c:553
ef317cd5 21281msgid "replace the ref if it exists"
07432cef 21282msgstr "如果存在则替换引用"
ef317cd5 21283
2b472aae 21284#: builtin/replace.c:555
6acbf033
JX
21285msgid "do not pretty-print contents for --edit"
21286msgstr "不要为 --edit 操作美观显示内容"
21287
2b472aae 21288#: builtin/replace.c:556
cfff71a9
JX
21289msgid "use this format"
21290msgstr "使用此格式"
21291
2b472aae 21292#: builtin/replace.c:569
c1ac5258 21293msgid "--format cannot be used when not listing"
e640d114 21294msgstr "不列出时不能使用 --format"
c1ac5258 21295
2b472aae 21296#: builtin/replace.c:577
c1ac5258
JX
21297msgid "-f only makes sense when writing a replacement"
21298msgstr "只有写一个替换时 -f 才有意义"
21299
2b472aae 21300#: builtin/replace.c:581
c1ac5258
JX
21301msgid "--raw only makes sense with --edit"
21302msgstr "--raw 只有和 --edit 共用才有意义"
21303
2b472aae 21304#: builtin/replace.c:587
c1ac5258
JX
21305msgid "-d needs at least one argument"
21306msgstr "-d 需要至少一个参数"
21307
2b472aae 21308#: builtin/replace.c:593
c1ac5258
JX
21309msgid "bad number of arguments"
21310msgstr "错误的参数个数"
21311
2b472aae 21312#: builtin/replace.c:599
c1ac5258 21313msgid "-e needs exactly one argument"
e640d114 21314msgstr "-e 需要且仅需要一个参数"
c1ac5258 21315
2b472aae 21316#: builtin/replace.c:605
c1ac5258
JX
21317msgid "-g needs at least one argument"
21318msgstr "-g 需要至少一个参数"
21319
2b472aae 21320#: builtin/replace.c:611
c1ac5258
JX
21321msgid "--convert-graft-file takes no argument"
21322msgstr "--convert-graft-file 不带参数"
21323
2b472aae 21324#: builtin/replace.c:617
c1ac5258
JX
21325msgid "only one pattern can be given with -l"
21326msgstr "只能为 -l 提供一个模式"
21327
a4f16749 21328#: builtin/rerere.c:13
814ff314
JX
21329msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
21330msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
ef317cd5 21331
ec3d4607 21332#: builtin/rerere.c:58
ef317cd5 21333msgid "register clean resolutions in index"
07432cef 21334msgstr "在索引中注册干净的解决方案"
ef317cd5 21335
ec3d4607 21336#: builtin/rerere.c:77
4c27fcb5
JX
21337msgid "'git rerere forget' without paths is deprecated"
21338msgstr "没有路径的 'git rerere forget' 已经过时"
21339
ec3d4607 21340#: builtin/rerere.c:111
4c27fcb5
JX
21341#, c-format
21342msgid "unable to generate diff for '%s'"
21343msgstr "无法为 '%s' 生成差异"
21344
06991777 21345#: builtin/reset.c:32
ef317cd5
JX
21346msgid ""
21347"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 21348msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5 21349
06991777 21350#: builtin/reset.c:33
ddc12c42
JX
21351msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
21352msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..."
ef317cd5 21353
06991777 21354#: builtin/reset.c:34
ddc12c42
JX
21355msgid ""
21356"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
2b472aae 21357msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]"
ef317cd5 21358
ddc12c42
JX
21359#: builtin/reset.c:35
21360msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
21361msgstr "git reset --patch [<树对象>] [--] [<路径表达式>...]"
21362
21363#: builtin/reset.c:41
c04f5ac3
JX
21364msgid "mixed"
21365msgstr "混杂"
21366
ddc12c42 21367#: builtin/reset.c:41
c04f5ac3
JX
21368msgid "soft"
21369msgstr "软性"
21370
ddc12c42 21371#: builtin/reset.c:41
c04f5ac3
JX
21372msgid "hard"
21373msgstr "硬性"
21374
ddc12c42 21375#: builtin/reset.c:41
8ada9598
JX
21376msgid "merge"
21377msgstr "合并"
21378
ddc12c42 21379#: builtin/reset.c:41
c04f5ac3
JX
21380msgid "keep"
21381msgstr "保持"
21382
7e6630a7 21383#: builtin/reset.c:89
c04f5ac3
JX
21384msgid "You do not have a valid HEAD."
21385msgstr "您没有一个有效的 HEAD。"
21386
7e6630a7 21387#: builtin/reset.c:91
c04f5ac3
JX
21388msgid "Failed to find tree of HEAD."
21389msgstr "无法找到 HEAD 指向的树。"
21390
7e6630a7 21391#: builtin/reset.c:97
c04f5ac3
JX
21392#, c-format
21393msgid "Failed to find tree of %s."
21394msgstr "无法找到 %s 指向的树。"
21395
7e6630a7 21396#: builtin/reset.c:122
a5cd71ca
JX
21397#, c-format
21398msgid "HEAD is now at %s"
21399msgstr "HEAD 现在位于 %s"
21400
90e6ef53 21401# 译者:汉字之间无空格,故删除%s前后空格
7e6630a7 21402#: builtin/reset.c:201
c04f5ac3
JX
21403#, c-format
21404msgid "Cannot do a %s reset in the middle of a merge."
21405msgstr "在合并过程中不能做%s重置操作。"
21406
7e6630a7
FZ
21407#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
21408#: builtin/stash.c:703
ef317cd5 21409msgid "be quiet, only report errors"
07432cef 21410msgstr "安静模式,只报告错误"
ef317cd5 21411
7e6630a7 21412#: builtin/reset.c:303
ef317cd5 21413msgid "reset HEAD and index"
07432cef 21414msgstr "重置 HEAD 和索引"
ef317cd5 21415
7e6630a7 21416#: builtin/reset.c:304
ef317cd5 21417msgid "reset only HEAD"
07432cef 21418msgstr "只重置 HEAD"
ef317cd5 21419
7e6630a7 21420#: builtin/reset.c:306 builtin/reset.c:308
ef317cd5 21421msgid "reset HEAD, index and working tree"
07432cef 21422msgstr "重置 HEAD、索引和工作区"
ef317cd5 21423
7e6630a7 21424#: builtin/reset.c:310
ef317cd5 21425msgid "reset HEAD but keep local changes"
07432cef 21426msgstr "重置 HEAD 但保存本地变更"
ef317cd5 21427
7e6630a7 21428#: builtin/reset.c:316
6c94aba5
JX
21429msgid "record only the fact that removed paths will be added later"
21430msgstr "将删除的路径标记为稍后添加"
21431
7e6630a7 21432#: builtin/reset.c:350
07432cef
WS
21433#, c-format
21434msgid "Failed to resolve '%s' as a valid revision."
21435msgstr "无法将 '%s' 解析为一个有效的版本。"
21436
7e6630a7 21437#: builtin/reset.c:358
07432cef
WS
21438#, c-format
21439msgid "Failed to resolve '%s' as a valid tree."
21440msgstr "无法将 '%s' 解析为一个有效的树对象。"
21441
7e6630a7 21442#: builtin/reset.c:367
c04f5ac3 21443msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 21444msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 21445
7e6630a7 21446#: builtin/reset.c:377
c04f5ac3 21447msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
d9d56b23 21448msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
c04f5ac3 21449
90e6ef53 21450# 译者:汉字之间无空格,故删除%s前后空格
7e6630a7 21451#: builtin/reset.c:379
c04f5ac3
JX
21452#, c-format
21453msgid "Cannot do %s reset with paths."
21454msgstr "不能带路径进行%s重置。"
21455
90e6ef53 21456# 译者:汉字之间无空格,故删除%s前后空格
7e6630a7 21457#: builtin/reset.c:394
c04f5ac3
JX
21458#, c-format
21459msgid "%s reset is not allowed in a bare repository"
160fb2b2 21460msgstr "不能对纯仓库进行%s重置"
c04f5ac3 21461
7e6630a7 21462#: builtin/reset.c:398
6c94aba5
JX
21463msgid "-N can only be used with --mixed"
21464msgstr "-N 只能和 --mixed 同时使用"
21465
7e6630a7 21466#: builtin/reset.c:419
90314792 21467msgid "Unstaged changes after reset:"
160fb2b2 21468msgstr "重置后取消暂存的变更:"
90314792 21469
7e6630a7 21470#: builtin/reset.c:422
4c27fcb5
JX
21471#, c-format
21472msgid ""
21473"\n"
21474"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
21475"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
21476"to make this the default.\n"
21477msgstr ""
21478"\n"
21479"重置后,枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n"
21480"将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n"
21481
7e6630a7 21482#: builtin/reset.c:440
ef317cd5
JX
21483#, c-format
21484msgid "Could not reset index file to revision '%s'."
21485msgstr "不能重置索引文件至版本 '%s'。"
21486
7e6630a7 21487#: builtin/reset.c:445
07432cef
WS
21488msgid "Could not write new index file."
21489msgstr "不能写入新的索引文件。"
21490
ec3d4607 21491#: builtin/rev-list.c:541
31e5e17b
JX
21492msgid "cannot combine --exclude-promisor-objects and --missing"
21493msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
21494
ec3d4607 21495#: builtin/rev-list.c:602
5809aa05
JX
21496msgid "object filtering requires --objects"
21497msgstr "对象过滤需要 --objects"
21498
ec3d4607 21499#: builtin/rev-list.c:674
1b7f4a34
JX
21500msgid "rev-list does not support display of notes"
21501msgstr "rev-list 不支持显示注解"
21502
ec3d4607 21503#: builtin/rev-list.c:679
2b472aae
JX
21504msgid "marked counting is incompatible with --objects"
21505msgstr "标记计数和 --objects 不兼容"
5809aa05 21506
349ede6a 21507#: builtin/rev-parse.c:409
814ff314
JX
21508msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
21509msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
ef317cd5 21510
349ede6a 21511#: builtin/rev-parse.c:414
ef317cd5 21512msgid "keep the `--` passed as an arg"
07432cef 21513msgstr "保持 `--` 作为一个参数传递"
ef317cd5 21514
349ede6a 21515#: builtin/rev-parse.c:416
ef317cd5 21516msgid "stop parsing after the first non-option argument"
07432cef 21517msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 21518
349ede6a 21519#: builtin/rev-parse.c:419
cfff71a9
JX
21520msgid "output in stuck long form"
21521msgstr "以固定长格式输出"
21522
ec3d4607
JX
21523#: builtin/rev-parse.c:438
21524msgid "premature end of input"
21525msgstr "输入过早结束"
21526
21527#: builtin/rev-parse.c:442
21528msgid "no usage string given before the `--' separator"
21529msgstr "在 `--' 分隔符之前没有给出使用方法字符串"
21530
21531#: builtin/rev-parse.c:548
21532msgid "Needed a single revision"
21533msgstr "需要一个单独的版本"
21534
349ede6a 21535#: builtin/rev-parse.c:552
ef317cd5 21536msgid ""
814ff314 21537"git rev-parse --parseopt [<options>] -- [<args>...]\n"
ef317cd5 21538" or: git rev-parse --sq-quote [<arg>...]\n"
814ff314 21539" or: git rev-parse [<options>] [<arg>...]\n"
ef317cd5
JX
21540"\n"
21541"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
21542msgstr ""
814ff314 21543"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
90314792 21544" 或者:git rev-parse --sq-quote [<参数>...]\n"
814ff314 21545" 或者:git rev-parse [<选项>] [<参数>...]\n"
07432cef
WS
21546"\n"
21547"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5 21548
ec3d4607
JX
21549#: builtin/rev-parse.c:712
21550msgid "--resolve-git-dir requires an argument"
21551msgstr "--resolve-git-dir 需要一个参数"
21552
21553#: builtin/rev-parse.c:715
21554#, c-format
21555msgid "not a gitdir '%s'"
21556msgstr "不是一个git目录 '%s'"
21557
21558#: builtin/rev-parse.c:739
21559msgid "--git-path requires an argument"
21560msgstr "--git-path 需要一个参数"
21561
21562#: builtin/rev-parse.c:749
21563msgid "-n requires an argument"
21564msgstr "-n 需要一个参数"
21565
21566#: builtin/rev-parse.c:763
21567msgid "--path-format requires an argument"
21568msgstr "--path-format 需要一个参数"
21569
21570#: builtin/rev-parse.c:769
21571#, c-format
21572msgid "unknown argument to --path-format: %s"
21573msgstr "未知的 --path-format 参数:%s"
21574
21575#: builtin/rev-parse.c:776
21576msgid "--default requires an argument"
21577msgstr "--default 需要一个参数"
21578
21579#: builtin/rev-parse.c:782
21580msgid "--prefix requires an argument"
21581msgstr "--prefix 需要一个参数"
21582
21583#: builtin/rev-parse.c:851
21584#, c-format
21585msgid "unknown mode for --abbrev-ref: %s"
21586msgstr "未知的 --abbrev-ref 模式:%s"
21587
21588#: builtin/rev-parse.c:1023
21589#, c-format
21590msgid "unknown mode for --show-object-format: %s"
21591msgstr "未知的 --show-object-format 模式:%s"
21592
c1ac5258 21593#: builtin/revert.c:24
814ff314
JX
21594msgid "git revert [<options>] <commit-ish>..."
21595msgstr "git revert [<选项>] <提交号>..."
ef317cd5 21596
c1ac5258 21597#: builtin/revert.c:25
ef317cd5 21598msgid "git revert <subcommand>"
07432cef 21599msgstr "git revert <子命令>"
ef317cd5 21600
c1ac5258 21601#: builtin/revert.c:30
814ff314
JX
21602msgid "git cherry-pick [<options>] <commit-ish>..."
21603msgstr "git cherry-pick [<选项>] <提交号>..."
ef317cd5 21604
c1ac5258 21605#: builtin/revert.c:31
ef317cd5 21606msgid "git cherry-pick <subcommand>"
07432cef 21607msgstr "git cherry-pick <子命令>"
ef317cd5 21608
06991777
JX
21609#: builtin/revert.c:72
21610#, c-format
21611msgid "option `%s' expects a number greater than zero"
21612msgstr "选项 `%s' 期望一个大于零的数字"
21613
21614#: builtin/revert.c:92
ef317cd5
JX
21615#, c-format
21616msgid "%s: %s cannot be used with %s"
21617msgstr "%s:%s 不能和 %s 同时使用"
21618
d46c5519 21619#: builtin/revert.c:102
ef317cd5 21620msgid "end revert or cherry-pick sequence"
07432cef 21621msgstr "终止反转或拣选操作"
ef317cd5 21622
d46c5519 21623#: builtin/revert.c:103
ef317cd5 21624msgid "resume revert or cherry-pick sequence"
07432cef 21625msgstr "继续反转或拣选操作"
ef317cd5 21626
d46c5519 21627#: builtin/revert.c:104
ef317cd5 21628msgid "cancel revert or cherry-pick sequence"
07432cef 21629msgstr "取消反转或拣选操作"
ef317cd5 21630
a6cd2cc4
JX
21631#: builtin/revert.c:105
21632msgid "skip current commit and continue"
21633msgstr "跳过当前提交并继续"
21634
21635#: builtin/revert.c:107
ef317cd5 21636msgid "don't automatically commit"
07432cef 21637msgstr "不要自动提交"
ef317cd5 21638
a6cd2cc4 21639#: builtin/revert.c:108
ef317cd5 21640msgid "edit the commit message"
07432cef 21641msgstr "编辑提交说明"
ef317cd5 21642
a6cd2cc4 21643#: builtin/revert.c:111
87cb7997 21644msgid "parent-number"
07432cef 21645msgstr "父编号"
ef317cd5 21646
a6cd2cc4 21647#: builtin/revert.c:112
87cb7997
JX
21648msgid "select mainline parent"
21649msgstr "选择主干父提交编号"
21650
a6cd2cc4 21651#: builtin/revert.c:114
ef317cd5 21652msgid "merge strategy"
07432cef 21653msgstr "合并策略"
ef317cd5 21654
a6cd2cc4 21655#: builtin/revert.c:116
ef317cd5 21656msgid "option for merge strategy"
07432cef 21657msgstr "合并策略的选项"
ef317cd5 21658
a6cd2cc4 21659#: builtin/revert.c:125
ef317cd5 21660msgid "append commit name"
07432cef 21661msgstr "追加提交名称"
ef317cd5 21662
a6cd2cc4 21663#: builtin/revert.c:127
ef317cd5 21664msgid "preserve initially empty commits"
07432cef 21665msgstr "保留初始化的空提交"
ef317cd5 21666
7e6630a7
FZ
21667#: builtin/revert.c:128
21668msgid "allow commits with empty messages"
21669msgstr "允许提交说明为空"
21670
a6cd2cc4 21671#: builtin/revert.c:129
ef317cd5 21672msgid "keep redundant, empty commits"
07432cef 21673msgstr "保持多余的、空的提交"
ef317cd5 21674
7e6630a7 21675#: builtin/revert.c:241
c04f5ac3
JX
21676msgid "revert failed"
21677msgstr "还原失败"
21678
7e6630a7 21679#: builtin/revert.c:254
c04f5ac3
JX
21680msgid "cherry-pick failed"
21681msgstr "拣选失败"
21682
33b62fba 21683#: builtin/rm.c:20
814ff314
JX
21684msgid "git rm [<options>] [--] <file>..."
21685msgstr "git rm [<选项>] [--] <文件>..."
07432cef 21686
33b62fba 21687#: builtin/rm.c:208
c04f5ac3 21688msgid ""
2e8451e8
JX
21689"the following file has staged content different from both the\n"
21690"file and the HEAD:"
21691msgid_plural ""
21692"the following files have staged content different from both the\n"
21693"file and the HEAD:"
21694msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
21695msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
21696
33b62fba 21697#: builtin/rm.c:213
2e8451e8
JX
21698msgid ""
21699"\n"
c04f5ac3
JX
21700"(use -f to force removal)"
21701msgstr ""
2e8451e8 21702"\n"
c04f5ac3
JX
21703"(使用 -f 强制删除)"
21704
33b62fba 21705#: builtin/rm.c:217
2e8451e8
JX
21706msgid "the following file has changes staged in the index:"
21707msgid_plural "the following files have changes staged in the index:"
160fb2b2
JX
21708msgstr[0] "下列文件索引中有变更"
21709msgstr[1] "下列文件索引中有变更"
c04f5ac3 21710
33b62fba 21711#: builtin/rm.c:221 builtin/rm.c:230
c04f5ac3 21712msgid ""
2e8451e8 21713"\n"
c04f5ac3
JX
21714"(use --cached to keep the file, or -f to force removal)"
21715msgstr ""
2e8451e8
JX
21716"\n"
21717"(使用 --cached 保留本地文件,或用 -f 强制删除)"
21718
33b62fba 21719#: builtin/rm.c:227
2e8451e8
JX
21720msgid "the following file has local modifications:"
21721msgid_plural "the following files have local modifications:"
21722msgstr[0] "如下文件有本地修改:"
21723msgstr[1] "如下文件有本地修改:"
c04f5ac3 21724
7e6630a7 21725#: builtin/rm.c:245
ef317cd5 21726msgid "do not list removed files"
07432cef 21727msgstr "不列出删除的文件"
ef317cd5 21728
7e6630a7 21729#: builtin/rm.c:246
ef317cd5 21730msgid "only remove from the index"
07432cef 21731msgstr "只从索引区删除"
ef317cd5 21732
7e6630a7 21733#: builtin/rm.c:247
ef317cd5 21734msgid "override the up-to-date check"
07432cef 21735msgstr "忽略文件更新状态检查"
ef317cd5 21736
7e6630a7 21737#: builtin/rm.c:248
ef317cd5 21738msgid "allow recursive removal"
07432cef 21739msgstr "允许递归删除"
ef317cd5 21740
7e6630a7 21741#: builtin/rm.c:250
ef317cd5 21742msgid "exit with a zero status even if nothing matched"
07432cef 21743msgstr "即使没有匹配,也以零状态退出"
ef317cd5 21744
7e6630a7 21745#: builtin/rm.c:285
2b472aae 21746msgid "No pathspec was given. Which files should I remove?"
440e7442 21747msgstr "没有提供路径规格。我应该删除哪些文件?"
2b472aae 21748
7e6630a7 21749#: builtin/rm.c:315
c1ac5258
JX
21750msgid "please stage your changes to .gitmodules or stash them to proceed"
21751msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
21752
7e6630a7 21753#: builtin/rm.c:337
c04f5ac3
JX
21754#, c-format
21755msgid "not removing '%s' recursively without -r"
21756msgstr "未提供 -r 选项不会递归删除 '%s'"
21757
7e6630a7 21758#: builtin/rm.c:385
c04f5ac3
JX
21759#, c-format
21760msgid "git rm: unable to remove %s"
21761msgstr "git rm:不能删除 %s"
21762
fd8cb379 21763#: builtin/send-pack.c:20
1b7f4a34 21764msgid ""
7e6630a7
FZ
21765"git send-pack [--mirror] [--dry-run] [--force]\n"
21766" [--receive-pack=<git-receive-pack>]\n"
21767" [--verbose] [--thin] [--atomic]\n"
21768" [<host>:]<directory> (--all | <ref>...)"
1b7f4a34 21769msgstr ""
7e6630a7
FZ
21770"git send-pack [--mirror] [--dry-run] [--force]\n"
21771" [--receive-pack=<git-receive-pack>]\n"
21772" [--verbose] [--thin] [--atomic]\n"
21773" [<主机>:]<目录> (--all | <引用>...)"
1b7f4a34 21774
7e6630a7 21775#: builtin/send-pack.c:192
1b7f4a34
JX
21776msgid "remote name"
21777msgstr "远程名称"
21778
7e6630a7 21779#: builtin/send-pack.c:205
1b7f4a34
JX
21780msgid "use stateless RPC protocol"
21781msgstr "使用无状态的 RPC 协议"
21782
7e6630a7 21783#: builtin/send-pack.c:206
1b7f4a34
JX
21784msgid "read refs from stdin"
21785msgstr "从标准输入读取引用"
21786
7e6630a7 21787#: builtin/send-pack.c:207
1b7f4a34
JX
21788msgid "print status from remote helper"
21789msgstr "打印来自远程 helper 的状态"
21790
d13389bf 21791#: builtin/shortlog.c:16
fd8cb379
JX
21792msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
21793msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
21794
d13389bf 21795#: builtin/shortlog.c:17
fd8cb379
JX
21796msgid "git log --pretty=short | git shortlog [<options>]"
21797msgstr "git log --pretty=short | git shortlog [<选项>]"
ef317cd5 21798
473eb541 21799#: builtin/shortlog.c:123
d9488fea
JX
21800msgid "using multiple --group options with stdin is not supported"
21801msgstr "不支持和标准输入一起使用多个 --group 选项"
21802
473eb541 21803#: builtin/shortlog.c:133
d9488fea
JX
21804msgid "using --group=trailer with stdin is not supported"
21805msgstr "不支持和标准输入一起使用 --group=trailer"
21806
473eb541 21807#: builtin/shortlog.c:323
d9488fea
JX
21808#, c-format
21809msgid "unknown group type: %s"
21810msgstr "未知分组类型:%s"
21811
473eb541
JX
21812#: builtin/shortlog.c:351
21813msgid "group by committer rather than author"
21814msgstr "按照提交者而不是作者分组"
1a79b2f1 21815
473eb541 21816#: builtin/shortlog.c:354
ef317cd5 21817msgid "sort output according to the number of commits per author"
07432cef 21818msgstr "根据每个作者的提交数量排序"
ef317cd5 21819
473eb541
JX
21820#: builtin/shortlog.c:356
21821msgid "suppress commit descriptions, only provides commit count"
21822msgstr "抑制提交描述,只提供提交数量"
ef317cd5 21823
473eb541
JX
21824#: builtin/shortlog.c:358
21825msgid "show the email address of each author"
07432cef 21826msgstr "显示每个作者的电子邮件地址"
ef317cd5 21827
473eb541 21828#: builtin/shortlog.c:359
c1ac5258
JX
21829msgid "<w>[,<i1>[,<i2>]]"
21830msgstr "<w>[,<i1>[,<i2>]]"
ef317cd5 21831
473eb541
JX
21832#: builtin/shortlog.c:360
21833msgid "linewrap output"
07432cef 21834msgstr "折行输出"
ef317cd5 21835
473eb541 21836#: builtin/shortlog.c:362
d9488fea
JX
21837msgid "field"
21838msgstr "字段"
21839
473eb541
JX
21840#: builtin/shortlog.c:363
21841msgid "group by field"
d9488fea
JX
21842msgstr "按字段分组"
21843
7e6630a7 21844#: builtin/shortlog.c:394
fd8cb379
JX
21845msgid "too many arguments given outside repository"
21846msgstr "仓库外执行提供了太多的参数"
21847
c1ac5258 21848#: builtin/show-branch.c:13
ef317cd5 21849msgid ""
814ff314 21850"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
7e6630a7
FZ
21851" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
21852" [--more=<n> | --list | --independent | --merge-base]\n"
21853" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
ef317cd5 21854msgstr ""
814ff314 21855"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
7e6630a7
FZ
21856" [--current] [--color[=<何时>] | --no-color] [--sparse]\n"
21857" [--more=<n> | --list | --independent | --merge-base]\n"
21858" [--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
ef317cd5 21859
c1ac5258 21860#: builtin/show-branch.c:17
814ff314 21861msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
58b6f078 21862msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
ef317cd5 21863
c1ac5258 21864#: builtin/show-branch.c:395
a0b6b246
JX
21865#, c-format
21866msgid "ignoring %s; cannot handle more than %d ref"
21867msgid_plural "ignoring %s; cannot handle more than %d refs"
21868msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
21869msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
21870
7e6630a7 21871#: builtin/show-branch.c:547
a0b6b246
JX
21872#, c-format
21873msgid "no matching refs with %s"
21874msgstr "没有和 %s 匹配的引用"
21875
7e6630a7 21876#: builtin/show-branch.c:644
ef317cd5 21877msgid "show remote-tracking and local branches"
07432cef 21878msgstr "显示远程跟踪的和本地的分支"
ef317cd5 21879
7e6630a7 21880#: builtin/show-branch.c:646
ef317cd5 21881msgid "show remote-tracking branches"
07432cef 21882msgstr "显示远程跟踪的分支"
ef317cd5 21883
7e6630a7 21884#: builtin/show-branch.c:648
ef317cd5 21885msgid "color '*!+-' corresponding to the branch"
07432cef 21886msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 21887
7e6630a7 21888#: builtin/show-branch.c:650
ef317cd5 21889msgid "show <n> more commits after the common ancestor"
07432cef 21890msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 21891
7e6630a7 21892#: builtin/show-branch.c:652
ef317cd5 21893msgid "synonym to more=-1"
07432cef 21894msgstr "和 more=-1 同义"
ef317cd5 21895
7e6630a7 21896#: builtin/show-branch.c:653
ef317cd5 21897msgid "suppress naming strings"
07432cef 21898msgstr "不显示字符串命名"
ef317cd5 21899
7e6630a7 21900#: builtin/show-branch.c:655
ef317cd5 21901msgid "include the current branch"
07432cef 21902msgstr "包括当前分支"
ef317cd5 21903
7e6630a7 21904#: builtin/show-branch.c:657
ef317cd5 21905msgid "name commits with their object names"
07432cef 21906msgstr "以对象名字命名提交"
ef317cd5 21907
7e6630a7 21908#: builtin/show-branch.c:659
ef317cd5 21909msgid "show possible merge bases"
07432cef 21910msgstr "显示可能合并的基线"
ef317cd5 21911
7e6630a7 21912#: builtin/show-branch.c:661
ef317cd5 21913msgid "show refs unreachable from any other ref"
07432cef 21914msgstr "显示没有任何引用的的引用"
ef317cd5 21915
7e6630a7 21916#: builtin/show-branch.c:663
ef317cd5 21917msgid "show commits in topological order"
07432cef 21918msgstr "以拓扑顺序显示提交"
ef317cd5 21919
7e6630a7 21920#: builtin/show-branch.c:666
ef317cd5 21921msgid "show only commits not on the first branch"
07432cef 21922msgstr "只显示不在第一个分支上的提交"
ef317cd5 21923
7e6630a7 21924#: builtin/show-branch.c:668
ef317cd5 21925msgid "show merges reachable from only one tip"
07432cef 21926msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 21927
7e6630a7 21928#: builtin/show-branch.c:670
2e8451e8
JX
21929msgid "topologically sort, maintaining date order where possible"
21930msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 21931
7e6630a7 21932#: builtin/show-branch.c:673
ef317cd5 21933msgid "<n>[,<base>]"
07432cef 21934msgstr "<n>[,<base>]"
ef317cd5 21935
7e6630a7 21936#: builtin/show-branch.c:674
ef317cd5 21937msgid "show <n> most recent ref-log entries starting at base"
58b6f078 21938msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
ef317cd5 21939
7e6630a7 21940#: builtin/show-branch.c:710
a0b6b246
JX
21941msgid ""
21942"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
21943msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
21944
7e6630a7 21945#: builtin/show-branch.c:734
a0b6b246
JX
21946msgid "no branches given, and HEAD is not valid"
21947msgstr "未提供分支,且 HEAD 无效"
21948
7e6630a7 21949#: builtin/show-branch.c:737
a0b6b246
JX
21950msgid "--reflog option needs one branch name"
21951msgstr "选项 --reflog 需要一个分支名"
21952
7e6630a7 21953#: builtin/show-branch.c:740
a0b6b246
JX
21954#, c-format
21955msgid "only %d entry can be shown at one time."
21956msgid_plural "only %d entries can be shown at one time."
21957msgstr[0] "一次只能显示 %d 个条目。"
21958msgstr[1] "一次只能显示 %d 个条目。"
21959
7e6630a7 21960#: builtin/show-branch.c:744
a0b6b246
JX
21961#, c-format
21962msgid "no such ref %s"
21963msgstr "无此引用 %s"
21964
7e6630a7 21965#: builtin/show-branch.c:828
a0b6b246
JX
21966#, c-format
21967msgid "cannot handle more than %d rev."
21968msgid_plural "cannot handle more than %d revs."
21969msgstr[0] "不能处理 %d 个以上的版本。"
21970msgstr[1] "不能处理 %d 个以上的版本。"
21971
7e6630a7 21972#: builtin/show-branch.c:832
a0b6b246
JX
21973#, c-format
21974msgid "'%s' is not a valid ref."
21975msgstr "'%s' 不是一个有效的引用。"
21976
7e6630a7 21977#: builtin/show-branch.c:835
a0b6b246
JX
21978#, c-format
21979msgid "cannot find commit %s (%s)"
29004bbb 21980msgstr "不能找到提交 %s(%s)"
a0b6b246 21981
7157c2b5
JX
21982#: builtin/show-index.c:21
21983msgid "hash-algorithm"
21984msgstr "哈希算法"
21985
21986#: builtin/show-index.c:31
21987msgid "Unknown hash algorithm"
21988msgstr "未知的哈希算法"
21989
d46c5519 21990#: builtin/show-ref.c:12
ef317cd5 21991msgid ""
814ff314
JX
21992"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
21993"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
ef317cd5 21994msgstr ""
814ff314
JX
21995"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
21996"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
ef317cd5 21997
d46c5519 21998#: builtin/show-ref.c:13
94550ed3
JX
21999msgid "git show-ref --exclude-existing[=<pattern>]"
22000msgstr "git show-ref --exclude-existing[=<模式>]"
ef317cd5 22001
d46c5519 22002#: builtin/show-ref.c:162
ef317cd5 22003msgid "only show tags (can be combined with heads)"
55a16ee4 22004msgstr "只显示标签(可以和头共用)"
ef317cd5 22005
d46c5519 22006#: builtin/show-ref.c:163
ef317cd5 22007msgid "only show heads (can be combined with tags)"
55a16ee4 22008msgstr "只显示头(可以和标签共用)"
ef317cd5 22009
d46c5519 22010#: builtin/show-ref.c:164
ef317cd5 22011msgid "stricter reference checking, requires exact ref path"
07432cef 22012msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 22013
d46c5519 22014#: builtin/show-ref.c:167 builtin/show-ref.c:169
2e8451e8
JX
22015msgid "show the HEAD reference, even if it would be filtered out"
22016msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 22017
d46c5519 22018#: builtin/show-ref.c:171
ef317cd5 22019msgid "dereference tags into object IDs"
4375c10e 22020msgstr "转换标签到对象 ID"
ef317cd5 22021
d46c5519
JX
22022#: builtin/show-ref.c:173
22023msgid "only show SHA1 hash using <n> digits"
22024msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
22025
22026#: builtin/show-ref.c:177
22027msgid "do not print results to stdout (useful with --verify)"
22028msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
22029
22030#: builtin/show-ref.c:179
22031msgid "show refs from stdin that aren't in local repository"
22032msgstr "显示从标准输入中读入的不在本地仓库中的引用"
22033
33b62fba 22034#: builtin/sparse-checkout.c:22
349ede6a
JX
22035msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
22036msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <选项>"
ddc12c42 22037
33b62fba 22038#: builtin/sparse-checkout.c:46
d9488fea
JX
22039msgid "git sparse-checkout list"
22040msgstr "git sparse-checkout list"
22041
33b62fba 22042#: builtin/sparse-checkout.c:72
ddc12c42
JX
22043msgid "this worktree is not sparse (sparse-checkout file may not exist)"
22044msgstr "本工作区不是稀疏模式(稀疏检出文件可能不存在)"
22045
7e6630a7
FZ
22046#: builtin/sparse-checkout.c:173
22047#, c-format
22048msgid ""
22049"directory '%s' contains untracked files, but is not in the sparse-checkout "
22050"cone"
22051msgstr "目录 '%s' 包括了未跟踪文件,但不在稀疏检出 cone 中"
22052
22053#: builtin/sparse-checkout.c:181
22054#, c-format
22055msgid "failed to remove directory '%s'"
22056msgstr "无法删除目录 '%s'"
22057
22058#: builtin/sparse-checkout.c:321
2b472aae
JX
22059msgid "failed to create directory for sparse-checkout file"
22060msgstr "无法为稀疏检出文件创建目录"
22061
7e6630a7 22062#: builtin/sparse-checkout.c:362
7157c2b5
JX
22063msgid "unable to upgrade repository format to enable worktreeConfig"
22064msgstr "无法升级仓库格式以启用 worktreeConfig"
22065
7e6630a7 22066#: builtin/sparse-checkout.c:364
ddc12c42
JX
22067msgid "failed to set extensions.worktreeConfig setting"
22068msgstr "无法设置 extensions.worktreeConfig"
22069
7e6630a7 22070#: builtin/sparse-checkout.c:384
33b62fba
JX
22071msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
22072msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
ddc12c42 22073
7e6630a7 22074#: builtin/sparse-checkout.c:404
ddc12c42
JX
22075msgid "initialize the sparse-checkout in cone mode"
22076msgstr "初始化稀疏检出为 cone 模式"
22077
7e6630a7 22078#: builtin/sparse-checkout.c:406
33b62fba
JX
22079msgid "toggle the use of a sparse index"
22080msgstr "切换稀疏索引的使用"
22081
7e6630a7 22082#: builtin/sparse-checkout.c:434
33b62fba
JX
22083msgid "failed to modify sparse-index config"
22084msgstr "无法修改 sparse-index 配置"
22085
7e6630a7 22086#: builtin/sparse-checkout.c:455
ddc12c42
JX
22087#, c-format
22088msgid "failed to open '%s'"
22089msgstr "无法打开 '%s'"
22090
7e6630a7 22091#: builtin/sparse-checkout.c:507
2b472aae
JX
22092#, c-format
22093msgid "could not normalize path %s"
22094msgstr "无法规范化路径 %s"
22095
7e6630a7 22096#: builtin/sparse-checkout.c:519
2b472aae
JX
22097msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
22098msgstr "git sparse-checkout (set|add) (--stdin | <模式>)"
22099
7e6630a7 22100#: builtin/sparse-checkout.c:544
2b472aae
JX
22101#, c-format
22102msgid "unable to unquote C-style string '%s'"
440e7442 22103msgstr "无法为 C 语言风格的字符串 '%s' 去引号"
2b472aae 22104
7e6630a7 22105#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
2b472aae
JX
22106msgid "unable to load existing sparse-checkout patterns"
22107msgstr "无法加载现存的稀疏检出模式"
ddc12c42 22108
7e6630a7 22109#: builtin/sparse-checkout.c:667
ddc12c42
JX
22110msgid "read patterns from standard in"
22111msgstr "从标准输入读取模式"
22112
7e6630a7 22113#: builtin/sparse-checkout.c:682
d9488fea
JX
22114msgid "git sparse-checkout reapply"
22115msgstr "git sparse-checkout reapply"
22116
7e6630a7 22117#: builtin/sparse-checkout.c:701
d9488fea
JX
22118msgid "git sparse-checkout disable"
22119msgstr "git sparse-checkout disable"
22120
7e6630a7 22121#: builtin/sparse-checkout.c:732
ddc12c42
JX
22122msgid "error while refreshing working directory"
22123msgstr "刷新工作目录时出错"
22124
33b62fba 22125#: builtin/stash.c:24 builtin/stash.c:40
d46c5519
JX
22126msgid "git stash list [<options>]"
22127msgstr "git stash list [<选项>]"
22128
33b62fba 22129#: builtin/stash.c:25 builtin/stash.c:45
d46c5519
JX
22130msgid "git stash show [<options>] [<stash>]"
22131msgstr "git stash show [<选项>] [<stash>]"
22132
33b62fba 22133#: builtin/stash.c:26 builtin/stash.c:50
d46c5519
JX
22134msgid "git stash drop [-q|--quiet] [<stash>]"
22135msgstr "git stash drop [-q|--quiet] [<stash>]"
22136
33b62fba 22137#: builtin/stash.c:27
d46c5519
JX
22138msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
22139msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
22140
33b62fba 22141#: builtin/stash.c:28 builtin/stash.c:65
d46c5519
JX
22142msgid "git stash branch <branchname> [<stash>]"
22143msgstr "git stash branch <分支名> [<stash>]"
22144
33b62fba 22145#: builtin/stash.c:30
d46c5519
JX
22146msgid ""
22147"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
22148" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
2b472aae 22149" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
d46c5519
JX
22150" [--] [<pathspec>...]]"
22151msgstr ""
22152"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
22153" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
2b472aae 22154" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
d46c5519
JX
22155" [--] [<路径规格>...]]"
22156
7e6630a7 22157#: builtin/stash.c:34
d46c5519
JX
22158msgid ""
22159"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
22160" [-u|--include-untracked] [-a|--all] [<message>]"
22161msgstr ""
22162"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
22163" [-u|--include-untracked] [-a|--all] [<消息>]"
22164
33b62fba 22165#: builtin/stash.c:55
d46c5519
JX
22166msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
22167msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
22168
33b62fba 22169#: builtin/stash.c:60
d46c5519
JX
22170msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
22171msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
22172
33b62fba 22173#: builtin/stash.c:75
d46c5519
JX
22174msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
22175msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>"
22176
33b62fba 22177#: builtin/stash.c:80
2b472aae
JX
22178msgid ""
22179"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
22180" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
22181" [--] [<pathspec>...]]"
22182msgstr ""
22183"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
22184" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
22185" [--] [<路径规格>...]]"
22186
7e6630a7
FZ
22187#: builtin/stash.c:87
22188msgid ""
22189"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
22190" [-u|--include-untracked] [-a|--all] [<message>]"
22191msgstr ""
22192"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
22193" [-u|--include-untracked] [-a|--all] [<消息>]"
22194
33b62fba 22195#: builtin/stash.c:130
d46c5519
JX
22196#, c-format
22197msgid "'%s' is not a stash-like commit"
22198msgstr "'%s' 不像是一个贮藏提交"
22199
33b62fba 22200#: builtin/stash.c:150
d46c5519
JX
22201#, c-format
22202msgid "Too many revisions specified:%s"
22203msgstr "指定了太多的版本:%s"
22204
33b62fba 22205#: builtin/stash.c:164
d46c5519
JX
22206msgid "No stash entries found."
22207msgstr "未发现贮藏条目。"
22208
33b62fba 22209#: builtin/stash.c:178
d46c5519
JX
22210#, c-format
22211msgid "%s is not a valid reference"
22212msgstr "%s 不是一个有效的引用名"
22213
33b62fba 22214#: builtin/stash.c:227
473eb541 22215msgid "git stash clear with arguments is unimplemented"
d46c5519
JX
22216msgstr "git stash clear 不支持参数"
22217
7e6630a7 22218#: builtin/stash.c:447
473eb541
JX
22219#, c-format
22220msgid ""
22221"WARNING: Untracked file in way of tracked file! Renaming\n"
22222" %s -> %s\n"
22223" to make room.\n"
22224msgstr ""
22225"警告:未跟踪文件出现在跟踪文件的路径上!重命名\n"
22226" %s -> %s\n"
22227" 以腾出空间。\n"
22228
7e6630a7 22229#: builtin/stash.c:508
d46c5519 22230msgid "cannot apply a stash in the middle of a merge"
349ede6a 22231msgstr "无法在合并过程中应用贮藏"
d46c5519 22232
7e6630a7 22233#: builtin/stash.c:519
d46c5519
JX
22234#, c-format
22235msgid "could not generate diff %s^!."
22236msgstr "无法生成差异 %s^!."
22237
7e6630a7 22238#: builtin/stash.c:526
d13389bf 22239msgid "conflicts in index. Try without --index."
d46c5519
JX
22240msgstr "索引中有冲突。尝试不用 --index。"
22241
7e6630a7 22242#: builtin/stash.c:532
d46c5519
JX
22243msgid "could not save index tree"
22244msgstr "不能保存索引树"
22245
7e6630a7 22246#: builtin/stash.c:552
d46c5519
JX
22247#, c-format
22248msgid "Merging %s with %s"
22249msgstr "正在合并 %s 和 %s"
22250
7e6630a7 22251#: builtin/stash.c:562
d46c5519
JX
22252msgid "Index was not unstashed."
22253msgstr "索引未从贮藏中恢复。"
22254
7e6630a7
FZ
22255#: builtin/stash.c:575
22256msgid "could not restore untracked files from stash"
22257msgstr "无法从贮藏条目中恢复未跟踪文件"
22258
22259#: builtin/stash.c:607 builtin/stash.c:705
d46c5519
JX
22260msgid "attempt to recreate the index"
22261msgstr "尝试重建索引"
22262
7e6630a7 22263#: builtin/stash.c:651
d46c5519
JX
22264#, c-format
22265msgid "Dropped %s (%s)"
22266msgstr "丢弃了 %s(%s)"
22267
7e6630a7 22268#: builtin/stash.c:654
d46c5519
JX
22269#, c-format
22270msgid "%s: Could not drop stash entry"
22271msgstr "%s:无法丢弃贮藏条目"
22272
7e6630a7 22273#: builtin/stash.c:667
d46c5519
JX
22274#, c-format
22275msgid "'%s' is not a stash reference"
22276msgstr "'%s' 不是一个贮藏引用"
22277
7e6630a7 22278#: builtin/stash.c:717
d46c5519
JX
22279msgid "The stash entry is kept in case you need it again."
22280msgstr "贮藏条目被保留以备您再次需要。"
22281
7e6630a7 22282#: builtin/stash.c:740
d46c5519
JX
22283msgid "No branch name specified"
22284msgstr "未指定分支名"
22285
7e6630a7 22286#: builtin/stash.c:824
33b62fba
JX
22287msgid "failed to parse tree"
22288msgstr "无法解析树"
22289
7e6630a7 22290#: builtin/stash.c:835
33b62fba
JX
22291msgid "failed to unpack trees"
22292msgstr "无法解包目录树"
22293
7e6630a7 22294#: builtin/stash.c:855
33b62fba
JX
22295msgid "include untracked files in the stash"
22296msgstr "在贮藏中包含未跟踪文件"
22297
7e6630a7 22298#: builtin/stash.c:858
33b62fba
JX
22299msgid "only show untracked files in the stash"
22300msgstr "仅显示贮藏中的未跟踪文件"
22301
7e6630a7 22302#: builtin/stash.c:945 builtin/stash.c:982
d46c5519
JX
22303#, c-format
22304msgid "Cannot update %s with %s"
22305msgstr "无法用 %2$s 更新 %1$s"
22306
7e6630a7 22307#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
d46c5519
JX
22308msgid "stash message"
22309msgstr "贮藏说明"
22310
7e6630a7 22311#: builtin/stash.c:973
d46c5519
JX
22312msgid "\"git stash store\" requires one <commit> argument"
22313msgstr "\"git stash store\" 需要一个 <提交> 参数"
22314
7e6630a7 22315#: builtin/stash.c:1187
d46c5519
JX
22316msgid "No changes selected"
22317msgstr "没有选择变更"
22318
7e6630a7 22319#: builtin/stash.c:1287
d46c5519
JX
22320msgid "You do not have the initial commit yet"
22321msgstr "您尚未建立初始提交"
22322
7e6630a7 22323#: builtin/stash.c:1314
d46c5519
JX
22324msgid "Cannot save the current index state"
22325msgstr "无法保存当前索引状态"
22326
7e6630a7 22327#: builtin/stash.c:1323
d46c5519
JX
22328msgid "Cannot save the untracked files"
22329msgstr "无法保存未跟踪文件"
22330
7e6630a7 22331#: builtin/stash.c:1334 builtin/stash.c:1343
d46c5519
JX
22332msgid "Cannot save the current worktree state"
22333msgstr "无法保存当前工作区状态"
22334
7e6630a7 22335#: builtin/stash.c:1371
d46c5519
JX
22336msgid "Cannot record working tree state"
22337msgstr "不能记录工作区状态"
22338
7e6630a7 22339#: builtin/stash.c:1420
d46c5519
JX
22340msgid "Can't use --patch and --include-untracked or --all at the same time"
22341msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
22342
7e6630a7 22343#: builtin/stash.c:1438
d46c5519
JX
22344msgid "Did you forget to 'git add'?"
22345msgstr "您是否忘了执行 'git add'?"
22346
7e6630a7 22347#: builtin/stash.c:1453
d46c5519
JX
22348msgid "No local changes to save"
22349msgstr "没有要保存的本地修改"
22350
7e6630a7 22351#: builtin/stash.c:1460
d46c5519
JX
22352msgid "Cannot initialize stash"
22353msgstr "无法初始化贮藏"
22354
7e6630a7 22355#: builtin/stash.c:1475
d46c5519
JX
22356msgid "Cannot save the current status"
22357msgstr "无法保存当前状态"
22358
7e6630a7 22359#: builtin/stash.c:1480
d46c5519
JX
22360#, c-format
22361msgid "Saved working directory and index state %s"
22362msgstr "保存工作目录和索引状态 %s"
22363
7e6630a7 22364#: builtin/stash.c:1571
d46c5519
JX
22365msgid "Cannot remove worktree changes"
22366msgstr "无法删除工作区变更"
22367
7e6630a7 22368#: builtin/stash.c:1610 builtin/stash.c:1675
d46c5519
JX
22369msgid "keep index"
22370msgstr "保持索引"
22371
7e6630a7 22372#: builtin/stash.c:1612 builtin/stash.c:1677
d46c5519
JX
22373msgid "stash in patch mode"
22374msgstr "以补丁模式贮藏"
22375
7e6630a7 22376#: builtin/stash.c:1613 builtin/stash.c:1678
d46c5519
JX
22377msgid "quiet mode"
22378msgstr "静默模式"
22379
7e6630a7 22380#: builtin/stash.c:1615 builtin/stash.c:1680
d46c5519
JX
22381msgid "include untracked files in stash"
22382msgstr "贮藏中包含未跟踪文件"
ef317cd5 22383
7e6630a7 22384#: builtin/stash.c:1617 builtin/stash.c:1682
d46c5519
JX
22385msgid "include ignore files"
22386msgstr "包含忽略的文件"
ef317cd5 22387
7e6630a7 22388#: builtin/stash.c:1717
349ede6a
JX
22389msgid ""
22390"the stash.useBuiltin support has been removed!\n"
22391"See its entry in 'git help config' for details."
22392msgstr ""
22393"对 stash.useBuiltin 的支持已被删除!\n"
22394"详见 'git help config' 中的条目。"
ef317cd5 22395
a4f16749 22396#: builtin/stripspace.c:18
94550ed3
JX
22397msgid "git stripspace [-s | --strip-comments]"
22398msgstr "git stripspace [-s | --strip-comments]"
22399
a4f16749 22400#: builtin/stripspace.c:19
94550ed3
JX
22401msgid "git stripspace [-c | --comment-lines]"
22402msgstr "git stripspace [-c | --comment-lines]"
22403
06991777 22404#: builtin/stripspace.c:37
94550ed3
JX
22405msgid "skip and remove all lines starting with comment character"
22406msgstr "跳过和移除所有的注释行"
22407
06991777 22408#: builtin/stripspace.c:40
276ceeaa 22409msgid "prepend comment character and space to each line"
94550ed3
JX
22410msgstr "为每一行的行首添加注释符和空格"
22411
7e6630a7 22412#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
5b04ee3b
JX
22413#, c-format
22414msgid "Expecting a full ref name, got %s"
22415msgstr "期望一个完整的引用名称,却得到 %s"
22416
ec3d4607 22417#: builtin/submodule--helper.c:63
31e5e17b
JX
22418msgid "submodule--helper print-default-remote takes no arguments"
22419msgstr "submodule--helper print-default-remote 不带参数"
22420
ec3d4607 22421#: builtin/submodule--helper.c:101
5b04ee3b
JX
22422#, c-format
22423msgid "cannot strip one component off url '%s'"
22424msgstr "无法从 url '%s' 剥离一个组件"
22425
7e6630a7
FZ
22426#: builtin/submodule--helper.c:211
22427#, c-format
22428msgid ""
22429"could not look up configuration '%s'. Assuming this repository is its own "
22430"authoritative upstream."
22431msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
22432
22433#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
94550ed3
JX
22434msgid "alternative anchor for relative paths"
22435msgstr "相对路径的替代锚记(anchor)"
22436
7e6630a7 22437#: builtin/submodule--helper.c:410
94550ed3
JX
22438msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
22439msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
22440
7e6630a7
FZ
22441#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
22442#: builtin/submodule--helper.c:628
5b04ee3b
JX
22443#, c-format
22444msgid "No url found for submodule path '%s' in .gitmodules"
7e6630a7 22445msgstr "在 .gitmodules 中未找到子模组路径 '%s' 的 url"
5b04ee3b 22446
7e6630a7 22447#: builtin/submodule--helper.c:520
c1ac5258
JX
22448#, c-format
22449msgid "Entering '%s'\n"
22450msgstr "进入 '%s'\n"
22451
7e6630a7 22452#: builtin/submodule--helper.c:523
c1ac5258
JX
22453#, c-format
22454msgid ""
22455"run_command returned non-zero status for %s\n"
22456"."
4c27fcb5
JX
22457msgstr ""
22458"对 %s 执行 run_command 返回非零值。\n"
22459"."
c1ac5258 22460
7e6630a7 22461#: builtin/submodule--helper.c:545
c1ac5258
JX
22462#, c-format
22463msgid ""
22464"run_command returned non-zero status while recursing in the nested "
22465"submodules of %s\n"
22466"."
4c27fcb5
JX
22467msgstr ""
22468"在递归 %s 的子模组执行 run_command 时返回非零值。\n"
22469"."
c1ac5258 22470
7e6630a7 22471#: builtin/submodule--helper.c:561
473eb541
JX
22472msgid "suppress output of entering each submodule command"
22473msgstr "抑制进入每一个子模组命令的输出"
c1ac5258 22474
7e6630a7
FZ
22475#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
22476#: builtin/submodule--helper.c:1453
473eb541 22477msgid "recurse into nested submodules"
c1ac5258
JX
22478msgstr "递归进入嵌套子模组中"
22479
7e6630a7 22480#: builtin/submodule--helper.c:568
d46c5519
JX
22481msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
22482msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
c1ac5258 22483
7e6630a7 22484#: builtin/submodule--helper.c:642
5b04ee3b
JX
22485#, c-format
22486msgid "Failed to register url for submodule path '%s'"
7e6630a7 22487msgstr "无法为子模组路径 '%s' 注册 url"
5b04ee3b 22488
7e6630a7 22489#: builtin/submodule--helper.c:646
5b04ee3b
JX
22490#, c-format
22491msgid "Submodule '%s' (%s) registered for path '%s'\n"
25c75902 22492msgstr "子模组 '%s'(%s)已对路径 '%s' 注册\n"
5b04ee3b 22493
7e6630a7 22494#: builtin/submodule--helper.c:656
aef18cc6 22495#, c-format
5b04ee3b 22496msgid "warning: command update mode suggested for submodule '%s'\n"
aef18cc6 22497msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
5b04ee3b 22498
7e6630a7 22499#: builtin/submodule--helper.c:663
5b04ee3b
JX
22500#, c-format
22501msgid "Failed to register update mode for submodule path '%s'"
7e6630a7 22502msgstr "无法为子模组路径 '%s' 注册更新模式"
5b04ee3b 22503
7e6630a7 22504#: builtin/submodule--helper.c:685
473eb541
JX
22505msgid "suppress output for initializing a submodule"
22506msgstr "抑制子模组初始化的输出"
5b04ee3b 22507
7e6630a7 22508#: builtin/submodule--helper.c:690
d46c5519
JX
22509msgid "git submodule--helper init [<options>] [<path>]"
22510msgstr "git submodule--helper init [<选项>] [<路径>]"
5b04ee3b 22511
7e6630a7 22512#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
94550ed3
JX
22513#, c-format
22514msgid "no submodule mapping found in .gitmodules for path '%s'"
22515msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
22516
7e6630a7 22517#: builtin/submodule--helper.c:811
5809aa05
JX
22518#, c-format
22519msgid "could not resolve HEAD ref inside the submodule '%s'"
22520msgstr "无法解析子模组 '%s' 的 HEAD 引用"
22521
7e6630a7 22522#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
5809aa05
JX
22523#, c-format
22524msgid "failed to recurse into submodule '%s'"
c1ac5258 22525msgstr "递归子模组 '%s' 失败"
5809aa05 22526
7e6630a7 22527#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
473eb541
JX
22528msgid "suppress submodule status output"
22529msgstr "抑制子模组状态输出"
5809aa05 22530
7e6630a7 22531#: builtin/submodule--helper.c:863
5809aa05 22532msgid ""
473eb541 22533"use commit stored in the index instead of the one stored in the submodule "
5809aa05
JX
22534"HEAD"
22535msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交"
22536
7e6630a7 22537#: builtin/submodule--helper.c:869
5809aa05
JX
22538msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
22539msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
22540
7e6630a7 22541#: builtin/submodule--helper.c:893
5809aa05
JX
22542msgid "git submodule--helper name <path>"
22543msgstr "git submodule--helper name <路径>"
22544
7e6630a7 22545#: builtin/submodule--helper.c:965
d9488fea
JX
22546#, c-format
22547msgid "* %s %s(blob)->%s(submodule)"
22548msgstr "* %s %s(数据对象)->%s(子模组)"
22549
7e6630a7 22550#: builtin/submodule--helper.c:968
d9488fea
JX
22551#, c-format
22552msgid "* %s %s(submodule)->%s(blob)"
22553msgstr "* %s %s(子模组)->%s(数据对象)"
22554
7e6630a7 22555#: builtin/submodule--helper.c:981
d9488fea
JX
22556#, c-format
22557msgid "%s"
22558msgstr "%s"
22559
7e6630a7 22560#: builtin/submodule--helper.c:1031
d9488fea
JX
22561#, c-format
22562msgid "couldn't hash object from '%s'"
22563msgstr "不能从 '%s' 创建哈希对象"
22564
7e6630a7 22565#: builtin/submodule--helper.c:1035
d9488fea
JX
22566#, c-format
22567msgid "unexpected mode %o\n"
22568msgstr "意外的模式 %o\n"
22569
7e6630a7 22570#: builtin/submodule--helper.c:1276
d9488fea
JX
22571msgid "use the commit stored in the index instead of the submodule HEAD"
22572msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交"
22573
7e6630a7 22574#: builtin/submodule--helper.c:1278
ec3d4607 22575msgid "compare the commit in the index with that in the submodule HEAD"
d9488fea
JX
22576msgstr "比较存储在索引和子模组 HEAD 中的提交"
22577
7e6630a7 22578#: builtin/submodule--helper.c:1280
d9488fea
JX
22579msgid "skip submodules with 'ignore_config' value set to 'all'"
22580msgstr "跳过设置了 'ignore_config' 为 'all' 的子模组"
22581
7e6630a7 22582#: builtin/submodule--helper.c:1282
d9488fea
JX
22583msgid "limit the summary size"
22584msgstr "限制总结的大小"
22585
7e6630a7 22586#: builtin/submodule--helper.c:1287
d9488fea
JX
22587msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
22588msgstr "git submodule--helper summary [<选项>] [<提交>] [--] [<路径>]"
22589
7e6630a7 22590#: builtin/submodule--helper.c:1311
d9488fea
JX
22591msgid "could not fetch a revision for HEAD"
22592msgstr "不能为 HEAD 获取一个版本"
22593
7e6630a7 22594#: builtin/submodule--helper.c:1316
d9488fea
JX
22595msgid "--cached and --files are mutually exclusive"
22596msgstr "--cached 和 --files 是互斥的"
22597
7e6630a7 22598#: builtin/submodule--helper.c:1373
31e5e17b
JX
22599#, c-format
22600msgid "Synchronizing submodule url for '%s'\n"
22601msgstr "为 '%s' 同步子模组 url\n"
22602
7e6630a7 22603#: builtin/submodule--helper.c:1379
31e5e17b
JX
22604#, c-format
22605msgid "failed to register url for submodule path '%s'"
22606msgstr "无法为子模组路径 '%s' 注册 url"
22607
7e6630a7 22608#: builtin/submodule--helper.c:1393
31e5e17b
JX
22609#, c-format
22610msgid "failed to get the default remote for submodule '%s'"
22611msgstr "无法得到子模组 '%s' 的默认远程关联"
22612
7e6630a7 22613#: builtin/submodule--helper.c:1404
31e5e17b
JX
22614#, c-format
22615msgid "failed to update remote for submodule '%s'"
22616msgstr "无法为子模组 '%s' 更新远程关联"
22617
7e6630a7 22618#: builtin/submodule--helper.c:1451
473eb541
JX
22619msgid "suppress output of synchronizing submodule url"
22620msgstr "抑制子模组 URL 同步的输出"
31e5e17b 22621
7e6630a7 22622#: builtin/submodule--helper.c:1458
31e5e17b
JX
22623msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
22624msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
22625
7e6630a7 22626#: builtin/submodule--helper.c:1512
31e5e17b
JX
22627#, c-format
22628msgid ""
22629"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
22630"really want to remove it including all of its history)"
22631msgstr ""
fd8cb379
JX
22632"子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm "
22633"-rf' 命令)"
31e5e17b 22634
7e6630a7 22635#: builtin/submodule--helper.c:1524
31e5e17b
JX
22636#, c-format
22637msgid ""
22638"Submodule work tree '%s' contains local modifications; use '-f' to discard "
22639"them"
22640msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们"
22641
7e6630a7 22642#: builtin/submodule--helper.c:1532
31e5e17b
JX
22643#, c-format
22644msgid "Cleared directory '%s'\n"
22645msgstr "已清除目录 '%s'\n"
22646
7e6630a7 22647#: builtin/submodule--helper.c:1534
31e5e17b
JX
22648#, c-format
22649msgid "Could not remove submodule work tree '%s'\n"
22650msgstr "无法移除子模组工作区 '%s'\n"
22651
7e6630a7 22652#: builtin/submodule--helper.c:1545
31e5e17b
JX
22653#, c-format
22654msgid "could not create empty submodule directory %s"
22655msgstr "不能创建空的子模组目录 %s"
22656
7e6630a7 22657#: builtin/submodule--helper.c:1561
31e5e17b
JX
22658#, c-format
22659msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
22660msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
22661
7e6630a7 22662#: builtin/submodule--helper.c:1590
473eb541 22663msgid "remove submodule working trees even if they contain local changes"
31e5e17b
JX
22664msgstr "删除子模组工作区,即使包含本地修改"
22665
7e6630a7 22666#: builtin/submodule--helper.c:1591
473eb541 22667msgid "unregister all submodules"
31e5e17b
JX
22668msgstr "将所有子模组取消注册"
22669
7e6630a7 22670#: builtin/submodule--helper.c:1596
31e5e17b
JX
22671msgid ""
22672"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
22673msgstr ""
22674"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
22675
7e6630a7 22676#: builtin/submodule--helper.c:1610
31e5e17b
JX
22677msgid "Use '--all' if you really want to deinitialize all submodules"
22678msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
22679
7e6630a7 22680#: builtin/submodule--helper.c:1655
ddc12c42
JX
22681msgid ""
22682"An alternate computed from a superproject's alternate is invalid.\n"
22683"To allow Git to clone without an alternate in such a case, set\n"
22684"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
22685"'--reference-if-able' instead of '--reference'."
22686msgstr ""
22687"从一个父项目的备用仓库中计算出的备用仓库无效。\n"
22688"此场景下,设置 submodule.alternateErrorStrategy 为 'info',以允许\n"
22689"Git 不使用备用仓库克隆,或者等效地使用 '--reference-if-able' 而非\n"
22690"'--reference' 来克隆。"
22691
7e6630a7 22692#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
a0b6b246
JX
22693#, c-format
22694msgid "submodule '%s' cannot add alternate: %s"
22695msgstr "子模组 '%s' 不能添加仓库备选:%s"
22696
7e6630a7 22697#: builtin/submodule--helper.c:1739
a0b6b246
JX
22698#, c-format
22699msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
22700msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
22701
7e6630a7 22702#: builtin/submodule--helper.c:1746
a0b6b246
JX
22703#, c-format
22704msgid "Value '%s' for submodule.alternateLocation is not recognized"
ae4e099e 22705msgstr "不能识别 submodule.alternateLocation 的取值 '%s'"
a0b6b246 22706
7e6630a7 22707#: builtin/submodule--helper.c:1771
ec3d4607
JX
22708#, c-format
22709msgid "refusing to create/use '%s' in another submodule's git dir"
22710msgstr "拒绝在另一个子模组的 git 目录中创建/使用 '%s'"
22711
7e6630a7 22712#: builtin/submodule--helper.c:1812
ec3d4607
JX
22713#, c-format
22714msgid "clone of '%s' into submodule path '%s' failed"
22715msgstr "无法克隆 '%s' 到子模组路径 '%s'"
22716
7e6630a7 22717#: builtin/submodule--helper.c:1817
ec3d4607
JX
22718#, c-format
22719msgid "directory not empty: '%s'"
22720msgstr "目录非空:'%s'"
22721
7e6630a7 22722#: builtin/submodule--helper.c:1829
ec3d4607
JX
22723#, c-format
22724msgid "could not get submodule directory for '%s'"
22725msgstr "无法得到 '%s' 的子模组目录"
22726
7e6630a7 22727#: builtin/submodule--helper.c:1861
94550ed3
JX
22728msgid "where the new submodule will be cloned to"
22729msgstr "新的子模组将要克隆的路径"
22730
7e6630a7 22731#: builtin/submodule--helper.c:1864
94550ed3
JX
22732msgid "name of the new submodule"
22733msgstr "新子模组的名称"
22734
7e6630a7 22735#: builtin/submodule--helper.c:1867
94550ed3
JX
22736msgid "url where to clone the submodule from"
22737msgstr "克隆子模组的 url 地址"
22738
7e6630a7 22739#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
94550ed3
JX
22740msgid "depth for shallow clones"
22741msgstr "浅克隆的深度"
22742
7e6630a7
FZ
22743#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
22744#: builtin/submodule--helper.c:3257
a0b6b246 22745msgid "force cloning progress"
29004bbb 22746msgstr "强制显示克隆进度"
a0b6b246 22747
7e6630a7 22748#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
ddc12c42
JX
22749msgid "disallow cloning into non-empty directory"
22750msgstr "不允许克隆到一个非空目录"
22751
7e6630a7 22752#: builtin/submodule--helper.c:1887
94550ed3
JX
22753msgid ""
22754"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
2b472aae
JX
22755"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
22756"<url> --path <path>"
5c57d762
JX
22757msgstr ""
22758"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
2b472aae 22759"[--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>"
94550ed3 22760
7e6630a7 22761#: builtin/submodule--helper.c:1924
4c27fcb5
JX
22762#, c-format
22763msgid "Invalid update mode '%s' for submodule path '%s'"
7e6630a7 22764msgstr "子模组路径 '%2$s' 的更新模式 '%1$s' 无效"
4c27fcb5 22765
7e6630a7 22766#: builtin/submodule--helper.c:1928
4c27fcb5
JX
22767#, c-format
22768msgid "Invalid update mode '%s' configured for submodule path '%s'"
7e6630a7 22769msgstr "为子模组路径 '%2$s' 配置的更新模式 '%1$s' 无效"
4c27fcb5 22770
7e6630a7 22771#: builtin/submodule--helper.c:2043
5b04ee3b
JX
22772#, c-format
22773msgid "Submodule path '%s' not initialized"
7e6630a7 22774msgstr "子模组路径 '%s' 尚未初始化"
5b04ee3b 22775
7e6630a7 22776#: builtin/submodule--helper.c:2047
5b04ee3b
JX
22777msgid "Maybe you want to use 'update --init'?"
22778msgstr "也许您想要执行 'update --init'?"
22779
7e6630a7 22780#: builtin/submodule--helper.c:2077
5b04ee3b
JX
22781#, c-format
22782msgid "Skipping unmerged submodule %s"
22783msgstr "略过未合并的子模组 %s"
22784
7e6630a7 22785#: builtin/submodule--helper.c:2106
5b04ee3b
JX
22786#, c-format
22787msgid "Skipping submodule '%s'"
22788msgstr "略过子模组 '%s'"
22789
7e6630a7 22790#: builtin/submodule--helper.c:2256
5c57d762
JX
22791#, c-format
22792msgid "Failed to clone '%s'. Retry scheduled"
22793msgstr "克隆 '%s' 失败。按计划重试"
22794
7e6630a7 22795#: builtin/submodule--helper.c:2267
5c57d762
JX
22796#, c-format
22797msgid "Failed to clone '%s' a second time, aborting"
22798msgstr "第二次尝试克隆 '%s' 失败,退出"
22799
7e6630a7
FZ
22800#: builtin/submodule--helper.c:2372
22801#, c-format
22802msgid "Unable to checkout '%s' in submodule path '%s'"
22803msgstr "无法在子模组路径 '%2$s' 中检出 '%1$s'"
22804
22805#: builtin/submodule--helper.c:2376
22806#, c-format
22807msgid "Unable to rebase '%s' in submodule path '%s'"
22808msgstr "无法在子模组路径 '%2$s' 中变基 '%1$s'"
22809
22810#: builtin/submodule--helper.c:2380
22811#, c-format
22812msgid "Unable to merge '%s' in submodule path '%s'"
22813msgstr "无法在子模组路径 '%2$s' 中合并 '%1$s'"
22814
22815#: builtin/submodule--helper.c:2384
22816#, c-format
22817msgid "Execution of '%s %s' failed in submodule path '%s'"
22818msgstr "在子模组路径 '%3$s' 中执行 '%1$s %2$s' 失败"
22819
22820#: builtin/submodule--helper.c:2408
22821#, c-format
22822msgid "Submodule path '%s': checked out '%s'\n"
22823msgstr "子模组路径 '%s':检出 '%s'\n"
22824
22825#: builtin/submodule--helper.c:2412
22826#, c-format
22827msgid "Submodule path '%s': rebased into '%s'\n"
22828msgstr "子模组路径 '%s':变基至 '%s'\n"
22829
22830#: builtin/submodule--helper.c:2416
22831#, c-format
22832msgid "Submodule path '%s': merged in '%s'\n"
22833msgstr "子模组路径 '%s':合并入 '%s'\n"
22834
22835#: builtin/submodule--helper.c:2420
22836#, c-format
22837msgid "Submodule path '%s': '%s %s'\n"
22838msgstr "子模组路径 '%s':'%s %s'\n"
22839
22840#: builtin/submodule--helper.c:2444
22841#, c-format
22842msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
22843msgstr "无法在子模组路径 '%s' 中获取;尝试直接获取 %s:"
22844
22845#: builtin/submodule--helper.c:2453
22846#, c-format
22847msgid ""
22848"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
22849"of that commit failed."
22850msgstr "获取了子模组路径 '%s',但是它没有包含 %s。直接获取该提交失败。"
22851
22852#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
22853#: builtin/submodule--helper.c:2812
5b04ee3b
JX
22854msgid "path into the working tree"
22855msgstr "到工作区的路径"
22856
7e6630a7 22857#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
5b04ee3b
JX
22858msgid "path into the working tree, across nested submodule boundaries"
22859msgstr "工作区中的路径,递归嵌套子模组"
22860
7e6630a7 22861#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
5b04ee3b
JX
22862msgid "rebase, merge, checkout or none"
22863msgstr "rebase、merge、checkout 或 none"
22864
7e6630a7 22865#: builtin/submodule--helper.c:2517
473eb541 22866msgid "create a shallow clone truncated to the specified number of revisions"
5b04ee3b
JX
22867msgstr "创建一个指定深度的浅克隆"
22868
7e6630a7 22869#: builtin/submodule--helper.c:2520
5b04ee3b
JX
22870msgid "parallel jobs"
22871msgstr "并发任务"
22872
7e6630a7 22873#: builtin/submodule--helper.c:2522
5c57d762 22874msgid "whether the initial clone should follow the shallow recommendation"
9a4b694c 22875msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
5c57d762 22876
7e6630a7 22877#: builtin/submodule--helper.c:2523
5b04ee3b
JX
22878msgid "don't print cloning progress"
22879msgstr "不要输出克隆进度"
94550ed3 22880
7e6630a7 22881#: builtin/submodule--helper.c:2534
a5cd71ca
JX
22882msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
22883msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]"
5b04ee3b 22884
7e6630a7 22885#: builtin/submodule--helper.c:2547
5b04ee3b
JX
22886msgid "bad value for update parameter"
22887msgstr "update 参数取值错误"
22888
7e6630a7
FZ
22889#: builtin/submodule--helper.c:2565
22890msgid "suppress output for update by rebase or merge"
22891msgstr "抑制变基或合并更新的输出"
22892
22893#: builtin/submodule--helper.c:2566
22894msgid "force checkout updates"
22895msgstr "强制检出更新"
22896
22897#: builtin/submodule--helper.c:2568
22898msgid "don't fetch new objects from the remote site"
22899msgstr "不要从远程地址获取新对象"
22900
22901#: builtin/submodule--helper.c:2570
22902msgid "overrides update mode in case the repository is a fresh clone"
22903msgstr "当仓库是新的克隆时,覆盖更新模式"
22904
22905#: builtin/submodule--helper.c:2571
22906msgid "depth for shallow fetch"
22907msgstr "浅获取的深度"
22908
22909#: builtin/submodule--helper.c:2581
22910msgid "sha1"
22911msgstr "sha1"
22912
22913#: builtin/submodule--helper.c:2582
22914msgid "SHA1 expected by superproject"
22915msgstr "上层项目期待的 SHA1"
22916
22917#: builtin/submodule--helper.c:2584
22918msgid "subsha1"
22919msgstr "subsha1"
22920
22921#: builtin/submodule--helper.c:2585
22922msgid "SHA1 of submodule's HEAD"
22923msgstr "子模块头指针的 SHA1"
22924
22925#: builtin/submodule--helper.c:2591
22926msgid "git submodule--helper run-update-procedure [<options>] <path>"
22927msgstr "git submodule--helper run-update-procedure [<选项>] <路径>"
22928
22929#: builtin/submodule--helper.c:2662
5c57d762
JX
22930#, c-format
22931msgid ""
22932"Submodule (%s) branch configured to inherit branch from superproject, but "
22933"the superproject is not on any branch"
22934msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
22935
7e6630a7 22936#: builtin/submodule--helper.c:2780
4c27fcb5
JX
22937#, c-format
22938msgid "could not get a repository handle for submodule '%s'"
22939msgstr "无法获得子模组 '%s' 的仓库句柄"
22940
7e6630a7 22941#: builtin/submodule--helper.c:2813
1a79b2f1
JX
22942msgid "recurse into submodules"
22943msgstr "在子模组中递归"
22944
7e6630a7 22945#: builtin/submodule--helper.c:2819
d46c5519
JX
22946msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
22947msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
1a79b2f1 22948
7e6630a7 22949#: builtin/submodule--helper.c:2875
4c27fcb5
JX
22950msgid "check if it is safe to write to the .gitmodules file"
22951msgstr "检查写入 .gitmodules 文件是否安全"
22952
7e6630a7 22953#: builtin/submodule--helper.c:2878
d46c5519
JX
22954msgid "unset the config in the .gitmodules file"
22955msgstr "取消 .gitmodules 文件中的设置"
22956
7e6630a7 22957#: builtin/submodule--helper.c:2883
d46c5519
JX
22958msgid "git submodule--helper config <name> [<value>]"
22959msgstr "git submodule--helper config <名称> [<值>]"
4c27fcb5 22960
7e6630a7 22961#: builtin/submodule--helper.c:2884
d46c5519
JX
22962msgid "git submodule--helper config --unset <name>"
22963msgstr "git submodule--helper config --unset <名称>"
22964
7e6630a7 22965#: builtin/submodule--helper.c:2885
4c27fcb5
JX
22966msgid "git submodule--helper config --check-writeable"
22967msgstr "git submodule--helper config --check-writeable"
22968
7e6630a7
FZ
22969#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
22970#: builtin/submodule--helper.c:3276
4c27fcb5
JX
22971msgid "please make sure that the .gitmodules file is in the working tree"
22972msgstr "请确认 .gitmodules 文件在工作区里"
22973
7e6630a7 22974#: builtin/submodule--helper.c:2920
473eb541
JX
22975msgid "suppress output for setting url of a submodule"
22976msgstr "抑制设置子模组 URL 的输出"
349ede6a 22977
7e6630a7 22978#: builtin/submodule--helper.c:2924
349ede6a
JX
22979msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
22980msgstr "git submodule--helper set-url [--quiet] <路径> <新地址>"
22981
7e6630a7 22982#: builtin/submodule--helper.c:2957
7157c2b5
JX
22983msgid "set the default tracking branch to master"
22984msgstr "设置默认跟踪分支为 master"
22985
7e6630a7 22986#: builtin/submodule--helper.c:2959
7157c2b5
JX
22987msgid "set the default tracking branch"
22988msgstr "设置默认跟踪分支"
22989
7e6630a7 22990#: builtin/submodule--helper.c:2963
7157c2b5
JX
22991msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
22992msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <路径>"
22993
7e6630a7 22994#: builtin/submodule--helper.c:2964
7157c2b5
JX
22995msgid ""
22996"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
d9488fea
JX
22997msgstr ""
22998"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <分支> <路径>"
7157c2b5 22999
7e6630a7 23000#: builtin/submodule--helper.c:2971
7157c2b5
JX
23001msgid "--branch or --default required"
23002msgstr "需要 --branch 或 --default"
23003
7e6630a7 23004#: builtin/submodule--helper.c:2974
7157c2b5
JX
23005msgid "--branch and --default are mutually exclusive"
23006msgstr "--branch 和 --default 是互斥的"
23007
7e6630a7 23008#: builtin/submodule--helper.c:3037
ec3d4607
JX
23009#, c-format
23010msgid "Adding existing repo at '%s' to the index\n"
23011msgstr "向索引中添加位于 '%s' 的已存在的仓库\n"
23012
7e6630a7 23013#: builtin/submodule--helper.c:3040
ec3d4607
JX
23014#, c-format
23015msgid "'%s' already exists and is not a valid git repo"
23016msgstr "'%s' 已存在并且不是一个有效的 git 仓库"
23017
7e6630a7 23018#: builtin/submodule--helper.c:3053
ec3d4607 23019#, c-format
7e6630a7
FZ
23020msgid "A git directory for '%s' is found locally with remote(s):\n"
23021msgstr "发现一个本地 git 目录 '%s' 及其远程仓库:\n"
ec3d4607 23022
7e6630a7 23023#: builtin/submodule--helper.c:3060
ec3d4607
JX
23024#, c-format
23025msgid ""
23026"If you want to reuse this local git directory instead of cloning again from\n"
23027" %s\n"
23028"use the '--force' option. If the local git directory is not the correct "
23029"repo\n"
7e6630a7
FZ
23030"or you are unsure what this means choose another name with the '--name' "
23031"option."
ec3d4607
JX
23032msgstr ""
23033"如果您想要重用这个本地 git 目录而非重新克隆自\n"
23034" %s\n"
23035"使用 '--force' 选项。如果本地 git 目录不是正确的仓库,或者如果您不确定这里\n"
7e6630a7 23036"的含义,使用 '--name' 选项指定另外的名称。"
ec3d4607 23037
7e6630a7 23038#: builtin/submodule--helper.c:3072
ec3d4607
JX
23039#, c-format
23040msgid "Reactivating local git directory for submodule '%s'\n"
23041msgstr "为子模组 '%s' 重新激活本地 git 目录\n"
23042
7e6630a7 23043#: builtin/submodule--helper.c:3109
ec3d4607
JX
23044#, c-format
23045msgid "unable to checkout submodule '%s'"
23046msgstr "无法检出子模组 '%s'"
23047
7e6630a7
FZ
23048#: builtin/submodule--helper.c:3148
23049#, c-format
23050msgid "Failed to add submodule '%s'"
23051msgstr "无法添加子模组 '%s'"
ec3d4607 23052
7e6630a7
FZ
23053#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
23054#: builtin/submodule--helper.c:3165
23055#, c-format
23056msgid "Failed to register submodule '%s'"
23057msgstr "无法注册子模组 '%s'"
ec3d4607 23058
7e6630a7 23059#: builtin/submodule--helper.c:3221
1a79b2f1 23060#, c-format
7e6630a7
FZ
23061msgid "'%s' already exists in the index"
23062msgstr "'%s' 已经存在于索引中"
1a79b2f1 23063
7e6630a7 23064#: builtin/submodule--helper.c:3224
94550ed3 23065#, c-format
7e6630a7
FZ
23066msgid "'%s' already exists in the index and is not a submodule"
23067msgstr "'%s' 已经存在于索引中且不是一个子模组"
23068
23069#: builtin/submodule--helper.c:3253
23070msgid "branch of repository to add as submodule"
23071msgstr "要添加为子模组的仓库的分支"
23072
23073#: builtin/submodule--helper.c:3254
23074msgid "allow adding an otherwise ignored submodule path"
23075msgstr "允许添加一个被忽略的子模组路径"
23076
23077#: builtin/submodule--helper.c:3256
23078msgid "print only error messages"
23079msgstr "只打印错误消息"
23080
23081#: builtin/submodule--helper.c:3260
23082msgid "borrow the objects from reference repositories"
23083msgstr "从引用仓库中借用对象"
23084
23085#: builtin/submodule--helper.c:3262
23086msgid ""
23087"sets the submodule’s name to the given string instead of defaulting to its "
23088"path"
23089msgstr "将子模组的名称设置为给定的字符串,而非默认为其路径"
23090
23091#: builtin/submodule--helper.c:3269
23092msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
23093msgstr "git submodule--helper add [<选项>] [--] <仓库> [<路径>]"
23094
23095#: builtin/submodule--helper.c:3297
23096msgid "Relative path can only be used from the toplevel of the working tree"
23097msgstr "只能在工作区的顶级目录中使用相对路径"
23098
23099#: builtin/submodule--helper.c:3305
23100#, c-format
23101msgid "repo URL: '%s' must be absolute or begin with ./|../"
23102msgstr "仓库 URL:'%s' 必须是绝对路径或以 ./|../ 起始"
23103
23104#: builtin/submodule--helper.c:3340
23105#, c-format
23106msgid "'%s' is not a valid submodule name"
23107msgstr "'%s' 不是一个有效的子模组名称"
23108
23109#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
23110#, c-format
23111msgid "%s doesn't support --super-prefix"
23112msgstr "%s 不支持 --super-prefix"
23113
23114#: builtin/submodule--helper.c:3410
23115#, c-format
23116msgid "'%s' is not a valid submodule--helper subcommand"
23117msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
94550ed3 23118
a4f16749 23119#: builtin/symbolic-ref.c:8
814ff314
JX
23120msgid "git symbolic-ref [<options>] <name> [<ref>]"
23121msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
07432cef 23122
a4f16749 23123#: builtin/symbolic-ref.c:9
814ff314
JX
23124msgid "git symbolic-ref -d [-q] <name>"
23125msgstr "git symbolic-ref -d [-q] <名称>"
ef317cd5 23126
33b62fba 23127#: builtin/symbolic-ref.c:42
ef317cd5 23128msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
23129msgstr "不显示非符号(分离的)引用的错误信息"
23130
33b62fba 23131#: builtin/symbolic-ref.c:43
07432cef
WS
23132msgid "delete symbolic ref"
23133msgstr "删除符号引用"
ef317cd5 23134
33b62fba 23135#: builtin/symbolic-ref.c:44
ef317cd5 23136msgid "shorten ref output"
6937cb4e 23137msgstr "缩短引用输出"
ef317cd5 23138
7e6630a7 23139#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
ef317cd5 23140msgid "reason"
07432cef 23141msgstr "原因"
ef317cd5 23142
7e6630a7 23143#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
ef317cd5 23144msgid "reason of the update"
07432cef 23145msgstr "更新的原因"
ef317cd5 23146
c1ac5258 23147#: builtin/tag.c:25
ef317cd5 23148msgid ""
d46c5519 23149"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
7e6630a7 23150" <tagname> [<head>]"
814ff314 23151msgstr ""
d46c5519 23152"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n"
7e6630a7 23153" <标签名> [<头>]"
ef317cd5 23154
d46c5519 23155#: builtin/tag.c:27
ef317cd5 23156msgid "git tag -d <tagname>..."
07432cef 23157msgstr "git tag -d <标签名>..."
ef317cd5 23158
d46c5519 23159#: builtin/tag.c:28
ef317cd5 23160msgid ""
87cb7997
JX
23161"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
23162"points-at <object>]\n"
7e6630a7 23163" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
d9488fea 23164"[<pattern>...]"
ef317cd5 23165msgstr ""
87cb7997
JX
23166"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
23167"at <对象>]\n"
7e6630a7 23168" [--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]"
ef317cd5 23169
d46c5519 23170#: builtin/tag.c:30
1a79b2f1
JX
23171msgid "git tag -v [--format=<format>] <tagname>..."
23172msgstr "git tag -v [--format=<格式>] <标签名>..."
ef317cd5 23173
33b62fba 23174#: builtin/tag.c:100
c04f5ac3
JX
23175#, c-format
23176msgid "tag '%s' not found."
55a16ee4 23177msgstr "未发现标签 '%s'。"
c04f5ac3 23178
33b62fba 23179#: builtin/tag.c:135
c04f5ac3
JX
23180#, c-format
23181msgid "Deleted tag '%s' (was %s)\n"
55a16ee4 23182msgstr "已删除标签 '%s'(曾为 %s)\n"
c04f5ac3 23183
33b62fba 23184#: builtin/tag.c:170
a77c07d9 23185#, c-format
c04f5ac3
JX
23186msgid ""
23187"\n"
6acbf033
JX
23188"Write a message for tag:\n"
23189" %s\n"
a77c07d9 23190"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
23191msgstr ""
23192"\n"
55a16ee4 23193"输入一个标签说明:\n"
6acbf033 23194" %s\n"
a77c07d9 23195"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 23196
33b62fba 23197#: builtin/tag.c:174
a77c07d9 23198#, c-format
c04f5ac3
JX
23199msgid ""
23200"\n"
6acbf033
JX
23201"Write a message for tag:\n"
23202" %s\n"
a77c07d9 23203"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 23204"want to.\n"
c04f5ac3
JX
23205msgstr ""
23206"\n"
55a16ee4 23207"输入一个标签说明:\n"
6acbf033 23208" %s\n"
a77c07d9 23209"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 23210
33b62fba 23211#: builtin/tag.c:241
c04f5ac3 23212msgid "unable to sign the tag"
55a16ee4 23213msgstr "无法签署标签"
c04f5ac3 23214
33b62fba 23215#: builtin/tag.c:259
d46c5519
JX
23216#, c-format
23217msgid ""
23218"You have created a nested tag. The object referred to by your new tag is\n"
23219"already a tag. If you meant to tag the object that it points to, use:\n"
23220"\n"
23221"\tgit tag -f %s %s^{}"
23222msgstr ""
23223"您创建了一个嵌套的标签。您的新标签指向的对象已经是一个标签。如果您想要\n"
23224"对其指向的目标创建标签,使用:\n"
23225"\n"
23226"\tgit tag -f %s %s^{}"
23227
33b62fba 23228#: builtin/tag.c:275
c04f5ac3 23229msgid "bad object type."
90e6ef53 23230msgstr "坏的对象类型。"
c04f5ac3 23231
7e6630a7 23232#: builtin/tag.c:326
c04f5ac3 23233msgid "no tag message?"
55a16ee4 23234msgstr "无标签说明?"
c04f5ac3 23235
7e6630a7 23236#: builtin/tag.c:333
c04f5ac3
JX
23237#, c-format
23238msgid "The tag message has been left in %s\n"
55a16ee4 23239msgstr "标签说明被保留在 %s\n"
c04f5ac3 23240
7e6630a7 23241#: builtin/tag.c:444
ef317cd5 23242msgid "list tag names"
55a16ee4 23243msgstr "列出标签名称"
ef317cd5 23244
7e6630a7 23245#: builtin/tag.c:446
ef317cd5 23246msgid "print <n> lines of each tag message"
55a16ee4 23247msgstr "每个标签信息打印 <n> 行"
ef317cd5 23248
7e6630a7 23249#: builtin/tag.c:448
ef317cd5 23250msgid "delete tags"
55a16ee4 23251msgstr "删除标签"
ef317cd5 23252
7e6630a7 23253#: builtin/tag.c:449
ef317cd5 23254msgid "verify tags"
55a16ee4 23255msgstr "验证标签"
ef317cd5 23256
7e6630a7 23257#: builtin/tag.c:451
ef317cd5 23258msgid "Tag creation options"
55a16ee4 23259msgstr "标签创建选项"
ef317cd5 23260
7e6630a7 23261#: builtin/tag.c:453
ef317cd5 23262msgid "annotated tag, needs a message"
55a16ee4 23263msgstr "附注标签,需要一个说明"
ef317cd5 23264
7e6630a7 23265#: builtin/tag.c:455
ef317cd5 23266msgid "tag message"
55a16ee4 23267msgstr "标签说明"
ef317cd5 23268
7e6630a7 23269#: builtin/tag.c:457
31e5e17b
JX
23270msgid "force edit of tag message"
23271msgstr "强制编辑标签说明"
23272
7e6630a7 23273#: builtin/tag.c:458
ef317cd5 23274msgid "annotated and GPG-signed tag"
55a16ee4 23275msgstr "附注并附加 GPG 签名的标签"
ef317cd5 23276
7e6630a7 23277#: builtin/tag.c:461
ef317cd5 23278msgid "use another key to sign the tag"
55a16ee4 23279msgstr "使用另外的私钥签名该标签"
ef317cd5 23280
7e6630a7 23281#: builtin/tag.c:462
ef317cd5 23282msgid "replace the tag if exists"
55a16ee4 23283msgstr "如果存在,替换现有的标签"
ef317cd5 23284
7e6630a7 23285#: builtin/tag.c:463 builtin/update-ref.c:511
03ea3327 23286msgid "create a reflog"
1b7f4a34
JX
23287msgstr "创建引用日志"
23288
7e6630a7 23289#: builtin/tag.c:465
814ff314 23290msgid "Tag listing options"
55a16ee4 23291msgstr "标签列表选项"
814ff314 23292
7e6630a7 23293#: builtin/tag.c:466
ef317cd5 23294msgid "show tag list in columns"
55a16ee4 23295msgstr "以列的方式显示标签列表"
ef317cd5 23296
7e6630a7 23297#: builtin/tag.c:467 builtin/tag.c:469
ef317cd5 23298msgid "print only tags that contain the commit"
87cb7997 23299msgstr "只打印包含该提交的标签"
ef317cd5 23300
7e6630a7 23301#: builtin/tag.c:468 builtin/tag.c:470
87cb7997
JX
23302msgid "print only tags that don't contain the commit"
23303msgstr "只打印不包含该提交的标签"
23304
7e6630a7 23305#: builtin/tag.c:471
94550ed3
JX
23306msgid "print only tags that are merged"
23307msgstr "只打印已经合并的标签"
23308
7e6630a7 23309#: builtin/tag.c:472
94550ed3
JX
23310msgid "print only tags that are not merged"
23311msgstr "只打印尚未合并的标签"
23312
7e6630a7 23313#: builtin/tag.c:476
ef317cd5 23314msgid "print only tags of the object"
87cb7997 23315msgstr "只打印指向该对象的标签"
ef317cd5 23316
7e6630a7 23317#: builtin/tag.c:525
8ada9598 23318msgid "--column and -n are incompatible"
81809b99 23319msgstr "--column 和 -n 不兼容"
8ada9598 23320
7e6630a7 23321#: builtin/tag.c:546
87cb7997
JX
23322msgid "-n option is only allowed in list mode"
23323msgstr "-n 选项只允许用在列表显示模式"
c04f5ac3 23324
7e6630a7 23325#: builtin/tag.c:548
87cb7997
JX
23326msgid "--contains option is only allowed in list mode"
23327msgstr "--contains 选项只允许用在列表显示模式"
c04f5ac3 23328
7e6630a7 23329#: builtin/tag.c:550
87cb7997
JX
23330msgid "--no-contains option is only allowed in list mode"
23331msgstr "--no-contains 选项只允许用在列表显示模式"
7ac1c0ad 23332
7e6630a7 23333#: builtin/tag.c:552
87cb7997
JX
23334msgid "--points-at option is only allowed in list mode"
23335msgstr "--points-at 选项只允许用在列表显示模式"
94550ed3 23336
7e6630a7 23337#: builtin/tag.c:554
87cb7997
JX
23338msgid "--merged and --no-merged options are only allowed in list mode"
23339msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
23340
7e6630a7 23341#: builtin/tag.c:568
c04f5ac3
JX
23342msgid "only one -F or -m option is allowed."
23343msgstr "只允许一个 -F 或 -m 选项。"
23344
7e6630a7 23345#: builtin/tag.c:593
c04f5ac3
JX
23346#, c-format
23347msgid "'%s' is not a valid tag name."
55a16ee4 23348msgstr "'%s' 不是一个有效的标签名称。"
c04f5ac3 23349
7e6630a7 23350#: builtin/tag.c:598
c04f5ac3
JX
23351#, c-format
23352msgid "tag '%s' already exists"
55a16ee4 23353msgstr "标签 '%s' 已存在"
c04f5ac3 23354
7e6630a7 23355#: builtin/tag.c:629
c04f5ac3
JX
23356#, c-format
23357msgid "Updated tag '%s' (was %s)\n"
55a16ee4 23358msgstr "已更新标签 '%s'(曾为 %s)\n"
c04f5ac3 23359
33b62fba 23360#: builtin/unpack-objects.c:504
6c94aba5
JX
23361msgid "Unpacking objects"
23362msgstr "展开对象中"
23363
ddc12c42 23364#: builtin/update-index.c:84
7aea43ff
JX
23365#, c-format
23366msgid "failed to create directory %s"
c1ac5258 23367msgstr "创建目录 %s 失败"
7aea43ff 23368
7e6630a7 23369#: builtin/update-index.c:106
7aea43ff
JX
23370#, c-format
23371msgid "failed to delete file %s"
c1ac5258 23372msgstr "删除文件 %s 失败"
7aea43ff 23373
7e6630a7 23374#: builtin/update-index.c:113 builtin/update-index.c:219
7aea43ff
JX
23375#, c-format
23376msgid "failed to delete directory %s"
c1ac5258 23377msgstr "删除目录 %s 失败"
7aea43ff 23378
7e6630a7 23379#: builtin/update-index.c:138
7aea43ff 23380#, c-format
276ceeaa
JX
23381msgid "Testing mtime in '%s' "
23382msgstr "在 '%s' 中测试 mtime "
7aea43ff 23383
7e6630a7 23384#: builtin/update-index.c:152
7aea43ff
JX
23385msgid "directory stat info does not change after adding a new file"
23386msgstr "添加一个新文件后,目录的状态信息未改变"
23387
7e6630a7 23388#: builtin/update-index.c:165
7aea43ff
JX
23389msgid "directory stat info does not change after adding a new directory"
23390msgstr "添加一个新目录后,目录的状态信息未改变"
23391
7e6630a7 23392#: builtin/update-index.c:178
7aea43ff
JX
23393msgid "directory stat info changes after updating a file"
23394msgstr "更新一个文件后,目录的状态信息被修改"
23395
7e6630a7 23396#: builtin/update-index.c:189
7aea43ff
JX
23397msgid "directory stat info changes after adding a file inside subdirectory"
23398msgstr "在子目录中添加文件后,目录的状态信息被修改"
23399
7e6630a7 23400#: builtin/update-index.c:200
7aea43ff
JX
23401msgid "directory stat info does not change after deleting a file"
23402msgstr "删除一个文件后,目录的状态信息未改变"
23403
7e6630a7 23404#: builtin/update-index.c:213
7aea43ff
JX
23405msgid "directory stat info does not change after deleting a directory"
23406msgstr "删除一个目录后,目录的状态信息未改变"
23407
7e6630a7 23408#: builtin/update-index.c:220
7aea43ff
JX
23409msgid " OK"
23410msgstr " OK"
23411
7e6630a7 23412#: builtin/update-index.c:589
814ff314
JX
23413msgid "git update-index [<options>] [--] [<file>...]"
23414msgstr "git update-index [<选项>] [--] [<文件>...]"
8ada9598 23415
7e6630a7 23416#: builtin/update-index.c:974
ef317cd5 23417msgid "continue refresh even when index needs update"
07432cef 23418msgstr "当索引需要更新时继续刷新"
8ada9598 23419
7e6630a7 23420#: builtin/update-index.c:977
ef317cd5 23421msgid "refresh: ignore submodules"
07432cef 23422msgstr "刷新:忽略子模组"
8ada9598 23423
7e6630a7 23424#: builtin/update-index.c:980
ef317cd5 23425msgid "do not ignore new files"
07432cef 23426msgstr "不忽略新的文件"
8ada9598 23427
7e6630a7 23428#: builtin/update-index.c:982
ef317cd5 23429msgid "let files replace directories and vice-versa"
07432cef 23430msgstr "让文件替换目录(反之亦然)"
ef317cd5 23431
7e6630a7 23432#: builtin/update-index.c:984
ef317cd5 23433msgid "notice files missing from worktree"
07432cef 23434msgstr "通知文件从工作区丢失"
ef317cd5 23435
7e6630a7 23436#: builtin/update-index.c:986
ef317cd5 23437msgid "refresh even if index contains unmerged entries"
07432cef 23438msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 23439
7e6630a7 23440#: builtin/update-index.c:989
ef317cd5 23441msgid "refresh stat information"
07432cef 23442msgstr "刷新统计信息"
ef317cd5 23443
7e6630a7 23444#: builtin/update-index.c:993
ef317cd5 23445msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 23446msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 23447
7e6630a7 23448#: builtin/update-index.c:997
6c94aba5 23449msgid "<mode>,<object>,<path>"
d9d56b23 23450msgstr "<存取模式>,<对象>,<路径>"
ef317cd5 23451
7e6630a7 23452#: builtin/update-index.c:998
ef317cd5 23453msgid "add the specified entry to the index"
07432cef 23454msgstr "添加指定的条目到索引区"
ef317cd5 23455
7e6630a7 23456#: builtin/update-index.c:1008
ef317cd5 23457msgid "mark files as \"not changing\""
07432cef 23458msgstr "把文件标记为 \"没有变更\""
ef317cd5 23459
7e6630a7 23460#: builtin/update-index.c:1011
ef317cd5 23461msgid "clear assumed-unchanged bit"
07432cef 23462msgstr "清除 assumed-unchanged 位"
ef317cd5 23463
7e6630a7 23464#: builtin/update-index.c:1014
ef317cd5 23465msgid "mark files as \"index-only\""
07432cef 23466msgstr "把文件标记为 \"仅索引\""
ef317cd5 23467
7e6630a7 23468#: builtin/update-index.c:1017
ef317cd5 23469msgid "clear skip-worktree bit"
07432cef 23470msgstr "清除 skip-worktree 位"
ef317cd5 23471
7e6630a7 23472#: builtin/update-index.c:1020
ddc12c42
JX
23473msgid "do not touch index-only entries"
23474msgstr "不要触碰仅索引条目"
23475
7e6630a7 23476#: builtin/update-index.c:1022
ef317cd5 23477msgid "add to index only; do not add content to object database"
07432cef 23478msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 23479
7e6630a7 23480#: builtin/update-index.c:1024
ef317cd5 23481msgid "remove named paths even if present in worktree"
07432cef 23482msgstr "即使存在工作区里,也删除路径"
ef317cd5 23483
7e6630a7 23484#: builtin/update-index.c:1026
ef317cd5 23485msgid "with --stdin: input lines are terminated by null bytes"
07432cef 23486msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 23487
7e6630a7 23488#: builtin/update-index.c:1028
ef317cd5 23489msgid "read list of paths to be updated from standard input"
07432cef 23490msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 23491
7e6630a7 23492#: builtin/update-index.c:1032
ef317cd5 23493msgid "add entries from standard input to the index"
07432cef 23494msgstr "从标准输入添加条目到索引区"
ef317cd5 23495
7e6630a7 23496#: builtin/update-index.c:1036
ef317cd5 23497msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 23498msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 23499
7e6630a7 23500#: builtin/update-index.c:1040
ef317cd5 23501msgid "only update entries that differ from HEAD"
07432cef 23502msgstr "只更新与 HEAD 不同的条目"
ef317cd5 23503
7e6630a7 23504#: builtin/update-index.c:1044
ef317cd5 23505msgid "ignore files missing from worktree"
07432cef 23506msgstr "忽略工作区丢失的文件"
ef317cd5 23507
7e6630a7 23508#: builtin/update-index.c:1047
ef317cd5 23509msgid "report actions to standard output"
07432cef 23510msgstr "在标准输出显示操作"
ef317cd5 23511
7e6630a7 23512#: builtin/update-index.c:1049
ef317cd5 23513msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 23514msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 23515
7e6630a7 23516#: builtin/update-index.c:1053
ef317cd5 23517msgid "write index in this format"
07432cef 23518msgstr "以这种格式写入索引区"
ef317cd5 23519
7e6630a7 23520#: builtin/update-index.c:1055
6acbf033
JX
23521msgid "enable or disable split index"
23522msgstr "启用或禁用索引拆分"
23523
7e6630a7 23524#: builtin/update-index.c:1057
7aea43ff
JX
23525msgid "enable/disable untracked cache"
23526msgstr "启用/禁用对未跟踪文件的缓存"
23527
7e6630a7 23528#: builtin/update-index.c:1059
276ceeaa
JX
23529msgid "test if the filesystem supports untracked cache"
23530msgstr "测试文件系统是否支持未跟踪文件缓存"
23531
7e6630a7 23532#: builtin/update-index.c:1061
7aea43ff
JX
23533msgid "enable untracked cache without testing the filesystem"
23534msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
23535
7e6630a7 23536#: builtin/update-index.c:1063
5809aa05
JX
23537msgid "write out the index even if is not flagged as changed"
23538msgstr "即使没有被标记为已更改,也要写出索引"
23539
7e6630a7 23540#: builtin/update-index.c:1065
5809aa05
JX
23541msgid "enable or disable file system monitor"
23542msgstr "启用或禁用文件系统监控"
23543
7e6630a7 23544#: builtin/update-index.c:1067
5809aa05
JX
23545msgid "mark files as fsmonitor valid"
23546msgstr "标记文件为 fsmonitor 有效"
23547
7e6630a7 23548#: builtin/update-index.c:1070
5809aa05
JX
23549msgid "clear fsmonitor valid bit"
23550msgstr "清除 fsmonitor 有效位"
23551
7e6630a7 23552#: builtin/update-index.c:1173
87cb7997
JX
23553msgid ""
23554"core.splitIndex is set to false; remove or change it, if you really want to "
23555"enable split index"
23556msgstr ""
23557"core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。"
23558
7e6630a7 23559#: builtin/update-index.c:1182
87cb7997
JX
23560msgid ""
23561"core.splitIndex is set to true; remove or change it, if you really want to "
23562"disable split index"
23563msgstr ""
23564"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。"
23565
7e6630a7 23566#: builtin/update-index.c:1194
a0b6b246
JX
23567msgid ""
23568"core.untrackedCache is set to true; remove or change it, if you really want "
23569"to disable the untracked cache"
275588f9
JX
23570msgstr ""
23571"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
23572"改它。"
a0b6b246 23573
7e6630a7 23574#: builtin/update-index.c:1198
276ceeaa
JX
23575msgid "Untracked cache disabled"
23576msgstr "缓存未跟踪文件被禁用"
23577
7e6630a7 23578#: builtin/update-index.c:1206
a0b6b246
JX
23579msgid ""
23580"core.untrackedCache is set to false; remove or change it, if you really want "
23581"to enable the untracked cache"
275588f9
JX
23582msgstr ""
23583"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
23584"修改它。"
a0b6b246 23585
7e6630a7 23586#: builtin/update-index.c:1210
276ceeaa
JX
23587#, c-format
23588msgid "Untracked cache enabled for '%s'"
23589msgstr "缓存未跟踪文件在 '%s' 启用"
23590
7e6630a7 23591#: builtin/update-index.c:1218
5809aa05 23592msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
31e5e17b 23593msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项"
5809aa05 23594
7e6630a7 23595#: builtin/update-index.c:1222
5809aa05
JX
23596msgid "fsmonitor enabled"
23597msgstr "fsmonitor 被启用"
23598
7e6630a7 23599#: builtin/update-index.c:1225
5809aa05
JX
23600msgid ""
23601"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
31e5e17b 23602msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项"
5809aa05 23603
7e6630a7 23604#: builtin/update-index.c:1229
5809aa05
JX
23605msgid "fsmonitor disabled"
23606msgstr "fsmonitor 被禁用"
23607
a4f16749 23608#: builtin/update-ref.c:10
814ff314
JX
23609msgid "git update-ref [<options>] -d <refname> [<old-val>]"
23610msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
ef317cd5 23611
a4f16749 23612#: builtin/update-ref.c:11
814ff314
JX
23613msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
23614msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
90314792 23615
a4f16749 23616#: builtin/update-ref.c:12
814ff314
JX
23617msgid "git update-ref [<options>] --stdin [-z]"
23618msgstr "git update-ref [<选项>] --stdin [-z]"
ef317cd5 23619
7e6630a7 23620#: builtin/update-ref.c:506
ef317cd5 23621msgid "delete the reference"
07432cef 23622msgstr "删除引用"
ef317cd5 23623
7e6630a7 23624#: builtin/update-ref.c:508
ef317cd5 23625msgid "update <refname> not the one it points to"
07432cef 23626msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 23627
7e6630a7 23628#: builtin/update-ref.c:509
90314792
JX
23629msgid "stdin has NUL-terminated arguments"
23630msgstr "标准输入有以 NUL 字符终止的参数"
23631
7e6630a7 23632#: builtin/update-ref.c:510
90314792
JX
23633msgid "read updates from stdin"
23634msgstr "从标准输入读取更新"
23635
a4f16749 23636#: builtin/update-server-info.c:7
ef317cd5 23637msgid "git update-server-info [--force]"
07432cef 23638msgstr "git update-server-info [--force]"
ef317cd5 23639
a4f16749 23640#: builtin/update-server-info.c:15
ef317cd5 23641msgid "update the info files from scratch"
07432cef 23642msgstr "从头开始更新文件信息"
ef317cd5 23643
fd8cb379
JX
23644#: builtin/upload-pack.c:11
23645msgid "git upload-pack [<options>] <dir>"
23646msgstr "git upload-pack [<选项>] <目录>"
23647
7e6630a7 23648#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
d46c5519
JX
23649msgid "quit after a single request/response exchange"
23650msgstr "在一次单独的请求/响应之后退出"
23651
7e6630a7
FZ
23652#: builtin/upload-pack.c:26
23653msgid "serve up the info/refs for git-http-backend"
23654msgstr "为 git-http-backend 提供 info/refs"
fd8cb379 23655
7e6630a7 23656#: builtin/upload-pack.c:29
fd8cb379
JX
23657msgid "do not try <directory>/.git/ if <directory> is no Git directory"
23658msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/"
23659
7e6630a7 23660#: builtin/upload-pack.c:31
fd8cb379
JX
23661msgid "interrupt transfer after <n> seconds of inactivity"
23662msgstr "不活动 <n> 秒钟后终止传输"
23663
a6cd2cc4 23664#: builtin/verify-commit.c:19
814ff314
JX
23665msgid "git verify-commit [-v | --verbose] <commit>..."
23666msgstr "git verify-commit [-v | --verbose] <提交>..."
6acbf033 23667
a6cd2cc4 23668#: builtin/verify-commit.c:68
6acbf033
JX
23669msgid "print commit contents"
23670msgstr "打印提交内容"
23671
a6cd2cc4 23672#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
1b7f4a34
JX
23673msgid "print raw gpg status output"
23674msgstr "打印原始 gpg 状态输出"
23675
d9488fea 23676#: builtin/verify-pack.c:59
814ff314
JX
23677msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
23678msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
ef317cd5 23679
d9488fea 23680#: builtin/verify-pack.c:70
ef317cd5
JX
23681msgid "verbose"
23682msgstr "冗长输出"
23683
d9488fea 23684#: builtin/verify-pack.c:72
ef317cd5 23685msgid "show statistics only"
07432cef 23686msgstr "只显示统计"
ef317cd5 23687
a6cd2cc4 23688#: builtin/verify-tag.c:18
1a79b2f1
JX
23689msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
23690msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
ef317cd5 23691
a6cd2cc4 23692#: builtin/verify-tag.c:36
ef317cd5 23693msgid "print tag contents"
55a16ee4 23694msgstr "打印标签内容"
ef317cd5 23695
7e6630a7 23696#: builtin/worktree.c:19
31e5e17b
JX
23697msgid "git worktree add [<options>] <path> [<commit-ish>]"
23698msgstr "git worktree add [<选项>] <路径> [<提交>]"
5bb01d4f 23699
7e6630a7 23700#: builtin/worktree.c:20
5c57d762
JX
23701msgid "git worktree list [<options>]"
23702msgstr "git worktree list [<选项>]"
23703
7e6630a7 23704#: builtin/worktree.c:21
5c57d762
JX
23705msgid "git worktree lock [<options>] <path>"
23706msgstr "git worktree lock [<选项>] <路径>"
23707
7e6630a7 23708#: builtin/worktree.c:22
31e5e17b
JX
23709msgid "git worktree move <worktree> <new-path>"
23710msgstr "git worktree move <工作区> <新路径>"
23711
7e6630a7 23712#: builtin/worktree.c:23
5bb01d4f
JX
23713msgid "git worktree prune [<options>]"
23714msgstr "git worktree prune [<选项>]"
23715
7e6630a7 23716#: builtin/worktree.c:24
31e5e17b
JX
23717msgid "git worktree remove [<options>] <worktree>"
23718msgstr "git worktree remove [<选项>] <工作区>"
23719
7e6630a7 23720#: builtin/worktree.c:25
5c57d762
JX
23721msgid "git worktree unlock <path>"
23722msgstr "git worktree unlock <路径>"
94550ed3 23723
7e6630a7 23724#: builtin/worktree.c:75
5bb01d4f 23725#, c-format
7157c2b5
JX
23726msgid "Removing %s/%s: %s"
23727msgstr "删除 %s/%s: %s"
5bb01d4f 23728
7e6630a7 23729#: builtin/worktree.c:148
1a79b2f1
JX
23730msgid "report pruned working trees"
23731msgstr "报告清除的工作区"
23732
7e6630a7 23733#: builtin/worktree.c:150
1a79b2f1 23734msgid "expire working trees older than <time>"
58b6f078 23735msgstr "将早于 <时间> 的工作区过期"
1a79b2f1 23736
7e6630a7 23737#: builtin/worktree.c:220
5bb01d4f
JX
23738#, c-format
23739msgid "'%s' already exists"
23740msgstr "'%s' 已经存在"
23741
7e6630a7 23742#: builtin/worktree.c:229
4c27fcb5 23743#, c-format
7157c2b5
JX
23744msgid "unusable worktree destination '%s'"
23745msgstr "无法使用的工作区目标 '%s'"
4c27fcb5 23746
7e6630a7 23747#: builtin/worktree.c:234
4c27fcb5
JX
23748#, c-format
23749msgid ""
23750"'%s' is a missing but locked worktree;\n"
7157c2b5 23751"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
4c27fcb5 23752msgstr ""
7157c2b5
JX
23753"'%s' 是一个丢失但锁定的工作区,\n"
23754"使用 '%s -f -f' 覆盖,或用 'unlock' 和 'prune' 或 'remove' 清除"
4c27fcb5 23755
7e6630a7 23756#: builtin/worktree.c:236
4c27fcb5
JX
23757#, c-format
23758msgid ""
23759"'%s' is a missing but already registered worktree;\n"
7157c2b5 23760"use '%s -f' to override, or 'prune' or 'remove' to clear"
4c27fcb5 23761msgstr ""
7157c2b5
JX
23762"'%s' 是一个丢失但已经注册的工作区,\n"
23763"使用 '%s -f' 覆盖,或用 'prune' 或 'remove' 清除"
4c27fcb5 23764
7e6630a7 23765#: builtin/worktree.c:287
5bb01d4f
JX
23766#, c-format
23767msgid "could not create directory of '%s'"
23768msgstr "不能创建目录 '%s'"
23769
7e6630a7 23770#: builtin/worktree.c:309
ec3d4607
JX
23771msgid "initializing"
23772msgstr "初始化"
23773
7e6630a7 23774#: builtin/worktree.c:421 builtin/worktree.c:427
fd8cb379
JX
23775#, c-format
23776msgid "Preparing worktree (new branch '%s')"
23777msgstr "准备工作区(新分支 '%s')"
23778
7e6630a7 23779#: builtin/worktree.c:423
fd8cb379
JX
23780#, c-format
23781msgid "Preparing worktree (resetting branch '%s'; was at %s)"
23782msgstr "准备工作区(重置分支 '%s',之前为 %s)"
23783
7e6630a7 23784#: builtin/worktree.c:432
fd8cb379
JX
23785#, c-format
23786msgid "Preparing worktree (checking out '%s')"
23787msgstr "准备工作区(检出 '%s')"
23788
7e6630a7 23789#: builtin/worktree.c:438
5bb01d4f 23790#, c-format
fd8cb379
JX
23791msgid "Preparing worktree (detached HEAD %s)"
23792msgstr "准备工作区(分离头指针 %s)"
5bb01d4f 23793
7e6630a7 23794#: builtin/worktree.c:483
5bb01d4f 23795msgid "checkout <branch> even if already checked out in other worktree"
58b6f078 23796msgstr "检出 <分支>,即使已经被检出到其它工作区"
5bb01d4f 23797
7e6630a7 23798#: builtin/worktree.c:486
5bb01d4f
JX
23799msgid "create a new branch"
23800msgstr "创建一个新分支"
23801
7e6630a7 23802#: builtin/worktree.c:488
5bb01d4f
JX
23803msgid "create or reset a branch"
23804msgstr "创建或重置一个分支"
23805
7e6630a7 23806#: builtin/worktree.c:490
5b04ee3b
JX
23807msgid "populate the new working tree"
23808msgstr "生成新的工作区"
23809
7e6630a7 23810#: builtin/worktree.c:491
60638e98
JX
23811msgid "keep the new working tree locked"
23812msgstr "锁定新工作区"
23813
7e6630a7 23814#: builtin/worktree.c:493 builtin/worktree.c:730
ec3d4607
JX
23815msgid "reason for locking"
23816msgstr "锁定原因"
23817
7e6630a7 23818#: builtin/worktree.c:496
5809aa05
JX
23819msgid "set up tracking mode (see git-branch(1))"
23820msgstr "设置跟踪模式(参见 git-branch(1))"
23821
7e6630a7 23822#: builtin/worktree.c:499
5809aa05
JX
23823msgid "try to match the new branch name with a remote-tracking branch"
23824msgstr "尝试为新分支名匹配一个远程跟踪分支"
23825
7e6630a7 23826#: builtin/worktree.c:507
1b7f4a34
JX
23827msgid "-b, -B, and --detach are mutually exclusive"
23828msgstr "-b、-B 和 --detach 是互斥的"
5bb01d4f 23829
7e6630a7 23830#: builtin/worktree.c:509
ec3d4607
JX
23831msgid "--reason requires --lock"
23832msgstr "--reason 需要 --lock"
23833
7e6630a7 23834#: builtin/worktree.c:513
ec3d4607
JX
23835msgid "added with --lock"
23836msgstr "由 --lock 添加"
23837
7e6630a7 23838#: builtin/worktree.c:575
5809aa05
JX
23839msgid "--[no-]track can only be used if a new branch is created"
23840msgstr "只能在创建新分支时使用选项 --[no-]track "
23841
7e6630a7 23842#: builtin/worktree.c:692
473eb541
JX
23843msgid "show extended annotations and reasons, if available"
23844msgstr "显示扩展的注释和原因(如果有)"
23845
7e6630a7 23846#: builtin/worktree.c:694
473eb541
JX
23847msgid "add 'prunable' annotation to worktrees older than <time>"
23848msgstr "向早于 <时间> 的工作区添添加“可修剪”注释"
23849
7e6630a7 23850#: builtin/worktree.c:703
473eb541
JX
23851msgid "--verbose and --porcelain are mutually exclusive"
23852msgstr "--verbose 和 --porcelain 互斥"
23853
7e6630a7
FZ
23854#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
23855#: builtin/worktree.c:973
5c57d762
JX
23856#, c-format
23857msgid "'%s' is not a working tree"
23858msgstr "'%s' 不是一个工作区"
23859
7e6630a7 23860#: builtin/worktree.c:744 builtin/worktree.c:777
5c57d762
JX
23861msgid "The main working tree cannot be locked or unlocked"
23862msgstr "主工作区无法被加锁或解锁"
23863
7e6630a7 23864#: builtin/worktree.c:749
5c57d762
JX
23865#, c-format
23866msgid "'%s' is already locked, reason: %s"
23867msgstr "'%s' 已被锁定,原因:%s"
23868
7e6630a7 23869#: builtin/worktree.c:751
5c57d762
JX
23870#, c-format
23871msgid "'%s' is already locked"
23872msgstr "'%s' 已被锁定"
23873
7e6630a7 23874#: builtin/worktree.c:779
5c57d762
JX
23875#, c-format
23876msgid "'%s' is not locked"
23877msgstr "'%s' 未被锁定"
23878
7e6630a7 23879#: builtin/worktree.c:820
31e5e17b 23880msgid "working trees containing submodules cannot be moved or removed"
610f8099 23881msgstr "不能移动或删除包含子模组的工作区"
31e5e17b 23882
7e6630a7 23883#: builtin/worktree.c:828
4c27fcb5
JX
23884msgid "force move even if worktree is dirty or locked"
23885msgstr "强制移动,即使工作区是脏的或已锁定"
23886
7e6630a7 23887#: builtin/worktree.c:851 builtin/worktree.c:975
31e5e17b
JX
23888#, c-format
23889msgid "'%s' is a main working tree"
23890msgstr "'%s' 是一个主工作区"
23891
7e6630a7 23892#: builtin/worktree.c:856
31e5e17b
JX
23893#, c-format
23894msgid "could not figure out destination name from '%s'"
23895msgstr "无法从 '%s' 算出目标名称"
23896
7e6630a7 23897#: builtin/worktree.c:869
31e5e17b 23898#, c-format
4c27fcb5
JX
23899msgid ""
23900"cannot move a locked working tree, lock reason: %s\n"
23901"use 'move -f -f' to override or unlock first"
23902msgstr ""
23903"无法移动一个锁定的工作区,锁定原因:%s\n"
23904"使用 'move -f -f' 覆盖或先解锁"
31e5e17b 23905
7e6630a7 23906#: builtin/worktree.c:871
4c27fcb5
JX
23907msgid ""
23908"cannot move a locked working tree;\n"
23909"use 'move -f -f' to override or unlock first"
23910msgstr ""
23911"无法移动一个锁定的工作区,\n"
23912"使用 'move -f -f' 覆盖或先解锁"
31e5e17b 23913
7e6630a7 23914#: builtin/worktree.c:874
31e5e17b
JX
23915#, c-format
23916msgid "validation failed, cannot move working tree: %s"
23917msgstr "验证失败,无法移动工作区:%s"
23918
7e6630a7 23919#: builtin/worktree.c:879
31e5e17b
JX
23920#, c-format
23921msgid "failed to move '%s' to '%s'"
c1ac5258 23922msgstr "移动 '%s' 到 '%s' 失败"
31e5e17b 23923
7e6630a7 23924#: builtin/worktree.c:925
31e5e17b
JX
23925#, c-format
23926msgid "failed to run 'git status' on '%s'"
c1ac5258 23927msgstr "在 '%s' 中执行 'git status' 失败"
31e5e17b 23928
7e6630a7 23929#: builtin/worktree.c:929
31e5e17b 23930#, c-format
a5cd71ca
JX
23931msgid "'%s' contains modified or untracked files, use --force to delete it"
23932msgstr "'%s' 包含修改或未跟踪的文件,使用 --force 删除"
31e5e17b 23933
7e6630a7 23934#: builtin/worktree.c:934
31e5e17b
JX
23935#, c-format
23936msgid "failed to run 'git status' on '%s', code %d"
c1ac5258 23937msgstr "在 '%s' 中执行 'git status' 失败,退出码 %d"
31e5e17b 23938
7e6630a7 23939#: builtin/worktree.c:957
4c27fcb5
JX
23940msgid "force removal even if worktree is dirty or locked"
23941msgstr "强制删除,即使工作区是脏的或已锁定"
31e5e17b 23942
7e6630a7 23943#: builtin/worktree.c:980
31e5e17b 23944#, c-format
4c27fcb5
JX
23945msgid ""
23946"cannot remove a locked working tree, lock reason: %s\n"
23947"use 'remove -f -f' to override or unlock first"
23948msgstr ""
23949"无法删除一个锁定的工作区,锁定原因:%s\n"
23950"使用 'remove -f -f' 覆盖或先解锁"
31e5e17b 23951
7e6630a7 23952#: builtin/worktree.c:982
4c27fcb5
JX
23953msgid ""
23954"cannot remove a locked working tree;\n"
23955"use 'remove -f -f' to override or unlock first"
23956msgstr ""
23957"无法删除一个锁定的工作区,\n"
23958"使用 'remove -f -f' 覆盖或先解锁"
31e5e17b 23959
7e6630a7 23960#: builtin/worktree.c:985
31e5e17b
JX
23961#, c-format
23962msgid "validation failed, cannot remove working tree: %s"
23963msgstr "验证失败,无法删除工作区:%s"
23964
7e6630a7 23965#: builtin/worktree.c:1009
d9488fea
JX
23966#, c-format
23967msgid "repair: %s: %s"
23968msgstr "修理:%s:%s"
23969
7e6630a7 23970#: builtin/worktree.c:1012
d9488fea
JX
23971#, c-format
23972msgid "error: %s: %s"
23973msgstr "错误:%s:%s"
23974
06991777 23975#: builtin/write-tree.c:15
ef317cd5 23976msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 23977msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5 23978
06991777 23979#: builtin/write-tree.c:28
ef317cd5 23980msgid "<prefix>/"
07432cef 23981msgstr "<前缀>/"
ef317cd5 23982
06991777 23983#: builtin/write-tree.c:29
ef317cd5 23984msgid "write tree object for a subdirectory <prefix>"
07432cef 23985msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5 23986
06991777 23987#: builtin/write-tree.c:31
ef317cd5 23988msgid "only useful for debugging"
07432cef 23989msgstr "只对调试有用"
ef317cd5 23990
349ede6a 23991#: git.c:28
31e5e17b
JX
23992msgid ""
23993"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
23994" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
fd8cb379
JX
23995" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
23996"bare]\n"
31e5e17b 23997" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
473eb541 23998" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
31e5e17b
JX
23999" <command> [<args>]"
24000msgstr ""
fd8cb379 24001"git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n"
31e5e17b 24002" [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
33b62fba
JX
24003" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
24004"bare]\n"
31e5e17b 24005" [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
473eb541 24006" [--super-prefix=<路径>] [--config-env=<名称>=<环境变量>]\n"
31e5e17b
JX
24007" <命令> [<参数>]"
24008
473eb541 24009#: git.c:36
4dcdc3d8 24010msgid ""
220c313c 24011"'git help -a' and 'git help -g' list available subcommands and some\n"
4dcdc3d8 24012"concept guides. See 'git help <command>' or 'git help <concept>'\n"
a6cd2cc4
JX
24013"to read about a specific subcommand or concept.\n"
24014"See 'git help git' for an overview of the system."
4dcdc3d8 24015msgstr ""
220c313c
JX
24016"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
24017"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
a6cd2cc4
JX
24018"帮助。\n"
24019"有关系统的概述,查看 'git help git'。"
8ada9598 24020
473eb541 24021#: git.c:188
31e5e17b
JX
24022#, c-format
24023msgid "no directory given for --git-dir\n"
24024msgstr "没有为 --git-dir 提供目录\n"
24025
473eb541 24026#: git.c:202
31e5e17b
JX
24027#, c-format
24028msgid "no namespace given for --namespace\n"
24029msgstr "没有为 --namespace 提供命名空间\n"
24030
473eb541 24031#: git.c:216
31e5e17b
JX
24032#, c-format
24033msgid "no directory given for --work-tree\n"
24034msgstr "没有为 --work-tree 提供目录\n"
24035
473eb541 24036#: git.c:230
31e5e17b
JX
24037#, c-format
24038msgid "no prefix given for --super-prefix\n"
24039msgstr "没有为 --super-prefix 提供前缀\n"
24040
473eb541 24041#: git.c:252
31e5e17b
JX
24042#, c-format
24043msgid "-c expects a configuration string\n"
24044msgstr "应为 -c 提供一个配置字符串\n"
24045
33b62fba
JX
24046#: git.c:260
24047#, c-format
24048msgid "no config key given for --config-env\n"
24049msgstr "没有为 --config-env 提供配置名称\n"
24050
24051#: git.c:300
31e5e17b
JX
24052#, c-format
24053msgid "no directory given for -C\n"
24054msgstr "没有为 -C 提供目录\n"
24055
33b62fba 24056#: git.c:326
31e5e17b
JX
24057#, c-format
24058msgid "unknown option: %s\n"
24059msgstr "未知选项:%s\n"
24060
33b62fba 24061#: git.c:375
06991777
JX
24062#, c-format
24063msgid "while expanding alias '%s': '%s'"
5b533632 24064msgstr "在扩展别名 '%s' 时:'%s'"
06991777 24065
33b62fba 24066#: git.c:384
06991777
JX
24067#, c-format
24068msgid ""
24069"alias '%s' changes environment variables.\n"
24070"You can use '!git' in the alias to do this"
24071msgstr ""
24072"别名 '%s' 修改环境变量。您可以使用在别名中\n"
24073"使用 '!git'"
24074
33b62fba 24075#: git.c:391
06991777
JX
24076#, c-format
24077msgid "empty alias for %s"
24078msgstr "%s 的空别名"
24079
33b62fba 24080#: git.c:394
06991777
JX
24081#, c-format
24082msgid "recursive alias: %s"
5b533632 24083msgstr "递归的别名:%s"
06991777 24084
33b62fba 24085#: git.c:476
06991777
JX
24086msgid "write failure on standard output"
24087msgstr "在标准输出写入失败"
24088
33b62fba 24089#: git.c:478
06991777
JX
24090msgid "unknown write failure on standard output"
24091msgstr "到标准输出的未知写入错误"
24092
33b62fba 24093#: git.c:480
06991777
JX
24094msgid "close failed on standard output"
24095msgstr "标准输出关闭失败"
24096
7e6630a7 24097#: git.c:832
4c27fcb5
JX
24098#, c-format
24099msgid "alias loop detected: expansion of '%s' does not terminate:%s"
24100msgstr "检测到别名循环:'%s'的扩展未终止:%s"
24101
7e6630a7 24102#: git.c:882
06991777
JX
24103#, c-format
24104msgid "cannot handle %s as a builtin"
24105msgstr "不能作为内置命令处理 %s"
24106
7e6630a7 24107#: git.c:895
06991777
JX
24108#, c-format
24109msgid ""
24110"usage: %s\n"
24111"\n"
24112msgstr ""
24113"用法:%s\n"
24114"\n"
24115
7e6630a7 24116#: git.c:915
31e5e17b
JX
24117#, c-format
24118msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
24119msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n"
24120
7e6630a7 24121#: git.c:927
31e5e17b
JX
24122#, c-format
24123msgid "failed to run command '%s': %s\n"
c1ac5258 24124msgstr "运行命令 '%s' 失败:%s\n"
31e5e17b 24125
33b62fba
JX
24126#: http-fetch.c:118
24127#, c-format
24128msgid "argument to --packfile must be a valid hash (got '%s')"
24129msgstr "--packfile 的参数必须是有效的哈希值(得到 '%s')"
24130
24131#: http-fetch.c:128
24132msgid "not a git repository"
24133msgstr "不是 git 仓库"
24134
24135#: http-fetch.c:134
24136msgid "--packfile requires --index-pack-args"
24137msgstr "--packfile 需要 --index-pack-args"
24138
24139#: http-fetch.c:143
24140msgid "--index-pack-args can only be used with --packfile"
24141msgstr "--index-pack-args 只能和 --packfile 一起使用"
24142
24143#: t/helper/test-fast-rebase.c:141
24144msgid "unhandled options"
24145msgstr "未处理的选项"
24146
24147#: t/helper/test-fast-rebase.c:146
24148msgid "error preparing revisions"
24149msgstr "准备版本时错误"
24150
24151#: t/helper/test-reach.c:154
24152#, c-format
24153msgid "commit %s is not marked reachable"
24154msgstr "提交 %s 没有标记为可达"
24155
24156#: t/helper/test-reach.c:164
24157msgid "too many commits marked reachable"
24158msgstr "太多提交标记为可达"
24159
24160#: t/helper/test-serve-v2.c:7
24161msgid "test-tool serve-v2 [<options>]"
24162msgstr "test-tool serve-v2 [<选项>]"
24163
24164#: t/helper/test-serve-v2.c:19
24165msgid "exit immediately after advertising capabilities"
7b4d4954 24166msgstr "通告能力之后立即退出"
33b62fba 24167
7e6630a7 24168#: t/helper/test-simple-ipc.c:581
33b62fba
JX
24169msgid "test-helper simple-ipc is-active [<name>] [<options>]"
24170msgstr "test-helper simple-ipc is-active [<名字>] [<选项>]"
24171
7e6630a7 24172#: t/helper/test-simple-ipc.c:582
33b62fba
JX
24173msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
24174msgstr "test-helper simple-ipc run-daemon [<名字>] [<线程>]"
24175
7e6630a7 24176#: t/helper/test-simple-ipc.c:583
33b62fba
JX
24177msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
24178msgstr "test-helper simple-ipc start-daemon [<名字>] [<线程>] [<最大等待>]"
24179
7e6630a7 24180#: t/helper/test-simple-ipc.c:584
33b62fba
JX
24181msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
24182msgstr "test-helper simple-ipc stop-daemon [<名字>] [<最大等待>]"
24183
7e6630a7 24184#: t/helper/test-simple-ipc.c:585
33b62fba
JX
24185msgid "test-helper simple-ipc send [<name>] [<token>]"
24186msgstr "test-helper simple-ipc send [<名字>] [<令牌>]"
24187
7e6630a7 24188#: t/helper/test-simple-ipc.c:586
33b62fba
JX
24189msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
24190msgstr "test-helper simple-ipc sendbytes [<名字>] [<字节数>] [<字节>]"
24191
7e6630a7 24192#: t/helper/test-simple-ipc.c:587
33b62fba
JX
24193msgid ""
24194"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
24195"[<batchsize>]"
ec3d4607
JX
24196msgstr ""
24197"test-helper simple-ipc multiple [<名字>] [<线程>] [<字节计数>] [<批处理大"
24198"小>]"
33b62fba 24199
7e6630a7 24200#: t/helper/test-simple-ipc.c:595
33b62fba
JX
24201msgid "name or pathname of unix domain socket"
24202msgstr "unix 域套接字的名称或路径名"
24203
7e6630a7 24204#: t/helper/test-simple-ipc.c:597
33b62fba
JX
24205msgid "named-pipe name"
24206msgstr "命名管道的名字"
24207
7e6630a7 24208#: t/helper/test-simple-ipc.c:599
33b62fba
JX
24209msgid "number of threads in server thread pool"
24210msgstr "服务器线程池中的线程数"
24211
7e6630a7 24212#: t/helper/test-simple-ipc.c:600
33b62fba
JX
24213msgid "seconds to wait for daemon to start or stop"
24214msgstr "等待守护进程启动或停止的秒数"
24215
7e6630a7 24216#: t/helper/test-simple-ipc.c:602
33b62fba
JX
24217msgid "number of bytes"
24218msgstr "字节数目"
24219
7e6630a7 24220#: t/helper/test-simple-ipc.c:603
33b62fba
JX
24221msgid "number of requests per thread"
24222msgstr "每个线程的请求数"
24223
7e6630a7 24224#: t/helper/test-simple-ipc.c:605
33b62fba
JX
24225msgid "byte"
24226msgstr "字节"
24227
7e6630a7 24228#: t/helper/test-simple-ipc.c:605
33b62fba
JX
24229msgid "ballast character"
24230msgstr "ballast character"
24231
7e6630a7 24232#: t/helper/test-simple-ipc.c:606
33b62fba
JX
24233msgid "token"
24234msgstr "令牌"
24235
7e6630a7 24236#: t/helper/test-simple-ipc.c:606
33b62fba
JX
24237msgid "command token to send to the server"
24238msgstr "发送到服务器的命令令牌"
24239
7e6630a7 24240#: http.c:350
60638e98
JX
24241#, c-format
24242msgid "negative value for http.postbuffer; defaulting to %d"
24243msgstr "http.postbuffer 为负值,默认为 %d"
24244
7e6630a7 24245#: http.c:371
a0b6b246 24246msgid "Delegation control is not supported with cURL < 7.22.0"
4c27fcb5 24247msgstr "不支持委托控制,因为 cURL < 7.22.0"
a0b6b246 24248
7e6630a7
FZ
24249#: http.c:380
24250msgid "Public key pinning not supported with cURL < 7.39.0"
24251msgstr "不支持公钥文件锁定,因为 cURL < 7.39.0"
276ceeaa 24252
7e6630a7 24253#: http.c:812
4c27fcb5
JX
24254msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
24255msgstr "不支持 CURLSSLOPT_NO_REVOKE,因为 cURL < 7.44.0"
24256
7e6630a7 24257#: http.c:1016
4c27fcb5
JX
24258#, c-format
24259msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
24260msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端:"
24261
7e6630a7 24262#: http.c:1023
4c27fcb5
JX
24263#, c-format
24264msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
24265msgstr "无法设置 SSL 后端为 '%s':cURL: cURL 没有使用 SSL 后端构建"
24266
7e6630a7 24267#: http.c:1027
4c27fcb5
JX
24268#, c-format
24269msgid "Could not set SSL backend to '%s': already set"
24270msgstr "无法将 SSL 后端设置为 '%s':已经设置"
24271
7e6630a7 24272#: http.c:1876
1a79b2f1
JX
24273#, c-format
24274msgid ""
24275"unable to update url base from redirection:\n"
24276" asked for: %s\n"
24277" redirect: %s"
24278msgstr ""
24279"不能更新重定向的 url base:\n"
24280" 请求:%s\n"
24281" 重定向:%s"
24282
d13389bf 24283#: remote-curl.c:183
d46c5519
JX
24284#, c-format
24285msgid "invalid quoting in push-option value: '%s'"
5b533632 24286msgstr "在 push-option 取值中无效的引号:'%s'"
d46c5519 24287
7e6630a7 24288#: remote-curl.c:304
d46c5519
JX
24289#, c-format
24290msgid "%sinfo/refs not valid: is this a git repository?"
d9488fea 24291msgstr "%sinfo/refs 无效:这是 git 仓库么?"
d46c5519 24292
7e6630a7 24293#: remote-curl.c:405
d46c5519
JX
24294msgid "invalid server response; expected service, got flush packet"
24295msgstr "无效的服务端响应。预期服务,得到 flush 包"
24296
7e6630a7 24297#: remote-curl.c:436
d46c5519
JX
24298#, c-format
24299msgid "invalid server response; got '%s'"
24300msgstr "无效的服务端响应,得到 '%s'"
24301
7e6630a7 24302#: remote-curl.c:496
d46c5519
JX
24303#, c-format
24304msgid "repository '%s' not found"
24305msgstr "仓库 '%s' 未找到"
24306
7e6630a7 24307#: remote-curl.c:500
d46c5519
JX
24308#, c-format
24309msgid "Authentication failed for '%s'"
24310msgstr "'%s' 鉴权失败"
24311
7e6630a7
FZ
24312#: remote-curl.c:504
24313#, c-format
24314msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
24315msgstr "无法以 http.pinnedPubkey 设置访问 '%s':%s"
24316
24317#: remote-curl.c:508
d46c5519
JX
24318#, c-format
24319msgid "unable to access '%s': %s"
24320msgstr "无法访问 '%s':%s"
24321
7e6630a7 24322#: remote-curl.c:514
1a79b2f1
JX
24323#, c-format
24324msgid "redirecting to %s"
24325msgstr "重定向到 %s"
24326
7e6630a7 24327#: remote-curl.c:645
d46c5519 24328msgid "shouldn't have EOF when not gentle on EOF"
5b533632 24329msgstr "当没有设置温和处理文件结束符(EOF)时,不应该有文件结束符"
d46c5519 24330
7e6630a7 24331#: remote-curl.c:657
ec3d4607
JX
24332msgid "remote server sent unexpected response end packet"
24333msgstr "远程服务器发送意外的响应结束数据包"
7157c2b5 24334
ec3d4607 24335#: remote-curl.c:726
d46c5519
JX
24336msgid "unable to rewind rpc post data - try increasing http.postBuffer"
24337msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
24338
7e6630a7 24339#: remote-curl.c:755
7157c2b5
JX
24340#, c-format
24341msgid "remote-curl: bad line length character: %.4s"
24342msgstr "remote-curl:错误的行宽字符:%.4s"
24343
7e6630a7 24344#: remote-curl.c:757
7157c2b5
JX
24345msgid "remote-curl: unexpected response end packet"
24346msgstr "remote-curl:意外响应结束包"
24347
7e6630a7 24348#: remote-curl.c:833
d46c5519
JX
24349#, c-format
24350msgid "RPC failed; %s"
24351msgstr "RPC 失败。%s"
24352
7e6630a7 24353#: remote-curl.c:873
d46c5519
JX
24354msgid "cannot handle pushes this big"
24355msgstr "不能处理这么大的推送"
24356
7e6630a7 24357#: remote-curl.c:986
d46c5519
JX
24358#, c-format
24359msgid "cannot deflate request; zlib deflate error %d"
24360msgstr "不能压缩请求,zlib 压缩错误 %d"
24361
7e6630a7 24362#: remote-curl.c:990
d46c5519
JX
24363#, c-format
24364msgid "cannot deflate request; zlib end error %d"
24365msgstr "不能压缩请求,zlib 结束错误 %d"
24366
7e6630a7 24367#: remote-curl.c:1040
7157c2b5
JX
24368#, c-format
24369msgid "%d bytes of length header were received"
24370msgstr "收到了 %d 字节长度的头信息"
24371
7e6630a7 24372#: remote-curl.c:1042
7157c2b5
JX
24373#, c-format
24374msgid "%d bytes of body are still expected"
24375msgstr "预期仍然需要 %d 个字节的正文"
24376
7e6630a7 24377#: remote-curl.c:1131
d46c5519 24378msgid "dumb http transport does not support shallow capabilities"
9146ef75 24379msgstr "哑 http 传输不支持浅克隆能力"
d46c5519 24380
7e6630a7 24381#: remote-curl.c:1146
d46c5519
JX
24382msgid "fetch failed."
24383msgstr "获取失败。"
24384
7e6630a7 24385#: remote-curl.c:1192
d46c5519
JX
24386msgid "cannot fetch by sha1 over smart http"
24387msgstr "无法通过智能 HTTP 获取 sha1"
24388
7e6630a7 24389#: remote-curl.c:1236 remote-curl.c:1242
d46c5519
JX
24390#, c-format
24391msgid "protocol error: expected sha/ref, got '%s'"
24392msgstr "协议错误:期望 sha/ref,却得到 '%s'"
24393
7e6630a7 24394#: remote-curl.c:1254 remote-curl.c:1372
d46c5519
JX
24395#, c-format
24396msgid "http transport does not support %s"
24397msgstr "http 传输协议不支持 %s"
24398
7e6630a7 24399#: remote-curl.c:1290
d46c5519
JX
24400msgid "git-http-push failed"
24401msgstr "git-http-push 失败"
24402
7e6630a7 24403#: remote-curl.c:1478
d46c5519
JX
24404msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
24405msgstr "remote-curl:用法:git remote-curl <远程> [<url>]"
24406
7e6630a7 24407#: remote-curl.c:1510
d46c5519
JX
24408msgid "remote-curl: error reading command stream from git"
24409msgstr "remote-curl:错误读取来自 git 的命令流"
24410
7e6630a7 24411#: remote-curl.c:1517
d46c5519
JX
24412msgid "remote-curl: fetch attempted without a local repo"
24413msgstr "remote-curl:尝试没有本地仓库下获取"
24414
7e6630a7 24415#: remote-curl.c:1558
d46c5519
JX
24416#, c-format
24417msgid "remote-curl: unknown command '%s' from git"
24418msgstr "remote-curl:未知的来自 git 的命令 '%s'"
24419
349ede6a
JX
24420#: compat/compiler.h:26
24421msgid "no compiler information available\n"
24422msgstr "编译器信息不可用\n"
24423
24424#: compat/compiler.h:38
24425msgid "no libc information available\n"
24426msgstr "libc 信息不可用\n"
24427
33b62fba 24428#: list-objects-filter-options.h:94
d46c5519
JX
24429msgid "args"
24430msgstr "参数"
24431
33b62fba 24432#: list-objects-filter-options.h:95
d46c5519
JX
24433msgid "object filtering"
24434msgstr "对象过滤"
24435
7e6630a7 24436#: parse-options.h:183
fd8cb379
JX
24437msgid "expiry-date"
24438msgstr "到期时间"
7aea43ff 24439
7e6630a7 24440#: parse-options.h:197
fd8cb379
JX
24441msgid "no-op (backward compatibility)"
24442msgstr "空操作(向后兼容)"
7aea43ff 24443
ffa14514 24444#: parse-options.h:308
fd8cb379
JX
24445msgid "be more verbose"
24446msgstr "更加详细"
7aea43ff 24447
ffa14514 24448#: parse-options.h:310
fd8cb379
JX
24449msgid "be more quiet"
24450msgstr "更加安静"
7aea43ff 24451
ffa14514 24452#: parse-options.h:316
d9488fea
JX
24453msgid "use <n> digits to display object names"
24454msgstr "用 <n> 位数字显示对象名"
7aea43ff 24455
ffa14514 24456#: parse-options.h:335
d46c5519
JX
24457msgid "how to strip spaces and #comments from message"
24458msgstr "设置如何删除提交说明里的空格和#注释"
24459
ffa14514 24460#: parse-options.h:336
ddc12c42
JX
24461msgid "read pathspec from file"
24462msgstr "从文件读取路径表达式"
24463
ffa14514 24464#: parse-options.h:337
ddc12c42
JX
24465msgid ""
24466"with --pathspec-from-file, pathspec elements are separated with NUL character"
24467msgstr "使用 --pathspec-from-file,路径表达式用空字符分隔"
24468
7e6630a7 24469#: ref-filter.h:101
d46c5519
JX
24470msgid "key"
24471msgstr "key"
24472
7e6630a7 24473#: ref-filter.h:101
d46c5519
JX
24474msgid "field name to sort on"
24475msgstr "排序的字段名"
24476
24477#: rerere.h:44
24478msgid "update the index with reused conflict resolution if possible"
24479msgstr "如果可能,重用冲突解决更新索引"
24480
fd8cb379 24481#: command-list.h:50
8ada9598 24482msgid "Add file contents to the index"
81809b99 24483msgstr "添加文件内容至索引"
8ada9598 24484
fd8cb379
JX
24485#: command-list.h:51
24486msgid "Apply a series of patches from a mailbox"
24487msgstr "应用邮箱格式的系列补丁"
24488
24489#: command-list.h:52
24490msgid "Annotate file lines with commit information"
24491msgstr "使用提交信息注释文件行"
24492
24493#: command-list.h:53
24494msgid "Apply a patch to files and/or to the index"
24495msgstr "应用一个补丁到文件和/或索引区"
24496
24497#: command-list.h:54
4c27fcb5
JX
24498msgid "Import a GNU Arch repository into Git"
24499msgstr "将一个 GNU Arch 仓库导入到 Git"
fd8cb379
JX
24500
24501#: command-list.h:55
24502msgid "Create an archive of files from a named tree"
24503msgstr "基于一个指定的树创建文件存档"
24504
24505#: command-list.h:56
1b7f4a34
JX
24506msgid "Use binary search to find the commit that introduced a bug"
24507msgstr "通过二分查找定位引入 bug 的提交"
8ada9598 24508
fd8cb379
JX
24509#: command-list.h:57
24510msgid "Show what revision and author last modified each line of a file"
24511msgstr "显示文件每一行最后修改的版本和修改者"
24512
24513#: command-list.h:58
8ada9598 24514msgid "List, create, or delete branches"
81809b99 24515msgstr "列出、创建或删除分支"
8ada9598 24516
fd8cb379 24517#: command-list.h:59
349ede6a
JX
24518msgid "Collect information for user to file a bug report"
24519msgstr "收集信息以供用户提交错误报告"
24520
24521#: command-list.h:60
fd8cb379
JX
24522msgid "Move objects and refs by archive"
24523msgstr "通过归档移动对象和引用"
24524
349ede6a 24525#: command-list.h:61
fd8cb379
JX
24526msgid "Provide content or type and size information for repository objects"
24527msgstr "提供仓库对象的内容、类型或大小"
24528
349ede6a 24529#: command-list.h:62
fd8cb379
JX
24530msgid "Display gitattributes information"
24531msgstr "显示 gitattributes 信息"
24532
349ede6a 24533#: command-list.h:63
fd8cb379
JX
24534msgid "Debug gitignore / exclude files"
24535msgstr "调试 gitignore / exclude 文件"
24536
349ede6a 24537#: command-list.h:64
fd8cb379
JX
24538msgid "Show canonical names and email addresses of contacts"
24539msgstr "显示联系人的规范名称和电子邮件"
24540
349ede6a 24541#: command-list.h:65
5bb01d4f
JX
24542msgid "Switch branches or restore working tree files"
24543msgstr "切换分支或恢复工作区文件"
8ada9598 24544
349ede6a 24545#: command-list.h:66
fd8cb379
JX
24546msgid "Copy files from the index to the working tree"
24547msgstr "从索引拷贝文件到工作区"
24548
349ede6a 24549#: command-list.h:67
fd8cb379
JX
24550msgid "Ensures that a reference name is well formed"
24551msgstr "确保引用名称格式正确"
24552
349ede6a 24553#: command-list.h:68
fd8cb379
JX
24554msgid "Find commits yet to be applied to upstream"
24555msgstr "查找尚未应用到上游的提交"
24556
349ede6a 24557#: command-list.h:69
fd8cb379
JX
24558msgid "Apply the changes introduced by some existing commits"
24559msgstr "应用一些现存提交引入的修改"
24560
349ede6a 24561#: command-list.h:70
fd8cb379
JX
24562msgid "Graphical alternative to git-commit"
24563msgstr "git-commit 的图形替代界面"
24564
349ede6a 24565#: command-list.h:71
fd8cb379
JX
24566msgid "Remove untracked files from the working tree"
24567msgstr "从工作区中删除未跟踪文件"
24568
349ede6a 24569#: command-list.h:72
8ada9598 24570msgid "Clone a repository into a new directory"
06991777 24571msgstr "克隆仓库到一个新目录"
8ada9598 24572
349ede6a 24573#: command-list.h:73
fd8cb379
JX
24574msgid "Display data in columns"
24575msgstr "以列的方式显示数据"
24576
349ede6a 24577#: command-list.h:74
8ada9598 24578msgid "Record changes to the repository"
160fb2b2 24579msgstr "记录变更到仓库"
8ada9598 24580
349ede6a 24581#: command-list.h:75
4c27fcb5
JX
24582msgid "Write and verify Git commit-graph files"
24583msgstr "写入和校验 Git 提交图文件"
fd8cb379 24584
349ede6a 24585#: command-list.h:76
fd8cb379
JX
24586msgid "Create a new commit object"
24587msgstr "创建一个新的提交对象"
24588
349ede6a 24589#: command-list.h:77
fd8cb379
JX
24590msgid "Get and set repository or global options"
24591msgstr "获取和设置仓库或者全局选项"
24592
349ede6a 24593#: command-list.h:78
fd8cb379
JX
24594msgid "Count unpacked number of objects and their disk consumption"
24595msgstr "计算未打包对象的数量和磁盘空间占用"
24596
349ede6a 24597#: command-list.h:79
fd8cb379
JX
24598msgid "Retrieve and store user credentials"
24599msgstr "检索和存储用户密码"
24600
349ede6a 24601#: command-list.h:80
fd8cb379
JX
24602msgid "Helper to temporarily store passwords in memory"
24603msgstr "在内存中临时存储密码的助手"
24604
349ede6a 24605#: command-list.h:81
fd8cb379
JX
24606msgid "Helper to store credentials on disk"
24607msgstr "在磁盘存储密码的助手"
24608
349ede6a 24609#: command-list.h:82
fd8cb379
JX
24610msgid "Export a single commit to a CVS checkout"
24611msgstr "将一个提交导出到 CVS 检出中"
24612
349ede6a 24613#: command-list.h:83
fd8cb379 24614msgid "Salvage your data out of another SCM people love to hate"
7e6630a7 24615msgstr "从另外一个人们爱恨的配置管理系统中拯救您的数据"
fd8cb379 24616
349ede6a 24617#: command-list.h:84
fd8cb379
JX
24618msgid "A CVS server emulator for Git"
24619msgstr "Git 的一个 CVS 服务模拟器"
24620
349ede6a 24621#: command-list.h:85
fd8cb379
JX
24622msgid "A really simple server for Git repositories"
24623msgstr "一个非常简单的 Git 仓库服务器"
24624
349ede6a 24625#: command-list.h:86
fd8cb379
JX
24626msgid "Give an object a human readable name based on an available ref"
24627msgstr "基于一个现存的引用为一个对象起一个可读的名称"
24628
349ede6a 24629#: command-list.h:87
8ada9598 24630msgid "Show changes between commits, commit and working tree, etc"
81809b99 24631msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598 24632
349ede6a 24633#: command-list.h:88
fd8cb379
JX
24634msgid "Compares files in the working tree and the index"
24635msgstr "比较工作区和索引区中的文件"
24636
349ede6a 24637#: command-list.h:89
fd8cb379
JX
24638msgid "Compare a tree to the working tree or index"
24639msgstr "将一个树和工作区或索引做比较"
24640
349ede6a 24641#: command-list.h:90
fd8cb379
JX
24642msgid "Compares the content and mode of blobs found via two tree objects"
24643msgstr "比较两个树对象的文件内容和模式"
24644
349ede6a 24645#: command-list.h:91
fd8cb379
JX
24646msgid "Show changes using common diff tools"
24647msgstr "使用常见的差异工具显示更改"
24648
349ede6a 24649#: command-list.h:92
fd8cb379
JX
24650msgid "Git data exporter"
24651msgstr "Git 数据导出器"
24652
349ede6a 24653#: command-list.h:93
fd8cb379
JX
24654msgid "Backend for fast Git data importers"
24655msgstr "Git 快速数据导入器后端"
24656
349ede6a 24657#: command-list.h:94
8ada9598 24658msgid "Download objects and refs from another repository"
160fb2b2 24659msgstr "从另外一个仓库下载对象和引用"
8ada9598 24660
349ede6a 24661#: command-list.h:95
fd8cb379
JX
24662msgid "Receive missing objects from another repository"
24663msgstr "从另一个仓库获取缺失的对象"
24664
349ede6a 24665#: command-list.h:96
fd8cb379
JX
24666msgid "Rewrite branches"
24667msgstr "重写分支"
24668
349ede6a 24669#: command-list.h:97
fd8cb379
JX
24670msgid "Produce a merge commit message"
24671msgstr "生成一个合并提交信息"
24672
349ede6a 24673#: command-list.h:98
fd8cb379
JX
24674msgid "Output information on each ref"
24675msgstr "对每一个引用输出信息 "
24676
349ede6a 24677#: command-list.h:99
d13389bf
JX
24678msgid "Run a Git command on a list of repositories"
24679msgstr "在一个仓库列表上运行 Git 命令"
24680
24681#: command-list.h:100
fd8cb379
JX
24682msgid "Prepare patches for e-mail submission"
24683msgstr "准备电子邮件提交的补丁"
24684
d13389bf 24685#: command-list.h:101
fd8cb379
JX
24686msgid "Verifies the connectivity and validity of the objects in the database"
24687msgstr "验证仓库中对象的连通性和有效性"
24688
d13389bf 24689#: command-list.h:102
fd8cb379
JX
24690msgid "Cleanup unnecessary files and optimize the local repository"
24691msgstr "清除不必要的文件和优化本地仓库"
24692
d13389bf 24693#: command-list.h:103
fd8cb379 24694msgid "Extract commit ID from an archive created using git-archive"
5b533632 24695msgstr "从 git-archive 创建的归档文件中提取提交 ID"
fd8cb379 24696
d13389bf 24697#: command-list.h:104
8ada9598 24698msgid "Print lines matching a pattern"
81809b99 24699msgstr "输出和模式匹配的行"
8ada9598 24700
d13389bf 24701#: command-list.h:105
fd8cb379
JX
24702msgid "A portable graphical interface to Git"
24703msgstr "一个便携的 Git 图形客户端"
24704
d13389bf 24705#: command-list.h:106
fd8cb379 24706msgid "Compute object ID and optionally creates a blob from a file"
5b533632 24707msgstr "从一个文件计算对象 ID,并可以创建 blob 数据对象"
fd8cb379 24708
d13389bf 24709#: command-list.h:107
fd8cb379
JX
24710msgid "Display help information about Git"
24711msgstr "显示 Git 的帮助信息"
24712
d13389bf 24713#: command-list.h:108
fd8cb379
JX
24714msgid "Server side implementation of Git over HTTP"
24715msgstr "Git HTTP 协议的服务端实现"
24716
d13389bf 24717#: command-list.h:109
fd8cb379
JX
24718msgid "Download from a remote Git repository via HTTP"
24719msgstr "通过 HTTP 从远程 Git 仓库下载"
24720
d13389bf 24721#: command-list.h:110
fd8cb379
JX
24722msgid "Push objects over HTTP/DAV to another repository"
24723msgstr "通过 HTTP/DAV 推送对象另一个仓库"
24724
d13389bf 24725#: command-list.h:111
fd8cb379
JX
24726msgid "Send a collection of patches from stdin to an IMAP folder"
24727msgstr "从标准输入将一组补丁发送到IMAP文件夹"
24728
d13389bf 24729#: command-list.h:112
fd8cb379
JX
24730msgid "Build pack index file for an existing packed archive"
24731msgstr "从一个现存的包存档文件创建包索引"
24732
d13389bf 24733#: command-list.h:113
a77c07d9 24734msgid "Create an empty Git repository or reinitialize an existing one"
160fb2b2 24735msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
8ada9598 24736
d13389bf 24737#: command-list.h:114
fd8cb379
JX
24738msgid "Instantly browse your working repository in gitweb"
24739msgstr "在 gitweb 中即时浏览您的工作仓库"
24740
d13389bf 24741#: command-list.h:115
d46c5519 24742msgid "Add or parse structured information in commit messages"
fd8cb379
JX
24743msgstr "添加或解析提交说明中的结构化信息"
24744
d13389bf 24745#: command-list.h:116
fd8cb379
JX
24746msgid "The Git repository browser"
24747msgstr "Git 仓库浏览器"
24748
d13389bf 24749#: command-list.h:117
8ada9598 24750msgid "Show commit logs"
81809b99 24751msgstr "显示提交日志"
8ada9598 24752
d13389bf 24753#: command-list.h:118
fd8cb379
JX
24754msgid "Show information about files in the index and the working tree"
24755msgstr "显示索引和工作区中文件的信息"
24756
d13389bf 24757#: command-list.h:119
fd8cb379
JX
24758msgid "List references in a remote repository"
24759msgstr "显示一个远程仓库的引用"
24760
d13389bf 24761#: command-list.h:120
fd8cb379
JX
24762msgid "List the contents of a tree object"
24763msgstr "显示一个树对象的内容"
24764
d13389bf 24765#: command-list.h:121
fd8cb379
JX
24766msgid "Extracts patch and authorship from a single e-mail message"
24767msgstr "从单个电子邮件中提取补丁和作者身份"
24768
d13389bf 24769#: command-list.h:122
fd8cb379
JX
24770msgid "Simple UNIX mbox splitter program"
24771msgstr "简单的 UNIX mbox 邮箱切分程序"
24772
d13389bf 24773#: command-list.h:123
d9488fea
JX
24774msgid "Run tasks to optimize Git repository data"
24775msgstr "运行任务以优化仓库数据"
24776
d13389bf 24777#: command-list.h:124
8ada9598 24778msgid "Join two or more development histories together"
81809b99 24779msgstr "合并两个或更多开发历史"
8ada9598 24780
d13389bf 24781#: command-list.h:125
fd8cb379
JX
24782msgid "Find as good common ancestors as possible for a merge"
24783msgstr "为了合并查找尽可能好的公共祖先提交"
24784
d13389bf 24785#: command-list.h:126
fd8cb379
JX
24786msgid "Run a three-way file merge"
24787msgstr "运行一个三路文件合并"
24788
d13389bf 24789#: command-list.h:127
fd8cb379
JX
24790msgid "Run a merge for files needing merging"
24791msgstr "对于需要合并的文件执行合并"
24792
d13389bf 24793#: command-list.h:128
fd8cb379
JX
24794msgid "The standard helper program to use with git-merge-index"
24795msgstr "与 git-merge-index 一起使用的标准向导程序"
24796
d13389bf 24797#: command-list.h:129
fd8cb379
JX
24798msgid "Run merge conflict resolution tools to resolve merge conflicts"
24799msgstr "运行合并冲突解决工具以解决合并冲突"
24800
d13389bf 24801#: command-list.h:130
fd8cb379
JX
24802msgid "Show three-way merge without touching index"
24803msgstr "显示三路合并而不动索引"
24804
d13389bf 24805#: command-list.h:131
4c27fcb5
JX
24806msgid "Write and verify multi-pack-indexes"
24807msgstr "写入和校验多包索引"
24808
d13389bf 24809#: command-list.h:132
473eb541
JX
24810msgid "Creates a tag object with extra validation"
24811msgstr "创建一个有额外验证的标签对象"
fd8cb379 24812
d13389bf 24813#: command-list.h:133
fd8cb379
JX
24814msgid "Build a tree-object from ls-tree formatted text"
24815msgstr "基于 ls-tree 的格式化文本创建一个树对象"
24816
d13389bf 24817#: command-list.h:134
8ada9598 24818msgid "Move or rename a file, a directory, or a symlink"
81809b99 24819msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598 24820
fd8cb379 24821# 查找给定版本的符号名称
d13389bf 24822#: command-list.h:135
fd8cb379
JX
24823msgid "Find symbolic names for given revs"
24824msgstr "查找给定版本的符号名称"
24825
d13389bf 24826#: command-list.h:136
fd8cb379
JX
24827msgid "Add or inspect object notes"
24828msgstr "添加或检查对象注释"
24829
d13389bf 24830#: command-list.h:137
fd8cb379
JX
24831msgid "Import from and submit to Perforce repositories"
24832msgstr "导入和提交到 Perforce 仓库中"
24833
d13389bf 24834#: command-list.h:138
fd8cb379
JX
24835msgid "Create a packed archive of objects"
24836msgstr "创建对象的存档包"
24837
d13389bf 24838#: command-list.h:139
fd8cb379
JX
24839msgid "Find redundant pack files"
24840msgstr "查找冗余的包文件"
24841
d13389bf 24842#: command-list.h:140
fd8cb379
JX
24843msgid "Pack heads and tags for efficient repository access"
24844msgstr "打包头和标签以实现高效的仓库访问"
24845
d9488fea 24846#: command-list.h:141
fd8cb379 24847msgid "Compute unique ID for a patch"
5b533632 24848msgstr "计算一个补丁的唯一 ID"
fd8cb379 24849
d9488fea 24850#: command-list.h:142
fd8cb379
JX
24851msgid "Prune all unreachable objects from the object database"
24852msgstr "删除对象库中所有不可达对象"
24853
d9488fea 24854#: command-list.h:143
fd8cb379
JX
24855msgid "Remove extra objects that are already in pack files"
24856msgstr "删除已经在包文件中的多余对象"
24857
d9488fea 24858#: command-list.h:144
2e8451e8 24859msgid "Fetch from and integrate with another repository or a local branch"
160fb2b2 24860msgstr "获取并整合另外的仓库或一个本地分支"
8ada9598 24861
d9488fea 24862#: command-list.h:145
8ada9598 24863msgid "Update remote refs along with associated objects"
81809b99 24864msgstr "更新远程引用和相关的对象"
8ada9598 24865
d9488fea 24866#: command-list.h:146
fd8cb379
JX
24867msgid "Applies a quilt patchset onto the current branch"
24868msgstr "将一个 quilt 补丁集应用到当前分支。"
24869
d9488fea 24870#: command-list.h:147
c1ac5258
JX
24871msgid "Compare two commit ranges (e.g. two versions of a branch)"
24872msgstr "比较两个提交范围(如一个分支的两个版本)"
24873
d9488fea 24874#: command-list.h:148
fd8cb379
JX
24875msgid "Reads tree information into the index"
24876msgstr "将树信息读取到索引"
24877
d9488fea 24878#: command-list.h:149
3495628d
JX
24879msgid "Reapply commits on top of another base tip"
24880msgstr "在另一个分支上重新应用提交"
8ada9598 24881
d9488fea 24882#: command-list.h:150
fd8cb379
JX
24883msgid "Receive what is pushed into the repository"
24884msgstr "接收推送到仓库中的对象"
24885
d9488fea 24886#: command-list.h:151
fd8cb379
JX
24887msgid "Manage reflog information"
24888msgstr "管理 reflog 信息"
24889
d9488fea 24890#: command-list.h:152
fd8cb379
JX
24891msgid "Manage set of tracked repositories"
24892msgstr "管理已跟踪仓库"
24893
d9488fea 24894#: command-list.h:153
fd8cb379
JX
24895msgid "Pack unpacked objects in a repository"
24896msgstr "打包仓库中未打包对象"
24897
d9488fea 24898#: command-list.h:154
fd8cb379
JX
24899msgid "Create, list, delete refs to replace objects"
24900msgstr "创建、列出、删除对象替换引用"
24901
d9488fea 24902#: command-list.h:155
fd8cb379
JX
24903msgid "Generates a summary of pending changes"
24904msgstr "生成待定更改的摘要"
24905
d9488fea 24906#: command-list.h:156
fd8cb379
JX
24907msgid "Reuse recorded resolution of conflicted merges"
24908msgstr "重用冲突合并的解决方案记录"
24909
d9488fea 24910#: command-list.h:157
8ada9598 24911msgid "Reset current HEAD to the specified state"
4375c10e 24912msgstr "重置当前 HEAD 到指定状态"
8ada9598 24913
d9488fea 24914#: command-list.h:158
a6cd2cc4
JX
24915msgid "Restore working tree files"
24916msgstr "恢复工作区文件"
24917
d9488fea 24918#: command-list.h:159
fd8cb379
JX
24919msgid "Revert some existing commits"
24920msgstr "回退一些现存提交"
24921
d9488fea 24922#: command-list.h:160
fd8cb379
JX
24923msgid "Lists commit objects in reverse chronological order"
24924msgstr "按时间顺序列出提交对象"
24925
d9488fea 24926#: command-list.h:161
fd8cb379
JX
24927msgid "Pick out and massage parameters"
24928msgstr "选出并处理参数"
24929
d9488fea 24930#: command-list.h:162
8ada9598 24931msgid "Remove files from the working tree and from the index"
81809b99 24932msgstr "从工作区和索引中删除文件"
8ada9598 24933
d9488fea 24934#: command-list.h:163
fd8cb379
JX
24935msgid "Send a collection of patches as emails"
24936msgstr "通过电子邮件发送一组补丁"
24937
d9488fea 24938#: command-list.h:164
fd8cb379
JX
24939msgid "Push objects over Git protocol to another repository"
24940msgstr "使用 Git 协议推送对象到另一个仓库"
24941
d9488fea 24942#: command-list.h:165
fd8cb379
JX
24943msgid "Restricted login shell for Git-only SSH access"
24944msgstr "只允许 Git SSH 访问的受限登录shell"
24945
d9488fea 24946#: command-list.h:166
fd8cb379
JX
24947msgid "Summarize 'git log' output"
24948msgstr "'git log' 输出摘要"
24949
d9488fea 24950#: command-list.h:167
8ada9598 24951msgid "Show various types of objects"
81809b99 24952msgstr "显示各种类型的对象"
8ada9598 24953
d9488fea 24954#: command-list.h:168
fd8cb379
JX
24955msgid "Show branches and their commits"
24956msgstr "显示分支和提交"
24957
d9488fea 24958#: command-list.h:169
fd8cb379
JX
24959msgid "Show packed archive index"
24960msgstr "显示打包归档索引"
24961
d9488fea 24962#: command-list.h:170
fd8cb379
JX
24963msgid "List references in a local repository"
24964msgstr "显示本地仓库中的引用"
24965
d9488fea 24966#: command-list.h:171
fd8cb379
JX
24967msgid "Git's i18n setup code for shell scripts"
24968msgstr "为 shell 脚本准备的 Git 国际化设置代码"
24969
d9488fea 24970#: command-list.h:172
fd8cb379
JX
24971msgid "Common Git shell script setup code"
24972msgstr "常用的 Git shell 脚本设置代码"
24973
d9488fea 24974#: command-list.h:173
ddc12c42
JX
24975msgid "Initialize and modify the sparse-checkout"
24976msgstr "初始化及修改稀疏检出"
24977
d9488fea 24978#: command-list.h:174
fd8cb379
JX
24979msgid "Stash the changes in a dirty working directory away"
24980msgstr "贮藏脏工作区中的修改"
24981
d9488fea 24982#: command-list.h:175
fd8cb379
JX
24983msgid "Add file contents to the staging area"
24984msgstr "将文件内容添加到索引"
24985
d9488fea 24986#: command-list.h:176
8ada9598 24987msgid "Show the working tree status"
81809b99 24988msgstr "显示工作区状态"
8ada9598 24989
d9488fea 24990#: command-list.h:177
fd8cb379
JX
24991msgid "Remove unnecessary whitespace"
24992msgstr "删除不必要的空白字符"
24993
d9488fea 24994#: command-list.h:178
fd8cb379
JX
24995msgid "Initialize, update or inspect submodules"
24996msgstr "初始化、更新或检查子模组"
24997
d9488fea 24998#: command-list.h:179
fd8cb379
JX
24999msgid "Bidirectional operation between a Subversion repository and Git"
25000msgstr "Subersion 仓库和 Git 之间的双向操作"
25001
d9488fea 25002#: command-list.h:180
a6cd2cc4
JX
25003msgid "Switch branches"
25004msgstr "切换分支"
25005
d9488fea 25006#: command-list.h:181
fd8cb379
JX
25007msgid "Read, modify and delete symbolic refs"
25008msgstr "读取、修改和删除符号引用"
25009
d9488fea 25010#: command-list.h:182
8ada9598 25011msgid "Create, list, delete or verify a tag object signed with GPG"
4375c10e 25012msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
8ada9598 25013
d9488fea 25014#: command-list.h:183
fd8cb379
JX
25015msgid "Creates a temporary file with a blob's contents"
25016msgstr "用 blob 数据对象的内容创建一个临时文件"
220c313c 25017
d9488fea 25018#: command-list.h:184
fd8cb379
JX
25019msgid "Unpack objects from a packed archive"
25020msgstr "从打包文件中解压缩对象"
220c313c 25021
d9488fea 25022#: command-list.h:185
fd8cb379
JX
25023msgid "Register file contents in the working tree to the index"
25024msgstr "将工作区的文件内容注册到索引"
220c313c 25025
d9488fea 25026#: command-list.h:186
fd8cb379
JX
25027msgid "Update the object name stored in a ref safely"
25028msgstr "安全地更新存储于引用中的对象名称"
220c313c 25029
d9488fea 25030#: command-list.h:187
fd8cb379
JX
25031msgid "Update auxiliary info file to help dumb servers"
25032msgstr "更新辅助信息文件以帮助哑协议服务"
25033
d9488fea 25034#: command-list.h:188
fd8cb379
JX
25035msgid "Send archive back to git-archive"
25036msgstr "将存档发送回 git-archive"
25037
d9488fea 25038#: command-list.h:189
fd8cb379
JX
25039msgid "Send objects packed back to git-fetch-pack"
25040msgstr "将对象压缩包发送回 git-fetch-pack"
25041
d9488fea 25042#: command-list.h:190
fd8cb379
JX
25043msgid "Show a Git logical variable"
25044msgstr "显示一个Git逻辑变量"
25045
d9488fea 25046#: command-list.h:191
fd8cb379
JX
25047msgid "Check the GPG signature of commits"
25048msgstr "检查 GPG 提交签名"
25049
d9488fea 25050#: command-list.h:192
fd8cb379
JX
25051msgid "Validate packed Git archive files"
25052msgstr "校验打包的Git存仓文件"
25053
d9488fea 25054#: command-list.h:193
fd8cb379
JX
25055msgid "Check the GPG signature of tags"
25056msgstr "检查标签的 GPG 签名"
25057
d9488fea 25058#: command-list.h:194
fd8cb379
JX
25059msgid "Git web interface (web frontend to Git repositories)"
25060msgstr "Git web 界面(Git 仓库的 web 前端)"
25061
d9488fea 25062#: command-list.h:195
fd8cb379
JX
25063msgid "Show logs with difference each commit introduces"
25064msgstr "显示每一个提交引入的差异日志"
25065
d9488fea 25066#: command-list.h:196
fd8cb379
JX
25067msgid "Manage multiple working trees"
25068msgstr "管理多个工作区"
25069
d9488fea 25070#: command-list.h:197
fd8cb379
JX
25071msgid "Create a tree object from the current index"
25072msgstr "从当前索引创建一个树对象"
25073
d9488fea 25074#: command-list.h:198
fd8cb379
JX
25075msgid "Defining attributes per path"
25076msgstr "定义路径的属性"
25077
d9488fea 25078#: command-list.h:199
fd8cb379
JX
25079msgid "Git command-line interface and conventions"
25080msgstr "Git 命令行界面和约定"
25081
d9488fea 25082#: command-list.h:200
fd8cb379
JX
25083msgid "A Git core tutorial for developers"
25084msgstr "面向开发人员的 Git 核心教程"
25085
d9488fea
JX
25086#: command-list.h:201
25087msgid "Providing usernames and passwords to Git"
25088msgstr "为 Git 提供用户名和口令"
25089
25090#: command-list.h:202
fd8cb379
JX
25091msgid "Git for CVS users"
25092msgstr "适合 CVS 用户的 Git 帮助"
25093
d9488fea 25094#: command-list.h:203
fd8cb379
JX
25095msgid "Tweaking diff output"
25096msgstr "调整差异输出"
25097
d9488fea 25098#: command-list.h:204
fd8cb379
JX
25099msgid "A useful minimum set of commands for Everyday Git"
25100msgstr "每一天 Git 的一组有用的最小命令集合"
25101
d9488fea 25102#: command-list.h:205
349ede6a
JX
25103msgid "Frequently asked questions about using Git"
25104msgstr "关于使用 Git 的常见问题"
25105
d9488fea 25106#: command-list.h:206
fd8cb379
JX
25107msgid "A Git Glossary"
25108msgstr "Git 词汇表"
25109
d9488fea 25110#: command-list.h:207
fd8cb379
JX
25111msgid "Hooks used by Git"
25112msgstr "Git 使用的钩子"
25113
d9488fea 25114#: command-list.h:208
fd8cb379
JX
25115msgid "Specifies intentionally untracked files to ignore"
25116msgstr "忽略指定的未跟踪文件"
25117
d9488fea 25118#: command-list.h:209
473eb541
JX
25119msgid "Map author/committer names and/or E-Mail addresses"
25120msgstr "映射作者/提交者的名称和/或邮件地址"
25121
25122#: command-list.h:210
fd8cb379
JX
25123msgid "Defining submodule properties"
25124msgstr "定义子模组属性"
25125
473eb541 25126#: command-list.h:211
fd8cb379
JX
25127msgid "Git namespaces"
25128msgstr "Git 名字空间"
25129
473eb541 25130#: command-list.h:212
d9488fea
JX
25131msgid "Helper programs to interact with remote repositories"
25132msgstr "与远程仓库交互的助手程序"
25133
473eb541 25134#: command-list.h:213
fd8cb379
JX
25135msgid "Git Repository Layout"
25136msgstr "Git 仓库布局"
25137
473eb541 25138#: command-list.h:214
fd8cb379
JX
25139msgid "Specifying revisions and ranges for Git"
25140msgstr "指定 Git 的版本和版本范围"
25141
473eb541 25142#: command-list.h:215
ddc12c42
JX
25143msgid "Mounting one repository inside another"
25144msgstr "将一个仓库安装到另外一个仓库中"
25145
473eb541 25146#: command-list.h:216
fd8cb379
JX
25147msgid "A tutorial introduction to Git: part two"
25148msgstr "一个 Git 教程:第二部分"
25149
473eb541 25150#: command-list.h:217
fd8cb379
JX
25151msgid "A tutorial introduction to Git"
25152msgstr "一个 Git 教程"
25153
473eb541 25154#: command-list.h:218
fd8cb379
JX
25155msgid "An overview of recommended workflows with Git"
25156msgstr "Git 推荐的工作流概览"
220c313c 25157
5c57d762
JX
25158#: git-merge-octopus.sh:46
25159msgid ""
25160"Error: Your local changes to the following files would be overwritten by "
25161"merge"
25162msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
25163
25164#: git-merge-octopus.sh:61
25165msgid "Automated merge did not work."
9a4b694c 25166msgstr "自动合并未生效。"
5c57d762
JX
25167
25168#: git-merge-octopus.sh:62
a0b6b246 25169msgid "Should not be doing an octopus."
5c57d762
JX
25170msgstr "不应该执行章鱼式合并。"
25171
25172#: git-merge-octopus.sh:73
25173#, sh-format
25174msgid "Unable to find common commit with $pretty_name"
25175msgstr "无法找到和 $pretty_name 的基线提交"
25176
25177#: git-merge-octopus.sh:77
25178#, sh-format
6937cb4e 25179msgid "Already up to date with $pretty_name"
5c57d762
JX
25180msgstr "已经和 $pretty_name 保持一致"
25181
25182#: git-merge-octopus.sh:89
25183#, sh-format
25184msgid "Fast-forwarding to: $pretty_name"
25185msgstr "快进至:$pretty_name"
25186
25187#: git-merge-octopus.sh:97
25188#, sh-format
25189msgid "Trying simple merge with $pretty_name"
25190msgstr "尝试和 $pretty_name 的简单合并"
25191
25192#: git-merge-octopus.sh:102
25193msgid "Simple merge did not work, trying automatic merge."
9a4b694c 25194msgstr "简单合并未生效,尝试自动合并。"
5c57d762 25195
7e6630a7 25196#: git-submodule.sh:401
c04f5ac3 25197#, sh-format
2e8451e8
JX
25198msgid "Unable to find current revision in submodule path '$displaypath'"
25199msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 25200
7e6630a7 25201#: git-submodule.sh:411
c04f5ac3 25202#, sh-format
170e9899
JX
25203msgid "Unable to fetch in submodule path '$sm_path'"
25204msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 25205
7e6630a7 25206#: git-submodule.sh:416
5c57d762
JX
25207#, sh-format
25208msgid ""
25209"Unable to find current ${remote_name}/${branch} revision in submodule path "
25210"'$sm_path'"
9a4b694c 25211msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
5c57d762 25212
7e6630a7 25213#: git-submodule.sh:464
2e8451e8
JX
25214#, sh-format
25215msgid "Failed to recurse into submodule path '$displaypath'"
25216msgstr "无法递归进子模组路径 '$displaypath'"
25217
5c57d762
JX
25218#: git-sh-setup.sh:89 git-sh-setup.sh:94
25219#, sh-format
25220msgid "usage: $dashless $USAGE"
25221msgstr "用法:$dashless $USAGE"
25222
d46c5519 25223#: git-sh-setup.sh:191
5c57d762
JX
25224#, sh-format
25225msgid "Cannot chdir to $cdup, the toplevel of the working tree"
9a4b694c 25226msgstr "不能切换目录到 $cdup,工作区的顶级目录"
5c57d762 25227
d46c5519 25228#: git-sh-setup.sh:200 git-sh-setup.sh:207
5c57d762
JX
25229#, sh-format
25230msgid "fatal: $program_name cannot be used without a working tree."
06991777 25231msgstr "致命错误:$program_name 不能在没有工作区的情况下使用"
5c57d762 25232
d46c5519 25233#: git-sh-setup.sh:221
5c57d762
JX
25234msgid "Cannot rewrite branches: You have unstaged changes."
25235msgstr "不能重写分支:您有未暂存的变更。"
25236
7e6630a7 25237#: git-sh-setup.sh:224
5c57d762
JX
25238#, sh-format
25239msgid "Cannot $action: You have unstaged changes."
25240msgstr "不能 $action:您有未暂存的变更。"
25241
7e6630a7 25242#: git-sh-setup.sh:235
5c57d762
JX
25243#, sh-format
25244msgid "Cannot $action: Your index contains uncommitted changes."
25245msgstr "不能 $action:您的索引中包含未提交的变更。"
25246
7e6630a7 25247#: git-sh-setup.sh:237
a0b6b246
JX
25248msgid "Additionally, your index contains uncommitted changes."
25249msgstr "而且您的索引中包含未提交的变更。"
25250
7e6630a7 25251#: git-sh-setup.sh:357
5c57d762
JX
25252msgid "You need to run this command from the toplevel of the working tree."
25253msgstr "您需要在工作区的顶级目录中运行这个命令。"
25254
7e6630a7 25255#: git-sh-setup.sh:362
5c57d762
JX
25256msgid "Unable to determine absolute path of git directory"
25257msgstr "不能确定 git 目录的绝对路径"
a0b6b246 25258
1a79b2f1 25259#. TRANSLATORS: you can adjust this to align "git add -i" status menu
ddc12c42 25260#: git-add--interactive.perl:212
1a79b2f1
JX
25261#, perl-format
25262msgid "%12s %12s %s"
25263msgstr "%12s %12s %s"
25264
d13389bf 25265#: git-add--interactive.perl:632
1a79b2f1
JX
25266#, perl-format
25267msgid "touched %d path\n"
25268msgid_plural "touched %d paths\n"
25269msgstr[0] "触碰了 %d 个路径\n"
25270msgstr[1] "触碰了 %d 个路径\n"
25271
d13389bf 25272#: git-add--interactive.perl:1056
1a79b2f1
JX
25273msgid ""
25274"If the patch applies cleanly, the edited hunk will immediately be\n"
25275"marked for staging."
25276msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
25277
d13389bf 25278#: git-add--interactive.perl:1059
1a79b2f1
JX
25279msgid ""
25280"If the patch applies cleanly, the edited hunk will immediately be\n"
25281"marked for stashing."
a4f16749 25282msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。"
1a79b2f1 25283
d13389bf 25284#: git-add--interactive.perl:1062
1a79b2f1
JX
25285msgid ""
25286"If the patch applies cleanly, the edited hunk will immediately be\n"
25287"marked for unstaging."
25288msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
25289
d13389bf
JX
25290#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
25291#: git-add--interactive.perl:1080
1a79b2f1
JX
25292msgid ""
25293"If the patch applies cleanly, the edited hunk will immediately be\n"
25294"marked for applying."
25295msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
25296
d13389bf
JX
25297#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
25298#: git-add--interactive.perl:1077
1a79b2f1
JX
25299msgid ""
25300"If the patch applies cleanly, the edited hunk will immediately be\n"
25301"marked for discarding."
25302msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
25303
d13389bf 25304#: git-add--interactive.perl:1114
1a79b2f1
JX
25305#, perl-format
25306msgid "failed to open hunk edit file for writing: %s"
c1ac5258 25307msgstr "为写入打开块编辑文件失败:%s"
1a79b2f1 25308
d13389bf 25309#: git-add--interactive.perl:1121
1a79b2f1
JX
25310#, perl-format
25311msgid ""
25312"---\n"
25313"To remove '%s' lines, make them ' ' lines (context).\n"
25314"To remove '%s' lines, delete them.\n"
25315"Lines starting with %s will be removed.\n"
25316msgstr ""
25317"---\n"
25318"要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
25319"要删除 '%s' 开始的行,删除它们。\n"
25320"以 %s 开始的行将被删除。\n"
25321
d13389bf 25322#: git-add--interactive.perl:1143
1a79b2f1
JX
25323#, perl-format
25324msgid "failed to open hunk edit file for reading: %s"
25325msgstr "无法读取块编辑文件:%s"
25326
d13389bf 25327#: git-add--interactive.perl:1251
1a79b2f1
JX
25328msgid ""
25329"y - stage this hunk\n"
25330"n - do not stage this hunk\n"
25331"q - quit; do not stage this hunk or any of the remaining ones\n"
25332"a - stage this hunk and all later hunks in the file\n"
25333"d - do not stage this hunk or any of the later hunks in the file"
25334msgstr ""
25335"y - 暂存该块\n"
25336"n - 不要暂存该块\n"
25337"q - 退出。不暂存该块及后面的全部块\n"
25338"a - 暂存该块和本文件中后面的全部块\n"
25339"d - 不暂存该块和本文件中后面的全部块"
25340
d13389bf 25341#: git-add--interactive.perl:1257
1a79b2f1
JX
25342msgid ""
25343"y - stash this hunk\n"
25344"n - do not stash this hunk\n"
25345"q - quit; do not stash this hunk or any of the remaining ones\n"
25346"a - stash this hunk and all later hunks in the file\n"
25347"d - do not stash this hunk or any of the later hunks in the file"
25348msgstr ""
25349"y - 贮藏该块\n"
25350"n - 不要贮藏该块\n"
25351"q - 退出。不贮藏该块及后面的全部块\n"
25352"a - 贮藏该块和本文件中后面的全部块\n"
25353"d - 不贮藏该块和本文件中后面的全部块"
25354
d13389bf 25355#: git-add--interactive.perl:1263
1a79b2f1
JX
25356msgid ""
25357"y - unstage this hunk\n"
25358"n - do not unstage this hunk\n"
25359"q - quit; do not unstage this hunk or any of the remaining ones\n"
25360"a - unstage this hunk and all later hunks in the file\n"
25361"d - do not unstage this hunk or any of the later hunks in the file"
25362msgstr ""
25363"y - 不暂存该块\n"
25364"n - 不要不暂存该块\n"
25365"q - 退出。不要不暂存该块及后面的全部块\n"
25366"a - 不暂存该块和本文件中后面的全部块\n"
25367"d - 不要不暂存该块和本文件中后面的全部块"
25368
d13389bf 25369#: git-add--interactive.perl:1269
1a79b2f1
JX
25370msgid ""
25371"y - apply this hunk to index\n"
25372"n - do not apply this hunk to index\n"
25373"q - quit; do not apply this hunk or any of the remaining ones\n"
25374"a - apply this hunk and all later hunks in the file\n"
25375"d - do not apply this hunk or any of the later hunks in the file"
25376msgstr ""
25377"y - 在索引中应用该块\n"
25378"n - 不要在索引中应用该块\n"
25379"q - 退出。不要应用该块及后面的全部块\n"
25380"a - 应用该块和本文件中后面的全部块\n"
25381"d - 不要应用该块和本文件中后面的全部块"
25382
d13389bf 25383#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
1a79b2f1
JX
25384msgid ""
25385"y - discard this hunk from worktree\n"
25386"n - do not discard this hunk from worktree\n"
25387"q - quit; do not discard this hunk or any of the remaining ones\n"
25388"a - discard this hunk and all later hunks in the file\n"
25389"d - do not discard this hunk or any of the later hunks in the file"
25390msgstr ""
25391"y - 在工作区中丢弃该块\n"
25392"n - 不要在工作区中丢弃该块\n"
25393"q - 退出。不要丢弃该块及后面的全部块\n"
25394"a - 丢弃该块和本文件中后面的全部块\n"
25395"d - 不要丢弃该块和本文件中后面的全部块"
25396
d13389bf 25397#: git-add--interactive.perl:1281
1a79b2f1
JX
25398msgid ""
25399"y - discard this hunk from index and worktree\n"
25400"n - do not discard this hunk from index and worktree\n"
25401"q - quit; do not discard this hunk or any of the remaining ones\n"
25402"a - discard this hunk and all later hunks in the file\n"
25403"d - do not discard this hunk or any of the later hunks in the file"
25404msgstr ""
25405"y - 在索引和工作区中丢弃该块\n"
25406"n - 不要在索引和工作区中丢弃该块\n"
25407"q - 退出。不要丢弃该块及后面的全部块\n"
25408"a - 丢弃该块和本文件中后面的全部块\n"
25409"d - 不要丢弃该块和本文件中后面的全部块"
25410
d13389bf 25411#: git-add--interactive.perl:1287
1a79b2f1
JX
25412msgid ""
25413"y - apply this hunk to index and worktree\n"
25414"n - do not apply this hunk to index and worktree\n"
25415"q - quit; do not apply this hunk or any of the remaining ones\n"
25416"a - apply this hunk and all later hunks in the file\n"
25417"d - do not apply this hunk or any of the later hunks in the file"
25418msgstr ""
25419"y - 在索引和工作区中应用该块\n"
25420"n - 不要在索引和工作区中应用该块\n"
25421"q - 退出。不要应用该块及后面的全部块\n"
25422"a - 应用该块和本文件中后面的全部块\n"
25423"d - 不要应用该块和本文件中后面的全部块"
25424
d13389bf 25425#: git-add--interactive.perl:1299
a6cd2cc4
JX
25426msgid ""
25427"y - apply this hunk to worktree\n"
25428"n - do not apply this hunk to worktree\n"
25429"q - quit; do not apply this hunk or any of the remaining ones\n"
25430"a - apply this hunk and all later hunks in the file\n"
25431"d - do not apply this hunk or any of the later hunks in the file"
25432msgstr ""
25433"y - 在工作区中应用该块\n"
25434"n - 不要在工作区中应用该块\n"
25435"q - 退出。不要应用该块及后面的全部块\n"
25436"a - 应用该块和本文件中后面的全部块\n"
25437"d - 不要应用该块和本文件中后面的全部块"
25438
d13389bf 25439#: git-add--interactive.perl:1314
1a79b2f1
JX
25440msgid ""
25441"g - select a hunk to go to\n"
25442"/ - search for a hunk matching the given regex\n"
25443"j - leave this hunk undecided, see next undecided hunk\n"
25444"J - leave this hunk undecided, see next hunk\n"
25445"k - leave this hunk undecided, see previous undecided hunk\n"
25446"K - leave this hunk undecided, see previous hunk\n"
25447"s - split the current hunk into smaller hunks\n"
25448"e - manually edit the current hunk\n"
25449"? - print help\n"
25450msgstr ""
25451"g - 选择跳转到一个块\n"
25452"/ - 查找和给定正则表达式匹配的块\n"
25453"j - 维持该块未决状态,查看下一个未决块\n"
25454"J - 维持该块未决状态,查看下一个块\n"
25455"k - 维持该块未决状态,查看上一个未决块\n"
25456"K - 维持该块未决状态,查看上一个块\n"
25457"s - 拆分当前块为更小的块\n"
25458"e - 手动编辑当前块\n"
25459"? - 显示帮助\n"
25460
d13389bf 25461#: git-add--interactive.perl:1345
1a79b2f1
JX
25462msgid "The selected hunks do not apply to the index!\n"
25463msgstr "选中的块不能应用到索引!\n"
25464
d13389bf 25465#: git-add--interactive.perl:1360
1a79b2f1
JX
25466#, perl-format
25467msgid "ignoring unmerged: %s\n"
25468msgstr "忽略未合入的:%s\n"
25469
d13389bf 25470#: git-add--interactive.perl:1479
a6cd2cc4
JX
25471#, perl-format
25472msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
25473msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
25474
d13389bf 25475#: git-add--interactive.perl:1480
a6cd2cc4
JX
25476#, perl-format
25477msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
25478msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
25479
d13389bf 25480#: git-add--interactive.perl:1481
7157c2b5
JX
25481#, perl-format
25482msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
25483msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? "
25484
d13389bf 25485#: git-add--interactive.perl:1482
a6cd2cc4
JX
25486#, perl-format
25487msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
25488msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
25489
d13389bf 25490#: git-add--interactive.perl:1599
31e5e17b
JX
25491msgid "No other hunks to goto\n"
25492msgstr "没有其它可供跳转的块\n"
1a79b2f1 25493
d13389bf 25494#: git-add--interactive.perl:1617
1a79b2f1
JX
25495#, perl-format
25496msgid "Invalid number: '%s'\n"
25497msgstr "无效数字:'%s'\n"
25498
d13389bf 25499#: git-add--interactive.perl:1622
1a79b2f1
JX
25500#, perl-format
25501msgid "Sorry, only %d hunk available.\n"
25502msgid_plural "Sorry, only %d hunks available.\n"
25503msgstr[0] "对不起,只有 %d 个可用块。\n"
25504msgstr[1] "对不起,只有 %d 个可用块。\n"
25505
d13389bf 25506#: git-add--interactive.perl:1657
31e5e17b
JX
25507msgid "No other hunks to search\n"
25508msgstr "没有其它可供查找的块\n"
25509
d13389bf 25510#: git-add--interactive.perl:1674
1a79b2f1
JX
25511#, perl-format
25512msgid "Malformed search regexp %s: %s\n"
25513msgstr "错误的正则表达式 %s:%s\n"
25514
d13389bf 25515#: git-add--interactive.perl:1684
1a79b2f1 25516msgid "No hunk matches the given pattern\n"
ddc12c42 25517msgstr "没有和给定模式相匹配的块\n"
1a79b2f1 25518
d13389bf 25519#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
1a79b2f1
JX
25520msgid "No previous hunk\n"
25521msgstr "没有前一个块\n"
25522
d13389bf 25523#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
1a79b2f1
JX
25524msgid "No next hunk\n"
25525msgstr "没有下一个块\n"
25526
d13389bf 25527#: git-add--interactive.perl:1730
31e5e17b
JX
25528msgid "Sorry, cannot split this hunk\n"
25529msgstr "对不起,不能拆分这个块\n"
25530
d13389bf 25531#: git-add--interactive.perl:1736
1a79b2f1
JX
25532#, perl-format
25533msgid "Split into %d hunk.\n"
25534msgid_plural "Split into %d hunks.\n"
25535msgstr[0] "拆分为 %d 块。\n"
25536msgstr[1] "拆分为 %d 块。\n"
25537
d13389bf 25538#: git-add--interactive.perl:1746
31e5e17b
JX
25539msgid "Sorry, cannot edit this hunk\n"
25540msgstr "对不起,不能编辑这个块\n"
25541
1a79b2f1
JX
25542#. TRANSLATORS: please do not translate the command names
25543#. 'status', 'update', 'revert', etc.
d13389bf 25544#: git-add--interactive.perl:1811
1a79b2f1
JX
25545msgid ""
25546"status - show paths with changes\n"
25547"update - add working tree state to the staged set of changes\n"
25548"revert - revert staged set of changes back to the HEAD version\n"
25549"patch - pick hunks and update selectively\n"
87cb7997 25550"diff - view diff between HEAD and index\n"
1a79b2f1
JX
25551"add untracked - add contents of untracked files to the staged set of "
25552"changes\n"
25553msgstr ""
25554"status - 显示含变更的路径\n"
25555"update - 添加工作区状态至暂存列表\n"
25556"revert - 还原修改的暂存集至 HEAD 版本\n"
25557"patch - 挑选块并且有选择地更新\n"
25558"diff - 显示 HEAD 和索引间差异\n"
25559"add untracked - 添加未跟踪文件的内容至暂存列表\n"
25560
d13389bf
JX
25561#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
25562#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
25563#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
25564#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
1a79b2f1
JX
25565msgid "missing --"
25566msgstr "缺失 --"
25567
d13389bf 25568#: git-add--interactive.perl:1866
1a79b2f1
JX
25569#, perl-format
25570msgid "unknown --patch mode: %s"
25571msgstr "未知的 --patch 模式:%s"
25572
d13389bf 25573#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
1a79b2f1
JX
25574#, perl-format
25575msgid "invalid argument %s, expecting --"
25576msgstr "无效的参数 %s,期望是 --"
25577
ec3d4607 25578#: git-send-email.perl:129
1a79b2f1
JX
25579msgid "local zone differs from GMT by a non-minute interval\n"
25580msgstr "本地时间和 GMT 有不到一分钟间隔\n"
25581
ec3d4607 25582#: git-send-email.perl:136 git-send-email.perl:142
1a79b2f1
JX
25583msgid "local time offset greater than or equal to 24 hours\n"
25584msgstr "本地时间偏移量大于等于 24 小时\n"
25585
ec3d4607 25586#: git-send-email.perl:214
33b62fba
JX
25587#, perl-format
25588msgid "fatal: command '%s' died with exit code %d"
25589msgstr "致命错误:命令 '%s' 已终止,退出代码为 %d"
25590
ec3d4607 25591#: git-send-email.perl:227
1a79b2f1
JX
25592msgid "the editor exited uncleanly, aborting everything"
25593msgstr "编辑器非正常退出,终止所有操作"
25594
ec3d4607 25595#: git-send-email.perl:316
1a79b2f1
JX
25596#, perl-format
25597msgid ""
25598"'%s' contains an intermediate version of the email you were composing.\n"
25599msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
25600
ec3d4607 25601#: git-send-email.perl:321
1a79b2f1
JX
25602#, perl-format
25603msgid "'%s.final' contains the composed email.\n"
25604msgstr "'%s.final' 包含编辑的邮件。\n"
25605
ec3d4607 25606#: git-send-email.perl:450
1a79b2f1
JX
25607msgid "--dump-aliases incompatible with other options\n"
25608msgstr "--dump-aliases 和其它选项不兼容\n"
25609
ec3d4607 25610#: git-send-email.perl:525
d9488fea
JX
25611msgid ""
25612"fatal: found configuration options for 'sendmail'\n"
25613"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
25614"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
25615msgstr ""
25616"致命错误:发现 'sendmail' 配置选项\n"
25617"git-send-email 通过 sendemail.* 选项进行设置,注意字母 'e'。\n"
25618"设置 sendemail.forbidSendmailVariables 为 false 来禁用这项检查。\n"
25619
ec3d4607 25620#: git-send-email.perl:530 git-send-email.perl:746
1a79b2f1
JX
25621msgid "Cannot run git format-patch from outside a repository\n"
25622msgstr "不能在仓库之外运行 git format-patch\n"
25623
ec3d4607 25624#: git-send-email.perl:533
31e5e17b
JX
25625msgid ""
25626"`batch-size` and `relogin` must be specified together (via command-line or "
25627"configuration option)\n"
25628msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n"
25629
ec3d4607 25630#: git-send-email.perl:546
1a79b2f1
JX
25631#, perl-format
25632msgid "Unknown --suppress-cc field: '%s'\n"
25633msgstr "未知的 --suppress-cc 字段:'%s'\n"
25634
ec3d4607 25635#: git-send-email.perl:577
1a79b2f1
JX
25636#, perl-format
25637msgid "Unknown --confirm setting: '%s'\n"
25638msgstr "未知的 --confirm 设置:'%s'\n"
25639
ec3d4607 25640#: git-send-email.perl:617
1a79b2f1
JX
25641#, perl-format
25642msgid "warning: sendmail alias with quotes is not supported: %s\n"
25643msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
25644
ec3d4607 25645#: git-send-email.perl:619
1a79b2f1
JX
25646#, perl-format
25647msgid "warning: `:include:` not supported: %s\n"
25648msgstr "警告:不支持 `:include:`:%s\n"
25649
ec3d4607 25650#: git-send-email.perl:621
1a79b2f1
JX
25651#, perl-format
25652msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
25653msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
25654
ec3d4607 25655#: git-send-email.perl:626
1a79b2f1
JX
25656#, perl-format
25657msgid "warning: sendmail line is not recognized: %s\n"
25658msgstr "警告:不能识别的 sendmail 行:%s\n"
25659
ec3d4607 25660#: git-send-email.perl:711
1a79b2f1
JX
25661#, perl-format
25662msgid ""
25663"File '%s' exists but it could also be the range of commits\n"
25664"to produce patches for. Please disambiguate by...\n"
25665"\n"
25666" * Saying \"./%s\" if you mean a file; or\n"
25667" * Giving --format-patch option if you mean a range.\n"
25668msgstr ""
87cb7997
JX
25669"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
25670"歧义:\n"
1a79b2f1
JX
25671"\n"
25672" * 如果含义为一个文件,使用 \"./%s\",或者\n"
25673" * 如果含义为一个范围,使用 --format-patch 选项。\n"
25674
ec3d4607 25675#: git-send-email.perl:732
1a79b2f1
JX
25676#, perl-format
25677msgid "Failed to opendir %s: %s"
25678msgstr "无法打开目录 %s: %s"
25679
ec3d4607 25680#: git-send-email.perl:767
1a79b2f1
JX
25681msgid ""
25682"\n"
25683"No patch files specified!\n"
25684"\n"
87cb7997
JX
25685msgstr ""
25686"\n"
25687"未指定补丁文件!\n"
25688"\n"
1a79b2f1 25689
ec3d4607 25690#: git-send-email.perl:780
1a79b2f1
JX
25691#, perl-format
25692msgid "No subject line in %s?"
25693msgstr "在 %s 中没有标题行?"
25694
ec3d4607 25695#: git-send-email.perl:791
1a79b2f1
JX
25696#, perl-format
25697msgid "Failed to open for writing %s: %s"
c1ac5258 25698msgstr "为写入打开 %s 失败: %s"
1a79b2f1 25699
ec3d4607 25700#: git-send-email.perl:802
1a79b2f1
JX
25701msgid ""
25702"Lines beginning in \"GIT:\" will be removed.\n"
25703"Consider including an overall diffstat or table of contents\n"
25704"for the patch you are writing.\n"
25705"\n"
25706"Clear the body content if you don't wish to send a summary.\n"
25707msgstr ""
25708"以 \"GIT:\" 开头的行将被删除。\n"
5b533632 25709"考虑包含一个整体的差异统计或者您正在写的补丁的目录。\n"
1a79b2f1
JX
25710"\n"
25711"如果您不想发送摘要,清除内容。\n"
25712
ec3d4607 25713#: git-send-email.perl:826
1a79b2f1
JX
25714#, perl-format
25715msgid "Failed to open %s: %s"
25716msgstr "无法打开 %s: %s"
25717
ec3d4607 25718#: git-send-email.perl:843
31e5e17b
JX
25719#, perl-format
25720msgid "Failed to open %s.final: %s"
25721msgstr "无法打开 %s.final: %s"
1a79b2f1 25722
ec3d4607 25723#: git-send-email.perl:886
1a79b2f1
JX
25724msgid "Summary email is empty, skipping it\n"
25725msgstr "摘要邮件为空,跳过\n"
25726
25727#. TRANSLATORS: please keep [y/N] as is.
ec3d4607 25728#: git-send-email.perl:935
1a79b2f1
JX
25729#, perl-format
25730msgid "Are you sure you want to use <%s> [y/N]? "
25731msgstr "您确认要使用 <%s> [y/N]?"
25732
ec3d4607 25733#: git-send-email.perl:990
1a79b2f1
JX
25734msgid ""
25735"The following files are 8bit, but do not declare a Content-Transfer-"
25736"Encoding.\n"
25737msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
25738
ec3d4607 25739#: git-send-email.perl:995
1a79b2f1
JX
25740msgid "Which 8bit encoding should I declare [UTF-8]? "
25741msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?"
25742
ec3d4607 25743#: git-send-email.perl:1003
1a79b2f1
JX
25744#, perl-format
25745msgid ""
25746"Refusing to send because the patch\n"
25747"\t%s\n"
25748"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
25749"want to send.\n"
25750msgstr ""
25751"拒绝发送,因为补丁\n"
25752"\t%s\n"
25753"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
25754
ec3d4607 25755#: git-send-email.perl:1022
1a79b2f1
JX
25756msgid "To whom should the emails be sent (if anyone)?"
25757msgstr "邮件将要发送给谁?"
25758
ec3d4607 25759#: git-send-email.perl:1040
1a79b2f1
JX
25760#, perl-format
25761msgid "fatal: alias '%s' expands to itself\n"
06991777 25762msgstr "致命错误:别名 '%s' 扩展为它自己\n"
1a79b2f1 25763
ec3d4607 25764#: git-send-email.perl:1052
1a79b2f1
JX
25765msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
25766msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?"
25767
ec3d4607 25768#: git-send-email.perl:1114 git-send-email.perl:1122
1a79b2f1
JX
25769#, perl-format
25770msgid "error: unable to extract a valid address from: %s\n"
25771msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
25772
25773#. TRANSLATORS: Make sure to include [q] [d] [e] in your
25774#. translation. The program will only accept English input
25775#. at this point.
ec3d4607 25776#: git-send-email.perl:1126
1a79b2f1
JX
25777msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
25778msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):"
25779
ec3d4607 25780#: git-send-email.perl:1446
1a79b2f1
JX
25781#, perl-format
25782msgid "CA path \"%s\" does not exist"
25783msgstr "CA 路径 \"%s\" 不存在"
25784
ec3d4607 25785#: git-send-email.perl:1529
1a79b2f1
JX
25786msgid ""
25787" The Cc list above has been expanded by additional\n"
25788" addresses found in the patch commit message. By default\n"
25789" send-email prompts before sending whenever this occurs.\n"
25790" This behavior is controlled by the sendemail.confirm\n"
25791" configuration setting.\n"
25792"\n"
25793" For additional information, run 'git send-email --help'.\n"
25794" To retain the current behavior, but squelch this message,\n"
25795" run 'git config --global sendemail.confirm auto'.\n"
25796"\n"
25797msgstr ""
25798" 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n"
25799" 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
25800" sendemail.confirm 配置设置。\n"
25801"\n"
25802" 更多信息,执行 'git send-email --help'。\n"
25803" 要保持当前行为,但不显示此信息,运行 'git config --global\n"
25804" sendemail.confirm auto'。\n"
25805"\n"
25806
fd8cb379 25807#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
1a79b2f1
JX
25808#. translation. The program will only accept English input
25809#. at this point.
ec3d4607 25810#: git-send-email.perl:1544
fd8cb379
JX
25811msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
25812msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
1a79b2f1 25813
ec3d4607 25814#: git-send-email.perl:1547
1a79b2f1
JX
25815msgid "Send this email reply required"
25816msgstr "发送要求的邮件回复"
25817
ec3d4607 25818#: git-send-email.perl:1581
1a79b2f1
JX
25819msgid "The required SMTP server is not properly defined."
25820msgstr "要求的 SMTP 服务器未被正确定义。"
25821
ec3d4607 25822#: git-send-email.perl:1628
1a79b2f1
JX
25823#, perl-format
25824msgid "Server does not support STARTTLS! %s"
25825msgstr "服务器不支持 STARTTLS!%s"
25826
ec3d4607 25827#: git-send-email.perl:1633 git-send-email.perl:1637
a4f16749
JX
25828#, perl-format
25829msgid "STARTTLS failed! %s"
25830msgstr "STARTTLS 失败!%s"
25831
ec3d4607 25832#: git-send-email.perl:1646
1a79b2f1
JX
25833msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
25834msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
25835
ec3d4607 25836#: git-send-email.perl:1664
1a79b2f1
JX
25837#, perl-format
25838msgid "Failed to send %s\n"
25839msgstr "无法发送 %s\n"
25840
ec3d4607 25841#: git-send-email.perl:1667
1a79b2f1
JX
25842#, perl-format
25843msgid "Dry-Sent %s\n"
25844msgstr "演习发送 %s\n"
25845
ec3d4607 25846#: git-send-email.perl:1667
1a79b2f1
JX
25847#, perl-format
25848msgid "Sent %s\n"
25849msgstr "正发送 %s\n"
25850
ec3d4607 25851#: git-send-email.perl:1669
1a79b2f1
JX
25852msgid "Dry-OK. Log says:\n"
25853msgstr "演习成功。日志说:\n"
25854
ec3d4607 25855#: git-send-email.perl:1669
1a79b2f1
JX
25856msgid "OK. Log says:\n"
25857msgstr "OK。日志说:\n"
25858
ec3d4607 25859#: git-send-email.perl:1688
1a79b2f1
JX
25860msgid "Result: "
25861msgstr "结果:"
25862
ec3d4607 25863#: git-send-email.perl:1691
1a79b2f1
JX
25864msgid "Result: OK\n"
25865msgstr "结果:OK\n"
25866
7e6630a7 25867#: git-send-email.perl:1708
1a79b2f1
JX
25868#, perl-format
25869msgid "can't open file %s"
25870msgstr "无法打开文件 %s"
25871
ec3d4607 25872#: git-send-email.perl:1756 git-send-email.perl:1776
1a79b2f1
JX
25873#, perl-format
25874msgid "(mbox) Adding cc: %s from line '%s'\n"
25875msgstr "(mbox) 添加 cc:%s 自行 '%s'\n"
25876
ec3d4607 25877#: git-send-email.perl:1762
1a79b2f1
JX
25878#, perl-format
25879msgid "(mbox) Adding to: %s from line '%s'\n"
25880msgstr "(mbox) 添加 to:%s 自行 '%s'\n"
25881
ec3d4607 25882#: git-send-email.perl:1819
1a79b2f1
JX
25883#, perl-format
25884msgid "(non-mbox) Adding cc: %s from line '%s'\n"
25885msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n"
25886
ec3d4607 25887#: git-send-email.perl:1854
1a79b2f1
JX
25888#, perl-format
25889msgid "(body) Adding cc: %s from line '%s'\n"
25890msgstr "(body) 添加 cc: %s 自行 '%s'\n"
25891
7e6630a7 25892#: git-send-email.perl:1973
1a79b2f1
JX
25893#, perl-format
25894msgid "(%s) Could not execute '%s'"
25895msgstr "(%s) 不能执行 '%s'"
25896
7e6630a7 25897#: git-send-email.perl:1980
1a79b2f1
JX
25898#, perl-format
25899msgid "(%s) Adding %s: %s from: '%s'\n"
25900msgstr "(%s) 添加 %s: %s 自:'%s'\n"
25901
7e6630a7 25902#: git-send-email.perl:1984
1a79b2f1
JX
25903#, perl-format
25904msgid "(%s) failed to close pipe to '%s'"
25905msgstr "(%s) 无法关闭管道至 '%s'"
25906
7e6630a7 25907#: git-send-email.perl:2014
1a79b2f1
JX
25908msgid "cannot send message as 7bit"
25909msgstr "不能以 7bit 形式发送信息"
25910
7e6630a7 25911#: git-send-email.perl:2022
1a79b2f1
JX
25912msgid "invalid transfer encoding"
25913msgstr "无效的传送编码"
25914
7e6630a7 25915#: git-send-email.perl:2059
33b62fba
JX
25916#, perl-format
25917msgid ""
25918"fatal: %s: rejected by sendemail-validate hook\n"
25919"%s\n"
25920"warning: no patches were sent\n"
25921msgstr ""
25922"致命错误:%s:被 sendemail-validate 挂钩拒绝\n"
25923"%s\n"
25924"警告:补丁未能发送\n"
25925
7e6630a7 25926#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
1a79b2f1
JX
25927#, perl-format
25928msgid "unable to open %s: %s\n"
25929msgstr "不能打开 %s:%s\n"
25930
7e6630a7 25931#: git-send-email.perl:2072
1a79b2f1 25932#, perl-format
33b62fba
JX
25933msgid ""
25934"fatal: %s:%d is longer than 998 characters\n"
25935"warning: no patches were sent\n"
25936msgstr ""
7b4d4954 25937"致命错误:%s:%d 超过 998 字符\n"
33b62fba 25938"警告:补丁未能发送\n"
1a79b2f1 25939
7e6630a7 25940#: git-send-email.perl:2090
1a79b2f1
JX
25941#, perl-format
25942msgid "Skipping %s with backup suffix '%s'.\n"
25943msgstr "略过 %s 含备份后缀 '%s'。\n"
25944
25945#. TRANSLATORS: please keep "[y|N]" as is.
7e6630a7 25946#: git-send-email.perl:2094
1a79b2f1
JX
25947#, perl-format
25948msgid "Do you really want to send %s? [y|N]: "
25949msgstr "您真的要发送 %s?[y|N]:"
7e6630a7
FZ
25950
25951#, c-format
25952#~ msgid ""
25953#~ "The following pathspecs didn't match any eligible path, but they do match "
25954#~ "index\n"
25955#~ "entries outside the current sparse checkout:\n"
25956#~ msgstr ""
25957#~ "以下路径规格不匹配任何适合的路径,但它们和当前稀疏检出之外的索引条目匹"
25958#~ "配:\n"
25959
25960#~ msgid ""
25961#~ "Disable or modify the sparsity rules if you intend to update such entries."
25962#~ msgstr "如果您打算更新此类条目,请禁用或修改稀疏规则。"
25963
25964#, c-format
25965#~ msgid "could not set GIT_DIR to '%s'"
25966#~ msgstr "不能设置 GIT_DIR 为 '%s'"
25967
25968#, c-format
25969#~ msgid "unable to unpack %s header with --allow-unknown-type"
25970#~ msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
25971
25972#, c-format
25973#~ msgid "unable to parse %s header with --allow-unknown-type"
25974#~ msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
25975
25976#~ msgid "open /dev/null failed"
25977#~ msgstr "不能打开 /dev/null"
25978
25979#~ msgid ""
25980#~ "after resolving the conflicts, mark the corrected paths\n"
25981#~ "with 'git add <paths>' or 'git rm <paths>'\n"
25982#~ "and commit the result with 'git commit'"
25983#~ msgstr ""
25984#~ "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
25985#~ "对修正后的文件做标记,然后用 'git commit' 提交"
25986
25987#~ msgid "open /dev/null or dup failed"
25988#~ msgstr "不能打开或者复制 /dev/null"
25989
25990#~ msgid "attempting to use sparse-index without cone mode"
25991#~ msgstr "尝试在没有 cone 模式下使用稀疏索引"
25992
25993#~ msgid "unable to update cache-tree, staying full"
25994#~ msgstr "不能更新缓存树,保持完整"
25995
25996#, c-format
25997#~ msgid "Could not open '%s' for writing."
25998#~ msgstr "无法为写入打开 '%s'。"
25999
26000#, c-format
26001#~ msgid "could not create archive file '%s'"
26002#~ msgstr "不能创建归档文件 '%s'"
26003
26004#~ msgid ""
26005#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
26006#~ msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]"
26007
26008#~ msgid "--bisect-next-check requires 2 or 3 arguments"
26009#~ msgstr "--bisect-next-check 需要 2 或 3 个参数"
26010
26011#, c-format
26012#~ msgid "couldn't create a new file at '%s'"
26013#~ msgstr "不能在 '%s' 创建新文件"
26014
26015#, c-format
26016#~ msgid "git commit-tree: failed to open '%s'"
26017#~ msgstr "git commit-tree:无法打开 '%s'"
26018
26019#, c-format
26020#~ msgid "cannot open packfile '%s'"
26021#~ msgstr "无法打开包文件 '%s'"
26022
26023#~ msgid "cannot store pack file"
26024#~ msgstr "无法存储包文件"
26025
26026#~ msgid "cannot store index file"
26027#~ msgstr "无法存储索引文件"
26028
26029#~ msgid "exclude patterns are read from <file>"
26030#~ msgstr "从 <文件> 中读取排除模式"
26031
26032#, c-format
26033#~ msgid "Unknown option for merge-recursive: -X%s"
26034#~ msgstr "merge-recursive 的未知选项:-X%s"
26035
26036#, c-format
26037#~ msgid "unusable todo list: '%s'"
26038#~ msgstr "不可用的待办列表:'%s'"
26039
26040#~ msgid "git rebase--interactive [<options>]"
26041#~ msgstr "git rebase--interactive [<选项>]"
26042
26043#~ msgid "rebase merge commits"
26044#~ msgstr "对合并提交变基"
26045
26046#~ msgid "keep original branch points of cousins"
26047#~ msgstr "保持兄弟提交的原始分支点"
26048
26049#~ msgid "move commits that begin with squash!/fixup!"
26050#~ msgstr "移动以 squash!/fixup! 开头的提交"
26051
26052#~ msgid "sign commits"
26053#~ msgstr "签名提交"
26054
26055#~ msgid "continue rebase"
26056#~ msgstr "继续变基"
26057
26058#~ msgid "skip commit"
26059#~ msgstr "跳过提交"
26060
26061#~ msgid "edit the todo list"
26062#~ msgstr "变基待办列表"
26063
26064#~ msgid "show the current patch"
26065#~ msgstr "显示当前补丁"
26066
26067#~ msgid "shorten commit ids in the todo list"
26068#~ msgstr "缩短待办列表中的提交号"
26069
26070#~ msgid "expand commit ids in the todo list"
26071#~ msgstr "扩展待办列表中的提交号"
26072
26073#~ msgid "check the todo list"
26074#~ msgstr "检查待办列表"
26075
26076#~ msgid "rearrange fixup/squash lines"
26077#~ msgstr "重新排列 fixup/squash 行"
26078
26079#~ msgid "insert exec commands in todo list"
26080#~ msgstr "在待办列表中插入 exec 执行命令"
26081
26082#~ msgid "onto"
26083#~ msgstr "onto"
26084
26085#~ msgid "restrict-revision"
26086#~ msgstr "restrict-revision"
26087
26088#~ msgid "restrict revision"
26089#~ msgstr "限制版本"
26090
26091#~ msgid "squash-onto"
26092#~ msgstr "squash-onto"
26093
26094#~ msgid "squash onto"
26095#~ msgstr "squash onto"
26096
26097#~ msgid "the upstream commit"
26098#~ msgstr "上游提交"
26099
26100#~ msgid "head-name"
26101#~ msgstr "head-name"
26102
26103#~ msgid "head name"
26104#~ msgstr "head 名称"
26105
26106#~ msgid "rebase strategy"
26107#~ msgstr "变基策略"
26108
26109#~ msgid "strategy-opts"
26110#~ msgstr "strategy-opts"
26111
26112#~ msgid "strategy options"
26113#~ msgstr "策略选项"
26114
26115#~ msgid "switch-to"
26116#~ msgstr "切换到"
26117
26118#~ msgid "the branch or commit to checkout"
26119#~ msgstr "要检出的分支或提交"
26120
26121#~ msgid "onto-name"
26122#~ msgstr "onto-name"
26123
26124#~ msgid "onto name"
26125#~ msgstr "onto name"
26126
26127#~ msgid "cmd"
26128#~ msgstr "cmd"
26129
26130#~ msgid "the command to run"
26131#~ msgstr "要执行的命令"
26132
26133#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
26134#~ msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果"
26135
26136#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
26137#~ msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"
26138
26139#~ msgid ""
26140#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
26141#~ msgstr ""
26142#~ "错误:不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"
26143
26144#~ msgid ""
26145#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> "
26146#~ "--name <name>"
26147#~ msgstr ""
26148#~ "git submodule--helper add-clone [<选项>...] --url <URL> --path <路径> --"
26149#~ "name <名称>"
26150
26151#, c-format
26152#~ msgid "failed to create file %s"
26153#~ msgstr "创建文件 %s 失败"
26154
26155#~ msgid "exit immediately after initial ref advertisement"
26156#~ msgstr "在初始的引用广告后立即退出"
26157
26158#, c-format
26159#~ msgid "socket/pipe already in use: '%s'"
26160#~ msgstr "套接字/管道已在使用:'%s'"
26161
26162#, c-format
26163#~ msgid "could not start server on: '%s'"
26164#~ msgstr "不能启动服务于:'%s'"
26165
26166#~ msgid "could not spawn daemon in the background"
26167#~ msgstr "无法在后台生成守护进程"
26168
26169#~ msgid "waitpid failed"
26170#~ msgstr "waitpid 失败"
26171
26172#~ msgid "daemon not online yet"
26173#~ msgstr "守护进程尚未上线"
26174
26175#~ msgid "daemon failed to start"
26176#~ msgstr "守护进程无法启动"
26177
26178#~ msgid "waitpid is confused"
26179#~ msgstr "waitpid 迷惑了"
26180
26181#~ msgid "daemon has not shutdown yet"
26182#~ msgstr "守护进程尚未关闭"
26183
26184#~ msgid "Protocol restrictions not supported with cURL < 7.19.4"
26185#~ msgstr "不支持协议限制,因为 cURL < 7.19.4"
26186
26187#, sh-format
26188#~ msgid "running $command"
26189#~ msgstr "运行 $command"
26190
26191#, sh-format
26192#~ msgid "'$sm_path' does not have a commit checked out"
26193#~ msgstr "'$sm_path' 没有检出的提交"
26194
26195#, sh-format
26196#~ msgid "Submodule path '$displaypath': '$command $sha1'"
26197#~ msgstr "子模组 '$displaypath':'$command $sha1'"
26198
26199#~ msgid "Applied autostash."
26200#~ msgstr "已应用 autostash。"
26201
26202#, sh-format
26203#~ msgid "Cannot store $stash_sha1"
26204#~ msgstr "不能存储 $stash_sha1"
26205
26206#~ msgid ""
26207#~ "Applying autostash resulted in conflicts.\n"
26208#~ "Your changes are safe in the stash.\n"
26209#~ "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
26210#~ msgstr ""
26211#~ "应用 autostash 导致了冲突。\n"
26212#~ "您的修改安全地保存在贮藏区中。\n"
26213#~ "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
26214
26215#, sh-format
26216#~ msgid "Rebasing ($new_count/$total)"
26217#~ msgstr "变基中($new_count/$total)"
26218
26219#~ msgid ""
26220#~ "\n"
26221#~ "Commands:\n"
26222#~ "p, pick <commit> = use commit\n"
26223#~ "r, reword <commit> = use commit, but edit the commit message\n"
26224#~ "e, edit <commit> = use commit, but stop for amending\n"
26225#~ "s, squash <commit> = use commit, but meld into previous commit\n"
26226#~ "f, fixup <commit> = like \"squash\", but discard this commit's log "
26227#~ "message\n"
26228#~ "x, exec <commit> = run command (the rest of the line) using shell\n"
26229#~ "d, drop <commit> = remove commit\n"
26230#~ "l, label <label> = label current HEAD with a name\n"
26231#~ "t, reset <label> = reset HEAD to a label\n"
26232#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
26233#~ ". create a merge commit using the original merge commit's\n"
26234#~ ". message (or the oneline, if no original merge commit was\n"
26235#~ ". specified). Use -c <commit> to reword the commit message.\n"
26236#~ "\n"
26237#~ "These lines can be re-ordered; they are executed from top to bottom.\n"
26238#~ msgstr ""
26239#~ "\n"
26240#~ "命令:\n"
26241#~ "p, pick <提交> = 使用提交\n"
26242#~ "r, reword <提交> = 使用提交,但修改提交说明\n"
26243#~ "e, edit <提交> = 使用提交,但停下来修补\n"
26244#~ "s, squash <提交> = 使用提交,但挤压到前一个提交\n"
26245#~ "f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
26246#~ "x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
26247#~ "d, drop <提交> = 删除提交\n"
26248#~ "l, label <标签> = 为当前 HEAD 打上标签\n"
26249#~ "t, reset <标签> = 重置 HEAD 到该标签\n"
26250#~ "m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n"
26251#~ ". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
26252#~ ". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
26253#~ ". -c <提交> 可以编辑提交说明。\n"
26254#~ "\n"
26255#~ "可以对这些行重新排序,将从上至下执行。\n"
26256
26257#, sh-format
26258#~ msgid ""
26259#~ "You can amend the commit now, with\n"
26260#~ "\n"
26261#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
26262#~ "\n"
26263#~ "Once you are satisfied with your changes, run\n"
26264#~ "\n"
26265#~ "\tgit rebase --continue"
26266#~ msgstr ""
26267#~ "您现在可以修补这个提交,使用\n"
26268#~ "\n"
26269#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
26270#~ "\n"
26271#~ "当您对变更感到满意,执行\n"
26272#~ "\n"
26273#~ "\tgit rebase --continue"
26274
26275#, sh-format
26276#~ msgid "$sha1: not a commit that can be picked"
26277#~ msgstr "$sha1:不是一个可以被拣选的提交"
26278
26279#, sh-format
26280#~ msgid "Invalid commit name: $sha1"
26281#~ msgstr "无效的提交名:$sha1"
26282
26283#~ msgid "Cannot write current commit's replacement sha1"
26284#~ msgstr "不能写入当前提交的替代 sha1"
26285
26286#, sh-format
26287#~ msgid "Fast-forward to $sha1"
26288#~ msgstr "快进到 $sha1"
26289
26290#, sh-format
26291#~ msgid "Cannot fast-forward to $sha1"
26292#~ msgstr "不能快进到 $sha1"
26293
26294#, sh-format
26295#~ msgid "Cannot move HEAD to $first_parent"
26296#~ msgstr "不能移动 HEAD 到 $first_parent"
26297
26298#, sh-format
26299#~ msgid "Refusing to squash a merge: $sha1"
26300#~ msgstr "拒绝挤压一个合并:$sha1"
26301
26302#, sh-format
26303#~ msgid "Error redoing merge $sha1"
26304#~ msgstr "无法重做合并 $sha1"
26305
26306#, sh-format
26307#~ msgid "Could not pick $sha1"
26308#~ msgstr "不能拣选 $sha1"
26309
26310#, sh-format
26311#~ msgid "This is the commit message #${n}:"
26312#~ msgstr "这是提交说明 #${n}:"
26313
26314#, sh-format
26315#~ msgid "The commit message #${n} will be skipped:"
26316#~ msgstr "提交说明 #${n} 将被跳过:"
26317
26318#, sh-format
26319#~ msgid "This is a combination of $count commit."
26320#~ msgid_plural "This is a combination of $count commits."
26321#~ msgstr[0] "这是一个 $count 个提交的组合。"
26322#~ msgstr[1] "这是一个 $count 个提交的组合。"
26323
26324#, sh-format
26325#~ msgid "Cannot write $fixup_msg"
26326#~ msgstr "不能写入 $fixup_msg"
26327
26328#~ msgid "This is a combination of 2 commits."
26329#~ msgstr "这是一个 2 个提交的组合。"
26330
26331#, sh-format
26332#~ msgid "Could not apply $sha1... $rest"
26333#~ msgstr "不能应用 $sha1... $rest"
26334
26335#, sh-format
26336#~ msgid ""
26337#~ "Could not amend commit after successfully picking $sha1... $rest\n"
26338#~ "This is most likely due to an empty commit message, or the pre-commit "
26339#~ "hook\n"
26340#~ "failed. If the pre-commit hook failed, you may need to resolve the issue "
26341#~ "before\n"
26342#~ "you are able to reword the commit."
26343#~ msgstr ""
26344#~ "不能在成功拣选 $sha1... $rest 之后修补提交\n"
26345#~ "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-"
26346#~ "commit\n"
26347#~ "钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
26348
26349#, sh-format
26350#~ msgid "Stopped at $sha1_abbrev... $rest"
26351#~ msgstr "停止在 $sha1_abbrev... $rest"
26352
26353#, sh-format
26354#~ msgid "Cannot '$squash_style' without a previous commit"
26355#~ msgstr "没有父提交的情况下不能 '$squash_style'"
26356
26357#, sh-format
26358#~ msgid "Executing: $rest"
26359#~ msgstr "执行:$rest"
26360
26361#, sh-format
26362#~ msgid "Execution failed: $rest"
26363#~ msgstr "执行失败:$rest"
26364
26365#~ msgid "and made changes to the index and/or the working tree"
26366#~ msgstr "并且修改索引和/或工作区"
26367
26368#~ msgid ""
26369#~ "You can fix the problem, and then run\n"
26370#~ "\n"
26371#~ "\tgit rebase --continue"
26372#~ msgstr ""
26373#~ "您可以解决这个问题,然后运行\n"
26374#~ "\n"
26375#~ "\tgit rebase --continue"
26376
26377#, sh-format
26378#~ msgid ""
26379#~ "Execution succeeded: $rest\n"
26380#~ "but left changes to the index and/or the working tree\n"
26381#~ "Commit or stash your changes, and then run\n"
26382#~ "\n"
26383#~ "\tgit rebase --continue"
26384#~ msgstr ""
26385#~ "执行成功:$rest\n"
26386#~ "但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n"
26387#~ "\n"
26388#~ "\tgit rebase --continue"
26389
26390#, sh-format
26391#~ msgid "Unknown command: $command $sha1 $rest"
26392#~ msgstr "未知命令:$command $sha1 $rest"
26393
26394#~ msgid "Please fix this using 'git rebase --edit-todo'."
26395#~ msgstr "要修改请使用命令 'git rebase --edit-todo'。"
26396
26397#, sh-format
26398#~ msgid "Successfully rebased and updated $head_name."
26399#~ msgstr "成功变基并更新 $head_name。"
26400
26401#~ msgid "Could not remove CHERRY_PICK_HEAD"
26402#~ msgstr "不能删除 CHERRY_PICK_HEAD"
26403
26404#, sh-format
26405#~ msgid ""
26406#~ "You have staged changes in your working tree.\n"
26407#~ "If these changes are meant to be\n"
26408#~ "squashed into the previous commit, run:\n"
26409#~ "\n"
26410#~ " git commit --amend $gpg_sign_opt_quoted\n"
26411#~ "\n"
26412#~ "If they are meant to go into a new commit, run:\n"
26413#~ "\n"
26414#~ " git commit $gpg_sign_opt_quoted\n"
26415#~ "\n"
26416#~ "In both cases, once you're done, continue with:\n"
26417#~ "\n"
26418#~ " git rebase --continue\n"
26419#~ msgstr ""
26420#~ "您已暂存了工作区的修改。如果这些修改要挤压到前一个提交,执行:\n"
26421#~ "\n"
26422#~ " git commit --amend $gpg_sign_opt_quoted\n"
26423#~ "\n"
26424#~ "如果这些变更要形成一个新提交,执行:\n"
26425#~ "\n"
26426#~ " git commit $gpg_sign_opt_quoted\n"
26427#~ "\n"
26428#~ "无论哪种情况,当您完成提交,继续执行:\n"
26429#~ "\n"
26430#~ " git rebase --continue\n"
26431
26432#~ msgid "Error trying to find the author identity to amend commit"
26433#~ msgstr "在修补提交中查找作者信息时遇到错误"
26434
26435#~ msgid ""
26436#~ "You have uncommitted changes in your working tree. Please commit them\n"
26437#~ "first and then run 'git rebase --continue' again."
26438#~ msgstr ""
26439#~ "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
26440
26441#~ msgid "Could not commit staged changes."
26442#~ msgstr "不能提交暂存的修改。"
26443
26444#~ msgid "Could not execute editor"
26445#~ msgstr "无法运行编辑器"
26446
26447#, sh-format
26448#~ msgid "Could not checkout $switch_to"
26449#~ msgstr "不能检出 $switch_to"
26450
26451#~ msgid "No HEAD?"
26452#~ msgstr "没有 HEAD?"
26453
26454#, sh-format
26455#~ msgid "Could not create temporary $state_dir"
26456#~ msgstr "不能创建临时 $state_dir"
26457
26458#~ msgid "Could not mark as interactive"
26459#~ msgstr "不能标记为交互式"
26460
26461#, sh-format
26462#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
26463#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
26464#~ msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
26465#~ msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
26466
26467#~ msgid "Note that empty commits are commented out"
26468#~ msgstr "注意空提交已被注释掉"
26469
26470#~ msgid "Could not init rewritten commits"
26471#~ msgstr "不能对重写提交进行初始化"
26472
26473#~ msgid "Cannot rebase: You have unstaged changes."
26474#~ msgstr "不能变基:您有未暂存的变更。"
26475
26476#~ msgid "Cannot pull with rebase: You have unstaged changes."
26477#~ msgstr "无法通过变基方式拉取:您有未暂存的变更。"
26478
26479#~ msgid "Cannot rebase: Your index contains uncommitted changes."
26480#~ msgstr "不能变基:您的索引中包含未提交的变更。"
26481
26482#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes."
26483#~ msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"