]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
Merge branch 'en/fetch-negotiation-default-fix'
[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) | 提交号
65387fd5 47# cone | 锥形(稀疏检出模型);锥(稀疏检出)
160fb2b2
JX
48# conflict | 冲突
49# core Git | 核心 Git 工具
d46c5519 50# cover letter | 附函
160fb2b2 51# DAG | 有向无环图
e640d114 52# dangling object | 悬空对象
160fb2b2
JX
53# detached HEAD | 分离头指针
54# directory | 目录
55# dirty | 脏(的工作区)
755c831b 56# dumb HTTP protocol | 哑 HTTP 协议
65387fd5 57# enlistment | 登记(在 scalar 中使用)
160fb2b2
JX
58# evil merge | 坏合并(合并引入了父提交没有的修改)
59# fast-forward | 快进
60# fetch | 获取
61# file system | 文件系统
e397e7e3 62# fork | 派生
160fb2b2
JX
63# Git archive | 仓库(对于 arch 用户)
64# gitfile | gitfile(仓库链接文件)
fd8cb379 65# grafts | (提交)移植
160fb2b2
JX
66# hash | 哈希值
67# HEAD | HEAD(头指针,亦即当前分支)
68# head | 头、分支
69# head ref | 分支
70# header | 头信息
71# hook | 钩子
72# hunk | 补丁片段
73# index | 索引
74# index entry | 索引条目
75# loose object | 松散对象
76# loose refs | 松散引用
77# master | master(默认分支名)
78# merge | 合并
79# object | 对象
80# object database | 对象库
81# object identifier | 对象标识符
82# object name | 对象名称
83# object type | 对象类型
84# octopus | 章鱼式合并(两分支以上的合并)
85# origin | origin(默认的远程名称)
86# pack | 包
87# pack index | 包索引
88# packfile | 包文件
89# parent | 父提交
90# patch | 补丁
91# pathspec | 路径规格
92# pattern | 模式
12e59059 93# pickaxe | 挖掘
160fb2b2
JX
94# plumbing | 管件(Git 底层核心命令的别称)
95# porcelain | 瓷件(Git 上层封装命令的别称)
94550ed3 96# precious-objects repo | 珍品仓库
473eb541 97# promisor | 承诺者
160fb2b2
JX
98# prune | 清除
99# pull | 拉,拉取
100# push | 推,推送
101# reachable | 可达
102# rebase | 变基
103# ref | 引用
104# reflog | 引用日志
105# refspec | 引用规格
106# remote | 远程,远程仓库
107# remote-tracking branch | 远程跟踪分支
108# replay | 重放
109# repo | 仓库
110# repository | 仓库
111# resolve | (冲突)解决
112# revert | 还原
113# revision | 版本
114# rewind | 回退
115# SCM | 源代码管理(工具)
ee7589bb 116# SHA-1 | SHA-1(安全哈希算法1)
160fb2b2
JX
117# shallow repository | 浅(克隆)仓库
118# signed tag | 签名标签
755c831b 119# smart HTTP protocol | 智能 HTTP 协议
33b62fba 120# squash | 挤压
160fb2b2 121# stage | n. 暂存区(即索引); v. 暂存
a4f16749 122# stash | n. 贮藏区; v. 贮藏
160fb2b2
JX
123# submodule | 子模组
124# symref | 符号引用
933c015e 125# tag | n. 标签; v. 打标签
160fb2b2
JX
126# tag object | 标签对象
127# tagger | 打标签者
128# topic branch | 主题分支
129# track | 跟踪
d13389bf 130# trailer | 尾注
160fb2b2
JX
131# tree | 树(工作区或树对象)
132# tree object | 树对象
133# tree-ish (also treeish) | 树对象(或可以解析为一树对象)
134# unmerged index | 未合并索引
135# unpack | 解包
136# unreachable object | 不可达对象
137# unstage | 取消暂存
138# upstream | 上游
139# upstream branch | 上游分支
140# working tree | 工作区
65387fd5 141# Fangyi Zhou <me@fangyi.io>, 2021-2022.
160fb2b2 142#
c04f5ac3
JX
143msgid ""
144msgstr ""
145"Project-Id-Version: Git\n"
146"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
ee27abd3 147"POT-Creation-Date: 2022-01-17 08:34+0800\n"
65387fd5 148"PO-Revision-Date: 2022-01-11 18:18+0000\n"
7e6630a7 149"Last-Translator: Fangyi Zhou <me@fangyi.io>\n"
7aea43ff 150"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
c04f5ac3
JX
151"Language: zh_CN\n"
152"MIME-Version: 1.0\n"
153"Content-Type: text/plain; charset=UTF-8\n"
154"Content-Transfer-Encoding: 8bit\n"
5ae481e0 155"Plural-Forms: nplurals=2; plural=(n != 1);\n"
7e6630a7 156"X-Generator: Gtranslator 41.0\n"
c04f5ac3 157
7e6630a7 158#: add-interactive.c:380
ddc12c42
JX
159#, c-format
160msgid "Huh (%s)?"
161msgstr "嗯(%s)?"
162
65387fd5
FZ
163#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
164#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
7e6630a7 165#: builtin/rebase.c:1642
ddc12c42
JX
166msgid "could not read index"
167msgstr "不能读取索引"
168
7e6630a7 169#: add-interactive.c:588 git-add--interactive.perl:269
ddc12c42
JX
170#: git-add--interactive.perl:294
171msgid "binary"
172msgstr "二进制"
173
7e6630a7 174#: add-interactive.c:646 git-add--interactive.perl:278
ddc12c42
JX
175#: git-add--interactive.perl:332
176msgid "nothing"
177msgstr "无"
178
7e6630a7 179#: add-interactive.c:647 git-add--interactive.perl:314
ddc12c42
JX
180#: git-add--interactive.perl:329
181msgid "unchanged"
182msgstr "没有修改"
183
7e6630a7 184#: add-interactive.c:684 git-add--interactive.perl:641
ddc12c42
JX
185msgid "Update"
186msgstr "更新"
187
7e6630a7 188#: add-interactive.c:701 add-interactive.c:889
ddc12c42
JX
189#, c-format
190msgid "could not stage '%s'"
191msgstr "不能暂存 '%s'"
192
65387fd5 193#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
ddc12c42
JX
194msgid "could not write index"
195msgstr "不能写入索引"
196
7e6630a7 197#: add-interactive.c:710 git-add--interactive.perl:626
ddc12c42
JX
198#, c-format, perl-format
199msgid "updated %d path\n"
200msgid_plural "updated %d paths\n"
201msgstr[0] "更新了 %d 个路径\n"
202msgstr[1] "更新了 %d 个路径\n"
203
7e6630a7 204#: add-interactive.c:728 git-add--interactive.perl:676
ddc12c42
JX
205#, c-format, perl-format
206msgid "note: %s is untracked now.\n"
207msgstr "说明:%s 现已成为未跟踪的。\n"
208
65387fd5
FZ
209#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
210#: builtin/reset.c:167
ddc12c42
JX
211#, c-format
212msgid "make_cache_entry failed for path '%s'"
213msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
214
7e6630a7 215#: add-interactive.c:763 git-add--interactive.perl:653
ddc12c42
JX
216msgid "Revert"
217msgstr "还原"
218
7e6630a7 219#: add-interactive.c:779
ddc12c42
JX
220msgid "Could not parse HEAD^{tree}"
221msgstr "不能解析 HEAD^{tree}"
222
7e6630a7 223#: add-interactive.c:817 git-add--interactive.perl:629
ddc12c42
JX
224#, c-format, perl-format
225msgid "reverted %d path\n"
226msgid_plural "reverted %d paths\n"
227msgstr[0] "还原了 %d 个路径\n"
228msgstr[1] "还原了 %d 个路径\n"
229
7e6630a7 230#: add-interactive.c:868 git-add--interactive.perl:693
ddc12c42
JX
231#, c-format
232msgid "No untracked files.\n"
233msgstr "没有未跟踪的文件。\n"
234
7e6630a7 235#: add-interactive.c:872 git-add--interactive.perl:687
ddc12c42
JX
236msgid "Add untracked"
237msgstr "添加未跟踪的"
238
7e6630a7 239#: add-interactive.c:899 git-add--interactive.perl:623
ddc12c42
JX
240#, c-format, perl-format
241msgid "added %d path\n"
242msgid_plural "added %d paths\n"
243msgstr[0] "增加了 %d 个路径\n"
244msgstr[1] "增加了 %d 个路径\n"
245
7e6630a7 246#: add-interactive.c:929
ddc12c42
JX
247#, c-format
248msgid "ignoring unmerged: %s"
249msgstr "忽略未合入的:%s"
250
65387fd5 251#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
ddc12c42
JX
252#, c-format
253msgid "Only binary files changed.\n"
254msgstr "只有二进制文件被修改。\n"
255
65387fd5 256#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
ddc12c42
JX
257#, c-format
258msgid "No changes.\n"
259msgstr "没有修改。\n"
260
65387fd5 261#: add-interactive.c:947 git-add--interactive.perl:1381
ddc12c42
JX
262msgid "Patch update"
263msgstr "补丁更新"
264
65387fd5 265#: add-interactive.c:986 git-add--interactive.perl:1794
ddc12c42
JX
266msgid "Review diff"
267msgstr "检视 diff"
268
7e6630a7 269#: add-interactive.c:1014
ddc12c42
JX
270msgid "show paths with changes"
271msgstr "显示含变更的路径"
272
7e6630a7 273#: add-interactive.c:1016
ddc12c42
JX
274msgid "add working tree state to the staged set of changes"
275msgstr "将工作区状态添加到暂存区修改集中"
276
7e6630a7 277#: add-interactive.c:1018
ddc12c42
JX
278msgid "revert staged set of changes back to the HEAD version"
279msgstr "将暂存的修改集恢复为 HEAD 版本"
280
7e6630a7 281#: add-interactive.c:1020
ddc12c42
JX
282msgid "pick hunks and update selectively"
283msgstr "挑选数据块并有选择地更新"
284
7e6630a7 285#: add-interactive.c:1022
ddc12c42
JX
286msgid "view diff between HEAD and index"
287msgstr "显示 HEAD 和索引的差异"
288
7e6630a7 289#: add-interactive.c:1024
ddc12c42
JX
290msgid "add contents of untracked files to the staged set of changes"
291msgstr "将未跟踪文件的内容添加到暂存区修改集中"
292
7e6630a7 293#: add-interactive.c:1032 add-interactive.c:1081
ddc12c42
JX
294msgid "Prompt help:"
295msgstr "帮助:"
296
7e6630a7 297#: add-interactive.c:1034
ddc12c42
JX
298msgid "select a single item"
299msgstr "选择一个条目"
300
7e6630a7 301#: add-interactive.c:1036
ddc12c42
JX
302msgid "select a range of items"
303msgstr "选择一系列条目"
304
7e6630a7 305#: add-interactive.c:1038
ddc12c42
JX
306msgid "select multiple ranges"
307msgstr "选择多个范围"
308
7e6630a7 309#: add-interactive.c:1040 add-interactive.c:1085
ddc12c42
JX
310msgid "select item based on unique prefix"
311msgstr "基于唯一前缀选择条目"
312
7e6630a7 313#: add-interactive.c:1042
ddc12c42
JX
314msgid "unselect specified items"
315msgstr "反选指定的条目"
316
7e6630a7 317#: add-interactive.c:1044
ddc12c42
JX
318msgid "choose all items"
319msgstr "选择所有条目"
320
7e6630a7 321#: add-interactive.c:1046
ddc12c42
JX
322msgid "(empty) finish selecting"
323msgstr "(空)结束选择"
324
7e6630a7 325#: add-interactive.c:1083
ddc12c42
JX
326msgid "select a numbered item"
327msgstr "选择一个编号条目"
328
7e6630a7 329#: add-interactive.c:1087
ddc12c42
JX
330msgid "(empty) select nothing"
331msgstr "(空)不选择任何内容"
332
65387fd5 333#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
ddc12c42
JX
334msgid "*** Commands ***"
335msgstr "*** 命令 ***"
336
65387fd5 337#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
ddc12c42
JX
338msgid "What now"
339msgstr "请选择"
340
7e6630a7 341#: add-interactive.c:1148 git-add--interactive.perl:213
ddc12c42
JX
342msgid "staged"
343msgstr "缓存"
344
7e6630a7 345#: add-interactive.c:1148 git-add--interactive.perl:213
ddc12c42
JX
346msgid "unstaged"
347msgstr "未缓存"
348
65387fd5
FZ
349#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
350#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
351#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
352#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
353#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
354#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
355#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
349ede6a 356#: git-add--interactive.perl:213
ddc12c42
JX
357msgid "path"
358msgstr "路径"
359
7e6630a7 360#: add-interactive.c:1155
ddc12c42
JX
361msgid "could not refresh index"
362msgstr "不能刷新索引"
363
65387fd5 364#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
ddc12c42
JX
365#, c-format
366msgid "Bye.\n"
367msgstr "再见。\n"
368
65387fd5 369#: add-patch.c:34 git-add--interactive.perl:1433
2b472aae
JX
370#, c-format, perl-format
371msgid "Stage mode change [y,n,q,a,d%s,?]? "
372msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
ddc12c42 373
65387fd5 374#: add-patch.c:35 git-add--interactive.perl:1434
2b472aae
JX
375#, c-format, perl-format
376msgid "Stage deletion [y,n,q,a,d%s,?]? "
377msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
ddc12c42 378
65387fd5 379#: add-patch.c:36 git-add--interactive.perl:1435
7157c2b5
JX
380#, c-format, perl-format
381msgid "Stage addition [y,n,q,a,d%s,?]? "
382msgstr "暂存添加动作 [y,n,q,a,d%s,?]? "
383
65387fd5 384#: add-patch.c:37 git-add--interactive.perl:1436
2b472aae
JX
385#, c-format, perl-format
386msgid "Stage this hunk [y,n,q,a,d%s,?]? "
387msgstr "暂存该块 [y,n,q,a,d%s,?]? "
388
7157c2b5 389#: add-patch.c:39
2b472aae
JX
390msgid ""
391"If the patch applies cleanly, the edited hunk will immediately be marked for "
392"staging."
393msgstr "如果补丁能正确地应用,编辑块将立即标记为暂存。"
394
7157c2b5 395#: add-patch.c:42
2b472aae
JX
396msgid ""
397"y - stage this hunk\n"
398"n - do not stage this hunk\n"
399"q - quit; do not stage this hunk or any of the remaining ones\n"
400"a - stage this hunk and all later hunks in the file\n"
401"d - do not stage this hunk or any of the later hunks in the file\n"
402msgstr ""
403"y - 暂存该块\n"
404"n - 不要暂存该块\n"
405"q - 退出。不暂存该块及后面的全部块\n"
406"a - 暂存该块和本文件中后面的全部块\n"
407"d - 不暂存该块和本文件中后面的全部块\n"
408
65387fd5 409#: add-patch.c:56 git-add--interactive.perl:1439
2b472aae
JX
410#, c-format, perl-format
411msgid "Stash mode change [y,n,q,a,d%s,?]? "
412msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
413
65387fd5 414#: add-patch.c:57 git-add--interactive.perl:1440
2b472aae
JX
415#, c-format, perl-format
416msgid "Stash deletion [y,n,q,a,d%s,?]? "
417msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
418
65387fd5 419#: add-patch.c:58 git-add--interactive.perl:1441
7157c2b5
JX
420#, c-format, perl-format
421msgid "Stash addition [y,n,q,a,d%s,?]? "
422msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? "
423
65387fd5 424#: add-patch.c:59 git-add--interactive.perl:1442
2b472aae
JX
425#, c-format, perl-format
426msgid "Stash this hunk [y,n,q,a,d%s,?]? "
427msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
428
7157c2b5 429#: add-patch.c:61
2b472aae
JX
430msgid ""
431"If the patch applies cleanly, the edited hunk will immediately be marked for "
432"stashing."
433msgstr "如果补丁能正确地应用,编辑块将立即标记为贮藏。"
434
7157c2b5 435#: add-patch.c:64
2b472aae
JX
436msgid ""
437"y - stash this hunk\n"
438"n - do not stash this hunk\n"
439"q - quit; do not stash this hunk or any of the remaining ones\n"
440"a - stash this hunk and all later hunks in the file\n"
441"d - do not stash this hunk or any of the later hunks in the file\n"
442msgstr ""
443"y - 贮藏该块\n"
444"n - 不要贮藏该块\n"
445"q - 退出。不贮藏该块及后面的全部块\n"
446"a - 贮藏该块和本文件中后面的全部块\n"
447"d - 不贮藏该块和本文件中后面的全部块\n"
448
65387fd5 449#: add-patch.c:80 git-add--interactive.perl:1445
2b472aae
JX
450#, c-format, perl-format
451msgid "Unstage mode change [y,n,q,a,d%s,?]? "
452msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
453
65387fd5 454#: add-patch.c:81 git-add--interactive.perl:1446
2b472aae
JX
455#, c-format, perl-format
456msgid "Unstage deletion [y,n,q,a,d%s,?]? "
457msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
458
65387fd5 459#: add-patch.c:82 git-add--interactive.perl:1447
7157c2b5
JX
460#, c-format, perl-format
461msgid "Unstage addition [y,n,q,a,d%s,?]? "
462msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? "
463
65387fd5 464#: add-patch.c:83 git-add--interactive.perl:1448
2b472aae
JX
465#, c-format, perl-format
466msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
467msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
468
7157c2b5 469#: add-patch.c:85
2b472aae
JX
470msgid ""
471"If the patch applies cleanly, the edited hunk will immediately be marked for "
472"unstaging."
473msgstr "如果补丁能正确地应用,编辑块将立即标记为未暂存。"
474
7157c2b5 475#: add-patch.c:88
2b472aae
JX
476msgid ""
477"y - unstage this hunk\n"
478"n - do not unstage this hunk\n"
479"q - quit; do not unstage this hunk or any of the remaining ones\n"
480"a - unstage this hunk and all later hunks in the file\n"
481"d - do not unstage this hunk or any of the later hunks in the file\n"
482msgstr ""
440e7442
FZ
483"y - 取消暂存该块\n"
484"n - 不要取消暂存该块\n"
485"q - 退出。不要取消暂存该块及后面的全部块\n"
486"a - 取消暂存该块和本文件中后面的全部块\n"
487"d - 不要取消暂存该块和本文件中后面的全部块\n"
2b472aae 488
65387fd5 489#: add-patch.c:103 git-add--interactive.perl:1451
2b472aae
JX
490#, c-format, perl-format
491msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
492msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
493
65387fd5 494#: add-patch.c:104 git-add--interactive.perl:1452
2b472aae
JX
495#, c-format, perl-format
496msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
497msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
498
65387fd5 499#: add-patch.c:105 git-add--interactive.perl:1453
7157c2b5
JX
500#, c-format, perl-format
501msgid "Apply addition to index [y,n,q,a,d%s,?]? "
502msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? "
503
65387fd5 504#: add-patch.c:106 git-add--interactive.perl:1454
2b472aae
JX
505#, c-format, perl-format
506msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
507msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
508
7157c2b5 509#: add-patch.c:108 add-patch.c:176 add-patch.c:221
2b472aae
JX
510msgid ""
511"If the patch applies cleanly, the edited hunk will immediately be marked for "
512"applying."
513msgstr "如果补丁能正确地应用,编辑块将立即标记为应用。"
514
7157c2b5 515#: add-patch.c:111
2b472aae
JX
516msgid ""
517"y - apply this hunk to index\n"
518"n - do not apply this hunk to index\n"
519"q - quit; do not apply this hunk or any of the remaining ones\n"
520"a - apply this hunk and all later hunks in the file\n"
521"d - do not apply this hunk or any of the later hunks in the file\n"
522msgstr ""
523"y - 在索引中应用该块\n"
524"n - 不要在索引中应用该块\n"
525"q - 退出。不要应用该块及后面的全部块\n"
526"a - 应用该块和本文件中后面的全部块\n"
527"d - 不要应用该块和本文件中后面的全部块\n"
528
65387fd5
FZ
529#: add-patch.c:126 git-add--interactive.perl:1457
530#: git-add--interactive.perl:1475
2b472aae
JX
531#, c-format, perl-format
532msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
533msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
534
65387fd5
FZ
535#: add-patch.c:127 git-add--interactive.perl:1458
536#: git-add--interactive.perl:1476
2b472aae
JX
537#, c-format, perl-format
538msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
539msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
ddc12c42 540
65387fd5
FZ
541#: add-patch.c:128 git-add--interactive.perl:1459
542#: git-add--interactive.perl:1477
7157c2b5
JX
543#, c-format, perl-format
544msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
545msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
546
65387fd5
FZ
547#: add-patch.c:129 git-add--interactive.perl:1460
548#: git-add--interactive.perl:1478
2b472aae
JX
549#, c-format, perl-format
550msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
551msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
552
7157c2b5 553#: add-patch.c:131 add-patch.c:154 add-patch.c:199
2b472aae
JX
554msgid ""
555"If the patch applies cleanly, the edited hunk will immediately be marked for "
556"discarding."
557msgstr "如果补丁能正确地应用,编辑块将立即标记为丢弃。"
558
7157c2b5 559#: add-patch.c:134 add-patch.c:202
2b472aae
JX
560msgid ""
561"y - discard this hunk from worktree\n"
562"n - do not discard this hunk from worktree\n"
563"q - quit; do not discard this hunk or any of the remaining ones\n"
564"a - discard this hunk and all later hunks in the file\n"
565"d - do not discard this hunk or any of the later hunks in the file\n"
566msgstr ""
567"y - 在工作区中丢弃该块\n"
568"n - 不要在工作区中丢弃该块\n"
569"q - 退出。不要丢弃该块及后面的全部块\n"
570"a - 丢弃该块和本文件中后面的全部块\n"
571"d - 不要丢弃该块和本文件中后面的全部块\n"
572
65387fd5 573#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
2b472aae
JX
574#, c-format, perl-format
575msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
576msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
577
65387fd5 578#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
2b472aae
JX
579#, c-format, perl-format
580msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
7157c2b5 581msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
2b472aae 582
65387fd5 583#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
7157c2b5
JX
584#, c-format, perl-format
585msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
586msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
587
65387fd5 588#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
2b472aae
JX
589#, c-format, perl-format
590msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
591msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
592
7157c2b5 593#: add-patch.c:157
2b472aae
JX
594msgid ""
595"y - discard this hunk from index and worktree\n"
596"n - do not discard this hunk from index and worktree\n"
597"q - quit; do not discard this hunk or any of the remaining ones\n"
598"a - discard this hunk and all later hunks in the file\n"
599"d - do not discard this hunk or any of the later hunks in the file\n"
600msgstr ""
601"y - 在索引和工作区中丢弃该块\n"
602"n - 不要在索引和工作区中丢弃该块\n"
603"q - 退出。不要丢弃该块及后面的全部块\n"
604"a - 丢弃该块和本文件中后面的全部块\n"
605"d - 不要丢弃该块和本文件中后面的全部块\n"
606
65387fd5 607#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
2b472aae
JX
608#, c-format, perl-format
609msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
610msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
611
65387fd5 612#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
2b472aae
JX
613#, c-format, perl-format
614msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
615msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
616
65387fd5 617#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
7157c2b5
JX
618#, c-format, perl-format
619msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
620msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
621
65387fd5 622#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
2b472aae
JX
623#, c-format, perl-format
624msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
625msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
626
7157c2b5 627#: add-patch.c:179
2b472aae
JX
628msgid ""
629"y - apply this hunk to index and worktree\n"
630"n - do not apply this hunk to index and worktree\n"
631"q - quit; do not apply this hunk or any of the remaining ones\n"
632"a - apply this hunk and all later hunks in the file\n"
633"d - do not apply this hunk or any of the later hunks in the file\n"
634msgstr ""
635"y - 在索引和工作区中应用该块\n"
636"n - 不要在索引和工作区中应用该块\n"
637"q - 退出。不要应用该块及后面的全部块\n"
638"a - 应用该块和本文件中后面的全部块\n"
639"d - 不要应用该块和本文件中后面的全部块\n"
640
7157c2b5 641#: add-patch.c:224
2b472aae
JX
642msgid ""
643"y - apply this hunk to worktree\n"
644"n - do not apply this hunk to worktree\n"
645"q - quit; do not apply this hunk or any of the remaining ones\n"
646"a - apply this hunk and all later hunks in the file\n"
647"d - do not apply this hunk or any of the later hunks in the file\n"
648msgstr ""
649"y - 在工作区中应用该块\n"
650"n - 不要在工作区中应用该块\n"
651"q - 退出。不要应用该块及后面的全部块\n"
652"a - 应用该块和本文件中后面的全部块\n"
653"d - 不要应用该块和本文件中后面的全部块\n"
654
ec3d4607 655#: add-patch.c:343
ddc12c42
JX
656#, c-format
657msgid "could not parse hunk header '%.*s'"
658msgstr "无法解析数据块头信息 '%.*s'"
659
ec3d4607 660#: add-patch.c:362 add-patch.c:366
ddc12c42
JX
661#, c-format
662msgid "could not parse colored hunk header '%.*s'"
663msgstr "无法解析彩色数据块头信息 '%.*s'"
664
ec3d4607 665#: add-patch.c:420
ddc12c42
JX
666msgid "could not parse diff"
667msgstr "不能解析差异信息"
668
ec3d4607 669#: add-patch.c:439
ddc12c42
JX
670msgid "could not parse colored diff"
671msgstr "不能解析彩色差异信息"
672
ec3d4607 673#: add-patch.c:453
2b472aae
JX
674#, c-format
675msgid "failed to run '%s'"
65387fd5 676msgstr "无法运行 '%s'"
2b472aae 677
ec3d4607 678#: add-patch.c:612
2b472aae
JX
679msgid "mismatched output from interactive.diffFilter"
680msgstr "interactive.diffFilter 的输出不匹配"
681
ec3d4607 682#: add-patch.c:613
2b472aae
JX
683msgid ""
684"Your filter must maintain a one-to-one correspondence\n"
685"between its input and output lines."
686msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"
687
ec3d4607 688#: add-patch.c:791
ddc12c42
JX
689#, c-format
690msgid ""
691"expected context line #%d in\n"
692"%.*s"
693msgstr ""
694"预期上下文行 #%d 于\n"
695"%.*s"
696
ec3d4607 697#: add-patch.c:806
ddc12c42
JX
698#, c-format
699msgid ""
700"hunks do not overlap:\n"
701"%.*s\n"
702"\tdoes not end with:\n"
703"%.*s"
704msgstr ""
705"块不重叠:\n"
706"%.*s\n"
707"\t不是结尾于:\n"
708"%.*s"
709
ec3d4607 710#: add-patch.c:1082 git-add--interactive.perl:1115
ddc12c42
JX
711msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
712msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
713
ec3d4607 714#: add-patch.c:1086
ddc12c42
JX
715#, c-format
716msgid ""
717"---\n"
718"To remove '%c' lines, make them ' ' lines (context).\n"
719"To remove '%c' lines, delete them.\n"
720"Lines starting with %c will be removed.\n"
721msgstr ""
722"---\n"
723"要删除 '%c' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
724"要删除 '%c' 开始的行,删除它们。\n"
725"以 %c 开始的行将被删除。\n"
726
ddc12c42 727#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
ec3d4607 728#: add-patch.c:1100 git-add--interactive.perl:1129
ddc12c42
JX
729msgid ""
730"If it does not apply cleanly, you will be given an opportunity to\n"
731"edit again. If all lines of the hunk are removed, then the edit is\n"
732"aborted and the hunk is left unchanged.\n"
733msgstr ""
734"如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
735"此次编辑被终止,该块不会被修改。\n"
736
ec3d4607 737#: add-patch.c:1133
ddc12c42
JX
738msgid "could not parse hunk header"
739msgstr "无法解析数据块头信息"
740
ec3d4607 741#: add-patch.c:1178
ddc12c42
JX
742msgid "'git apply --cached' failed"
743msgstr "'git apply --cached' 失败"
744
745#. TRANSLATORS: do not translate [y/n]
746#. The program will only accept that input at this point.
747#. Consider translating (saying "no" discards!) as
748#. (saying "n" for "no" discards!) if the translation
749#. of the word "no" does not start with n.
750#.
751#. TRANSLATORS: do not translate [y/n]
752#. The program will only accept that input
753#. at this point.
754#. Consider translating (saying "no" discards!) as
755#. (saying "n" for "no" discards!) if the translation
756#. of the word "no" does not start with n.
65387fd5 757#: add-patch.c:1247 git-add--interactive.perl:1244
ddc12c42
JX
758msgid ""
759"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
760msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
761
ec3d4607 762#: add-patch.c:1290
2b472aae
JX
763msgid "The selected hunks do not apply to the index!"
764msgstr "选中的块不能应用到索引!"
765
65387fd5 766#: add-patch.c:1291 git-add--interactive.perl:1348
2b472aae
JX
767msgid "Apply them to the worktree anyway? "
768msgstr "无论如何都要应用到工作区么?"
769
65387fd5 770#: add-patch.c:1298 git-add--interactive.perl:1351
2b472aae
JX
771msgid "Nothing was applied.\n"
772msgstr "未应用。\n"
ddc12c42 773
ec3d4607 774#: add-patch.c:1355
ddc12c42
JX
775msgid ""
776"j - leave this hunk undecided, see next undecided hunk\n"
777"J - leave this hunk undecided, see next hunk\n"
778"k - leave this hunk undecided, see previous undecided hunk\n"
779"K - leave this hunk undecided, see previous hunk\n"
780"g - select a hunk to go to\n"
781"/ - search for a hunk matching the given regex\n"
782"s - split the current hunk into smaller hunks\n"
783"e - manually edit the current hunk\n"
784"? - print help\n"
785msgstr ""
786"j - 维持该块未决状态,查看下一个未决块\n"
787"J - 维持该块未决状态,查看下一个块\n"
788"k - 维持该块未决状态,查看上一个未决块\n"
789"K - 维持该块未决状态,查看上一个块\n"
790"g - 选择跳转到一个块\n"
791"/ - 查找和给定正则表达式匹配的块\n"
792"s - 拆分当前块为更小的块\n"
793"e - 手动编辑当前块\n"
794"? - 显示帮助\n"
795
ec3d4607 796#: add-patch.c:1517 add-patch.c:1527
ddc12c42
JX
797msgid "No previous hunk"
798msgstr "没有前一个块"
799
ec3d4607 800#: add-patch.c:1522 add-patch.c:1532
ddc12c42
JX
801msgid "No next hunk"
802msgstr "没有下一个块"
803
ec3d4607 804#: add-patch.c:1538
ddc12c42
JX
805msgid "No other hunks to goto"
806msgstr "没有其它可供跳转的块"
807
65387fd5 808#: add-patch.c:1549 git-add--interactive.perl:1608
ddc12c42
JX
809msgid "go to which hunk (<ret> to see more)? "
810msgstr "跳转到哪个块(<回车> 查看更多)? "
811
65387fd5 812#: add-patch.c:1550 git-add--interactive.perl:1610
ddc12c42
JX
813msgid "go to which hunk? "
814msgstr "跳转到哪个块?"
815
ec3d4607 816#: add-patch.c:1561
ddc12c42
JX
817#, c-format
818msgid "Invalid number: '%s'"
819msgstr "无效数字:'%s'"
820
ec3d4607 821#: add-patch.c:1566
ddc12c42
JX
822#, c-format
823msgid "Sorry, only %d hunk available."
824msgid_plural "Sorry, only %d hunks available."
825msgstr[0] "对不起,只有 %d 个可用块。"
826msgstr[1] "对不起,只有 %d 个可用块。"
827
ec3d4607 828#: add-patch.c:1575
ddc12c42
JX
829msgid "No other hunks to search"
830msgstr "没有其它可供查找的块"
831
65387fd5 832#: add-patch.c:1581 git-add--interactive.perl:1663
ddc12c42
JX
833msgid "search for regex? "
834msgstr "使用正则表达式搜索?"
835
ec3d4607 836#: add-patch.c:1596
ddc12c42
JX
837#, c-format
838msgid "Malformed search regexp %s: %s"
839msgstr "错误的正则表达式 %s:%s"
840
ec3d4607 841#: add-patch.c:1613
ddc12c42
JX
842msgid "No hunk matches the given pattern"
843msgstr "没有和给定模式相匹配的块"
844
ec3d4607 845#: add-patch.c:1620
ddc12c42
JX
846msgid "Sorry, cannot split this hunk"
847msgstr "对不起,不能拆分这个块"
848
ec3d4607 849#: add-patch.c:1624
ddc12c42
JX
850#, c-format
851msgid "Split into %d hunks."
852msgstr "拆分为 %d 块。"
853
ec3d4607 854#: add-patch.c:1628
ddc12c42
JX
855msgid "Sorry, cannot edit this hunk"
856msgstr "对不起,不能编辑这个块"
857
ec3d4607 858#: add-patch.c:1680
2b472aae
JX
859msgid "'git apply' failed"
860msgstr "'git apply' 失败"
861
7e6630a7 862#: advice.c:78
349ede6a
JX
863#, c-format
864msgid ""
865"\n"
866"Disable this message with \"git config advice.%s false\""
867msgstr ""
868"\n"
869"使用 \"git config advice.%s false\" 来关闭此消息"
870
7e6630a7 871#: advice.c:94
c04f5ac3 872#, c-format
fd8cb379
JX
873msgid "%shint: %.*s%s\n"
874msgstr "%s提示:%.*s%s\n"
c04f5ac3 875
7e6630a7 876#: advice.c:178
5c57d762
JX
877msgid "Cherry-picking is not possible because you have unmerged files."
878msgstr "无法拣选,因为您有未合并的文件。"
879
7e6630a7 880#: advice.c:180
5c57d762
JX
881msgid "Committing is not possible because you have unmerged files."
882msgstr "无法提交,因为您有未合并的文件。"
883
7e6630a7 884#: advice.c:182
5c57d762
JX
885msgid "Merging is not possible because you have unmerged files."
886msgstr "无法合并,因为您有未合并的文件。"
887
7e6630a7 888#: advice.c:184
5c57d762
JX
889msgid "Pulling is not possible because you have unmerged files."
890msgstr "无法拉取,因为您有未合并的文件。"
891
7e6630a7 892#: advice.c:186
5c57d762
JX
893msgid "Reverting is not possible because you have unmerged files."
894msgstr "无法回退,因为您有未合并的文件。"
895
7e6630a7 896#: advice.c:188
5c57d762
JX
897#, c-format
898msgid "It is not possible to %s because you have unmerged files."
899msgstr "无法 %s,因为您有未合并的文件。"
900
7e6630a7 901#: advice.c:196
c04f5ac3 902msgid ""
6acbf033 903"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 904"as appropriate to mark resolution and make a commit."
c04f5ac3 905msgstr ""
d9d56b23 906"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
220c313c 907"解决方案并提交。"
c04f5ac3 908
7e6630a7 909#: advice.c:204
5c57d762
JX
910msgid "Exiting because of an unresolved conflict."
911msgstr "因为存在未解决的冲突而退出。"
912
65387fd5 913#: advice.c:209 builtin/merge.c:1382
1b7f4a34
JX
914msgid "You have not concluded your merge (MERGE_HEAD exists)."
915msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
916
7e6630a7 917#: advice.c:211
94550ed3 918msgid "Please, commit your changes before merging."
1b7f4a34
JX
919msgstr "请在合并前先提交您的修改。"
920
7e6630a7 921#: advice.c:212
1b7f4a34
JX
922msgid "Exiting because of unfinished merge."
923msgstr "因为存在未完成的合并而退出。"
924
7e6630a7
FZ
925#: advice.c:217
926msgid "Not possible to fast-forward, aborting."
927msgstr "无法快进,终止。"
928
929#: advice.c:227
33b62fba
JX
930#, c-format
931msgid ""
7e6630a7
FZ
932"The following paths and/or pathspecs matched paths that exist\n"
933"outside of your sparse-checkout definition, so will not be\n"
934"updated in the index:\n"
ec3d4607 935msgstr ""
7e6630a7
FZ
936"下面的路径和/或者路径规格匹配了您定义的稀疏检出以外的路径,\n"
937"所以不会在索引中更新:\n"
33b62fba 938
7e6630a7 939#: advice.c:234
33b62fba 940msgid ""
7e6630a7
FZ
941"If you intend to update such entries, try one of the following:\n"
942"* Use the --sparse option.\n"
943"* Disable or modify the sparsity rules."
944msgstr ""
945"如果您意图更新这些条目,请尝试下列其中之一:\n"
946"* 使用 --sparse 选项。\n"
947"* 禁用或者修改稀疏规则。"
33b62fba 948
7e6630a7 949#: advice.c:242
5c57d762
JX
950#, c-format
951msgid ""
a6cd2cc4 952"Note: switching to '%s'.\n"
5c57d762
JX
953"\n"
954"You are in 'detached HEAD' state. You can look around, make experimental\n"
955"changes and commit them, and you can discard any commits you make in this\n"
a6cd2cc4 956"state without impacting any branches by switching back to a branch.\n"
5c57d762
JX
957"\n"
958"If you want to create a new branch to retain commits you create, you may\n"
a6cd2cc4 959"do so (now or later) by using -c with the switch command. Example:\n"
5c57d762 960"\n"
a6cd2cc4
JX
961" git switch -c <new-branch-name>\n"
962"\n"
963"Or undo this operation with:\n"
964"\n"
965" git switch -\n"
966"\n"
967"Turn off this advice by setting config variable advice.detachedHead to "
968"false\n"
5c57d762
JX
969"\n"
970msgstr ""
a6cd2cc4
JX
971"注意:正在切换到 '%s'。\n"
972"\n"
973"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以在切换\n"
974"回一个分支时,丢弃在此状态下所做的提交而不对分支造成影响。\n"
5c57d762 975"\n"
a6cd2cc4
JX
976"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在 switch 命令\n"
977"中添加参数 -c 来实现(现在或稍后)。例如:\n"
5c57d762 978"\n"
a6cd2cc4 979" git switch -c <新分支名>\n"
5c57d762 980"\n"
a6cd2cc4
JX
981"或者撤销此操作:\n"
982"\n"
983" git switch -\n"
984"\n"
985"通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n"
5c57d762
JX
986"\n"
987
06991777
JX
988#: alias.c:50
989msgid "cmdline ends with \\"
990msgstr "命令行以 \\ 结尾"
991
992#: alias.c:51
993msgid "unclosed quote"
994msgstr "未关闭的引号"
995
33b62fba 996#: apply.c:70
a0b6b246
JX
997#, c-format
998msgid "unrecognized whitespace option '%s'"
999msgstr "未能识别的空白字符选项 '%s'"
ef317cd5 1000
33b62fba 1001#: apply.c:86
90314792 1002#, c-format
a0b6b246
JX
1003msgid "unrecognized whitespace ignore option '%s'"
1004msgstr "未能识别的空白字符忽略选项 '%s'"
90314792 1005
65387fd5
FZ
1006#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
1007#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
1008#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
1009#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
1010#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
1011#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
1012#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
1013#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
ee27abd3
JX
1014#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
1015#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
65387fd5
FZ
1016#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
1017#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
1018#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
1019#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
1020#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
1021#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
1022#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
1023#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
1024#: builtin/worktree.c:702
1025#, c-format
1026msgid "options '%s' and '%s' cannot be used together"
1027msgstr "选项 '%s' 和 '%s' 不能同时使用"
1028
1029#: apply.c:139 apply.c:150 apply.c:153
1030#, c-format
1031msgid "'%s' outside a repository"
1032msgstr "'%s' 在仓库之外"
ef317cd5 1033
33b62fba 1034#: apply.c:800
a0b6b246
JX
1035#, c-format
1036msgid "Cannot prepare timestamp regexp %s"
1037msgstr "无法准备时间戳正则表达式 %s"
ef317cd5 1038
33b62fba 1039#: apply.c:809
a0b6b246
JX
1040#, c-format
1041msgid "regexec returned %d for input: %s"
1042msgstr "regexec 返回 %d,输入为:%s"
ef317cd5 1043
33b62fba 1044#: apply.c:883
a0b6b246
JX
1045#, c-format
1046msgid "unable to find filename in patch at line %d"
1047msgstr "不能在补丁的第 %d 行找到文件名"
ef317cd5 1048
33b62fba 1049#: apply.c:921
a0b6b246
JX
1050#, c-format
1051msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1052msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
ef317cd5 1053
33b62fba 1054#: apply.c:927
a0b6b246
JX
1055#, c-format
1056msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1057msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
ef317cd5 1058
33b62fba 1059#: apply.c:928
a0b6b246
JX
1060#, c-format
1061msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1062msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
ef317cd5 1063
33b62fba 1064#: apply.c:933
a0b6b246
JX
1065#, c-format
1066msgid "git apply: bad git-diff - expected /dev/null on line %d"
1067msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
ef317cd5 1068
33b62fba 1069#: apply.c:962
a4f16749
JX
1070#, c-format
1071msgid "invalid mode on line %d: %s"
1072msgstr "第 %d 行包含无效文件模式:%s"
1073
33b62fba 1074#: apply.c:1281
a4f16749
JX
1075#, c-format
1076msgid "inconsistent header lines %d and %d"
1077msgstr "不一致的文件头,%d 行和 %d 行"
1078
33b62fba 1079#: apply.c:1371
a0b6b246
JX
1080#, c-format
1081msgid ""
1082"git diff header lacks filename information when removing %d leading pathname "
1083"component (line %d)"
1084msgid_plural ""
1085"git diff header lacks filename information when removing %d leading pathname "
1086"components (line %d)"
1087msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
1088msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
ef317cd5 1089
33b62fba 1090#: apply.c:1384
a0b6b246
JX
1091#, c-format
1092msgid "git diff header lacks filename information (line %d)"
1093msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
07432cef 1094
33b62fba 1095#: apply.c:1480
a5cd71ca
JX
1096#, c-format
1097msgid "recount: unexpected line: %.*s"
1098msgstr "recount:意外的行:%.*s"
1099
33b62fba 1100#: apply.c:1549
a5cd71ca
JX
1101#, c-format
1102msgid "patch fragment without header at line %d: %.*s"
1103msgstr "第 %d 行的补丁片段没有头信息:%.*s"
1104
33b62fba 1105#: apply.c:1752
a0b6b246
JX
1106msgid "new file depends on old contents"
1107msgstr "新文件依赖旧内容"
5c57d762 1108
33b62fba 1109#: apply.c:1754
a0b6b246
JX
1110msgid "deleted file still has contents"
1111msgstr "删除的文件仍有内容"
5c57d762 1112
33b62fba 1113#: apply.c:1788
a0b6b246
JX
1114#, c-format
1115msgid "corrupt patch at line %d"
1116msgstr "补丁在第 %d 行损坏"
5c57d762 1117
33b62fba 1118#: apply.c:1825
5c57d762 1119#, c-format
a0b6b246
JX
1120msgid "new file %s depends on old contents"
1121msgstr "新文件 %s 依赖旧内容"
5c57d762 1122
33b62fba 1123#: apply.c:1827
5c57d762 1124#, c-format
a0b6b246
JX
1125msgid "deleted file %s still has contents"
1126msgstr "删除的文件 %s 仍有内容"
5c57d762 1127
33b62fba 1128#: apply.c:1830
a0b6b246
JX
1129#, c-format
1130msgid "** warning: file %s becomes empty but is not deleted"
1131msgstr "** 警告:文件 %s 成为空文件但并未删除"
ef317cd5 1132
7e6630a7 1133#: apply.c:1978
5c57d762 1134#, c-format
a0b6b246
JX
1135msgid "corrupt binary patch at line %d: %.*s"
1136msgstr "二进制补丁在第 %d 行损坏:%.*s"
5c57d762 1137
7e6630a7 1138#: apply.c:2015
5c57d762 1139#, c-format
a0b6b246
JX
1140msgid "unrecognized binary patch at line %d"
1141msgstr "未能识别的二进制补丁位于第 %d 行"
5c57d762 1142
7e6630a7 1143#: apply.c:2177
5c57d762 1144#, c-format
a0b6b246
JX
1145msgid "patch with only garbage at line %d"
1146msgstr "补丁文件的第 %d 行只有垃圾数据"
5c57d762 1147
7e6630a7 1148#: apply.c:2263
5c57d762 1149#, c-format
a0b6b246
JX
1150msgid "unable to read symlink %s"
1151msgstr "无法读取符号链接 %s"
5c57d762 1152
7e6630a7 1153#: apply.c:2267
5c57d762 1154#, c-format
a0b6b246
JX
1155msgid "unable to open or read %s"
1156msgstr "不能打开或读取 %s"
5c57d762 1157
7e6630a7 1158#: apply.c:2936
5c57d762 1159#, c-format
a0b6b246
JX
1160msgid "invalid start of line: '%c'"
1161msgstr "无效的行首字符:'%c'"
5c57d762 1162
7e6630a7 1163#: apply.c:3057
5c57d762 1164#, c-format
a0b6b246
JX
1165msgid "Hunk #%d succeeded at %d (offset %d line)."
1166msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1167msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
1168msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
5c57d762 1169
7e6630a7 1170#: apply.c:3069
5c57d762 1171#, c-format
a0b6b246
JX
1172msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1173msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
5c57d762 1174
7e6630a7 1175#: apply.c:3075
5c57d762
JX
1176#, c-format
1177msgid ""
a0b6b246
JX
1178"while searching for:\n"
1179"%.*s"
5c57d762 1180msgstr ""
a0b6b246
JX
1181"当查询:\n"
1182"%.*s"
5c57d762 1183
7e6630a7 1184#: apply.c:3097
5c57d762 1185#, c-format
a0b6b246
JX
1186msgid "missing binary patch data for '%s'"
1187msgstr "缺失 '%s' 的二进制补丁数据"
5c57d762 1188
7e6630a7 1189#: apply.c:3105
5c57d762 1190#, c-format
a0b6b246 1191msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
29004bbb 1192msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
5c57d762 1193
7e6630a7 1194#: apply.c:3152
5c57d762 1195#, c-format
a0b6b246
JX
1196msgid "cannot apply binary patch to '%s' without full index line"
1197msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
5c57d762 1198
7e6630a7 1199#: apply.c:3163
5c57d762 1200#, c-format
a0b6b246
JX
1201msgid ""
1202"the patch applies to '%s' (%s), which does not match the current contents."
29004bbb 1203msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。"
5c57d762 1204
7e6630a7 1205#: apply.c:3171
a0b6b246
JX
1206#, c-format
1207msgid "the patch applies to an empty '%s' but it is not empty"
29004bbb 1208msgstr "补丁应用到空文件 '%s',但其并非空文件"
5c57d762 1209
7e6630a7 1210#: apply.c:3189
5c57d762 1211#, c-format
a0b6b246 1212msgid "the necessary postimage %s for '%s' cannot be read"
e640d114 1213msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
5c57d762 1214
7e6630a7 1215#: apply.c:3202
5c57d762 1216#, c-format
a0b6b246
JX
1217msgid "binary patch does not apply to '%s'"
1218msgstr "二进制补丁未应用到 '%s'"
5c57d762 1219
7e6630a7 1220#: apply.c:3209
5c57d762 1221#, c-format
a0b6b246
JX
1222msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1223msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
5c57d762 1224
7e6630a7 1225#: apply.c:3230
276ceeaa 1226#, c-format
a0b6b246
JX
1227msgid "patch failed: %s:%ld"
1228msgstr "打补丁失败:%s:%ld"
276ceeaa 1229
7e6630a7 1230#: apply.c:3353
4dcdc3d8 1231#, c-format
a0b6b246
JX
1232msgid "cannot checkout %s"
1233msgstr "不能检出 %s"
4dcdc3d8 1234
65387fd5
FZ
1235#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
1236#: setup.c:309
4dcdc3d8 1237#, c-format
a0b6b246
JX
1238msgid "failed to read %s"
1239msgstr "无法读取 %s"
4dcdc3d8 1240
7e6630a7 1241#: apply.c:3413
4dcdc3d8 1242#, c-format
a0b6b246
JX
1243msgid "reading from '%s' beyond a symbolic link"
1244msgstr "读取位于符号链接中的 '%s'"
4dcdc3d8 1245
65387fd5 1246#: apply.c:3442 apply.c:3711
4dcdc3d8 1247#, c-format
a0b6b246
JX
1248msgid "path %s has been renamed/deleted"
1249msgstr "路径 %s 已经被重命名/删除"
4dcdc3d8 1250
65387fd5 1251#: apply.c:3549 apply.c:3726
4dcdc3d8 1252#, c-format
a0b6b246
JX
1253msgid "%s: does not exist in index"
1254msgstr "%s:不存在于索引中"
4dcdc3d8 1255
65387fd5 1256#: apply.c:3558 apply.c:3734 apply.c:3978
4dcdc3d8 1257#, c-format
a0b6b246
JX
1258msgid "%s: does not match index"
1259msgstr "%s:和索引不匹配"
4dcdc3d8 1260
65387fd5 1261#: apply.c:3595
33b62fba
JX
1262msgid "repository lacks the necessary blob to perform 3-way merge."
1263msgstr "仓库缺乏执行三方合并所必需的数据对象。"
4dcdc3d8 1264
65387fd5 1265#: apply.c:3598
4dcdc3d8 1266#, c-format
33b62fba
JX
1267msgid "Performing three-way merge...\n"
1268msgstr "执行三方合并...\n"
4dcdc3d8 1269
65387fd5 1270#: apply.c:3614 apply.c:3618
4dcdc3d8 1271#, c-format
a0b6b246
JX
1272msgid "cannot read the current contents of '%s'"
1273msgstr "无法读取 '%s' 的当前内容"
276ceeaa 1274
65387fd5 1275#: apply.c:3630
4dcdc3d8 1276#, c-format
33b62fba
JX
1277msgid "Failed to perform three-way merge...\n"
1278msgstr "无法执行三方合并...\n"
4dcdc3d8 1279
65387fd5 1280#: apply.c:3644
4dcdc3d8 1281#, c-format
a0b6b246
JX
1282msgid "Applied patch to '%s' with conflicts.\n"
1283msgstr "应用补丁到 '%s' 存在冲突。\n"
4dcdc3d8 1284
65387fd5 1285#: apply.c:3649
4dcdc3d8 1286#, c-format
a0b6b246
JX
1287msgid "Applied patch to '%s' cleanly.\n"
1288msgstr "成功应用补丁到 '%s'。\n"
4dcdc3d8 1289
65387fd5 1290#: apply.c:3666
33b62fba
JX
1291#, c-format
1292msgid "Falling back to direct application...\n"
1293msgstr "回落到直接应用...\n"
1294
65387fd5 1295#: apply.c:3678
a0b6b246
JX
1296msgid "removal patch leaves file contents"
1297msgstr "移除补丁仍留下了文件内容"
4dcdc3d8 1298
65387fd5 1299#: apply.c:3751
1003b3a5 1300#, c-format
a0b6b246
JX
1301msgid "%s: wrong type"
1302msgstr "%s:错误类型"
1003b3a5 1303
65387fd5 1304#: apply.c:3753
1003b3a5 1305#, c-format
a0b6b246
JX
1306msgid "%s has type %o, expected %o"
1307msgstr "%s 的类型是 %o,应为 %o"
1003b3a5 1308
65387fd5
FZ
1309#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
1310#: read-cache.c:1381
4dcdc3d8 1311#, c-format
a0b6b246
JX
1312msgid "invalid path '%s'"
1313msgstr "无效路径 '%s'"
4dcdc3d8 1314
65387fd5 1315#: apply.c:3976
4dcdc3d8 1316#, c-format
a0b6b246
JX
1317msgid "%s: already exists in index"
1318msgstr "%s:已经存在于索引中"
4dcdc3d8 1319
65387fd5 1320#: apply.c:3980
4dcdc3d8 1321#, c-format
a0b6b246
JX
1322msgid "%s: already exists in working directory"
1323msgstr "%s:已经存在于工作区中"
4dcdc3d8 1324
65387fd5 1325#: apply.c:4000
1b7f4a34 1326#, c-format
a0b6b246
JX
1327msgid "new mode (%o) of %s does not match old mode (%o)"
1328msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
1b7f4a34 1329
65387fd5 1330#: apply.c:4005
5b04ee3b 1331#, c-format
a0b6b246
JX
1332msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1333msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
5b04ee3b 1334
65387fd5 1335#: apply.c:4025
8ada9598 1336#, c-format
a0b6b246
JX
1337msgid "affected file '%s' is beyond a symbolic link"
1338msgstr "受影响的文件 '%s' 位于符号链接中"
8ada9598 1339
65387fd5 1340#: apply.c:4029
81809b99 1341#, c-format
a0b6b246
JX
1342msgid "%s: patch does not apply"
1343msgstr "%s:补丁未应用"
8ada9598 1344
65387fd5 1345#: apply.c:4044
8ada9598 1346#, c-format
a0b6b246 1347msgid "Checking patch %s..."
06991777 1348msgstr "正在检查补丁 %s..."
8ada9598 1349
65387fd5 1350#: apply.c:4136
a0b6b246
JX
1351#, c-format
1352msgid "sha1 information is lacking or useless for submodule %s"
1353msgstr "子模组 %s 的 sha1 信息缺失或无效"
8ada9598 1354
65387fd5 1355#: apply.c:4143
8ada9598 1356#, c-format
a0b6b246 1357msgid "mode change for %s, which is not in current HEAD"
31e5e17b 1358msgstr "%s 的模式变更,但它不在当前 HEAD 中"
8ada9598 1359
65387fd5 1360#: apply.c:4146
a0b6b246
JX
1361#, c-format
1362msgid "sha1 information is lacking or useless (%s)."
1363msgstr "sha1 信息缺失或无效(%s)。"
6792b93b 1364
65387fd5 1365#: apply.c:4155
a0b6b246
JX
1366#, c-format
1367msgid "could not add %s to temporary index"
1368msgstr "不能在临时索引中添加 %s"
9aeb4c2b 1369
65387fd5 1370#: apply.c:4165
a0b6b246
JX
1371#, c-format
1372msgid "could not write temporary index to %s"
1373msgstr "不能把临时索引写入到 %s"
9aeb4c2b 1374
65387fd5 1375#: apply.c:4303
a0b6b246
JX
1376#, c-format
1377msgid "unable to remove %s from index"
1378msgstr "不能从索引中移除 %s"
8ada9598 1379
65387fd5 1380#: apply.c:4337
8ada9598 1381#, c-format
a0b6b246
JX
1382msgid "corrupt patch for submodule %s"
1383msgstr "子模组 %s 损坏的补丁"
8ada9598 1384
65387fd5 1385#: apply.c:4343
9aeb4c2b 1386#, c-format
a0b6b246 1387msgid "unable to stat newly created file '%s'"
65e2041e 1388msgstr "不能对新建文件 '%s' 调用 stat"
9aeb4c2b 1389
65387fd5 1390#: apply.c:4351
a0b6b246
JX
1391#, c-format
1392msgid "unable to create backing store for newly created file %s"
1393msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 1394
65387fd5 1395#: apply.c:4357 apply.c:4502
81809b99 1396#, c-format
a0b6b246
JX
1397msgid "unable to add cache entry for %s"
1398msgstr "无法为 %s 添加缓存条目"
8ada9598 1399
65387fd5
FZ
1400#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
1401#: builtin/gc.c:2293
a0b6b246
JX
1402#, c-format
1403msgid "failed to write to '%s'"
65387fd5 1404msgstr "无法写入 '%s'"
8ada9598 1405
65387fd5 1406#: apply.c:4404
220c313c 1407#, c-format
a0b6b246
JX
1408msgid "closing file '%s'"
1409msgstr "关闭文件 '%s'"
220c313c 1410
65387fd5 1411#: apply.c:4474
c04f5ac3 1412#, c-format
a0b6b246
JX
1413msgid "unable to write file '%s' mode %o"
1414msgstr "不能写文件 '%s' 权限 %o"
c04f5ac3 1415
65387fd5 1416#: apply.c:4572
c04f5ac3 1417#, c-format
a0b6b246
JX
1418msgid "Applied patch %s cleanly."
1419msgstr "成功应用补丁 %s。"
c04f5ac3 1420
65387fd5 1421#: apply.c:4580
a0b6b246
JX
1422msgid "internal error"
1423msgstr "内部错误"
c04f5ac3 1424
65387fd5 1425#: apply.c:4583
5c57d762 1426#, c-format
a0b6b246
JX
1427msgid "Applying patch %%s with %d reject..."
1428msgid_plural "Applying patch %%s with %d rejects..."
1429msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
1430msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
5c57d762 1431
65387fd5 1432#: apply.c:4594
5c57d762 1433#, c-format
a0b6b246
JX
1434msgid "truncating .rej filename to %.*s.rej"
1435msgstr "截短 .rej 文件名为 %.*s.rej"
5c57d762 1436
65387fd5 1437#: apply.c:4602
220c313c 1438#, c-format
a0b6b246
JX
1439msgid "cannot open %s"
1440msgstr "不能打开 %s"
220c313c 1441
65387fd5 1442#: apply.c:4616
220c313c 1443#, c-format
a0b6b246
JX
1444msgid "Hunk #%d applied cleanly."
1445msgstr "第 #%d 个片段成功应用。"
220c313c 1446
65387fd5 1447#: apply.c:4620
5c57d762 1448#, c-format
a0b6b246
JX
1449msgid "Rejected hunk #%d."
1450msgstr "拒绝第 #%d 个片段。"
5c57d762 1451
65387fd5 1452#: apply.c:4749
5c57d762 1453#, c-format
a0b6b246
JX
1454msgid "Skipped patch '%s'."
1455msgstr "略过补丁 '%s'。"
5c57d762 1456
65387fd5
FZ
1457#: apply.c:4758
1458msgid "No valid patches in input (allow with \"--allow-empty\")"
1459msgstr "输入中没有合法的补丁 (使用 \"--allow-empty\" 来允许)"
5c57d762 1460
65387fd5 1461#: apply.c:4779
a0b6b246
JX
1462msgid "unable to read index file"
1463msgstr "无法读取索引文件"
5c57d762 1464
65387fd5 1465#: apply.c:4936
220c313c 1466#, c-format
a0b6b246
JX
1467msgid "can't open patch '%s': %s"
1468msgstr "不能打开补丁 '%s':%s"
220c313c 1469
65387fd5 1470#: apply.c:4963
5c57d762 1471#, c-format
a0b6b246
JX
1472msgid "squelched %d whitespace error"
1473msgid_plural "squelched %d whitespace errors"
1474msgstr[0] "抑制下仍有 %d 个空白字符误用"
1475msgstr[1] "抑制下仍有 %d 个空白字符误用"
5c57d762 1476
65387fd5 1477#: apply.c:4969 apply.c:4984
5c57d762 1478#, c-format
a0b6b246
JX
1479msgid "%d line adds whitespace errors."
1480msgid_plural "%d lines add whitespace errors."
a4f16749
JX
1481msgstr[0] "%d 行新增了空白字符误用。"
1482msgstr[1] "%d 行新增了空白字符误用。"
5c57d762 1483
65387fd5 1484#: apply.c:4977
5c57d762 1485#, c-format
a0b6b246
JX
1486msgid "%d line applied after fixing whitespace errors."
1487msgid_plural "%d lines applied after fixing whitespace errors."
1488msgstr[0] "修复空白错误后,应用了 %d 行。"
1489msgstr[1] "修复空白错误后,应用了 %d 行。"
5c57d762 1490
65387fd5 1491#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
a0b6b246
JX
1492msgid "Unable to write new index file"
1493msgstr "无法写入新索引文件"
5c57d762 1494
65387fd5 1495#: apply.c:5021
a0b6b246
JX
1496msgid "don't apply changes matching the given path"
1497msgstr "不要应用与给出路径向匹配的变更"
5c57d762 1498
65387fd5 1499#: apply.c:5024
a0b6b246
JX
1500msgid "apply changes matching the given path"
1501msgstr "应用与给出路径向匹配的变更"
220c313c 1502
65387fd5 1503#: apply.c:5026 builtin/am.c:2376
a0b6b246
JX
1504msgid "num"
1505msgstr "数字"
220c313c 1506
65387fd5 1507#: apply.c:5027
a0b6b246
JX
1508msgid "remove <num> leading slashes from traditional diff paths"
1509msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
220c313c 1510
65387fd5 1511#: apply.c:5030
a0b6b246
JX
1512msgid "ignore additions made by the patch"
1513msgstr "忽略补丁中的添加的文件"
220c313c 1514
65387fd5 1515#: apply.c:5032
a0b6b246
JX
1516msgid "instead of applying the patch, output diffstat for the input"
1517msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
220c313c 1518
65387fd5 1519#: apply.c:5036
a0b6b246
JX
1520msgid "show number of added and deleted lines in decimal notation"
1521msgstr "以十进制数显示添加和删除的行数"
220c313c 1522
65387fd5 1523#: apply.c:5038
a0b6b246
JX
1524msgid "instead of applying the patch, output a summary for the input"
1525msgstr "不应用补丁,而是显示输入的概要"
220c313c 1526
65387fd5 1527#: apply.c:5040
a0b6b246
JX
1528msgid "instead of applying the patch, see if the patch is applicable"
1529msgstr "不应用补丁,而是查看补丁是否可应用"
220c313c 1530
65387fd5 1531#: apply.c:5042
a0b6b246
JX
1532msgid "make sure the patch is applicable to the current index"
1533msgstr "确认补丁可以应用到当前索引"
276ceeaa 1534
65387fd5 1535#: apply.c:5044
c1ac5258
JX
1536msgid "mark new files with `git add --intent-to-add`"
1537msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
1538
65387fd5 1539#: apply.c:5046
a0b6b246
JX
1540msgid "apply a patch without touching the working tree"
1541msgstr "应用补丁而不修改工作区"
5b04ee3b 1542
65387fd5 1543#: apply.c:5048
a0b6b246
JX
1544msgid "accept a patch that touches outside the working area"
1545msgstr "接受修改工作区之外文件的补丁"
5c57d762 1546
65387fd5 1547#: apply.c:5051
a0b6b246
JX
1548msgid "also apply the patch (use with --stat/--summary/--check)"
1549msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
c04f5ac3 1550
65387fd5 1551#: apply.c:5053
33b62fba 1552msgid "attempt three-way merge, fall back on normal patch if that fails"
523ccf5d 1553msgstr "尝试三路合并,如果失败则回落至正常补丁模式"
c04f5ac3 1554
65387fd5 1555#: apply.c:5055
a0b6b246
JX
1556msgid "build a temporary index based on embedded index information"
1557msgstr "创建一个临时索引基于嵌入的索引信息"
c04f5ac3 1558
65387fd5 1559#: apply.c:5058 builtin/checkout-index.c:196
a0b6b246
JX
1560msgid "paths are separated with NUL character"
1561msgstr "路径以 NUL 字符分隔"
8ada9598 1562
65387fd5 1563#: apply.c:5060
a0b6b246
JX
1564msgid "ensure at least <n> lines of context match"
1565msgstr "确保至少匹配 <n> 行上下文"
8ada9598 1566
65387fd5 1567#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
33b62fba 1568#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
7e6630a7
FZ
1569#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
1570#: builtin/rebase.c:1051
a0b6b246
JX
1571msgid "action"
1572msgstr "动作"
8ada9598 1573
65387fd5 1574#: apply.c:5062
a0b6b246
JX
1575msgid "detect new or modified lines that have whitespace errors"
1576msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 1577
65387fd5 1578#: apply.c:5065 apply.c:5068
a0b6b246
JX
1579msgid "ignore changes in whitespace when finding context"
1580msgstr "查找上下文时忽略空白字符的变更"
8ada9598 1581
65387fd5 1582#: apply.c:5071
a0b6b246
JX
1583msgid "apply the patch in reverse"
1584msgstr "反向应用补丁"
8ada9598 1585
65387fd5 1586#: apply.c:5073
a0b6b246
JX
1587msgid "don't expect at least one line of context"
1588msgstr "无需至少一行上下文"
8ada9598 1589
65387fd5 1590#: apply.c:5075
a0b6b246
JX
1591msgid "leave the rejected hunks in corresponding *.rej files"
1592msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 1593
65387fd5 1594#: apply.c:5077
a0b6b246
JX
1595msgid "allow overlapping hunks"
1596msgstr "允许重叠的补丁片段"
8ada9598 1597
65387fd5 1598#: apply.c:5080
a0b6b246
JX
1599msgid "tolerate incorrectly detected missing new-line at the end of file"
1600msgstr "允许不正确的文件末尾换行符"
cfff71a9 1601
65387fd5 1602#: apply.c:5083
a0b6b246
JX
1603msgid "do not trust the line counts in the hunk headers"
1604msgstr "不信任补丁片段的头信息中的行号"
6c94aba5 1605
65387fd5 1606#: apply.c:5085 builtin/am.c:2364
a0b6b246
JX
1607msgid "root"
1608msgstr "根目录"
c04f5ac3 1609
65387fd5 1610#: apply.c:5086
a0b6b246
JX
1611msgid "prepend <root> to all filenames"
1612msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 1613
65387fd5
FZ
1614#: apply.c:5089
1615msgid "don't return error for empty patches"
1616msgstr "对空的补丁不返回错误"
1617
d9488fea 1618#: archive-tar.c:125 archive-zip.c:345
349ede6a
JX
1619#, c-format
1620msgid "cannot stream blob %s"
1621msgstr "不能打开数据对象 %s"
1622
d9488fea 1623#: archive-tar.c:265 archive-zip.c:358
349ede6a
JX
1624#, c-format
1625msgid "unsupported file mode: 0%o (SHA1: %s)"
1626msgstr "不支持的文件模式:0%o (SHA1: %s)"
1627
65387fd5 1628#: archive-tar.c:447
349ede6a
JX
1629#, c-format
1630msgid "unable to start '%s' filter"
1631msgstr "无法启动 '%s' 过滤器"
1632
65387fd5 1633#: archive-tar.c:450
349ede6a
JX
1634msgid "unable to redirect descriptor"
1635msgstr "无法重定向描述符"
1636
65387fd5 1637#: archive-tar.c:457
349ede6a
JX
1638#, c-format
1639msgid "'%s' filter reported error"
1640msgstr "'%s' 过滤器报告了错误"
1641
d9488fea 1642#: archive-zip.c:318
349ede6a
JX
1643#, c-format
1644msgid "path is not valid UTF-8: %s"
1645msgstr "路径不是有效的 UTF-8:%s"
1646
d9488fea 1647#: archive-zip.c:322
349ede6a
JX
1648#, c-format
1649msgid "path too long (%d chars, SHA1: %s): %s"
1650msgstr "路径太长(%d 字符,SHA1:%s):%s"
1651
ec3d4607 1652#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
349ede6a
JX
1653#, c-format
1654msgid "deflate error (%d)"
1655msgstr "压缩错误 (%d)"
1656
d9488fea 1657#: archive-zip.c:603
349ede6a
JX
1658#, c-format
1659msgid "timestamp too large for this system: %<PRIuMAX>"
1660msgstr "对于本系统时间戳太大:%<PRIuMAX>"
1661
c1ac5258 1662#: archive.c:14
a0b6b246 1663msgid "git archive [<options>] <tree-ish> [<path>...]"
ddc12c42 1664msgstr "git archive [<选项>] <树对象> [<路径>...]"
07432cef 1665
c1ac5258 1666#: archive.c:15
a0b6b246
JX
1667msgid "git archive --list"
1668msgstr "git archive --list"
1669
c1ac5258 1670#: archive.c:16
c04f5ac3 1671msgid ""
a0b6b246 1672"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
c04f5ac3 1673msgstr ""
ddc12c42 1674"git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]"
6acbf033 1675
c1ac5258 1676#: archive.c:17
a0b6b246
JX
1677msgid "git archive --remote <repo> [--exec <cmd>] --list"
1678msgstr "git archive --remote <仓库> [--exec <命令>] --list"
6acbf033 1679
65387fd5
FZ
1680#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
1681#: builtin/tag.c:578
d9488fea 1682#, c-format
65387fd5 1683msgid "cannot read '%s'"
d9488fea
JX
1684msgstr "不能读取 '%s'"
1685
65387fd5 1686#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
c04f5ac3 1687#, c-format
a0b6b246
JX
1688msgid "pathspec '%s' did not match any files"
1689msgstr "路径规格 '%s' 未匹配任何文件"
c04f5ac3 1690
7e6630a7 1691#: archive.c:450
06991777
JX
1692#, c-format
1693msgid "no such ref: %.*s"
1694msgstr "无此引用:%.*s"
1695
7e6630a7 1696#: archive.c:456
06991777
JX
1697#, c-format
1698msgid "not a valid object name: %s"
1699msgstr "不是一个有效的对象名:%s"
1700
7e6630a7 1701#: archive.c:469
06991777
JX
1702#, c-format
1703msgid "not a tree object: %s"
1704msgstr "不是一个树对象:%s"
1705
7e6630a7 1706#: archive.c:481
06991777
JX
1707msgid "current working directory is untracked"
1708msgstr "当前工作目录未被跟踪"
1709
7e6630a7 1710#: archive.c:522
d9488fea
JX
1711#, c-format
1712msgid "File not found: %s"
1713msgstr "文件未找到:%s"
1714
7e6630a7 1715#: archive.c:524
d9488fea
JX
1716#, c-format
1717msgid "Not a regular file: %s"
1718msgstr "不是一个常规文件:%s"
1719
7e6630a7 1720#: archive.c:551
a0b6b246
JX
1721msgid "fmt"
1722msgstr "格式"
07432cef 1723
7e6630a7 1724#: archive.c:551
a0b6b246
JX
1725msgid "archive format"
1726msgstr "归档格式"
7aea43ff 1727
65387fd5 1728#: archive.c:552 builtin/log.c:1790
a0b6b246
JX
1729msgid "prefix"
1730msgstr "前缀"
7aea43ff 1731
7e6630a7 1732#: archive.c:553
a0b6b246
JX
1733msgid "prepend prefix to each pathname in the archive"
1734msgstr "为归档中每个路径名加上前缀"
c04f5ac3 1735
7e6630a7
FZ
1736#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
1737#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
65387fd5
FZ
1738#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
1739#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
1740#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
7e6630a7 1741#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
a0b6b246
JX
1742msgid "file"
1743msgstr "文件"
a77c07d9 1744
7e6630a7 1745#: archive.c:555
d9488fea
JX
1746msgid "add untracked file to archive"
1747msgstr "将未跟踪文件添加到归档"
1748
7e6630a7 1749#: archive.c:558 builtin/archive.c:88
a0b6b246
JX
1750msgid "write the archive to this file"
1751msgstr "归档写入此文件"
a77c07d9 1752
7e6630a7 1753#: archive.c:560
a0b6b246
JX
1754msgid "read .gitattributes in working directory"
1755msgstr "读取工作区中的 .gitattributes"
7ac1c0ad 1756
7e6630a7 1757#: archive.c:561
a0b6b246
JX
1758msgid "report archived files on stderr"
1759msgstr "在标准错误上报告归档文件"
7ac1c0ad 1760
7e6630a7 1761#: archive.c:563
d13389bf
JX
1762msgid "set compression level"
1763msgstr "设置压缩级别"
8ada9598 1764
7e6630a7 1765#: archive.c:566
a0b6b246
JX
1766msgid "list supported archive formats"
1767msgstr "列出支持的归档格式"
a77c07d9 1768
7e6630a7 1769#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
65387fd5 1770#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
a0b6b246
JX
1771msgid "repo"
1772msgstr "仓库"
c04f5ac3 1773
7e6630a7 1774#: archive.c:569 builtin/archive.c:90
a0b6b246
JX
1775msgid "retrieve the archive from remote repository <repo>"
1776msgstr "从远程仓库(<仓库>)提取归档文件"
8ada9598 1777
65387fd5 1778#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
7e6630a7 1779#: builtin/notes.c:496
a0b6b246
JX
1780msgid "command"
1781msgstr "命令"
1782
7e6630a7 1783#: archive.c:571 builtin/archive.c:92
a0b6b246
JX
1784msgid "path to the remote git-upload-archive command"
1785msgstr "远程 git-upload-archive 命令的路径"
1786
7e6630a7 1787#: archive.c:578
a0b6b246
JX
1788msgid "Unexpected option --remote"
1789msgstr "未知参数 --remote"
1790
65387fd5
FZ
1791#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
1792#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
1793#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
1794#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
1795#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
1796#: http-fetch.c:153
1797#, c-format
1798msgid "the option '%s' requires '%s'"
1799msgstr "选项 '%s' 需要 '%s'"
a0b6b246 1800
7e6630a7 1801#: archive.c:582
a0b6b246
JX
1802msgid "Unexpected option --output"
1803msgstr "未知参数 --output"
1804
7e6630a7 1805#: archive.c:606
a0b6b246
JX
1806#, c-format
1807msgid "Unknown archive format '%s'"
1808msgstr "未知归档格式 '%s'"
1809
7e6630a7 1810#: archive.c:615
8ada9598 1811#, c-format
a0b6b246
JX
1812msgid "Argument not supported for format '%s': -%d"
1813msgstr "参数不支持此格式 '%s':-%d"
1814
7e6630a7 1815#: attr.c:203
87cb7997
JX
1816#, c-format
1817msgid "%.*s is not a valid attribute name"
1818msgstr "%.*s 不是一个有效的属性名"
1819
7e6630a7 1820#: attr.c:364
06991777
JX
1821#, c-format
1822msgid "%s not allowed: %s:%d"
5b533632 1823msgstr "不允许 %s:%s:%d"
06991777 1824
7e6630a7 1825#: attr.c:404
8ada9598 1826msgid ""
a0b6b246
JX
1827"Negative patterns are ignored in git attributes\n"
1828"Use '\\!' for literal leading exclamation."
8ada9598 1829msgstr ""
a0b6b246
JX
1830"负值模版在 git attributes 中被忽略\n"
1831"当字符串确实要以感叹号开始时,使用 '\\!'。"
8ada9598 1832
7e6630a7 1833#: bisect.c:488
8ada9598 1834#, c-format
a0b6b246
JX
1835msgid "Badly quoted content in file '%s': %s"
1836msgstr "文件 '%s' 包含错误的引用格式:%s"
8ada9598 1837
7e6630a7 1838#: bisect.c:698
a0b6b246
JX
1839#, c-format
1840msgid "We cannot bisect more!\n"
1841msgstr "我们无法进行更多的二分查找!\n"
8ada9598 1842
7e6630a7 1843#: bisect.c:764
2e8451e8 1844#, c-format
a0b6b246
JX
1845msgid "Not a valid commit name %s"
1846msgstr "不是一个有效的提交名 %s"
2e8451e8 1847
7e6630a7 1848#: bisect.c:789
5b04ee3b
JX
1849#, c-format
1850msgid ""
a0b6b246
JX
1851"The merge base %s is bad.\n"
1852"This means the bug has been fixed between %s and [%s].\n"
5b04ee3b 1853msgstr ""
a0b6b246
JX
1854"合并基线 %s 是坏的。\n"
1855"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
5b04ee3b 1856
7e6630a7 1857#: bisect.c:794
5b04ee3b 1858#, c-format
a0b6b246
JX
1859msgid ""
1860"The merge base %s is new.\n"
1861"The property has changed between %s and [%s].\n"
1862msgstr ""
1863"合并基线 %s 是新的。\n"
1864"介于 %s 和 [%s] 之间的属性已经被修改。\n"
5b04ee3b 1865
7e6630a7 1866#: bisect.c:799
a0b6b246
JX
1867#, c-format
1868msgid ""
1869"The merge base %s is %s.\n"
1870"This means the first '%s' commit is between %s and [%s].\n"
1871msgstr ""
1872"合并基线 %s 是 %s。\n"
1873"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
07432cef 1874
7e6630a7 1875#: bisect.c:807
a0b6b246
JX
1876#, c-format
1877msgid ""
1a79b2f1 1878"Some %s revs are not ancestors of the %s rev.\n"
a0b6b246
JX
1879"git bisect cannot work properly in this case.\n"
1880"Maybe you mistook %s and %s revs?\n"
1881msgstr ""
1882"一些 %s 版本不是 %s 版本的祖先。\n"
1883"这种情况下 git 二分查找无法正常工作。\n"
1884"您可能弄错了 %s 和 %s 版本?\n"
07432cef 1885
7e6630a7 1886#: bisect.c:820
a0b6b246
JX
1887#, c-format
1888msgid ""
1889"the merge base between %s and [%s] must be skipped.\n"
1890"So we cannot be sure the first %s commit is between %s and %s.\n"
1891"We continue anyway."
1892msgstr ""
1893"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
1894"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1895"我们仍旧继续。"
649900bc 1896
7e6630a7 1897#: bisect.c:859
649900bc 1898#, c-format
a0b6b246
JX
1899msgid "Bisecting: a merge base must be tested\n"
1900msgstr "二分查找中:合并基线必须是经过测试的\n"
649900bc 1901
7e6630a7 1902#: bisect.c:909
a0b6b246
JX
1903#, c-format
1904msgid "a %s revision is needed"
1905msgstr "需要一个 %s 版本"
649900bc 1906
7e6630a7 1907#: bisect.c:939
649900bc 1908#, c-format
a0b6b246
JX
1909msgid "could not create file '%s'"
1910msgstr "不能创建文件 '%s'"
649900bc 1911
65387fd5 1912#: bisect.c:985 builtin/merge.c:155
649900bc 1913#, c-format
a0b6b246
JX
1914msgid "could not read file '%s'"
1915msgstr "不能读取文件 '%s'"
649900bc 1916
7e6630a7 1917#: bisect.c:1025
a0b6b246
JX
1918msgid "reading bisect refs failed"
1919msgstr "读取二分查找引用失败"
649900bc 1920
7e6630a7 1921#: bisect.c:1055
649900bc 1922#, c-format
a0b6b246
JX
1923msgid "%s was both %s and %s\n"
1924msgstr "%s 同时为 %s 和 %s\n"
649900bc 1925
7e6630a7 1926#: bisect.c:1064
649900bc 1927#, c-format
a0b6b246
JX
1928msgid ""
1929"No testable commit found.\n"
473eb541 1930"Maybe you started with bad path arguments?\n"
a0b6b246
JX
1931msgstr ""
1932"没有发现可测试的提交。\n"
1933"可能您在运行时使用了错误的路径参数?\n"
649900bc 1934
7e6630a7 1935#: bisect.c:1093
649900bc 1936#, c-format
a0b6b246
JX
1937msgid "(roughly %d step)"
1938msgid_plural "(roughly %d steps)"
1939msgstr[0] "(大概 %d 步)"
1940msgstr[1] "(大概 %d 步)"
649900bc 1941
a4f16749
JX
1942#. TRANSLATORS: the last %s will be replaced with "(roughly %d
1943#. steps)" translation.
1944#.
7e6630a7 1945#: bisect.c:1099
649900bc 1946#, c-format
a0b6b246
JX
1947msgid "Bisecting: %d revision left to test after this %s\n"
1948msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1949msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
1950msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
649900bc 1951
33b62fba 1952#: blame.c:2776
a4f16749
JX
1953msgid "--contents and --reverse do not blend well."
1954msgstr "--contents 和 --reverse 不能混用。"
1955
33b62fba 1956#: blame.c:2790
a4f16749
JX
1957msgid "cannot use --contents with final commit object name"
1958msgstr "不能将 --contents 和最终的提交对象名共用"
1959
33b62fba 1960#: blame.c:2811
a4f16749
JX
1961msgid "--reverse and --first-parent together require specified latest commit"
1962msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
1963
65387fd5
FZ
1964#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
1965#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
1966#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
1967#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
7e6630a7
FZ
1968#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
1969#: builtin/shortlog.c:255
a4f16749
JX
1970msgid "revision walk setup failed"
1971msgstr "版本遍历设置失败"
1972
33b62fba 1973#: blame.c:2838
a4f16749
JX
1974msgid ""
1975"--reverse --first-parent together require range along first-parent chain"
1976msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
1977
33b62fba 1978#: blame.c:2849
a4f16749
JX
1979#, c-format
1980msgid "no such path %s in %s"
1981msgstr "在 %2$s 中无此路径 %1$s"
1982
33b62fba 1983#: blame.c:2860
a4f16749
JX
1984#, c-format
1985msgid "cannot read blob %s for path %s"
1986msgstr "不能为路径 %2$s 读取数据对象 %1$s"
1987
65387fd5 1988#: branch.c:77
a0b6b246 1989msgid ""
65387fd5
FZ
1990"cannot inherit upstream tracking configuration of multiple refs when "
1991"rebasing is requested"
1992msgstr "在请求变基时无法继承上游多个引用的跟踪设置"
649900bc 1993
65387fd5 1994#: branch.c:88
649900bc 1995#, c-format
65387fd5
FZ
1996msgid "not setting branch '%s' as its own upstream"
1997msgstr "没有将分支 '%s' 设置为它自己的上游"
649900bc 1998
65387fd5 1999#: branch.c:144
649900bc 2000#, c-format
65387fd5
FZ
2001msgid "branch '%s' set up to track '%s' by rebasing."
2002msgstr "分支 '%s' 设置为使用变基来跟踪 '%s'。"
649900bc 2003
65387fd5 2004#: branch.c:145
649900bc 2005#, c-format
65387fd5
FZ
2006msgid "branch '%s' set up to track '%s'."
2007msgstr "分支 '%s' 设置为跟踪 '%s'。"
649900bc 2008
65387fd5 2009#: branch.c:148
649900bc 2010#, c-format
65387fd5
FZ
2011msgid "branch '%s' set up to track:"
2012msgstr "分支 '%s' 设置为跟踪:"
649900bc 2013
65387fd5
FZ
2014#: branch.c:160
2015msgid "unable to write upstream branch configuration"
2016msgstr "无法写入上游分支配置"
649900bc 2017
65387fd5
FZ
2018#: branch.c:162
2019msgid ""
2020"\n"
2021"After fixing the error cause you may try to fix up\n"
2022"the remote tracking information by invoking:"
2023msgstr ""
2024"\n"
2025"在修复错误后,您可以通过执行以下命令来尝试修改远程跟踪分支:"
649900bc 2026
65387fd5 2027#: branch.c:203
649900bc 2028#, c-format
65387fd5
FZ
2029msgid "asked to inherit tracking from '%s', but no remote is set"
2030msgstr "要求从 '%s' 继承跟踪信息,但是没有设置远程"
649900bc 2031
65387fd5 2032#: branch.c:209
649900bc 2033#, c-format
65387fd5
FZ
2034msgid "asked to inherit tracking from '%s', but no merge configuration is set"
2035msgstr "要求从 '%s' 继承跟踪信息,但是没有设置合并配置"
649900bc 2036
65387fd5 2037#: branch.c:252
649900bc 2038#, c-format
65387fd5 2039msgid "not tracking: ambiguous information for ref %s"
a0b6b246 2040msgstr "未跟踪:引用 %s 有歧义"
649900bc 2041
65387fd5 2042#: branch.c:287
649900bc 2043#, c-format
65387fd5
FZ
2044msgid "'%s' is not a valid branch name"
2045msgstr "'%s' 不是一个有效的分支名称"
649900bc 2046
65387fd5 2047#: branch.c:307
649900bc 2048#, c-format
65387fd5
FZ
2049msgid "a branch named '%s' already exists"
2050msgstr "一个名为 '%s' 的分支已经存在"
649900bc 2051
65387fd5
FZ
2052#: branch.c:313
2053#, c-format
ee27abd3 2054msgid "cannot force update the branch '%s' checked out at '%s'"
65387fd5 2055msgstr "无法强制更新检出于 '%2$s' 的分支 '%1$s'"
649900bc 2056
65387fd5 2057#: branch.c:336
649900bc 2058#, c-format
65387fd5
FZ
2059msgid "cannot set up tracking information; starting point '%s' is not a branch"
2060msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支"
649900bc 2061
65387fd5 2062#: branch.c:338
649900bc 2063#, c-format
a0b6b246
JX
2064msgid "the requested upstream branch '%s' does not exist"
2065msgstr "请求的上游分支 '%s' 不存在"
649900bc 2066
65387fd5 2067#: branch.c:340
a0b6b246
JX
2068msgid ""
2069"\n"
2070"If you are planning on basing your work on an upstream\n"
2071"branch that already exists at the remote, you may need to\n"
2072"run \"git fetch\" to retrieve it.\n"
2073"\n"
2074"If you are planning to push out a new local branch that\n"
2075"will track its remote counterpart, you may want to use\n"
2076"\"git push -u\" to set the upstream config as you push."
2077msgstr ""
2078"\n"
7e6630a7 2079"如果您正计划基于远程一个现存的上游分支开始您的工作,\n"
a0b6b246
JX
2080"您可能需要执行 \"git fetch\" 来获取分支。\n"
2081"\n"
2082"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
2083"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
649900bc 2084
65387fd5
FZ
2085#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
2086#: builtin/replace.c:423 builtin/replace.c:453
649900bc 2087#, c-format
65387fd5
FZ
2088msgid "not a valid object name: '%s'"
2089msgstr "不是一个有效的对象名:'%s'"
649900bc 2090
65387fd5 2091#: branch.c:404
649900bc 2092#, c-format
65387fd5
FZ
2093msgid "ambiguous object name: '%s'"
2094msgstr "歧义的对象名:'%s'"
649900bc 2095
65387fd5 2096#: branch.c:409
649900bc 2097#, c-format
65387fd5
FZ
2098msgid "not a valid branch point: '%s'"
2099msgstr "无效的分支点:'%s'"
649900bc 2100
65387fd5 2101#: branch.c:469
649900bc 2102#, c-format
a0b6b246
JX
2103msgid "'%s' is already checked out at '%s'"
2104msgstr "'%s' 已经检出到 '%s'"
649900bc 2105
65387fd5 2106#: branch.c:494
a0b6b246
JX
2107#, c-format
2108msgid "HEAD of working tree %s is not updated"
2109msgstr "工作区 %s 的 HEAD 指向没有被更新"
649900bc 2110
ec3d4607 2111#: bundle.c:44
d9488fea
JX
2112#, c-format
2113msgid "unrecognized bundle hash algorithm: %s"
2114msgstr "未能识别的归档包哈希算法:%s"
2115
ec3d4607 2116#: bundle.c:48
649900bc 2117#, c-format
d9488fea
JX
2118msgid "unknown capability '%s'"
2119msgstr "未知能力 '%s'"
649900bc 2120
ec3d4607 2121#: bundle.c:74
d9488fea
JX
2122#, c-format
2123msgid "'%s' does not look like a v2 or v3 bundle file"
2124msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件"
7157c2b5 2125
ec3d4607 2126#: bundle.c:113
a0b6b246
JX
2127#, c-format
2128msgid "unrecognized header: %s%s (%d)"
2129msgstr "未能识别的包头:%s%s (%d)"
649900bc 2130
65387fd5 2131#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
7e6630a7 2132#: builtin/commit.c:862
649900bc 2133#, c-format
a0b6b246
JX
2134msgid "could not open '%s'"
2135msgstr "不能打开 '%s'"
649900bc 2136
ec3d4607 2137#: bundle.c:198
a0b6b246
JX
2138msgid "Repository lacks these prerequisite commits:"
2139msgstr "仓库中缺少这些必备的提交:"
649900bc 2140
ec3d4607 2141#: bundle.c:201
a6cd2cc4 2142msgid "need a repository to verify a bundle"
d9488fea 2143msgstr "需要一个仓库来校验一个归档包"
a6cd2cc4 2144
ec3d4607 2145#: bundle.c:257
2e8451e8 2146#, c-format
a0b6b246
JX
2147msgid "The bundle contains this ref:"
2148msgid_plural "The bundle contains these %d refs:"
d9488fea
JX
2149msgstr[0] "这个归档包中含有这个引用:"
2150msgstr[1] "这个归档包中含有 %d 个引用:"
2e8451e8 2151
ec3d4607 2152#: bundle.c:264
a0b6b246 2153msgid "The bundle records a complete history."
d9488fea 2154msgstr "这个归档包记录一个完整历史。"
2e8451e8 2155
ec3d4607 2156#: bundle.c:266
2e8451e8 2157#, c-format
a0b6b246
JX
2158msgid "The bundle requires this ref:"
2159msgid_plural "The bundle requires these %d refs:"
d9488fea
JX
2160msgstr[0] "这个归档包需要这个引用:"
2161msgstr[1] "这个归档包需要 %d 个引用:"
2e8451e8 2162
ec3d4607 2163#: bundle.c:333
4c27fcb5 2164msgid "unable to dup bundle descriptor"
d9488fea 2165msgstr "无法复制归档包描述符"
4c27fcb5 2166
ec3d4607 2167#: bundle.c:340
a0b6b246
JX
2168msgid "Could not spawn pack-objects"
2169msgstr "不能生成 pack-objects 进程"
1003b3a5 2170
ec3d4607 2171#: bundle.c:351
a0b6b246
JX
2172msgid "pack-objects died"
2173msgstr "pack-objects 终止"
8ada9598 2174
ec3d4607 2175#: bundle.c:400
81809b99 2176#, c-format
a0b6b246
JX
2177msgid "ref '%s' is excluded by the rev-list options"
2178msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 2179
ec3d4607 2180#: bundle.c:504
d9488fea
JX
2181#, c-format
2182msgid "unsupported bundle version %d"
2183msgstr "不支持的归档包版本 %d"
2184
ec3d4607 2185#: bundle.c:506
d9488fea
JX
2186#, c-format
2187msgid "cannot write bundle version %d with algorithm %s"
2188msgstr "不能写入,归档包版本 %d 不支持算法 %s"
2189
65387fd5 2190#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
81809b99 2191#, c-format
a0b6b246
JX
2192msgid "unrecognized argument: %s"
2193msgstr "未能识别的参数:%s"
8ada9598 2194
ec3d4607 2195#: bundle.c:553
a0b6b246 2196msgid "Refusing to create empty bundle."
d9488fea 2197msgstr "不能创建空的归档包。"
a0b6b246 2198
ec3d4607 2199#: bundle.c:563
81809b99 2200#, c-format
a0b6b246
JX
2201msgid "cannot create '%s'"
2202msgstr "不能创建 '%s'"
8ada9598 2203
ec3d4607 2204#: bundle.c:588
a0b6b246
JX
2205msgid "index-pack died"
2206msgstr "index-pack 终止"
63af42fe 2207
ec3d4607 2208#: chunk-format.c:117
473eb541
JX
2209msgid "terminating chunk id appears earlier than expected"
2210msgstr "终止块 ID 比预期更早出现"
2211
ec3d4607 2212#: chunk-format.c:126
473eb541
JX
2213#, c-format
2214msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
2215msgstr "不正确的块偏移 %<PRIx64> 和 %<PRIx64>"
2216
ec3d4607 2217#: chunk-format.c:133
473eb541
JX
2218#, c-format
2219msgid "duplicate chunk ID %<PRIx32> found"
2220msgstr "发现重复的块ID %<PRIx32>"
2221
ec3d4607 2222#: chunk-format.c:147
473eb541
JX
2223#, c-format
2224msgid "final chunk has non-zero id %<PRIx32>"
2225msgstr "最终块有非零 ID %<PRIx32>"
2226
65387fd5 2227#: color.c:354
94550ed3 2228#, c-format
a0b6b246
JX
2229msgid "invalid color value: %.*s"
2230msgstr "无效的颜色值:%.*s"
94550ed3 2231
7e6630a7 2232#: commit-graph.c:204 midx.c:51
d9488fea
JX
2233msgid "invalid hash version"
2234msgstr "无效的哈希版本"
2235
33b62fba 2236#: commit-graph.c:262
d46c5519
JX
2237msgid "commit-graph file is too small"
2238msgstr "提交图形文件太小"
c1ac5258 2239
33b62fba 2240#: commit-graph.c:355
c1ac5258 2241#, c-format
d46c5519
JX
2242msgid "commit-graph signature %X does not match signature %X"
2243msgstr "提交图形签名 %X 和签名 %X 不匹配"
c1ac5258 2244
33b62fba 2245#: commit-graph.c:362
c1ac5258 2246#, c-format
d46c5519
JX
2247msgid "commit-graph version %X does not match version %X"
2248msgstr "提交图形版本 %X 和版本 %X 不匹配"
c1ac5258 2249
33b62fba 2250#: commit-graph.c:369
c1ac5258 2251#, c-format
d46c5519
JX
2252msgid "commit-graph hash version %X does not match version %X"
2253msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
c1ac5258 2254
33b62fba 2255#: commit-graph.c:386
d9488fea
JX
2256#, c-format
2257msgid "commit-graph file is too small to hold %u chunks"
2258msgstr "提交图形文件太小,容不下 %u 个块"
06991777 2259
33b62fba 2260#: commit-graph.c:482
a6cd2cc4
JX
2261msgid "commit-graph has no base graphs chunk"
2262msgstr "提交图形没有基础图形块"
2263
33b62fba 2264#: commit-graph.c:492
a6cd2cc4
JX
2265msgid "commit-graph chain does not match"
2266msgstr "提交图形链不匹配"
2267
33b62fba 2268#: commit-graph.c:540
a6cd2cc4
JX
2269#, c-format
2270msgid "invalid commit-graph chain: line '%s' not a hash"
2271msgstr "无效的提交图形链:行 '%s' 不是一个哈希值"
2272
33b62fba 2273#: commit-graph.c:564
a6cd2cc4
JX
2274msgid "unable to find all commit-graph files"
2275msgstr "无法找到所有提交图形文件"
2276
65387fd5 2277#: commit-graph.c:749 commit-graph.c:786
a6cd2cc4
JX
2278msgid "invalid commit position. commit-graph is likely corrupt"
2279msgstr "无效的提交位置。提交图形可能已损坏"
2280
65387fd5 2281#: commit-graph.c:770
c1ac5258
JX
2282#, c-format
2283msgid "could not find commit %s"
2284msgstr "无法找到提交 %s"
2285
65387fd5 2286#: commit-graph.c:803
473eb541
JX
2287msgid "commit-graph requires overflow generation data but has none"
2288msgstr "提交图需要溢出世代数据,但是没有"
2289
65387fd5 2290#: commit-graph.c:1108 builtin/am.c:1369
a5cd71ca
JX
2291#, c-format
2292msgid "unable to parse commit %s"
2293msgstr "不能解析提交 %s"
2294
65387fd5 2295#: commit-graph.c:1370 builtin/pack-objects.c:3070
c1ac5258
JX
2296#, c-format
2297msgid "unable to get type of object %s"
2298msgstr "无法获得对象 %s 类型"
2299
65387fd5 2300#: commit-graph.c:1401
06991777
JX
2301msgid "Loading known commits in commit graph"
2302msgstr "正在加载提交图中的已知提交"
2303
65387fd5 2304#: commit-graph.c:1418
06991777
JX
2305msgid "Expanding reachable commits in commit graph"
2306msgstr "正在扩展提交图中的可达提交"
2307
65387fd5 2308#: commit-graph.c:1438
06991777
JX
2309msgid "Clearing commit marks in commit graph"
2310msgstr "正在清除提交图中的提交标记"
4c27fcb5 2311
65387fd5 2312#: commit-graph.c:1457
473eb541
JX
2313msgid "Computing commit graph topological levels"
2314msgstr "正在计算提交图拓扑级别"
2315
65387fd5 2316#: commit-graph.c:1510
4c27fcb5
JX
2317msgid "Computing commit graph generation numbers"
2318msgstr "正在计算提交图世代数字"
2319
65387fd5 2320#: commit-graph.c:1591
349ede6a 2321msgid "Computing commit changed paths Bloom filters"
d9488fea 2322msgstr "计算提交变更路径的布隆过滤器"
349ede6a 2323
65387fd5 2324#: commit-graph.c:1668
7157c2b5
JX
2325msgid "Collecting referenced commits"
2326msgstr "正在收集引用的提交"
2327
65387fd5 2328#: commit-graph.c:1693
06991777
JX
2329#, c-format
2330msgid "Finding commits for commit graph in %d pack"
2331msgid_plural "Finding commits for commit graph in %d packs"
2332msgstr[0] "正在 %d 个包中查找提交图的提交"
2333msgstr[1] "正在 %d 个包中查找提交图的提交"
4c27fcb5 2334
65387fd5 2335#: commit-graph.c:1706
c1ac5258
JX
2336#, c-format
2337msgid "error adding pack %s"
2338msgstr "添加包 %s 出错"
2339
65387fd5 2340#: commit-graph.c:1710
c1ac5258
JX
2341#, c-format
2342msgid "error opening index for %s"
2343msgstr "为 %s 打开索引出错"
2344
65387fd5 2345#: commit-graph.c:1747
06991777
JX
2346msgid "Finding commits for commit graph among packed objects"
2347msgstr "正在打包对象中查找提交图的提交"
2348
65387fd5 2349#: commit-graph.c:1765
06991777 2350msgid "Finding extra edges in commit graph"
8e4e0555 2351msgstr "正在查找提交图中额外的边"
06991777 2352
65387fd5 2353#: commit-graph.c:1814
a6cd2cc4
JX
2354msgid "failed to write correct number of base graph ids"
2355msgstr "无法写入正确数量的基础图形 ID"
fd8cb379 2356
65387fd5 2357#: commit-graph.c:1845 midx.c:1149
fd8cb379 2358#, c-format
c1ac5258
JX
2359msgid "unable to create leading directories of %s"
2360msgstr "不能为 %s 创建先导目录"
2361
65387fd5 2362#: commit-graph.c:1858
349ede6a
JX
2363msgid "unable to create temporary graph layer"
2364msgstr "无法创建临时图层"
2365
65387fd5 2366#: commit-graph.c:1863
a6cd2cc4 2367#, c-format
349ede6a
JX
2368msgid "unable to adjust shared permissions for '%s'"
2369msgstr "无法为 '%s' 调整共享权限"
a6cd2cc4 2370
65387fd5 2371#: commit-graph.c:1920
06991777
JX
2372#, c-format
2373msgid "Writing out commit graph in %d pass"
2374msgid_plural "Writing out commit graph in %d passes"
8e4e0555
FZ
2375msgstr[0] "正在用 %d 步写出提交图"
2376msgstr[1] "正在用 %d 步写出提交图"
06991777 2377
65387fd5 2378#: commit-graph.c:1956
a6cd2cc4
JX
2379msgid "unable to open commit-graph chain file"
2380msgstr "无法打开提交图形链文件"
2381
65387fd5 2382#: commit-graph.c:1972
a6cd2cc4
JX
2383msgid "failed to rename base commit-graph file"
2384msgstr "无法重命名基础提交图形文件"
2385
65387fd5 2386#: commit-graph.c:1992
a6cd2cc4
JX
2387msgid "failed to rename temporary commit-graph file"
2388msgstr "无法重命名临时提交图形文件"
2389
65387fd5 2390#: commit-graph.c:2125
a6cd2cc4
JX
2391msgid "Scanning merged commits"
2392msgstr "正在扫描合并提交"
2393
65387fd5 2394#: commit-graph.c:2169
a6cd2cc4
JX
2395msgid "Merging commit-graph"
2396msgstr "正在合并提交图形"
2397
65387fd5 2398#: commit-graph.c:2277
d13389bf
JX
2399msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
2400msgstr "正尝试写提交图,但是 'core.commitGraph' 被禁用"
a6cd2cc4 2401
65387fd5 2402#: commit-graph.c:2384
a6cd2cc4
JX
2403msgid "too many commits to write graph"
2404msgstr "提交太多不能画图"
2405
65387fd5 2406#: commit-graph.c:2482
c1ac5258 2407msgid "the commit-graph file has incorrect checksum and is likely corrupt"
4c27fcb5
JX
2408msgstr "提交图文件的校验码错误,可能已经损坏"
2409
65387fd5 2410#: commit-graph.c:2492
d46c5519
JX
2411#, c-format
2412msgid "commit-graph has incorrect OID order: %s then %s"
5b533632 2413msgstr "提交图形的对象 ID 顺序不正确:%s 然后 %s"
d46c5519 2414
65387fd5 2415#: commit-graph.c:2502 commit-graph.c:2517
d46c5519
JX
2416#, c-format
2417msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2418msgstr "提交图形有不正确的扇出值:fanout[%d] = %u != %u"
2419
65387fd5 2420#: commit-graph.c:2509
d46c5519
JX
2421#, c-format
2422msgid "failed to parse commit %s from commit-graph"
2423msgstr "无法从提交图形中解析提交 %s"
2424
65387fd5 2425#: commit-graph.c:2527
4c27fcb5 2426msgid "Verifying commits in commit graph"
8e4e0555 2427msgstr "正在校验提交图中的提交"
fd8cb379 2428
65387fd5 2429#: commit-graph.c:2542
d46c5519
JX
2430#, c-format
2431msgid "failed to parse commit %s from object database for commit-graph"
2432msgstr "无法从提交图形的对象库中解析提交 %s"
2433
65387fd5 2434#: commit-graph.c:2549
d46c5519
JX
2435#, c-format
2436msgid "root tree OID for commit %s in commit-graph is %s != %s"
5b533632 2437msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
d46c5519 2438
65387fd5 2439#: commit-graph.c:2559
d46c5519
JX
2440#, c-format
2441msgid "commit-graph parent list for commit %s is too long"
2442msgstr "提交 %s 的提交图形父提交列表太长了"
2443
65387fd5 2444#: commit-graph.c:2568
d46c5519
JX
2445#, c-format
2446msgid "commit-graph parent for %s is %s != %s"
2447msgstr "%s 的提交图形父提交是 %s != %s"
2448
65387fd5 2449#: commit-graph.c:2582
d46c5519
JX
2450#, c-format
2451msgid "commit-graph parent list for commit %s terminates early"
2452msgstr "提交 %s 的提交图形父提交列表过早终止"
2453
65387fd5 2454#: commit-graph.c:2587
d46c5519
JX
2455#, c-format
2456msgid ""
2457"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2458msgstr "提交图形中提交 %s 的世代号是零,但其它地方非零"
2459
65387fd5 2460#: commit-graph.c:2591
d46c5519
JX
2461#, c-format
2462msgid ""
2463"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2464msgstr "提交图形中提交 %s 的世代号非零,但其它地方是零"
2465
65387fd5 2466#: commit-graph.c:2608
d46c5519 2467#, c-format
473eb541
JX
2468msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
2469msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"
d46c5519 2470
65387fd5 2471#: commit-graph.c:2614
d46c5519
JX
2472#, c-format
2473msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2474msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
2475
65387fd5
FZ
2476#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
2477#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
349ede6a
JX
2478#, c-format
2479msgid "could not parse %s"
2480msgstr "不能解析 %s"
2481
7e6630a7 2482#: commit.c:55
349ede6a
JX
2483#, c-format
2484msgid "%s %s is not a commit!"
2485msgstr "%s %s 不是一个提交!"
2486
7e6630a7 2487#: commit.c:196
349ede6a
JX
2488msgid ""
2489"Support for <GIT_DIR>/info/grafts is deprecated\n"
2490"and will be removed in a future Git version.\n"
2491"\n"
2492"Please use \"git replace --convert-graft-file\"\n"
2493"to convert the grafts into replace refs.\n"
2494"\n"
2495"Turn this message off by running\n"
2496"\"git config advice.graftFileDeprecated false\""
2497msgstr ""
2498"对 <GIT_DIR>/info/grafts 的支持已过时,并将在\n"
2499"未来的Git版本中被移除。\n"
2500"\n"
2501"请使用 \"git replace --convert-graft-file\" 将\n"
2502"grafts 转换为替换引用。\n"
2503"\n"
2504"设置 \"git config advice.graftFileDeprecated false\"\n"
2505"可关闭本消息"
2506
65387fd5 2507#: commit.c:1241
349ede6a
JX
2508#, c-format
2509msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2510msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
2511
65387fd5 2512#: commit.c:1245
349ede6a
JX
2513#, c-format
2514msgid "Commit %s has a bad GPG signature allegedly by %s."
2515msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
2516
65387fd5 2517#: commit.c:1248
349ede6a
JX
2518#, c-format
2519msgid "Commit %s does not have a GPG signature."
2520msgstr "提交 %s 没有 GPG 签名。"
2521
65387fd5 2522#: commit.c:1251
349ede6a
JX
2523#, c-format
2524msgid "Commit %s has a good GPG signature by %s\n"
2525msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
2526
65387fd5 2527#: commit.c:1505
349ede6a
JX
2528msgid ""
2529"Warning: commit message did not conform to UTF-8.\n"
2530"You may want to amend it after fixing the message, or set the config\n"
2531"variable i18n.commitencoding to the encoding your project uses.\n"
2532msgstr ""
2533"警告:提交说明不符合 UTF-8 字符编码。\n"
2534"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
2535"设置为您项目所用的字符编码。\n"
2536
06991777 2537#: compat/obstack.c:406 compat/obstack.c:408
a0b6b246
JX
2538msgid "memory exhausted"
2539msgstr "内存耗尽"
90314792 2540
7e6630a7 2541#: config.c:125
c1ac5258
JX
2542#, c-format
2543msgid ""
2544"exceeded maximum include depth (%d) while including\n"
2545"\t%s\n"
2546"from\n"
2547"\t%s\n"
2548"This might be due to circular includes."
2549msgstr ""
e640d114 2550"超过了最大包含深度(%1$d),当从\n"
c1ac5258
JX
2551"\t%3$s\n"
2552"包含\n"
2553"\t%2$s\n"
e640d114 2554"这可能是因为循环包含。"
c1ac5258 2555
7e6630a7 2556#: config.c:141
c1ac5258
JX
2557#, c-format
2558msgid "could not expand include path '%s'"
2559msgstr "无法扩展包含路径 '%s'"
2560
7e6630a7 2561#: config.c:152
c1ac5258
JX
2562msgid "relative config includes must come from files"
2563msgstr "相对路径的配置文件引用必须来自于文件"
2564
7e6630a7 2565#: config.c:201
87cb7997 2566msgid "relative config include conditionals must come from files"
c1ac5258
JX
2567msgstr "相对路径的配置文件条件引用必须来自于文件"
2568
7e6630a7 2569#: config.c:398
473eb541
JX
2570#, c-format
2571msgid "invalid config format: %s"
2572msgstr "无效的配置格式:%s"
2573
7e6630a7 2574#: config.c:402
473eb541
JX
2575#, c-format
2576msgid "missing environment variable name for configuration '%.*s'"
2577msgstr "配置 '%.*s' 缺少环境变量名称"
2578
7e6630a7 2579#: config.c:407
473eb541
JX
2580#, c-format
2581msgid "missing environment variable '%s' for configuration '%.*s'"
2582msgstr "缺少环境变量 '%s' 于配置 '%.*s' "
2583
7e6630a7 2584#: config.c:443
c1ac5258
JX
2585#, c-format
2586msgid "key does not contain a section: %s"
2587msgstr "键名没有包含一个小节名称:%s"
87cb7997 2588
473eb541 2589#: config.c:448
c1ac5258
JX
2590#, c-format
2591msgid "key does not contain variable name: %s"
2592msgstr "键名没有包含变量名:%s"
2593
65387fd5 2594#: config.c:470 sequencer.c:2806
c1ac5258
JX
2595#, c-format
2596msgid "invalid key: %s"
2597msgstr "无效键名:%s"
2598
7e6630a7 2599#: config.c:475
c1ac5258
JX
2600#, c-format
2601msgid "invalid key (newline): %s"
2602msgstr "无效键名(有换行符):%s"
2603
7e6630a7 2604#: config.c:495
473eb541
JX
2605msgid "empty config key"
2606msgstr "空的配置键名"
2607
7e6630a7 2608#: config.c:513 config.c:525
c1ac5258
JX
2609#, c-format
2610msgid "bogus config parameter: %s"
2611msgstr "伪配置参数:%s"
2612
7e6630a7 2613#: config.c:539 config.c:556 config.c:563 config.c:572
c1ac5258
JX
2614#, c-format
2615msgid "bogus format in %s"
2616msgstr "%s 中格式错误"
2617
7e6630a7 2618#: config.c:606
473eb541
JX
2619#, c-format
2620msgid "bogus count in %s"
2621msgstr "%s 中错误计数"
2622
7e6630a7 2623#: config.c:610
473eb541
JX
2624#, c-format
2625msgid "too many entries in %s"
2626msgstr "%s 中太多的条目"
2627
7e6630a7 2628#: config.c:620
473eb541
JX
2629#, c-format
2630msgid "missing config key %s"
2631msgstr "缺失配置键名 %s"
2632
7e6630a7 2633#: config.c:628
473eb541
JX
2634#, c-format
2635msgid "missing config value %s"
2636msgstr "缺失配置取值 %s"
2637
7e6630a7 2638#: config.c:979
90314792 2639#, c-format
a0b6b246
JX
2640msgid "bad config line %d in blob %s"
2641msgstr "数据对象 %2$s 中错误的配置行 %1$d"
90314792 2642
7e6630a7 2643#: config.c:983
a77c07d9 2644#, c-format
a0b6b246
JX
2645msgid "bad config line %d in file %s"
2646msgstr "文件 %2$s 中错误的配置行 %1$d"
a77c07d9 2647
7e6630a7 2648#: config.c:987
a77c07d9 2649#, c-format
a0b6b246
JX
2650msgid "bad config line %d in standard input"
2651msgstr "标准输入中错误的配置行 %d"
a77c07d9 2652
7e6630a7 2653#: config.c:991
90314792 2654#, c-format
a0b6b246
JX
2655msgid "bad config line %d in submodule-blob %s"
2656msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
90314792 2657
7e6630a7 2658#: config.c:995
90314792 2659#, c-format
a0b6b246
JX
2660msgid "bad config line %d in command line %s"
2661msgstr "命令行 %2$s 中错误的配置行 %1$d"
90314792 2662
7e6630a7 2663#: config.c:999
90314792 2664#, c-format
a0b6b246
JX
2665msgid "bad config line %d in %s"
2666msgstr "在 %2$s 中错误的配置行 %1$d"
220c313c 2667
7e6630a7 2668#: config.c:1136
a0b6b246
JX
2669msgid "out of range"
2670msgstr "超出范围"
6c94aba5 2671
7e6630a7 2672#: config.c:1136
a0b6b246
JX
2673msgid "invalid unit"
2674msgstr "无效的单位"
6c94aba5 2675
7e6630a7 2676#: config.c:1137
6c94aba5 2677#, c-format
a0b6b246
JX
2678msgid "bad numeric config value '%s' for '%s': %s"
2679msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
6c94aba5 2680
7e6630a7 2681#: config.c:1147
1b7f4a34 2682#, c-format
a0b6b246
JX
2683msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
2684msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 2685
7e6630a7 2686#: config.c:1150
1b7f4a34 2687#, c-format
a0b6b246
JX
2688msgid "bad numeric config value '%s' for '%s' in file %s: %s"
2689msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 2690
7e6630a7 2691#: config.c:1153
1b7f4a34 2692#, c-format
a0b6b246
JX
2693msgid "bad numeric config value '%s' for '%s' in standard input: %s"
2694msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
1b7f4a34 2695
7e6630a7 2696#: config.c:1156
1b7f4a34 2697#, c-format
a0b6b246
JX
2698msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
2699msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
1b7f4a34 2700
7e6630a7 2701#: config.c:1159
94550ed3 2702#, c-format
a0b6b246
JX
2703msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
2704msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 2705
7e6630a7 2706#: config.c:1162
276ceeaa 2707#, c-format
a0b6b246
JX
2708msgid "bad numeric config value '%s' for '%s' in %s: %s"
2709msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
276ceeaa 2710
7e6630a7 2711#: config.c:1241
473eb541
JX
2712#, c-format
2713msgid "bad boolean config value '%s' for '%s'"
2714msgstr "'%2$s' 的错误的布尔取值 '%1$s'"
2715
7e6630a7 2716#: config.c:1259
276ceeaa 2717#, c-format
a0b6b246 2718msgid "failed to expand user dir in: '%s'"
c1ac5258 2719msgstr "无法扩展用户目录:'%s'"
94550ed3 2720
7e6630a7 2721#: config.c:1268
5809aa05
JX
2722#, c-format
2723msgid "'%s' for '%s' is not a valid timestamp"
2724msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
2725
7e6630a7 2726#: config.c:1361
c1ac5258
JX
2727#, c-format
2728msgid "abbrev length out of range: %d"
2729msgstr "缩写长度超出范围:%d"
2730
7e6630a7 2731#: config.c:1375 config.c:1386
3495628d 2732#, c-format
a0b6b246
JX
2733msgid "bad zlib compression level %d"
2734msgstr "错误的 zlib 压缩级别 %d"
3495628d 2735
7e6630a7 2736#: config.c:1476
c1ac5258
JX
2737msgid "core.commentChar should only be one character"
2738msgstr "core.commentChar 应该是一个字符"
2739
7e6630a7 2740#: config.c:1509
3495628d 2741#, c-format
a0b6b246
JX
2742msgid "invalid mode for object creation: %s"
2743msgstr "无效的对象创建模式:%s"
3495628d 2744
65387fd5 2745#: config.c:1584
c1ac5258
JX
2746#, c-format
2747msgid "malformed value for %s"
2748msgstr "%s 的取值格式错误"
2749
65387fd5 2750#: config.c:1610
c1ac5258
JX
2751#, c-format
2752msgid "malformed value for %s: %s"
2753msgstr "%s 的取值格式错误:%s"
2754
65387fd5 2755#: config.c:1611
c1ac5258
JX
2756msgid "must be one of nothing, matching, simple, upstream or current"
2757msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current"
2758
65387fd5 2759#: config.c:1672 builtin/pack-objects.c:4053
1a79b2f1
JX
2760#, c-format
2761msgid "bad pack compression level %d"
2762msgstr "错误的打包压缩级别 %d"
2763
65387fd5 2764#: config.c:1795
c1ac5258
JX
2765#, c-format
2766msgid "unable to load config blob object '%s'"
2767msgstr "无法从数据对象 '%s' 加载配置"
2768
65387fd5 2769#: config.c:1798
c1ac5258
JX
2770#, c-format
2771msgid "reference '%s' does not point to a blob"
2772msgstr "引用 '%s' 没有指向一个数据对象"
2773
65387fd5 2774#: config.c:1816
c1ac5258
JX
2775#, c-format
2776msgid "unable to resolve config blob '%s'"
2777msgstr "不能解析配置对象 '%s'"
2778
65387fd5 2779#: config.c:1861
c1ac5258
JX
2780#, c-format
2781msgid "failed to parse %s"
65387fd5 2782msgstr "无法解析 %s"
c1ac5258 2783
65387fd5 2784#: config.c:1917
a0b6b246
JX
2785msgid "unable to parse command-line config"
2786msgstr "无法解析命令行中的配置"
94550ed3 2787
65387fd5 2788#: config.c:2285
a0b6b246
JX
2789msgid "unknown error occurred while reading the configuration files"
2790msgstr "在读取配置文件时遇到未知错误"
94550ed3 2791
65387fd5 2792#: config.c:2459
87cb7997
JX
2793#, c-format
2794msgid "Invalid %s: '%s'"
2795msgstr "无效 %s:'%s'"
2796
65387fd5 2797#: config.c:2504
87cb7997
JX
2798#, c-format
2799msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2800msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
2801
65387fd5 2802#: config.c:2550
276ceeaa 2803#, c-format
a0b6b246
JX
2804msgid "unable to parse '%s' from command-line config"
2805msgstr "无法解析命令行配置中的 '%s'"
1b7f4a34 2806
65387fd5 2807#: config.c:2552
94550ed3 2808#, c-format
a0b6b246
JX
2809msgid "bad config variable '%s' in file '%s' at line %d"
2810msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
94550ed3 2811
65387fd5 2812#: config.c:2637
c1ac5258
JX
2813#, c-format
2814msgid "invalid section name '%s'"
2815msgstr "无效的小节名称 '%s'"
2816
65387fd5 2817#: config.c:2669
276ceeaa 2818#, c-format
a0b6b246
JX
2819msgid "%s has multiple values"
2820msgstr "%s 有多个取值"
276ceeaa 2821
65387fd5 2822#: config.c:2698
c1ac5258
JX
2823#, c-format
2824msgid "failed to write new configuration file %s"
65387fd5 2825msgstr "无法写入新的配置文件 %s"
c1ac5258 2826
65387fd5 2827#: config.c:2950 config.c:3277
c1ac5258
JX
2828#, c-format
2829msgid "could not lock config file %s"
2830msgstr "不能锁定配置文件 %s"
2831
65387fd5 2832#: config.c:2961
c1ac5258
JX
2833#, c-format
2834msgid "opening %s"
2835msgstr "打开 %s"
2836
65387fd5 2837#: config.c:2998 builtin/config.c:361
c1ac5258
JX
2838#, c-format
2839msgid "invalid pattern: %s"
2840msgstr "无效模式:%s"
2841
65387fd5 2842#: config.c:3023
c1ac5258
JX
2843#, c-format
2844msgid "invalid config file %s"
2845msgstr "无效的配置文件 %s"
2846
65387fd5 2847#: config.c:3036 config.c:3290
1a79b2f1
JX
2848#, c-format
2849msgid "fstat on %s failed"
65e2041e 2850msgstr "对 %s 调用 fstat 失败"
1a79b2f1 2851
65387fd5 2852#: config.c:3047
c1ac5258 2853#, c-format
ec3d4607
JX
2854msgid "unable to mmap '%s'%s"
2855msgstr "不能 mmap '%s'%s"
c1ac5258 2856
65387fd5 2857#: config.c:3057 config.c:3295
c1ac5258
JX
2858#, c-format
2859msgid "chmod on %s failed"
2860msgstr "对 %s 调用 chmod 失败"
2861
65387fd5 2862#: config.c:3142 config.c:3392
c1ac5258
JX
2863#, c-format
2864msgid "could not write config file %s"
2865msgstr "不能写入配置文件 %s"
2866
65387fd5 2867#: config.c:3176
94550ed3 2868#, c-format
a0b6b246
JX
2869msgid "could not set '%s' to '%s'"
2870msgstr "不能设置 '%s' 为 '%s'"
94550ed3 2871
65387fd5 2872#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
276ceeaa 2873#, c-format
a0b6b246
JX
2874msgid "could not unset '%s'"
2875msgstr "不能取消设置 '%s'"
276ceeaa 2876
65387fd5 2877#: config.c:3268
c1ac5258
JX
2878#, c-format
2879msgid "invalid section name: %s"
2880msgstr "无效的小节名称:%s"
2881
65387fd5 2882#: config.c:3435
c1ac5258
JX
2883#, c-format
2884msgid "missing value for '%s'"
2885msgstr "%s 的取值缺失"
2886
fd8cb379 2887#: connect.c:61
c1ac5258
JX
2888msgid "the remote end hung up upon initial contact"
2889msgstr "远端在初始连接时即挂断"
94550ed3 2890
fd8cb379 2891#: connect.c:63
a0b6b246
JX
2892msgid ""
2893"Could not read from remote repository.\n"
2894"\n"
2895"Please make sure you have the correct access rights\n"
2896"and the repository exists."
2897msgstr ""
2898"无法读取远程仓库。\n"
2899"\n"
2900"请确认您有正确的访问权限并且仓库存在。"
2901
c1ac5258
JX
2902#: connect.c:81
2903#, c-format
2904msgid "server doesn't support '%s'"
2905msgstr "服务器不支持 '%s'"
2906
7157c2b5 2907#: connect.c:118
c1ac5258
JX
2908#, c-format
2909msgid "server doesn't support feature '%s'"
2910msgstr "服务器不支持特性 '%s'"
2911
7157c2b5 2912#: connect.c:129
c1ac5258
JX
2913msgid "expected flush after capabilities"
2914msgstr "在能力之后应为一个 flush 包"
2915
7e6630a7 2916#: connect.c:265
c1ac5258
JX
2917#, c-format
2918msgid "ignoring capabilities after first line '%s'"
e640d114 2919msgstr "忽略第一行 '%s' 之后的能力字段"
c1ac5258 2920
7e6630a7 2921#: connect.c:286
c1ac5258
JX
2922msgid "protocol error: unexpected capabilities^{}"
2923msgstr "协议错误:意外的 capabilities^{}"
2924
7e6630a7 2925#: connect.c:308
c1ac5258
JX
2926#, c-format
2927msgid "protocol error: expected shallow sha-1, got '%s'"
2928msgstr "协议错误:预期浅克隆 sha-1,却得到 '%s'"
2929
7e6630a7 2930#: connect.c:310
c1ac5258
JX
2931msgid "repository on the other end cannot be shallow"
2932msgstr "另一端的仓库不能是浅克隆仓库"
2933
7e6630a7 2934#: connect.c:349
c1ac5258
JX
2935msgid "invalid packet"
2936msgstr "无效数据包"
2937
7e6630a7 2938#: connect.c:369
c1ac5258
JX
2939#, c-format
2940msgid "protocol error: unexpected '%s'"
2941msgstr "协议错误:意外的 '%s'"
2942
7e6630a7 2943#: connect.c:499
7157c2b5
JX
2944#, c-format
2945msgid "unknown object format '%s' specified by server"
2946msgstr "服务器给出未知的对象格式 '%s'"
2947
7e6630a7 2948#: connect.c:528
c1ac5258
JX
2949#, c-format
2950msgid "invalid ls-refs response: %s"
2951msgstr "无效的 ls-refs 响应:%s"
2952
7e6630a7 2953#: connect.c:532
c1ac5258
JX
2954msgid "expected flush after ref listing"
2955msgstr "在引用列表之后应该有一个 flush 包"
2956
7e6630a7 2957#: connect.c:535
7157c2b5
JX
2958msgid "expected response end packet after ref listing"
2959msgstr "在引用列表之后应该有响应结束包"
2960
7e6630a7 2961#: connect.c:670
c1ac5258
JX
2962#, c-format
2963msgid "protocol '%s' is not supported"
2964msgstr "不支持 '%s' 协议"
2965
7e6630a7 2966#: connect.c:721
c1ac5258
JX
2967msgid "unable to set SO_KEEPALIVE on socket"
2968msgstr "无法为 socket 设置 SO_KEEPALIVE"
2969
7e6630a7 2970#: connect.c:761 connect.c:824
c1ac5258
JX
2971#, c-format
2972msgid "Looking up %s ... "
2973msgstr "查找 %s ..."
2974
7e6630a7 2975#: connect.c:765
c1ac5258
JX
2976#, c-format
2977msgid "unable to look up %s (port %s) (%s)"
2978msgstr "无法查找 %s(端口 %s)(%s)"
2979
2980#. TRANSLATORS: this is the end of "Looking up %s ... "
7e6630a7 2981#: connect.c:769 connect.c:840
c1ac5258
JX
2982#, c-format
2983msgid ""
2984"done.\n"
2985"Connecting to %s (port %s) ... "
2986msgstr ""
2987"完成。\n"
2988"连接到 %s(端口 %s)... "
2989
7e6630a7 2990#: connect.c:791 connect.c:868
c1ac5258
JX
2991#, c-format
2992msgid ""
2993"unable to connect to %s:\n"
2994"%s"
2995msgstr ""
2996"无法连接到 %s:\n"
2997"%s"
2998
2999#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
7e6630a7 3000#: connect.c:797 connect.c:874
c1ac5258
JX
3001msgid "done."
3002msgstr "完成。"
3003
7e6630a7 3004#: connect.c:828
c1ac5258
JX
3005#, c-format
3006msgid "unable to look up %s (%s)"
3007msgstr "无法查找 %s(%s)"
3008
7e6630a7 3009#: connect.c:834
c1ac5258
JX
3010#, c-format
3011msgid "unknown port %s"
3012msgstr "未知端口 %s"
3013
7e6630a7 3014#: connect.c:971 connect.c:1303
c1ac5258
JX
3015#, c-format
3016msgid "strange hostname '%s' blocked"
3017msgstr "已阻止奇怪的主机名 '%s'"
3018
7e6630a7 3019#: connect.c:973
c1ac5258
JX
3020#, c-format
3021msgid "strange port '%s' blocked"
3022msgstr "已阻止奇怪的端口号 '%s'"
3023
7e6630a7 3024#: connect.c:983
c1ac5258
JX
3025#, c-format
3026msgid "cannot start proxy %s"
3027msgstr "不能启动代理 %s"
3028
7e6630a7 3029#: connect.c:1054
c1ac5258
JX
3030msgid "no path specified; see 'git help pull' for valid url syntax"
3031msgstr "未指定路径,执行 'git help pull' 查看有效的 url 语法"
3032
7e6630a7 3033#: connect.c:1194
473eb541
JX
3034msgid "newline is forbidden in git:// hosts and repo paths"
3035msgstr "在 git:// 主机和仓库路径中禁止使用换行符"
3036
7e6630a7 3037#: connect.c:1251
c1ac5258
JX
3038msgid "ssh variant 'simple' does not support -4"
3039msgstr "ssh 变体 'simple' 不支持 -4"
3040
7e6630a7 3041#: connect.c:1263
c1ac5258
JX
3042msgid "ssh variant 'simple' does not support -6"
3043msgstr "ssh 变体 'simple' 不支持 -6"
3044
7e6630a7 3045#: connect.c:1280
c1ac5258 3046msgid "ssh variant 'simple' does not support setting port"
e640d114 3047msgstr "ssh 变体 'simple' 不支持设置端口"
c1ac5258 3048
7e6630a7 3049#: connect.c:1392
c1ac5258
JX
3050#, c-format
3051msgid "strange pathname '%s' blocked"
3052msgstr "已阻止奇怪的路径名 '%s'"
3053
7e6630a7 3054#: connect.c:1440
c1ac5258
JX
3055msgid "unable to fork"
3056msgstr "无法 fork"
3057
65387fd5 3058#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
a0b6b246 3059msgid "Checking connectivity"
06991777 3060msgstr "正在检查连通性"
a0b6b246 3061
7e6630a7 3062#: connected.c:122
a0b6b246
JX
3063msgid "Could not run 'git rev-list'"
3064msgstr "不能执行 'git rev-list'"
3065
7e6630a7 3066#: connected.c:146
a0b6b246 3067msgid "failed write to rev-list"
c1ac5258 3068msgstr "写入 rev-list 失败"
a0b6b246 3069
7e6630a7 3070#: connected.c:151
a0b6b246 3071msgid "failed to close rev-list's stdin"
65387fd5 3072msgstr "无法关闭 rev-list 的标准输入"
c1ac5258 3073
33b62fba 3074#: convert.c:183
c1ac5258
JX
3075#, c-format
3076msgid "illegal crlf_action %d"
ae4e099e 3077msgstr "非法的 crlf_action %d"
a0b6b246 3078
33b62fba 3079#: convert.c:196
3495628d 3080#, c-format
c1ac5258
JX
3081msgid "CRLF would be replaced by LF in %s"
3082msgstr "%s 中的 CRLF 将被 LF 替换"
31e5e17b 3083
33b62fba 3084#: convert.c:198
31e5e17b 3085#, c-format
a0b6b246
JX
3086msgid ""
3087"CRLF will be replaced by LF in %s.\n"
c1ac5258 3088"The file will have its original line endings in your working directory"
a0b6b246 3089msgstr ""
c1ac5258 3090"%s 中的 CRLF 将被 LF 替换。<\n"
a0b6b246 3091"在工作区中该文件仍保持原有的换行符。"
3495628d 3092
33b62fba 3093#: convert.c:206
3495628d 3094#, c-format
31e5e17b
JX
3095msgid "LF would be replaced by CRLF in %s"
3096msgstr "文件 %s 中的 LF 将被 CRLF 替换"
3495628d 3097
33b62fba 3098#: convert.c:208
276ceeaa 3099#, c-format
a0b6b246
JX
3100msgid ""
3101"LF will be replaced by CRLF in %s.\n"
c1ac5258 3102"The file will have its original line endings in your working directory"
a0b6b246 3103msgstr ""
c1ac5258
JX
3104"%s 中的 LF 将被 CRLF 替换。\n"
3105"在工作区中该文件仍保持原有的换行符"
276ceeaa 3106
33b62fba 3107#: convert.c:273
fd8cb379
JX
3108#, c-format
3109msgid "BOM is prohibited in '%s' if encoded as %s"
3110msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM"
3111
33b62fba 3112#: convert.c:280
fd8cb379
JX
3113#, c-format
3114msgid ""
ddc12c42
JX
3115"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
3116"working-tree-encoding."
2b472aae
JX
3117msgstr ""
3118"文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%.*s 作为工作区编码。"
fd8cb379 3119
33b62fba 3120#: convert.c:293
fd8cb379
JX
3121#, c-format
3122msgid "BOM is required in '%s' if encoded as %s"
3123msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM"
3124
33b62fba 3125#: convert.c:295
fd8cb379
JX
3126#, c-format
3127msgid ""
3128"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
3129"%sLE (depending on the byte order) as working-tree-encoding."
3130msgstr ""
3131"文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字"
3132"节序)作为工作区编码。"
3133
33b62fba 3134#: convert.c:408 convert.c:479
fd8cb379
JX
3135#, c-format
3136msgid "failed to encode '%s' from %s to %s"
3137msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
3138
33b62fba 3139#: convert.c:451
fd8cb379
JX
3140#, c-format
3141msgid "encoding '%s' from %s to %s and back is not the same"
3142msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
3143
33b62fba 3144#: convert.c:654
c1ac5258
JX
3145#, c-format
3146msgid "cannot fork to run external filter '%s'"
e640d114 3147msgstr "不能 fork 以执行外部过滤器 '%s'"
c1ac5258 3148
33b62fba 3149#: convert.c:674
c1ac5258
JX
3150#, c-format
3151msgid "cannot feed the input to external filter '%s'"
e640d114 3152msgstr "不能将输入传递给外部过滤器 '%s'"
c1ac5258 3153
33b62fba 3154#: convert.c:681
c1ac5258
JX
3155#, c-format
3156msgid "external filter '%s' failed %d"
e640d114 3157msgstr "外部过滤器 '%s' 失败码 %d"
c1ac5258 3158
33b62fba 3159#: convert.c:716 convert.c:719
c1ac5258
JX
3160#, c-format
3161msgid "read from external filter '%s' failed"
3162msgstr "从外部过滤器 '%s' 读取失败"
3163
33b62fba 3164#: convert.c:722 convert.c:777
c1ac5258
JX
3165#, c-format
3166msgid "external filter '%s' failed"
3167msgstr "外部过滤器 '%s' 失败"
3168
33b62fba 3169#: convert.c:826
c1ac5258
JX
3170msgid "unexpected filter type"
3171msgstr "意外的过滤类型"
3172
33b62fba 3173#: convert.c:837
c1ac5258
JX
3174msgid "path name too long for external filter"
3175msgstr "外部过滤器的路径名太长"
3176
ec3d4607 3177#: convert.c:935
c1ac5258
JX
3178#, c-format
3179msgid ""
3180"external filter '%s' is not available anymore although not all paths have "
3181"been filtered"
3182msgstr "外部过滤器 '%s' 不再可用,但并非所有路径都已过滤"
3183
ec3d4607 3184#: convert.c:1236
fd8cb379
JX
3185msgid "true/false are no valid working-tree-encodings"
3186msgstr "true/false 不是有效的工作区编码"
3187
ec3d4607 3188#: convert.c:1416 convert.c:1449
c1ac5258
JX
3189#, c-format
3190msgid "%s: clean filter '%s' failed"
3191msgstr "%s:clean 过滤器 '%s' 失败"
3192
ec3d4607 3193#: convert.c:1492
c1ac5258
JX
3194#, c-format
3195msgid "%s: smudge filter %s failed"
3196msgstr "%s:smudge 过滤器 %s 失败"
3197
349ede6a
JX
3198#: credential.c:96
3199#, c-format
3200msgid "skipping credential lookup for key: credential.%s"
3201msgstr "跳过凭据查询:credential.%s"
3202
3203#: credential.c:112
3204msgid "refusing to work with credential missing host field"
3205msgstr "拒绝使用缺少主机字段的凭据"
3206
3207#: credential.c:114
3208msgid "refusing to work with credential missing protocol field"
3209msgstr "拒绝使用缺少协议字段的凭据"
3210
7e6630a7 3211#: credential.c:395
349ede6a
JX
3212#, c-format
3213msgid "url contains a newline in its %s component: %s"
3214msgstr "URL 的 %s 组件中包含换行符:%s"
3215
7e6630a7 3216#: credential.c:439
349ede6a
JX
3217#, c-format
3218msgid "url has no scheme: %s"
3219msgstr "URL 没有 scheme:%s"
3220
7e6630a7 3221#: credential.c:512
349ede6a
JX
3222#, c-format
3223msgid "credential url cannot be parsed: %s"
3224msgstr "不能解析凭据 URL:%s"
3225
a5cd71ca 3226#: date.c:138
a0b6b246
JX
3227msgid "in the future"
3228msgstr "在将来"
3495628d 3229
a5cd71ca 3230#: date.c:144
3495628d 3231#, c-format
a4f16749
JX
3232msgid "%<PRIuMAX> second ago"
3233msgid_plural "%<PRIuMAX> seconds ago"
3234msgstr[0] "%<PRIuMAX> 秒钟前"
3235msgstr[1] "%<PRIuMAX> 秒钟前"
3495628d 3236
a5cd71ca 3237#: date.c:151
3495628d 3238#, c-format
a4f16749
JX
3239msgid "%<PRIuMAX> minute ago"
3240msgid_plural "%<PRIuMAX> minutes ago"
3241msgstr[0] "%<PRIuMAX> 分钟前"
3242msgstr[1] "%<PRIuMAX> 分钟前"
3495628d 3243
a5cd71ca 3244#: date.c:158
3495628d 3245#, c-format
a4f16749
JX
3246msgid "%<PRIuMAX> hour ago"
3247msgid_plural "%<PRIuMAX> hours ago"
3248msgstr[0] "%<PRIuMAX> 小时前"
3249msgstr[1] "%<PRIuMAX> 小时前"
3495628d 3250
a5cd71ca 3251#: date.c:165
3495628d 3252#, c-format
a4f16749
JX
3253msgid "%<PRIuMAX> day ago"
3254msgid_plural "%<PRIuMAX> days ago"
3255msgstr[0] "%<PRIuMAX> 天前"
3256msgstr[1] "%<PRIuMAX> 天前"
3495628d 3257
a5cd71ca 3258#: date.c:171
94550ed3 3259#, c-format
a4f16749
JX
3260msgid "%<PRIuMAX> week ago"
3261msgid_plural "%<PRIuMAX> weeks ago"
3262msgstr[0] "%<PRIuMAX> 周前"
3263msgstr[1] "%<PRIuMAX> 周前"
94550ed3 3264
a5cd71ca 3265#: date.c:178
3495628d 3266#, c-format
a4f16749
JX
3267msgid "%<PRIuMAX> month ago"
3268msgid_plural "%<PRIuMAX> months ago"
3269msgstr[0] "%<PRIuMAX> 个月前"
3270msgstr[1] "%<PRIuMAX> 个月前"
3495628d 3271
a5cd71ca 3272#: date.c:189
3495628d 3273#, c-format
a4f16749
JX
3274msgid "%<PRIuMAX> year"
3275msgid_plural "%<PRIuMAX> years"
3276msgstr[0] "%<PRIuMAX> 年"
3277msgstr[1] "%<PRIuMAX> 年"
3495628d 3278
a0b6b246 3279#. TRANSLATORS: "%s" is "<n> years"
a5cd71ca 3280#: date.c:192
94550ed3 3281#, c-format
a4f16749
JX
3282msgid "%s, %<PRIuMAX> month ago"
3283msgid_plural "%s, %<PRIuMAX> months ago"
3284msgstr[0] "%s %<PRIuMAX> 个月前"
3285msgstr[1] "%s %<PRIuMAX> 个月前"
94550ed3 3286
a5cd71ca 3287#: date.c:197 date.c:202
94550ed3 3288#, c-format
a4f16749
JX
3289msgid "%<PRIuMAX> year ago"
3290msgid_plural "%<PRIuMAX> years ago"
3291msgstr[0] "%<PRIuMAX> 年前"
3292msgstr[1] "%<PRIuMAX> 年前"
94550ed3 3293
06991777 3294#: delta-islands.c:272
4c27fcb5
JX
3295msgid "Propagating island marks"
3296msgstr "正在传播数据岛标记"
3297
06991777 3298#: delta-islands.c:290
4c27fcb5
JX
3299#, c-format
3300msgid "bad tree object %s"
3301msgstr "坏的树对象 %s"
3302
06991777 3303#: delta-islands.c:334
4c27fcb5
JX
3304#, c-format
3305msgid "failed to load island regex for '%s': %s"
3306msgstr "未能加载 '%s' 的数据岛正则表达式:%s"
3307
06991777 3308#: delta-islands.c:390
4c27fcb5
JX
3309#, c-format
3310msgid "island regex from config has too many capture groups (max=%d)"
3311msgstr "来自 config 的数据岛正则表达式有太多的捕获组(最多 %d 个)"
3312
a6cd2cc4 3313#: delta-islands.c:467
4c27fcb5
JX
3314#, c-format
3315msgid "Marked %d islands, done.\n"
3316msgstr "已标记 %d 个数据岛,结束。\n"
3317
ec3d4607 3318#: diff-merges.c:70
473eb541
JX
3319#, c-format
3320msgid "unknown value for --diff-merges: %s"
3321msgstr "未知的 --diff-merges 取值:%s"
3322
7e6630a7 3323#: diff-lib.c:561
d13389bf
JX
3324msgid "--merge-base does not work with ranges"
3325msgstr "--merge-base 不适用于范围"
3326
7e6630a7 3327#: diff-lib.c:563
d13389bf
JX
3328msgid "--merge-base only works with commits"
3329msgstr "--merge-base 仅适用于提交"
3330
7e6630a7 3331#: diff-lib.c:580
d13389bf
JX
3332msgid "unable to get HEAD"
3333msgstr "不能解析 HEAD"
3334
7e6630a7 3335#: diff-lib.c:587
d13389bf
JX
3336msgid "no merge base found"
3337msgstr "未找到合并基线"
3338
7e6630a7 3339#: diff-lib.c:589
d13389bf
JX
3340msgid "multiple merge bases found"
3341msgstr "找到了多条合并基线"
3342
ec3d4607 3343#: diff-no-index.c:237
d46c5519
JX
3344msgid "git diff --no-index [<options>] <path> <path>"
3345msgstr "git diff --no-index [<选项>] <路径> <路径>"
3346
ec3d4607 3347#: diff-no-index.c:262
d46c5519
JX
3348msgid ""
3349"Not a git repository. Use --no-index to compare two paths outside a working "
3350"tree"
d9488fea 3351msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径"
cfff71a9 3352
a0b6b246 3353# 译者:注意保持前导空格
65387fd5 3354#: diff.c:158
a0b6b246
JX
3355#, c-format
3356msgid " Failed to parse dirstat cut-off percentage '%s'\n"
3357msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
cfff71a9 3358
a0b6b246 3359# 译者:注意保持前导空格
65387fd5 3360#: diff.c:163
a0b6b246
JX
3361#, c-format
3362msgid " Unknown dirstat parameter '%s'\n"
3363msgstr " 未知的 dirstat 参数 '%s'\n"
7aea43ff 3364
65387fd5 3365#: diff.c:299
6937cb4e 3366msgid ""
c1ac5258
JX
3367"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
3368"'dimmed-zebra', 'plain'"
5809aa05 3369msgstr ""
ec3d4607 3370"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed-zebra' 或 "
c1ac5258
JX
3371"'plain'"
3372
65387fd5 3373#: diff.c:327
c1ac5258 3374#, c-format
06991777
JX
3375msgid ""
3376"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
3377"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
3378msgstr ""
3379"未知的 color-moved-ws 模式 '%s',可能的取值有 'ignore-space-change'、'ignore-"
3380"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
c1ac5258 3381
65387fd5 3382#: diff.c:335
c1ac5258 3383msgid ""
06991777
JX
3384"color-moved-ws: allow-indentation-change cannot be combined with other "
3385"whitespace modes"
c1ac5258 3386msgstr "color-moved-ws:allow-indentation-change 不能与其它空白字符模式共用"
6937cb4e 3387
65387fd5 3388#: diff.c:412
7aea43ff 3389#, c-format
a0b6b246
JX
3390msgid "Unknown value for 'diff.submodule' config variable: '%s'"
3391msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
7aea43ff 3392
65387fd5 3393#: diff.c:472
7aea43ff 3394#, c-format
a0b6b246
JX
3395msgid ""
3396"Found errors in 'diff.dirstat' config variable:\n"
3397"%s"
3398msgstr ""
3399"发现配置变量 'diff.dirstat' 中的错误:\n"
3400"%s"
7aea43ff 3401
65387fd5 3402#: diff.c:4237
7aea43ff 3403#, c-format
a0b6b246
JX
3404msgid "external diff died, stopping at %s"
3405msgstr "外部 diff 退出,停止在 %s"
7aea43ff 3406
65387fd5
FZ
3407#: diff.c:4589
3408#, c-format
3409msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
3410msgstr "选项 '%s'、'%s'、'%s' 和 '%s' 不能同时使用"
a0b6b246 3411
65387fd5
FZ
3412#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
3413#, c-format
3414msgid "options '%s', '%s', and '%s' cannot be used together"
3415msgstr "选项 '%s'、'%s' 和 '%s' 不能同时使用"
31e5e17b 3416
65387fd5
FZ
3417#: diff.c:4597
3418#, c-format
3419msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
3420msgstr "选项 '%1$s'、'%2$s' 不能同时使用,与 '%4$s' 一起使用 '%3$s'"
ec3d4607 3421
65387fd5
FZ
3422#: diff.c:4601
3423#, c-format
ec3d4607 3424msgid ""
65387fd5
FZ
3425"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
3426msgstr "选项 '%1$s'、'%2$s' 不能同时使用,与 '%4$s' 和 '%5$s' 一起使用 '%3$s'"
ec3d4607 3427
65387fd5 3428#: diff.c:4681
a0b6b246
JX
3429msgid "--follow requires exactly one pathspec"
3430msgstr "--follow 明确要求只跟一个路径规格"
3431
65387fd5 3432#: diff.c:4729
d46c5519
JX
3433#, c-format
3434msgid "invalid --stat value: %s"
3435msgstr "无效的 --stat 值:%s"
3436
65387fd5 3437#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
7e6630a7 3438#: parse-options.c:217 parse-options.c:221
d46c5519
JX
3439#, c-format
3440msgid "%s expects a numerical value"
3441msgstr "%s 期望一个数字值"
3442
65387fd5 3443#: diff.c:4766
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
65387fd5 3452#: diff.c:4851
d46c5519
JX
3453#, c-format
3454msgid "unknown change class '%c' in --diff-filter=%s"
3455msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
3456
65387fd5 3457#: diff.c:4875
d46c5519
JX
3458#, c-format
3459msgid "unknown value after ws-error-highlight=%.*s"
3460msgstr "ws-error-highlight=%.*s 之后未知的值"
3461
65387fd5 3462#: diff.c:4889
7aea43ff 3463#, c-format
d46c5519
JX
3464msgid "unable to resolve '%s'"
3465msgstr "不能解析 '%s'"
3466
65387fd5 3467#: diff.c:4939 diff.c:4945
d46c5519
JX
3468#, c-format
3469msgid "%s expects <n>/<m> form"
3470msgstr "%s 期望 <n>/<m> 格式"
3471
65387fd5 3472#: diff.c:4957
d46c5519
JX
3473#, c-format
3474msgid "%s expects a character, got '%s'"
3475msgstr "%s 期望一个字符,得到 '%s'"
3476
65387fd5 3477#: diff.c:4978
d46c5519
JX
3478#, c-format
3479msgid "bad --color-moved argument: %s"
3480msgstr "坏的 --color-moved 参数:%s"
3481
65387fd5 3482#: diff.c:4997
d46c5519
JX
3483#, c-format
3484msgid "invalid mode '%s' in --color-moved-ws"
3485msgstr "--color-moved-ws 中的无效模式 '%s' "
3486
65387fd5 3487#: diff.c:5037
d46c5519
JX
3488msgid ""
3489"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3490"\"histogram\""
3491msgstr ""
3492"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3493
65387fd5 3494#: diff.c:5073 diff.c:5093
d46c5519
JX
3495#, c-format
3496msgid "invalid argument to %s"
3497msgstr "%s 的参数无效"
3498
65387fd5 3499#: diff.c:5197
d13389bf
JX
3500#, c-format
3501msgid "invalid regex given to -I: '%s'"
3502msgstr "选项 -I 的正则表达式无效:'%s'"
3503
65387fd5 3504#: diff.c:5246
d46c5519
JX
3505#, c-format
3506msgid "failed to parse --submodule option parameter: '%s'"
a0b6b246 3507msgstr "无法解析 --submodule 选项的参数:'%s'"
7aea43ff 3508
65387fd5 3509#: diff.c:5302
d46c5519
JX
3510#, c-format
3511msgid "bad --word-diff argument: %s"
3512msgstr "坏的 --word-diff 参数:%s"
3513
65387fd5 3514#: diff.c:5338
d46c5519
JX
3515msgid "Diff output format options"
3516msgstr "差异输出格式化选项"
3517
65387fd5 3518#: diff.c:5340 diff.c:5346
d46c5519
JX
3519msgid "generate patch"
3520msgstr "生成补丁"
3521
65387fd5 3522#: diff.c:5343 builtin/log.c:179
d46c5519
JX
3523msgid "suppress diff output"
3524msgstr "不显示差异输出"
3525
65387fd5 3526#: diff.c:5348 diff.c:5462 diff.c:5469
d46c5519
JX
3527msgid "<n>"
3528msgstr "<n>"
3529
65387fd5 3530#: diff.c:5349 diff.c:5352
d46c5519
JX
3531msgid "generate diffs with <n> lines context"
3532msgstr "生成含 <n> 行上下文的差异"
3533
65387fd5 3534#: diff.c:5354
d46c5519
JX
3535msgid "generate the diff in raw format"
3536msgstr "生成原始格式的差异"
3537
65387fd5 3538#: diff.c:5357
d46c5519
JX
3539msgid "synonym for '-p --raw'"
3540msgstr "和 '-p --raw' 同义"
3541
65387fd5 3542#: diff.c:5361
d46c5519
JX
3543msgid "synonym for '-p --stat'"
3544msgstr "和 '-p --stat' 同义"
3545
65387fd5 3546#: diff.c:5365
d46c5519
JX
3547msgid "machine friendly --stat"
3548msgstr "机器友好的 --stat"
3549
65387fd5 3550#: diff.c:5368
d46c5519
JX
3551msgid "output only the last line of --stat"
3552msgstr "只输出 --stat 的最后一行"
3553
65387fd5 3554#: diff.c:5370 diff.c:5378
d46c5519
JX
3555msgid "<param1,param2>..."
3556msgstr "<参数1,参数2>..."
3557
65387fd5 3558#: diff.c:5371
d46c5519
JX
3559msgid ""
3560"output the distribution of relative amount of changes for each sub-directory"
3561msgstr "输出每个子目录相对变更的分布"
3562
65387fd5 3563#: diff.c:5375
d46c5519
JX
3564msgid "synonym for --dirstat=cumulative"
3565msgstr "和 --dirstat=cumulative 同义"
3566
65387fd5 3567#: diff.c:5379
d46c5519
JX
3568msgid "synonym for --dirstat=files,param1,param2..."
3569msgstr "是 --dirstat=files,param1,param2... 的同义词"
3570
65387fd5 3571#: diff.c:5383
d46c5519
JX
3572msgid "warn if changes introduce conflict markers or whitespace errors"
3573msgstr "如果变更中引入冲突定界符或空白错误,给出警告"
3574
65387fd5 3575#: diff.c:5386
d46c5519
JX
3576msgid "condensed summary such as creations, renames and mode changes"
3577msgstr "精简摘要,例如创建、重命名和模式变更"
3578
65387fd5 3579#: diff.c:5389
d46c5519
JX
3580msgid "show only names of changed files"
3581msgstr "只显示变更文件的文件名"
3582
65387fd5 3583#: diff.c:5392
d46c5519
JX
3584msgid "show only names and status of changed files"
3585msgstr "只显示变更文件的文件名和状态"
3586
65387fd5 3587#: diff.c:5394
d46c5519
JX
3588msgid "<width>[,<name-width>[,<count>]]"
3589msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
3590
65387fd5 3591#: diff.c:5395
d46c5519 3592msgid "generate diffstat"
5b533632 3593msgstr "生成差异统计(diffstat)"
d46c5519 3594
65387fd5 3595#: diff.c:5397 diff.c:5400 diff.c:5403
d46c5519
JX
3596msgid "<width>"
3597msgstr "<宽度>"
3598
65387fd5 3599#: diff.c:5398
d46c5519
JX
3600msgid "generate diffstat with a given width"
3601msgstr "使用给定的长度生成差异统计"
3602
65387fd5 3603#: diff.c:5401
d46c5519
JX
3604msgid "generate diffstat with a given name width"
3605msgstr "使用给定的文件名长度生成差异统计"
3606
65387fd5 3607#: diff.c:5404
d46c5519
JX
3608msgid "generate diffstat with a given graph width"
3609msgstr "使用给定的图形长度生成差异统计"
3610
65387fd5 3611#: diff.c:5406
d46c5519
JX
3612msgid "<count>"
3613msgstr "<次数>"
3614
65387fd5 3615#: diff.c:5407
d46c5519
JX
3616msgid "generate diffstat with limited lines"
3617msgstr "生成有限行数的差异统计"
3618
65387fd5 3619#: diff.c:5410
d46c5519
JX
3620msgid "generate compact summary in diffstat"
3621msgstr "生成差异统计的简洁摘要"
3622
65387fd5 3623#: diff.c:5413
d46c5519
JX
3624msgid "output a binary diff that can be applied"
3625msgstr "输出一个可以应用的二进制差异"
3626
65387fd5 3627#: diff.c:5416
d46c5519
JX
3628msgid "show full pre- and post-image object names on the \"index\" lines"
3629msgstr "在 \"index\" 行显示完整的前后对象名称"
3630
65387fd5 3631#: diff.c:5418
d46c5519
JX
3632msgid "show colored diff"
3633msgstr "显示带颜色的差异"
3634
65387fd5 3635#: diff.c:5419
d46c5519
JX
3636msgid "<kind>"
3637msgstr "<类型>"
3638
65387fd5 3639#: diff.c:5420
d46c5519
JX
3640msgid ""
3641"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3642"diff"
3643msgstr "对于差异中的上下文、旧的和新的行,加亮显示错误的空白字符"
3644
65387fd5 3645#: diff.c:5423
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
65387fd5 3653#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
d46c5519
JX
3654msgid "<prefix>"
3655msgstr "<前缀>"
3656
65387fd5 3657#: diff.c:5427
d46c5519
JX
3658msgid "show the given source prefix instead of \"a/\""
3659msgstr "显示给定的源前缀取代 \"a/\""
3660
65387fd5 3661#: diff.c:5430
d46c5519
JX
3662msgid "show the given destination prefix instead of \"b/\""
3663msgstr "显示给定的目标前缀取代 \"b/\""
3664
65387fd5 3665#: diff.c:5433
d46c5519
JX
3666msgid "prepend an additional prefix to every line of output"
3667msgstr "输出的每一行附加前缀"
3668
65387fd5 3669#: diff.c:5436
d46c5519
JX
3670msgid "do not show any source or destination prefix"
3671msgstr "不显示任何源和目标前缀"
3672
65387fd5 3673#: diff.c:5439
d46c5519
JX
3674msgid "show context between diff hunks up to the specified number of lines"
3675msgstr "显示指定行数的差异块间的上下文"
3676
65387fd5 3677#: diff.c:5443 diff.c:5448 diff.c:5453
d46c5519
JX
3678msgid "<char>"
3679msgstr "<字符>"
3680
65387fd5 3681#: diff.c:5444
d46c5519
JX
3682msgid "specify the character to indicate a new line instead of '+'"
3683msgstr "指定一个字符取代 '+' 来表示新的一行"
3684
65387fd5 3685#: diff.c:5449
d46c5519
JX
3686msgid "specify the character to indicate an old line instead of '-'"
3687msgstr "指定一个字符取代 '-' 来表示旧的一行"
3688
65387fd5 3689#: diff.c:5454
d46c5519
JX
3690msgid "specify the character to indicate a context instead of ' '"
3691msgstr "指定一个字符取代 ' ' 来表示一行上下文"
3692
65387fd5 3693#: diff.c:5457
d46c5519
JX
3694msgid "Diff rename options"
3695msgstr "差异重命名选项"
3696
65387fd5 3697#: diff.c:5458
d46c5519
JX
3698msgid "<n>[/<m>]"
3699msgstr "<n>[/<m>]"
3700
65387fd5 3701#: diff.c:5459
d46c5519 3702msgid "break complete rewrite changes into pairs of delete and create"
5b533632 3703msgstr "将完全重写的变更打破为成对的删除和创建"
d46c5519 3704
65387fd5 3705#: diff.c:5463
d46c5519
JX
3706msgid "detect renames"
3707msgstr "检测重命名"
3708
65387fd5 3709#: diff.c:5467
d46c5519
JX
3710msgid "omit the preimage for deletes"
3711msgstr "省略删除操作的差异输出"
3712
65387fd5 3713#: diff.c:5470
d46c5519
JX
3714msgid "detect copies"
3715msgstr "检测拷贝"
3716
65387fd5 3717#: diff.c:5474
d46c5519
JX
3718msgid "use unmodified files as source to find copies"
3719msgstr "使用未修改的文件做为发现拷贝的源"
3720
65387fd5 3721#: diff.c:5476
d46c5519
JX
3722msgid "disable rename detection"
3723msgstr "禁用重命名探测"
3724
65387fd5 3725#: diff.c:5479
d46c5519
JX
3726msgid "use empty blobs as rename source"
3727msgstr "使用空的数据对象做为重命名的源"
3728
65387fd5 3729#: diff.c:5481
d46c5519
JX
3730msgid "continue listing the history of a file beyond renames"
3731msgstr "继续列出文件重命名以外的历史记录"
3732
65387fd5 3733#: diff.c:5484
d46c5519
JX
3734msgid ""
3735"prevent rename/copy detection if the number of rename/copy targets exceeds "
3736"given limit"
3737msgstr "如果重命名/拷贝目标超过给定的限制,禁止重命名/拷贝检测"
3738
65387fd5 3739#: diff.c:5486
d46c5519
JX
3740msgid "Diff algorithm options"
3741msgstr "差异算法选项"
3742
65387fd5 3743#: diff.c:5488
d46c5519
JX
3744msgid "produce the smallest possible diff"
3745msgstr "生成尽可能小的差异"
3746
65387fd5 3747#: diff.c:5491
d46c5519
JX
3748msgid "ignore whitespace when comparing lines"
3749msgstr "行比较时忽略空白字符"
3750
65387fd5 3751#: diff.c:5494
d46c5519
JX
3752msgid "ignore changes in amount of whitespace"
3753msgstr "忽略空白字符的变更"
3754
65387fd5 3755#: diff.c:5497
d46c5519
JX
3756msgid "ignore changes in whitespace at EOL"
3757msgstr "忽略行尾的空白字符变更"
3758
65387fd5 3759#: diff.c:5500
d46c5519
JX
3760msgid "ignore carrier-return at the end of line"
3761msgstr "忽略行尾的回车符(CR)"
3762
65387fd5 3763#: diff.c:5503
d46c5519
JX
3764msgid "ignore changes whose lines are all blank"
3765msgstr "忽略整行都是空白的变更"
3766
65387fd5 3767#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
d13389bf
JX
3768msgid "<regex>"
3769msgstr "<正则>"
3770
65387fd5 3771#: diff.c:5506
d13389bf
JX
3772msgid "ignore changes whose all lines match <regex>"
3773msgstr "忽略所有行都和正则表达式匹配的变更"
3774
65387fd5 3775#: diff.c:5509
d46c5519
JX
3776msgid "heuristic to shift diff hunk boundaries for easy reading"
3777msgstr "启发式转换差异边界以便阅读"
3778
65387fd5 3779#: diff.c:5512
d46c5519
JX
3780msgid "generate diff using the \"patience diff\" algorithm"
3781msgstr "使用 \"patience diff\" 算法生成差异"
3782
65387fd5 3783#: diff.c:5516
d46c5519
JX
3784msgid "generate diff using the \"histogram diff\" algorithm"
3785msgstr "使用 \"histogram diff\" 算法生成差异"
3786
65387fd5 3787#: diff.c:5518
d46c5519
JX
3788msgid "<algorithm>"
3789msgstr "<算法>"
3790
65387fd5 3791#: diff.c:5519
d46c5519
JX
3792msgid "choose a diff algorithm"
3793msgstr "选择一个差异算法"
3794
65387fd5 3795#: diff.c:5521
d46c5519
JX
3796msgid "<text>"
3797msgstr "<文本>"
3798
65387fd5 3799#: diff.c:5522
d46c5519 3800msgid "generate diff using the \"anchored diff\" algorithm"
5b533632 3801msgstr "使用 \"anchored diff\" 算法生成差异"
d46c5519 3802
65387fd5 3803#: diff.c:5524 diff.c:5533 diff.c:5536
d46c5519
JX
3804msgid "<mode>"
3805msgstr "<模式>"
3806
65387fd5 3807#: diff.c:5525
d46c5519
JX
3808msgid "show word diff, using <mode> to delimit changed words"
3809msgstr "显示单词差异,使用 <模式> 分隔变更的单词"
3810
65387fd5 3811#: diff.c:5528
d46c5519
JX
3812msgid "use <regex> to decide what a word is"
3813msgstr "使用 <正则表达式> 确定何为一个词"
3814
65387fd5 3815#: diff.c:5531
d46c5519
JX
3816msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3817msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
3818
65387fd5 3819#: diff.c:5534
d46c5519
JX
3820msgid "moved lines of code are colored differently"
3821msgstr "移动的代码行用不同方式着色"
3822
65387fd5 3823#: diff.c:5537
d46c5519
JX
3824msgid "how white spaces are ignored in --color-moved"
3825msgstr "在 --color-moved 下如何忽略空白字符"
3826
65387fd5 3827#: diff.c:5540
d46c5519
JX
3828msgid "Other diff options"
3829msgstr "其它差异选项"
3830
65387fd5 3831#: diff.c:5542
d46c5519
JX
3832msgid "when run from subdir, exclude changes outside and show relative paths"
3833msgstr "当从子目录运行,排除目录之外的变更并显示相对路径"
3834
65387fd5 3835#: diff.c:5546
d46c5519
JX
3836msgid "treat all files as text"
3837msgstr "把所有文件当做文本处理"
3838
65387fd5 3839#: diff.c:5548
d46c5519
JX
3840msgid "swap two inputs, reverse the diff"
3841msgstr "交换两个输入,反转差异"
3842
65387fd5 3843#: diff.c:5550
d46c5519
JX
3844msgid "exit with 1 if there were differences, 0 otherwise"
3845msgstr "有差异时退出码为 1,否则为 0"
3846
65387fd5 3847#: diff.c:5552
d46c5519
JX
3848msgid "disable all output of the program"
3849msgstr "禁用本程序的所有输出"
3850
65387fd5 3851#: diff.c:5554
d46c5519
JX
3852msgid "allow an external diff helper to be executed"
3853msgstr "允许执行一个外置的差异助手"
3854
65387fd5 3855#: diff.c:5556
d46c5519
JX
3856msgid "run external text conversion filters when comparing binary files"
3857msgstr "当比较二进制文件时,运行外部的文本转换过滤器"
3858
65387fd5 3859#: diff.c:5558
d46c5519
JX
3860msgid "<when>"
3861msgstr "<何时>"
3862
65387fd5 3863#: diff.c:5559
d46c5519
JX
3864msgid "ignore changes to submodules in the diff generation"
3865msgstr "在生成差异时,忽略子模组的更改"
3866
65387fd5 3867#: diff.c:5562
d46c5519
JX
3868msgid "<format>"
3869msgstr "<格式>"
3870
65387fd5 3871#: diff.c:5563
d46c5519
JX
3872msgid "specify how differences in submodules are shown"
3873msgstr "指定子模组的差异如何显示"
3874
65387fd5 3875#: diff.c:5567
d46c5519
JX
3876msgid "hide 'git add -N' entries from the index"
3877msgstr "隐藏索引中 'git add -N' 条目"
3878
65387fd5 3879#: diff.c:5570
d46c5519
JX
3880msgid "treat 'git add -N' entries as real in the index"
3881msgstr "将索引中 'git add -N' 条目当做真实的"
3882
65387fd5 3883#: diff.c:5572
d46c5519
JX
3884msgid "<string>"
3885msgstr "<字符串>"
3886
65387fd5 3887#: diff.c:5573
d46c5519
JX
3888msgid ""
3889"look for differences that change the number of occurrences of the specified "
3890"string"
3891msgstr "查找改变了指定字符串出现次数的差异"
3892
65387fd5 3893#: diff.c:5576
d46c5519
JX
3894msgid ""
3895"look for differences that change the number of occurrences of the specified "
3896"regex"
3897msgstr "查找改变指定正则匹配出现次数的差异"
3898
65387fd5 3899#: diff.c:5579
d46c5519
JX
3900msgid "show all changes in the changeset with -S or -G"
3901msgstr "显示使用 -S 或 -G 的变更集的所有变更"
3902
65387fd5 3903#: diff.c:5582
d46c5519
JX
3904msgid "treat <string> in -S as extended POSIX regular expression"
3905msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
3906
65387fd5 3907#: diff.c:5585
d46c5519
JX
3908msgid "control the order in which files appear in the output"
3909msgstr "控制输出中的文件显示顺序"
3910
65387fd5 3911#: diff.c:5586 diff.c:5589
473eb541
JX
3912msgid "<path>"
3913msgstr "<路径>"
3914
65387fd5 3915#: diff.c:5587
473eb541
JX
3916msgid "show the change in the specified path first"
3917msgstr "先显示指定路径的变更"
3918
65387fd5 3919#: diff.c:5590
473eb541
JX
3920msgid "skip the output to the specified path"
3921msgstr "跳过指定路径的输出"
3922
65387fd5 3923#: diff.c:5592
d46c5519 3924msgid "<object-id>"
5b533632 3925msgstr "<对象 ID>"
d46c5519 3926
65387fd5 3927#: diff.c:5593
d46c5519
JX
3928msgid ""
3929"look for differences that change the number of occurrences of the specified "
3930"object"
3931msgstr "查找改变指定对象出现次数的差异"
3932
65387fd5 3933#: diff.c:5595
d46c5519
JX
3934msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3935msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
3936
65387fd5 3937#: diff.c:5596
d46c5519
JX
3938msgid "select files by diff type"
3939msgstr "通过差异类型选择文件"
3940
65387fd5 3941#: diff.c:5598
d46c5519
JX
3942msgid "<file>"
3943msgstr "<文件>"
3944
65387fd5 3945#: diff.c:5599
d46c5519
JX
3946msgid "Output to a specific file"
3947msgstr "输出到一个指定的文件"
3948
65387fd5 3949#: diff.c:6257
ec3d4607
JX
3950msgid "exhaustive rename detection was skipped due to too many files."
3951msgstr "由于文件太多,跳过详尽的重命名检查。"
a0b6b246 3952
65387fd5 3953#: diff.c:6260
a0b6b246 3954msgid "only found copies from modified paths due to too many files."
ec3d4607 3955msgstr "由于文件太多,只在修改的路径中找到了拷贝。"
a0b6b246 3956
65387fd5 3957#: diff.c:6263
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'"
65387fd5 3966msgstr "无法读取排序文件 '%s'"
349ede6a 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
65387fd5 3997#: dir.c:828
ddc12c42 3998msgid "disabling cone pattern matching"
65387fd5 3999msgstr "停用锥形模式匹配"
ddc12c42 4000
65387fd5 4001#: dir.c:1212
c1ac5258
JX
4002#, c-format
4003msgid "cannot use %s as an exclude file"
4004msgstr "不能将 %s 用作排除文件"
4005
65387fd5 4006#: dir.c:2418
31e5e17b
JX
4007#, c-format
4008msgid "could not open directory '%s'"
4009msgstr "不能打开目录 '%s'"
4010
65387fd5 4011#: dir.c:2720
a0b6b246
JX
4012msgid "failed to get kernel name and information"
4013msgstr "无法获得内核名称和信息"
7aea43ff 4014
65387fd5 4015#: dir.c:2844
c1ac5258
JX
4016msgid "untracked cache is disabled on this system or location"
4017msgstr "缓存未跟踪文件在本系统或位置中被禁用"
4018
65387fd5 4019#: dir.c:3112
7e6630a7
FZ
4020msgid ""
4021"No directory name could be guessed.\n"
4022"Please specify a directory on the command line"
4023msgstr ""
4024"无法猜到目录名。\n"
4025"请在命令行指定一个目录"
4026
65387fd5 4027#: dir.c:3800
c1ac5258
JX
4028#, c-format
4029msgid "index file corrupt in repo %s"
4030msgstr "仓库 %s 中的索引文件损坏"
7aea43ff 4031
65387fd5 4032#: dir.c:3847 dir.c:3852
87cb7997
JX
4033#, c-format
4034msgid "could not create directories for %s"
4035msgstr "不能为 %s 创建目录"
4036
65387fd5 4037#: dir.c:3881
1a79b2f1
JX
4038#, c-format
4039msgid "could not migrate git directory from '%s' to '%s'"
4040msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
4041
65387fd5 4042#: editor.c:74
5809aa05
JX
4043#, c-format
4044msgid "hint: Waiting for your editor to close the file...%c"
4045msgstr "提示:等待您的编辑器关闭文件...%c"
4046
65387fd5 4047#: entry.c:179
6937cb4e
JX
4048msgid "Filtering content"
4049msgstr "过滤内容"
4050
65387fd5 4051#: entry.c:500
87cb7997
JX
4052#, c-format
4053msgid "could not stat file '%s'"
65e2041e 4054msgstr "不能对文件 '%s' 调用 stat"
87cb7997 4055
65387fd5 4056#: environment.c:145
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
65387fd5 4066#: fetch-pack.c:194
a0b6b246
JX
4067msgid "git fetch-pack: expected shallow list"
4068msgstr "git fetch-pack:应为 shallow 列表"
4069
65387fd5 4070#: fetch-pack.c:197
06991777
JX
4071msgid "git fetch-pack: expected a flush packet after shallow list"
4072msgstr "git fetch-pack:在浅克隆列表之后期望一个 flush 包"
4073
65387fd5 4074#: fetch-pack.c:208
31e5e17b
JX
4075msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
4076msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包"
a0b6b246 4077
65387fd5 4078#: fetch-pack.c:228
90314792 4079#, c-format
275588f9 4080msgid "git fetch-pack: expected ACK/NAK, got '%s'"
a0b6b246 4081msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
90314792 4082
65387fd5 4083#: fetch-pack.c:239
d46c5519
JX
4084msgid "unable to write to remote"
4085msgstr "无法写到远程"
4086
65387fd5 4087#: fetch-pack.c:395 fetch-pack.c:1439
90314792 4088#, c-format
a0b6b246
JX
4089msgid "invalid shallow line: %s"
4090msgstr "无效的 shallow 信息:%s"
90314792 4091
65387fd5 4092#: fetch-pack.c:401 fetch-pack.c:1445
c04f5ac3 4093#, c-format
a0b6b246
JX
4094msgid "invalid unshallow line: %s"
4095msgstr "无效的 unshallow 信息:%s"
c04f5ac3 4096
65387fd5 4097#: fetch-pack.c:403 fetch-pack.c:1447
a0b6b246
JX
4098#, c-format
4099msgid "object not found: %s"
4100msgstr "对象未找到:%s"
07432cef 4101
65387fd5 4102#: fetch-pack.c:406 fetch-pack.c:1450
c04f5ac3 4103#, c-format
a0b6b246
JX
4104msgid "error in object: %s"
4105msgstr "对象中出错:%s"
07432cef 4106
65387fd5 4107#: fetch-pack.c:408 fetch-pack.c:1452
c04f5ac3 4108#, c-format
a0b6b246
JX
4109msgid "no shallow found: %s"
4110msgstr "未发现 shallow:%s"
c04f5ac3 4111
65387fd5 4112#: fetch-pack.c:411 fetch-pack.c:1456
a0b6b246
JX
4113#, c-format
4114msgid "expected shallow/unshallow, got %s"
4115msgstr "应为 shallow/unshallow,却得到 %s"
07432cef 4116
65387fd5 4117#: fetch-pack.c:451
a0b6b246
JX
4118#, c-format
4119msgid "got %s %d %s"
4120msgstr "得到 %s %d %s"
1b7f4a34 4121
65387fd5 4122#: fetch-pack.c:468
1b7f4a34 4123#, c-format
a0b6b246
JX
4124msgid "invalid commit %s"
4125msgstr "无效提交 %s"
1b7f4a34 4126
65387fd5 4127#: fetch-pack.c:499
a0b6b246
JX
4128msgid "giving up"
4129msgstr "放弃"
814ff314 4130
65387fd5 4131#: fetch-pack.c:512 progress.c:339
a0b6b246
JX
4132msgid "done"
4133msgstr "完成"
2e8451e8 4134
65387fd5 4135#: fetch-pack.c:524
2e8451e8 4136#, c-format
a0b6b246
JX
4137msgid "got %s (%d) %s"
4138msgstr "得到 %s (%d) %s"
2e8451e8 4139
65387fd5 4140#: fetch-pack.c:560
a0b6b246
JX
4141#, c-format
4142msgid "Marking %s as complete"
4143msgstr "标记 %s 为完成"
220c313c 4144
65387fd5 4145#: fetch-pack.c:775
a0b6b246
JX
4146#, c-format
4147msgid "already have %s (%s)"
29004bbb 4148msgstr "已经有 %s(%s)"
220c313c 4149
65387fd5 4150#: fetch-pack.c:861
a0b6b246
JX
4151msgid "fetch-pack: unable to fork off sideband demultiplexer"
4152msgstr "fetch-pack:无法派生 sideband 多路输出"
1b7f4a34 4153
65387fd5 4154#: fetch-pack.c:869
a0b6b246
JX
4155msgid "protocol error: bad pack header"
4156msgstr "协议错误:坏的包头"
814ff314 4157
65387fd5 4158#: fetch-pack.c:965
a0b6b246
JX
4159#, c-format
4160msgid "fetch-pack: unable to fork off %s"
4161msgstr "fetch-pack:无法派生进程 %s"
5c57d762 4162
65387fd5 4163#: fetch-pack.c:971
473eb541
JX
4164msgid "fetch-pack: invalid index-pack output"
4165msgstr "fetch-pack:无效的 index-pack 输出"
4166
65387fd5 4167#: fetch-pack.c:988
a0b6b246
JX
4168#, c-format
4169msgid "%s failed"
4170msgstr "%s 失败"
14c8bced 4171
65387fd5 4172#: fetch-pack.c:990
a0b6b246
JX
4173msgid "error in sideband demultiplexer"
4174msgstr "sideband 多路输出出错"
c04f5ac3 4175
65387fd5 4176#: fetch-pack.c:1035
81809b99 4177#, c-format
a0b6b246
JX
4178msgid "Server version is %.*s"
4179msgstr "服务器版本 %.*s"
8ada9598 4180
65387fd5
FZ
4181#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
4182#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
4183#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
4184#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
a6cd2cc4
JX
4185#, c-format
4186msgid "Server supports %s"
4187msgstr "服务器支持 %s"
4188
65387fd5 4189#: fetch-pack.c:1045
a6cd2cc4 4190msgid "Server does not support shallow clients"
9146ef75 4191msgstr "服务器不支持浅客户端"
a6cd2cc4 4192
65387fd5 4193#: fetch-pack.c:1105
a0b6b246
JX
4194msgid "Server does not support --shallow-since"
4195msgstr "服务器不支持 --shallow-since"
8ada9598 4196
65387fd5 4197#: fetch-pack.c:1110
a0b6b246
JX
4198msgid "Server does not support --shallow-exclude"
4199msgstr "服务器不支持 --shallow-exclude"
c04f5ac3 4200
65387fd5 4201#: fetch-pack.c:1114
a0b6b246
JX
4202msgid "Server does not support --deepen"
4203msgstr "服务器不支持 --deepen"
c04f5ac3 4204
65387fd5 4205#: fetch-pack.c:1116
7157c2b5
JX
4206msgid "Server does not support this repository's object format"
4207msgstr "服务器不支持这个仓库的对象格式"
4208
65387fd5 4209#: fetch-pack.c:1129
a0b6b246
JX
4210msgid "no common commits"
4211msgstr "没有共同的提交"
c04f5ac3 4212
65387fd5 4213#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
33b62fba
JX
4214msgid "source repository is shallow, reject to clone."
4215msgstr "源仓库是浅克隆,拒绝克隆。"
4216
65387fd5 4217#: fetch-pack.c:1144 fetch-pack.c:1681
a0b6b246
JX
4218msgid "git fetch-pack: fetch failed."
4219msgstr "git fetch-pack:获取失败。"
c04f5ac3 4220
65387fd5 4221#: fetch-pack.c:1258
7157c2b5
JX
4222#, c-format
4223msgid "mismatched algorithms: client %s; server %s"
4224msgstr "不匹配的算法:客户端 %s,服务端 %s"
4225
65387fd5 4226#: fetch-pack.c:1262
7157c2b5
JX
4227#, c-format
4228msgid "the server does not support algorithm '%s'"
4229msgstr "服务器不支持算法 '%s'"
4230
65387fd5 4231#: fetch-pack.c:1295
fd8cb379 4232msgid "Server does not support shallow requests"
9146ef75 4233msgstr "服务器不支持浅克隆请求"
fd8cb379 4234
65387fd5 4235#: fetch-pack.c:1302
a6cd2cc4
JX
4236msgid "Server supports filter"
4237msgstr "服务器支持 filter"
4238
65387fd5 4239#: fetch-pack.c:1345 fetch-pack.c:2063
d46c5519
JX
4240msgid "unable to write request to remote"
4241msgstr "无法将请求写到远程"
4242
65387fd5 4243#: fetch-pack.c:1363
c1ac5258
JX
4244#, c-format
4245msgid "error reading section header '%s'"
4246msgstr "读取节标题 '%s' 出错"
4247
65387fd5 4248#: fetch-pack.c:1369
c1ac5258
JX
4249#, c-format
4250msgid "expected '%s', received '%s'"
4251msgstr "预期 '%s',得到 '%s'"
4252
65387fd5 4253#: fetch-pack.c:1403
c1ac5258
JX
4254#, c-format
4255msgid "unexpected acknowledgment line: '%s'"
4256msgstr "意外的确认行:'%s'"
4257
65387fd5 4258#: fetch-pack.c:1408
c1ac5258
JX
4259#, c-format
4260msgid "error processing acks: %d"
4261msgstr "处理 ack 出错:%d"
4262
65387fd5 4263#: fetch-pack.c:1418
4c27fcb5
JX
4264msgid "expected packfile to be sent after 'ready'"
4265msgstr "预期在 'ready' 之后发送 packfile"
4266
65387fd5 4267#: fetch-pack.c:1420
4c27fcb5
JX
4268msgid "expected no other sections to be sent after no 'ready'"
4269msgstr "在没有 'ready' 不应该发送其它小节"
4270
65387fd5 4271#: fetch-pack.c:1461
c1ac5258
JX
4272#, c-format
4273msgid "error processing shallow info: %d"
4274msgstr "处理浅克隆信息出错:%d"
4275
65387fd5 4276#: fetch-pack.c:1510
c1ac5258
JX
4277#, c-format
4278msgid "expected wanted-ref, got '%s'"
4279msgstr "预期 wanted-ref,得到 '%s'"
4280
65387fd5 4281#: fetch-pack.c:1515
c1ac5258
JX
4282#, c-format
4283msgid "unexpected wanted-ref: '%s'"
4284msgstr "意外的 wanted-ref:'%s'"
4285
65387fd5 4286#: fetch-pack.c:1520
c1ac5258
JX
4287#, c-format
4288msgid "error processing wanted refs: %d"
4289msgstr "处理要获取的引用出错:%d"
4290
65387fd5 4291#: fetch-pack.c:1550
7157c2b5
JX
4292msgid "git fetch-pack: expected response end packet"
4293msgstr "git fetch-pack:预期响应结束包"
4294
65387fd5 4295#: fetch-pack.c:1959
a0b6b246
JX
4296msgid "no matching remote head"
4297msgstr "没有匹配的远程分支"
c04f5ac3 4298
65387fd5 4299#: fetch-pack.c:1982 builtin/clone.c:581
c1ac5258 4300msgid "remote did not send all necessary objects"
e640d114 4301msgstr "远程没有发送所有必需的对象"
c1ac5258 4302
65387fd5 4303#: fetch-pack.c:2085
33b62fba
JX
4304msgid "unexpected 'ready' from remote"
4305msgstr "来自远程的意外的 'ready'"
4306
65387fd5 4307#: fetch-pack.c:2108
87cb7997
JX
4308#, c-format
4309msgid "no such remote ref %s"
4310msgstr "没有这样的远程引用 %s"
4311
65387fd5 4312#: fetch-pack.c:2111
87cb7997
JX
4313#, c-format
4314msgid "Server does not allow request for unadvertised object %s"
4315msgstr "服务器不允许请求未公开的对象 %s"
4316
65387fd5
FZ
4317#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
4318#: gpg-interface.c:990
a0b6b246
JX
4319msgid "could not create temporary file"
4320msgstr "不能创建临时文件"
c04f5ac3 4321
65387fd5 4322#: gpg-interface.c:332 gpg-interface.c:460
c04f5ac3 4323#, c-format
a0b6b246
JX
4324msgid "failed writing detached signature to '%s'"
4325msgstr "无法将分离式签名写入 '%s'"
c04f5ac3 4326
65387fd5 4327#: gpg-interface.c:451
7e6630a7
FZ
4328msgid ""
4329"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
4330"signature verification"
4331msgstr "ssh 签名验证需要 gpg.ssh.allowedSignersFile 被设置且存在"
4332
65387fd5 4333#: gpg-interface.c:480
7e6630a7
FZ
4334msgid ""
4335"ssh-keygen -Y find-principals/verify is needed for ssh signature "
4336"verification (available in openssh version 8.2p1+)"
4337msgstr ""
4338"ssh 签名验证需要 ssh-keygen -Y find-principals/verify \n"
4339"(openssh 8.2p1+ 版本可用)"
4340
65387fd5 4341#: gpg-interface.c:536
7e6630a7
FZ
4342#, c-format
4343msgid "ssh signing revocation file configured but not found: %s"
4344msgstr "设置了 ssh 签名吊销文件但无法找到:%s"
4345
65387fd5 4346#: gpg-interface.c:624
7e6630a7
FZ
4347#, c-format
4348msgid "bad/incompatible signature '%s'"
4349msgstr "坏的/不兼容的签名 '%s‘"
4350
65387fd5 4351#: gpg-interface.c:801 gpg-interface.c:806
7e6630a7
FZ
4352#, c-format
4353msgid "failed to get the ssh fingerprint for key '%s'"
4354msgstr "无法得到密钥 '%s' 的 ssh 指纹"
4355
65387fd5 4356#: gpg-interface.c:829
7e6630a7
FZ
4357msgid ""
4358"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
4359msgstr "需要配置 user.signingkey 或者 gpg.ssh.defaultKeyCommand 其中之一"
4360
65387fd5 4361#: gpg-interface.c:851
7e6630a7 4362#, c-format
84bf71ea 4363msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
7e6630a7
FZ
4364msgstr "gpg.ssh.defaultKeyCommand 成功,但没有返回密钥:%s %s"
4365
65387fd5 4366#: gpg-interface.c:857
7e6630a7
FZ
4367#, c-format
4368msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
4369msgstr "gpg.ssh.defaultKeyCommand 失败:%s %s"
4370
65387fd5 4371#: gpg-interface.c:945
349ede6a 4372msgid "gpg failed to sign the data"
65387fd5 4373msgstr "gpg 无法为数据签名"
349ede6a 4374
65387fd5 4375#: gpg-interface.c:967
7e6630a7
FZ
4376msgid "user.signingkey needs to be set for ssh signing"
4377msgstr "ssh 签名需要设置 user.signingkey"
4378
65387fd5 4379#: gpg-interface.c:978
7e6630a7
FZ
4380#, c-format
4381msgid "failed writing ssh signing key to '%s'"
4382msgstr "无法将 ssh 签名密钥写入 '%s'"
4383
65387fd5 4384#: gpg-interface.c:996
7e6630a7
FZ
4385#, c-format
4386msgid "failed writing ssh signing key buffer to '%s'"
4387msgstr "无法将 ssh 签名密钥缓冲区写入 '%s'"
4388
65387fd5 4389#: gpg-interface.c:1014
7e6630a7
FZ
4390msgid ""
4391"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
4392"8.2p1+)"
4393msgstr "ssh 签名需要 ssh-keygen -Y sign (openssh 8.2p1+ 版本可用)"
4394
65387fd5 4395#: gpg-interface.c:1026
7e6630a7
FZ
4396#, c-format
4397msgid "failed reading ssh signing data buffer from '%s'"
4398msgstr "无法从 '%s' 读入 ssh 签名数据"
4399
ddc12c42 4400#: graph.c:98
1a79b2f1 4401#, c-format
ec3d4607 4402msgid "ignored invalid color '%.*s' in log.graphColors"
1a79b2f1
JX
4403msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
4404
65387fd5 4405#: grep.c:531
a5cd71ca
JX
4406msgid ""
4407"given pattern contains NULL byte (via -f <file>). This is only supported "
4408"with -P under PCRE v2"
4409msgstr ""
ddc12c42
JX
4410"给定的模式包含 NULL 字符(通过 -f <文件> 参数)。只有 PCRE v2 下的 -P 支持此"
4411"功能"
a5cd71ca 4412
65387fd5 4413#: grep.c:1942
c04f5ac3 4414#, c-format
a0b6b246
JX
4415msgid "'%s': unable to read %s"
4416msgstr "'%s':无法读取 %s"
c04f5ac3 4417
65387fd5 4418#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
33b62fba 4419#: builtin/rm.c:136
c04f5ac3 4420#, c-format
a0b6b246 4421msgid "failed to stat '%s'"
65387fd5 4422msgstr "无法对 '%s' 调用 stat"
c04f5ac3 4423
65387fd5 4424#: grep.c:1970
a0b6b246
JX
4425#, c-format
4426msgid "'%s': short read"
4427msgstr "'%s':读取不完整"
5c57d762 4428
7e6630a7 4429#: help.c:24
fd8cb379
JX
4430msgid "start a working area (see also: git help tutorial)"
4431msgstr "开始一个工作区(参见:git help tutorial)"
4432
7e6630a7 4433#: help.c:25
fd8cb379
JX
4434msgid "work on the current change (see also: git help everyday)"
4435msgstr "在当前变更上工作(参见:git help everyday)"
4436
7e6630a7 4437#: help.c:26
fd8cb379
JX
4438msgid "examine the history and state (see also: git help revisions)"
4439msgstr "检查历史和状态(参见:git help revisions)"
4440
7e6630a7 4441#: help.c:27
fd8cb379
JX
4442msgid "grow, mark and tweak your common history"
4443msgstr "扩展、标记和调校您的历史记录"
4444
7e6630a7 4445#: help.c:28
fd8cb379
JX
4446msgid "collaborate (see also: git help workflows)"
4447msgstr "协同(参见:git help workflows)"
4448
7e6630a7 4449#: help.c:32
fd8cb379
JX
4450msgid "Main Porcelain Commands"
4451msgstr "主要的上层命令"
4452
7e6630a7 4453#: help.c:33
fd8cb379
JX
4454msgid "Ancillary Commands / Manipulators"
4455msgstr "辅助命令/操作者"
4456
7e6630a7 4457#: help.c:34
fd8cb379
JX
4458msgid "Ancillary Commands / Interrogators"
4459msgstr "辅助命令/询问者"
4460
7e6630a7 4461#: help.c:35
fd8cb379
JX
4462msgid "Interacting with Others"
4463msgstr "与其它系统交互"
4464
7e6630a7 4465#: help.c:36
fd8cb379
JX
4466msgid "Low-level Commands / Manipulators"
4467msgstr "低级命令/操作者"
4468
7e6630a7 4469#: help.c:37
fd8cb379
JX
4470msgid "Low-level Commands / Interrogators"
4471msgstr "低级命令/询问者"
4472
7e6630a7 4473#: help.c:38
ddc12c42 4474msgid "Low-level Commands / Syncing Repositories"
fd8cb379
JX
4475msgstr "低级命令/同步仓库"
4476
7e6630a7 4477#: help.c:39
fd8cb379
JX
4478msgid "Low-level Commands / Internal Helpers"
4479msgstr "低级命令/内部助手"
4480
7e6630a7 4481#: help.c:313
a0b6b246
JX
4482#, c-format
4483msgid "available git commands in '%s'"
4484msgstr "在 '%s' 下可用的 git 命令"
c04f5ac3 4485
7e6630a7 4486#: help.c:320
a0b6b246
JX
4487msgid "git commands available from elsewhere on your $PATH"
4488msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
5c57d762 4489
7e6630a7 4490#: help.c:329
a0b6b246
JX
4491msgid "These are common Git commands used in various situations:"
4492msgstr "这些是各种场合常见的 Git 命令:"
5c57d762 4493
7e6630a7 4494#: help.c:378 git.c:100
fd8cb379
JX
4495#, c-format
4496msgid "unsupported command listing type '%s'"
4497msgstr "不支持的命令列表类型 '%s'"
4498
7e6630a7 4499#: help.c:418
d9488fea
JX
4500msgid "The Git concept guides are:"
4501msgstr "Git 概念向导有:"
fd8cb379 4502
7e6630a7 4503#: help.c:442
4c27fcb5
JX
4504msgid "See 'git help <command>' to read about a specific subcommand"
4505msgstr "执行 'git help <command>' 来查看特定子命令"
4506
7e6630a7 4507#: help.c:447
4c27fcb5
JX
4508msgid "External commands"
4509msgstr "外部命令"
4510
7e6630a7 4511#: help.c:462
4c27fcb5
JX
4512msgid "Command aliases"
4513msgstr "命令别名"
4514
7e6630a7 4515#: help.c:543
c04f5ac3 4516#, c-format
a0b6b246
JX
4517msgid ""
4518"'%s' appears to be a git command, but we were not\n"
4519"able to execute it. Maybe git-%s is broken?"
4520msgstr ""
4521"'%s' 像是一个 git 命令,但却无法运行。\n"
4522"可能是 git-%s 受损?"
c04f5ac3 4523
7e6630a7 4524#: help.c:565 help.c:662
d13389bf
JX
4525#, c-format
4526msgid "git: '%s' is not a git command. See 'git --help'."
4527msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
4528
7e6630a7 4529#: help.c:613
a0b6b246
JX
4530msgid "Uh oh. Your system reports no Git commands at all."
4531msgstr "唉呀,您的系统中未发现 Git 命令。"
c04f5ac3 4532
7e6630a7 4533#: help.c:635
c04f5ac3 4534#, c-format
a4f16749 4535msgid "WARNING: You called a Git command named '%s', which does not exist."
554e8501 4536msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。"
a4f16749 4537
7e6630a7 4538#: help.c:640
a4f16749
JX
4539#, c-format
4540msgid "Continuing under the assumption that you meant '%s'."
7e6630a7
FZ
4541msgstr "假定您想要的是 '%s' 并继续。"
4542
4543#: help.c:646
4544#, c-format
65387fd5
FZ
4545msgid "Run '%s' instead [y/N]? "
4546msgstr "取而代之运行 '%s' [y/N]?"
c04f5ac3 4547
7e6630a7 4548#: help.c:654
c04f5ac3 4549#, c-format
a4f16749 4550msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
7e6630a7 4551msgstr "假定您想要的是 '%2$s',在 %1$0.1f 秒钟后继续。"
c04f5ac3 4552
7e6630a7 4553#: help.c:666
a4f16749
JX
4554msgid ""
4555"\n"
4556"The most similar command is"
4557msgid_plural ""
4558"\n"
4559"The most similar commands are"
6937cb4e
JX
4560msgstr[0] ""
4561"\n"
4562"最相似的命令是"
4563msgstr[1] ""
4564"\n"
4565"最相似的命令是"
a4f16749 4566
7e6630a7 4567#: help.c:706
a4f16749
JX
4568msgid "git version [<options>]"
4569msgstr "git version [<选项>]"
4570
7e6630a7 4571#: help.c:761
a4f16749
JX
4572#, c-format
4573msgid "%s: %s - %s"
4574msgstr "%s:%s - %s"
4575
7e6630a7 4576#: help.c:765
a0b6b246
JX
4577msgid ""
4578"\n"
4579"Did you mean this?"
4580msgid_plural ""
4581"\n"
4582"Did you mean one of these?"
4583msgstr[0] ""
4584"\n"
4585"您指的是这个么?"
4586msgstr[1] ""
4587"\n"
4588"您指的是这其中的某一个么?"
c04f5ac3 4589
7e6630a7
FZ
4590#: hook.c:27
4591#, c-format
4592msgid ""
4593"The '%s' hook was ignored because it's not set as executable.\n"
4594"You can disable this warning with `git config advice.ignoredHook false`."
4595msgstr ""
4596"因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n"
4597"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
4598
d9488fea
JX
4599#: ident.c:353
4600msgid "Author identity unknown\n"
4601msgstr "作者身份未知\n"
4602
4603#: ident.c:356
4604msgid "Committer identity unknown\n"
4605msgstr "提交者身份未知\n"
4606
4607#: ident.c:362
a0b6b246
JX
4608msgid ""
4609"\n"
4610"*** Please tell me who you are.\n"
4611"\n"
4612"Run\n"
4613"\n"
4614" git config --global user.email \"you@example.com\"\n"
4615" git config --global user.name \"Your Name\"\n"
4616"\n"
4617"to set your account's default identity.\n"
4618"Omit --global to set the identity only in this repository.\n"
4619"\n"
4620msgstr ""
4621"\n"
7e6630a7 4622"*** 请告诉我您是谁。\n"
a0b6b246
JX
4623"\n"
4624"运行\n"
4625"\n"
4626" git config --global user.email \"you@example.com\"\n"
4627" git config --global user.name \"Your Name\"\n"
4628"\n"
4629"来设置您账号的缺省身份标识。\n"
4630"如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
c04f5ac3 4631
d9488fea 4632#: ident.c:397
87cb7997 4633msgid "no email was given and auto-detection is disabled"
65e2041e 4634msgstr "未提供邮件地址且自动探测被禁用"
87cb7997 4635
d9488fea 4636#: ident.c:402
87cb7997
JX
4637#, c-format
4638msgid "unable to auto-detect email address (got '%s')"
4639msgstr "无法自动探测邮件地址(得到 '%s')"
4640
d9488fea 4641#: ident.c:419
87cb7997
JX
4642msgid "no name was given and auto-detection is disabled"
4643msgstr "未提供姓名且自动探测被禁用"
4644
d9488fea 4645#: ident.c:425
87cb7997
JX
4646#, c-format
4647msgid "unable to auto-detect name (got '%s')"
4648msgstr "无法自动探测姓名(得到 '%s')"
4649
d9488fea 4650#: ident.c:433
87cb7997
JX
4651#, c-format
4652msgid "empty ident name (for <%s>) not allowed"
4653msgstr "不允许空的姓名(对于 <%s>)"
4654
d9488fea 4655#: ident.c:439
87cb7997
JX
4656#, c-format
4657msgid "name consists only of disallowed characters: %s"
4658msgstr "姓名中仅包含禁用字符:%s"
4659
7e6630a7 4660#: ident.c:454 builtin/commit.c:648
87cb7997
JX
4661#, c-format
4662msgid "invalid date format: %s"
4663msgstr "无效的日期格式:%s"
4664
33b62fba 4665#: list-objects-filter-options.c:83
06991777
JX
4666msgid "expected 'tree:<depth>'"
4667msgstr "期望 'tree:<深度>'"
4c27fcb5 4668
33b62fba 4669#: list-objects-filter-options.c:98
d46c5519
JX
4670msgid "sparse:path filters support has been dropped"
4671msgstr "sparse:path 过滤器支持已被删除"
4672
33b62fba
JX
4673#: list-objects-filter-options.c:105
4674#, c-format
ec3d4607 4675msgid "'%s' for 'object:type=<type>' is not a valid object type"
33b62fba
JX
4676msgstr "'object:type=<type>' 的值 '%s' 不是有效的对象类型"
4677
4678#: list-objects-filter-options.c:124
a6cd2cc4
JX
4679#, c-format
4680msgid "invalid filter-spec '%s'"
4681msgstr "无效的过滤器表达式 '%s'"
4682
33b62fba 4683#: list-objects-filter-options.c:140
a5cd71ca
JX
4684#, c-format
4685msgid "must escape char in sub-filter-spec: '%c'"
4686msgstr "必须对 sub-filter-spec 中的字符进行转义:'%c'"
4687
33b62fba 4688#: list-objects-filter-options.c:182
a5cd71ca
JX
4689msgid "expected something after combine:"
4690msgstr "期望在组合后有一些东西:"
4691
33b62fba 4692#: list-objects-filter-options.c:264
a5cd71ca
JX
4693msgid "multiple filter-specs cannot be combined"
4694msgstr "不能混用多种过滤规格"
5809aa05 4695
33b62fba 4696#: list-objects-filter-options.c:376
7157c2b5
JX
4697msgid "unable to upgrade repository format to support partial clone"
4698msgstr "无法升级仓库格式以支持部分克隆"
4699
33b62fba 4700#: list-objects-filter.c:532
349ede6a
JX
4701#, c-format
4702msgid "unable to access sparse blob in '%s'"
4703msgstr "不能访问 '%s' 中的稀疏数据对象"
4704
33b62fba 4705#: list-objects-filter.c:535
349ede6a
JX
4706#, c-format
4707msgid "unable to parse sparse filter data in %s"
4708msgstr "无法解析 %s 中的稀疏过滤器数据"
4709
4710#: list-objects.c:127
4711#, c-format
4712msgid "entry '%s' in tree %s has tree mode, but is not a tree"
4713msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式,但不是一个树对象"
4714
4715#: list-objects.c:140
4716#, c-format
4717msgid "entry '%s' in tree %s has blob mode, but is not a blob"
4718msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式,但不是一个数据对象"
4719
ec3d4607 4720#: list-objects.c:398
349ede6a
JX
4721#, c-format
4722msgid "unable to load root tree for commit %s"
4723msgstr "无法为提交 %s 加载根树"
4724
4725#: lockfile.c:152
c04f5ac3 4726#, c-format
a0b6b246
JX
4727msgid ""
4728"Unable to create '%s.lock': %s.\n"
4729"\n"
4730"Another git process seems to be running in this repository, e.g.\n"
4731"an editor opened by 'git commit'. Please make sure all processes\n"
4732"are terminated then try again. If it still fails, a git process\n"
4733"may have crashed in this repository earlier:\n"
4734"remove the file manually to continue."
4735msgstr ""
4736"无法创建 '%s.lock':%s。\n"
4737"\n"
4738"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
4739"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
4740"可能之前有一个 git 进程在这个仓库中异常退出:\n"
4741"手动删除这个文件再继续。"
c04f5ac3 4742
349ede6a 4743#: lockfile.c:160
a0b6b246
JX
4744#, c-format
4745msgid "Unable to create '%s.lock': %s"
4746msgstr "不能创建 '%s.lock':%s"
c04f5ac3 4747
473eb541
JX
4748#: ls-refs.c:37
4749#, c-format
4750msgid "invalid value '%s' for lsrefs.unborn"
4751msgstr "lsrefs.unborn 的取值 '%s' 无效"
4752
7e6630a7
FZ
4753#: ls-refs.c:174
4754#, c-format
4755msgid "unexpected line: '%s'"
4756msgstr "意外的行:'%s'"
4757
4758#: ls-refs.c:178
349ede6a
JX
4759msgid "expected flush after ls-refs arguments"
4760msgstr "在 ls-refs 参数后应该有一个 flush 包"
c04f5ac3 4761
33b62fba
JX
4762#: mailinfo.c:1050
4763msgid "quoted CRLF detected"
7b4d4954 4764msgstr "检测到被引用的 CRLF"
33b62fba 4765
65387fd5 4766#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
33b62fba
JX
4767#, c-format
4768msgid "bad action '%s' for '%s'"
4769msgstr "'%2$s' 的错误动作 '%1$s'"
4770
7e6630a7 4771#: merge-ort.c:1584 merge-recursive.c:1211
473eb541
JX
4772#, c-format
4773msgid "Failed to merge submodule %s (not checked out)"
4774msgstr "无法合并子模组 %s (没有检出)"
4775
7e6630a7 4776#: merge-ort.c:1593 merge-recursive.c:1218
473eb541
JX
4777#, c-format
4778msgid "Failed to merge submodule %s (commits not present)"
4779msgstr "无法合并子模组 %s(提交不存在)"
4780
7e6630a7 4781#: merge-ort.c:1602 merge-recursive.c:1225
473eb541
JX
4782#, c-format
4783msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4784msgstr "无法合并子模组 %s (提交未跟随合并基线)"
4785
7e6630a7 4786#: merge-ort.c:1612 merge-ort.c:1620
473eb541
JX
4787#, c-format
4788msgid "Note: Fast-forwarding submodule %s to %s"
4789msgstr "注意:快进子模组 %s 到 %s"
4790
7e6630a7 4791#: merge-ort.c:1642
473eb541
JX
4792#, c-format
4793msgid "Failed to merge submodule %s"
4794msgstr "无法合并子模组 %s"
4795
7e6630a7 4796#: merge-ort.c:1649
473eb541
JX
4797#, c-format
4798msgid ""
4799"Failed to merge submodule %s, but a possible merge resolution exists:\n"
4800"%s\n"
4801msgstr ""
4802"无法合并子模组 %s,但是存在一个可能的合并方案:\n"
4803"%s\n"
4804
7e6630a7 4805#: merge-ort.c:1653 merge-recursive.c:1281
473eb541
JX
4806#, c-format
4807msgid ""
4808"If this is correct simply add it to the index for example\n"
4809"by using:\n"
4810"\n"
4811" git update-index --cacheinfo 160000 %s \"%s\"\n"
4812"\n"
4813"which will accept this suggestion.\n"
4814msgstr ""
4815"如果这个正确,将其添加到索引,例如使用命令:\n"
4816"\n"
4817" git update-index --cacheinfo 160000 %s \"%s\"\n"
4818"\n"
4819"以接受此建议。\n"
4820
7e6630a7 4821#: merge-ort.c:1666
473eb541
JX
4822#, c-format
4823msgid ""
4824"Failed to merge submodule %s, but multiple possible merges exist:\n"
4825"%s"
4826msgstr ""
4827"无法合并子模组 %s,但是存在多个可能的合并:\n"
4828"%s"
4829
7e6630a7 4830#: merge-ort.c:1887 merge-recursive.c:1372
473eb541
JX
4831msgid "Failed to execute internal merge"
4832msgstr "无法执行内部合并"
4833
7e6630a7 4834#: merge-ort.c:1892 merge-recursive.c:1377
473eb541
JX
4835#, c-format
4836msgid "Unable to add %s to database"
4837msgstr "不能添加 %s 至对象库"
4838
7e6630a7 4839#: merge-ort.c:1899 merge-recursive.c:1410
473eb541
JX
4840#, c-format
4841msgid "Auto-merging %s"
4842msgstr "自动合并 %s"
4843
7e6630a7 4844#: merge-ort.c:2038 merge-recursive.c:2132
473eb541
JX
4845#, c-format
4846msgid ""
4847"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
4848"implicit directory rename(s) putting the following path(s) there: %s."
4849msgstr ""
4850"冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放"
4851"在:%s。"
4852
7e6630a7 4853#: merge-ort.c:2048 merge-recursive.c:2142
473eb541
JX
4854#, c-format
4855msgid ""
4856"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
4857"implicit directory renames tried to put these paths there: %s"
4858msgstr ""
4859"冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路"
4860"径放置于此:%s"
4861
7e6630a7 4862#: merge-ort.c:2106
473eb541
JX
4863#, c-format
4864msgid ""
4865"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
4866"renamed to multiple other directories, with no destination getting a "
4867"majority of the files."
33b62fba
JX
4868msgstr ""
4869"冲突(分割的目录重命名):不清楚重命名 %s 到哪里,因为它被重命名到多个其他目"
4870"录中,没有一个目标目录中包含多数文件。"
473eb541 4871
7e6630a7 4872#: merge-ort.c:2260 merge-recursive.c:2478
473eb541
JX
4873#, c-format
4874msgid ""
4875"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4876"renamed."
4877msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。"
4878
7e6630a7 4879#: merge-ort.c:2400 merge-recursive.c:3261
473eb541
JX
4880#, c-format
4881msgid ""
4882"Path updated: %s added in %s inside a directory that was renamed in %s; "
4883"moving it to %s."
4884msgstr ""
4885"路径已更新:%s 添加到 %s,位于一个被重命名到 %s 的目录中,将其移动到 %s。"
4886
7e6630a7 4887#: merge-ort.c:2407 merge-recursive.c:3268
473eb541
JX
4888#, c-format
4889msgid ""
4890"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
4891"%s; moving it to %s."
4892msgstr ""
4893"路径已更新:%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,将其移"
4894"动到 %5$s。"
4895
7e6630a7 4896#: merge-ort.c:2420 merge-recursive.c:3264
473eb541
JX
4897#, c-format
4898msgid ""
4899"CONFLICT (file location): %s added in %s inside a directory that was renamed "
4900"in %s, suggesting it should perhaps be moved to %s."
4901msgstr ""
4902"冲突(文件位置):%s 添加到 %s,位于一个被重命名为 %s 的目录中,建议将其移动"
4903"到 %s。"
4904
7e6630a7 4905#: merge-ort.c:2428 merge-recursive.c:3271
473eb541
JX
4906#, c-format
4907msgid ""
4908"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
4909"was renamed in %s, suggesting it should perhaps be moved to %s."
4910msgstr ""
4911"冲突(文件位置):%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,"
4912"建议将其移动到 %5$s。"
4913
7e6630a7 4914#: merge-ort.c:2584
473eb541
JX
4915#, c-format
4916msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
33b62fba
JX
4917msgstr ""
4918"冲突(重命名/重命名):%1$s 重命名为 %3$s 中的 %2$s,以及在 %5$s 中的 %4$s。"
473eb541 4919
7e6630a7 4920#: merge-ort.c:2679
473eb541
JX
4921#, c-format
4922msgid ""
4923"CONFLICT (rename involved in collision): rename of %s -> %s has content "
4924"conflicts AND collides with another path; this may result in nested conflict "
4925"markers."
33b62fba
JX
4926msgstr ""
4927"冲突(重命名卷入冲突):重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞,这"
4928"可能导致嵌套的冲突标签。"
473eb541 4929
7e6630a7 4930#: merge-ort.c:2698 merge-ort.c:2722
473eb541
JX
4931#, c-format
4932msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
4933msgstr "冲突(重命名/删除):%1$s 在 %3$s 中重命名为 %2$s,但在 %4$s 中删除。"
4934
7e6630a7 4935#: merge-ort.c:3212 merge-recursive.c:3022
33b62fba
JX
4936#, c-format
4937msgid "cannot read object %s"
4938msgstr "不能读取对象 %s"
4939
7e6630a7 4940#: merge-ort.c:3215 merge-recursive.c:3025
33b62fba
JX
4941#, c-format
4942msgid "object %s is not a blob"
4943msgstr "对象 %s 不是一个数据对象"
4944
7e6630a7 4945#: merge-ort.c:3644
473eb541
JX
4946#, c-format
4947msgid ""
4948"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
4949"%s instead."
4950msgstr "冲突(文件/目录):目录已存在于 %2$s 中的 %1$s,将其移动到 %3$s。"
4951
7e6630a7 4952#: merge-ort.c:3721
473eb541
JX
4953#, c-format
4954msgid ""
33b62fba 4955"CONFLICT (distinct types): %s had different types on each side; renamed both "
473eb541 4956"of them so each can be recorded somewhere."
ec3d4607
JX
4957msgstr ""
4958"冲突(不同类型):%s 在两侧有不同的类型,将两者都重命名以便它们能记录在不同位"
4959"置。"
473eb541 4960
7e6630a7 4961#: merge-ort.c:3728
33b62fba
JX
4962#, c-format
4963msgid ""
4964"CONFLICT (distinct types): %s had different types on each side; renamed one "
4965"of them so each can be recorded somewhere."
ec3d4607
JX
4966msgstr ""
4967"冲突(不同类型):%s 在两侧有不同的类型,将其中之一重命名以便它们能记录在不同"
4968"位置。"
473eb541 4969
7e6630a7 4970#: merge-ort.c:3819 merge-recursive.c:3101
473eb541
JX
4971msgid "content"
4972msgstr "内容"
4973
7e6630a7 4974#: merge-ort.c:3821 merge-recursive.c:3105
473eb541
JX
4975msgid "add/add"
4976msgstr "添加/添加"
4977
7e6630a7 4978#: merge-ort.c:3823 merge-recursive.c:3150
473eb541
JX
4979msgid "submodule"
4980msgstr "子模组"
4981
7e6630a7 4982#: merge-ort.c:3825 merge-recursive.c:3151
473eb541
JX
4983#, c-format
4984msgid "CONFLICT (%s): Merge conflict in %s"
4985msgstr "冲突(%s):合并冲突于 %s"
4986
65387fd5 4987#: merge-ort.c:3869
473eb541
JX
4988#, c-format
4989msgid ""
4990"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
4991"of %s left in tree."
33b62fba
JX
4992msgstr ""
4993"冲突(修改/删除):%1$s 在 %2$s 中被删除,在 %3$s 中被修改。%5$s 的 %4$s 版本"
4994"在树中被保留。"
4995
65387fd5 4996#: merge-ort.c:4165
33b62fba
JX
4997#, c-format
4998msgid ""
4999"Note: %s not up to date and in way of checking out conflicted version; old "
5000"copy renamed to %s"
7b4d4954 5001msgstr "注意:%s 不是最新的,并且与要检出的版本冲突。旧副本重命名为 %s"
473eb541
JX
5002
5003#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
5004#. base, and 2-3) the trees for the two trees we're merging.
5005#.
65387fd5 5006#: merge-ort.c:4534
473eb541
JX
5007#, c-format
5008msgid "collecting merge info failed for trees %s, %s, %s"
5009msgstr "无法收集树 %s、%s、%s 的合并信息"
5010
7e6630a7 5011#: merge-ort-wrappers.c:13 merge-recursive.c:3716
d13389bf
JX
5012#, c-format
5013msgid ""
5014"Your local changes to the following files would be overwritten by merge:\n"
5015" %s"
5016msgstr ""
5017"您对下列文件的本地修改将被合并操作覆盖:\n"
5018" %s"
5019
65387fd5 5020#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
33b62fba
JX
5021msgid "Already up to date."
5022msgstr "已经是最新的。"
d13389bf 5023
7e6630a7 5024#: merge-recursive.c:353
a0b6b246
JX
5025msgid "(bad commit)\n"
5026msgstr "(坏提交)\n"
c04f5ac3 5027
7e6630a7 5028#: merge-recursive.c:381
a0b6b246 5029#, c-format
fd8cb379 5030msgid "add_cacheinfo failed for path '%s'; merge aborting."
0fcd668f 5031msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。"
c04f5ac3 5032
7e6630a7 5033#: merge-recursive.c:390
fd8cb379
JX
5034#, c-format
5035msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
0fcd668f 5036msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。"
fd8cb379 5037
7e6630a7 5038#: merge-recursive.c:881
c04f5ac3 5039#, c-format
a0b6b246 5040msgid "failed to create path '%s'%s"
65387fd5 5041msgstr "无法创建路径 '%s'%s"
c04f5ac3 5042
7e6630a7 5043#: merge-recursive.c:892
c04f5ac3 5044#, c-format
a0b6b246
JX
5045msgid "Removing %s to make room for subdirectory\n"
5046msgstr "删除 %s 以便为子目录留出空间\n"
c04f5ac3 5047
7e6630a7 5048#: merge-recursive.c:906 merge-recursive.c:925
a0b6b246
JX
5049msgid ": perhaps a D/F conflict?"
5050msgstr ":可能是一个目录/文件冲突?"
c04f5ac3 5051
7e6630a7 5052#: merge-recursive.c:915
c04f5ac3 5053#, c-format
a0b6b246
JX
5054msgid "refusing to lose untracked file at '%s'"
5055msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
c04f5ac3 5056
7e6630a7 5057#: merge-recursive.c:956 builtin/cat-file.c:41
c04f5ac3 5058#, c-format
a0b6b246
JX
5059msgid "cannot read object %s '%s'"
5060msgstr "不能读取对象 %s '%s'"
c04f5ac3 5061
7e6630a7 5062#: merge-recursive.c:961
4dcdc3d8 5063#, c-format
a0b6b246
JX
5064msgid "blob expected for %s '%s'"
5065msgstr "%s '%s' 应为数据对象"
4dcdc3d8 5066
7e6630a7 5067#: merge-recursive.c:986
4dcdc3d8 5068#, c-format
a0b6b246 5069msgid "failed to open '%s': %s"
65387fd5 5070msgstr "无法打开 '%s':%s"
4dcdc3d8 5071
7e6630a7 5072#: merge-recursive.c:997
a0b6b246
JX
5073#, c-format
5074msgid "failed to symlink '%s': %s"
65387fd5 5075msgstr "无法创建符号链接 '%s':%s"
c04f5ac3 5076
7e6630a7 5077#: merge-recursive.c:1002
5c57d762 5078#, c-format
a0b6b246
JX
5079msgid "do not know what to do with %06o %s '%s'"
5080msgstr "不知道如何处理 %06o %s '%s'"
5c57d762 5081
7e6630a7 5082#: merge-recursive.c:1233 merge-recursive.c:1246
fd8cb379
JX
5083#, c-format
5084msgid "Fast-forwarding submodule %s to the following commit:"
5085msgstr "子模组 %s 快进到如下提交:"
5086
7e6630a7 5087#: merge-recursive.c:1236 merge-recursive.c:1249
fd8cb379
JX
5088#, c-format
5089msgid "Fast-forwarding submodule %s"
5090msgstr "快进子模组 %s"
5091
7e6630a7 5092#: merge-recursive.c:1273
fd8cb379
JX
5093#, c-format
5094msgid "Failed to merge submodule %s (merge following commits not found)"
5095msgstr "无法合并子模组 %s (没发现合并跟随的提交)"
5096
7e6630a7 5097#: merge-recursive.c:1277
fd8cb379
JX
5098#, c-format
5099msgid "Failed to merge submodule %s (not fast-forward)"
5100msgstr "无法合并子模组 %s(非快进)"
5101
7e6630a7 5102#: merge-recursive.c:1278
fd8cb379
JX
5103msgid "Found a possible merge resolution for the submodule:\n"
5104msgstr "找到子模组的一个可能的合并方案:\n"
5105
7e6630a7 5106#: merge-recursive.c:1290
fd8cb379
JX
5107#, c-format
5108msgid "Failed to merge submodule %s (multiple merges found)"
5109msgstr "无法合并子模组 %s (发现多个合并)"
5110
7e6630a7 5111#: merge-recursive.c:1434
fd8cb379
JX
5112#, c-format
5113msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
5114msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。"
5115
7e6630a7 5116#: merge-recursive.c:1506
5c57d762
JX
5117#, c-format
5118msgid ""
a0b6b246
JX
5119"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
5120"in tree."
5c57d762 5121msgstr ""
87cb7997
JX
5122"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
5123"本被保留。"
5124
7e6630a7 5125#: merge-recursive.c:1511
87cb7997
JX
5126#, c-format
5127msgid ""
5128"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
5129"left in tree."
5130msgstr ""
5131"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
5132"%7$s 版本被保留。"
c04f5ac3 5133
7e6630a7 5134#: merge-recursive.c:1518
7aea43ff 5135#, c-format
a0b6b246
JX
5136msgid ""
5137"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
5138"in tree at %s."
5139msgstr ""
87cb7997
JX
5140"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
5141"本保留在 %8$s 中。"
7aea43ff 5142
7e6630a7 5143#: merge-recursive.c:1523
87cb7997
JX
5144#, c-format
5145msgid ""
5146"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
5147"left in tree at %s."
5148msgstr ""
5149"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
5150"%7$s 版本保留在 %9$s 中。"
5151
7e6630a7 5152#: merge-recursive.c:1558
a0b6b246
JX
5153msgid "rename"
5154msgstr "重命名"
5b04ee3b 5155
7e6630a7 5156#: merge-recursive.c:1558
a0b6b246
JX
5157msgid "renamed"
5158msgstr "重命名"
5b04ee3b 5159
7e6630a7 5160#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
fd8cb379
JX
5161#, c-format
5162msgid "Refusing to lose dirty file at %s"
5163msgstr "拒绝丢失脏文件 '%s'"
5164
7e6630a7 5165#: merge-recursive.c:1619
06991777
JX
5166#, c-format
5167msgid "Refusing to lose untracked file at %s, even though it's in the way."
5168msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。"
5169
7e6630a7 5170#: merge-recursive.c:1677
06991777
JX
5171#, c-format
5172msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
5173msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
5174
7e6630a7 5175#: merge-recursive.c:1708
5c57d762 5176#, c-format
a0b6b246
JX
5177msgid "%s is a directory in %s adding as %s instead"
5178msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
5c57d762 5179
7e6630a7 5180#: merge-recursive.c:1713
fd8cb379
JX
5181#, c-format
5182msgid "Refusing to lose untracked file at %s; adding as %s instead"
5183msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s"
5184
7e6630a7 5185#: merge-recursive.c:1740
5c57d762
JX
5186#, c-format
5187msgid ""
a0b6b246
JX
5188"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
5189"\"->\"%s\" in \"%s\"%s"
5c57d762 5190msgstr ""
a0b6b246
JX
5191"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
5192"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
5c57d762 5193
7e6630a7 5194#: merge-recursive.c:1745
a0b6b246
JX
5195msgid " (left unresolved)"
5196msgstr "(留下未解决)"
5c57d762 5197
7e6630a7 5198#: merge-recursive.c:1837
5c57d762 5199#, c-format
a0b6b246 5200msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
5c57d762 5201msgstr ""
a0b6b246
JX
5202"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
5203"%5$s"
3495628d 5204
7e6630a7 5205#: merge-recursive.c:2100
fd8cb379
JX
5206#, c-format
5207msgid ""
5208"CONFLICT (directory rename split): Unclear where to place %s because "
5209"directory %s was renamed to multiple other directories, with no destination "
5210"getting a majority of the files."
c1ac5258
JX
5211msgstr ""
5212"冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个"
5213"其它目录,没有目录包含大部分文件。"
fd8cb379 5214
7e6630a7 5215#: merge-recursive.c:2234
fd8cb379
JX
5216#, c-format
5217msgid ""
5218"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
5219">%s in %s"
5220msgstr ""
5221"冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 "
5222"%4$s->%5$s"
5223
7e6630a7 5224#: merge-recursive.c:3089
a0b6b246
JX
5225msgid "modify"
5226msgstr "修改"
90314792 5227
7e6630a7 5228#: merge-recursive.c:3089
a0b6b246
JX
5229msgid "modified"
5230msgstr "修改"
5b04ee3b 5231
7e6630a7 5232#: merge-recursive.c:3128
220c313c 5233#, c-format
a0b6b246
JX
5234msgid "Skipped %s (merged same as existing)"
5235msgstr "略过 %s(已经做过相同合并)"
220c313c 5236
7e6630a7 5237#: merge-recursive.c:3181
220c313c 5238#, c-format
06991777
JX
5239msgid "Adding as %s instead"
5240msgstr "而是以 %s 为名添加"
5241
7e6630a7 5242#: merge-recursive.c:3385
d46c5519
JX
5243#, c-format
5244msgid "Removing %s"
5245msgstr "删除 %s"
5246
7e6630a7 5247#: merge-recursive.c:3408
d46c5519
JX
5248msgid "file/directory"
5249msgstr "文件/目录"
220c313c 5250
7e6630a7 5251#: merge-recursive.c:3413
a0b6b246
JX
5252msgid "directory/file"
5253msgstr "目录/文件"
276ceeaa 5254
7e6630a7 5255#: merge-recursive.c:3420
276ceeaa 5256#, c-format
a0b6b246
JX
5257msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
5258msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
276ceeaa 5259
7e6630a7 5260#: merge-recursive.c:3429
276ceeaa 5261#, c-format
a0b6b246
JX
5262msgid "Adding %s"
5263msgstr "添加 %s"
276ceeaa 5264
7e6630a7 5265#: merge-recursive.c:3438
06991777
JX
5266#, c-format
5267msgid "CONFLICT (add/add): Merge conflict in %s"
5268msgstr "冲突(add/add):合并冲突于 %s"
5269
7e6630a7 5270#: merge-recursive.c:3491
276ceeaa 5271#, c-format
a0b6b246
JX
5272msgid "merging of trees %s and %s failed"
5273msgstr "无法合并树 %s 和 %s"
276ceeaa 5274
7e6630a7 5275#: merge-recursive.c:3585
a0b6b246
JX
5276msgid "Merging:"
5277msgstr "合并:"
5c57d762 5278
7e6630a7 5279#: merge-recursive.c:3598
5c57d762 5280#, c-format
a0b6b246
JX
5281msgid "found %u common ancestor:"
5282msgid_plural "found %u common ancestors:"
5283msgstr[0] "发现 %u 个共同祖先:"
5284msgstr[1] "发现 %u 个共同祖先:"
5285
7e6630a7 5286#: merge-recursive.c:3648
a0b6b246
JX
5287msgid "merge returned no commit"
5288msgstr "合并未返回提交"
5289
7e6630a7 5290#: merge-recursive.c:3816
5c57d762 5291#, c-format
a0b6b246
JX
5292msgid "Could not parse object '%s'"
5293msgstr "不能解析对象 '%s'"
5c57d762 5294
65387fd5 5295#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
7e6630a7 5296#: builtin/stash.c:489
a0b6b246
JX
5297msgid "Unable to write index."
5298msgstr "不能写入索引。"
5299
349ede6a
JX
5300#: merge.c:41
5301msgid "failed to read the cache"
65387fd5 5302msgstr "无法读取缓存"
349ede6a 5303
65387fd5
FZ
5304#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
5305#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
7e6630a7 5306#: builtin/stash.c:269
349ede6a
JX
5307msgid "unable to write new index file"
5308msgstr "无法写新的索引文件"
5309
7e6630a7 5310#: midx.c:78
473eb541
JX
5311msgid "multi-pack-index OID fanout is of the wrong size"
5312msgstr "多包索引的对象ID扇出表大小错误"
5313
65387fd5 5314#: midx.c:111
4c27fcb5
JX
5315#, c-format
5316msgid "multi-pack-index file %s is too small"
5317msgstr "多包索引文件 %s 太小"
5318
65387fd5 5319#: midx.c:127
4c27fcb5
JX
5320#, c-format
5321msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
5322msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
5323
65387fd5 5324#: midx.c:132
4c27fcb5
JX
5325#, c-format
5326msgid "multi-pack-index version %d not recognized"
5327msgstr "multi-pack-index 版本 %d 不能被识别"
5328
65387fd5 5329#: midx.c:137
4c27fcb5 5330#, c-format
d9488fea
JX
5331msgid "multi-pack-index hash version %u does not match version %u"
5332msgstr "多包索引哈希版本 %u 和版本 %u 不匹配"
4c27fcb5 5333
65387fd5 5334#: midx.c:154
4c27fcb5
JX
5335msgid "multi-pack-index missing required pack-name chunk"
5336msgstr "多包索引缺少必需的包名块"
5337
65387fd5 5338#: midx.c:156
4c27fcb5 5339msgid "multi-pack-index missing required OID fanout chunk"
5b533632 5340msgstr "多包索引缺少必需的对象 ID 扇出块"
4c27fcb5 5341
65387fd5 5342#: midx.c:158
4c27fcb5 5343msgid "multi-pack-index missing required OID lookup chunk"
5b533632 5344msgstr "多包索引缺少必需的对象 ID 查询块"
4c27fcb5 5345
65387fd5 5346#: midx.c:160
4c27fcb5
JX
5347msgid "multi-pack-index missing required object offsets chunk"
5348msgstr "多包索引缺少必需的对象偏移块"
5349
65387fd5 5350#: midx.c:176
4c27fcb5
JX
5351#, c-format
5352msgid "multi-pack-index pack names out of order: '%s' before '%s'"
5353msgstr "多包索引包名无序:'%s' 在 '%s' 之前"
5354
65387fd5 5355#: midx.c:224
4c27fcb5
JX
5356#, c-format
5357msgid "bad pack-int-id: %u (%u total packs)"
5358msgstr "错的 pack-int-id:%u(共有 %u 个包)"
5359
65387fd5 5360#: midx.c:274
4c27fcb5
JX
5361msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
5362msgstr "多包索引存储一个64位偏移,但是 off_t 太小"
5363
65387fd5 5364#: midx.c:505
4c27fcb5
JX
5365#, c-format
5366msgid "failed to add packfile '%s'"
65387fd5 5367msgstr "无法添加包文件 '%s'"
4c27fcb5 5368
65387fd5 5369#: midx.c:511
4c27fcb5
JX
5370#, c-format
5371msgid "failed to open pack-index '%s'"
65387fd5 5372msgstr "无法打开包索引 '%s'"
4c27fcb5 5373
65387fd5 5374#: midx.c:579
4c27fcb5
JX
5375#, c-format
5376msgid "failed to locate object %d in packfile"
65387fd5 5377msgstr "无法在包文件中定位对象 %d"
4c27fcb5 5378
65387fd5 5379#: midx.c:895
33b62fba
JX
5380msgid "cannot store reverse index file"
5381msgstr "无法存储反向索引文件"
5382
65387fd5 5383#: midx.c:993
7e6630a7
FZ
5384#, c-format
5385msgid "could not parse line: %s"
65387fd5 5386msgstr "不能解析行:%s"
7e6630a7 5387
65387fd5 5388#: midx.c:995
7e6630a7
FZ
5389#, c-format
5390msgid "malformed line: %s"
5391msgstr "格式错误的行:%s"
5392
65387fd5 5393#: midx.c:1162
ec3d4607
JX
5394msgid "ignoring existing multi-pack-index; checksum mismatch"
5395msgstr "忽略已存在的多包索引,校验码不匹配"
5396
65387fd5 5397#: midx.c:1187
7e6630a7
FZ
5398msgid "could not load pack"
5399msgstr "不能载入包"
ddc12c42 5400
65387fd5 5401#: midx.c:1193
a6cd2cc4 5402#, c-format
7e6630a7
FZ
5403msgid "could not open index for %s"
5404msgstr "不能打开 %s 的索引"
a6cd2cc4 5405
65387fd5 5406#: midx.c:1204
7e6630a7
FZ
5407msgid "Adding packfiles to multi-pack-index"
5408msgstr "添加包文件到多包索引"
5409
65387fd5 5410#: midx.c:1247
33b62fba
JX
5411#, c-format
5412msgid "unknown preferred pack: '%s'"
5413msgstr "未知的首选包:'%s'"
5414
65387fd5 5415#: midx.c:1292
7e6630a7
FZ
5416#, c-format
5417msgid "cannot select preferred pack %s with no objects"
5418msgstr "不能选择没有对象的首选包 %s"
5419
65387fd5 5420#: midx.c:1324
7e6630a7
FZ
5421#, c-format
5422msgid "did not see pack-file %s to drop"
5423msgstr "没有看到要丢弃的包文件 %s"
5424
65387fd5 5425#: midx.c:1370
33b62fba
JX
5426#, c-format
5427msgid "preferred pack '%s' is expired"
5428msgstr "首选包 '%s' 已过期"
5429
65387fd5 5430#: midx.c:1383
349ede6a
JX
5431msgid "no pack files to index."
5432msgstr "没有要索引的包文件。"
5433
65387fd5 5434#: midx.c:1420
7e6630a7
FZ
5435msgid "could not write multi-pack bitmap"
5436msgstr "无法写入多包位图"
5437
65387fd5 5438#: midx.c:1430
7e6630a7
FZ
5439msgid "could not write multi-pack-index"
5440msgstr "无法写入多包索引"
5441
65387fd5 5442#: midx.c:1489 builtin/clean.c:37
33b62fba
JX
5443#, c-format
5444msgid "failed to remove %s"
65387fd5 5445msgstr "无法删除 %s"
33b62fba 5446
65387fd5 5447#: midx.c:1522
4c27fcb5
JX
5448#, c-format
5449msgid "failed to clear multi-pack-index at %s"
65387fd5 5450msgstr "无法清理位于 %s 的多包索引"
4c27fcb5 5451
65387fd5 5452#: midx.c:1585
d9488fea
JX
5453msgid "multi-pack-index file exists, but failed to parse"
5454msgstr "多包索引文件存在,但无法解析"
5455
65387fd5 5456#: midx.c:1593
ec3d4607
JX
5457msgid "incorrect checksum"
5458msgstr "不正确的校验码"
5459
65387fd5 5460#: midx.c:1596
d46c5519
JX
5461msgid "Looking for referenced packfiles"
5462msgstr "正在查找引用的包文件"
5463
65387fd5 5464#: midx.c:1611
4c27fcb5
JX
5465#, c-format
5466msgid ""
5467"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
5b533632 5468msgstr "对象 ID 扇出无序:fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
4c27fcb5 5469
65387fd5 5470#: midx.c:1616
349ede6a
JX
5471msgid "the midx contains no oid"
5472msgstr "midx 不包含 oid"
5473
65387fd5 5474#: midx.c:1625
ddc12c42
JX
5475msgid "Verifying OID order in multi-pack-index"
5476msgstr "校验多包索引中的 OID 顺序"
d46c5519 5477
65387fd5 5478#: midx.c:1634
4c27fcb5
JX
5479#, c-format
5480msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
5b533632 5481msgstr "对象 ID 查询无序:oid[%d] = %s >= %s = oid[%d]"
4c27fcb5 5482
65387fd5 5483#: midx.c:1654
d46c5519
JX
5484msgid "Sorting objects by packfile"
5485msgstr "通过包文件为对象排序"
5486
65387fd5 5487#: midx.c:1661
4c27fcb5
JX
5488msgid "Verifying object offsets"
5489msgstr "校验对象偏移"
5490
65387fd5 5491#: midx.c:1677
4c27fcb5
JX
5492#, c-format
5493msgid "failed to load pack entry for oid[%d] = %s"
65387fd5 5494msgstr "无法为 oid[%d] = %s 加载包条目"
4c27fcb5 5495
65387fd5 5496#: midx.c:1683
4c27fcb5
JX
5497#, c-format
5498msgid "failed to load pack-index for packfile %s"
65387fd5 5499msgstr "无法为包文件 %s 加载包索引"
4c27fcb5 5500
65387fd5 5501#: midx.c:1692
4c27fcb5
JX
5502#, c-format
5503msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
5504msgstr "oid[%d] = %s 错误的对象偏移:%<PRIx64> != %<PRIx64>"
5505
65387fd5 5506#: midx.c:1719
ddc12c42
JX
5507msgid "Counting referenced objects"
5508msgstr "正在对引用对象计数"
5509
65387fd5 5510#: midx.c:1729
ddc12c42
JX
5511msgid "Finding and deleting unreferenced packfiles"
5512msgstr "正在查找和删除未引用的包文件"
5513
65387fd5 5514#: midx.c:1921
a6cd2cc4
JX
5515msgid "could not start pack-objects"
5516msgstr "不能开始 pack-objects"
5517
65387fd5 5518#: midx.c:1941
a6cd2cc4
JX
5519msgid "could not finish pack-objects"
5520msgstr "不能结束 pack-objects"
5521
33b62fba 5522#: name-hash.c:542
4c27fcb5
JX
5523#, c-format
5524msgid "unable to create lazy_dir thread: %s"
5525msgstr "不能创建 lazy_dir 线程:%s"
5526
33b62fba 5527#: name-hash.c:564
4c27fcb5
JX
5528#, c-format
5529msgid "unable to create lazy_name thread: %s"
5530msgstr "不能创建 lazy_name 线程:%s"
5531
33b62fba 5532#: name-hash.c:570
4c27fcb5
JX
5533#, c-format
5534msgid "unable to join lazy_name thread: %s"
ae4e099e 5535msgstr "不能加入 lazy_name 线程:%s"
4c27fcb5 5536
06991777 5537#: notes-merge.c:277
5c57d762
JX
5538#, c-format
5539msgid ""
a0b6b246
JX
5540"You have not concluded your previous notes merge (%s exists).\n"
5541"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
5542"commit/abort the previous merge before you start a new notes merge."
5c57d762 5543msgstr ""
29004bbb 5544"您的前一次注释合并尚未结束(存在 %s)。\n"
1a79b2f1
JX
5545"在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
5546"notes merge --abort' 来提交/终止前一次合并。"
5c57d762 5547
06991777 5548#: notes-merge.c:284
a0b6b246
JX
5549#, c-format
5550msgid "You have not concluded your notes merge (%s exists)."
5551msgstr "您尚未结束注释合并(存在 %s)。"
5552
06991777 5553#: notes-utils.c:46
a0b6b246
JX
5554msgid "Cannot commit uninitialized/unreferenced notes tree"
5555msgstr "不能提交未初始化/未引用的注解树"
5c57d762 5556
06991777 5557#: notes-utils.c:105
1b7f4a34 5558#, c-format
a0b6b246
JX
5559msgid "Bad notes.rewriteMode value: '%s'"
5560msgstr "坏的 notes.rewriteMode 值:'%s'"
1b7f4a34 5561
06991777 5562#: notes-utils.c:115
5b04ee3b 5563#, c-format
a0b6b246
JX
5564msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
5565msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
5b04ee3b 5566
a4f16749
JX
5567#. TRANSLATORS: The first %s is the name of
5568#. the environment variable, the second %s is
5569#. its value.
5570#.
06991777 5571#: notes-utils.c:145
5b04ee3b 5572#, c-format
a0b6b246
JX
5573msgid "Bad %s value: '%s'"
5574msgstr "坏的 %s 值:'%s'"
5b04ee3b 5575
65387fd5 5576#: object-file.c:456
c1ac5258 5577#, c-format
473eb541
JX
5578msgid "object directory %s does not exist; check .git/objects/info/alternates"
5579msgstr "对象目录 %s 不存在,检查 .git/objects/info/alternates"
c1ac5258 5580
65387fd5 5581#: object-file.c:514
c1ac5258 5582#, c-format
473eb541
JX
5583msgid "unable to normalize alternate object path: %s"
5584msgstr "无法规范化备用对象路径:%s"
c1ac5258 5585
65387fd5 5586#: object-file.c:588
c1ac5258 5587#, c-format
473eb541
JX
5588msgid "%s: ignoring alternate object stores, nesting too deep"
5589msgstr "%s:忽略备用对象库,嵌套太深"
c1ac5258 5590
65387fd5 5591#: object-file.c:595
5b04ee3b 5592#, c-format
473eb541
JX
5593msgid "unable to normalize object directory: %s"
5594msgstr "无法规范化对象目录: %s"
5b04ee3b 5595
65387fd5 5596#: object-file.c:638
473eb541
JX
5597msgid "unable to fdopen alternates lockfile"
5598msgstr "无法 fdopen 替换锁文件"
c1ac5258 5599
65387fd5 5600#: object-file.c:656
473eb541
JX
5601msgid "unable to read alternates file"
5602msgstr "无法读取替代文件"
349ede6a 5603
65387fd5 5604#: object-file.c:663
473eb541
JX
5605msgid "unable to move new alternates file into place"
5606msgstr "无法将新的替代文件移动到位"
6937cb4e 5607
65387fd5 5608#: object-file.c:741
6937cb4e 5609#, c-format
473eb541
JX
5610msgid "path '%s' does not exist"
5611msgstr "路径 '%s' 不存在"
6937cb4e 5612
65387fd5 5613#: object-file.c:762
6937cb4e 5614#, c-format
473eb541
JX
5615msgid "reference repository '%s' as a linked checkout is not supported yet."
5616msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
6937cb4e 5617
65387fd5 5618#: object-file.c:768
2b472aae 5619#, c-format
473eb541
JX
5620msgid "reference repository '%s' is not a local repository."
5621msgstr "参考仓库 '%s' 不是一个本地仓库。"
349ede6a 5622
65387fd5 5623#: object-file.c:774
349ede6a 5624#, c-format
473eb541
JX
5625msgid "reference repository '%s' is shallow"
5626msgstr "参考仓库 '%s' 是一个浅克隆"
349ede6a 5627
65387fd5 5628#: object-file.c:782
349ede6a 5629#, c-format
473eb541
JX
5630msgid "reference repository '%s' is grafted"
5631msgstr "参考仓库 '%s' 已被移植"
349ede6a 5632
65387fd5 5633#: object-file.c:813
7e6630a7
FZ
5634#, c-format
5635msgid "could not find object directory matching %s"
5636msgstr "无法找到和 %s 匹配的对象目录"
5637
65387fd5 5638#: object-file.c:863
349ede6a 5639#, c-format
473eb541
JX
5640msgid "invalid line while parsing alternate refs: %s"
5641msgstr "解析备用引用时无效的行:%s"
2b472aae 5642
65387fd5 5643#: object-file.c:1013
06991777 5644#, c-format
473eb541
JX
5645msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
5646msgstr "尝试 mmap %<PRIuMAX>,超过了最大值 %<PRIuMAX>"
06991777 5647
65387fd5 5648#: object-file.c:1048
ec3d4607
JX
5649#, c-format
5650msgid "mmap failed%s"
5651msgstr "mmap 失败%s"
06991777 5652
65387fd5 5653#: object-file.c:1214
06991777 5654#, c-format
473eb541
JX
5655msgid "object file %s is empty"
5656msgstr "对象文件 %s 为空"
06991777 5657
65387fd5 5658#: object-file.c:1333 object-file.c:2542
06991777 5659#, c-format
473eb541
JX
5660msgid "corrupt loose object '%s'"
5661msgstr "损坏的松散对象 '%s'"
06991777 5662
65387fd5 5663#: object-file.c:1335 object-file.c:2546
06991777 5664#, c-format
473eb541
JX
5665msgid "garbage at end of loose object '%s'"
5666msgstr "松散对象 '%s' 后面有垃圾数据"
06991777 5667
65387fd5 5668#: object-file.c:1457
7e6630a7
FZ
5669#, c-format
5670msgid "unable to parse %s header"
5671msgstr "无法解析 %s 头部"
5672
65387fd5 5673#: object-file.c:1459
473eb541
JX
5674msgid "invalid object type"
5675msgstr "无效的对象类型"
06991777 5676
65387fd5 5677#: object-file.c:1470
06991777 5678#, c-format
473eb541
JX
5679msgid "unable to unpack %s header"
5680msgstr "无法解开 %s 头部"
06991777 5681
65387fd5 5682#: object-file.c:1474
349ede6a 5683#, c-format
7e6630a7
FZ
5684msgid "header for %s too long, exceeds %d bytes"
5685msgstr "%s 的头部太长,超出了 %d 字节"
349ede6a 5686
65387fd5 5687#: object-file.c:1704
06991777 5688#, c-format
473eb541 5689msgid "failed to read object %s"
65387fd5 5690msgstr "无法读取对象 %s"
06991777 5691
65387fd5 5692#: object-file.c:1708
06991777 5693#, c-format
473eb541
JX
5694msgid "replacement %s not found for %s"
5695msgstr "找不到 %2$s 的替代 %1$s"
06991777 5696
65387fd5 5697#: object-file.c:1712
473eb541
JX
5698#, c-format
5699msgid "loose object %s (stored in %s) is corrupt"
5700msgstr "松散对象 %s(保存在 %s)已损坏"
a0b6b246 5701
65387fd5 5702#: object-file.c:1716
5b04ee3b 5703#, c-format
473eb541
JX
5704msgid "packed object %s (stored in %s) is corrupt"
5705msgstr "打包对象 %s(保存在 %s)已损坏"
5b04ee3b 5706
65387fd5 5707#: object-file.c:1821
5b04ee3b 5708#, c-format
473eb541
JX
5709msgid "unable to write file %s"
5710msgstr "无法写文件 %s"
5b04ee3b 5711
65387fd5 5712#: object-file.c:1828
5b04ee3b 5713#, c-format
473eb541
JX
5714msgid "unable to set permission to '%s'"
5715msgstr "无法为 '%s' 设置权限"
5b04ee3b 5716
65387fd5 5717#: object-file.c:1835
473eb541
JX
5718msgid "file write error"
5719msgstr "文件写错误"
a0b6b246 5720
65387fd5 5721#: object-file.c:1858
473eb541
JX
5722msgid "error when closing loose object file"
5723msgstr "关闭松散对象文件时出错"
5724
65387fd5 5725#: object-file.c:1925
5b04ee3b 5726#, c-format
473eb541
JX
5727msgid "insufficient permission for adding an object to repository database %s"
5728msgstr "权限不足,无法在仓库对象库 %s 中添加对象"
a0b6b246 5729
65387fd5 5730#: object-file.c:1927
473eb541
JX
5731msgid "unable to create temporary file"
5732msgstr "无法创建临时文件"
87cb7997 5733
65387fd5 5734#: object-file.c:1951
473eb541
JX
5735msgid "unable to write loose object file"
5736msgstr "不能写松散对象文件"
87cb7997 5737
65387fd5 5738#: object-file.c:1957
473eb541
JX
5739#, c-format
5740msgid "unable to deflate new object %s (%d)"
5741msgstr "不能压缩新对象 %s(%d)"
87cb7997 5742
65387fd5 5743#: object-file.c:1961
87cb7997 5744#, c-format
473eb541
JX
5745msgid "deflateEnd on object %s failed (%d)"
5746msgstr "在对象 %s 上调用 deflateEnd 失败(%d)"
87cb7997 5747
65387fd5 5748#: object-file.c:1965
473eb541
JX
5749#, c-format
5750msgid "confused by unstable object source data for %s"
5751msgstr "被 %s 的不稳定对象源数据搞糊涂了"
a0b6b246 5752
65387fd5 5753#: object-file.c:1976 builtin/pack-objects.c:1243
473eb541
JX
5754#, c-format
5755msgid "failed utime() on %s"
5756msgstr "在 %s 上调用 utime() 失败"
5b04ee3b 5757
65387fd5 5758#: object-file.c:2054
473eb541
JX
5759#, c-format
5760msgid "cannot read object for %s"
5761msgstr "不能读取对象 %s"
a0b6b246 5762
65387fd5 5763#: object-file.c:2105
473eb541
JX
5764msgid "corrupt commit"
5765msgstr "损坏的提交"
5766
65387fd5 5767#: object-file.c:2113
473eb541
JX
5768msgid "corrupt tag"
5769msgstr "损坏的标签"
5770
65387fd5 5771#: object-file.c:2213
5b04ee3b 5772#, c-format
473eb541
JX
5773msgid "read error while indexing %s"
5774msgstr "索引 %s 时读取错误"
5b04ee3b 5775
65387fd5 5776#: object-file.c:2216
5b04ee3b 5777#, c-format
473eb541
JX
5778msgid "short read while indexing %s"
5779msgstr "索引 %s 时读入不完整"
5b04ee3b 5780
65387fd5 5781#: object-file.c:2289 object-file.c:2299
5b04ee3b 5782#, c-format
473eb541 5783msgid "%s: failed to insert into database"
65387fd5 5784msgstr "%s:无法插入数据库"
5b04ee3b 5785
65387fd5 5786#: object-file.c:2305
5b04ee3b 5787#, c-format
473eb541
JX
5788msgid "%s: unsupported file type"
5789msgstr "%s:不支持的文件类型"
5b04ee3b 5790
ee27abd3 5791#: object-file.c:2329 builtin/fetch.c:1453
5b04ee3b 5792#, c-format
473eb541
JX
5793msgid "%s is not a valid object"
5794msgstr "%s 不是一个有效的对象"
5b04ee3b 5795
65387fd5 5796#: object-file.c:2331
5b04ee3b 5797#, c-format
473eb541
JX
5798msgid "%s is not a valid '%s' object"
5799msgstr "%s 不是一个有效的 '%s' 对象"
5b04ee3b 5800
65387fd5 5801#: object-file.c:2358
5b04ee3b 5802#, c-format
473eb541
JX
5803msgid "unable to open %s"
5804msgstr "不能打开 %s"
a0b6b246 5805
65387fd5 5806#: object-file.c:2553
5b04ee3b 5807#, c-format
473eb541
JX
5808msgid "hash mismatch for %s (expected %s)"
5809msgstr "%s 的哈希值不匹配(预期 %s)"
a0b6b246 5810
65387fd5 5811#: object-file.c:2576
ddc12c42 5812#, c-format
473eb541
JX
5813msgid "unable to mmap %s"
5814msgstr "不能 mmap %s"
ddc12c42 5815
65387fd5 5816#: object-file.c:2582
473eb541
JX
5817#, c-format
5818msgid "unable to unpack header of %s"
5819msgstr "无法解压缩 %s 的头部"
d46c5519 5820
65387fd5 5821#: object-file.c:2587
473eb541
JX
5822#, c-format
5823msgid "unable to parse header of %s"
5824msgstr "无法解析 %s 的头部"
d46c5519 5825
65387fd5 5826#: object-file.c:2598
473eb541
JX
5827#, c-format
5828msgid "unable to unpack contents of %s"
5829msgstr "无法解压缩 %s 的内容"
7157c2b5 5830
ec3d4607 5831#: object-name.c:480
473eb541
JX
5832#, c-format
5833msgid "short object ID %s is ambiguous"
5834msgstr "短对象ID %s 存在歧义"
c1ac5258 5835
ec3d4607 5836#: object-name.c:491
473eb541
JX
5837msgid "The candidates are:"
5838msgstr "候选者有:"
c1ac5258 5839
ec3d4607 5840#: object-name.c:790
473eb541
JX
5841msgid ""
5842"Git normally never creates a ref that ends with 40 hex characters\n"
5843"because it will be ignored when you just specify 40-hex. These refs\n"
5844"may be created by mistake. For example,\n"
5845"\n"
5846" git switch -c $br $(git rev-parse ...)\n"
5847"\n"
5848"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
5849"examine these refs and maybe delete them. Turn this message off by\n"
5850"running \"git config advice.objectNameWarning false\""
5851msgstr ""
5852"Git 通常不会创建一个以40个十六进制字符结尾的引用,因为当您只提供40\n"
5853"个十六进制字符时将被忽略。这些引用可能被错误地创建。例如:\n"
5854"\n"
5855" git switch -c $br $(git rev-parse ...)\n"
5856"\n"
5857"当 \"$br\" 某种原因空白时,一个40位十六进制的引用将被创建。请检查这些\n"
5858"引用,可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
5859"false\" 命令关闭本消息通知。"
c1ac5258 5860
ec3d4607 5861#: object-name.c:910
473eb541
JX
5862#, c-format
5863msgid "log for '%.*s' only goes back to %s"
5864msgstr "'%.*s' 的日志仅能回到 %s"
c1ac5258 5865
ec3d4607 5866#: object-name.c:918
473eb541
JX
5867#, c-format
5868msgid "log for '%.*s' only has %d entries"
5869msgstr "'%.*s' 的日志仅有 %d 个条目"
c1ac5258 5870
ec3d4607 5871#: object-name.c:1696
473eb541
JX
5872#, c-format
5873msgid "path '%s' exists on disk, but not in '%.*s'"
5874msgstr "路径 '%s' 在磁盘上,但是不在 '%.*s' 中"
c1ac5258 5875
ec3d4607 5876#: object-name.c:1702
473eb541
JX
5877#, c-format
5878msgid ""
5879"path '%s' exists, but not '%s'\n"
5880"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
5881msgstr ""
5882"路径 '%s' 存在,而 '%s' 不存在\n"
5883"提示:您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'?"
c1ac5258 5884
ec3d4607 5885#: object-name.c:1711
c1ac5258 5886#, c-format
473eb541
JX
5887msgid "path '%s' does not exist in '%.*s'"
5888msgstr "路径 '%s' 不在 '%.*s' 中"
c1ac5258 5889
ec3d4607 5890#: object-name.c:1739
c1ac5258 5891#, c-format
473eb541
JX
5892msgid ""
5893"path '%s' is in the index, but not at stage %d\n"
5894"hint: Did you mean ':%d:%s'?"
5895msgstr ""
5896"路径 '%s' 在索引中,但不在暂存区 %d 中\n"
5897"提示:您的意思是 ':%d:%s'?"
c1ac5258 5898
ec3d4607 5899#: object-name.c:1755
06991777 5900#, c-format
473eb541
JX
5901msgid ""
5902"path '%s' is in the index, but not '%s'\n"
5903"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
5904msgstr ""
5905"路径 '%s' 在索引中,但 '%s' 不在\n"
5906"提示:您的意思是 ':%d:%s' 亦即 ':%d:./%s'?"
06991777 5907
ec3d4607 5908#: object-name.c:1763
473eb541
JX
5909#, c-format
5910msgid "path '%s' exists on disk, but not in the index"
5911msgstr "路径 '%s' 在磁盘上,但不在索引里"
4c27fcb5 5912
ec3d4607 5913#: object-name.c:1765
4c27fcb5 5914#, c-format
473eb541
JX
5915msgid "path '%s' does not exist (neither on disk nor in the index)"
5916msgstr "路径 '%s' 不存在(既不在磁盘上,也不在索引中)"
4c27fcb5 5917
ec3d4607 5918#: object-name.c:1778
473eb541
JX
5919msgid "relative path syntax can't be used outside working tree"
5920msgstr "不能在工作区之外使用相对路径语法"
a0b6b246 5921
ec3d4607 5922#: object-name.c:1916
473eb541
JX
5923#, c-format
5924msgid "invalid object name '%.*s'."
5925msgstr "无效的对象名 '%.*s'。"
d9488fea 5926
473eb541
JX
5927#: object.c:53
5928#, c-format
5929msgid "invalid object type \"%s\""
5930msgstr "无效的对象类型 \"%s\""
a5cd71ca 5931
473eb541
JX
5932#: object.c:173
5933#, c-format
5934msgid "object %s is a %s, not a %s"
5935msgstr "对象 %s 是一个 %s,不是一个 %s"
d9488fea 5936
ec3d4607 5937#: object.c:250
a5cd71ca 5938#, c-format
473eb541
JX
5939msgid "object %s has unknown type id %d"
5940msgstr "对象 %s 有未知的类型 id %d"
a5cd71ca 5941
ec3d4607 5942#: object.c:263
473eb541
JX
5943#, c-format
5944msgid "unable to parse object: %s"
5945msgstr "不能解析对象:%s"
349ede6a 5946
ec3d4607 5947#: object.c:283 object.c:295
473eb541
JX
5948#, c-format
5949msgid "hash mismatch %s"
5950msgstr "哈希值与 %s 不匹配"
c1ac5258 5951
65387fd5 5952#: pack-bitmap.c:353
7e6630a7
FZ
5953msgid "multi-pack bitmap is missing required reverse index"
5954msgstr "多包位图缺少必需的反向索引"
5955
65387fd5 5956#: pack-bitmap.c:429
7e6630a7
FZ
5957msgid "load_reverse_index: could not open pack"
5958msgstr "load_reverse_index:无法打开包"
5959
65387fd5 5960#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
473eb541
JX
5961#, c-format
5962msgid "unable to get size of %s"
5963msgstr "无法得到 %s 的大小"
c1ac5258 5964
65387fd5 5965#: pack-bitmap.c:1935
7e6630a7
FZ
5966#, c-format
5967msgid "could not find %s in pack %s at offset %<PRIuMAX>"
5968msgstr "在包 %2$s 偏移 %3$<PRIuMAX> 中无法找到 %1$s"
5969
65387fd5 5970#: pack-bitmap.c:1971 builtin/rev-list.c:92
c1ac5258 5971#, c-format
473eb541
JX
5972msgid "unable to get disk usage of %s"
5973msgstr "无法得到 %s 的磁盘使用量"
c1ac5258 5974
33b62fba 5975#: pack-revindex.c:221
349ede6a 5976#, c-format
473eb541
JX
5977msgid "reverse-index file %s is too small"
5978msgstr "反向索引文件 %s 太小"
349ede6a 5979
33b62fba 5980#: pack-revindex.c:226
a6cd2cc4 5981#, c-format
473eb541
JX
5982msgid "reverse-index file %s is corrupt"
5983msgstr "反向索引文件 %s 损坏"
a6cd2cc4 5984
33b62fba 5985#: pack-revindex.c:234
473eb541
JX
5986#, c-format
5987msgid "reverse-index file %s has unknown signature"
5988msgstr "反向索引文件 %s 有错误的签名"
c1ac5258 5989
33b62fba 5990#: pack-revindex.c:238
c1ac5258 5991#, c-format
473eb541
JX
5992msgid "reverse-index file %s has unsupported version %<PRIu32>"
5993msgstr "反向索引文件 %s 不支持的版本 %<PRIu32>"
c1ac5258 5994
33b62fba 5995#: pack-revindex.c:243
06991777 5996#, c-format
473eb541
JX
5997msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
5998msgstr "反向索引文件 %s 有不支持的哈希 ID %<PRIu32>"
06991777 5999
7e6630a7 6000#: pack-write.c:251
473eb541
JX
6001msgid "cannot both write and verify reverse index"
6002msgstr "无法同时写入和校验反向索引"
06991777 6003
7e6630a7 6004#: pack-write.c:270
06991777 6005#, c-format
473eb541
JX
6006msgid "could not stat: %s"
6007msgstr "不能调用 stat:%s"
06991777 6008
7e6630a7 6009#: pack-write.c:282
d46c5519 6010#, c-format
473eb541
JX
6011msgid "failed to make %s readable"
6012msgstr "无法设置 %s 为可读"
d46c5519 6013
7e6630a7 6014#: pack-write.c:520
06991777 6015#, c-format
473eb541
JX
6016msgid "could not write '%s' promisor file"
6017msgstr "无法写入 '%s' 承诺者文件"
06991777 6018
65387fd5 6019#: packfile.c:627
473eb541
JX
6020msgid "offset before end of packfile (broken .idx?)"
6021msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
06991777 6022
65387fd5 6023#: packfile.c:657
ec3d4607
JX
6024#, c-format
6025msgid "packfile %s cannot be mapped%s"
6026msgstr "包文件 %s 不能被映射%s"
6027
65387fd5 6028#: packfile.c:1924
06991777 6029#, c-format
473eb541
JX
6030msgid "offset before start of pack index for %s (corrupt index?)"
6031msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
06991777 6032
65387fd5 6033#: packfile.c:1928
06991777 6034#, c-format
473eb541
JX
6035msgid "offset beyond end of pack index for %s (truncated index?)"
6036msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
06991777 6037
65387fd5 6038#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
473eb541
JX
6039#, c-format
6040msgid "option `%s' expects a numerical value"
6041msgstr "选项 `%s' 期望一个数字值"
4c27fcb5 6042
65387fd5 6043#: parse-options-cb.c:42
5b04ee3b 6044#, c-format
473eb541
JX
6045msgid "malformed expiration date '%s'"
6046msgstr "格式错误的到期时间:'%s'"
5b04ee3b 6047
65387fd5 6048#: parse-options-cb.c:55
5b04ee3b 6049#, c-format
473eb541
JX
6050msgid "option `%s' expects \"always\", \"auto\", or \"never\""
6051msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
5b04ee3b 6052
65387fd5 6053#: parse-options-cb.c:133 parse-options-cb.c:150
06991777 6054#, c-format
473eb541
JX
6055msgid "malformed object name '%s'"
6056msgstr "格式错误的对象名 '%s'"
06991777 6057
65387fd5
FZ
6058#: parse-options-cb.c:307
6059#, c-format
6060msgid "option `%s' expects \"%s\" or \"%s\""
6061msgstr "选项 `%s' 期望 \"%s\" 或 \"%s\""
6062
7e6630a7 6063#: parse-options.c:58
06991777 6064#, c-format
473eb541
JX
6065msgid "%s requires a value"
6066msgstr "%s 需要一个值"
06991777 6067
7e6630a7 6068#: parse-options.c:93
473eb541
JX
6069#, c-format
6070msgid "%s is incompatible with %s"
6071msgstr "%s 与 %s 不兼容"
06991777 6072
7e6630a7 6073#: parse-options.c:98
06991777 6074#, c-format
473eb541
JX
6075msgid "%s : incompatible with something else"
6076msgstr "%s:和其它的不兼容"
06991777 6077
7e6630a7 6078#: parse-options.c:112 parse-options.c:116
06991777 6079#, c-format
473eb541
JX
6080msgid "%s takes no value"
6081msgstr "%s 不取值"
06991777 6082
7e6630a7 6083#: parse-options.c:114
06991777 6084#, c-format
473eb541
JX
6085msgid "%s isn't available"
6086msgstr "%s 不可用"
06991777 6087
7e6630a7 6088#: parse-options.c:237
4c27fcb5 6089#, c-format
473eb541
JX
6090msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
6091msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
4c27fcb5 6092
7e6630a7 6093#: parse-options.c:393
473eb541
JX
6094#, c-format
6095msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
6096msgstr "有歧义的选项:%s(可以是 --%s%s 或 --%s%s)"
06991777 6097
65387fd5 6098#: parse-options.c:428 parse-options.c:436
06991777 6099#, c-format
473eb541 6100msgid "did you mean `--%s` (with two dashes)?"
7e6630a7 6101msgstr "您的意思是 `--%s`(有两个短线)?"
06991777 6102
65387fd5 6103#: parse-options.c:678 parse-options.c:1054
06991777 6104#, c-format
473eb541
JX
6105msgid "alias of --%s"
6106msgstr "--%s 的别名"
06991777 6107
65387fd5 6108#: parse-options.c:892
473eb541
JX
6109#, c-format
6110msgid "unknown option `%s'"
6111msgstr "未知选项 `%s'"
4c27fcb5 6112
65387fd5 6113#: parse-options.c:894
4c27fcb5 6114#, c-format
473eb541
JX
6115msgid "unknown switch `%c'"
6116msgstr "未知开关 `%c'"
4c27fcb5 6117
65387fd5 6118#: parse-options.c:896
4c27fcb5 6119#, c-format
473eb541
JX
6120msgid "unknown non-ascii option in string: `%s'"
6121msgstr "字符串中未知的非 ascii 字符选项:`%s'"
6122
65387fd5 6123#: parse-options.c:920
473eb541
JX
6124msgid "..."
6125msgstr "..."
4c27fcb5 6126
65387fd5 6127#: parse-options.c:934
06991777 6128#, c-format
473eb541
JX
6129msgid "usage: %s"
6130msgstr "用法:%s"
06991777 6131
473eb541
JX
6132#. TRANSLATORS: the colon here should align with the
6133#. one in "usage: %s" translation.
6134#.
65387fd5 6135#: parse-options.c:949
06991777 6136#, c-format
473eb541
JX
6137msgid " or: %s"
6138msgstr " 或:%s"
06991777 6139
7e6630a7
FZ
6140#. TRANSLATORS: You should only need to translate this format
6141#. string if your language is a RTL language (e.g. Arabic,
6142#. Hebrew etc.), not if it's a LTR language (e.g. German,
6143#. Russian, Chinese etc.).
6144#. *
6145#. When a translated usage string has an embedded "\n" it's
6146#. because options have wrapped to the next line. The line
6147#. after the "\n" will then be padded to align with the
6148#. command name, such as N_("git cmd [opt]\n<8
6149#. spaces>[opt2]"), where the 8 spaces are the same length as
6150#. "git cmd ".
6151#. *
6152#. This format string prints out that already-translated
6153#. line. The "%*s" is whitespace padding to account for the
6154#. padding at the start of the line that we add in this
6155#. function. The "%s" is a line in the (hopefully already
6156#. translated) N_() usage string, which contained embedded
6157#. newlines before we split it up.
6158#.
65387fd5 6159#: parse-options.c:970
7e6630a7
FZ
6160#, c-format
6161msgid "%*s%s"
6162msgstr "%*s%s"
6163
473eb541 6164# 译者:为保证在输出中对齐,注意调整句中空格!
65387fd5 6165#: parse-options.c:993
06991777 6166#, c-format
473eb541
JX
6167msgid " %s"
6168msgstr " %s"
6169
65387fd5 6170#: parse-options.c:1040
473eb541
JX
6171msgid "-NUM"
6172msgstr "-数字"
06991777 6173
7e6630a7 6174#: path.c:922
06991777 6175#, c-format
473eb541
JX
6176msgid "Could not make %s writable by group"
6177msgstr "不能设置 %s 为组可写"
6178
7e6630a7 6179#: pathspec.c:150
473eb541
JX
6180msgid "Escape character '\\' not allowed as last character in attr value"
6181msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
6182
7e6630a7 6183#: pathspec.c:168
473eb541
JX
6184msgid "Only one 'attr:' specification is allowed."
6185msgstr "只允许一个 'attr:' 规格。"
6186
7e6630a7 6187#: pathspec.c:171
473eb541
JX
6188msgid "attr spec must not be empty"
6189msgstr "属性规格不能为空"
06991777 6190
7e6630a7 6191#: pathspec.c:214
4c27fcb5 6192#, c-format
473eb541
JX
6193msgid "invalid attribute name %s"
6194msgstr "无效的属性名 %s"
6195
7e6630a7 6196#: pathspec.c:279
473eb541
JX
6197msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
6198msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
6199
7e6630a7 6200#: pathspec.c:286
473eb541
JX
6201msgid ""
6202"global 'literal' pathspec setting is incompatible with all other global "
6203"pathspec settings"
6204msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
6205
7e6630a7 6206#: pathspec.c:326
473eb541
JX
6207msgid "invalid parameter for pathspec magic 'prefix'"
6208msgstr "路径规格包含无效的神奇前缀"
4c27fcb5 6209
7e6630a7 6210#: pathspec.c:347
4c27fcb5 6211#, c-format
473eb541
JX
6212msgid "Invalid pathspec magic '%.*s' in '%s'"
6213msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
4c27fcb5 6214
7e6630a7 6215#: pathspec.c:352
06991777 6216#, c-format
473eb541
JX
6217msgid "Missing ')' at the end of pathspec magic in '%s'"
6218msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
06991777 6219
7e6630a7 6220#: pathspec.c:390
06991777 6221#, c-format
473eb541
JX
6222msgid "Unimplemented pathspec magic '%c' in '%s'"
6223msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
06991777 6224
7e6630a7 6225#: pathspec.c:449
a4f16749 6226#, c-format
473eb541
JX
6227msgid "%s: 'literal' and 'glob' are incompatible"
6228msgstr "%s:'literal' 和 'glob' 不兼容"
a4f16749 6229
7e6630a7 6230#: pathspec.c:465
87cb7997 6231#, c-format
473eb541
JX
6232msgid "%s: '%s' is outside repository at '%s'"
6233msgstr "%s:'%s' 在位于 '%s' 的仓库之外"
87cb7997 6234
7e6630a7 6235#: pathspec.c:541
87cb7997 6236#, c-format
473eb541
JX
6237msgid "'%s' (mnemonic: '%c')"
6238msgstr "'%s'(助记符:'%c')"
87cb7997 6239
7e6630a7 6240#: pathspec.c:551
87cb7997 6241#, c-format
473eb541
JX
6242msgid "%s: pathspec magic not supported by this command: %s"
6243msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
87cb7997 6244
7e6630a7 6245#: pathspec.c:618
06991777 6246#, c-format
473eb541
JX
6247msgid "pathspec '%s' is beyond a symbolic link"
6248msgstr "路径规格 '%s' 位于符号链接中"
06991777 6249
7e6630a7 6250#: pathspec.c:663
06991777 6251#, c-format
473eb541
JX
6252msgid "line is badly quoted: %s"
6253msgstr "行被错误地引用:%s"
06991777 6254
473eb541
JX
6255#: pkt-line.c:92
6256msgid "unable to write flush packet"
6257msgstr "无法写 flush 包"
2b472aae 6258
473eb541
JX
6259#: pkt-line.c:99
6260msgid "unable to write delim packet"
6261msgstr "无法写 delim 包"
d46c5519 6262
473eb541 6263#: pkt-line.c:106
ec3d4607
JX
6264msgid "unable to write response end packet"
6265msgstr "无法写入响应结束数据包"
4c27fcb5 6266
473eb541
JX
6267#: pkt-line.c:113
6268msgid "flush packet write failed"
6269msgstr "flush 包写错误"
d46c5519 6270
7e6630a7 6271#: pkt-line.c:153
473eb541
JX
6272msgid "protocol error: impossibly long line"
6273msgstr "协议错误:不可能的长行"
4c27fcb5 6274
473eb541
JX
6275#: pkt-line.c:169 pkt-line.c:171
6276msgid "packet write with format failed"
6277msgstr "格式化包写入错误"
4c27fcb5 6278
7e6630a7 6279#: pkt-line.c:204 pkt-line.c:252
473eb541
JX
6280msgid "packet write failed - data exceeds max packet size"
6281msgstr "写数据包失败:数据超过了包的最大长度"
4c27fcb5 6282
33b62fba
JX
6283#: pkt-line.c:222
6284#, c-format
6285msgid "packet write failed: %s"
6286msgstr "数据包写入失败:%s"
4c27fcb5 6287
7e6630a7 6288#: pkt-line.c:349 pkt-line.c:350
473eb541
JX
6289msgid "read error"
6290msgstr "读取错误"
d46c5519 6291
7e6630a7 6292#: pkt-line.c:360 pkt-line.c:361
473eb541
JX
6293msgid "the remote end hung up unexpectedly"
6294msgstr "远端意外挂断了"
d46c5519 6295
65387fd5 6296#: pkt-line.c:417 pkt-line.c:419
d46c5519 6297#, c-format
473eb541
JX
6298msgid "protocol error: bad line length character: %.4s"
6299msgstr "协议错误:错误的行长度字符串:%.4s"
d46c5519 6300
65387fd5 6301#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
d46c5519 6302#, c-format
473eb541
JX
6303msgid "protocol error: bad line length %d"
6304msgstr "协议错误:错误的行长度 %d"
4c27fcb5 6305
65387fd5 6306#: pkt-line.c:472 sideband.c:165
2b472aae 6307#, c-format
473eb541
JX
6308msgid "remote error: %s"
6309msgstr "远程错误:%s"
2b472aae 6310
473eb541
JX
6311#: preload-index.c:125
6312msgid "Refreshing index"
6313msgstr "正在刷新索引"
c1ac5258 6314
473eb541 6315#: preload-index.c:144
c1ac5258 6316#, c-format
473eb541
JX
6317msgid "unable to create threaded lstat: %s"
6318msgstr "无法创建线程 lstat:%s"
c1ac5258 6319
84bf71ea 6320#: pretty.c:1051
473eb541
JX
6321msgid "unable to parse --pretty format"
6322msgstr "不能解析 --pretty 格式"
c1ac5258 6323
ec3d4607 6324#: promisor-remote.c:31
473eb541
JX
6325msgid "promisor-remote: unable to fork off fetch subprocess"
6326msgstr "promisor-remote:无法派生 fetch 子进程"
c1ac5258 6327
ec3d4607 6328#: promisor-remote.c:38 promisor-remote.c:40
473eb541
JX
6329msgid "promisor-remote: could not write to fetch subprocess"
6330msgstr "promisor-remote:无法向 fetch 子进程写入"
c1ac5258 6331
ec3d4607 6332#: promisor-remote.c:44
473eb541
JX
6333msgid "promisor-remote: could not close stdin to fetch subprocess"
6334msgstr "promisor-remote:无法关闭至 fetch 子进程的标准输入"
c1ac5258 6335
ec3d4607 6336#: promisor-remote.c:54
c1ac5258 6337#, c-format
473eb541
JX
6338msgid "promisor remote name cannot begin with '/': %s"
6339msgstr "promisor 远程名称不能以 '/' 开始:%s"
c1ac5258 6340
33b62fba
JX
6341#: protocol-caps.c:103
6342msgid "object-info: expected flush after arguments"
6343msgstr "object-info:在参数之后应有一个 flush"
6344
473eb541
JX
6345#: prune-packed.c:35
6346msgid "Removing duplicate objects"
6347msgstr "正在删除重复对象"
c1ac5258 6348
7e6630a7 6349#: range-diff.c:67
473eb541
JX
6350msgid "could not start `log`"
6351msgstr "不能启动 `log`"
5b04ee3b 6352
7e6630a7 6353#: range-diff.c:69
473eb541
JX
6354msgid "could not read `log` output"
6355msgstr "不能读取 `log` 的输出"
c1ac5258 6356
65387fd5 6357#: range-diff.c:97 sequencer.c:5602
c1ac5258 6358#, c-format
473eb541
JX
6359msgid "could not parse commit '%s'"
6360msgstr "不能解析提交 '%s'"
c1ac5258 6361
7e6630a7 6362#: range-diff.c:111
c1ac5258 6363#, c-format
473eb541
JX
6364msgid ""
6365"could not parse first line of `log` output: did not start with 'commit ': "
6366"'%s'"
6367msgstr "无法解析 `log` 输出的首行:不是以 'commit ' 开头:'%s'"
c1ac5258 6368
7e6630a7 6369#: range-diff.c:137
c1ac5258 6370#, c-format
473eb541
JX
6371msgid "could not parse git header '%.*s'"
6372msgstr "无法解析 git 头 '%.*s'"
c1ac5258 6373
7e6630a7 6374#: range-diff.c:304
473eb541 6375msgid "failed to generate diff"
65387fd5 6376msgstr "无法生成 diff"
1a79b2f1 6377
ec3d4607 6378#: range-diff.c:562 range-diff.c:564
a0b6b246 6379#, c-format
473eb541
JX
6380msgid "could not parse log for '%s'"
6381msgstr "不能解析 '%s' 的日志"
90314792 6382
65387fd5 6383#: read-cache.c:723
a0b6b246 6384#, c-format
473eb541
JX
6385msgid "will not add file alias '%s' ('%s' already exists in index)"
6386msgstr "将不会添加文件别名 '%s'('%s' 已经存在于索引中)"
6387
65387fd5 6388#: read-cache.c:739
473eb541
JX
6389msgid "cannot create an empty blob in the object database"
6390msgstr "不能在对象数据库中创建空的数据对象"
90314792 6391
65387fd5 6392#: read-cache.c:761
d9488fea 6393#, c-format
473eb541
JX
6394msgid "%s: can only add regular files, symbolic links or git-directories"
6395msgstr "%s:只能添加常规文件、符号链接或 git 目录"
d9488fea 6396
65387fd5 6397#: read-cache.c:766 builtin/submodule--helper.c:3242
87cb7997 6398#, c-format
473eb541
JX
6399msgid "'%s' does not have a commit checked out"
6400msgstr "'%s' 没有检出一个提交"
87cb7997 6401
65387fd5 6402#: read-cache.c:818
a0b6b246 6403#, c-format
473eb541
JX
6404msgid "unable to index file '%s'"
6405msgstr "无法索引文件 '%s'"
90314792 6406
65387fd5 6407#: read-cache.c:837
a0b6b246 6408#, c-format
473eb541
JX
6409msgid "unable to add '%s' to index"
6410msgstr "无法在索引中添加 '%s'"
90314792 6411
65387fd5 6412#: read-cache.c:848
5c57d762 6413#, c-format
473eb541
JX
6414msgid "unable to stat '%s'"
6415msgstr "无法对 %s 执行 stat"
5c57d762 6416
65387fd5 6417#: read-cache.c:1386
1b7f4a34 6418#, c-format
473eb541
JX
6419msgid "'%s' appears as both a file and as a directory"
6420msgstr "'%s' 看起来既是文件又是目录"
1b7f4a34 6421
65387fd5 6422#: read-cache.c:1601
473eb541
JX
6423msgid "Refresh index"
6424msgstr "刷新索引"
1b7f4a34 6425
65387fd5 6426#: read-cache.c:1733
1b7f4a34 6427#, c-format
473eb541
JX
6428msgid ""
6429"index.version set, but the value is invalid.\n"
6430"Using version %i"
6431msgstr ""
6432"设置了 index.version,但是取值无效。\n"
6433"使用版本 %i"
1b7f4a34 6434
65387fd5 6435#: read-cache.c:1743
87cb7997 6436#, c-format
473eb541
JX
6437msgid ""
6438"GIT_INDEX_VERSION set, but the value is invalid.\n"
6439"Using version %i"
6440msgstr ""
6441"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
6442"使用版本 %i"
87cb7997 6443
65387fd5 6444#: read-cache.c:1799
07432cef 6445#, c-format
473eb541
JX
6446msgid "bad signature 0x%08x"
6447msgstr "坏的签名 0x%08x"
ef317cd5 6448
65387fd5 6449#: read-cache.c:1802
a0b6b246 6450#, c-format
473eb541
JX
6451msgid "bad index version %d"
6452msgstr "坏的索引版本 %d"
220c313c 6453
65387fd5 6454#: read-cache.c:1811
473eb541
JX
6455msgid "bad index file sha1 signature"
6456msgstr "坏的索引文件 sha1 签名"
4c27fcb5 6457
65387fd5 6458#: read-cache.c:1845
87cb7997 6459#, c-format
473eb541
JX
6460msgid "index uses %.4s extension, which we do not understand"
6461msgstr "索引使用不被支持的 %.4s 扩展"
87cb7997 6462
473eb541 6463#
65387fd5 6464#: read-cache.c:1847
87cb7997 6465#, c-format
473eb541
JX
6466msgid "ignoring %.4s extension"
6467msgstr "忽略 %.4s 扩展"
87cb7997 6468
65387fd5 6469#: read-cache.c:1884
87cb7997 6470#, c-format
473eb541
JX
6471msgid "unknown index entry format 0x%08x"
6472msgstr "未知的索引条目格式 0x%08x"
87cb7997 6473
65387fd5 6474#: read-cache.c:1900
87cb7997 6475#, c-format
473eb541
JX
6476msgid "malformed name field in the index, near path '%s'"
6477msgstr "索引中靠近路径 '%s' 有错误的名称字段"
6478
65387fd5 6479#: read-cache.c:1957
473eb541
JX
6480msgid "unordered stage entries in index"
6481msgstr "索引中有未排序的暂存条目"
87cb7997 6482
65387fd5 6483#: read-cache.c:1960
87cb7997 6484#, c-format
473eb541
JX
6485msgid "multiple stage entries for merged file '%s'"
6486msgstr "合并文件 '%s' 有多个暂存条目"
87cb7997 6487
65387fd5 6488#: read-cache.c:1963
87cb7997 6489#, c-format
473eb541
JX
6490msgid "unordered stage entries for '%s'"
6491msgstr "'%s' 的未排序暂存条目"
87cb7997 6492
65387fd5
FZ
6493#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
6494#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
6495#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
7e6630a7 6496#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
65387fd5
FZ
6497#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
6498#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
473eb541
JX
6499msgid "index file corrupt"
6500msgstr "索引文件损坏"
6501
65387fd5 6502#: read-cache.c:2222
87cb7997 6503#, c-format
473eb541
JX
6504msgid "unable to create load_cache_entries thread: %s"
6505msgstr "无法创建 load_cache_entries 线程:%s"
87cb7997 6506
65387fd5 6507#: read-cache.c:2235
7aea43ff 6508#, c-format
473eb541
JX
6509msgid "unable to join load_cache_entries thread: %s"
6510msgstr "无法加入 load_cache_entries 线程:%s"
7aea43ff 6511
65387fd5 6512#: read-cache.c:2268
7aea43ff 6513#, c-format
473eb541
JX
6514msgid "%s: index file open failed"
6515msgstr "%s:打开索引文件失败"
7aea43ff 6516
65387fd5 6517#: read-cache.c:2272
87cb7997 6518#, c-format
473eb541
JX
6519msgid "%s: cannot stat the open index"
6520msgstr "%s:不能对打开的索引执行 stat 操作"
c04f5ac3 6521
65387fd5 6522#: read-cache.c:2276
c04f5ac3 6523#, c-format
473eb541
JX
6524msgid "%s: index file smaller than expected"
6525msgstr "%s:索引文件比预期的小"
c04f5ac3 6526
65387fd5 6527#: read-cache.c:2280
a0b6b246 6528#, c-format
ec3d4607
JX
6529msgid "%s: unable to map index file%s"
6530msgstr "%s:无法映射索引文件%s"
6792b93b 6531
65387fd5 6532#: read-cache.c:2323
473eb541
JX
6533#, c-format
6534msgid "unable to create load_index_extensions thread: %s"
6535msgstr "无法创建 load_index_extensions 线程:%s"
87cb7997 6536
65387fd5 6537#: read-cache.c:2350
a0b6b246 6538#, c-format
473eb541
JX
6539msgid "unable to join load_index_extensions thread: %s"
6540msgstr "无法加入 load_index_extensions 线程:%s"
c04f5ac3 6541
65387fd5 6542#: read-cache.c:2396
a0b6b246 6543#, c-format
473eb541
JX
6544msgid "could not freshen shared index '%s'"
6545msgstr "无法刷新共享索引 '%s'"
6792b93b 6546
65387fd5 6547#: read-cache.c:2455
a0b6b246 6548#, c-format
473eb541
JX
6549msgid "broken index, expect %s in %s, got %s"
6550msgstr "损坏的索引,期望在 %2$s 中的 %1$s,得到 %3$s"
c04f5ac3 6551
65387fd5 6552#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
a0b6b246 6553#, c-format
473eb541
JX
6554msgid "could not close '%s'"
6555msgstr "不能关闭 '%s'"
c04f5ac3 6556
65387fd5 6557#: read-cache.c:3129
33b62fba
JX
6558msgid "failed to convert to a sparse-index"
6559msgstr "无法转换为稀疏索引"
6560
65387fd5 6561#: read-cache.c:3200
349ede6a 6562#, c-format
473eb541
JX
6563msgid "could not stat '%s'"
6564msgstr "不能对 '%s' 调用 stat"
349ede6a 6565
65387fd5 6566#: read-cache.c:3213
a0b6b246 6567#, c-format
473eb541
JX
6568msgid "unable to open git dir: %s"
6569msgstr "不能打开 git 目录:%s"
c04f5ac3 6570
65387fd5 6571#: read-cache.c:3225
a0b6b246 6572#, c-format
473eb541
JX
6573msgid "unable to unlink: %s"
6574msgstr "无法删除:%s"
c04f5ac3 6575
65387fd5 6576#: read-cache.c:3254
06991777 6577#, c-format
473eb541
JX
6578msgid "cannot fix permission bits on '%s'"
6579msgstr "不能修复 '%s' 的权限位"
06991777 6580
65387fd5 6581#: read-cache.c:3411
349ede6a 6582#, c-format
473eb541
JX
6583msgid "%s: cannot drop to stage #0"
6584msgstr "%s:不能落到暂存区 #0"
349ede6a 6585
473eb541
JX
6586#: rebase-interactive.c:11
6587msgid ""
6588"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
6589"continue'.\n"
6590"Or you can abort the rebase with 'git rebase --abort'.\n"
6591msgstr ""
6592"您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n"
6593"或者您可以用 'git rebase --abort' 终止变基。\n"
6594
6595#: rebase-interactive.c:33
d13389bf
JX
6596#, c-format
6597msgid ""
473eb541
JX
6598"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
6599msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
6600
6601#: rebase-interactive.c:42
6602msgid ""
d13389bf 6603"\n"
473eb541
JX
6604"Commands:\n"
6605"p, pick <commit> = use commit\n"
6606"r, reword <commit> = use commit, but edit the commit message\n"
6607"e, edit <commit> = use commit, but stop for amending\n"
6608"s, squash <commit> = use commit, but meld into previous commit\n"
33b62fba
JX
6609"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n"
6610" commit's log message, unless -C is used, in which case\n"
6611" keep only this commit's message; -c is same as -C but\n"
6612" opens the editor\n"
473eb541
JX
6613"x, exec <command> = run command (the rest of the line) using shell\n"
6614"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
6615"d, drop <commit> = remove commit\n"
6616"l, label <label> = label current HEAD with a name\n"
6617"t, reset <label> = reset HEAD to a label\n"
6618"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
6619". create a merge commit using the original merge commit's\n"
6620". message (or the oneline, if no original merge commit was\n"
33b62fba 6621". specified); use -c <commit> to reword the commit message\n"
d13389bf 6622"\n"
473eb541 6623"These lines can be re-ordered; they are executed from top to bottom.\n"
d13389bf 6624msgstr ""
d13389bf 6625"\n"
473eb541
JX
6626"命令:\n"
6627"p, pick <提交> = 使用提交\n"
33b62fba
JX
6628"r, reword <提交> = 使用提交,但编辑提交说明\n"
6629"e, edit <提交> = 使用提交,但停止以便在 shell 中修补提交\n"
6630"s, squash <提交> = 使用提交,但挤压到前一个提交\n"
6631"f, fixup [-C | -c] <提交> = 类似于 \"squash\",但只保留前一个提交\n"
6632" 的提交说明,除非使用了 -C 参数,此情况下则只\n"
6633" 保留本提交说明。使用 -c 和 -C 类似,但会打开\n"
6634" 编辑器修改提交说明\n"
473eb541
JX
6635"x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
6636"b, break = 在此处停止(使用 'git rebase --continue' 继续变基)\n"
6637"d, drop <提交> = 删除提交\n"
6638"l, label <label> = 为当前 HEAD 打上标记\n"
6639"t, reset <label> = 重置 HEAD 到该标记\n"
6640"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
6641". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
6642". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
6643". -c <提交> 可以编辑提交说明。\n"
d13389bf 6644"\n"
473eb541 6645"可以对这些行重新排序,将从上至下执行。\n"
7157c2b5 6646
33b62fba 6647#: rebase-interactive.c:66
7157c2b5 6648#, c-format
473eb541
JX
6649msgid "Rebase %s onto %s (%d command)"
6650msgid_plural "Rebase %s onto %s (%d commands)"
6651msgstr[0] "变基 %s 到 %s(%d 个提交)"
6652msgstr[1] "变基 %s 到 %s(%d 个提交)"
7157c2b5 6653
7e6630a7 6654#: rebase-interactive.c:75
473eb541
JX
6655msgid ""
6656"\n"
6657"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
6658msgstr ""
6659"\n"
6660"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
349ede6a 6661
7e6630a7 6662#: rebase-interactive.c:78
473eb541
JX
6663msgid ""
6664"\n"
6665"If you remove a line here THAT COMMIT WILL BE LOST.\n"
6666msgstr ""
6667"\n"
6668"如果您在这里删除一行,对应的提交将会丢失。\n"
349ede6a 6669
7e6630a7 6670#: rebase-interactive.c:84
473eb541
JX
6671msgid ""
6672"\n"
6673"You are editing the todo file of an ongoing interactive rebase.\n"
6674"To continue rebase after editing, run:\n"
6675" git rebase --continue\n"
6676"\n"
6677msgstr ""
6678"\n"
6679"您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基,\n"
6680"请执行:\n"
6681" git rebase --continue\n"
6682"\n"
349ede6a 6683
7e6630a7 6684#: rebase-interactive.c:89
473eb541
JX
6685msgid ""
6686"\n"
6687"However, if you remove everything, the rebase will be aborted.\n"
6688"\n"
6689msgstr ""
6690"\n"
6691"然而,如果您删除全部内容,变基操作将会终止。\n"
6692"\n"
349ede6a 6693
65387fd5
FZ
6694#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
6695#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
7e6630a7 6696#: builtin/rebase.c:190
349ede6a 6697#, c-format
473eb541
JX
6698msgid "could not write '%s'"
6699msgstr "不能写入 '%s'"
349ede6a 6700
7e6630a7 6701#: rebase-interactive.c:119
349ede6a 6702#, c-format
473eb541
JX
6703msgid "could not write '%s'."
6704msgstr "不能写入 '%s'。"
349ede6a 6705
33b62fba 6706#: rebase-interactive.c:196
349ede6a 6707#, c-format
473eb541
JX
6708msgid ""
6709"Warning: some commits may have been dropped accidentally.\n"
6710"Dropped commits (newer to older):\n"
6711msgstr ""
6712"警告:一些提交可能被意外丢弃。\n"
6713"丢弃的提交(从新到旧):\n"
7157c2b5 6714
33b62fba 6715#: rebase-interactive.c:203
349ede6a 6716#, c-format
473eb541
JX
6717msgid ""
6718"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
6719"\n"
6720"Use 'git config rebase.missingCommitsCheck' to change the level of "
6721"warnings.\n"
6722"The possible behaviours are: ignore, warn, error.\n"
6723"\n"
6724msgstr ""
6725"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
6726"\n"
6727"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
6728"可选值有:ignore、warn、error。\n"
6729"\n"
349ede6a 6730
7e6630a7 6731#: rebase.c:29
349ede6a 6732#, c-format
7e6630a7 6733msgid "%s: 'preserve' superseded by 'merges'"
65387fd5 6734msgstr "%s:'preserve' 被 'merges' 取代"
349ede6a 6735
65387fd5 6736#: ref-filter.c:42 wt-status.c:2048
473eb541
JX
6737msgid "gone"
6738msgstr "丢失"
349ede6a 6739
473eb541 6740#: ref-filter.c:43
349ede6a 6741#, c-format
473eb541
JX
6742msgid "ahead %d"
6743msgstr "领先 %d"
349ede6a 6744
473eb541 6745#: ref-filter.c:44
349ede6a 6746#, c-format
473eb541
JX
6747msgid "behind %d"
6748msgstr "落后 %d"
349ede6a 6749
473eb541 6750#: ref-filter.c:45
349ede6a 6751#, c-format
473eb541
JX
6752msgid "ahead %d, behind %d"
6753msgstr "领先 %d,落后 %d"
349ede6a 6754
7e6630a7 6755#: ref-filter.c:235
06991777 6756#, c-format
473eb541
JX
6757msgid "expected format: %%(color:<color>)"
6758msgstr "期望的格式:%%(color:<颜色>)"
06991777 6759
7e6630a7 6760#: ref-filter.c:237
a0b6b246 6761#, c-format
473eb541
JX
6762msgid "unrecognized color: %%(color:%s)"
6763msgstr "未能识别的颜色:%%(color:%s)"
c04f5ac3 6764
7e6630a7 6765#: ref-filter.c:259
c04f5ac3 6766#, c-format
473eb541
JX
6767msgid "Integer value expected refname:lstrip=%s"
6768msgstr "期望整数值 refname:lstrip=%s"
c04f5ac3 6769
7e6630a7 6770#: ref-filter.c:263
a0b6b246 6771#, c-format
473eb541
JX
6772msgid "Integer value expected refname:rstrip=%s"
6773msgstr "期望整数值 refname:rstrip=%s"
c04f5ac3 6774
65387fd5
FZ
6775#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
6776#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
06991777 6777#, c-format
473eb541
JX
6778msgid "unrecognized %%(%s) argument: %s"
6779msgstr "未能识别的 %%(%s) 参数:%s"
06991777 6780
7e6630a7 6781#: ref-filter.c:320
06991777 6782#, c-format
473eb541
JX
6783msgid "%%(objecttype) does not take arguments"
6784msgstr "%%(objecttype) 不带参数"
06991777 6785
7e6630a7 6786#: ref-filter.c:352
06991777 6787#, c-format
473eb541
JX
6788msgid "%%(deltabase) does not take arguments"
6789msgstr "%%(deltabase) 不带参数"
06991777 6790
7e6630a7 6791#: ref-filter.c:364
06991777 6792#, c-format
473eb541
JX
6793msgid "%%(body) does not take arguments"
6794msgstr "%%(body) 不带参数"
06991777 6795
7e6630a7 6796#: ref-filter.c:396
06991777 6797#, c-format
473eb541
JX
6798msgid "expected %%(trailers:key=<value>)"
6799msgstr "预期 %%(trailers:key=<值>)"
06991777 6800
7e6630a7 6801#: ref-filter.c:398
06991777 6802#, c-format
473eb541
JX
6803msgid "unknown %%(trailers) argument: %s"
6804msgstr "未知的 %%(trailers) 参数:%s"
06991777 6805
7e6630a7 6806#: ref-filter.c:429
06991777 6807#, c-format
473eb541
JX
6808msgid "positive value expected contents:lines=%s"
6809msgstr "期望一个正数 contents:lines=%s"
06991777 6810
7e6630a7 6811#: ref-filter.c:458
06991777 6812#, c-format
473eb541
JX
6813msgid "positive value expected '%s' in %%(%s)"
6814msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数"
06991777 6815
7e6630a7 6816#: ref-filter.c:476
06991777 6817#, c-format
473eb541
JX
6818msgid "unrecognized email option: %s"
6819msgstr "未识别的邮件选项:%s"
c04f5ac3 6820
7e6630a7 6821#: ref-filter.c:506
a0b6b246 6822#, c-format
473eb541
JX
6823msgid "expected format: %%(align:<width>,<position>)"
6824msgstr "期望的格式:%%(align:<宽度>,<位置>)"
c04f5ac3 6825
7e6630a7 6826#: ref-filter.c:518
a0b6b246 6827#, c-format
473eb541
JX
6828msgid "unrecognized position:%s"
6829msgstr "未能识别的位置:%s"
c04f5ac3 6830
7e6630a7 6831#: ref-filter.c:525
a0b6b246 6832#, c-format
473eb541
JX
6833msgid "unrecognized width:%s"
6834msgstr "未能识别的宽度:%s"
c04f5ac3 6835
7e6630a7 6836#: ref-filter.c:542
a0b6b246 6837#, c-format
473eb541
JX
6838msgid "positive width expected with the %%(align) atom"
6839msgstr "元素 %%(align) 需要一个正数的宽度"
cfff71a9 6840
7e6630a7
FZ
6841#: ref-filter.c:568
6842#, c-format
6843msgid "%%(rest) does not take arguments"
6844msgstr "%%(rest) 不带参数"
6845
6846#: ref-filter.c:680
06991777 6847#, c-format
473eb541
JX
6848msgid "malformed field name: %.*s"
6849msgstr "格式错误的字段名:%.*s"
06991777 6850
7e6630a7 6851#: ref-filter.c:707
06991777 6852#, c-format
473eb541
JX
6853msgid "unknown field name: %.*s"
6854msgstr "未知的字段名:%.*s"
06991777 6855
7e6630a7 6856#: ref-filter.c:711
a0b6b246 6857#, c-format
473eb541
JX
6858msgid ""
6859"not a git repository, but the field '%.*s' requires access to object data"
6860msgstr "不是 git 仓库,但是字段 '%.*s' 需要访问对象数据"
6c94aba5 6861
65387fd5 6862#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
31e5e17b 6863#, c-format
65387fd5
FZ
6864msgid "format: %%(%s) atom used without a %%(%s) atom"
6865msgstr "格式:在没有 %%(%2$s) 元素的情况下使用了 %%(%1$s) 元素"
31e5e17b 6866
7e6630a7 6867#: ref-filter.c:912
31e5e17b 6868#, c-format
473eb541
JX
6869msgid "format: %%(then) atom used more than once"
6870msgstr "格式:%%(then) 元素用了多次"
31e5e17b 6871
7e6630a7 6872#: ref-filter.c:914
a0b6b246 6873#, c-format
473eb541
JX
6874msgid "format: %%(then) atom used after %%(else)"
6875msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
cfff71a9 6876
7e6630a7 6877#: ref-filter.c:950
473eb541
JX
6878#, c-format
6879msgid "format: %%(else) atom used more than once"
6880msgstr "格式:%%(else) 元素用了多次"
c04f5ac3 6881
7e6630a7 6882#: ref-filter.c:965
a0b6b246 6883#, c-format
473eb541
JX
6884msgid "format: %%(end) atom used without corresponding atom"
6885msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
90314792 6886
7e6630a7 6887#: ref-filter.c:1027
473eb541
JX
6888#, c-format
6889msgid "malformed format string %s"
6890msgstr "错误的格式化字符串 %s"
90314792 6891
7e6630a7
FZ
6892#: ref-filter.c:1033
6893#, c-format
6894msgid "this command reject atom %%(%.*s)"
6895msgstr "这个命令拒绝元素 %%(%.*s)"
6896
6897#: ref-filter.c:1040
6898#, c-format
84bf71ea 6899msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
7e6630a7
FZ
6900msgstr "--format=%.*s 不能和 --python、--shell、--tcl 同时使用"
6901
6902#: ref-filter.c:1706
06991777 6903#, c-format
473eb541
JX
6904msgid "(no branch, rebasing %s)"
6905msgstr "(非分支,正变基 %s)"
06991777 6906
7e6630a7 6907#: ref-filter.c:1709
c1ac5258 6908#, c-format
473eb541
JX
6909msgid "(no branch, rebasing detached HEAD %s)"
6910msgstr "(非分支,正变基分离头指针 %s)"
c1ac5258 6911
7e6630a7 6912#: ref-filter.c:1712
c1ac5258 6913#, c-format
473eb541
JX
6914msgid "(no branch, bisect started on %s)"
6915msgstr "(非分支,二分查找开始于 %s)"
c1ac5258 6916
7e6630a7 6917#: ref-filter.c:1716
c1ac5258 6918#, c-format
473eb541
JX
6919msgid "(HEAD detached at %s)"
6920msgstr "(头指针在 %s 分离)"
c1ac5258 6921
7e6630a7 6922#: ref-filter.c:1719
473eb541
JX
6923#, c-format
6924msgid "(HEAD detached from %s)"
6925msgstr "(头指针自 %s 分离)"
4c27fcb5 6926
7e6630a7 6927#: ref-filter.c:1722
473eb541
JX
6928msgid "(no branch)"
6929msgstr "(非分支)"
cfff71a9 6930
7e6630a7 6931#: ref-filter.c:1754 ref-filter.c:1972
4c27fcb5 6932#, c-format
473eb541
JX
6933msgid "missing object %s for %s"
6934msgstr "缺失 %2$s 的对象 %1$s"
6792b93b 6935
7e6630a7 6936#: ref-filter.c:1764
4c27fcb5 6937#, c-format
473eb541
JX
6938msgid "parse_object_buffer failed on %s for %s"
6939msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
5c57d762 6940
7e6630a7 6941#: ref-filter.c:2155
5809aa05 6942#, c-format
473eb541
JX
6943msgid "malformed object at '%s'"
6944msgstr "格式错误的对象 '%s'"
5809aa05 6945
7e6630a7 6946#: ref-filter.c:2245
4c27fcb5 6947#, c-format
473eb541
JX
6948msgid "ignoring ref with broken name %s"
6949msgstr "忽略带有错误名称 %s 的引用"
31e5e17b 6950
65387fd5 6951#: ref-filter.c:2250 refs.c:676
87cb7997 6952#, c-format
473eb541
JX
6953msgid "ignoring broken ref %s"
6954msgstr "忽略损坏的引用 %s"
87cb7997 6955
65387fd5 6956#: ref-filter.c:2629
87cb7997 6957#, c-format
473eb541
JX
6958msgid "format: %%(end) atom missing"
6959msgstr "格式:缺少 %%(end) 元素"
87cb7997 6960
65387fd5 6961#: ref-filter.c:2740
4c27fcb5 6962#, c-format
473eb541
JX
6963msgid "malformed object name %s"
6964msgstr "格式错误的对象名 %s"
6792b93b 6965
65387fd5 6966#: ref-filter.c:2745
4c27fcb5 6967#, c-format
473eb541
JX
6968msgid "option `%s' must point to a commit"
6969msgstr "选项 `%s' 必须指向一个提交"
4c27fcb5 6970
7e6630a7 6971#: refs.c:261
4c27fcb5 6972#, c-format
473eb541
JX
6973msgid "%s does not point to a valid object!"
6974msgstr "%s 没有指向一个有效的对象!"
4c27fcb5 6975
7e6630a7 6976#: refs.c:563
4c27fcb5 6977#, c-format
473eb541
JX
6978msgid ""
6979"Using '%s' as the name for the initial branch. This default branch name\n"
6980"is subject to change. To configure the initial branch name to use in all\n"
6981"of your new repositories, which will suppress this warning, call:\n"
6982"\n"
6983"\tgit config --global init.defaultBranch <name>\n"
6984"\n"
6985"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
6986"'development'. The just-created branch can be renamed via this command:\n"
6987"\n"
6988"\tgit branch -m <name>\n"
6989msgstr ""
6990"使用 '%s' 作为初始分支的名称。这个默认分支名称可能会更改。要在新仓库中\n"
6991"配置使用初始分支名,并消除这条警告,请执行:\n"
6992"\n"
6993"\tgit config --global init.defaultBranch <名称>\n"
6994"\n"
6995"除了 'master' 之外,通常选定的名字有 'main'、'trunk' 和 'development'。\n"
6996"可以通过以下命令重命名刚创建的分支:\n"
6997"\n"
6998"\tgit branch -m <name>\n"
4c27fcb5 6999
7e6630a7 7000#: refs.c:585
4c27fcb5 7001#, c-format
473eb541
JX
7002msgid "could not retrieve `%s`"
7003msgstr "无法获取 `%s`"
4c27fcb5 7004
7e6630a7 7005#: refs.c:595
4c27fcb5 7006#, c-format
473eb541
JX
7007msgid "invalid branch name: %s = %s"
7008msgstr "无效的分支名:%s = %s"
4c27fcb5 7009
65387fd5 7010#: refs.c:674
4c27fcb5 7011#, c-format
473eb541
JX
7012msgid "ignoring dangling symref %s"
7013msgstr "忽略悬空符号引用 %s"
4c27fcb5 7014
65387fd5 7015#: refs.c:925
4c27fcb5 7016#, c-format
473eb541
JX
7017msgid "log for ref %s has gap after %s"
7018msgstr "引用 %s 的日志在 %s 之后有缺口"
4c27fcb5 7019
65387fd5 7020#: refs.c:932
4c27fcb5 7021#, c-format
473eb541
JX
7022msgid "log for ref %s unexpectedly ended on %s"
7023msgstr "引用 %s 的日志意外终止于 %s "
4c27fcb5 7024
65387fd5 7025#: refs.c:997
4c27fcb5 7026#, c-format
473eb541
JX
7027msgid "log for %s is empty"
7028msgstr "%s 的日志为空"
349ede6a 7029
65387fd5 7030#: refs.c:1090
349ede6a 7031#, c-format
473eb541
JX
7032msgid "refusing to update ref with bad name '%s'"
7033msgstr "拒绝更新有错误名称 '%s' 的引用"
d9488fea 7034
65387fd5 7035#: refs.c:1168
d9488fea 7036#, c-format
473eb541
JX
7037msgid "update_ref failed for ref '%s': %s"
7038msgstr "对引用 '%s' 执行 update_ref 失败:%s"
4c27fcb5 7039
ee27abd3 7040#: refs.c:2067
4c27fcb5 7041#, c-format
473eb541
JX
7042msgid "multiple updates for ref '%s' not allowed"
7043msgstr "不允许对引用 '%s' 多次更新"
4c27fcb5 7044
ee27abd3 7045#: refs.c:2150
473eb541
JX
7046msgid "ref updates forbidden inside quarantine environment"
7047msgstr "在隔离环境中禁止更新引用"
d46c5519 7048
ee27abd3 7049#: refs.c:2161
473eb541
JX
7050msgid "ref updates aborted by hook"
7051msgstr "引用更新被钩子中止"
4c27fcb5 7052
ee27abd3 7053#: refs.c:2269 refs.c:2299
4c27fcb5 7054#, c-format
473eb541
JX
7055msgid "'%s' exists; cannot create '%s'"
7056msgstr "'%s' 已存在,无法创建 '%s'"
4c27fcb5 7057
ee27abd3 7058#: refs.c:2275 refs.c:2310
4c27fcb5 7059#, c-format
473eb541
JX
7060msgid "cannot process '%s' and '%s' at the same time"
7061msgstr "无法同时处理 '%s' 和 '%s'"
4c27fcb5 7062
ee27abd3 7063#: refs/files-backend.c:1267
4c27fcb5 7064#, c-format
473eb541
JX
7065msgid "could not remove reference %s"
7066msgstr "无法删除引用 %s"
4c27fcb5 7067
ee27abd3 7068#: refs/files-backend.c:1281 refs/packed-backend.c:1549
7e6630a7 7069#: refs/packed-backend.c:1559
4c27fcb5 7070#, c-format
473eb541
JX
7071msgid "could not delete reference %s: %s"
7072msgstr "无法删除引用 %s:%s"
4c27fcb5 7073
ee27abd3 7074#: refs/files-backend.c:1284 refs/packed-backend.c:1562
473eb541
JX
7075#, c-format
7076msgid "could not delete references: %s"
7077msgstr "无法删除引用:%s"
7157c2b5 7078
473eb541
JX
7079#: refspec.c:170
7080#, c-format
7081msgid "invalid refspec '%s'"
33b62fba 7082msgstr "无效的引用规格:'%s'"
6792b93b 7083
65387fd5 7084#: remote.c:402
473eb541
JX
7085#, c-format
7086msgid "config remote shorthand cannot begin with '/': %s"
7087msgstr "配置的远程短名称不能以 '/' 开始:%s"
6792b93b 7088
65387fd5 7089#: remote.c:450
473eb541
JX
7090msgid "more than one receivepack given, using the first"
7091msgstr "提供了一个以上的 receivepack,使用第一个"
6792b93b 7092
65387fd5 7093#: remote.c:458
473eb541
JX
7094msgid "more than one uploadpack given, using the first"
7095msgstr "提供了一个以上的 uploadpack,使用第一个"
6792b93b 7096
65387fd5 7097#: remote.c:699
31e5e17b 7098#, c-format
473eb541
JX
7099msgid "Cannot fetch both %s and %s to %s"
7100msgstr "不能同时获取 %s 和 %s 至 %s"
31e5e17b 7101
65387fd5 7102#: remote.c:703
fd8cb379 7103#, c-format
473eb541
JX
7104msgid "%s usually tracks %s, not %s"
7105msgstr "%s 通常跟踪 %s,而非 %s"
fd8cb379 7106
65387fd5 7107#: remote.c:707
a6cd2cc4 7108#, c-format
473eb541
JX
7109msgid "%s tracks both %s and %s"
7110msgstr "%s 同时跟踪 %s 和 %s"
a6cd2cc4 7111
65387fd5 7112#: remote.c:775
473eb541
JX
7113#, c-format
7114msgid "key '%s' of pattern had no '*'"
7115msgstr "模式的键 '%s' 没有 '*'"
6792b93b 7116
65387fd5 7117#: remote.c:785
473eb541
JX
7118#, c-format
7119msgid "value '%s' of pattern has no '*'"
7120msgstr "模式的值 '%s' 没有 '*'"
a0b6b246 7121
65387fd5 7122#: remote.c:1192
473eb541
JX
7123#, c-format
7124msgid "src refspec %s does not match any"
33b62fba 7125msgstr "源引用规格 %s 没有匹配"
2b472aae 7126
65387fd5 7127#: remote.c:1197
1a79b2f1 7128#, c-format
473eb541 7129msgid "src refspec %s matches more than one"
33b62fba 7130msgstr "源引用规格 %s 匹配超过一个"
1a79b2f1 7131
473eb541
JX
7132#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
7133#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
7134#. the <src>.
7135#.
65387fd5 7136#: remote.c:1212
473eb541 7137#, c-format
a0b6b246 7138msgid ""
473eb541
JX
7139"The destination you provided is not a full refname (i.e.,\n"
7140"starting with \"refs/\"). We tried to guess what you meant by:\n"
7141"\n"
7142"- Looking for a ref that matches '%s' on the remote side.\n"
7143"- Checking if the <src> being pushed ('%s')\n"
7144" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
7145" refs/{heads,tags}/ prefix on the remote side.\n"
7146"\n"
7147"Neither worked, so we gave up. You must fully qualify the ref."
a0b6b246 7148msgstr ""
473eb541
JX
7149"您提供的目标不是一个完整的引用名称(即以 \"refs/\" 开头)。我们\n"
7150"试着猜测您的想法:\n"
7151"\n"
7152"- 在远端查询和 '%s' 匹配的引用。\n"
7153"- 检查要推送的 <src>('%s')是不是在 \"refs/{heads,tags}/\" 中的\n"
7154" 引用。如果是,我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n"
7155"\n"
7156"都不行,所以我们已放弃。您必须给出完整的引用。"
a0b6b246 7157
65387fd5 7158#: remote.c:1232
473eb541 7159#, c-format
a0b6b246 7160msgid ""
473eb541
JX
7161"The <src> part of the refspec is a commit object.\n"
7162"Did you mean to create a new branch by pushing to\n"
7163"'%s:refs/heads/%s'?"
a0b6b246 7164msgstr ""
33b62fba 7165"引用规格的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
473eb541 7166"'%s:refs/heads/%s' 推送么?"
1b7f4a34 7167
65387fd5 7168#: remote.c:1237
d9488fea 7169#, c-format
473eb541
JX
7170msgid ""
7171"The <src> part of the refspec is a tag object.\n"
7172"Did you mean to create a new tag by pushing to\n"
7173"'%s:refs/tags/%s'?"
7174msgstr ""
33b62fba 7175"引用规格的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
473eb541 7176"'%s:refs/tags/%s' 推送么?"
d9488fea 7177
65387fd5 7178#: remote.c:1242
a0b6b246 7179#, c-format
473eb541
JX
7180msgid ""
7181"The <src> part of the refspec is a tree object.\n"
7182"Did you mean to tag a new tree by pushing to\n"
7183"'%s:refs/tags/%s'?"
7184msgstr ""
33b62fba 7185"引用规格的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
473eb541 7186"'%s:refs/tags/%s' 推送么?"
1b7f4a34 7187
65387fd5 7188#: remote.c:1247
1b7f4a34 7189#, c-format
473eb541
JX
7190msgid ""
7191"The <src> part of the refspec is a blob object.\n"
7192"Did you mean to tag a new blob by pushing to\n"
7193"'%s:refs/tags/%s'?"
7194msgstr ""
33b62fba 7195"引用规格的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
473eb541 7196"'%s:refs/tags/%s' 推送么?"
1b7f4a34 7197
65387fd5 7198#: remote.c:1283
63af42fe 7199#, c-format
473eb541
JX
7200msgid "%s cannot be resolved to branch"
7201msgstr "%s 无法被解析为分支"
6792b93b 7202
65387fd5 7203#: remote.c:1294
a0b6b246 7204#, c-format
473eb541
JX
7205msgid "unable to delete '%s': remote ref does not exist"
7206msgstr "无法删除 '%s':远程引用不存在"
6792b93b 7207
65387fd5 7208#: remote.c:1306
d46c5519 7209#, c-format
473eb541 7210msgid "dst refspec %s matches more than one"
33b62fba 7211msgstr "目标引用规格 %s 匹配超过一个"
d46c5519 7212
65387fd5 7213#: remote.c:1313
a0b6b246 7214#, c-format
473eb541
JX
7215msgid "dst ref %s receives from more than one src"
7216msgstr "目标引用 %s 接收超过一个源"
6792b93b 7217
65387fd5 7218#: remote.c:1834 remote.c:1941
473eb541
JX
7219msgid "HEAD does not point to a branch"
7220msgstr "HEAD 没有指向一个分支"
fd8cb379 7221
65387fd5 7222#: remote.c:1843
4c27fcb5 7223#, c-format
473eb541
JX
7224msgid "no such branch: '%s'"
7225msgstr "没有此分支:'%s'"
4c27fcb5 7226
65387fd5 7227#: remote.c:1846
c1ac5258 7228#, c-format
473eb541
JX
7229msgid "no upstream configured for branch '%s'"
7230msgstr "尚未给分支 '%s' 设置上游"
c1ac5258 7231
65387fd5 7232#: remote.c:1852
c1ac5258 7233#, c-format
473eb541
JX
7234msgid "upstream branch '%s' not stored as a remote-tracking branch"
7235msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
4c27fcb5 7236
65387fd5 7237#: remote.c:1867
4c27fcb5 7238#, c-format
473eb541
JX
7239msgid "push destination '%s' on remote '%s' has no local tracking branch"
7240msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
4c27fcb5 7241
65387fd5 7242#: remote.c:1882
473eb541
JX
7243#, c-format
7244msgid "branch '%s' has no remote for pushing"
7245msgstr "分支 '%s' 没有设置要推送的远程服务器"
4c27fcb5 7246
65387fd5 7247#: remote.c:1892
63af42fe 7248#, c-format
473eb541
JX
7249msgid "push refspecs for '%s' do not include '%s'"
7250msgstr "向 '%s' 推送引用规格未包含 '%s'"
6792b93b 7251
65387fd5 7252#: remote.c:1905
473eb541
JX
7253msgid "push has no destination (push.default is 'nothing')"
7254msgstr "推送无目标(push.default 是 'nothing')"
31e5e17b 7255
65387fd5 7256#: remote.c:1927
473eb541
JX
7257msgid "cannot resolve 'simple' push to a single destination"
7258msgstr "无法解析 'simple' 推送至一个单独的目标"
31e5e17b 7259
65387fd5 7260#: remote.c:2060
473eb541
JX
7261#, c-format
7262msgid "couldn't find remote ref %s"
7263msgstr "无法找到远程引用 %s"
31e5e17b 7264
65387fd5 7265#: remote.c:2073
473eb541
JX
7266#, c-format
7267msgid "* Ignoring funny ref '%s' locally"
7268msgstr "* 在本地忽略可笑的引用 '%s'"
31e5e17b 7269
65387fd5 7270#: remote.c:2236
473eb541
JX
7271#, c-format
7272msgid "Your branch is based on '%s', but the upstream is gone.\n"
7273msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
31e5e17b 7274
65387fd5 7275#: remote.c:2240
473eb541
JX
7276msgid " (use \"git branch --unset-upstream\" to fixup)\n"
7277msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
31e5e17b 7278
65387fd5 7279#: remote.c:2243
473eb541
JX
7280#, c-format
7281msgid "Your branch is up to date with '%s'.\n"
7282msgstr "您的分支与上游分支 '%s' 一致。\n"
31e5e17b 7283
65387fd5 7284#: remote.c:2247
473eb541
JX
7285#, c-format
7286msgid "Your branch and '%s' refer to different commits.\n"
7287msgstr "您的分支和 '%s' 指向不同的提交。\n"
31e5e17b 7288
65387fd5 7289#: remote.c:2250
473eb541
JX
7290#, c-format
7291msgid " (use \"%s\" for details)\n"
7292msgstr " (使用 \"%s\" 查看详情)\n"
31e5e17b 7293
65387fd5 7294#: remote.c:2254
31e5e17b 7295#, c-format
473eb541
JX
7296msgid "Your branch is ahead of '%s' by %d commit.\n"
7297msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
7298msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
7299msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
31e5e17b 7300
65387fd5 7301#: remote.c:2260
473eb541
JX
7302msgid " (use \"git push\" to publish your local commits)\n"
7303msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
31e5e17b 7304
65387fd5 7305#: remote.c:2263
473eb541
JX
7306#, c-format
7307msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
7308msgid_plural ""
7309"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
7310msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
7311msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
31e5e17b 7312
473eb541 7313# 译者:注意保持前导空格
65387fd5 7314#: remote.c:2271
473eb541
JX
7315msgid " (use \"git pull\" to update your local branch)\n"
7316msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
31e5e17b 7317
65387fd5 7318#: remote.c:2274
31e5e17b 7319#, c-format
473eb541
JX
7320msgid ""
7321"Your branch and '%s' have diverged,\n"
7322"and have %d and %d different commit each, respectively.\n"
7323msgid_plural ""
7324"Your branch and '%s' have diverged,\n"
7325"and have %d and %d different commits each, respectively.\n"
7326msgstr[0] ""
7327"您的分支和 '%s' 出现了偏离,\n"
7328"并且分别有 %d 和 %d 处不同的提交。\n"
7329msgstr[1] ""
7330"您的分支和 '%s' 出现了偏离,\n"
7331"并且分别有 %d 和 %d 处不同的提交。\n"
7332
7333# 译者:注意保持前导空格
65387fd5 7334#: remote.c:2284
473eb541
JX
7335msgid " (use \"git pull\" to merge the remote branch into yours)\n"
7336msgstr " (使用 \"git pull\" 来合并远程分支)\n"
31e5e17b 7337
65387fd5 7338#: remote.c:2476
d9488fea 7339#, c-format
473eb541
JX
7340msgid "cannot parse expected object name '%s'"
7341msgstr "无法解析期望的对象名 '%s'"
d9488fea 7342
473eb541
JX
7343#: replace-object.c:21
7344#, c-format
7345msgid "bad replace ref name: %s"
7346msgstr "错误的替换引用名称:%s"
d9488fea 7347
473eb541
JX
7348#: replace-object.c:30
7349#, c-format
7350msgid "duplicate replace ref: %s"
7351msgstr "重复的替换引用:%s"
31e5e17b 7352
473eb541 7353#: replace-object.c:82
349ede6a 7354#, c-format
473eb541
JX
7355msgid "replace depth too high for object %s"
7356msgstr "对象 %s 的替换层级太深"
349ede6a 7357
473eb541
JX
7358#: rerere.c:201 rerere.c:210 rerere.c:213
7359msgid "corrupt MERGE_RR"
7360msgstr "损坏的 MERGE_RR"
7361
7362#: rerere.c:248 rerere.c:253
7363msgid "unable to write rerere record"
7364msgstr "无法写入 rerere 记录"
7365
7366#: rerere.c:479
a0b6b246 7367#, c-format
473eb541
JX
7368msgid "there were errors while writing '%s' (%s)"
7369msgstr "写入 '%s' (%s) 时出错"
6792b93b 7370
65387fd5 7371#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
63af42fe 7372#, c-format
473eb541 7373msgid "failed to flush '%s'"
65387fd5 7374msgstr "无法刷新 '%s'"
63af42fe 7375
473eb541 7376#: rerere.c:487 rerere.c:1023
c1ac5258 7377#, c-format
473eb541
JX
7378msgid "could not parse conflict hunks in '%s'"
7379msgstr "不能解析 '%s' 中的冲突块"
c1ac5258 7380
473eb541 7381#: rerere.c:668
1a79b2f1 7382#, c-format
473eb541
JX
7383msgid "failed utime() on '%s'"
7384msgstr "在 '%s' 上调用 utime() 失败"
1a79b2f1 7385
473eb541
JX
7386#: rerere.c:678
7387#, c-format
7388msgid "writing '%s' failed"
7389msgstr "写入 '%s' 失败"
1a79b2f1 7390
473eb541
JX
7391#: rerere.c:698
7392#, c-format
7393msgid "Staged '%s' using previous resolution."
7394msgstr "使用之前的解决方案暂存 '%s'。"
1a79b2f1 7395
473eb541
JX
7396#: rerere.c:737
7397#, c-format
7398msgid "Recorded resolution for '%s'."
7399msgstr "已记录 '%s' 的解决方案。"
1a79b2f1 7400
473eb541 7401#: rerere.c:772
1a79b2f1 7402#, c-format
473eb541
JX
7403msgid "Resolved '%s' using previous resolution."
7404msgstr "使用之前的解决方案解决 '%s'。"
1a79b2f1 7405
473eb541
JX
7406#: rerere.c:787
7407#, c-format
7408msgid "cannot unlink stray '%s'"
7409msgstr "不能删除 stray '%s'"
1a79b2f1 7410
473eb541 7411#: rerere.c:791
1a79b2f1 7412#, c-format
473eb541
JX
7413msgid "Recorded preimage for '%s'"
7414msgstr "为 '%s' 记录 preimage"
1a79b2f1 7415
65387fd5
FZ
7416#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
7417#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
1a79b2f1 7418#, c-format
473eb541
JX
7419msgid "could not create directory '%s'"
7420msgstr "不能创建目录 '%s'"
1a79b2f1 7421
473eb541 7422#: rerere.c:1041
1a79b2f1 7423#, c-format
473eb541 7424msgid "failed to update conflicted state in '%s'"
65387fd5 7425msgstr "无法更新 '%s' 中的冲突状态"
1a79b2f1 7426
473eb541
JX
7427#: rerere.c:1052 rerere.c:1059
7428#, c-format
7429msgid "no remembered resolution for '%s'"
7430msgstr "没有为 '%s' 记忆的解决方案"
6792b93b 7431
473eb541
JX
7432#: rerere.c:1061
7433#, c-format
7434msgid "cannot unlink '%s'"
7435msgstr "不能删除 '%s'"
fd8cb379 7436
473eb541 7437#: rerere.c:1071
a0b6b246 7438#, c-format
473eb541
JX
7439msgid "Updated preimage for '%s'"
7440msgstr "已为 '%s' 更新 preimage"
6792b93b 7441
473eb541 7442#: rerere.c:1080
a0b6b246 7443#, c-format
473eb541
JX
7444msgid "Forgot resolution for '%s'\n"
7445msgstr "忘记 '%s' 的解决方案\n"
7446
7447#: rerere.c:1191
7448msgid "unable to open rr-cache directory"
7449msgstr "不能打开 rr-cache 目录"
a0b6b246 7450
473eb541
JX
7451#: reset.c:42
7452msgid "could not determine HEAD revision"
7453msgstr "不能确定 HEAD 版本"
7454
65387fd5 7455#: reset.c:70 reset.c:76 sequencer.c:3700
1a79b2f1 7456#, c-format
473eb541 7457msgid "failed to find tree of %s"
7e6630a7 7458msgstr "无法找到 %s 指向的树"
1a79b2f1 7459
65387fd5 7460#: revision.c:2347
473eb541
JX
7461msgid "--unpacked=<packfile> no longer supported"
7462msgstr "不再支持 --unpacked=<packfile>"
7463
65387fd5 7464#: revision.c:2686
473eb541
JX
7465msgid "your current branch appears to be broken"
7466msgstr "您的当前分支好像被损坏"
7467
65387fd5 7468#: revision.c:2689
a0b6b246 7469#, c-format
473eb541
JX
7470msgid "your current branch '%s' does not have any commits yet"
7471msgstr "您的当前分支 '%s' 尚无任何提交"
7472
65387fd5 7473#: revision.c:2891
473eb541
JX
7474msgid "-L does not yet support diff formats besides -p and -s"
7475msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
7476
65387fd5 7477#: run-command.c:1262
a0b6b246 7478#, c-format
473eb541
JX
7479msgid "cannot create async thread: %s"
7480msgstr "不能创建 async 线程:%s"
a0b6b246 7481
33b62fba 7482#: send-pack.c:150
473eb541
JX
7483msgid "unexpected flush packet while reading remote unpack status"
7484msgstr "读取远程解包状态时收到意外的 flush 包"
a0b6b246 7485
33b62fba 7486#: send-pack.c:152
a0b6b246 7487#, c-format
473eb541
JX
7488msgid "unable to parse remote unpack status: %s"
7489msgstr "不能解析远程解包状态:%s"
7490
33b62fba 7491#: send-pack.c:154
473eb541
JX
7492#, c-format
7493msgid "remote unpack failed: %s"
7494msgstr "远程解包失败:%s"
7495
33b62fba 7496#: send-pack.c:378
473eb541 7497msgid "failed to sign the push certificate"
65387fd5 7498msgstr "无法为推送证书签名"
a0b6b246 7499
7e6630a7 7500#: send-pack.c:435
33b62fba
JX
7501msgid "send-pack: unable to fork off fetch subprocess"
7502msgstr "send-pack:无法派生 fetch 子进程"
7503
7e6630a7 7504#: send-pack.c:457
33b62fba 7505msgid "push negotiation failed; proceeding anyway with push"
7b4d4954 7506msgstr "推送协商失败,但还是继续推送"
33b62fba 7507
7e6630a7 7508#: send-pack.c:528
473eb541
JX
7509msgid "the receiving end does not support this repository's hash algorithm"
7510msgstr "接收端不支持这个仓库的哈希算法"
2b472aae 7511
7e6630a7 7512#: send-pack.c:537
473eb541 7513msgid "the receiving end does not support --signed push"
ec3d4607 7514msgstr "接收端不支持签名推送(--signed)"
a0b6b246 7515
7e6630a7 7516#: send-pack.c:539
473eb541
JX
7517msgid ""
7518"not sending a push certificate since the receiving end does not support --"
7519"signed push"
ec3d4607 7520msgstr "未发送推送证书,因为接收端不支持签名推送(--signed)"
a0b6b246 7521
7e6630a7 7522#: send-pack.c:546
473eb541 7523msgid "the receiving end does not support --atomic push"
ec3d4607 7524msgstr "接收端不支持原子推送(--atomic)"
5809aa05 7525
7e6630a7 7526#: send-pack.c:551
473eb541
JX
7527msgid "the receiving end does not support push options"
7528msgstr "接收端不支持推送选项"
5809aa05 7529
7e6630a7 7530#: sequencer.c:197
d46c5519 7531#, c-format
473eb541
JX
7532msgid "invalid commit message cleanup mode '%s'"
7533msgstr "无效的提交信息清理模式 '%s'"
d46c5519 7534
7e6630a7 7535#: sequencer.c:325
a0b6b246 7536#, c-format
473eb541
JX
7537msgid "could not delete '%s'"
7538msgstr "无法删除 '%s'"
a0b6b246 7539
65387fd5
FZ
7540#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
7541#: builtin/rm.c:409
1a79b2f1 7542#, c-format
473eb541
JX
7543msgid "could not remove '%s'"
7544msgstr "无法删除 '%s'"
a0b6b246 7545
7e6630a7 7546#: sequencer.c:355
473eb541
JX
7547msgid "revert"
7548msgstr "还原"
a6cd2cc4 7549
7e6630a7 7550#: sequencer.c:357
473eb541
JX
7551msgid "cherry-pick"
7552msgstr "拣选"
a6cd2cc4 7553
7e6630a7 7554#: sequencer.c:359
473eb541
JX
7555msgid "rebase"
7556msgstr "变基"
1a79b2f1 7557
7e6630a7 7558#: sequencer.c:361
a0b6b246 7559#, c-format
473eb541
JX
7560msgid "unknown action: %d"
7561msgstr "未知动作:%d"
1a79b2f1 7562
7e6630a7 7563#: sequencer.c:420
473eb541
JX
7564msgid ""
7565"after resolving the conflicts, mark the corrected paths\n"
7566"with 'git add <paths>' or 'git rm <paths>'"
7567msgstr ""
7568"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
7569"命令标记修正后的文件"
a0b6b246 7570
7e6630a7 7571#: sequencer.c:423
473eb541 7572msgid ""
7e6630a7
FZ
7573"After resolving the conflicts, mark them with\n"
7574"\"git add/rm <pathspec>\", then run\n"
7575"\"git cherry-pick --continue\".\n"
7576"You can instead skip this commit with \"git cherry-pick --skip\".\n"
7577"To abort and get back to the state before \"git cherry-pick\",\n"
7578"run \"git cherry-pick --abort\"."
473eb541 7579msgstr ""
7e6630a7
FZ
7580"解决所有冲突之后,用 \"git add/rm <路径规格>\" 标记它们,\n"
7581"然后执行 \"git cherry-pick --continue\"。您也可以执行\n"
7582"\"git cherry-pick --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
7583"执行 \"git cherry-pick\" 之前的状态,执行 \"git cherry-pick --abort\"。"
7584
7585#: sequencer.c:430
7586msgid ""
7587"After resolving the conflicts, mark them with\n"
7588"\"git add/rm <pathspec>\", then run\n"
7589"\"git revert --continue\".\n"
7590"You can instead skip this commit with \"git revert --skip\".\n"
7591"To abort and get back to the state before \"git revert\",\n"
7592"run \"git revert --abort\"."
7593msgstr ""
7594"解决所有冲突之后,用 \"git add/rm <路径规格>\" 标记它们,\n"
7595"然后执行 \"git revert --continue\"。您也可以执行\n"
7596"\"git revert --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
7597"执行 \"git revert\" 之前的状态,执行 \"git revert --abort\"。"
a0b6b246 7598
65387fd5 7599#: sequencer.c:448 sequencer.c:3292
a0b6b246 7600#, c-format
473eb541
JX
7601msgid "could not lock '%s'"
7602msgstr "不能锁定 '%s'"
fd8cb379 7603
65387fd5
FZ
7604#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
7605#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
a0b6b246 7606#, c-format
473eb541
JX
7607msgid "could not write to '%s'"
7608msgstr "不能写入 '%s'"
a0b6b246 7609
7e6630a7 7610#: sequencer.c:455
473eb541
JX
7611#, c-format
7612msgid "could not write eol to '%s'"
7613msgstr "不能将换行符写入 '%s'"
c1ac5258 7614
65387fd5
FZ
7615#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
7616#: sequencer.c:3569
473eb541
JX
7617#, c-format
7618msgid "failed to finalize '%s'"
7619msgstr "无法完成 '%s'"
a0b6b246 7620
65387fd5
FZ
7621#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
7622#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
7623#, c-format
7624msgid "could not read '%s'"
7625msgstr "不能读取 '%s'"
7626
7e6630a7 7627#: sequencer.c:499
a6cd2cc4 7628#, c-format
473eb541
JX
7629msgid "your local changes would be overwritten by %s."
7630msgstr "您的本地修改将被%s覆盖。"
a6cd2cc4 7631
7e6630a7 7632#: sequencer.c:503
473eb541
JX
7633msgid "commit your changes or stash them to proceed."
7634msgstr "提交您的修改或贮藏后再继续。"
a6cd2cc4 7635
7e6630a7 7636#: sequencer.c:535
a6cd2cc4 7637#, c-format
473eb541
JX
7638msgid "%s: fast-forward"
7639msgstr "%s:快进"
a0b6b246 7640
65387fd5 7641#: sequencer.c:574 builtin/tag.c:614
a0b6b246 7642#, c-format
473eb541
JX
7643msgid "Invalid cleanup mode %s"
7644msgstr "无效的清理模式 %s"
a0b6b246 7645
473eb541
JX
7646#. TRANSLATORS: %s will be "revert", "cherry-pick" or
7647#. "rebase".
7648#.
7e6630a7 7649#: sequencer.c:685
473eb541
JX
7650#, c-format
7651msgid "%s: Unable to write new index file"
7652msgstr "%s:无法写入新索引文件"
a0b6b246 7653
7e6630a7 7654#: sequencer.c:699
473eb541
JX
7655msgid "unable to update cache tree"
7656msgstr "不能更新缓存树"
a0b6b246 7657
7e6630a7 7658#: sequencer.c:713
473eb541
JX
7659msgid "could not resolve HEAD commit"
7660msgstr "不能解析 HEAD 提交"
a0b6b246 7661
7e6630a7 7662#: sequencer.c:793
a0b6b246 7663#, c-format
473eb541
JX
7664msgid "no key present in '%.*s'"
7665msgstr "在 '%.*s' 中没有 key"
a0b6b246 7666
7e6630a7 7667#: sequencer.c:804
a0b6b246 7668#, c-format
473eb541
JX
7669msgid "unable to dequote value of '%s'"
7670msgstr "无法为 '%s' 的值去引号"
a0b6b246 7671
65387fd5
FZ
7672#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
7673#: builtin/am.c:848 builtin/rebase.c:694
a0b6b246 7674#, c-format
473eb541
JX
7675msgid "could not open '%s' for reading"
7676msgstr "无法打开 '%s' 进行读取"
a6cd2cc4 7677
7e6630a7 7678#: sequencer.c:851
473eb541
JX
7679msgid "'GIT_AUTHOR_NAME' already given"
7680msgstr "已经给出 'GIT_AUTHOR_NAME'"
a6cd2cc4 7681
7e6630a7 7682#: sequencer.c:856
473eb541
JX
7683msgid "'GIT_AUTHOR_EMAIL' already given"
7684msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
a6cd2cc4 7685
7e6630a7 7686#: sequencer.c:861
473eb541
JX
7687msgid "'GIT_AUTHOR_DATE' already given"
7688msgstr "已经给出 'GIT_AUTHOR_DATE'"
a6cd2cc4 7689
7e6630a7 7690#: sequencer.c:865
a6cd2cc4 7691#, c-format
473eb541
JX
7692msgid "unknown variable '%s'"
7693msgstr "未知变量 '%s'"
a6cd2cc4 7694
7e6630a7 7695#: sequencer.c:870
473eb541
JX
7696msgid "missing 'GIT_AUTHOR_NAME'"
7697msgstr "缺少 'GIT_AUTHOR_NAME'"
1a79b2f1 7698
7e6630a7 7699#: sequencer.c:872
473eb541
JX
7700msgid "missing 'GIT_AUTHOR_EMAIL'"
7701msgstr "缺少 'GIT_AUTHOR_EMAIL'"
c1ac5258 7702
7e6630a7 7703#: sequencer.c:874
473eb541
JX
7704msgid "missing 'GIT_AUTHOR_DATE'"
7705msgstr "缺少 'GIT_AUTHOR_DATE'"
7706
7e6630a7 7707#: sequencer.c:939
c1ac5258
JX
7708#, c-format
7709msgid ""
473eb541
JX
7710"you have staged changes in your working tree\n"
7711"If these changes are meant to be squashed into the previous commit, run:\n"
c1ac5258
JX
7712"\n"
7713" git commit --amend %s\n"
7714"\n"
473eb541
JX
7715"If they are meant to go into a new commit, run:\n"
7716"\n"
7717" git commit %s\n"
7718"\n"
7719"In both cases, once you're done, continue with:\n"
c1ac5258
JX
7720"\n"
7721" git rebase --continue\n"
7722msgstr ""
473eb541 7723"您的工作区中存在已暂存的修改\n"
33b62fba 7724"如果这些修改需要被挤压到前一个提交,执行:\n"
c1ac5258
JX
7725"\n"
7726" git commit --amend %s\n"
7727"\n"
473eb541
JX
7728"如果这些修改要形成一个新提交,执行:\n"
7729"\n"
7730" git commit %s\n"
7731"\n"
7732"无论哪种情况,当您完成提交,继续执行:\n"
c1ac5258
JX
7733"\n"
7734" git rebase --continue\n"
7735
65387fd5 7736#: sequencer.c:1225
473eb541
JX
7737msgid "'prepare-commit-msg' hook failed"
7738msgstr "'prepare-commit-msg' 钩子失败"
349ede6a 7739
65387fd5 7740#: sequencer.c:1231
1a79b2f1 7741msgid ""
473eb541
JX
7742"Your name and email address were configured automatically based\n"
7743"on your username and hostname. Please check that they are accurate.\n"
7744"You can suppress this message by setting them explicitly. Run the\n"
7745"following command and follow the instructions in your editor to edit\n"
7746"your configuration file:\n"
1a79b2f1 7747"\n"
473eb541
JX
7748" git config --global --edit\n"
7749"\n"
7750"After doing this, you may fix the identity used for this commit with:\n"
7751"\n"
7752" git commit --amend --reset-author\n"
7753msgstr ""
7754"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
7755"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
7756"中编辑您的配置文件:\n"
1a79b2f1 7757"\n"
473eb541 7758" git config --global --edit\n"
1a79b2f1 7759"\n"
473eb541 7760"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
1a79b2f1 7761"\n"
473eb541 7762" git commit --amend --reset-author\n"
1a79b2f1 7763
65387fd5 7764#: sequencer.c:1244
1a79b2f1 7765msgid ""
473eb541
JX
7766"Your name and email address were configured automatically based\n"
7767"on your username and hostname. Please check that they are accurate.\n"
7768"You can suppress this message by setting them explicitly:\n"
1a79b2f1 7769"\n"
473eb541
JX
7770" git config --global user.name \"Your Name\"\n"
7771" git config --global user.email you@example.com\n"
7772"\n"
7773"After doing this, you may fix the identity used for this commit with:\n"
1a79b2f1 7774"\n"
473eb541 7775" git commit --amend --reset-author\n"
1a79b2f1 7776msgstr ""
473eb541
JX
7777"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
7778"与否。您可以对其进行设置以免再出现本提示信息:\n"
1a79b2f1 7779"\n"
473eb541
JX
7780" git config --global user.name \"Your Name\"\n"
7781" git config --global user.email you@example.com\n"
1a79b2f1 7782"\n"
473eb541
JX
7783"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
7784"\n"
7785" git commit --amend --reset-author\n"
1a79b2f1 7786
65387fd5 7787#: sequencer.c:1288
473eb541
JX
7788msgid "couldn't look up newly created commit"
7789msgstr "无法找到新创建的提交"
c1ac5258 7790
65387fd5 7791#: sequencer.c:1290
473eb541
JX
7792msgid "could not parse newly created commit"
7793msgstr "不能解析新创建的提交"
fd8cb379 7794
65387fd5 7795#: sequencer.c:1339
473eb541
JX
7796msgid "unable to resolve HEAD after creating commit"
7797msgstr "创建提交后,不能解析 HEAD"
fd8cb379 7798
65387fd5 7799#: sequencer.c:1342
473eb541
JX
7800msgid "detached HEAD"
7801msgstr "分离头指针"
c1ac5258 7802
473eb541 7803# 译者:中文字符串拼接,可删除前导空格
65387fd5 7804#: sequencer.c:1346
473eb541
JX
7805msgid " (root-commit)"
7806msgstr "(根提交)"
fd8cb379 7807
65387fd5 7808#: sequencer.c:1367
473eb541
JX
7809msgid "could not parse HEAD"
7810msgstr "不能解析 HEAD"
c1ac5258 7811
65387fd5 7812#: sequencer.c:1369
c1ac5258 7813#, c-format
473eb541
JX
7814msgid "HEAD %s is not a commit!"
7815msgstr "HEAD %s 不是一个提交!"
c1ac5258 7816
65387fd5 7817#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
473eb541
JX
7818msgid "could not parse HEAD commit"
7819msgstr "不能解析 HEAD 提交"
7820
65387fd5 7821#: sequencer.c:1429 sequencer.c:2314
473eb541
JX
7822msgid "unable to parse commit author"
7823msgstr "不能解析提交作者"
7824
65387fd5 7825#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
473eb541
JX
7826msgid "git write-tree failed to write a tree"
7827msgstr "git write-tree 无法写入树对象"
fd8cb379 7828
65387fd5 7829#: sequencer.c:1473 sequencer.c:1593
fd8cb379 7830#, c-format
473eb541
JX
7831msgid "unable to read commit message from '%s'"
7832msgstr "不能从 '%s' 读取提交说明"
fd8cb379 7833
65387fd5 7834#: sequencer.c:1504 sequencer.c:1536
fd8cb379 7835#, c-format
473eb541
JX
7836msgid "invalid author identity '%s'"
7837msgstr "无效的作者身份 '%s'"
fd8cb379 7838
65387fd5 7839#: sequencer.c:1510
473eb541
JX
7840msgid "corrupt author: missing date information"
7841msgstr "损坏的作者:缺失日期信息"
fd8cb379 7842
65387fd5
FZ
7843#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
7844#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
473eb541 7845msgid "failed to write commit object"
65387fd5 7846msgstr "无法写提交对象"
349ede6a 7847
65387fd5 7848#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
ec3d4607 7849#: t/helper/test-fast-rebase.c:217
1a79b2f1 7850#, c-format
473eb541
JX
7851msgid "could not update %s"
7852msgstr "不能更新 %s"
1a79b2f1 7853
65387fd5 7854#: sequencer.c:1625
1a79b2f1 7855#, c-format
473eb541
JX
7856msgid "could not parse commit %s"
7857msgstr "不能解析提交 %s"
349ede6a 7858
65387fd5 7859#: sequencer.c:1630
349ede6a 7860#, c-format
473eb541
JX
7861msgid "could not parse parent commit %s"
7862msgstr "不能解析父提交 %s"
349ede6a 7863
65387fd5 7864#: sequencer.c:1713 sequencer.c:1994
349ede6a 7865#, c-format
473eb541
JX
7866msgid "unknown command: %d"
7867msgstr "未知命令:%d"
349ede6a 7868
65387fd5 7869#: sequencer.c:1755
33b62fba
JX
7870msgid "This is the 1st commit message:"
7871msgstr "这是第一个提交说明:"
7872
65387fd5 7873#: sequencer.c:1756
33b62fba
JX
7874#, c-format
7875msgid "This is the commit message #%d:"
7876msgstr "这是提交说明 #%d:"
7877
65387fd5 7878#: sequencer.c:1757
33b62fba
JX
7879msgid "The 1st commit message will be skipped:"
7880msgstr "第一个提交说明将被跳过:"
7881
65387fd5 7882#: sequencer.c:1758
33b62fba
JX
7883#, c-format
7884msgid "The commit message #%d will be skipped:"
7885msgstr "提交说明 #%d 将被跳过:"
7886
65387fd5 7887#: sequencer.c:1759
349ede6a 7888#, c-format
473eb541
JX
7889msgid "This is a combination of %d commits."
7890msgstr "这是一个 %d 个提交的组合。"
7891
65387fd5 7892#: sequencer.c:1906 sequencer.c:1963
33b62fba
JX
7893#, c-format
7894msgid "cannot write '%s'"
7895msgstr "不能写 '%s'"
7896
65387fd5 7897#: sequencer.c:1953
473eb541
JX
7898msgid "need a HEAD to fixup"
7899msgstr "需要一个 HEAD 来修复"
7900
65387fd5 7901#: sequencer.c:1955 sequencer.c:3596
473eb541
JX
7902msgid "could not read HEAD"
7903msgstr "不能读取 HEAD"
7904
65387fd5 7905#: sequencer.c:1957
473eb541
JX
7906msgid "could not read HEAD's commit message"
7907msgstr "不能读取 HEAD 的提交说明"
1a79b2f1 7908
65387fd5 7909#: sequencer.c:1981
473eb541
JX
7910#, c-format
7911msgid "could not read commit message of %s"
7912msgstr "不能读取 %s 的提交说明"
349ede6a 7913
65387fd5 7914#: sequencer.c:2091
473eb541
JX
7915msgid "your index file is unmerged."
7916msgstr "您的索引文件未完成合并。"
7917
65387fd5 7918#: sequencer.c:2098
473eb541
JX
7919msgid "cannot fixup root commit"
7920msgstr "不能修复根提交"
4c27fcb5 7921
65387fd5 7922#: sequencer.c:2117
4c27fcb5 7923#, c-format
473eb541
JX
7924msgid "commit %s is a merge but no -m option was given."
7925msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
4c27fcb5 7926
65387fd5 7927#: sequencer.c:2125 sequencer.c:2133
fd8cb379 7928#, c-format
473eb541
JX
7929msgid "commit %s does not have parent %d"
7930msgstr "提交 %s 没有第 %d 个父提交"
fd8cb379 7931
65387fd5 7932#: sequencer.c:2139
349ede6a 7933#, c-format
473eb541
JX
7934msgid "cannot get commit message for %s"
7935msgstr "不能得到 %s 的提交说明"
349ede6a 7936
473eb541
JX
7937#. TRANSLATORS: The first %s will be a "todo" command like
7938#. "revert" or "pick", the second %s a SHA1.
65387fd5 7939#: sequencer.c:2158
1a79b2f1 7940#, c-format
473eb541
JX
7941msgid "%s: cannot parse parent commit %s"
7942msgstr "%s:不能解析父提交 %s"
1a79b2f1 7943
65387fd5 7944#: sequencer.c:2224
1a79b2f1 7945#, c-format
473eb541
JX
7946msgid "could not rename '%s' to '%s'"
7947msgstr "不能将 '%s' 重命名为 '%s'"
1a79b2f1 7948
65387fd5 7949#: sequencer.c:2284
473eb541
JX
7950#, c-format
7951msgid "could not revert %s... %s"
7952msgstr "不能还原 %s... %s"
1a79b2f1 7953
65387fd5 7954#: sequencer.c:2285
473eb541
JX
7955#, c-format
7956msgid "could not apply %s... %s"
7957msgstr "不能应用 %s... %s"
1a79b2f1 7958
65387fd5 7959#: sequencer.c:2306
1a79b2f1 7960#, c-format
473eb541
JX
7961msgid "dropping %s %s -- patch contents already upstream\n"
7962msgstr "丢弃 %s %s -- 补丁内容已在上游\n"
1a79b2f1 7963
65387fd5 7964#: sequencer.c:2364
349ede6a 7965#, c-format
473eb541
JX
7966msgid "git %s: failed to read the index"
7967msgstr "git %s:无法读取索引"
349ede6a 7968
65387fd5 7969#: sequencer.c:2372
473eb541
JX
7970#, c-format
7971msgid "git %s: failed to refresh the index"
7972msgstr "git %s:无法刷新索引"
1a79b2f1 7973
65387fd5 7974#: sequencer.c:2452
473eb541
JX
7975#, c-format
7976msgid "%s does not accept arguments: '%s'"
7977msgstr "%s 不接受参数:'%s'"
1a79b2f1 7978
65387fd5 7979#: sequencer.c:2461
1a79b2f1 7980#, c-format
473eb541
JX
7981msgid "missing arguments for %s"
7982msgstr "缺少 %s 的参数"
1a79b2f1 7983
65387fd5 7984#: sequencer.c:2504
1a79b2f1 7985#, c-format
473eb541
JX
7986msgid "could not parse '%s'"
7987msgstr "无法解析 '%s'"
1a79b2f1 7988
65387fd5 7989#: sequencer.c:2565
473eb541
JX
7990#, c-format
7991msgid "invalid line %d: %.*s"
7992msgstr "无效行 %d:%.*s"
1a79b2f1 7993
65387fd5 7994#: sequencer.c:2576
fd8cb379 7995#, c-format
473eb541
JX
7996msgid "cannot '%s' without a previous commit"
7997msgstr "没有父提交的情况下不能 '%s'"
fd8cb379 7998
65387fd5 7999#: sequencer.c:2624 builtin/rebase.c:184
7e6630a7
FZ
8000#, c-format
8001msgid "could not read '%s'."
8002msgstr "不能读取 '%s'。"
8003
65387fd5 8004#: sequencer.c:2662
473eb541
JX
8005msgid "cancelling a cherry picking in progress"
8006msgstr "正在取消一个进行中的拣选"
fd8cb379 8007
65387fd5 8008#: sequencer.c:2671
473eb541
JX
8009msgid "cancelling a revert in progress"
8010msgstr "正在取消一个进行中的还原"
1a79b2f1 8011
65387fd5 8012#: sequencer.c:2711
473eb541
JX
8013msgid "please fix this using 'git rebase --edit-todo'."
8014msgstr "请用 'git rebase --edit-todo' 来修改。"
a0b6b246 8015
65387fd5 8016#: sequencer.c:2713
a0b6b246 8017#, c-format
473eb541
JX
8018msgid "unusable instruction sheet: '%s'"
8019msgstr "不可用的指令清单:'%s'"
a0b6b246 8020
65387fd5 8021#: sequencer.c:2718
473eb541
JX
8022msgid "no commits parsed."
8023msgstr "没有解析提交。"
6937cb4e 8024
65387fd5 8025#: sequencer.c:2729
473eb541
JX
8026msgid "cannot cherry-pick during a revert."
8027msgstr "不能在回退中执行拣选。"
6937cb4e 8028
65387fd5 8029#: sequencer.c:2731
473eb541
JX
8030msgid "cannot revert during a cherry-pick."
8031msgstr "不能在拣选中执行回退。"
4c27fcb5 8032
65387fd5 8033#: sequencer.c:2809
473eb541
JX
8034#, c-format
8035msgid "invalid value for %s: %s"
8036msgstr "%s 的值无效:%s"
4c27fcb5 8037
65387fd5 8038#: sequencer.c:2918
473eb541
JX
8039msgid "unusable squash-onto"
8040msgstr "不可用的 squash-onto"
6937cb4e 8041
65387fd5 8042#: sequencer.c:2938
31e5e17b 8043#, c-format
473eb541
JX
8044msgid "malformed options sheet: '%s'"
8045msgstr "格式错误的选项清单:'%s'"
31e5e17b 8046
65387fd5 8047#: sequencer.c:3033 sequencer.c:4902
473eb541
JX
8048msgid "empty commit set passed"
8049msgstr "提供了空的提交集"
6792b93b 8050
65387fd5 8051#: sequencer.c:3050
473eb541
JX
8052msgid "revert is already in progress"
8053msgstr "一个还原操作已在进行"
6792b93b 8054
65387fd5 8055#: sequencer.c:3052
31e5e17b 8056#, c-format
473eb541
JX
8057msgid "try \"git revert (--continue | %s--abort | --quit)\""
8058msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
31e5e17b 8059
65387fd5 8060#: sequencer.c:3055
473eb541
JX
8061msgid "cherry-pick is already in progress"
8062msgstr "拣选操作已在进行"
8063
65387fd5 8064#: sequencer.c:3057
a0b6b246 8065#, c-format
473eb541
JX
8066msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
8067msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
2e8451e8 8068
65387fd5 8069#: sequencer.c:3071
473eb541
JX
8070#, c-format
8071msgid "could not create sequencer directory '%s'"
8072msgstr "不能创建序列目录 '%s'"
31e5e17b 8073
65387fd5 8074#: sequencer.c:3086
473eb541
JX
8075msgid "could not lock HEAD"
8076msgstr "不能锁定 HEAD"
31e5e17b 8077
65387fd5 8078#: sequencer.c:3146 sequencer.c:4612
473eb541
JX
8079msgid "no cherry-pick or revert in progress"
8080msgstr "拣选或还原操作并未进行"
6792b93b 8081
65387fd5 8082#: sequencer.c:3148 sequencer.c:3159
473eb541
JX
8083msgid "cannot resolve HEAD"
8084msgstr "不能解析 HEAD"
2e8451e8 8085
65387fd5 8086#: sequencer.c:3150 sequencer.c:3194
473eb541
JX
8087msgid "cannot abort from a branch yet to be born"
8088msgstr "不能从尚未建立的分支终止"
d9488fea 8089
ee27abd3
JX
8090#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
8091#: builtin/grep.c:772
1003b3a5 8092#, c-format
473eb541
JX
8093msgid "cannot open '%s'"
8094msgstr "不能打开 '%s'"
1003b3a5 8095
65387fd5 8096#: sequencer.c:3182
31e5e17b 8097#, c-format
473eb541
JX
8098msgid "cannot read '%s': %s"
8099msgstr "不能读取 '%s':%s"
31e5e17b 8100
65387fd5 8101#: sequencer.c:3183
473eb541
JX
8102msgid "unexpected end of file"
8103msgstr "意外的文件结束"
31e5e17b 8104
65387fd5 8105#: sequencer.c:3189
31e5e17b 8106#, c-format
473eb541
JX
8107msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
8108msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
31e5e17b 8109
65387fd5 8110#: sequencer.c:3200
473eb541
JX
8111msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
8112msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!"
31e5e17b 8113
65387fd5 8114#: sequencer.c:3241
473eb541
JX
8115msgid "no revert in progress"
8116msgstr "没有正在进行的还原"
31e5e17b 8117
65387fd5 8118#: sequencer.c:3250
473eb541
JX
8119msgid "no cherry-pick in progress"
8120msgstr "没有正在进行的拣选"
31e5e17b 8121
65387fd5 8122#: sequencer.c:3260
473eb541
JX
8123msgid "failed to skip the commit"
8124msgstr "无法跳过这个提交"
8125
65387fd5 8126#: sequencer.c:3267
473eb541
JX
8127msgid "there is nothing to skip"
8128msgstr "没有要跳过的"
8129
65387fd5 8130#: sequencer.c:3270
31e5e17b 8131#, c-format
473eb541
JX
8132msgid ""
8133"have you committed already?\n"
8134"try \"git %s --continue\""
8135msgstr ""
8136"您已经提交了么?\n"
8137"试试 \"git %s --continue\""
31e5e17b 8138
65387fd5 8139#: sequencer.c:3432 sequencer.c:4503
473eb541
JX
8140msgid "cannot read HEAD"
8141msgstr "不能读取 HEAD"
8142
65387fd5 8143#: sequencer.c:3449
31e5e17b 8144#, c-format
473eb541
JX
8145msgid "unable to copy '%s' to '%s'"
8146msgstr "无法拷贝 '%s' 至 '%s'"
31e5e17b 8147
65387fd5 8148#: sequencer.c:3457
473eb541
JX
8149#, c-format
8150msgid ""
8151"You can amend the commit now, with\n"
8152"\n"
8153" git commit --amend %s\n"
8154"\n"
8155"Once you are satisfied with your changes, run\n"
8156"\n"
8157" git rebase --continue\n"
8158msgstr ""
8159"您现在可以修补这个提交,使用\n"
8160"\n"
8161" git commit --amend %s\n"
8162"\n"
8163"当您对变更感到满意,执行\n"
8164"\n"
8165" git rebase --continue\n"
1003b3a5 8166
65387fd5 8167#: sequencer.c:3467
31e5e17b 8168#, c-format
473eb541
JX
8169msgid "Could not apply %s... %.*s"
8170msgstr "不能应用 %s... %.*s"
31e5e17b 8171
65387fd5 8172#: sequencer.c:3474
473eb541
JX
8173#, c-format
8174msgid "Could not merge %.*s"
8175msgstr "不能合并 %.*s"
1003b3a5 8176
65387fd5 8177#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
87cb7997 8178#, c-format
473eb541
JX
8179msgid "could not copy '%s' to '%s'"
8180msgstr "不能拷贝 '%s' 至 '%s'"
87cb7997 8181
65387fd5 8182#: sequencer.c:3503
06991777 8183#, c-format
473eb541
JX
8184msgid "Executing: %s\n"
8185msgstr "正在执行:%s\n"
06991777 8186
65387fd5 8187#: sequencer.c:3514
a0b6b246
JX
8188#, c-format
8189msgid ""
473eb541
JX
8190"execution failed: %s\n"
8191"%sYou can fix the problem, and then run\n"
8192"\n"
8193" git rebase --continue\n"
8194"\n"
a0b6b246 8195msgstr ""
473eb541
JX
8196"执行失败:%s\n"
8197"%s您可以改正该问题,然后运行\n"
8198"\n"
8199" git rebase --continue\n"
8200"\n"
1003b3a5 8201
65387fd5 8202#: sequencer.c:3520
473eb541
JX
8203msgid "and made changes to the index and/or the working tree\n"
8204msgstr "并且修改索引和/或工作区\n"
8205
65387fd5 8206#: sequencer.c:3526
a0b6b246
JX
8207#, c-format
8208msgid ""
473eb541
JX
8209"execution succeeded: %s\n"
8210"but left changes to the index and/or the working tree\n"
8211"Commit or stash your changes, and then run\n"
8212"\n"
8213" git rebase --continue\n"
8214"\n"
a0b6b246 8215msgstr ""
473eb541
JX
8216"执行成功:%s\n"
8217"但是在索引和/或工作区中存在变更\n"
8218"提交或贮藏修改,然后运行\n"
8219"\n"
8220" git rebase --continue\n"
8221"\n"
6792b93b 8222
65387fd5 8223#: sequencer.c:3586
473eb541
JX
8224#, c-format
8225msgid "illegal label name: '%.*s'"
8226msgstr "非法的标签名称:'%.*s'"
31e5e17b 8227
65387fd5 8228#: sequencer.c:3659
473eb541
JX
8229msgid "writing fake root commit"
8230msgstr "写伪根提交"
31e5e17b 8231
65387fd5 8232#: sequencer.c:3664
473eb541
JX
8233msgid "writing squash-onto"
8234msgstr "写入 squash-onto"
31e5e17b 8235
65387fd5 8236#: sequencer.c:3743
c1ac5258 8237#, c-format
473eb541
JX
8238msgid "could not resolve '%s'"
8239msgstr "无法解析 '%s'"
8240
65387fd5 8241#: sequencer.c:3775
473eb541
JX
8242msgid "cannot merge without a current revision"
8243msgstr "没有当前版本不能合并"
c1ac5258 8244
65387fd5 8245#: sequencer.c:3797
c1ac5258 8246#, c-format
473eb541
JX
8247msgid "unable to parse '%.*s'"
8248msgstr "无法解析 '%.*s'"
c1ac5258 8249
65387fd5 8250#: sequencer.c:3806
c1ac5258 8251#, c-format
473eb541
JX
8252msgid "nothing to merge: '%.*s'"
8253msgstr "无可用合并:'%.*s'"
8254
65387fd5 8255#: sequencer.c:3818
473eb541
JX
8256msgid "octopus merge cannot be executed on top of a [new root]"
8257msgstr "章鱼合并不能在一个新的根提交上执行"
c1ac5258 8258
65387fd5 8259#: sequencer.c:3873
c1ac5258 8260#, c-format
473eb541
JX
8261msgid "could not get commit message of '%s'"
8262msgstr "不能获取 '%s' 的提交说明"
c1ac5258 8263
65387fd5 8264#: sequencer.c:4019
473eb541
JX
8265#, c-format
8266msgid "could not even attempt to merge '%.*s'"
8267msgstr "甚至不能尝试合并 '%.*s'"
c1ac5258 8268
65387fd5 8269#: sequencer.c:4035
473eb541
JX
8270msgid "merge: Unable to write new index file"
8271msgstr "合并:无法写入新索引文件"
c1ac5258 8272
65387fd5 8273#: sequencer.c:4116
473eb541 8274msgid "Cannot autostash"
ec3d4607 8275msgstr "无法自动贮藏"
c1ac5258 8276
65387fd5 8277#: sequencer.c:4119
a0b6b246 8278#, c-format
473eb541 8279msgid "Unexpected stash response: '%s'"
ec3d4607 8280msgstr "意外的贮藏响应:'%s'"
a0b6b246 8281
65387fd5 8282#: sequencer.c:4125
a0b6b246 8283#, c-format
473eb541
JX
8284msgid "Could not create directory for '%s'"
8285msgstr "不能为 '%s' 创建目录"
a0b6b246 8286
65387fd5 8287#: sequencer.c:4128
a0b6b246 8288#, c-format
473eb541 8289msgid "Created autostash: %s\n"
ec3d4607 8290msgstr "创建了自动贮藏:%s\n"
a0b6b246 8291
65387fd5 8292#: sequencer.c:4132
473eb541 8293msgid "could not reset --hard"
ec3d4607 8294msgstr "无法硬性重置(reset --hard)"
a0b6b246 8295
65387fd5 8296#: sequencer.c:4157
a0b6b246 8297#, c-format
473eb541 8298msgid "Applied autostash.\n"
ec3d4607 8299msgstr "已应用自动贮藏。\n"
a0b6b246 8300
65387fd5 8301#: sequencer.c:4169
a6cd2cc4 8302#, c-format
473eb541
JX
8303msgid "cannot store %s"
8304msgstr "不能存储 %s"
a6cd2cc4 8305
65387fd5 8306#: sequencer.c:4172
c1ac5258 8307#, c-format
473eb541
JX
8308msgid ""
8309"%s\n"
8310"Your changes are safe in the stash.\n"
8311"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
8312msgstr ""
8313"%s\n"
8314"您的修改在贮藏区中很安全。\n"
8315"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
c1ac5258 8316
65387fd5 8317#: sequencer.c:4177
473eb541
JX
8318msgid "Applying autostash resulted in conflicts."
8319msgstr "应用自动贮藏导致冲突。"
c1ac5258 8320
65387fd5 8321#: sequencer.c:4178
473eb541
JX
8322msgid "Autostash exists; creating a new stash entry."
8323msgstr "自动贮藏已经存在;正在创建一个新的贮藏条目。"
8324
65387fd5 8325#: sequencer.c:4252
473eb541
JX
8326msgid "could not detach HEAD"
8327msgstr "不能分离头指针"
c1ac5258 8328
65387fd5 8329#: sequencer.c:4267
c1ac5258 8330#, c-format
473eb541
JX
8331msgid "Stopped at HEAD\n"
8332msgstr "停止在 HEAD\n"
c1ac5258 8333
65387fd5 8334#: sequencer.c:4269
c1ac5258 8335#, c-format
473eb541
JX
8336msgid "Stopped at %s\n"
8337msgstr "停止在 %s\n"
c1ac5258 8338
65387fd5 8339#: sequencer.c:4301
473eb541
JX
8340#, c-format
8341msgid ""
8342"Could not execute the todo command\n"
8343"\n"
8344" %.*s\n"
8345"It has been rescheduled; To edit the command before continuing, please\n"
8346"edit the todo list first:\n"
8347"\n"
8348" git rebase --edit-todo\n"
8349" git rebase --continue\n"
8350msgstr ""
8351"无法执行待办命令\n"
8352"\n"
8353" %.*s\n"
8354"已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n"
8355"\n"
8356" git rebase --edit-todo\n"
8357" git rebase --continue\n"
c1ac5258 8358
65387fd5 8359#: sequencer.c:4347
c1ac5258 8360#, c-format
473eb541
JX
8361msgid "Rebasing (%d/%d)%s"
8362msgstr "正在变基(%d/%d)%s"
c1ac5258 8363
65387fd5 8364#: sequencer.c:4393
c1ac5258 8365#, c-format
473eb541
JX
8366msgid "Stopped at %s... %.*s\n"
8367msgstr "停止在 %s... %.*s\n"
c1ac5258 8368
65387fd5 8369#: sequencer.c:4463
c1ac5258 8370#, c-format
473eb541
JX
8371msgid "unknown command %d"
8372msgstr "未知命令 %d"
8373
65387fd5 8374#: sequencer.c:4511
473eb541
JX
8375msgid "could not read orig-head"
8376msgstr "不能读取 orig-head"
8377
65387fd5 8378#: sequencer.c:4516
473eb541
JX
8379msgid "could not read 'onto'"
8380msgstr "不能读取 'onto'"
c1ac5258 8381
65387fd5 8382#: sequencer.c:4530
c1ac5258 8383#, c-format
473eb541
JX
8384msgid "could not update HEAD to %s"
8385msgstr "不能更新 HEAD 为 %s"
c1ac5258 8386
65387fd5 8387#: sequencer.c:4590
c1ac5258 8388#, c-format
473eb541
JX
8389msgid "Successfully rebased and updated %s.\n"
8390msgstr "成功变基并更新 %s。\n"
c1ac5258 8391
65387fd5 8392#: sequencer.c:4642
473eb541
JX
8393msgid "cannot rebase: You have unstaged changes."
8394msgstr "不能变基:您有未暂存的变更。"
8395
65387fd5 8396#: sequencer.c:4651
473eb541
JX
8397msgid "cannot amend non-existing commit"
8398msgstr "不能修补不存在的提交"
8399
65387fd5 8400#: sequencer.c:4653
c1ac5258 8401#, c-format
473eb541
JX
8402msgid "invalid file: '%s'"
8403msgstr "无效文件:'%s'"
c1ac5258 8404
65387fd5 8405#: sequencer.c:4655
c1ac5258 8406#, c-format
473eb541
JX
8407msgid "invalid contents: '%s'"
8408msgstr "无效内容:'%s'"
8409
65387fd5 8410#: sequencer.c:4658
473eb541
JX
8411msgid ""
8412"\n"
8413"You have uncommitted changes in your working tree. Please, commit them\n"
8414"first and then run 'git rebase --continue' again."
8415msgstr ""
8416"\n"
8417"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
c1ac5258 8418
65387fd5 8419#: sequencer.c:4694 sequencer.c:4733
c1ac5258 8420#, c-format
473eb541
JX
8421msgid "could not write file: '%s'"
8422msgstr "不能写入文件:'%s'"
8423
65387fd5 8424#: sequencer.c:4749
473eb541
JX
8425msgid "could not remove CHERRY_PICK_HEAD"
8426msgstr "不能删除 CHERRY_PICK_HEAD"
8427
65387fd5 8428#: sequencer.c:4759
473eb541
JX
8429msgid "could not commit staged changes."
8430msgstr "不能提交暂存的修改。"
c1ac5258 8431
65387fd5 8432#: sequencer.c:4879
c1ac5258 8433#, c-format
473eb541
JX
8434msgid "%s: can't cherry-pick a %s"
8435msgstr "%s:不能拣选一个%s"
c1ac5258 8436
65387fd5 8437#: sequencer.c:4883
c1ac5258 8438#, c-format
473eb541
JX
8439msgid "%s: bad revision"
8440msgstr "%s:错误的版本"
c1ac5258 8441
65387fd5 8442#: sequencer.c:4918
473eb541
JX
8443msgid "can't revert as initial commit"
8444msgstr "不能作为初始提交回退"
c1ac5258 8445
65387fd5 8446#: sequencer.c:5189 sequencer.c:5418
7e6630a7
FZ
8447#, c-format
8448msgid "skipped previously applied commit %s"
8449msgstr "跳过了先前已应用的提交 %s"
8450
65387fd5 8451#: sequencer.c:5259 sequencer.c:5434
7e6630a7
FZ
8452msgid "use --reapply-cherry-picks to include skipped commits"
8453msgstr "使用 --reapply-cherry-picks 来包括跳过的提交"
8454
65387fd5 8455#: sequencer.c:5405
473eb541
JX
8456msgid "make_script: unhandled options"
8457msgstr "make_script:有未能处理的选项"
c1ac5258 8458
65387fd5 8459#: sequencer.c:5408
473eb541
JX
8460msgid "make_script: error preparing revisions"
8461msgstr "make_script:准备版本时错误"
c1ac5258 8462
65387fd5 8463#: sequencer.c:5666 sequencer.c:5683
473eb541
JX
8464msgid "nothing to do"
8465msgstr "无事可做"
c1ac5258 8466
65387fd5 8467#: sequencer.c:5702
473eb541
JX
8468msgid "could not skip unnecessary pick commands"
8469msgstr "无法跳过不必要的拣选"
c1ac5258 8470
65387fd5 8471#: sequencer.c:5802
473eb541
JX
8472msgid "the script was already rearranged."
8473msgstr "脚本已经重新编排。"
c1ac5258 8474
65387fd5 8475#: setup.c:134
c1ac5258 8476#, c-format
473eb541
JX
8477msgid "'%s' is outside repository at '%s'"
8478msgstr "'%s' 在位于 '%s' 的仓库之外"
c1ac5258 8479
65387fd5 8480#: setup.c:186
c1ac5258 8481#, c-format
473eb541
JX
8482msgid ""
8483"%s: no such path in the working tree.\n"
8484"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
8485msgstr ""
8486"%s:工作区中无此路径。\n"
8487"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
c1ac5258 8488
65387fd5 8489#: setup.c:199
c1ac5258 8490#, c-format
473eb541
JX
8491msgid ""
8492"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
8493"Use '--' to separate paths from revisions, like this:\n"
8494"'git <command> [<revision>...] -- [<file>...]'"
8495msgstr ""
8496"有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
8497"使用 '--' 来分隔版本和路径,例如:\n"
8498"'git <命令> [<版本>...] -- [<文件>...]'"
c1ac5258 8499
65387fd5 8500#: setup.c:265
c1ac5258 8501#, c-format
473eb541
JX
8502msgid "option '%s' must come before non-option arguments"
8503msgstr "选项 '%s' 必须在其他非选项参数之前"
c1ac5258 8504
65387fd5 8505#: setup.c:284
473eb541
JX
8506#, c-format
8507msgid ""
8508"ambiguous argument '%s': both revision and filename\n"
8509"Use '--' to separate paths from revisions, like this:\n"
8510"'git <command> [<revision>...] -- [<file>...]'"
8511msgstr ""
8512"有歧义的参数 '%s':可同时是版本和文件\n"
8513"使用 '--' 来分隔版本和路径,例如:\n"
8514"'git <命令> [<版本>...] -- [<文件>...]'"
c1ac5258 8515
65387fd5 8516#: setup.c:420
473eb541
JX
8517msgid "unable to set up work tree using invalid config"
8518msgstr "无法使用无效配置来创建工作区"
c1ac5258 8519
65387fd5 8520#: setup.c:424 builtin/rev-parse.c:895
473eb541
JX
8521msgid "this operation must be run in a work tree"
8522msgstr "该操作必须在一个工作区中运行"
c1ac5258 8523
65387fd5 8524#: setup.c:722
c1ac5258 8525#, c-format
473eb541
JX
8526msgid "Expected git repo version <= %d, found %d"
8527msgstr "期望 git 仓库版本 <= %d,却得到 %d"
c1ac5258 8528
65387fd5 8529#: setup.c:730
ec3d4607
JX
8530msgid "unknown repository extension found:"
8531msgid_plural "unknown repository extensions found:"
8532msgstr[0] "发现未知的仓库扩展:"
8533msgstr[1] "发现未知的仓库扩展:"
c1ac5258 8534
65387fd5 8535#: setup.c:744
ec3d4607
JX
8536msgid "repo version is 0, but v1-only extension found:"
8537msgid_plural "repo version is 0, but v1-only extensions found:"
8538msgstr[0] "仓库的版本是 0,但是发现仅用于 v1 的扩展:"
8539msgstr[1] "仓库的版本是 0,但是发现仅用于 v1 的扩展:"
c1ac5258 8540
65387fd5 8541#: setup.c:765
c1ac5258 8542#, c-format
473eb541
JX
8543msgid "error opening '%s'"
8544msgstr "打开 '%s' 出错"
c1ac5258 8545
65387fd5 8546#: setup.c:767
c1ac5258 8547#, c-format
473eb541
JX
8548msgid "too large to be a .git file: '%s'"
8549msgstr "文件太大,无法作为 .git 文件:'%s'"
c1ac5258 8550
65387fd5 8551#: setup.c:769
c1ac5258 8552#, c-format
473eb541
JX
8553msgid "error reading %s"
8554msgstr "读取 %s 出错"
c1ac5258 8555
65387fd5 8556#: setup.c:771
c1ac5258 8557#, c-format
473eb541
JX
8558msgid "invalid gitfile format: %s"
8559msgstr "无效的 gitfile 格式:%s"
c1ac5258 8560
65387fd5 8561#: setup.c:773
c1ac5258 8562#, c-format
473eb541
JX
8563msgid "no path in gitfile: %s"
8564msgstr "在 gitfile 中没有路径:%s"
c1ac5258 8565
65387fd5 8566#: setup.c:775
c1ac5258 8567#, c-format
473eb541
JX
8568msgid "not a git repository: %s"
8569msgstr "不是 git 仓库:%s"
c1ac5258 8570
65387fd5 8571#: setup.c:877
c1ac5258 8572#, c-format
473eb541
JX
8573msgid "'$%s' too big"
8574msgstr "'$%s' 太大"
c1ac5258 8575
65387fd5 8576#: setup.c:891
c1ac5258 8577#, c-format
473eb541
JX
8578msgid "not a git repository: '%s'"
8579msgstr "不是 git 仓库:'%s'"
c1ac5258 8580
65387fd5 8581#: setup.c:920 setup.c:922 setup.c:953
a0b6b246 8582#, c-format
473eb541
JX
8583msgid "cannot chdir to '%s'"
8584msgstr "不能切换目录到 '%s'"
a6cd2cc4 8585
65387fd5 8586#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
473eb541
JX
8587msgid "cannot come back to cwd"
8588msgstr "无法返回当前工作目录"
2b472aae 8589
65387fd5 8590#: setup.c:1052
2b472aae 8591#, c-format
473eb541 8592msgid "failed to stat '%*s%s%s'"
65387fd5 8593msgstr "无法获取 '%*s%s%s' 状态(stat)"
2b472aae 8594
65387fd5 8595#: setup.c:1295
473eb541
JX
8596msgid "Unable to read current working directory"
8597msgstr "不能读取当前工作目录"
2b472aae 8598
65387fd5 8599#: setup.c:1304 setup.c:1310
2b472aae 8600#, c-format
473eb541
JX
8601msgid "cannot change to '%s'"
8602msgstr "不能切换到 '%s'"
2b472aae 8603
65387fd5 8604#: setup.c:1315
2b472aae 8605#, c-format
473eb541
JX
8606msgid "not a git repository (or any of the parent directories): %s"
8607msgstr "不是 git 仓库(或者任何父目录):%s"
2b472aae 8608
65387fd5 8609#: setup.c:1321
2b472aae
JX
8610#, c-format
8611msgid ""
473eb541
JX
8612"not a git repository (or any parent up to mount point %s)\n"
8613"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
2b472aae 8614msgstr ""
473eb541
JX
8615"不是 git 仓库(或者直至挂载点 %s 的任何父目录)\n"
8616"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
2b472aae 8617
65387fd5 8618#: setup.c:1446
2b472aae
JX
8619#, c-format
8620msgid ""
473eb541
JX
8621"problem with core.sharedRepository filemode value (0%.3o).\n"
8622"The owner of files must always have read and write permissions."
2b472aae 8623msgstr ""
473eb541
JX
8624"参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n"
8625"文件属主必须始终拥有读写权限。"
2b472aae 8626
65387fd5 8627#: setup.c:1508
473eb541
JX
8628msgid "fork failed"
8629msgstr "fork 失败"
2b472aae 8630
65387fd5 8631#: setup.c:1513
473eb541
JX
8632msgid "setsid failed"
8633msgstr "setsid 失败"
2b472aae 8634
65387fd5 8635#: sparse-index.c:289
33b62fba
JX
8636#, c-format
8637msgid "index entry is a directory, but not sparse (%08x)"
8638msgstr "索引条目是一个目录,但不是稀疏的 (%08x)"
8639
a6cd2cc4 8640#. TRANSLATORS: IEC 80000-13:2008 gibibyte
33b62fba 8641#: strbuf.c:850
a6cd2cc4
JX
8642#, c-format
8643msgid "%u.%2.2u GiB"
8644msgstr "%u.%2.2u GiB"
8645
8646#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
33b62fba 8647#: strbuf.c:852
a6cd2cc4
JX
8648#, c-format
8649msgid "%u.%2.2u GiB/s"
8650msgstr "%u.%2.2u GiB/s"
8651
8652#. TRANSLATORS: IEC 80000-13:2008 mebibyte
33b62fba 8653#: strbuf.c:860
a6cd2cc4
JX
8654#, c-format
8655msgid "%u.%2.2u MiB"
8656msgstr "%u.%2.2u MiB"
8657
8658#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
33b62fba 8659#: strbuf.c:862
a6cd2cc4
JX
8660#, c-format
8661msgid "%u.%2.2u MiB/s"
8662msgstr "%u.%2.2u MiB/s"
8663
8664#. TRANSLATORS: IEC 80000-13:2008 kibibyte
33b62fba 8665#: strbuf.c:869
a6cd2cc4
JX
8666#, c-format
8667msgid "%u.%2.2u KiB"
8668msgstr "%u.%2.2u KiB"
8669
8670#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
33b62fba 8671#: strbuf.c:871
a6cd2cc4
JX
8672#, c-format
8673msgid "%u.%2.2u KiB/s"
8674msgstr "%u.%2.2u KiB/s"
8675
8676#. TRANSLATORS: IEC 80000-13:2008 byte
33b62fba 8677#: strbuf.c:877
a6cd2cc4
JX
8678#, c-format
8679msgid "%u byte"
8680msgid_plural "%u bytes"
8681msgstr[0] "%u 字节"
8682msgstr[1] "%u 字节"
8683
8684#. TRANSLATORS: IEC 80000-13:2008 byte/second
33b62fba 8685#: strbuf.c:879
a6cd2cc4
JX
8686#, c-format
8687msgid "%u byte/s"
8688msgid_plural "%u bytes/s"
8689msgstr[0] "%u 字节/秒"
8690msgstr[1] "%u 字节/秒"
a0b6b246 8691
65387fd5 8692#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
7e6630a7 8693#: builtin/rebase.c:650
d9488fea
JX
8694#, c-format
8695msgid "could not open '%s' for writing"
8696msgstr "无法打开 '%s' 进行写入"
8697
65387fd5 8698#: strbuf.c:1195
ddc12c42
JX
8699#, c-format
8700msgid "could not edit '%s'"
8701msgstr "不能编辑 '%s'"
8702
349ede6a
JX
8703#: submodule-config.c:237
8704#, c-format
8705msgid "ignoring suspicious submodule name: %s"
8706msgstr "忽略可疑的子模组名称:%s"
8707
8708#: submodule-config.c:304
8709msgid "negative values not allowed for submodule.fetchjobs"
8710msgstr "submodule.fetchjobs 不允许为负值"
8711
8712#: submodule-config.c:402
8713#, c-format
8714msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
8715msgstr "忽略可能被解析为命令行选项的 '%s':%s"
8716
8717#: submodule-config.c:499
8718#, c-format
8719msgid "invalid value for %s"
8720msgstr "%s 的值无效"
8721
7e6630a7 8722#: submodule-config.c:767
349ede6a
JX
8723#, c-format
8724msgid "Could not update .gitmodules entry %s"
8725msgstr "不能更新 .gitmodules 条目 %s"
8726
06991777 8727#: submodule.c:114 submodule.c:143
a0b6b246
JX
8728msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
8729msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
8730
06991777 8731#: submodule.c:118 submodule.c:147
a0b6b246
JX
8732#, c-format
8733msgid "Could not find section in .gitmodules where path=%s"
8734msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
8735
06991777 8736#: submodule.c:154
a0b6b246
JX
8737#, c-format
8738msgid "Could not remove .gitmodules entry for %s"
8739msgstr "无法移除 %s 的 .gitmodules 条目"
8740
06991777 8741#: submodule.c:165
a0b6b246
JX
8742msgid "staging updated .gitmodules failed"
8743msgstr "将更新后 .gitmodules 添加暂存区失败"
8744
7e6630a7 8745#: submodule.c:358
a4f16749
JX
8746#, c-format
8747msgid "in unpopulated submodule '%s'"
8748msgstr "位于未检出的子模组 '%s'"
8749
7e6630a7 8750#: submodule.c:389
a4f16749
JX
8751#, c-format
8752msgid "Pathspec '%s' is in submodule '%.*s'"
8753msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
8754
7e6630a7 8755#: submodule.c:466
2b472aae
JX
8756#, c-format
8757msgid "bad --ignore-submodules argument: %s"
8758msgstr "坏的 --ignore-submodules 参数:%s"
8759
7e6630a7 8760#: submodule.c:844
2b472aae
JX
8761#, c-format
8762msgid ""
8763"Submodule in commit %s at path: '%s' collides with a submodule named the "
8764"same. Skipping it."
440e7442 8765msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。"
2b472aae 8766
7e6630a7 8767#: submodule.c:954
6937cb4e
JX
8768#, c-format
8769msgid "submodule entry '%s' (%s) is a %s, not a commit"
493a9322 8770msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交"
6937cb4e 8771
7e6630a7 8772#: submodule.c:1042
2b472aae
JX
8773#, c-format
8774msgid ""
8775"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
8776"submodule %s"
440e7442 8777msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes -n 1'"
2b472aae 8778
7e6630a7 8779#: submodule.c:1165
2b472aae
JX
8780#, c-format
8781msgid "process for submodule '%s' failed"
440e7442 8782msgstr "处理子模组 '%s' 失败"
2b472aae 8783
65387fd5 8784#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
6937cb4e
JX
8785msgid "Failed to resolve HEAD as a valid ref."
8786msgstr "无法将 HEAD 解析为有效引用。"
8787
7e6630a7 8788#: submodule.c:1205
06991777 8789#, c-format
2b472aae
JX
8790msgid "Pushing submodule '%s'\n"
8791msgstr "正在推送子模组 '%s'\n"
06991777 8792
7e6630a7 8793#: submodule.c:1208
2b472aae
JX
8794#, c-format
8795msgid "Unable to push submodule '%s'\n"
8796msgstr "无法推送子模组 '%s'\n"
8797
7e6630a7 8798#: submodule.c:1491
2b472aae
JX
8799#, c-format
8800msgid "Fetching submodule %s%s\n"
8801msgstr "正在获取子模组 %s%s\n"
8802
7e6630a7 8803#: submodule.c:1525
2b472aae
JX
8804#, c-format
8805msgid "Could not access submodule '%s'\n"
8806msgstr "无法访问子模组 '%s'\n"
8807
7e6630a7 8808#: submodule.c:1680
2b472aae
JX
8809#, c-format
8810msgid ""
8811"Errors during submodule fetch:\n"
8812"%s"
8813msgstr ""
8814"获取子模组时的错误:\n"
8815"%s"
8816
7e6630a7 8817#: submodule.c:1705
1a79b2f1 8818#, c-format
87cb7997 8819msgid "'%s' not recognized as a git repository"
d9488fea 8820msgstr "无法将 '%s' 识别为 git 仓库"
1a79b2f1 8821
7e6630a7 8822#: submodule.c:1722
2b472aae
JX
8823#, c-format
8824msgid "Could not run 'git status --porcelain=2' in submodule %s"
8825msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'"
8826
7e6630a7 8827#: submodule.c:1763
2b472aae
JX
8828#, c-format
8829msgid "'git status --porcelain=2' failed in submodule %s"
8830msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败"
8831
7e6630a7 8832#: submodule.c:1838
1a79b2f1 8833#, c-format
87cb7997
JX
8834msgid "could not start 'git status' in submodule '%s'"
8835msgstr "无法在子模组 '%s' 中启动 'git status'"
1a79b2f1 8836
7e6630a7 8837#: submodule.c:1851
87cb7997
JX
8838#, c-format
8839msgid "could not run 'git status' in submodule '%s'"
8840msgstr "无法在子模组 '%s' 中执行 'git status'"
8841
7e6630a7 8842#: submodule.c:1868
06991777
JX
8843#, c-format
8844msgid "Could not unset core.worktree setting in submodule '%s'"
8845msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
8846
7e6630a7 8847#: submodule.c:1895 submodule.c:2210
2b472aae
JX
8848#, c-format
8849msgid "could not recurse into submodule '%s'"
8850msgstr "无法递归进子模组路径 '%s'"
8851
7e6630a7 8852#: submodule.c:1917
2b472aae
JX
8853msgid "could not reset submodule index"
8854msgstr "无法重置子模组索引"
8855
7e6630a7 8856#: submodule.c:1959
87cb7997
JX
8857#, c-format
8858msgid "submodule '%s' has dirty index"
8859msgstr "子模组 '%s' 中有脏索引"
8860
7e6630a7 8861#: submodule.c:2013
c1ac5258
JX
8862#, c-format
8863msgid "Submodule '%s' could not be updated."
8864msgstr "子模组 '%s' 无法被更新。"
8865
7e6630a7 8866#: submodule.c:2081
ddc12c42
JX
8867#, c-format
8868msgid "submodule git dir '%s' is inside git dir '%.*s'"
8869msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中"
8870
7e6630a7 8871#: submodule.c:2102
1a79b2f1
JX
8872#, c-format
8873msgid ""
8874"relocate_gitdir for submodule '%s' with more than one worktree not supported"
8875msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
8876
7e6630a7 8877#: submodule.c:2114 submodule.c:2174
1a79b2f1
JX
8878#, c-format
8879msgid "could not lookup name for submodule '%s'"
8880msgstr "不能查询子模组 '%s' 的名称"
8881
7e6630a7 8882#: submodule.c:2118
ddc12c42
JX
8883#, c-format
8884msgid "refusing to move '%s' into an existing git dir"
8885msgstr "禁止移动 '%s' 到现存 git 目录中"
8886
7e6630a7 8887#: submodule.c:2124
1a79b2f1
JX
8888#, c-format
8889msgid ""
8890"Migrating git directory of '%s%s' from\n"
8891"'%s' to\n"
8892"'%s'\n"
8893msgstr ""
8894"将 '%s%s' 的 git 目录从\n"
8895"'%s' 迁移至\n"
8896"'%s'\n"
8897
7e6630a7 8898#: submodule.c:2255
87cb7997
JX
8899msgid "could not start ls-files in .."
8900msgstr "无法在 .. 中启动 ls-files"
8901
7e6630a7 8902#: submodule.c:2295
87cb7997
JX
8903#, c-format
8904msgid "ls-tree returned unexpected return code %d"
8905msgstr "ls-tree 返回未知返回值 %d"
8906
33b62fba
JX
8907#: symlinks.c:244
8908#, c-format
8909msgid "failed to lstat '%s'"
8910msgstr "无法执行 lstat '%s'"
8911
8912#: trailer.c:244
a0b6b246
JX
8913#, c-format
8914msgid "running trailer command '%s' failed"
8915msgstr "执行 trailer 命令 '%s' 失败"
8916
33b62fba
JX
8917#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566
8918#: trailer.c:570
a0b6b246
JX
8919#, c-format
8920msgid "unknown value '%s' for key '%s'"
8921msgstr "键 '%2$s' 的未知取值 '%1$s'"
8922
33b62fba 8923#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299
7e6630a7 8924#: builtin/remote.c:327
a0b6b246
JX
8925#, c-format
8926msgid "more than one %s"
8927msgstr "多于一个 %s"
8928
33b62fba 8929#: trailer.c:743
a0b6b246
JX
8930#, c-format
8931msgid "empty trailer token in trailer '%.*s'"
d13389bf 8932msgstr "尾注 '%.*s' 的键为空"
a0b6b246 8933
33b62fba 8934#: trailer.c:763
a0b6b246
JX
8935#, c-format
8936msgid "could not read input file '%s'"
8937msgstr "不能读取输入文件 '%s'"
8938
7e6630a7 8939#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573
a0b6b246
JX
8940msgid "could not read from stdin"
8941msgstr "不能自标准输入读取"
8942
7e6630a7 8943#: trailer.c:1024 wrapper.c:684
a0b6b246
JX
8944#, c-format
8945msgid "could not stat %s"
65e2041e 8946msgstr "不能对 %s 调用 stat"
a0b6b246 8947
33b62fba 8948#: trailer.c:1026
a0b6b246
JX
8949#, c-format
8950msgid "file %s is not a regular file"
8951msgstr "文件 %s 不是一个正规文件"
8952
33b62fba 8953#: trailer.c:1028
a0b6b246
JX
8954#, c-format
8955msgid "file %s is not writable by user"
8956msgstr "文件 %s 用户不可写"
8957
33b62fba 8958#: trailer.c:1040
a0b6b246
JX
8959msgid "could not open temporary file"
8960msgstr "不能打开临时文件"
8961
33b62fba 8962#: trailer.c:1080
a0b6b246
JX
8963#, c-format
8964msgid "could not rename temporary file to %s"
8965msgstr "不能重命名临时文件为 %s"
8966
7157c2b5 8967#: transport-helper.c:62 transport-helper.c:91
c1ac5258
JX
8968msgid "full write to remote helper failed"
8969msgstr "完整写入远程助手失败"
8970
7157c2b5 8971#: transport-helper.c:145
c1ac5258
JX
8972#, c-format
8973msgid "unable to find remote helper for '%s'"
8974msgstr "无法为 '%s' 找到远程助手"
8975
7157c2b5 8976#: transport-helper.c:161 transport-helper.c:575
c1ac5258
JX
8977msgid "can't dup helper output fd"
8978msgstr "无法复制助手输出文件句柄"
8979
7157c2b5 8980#: transport-helper.c:214
c1ac5258
JX
8981#, c-format
8982msgid ""
8983"unknown mandatory capability %s; this remote helper probably needs newer "
8984"version of Git"
8985msgstr "未知的强制能力 %s,该远程助手可能需要新版本的Git"
8986
7157c2b5 8987#: transport-helper.c:220
c1ac5258
JX
8988msgid "this remote helper should implement refspec capability"
8989msgstr "远程助手需要实现 refspec 能力"
8990
7157c2b5 8991#: transport-helper.c:287 transport-helper.c:429
c1ac5258
JX
8992#, c-format
8993msgid "%s unexpectedly said: '%s'"
8994msgstr "%s 意外地说:'%s'"
8995
7157c2b5 8996#: transport-helper.c:417
c1ac5258
JX
8997#, c-format
8998msgid "%s also locked %s"
8999msgstr "%s 也锁定了 %s"
9000
7157c2b5 9001#: transport-helper.c:497
c1ac5258
JX
9002msgid "couldn't run fast-import"
9003msgstr "不能执行 fast-import"
9004
7157c2b5 9005#: transport-helper.c:520
c1ac5258
JX
9006msgid "error while running fast-import"
9007msgstr "执行 fast-import 出错"
9008
7e6630a7 9009#: transport-helper.c:549 transport-helper.c:1251
c1ac5258
JX
9010#, c-format
9011msgid "could not read ref %s"
9012msgstr "无法读取引用 %s"
9013
7157c2b5 9014#: transport-helper.c:594
c1ac5258
JX
9015#, c-format
9016msgid "unknown response to connect: %s"
9017msgstr "连接时未知的响应:%s"
9018
7157c2b5 9019#: transport-helper.c:616
c1ac5258
JX
9020msgid "setting remote service path not supported by protocol"
9021msgstr "协议不支持设置远程服务路径"
9022
7157c2b5 9023#: transport-helper.c:618
c1ac5258
JX
9024msgid "invalid remote service path"
9025msgstr "无效的远程服务路径"
9026
ee27abd3 9027#: transport-helper.c:661 transport.c:1479
349ede6a
JX
9028msgid "operation not supported by protocol"
9029msgstr "协议不支持该操作"
9030
7157c2b5 9031#: transport-helper.c:664
c1ac5258
JX
9032#, c-format
9033msgid "can't connect to subservice %s"
9034msgstr "不能连接到子服务 %s"
9035
7e6630a7 9036#: transport-helper.c:693 transport.c:404
33b62fba
JX
9037msgid "--negotiate-only requires protocol v2"
9038msgstr "--negotiate-only 需要协议 v2"
9039
9040#: transport-helper.c:755
d9488fea
JX
9041msgid "'option' without a matching 'ok/error' directive"
9042msgstr "'option' 缺乏一个匹配的 'ok/error' 指令"
9043
33b62fba 9044#: transport-helper.c:798
c1ac5258
JX
9045#, c-format
9046msgid "expected ok/error, helper said '%s'"
9047msgstr "预期 ok/error,助手说 '%s'"
9048
7e6630a7 9049#: transport-helper.c:859
c1ac5258
JX
9050#, c-format
9051msgid "helper reported unexpected status of %s"
9052msgstr "助手报告 %s 的意外状态"
9053
7e6630a7 9054#: transport-helper.c:942
a0b6b246 9055#, c-format
c1ac5258
JX
9056msgid "helper %s does not support dry-run"
9057msgstr "助手 %s 不支持 dry-run"
a0b6b246 9058
7e6630a7 9059#: transport-helper.c:945
c1ac5258
JX
9060#, c-format
9061msgid "helper %s does not support --signed"
9062msgstr "助手 %s 不支持 --signed"
9063
7e6630a7 9064#: transport-helper.c:948
c1ac5258
JX
9065#, c-format
9066msgid "helper %s does not support --signed=if-asked"
9067msgstr "助手 %s 不支持 --signed=if-asked"
9068
7e6630a7 9069#: transport-helper.c:953
a5cd71ca
JX
9070#, c-format
9071msgid "helper %s does not support --atomic"
9072msgstr "助手 %s 不支持 --atomic"
9073
7e6630a7 9074#: transport-helper.c:957
d13389bf
JX
9075#, c-format
9076msgid "helper %s does not support --%s"
9077msgstr "助手 %s 不支持 --%s"
9078
7e6630a7 9079#: transport-helper.c:964
c1ac5258
JX
9080#, c-format
9081msgid "helper %s does not support 'push-option'"
9082msgstr "助手 %s 不支持 'push-option'"
9083
7e6630a7 9084#: transport-helper.c:1064
c1ac5258 9085msgid "remote-helper doesn't support push; refspec needed"
33b62fba 9086msgstr "remote-heper 不支持推送,需要引用规格"
c1ac5258 9087
7e6630a7 9088#: transport-helper.c:1069
c1ac5258
JX
9089#, c-format
9090msgid "helper %s does not support 'force'"
9091msgstr "助手 %s 不支持 'force'"
9092
7e6630a7 9093#: transport-helper.c:1116
c1ac5258
JX
9094msgid "couldn't run fast-export"
9095msgstr "无法执行 fast-export"
9096
7e6630a7 9097#: transport-helper.c:1121
c1ac5258
JX
9098msgid "error while running fast-export"
9099msgstr "执行 fast-export 时出错"
9100
7e6630a7 9101#: transport-helper.c:1146
c1ac5258
JX
9102#, c-format
9103msgid ""
9104"No refs in common and none specified; doing nothing.\n"
7157c2b5 9105"Perhaps you should specify a branch.\n"
c1ac5258
JX
9106msgstr ""
9107"没有共同的引用并且也没有指定,什么也不会做。\n"
7157c2b5
JX
9108"也许您应该指定一个分支。\n"
9109
7e6630a7 9110#: transport-helper.c:1228
7157c2b5
JX
9111#, c-format
9112msgid "unsupported object format '%s'"
9113msgstr "不支持的对象格式 '%s'"
c1ac5258 9114
7e6630a7 9115#: transport-helper.c:1237
c1ac5258
JX
9116#, c-format
9117msgid "malformed response in ref list: %s"
9118msgstr "引用列表中格式错误的响应:%s"
9119
7e6630a7 9120#: transport-helper.c:1389
c1ac5258
JX
9121#, c-format
9122msgid "read(%s) failed"
9123msgstr "读取(%s)失败"
9124
7e6630a7 9125#: transport-helper.c:1416
c1ac5258
JX
9126#, c-format
9127msgid "write(%s) failed"
9128msgstr "写(%s)失败"
9129
7e6630a7 9130#: transport-helper.c:1465
c1ac5258
JX
9131#, c-format
9132msgid "%s thread failed"
9133msgstr "%s 线程失败"
9134
7e6630a7 9135#: transport-helper.c:1469
c1ac5258
JX
9136#, c-format
9137msgid "%s thread failed to join: %s"
e640d114 9138msgstr "%s 线程等待失败:%s"
c1ac5258 9139
7e6630a7 9140#: transport-helper.c:1488 transport-helper.c:1492
c1ac5258
JX
9141#, c-format
9142msgid "can't start thread for copying data: %s"
9143msgstr "不能启动线程来拷贝数据:%s"
9144
7e6630a7 9145#: transport-helper.c:1529
c1ac5258
JX
9146#, c-format
9147msgid "%s process failed to wait"
9148msgstr "%s 进程等待失败"
9149
7e6630a7 9150#: transport-helper.c:1533
c1ac5258
JX
9151#, c-format
9152msgid "%s process failed"
9153msgstr "%s 进程失败"
9154
7e6630a7 9155#: transport-helper.c:1551 transport-helper.c:1560
c1ac5258
JX
9156msgid "can't start thread for copying data"
9157msgstr "不能启动线程来拷贝数据"
9158
349ede6a
JX
9159#: transport.c:116
9160#, c-format
9161msgid "Would set upstream of '%s' to '%s' of '%s'\n"
9162msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
9163
9164#: transport.c:145
9165#, c-format
9166msgid "could not read bundle '%s'"
d9488fea 9167msgstr "无法读取归档包 '%s'"
349ede6a 9168
7e6630a7 9169#: transport.c:227
349ede6a
JX
9170#, c-format
9171msgid "transport: invalid depth option '%s'"
9172msgstr "传输:无效的深度选项 '%s'"
9173
7e6630a7 9174#: transport.c:279
349ede6a
JX
9175msgid "see protocol.version in 'git help config' for more details"
9176msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
9177
7e6630a7 9178#: transport.c:280
349ede6a
JX
9179msgid "server options require protocol version 2 or later"
9180msgstr "服务端选项需要版本 2 协议或更高"
9181
7e6630a7 9182#: transport.c:407
33b62fba
JX
9183msgid "server does not support wait-for-done"
9184msgstr "服务器不支持 wait-for-done"
9185
7e6630a7 9186#: transport.c:759
349ede6a
JX
9187msgid "could not parse transport.color.* config"
9188msgstr "不能解析 transport.color.* 配置"
9189
7e6630a7 9190#: transport.c:834
349ede6a
JX
9191msgid "support for protocol v2 not implemented yet"
9192msgstr "协议 v2 的支持尚未实现"
9193
7e6630a7 9194#: transport.c:967
349ede6a
JX
9195#, c-format
9196msgid "unknown value for config '%s': %s"
9197msgstr "配置 '%s' 的取值未知:%s"
9198
7e6630a7 9199#: transport.c:1033
349ede6a
JX
9200#, c-format
9201msgid "transport '%s' not allowed"
9202msgstr "传输 '%s' 不允许"
9203
7e6630a7 9204#: transport.c:1082
349ede6a
JX
9205msgid "git-over-rsync is no longer supported"
9206msgstr "不再支持 git-over-rsync"
9207
7e6630a7 9208#: transport.c:1185
349ede6a
JX
9209#, c-format
9210msgid ""
9211"The following submodule paths contain changes that can\n"
9212"not be found on any remote:\n"
9213msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
9214
7e6630a7 9215#: transport.c:1189
349ede6a
JX
9216#, c-format
9217msgid ""
9218"\n"
9219"Please try\n"
9220"\n"
9221"\tgit push --recurse-submodules=on-demand\n"
9222"\n"
9223"or cd to the path and use\n"
9224"\n"
9225"\tgit push\n"
9226"\n"
9227"to push them to a remote.\n"
9228"\n"
9229msgstr ""
9230"\n"
9231"请尝试\n"
9232"\n"
9233"\tgit push --recurse-submodules=on-demand\n"
9234"\n"
9235"或者进入到子目录执行\n"
9236"\n"
9237"\tgit push\n"
9238"\n"
9239"以推送至远程。\n"
9240"\n"
9241
7e6630a7 9242#: transport.c:1197
349ede6a
JX
9243msgid "Aborting."
9244msgstr "正在终止。"
9245
65387fd5 9246#: transport.c:1343
349ede6a
JX
9247msgid "failed to push all needed submodules"
9248msgstr "不能推送全部需要的子模组"
9249
473eb541 9250#: tree-walk.c:33
a0b6b246
JX
9251msgid "too-short tree object"
9252msgstr "太短的树对象"
9253
473eb541 9254#: tree-walk.c:39
a0b6b246 9255msgid "malformed mode in tree entry"
29004bbb 9256msgstr "树对象中的条目模式错误"
a0b6b246 9257
473eb541 9258#: tree-walk.c:43
a0b6b246
JX
9259msgid "empty filename in tree entry"
9260msgstr "树对象条目中空的文件名"
9261
473eb541 9262#: tree-walk.c:118
a0b6b246
JX
9263msgid "too-short tree file"
9264msgstr "太短的树文件"
9265
65387fd5 9266#: unpack-trees.c:118
a0b6b246
JX
9267#, c-format
9268msgid ""
9269"Your local changes to the following files would be overwritten by checkout:\n"
9270"%%sPlease commit your changes or stash them before you switch branches."
9271msgstr ""
9272"您对下列文件的本地修改将被检出操作覆盖:\n"
a4f16749 9273"%%s请在切换分支前提交或贮藏您的修改。"
a0b6b246 9274
65387fd5 9275#: unpack-trees.c:120
a0b6b246
JX
9276#, c-format
9277msgid ""
9278"Your local changes to the following files would be overwritten by checkout:\n"
9279"%%s"
9280msgstr ""
9281"您对下列文件的本地修改将被检出操作覆盖:\n"
9282"%%s"
9283
65387fd5 9284#: unpack-trees.c:123
a0b6b246
JX
9285#, c-format
9286msgid ""
9287"Your local changes to the following files would be overwritten by merge:\n"
9288"%%sPlease commit your changes or stash them before you merge."
9289msgstr ""
9290"您对下列文件的本地修改将被合并操作覆盖:\n"
a4f16749 9291"%%s请在合并前提交或贮藏您的修改。"
a0b6b246 9292
65387fd5 9293#: unpack-trees.c:125
a0b6b246
JX
9294#, c-format
9295msgid ""
9296"Your local changes to the following files would be overwritten by merge:\n"
9297"%%s"
9298msgstr ""
9299"您对下列文件的本地修改将被合并操作覆盖:\n"
9300"%%s"
9301
65387fd5 9302#: unpack-trees.c:128
a0b6b246
JX
9303#, c-format
9304msgid ""
9305"Your local changes to the following files would be overwritten by %s:\n"
9306"%%sPlease commit your changes or stash them before you %s."
9307msgstr ""
9308"您对下列文件的本地修改将被 %s 覆盖:\n"
a4f16749 9309"%%s请在 %s 之前提交或贮藏您的修改。"
6792b93b 9310
65387fd5 9311#: unpack-trees.c:130
a0b6b246
JX
9312#, c-format
9313msgid ""
9314"Your local changes to the following files would be overwritten by %s:\n"
9315"%%s"
9316msgstr ""
9317"您对下列文件的本地修改将被 %s 覆盖:\n"
9318"%%s"
c04f5ac3 9319
65387fd5 9320#: unpack-trees.c:135
a0b6b246
JX
9321#, c-format
9322msgid ""
1a79b2f1 9323"Updating the following directories would lose untracked files in them:\n"
a0b6b246
JX
9324"%s"
9325msgstr ""
9326"更新如下目录将会丢失其中未跟踪的文件:\n"
9327"%s"
1b7f4a34 9328
65387fd5
FZ
9329#: unpack-trees.c:138
9330#, c-format
9331msgid ""
9332"Refusing to remove the current working directory:\n"
9333"%s"
9334msgstr ""
9335"拒绝删除当前工作目录:\n"
9336"%s"
9337
9338#: unpack-trees.c:142
a0b6b246
JX
9339#, c-format
9340msgid ""
9341"The following untracked working tree files would be removed by checkout:\n"
9342"%%sPlease move or remove them before you switch branches."
9343msgstr ""
9344"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
9345"%%s请在切换分支之前移动或删除。"
2e8451e8 9346
65387fd5 9347#: unpack-trees.c:144
a0b6b246
JX
9348#, c-format
9349msgid ""
9350"The following untracked working tree files would be removed by checkout:\n"
9351"%%s"
9352msgstr ""
9353"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
9354"%%s"
1003b3a5 9355
65387fd5 9356#: unpack-trees.c:147
a0b6b246
JX
9357#, c-format
9358msgid ""
9359"The following untracked working tree files would be removed by merge:\n"
9360"%%sPlease move or remove them before you merge."
9361msgstr ""
9362"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
9363"%%s请在合并前移动或删除。"
1003b3a5 9364
65387fd5 9365#: unpack-trees.c:149
a0b6b246
JX
9366#, c-format
9367msgid ""
9368"The following untracked working tree files would be removed by merge:\n"
9369"%%s"
9370msgstr ""
9371"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
9372"%%s"
c04f5ac3 9373
65387fd5 9374#: unpack-trees.c:152
a0b6b246
JX
9375#, c-format
9376msgid ""
9377"The following untracked working tree files would be removed by %s:\n"
9378"%%sPlease move or remove them before you %s."
9379msgstr ""
9380"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
9381"%%s请在 %s 前移动或删除。"
c04f5ac3 9382
65387fd5 9383#: unpack-trees.c:154
a0b6b246
JX
9384#, c-format
9385msgid ""
9386"The following untracked working tree files would be removed by %s:\n"
9387"%%s"
9388msgstr ""
9389"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
9390"%%s"
c04f5ac3 9391
65387fd5 9392#: unpack-trees.c:160
a0b6b246
JX
9393#, c-format
9394msgid ""
9395"The following untracked working tree files would be overwritten by "
9396"checkout:\n"
9397"%%sPlease move or remove them before you switch branches."
9398msgstr ""
9399"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
9400"%%s请在切换分支前移动或删除。"
c04f5ac3 9401
65387fd5 9402#: unpack-trees.c:162
1003b3a5 9403#, c-format
4dcdc3d8 9404msgid ""
a0b6b246
JX
9405"The following untracked working tree files would be overwritten by "
9406"checkout:\n"
9407"%%s"
4dcdc3d8 9408msgstr ""
a0b6b246
JX
9409"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
9410"%%s"
1003b3a5 9411
65387fd5 9412#: unpack-trees.c:165
c04f5ac3 9413#, c-format
a0b6b246
JX
9414msgid ""
9415"The following untracked working tree files would be overwritten by merge:\n"
9416"%%sPlease move or remove them before you merge."
9417msgstr ""
9418"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
9419"%%s请在合并前移动或删除。"
c04f5ac3 9420
65387fd5 9421#: unpack-trees.c:167
a0b6b246
JX
9422#, c-format
9423msgid ""
9424"The following untracked working tree files would be overwritten by merge:\n"
9425"%%s"
9426msgstr ""
9427"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
9428"%%s"
c04f5ac3 9429
65387fd5 9430#: unpack-trees.c:170
a0b6b246
JX
9431#, c-format
9432msgid ""
9433"The following untracked working tree files would be overwritten by %s:\n"
9434"%%sPlease move or remove them before you %s."
9435msgstr ""
9436"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
9437"%%s请在 %s 前移动或删除。"
c04f5ac3 9438
65387fd5 9439#: unpack-trees.c:172
07432cef 9440#, c-format
a0b6b246
JX
9441msgid ""
9442"The following untracked working tree files would be overwritten by %s:\n"
9443"%%s"
9444msgstr ""
9445"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
9446"%%s"
c04f5ac3 9447
65387fd5 9448#: unpack-trees.c:180
07432cef 9449#, c-format
a0b6b246
JX
9450msgid "Entry '%s' overlaps with '%s'. Cannot bind."
9451msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
c04f5ac3 9452
65387fd5 9453#: unpack-trees.c:183
07432cef 9454#, c-format
ef317cd5 9455msgid ""
349ede6a 9456"Cannot update submodule:\n"
a0b6b246
JX
9457"%s"
9458msgstr ""
349ede6a 9459"无法更新子模组:\n"
a0b6b246 9460"%s"
c04f5ac3 9461
65387fd5 9462#: unpack-trees.c:186
07432cef 9463#, c-format
a0b6b246 9464msgid ""
349ede6a
JX
9465"The following paths are not up to date and were left despite sparse "
9466"patterns:\n"
a0b6b246
JX
9467"%s"
9468msgstr ""
349ede6a 9469"尽管存在稀疏检出模板,以下路径不是最新,因而保留:\n"
a0b6b246 9470"%s"
c04f5ac3 9471
65387fd5 9472#: unpack-trees.c:188
07432cef 9473#, c-format
a0b6b246 9474msgid ""
349ede6a 9475"The following paths are unmerged and were left despite sparse patterns:\n"
a0b6b246
JX
9476"%s"
9477msgstr ""
349ede6a 9478"尽管存在稀疏检出模板,以下路径处于未合并状态,因而保留:\n"
a0b6b246 9479"%s"
c04f5ac3 9480
65387fd5 9481#: unpack-trees.c:190
87cb7997
JX
9482#, c-format
9483msgid ""
349ede6a
JX
9484"The following paths were already present and thus not updated despite sparse "
9485"patterns:\n"
87cb7997
JX
9486"%s"
9487msgstr ""
349ede6a 9488"尽管存在稀疏检出模板,以下路径已经存在,因而未更新:\n"
87cb7997
JX
9489"%s"
9490
65387fd5 9491#: unpack-trees.c:270
07432cef 9492#, c-format
a0b6b246 9493msgid "Aborting\n"
a6cd2cc4 9494msgstr "正在终止\n"
ef317cd5 9495
65387fd5 9496#: unpack-trees.c:297
349ede6a
JX
9497#, c-format
9498msgid ""
9499"After fixing the above paths, you may want to run `git sparse-checkout "
9500"reapply`.\n"
7e6630a7 9501msgstr "在修复上述路径之后,您可能要执行 `git sparse-checkout reapply`。\n"
349ede6a 9502
65387fd5 9503#: unpack-trees.c:358
a6cd2cc4
JX
9504msgid "Updating files"
9505msgstr "正在更新文件"
c04f5ac3 9506
65387fd5 9507#: unpack-trees.c:390
4c27fcb5
JX
9508msgid ""
9509"the following paths have collided (e.g. case-sensitive paths\n"
9510"on a case-insensitive filesystem) and only one from the same\n"
9511"colliding group is in the working tree:\n"
9512msgstr ""
9513"以下路径发生碰撞(如:在不区分大小写的文件系统上的区分大小写的路径),\n"
9514"并且碰撞组中只有一个文件存在工作区中:\n"
9515
65387fd5 9516#: unpack-trees.c:1636
ddc12c42
JX
9517msgid "Updating index flags"
9518msgstr "正在更新索引标志"
9519
65387fd5 9520#: unpack-trees.c:2803
33b62fba
JX
9521#, c-format
9522msgid "worktree and untracked commit have duplicate entries: %s"
9523msgstr "工作树和未跟踪提交具有重复条目:%s"
9524
65387fd5 9525#: upload-pack.c:1565
349ede6a
JX
9526msgid "expected flush after fetch arguments"
9527msgstr "在 fetch 参数之后应该有一个 flush 包"
9528
87cb7997 9529#: urlmatch.c:163
a0b6b246
JX
9530msgid "invalid URL scheme name or missing '://' suffix"
9531msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
9532
87cb7997 9533#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
07432cef 9534#, c-format
a0b6b246
JX
9535msgid "invalid %XX escape sequence"
9536msgstr "无效的 %XX 转义序列"
c04f5ac3 9537
87cb7997 9538#: urlmatch.c:215
a0b6b246
JX
9539msgid "missing host and scheme is not 'file:'"
9540msgstr "缺失主机名且 URL 方案不是 'file:'"
c04f5ac3 9541
87cb7997 9542#: urlmatch.c:232
a0b6b246
JX
9543msgid "a 'file:' URL may not have a port number"
9544msgstr "一个 'file:' URL 不应该包含端口号"
94550ed3 9545
87cb7997 9546#: urlmatch.c:247
a0b6b246
JX
9547msgid "invalid characters in host name"
9548msgstr "主机名中包含无效的字符"
90314792 9549
87cb7997 9550#: urlmatch.c:292 urlmatch.c:303
a0b6b246
JX
9551msgid "invalid port number"
9552msgstr "无效的端口号"
c04f5ac3 9553
87cb7997 9554#: urlmatch.c:371
a0b6b246
JX
9555msgid "invalid '..' path segment"
9556msgstr "无效的 '..' 路径片段"
5c0c220c 9557
2b472aae
JX
9558#: walker.c:170
9559msgid "Fetching objects"
9560msgstr "正在获取对象"
9561
65387fd5 9562#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
a77c07d9 9563#, c-format
a0b6b246 9564msgid "failed to read '%s'"
65387fd5 9565msgstr "无法读取 '%s'"
ef317cd5 9566
65387fd5 9567#: worktree.c:305
31e5e17b
JX
9568#, c-format
9569msgid "'%s' at main working tree is not the repository directory"
9570msgstr "在主工作区的 '%s' 不是仓库目录"
9571
65387fd5 9572#: worktree.c:316
31e5e17b
JX
9573#, c-format
9574msgid "'%s' file does not contain absolute path to the working tree location"
9575msgstr "文件 '%s' 不包含工作区的绝对路径"
9576
65387fd5 9577#: worktree.c:328
31e5e17b
JX
9578#, c-format
9579msgid "'%s' does not exist"
9580msgstr "'%s' 不存在"
9581
65387fd5 9582#: worktree.c:334
31e5e17b
JX
9583#, c-format
9584msgid "'%s' is not a .git file, error code %d"
9585msgstr "'%s' 不是一个 .git 文件,错误码 %d"
9586
65387fd5 9587#: worktree.c:343
31e5e17b
JX
9588#, c-format
9589msgid "'%s' does not point back to '%s'"
9590msgstr "'%s' 没有指回到 '%s'"
9591
65387fd5 9592#: worktree.c:604
d9488fea
JX
9593msgid "not a directory"
9594msgstr "不是一个目录"
9595
65387fd5 9596#: worktree.c:613
d9488fea
JX
9597msgid ".git is not a file"
9598msgstr ".git 不是一个文件"
9599
65387fd5 9600#: worktree.c:615
d9488fea
JX
9601msgid ".git file broken"
9602msgstr ".git 文件损坏"
9603
65387fd5 9604#: worktree.c:617
d9488fea
JX
9605msgid ".git file incorrect"
9606msgstr ".git 文件不正确"
9607
65387fd5 9608#: worktree.c:723
d9488fea
JX
9609msgid "not a valid path"
9610msgstr "不是一个有效的路径"
9611
65387fd5 9612#: worktree.c:729
d9488fea
JX
9613msgid "unable to locate repository; .git is not a file"
9614msgstr "无法定位仓库,.git 不是一个文件"
9615
65387fd5 9616#: worktree.c:733
473eb541
JX
9617msgid "unable to locate repository; .git file does not reference a repository"
9618msgstr "无法定位仓库,.git 文件没有指向一个仓库"
9619
65387fd5 9620#: worktree.c:737
d9488fea
JX
9621msgid "unable to locate repository; .git file broken"
9622msgstr "无法定位仓库,.git 文件损坏"
9623
65387fd5 9624#: worktree.c:743
d9488fea
JX
9625msgid "gitdir unreadable"
9626msgstr "gitdir 不可读"
9627
65387fd5 9628#: worktree.c:747
d9488fea
JX
9629msgid "gitdir incorrect"
9630msgstr "gitdir 不正确"
9631
65387fd5 9632#: worktree.c:772
473eb541
JX
9633msgid "not a valid directory"
9634msgstr "不是一个有效的目录"
9635
65387fd5 9636#: worktree.c:778
473eb541
JX
9637msgid "gitdir file does not exist"
9638msgstr "gitdir 文件不存在"
9639
65387fd5 9640#: worktree.c:783 worktree.c:792
473eb541
JX
9641#, c-format
9642msgid "unable to read gitdir file (%s)"
9643msgstr "无法读取 gitdir 文件(%s)"
9644
65387fd5 9645#: worktree.c:802
473eb541
JX
9646#, c-format
9647msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
9648msgstr "读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)"
9649
65387fd5 9650#: worktree.c:810
473eb541
JX
9651msgid "invalid gitdir file"
9652msgstr "无效的 gitdir 文件"
9653
65387fd5 9654#: worktree.c:818
473eb541
JX
9655msgid "gitdir file points to non-existent location"
9656msgstr "gitdir 文件指向一个不存在的位置"
9657
7e6630a7
FZ
9658#: wrapper.c:151
9659#, c-format
9660msgid "could not setenv '%s'"
9661msgstr "不能设置环境变量 '%s'"
9662
9663#: wrapper.c:203
9664#, c-format
9665msgid "unable to create '%s'"
9666msgstr "不能创建 '%s'"
9667
9668#: wrapper.c:205 wrapper.c:375
c04f5ac3 9669#, c-format
a0b6b246
JX
9670msgid "could not open '%s' for reading and writing"
9671msgstr "无法打开 '%s' 进行读写"
c04f5ac3 9672
7e6630a7 9673#: wrapper.c:406 wrapper.c:607
a0b6b246
JX
9674#, c-format
9675msgid "unable to access '%s'"
9676msgstr "不能访问 '%s'"
c04f5ac3 9677
7e6630a7 9678#: wrapper.c:615
a0b6b246
JX
9679msgid "unable to get current working directory"
9680msgstr "不能获取当前工作目录"
c04f5ac3 9681
a6cd2cc4 9682#: wt-status.c:158
a0b6b246
JX
9683msgid "Unmerged paths:"
9684msgstr "未合并的路径:"
7aea43ff 9685
a0b6b246 9686# 译者:注意保持前导空格
a6cd2cc4
JX
9687#: wt-status.c:187 wt-status.c:219
9688msgid " (use \"git restore --staged <file>...\" to unstage)"
9689msgstr " (使用 \"git restore --staged <文件>...\" 以取消暂存)"
9690
9691# 译者:注意保持前导空格
9692#: wt-status.c:190 wt-status.c:222
c04f5ac3 9693#, c-format
a6cd2cc4
JX
9694msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
9695msgstr " (使用 \"git restore --source=%s --staged <文件>...\" 以取消暂存)"
c04f5ac3 9696
a0b6b246 9697# 译者:注意保持前导空格
a6cd2cc4 9698#: wt-status.c:193 wt-status.c:225
a0b6b246
JX
9699msgid " (use \"git rm --cached <file>...\" to unstage)"
9700msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
c04f5ac3 9701
a0b6b246 9702# 译者:注意保持前导空格
a6cd2cc4 9703#: wt-status.c:197
a0b6b246
JX
9704msgid " (use \"git add <file>...\" to mark resolution)"
9705msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
8ada9598 9706
a0b6b246 9707# 译者:注意保持前导空格
a6cd2cc4 9708#: wt-status.c:199 wt-status.c:203
a0b6b246
JX
9709msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
9710msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
8ada9598 9711
a0b6b246 9712# 译者:注意保持前导空格
a6cd2cc4 9713#: wt-status.c:201
a0b6b246
JX
9714msgid " (use \"git rm <file>...\" to mark resolution)"
9715msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
ef317cd5 9716
65387fd5 9717#: wt-status.c:211 wt-status.c:1131
a0b6b246
JX
9718msgid "Changes to be committed:"
9719msgstr "要提交的变更:"
ef317cd5 9720
65387fd5 9721#: wt-status.c:234 wt-status.c:1140
a0b6b246
JX
9722msgid "Changes not staged for commit:"
9723msgstr "尚未暂存以备提交的变更:"
ef317cd5 9724
a0b6b246 9725# 译者:注意保持前导空格
a6cd2cc4 9726#: wt-status.c:238
a0b6b246
JX
9727msgid " (use \"git add <file>...\" to update what will be committed)"
9728msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
ef317cd5 9729
a0b6b246 9730# 译者:注意保持前导空格
a6cd2cc4 9731#: wt-status.c:240
a0b6b246
JX
9732msgid " (use \"git add/rm <file>...\" to update what will be committed)"
9733msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
ef317cd5 9734
a0b6b246 9735# 译者:注意保持前导空格
a6cd2cc4 9736#: wt-status.c:241
a0b6b246 9737msgid ""
a6cd2cc4
JX
9738" (use \"git restore <file>...\" to discard changes in working directory)"
9739msgstr " (使用 \"git restore <文件>...\" 丢弃工作区的改动)"
ef317cd5 9740
a0b6b246 9741# 译者:注意保持前导空格
a6cd2cc4 9742#: wt-status.c:243
a0b6b246
JX
9743msgid " (commit or discard the untracked or modified content in submodules)"
9744msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
ef317cd5 9745
a0b6b246 9746# 译者:注意保持前导空格
a6cd2cc4 9747#: wt-status.c:254
a0b6b246
JX
9748#, c-format
9749msgid " (use \"git %s <file>...\" to include in what will be committed)"
9750msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
ef317cd5 9751
d9488fea 9752#: wt-status.c:266
a0b6b246
JX
9753msgid "both deleted:"
9754msgstr "双方删除:"
ef317cd5 9755
d9488fea 9756#: wt-status.c:268
a0b6b246
JX
9757msgid "added by us:"
9758msgstr "由我们添加:"
4dcdc3d8 9759
d9488fea 9760#: wt-status.c:270
a0b6b246
JX
9761msgid "deleted by them:"
9762msgstr "由他们删除:"
ef317cd5 9763
d9488fea 9764#: wt-status.c:272
a0b6b246
JX
9765msgid "added by them:"
9766msgstr "由他们添加:"
ef317cd5 9767
d9488fea 9768#: wt-status.c:274
a0b6b246
JX
9769msgid "deleted by us:"
9770msgstr "由我们删除:"
ef317cd5 9771
d9488fea 9772#: wt-status.c:276
a0b6b246
JX
9773msgid "both added:"
9774msgstr "双方添加:"
5c57d762 9775
d9488fea 9776#: wt-status.c:278
a0b6b246
JX
9777msgid "both modified:"
9778msgstr "双方修改:"
5c57d762 9779
d9488fea 9780#: wt-status.c:288
a0b6b246
JX
9781msgid "new file:"
9782msgstr "新文件:"
8ada9598 9783
d9488fea 9784#: wt-status.c:290
a0b6b246
JX
9785msgid "copied:"
9786msgstr "拷贝:"
8ada9598 9787
d9488fea 9788#: wt-status.c:292
a0b6b246
JX
9789msgid "deleted:"
9790msgstr "删除:"
8ada9598 9791
d9488fea 9792#: wt-status.c:294
a0b6b246
JX
9793msgid "modified:"
9794msgstr "修改:"
8ada9598 9795
d9488fea 9796#: wt-status.c:296
a0b6b246
JX
9797msgid "renamed:"
9798msgstr "重命名:"
5c57d762 9799
d9488fea 9800#: wt-status.c:298
a0b6b246
JX
9801msgid "typechange:"
9802msgstr "类型变更:"
8ada9598 9803
d9488fea 9804#: wt-status.c:300
a0b6b246
JX
9805msgid "unknown:"
9806msgstr "未知:"
8ada9598 9807
d9488fea 9808#: wt-status.c:302
a0b6b246
JX
9809msgid "unmerged:"
9810msgstr "未合并:"
8ada9598 9811
a0b6b246 9812# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
d9488fea 9813#: wt-status.c:382
a0b6b246
JX
9814msgid "new commits, "
9815msgstr "新提交, "
8ada9598 9816
a0b6b246 9817# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
d9488fea 9818#: wt-status.c:384
a0b6b246
JX
9819msgid "modified content, "
9820msgstr "修改的内容, "
1b7f4a34 9821
a0b6b246 9822# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
d9488fea 9823#: wt-status.c:386
a0b6b246
JX
9824msgid "untracked content, "
9825msgstr "未跟踪的内容, "
1b7f4a34 9826
65387fd5 9827#: wt-status.c:964
a4f16749
JX
9828#, c-format
9829msgid "Your stash currently has %d entry"
9830msgid_plural "Your stash currently has %d entries"
9831msgstr[0] "您的贮藏区当前有 %d 条记录"
9832msgstr[1] "您的贮藏区当前有 %d 条记录"
9833
65387fd5 9834#: wt-status.c:995
a0b6b246
JX
9835msgid "Submodules changed but not updated:"
9836msgstr "子模组已修改但尚未更新:"
1b7f4a34 9837
65387fd5 9838#: wt-status.c:997
a0b6b246
JX
9839msgid "Submodule changes to be committed:"
9840msgstr "要提交的子模组变更:"
1b7f4a34 9841
65387fd5 9842#: wt-status.c:1079
a0b6b246 9843msgid ""
6937cb4e
JX
9844"Do not modify or remove the line above.\n"
9845"Everything below it will be ignored."
a0b6b246 9846msgstr ""
6937cb4e
JX
9847"不要改动或删除上面的一行。\n"
9848"其下所有内容都将被忽略。"
1b7f4a34 9849
65387fd5 9850#: wt-status.c:1171
a6cd2cc4
JX
9851#, c-format
9852msgid ""
9853"\n"
9854"It took %.2f seconds to compute the branch ahead/behind values.\n"
9855"You can use '--no-ahead-behind' to avoid this.\n"
9856msgstr ""
9857"\n"
9858"花了 %.2f 秒才计算出分支的领先/落后范围。\n"
9859"为避免,您可以使用 '--no-ahead-behind'。\n"
9860
65387fd5 9861#: wt-status.c:1201
a0b6b246
JX
9862msgid "You have unmerged paths."
9863msgstr "您有尚未合并的路径。"
1b7f4a34 9864
a0b6b246 9865# 译者:注意保持前导空格
65387fd5 9866#: wt-status.c:1204
a0b6b246
JX
9867msgid " (fix conflicts and run \"git commit\")"
9868msgstr " (解决冲突并运行 \"git commit\")"
1b7f4a34 9869
a0b6b246 9870# 译者:注意保持前导空格
65387fd5 9871#: wt-status.c:1206
a0b6b246
JX
9872msgid " (use \"git merge --abort\" to abort the merge)"
9873msgstr " (使用 \"git merge --abort\" 终止合并)"
1b7f4a34 9874
65387fd5 9875#: wt-status.c:1210
a0b6b246
JX
9876msgid "All conflicts fixed but you are still merging."
9877msgstr "所有冲突已解决但您仍处于合并中。"
1b7f4a34 9878
a0b6b246 9879# 译者:注意保持前导空格
65387fd5 9880#: wt-status.c:1213
a0b6b246
JX
9881msgid " (use \"git commit\" to conclude merge)"
9882msgstr " (使用 \"git commit\" 结束合并)"
1b7f4a34 9883
65387fd5 9884#: wt-status.c:1224
a0b6b246
JX
9885msgid "You are in the middle of an am session."
9886msgstr "您正处于 am 操作过程中。"
1b7f4a34 9887
65387fd5 9888#: wt-status.c:1227
a0b6b246
JX
9889msgid "The current patch is empty."
9890msgstr "当前的补丁为空。"
1b7f4a34 9891
a0b6b246 9892# 译者:注意保持前导空格
65387fd5 9893#: wt-status.c:1232
a0b6b246
JX
9894msgid " (fix conflicts and then run \"git am --continue\")"
9895msgstr " (解决冲突,然后运行 \"git am --continue\")"
1b7f4a34 9896
a0b6b246 9897# 译者:注意保持前导空格
65387fd5 9898#: wt-status.c:1234
a0b6b246
JX
9899msgid " (use \"git am --skip\" to skip this patch)"
9900msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1b7f4a34 9901
a0b6b246 9902# 译者:注意保持前导空格
65387fd5
FZ
9903#: wt-status.c:1237
9904msgid ""
9905" (use \"git am --allow-empty\" to record this patch as an empty commit)"
9906msgstr " (使用 \"git am --allow-empty\" 将这个补丁记录为空提交)"
9907
9908# 译者:注意保持前导空格
9909#: wt-status.c:1239
a0b6b246
JX
9910msgid " (use \"git am --abort\" to restore the original branch)"
9911msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1b7f4a34 9912
65387fd5 9913#: wt-status.c:1372
1a79b2f1
JX
9914msgid "git-rebase-todo is missing."
9915msgstr "git-rebase-todo 丢失。"
9916
65387fd5 9917#: wt-status.c:1374
a0b6b246
JX
9918msgid "No commands done."
9919msgstr "没有命令被执行。"
9920
65387fd5 9921#: wt-status.c:1377
1b7f4a34 9922#, c-format
a0b6b246
JX
9923msgid "Last command done (%d command done):"
9924msgid_plural "Last commands done (%d commands done):"
9925msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
9926msgstr[1] "最后的命令已完成(%d 条命令被执行):"
1b7f4a34 9927
65387fd5 9928#: wt-status.c:1388
1b7f4a34 9929#, c-format
a0b6b246
JX
9930msgid " (see more in file %s)"
9931msgstr " (更多参见文件 %s)"
9932
65387fd5 9933#: wt-status.c:1393
a0b6b246
JX
9934msgid "No commands remaining."
9935msgstr "未剩下任何命令。"
1b7f4a34 9936
65387fd5 9937#: wt-status.c:1396
1b7f4a34 9938#, c-format
a0b6b246
JX
9939msgid "Next command to do (%d remaining command):"
9940msgid_plural "Next commands to do (%d remaining commands):"
9941msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
9942msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
1b7f4a34 9943
a0b6b246 9944# 译者:注意保持前导空格
65387fd5 9945#: wt-status.c:1404
a0b6b246
JX
9946msgid " (use \"git rebase --edit-todo\" to view and edit)"
9947msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
1b7f4a34 9948
65387fd5 9949#: wt-status.c:1416
1b7f4a34 9950#, c-format
a0b6b246
JX
9951msgid "You are currently rebasing branch '%s' on '%s'."
9952msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1b7f4a34 9953
65387fd5 9954#: wt-status.c:1421
a0b6b246
JX
9955msgid "You are currently rebasing."
9956msgstr "您在执行变基操作。"
1b7f4a34 9957
a0b6b246 9958# 译者:注意保持前导空格
65387fd5 9959#: wt-status.c:1434
a0b6b246
JX
9960msgid " (fix conflicts and then run \"git rebase --continue\")"
9961msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1b7f4a34 9962
a0b6b246 9963# 译者:注意保持前导空格
65387fd5 9964#: wt-status.c:1436
a0b6b246
JX
9965msgid " (use \"git rebase --skip\" to skip this patch)"
9966msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
9967
9968# 译者:注意保持前导空格
65387fd5 9969#: wt-status.c:1438
a0b6b246
JX
9970msgid " (use \"git rebase --abort\" to check out the original branch)"
9971msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
9972
9973# 译者:注意保持前导空格
65387fd5 9974#: wt-status.c:1445
a0b6b246
JX
9975msgid " (all conflicts fixed: run \"git rebase --continue\")"
9976msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1b7f4a34 9977
65387fd5 9978#: wt-status.c:1449
a0b6b246 9979#, c-format
1b7f4a34 9980msgid ""
a0b6b246
JX
9981"You are currently splitting a commit while rebasing branch '%s' on '%s'."
9982msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1b7f4a34 9983
65387fd5 9984#: wt-status.c:1454
a0b6b246
JX
9985msgid "You are currently splitting a commit during a rebase."
9986msgstr "您在执行变基操作时拆分提交。"
1b7f4a34 9987
a0b6b246 9988# 译者:注意保持前导空格
65387fd5 9989#: wt-status.c:1457
a0b6b246
JX
9990msgid " (Once your working directory is clean, run \"git rebase --continue\")"
9991msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1b7f4a34 9992
65387fd5 9993#: wt-status.c:1461
a0b6b246
JX
9994#, c-format
9995msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
9996msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1b7f4a34 9997
65387fd5 9998#: wt-status.c:1466
a0b6b246
JX
9999msgid "You are currently editing a commit during a rebase."
10000msgstr "您在执行变基操作时编辑提交。"
1b7f4a34 10001
a0b6b246 10002# 译者:注意保持前导空格
65387fd5 10003#: wt-status.c:1469
a0b6b246
JX
10004msgid " (use \"git commit --amend\" to amend the current commit)"
10005msgstr " (使用 \"git commit --amend\" 修补当前提交)"
10006
10007# 译者:注意保持前导空格
65387fd5 10008#: wt-status.c:1471
a0b6b246
JX
10009msgid ""
10010" (use \"git rebase --continue\" once you are satisfied with your changes)"
10011msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
1b7f4a34 10012
65387fd5 10013#: wt-status.c:1482
d46c5519
JX
10014msgid "Cherry-pick currently in progress."
10015msgstr "拣选操作正在进行中。"
10016
65387fd5 10017#: wt-status.c:1485
1b7f4a34 10018#, c-format
a0b6b246
JX
10019msgid "You are currently cherry-picking commit %s."
10020msgstr "您在执行拣选提交 %s 的操作。"
1b7f4a34 10021
a0b6b246 10022# 译者:注意保持前导空格
65387fd5 10023#: wt-status.c:1492
a0b6b246
JX
10024msgid " (fix conflicts and run \"git cherry-pick --continue\")"
10025msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1b7f4a34 10026
a0b6b246 10027# 译者:注意保持前导空格
65387fd5 10028#: wt-status.c:1495
d46c5519
JX
10029msgid " (run \"git cherry-pick --continue\" to continue)"
10030msgstr " (执行 \"git cherry-pick --continue\" 以继续)"
10031
10032# 译者:注意保持前导空格
65387fd5 10033#: wt-status.c:1498
a0b6b246
JX
10034msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
10035msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
1b7f4a34 10036
a0b6b246 10037# 译者:注意保持前导空格
65387fd5 10038#: wt-status.c:1500
a5cd71ca
JX
10039msgid " (use \"git cherry-pick --skip\" to skip this patch)"
10040msgstr " (使用 \"git cherry-pick --skip\" 跳过此补丁)"
10041
10042# 译者:注意保持前导空格
65387fd5 10043#: wt-status.c:1502
a0b6b246
JX
10044msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
10045msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1b7f4a34 10046
65387fd5 10047#: wt-status.c:1512
d46c5519
JX
10048msgid "Revert currently in progress."
10049msgstr "还原操作正在行中。"
10050
65387fd5 10051#: wt-status.c:1515
1b7f4a34 10052#, c-format
a0b6b246
JX
10053msgid "You are currently reverting commit %s."
10054msgstr "您在执行反转提交 %s 的操作。"
1b7f4a34 10055
a0b6b246 10056# 译者:注意保持前导空格
65387fd5 10057#: wt-status.c:1521
a0b6b246 10058msgid " (fix conflicts and run \"git revert --continue\")"
5b533632 10059msgstr " (解决冲突并执行 \"git revert --continue\")"
1b7f4a34 10060
a0b6b246 10061# 译者:注意保持前导空格
65387fd5 10062#: wt-status.c:1524
d46c5519 10063msgid " (run \"git revert --continue\" to continue)"
5b533632 10064msgstr " (执行 \"git revert --continue\" 以继续)"
d46c5519
JX
10065
10066# 译者:注意保持前导空格
65387fd5 10067#: wt-status.c:1527
a0b6b246 10068msgid " (all conflicts fixed: run \"git revert --continue\")"
5b533632 10069msgstr " (所有冲突已解决:执行 \"git revert --continue\")"
1b7f4a34 10070
a0b6b246 10071# 译者:注意保持前导空格
65387fd5 10072#: wt-status.c:1529
a5cd71ca
JX
10073msgid " (use \"git revert --skip\" to skip this patch)"
10074msgstr " (使用 \"git revert --skip\" 跳过此补丁)"
10075
10076# 译者:注意保持前导空格
65387fd5 10077#: wt-status.c:1531
a0b6b246
JX
10078msgid " (use \"git revert --abort\" to cancel the revert operation)"
10079msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1b7f4a34 10080
65387fd5 10081#: wt-status.c:1541
1b7f4a34 10082#, c-format
a0b6b246
JX
10083msgid "You are currently bisecting, started from branch '%s'."
10084msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1b7f4a34 10085
65387fd5 10086#: wt-status.c:1545
a0b6b246
JX
10087msgid "You are currently bisecting."
10088msgstr "您在执行二分查找操作。"
1b7f4a34 10089
a0b6b246 10090# 译者:注意保持前导空格
65387fd5 10091#: wt-status.c:1548
a0b6b246
JX
10092msgid " (use \"git bisect reset\" to get back to the original branch)"
10093msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1b7f4a34 10094
65387fd5 10095#: wt-status.c:1559
ec3d4607
JX
10096msgid "You are in a sparse checkout."
10097msgstr "您处于一个稀疏检出中。"
10098
65387fd5 10099#: wt-status.c:1562
7157c2b5
JX
10100#, c-format
10101msgid "You are in a sparse checkout with %d%% of tracked files present."
ec3d4607 10102msgstr "您处于稀疏检出状态,包含 %d%% 的跟踪文件"
7157c2b5 10103
65387fd5 10104#: wt-status.c:1806
a0b6b246
JX
10105msgid "On branch "
10106msgstr "位于分支 "
1b7f4a34 10107
65387fd5 10108#: wt-status.c:1813
a0b6b246
JX
10109msgid "interactive rebase in progress; onto "
10110msgstr "交互式变基操作正在进行中;至 "
1b7f4a34 10111
65387fd5 10112#: wt-status.c:1815
a0b6b246
JX
10113msgid "rebase in progress; onto "
10114msgstr "变基操作正在进行中;至 "
1b7f4a34 10115
65387fd5 10116#: wt-status.c:1820
473eb541
JX
10117msgid "HEAD detached at "
10118msgstr "头指针分离于 "
10119
65387fd5 10120#: wt-status.c:1822
473eb541
JX
10121msgid "HEAD detached from "
10122msgstr "头指针分离自 "
10123
65387fd5 10124#: wt-status.c:1825
a0b6b246
JX
10125msgid "Not currently on any branch."
10126msgstr "当前不在任何分支上。"
1b7f4a34 10127
65387fd5 10128#: wt-status.c:1842
a0b6b246
JX
10129msgid "Initial commit"
10130msgstr "初始提交"
1b7f4a34 10131
65387fd5 10132#: wt-status.c:1843
a4f16749
JX
10133msgid "No commits yet"
10134msgstr "尚无提交"
10135
65387fd5 10136#: wt-status.c:1857
a0b6b246
JX
10137msgid "Untracked files"
10138msgstr "未跟踪的文件"
1b7f4a34 10139
65387fd5 10140#: wt-status.c:1859
a0b6b246
JX
10141msgid "Ignored files"
10142msgstr "忽略的文件"
1b7f4a34 10143
65387fd5 10144#: wt-status.c:1863
a0b6b246
JX
10145#, c-format
10146msgid ""
10147"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
10148"may speed it up, but you have to be careful not to forget to add\n"
10149"new files yourself (see 'git help status')."
10150msgstr ""
10151"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
10152"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1b7f4a34 10153
65387fd5 10154#: wt-status.c:1869
a0b6b246
JX
10155#, c-format
10156msgid "Untracked files not listed%s"
10157msgstr "未跟踪的文件没有列出%s"
1b7f4a34 10158
a0b6b246 10159# 译者:中文字符串拼接,可删除前导空格
65387fd5 10160#: wt-status.c:1871
a0b6b246
JX
10161msgid " (use -u option to show untracked files)"
10162msgstr "(使用 -u 参数显示未跟踪的文件)"
1b7f4a34 10163
65387fd5 10164#: wt-status.c:1877
a0b6b246
JX
10165msgid "No changes"
10166msgstr "没有修改"
1b7f4a34 10167
65387fd5 10168#: wt-status.c:1882
a0b6b246
JX
10169#, c-format
10170msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
10171msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
1b7f4a34 10172
65387fd5 10173#: wt-status.c:1886
a0b6b246
JX
10174#, c-format
10175msgid "no changes added to commit\n"
10176msgstr "修改尚未加入提交\n"
1b7f4a34 10177
65387fd5 10178#: wt-status.c:1890
a0b6b246
JX
10179#, c-format
10180msgid ""
10181"nothing added to commit but untracked files present (use \"git add\" to "
10182"track)\n"
10183msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
1b7f4a34 10184
65387fd5 10185#: wt-status.c:1894
a0b6b246
JX
10186#, c-format
10187msgid "nothing added to commit but untracked files present\n"
10188msgstr "提交为空,但是存在尚未跟踪的文件\n"
1b7f4a34 10189
65387fd5 10190#: wt-status.c:1898
a0b6b246
JX
10191#, c-format
10192msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
10193msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
1b7f4a34 10194
65387fd5 10195#: wt-status.c:1902 wt-status.c:1908
a0b6b246
JX
10196#, c-format
10197msgid "nothing to commit\n"
10198msgstr "无文件要提交\n"
1b7f4a34 10199
65387fd5 10200#: wt-status.c:1905
a0b6b246
JX
10201#, c-format
10202msgid "nothing to commit (use -u to show untracked files)\n"
10203msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
1b7f4a34 10204
65387fd5 10205#: wt-status.c:1910
a0b6b246
JX
10206#, c-format
10207msgid "nothing to commit, working tree clean\n"
10208msgstr "无文件要提交,干净的工作区\n"
10209
65387fd5 10210#: wt-status.c:2015
a4f16749
JX
10211msgid "No commits yet on "
10212msgstr "尚无提交在 "
1b7f4a34 10213
65387fd5 10214#: wt-status.c:2019
a0b6b246
JX
10215msgid "HEAD (no branch)"
10216msgstr "HEAD(非分支)"
1b7f4a34 10217
65387fd5 10218#: wt-status.c:2050
31e5e17b
JX
10219msgid "different"
10220msgstr "不同"
10221
a0b6b246 10222# 译者:注意保持句尾空格
65387fd5 10223#: wt-status.c:2052 wt-status.c:2060
a0b6b246
JX
10224msgid "behind "
10225msgstr "落后 "
1b7f4a34 10226
65387fd5 10227#: wt-status.c:2055 wt-status.c:2058
a0b6b246
JX
10228msgid "ahead "
10229msgstr "领先 "
1b7f4a34 10230
a0b6b246 10231#. TRANSLATORS: the action is e.g. "pull with rebase"
65387fd5 10232#: wt-status.c:2596
a0b6b246
JX
10233#, c-format
10234msgid "cannot %s: You have unstaged changes."
10235msgstr "不能%s:您有未暂存的变更。"
1b7f4a34 10236
65387fd5 10237#: wt-status.c:2602
a0b6b246 10238msgid "additionally, your index contains uncommitted changes."
29004bbb 10239msgstr "另外,您的索引中包含未提交的变更。"
1b7f4a34 10240
65387fd5 10241#: wt-status.c:2604
a0b6b246
JX
10242#, c-format
10243msgid "cannot %s: Your index contains uncommitted changes."
10244msgstr "不能%s:您的索引中包含未提交的变更。"
1b7f4a34 10245
65387fd5 10246#: compat/simple-ipc/ipc-unix-socket.c:205
33b62fba
JX
10247msgid "could not send IPC command"
10248msgstr "无法发送 IPC 命令"
10249
65387fd5 10250#: compat/simple-ipc/ipc-unix-socket.c:212
33b62fba
JX
10251msgid "could not read IPC response"
10252msgstr "无法读取 IPC 响应"
10253
65387fd5 10254#: compat/simple-ipc/ipc-unix-socket.c:892
33b62fba
JX
10255#, c-format
10256msgid "could not start accept_thread '%s'"
7b4d4954 10257msgstr "无法启动 accept_thread '%s'"
33b62fba 10258
65387fd5 10259#: compat/simple-ipc/ipc-unix-socket.c:904
33b62fba
JX
10260#, c-format
10261msgid "could not start worker[0] for '%s'"
10262msgstr "无法启动 '%s' 的 worker[0]"
10263
7e6630a7 10264#: compat/precompose_utf8.c:58 builtin/clone.c:347
a5cd71ca
JX
10265#, c-format
10266msgid "failed to unlink '%s'"
65387fd5 10267msgstr "无法删除 '%s'"
a5cd71ca 10268
ddc12c42 10269#: builtin/add.c:26
a0b6b246
JX
10270msgid "git add [<options>] [--] <pathspec>..."
10271msgstr "git add [<选项>] [--] <路径规格>..."
1b7f4a34 10272
7e6630a7 10273#: builtin/add.c:64
473eb541
JX
10274#, c-format
10275msgid "cannot chmod %cx '%s'"
10276msgstr "不能 chmod %cx '%s'"
10277
7e6630a7 10278#: builtin/add.c:106
a0b6b246
JX
10279#, c-format
10280msgid "unexpected diff status %c"
10281msgstr "意外的差异状态 %c"
1b7f4a34 10282
7e6630a7 10283#: builtin/add.c:111 builtin/commit.c:298
a0b6b246
JX
10284msgid "updating files failed"
10285msgstr "更新文件失败"
1b7f4a34 10286
7e6630a7 10287#: builtin/add.c:121
a0b6b246
JX
10288#, c-format
10289msgid "remove '%s'\n"
10290msgstr "删除 '%s'\n"
1b7f4a34 10291
7e6630a7 10292#: builtin/add.c:205
a0b6b246
JX
10293msgid "Unstaged changes after refreshing the index:"
10294msgstr "刷新索引之后尚未被暂存的变更:"
1b7f4a34 10295
65387fd5 10296#: builtin/add.c:313 builtin/rev-parse.c:993
a0b6b246
JX
10297msgid "Could not read the index"
10298msgstr "不能读取索引"
1b7f4a34 10299
65387fd5 10300#: builtin/add.c:326
a0b6b246
JX
10301msgid "Could not write patch"
10302msgstr "不能生成补丁"
1b7f4a34 10303
65387fd5 10304#: builtin/add.c:329
a0b6b246
JX
10305msgid "editing patch failed"
10306msgstr "编辑补丁失败"
1b7f4a34 10307
65387fd5 10308#: builtin/add.c:332
1b7f4a34 10309#, c-format
a0b6b246 10310msgid "Could not stat '%s'"
65e2041e 10311msgstr "不能对 '%s' 调用 stat"
1b7f4a34 10312
65387fd5 10313#: builtin/add.c:334
a0b6b246
JX
10314msgid "Empty patch. Aborted."
10315msgstr "空补丁。异常终止。"
1b7f4a34 10316
65387fd5 10317#: builtin/add.c:340
a0b6b246
JX
10318#, c-format
10319msgid "Could not apply '%s'"
10320msgstr "不能应用 '%s'"
1b7f4a34 10321
65387fd5 10322#: builtin/add.c:348
a0b6b246
JX
10323msgid "The following paths are ignored by one of your .gitignore files:\n"
10324msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 10325
65387fd5 10326#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
ffa14514 10327#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
7e6630a7 10328#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
a0b6b246
JX
10329msgid "dry run"
10330msgstr "演习"
8ada9598 10331
65387fd5
FZ
10332#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
10333#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
10334#: builtin/mv.c:123 builtin/read-tree.c:120
10335msgid "be verbose"
10336msgstr "冗长输出"
10337
10338#: builtin/add.c:371
10339msgid "interactive picking"
a0b6b246 10340msgstr "交互式拣选"
8ada9598 10341
65387fd5 10342#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
a0b6b246
JX
10343msgid "select hunks interactively"
10344msgstr "交互式挑选数据块"
8ada9598 10345
65387fd5 10346#: builtin/add.c:373
a0b6b246
JX
10347msgid "edit current diff and apply"
10348msgstr "编辑当前差异并应用"
8ada9598 10349
65387fd5 10350#: builtin/add.c:374
a0b6b246
JX
10351msgid "allow adding otherwise ignored files"
10352msgstr "允许添加忽略的文件"
8ada9598 10353
65387fd5 10354#: builtin/add.c:375
a0b6b246
JX
10355msgid "update tracked files"
10356msgstr "更新已跟踪的文件"
8ada9598 10357
65387fd5 10358#: builtin/add.c:376
5809aa05
JX
10359msgid "renormalize EOL of tracked files (implies -u)"
10360msgstr "对已跟踪文件(暗含 -u)重新归一换行符"
10361
65387fd5 10362#: builtin/add.c:377
a0b6b246
JX
10363msgid "record only the fact that the path will be added later"
10364msgstr "只记录,该路径稍后再添加"
8ada9598 10365
65387fd5 10366#: builtin/add.c:378
a0b6b246
JX
10367msgid "add changes from all tracked and untracked files"
10368msgstr "添加所有改变的已跟踪文件和未跟踪文件"
8ada9598 10369
65387fd5 10370#: builtin/add.c:381
a0b6b246
JX
10371msgid "ignore paths removed in the working tree (same as --no-all)"
10372msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
8ada9598 10373
65387fd5 10374#: builtin/add.c:383
a0b6b246
JX
10375msgid "don't add, only refresh the index"
10376msgstr "不添加,只刷新索引"
8ada9598 10377
65387fd5 10378#: builtin/add.c:384
a0b6b246
JX
10379msgid "just skip files which cannot be added because of errors"
10380msgstr "跳过因出错不能添加的文件"
8ada9598 10381
65387fd5 10382#: builtin/add.c:385
a0b6b246
JX
10383msgid "check if - even missing - files are ignored in dry run"
10384msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
8ada9598 10385
65387fd5 10386#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
7e6630a7 10387msgid "allow updating entries outside of the sparse-checkout cone"
65387fd5 10388msgstr "允许更新稀疏检出锥以外的条目"
7e6630a7 10389
65387fd5 10390#: builtin/add.c:388 builtin/update-index.c:1004
a0b6b246
JX
10391msgid "override the executable bit of the listed files"
10392msgstr "覆盖列表里文件的可执行位"
8ada9598 10393
65387fd5 10394#: builtin/add.c:390
a4f16749
JX
10395msgid "warn when adding an embedded repository"
10396msgstr "创建一个嵌入式仓库时给予警告"
10397
65387fd5 10398#: builtin/add.c:392
2b472aae
JX
10399msgid "backend for `git stash -p`"
10400msgstr "`git stash -p` 的后端"
10401
65387fd5 10402#: builtin/add.c:410
a4f16749
JX
10403#, c-format
10404msgid ""
10405"You've added another git repository inside your current repository.\n"
10406"Clones of the outer repository will not contain the contents of\n"
10407"the embedded repository and will not know how to obtain it.\n"
10408"If you meant to add a submodule, use:\n"
10409"\n"
10410"\tgit submodule add <url> %s\n"
10411"\n"
10412"If you added this path by mistake, you can remove it from the\n"
10413"index with:\n"
10414"\n"
10415"\tgit rm --cached %s\n"
10416"\n"
10417"See \"git help submodule\" for more information."
10418msgstr ""
ddc12c42
JX
10419"您在当前仓库中添加了另一个Git仓库。克隆外层的仓库将不包含嵌入仓库的\n"
10420"内容,并且不知道该如何获取它。如果您要添加一个子模组,使用:\n"
a4f16749
JX
10421"\n"
10422"\tgit submodule add <url> %s\n"
10423"\n"
10424"如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n"
10425"\n"
10426"\tgit rm --cached %s\n"
10427"\n"
10428"参见 \"git help submodule\" 获取更多信息。"
10429
65387fd5 10430#: builtin/add.c:439
a4f16749
JX
10431#, c-format
10432msgid "adding embedded git repository: %s"
10433msgstr "正在添加嵌入式 git 仓库:%s"
10434
65387fd5 10435#: builtin/add.c:459
2b472aae
JX
10436msgid ""
10437"Use -f if you really want to add them.\n"
10438"Turn this message off by running\n"
10439"\"git config advice.addIgnoredFile false\""
10440msgstr ""
440e7442 10441"如果您确实要添加它们,使用 -f 参数。\n"
2b472aae
JX
10442"运行下面的命令来关闭本消息\n"
10443"\"git config advice.addIgnoredFile false\""
8ada9598 10444
65387fd5 10445#: builtin/add.c:474
a0b6b246
JX
10446msgid "adding files failed"
10447msgstr "添加文件失败"
8ada9598 10448
65387fd5 10449#: builtin/add.c:548
8ada9598 10450#, c-format
a0b6b246
JX
10451msgid "--chmod param '%s' must be either -x or +x"
10452msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
8ada9598 10453
65387fd5
FZ
10454#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
10455#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
10456#, c-format
10457msgid "'%s' and pathspec arguments cannot be used together"
10458msgstr "'%s' 和路径规格参数不能同时使用"
ddc12c42 10459
65387fd5 10460#: builtin/add.c:580
8ada9598 10461#, c-format
a0b6b246
JX
10462msgid "Nothing specified, nothing added.\n"
10463msgstr "没有指定文件,也没有文件被添加。\n"
8ada9598 10464
65387fd5 10465#: builtin/add.c:582
2b472aae
JX
10466msgid ""
10467"Maybe you wanted to say 'git add .'?\n"
10468"Turn this message off by running\n"
10469"\"git config advice.addEmptyPathspec false\""
10470msgstr ""
10471"也许您想要执行 'git add .'?\n"
10472"运行下面的命令来关闭本消息\n"
10473"\"git config advice.addEmptyPathspec false\""
8ada9598 10474
65387fd5
FZ
10475#: builtin/am.c:202
10476#, c-format
10477msgid "Invalid value for --empty: %s"
10478msgstr "--empty 的值无效:%s"
10479
10480#: builtin/am.c:392
a0b6b246
JX
10481msgid "could not parse author script"
10482msgstr "不能解析作者脚本"
8ada9598 10483
65387fd5 10484#: builtin/am.c:482
81809b99 10485#, c-format
a0b6b246
JX
10486msgid "'%s' was deleted by the applypatch-msg hook"
10487msgstr "'%s' 被 applypatch-msg 钩子删除"
8ada9598 10488
65387fd5 10489#: builtin/am.c:524
8ada9598 10490#, c-format
a0b6b246
JX
10491msgid "Malformed input line: '%s'."
10492msgstr "非法的输入行:'%s'。"
8ada9598 10493
65387fd5 10494#: builtin/am.c:562
8ada9598 10495#, c-format
a0b6b246
JX
10496msgid "Failed to copy notes from '%s' to '%s'"
10497msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
8ada9598 10498
65387fd5 10499#: builtin/am.c:588
a0b6b246
JX
10500msgid "fseek failed"
10501msgstr "fseek 失败"
8ada9598 10502
65387fd5 10503#: builtin/am.c:776
8ada9598 10504#, c-format
a0b6b246
JX
10505msgid "could not parse patch '%s'"
10506msgstr "无法解析补丁 '%s'"
8ada9598 10507
65387fd5 10508#: builtin/am.c:841
a0b6b246
JX
10509msgid "Only one StGIT patch series can be applied at once"
10510msgstr "一次只能有一个 StGIT 补丁队列被应用"
10511
65387fd5 10512#: builtin/am.c:889
a0b6b246
JX
10513msgid "invalid timestamp"
10514msgstr "无效的时间戳"
10515
65387fd5 10516#: builtin/am.c:894 builtin/am.c:906
a0b6b246
JX
10517msgid "invalid Date line"
10518msgstr "无效的日期行"
8ada9598 10519
65387fd5 10520#: builtin/am.c:901
a0b6b246
JX
10521msgid "invalid timezone offset"
10522msgstr "无效的时区偏移值"
8ada9598 10523
65387fd5 10524#: builtin/am.c:994
a0b6b246 10525msgid "Patch format detection failed."
87cb7997 10526msgstr "补丁格式探测失败。"
8ada9598 10527
65387fd5 10528#: builtin/am.c:999 builtin/clone.c:300
8ada9598 10529#, c-format
a0b6b246 10530msgid "failed to create directory '%s'"
65387fd5 10531msgstr "无法创建目录 '%s'"
8ada9598 10532
65387fd5 10533#: builtin/am.c:1004
a0b6b246 10534msgid "Failed to split patches."
65387fd5 10535msgstr "无法拆分补丁。"
814ff314 10536
65387fd5 10537#: builtin/am.c:1153
8ada9598 10538#, c-format
a0b6b246
JX
10539msgid "When you have resolved this problem, run \"%s --continue\"."
10540msgstr "当您解决这一问题,执行 \"%s --continue\"。"
8ada9598 10541
65387fd5 10542#: builtin/am.c:1154
81809b99 10543#, c-format
a0b6b246
JX
10544msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
10545msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
8ada9598 10546
65387fd5
FZ
10547#: builtin/am.c:1159
10548#, c-format
10549msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
10550msgstr "若要把空补丁记录为空提交,执行 \"%s --allow-empty\"。"
10551
10552#: builtin/am.c:1161
81809b99 10553#, c-format
a0b6b246
JX
10554msgid "To restore the original branch and stop patching, run \"%s --abort\"."
10555msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
8ada9598 10556
65387fd5 10557#: builtin/am.c:1256
4c27fcb5
JX
10558msgid "Patch sent with format=flowed; space at the end of lines might be lost."
10559msgstr "补丁使用 format=flowed 格式发送,行尾的空格可能会丢失。"
10560
65387fd5 10561#: builtin/am.c:1344
a5cd71ca
JX
10562#, c-format
10563msgid "missing author line in commit %s"
10564msgstr "在提交 %s 中缺失作者行"
10565
65387fd5 10566#: builtin/am.c:1347
8ada9598 10567#, c-format
a4f16749
JX
10568msgid "invalid ident line: %.*s"
10569msgstr "无效的身份标识:%.*s"
8ada9598 10570
65387fd5 10571#: builtin/am.c:1566
a0b6b246
JX
10572msgid "Repository lacks necessary blobs to fall back on 3-way merge."
10573msgstr "仓库缺乏必要的数据对象以进行三方合并。"
814ff314 10574
65387fd5 10575#: builtin/am.c:1568
a0b6b246
JX
10576msgid "Using index info to reconstruct a base tree..."
10577msgstr "使用索引来重建一个(三方合并的)基础目录树..."
8ada9598 10578
65387fd5 10579#: builtin/am.c:1587
a0b6b246
JX
10580msgid ""
10581"Did you hand edit your patch?\n"
10582"It does not apply to blobs recorded in its index."
10583msgstr ""
10584"您是否曾手动编辑过您的补丁?\n"
10585"无法应用补丁到索引中的数据对象上。"
23ff3338 10586
65387fd5 10587#: builtin/am.c:1593
a0b6b246
JX
10588msgid "Falling back to patching base and 3-way merge..."
10589msgstr "回落到基础版本上打补丁及进行三方合并..."
8ada9598 10590
65387fd5 10591#: builtin/am.c:1619
a0b6b246
JX
10592msgid "Failed to merge in the changes."
10593msgstr "无法合并变更。"
d691f479 10594
65387fd5 10595#: builtin/am.c:1651
a0b6b246
JX
10596msgid "applying to an empty history"
10597msgstr "正应用到一个空历史上"
8ada9598 10598
65387fd5 10599#: builtin/am.c:1703 builtin/am.c:1707
8ada9598 10600#, c-format
a0b6b246
JX
10601msgid "cannot resume: %s does not exist."
10602msgstr "无法继续:%s 不存在。"
8ada9598 10603
65387fd5 10604#: builtin/am.c:1725
a0b6b246
JX
10605msgid "Commit Body is:"
10606msgstr "提交内容为:"
8ada9598 10607
a0b6b246
JX
10608#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
10609#. in your translation. The program will only accept English
10610#. input at this point.
10611#.
65387fd5 10612#: builtin/am.c:1735
a6cd2cc4 10613#, c-format
a0b6b246
JX
10614msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
10615msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
8ada9598 10616
65387fd5 10617#: builtin/am.c:1781 builtin/commit.c:409
a5cd71ca
JX
10618msgid "unable to write index file"
10619msgstr "无法写入索引文件"
10620
65387fd5 10621#: builtin/am.c:1785
8ada9598 10622#, c-format
a0b6b246
JX
10623msgid "Dirty index: cannot apply patches (dirty: %s)"
10624msgstr "脏索引:不能应用补丁(脏文件:%s)"
8ada9598 10625
65387fd5
FZ
10626#: builtin/am.c:1827
10627#, c-format
10628msgid "Skipping: %.*s"
10629msgstr "跳过:%.*s"
10630
10631#: builtin/am.c:1832
10632#, c-format
10633msgid "Creating an empty commit: %.*s"
10634msgstr "创建空提交:%.*s"
10635
10636#: builtin/am.c:1836
10637msgid "Patch is empty."
10638msgstr "补丁为空。"
10639
10640#: builtin/am.c:1847 builtin/am.c:1916
81809b99 10641#, c-format
a0b6b246
JX
10642msgid "Applying: %.*s"
10643msgstr "应用:%.*s"
8ada9598 10644
65387fd5 10645#: builtin/am.c:1864
a0b6b246
JX
10646msgid "No changes -- Patch already applied."
10647msgstr "没有变更 —— 补丁已经应用过。"
8ada9598 10648
65387fd5 10649#: builtin/am.c:1870
81809b99 10650#, c-format
a0b6b246
JX
10651msgid "Patch failed at %s %.*s"
10652msgstr "打补丁失败于 %s %.*s"
8ada9598 10653
65387fd5 10654#: builtin/am.c:1874
2b472aae
JX
10655msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
10656msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁"
8ada9598 10657
65387fd5
FZ
10658#: builtin/am.c:1920
10659msgid "No changes - recorded it as an empty commit."
10660msgstr "没有变更 —— 记录为空提交。"
10661
10662#: builtin/am.c:1922
a0b6b246
JX
10663msgid ""
10664"No changes - did you forget to use 'git add'?\n"
10665"If there is nothing left to stage, chances are that something else\n"
10666"already introduced the same changes; you might want to skip this patch."
10667msgstr ""
10668"没有变更 —— 您是不是忘了执行 'git add'?\n"
10669"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
10670"您也许想要跳过这个补丁。"
8ada9598 10671
65387fd5 10672#: builtin/am.c:1930
a0b6b246
JX
10673msgid ""
10674"You still have unmerged paths in your index.\n"
a4f16749
JX
10675"You should 'git add' each file with resolved conflicts to mark them as "
10676"such.\n"
10677"You might run `git rm` on a file to accept \"deleted by them\" for it."
a0b6b246 10678msgstr ""
a4f16749
JX
10679"在您的索引中仍存在未合并的路径。\n"
10680"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
7e6630a7 10681"您可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
8ada9598 10682
65387fd5
FZ
10683#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
10684#: builtin/reset.c:456
8ada9598 10685#, c-format
a0b6b246
JX
10686msgid "Could not parse object '%s'."
10687msgstr "不能解析对象 '%s'。"
8ada9598 10688
65387fd5 10689#: builtin/am.c:2090 builtin/am.c:2166
a0b6b246 10690msgid "failed to clean index"
65387fd5 10691msgstr "无法清空索引"
5b04ee3b 10692
65387fd5 10693#: builtin/am.c:2134
a0b6b246
JX
10694msgid ""
10695"You seem to have moved HEAD since the last 'am' failure.\n"
10696"Not rewinding to ORIG_HEAD"
10697msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
8ada9598 10698
65387fd5 10699#: builtin/am.c:2242
8ada9598 10700#, c-format
a0b6b246
JX
10701msgid "Invalid value for --patch-format: %s"
10702msgstr "无效的 --patch-format 值:%s"
8ada9598 10703
65387fd5 10704#: builtin/am.c:2285
2b472aae
JX
10705#, c-format
10706msgid "Invalid value for --show-current-patch: %s"
10707msgstr "无效的 --show-current-patch 值:%s"
10708
65387fd5 10709#: builtin/am.c:2289
2b472aae 10710#, c-format
65387fd5
FZ
10711msgid "options '%s=%s' and '%s=%s' cannot be used together"
10712msgstr "选项 '%s=%s' 和 '%s=%s' 不能同时使用"
2b472aae 10713
65387fd5 10714#: builtin/am.c:2320
a0b6b246
JX
10715msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
10716msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
5b04ee3b 10717
65387fd5 10718#: builtin/am.c:2321
a0b6b246
JX
10719msgid "git am [<options>] (--continue | --skip | --abort)"
10720msgstr "git am [<选项>] (--continue | --skip | --abort)"
8ada9598 10721
65387fd5 10722#: builtin/am.c:2327
a0b6b246
JX
10723msgid "run interactively"
10724msgstr "以交互式方式运行"
8ada9598 10725
65387fd5 10726#: builtin/am.c:2329
a0b6b246
JX
10727msgid "historical option -- no-op"
10728msgstr "老的参数 —— 无作用"
8ada9598 10729
65387fd5 10730#: builtin/am.c:2331
a0b6b246
JX
10731msgid "allow fall back on 3way merging if needed"
10732msgstr "如果必要,允许使用三方合并。"
8ada9598 10733
65387fd5
FZ
10734#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
10735#: builtin/repack.c:642 builtin/stash.c:962
a0b6b246
JX
10736msgid "be quiet"
10737msgstr "静默模式"
8ada9598 10738
65387fd5 10739#: builtin/am.c:2334
d13389bf
JX
10740msgid "add a Signed-off-by trailer to the commit message"
10741msgstr "在提交说明中添加 Signed-off-by 尾注"
5c57d762 10742
65387fd5 10743#: builtin/am.c:2337
a0b6b246
JX
10744msgid "recode into utf8 (default)"
10745msgstr "使用 utf8 字符集(默认)"
5c57d762 10746
65387fd5 10747#: builtin/am.c:2339
a0b6b246
JX
10748msgid "pass -k flag to git-mailinfo"
10749msgstr "向 git-mailinfo 传递 -k 参数"
5c57d762 10750
65387fd5 10751#: builtin/am.c:2341
a0b6b246
JX
10752msgid "pass -b flag to git-mailinfo"
10753msgstr "向 git-mailinfo 传递 -b 参数"
5c57d762 10754
65387fd5 10755#: builtin/am.c:2343
a0b6b246
JX
10756msgid "pass -m flag to git-mailinfo"
10757msgstr "向 git-mailinfo 传递 -m 参数"
5c57d762 10758
65387fd5 10759#: builtin/am.c:2345
a0b6b246
JX
10760msgid "pass --keep-cr flag to git-mailsplit for mbox format"
10761msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
5c57d762 10762
65387fd5 10763#: builtin/am.c:2348
a0b6b246
JX
10764msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
10765msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
8ada9598 10766
65387fd5 10767#: builtin/am.c:2351
a0b6b246
JX
10768msgid "strip everything before a scissors line"
10769msgstr "丢弃裁切线前的所有内容"
8ada9598 10770
65387fd5 10771#: builtin/am.c:2353
33b62fba
JX
10772msgid "pass it through git-mailinfo"
10773msgstr "传递给 git-mailinfo"
10774
65387fd5
FZ
10775#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
10776#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
10777#: builtin/am.c:2383
a0b6b246
JX
10778msgid "pass it through git-apply"
10779msgstr "传递给 git-apply"
8ada9598 10780
65387fd5
FZ
10781#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
10782#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
ffa14514 10783#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
65387fd5
FZ
10784#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
10785#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
7e6630a7 10786#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
65387fd5 10787#: parse-options.h:317
a0b6b246
JX
10788msgid "n"
10789msgstr "n"
8ada9598 10790
65387fd5
FZ
10791#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
10792#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
d9488fea 10793#: builtin/verify-tag.c:38
a0b6b246
JX
10794msgid "format"
10795msgstr "格式"
8ada9598 10796
65387fd5 10797#: builtin/am.c:2380
a0b6b246
JX
10798msgid "format the patch(es) are in"
10799msgstr "补丁的格式"
8ada9598 10800
65387fd5 10801#: builtin/am.c:2386
a0b6b246
JX
10802msgid "override error message when patch failure occurs"
10803msgstr "打补丁失败时显示的错误信息"
8ada9598 10804
65387fd5 10805#: builtin/am.c:2388
a0b6b246
JX
10806msgid "continue applying patches after resolving a conflict"
10807msgstr "冲突解决后继续应用补丁"
814ff314 10808
65387fd5 10809#: builtin/am.c:2391
a0b6b246
JX
10810msgid "synonyms for --continue"
10811msgstr "和 --continue 同义"
8ada9598 10812
65387fd5 10813#: builtin/am.c:2394
a0b6b246
JX
10814msgid "skip the current patch"
10815msgstr "跳过当前补丁"
23ff3338 10816
65387fd5 10817#: builtin/am.c:2397
473eb541
JX
10818msgid "restore the original branch and abort the patching operation"
10819msgstr "恢复原始分支并终止打补丁操作"
8ada9598 10820
65387fd5 10821#: builtin/am.c:2400
473eb541
JX
10822msgid "abort the patching operation but keep HEAD where it is"
10823msgstr "终止补丁操作但保持 HEAD 不变"
31e5e17b 10824
65387fd5 10825#: builtin/am.c:2404
2b472aae
JX
10826msgid "show the patch being applied"
10827msgstr "显示正在应用的补丁"
31e5e17b 10828
65387fd5
FZ
10829#: builtin/am.c:2408
10830msgid "record the empty patch as an empty commit"
10831msgstr "把空补丁记录为空提交"
10832
10833#: builtin/am.c:2412
a0b6b246
JX
10834msgid "lie about committer date"
10835msgstr "将作者日期作为提交日期"
8ada9598 10836
65387fd5 10837#: builtin/am.c:2414
a0b6b246
JX
10838msgid "use current timestamp for author date"
10839msgstr "用当前时间作为作者日期"
8ada9598 10840
65387fd5
FZ
10841#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
10842#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
7e6630a7 10843#: builtin/revert.c:117 builtin/tag.c:460
a0b6b246
JX
10844msgid "key-id"
10845msgstr "key-id"
8ada9598 10846
65387fd5 10847#: builtin/am.c:2417 builtin/rebase.c:1100
a0b6b246
JX
10848msgid "GPG-sign commits"
10849msgstr "使用 GPG 签名提交"
8ada9598 10850
65387fd5
FZ
10851#: builtin/am.c:2420
10852msgid "how to handle empty patches"
10853msgstr "如何处理空补丁"
10854
10855#: builtin/am.c:2423
a0b6b246
JX
10856msgid "(internal use for git-rebase)"
10857msgstr "(内部使用,用于 git-rebase)"
8ada9598 10858
65387fd5 10859#: builtin/am.c:2441
a0b6b246
JX
10860msgid ""
10861"The -b/--binary option has been a no-op for long time, and\n"
10862"it will be removed. Please do not use it anymore."
10863msgstr ""
10864"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
10865"请不要再使用它了。"
8ada9598 10866
65387fd5 10867#: builtin/am.c:2448
a0b6b246 10868msgid "failed to read the index"
65387fd5 10869msgstr "无法读取索引"
8ada9598 10870
65387fd5 10871#: builtin/am.c:2463
a0b6b246
JX
10872#, c-format
10873msgid "previous rebase directory %s still exists but mbox given."
10874msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
8ada9598 10875
65387fd5 10876#: builtin/am.c:2487
a0b6b246
JX
10877#, c-format
10878msgid ""
10879"Stray %s directory found.\n"
10880"Use \"git am --abort\" to remove it."
10881msgstr ""
10882"发现了错误的 %s 目录。\n"
10883"使用 \"git am --abort\" 删除它。"
c04f5ac3 10884
65387fd5 10885#: builtin/am.c:2493
a0b6b246
JX
10886msgid "Resolve operation not in progress, we are not resuming."
10887msgstr "解决操作未进行,我们不会继续。"
c04f5ac3 10888
65387fd5 10889#: builtin/am.c:2503
a6cd2cc4
JX
10890msgid "interactive mode requires patches on the command line"
10891msgstr "交互式模式需要命令行上提供补丁"
10892
a0b6b246
JX
10893#: builtin/apply.c:8
10894msgid "git apply [<options>] [<patch>...]"
10895msgstr "git apply [<选项>] [<补丁>...]"
c04f5ac3 10896
7e6630a7 10897#: builtin/archive.c:18
c04f5ac3 10898msgid "could not redirect output"
195febda 10899msgstr "不能重定向输出"
c04f5ac3 10900
7e6630a7 10901#: builtin/archive.c:35
c04f5ac3 10902msgid "git archive: Remote with no URL"
4375c10e 10903msgstr "git archive:未提供远程 URL"
c04f5ac3 10904
7e6630a7 10905#: builtin/archive.c:59
31e5e17b
JX
10906msgid "git archive: expected ACK/NAK, got a flush packet"
10907msgstr "git archive:期望是 ACK/NAK,却得到 flush 包"
c04f5ac3 10908
7e6630a7 10909#: builtin/archive.c:62
c04f5ac3
JX
10910#, c-format
10911msgid "git archive: NACK %s"
90e6ef53 10912msgstr "git archive:NACK %s"
c04f5ac3 10913
7e6630a7 10914#: builtin/archive.c:63
c04f5ac3 10915msgid "git archive: protocol error"
90e6ef53 10916msgstr "git archive:协议错误"
c04f5ac3 10917
7e6630a7 10918#: builtin/archive.c:67
c04f5ac3 10919msgid "git archive: expected a flush"
31e5e17b 10920msgstr "git archive:应有一个 flush 包"
c04f5ac3 10921
7e6630a7 10922#: builtin/bisect--helper.c:24
06991777
JX
10923msgid "git bisect--helper --bisect-reset [<commit>]"
10924msgstr "git bisect--helper --bisect-reset [<提交>]"
10925
473eb541 10926#: builtin/bisect--helper.c:25
06991777
JX
10927msgid ""
10928"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
10929"term-new]"
10930msgstr ""
10931"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
10932"term-new]"
10933
473eb541 10934#: builtin/bisect--helper.c:26
06991777 10935msgid ""
d9488fea
JX
10936"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
10937"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
10938"[<paths>...]"
06991777 10939msgstr ""
d9488fea
JX
10940"git bisect--helper --bisect-start [--term-{new,bad}=<术语> --term-{old,good}"
10941"=<术语>] [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径>...]"
10942
473eb541 10943#: builtin/bisect--helper.c:28
d9488fea
JX
10944msgid "git bisect--helper --bisect-next"
10945msgstr "git bisect--helper --bisect-next"
10946
473eb541 10947#: builtin/bisect--helper.c:29
d13389bf
JX
10948msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
10949msgstr "git bisect--helper --bisect-state (bad|new) [<版本>]"
10950
473eb541 10951#: builtin/bisect--helper.c:30
d13389bf
JX
10952msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
10953msgstr "git bisect--helper --bisect-state (good|old) [<版本>...]"
d9488fea 10954
473eb541
JX
10955#: builtin/bisect--helper.c:31
10956msgid "git bisect--helper --bisect-replay <filename>"
10957msgstr "git bisect--helper --bisect-replay <文件>"
10958
10959#: builtin/bisect--helper.c:32
10960msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
10961msgstr "git bisect--helper --bisect-skip [(<版本>|<范围>)...]"
10962
7e6630a7
FZ
10963#: builtin/bisect--helper.c:33
10964msgid "git bisect--helper --bisect-visualize"
10965msgstr "git bisect--helper --bisect-visualize"
10966
10967#: builtin/bisect--helper.c:34
10968msgid "git bisect--helper --bisect-run <cmd>..."
10969msgstr "git bisect--helper --bisect-run <命令>..."
10970
10971#: builtin/bisect--helper.c:109
d9488fea
JX
10972#, c-format
10973msgid "cannot open file '%s' in mode '%s'"
10974msgstr "不能以 '%2$s' 模式打开文件 '%1$s'"
10975
7e6630a7 10976#: builtin/bisect--helper.c:116
d9488fea
JX
10977#, c-format
10978msgid "could not write to file '%s'"
10979msgstr "不能写入文件 '%s'"
10980
7e6630a7
FZ
10981#: builtin/bisect--helper.c:154
10982#, c-format
10983msgid "cannot open file '%s' for reading"
10984msgstr "不能打开文件 '%s' 来读取"
10985
10986#: builtin/bisect--helper.c:170
5809aa05
JX
10987#, c-format
10988msgid "'%s' is not a valid term"
10989msgstr "'%s' 不是一个有效的术语"
10990
7e6630a7 10991#: builtin/bisect--helper.c:174
5809aa05
JX
10992#, c-format
10993msgid "can't use the builtin command '%s' as a term"
10994msgstr "不能使用内置命令 '%s' 作为术语"
10995
7e6630a7 10996#: builtin/bisect--helper.c:184
5809aa05
JX
10997#, c-format
10998msgid "can't change the meaning of the term '%s'"
10999msgstr "不能修改术语 '%s' 的含义"
11000
7e6630a7 11001#: builtin/bisect--helper.c:194
5809aa05
JX
11002msgid "please use two different terms"
11003msgstr "请使用两个不同的术语"
11004
7e6630a7 11005#: builtin/bisect--helper.c:210
06991777
JX
11006#, c-format
11007msgid "We are not bisecting.\n"
11008msgstr "我们没有在二分查找。\n"
11009
7e6630a7 11010#: builtin/bisect--helper.c:218
06991777
JX
11011#, c-format
11012msgid "'%s' is not a valid commit"
11013msgstr "'%s' 不是一个有效的提交"
11014
7e6630a7 11015#: builtin/bisect--helper.c:227
06991777
JX
11016#, c-format
11017msgid ""
11018"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
11019msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
11020
7e6630a7 11021#: builtin/bisect--helper.c:271
06991777
JX
11022#, c-format
11023msgid "Bad bisect_write argument: %s"
11024msgstr "坏的 bisect_write 参数:%s"
11025
7e6630a7 11026#: builtin/bisect--helper.c:276
06991777
JX
11027#, c-format
11028msgid "couldn't get the oid of the rev '%s'"
5b533632 11029msgstr "无法获取版本 '%s' 的对象 ID"
06991777 11030
7e6630a7 11031#: builtin/bisect--helper.c:288
06991777
JX
11032#, c-format
11033msgid "couldn't open the file '%s'"
11034msgstr "无法打开文件 '%s'"
11035
7e6630a7 11036#: builtin/bisect--helper.c:314
06991777
JX
11037#, c-format
11038msgid "Invalid command: you're currently in a %s/%s bisect"
11039msgstr "无效的命令:您当前正处于一个 %s/%s 二分查找中"
11040
7e6630a7 11041#: builtin/bisect--helper.c:341
06991777
JX
11042#, c-format
11043msgid ""
11044"You need to give me at least one %s and %s revision.\n"
11045"You can use \"git bisect %s\" and \"git bisect %s\" for that."
11046msgstr ""
11047"您需要给我至少一个 %s 和一个 %s 版本。\n"
11048"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
11049
7e6630a7 11050#: builtin/bisect--helper.c:345
06991777
JX
11051#, c-format
11052msgid ""
11053"You need to start by \"git bisect start\".\n"
11054"You then need to give me at least one %s and %s revision.\n"
11055"You can use \"git bisect %s\" and \"git bisect %s\" for that."
11056msgstr ""
11057"您需要执行 \"git bisect start\" 来开始。\n"
11058"然后需要提供我至少一个 %s 和一个 %s 版本。\n"
11059"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
11060
7e6630a7 11061#: builtin/bisect--helper.c:365
06991777
JX
11062#, c-format
11063msgid "bisecting only with a %s commit"
5b533632 11064msgstr "在只有一个 %s 提交的情况下二分查找"
06991777 11065
06991777
JX
11066#. TRANSLATORS: Make sure to include [Y] and [n] in your
11067#. translation. The program will only accept English input
11068#. at this point.
11069#.
7e6630a7 11070#: builtin/bisect--helper.c:373
06991777
JX
11071msgid "Are you sure [Y/n]? "
11072msgstr "您确认么[Y/n]? "
11073
7e6630a7 11074#: builtin/bisect--helper.c:434
06991777
JX
11075msgid "no terms defined"
11076msgstr "未定义术语"
11077
7e6630a7 11078#: builtin/bisect--helper.c:437
06991777
JX
11079#, c-format
11080msgid ""
11081"Your current terms are %s for the old state\n"
11082"and %s for the new state.\n"
11083msgstr "您当前针对旧状态的术语是 %s,对新状态的术语是 %s。\n"
11084
7e6630a7 11085#: builtin/bisect--helper.c:447
06991777
JX
11086#, c-format
11087msgid ""
11088"invalid argument %s for 'git bisect terms'.\n"
11089"Supported options are: --term-good|--term-old and --term-bad|--term-new."
11090msgstr ""
11091"命令 'git bisect terms' 的参数 %s 无效。\n"
11092"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
11093
7e6630a7 11094#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
d9488fea
JX
11095msgid "revision walk setup failed\n"
11096msgstr "版本遍历设置失败\n"
11097
7e6630a7 11098#: builtin/bisect--helper.c:536
d9488fea
JX
11099#, c-format
11100msgid "could not open '%s' for appending"
11101msgstr "无法打开 '%s' 进行追加"
11102
7e6630a7 11103#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668
7157c2b5
JX
11104msgid "'' is not a valid term"
11105msgstr "'' 不是一个有效的术语"
11106
7e6630a7 11107#: builtin/bisect--helper.c:678
06991777
JX
11108#, c-format
11109msgid "unrecognized option: '%s'"
11110msgstr "未识别的选项:'%s'"
11111
7e6630a7 11112#: builtin/bisect--helper.c:682
06991777
JX
11113#, c-format
11114msgid "'%s' does not appear to be a valid revision"
8e4e0555 11115msgstr "'%s' 看起来不是一个有效的版本"
06991777 11116
7e6630a7 11117#: builtin/bisect--helper.c:713
06991777
JX
11118msgid "bad HEAD - I need a HEAD"
11119msgstr "坏的 HEAD - 我需要一个 HEAD"
11120
7e6630a7 11121#: builtin/bisect--helper.c:728
06991777
JX
11122#, c-format
11123msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
11124msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
11125
7e6630a7 11126#: builtin/bisect--helper.c:749
06991777
JX
11127msgid "won't bisect on cg-seek'ed tree"
11128msgstr "不会在做了 cg-seek 的树上做二分查找"
11129
7e6630a7 11130#: builtin/bisect--helper.c:752
06991777
JX
11131msgid "bad HEAD - strange symbolic ref"
11132msgstr "坏的 HEAD - 奇怪的符号引用"
11133
7e6630a7 11134#: builtin/bisect--helper.c:772
a6cd2cc4
JX
11135#, c-format
11136msgid "invalid ref: '%s'"
11137msgstr "无效的引用:'%s'"
11138
7e6630a7 11139#: builtin/bisect--helper.c:830
d9488fea
JX
11140msgid "You need to start by \"git bisect start\"\n"
11141msgstr "您需要执行 \"git bisect start\" 来开始\n"
11142
d9488fea
JX
11143#. TRANSLATORS: Make sure to include [Y] and [n] in your
11144#. translation. The program will only accept English input
11145#. at this point.
11146#.
7e6630a7 11147#: builtin/bisect--helper.c:841
d9488fea
JX
11148msgid "Do you want me to do it for you [Y/n]? "
11149msgstr "您想让我为您这样做么[Y/n]? "
11150
7e6630a7 11151#: builtin/bisect--helper.c:859
d13389bf
JX
11152msgid "Please call `--bisect-state` with at least one argument"
11153msgstr "请使用至少一个参数调用 `--bisect-state`"
ef317cd5 11154
7e6630a7 11155#: builtin/bisect--helper.c:872
d13389bf
JX
11156#, c-format
11157msgid "'git bisect %s' can take only one argument."
11158msgstr "'git bisect %s' 只能带一个参数。"
5809aa05 11159
7e6630a7 11160#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897
d13389bf
JX
11161#, c-format
11162msgid "Bad rev input: %s"
11163msgstr "坏的版本输入:%s"
5809aa05 11164
7e6630a7 11165#: builtin/bisect--helper.c:904
33b62fba
JX
11166#, c-format
11167msgid "Bad rev input (not a commit): %s"
11168msgstr "坏的版本输入(不是提交):%s"
11169
7e6630a7 11170#: builtin/bisect--helper.c:936
473eb541
JX
11171msgid "We are not bisecting."
11172msgstr "我们没有在二分查找。"
11173
7e6630a7 11174#: builtin/bisect--helper.c:986
473eb541
JX
11175#, c-format
11176msgid "'%s'?? what are you talking about?"
11177msgstr "'%s'?? 您在说什么?"
06991777 11178
7e6630a7 11179#: builtin/bisect--helper.c:998
473eb541
JX
11180#, c-format
11181msgid "cannot read file '%s' for replaying"
11182msgstr "不能读取文件 '%s' 来重放"
06991777 11183
7e6630a7
FZ
11184#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274
11185msgid "bisect run failed: no command provided."
11186msgstr "二分查找运行失败:没有提供命令。"
11187
11188#: builtin/bisect--helper.c:1116
11189#, c-format
11190msgid "running %s\n"
11191msgstr "正在执行 %s\n"
11192
11193#: builtin/bisect--helper.c:1120
11194#, c-format
11195msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
11196msgstr "二分查找运行失败:命令 '%2$s' 的退出码 %1$d < 0 或 >= 128"
11197
11198#: builtin/bisect--helper.c:1136
11199#, c-format
11200msgid "cannot open file '%s' for writing"
11201msgstr "无法打开文件 '%s' 进行写入"
11202
11203#: builtin/bisect--helper.c:1152
11204msgid "bisect run cannot continue any more"
11205msgstr "二分查找不能继续运行"
11206
11207#: builtin/bisect--helper.c:1154
11208#, c-format
11209msgid "bisect run success"
11210msgstr "二分查找运行成功"
11211
11212#: builtin/bisect--helper.c:1157
11213#, c-format
11214msgid "bisect found first bad commit"
11215msgstr "二分查找找到了第一个坏的提交"
11216
11217#: builtin/bisect--helper.c:1160
11218#, c-format
11219msgid ""
11220"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
11221"code %d"
11222msgstr "二分查找运行失败:'git bisect--helper --bisect-state %s' 退出码为 %d"
11223
11224#: builtin/bisect--helper.c:1192
473eb541
JX
11225msgid "reset the bisection state"
11226msgstr "清除二分查找状态"
06991777 11227
7e6630a7 11228#: builtin/bisect--helper.c:1194
06991777
JX
11229msgid "check whether bad or good terms exist"
11230msgstr "检查坏的或好的术语是否存在"
11231
7e6630a7 11232#: builtin/bisect--helper.c:1196
06991777
JX
11233msgid "print out the bisect terms"
11234msgstr "打印二分查找术语"
11235
7e6630a7 11236#: builtin/bisect--helper.c:1198
06991777 11237msgid "start the bisect session"
5b533632 11238msgstr "启动二分查找过程"
06991777 11239
7e6630a7 11240#: builtin/bisect--helper.c:1200
d9488fea
JX
11241msgid "find the next bisection commit"
11242msgstr "查询下一个二分查找提交"
11243
7e6630a7 11244#: builtin/bisect--helper.c:1202
d13389bf
JX
11245msgid "mark the state of ref (or refs)"
11246msgstr "标记引用的状态"
d9488fea 11247
7e6630a7 11248#: builtin/bisect--helper.c:1204
473eb541
JX
11249msgid "list the bisection steps so far"
11250msgstr "列出到目前为止的二分查找步骤"
11251
7e6630a7 11252#: builtin/bisect--helper.c:1206
473eb541
JX
11253msgid "replay the bisection process from the given file"
11254msgstr "从给定文件重放二分查找进程"
11255
7e6630a7 11256#: builtin/bisect--helper.c:1208
473eb541
JX
11257msgid "skip some commits for checkout"
11258msgstr "跳过要检出的一些提交"
11259
7e6630a7
FZ
11260#: builtin/bisect--helper.c:1210
11261msgid "visualize the bisection"
11262msgstr "可视化二分查找过程"
11263
11264#: builtin/bisect--helper.c:1212
11265msgid "use <cmd>... to automatically bisect."
11266msgstr "使用 <命令>... 来自动二分查找。"
11267
11268#: builtin/bisect--helper.c:1214
06991777
JX
11269msgid "no log for BISECT_WRITE"
11270msgstr "BISECT_WRITE 无日志"
11271
7e6630a7 11272#: builtin/bisect--helper.c:1229
06991777
JX
11273msgid "--bisect-reset requires either no argument or a commit"
11274msgstr "--bisect-reset 无需参数或者需要一个提交"
11275
7e6630a7 11276#: builtin/bisect--helper.c:1234
06991777
JX
11277msgid "--bisect-terms requires 0 or 1 argument"
11278msgstr "--bisect-terms 需要 0 或 1 个参数"
11279
7e6630a7 11280#: builtin/bisect--helper.c:1243
d9488fea
JX
11281msgid "--bisect-next requires 0 arguments"
11282msgstr "--bisect-next 需要 0 个参数"
11283
7e6630a7 11284#: builtin/bisect--helper.c:1254
473eb541
JX
11285msgid "--bisect-log requires 0 arguments"
11286msgstr "--bisect-log 需要 0 个参数"
11287
7e6630a7 11288#: builtin/bisect--helper.c:1259
473eb541
JX
11289msgid "no logfile given"
11290msgstr "未提供日志文件"
d9488fea 11291
d9488fea 11292#: builtin/blame.c:32
7aea43ff
JX
11293msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
11294msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
ef317cd5 11295
d9488fea 11296#: builtin/blame.c:37
814ff314
JX
11297msgid "<rev-opts> are documented in git-rev-list(1)"
11298msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
ef317cd5 11299
7e6630a7 11300#: builtin/blame.c:406
fd8cb379
JX
11301#, c-format
11302msgid "expecting a color: %s"
11303msgstr "期望一个颜色:%s"
11304
7e6630a7 11305#: builtin/blame.c:413
fd8cb379
JX
11306msgid "must end with a color"
11307msgstr "必须以一个颜色结尾"
11308
7e6630a7 11309#: builtin/blame.c:724
fd8cb379
JX
11310#, c-format
11311msgid "invalid color '%s' in color.blame.repeatedLines"
11312msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
11313
7e6630a7 11314#: builtin/blame.c:742
fd8cb379
JX
11315msgid "invalid value for blame.coloring"
11316msgstr "设置 blame.coloring 中的无效取值"
11317
7e6630a7 11318#: builtin/blame.c:841
a6cd2cc4
JX
11319#, c-format
11320msgid "cannot find revision %s to ignore"
11321msgstr "不能找到要忽略的版本 %s"
11322
7e6630a7 11323#: builtin/blame.c:863
473eb541 11324msgid "show blame entries as we find them, incrementally"
07432cef 11325msgstr "增量式地显示发现的 blame 条目"
ef317cd5 11326
7e6630a7 11327#: builtin/blame.c:864
473eb541 11328msgid "do not show object names of boundary commits (Default: off)"
d9488fea 11329msgstr "不显示边界提交的对象名(默认:关闭)"
ef317cd5 11330
7e6630a7 11331#: builtin/blame.c:865
473eb541 11332msgid "do not treat root commits as boundaries (Default: off)"
07432cef 11333msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 11334
7e6630a7 11335#: builtin/blame.c:866
473eb541
JX
11336msgid "show work cost statistics"
11337msgstr "显示工作消耗统计"
ef317cd5 11338
65387fd5
FZ
11339#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
11340#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
11341#: builtin/merge.c:301 builtin/multi-pack-index.c:103
11342#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
11343#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
7e6630a7 11344#: builtin/send-pack.c:202
473eb541
JX
11345msgid "force progress reporting"
11346msgstr "强制显示进度报告"
276ceeaa 11347
7e6630a7 11348#: builtin/blame.c:868
473eb541
JX
11349msgid "show output score for blame entries"
11350msgstr "显示 blame 条目的输出得分"
ef317cd5 11351
7e6630a7 11352#: builtin/blame.c:869
473eb541 11353msgid "show original filename (Default: auto)"
07432cef 11354msgstr "显示原始文件名(默认:自动)"
ef317cd5 11355
7e6630a7 11356#: builtin/blame.c:870
473eb541 11357msgid "show original linenumber (Default: off)"
07432cef 11358msgstr "显示原始的行号(默认:关闭)"
ef317cd5 11359
7e6630a7 11360#: builtin/blame.c:871
473eb541 11361msgid "show in a format designed for machine consumption"
07432cef 11362msgstr "显示为一个适合机器读取的格式"
ef317cd5 11363
7e6630a7 11364#: builtin/blame.c:872
473eb541 11365msgid "show porcelain format with per-line commit information"
07432cef 11366msgstr "为每一行显示机器适用的提交信息"
ef317cd5 11367
7e6630a7 11368#: builtin/blame.c:873
473eb541 11369msgid "use the same output mode as git-annotate (Default: off)"
07432cef 11370msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 11371
7e6630a7 11372#: builtin/blame.c:874
473eb541 11373msgid "show raw timestamp (Default: off)"
07432cef 11374msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 11375
7e6630a7 11376#: builtin/blame.c:875
473eb541 11377msgid "show long commit SHA1 (Default: off)"
4375c10e 11378msgstr "显示长的 SHA1 提交号(默认:关闭)"
ef317cd5 11379
7e6630a7 11380#: builtin/blame.c:876
473eb541 11381msgid "suppress author name and timestamp (Default: off)"
07432cef 11382msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 11383
7e6630a7 11384#: builtin/blame.c:877
473eb541 11385msgid "show author email instead of name (Default: off)"
07432cef 11386msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 11387
7e6630a7 11388#: builtin/blame.c:878
473eb541 11389msgid "ignore whitespace differences"
07432cef 11390msgstr "忽略空白差异"
ef317cd5 11391
65387fd5 11392#: builtin/blame.c:879 builtin/log.c:1838
a6cd2cc4
JX
11393msgid "rev"
11394msgstr "版本"
11395
7e6630a7 11396#: builtin/blame.c:879
473eb541 11397msgid "ignore <rev> when blaming"
a6cd2cc4
JX
11398msgstr "在执行 blame 操作时忽略 <版本>"
11399
7e6630a7 11400#: builtin/blame.c:880
473eb541 11401msgid "ignore revisions from <file>"
a6cd2cc4
JX
11402msgstr "忽略来自 <文件> 中的版本"
11403
7e6630a7 11404#: builtin/blame.c:881
fd8cb379
JX
11405msgid "color redundant metadata from previous line differently"
11406msgstr "使用颜色间隔输出与前一行不同的重复元信息"
11407
7e6630a7 11408#: builtin/blame.c:882
fd8cb379
JX
11409msgid "color lines by age"
11410msgstr "依据时间着色"
11411
7e6630a7 11412#: builtin/blame.c:883
473eb541 11413msgid "spend extra cycles to find better match"
07432cef 11414msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 11415
7e6630a7 11416#: builtin/blame.c:884
473eb541 11417msgid "use revisions from <file> instead of calling git-rev-list"
d9d56b23 11418msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
ef317cd5 11419
7e6630a7 11420#: builtin/blame.c:885
473eb541
JX
11421msgid "use <file>'s contents as the final image"
11422msgstr "使用 <文件> 的内容作为最终的镜像"
ef317cd5 11423
7e6630a7 11424#: builtin/blame.c:886 builtin/blame.c:887
ef317cd5 11425msgid "score"
07432cef 11426msgstr "得分"
ef317cd5 11427
7e6630a7 11428#: builtin/blame.c:886
473eb541 11429msgid "find line copies within and across files"
07432cef 11430msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 11431
7e6630a7 11432#: builtin/blame.c:887
473eb541 11433msgid "find line movements within and across files"
07432cef 11434msgstr "找到文件内及跨文件的行移动"
ef317cd5 11435
7e6630a7 11436#: builtin/blame.c:888
d13389bf
JX
11437msgid "range"
11438msgstr "范围"
ef317cd5 11439
7e6630a7 11440#: builtin/blame.c:889
473eb541 11441msgid "process only line range <start>,<end> or function :<funcname>"
d13389bf 11442msgstr "只处理在 <开始>,<结束> 范围内的行,或者函数:<函数名>"
ef317cd5 11443
65387fd5 11444#: builtin/blame.c:947
a0b6b246 11445msgid "--progress can't be used with --incremental or porcelain formats"
ec3d4607 11446msgstr "--progress 不能和 --incremental 或机器内部格式一起使用"
a0b6b246 11447
a4f16749
JX
11448#. TRANSLATORS: This string is used to tell us the
11449#. maximum display width for a relative timestamp in
11450#. "git blame" output. For C locale, "4 years, 11
11451#. months ago", which takes 22 places, is the longest
11452#. among various forms of relative timestamps, but
11453#. your language may need more or fewer display
11454#. columns.
11455#.
65387fd5 11456#: builtin/blame.c:998
6c94aba5
JX
11457msgid "4 years, 11 months ago"
11458msgstr "4 年 11 个月前"
11459
65387fd5 11460#: builtin/blame.c:1114
a0b6b246
JX
11461#, c-format
11462msgid "file %s has only %lu line"
11463msgid_plural "file %s has only %lu lines"
11464msgstr[0] "文件 %s 只有 %lu 行"
11465msgstr[1] "文件 %s 只有 %lu 行"
11466
65387fd5 11467#: builtin/blame.c:1159
a4f16749
JX
11468msgid "Blaming lines"
11469msgstr "追踪代码行"
11470
4c27fcb5 11471#: builtin/branch.c:29
d9488fea
JX
11472msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
11473msgstr "git branch [<选项>] [-r | -a] [--merged] [--no-merged]"
ef317cd5 11474
4c27fcb5 11475#: builtin/branch.c:30
814ff314
JX
11476msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
11477msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 11478
4c27fcb5 11479#: builtin/branch.c:31
814ff314
JX
11480msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
11481msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
ef317cd5 11482
4c27fcb5 11483#: builtin/branch.c:32
814ff314
JX
11484msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
11485msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 11486
4c27fcb5 11487#: builtin/branch.c:33
6937cb4e
JX
11488msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
11489msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
11490
4c27fcb5 11491#: builtin/branch.c:34
94550ed3
JX
11492msgid "git branch [<options>] [-r | -a] [--points-at]"
11493msgstr "git branch [<选项>] [-r | -a] [--points-at]"
11494
4c27fcb5 11495#: builtin/branch.c:35
87cb7997
JX
11496msgid "git branch [<options>] [-r | -a] [--format]"
11497msgstr "git branch [<选项>] [-r | -a] [--format]"
11498
90e6ef53 11499# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
65387fd5 11500#: builtin/branch.c:153
c04f5ac3
JX
11501#, c-format
11502msgid ""
11503"deleting branch '%s' that has been merged to\n"
11504" '%s', but not yet merged to HEAD."
11505msgstr ""
70fc47bf 11506"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
11507" '%s',但未合并到 HEAD。"
11508
90e6ef53 11509# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
65387fd5 11510#: builtin/branch.c:157
c04f5ac3
JX
11511#, c-format
11512msgid ""
11513"not deleting branch '%s' that is not yet merged to\n"
11514" '%s', even though it is merged to HEAD."
11515msgstr ""
70fc47bf
T
11516"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
11517" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 11518
65387fd5 11519#: builtin/branch.c:171
07432cef
WS
11520#, c-format
11521msgid "Couldn't look up commit object for '%s'"
11522msgstr "无法查询 '%s' 指向的提交对象"
11523
65387fd5 11524#: builtin/branch.c:175
07432cef
WS
11525#, c-format
11526msgid ""
11527"The branch '%s' is not fully merged.\n"
11528"If you are sure you want to delete it, run 'git branch -D %s'."
11529msgstr ""
11530"分支 '%s' 没有完全合并。\n"
11531"如果您确认要删除它,执行 'git branch -D %s'。"
11532
65387fd5 11533#: builtin/branch.c:188
07432cef 11534msgid "Update of config-file failed"
6937cb4e 11535msgstr "更新配置文件失败"
07432cef 11536
473eb541 11537#: builtin/branch.c:223
c04f5ac3 11538msgid "cannot use -a with -d"
649900bc 11539msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 11540
473eb541 11541#: builtin/branch.c:230
c04f5ac3
JX
11542msgid "Couldn't look up commit object for HEAD"
11543msgstr "无法查询 HEAD 指向的提交对象"
11544
65387fd5 11545#: builtin/branch.c:247
c04f5ac3 11546#, c-format
5b04ee3b
JX
11547msgid "Cannot delete branch '%s' checked out at '%s'"
11548msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
c04f5ac3 11549
65387fd5 11550#: builtin/branch.c:262
5ae481e0 11551#, c-format
7aea43ff
JX
11552msgid "remote-tracking branch '%s' not found."
11553msgstr "未能找到远程跟踪分支 '%s'。"
c04f5ac3 11554
65387fd5 11555#: builtin/branch.c:263
81809b99 11556#, c-format
8ada9598 11557msgid "branch '%s' not found."
81809b99 11558msgstr "分支 '%s' 未发现。"
8ada9598 11559
65387fd5 11560#: builtin/branch.c:294
81809b99 11561#, c-format
7aea43ff
JX
11562msgid "Deleted remote-tracking branch %s (was %s).\n"
11563msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
c04f5ac3 11564
65387fd5 11565#: builtin/branch.c:295
81809b99 11566#, c-format
8ada9598 11567msgid "Deleted branch %s (was %s).\n"
81809b99 11568msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 11569
65387fd5 11570#: builtin/branch.c:445 builtin/tag.c:63
6937cb4e
JX
11571msgid "unable to parse format string"
11572msgstr "不能解析格式化字符串"
11573
65387fd5 11574#: builtin/branch.c:476
d46c5519
JX
11575msgid "could not resolve HEAD"
11576msgstr "不能解析 HEAD 提交"
11577
65387fd5 11578#: builtin/branch.c:482
5b04ee3b 11579#, c-format
d46c5519
JX
11580msgid "HEAD (%s) points outside of refs/heads/"
11581msgstr "HEAD (%s) 指向 refs/heads/ 之外"
11582
65387fd5 11583#: builtin/branch.c:497
d46c5519 11584#, c-format
5b04ee3b
JX
11585msgid "Branch %s is being rebased at %s"
11586msgstr "分支 %s 正被变基到 %s"
11587
65387fd5 11588#: builtin/branch.c:501
5b04ee3b
JX
11589#, c-format
11590msgid "Branch %s is being bisected at %s"
11591msgstr "分支 %s 正被二分查找于 %s"
11592
65387fd5 11593#: builtin/branch.c:518
6937cb4e
JX
11594msgid "cannot copy the current branch while not on any."
11595msgstr "无法拷贝当前分支因为不处于任何分支上。"
11596
65387fd5 11597#: builtin/branch.c:520
c04f5ac3 11598msgid "cannot rename the current branch while not on any."
90e6ef53 11599msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 11600
65387fd5 11601#: builtin/branch.c:531
c04f5ac3
JX
11602#, c-format
11603msgid "Invalid branch name: '%s'"
11604msgstr "无效的分支名:'%s'"
11605
65387fd5 11606#: builtin/branch.c:560
c04f5ac3
JX
11607msgid "Branch rename failed"
11608msgstr "分支重命名失败"
11609
65387fd5 11610#: builtin/branch.c:562
6937cb4e
JX
11611msgid "Branch copy failed"
11612msgstr "分支拷贝失败"
11613
65387fd5 11614#: builtin/branch.c:566
6937cb4e 11615#, c-format
5809aa05
JX
11616msgid "Created a copy of a misnamed branch '%s'"
11617msgstr "已为错误命名的分支 '%s' 创建了一个副本"
6937cb4e 11618
65387fd5 11619#: builtin/branch.c:569
c04f5ac3
JX
11620#, c-format
11621msgid "Renamed a misnamed branch '%s' away"
6937cb4e 11622msgstr "已将错误命名的分支 '%s' 重命名"
c04f5ac3 11623
65387fd5 11624#: builtin/branch.c:575
c04f5ac3
JX
11625#, c-format
11626msgid "Branch renamed to %s, but HEAD is not updated!"
11627msgstr "分支重命名为 %s,但 HEAD 没有更新!"
11628
65387fd5 11629#: builtin/branch.c:584
c04f5ac3 11630msgid "Branch is renamed, but update of config-file failed"
6937cb4e
JX
11631msgstr "分支被重命名,但更新配置文件失败"
11632
65387fd5 11633#: builtin/branch.c:586
6937cb4e
JX
11634msgid "Branch is copied, but update of config-file failed"
11635msgstr "分支已拷贝,但更新配置文件失败"
c04f5ac3 11636
65387fd5 11637#: builtin/branch.c:602
5c57d762
JX
11638#, c-format
11639msgid ""
11640"Please edit the description for the branch\n"
11641" %s\n"
11642"Lines starting with '%c' will be stripped.\n"
11643msgstr ""
11644"请编辑分支的描述\n"
11645" %s\n"
11646"以 '%c' 开头的行将被过滤。\n"
c04f5ac3 11647
65387fd5 11648#: builtin/branch.c:637
ef317cd5 11649msgid "Generic options"
07432cef 11650msgstr "通用选项"
c04f5ac3 11651
65387fd5 11652#: builtin/branch.c:639
ef317cd5 11653msgid "show hash and subject, give twice for upstream branch"
07432cef 11654msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 11655
65387fd5 11656#: builtin/branch.c:640
ef317cd5 11657msgid "suppress informational messages"
07432cef 11658msgstr "不显示信息"
8ada9598 11659
65387fd5
FZ
11660#: builtin/branch.c:642
11661msgid "set branch tracking configuration"
11662msgstr "设置分支跟踪配置"
c04f5ac3 11663
65387fd5 11664#: builtin/branch.c:645
6937cb4e
JX
11665msgid "do not use"
11666msgstr "不要使用"
c04f5ac3 11667
65387fd5 11668#: builtin/branch.c:647
5b04ee3b
JX
11669msgid "upstream"
11670msgstr "上游"
11671
65387fd5 11672#: builtin/branch.c:647
5b04ee3b
JX
11673msgid "change the upstream info"
11674msgstr "改变上游信息"
11675
65387fd5 11676#: builtin/branch.c:648
ddc12c42 11677msgid "unset the upstream info"
a0b6b246
JX
11678msgstr "取消上游信息的设置"
11679
65387fd5 11680#: builtin/branch.c:649
ef317cd5 11681msgid "use colored output"
07432cef 11682msgstr "使用彩色输出"
c04f5ac3 11683
65387fd5 11684#: builtin/branch.c:650
ef317cd5 11685msgid "act on remote-tracking branches"
07432cef 11686msgstr "作用于远程跟踪分支"
c04f5ac3 11687
65387fd5 11688#: builtin/branch.c:652 builtin/branch.c:654
ef317cd5 11689msgid "print only branches that contain the commit"
07432cef 11690msgstr "只打印包含该提交的分支"
c04f5ac3 11691
65387fd5 11692#: builtin/branch.c:653 builtin/branch.c:655
87cb7997
JX
11693msgid "print only branches that don't contain the commit"
11694msgstr "只打印不包含该提交的分支"
11695
65387fd5 11696#: builtin/branch.c:658
ef317cd5 11697msgid "Specific git-branch actions:"
07432cef 11698msgstr "具体的 git-branch 动作:"
c04f5ac3 11699
65387fd5 11700#: builtin/branch.c:659
ef317cd5 11701msgid "list both remote-tracking and local branches"
07432cef 11702msgstr "列出远程跟踪及本地分支"
c04f5ac3 11703
65387fd5 11704#: builtin/branch.c:661
ef317cd5 11705msgid "delete fully merged branch"
07432cef 11706msgstr "删除完全合并的分支"
c04f5ac3 11707
65387fd5 11708#: builtin/branch.c:662
ef317cd5 11709msgid "delete branch (even if not merged)"
07432cef 11710msgstr "删除分支(即使没有合并)"
c04f5ac3 11711
65387fd5 11712#: builtin/branch.c:663
ef317cd5 11713msgid "move/rename a branch and its reflog"
07432cef 11714msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 11715
65387fd5 11716#: builtin/branch.c:664
ef317cd5 11717msgid "move/rename a branch, even if target exists"
07432cef 11718msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 11719
65387fd5 11720#: builtin/branch.c:665
6937cb4e
JX
11721msgid "copy a branch and its reflog"
11722msgstr "拷贝一个分支和它的引用日志"
11723
65387fd5 11724#: builtin/branch.c:666
6937cb4e
JX
11725msgid "copy a branch, even if target exists"
11726msgstr "拷贝一个分支,即使目标已存在"
11727
65387fd5 11728#: builtin/branch.c:667
ef317cd5 11729msgid "list branch names"
07432cef 11730msgstr "列出分支名"
c04f5ac3 11731
65387fd5 11732#: builtin/branch.c:668
d46c5519
JX
11733msgid "show current branch name"
11734msgstr "显示当前分支名"
11735
65387fd5 11736#: builtin/branch.c:669
ef317cd5 11737msgid "create the branch's reflog"
07432cef 11738msgstr "创建分支的引用日志"
ef317cd5 11739
65387fd5 11740#: builtin/branch.c:671
ef317cd5 11741msgid "edit the description for the branch"
07432cef 11742msgstr "标记分支的描述"
ef317cd5 11743
65387fd5 11744#: builtin/branch.c:672
04cb2f28
JX
11745msgid "force creation, move/rename, deletion"
11746msgstr "强制创建、移动/重命名、删除"
ef317cd5 11747
65387fd5 11748#: builtin/branch.c:673
94550ed3
JX
11749msgid "print only branches that are merged"
11750msgstr "只打印已经合并的分支"
ef317cd5 11751
65387fd5 11752#: builtin/branch.c:674
94550ed3
JX
11753msgid "print only branches that are not merged"
11754msgstr "只打印尚未合并的分支"
ef317cd5 11755
65387fd5 11756#: builtin/branch.c:675
ef317cd5 11757msgid "list branches in columns"
07432cef 11758msgstr "以列的方式显示分支"
ef317cd5 11759
65387fd5 11760#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
7e6630a7
FZ
11761#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
11762#: builtin/tag.c:475
94550ed3
JX
11763msgid "object"
11764msgstr "对象"
11765
65387fd5 11766#: builtin/branch.c:678
94550ed3
JX
11767msgid "print only branches of the object"
11768msgstr "只打印指向该对象的分支"
11769
65387fd5 11770#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
1a79b2f1
JX
11771msgid "sorting and filtering are case insensitive"
11772msgstr "排序和过滤属于大小写不敏感"
11773
65387fd5 11774#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
a6cd2cc4 11775#: builtin/verify-tag.c:38
87cb7997
JX
11776msgid "format to use for the output"
11777msgstr "输出格式"
11778
65387fd5 11779#: builtin/branch.c:703 builtin/clone.c:678
c04f5ac3 11780msgid "HEAD not found below refs/heads!"
90e6ef53 11781msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 11782
65387fd5 11783#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
a77c07d9
JX
11784msgid "branch name required"
11785msgstr "必须提供分支名"
11786
65387fd5 11787#: builtin/branch.c:774
a77c07d9
JX
11788msgid "Cannot give description to detached HEAD"
11789msgstr "不能向分离头指针提供描述"
11790
65387fd5 11791#: builtin/branch.c:779
a77c07d9
JX
11792msgid "cannot edit description of more than one branch"
11793msgstr "不能为一个以上的分支编辑描述"
11794
65387fd5 11795#: builtin/branch.c:786
a77c07d9
JX
11796#, c-format
11797msgid "No commit on branch '%s' yet."
11798msgstr "分支 '%s' 尚无提交。"
11799
65387fd5 11800#: builtin/branch.c:789
a77c07d9
JX
11801#, c-format
11802msgid "No branch named '%s'."
11803msgstr "没有分支 '%s'。"
11804
65387fd5 11805#: builtin/branch.c:804
6937cb4e
JX
11806msgid "too many branches for a copy operation"
11807msgstr "为拷贝操作提供了太多的分支名"
a77c07d9 11808
65387fd5 11809#: builtin/branch.c:813
6937cb4e
JX
11810msgid "too many arguments for a rename operation"
11811msgstr "为重命名操作提供了太多的参数"
1003b3a5 11812
65387fd5 11813#: builtin/branch.c:818
6937cb4e
JX
11814msgid "too many arguments to set new upstream"
11815msgstr "为设置新上游提供了太多的参数"
11816
65387fd5 11817#: builtin/branch.c:822
1003b3a5
JX
11818#, c-format
11819msgid ""
11820"could not set upstream of HEAD to %s when it does not point to any branch."
11821msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
11822
65387fd5 11823#: builtin/branch.c:825 builtin/branch.c:848
1003b3a5
JX
11824#, c-format
11825msgid "no such branch '%s'"
11826msgstr "没有此分支 '%s'"
11827
65387fd5 11828#: builtin/branch.c:829
07432cef 11829#, c-format
ef317cd5 11830msgid "branch '%s' does not exist"
07432cef 11831msgstr "分支 '%s' 不存在"
ef317cd5 11832
65387fd5 11833#: builtin/branch.c:842
6937cb4e
JX
11834msgid "too many arguments to unset upstream"
11835msgstr "为取消上游设置操作提供了太多的参数"
1003b3a5 11836
65387fd5 11837#: builtin/branch.c:846
1003b3a5
JX
11838msgid "could not unset upstream of HEAD when it does not point to any branch."
11839msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
11840
65387fd5 11841#: builtin/branch.c:852
ef317cd5
JX
11842#, c-format
11843msgid "Branch '%s' has no upstream information"
07432cef 11844msgstr "分支 '%s' 没有上游信息"
ef317cd5 11845
65387fd5 11846#: builtin/branch.c:862
a6cd2cc4
JX
11847msgid ""
11848"The -a, and -r, options to 'git branch' do not take a branch name.\n"
11849"Did you mean to use: -a|-r --list <pattern>?"
11850msgstr ""
11851"'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
11852"您是否想要使用:-a|-r --list <模式>?"
c04f5ac3 11853
65387fd5 11854#: builtin/branch.c:866
ddc12c42
JX
11855msgid ""
11856"the '--set-upstream' option is no longer supported. Please use '--track' or "
11857"'--set-upstream-to' instead."
11858msgstr ""
11859"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
11860
7e6630a7 11861#: builtin/bugreport.c:16
d9488fea
JX
11862msgid "git version:\n"
11863msgstr "git 版本:\n"
11864
7e6630a7 11865#: builtin/bugreport.c:22
d9488fea
JX
11866#, c-format
11867msgid "uname() failed with error '%s' (%d)\n"
11868msgstr "uname() 失败,错误为 '%s'(%d)\n"
11869
7e6630a7 11870#: builtin/bugreport.c:32
d9488fea
JX
11871msgid "compiler info: "
11872msgstr "编译器信息:"
11873
7e6630a7 11874#: builtin/bugreport.c:35
d9488fea
JX
11875msgid "libc info: "
11876msgstr "libc 信息:"
11877
7e6630a7 11878#: builtin/bugreport.c:49
d9488fea
JX
11879msgid "not run from a git repository - no hooks to show\n"
11880msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n"
11881
7e6630a7 11882#: builtin/bugreport.c:62
d9488fea
JX
11883msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
11884msgstr "git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>]"
11885
7e6630a7 11886#: builtin/bugreport.c:69
d9488fea
JX
11887msgid ""
11888"Thank you for filling out a Git bug report!\n"
11889"Please answer the following questions to help us understand your issue.\n"
11890"\n"
11891"What did you do before the bug happened? (Steps to reproduce your issue)\n"
11892"\n"
11893"What did you expect to happen? (Expected behavior)\n"
11894"\n"
11895"What happened instead? (Actual behavior)\n"
11896"\n"
11897"What's different between what you expected and what actually happened?\n"
11898"\n"
11899"Anything else you want to add:\n"
11900"\n"
11901"Please review the rest of the bug report below.\n"
11902"You can delete any lines you don't wish to share.\n"
11903msgstr ""
11904"感谢您填写 Git 错误报告!\n"
11905"请填写以下问卷,以帮助我们了解您的问题。\n"
11906"\n"
11907"在错误发生之前,您做了什么?(重现问题的步骤)\n"
11908"\n"
11909"您期望发生什么?(预期行为)\n"
11910"\n"
11911"实际发生了什么?(实际行为)\n"
11912"\n"
11913"您所期望的与实际发生的有什么不同?\n"
11914"\n"
11915"您想要补充的其它内容:\n"
11916"\n"
11917"请检查下面错误报告中余下的内容。\n"
11918"您可以删除任何您不想共享的内容。\n"
11919
7e6630a7 11920#: builtin/bugreport.c:108
d9488fea
JX
11921msgid "specify a destination for the bugreport file"
11922msgstr "指定错误报告文件的目标位置"
11923
7e6630a7 11924#: builtin/bugreport.c:110
d9488fea
JX
11925msgid "specify a strftime format suffix for the filename"
11926msgstr "指定文件的 strftime 格式后缀"
11927
7e6630a7 11928#: builtin/bugreport.c:132
d9488fea
JX
11929#, c-format
11930msgid "could not create leading directories for '%s'"
11931msgstr "不能为 '%s' 创建先导目录"
11932
7e6630a7 11933#: builtin/bugreport.c:139
d9488fea
JX
11934msgid "System Info"
11935msgstr "系统信息"
11936
7e6630a7 11937#: builtin/bugreport.c:142
d9488fea
JX
11938msgid "Enabled Hooks"
11939msgstr "启用的钩子"
11940
7e6630a7 11941#: builtin/bugreport.c:149
d9488fea
JX
11942#, c-format
11943msgid "unable to write to %s"
11944msgstr "无法写入 %s"
11945
7e6630a7 11946#: builtin/bugreport.c:159
d9488fea
JX
11947#, c-format
11948msgid "Created new report at '%s'.\n"
11949msgstr "在 '%s' 创建了新报告。\n"
11950
ddc12c42
JX
11951#: builtin/bundle.c:15 builtin/bundle.c:23
11952msgid "git bundle create [<options>] <file> <git-rev-list args>"
11953msgstr "git bundle create [<选项>] <文件> <git-rev-list 参数>"
11954
11955#: builtin/bundle.c:16 builtin/bundle.c:28
11956msgid "git bundle verify [<options>] <file>"
11957msgstr "git bundle verify [<选项>] <文件>"
11958
11959#: builtin/bundle.c:17 builtin/bundle.c:33
11960msgid "git bundle list-heads <file> [<refname>...]"
11961msgstr "git bundle list-heads <文件> [<引用名>...]"
11962
11963#: builtin/bundle.c:18 builtin/bundle.c:38
11964msgid "git bundle unbundle <file> [<refname>...]"
11965msgstr "git bundle unbundle <文件> [<引用名>...]"
11966
7e6630a7 11967#: builtin/bundle.c:65 builtin/pack-objects.c:3876
ddc12c42
JX
11968msgid "do not show progress meter"
11969msgstr "不显示进度表"
11970
7e6630a7 11971#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878
ddc12c42
JX
11972msgid "show progress meter"
11973msgstr "显示进度表"
11974
7e6630a7 11975#: builtin/bundle.c:69 builtin/pack-objects.c:3880
ddc12c42
JX
11976msgid "show progress meter during object writing phase"
11977msgstr "在对象写入阶段显示进度表"
11978
7e6630a7 11979#: builtin/bundle.c:72 builtin/pack-objects.c:3883
ddc12c42
JX
11980msgid "similar to --all-progress when progress meter is shown"
11981msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 11982
7e6630a7 11983#: builtin/bundle.c:74
d9488fea
JX
11984msgid "specify bundle format version"
11985msgstr "指定归档包的格式版本"
11986
7e6630a7 11987#: builtin/bundle.c:94
ddc12c42 11988msgid "Need a repository to create a bundle."
d9488fea 11989msgstr "需要一个仓库来创建归档包。"
ddc12c42 11990
7e6630a7 11991#: builtin/bundle.c:107
ddc12c42 11992msgid "do not show bundle details"
d9488fea 11993msgstr "不显示归档包的细节"
ddc12c42 11994
7e6630a7 11995#: builtin/bundle.c:126
c04f5ac3
JX
11996#, c-format
11997msgid "%s is okay\n"
11998msgstr "%s 可以\n"
11999
7e6630a7 12000#: builtin/bundle.c:182
c04f5ac3 12001msgid "Need a repository to unbundle."
d9488fea 12002msgstr "需要一个仓库来解开归档包。"
c04f5ac3 12003
7e6630a7
FZ
12004#: builtin/bundle.c:185
12005msgid "Unbundling objects"
12006msgstr "解包对象中"
ddc12c42 12007
7e6630a7 12008#: builtin/bundle.c:219 builtin/remote.c:1733
ddc12c42
JX
12009#, c-format
12010msgid "Unknown subcommand: %s"
12011msgstr "未知子命令:%s"
12012
7e6630a7 12013#: builtin/cat-file.c:622
7aea43ff 12014msgid ""
a0b6b246
JX
12015"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
12016"p | <type> | --textconv | --filters) [--path=<path>] <object>"
275588f9
JX
12017msgstr ""
12018"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
12019"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
ef317cd5 12020
7e6630a7 12021#: builtin/cat-file.c:623
a0b6b246 12022msgid ""
7157c2b5
JX
12023"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
12024"symlinks] [--textconv | --filters]"
d9488fea
JX
12025msgstr ""
12026"git cat-file (--batch[=<格式>] | --batch-check[=<格式>]) [--follow-symlinks] "
12027"[--textconv | --filters]"
ef317cd5 12028
7e6630a7 12029#: builtin/cat-file.c:644
4c27fcb5
JX
12030msgid "only one batch option may be specified"
12031msgstr "只能指定一个批处理选项"
12032
7e6630a7 12033#: builtin/cat-file.c:662
ef317cd5 12034msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 12035msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 12036
7e6630a7 12037#: builtin/cat-file.c:663
ef317cd5 12038msgid "show object type"
07432cef 12039msgstr "显示对象类型"
ef317cd5 12040
7e6630a7 12041#: builtin/cat-file.c:664
ef317cd5 12042msgid "show object size"
07432cef 12043msgstr "显示对象大小"
ef317cd5 12044
7e6630a7 12045#: builtin/cat-file.c:666
ef317cd5 12046msgid "exit with zero when there's no error"
07432cef 12047msgstr "当没有错误时退出并返回零"
ef317cd5 12048
7e6630a7 12049#: builtin/cat-file.c:667
ef317cd5 12050msgid "pretty-print object's content"
07432cef 12051msgstr "美观地打印对象的内容"
ef317cd5 12052
7e6630a7 12053#: builtin/cat-file.c:669
ef317cd5 12054msgid "for blob objects, run textconv on object's content"
a0b6b246
JX
12055msgstr "对于数据对象,对其内容做文本转换"
12056
7e6630a7 12057#: builtin/cat-file.c:671
a0b6b246
JX
12058msgid "for blob objects, run filters on object's content"
12059msgstr "对于数据对象,对其内容做过滤"
12060
7e6630a7 12061#: builtin/cat-file.c:672
a0b6b246
JX
12062msgid "blob"
12063msgstr "数据对象"
12064
7e6630a7 12065#: builtin/cat-file.c:673
a0b6b246
JX
12066msgid "use a specific path for --textconv/--filters"
12067msgstr "对于 --textconv/--filters 使用一个特定的路径"
ef317cd5 12068
7e6630a7 12069#: builtin/cat-file.c:675
7aea43ff
JX
12070msgid "allow -s and -t to work with broken/corrupt objects"
12071msgstr "允许 -s 和 -t 对损坏的对象生效"
12072
7e6630a7 12073#: builtin/cat-file.c:676
1b7f4a34
JX
12074msgid "buffer --batch output"
12075msgstr "缓冲 --batch 的输出"
12076
7e6630a7 12077#: builtin/cat-file.c:678
ef317cd5 12078msgid "show info and content of objects fed from the standard input"
07432cef 12079msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 12080
7e6630a7 12081#: builtin/cat-file.c:682
ef317cd5 12082msgid "show info about objects fed from the standard input"
07432cef 12083msgstr "显示从标准输入提供的对象的信息"
ef317cd5 12084
7e6630a7 12085#: builtin/cat-file.c:686
7aea43ff
JX
12086msgid "follow in-tree symlinks (used with --batch or --batch-check)"
12087msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
12088
7e6630a7 12089#: builtin/cat-file.c:688
1b7f4a34
JX
12090msgid "show all objects with --batch or --batch-check"
12091msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
12092
7e6630a7 12093#: builtin/cat-file.c:690
c1ac5258
JX
12094msgid "do not order --batch-all-objects output"
12095msgstr "不要对 --batch-all-objects 的输出排序"
12096
06991777 12097#: builtin/check-attr.c:13
814ff314
JX
12098msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
12099msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
ef317cd5 12100
06991777 12101#: builtin/check-attr.c:14
94550ed3
JX
12102msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
12103msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
ef317cd5 12104
06991777 12105#: builtin/check-attr.c:21
ef317cd5 12106msgid "report all attributes set on file"
07432cef 12107msgstr "报告设置在文件上的所有属性"
ef317cd5 12108
06991777 12109#: builtin/check-attr.c:22
ef317cd5 12110msgid "use .gitattributes only from the index"
07432cef 12111msgstr "只使用索引中的 .gitattributes"
ef317cd5 12112
7e6630a7 12113#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100
ef317cd5 12114msgid "read file names from stdin"
07432cef 12115msgstr "从标准输入读出文件名"
ef317cd5 12116
06991777 12117#: builtin/check-attr.c:25 builtin/check-ignore.c:27
90314792
JX
12118msgid "terminate input and output records by a NUL character"
12119msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 12120
65387fd5
FZ
12121#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
12122#: builtin/worktree.c:493
a77c07d9
JX
12123msgid "suppress progress reporting"
12124msgstr "不显示进度报告"
12125
06991777 12126#: builtin/check-ignore.c:29
2e8451e8
JX
12127msgid "show non-matching input paths"
12128msgstr "显示未匹配的输入路径"
12129
06991777 12130#: builtin/check-ignore.c:31
90314792
JX
12131msgid "ignore index when checking"
12132msgstr "检查时忽略索引"
12133
33b62fba 12134#: builtin/check-ignore.c:165
a77c07d9 12135msgid "cannot specify pathnames with --stdin"
1b7f4a34 12136msgstr "不能同时指定路径及 --stdin 参数"
a77c07d9 12137
33b62fba 12138#: builtin/check-ignore.c:168
a77c07d9
JX
12139msgid "-z only makes sense with --stdin"
12140msgstr "-z 需要和 --stdin 参数共用才有意义"
12141
33b62fba 12142#: builtin/check-ignore.c:170
a77c07d9
JX
12143msgid "no path specified"
12144msgstr "未指定路径"
12145
33b62fba 12146#: builtin/check-ignore.c:174
a77c07d9
JX
12147msgid "--quiet is only valid with a single pathname"
12148msgstr "参数 --quiet 只在提供一个路径名时有效"
12149
33b62fba 12150#: builtin/check-ignore.c:176
a77c07d9
JX
12151msgid "cannot have both --quiet and --verbose"
12152msgstr "不能同时提供 --quiet 和 --verbose 参数"
12153
33b62fba 12154#: builtin/check-ignore.c:179
2e8451e8
JX
12155msgid "--non-matching is only valid with --verbose"
12156msgstr "--non-matching 选项只在使用 --verbose 时有效"
12157
a4f16749 12158#: builtin/check-mailmap.c:9
814ff314
JX
12159msgid "git check-mailmap [<options>] <contact>..."
12160msgstr "git check-mailmap [<选项>] <联系地址>..."
2e8451e8 12161
a4f16749 12162#: builtin/check-mailmap.c:14
2e8451e8
JX
12163msgid "also read contacts from stdin"
12164msgstr "还从标准输入读取联系地址"
12165
a4f16749 12166#: builtin/check-mailmap.c:25
2e8451e8
JX
12167#, c-format
12168msgid "unable to parse contact: %s"
12169msgstr "不能解析联系地址:%s"
12170
a4f16749 12171#: builtin/check-mailmap.c:48
2e8451e8
JX
12172msgid "no contacts specified"
12173msgstr "未指定联系地址"
12174
33b62fba
JX
12175#: builtin/checkout--worker.c:110
12176msgid "git checkout--worker [<options>]"
12177msgstr "git checkout--worker [<选项>]"
12178
12179#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
65387fd5
FZ
12180#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
12181#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
12182#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
12183#: builtin/worktree.c:491 builtin/worktree.c:728
33b62fba
JX
12184msgid "string"
12185msgstr "字符串"
12186
12187#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
12188msgid "when creating files, prepend <string>"
12189msgstr "在创建文件时,在前面加上 <字符串>"
12190
473eb541 12191#: builtin/checkout-index.c:152
814ff314
JX
12192msgid "git checkout-index [<options>] [--] [<file>...]"
12193msgstr "git checkout-index [<选项>] [--] [<文件>...]"
ef317cd5 12194
473eb541 12195#: builtin/checkout-index.c:169
276ceeaa
JX
12196msgid "stage should be between 1 and 3 or all"
12197msgstr "索引值应该取值 1 到 3 或者 all"
12198
33b62fba 12199#: builtin/checkout-index.c:187
ef317cd5 12200msgid "check out all files in the index"
07432cef 12201msgstr "检出索引区的所有文件"
ef317cd5 12202
33b62fba 12203#: builtin/checkout-index.c:188
ef317cd5 12204msgid "force overwrite of existing files"
07432cef 12205msgstr "强制覆盖现有的文件"
ef317cd5 12206
33b62fba 12207#: builtin/checkout-index.c:190
ef317cd5 12208msgid "no warning for existing files and files not in index"
07432cef 12209msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 12210
33b62fba 12211#: builtin/checkout-index.c:192
ef317cd5 12212msgid "don't checkout new files"
07432cef 12213msgstr "不检出新文件"
ef317cd5 12214
33b62fba 12215#: builtin/checkout-index.c:194
ef317cd5 12216msgid "update stat information in the index file"
07432cef 12217msgstr "更新索引中文件的状态信息"
ef317cd5 12218
33b62fba 12219#: builtin/checkout-index.c:198
ef317cd5 12220msgid "read list of paths from the standard input"
07432cef 12221msgstr "从标准输入读取路径列表"
ef317cd5 12222
33b62fba 12223#: builtin/checkout-index.c:200
ef317cd5 12224msgid "write the content to temporary files"
07432cef 12225msgstr "将内容写入临时文件"
ef317cd5 12226
33b62fba 12227#: builtin/checkout-index.c:204
ef317cd5 12228msgid "copy out the files from named stage"
07432cef 12229msgstr "从指定暂存区中拷出文件"
ef317cd5 12230
33b62fba 12231#: builtin/checkout.c:33
814ff314
JX
12232msgid "git checkout [<options>] <branch>"
12233msgstr "git checkout [<选项>] <分支>"
ef317cd5 12234
33b62fba 12235#: builtin/checkout.c:34
814ff314
JX
12236msgid "git checkout [<options>] [<branch>] -- <file>..."
12237msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
ef317cd5 12238
33b62fba 12239#: builtin/checkout.c:39
a6cd2cc4
JX
12240msgid "git switch [<options>] [<branch>]"
12241msgstr "git switch [<选项>] [<分支>]"
12242
33b62fba 12243#: builtin/checkout.c:44
a6cd2cc4
JX
12244msgid "git restore [<options>] [--source=<branch>] <file>..."
12245msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
12246
65387fd5 12247#: builtin/checkout.c:198 builtin/checkout.c:237
c04f5ac3
JX
12248#, c-format
12249msgid "path '%s' does not have our version"
12250msgstr "路径 '%s' 没有我们的版本"
12251
65387fd5 12252#: builtin/checkout.c:200 builtin/checkout.c:239
c04f5ac3
JX
12253#, c-format
12254msgid "path '%s' does not have their version"
12255msgstr "路径 '%s' 没有他们的版本"
12256
65387fd5 12257#: builtin/checkout.c:216
c04f5ac3
JX
12258#, c-format
12259msgid "path '%s' does not have all necessary versions"
e640d114 12260msgstr "路径 '%s' 没有全部必需的版本"
c04f5ac3 12261
65387fd5 12262#: builtin/checkout.c:269
c04f5ac3
JX
12263#, c-format
12264msgid "path '%s' does not have necessary versions"
e640d114 12265msgstr "路径 '%s' 没有必需的版本"
c04f5ac3 12266
65387fd5 12267#: builtin/checkout.c:286
c04f5ac3
JX
12268#, c-format
12269msgid "path '%s': cannot merge"
90e6ef53 12270msgstr "path '%s':无法合并"
c04f5ac3 12271
65387fd5 12272#: builtin/checkout.c:302
c04f5ac3
JX
12273#, c-format
12274msgid "Unable to add merge result for '%s'"
12275msgstr "无法为 '%s' 添加合并结果"
12276
65387fd5 12277#: builtin/checkout.c:419
a6cd2cc4
JX
12278#, c-format
12279msgid "Recreated %d merge conflict"
12280msgid_plural "Recreated %d merge conflicts"
12281msgstr[0] "重新创建了 %d 个合并冲突"
12282msgstr[1] "重新创建了 %d 个合并冲突"
12283
65387fd5 12284#: builtin/checkout.c:424
a6cd2cc4
JX
12285#, c-format
12286msgid "Updated %d path from %s"
12287msgid_plural "Updated %d paths from %s"
12288msgstr[0] "从 %2$s 更新了 %1$d 个路径"
12289msgstr[1] "从 %2$s 更新了 %1$d 个路径"
12290
65387fd5 12291#: builtin/checkout.c:431
a6cd2cc4
JX
12292#, c-format
12293msgid "Updated %d path from the index"
12294msgid_plural "Updated %d paths from the index"
12295msgstr[0] "从索引区更新了 %d 个路径"
12296msgstr[1] "从索引区更新了 %d 个路径"
12297
65387fd5
FZ
12298#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
12299#: builtin/checkout.c:464
07432cef 12300#, c-format
ef317cd5 12301msgid "'%s' cannot be used with updating paths"
07432cef 12302msgstr "'%s' 不能在更新路径时使用"
ef317cd5 12303
65387fd5 12304#: builtin/checkout.c:474
ef317cd5
JX
12305#, c-format
12306msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 12307msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 12308
65387fd5 12309#: builtin/checkout.c:478
c04f5ac3 12310#, c-format
a6cd2cc4
JX
12311msgid "neither '%s' or '%s' is specified"
12312msgstr "'%s' 或 '%s' 都没有指定"
c04f5ac3 12313
65387fd5 12314#: builtin/checkout.c:482
06991777 12315#, c-format
a6cd2cc4
JX
12316msgid "'%s' must be used when '%s' is not specified"
12317msgstr "未指定 '%2$s' 时,必须使用 '%1$s'"
06991777 12318
65387fd5 12319#: builtin/checkout.c:487 builtin/checkout.c:492
06991777 12320#, c-format
a6cd2cc4
JX
12321msgid "'%s' or '%s' cannot be used with %s"
12322msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
06991777 12323
65387fd5 12324#: builtin/checkout.c:566 builtin/checkout.c:573
06991777 12325#, c-format
a6cd2cc4
JX
12326msgid "path '%s' is unmerged"
12327msgstr "路径 '%s' 未合并"
06991777 12328
65387fd5 12329#: builtin/checkout.c:747
c04f5ac3 12330msgid "you need to resolve your current index first"
90e6ef53 12331msgstr "您需要先解决当前索引的冲突"
c04f5ac3 12332
65387fd5 12333#: builtin/checkout.c:797
d46c5519
JX
12334#, c-format
12335msgid ""
12336"cannot continue with staged changes in the following files:\n"
12337"%s"
12338msgstr ""
12339"不能继续,下列文件有暂存的修改:\n"
12340"%s"
12341
65387fd5 12342#: builtin/checkout.c:890
c04f5ac3 12343#, c-format
1b7f4a34
JX
12344msgid "Can not do reflog for '%s': %s\n"
12345msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
c04f5ac3 12346
65387fd5 12347#: builtin/checkout.c:934
c04f5ac3
JX
12348msgid "HEAD is now at"
12349msgstr "HEAD 目前位于"
12350
65387fd5 12351#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
3495628d
JX
12352msgid "unable to update HEAD"
12353msgstr "不能更新 HEAD"
12354
65387fd5 12355#: builtin/checkout.c:942
c04f5ac3
JX
12356#, c-format
12357msgid "Reset branch '%s'\n"
12358msgstr "重置分支 '%s'\n"
12359
65387fd5 12360#: builtin/checkout.c:945
c04f5ac3
JX
12361#, c-format
12362msgid "Already on '%s'\n"
12363msgstr "已经位于 '%s'\n"
12364
65387fd5 12365#: builtin/checkout.c:949
c04f5ac3
JX
12366#, c-format
12367msgid "Switched to and reset branch '%s'\n"
12368msgstr "切换并重置分支 '%s'\n"
12369
65387fd5 12370#: builtin/checkout.c:951 builtin/checkout.c:1388
c04f5ac3
JX
12371#, c-format
12372msgid "Switched to a new branch '%s'\n"
12373msgstr "切换到一个新分支 '%s'\n"
12374
65387fd5 12375#: builtin/checkout.c:953
c04f5ac3
JX
12376#, c-format
12377msgid "Switched to branch '%s'\n"
12378msgstr "切换到分支 '%s'\n"
12379
90e6ef53 12380# 译者:注意保持前导空格
65387fd5 12381#: builtin/checkout.c:1004
c04f5ac3
JX
12382#, c-format
12383msgid " ... and %d more.\n"
90e6ef53 12384msgstr " ... 及其它 %d 个。\n"
c04f5ac3 12385
65387fd5 12386#: builtin/checkout.c:1010
c04f5ac3
JX
12387#, c-format
12388msgid ""
12389"Warning: you are leaving %d commit behind, not connected to\n"
12390"any of your branches:\n"
12391"\n"
12392"%s\n"
12393msgid_plural ""
12394"Warning: you are leaving %d commits behind, not connected to\n"
12395"any of your branches:\n"
12396"\n"
12397"%s\n"
12398msgstr[0] ""
12399"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
12400"\n"
12401"%s\n"
5ae481e0
JX
12402msgstr[1] ""
12403"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
12404"\n"
12405"%s\n"
c04f5ac3 12406
65387fd5 12407#: builtin/checkout.c:1029
c04f5ac3
JX
12408#, c-format
12409msgid ""
7aea43ff
JX
12410"If you want to keep it by creating a new branch, this may be a good time\n"
12411"to do so with:\n"
12412"\n"
12413" git branch <new-branch-name> %s\n"
12414"\n"
12415msgid_plural ""
c04f5ac3
JX
12416"If you want to keep them by creating a new branch, this may be a good time\n"
12417"to do so with:\n"
12418"\n"
814ff314 12419" git branch <new-branch-name> %s\n"
c04f5ac3 12420"\n"
7aea43ff
JX
12421msgstr[0] ""
12422"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
12423"如下操作:\n"
12424"\n"
12425" git branch <新分支名> %s\n"
12426"\n"
12427msgstr[1] ""
12428"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
c04f5ac3
JX
12429"如下操作:\n"
12430"\n"
814ff314 12431" git branch <新分支名> %s\n"
c04f5ac3
JX
12432"\n"
12433
65387fd5 12434#: builtin/checkout.c:1064
c04f5ac3
JX
12435msgid "internal error in revision walk"
12436msgstr "在版本遍历时遇到内部错误"
12437
65387fd5 12438#: builtin/checkout.c:1068
c04f5ac3
JX
12439msgid "Previous HEAD position was"
12440msgstr "之前的 HEAD 位置是"
12441
65387fd5 12442#: builtin/checkout.c:1114 builtin/checkout.c:1383
c04f5ac3 12443msgid "You are on a branch yet to be born"
90e6ef53 12444msgstr "您位于一个尚未初始化的分支"
c04f5ac3 12445
65387fd5 12446#: builtin/checkout.c:1196
06991777
JX
12447#, c-format
12448msgid ""
12449"'%s' could be both a local file and a tracking branch.\n"
12450"Please use -- (and optionally --no-guess) to disambiguate"
12451msgstr ""
12452"'%s' 既可以是一个本地文件,也可以是一个跟踪分支。\n"
12453"请使用 --(和可选的 --no-guess)来消除歧义"
12454
65387fd5 12455#: builtin/checkout.c:1203
2b472aae
JX
12456msgid ""
12457"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
12458"you can do so by fully qualifying the name with the --track option:\n"
12459"\n"
12460" git checkout --track origin/<name>\n"
12461"\n"
12462"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
12463"one remote, e.g. the 'origin' remote, consider setting\n"
12464"checkout.defaultRemote=origin in your config."
12465msgstr ""
12466"如果您想要检出一个远程跟踪分支,例如在 'origin' 上的,您可以使用分支\n"
12467"全名和 --track 选项:\n"
12468"\n"
440e7442 12469" git checkout --track origin/<名称>\n"
2b472aae 12470"\n"
440e7442 12471"如果您总是喜欢使用模糊的简短分支名 <名称>,而不喜欢如 'origin' 的远程\n"
2b472aae
JX
12472"名称,可以在配置中设置 checkout.defaultRemote=origin。"
12473
65387fd5 12474#: builtin/checkout.c:1213
2b472aae
JX
12475#, c-format
12476msgid "'%s' matched multiple (%d) remote tracking branches"
440e7442 12477msgstr "'%s' 匹配多个(%d 个)远程跟踪分支"
2b472aae 12478
65387fd5 12479#: builtin/checkout.c:1279
2b472aae 12480msgid "only one reference expected"
440e7442 12481msgstr "只期望一个引用"
2b472aae 12482
65387fd5 12483#: builtin/checkout.c:1296
2b472aae
JX
12484#, c-format
12485msgid "only one reference expected, %d given."
12486msgstr "应只有一个引用,却给出了 %d 个"
12487
65387fd5 12488#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
c04f5ac3
JX
12489#, c-format
12490msgid "invalid reference: %s"
12491msgstr "无效引用:%s"
12492
65387fd5 12493#: builtin/checkout.c:1355 builtin/checkout.c:1725
c04f5ac3
JX
12494#, c-format
12495msgid "reference is not a tree: %s"
12496msgstr "引用不是一个树:%s"
12497
65387fd5 12498#: builtin/checkout.c:1402
a6cd2cc4
JX
12499#, c-format
12500msgid "a branch is expected, got tag '%s'"
12501msgstr "期望一个分支,得到标签 '%s'"
12502
65387fd5 12503#: builtin/checkout.c:1404
a6cd2cc4
JX
12504#, c-format
12505msgid "a branch is expected, got remote branch '%s'"
12506msgstr "期望一个分支,得到远程分支 '%s'"
12507
65387fd5 12508#: builtin/checkout.c:1405 builtin/checkout.c:1413
a6cd2cc4
JX
12509#, c-format
12510msgid "a branch is expected, got '%s'"
12511msgstr "期望一个分支,得到 '%s'"
12512
65387fd5 12513#: builtin/checkout.c:1408
a6cd2cc4
JX
12514#, c-format
12515msgid "a branch is expected, got commit '%s'"
12516msgstr "期望一个分支,得到提交 '%s'"
12517
65387fd5 12518#: builtin/checkout.c:1424
a6cd2cc4
JX
12519msgid ""
12520"cannot switch branch while merging\n"
12521"Consider \"git merge --quit\" or \"git worktree add\"."
12522msgstr ""
12523"不能在合并时切换分支\n"
12524"考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
12525
65387fd5 12526#: builtin/checkout.c:1428
a6cd2cc4
JX
12527msgid ""
12528"cannot switch branch in the middle of an am session\n"
12529"Consider \"git am --quit\" or \"git worktree add\"."
12530msgstr ""
12531"不能在一个 am 会话期间切换分支\n"
12532"考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
12533
65387fd5 12534#: builtin/checkout.c:1432
a6cd2cc4
JX
12535msgid ""
12536"cannot switch branch while rebasing\n"
12537"Consider \"git rebase --quit\" or \"git worktree add\"."
12538msgstr ""
12539"不能在变基时切换分支\n"
12540"考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
12541
65387fd5 12542#: builtin/checkout.c:1436
a6cd2cc4
JX
12543msgid ""
12544"cannot switch branch while cherry-picking\n"
12545"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
12546msgstr ""
12547"不能在拣选时切换分支\n"
12548"考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
12549
65387fd5 12550#: builtin/checkout.c:1440
a6cd2cc4
JX
12551msgid ""
12552"cannot switch branch while reverting\n"
12553"Consider \"git revert --quit\" or \"git worktree add\"."
12554msgstr ""
12555"不能在还原时切换分支\n"
12556"考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
12557
65387fd5 12558#: builtin/checkout.c:1444
a6cd2cc4
JX
12559msgid "you are switching branch while bisecting"
12560msgstr "您在执行二分查找时切换分支"
12561
65387fd5 12562#: builtin/checkout.c:1451
ef317cd5 12563msgid "paths cannot be used with switching branches"
07432cef 12564msgstr "路径不能和切换分支同时使用"
c04f5ac3 12565
65387fd5 12566#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
07432cef 12567#, c-format
ef317cd5 12568msgid "'%s' cannot be used with switching branches"
07432cef 12569msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 12570
65387fd5
FZ
12571#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
12572#: builtin/checkout.c:1477 builtin/checkout.c:1482
07432cef 12573#, c-format
ef317cd5 12574msgid "'%s' cannot be used with '%s'"
07432cef 12575msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 12576
65387fd5 12577#: builtin/checkout.c:1479
a6cd2cc4
JX
12578#, c-format
12579msgid "'%s' cannot take <start-point>"
12580msgstr "'%s' 不带 <起始点>"
12581
65387fd5 12582#: builtin/checkout.c:1487
07432cef 12583#, c-format
ef317cd5 12584msgid "Cannot switch branch to a non-commit '%s'"
07432cef 12585msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 12586
65387fd5 12587#: builtin/checkout.c:1494
a6cd2cc4
JX
12588msgid "missing branch or commit argument"
12589msgstr "缺少分支或提交参数"
c04f5ac3 12590
65387fd5 12591#: builtin/checkout.c:1537
a6cd2cc4
JX
12592msgid "perform a 3-way merge with the new branch"
12593msgstr "和新的分支执行三方合并"
c04f5ac3 12594
65387fd5 12595#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
a6cd2cc4
JX
12596msgid "style"
12597msgstr "风格"
ef317cd5 12598
65387fd5
FZ
12599#: builtin/checkout.c:1539
12600msgid "conflict style (merge, diff3, or zdiff3)"
12601msgstr "冲突输出风格(merge、diff3 或 zdiff3)"
a6cd2cc4 12602
65387fd5 12603#: builtin/checkout.c:1551 builtin/worktree.c:488
5c57d762
JX
12604msgid "detach HEAD at named commit"
12605msgstr "HEAD 从指定的提交分离"
ef317cd5 12606
65387fd5
FZ
12607#: builtin/checkout.c:1553
12608msgid "set up tracking mode (see git-pull(1))"
12609msgstr "设置跟踪模式(参见 git-pull(1))"
ef317cd5 12610
65387fd5 12611#: builtin/checkout.c:1556
a6cd2cc4
JX
12612msgid "force checkout (throw away local modifications)"
12613msgstr "强制检出(丢弃本地修改)"
12614
65387fd5 12615#: builtin/checkout.c:1558
6c94aba5 12616msgid "new-branch"
07432cef 12617msgstr "新分支"
ef317cd5 12618
65387fd5 12619#: builtin/checkout.c:1558
ef317cd5 12620msgid "new unparented branch"
07432cef 12621msgstr "新的没有父提交的分支"
ef317cd5 12622
65387fd5 12623#: builtin/checkout.c:1560 builtin/merge.c:305
a6cd2cc4
JX
12624msgid "update ignored files (default)"
12625msgstr "更新忽略的文件(默认)"
12626
65387fd5 12627#: builtin/checkout.c:1563
a6cd2cc4
JX
12628msgid "do not check if another worktree is holding the given ref"
12629msgstr "不检查指定的引用是否被其他工作区所占用"
12630
65387fd5 12631#: builtin/checkout.c:1576
ef317cd5 12632msgid "checkout our version for unmerged files"
07432cef 12633msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 12634
65387fd5 12635#: builtin/checkout.c:1579
ef317cd5 12636msgid "checkout their version for unmerged files"
07432cef 12637msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 12638
65387fd5 12639#: builtin/checkout.c:1583
4dcdc3d8
JX
12640msgid "do not limit pathspecs to sparse entries only"
12641msgstr "对路径不做稀疏检出的限制"
12642
65387fd5 12643#: builtin/checkout.c:1640
349ede6a 12644#, c-format
65387fd5
FZ
12645msgid "options '-%c', '-%c', and '%s' cannot be used together"
12646msgstr "选项 '-%c'、'-%c' 和 ‘%s' 不能同时使用"
ef317cd5 12647
65387fd5 12648#: builtin/checkout.c:1681
ef317cd5
JX
12649msgid "--track needs a branch name"
12650msgstr "--track 需要一个分支名"
12651
65387fd5 12652#: builtin/checkout.c:1686
349ede6a
JX
12653#, c-format
12654msgid "missing branch name; try -%c"
12655msgstr "缺少分支名,尝试 -%c"
ef317cd5 12656
65387fd5 12657#: builtin/checkout.c:1718
a6cd2cc4
JX
12658#, c-format
12659msgid "could not resolve %s"
12660msgstr "无法解析 %s"
12661
65387fd5 12662#: builtin/checkout.c:1734
c04f5ac3 12663msgid "invalid path specification"
90e6ef53 12664msgstr "无效的路径规格"
c04f5ac3 12665
65387fd5 12666#: builtin/checkout.c:1741
07432cef 12667#, c-format
a4f16749
JX
12668msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
12669msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'"
c04f5ac3 12670
65387fd5 12671#: builtin/checkout.c:1745
07432cef 12672#, c-format
ef317cd5 12673msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 12674msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 12675
65387fd5 12676#: builtin/checkout.c:1770
c04f5ac3
JX
12677msgid ""
12678"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
12679"checking out of the index."
12680msgstr ""
90e6ef53 12681"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 12682
65387fd5 12683#: builtin/checkout.c:1775
ddc12c42
JX
12684msgid "you must specify path(s) to restore"
12685msgstr "您必须指定一个要恢复的路径"
12686
65387fd5
FZ
12687#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
12688#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
12689#: builtin/remote.c:172 builtin/submodule--helper.c:2959
12690#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
12691#: builtin/worktree.c:486
a6cd2cc4
JX
12692msgid "branch"
12693msgstr "分支"
12694
65387fd5 12695#: builtin/checkout.c:1801
a6cd2cc4
JX
12696msgid "create and checkout a new branch"
12697msgstr "创建并检出一个新的分支"
12698
65387fd5 12699#: builtin/checkout.c:1803
a6cd2cc4
JX
12700msgid "create/reset and checkout a branch"
12701msgstr "创建/重置并检出一个分支"
12702
65387fd5 12703#: builtin/checkout.c:1804
a6cd2cc4
JX
12704msgid "create reflog for new branch"
12705msgstr "为新的分支创建引用日志"
12706
65387fd5 12707#: builtin/checkout.c:1806
a6cd2cc4
JX
12708msgid "second guess 'git checkout <no-such-branch>' (default)"
12709msgstr "二次猜测 'git checkout <无此分支>'(默认)"
12710
65387fd5 12711#: builtin/checkout.c:1807
a6cd2cc4
JX
12712msgid "use overlay mode (default)"
12713msgstr "使用叠加模式(默认)"
12714
65387fd5 12715#: builtin/checkout.c:1855
a6cd2cc4
JX
12716msgid "create and switch to a new branch"
12717msgstr "创建并切换一个新分支"
12718
65387fd5 12719#: builtin/checkout.c:1857
a6cd2cc4
JX
12720msgid "create/reset and switch to a branch"
12721msgstr "创建/重置并切换一个分支"
12722
65387fd5 12723#: builtin/checkout.c:1859
a6cd2cc4
JX
12724msgid "second guess 'git switch <no-such-branch>'"
12725msgstr "二次猜测 'git switch <无此分支>'"
12726
65387fd5 12727#: builtin/checkout.c:1861
a6cd2cc4
JX
12728msgid "throw away local modifications"
12729msgstr "丢弃本地修改"
12730
65387fd5 12731#: builtin/checkout.c:1897
a6cd2cc4
JX
12732msgid "which tree-ish to checkout from"
12733msgstr "要检出哪一个树"
12734
65387fd5 12735#: builtin/checkout.c:1899
a6cd2cc4
JX
12736msgid "restore the index"
12737msgstr "恢复索引"
12738
65387fd5 12739#: builtin/checkout.c:1901
a6cd2cc4
JX
12740msgid "restore the working tree (default)"
12741msgstr "恢复工作区(默认)"
12742
65387fd5 12743#: builtin/checkout.c:1903
a6cd2cc4
JX
12744msgid "ignore unmerged entries"
12745msgstr "忽略未合并条目"
12746
65387fd5 12747#: builtin/checkout.c:1904
a6cd2cc4
JX
12748msgid "use overlay mode"
12749msgstr "使用叠加模式"
12750
349ede6a 12751#: builtin/clean.c:29
2e8451e8
JX
12752msgid ""
12753"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
12754msgstr ""
12755"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 12756
349ede6a 12757#: builtin/clean.c:33
07432cef
WS
12758#, c-format
12759msgid "Removing %s\n"
12760msgstr "正删除 %s\n"
12761
349ede6a 12762#: builtin/clean.c:34
07432cef
WS
12763#, c-format
12764msgid "Would remove %s\n"
12765msgstr "将删除 %s\n"
12766
349ede6a 12767#: builtin/clean.c:35
07432cef
WS
12768#, c-format
12769msgid "Skipping repository %s\n"
160fb2b2 12770msgstr "忽略仓库 %s\n"
07432cef 12771
349ede6a 12772#: builtin/clean.c:36
07432cef
WS
12773#, c-format
12774msgid "Would skip repository %s\n"
160fb2b2 12775msgstr "将忽略仓库 %s\n"
07432cef 12776
349ede6a 12777#: builtin/clean.c:38
a6cd2cc4
JX
12778#, c-format
12779msgid "could not lstat %s\n"
12780msgstr "不能对 %s 调用 lstat\n"
12781
65387fd5
FZ
12782#: builtin/clean.c:39
12783msgid "Refusing to remove current working directory\n"
12784msgstr "拒绝删除当前工作目录\n"
12785
12786#: builtin/clean.c:40
12787msgid "Would refuse to remove current working directory\n"
12788msgstr "将拒绝删除当前工作目录\n"
12789
12790#: builtin/clean.c:326 git-add--interactive.perl:593
1a79b2f1 12791#, c-format
2e8451e8
JX
12792msgid ""
12793"Prompt help:\n"
12794"1 - select a numbered item\n"
12795"foo - select item based on unique prefix\n"
1a79b2f1 12796" - (empty) select nothing\n"
2e8451e8
JX
12797msgstr ""
12798"帮助:\n"
12799"1 - 通过编号选择一个选项\n"
1a79b2f1
JX
12800"foo - 通过唯一前缀选择一个选项\n"
12801" - (空)什么也不选择\n"
2e8451e8 12802
65387fd5 12803#: builtin/clean.c:330 git-add--interactive.perl:602
1a79b2f1 12804#, c-format
2e8451e8
JX
12805msgid ""
12806"Prompt help:\n"
12807"1 - select a single item\n"
12808"3-5 - select a range of items\n"
12809"2-3,6-9 - select multiple ranges\n"
12810"foo - select item based on unique prefix\n"
12811"-... - unselect specified items\n"
12812"* - choose all items\n"
1a79b2f1 12813" - (empty) finish selecting\n"
2e8451e8
JX
12814msgstr ""
12815"帮助:\n"
12816"1 - 选择一个选项\n"
12817"3-5 - 选择一个范围内的所有选项\n"
12818"2-3,6-9 - 选择多个范围内的所有选项\n"
1a79b2f1 12819"foo - 通过唯一前缀选择一个选项\n"
2e8451e8
JX
12820"-... - 反选特定的选项\n"
12821"* - 选择所有选项\n"
1a79b2f1 12822" - (空)结束选择\n"
2e8451e8 12823
65387fd5 12824#: builtin/clean.c:545 git-add--interactive.perl:568
d13389bf 12825#: git-add--interactive.perl:573
1a79b2f1
JX
12826#, c-format, perl-format
12827msgid "Huh (%s)?\n"
12828msgstr "嗯(%s)?\n"
2e8451e8 12829
65387fd5 12830#: builtin/clean.c:685
2e8451e8
JX
12831#, c-format
12832msgid "Input ignore patterns>> "
12833msgstr "输入模版以排除条目>> "
12834
65387fd5 12835#: builtin/clean.c:719
2e8451e8
JX
12836#, c-format
12837msgid "WARNING: Cannot find items matched by: %s"
12838msgstr "警告:无法找到和 %s 匹配的条目"
12839
65387fd5 12840#: builtin/clean.c:740
2e8451e8
JX
12841msgid "Select items to delete"
12842msgstr "选择要删除的条目"
12843
814ff314 12844#. TRANSLATORS: Make sure to keep [y/N] as is
65387fd5 12845#: builtin/clean.c:781
2e8451e8 12846#, c-format
814ff314
JX
12847msgid "Remove %s [y/N]? "
12848msgstr "删除 %s [y/N]?"
2e8451e8 12849
65387fd5 12850#: builtin/clean.c:812
2e8451e8
JX
12851msgid ""
12852"clean - start cleaning\n"
12853"filter by pattern - exclude items from deletion\n"
12854"select by numbers - select items to be deleted by numbers\n"
12855"ask each - confirm each deletion (like \"rm -i\")\n"
12856"quit - stop cleaning\n"
12857"help - this screen\n"
12858"? - help for prompt selection"
12859msgstr ""
12860"clean - 开始清理\n"
12861"filter by pattern - 通过模版排除要删除的条目\n"
12862"select by numbers - 通过数字选择要删除的条目\n"
12863"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
12864"quit - 停止删除并退出\n"
12865"help - 显示本帮助\n"
12866"? - 显示如何在提示符下选择的帮助"
12867
65387fd5 12868#: builtin/clean.c:848
2e8451e8
JX
12869msgid "Would remove the following item:"
12870msgid_plural "Would remove the following items:"
12871msgstr[0] "将删除如下条目:"
12872msgstr[1] "将删除如下条目:"
12873
65387fd5 12874#: builtin/clean.c:864
2e8451e8
JX
12875msgid "No more files to clean, exiting."
12876msgstr "没有要清理的文件,退出。"
12877
65387fd5 12878#: builtin/clean.c:926
ef317cd5 12879msgid "do not print names of files removed"
07432cef 12880msgstr "不打印删除文件的名称"
ef317cd5 12881
65387fd5 12882#: builtin/clean.c:928
ef317cd5 12883msgid "force"
07432cef 12884msgstr "强制"
ef317cd5 12885
65387fd5 12886#: builtin/clean.c:929
2e8451e8
JX
12887msgid "interactive cleaning"
12888msgstr "交互式清除"
12889
65387fd5 12890#: builtin/clean.c:931
ef317cd5 12891msgid "remove whole directories"
07432cef 12892msgstr "删除整个目录"
ef317cd5 12893
65387fd5 12894#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
7e6630a7 12895#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
65387fd5 12896#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
d46c5519 12897#: builtin/show-ref.c:179
ef317cd5 12898msgid "pattern"
07432cef 12899msgstr "模式"
ef317cd5 12900
65387fd5 12901#: builtin/clean.c:933
ef317cd5 12902msgid "add <pattern> to ignore rules"
4375c10e 12903msgstr "添加 <模式> 到忽略规则"
ef317cd5 12904
65387fd5 12905#: builtin/clean.c:934
ef317cd5 12906msgid "remove ignored files, too"
07432cef 12907msgstr "也删除忽略的文件"
ef317cd5 12908
65387fd5 12909#: builtin/clean.c:936
ef317cd5 12910msgid "remove only ignored files"
07432cef 12911msgstr "只删除忽略的文件"
c04f5ac3 12912
65387fd5 12913#: builtin/clean.c:951
c04f5ac3 12914msgid ""
6c94aba5 12915"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 12916"clean"
c04f5ac3 12917msgstr ""
2e8451e8 12918"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 12919
65387fd5 12920#: builtin/clean.c:954
c04f5ac3 12921msgid ""
6c94aba5 12922"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 12923"refusing to clean"
c04f5ac3 12924msgstr ""
2e8451e8 12925"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 12926
65387fd5 12927#: builtin/clean.c:966
7157c2b5
JX
12928msgid "-x and -X cannot be used together"
12929msgstr "-x 和 -X 不能同时使用"
12930
a5cd71ca 12931#: builtin/clone.c:45
814ff314 12932msgid "git clone [<options>] [--] <repo> [<dir>]"
160fb2b2 12933msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
ef317cd5 12934
33b62fba
JX
12935#: builtin/clone.c:96
12936msgid "don't clone shallow repository"
12937msgstr "不克隆浅仓库"
12938
12939#: builtin/clone.c:98
ef317cd5 12940msgid "don't create a checkout"
07432cef 12941msgstr "不创建一个检出"
ef317cd5 12942
ec3d4607 12943#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
ef317cd5 12944msgid "create a bare repository"
160fb2b2 12945msgstr "创建一个纯仓库"
ef317cd5 12946
33b62fba 12947#: builtin/clone.c:103
ef317cd5 12948msgid "create a mirror repository (implies bare)"
160fb2b2 12949msgstr "创建一个镜像仓库(也是纯仓库)"
ef317cd5 12950
33b62fba 12951#: builtin/clone.c:105
ef317cd5 12952msgid "to clone from a local repository"
160fb2b2 12953msgstr "从本地仓库克隆"
ef317cd5 12954
33b62fba 12955#: builtin/clone.c:107
ef317cd5 12956msgid "don't use local hardlinks, always copy"
07432cef 12957msgstr "不使用本地硬链接,始终复制"
ef317cd5 12958
33b62fba 12959#: builtin/clone.c:109
ef317cd5 12960msgid "setup as shared repository"
160fb2b2 12961msgstr "设置为共享仓库"
ef317cd5 12962
33b62fba 12963#: builtin/clone.c:111
87cb7997 12964msgid "pathspec"
65e2041e 12965msgstr "路径规格"
87cb7997 12966
33b62fba 12967#: builtin/clone.c:111
ef317cd5 12968msgid "initialize submodules in the clone"
07432cef 12969msgstr "在克隆时初始化子模组"
ef317cd5 12970
33b62fba 12971#: builtin/clone.c:115
5b04ee3b
JX
12972msgid "number of submodules cloned in parallel"
12973msgstr "并发克隆的子模组的数量"
12974
ec3d4607 12975#: builtin/clone.c:116 builtin/init-db.c:539
ef317cd5 12976msgid "template-directory"
07432cef 12977msgstr "模板目录"
ef317cd5 12978
ec3d4607 12979#: builtin/clone.c:117 builtin/init-db.c:540
ef317cd5 12980msgid "directory from which templates will be used"
07432cef 12981msgstr "模板目录将被使用"
ef317cd5 12982
65387fd5
FZ
12983#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
12984#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
ef317cd5 12985msgid "reference repository"
160fb2b2 12986msgstr "参考仓库"
ef317cd5 12987
65387fd5
FZ
12988#: builtin/clone.c:123 builtin/submodule--helper.c:1873
12989#: builtin/submodule--helper.c:2516
7aea43ff 12990msgid "use --reference only while cloning"
160fb2b2 12991msgstr "仅在克隆时参考 --reference 指向的本地仓库"
7aea43ff 12992
65387fd5
FZ
12993#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
12994#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
12995#: builtin/pack-objects.c:3944 builtin/repack.c:665
12996#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
7e6630a7 12997#: t/helper/test-simple-ipc.c:597
ef317cd5 12998msgid "name"
07432cef 12999msgstr "名称"
ef317cd5 13000
33b62fba 13001#: builtin/clone.c:125
ef317cd5 13002msgid "use <name> instead of 'origin' to track upstream"
4375c10e 13003msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
ef317cd5 13004
33b62fba 13005#: builtin/clone.c:127
ef317cd5 13006msgid "checkout <branch> instead of the remote's HEAD"
4375c10e 13007msgstr "检出 <分支> 而不是远程 HEAD"
ef317cd5 13008
33b62fba 13009#: builtin/clone.c:129
ef317cd5 13010msgid "path to git-upload-pack on the remote"
07432cef 13011msgstr "远程 git-upload-pack 路径"
ef317cd5 13012
65387fd5 13013#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
ffa14514 13014#: builtin/pull.c:212
ef317cd5 13015msgid "depth"
07432cef 13016msgstr "深度"
ef317cd5 13017
33b62fba 13018#: builtin/clone.c:131
ef317cd5 13019msgid "create a shallow clone of that depth"
07432cef 13020msgstr "创建一个指定深度的浅克隆"
ef317cd5 13021
65387fd5 13022#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
ffa14514 13023#: builtin/pull.c:215
a0b6b246
JX
13024msgid "time"
13025msgstr "时间"
13026
33b62fba 13027#: builtin/clone.c:133
a0b6b246
JX
13028msgid "create a shallow clone since a specific time"
13029msgstr "从一个特定时间创建一个浅克隆"
13030
65387fd5 13031#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
ffa14514 13032#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
a0b6b246
JX
13033msgid "revision"
13034msgstr "版本"
13035
65387fd5 13036#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
1a79b2f1
JX
13037msgid "deepen history of shallow clone, excluding rev"
13038msgstr "深化浅克隆的历史,除了特定版本"
a0b6b246 13039
65387fd5
FZ
13040#: builtin/clone.c:137 builtin/submodule--helper.c:1883
13041#: builtin/submodule--helper.c:2530
ef317cd5 13042msgid "clone only one branch, HEAD or --branch"
07432cef 13043msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 13044
33b62fba 13045#: builtin/clone.c:139
a4f16749
JX
13046msgid "don't clone any tags, and make later fetches not to follow them"
13047msgstr "不要克隆任何标签,并且后续获取操作也不下载它们"
13048
33b62fba 13049#: builtin/clone.c:141
5b04ee3b
JX
13050msgid "any cloned submodules will be shallow"
13051msgstr "子模组将以浅下载模式克隆"
13052
ec3d4607 13053#: builtin/clone.c:142 builtin/init-db.c:548
ef317cd5 13054msgid "gitdir"
07432cef 13055msgstr "git目录"
ef317cd5 13056
ec3d4607 13057#: builtin/clone.c:143 builtin/init-db.c:549
ef317cd5 13058msgid "separate git dir from working tree"
07432cef 13059msgstr "git目录和工作区分离"
ef317cd5 13060
33b62fba 13061#: builtin/clone.c:144
ef317cd5 13062msgid "key=value"
07432cef 13063msgstr "key=value"
ef317cd5 13064
33b62fba 13065#: builtin/clone.c:145
ef317cd5 13066msgid "set config inside the new repository"
160fb2b2 13067msgstr "在新仓库中设置配置信息"
ef317cd5 13068
65387fd5 13069#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
ffa14514 13070#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
d46c5519
JX
13071msgid "server-specific"
13072msgstr "server-specific"
13073
65387fd5 13074#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
ffa14514 13075#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
d46c5519
JX
13076msgid "option to transmit"
13077msgstr "传输选项"
13078
65387fd5 13079#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
ec3d4607 13080#: builtin/push.c:576
276ceeaa
JX
13081msgid "use IPv4 addresses only"
13082msgstr "只使用 IPv4 地址"
13083
65387fd5 13084#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
ec3d4607 13085#: builtin/push.c:578
276ceeaa
JX
13086msgid "use IPv6 addresses only"
13087msgstr "只使用 IPv6 地址"
13088
33b62fba 13089#: builtin/clone.c:154
a6cd2cc4
JX
13090msgid "any cloned submodules will use their remote-tracking branch"
13091msgstr "任何克隆的子模组将使用它们的远程跟踪分支"
13092
33b62fba 13093#: builtin/clone.c:156
ddc12c42
JX
13094msgid "initialize sparse-checkout file to include only files at root"
13095msgstr "初始化稀疏检出文件,只包含根目录文件"
13096
7e6630a7 13097#: builtin/clone.c:231
cfff71a9 13098#, c-format
a0b6b246
JX
13099msgid "info: Could not add alternate for '%s': %s\n"
13100msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
cfff71a9 13101
7e6630a7 13102#: builtin/clone.c:304
c04f5ac3
JX
13103#, c-format
13104msgid "%s exists and is not a directory"
13105msgstr "%s 存在且不是一个目录"
13106
7e6630a7 13107#: builtin/clone.c:322
c04f5ac3 13108#, c-format
a6cd2cc4
JX
13109msgid "failed to start iterator over '%s'"
13110msgstr "无法在 '%s' 上启动迭代器"
c04f5ac3 13111
7e6630a7 13112#: builtin/clone.c:353
c04f5ac3
JX
13113#, c-format
13114msgid "failed to create link '%s'"
65387fd5 13115msgstr "无法创建链接 '%s'"
c04f5ac3 13116
7e6630a7 13117#: builtin/clone.c:357
c04f5ac3
JX
13118#, c-format
13119msgid "failed to copy file to '%s'"
65387fd5 13120msgstr "无法拷贝文件至 '%s'"
c04f5ac3 13121
7e6630a7 13122#: builtin/clone.c:362
a6cd2cc4
JX
13123#, c-format
13124msgid "failed to iterate over '%s'"
13125msgstr "无法在 '%s' 上迭代"
13126
7e6630a7 13127#: builtin/clone.c:389
c04f5ac3
JX
13128#, c-format
13129msgid "done.\n"
13130msgstr "完成。\n"
13131
7e6630a7 13132#: builtin/clone.c:403
1003b3a5
JX
13133msgid ""
13134"Clone succeeded, but checkout failed.\n"
13135"You can inspect what was checked out with 'git status'\n"
a6cd2cc4 13136"and retry with 'git restore --source=HEAD :/'\n"
1003b3a5
JX
13137msgstr ""
13138"克隆成功,但是检出失败。\n"
13139"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
a6cd2cc4 13140"'git restore --source=HEAD :/' 重试\n"
1003b3a5 13141
7e6630a7 13142#: builtin/clone.c:480
c04f5ac3
JX
13143#, c-format
13144msgid "Could not find remote branch %s to clone."
90e6ef53 13145msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 13146
7e6630a7 13147#: builtin/clone.c:597
3495628d
JX
13148#, c-format
13149msgid "unable to update %s"
13150msgstr "不能更新 %s"
13151
7e6630a7 13152#: builtin/clone.c:645
ddc12c42
JX
13153msgid "failed to initialize sparse-checkout"
13154msgstr "无法初始化稀疏检出"
13155
7e6630a7 13156#: builtin/clone.c:668
c04f5ac3
JX
13157msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
13158msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
13159
7e6630a7 13160#: builtin/clone.c:701
1003b3a5
JX
13161msgid "unable to checkout working tree"
13162msgstr "不能检出工作区"
13163
7e6630a7 13164#: builtin/clone.c:779
3495628d
JX
13165msgid "unable to write parameters to config file"
13166msgstr "无法将参数写入配置文件"
13167
7e6630a7 13168#: builtin/clone.c:842
04cb2f28
JX
13169msgid "cannot repack to clean up"
13170msgstr "无法执行 repack 来清理"
13171
7e6630a7 13172#: builtin/clone.c:844
04cb2f28
JX
13173msgid "cannot unlink temporary alternates file"
13174msgstr "无法删除临时的 alternates 文件"
13175
65387fd5 13176#: builtin/clone.c:886
c04f5ac3
JX
13177msgid "Too many arguments."
13178msgstr "太多参数。"
13179
65387fd5 13180#: builtin/clone.c:890 contrib/scalar/scalar.c:414
c04f5ac3 13181msgid "You must specify a repository to clone."
160fb2b2 13182msgstr "您必须指定一个仓库来克隆。"
c04f5ac3 13183
7e6630a7 13184#: builtin/clone.c:903
c04f5ac3 13185#, c-format
65387fd5
FZ
13186msgid "options '%s' and '%s %s' cannot be used together"
13187msgstr "选项 '%s' 和 '%s %s' 不能同时使用"
07432cef 13188
7e6630a7 13189#: builtin/clone.c:920
c04f5ac3
JX
13190#, c-format
13191msgid "repository '%s' does not exist"
160fb2b2 13192msgstr "仓库 '%s' 不存在"
c04f5ac3 13193
ee27abd3 13194#: builtin/clone.c:924 builtin/fetch.c:2052
cfff71a9
JX
13195#, c-format
13196msgid "depth %s is not a positive number"
13197msgstr "深度 %s 不是一个正数"
13198
7e6630a7 13199#: builtin/clone.c:934
c04f5ac3
JX
13200#, c-format
13201msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 13202msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 13203
7e6630a7 13204#: builtin/clone.c:940
d9488fea
JX
13205#, c-format
13206msgid "repository path '%s' already exists and is not an empty directory."
13207msgstr "仓库路径 '%s' 已经存在,并且不是一个空目录。"
13208
7e6630a7 13209#: builtin/clone.c:954
c04f5ac3
JX
13210#, c-format
13211msgid "working tree '%s' already exists."
13212msgstr "工作区 '%s' 已经存在。"
13213
65387fd5
FZ
13214#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
13215#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
5bb01d4f
JX
13216#, c-format
13217msgid "could not create leading directories of '%s'"
13218msgstr "不能为 '%s' 创建先导目录"
13219
7e6630a7 13220#: builtin/clone.c:974
c04f5ac3 13221#, c-format
814ff314
JX
13222msgid "could not create work tree dir '%s'"
13223msgstr "不能创建工作区目录 '%s'"
c04f5ac3 13224
7e6630a7 13225#: builtin/clone.c:994
c04f5ac3
JX
13226#, c-format
13227msgid "Cloning into bare repository '%s'...\n"
160fb2b2 13228msgstr "克隆到纯仓库 '%s'...\n"
c04f5ac3 13229
7e6630a7 13230#: builtin/clone.c:996
c04f5ac3
JX
13231#, c-format
13232msgid "Cloning into '%s'...\n"
13233msgstr "正克隆到 '%s'...\n"
13234
7e6630a7 13235#: builtin/clone.c:1025
a0b6b246
JX
13236msgid ""
13237"clone --recursive is not compatible with both --reference and --reference-if-"
13238"able"
13239msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
13240
7e6630a7 13241#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710
d13389bf
JX
13242#, c-format
13243msgid "'%s' is not a valid remote name"
13244msgstr "'%s' 不是一个有效的远程名称"
13245
7e6630a7 13246#: builtin/clone.c:1121
6acbf033 13247msgid "--depth is ignored in local clones; use file:// instead."
a0b6b246
JX
13248msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
13249
7e6630a7 13250#: builtin/clone.c:1123
a0b6b246
JX
13251msgid "--shallow-since is ignored in local clones; use file:// instead."
13252msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
6acbf033 13253
7e6630a7 13254#: builtin/clone.c:1125
a0b6b246
JX
13255msgid "--shallow-exclude is ignored in local clones; use file:// instead."
13256msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
13257
7e6630a7 13258#: builtin/clone.c:1127
31e5e17b
JX
13259msgid "--filter is ignored in local clones; use file:// instead."
13260msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。"
13261
7e6630a7 13262#: builtin/clone.c:1132
6acbf033 13263msgid "source repository is shallow, ignoring --local"
160fb2b2 13264msgstr "源仓库是浅克隆,忽略 --local"
6acbf033 13265
7e6630a7 13266#: builtin/clone.c:1137
6acbf033
JX
13267msgid "--local is ignored"
13268msgstr "--local 被忽略"
13269
7e6630a7 13270#: builtin/clone.c:1216 builtin/clone.c:1276
ec3d4607
JX
13271msgid "remote transport reported error"
13272msgstr "远程传输报告错误"
13273
7e6630a7 13274#: builtin/clone.c:1228 builtin/clone.c:1239
c04f5ac3
JX
13275#, c-format
13276msgid "Remote branch %s not found in upstream %s"
13277msgstr "远程分支 %s 在上游 %s 未发现"
13278
7e6630a7 13279#: builtin/clone.c:1242
c04f5ac3 13280msgid "You appear to have cloned an empty repository."
160fb2b2 13281msgstr "您似乎克隆了一个空仓库。"
c04f5ac3 13282
a4f16749 13283#: builtin/column.c:10
814ff314
JX
13284msgid "git column [<options>]"
13285msgstr "git column [<选项>]"
ef317cd5 13286
a4f16749 13287#: builtin/column.c:27
ef317cd5 13288msgid "lookup config vars"
07432cef 13289msgstr "查找配置变量"
ef317cd5 13290
a4f16749 13291#: builtin/column.c:28 builtin/column.c:29
ef317cd5 13292msgid "layout to use"
07432cef 13293msgstr "要使用的布局"
ef317cd5 13294
a4f16749 13295#: builtin/column.c:30
33b62fba 13296msgid "maximum width"
07432cef 13297msgstr "最大宽度"
ef317cd5 13298
a4f16749 13299#: builtin/column.c:31
33b62fba 13300msgid "padding space on left border"
07432cef 13301msgstr "左边框的填充空间"
ef317cd5 13302
a4f16749 13303#: builtin/column.c:32
33b62fba 13304msgid "padding space on right border"
07432cef 13305msgstr "右边框的填充空间"
ef317cd5 13306
a4f16749 13307#: builtin/column.c:33
33b62fba 13308msgid "padding space between columns"
07432cef 13309msgstr "两列之间的填充空间"
ef317cd5 13310
fd8cb379 13311#: builtin/column.c:51
8ada9598 13312msgid "--command must be the first argument"
81809b99 13313msgstr "--command 必须是第一个参数"
8ada9598 13314
7e6630a7 13315#: builtin/commit-graph.c:13
349ede6a
JX
13316msgid ""
13317"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
13318msgstr ""
13319"git commit-graph verify [--object-dir <对象目录>] [--shallow] [--"
13320"[no-]progress]"
13321
7e6630a7 13322#: builtin/commit-graph.c:16
349ede6a
JX
13323msgid ""
13324"git commit-graph write [--object-dir <objdir>] [--append] [--"
13325"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
d9488fea 13326"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
349ede6a
JX
13327msgstr ""
13328"git commit-graph write [--object-dir <对象目录>] [--append] [--split[=<策略"
13329">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--"
d9488fea 13330"[no-]max-new-filters <n>] [--[no-]progress] <切分选项>"
349ede6a 13331
65387fd5 13332#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
349ede6a
JX
13333msgid "dir"
13334msgstr "目录"
13335
7e6630a7 13336#: builtin/commit-graph.c:52
473eb541 13337msgid "the object directory to store the graph"
349ede6a
JX
13338msgstr "保存图形的对象目录"
13339
7e6630a7 13340#: builtin/commit-graph.c:73
349ede6a
JX
13341msgid "if the commit-graph is split, only verify the tip file"
13342msgstr "如果提交图形被拆分,只验证头一个文件"
13343
7e6630a7 13344#: builtin/commit-graph.c:100
349ede6a
JX
13345#, c-format
13346msgid "Could not open commit-graph '%s'"
13347msgstr "无法打开提交图形 '%s'"
13348
7e6630a7 13349#: builtin/commit-graph.c:137
349ede6a
JX
13350#, c-format
13351msgid "unrecognized --split argument, %s"
13352msgstr "未能识别的 --split 参数,%s"
13353
7e6630a7 13354#: builtin/commit-graph.c:150
7157c2b5
JX
13355#, c-format
13356msgid "unexpected non-hex object ID: %s"
13357msgstr "意外的非十六进制对象 ID:%s"
13358
7e6630a7 13359#: builtin/commit-graph.c:155
7157c2b5
JX
13360#, c-format
13361msgid "invalid object: %s"
13362msgstr "无效对象:%s"
13363
7e6630a7 13364#: builtin/commit-graph.c:205
349ede6a
JX
13365msgid "start walk at all refs"
13366msgstr "开始遍历所有引用"
13367
7e6630a7 13368#: builtin/commit-graph.c:207
349ede6a
JX
13369msgid "scan pack-indexes listed by stdin for commits"
13370msgstr "从标准输入中的包索引文件列表中扫描提交"
13371
7e6630a7 13372#: builtin/commit-graph.c:209
349ede6a
JX
13373msgid "start walk at commits listed by stdin"
13374msgstr "从标准输入中的提交开始扫描"
13375
7e6630a7 13376#: builtin/commit-graph.c:211
349ede6a
JX
13377msgid "include all commits already in the commit-graph file"
13378msgstr "包含 commit-graph 文件中已有所有提交"
13379
7e6630a7 13380#: builtin/commit-graph.c:213
349ede6a
JX
13381msgid "enable computation for changed paths"
13382msgstr "启用变更路径的计算"
13383
7e6630a7 13384#: builtin/commit-graph.c:215
349ede6a
JX
13385msgid "allow writing an incremental commit-graph file"
13386msgstr "允许写一个增量提交图形文件"
13387
7e6630a7 13388#: builtin/commit-graph.c:219
349ede6a
JX
13389msgid "maximum number of commits in a non-base split commit-graph"
13390msgstr "在非基本拆分提交图形中的最大提交数"
13391
7e6630a7 13392#: builtin/commit-graph.c:221
349ede6a
JX
13393msgid "maximum ratio between two levels of a split commit-graph"
13394msgstr "一个拆分提交图形的两个级别之间的最大比率"
13395
7e6630a7 13396#: builtin/commit-graph.c:223
349ede6a
JX
13397msgid "only expire files older than a given date-time"
13398msgstr "只让早于给定时间的文件过期"
13399
7e6630a7 13400#: builtin/commit-graph.c:225
d9488fea
JX
13401msgid "maximum number of changed-path Bloom filters to compute"
13402msgstr "要计算的变更路径布隆过滤器的最大数"
13403
7e6630a7 13404#: builtin/commit-graph.c:251
349ede6a
JX
13405msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
13406msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
13407
84bf71ea 13408#: builtin/commit-graph.c:282
7157c2b5
JX
13409msgid "Collecting commits from input"
13410msgstr "正从标准输入收集提交"
349ede6a 13411
65387fd5 13412#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
7e6630a7
FZ
13413#, c-format
13414msgid "unrecognized subcommand: %s"
13415msgstr "未识别的子命令:%s"
13416
d46c5519
JX
13417#: builtin/commit-tree.c:18
13418msgid ""
13419"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
13420"<file>)...] <tree>"
13421msgstr ""
13422"git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件"
13423">)...] <树>"
13424
13425#: builtin/commit-tree.c:31
13426#, c-format
13427msgid "duplicate parent %s ignored"
13428msgstr "忽略重复的父提交 %s"
13429
65387fd5 13430#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
d46c5519
JX
13431#, c-format
13432msgid "not a valid object name %s"
13433msgstr "不是一个有效的对象名 %s"
13434
7e6630a7 13435#: builtin/commit-tree.c:94
d46c5519
JX
13436#, c-format
13437msgid "git commit-tree: failed to read '%s'"
13438msgstr "git commit-tree:无法读取 '%s'"
13439
7e6630a7 13440#: builtin/commit-tree.c:96
d46c5519
JX
13441#, c-format
13442msgid "git commit-tree: failed to close '%s'"
13443msgstr "git commit-tree:无法关闭 '%s'"
13444
7e6630a7 13445#: builtin/commit-tree.c:109
d46c5519
JX
13446msgid "parent"
13447msgstr "父提交"
13448
7e6630a7 13449#: builtin/commit-tree.c:110
d46c5519 13450msgid "id of a parent commit object"
5b533632 13451msgstr "父提交对象 ID"
d46c5519 13452
65387fd5
FZ
13453#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
13454#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
7e6630a7 13455#: builtin/tag.c:454
d46c5519
JX
13456msgid "message"
13457msgstr "说明"
13458
65387fd5 13459#: builtin/commit-tree.c:113 builtin/commit.c:1627
d46c5519
JX
13460msgid "commit message"
13461msgstr "提交说明"
13462
7e6630a7 13463#: builtin/commit-tree.c:116
d46c5519
JX
13464msgid "read commit log message from file"
13465msgstr "从文件中读取提交说明"
13466
65387fd5 13467#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
ffa14514 13468#: builtin/pull.c:180 builtin/revert.c:118
d46c5519
JX
13469msgid "GPG sign commit"
13470msgstr "GPG 提交签名"
13471
7e6630a7 13472#: builtin/commit-tree.c:131
d46c5519
JX
13473msgid "must give exactly one tree"
13474msgstr "必须精确地提供一个树"
13475
7e6630a7 13476#: builtin/commit-tree.c:138
d46c5519 13477msgid "git commit-tree: failed to read"
65387fd5 13478msgstr "git commit-tree:无法读取"
d46c5519 13479
7e6630a7 13480#: builtin/commit.c:42
814ff314 13481msgid "git commit [<options>] [--] <pathspec>..."
160fb2b2 13482msgstr "git commit [<选项>] [--] <路径规格>..."
ef317cd5 13483
7e6630a7 13484#: builtin/commit.c:47
814ff314 13485msgid "git status [<options>] [--] <pathspec>..."
160fb2b2 13486msgstr "git status [<选项>] [--] <路径规格>..."
ef317cd5 13487
7e6630a7 13488#: builtin/commit.c:52
c04f5ac3
JX
13489msgid ""
13490"You asked to amend the most recent commit, but doing so would make\n"
13491"it empty. You can repeat your command with --allow-empty, or you can\n"
13492"remove the commit entirely with \"git reset HEAD^\".\n"
13493msgstr ""
1b150dc9
T
13494"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
13495"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 13496
7e6630a7 13497#: builtin/commit.c:57
c04f5ac3
JX
13498msgid ""
13499"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
13500"If you wish to commit it anyway, use:\n"
13501"\n"
13502" git commit --allow-empty\n"
13503"\n"
c04f5ac3 13504msgstr ""
a9ce4543
T
13505"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
13506"也要提交,使用命令:\n"
c04f5ac3
JX
13507"\n"
13508" git commit --allow-empty\n"
13509"\n"
c04f5ac3 13510
7e6630a7 13511#: builtin/commit.c:64
349ede6a
JX
13512msgid "Otherwise, please use 'git rebase --skip'\n"
13513msgstr "否则,请使用 'git rebase --skip'\n"
13514
7e6630a7 13515#: builtin/commit.c:67
a6cd2cc4
JX
13516msgid "Otherwise, please use 'git cherry-pick --skip'\n"
13517msgstr "否则,请使用 'git cherry-pick --skip'\n"
b1894384 13518
7e6630a7 13519#: builtin/commit.c:70
b1894384 13520msgid ""
a6cd2cc4
JX
13521"and then use:\n"
13522"\n"
13523" git cherry-pick --continue\n"
13524"\n"
13525"to resume cherry-picking the remaining commits.\n"
b1894384
JX
13526"If you wish to skip this commit, use:\n"
13527"\n"
a6cd2cc4 13528" git cherry-pick --skip\n"
b1894384 13529"\n"
b1894384 13530msgstr ""
a6cd2cc4
JX
13531"然后使用:\n"
13532"\n"
13533" git cherry-pick --continue\n"
b1894384 13534"\n"
a6cd2cc4
JX
13535"来继续拣选剩余提交。如果您想跳过此提交,使用:\n"
13536"\n"
13537" git cherry-pick --skip\n"
b1894384 13538"\n"
b1894384 13539
7e6630a7 13540#: builtin/commit.c:325
c04f5ac3 13541msgid "failed to unpack HEAD tree object"
65387fd5 13542msgstr "无法解包 HEAD 树对象"
ddc12c42 13543
7e6630a7 13544#: builtin/commit.c:375
ddc12c42
JX
13545msgid "No paths with --include/--only does not make sense."
13546msgstr "参数 --include/--only 不跟路径没有意义。"
13547
7e6630a7 13548#: builtin/commit.c:387
c04f5ac3 13549msgid "unable to create temporary index"
90e6ef53 13550msgstr "不能创建临时索引"
c04f5ac3 13551
7e6630a7 13552#: builtin/commit.c:396
c04f5ac3
JX
13553msgid "interactive add failed"
13554msgstr "交互式添加失败"
13555
7e6630a7 13556#: builtin/commit.c:411
220c313c
JX
13557msgid "unable to update temporary index"
13558msgstr "无法更新临时索引"
13559
7e6630a7 13560#: builtin/commit.c:413
220c313c
JX
13561msgid "Failed to update main cache tree"
13562msgstr "不能更新树的主缓存"
13563
7e6630a7 13564#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509
c04f5ac3 13565msgid "unable to write new_index file"
90e6ef53 13566msgstr "无法写 new_index 文件"
c04f5ac3 13567
7e6630a7 13568#: builtin/commit.c:490
8ada9598 13569msgid "cannot do a partial commit during a merge."
81809b99 13570msgstr "在合并过程中不能做部分提交。"
c04f5ac3 13571
7e6630a7 13572#: builtin/commit.c:492
8ada9598 13573msgid "cannot do a partial commit during a cherry-pick."
81809b99 13574msgstr "在拣选过程中不能做部分提交。"
8ada9598 13575
7e6630a7 13576#: builtin/commit.c:494
349ede6a
JX
13577msgid "cannot do a partial commit during a rebase."
13578msgstr "在变基过程中不能做部分提交。"
13579
7e6630a7 13580#: builtin/commit.c:502
c04f5ac3 13581msgid "cannot read the index"
90e6ef53 13582msgstr "无法读取索引"
c04f5ac3 13583
7e6630a7 13584#: builtin/commit.c:521
c04f5ac3 13585msgid "unable to write temporary index file"
90e6ef53 13586msgstr "无法写临时索引文件"
c04f5ac3 13587
7e6630a7 13588#: builtin/commit.c:619
220c313c
JX
13589#, c-format
13590msgid "commit '%s' lacks author header"
13591msgstr "提交 '%s' 缺少作者信息"
13592
7e6630a7 13593#: builtin/commit.c:621
c04f5ac3 13594#, c-format
220c313c 13595msgid "commit '%s' has malformed author line"
fd8cb379 13596msgstr "提交 '%s' 有格式错误的作者信息"
c04f5ac3 13597
7e6630a7 13598#: builtin/commit.c:640
c04f5ac3 13599msgid "malformed --author parameter"
fd8cb379 13600msgstr "格式错误的 --author 参数"
c04f5ac3 13601
7e6630a7 13602#: builtin/commit.c:693
6acbf033
JX
13603msgid ""
13604"unable to select a comment character that is not used\n"
13605"in the current commit message"
13606msgstr "无法选择一个未被当前提交说明使用的注释字符"
13607
7e6630a7 13608#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166
c04f5ac3
JX
13609#, c-format
13610msgid "could not lookup commit %s"
13611msgstr "不能查询提交 %s"
13612
7e6630a7 13613#: builtin/commit.c:759 builtin/shortlog.c:416
c04f5ac3
JX
13614#, c-format
13615msgid "(reading log message from standard input)\n"
90e6ef53 13616msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 13617
7e6630a7 13618#: builtin/commit.c:761
c04f5ac3 13619msgid "could not read log from standard input"
90e6ef53 13620msgstr "不能从标准输入中读取日志信息"
c04f5ac3 13621
7e6630a7 13622#: builtin/commit.c:765
c04f5ac3
JX
13623#, c-format
13624msgid "could not read log file '%s'"
90e6ef53 13625msgstr "不能读取日志文件 '%s'"
c04f5ac3 13626
7e6630a7 13627#: builtin/commit.c:802
33b62fba 13628#, c-format
65387fd5
FZ
13629msgid "options '%s' and '%s:%s' cannot be used together"
13630msgstr "选项 '%s' 和 '%s:%s' 不能同时使用"
33b62fba 13631
7e6630a7 13632#: builtin/commit.c:814 builtin/commit.c:830
c04f5ac3 13633msgid "could not read SQUASH_MSG"
90e6ef53 13634msgstr "不能读取 SQUASH_MSG"
c04f5ac3 13635
7e6630a7 13636#: builtin/commit.c:821
5b04ee3b
JX
13637msgid "could not read MERGE_MSG"
13638msgstr "不能读取 MERGE_MSG"
13639
7e6630a7 13640#: builtin/commit.c:881
c04f5ac3 13641msgid "could not write commit template"
90e6ef53 13642msgstr "不能写提交模版"
c04f5ac3 13643
7e6630a7 13644#: builtin/commit.c:894
ec3d4607
JX
13645#, c-format
13646msgid ""
13647"Please enter the commit message for your changes. Lines starting\n"
13648"with '%c' will be ignored.\n"
13649msgstr "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略。\n"
13650
7e6630a7 13651#: builtin/commit.c:896
ec3d4607
JX
13652#, c-format
13653msgid ""
13654"Please enter the commit message for your changes. Lines starting\n"
13655"with '%c' will be ignored, and an empty message aborts the commit.\n"
13656msgstr ""
13657"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
13658"说明将会终止提交。\n"
13659
7e6630a7 13660#: builtin/commit.c:900
ec3d4607
JX
13661#, c-format
13662msgid ""
13663"Please enter the commit message for your changes. Lines starting\n"
13664"with '%c' will be kept; you may remove them yourself if you want to.\n"
13665msgstr ""
13666"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您愿意\n"
13667"也可以删除它们。\n"
13668
7e6630a7 13669#: builtin/commit.c:904
ec3d4607
JX
13670#, c-format
13671msgid ""
13672"Please enter the commit message for your changes. Lines starting\n"
13673"with '%c' will be kept; you may remove them yourself if you want to.\n"
13674"An empty message aborts the commit.\n"
13675msgstr ""
13676"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您愿意\n"
13677"也可以删除它们。一个空的提交说明将会终止提交。\n"
13678
7e6630a7 13679#: builtin/commit.c:916
c04f5ac3
JX
13680msgid ""
13681"\n"
8ada9598 13682"It looks like you may be committing a merge.\n"
d9488fea
JX
13683"If this is not correct, please run\n"
13684"\tgit update-ref -d MERGE_HEAD\n"
c04f5ac3
JX
13685"and try again.\n"
13686msgstr ""
13687"\n"
d9488fea
JX
13688"似乎您正在做一个合并提交。如果不对,请运行\n"
13689"\tgit update-ref -d MERGE_HEAD\n"
c04f5ac3
JX
13690"然后重试。\n"
13691
7e6630a7 13692#: builtin/commit.c:921
8ada9598
JX
13693msgid ""
13694"\n"
13695"It looks like you may be committing a cherry-pick.\n"
d9488fea
JX
13696"If this is not correct, please run\n"
13697"\tgit update-ref -d CHERRY_PICK_HEAD\n"
8ada9598
JX
13698"and try again.\n"
13699msgstr ""
13700"\n"
d9488fea
JX
13701"似乎您正在做一个拣选提交。如果不对,请运行\n"
13702"\tgit update-ref -d CHERRY_PICK_HEAD\n"
8ada9598 13703"然后重试。\n"
c04f5ac3 13704
90e6ef53 13705# 译者:为保证在输出中对齐,注意调整句中空格!
7e6630a7 13706#: builtin/commit.c:948
6acbf033
JX
13707#, c-format
13708msgid "%sAuthor: %.*s <%.*s>"
13709msgstr "%s作者: %.*s <%.*s>"
13710
13711# 译者:为保证在输出中对齐,注意调整句中空格!
7e6630a7 13712#: builtin/commit.c:956
c04f5ac3 13713#, c-format
6acbf033
JX
13714msgid "%sDate: %s"
13715msgstr "%s日期: %s"
c04f5ac3 13716
90e6ef53 13717# 译者:为保证在输出中对齐,注意调整句中空格!
7e6630a7 13718#: builtin/commit.c:963
c04f5ac3 13719#, c-format
6acbf033
JX
13720msgid "%sCommitter: %.*s <%.*s>"
13721msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 13722
7e6630a7 13723#: builtin/commit.c:981
c04f5ac3 13724msgid "Cannot read index"
90e6ef53 13725msgstr "无法读取索引"
c04f5ac3 13726
7e6630a7 13727#: builtin/commit.c:1026
33b62fba
JX
13728msgid "unable to pass trailers to --trailers"
13729msgstr "无法将尾注传递给 --trailers"
13730
7e6630a7 13731#: builtin/commit.c:1066
c04f5ac3
JX
13732msgid "Error building trees"
13733msgstr "无法创建树对象"
13734
65387fd5 13735#: builtin/commit.c:1080 builtin/tag.c:316
c04f5ac3
JX
13736#, c-format
13737msgid "Please supply the message using either -m or -F option.\n"
07432cef 13738msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 13739
7e6630a7 13740#: builtin/commit.c:1124
c04f5ac3 13741#, c-format
814ff314 13742msgid "--author '%s' is not 'Name <email>' and matches no existing author"
58b6f078 13743msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配"
c04f5ac3 13744
7e6630a7 13745#: builtin/commit.c:1138
5809aa05
JX
13746#, c-format
13747msgid "Invalid ignored mode '%s'"
13748msgstr "无效的忽略模式 '%s'"
13749
65387fd5 13750#: builtin/commit.c:1156 builtin/commit.c:1451
c04f5ac3
JX
13751#, c-format
13752msgid "Invalid untracked files mode '%s'"
65387fd5 13753msgstr "无效的未跟踪文件参数 '%s'"
2e8451e8 13754
7e6630a7 13755#: builtin/commit.c:1227
33b62fba
JX
13756msgid "You are in the middle of a merge -- cannot reword."
13757msgstr "您正处于一个合并过程中 -- 无法改写说明。"
13758
7e6630a7 13759#: builtin/commit.c:1229
33b62fba
JX
13760msgid "You are in the middle of a cherry-pick -- cannot reword."
13761msgstr "您正处于一个拣选过程中 -- 无法改写说明。"
13762
7e6630a7 13763#: builtin/commit.c:1232
33b62fba 13764#, c-format
65387fd5
FZ
13765msgid "reword option of '%s' and path '%s' cannot be used together"
13766msgstr "改写说明选项 '%s' 和路径 '%s' 不能同时使用"
33b62fba 13767
7e6630a7 13768#: builtin/commit.c:1234
65387fd5
FZ
13769#, c-format
13770msgid "reword option of '%s' and '%s' cannot be used together"
13771msgstr "改写说明选项 '%s' 和 '%s' 不能同时使用"
33b62fba 13772
65387fd5 13773#: builtin/commit.c:1254
c04f5ac3
JX
13774msgid "Using both --reset-author and --author does not make sense"
13775msgstr "同时使用 --reset-author 和 --author 没有意义"
13776
65387fd5 13777#: builtin/commit.c:1261
c04f5ac3 13778msgid "You have nothing to amend."
90e6ef53 13779msgstr "您没有可修补的提交。"
c04f5ac3 13780
65387fd5 13781#: builtin/commit.c:1264
8ada9598 13782msgid "You are in the middle of a merge -- cannot amend."
81809b99 13783msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 13784
65387fd5 13785#: builtin/commit.c:1266
8ada9598 13786msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 13787msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 13788
65387fd5 13789#: builtin/commit.c:1268
349ede6a
JX
13790msgid "You are in the middle of a rebase -- cannot amend."
13791msgstr "您正处于一个变基过程中 -- 无法修补提交。"
13792
65387fd5 13793#: builtin/commit.c:1271
c04f5ac3 13794msgid "Options --squash and --fixup cannot be used together"
649900bc 13795msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 13796
65387fd5 13797#: builtin/commit.c:1281
c04f5ac3
JX
13798msgid "Only one of -c/-C/-F/--fixup can be used."
13799msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
13800
65387fd5 13801#: builtin/commit.c:1283
31e5e17b
JX
13802msgid "Option -m cannot be combined with -c/-C/-F."
13803msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
c04f5ac3 13804
65387fd5 13805#: builtin/commit.c:1292
c04f5ac3 13806msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 13807msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 13808
65387fd5 13809#: builtin/commit.c:1310
c04f5ac3
JX
13810msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
13811msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
13812
65387fd5 13813#: builtin/commit.c:1338
33b62fba
JX
13814#, c-format
13815msgid "unknown option: --fixup=%s:%s"
13816msgstr "未知选项:--fixup=%s:%s"
13817
65387fd5 13818#: builtin/commit.c:1355
c04f5ac3 13819#, c-format
d46c5519
JX
13820msgid "paths '%s ...' with -a does not make sense"
13821msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"
c04f5ac3 13822
65387fd5 13823#: builtin/commit.c:1486 builtin/commit.c:1655
ef317cd5 13824msgid "show status concisely"
07432cef 13825msgstr "以简洁的格式显示状态"
ef317cd5 13826
65387fd5 13827#: builtin/commit.c:1488 builtin/commit.c:1657
ef317cd5 13828msgid "show branch information"
07432cef 13829msgstr "显示分支信息"
ef317cd5 13830
65387fd5 13831#: builtin/commit.c:1490
a4f16749
JX
13832msgid "show stash information"
13833msgstr "显示贮藏区信息"
13834
65387fd5 13835#: builtin/commit.c:1492 builtin/commit.c:1659
31e5e17b
JX
13836msgid "compute full ahead/behind values"
13837msgstr "计算完整的领先/落后值"
13838
65387fd5 13839#: builtin/commit.c:1494
a0b6b246
JX
13840msgid "version"
13841msgstr "版本"
13842
65387fd5
FZ
13843#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
13844#: builtin/worktree.c:690
ef317cd5 13845msgid "machine-readable output"
07432cef
WS
13846msgstr "机器可读的输出"
13847
65387fd5 13848#: builtin/commit.c:1497 builtin/commit.c:1663
07432cef
WS
13849msgid "show status in long format (default)"
13850msgstr "以长格式显示状态(默认)"
ef317cd5 13851
65387fd5 13852#: builtin/commit.c:1500 builtin/commit.c:1666
ef317cd5 13853msgid "terminate entries with NUL"
4375c10e 13854msgstr "条目以 NUL 字符结尾"
ef317cd5 13855
65387fd5
FZ
13856#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
13857#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
13858#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
ef317cd5 13859msgid "mode"
07432cef 13860msgstr "模式"
ef317cd5 13861
65387fd5 13862#: builtin/commit.c:1503 builtin/commit.c:1669
ef317cd5 13863msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 13864msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 13865
65387fd5 13866#: builtin/commit.c:1507
5809aa05
JX
13867msgid ""
13868"show ignored files, optional modes: traditional, matching, no. (Default: "
13869"traditional)"
31e5e17b
JX
13870msgstr ""
13871"显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)"
ef317cd5 13872
65387fd5 13873#: builtin/commit.c:1509 parse-options.h:192
ef317cd5
JX
13874msgid "when"
13875msgstr "何时"
13876
65387fd5 13877#: builtin/commit.c:1510
ef317cd5
JX
13878msgid ""
13879"ignore changes to submodules, optional when: all, dirty, untracked. "
13880"(Default: all)"
13881msgstr ""
07432cef 13882"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 13883
65387fd5 13884#: builtin/commit.c:1512
ef317cd5 13885msgid "list untracked files in columns"
07432cef 13886msgstr "以列的方式显示未跟踪的文件"
ef317cd5 13887
65387fd5 13888#: builtin/commit.c:1513
fd8cb379
JX
13889msgid "do not detect renames"
13890msgstr "不检测重命名"
13891
65387fd5 13892#: builtin/commit.c:1515
fd8cb379
JX
13893msgid "detect renames, optionally set similarity index"
13894msgstr "检测重命名,可以设置索引相似度"
13895
65387fd5 13896#: builtin/commit.c:1538
5809aa05
JX
13897msgid "Unsupported combination of ignored and untracked-files arguments"
13898msgstr "不支持已忽略和未跟踪文件参数的组合"
13899
65387fd5 13900#: builtin/commit.c:1620
ef317cd5 13901msgid "suppress summary after successful commit"
07432cef 13902msgstr "提交成功后不显示概述信息"
c04f5ac3 13903
65387fd5 13904#: builtin/commit.c:1621
ef317cd5 13905msgid "show diff in commit message template"
07432cef 13906msgstr "在提交说明模板里显示差异"
c04f5ac3 13907
65387fd5 13908#: builtin/commit.c:1623
ef317cd5 13909msgid "Commit message options"
07432cef 13910msgstr "提交说明选项"
c04f5ac3 13911
65387fd5 13912#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
ef317cd5 13913msgid "read message from file"
07432cef 13914msgstr "从文件中读取提交说明"
c04f5ac3 13915
65387fd5 13916#: builtin/commit.c:1625
ef317cd5 13917msgid "author"
07432cef 13918msgstr "作者"
c04f5ac3 13919
65387fd5 13920#: builtin/commit.c:1625
ef317cd5 13921msgid "override author for commit"
07432cef 13922msgstr "提交时覆盖作者"
73a60cd2 13923
65387fd5 13924#: builtin/commit.c:1626 builtin/gc.c:551
ef317cd5 13925msgid "date"
07432cef 13926msgstr "日期"
c04f5ac3 13927
65387fd5 13928#: builtin/commit.c:1626
ef317cd5 13929msgid "override date for commit"
07432cef 13930msgstr "提交时覆盖日期"
c04f5ac3 13931
65387fd5
FZ
13932#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
13933#: parse-options.h:329 ref-filter.h:89
94550ed3
JX
13934msgid "commit"
13935msgstr "提交"
13936
65387fd5 13937#: builtin/commit.c:1628
ef317cd5 13938msgid "reuse and edit message from specified commit"
07432cef 13939msgstr "重用并编辑指定提交的提交说明"
ef317cd5 13940
65387fd5 13941#: builtin/commit.c:1629
ef317cd5 13942msgid "reuse message from specified commit"
07432cef 13943msgstr "重用指定提交的提交说明"
ef317cd5 13944
33b62fba
JX
13945#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
13946#. and only translate <commit>.
13947#.
65387fd5 13948#: builtin/commit.c:1634
33b62fba
JX
13949msgid "[(amend|reword):]commit"
13950msgstr "[(amend|reword):]提交"
13951
65387fd5 13952#: builtin/commit.c:1634
33b62fba
JX
13953msgid ""
13954"use autosquash formatted message to fixup or amend/reword specified commit"
13955msgstr "使用自动挤压格式的提交说明对指定的提交进行修正、修补或改写说明"
ef317cd5 13956
65387fd5 13957#: builtin/commit.c:1635
ef317cd5 13958msgid "use autosquash formatted message to squash specified commit"
33b62fba 13959msgstr "使用自动挤压格式的提交说明用以挤压至指定的提交"
ef317cd5 13960
65387fd5 13961#: builtin/commit.c:1636
ef317cd5 13962msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 13963msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 13964
65387fd5 13965#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
33b62fba
JX
13966msgid "trailer"
13967msgstr "尾注"
13968
65387fd5 13969#: builtin/commit.c:1637
33b62fba
JX
13970msgid "add custom trailer(s)"
13971msgstr "添加自定义尾注"
13972
65387fd5 13973#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
ffa14514 13974#: builtin/pull.c:146 builtin/revert.c:110
d13389bf
JX
13975msgid "add a Signed-off-by trailer"
13976msgstr "添加 Signed-off-by 尾注"
ef317cd5 13977
65387fd5 13978#: builtin/commit.c:1639
ef317cd5 13979msgid "use specified template file"
07432cef 13980msgstr "使用指定的模板文件"
ef317cd5 13981
65387fd5 13982#: builtin/commit.c:1640
ef317cd5 13983msgid "force edit of commit"
07432cef 13984msgstr "强制编辑提交"
ef317cd5 13985
65387fd5 13986#: builtin/commit.c:1642
ef317cd5 13987msgid "include status in commit message template"
07432cef 13988msgstr "在提交说明模板里包含状态信息"
ef317cd5 13989
65387fd5 13990#: builtin/commit.c:1647
ef317cd5 13991msgid "Commit contents options"
07432cef 13992msgstr "提交内容选项"
ef317cd5 13993
65387fd5 13994#: builtin/commit.c:1648
ef317cd5 13995msgid "commit all changed files"
07432cef 13996msgstr "提交所有改动的文件"
ef317cd5 13997
65387fd5 13998#: builtin/commit.c:1649
ef317cd5 13999msgid "add specified files to index for commit"
07432cef 14000msgstr "添加指定的文件到索引区等待提交"
ef317cd5 14001
65387fd5 14002#: builtin/commit.c:1650
ef317cd5 14003msgid "interactively add files"
07432cef 14004msgstr "交互式添加文件"
ef317cd5 14005
65387fd5 14006#: builtin/commit.c:1651
ef317cd5 14007msgid "interactively add changes"
07432cef 14008msgstr "交互式添加变更"
ef317cd5 14009
65387fd5 14010#: builtin/commit.c:1652
ef317cd5 14011msgid "commit only specified files"
07432cef 14012msgstr "只提交指定的文件"
ef317cd5 14013
65387fd5 14014#: builtin/commit.c:1653
5c57d762
JX
14015msgid "bypass pre-commit and commit-msg hooks"
14016msgstr "绕过 pre-commit 和 commit-msg 钩子"
14017
65387fd5 14018#: builtin/commit.c:1654
ef317cd5 14019msgid "show what would be committed"
07432cef 14020msgstr "显示将要提交的内容"
ef317cd5 14021
65387fd5 14022#: builtin/commit.c:1667
ef317cd5 14023msgid "amend previous commit"
07432cef 14024msgstr "修改先前的提交"
ef317cd5 14025
65387fd5 14026#: builtin/commit.c:1668
ef317cd5 14027msgid "bypass post-rewrite hook"
07432cef 14028msgstr "绕过 post-rewrite 钩子"
ef317cd5 14029
65387fd5 14030#: builtin/commit.c:1675
ef317cd5 14031msgid "ok to record an empty change"
07432cef 14032msgstr "允许一个空提交"
ef317cd5 14033
65387fd5 14034#: builtin/commit.c:1677
ef317cd5 14035msgid "ok to record a change with an empty message"
07432cef 14036msgstr "允许空的提交说明"
ef317cd5 14037
65387fd5 14038#: builtin/commit.c:1753
c04f5ac3
JX
14039#, c-format
14040msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 14041msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 14042
65387fd5 14043#: builtin/commit.c:1760
c04f5ac3 14044msgid "could not read MERGE_MODE"
90e6ef53 14045msgstr "不能读取 MERGE_MODE"
c04f5ac3 14046
65387fd5 14047#: builtin/commit.c:1781
c04f5ac3
JX
14048#, c-format
14049msgid "could not read commit message: %s"
90e6ef53 14050msgstr "不能读取提交说明:%s"
c04f5ac3 14051
65387fd5 14052#: builtin/commit.c:1788
c04f5ac3
JX
14053#, c-format
14054msgid "Aborting commit due to empty commit message.\n"
14055msgstr "终止提交因为提交说明为空。\n"
14056
65387fd5 14057#: builtin/commit.c:1793
6937cb4e
JX
14058#, c-format
14059msgid "Aborting commit; you did not edit the message.\n"
14060msgstr "终止提交;您未更改来自模版的提交说明。\n"
14061
65387fd5 14062#: builtin/commit.c:1804
33b62fba
JX
14063#, c-format
14064msgid "Aborting commit due to empty commit message body.\n"
7b4d4954 14065msgstr "因提交说明的正文为空而终止提交。\n"
33b62fba 14066
65387fd5 14067#: builtin/commit.c:1840
c04f5ac3 14068msgid ""
c1ac5258 14069"repository has been updated, but unable to write\n"
220c313c 14070"new_index file. Check that disk is not full and quota is\n"
a6cd2cc4 14071"not exceeded, and then \"git restore --staged :/\" to recover."
c04f5ac3 14072msgstr ""
a6cd2cc4
JX
14073"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满或\n"
14074"磁盘配额已耗尽,然后执行 \"git restore --staged :/\" 恢复。"
c04f5ac3 14075
4c27fcb5 14076#: builtin/config.c:11
814ff314
JX
14077msgid "git config [<options>]"
14078msgstr "git config [<选项>]"
ef317cd5 14079
d13389bf 14080#: builtin/config.c:109 builtin/env--helper.c:27
fd8cb379
JX
14081#, c-format
14082msgid "unrecognized --type argument, %s"
14083msgstr "未能识别的 --type 参数,%s"
14084
d13389bf 14085#: builtin/config.c:121
c1ac5258
JX
14086msgid "only one type at a time"
14087msgstr "一次只能一个类型"
14088
d13389bf 14089#: builtin/config.c:130
ef317cd5 14090msgid "Config file location"
07432cef 14091msgstr "配置文件位置"
ef317cd5 14092
d13389bf 14093#: builtin/config.c:131
ef317cd5 14094msgid "use global config file"
07432cef 14095msgstr "使用全局配置文件"
ef317cd5 14096
d13389bf 14097#: builtin/config.c:132
ef317cd5 14098msgid "use system config file"
07432cef 14099msgstr "使用系统级配置文件"
ef317cd5 14100
d13389bf 14101#: builtin/config.c:133
ef317cd5 14102msgid "use repository config file"
160fb2b2 14103msgstr "使用仓库级配置文件"
ef317cd5 14104
d13389bf 14105#: builtin/config.c:134
4c27fcb5
JX
14106msgid "use per-worktree config file"
14107msgstr "使用工作区级别的配置文件"
14108
d13389bf 14109#: builtin/config.c:135
ef317cd5 14110msgid "use given config file"
07432cef 14111msgstr "使用指定的配置文件"
ef317cd5 14112
d13389bf 14113#: builtin/config.c:136
2e8451e8 14114msgid "blob-id"
4375c10e 14115msgstr "数据对象 ID"
2e8451e8 14116
d13389bf 14117#: builtin/config.c:136
2e8451e8
JX
14118msgid "read config from given blob object"
14119msgstr "从给定的数据对象读取配置"
14120
d13389bf 14121#: builtin/config.c:137
ef317cd5 14122msgid "Action"
07432cef 14123msgstr "操作"
ef317cd5 14124
d9488fea 14125#: builtin/config.c:138
d13389bf
JX
14126msgid "get value: name [value-pattern]"
14127msgstr "获取值:名称 [值模式]"
ef317cd5 14128
d9488fea 14129#: builtin/config.c:139
d13389bf
JX
14130msgid "get all values: key [value-pattern]"
14131msgstr "获得所有的值:键 [值模式]"
90314792 14132
d9488fea 14133#: builtin/config.c:140
d13389bf
JX
14134msgid "get values for regexp: name-regex [value-pattern]"
14135msgstr "根据正则表达式获得值:名称正则 [值模式]"
ef317cd5 14136
d9488fea 14137#: builtin/config.c:141
d13389bf
JX
14138msgid "get value specific for the URL: section[.var] URL"
14139msgstr "获得 URL 取值:section[.var] URL"
ef317cd5 14140
d9488fea 14141#: builtin/config.c:142
d13389bf
JX
14142msgid "replace all matching variables: name value [value-pattern]"
14143msgstr "替换所有匹配的变量:名称 值 [值模式]"
ef317cd5 14144
d9488fea 14145#: builtin/config.c:143
d13389bf
JX
14146msgid "add a new variable: name value"
14147msgstr "添加一个新的变量:名称 值"
ef317cd5 14148
d9488fea 14149#: builtin/config.c:144
d13389bf
JX
14150msgid "remove a variable: name [value-pattern]"
14151msgstr "删除一个变量:名称 [值模式]"
14152
14153#: builtin/config.c:145
14154msgid "remove all matches: name [value-pattern]"
14155msgstr "删除所有匹配项:名称 [值模式]"
14156
14157#: builtin/config.c:146
ef317cd5 14158msgid "rename section: old-name new-name"
07432cef 14159msgstr "重命名小节:old-name new-name"
ef317cd5 14160
d13389bf 14161#: builtin/config.c:147
ef317cd5 14162msgid "remove a section: name"
07432cef 14163msgstr "删除一个小节:name"
ef317cd5 14164
d13389bf 14165#: builtin/config.c:148
ef317cd5 14166msgid "list all"
07432cef 14167msgstr "列出所有"
ef317cd5 14168
d13389bf
JX
14169#: builtin/config.c:149
14170msgid "use string equality when comparing values to 'value-pattern'"
14171msgstr "在比较值与 '值模式' 时,使用字符串字面比较"
14172
14173#: builtin/config.c:150
ef317cd5 14174msgid "open an editor"
07432cef 14175msgstr "打开一个编辑器"
ef317cd5 14176
d13389bf 14177#: builtin/config.c:151
04cb2f28
JX
14178msgid "find the color configured: slot [default]"
14179msgstr "获得配置的颜色:配置 [默认]"
ef317cd5 14180
d13389bf 14181#: builtin/config.c:152
04cb2f28
JX
14182msgid "find the color setting: slot [stdout-is-tty]"
14183msgstr "获得颜色设置:配置 [stdout-is-tty]"
ef317cd5 14184
d13389bf 14185#: builtin/config.c:153
ef317cd5 14186msgid "Type"
07432cef 14187msgstr "类型"
ef317cd5 14188
d13389bf 14189#: builtin/config.c:154 builtin/env--helper.c:43
fd8cb379
JX
14190msgid "value is given this type"
14191msgstr "取值为该类型"
14192
d13389bf 14193#: builtin/config.c:155
ef317cd5 14194msgid "value is \"true\" or \"false\""
07432cef 14195msgstr "值是 \"true\" 或 \"false\""
ef317cd5 14196
d13389bf 14197#: builtin/config.c:156
ef317cd5 14198msgid "value is decimal number"
07432cef 14199msgstr "值是十进制数"
ef317cd5 14200
d13389bf 14201#: builtin/config.c:157
ef317cd5 14202msgid "value is --bool or --int"
d9488fea 14203msgstr "值是 --bool 或 --int"
ef317cd5 14204
d13389bf 14205#: builtin/config.c:158
d9488fea
JX
14206msgid "value is --bool or string"
14207msgstr "值是 --bool 或字符串"
14208
d13389bf 14209#: builtin/config.c:159
ef317cd5 14210msgid "value is a path (file or directory name)"
07432cef 14211msgstr "值是一个路径(文件或目录名)"
ef317cd5 14212
d13389bf 14213#: builtin/config.c:160
5809aa05
JX
14214msgid "value is an expiry date"
14215msgstr "值是一个到期日期"
14216
d13389bf 14217#: builtin/config.c:161
ef317cd5 14218msgid "Other"
07432cef 14219msgstr "其它"
ef317cd5 14220
d13389bf 14221#: builtin/config.c:162
ef317cd5 14222msgid "terminate values with NUL byte"
4375c10e 14223msgstr "终止值是 NUL 字节"
ef317cd5 14224
d13389bf 14225#: builtin/config.c:163
1b7f4a34
JX
14226msgid "show variable names only"
14227msgstr "只显示变量名"
14228
d13389bf 14229#: builtin/config.c:164
ef317cd5 14230msgid "respect include directives on lookup"
07432cef 14231msgstr "查询时参照 include 指令递归查找"
ef317cd5 14232
d13389bf 14233#: builtin/config.c:165
276ceeaa
JX
14234msgid "show origin of config (file, standard input, blob, command line)"
14235msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
14236
d13389bf 14237#: builtin/config.c:166
2b472aae 14238msgid "show scope of config (worktree, local, global, system, command)"
440e7442 14239msgstr "显示配置的作用域(工作区、本地、全局、系统、命令)"
2b472aae 14240
d13389bf 14241#: builtin/config.c:167 builtin/env--helper.c:45
fd8cb379
JX
14242msgid "value"
14243msgstr "取值"
14244
d13389bf 14245#: builtin/config.c:167
fd8cb379
JX
14246msgid "with --get, use default value when missing entry"
14247msgstr "使用 --get 参数,当缺少设置时使用默认值"
14248
d13389bf 14249#: builtin/config.c:181
c1ac5258
JX
14250#, c-format
14251msgid "wrong number of arguments, should be %d"
14252msgstr "错误的参数个数,应该为 %d 个"
14253
d13389bf 14254#: builtin/config.c:183
c1ac5258
JX
14255#, c-format
14256msgid "wrong number of arguments, should be from %d to %d"
14257msgstr "错误的参数个数,应该为从 %d 个到 %d 个"
14258
d13389bf 14259#: builtin/config.c:339
c1ac5258
JX
14260#, c-format
14261msgid "invalid key pattern: %s"
14262msgstr "无效键名模式:%s"
14263
d13389bf 14264#: builtin/config.c:377
fd8cb379
JX
14265#, c-format
14266msgid "failed to format default config value: %s"
65387fd5 14267msgstr "无法格式化默认配置值:%s"
c1ac5258 14268
d13389bf 14269#: builtin/config.c:441
c1ac5258
JX
14270#, c-format
14271msgid "cannot parse color '%s'"
14272msgstr "无法解析颜色 '%s'"
fd8cb379 14273
d13389bf 14274#: builtin/config.c:483
220c313c 14275msgid "unable to parse default color value"
c1ac5258
JX
14276msgstr "无法解析默认颜色值"
14277
d13389bf 14278#: builtin/config.c:536 builtin/config.c:833
c1ac5258
JX
14279msgid "not in a git directory"
14280msgstr "不在 git 仓库中"
14281
d13389bf 14282#: builtin/config.c:539
c1ac5258
JX
14283msgid "writing to stdin is not supported"
14284msgstr "不支持写到标准输入"
14285
d13389bf 14286#: builtin/config.c:542
c1ac5258
JX
14287msgid "writing config blobs is not supported"
14288msgstr "不支持写到配置数据对象"
220c313c 14289
d13389bf 14290#: builtin/config.c:627
220c313c
JX
14291#, c-format
14292msgid ""
14293"# This is Git's per-user configuration file.\n"
7aea43ff 14294"[user]\n"
220c313c 14295"# Please adapt and uncomment the following lines:\n"
7aea43ff 14296"#\tname = %s\n"
220c313c
JX
14297"#\temail = %s\n"
14298msgstr ""
14299"# This is Git's per-user configuration file.\n"
7aea43ff 14300"[user]\n"
220c313c 14301"# Please adapt and uncomment the following lines:\n"
7aea43ff 14302"#\tname = %s\n"
220c313c
JX
14303"#\temail = %s\n"
14304
d13389bf 14305#: builtin/config.c:652
c1ac5258
JX
14306msgid "only one config file at a time"
14307msgstr "一次只能有一个配置文件"
14308
d13389bf 14309#: builtin/config.c:658
a4f16749 14310msgid "--local can only be used inside a git repository"
d9488fea 14311msgstr "--local 只能在 git 仓库内使用"
a4f16749 14312
d13389bf 14313#: builtin/config.c:660
fd8cb379 14314msgid "--blob can only be used inside a git repository"
d9488fea
JX
14315msgstr "--blob 只能在 git 仓库内使用"
14316
d13389bf 14317#: builtin/config.c:662
d9488fea
JX
14318msgid "--worktree can only be used inside a git repository"
14319msgstr "--worktree 只能在 git 仓库内使用"
fd8cb379 14320
d13389bf 14321#: builtin/config.c:684
c1ac5258
JX
14322msgid "$HOME not set"
14323msgstr "$HOME 未设置"
14324
d13389bf 14325#: builtin/config.c:708
4c27fcb5
JX
14326msgid ""
14327"--worktree cannot be used with multiple working trees unless the config\n"
14328"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
14329"section in \"git help worktree\" for details"
14330msgstr ""
14331"不能和多个工作区一起使用 --worktree,除非启用 worktreeConfig 配置扩展。\n"
14332"详情请阅读“git help worktree”的“CONFIGURATION FILE”小节"
14333
d13389bf 14334#: builtin/config.c:743
c1ac5258
JX
14335msgid "--get-color and variable type are incoherent"
14336msgstr "--get-color 和变量类型不兼容"
14337
d13389bf 14338#: builtin/config.c:748
c1ac5258
JX
14339msgid "only one action at a time"
14340msgstr "一次只能有一个动作"
14341
d13389bf 14342#: builtin/config.c:761
c1ac5258
JX
14343msgid "--name-only is only applicable to --list or --get-regexp"
14344msgstr "--name-only 仅适用于 --list 或 --get-regexp"
14345
d13389bf 14346#: builtin/config.c:767
c1ac5258
JX
14347msgid ""
14348"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
14349"list"
14350msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
14351
d13389bf 14352#: builtin/config.c:773
c1ac5258
JX
14353msgid "--default is only applicable to --get"
14354msgstr "--default 仅适用于 --get"
14355
d13389bf
JX
14356#: builtin/config.c:806
14357msgid "--fixed-value only applies with 'value-pattern'"
14358msgstr "--fixed-value 仅适用于有 '值模式'"
14359
14360#: builtin/config.c:822
c1ac5258
JX
14361#, c-format
14362msgid "unable to read config file '%s'"
14363msgstr "无法读取配置文件 '%s'"
14364
d13389bf 14365#: builtin/config.c:825
c1ac5258
JX
14366msgid "error processing config file(s)"
14367msgstr "处理配置文件出错"
14368
d13389bf 14369#: builtin/config.c:835
c1ac5258
JX
14370msgid "editing stdin is not supported"
14371msgstr "不支持编辑标准输入"
14372
d13389bf 14373#: builtin/config.c:837
c1ac5258
JX
14374msgid "editing blobs is not supported"
14375msgstr "不支持编辑数据对象"
14376
d13389bf 14377#: builtin/config.c:851
220c313c
JX
14378#, c-format
14379msgid "cannot create configuration file %s"
14380msgstr "不能创建配置文件 %s"
14381
d13389bf 14382#: builtin/config.c:864
a0b6b246
JX
14383#, c-format
14384msgid ""
14385"cannot overwrite multiple values with a single value\n"
14386" Use a regexp, --add or --replace-all to change %s."
14387msgstr ""
14388"无法用一个值覆盖多个值\n"
14389" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
14390
d13389bf 14391#: builtin/config.c:943 builtin/config.c:954
c1ac5258
JX
14392#, c-format
14393msgid "no such section: %s"
14394msgstr "无此小节:%s"
14395
fd8cb379 14396#: builtin/count-objects.c:90
4dcdc3d8
JX
14397msgid "git count-objects [-v] [-H | --human-readable]"
14398msgstr "git count-objects [-v] [-H | --human-readable]"
14399
fd8cb379 14400#: builtin/count-objects.c:100
4dcdc3d8
JX
14401msgid "print sizes in human readable format"
14402msgstr "以用户可读的格式显示大小"
ef317cd5 14403
33b62fba 14404#: builtin/credential-cache--daemon.c:227
d9488fea
JX
14405#, c-format
14406msgid ""
14407"The permissions on your socket directory are too loose; other\n"
14408"users may be able to read your cached credentials. Consider running:\n"
14409"\n"
14410"\tchmod 0700 %s"
14411msgstr ""
14412"您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
14413"行:\n"
14414"\n"
14415"\tchmod 0700 %s"
14416
33b62fba 14417#: builtin/credential-cache--daemon.c:276
d9488fea
JX
14418msgid "print debugging messages to stderr"
14419msgstr "输出调试信息到标准错误"
14420
33b62fba 14421#: builtin/credential-cache--daemon.c:316
d9488fea
JX
14422msgid "credential-cache--daemon unavailable; no unix socket support"
14423msgstr "credential-cache--daemon 不可用,不支持 unix 套接字"
14424
7e6630a7 14425#: builtin/credential-cache.c:180
d9488fea
JX
14426msgid "credential-cache unavailable; no unix socket support"
14427msgstr "credential-cache 不可用,不支持 unix 套接字"
14428
d13389bf
JX
14429#: builtin/credential-store.c:66
14430#, c-format
14431msgid "unable to get credential storage lock in %d ms"
14432msgstr "无法在 %d ms 获得凭证存储锁"
14433
a5cd71ca 14434#: builtin/describe.c:26
814ff314
JX
14435msgid "git describe [<options>] [<commit-ish>...]"
14436msgstr "git describe [<选项>] [<提交号>...]"
ef317cd5 14437
a5cd71ca 14438#: builtin/describe.c:27
814ff314
JX
14439msgid "git describe [<options>] --dirty"
14440msgstr "git describe [<选项>] --dirty"
ef317cd5 14441
349ede6a 14442#: builtin/describe.c:63
87cb7997
JX
14443msgid "head"
14444msgstr "头"
14445
349ede6a 14446#: builtin/describe.c:63
87cb7997
JX
14447msgid "lightweight"
14448msgstr "轻量级的"
14449
349ede6a 14450#: builtin/describe.c:63
87cb7997
JX
14451msgid "annotated"
14452msgstr "附注的"
14453
349ede6a 14454#: builtin/describe.c:277
c04f5ac3
JX
14455#, c-format
14456msgid "annotated tag %s not available"
55a16ee4 14457msgstr "附注标签 %s 无效"
c04f5ac3 14458
a5cd71ca 14459#: builtin/describe.c:281
c04f5ac3 14460#, c-format
349ede6a
JX
14461msgid "tag '%s' is externally known as '%s'"
14462msgstr "标签 '%s' 在外部被认为是 '%s'"
c04f5ac3 14463
349ede6a 14464#: builtin/describe.c:328
c04f5ac3
JX
14465#, c-format
14466msgid "no tag exactly matches '%s'"
55a16ee4 14467msgstr "没有标签准确匹配 '%s'"
c04f5ac3 14468
349ede6a 14469#: builtin/describe.c:330
c04f5ac3 14470#, c-format
5809aa05
JX
14471msgid "No exact match on refs or tags, searching to describe\n"
14472msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n"
c04f5ac3 14473
349ede6a 14474#: builtin/describe.c:397
c04f5ac3
JX
14475#, c-format
14476msgid "finished search at %s\n"
14477msgstr "完成搜索 %s\n"
14478
349ede6a 14479#: builtin/describe.c:424
c04f5ac3
JX
14480#, c-format
14481msgid ""
14482"No annotated tags can describe '%s'.\n"
14483"However, there were unannotated tags: try --tags."
14484msgstr ""
55a16ee4
RC
14485"没有附注标签能描述 '%s'。\n"
14486"然而,存在未附注标签:尝试 --tags。"
c04f5ac3 14487
349ede6a 14488#: builtin/describe.c:428
c04f5ac3
JX
14489#, c-format
14490msgid ""
14491"No tags can describe '%s'.\n"
14492"Try --always, or create some tags."
14493msgstr ""
55a16ee4
RC
14494"没有标签能描述 '%s'。\n"
14495"尝试 --always,或者创建一些标签。"
c04f5ac3 14496
349ede6a 14497#: builtin/describe.c:458
c04f5ac3
JX
14498#, c-format
14499msgid "traversed %lu commits\n"
14500msgstr "已遍历 %lu 个提交\n"
14501
349ede6a 14502#: builtin/describe.c:461
c04f5ac3
JX
14503#, c-format
14504msgid ""
14505"more than %i tags found; listed %i most recent\n"
14506"gave up search at %s\n"
14507msgstr ""
55a16ee4 14508"发现多于 %i 个标签,列出最近的 %i 个\n"
90e6ef53 14509"在 %s 放弃搜索\n"
c04f5ac3 14510
349ede6a 14511#: builtin/describe.c:529
5809aa05
JX
14512#, c-format
14513msgid "describe %s\n"
14514msgstr "描述 %s\n"
14515
349ede6a 14516#: builtin/describe.c:532
5809aa05
JX
14517#, c-format
14518msgid "Not a valid object name %s"
14519msgstr "不是一个有效的对象名 %s"
14520
349ede6a 14521#: builtin/describe.c:540
5809aa05
JX
14522#, c-format
14523msgid "%s is neither a commit nor blob"
14524msgstr "%s 既不是提交也不是数据对象"
14525
349ede6a 14526#: builtin/describe.c:554
ef317cd5 14527msgid "find the tag that comes after the commit"
55a16ee4 14528msgstr "寻找该提交之后的标签"
ef317cd5 14529
349ede6a 14530#: builtin/describe.c:555
ef317cd5 14531msgid "debug search strategy on stderr"
07432cef 14532msgstr "在标准错误上调试搜索策略"
ef317cd5 14533
349ede6a 14534#: builtin/describe.c:556
1003b3a5
JX
14535msgid "use any ref"
14536msgstr "使用任意引用"
14537
349ede6a 14538#: builtin/describe.c:557
1003b3a5 14539msgid "use any tag, even unannotated"
55a16ee4 14540msgstr "使用任意标签,即使未附带注释"
ef317cd5 14541
349ede6a 14542#: builtin/describe.c:558
ef317cd5 14543msgid "always use long format"
07432cef 14544msgstr "始终使用长提交号格式"
ef317cd5 14545
349ede6a 14546#: builtin/describe.c:559
2e8451e8
JX
14547msgid "only follow first parent"
14548msgstr "只跟随第一个父提交"
14549
349ede6a 14550#: builtin/describe.c:562
ef317cd5 14551msgid "only output exact matches"
07432cef 14552msgstr "只输出精确匹配"
ef317cd5 14553
349ede6a 14554#: builtin/describe.c:564
ef317cd5 14555msgid "consider <n> most recent tags (default: 10)"
55a16ee4 14556msgstr "考虑最近 <n> 个标签(默认:10)"
ef317cd5 14557
349ede6a 14558#: builtin/describe.c:566
ef317cd5 14559msgid "only consider tags matching <pattern>"
55a16ee4 14560msgstr "只考虑匹配 <模式> 的标签"
ef317cd5 14561
349ede6a 14562#: builtin/describe.c:568
87cb7997
JX
14563msgid "do not consider tags matching <pattern>"
14564msgstr "不考虑匹配 <模式> 的标签"
14565
65387fd5 14566#: builtin/describe.c:570 builtin/name-rev.c:544
ef317cd5 14567msgid "show abbreviated commit object as fallback"
07432cef 14568msgstr "显示简写的提交号作为后备"
ef317cd5 14569
349ede6a 14570#: builtin/describe.c:571 builtin/describe.c:574
ef317cd5 14571msgid "mark"
07432cef 14572msgstr "标记"
ef317cd5 14573
349ede6a 14574#: builtin/describe.c:572
ef317cd5 14575msgid "append <mark> on dirty working tree (default: \"-dirty\")"
160fb2b2 14576msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
ef317cd5 14577
349ede6a 14578#: builtin/describe.c:575
87cb7997
JX
14579msgid "append <mark> on broken working tree (default: \"-broken\")"
14580msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")"
14581
349ede6a 14582#: builtin/describe.c:622
c04f5ac3 14583msgid "No names found, cannot describe anything."
90e6ef53 14584msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 14585
65387fd5
FZ
14586#: builtin/describe.c:673 builtin/describe.c:675
14587#, c-format
14588msgid "option '%s' and commit-ishes cannot be used together"
14589msgstr "选项 '%s' 和提交号不能同时使用"
d13389bf
JX
14590
14591#: builtin/diff-tree.c:157
14592msgid "--merge-base only works with two commits"
14593msgstr "--merge-base 仅适用于两个提交"
14594
473eb541 14595#: builtin/diff.c:92
c04f5ac3
JX
14596#, c-format
14597msgid "'%s': not a regular file or symlink"
14598msgstr "'%s':不是一个正规文件或符号链接"
14599
473eb541 14600#: builtin/diff.c:259
c04f5ac3
JX
14601#, c-format
14602msgid "invalid option: %s"
14603msgstr "无效选项:%s"
14604
473eb541 14605#: builtin/diff.c:376
7157c2b5
JX
14606#, c-format
14607msgid "%s...%s: no merge base"
14608msgstr "%s...%s:无合并基线"
14609
65387fd5 14610#: builtin/diff.c:491
c04f5ac3 14611msgid "Not a git repository"
d9488fea 14612msgstr "不是 git 仓库"
c04f5ac3 14613
65387fd5 14614#: builtin/diff.c:537 builtin/grep.c:698
c04f5ac3
JX
14615#, c-format
14616msgid "invalid object '%s' given."
14617msgstr "提供了无效对象 '%s'。"
14618
65387fd5 14619#: builtin/diff.c:548
c04f5ac3
JX
14620#, c-format
14621msgid "more than two blobs given: '%s'"
160fb2b2 14622msgstr "提供了超过两个数据对象:'%s'"
c04f5ac3 14623
65387fd5 14624#: builtin/diff.c:553
c04f5ac3
JX
14625#, c-format
14626msgid "unhandled object '%s' given."
6c94aba5 14627msgstr "无法处理的对象 '%s'。"
c04f5ac3 14628
65387fd5 14629#: builtin/diff.c:587
7157c2b5
JX
14630#, c-format
14631msgid "%s...%s: multiple merge bases, using %s"
14632msgstr "%s...%s:多条合并基线,使用 %s"
14633
33b62fba 14634#: builtin/difftool.c:31
1a79b2f1
JX
14635msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
14636msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
14637
65387fd5 14638#: builtin/difftool.c:287
87cb7997
JX
14639#, c-format
14640msgid "could not read symlink %s"
14641msgstr "无法读取符号链接 %s"
14642
65387fd5 14643#: builtin/difftool.c:289
87cb7997
JX
14644#, c-format
14645msgid "could not read symlink file %s"
14646msgstr "无法读取符号链接文件 %s"
14647
65387fd5 14648#: builtin/difftool.c:297
87cb7997
JX
14649#, c-format
14650msgid "could not read object %s for symlink %s"
14651msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
14652
65387fd5 14653#: builtin/difftool.c:421
1a79b2f1 14654msgid ""
7e6630a7
FZ
14655"combined diff formats ('-c' and '--cc') are not supported in\n"
14656"directory diff mode ('-d' and '--dir-diff')."
87cb7997
JX
14657msgstr ""
14658"不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
14659"cc')。"
1a79b2f1 14660
65387fd5 14661#: builtin/difftool.c:626
1a79b2f1
JX
14662#, c-format
14663msgid "both files modified: '%s' and '%s'."
14664msgstr "两个文件都被修改:'%s' 和 '%s'。"
14665
65387fd5 14666#: builtin/difftool.c:628
1a79b2f1
JX
14667msgid "working tree file has been left."
14668msgstr "工作区文件被留了下来。"
14669
65387fd5 14670#: builtin/difftool.c:639
1a79b2f1
JX
14671#, c-format
14672msgid "temporary files exist in '%s'."
14673msgstr "临时文件存在于 '%s'。"
14674
65387fd5 14675#: builtin/difftool.c:640
1a79b2f1
JX
14676msgid "you may want to cleanup or recover these."
14677msgstr "您可能想要清理或者恢复它们。"
14678
65387fd5 14679#: builtin/difftool.c:645
7e6630a7
FZ
14680#, c-format
14681msgid "failed: %d"
14682msgstr "失败:%d"
14683
65387fd5 14684#: builtin/difftool.c:690
1a79b2f1
JX
14685msgid "use `diff.guitool` instead of `diff.tool`"
14686msgstr "使用 `diff.guitool` 代替 `diff.tool`"
14687
65387fd5 14688#: builtin/difftool.c:692
1a79b2f1
JX
14689msgid "perform a full-directory diff"
14690msgstr "执行一个全目录差异比较"
14691
65387fd5 14692#: builtin/difftool.c:694
1a79b2f1
JX
14693msgid "do not prompt before launching a diff tool"
14694msgstr "启动差异比较工具之前不提示"
14695
65387fd5 14696#: builtin/difftool.c:699
1a79b2f1
JX
14697msgid "use symlinks in dir-diff mode"
14698msgstr "在 dir-diff 模式中使用符号链接"
14699
65387fd5 14700#: builtin/difftool.c:700
c1ac5258
JX
14701msgid "tool"
14702msgstr "工具"
14703
65387fd5 14704#: builtin/difftool.c:701
1a79b2f1
JX
14705msgid "use the specified diff tool"
14706msgstr "使用指定的差异比较工具"
14707
65387fd5 14708#: builtin/difftool.c:703
1a79b2f1
JX
14709msgid "print a list of diff tools that may be used with `--tool`"
14710msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
14711
65387fd5 14712#: builtin/difftool.c:706
1a79b2f1 14713msgid ""
7e6630a7 14714"make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
1a79b2f1 14715"code"
7e6630a7 14716msgstr "当执行的 diff 工具返回非零退出码时,使 'git-difftool' 退出"
1a79b2f1 14717
65387fd5 14718#: builtin/difftool.c:709
1a79b2f1
JX
14719msgid "specify a custom command for viewing diffs"
14720msgstr "指定一个用于查看差异的自定义命令"
14721
65387fd5 14722#: builtin/difftool.c:710
d46c5519
JX
14723msgid "passed to `diff`"
14724msgstr "传递给 `diff`"
14725
65387fd5 14726#: builtin/difftool.c:726
d46c5519
JX
14727msgid "difftool requires worktree or --no-index"
14728msgstr "difftool 要求工作区或者 --no-index"
14729
65387fd5 14730#: builtin/difftool.c:744
1a79b2f1
JX
14731msgid "no <tool> given for --tool=<tool>"
14732msgstr "没有为 --tool=<工具> 参数提供 <工具>"
14733
65387fd5 14734#: builtin/difftool.c:751
1a79b2f1
JX
14735msgid "no <cmd> given for --extcmd=<cmd>"
14736msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
14737
a6cd2cc4
JX
14738#: builtin/env--helper.c:6
14739msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
14740msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>"
14741
7e6630a7 14742#: builtin/env--helper.c:42 builtin/hash-object.c:96
a6cd2cc4
JX
14743msgid "type"
14744msgstr "类型"
14745
d9488fea 14746#: builtin/env--helper.c:46
a6cd2cc4
JX
14747msgid "default for git_env_*(...) to fall back on"
14748msgstr "git_env_*(...) 的默认值"
14749
d9488fea 14750#: builtin/env--helper.c:48
a6cd2cc4
JX
14751msgid "be quiet only use git_env_*() value as exit code"
14752msgstr "安静模式,只使用 git_env_*() 的值作为退出码"
14753
d9488fea 14754#: builtin/env--helper.c:67
a6cd2cc4
JX
14755#, c-format
14756msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
ec3d4607 14757msgstr "选项 `--default' 和 `--type=bool` 期望一个布尔值,不是 `%s`"
a6cd2cc4 14758
d9488fea 14759#: builtin/env--helper.c:82
a6cd2cc4
JX
14760#, c-format
14761msgid ""
14762"option `--default' expects an unsigned long value with `--type=ulong`, not `"
14763"%s`"
ec3d4607 14764msgstr "选项 `--default' 和 `--type=ulong` 期望一个无符号长整型,不是 `%s`"
a6cd2cc4 14765
c1ac5258 14766#: builtin/fast-export.c:29
ef317cd5 14767msgid "git fast-export [rev-list-opts]"
07432cef 14768msgstr "git fast-export [rev-list-opts]"
ef317cd5 14769
65387fd5 14770#: builtin/fast-export.c:843
a5cd71ca
JX
14771msgid "Error: Cannot export nested tags unless --mark-tags is specified."
14772msgstr "错误:除非指定 --mark-tags,否则无法导出嵌套标签。"
14773
65387fd5 14774#: builtin/fast-export.c:1152
7157c2b5
JX
14775msgid "--anonymize-map token cannot be empty"
14776msgstr "--anonymize-map 取值不能为空"
14777
65387fd5 14778#: builtin/fast-export.c:1171
ef317cd5 14779msgid "show progress after <n> objects"
07432cef 14780msgstr "在 <n> 个对象之后显示进度"
ef317cd5 14781
65387fd5 14782#: builtin/fast-export.c:1173
ef317cd5 14783msgid "select handling of signed tags"
55a16ee4 14784msgstr "选择如何处理签名标签"
ef317cd5 14785
65387fd5 14786#: builtin/fast-export.c:1176
ef317cd5 14787msgid "select handling of tags that tag filtered objects"
55a16ee4 14788msgstr "选择当标签指向被过滤对象时该标签的处理方式"
ef317cd5 14789
65387fd5 14790#: builtin/fast-export.c:1179
a6cd2cc4
JX
14791msgid "select handling of commit messages in an alternate encoding"
14792msgstr "选择使用备用编码处理提交说明"
14793
65387fd5 14794#: builtin/fast-export.c:1182
473eb541 14795msgid "dump marks to this file"
07432cef 14796msgstr "把标记存储到这个文件"
ef317cd5 14797
65387fd5 14798#: builtin/fast-export.c:1184
473eb541 14799msgid "import marks from this file"
07432cef 14800msgstr "从这个文件导入标记"
ef317cd5 14801
65387fd5 14802#: builtin/fast-export.c:1188
473eb541
JX
14803msgid "import marks from this file if it exists"
14804msgstr "如果文件存在,从该文件导入标记"
a5cd71ca 14805
65387fd5 14806#: builtin/fast-export.c:1190
473eb541
JX
14807msgid "fake a tagger when tags lack one"
14808msgstr "当标签缺少标记人字段时,假装提供一个"
ef317cd5 14809
65387fd5 14810#: builtin/fast-export.c:1192
473eb541 14811msgid "output full tree for each commit"
07432cef 14812msgstr "每次提交都输出整个树"
ef317cd5 14813
65387fd5 14814#: builtin/fast-export.c:1194
473eb541 14815msgid "use the done feature to terminate the stream"
07432cef 14816msgstr "使用 done 功能来终止流"
ef317cd5 14817
65387fd5 14818#: builtin/fast-export.c:1195
473eb541 14819msgid "skip output of blob data"
07432cef 14820msgstr "跳过数据对象的输出"
ef317cd5 14821
65387fd5 14822#: builtin/fast-export.c:1196 builtin/log.c:1841
6acbf033 14823msgid "refspec"
160fb2b2 14824msgstr "引用规格"
6acbf033 14825
65387fd5 14826#: builtin/fast-export.c:1197
473eb541 14827msgid "apply refspec to exported refs"
160fb2b2 14828msgstr "对导出的引用应用引用规格"
6acbf033 14829
65387fd5 14830#: builtin/fast-export.c:1198
220c313c
JX
14831msgid "anonymize output"
14832msgstr "匿名输出"
14833
65387fd5 14834#: builtin/fast-export.c:1199
7157c2b5
JX
14835msgid "from:to"
14836msgstr "from:to"
14837
65387fd5 14838#: builtin/fast-export.c:1200
7157c2b5
JX
14839msgid "convert <from> to <to> in anonymized output"
14840msgstr "在匿名输出中将 <from> 转换为 <to>"
14841
65387fd5 14842#: builtin/fast-export.c:1203
473eb541 14843msgid "reference parents which are not in fast-export stream by object id"
5b533632 14844msgstr "引用父对象 ID 不在 fast-export 流中"
06991777 14845
65387fd5 14846#: builtin/fast-export.c:1205
473eb541 14847msgid "show original object ids of blobs/commits"
5b533632 14848msgstr "显示数据对象/提交的原始对象 ID"
06991777 14849
65387fd5 14850#: builtin/fast-export.c:1207
473eb541 14851msgid "label tags with mark ids"
a5cd71ca
JX
14852msgstr "对带有标记 ID 的标签做标记"
14853
65387fd5 14854#: builtin/fast-import.c:3090
d9488fea
JX
14855#, c-format
14856msgid "Missing from marks for submodule '%s'"
14857msgstr "子模组 '%s' 缺少 from 标记"
14858
65387fd5 14859#: builtin/fast-import.c:3092
d9488fea
JX
14860#, c-format
14861msgid "Missing to marks for submodule '%s'"
14862msgstr "子模组 '%s' 缺少 to 标记"
14863
65387fd5 14864#: builtin/fast-import.c:3227
d9488fea
JX
14865#, c-format
14866msgid "Expected 'mark' command, got %s"
14867msgstr "预期 'mark' 命令,得到 %s"
14868
65387fd5 14869#: builtin/fast-import.c:3232
d9488fea
JX
14870#, c-format
14871msgid "Expected 'to' command, got %s"
14872msgstr "预期 'to' 命令,得到 %s"
14873
65387fd5 14874#: builtin/fast-import.c:3324
d9488fea
JX
14875msgid "Expected format name:filename for submodule rewrite option"
14876msgstr "子模组重写选项的预期格式为 name:filename"
14877
65387fd5 14878#: builtin/fast-import.c:3379
d9488fea
JX
14879#, c-format
14880msgid "feature '%s' forbidden in input without --allow-unsafe-features"
14881msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'"
14882
473eb541 14883#: builtin/fetch-pack.c:242
7157c2b5
JX
14884#, c-format
14885msgid "Lockfile created but not reported: %s"
14886msgstr "Lockfile 已创建但未报告:%s"
14887
65387fd5 14888#: builtin/fetch.c:36
ef317cd5 14889msgid "git fetch [<options>] [<repository> [<refspec>...]]"
160fb2b2 14890msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
ef317cd5 14891
65387fd5 14892#: builtin/fetch.c:37
ef317cd5 14893msgid "git fetch [<options>] <group>"
07432cef 14894msgstr "git fetch [<选项>] <组>"
ef317cd5 14895
65387fd5 14896#: builtin/fetch.c:38
ef317cd5 14897msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
160fb2b2 14898msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
ef317cd5 14899
65387fd5 14900#: builtin/fetch.c:39
ef317cd5 14901msgid "git fetch --all [<options>]"
07432cef 14902msgstr "git fetch --all [<选项>]"
ef317cd5 14903
65387fd5 14904#: builtin/fetch.c:123
a5cd71ca
JX
14905msgid "fetch.parallel cannot be negative"
14906msgstr "fetch.parallel 不能为负数"
14907
65387fd5 14908#: builtin/fetch.c:146 builtin/pull.c:189
ef317cd5 14909msgid "fetch from all remotes"
07432cef 14910msgstr "从所有的远程抓取"
ef317cd5 14911
65387fd5 14912#: builtin/fetch.c:148 builtin/pull.c:249
a5cd71ca
JX
14913msgid "set upstream for git pull/fetch"
14914msgstr "为 git pull/fetch 设置上游"
14915
65387fd5 14916#: builtin/fetch.c:150 builtin/pull.c:192
ef317cd5 14917msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 14918msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 14919
65387fd5 14920#: builtin/fetch.c:152
473eb541
JX
14921msgid "use atomic transaction to update references"
14922msgstr "使用原子事务更新引用"
14923
65387fd5 14924#: builtin/fetch.c:154 builtin/pull.c:195
ef317cd5 14925msgid "path to upload pack on remote end"
07432cef 14926msgstr "上传包到远程的路径"
ef317cd5 14927
65387fd5 14928#: builtin/fetch.c:155
4c27fcb5
JX
14929msgid "force overwrite of local reference"
14930msgstr "强制覆盖本地引用"
ef317cd5 14931
65387fd5 14932#: builtin/fetch.c:157
ef317cd5 14933msgid "fetch from multiple remotes"
07432cef 14934msgstr "从多个远程抓取"
ef317cd5 14935
65387fd5 14936#: builtin/fetch.c:159 builtin/pull.c:199
ef317cd5 14937msgid "fetch all tags and associated objects"
55a16ee4 14938msgstr "抓取所有的标签和关联对象"
ef317cd5 14939
65387fd5 14940#: builtin/fetch.c:161
ef317cd5 14941msgid "do not fetch all tags (--no-tags)"
55a16ee4 14942msgstr "不抓取任何标签(--no-tags)"
ef317cd5 14943
65387fd5 14944#: builtin/fetch.c:163
276ceeaa
JX
14945msgid "number of submodules fetched in parallel"
14946msgstr "子模组获取的并发数"
14947
65387fd5 14948#: builtin/fetch.c:165
33b62fba
JX
14949msgid "modify the refspec to place all refs within refs/prefetch/"
14950msgstr "修改引用规格以将所有引用放入 refs/prefetch/"
14951
65387fd5 14952#: builtin/fetch.c:167 builtin/pull.c:202
ef317cd5 14953msgid "prune remote-tracking branches no longer on remote"
07432cef 14954msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 14955
65387fd5 14956#: builtin/fetch.c:169
31e5e17b
JX
14957msgid "prune local tags no longer on remote and clobber changed tags"
14958msgstr "清除远程不存在的本地标签,并且替换变更标签"
14959
07432cef 14960# 译者:可选值,不能翻译
65387fd5 14961#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
ef317cd5 14962msgid "on-demand"
07432cef 14963msgstr "on-demand"
ef317cd5 14964
65387fd5 14965#: builtin/fetch.c:171
ef317cd5 14966msgid "control recursive fetching of submodules"
07432cef 14967msgstr "控制子模组的递归抓取"
ef317cd5 14968
65387fd5 14969#: builtin/fetch.c:176
d9488fea
JX
14970msgid "write fetched references to the FETCH_HEAD file"
14971msgstr "将获取到的引用写入 FETCH_HEAD 文件"
14972
65387fd5 14973#: builtin/fetch.c:177 builtin/pull.c:210
ef317cd5 14974msgid "keep downloaded pack"
07432cef 14975msgstr "保持下载包"
ef317cd5 14976
65387fd5 14977#: builtin/fetch.c:179
ef317cd5 14978msgid "allow updating of HEAD ref"
07432cef 14979msgstr "允许更新 HEAD 引用"
ef317cd5 14980
65387fd5 14981#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
ffa14514 14982#: builtin/pull.c:222
ef317cd5 14983msgid "deepen history of shallow clone"
07432cef 14984msgstr "深化浅克隆的历史"
ef317cd5 14985
65387fd5 14986#: builtin/fetch.c:184 builtin/pull.c:216
a0b6b246
JX
14987msgid "deepen history of shallow repository based on time"
14988msgstr "基于时间来深化浅克隆的历史"
14989
65387fd5 14990#: builtin/fetch.c:190 builtin/pull.c:225
a77c07d9 14991msgid "convert to a complete repository"
160fb2b2 14992msgstr "转换为一个完整的仓库"
a77c07d9 14993
65387fd5 14994#: builtin/fetch.c:193
ef317cd5 14995msgid "prepend this to submodule path output"
07432cef 14996msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 14997
65387fd5 14998#: builtin/fetch.c:196
a4f16749
JX
14999msgid ""
15000"default for recursive fetching of submodules (lower priority than config "
15001"files)"
15002msgstr "递归获取子模组的缺省值(比配置文件优先级低)"
ef317cd5 15003
65387fd5 15004#: builtin/fetch.c:200 builtin/pull.c:228
cfff71a9
JX
15005msgid "accept refs that update .git/shallow"
15006msgstr "接受更新 .git/shallow 的引用"
15007
65387fd5 15008#: builtin/fetch.c:201 builtin/pull.c:230
6acbf033
JX
15009msgid "refmap"
15010msgstr "引用映射"
15011
65387fd5 15012#: builtin/fetch.c:202 builtin/pull.c:231
6acbf033
JX
15013msgid "specify fetch refmap"
15014msgstr "指定获取操作的引用映射"
15015
65387fd5 15016#: builtin/fetch.c:209 builtin/pull.c:244
c1ac5258
JX
15017msgid "report that we have only objects reachable from this object"
15018msgstr "报告我们只拥有从该对象开始可达的对象"
15019
65387fd5 15020#: builtin/fetch.c:211
33b62fba
JX
15021msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
15022msgstr "不获取包文件;而是打印协商的祖先提交"
15023
65387fd5 15024#: builtin/fetch.c:214 builtin/fetch.c:216
d9488fea
JX
15025msgid "run 'maintenance --auto' after fetching"
15026msgstr "获取后执行 'maintenance --auto'"
a6cd2cc4 15027
65387fd5 15028#: builtin/fetch.c:218 builtin/pull.c:247
a6cd2cc4
JX
15029msgid "check for forced-updates on all updated branches"
15030msgstr "在所有更新分支上检查强制更新"
15031
65387fd5 15032#: builtin/fetch.c:220
ddc12c42
JX
15033msgid "write the commit-graph after fetching"
15034msgstr "抓取后写提交图"
15035
65387fd5 15036#: builtin/fetch.c:222
d9488fea 15037msgid "accept refspecs from stdin"
33b62fba 15038msgstr "从标准输入获取引用规格"
d9488fea 15039
ee27abd3 15040#: builtin/fetch.c:592
65387fd5 15041msgid "couldn't find remote ref HEAD"
c04f5ac3
JX
15042msgstr "无法发现远程 HEAD 引用"
15043
ee27abd3 15044#: builtin/fetch.c:766
5c57d762
JX
15045#, c-format
15046msgid "configuration fetch.output contains invalid value %s"
15047msgstr "配置变量 fetch.output 包含无效值 %s"
15048
ee27abd3 15049#: builtin/fetch.c:867
c04f5ac3
JX
15050#, c-format
15051msgid "object %s not found"
15052msgstr "对象 %s 未发现"
15053
ee27abd3 15054#: builtin/fetch.c:871
c04f5ac3
JX
15055msgid "[up to date]"
15056msgstr "[最新]"
15057
ee27abd3 15058#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
c04f5ac3
JX
15059msgid "[rejected]"
15060msgstr "[已拒绝]"
15061
ee27abd3 15062#: builtin/fetch.c:885
5c57d762 15063msgid "can't fetch in current branch"
9a4b694c 15064msgstr "当前分支下不能执行获取操作"
5c57d762 15065
ee27abd3 15066#: builtin/fetch.c:886
65387fd5
FZ
15067msgid "checked out in another worktree"
15068msgstr "已在另一个工作树中检出"
15069
ee27abd3 15070#: builtin/fetch.c:896
c04f5ac3 15071msgid "[tag update]"
55a16ee4 15072msgstr "[标签更新]"
c04f5ac3 15073
ee27abd3
JX
15074#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
15075#: builtin/fetch.c:968
5c57d762
JX
15076msgid "unable to update local ref"
15077msgstr "不能更新本地引用"
c04f5ac3 15078
ee27abd3 15079#: builtin/fetch.c:901
4c27fcb5
JX
15080msgid "would clobber existing tag"
15081msgstr "会破坏现有的标签"
15082
ee27abd3 15083#: builtin/fetch.c:923
c04f5ac3 15084msgid "[new tag]"
55a16ee4 15085msgstr "[新标签]"
c04f5ac3 15086
ee27abd3 15087#: builtin/fetch.c:926
c04f5ac3
JX
15088msgid "[new branch]"
15089msgstr "[新分支]"
15090
ee27abd3 15091#: builtin/fetch.c:929
170e9899
JX
15092msgid "[new ref]"
15093msgstr "[新引用]"
15094
ee27abd3 15095#: builtin/fetch.c:968
c04f5ac3
JX
15096msgid "forced update"
15097msgstr "强制更新"
15098
ee27abd3 15099#: builtin/fetch.c:973
5c57d762
JX
15100msgid "non-fast-forward"
15101msgstr "非快进"
c04f5ac3 15102
ee27abd3 15103#: builtin/fetch.c:1076
a6cd2cc4 15104msgid ""
65387fd5
FZ
15105"fetch normally indicates which branches had a forced update,\n"
15106"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
15107"flag or run 'git config fetch.showForcedUpdates true'"
a6cd2cc4 15108msgstr ""
65387fd5 15109"获取操作通常显示哪些分支发生了强制更新,但该检查已被禁用;\n"
a6cd2cc4 15110"要重新启用,请使用 '--show-forced-updates' 选项或运行\n"
65387fd5 15111"'git config fetch.showForcedUpdates true'"
a6cd2cc4 15112
ee27abd3 15113#: builtin/fetch.c:1080
a6cd2cc4
JX
15114#, c-format
15115msgid ""
65387fd5 15116"it took %.2f seconds to check forced updates; you can use\n"
a6cd2cc4
JX
15117"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
15118"false'\n"
65387fd5 15119"to avoid this check\n"
a6cd2cc4 15120msgstr ""
65387fd5
FZ
15121"花了 %.2f 秒来检查强制更新;您可以使用 '--no-show-forced-updates'\n"
15122"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查\n"
a6cd2cc4 15123
ee27abd3 15124#: builtin/fetch.c:1112
c04f5ac3
JX
15125#, c-format
15126msgid "%s did not send all necessary objects\n"
e640d114 15127msgstr "%s 未发送所有必需的对象\n"
c04f5ac3 15128
ee27abd3 15129#: builtin/fetch.c:1141
cfff71a9 15130#, c-format
ec3d4607
JX
15131msgid "rejected %s because shallow roots are not allowed to be updated"
15132msgstr "拒绝 %s 因为浅克隆的根不允许被更新"
cfff71a9 15133
ee27abd3 15134#: builtin/fetch.c:1231 builtin/fetch.c:1379
c04f5ac3
JX
15135#, c-format
15136msgid "From %.*s\n"
15137msgstr "来自 %.*s\n"
15138
ee27abd3 15139#: builtin/fetch.c:1252
c04f5ac3
JX
15140#, c-format
15141msgid ""
15142"some local refs could not be updated; try running\n"
15143" 'git remote prune %s' to remove any old, conflicting branches"
15144msgstr ""
15145"一些本地引用不能被更新;尝试运行\n"
15146" 'git remote prune %s' 来删除旧的、有冲突的分支"
15147
90e6ef53 15148# 译者:注意保持前导空格
ee27abd3 15149#: builtin/fetch.c:1349
81809b99 15150#, c-format
8ada9598 15151msgid " (%s will become dangling)"
e640d114 15152msgstr " (%s 将成为悬空状态)"
c04f5ac3 15153
90e6ef53 15154# 译者:注意保持前导空格
ee27abd3 15155#: builtin/fetch.c:1350
81809b99 15156#, c-format
8ada9598 15157msgid " (%s has become dangling)"
e640d114 15158msgstr " (%s 已成为悬空状态)"
c04f5ac3 15159
ee27abd3 15160#: builtin/fetch.c:1382
c04f5ac3
JX
15161msgid "[deleted]"
15162msgstr "[已删除]"
15163
ee27abd3 15164#: builtin/fetch.c:1383 builtin/remote.c:1128
c04f5ac3
JX
15165msgid "(none)"
15166msgstr "(无)"
15167
ee27abd3 15168#: builtin/fetch.c:1405
c04f5ac3 15169#, c-format
65387fd5
FZ
15170msgid "refusing to fetch into branch '%s' checked out at '%s'"
15171msgstr "拒绝获取于 '%2$s' 检出的分支 '%1$s'"
c04f5ac3 15172
ee27abd3 15173#: builtin/fetch.c:1425
c04f5ac3 15174#, c-format
65387fd5 15175msgid "option \"%s\" value \"%s\" is not valid for %s"
c04f5ac3
JX
15176msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
15177
ee27abd3 15178#: builtin/fetch.c:1428
c04f5ac3 15179#, c-format
65387fd5 15180msgid "option \"%s\" is ignored for %s\n"
81809b99 15181msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 15182
ee27abd3 15183#: builtin/fetch.c:1455
7e6630a7
FZ
15184#, c-format
15185msgid "the object %s does not exist"
15186msgstr "对象 '%s' 不存在"
15187
ee27abd3 15188#: builtin/fetch.c:1643
ddc12c42 15189msgid "multiple branches detected, incompatible with --set-upstream"
a5cd71ca
JX
15190msgstr "检测到多分支,和 --set-upstream 不兼容"
15191
ee27abd3 15192#: builtin/fetch.c:1655
65387fd5
FZ
15193#, c-format
15194msgid ""
15195"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
15196"any branch."
15197msgstr "无法在不指向任何分支时将 HEAD 的上游从 '%s' 设置为 '%s'。"
15198
ee27abd3 15199#: builtin/fetch.c:1668
a5cd71ca
JX
15200msgid "not setting upstream for a remote remote-tracking branch"
15201msgstr "没有为一个远程跟踪分支设置上游"
15202
ee27abd3 15203#: builtin/fetch.c:1670
a5cd71ca
JX
15204msgid "not setting upstream for a remote tag"
15205msgstr "没有为一个远程标签设置上游"
15206
ee27abd3 15207#: builtin/fetch.c:1672
a5cd71ca
JX
15208msgid "unknown branch type"
15209msgstr "未知的分支类型"
15210
ee27abd3 15211#: builtin/fetch.c:1674
a5cd71ca 15212msgid ""
65387fd5
FZ
15213"no source branch found;\n"
15214"you need to specify exactly one branch with the --set-upstream option"
a5cd71ca 15215msgstr ""
65387fd5
FZ
15216"未发现源分支;\n"
15217"您需要使用 --set-upstream 选项指定一个分支"
a5cd71ca 15218
ee27abd3 15219#: builtin/fetch.c:1804 builtin/fetch.c:1867
c04f5ac3
JX
15220#, c-format
15221msgid "Fetching %s\n"
d4a8e00b 15222msgstr "正在获取 %s\n"
c04f5ac3 15223
ee27abd3 15224#: builtin/fetch.c:1814 builtin/fetch.c:1869
c04f5ac3 15225#, c-format
65387fd5 15226msgid "could not fetch %s"
c04f5ac3
JX
15227msgstr "不能获取 %s"
15228
ee27abd3 15229#: builtin/fetch.c:1826
a5cd71ca
JX
15230#, c-format
15231msgid "could not fetch '%s' (exit code: %d)\n"
15232msgstr "无法获取 '%s'(退出码:%d)\n"
31e5e17b 15233
ee27abd3 15234#: builtin/fetch.c:1930
c04f5ac3 15235msgid ""
65387fd5
FZ
15236"no remote repository specified; please specify either a URL or a\n"
15237"remote name from which new revisions should be fetched"
15238msgstr "未指定远程仓库;请指定一个用于获取新版本的 URL 或远程仓库名"
c04f5ac3 15239
ee27abd3 15240#: builtin/fetch.c:1966
65387fd5
FZ
15241msgid "you need to specify a tag name"
15242msgstr "您需要指定一个标签名称"
c04f5ac3 15243
ee27abd3 15244#: builtin/fetch.c:2032
ec3d4607
JX
15245msgid "--negotiate-only needs one or more --negotiate-tip=*"
15246msgstr "--negotiate-only 需要一个或多个 --negotiate-tip=*"
15247
ee27abd3 15248#: builtin/fetch.c:2036
65387fd5 15249msgid "negative depth in --deepen is not supported"
a0b6b246
JX
15250msgstr "--deepen 不支持负数深度"
15251
ee27abd3 15252#: builtin/fetch.c:2045
a77c07d9 15253msgid "--unshallow on a complete repository does not make sense"
160fb2b2 15254msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
a77c07d9 15255
ee27abd3 15256#: builtin/fetch.c:2062
c04f5ac3 15257msgid "fetch --all does not take a repository argument"
160fb2b2 15258msgstr "fetch --all 不能带一个仓库参数"
c04f5ac3 15259
ee27abd3 15260#: builtin/fetch.c:2064
c04f5ac3 15261msgid "fetch --all does not make sense with refspecs"
160fb2b2 15262msgstr "fetch --all 带引用规格没有任何意义"
c04f5ac3 15263
ee27abd3 15264#: builtin/fetch.c:2073
c04f5ac3 15265#, c-format
65387fd5 15266msgid "no such remote or remote group: %s"
c04f5ac3
JX
15267msgstr "没有这样的远程或远程组:%s"
15268
ee27abd3 15269#: builtin/fetch.c:2081
65387fd5 15270msgid "fetching a group and specifying refspecs does not make sense"
160fb2b2 15271msgstr "获取组并指定引用规格没有意义"
c04f5ac3 15272
ee27abd3 15273#: builtin/fetch.c:2097
33b62fba
JX
15274msgid "must supply remote when using --negotiate-only"
15275msgstr "在使用 --negotiate-only 时必须提供远程仓库"
15276
ee27abd3 15277#: builtin/fetch.c:2102
65387fd5
FZ
15278msgid "protocol does not support --negotiate-only, exiting"
15279msgstr "协议不支持 --negotiate-only,退出"
15280
ee27abd3 15281#: builtin/fetch.c:2121
06991777
JX
15282msgid ""
15283"--filter can only be used with the remote configured in extensions."
15284"partialclone"
ae4e099e 15285msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库"
06991777 15286
ee27abd3 15287#: builtin/fetch.c:2125
473eb541
JX
15288msgid "--atomic can only be used when fetching from one remote"
15289msgstr "--atomic 仅在从一个远程仓库获取的时候可用"
15290
ee27abd3 15291#: builtin/fetch.c:2129
d9488fea
JX
15292msgid "--stdin can only be used when fetching from one remote"
15293msgstr "--stdin 仅在从一个远程仓库获取的时候可用"
15294
349ede6a 15295#: builtin/fmt-merge-msg.c:7
814ff314
JX
15296msgid ""
15297"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
15298msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
c04f5ac3 15299
65387fd5 15300#: builtin/fmt-merge-msg.c:19
ef317cd5 15301msgid "populate log with at most <n> entries from shortlog"
07432cef 15302msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 15303
65387fd5 15304#: builtin/fmt-merge-msg.c:22
ef317cd5 15305msgid "alias for --log (deprecated)"
07432cef 15306msgstr "参数 --log 的别名(已弃用)"
ef317cd5 15307
65387fd5 15308#: builtin/fmt-merge-msg.c:25
ef317cd5 15309msgid "text"
07432cef 15310msgstr "文本"
ef317cd5 15311
65387fd5 15312#: builtin/fmt-merge-msg.c:26
ef317cd5 15313msgid "use <text> as start of message"
07432cef 15314msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 15315
65387fd5
FZ
15316#: builtin/fmt-merge-msg.c:28
15317msgid "use <name> instead of the real target branch"
15318msgstr "使用 <名称> 而不是真正的目标分支"
15319
15320#: builtin/fmt-merge-msg.c:29
ef317cd5 15321msgid "file to read from"
07432cef 15322msgstr "从文件中读取"
ef317cd5 15323
a4f16749 15324#: builtin/for-each-ref.c:10
814ff314
JX
15325msgid "git for-each-ref [<options>] [<pattern>]"
15326msgstr "git for-each-ref [<选项>] [<模式>]"
ef317cd5 15327
a4f16749 15328#: builtin/for-each-ref.c:11
94550ed3
JX
15329msgid "git for-each-ref [--points-at <object>]"
15330msgstr "git for-each-ref [--points-at <对象>]"
15331
a4f16749 15332#: builtin/for-each-ref.c:12
d9488fea
JX
15333msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
15334msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]"
94550ed3 15335
a4f16749 15336#: builtin/for-each-ref.c:13
87cb7997
JX
15337msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
15338msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
94550ed3 15339
65387fd5 15340#: builtin/for-each-ref.c:31
ef317cd5 15341msgid "quote placeholders suitably for shells"
07432cef 15342msgstr "引用占位符适用于 shells"
ef317cd5 15343
65387fd5 15344#: builtin/for-each-ref.c:33
ef317cd5 15345msgid "quote placeholders suitably for perl"
07432cef 15346msgstr "引用占位符适用于 perl"
ef317cd5 15347
65387fd5 15348#: builtin/for-each-ref.c:35
ef317cd5 15349msgid "quote placeholders suitably for python"
07432cef 15350msgstr "引用占位符适用于 python"
ef317cd5 15351
65387fd5 15352#: builtin/for-each-ref.c:37
04cb2f28
JX
15353msgid "quote placeholders suitably for Tcl"
15354msgstr "引用占位符适用于 Tcl"
ef317cd5 15355
65387fd5 15356#: builtin/for-each-ref.c:40
ef317cd5 15357msgid "show only <n> matched refs"
07432cef 15358msgstr "只显示 <n> 个匹配的引用"
ef317cd5 15359
65387fd5 15360#: builtin/for-each-ref.c:42 builtin/tag.c:481
6937cb4e
JX
15361msgid "respect format colors"
15362msgstr "遵照格式中的颜色输出"
15363
65387fd5 15364#: builtin/for-each-ref.c:45
94550ed3
JX
15365msgid "print only refs which points at the given object"
15366msgstr "只打印指向给定对象的引用"
ef317cd5 15367
65387fd5 15368#: builtin/for-each-ref.c:47
94550ed3
JX
15369msgid "print only refs that are merged"
15370msgstr "只打印已经合并的引用"
15371
65387fd5 15372#: builtin/for-each-ref.c:48
94550ed3
JX
15373msgid "print only refs that are not merged"
15374msgstr "只打印没有合并的引用"
ef317cd5 15375
65387fd5 15376#: builtin/for-each-ref.c:49
94550ed3
JX
15377msgid "print only refs which contain the commit"
15378msgstr "只打印包含该提交的引用"
15379
65387fd5 15380#: builtin/for-each-ref.c:50
87cb7997
JX
15381msgid "print only refs which don't contain the commit"
15382msgstr "只打印不包含该提交的引用"
15383
d13389bf
JX
15384#: builtin/for-each-repo.c:9
15385msgid "git for-each-repo --config=<config> <command-args>"
15386msgstr "git for-each-repo --config=<配置> <命令参数>"
15387
ec3d4607 15388#: builtin/for-each-repo.c:34
d13389bf
JX
15389msgid "config"
15390msgstr "配置"
15391
ec3d4607 15392#: builtin/for-each-repo.c:35
d13389bf
JX
15393msgid "config key storing a list of repository paths"
15394msgstr "存储着仓库路径列表的配置项键名"
15395
ec3d4607 15396#: builtin/for-each-repo.c:43
d13389bf
JX
15397msgid "missing --config=<config>"
15398msgstr "缺少 --config=<配置>"
15399
ec3d4607 15400#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
06991777
JX
15401msgid "unknown"
15402msgstr "未知"
15403
15404#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
33b62fba 15405#: builtin/fsck.c:78 builtin/fsck.c:100
06991777
JX
15406#, c-format
15407msgid "error in %s %s: %s"
15408msgstr "%s %s 错误:%s"
15409
15410#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
33b62fba 15411#: builtin/fsck.c:94
06991777
JX
15412#, c-format
15413msgid "warning in %s %s: %s"
15414msgstr "%s %s 警告:%s"
15415
ec3d4607 15416#: builtin/fsck.c:124 builtin/fsck.c:127
06991777
JX
15417#, c-format
15418msgid "broken link from %7s %s"
15419msgstr "来自 %7s %s 的损坏的链接"
15420
ec3d4607 15421#: builtin/fsck.c:136
06991777
JX
15422msgid "wrong object type in link"
15423msgstr "链接中错误的对象类型"
15424
ec3d4607 15425#: builtin/fsck.c:152
06991777
JX
15426#, c-format
15427msgid ""
15428"broken link from %7s %s\n"
15429" to %7s %s"
15430msgstr ""
15431"损坏的链接来自于 %7s %s\n"
15432" 到 %7s %s"
15433
ec3d4607 15434#: builtin/fsck.c:264
06991777
JX
15435#, c-format
15436msgid "missing %s %s"
15437msgstr "缺失 %s %s"
15438
ec3d4607 15439#: builtin/fsck.c:291
06991777
JX
15440#, c-format
15441msgid "unreachable %s %s"
5b533632 15442msgstr "不可达 %s %s"
06991777 15443
ec3d4607 15444#: builtin/fsck.c:311
06991777
JX
15445#, c-format
15446msgid "dangling %s %s"
15447msgstr "悬空 %s %s"
15448
ec3d4607 15449#: builtin/fsck.c:321
06991777
JX
15450msgid "could not create lost-found"
15451msgstr "不能创建 lost-found"
15452
ec3d4607 15453#: builtin/fsck.c:332
06991777
JX
15454#, c-format
15455msgid "could not finish '%s'"
15456msgstr "不能完成 '%s'"
15457
ec3d4607 15458#: builtin/fsck.c:349
06991777
JX
15459#, c-format
15460msgid "Checking %s"
15461msgstr "正在检查 %s"
15462
ec3d4607 15463#: builtin/fsck.c:387
06991777
JX
15464#, c-format
15465msgid "Checking connectivity (%d objects)"
15466msgstr "正在检查连通性(%d 个对象)"
15467
ec3d4607 15468#: builtin/fsck.c:406
06991777
JX
15469#, c-format
15470msgid "Checking %s %s"
15471msgstr "正在检查 %s %s"
15472
ec3d4607 15473#: builtin/fsck.c:411
06991777
JX
15474msgid "broken links"
15475msgstr "损坏的链接"
15476
ec3d4607 15477#: builtin/fsck.c:420
06991777
JX
15478#, c-format
15479msgid "root %s"
15480msgstr "根 %s"
15481
ec3d4607 15482#: builtin/fsck.c:428
06991777
JX
15483#, c-format
15484msgid "tagged %s %s (%s) in %s"
15485msgstr "标记 %s %s (%s) 于 %s"
15486
ec3d4607 15487#: builtin/fsck.c:457
06991777
JX
15488#, c-format
15489msgid "%s: object corrupt or missing"
15490msgstr "%s:对象损坏或丢失"
15491
ec3d4607 15492#: builtin/fsck.c:482
06991777
JX
15493#, c-format
15494msgid "%s: invalid reflog entry %s"
15495msgstr "%s:无效的引用日志条目 %s"
15496
ec3d4607 15497#: builtin/fsck.c:496
06991777
JX
15498#, c-format
15499msgid "Checking reflog %s->%s"
15500msgstr "正在检查引用日志 %s->%s"
15501
ec3d4607 15502#: builtin/fsck.c:530
06991777
JX
15503#, c-format
15504msgid "%s: invalid sha1 pointer %s"
15505msgstr "%s:无效的 sha1 指针 %s"
15506
ec3d4607 15507#: builtin/fsck.c:537
06991777
JX
15508#, c-format
15509msgid "%s: not a commit"
15510msgstr "%s:不是一个提交"
15511
ec3d4607 15512#: builtin/fsck.c:591
06991777
JX
15513msgid "notice: No default references"
15514msgstr "注意:无默认引用"
15515
7e6630a7
FZ
15516#: builtin/fsck.c:621
15517#, c-format
15518msgid "%s: hash-path mismatch, found at: %s"
65387fd5 15519msgstr "%s:哈希路径不匹配,发现于 %s"
7e6630a7
FZ
15520
15521#: builtin/fsck.c:624
06991777
JX
15522#, c-format
15523msgid "%s: object corrupt or missing: %s"
15524msgstr "%s:对象损坏或丢失:%s"
15525
7e6630a7
FZ
15526#: builtin/fsck.c:628
15527#, c-format
15528msgid "%s: object is of unknown type '%s': %s"
65387fd5 15529msgstr "%s:对象有未知的类型 '%s': %s"
7e6630a7 15530
65387fd5 15531#: builtin/fsck.c:645
06991777
JX
15532#, c-format
15533msgid "%s: object could not be parsed: %s"
15534msgstr "%s:不能解析对象:%s"
15535
65387fd5 15536#: builtin/fsck.c:665
06991777
JX
15537#, c-format
15538msgid "bad sha1 file: %s"
15539msgstr "坏的 sha1 文件:%s"
15540
65387fd5 15541#: builtin/fsck.c:686
06991777
JX
15542msgid "Checking object directory"
15543msgstr "正在检查对象目录"
15544
65387fd5 15545#: builtin/fsck.c:689
6c94aba5 15546msgid "Checking object directories"
06991777
JX
15547msgstr "正在检查对象目录"
15548
65387fd5 15549#: builtin/fsck.c:705
06991777
JX
15550#, c-format
15551msgid "Checking %s link"
15552msgstr "正在检查 %s 链接"
15553
65387fd5 15554#: builtin/fsck.c:710 builtin/index-pack.c:859
06991777
JX
15555#, c-format
15556msgid "invalid %s"
15557msgstr "无效的 %s"
15558
65387fd5 15559#: builtin/fsck.c:717
06991777
JX
15560#, c-format
15561msgid "%s points to something strange (%s)"
15562msgstr "%s 指向奇怪的东西(%s)"
15563
65387fd5 15564#: builtin/fsck.c:723
06991777
JX
15565#, c-format
15566msgid "%s: detached HEAD points at nothing"
15567msgstr "%s:分离头指针的指向不存在"
15568
65387fd5 15569#: builtin/fsck.c:727
06991777
JX
15570#, c-format
15571msgid "notice: %s points to an unborn branch (%s)"
15572msgstr "注意:%s 指向一个尚未诞生的分支(%s)"
15573
65387fd5 15574#: builtin/fsck.c:739
06991777
JX
15575msgid "Checking cache tree"
15576msgstr "正在检查缓存树"
15577
65387fd5 15578#: builtin/fsck.c:744
06991777
JX
15579#, c-format
15580msgid "%s: invalid sha1 pointer in cache-tree"
15581msgstr "%s:cache-tree 中无效的 sha1 指针"
6c94aba5 15582
65387fd5 15583#: builtin/fsck.c:753
06991777
JX
15584msgid "non-tree in cache-tree"
15585msgstr "cache-tree 中非树对象"
15586
65387fd5 15587#: builtin/fsck.c:784
814ff314
JX
15588msgid "git fsck [<options>] [<object>...]"
15589msgstr "git fsck [<选项>] [<对象>...]"
ef317cd5 15590
65387fd5 15591#: builtin/fsck.c:790
ef317cd5 15592msgid "show unreachable objects"
07432cef 15593msgstr "显示不可达的对象"
ef317cd5 15594
65387fd5 15595#: builtin/fsck.c:791
ef317cd5 15596msgid "show dangling objects"
e640d114 15597msgstr "显示悬空的对象"
ef317cd5 15598
65387fd5 15599#: builtin/fsck.c:792
ef317cd5 15600msgid "report tags"
55a16ee4 15601msgstr "报告标签"
ef317cd5 15602
65387fd5 15603#: builtin/fsck.c:793
ef317cd5 15604msgid "report root nodes"
07432cef 15605msgstr "报告根节点"
ef317cd5 15606
65387fd5 15607#: builtin/fsck.c:794
ef317cd5 15608msgid "make index objects head nodes"
07432cef 15609msgstr "将索引亦作为检查的头节点"
ef317cd5 15610
65387fd5 15611#: builtin/fsck.c:795
ef317cd5 15612msgid "make reflogs head nodes (default)"
07432cef 15613msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 15614
65387fd5 15615#: builtin/fsck.c:796
ef317cd5 15616msgid "also consider packs and alternate objects"
07432cef 15617msgstr "也考虑包和备用对象"
ef317cd5 15618
65387fd5 15619#: builtin/fsck.c:797
1b7f4a34
JX
15620msgid "check only connectivity"
15621msgstr "仅检查连通性"
15622
65387fd5 15623#: builtin/fsck.c:798 builtin/mktag.c:76
ef317cd5 15624msgid "enable more strict checking"
07432cef 15625msgstr "启用更严格的检查"
ef317cd5 15626
65387fd5 15627#: builtin/fsck.c:800
ef317cd5 15628msgid "write dangling objects in .git/lost-found"
e640d114 15629msgstr "将悬空对象写入 .git/lost-found 中"
ef317cd5 15630
65387fd5 15631#: builtin/fsck.c:801 builtin/prune.c:146
ef317cd5 15632msgid "show progress"
07432cef 15633msgstr "显示进度"
ef317cd5 15634
65387fd5 15635#: builtin/fsck.c:802
5c57d762
JX
15636msgid "show verbose names for reachable objects"
15637msgstr "显示可达对象的详细名称"
15638
65387fd5 15639#: builtin/fsck.c:862 builtin/index-pack.c:261
6c94aba5 15640msgid "Checking objects"
06991777
JX
15641msgstr "正在检查对象"
15642
65387fd5 15643#: builtin/fsck.c:890
06991777
JX
15644#, c-format
15645msgid "%s: object missing"
15646msgstr "%s:对象缺失"
15647
65387fd5 15648#: builtin/fsck.c:901
06991777
JX
15649#, c-format
15650msgid "invalid parameter: expected sha1, got '%s'"
15651msgstr "无效的参数:期望 sha1,得到 '%s'"
6c94aba5 15652
d13389bf 15653#: builtin/gc.c:39
814ff314
JX
15654msgid "git gc [<options>]"
15655msgstr "git gc [<选项>]"
ef317cd5 15656
473eb541 15657#: builtin/gc.c:93
c04f5ac3 15658#, c-format
87cb7997 15659msgid "Failed to fstat %s: %s"
65e2041e 15660msgstr "对 %s 调用 fstat 失败:%s"
c04f5ac3 15661
473eb541 15662#: builtin/gc.c:129
d46c5519
JX
15663#, c-format
15664msgid "failed to parse '%s' value '%s'"
15665msgstr "无法解析 '%s' 值 '%s'"
15666
65387fd5 15667#: builtin/gc.c:488 builtin/init-db.c:57
c04f5ac3 15668#, c-format
4c27fcb5
JX
15669msgid "cannot stat '%s'"
15670msgstr "不能对 '%s' 调用 stat"
15671
65387fd5 15672#: builtin/gc.c:504
94550ed3
JX
15673#, c-format
15674msgid ""
15675"The last gc run reported the following. Please correct the root cause\n"
7e6630a7 15676"and remove %s\n"
94550ed3
JX
15677"Automatic cleanup will not be performed until the file is removed.\n"
15678"\n"
15679"%s"
15680msgstr ""
7e6630a7 15681"最后一次 gc 操作报告如下信息。请检查原因并删除 %s\n"
94550ed3
JX
15682"在该文件被删除之前,自动清理将不会执行。\n"
15683"\n"
15684"%s"
15685
65387fd5 15686#: builtin/gc.c:552
ef317cd5 15687msgid "prune unreferenced objects"
07432cef 15688msgstr "清除未引用的对象"
ef317cd5 15689
65387fd5 15690#: builtin/gc.c:554
ef317cd5 15691msgid "be more thorough (increased runtime)"
07432cef 15692msgstr "更彻底(增加运行时间)"
ef317cd5 15693
65387fd5 15694#: builtin/gc.c:555
ef317cd5 15695msgid "enable auto-gc mode"
07432cef 15696msgstr "启用自动垃圾回收模式"
ef317cd5 15697
65387fd5 15698#: builtin/gc.c:558
90314792
JX
15699msgid "force running gc even if there may be another gc running"
15700msgstr "强制执行 gc 即使另外一个 gc 正在执行"
15701
65387fd5 15702#: builtin/gc.c:561
fd8cb379
JX
15703msgid "repack all other packs except the largest pack"
15704msgstr "除了最大的包之外,对所有其它包文件重新打包"
15705
65387fd5 15706#: builtin/gc.c:577
fd8cb379
JX
15707#, c-format
15708msgid "failed to parse gc.logexpiry value %s"
65387fd5 15709msgstr "无法解析 gc.logexpiry 的值 %s"
fd8cb379 15710
65387fd5 15711#: builtin/gc.c:588
87cb7997 15712#, c-format
fd8cb379 15713msgid "failed to parse prune expiry value %s"
65387fd5 15714msgstr "无法解析清除期限值 %s"
87cb7997 15715
65387fd5 15716#: builtin/gc.c:608
c04f5ac3 15717#, c-format
6c94aba5 15718msgid "Auto packing the repository in background for optimum performance.\n"
160fb2b2 15719msgstr "自动在后台执行仓库打包以求最佳性能。\n"
6c94aba5 15720
65387fd5 15721#: builtin/gc.c:610
6c94aba5
JX
15722#, c-format
15723msgid "Auto packing the repository for optimum performance.\n"
160fb2b2 15724msgstr "自动打包仓库以求最佳性能。\n"
6c94aba5 15725
65387fd5 15726#: builtin/gc.c:611
6c94aba5
JX
15727#, c-format
15728msgid "See \"git help gc\" for manual housekeeping.\n"
15729msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 15730
65387fd5 15731#: builtin/gc.c:652
90314792
JX
15732#, c-format
15733msgid ""
15734"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
15735msgstr ""
29004bbb 15736"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)"
90314792 15737
65387fd5 15738#: builtin/gc.c:707
c04f5ac3
JX
15739msgid ""
15740"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 15741msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 15742
65387fd5 15743#: builtin/gc.c:717
d13389bf
JX
15744msgid ""
15745"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
15746msgstr ""
15747"git maintenance run [--auto] [--[no-]quiet] [--task=<任务>] [--schedule]"
15748
65387fd5 15749#: builtin/gc.c:747
d13389bf
JX
15750msgid "--no-schedule is not allowed"
15751msgstr "--no-schedule 不被允许"
15752
65387fd5 15753#: builtin/gc.c:752
d13389bf
JX
15754#, c-format
15755msgid "unrecognized --schedule argument '%s'"
15756msgstr "无法识别的 --schedule 参数 '%s'"
d9488fea 15757
65387fd5 15758#: builtin/gc.c:870
d9488fea
JX
15759msgid "failed to write commit-graph"
15760msgstr "无法写入提交图"
15761
65387fd5 15762#: builtin/gc.c:906
33b62fba
JX
15763msgid "failed to prefetch remotes"
15764msgstr "无法预先获取远程仓库"
d13389bf 15765
65387fd5 15766#: builtin/gc.c:1022
d13389bf
JX
15767msgid "failed to start 'git pack-objects' process"
15768msgstr "无法启动 'git pack-objects' 进程"
15769
65387fd5 15770#: builtin/gc.c:1039
d13389bf
JX
15771msgid "failed to finish 'git pack-objects' process"
15772msgstr "无法完成 'git pack-objects' 进程"
15773
65387fd5 15774#: builtin/gc.c:1090
d13389bf
JX
15775msgid "failed to write multi-pack-index"
15776msgstr "无法写入多包索引"
15777
65387fd5 15778#: builtin/gc.c:1106
d13389bf
JX
15779msgid "'git multi-pack-index expire' failed"
15780msgstr "'git multi-pack-index expire' 失败"
15781
65387fd5 15782#: builtin/gc.c:1165
d13389bf
JX
15783msgid "'git multi-pack-index repack' failed"
15784msgstr "'git multi-pack-index repack' 失败"
15785
65387fd5 15786#: builtin/gc.c:1174
d13389bf
JX
15787msgid ""
15788"skipping incremental-repack task because core.multiPackIndex is disabled"
15789msgstr "跳过增量重新打包任务,因为 core.multiPackIndex 被禁用"
15790
65387fd5 15791#: builtin/gc.c:1278
d9488fea
JX
15792#, c-format
15793msgid "lock file '%s' exists, skipping maintenance"
15794msgstr "锁文件 '%s' 已存在,跳过维护"
15795
65387fd5 15796#: builtin/gc.c:1308
d9488fea
JX
15797#, c-format
15798msgid "task '%s' failed"
15799msgstr "任务 '%s' 失败"
15800
65387fd5 15801#: builtin/gc.c:1390
d9488fea
JX
15802#, c-format
15803msgid "'%s' is not a valid task"
15804msgstr "'%s' 不是一个有效的任务"
15805
65387fd5 15806#: builtin/gc.c:1395
d9488fea
JX
15807#, c-format
15808msgid "task '%s' cannot be selected multiple times"
15809msgstr "任务 '%s' 不能被多次选择"
15810
65387fd5 15811#: builtin/gc.c:1410
d9488fea
JX
15812msgid "run tasks based on the state of the repository"
15813msgstr "基于仓库状态来运行任务"
15814
65387fd5 15815#: builtin/gc.c:1411
d13389bf
JX
15816msgid "frequency"
15817msgstr "频率"
15818
65387fd5 15819#: builtin/gc.c:1412
d13389bf
JX
15820msgid "run tasks based on frequency"
15821msgstr "基于频率运行任务"
15822
65387fd5 15823#: builtin/gc.c:1415
d9488fea
JX
15824msgid "do not report progress or other information over stderr"
15825msgstr "不通过标准错误报告进度或其它信息"
15826
65387fd5 15827#: builtin/gc.c:1416
d9488fea
JX
15828msgid "task"
15829msgstr "任务"
15830
65387fd5 15831#: builtin/gc.c:1417
d9488fea
JX
15832msgid "run a specific task"
15833msgstr "运行一个特定的任务"
15834
65387fd5 15835#: builtin/gc.c:1434
d13389bf
JX
15836msgid "use at most one of --auto and --schedule=<frequency>"
15837msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一"
15838
65387fd5 15839#: builtin/gc.c:1477
d13389bf
JX
15840msgid "failed to run 'git config'"
15841msgstr "无法运行 'git config'"
15842
65387fd5 15843#: builtin/gc.c:1629
473eb541
JX
15844#, c-format
15845msgid "failed to expand path '%s'"
15846msgstr "无法扩展路径 '%s'"
15847
65387fd5 15848#: builtin/gc.c:1656 builtin/gc.c:1694
473eb541
JX
15849msgid "failed to start launchctl"
15850msgstr "无法启动 launchctl"
d9488fea 15851
65387fd5 15852#: builtin/gc.c:1769 builtin/gc.c:2237
473eb541
JX
15853#, c-format
15854msgid "failed to create directories for '%s'"
15855msgstr "无法为 '%s' 创建目录"
15856
65387fd5 15857#: builtin/gc.c:1796
473eb541
JX
15858#, c-format
15859msgid "failed to bootstrap service %s"
15860msgstr "无法引导服务 %s"
15861
65387fd5 15862#: builtin/gc.c:1889
473eb541
JX
15863msgid "failed to create temp xml file"
15864msgstr "无法创建临时 XML 文件"
15865
65387fd5 15866#: builtin/gc.c:1979
473eb541
JX
15867msgid "failed to start schtasks"
15868msgstr "无法启动计划任务"
15869
65387fd5 15870#: builtin/gc.c:2063
d13389bf
JX
15871msgid "failed to run 'crontab -l'; your system might not support 'cron'"
15872msgstr "无法执行 'crontab -l',您的系统可能不支持 'cron'"
15873
65387fd5 15874#: builtin/gc.c:2080
d13389bf
JX
15875msgid "failed to run 'crontab'; your system might not support 'cron'"
15876msgstr "无法运行 'crontab',您的系统可能不支持 'cron'"
15877
65387fd5 15878#: builtin/gc.c:2084
d13389bf
JX
15879msgid "failed to open stdin of 'crontab'"
15880msgstr "无法打开 'crontab' 的标准输入"
15881
65387fd5 15882#: builtin/gc.c:2126
d13389bf
JX
15883msgid "'crontab' died"
15884msgstr "'crontab' 终止"
15885
65387fd5 15886#: builtin/gc.c:2191
7e6630a7
FZ
15887msgid "failed to start systemctl"
15888msgstr "无法启动 systemctl"
15889
65387fd5 15890#: builtin/gc.c:2201
7e6630a7
FZ
15891msgid "failed to run systemctl"
15892msgstr "无法运行 systemctl"
15893
65387fd5
FZ
15894#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
15895#: builtin/worktree.c:944
7e6630a7
FZ
15896#, c-format
15897msgid "failed to delete '%s'"
65387fd5 15898msgstr "无法删除 '%s'"
7e6630a7 15899
65387fd5 15900#: builtin/gc.c:2395
7e6630a7
FZ
15901#, c-format
15902msgid "unrecognized --scheduler argument '%s'"
15903msgstr "无法识别的 --scheduler 参数 '%s'"
15904
65387fd5 15905#: builtin/gc.c:2420
7e6630a7
FZ
15906msgid "neither systemd timers nor crontab are available"
15907msgstr "systemd 和 crontab 的定时器都不可用"
15908
65387fd5 15909#: builtin/gc.c:2435
7e6630a7
FZ
15910#, c-format
15911msgid "%s scheduler is not available"
15912msgstr "%s 调度器不可用"
15913
65387fd5 15914#: builtin/gc.c:2449
473eb541
JX
15915msgid "another process is scheduling background maintenance"
15916msgstr "另外一个进程正运行于后台维护"
15917
65387fd5 15918#: builtin/gc.c:2471
7e6630a7
FZ
15919msgid "git maintenance start [--scheduler=<scheduler>]"
15920msgstr "git maintenance start [--scheduler=<调度器>]"
15921
65387fd5 15922#: builtin/gc.c:2480
7e6630a7
FZ
15923msgid "scheduler"
15924msgstr "调度器"
15925
65387fd5 15926#: builtin/gc.c:2481
7e6630a7
FZ
15927msgid "scheduler to trigger git maintenance run"
15928msgstr "触发 git maintenance 执行的调度器"
15929
65387fd5 15930#: builtin/gc.c:2495
d13389bf
JX
15931msgid "failed to add repo to global config"
15932msgstr "无法将仓库添加到全局配置"
15933
65387fd5 15934#: builtin/gc.c:2504
d13389bf
JX
15935msgid "git maintenance <subcommand> [<options>]"
15936msgstr "git maintenance <子命令> [<选项>]"
15937
65387fd5 15938#: builtin/gc.c:2523
d9488fea
JX
15939#, c-format
15940msgid "invalid subcommand: %s"
15941msgstr "无效子命令:%s"
15942
2b472aae 15943#: builtin/grep.c:30
814ff314
JX
15944msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
15945msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
ef317cd5 15946
7e6630a7 15947#: builtin/grep.c:239
c04f5ac3
JX
15948#, c-format
15949msgid "grep: failed to create thread: %s"
90e6ef53 15950msgstr "grep:无法创建线程:%s"
c04f5ac3 15951
7e6630a7 15952#: builtin/grep.c:293
276ceeaa
JX
15953#, c-format
15954msgid "invalid number of threads specified (%d) for %s"
15955msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
15956
a4f16749
JX
15957#. TRANSLATORS: %s is the configuration
15958#. variable for tweaking threads, currently
15959#. grep.threads
15960#.
7e6630a7
FZ
15961#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785
15962#: builtin/pack-objects.c:3142
a4f16749
JX
15963#, c-format
15964msgid "no threads support, ignoring %s"
15965msgstr "没有线程支持,忽略 %s"
15966
7e6630a7 15967#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657
c04f5ac3
JX
15968#, c-format
15969msgid "unable to read tree (%s)"
90e6ef53 15970msgstr "无法读取树(%s)"
c04f5ac3 15971
7e6630a7 15972#: builtin/grep.c:672
c04f5ac3
JX
15973#, c-format
15974msgid "unable to grep from object of type %s"
15975msgstr "无法抓取来自于 %s 类型的对象"
15976
7e6630a7 15977#: builtin/grep.c:752
c04f5ac3
JX
15978#, c-format
15979msgid "switch `%c' expects a numerical value"
15980msgstr "开关 `%c' 期望一个数字值"
15981
7e6630a7 15982#: builtin/grep.c:851
ef317cd5 15983msgid "search in index instead of in the work tree"
07432cef 15984msgstr "在索引区搜索而不是在工作区"
ef317cd5 15985
7e6630a7 15986#: builtin/grep.c:853
ef317cd5 15987msgid "find in contents not managed by git"
07432cef 15988msgstr "在未被 git 管理的内容中查找"
ef317cd5 15989
7e6630a7 15990#: builtin/grep.c:855
ef317cd5 15991msgid "search in both tracked and untracked files"
07432cef 15992msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 15993
7e6630a7 15994#: builtin/grep.c:857
814ff314
JX
15995msgid "ignore files specified via '.gitignore'"
15996msgstr "忽略 '.gitignore' 包含的文件"
ef317cd5 15997
7e6630a7 15998#: builtin/grep.c:859
87cb7997 15999msgid "recursively search in each submodule"
1a79b2f1
JX
16000msgstr "在每一个子模组中递归搜索"
16001
7e6630a7 16002#: builtin/grep.c:862
ef317cd5 16003msgid "show non-matching lines"
07432cef 16004msgstr "显示未匹配的行"
ef317cd5 16005
7e6630a7 16006#: builtin/grep.c:864
ef317cd5 16007msgid "case insensitive matching"
07432cef 16008msgstr "不区分大小写匹配"
ef317cd5 16009
7e6630a7 16010#: builtin/grep.c:866
ef317cd5 16011msgid "match patterns only at word boundaries"
07432cef 16012msgstr "只在单词边界匹配模式"
ef317cd5 16013
7e6630a7 16014#: builtin/grep.c:868
ef317cd5 16015msgid "process binary files as text"
07432cef 16016msgstr "把二进制文件当做文本处理"
ef317cd5 16017
7e6630a7 16018#: builtin/grep.c:870
ef317cd5 16019msgid "don't match patterns in binary files"
07432cef 16020msgstr "不在二进制文件中匹配模式"
ef317cd5 16021
7e6630a7 16022#: builtin/grep.c:873
90314792
JX
16023msgid "process binary files with textconv filters"
16024msgstr "用 textconv 过滤器处理二进制文件"
16025
7e6630a7 16026#: builtin/grep.c:875
4c27fcb5
JX
16027msgid "search in subdirectories (default)"
16028msgstr "在子目录中寻找(默认)"
16029
7e6630a7 16030#: builtin/grep.c:877
ef317cd5 16031msgid "descend at most <depth> levels"
07432cef 16032msgstr "最多以指定的深度向下寻找"
ef317cd5 16033
7e6630a7 16034#: builtin/grep.c:881
ef317cd5 16035msgid "use extended POSIX regular expressions"
07432cef 16036msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 16037
7e6630a7 16038#: builtin/grep.c:884
ef317cd5 16039msgid "use basic POSIX regular expressions (default)"
07432cef 16040msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 16041
7e6630a7 16042#: builtin/grep.c:887
ef317cd5 16043msgid "interpret patterns as fixed strings"
07432cef 16044msgstr "把模式解析为固定的字符串"
ef317cd5 16045
7e6630a7 16046#: builtin/grep.c:890
ef317cd5 16047msgid "use Perl-compatible regular expressions"
07432cef 16048msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 16049
7e6630a7 16050#: builtin/grep.c:893
ef317cd5 16051msgid "show line numbers"
07432cef 16052msgstr "显示行号"
ef317cd5 16053
7e6630a7 16054#: builtin/grep.c:894
c1ac5258
JX
16055msgid "show column number of first match"
16056msgstr "显示第一个匹配的列号"
16057
7e6630a7 16058#: builtin/grep.c:895
ef317cd5 16059msgid "don't show filenames"
07432cef 16060msgstr "不显示文件名"
ef317cd5 16061
7e6630a7 16062#: builtin/grep.c:896
ef317cd5 16063msgid "show filenames"
07432cef 16064msgstr "显示文件名"
ef317cd5 16065
7e6630a7 16066#: builtin/grep.c:898
ef317cd5 16067msgid "show filenames relative to top directory"
07432cef 16068msgstr "显示相对于顶级目录的文件名"
ef317cd5 16069
7e6630a7 16070#: builtin/grep.c:900
ef317cd5 16071msgid "show only filenames instead of matching lines"
07432cef 16072msgstr "只显示文件名而不显示匹配的行"
ef317cd5 16073
7e6630a7 16074#: builtin/grep.c:902
ef317cd5 16075msgid "synonym for --files-with-matches"
07432cef 16076msgstr "和 --files-with-matches 同义"
ef317cd5 16077
7e6630a7 16078#: builtin/grep.c:905
ef317cd5 16079msgid "show only the names of files without match"
07432cef 16080msgstr "只显示未匹配的文件名"
ef317cd5 16081
7e6630a7 16082#: builtin/grep.c:907
ef317cd5 16083msgid "print NUL after filenames"
07432cef 16084msgstr "在文件名后输出 NUL 字符"
ef317cd5 16085
7e6630a7 16086#: builtin/grep.c:910
c1ac5258
JX
16087msgid "show only matching parts of a line"
16088msgstr "只显示行中的匹配的部分"
16089
7e6630a7 16090#: builtin/grep.c:912
ef317cd5 16091msgid "show the number of matches instead of matching lines"
07432cef 16092msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 16093
7e6630a7 16094#: builtin/grep.c:913
ef317cd5 16095msgid "highlight matches"
07432cef 16096msgstr "高亮显示匹配项"
ef317cd5 16097
7e6630a7 16098#: builtin/grep.c:915
ef317cd5 16099msgid "print empty line between matches from different files"
07432cef 16100msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 16101
7e6630a7 16102#: builtin/grep.c:917
ef317cd5 16103msgid "show filename only once above matches from same file"
07432cef 16104msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 16105
7e6630a7 16106#: builtin/grep.c:920
ef317cd5 16107msgid "show <n> context lines before and after matches"
07432cef 16108msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 16109
7e6630a7 16110#: builtin/grep.c:923
ef317cd5 16111msgid "show <n> context lines before matches"
07432cef 16112msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 16113
7e6630a7 16114#: builtin/grep.c:925
ef317cd5 16115msgid "show <n> context lines after matches"
07432cef 16116msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 16117
7e6630a7 16118#: builtin/grep.c:927
276ceeaa
JX
16119msgid "use <n> worker threads"
16120msgstr "使用 <n> 个工作线程"
16121
7e6630a7 16122#: builtin/grep.c:928
ef317cd5 16123msgid "shortcut for -C NUM"
07432cef 16124msgstr "快捷键 -C 数字"
ef317cd5 16125
7e6630a7 16126#: builtin/grep.c:931
ef317cd5 16127msgid "show a line with the function name before matches"
07432cef 16128msgstr "在匹配的前面显示一行函数名"
ef317cd5 16129
7e6630a7 16130#: builtin/grep.c:933
ef317cd5 16131msgid "show the surrounding function"
07432cef 16132msgstr "显示所在函数的前后内容"
ef317cd5 16133
7e6630a7 16134#: builtin/grep.c:936
ef317cd5 16135msgid "read patterns from file"
07432cef 16136msgstr "从文件读取模式"
ef317cd5 16137
7e6630a7 16138#: builtin/grep.c:938
ef317cd5 16139msgid "match <pattern>"
07432cef 16140msgstr "匹配 <模式>"
ef317cd5 16141
7e6630a7 16142#: builtin/grep.c:940
ef317cd5 16143msgid "combine patterns specified with -e"
07432cef 16144msgstr "组合用 -e 参数设定的模式"
ef317cd5 16145
7e6630a7 16146#: builtin/grep.c:952
ef317cd5 16147msgid "indicate hit with exit status without output"
07432cef 16148msgstr "不输出,而用退出码标识命中状态"
ef317cd5 16149
7e6630a7 16150#: builtin/grep.c:954
ef317cd5 16151msgid "show only matches from files that match all patterns"
07432cef 16152msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 16153
7e6630a7 16154#: builtin/grep.c:957
ef317cd5 16155msgid "pager"
07432cef 16156msgstr "分页"
ef317cd5 16157
7e6630a7 16158#: builtin/grep.c:957
ef317cd5 16159msgid "show matching files in the pager"
07432cef 16160msgstr "分页显示匹配的文件"
ef317cd5 16161
7e6630a7 16162#: builtin/grep.c:961
ef317cd5 16163msgid "allow calling of grep(1) (ignored by this build)"
07432cef 16164msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 16165
7e6630a7 16166#: builtin/grep.c:1027
c1ac5258
JX
16167msgid "no pattern given"
16168msgstr "未提供匹配模式"
c04f5ac3 16169
7e6630a7 16170#: builtin/grep.c:1063
87cb7997
JX
16171msgid "--no-index or --untracked cannot be used with revs"
16172msgstr "--no-index 或 --untracked 不能和版本同时使用"
16173
7e6630a7 16174#: builtin/grep.c:1071
87cb7997
JX
16175#, c-format
16176msgid "unable to resolve revision: %s"
16177msgstr "不能解析版本:%s"
16178
7e6630a7 16179#: builtin/grep.c:1101
2b472aae
JX
16180msgid "--untracked not supported with --recurse-submodules"
16181msgstr "--untracked 不支持和 --recurse-submodules 共用"
16182
7e6630a7 16183#: builtin/grep.c:1105
4c27fcb5
JX
16184msgid "invalid option combination, ignoring --threads"
16185msgstr "无效的选项组合,忽略 --threads"
276ceeaa 16186
7e6630a7 16187#: builtin/grep.c:1108 builtin/pack-objects.c:4059
a4f16749
JX
16188msgid "no threads support, ignoring --threads"
16189msgstr "没有线程支持,忽略 --threads"
16190
7e6630a7 16191#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139
4c27fcb5
JX
16192#, c-format
16193msgid "invalid number of threads specified (%d)"
16194msgstr "指定的线程数无效(%d)"
16195
7e6630a7 16196#: builtin/grep.c:1145
c04f5ac3
JX
16197msgid "--open-files-in-pager only works on the worktree"
16198msgstr "--open-files-in-pager 仅用于工作区"
16199
7e6630a7 16200#: builtin/grep.c:1171
c1ac5258
JX
16201msgid "--cached or --untracked cannot be used with --no-index"
16202msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
c04f5ac3 16203
7e6630a7 16204#: builtin/grep.c:1174
473eb541
JX
16205msgid "--untracked cannot be used with --cached"
16206msgstr "--untracked 不能与 --cached 同时使用"
16207
7e6630a7 16208#: builtin/grep.c:1180
c1ac5258
JX
16209msgid "--[no-]exclude-standard cannot be used for tracked contents"
16210msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
c04f5ac3 16211
7e6630a7 16212#: builtin/grep.c:1188
c1ac5258
JX
16213msgid "both --cached and trees are given"
16214msgstr "同时给出了 --cached 和树对象"
16215
7e6630a7 16216#: builtin/hash-object.c:83
ef317cd5 16217msgid ""
814ff314
JX
16218"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
16219"[--] <file>..."
ef317cd5 16220msgstr ""
814ff314
JX
16221"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
16222"[--] <文件>..."
ef317cd5 16223
7e6630a7 16224#: builtin/hash-object.c:84
94550ed3
JX
16225msgid "git hash-object --stdin-paths"
16226msgstr "git hash-object --stdin-paths"
ef317cd5 16227
7e6630a7 16228#: builtin/hash-object.c:96
ef317cd5 16229msgid "object type"
07432cef 16230msgstr "对象类型"
ef317cd5 16231
7e6630a7 16232#: builtin/hash-object.c:97
ef317cd5 16233msgid "write the object into the object database"
07432cef 16234msgstr "将对象写入对象数据库"
ef317cd5 16235
7e6630a7 16236#: builtin/hash-object.c:99
ef317cd5 16237msgid "read the object from stdin"
07432cef 16238msgstr "从标准输入读取对象"
ef317cd5 16239
7e6630a7 16240#: builtin/hash-object.c:101
ef317cd5 16241msgid "store file as is without filters"
07432cef 16242msgstr "原样存储文件不使用过滤器"
ef317cd5 16243
7e6630a7 16244#: builtin/hash-object.c:102
220c313c
JX
16245msgid ""
16246"just hash any random garbage to create corrupt objects for debugging Git"
16247msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
16248
7e6630a7 16249#: builtin/hash-object.c:103
ef317cd5 16250msgid "process file as it were from this path"
07432cef 16251msgstr "处理文件并假设其来自于此路径"
ef317cd5 16252
7e6630a7 16253#: builtin/help.c:55
ef317cd5 16254msgid "print all available commands"
07432cef 16255msgstr "打印所有可用的命令"
ef317cd5 16256
7e6630a7 16257#: builtin/help.c:57
a0b6b246
JX
16258msgid "exclude guides"
16259msgstr "排除向导"
16260
7e6630a7 16261#: builtin/help.c:58
ef317cd5 16262msgid "show man page"
07432cef 16263msgstr "显示 man 手册"
ef317cd5 16264
7e6630a7 16265#: builtin/help.c:59
ef317cd5 16266msgid "show manual in web browser"
07432cef 16267msgstr "在 web 浏览器中显示手册"
ef317cd5 16268
7e6630a7 16269#: builtin/help.c:61
ef317cd5 16270msgid "show info page"
07432cef 16271msgstr "显示 info 手册"
ef317cd5 16272
7e6630a7 16273#: builtin/help.c:63
fd8cb379
JX
16274msgid "print command description"
16275msgstr "打印命令描述"
16276
7e6630a7
FZ
16277#: builtin/help.c:65
16278msgid "print list of useful guides"
16279msgstr "显示有用的指南列表"
16280
16281#: builtin/help.c:67
16282msgid "print all configuration variable names"
16283msgstr "打印所有配置变量名称"
16284
16285#: builtin/help.c:78
16286msgid ""
16287"git help [-a|--all] [--[no-]verbose]]\n"
16288" [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
16289msgstr ""
16290"git help [-a|--all] [--[no-]verbose]]\n"
16291" [[-i|--info] [-m|--man] [-w|--web]] [<命令>]"
16292
16293#: builtin/help.c:80
16294msgid "git help [-g|--guides]"
16295msgstr "git help [-g|--guides]"
16296
16297#: builtin/help.c:81
16298msgid "git help [-c|--config]"
16299msgstr "git help [-c|--config]"
ef317cd5 16300
7e6630a7 16301#: builtin/help.c:196
81809b99 16302#, c-format
8ada9598 16303msgid "unrecognized help format '%s'"
81809b99 16304msgstr "未能识别的帮助格式 '%s'"
8ada9598 16305
65387fd5 16306#: builtin/help.c:222
8ada9598 16307msgid "Failed to start emacsclient."
81809b99 16308msgstr "无法启动 emacsclient。"
8ada9598 16309
65387fd5 16310#: builtin/help.c:235
8ada9598 16311msgid "Failed to parse emacsclient version."
81809b99 16312msgstr "无法解析 emacsclient 版本。"
8ada9598 16313
65387fd5 16314#: builtin/help.c:243
8ada9598
JX
16315#, c-format
16316msgid "emacsclient version '%d' too old (< 22)."
07432cef 16317msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 16318
65387fd5 16319#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
81809b99 16320#, c-format
5b04ee3b 16321msgid "failed to exec '%s'"
65387fd5 16322msgstr "无法执行 '%s'"
8ada9598 16323
65387fd5 16324#: builtin/help.c:339
8ada9598
JX
16325#, c-format
16326msgid ""
16327"'%s': path for unsupported man viewer.\n"
16328"Please consider using 'man.<tool>.cmd' instead."
16329msgstr ""
81809b99 16330"'%s':不支持的 man 手册查看器的路径。\n"
d9d56b23 16331"请使用 'man.<工具>.cmd'。"
8ada9598 16332
65387fd5 16333#: builtin/help.c:351
8ada9598
JX
16334#, c-format
16335msgid ""
16336"'%s': cmd for supported man viewer.\n"
16337"Please consider using 'man.<tool>.path' instead."
16338msgstr ""
81809b99 16339"'%s': 支持的 man 手册查看器命令。\n"
d9d56b23 16340"请使用 'man.<工具>.path'。"
8ada9598 16341
65387fd5 16342#: builtin/help.c:466
8ada9598
JX
16343#, c-format
16344msgid "'%s': unknown man viewer."
81809b99 16345msgstr "'%s':未知的 man 查看器。"
8ada9598 16346
65387fd5 16347#: builtin/help.c:482
8ada9598 16348msgid "no man viewer handled the request"
81809b99 16349msgstr "没有 man 查看器处理此请求"
8ada9598 16350
65387fd5 16351#: builtin/help.c:489
8ada9598 16352msgid "no info viewer handled the request"
81809b99 16353msgstr "没有 info 查看器处理此请求"
8ada9598 16354
65387fd5 16355#: builtin/help.c:550 builtin/help.c:561 git.c:348
fd8cb379
JX
16356#, c-format
16357msgid "'%s' is aliased to '%s'"
16358msgstr "'%s' 是 '%s' 的别名"
220c313c 16359
65387fd5 16360#: builtin/help.c:564 git.c:380
4c27fcb5
JX
16361#, c-format
16362msgid "bad alias.%s string: %s"
16363msgstr "坏的 alias.%s 字符串:%s"
16364
65387fd5 16365#: builtin/help.c:580
7e6630a7
FZ
16366msgid "this option doesn't take any other arguments"
16367msgstr "这个选项不带其他参数"
16368
65387fd5 16369#: builtin/help.c:601 builtin/help.c:628
fd8cb379
JX
16370#, c-format
16371msgid "usage: %s%s"
16372msgstr "用法:%s%s"
4dcdc3d8 16373
65387fd5 16374#: builtin/help.c:623
c1ac5258
JX
16375msgid "'git help config' for more information"
16376msgstr "'git help config' 获取更多信息"
4dcdc3d8 16377
7e6630a7 16378#: builtin/index-pack.c:221
8ada9598
JX
16379#, c-format
16380msgid "object type mismatch at %s"
81809b99 16381msgstr "%s 的对象类型不匹配"
8ada9598 16382
7e6630a7 16383#: builtin/index-pack.c:241
6acbf033
JX
16384#, c-format
16385msgid "did not receive expected object %s"
a0b6b246 16386msgstr "未能获取预期的对象 %s"
8ada9598 16387
7e6630a7 16388#: builtin/index-pack.c:244
6acbf033
JX
16389#, c-format
16390msgid "object %s: expected type %s, found %s"
a0b6b246 16391msgstr "对象 %s:应为类型 %s,却是 %s"
6acbf033 16392
7e6630a7 16393#: builtin/index-pack.c:294
81809b99 16394#, c-format
8ada9598
JX
16395msgid "cannot fill %d byte"
16396msgid_plural "cannot fill %d bytes"
81809b99 16397msgstr[0] "无法填充 %d 字节"
5ae481e0 16398msgstr[1] "无法填充 %d 字节"
8ada9598 16399
7e6630a7 16400#: builtin/index-pack.c:304
8ada9598 16401msgid "early EOF"
81809b99 16402msgstr "过早的文件结束符(EOF)"
8ada9598 16403
7e6630a7 16404#: builtin/index-pack.c:305
8ada9598 16405msgid "read error on input"
81809b99 16406msgstr "输入上的读错误"
8ada9598 16407
7e6630a7 16408#: builtin/index-pack.c:317
8ada9598 16409msgid "used more bytes than were available"
81809b99 16410msgstr "用掉了超过可用的字节"
8ada9598 16411
7e6630a7 16412#: builtin/index-pack.c:324 builtin/pack-objects.c:756
8ada9598 16413msgid "pack too large for current definition of off_t"
81809b99 16414msgstr "包太大超过了当前 off_t 的定义"
8ada9598 16415
7e6630a7 16416#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
a0b6b246
JX
16417msgid "pack exceeds maximum allowed size"
16418msgstr "包超过了最大允许值"
16419
7e6630a7 16420#: builtin/index-pack.c:358
8ada9598 16421msgid "pack signature mismatch"
81809b99 16422msgstr "包签名不匹配"
8ada9598 16423
7e6630a7 16424#: builtin/index-pack.c:360
ef317cd5
JX
16425#, c-format
16426msgid "pack version %<PRIu32> unsupported"
07432cef 16427msgstr "不支持包版本 %<PRIu32>"
ef317cd5 16428
7e6630a7 16429#: builtin/index-pack.c:376
8ada9598 16430#, c-format
5c57d762
JX
16431msgid "pack has bad object at offset %<PRIuMAX>: %s"
16432msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
8ada9598 16433
7e6630a7 16434#: builtin/index-pack.c:482
8ada9598
JX
16435#, c-format
16436msgid "inflate returned %d"
81809b99 16437msgstr "解压缩返回 %d"
8ada9598 16438
7e6630a7 16439#: builtin/index-pack.c:531
8ada9598 16440msgid "offset value overflow for delta base object"
81809b99 16441msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 16442
7e6630a7 16443#: builtin/index-pack.c:539
8ada9598 16444msgid "delta base offset is out of bound"
81809b99 16445msgstr "delta 基准偏移越界"
8ada9598 16446
7e6630a7 16447#: builtin/index-pack.c:547
81809b99 16448#, c-format
8ada9598 16449msgid "unknown object type %d"
81809b99 16450msgstr "未知对象类型 %d"
8ada9598 16451
7e6630a7 16452#: builtin/index-pack.c:578
8ada9598 16453msgid "cannot pread pack file"
81809b99 16454msgstr "无法读取包文件"
8ada9598 16455
7e6630a7 16456#: builtin/index-pack.c:580
8ada9598 16457#, c-format
5c57d762
JX
16458msgid "premature end of pack file, %<PRIuMAX> byte missing"
16459msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
16460msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
16461msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
8ada9598 16462
7e6630a7 16463#: builtin/index-pack.c:606
8ada9598 16464msgid "serious inflate inconsistency"
81809b99 16465msgstr "解压缩严重的不一致"
8ada9598 16466
7e6630a7
FZ
16467#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781
16468#: builtin/index-pack.c:820 builtin/index-pack.c:829
8ada9598
JX
16469#, c-format
16470msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 16471msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 16472
7e6630a7 16473#: builtin/index-pack.c:754 builtin/pack-objects.c:292
ec3d4607 16474#: builtin/pack-objects.c:352 builtin/pack-objects.c:458
6792b93b
JX
16475#, c-format
16476msgid "unable to read %s"
16477msgstr "不能读 %s"
16478
7e6630a7 16479#: builtin/index-pack.c:818
87cb7997
JX
16480#, c-format
16481msgid "cannot read existing object info %s"
16482msgstr "不能读取现存对象信息 %s"
16483
7e6630a7 16484#: builtin/index-pack.c:826
6792b93b
JX
16485#, c-format
16486msgid "cannot read existing object %s"
16487msgstr "不能读取现存对象 %s"
16488
7e6630a7 16489#: builtin/index-pack.c:840
81809b99 16490#, c-format
8ada9598 16491msgid "invalid blob object %s"
160fb2b2 16492msgstr "无效的数据对象 %s"
8ada9598 16493
7e6630a7 16494#: builtin/index-pack.c:843 builtin/index-pack.c:862
fd8cb379
JX
16495msgid "fsck error in packed object"
16496msgstr "对打包对象 fsck 检查出错"
16497
7e6630a7 16498#: builtin/index-pack.c:864
8ada9598
JX
16499#, c-format
16500msgid "Not all child objects of %s are reachable"
81809b99 16501msgstr "%s 的所有子对象并非都可达"
8ada9598 16502
7e6630a7 16503#: builtin/index-pack.c:925 builtin/index-pack.c:972
8ada9598 16504msgid "failed to apply delta"
65387fd5 16505msgstr "无法应用 delta"
8ada9598 16506
7e6630a7 16507#: builtin/index-pack.c:1156
8ada9598 16508msgid "Receiving objects"
81809b99 16509msgstr "接收对象中"
8ada9598 16510
7e6630a7 16511#: builtin/index-pack.c:1156
8ada9598 16512msgid "Indexing objects"
81809b99 16513msgstr "索引对象中"
8ada9598 16514
7e6630a7 16515#: builtin/index-pack.c:1190
8ada9598 16516msgid "pack is corrupted (SHA1 mismatch)"
81809b99 16517msgstr "包冲突(SHA1 不匹配)"
8ada9598 16518
7e6630a7 16519#: builtin/index-pack.c:1195
8ada9598 16520msgid "cannot fstat packfile"
65e2041e 16521msgstr "不能对包文件调用 fstat"
8ada9598 16522
7e6630a7 16523#: builtin/index-pack.c:1198
8ada9598 16524msgid "pack has junk at the end"
81809b99 16525msgstr "包的结尾有垃圾数据"
8ada9598 16526
7e6630a7 16527#: builtin/index-pack.c:1210
6792b93b
JX
16528msgid "confusion beyond insanity in parse_pack_objects()"
16529msgstr "parse_pack_objects() 中遇到不可理喻的问题"
16530
7e6630a7 16531#: builtin/index-pack.c:1233
8ada9598 16532msgid "Resolving deltas"
81809b99 16533msgstr "处理 delta 中"
8ada9598 16534
7e6630a7 16535#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905
07432cef 16536#, c-format
ef317cd5 16537msgid "unable to create thread: %s"
07432cef 16538msgstr "不能创建线程:%s"
ef317cd5 16539
7e6630a7 16540#: builtin/index-pack.c:1277
8ada9598 16541msgid "confusion beyond insanity"
81809b99 16542msgstr "不可理喻"
8ada9598 16543
7e6630a7 16544#: builtin/index-pack.c:1283
ef317cd5 16545#, c-format
5b04ee3b
JX
16546msgid "completed with %d local object"
16547msgid_plural "completed with %d local objects"
16548msgstr[0] "完成 %d 个本地对象"
16549msgstr[1] "完成 %d 个本地对象"
ef317cd5 16550
7e6630a7 16551#: builtin/index-pack.c:1295
ef317cd5
JX
16552#, c-format
16553msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 16554msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 16555
7e6630a7 16556#: builtin/index-pack.c:1299
8ada9598
JX
16557#, c-format
16558msgid "pack has %d unresolved delta"
16559msgid_plural "pack has %d unresolved deltas"
81809b99 16560msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 16561msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 16562
7e6630a7 16563#: builtin/index-pack.c:1323
81809b99 16564#, c-format
8ada9598 16565msgid "unable to deflate appended object (%d)"
07432cef 16566msgstr "不能压缩附加对象(%d)"
8ada9598 16567
7e6630a7 16568#: builtin/index-pack.c:1419
8ada9598
JX
16569#, c-format
16570msgid "local object %s is corrupt"
81809b99 16571msgstr "本地对象 %s 已损坏"
8ada9598 16572
7e6630a7 16573#: builtin/index-pack.c:1440
31e5e17b 16574#, c-format
473eb541
JX
16575msgid "packfile name '%s' does not end with '.%s'"
16576msgstr "包文件名 '%s' 没有以 '.%s' 结尾"
8ada9598 16577
7e6630a7 16578#: builtin/index-pack.c:1464
81809b99 16579#, c-format
31e5e17b
JX
16580msgid "cannot write %s file '%s'"
16581msgstr "无法写入 %s 文件 '%s'"
8ada9598 16582
7e6630a7 16583#: builtin/index-pack.c:1472
81809b99 16584#, c-format
31e5e17b
JX
16585msgid "cannot close written %s file '%s'"
16586msgstr "无法关闭已写入的 %s 文件 '%s'"
16587
7e6630a7
FZ
16588#: builtin/index-pack.c:1489
16589#, c-format
84bf71ea
FZ
16590msgid "unable to rename temporary '*.%s' file to '%s'"
16591msgstr "不能重命名临时文件 '*.%s' 为 '%s'"
7e6630a7
FZ
16592
16593#: builtin/index-pack.c:1514
31e5e17b
JX
16594msgid "error while closing pack file"
16595msgstr "关闭包文件时出错"
8ada9598 16596
7e6630a7 16597#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150
07432cef 16598#, c-format
ef317cd5 16599msgid "bad pack.indexversion=%<PRIu32>"
07432cef 16600msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 16601
7e6630a7 16602#: builtin/index-pack.c:1643
81809b99 16603#, c-format
8ada9598 16604msgid "Cannot open existing pack file '%s'"
81809b99 16605msgstr "无法打开现存包文件 '%s'"
8ada9598 16606
7e6630a7 16607#: builtin/index-pack.c:1645
81809b99 16608#, c-format
8ada9598 16609msgid "Cannot open existing pack idx file for '%s'"
81809b99 16610msgstr "无法为 %s 打开包索引文件"
8ada9598 16611
7e6630a7 16612#: builtin/index-pack.c:1693
81809b99 16613#, c-format
8ada9598
JX
16614msgid "non delta: %d object"
16615msgid_plural "non delta: %d objects"
81809b99 16616msgstr[0] "非 delta:%d 个对象"
5ae481e0 16617msgstr[1] "非 delta:%d 个对象"
8ada9598 16618
7e6630a7 16619#: builtin/index-pack.c:1700
8ada9598
JX
16620#, c-format
16621msgid "chain length = %d: %lu object"
16622msgid_plural "chain length = %d: %lu objects"
81809b99 16623msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 16624msgstr[1] "链长 = %d: %lu 对象"
8ada9598 16625
7e6630a7 16626#: builtin/index-pack.c:1742
31e5e17b
JX
16627msgid "Cannot come back to cwd"
16628msgstr "无法返回当前工作目录"
5b04ee3b 16629
7e6630a7
FZ
16630#: builtin/index-pack.c:1796 builtin/index-pack.c:1799
16631#: builtin/index-pack.c:1819 builtin/index-pack.c:1823
81809b99 16632#, c-format
8ada9598 16633msgid "bad %s"
81809b99 16634msgstr "错误选项 %s"
8ada9598 16635
7e6630a7 16636#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614
7157c2b5
JX
16637#, c-format
16638msgid "unknown hash algorithm '%s'"
16639msgstr "未知的哈希算法 '%s'"
16640
7e6630a7 16641#: builtin/index-pack.c:1850
1a79b2f1 16642msgid "--stdin requires a git repository"
d9488fea 16643msgstr "--stdin 需要 git 仓库"
1a79b2f1 16644
7e6630a7 16645#: builtin/index-pack.c:1867
8ada9598 16646msgid "--verify with no packfile name given"
dbd6cced 16647msgstr "--verify 没有提供包文件名参数"
8ada9598 16648
7e6630a7 16649#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584
fd8cb379
JX
16650msgid "fsck error in pack objects"
16651msgstr "在打包对象中 fsck 检查出错"
16652
33b62fba 16653#: builtin/init-db.c:63
c04f5ac3
JX
16654#, c-format
16655msgid "cannot stat template '%s'"
65e2041e 16656msgstr "不能对模版 '%s' 调用 stat"
c04f5ac3 16657
33b62fba 16658#: builtin/init-db.c:68
c04f5ac3
JX
16659#, c-format
16660msgid "cannot opendir '%s'"
16661msgstr "不能打开目录 '%s'"
16662
33b62fba 16663#: builtin/init-db.c:80
c04f5ac3
JX
16664#, c-format
16665msgid "cannot readlink '%s'"
16666msgstr "不能读取链接 '%s'"
16667
33b62fba 16668#: builtin/init-db.c:82
c04f5ac3
JX
16669#, c-format
16670msgid "cannot symlink '%s' '%s'"
90e6ef53 16671msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3 16672
33b62fba 16673#: builtin/init-db.c:88
c04f5ac3
JX
16674#, c-format
16675msgid "cannot copy '%s' to '%s'"
16676msgstr "不能拷贝 '%s' 至 '%s'"
16677
33b62fba 16678#: builtin/init-db.c:92
c04f5ac3
JX
16679#, c-format
16680msgid "ignoring template %s"
16681msgstr "忽略模版 %s"
16682
33b62fba 16683#: builtin/init-db.c:123
c04f5ac3 16684#, c-format
fd8cb379
JX
16685msgid "templates not found in %s"
16686msgstr "没有在 %s 中找到模版"
c04f5ac3 16687
33b62fba 16688#: builtin/init-db.c:138
c04f5ac3 16689#, c-format
5b04ee3b
JX
16690msgid "not copying templates from '%s': %s"
16691msgstr "没有从 '%s' 复制模版:%s"
c04f5ac3 16692
ec3d4607 16693#: builtin/init-db.c:263
7157c2b5
JX
16694#, c-format
16695msgid "invalid initial branch name: '%s'"
16696msgstr "无效的初始分支名:'%s'"
16697
ec3d4607 16698#: builtin/init-db.c:354
c04f5ac3
JX
16699#, c-format
16700msgid "unable to handle file type %d"
16701msgstr "不能处理 %d 类型的文件"
16702
ec3d4607 16703#: builtin/init-db.c:357
c04f5ac3
JX
16704#, c-format
16705msgid "unable to move %s to %s"
16706msgstr "不能移动 %s 至 %s"
16707
ec3d4607 16708#: builtin/init-db.c:373
349ede6a
JX
16709msgid "attempt to reinitialize repository with different hash"
16710msgstr "尝试用不同的哈希算法重新初始化仓库"
16711
ec3d4607 16712#: builtin/init-db.c:397 builtin/init-db.c:400
a0b6b246
JX
16713#, c-format
16714msgid "%s already exists"
16715msgstr "%s 已经存在"
16716
ec3d4607 16717#: builtin/init-db.c:432
7157c2b5
JX
16718#, c-format
16719msgid "re-init: ignored --initial-branch=%s"
16720msgstr "re-init:已忽略 --initial-branch=%s"
16721
ec3d4607 16722#: builtin/init-db.c:463
c04f5ac3 16723#, c-format
5c57d762
JX
16724msgid "Reinitialized existing shared Git repository in %s%s\n"
16725msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
c04f5ac3 16726
ec3d4607 16727#: builtin/init-db.c:464
5c57d762
JX
16728#, c-format
16729msgid "Reinitialized existing Git repository in %s%s\n"
ec3d4607 16730msgstr "已重新初始化已存在的 Git 仓库于 %s%s\n"
c04f5ac3 16731
ec3d4607 16732#: builtin/init-db.c:468
5c57d762
JX
16733#, c-format
16734msgid "Initialized empty shared Git repository in %s%s\n"
9a4b694c 16735msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
c04f5ac3 16736
ec3d4607 16737#: builtin/init-db.c:469
5c57d762
JX
16738#, c-format
16739msgid "Initialized empty Git repository in %s%s\n"
9a4b694c 16740msgstr "已初始化空的 Git 仓库于 %s%s\n"
c04f5ac3 16741
ec3d4607 16742#: builtin/init-db.c:518
ef317cd5 16743msgid ""
a77c07d9 16744"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
814ff314 16745"shared[=<permissions>]] [<directory>]"
ef317cd5 16746msgstr ""
07432cef 16747"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
814ff314 16748"[<目录>]"
ef317cd5 16749
ec3d4607 16750#: builtin/init-db.c:544
ef317cd5 16751msgid "permissions"
07432cef 16752msgstr "权限"
ef317cd5 16753
ec3d4607 16754#: builtin/init-db.c:545
ef317cd5 16755msgid "specify that the git repository is to be shared amongst several users"
160fb2b2 16756msgstr "指定 git 仓库是多个用户之间共享的"
ef317cd5 16757
ec3d4607 16758#: builtin/init-db.c:551
7157c2b5
JX
16759msgid "override the name of the initial branch"
16760msgstr "覆盖初始分支名称"
16761
ec3d4607 16762#: builtin/init-db.c:552 builtin/verify-pack.c:74
349ede6a
JX
16763msgid "hash"
16764msgstr "hash"
16765
ec3d4607 16766#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75
349ede6a
JX
16767msgid "specify the hash algorithm to use"
16768msgstr "指定要使用的哈希算法"
16769
ec3d4607 16770#: builtin/init-db.c:591 builtin/init-db.c:596
c1ac5258
JX
16771#, c-format
16772msgid "cannot mkdir %s"
16773msgstr "不能创建目录 %s"
16774
ec3d4607 16775#: builtin/init-db.c:600 builtin/init-db.c:655
c04f5ac3
JX
16776#, c-format
16777msgid "cannot chdir to %s"
16778msgstr "不能切换目录到 %s"
16779
ec3d4607 16780#: builtin/init-db.c:627
c04f5ac3
JX
16781#, c-format
16782msgid ""
16783"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
16784"dir=<directory>)"
1e607449 16785msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
c04f5ac3 16786
ec3d4607 16787#: builtin/init-db.c:679
c04f5ac3
JX
16788#, c-format
16789msgid "Cannot access work tree '%s'"
16790msgstr "不能访问工作区 '%s'"
16791
ec3d4607 16792#: builtin/init-db.c:684
d9488fea
JX
16793msgid "--separate-git-dir incompatible with bare repository"
16794msgstr "--separate-git-dir 不能用于纯仓库"
16795
a6cd2cc4 16796#: builtin/interpret-trailers.c:16
220c313c 16797msgid ""
276ceeaa
JX
16798"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
16799"<token>[(=|:)<value>])...] [<file>...]"
3495628d
JX
16800msgstr ""
16801"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
16802">])...] [<文件>...]"
276ceeaa 16803
a6cd2cc4 16804#: builtin/interpret-trailers.c:95
276ceeaa
JX
16805msgid "edit files in place"
16806msgstr "在原位编辑文件"
220c313c 16807
a6cd2cc4 16808#: builtin/interpret-trailers.c:96
220c313c 16809msgid "trim empty trailers"
d13389bf 16810msgstr "删除空的尾注"
6937cb4e 16811
a6cd2cc4 16812#: builtin/interpret-trailers.c:99
6937cb4e 16813msgid "where to place the new trailer"
d13389bf 16814msgstr "在哪里放置新的尾注"
220c313c 16815
a6cd2cc4 16816#: builtin/interpret-trailers.c:101
6937cb4e 16817msgid "action if trailer already exists"
d13389bf 16818msgstr "当尾注已经存在时所采取的动作"
6937cb4e 16819
a6cd2cc4 16820#: builtin/interpret-trailers.c:103
6937cb4e 16821msgid "action if trailer is missing"
d13389bf 16822msgstr "当尾注缺失时所采取的动作"
6937cb4e 16823
a6cd2cc4 16824#: builtin/interpret-trailers.c:105
6937cb4e 16825msgid "output only the trailers"
d13389bf 16826msgstr "只输出尾注"
6937cb4e 16827
a6cd2cc4 16828#: builtin/interpret-trailers.c:106
6937cb4e
JX
16829msgid "do not apply config rules"
16830msgstr "不要应用配置规则"
16831
a6cd2cc4 16832#: builtin/interpret-trailers.c:107
6937cb4e
JX
16833msgid "join whitespace-continued values"
16834msgstr "连接空白折行的值"
16835
a6cd2cc4 16836#: builtin/interpret-trailers.c:108
6937cb4e
JX
16837msgid "set parsing options"
16838msgstr "设置解析选项"
16839
a6cd2cc4 16840#: builtin/interpret-trailers.c:110
4c27fcb5
JX
16841msgid "do not treat --- specially"
16842msgstr "不要对 --- 特殊处理"
16843
a6cd2cc4 16844#: builtin/interpret-trailers.c:112
220c313c 16845msgid "trailer(s) to add"
d13389bf 16846msgstr "要添加的尾注"
220c313c 16847
a6cd2cc4 16848#: builtin/interpret-trailers.c:123
6937cb4e
JX
16849msgid "--trailer with --only-input does not make sense"
16850msgstr "--trailer 和 --only-input 同时使用没有意义"
16851
a6cd2cc4 16852#: builtin/interpret-trailers.c:133
276ceeaa
JX
16853msgid "no input file given for in-place editing"
16854msgstr "没有给出要原位编辑的文件"
16855
473eb541 16856#: builtin/log.c:59
7aea43ff 16857msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
d9d56b23 16858msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
ef317cd5 16859
473eb541 16860#: builtin/log.c:60
814ff314
JX
16861msgid "git show [<options>] <object>..."
16862msgstr "git show [<选项>] <对象>..."
ef317cd5 16863
473eb541 16864#: builtin/log.c:113
220c313c
JX
16865#, c-format
16866msgid "invalid --decorate option: %s"
16867msgstr "无效的 --decorate 选项:%s"
16868
473eb541 16869#: builtin/log.c:180
ef317cd5 16870msgid "show source"
07432cef 16871msgstr "显示源"
ef317cd5 16872
473eb541
JX
16873#: builtin/log.c:181
16874msgid "use mail map file"
07432cef
WS
16875msgstr "使用邮件映射文件"
16876
473eb541 16877#: builtin/log.c:184
5809aa05
JX
16878msgid "only decorate refs that match <pattern>"
16879msgstr "只修饰与 <模式> 匹配的引用"
16880
473eb541 16881#: builtin/log.c:186
5809aa05
JX
16882msgid "do not decorate refs that match <pattern>"
16883msgstr "不修饰和 <模式> 匹配的引用"
16884
473eb541 16885#: builtin/log.c:187
ef317cd5 16886msgid "decorate options"
07432cef 16887msgstr "修饰选项"
ef317cd5 16888
473eb541 16889#: builtin/log.c:190
d13389bf 16890msgid ""
473eb541 16891"trace the evolution of line range <start>,<end> or function :<funcname> in "
d13389bf
JX
16892"<file>"
16893msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数名> 的演变"
16894
473eb541 16895#: builtin/log.c:213
d13389bf
JX
16896msgid "-L<range>:<file> cannot be used with pathspec"
16897msgstr "-L<范围>:<文件> 不能和路径表达式共用"
220c313c 16898
65387fd5 16899#: builtin/log.c:321
c04f5ac3
JX
16900#, c-format
16901msgid "Final output: %d %s\n"
16902msgstr "最终输出:%d %s\n"
16903
65387fd5 16904#: builtin/log.c:586
220c313c
JX
16905#, c-format
16906msgid "git show %s: bad file"
16907msgstr "git show %s: 损坏的文件"
16908
65387fd5 16909#: builtin/log.c:601 builtin/log.c:691
c04f5ac3 16910#, c-format
d46c5519 16911msgid "could not read object %s"
90e6ef53 16912msgstr "不能读取对象 %s"
c04f5ac3 16913
65387fd5 16914#: builtin/log.c:716
c04f5ac3 16915#, c-format
d46c5519 16916msgid "unknown type: %d"
c04f5ac3
JX
16917msgstr "未知类型:%d"
16918
65387fd5 16919#: builtin/log.c:861
ddc12c42
JX
16920#, c-format
16921msgid "%s: invalid cover from description mode"
16922msgstr "%s:从描述生成附函的模式无效"
16923
65387fd5 16924#: builtin/log.c:868
c04f5ac3
JX
16925msgid "format.headers without value"
16926msgstr "format.headers 没有值"
16927
65387fd5 16928#: builtin/log.c:997
c04f5ac3 16929#, c-format
d46c5519 16930msgid "cannot open patch file %s"
c04f5ac3
JX
16931msgstr "无法打开补丁文件 %s"
16932
65387fd5 16933#: builtin/log.c:1014
d46c5519
JX
16934msgid "need exactly one range"
16935msgstr "只需要一个范围"
c04f5ac3 16936
65387fd5 16937#: builtin/log.c:1024
d46c5519
JX
16938msgid "not a range"
16939msgstr "不是一个范围"
c04f5ac3 16940
65387fd5 16941#: builtin/log.c:1188
d46c5519
JX
16942msgid "cover letter needs email format"
16943msgstr "附函需要邮件地址格式"
c04f5ac3 16944
65387fd5 16945#: builtin/log.c:1194
d46c5519
JX
16946msgid "failed to create cover-letter file"
16947msgstr "无法创建附函文件"
16948
65387fd5 16949#: builtin/log.c:1281
c04f5ac3
JX
16950#, c-format
16951msgid "insane in-reply-to: %s"
16952msgstr "不正常的 in-reply-to:%s"
16953
65387fd5 16954#: builtin/log.c:1308
814ff314
JX
16955msgid "git format-patch [<options>] [<since> | <revision-range>]"
16956msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
ef317cd5 16957
65387fd5 16958#: builtin/log.c:1366
d46c5519 16959msgid "two output directories?"
c04f5ac3
JX
16960msgstr "两个输出目录?"
16961
65387fd5 16962#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
5b04ee3b 16963#, c-format
d46c5519 16964msgid "unknown commit %s"
5b04ee3b
JX
16965msgstr "未知提交 %s"
16966
65387fd5 16967#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
d46c5519 16968#: builtin/replace.c:210
5b04ee3b 16969#, c-format
d46c5519
JX
16970msgid "failed to resolve '%s' as a valid ref"
16971msgstr "无法将 '%s' 解析为一个有效引用"
5b04ee3b 16972
65387fd5 16973#: builtin/log.c:1537
d46c5519
JX
16974msgid "could not find exact merge base"
16975msgstr "不能找到准确的合并基线"
5b04ee3b 16976
65387fd5 16977#: builtin/log.c:1547
5b04ee3b 16978msgid ""
d46c5519 16979"failed to get upstream, if you want to record base commit automatically,\n"
5b04ee3b 16980"please use git branch --set-upstream-to to track a remote branch.\n"
d46c5519 16981"Or you could specify base commit by --base=<base-commit-id> manually"
5b04ee3b 16982msgstr ""
7e6630a7
FZ
16983"无法得到上游地址,如果您想自动记录基线提交,请使用命令\n"
16984"git branch --set-upstream-to 来跟踪一个远程分支。或者您可以通过\n"
d46c5519 16985"参数 --base=<基线提交> 手动指定一个基线提交"
5b04ee3b 16986
65387fd5 16987#: builtin/log.c:1570
d46c5519 16988msgid "failed to find exact merge base"
5b04ee3b
JX
16989msgstr "无法找到准确的合并基线"
16990
65387fd5 16991#: builtin/log.c:1587
5b04ee3b
JX
16992msgid "base commit should be the ancestor of revision list"
16993msgstr "基线提交应该是版本列表的祖先"
16994
65387fd5 16995#: builtin/log.c:1597
5b04ee3b
JX
16996msgid "base commit shouldn't be in revision list"
16997msgstr "基线提交不应该出现在版本列表中"
16998
65387fd5 16999#: builtin/log.c:1655
5b04ee3b 17000msgid "cannot get patch id"
aef18cc6 17001msgstr "无法得到补丁 id"
5b04ee3b 17002
65387fd5 17003#: builtin/log.c:1718
d9488fea
JX
17004msgid "failed to infer range-diff origin of current series"
17005msgstr "无法推断当前系列的 range-diff 起始"
17006
65387fd5 17007#: builtin/log.c:1720
d9488fea
JX
17008#, c-format
17009msgid "using '%s' as range-diff origin of current series"
17010msgstr "使用 '%s' 作为当前系列的 range-diff 源"
4c27fcb5 17011
65387fd5 17012#: builtin/log.c:1764
ef317cd5 17013msgid "use [PATCH n/m] even with a single patch"
07432cef 17014msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 17015
65387fd5 17016#: builtin/log.c:1767
ef317cd5 17017msgid "use [PATCH] even with multiple patches"
07432cef 17018msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 17019
65387fd5 17020#: builtin/log.c:1771
ef317cd5 17021msgid "print patches to standard out"
07432cef 17022msgstr "打印补丁到标准输出"
c04f5ac3 17023
65387fd5 17024#: builtin/log.c:1773
ef317cd5 17025msgid "generate a cover letter"
d46c5519 17026msgstr "生成一封附函"
c04f5ac3 17027
65387fd5 17028#: builtin/log.c:1775
ef317cd5 17029msgid "use simple number sequence for output file names"
07432cef 17030msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 17031
65387fd5 17032#: builtin/log.c:1776
ef317cd5 17033msgid "sfx"
07432cef 17034msgstr "后缀"
ef317cd5 17035
65387fd5 17036#: builtin/log.c:1777
ef317cd5 17037msgid "use <sfx> instead of '.patch'"
07432cef 17038msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 17039
65387fd5 17040#: builtin/log.c:1779
ef317cd5 17041msgid "start numbering patches at <n> instead of 1"
07432cef
WS
17042msgstr "补丁以 <n> 开始编号,而不是1"
17043
65387fd5 17044#: builtin/log.c:1780
33b62fba
JX
17045msgid "reroll-count"
17046msgstr "重制-计数"
17047
65387fd5 17048#: builtin/log.c:1781
07432cef
WS
17049msgid "mark the series as Nth re-roll"
17050msgstr "标记补丁系列是第几次重制"
ef317cd5 17051
65387fd5 17052#: builtin/log.c:1783
d13389bf
JX
17053msgid "max length of output filename"
17054msgstr "输出文件名的最大长度"
17055
65387fd5 17056#: builtin/log.c:1785
473eb541 17057msgid "use [RFC PATCH] instead of [PATCH]"
a0b6b246
JX
17058msgstr "使用 [RFC PATCH] 代替 [PATCH]"
17059
65387fd5 17060#: builtin/log.c:1788
ddc12c42
JX
17061msgid "cover-from-description-mode"
17062msgstr "从分支描述获取附函的模式"
17063
65387fd5 17064#: builtin/log.c:1789
ddc12c42
JX
17065msgid "generate parts of a cover letter based on a branch's description"
17066msgstr "基于一个分支描述生成部分附函"
17067
65387fd5 17068#: builtin/log.c:1791
473eb541 17069msgid "use [<prefix>] instead of [PATCH]"
07432cef 17070msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 17071
65387fd5 17072#: builtin/log.c:1794
ef317cd5 17073msgid "store resulting files in <dir>"
d9d56b23 17074msgstr "把结果文件存储在 <目录>"
ef317cd5 17075
65387fd5 17076#: builtin/log.c:1797
ef317cd5 17077msgid "don't strip/add [PATCH]"
07432cef 17078msgstr "不删除/添加 [PATCH]"
ef317cd5 17079
65387fd5 17080#: builtin/log.c:1800
ef317cd5 17081msgid "don't output binary diffs"
07432cef 17082msgstr "不输出二进制差异"
ef317cd5 17083
65387fd5 17084#: builtin/log.c:1802
89f80d72
JX
17085msgid "output all-zero hash in From header"
17086msgstr "在 From 头信息中输出全为零的哈希值"
17087
65387fd5 17088#: builtin/log.c:1804
ef317cd5 17089msgid "don't include a patch matching a commit upstream"
07432cef 17090msgstr "不包含已在上游提交中的补丁"
ef317cd5 17091
65387fd5 17092#: builtin/log.c:1806
ef317cd5 17093msgid "show patch format instead of default (patch + stat)"
07432cef 17094msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 17095
65387fd5 17096#: builtin/log.c:1808
ef317cd5 17097msgid "Messaging"
07432cef 17098msgstr "邮件发送"
ef317cd5 17099
65387fd5 17100#: builtin/log.c:1809
ef317cd5 17101msgid "header"
07432cef 17102msgstr "header"
ef317cd5 17103
65387fd5 17104#: builtin/log.c:1810
ef317cd5 17105msgid "add email header"
07432cef 17106msgstr "添加邮件头"
ef317cd5 17107
65387fd5 17108#: builtin/log.c:1811 builtin/log.c:1812
ef317cd5 17109msgid "email"
07432cef 17110msgstr "邮件地址"
ef317cd5 17111
65387fd5 17112#: builtin/log.c:1811
ef317cd5 17113msgid "add To: header"
07432cef 17114msgstr "添加收件人"
ef317cd5 17115
65387fd5 17116#: builtin/log.c:1812
ef317cd5 17117msgid "add Cc: header"
07432cef 17118msgstr "添加抄送"
ef317cd5 17119
65387fd5 17120#: builtin/log.c:1813
2e8451e8 17121msgid "ident"
d9d56b23 17122msgstr "标识"
2e8451e8 17123
65387fd5 17124#: builtin/log.c:1814
2e8451e8 17125msgid "set From address to <ident> (or committer ident if absent)"
4375c10e 17126msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
2e8451e8 17127
65387fd5 17128#: builtin/log.c:1816
ef317cd5 17129msgid "message-id"
d9d56b23 17130msgstr "邮件标识"
ef317cd5 17131
65387fd5 17132#: builtin/log.c:1817
ef317cd5 17133msgid "make first mail a reply to <message-id>"
d9d56b23 17134msgstr "使第一封邮件作为对 <邮件标识> 的回复"
ef317cd5 17135
65387fd5 17136#: builtin/log.c:1818 builtin/log.c:1821
ef317cd5 17137msgid "boundary"
07432cef 17138msgstr "边界"
ef317cd5 17139
65387fd5 17140#: builtin/log.c:1819
ef317cd5 17141msgid "attach the patch"
07432cef 17142msgstr "附件方式添加补丁"
ef317cd5 17143
65387fd5 17144#: builtin/log.c:1822
ef317cd5 17145msgid "inline the patch"
07432cef 17146msgstr "内联显示补丁"
ef317cd5 17147
65387fd5 17148#: builtin/log.c:1826
ef317cd5 17149msgid "enable message threading, styles: shallow, deep"
07432cef 17150msgstr "启用邮件线索,风格:浅,深"
ef317cd5 17151
65387fd5 17152#: builtin/log.c:1828
ef317cd5 17153msgid "signature"
07432cef 17154msgstr "签名"
ef317cd5 17155
65387fd5 17156#: builtin/log.c:1829
ef317cd5 17157msgid "add a signature"
07432cef 17158msgstr "添加一个签名"
ef317cd5 17159
65387fd5 17160#: builtin/log.c:1830
5b04ee3b
JX
17161msgid "base-commit"
17162msgstr "基线提交"
17163
65387fd5 17164#: builtin/log.c:1831
5b04ee3b
JX
17165msgid "add prerequisite tree info to the patch series"
17166msgstr "为补丁列表添加前置树信息"
17167
65387fd5 17168#: builtin/log.c:1834
6acbf033
JX
17169msgid "add a signature from a file"
17170msgstr "从文件添加一个签名"
17171
65387fd5 17172#: builtin/log.c:1835
ef317cd5 17173msgid "don't print the patch filenames"
07432cef 17174msgstr "不要打印补丁文件名"
ef317cd5 17175
65387fd5 17176#: builtin/log.c:1837
6937cb4e
JX
17177msgid "show progress while generating patches"
17178msgstr "在生成补丁时显示进度"
17179
65387fd5 17180#: builtin/log.c:1839
4c27fcb5 17181msgid "show changes against <rev> in cover letter or single patch"
ec3d4607 17182msgstr "在附函或单个补丁中显示和 <版本> 的差异"
4c27fcb5 17183
65387fd5 17184#: builtin/log.c:1842
4c27fcb5 17185msgid "show changes against <refspec> in cover letter or single patch"
ec3d4607 17186msgstr "在附函或单个补丁中显示和 <引用规格> 的差异"
4c27fcb5 17187
65387fd5 17188#: builtin/log.c:1844 builtin/range-diff.c:28
4c27fcb5
JX
17189msgid "percentage by which creation is weighted"
17190msgstr "创建权重的百分比"
17191
65387fd5 17192#: builtin/log.c:1931
a4f16749
JX
17193#, c-format
17194msgid "invalid ident line: %s"
17195msgstr "包含无效的身份标识:%s"
17196
65387fd5 17197#: builtin/log.c:1956
c04f5ac3
JX
17198msgid "--name-only does not make sense"
17199msgstr "--name-only 无意义"
17200
65387fd5 17201#: builtin/log.c:1958
c04f5ac3
JX
17202msgid "--name-status does not make sense"
17203msgstr "--name-status 无意义"
17204
65387fd5 17205#: builtin/log.c:1960
c04f5ac3
JX
17206msgid "--check does not make sense"
17207msgstr "--check 无意义"
17208
65387fd5 17209#: builtin/log.c:2104
4c27fcb5
JX
17210msgid "--interdiff requires --cover-letter or single patch"
17211msgstr "--interdiff 需要 --cover-letter 或单一补丁"
17212
65387fd5 17213#: builtin/log.c:2108
4c27fcb5
JX
17214msgid "Interdiff:"
17215msgstr "版本间差异:"
17216
65387fd5 17217#: builtin/log.c:2109
4c27fcb5
JX
17218#, c-format
17219msgid "Interdiff against v%d:"
17220msgstr "对 v%d 的版本差异:"
17221
65387fd5 17222#: builtin/log.c:2119
4c27fcb5
JX
17223msgid "--range-diff requires --cover-letter or single patch"
17224msgstr "--range-diff 需要 --cover-letter 或单一补丁"
17225
65387fd5 17226#: builtin/log.c:2127
4c27fcb5
JX
17227msgid "Range-diff:"
17228msgstr "范围差异:"
17229
65387fd5 17230#: builtin/log.c:2128
4c27fcb5
JX
17231#, c-format
17232msgid "Range-diff against v%d:"
17233msgstr "对 v%d 的范围差异:"
17234
65387fd5 17235#: builtin/log.c:2139
6acbf033
JX
17236#, c-format
17237msgid "unable to read signature file '%s'"
17238msgstr "无法读取签名文件 '%s'"
17239
65387fd5 17240#: builtin/log.c:2175
6937cb4e
JX
17241msgid "Generating patches"
17242msgstr "生成补丁"
17243
65387fd5 17244#: builtin/log.c:2219
d46c5519 17245msgid "failed to create output files"
c04f5ac3
JX
17246msgstr "无法创建输出文件"
17247
65387fd5 17248#: builtin/log.c:2279
ef317cd5 17249msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 17250msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 17251
65387fd5 17252#: builtin/log.c:2333
c04f5ac3
JX
17253#, c-format
17254msgid ""
17255"Could not find a tracked remote branch, please specify <upstream> manually.\n"
d9d56b23 17256msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
c04f5ac3 17257
65387fd5 17258#: builtin/ls-files.c:564
814ff314
JX
17259msgid "git ls-files [<options>] [<file>...]"
17260msgstr "git ls-files [<选项>] [<文件>...]"
ef317cd5 17261
65387fd5 17262#: builtin/ls-files.c:618
7e6630a7
FZ
17263msgid "separate paths with the NUL character"
17264msgstr "用 NUL 字符分隔路径"
17265
65387fd5 17266#: builtin/ls-files.c:620
ef317cd5 17267msgid "identify the file status with tags"
07432cef 17268msgstr "用标签标识文件的状态"
ef317cd5 17269
65387fd5 17270#: builtin/ls-files.c:622
ef317cd5 17271msgid "use lowercase letters for 'assume unchanged' files"
07432cef 17272msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 17273
65387fd5 17274#: builtin/ls-files.c:624
5809aa05
JX
17275msgid "use lowercase letters for 'fsmonitor clean' files"
17276msgstr "使用小写字母表示 'fsmonitor clean' 文件"
17277
65387fd5 17278#: builtin/ls-files.c:626
ef317cd5 17279msgid "show cached files in the output (default)"
07432cef 17280msgstr "显示缓存的文件(默认)"
ef317cd5 17281
65387fd5 17282#: builtin/ls-files.c:628
ef317cd5 17283msgid "show deleted files in the output"
07432cef 17284msgstr "显示已删除的文件"
ef317cd5 17285
65387fd5 17286#: builtin/ls-files.c:630
ef317cd5 17287msgid "show modified files in the output"
07432cef 17288msgstr "显示已修改的文件"
ef317cd5 17289
65387fd5 17290#: builtin/ls-files.c:632
ef317cd5 17291msgid "show other files in the output"
07432cef 17292msgstr "显示其它文件"
ef317cd5 17293
65387fd5 17294#: builtin/ls-files.c:634
ef317cd5 17295msgid "show ignored files in the output"
07432cef 17296msgstr "显示忽略的文件"
ef317cd5 17297
65387fd5 17298#: builtin/ls-files.c:637
ef317cd5 17299msgid "show staged contents' object name in the output"
07432cef 17300msgstr "显示暂存区内容的对象名称"
ef317cd5 17301
65387fd5 17302#: builtin/ls-files.c:639
ef317cd5 17303msgid "show files on the filesystem that need to be removed"
07432cef 17304msgstr "显示文件系统需要删除的文件"
ef317cd5 17305
65387fd5 17306#: builtin/ls-files.c:641
220c313c 17307msgid "show 'other' directories' names only"
07432cef 17308msgstr "只显示“其他”目录的名称"
ef317cd5 17309
65387fd5 17310#: builtin/ls-files.c:643
276ceeaa
JX
17311msgid "show line endings of files"
17312msgstr "显示文件换行符格式"
17313
65387fd5 17314#: builtin/ls-files.c:645
ef317cd5 17315msgid "don't show empty directories"
07432cef 17316msgstr "不显示空目录"
ef317cd5 17317
65387fd5 17318#: builtin/ls-files.c:648
ef317cd5 17319msgid "show unmerged files in the output"
07432cef 17320msgstr "显示未合并的文件"
ef317cd5 17321
65387fd5 17322#: builtin/ls-files.c:650
ef317cd5 17323msgid "show resolve-undo information"
07432cef 17324msgstr "显示 resolve-undo 信息"
ef317cd5 17325
65387fd5 17326#: builtin/ls-files.c:652
ef317cd5 17327msgid "skip files matching pattern"
d9488fea 17328msgstr "跳过和模式匹配的文件"
ef317cd5 17329
65387fd5 17330#: builtin/ls-files.c:655
7e6630a7
FZ
17331msgid "read exclude patterns from <file>"
17332msgstr "从 <文件> 读取排除模式"
ef317cd5 17333
65387fd5 17334#: builtin/ls-files.c:658
ef317cd5 17335msgid "read additional per-directory exclude patterns in <file>"
07432cef 17336msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 17337
65387fd5 17338#: builtin/ls-files.c:660
ef317cd5 17339msgid "add the standard git exclusions"
07432cef 17340msgstr "添加标准的 git 排除"
ef317cd5 17341
65387fd5 17342#: builtin/ls-files.c:664
ef317cd5 17343msgid "make the output relative to the project top directory"
07432cef 17344msgstr "显示相对于顶级目录的文件名"
ef317cd5 17345
65387fd5 17346#: builtin/ls-files.c:667
a0b6b246
JX
17347msgid "recurse through submodules"
17348msgstr "在子模组中递归"
17349
65387fd5 17350#: builtin/ls-files.c:669
ef317cd5 17351msgid "if any <file> is not in the index, treat this as an error"
07432cef 17352msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 17353
65387fd5 17354#: builtin/ls-files.c:670
ef317cd5 17355msgid "tree-ish"
ddc12c42 17356msgstr "树对象"
ef317cd5 17357
65387fd5 17358#: builtin/ls-files.c:671
ef317cd5 17359msgid "pretend that paths removed since <tree-ish> are still present"
ddc12c42 17360msgstr "假装自从 <树对象> 之后删除的路径仍然存在"
ef317cd5 17361
65387fd5 17362#: builtin/ls-files.c:673
ef317cd5 17363msgid "show debugging data"
07432cef 17364msgstr "显示调试数据"
ef317cd5 17365
65387fd5 17366#: builtin/ls-files.c:675
473eb541
JX
17367msgid "suppress duplicate entries"
17368msgstr "抑制重复条目"
17369
65387fd5
FZ
17370#: builtin/ls-files.c:677
17371msgid "show sparse directories in the presence of a sparse index"
17372msgstr "在稀疏索引存在时显示稀疏目录"
17373
fd8cb379 17374#: builtin/ls-remote.c:9
276ceeaa
JX
17375msgid ""
17376"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
7e6630a7
FZ
17377" [-q | --quiet] [--exit-code] [--get-url]\n"
17378" [--symref] [<repository> [<refs>...]]"
276ceeaa
JX
17379msgstr ""
17380"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
7e6630a7
FZ
17381" [-q | --quiet] [--exit-code] [--get-url]\n"
17382" [--symref] [<仓库> [<引用>...]]"
276ceeaa 17383
473eb541 17384#: builtin/ls-remote.c:60
276ceeaa
JX
17385msgid "do not print remote URL"
17386msgstr "不打印远程 URL"
17387
7e6630a7 17388#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103
276ceeaa
JX
17389msgid "exec"
17390msgstr "exec"
17391
473eb541 17392#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
276ceeaa
JX
17393msgid "path of git-upload-pack on the remote host"
17394msgstr "远程主机上的 git-upload-pack 路径"
17395
473eb541 17396#: builtin/ls-remote.c:66
276ceeaa
JX
17397msgid "limit to tags"
17398msgstr "仅限于标签"
17399
473eb541 17400#: builtin/ls-remote.c:67
276ceeaa
JX
17401msgid "limit to heads"
17402msgstr "仅限于分支"
17403
473eb541 17404#: builtin/ls-remote.c:68
276ceeaa
JX
17405msgid "do not show peeled tags"
17406msgstr "不显示已解析的标签"
17407
473eb541 17408#: builtin/ls-remote.c:70
276ceeaa
JX
17409msgid "take url.<base>.insteadOf into account"
17410msgstr "参考 url.<base>.insteadOf 设置"
17411
473eb541 17412#: builtin/ls-remote.c:73
276ceeaa
JX
17413msgid "exit with exit code 2 if no matching refs are found"
17414msgstr "若未找到匹配的引用则以退出码2退出"
17415
473eb541 17416#: builtin/ls-remote.c:76
276ceeaa
JX
17417msgid "show underlying ref in addition to the object pointed by it"
17418msgstr "除了显示指向的对象外,显示指向的引用名"
17419
c1ac5258 17420#: builtin/ls-tree.c:30
ef317cd5 17421msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
ddc12c42 17422msgstr "git ls-tree [<选项>] <树对象> [<路径>...]"
ef317cd5 17423
c1ac5258 17424#: builtin/ls-tree.c:128
ef317cd5 17425msgid "only show trees"
07432cef 17426msgstr "只显示树"
ef317cd5 17427
c1ac5258 17428#: builtin/ls-tree.c:130
ef317cd5 17429msgid "recurse into subtrees"
07432cef 17430msgstr "递归到子树"
ef317cd5 17431
c1ac5258 17432#: builtin/ls-tree.c:132
ef317cd5 17433msgid "show trees when recursing"
07432cef 17434msgstr "当递归时显示树"
ef317cd5 17435
c1ac5258 17436#: builtin/ls-tree.c:135
ef317cd5 17437msgid "terminate entries with NUL byte"
4375c10e 17438msgstr "条目以 NUL 字符终止"
ef317cd5 17439
c1ac5258 17440#: builtin/ls-tree.c:136
ef317cd5 17441msgid "include object size"
07432cef 17442msgstr "包括对象大小"
ef317cd5 17443
c1ac5258 17444#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
ef317cd5 17445msgid "list only filenames"
07432cef 17446msgstr "只列出文件名"
ef317cd5 17447
c1ac5258 17448#: builtin/ls-tree.c:143
ef317cd5 17449msgid "use full path names"
07432cef 17450msgstr "使用文件的全路径"
ef317cd5 17451
c1ac5258 17452#: builtin/ls-tree.c:145
ef317cd5 17453msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 17454msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5 17455
33b62fba
JX
17456#. TRANSLATORS: keep <> in "<" mail ">" info.
17457#: builtin/mailinfo.c:14
17458msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
17459msgstr "git mailinfo [<选项>] <消息> <补丁> < mail >info"
17460
17461#: builtin/mailinfo.c:58
17462msgid "keep subject"
17463msgstr "保持主题"
17464
17465#: builtin/mailinfo.c:60
17466msgid "keep non patch brackets in subject"
7b4d4954 17467msgstr "在主题中保持无补丁括号标注"
33b62fba
JX
17468
17469#: builtin/mailinfo.c:62
17470msgid "copy Message-ID to the end of commit message"
17471msgstr "拷贝 Message-ID 至提交说明结尾"
17472
17473#: builtin/mailinfo.c:64
17474msgid "re-code metadata to i18n.commitEncoding"
17475msgstr "将元数据重新编码为 i18n.commitEncoding"
17476
17477#: builtin/mailinfo.c:67
17478msgid "disable charset re-coding of metadata"
17479msgstr "禁用元数据的字符集重新编码"
17480
17481#: builtin/mailinfo.c:69
17482msgid "encoding"
17483msgstr "编码"
17484
17485#: builtin/mailinfo.c:70
17486msgid "re-code metadata to this encoding"
17487msgstr "将元数据用此编码重新编码"
17488
17489#: builtin/mailinfo.c:72
17490msgid "use scissors"
17491msgstr "使用剪刀标记"
17492
17493#: builtin/mailinfo.c:73
17494msgid "<action>"
17495msgstr "<动作>"
17496
17497#: builtin/mailinfo.c:74
17498msgid "action when quoted CR is found"
523ccf5d 17499msgstr "找到引号中的 CR 时的操作"
33b62fba
JX
17500
17501#: builtin/mailinfo.c:77
17502msgid "use headers in message's body"
7b4d4954 17503msgstr "在消息正文中使用标头"
33b62fba 17504
7e6630a7 17505#: builtin/mailsplit.c:239
a4f16749
JX
17506#, c-format
17507msgid "empty mbox: '%s'"
17508msgstr "空的 mbox:'%s'"
17509
349ede6a
JX
17510#: builtin/merge-base.c:32
17511msgid "git merge-base [-a | --all] <commit> <commit>..."
17512msgstr "git merge-base [-a | --all] <提交> <提交>..."
17513
17514#: builtin/merge-base.c:33
17515msgid "git merge-base [-a | --all] --octopus <commit>..."
17516msgstr "git merge-base [-a | --all] --octopus <提交>..."
17517
17518#: builtin/merge-base.c:34
17519msgid "git merge-base --independent <commit>..."
17520msgstr "git merge-base --independent <提交>..."
17521
17522#: builtin/merge-base.c:35
17523msgid "git merge-base --is-ancestor <commit> <commit>"
17524msgstr "git merge-base --is-ancestor <提交> <提交>"
17525
17526#: builtin/merge-base.c:36
17527msgid "git merge-base --fork-point <ref> [<commit>]"
17528msgstr "git merge-base --fork-point <引用> [<提交>]"
17529
17530#: builtin/merge-base.c:143
17531msgid "output all common ancestors"
17532msgstr "输出所有共同的祖先"
17533
17534#: builtin/merge-base.c:145
17535msgid "find ancestors for a single n-way merge"
17536msgstr "查找一个多路合并的祖先提交"
17537
17538#: builtin/merge-base.c:147
17539msgid "list revs not reachable from others"
17540msgstr "显示不能被其他访问到的版本"
17541
17542#: builtin/merge-base.c:149
17543msgid "is the first one ancestor of the other?"
17544msgstr "第一个是其他的祖先提交么?"
17545
17546#: builtin/merge-base.c:151
17547msgid "find where <commit> forked from reflog of <ref>"
17548msgstr "根据 <引用> 的引用日志查找 <提交> 的分叉点"
17549
17550#: builtin/merge-file.c:9
17551msgid ""
17552"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
17553"<orig-file> <file2>"
17554msgstr ""
17555"git merge-file [<选项>] [-L <名字1> [-L <初始名字> [-L <名字2>]]] <文件1> <初"
17556"始文件> <文件2>"
17557
17558#: builtin/merge-file.c:35
17559msgid "send results to standard output"
17560msgstr "将结果发送到标准输出"
17561
17562#: builtin/merge-file.c:36
17563msgid "use a diff3 based merge"
17564msgstr "使用基于 diff3 的合并"
17565
17566#: builtin/merge-file.c:37
65387fd5
FZ
17567msgid "use a zealous diff3 based merge"
17568msgstr "使用基于狂热 diff3(zealous diff3)的合并"
17569
17570#: builtin/merge-file.c:39
349ede6a
JX
17571msgid "for conflicts, use our version"
17572msgstr "如果冲突,使用我们的版本"
17573
65387fd5 17574#: builtin/merge-file.c:41
349ede6a
JX
17575msgid "for conflicts, use their version"
17576msgstr "如果冲突,使用他们的版本"
17577
65387fd5 17578#: builtin/merge-file.c:43
349ede6a
JX
17579msgid "for conflicts, use a union version"
17580msgstr "如果冲突,使用联合版本"
17581
65387fd5 17582#: builtin/merge-file.c:46
349ede6a
JX
17583msgid "for conflicts, use this marker size"
17584msgstr "如果冲突,使用指定长度的标记"
17585
65387fd5 17586#: builtin/merge-file.c:47
349ede6a
JX
17587msgid "do not warn about conflicts"
17588msgstr "不要警告冲突"
17589
65387fd5 17590#: builtin/merge-file.c:49
349ede6a
JX
17591msgid "set labels for file1/orig-file/file2"
17592msgstr "为 文件1/初始文件/文件2 设置标签"
17593
17594#: builtin/merge-recursive.c:47
17595#, c-format
17596msgid "unknown option %s"
17597msgstr "未知选项 %s"
17598
17599#: builtin/merge-recursive.c:53
17600#, c-format
17601msgid "could not parse object '%s'"
17602msgstr "不能解析对象 '%s'"
17603
17604#: builtin/merge-recursive.c:57
17605#, c-format
17606msgid "cannot handle more than %d base. Ignoring %s."
17607msgid_plural "cannot handle more than %d bases. Ignoring %s."
17608msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
17609msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
17610
17611#: builtin/merge-recursive.c:65
17612msgid "not handling anything other than two heads merge."
17613msgstr "不能处理两个头合并之外的任何操作。"
17614
17615#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
17616#, c-format
17617msgid "could not resolve ref '%s'"
17618msgstr "无法解析引用 '%s'"
17619
17620#: builtin/merge-recursive.c:82
17621#, c-format
17622msgid "Merging %s with %s\n"
17623msgstr "合并 %s 和 %s\n"
17624
7e6630a7 17625#: builtin/merge.c:59
814ff314
JX
17626msgid "git merge [<options>] [<commit>...]"
17627msgstr "git merge [<选项>] [<提交>...]"
ef317cd5 17628
65387fd5 17629#: builtin/merge.c:125
c04f5ac3
JX
17630msgid "switch `m' requires a value"
17631msgstr "开关 `m' 需要一个值"
17632
65387fd5 17633#: builtin/merge.c:148
06991777
JX
17634#, c-format
17635msgid "option `%s' requires a value"
17636msgstr "选项 `%s' 需要一个值"
17637
65387fd5 17638#: builtin/merge.c:201
c04f5ac3
JX
17639#, c-format
17640msgid "Could not find merge strategy '%s'.\n"
90e6ef53 17641msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 17642
65387fd5 17643#: builtin/merge.c:202
c04f5ac3
JX
17644#, c-format
17645msgid "Available strategies are:"
17646msgstr "可用的策略有:"
17647
65387fd5 17648#: builtin/merge.c:207
c04f5ac3
JX
17649#, c-format
17650msgid "Available custom strategies are:"
17651msgstr "可用的自定义策略有:"
17652
65387fd5 17653#: builtin/merge.c:258 builtin/pull.c:134
ef317cd5 17654msgid "do not show a diffstat at the end of the merge"
07432cef 17655msgstr "在合并的最后不显示差异统计"
ef317cd5 17656
65387fd5 17657#: builtin/merge.c:261 builtin/pull.c:137
ef317cd5 17658msgid "show a diffstat at the end of the merge"
07432cef 17659msgstr "在合并的最后显示差异统计"
ef317cd5 17660
65387fd5 17661#: builtin/merge.c:262 builtin/pull.c:140
ef317cd5 17662msgid "(synonym to --stat)"
07432cef 17663msgstr "(和 --stat 同义)"
ef317cd5 17664
65387fd5 17665#: builtin/merge.c:264 builtin/pull.c:143
ef317cd5 17666msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 17667msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 17668
65387fd5 17669#: builtin/merge.c:267 builtin/pull.c:149
ef317cd5 17670msgid "create a single commit instead of doing a merge"
07432cef 17671msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 17672
65387fd5 17673#: builtin/merge.c:269 builtin/pull.c:152
ef317cd5 17674msgid "perform a commit if the merge succeeds (default)"
07432cef 17675msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 17676
65387fd5 17677#: builtin/merge.c:271 builtin/pull.c:155
ef317cd5 17678msgid "edit message before committing"
07432cef 17679msgstr "在提交前编辑提交说明"
ef317cd5 17680
65387fd5 17681#: builtin/merge.c:273
ef317cd5 17682msgid "allow fast-forward (default)"
07432cef 17683msgstr "允许快进(默认)"
ef317cd5 17684
65387fd5 17685#: builtin/merge.c:275 builtin/pull.c:162
ef317cd5 17686msgid "abort if fast-forward is not possible"
07432cef 17687msgstr "如果不能快进就放弃合并"
ef317cd5 17688
65387fd5 17689#: builtin/merge.c:279 builtin/pull.c:168
5c57d762 17690msgid "verify that the named commit has a valid GPG signature"
1003b3a5
JX
17691msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
17692
65387fd5 17693#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
7e6630a7 17694#: builtin/rebase.c:1117 builtin/revert.c:114
ef317cd5 17695msgid "strategy"
07432cef 17696msgstr "策略"
ef317cd5 17697
65387fd5 17698#: builtin/merge.c:281 builtin/pull.c:173
ef317cd5 17699msgid "merge strategy to use"
07432cef 17700msgstr "要使用的合并策略"
ef317cd5 17701
65387fd5 17702#: builtin/merge.c:282 builtin/pull.c:176
ef317cd5 17703msgid "option=value"
07432cef 17704msgstr "option=value"
ef317cd5 17705
65387fd5 17706#: builtin/merge.c:283 builtin/pull.c:177
ef317cd5 17707msgid "option for selected merge strategy"
07432cef 17708msgstr "所选的合并策略的选项"
ef317cd5 17709
65387fd5 17710#: builtin/merge.c:285
ef317cd5 17711msgid "merge commit message (for a non-fast-forward merge)"
07432cef 17712msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 17713
7e6630a7 17714#: builtin/merge.c:291
65387fd5
FZ
17715msgid "use <name> instead of the real target"
17716msgstr "使用 <名称> 而不是真正的目标"
17717
17718#: builtin/merge.c:294
ef317cd5 17719msgid "abort the current in-progress merge"
07432cef 17720msgstr "放弃当前正在进行的合并"
ef317cd5 17721
a6cd2cc4 17722#
65387fd5 17723#: builtin/merge.c:296
a6cd2cc4
JX
17724msgid "--abort but leave index and working tree alone"
17725msgstr "--abort,但是保留索引和工作区"
17726
65387fd5 17727#: builtin/merge.c:298
1a79b2f1
JX
17728msgid "continue the current in-progress merge"
17729msgstr "继续当前正在进行的合并"
17730
65387fd5 17731#: builtin/merge.c:300 builtin/pull.c:184
5b04ee3b
JX
17732msgid "allow merging unrelated histories"
17733msgstr "允许合并不相关的历史"
17734
65387fd5 17735#: builtin/merge.c:307
a5cd71ca
JX
17736msgid "bypass pre-merge-commit and commit-msg hooks"
17737msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"
6937cb4e 17738
65387fd5 17739#: builtin/merge.c:323
c04f5ac3 17740msgid "could not run stash."
a4f16749 17741msgstr "不能运行贮藏。"
c04f5ac3 17742
65387fd5 17743#: builtin/merge.c:328
c04f5ac3 17744msgid "stash failed"
a4f16749 17745msgstr "贮藏失败"
c04f5ac3 17746
65387fd5 17747#: builtin/merge.c:333
c04f5ac3
JX
17748#, c-format
17749msgid "not a valid object: %s"
17750msgstr "不是一个有效对象:%s"
17751
65387fd5 17752#: builtin/merge.c:355 builtin/merge.c:372
c04f5ac3
JX
17753msgid "read-tree failed"
17754msgstr "读取树失败"
17755
65387fd5 17756#: builtin/merge.c:403
33b62fba
JX
17757msgid "Already up to date. (nothing to squash)"
17758msgstr "已经是最新的。(无可挤压)"
c04f5ac3 17759
65387fd5 17760#: builtin/merge.c:417
c04f5ac3
JX
17761#, c-format
17762msgid "Squash commit -- not updating HEAD\n"
33b62fba 17763msgstr "挤压提交 -- 未更新 HEAD\n"
c04f5ac3 17764
65387fd5 17765#: builtin/merge.c:467
c04f5ac3
JX
17766#, c-format
17767msgid "No merge message -- not updating HEAD\n"
17768msgstr "无合并信息 -- 未更新 HEAD\n"
17769
65387fd5 17770#: builtin/merge.c:517
c04f5ac3
JX
17771#, c-format
17772msgid "'%s' does not point to a commit"
17773msgstr "'%s' 没有指向一个提交"
17774
65387fd5 17775#: builtin/merge.c:605
c04f5ac3
JX
17776#, c-format
17777msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 17778msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 17779
65387fd5 17780#: builtin/merge.c:732
c04f5ac3 17781msgid "Not handling anything other than two heads merge."
29004bbb 17782msgstr "未处理两个头合并之外的任何操作。"
c04f5ac3 17783
65387fd5 17784#: builtin/merge.c:745
c04f5ac3 17785#, c-format
7e6630a7
FZ
17786msgid "unknown strategy option: -X%s"
17787msgstr "未知的策略选项:-X%s"
c04f5ac3 17788
65387fd5 17789#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
c04f5ac3
JX
17790#, c-format
17791msgid "unable to write %s"
17792msgstr "不能写 %s"
17793
65387fd5 17794#: builtin/merge.c:816
c04f5ac3
JX
17795#, c-format
17796msgid "Could not read from '%s'"
17797msgstr "不能从 '%s' 读取"
17798
65387fd5 17799#: builtin/merge.c:825
c04f5ac3
JX
17800#, c-format
17801msgid "Not committing merge; use 'git commit' to complete the merge.\n"
17802msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
17803
65387fd5 17804#: builtin/merge.c:831
c04f5ac3
JX
17805msgid ""
17806"Please enter a commit message to explain why this merge is necessary,\n"
17807"especially if it merges an updated upstream into a topic branch.\n"
17808"\n"
c04f5ac3
JX
17809msgstr ""
17810"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
17811"合并到主题分支。\n"
17812"\n"
c04f5ac3 17813
65387fd5 17814#: builtin/merge.c:836
d46c5519 17815msgid "An empty message aborts the commit.\n"
5b533632 17816msgstr "空的提交说明会终止提交。\n"
d46c5519 17817
65387fd5 17818#: builtin/merge.c:839
d46c5519
JX
17819#, c-format
17820msgid ""
17821"Lines starting with '%c' will be ignored, and an empty message aborts\n"
17822"the commit.\n"
5b533632 17823msgstr "以 '%c' 开始的行将被忽略,而空的提交说明将终止提交。\n"
d46c5519 17824
65387fd5 17825#: builtin/merge.c:894
c04f5ac3
JX
17826msgid "Empty commit message."
17827msgstr "空提交信息。"
17828
65387fd5 17829#: builtin/merge.c:909
c04f5ac3
JX
17830#, c-format
17831msgid "Wonderful.\n"
17832msgstr "太棒了。\n"
17833
65387fd5 17834#: builtin/merge.c:970
c04f5ac3
JX
17835#, c-format
17836msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
17837msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
17838
65387fd5 17839#: builtin/merge.c:1009
c04f5ac3 17840msgid "No current branch."
90e6ef53 17841msgstr "没有当前分支。"
c04f5ac3 17842
65387fd5 17843#: builtin/merge.c:1011
c04f5ac3 17844msgid "No remote for the current branch."
160fb2b2 17845msgstr "当前分支没有对应的远程仓库。"
c04f5ac3 17846
65387fd5 17847#: builtin/merge.c:1013
c04f5ac3 17848msgid "No default upstream defined for the current branch."
90e6ef53 17849msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 17850
65387fd5 17851#: builtin/merge.c:1018
170e9899 17852#, c-format
2e8451e8
JX
17853msgid "No remote-tracking branch for %s from %s"
17854msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 17855
65387fd5 17856#: builtin/merge.c:1075
5c57d762
JX
17857#, c-format
17858msgid "Bad value '%s' in environment '%s'"
9a4b694c 17859msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
5c57d762 17860
65387fd5 17861#: builtin/merge.c:1177
5c57d762
JX
17862#, c-format
17863msgid "not something we can merge in %s: %s"
17864msgstr "不能在 %s 中合并:%s"
17865
65387fd5 17866#: builtin/merge.c:1211
5c57d762
JX
17867msgid "not something we can merge"
17868msgstr "不能合并"
17869
65387fd5 17870#: builtin/merge.c:1324
1a79b2f1
JX
17871msgid "--abort expects no arguments"
17872msgstr "--abort 不带参数"
17873
65387fd5 17874#: builtin/merge.c:1328
c04f5ac3 17875msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 17876msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 17877
65387fd5 17878#: builtin/merge.c:1346
a6cd2cc4
JX
17879msgid "--quit expects no arguments"
17880msgstr "--quit 不带参数"
17881
65387fd5 17882#: builtin/merge.c:1359
1a79b2f1
JX
17883msgid "--continue expects no arguments"
17884msgstr "--continue 不带参数"
17885
65387fd5 17886#: builtin/merge.c:1363
1a79b2f1
JX
17887msgid "There is no merge in progress (MERGE_HEAD missing)."
17888msgstr "没有进行中的合并(MERGE_HEAD 丢失)。"
17889
65387fd5 17890#: builtin/merge.c:1379
c04f5ac3
JX
17891msgid ""
17892"You have not concluded your merge (MERGE_HEAD exists).\n"
220c313c 17893"Please, commit your changes before you merge."
c04f5ac3
JX
17894msgstr ""
17895"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 17896"请在合并前先提交您的修改。"
c04f5ac3 17897
65387fd5 17898#: builtin/merge.c:1386
c04f5ac3
JX
17899msgid ""
17900"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
220c313c 17901"Please, commit your changes before you merge."
c04f5ac3
JX
17902msgstr ""
17903"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 17904"请在合并前先提交您的修改。"
c04f5ac3 17905
65387fd5 17906#: builtin/merge.c:1389
c04f5ac3
JX
17907msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
17908msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
17909
65387fd5 17910#: builtin/merge.c:1421
c04f5ac3 17911msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 17912msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 17913
65387fd5 17914#: builtin/merge.c:1438
c04f5ac3
JX
17915msgid "Squash commit into empty head not supported yet"
17916msgstr "尚不支持到空分支的压缩提交"
17917
65387fd5 17918#: builtin/merge.c:1440
c04f5ac3
JX
17919msgid "Non-fast-forward commit does not make sense into an empty head"
17920msgstr "到空分支的非快进式提交没有意义"
17921
65387fd5 17922#: builtin/merge.c:1445
2e8451e8
JX
17923#, c-format
17924msgid "%s - not something we can merge"
17925msgstr "%s - 不能被合并"
17926
65387fd5 17927#: builtin/merge.c:1447
7aea43ff
JX
17928msgid "Can merge only exactly one commit into empty head"
17929msgstr "只能将一个提交合并到空分支上"
17930
65387fd5 17931#: builtin/merge.c:1534
5b04ee3b
JX
17932msgid "refusing to merge unrelated histories"
17933msgstr "拒绝合并无关的历史"
17934
65387fd5 17935#: builtin/merge.c:1553
c04f5ac3
JX
17936#, c-format
17937msgid "Updating %s..%s\n"
17938msgstr "更新 %s..%s\n"
17939
65387fd5 17940#: builtin/merge.c:1601
c04f5ac3
JX
17941#, c-format
17942msgid "Trying really trivial in-index merge...\n"
90e6ef53 17943msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 17944
65387fd5 17945#: builtin/merge.c:1608
c04f5ac3
JX
17946#, c-format
17947msgid "Nope.\n"
17948msgstr "无。\n"
17949
65387fd5 17950#: builtin/merge.c:1667 builtin/merge.c:1733
c04f5ac3
JX
17951#, c-format
17952msgid "Rewinding the tree to pristine...\n"
17953msgstr "将树回滚至原始状态...\n"
17954
65387fd5 17955#: builtin/merge.c:1671
c04f5ac3
JX
17956#, c-format
17957msgid "Trying merge strategy %s...\n"
17958msgstr "尝试合并策略 %s...\n"
17959
65387fd5 17960#: builtin/merge.c:1723
c04f5ac3
JX
17961#, c-format
17962msgid "No merge strategy handled the merge.\n"
17963msgstr "没有合并策略处理此合并。\n"
17964
65387fd5 17965#: builtin/merge.c:1725
c04f5ac3
JX
17966#, c-format
17967msgid "Merge with strategy %s failed.\n"
17968msgstr "使用策略 %s 合并失败。\n"
17969
65387fd5 17970#: builtin/merge.c:1735
c04f5ac3 17971#, c-format
ec3d4607
JX
17972msgid "Using the %s strategy to prepare resolving by hand.\n"
17973msgstr "使用 %s 策略以准备手工解决。\n"
c04f5ac3 17974
65387fd5 17975#: builtin/merge.c:1749
c04f5ac3
JX
17976#, c-format
17977msgid "Automatic merge went well; stopped before committing as requested\n"
17978msgstr "自动合并进展顺利,按要求在提交前停止\n"
17979
473eb541
JX
17980#: builtin/mktag.c:10
17981msgid "git mktag"
17982msgstr "git mktag"
17983
33b62fba 17984#: builtin/mktag.c:27
473eb541
JX
17985#, c-format
17986msgid "warning: tag input does not pass fsck: %s"
17987msgstr "警告:标签输入未通过 fsck:%s"
17988
33b62fba 17989#: builtin/mktag.c:38
473eb541
JX
17990#, c-format
17991msgid "error: tag input does not pass fsck: %s"
17992msgstr "错误:标签输入未通过 fsck:%s"
17993
33b62fba 17994#: builtin/mktag.c:41
473eb541
JX
17995#, c-format
17996msgid "%d (FSCK_IGNORE?) should never trigger this callback"
ae4e099e 17997msgstr "%d (FSCK_IGNORE?) 永远不应该触发这个回调"
473eb541 17998
33b62fba 17999#: builtin/mktag.c:56
473eb541
JX
18000#, c-format
18001msgid "could not read tagged object '%s'"
18002msgstr "不能读取被标记的对象 '%s'"
18003
33b62fba 18004#: builtin/mktag.c:59
473eb541
JX
18005#, c-format
18006msgid "object '%s' tagged as '%s', but is a '%s' type"
18007msgstr "对象 '%s' 被标记为 '%s',然而是一个 '%s' 类型"
18008
7e6630a7 18009#: builtin/mktag.c:98
473eb541
JX
18010msgid "tag on stdin did not pass our strict fsck check"
18011msgstr "标准输入上的标签未通过我们严格的 fsck 检查"
18012
7e6630a7 18013#: builtin/mktag.c:101
473eb541
JX
18014msgid "tag on stdin did not refer to a valid object"
18015msgstr "标准输入上的标签未指向一个有效的对象"
18016
65387fd5 18017#: builtin/mktag.c:104 builtin/tag.c:242
473eb541
JX
18018msgid "unable to write tag file"
18019msgstr "无法写标签文件"
18020
349ede6a
JX
18021#: builtin/mktree.c:66
18022msgid "git mktree [-z] [--missing] [--batch]"
18023msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 18024
c1ac5258 18025#: builtin/mktree.c:154
ef317cd5 18026msgid "input is NUL terminated"
07432cef 18027msgstr "输入以 NUL 字符终止"
c04f5ac3 18028
06991777 18029#: builtin/mktree.c:155 builtin/write-tree.c:26
ef317cd5 18030msgid "allow missing objects"
07432cef 18031msgstr "允许丢失的对象"
c04f5ac3 18032
c1ac5258 18033#: builtin/mktree.c:156
ef317cd5 18034msgid "allow creation of more than one tree"
07432cef 18035msgstr "允许创建一个以上的树"
c04f5ac3 18036
33b62fba 18037#: builtin/multi-pack-index.c:10
7e6630a7
FZ
18038msgid ""
18039"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
18040"snapshot=<path>]"
18041msgstr ""
18042"git multi-pack-index [<选项>] write [--preferred-pack=<包>][--refs-snapshot=<"
18043"路径>]"
33b62fba 18044
7e6630a7 18045#: builtin/multi-pack-index.c:14
33b62fba
JX
18046msgid "git multi-pack-index [<options>] verify"
18047msgstr "git multi-pack-index [<选项>] verify"
18048
7e6630a7 18049#: builtin/multi-pack-index.c:17
33b62fba
JX
18050msgid "git multi-pack-index [<options>] expire"
18051msgstr "git multi-pack-index [<选项>] expire"
4c27fcb5 18052
7e6630a7 18053#: builtin/multi-pack-index.c:20
33b62fba
JX
18054msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
18055msgstr "git multi-pack-index [<选项>] repack [--batch-size=<尺寸>]"
18056
7e6630a7 18057#: builtin/multi-pack-index.c:57
4c27fcb5
JX
18058msgid "object directory containing set of packfile and pack-index pairs"
18059msgstr "包含成对包文件和包索引的对象目录"
18060
7e6630a7 18061#: builtin/multi-pack-index.c:98
33b62fba
JX
18062msgid "preferred-pack"
18063msgstr "首选包"
18064
7e6630a7 18065#: builtin/multi-pack-index.c:99
33b62fba
JX
18066msgid "pack for reuse when computing a multi-pack bitmap"
18067msgstr "在计算多包位图时打包以供重用"
18068
7e6630a7
FZ
18069#: builtin/multi-pack-index.c:100
18070msgid "write multi-pack bitmap"
18071msgstr "写入多包位图"
18072
18073#: builtin/multi-pack-index.c:105
18074msgid "write multi-pack index containing only given indexes"
18075msgstr "写入只包括给定索引的多包索引"
18076
18077#: builtin/multi-pack-index.c:107
18078msgid "refs snapshot for selecting bitmap commits"
18079msgstr "用于选择位图提交的引用快照"
18080
65387fd5 18081#: builtin/multi-pack-index.c:206
a6cd2cc4
JX
18082msgid ""
18083"during repack, collect pack-files of smaller size into a batch that is "
18084"larger than this size"
18085msgstr "在 repack 期间,将较小尺寸的包文件收集到大于此大小的批次中"
18086
06991777 18087#: builtin/mv.c:18
814ff314
JX
18088msgid "git mv [<options>] <source>... <destination>"
18089msgstr "git mv [<选项>] <源>... <目标>"
c04f5ac3 18090
06991777 18091#: builtin/mv.c:83
220c313c
JX
18092#, c-format
18093msgid "Directory %s is in index and no submodule?"
18094msgstr "目录 %s 在索引中并且不是子模组?"
18095
06991777 18096#: builtin/mv.c:85
220c313c 18097msgid "Please stage your changes to .gitmodules or stash them to proceed"
a4f16749 18098msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
220c313c 18099
06991777 18100#: builtin/mv.c:103
220c313c
JX
18101#, c-format
18102msgid "%.*s is in index"
18103msgstr "%.*s 在索引中"
18104
06991777 18105#: builtin/mv.c:125
ef317cd5 18106msgid "force move/rename even if target exists"
07432cef 18107msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 18108
06991777 18109#: builtin/mv.c:127
ef317cd5 18110msgid "skip move/rename errors"
07432cef 18111msgstr "跳过移动/重命名错误"
c04f5ac3 18112
7e6630a7 18113#: builtin/mv.c:172
220c313c
JX
18114#, c-format
18115msgid "destination '%s' is not a directory"
18116msgstr "目标 '%s' 不是一个目录"
18117
7e6630a7 18118#: builtin/mv.c:184
c04f5ac3
JX
18119#, c-format
18120msgid "Checking rename of '%s' to '%s'\n"
18121msgstr "检查 '%s' 到 '%s' 的重命名\n"
18122
7e6630a7 18123#: builtin/mv.c:190
c04f5ac3
JX
18124msgid "bad source"
18125msgstr "坏的源"
18126
7e6630a7 18127#: builtin/mv.c:193
c04f5ac3
JX
18128msgid "can not move directory into itself"
18129msgstr "不能将目录移动到自身"
18130
7e6630a7 18131#: builtin/mv.c:196
c04f5ac3
JX
18132msgid "cannot move directory over file"
18133msgstr "不能将目录移动到文件"
18134
7e6630a7 18135#: builtin/mv.c:205
c04f5ac3
JX
18136msgid "source directory is empty"
18137msgstr "源目录为空"
18138
7e6630a7 18139#: builtin/mv.c:231
c04f5ac3
JX
18140msgid "not under version control"
18141msgstr "不在版本控制之下"
18142
7e6630a7 18143#: builtin/mv.c:233
d9488fea
JX
18144msgid "conflicted"
18145msgstr "冲突"
18146
7e6630a7 18147#: builtin/mv.c:236
c04f5ac3
JX
18148msgid "destination exists"
18149msgstr "目标已存在"
18150
7e6630a7 18151#: builtin/mv.c:244
c04f5ac3
JX
18152#, c-format
18153msgid "overwriting '%s'"
18154msgstr "覆盖 '%s'"
18155
7e6630a7 18156#: builtin/mv.c:247
c04f5ac3
JX
18157msgid "Cannot overwrite"
18158msgstr "不能覆盖"
18159
7e6630a7 18160#: builtin/mv.c:250
c04f5ac3
JX
18161msgid "multiple sources for the same target"
18162msgstr "同一目标具有多个源"
18163
7e6630a7 18164#: builtin/mv.c:252
cfff71a9
JX
18165msgid "destination directory does not exist"
18166msgstr "目标目录不存在"
18167
7e6630a7 18168#: builtin/mv.c:280
c04f5ac3
JX
18169#, c-format
18170msgid "%s, source=%s, destination=%s"
18171msgstr "%s,源=%s,目标=%s"
18172
7e6630a7 18173#: builtin/mv.c:308
c04f5ac3
JX
18174#, c-format
18175msgid "Renaming %s to %s\n"
18176msgstr "重命名 %s 至 %s\n"
18177
65387fd5 18178#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
c04f5ac3
JX
18179#, c-format
18180msgid "renaming '%s' failed"
18181msgstr "重命名 '%s' 失败"
18182
65387fd5 18183#: builtin/name-rev.c:474
814ff314
JX
18184msgid "git name-rev [<options>] <commit>..."
18185msgstr "git name-rev [<选项>] <提交>..."
ef317cd5 18186
65387fd5 18187#: builtin/name-rev.c:475
814ff314
JX
18188msgid "git name-rev [<options>] --all"
18189msgstr "git name-rev [<选项>] --all"
ef317cd5 18190
65387fd5 18191#: builtin/name-rev.c:476
814ff314
JX
18192msgid "git name-rev [<options>] --stdin"
18193msgstr "git name-rev [<选项>] --stdin"
ef317cd5 18194
65387fd5 18195#: builtin/name-rev.c:533
d9488fea
JX
18196msgid "print only ref-based names (no object names)"
18197msgstr "只打印基于引用的名称(非对象名)"
ef317cd5 18198
65387fd5 18199#: builtin/name-rev.c:534
ef317cd5 18200msgid "only use tags to name the commits"
55a16ee4 18201msgstr "只使用标签来命名提交"
ef317cd5 18202
65387fd5 18203#: builtin/name-rev.c:536
ef317cd5 18204msgid "only use refs matching <pattern>"
07432cef 18205msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 18206
65387fd5 18207#: builtin/name-rev.c:538
87cb7997
JX
18208msgid "ignore refs matching <pattern>"
18209msgstr "忽略和 <模式> 相匹配的引用"
18210
65387fd5 18211#: builtin/name-rev.c:540
ef317cd5 18212msgid "list all commits reachable from all refs"
07432cef 18213msgstr "列出可以从所有引用访问的提交"
ef317cd5 18214
65387fd5 18215#: builtin/name-rev.c:541
ef317cd5 18216msgid "read from stdin"
07432cef 18217msgstr "从标准输入读取"
ef317cd5 18218
65387fd5 18219#: builtin/name-rev.c:542
90314792
JX
18220msgid "allow to print `undefined` names (default)"
18221msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 18222
65387fd5 18223#: builtin/name-rev.c:548
2e8451e8 18224msgid "dereference tags in the input (internal use)"
55a16ee4 18225msgstr "反向解析输入中的标签(内部使用)"
2e8451e8 18226
c1ac5258 18227#: builtin/notes.c:28
814ff314 18228msgid "git notes [--ref <notes-ref>] [list [<object>]]"
07432cef 18229msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 18230
c1ac5258 18231#: builtin/notes.c:29
ef317cd5 18232msgid ""
814ff314 18233"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
04cb2f28 18234"| (-c | -C) <object>] [<object>]"
ef317cd5 18235msgstr ""
04cb2f28
JX
18236"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
18237"| (-c | -C) <对象>] [<对象>]"
ef317cd5 18238
c1ac5258 18239#: builtin/notes.c:30
814ff314 18240msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
07432cef 18241msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 18242
c1ac5258 18243#: builtin/notes.c:31
ef317cd5 18244msgid ""
814ff314 18245"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
04cb2f28 18246"(-c | -C) <object>] [<object>]"
ef317cd5 18247msgstr ""
04cb2f28
JX
18248"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
18249"(-c | -C) <对象>] [<对象>]"
ef317cd5 18250
c1ac5258 18251#: builtin/notes.c:32
814ff314 18252msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
04cb2f28 18253msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
ef317cd5 18254
c1ac5258 18255#: builtin/notes.c:33
814ff314 18256msgid "git notes [--ref <notes-ref>] show [<object>]"
07432cef 18257msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 18258
c1ac5258 18259#: builtin/notes.c:34
ef317cd5 18260msgid ""
814ff314 18261"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
07432cef 18262msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 18263
c1ac5258 18264#: builtin/notes.c:35
ef317cd5 18265msgid "git notes merge --commit [-v | -q]"
07432cef 18266msgstr "git notes merge --commit [-v | -q]"
ef317cd5 18267
c1ac5258 18268#: builtin/notes.c:36
ef317cd5 18269msgid "git notes merge --abort [-v | -q]"
07432cef 18270msgstr "git notes merge --abort [-v | -q]"
ef317cd5 18271
c1ac5258 18272#: builtin/notes.c:37
814ff314 18273msgid "git notes [--ref <notes-ref>] remove [<object>...]"
07432cef 18274msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 18275
c1ac5258 18276#: builtin/notes.c:38
5809aa05
JX
18277msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
18278msgstr "git notes [--ref <注解引用>] prune [-n] [-v]"
ef317cd5 18279
c1ac5258 18280#: builtin/notes.c:39
814ff314 18281msgid "git notes [--ref <notes-ref>] get-ref"
07432cef 18282msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 18283
c1ac5258 18284#: builtin/notes.c:44
ef317cd5 18285msgid "git notes [list [<object>]]"
07432cef 18286msgstr "git notes [list [<对象>]]"
ef317cd5 18287
c1ac5258 18288#: builtin/notes.c:49
ef317cd5 18289msgid "git notes add [<options>] [<object>]"
07432cef 18290msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 18291
c1ac5258 18292#: builtin/notes.c:54
ef317cd5 18293msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 18294msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 18295
c1ac5258 18296#: builtin/notes.c:55
ef317cd5 18297msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 18298msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 18299
c1ac5258 18300#: builtin/notes.c:60
ef317cd5 18301msgid "git notes append [<options>] [<object>]"
07432cef 18302msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 18303
c1ac5258 18304#: builtin/notes.c:65
ef317cd5 18305msgid "git notes edit [<object>]"
07432cef 18306msgstr "git notes edit [<对象>]"
ef317cd5 18307
c1ac5258 18308#: builtin/notes.c:70
ef317cd5 18309msgid "git notes show [<object>]"
07432cef 18310msgstr "git notes show [<对象>]"
ef317cd5 18311
c1ac5258 18312#: builtin/notes.c:75
814ff314 18313msgid "git notes merge [<options>] <notes-ref>"
07432cef 18314msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 18315
c1ac5258 18316#: builtin/notes.c:76
ef317cd5 18317msgid "git notes merge --commit [<options>]"
07432cef 18318msgstr "git notes merge --commit [<选项>]"
ef317cd5 18319
c1ac5258 18320#: builtin/notes.c:77
ef317cd5 18321msgid "git notes merge --abort [<options>]"
07432cef 18322msgstr "git notes merge --abort [<选项>]"
ef317cd5 18323
c1ac5258 18324#: builtin/notes.c:82
ef317cd5 18325msgid "git notes remove [<object>]"
07432cef 18326msgstr "git notes remove [<对象>]"
ef317cd5 18327
c1ac5258 18328#: builtin/notes.c:87
ef317cd5 18329msgid "git notes prune [<options>]"
07432cef 18330msgstr "git notes prune [<选项>]"
ef317cd5 18331
c1ac5258 18332#: builtin/notes.c:92
ef317cd5 18333msgid "git notes get-ref"
07432cef 18334msgstr "git notes get-ref"
ef317cd5 18335
c1ac5258 18336#: builtin/notes.c:97
5c57d762
JX
18337msgid "Write/edit the notes for the following object:"
18338msgstr "为下面的对象写/编辑说明:"
18339
65387fd5 18340#: builtin/notes.c:149
c04f5ac3
JX
18341#, c-format
18342msgid "unable to start 'show' for object '%s'"
18343msgstr "不能为对象 '%s' 开始 'show'"
18344
65387fd5 18345#: builtin/notes.c:153
a77c07d9
JX
18346msgid "could not read 'show' output"
18347msgstr "不能读取 'show' 的输出"
c04f5ac3 18348
65387fd5 18349#: builtin/notes.c:161
c04f5ac3
JX
18350#, c-format
18351msgid "failed to finish 'show' for object '%s'"
18352msgstr "无法为对象 '%s' 完成 'show'"
18353
65387fd5 18354#: builtin/notes.c:194
a0b6b246 18355msgid "please supply the note contents using either -m or -F option"
c04f5ac3
JX
18356msgstr "请通过 -m 或 -F 选项为注解提供内容"
18357
65387fd5 18358#: builtin/notes.c:203
c04f5ac3
JX
18359msgid "unable to write note object"
18360msgstr "不能写注解对象"
18361
7e6630a7 18362#: builtin/notes.c:206
c04f5ac3 18363#, c-format
a0b6b246 18364msgid "the note contents have been left in %s"
220c313c 18365msgstr "注解内容被留在 %s 中"
c04f5ac3 18366
65387fd5 18367#: builtin/notes.c:240 builtin/tag.c:581
c04f5ac3
JX
18368#, c-format
18369msgid "could not open or read '%s'"
18370msgstr "不能打开或读取 '%s'"
18371
7e6630a7
FZ
18372#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313
18373#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524
18374#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670
a0b6b246
JX
18375#, c-format
18376msgid "failed to resolve '%s' as a valid ref."
18377msgstr "无法解析 '%s' 为一个有效引用。"
18378
7e6630a7 18379#: builtin/notes.c:263
c04f5ac3 18380#, c-format
a0b6b246 18381msgid "failed to read object '%s'."
65387fd5 18382msgstr "无法读取对象 '%s'。"
c04f5ac3 18383
7e6630a7 18384#: builtin/notes.c:266
6c94aba5 18385#, c-format
a0b6b246
JX
18386msgid "cannot read note data from non-blob object '%s'."
18387msgstr "不能从非数据对象 '%s' 中读取注解数据。"
18388
7e6630a7 18389#: builtin/notes.c:307
a0b6b246
JX
18390#, c-format
18391msgid "malformed input line: '%s'."
fd8cb379 18392msgstr "格式错误的输入行:'%s'。"
a0b6b246 18393
7e6630a7 18394#: builtin/notes.c:322
a0b6b246
JX
18395#, c-format
18396msgid "failed to copy notes from '%s' to '%s'"
65387fd5 18397msgstr "无法把注解从 '%s' 拷贝到 '%s'"
6c94aba5 18398
a4f16749
JX
18399#. TRANSLATORS: the first %s will be replaced by a git
18400#. notes command: 'add', 'merge', 'remove', etc.
18401#.
7e6630a7 18402#: builtin/notes.c:354
a0b6b246
JX
18403#, c-format
18404msgid "refusing to %s notes in %s (outside of refs/notes/)"
18405msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
18406
7e6630a7
FZ
18407#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
18408#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
65387fd5
FZ
18409#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
18410#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
33b62fba
JX
18411msgid "too many arguments"
18412msgstr "太多参数"
18413
7e6630a7 18414#: builtin/notes.c:387 builtin/notes.c:676
c04f5ac3 18415#, c-format
a0b6b246 18416msgid "no note found for object %s."
c04f5ac3
JX
18417msgstr "未发现对象 %s 的注解。"
18418
7e6630a7 18419#: builtin/notes.c:408 builtin/notes.c:574
ef317cd5 18420msgid "note contents as a string"
07432cef 18421msgstr "注解内容作为一个字符串"
ef317cd5 18422
7e6630a7 18423#: builtin/notes.c:411 builtin/notes.c:577
ef317cd5 18424msgid "note contents in a file"
07432cef 18425msgstr "注解内容到一个文件中"
ef317cd5 18426
7e6630a7 18427#: builtin/notes.c:414 builtin/notes.c:580
ef317cd5 18428msgid "reuse and edit specified note object"
07432cef 18429msgstr "重用和编辑指定的注解对象"
ef317cd5 18430
7e6630a7 18431#: builtin/notes.c:417 builtin/notes.c:583
ef317cd5 18432msgid "reuse specified note object"
07432cef 18433msgstr "重用指定的注解对象"
ef317cd5 18434
7e6630a7 18435#: builtin/notes.c:420 builtin/notes.c:586
04cb2f28
JX
18436msgid "allow storing empty note"
18437msgstr "允许保存空白注释"
18438
7e6630a7 18439#: builtin/notes.c:421 builtin/notes.c:494
ef317cd5 18440msgid "replace existing notes"
07432cef 18441msgstr "替换已存在的注解"
ef317cd5 18442
7e6630a7 18443#: builtin/notes.c:446
c04f5ac3
JX
18444#, c-format
18445msgid ""
18446"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
18447"existing notes"
18448msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
18449
7e6630a7 18450#: builtin/notes.c:461 builtin/notes.c:542
c04f5ac3
JX
18451#, c-format
18452msgid "Overwriting existing notes for object %s\n"
18453msgstr "覆盖对象 %s 现存注解\n"
18454
65387fd5 18455#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
04cb2f28
JX
18456#, c-format
18457msgid "Removing note for object %s\n"
18458msgstr "删除对象 %s 的注解\n"
18459
7e6630a7 18460#: builtin/notes.c:495
ef317cd5 18461msgid "read objects from stdin"
07432cef 18462msgstr "从标准输入读取对象"
ef317cd5 18463
7e6630a7 18464#: builtin/notes.c:497
ef317cd5 18465msgid "load rewriting config for <command> (implies --stdin)"
07432cef 18466msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 18467
7e6630a7 18468#: builtin/notes.c:515
473eb541 18469msgid "too few arguments"
c04f5ac3
JX
18470msgstr "参数太少"
18471
7e6630a7 18472#: builtin/notes.c:536
c04f5ac3
JX
18473#, c-format
18474msgid ""
18475"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
18476"existing notes"
18477msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
18478
7e6630a7 18479#: builtin/notes.c:548
c04f5ac3 18480#, c-format
a0b6b246 18481msgid "missing notes on source object %s. Cannot copy."
c04f5ac3
JX
18482msgstr "源对象 %s 缺少注解。不能拷贝。"
18483
7e6630a7 18484#: builtin/notes.c:601
ef317cd5
JX
18485#, c-format
18486msgid ""
18487"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
18488"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
18489msgstr ""
18490"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
18491"请换用 'git notes add -f -m/-F/-c/-C'。\n"
18492
7e6630a7 18493#: builtin/notes.c:696
a0b6b246 18494msgid "failed to delete ref NOTES_MERGE_PARTIAL"
65387fd5 18495msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
a0b6b246 18496
7e6630a7 18497#: builtin/notes.c:698
a0b6b246 18498msgid "failed to delete ref NOTES_MERGE_REF"
65387fd5 18499msgstr "无法删除引用 NOTES_MERGE_REF"
a0b6b246 18500
7e6630a7 18501#: builtin/notes.c:700
a0b6b246 18502msgid "failed to remove 'git notes merge' worktree"
65387fd5 18503msgstr "无法删除 'git notes merge' 工作区"
a0b6b246 18504
7e6630a7 18505#: builtin/notes.c:720
a0b6b246 18506msgid "failed to read ref NOTES_MERGE_PARTIAL"
65387fd5 18507msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
a0b6b246 18508
7e6630a7 18509#: builtin/notes.c:722
a0b6b246
JX
18510msgid "could not find commit from NOTES_MERGE_PARTIAL."
18511msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
18512
7e6630a7 18513#: builtin/notes.c:724
a0b6b246
JX
18514msgid "could not parse commit from NOTES_MERGE_PARTIAL."
18515msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
18516
7e6630a7 18517#: builtin/notes.c:737
a0b6b246 18518msgid "failed to resolve NOTES_MERGE_REF"
65387fd5 18519msgstr "无法解析 NOTES_MERGE_REF"
a0b6b246 18520
7e6630a7 18521#: builtin/notes.c:740
a0b6b246
JX
18522msgid "failed to finalize notes merge"
18523msgstr "无法完成注解合并"
18524
7e6630a7 18525#: builtin/notes.c:766
5c57d762
JX
18526#, c-format
18527msgid "unknown notes merge strategy %s"
18528msgstr "未知的注解合并策略 %s"
18529
7e6630a7 18530#: builtin/notes.c:782
ef317cd5 18531msgid "General options"
07432cef 18532msgstr "通用选项"
ef317cd5 18533
7e6630a7 18534#: builtin/notes.c:784
ef317cd5 18535msgid "Merge options"
07432cef 18536msgstr "合并选项"
ef317cd5 18537
7e6630a7 18538#: builtin/notes.c:786
ef317cd5
JX
18539msgid ""
18540"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
18541"cat_sort_uniq)"
07432cef 18542msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 18543
7e6630a7 18544#: builtin/notes.c:788
ef317cd5 18545msgid "Committing unmerged notes"
07432cef 18546msgstr "提交未合并的注解"
ef317cd5 18547
7e6630a7 18548#: builtin/notes.c:790
ef317cd5 18549msgid "finalize notes merge by committing unmerged notes"
07432cef 18550msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 18551
7e6630a7 18552#: builtin/notes.c:792
ef317cd5 18553msgid "Aborting notes merge resolution"
07432cef 18554msgstr "中止注解合并的方案"
ef317cd5 18555
7e6630a7 18556#: builtin/notes.c:794
ef317cd5 18557msgid "abort notes merge"
07432cef 18558msgstr "中止注解合并"
ef317cd5 18559
7e6630a7 18560#: builtin/notes.c:805
5c57d762
JX
18561msgid "cannot mix --commit, --abort or -s/--strategy"
18562msgstr "不能混用 --commit、--abort 或 -s/--strategy"
18563
7e6630a7 18564#: builtin/notes.c:810
a0b6b246 18565msgid "must specify a notes ref to merge"
9a4b694c 18566msgstr "必须指定一个注解引用来合并"
5c57d762 18567
7e6630a7 18568#: builtin/notes.c:834
5c57d762 18569#, c-format
a0b6b246 18570msgid "unknown -s/--strategy: %s"
5c57d762
JX
18571msgstr "未知的 -s/--strategy:%s"
18572
65387fd5 18573#: builtin/notes.c:874
1b7f4a34 18574#, c-format
a0b6b246
JX
18575msgid "a notes merge into %s is already in-progress at %s"
18576msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
1b7f4a34 18577
65387fd5 18578#: builtin/notes.c:878
5c57d762 18579#, c-format
a0b6b246
JX
18580msgid "failed to store link to current notes ref (%s)"
18581msgstr "无法存储链接到当前的注解引用(%s)"
5c57d762 18582
65387fd5 18583#: builtin/notes.c:880
5c57d762
JX
18584#, c-format
18585msgid ""
18586"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
18587"'git notes merge --commit', or abort the merge with 'git notes merge --"
18588"abort'.\n"
a0b6b246
JX
18589msgstr ""
18590"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
18591"交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
5c57d762 18592
65387fd5 18593#: builtin/notes.c:899 builtin/tag.c:594
d46c5519
JX
18594#, c-format
18595msgid "Failed to resolve '%s' as a valid ref."
18596msgstr "无法解析 '%s' 为一个有效引用。"
18597
65387fd5 18598#: builtin/notes.c:902
ef317cd5
JX
18599#, c-format
18600msgid "Object %s has no note\n"
18601msgstr "对象 %s 没有注解\n"
18602
65387fd5 18603#: builtin/notes.c:914
ef317cd5 18604msgid "attempt to remove non-existent note is not an error"
07432cef 18605msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 18606
65387fd5 18607#: builtin/notes.c:917
ef317cd5 18608msgid "read object names from the standard input"
07432cef 18609msgstr "从标准输入读取对象名称"
ef317cd5 18610
65387fd5 18611#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
5c57d762
JX
18612msgid "do not remove, show only"
18613msgstr "不删除,只显示"
18614
65387fd5 18615#: builtin/notes.c:957
5c57d762
JX
18616msgid "report pruned notes"
18617msgstr "报告清除的注解"
18618
65387fd5 18619#: builtin/notes.c:1000
6c94aba5 18620msgid "notes-ref"
07432cef 18621msgstr "注解引用"
ef317cd5 18622
65387fd5 18623#: builtin/notes.c:1001
814ff314 18624msgid "use notes from <notes-ref>"
07432cef 18625msgstr "从 <注解引用> 使用注解"
ef317cd5 18626
65387fd5 18627#: builtin/notes.c:1036 builtin/stash.c:1818
ef317cd5 18628#, c-format
a0b6b246 18629msgid "unknown subcommand: %s"
ef317cd5
JX
18630msgstr "未知子命令:%s"
18631
ec3d4607 18632#: builtin/pack-objects.c:182
1b7f4a34
JX
18633msgid ""
18634"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
18635msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
ef317cd5 18636
ec3d4607 18637#: builtin/pack-objects.c:183
1b7f4a34
JX
18638msgid ""
18639"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
58b6f078 18640msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
ef317cd5 18641
ec3d4607 18642#: builtin/pack-objects.c:572
473eb541
JX
18643#, c-format
18644msgid ""
18645"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
18646"pack %s"
33b62fba
JX
18647msgstr ""
18648"write_reuse_object:无法定位 %1$s,预期在包 %3$s 中的偏移量 %2$<PRIuMAX> 上"
473eb541 18649
ec3d4607 18650#: builtin/pack-objects.c:580
ef317cd5 18651#, c-format
c1ac5258
JX
18652msgid "bad packed object CRC for %s"
18653msgstr "%s 错的包对象 CRC"
18654
ec3d4607 18655#: builtin/pack-objects.c:591
c1ac5258
JX
18656#, c-format
18657msgid "corrupt packed object for %s"
18658msgstr "%s 损坏的包对象"
18659
ec3d4607 18660#: builtin/pack-objects.c:722
c1ac5258
JX
18661#, c-format
18662msgid "recursive delta detected for object %s"
18663msgstr "发现对象 %s 递归 delta"
18664
ec3d4607 18665#: builtin/pack-objects.c:941
c1ac5258
JX
18666#, c-format
18667msgid "ordered %u objects, expected %<PRIu32>"
18668msgstr "排序了 %u 个对象,预期 %<PRIu32> 个"
18669
ec3d4607 18670#: builtin/pack-objects.c:1036
473eb541
JX
18671#, c-format
18672msgid "expected object at offset %<PRIuMAX> in pack %s"
18673msgstr "预期对象在包文件 %2$s 的偏移量 %1$<PRIuMAX> 上"
18674
7e6630a7 18675#: builtin/pack-objects.c:1160
5b04ee3b
JX
18676msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
18677msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
18678
7e6630a7 18679#: builtin/pack-objects.c:1173
6c94aba5
JX
18680msgid "Writing objects"
18681msgstr "写入对象中"
18682
7e6630a7 18683#: builtin/pack-objects.c:1235 builtin/update-index.c:90
c1ac5258
JX
18684#, c-format
18685msgid "failed to stat %s"
65387fd5 18686msgstr "无法对 %s 调用 stat"
c1ac5258 18687
7e6630a7
FZ
18688#: builtin/pack-objects.c:1268
18689msgid "failed to write bitmap index"
65387fd5 18690msgstr "无法写入位图索引"
7e6630a7
FZ
18691
18692#: builtin/pack-objects.c:1294
c1ac5258
JX
18693#, c-format
18694msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
18695msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
18696
7e6630a7 18697#: builtin/pack-objects.c:1536
6c94aba5
JX
18698msgid "disabling bitmap writing, as some objects are not being packed"
18699msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
18700
7e6630a7 18701#: builtin/pack-objects.c:1984
c1ac5258
JX
18702#, c-format
18703msgid "delta base offset overflow in pack for %s"
18704msgstr "%s 压缩中 delta 基准偏移越界"
18705
7e6630a7 18706#: builtin/pack-objects.c:1993
c1ac5258
JX
18707#, c-format
18708msgid "delta base offset out of bound for %s"
18709msgstr "%s 的 delta 基准偏移越界"
18710
7e6630a7 18711#: builtin/pack-objects.c:2274
fd8cb379
JX
18712msgid "Counting objects"
18713msgstr "对象计数中"
18714
7e6630a7 18715#: builtin/pack-objects.c:2439
fd8cb379
JX
18716#, c-format
18717msgid "unable to parse object header of %s"
18718msgstr "无法解析对象 %s 头信息"
18719
7e6630a7
FZ
18720#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
18721#: builtin/pack-objects.c:2535
c1ac5258
JX
18722#, c-format
18723msgid "object %s cannot be read"
18724msgstr "对象 %s 无法读取"
18725
7e6630a7 18726#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
c1ac5258 18727#, c-format
4c27fcb5
JX
18728msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
18729msgstr "对象 %s 不一致的对象长度(%<PRIuMAX> vs %<PRIuMAX>)"
c1ac5258 18730
7e6630a7 18731#: builtin/pack-objects.c:2549
c1ac5258
JX
18732msgid "suboptimal pack - out of memory"
18733msgstr "次优(suboptimal)打包 - 内存不足"
18734
7e6630a7 18735#: builtin/pack-objects.c:2864
c1ac5258
JX
18736#, c-format
18737msgid "Delta compression using up to %d threads"
18738msgstr "使用 %d 个线程进行压缩"
18739
7e6630a7 18740#: builtin/pack-objects.c:3003
c1ac5258
JX
18741#, c-format
18742msgid "unable to pack objects reachable from tag %s"
18743msgstr "无法为标签 %s 压缩对象"
18744
7e6630a7 18745#: builtin/pack-objects.c:3089
6c94aba5
JX
18746msgid "Compressing objects"
18747msgstr "压缩对象中"
18748
7e6630a7 18749#: builtin/pack-objects.c:3095
c1ac5258
JX
18750msgid "inconsistency with delta count"
18751msgstr "不一致的差异计数"
18752
7e6630a7 18753#: builtin/pack-objects.c:3174
7157c2b5
JX
18754#, c-format
18755msgid ""
18756"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
18757"hash> <uri>' (got '%s')"
d9488fea
JX
18758msgstr ""
18759"uploadpack.blobpackfileuri 的取值必须是 '<object-hash> <pack-hash> <uri>' 格"
18760"式(得到 '%s')"
7157c2b5 18761
7e6630a7 18762#: builtin/pack-objects.c:3177
7157c2b5
JX
18763#, c-format
18764msgid ""
18765"object already configured in another uploadpack.blobpackfileuri (got '%s')"
18766msgstr "对象已经在另外的 uploadpack.blobpackfileuri 中配置(得到 '%s')"
18767
7e6630a7 18768#: builtin/pack-objects.c:3212
33b62fba
JX
18769#, c-format
18770msgid "could not get type of object %s in pack %s"
18771msgstr "无法获得包 %2$s 中对象 %1$s 的类型"
18772
7e6630a7
FZ
18773#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
18774#: builtin/pack-objects.c:3365
33b62fba
JX
18775#, c-format
18776msgid "could not find pack '%s'"
18777msgstr "不能找到包 '%s'"
18778
7e6630a7 18779#: builtin/pack-objects.c:3408
c1ac5258
JX
18780#, c-format
18781msgid ""
18782"expected edge object ID, got garbage:\n"
18783" %s"
18784msgstr ""
18785"预期边界对象(edge object)ID,却得到垃圾数据:\n"
18786" %s"
18787
7e6630a7 18788#: builtin/pack-objects.c:3414
c1ac5258
JX
18789#, c-format
18790msgid ""
18791"expected object ID, got garbage:\n"
18792" %s"
18793msgstr ""
18794"预期对象 ID,却得到垃圾数据:\n"
18795" %s"
18796
7e6630a7 18797#: builtin/pack-objects.c:3507
5809aa05
JX
18798msgid "invalid value for --missing"
18799msgstr "选项 --missing 的值无效"
18800
7e6630a7 18801#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
c1ac5258
JX
18802msgid "cannot open pack index"
18803msgstr "无法打开包文件索引"
18804
7e6630a7 18805#: builtin/pack-objects.c:3541
c1ac5258
JX
18806#, c-format
18807msgid "loose object at %s could not be examined"
18808msgstr "无法检查 %s 处的松散对象"
18809
7e6630a7 18810#: builtin/pack-objects.c:3627
c1ac5258
JX
18811msgid "unable to force loose object"
18812msgstr "无法强制松散对象"
18813
7e6630a7 18814#: builtin/pack-objects.c:3757
c1ac5258
JX
18815#, c-format
18816msgid "not a rev '%s'"
18817msgstr "不是一个版本 '%s'"
18818
7e6630a7 18819#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
c1ac5258
JX
18820#, c-format
18821msgid "bad revision '%s'"
18822msgstr "坏的版本 '%s'"
18823
7e6630a7 18824#: builtin/pack-objects.c:3788
c1ac5258
JX
18825msgid "unable to add recent objects"
18826msgstr "无法添加最近的对象"
18827
7e6630a7 18828#: builtin/pack-objects.c:3841
ef317cd5
JX
18829#, c-format
18830msgid "unsupported index version %s"
18831msgstr "不支持的索引版本 %s"
18832
7e6630a7 18833#: builtin/pack-objects.c:3845
ef317cd5
JX
18834#, c-format
18835msgid "bad index version '%s'"
18836msgstr "坏的索引版本 '%s'"
18837
7e6630a7 18838#: builtin/pack-objects.c:3884
c1ac5258
JX
18839msgid "<version>[,<offset>]"
18840msgstr "<版本>[,<偏移>]"
ef317cd5 18841
7e6630a7 18842#: builtin/pack-objects.c:3885
ef317cd5 18843msgid "write the pack index file in the specified idx format version"
07432cef 18844msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 18845
7e6630a7 18846#: builtin/pack-objects.c:3888
ef317cd5 18847msgid "maximum size of each output pack file"
07432cef 18848msgstr "每个输出包的最大尺寸"
ef317cd5 18849
7e6630a7 18850#: builtin/pack-objects.c:3890
ef317cd5 18851msgid "ignore borrowed objects from alternate object store"
160fb2b2 18852msgstr "忽略从备用对象存储里借用对象"
ef317cd5 18853
7e6630a7 18854#: builtin/pack-objects.c:3892
ef317cd5 18855msgid "ignore packed objects"
07432cef 18856msgstr "忽略包对象"
ef317cd5 18857
7e6630a7 18858#: builtin/pack-objects.c:3894
ef317cd5 18859msgid "limit pack window by objects"
07432cef 18860msgstr "限制打包窗口的对象数"
ef317cd5 18861
7e6630a7 18862#: builtin/pack-objects.c:3896
ef317cd5 18863msgid "limit pack window by memory in addition to object limit"
07432cef 18864msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 18865
7e6630a7 18866#: builtin/pack-objects.c:3898
ef317cd5 18867msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 18868msgstr "打包允许的 delta 链的最大长度"
ef317cd5 18869
7e6630a7 18870#: builtin/pack-objects.c:3900
ef317cd5 18871msgid "reuse existing deltas"
07432cef 18872msgstr "重用已存在的 deltas"
ef317cd5 18873
7e6630a7 18874#: builtin/pack-objects.c:3902
ef317cd5 18875msgid "reuse existing objects"
07432cef 18876msgstr "重用已存在的对象"
ef317cd5 18877
7e6630a7 18878#: builtin/pack-objects.c:3904
ef317cd5 18879msgid "use OFS_DELTA objects"
07432cef 18880msgstr "使用 OFS_DELTA 对象"
ef317cd5 18881
7e6630a7 18882#: builtin/pack-objects.c:3906
ef317cd5 18883msgid "use threads when searching for best delta matches"
07432cef 18884msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 18885
7e6630a7 18886#: builtin/pack-objects.c:3908
ef317cd5 18887msgid "do not create an empty pack output"
07432cef 18888msgstr "不创建空的包输出"
ef317cd5 18889
7e6630a7 18890#: builtin/pack-objects.c:3910
ef317cd5 18891msgid "read revision arguments from standard input"
d9d56b23 18892msgstr "从标准输入读取版本号参数"
ef317cd5 18893
7e6630a7 18894#: builtin/pack-objects.c:3912
ef317cd5 18895msgid "limit the objects to those that are not yet packed"
07432cef 18896msgstr "限制那些尚未打包的对象"
ef317cd5 18897
7e6630a7 18898#: builtin/pack-objects.c:3915
ef317cd5 18899msgid "include objects reachable from any reference"
07432cef 18900msgstr "包括可以从任何引用访问到的对象"
ef317cd5 18901
7e6630a7 18902#: builtin/pack-objects.c:3918
ef317cd5 18903msgid "include objects referred by reflog entries"
07432cef 18904msgstr "包括被引用日志引用到的对象"
ef317cd5 18905
7e6630a7 18906#: builtin/pack-objects.c:3921
220c313c
JX
18907msgid "include objects referred to by the index"
18908msgstr "包括被索引引用到的对象"
18909
7e6630a7 18910#: builtin/pack-objects.c:3924
33b62fba
JX
18911msgid "read packs from stdin"
18912msgstr "从标准输入读取包"
18913
7e6630a7 18914#: builtin/pack-objects.c:3926
ef317cd5 18915msgid "output pack to stdout"
07432cef 18916msgstr "输出包到标准输出"
ef317cd5 18917
7e6630a7 18918#: builtin/pack-objects.c:3928
ef317cd5 18919msgid "include tag objects that refer to objects to be packed"
53438e8f 18920msgstr "包括那些引用了待打包对象的标签对象"
ef317cd5 18921
7e6630a7 18922#: builtin/pack-objects.c:3930
ef317cd5 18923msgid "keep unreachable objects"
07432cef 18924msgstr "维持不可达的对象"
ef317cd5 18925
7e6630a7 18926#: builtin/pack-objects.c:3932
5c57d762
JX
18927msgid "pack loose unreachable objects"
18928msgstr "打包松散的不可达对象"
18929
7e6630a7 18930#: builtin/pack-objects.c:3934
ef317cd5 18931msgid "unpack unreachable objects newer than <time>"
07432cef 18932msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 18933
7e6630a7 18934#: builtin/pack-objects.c:3937
06991777
JX
18935msgid "use the sparse reachability algorithm"
18936msgstr "使用稀疏可达性算法"
18937
7e6630a7 18938#: builtin/pack-objects.c:3939
ef317cd5 18939msgid "create thin packs"
07432cef 18940msgstr "创建精简包"
ef317cd5 18941
7e6630a7 18942#: builtin/pack-objects.c:3941
04cb2f28 18943msgid "create packs suitable for shallow fetches"
160fb2b2 18944msgstr "创建适合浅克隆仓库获取的包"
04cb2f28 18945
7e6630a7 18946#: builtin/pack-objects.c:3943
ef317cd5 18947msgid "ignore packs that have companion .keep file"
07432cef 18948msgstr "忽略配有 .keep 文件的包"
ef317cd5 18949
7e6630a7 18950#: builtin/pack-objects.c:3945
fd8cb379
JX
18951msgid "ignore this pack"
18952msgstr "忽略该 pack"
18953
7e6630a7 18954#: builtin/pack-objects.c:3947
ef317cd5 18955msgid "pack compression level"
07432cef 18956msgstr "打包压缩级别"
ef317cd5 18957
7e6630a7 18958#: builtin/pack-objects.c:3949
ef317cd5 18959msgid "do not hide commits by grafts"
fd8cb379 18960msgstr "显示被移植隐藏的提交"
ef317cd5 18961
7e6630a7 18962#: builtin/pack-objects.c:3951
6c94aba5
JX
18963msgid "use a bitmap index if available to speed up counting objects"
18964msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
18965
7e6630a7 18966#: builtin/pack-objects.c:3953
6c94aba5
JX
18967msgid "write a bitmap index together with the pack index"
18968msgstr "在建立包索引的同时创建 bitmap 索引"
18969
7e6630a7 18970#: builtin/pack-objects.c:3957
a6cd2cc4
JX
18971msgid "write a bitmap index if possible"
18972msgstr "如果可能,写 bitmap 索引"
18973
7e6630a7 18974#: builtin/pack-objects.c:3961
5809aa05
JX
18975msgid "handling for missing objects"
18976msgstr "处理丢失的对象"
18977
7e6630a7 18978#: builtin/pack-objects.c:3964
31e5e17b
JX
18979msgid "do not pack objects in promisor packfiles"
18980msgstr "不要打包 promisor 包文件中的对象"
18981
7e6630a7 18982#: builtin/pack-objects.c:3966
4c27fcb5
JX
18983msgid "respect islands during delta compression"
18984msgstr "在增量压缩时参考数据岛"
18985
7e6630a7 18986#: builtin/pack-objects.c:3968
7157c2b5
JX
18987msgid "protocol"
18988msgstr "协议"
18989
7e6630a7 18990#: builtin/pack-objects.c:3969
7157c2b5
JX
18991msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
18992msgstr "使用此协议排除任何已配置的 uploadpack.blobpackfileuri"
18993
7e6630a7 18994#: builtin/pack-objects.c:4002
fd8cb379
JX
18995#, c-format
18996msgid "delta chain depth %d is too deep, forcing %d"
18997msgstr "增量链深度 %d 太深了,强制为 %d"
18998
7e6630a7 18999#: builtin/pack-objects.c:4007
fd8cb379
JX
19000#, c-format
19001msgid "pack.deltaCacheLimit is too high, forcing %d"
19002msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d"
6c94aba5 19003
7e6630a7 19004#: builtin/pack-objects.c:4063
c1ac5258
JX
19005msgid "--max-pack-size cannot be used to build a pack for transfer"
19006msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
19007
7e6630a7 19008#: builtin/pack-objects.c:4065
c1ac5258 19009msgid "minimum pack size limit is 1 MiB"
e640d114 19010msgstr "最小的包文件大小是 1 MiB"
c1ac5258 19011
7e6630a7 19012#: builtin/pack-objects.c:4070
c1ac5258
JX
19013msgid "--thin cannot be used to build an indexable pack"
19014msgstr "--thin 不能用于创建一个可索引包"
19015
7e6630a7 19016#: builtin/pack-objects.c:4079
c1ac5258 19017msgid "cannot use --filter without --stdout"
e640d114 19018msgstr "不能在没有 --stdout 的情况下使用 --filter"
c1ac5258 19019
7e6630a7 19020#: builtin/pack-objects.c:4081
33b62fba
JX
19021msgid "cannot use --filter with --stdin-packs"
19022msgstr "不能同时使用 --filter 和 --stdin-packs"
19023
7e6630a7 19024#: builtin/pack-objects.c:4085
33b62fba
JX
19025msgid "cannot use internal rev list with --stdin-packs"
19026msgstr "不能同时使用内部版本列表和 --stdin-packs"
19027
7e6630a7 19028#: builtin/pack-objects.c:4144
fd8cb379 19029msgid "Enumerating objects"
d9488fea 19030msgstr "枚举对象中"
fd8cb379 19031
65387fd5 19032#: builtin/pack-objects.c:4180
c1ac5258 19033#, c-format
2b472aae
JX
19034msgid ""
19035"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
19036"reused %<PRIu32>"
19037msgstr ""
19038"总共 %<PRIu32>(差异 %<PRIu32>),复用 %<PRIu32>(差异 %<PRIu32>),包复用 "
19039"%<PRIu32>"
c1ac5258 19040
473eb541
JX
19041#: builtin/pack-redundant.c:601
19042msgid ""
19043"'git pack-redundant' is nominated for removal.\n"
19044"If you still use this command, please add an extra\n"
19045"option, '--i-still-use-this', on the command line\n"
19046"and let us know you still use it by sending an e-mail\n"
19047"to <git@vger.kernel.org>. Thanks.\n"
19048msgstr ""
19049"准备移除 'git pack-redundant' 命令。如果您仍旧使用这个\n"
19050"命令,请在命令行中添加额外参数:'--i-still-use-this',\n"
19051"并通过发送邮件到 <git@vger.kernel.org> 让我们知道您仍旧\n"
19052"使用它。 谢谢。\n"
19053
d46c5519 19054#: builtin/pack-refs.c:8
814ff314
JX
19055msgid "git pack-refs [<options>]"
19056msgstr "git pack-refs [<选项>]"
c04f5ac3 19057
d46c5519 19058#: builtin/pack-refs.c:16
ef317cd5 19059msgid "pack everything"
07432cef 19060msgstr "打包一切"
c04f5ac3 19061
d46c5519 19062#: builtin/pack-refs.c:17
ef317cd5 19063msgid "prune loose refs (default)"
07432cef 19064msgstr "清除松散的引用(默认)"
c04f5ac3 19065
349ede6a 19066#: builtin/prune-packed.c:6
814ff314
JX
19067msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
19068msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
6792b93b 19069
349ede6a 19070#: builtin/prune.c:14
5809aa05
JX
19071msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
19072msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
7ac1c0ad 19073
65387fd5 19074#: builtin/prune.c:145
1b7f4a34
JX
19075msgid "report pruned objects"
19076msgstr "报告清除的对象"
19077
65387fd5 19078#: builtin/prune.c:148
1b7f4a34
JX
19079msgid "expire objects older than <time>"
19080msgstr "使早于给定时间的对象过期"
19081
65387fd5 19082#: builtin/prune.c:150
31e5e17b
JX
19083msgid "limit traversal to objects outside promisor packfiles"
19084msgstr "限制遍历 promisor 包以外的对象"
19085
65387fd5 19086#: builtin/prune.c:163
94550ed3
JX
19087msgid "cannot prune in a precious-objects repo"
19088msgstr "不能在珍品仓库中执行清理操作"
19089
2b472aae 19090#: builtin/pull.c:45 builtin/pull.c:47
a0b6b246
JX
19091#, c-format
19092msgid "Invalid value for %s: %s"
19093msgstr "%s 的值无效:%s"
19094
2b472aae 19095#: builtin/pull.c:67
94550ed3 19096msgid "git pull [<options>] [<repository> [<refspec>...]]"
1b7f4a34
JX
19097msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
19098
ffa14514 19099#: builtin/pull.c:124
a4f16749
JX
19100msgid "control for recursive fetching of submodules"
19101msgstr "控制子模组的递归获取"
19102
ffa14514 19103#: builtin/pull.c:128
1b7f4a34
JX
19104msgid "Options related to merging"
19105msgstr "和合并相关的选项"
19106
ffa14514 19107#: builtin/pull.c:131
1b7f4a34
JX
19108msgid "incorporate changes by rebasing rather than merging"
19109msgstr "使用变基操作取代合并操作以合入修改"
19110
ffa14514 19111#: builtin/pull.c:159 builtin/revert.c:126
1b7f4a34
JX
19112msgid "allow fast-forward"
19113msgstr "允许快进式"
19114
ffa14514
FZ
19115#: builtin/pull.c:165
19116msgid "control use of pre-merge-commit and commit-msg hooks"
19117msgstr "控制 pre-merge-commit 和 commit-msg 钩子的使用"
19118
65387fd5 19119#: builtin/pull.c:171 parse-options.h:340
349ede6a
JX
19120msgid "automatically stash/stash pop before and after"
19121msgstr "在操作前后执行自动贮藏和弹出贮藏"
5b04ee3b 19122
ffa14514 19123#: builtin/pull.c:187
1b7f4a34
JX
19124msgid "Options related to fetching"
19125msgstr "和获取相关的参数"
19126
ffa14514 19127#: builtin/pull.c:197
4c27fcb5
JX
19128msgid "force overwrite of local branch"
19129msgstr "强制覆盖本地分支"
19130
ffa14514 19131#: builtin/pull.c:205
276ceeaa
JX
19132msgid "number of submodules pulled in parallel"
19133msgstr "并发拉取的子模组的数量"
19134
ffa14514 19135#: builtin/pull.c:321
1b7f4a34
JX
19136#, c-format
19137msgid "Invalid value for pull.ff: %s"
19138msgstr "pull.ff 的取值无效:%s"
19139
ffa14514 19140#: builtin/pull.c:449
1b7f4a34
JX
19141msgid ""
19142"There is no candidate for rebasing against among the refs that you just "
19143"fetched."
19144msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
19145
ffa14514 19146#: builtin/pull.c:451
1b7f4a34
JX
19147msgid ""
19148"There are no candidates for merging among the refs that you just fetched."
19149msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
19150
ffa14514 19151#: builtin/pull.c:452
1b7f4a34
JX
19152msgid ""
19153"Generally this means that you provided a wildcard refspec which had no\n"
19154"matches on the remote end."
19155msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
19156
ffa14514 19157#: builtin/pull.c:455
1b7f4a34
JX
19158#, c-format
19159msgid ""
19160"You asked to pull from the remote '%s', but did not specify\n"
19161"a branch. Because this is not the default configured remote\n"
19162"for your current branch, you must specify a branch on the command line."
19163msgstr ""
19164"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
19165"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
19166
ffa14514 19167#: builtin/pull.c:460 builtin/rebase.c:951
1b7f4a34
JX
19168msgid "You are not currently on a branch."
19169msgstr "您当前不在一个分支上。"
19170
ffa14514 19171#: builtin/pull.c:462 builtin/pull.c:477
1b7f4a34
JX
19172msgid "Please specify which branch you want to rebase against."
19173msgstr "请指定您要变基到哪一个分支。"
19174
ffa14514 19175#: builtin/pull.c:464 builtin/pull.c:479
1b7f4a34
JX
19176msgid "Please specify which branch you want to merge with."
19177msgstr "请指定您要合并哪一个分支。"
19178
ffa14514 19179#: builtin/pull.c:465 builtin/pull.c:480
1b7f4a34
JX
19180msgid "See git-pull(1) for details."
19181msgstr "详见 git-pull(1)。"
19182
ffa14514 19183#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
7e6630a7 19184#: builtin/rebase.c:957
5b04ee3b
JX
19185msgid "<remote>"
19186msgstr "<远程>"
19187
ffa14514 19188#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
65387fd5 19189#: contrib/scalar/scalar.c:375
5b04ee3b
JX
19190msgid "<branch>"
19191msgstr "<分支>"
19192
ffa14514 19193#: builtin/pull.c:475 builtin/rebase.c:949
1b7f4a34
JX
19194msgid "There is no tracking information for the current branch."
19195msgstr "当前分支没有跟踪信息。"
19196
ffa14514 19197#: builtin/pull.c:484
1b7f4a34 19198msgid ""
5b04ee3b
JX
19199"If you wish to set tracking information for this branch you can do so with:"
19200msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
7ac1c0ad 19201
ffa14514 19202#: builtin/pull.c:489
1b7f4a34
JX
19203#, c-format
19204msgid ""
19205"Your configuration specifies to merge with the ref '%s'\n"
19206"from the remote, but no such ref was fetched."
19207msgstr ""
19208"您的配置中指定要合并远程的引用 '%s',\n"
19209"但是没有获取到这个引用。"
7ac1c0ad 19210
ffa14514 19211#: builtin/pull.c:600
4c27fcb5
JX
19212#, c-format
19213msgid "unable to access commit %s"
19214msgstr "无法访问提交 %s"
19215
ffa14514 19216#: builtin/pull.c:908
5c57d762
JX
19217msgid "ignoring --verify-signatures for rebase"
19218msgstr "为变基操作忽略 --verify-signatures"
19219
65387fd5 19220#: builtin/pull.c:969
473eb541 19221msgid ""
7e6630a7
FZ
19222"You have divergent branches and need to specify how to reconcile them.\n"
19223"You can do so by running one of the following commands sometime before\n"
19224"your next pull:\n"
473eb541 19225"\n"
65387fd5 19226" git config pull.rebase false # merge\n"
473eb541
JX
19227" git config pull.rebase true # rebase\n"
19228" git config pull.ff only # fast-forward only\n"
19229"\n"
19230"You can replace \"git config\" with \"git config --global\" to set a "
19231"default\n"
19232"preference for all repositories. You can also pass --rebase, --no-rebase,\n"
19233"or --ff-only on the command line to override the configured default per\n"
19234"invocation.\n"
19235msgstr ""
7e6630a7 19236"您有偏离的分支,需要指定如何调和它们。您可以在执行下一次\n"
473eb541
JX
19237"pull 操作之前执行下面一条命令来抑制本消息:\n"
19238"\n"
65387fd5 19239" git config pull.rebase false # 合并\n"
473eb541
JX
19240" git config pull.rebase true # 变基\n"
19241" git config pull.ff only # 仅快进\n"
19242"\n"
19243"您可以将 \"git config\" 替换为 \"git config --global\" 以便为所有仓库设置\n"
19244"缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase,\n"
19245"或者 --ff-only 参数覆盖缺省设置。\n"
19246
65387fd5 19247#: builtin/pull.c:1046
1b7f4a34
JX
19248msgid "Updating an unborn branch with changes added to the index."
19249msgstr "更新尚未诞生的分支,变更添加至索引。"
19250
65387fd5 19251#: builtin/pull.c:1050
a0b6b246
JX
19252msgid "pull with rebase"
19253msgstr "变基式拉取"
19254
65387fd5 19255#: builtin/pull.c:1051
a0b6b246 19256msgid "please commit or stash them."
554e8501 19257msgstr "请提交或贮藏它们。"
a0b6b246 19258
65387fd5 19259#: builtin/pull.c:1076
1b7f4a34
JX
19260#, c-format
19261msgid ""
19262"fetch updated the current branch head.\n"
19263"fast-forwarding your working tree from\n"
19264"commit %s."
19265msgstr ""
19266"fetch 更新了当前的分支。快进您的工作区\n"
19267"至提交 %s。"
ef317cd5 19268
65387fd5 19269#: builtin/pull.c:1082
1b7f4a34
JX
19270#, c-format
19271msgid ""
19272"Cannot fast-forward your working tree.\n"
19273"After making sure that you saved anything precious from\n"
19274"$ git diff %s\n"
19275"output, run\n"
19276"$ git reset --hard\n"
19277"to recover."
19278msgstr ""
19279"您当前的工作区无法执行快进操作。\n"
19280"首先执行如下命令:\n"
19281"$ git diff %s\n"
19282"以确认所有有用的数据均已保存。然后执行下面的命令\n"
19283"$ git reset --hard\n"
19284"恢复之前的状态。"
19285
65387fd5 19286#: builtin/pull.c:1097
1b7f4a34
JX
19287msgid "Cannot merge multiple branches into empty head."
19288msgstr "无法将多个分支合并到空分支。"
19289
65387fd5 19290#: builtin/pull.c:1102
1b7f4a34
JX
19291msgid "Cannot rebase onto multiple branches."
19292msgstr "无法变基到多个分支。"
19293
65387fd5 19294#: builtin/pull.c:1104
7e6630a7
FZ
19295msgid "Cannot fast-forward to multiple branches."
19296msgstr "无法快进到多个分支。"
19297
65387fd5 19298#: builtin/pull.c:1119
7e6630a7
FZ
19299msgid "Need to specify how to reconcile divergent branches."
19300msgstr "需要指定如何调和偏离的分支。"
19301
65387fd5 19302#: builtin/pull.c:1133
a4f16749
JX
19303msgid "cannot rebase with locally recorded submodule modifications"
19304msgstr "本地子模组中有修改,无法变基"
19305
fd8cb379 19306#: builtin/push.c:19
ef317cd5 19307msgid "git push [<options>] [<repository> [<refspec>...]]"
160fb2b2 19308msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
7ac1c0ad 19309
d9488fea 19310#: builtin/push.c:111
c04f5ac3 19311msgid "tag shorthand without <tag>"
55a16ee4 19312msgstr "标签后面未提供 <标签> 参数"
c04f5ac3 19313
d9488fea 19314#: builtin/push.c:119
c04f5ac3 19315msgid "--delete only accepts plain target ref names"
90e6ef53 19316msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 19317
d9488fea 19318#: builtin/push.c:164
8ada9598
JX
19319msgid ""
19320"\n"
19321"To choose either option permanently, see push.default in 'git help config'."
19322msgstr ""
81809b99
JX
19323"\n"
19324"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 19325
d9488fea 19326#: builtin/push.c:167
8ada9598
JX
19327#, c-format
19328msgid ""
19329"The upstream branch of your current branch does not match\n"
19330"the name of your current branch. To push to the upstream branch\n"
19331"on the remote, use\n"
19332"\n"
19333" git push %s HEAD:%s\n"
19334"\n"
19335"To push to the branch of the same name on the remote, use\n"
19336"\n"
4c27fcb5 19337" git push %s HEAD\n"
8ada9598
JX
19338"%s"
19339msgstr ""
4c27fcb5
JX
19340"您当前分支的上游分支和您当前分支名不匹配,为推送到远程的上游分支,\n"
19341"使用\n"
81809b99
JX
19342"\n"
19343" git push %s HEAD:%s\n"
19344"\n"
19345"为推送至远程同名分支,使用\n"
19346"\n"
4c27fcb5 19347" git push %s HEAD\n"
81809b99 19348"%s"
8ada9598 19349
d9488fea 19350#: builtin/push.c:182
c04f5ac3
JX
19351#, c-format
19352msgid ""
19353"You are not currently on a branch.\n"
19354"To push the history leading to the current (detached HEAD)\n"
19355"state now, use\n"
19356"\n"
19357" git push %s HEAD:<name-of-remote-branch>\n"
19358msgstr ""
19359"您当前不在一个分支上。\n"
90e6ef53 19360"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3 19361"\n"
d9d56b23 19362" git push %s HEAD:<远程分支名字>\n"
c04f5ac3 19363
ec3d4607 19364#: builtin/push.c:191
c04f5ac3
JX
19365#, c-format
19366msgid ""
19367"The current branch %s has no upstream branch.\n"
19368"To push the current branch and set the remote as upstream, use\n"
19369"\n"
19370" git push --set-upstream %s %s\n"
19371msgstr ""
19372"当前分支 %s 没有对应的上游分支。\n"
19373"为推送当前分支并建立与远程上游的跟踪,使用\n"
19374"\n"
19375" git push --set-upstream %s %s\n"
19376
ec3d4607 19377#: builtin/push.c:199
c04f5ac3
JX
19378#, c-format
19379msgid "The current branch %s has multiple upstream branches, refusing to push."
19380msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
19381
ec3d4607
JX
19382#: builtin/push.c:217
19383msgid ""
19384"You didn't specify any refspecs to push, and push.default is \"nothing\"."
19385msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
19386
19387#: builtin/push.c:243
73a60cd2
JX
19388#, c-format
19389msgid ""
19390"You are pushing to remote '%s', which is not the upstream of\n"
19391"your current branch '%s', without telling me what to push\n"
19392"to update which remote branch."
19393msgstr ""
19394"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
19395"而没有告诉我要推送什么、更新哪个远程分支。"
19396
ec3d4607 19397#: builtin/push.c:258
170e9899
JX
19398msgid ""
19399"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
19400"its remote counterpart. Integrate the remote changes (e.g.\n"
19401"'git pull ...') before pushing again.\n"
170e9899
JX
19402"See the 'Note about fast-forwards' in 'git push --help' for details."
19403msgstr ""
eff6d3a9 19404"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 19405"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 19406"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 19407
ec3d4607 19408#: builtin/push.c:264
170e9899
JX
19409msgid ""
19410"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
19411"counterpart. Check out this branch and integrate the remote changes\n"
19412"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
19413"See the 'Note about fast-forwards' in 'git push --help' for details."
19414msgstr ""
eff6d3a9 19415"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 19416"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 19417"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 19418
ec3d4607 19419#: builtin/push.c:270
07432cef 19420msgid ""
a77c07d9
JX
19421"Updates were rejected because the remote contains work that you do\n"
19422"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
19423"to the same ref. You may want to first integrate the remote changes\n"
19424"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
19425"See the 'Note about fast-forwards' in 'git push --help' for details."
19426msgstr ""
160fb2b2
JX
19427"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
19428"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
2e8451e8 19429"(如 'git pull ...')。\n"
a77c07d9
JX
19430"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
19431
ec3d4607 19432#: builtin/push.c:277
a77c07d9 19433msgid "Updates were rejected because the tag already exists in the remote."
55a16ee4 19434msgstr "更新被拒绝,因为该标签在远程已经存在。"
a77c07d9 19435
ec3d4607 19436#: builtin/push.c:280
a77c07d9
JX
19437msgid ""
19438"You cannot update a remote ref that points at a non-commit object,\n"
19439"or update a remote ref to make it point at a non-commit object,\n"
19440"without using the '--force' option.\n"
19441msgstr ""
19442"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
19443"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 19444
ec3d4607 19445#: builtin/push.c:285
d13389bf
JX
19446msgid ""
19447"Updates were rejected because the tip of the remote-tracking\n"
19448"branch has been updated since the last checkout. You may want\n"
19449"to integrate those changes locally (e.g., 'git pull ...')\n"
19450"before forcing an update.\n"
19451msgstr ""
19452"更新被拒绝,因为远程跟踪分支的最新提交自从上次检出之后已被更新。\n"
19453"在强制更新前,您可能想将这些变更整合到本地(如 'git pull ...')。\n"
19454
ec3d4607 19455#: builtin/push.c:355
c04f5ac3
JX
19456#, c-format
19457msgid "Pushing to %s\n"
19458msgstr "推送到 %s\n"
19459
ec3d4607 19460#: builtin/push.c:362
c04f5ac3
JX
19461#, c-format
19462msgid "failed to push some refs to '%s'"
65387fd5 19463msgstr "无法推送一些引用到 '%s'"
c04f5ac3 19464
65387fd5 19465#: builtin/push.c:544 builtin/submodule--helper.c:3259
ef317cd5 19466msgid "repository"
160fb2b2 19467msgstr "仓库"
ef317cd5 19468
7e6630a7 19469#: builtin/push.c:545 builtin/send-pack.c:193
ef317cd5 19470msgid "push all refs"
07432cef 19471msgstr "推送所有引用"
ef317cd5 19472
7e6630a7 19473#: builtin/push.c:546 builtin/send-pack.c:195
ef317cd5 19474msgid "mirror all refs"
07432cef 19475msgstr "镜像所有引用"
ef317cd5 19476
ec3d4607 19477#: builtin/push.c:548
ef317cd5 19478msgid "delete refs"
07432cef 19479msgstr "删除引用"
ef317cd5 19480
ec3d4607 19481#: builtin/push.c:549
ef317cd5 19482msgid "push tags (can't be used with --all or --mirror)"
55a16ee4 19483msgstr "推送标签(不能使用 --all or --mirror)"
ef317cd5 19484
7e6630a7 19485#: builtin/push.c:552 builtin/send-pack.c:196
ef317cd5
JX
19486msgid "force updates"
19487msgstr "强制更新"
19488
7e6630a7 19489#: builtin/push.c:553 builtin/send-pack.c:208
c1ac5258
JX
19490msgid "<refname>:<expect>"
19491msgstr "<引用名>:<期望值>"
90314792 19492
7e6630a7 19493#: builtin/push.c:554 builtin/send-pack.c:209
90314792
JX
19494msgid "require old value of ref to be at this value"
19495msgstr "要求引用旧的取值为设定值"
19496
7e6630a7 19497#: builtin/push.c:557 builtin/send-pack.c:212
d13389bf
JX
19498msgid "require remote updates to be integrated locally"
19499msgstr "要求远程更新在本地被整合"
19500
ec3d4607 19501#: builtin/push.c:560
ef317cd5 19502msgid "control recursive pushing of submodules"
07432cef 19503msgstr "控制子模组的递归推送"
ef317cd5 19504
7e6630a7 19505#: builtin/push.c:561 builtin/send-pack.c:203
ef317cd5 19506msgid "use thin pack"
07432cef 19507msgstr "使用精简打包"
ef317cd5 19508
7e6630a7
FZ
19509#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190
19510#: builtin/send-pack.c:191
ef317cd5 19511msgid "receive pack program"
07432cef 19512msgstr "接收包程序"
ef317cd5 19513
ec3d4607 19514#: builtin/push.c:564
ef317cd5 19515msgid "set upstream for git pull/status"
07432cef 19516msgstr "设置 git pull/status 的上游"
ef317cd5 19517
ec3d4607 19518#: builtin/push.c:567
ef317cd5 19519msgid "prune locally removed refs"
07432cef 19520msgstr "清除本地删除的引用"
ef317cd5 19521
ec3d4607 19522#: builtin/push.c:569
a77c07d9
JX
19523msgid "bypass pre-push hook"
19524msgstr "绕过 pre-push 钩子"
19525
ec3d4607 19526#: builtin/push.c:570
1003b3a5 19527msgid "push missing but relevant tags"
55a16ee4 19528msgstr "推送缺失但有关的标签"
1003b3a5 19529
7e6630a7 19530#: builtin/push.c:572 builtin/send-pack.c:197
220c313c
JX
19531msgid "GPG sign the push"
19532msgstr "用 GPG 为推送签名"
19533
7e6630a7 19534#: builtin/push.c:574 builtin/send-pack.c:204
814ff314
JX
19535msgid "request atomic transaction on remote side"
19536msgstr "需要远端支持原子事务"
19537
ec3d4607 19538#: builtin/push.c:594
c04f5ac3
JX
19539msgid "--delete doesn't make sense without any refs"
19540msgstr "--delete 未接任何引用没有意义"
19541
ec3d4607 19542#: builtin/push.c:614
a5cd71ca
JX
19543#, c-format
19544msgid "bad repository '%s'"
19545msgstr "坏的仓库 '%s'"
19546
ec3d4607 19547#: builtin/push.c:615
a5cd71ca
JX
19548msgid ""
19549"No configured push destination.\n"
19550"Either specify the URL from the command-line or configure a remote "
19551"repository using\n"
19552"\n"
19553" git remote add <name> <url>\n"
19554"\n"
19555"and then push using the remote name\n"
19556"\n"
19557" git push <name>\n"
19558msgstr ""
19559"没有配置推送目标。\n"
19560"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
19561"\n"
19562" git remote add <名称> <地址>\n"
19563"\n"
19564"然后使用该远程仓库名执行推送\n"
19565"\n"
19566" git push <名称>\n"
19567
ec3d4607 19568#: builtin/push.c:632
fd8cb379
JX
19569msgid "--all can't be combined with refspecs"
19570msgstr "--all 不能和引用规格同时使用"
19571
ec3d4607 19572#: builtin/push.c:638
fd8cb379
JX
19573msgid "--mirror can't be combined with refspecs"
19574msgstr "--mirror 不能和引用规格同时使用"
19575
ec3d4607 19576#: builtin/push.c:648
5c57d762
JX
19577msgid "push options must not have new line characters"
19578msgstr "推送选项不能有换行符"
19579
473eb541 19580#: builtin/range-diff.c:9
c1ac5258
JX
19581msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
19582msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>"
19583
473eb541 19584#: builtin/range-diff.c:10
c1ac5258
JX
19585msgid "git range-diff [<options>] <old-tip>...<new-tip>"
19586msgstr "git range-diff [<选项>] <old-tip>...<new-tip>"
19587
473eb541 19588#: builtin/range-diff.c:11
c1ac5258
JX
19589msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
19590msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>"
19591
473eb541 19592#: builtin/range-diff.c:30
c1ac5258
JX
19593msgid "use simple diff colors"
19594msgstr "使用简单差异颜色"
19595
473eb541 19596#: builtin/range-diff.c:32
ddc12c42
JX
19597msgid "notes"
19598msgstr "注解"
19599
473eb541 19600#: builtin/range-diff.c:32
ddc12c42
JX
19601msgid "passed to 'git log'"
19602msgstr "传递给 'git log'"
19603
473eb541
JX
19604#: builtin/range-diff.c:35
19605msgid "only emit output related to the first range"
19606msgstr "仅显示与第一个范围有关的输出"
19607
19608#: builtin/range-diff.c:37
19609msgid "only emit output related to the second range"
19610msgstr "仅显示与第二个范围有关的输出"
19611
19612#: builtin/range-diff.c:60 builtin/range-diff.c:64
c1ac5258 19613#, c-format
473eb541
JX
19614msgid "not a commit range: '%s'"
19615msgstr "不是一个提交范围:'%s'"
c1ac5258 19616
473eb541 19617#: builtin/range-diff.c:74
c1ac5258
JX
19618msgid "single arg format must be symmetric range"
19619msgstr "单个参数格式必须是对称范围(即包含...)"
19620
473eb541 19621#: builtin/range-diff.c:89
c1ac5258
JX
19622msgid "need two commit ranges"
19623msgstr "需要两个提交范围"
19624
06991777 19625#: builtin/read-tree.c:41
ef317cd5 19626msgid ""
1b7f4a34 19627"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
7e6630a7
FZ
19628"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
19629"ish1> [<tree-ish2> [<tree-ish3>]])"
ef317cd5 19630msgstr ""
1b7f4a34 19631"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
7e6630a7
FZ
19632"u | -i]] [--no-sparse-checkout] [--index-output=<文件>] (--empty | <树对象一"
19633"> [<树对象二> [<树对象三>]])"
ef317cd5 19634
7e6630a7 19635#: builtin/read-tree.c:116
ef317cd5 19636msgid "write resulting index to <file>"
d9d56b23 19637msgstr "将索引结果写入 <文件>"
ef317cd5 19638
7e6630a7 19639#: builtin/read-tree.c:119
ef317cd5 19640msgid "only empty the index"
07432cef 19641msgstr "只是清空索引"
ef317cd5 19642
7e6630a7 19643#: builtin/read-tree.c:121
ef317cd5 19644msgid "Merging"
07432cef 19645msgstr "合并"
ef317cd5 19646
7e6630a7 19647#: builtin/read-tree.c:123
ef317cd5 19648msgid "perform a merge in addition to a read"
07432cef 19649msgstr "读取之余再执行一个合并"
ef317cd5 19650
7e6630a7 19651#: builtin/read-tree.c:125
ef317cd5 19652msgid "3-way merge if no file level merging required"
160fb2b2 19653msgstr "如果没有文件级合并需要,执行三方合并"
ef317cd5 19654
7e6630a7 19655#: builtin/read-tree.c:127
ef317cd5 19656msgid "3-way merge in presence of adds and removes"
160fb2b2 19657msgstr "存在添加和删除时,也执行三方合并"
ef317cd5 19658
7e6630a7 19659#: builtin/read-tree.c:129
ef317cd5 19660msgid "same as -m, but discard unmerged entries"
07432cef 19661msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 19662
7e6630a7 19663#: builtin/read-tree.c:130
ef317cd5 19664msgid "<subdirectory>/"
07432cef 19665msgstr "<子目录>/"
ef317cd5 19666
7e6630a7 19667#: builtin/read-tree.c:131
ef317cd5 19668msgid "read the tree into the index under <subdirectory>/"
07432cef 19669msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 19670
7e6630a7 19671#: builtin/read-tree.c:134
ef317cd5 19672msgid "update working tree with merge result"
07432cef 19673msgstr "用合并的结果更新工作区"
ef317cd5 19674
7e6630a7 19675#: builtin/read-tree.c:136
ef317cd5 19676msgid "gitignore"
07432cef 19677msgstr "gitignore"
ef317cd5 19678
7e6630a7 19679#: builtin/read-tree.c:137
ef317cd5 19680msgid "allow explicitly ignored files to be overwritten"
07432cef 19681msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 19682
7e6630a7 19683#: builtin/read-tree.c:140
ef317cd5 19684msgid "don't check the working tree after merging"
07432cef 19685msgstr "合并后不检查工作区"
ef317cd5 19686
7e6630a7 19687#: builtin/read-tree.c:141
ef317cd5 19688msgid "don't update the index or the work tree"
07432cef 19689msgstr "不更新索引区和工作区"
ef317cd5 19690
7e6630a7 19691#: builtin/read-tree.c:143
ef317cd5 19692msgid "skip applying sparse checkout filter"
07432cef 19693msgstr "跳过应用稀疏检出过滤器"
ef317cd5 19694
7e6630a7 19695#: builtin/read-tree.c:145
ef317cd5 19696msgid "debug unpack-trees"
07432cef 19697msgstr "调试 unpack-trees"
ef317cd5 19698
7e6630a7 19699#: builtin/read-tree.c:149
d46c5519
JX
19700msgid "suppress feedback messages"
19701msgstr "抑制反馈信息"
19702
7e6630a7 19703#: builtin/read-tree.c:183
ddc12c42
JX
19704msgid "You need to resolve your current index first"
19705msgstr "您需要先解决当前索引的冲突"
19706
349ede6a 19707#: builtin/rebase.c:35
4c27fcb5 19708msgid ""
a5cd71ca
JX
19709"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
19710"[<upstream> [<branch>]]"
ddc12c42
JX
19711msgstr ""
19712"git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<"
19713"上游> [<分支>]]"
4c27fcb5 19714
349ede6a 19715#: builtin/rebase.c:37
4c27fcb5
JX
19716msgid ""
19717"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
19718msgstr ""
19719"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]"
19720
349ede6a 19721#: builtin/rebase.c:39
4c27fcb5
JX
19722msgid "git rebase --continue | --abort | --skip | --edit-todo"
19723msgstr "git rebase --continue | --abort | --skip | --edit-todo"
19724
7e6630a7 19725#: builtin/rebase.c:230
d46c5519
JX
19726#, c-format
19727msgid "could not create temporary %s"
19728msgstr "无法创建临时的 %s"
19729
7e6630a7 19730#: builtin/rebase.c:236
d46c5519
JX
19731msgid "could not mark as interactive"
19732msgstr "无法标记为交互式"
19733
7e6630a7 19734#: builtin/rebase.c:289
d46c5519
JX
19735msgid "could not generate todo list"
19736msgstr "无法生成待办列表"
19737
7e6630a7 19738#: builtin/rebase.c:331
d46c5519
JX
19739msgid "a base commit must be provided with --upstream or --onto"
19740msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
19741
7e6630a7 19742#: builtin/rebase.c:390
4c27fcb5 19743#, c-format
349ede6a
JX
19744msgid "%s requires the merge backend"
19745msgstr "%s 需要合并后端"
4c27fcb5 19746
7e6630a7 19747#: builtin/rebase.c:432
4c27fcb5
JX
19748#, c-format
19749msgid "could not get 'onto': '%s'"
19750msgstr "无法获取 'onto':'%s'"
19751
7e6630a7 19752#: builtin/rebase.c:449
4c27fcb5
JX
19753#, c-format
19754msgid "invalid orig-head: '%s'"
19755msgstr "无效的原始 head:'%s'"
19756
7e6630a7 19757#: builtin/rebase.c:474
4c27fcb5
JX
19758#, c-format
19759msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
19760msgstr "忽略无效的 allow_rerere_autoupdate:'%s'"
19761
7e6630a7 19762#: builtin/rebase.c:597
4c27fcb5
JX
19763msgid ""
19764"Resolve all conflicts manually, mark them as resolved with\n"
19765"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
19766"You can instead skip this commit: run \"git rebase --skip\".\n"
19767"To abort and get back to the state before \"git rebase\", run \"git rebase --"
19768"abort\"."
19769msgstr ""
19770"手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n"
19771"冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n"
19772"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
19773"\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。"
19774
7e6630a7 19775#: builtin/rebase.c:680
06991777
JX
19776#, c-format
19777msgid ""
19778"\n"
19779"git encountered an error while preparing the patches to replay\n"
19780"these revisions:\n"
19781"\n"
19782" %s\n"
19783"\n"
19784"As a result, git cannot rebase them."
19785msgstr ""
19786"\n"
19787"在为重放这些版本而准备补丁时,git 遇到了一个错误:\n"
19788"\n"
19789" %s\n"
19790"\n"
19791"因此 git 无法对其变基。"
4c27fcb5 19792
7e6630a7 19793#: builtin/rebase.c:925
2b472aae
JX
19794#, c-format
19795msgid ""
19796"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
19797"\"."
440e7442 19798msgstr "无法识别的空类型 '%s';有效值有 \"drop\"、\"keep\" 和 \"ask\"。"
2b472aae 19799
7e6630a7 19800#: builtin/rebase.c:943
4c27fcb5
JX
19801#, c-format
19802msgid ""
19803"%s\n"
19804"Please specify which branch you want to rebase against.\n"
19805"See git-rebase(1) for details.\n"
19806"\n"
19807" git rebase '<branch>'\n"
19808"\n"
19809msgstr ""
19810"%s\n"
19811"请指定您要变基到哪个分支。\n"
19812"详见 git-rebase(1)。\n"
19813"\n"
19814" git rebase '<branch>'\n"
19815"\n"
19816
7e6630a7 19817#: builtin/rebase.c:959
4c27fcb5
JX
19818#, c-format
19819msgid ""
19820"If you wish to set tracking information for this branch you can do so with:\n"
19821"\n"
19822" git branch --set-upstream-to=%s/<branch> %s\n"
19823"\n"
19824msgstr ""
19825"如果您想要为此分支创建跟踪信息,您可以执行:\n"
19826"\n"
19827" git branch --set-upstream-to=%s/<branch> %s\n"
19828"\n"
19829
7e6630a7 19830#: builtin/rebase.c:989
06991777
JX
19831msgid "exec commands cannot contain newlines"
19832msgstr "exec 命令不能包含换行符"
19833
7e6630a7 19834#: builtin/rebase.c:993
06991777
JX
19835msgid "empty exec command"
19836msgstr "空的 exec 命令"
19837
7e6630a7 19838#: builtin/rebase.c:1023
4c27fcb5
JX
19839msgid "rebase onto given branch instead of upstream"
19840msgstr "变基到给定的分支而非上游"
19841
7e6630a7 19842#: builtin/rebase.c:1025
a5cd71ca
JX
19843msgid "use the merge-base of upstream and branch as the current base"
19844msgstr "使用上游和分支的合并基线做为当前基线"
19845
7e6630a7 19846#: builtin/rebase.c:1027
4c27fcb5
JX
19847msgid "allow pre-rebase hook to run"
19848msgstr "允许执行 pre-rebase 钩子"
19849
7e6630a7 19850#: builtin/rebase.c:1029
4c27fcb5
JX
19851msgid "be quiet. implies --no-stat"
19852msgstr "安静。暗示 --no-stat"
19853
7e6630a7
FZ
19854#: builtin/rebase.c:1032
19855msgid "display a diffstat of what changed upstream"
19856msgstr "显示上游变化的差异统计"
19857
19858#: builtin/rebase.c:1035
4c27fcb5 19859msgid "do not show diffstat of what changed upstream"
5b533632 19860msgstr "不显示上游变化的差异统计"
4c27fcb5 19861
7e6630a7 19862#: builtin/rebase.c:1038
d13389bf
JX
19863msgid "add a Signed-off-by trailer to each commit"
19864msgstr "为每一个提交添加 Signed-off-by 尾注"
4c27fcb5 19865
7e6630a7 19866#: builtin/rebase.c:1041
d9488fea
JX
19867msgid "make committer date match author date"
19868msgstr "使提交者日期和作者日期一致"
19869
7e6630a7 19870#: builtin/rebase.c:1043
d9488fea
JX
19871msgid "ignore author date and use current date"
19872msgstr "忽略作者日期,使用当前日期"
19873
7e6630a7 19874#: builtin/rebase.c:1045
d9488fea
JX
19875msgid "synonym of --reset-author-date"
19876msgstr "--reset-author-date 的同义词"
4c27fcb5 19877
7e6630a7 19878#: builtin/rebase.c:1047 builtin/rebase.c:1051
4c27fcb5
JX
19879msgid "passed to 'git apply'"
19880msgstr "传递给 'git apply'"
19881
7e6630a7 19882#: builtin/rebase.c:1049
d9488fea
JX
19883msgid "ignore changes in whitespace"
19884msgstr "忽略空白字符的变更"
19885
7e6630a7 19886#: builtin/rebase.c:1053 builtin/rebase.c:1056
4c27fcb5
JX
19887msgid "cherry-pick all commits, even if unchanged"
19888msgstr "拣选所有提交,即使未修改"
19889
7e6630a7 19890#: builtin/rebase.c:1058
4c27fcb5
JX
19891msgid "continue"
19892msgstr "继续"
19893
7e6630a7 19894#: builtin/rebase.c:1061
4c27fcb5
JX
19895msgid "skip current patch and continue"
19896msgstr "跳过当前补丁并继续"
19897
7e6630a7 19898#: builtin/rebase.c:1063
4c27fcb5
JX
19899msgid "abort and check out the original branch"
19900msgstr "终止并检出原有分支"
19901
7e6630a7 19902#: builtin/rebase.c:1066
4c27fcb5
JX
19903msgid "abort but keep HEAD where it is"
19904msgstr "终止但保持 HEAD 不变"
19905
7e6630a7 19906#: builtin/rebase.c:1067
4c27fcb5
JX
19907msgid "edit the todo list during an interactive rebase"
19908msgstr "在交互式变基中编辑待办列表"
19909
7e6630a7 19910#: builtin/rebase.c:1070
4c27fcb5
JX
19911msgid "show the patch file being applied or merged"
19912msgstr "显示正在应用或合并的补丁文件"
19913
7e6630a7 19914#: builtin/rebase.c:1073
2b472aae
JX
19915msgid "use apply strategies to rebase"
19916msgstr "使用应用策略进行变基"
19917
7e6630a7 19918#: builtin/rebase.c:1077
4c27fcb5
JX
19919msgid "use merging strategies to rebase"
19920msgstr "使用合并策略进行变基"
19921
7e6630a7 19922#: builtin/rebase.c:1081
4c27fcb5
JX
19923msgid "let the user edit the list of commits to rebase"
19924msgstr "让用户编辑要变基的提交列表"
19925
7e6630a7 19926#: builtin/rebase.c:1085
d46c5519
JX
19927msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
19928msgstr "(已弃用)尝试重建合并提交而非忽略它们"
4c27fcb5 19929
7e6630a7 19930#: builtin/rebase.c:1090
2b472aae 19931msgid "how to handle commits that become empty"
440e7442 19932msgstr "如何处理成为空提交的提交"
4c27fcb5 19933
7e6630a7
FZ
19934#: builtin/rebase.c:1093
19935msgid "keep commits which start empty"
19936msgstr "保留初始为空的提交"
19937
19938#: builtin/rebase.c:1097
4c27fcb5
JX
19939msgid "move commits that begin with squash!/fixup! under -i"
19940msgstr "在 -i 交互模式下,移动以 squash!/fixup! 开头的提交"
19941
7e6630a7 19942#: builtin/rebase.c:1104
4c27fcb5
JX
19943msgid "add exec lines after each commit of the editable list"
19944msgstr "可编辑列表的每一个提交下面增加一行 exec"
19945
7e6630a7 19946#: builtin/rebase.c:1108
4c27fcb5
JX
19947msgid "allow rebasing commits with empty messages"
19948msgstr "允许针对空提交说明的提交变基"
19949
7e6630a7 19950#: builtin/rebase.c:1112
4c27fcb5
JX
19951msgid "try to rebase merges instead of skipping them"
19952msgstr "尝试对合并提交变基而不是忽略它们"
19953
7e6630a7 19954#: builtin/rebase.c:1115
4c27fcb5
JX
19955msgid "use 'merge-base --fork-point' to refine upstream"
19956msgstr "使用 'merge-base --fork-point' 来优化上游"
19957
7e6630a7 19958#: builtin/rebase.c:1117
4c27fcb5
JX
19959msgid "use the given merge strategy"
19960msgstr "使用给定的合并策略"
19961
7e6630a7 19962#: builtin/rebase.c:1119 builtin/revert.c:115
4c27fcb5
JX
19963msgid "option"
19964msgstr "选项"
19965
7e6630a7 19966#: builtin/rebase.c:1120
4c27fcb5
JX
19967msgid "pass the argument through to the merge strategy"
19968msgstr "将参数传递给合并策略"
19969
7e6630a7 19970#: builtin/rebase.c:1123
4c27fcb5
JX
19971msgid "rebase all reachable commits up to the root(s)"
19972msgstr "将所有可达的提交变基到根提交"
19973
7e6630a7
FZ
19974#: builtin/rebase.c:1126
19975msgid "automatically re-schedule any `exec` that fails"
19976msgstr "自动重新安排任何失败的 `exec`"
19977
19978#: builtin/rebase.c:1128
349ede6a
JX
19979msgid "apply all changes, even those already present upstream"
19980msgstr "应用所有更改,甚至那些已在上游存在的"
19981
7e6630a7 19982#: builtin/rebase.c:1149
4c27fcb5 19983msgid "It looks like 'git am' is in progress. Cannot rebase."
ec3d4607 19984msgstr "看起来 'git am' 正在执行中。无法变基。"
4c27fcb5 19985
7e6630a7
FZ
19986#: builtin/rebase.c:1180
19987msgid "--preserve-merges was replaced by --rebase-merges"
19988msgstr "--preserve-merges 被 --rebase-merges 代替。"
d46c5519 19989
7e6630a7 19990#: builtin/rebase.c:1202
4c27fcb5
JX
19991msgid "No rebase in progress?"
19992msgstr "没有正在进行的变基?"
19993
7e6630a7 19994#: builtin/rebase.c:1206
4c27fcb5
JX
19995msgid "The --edit-todo action can only be used during interactive rebase."
19996msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
19997
7e6630a7 19998#: builtin/rebase.c:1229 t/helper/test-fast-rebase.c:122
4c27fcb5
JX
19999msgid "Cannot read HEAD"
20000msgstr "不能读取 HEAD"
20001
7e6630a7 20002#: builtin/rebase.c:1241
4c27fcb5
JX
20003msgid ""
20004"You must edit all merge conflicts and then\n"
20005"mark them as resolved using git add"
20006msgstr ""
20007"您必须编辑所有的合并冲突,然后通过 git add\n"
20008"命令将它们标记为已解决"
20009
7e6630a7 20010#: builtin/rebase.c:1260
4c27fcb5
JX
20011msgid "could not discard worktree changes"
20012msgstr "无法丢弃工作区变更"
20013
7e6630a7 20014#: builtin/rebase.c:1279
4c27fcb5
JX
20015#, c-format
20016msgid "could not move back to %s"
20017msgstr "无法移回 %s"
20018
7e6630a7 20019#: builtin/rebase.c:1325
4c27fcb5
JX
20020#, c-format
20021msgid ""
20022"It seems that there is already a %s directory, and\n"
20023"I wonder if you are in the middle of another rebase. If that is the\n"
20024"case, please try\n"
20025"\t%s\n"
20026"If that is not the case, please\n"
20027"\t%s\n"
20028"and run me again. I am stopping in case you still have something\n"
20029"valuable there.\n"
20030msgstr ""
20031"似乎已有一个 %s 目录,我怀疑您正处于另外一个变基操作过程中。\n"
20032"如果是这样,请执行\n"
20033"\t%s\n"
20034"如果不是这样,请执行\n"
20035"\t%s\n"
20036"然后再重新执行。 为避免丢失重要数据,我已经停止当前操作。\n"
20037
7e6630a7 20038#: builtin/rebase.c:1353
4c27fcb5
JX
20039msgid "switch `C' expects a numerical value"
20040msgstr "开关 `C' 期望一个数字值"
20041
7e6630a7 20042#: builtin/rebase.c:1395
4c27fcb5
JX
20043#, c-format
20044msgid "Unknown mode: %s"
20045msgstr "未知模式:%s"
20046
7e6630a7 20047#: builtin/rebase.c:1434
4c27fcb5
JX
20048msgid "--strategy requires --merge or --interactive"
20049msgstr "--strategy 需要 --merge 或 --interactive"
20050
7e6630a7 20051#: builtin/rebase.c:1463
65387fd5
FZ
20052msgid "apply options and merge options cannot be used together"
20053msgstr "应用选项和合并选项不能同时使用"
2b472aae 20054
7e6630a7 20055#: builtin/rebase.c:1476
2b472aae
JX
20056#, c-format
20057msgid "Unknown rebase backend: %s"
20058msgstr "未知的变基后端:%s"
20059
7e6630a7 20060#: builtin/rebase.c:1505
a6cd2cc4
JX
20061msgid "--reschedule-failed-exec requires --exec or --interactive"
20062msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
20063
7e6630a7 20064#: builtin/rebase.c:1536
4c27fcb5
JX
20065#, c-format
20066msgid "invalid upstream '%s'"
20067msgstr "无效的上游 '%s'"
20068
7e6630a7 20069#: builtin/rebase.c:1542
4c27fcb5
JX
20070msgid "Could not create new root commit"
20071msgstr "不能创建新的根提交"
20072
7e6630a7 20073#: builtin/rebase.c:1568
a5cd71ca
JX
20074#, c-format
20075msgid "'%s': need exactly one merge base with branch"
20076msgstr "'%s':只需要与分支的一个合并基线"
20077
7e6630a7 20078#: builtin/rebase.c:1571
4c27fcb5
JX
20079#, c-format
20080msgid "'%s': need exactly one merge base"
20081msgstr "'%s':只需要一个合并基线"
20082
7e6630a7 20083#: builtin/rebase.c:1580
4c27fcb5
JX
20084#, c-format
20085msgid "Does not point to a valid commit '%s'"
20086msgstr "没有指向一个有效的提交 '%s'"
20087
7e6630a7 20088#: builtin/rebase.c:1607
4c27fcb5 20089#, c-format
7e6630a7
FZ
20090msgid "no such branch/commit '%s'"
20091msgstr "无此分支/提交 '%s'"
4c27fcb5 20092
7e6630a7 20093#: builtin/rebase.c:1618 builtin/submodule--helper.c:39
65387fd5 20094#: builtin/submodule--helper.c:2659
4c27fcb5
JX
20095#, c-format
20096msgid "No such ref: %s"
20097msgstr "没有这样的引用:%s"
20098
7e6630a7 20099#: builtin/rebase.c:1629
4c27fcb5
JX
20100msgid "Could not resolve HEAD to a revision"
20101msgstr "无法将 HEAD 解析为一个版本"
20102
7e6630a7 20103#: builtin/rebase.c:1650
4c27fcb5
JX
20104msgid "Please commit or stash them."
20105msgstr "请提交或贮藏修改。"
20106
7e6630a7 20107#: builtin/rebase.c:1686
4c27fcb5
JX
20108#, c-format
20109msgid "could not switch to %s"
20110msgstr "无法切换到 %s"
20111
7e6630a7 20112#: builtin/rebase.c:1697
4c27fcb5
JX
20113msgid "HEAD is up to date."
20114msgstr "HEAD 是最新的。"
20115
7e6630a7 20116#: builtin/rebase.c:1699
4c27fcb5
JX
20117#, c-format
20118msgid "Current branch %s is up to date.\n"
20119msgstr "当前分支 %s 是最新的。\n"
20120
7e6630a7 20121#: builtin/rebase.c:1707
4c27fcb5
JX
20122msgid "HEAD is up to date, rebase forced."
20123msgstr "HEAD 是最新的,强制变基。"
20124
7e6630a7 20125#: builtin/rebase.c:1709
4c27fcb5
JX
20126#, c-format
20127msgid "Current branch %s is up to date, rebase forced.\n"
20128msgstr "当前分支 %s 是最新的,强制变基。\n"
20129
7e6630a7 20130#: builtin/rebase.c:1717
4c27fcb5
JX
20131msgid "The pre-rebase hook refused to rebase."
20132msgstr "pre-rebase 钩子拒绝了变基操作。"
20133
7e6630a7 20134#: builtin/rebase.c:1724
4c27fcb5
JX
20135#, c-format
20136msgid "Changes to %s:\n"
20137msgstr "到 %s 的变更:\n"
20138
7e6630a7 20139#: builtin/rebase.c:1727
4c27fcb5
JX
20140#, c-format
20141msgid "Changes from %s to %s:\n"
20142msgstr "从 %s 到 %s 的变更:\n"
20143
7e6630a7 20144#: builtin/rebase.c:1752
4c27fcb5
JX
20145#, c-format
20146msgid "First, rewinding head to replay your work on top of it...\n"
20147msgstr "首先,回退头指针以便在其上重放您的工作...\n"
20148
7e6630a7 20149#: builtin/rebase.c:1761
4c27fcb5
JX
20150msgid "Could not detach HEAD"
20151msgstr "无法分离头指针"
20152
7e6630a7 20153#: builtin/rebase.c:1770
4c27fcb5
JX
20154#, c-format
20155msgid "Fast-forwarded %s to %s.\n"
20156msgstr "快进 %s 到 %s。\n"
20157
7e6630a7 20158#: builtin/receive-pack.c:35
5b04ee3b 20159msgid "git receive-pack <git-dir>"
58b6f078 20160msgstr "git receive-pack <仓库目录>"
5b04ee3b 20161
65387fd5 20162#: builtin/receive-pack.c:1275
a0b6b246
JX
20163msgid ""
20164"By default, updating the current branch in a non-bare repository\n"
20165"is denied, because it will make the index and work tree inconsistent\n"
20166"with what you pushed, and will require 'git reset --hard' to match\n"
20167"the work tree to HEAD.\n"
20168"\n"
1a79b2f1
JX
20169"You can set the 'receive.denyCurrentBranch' configuration variable\n"
20170"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
a0b6b246
JX
20171"its current branch; however, this is not recommended unless you\n"
20172"arranged to update its work tree to match what you pushed in some\n"
20173"other way.\n"
20174"\n"
20175"To squelch this message and still keep the default behaviour, set\n"
20176"'receive.denyCurrentBranch' configuration variable to 'refuse'."
20177msgstr ""
20178"默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
20179"不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
20180"\n"
20181"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
20182"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
20183"用某种方式将其工作区更新至您推送的状态。\n"
20184"\n"
20185"若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
20186"配置变量为 'refuse'。"
20187
65387fd5 20188#: builtin/receive-pack.c:1295
a0b6b246
JX
20189msgid ""
20190"By default, deleting the current branch is denied, because the next\n"
20191"'git clone' won't result in any file checked out, causing confusion.\n"
20192"\n"
20193"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
20194"'warn' or 'ignore' in the remote repository to allow deleting the\n"
20195"current branch, with or without a warning message.\n"
20196"\n"
20197"To squelch this message, you can set it to 'refuse'."
20198msgstr ""
20199"默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
29004bbb 20200"导致困惑。\n"
a0b6b246
JX
20201"\n"
20202"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
29004bbb 20203"'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
a0b6b246
JX
20204"\n"
20205"若要屏蔽此信息,您可以设置它为 'refuse'。"
20206
65387fd5 20207#: builtin/receive-pack.c:2474
5b04ee3b
JX
20208msgid "quiet"
20209msgstr "静默模式"
20210
65387fd5
FZ
20211#: builtin/receive-pack.c:2489
20212msgid "you must specify a directory"
20213msgstr "您必须指定一个目录"
5b04ee3b 20214
06991777
JX
20215#: builtin/reflog.c:17
20216msgid ""
20217"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
20218"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
20219"<refs>..."
20220msgstr ""
20221"git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>] [--"
20222"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引"
20223"用>..."
20224
20225#: builtin/reflog.c:22
20226msgid ""
20227"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
20228"<refs>..."
20229msgstr ""
20230"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引"
20231"用>..."
20232
20233#: builtin/reflog.c:25
20234msgid "git reflog exists <ref>"
20235msgstr "git reflog exists <引用>"
20236
65387fd5 20237#: builtin/reflog.c:585 builtin/reflog.c:590
2e8451e8
JX
20238#, c-format
20239msgid "'%s' is not a valid timestamp"
20240msgstr "'%s' 不是一个有效的时间戳"
20241
65387fd5 20242#: builtin/reflog.c:631
06991777
JX
20243#, c-format
20244msgid "Marking reachable objects..."
20245msgstr "正在标记可达对象..."
20246
65387fd5 20247#: builtin/reflog.c:675
06991777
JX
20248#, c-format
20249msgid "%s points nowhere!"
20250msgstr "%s 指向不存在!"
20251
65387fd5 20252#: builtin/reflog.c:731
06991777
JX
20253msgid "no reflog specified to delete"
20254msgstr "未指定要删除的引用日志"
20255
65387fd5 20256#: builtin/reflog.c:742
06991777
JX
20257#, c-format
20258msgid "not a reflog: %s"
20259msgstr "不是一个引用日志:%s"
20260
65387fd5 20261#: builtin/reflog.c:747
06991777
JX
20262#, c-format
20263msgid "no reflog for '%s'"
20264msgstr "没有 '%s' 的引用日志"
20265
65387fd5 20266#: builtin/reflog.c:794
06991777
JX
20267#, c-format
20268msgid "invalid ref format: %s"
20269msgstr "无效的引用格式:%s"
20270
65387fd5 20271#: builtin/reflog.c:803
06991777
JX
20272msgid "git reflog [ show | expire | delete | exists ]"
20273msgstr "git reflog [ show | expire | delete | exists ]"
20274
2b472aae 20275#: builtin/remote.c:17
ef317cd5 20276msgid "git remote [-v | --verbose]"
07432cef 20277msgstr "git remote [-v | --verbose]"
ef317cd5 20278
2b472aae 20279#: builtin/remote.c:18
ef317cd5 20280msgid ""
814ff314 20281"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
ef317cd5
JX
20282"mirror=<fetch|push>] <name> <url>"
20283msgstr ""
814ff314 20284"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
d9d56b23 20285"mirror=<fetch|push>] <名称> <地址>"
ef317cd5 20286
2b472aae 20287#: builtin/remote.c:19 builtin/remote.c:39
ef317cd5 20288msgid "git remote rename <old> <new>"
07432cef 20289msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 20290
2b472aae 20291#: builtin/remote.c:20 builtin/remote.c:44
ef317cd5 20292msgid "git remote remove <name>"
07432cef 20293msgstr "git remote remove <名称>"
ef317cd5 20294
2b472aae 20295#: builtin/remote.c:21 builtin/remote.c:49
814ff314
JX
20296msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
20297msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
ef317cd5 20298
2b472aae 20299#: builtin/remote.c:22
ef317cd5 20300msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 20301msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 20302
2b472aae 20303#: builtin/remote.c:23
ef317cd5 20304msgid "git remote prune [-n | --dry-run] <name>"
07432cef 20305msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 20306
2b472aae 20307#: builtin/remote.c:24
ef317cd5
JX
20308msgid ""
20309"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 20310msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 20311
2b472aae 20312#: builtin/remote.c:25
ef317cd5 20313msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 20314msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 20315
2b472aae 20316#: builtin/remote.c:26 builtin/remote.c:75
94550ed3
JX
20317msgid "git remote get-url [--push] [--all] <name>"
20318msgstr "git remote get-url [--push] [--all] <名称>"
20319
2b472aae 20320#: builtin/remote.c:27 builtin/remote.c:80
ef317cd5 20321msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 20322msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 20323
2b472aae 20324#: builtin/remote.c:28 builtin/remote.c:81
ef317cd5 20325msgid "git remote set-url --add <name> <newurl>"
07432cef 20326msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 20327
2b472aae 20328#: builtin/remote.c:29 builtin/remote.c:82
ef317cd5 20329msgid "git remote set-url --delete <name> <url>"
07432cef 20330msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 20331
2b472aae 20332#: builtin/remote.c:34
ef317cd5 20333msgid "git remote add [<options>] <name> <url>"
07432cef 20334msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 20335
2b472aae 20336#: builtin/remote.c:54
ef317cd5 20337msgid "git remote set-branches <name> <branch>..."
07432cef 20338msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 20339
2b472aae 20340#: builtin/remote.c:55
ef317cd5 20341msgid "git remote set-branches --add <name> <branch>..."
07432cef 20342msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 20343
2b472aae 20344#: builtin/remote.c:60
ef317cd5 20345msgid "git remote show [<options>] <name>"
07432cef 20346msgstr "git remote show [<选项>] <名称>"
ef317cd5 20347
2b472aae 20348#: builtin/remote.c:65
ef317cd5 20349msgid "git remote prune [<options>] <name>"
07432cef 20350msgstr "git remote prune [<选项>] <名称>"
ef317cd5 20351
2b472aae 20352#: builtin/remote.c:70
ef317cd5 20353msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 20354msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 20355
2b472aae 20356#: builtin/remote.c:99
81809b99 20357#, c-format
8ada9598 20358msgid "Updating %s"
81809b99 20359msgstr "更新 %s 中"
8ada9598 20360
65387fd5
FZ
20361#: builtin/remote.c:101
20362#, c-format
20363msgid "Could not fetch %s"
20364msgstr "不能获取 %s"
20365
2b472aae 20366#: builtin/remote.c:131
8ada9598
JX
20367msgid ""
20368"--mirror is dangerous and deprecated; please\n"
20369"\t use --mirror=fetch or --mirror=push instead"
20370msgstr ""
81809b99
JX
20371"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
20372"\t 或 --mirror=push"
8ada9598 20373
2b472aae 20374#: builtin/remote.c:148
81809b99 20375#, c-format
8ada9598 20376msgid "unknown mirror argument: %s"
81809b99 20377msgstr "未知的镜像参数:%s"
8ada9598 20378
2b472aae 20379#: builtin/remote.c:164
ef317cd5 20380msgid "fetch the remote branches"
07432cef 20381msgstr "抓取远程的分支"
ef317cd5 20382
2b472aae 20383#: builtin/remote.c:166
ef317cd5 20384msgid "import all tags and associated objects when fetching"
55a16ee4 20385msgstr "抓取时导入所有的标签和关联对象"
ef317cd5 20386
2b472aae 20387#: builtin/remote.c:169
ef317cd5 20388msgid "or do not fetch any tag at all (--no-tags)"
55a16ee4 20389msgstr "或不抓取任何标签(--no-tags)"
ef317cd5 20390
2b472aae 20391#: builtin/remote.c:171
ef317cd5 20392msgid "branch(es) to track"
07432cef 20393msgstr "跟踪的分支"
ef317cd5 20394
2b472aae 20395#: builtin/remote.c:172
ef317cd5 20396msgid "master branch"
07432cef 20397msgstr "主线分支"
ef317cd5 20398
2b472aae 20399#: builtin/remote.c:174
ef317cd5 20400msgid "set up remote as a mirror to push to or fetch from"
07432cef 20401msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 20402
2b472aae 20403#: builtin/remote.c:186
8ada9598 20404msgid "specifying a master branch makes no sense with --mirror"
81809b99 20405msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 20406
2b472aae 20407#: builtin/remote.c:188
8ada9598 20408msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 20409msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 20410
7e6630a7 20411#: builtin/remote.c:195 builtin/remote.c:705
81809b99 20412#, c-format
8ada9598 20413msgid "remote %s already exists."
81809b99 20414msgstr "远程 %s 已经存在。"
8ada9598 20415
d13389bf 20416#: builtin/remote.c:240
81809b99 20417#, c-format
8ada9598 20418msgid "Could not setup master '%s'"
81809b99 20419msgstr "无法设置 master '%s'"
8ada9598 20420
7e6630a7
FZ
20421#: builtin/remote.c:322
20422#, c-format
20423msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
20424msgstr "未处理的 branch.%s.rebase=%s; 假定为 'true'"
20425
20426#: builtin/remote.c:366
81809b99 20427#, c-format
8ada9598 20428msgid "Could not get fetch map for refspec %s"
160fb2b2 20429msgstr "无法得到引用规格 %s 的获取列表"
8ada9598 20430
7e6630a7 20431#: builtin/remote.c:460 builtin/remote.c:468
8ada9598 20432msgid "(matching)"
81809b99 20433msgstr "(匹配)"
8ada9598 20434
7e6630a7 20435#: builtin/remote.c:472
8ada9598 20436msgid "(delete)"
81809b99 20437msgstr "(删除)"
8ada9598 20438
7e6630a7 20439#: builtin/remote.c:660
2b472aae
JX
20440#, c-format
20441msgid "could not set '%s'"
20442msgstr "不能设置 '%s'"
20443
7e6630a7 20444#: builtin/remote.c:665
2b472aae
JX
20445#, c-format
20446msgid ""
20447"The %s configuration remote.pushDefault in:\n"
20448"\t%s:%d\n"
20449"now names the non-existent remote '%s'"
20450msgstr ""
20451"配置(%s)remote.pushDefault 位于:\n"
20452"\t%s:%d\n"
20453"现在在为不存在的远程名 '%s' 命名"
20454
7e6630a7 20455#: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
81809b99 20456#, c-format
4c27fcb5
JX
20457msgid "No such remote: '%s'"
20458msgstr "没有此远程仓库:'%s'"
8ada9598 20459
7e6630a7 20460#: builtin/remote.c:715
81809b99 20461#, c-format
8ada9598 20462msgid "Could not rename config section '%s' to '%s'"
81809b99 20463msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 20464
7e6630a7 20465#: builtin/remote.c:735
8ada9598
JX
20466#, c-format
20467msgid ""
d691f479 20468"Not updating non-default fetch refspec\n"
8ada9598
JX
20469"\t%s\n"
20470"\tPlease update the configuration manually if necessary."
20471msgstr ""
160fb2b2 20472"没有更新非默认的获取引用规格\n"
81809b99
JX
20473"\t%s\n"
20474"\t如果必要请手动更新配置。"
8ada9598 20475
7e6630a7 20476#: builtin/remote.c:775
81809b99 20477#, c-format
8ada9598 20478msgid "deleting '%s' failed"
81809b99 20479msgstr "删除 '%s' 失败"
8ada9598 20480
7e6630a7 20481#: builtin/remote.c:809
81809b99 20482#, c-format
8ada9598 20483msgid "creating '%s' failed"
81809b99 20484msgstr "创建 '%s' 失败"
8ada9598 20485
7e6630a7 20486#: builtin/remote.c:887
8ada9598
JX
20487msgid ""
20488"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
20489"to delete it, use:"
20490msgid_plural ""
20491"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
20492"to delete them, use:"
5ae481e0
JX
20493msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
20494msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 20495
7e6630a7 20496#: builtin/remote.c:901
276ceeaa
JX
20497#, c-format
20498msgid "Could not remove config section '%s'"
20499msgstr "不能移除配置小节 '%s'"
20500
7e6630a7 20501#: builtin/remote.c:1009
8ada9598
JX
20502#, c-format
20503msgid " new (next fetch will store in remotes/%s)"
81809b99 20504msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 20505
7e6630a7 20506#: builtin/remote.c:1012
8ada9598 20507msgid " tracked"
81809b99 20508msgstr " 已跟踪"
8ada9598 20509
7e6630a7 20510#: builtin/remote.c:1014
8ada9598 20511msgid " stale (use 'git remote prune' to remove)"
81809b99 20512msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 20513
7e6630a7 20514#: builtin/remote.c:1016
8ada9598 20515msgid " ???"
81809b99 20516msgstr " ???"
8ada9598 20517
7e6630a7 20518#: builtin/remote.c:1057
8ada9598
JX
20519#, c-format
20520msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 20521msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 20522
7e6630a7 20523#: builtin/remote.c:1066
81809b99 20524#, c-format
276ceeaa
JX
20525msgid "rebases interactively onto remote %s"
20526msgstr "交互式变基到远程 %s"
8ada9598 20527
7e6630a7 20528#: builtin/remote.c:1068
fd8cb379
JX
20529#, c-format
20530msgid "rebases interactively (with merges) onto remote %s"
20531msgstr "交互式变基(含合并提交)到远程 %s"
20532
7e6630a7 20533#: builtin/remote.c:1071
5c57d762
JX
20534#, c-format
20535msgid "rebases onto remote %s"
20536msgstr "变基到远程 %s"
20537
7e6630a7 20538#: builtin/remote.c:1075
81809b99 20539#, c-format
8ada9598 20540msgid " merges with remote %s"
81809b99 20541msgstr " 与远程 %s 合并"
8ada9598 20542
7e6630a7 20543#: builtin/remote.c:1078
81809b99 20544#, c-format
8ada9598 20545msgid "merges with remote %s"
81809b99 20546msgstr "与远程 %s 合并"
8ada9598 20547
7e6630a7 20548#: builtin/remote.c:1081
5c57d762
JX
20549#, c-format
20550msgid "%-*s and with remote %s\n"
20551msgstr "%-*s 以及和远程 %s\n"
8ada9598 20552
7e6630a7 20553#: builtin/remote.c:1124
8ada9598 20554msgid "create"
81809b99 20555msgstr "创建"
8ada9598 20556
7e6630a7 20557#: builtin/remote.c:1127
8ada9598 20558msgid "delete"
81809b99 20559msgstr "删除"
8ada9598 20560
7e6630a7 20561#: builtin/remote.c:1131
8ada9598 20562msgid "up to date"
81809b99 20563msgstr "最新"
8ada9598 20564
7e6630a7 20565#: builtin/remote.c:1134
8ada9598 20566msgid "fast-forwardable"
81809b99 20567msgstr "可快进"
8ada9598 20568
7e6630a7 20569#: builtin/remote.c:1137
8ada9598 20570msgid "local out of date"
81809b99 20571msgstr "本地已过时"
8ada9598 20572
7e6630a7 20573#: builtin/remote.c:1144
8ada9598
JX
20574#, c-format
20575msgid " %-*s forces to %-*s (%s)"
81809b99 20576msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 20577
7e6630a7 20578#: builtin/remote.c:1147
8ada9598
JX
20579#, c-format
20580msgid " %-*s pushes to %-*s (%s)"
81809b99 20581msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 20582
7e6630a7 20583#: builtin/remote.c:1151
8ada9598
JX
20584#, c-format
20585msgid " %-*s forces to %s"
81809b99 20586msgstr " %-*s 强制推送至 %s"
8ada9598 20587
7e6630a7 20588#: builtin/remote.c:1154
8ada9598
JX
20589#, c-format
20590msgid " %-*s pushes to %s"
81809b99 20591msgstr " %-*s 推送至 %s"
8ada9598 20592
7e6630a7 20593#: builtin/remote.c:1222
ef317cd5 20594msgid "do not query remotes"
07432cef 20595msgstr "不查询远程"
ef317cd5 20596
7e6630a7 20597#: builtin/remote.c:1243
81809b99 20598#, c-format
8ada9598 20599msgid "* remote %s"
81809b99 20600msgstr "* 远程 %s"
8ada9598 20601
7e6630a7 20602#: builtin/remote.c:1244
8ada9598
JX
20603#, c-format
20604msgid " Fetch URL: %s"
81809b99 20605msgstr " 获取地址:%s"
8ada9598 20606
7e6630a7 20607#: builtin/remote.c:1245 builtin/remote.c:1261 builtin/remote.c:1398
8ada9598 20608msgid "(no URL)"
81809b99 20609msgstr "(无 URL)"
8ada9598 20610
a4f16749
JX
20611#. TRANSLATORS: the colon ':' should align
20612#. with the one in " Fetch URL: %s"
20613#. translation.
20614#.
7e6630a7 20615#: builtin/remote.c:1259 builtin/remote.c:1261
8ada9598
JX
20616#, c-format
20617msgid " Push URL: %s"
81809b99 20618msgstr " 推送地址:%s"
8ada9598 20619
7e6630a7 20620#: builtin/remote.c:1263 builtin/remote.c:1265 builtin/remote.c:1267
81809b99 20621#, c-format
8ada9598 20622msgid " HEAD branch: %s"
4375c10e 20623msgstr " HEAD 分支:%s"
8ada9598 20624
7e6630a7 20625#: builtin/remote.c:1263
5c57d762
JX
20626msgid "(not queried)"
20627msgstr "(未查询)"
20628
7e6630a7 20629#: builtin/remote.c:1265
5c57d762
JX
20630msgid "(unknown)"
20631msgstr "(未知)"
20632
7e6630a7 20633#: builtin/remote.c:1269
8ada9598
JX
20634#, c-format
20635msgid ""
20636" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 20637msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 20638
7e6630a7 20639#: builtin/remote.c:1281
81809b99 20640#, c-format
8ada9598
JX
20641msgid " Remote branch:%s"
20642msgid_plural " Remote branches:%s"
81809b99 20643msgstr[0] " 远程分支:%s"
5ae481e0 20644msgstr[1] " 远程分支:%s"
8ada9598 20645
81809b99 20646# 译者:中文字符串拼接,可删除前导空格
7e6630a7 20647#: builtin/remote.c:1284 builtin/remote.c:1310
8ada9598 20648msgid " (status not queried)"
81809b99 20649msgstr "(状态未查询)"
8ada9598 20650
7e6630a7 20651#: builtin/remote.c:1293
8ada9598
JX
20652msgid " Local branch configured for 'git pull':"
20653msgid_plural " Local branches configured for 'git pull':"
81809b99 20654msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 20655msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 20656
7e6630a7 20657#: builtin/remote.c:1301
8ada9598 20658msgid " Local refs will be mirrored by 'git push'"
81809b99 20659msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 20660
7e6630a7 20661#: builtin/remote.c:1307
81809b99 20662#, c-format
8ada9598
JX
20663msgid " Local ref configured for 'git push'%s:"
20664msgid_plural " Local refs configured for 'git push'%s:"
81809b99 20665msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 20666msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 20667
7e6630a7 20668#: builtin/remote.c:1328
ef317cd5 20669msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 20670msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 20671
7e6630a7 20672#: builtin/remote.c:1330
ef317cd5 20673msgid "delete refs/remotes/<name>/HEAD"
07432cef 20674msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 20675
7e6630a7 20676#: builtin/remote.c:1344
8ada9598 20677msgid "Cannot determine remote HEAD"
81809b99 20678msgstr "无法确定远程 HEAD"
8ada9598 20679
7e6630a7 20680#: builtin/remote.c:1346
8ada9598 20681msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 20682msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 20683
7e6630a7 20684#: builtin/remote.c:1356
81809b99 20685#, c-format
8ada9598 20686msgid "Could not delete %s"
81809b99 20687msgstr "无法删除 %s"
8ada9598 20688
7e6630a7 20689#: builtin/remote.c:1364
81809b99 20690#, c-format
8ada9598 20691msgid "Not a valid ref: %s"
81809b99 20692msgstr "不是一个有效引用:%s"
8ada9598 20693
7e6630a7 20694#: builtin/remote.c:1366
81809b99 20695#, c-format
8ada9598 20696msgid "Could not setup %s"
81809b99 20697msgstr "不能设置 %s"
8ada9598
JX
20698
20699# 译者:注意保持前导空格
7e6630a7 20700#: builtin/remote.c:1384
81809b99 20701#, c-format
8ada9598 20702msgid " %s will become dangling!"
e640d114 20703msgstr " %s 将成为悬空状态!"
8ada9598
JX
20704
20705# 译者:注意保持前导空格
7e6630a7 20706#: builtin/remote.c:1385
81809b99 20707#, c-format
8ada9598 20708msgid " %s has become dangling!"
e640d114 20709msgstr " %s 已成为悬空状态!"
8ada9598 20710
7e6630a7 20711#: builtin/remote.c:1394
81809b99 20712#, c-format
8ada9598 20713msgid "Pruning %s"
81809b99 20714msgstr "修剪 %s"
8ada9598 20715
7e6630a7 20716#: builtin/remote.c:1395
8ada9598
JX
20717#, c-format
20718msgid "URL: %s"
81809b99 20719msgstr "URL:%s"
8ada9598 20720
7e6630a7 20721#: builtin/remote.c:1411
8ada9598
JX
20722#, c-format
20723msgid " * [would prune] %s"
81809b99 20724msgstr " * [将删除] %s"
8ada9598 20725
7e6630a7 20726#: builtin/remote.c:1414
8ada9598
JX
20727#, c-format
20728msgid " * [pruned] %s"
81809b99 20729msgstr " * [已删除] %s"
8ada9598 20730
7e6630a7 20731#: builtin/remote.c:1459
ef317cd5 20732msgid "prune remotes after fetching"
07432cef 20733msgstr "抓取后清除远程"
ef317cd5 20734
7e6630a7 20735#: builtin/remote.c:1523 builtin/remote.c:1579 builtin/remote.c:1649
81809b99 20736#, c-format
8ada9598 20737msgid "No such remote '%s'"
81809b99 20738msgstr "没有此远程 '%s'"
8ada9598 20739
7e6630a7 20740#: builtin/remote.c:1541
ef317cd5 20741msgid "add branch"
07432cef 20742msgstr "添加分支"
ef317cd5 20743
7e6630a7 20744#: builtin/remote.c:1548
8ada9598 20745msgid "no remote specified"
81809b99 20746msgstr "未指定远程"
8ada9598 20747
7e6630a7 20748#: builtin/remote.c:1565
94550ed3
JX
20749msgid "query push URLs rather than fetch URLs"
20750msgstr "查询推送 URL 地址,而非获取 URL 地址"
20751
7e6630a7 20752#: builtin/remote.c:1567
94550ed3
JX
20753msgid "return all URLs"
20754msgstr "返回所有 URL 地址"
20755
7e6630a7 20756#: builtin/remote.c:1597
94550ed3
JX
20757#, c-format
20758msgid "no URLs configured for remote '%s'"
20759msgstr "没有给远程仓库 '%s' 设定 URL"
20760
7e6630a7 20761#: builtin/remote.c:1623
ef317cd5 20762msgid "manipulate push URLs"
07432cef 20763msgstr "操作推送 URLS"
ef317cd5 20764
7e6630a7 20765#: builtin/remote.c:1625
ef317cd5 20766msgid "add URL"
07432cef 20767msgstr "添加 URL"
ef317cd5 20768
7e6630a7 20769#: builtin/remote.c:1627
ef317cd5 20770msgid "delete URLs"
07432cef 20771msgstr "删除 URLS"
ef317cd5 20772
7e6630a7 20773#: builtin/remote.c:1634
8ada9598 20774msgid "--add --delete doesn't make sense"
81809b99 20775msgstr "--add --delete 无意义"
8ada9598 20776
7e6630a7 20777#: builtin/remote.c:1675
81809b99 20778#, c-format
8ada9598 20779msgid "Invalid old URL pattern: %s"
4375c10e 20780msgstr "无效的旧 URL 匹配模版:%s"
8ada9598 20781
7e6630a7 20782#: builtin/remote.c:1683
81809b99 20783#, c-format
8ada9598 20784msgid "No such URL found: %s"
4375c10e 20785msgstr "未找到此 URL:%s"
8ada9598 20786
7e6630a7 20787#: builtin/remote.c:1685
8ada9598 20788msgid "Will not delete all non-push URLs"
4375c10e 20789msgstr "将不会删除所有非推送 URL 地址"
8ada9598 20790
7e6630a7
FZ
20791#: builtin/remote.c:1702
20792msgid "be verbose; must be placed before a subcommand"
20793msgstr "冗长输出;必须置于子命令之前"
20794
20795#: builtin/repack.c:28
814ff314
JX
20796msgid "git repack [<options>]"
20797msgstr "git repack [<选项>]"
90314792 20798
7e6630a7 20799#: builtin/repack.c:33
1a79b2f1
JX
20800msgid ""
20801"Incremental repacks are incompatible with bitmap indexes. Use\n"
20802"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
20803msgstr ""
20804"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
20805"或禁用 pack.writebitmaps 配置。"
20806
7e6630a7 20807#: builtin/repack.c:201
06991777 20808msgid "could not start pack-objects to repack promisor objects"
5b533632 20809msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
06991777 20810
65387fd5 20811#: builtin/repack.c:275 builtin/repack.c:820
06991777 20812msgid "repack: Expecting full hex object ID lines only from pack-objects."
5b533632 20813msgstr "repack:期望来自 pack-objects 的完整十六进制对象 ID。"
06991777 20814
65387fd5 20815#: builtin/repack.c:299
06991777 20816msgid "could not finish pack-objects to repack promisor objects"
5b533632 20817msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
06991777 20818
65387fd5 20819#: builtin/repack.c:314
33b62fba
JX
20820#, c-format
20821msgid "cannot open index for %s"
20822msgstr "不能打开 %s 的索引"
20823
65387fd5 20824#: builtin/repack.c:373
33b62fba
JX
20825#, c-format
20826msgid "pack %s too large to consider in geometric progression"
20827msgstr "包 %s 太大,不在几何级数中考虑"
20828
65387fd5 20829#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
33b62fba
JX
20830#, c-format
20831msgid "pack %s too large to roll up"
20832msgstr "包 %s 太大导致数字溢出"
20833
65387fd5 20834#: builtin/repack.c:498
7e6630a7
FZ
20835#, c-format
20836msgid "could not open tempfile %s for writing"
20837msgstr "无法打开临时文件 %s 进行写入"
20838
65387fd5 20839#: builtin/repack.c:516
7e6630a7
FZ
20840msgid "could not close refs snapshot tempfile"
20841msgstr "不能关闭引用快照临时文件"
20842
65387fd5 20843#: builtin/repack.c:630
90314792
JX
20844msgid "pack everything in a single pack"
20845msgstr "所有内容打包到一个包文件中"
20846
65387fd5 20847#: builtin/repack.c:632
90314792
JX
20848msgid "same as -a, and turn unreachable objects loose"
20849msgstr "和 -a 相同,并将不可达的对象设为松散对象"
20850
65387fd5 20851#: builtin/repack.c:635
90314792
JX
20852msgid "remove redundant packs, and run git-prune-packed"
20853msgstr "删除多余的包,运行 git-prune-packed"
20854
65387fd5 20855#: builtin/repack.c:637
90314792
JX
20856msgid "pass --no-reuse-delta to git-pack-objects"
20857msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
20858
65387fd5 20859#: builtin/repack.c:639
90314792
JX
20860msgid "pass --no-reuse-object to git-pack-objects"
20861msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
20862
65387fd5 20863#: builtin/repack.c:641
90314792
JX
20864msgid "do not run git-update-server-info"
20865msgstr "不运行 git-update-server-info"
20866
65387fd5 20867#: builtin/repack.c:644
90314792
JX
20868msgid "pass --local to git-pack-objects"
20869msgstr "向 git-pack-objects 传递参数 --local"
20870
65387fd5 20871#: builtin/repack.c:646
6c94aba5
JX
20872msgid "write bitmap index"
20873msgstr "写 bitmap 索引"
20874
65387fd5 20875#: builtin/repack.c:648
4c27fcb5
JX
20876msgid "pass --delta-islands to git-pack-objects"
20877msgstr "向 git-pack-objects 传递参数 --delta-islands"
20878
65387fd5 20879#: builtin/repack.c:649
90314792
JX
20880msgid "approxidate"
20881msgstr "近似日期"
20882
65387fd5 20883#: builtin/repack.c:650
90314792
JX
20884msgid "with -A, do not loosen objects older than this"
20885msgstr "使用 -A,不要将早于给定时间的对象过期"
20886
65387fd5 20887#: builtin/repack.c:652
5c57d762
JX
20888msgid "with -a, repack unreachable objects"
20889msgstr "使用 -a ,重新对不可达对象打包"
20890
65387fd5 20891#: builtin/repack.c:654
90314792
JX
20892msgid "size of the window used for delta compression"
20893msgstr "用于增量压缩的窗口值"
20894
65387fd5 20895#: builtin/repack.c:655 builtin/repack.c:661
8376b58d
JX
20896msgid "bytes"
20897msgstr "字节"
20898
65387fd5 20899#: builtin/repack.c:656
90314792
JX
20900msgid "same as the above, but limit memory size instead of entries count"
20901msgstr "和上面的相似,但限制内存大小而非条目数"
20902
65387fd5 20903#: builtin/repack.c:658
90314792
JX
20904msgid "limits the maximum delta depth"
20905msgstr "限制最大增量深度"
20906
65387fd5 20907#: builtin/repack.c:660
a4f16749
JX
20908msgid "limits the maximum number of threads"
20909msgstr "限制最大线程数"
20910
65387fd5 20911#: builtin/repack.c:662
90314792 20912msgid "maximum size of each packfile"
dbd6cced 20913msgstr "每个包文件的最大尺寸"
90314792 20914
65387fd5 20915#: builtin/repack.c:664
6c94aba5
JX
20916msgid "repack objects in packs marked with .keep"
20917msgstr "对标记为 .keep 的包中的对象重新打包"
20918
65387fd5 20919#: builtin/repack.c:666
fd8cb379
JX
20920msgid "do not repack this pack"
20921msgstr "不要对该包文件重新打包"
20922
65387fd5 20923#: builtin/repack.c:668
33b62fba
JX
20924msgid "find a geometric progression with factor <N>"
20925msgstr "使用因子 <n> 查找几何级数"
20926
65387fd5 20927#: builtin/repack.c:670
7e6630a7
FZ
20928msgid "write a multi-pack index of the resulting packs"
20929msgstr "写入结果包的多包索引"
20930
65387fd5 20931#: builtin/repack.c:680
94550ed3
JX
20932msgid "cannot delete packs in a precious-objects repo"
20933msgstr "不能删除珍品仓库中的打包文件"
20934
65387fd5 20935#: builtin/repack.c:829
06991777
JX
20936msgid "Nothing new to pack."
20937msgstr "没有新的要打包。"
20938
65387fd5 20939#: builtin/repack.c:859
06991777 20940#, c-format
d13389bf
JX
20941msgid "missing required file: %s"
20942msgstr "缺少需要的文件:%s"
06991777 20943
65387fd5 20944#: builtin/repack.c:861
90314792 20945#, c-format
d13389bf
JX
20946msgid "could not unlink: %s"
20947msgstr "不能删除:%s"
90314792 20948
fd8cb379 20949#: builtin/replace.c:22
ef317cd5 20950msgid "git replace [-f] <object> <replacement>"
07432cef 20951msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 20952
fd8cb379 20953#: builtin/replace.c:23
6acbf033
JX
20954msgid "git replace [-f] --edit <object>"
20955msgstr "git replace [-f] --edit <对象>"
20956
fd8cb379 20957#: builtin/replace.c:24
6acbf033
JX
20958msgid "git replace [-f] --graft <commit> [<parent>...]"
20959msgstr "git replace [-f] --graft <提交> [<父提交>...]"
20960
fd8cb379
JX
20961#: builtin/replace.c:25
20962msgid "git replace [-f] --convert-graft-file"
20963msgstr "git replace [-f] --convert-graft-file"
20964
20965#: builtin/replace.c:26
ef317cd5 20966msgid "git replace -d <object>..."
07432cef 20967msgstr "git replace -d <对象>..."
ef317cd5 20968
fd8cb379 20969#: builtin/replace.c:27
cfff71a9
JX
20970msgid "git replace [--format=<format>] [-l [<pattern>]]"
20971msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 20972
d46c5519 20973#: builtin/replace.c:90
c1ac5258
JX
20974#, c-format
20975msgid ""
20976"invalid replace format '%s'\n"
20977"valid formats are 'short', 'medium' and 'long'"
20978msgstr ""
20979"无效的替换格式 '%s'\n"
20980"有效的格式有 'short'、'medium' 和 'long'"
20981
d46c5519 20982#: builtin/replace.c:125
c1ac5258
JX
20983#, c-format
20984msgid "replace ref '%s' not found"
20985msgstr "未发现替换引用 '%s'"
20986
d46c5519 20987#: builtin/replace.c:141
c1ac5258
JX
20988#, c-format
20989msgid "Deleted replace ref '%s'"
e640d114 20990msgstr "已删除替换引用 '%s'"
c1ac5258 20991
d46c5519 20992#: builtin/replace.c:153
c1ac5258
JX
20993#, c-format
20994msgid "'%s' is not a valid ref name"
20995msgstr "'%s' 不是一个有效的引用名"
20996
d46c5519 20997#: builtin/replace.c:158
c1ac5258
JX
20998#, c-format
20999msgid "replace ref '%s' already exists"
21000msgstr "替换引用 '%s' 已经存在"
21001
d46c5519 21002#: builtin/replace.c:178
c1ac5258
JX
21003#, c-format
21004msgid ""
21005"Objects must be of the same type.\n"
21006"'%s' points to a replaced object of type '%s'\n"
21007"while '%s' points to a replacement object of type '%s'."
21008msgstr ""
21009"对象必须属于同一类型。\n"
21010"'%s' 指向 '%s' 类型的替换对象\n"
21011"而 '%s' 指向 '%s' 类型的替换对象。"
21012
d46c5519 21013#: builtin/replace.c:229
c1ac5258
JX
21014#, c-format
21015msgid "unable to open %s for writing"
21016msgstr "无法为写入打开 %s"
21017
d46c5519 21018#: builtin/replace.c:242
c1ac5258
JX
21019msgid "cat-file reported failure"
21020msgstr "cat-file 报告失败"
21021
d46c5519 21022#: builtin/replace.c:258
c1ac5258
JX
21023#, c-format
21024msgid "unable to open %s for reading"
21025msgstr "无法为读取打开 %s"
21026
65387fd5 21027#: builtin/replace.c:271
c1ac5258
JX
21028msgid "unable to spawn mktree"
21029msgstr "无法启动 mktree"
21030
65387fd5 21031#: builtin/replace.c:275
c1ac5258
JX
21032msgid "unable to read from mktree"
21033msgstr "无法从 mktree 读取"
21034
65387fd5 21035#: builtin/replace.c:284
c1ac5258
JX
21036msgid "mktree reported failure"
21037msgstr "mktree 报告失败"
21038
65387fd5 21039#: builtin/replace.c:288
c1ac5258
JX
21040msgid "mktree did not return an object name"
21041msgstr "mktree 没有返回一个对象名"
21042
65387fd5 21043#: builtin/replace.c:297
c1ac5258
JX
21044#, c-format
21045msgid "unable to fstat %s"
21046msgstr "无法对 %s 执行 fstat"
21047
65387fd5 21048#: builtin/replace.c:302
c1ac5258
JX
21049msgid "unable to write object to database"
21050msgstr "无法向数据库写入对象"
21051
65387fd5 21052#: builtin/replace.c:325
c1ac5258
JX
21053#, c-format
21054msgid "unable to get object type for %s"
21055msgstr "无法得到 %s 的对象类型"
21056
65387fd5 21057#: builtin/replace.c:341
c1ac5258
JX
21058msgid "editing object file failed"
21059msgstr "编辑对象文件失败"
21060
65387fd5 21061#: builtin/replace.c:350
c1ac5258
JX
21062#, c-format
21063msgid "new object is the same as the old one: '%s'"
21064msgstr "新对象和旧对象相同:'%s'"
21065
65387fd5 21066#: builtin/replace.c:383
d46c5519
JX
21067#, c-format
21068msgid "could not parse %s as a commit"
21069msgstr "无法将 %s 解析为一个提交"
21070
65387fd5 21071#: builtin/replace.c:415
6acbf033
JX
21072#, c-format
21073msgid "bad mergetag in commit '%s'"
55a16ee4 21074msgstr "提交 '%s' 中含有损坏的合并标签"
6acbf033 21075
65387fd5 21076#: builtin/replace.c:417
6acbf033
JX
21077#, c-format
21078msgid "malformed mergetag in commit '%s'"
fd8cb379 21079msgstr "提交 '%s' 中含有格式错误的合并标签"
6acbf033 21080
65387fd5 21081#: builtin/replace.c:429
6acbf033
JX
21082#, c-format
21083msgid ""
21084"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
21085"instead of --graft"
55a16ee4 21086msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
6acbf033 21087
65387fd5 21088#: builtin/replace.c:468
6acbf033 21089#, c-format
c1ac5258
JX
21090msgid "the original commit '%s' has a gpg signature"
21091msgstr "原始提交 '%s' 中有一个 gpg 签名"
6acbf033 21092
65387fd5 21093#: builtin/replace.c:469
6acbf033
JX
21094msgid "the signature will be removed in the replacement commit!"
21095msgstr "在替换的提交中签名将被移除!"
21096
65387fd5 21097#: builtin/replace.c:479
6acbf033
JX
21098#, c-format
21099msgid "could not write replacement commit for: '%s'"
21100msgstr "不能为 '%s' 写替换提交"
21101
65387fd5 21102#: builtin/replace.c:487
c1ac5258
JX
21103#, c-format
21104msgid "graft for '%s' unnecessary"
21105msgstr "对 '%s' 移植没有必要"
21106
65387fd5 21107#: builtin/replace.c:491
c1ac5258
JX
21108#, c-format
21109msgid "new commit is the same as the old one: '%s'"
21110msgstr "新提交和旧的一样:'%s'"
21111
65387fd5 21112#: builtin/replace.c:526
fd8cb379
JX
21113#, c-format
21114msgid ""
21115"could not convert the following graft(s):\n"
21116"%s"
21117msgstr ""
21118"不能转换下列移植:\n"
21119"%s"
21120
65387fd5 21121#: builtin/replace.c:547
ef317cd5 21122msgid "list replace refs"
07432cef 21123msgstr "列出替换的引用"
ef317cd5 21124
65387fd5 21125#: builtin/replace.c:548
ef317cd5 21126msgid "delete replace refs"
07432cef 21127msgstr "删除替换的引用"
ef317cd5 21128
65387fd5 21129#: builtin/replace.c:549
6acbf033
JX
21130msgid "edit existing object"
21131msgstr "编辑现存的对象"
21132
65387fd5 21133#: builtin/replace.c:550
6acbf033
JX
21134msgid "change a commit's parents"
21135msgstr "修改一个提交的父提交"
21136
65387fd5 21137#: builtin/replace.c:551
fd8cb379
JX
21138msgid "convert existing graft file"
21139msgstr "转换现存的移植文件"
21140
65387fd5 21141#: builtin/replace.c:552
ef317cd5 21142msgid "replace the ref if it exists"
07432cef 21143msgstr "如果存在则替换引用"
ef317cd5 21144
65387fd5 21145#: builtin/replace.c:554
6acbf033
JX
21146msgid "do not pretty-print contents for --edit"
21147msgstr "不要为 --edit 操作美观显示内容"
21148
65387fd5 21149#: builtin/replace.c:555
cfff71a9
JX
21150msgid "use this format"
21151msgstr "使用此格式"
21152
65387fd5 21153#: builtin/replace.c:568
c1ac5258 21154msgid "--format cannot be used when not listing"
e640d114 21155msgstr "不列出时不能使用 --format"
c1ac5258 21156
65387fd5 21157#: builtin/replace.c:576
c1ac5258
JX
21158msgid "-f only makes sense when writing a replacement"
21159msgstr "只有写一个替换时 -f 才有意义"
21160
65387fd5 21161#: builtin/replace.c:580
c1ac5258
JX
21162msgid "--raw only makes sense with --edit"
21163msgstr "--raw 只有和 --edit 共用才有意义"
21164
65387fd5 21165#: builtin/replace.c:586
c1ac5258
JX
21166msgid "-d needs at least one argument"
21167msgstr "-d 需要至少一个参数"
21168
65387fd5 21169#: builtin/replace.c:592
c1ac5258
JX
21170msgid "bad number of arguments"
21171msgstr "错误的参数个数"
21172
65387fd5 21173#: builtin/replace.c:598
c1ac5258 21174msgid "-e needs exactly one argument"
e640d114 21175msgstr "-e 需要且仅需要一个参数"
c1ac5258 21176
65387fd5 21177#: builtin/replace.c:604
c1ac5258
JX
21178msgid "-g needs at least one argument"
21179msgstr "-g 需要至少一个参数"
21180
65387fd5 21181#: builtin/replace.c:610
c1ac5258
JX
21182msgid "--convert-graft-file takes no argument"
21183msgstr "--convert-graft-file 不带参数"
21184
65387fd5 21185#: builtin/replace.c:616
c1ac5258
JX
21186msgid "only one pattern can be given with -l"
21187msgstr "只能为 -l 提供一个模式"
21188
a4f16749 21189#: builtin/rerere.c:13
814ff314
JX
21190msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
21191msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
ef317cd5 21192
ec3d4607 21193#: builtin/rerere.c:58
ef317cd5 21194msgid "register clean resolutions in index"
07432cef 21195msgstr "在索引中注册干净的解决方案"
ef317cd5 21196
ec3d4607 21197#: builtin/rerere.c:77
4c27fcb5
JX
21198msgid "'git rerere forget' without paths is deprecated"
21199msgstr "没有路径的 'git rerere forget' 已经过时"
21200
ec3d4607 21201#: builtin/rerere.c:111
4c27fcb5
JX
21202#, c-format
21203msgid "unable to generate diff for '%s'"
21204msgstr "无法为 '%s' 生成差异"
21205
65387fd5 21206#: builtin/reset.c:33
ef317cd5
JX
21207msgid ""
21208"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 21209msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5 21210
65387fd5 21211#: builtin/reset.c:34
ddc12c42
JX
21212msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
21213msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..."
ef317cd5 21214
65387fd5 21215#: builtin/reset.c:35
ddc12c42
JX
21216msgid ""
21217"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
2b472aae 21218msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]"
ef317cd5 21219
65387fd5 21220#: builtin/reset.c:36
ddc12c42
JX
21221msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
21222msgstr "git reset --patch [<树对象>] [--] [<路径表达式>...]"
21223
65387fd5 21224#: builtin/reset.c:42
c04f5ac3
JX
21225msgid "mixed"
21226msgstr "混杂"
21227
65387fd5 21228#: builtin/reset.c:42
c04f5ac3
JX
21229msgid "soft"
21230msgstr "软性"
21231
65387fd5 21232#: builtin/reset.c:42
c04f5ac3
JX
21233msgid "hard"
21234msgstr "硬性"
21235
65387fd5 21236#: builtin/reset.c:42
8ada9598
JX
21237msgid "merge"
21238msgstr "合并"
21239
65387fd5 21240#: builtin/reset.c:42
c04f5ac3
JX
21241msgid "keep"
21242msgstr "保持"
21243
65387fd5 21244#: builtin/reset.c:90
c04f5ac3
JX
21245msgid "You do not have a valid HEAD."
21246msgstr "您没有一个有效的 HEAD。"
21247
65387fd5 21248#: builtin/reset.c:92
c04f5ac3
JX
21249msgid "Failed to find tree of HEAD."
21250msgstr "无法找到 HEAD 指向的树。"
21251
65387fd5 21252#: builtin/reset.c:98
c04f5ac3
JX
21253#, c-format
21254msgid "Failed to find tree of %s."
21255msgstr "无法找到 %s 指向的树。"
21256
65387fd5 21257#: builtin/reset.c:123
a5cd71ca
JX
21258#, c-format
21259msgid "HEAD is now at %s"
21260msgstr "HEAD 现在位于 %s"
21261
90e6ef53 21262# 译者:汉字之间无空格,故删除%s前后空格
65387fd5 21263#: builtin/reset.c:299
c04f5ac3
JX
21264#, c-format
21265msgid "Cannot do a %s reset in the middle of a merge."
21266msgstr "在合并过程中不能做%s重置操作。"
21267
65387fd5
FZ
21268#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
21269#: builtin/stash.c:704
ef317cd5 21270msgid "be quiet, only report errors"
07432cef 21271msgstr "安静模式,只报告错误"
ef317cd5 21272
65387fd5 21273#: builtin/reset.c:398
ef317cd5 21274msgid "reset HEAD and index"
07432cef 21275msgstr "重置 HEAD 和索引"
ef317cd5 21276
65387fd5 21277#: builtin/reset.c:399
ef317cd5 21278msgid "reset only HEAD"
07432cef 21279msgstr "只重置 HEAD"
ef317cd5 21280
65387fd5 21281#: builtin/reset.c:401 builtin/reset.c:403
ef317cd5 21282msgid "reset HEAD, index and working tree"
07432cef 21283msgstr "重置 HEAD、索引和工作区"
ef317cd5 21284
65387fd5 21285#: builtin/reset.c:405
ef317cd5 21286msgid "reset HEAD but keep local changes"
07432cef 21287msgstr "重置 HEAD 但保存本地变更"
ef317cd5 21288
65387fd5 21289#: builtin/reset.c:411
6c94aba5
JX
21290msgid "record only the fact that removed paths will be added later"
21291msgstr "将删除的路径标记为稍后添加"
21292
65387fd5 21293#: builtin/reset.c:445
07432cef
WS
21294#, c-format
21295msgid "Failed to resolve '%s' as a valid revision."
21296msgstr "无法将 '%s' 解析为一个有效的版本。"
21297
65387fd5 21298#: builtin/reset.c:453
07432cef
WS
21299#, c-format
21300msgid "Failed to resolve '%s' as a valid tree."
21301msgstr "无法将 '%s' 解析为一个有效的树对象。"
21302
65387fd5 21303#: builtin/reset.c:472
c04f5ac3 21304msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
d9d56b23 21305msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
c04f5ac3 21306
90e6ef53 21307# 译者:汉字之间无空格,故删除%s前后空格
65387fd5 21308#: builtin/reset.c:474
c04f5ac3
JX
21309#, c-format
21310msgid "Cannot do %s reset with paths."
21311msgstr "不能带路径进行%s重置。"
21312
90e6ef53 21313# 译者:汉字之间无空格,故删除%s前后空格
65387fd5 21314#: builtin/reset.c:489
c04f5ac3
JX
21315#, c-format
21316msgid "%s reset is not allowed in a bare repository"
160fb2b2 21317msgstr "不能对纯仓库进行%s重置"
c04f5ac3 21318
65387fd5 21319#: builtin/reset.c:520
90314792 21320msgid "Unstaged changes after reset:"
160fb2b2 21321msgstr "重置后取消暂存的变更:"
90314792 21322
65387fd5 21323#: builtin/reset.c:523
4c27fcb5
JX
21324#, c-format
21325msgid ""
21326"\n"
21327"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
21328"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
21329"to make this the default.\n"
21330msgstr ""
21331"\n"
21332"重置后,枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n"
21333"将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n"
21334
65387fd5 21335#: builtin/reset.c:541
ef317cd5
JX
21336#, c-format
21337msgid "Could not reset index file to revision '%s'."
21338msgstr "不能重置索引文件至版本 '%s'。"
21339
65387fd5 21340#: builtin/reset.c:546
07432cef
WS
21341msgid "Could not write new index file."
21342msgstr "不能写入新的索引文件。"
21343
ec3d4607 21344#: builtin/rev-list.c:602
5809aa05
JX
21345msgid "object filtering requires --objects"
21346msgstr "对象过滤需要 --objects"
21347
ec3d4607 21348#: builtin/rev-list.c:674
1b7f4a34
JX
21349msgid "rev-list does not support display of notes"
21350msgstr "rev-list 不支持显示注解"
21351
ec3d4607 21352#: builtin/rev-list.c:679
65387fd5
FZ
21353#, c-format
21354msgid "marked counting and '%s' cannot be used together"
21355msgstr "标记计数和 '%s' 不能同时使用"
5809aa05 21356
349ede6a 21357#: builtin/rev-parse.c:409
814ff314
JX
21358msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
21359msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
ef317cd5 21360
349ede6a 21361#: builtin/rev-parse.c:414
ef317cd5 21362msgid "keep the `--` passed as an arg"
07432cef 21363msgstr "保持 `--` 作为一个参数传递"
ef317cd5 21364
349ede6a 21365#: builtin/rev-parse.c:416
ef317cd5 21366msgid "stop parsing after the first non-option argument"
07432cef 21367msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 21368
349ede6a 21369#: builtin/rev-parse.c:419
cfff71a9
JX
21370msgid "output in stuck long form"
21371msgstr "以固定长格式输出"
21372
ec3d4607
JX
21373#: builtin/rev-parse.c:438
21374msgid "premature end of input"
21375msgstr "输入过早结束"
21376
21377#: builtin/rev-parse.c:442
21378msgid "no usage string given before the `--' separator"
21379msgstr "在 `--' 分隔符之前没有给出使用方法字符串"
21380
21381#: builtin/rev-parse.c:548
21382msgid "Needed a single revision"
21383msgstr "需要一个单独的版本"
21384
349ede6a 21385#: builtin/rev-parse.c:552
ef317cd5 21386msgid ""
814ff314 21387"git rev-parse --parseopt [<options>] -- [<args>...]\n"
ef317cd5 21388" or: git rev-parse --sq-quote [<arg>...]\n"
814ff314 21389" or: git rev-parse [<options>] [<arg>...]\n"
ef317cd5
JX
21390"\n"
21391"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
21392msgstr ""
814ff314 21393"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
90314792 21394" 或者:git rev-parse --sq-quote [<参数>...]\n"
814ff314 21395" 或者:git rev-parse [<选项>] [<参数>...]\n"
07432cef
WS
21396"\n"
21397"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5 21398
ec3d4607
JX
21399#: builtin/rev-parse.c:712
21400msgid "--resolve-git-dir requires an argument"
21401msgstr "--resolve-git-dir 需要一个参数"
21402
21403#: builtin/rev-parse.c:715
21404#, c-format
21405msgid "not a gitdir '%s'"
21406msgstr "不是一个git目录 '%s'"
21407
21408#: builtin/rev-parse.c:739
21409msgid "--git-path requires an argument"
21410msgstr "--git-path 需要一个参数"
21411
21412#: builtin/rev-parse.c:749
21413msgid "-n requires an argument"
21414msgstr "-n 需要一个参数"
21415
21416#: builtin/rev-parse.c:763
21417msgid "--path-format requires an argument"
21418msgstr "--path-format 需要一个参数"
21419
21420#: builtin/rev-parse.c:769
21421#, c-format
21422msgid "unknown argument to --path-format: %s"
21423msgstr "未知的 --path-format 参数:%s"
21424
21425#: builtin/rev-parse.c:776
21426msgid "--default requires an argument"
21427msgstr "--default 需要一个参数"
21428
21429#: builtin/rev-parse.c:782
21430msgid "--prefix requires an argument"
21431msgstr "--prefix 需要一个参数"
21432
21433#: builtin/rev-parse.c:851
21434#, c-format
21435msgid "unknown mode for --abbrev-ref: %s"
21436msgstr "未知的 --abbrev-ref 模式:%s"
21437
21438#: builtin/rev-parse.c:1023
21439#, c-format
21440msgid "unknown mode for --show-object-format: %s"
21441msgstr "未知的 --show-object-format 模式:%s"
21442
c1ac5258 21443#: builtin/revert.c:24
814ff314
JX
21444msgid "git revert [<options>] <commit-ish>..."
21445msgstr "git revert [<选项>] <提交号>..."
ef317cd5 21446
c1ac5258 21447#: builtin/revert.c:25
ef317cd5 21448msgid "git revert <subcommand>"
07432cef 21449msgstr "git revert <子命令>"
ef317cd5 21450
c1ac5258 21451#: builtin/revert.c:30
814ff314
JX
21452msgid "git cherry-pick [<options>] <commit-ish>..."
21453msgstr "git cherry-pick [<选项>] <提交号>..."
ef317cd5 21454
c1ac5258 21455#: builtin/revert.c:31
ef317cd5 21456msgid "git cherry-pick <subcommand>"
07432cef 21457msgstr "git cherry-pick <子命令>"
ef317cd5 21458
06991777
JX
21459#: builtin/revert.c:72
21460#, c-format
21461msgid "option `%s' expects a number greater than zero"
21462msgstr "选项 `%s' 期望一个大于零的数字"
21463
21464#: builtin/revert.c:92
ef317cd5
JX
21465#, c-format
21466msgid "%s: %s cannot be used with %s"
21467msgstr "%s:%s 不能和 %s 同时使用"
21468
d46c5519 21469#: builtin/revert.c:102
ef317cd5 21470msgid "end revert or cherry-pick sequence"
07432cef 21471msgstr "终止反转或拣选操作"
ef317cd5 21472
d46c5519 21473#: builtin/revert.c:103
ef317cd5 21474msgid "resume revert or cherry-pick sequence"
07432cef 21475msgstr "继续反转或拣选操作"
ef317cd5 21476
d46c5519 21477#: builtin/revert.c:104
ef317cd5 21478msgid "cancel revert or cherry-pick sequence"
07432cef 21479msgstr "取消反转或拣选操作"
ef317cd5 21480
a6cd2cc4
JX
21481#: builtin/revert.c:105
21482msgid "skip current commit and continue"
21483msgstr "跳过当前提交并继续"
21484
21485#: builtin/revert.c:107
ef317cd5 21486msgid "don't automatically commit"
07432cef 21487msgstr "不要自动提交"
ef317cd5 21488
a6cd2cc4 21489#: builtin/revert.c:108
ef317cd5 21490msgid "edit the commit message"
07432cef 21491msgstr "编辑提交说明"
ef317cd5 21492
a6cd2cc4 21493#: builtin/revert.c:111
87cb7997 21494msgid "parent-number"
07432cef 21495msgstr "父编号"
ef317cd5 21496
a6cd2cc4 21497#: builtin/revert.c:112
87cb7997
JX
21498msgid "select mainline parent"
21499msgstr "选择主干父提交编号"
21500
a6cd2cc4 21501#: builtin/revert.c:114
ef317cd5 21502msgid "merge strategy"
07432cef 21503msgstr "合并策略"
ef317cd5 21504
a6cd2cc4 21505#: builtin/revert.c:116
ef317cd5 21506msgid "option for merge strategy"
07432cef 21507msgstr "合并策略的选项"
ef317cd5 21508
a6cd2cc4 21509#: builtin/revert.c:125
ef317cd5 21510msgid "append commit name"
07432cef 21511msgstr "追加提交名称"
ef317cd5 21512
a6cd2cc4 21513#: builtin/revert.c:127
ef317cd5 21514msgid "preserve initially empty commits"
07432cef 21515msgstr "保留初始化的空提交"
ef317cd5 21516
7e6630a7
FZ
21517#: builtin/revert.c:128
21518msgid "allow commits with empty messages"
21519msgstr "允许提交说明为空"
21520
a6cd2cc4 21521#: builtin/revert.c:129
ef317cd5 21522msgid "keep redundant, empty commits"
07432cef 21523msgstr "保持多余的、空的提交"
ef317cd5 21524
7e6630a7 21525#: builtin/revert.c:241
c04f5ac3
JX
21526msgid "revert failed"
21527msgstr "还原失败"
21528
7e6630a7 21529#: builtin/revert.c:254
c04f5ac3
JX
21530msgid "cherry-pick failed"
21531msgstr "拣选失败"
21532
33b62fba 21533#: builtin/rm.c:20
814ff314
JX
21534msgid "git rm [<options>] [--] <file>..."
21535msgstr "git rm [<选项>] [--] <文件>..."
07432cef 21536
33b62fba 21537#: builtin/rm.c:208
c04f5ac3 21538msgid ""
2e8451e8
JX
21539"the following file has staged content different from both the\n"
21540"file and the HEAD:"
21541msgid_plural ""
21542"the following files have staged content different from both the\n"
21543"file and the HEAD:"
21544msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
21545msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
21546
33b62fba 21547#: builtin/rm.c:213
2e8451e8
JX
21548msgid ""
21549"\n"
c04f5ac3
JX
21550"(use -f to force removal)"
21551msgstr ""
2e8451e8 21552"\n"
c04f5ac3
JX
21553"(使用 -f 强制删除)"
21554
33b62fba 21555#: builtin/rm.c:217
2e8451e8
JX
21556msgid "the following file has changes staged in the index:"
21557msgid_plural "the following files have changes staged in the index:"
160fb2b2
JX
21558msgstr[0] "下列文件索引中有变更"
21559msgstr[1] "下列文件索引中有变更"
c04f5ac3 21560
33b62fba 21561#: builtin/rm.c:221 builtin/rm.c:230
c04f5ac3 21562msgid ""
2e8451e8 21563"\n"
c04f5ac3
JX
21564"(use --cached to keep the file, or -f to force removal)"
21565msgstr ""
2e8451e8
JX
21566"\n"
21567"(使用 --cached 保留本地文件,或用 -f 强制删除)"
21568
33b62fba 21569#: builtin/rm.c:227
2e8451e8
JX
21570msgid "the following file has local modifications:"
21571msgid_plural "the following files have local modifications:"
21572msgstr[0] "如下文件有本地修改:"
21573msgstr[1] "如下文件有本地修改:"
c04f5ac3 21574
7e6630a7 21575#: builtin/rm.c:245
ef317cd5 21576msgid "do not list removed files"
07432cef 21577msgstr "不列出删除的文件"
ef317cd5 21578
7e6630a7 21579#: builtin/rm.c:246
ef317cd5 21580msgid "only remove from the index"
07432cef 21581msgstr "只从索引区删除"
ef317cd5 21582
7e6630a7 21583#: builtin/rm.c:247
ef317cd5 21584msgid "override the up-to-date check"
07432cef 21585msgstr "忽略文件更新状态检查"
ef317cd5 21586
7e6630a7 21587#: builtin/rm.c:248
ef317cd5 21588msgid "allow recursive removal"
07432cef 21589msgstr "允许递归删除"
ef317cd5 21590
7e6630a7 21591#: builtin/rm.c:250
ef317cd5 21592msgid "exit with a zero status even if nothing matched"
07432cef 21593msgstr "即使没有匹配,也以零状态退出"
ef317cd5 21594
7e6630a7 21595#: builtin/rm.c:285
2b472aae 21596msgid "No pathspec was given. Which files should I remove?"
440e7442 21597msgstr "没有提供路径规格。我应该删除哪些文件?"
2b472aae 21598
7e6630a7 21599#: builtin/rm.c:315
c1ac5258
JX
21600msgid "please stage your changes to .gitmodules or stash them to proceed"
21601msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
21602
7e6630a7 21603#: builtin/rm.c:337
c04f5ac3
JX
21604#, c-format
21605msgid "not removing '%s' recursively without -r"
21606msgstr "未提供 -r 选项不会递归删除 '%s'"
21607
7e6630a7 21608#: builtin/rm.c:385
c04f5ac3
JX
21609#, c-format
21610msgid "git rm: unable to remove %s"
21611msgstr "git rm:不能删除 %s"
21612
fd8cb379 21613#: builtin/send-pack.c:20
1b7f4a34 21614msgid ""
7e6630a7
FZ
21615"git send-pack [--mirror] [--dry-run] [--force]\n"
21616" [--receive-pack=<git-receive-pack>]\n"
21617" [--verbose] [--thin] [--atomic]\n"
21618" [<host>:]<directory> (--all | <ref>...)"
1b7f4a34 21619msgstr ""
7e6630a7
FZ
21620"git send-pack [--mirror] [--dry-run] [--force]\n"
21621" [--receive-pack=<git-receive-pack>]\n"
21622" [--verbose] [--thin] [--atomic]\n"
21623" [<主机>:]<目录> (--all | <引用>...)"
1b7f4a34 21624
7e6630a7 21625#: builtin/send-pack.c:192
1b7f4a34
JX
21626msgid "remote name"
21627msgstr "远程名称"
21628
7e6630a7 21629#: builtin/send-pack.c:205
1b7f4a34
JX
21630msgid "use stateless RPC protocol"
21631msgstr "使用无状态的 RPC 协议"
21632
7e6630a7 21633#: builtin/send-pack.c:206
1b7f4a34
JX
21634msgid "read refs from stdin"
21635msgstr "从标准输入读取引用"
21636
7e6630a7 21637#: builtin/send-pack.c:207
1b7f4a34
JX
21638msgid "print status from remote helper"
21639msgstr "打印来自远程 helper 的状态"
21640
d13389bf 21641#: builtin/shortlog.c:16
fd8cb379
JX
21642msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
21643msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
21644
d13389bf 21645#: builtin/shortlog.c:17
fd8cb379
JX
21646msgid "git log --pretty=short | git shortlog [<options>]"
21647msgstr "git log --pretty=short | git shortlog [<选项>]"
ef317cd5 21648
473eb541 21649#: builtin/shortlog.c:123
d9488fea
JX
21650msgid "using multiple --group options with stdin is not supported"
21651msgstr "不支持和标准输入一起使用多个 --group 选项"
21652
473eb541 21653#: builtin/shortlog.c:133
d9488fea
JX
21654msgid "using --group=trailer with stdin is not supported"
21655msgstr "不支持和标准输入一起使用 --group=trailer"
21656
473eb541 21657#: builtin/shortlog.c:323
d9488fea
JX
21658#, c-format
21659msgid "unknown group type: %s"
21660msgstr "未知分组类型:%s"
21661
473eb541
JX
21662#: builtin/shortlog.c:351
21663msgid "group by committer rather than author"
21664msgstr "按照提交者而不是作者分组"
1a79b2f1 21665
473eb541 21666#: builtin/shortlog.c:354
ef317cd5 21667msgid "sort output according to the number of commits per author"
07432cef 21668msgstr "根据每个作者的提交数量排序"
ef317cd5 21669
473eb541
JX
21670#: builtin/shortlog.c:356
21671msgid "suppress commit descriptions, only provides commit count"
21672msgstr "抑制提交描述,只提供提交数量"
ef317cd5 21673
473eb541
JX
21674#: builtin/shortlog.c:358
21675msgid "show the email address of each author"
07432cef 21676msgstr "显示每个作者的电子邮件地址"
ef317cd5 21677
473eb541 21678#: builtin/shortlog.c:359
c1ac5258
JX
21679msgid "<w>[,<i1>[,<i2>]]"
21680msgstr "<w>[,<i1>[,<i2>]]"
ef317cd5 21681
473eb541
JX
21682#: builtin/shortlog.c:360
21683msgid "linewrap output"
07432cef 21684msgstr "折行输出"
ef317cd5 21685
473eb541 21686#: builtin/shortlog.c:362
d9488fea
JX
21687msgid "field"
21688msgstr "字段"
21689
473eb541
JX
21690#: builtin/shortlog.c:363
21691msgid "group by field"
d9488fea
JX
21692msgstr "按字段分组"
21693
7e6630a7 21694#: builtin/shortlog.c:394
fd8cb379
JX
21695msgid "too many arguments given outside repository"
21696msgstr "仓库外执行提供了太多的参数"
21697
c1ac5258 21698#: builtin/show-branch.c:13
ef317cd5 21699msgid ""
814ff314 21700"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
7e6630a7
FZ
21701" [--current] [--color[=<when>] | --no-color] [--sparse]\n"
21702" [--more=<n> | --list | --independent | --merge-base]\n"
21703" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
ef317cd5 21704msgstr ""
814ff314 21705"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
7e6630a7
FZ
21706" [--current] [--color[=<何时>] | --no-color] [--sparse]\n"
21707" [--more=<n> | --list | --independent | --merge-base]\n"
21708" [--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
ef317cd5 21709
c1ac5258 21710#: builtin/show-branch.c:17
814ff314 21711msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
58b6f078 21712msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
ef317cd5 21713
c1ac5258 21714#: builtin/show-branch.c:395
a0b6b246
JX
21715#, c-format
21716msgid "ignoring %s; cannot handle more than %d ref"
21717msgid_plural "ignoring %s; cannot handle more than %d refs"
21718msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
21719msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
21720
7e6630a7 21721#: builtin/show-branch.c:547
a0b6b246
JX
21722#, c-format
21723msgid "no matching refs with %s"
21724msgstr "没有和 %s 匹配的引用"
21725
7e6630a7 21726#: builtin/show-branch.c:644
ef317cd5 21727msgid "show remote-tracking and local branches"
07432cef 21728msgstr "显示远程跟踪的和本地的分支"
ef317cd5 21729
7e6630a7 21730#: builtin/show-branch.c:646
ef317cd5 21731msgid "show remote-tracking branches"
07432cef 21732msgstr "显示远程跟踪的分支"
ef317cd5 21733
7e6630a7 21734#: builtin/show-branch.c:648
ef317cd5 21735msgid "color '*!+-' corresponding to the branch"
07432cef 21736msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 21737
7e6630a7 21738#: builtin/show-branch.c:650
ef317cd5 21739msgid "show <n> more commits after the common ancestor"
07432cef 21740msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 21741
7e6630a7 21742#: builtin/show-branch.c:652
ef317cd5 21743msgid "synonym to more=-1"
07432cef 21744msgstr "和 more=-1 同义"
ef317cd5 21745
7e6630a7 21746#: builtin/show-branch.c:653
ef317cd5 21747msgid "suppress naming strings"
07432cef 21748msgstr "不显示字符串命名"
ef317cd5 21749
7e6630a7 21750#: builtin/show-branch.c:655
ef317cd5 21751msgid "include the current branch"
07432cef 21752msgstr "包括当前分支"
ef317cd5 21753
7e6630a7 21754#: builtin/show-branch.c:657
ef317cd5 21755msgid "name commits with their object names"
07432cef 21756msgstr "以对象名字命名提交"
ef317cd5 21757
7e6630a7 21758#: builtin/show-branch.c:659
ef317cd5 21759msgid "show possible merge bases"
07432cef 21760msgstr "显示可能合并的基线"
ef317cd5 21761
7e6630a7 21762#: builtin/show-branch.c:661
ef317cd5 21763msgid "show refs unreachable from any other ref"
07432cef 21764msgstr "显示没有任何引用的的引用"
ef317cd5 21765
7e6630a7 21766#: builtin/show-branch.c:663
ef317cd5 21767msgid "show commits in topological order"
07432cef 21768msgstr "以拓扑顺序显示提交"
ef317cd5 21769
7e6630a7 21770#: builtin/show-branch.c:666
ef317cd5 21771msgid "show only commits not on the first branch"
07432cef 21772msgstr "只显示不在第一个分支上的提交"
ef317cd5 21773
7e6630a7 21774#: builtin/show-branch.c:668
ef317cd5 21775msgid "show merges reachable from only one tip"
07432cef 21776msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 21777
7e6630a7 21778#: builtin/show-branch.c:670
2e8451e8
JX
21779msgid "topologically sort, maintaining date order where possible"
21780msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 21781
7e6630a7 21782#: builtin/show-branch.c:673
ef317cd5 21783msgid "<n>[,<base>]"
07432cef 21784msgstr "<n>[,<base>]"
ef317cd5 21785
7e6630a7 21786#: builtin/show-branch.c:674
ef317cd5 21787msgid "show <n> most recent ref-log entries starting at base"
58b6f078 21788msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
ef317cd5 21789
7e6630a7 21790#: builtin/show-branch.c:734
a0b6b246
JX
21791msgid "no branches given, and HEAD is not valid"
21792msgstr "未提供分支,且 HEAD 无效"
21793
7e6630a7 21794#: builtin/show-branch.c:737
a0b6b246
JX
21795msgid "--reflog option needs one branch name"
21796msgstr "选项 --reflog 需要一个分支名"
21797
7e6630a7 21798#: builtin/show-branch.c:740
a0b6b246
JX
21799#, c-format
21800msgid "only %d entry can be shown at one time."
21801msgid_plural "only %d entries can be shown at one time."
21802msgstr[0] "一次只能显示 %d 个条目。"
21803msgstr[1] "一次只能显示 %d 个条目。"
21804
7e6630a7 21805#: builtin/show-branch.c:744
a0b6b246
JX
21806#, c-format
21807msgid "no such ref %s"
21808msgstr "无此引用 %s"
21809
65387fd5 21810#: builtin/show-branch.c:830
a0b6b246
JX
21811#, c-format
21812msgid "cannot handle more than %d rev."
21813msgid_plural "cannot handle more than %d revs."
21814msgstr[0] "不能处理 %d 个以上的版本。"
21815msgstr[1] "不能处理 %d 个以上的版本。"
21816
65387fd5 21817#: builtin/show-branch.c:834
a0b6b246
JX
21818#, c-format
21819msgid "'%s' is not a valid ref."
21820msgstr "'%s' 不是一个有效的引用。"
21821
65387fd5 21822#: builtin/show-branch.c:837
a0b6b246
JX
21823#, c-format
21824msgid "cannot find commit %s (%s)"
29004bbb 21825msgstr "不能找到提交 %s(%s)"
a0b6b246 21826
7157c2b5
JX
21827#: builtin/show-index.c:21
21828msgid "hash-algorithm"
21829msgstr "哈希算法"
21830
21831#: builtin/show-index.c:31
21832msgid "Unknown hash algorithm"
21833msgstr "未知的哈希算法"
21834
d46c5519 21835#: builtin/show-ref.c:12
ef317cd5 21836msgid ""
814ff314
JX
21837"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
21838"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
ef317cd5 21839msgstr ""
814ff314
JX
21840"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
21841"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
ef317cd5 21842
d46c5519 21843#: builtin/show-ref.c:13
94550ed3
JX
21844msgid "git show-ref --exclude-existing[=<pattern>]"
21845msgstr "git show-ref --exclude-existing[=<模式>]"
ef317cd5 21846
d46c5519 21847#: builtin/show-ref.c:162
ef317cd5 21848msgid "only show tags (can be combined with heads)"
55a16ee4 21849msgstr "只显示标签(可以和头共用)"
ef317cd5 21850
d46c5519 21851#: builtin/show-ref.c:163
ef317cd5 21852msgid "only show heads (can be combined with tags)"
55a16ee4 21853msgstr "只显示头(可以和标签共用)"
ef317cd5 21854
d46c5519 21855#: builtin/show-ref.c:164
ef317cd5 21856msgid "stricter reference checking, requires exact ref path"
07432cef 21857msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 21858
d46c5519 21859#: builtin/show-ref.c:167 builtin/show-ref.c:169
2e8451e8
JX
21860msgid "show the HEAD reference, even if it would be filtered out"
21861msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 21862
d46c5519 21863#: builtin/show-ref.c:171
ef317cd5 21864msgid "dereference tags into object IDs"
4375c10e 21865msgstr "转换标签到对象 ID"
ef317cd5 21866
d46c5519
JX
21867#: builtin/show-ref.c:173
21868msgid "only show SHA1 hash using <n> digits"
21869msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
21870
21871#: builtin/show-ref.c:177
21872msgid "do not print results to stdout (useful with --verify)"
21873msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
21874
21875#: builtin/show-ref.c:179
21876msgid "show refs from stdin that aren't in local repository"
21877msgstr "显示从标准输入中读入的不在本地仓库中的引用"
21878
33b62fba 21879#: builtin/sparse-checkout.c:22
349ede6a
JX
21880msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
21881msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <选项>"
ddc12c42 21882
33b62fba 21883#: builtin/sparse-checkout.c:46
d9488fea
JX
21884msgid "git sparse-checkout list"
21885msgstr "git sparse-checkout list"
21886
65387fd5
FZ
21887#: builtin/sparse-checkout.c:60
21888msgid "this worktree is not sparse"
21889msgstr "这个工作区不是稀疏的"
21890
21891#: builtin/sparse-checkout.c:75
ddc12c42
JX
21892msgid "this worktree is not sparse (sparse-checkout file may not exist)"
21893msgstr "本工作区不是稀疏模式(稀疏检出文件可能不存在)"
21894
65387fd5 21895#: builtin/sparse-checkout.c:176
7e6630a7
FZ
21896#, c-format
21897msgid ""
21898"directory '%s' contains untracked files, but is not in the sparse-checkout "
21899"cone"
65387fd5 21900msgstr "目录 '%s' 包括了未跟踪文件,但不在稀疏检出锥中"
7e6630a7 21901
65387fd5 21902#: builtin/sparse-checkout.c:184
7e6630a7
FZ
21903#, c-format
21904msgid "failed to remove directory '%s'"
21905msgstr "无法删除目录 '%s'"
21906
65387fd5 21907#: builtin/sparse-checkout.c:324
2b472aae
JX
21908msgid "failed to create directory for sparse-checkout file"
21909msgstr "无法为稀疏检出文件创建目录"
21910
65387fd5 21911#: builtin/sparse-checkout.c:365
7157c2b5
JX
21912msgid "unable to upgrade repository format to enable worktreeConfig"
21913msgstr "无法升级仓库格式以启用 worktreeConfig"
21914
65387fd5 21915#: builtin/sparse-checkout.c:367
ddc12c42
JX
21916msgid "failed to set extensions.worktreeConfig setting"
21917msgstr "无法设置 extensions.worktreeConfig"
21918
65387fd5
FZ
21919#: builtin/sparse-checkout.c:411
21920msgid "failed to modify sparse-index config"
21921msgstr "无法修改 sparse-index 配置"
21922
21923#: builtin/sparse-checkout.c:422
33b62fba
JX
21924msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
21925msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
ddc12c42 21926
65387fd5
FZ
21927#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
21928#: builtin/sparse-checkout.c:778
ddc12c42 21929msgid "initialize the sparse-checkout in cone mode"
65387fd5 21930msgstr "初始化稀疏检出为锥形模式"
ddc12c42 21931
65387fd5
FZ
21932#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
21933#: builtin/sparse-checkout.c:780
33b62fba
JX
21934msgid "toggle the use of a sparse index"
21935msgstr "切换稀疏索引的使用"
21936
65387fd5 21937#: builtin/sparse-checkout.c:476
ddc12c42
JX
21938#, c-format
21939msgid "failed to open '%s'"
21940msgstr "无法打开 '%s'"
21941
65387fd5 21942#: builtin/sparse-checkout.c:528
2b472aae
JX
21943#, c-format
21944msgid "could not normalize path %s"
21945msgstr "无法规范化路径 %s"
21946
65387fd5 21947#: builtin/sparse-checkout.c:557
2b472aae
JX
21948#, c-format
21949msgid "unable to unquote C-style string '%s'"
440e7442 21950msgstr "无法为 C 语言风格的字符串 '%s' 去引号"
2b472aae 21951
65387fd5 21952#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
2b472aae
JX
21953msgid "unable to load existing sparse-checkout patterns"
21954msgstr "无法加载现存的稀疏检出模式"
ddc12c42 21955
65387fd5
FZ
21956#: builtin/sparse-checkout.c:616
21957msgid "existing sparse-checkout patterns do not use cone mode"
21958msgstr "已有的稀疏检出模式不使用锥形模式"
21959
21960#: builtin/sparse-checkout.c:682
21961msgid "git sparse-checkout add (--stdin | <patterns>)"
21962msgstr "git sparse-checkout add (--stdin | <模式>)"
21963
21964#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
ddc12c42
JX
21965msgid "read patterns from standard in"
21966msgstr "从标准输入读取模式"
21967
65387fd5
FZ
21968#: builtin/sparse-checkout.c:699
21969msgid "no sparse-checkout to add to"
21970msgstr "没有可以添加到的稀疏检出"
21971
21972#: builtin/sparse-checkout.c:712
21973msgid ""
21974"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
21975"<patterns>)"
21976msgstr ""
21977"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | <模式"
21978">)"
21979
21980#: builtin/sparse-checkout.c:765
21981msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
21982msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
21983
21984#: builtin/sparse-checkout.c:785
21985msgid "must be in a sparse-checkout to reapply sparsity patterns"
21986msgstr "必须在稀疏检出中重应用稀疏模式"
d9488fea 21987
65387fd5 21988#: builtin/sparse-checkout.c:803
d9488fea
JX
21989msgid "git sparse-checkout disable"
21990msgstr "git sparse-checkout disable"
21991
65387fd5 21992#: builtin/sparse-checkout.c:845
ddc12c42
JX
21993msgid "error while refreshing working directory"
21994msgstr "刷新工作目录时出错"
21995
33b62fba 21996#: builtin/stash.c:24 builtin/stash.c:40
d46c5519
JX
21997msgid "git stash list [<options>]"
21998msgstr "git stash list [<选项>]"
21999
33b62fba 22000#: builtin/stash.c:25 builtin/stash.c:45
d46c5519
JX
22001msgid "git stash show [<options>] [<stash>]"
22002msgstr "git stash show [<选项>] [<stash>]"
22003
33b62fba 22004#: builtin/stash.c:26 builtin/stash.c:50
d46c5519
JX
22005msgid "git stash drop [-q|--quiet] [<stash>]"
22006msgstr "git stash drop [-q|--quiet] [<stash>]"
22007
33b62fba 22008#: builtin/stash.c:27
d46c5519
JX
22009msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
22010msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
22011
33b62fba 22012#: builtin/stash.c:28 builtin/stash.c:65
d46c5519
JX
22013msgid "git stash branch <branchname> [<stash>]"
22014msgstr "git stash branch <分支名> [<stash>]"
22015
33b62fba 22016#: builtin/stash.c:30
d46c5519 22017msgid ""
65387fd5
FZ
22018"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
22019"quiet]\n"
d46c5519 22020" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
2b472aae 22021" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
d46c5519
JX
22022" [--] [<pathspec>...]]"
22023msgstr ""
65387fd5
FZ
22024"git stash [push [-p|--patch] [[-S|--staged] -k|--[no-]keep-index] [-q|--"
22025"quiet]\n"
d46c5519 22026" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
65387fd5 22027" [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n"
d46c5519
JX
22028" [--] [<路径规格>...]]"
22029
7e6630a7 22030#: builtin/stash.c:34
d46c5519 22031msgid ""
65387fd5
FZ
22032"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
22033"quiet]\n"
d46c5519
JX
22034" [-u|--include-untracked] [-a|--all] [<message>]"
22035msgstr ""
65387fd5
FZ
22036"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
22037"quiet]\n"
d46c5519
JX
22038" [-u|--include-untracked] [-a|--all] [<消息>]"
22039
33b62fba 22040#: builtin/stash.c:55
d46c5519
JX
22041msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
22042msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
22043
33b62fba 22044#: builtin/stash.c:60
d46c5519
JX
22045msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
22046msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
22047
33b62fba 22048#: builtin/stash.c:75
d46c5519
JX
22049msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
22050msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>"
22051
33b62fba 22052#: builtin/stash.c:80
2b472aae
JX
22053msgid ""
22054"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
22055" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
22056" [--] [<pathspec>...]]"
22057msgstr ""
22058"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
22059" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
22060" [--] [<路径规格>...]]"
22061
7e6630a7
FZ
22062#: builtin/stash.c:87
22063msgid ""
22064"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
22065" [-u|--include-untracked] [-a|--all] [<message>]"
22066msgstr ""
22067"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
22068" [-u|--include-untracked] [-a|--all] [<消息>]"
22069
33b62fba 22070#: builtin/stash.c:130
d46c5519
JX
22071#, c-format
22072msgid "'%s' is not a stash-like commit"
22073msgstr "'%s' 不像是一个贮藏提交"
22074
33b62fba 22075#: builtin/stash.c:150
d46c5519
JX
22076#, c-format
22077msgid "Too many revisions specified:%s"
22078msgstr "指定了太多的版本:%s"
22079
33b62fba 22080#: builtin/stash.c:164
d46c5519
JX
22081msgid "No stash entries found."
22082msgstr "未发现贮藏条目。"
22083
33b62fba 22084#: builtin/stash.c:178
d46c5519
JX
22085#, c-format
22086msgid "%s is not a valid reference"
22087msgstr "%s 不是一个有效的引用名"
22088
33b62fba 22089#: builtin/stash.c:227
473eb541 22090msgid "git stash clear with arguments is unimplemented"
d46c5519
JX
22091msgstr "git stash clear 不支持参数"
22092
7e6630a7 22093#: builtin/stash.c:447
473eb541
JX
22094#, c-format
22095msgid ""
22096"WARNING: Untracked file in way of tracked file! Renaming\n"
22097" %s -> %s\n"
22098" to make room.\n"
22099msgstr ""
22100"警告:未跟踪文件出现在跟踪文件的路径上!重命名\n"
22101" %s -> %s\n"
22102" 以腾出空间。\n"
22103
7e6630a7 22104#: builtin/stash.c:508
d46c5519 22105msgid "cannot apply a stash in the middle of a merge"
349ede6a 22106msgstr "无法在合并过程中应用贮藏"
d46c5519 22107
7e6630a7 22108#: builtin/stash.c:519
d46c5519
JX
22109#, c-format
22110msgid "could not generate diff %s^!."
22111msgstr "无法生成差异 %s^!."
22112
7e6630a7 22113#: builtin/stash.c:526
d13389bf 22114msgid "conflicts in index. Try without --index."
d46c5519
JX
22115msgstr "索引中有冲突。尝试不用 --index。"
22116
7e6630a7 22117#: builtin/stash.c:532
d46c5519
JX
22118msgid "could not save index tree"
22119msgstr "不能保存索引树"
22120
7e6630a7 22121#: builtin/stash.c:552
d46c5519
JX
22122#, c-format
22123msgid "Merging %s with %s"
22124msgstr "正在合并 %s 和 %s"
22125
7e6630a7 22126#: builtin/stash.c:562
d46c5519
JX
22127msgid "Index was not unstashed."
22128msgstr "索引未从贮藏中恢复。"
22129
65387fd5 22130#: builtin/stash.c:576
7e6630a7
FZ
22131msgid "could not restore untracked files from stash"
22132msgstr "无法从贮藏条目中恢复未跟踪文件"
22133
65387fd5 22134#: builtin/stash.c:608 builtin/stash.c:706
d46c5519
JX
22135msgid "attempt to recreate the index"
22136msgstr "尝试重建索引"
22137
65387fd5 22138#: builtin/stash.c:652
d46c5519
JX
22139#, c-format
22140msgid "Dropped %s (%s)"
22141msgstr "丢弃了 %s(%s)"
22142
65387fd5 22143#: builtin/stash.c:655
d46c5519
JX
22144#, c-format
22145msgid "%s: Could not drop stash entry"
22146msgstr "%s:无法丢弃贮藏条目"
22147
65387fd5 22148#: builtin/stash.c:668
d46c5519
JX
22149#, c-format
22150msgid "'%s' is not a stash reference"
22151msgstr "'%s' 不是一个贮藏引用"
22152
65387fd5 22153#: builtin/stash.c:718
d46c5519
JX
22154msgid "The stash entry is kept in case you need it again."
22155msgstr "贮藏条目被保留以备您再次需要。"
22156
65387fd5 22157#: builtin/stash.c:741
d46c5519
JX
22158msgid "No branch name specified"
22159msgstr "未指定分支名"
22160
65387fd5 22161#: builtin/stash.c:825
33b62fba
JX
22162msgid "failed to parse tree"
22163msgstr "无法解析树"
22164
65387fd5 22165#: builtin/stash.c:836
33b62fba
JX
22166msgid "failed to unpack trees"
22167msgstr "无法解包目录树"
22168
65387fd5 22169#: builtin/stash.c:856
33b62fba
JX
22170msgid "include untracked files in the stash"
22171msgstr "在贮藏中包含未跟踪文件"
22172
65387fd5 22173#: builtin/stash.c:859
33b62fba
JX
22174msgid "only show untracked files in the stash"
22175msgstr "仅显示贮藏中的未跟踪文件"
22176
65387fd5 22177#: builtin/stash.c:946 builtin/stash.c:983
d46c5519
JX
22178#, c-format
22179msgid "Cannot update %s with %s"
22180msgstr "无法用 %2$s 更新 %1$s"
22181
65387fd5 22182#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
d46c5519
JX
22183msgid "stash message"
22184msgstr "贮藏说明"
22185
65387fd5 22186#: builtin/stash.c:974
d46c5519
JX
22187msgid "\"git stash store\" requires one <commit> argument"
22188msgstr "\"git stash store\" 需要一个 <提交> 参数"
22189
65387fd5
FZ
22190#: builtin/stash.c:1159
22191msgid "No staged changes"
22192msgstr "没有暂存的修改"
22193
22194#: builtin/stash.c:1220
d46c5519
JX
22195msgid "No changes selected"
22196msgstr "没有选择变更"
22197
65387fd5 22198#: builtin/stash.c:1320
d46c5519
JX
22199msgid "You do not have the initial commit yet"
22200msgstr "您尚未建立初始提交"
22201
65387fd5 22202#: builtin/stash.c:1347
d46c5519
JX
22203msgid "Cannot save the current index state"
22204msgstr "无法保存当前索引状态"
22205
65387fd5 22206#: builtin/stash.c:1356
d46c5519
JX
22207msgid "Cannot save the untracked files"
22208msgstr "无法保存未跟踪文件"
22209
65387fd5 22210#: builtin/stash.c:1367 builtin/stash.c:1386
d46c5519
JX
22211msgid "Cannot save the current worktree state"
22212msgstr "无法保存当前工作区状态"
22213
65387fd5
FZ
22214#: builtin/stash.c:1377
22215msgid "Cannot save the current staged state"
22216msgstr "无法保存当前暂存状态"
22217
22218#: builtin/stash.c:1414
d46c5519
JX
22219msgid "Cannot record working tree state"
22220msgstr "不能记录工作区状态"
22221
65387fd5 22222#: builtin/stash.c:1463
d46c5519
JX
22223msgid "Can't use --patch and --include-untracked or --all at the same time"
22224msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
22225
65387fd5
FZ
22226#: builtin/stash.c:1474
22227msgid "Can't use --staged and --include-untracked or --all at the same time"
22228msgstr "不能同时使用参数 --staged 和 --include-untracked 或 --all"
22229
22230#: builtin/stash.c:1492
d46c5519
JX
22231msgid "Did you forget to 'git add'?"
22232msgstr "您是否忘了执行 'git add'?"
22233
65387fd5 22234#: builtin/stash.c:1507
d46c5519
JX
22235msgid "No local changes to save"
22236msgstr "没有要保存的本地修改"
22237
65387fd5 22238#: builtin/stash.c:1514
d46c5519
JX
22239msgid "Cannot initialize stash"
22240msgstr "无法初始化贮藏"
22241
65387fd5 22242#: builtin/stash.c:1529
d46c5519
JX
22243msgid "Cannot save the current status"
22244msgstr "无法保存当前状态"
22245
65387fd5 22246#: builtin/stash.c:1534
d46c5519
JX
22247#, c-format
22248msgid "Saved working directory and index state %s"
22249msgstr "保存工作目录和索引状态 %s"
22250
65387fd5 22251#: builtin/stash.c:1627
d46c5519
JX
22252msgid "Cannot remove worktree changes"
22253msgstr "无法删除工作区变更"
22254
65387fd5 22255#: builtin/stash.c:1667 builtin/stash.c:1739
d46c5519
JX
22256msgid "keep index"
22257msgstr "保持索引"
22258
65387fd5
FZ
22259#: builtin/stash.c:1669 builtin/stash.c:1741
22260msgid "stash staged changes only"
22261msgstr "只贮藏暂存的变更"
22262
22263#: builtin/stash.c:1671 builtin/stash.c:1743
d46c5519
JX
22264msgid "stash in patch mode"
22265msgstr "以补丁模式贮藏"
22266
65387fd5 22267#: builtin/stash.c:1672 builtin/stash.c:1744
d46c5519
JX
22268msgid "quiet mode"
22269msgstr "静默模式"
22270
65387fd5 22271#: builtin/stash.c:1674 builtin/stash.c:1746
d46c5519
JX
22272msgid "include untracked files in stash"
22273msgstr "贮藏中包含未跟踪文件"
ef317cd5 22274
65387fd5 22275#: builtin/stash.c:1676 builtin/stash.c:1748
d46c5519
JX
22276msgid "include ignore files"
22277msgstr "包含忽略的文件"
ef317cd5 22278
65387fd5 22279#: builtin/stash.c:1783
349ede6a
JX
22280msgid ""
22281"the stash.useBuiltin support has been removed!\n"
22282"See its entry in 'git help config' for details."
22283msgstr ""
22284"对 stash.useBuiltin 的支持已被删除!\n"
22285"详见 'git help config' 中的条目。"
ef317cd5 22286
a4f16749 22287#: builtin/stripspace.c:18
94550ed3
JX
22288msgid "git stripspace [-s | --strip-comments]"
22289msgstr "git stripspace [-s | --strip-comments]"
22290
a4f16749 22291#: builtin/stripspace.c:19
94550ed3
JX
22292msgid "git stripspace [-c | --comment-lines]"
22293msgstr "git stripspace [-c | --comment-lines]"
22294
06991777 22295#: builtin/stripspace.c:37
94550ed3
JX
22296msgid "skip and remove all lines starting with comment character"
22297msgstr "跳过和移除所有的注释行"
22298
06991777 22299#: builtin/stripspace.c:40
276ceeaa 22300msgid "prepend comment character and space to each line"
94550ed3
JX
22301msgstr "为每一行的行首添加注释符和空格"
22302
65387fd5 22303#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
5b04ee3b
JX
22304#, c-format
22305msgid "Expecting a full ref name, got %s"
22306msgstr "期望一个完整的引用名称,却得到 %s"
22307
ec3d4607 22308#: builtin/submodule--helper.c:63
31e5e17b
JX
22309msgid "submodule--helper print-default-remote takes no arguments"
22310msgstr "submodule--helper print-default-remote 不带参数"
22311
ec3d4607 22312#: builtin/submodule--helper.c:101
5b04ee3b
JX
22313#, c-format
22314msgid "cannot strip one component off url '%s'"
22315msgstr "无法从 url '%s' 剥离一个组件"
22316
7e6630a7
FZ
22317#: builtin/submodule--helper.c:211
22318#, c-format
22319msgid ""
22320"could not look up configuration '%s'. Assuming this repository is its own "
22321"authoritative upstream."
22322msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
22323
65387fd5 22324#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
94550ed3
JX
22325msgid "alternative anchor for relative paths"
22326msgstr "相对路径的替代锚记(anchor)"
22327
7e6630a7 22328#: builtin/submodule--helper.c:410
94550ed3
JX
22329msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
22330msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
22331
7e6630a7
FZ
22332#: builtin/submodule--helper.c:468 builtin/submodule--helper.c:605
22333#: builtin/submodule--helper.c:628
5b04ee3b
JX
22334#, c-format
22335msgid "No url found for submodule path '%s' in .gitmodules"
7e6630a7 22336msgstr "在 .gitmodules 中未找到子模组路径 '%s' 的 url"
5b04ee3b 22337
7e6630a7 22338#: builtin/submodule--helper.c:520
c1ac5258
JX
22339#, c-format
22340msgid "Entering '%s'\n"
22341msgstr "进入 '%s'\n"
22342
7e6630a7 22343#: builtin/submodule--helper.c:523
c1ac5258
JX
22344#, c-format
22345msgid ""
22346"run_command returned non-zero status for %s\n"
22347"."
4c27fcb5
JX
22348msgstr ""
22349"对 %s 执行 run_command 返回非零值。\n"
22350"."
c1ac5258 22351
7e6630a7 22352#: builtin/submodule--helper.c:545
c1ac5258
JX
22353#, c-format
22354msgid ""
22355"run_command returned non-zero status while recursing in the nested "
22356"submodules of %s\n"
22357"."
4c27fcb5
JX
22358msgstr ""
22359"在递归 %s 的子模组执行 run_command 时返回非零值。\n"
22360"."
c1ac5258 22361
7e6630a7 22362#: builtin/submodule--helper.c:561
473eb541
JX
22363msgid "suppress output of entering each submodule command"
22364msgstr "抑制进入每一个子模组命令的输出"
c1ac5258 22365
7e6630a7
FZ
22366#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
22367#: builtin/submodule--helper.c:1453
473eb541 22368msgid "recurse into nested submodules"
c1ac5258
JX
22369msgstr "递归进入嵌套子模组中"
22370
7e6630a7 22371#: builtin/submodule--helper.c:568
d46c5519
JX
22372msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
22373msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
c1ac5258 22374
7e6630a7 22375#: builtin/submodule--helper.c:642
5b04ee3b
JX
22376#, c-format
22377msgid "Failed to register url for submodule path '%s'"
7e6630a7 22378msgstr "无法为子模组路径 '%s' 注册 url"
5b04ee3b 22379
7e6630a7 22380#: builtin/submodule--helper.c:646
5b04ee3b
JX
22381#, c-format
22382msgid "Submodule '%s' (%s) registered for path '%s'\n"
25c75902 22383msgstr "子模组 '%s'(%s)已对路径 '%s' 注册\n"
5b04ee3b 22384
7e6630a7 22385#: builtin/submodule--helper.c:656
aef18cc6 22386#, c-format
5b04ee3b 22387msgid "warning: command update mode suggested for submodule '%s'\n"
aef18cc6 22388msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
5b04ee3b 22389
7e6630a7 22390#: builtin/submodule--helper.c:663
5b04ee3b
JX
22391#, c-format
22392msgid "Failed to register update mode for submodule path '%s'"
7e6630a7 22393msgstr "无法为子模组路径 '%s' 注册更新模式"
5b04ee3b 22394
7e6630a7 22395#: builtin/submodule--helper.c:685
473eb541
JX
22396msgid "suppress output for initializing a submodule"
22397msgstr "抑制子模组初始化的输出"
5b04ee3b 22398
7e6630a7 22399#: builtin/submodule--helper.c:690
d46c5519
JX
22400msgid "git submodule--helper init [<options>] [<path>]"
22401msgstr "git submodule--helper init [<选项>] [<路径>]"
5b04ee3b 22402
7e6630a7 22403#: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
94550ed3
JX
22404#, c-format
22405msgid "no submodule mapping found in .gitmodules for path '%s'"
22406msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
22407
7e6630a7 22408#: builtin/submodule--helper.c:811
5809aa05
JX
22409#, c-format
22410msgid "could not resolve HEAD ref inside the submodule '%s'"
22411msgstr "无法解析子模组 '%s' 的 HEAD 引用"
22412
7e6630a7 22413#: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
5809aa05
JX
22414#, c-format
22415msgid "failed to recurse into submodule '%s'"
65387fd5 22416msgstr "无法递归进入子模组 '%s'"
5809aa05 22417
65387fd5 22418#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
473eb541
JX
22419msgid "suppress submodule status output"
22420msgstr "抑制子模组状态输出"
5809aa05 22421
7e6630a7 22422#: builtin/submodule--helper.c:863
5809aa05 22423msgid ""
473eb541 22424"use commit stored in the index instead of the one stored in the submodule "
5809aa05
JX
22425"HEAD"
22426msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交"
22427
7e6630a7 22428#: builtin/submodule--helper.c:869
5809aa05
JX
22429msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
22430msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
22431
7e6630a7 22432#: builtin/submodule--helper.c:893
5809aa05
JX
22433msgid "git submodule--helper name <path>"
22434msgstr "git submodule--helper name <路径>"
22435
7e6630a7 22436#: builtin/submodule--helper.c:965
d9488fea
JX
22437#, c-format
22438msgid "* %s %s(blob)->%s(submodule)"
22439msgstr "* %s %s(数据对象)->%s(子模组)"
22440
7e6630a7 22441#: builtin/submodule--helper.c:968
d9488fea
JX
22442#, c-format
22443msgid "* %s %s(submodule)->%s(blob)"
22444msgstr "* %s %s(子模组)->%s(数据对象)"
22445
7e6630a7 22446#: builtin/submodule--helper.c:981
d9488fea
JX
22447#, c-format
22448msgid "%s"
22449msgstr "%s"
22450
7e6630a7 22451#: builtin/submodule--helper.c:1031
d9488fea
JX
22452#, c-format
22453msgid "couldn't hash object from '%s'"
22454msgstr "不能从 '%s' 创建哈希对象"
22455
7e6630a7 22456#: builtin/submodule--helper.c:1035
d9488fea
JX
22457#, c-format
22458msgid "unexpected mode %o\n"
22459msgstr "意外的模式 %o\n"
22460
7e6630a7 22461#: builtin/submodule--helper.c:1276
d9488fea
JX
22462msgid "use the commit stored in the index instead of the submodule HEAD"
22463msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交"
22464
7e6630a7 22465#: builtin/submodule--helper.c:1278
ec3d4607 22466msgid "compare the commit in the index with that in the submodule HEAD"
d9488fea
JX
22467msgstr "比较存储在索引和子模组 HEAD 中的提交"
22468
7e6630a7 22469#: builtin/submodule--helper.c:1280
d9488fea
JX
22470msgid "skip submodules with 'ignore_config' value set to 'all'"
22471msgstr "跳过设置了 'ignore_config' 为 'all' 的子模组"
22472
7e6630a7 22473#: builtin/submodule--helper.c:1282
d9488fea
JX
22474msgid "limit the summary size"
22475msgstr "限制总结的大小"
22476
7e6630a7 22477#: builtin/submodule--helper.c:1287
d9488fea
JX
22478msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
22479msgstr "git submodule--helper summary [<选项>] [<提交>] [--] [<路径>]"
22480
7e6630a7 22481#: builtin/submodule--helper.c:1311
d9488fea
JX
22482msgid "could not fetch a revision for HEAD"
22483msgstr "不能为 HEAD 获取一个版本"
22484
7e6630a7 22485#: builtin/submodule--helper.c:1373
31e5e17b
JX
22486#, c-format
22487msgid "Synchronizing submodule url for '%s'\n"
22488msgstr "为 '%s' 同步子模组 url\n"
22489
7e6630a7 22490#: builtin/submodule--helper.c:1379
31e5e17b
JX
22491#, c-format
22492msgid "failed to register url for submodule path '%s'"
22493msgstr "无法为子模组路径 '%s' 注册 url"
22494
7e6630a7 22495#: builtin/submodule--helper.c:1393
31e5e17b
JX
22496#, c-format
22497msgid "failed to get the default remote for submodule '%s'"
22498msgstr "无法得到子模组 '%s' 的默认远程关联"
22499
7e6630a7 22500#: builtin/submodule--helper.c:1404
31e5e17b
JX
22501#, c-format
22502msgid "failed to update remote for submodule '%s'"
22503msgstr "无法为子模组 '%s' 更新远程关联"
22504
7e6630a7 22505#: builtin/submodule--helper.c:1451
473eb541
JX
22506msgid "suppress output of synchronizing submodule url"
22507msgstr "抑制子模组 URL 同步的输出"
31e5e17b 22508
7e6630a7 22509#: builtin/submodule--helper.c:1458
31e5e17b
JX
22510msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
22511msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
22512
65387fd5 22513#: builtin/submodule--helper.c:1508
31e5e17b
JX
22514#, c-format
22515msgid ""
65387fd5
FZ
22516"Submodule work tree '%s' contains a .git directory. This will be replaced "
22517"with a .git file by using absorbgitdirs."
31e5e17b 22518msgstr ""
65387fd5
FZ
22519"子模组工作区 '%s' 包含一个 .git 目录。这将会用 absorbgitdirs 子命令替换成一"
22520"个 .git 文件。"
31e5e17b 22521
65387fd5 22522#: builtin/submodule--helper.c:1525
31e5e17b
JX
22523#, c-format
22524msgid ""
22525"Submodule work tree '%s' contains local modifications; use '-f' to discard "
22526"them"
22527msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们"
22528
65387fd5 22529#: builtin/submodule--helper.c:1533
31e5e17b
JX
22530#, c-format
22531msgid "Cleared directory '%s'\n"
22532msgstr "已清除目录 '%s'\n"
22533
65387fd5 22534#: builtin/submodule--helper.c:1535
31e5e17b
JX
22535#, c-format
22536msgid "Could not remove submodule work tree '%s'\n"
22537msgstr "无法移除子模组工作区 '%s'\n"
22538
65387fd5 22539#: builtin/submodule--helper.c:1546
31e5e17b
JX
22540#, c-format
22541msgid "could not create empty submodule directory %s"
22542msgstr "不能创建空的子模组目录 %s"
22543
65387fd5 22544#: builtin/submodule--helper.c:1562
31e5e17b
JX
22545#, c-format
22546msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
22547msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
22548
65387fd5 22549#: builtin/submodule--helper.c:1591
473eb541 22550msgid "remove submodule working trees even if they contain local changes"
31e5e17b
JX
22551msgstr "删除子模组工作区,即使包含本地修改"
22552
65387fd5 22553#: builtin/submodule--helper.c:1592
473eb541 22554msgid "unregister all submodules"
31e5e17b
JX
22555msgstr "将所有子模组取消注册"
22556
65387fd5 22557#: builtin/submodule--helper.c:1597
31e5e17b
JX
22558msgid ""
22559"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
22560msgstr ""
22561"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
22562
65387fd5 22563#: builtin/submodule--helper.c:1611
31e5e17b
JX
22564msgid "Use '--all' if you really want to deinitialize all submodules"
22565msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
22566
65387fd5 22567#: builtin/submodule--helper.c:1656
ddc12c42
JX
22568msgid ""
22569"An alternate computed from a superproject's alternate is invalid.\n"
22570"To allow Git to clone without an alternate in such a case, set\n"
22571"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
22572"'--reference-if-able' instead of '--reference'."
22573msgstr ""
22574"从一个父项目的备用仓库中计算出的备用仓库无效。\n"
22575"此场景下,设置 submodule.alternateErrorStrategy 为 'info',以允许\n"
22576"Git 不使用备用仓库克隆,或者等效地使用 '--reference-if-able' 而非\n"
22577"'--reference' 来克隆。"
22578
65387fd5 22579#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
a0b6b246
JX
22580#, c-format
22581msgid "submodule '%s' cannot add alternate: %s"
22582msgstr "子模组 '%s' 不能添加仓库备选:%s"
22583
65387fd5 22584#: builtin/submodule--helper.c:1740
a0b6b246
JX
22585#, c-format
22586msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
22587msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
22588
65387fd5 22589#: builtin/submodule--helper.c:1747
a0b6b246
JX
22590#, c-format
22591msgid "Value '%s' for submodule.alternateLocation is not recognized"
ae4e099e 22592msgstr "不能识别 submodule.alternateLocation 的取值 '%s'"
a0b6b246 22593
65387fd5 22594#: builtin/submodule--helper.c:1772
ec3d4607
JX
22595#, c-format
22596msgid "refusing to create/use '%s' in another submodule's git dir"
22597msgstr "拒绝在另一个子模组的 git 目录中创建/使用 '%s'"
22598
65387fd5 22599#: builtin/submodule--helper.c:1813
ec3d4607
JX
22600#, c-format
22601msgid "clone of '%s' into submodule path '%s' failed"
22602msgstr "无法克隆 '%s' 到子模组路径 '%s'"
22603
65387fd5 22604#: builtin/submodule--helper.c:1818
ec3d4607
JX
22605#, c-format
22606msgid "directory not empty: '%s'"
22607msgstr "目录非空:'%s'"
22608
65387fd5 22609#: builtin/submodule--helper.c:1830
ec3d4607
JX
22610#, c-format
22611msgid "could not get submodule directory for '%s'"
22612msgstr "无法得到 '%s' 的子模组目录"
22613
65387fd5 22614#: builtin/submodule--helper.c:1862
94550ed3
JX
22615msgid "where the new submodule will be cloned to"
22616msgstr "新的子模组将要克隆的路径"
22617
65387fd5 22618#: builtin/submodule--helper.c:1865
94550ed3
JX
22619msgid "name of the new submodule"
22620msgstr "新子模组的名称"
22621
65387fd5 22622#: builtin/submodule--helper.c:1868
94550ed3
JX
22623msgid "url where to clone the submodule from"
22624msgstr "克隆子模组的 url 地址"
22625
65387fd5 22626#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
94550ed3
JX
22627msgid "depth for shallow clones"
22628msgstr "浅克隆的深度"
22629
65387fd5
FZ
22630#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
22631#: builtin/submodule--helper.c:3258
a0b6b246 22632msgid "force cloning progress"
29004bbb 22633msgstr "强制显示克隆进度"
a0b6b246 22634
65387fd5 22635#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
ddc12c42
JX
22636msgid "disallow cloning into non-empty directory"
22637msgstr "不允许克隆到一个非空目录"
22638
65387fd5 22639#: builtin/submodule--helper.c:1888
94550ed3
JX
22640msgid ""
22641"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
2b472aae
JX
22642"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
22643"<url> --path <path>"
5c57d762
JX
22644msgstr ""
22645"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
2b472aae 22646"[--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>"
94550ed3 22647
65387fd5 22648#: builtin/submodule--helper.c:1925
4c27fcb5
JX
22649#, c-format
22650msgid "Invalid update mode '%s' for submodule path '%s'"
7e6630a7 22651msgstr "子模组路径 '%2$s' 的更新模式 '%1$s' 无效"
4c27fcb5 22652
65387fd5 22653#: builtin/submodule--helper.c:1929
4c27fcb5
JX
22654#, c-format
22655msgid "Invalid update mode '%s' configured for submodule path '%s'"
7e6630a7 22656msgstr "为子模组路径 '%2$s' 配置的更新模式 '%1$s' 无效"
4c27fcb5 22657
65387fd5 22658#: builtin/submodule--helper.c:2044
5b04ee3b
JX
22659#, c-format
22660msgid "Submodule path '%s' not initialized"
7e6630a7 22661msgstr "子模组路径 '%s' 尚未初始化"
5b04ee3b 22662
65387fd5 22663#: builtin/submodule--helper.c:2048
5b04ee3b
JX
22664msgid "Maybe you want to use 'update --init'?"
22665msgstr "也许您想要执行 'update --init'?"
22666
65387fd5 22667#: builtin/submodule--helper.c:2078
5b04ee3b
JX
22668#, c-format
22669msgid "Skipping unmerged submodule %s"
22670msgstr "略过未合并的子模组 %s"
22671
65387fd5 22672#: builtin/submodule--helper.c:2107
5b04ee3b
JX
22673#, c-format
22674msgid "Skipping submodule '%s'"
22675msgstr "略过子模组 '%s'"
22676
65387fd5 22677#: builtin/submodule--helper.c:2257
5c57d762
JX
22678#, c-format
22679msgid "Failed to clone '%s'. Retry scheduled"
22680msgstr "克隆 '%s' 失败。按计划重试"
22681
65387fd5 22682#: builtin/submodule--helper.c:2268
5c57d762
JX
22683#, c-format
22684msgid "Failed to clone '%s' a second time, aborting"
22685msgstr "第二次尝试克隆 '%s' 失败,退出"
22686
65387fd5 22687#: builtin/submodule--helper.c:2373
7e6630a7
FZ
22688#, c-format
22689msgid "Unable to checkout '%s' in submodule path '%s'"
22690msgstr "无法在子模组路径 '%2$s' 中检出 '%1$s'"
22691
65387fd5 22692#: builtin/submodule--helper.c:2377
7e6630a7
FZ
22693#, c-format
22694msgid "Unable to rebase '%s' in submodule path '%s'"
22695msgstr "无法在子模组路径 '%2$s' 中变基 '%1$s'"
22696
65387fd5 22697#: builtin/submodule--helper.c:2381
7e6630a7
FZ
22698#, c-format
22699msgid "Unable to merge '%s' in submodule path '%s'"
22700msgstr "无法在子模组路径 '%2$s' 中合并 '%1$s'"
22701
65387fd5 22702#: builtin/submodule--helper.c:2385
7e6630a7
FZ
22703#, c-format
22704msgid "Execution of '%s %s' failed in submodule path '%s'"
22705msgstr "在子模组路径 '%3$s' 中执行 '%1$s %2$s' 失败"
22706
65387fd5 22707#: builtin/submodule--helper.c:2409
7e6630a7
FZ
22708#, c-format
22709msgid "Submodule path '%s': checked out '%s'\n"
22710msgstr "子模组路径 '%s':检出 '%s'\n"
22711
65387fd5 22712#: builtin/submodule--helper.c:2413
7e6630a7
FZ
22713#, c-format
22714msgid "Submodule path '%s': rebased into '%s'\n"
22715msgstr "子模组路径 '%s':变基至 '%s'\n"
22716
65387fd5 22717#: builtin/submodule--helper.c:2417
7e6630a7
FZ
22718#, c-format
22719msgid "Submodule path '%s': merged in '%s'\n"
22720msgstr "子模组路径 '%s':合并入 '%s'\n"
22721
65387fd5 22722#: builtin/submodule--helper.c:2421
7e6630a7
FZ
22723#, c-format
22724msgid "Submodule path '%s': '%s %s'\n"
22725msgstr "子模组路径 '%s':'%s %s'\n"
22726
65387fd5 22727#: builtin/submodule--helper.c:2445
7e6630a7
FZ
22728#, c-format
22729msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
22730msgstr "无法在子模组路径 '%s' 中获取;尝试直接获取 %s:"
22731
65387fd5 22732#: builtin/submodule--helper.c:2454
7e6630a7
FZ
22733#, c-format
22734msgid ""
22735"Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
22736"of that commit failed."
22737msgstr "获取了子模组路径 '%s',但是它没有包含 %s。直接获取该提交失败。"
22738
65387fd5
FZ
22739#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
22740#: builtin/submodule--helper.c:2813
5b04ee3b
JX
22741msgid "path into the working tree"
22742msgstr "到工作区的路径"
22743
65387fd5 22744#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
5b04ee3b
JX
22745msgid "path into the working tree, across nested submodule boundaries"
22746msgstr "工作区中的路径,递归嵌套子模组"
22747
65387fd5 22748#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
5b04ee3b
JX
22749msgid "rebase, merge, checkout or none"
22750msgstr "rebase、merge、checkout 或 none"
22751
65387fd5 22752#: builtin/submodule--helper.c:2518
473eb541 22753msgid "create a shallow clone truncated to the specified number of revisions"
5b04ee3b
JX
22754msgstr "创建一个指定深度的浅克隆"
22755
65387fd5 22756#: builtin/submodule--helper.c:2521
5b04ee3b
JX
22757msgid "parallel jobs"
22758msgstr "并发任务"
22759
65387fd5 22760#: builtin/submodule--helper.c:2523
5c57d762 22761msgid "whether the initial clone should follow the shallow recommendation"
9a4b694c 22762msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
5c57d762 22763
65387fd5 22764#: builtin/submodule--helper.c:2524
5b04ee3b
JX
22765msgid "don't print cloning progress"
22766msgstr "不要输出克隆进度"
94550ed3 22767
65387fd5 22768#: builtin/submodule--helper.c:2535
a5cd71ca
JX
22769msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
22770msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]"
5b04ee3b 22771
65387fd5 22772#: builtin/submodule--helper.c:2548
5b04ee3b
JX
22773msgid "bad value for update parameter"
22774msgstr "update 参数取值错误"
22775
65387fd5 22776#: builtin/submodule--helper.c:2566
7e6630a7
FZ
22777msgid "suppress output for update by rebase or merge"
22778msgstr "抑制变基或合并更新的输出"
22779
65387fd5 22780#: builtin/submodule--helper.c:2567
7e6630a7
FZ
22781msgid "force checkout updates"
22782msgstr "强制检出更新"
22783
65387fd5 22784#: builtin/submodule--helper.c:2569
7e6630a7
FZ
22785msgid "don't fetch new objects from the remote site"
22786msgstr "不要从远程地址获取新对象"
22787
65387fd5 22788#: builtin/submodule--helper.c:2571
7e6630a7
FZ
22789msgid "overrides update mode in case the repository is a fresh clone"
22790msgstr "当仓库是新的克隆时,覆盖更新模式"
22791
65387fd5 22792#: builtin/submodule--helper.c:2572
7e6630a7
FZ
22793msgid "depth for shallow fetch"
22794msgstr "浅获取的深度"
22795
65387fd5 22796#: builtin/submodule--helper.c:2582
7e6630a7
FZ
22797msgid "sha1"
22798msgstr "sha1"
22799
65387fd5 22800#: builtin/submodule--helper.c:2583
7e6630a7
FZ
22801msgid "SHA1 expected by superproject"
22802msgstr "上层项目期待的 SHA1"
22803
65387fd5 22804#: builtin/submodule--helper.c:2585
7e6630a7
FZ
22805msgid "subsha1"
22806msgstr "subsha1"
22807
65387fd5 22808#: builtin/submodule--helper.c:2586
7e6630a7
FZ
22809msgid "SHA1 of submodule's HEAD"
22810msgstr "子模块头指针的 SHA1"
22811
65387fd5 22812#: builtin/submodule--helper.c:2592
7e6630a7
FZ
22813msgid "git submodule--helper run-update-procedure [<options>] <path>"
22814msgstr "git submodule--helper run-update-procedure [<选项>] <路径>"
22815
65387fd5 22816#: builtin/submodule--helper.c:2663
5c57d762
JX
22817#, c-format
22818msgid ""
22819"Submodule (%s) branch configured to inherit branch from superproject, but "
22820"the superproject is not on any branch"
22821msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
22822
65387fd5 22823#: builtin/submodule--helper.c:2781
4c27fcb5
JX
22824#, c-format
22825msgid "could not get a repository handle for submodule '%s'"
22826msgstr "无法获得子模组 '%s' 的仓库句柄"
22827
65387fd5 22828#: builtin/submodule--helper.c:2814
1a79b2f1
JX
22829msgid "recurse into submodules"
22830msgstr "在子模组中递归"
22831
65387fd5 22832#: builtin/submodule--helper.c:2820
d46c5519
JX
22833msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
22834msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
1a79b2f1 22835
65387fd5 22836#: builtin/submodule--helper.c:2876
4c27fcb5
JX
22837msgid "check if it is safe to write to the .gitmodules file"
22838msgstr "检查写入 .gitmodules 文件是否安全"
22839
65387fd5 22840#: builtin/submodule--helper.c:2879
d46c5519
JX
22841msgid "unset the config in the .gitmodules file"
22842msgstr "取消 .gitmodules 文件中的设置"
22843
65387fd5 22844#: builtin/submodule--helper.c:2884
d46c5519
JX
22845msgid "git submodule--helper config <name> [<value>]"
22846msgstr "git submodule--helper config <名称> [<值>]"
4c27fcb5 22847
65387fd5 22848#: builtin/submodule--helper.c:2885
d46c5519
JX
22849msgid "git submodule--helper config --unset <name>"
22850msgstr "git submodule--helper config --unset <名称>"
22851
65387fd5 22852#: builtin/submodule--helper.c:2886
4c27fcb5
JX
22853msgid "git submodule--helper config --check-writeable"
22854msgstr "git submodule--helper config --check-writeable"
22855
65387fd5
FZ
22856#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
22857#: builtin/submodule--helper.c:3277
4c27fcb5
JX
22858msgid "please make sure that the .gitmodules file is in the working tree"
22859msgstr "请确认 .gitmodules 文件在工作区里"
22860
65387fd5 22861#: builtin/submodule--helper.c:2921
473eb541
JX
22862msgid "suppress output for setting url of a submodule"
22863msgstr "抑制设置子模组 URL 的输出"
349ede6a 22864
65387fd5 22865#: builtin/submodule--helper.c:2925
349ede6a
JX
22866msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
22867msgstr "git submodule--helper set-url [--quiet] <路径> <新地址>"
22868
65387fd5 22869#: builtin/submodule--helper.c:2958
7157c2b5
JX
22870msgid "set the default tracking branch to master"
22871msgstr "设置默认跟踪分支为 master"
22872
65387fd5 22873#: builtin/submodule--helper.c:2960
7157c2b5
JX
22874msgid "set the default tracking branch"
22875msgstr "设置默认跟踪分支"
22876
65387fd5 22877#: builtin/submodule--helper.c:2964
7157c2b5
JX
22878msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
22879msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <路径>"
22880
65387fd5 22881#: builtin/submodule--helper.c:2965
7157c2b5
JX
22882msgid ""
22883"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
d9488fea
JX
22884msgstr ""
22885"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <分支> <路径>"
7157c2b5 22886
65387fd5 22887#: builtin/submodule--helper.c:2972
7157c2b5
JX
22888msgid "--branch or --default required"
22889msgstr "需要 --branch 或 --default"
22890
65387fd5 22891#: builtin/submodule--helper.c:3038
ec3d4607
JX
22892#, c-format
22893msgid "Adding existing repo at '%s' to the index\n"
22894msgstr "向索引中添加位于 '%s' 的已存在的仓库\n"
22895
65387fd5 22896#: builtin/submodule--helper.c:3041
ec3d4607
JX
22897#, c-format
22898msgid "'%s' already exists and is not a valid git repo"
22899msgstr "'%s' 已存在并且不是一个有效的 git 仓库"
22900
65387fd5 22901#: builtin/submodule--helper.c:3054
ec3d4607 22902#, c-format
7e6630a7
FZ
22903msgid "A git directory for '%s' is found locally with remote(s):\n"
22904msgstr "发现一个本地 git 目录 '%s' 及其远程仓库:\n"
ec3d4607 22905
65387fd5 22906#: builtin/submodule--helper.c:3061
ec3d4607
JX
22907#, c-format
22908msgid ""
22909"If you want to reuse this local git directory instead of cloning again from\n"
22910" %s\n"
22911"use the '--force' option. If the local git directory is not the correct "
22912"repo\n"
7e6630a7
FZ
22913"or you are unsure what this means choose another name with the '--name' "
22914"option."
ec3d4607
JX
22915msgstr ""
22916"如果您想要重用这个本地 git 目录而非重新克隆自\n"
22917" %s\n"
22918"使用 '--force' 选项。如果本地 git 目录不是正确的仓库,或者如果您不确定这里\n"
7e6630a7 22919"的含义,使用 '--name' 选项指定另外的名称。"
ec3d4607 22920
65387fd5 22921#: builtin/submodule--helper.c:3073
ec3d4607
JX
22922#, c-format
22923msgid "Reactivating local git directory for submodule '%s'\n"
22924msgstr "为子模组 '%s' 重新激活本地 git 目录\n"
22925
65387fd5 22926#: builtin/submodule--helper.c:3110
ec3d4607
JX
22927#, c-format
22928msgid "unable to checkout submodule '%s'"
22929msgstr "无法检出子模组 '%s'"
22930
65387fd5 22931#: builtin/submodule--helper.c:3149
7e6630a7
FZ
22932#, c-format
22933msgid "Failed to add submodule '%s'"
22934msgstr "无法添加子模组 '%s'"
ec3d4607 22935
65387fd5
FZ
22936#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
22937#: builtin/submodule--helper.c:3166
7e6630a7
FZ
22938#, c-format
22939msgid "Failed to register submodule '%s'"
22940msgstr "无法注册子模组 '%s'"
ec3d4607 22941
65387fd5 22942#: builtin/submodule--helper.c:3222
1a79b2f1 22943#, c-format
7e6630a7
FZ
22944msgid "'%s' already exists in the index"
22945msgstr "'%s' 已经存在于索引中"
1a79b2f1 22946
65387fd5 22947#: builtin/submodule--helper.c:3225
94550ed3 22948#, c-format
7e6630a7
FZ
22949msgid "'%s' already exists in the index and is not a submodule"
22950msgstr "'%s' 已经存在于索引中且不是一个子模组"
22951
65387fd5 22952#: builtin/submodule--helper.c:3254
7e6630a7
FZ
22953msgid "branch of repository to add as submodule"
22954msgstr "要添加为子模组的仓库的分支"
22955
65387fd5 22956#: builtin/submodule--helper.c:3255
7e6630a7
FZ
22957msgid "allow adding an otherwise ignored submodule path"
22958msgstr "允许添加一个被忽略的子模组路径"
22959
65387fd5 22960#: builtin/submodule--helper.c:3257
7e6630a7
FZ
22961msgid "print only error messages"
22962msgstr "只打印错误消息"
22963
65387fd5 22964#: builtin/submodule--helper.c:3261
7e6630a7
FZ
22965msgid "borrow the objects from reference repositories"
22966msgstr "从引用仓库中借用对象"
22967
65387fd5 22968#: builtin/submodule--helper.c:3263
7e6630a7
FZ
22969msgid ""
22970"sets the submodule’s name to the given string instead of defaulting to its "
22971"path"
22972msgstr "将子模组的名称设置为给定的字符串,而非默认为其路径"
22973
65387fd5 22974#: builtin/submodule--helper.c:3270
7e6630a7
FZ
22975msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
22976msgstr "git submodule--helper add [<选项>] [--] <仓库> [<路径>]"
22977
65387fd5 22978#: builtin/submodule--helper.c:3298
7e6630a7
FZ
22979msgid "Relative path can only be used from the toplevel of the working tree"
22980msgstr "只能在工作区的顶级目录中使用相对路径"
22981
65387fd5 22982#: builtin/submodule--helper.c:3306
7e6630a7
FZ
22983#, c-format
22984msgid "repo URL: '%s' must be absolute or begin with ./|../"
22985msgstr "仓库 URL:'%s' 必须是绝对路径或以 ./|../ 起始"
22986
65387fd5 22987#: builtin/submodule--helper.c:3341
7e6630a7
FZ
22988#, c-format
22989msgid "'%s' is not a valid submodule name"
22990msgstr "'%s' 不是一个有效的子模组名称"
22991
65387fd5 22992#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
7e6630a7
FZ
22993#, c-format
22994msgid "%s doesn't support --super-prefix"
22995msgstr "%s 不支持 --super-prefix"
22996
65387fd5 22997#: builtin/submodule--helper.c:3411
7e6630a7
FZ
22998#, c-format
22999msgid "'%s' is not a valid submodule--helper subcommand"
23000msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
94550ed3 23001
a4f16749 23002#: builtin/symbolic-ref.c:8
814ff314
JX
23003msgid "git symbolic-ref [<options>] <name> [<ref>]"
23004msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
07432cef 23005
a4f16749 23006#: builtin/symbolic-ref.c:9
814ff314
JX
23007msgid "git symbolic-ref -d [-q] <name>"
23008msgstr "git symbolic-ref -d [-q] <名称>"
ef317cd5 23009
33b62fba 23010#: builtin/symbolic-ref.c:42
ef317cd5 23011msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
23012msgstr "不显示非符号(分离的)引用的错误信息"
23013
33b62fba 23014#: builtin/symbolic-ref.c:43
07432cef
WS
23015msgid "delete symbolic ref"
23016msgstr "删除符号引用"
ef317cd5 23017
33b62fba 23018#: builtin/symbolic-ref.c:44
ef317cd5 23019msgid "shorten ref output"
6937cb4e 23020msgstr "缩短引用输出"
ef317cd5 23021
7e6630a7 23022#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
ef317cd5 23023msgid "reason"
07432cef 23024msgstr "原因"
ef317cd5 23025
7e6630a7 23026#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505
ef317cd5 23027msgid "reason of the update"
07432cef 23028msgstr "更新的原因"
ef317cd5 23029
c1ac5258 23030#: builtin/tag.c:25
ef317cd5 23031msgid ""
d46c5519 23032"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
7e6630a7 23033" <tagname> [<head>]"
814ff314 23034msgstr ""
d46c5519 23035"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n"
7e6630a7 23036" <标签名> [<头>]"
ef317cd5 23037
d46c5519 23038#: builtin/tag.c:27
ef317cd5 23039msgid "git tag -d <tagname>..."
07432cef 23040msgstr "git tag -d <标签名>..."
ef317cd5 23041
d46c5519 23042#: builtin/tag.c:28
ef317cd5 23043msgid ""
87cb7997
JX
23044"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
23045"points-at <object>]\n"
7e6630a7 23046" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
d9488fea 23047"[<pattern>...]"
ef317cd5 23048msgstr ""
87cb7997
JX
23049"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
23050"at <对象>]\n"
7e6630a7 23051" [--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]"
ef317cd5 23052
d46c5519 23053#: builtin/tag.c:30
1a79b2f1
JX
23054msgid "git tag -v [--format=<format>] <tagname>..."
23055msgstr "git tag -v [--format=<格式>] <标签名>..."
ef317cd5 23056
33b62fba 23057#: builtin/tag.c:100
c04f5ac3
JX
23058#, c-format
23059msgid "tag '%s' not found."
55a16ee4 23060msgstr "未发现标签 '%s'。"
c04f5ac3 23061
33b62fba 23062#: builtin/tag.c:135
c04f5ac3
JX
23063#, c-format
23064msgid "Deleted tag '%s' (was %s)\n"
55a16ee4 23065msgstr "已删除标签 '%s'(曾为 %s)\n"
c04f5ac3 23066
33b62fba 23067#: builtin/tag.c:170
a77c07d9 23068#, c-format
c04f5ac3
JX
23069msgid ""
23070"\n"
6acbf033
JX
23071"Write a message for tag:\n"
23072" %s\n"
a77c07d9 23073"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
23074msgstr ""
23075"\n"
55a16ee4 23076"输入一个标签说明:\n"
6acbf033 23077" %s\n"
a77c07d9 23078"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 23079
33b62fba 23080#: builtin/tag.c:174
a77c07d9 23081#, c-format
c04f5ac3
JX
23082msgid ""
23083"\n"
6acbf033
JX
23084"Write a message for tag:\n"
23085" %s\n"
a77c07d9 23086"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 23087"want to.\n"
c04f5ac3
JX
23088msgstr ""
23089"\n"
55a16ee4 23090"输入一个标签说明:\n"
6acbf033 23091" %s\n"
a77c07d9 23092"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 23093
65387fd5 23094#: builtin/tag.c:240
c04f5ac3 23095msgid "unable to sign the tag"
55a16ee4 23096msgstr "无法签署标签"
c04f5ac3 23097
65387fd5 23098#: builtin/tag.c:258
d46c5519
JX
23099#, c-format
23100msgid ""
23101"You have created a nested tag. The object referred to by your new tag is\n"
23102"already a tag. If you meant to tag the object that it points to, use:\n"
23103"\n"
23104"\tgit tag -f %s %s^{}"
23105msgstr ""
23106"您创建了一个嵌套的标签。您的新标签指向的对象已经是一个标签。如果您想要\n"
23107"对其指向的目标创建标签,使用:\n"
23108"\n"
23109"\tgit tag -f %s %s^{}"
23110
65387fd5 23111#: builtin/tag.c:274
c04f5ac3 23112msgid "bad object type."
90e6ef53 23113msgstr "坏的对象类型。"
c04f5ac3 23114
65387fd5 23115#: builtin/tag.c:325
c04f5ac3 23116msgid "no tag message?"
55a16ee4 23117msgstr "无标签说明?"
c04f5ac3 23118
65387fd5 23119#: builtin/tag.c:332
c04f5ac3
JX
23120#, c-format
23121msgid "The tag message has been left in %s\n"
55a16ee4 23122msgstr "标签说明被保留在 %s\n"
c04f5ac3 23123
7e6630a7 23124#: builtin/tag.c:444
ef317cd5 23125msgid "list tag names"
55a16ee4 23126msgstr "列出标签名称"
ef317cd5 23127
7e6630a7 23128#: builtin/tag.c:446
ef317cd5 23129msgid "print <n> lines of each tag message"
55a16ee4 23130msgstr "每个标签信息打印 <n> 行"
ef317cd5 23131
7e6630a7 23132#: builtin/tag.c:448
ef317cd5 23133msgid "delete tags"
55a16ee4 23134msgstr "删除标签"
ef317cd5 23135
7e6630a7 23136#: builtin/tag.c:449
ef317cd5 23137msgid "verify tags"
55a16ee4 23138msgstr "验证标签"
ef317cd5 23139
7e6630a7 23140#: builtin/tag.c:451
ef317cd5 23141msgid "Tag creation options"
55a16ee4 23142msgstr "标签创建选项"
ef317cd5 23143
7e6630a7 23144#: builtin/tag.c:453
ef317cd5 23145msgid "annotated tag, needs a message"
55a16ee4 23146msgstr "附注标签,需要一个说明"
ef317cd5 23147
7e6630a7 23148#: builtin/tag.c:455
ef317cd5 23149msgid "tag message"
55a16ee4 23150msgstr "标签说明"
ef317cd5 23151
7e6630a7 23152#: builtin/tag.c:457
31e5e17b
JX
23153msgid "force edit of tag message"
23154msgstr "强制编辑标签说明"
23155
7e6630a7 23156#: builtin/tag.c:458
ef317cd5 23157msgid "annotated and GPG-signed tag"
55a16ee4 23158msgstr "附注并附加 GPG 签名的标签"
ef317cd5 23159
7e6630a7 23160#: builtin/tag.c:461
ef317cd5 23161msgid "use another key to sign the tag"
55a16ee4 23162msgstr "使用另外的私钥签名该标签"
ef317cd5 23163
7e6630a7 23164#: builtin/tag.c:462
ef317cd5 23165msgid "replace the tag if exists"
55a16ee4 23166msgstr "如果存在,替换现有的标签"
ef317cd5 23167
7e6630a7 23168#: builtin/tag.c:463 builtin/update-ref.c:511
03ea3327 23169msgid "create a reflog"
1b7f4a34
JX
23170msgstr "创建引用日志"
23171
7e6630a7 23172#: builtin/tag.c:465
814ff314 23173msgid "Tag listing options"
55a16ee4 23174msgstr "标签列表选项"
814ff314 23175
7e6630a7 23176#: builtin/tag.c:466
ef317cd5 23177msgid "show tag list in columns"
55a16ee4 23178msgstr "以列的方式显示标签列表"
ef317cd5 23179
7e6630a7 23180#: builtin/tag.c:467 builtin/tag.c:469
ef317cd5 23181msgid "print only tags that contain the commit"
87cb7997 23182msgstr "只打印包含该提交的标签"
ef317cd5 23183
7e6630a7 23184#: builtin/tag.c:468 builtin/tag.c:470
87cb7997
JX
23185msgid "print only tags that don't contain the commit"
23186msgstr "只打印不包含该提交的标签"
23187
7e6630a7 23188#: builtin/tag.c:471
94550ed3
JX
23189msgid "print only tags that are merged"
23190msgstr "只打印已经合并的标签"
23191
7e6630a7 23192#: builtin/tag.c:472
94550ed3
JX
23193msgid "print only tags that are not merged"
23194msgstr "只打印尚未合并的标签"
23195
7e6630a7 23196#: builtin/tag.c:476
ef317cd5 23197msgid "print only tags of the object"
87cb7997 23198msgstr "只打印指向该对象的标签"
ef317cd5 23199
65387fd5
FZ
23200#: builtin/tag.c:558
23201#, c-format
23202msgid "the '%s' option is only allowed in list mode"
23203msgstr "'%s' 选项只允许用在列表显示模式"
c04f5ac3 23204
65387fd5 23205#: builtin/tag.c:597
c04f5ac3
JX
23206#, c-format
23207msgid "'%s' is not a valid tag name."
55a16ee4 23208msgstr "'%s' 不是一个有效的标签名称。"
c04f5ac3 23209
65387fd5 23210#: builtin/tag.c:602
c04f5ac3
JX
23211#, c-format
23212msgid "tag '%s' already exists"
55a16ee4 23213msgstr "标签 '%s' 已存在"
c04f5ac3 23214
65387fd5 23215#: builtin/tag.c:633
c04f5ac3
JX
23216#, c-format
23217msgid "Updated tag '%s' (was %s)\n"
55a16ee4 23218msgstr "已更新标签 '%s'(曾为 %s)\n"
c04f5ac3 23219
33b62fba 23220#: builtin/unpack-objects.c:504
6c94aba5
JX
23221msgid "Unpacking objects"
23222msgstr "展开对象中"
23223
ddc12c42 23224#: builtin/update-index.c:84
7aea43ff
JX
23225#, c-format
23226msgid "failed to create directory %s"
65387fd5 23227msgstr "无法创建目录 %s"
7aea43ff 23228
7e6630a7 23229#: builtin/update-index.c:106
7aea43ff
JX
23230#, c-format
23231msgid "failed to delete file %s"
65387fd5 23232msgstr "无法删除文件 %s"
7aea43ff 23233
7e6630a7 23234#: builtin/update-index.c:113 builtin/update-index.c:219
7aea43ff
JX
23235#, c-format
23236msgid "failed to delete directory %s"
65387fd5 23237msgstr "无法删除目录 %s"
7aea43ff 23238
7e6630a7 23239#: builtin/update-index.c:138
7aea43ff 23240#, c-format
276ceeaa
JX
23241msgid "Testing mtime in '%s' "
23242msgstr "在 '%s' 中测试 mtime "
7aea43ff 23243
7e6630a7 23244#: builtin/update-index.c:152
7aea43ff
JX
23245msgid "directory stat info does not change after adding a new file"
23246msgstr "添加一个新文件后,目录的状态信息未改变"
23247
7e6630a7 23248#: builtin/update-index.c:165
7aea43ff
JX
23249msgid "directory stat info does not change after adding a new directory"
23250msgstr "添加一个新目录后,目录的状态信息未改变"
23251
7e6630a7 23252#: builtin/update-index.c:178
7aea43ff
JX
23253msgid "directory stat info changes after updating a file"
23254msgstr "更新一个文件后,目录的状态信息被修改"
23255
7e6630a7 23256#: builtin/update-index.c:189
7aea43ff
JX
23257msgid "directory stat info changes after adding a file inside subdirectory"
23258msgstr "在子目录中添加文件后,目录的状态信息被修改"
23259
7e6630a7 23260#: builtin/update-index.c:200
7aea43ff
JX
23261msgid "directory stat info does not change after deleting a file"
23262msgstr "删除一个文件后,目录的状态信息未改变"
23263
7e6630a7 23264#: builtin/update-index.c:213
7aea43ff
JX
23265msgid "directory stat info does not change after deleting a directory"
23266msgstr "删除一个目录后,目录的状态信息未改变"
23267
7e6630a7 23268#: builtin/update-index.c:220
7aea43ff
JX
23269msgid " OK"
23270msgstr " OK"
23271
7e6630a7 23272#: builtin/update-index.c:589
814ff314
JX
23273msgid "git update-index [<options>] [--] [<file>...]"
23274msgstr "git update-index [<选项>] [--] [<文件>...]"
8ada9598 23275
7e6630a7 23276#: builtin/update-index.c:974
ef317cd5 23277msgid "continue refresh even when index needs update"
07432cef 23278msgstr "当索引需要更新时继续刷新"
8ada9598 23279
7e6630a7 23280#: builtin/update-index.c:977
ef317cd5 23281msgid "refresh: ignore submodules"
07432cef 23282msgstr "刷新:忽略子模组"
8ada9598 23283
7e6630a7 23284#: builtin/update-index.c:980
ef317cd5 23285msgid "do not ignore new files"
07432cef 23286msgstr "不忽略新的文件"
8ada9598 23287
7e6630a7 23288#: builtin/update-index.c:982
ef317cd5 23289msgid "let files replace directories and vice-versa"
07432cef 23290msgstr "让文件替换目录(反之亦然)"
ef317cd5 23291
7e6630a7 23292#: builtin/update-index.c:984
ef317cd5 23293msgid "notice files missing from worktree"
07432cef 23294msgstr "通知文件从工作区丢失"
ef317cd5 23295
7e6630a7 23296#: builtin/update-index.c:986
ef317cd5 23297msgid "refresh even if index contains unmerged entries"
07432cef 23298msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 23299
7e6630a7 23300#: builtin/update-index.c:989
ef317cd5 23301msgid "refresh stat information"
07432cef 23302msgstr "刷新统计信息"
ef317cd5 23303
7e6630a7 23304#: builtin/update-index.c:993
ef317cd5 23305msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 23306msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 23307
7e6630a7 23308#: builtin/update-index.c:997
6c94aba5 23309msgid "<mode>,<object>,<path>"
d9d56b23 23310msgstr "<存取模式>,<对象>,<路径>"
ef317cd5 23311
7e6630a7 23312#: builtin/update-index.c:998
ef317cd5 23313msgid "add the specified entry to the index"
07432cef 23314msgstr "添加指定的条目到索引区"
ef317cd5 23315
7e6630a7 23316#: builtin/update-index.c:1008
ef317cd5 23317msgid "mark files as \"not changing\""
07432cef 23318msgstr "把文件标记为 \"没有变更\""
ef317cd5 23319
7e6630a7 23320#: builtin/update-index.c:1011
ef317cd5 23321msgid "clear assumed-unchanged bit"
07432cef 23322msgstr "清除 assumed-unchanged 位"
ef317cd5 23323
7e6630a7 23324#: builtin/update-index.c:1014
ef317cd5 23325msgid "mark files as \"index-only\""
07432cef 23326msgstr "把文件标记为 \"仅索引\""
ef317cd5 23327
7e6630a7 23328#: builtin/update-index.c:1017
ef317cd5 23329msgid "clear skip-worktree bit"
07432cef 23330msgstr "清除 skip-worktree 位"
ef317cd5 23331
7e6630a7 23332#: builtin/update-index.c:1020
ddc12c42
JX
23333msgid "do not touch index-only entries"
23334msgstr "不要触碰仅索引条目"
23335
7e6630a7 23336#: builtin/update-index.c:1022
ef317cd5 23337msgid "add to index only; do not add content to object database"
07432cef 23338msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 23339
7e6630a7 23340#: builtin/update-index.c:1024
ef317cd5 23341msgid "remove named paths even if present in worktree"
07432cef 23342msgstr "即使存在工作区里,也删除路径"
ef317cd5 23343
7e6630a7 23344#: builtin/update-index.c:1026
ef317cd5 23345msgid "with --stdin: input lines are terminated by null bytes"
07432cef 23346msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 23347
7e6630a7 23348#: builtin/update-index.c:1028
ef317cd5 23349msgid "read list of paths to be updated from standard input"
07432cef 23350msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 23351
7e6630a7 23352#: builtin/update-index.c:1032
ef317cd5 23353msgid "add entries from standard input to the index"
07432cef 23354msgstr "从标准输入添加条目到索引区"
ef317cd5 23355
7e6630a7 23356#: builtin/update-index.c:1036
ef317cd5 23357msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 23358msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 23359
7e6630a7 23360#: builtin/update-index.c:1040
ef317cd5 23361msgid "only update entries that differ from HEAD"
07432cef 23362msgstr "只更新与 HEAD 不同的条目"
ef317cd5 23363
7e6630a7 23364#: builtin/update-index.c:1044
ef317cd5 23365msgid "ignore files missing from worktree"
07432cef 23366msgstr "忽略工作区丢失的文件"
ef317cd5 23367
7e6630a7 23368#: builtin/update-index.c:1047
ef317cd5 23369msgid "report actions to standard output"
07432cef 23370msgstr "在标准输出显示操作"
ef317cd5 23371
7e6630a7 23372#: builtin/update-index.c:1049
ef317cd5 23373msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 23374msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 23375
7e6630a7 23376#: builtin/update-index.c:1053
ef317cd5 23377msgid "write index in this format"
07432cef 23378msgstr "以这种格式写入索引区"
ef317cd5 23379
7e6630a7 23380#: builtin/update-index.c:1055
6acbf033
JX
23381msgid "enable or disable split index"
23382msgstr "启用或禁用索引拆分"
23383
7e6630a7 23384#: builtin/update-index.c:1057
7aea43ff
JX
23385msgid "enable/disable untracked cache"
23386msgstr "启用/禁用对未跟踪文件的缓存"
23387
7e6630a7 23388#: builtin/update-index.c:1059
276ceeaa
JX
23389msgid "test if the filesystem supports untracked cache"
23390msgstr "测试文件系统是否支持未跟踪文件缓存"
23391
7e6630a7 23392#: builtin/update-index.c:1061
7aea43ff
JX
23393msgid "enable untracked cache without testing the filesystem"
23394msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
23395
7e6630a7 23396#: builtin/update-index.c:1063
5809aa05
JX
23397msgid "write out the index even if is not flagged as changed"
23398msgstr "即使没有被标记为已更改,也要写出索引"
23399
7e6630a7 23400#: builtin/update-index.c:1065
5809aa05
JX
23401msgid "enable or disable file system monitor"
23402msgstr "启用或禁用文件系统监控"
23403
7e6630a7 23404#: builtin/update-index.c:1067
5809aa05
JX
23405msgid "mark files as fsmonitor valid"
23406msgstr "标记文件为 fsmonitor 有效"
23407
7e6630a7 23408#: builtin/update-index.c:1070
5809aa05
JX
23409msgid "clear fsmonitor valid bit"
23410msgstr "清除 fsmonitor 有效位"
23411
7e6630a7 23412#: builtin/update-index.c:1173
87cb7997
JX
23413msgid ""
23414"core.splitIndex is set to false; remove or change it, if you really want to "
23415"enable split index"
23416msgstr ""
23417"core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。"
23418
7e6630a7 23419#: builtin/update-index.c:1182
87cb7997
JX
23420msgid ""
23421"core.splitIndex is set to true; remove or change it, if you really want to "
23422"disable split index"
23423msgstr ""
23424"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。"
23425
7e6630a7 23426#: builtin/update-index.c:1194
a0b6b246
JX
23427msgid ""
23428"core.untrackedCache is set to true; remove or change it, if you really want "
23429"to disable the untracked cache"
275588f9
JX
23430msgstr ""
23431"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
23432"改它。"
a0b6b246 23433
7e6630a7 23434#: builtin/update-index.c:1198
276ceeaa
JX
23435msgid "Untracked cache disabled"
23436msgstr "缓存未跟踪文件被禁用"
23437
7e6630a7 23438#: builtin/update-index.c:1206
a0b6b246
JX
23439msgid ""
23440"core.untrackedCache is set to false; remove or change it, if you really want "
23441"to enable the untracked cache"
275588f9
JX
23442msgstr ""
23443"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
23444"修改它。"
a0b6b246 23445
7e6630a7 23446#: builtin/update-index.c:1210
276ceeaa
JX
23447#, c-format
23448msgid "Untracked cache enabled for '%s'"
23449msgstr "缓存未跟踪文件在 '%s' 启用"
23450
7e6630a7 23451#: builtin/update-index.c:1218
5809aa05 23452msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
31e5e17b 23453msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项"
5809aa05 23454
7e6630a7 23455#: builtin/update-index.c:1222
5809aa05
JX
23456msgid "fsmonitor enabled"
23457msgstr "fsmonitor 被启用"
23458
7e6630a7 23459#: builtin/update-index.c:1225
5809aa05
JX
23460msgid ""
23461"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
31e5e17b 23462msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项"
5809aa05 23463
7e6630a7 23464#: builtin/update-index.c:1229
5809aa05
JX
23465msgid "fsmonitor disabled"
23466msgstr "fsmonitor 被禁用"
23467
a4f16749 23468#: builtin/update-ref.c:10
814ff314
JX
23469msgid "git update-ref [<options>] -d <refname> [<old-val>]"
23470msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
ef317cd5 23471
a4f16749 23472#: builtin/update-ref.c:11
814ff314
JX
23473msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
23474msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
90314792 23475
a4f16749 23476#: builtin/update-ref.c:12
814ff314
JX
23477msgid "git update-ref [<options>] --stdin [-z]"
23478msgstr "git update-ref [<选项>] --stdin [-z]"
ef317cd5 23479
7e6630a7 23480#: builtin/update-ref.c:506
ef317cd5 23481msgid "delete the reference"
07432cef 23482msgstr "删除引用"
ef317cd5 23483
7e6630a7 23484#: builtin/update-ref.c:508
ef317cd5 23485msgid "update <refname> not the one it points to"
07432cef 23486msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 23487
7e6630a7 23488#: builtin/update-ref.c:509
90314792
JX
23489msgid "stdin has NUL-terminated arguments"
23490msgstr "标准输入有以 NUL 字符终止的参数"
23491
7e6630a7 23492#: builtin/update-ref.c:510
90314792
JX
23493msgid "read updates from stdin"
23494msgstr "从标准输入读取更新"
23495
a4f16749 23496#: builtin/update-server-info.c:7
ef317cd5 23497msgid "git update-server-info [--force]"
07432cef 23498msgstr "git update-server-info [--force]"
ef317cd5 23499
a4f16749 23500#: builtin/update-server-info.c:15
ef317cd5 23501msgid "update the info files from scratch"
07432cef 23502msgstr "从头开始更新文件信息"
ef317cd5 23503
fd8cb379
JX
23504#: builtin/upload-pack.c:11
23505msgid "git upload-pack [<options>] <dir>"
23506msgstr "git upload-pack [<选项>] <目录>"
23507
7e6630a7 23508#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17
d46c5519
JX
23509msgid "quit after a single request/response exchange"
23510msgstr "在一次单独的请求/响应之后退出"
23511
7e6630a7
FZ
23512#: builtin/upload-pack.c:26
23513msgid "serve up the info/refs for git-http-backend"
23514msgstr "为 git-http-backend 提供 info/refs"
fd8cb379 23515
7e6630a7 23516#: builtin/upload-pack.c:29
fd8cb379
JX
23517msgid "do not try <directory>/.git/ if <directory> is no Git directory"
23518msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/"
23519
7e6630a7 23520#: builtin/upload-pack.c:31
fd8cb379
JX
23521msgid "interrupt transfer after <n> seconds of inactivity"
23522msgstr "不活动 <n> 秒钟后终止传输"
23523
a6cd2cc4 23524#: builtin/verify-commit.c:19
814ff314
JX
23525msgid "git verify-commit [-v | --verbose] <commit>..."
23526msgstr "git verify-commit [-v | --verbose] <提交>..."
6acbf033 23527
a6cd2cc4 23528#: builtin/verify-commit.c:68
6acbf033
JX
23529msgid "print commit contents"
23530msgstr "打印提交内容"
23531
a6cd2cc4 23532#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
1b7f4a34
JX
23533msgid "print raw gpg status output"
23534msgstr "打印原始 gpg 状态输出"
23535
d9488fea 23536#: builtin/verify-pack.c:59
814ff314
JX
23537msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
23538msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
ef317cd5 23539
d9488fea 23540#: builtin/verify-pack.c:70
ef317cd5
JX
23541msgid "verbose"
23542msgstr "冗长输出"
23543
d9488fea 23544#: builtin/verify-pack.c:72
ef317cd5 23545msgid "show statistics only"
07432cef 23546msgstr "只显示统计"
ef317cd5 23547
a6cd2cc4 23548#: builtin/verify-tag.c:18
1a79b2f1
JX
23549msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
23550msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
ef317cd5 23551
a6cd2cc4 23552#: builtin/verify-tag.c:36
ef317cd5 23553msgid "print tag contents"
55a16ee4 23554msgstr "打印标签内容"
ef317cd5 23555
7e6630a7 23556#: builtin/worktree.c:19
31e5e17b
JX
23557msgid "git worktree add [<options>] <path> [<commit-ish>]"
23558msgstr "git worktree add [<选项>] <路径> [<提交>]"
5bb01d4f 23559
7e6630a7 23560#: builtin/worktree.c:20
5c57d762
JX
23561msgid "git worktree list [<options>]"
23562msgstr "git worktree list [<选项>]"
23563
7e6630a7 23564#: builtin/worktree.c:21
5c57d762
JX
23565msgid "git worktree lock [<options>] <path>"
23566msgstr "git worktree lock [<选项>] <路径>"
23567
7e6630a7 23568#: builtin/worktree.c:22
31e5e17b
JX
23569msgid "git worktree move <worktree> <new-path>"
23570msgstr "git worktree move <工作区> <新路径>"
23571
7e6630a7 23572#: builtin/worktree.c:23
5bb01d4f
JX
23573msgid "git worktree prune [<options>]"
23574msgstr "git worktree prune [<选项>]"
23575
7e6630a7 23576#: builtin/worktree.c:24
31e5e17b
JX
23577msgid "git worktree remove [<options>] <worktree>"
23578msgstr "git worktree remove [<选项>] <工作区>"
23579
7e6630a7 23580#: builtin/worktree.c:25
5c57d762
JX
23581msgid "git worktree unlock <path>"
23582msgstr "git worktree unlock <路径>"
94550ed3 23583
7e6630a7 23584#: builtin/worktree.c:75
5bb01d4f 23585#, c-format
7157c2b5
JX
23586msgid "Removing %s/%s: %s"
23587msgstr "删除 %s/%s: %s"
5bb01d4f 23588
7e6630a7 23589#: builtin/worktree.c:148
1a79b2f1
JX
23590msgid "report pruned working trees"
23591msgstr "报告清除的工作区"
23592
7e6630a7 23593#: builtin/worktree.c:150
1a79b2f1 23594msgid "expire working trees older than <time>"
58b6f078 23595msgstr "将早于 <时间> 的工作区过期"
1a79b2f1 23596
7e6630a7 23597#: builtin/worktree.c:220
5bb01d4f
JX
23598#, c-format
23599msgid "'%s' already exists"
23600msgstr "'%s' 已经存在"
23601
7e6630a7 23602#: builtin/worktree.c:229
4c27fcb5 23603#, c-format
7157c2b5
JX
23604msgid "unusable worktree destination '%s'"
23605msgstr "无法使用的工作区目标 '%s'"
4c27fcb5 23606
7e6630a7 23607#: builtin/worktree.c:234
4c27fcb5
JX
23608#, c-format
23609msgid ""
23610"'%s' is a missing but locked worktree;\n"
7157c2b5 23611"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
4c27fcb5 23612msgstr ""
7157c2b5
JX
23613"'%s' 是一个丢失但锁定的工作区,\n"
23614"使用 '%s -f -f' 覆盖,或用 'unlock' 和 'prune' 或 'remove' 清除"
4c27fcb5 23615
7e6630a7 23616#: builtin/worktree.c:236
4c27fcb5
JX
23617#, c-format
23618msgid ""
23619"'%s' is a missing but already registered worktree;\n"
7157c2b5 23620"use '%s -f' to override, or 'prune' or 'remove' to clear"
4c27fcb5 23621msgstr ""
7157c2b5
JX
23622"'%s' 是一个丢失但已经注册的工作区,\n"
23623"使用 '%s -f' 覆盖,或用 'prune' 或 'remove' 清除"
4c27fcb5 23624
7e6630a7 23625#: builtin/worktree.c:287
5bb01d4f
JX
23626#, c-format
23627msgid "could not create directory of '%s'"
23628msgstr "不能创建目录 '%s'"
23629
7e6630a7 23630#: builtin/worktree.c:309
ec3d4607
JX
23631msgid "initializing"
23632msgstr "初始化"
23633
65387fd5 23634#: builtin/worktree.c:420 builtin/worktree.c:426
fd8cb379
JX
23635#, c-format
23636msgid "Preparing worktree (new branch '%s')"
23637msgstr "准备工作区(新分支 '%s')"
23638
65387fd5 23639#: builtin/worktree.c:422
fd8cb379
JX
23640#, c-format
23641msgid "Preparing worktree (resetting branch '%s'; was at %s)"
23642msgstr "准备工作区(重置分支 '%s',之前为 %s)"
23643
65387fd5 23644#: builtin/worktree.c:431
fd8cb379
JX
23645#, c-format
23646msgid "Preparing worktree (checking out '%s')"
23647msgstr "准备工作区(检出 '%s')"
23648
65387fd5 23649#: builtin/worktree.c:437
5bb01d4f 23650#, c-format
fd8cb379
JX
23651msgid "Preparing worktree (detached HEAD %s)"
23652msgstr "准备工作区(分离头指针 %s)"
5bb01d4f 23653
65387fd5 23654#: builtin/worktree.c:482
5bb01d4f 23655msgid "checkout <branch> even if already checked out in other worktree"
58b6f078 23656msgstr "检出 <分支>,即使已经被检出到其它工作区"
5bb01d4f 23657
65387fd5 23658#: builtin/worktree.c:485
5bb01d4f
JX
23659msgid "create a new branch"
23660msgstr "创建一个新分支"
23661
65387fd5 23662#: builtin/worktree.c:487
5bb01d4f
JX
23663msgid "create or reset a branch"
23664msgstr "创建或重置一个分支"
23665
65387fd5 23666#: builtin/worktree.c:489
5b04ee3b
JX
23667msgid "populate the new working tree"
23668msgstr "生成新的工作区"
23669
65387fd5 23670#: builtin/worktree.c:490
60638e98
JX
23671msgid "keep the new working tree locked"
23672msgstr "锁定新工作区"
23673
65387fd5 23674#: builtin/worktree.c:492 builtin/worktree.c:729
ec3d4607
JX
23675msgid "reason for locking"
23676msgstr "锁定原因"
23677
65387fd5 23678#: builtin/worktree.c:495
5809aa05
JX
23679msgid "set up tracking mode (see git-branch(1))"
23680msgstr "设置跟踪模式(参见 git-branch(1))"
23681
65387fd5 23682#: builtin/worktree.c:498
5809aa05
JX
23683msgid "try to match the new branch name with a remote-tracking branch"
23684msgstr "尝试为新分支名匹配一个远程跟踪分支"
23685
65387fd5 23686#: builtin/worktree.c:512
ec3d4607
JX
23687msgid "added with --lock"
23688msgstr "由 --lock 添加"
23689
65387fd5 23690#: builtin/worktree.c:574
5809aa05
JX
23691msgid "--[no-]track can only be used if a new branch is created"
23692msgstr "只能在创建新分支时使用选项 --[no-]track "
23693
65387fd5 23694#: builtin/worktree.c:691
473eb541
JX
23695msgid "show extended annotations and reasons, if available"
23696msgstr "显示扩展的注释和原因(如果有)"
23697
65387fd5 23698#: builtin/worktree.c:693
473eb541
JX
23699msgid "add 'prunable' annotation to worktrees older than <time>"
23700msgstr "向早于 <时间> 的工作区添添加“可修剪”注释"
23701
65387fd5
FZ
23702#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
23703#: builtin/worktree.c:972
5c57d762
JX
23704#, c-format
23705msgid "'%s' is not a working tree"
23706msgstr "'%s' 不是一个工作区"
23707
65387fd5 23708#: builtin/worktree.c:743 builtin/worktree.c:776
5c57d762
JX
23709msgid "The main working tree cannot be locked or unlocked"
23710msgstr "主工作区无法被加锁或解锁"
23711
65387fd5 23712#: builtin/worktree.c:748
5c57d762
JX
23713#, c-format
23714msgid "'%s' is already locked, reason: %s"
23715msgstr "'%s' 已被锁定,原因:%s"
23716
65387fd5 23717#: builtin/worktree.c:750
5c57d762
JX
23718#, c-format
23719msgid "'%s' is already locked"
23720msgstr "'%s' 已被锁定"
23721
65387fd5 23722#: builtin/worktree.c:778
5c57d762
JX
23723#, c-format
23724msgid "'%s' is not locked"
23725msgstr "'%s' 未被锁定"
23726
65387fd5 23727#: builtin/worktree.c:819
31e5e17b 23728msgid "working trees containing submodules cannot be moved or removed"
610f8099 23729msgstr "不能移动或删除包含子模组的工作区"
31e5e17b 23730
65387fd5 23731#: builtin/worktree.c:827
4c27fcb5
JX
23732msgid "force move even if worktree is dirty or locked"
23733msgstr "强制移动,即使工作区是脏的或已锁定"
23734
65387fd5 23735#: builtin/worktree.c:850 builtin/worktree.c:974
31e5e17b
JX
23736#, c-format
23737msgid "'%s' is a main working tree"
23738msgstr "'%s' 是一个主工作区"
23739
65387fd5 23740#: builtin/worktree.c:855
31e5e17b
JX
23741#, c-format
23742msgid "could not figure out destination name from '%s'"
23743msgstr "无法从 '%s' 算出目标名称"
23744
65387fd5 23745#: builtin/worktree.c:868
31e5e17b 23746#, c-format
4c27fcb5
JX
23747msgid ""
23748"cannot move a locked working tree, lock reason: %s\n"
23749"use 'move -f -f' to override or unlock first"
23750msgstr ""
23751"无法移动一个锁定的工作区,锁定原因:%s\n"
23752"使用 'move -f -f' 覆盖或先解锁"
31e5e17b 23753
65387fd5 23754#: builtin/worktree.c:870
4c27fcb5
JX
23755msgid ""
23756"cannot move a locked working tree;\n"
23757"use 'move -f -f' to override or unlock first"
23758msgstr ""
23759"无法移动一个锁定的工作区,\n"
23760"使用 'move -f -f' 覆盖或先解锁"
31e5e17b 23761
65387fd5 23762#: builtin/worktree.c:873
31e5e17b
JX
23763#, c-format
23764msgid "validation failed, cannot move working tree: %s"
23765msgstr "验证失败,无法移动工作区:%s"
23766
65387fd5 23767#: builtin/worktree.c:878
31e5e17b
JX
23768#, c-format
23769msgid "failed to move '%s' to '%s'"
65387fd5 23770msgstr "无法移动 '%s' 到 '%s'"
31e5e17b 23771
65387fd5 23772#: builtin/worktree.c:924
31e5e17b
JX
23773#, c-format
23774msgid "failed to run 'git status' on '%s'"
65387fd5 23775msgstr "无法在 '%s' 中执行 'git status'"
31e5e17b 23776
65387fd5 23777#: builtin/worktree.c:928
31e5e17b 23778#, c-format
a5cd71ca
JX
23779msgid "'%s' contains modified or untracked files, use --force to delete it"
23780msgstr "'%s' 包含修改或未跟踪的文件,使用 --force 删除"
31e5e17b 23781
65387fd5 23782#: builtin/worktree.c:933
31e5e17b
JX
23783#, c-format
23784msgid "failed to run 'git status' on '%s', code %d"
65387fd5 23785msgstr "无法在 '%s' 中执行 'git status',退出码 %d"
31e5e17b 23786
65387fd5 23787#: builtin/worktree.c:956
4c27fcb5
JX
23788msgid "force removal even if worktree is dirty or locked"
23789msgstr "强制删除,即使工作区是脏的或已锁定"
31e5e17b 23790
65387fd5 23791#: builtin/worktree.c:979
31e5e17b 23792#, c-format
4c27fcb5
JX
23793msgid ""
23794"cannot remove a locked working tree, lock reason: %s\n"
23795"use 'remove -f -f' to override or unlock first"
23796msgstr ""
23797"无法删除一个锁定的工作区,锁定原因:%s\n"
23798"使用 'remove -f -f' 覆盖或先解锁"
31e5e17b 23799
65387fd5 23800#: builtin/worktree.c:981
4c27fcb5
JX
23801msgid ""
23802"cannot remove a locked working tree;\n"
23803"use 'remove -f -f' to override or unlock first"
23804msgstr ""
23805"无法删除一个锁定的工作区,\n"
23806"使用 'remove -f -f' 覆盖或先解锁"
31e5e17b 23807
65387fd5 23808#: builtin/worktree.c:984
31e5e17b
JX
23809#, c-format
23810msgid "validation failed, cannot remove working tree: %s"
23811msgstr "验证失败,无法删除工作区:%s"
23812
65387fd5 23813#: builtin/worktree.c:1008
d9488fea
JX
23814#, c-format
23815msgid "repair: %s: %s"
23816msgstr "修理:%s:%s"
23817
65387fd5 23818#: builtin/worktree.c:1011
d9488fea
JX
23819#, c-format
23820msgid "error: %s: %s"
23821msgstr "错误:%s:%s"
23822
06991777 23823#: builtin/write-tree.c:15
ef317cd5 23824msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 23825msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5 23826
06991777 23827#: builtin/write-tree.c:28
ef317cd5 23828msgid "<prefix>/"
07432cef 23829msgstr "<前缀>/"
ef317cd5 23830
06991777 23831#: builtin/write-tree.c:29
ef317cd5 23832msgid "write tree object for a subdirectory <prefix>"
07432cef 23833msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5 23834
06991777 23835#: builtin/write-tree.c:31
ef317cd5 23836msgid "only useful for debugging"
07432cef 23837msgstr "只对调试有用"
ef317cd5 23838
349ede6a 23839#: git.c:28
31e5e17b
JX
23840msgid ""
23841"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
23842" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
fd8cb379
JX
23843" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
23844"bare]\n"
31e5e17b 23845" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
473eb541 23846" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
31e5e17b
JX
23847" <command> [<args>]"
23848msgstr ""
fd8cb379 23849"git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n"
31e5e17b 23850" [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
33b62fba
JX
23851" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
23852"bare]\n"
31e5e17b 23853" [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
473eb541 23854" [--super-prefix=<路径>] [--config-env=<名称>=<环境变量>]\n"
31e5e17b
JX
23855" <命令> [<参数>]"
23856
473eb541 23857#: git.c:36
4dcdc3d8 23858msgid ""
220c313c 23859"'git help -a' and 'git help -g' list available subcommands and some\n"
4dcdc3d8 23860"concept guides. See 'git help <command>' or 'git help <concept>'\n"
a6cd2cc4
JX
23861"to read about a specific subcommand or concept.\n"
23862"See 'git help git' for an overview of the system."
4dcdc3d8 23863msgstr ""
220c313c
JX
23864"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
23865"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
a6cd2cc4
JX
23866"帮助。\n"
23867"有关系统的概述,查看 'git help git'。"
8ada9598 23868
65387fd5 23869#: git.c:188 git.c:216 git.c:300
31e5e17b 23870#, c-format
65387fd5
FZ
23871msgid "no directory given for '%s' option\n"
23872msgstr "没有为 '%s' 选项提供目录\n"
31e5e17b 23873
473eb541 23874#: git.c:202
31e5e17b
JX
23875#, c-format
23876msgid "no namespace given for --namespace\n"
23877msgstr "没有为 --namespace 提供命名空间\n"
23878
473eb541 23879#: git.c:230
31e5e17b
JX
23880#, c-format
23881msgid "no prefix given for --super-prefix\n"
23882msgstr "没有为 --super-prefix 提供前缀\n"
23883
473eb541 23884#: git.c:252
31e5e17b
JX
23885#, c-format
23886msgid "-c expects a configuration string\n"
23887msgstr "应为 -c 提供一个配置字符串\n"
23888
33b62fba
JX
23889#: git.c:260
23890#, c-format
23891msgid "no config key given for --config-env\n"
23892msgstr "没有为 --config-env 提供配置名称\n"
23893
33b62fba 23894#: git.c:326
31e5e17b
JX
23895#, c-format
23896msgid "unknown option: %s\n"
23897msgstr "未知选项:%s\n"
23898
33b62fba 23899#: git.c:375
06991777
JX
23900#, c-format
23901msgid "while expanding alias '%s': '%s'"
5b533632 23902msgstr "在扩展别名 '%s' 时:'%s'"
06991777 23903
33b62fba 23904#: git.c:384
06991777
JX
23905#, c-format
23906msgid ""
23907"alias '%s' changes environment variables.\n"
23908"You can use '!git' in the alias to do this"
23909msgstr ""
23910"别名 '%s' 修改环境变量。您可以使用在别名中\n"
23911"使用 '!git'"
23912
33b62fba 23913#: git.c:391
06991777
JX
23914#, c-format
23915msgid "empty alias for %s"
23916msgstr "%s 的空别名"
23917
33b62fba 23918#: git.c:394
06991777
JX
23919#, c-format
23920msgid "recursive alias: %s"
5b533632 23921msgstr "递归的别名:%s"
06991777 23922
65387fd5 23923#: git.c:479
06991777
JX
23924msgid "write failure on standard output"
23925msgstr "在标准输出写入失败"
23926
65387fd5 23927#: git.c:481
06991777
JX
23928msgid "unknown write failure on standard output"
23929msgstr "到标准输出的未知写入错误"
23930
65387fd5 23931#: git.c:483
06991777
JX
23932msgid "close failed on standard output"
23933msgstr "标准输出关闭失败"
23934
65387fd5 23935#: git.c:835
4c27fcb5
JX
23936#, c-format
23937msgid "alias loop detected: expansion of '%s' does not terminate:%s"
23938msgstr "检测到别名循环:'%s'的扩展未终止:%s"
23939
65387fd5 23940#: git.c:885
06991777
JX
23941#, c-format
23942msgid "cannot handle %s as a builtin"
23943msgstr "不能作为内置命令处理 %s"
23944
65387fd5 23945#: git.c:898
06991777
JX
23946#, c-format
23947msgid ""
23948"usage: %s\n"
23949"\n"
23950msgstr ""
23951"用法:%s\n"
23952"\n"
23953
65387fd5 23954#: git.c:918
31e5e17b
JX
23955#, c-format
23956msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
23957msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n"
23958
65387fd5 23959#: git.c:930
31e5e17b
JX
23960#, c-format
23961msgid "failed to run command '%s': %s\n"
65387fd5 23962msgstr "无法运行命令 '%s':%s\n"
31e5e17b 23963
65387fd5 23964#: http-fetch.c:128
33b62fba
JX
23965#, c-format
23966msgid "argument to --packfile must be a valid hash (got '%s')"
23967msgstr "--packfile 的参数必须是有效的哈希值(得到 '%s')"
23968
65387fd5 23969#: http-fetch.c:138
33b62fba
JX
23970msgid "not a git repository"
23971msgstr "不是 git 仓库"
23972
33b62fba
JX
23973#: t/helper/test-fast-rebase.c:141
23974msgid "unhandled options"
23975msgstr "未处理的选项"
23976
23977#: t/helper/test-fast-rebase.c:146
23978msgid "error preparing revisions"
23979msgstr "准备版本时错误"
23980
23981#: t/helper/test-reach.c:154
23982#, c-format
23983msgid "commit %s is not marked reachable"
23984msgstr "提交 %s 没有标记为可达"
23985
23986#: t/helper/test-reach.c:164
23987msgid "too many commits marked reachable"
23988msgstr "太多提交标记为可达"
23989
23990#: t/helper/test-serve-v2.c:7
23991msgid "test-tool serve-v2 [<options>]"
23992msgstr "test-tool serve-v2 [<选项>]"
23993
23994#: t/helper/test-serve-v2.c:19
23995msgid "exit immediately after advertising capabilities"
7b4d4954 23996msgstr "通告能力之后立即退出"
33b62fba 23997
7e6630a7 23998#: t/helper/test-simple-ipc.c:581
33b62fba
JX
23999msgid "test-helper simple-ipc is-active [<name>] [<options>]"
24000msgstr "test-helper simple-ipc is-active [<名字>] [<选项>]"
24001
7e6630a7 24002#: t/helper/test-simple-ipc.c:582
33b62fba
JX
24003msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]"
24004msgstr "test-helper simple-ipc run-daemon [<名字>] [<线程>]"
24005
7e6630a7 24006#: t/helper/test-simple-ipc.c:583
33b62fba
JX
24007msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
24008msgstr "test-helper simple-ipc start-daemon [<名字>] [<线程>] [<最大等待>]"
24009
7e6630a7 24010#: t/helper/test-simple-ipc.c:584
33b62fba
JX
24011msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
24012msgstr "test-helper simple-ipc stop-daemon [<名字>] [<最大等待>]"
24013
7e6630a7 24014#: t/helper/test-simple-ipc.c:585
33b62fba
JX
24015msgid "test-helper simple-ipc send [<name>] [<token>]"
24016msgstr "test-helper simple-ipc send [<名字>] [<令牌>]"
24017
7e6630a7 24018#: t/helper/test-simple-ipc.c:586
33b62fba
JX
24019msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
24020msgstr "test-helper simple-ipc sendbytes [<名字>] [<字节数>] [<字节>]"
24021
7e6630a7 24022#: t/helper/test-simple-ipc.c:587
33b62fba
JX
24023msgid ""
24024"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] "
24025"[<batchsize>]"
ec3d4607
JX
24026msgstr ""
24027"test-helper simple-ipc multiple [<名字>] [<线程>] [<字节计数>] [<批处理大"
24028"小>]"
33b62fba 24029
7e6630a7 24030#: t/helper/test-simple-ipc.c:595
33b62fba
JX
24031msgid "name or pathname of unix domain socket"
24032msgstr "unix 域套接字的名称或路径名"
24033
7e6630a7 24034#: t/helper/test-simple-ipc.c:597
33b62fba
JX
24035msgid "named-pipe name"
24036msgstr "命名管道的名字"
24037
7e6630a7 24038#: t/helper/test-simple-ipc.c:599
33b62fba
JX
24039msgid "number of threads in server thread pool"
24040msgstr "服务器线程池中的线程数"
24041
7e6630a7 24042#: t/helper/test-simple-ipc.c:600
33b62fba
JX
24043msgid "seconds to wait for daemon to start or stop"
24044msgstr "等待守护进程启动或停止的秒数"
24045
7e6630a7 24046#: t/helper/test-simple-ipc.c:602
33b62fba
JX
24047msgid "number of bytes"
24048msgstr "字节数目"
24049
7e6630a7 24050#: t/helper/test-simple-ipc.c:603
33b62fba
JX
24051msgid "number of requests per thread"
24052msgstr "每个线程的请求数"
24053
7e6630a7 24054#: t/helper/test-simple-ipc.c:605
33b62fba
JX
24055msgid "byte"
24056msgstr "字节"
24057
7e6630a7 24058#: t/helper/test-simple-ipc.c:605
33b62fba
JX
24059msgid "ballast character"
24060msgstr "ballast character"
24061
7e6630a7 24062#: t/helper/test-simple-ipc.c:606
33b62fba
JX
24063msgid "token"
24064msgstr "令牌"
24065
7e6630a7 24066#: t/helper/test-simple-ipc.c:606
33b62fba
JX
24067msgid "command token to send to the server"
24068msgstr "发送到服务器的命令令牌"
24069
7e6630a7 24070#: http.c:350
60638e98
JX
24071#, c-format
24072msgid "negative value for http.postbuffer; defaulting to %d"
24073msgstr "http.postbuffer 为负值,默认为 %d"
24074
7e6630a7 24075#: http.c:371
a0b6b246 24076msgid "Delegation control is not supported with cURL < 7.22.0"
4c27fcb5 24077msgstr "不支持委托控制,因为 cURL < 7.22.0"
a0b6b246 24078
7e6630a7
FZ
24079#: http.c:380
24080msgid "Public key pinning not supported with cURL < 7.39.0"
24081msgstr "不支持公钥文件锁定,因为 cURL < 7.39.0"
276ceeaa 24082
7e6630a7 24083#: http.c:812
4c27fcb5
JX
24084msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
24085msgstr "不支持 CURLSSLOPT_NO_REVOKE,因为 cURL < 7.44.0"
24086
7e6630a7 24087#: http.c:1016
4c27fcb5
JX
24088#, c-format
24089msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
24090msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端:"
24091
7e6630a7 24092#: http.c:1023
4c27fcb5
JX
24093#, c-format
24094msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
24095msgstr "无法设置 SSL 后端为 '%s':cURL: cURL 没有使用 SSL 后端构建"
24096
7e6630a7 24097#: http.c:1027
4c27fcb5
JX
24098#, c-format
24099msgid "Could not set SSL backend to '%s': already set"
24100msgstr "无法将 SSL 后端设置为 '%s':已经设置"
24101
7e6630a7 24102#: http.c:1876
1a79b2f1
JX
24103#, c-format
24104msgid ""
24105"unable to update url base from redirection:\n"
24106" asked for: %s\n"
24107" redirect: %s"
24108msgstr ""
24109"不能更新重定向的 url base:\n"
24110" 请求:%s\n"
24111" 重定向:%s"
24112
d13389bf 24113#: remote-curl.c:183
d46c5519
JX
24114#, c-format
24115msgid "invalid quoting in push-option value: '%s'"
5b533632 24116msgstr "在 push-option 取值中无效的引号:'%s'"
d46c5519 24117
7e6630a7 24118#: remote-curl.c:304
d46c5519
JX
24119#, c-format
24120msgid "%sinfo/refs not valid: is this a git repository?"
d9488fea 24121msgstr "%sinfo/refs 无效:这是 git 仓库么?"
d46c5519 24122
7e6630a7 24123#: remote-curl.c:405
d46c5519
JX
24124msgid "invalid server response; expected service, got flush packet"
24125msgstr "无效的服务端响应。预期服务,得到 flush 包"
24126
7e6630a7 24127#: remote-curl.c:436
d46c5519
JX
24128#, c-format
24129msgid "invalid server response; got '%s'"
24130msgstr "无效的服务端响应,得到 '%s'"
24131
7e6630a7 24132#: remote-curl.c:496
d46c5519
JX
24133#, c-format
24134msgid "repository '%s' not found"
24135msgstr "仓库 '%s' 未找到"
24136
7e6630a7 24137#: remote-curl.c:500
d46c5519
JX
24138#, c-format
24139msgid "Authentication failed for '%s'"
24140msgstr "'%s' 鉴权失败"
24141
7e6630a7
FZ
24142#: remote-curl.c:504
24143#, c-format
24144msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
24145msgstr "无法以 http.pinnedPubkey 设置访问 '%s':%s"
24146
24147#: remote-curl.c:508
d46c5519
JX
24148#, c-format
24149msgid "unable to access '%s': %s"
24150msgstr "无法访问 '%s':%s"
24151
7e6630a7 24152#: remote-curl.c:514
1a79b2f1
JX
24153#, c-format
24154msgid "redirecting to %s"
24155msgstr "重定向到 %s"
24156
7e6630a7 24157#: remote-curl.c:645
d46c5519 24158msgid "shouldn't have EOF when not gentle on EOF"
5b533632 24159msgstr "当没有设置温和处理文件结束符(EOF)时,不应该有文件结束符"
d46c5519 24160
7e6630a7 24161#: remote-curl.c:657
ec3d4607
JX
24162msgid "remote server sent unexpected response end packet"
24163msgstr "远程服务器发送意外的响应结束数据包"
7157c2b5 24164
ec3d4607 24165#: remote-curl.c:726
d46c5519
JX
24166msgid "unable to rewind rpc post data - try increasing http.postBuffer"
24167msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
24168
7e6630a7 24169#: remote-curl.c:755
7157c2b5
JX
24170#, c-format
24171msgid "remote-curl: bad line length character: %.4s"
24172msgstr "remote-curl:错误的行宽字符:%.4s"
24173
7e6630a7 24174#: remote-curl.c:757
7157c2b5
JX
24175msgid "remote-curl: unexpected response end packet"
24176msgstr "remote-curl:意外响应结束包"
24177
7e6630a7 24178#: remote-curl.c:833
d46c5519
JX
24179#, c-format
24180msgid "RPC failed; %s"
24181msgstr "RPC 失败。%s"
24182
7e6630a7 24183#: remote-curl.c:873
d46c5519
JX
24184msgid "cannot handle pushes this big"
24185msgstr "不能处理这么大的推送"
24186
7e6630a7 24187#: remote-curl.c:986
d46c5519
JX
24188#, c-format
24189msgid "cannot deflate request; zlib deflate error %d"
24190msgstr "不能压缩请求,zlib 压缩错误 %d"
24191
7e6630a7 24192#: remote-curl.c:990
d46c5519
JX
24193#, c-format
24194msgid "cannot deflate request; zlib end error %d"
24195msgstr "不能压缩请求,zlib 结束错误 %d"
24196
7e6630a7 24197#: remote-curl.c:1040
7157c2b5
JX
24198#, c-format
24199msgid "%d bytes of length header were received"
24200msgstr "收到了 %d 字节长度的头信息"
24201
7e6630a7 24202#: remote-curl.c:1042
7157c2b5
JX
24203#, c-format
24204msgid "%d bytes of body are still expected"
24205msgstr "预期仍然需要 %d 个字节的正文"
24206
7e6630a7 24207#: remote-curl.c:1131
d46c5519 24208msgid "dumb http transport does not support shallow capabilities"
9146ef75 24209msgstr "哑 http 传输不支持浅克隆能力"
d46c5519 24210
7e6630a7 24211#: remote-curl.c:1146
d46c5519
JX
24212msgid "fetch failed."
24213msgstr "获取失败。"
24214
7e6630a7 24215#: remote-curl.c:1192
d46c5519
JX
24216msgid "cannot fetch by sha1 over smart http"
24217msgstr "无法通过智能 HTTP 获取 sha1"
24218
7e6630a7 24219#: remote-curl.c:1236 remote-curl.c:1242
d46c5519
JX
24220#, c-format
24221msgid "protocol error: expected sha/ref, got '%s'"
24222msgstr "协议错误:期望 sha/ref,却得到 '%s'"
24223
7e6630a7 24224#: remote-curl.c:1254 remote-curl.c:1372
d46c5519
JX
24225#, c-format
24226msgid "http transport does not support %s"
24227msgstr "http 传输协议不支持 %s"
24228
7e6630a7 24229#: remote-curl.c:1290
d46c5519
JX
24230msgid "git-http-push failed"
24231msgstr "git-http-push 失败"
24232
7e6630a7 24233#: remote-curl.c:1478
d46c5519
JX
24234msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
24235msgstr "remote-curl:用法:git remote-curl <远程> [<url>]"
24236
7e6630a7 24237#: remote-curl.c:1510
d46c5519
JX
24238msgid "remote-curl: error reading command stream from git"
24239msgstr "remote-curl:错误读取来自 git 的命令流"
24240
7e6630a7 24241#: remote-curl.c:1517
d46c5519
JX
24242msgid "remote-curl: fetch attempted without a local repo"
24243msgstr "remote-curl:尝试没有本地仓库下获取"
24244
7e6630a7 24245#: remote-curl.c:1558
d46c5519
JX
24246#, c-format
24247msgid "remote-curl: unknown command '%s' from git"
24248msgstr "remote-curl:未知的来自 git 的命令 '%s'"
24249
65387fd5
FZ
24250#: contrib/scalar/scalar.c:49
24251msgid "need a working directory"
24252msgstr "需要一个工作目录"
349ede6a 24253
65387fd5
FZ
24254#: contrib/scalar/scalar.c:86
24255msgid "could not find enlistment root"
24256msgstr "无法找到登记根"
349ede6a 24257
65387fd5
FZ
24258#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
24259#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
24260#, c-format
24261msgid "could not switch to '%s'"
24262msgstr "无法切换到 '%s'"
d46c5519 24263
65387fd5
FZ
24264#: contrib/scalar/scalar.c:180
24265#, c-format
24266msgid "could not configure %s=%s"
24267msgstr "无法配置 %s=%s"
d46c5519 24268
65387fd5
FZ
24269#: contrib/scalar/scalar.c:198
24270msgid "could not configure log.excludeDecoration"
24271msgstr "无法配置 log.excludeDecoration"
24272
24273#: contrib/scalar/scalar.c:219
24274msgid "Scalar enlistments require a worktree"
24275msgstr "Scalar 登记需要一个工作树"
24276
24277#: contrib/scalar/scalar.c:311
24278#, c-format
24279msgid "remote HEAD is not a branch: '%.*s'"
24280msgstr "远程 HEAD 不是一个分支:'%.*s'"
24281
24282#: contrib/scalar/scalar.c:317
24283msgid "failed to get default branch name from remote; using local default"
24284msgstr "无法从远程获取默认分支名称;使用本地默认值"
24285
24286#: contrib/scalar/scalar.c:330
24287msgid "failed to get default branch name"
24288msgstr "无法获取默认分支名称"
24289
24290#: contrib/scalar/scalar.c:341
24291msgid "failed to unregister repository"
24292msgstr "无法取消注册仓库"
24293
24294#: contrib/scalar/scalar.c:356
24295msgid "failed to delete enlistment directory"
24296msgstr "无法删除登记目录"
24297
24298#: contrib/scalar/scalar.c:376
24299msgid "branch to checkout after clone"
24300msgstr "克隆后要检出的分支"
24301
24302#: contrib/scalar/scalar.c:378
24303msgid "when cloning, create full working directory"
24304msgstr "在克隆时,创建完整的工作目录"
24305
24306#: contrib/scalar/scalar.c:380
24307msgid "only download metadata for the branch that will be checked out"
24308msgstr "只下载要检出的分支的元信息"
24309
24310#: contrib/scalar/scalar.c:385
24311msgid "scalar clone [<options>] [--] <repo> [<dir>]"
24312msgstr "scalar clone [<选项>] [--] <仓库> [<目录>]"
24313
24314#: contrib/scalar/scalar.c:410
24315#, c-format
24316msgid "cannot deduce worktree name from '%s'"
24317msgstr "无法从 '%s' 猜测工作区名称"
24318
24319#: contrib/scalar/scalar.c:419
24320#, c-format
24321msgid "directory '%s' exists already"
24322msgstr "目录 '%s' 已存在"
24323
24324#: contrib/scalar/scalar.c:446
24325#, c-format
24326msgid "failed to get default branch for '%s'"
24327msgstr "无法获取 '%s' 的默认分支"
24328
24329#: contrib/scalar/scalar.c:457
24330#, c-format
24331msgid "could not configure remote in '%s'"
24332msgstr "无法在 '%s' 中配置远程"
24333
24334#: contrib/scalar/scalar.c:466
24335#, c-format
24336msgid "could not configure '%s'"
24337msgstr "无法配置 '%s'"
24338
24339#: contrib/scalar/scalar.c:469
24340msgid "partial clone failed; attempting full clone"
24341msgstr "部分克隆失败;尝试完整克隆"
24342
24343#: contrib/scalar/scalar.c:473
24344msgid "could not configure for full clone"
24345msgstr "无法配置完整克隆"
24346
24347#: contrib/scalar/scalar.c:505
24348msgid "`scalar list` does not take arguments"
24349msgstr "`scalar list` 不带参数"
24350
24351#: contrib/scalar/scalar.c:518
24352msgid "scalar register [<enlistment>]"
24353msgstr "scalar register [<登记>]"
24354
24355#: contrib/scalar/scalar.c:545
24356msgid "reconfigure all registered enlistments"
24357msgstr "重新配置所有注册的登记"
24358
24359#: contrib/scalar/scalar.c:549
24360msgid "scalar reconfigure [--all | <enlistment>]"
24361msgstr "scalar reconfigure [--all | <登记>]"
24362
24363#: contrib/scalar/scalar.c:567
24364msgid "--all or <enlistment>, but not both"
24365msgstr "--all 或者 <登记>,而不是两个一起"
24366
24367#: contrib/scalar/scalar.c:582
24368#, c-format
24369msgid "git repository gone in '%s'"
24370msgstr "在 '%s' 的 git 仓库已消失"
24371
24372#: contrib/scalar/scalar.c:622
24373msgid ""
24374"scalar run <task> [<enlistment>]\n"
24375"Tasks:\n"
24376msgstr ""
24377"scalar run <任务> [<登记>]\n"
24378"任务:\n"
24379
24380#: contrib/scalar/scalar.c:640
24381#, c-format
24382msgid "no such task: '%s'"
24383msgstr "没有此任务:'%s'"
24384
24385#: contrib/scalar/scalar.c:690
24386msgid "scalar unregister [<enlistment>]"
24387msgstr "scalar unregister [<登记>]"
24388
24389#: contrib/scalar/scalar.c:737
24390msgid "scalar delete <enlistment>"
24391msgstr "scalar delete <登记>"
24392
24393#: contrib/scalar/scalar.c:752
24394msgid "refusing to delete current working directory"
24395msgstr "拒绝删除当前工作目录"
24396
24397#: contrib/scalar/scalar.c:767
24398msgid "include Git version"
24399msgstr "包括 Git 的版本"
24400
24401#: contrib/scalar/scalar.c:769
24402msgid "include Git's build options"
24403msgstr "包括 Git 的构建选项"
24404
24405#: contrib/scalar/scalar.c:773
24406msgid "scalar verbose [-v | --verbose] [--build-options]"
24407msgstr "scalar verbose [-v | --verbose] [--build-options]"
24408
24409#: contrib/scalar/scalar.c:821
24410msgid ""
24411"scalar <command> [<options>]\n"
24412"\n"
24413"Commands:\n"
24414msgstr ""
24415"scalar <命令> [<选项>]\n"
24416"\n"
24417"命令:\n"
24418
24419#: compat/compiler.h:26
24420msgid "no compiler information available\n"
24421msgstr "编译器信息不可用\n"
24422
24423#: compat/compiler.h:38
24424msgid "no libc information available\n"
24425msgstr "libc 信息不可用\n"
24426
24427#: list-objects-filter-options.h:94
24428msgid "args"
24429msgstr "参数"
24430
24431#: list-objects-filter-options.h:95
24432msgid "object filtering"
24433msgstr "对象过滤"
24434
24435#: parse-options.h:183
24436msgid "expiry-date"
fd8cb379 24437msgstr "到期时间"
7aea43ff 24438
7e6630a7 24439#: parse-options.h:197
fd8cb379
JX
24440msgid "no-op (backward compatibility)"
24441msgstr "空操作(向后兼容)"
7aea43ff 24442
65387fd5 24443#: parse-options.h:310
fd8cb379
JX
24444msgid "be more verbose"
24445msgstr "更加详细"
7aea43ff 24446
65387fd5 24447#: parse-options.h:312
fd8cb379
JX
24448msgid "be more quiet"
24449msgstr "更加安静"
7aea43ff 24450
65387fd5 24451#: parse-options.h:318
d9488fea
JX
24452msgid "use <n> digits to display object names"
24453msgstr "用 <n> 位数字显示对象名"
7aea43ff 24454
65387fd5 24455#: parse-options.h:337
d46c5519
JX
24456msgid "how to strip spaces and #comments from message"
24457msgstr "设置如何删除提交说明里的空格和#注释"
24458
65387fd5 24459#: parse-options.h:338
ddc12c42
JX
24460msgid "read pathspec from file"
24461msgstr "从文件读取路径表达式"
24462
65387fd5 24463#: parse-options.h:339
ddc12c42
JX
24464msgid ""
24465"with --pathspec-from-file, pathspec elements are separated with NUL character"
24466msgstr "使用 --pathspec-from-file,路径表达式用空字符分隔"
24467
65387fd5 24468#: ref-filter.h:98
d46c5519
JX
24469msgid "key"
24470msgstr "key"
24471
65387fd5 24472#: ref-filter.h:98
d46c5519
JX
24473msgid "field name to sort on"
24474msgstr "排序的字段名"
24475
24476#: rerere.h:44
24477msgid "update the index with reused conflict resolution if possible"
24478msgstr "如果可能,重用冲突解决更新索引"
24479
fd8cb379 24480#: command-list.h:50
8ada9598 24481msgid "Add file contents to the index"
81809b99 24482msgstr "添加文件内容至索引"
8ada9598 24483
fd8cb379
JX
24484#: command-list.h:51
24485msgid "Apply a series of patches from a mailbox"
24486msgstr "应用邮箱格式的系列补丁"
24487
24488#: command-list.h:52
24489msgid "Annotate file lines with commit information"
24490msgstr "使用提交信息注释文件行"
24491
24492#: command-list.h:53
24493msgid "Apply a patch to files and/or to the index"
24494msgstr "应用一个补丁到文件和/或索引区"
24495
24496#: command-list.h:54
4c27fcb5
JX
24497msgid "Import a GNU Arch repository into Git"
24498msgstr "将一个 GNU Arch 仓库导入到 Git"
fd8cb379
JX
24499
24500#: command-list.h:55
24501msgid "Create an archive of files from a named tree"
24502msgstr "基于一个指定的树创建文件存档"
24503
24504#: command-list.h:56
1b7f4a34
JX
24505msgid "Use binary search to find the commit that introduced a bug"
24506msgstr "通过二分查找定位引入 bug 的提交"
8ada9598 24507
fd8cb379
JX
24508#: command-list.h:57
24509msgid "Show what revision and author last modified each line of a file"
24510msgstr "显示文件每一行最后修改的版本和修改者"
24511
24512#: command-list.h:58
8ada9598 24513msgid "List, create, or delete branches"
81809b99 24514msgstr "列出、创建或删除分支"
8ada9598 24515
fd8cb379 24516#: command-list.h:59
349ede6a
JX
24517msgid "Collect information for user to file a bug report"
24518msgstr "收集信息以供用户提交错误报告"
24519
24520#: command-list.h:60
fd8cb379
JX
24521msgid "Move objects and refs by archive"
24522msgstr "通过归档移动对象和引用"
24523
349ede6a 24524#: command-list.h:61
fd8cb379
JX
24525msgid "Provide content or type and size information for repository objects"
24526msgstr "提供仓库对象的内容、类型或大小"
24527
349ede6a 24528#: command-list.h:62
fd8cb379
JX
24529msgid "Display gitattributes information"
24530msgstr "显示 gitattributes 信息"
24531
349ede6a 24532#: command-list.h:63
fd8cb379
JX
24533msgid "Debug gitignore / exclude files"
24534msgstr "调试 gitignore / exclude 文件"
24535
349ede6a 24536#: command-list.h:64
fd8cb379
JX
24537msgid "Show canonical names and email addresses of contacts"
24538msgstr "显示联系人的规范名称和电子邮件"
24539
349ede6a 24540#: command-list.h:65
65387fd5
FZ
24541msgid "Ensures that a reference name is well formed"
24542msgstr "确保引用名称格式正确"
24543
24544#: command-list.h:66
5bb01d4f
JX
24545msgid "Switch branches or restore working tree files"
24546msgstr "切换分支或恢复工作区文件"
8ada9598 24547
65387fd5 24548#: command-list.h:67
fd8cb379
JX
24549msgid "Copy files from the index to the working tree"
24550msgstr "从索引拷贝文件到工作区"
24551
349ede6a 24552#: command-list.h:68
fd8cb379
JX
24553msgid "Find commits yet to be applied to upstream"
24554msgstr "查找尚未应用到上游的提交"
24555
349ede6a 24556#: command-list.h:69
fd8cb379
JX
24557msgid "Apply the changes introduced by some existing commits"
24558msgstr "应用一些现存提交引入的修改"
24559
349ede6a 24560#: command-list.h:70
fd8cb379
JX
24561msgid "Graphical alternative to git-commit"
24562msgstr "git-commit 的图形替代界面"
24563
349ede6a 24564#: command-list.h:71
fd8cb379
JX
24565msgid "Remove untracked files from the working tree"
24566msgstr "从工作区中删除未跟踪文件"
24567
349ede6a 24568#: command-list.h:72
8ada9598 24569msgid "Clone a repository into a new directory"
06991777 24570msgstr "克隆仓库到一个新目录"
8ada9598 24571
349ede6a 24572#: command-list.h:73
fd8cb379
JX
24573msgid "Display data in columns"
24574msgstr "以列的方式显示数据"
24575
349ede6a 24576#: command-list.h:74
8ada9598 24577msgid "Record changes to the repository"
160fb2b2 24578msgstr "记录变更到仓库"
8ada9598 24579
349ede6a 24580#: command-list.h:75
4c27fcb5
JX
24581msgid "Write and verify Git commit-graph files"
24582msgstr "写入和校验 Git 提交图文件"
fd8cb379 24583
349ede6a 24584#: command-list.h:76
fd8cb379
JX
24585msgid "Create a new commit object"
24586msgstr "创建一个新的提交对象"
24587
349ede6a 24588#: command-list.h:77
fd8cb379
JX
24589msgid "Get and set repository or global options"
24590msgstr "获取和设置仓库或者全局选项"
24591
349ede6a 24592#: command-list.h:78
fd8cb379
JX
24593msgid "Count unpacked number of objects and their disk consumption"
24594msgstr "计算未打包对象的数量和磁盘空间占用"
24595
349ede6a 24596#: command-list.h:79
fd8cb379
JX
24597msgid "Retrieve and store user credentials"
24598msgstr "检索和存储用户密码"
24599
349ede6a 24600#: command-list.h:80
fd8cb379
JX
24601msgid "Helper to temporarily store passwords in memory"
24602msgstr "在内存中临时存储密码的助手"
24603
349ede6a 24604#: command-list.h:81
fd8cb379
JX
24605msgid "Helper to store credentials on disk"
24606msgstr "在磁盘存储密码的助手"
24607
349ede6a 24608#: command-list.h:82
fd8cb379
JX
24609msgid "Export a single commit to a CVS checkout"
24610msgstr "将一个提交导出到 CVS 检出中"
24611
349ede6a 24612#: command-list.h:83
fd8cb379 24613msgid "Salvage your data out of another SCM people love to hate"
7e6630a7 24614msgstr "从另外一个人们爱恨的配置管理系统中拯救您的数据"
fd8cb379 24615
349ede6a 24616#: command-list.h:84
fd8cb379
JX
24617msgid "A CVS server emulator for Git"
24618msgstr "Git 的一个 CVS 服务模拟器"
24619
349ede6a 24620#: command-list.h:85
fd8cb379
JX
24621msgid "A really simple server for Git repositories"
24622msgstr "一个非常简单的 Git 仓库服务器"
24623
349ede6a 24624#: command-list.h:86
fd8cb379
JX
24625msgid "Give an object a human readable name based on an available ref"
24626msgstr "基于一个现存的引用为一个对象起一个可读的名称"
24627
349ede6a 24628#: command-list.h:87
8ada9598 24629msgid "Show changes between commits, commit and working tree, etc"
81809b99 24630msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598 24631
349ede6a 24632#: command-list.h:88
fd8cb379
JX
24633msgid "Compares files in the working tree and the index"
24634msgstr "比较工作区和索引区中的文件"
24635
349ede6a 24636#: command-list.h:89
fd8cb379
JX
24637msgid "Compare a tree to the working tree or index"
24638msgstr "将一个树和工作区或索引做比较"
24639
349ede6a 24640#: command-list.h:90
fd8cb379
JX
24641msgid "Compares the content and mode of blobs found via two tree objects"
24642msgstr "比较两个树对象的文件内容和模式"
24643
349ede6a 24644#: command-list.h:91
fd8cb379
JX
24645msgid "Show changes using common diff tools"
24646msgstr "使用常见的差异工具显示更改"
24647
349ede6a 24648#: command-list.h:92
fd8cb379
JX
24649msgid "Git data exporter"
24650msgstr "Git 数据导出器"
24651
349ede6a 24652#: command-list.h:93
fd8cb379
JX
24653msgid "Backend for fast Git data importers"
24654msgstr "Git 快速数据导入器后端"
24655
349ede6a 24656#: command-list.h:94
8ada9598 24657msgid "Download objects and refs from another repository"
160fb2b2 24658msgstr "从另外一个仓库下载对象和引用"
8ada9598 24659
349ede6a 24660#: command-list.h:95
fd8cb379
JX
24661msgid "Receive missing objects from another repository"
24662msgstr "从另一个仓库获取缺失的对象"
24663
349ede6a 24664#: command-list.h:96
fd8cb379
JX
24665msgid "Rewrite branches"
24666msgstr "重写分支"
24667
349ede6a 24668#: command-list.h:97
fd8cb379
JX
24669msgid "Produce a merge commit message"
24670msgstr "生成一个合并提交信息"
24671
349ede6a 24672#: command-list.h:98
fd8cb379
JX
24673msgid "Output information on each ref"
24674msgstr "对每一个引用输出信息 "
24675
349ede6a 24676#: command-list.h:99
d13389bf
JX
24677msgid "Run a Git command on a list of repositories"
24678msgstr "在一个仓库列表上运行 Git 命令"
24679
24680#: command-list.h:100
fd8cb379
JX
24681msgid "Prepare patches for e-mail submission"
24682msgstr "准备电子邮件提交的补丁"
24683
d13389bf 24684#: command-list.h:101
fd8cb379
JX
24685msgid "Verifies the connectivity and validity of the objects in the database"
24686msgstr "验证仓库中对象的连通性和有效性"
24687
d13389bf 24688#: command-list.h:102
fd8cb379
JX
24689msgid "Cleanup unnecessary files and optimize the local repository"
24690msgstr "清除不必要的文件和优化本地仓库"
24691
d13389bf 24692#: command-list.h:103
fd8cb379 24693msgid "Extract commit ID from an archive created using git-archive"
5b533632 24694msgstr "从 git-archive 创建的归档文件中提取提交 ID"
fd8cb379 24695
d13389bf 24696#: command-list.h:104
8ada9598 24697msgid "Print lines matching a pattern"
81809b99 24698msgstr "输出和模式匹配的行"
8ada9598 24699
d13389bf 24700#: command-list.h:105
fd8cb379
JX
24701msgid "A portable graphical interface to Git"
24702msgstr "一个便携的 Git 图形客户端"
24703
d13389bf 24704#: command-list.h:106
fd8cb379 24705msgid "Compute object ID and optionally creates a blob from a file"
5b533632 24706msgstr "从一个文件计算对象 ID,并可以创建 blob 数据对象"
fd8cb379 24707
d13389bf 24708#: command-list.h:107
fd8cb379
JX
24709msgid "Display help information about Git"
24710msgstr "显示 Git 的帮助信息"
24711
d13389bf 24712#: command-list.h:108
fd8cb379
JX
24713msgid "Server side implementation of Git over HTTP"
24714msgstr "Git HTTP 协议的服务端实现"
24715
d13389bf 24716#: command-list.h:109
fd8cb379
JX
24717msgid "Download from a remote Git repository via HTTP"
24718msgstr "通过 HTTP 从远程 Git 仓库下载"
24719
d13389bf 24720#: command-list.h:110
fd8cb379
JX
24721msgid "Push objects over HTTP/DAV to another repository"
24722msgstr "通过 HTTP/DAV 推送对象另一个仓库"
24723
d13389bf 24724#: command-list.h:111
fd8cb379
JX
24725msgid "Send a collection of patches from stdin to an IMAP folder"
24726msgstr "从标准输入将一组补丁发送到IMAP文件夹"
24727
d13389bf 24728#: command-list.h:112
fd8cb379
JX
24729msgid "Build pack index file for an existing packed archive"
24730msgstr "从一个现存的包存档文件创建包索引"
24731
d13389bf 24732#: command-list.h:113
a77c07d9 24733msgid "Create an empty Git repository or reinitialize an existing one"
160fb2b2 24734msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
8ada9598 24735
d13389bf 24736#: command-list.h:114
fd8cb379
JX
24737msgid "Instantly browse your working repository in gitweb"
24738msgstr "在 gitweb 中即时浏览您的工作仓库"
24739
d13389bf 24740#: command-list.h:115
d46c5519 24741msgid "Add or parse structured information in commit messages"
fd8cb379
JX
24742msgstr "添加或解析提交说明中的结构化信息"
24743
d13389bf 24744#: command-list.h:116
8ada9598 24745msgid "Show commit logs"
81809b99 24746msgstr "显示提交日志"
8ada9598 24747
65387fd5 24748#: command-list.h:117
fd8cb379
JX
24749msgid "Show information about files in the index and the working tree"
24750msgstr "显示索引和工作区中文件的信息"
24751
65387fd5 24752#: command-list.h:118
fd8cb379
JX
24753msgid "List references in a remote repository"
24754msgstr "显示一个远程仓库的引用"
24755
65387fd5 24756#: command-list.h:119
fd8cb379
JX
24757msgid "List the contents of a tree object"
24758msgstr "显示一个树对象的内容"
24759
65387fd5 24760#: command-list.h:120
fd8cb379
JX
24761msgid "Extracts patch and authorship from a single e-mail message"
24762msgstr "从单个电子邮件中提取补丁和作者身份"
24763
65387fd5 24764#: command-list.h:121
fd8cb379
JX
24765msgid "Simple UNIX mbox splitter program"
24766msgstr "简单的 UNIX mbox 邮箱切分程序"
24767
65387fd5 24768#: command-list.h:122
d9488fea
JX
24769msgid "Run tasks to optimize Git repository data"
24770msgstr "运行任务以优化仓库数据"
24771
65387fd5 24772#: command-list.h:123
8ada9598 24773msgid "Join two or more development histories together"
81809b99 24774msgstr "合并两个或更多开发历史"
8ada9598 24775
65387fd5 24776#: command-list.h:124
fd8cb379
JX
24777msgid "Find as good common ancestors as possible for a merge"
24778msgstr "为了合并查找尽可能好的公共祖先提交"
24779
65387fd5 24780#: command-list.h:125
fd8cb379
JX
24781msgid "Run a three-way file merge"
24782msgstr "运行一个三路文件合并"
24783
65387fd5 24784#: command-list.h:126
fd8cb379
JX
24785msgid "Run a merge for files needing merging"
24786msgstr "对于需要合并的文件执行合并"
24787
65387fd5 24788#: command-list.h:127
fd8cb379
JX
24789msgid "The standard helper program to use with git-merge-index"
24790msgstr "与 git-merge-index 一起使用的标准向导程序"
24791
65387fd5
FZ
24792#: command-list.h:128
24793msgid "Show three-way merge without touching index"
24794msgstr "在不动索引的情况下显示三路合并"
24795
d13389bf 24796#: command-list.h:129
fd8cb379
JX
24797msgid "Run merge conflict resolution tools to resolve merge conflicts"
24798msgstr "运行合并冲突解决工具以解决合并冲突"
24799
d13389bf 24800#: command-list.h:130
473eb541
JX
24801msgid "Creates a tag object with extra validation"
24802msgstr "创建一个有额外验证的标签对象"
fd8cb379 24803
65387fd5 24804#: command-list.h:131
fd8cb379
JX
24805msgid "Build a tree-object from ls-tree formatted text"
24806msgstr "基于 ls-tree 的格式化文本创建一个树对象"
24807
65387fd5
FZ
24808#: command-list.h:132
24809msgid "Write and verify multi-pack-indexes"
24810msgstr "写入和校验多包索引"
24811
24812#: command-list.h:133
8ada9598 24813msgid "Move or rename a file, a directory, or a symlink"
81809b99 24814msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598 24815
fd8cb379 24816# 查找给定版本的符号名称
65387fd5 24817#: command-list.h:134
fd8cb379
JX
24818msgid "Find symbolic names for given revs"
24819msgstr "查找给定版本的符号名称"
24820
65387fd5 24821#: command-list.h:135
fd8cb379
JX
24822msgid "Add or inspect object notes"
24823msgstr "添加或检查对象注释"
24824
65387fd5 24825#: command-list.h:136
fd8cb379
JX
24826msgid "Import from and submit to Perforce repositories"
24827msgstr "导入和提交到 Perforce 仓库中"
24828
65387fd5 24829#: command-list.h:137
fd8cb379
JX
24830msgid "Create a packed archive of objects"
24831msgstr "创建对象的存档包"
24832
65387fd5 24833#: command-list.h:138
fd8cb379
JX
24834msgid "Find redundant pack files"
24835msgstr "查找冗余的包文件"
24836
65387fd5 24837#: command-list.h:139
fd8cb379
JX
24838msgid "Pack heads and tags for efficient repository access"
24839msgstr "打包头和标签以实现高效的仓库访问"
24840
65387fd5 24841#: command-list.h:140
fd8cb379 24842msgid "Compute unique ID for a patch"
5b533632 24843msgstr "计算一个补丁的唯一 ID"
fd8cb379 24844
65387fd5 24845#: command-list.h:141
fd8cb379
JX
24846msgid "Prune all unreachable objects from the object database"
24847msgstr "删除对象库中所有不可达对象"
24848
65387fd5 24849#: command-list.h:142
fd8cb379
JX
24850msgid "Remove extra objects that are already in pack files"
24851msgstr "删除已经在包文件中的多余对象"
24852
65387fd5 24853#: command-list.h:143
2e8451e8 24854msgid "Fetch from and integrate with another repository or a local branch"
160fb2b2 24855msgstr "获取并整合另外的仓库或一个本地分支"
8ada9598 24856
65387fd5 24857#: command-list.h:144
8ada9598 24858msgid "Update remote refs along with associated objects"
81809b99 24859msgstr "更新远程引用和相关的对象"
8ada9598 24860
65387fd5 24861#: command-list.h:145
fd8cb379
JX
24862msgid "Applies a quilt patchset onto the current branch"
24863msgstr "将一个 quilt 补丁集应用到当前分支。"
24864
65387fd5 24865#: command-list.h:146
c1ac5258
JX
24866msgid "Compare two commit ranges (e.g. two versions of a branch)"
24867msgstr "比较两个提交范围(如一个分支的两个版本)"
24868
65387fd5 24869#: command-list.h:147
fd8cb379
JX
24870msgid "Reads tree information into the index"
24871msgstr "将树信息读取到索引"
24872
65387fd5 24873#: command-list.h:148
3495628d
JX
24874msgid "Reapply commits on top of another base tip"
24875msgstr "在另一个分支上重新应用提交"
8ada9598 24876
65387fd5 24877#: command-list.h:149
fd8cb379
JX
24878msgid "Receive what is pushed into the repository"
24879msgstr "接收推送到仓库中的对象"
24880
65387fd5 24881#: command-list.h:150
fd8cb379
JX
24882msgid "Manage reflog information"
24883msgstr "管理 reflog 信息"
24884
65387fd5 24885#: command-list.h:151
fd8cb379
JX
24886msgid "Manage set of tracked repositories"
24887msgstr "管理已跟踪仓库"
24888
65387fd5 24889#: command-list.h:152
fd8cb379
JX
24890msgid "Pack unpacked objects in a repository"
24891msgstr "打包仓库中未打包对象"
24892
65387fd5 24893#: command-list.h:153
fd8cb379
JX
24894msgid "Create, list, delete refs to replace objects"
24895msgstr "创建、列出、删除对象替换引用"
24896
65387fd5 24897#: command-list.h:154
fd8cb379
JX
24898msgid "Generates a summary of pending changes"
24899msgstr "生成待定更改的摘要"
24900
65387fd5 24901#: command-list.h:155
fd8cb379
JX
24902msgid "Reuse recorded resolution of conflicted merges"
24903msgstr "重用冲突合并的解决方案记录"
24904
65387fd5 24905#: command-list.h:156
8ada9598 24906msgid "Reset current HEAD to the specified state"
4375c10e 24907msgstr "重置当前 HEAD 到指定状态"
8ada9598 24908
65387fd5 24909#: command-list.h:157
a6cd2cc4
JX
24910msgid "Restore working tree files"
24911msgstr "恢复工作区文件"
24912
65387fd5 24913#: command-list.h:158
fd8cb379
JX
24914msgid "Lists commit objects in reverse chronological order"
24915msgstr "按时间顺序列出提交对象"
24916
65387fd5 24917#: command-list.h:159
fd8cb379
JX
24918msgid "Pick out and massage parameters"
24919msgstr "选出并处理参数"
24920
65387fd5
FZ
24921#: command-list.h:160
24922msgid "Revert some existing commits"
24923msgstr "回退一些现存提交"
24924
24925#: command-list.h:161
8ada9598 24926msgid "Remove files from the working tree and from the index"
81809b99 24927msgstr "从工作区和索引中删除文件"
8ada9598 24928
65387fd5 24929#: command-list.h:162
fd8cb379
JX
24930msgid "Send a collection of patches as emails"
24931msgstr "通过电子邮件发送一组补丁"
24932
65387fd5 24933#: command-list.h:163
fd8cb379
JX
24934msgid "Push objects over Git protocol to another repository"
24935msgstr "使用 Git 协议推送对象到另一个仓库"
24936
65387fd5
FZ
24937#: command-list.h:164
24938msgid "Git's i18n setup code for shell scripts"
24939msgstr "为 shell 脚本准备的 Git 国际化设置代码"
24940
d9488fea 24941#: command-list.h:165
65387fd5
FZ
24942msgid "Common Git shell script setup code"
24943msgstr "常用的 Git shell 脚本设置代码"
24944
24945#: command-list.h:166
fd8cb379
JX
24946msgid "Restricted login shell for Git-only SSH access"
24947msgstr "只允许 Git SSH 访问的受限登录shell"
24948
65387fd5 24949#: command-list.h:167
fd8cb379
JX
24950msgid "Summarize 'git log' output"
24951msgstr "'git log' 输出摘要"
24952
65387fd5 24953#: command-list.h:168
8ada9598 24954msgid "Show various types of objects"
81809b99 24955msgstr "显示各种类型的对象"
8ada9598 24956
65387fd5 24957#: command-list.h:169
fd8cb379
JX
24958msgid "Show branches and their commits"
24959msgstr "显示分支和提交"
24960
65387fd5 24961#: command-list.h:170
fd8cb379
JX
24962msgid "Show packed archive index"
24963msgstr "显示打包归档索引"
24964
65387fd5 24965#: command-list.h:171
fd8cb379
JX
24966msgid "List references in a local repository"
24967msgstr "显示本地仓库中的引用"
24968
d9488fea 24969#: command-list.h:172
ddc12c42
JX
24970msgid "Initialize and modify the sparse-checkout"
24971msgstr "初始化及修改稀疏检出"
24972
65387fd5
FZ
24973#: command-list.h:173
24974msgid "Add file contents to the staging area"
24975msgstr "将文件内容添加到暂存区"
24976
d9488fea 24977#: command-list.h:174
fd8cb379
JX
24978msgid "Stash the changes in a dirty working directory away"
24979msgstr "贮藏脏工作区中的修改"
24980
d9488fea 24981#: command-list.h:175
8ada9598 24982msgid "Show the working tree status"
81809b99 24983msgstr "显示工作区状态"
8ada9598 24984
65387fd5 24985#: command-list.h:176
fd8cb379
JX
24986msgid "Remove unnecessary whitespace"
24987msgstr "删除不必要的空白字符"
24988
65387fd5 24989#: command-list.h:177
fd8cb379
JX
24990msgid "Initialize, update or inspect submodules"
24991msgstr "初始化、更新或检查子模组"
24992
65387fd5 24993#: command-list.h:178
fd8cb379
JX
24994msgid "Bidirectional operation between a Subversion repository and Git"
24995msgstr "Subersion 仓库和 Git 之间的双向操作"
24996
65387fd5 24997#: command-list.h:179
a6cd2cc4
JX
24998msgid "Switch branches"
24999msgstr "切换分支"
25000
65387fd5 25001#: command-list.h:180
fd8cb379
JX
25002msgid "Read, modify and delete symbolic refs"
25003msgstr "读取、修改和删除符号引用"
25004
65387fd5 25005#: command-list.h:181
8ada9598 25006msgid "Create, list, delete or verify a tag object signed with GPG"
4375c10e 25007msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
8ada9598 25008
65387fd5 25009#: command-list.h:182
fd8cb379
JX
25010msgid "Creates a temporary file with a blob's contents"
25011msgstr "用 blob 数据对象的内容创建一个临时文件"
220c313c 25012
65387fd5 25013#: command-list.h:183
fd8cb379
JX
25014msgid "Unpack objects from a packed archive"
25015msgstr "从打包文件中解压缩对象"
220c313c 25016
65387fd5 25017#: command-list.h:184
fd8cb379
JX
25018msgid "Register file contents in the working tree to the index"
25019msgstr "将工作区的文件内容注册到索引"
220c313c 25020
65387fd5 25021#: command-list.h:185
fd8cb379
JX
25022msgid "Update the object name stored in a ref safely"
25023msgstr "安全地更新存储于引用中的对象名称"
220c313c 25024
65387fd5 25025#: command-list.h:186
fd8cb379
JX
25026msgid "Update auxiliary info file to help dumb servers"
25027msgstr "更新辅助信息文件以帮助哑协议服务"
25028
65387fd5 25029#: command-list.h:187
fd8cb379
JX
25030msgid "Send archive back to git-archive"
25031msgstr "将存档发送回 git-archive"
25032
65387fd5 25033#: command-list.h:188
fd8cb379
JX
25034msgid "Send objects packed back to git-fetch-pack"
25035msgstr "将对象压缩包发送回 git-fetch-pack"
25036
65387fd5 25037#: command-list.h:189
fd8cb379
JX
25038msgid "Show a Git logical variable"
25039msgstr "显示一个Git逻辑变量"
25040
65387fd5 25041#: command-list.h:190
fd8cb379
JX
25042msgid "Check the GPG signature of commits"
25043msgstr "检查 GPG 提交签名"
25044
65387fd5 25045#: command-list.h:191
fd8cb379
JX
25046msgid "Validate packed Git archive files"
25047msgstr "校验打包的Git存仓文件"
25048
65387fd5 25049#: command-list.h:192
fd8cb379
JX
25050msgid "Check the GPG signature of tags"
25051msgstr "检查标签的 GPG 签名"
25052
65387fd5 25053#: command-list.h:193
fd8cb379
JX
25054msgid "Show logs with difference each commit introduces"
25055msgstr "显示每一个提交引入的差异日志"
25056
65387fd5 25057#: command-list.h:194
fd8cb379
JX
25058msgid "Manage multiple working trees"
25059msgstr "管理多个工作区"
25060
65387fd5 25061#: command-list.h:195
fd8cb379
JX
25062msgid "Create a tree object from the current index"
25063msgstr "从当前索引创建一个树对象"
25064
65387fd5 25065#: command-list.h:196
fd8cb379
JX
25066msgid "Defining attributes per path"
25067msgstr "定义路径的属性"
25068
65387fd5 25069#: command-list.h:197
fd8cb379
JX
25070msgid "Git command-line interface and conventions"
25071msgstr "Git 命令行界面和约定"
25072
65387fd5 25073#: command-list.h:198
fd8cb379
JX
25074msgid "A Git core tutorial for developers"
25075msgstr "面向开发人员的 Git 核心教程"
25076
65387fd5 25077#: command-list.h:199
d9488fea
JX
25078msgid "Providing usernames and passwords to Git"
25079msgstr "为 Git 提供用户名和口令"
25080
65387fd5 25081#: command-list.h:200
fd8cb379
JX
25082msgid "Git for CVS users"
25083msgstr "适合 CVS 用户的 Git 帮助"
25084
65387fd5 25085#: command-list.h:201
fd8cb379
JX
25086msgid "Tweaking diff output"
25087msgstr "调整差异输出"
25088
65387fd5 25089#: command-list.h:202
fd8cb379
JX
25090msgid "A useful minimum set of commands for Everyday Git"
25091msgstr "每一天 Git 的一组有用的最小命令集合"
25092
65387fd5 25093#: command-list.h:203
349ede6a
JX
25094msgid "Frequently asked questions about using Git"
25095msgstr "关于使用 Git 的常见问题"
25096
65387fd5 25097#: command-list.h:204
fd8cb379
JX
25098msgid "A Git Glossary"
25099msgstr "Git 词汇表"
25100
65387fd5 25101#: command-list.h:205
fd8cb379
JX
25102msgid "Hooks used by Git"
25103msgstr "Git 使用的钩子"
25104
65387fd5 25105#: command-list.h:206
fd8cb379
JX
25106msgid "Specifies intentionally untracked files to ignore"
25107msgstr "忽略指定的未跟踪文件"
25108
65387fd5
FZ
25109#: command-list.h:207
25110msgid "The Git repository browser"
25111msgstr "Git 仓库浏览器"
25112
25113#: command-list.h:208
473eb541
JX
25114msgid "Map author/committer names and/or E-Mail addresses"
25115msgstr "映射作者/提交者的名称和/或邮件地址"
25116
65387fd5 25117#: command-list.h:209
fd8cb379
JX
25118msgid "Defining submodule properties"
25119msgstr "定义子模组属性"
25120
65387fd5 25121#: command-list.h:210
fd8cb379
JX
25122msgid "Git namespaces"
25123msgstr "Git 名字空间"
25124
65387fd5 25125#: command-list.h:211
d9488fea
JX
25126msgid "Helper programs to interact with remote repositories"
25127msgstr "与远程仓库交互的助手程序"
25128
65387fd5 25129#: command-list.h:212
fd8cb379
JX
25130msgid "Git Repository Layout"
25131msgstr "Git 仓库布局"
25132
65387fd5 25133#: command-list.h:213
fd8cb379
JX
25134msgid "Specifying revisions and ranges for Git"
25135msgstr "指定 Git 的版本和版本范围"
25136
65387fd5 25137#: command-list.h:214
ddc12c42
JX
25138msgid "Mounting one repository inside another"
25139msgstr "将一个仓库安装到另外一个仓库中"
25140
65387fd5
FZ
25141#: command-list.h:215
25142msgid "A tutorial introduction to Git"
25143msgstr "Git 入门教程"
25144
473eb541 25145#: command-list.h:216
fd8cb379 25146msgid "A tutorial introduction to Git: part two"
65387fd5 25147msgstr "Git 入门教程:第二部分"
fd8cb379 25148
473eb541 25149#: command-list.h:217
65387fd5
FZ
25150msgid "Git web interface (web frontend to Git repositories)"
25151msgstr "Git web 界面(Git 仓库的 web 前端)"
fd8cb379 25152
473eb541 25153#: command-list.h:218
fd8cb379
JX
25154msgid "An overview of recommended workflows with Git"
25155msgstr "Git 推荐的工作流概览"
220c313c 25156
5c57d762
JX
25157#: git-merge-octopus.sh:46
25158msgid ""
25159"Error: Your local changes to the following files would be overwritten by "
25160"merge"
25161msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
25162
25163#: git-merge-octopus.sh:61
25164msgid "Automated merge did not work."
9a4b694c 25165msgstr "自动合并未生效。"
5c57d762
JX
25166
25167#: git-merge-octopus.sh:62
a0b6b246 25168msgid "Should not be doing an octopus."
5c57d762
JX
25169msgstr "不应该执行章鱼式合并。"
25170
25171#: git-merge-octopus.sh:73
25172#, sh-format
25173msgid "Unable to find common commit with $pretty_name"
25174msgstr "无法找到和 $pretty_name 的基线提交"
25175
25176#: git-merge-octopus.sh:77
25177#, sh-format
6937cb4e 25178msgid "Already up to date with $pretty_name"
5c57d762
JX
25179msgstr "已经和 $pretty_name 保持一致"
25180
25181#: git-merge-octopus.sh:89
25182#, sh-format
25183msgid "Fast-forwarding to: $pretty_name"
25184msgstr "快进至:$pretty_name"
25185
25186#: git-merge-octopus.sh:97
25187#, sh-format
25188msgid "Trying simple merge with $pretty_name"
25189msgstr "尝试和 $pretty_name 的简单合并"
25190
25191#: git-merge-octopus.sh:102
25192msgid "Simple merge did not work, trying automatic merge."
9a4b694c 25193msgstr "简单合并未生效,尝试自动合并。"
5c57d762 25194
7e6630a7 25195#: git-submodule.sh:401
c04f5ac3 25196#, sh-format
2e8451e8
JX
25197msgid "Unable to find current revision in submodule path '$displaypath'"
25198msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 25199
7e6630a7 25200#: git-submodule.sh:411
c04f5ac3 25201#, sh-format
170e9899
JX
25202msgid "Unable to fetch in submodule path '$sm_path'"
25203msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 25204
7e6630a7 25205#: git-submodule.sh:416
5c57d762
JX
25206#, sh-format
25207msgid ""
25208"Unable to find current ${remote_name}/${branch} revision in submodule path "
25209"'$sm_path'"
9a4b694c 25210msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
5c57d762 25211
7e6630a7 25212#: git-submodule.sh:464
2e8451e8
JX
25213#, sh-format
25214msgid "Failed to recurse into submodule path '$displaypath'"
25215msgstr "无法递归进子模组路径 '$displaypath'"
25216
5c57d762
JX
25217#: git-sh-setup.sh:89 git-sh-setup.sh:94
25218#, sh-format
25219msgid "usage: $dashless $USAGE"
25220msgstr "用法:$dashless $USAGE"
25221
65387fd5 25222#: git-sh-setup.sh:183
5c57d762
JX
25223#, sh-format
25224msgid "Cannot chdir to $cdup, the toplevel of the working tree"
9a4b694c 25225msgstr "不能切换目录到 $cdup,工作区的顶级目录"
5c57d762 25226
65387fd5 25227#: git-sh-setup.sh:192 git-sh-setup.sh:199
5c57d762
JX
25228#, sh-format
25229msgid "fatal: $program_name cannot be used without a working tree."
06991777 25230msgstr "致命错误:$program_name 不能在没有工作区的情况下使用"
5c57d762 25231
65387fd5 25232#: git-sh-setup.sh:213
5c57d762
JX
25233msgid "Cannot rewrite branches: You have unstaged changes."
25234msgstr "不能重写分支:您有未暂存的变更。"
25235
65387fd5 25236#: git-sh-setup.sh:216
5c57d762
JX
25237#, sh-format
25238msgid "Cannot $action: You have unstaged changes."
25239msgstr "不能 $action:您有未暂存的变更。"
25240
65387fd5 25241#: git-sh-setup.sh:227
5c57d762
JX
25242#, sh-format
25243msgid "Cannot $action: Your index contains uncommitted changes."
25244msgstr "不能 $action:您的索引中包含未提交的变更。"
25245
65387fd5 25246#: git-sh-setup.sh:229
a0b6b246
JX
25247msgid "Additionally, your index contains uncommitted changes."
25248msgstr "而且您的索引中包含未提交的变更。"
25249
65387fd5 25250#: git-sh-setup.sh:349
5c57d762
JX
25251msgid "You need to run this command from the toplevel of the working tree."
25252msgstr "您需要在工作区的顶级目录中运行这个命令。"
25253
65387fd5 25254#: git-sh-setup.sh:354
5c57d762
JX
25255msgid "Unable to determine absolute path of git directory"
25256msgstr "不能确定 git 目录的绝对路径"
a0b6b246 25257
1a79b2f1 25258#. TRANSLATORS: you can adjust this to align "git add -i" status menu
ddc12c42 25259#: git-add--interactive.perl:212
1a79b2f1
JX
25260#, perl-format
25261msgid "%12s %12s %s"
25262msgstr "%12s %12s %s"
25263
d13389bf 25264#: git-add--interactive.perl:632
1a79b2f1
JX
25265#, perl-format
25266msgid "touched %d path\n"
25267msgid_plural "touched %d paths\n"
25268msgstr[0] "触碰了 %d 个路径\n"
25269msgstr[1] "触碰了 %d 个路径\n"
25270
d13389bf 25271#: git-add--interactive.perl:1056
1a79b2f1
JX
25272msgid ""
25273"If the patch applies cleanly, the edited hunk will immediately be\n"
25274"marked for staging."
25275msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
25276
d13389bf 25277#: git-add--interactive.perl:1059
1a79b2f1
JX
25278msgid ""
25279"If the patch applies cleanly, the edited hunk will immediately be\n"
25280"marked for stashing."
a4f16749 25281msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。"
1a79b2f1 25282
d13389bf 25283#: git-add--interactive.perl:1062
1a79b2f1
JX
25284msgid ""
25285"If the patch applies cleanly, the edited hunk will immediately be\n"
25286"marked for unstaging."
25287msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
25288
d13389bf
JX
25289#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
25290#: git-add--interactive.perl:1080
1a79b2f1
JX
25291msgid ""
25292"If the patch applies cleanly, the edited hunk will immediately be\n"
25293"marked for applying."
25294msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
25295
d13389bf
JX
25296#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
25297#: git-add--interactive.perl:1077
1a79b2f1
JX
25298msgid ""
25299"If the patch applies cleanly, the edited hunk will immediately be\n"
25300"marked for discarding."
25301msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
25302
d13389bf 25303#: git-add--interactive.perl:1114
1a79b2f1
JX
25304#, perl-format
25305msgid "failed to open hunk edit file for writing: %s"
65387fd5 25306msgstr "无法为写入打开块编辑文件:%s"
1a79b2f1 25307
d13389bf 25308#: git-add--interactive.perl:1121
1a79b2f1
JX
25309#, perl-format
25310msgid ""
25311"---\n"
25312"To remove '%s' lines, make them ' ' lines (context).\n"
25313"To remove '%s' lines, delete them.\n"
25314"Lines starting with %s will be removed.\n"
25315msgstr ""
25316"---\n"
25317"要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
25318"要删除 '%s' 开始的行,删除它们。\n"
25319"以 %s 开始的行将被删除。\n"
25320
d13389bf 25321#: git-add--interactive.perl:1143
1a79b2f1
JX
25322#, perl-format
25323msgid "failed to open hunk edit file for reading: %s"
25324msgstr "无法读取块编辑文件:%s"
25325
65387fd5 25326#: git-add--interactive.perl:1253
1a79b2f1
JX
25327msgid ""
25328"y - stage this hunk\n"
25329"n - do not stage this hunk\n"
25330"q - quit; do not stage this hunk or any of the remaining ones\n"
25331"a - stage this hunk and all later hunks in the file\n"
25332"d - do not stage this hunk or any of the later hunks in the file"
25333msgstr ""
25334"y - 暂存该块\n"
25335"n - 不要暂存该块\n"
25336"q - 退出。不暂存该块及后面的全部块\n"
25337"a - 暂存该块和本文件中后面的全部块\n"
25338"d - 不暂存该块和本文件中后面的全部块"
25339
65387fd5 25340#: git-add--interactive.perl:1259
1a79b2f1
JX
25341msgid ""
25342"y - stash this hunk\n"
25343"n - do not stash this hunk\n"
25344"q - quit; do not stash this hunk or any of the remaining ones\n"
25345"a - stash this hunk and all later hunks in the file\n"
25346"d - do not stash this hunk or any of the later hunks in the file"
25347msgstr ""
25348"y - 贮藏该块\n"
25349"n - 不要贮藏该块\n"
25350"q - 退出。不贮藏该块及后面的全部块\n"
25351"a - 贮藏该块和本文件中后面的全部块\n"
25352"d - 不贮藏该块和本文件中后面的全部块"
25353
65387fd5 25354#: git-add--interactive.perl:1265
1a79b2f1
JX
25355msgid ""
25356"y - unstage this hunk\n"
25357"n - do not unstage this hunk\n"
25358"q - quit; do not unstage this hunk or any of the remaining ones\n"
25359"a - unstage this hunk and all later hunks in the file\n"
25360"d - do not unstage this hunk or any of the later hunks in the file"
25361msgstr ""
25362"y - 不暂存该块\n"
25363"n - 不要不暂存该块\n"
25364"q - 退出。不要不暂存该块及后面的全部块\n"
25365"a - 不暂存该块和本文件中后面的全部块\n"
25366"d - 不要不暂存该块和本文件中后面的全部块"
25367
65387fd5 25368#: git-add--interactive.perl:1271
1a79b2f1
JX
25369msgid ""
25370"y - apply this hunk to index\n"
25371"n - do not apply this hunk to index\n"
25372"q - quit; do not apply this hunk or any of the remaining ones\n"
25373"a - apply this hunk and all later hunks in the file\n"
25374"d - do not apply this hunk or any of the later hunks in the file"
25375msgstr ""
25376"y - 在索引中应用该块\n"
25377"n - 不要在索引中应用该块\n"
25378"q - 退出。不要应用该块及后面的全部块\n"
25379"a - 应用该块和本文件中后面的全部块\n"
25380"d - 不要应用该块和本文件中后面的全部块"
25381
65387fd5 25382#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
1a79b2f1
JX
25383msgid ""
25384"y - discard this hunk from worktree\n"
25385"n - do not discard this hunk from worktree\n"
25386"q - quit; do not discard this hunk or any of the remaining ones\n"
25387"a - discard this hunk and all later hunks in the file\n"
25388"d - do not discard this hunk or any of the later hunks in the file"
25389msgstr ""
25390"y - 在工作区中丢弃该块\n"
25391"n - 不要在工作区中丢弃该块\n"
25392"q - 退出。不要丢弃该块及后面的全部块\n"
25393"a - 丢弃该块和本文件中后面的全部块\n"
25394"d - 不要丢弃该块和本文件中后面的全部块"
25395
65387fd5 25396#: git-add--interactive.perl:1283
1a79b2f1
JX
25397msgid ""
25398"y - discard this hunk from index and worktree\n"
25399"n - do not discard this hunk from index and worktree\n"
25400"q - quit; do not discard this hunk or any of the remaining ones\n"
25401"a - discard this hunk and all later hunks in the file\n"
25402"d - do not discard this hunk or any of the later hunks in the file"
25403msgstr ""
25404"y - 在索引和工作区中丢弃该块\n"
25405"n - 不要在索引和工作区中丢弃该块\n"
25406"q - 退出。不要丢弃该块及后面的全部块\n"
25407"a - 丢弃该块和本文件中后面的全部块\n"
25408"d - 不要丢弃该块和本文件中后面的全部块"
25409
65387fd5 25410#: git-add--interactive.perl:1289
1a79b2f1
JX
25411msgid ""
25412"y - apply this hunk to index and worktree\n"
25413"n - do not apply this hunk to index and worktree\n"
25414"q - quit; do not apply this hunk or any of the remaining ones\n"
25415"a - apply this hunk and all later hunks in the file\n"
25416"d - do not apply this hunk or any of the later hunks in the file"
25417msgstr ""
25418"y - 在索引和工作区中应用该块\n"
25419"n - 不要在索引和工作区中应用该块\n"
25420"q - 退出。不要应用该块及后面的全部块\n"
25421"a - 应用该块和本文件中后面的全部块\n"
25422"d - 不要应用该块和本文件中后面的全部块"
25423
65387fd5 25424#: git-add--interactive.perl:1301
a6cd2cc4
JX
25425msgid ""
25426"y - apply this hunk to worktree\n"
25427"n - do not apply this hunk to worktree\n"
25428"q - quit; do not apply this hunk or any of the remaining ones\n"
25429"a - apply this hunk and all later hunks in the file\n"
25430"d - do not apply this hunk or any of the later hunks in the file"
25431msgstr ""
25432"y - 在工作区中应用该块\n"
25433"n - 不要在工作区中应用该块\n"
25434"q - 退出。不要应用该块及后面的全部块\n"
25435"a - 应用该块和本文件中后面的全部块\n"
25436"d - 不要应用该块和本文件中后面的全部块"
25437
65387fd5 25438#: git-add--interactive.perl:1316
1a79b2f1
JX
25439msgid ""
25440"g - select a hunk to go to\n"
25441"/ - search for a hunk matching the given regex\n"
25442"j - leave this hunk undecided, see next undecided hunk\n"
25443"J - leave this hunk undecided, see next hunk\n"
25444"k - leave this hunk undecided, see previous undecided hunk\n"
25445"K - leave this hunk undecided, see previous hunk\n"
25446"s - split the current hunk into smaller hunks\n"
25447"e - manually edit the current hunk\n"
25448"? - print help\n"
25449msgstr ""
25450"g - 选择跳转到一个块\n"
25451"/ - 查找和给定正则表达式匹配的块\n"
25452"j - 维持该块未决状态,查看下一个未决块\n"
25453"J - 维持该块未决状态,查看下一个块\n"
25454"k - 维持该块未决状态,查看上一个未决块\n"
25455"K - 维持该块未决状态,查看上一个块\n"
25456"s - 拆分当前块为更小的块\n"
25457"e - 手动编辑当前块\n"
25458"? - 显示帮助\n"
25459
65387fd5 25460#: git-add--interactive.perl:1347
1a79b2f1
JX
25461msgid "The selected hunks do not apply to the index!\n"
25462msgstr "选中的块不能应用到索引!\n"
25463
65387fd5 25464#: git-add--interactive.perl:1362
1a79b2f1
JX
25465#, perl-format
25466msgid "ignoring unmerged: %s\n"
25467msgstr "忽略未合入的:%s\n"
25468
65387fd5 25469#: git-add--interactive.perl:1481
a6cd2cc4
JX
25470#, perl-format
25471msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
25472msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
25473
65387fd5 25474#: git-add--interactive.perl:1482
a6cd2cc4
JX
25475#, perl-format
25476msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
25477msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
25478
65387fd5 25479#: git-add--interactive.perl:1483
7157c2b5
JX
25480#, perl-format
25481msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
25482msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? "
25483
65387fd5 25484#: git-add--interactive.perl:1484
a6cd2cc4
JX
25485#, perl-format
25486msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
25487msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
25488
65387fd5 25489#: git-add--interactive.perl:1601
31e5e17b
JX
25490msgid "No other hunks to goto\n"
25491msgstr "没有其它可供跳转的块\n"
1a79b2f1 25492
65387fd5 25493#: git-add--interactive.perl:1619
1a79b2f1
JX
25494#, perl-format
25495msgid "Invalid number: '%s'\n"
25496msgstr "无效数字:'%s'\n"
25497
65387fd5 25498#: git-add--interactive.perl:1624
1a79b2f1
JX
25499#, perl-format
25500msgid "Sorry, only %d hunk available.\n"
25501msgid_plural "Sorry, only %d hunks available.\n"
25502msgstr[0] "对不起,只有 %d 个可用块。\n"
25503msgstr[1] "对不起,只有 %d 个可用块。\n"
25504
65387fd5 25505#: git-add--interactive.perl:1659
31e5e17b
JX
25506msgid "No other hunks to search\n"
25507msgstr "没有其它可供查找的块\n"
25508
65387fd5 25509#: git-add--interactive.perl:1676
1a79b2f1
JX
25510#, perl-format
25511msgid "Malformed search regexp %s: %s\n"
25512msgstr "错误的正则表达式 %s:%s\n"
25513
65387fd5 25514#: git-add--interactive.perl:1686
1a79b2f1 25515msgid "No hunk matches the given pattern\n"
ddc12c42 25516msgstr "没有和给定模式相匹配的块\n"
1a79b2f1 25517
65387fd5 25518#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
1a79b2f1
JX
25519msgid "No previous hunk\n"
25520msgstr "没有前一个块\n"
25521
65387fd5 25522#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
1a79b2f1
JX
25523msgid "No next hunk\n"
25524msgstr "没有下一个块\n"
25525
65387fd5 25526#: git-add--interactive.perl:1732
31e5e17b
JX
25527msgid "Sorry, cannot split this hunk\n"
25528msgstr "对不起,不能拆分这个块\n"
25529
65387fd5 25530#: git-add--interactive.perl:1738
1a79b2f1
JX
25531#, perl-format
25532msgid "Split into %d hunk.\n"
25533msgid_plural "Split into %d hunks.\n"
25534msgstr[0] "拆分为 %d 块。\n"
25535msgstr[1] "拆分为 %d 块。\n"
25536
65387fd5 25537#: git-add--interactive.perl:1748
31e5e17b
JX
25538msgid "Sorry, cannot edit this hunk\n"
25539msgstr "对不起,不能编辑这个块\n"
25540
1a79b2f1
JX
25541#. TRANSLATORS: please do not translate the command names
25542#. 'status', 'update', 'revert', etc.
65387fd5 25543#: git-add--interactive.perl:1813
1a79b2f1
JX
25544msgid ""
25545"status - show paths with changes\n"
25546"update - add working tree state to the staged set of changes\n"
25547"revert - revert staged set of changes back to the HEAD version\n"
25548"patch - pick hunks and update selectively\n"
87cb7997 25549"diff - view diff between HEAD and index\n"
1a79b2f1
JX
25550"add untracked - add contents of untracked files to the staged set of "
25551"changes\n"
25552msgstr ""
25553"status - 显示含变更的路径\n"
25554"update - 添加工作区状态至暂存列表\n"
25555"revert - 还原修改的暂存集至 HEAD 版本\n"
25556"patch - 挑选块并且有选择地更新\n"
25557"diff - 显示 HEAD 和索引间差异\n"
25558"add untracked - 添加未跟踪文件的内容至暂存列表\n"
25559
65387fd5
FZ
25560#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
25561#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
25562#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
25563#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
1a79b2f1
JX
25564msgid "missing --"
25565msgstr "缺失 --"
25566
65387fd5 25567#: git-add--interactive.perl:1868
1a79b2f1
JX
25568#, perl-format
25569msgid "unknown --patch mode: %s"
25570msgstr "未知的 --patch 模式:%s"
25571
65387fd5 25572#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
1a79b2f1
JX
25573#, perl-format
25574msgid "invalid argument %s, expecting --"
25575msgstr "无效的参数 %s,期望是 --"
25576
65387fd5 25577#: git-send-email.perl:159
1a79b2f1
JX
25578msgid "local zone differs from GMT by a non-minute interval\n"
25579msgstr "本地时间和 GMT 有不到一分钟间隔\n"
25580
65387fd5 25581#: git-send-email.perl:166 git-send-email.perl:172
1a79b2f1
JX
25582msgid "local time offset greater than or equal to 24 hours\n"
25583msgstr "本地时间偏移量大于等于 24 小时\n"
25584
65387fd5 25585#: git-send-email.perl:244
33b62fba
JX
25586#, perl-format
25587msgid "fatal: command '%s' died with exit code %d"
25588msgstr "致命错误:命令 '%s' 已终止,退出代码为 %d"
25589
65387fd5 25590#: git-send-email.perl:257
1a79b2f1
JX
25591msgid "the editor exited uncleanly, aborting everything"
25592msgstr "编辑器非正常退出,终止所有操作"
25593
65387fd5 25594#: git-send-email.perl:346
1a79b2f1
JX
25595#, perl-format
25596msgid ""
25597"'%s' contains an intermediate version of the email you were composing.\n"
25598msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
25599
65387fd5 25600#: git-send-email.perl:351
1a79b2f1
JX
25601#, perl-format
25602msgid "'%s.final' contains the composed email.\n"
25603msgstr "'%s.final' 包含编辑的邮件。\n"
25604
65387fd5 25605#: git-send-email.perl:484
1a79b2f1
JX
25606msgid "--dump-aliases incompatible with other options\n"
25607msgstr "--dump-aliases 和其它选项不兼容\n"
25608
65387fd5 25609#: git-send-email.perl:561
d9488fea
JX
25610msgid ""
25611"fatal: found configuration options for 'sendmail'\n"
25612"git-send-email is configured with the sendemail.* options - note the 'e'.\n"
25613"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
25614msgstr ""
25615"致命错误:发现 'sendmail' 配置选项\n"
25616"git-send-email 通过 sendemail.* 选项进行设置,注意字母 'e'。\n"
25617"设置 sendemail.forbidSendmailVariables 为 false 来禁用这项检查。\n"
25618
65387fd5 25619#: git-send-email.perl:566 git-send-email.perl:782
1a79b2f1
JX
25620msgid "Cannot run git format-patch from outside a repository\n"
25621msgstr "不能在仓库之外运行 git format-patch\n"
25622
65387fd5 25623#: git-send-email.perl:569
31e5e17b
JX
25624msgid ""
25625"`batch-size` and `relogin` must be specified together (via command-line or "
25626"configuration option)\n"
25627msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n"
25628
65387fd5 25629#: git-send-email.perl:582
1a79b2f1
JX
25630#, perl-format
25631msgid "Unknown --suppress-cc field: '%s'\n"
25632msgstr "未知的 --suppress-cc 字段:'%s'\n"
25633
65387fd5 25634#: git-send-email.perl:613
1a79b2f1
JX
25635#, perl-format
25636msgid "Unknown --confirm setting: '%s'\n"
25637msgstr "未知的 --confirm 设置:'%s'\n"
25638
65387fd5 25639#: git-send-email.perl:653
1a79b2f1
JX
25640#, perl-format
25641msgid "warning: sendmail alias with quotes is not supported: %s\n"
25642msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
25643
65387fd5 25644#: git-send-email.perl:655
1a79b2f1
JX
25645#, perl-format
25646msgid "warning: `:include:` not supported: %s\n"
25647msgstr "警告:不支持 `:include:`:%s\n"
25648
65387fd5 25649#: git-send-email.perl:657
1a79b2f1
JX
25650#, perl-format
25651msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
25652msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
25653
65387fd5 25654#: git-send-email.perl:662
1a79b2f1
JX
25655#, perl-format
25656msgid "warning: sendmail line is not recognized: %s\n"
25657msgstr "警告:不能识别的 sendmail 行:%s\n"
25658
65387fd5 25659#: git-send-email.perl:747
1a79b2f1
JX
25660#, perl-format
25661msgid ""
25662"File '%s' exists but it could also be the range of commits\n"
25663"to produce patches for. Please disambiguate by...\n"
25664"\n"
25665" * Saying \"./%s\" if you mean a file; or\n"
25666" * Giving --format-patch option if you mean a range.\n"
25667msgstr ""
87cb7997
JX
25668"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
25669"歧义:\n"
1a79b2f1
JX
25670"\n"
25671" * 如果含义为一个文件,使用 \"./%s\",或者\n"
25672" * 如果含义为一个范围,使用 --format-patch 选项。\n"
25673
65387fd5 25674#: git-send-email.perl:768
1a79b2f1
JX
25675#, perl-format
25676msgid "Failed to opendir %s: %s"
25677msgstr "无法打开目录 %s: %s"
25678
65387fd5 25679#: git-send-email.perl:803
1a79b2f1
JX
25680msgid ""
25681"\n"
25682"No patch files specified!\n"
25683"\n"
87cb7997
JX
25684msgstr ""
25685"\n"
25686"未指定补丁文件!\n"
25687"\n"
1a79b2f1 25688
65387fd5 25689#: git-send-email.perl:816
1a79b2f1
JX
25690#, perl-format
25691msgid "No subject line in %s?"
25692msgstr "在 %s 中没有标题行?"
25693
65387fd5 25694#: git-send-email.perl:827
1a79b2f1
JX
25695#, perl-format
25696msgid "Failed to open for writing %s: %s"
c1ac5258 25697msgstr "为写入打开 %s 失败: %s"
1a79b2f1 25698
65387fd5 25699#: git-send-email.perl:838
1a79b2f1
JX
25700msgid ""
25701"Lines beginning in \"GIT:\" will be removed.\n"
25702"Consider including an overall diffstat or table of contents\n"
25703"for the patch you are writing.\n"
25704"\n"
25705"Clear the body content if you don't wish to send a summary.\n"
25706msgstr ""
25707"以 \"GIT:\" 开头的行将被删除。\n"
5b533632 25708"考虑包含一个整体的差异统计或者您正在写的补丁的目录。\n"
1a79b2f1
JX
25709"\n"
25710"如果您不想发送摘要,清除内容。\n"
25711
65387fd5 25712#: git-send-email.perl:862
1a79b2f1
JX
25713#, perl-format
25714msgid "Failed to open %s: %s"
25715msgstr "无法打开 %s: %s"
25716
65387fd5 25717#: git-send-email.perl:879
31e5e17b
JX
25718#, perl-format
25719msgid "Failed to open %s.final: %s"
25720msgstr "无法打开 %s.final: %s"
1a79b2f1 25721
65387fd5 25722#: git-send-email.perl:922
1a79b2f1
JX
25723msgid "Summary email is empty, skipping it\n"
25724msgstr "摘要邮件为空,跳过\n"
25725
25726#. TRANSLATORS: please keep [y/N] as is.
65387fd5 25727#: git-send-email.perl:971
1a79b2f1
JX
25728#, perl-format
25729msgid "Are you sure you want to use <%s> [y/N]? "
25730msgstr "您确认要使用 <%s> [y/N]?"
25731
65387fd5 25732#: git-send-email.perl:1026
1a79b2f1
JX
25733msgid ""
25734"The following files are 8bit, but do not declare a Content-Transfer-"
25735"Encoding.\n"
25736msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
25737
65387fd5 25738#: git-send-email.perl:1031
1a79b2f1
JX
25739msgid "Which 8bit encoding should I declare [UTF-8]? "
25740msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?"
25741
65387fd5 25742#: git-send-email.perl:1039
1a79b2f1
JX
25743#, perl-format
25744msgid ""
25745"Refusing to send because the patch\n"
25746"\t%s\n"
25747"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
25748"want to send.\n"
25749msgstr ""
25750"拒绝发送,因为补丁\n"
25751"\t%s\n"
25752"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
25753
65387fd5 25754#: git-send-email.perl:1058
1a79b2f1
JX
25755msgid "To whom should the emails be sent (if anyone)?"
25756msgstr "邮件将要发送给谁?"
25757
65387fd5 25758#: git-send-email.perl:1076
1a79b2f1
JX
25759#, perl-format
25760msgid "fatal: alias '%s' expands to itself\n"
06991777 25761msgstr "致命错误:别名 '%s' 扩展为它自己\n"
1a79b2f1 25762
65387fd5 25763#: git-send-email.perl:1088
1a79b2f1
JX
25764msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
25765msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?"
25766
65387fd5 25767#: git-send-email.perl:1150 git-send-email.perl:1158
1a79b2f1
JX
25768#, perl-format
25769msgid "error: unable to extract a valid address from: %s\n"
25770msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
25771
25772#. TRANSLATORS: Make sure to include [q] [d] [e] in your
25773#. translation. The program will only accept English input
25774#. at this point.
65387fd5 25775#: git-send-email.perl:1162
1a79b2f1
JX
25776msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
25777msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):"
25778
65387fd5 25779#: git-send-email.perl:1482
1a79b2f1
JX
25780#, perl-format
25781msgid "CA path \"%s\" does not exist"
25782msgstr "CA 路径 \"%s\" 不存在"
25783
65387fd5 25784#: git-send-email.perl:1565
1a79b2f1
JX
25785msgid ""
25786" The Cc list above has been expanded by additional\n"
25787" addresses found in the patch commit message. By default\n"
25788" send-email prompts before sending whenever this occurs.\n"
25789" This behavior is controlled by the sendemail.confirm\n"
25790" configuration setting.\n"
25791"\n"
25792" For additional information, run 'git send-email --help'.\n"
25793" To retain the current behavior, but squelch this message,\n"
25794" run 'git config --global sendemail.confirm auto'.\n"
25795"\n"
25796msgstr ""
25797" 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n"
25798" 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
25799" sendemail.confirm 配置设置。\n"
25800"\n"
25801" 更多信息,执行 'git send-email --help'。\n"
25802" 要保持当前行为,但不显示此信息,运行 'git config --global\n"
25803" sendemail.confirm auto'。\n"
25804"\n"
25805
fd8cb379 25806#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
1a79b2f1
JX
25807#. translation. The program will only accept English input
25808#. at this point.
65387fd5 25809#: git-send-email.perl:1580
fd8cb379
JX
25810msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
25811msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
1a79b2f1 25812
65387fd5 25813#: git-send-email.perl:1583
1a79b2f1
JX
25814msgid "Send this email reply required"
25815msgstr "发送要求的邮件回复"
25816
65387fd5 25817#: git-send-email.perl:1617
1a79b2f1
JX
25818msgid "The required SMTP server is not properly defined."
25819msgstr "要求的 SMTP 服务器未被正确定义。"
25820
65387fd5 25821#: git-send-email.perl:1664
1a79b2f1
JX
25822#, perl-format
25823msgid "Server does not support STARTTLS! %s"
25824msgstr "服务器不支持 STARTTLS!%s"
25825
65387fd5 25826#: git-send-email.perl:1669 git-send-email.perl:1673
a4f16749
JX
25827#, perl-format
25828msgid "STARTTLS failed! %s"
25829msgstr "STARTTLS 失败!%s"
25830
65387fd5 25831#: git-send-email.perl:1682
1a79b2f1
JX
25832msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
25833msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
25834
65387fd5 25835#: git-send-email.perl:1700
1a79b2f1
JX
25836#, perl-format
25837msgid "Failed to send %s\n"
25838msgstr "无法发送 %s\n"
25839
65387fd5 25840#: git-send-email.perl:1703
1a79b2f1
JX
25841#, perl-format
25842msgid "Dry-Sent %s\n"
25843msgstr "演习发送 %s\n"
25844
65387fd5 25845#: git-send-email.perl:1703
1a79b2f1
JX
25846#, perl-format
25847msgid "Sent %s\n"
25848msgstr "正发送 %s\n"
25849
65387fd5 25850#: git-send-email.perl:1705
1a79b2f1
JX
25851msgid "Dry-OK. Log says:\n"
25852msgstr "演习成功。日志说:\n"
25853
65387fd5 25854#: git-send-email.perl:1705
1a79b2f1
JX
25855msgid "OK. Log says:\n"
25856msgstr "OK。日志说:\n"
25857
65387fd5 25858#: git-send-email.perl:1724
1a79b2f1
JX
25859msgid "Result: "
25860msgstr "结果:"
25861
65387fd5 25862#: git-send-email.perl:1727
1a79b2f1
JX
25863msgid "Result: OK\n"
25864msgstr "结果:OK\n"
25865
65387fd5 25866#: git-send-email.perl:1744
1a79b2f1
JX
25867#, perl-format
25868msgid "can't open file %s"
25869msgstr "无法打开文件 %s"
25870
65387fd5 25871#: git-send-email.perl:1792 git-send-email.perl:1812
1a79b2f1
JX
25872#, perl-format
25873msgid "(mbox) Adding cc: %s from line '%s'\n"
25874msgstr "(mbox) 添加 cc:%s 自行 '%s'\n"
25875
65387fd5 25876#: git-send-email.perl:1798
1a79b2f1
JX
25877#, perl-format
25878msgid "(mbox) Adding to: %s from line '%s'\n"
25879msgstr "(mbox) 添加 to:%s 自行 '%s'\n"
25880
65387fd5 25881#: git-send-email.perl:1855
1a79b2f1
JX
25882#, perl-format
25883msgid "(non-mbox) Adding cc: %s from line '%s'\n"
25884msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n"
25885
65387fd5 25886#: git-send-email.perl:1890
1a79b2f1
JX
25887#, perl-format
25888msgid "(body) Adding cc: %s from line '%s'\n"
25889msgstr "(body) 添加 cc: %s 自行 '%s'\n"
25890
65387fd5 25891#: git-send-email.perl:2009
1a79b2f1
JX
25892#, perl-format
25893msgid "(%s) Could not execute '%s'"
25894msgstr "(%s) 不能执行 '%s'"
25895
65387fd5 25896#: git-send-email.perl:2016
1a79b2f1
JX
25897#, perl-format
25898msgid "(%s) Adding %s: %s from: '%s'\n"
25899msgstr "(%s) 添加 %s: %s 自:'%s'\n"
25900
65387fd5 25901#: git-send-email.perl:2020
1a79b2f1
JX
25902#, perl-format
25903msgid "(%s) failed to close pipe to '%s'"
25904msgstr "(%s) 无法关闭管道至 '%s'"
25905
65387fd5 25906#: git-send-email.perl:2050
1a79b2f1
JX
25907msgid "cannot send message as 7bit"
25908msgstr "不能以 7bit 形式发送信息"
25909
65387fd5 25910#: git-send-email.perl:2058
1a79b2f1
JX
25911msgid "invalid transfer encoding"
25912msgstr "无效的传送编码"
25913
65387fd5 25914#: git-send-email.perl:2095
33b62fba
JX
25915#, perl-format
25916msgid ""
25917"fatal: %s: rejected by sendemail-validate hook\n"
25918"%s\n"
25919"warning: no patches were sent\n"
25920msgstr ""
25921"致命错误:%s:被 sendemail-validate 挂钩拒绝\n"
25922"%s\n"
25923"警告:补丁未能发送\n"
25924
65387fd5 25925#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
1a79b2f1
JX
25926#, perl-format
25927msgid "unable to open %s: %s\n"
25928msgstr "不能打开 %s:%s\n"
25929
65387fd5 25930#: git-send-email.perl:2108
1a79b2f1 25931#, perl-format
33b62fba
JX
25932msgid ""
25933"fatal: %s:%d is longer than 998 characters\n"
25934"warning: no patches were sent\n"
25935msgstr ""
7b4d4954 25936"致命错误:%s:%d 超过 998 字符\n"
33b62fba 25937"警告:补丁未能发送\n"
1a79b2f1 25938
65387fd5 25939#: git-send-email.perl:2126
1a79b2f1
JX
25940#, perl-format
25941msgid "Skipping %s with backup suffix '%s'.\n"
25942msgstr "略过 %s 含备份后缀 '%s'。\n"
25943
25944#. TRANSLATORS: please keep "[y|N]" as is.
65387fd5 25945#: git-send-email.perl:2130
1a79b2f1
JX
25946#, perl-format
25947msgid "Do you really want to send %s? [y|N]: "
25948msgstr "您真的要发送 %s?[y|N]:"