]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
l10n: TEAMS: stash inactive zh_CN team members
[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:
c04f5ac3 6# - Jiang Xin <worldhello.net AT gmail.com>
bbdf0acc
JX
7# - Lian Cheng <rhythm.mail AT gmail.com>
8# - Ray Chen <oldsharp AT gmail.com>
c04f5ac3 9# - Riku <lu.riku AT gmail.com>
bbdf0acc
JX
10# - Thynson <lanxingcan AT gmail.com>
11# - ws3389 <willsmith3389 AT gmail.com>
12# - Wang Sheng <wangsheng2008love AT 163.com>
13# - Yichao Yu <yyc1992 AT gmail.com>
c04f5ac3 14# - Zhuang Ya <zhuangya AT me.com>
c04f5ac3
JX
15#
16msgid ""
17msgstr ""
18"Project-Id-Version: Git\n"
19"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
5bb01d4f 20"POT-Creation-Date: 2015-07-14 07:19+0800\n"
bbdf0acc 21"PO-Revision-Date: 2015-08-04 00:42+0800\n"
c04f5ac3 22"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
7aea43ff 23"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
c04f5ac3
JX
24"Language: zh_CN\n"
25"MIME-Version: 1.0\n"
26"Content-Type: text/plain; charset=UTF-8\n"
27"Content-Transfer-Encoding: 8bit\n"
5ae481e0 28"Plural-Forms: nplurals=2; plural=(n != 1);\n"
c04f5ac3 29
6c94aba5 30#: advice.c:55
c04f5ac3
JX
31#, c-format
32msgid "hint: %.*s\n"
33msgstr "提示:%.*s\n"
34
6acbf033 35#: advice.c:88
c04f5ac3 36msgid ""
6acbf033 37"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 38"as appropriate to mark resolution and make a commit."
c04f5ac3 39msgstr ""
d9d56b23 40"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
220c313c 41"解决方案并提交。"
c04f5ac3 42
220c313c 43#: archive.c:11
814ff314
JX
44msgid "git archive [<options>] <tree-ish> [<path>...]"
45msgstr "git archive [<选项>] <树或提交> [<路径>...]"
ef317cd5 46
220c313c 47#: archive.c:12
ef317cd5 48msgid "git archive --list"
07432cef 49msgstr "git archive --list"
ef317cd5 50
220c313c 51#: archive.c:13
ef317cd5 52msgid ""
814ff314 53"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
ef317cd5 54msgstr ""
814ff314 55"git archive --remote <版本库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
ef317cd5 56
220c313c 57#: archive.c:14
ef317cd5 58msgid "git archive --remote <repo> [--exec <cmd>] --list"
07432cef 59msgstr "git archive --remote <版本库> [--exec <命令>] --list"
ef317cd5 60
7aea43ff 61#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327
90314792
JX
62#, c-format
63msgid "pathspec '%s' did not match any files"
64msgstr "路径规则 '%s' 未匹配任何文件"
65
04cb2f28 66#: archive.c:427
ef317cd5 67msgid "fmt"
07432cef 68msgstr "格式"
ef317cd5 69
04cb2f28 70#: archive.c:427
ef317cd5 71msgid "archive format"
07432cef 72msgstr "归档格式"
ef317cd5 73
04cb2f28 74#: archive.c:428 builtin/log.c:1204
ef317cd5 75msgid "prefix"
07432cef 76msgstr "前缀"
ef317cd5 77
04cb2f28 78#: archive.c:429
ef317cd5 79msgid "prepend prefix to each pathname in the archive"
07432cef 80msgstr "为归档中每个路径名加上前缀"
ef317cd5 81
814ff314
JX
82#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516
83#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986
7aea43ff 84#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99
814ff314 85#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394
7aea43ff 86#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150
ef317cd5
JX
87msgid "file"
88msgstr "文件"
89
04cb2f28 90#: archive.c:431 builtin/archive.c:89
ef317cd5 91msgid "write the archive to this file"
07432cef 92msgstr "归档写入此文件"
ef317cd5 93
04cb2f28 94#: archive.c:433
ef317cd5 95msgid "read .gitattributes in working directory"
07432cef 96msgstr "读取工作区中的 .gitattributes"
ef317cd5 97
04cb2f28 98#: archive.c:434
ef317cd5 99msgid "report archived files on stderr"
07432cef 100msgstr "在标准错误上报告归档文件"
ef317cd5 101
04cb2f28 102#: archive.c:435
ef317cd5 103msgid "store only"
07432cef 104msgstr "只存储"
ef317cd5 105
04cb2f28 106#: archive.c:436
ef317cd5 107msgid "compress faster"
07432cef 108msgstr "压缩速度更快"
ef317cd5 109
04cb2f28 110#: archive.c:444
ef317cd5 111msgid "compress better"
07432cef 112msgstr "压缩效果更好"
ef317cd5 113
04cb2f28 114#: archive.c:447
ef317cd5 115msgid "list supported archive formats"
07432cef 116msgstr "列出支持的归档格式"
ef317cd5 117
7aea43ff 118#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77
ef317cd5 119msgid "repo"
07432cef 120msgstr "版本库"
ef317cd5 121
04cb2f28 122#: archive.c:450 builtin/archive.c:91
ef317cd5 123msgid "retrieve the archive from remote repository <repo>"
07432cef 124msgstr "从远程版本库(<版本库>)提取归档文件"
ef317cd5 125
04cb2f28 126#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478
ef317cd5 127msgid "command"
07432cef 128msgstr "命令"
ef317cd5 129
04cb2f28 130#: archive.c:452 builtin/archive.c:93
ef317cd5 131msgid "path to the remote git-upload-archive command"
07432cef
WS
132msgstr "远程 git-upload-archive 命令的路径"
133
7aea43ff 134#: attr.c:265
07432cef 135msgid ""
a7409dfb 136"Negative patterns are ignored in git attributes\n"
07432cef 137"Use '\\!' for literal leading exclamation."
ef317cd5 138msgstr ""
a7409dfb 139"负值模版在 git attributes 中被忽略\n"
07432cef 140"当字符串确实要以感叹号开始时,使用 '\\!'。"
ef317cd5 141
4dcdc3d8
JX
142#: branch.c:60
143#, c-format
144msgid "Not setting branch %s as its own upstream."
145msgstr "未设置分支 %s 作为它自己的上游。"
146
6c94aba5 147#: branch.c:83
4dcdc3d8
JX
148#, c-format
149msgid "Branch %s set up to track remote branch %s from %s by rebasing."
150msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
151
6c94aba5 152#: branch.c:84
4dcdc3d8
JX
153#, c-format
154msgid "Branch %s set up to track remote branch %s from %s."
155msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
156
6c94aba5 157#: branch.c:88
4dcdc3d8
JX
158#, c-format
159msgid "Branch %s set up to track local branch %s by rebasing."
160msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
161
6c94aba5 162#: branch.c:89
4dcdc3d8
JX
163#, c-format
164msgid "Branch %s set up to track local branch %s."
165msgstr "分支 %s 设置为跟踪本地分支 %s。"
166
6c94aba5 167#: branch.c:94
4dcdc3d8
JX
168#, c-format
169msgid "Branch %s set up to track remote ref %s by rebasing."
170msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
171
6c94aba5 172#: branch.c:95
4dcdc3d8
JX
173#, c-format
174msgid "Branch %s set up to track remote ref %s."
175msgstr "分支 %s 设置为跟踪远程引用 %s。"
176
6c94aba5 177#: branch.c:99
4dcdc3d8
JX
178#, c-format
179msgid "Branch %s set up to track local ref %s by rebasing."
180msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
181
6c94aba5 182#: branch.c:100
4dcdc3d8
JX
183#, c-format
184msgid "Branch %s set up to track local ref %s."
185msgstr "分支 %s 设置为跟踪本地引用 %s。"
186
6c94aba5 187#: branch.c:133
4dcdc3d8
JX
188#, c-format
189msgid "Not tracking: ambiguous information for ref %s"
190msgstr "未跟踪:引用 %s 有歧义"
191
220c313c 192#: branch.c:162
4dcdc3d8
JX
193#, c-format
194msgid "'%s' is not a valid branch name."
195msgstr "'%s' 不是一个有效的分支名称。"
196
220c313c 197#: branch.c:167
4dcdc3d8
JX
198#, c-format
199msgid "A branch named '%s' already exists."
200msgstr "一个分支名 '%s' 已经存在。"
201
220c313c 202#: branch.c:175
4dcdc3d8
JX
203msgid "Cannot force update the current branch."
204msgstr "无法强制更新当前分支。"
205
220c313c 206#: branch.c:195
1003b3a5
JX
207#, c-format
208msgid "Cannot setup tracking information; starting point '%s' is not a branch."
209msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
210
220c313c 211#: branch.c:197
1003b3a5
JX
212#, c-format
213msgid "the requested upstream branch '%s' does not exist"
214msgstr "请求的上游分支 '%s' 不存在"
215
220c313c 216#: branch.c:199
1003b3a5
JX
217msgid ""
218"\n"
219"If you are planning on basing your work on an upstream\n"
220"branch that already exists at the remote, you may need to\n"
221"run \"git fetch\" to retrieve it.\n"
222"\n"
223"If you are planning to push out a new local branch that\n"
224"will track its remote counterpart, you may want to use\n"
225"\"git push -u\" to set the upstream config as you push."
226msgstr ""
227"\n"
228"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
229"您可能需要执行 \"git fetch\" 来获取分支。\n"
230"\n"
231"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
232"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
233
220c313c 234#: branch.c:243
4dcdc3d8
JX
235#, c-format
236msgid "Not a valid object name: '%s'."
237msgstr "不是一个有效的对象名:'%s'。"
238
220c313c 239#: branch.c:263
4dcdc3d8
JX
240#, c-format
241msgid "Ambiguous object name: '%s'."
242msgstr "歧义的对象名:'%s'。"
243
220c313c 244#: branch.c:268
4dcdc3d8
JX
245#, c-format
246msgid "Not a valid branch point: '%s'."
247msgstr "无效的分支点:'%s'。"
248
220c313c 249#: bundle.c:34
8ada9598
JX
250#, c-format
251msgid "'%s' does not look like a v2 bundle file"
81809b99 252msgstr "'%s' 不像是一个 v2 版本的包文件"
8ada9598 253
220c313c 254#: bundle.c:61
81809b99 255#, c-format
8ada9598 256msgid "unrecognized header: %s%s (%d)"
81809b99 257msgstr "未能识别的包头:%s%s (%d)"
8ada9598 258
44f518e6 259#: bundle.c:87 builtin/commit.c:766
8ada9598
JX
260#, c-format
261msgid "could not open '%s'"
262msgstr "不能打开 '%s'"
263
220c313c 264#: bundle.c:139
8ada9598 265msgid "Repository lacks these prerequisite commits:"
81809b99 266msgstr "版本库缺少这些必备的提交:"
8ada9598 267
814ff314 268#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
7aea43ff
JX
269#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330
270#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358
90314792 271#: builtin/shortlog.c:158
8ada9598
JX
272msgid "revision walk setup failed"
273msgstr "版本遍历设置失败"
274
220c313c 275#: bundle.c:185
8ada9598 276#, c-format
1003b3a5
JX
277msgid "The bundle contains this ref:"
278msgid_plural "The bundle contains these %d refs:"
279msgstr[0] "这个包中含有这个引用:"
280msgstr[1] "这个包中含有 %d 个引用:"
8ada9598 281
220c313c 282#: bundle.c:192
6792b93b
JX
283msgid "The bundle records a complete history."
284msgstr "这个包记录一个完整历史。"
285
220c313c 286#: bundle.c:194
8ada9598 287#, c-format
1003b3a5
JX
288msgid "The bundle requires this ref:"
289msgid_plural "The bundle requires these %d refs:"
290msgstr[0] "这个包需要这个引用:"
291msgstr[1] "这个包需要 %d 个引用:"
8ada9598 292
9aeb4c2b
JX
293#: bundle.c:251
294msgid "Could not spawn pack-objects"
295msgstr "不能生成 pack-objects 进程"
296
297#: bundle.c:269
298msgid "pack-objects died"
299msgstr "pack-objects 终止"
300
301#: bundle.c:309
8ada9598 302msgid "rev-list died"
81809b99 303msgstr "rev-list 终止"
8ada9598 304
9aeb4c2b 305#: bundle.c:358
8ada9598
JX
306#, c-format
307msgid "ref '%s' is excluded by the rev-list options"
81809b99 308msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 309
814ff314 310#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
9aeb4c2b
JX
311#, c-format
312msgid "unrecognized argument: %s"
313msgstr "未能识别的参数:%s"
314
814ff314 315#: bundle.c:443
8ada9598 316msgid "Refusing to create empty bundle."
81809b99 317msgstr "不能创建空包。"
8ada9598 318
814ff314 319#: bundle.c:453
81809b99 320#, c-format
8ada9598 321msgid "cannot create '%s'"
81809b99 322msgstr "不能创建 '%s'"
8ada9598 323
814ff314 324#: bundle.c:474
8ada9598 325msgid "index-pack died"
81809b99 326msgstr "index-pack 终止"
8ada9598 327
1e607449 328#: color.c:260
220c313c
JX
329#, c-format
330msgid "invalid color value: %.*s"
331msgstr "无效的颜色值:%.*s"
332
6acbf033 333#: commit.c:40
c04f5ac3
JX
334#, c-format
335msgid "could not parse %s"
336msgstr "不能解析 %s"
337
6acbf033 338#: commit.c:42
c04f5ac3
JX
339#, c-format
340msgid "%s %s is not a commit!"
341msgstr "%s %s 不是一个提交!"
342
343#: compat/obstack.c:406 compat/obstack.c:408
344msgid "memory exhausted"
345msgstr "内存耗尽"
346
814ff314 347#: config.c:474 config.c:476
220c313c
JX
348#, c-format
349msgid "bad config file line %d in %s"
350msgstr "配置文件 %2$s 出错于第 %1$d 行"
351
814ff314 352#: config.c:592
220c313c
JX
353#, c-format
354msgid "bad numeric config value '%s' for '%s' in %s: %s"
355msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
356
814ff314 357#: config.c:594
220c313c
JX
358#, c-format
359msgid "bad numeric config value '%s' for '%s': %s"
360msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
361
814ff314 362#: config.c:679
220c313c
JX
363#, c-format
364msgid "failed to expand user dir in: '%s'"
365msgstr "无法扩展 '%s' 中的用户目录"
366
814ff314 367#: config.c:757 config.c:768
220c313c
JX
368#, c-format
369msgid "bad zlib compression level %d"
370msgstr "错误的 zlib 压缩级别 %d"
371
814ff314 372#: config.c:890
220c313c
JX
373#, c-format
374msgid "invalid mode for object creation: %s"
375msgstr "无效的对象创建模式:%s"
376
814ff314 377#: config.c:1216
220c313c
JX
378msgid "unable to parse command-line config"
379msgstr "无法解析命令行中的配置"
380
814ff314 381#: config.c:1277
220c313c
JX
382msgid "unknown error occured while reading the configuration files"
383msgstr "在读取配置文件时遇到未知错误"
384
814ff314 385#: config.c:1601
220c313c
JX
386#, c-format
387msgid "unable to parse '%s' from command-line config"
388msgstr "无法解析命令行配置中的 '%s'"
389
814ff314 390#: config.c:1603
220c313c
JX
391#, c-format
392msgid "bad config variable '%s' in file '%s' at line %d"
393msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
394
814ff314 395#: config.c:1662
220c313c
JX
396#, c-format
397msgid "%s has multiple values"
398msgstr "%s 有多个取值"
399
400#: connected.c:69
c04f5ac3
JX
401msgid "Could not run 'git rev-list'"
402msgstr "不能执行 'git rev-list'"
403
220c313c 404#: connected.c:89
c04f5ac3
JX
405#, c-format
406msgid "failed write to rev-list: %s"
407msgstr "无法写入 rev-list:%s"
408
220c313c 409#: connected.c:97
c04f5ac3
JX
410#, c-format
411msgid "failed to close rev-list's stdin: %s"
412msgstr "无法关闭 rev-list 的标准输入:%s"
413
8ada9598
JX
414#: date.c:95
415msgid "in the future"
81809b99 416msgstr "在将来"
8ada9598
JX
417
418#: date.c:101
419#, c-format
420msgid "%lu second ago"
421msgid_plural "%lu seconds ago"
6c94aba5
JX
422msgstr[0] "%lu 秒钟前"
423msgstr[1] "%lu 秒钟前"
8ada9598
JX
424
425#: date.c:108
426#, c-format
427msgid "%lu minute ago"
428msgid_plural "%lu minutes ago"
6c94aba5
JX
429msgstr[0] "%lu 分钟前"
430msgstr[1] "%lu 分钟前"
8ada9598
JX
431
432#: date.c:115
433#, c-format
434msgid "%lu hour ago"
435msgid_plural "%lu hours ago"
6c94aba5
JX
436msgstr[0] "%lu 小时前"
437msgstr[1] "%lu 小时前"
8ada9598
JX
438
439#: date.c:122
440#, c-format
441msgid "%lu day ago"
442msgid_plural "%lu days ago"
6c94aba5
JX
443msgstr[0] "%lu 天前"
444msgstr[1] "%lu 天前"
8ada9598
JX
445
446#: date.c:128
447#, c-format
448msgid "%lu week ago"
449msgid_plural "%lu weeks ago"
6c94aba5
JX
450msgstr[0] "%lu 周前"
451msgstr[1] "%lu 周前"
8ada9598
JX
452
453#: date.c:135
454#, c-format
455msgid "%lu month ago"
456msgid_plural "%lu months ago"
6c94aba5
JX
457msgstr[0] "%lu 个月前"
458msgstr[1] "%lu 个月前"
8ada9598
JX
459
460#: date.c:146
461#, c-format
462msgid "%lu year"
463msgid_plural "%lu years"
81809b99 464msgstr[0] "%lu 年"
5ae481e0 465msgstr[1] "%lu 年"
8ada9598 466
6c94aba5 467#. TRANSLATORS: "%s" is "<n> years"
8ada9598
JX
468#: date.c:149
469#, c-format
470msgid "%s, %lu month ago"
471msgid_plural "%s, %lu months ago"
6c94aba5
JX
472msgstr[0] "%s %lu 个月前"
473msgstr[1] "%s %lu 个月前"
8ada9598
JX
474
475#: date.c:154 date.c:159
476#, c-format
477msgid "%lu year ago"
478msgid_plural "%lu years ago"
81809b99 479msgstr[0] "%lu 年前"
5ae481e0 480msgstr[1] "%lu 年前"
8ada9598 481
cfff71a9
JX
482#: diffcore-order.c:24
483#, c-format
484msgid "failed to read orderfile '%s'"
485msgstr "无法读取排序文件 '%s'"
486
814ff314 487#: diffcore-rename.c:536
6c94aba5
JX
488msgid "Performing inexact rename detection"
489msgstr "正在进行非精确的重命名检测"
490
90e6ef53 491# 译者:注意保持前导空格
6acbf033 492#: diff.c:114
c04f5ac3 493#, c-format
07432cef
WS
494msgid " Failed to parse dirstat cut-off percentage '%s'\n"
495msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
c04f5ac3 496
90e6ef53 497# 译者:注意保持前导空格
6acbf033 498#: diff.c:119
c04f5ac3 499#, c-format
07432cef
WS
500msgid " Unknown dirstat parameter '%s'\n"
501msgstr " 未知的 dirstat 参数 '%s'\n"
c04f5ac3 502
6acbf033 503#: diff.c:214
07432cef
WS
504#, c-format
505msgid "Unknown value for 'diff.submodule' config variable: '%s'"
506msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
507
220c313c 508#: diff.c:266
c04f5ac3
JX
509#, c-format
510msgid ""
511"Found errors in 'diff.dirstat' config variable:\n"
512"%s"
513msgstr ""
90e6ef53 514"发现配置变量 'diff.dirstat' 中的错误:\n"
c04f5ac3
JX
515"%s"
516
7aea43ff 517#: diff.c:2997
6acbf033
JX
518#, c-format
519msgid "external diff died, stopping at %s"
520msgstr "外部 diff 退出,停止在 %s"
521
7aea43ff 522#: diff.c:3393
6acbf033
JX
523msgid "--follow requires exactly one pathspec"
524msgstr "--follow 参数后只跟一个 pathspec"
525
7aea43ff 526#: diff.c:3556
c04f5ac3
JX
527#, c-format
528msgid ""
529"Failed to parse --dirstat/-X option parameter:\n"
530"%s"
531msgstr ""
532"无法解析 --dirstat/-X 选项的参数:\n"
533"%s"
534
7aea43ff 535#: diff.c:3570
07432cef
WS
536#, c-format
537msgid "Failed to parse --submodule option parameter: '%s'"
538msgstr "无法解析 --submodule 选项的参数:'%s'"
539
7aea43ff
JX
540#: dir.c:1852
541msgid "failed to get kernel name and information"
542msgstr "无法获得内核名称和信息"
543
544#: dir.c:1945
545msgid "Untracked cache is disabled on this system."
546msgstr "缓存未跟踪文件在本系统被禁用"
547
220c313c 548#: gpg-interface.c:129 gpg-interface.c:200
c04f5ac3
JX
549msgid "could not run gpg."
550msgstr "不能执行 gpg。"
551
220c313c 552#: gpg-interface.c:141
c04f5ac3
JX
553msgid "gpg did not accept the data"
554msgstr "gpg 没有接受数据"
555
220c313c 556#: gpg-interface.c:152
c04f5ac3
JX
557msgid "gpg failed to sign the data"
558msgstr "gpg 无法为数据签名"
559
220c313c 560#: gpg-interface.c:185
a77c07d9
JX
561#, c-format
562msgid "could not create temporary file '%s': %s"
563msgstr "不能创建临时文件 '%s':%s"
564
220c313c 565#: gpg-interface.c:188
a77c07d9
JX
566#, c-format
567msgid "failed writing detached signature to '%s': %s"
568msgstr "无法将分离式签名写入 '%s':%s"
569
220c313c 570#: grep.c:1718
7ac1c0ad
JX
571#, c-format
572msgid "'%s': unable to read %s"
573msgstr "'%s':无法读取 %s"
574
220c313c 575#: grep.c:1735
7ac1c0ad
JX
576#, c-format
577msgid "'%s': %s"
578msgstr "'%s':%s"
579
220c313c 580#: grep.c:1746
7ac1c0ad
JX
581#, c-format
582msgid "'%s': short read %s"
583msgstr "'%s':读取不完整 %s"
584
6acbf033 585#: help.c:207
81809b99 586#, c-format
8ada9598 587msgid "available git commands in '%s'"
81809b99 588msgstr "在 '%s' 下可用的 git 命令"
8ada9598 589
6acbf033 590#: help.c:214
8ada9598 591msgid "git commands available from elsewhere on your $PATH"
81809b99 592msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
8ada9598 593
7aea43ff
JX
594#: help.c:246
595msgid "These are common Git commands used in various situations:"
596msgstr "这些是各种场合常见的 Git 命令:"
a77c07d9 597
7aea43ff 598#: help.c:311
c04f5ac3
JX
599#, c-format
600msgid ""
601"'%s' appears to be a git command, but we were not\n"
602"able to execute it. Maybe git-%s is broken?"
603msgstr ""
604"'%s' 像是一个 git 命令,但却无法运行。\n"
605"可能是 git-%s 受损?"
606
7aea43ff 607#: help.c:368
8ada9598 608msgid "Uh oh. Your system reports no Git commands at all."
81809b99 609msgstr "唉呀,您的系统中未发现 Git 命令。"
8ada9598 610
7aea43ff 611#: help.c:390
8ada9598
JX
612#, c-format
613msgid ""
614"WARNING: You called a Git command named '%s', which does not exist.\n"
615"Continuing under the assumption that you meant '%s'"
616msgstr ""
81809b99
JX
617"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
618"是 '%s'"
8ada9598 619
7aea43ff 620#: help.c:395
8ada9598
JX
621#, c-format
622msgid "in %0.1f seconds automatically..."
81809b99 623msgstr "在 %0.1f 秒钟后自动运行..."
8ada9598 624
7aea43ff 625#: help.c:402
8ada9598
JX
626#, c-format
627msgid "git: '%s' is not a git command. See 'git --help'."
81809b99 628msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
8ada9598 629
7aea43ff 630#: help.c:406 help.c:466
8ada9598
JX
631msgid ""
632"\n"
633"Did you mean this?"
634msgid_plural ""
635"\n"
636"Did you mean one of these?"
637msgstr[0] ""
81809b99
JX
638"\n"
639"您指的是这个么?"
640msgstr[1] ""
641"\n"
195febda 642"您指的是这其中的某一个么?"
8ada9598 643
7aea43ff 644#: help.c:462
2e8451e8
JX
645#, c-format
646msgid "%s: %s - %s"
647msgstr "%s:%s - %s"
648
7aea43ff 649#: lockfile.c:345
220c313c
JX
650msgid "BUG: reopen a lockfile that is still open"
651msgstr "BUG: 重新打开一个仍打开着的锁文件"
652
7aea43ff 653#: lockfile.c:347
220c313c
JX
654msgid "BUG: reopen a lockfile that has been committed"
655msgstr "BUG: 重新打开一个已提交的锁文件"
656
657#: merge.c:41
07432cef
WS
658msgid "failed to read the cache"
659msgstr "无法读取缓存"
660
5bb01d4f
JX
661#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587
662#: builtin/clone.c:647
07432cef
WS
663msgid "unable to write new index file"
664msgstr "无法写新的索引文件"
665
220c313c 666#: merge-recursive.c:189
649900bc
JX
667#, c-format
668msgid "(bad commit)\n"
669msgstr "(坏提交)\n"
670
220c313c 671#: merge-recursive.c:209
649900bc
JX
672#, c-format
673msgid "addinfo_cache failed for path '%s'"
674msgstr "为路径 '%s' addinfo_cache 失败"
675
220c313c 676#: merge-recursive.c:270
649900bc
JX
677msgid "error building trees"
678msgstr "无法创建树"
679
7aea43ff 680#: merge-recursive.c:687
649900bc
JX
681#, c-format
682msgid "failed to create path '%s'%s"
683msgstr "无法创建路径 '%s'%s"
684
7aea43ff 685#: merge-recursive.c:698
649900bc
JX
686#, c-format
687msgid "Removing %s to make room for subdirectory\n"
688msgstr "删除 %s 以便为子目录留出空间\n"
689
7aea43ff 690#: merge-recursive.c:712 merge-recursive.c:733
649900bc
JX
691msgid ": perhaps a D/F conflict?"
692msgstr ":可能是一个目录/文件冲突?"
693
7aea43ff 694#: merge-recursive.c:723
649900bc
JX
695#, c-format
696msgid "refusing to lose untracked file at '%s'"
697msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
698
7aea43ff 699#: merge-recursive.c:763
649900bc
JX
700#, c-format
701msgid "cannot read object %s '%s'"
702msgstr "不能读取对象 %s '%s'"
703
7aea43ff 704#: merge-recursive.c:765
649900bc
JX
705#, c-format
706msgid "blob expected for %s '%s'"
07432cef 707msgstr "%s '%s' 应为数据(blob)对象"
649900bc 708
5bb01d4f 709#: merge-recursive.c:788 builtin/clone.c:306
649900bc
JX
710#, c-format
711msgid "failed to open '%s'"
712msgstr "无法打开 '%s'"
713
7aea43ff 714#: merge-recursive.c:796
649900bc
JX
715#, c-format
716msgid "failed to symlink '%s'"
717msgstr "无法创建符号链接 '%s'"
718
7aea43ff 719#: merge-recursive.c:799
649900bc
JX
720#, c-format
721msgid "do not know what to do with %06o %s '%s'"
722msgstr "不知道如何处理 %06o %s '%s'"
723
7aea43ff 724#: merge-recursive.c:937
649900bc
JX
725msgid "Failed to execute internal merge"
726msgstr "无法执行内部合并"
727
7aea43ff 728#: merge-recursive.c:941
649900bc
JX
729#, c-format
730msgid "Unable to add %s to database"
731msgstr "不能添加 %s 至对象库"
732
7aea43ff 733#: merge-recursive.c:957
649900bc
JX
734msgid "unsupported object type in the tree"
735msgstr "在树中有不支持的对象类型"
736
7aea43ff 737#: merge-recursive.c:1032 merge-recursive.c:1046
649900bc
JX
738#, c-format
739msgid ""
740"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
741"in tree."
742msgstr ""
743"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
744"的版本被保留。"
745
7aea43ff 746#: merge-recursive.c:1038 merge-recursive.c:1051
649900bc
JX
747#, c-format
748msgid ""
749"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
750"in tree at %s."
751msgstr ""
752"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
753"的版本保留于 %8$s 中。"
754
7aea43ff 755#: merge-recursive.c:1092
649900bc
JX
756msgid "rename"
757msgstr "重命名"
758
7aea43ff 759#: merge-recursive.c:1092
649900bc
JX
760msgid "renamed"
761msgstr "重命名"
762
7aea43ff 763#: merge-recursive.c:1148
649900bc
JX
764#, c-format
765msgid "%s is a directory in %s adding as %s instead"
766msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
767
7aea43ff 768#: merge-recursive.c:1170
649900bc
JX
769#, c-format
770msgid ""
771"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
772"\"->\"%s\" in \"%s\"%s"
773msgstr ""
774"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
775"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
776
7aea43ff 777#: merge-recursive.c:1175
649900bc
JX
778msgid " (left unresolved)"
779msgstr "(留下未解决)"
780
7aea43ff 781#: merge-recursive.c:1229
649900bc
JX
782#, c-format
783msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
784msgstr ""
785"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
786"%5$s"
787
7aea43ff 788#: merge-recursive.c:1259
649900bc
JX
789#, c-format
790msgid "Renaming %s to %s and %s to %s instead"
07432cef 791msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
649900bc 792
7aea43ff 793#: merge-recursive.c:1458
649900bc
JX
794#, c-format
795msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
796msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
797
7aea43ff 798#: merge-recursive.c:1468
649900bc
JX
799#, c-format
800msgid "Adding merged %s"
801msgstr "添加合并后的 %s"
802
7aea43ff 803#: merge-recursive.c:1473 merge-recursive.c:1671
649900bc
JX
804#, c-format
805msgid "Adding as %s instead"
806msgstr "而是以 %s 为名添加"
807
7aea43ff 808#: merge-recursive.c:1524
649900bc
JX
809#, c-format
810msgid "cannot read object %s"
811msgstr "不能读取对象 %s"
812
7aea43ff 813#: merge-recursive.c:1527
649900bc
JX
814#, c-format
815msgid "object %s is not a blob"
07432cef 816msgstr "对象 %s 不是一个数据(blob)对象"
649900bc 817
7aea43ff 818#: merge-recursive.c:1575
649900bc
JX
819msgid "modify"
820msgstr "修改"
821
7aea43ff 822#: merge-recursive.c:1575
649900bc
JX
823msgid "modified"
824msgstr "修改"
825
7aea43ff 826#: merge-recursive.c:1585
649900bc
JX
827msgid "content"
828msgstr "内容"
829
7aea43ff 830#: merge-recursive.c:1592
649900bc
JX
831msgid "add/add"
832msgstr "添加/添加"
833
7aea43ff 834#: merge-recursive.c:1626
649900bc
JX
835#, c-format
836msgid "Skipped %s (merged same as existing)"
837msgstr "略过 %s(已经做过相同合并)"
838
7aea43ff 839#: merge-recursive.c:1640
649900bc
JX
840#, c-format
841msgid "Auto-merging %s"
842msgstr "自动合并 %s"
843
7aea43ff 844#: merge-recursive.c:1644 git-submodule.sh:1150
649900bc
JX
845msgid "submodule"
846msgstr "子模组"
847
7aea43ff 848#: merge-recursive.c:1645
649900bc
JX
849#, c-format
850msgid "CONFLICT (%s): Merge conflict in %s"
851msgstr "冲突(%s):合并冲突于 %s"
852
7aea43ff 853#: merge-recursive.c:1731
649900bc
JX
854#, c-format
855msgid "Removing %s"
856msgstr "删除 %s"
857
7aea43ff 858#: merge-recursive.c:1756
649900bc
JX
859msgid "file/directory"
860msgstr "文件/目录"
861
7aea43ff 862#: merge-recursive.c:1762
649900bc
JX
863msgid "directory/file"
864msgstr "目录/文件"
865
7aea43ff 866#: merge-recursive.c:1767
649900bc
JX
867#, c-format
868msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
869msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
870
7aea43ff 871#: merge-recursive.c:1777
649900bc
JX
872#, c-format
873msgid "Adding %s"
874msgstr "添加 %s"
875
7aea43ff 876#: merge-recursive.c:1794
649900bc
JX
877msgid "Fatal merge failure, shouldn't happen."
878msgstr "严重的合并错误,不应发生。"
879
7aea43ff 880#: merge-recursive.c:1813
649900bc
JX
881msgid "Already up-to-date!"
882msgstr "已经是最新的!"
883
7aea43ff 884#: merge-recursive.c:1822
649900bc
JX
885#, c-format
886msgid "merging of trees %s and %s failed"
887msgstr "无法合并树 %s 和 %s"
888
7aea43ff 889#: merge-recursive.c:1852
649900bc
JX
890#, c-format
891msgid "Unprocessed path??? %s"
892msgstr "未处理的路径??? %s"
893
7aea43ff 894#: merge-recursive.c:1900
649900bc
JX
895msgid "Merging:"
896msgstr "合并:"
897
7aea43ff 898#: merge-recursive.c:1913
649900bc 899#, c-format
e5e38ce4
JX
900msgid "found %u common ancestor:"
901msgid_plural "found %u common ancestors:"
902msgstr[0] "发现 %u 个共同祖先:"
903msgstr[1] "发现 %u 个共同祖先:"
649900bc 904
7aea43ff 905#: merge-recursive.c:1950
649900bc
JX
906msgid "merge returned no commit"
907msgstr "合并未返回提交"
908
7aea43ff 909#: merge-recursive.c:2007
649900bc
JX
910#, c-format
911msgid "Could not parse object '%s'"
912msgstr "不能解析对象 '%s'"
913
7aea43ff 914#: merge-recursive.c:2018 builtin/merge.c:645
649900bc
JX
915msgid "Unable to write index."
916msgstr "不能写入索引。"
917
6acbf033 918#: notes-utils.c:41
2e8451e8
JX
919msgid "Cannot commit uninitialized/unreferenced notes tree"
920msgstr "不能提交未初始化/未引用的注解树"
921
04cb2f28 922#: notes-utils.c:82
2e8451e8
JX
923#, c-format
924msgid "Bad notes.rewriteMode value: '%s'"
925msgstr "坏的 notes.rewriteMode 值:'%s'"
926
04cb2f28 927#: notes-utils.c:92
2e8451e8
JX
928#, c-format
929msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
930msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
931
932#. TRANSLATORS: The first %s is the name of the
933#. environment variable, the second %s is its value
04cb2f28 934#: notes-utils.c:119
2e8451e8
JX
935#, c-format
936msgid "Bad %s value: '%s'"
937msgstr "坏的 %s 值:'%s'"
938
7aea43ff 939#: object.c:242
1003b3a5
JX
940#, c-format
941msgid "unable to parse object: %s"
942msgstr "不能解析对象:%s"
943
220c313c 944#: parse-options.c:546
8ada9598 945msgid "..."
81809b99 946msgstr "..."
8ada9598 947
220c313c 948#: parse-options.c:564
81809b99 949#, c-format
8ada9598 950msgid "usage: %s"
81809b99 951msgstr "用法:%s"
8ada9598
JX
952
953#. TRANSLATORS: the colon here should align with the
954#. one in "usage: %s" translation
220c313c 955#: parse-options.c:568
81809b99 956#, c-format
8ada9598 957msgid " or: %s"
81809b99 958msgstr " 或:%s"
8ada9598
JX
959
960# 译者:为保证在输出中对齐,注意调整句中空格!
220c313c 961#: parse-options.c:571
81809b99 962#, c-format
8ada9598 963msgid " %s"
81809b99 964msgstr " %s"
8ada9598 965
220c313c 966#: parse-options.c:605
63af42fe
JX
967msgid "-NUM"
968msgstr "-数字"
969
cfff71a9 970#: pathspec.c:133
90314792
JX
971msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
972msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
973
cfff71a9 974#: pathspec.c:143
90314792
JX
975msgid ""
976"global 'literal' pathspec setting is incompatible with all other global "
977"pathspec settings"
978msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
979
cfff71a9 980#: pathspec.c:177
90314792
JX
981msgid "invalid parameter for pathspec magic 'prefix'"
982msgstr "路径规则包含无效的神奇前缀"
983
cfff71a9 984#: pathspec.c:183
90314792
JX
985#, c-format
986msgid "Invalid pathspec magic '%.*s' in '%s'"
987msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
988
cfff71a9 989#: pathspec.c:187
90314792
JX
990#, c-format
991msgid "Missing ')' at the end of pathspec magic in '%s'"
992msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
993
cfff71a9 994#: pathspec.c:205
90314792
JX
995#, c-format
996msgid "Unimplemented pathspec magic '%c' in '%s'"
997msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
998
cfff71a9 999#: pathspec.c:230
a77c07d9 1000#, c-format
90314792
JX
1001msgid "%s: 'literal' and 'glob' are incompatible"
1002msgstr "%s:'literal' 和 'glob' 不兼容"
a77c07d9 1003
cfff71a9 1004#: pathspec.c:241
a77c07d9 1005#, c-format
90314792
JX
1006msgid "%s: '%s' is outside repository"
1007msgstr "%s:'%s' 在版本库之外"
a77c07d9 1008
cfff71a9 1009#: pathspec.c:291
90314792
JX
1010#, c-format
1011msgid "Pathspec '%s' is in submodule '%.*s'"
1012msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
1013
cfff71a9 1014#: pathspec.c:353
90314792
JX
1015#, c-format
1016msgid "%s: pathspec magic not supported by this command: %s"
1017msgstr "%s:路径规则神奇前缀不被此命令支持:%s"
1018
6acbf033 1019#: pathspec.c:432
90314792
JX
1020#, c-format
1021msgid "pathspec '%s' is beyond a symbolic link"
1022msgstr "路径规则 '%s' 位于符号链接中"
1023
6acbf033 1024#: pathspec.c:441
cfff71a9
JX
1025msgid ""
1026"There is nothing to exclude from by :(exclude) patterns.\n"
1027"Perhaps you forgot to add either ':/' or '.' ?"
1028msgstr ""
1029"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1030"添加 ':/' 或 '.' ?"
1031
220c313c
JX
1032#: pretty.c:968
1033msgid "unable to parse --pretty format"
1034msgstr "不能解析 --pretty 格式"
1035
7aea43ff 1036#: progress.c:236
6c94aba5
JX
1037msgid "done"
1038msgstr "完成"
1039
7aea43ff 1040#: read-cache.c:1295
6c94aba5
JX
1041#, c-format
1042msgid ""
1043"index.version set, but the value is invalid.\n"
1044"Using version %i"
1045msgstr ""
1046"设置了 index.version,但是取值无效。\n"
1047"使用版本 %i"
1048
7aea43ff 1049#: read-cache.c:1305
6c94aba5
JX
1050#, c-format
1051msgid ""
1052"GIT_INDEX_VERSION set, but the value is invalid.\n"
1053"Using version %i"
1054msgstr ""
1055"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1056"使用版本 %i"
1057
7aea43ff 1058#: remote.c:792
cfff71a9
JX
1059#, c-format
1060msgid "Cannot fetch both %s and %s to %s"
1061msgstr "不能同时获取 %s 和 %s 至 %s"
1062
7aea43ff 1063#: remote.c:796
cfff71a9
JX
1064#, c-format
1065msgid "%s usually tracks %s, not %s"
1066msgstr "%s 通常跟踪 %s,而非 %s"
1067
7aea43ff 1068#: remote.c:800
cfff71a9
JX
1069#, c-format
1070msgid "%s tracks both %s and %s"
1071msgstr "%s 同时跟踪 %s 和 %s"
1072
7aea43ff 1073#: remote.c:808
cfff71a9
JX
1074msgid "Internal error"
1075msgstr "内部错误"
1076
7aea43ff
JX
1077#: remote.c:1723 remote.c:1766
1078msgid "HEAD does not point to a branch"
1079msgstr "HEAD 没有指向一个分支"
1080
1081#: remote.c:1732
1082#, c-format
1083msgid "no such branch: '%s'"
1084msgstr "没有此分支:'%s'"
1085
1086#: remote.c:1735
1087#, c-format
1088msgid "no upstream configured for branch '%s'"
1089msgstr "尚未给分支 '%s' 设置上游"
1090
1091#: remote.c:1741
1092#, c-format
1093msgid "upstream branch '%s' not stored as a remote-tracking branch"
1094msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1095
1096#: remote.c:1756
1097#, c-format
1098msgid "push destination '%s' on remote '%s' has no local tracking branch"
1099msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1100
1101#: remote.c:1771
1102#, c-format
1103msgid "branch '%s' has no remote for pushing"
1104msgstr "分支 '%s' 没有设置要推送的远程服务器"
1105
1106#: remote.c:1782
1107#, c-format
1108msgid "push refspecs for '%s' do not include '%s'"
1109msgstr "向 '%s' 推送引用表达式未包含 '%s'"
1110
1111#: remote.c:1795
1112msgid "push has no destination (push.default is 'nothing')"
1113msgstr "推送无目标(push.default 是 'nothing')"
1114
1115#: remote.c:1817
1116msgid "cannot resolve 'simple' push to a single destination"
1117msgstr "无法解析 'simple' 推送至一个单独的目标"
1118
1119#: remote.c:2124
90314792
JX
1120#, c-format
1121msgid "Your branch is based on '%s', but the upstream is gone.\n"
1122msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1123
7aea43ff 1124#: remote.c:2128
90314792
JX
1125msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1126msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1127
7aea43ff 1128#: remote.c:2131
90314792
JX
1129#, c-format
1130msgid "Your branch is up-to-date with '%s'.\n"
1131msgstr "您的分支与上游分支 '%s' 一致。\n"
1132
7aea43ff 1133#: remote.c:2135
c04f5ac3
JX
1134#, c-format
1135msgid "Your branch is ahead of '%s' by %d commit.\n"
1136msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1137msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
5ae481e0 1138msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
c04f5ac3 1139
7aea43ff 1140#: remote.c:2141
07432cef
WS
1141msgid " (use \"git push\" to publish your local commits)\n"
1142msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1143
7aea43ff 1144#: remote.c:2144
c04f5ac3
JX
1145#, c-format
1146msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1147msgid_plural ""
1148"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
90e6ef53 1149msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
5ae481e0 1150msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 1151
07432cef 1152# 译者:注意保持前导空格
7aea43ff 1153#: remote.c:2152
07432cef
WS
1154msgid " (use \"git pull\" to update your local branch)\n"
1155msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1156
7aea43ff 1157#: remote.c:2155
c04f5ac3
JX
1158#, c-format
1159msgid ""
1160"Your branch and '%s' have diverged,\n"
1161"and have %d and %d different commit each, respectively.\n"
1162msgid_plural ""
1163"Your branch and '%s' have diverged,\n"
1164"and have %d and %d different commits each, respectively.\n"
1165msgstr[0] ""
1166"您的分支和 '%s' 出现了偏离,\n"
195febda 1167"并且分别有 %d 和 %d 处不同的提交。\n"
5ae481e0
JX
1168msgstr[1] ""
1169"您的分支和 '%s' 出现了偏离,\n"
195febda 1170"并且分别有 %d 和 %d 处不同的提交。\n"
c04f5ac3 1171
07432cef 1172# 译者:注意保持前导空格
7aea43ff 1173#: remote.c:2165
07432cef
WS
1174msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1175msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1176
7aea43ff 1177#: revision.c:2366
814ff314
JX
1178msgid "--first-parent is incompatible with --bisect"
1179msgstr "--first-parent 与 --bisect 不兼容"
1180
1181#: run-command.c:83
2e8451e8
JX
1182msgid "open /dev/null failed"
1183msgstr "不能打开 /dev/null"
1184
814ff314 1185#: run-command.c:85
2e8451e8
JX
1186#, c-format
1187msgid "dup2(%d,%d) failed"
1188msgstr "不能调用 dup2(%d,%d)"
1189
814ff314 1190#: send-pack.c:272
220c313c
JX
1191msgid "failed to sign the push certificate"
1192msgstr "无法为推送证书签名"
1193
7aea43ff 1194#: send-pack.c:378
220c313c
JX
1195msgid "the receiving end does not support --signed push"
1196msgstr "接收端不支持签名推送"
1197
7aea43ff 1198#: send-pack.c:389
44f518e6
JX
1199msgid "the receiving end does not support --atomic push"
1200msgstr "接收端不支持原子推送"
814ff314 1201
7aea43ff
JX
1202#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
1203#: builtin/merge.c:983
c04f5ac3
JX
1204#, c-format
1205msgid "Could not open '%s' for writing"
90e6ef53 1206msgstr "不能为写入打开 '%s'"
c04f5ac3 1207
7aea43ff
JX
1208#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
1209#: builtin/merge.c:988
c04f5ac3
JX
1210#, c-format
1211msgid "Could not write to '%s'"
90e6ef53 1212msgstr "不能写入 '%s'"
c04f5ac3 1213
220c313c 1214#: sequencer.c:195
14c8bced
JX
1215msgid ""
1216"after resolving the conflicts, mark the corrected paths\n"
1217"with 'git add <paths>' or 'git rm <paths>'"
1218msgstr ""
d9d56b23 1219"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
14c8bced
JX
1220"命令标记修正后的文件"
1221
220c313c 1222#: sequencer.c:198
c04f5ac3
JX
1223msgid ""
1224"after resolving the conflicts, mark the corrected paths\n"
1225"with 'git add <paths>' or 'git rm <paths>'\n"
1226"and commit the result with 'git commit'"
1227msgstr ""
d9d56b23 1228"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
c04f5ac3
JX
1229"对修正后的文件做标记,然后用 'git commit' 提交"
1230
814ff314 1231#: sequencer.c:211 sequencer.c:861 sequencer.c:944
c04f5ac3
JX
1232#, c-format
1233msgid "Could not write to %s"
1234msgstr "不能写入 %s"
1235
220c313c 1236#: sequencer.c:214
c04f5ac3
JX
1237#, c-format
1238msgid "Error wrapping up %s"
1239msgstr "错误收尾 %s"
1240
220c313c 1241#: sequencer.c:229
c04f5ac3
JX
1242msgid "Your local changes would be overwritten by cherry-pick."
1243msgstr "您的本地修改将被拣选操作覆盖。"
1244
220c313c 1245#: sequencer.c:231
c04f5ac3
JX
1246msgid "Your local changes would be overwritten by revert."
1247msgstr "您的本地修改将被还原操作覆盖。"
1248
220c313c 1249#: sequencer.c:234
c04f5ac3
JX
1250msgid "Commit your changes or stash them to proceed."
1251msgstr "提交您的修改或保存进度后再继续。"
1252
1253#. TRANSLATORS: %s will be "revert" or "cherry-pick"
04cb2f28 1254#: sequencer.c:321
c04f5ac3
JX
1255#, c-format
1256msgid "%s: Unable to write new index file"
90e6ef53 1257msgstr "%s:无法写入新索引文件"
c04f5ac3 1258
04cb2f28 1259#: sequencer.c:339
8ada9598 1260msgid "Could not resolve HEAD commit\n"
81809b99 1261msgstr "不能解析 HEAD 提交\n"
8ada9598 1262
04cb2f28 1263#: sequencer.c:359
8ada9598 1264msgid "Unable to update cache tree\n"
81809b99 1265msgstr "不能更新缓存\n"
8ada9598 1266
814ff314 1267#: sequencer.c:411
81809b99 1268#, c-format
8ada9598 1269msgid "Could not parse commit %s\n"
81809b99 1270msgstr "不能解析提交 %s\n"
8ada9598 1271
814ff314 1272#: sequencer.c:416
81809b99 1273#, c-format
8ada9598 1274msgid "Could not parse parent commit %s\n"
81809b99 1275msgstr "不能解析父提交 %s\n"
8ada9598 1276
814ff314 1277#: sequencer.c:482
c04f5ac3 1278msgid "Your index file is unmerged."
90e6ef53 1279msgstr "您的索引文件未完成合并。"
c04f5ac3 1280
814ff314 1281#: sequencer.c:501
c04f5ac3
JX
1282#, c-format
1283msgid "Commit %s is a merge but no -m option was given."
1284msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1285
814ff314 1286#: sequencer.c:509
c04f5ac3
JX
1287#, c-format
1288msgid "Commit %s does not have parent %d"
1289msgstr "提交 %s 没有父提交 %d"
1290
814ff314 1291#: sequencer.c:513
c04f5ac3
JX
1292#, c-format
1293msgid "Mainline was specified but commit %s is not a merge."
90e6ef53 1294msgstr "指定了主线但提交 %s 不是一个合并。"
c04f5ac3
JX
1295
1296#. TRANSLATORS: The first %s will be "revert" or
1297#. "cherry-pick", the second %s a SHA1
814ff314 1298#: sequencer.c:526
c04f5ac3
JX
1299#, c-format
1300msgid "%s: cannot parse parent commit %s"
1301msgstr "%s:不能解析父提交 %s"
1302
814ff314 1303#: sequencer.c:530
c04f5ac3
JX
1304#, c-format
1305msgid "Cannot get commit message for %s"
1306msgstr "不能得到 %s 的提交说明"
1307
814ff314 1308#: sequencer.c:616
c04f5ac3
JX
1309#, c-format
1310msgid "could not revert %s... %s"
1311msgstr "不能还原 %s... %s"
1312
814ff314 1313#: sequencer.c:617
c04f5ac3
JX
1314#, c-format
1315msgid "could not apply %s... %s"
1316msgstr "不能应用 %s... %s"
1317
814ff314 1318#: sequencer.c:653
c04f5ac3
JX
1319msgid "empty commit set passed"
1320msgstr "提供了空的提交集"
1321
814ff314 1322#: sequencer.c:661
c04f5ac3
JX
1323#, c-format
1324msgid "git %s: failed to read the index"
90e6ef53 1325msgstr "git %s:无法读取索引"
c04f5ac3 1326
814ff314 1327#: sequencer.c:665
c04f5ac3
JX
1328#, c-format
1329msgid "git %s: failed to refresh the index"
90e6ef53 1330msgstr "git %s:无法刷新索引"
c04f5ac3 1331
814ff314 1332#: sequencer.c:725
c04f5ac3
JX
1333#, c-format
1334msgid "Cannot %s during a %s"
90e6ef53 1335msgstr "无法 %s 在一个 %s 过程中"
c04f5ac3 1336
814ff314 1337#: sequencer.c:747
c04f5ac3
JX
1338#, c-format
1339msgid "Could not parse line %d."
90e6ef53 1340msgstr "不能解析第 %d 行。"
c04f5ac3 1341
814ff314 1342#: sequencer.c:752
c04f5ac3 1343msgid "No commits parsed."
7e238ab7 1344msgstr "没有提交被解析。"
c04f5ac3 1345
814ff314 1346#: sequencer.c:765
c04f5ac3
JX
1347#, c-format
1348msgid "Could not open %s"
1349msgstr "不能打开 %s"
1350
814ff314 1351#: sequencer.c:769
c04f5ac3
JX
1352#, c-format
1353msgid "Could not read %s."
1354msgstr "不能读取 %s。"
1355
814ff314 1356#: sequencer.c:776
c04f5ac3
JX
1357#, c-format
1358msgid "Unusable instruction sheet: %s"
1359msgstr "无用的指令表单:%s"
1360
814ff314 1361#: sequencer.c:806
c04f5ac3
JX
1362#, c-format
1363msgid "Invalid key: %s"
1364msgstr "无效键名:%s"
1365
814ff314 1366#: sequencer.c:809
c04f5ac3
JX
1367#, c-format
1368msgid "Invalid value for %s: %s"
81809b99 1369msgstr "%s 的值无效:%s"
c04f5ac3 1370
814ff314 1371#: sequencer.c:821
c04f5ac3
JX
1372#, c-format
1373msgid "Malformed options sheet: %s"
1374msgstr "非法的选项表单:%s"
1375
814ff314 1376#: sequencer.c:842
c04f5ac3
JX
1377msgid "a cherry-pick or revert is already in progress"
1378msgstr "一个拣选或还原操作已在进行"
1379
814ff314 1380#: sequencer.c:843
c04f5ac3
JX
1381msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1382msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1383
814ff314 1384#: sequencer.c:847
c04f5ac3
JX
1385#, c-format
1386msgid "Could not create sequencer directory %s"
90e6ef53 1387msgstr "不能创建序列目录 %s"
c04f5ac3 1388
814ff314 1389#: sequencer.c:863 sequencer.c:948
c04f5ac3
JX
1390#, c-format
1391msgid "Error wrapping up %s."
1392msgstr "错误收尾 %s。"
1393
814ff314 1394#: sequencer.c:882 sequencer.c:1018
c04f5ac3 1395msgid "no cherry-pick or revert in progress"
195febda 1396msgstr "拣选或还原操作并未进行"
c04f5ac3 1397
814ff314 1398#: sequencer.c:884
c04f5ac3
JX
1399msgid "cannot resolve HEAD"
1400msgstr "不能解析 HEAD"
1401
814ff314 1402#: sequencer.c:886
c04f5ac3 1403msgid "cannot abort from a branch yet to be born"
90e6ef53 1404msgstr "不能从尚未建立的分支终止"
c04f5ac3 1405
7aea43ff 1406#: sequencer.c:908 builtin/apply.c:4291
c04f5ac3
JX
1407#, c-format
1408msgid "cannot open %s: %s"
1409msgstr "不能打开 %s:%s"
1410
814ff314 1411#: sequencer.c:911
c04f5ac3
JX
1412#, c-format
1413msgid "cannot read %s: %s"
1414msgstr "不能读取 %s:%s"
1415
814ff314 1416#: sequencer.c:912
c04f5ac3 1417msgid "unexpected end of file"
9aafc933 1418msgstr "意外的文件结束"
c04f5ac3 1419
814ff314 1420#: sequencer.c:918
c04f5ac3
JX
1421#, c-format
1422msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
90e6ef53 1423msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
c04f5ac3 1424
814ff314 1425#: sequencer.c:941
c04f5ac3
JX
1426#, c-format
1427msgid "Could not format %s."
1428msgstr "不能格式化 %s。"
1429
814ff314 1430#: sequencer.c:1086
4dcdc3d8
JX
1431#, c-format
1432msgid "%s: can't cherry-pick a %s"
1433msgstr "%s:不能拣选一个%s"
1434
814ff314 1435#: sequencer.c:1089
4dcdc3d8
JX
1436#, c-format
1437msgid "%s: bad revision"
1438msgstr "%s:错误的版本"
1439
814ff314 1440#: sequencer.c:1123
c04f5ac3
JX
1441msgid "Can't revert as initial commit"
1442msgstr "不能作为初始提交还原"
1443
814ff314 1444#: sequencer.c:1124
c04f5ac3
JX
1445msgid "Can't cherry-pick into empty head"
1446msgstr "不能拣选到空分支"
1447
7aea43ff
JX
1448#: setup.c:243
1449#, c-format
1450msgid "failed to read %s"
1451msgstr "无法读取 %s"
1452
1453#: sha1_name.c:453
2e8451e8
JX
1454msgid ""
1455"Git normally never creates a ref that ends with 40 hex characters\n"
1456"because it will be ignored when you just specify 40-hex. These refs\n"
1457"may be created by mistake. For example,\n"
1458"\n"
1459" git checkout -b $br $(git rev-parse ...)\n"
1460"\n"
1461"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1462"examine these refs and maybe delete them. Turn this message off by\n"
b1894384 1463"running \"git config advice.objectNameWarning false\""
2e8451e8
JX
1464msgstr ""
1465"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1466"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1467"\n"
1468" git checkout -b $br $(git rev-parse ...)\n"
1469"\n"
1470"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
b1894384 1471"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
2e8451e8
JX
1472"命令关闭本消息通知。"
1473
90314792
JX
1474#: submodule.c:64 submodule.c:98
1475msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1476msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1477
1478#: submodule.c:68 submodule.c:102
1479#, c-format
1480msgid "Could not find section in .gitmodules where path=%s"
1481msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1482
90314792
JX
1483#: submodule.c:76
1484#, c-format
1485msgid "Could not update .gitmodules entry %s"
1486msgstr "不能更新 .gitmodules 条目 %s"
1487
90314792
JX
1488#: submodule.c:109
1489#, c-format
1490msgid "Could not remove .gitmodules entry for %s"
1491msgstr "无法移除 %s 的 .gitmodules 条目"
1492
6c94aba5 1493#: submodule.c:120
90314792
JX
1494msgid "staging updated .gitmodules failed"
1495msgstr "将更新后 .gitmodules 添加暂存区失败"
1496
7aea43ff 1497#: submodule.c:1115
90314792
JX
1498#, c-format
1499msgid "Could not set core.worktree in %s"
1500msgstr "不能在 %s 中设置 core.worktree"
1501
814ff314
JX
1502#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1503#: trailer.c:561
220c313c
JX
1504#, c-format
1505msgid "unknown value '%s' for key '%s'"
1506msgstr "键 '%2$s' 的未知取值 '%1$s'"
1507
814ff314 1508#: trailer.c:543 trailer.c:548 builtin/remote.c:290
220c313c
JX
1509#, c-format
1510msgid "more than one %s"
1511msgstr "多于一个 %s"
1512
814ff314 1513#: trailer.c:581
220c313c 1514#, c-format
9aeb4c2b
JX
1515msgid "empty trailer token in trailer '%.*s'"
1516msgstr "签名 '%.*s' 的键为空"
220c313c 1517
814ff314 1518#: trailer.c:701
220c313c
JX
1519#, c-format
1520msgid "could not read input file '%s'"
1521msgstr "不能读取输入文件 '%s'"
1522
814ff314 1523#: trailer.c:704
220c313c
JX
1524msgid "could not read from stdin"
1525msgstr "不能自标准输入读取"
1526
7aea43ff 1527#: unpack-trees.c:203
6c94aba5
JX
1528msgid "Checking out files"
1529msgstr "正在检出文件"
1530
90314792
JX
1531#: urlmatch.c:120
1532msgid "invalid URL scheme name or missing '://' suffix"
1533msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1534
1535#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1536#, c-format
1537msgid "invalid %XX escape sequence"
1538msgstr "无效的 %XX 转义序列"
1539
1540#: urlmatch.c:172
1541msgid "missing host and scheme is not 'file:'"
1542msgstr "缺失主机名且URL方案不是 'file:'"
1543
1544#: urlmatch.c:189
1545msgid "a 'file:' URL may not have a port number"
1546msgstr "一个 'file:' URL 不应该包含端口号"
1547
1548#: urlmatch.c:199
1549msgid "invalid characters in host name"
1550msgstr "主机名中包含无效的字符"
1551
1552#: urlmatch.c:244 urlmatch.c:255
1553msgid "invalid port number"
1554msgstr "无效的端口号"
1555
1556#: urlmatch.c:322
1557msgid "invalid '..' path segment"
1558msgstr "无效的 '..' 路径片段"
1559
814ff314 1560#: wrapper.c:523
07432cef 1561#, c-format
ef317cd5 1562msgid "unable to access '%s': %s"
07432cef
WS
1563msgstr "不能访问 '%s':%s"
1564
814ff314 1565#: wrapper.c:544
07432cef
WS
1566#, c-format
1567msgid "unable to access '%s'"
1568msgstr "不能访问 '%s'"
ef317cd5 1569
814ff314 1570#: wrapper.c:555
d691f479
JX
1571#, c-format
1572msgid "unable to look up current user in the passwd file: %s"
07432cef 1573msgstr "无法在口令文件中查询到当前用户:%s"
d691f479 1574
814ff314 1575#: wrapper.c:556
d691f479
JX
1576msgid "no such user"
1577msgstr "无此用户"
1578
814ff314 1579#: wrapper.c:564
220c313c
JX
1580msgid "unable to get current working directory"
1581msgstr "不能获取当前工作目录"
1582
7aea43ff
JX
1583#: wrapper.c:575
1584#, c-format
1585msgid "could not open %s for writing"
1586msgstr "不能写入 %s"
1587
1588#: wrapper.c:587
1589#, c-format
1590msgid "could not write to %s"
1591msgstr "不能写入 %s"
1592
1593#: wrapper.c:593
1594#, c-format
1595msgid "could not close %s"
1596msgstr "不能关闭 %s"
1597
cfff71a9 1598#: wt-status.c:150
c04f5ac3
JX
1599msgid "Unmerged paths:"
1600msgstr "未合并的路径:"
1601
90e6ef53 1602# 译者:注意保持前导空格
cfff71a9 1603#: wt-status.c:177 wt-status.c:204
c04f5ac3
JX
1604#, c-format
1605msgid " (use \"git reset %s <file>...\" to unstage)"
d9d56b23 1606msgstr " (使用 \"git reset %s <文件>...\" 撤出暂存区)"
c04f5ac3 1607
90e6ef53 1608# 译者:注意保持前导空格
cfff71a9 1609#: wt-status.c:179 wt-status.c:206
c04f5ac3 1610msgid " (use \"git rm --cached <file>...\" to unstage)"
d9d56b23 1611msgstr " (使用 \"git rm --cached <文件>...\" 撤出暂存区)"
c04f5ac3 1612
90e6ef53 1613# 译者:注意保持前导空格
cfff71a9 1614#: wt-status.c:183
6792b93b 1615msgid " (use \"git add <file>...\" to mark resolution)"
d9d56b23 1616msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
6792b93b
JX
1617
1618# 译者:注意保持前导空格
cfff71a9 1619#: wt-status.c:185 wt-status.c:189
c04f5ac3 1620msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
d9d56b23 1621msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
c04f5ac3 1622
6792b93b 1623# 译者:注意保持前导空格
cfff71a9 1624#: wt-status.c:187
6792b93b 1625msgid " (use \"git rm <file>...\" to mark resolution)"
d9d56b23 1626msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
6792b93b 1627
7aea43ff 1628#: wt-status.c:198 wt-status.c:881
c04f5ac3
JX
1629msgid "Changes to be committed:"
1630msgstr "要提交的变更:"
1631
7aea43ff 1632#: wt-status.c:216 wt-status.c:890
c04f5ac3 1633msgid "Changes not staged for commit:"
7e238ab7 1634msgstr "尚未暂存以备提交的变更:"
c04f5ac3 1635
90e6ef53 1636# 译者:注意保持前导空格
cfff71a9 1637#: wt-status.c:220
c04f5ac3 1638msgid " (use \"git add <file>...\" to update what will be committed)"
d9d56b23 1639msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
c04f5ac3 1640
90e6ef53 1641# 译者:注意保持前导空格
cfff71a9 1642#: wt-status.c:222
c04f5ac3 1643msgid " (use \"git add/rm <file>...\" to update what will be committed)"
d9d56b23 1644msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
c04f5ac3 1645
90e6ef53 1646# 译者:注意保持前导空格
cfff71a9 1647#: wt-status.c:223
c04f5ac3
JX
1648msgid ""
1649" (use \"git checkout -- <file>...\" to discard changes in working directory)"
d9d56b23 1650msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
c04f5ac3 1651
90e6ef53 1652# 译者:注意保持前导空格
cfff71a9 1653#: wt-status.c:225
c04f5ac3
JX
1654msgid " (commit or discard the untracked or modified content in submodules)"
1655msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1656
90e6ef53 1657# 译者:注意保持前导空格
cfff71a9 1658#: wt-status.c:237
c04f5ac3
JX
1659#, c-format
1660msgid " (use \"git %s <file>...\" to include in what will be committed)"
d9d56b23 1661msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
c04f5ac3 1662
6c94aba5 1663#: wt-status.c:252
c04f5ac3
JX
1664msgid "both deleted:"
1665msgstr "双方删除:"
1666
6c94aba5 1667#: wt-status.c:254
c04f5ac3
JX
1668msgid "added by us:"
1669msgstr "由我们添加:"
1670
6c94aba5 1671#: wt-status.c:256
c04f5ac3
JX
1672msgid "deleted by them:"
1673msgstr "由他们删除:"
1674
6c94aba5 1675#: wt-status.c:258
c04f5ac3
JX
1676msgid "added by them:"
1677msgstr "由他们添加:"
1678
6c94aba5 1679#: wt-status.c:260
c04f5ac3
JX
1680msgid "deleted by us:"
1681msgstr "由我们删除:"
1682
6c94aba5 1683#: wt-status.c:262
c04f5ac3
JX
1684msgid "both added:"
1685msgstr "双方添加:"
1686
6c94aba5 1687#: wt-status.c:264
c04f5ac3
JX
1688msgid "both modified:"
1689msgstr "双方修改:"
1690
6c94aba5
JX
1691#: wt-status.c:266
1692#, c-format
1693msgid "bug: unhandled unmerged status %x"
1694msgstr "bug:无法处理的未合并状态 %x"
cfff71a9 1695
6c94aba5
JX
1696#: wt-status.c:274
1697msgid "new file:"
1698msgstr "新文件:"
cfff71a9 1699
6c94aba5
JX
1700#: wt-status.c:276
1701msgid "copied:"
1702msgstr "拷贝:"
cfff71a9 1703
6c94aba5
JX
1704#: wt-status.c:278
1705msgid "deleted:"
1706msgstr "删除:"
cfff71a9 1707
6c94aba5
JX
1708#: wt-status.c:280
1709msgid "modified:"
1710msgstr "修改:"
1711
1712#: wt-status.c:282
1713msgid "renamed:"
1714msgstr "重命名:"
1715
1716#: wt-status.c:284
1717msgid "typechange:"
1718msgstr "类型变更:"
1719
1720#: wt-status.c:286
1721msgid "unknown:"
1722msgstr "未知:"
cfff71a9 1723
6c94aba5
JX
1724#: wt-status.c:288
1725msgid "unmerged:"
1726msgstr "未合并:"
cfff71a9 1727
90e6ef53 1728# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6c94aba5 1729#: wt-status.c:370
c04f5ac3 1730msgid "new commits, "
aa9565f7 1731msgstr "新提交, "
c04f5ac3 1732
90e6ef53 1733# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6c94aba5 1734#: wt-status.c:372
c04f5ac3 1735msgid "modified content, "
aa9565f7 1736msgstr "修改的内容, "
c04f5ac3 1737
90e6ef53 1738# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6c94aba5 1739#: wt-status.c:374
c04f5ac3 1740msgid "untracked content, "
aa9565f7 1741msgstr "未跟踪的内容, "
c04f5ac3 1742
6c94aba5 1743#: wt-status.c:391
c04f5ac3
JX
1744#, c-format
1745msgid "bug: unhandled diff status %c"
6c94aba5 1746msgstr "bug:无法处理的差异状态 %c"
c04f5ac3 1747
7aea43ff 1748#: wt-status.c:755
90314792
JX
1749msgid "Submodules changed but not updated:"
1750msgstr "子模组已修改但尚未更新:"
1751
7aea43ff 1752#: wt-status.c:757
90314792
JX
1753msgid "Submodule changes to be committed:"
1754msgstr "要提交的子模组变更:"
1755
7aea43ff 1756#: wt-status.c:838
cfff71a9
JX
1757msgid ""
1758"Do not touch the line above.\n"
1759"Everything below will be removed."
1760msgstr ""
1761"不要改动上面的一行。\n"
1762"下面的所有内容均将被删除。"
1763
7aea43ff 1764#: wt-status.c:949
6792b93b 1765msgid "You have unmerged paths."
195febda 1766msgstr "您有尚未合并的路径。"
6792b93b
JX
1767
1768# 译者:注意保持前导空格
7aea43ff 1769#: wt-status.c:952
6792b93b
JX
1770msgid " (fix conflicts and run \"git commit\")"
1771msgstr " (解决冲突并运行 \"git commit\")"
1772
7aea43ff 1773#: wt-status.c:955
6792b93b
JX
1774msgid "All conflicts fixed but you are still merging."
1775msgstr "所有冲突已解决但您仍处于合并中。"
1776
1777# 译者:注意保持前导空格
7aea43ff 1778#: wt-status.c:958
6792b93b
JX
1779msgid " (use \"git commit\" to conclude merge)"
1780msgstr " (使用 \"git commit\" 结束合并)"
1781
7aea43ff 1782#: wt-status.c:968
6792b93b 1783msgid "You are in the middle of an am session."
98b2761d 1784msgstr "您正处于 am 操作过程中。"
6792b93b 1785
7aea43ff 1786#: wt-status.c:971
6792b93b
JX
1787msgid "The current patch is empty."
1788msgstr "当前的补丁为空。"
1789
1790# 译者:注意保持前导空格
7aea43ff 1791#: wt-status.c:975
2e8451e8
JX
1792msgid " (fix conflicts and then run \"git am --continue\")"
1793msgstr " (解决冲突,然后运行 \"git am --continue\")"
6792b93b
JX
1794
1795# 译者:注意保持前导空格
7aea43ff 1796#: wt-status.c:977
6792b93b
JX
1797msgid " (use \"git am --skip\" to skip this patch)"
1798msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1799
1800# 译者:注意保持前导空格
7aea43ff 1801#: wt-status.c:979
6792b93b
JX
1802msgid " (use \"git am --abort\" to restore the original branch)"
1803msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1804
7aea43ff 1805#: wt-status.c:1039 wt-status.c:1056
63af42fe
JX
1806#, c-format
1807msgid "You are currently rebasing branch '%s' on '%s'."
98b2761d 1808msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
63af42fe 1809
7aea43ff 1810#: wt-status.c:1044 wt-status.c:1061
6792b93b 1811msgid "You are currently rebasing."
98b2761d 1812msgstr "您在执行变基操作。"
6792b93b
JX
1813
1814# 译者:注意保持前导空格
7aea43ff 1815#: wt-status.c:1047
6792b93b
JX
1816msgid " (fix conflicts and then run \"git rebase --continue\")"
1817msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1818
1819# 译者:注意保持前导空格
7aea43ff 1820#: wt-status.c:1049
6792b93b
JX
1821msgid " (use \"git rebase --skip\" to skip this patch)"
1822msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1823
1824# 译者:注意保持前导空格
7aea43ff 1825#: wt-status.c:1051
6792b93b
JX
1826msgid " (use \"git rebase --abort\" to check out the original branch)"
1827msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1828
1829# 译者:注意保持前导空格
7aea43ff 1830#: wt-status.c:1064
6792b93b
JX
1831msgid " (all conflicts fixed: run \"git rebase --continue\")"
1832msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1833
7aea43ff 1834#: wt-status.c:1068
63af42fe
JX
1835#, c-format
1836msgid ""
1837"You are currently splitting a commit while rebasing branch '%s' on '%s'."
98b2761d 1838msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
63af42fe 1839
7aea43ff 1840#: wt-status.c:1073
6792b93b 1841msgid "You are currently splitting a commit during a rebase."
98b2761d 1842msgstr "您在执行变基操作时拆分提交。"
6792b93b
JX
1843
1844# 译者:注意保持前导空格
7aea43ff 1845#: wt-status.c:1076
6792b93b
JX
1846msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1847msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1848
7aea43ff 1849#: wt-status.c:1080
63af42fe
JX
1850#, c-format
1851msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
98b2761d 1852msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
63af42fe 1853
7aea43ff 1854#: wt-status.c:1085
6792b93b 1855msgid "You are currently editing a commit during a rebase."
98b2761d 1856msgstr "您在执行变基操作时编辑提交。"
6792b93b
JX
1857
1858# 译者:注意保持前导空格
7aea43ff 1859#: wt-status.c:1088
6792b93b
JX
1860msgid " (use \"git commit --amend\" to amend the current commit)"
1861msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1862
1863# 译者:注意保持前导空格
7aea43ff 1864#: wt-status.c:1090
6792b93b
JX
1865msgid ""
1866" (use \"git rebase --continue\" once you are satisfied with your changes)"
195febda 1867msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
6792b93b 1868
7aea43ff 1869#: wt-status.c:1100
90314792
JX
1870#, c-format
1871msgid "You are currently cherry-picking commit %s."
98b2761d 1872msgstr "您在执行拣选提交 %s 的操作。"
6792b93b 1873
2e8451e8 1874# 译者:注意保持前导空格
7aea43ff 1875#: wt-status.c:1105
2e8451e8
JX
1876msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1877msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1878
6792b93b 1879# 译者:注意保持前导空格
7aea43ff 1880#: wt-status.c:1108
2e8451e8
JX
1881msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1882msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
6792b93b 1883
2e8451e8 1884# 译者:注意保持前导空格
7aea43ff 1885#: wt-status.c:1110
2e8451e8
JX
1886msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1887msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1888
7aea43ff 1889#: wt-status.c:1119
1003b3a5
JX
1890#, c-format
1891msgid "You are currently reverting commit %s."
98b2761d 1892msgstr "您在执行反转提交 %s 的操作。"
1003b3a5
JX
1893
1894# 译者:注意保持前导空格
7aea43ff 1895#: wt-status.c:1124
1003b3a5
JX
1896msgid " (fix conflicts and run \"git revert --continue\")"
1897msgstr " (解决冲突并运行 \"git revert --continue\")"
1898
1899# 译者:注意保持前导空格
7aea43ff 1900#: wt-status.c:1127
1003b3a5
JX
1901msgid " (all conflicts fixed: run \"git revert --continue\")"
1902msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1903
1904# 译者:注意保持前导空格
7aea43ff 1905#: wt-status.c:1129
1003b3a5
JX
1906msgid " (use \"git revert --abort\" to cancel the revert operation)"
1907msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1908
7aea43ff 1909#: wt-status.c:1140
63af42fe 1910#, c-format
1003b3a5 1911msgid "You are currently bisecting, started from branch '%s'."
98b2761d 1912msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
63af42fe 1913
7aea43ff 1914#: wt-status.c:1144
6792b93b 1915msgid "You are currently bisecting."
98b2761d 1916msgstr "您在执行二分查找操作。"
6792b93b
JX
1917
1918# 译者:注意保持前导空格
7aea43ff 1919#: wt-status.c:1147
6792b93b
JX
1920msgid " (use \"git bisect reset\" to get back to the original branch)"
1921msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1922
7aea43ff 1923#: wt-status.c:1324
c04f5ac3
JX
1924msgid "On branch "
1925msgstr "位于分支 "
1926
7aea43ff 1927#: wt-status.c:1331
2e8451e8 1928msgid "rebase in progress; onto "
98b2761d 1929msgstr "变基操作正在进行中;至 "
2e8451e8 1930
7aea43ff 1931#: wt-status.c:1336
1003b3a5
JX
1932msgid "HEAD detached at "
1933msgstr "头指针分离于 "
1934
7aea43ff 1935#: wt-status.c:1338
1003b3a5
JX
1936msgid "HEAD detached from "
1937msgstr "头指针分离自 "
1938
7aea43ff 1939#: wt-status.c:1341
c04f5ac3
JX
1940msgid "Not currently on any branch."
1941msgstr "当前不在任何分支上。"
1942
7aea43ff 1943#: wt-status.c:1358
c04f5ac3
JX
1944msgid "Initial commit"
1945msgstr "初始提交"
1946
7aea43ff 1947#: wt-status.c:1372
ef317cd5 1948msgid "Untracked files"
07432cef 1949msgstr "未跟踪的文件"
c04f5ac3 1950
7aea43ff 1951#: wt-status.c:1374
ef317cd5 1952msgid "Ignored files"
07432cef 1953msgstr "忽略的文件"
c04f5ac3 1954
7aea43ff 1955#: wt-status.c:1378
1003b3a5 1956#, c-format
4dcdc3d8
JX
1957msgid ""
1958"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1959"may speed it up, but you have to be careful not to forget to add\n"
1960"new files yourself (see 'git help status')."
1961msgstr ""
1962"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
1963"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1003b3a5 1964
7aea43ff 1965#: wt-status.c:1384
c04f5ac3
JX
1966#, c-format
1967msgid "Untracked files not listed%s"
1968msgstr "未跟踪的文件没有列出%s"
1969
7e238ab7 1970# 译者:中文字符串拼接,可删除前导空格
7aea43ff 1971#: wt-status.c:1386
c04f5ac3 1972msgid " (use -u option to show untracked files)"
7e238ab7 1973msgstr "(使用 -u 参数显示未跟踪的文件)"
c04f5ac3 1974
7aea43ff 1975#: wt-status.c:1392
c04f5ac3
JX
1976msgid "No changes"
1977msgstr "没有修改"
1978
7aea43ff 1979#: wt-status.c:1397
07432cef 1980#, c-format
ef317cd5 1981msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
07432cef 1982msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
c04f5ac3 1983
7aea43ff 1984#: wt-status.c:1400
07432cef 1985#, c-format
ef317cd5 1986msgid "no changes added to commit\n"
07432cef 1987msgstr "修改尚未加入提交\n"
c04f5ac3 1988
7aea43ff 1989#: wt-status.c:1403
07432cef 1990#, c-format
ef317cd5
JX
1991msgid ""
1992"nothing added to commit but untracked files present (use \"git add\" to "
1993"track)\n"
07432cef 1994msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
c04f5ac3 1995
7aea43ff 1996#: wt-status.c:1406
07432cef 1997#, c-format
ef317cd5 1998msgid "nothing added to commit but untracked files present\n"
07432cef 1999msgstr "提交为空,但是存在尚未跟踪的文件\n"
c04f5ac3 2000
7e238ab7 2001# 译者:中文字符串拼接,可删除前导空格
7aea43ff 2002#: wt-status.c:1409
07432cef 2003#, c-format
ef317cd5 2004msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
07432cef 2005msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
c04f5ac3 2006
7aea43ff 2007#: wt-status.c:1412 wt-status.c:1417
07432cef 2008#, c-format
ef317cd5 2009msgid "nothing to commit\n"
07432cef 2010msgstr "无文件要提交\n"
ef317cd5 2011
7e238ab7 2012# 译者:中文字符串拼接,可删除前导空格
7aea43ff 2013#: wt-status.c:1415
07432cef 2014#, c-format
ef317cd5 2015msgid "nothing to commit (use -u to show untracked files)\n"
07432cef 2016msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
c04f5ac3 2017
7e238ab7 2018# 译者:中文字符串拼接,可删除前导空格
7aea43ff 2019#: wt-status.c:1419
07432cef 2020#, c-format
ef317cd5 2021msgid "nothing to commit, working directory clean\n"
07432cef 2022msgstr "无文件要提交,干净的工作区\n"
c04f5ac3 2023
7aea43ff 2024#: wt-status.c:1528
c04f5ac3 2025msgid "HEAD (no branch)"
61bc0753 2026msgstr "HEAD(非分支)"
c04f5ac3 2027
90e6ef53 2028# 译者:注意保持句尾空格
7aea43ff 2029#: wt-status.c:1534
c04f5ac3
JX
2030msgid "Initial commit on "
2031msgstr "初始提交于 "
2032
7aea43ff 2033#: wt-status.c:1561
90314792
JX
2034msgid "gone"
2035msgstr "丢失"
2036
90e6ef53 2037# 译者:注意保持句尾空格
7aea43ff 2038#: wt-status.c:1563 wt-status.c:1571
c04f5ac3
JX
2039msgid "behind "
2040msgstr "落后 "
2041
5bb01d4f 2042#: compat/precompose_utf8.c:55 builtin/clone.c:345
a77c07d9
JX
2043#, c-format
2044msgid "failed to unlink '%s'"
2045msgstr "无法删除 '%s'"
2046
220c313c 2047#: builtin/add.c:22
814ff314
JX
2048msgid "git add [<options>] [--] <pathspec>..."
2049msgstr "git add [<选项>] [--] <路径规则>..."
ef317cd5 2050
220c313c 2051#: builtin/add.c:65
c04f5ac3
JX
2052#, c-format
2053msgid "unexpected diff status %c"
2054msgstr "意外的差异状态 %c"
2055
44f518e6 2056#: builtin/add.c:70 builtin/commit.c:277
c04f5ac3
JX
2057msgid "updating files failed"
2058msgstr "更新文件失败"
2059
220c313c 2060#: builtin/add.c:80
c04f5ac3
JX
2061#, c-format
2062msgid "remove '%s'\n"
2063msgstr "删除 '%s'\n"
2064
220c313c 2065#: builtin/add.c:134
c04f5ac3 2066msgid "Unstaged changes after refreshing the index:"
90e6ef53 2067msgstr "刷新索引之后尚未被暂存的变更:"
c04f5ac3 2068
7aea43ff 2069#: builtin/add.c:194 builtin/rev-parse.c:796
c04f5ac3 2070msgid "Could not read the index"
90e6ef53 2071msgstr "不能读取索引"
c04f5ac3 2072
220c313c 2073#: builtin/add.c:205
c04f5ac3
JX
2074#, c-format
2075msgid "Could not open '%s' for writing."
195febda 2076msgstr "不能打开 '%s' 以写入。"
c04f5ac3 2077
220c313c 2078#: builtin/add.c:209
c04f5ac3 2079msgid "Could not write patch"
195febda 2080msgstr "不能生成补丁"
c04f5ac3 2081
7aea43ff
JX
2082#: builtin/add.c:212
2083msgid "editing patch failed"
2084msgstr "编辑补丁失败"
2085
2086#: builtin/add.c:215
c04f5ac3
JX
2087#, c-format
2088msgid "Could not stat '%s'"
90e6ef53 2089msgstr "不能查看文件状态 '%s'"
c04f5ac3 2090
7aea43ff 2091#: builtin/add.c:217
c04f5ac3
JX
2092msgid "Empty patch. Aborted."
2093msgstr "空补丁。异常终止。"
2094
7aea43ff 2095#: builtin/add.c:222
8ada9598
JX
2096#, c-format
2097msgid "Could not apply '%s'"
2098msgstr "不能应用 '%s'"
2099
7aea43ff 2100#: builtin/add.c:232
8ada9598 2101msgid "The following paths are ignored by one of your .gitignore files:\n"
195febda 2102msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 2103
7aea43ff
JX
2104#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110
2105#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369
2106#: builtin/rm.c:268
ef317cd5 2107msgid "dry run"
07432cef 2108msgstr "演习"
ef317cd5 2109
7aea43ff
JX
2110#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
2111#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616
220c313c 2112#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
ef317cd5
JX
2113msgid "be verbose"
2114msgstr "冗长输出"
2115
7aea43ff 2116#: builtin/add.c:252
ef317cd5 2117msgid "interactive picking"
07432cef 2118msgstr "交互式拣选"
ef317cd5 2119
5bb01d4f 2120#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286
ef317cd5 2121msgid "select hunks interactively"
07432cef 2122msgstr "交互式挑选数据块"
ef317cd5 2123
7aea43ff 2124#: builtin/add.c:254
ef317cd5 2125msgid "edit current diff and apply"
07432cef 2126msgstr "编辑当前差异并应用"
ef317cd5 2127
7aea43ff 2128#: builtin/add.c:255
ef317cd5 2129msgid "allow adding otherwise ignored files"
07432cef 2130msgstr "允许添加忽略的文件"
ef317cd5 2131
7aea43ff 2132#: builtin/add.c:256
ef317cd5 2133msgid "update tracked files"
07432cef 2134msgstr "更新已跟踪的文件"
ef317cd5 2135
7aea43ff 2136#: builtin/add.c:257
ef317cd5 2137msgid "record only the fact that the path will be added later"
07432cef 2138msgstr "只记录,该路径稍后再添加"
ef317cd5 2139
7aea43ff 2140#: builtin/add.c:258
ef317cd5 2141msgid "add changes from all tracked and untracked files"
07432cef 2142msgstr "添加所有改变的已跟踪文件和未跟踪文件"
ef317cd5 2143
7aea43ff 2144#: builtin/add.c:261
4dcdc3d8
JX
2145msgid "ignore paths removed in the working tree (same as --no-all)"
2146msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2147
7aea43ff 2148#: builtin/add.c:263
ef317cd5 2149msgid "don't add, only refresh the index"
07432cef 2150msgstr "不添加,只刷新索引"
ef317cd5 2151
7aea43ff 2152#: builtin/add.c:264
ef317cd5 2153msgid "just skip files which cannot be added because of errors"
07432cef 2154msgstr "跳过因出错不能添加的文件"
ef317cd5 2155
7aea43ff 2156#: builtin/add.c:265
ef317cd5 2157msgid "check if - even missing - files are ignored in dry run"
07432cef 2158msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
ef317cd5 2159
7aea43ff 2160#: builtin/add.c:287
8ada9598
JX
2161#, c-format
2162msgid "Use -f if you really want to add them.\n"
2163msgstr "使用 -f 参数如果您确实要添加它们。\n"
2164
7aea43ff 2165#: builtin/add.c:294
8ada9598
JX
2166msgid "adding files failed"
2167msgstr "添加文件失败"
2168
7aea43ff 2169#: builtin/add.c:330
8ada9598
JX
2170msgid "-A and -u are mutually incompatible"
2171msgstr "-A 和 -u 选项互斥"
2172
7aea43ff 2173#: builtin/add.c:337
8ada9598 2174msgid "Option --ignore-missing can only be used together with --dry-run"
649900bc 2175msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 2176
7aea43ff 2177#: builtin/add.c:358
8ada9598
JX
2178#, c-format
2179msgid "Nothing specified, nothing added.\n"
2180msgstr "没有指定文件,也没有文件被添加。\n"
2181
7aea43ff 2182#: builtin/add.c:359
8ada9598
JX
2183#, c-format
2184msgid "Maybe you wanted to say 'git add .'?\n"
2185msgstr "也许您想要执行 'git add .'?\n"
2186
7aea43ff
JX
2187#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918
2188#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
8ada9598
JX
2189msgid "index file corrupt"
2190msgstr "索引文件损坏"
2191
7aea43ff 2192#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
8ada9598
JX
2193msgid "Unable to write new index file"
2194msgstr "无法写入新索引文件"
2195
814ff314
JX
2196#: builtin/apply.c:59
2197msgid "git apply [<options>] [<patch>...]"
2198msgstr "git apply [<选项>] [<补丁>...]"
8ada9598 2199
814ff314 2200#: builtin/apply.c:112
81809b99 2201#, c-format
8ada9598 2202msgid "unrecognized whitespace option '%s'"
81809b99 2203msgstr "未能识别的空白字符选项 '%s'"
8ada9598 2204
814ff314 2205#: builtin/apply.c:127
81809b99 2206#, c-format
8ada9598 2207msgid "unrecognized whitespace ignore option '%s'"
81809b99 2208msgstr "未能识别的空白字符忽略选项 '%s'"
8ada9598 2209
814ff314 2210#: builtin/apply.c:822
8ada9598
JX
2211#, c-format
2212msgid "Cannot prepare timestamp regexp %s"
81809b99 2213msgstr "无法准备时间戳正则表达式 %s"
8ada9598 2214
814ff314 2215#: builtin/apply.c:831
8ada9598
JX
2216#, c-format
2217msgid "regexec returned %d for input: %s"
81809b99 2218msgstr "regexec 返回 %d,输入为:%s"
8ada9598 2219
814ff314 2220#: builtin/apply.c:912
81809b99 2221#, c-format
8ada9598 2222msgid "unable to find filename in patch at line %d"
81809b99 2223msgstr "不能在补丁的第 %d 行找到文件名"
8ada9598 2224
814ff314 2225#: builtin/apply.c:944
8ada9598
JX
2226#, c-format
2227msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
9aafc933 2228msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
8ada9598 2229
814ff314 2230#: builtin/apply.c:948
8ada9598
JX
2231#, c-format
2232msgid "git apply: bad git-diff - inconsistent new filename on line %d"
81809b99 2233msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
8ada9598 2234
814ff314 2235#: builtin/apply.c:949
8ada9598
JX
2236#, c-format
2237msgid "git apply: bad git-diff - inconsistent old filename on line %d"
81809b99 2238msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
8ada9598 2239
814ff314 2240#: builtin/apply.c:956
8ada9598
JX
2241#, c-format
2242msgid "git apply: bad git-diff - expected /dev/null on line %d"
9aafc933 2243msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
8ada9598 2244
814ff314 2245#: builtin/apply.c:1419
8ada9598
JX
2246#, c-format
2247msgid "recount: unexpected line: %.*s"
81809b99 2248msgstr "recount:意外的行:%.*s"
8ada9598 2249
814ff314 2250#: builtin/apply.c:1476
8ada9598
JX
2251#, c-format
2252msgid "patch fragment without header at line %d: %.*s"
81809b99 2253msgstr "第 %d 行的补丁片段没有头信息:%.*s"
8ada9598 2254
814ff314 2255#: builtin/apply.c:1493
8ada9598
JX
2256#, c-format
2257msgid ""
2258"git diff header lacks filename information when removing %d leading pathname "
2259"component (line %d)"
2260msgid_plural ""
2261"git diff header lacks filename information when removing %d leading pathname "
2262"components (line %d)"
5ae481e0
JX
2263msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2264msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
8ada9598 2265
7aea43ff 2266#: builtin/apply.c:1659
8ada9598 2267msgid "new file depends on old contents"
81809b99 2268msgstr "新文件依赖旧内容"
8ada9598 2269
7aea43ff 2270#: builtin/apply.c:1661
8ada9598 2271msgid "deleted file still has contents"
81809b99 2272msgstr "删除的文件仍有内容"
8ada9598 2273
7aea43ff 2274#: builtin/apply.c:1687
8ada9598
JX
2275#, c-format
2276msgid "corrupt patch at line %d"
195febda 2277msgstr "补丁在第 %d 行损坏"
8ada9598 2278
7aea43ff 2279#: builtin/apply.c:1723
8ada9598
JX
2280#, c-format
2281msgid "new file %s depends on old contents"
81809b99 2282msgstr "新文件 %s 依赖旧内容"
8ada9598 2283
7aea43ff 2284#: builtin/apply.c:1725
8ada9598
JX
2285#, c-format
2286msgid "deleted file %s still has contents"
81809b99 2287msgstr "删除的文件 %s 仍有内容"
8ada9598 2288
7aea43ff 2289#: builtin/apply.c:1728
8ada9598
JX
2290#, c-format
2291msgid "** warning: file %s becomes empty but is not deleted"
81809b99 2292msgstr "** 警告:文件 %s 成为空文件但并未删除"
8ada9598 2293
7aea43ff 2294#: builtin/apply.c:1874
8ada9598
JX
2295#, c-format
2296msgid "corrupt binary patch at line %d: %.*s"
81809b99 2297msgstr "二进制补丁在第 %d 行损坏:%.*s"
8ada9598 2298
7aea43ff 2299#: builtin/apply.c:1903
8ada9598
JX
2300#, c-format
2301msgid "unrecognized binary patch at line %d"
81809b99 2302msgstr "未能识别的二进制补丁位于第 %d 行"
8ada9598 2303
7aea43ff 2304#: builtin/apply.c:2054
8ada9598
JX
2305#, c-format
2306msgid "patch with only garbage at line %d"
81809b99 2307msgstr "补丁文件的第 %d 行只有垃圾数据"
8ada9598 2308
7aea43ff 2309#: builtin/apply.c:2144
81809b99 2310#, c-format
8ada9598 2311msgid "unable to read symlink %s"
81809b99 2312msgstr "无法读取符号链接 %s"
8ada9598 2313
7aea43ff 2314#: builtin/apply.c:2148
81809b99 2315#, c-format
8ada9598 2316msgid "unable to open or read %s"
81809b99 2317msgstr "不能打开或读取 %s"
8ada9598 2318
7aea43ff 2319#: builtin/apply.c:2781
81809b99 2320#, c-format
8ada9598 2321msgid "invalid start of line: '%c'"
81809b99 2322msgstr "无效的行首字符:'%c'"
8ada9598 2323
7aea43ff 2324#: builtin/apply.c:2900
8ada9598
JX
2325#, c-format
2326msgid "Hunk #%d succeeded at %d (offset %d line)."
2327msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
07432cef
WS
2328msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2329msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
8ada9598 2330
7aea43ff 2331#: builtin/apply.c:2912
8ada9598
JX
2332#, c-format
2333msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
81809b99 2334msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
8ada9598 2335
7aea43ff 2336#: builtin/apply.c:2918
8ada9598
JX
2337#, c-format
2338msgid ""
2339"while searching for:\n"
2340"%.*s"
2341msgstr ""
81809b99
JX
2342"当查询:\n"
2343"%.*s"
8ada9598 2344
7aea43ff 2345#: builtin/apply.c:2938
8ada9598
JX
2346#, c-format
2347msgid "missing binary patch data for '%s'"
81809b99 2348msgstr "缺失 '%s' 的二进制补丁数据"
8ada9598 2349
7aea43ff 2350#: builtin/apply.c:3039
8ada9598
JX
2351#, c-format
2352msgid "binary patch does not apply to '%s'"
81809b99 2353msgstr "二进制补丁未应用到 '%s'"
8ada9598 2354
7aea43ff 2355#: builtin/apply.c:3045
8ada9598
JX
2356#, c-format
2357msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
9aafc933 2358msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
8ada9598 2359
7aea43ff 2360#: builtin/apply.c:3066
8ada9598
JX
2361#, c-format
2362msgid "patch failed: %s:%ld"
81809b99 2363msgstr "打补丁失败:%s:%ld"
8ada9598 2364
7aea43ff 2365#: builtin/apply.c:3190
8ada9598 2366#, c-format
23ff3338
JX
2367msgid "cannot checkout %s"
2368msgstr "不能检出 %s"
8ada9598 2369
7aea43ff 2370#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
81809b99 2371#, c-format
8ada9598 2372msgid "read of %s failed"
81809b99 2373msgstr "读取 %s 失败"
8ada9598 2374
7aea43ff 2375#: builtin/apply.c:3243
814ff314
JX
2376#, c-format
2377msgid "reading from '%s' beyond a symbolic link"
2378msgstr "读取位于符号链接中的 '%s'"
2379
7aea43ff 2380#: builtin/apply.c:3271 builtin/apply.c:3493
81809b99 2381#, c-format
23ff3338
JX
2382msgid "path %s has been renamed/deleted"
2383msgstr "路径 %s 已经被重命名/删除"
8ada9598 2384
7aea43ff 2385#: builtin/apply.c:3352 builtin/apply.c:3507
8ada9598 2386#, c-format
23ff3338
JX
2387msgid "%s: does not exist in index"
2388msgstr "%s:不存在于索引中"
8ada9598 2389
7aea43ff 2390#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
81809b99 2391#, c-format
8ada9598 2392msgid "%s: %s"
81809b99 2393msgstr "%s:%s"
8ada9598 2394
7aea43ff 2395#: builtin/apply.c:3361 builtin/apply.c:3515
81809b99 2396#, c-format
8ada9598 2397msgid "%s: does not match index"
81809b99 2398msgstr "%s:和索引不匹配"
8ada9598 2399
7aea43ff 2400#: builtin/apply.c:3463
23ff3338
JX
2401msgid "removal patch leaves file contents"
2402msgstr "移除补丁仍留下了文件内容"
2403
7aea43ff 2404#: builtin/apply.c:3532
8ada9598
JX
2405#, c-format
2406msgid "%s: wrong type"
81809b99 2407msgstr "%s:错误类型"
8ada9598 2408
7aea43ff 2409#: builtin/apply.c:3534
8ada9598
JX
2410#, c-format
2411msgid "%s has type %o, expected %o"
9aafc933 2412msgstr "%s 的类型是 %o,应为 %o"
8ada9598 2413
7aea43ff 2414#: builtin/apply.c:3693 builtin/apply.c:3695
814ff314
JX
2415#, c-format
2416msgid "invalid path '%s'"
2417msgstr "无效路径 '%s'"
2418
7aea43ff 2419#: builtin/apply.c:3750
81809b99 2420#, c-format
8ada9598 2421msgid "%s: already exists in index"
81809b99 2422msgstr "%s:已经存在于索引中"
8ada9598 2423
7aea43ff 2424#: builtin/apply.c:3753
23ff3338
JX
2425#, c-format
2426msgid "%s: already exists in working directory"
2427msgstr "%s:已经存在于工作区中"
2428
7aea43ff 2429#: builtin/apply.c:3773
d691f479
JX
2430#, c-format
2431msgid "new mode (%o) of %s does not match old mode (%o)"
2432msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
8ada9598 2433
7aea43ff 2434#: builtin/apply.c:3778
8ada9598 2435#, c-format
d691f479
JX
2436msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2437msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2438
7aea43ff 2439#: builtin/apply.c:3798
814ff314
JX
2440#, c-format
2441msgid "affected file '%s' is beyond a symbolic link"
2442msgstr "受影响的文件 '%s' 位于符号链接中"
2443
7aea43ff 2444#: builtin/apply.c:3802
d691f479 2445#, c-format
8ada9598 2446msgid "%s: patch does not apply"
81809b99 2447msgstr "%s:补丁未应用"
8ada9598 2448
7aea43ff 2449#: builtin/apply.c:3816
8ada9598
JX
2450#, c-format
2451msgid "Checking patch %s..."
81809b99 2452msgstr "检查补丁 %s..."
8ada9598 2453
5bb01d4f 2454#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135
8ada9598
JX
2455#, c-format
2456msgid "make_cache_entry failed for path '%s'"
2457msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2458
7aea43ff 2459#: builtin/apply.c:4052
81809b99 2460#, c-format
8ada9598 2461msgid "unable to remove %s from index"
81809b99 2462msgstr "不能从索引中移除 %s"
8ada9598 2463
7aea43ff 2464#: builtin/apply.c:4081
8ada9598 2465#, c-format
2e8451e8
JX
2466msgid "corrupt patch for submodule %s"
2467msgstr "子模组 %s 损坏的补丁"
8ada9598 2468
7aea43ff 2469#: builtin/apply.c:4085
81809b99 2470#, c-format
8ada9598 2471msgid "unable to stat newly created file '%s'"
81809b99 2472msgstr "不能枚举新建文件 '%s' 的状态"
8ada9598 2473
7aea43ff 2474#: builtin/apply.c:4090
8ada9598
JX
2475#, c-format
2476msgid "unable to create backing store for newly created file %s"
81809b99 2477msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 2478
7aea43ff 2479#: builtin/apply.c:4093 builtin/apply.c:4201
81809b99 2480#, c-format
8ada9598 2481msgid "unable to add cache entry for %s"
81809b99 2482msgstr "无法为 %s 添加缓存条目"
8ada9598 2483
7aea43ff 2484#: builtin/apply.c:4126
81809b99 2485#, c-format
8ada9598 2486msgid "closing file '%s'"
81809b99 2487msgstr "关闭文件 '%s'"
8ada9598 2488
7aea43ff 2489#: builtin/apply.c:4175
81809b99 2490#, c-format
8ada9598 2491msgid "unable to write file '%s' mode %o"
81809b99 2492msgstr "不能写文件 '%s' 权限 %o"
8ada9598 2493
7aea43ff 2494#: builtin/apply.c:4262
8ada9598
JX
2495#, c-format
2496msgid "Applied patch %s cleanly."
81809b99 2497msgstr "成功应用补丁 %s。"
8ada9598 2498
7aea43ff 2499#: builtin/apply.c:4270
8ada9598 2500msgid "internal error"
81809b99 2501msgstr "内部错误"
8ada9598 2502
7aea43ff 2503#: builtin/apply.c:4273
8ada9598
JX
2504#, c-format
2505msgid "Applying patch %%s with %d reject..."
2506msgid_plural "Applying patch %%s with %d rejects..."
195febda
T
2507msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2508msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
8ada9598 2509
7aea43ff 2510#: builtin/apply.c:4283
8ada9598
JX
2511#, c-format
2512msgid "truncating .rej filename to %.*s.rej"
81809b99 2513msgstr "截短 .rej 文件名为 %.*s.rej"
8ada9598 2514
7aea43ff 2515#: builtin/apply.c:4304
8ada9598
JX
2516#, c-format
2517msgid "Hunk #%d applied cleanly."
81809b99 2518msgstr "第 #%d 个片段成功应用。"
8ada9598 2519
7aea43ff 2520#: builtin/apply.c:4307
8ada9598
JX
2521#, c-format
2522msgid "Rejected hunk #%d."
81809b99 2523msgstr "拒绝第 #%d 个片段。"
8ada9598 2524
7aea43ff 2525#: builtin/apply.c:4397
8ada9598 2526msgid "unrecognized input"
81809b99 2527msgstr "未能识别的输入"
8ada9598 2528
7aea43ff 2529#: builtin/apply.c:4408
8ada9598 2530msgid "unable to read index file"
81809b99 2531msgstr "无法读取索引文件"
8ada9598 2532
7aea43ff 2533#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85
814ff314 2534#: builtin/fetch.c:92
8ada9598 2535msgid "path"
81809b99 2536msgstr "路径"
8ada9598 2537
7aea43ff 2538#: builtin/apply.c:4526
8ada9598 2539msgid "don't apply changes matching the given path"
81809b99 2540msgstr "不要应用与给出路径向匹配的变更"
8ada9598 2541
7aea43ff 2542#: builtin/apply.c:4529
8ada9598 2543msgid "apply changes matching the given path"
81809b99 2544msgstr "应用与给出路径向匹配的变更"
8ada9598 2545
7aea43ff 2546#: builtin/apply.c:4531
8ada9598 2547msgid "num"
81809b99 2548msgstr "数字"
8ada9598 2549
7aea43ff 2550#: builtin/apply.c:4532
8ada9598 2551msgid "remove <num> leading slashes from traditional diff paths"
07432cef 2552msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
8ada9598 2553
7aea43ff 2554#: builtin/apply.c:4535
8ada9598 2555msgid "ignore additions made by the patch"
81809b99 2556msgstr "忽略补丁中的添加的文件"
8ada9598 2557
7aea43ff 2558#: builtin/apply.c:4537
8ada9598 2559msgid "instead of applying the patch, output diffstat for the input"
81809b99 2560msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
8ada9598 2561
7aea43ff 2562#: builtin/apply.c:4541
ef317cd5 2563msgid "show number of added and deleted lines in decimal notation"
07432cef 2564msgstr "以十进制数显示添加和删除的行数"
8ada9598 2565
7aea43ff 2566#: builtin/apply.c:4543
8ada9598 2567msgid "instead of applying the patch, output a summary for the input"
81809b99 2568msgstr "不应用补丁,而是显示输入的概要"
8ada9598 2569
7aea43ff 2570#: builtin/apply.c:4545
8ada9598 2571msgid "instead of applying the patch, see if the patch is applicable"
81809b99 2572msgstr "不应用补丁,而是查看补丁是否可应用"
8ada9598 2573
7aea43ff 2574#: builtin/apply.c:4547
8ada9598 2575msgid "make sure the patch is applicable to the current index"
81809b99 2576msgstr "确认补丁可以应用到当前索引"
8ada9598 2577
7aea43ff 2578#: builtin/apply.c:4549
8ada9598 2579msgid "apply a patch without touching the working tree"
81809b99 2580msgstr "应用补丁而不修改工作区"
8ada9598 2581
7aea43ff 2582#: builtin/apply.c:4551
814ff314
JX
2583msgid "accept a patch that touches outside the working area"
2584msgstr "接受修改工作区之外文件的补丁"
2585
7aea43ff 2586#: builtin/apply.c:4553
8ada9598 2587msgid "also apply the patch (use with --stat/--summary/--check)"
195febda 2588msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
8ada9598 2589
7aea43ff 2590#: builtin/apply.c:4555
23ff3338
JX
2591msgid "attempt three-way merge if a patch does not apply"
2592msgstr "如果一个补丁不能应用则尝试三路合并"
2593
7aea43ff 2594#: builtin/apply.c:4557
8ada9598 2595msgid "build a temporary index based on embedded index information"
81809b99 2596msgstr "创建一个临时索引基于嵌入的索引信息"
8ada9598 2597
7aea43ff 2598#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
8ada9598 2599msgid "paths are separated with NUL character"
81809b99 2600msgstr "路径以 NUL 字符分隔"
8ada9598 2601
7aea43ff 2602#: builtin/apply.c:4562
8ada9598 2603msgid "ensure at least <n> lines of context match"
81809b99 2604msgstr "确保至少匹配 <n> 行上下文"
8ada9598 2605
7aea43ff 2606#: builtin/apply.c:4563
8ada9598 2607msgid "action"
81809b99 2608msgstr "动作"
8ada9598 2609
7aea43ff 2610#: builtin/apply.c:4564
8ada9598 2611msgid "detect new or modified lines that have whitespace errors"
81809b99 2612msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 2613
7aea43ff 2614#: builtin/apply.c:4567 builtin/apply.c:4570
8ada9598 2615msgid "ignore changes in whitespace when finding context"
81809b99 2616msgstr "查找上下文时忽略空白字符的变更"
8ada9598 2617
7aea43ff 2618#: builtin/apply.c:4573
8ada9598 2619msgid "apply the patch in reverse"
81809b99 2620msgstr "反向应用补丁"
8ada9598 2621
7aea43ff 2622#: builtin/apply.c:4575
8ada9598 2623msgid "don't expect at least one line of context"
81809b99 2624msgstr "无需至少一行上下文"
8ada9598 2625
7aea43ff 2626#: builtin/apply.c:4577
8ada9598 2627msgid "leave the rejected hunks in corresponding *.rej files"
81809b99 2628msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 2629
7aea43ff 2630#: builtin/apply.c:4579
8ada9598 2631msgid "allow overlapping hunks"
81809b99 2632msgstr "允许重叠的补丁片段"
8ada9598 2633
7aea43ff 2634#: builtin/apply.c:4582
8ada9598 2635msgid "tolerate incorrectly detected missing new-line at the end of file"
195febda 2636msgstr "允许不正确的文件末尾换行符"
c04f5ac3 2637
7aea43ff 2638#: builtin/apply.c:4585
8ada9598 2639msgid "do not trust the line counts in the hunk headers"
81809b99 2640msgstr "不信任补丁片段的头信息中的行号"
c04f5ac3 2641
7aea43ff 2642#: builtin/apply.c:4587
8ada9598 2643msgid "root"
81809b99 2644msgstr "根目录"
c04f5ac3 2645
7aea43ff 2646#: builtin/apply.c:4588
8ada9598 2647msgid "prepend <root> to all filenames"
81809b99 2648msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 2649
7aea43ff 2650#: builtin/apply.c:4610
23ff3338
JX
2651msgid "--3way outside a repository"
2652msgstr "--3way 在一个版本库之外"
2653
7aea43ff 2654#: builtin/apply.c:4618
8ada9598 2655msgid "--index outside a repository"
81809b99 2656msgstr "--index 在一个版本库之外"
c04f5ac3 2657
7aea43ff 2658#: builtin/apply.c:4621
8ada9598 2659msgid "--cached outside a repository"
81809b99 2660msgstr "--cached 在一个版本库之外"
c04f5ac3 2661
7aea43ff 2662#: builtin/apply.c:4640
81809b99 2663#, c-format
8ada9598 2664msgid "can't open patch '%s'"
81809b99 2665msgstr "不能打开补丁 '%s'"
c04f5ac3 2666
7aea43ff 2667#: builtin/apply.c:4654
c04f5ac3 2668#, c-format
8ada9598
JX
2669msgid "squelched %d whitespace error"
2670msgid_plural "squelched %d whitespace errors"
81809b99 2671msgstr[0] "抑制下仍有 %d 个空白字符误用"
5ae481e0 2672msgstr[1] "抑制下仍有 %d 个空白字符误用"
c04f5ac3 2673
7aea43ff 2674#: builtin/apply.c:4660 builtin/apply.c:4670
8ada9598
JX
2675#, c-format
2676msgid "%d line adds whitespace errors."
2677msgid_plural "%d lines add whitespace errors."
81809b99 2678msgstr[0] "%d 行有空白字符误用。"
5ae481e0 2679msgstr[1] "%d 行有空白字符误用。"
c04f5ac3
JX
2680
2681#: builtin/archive.c:17
2682#, c-format
2683msgid "could not create archive file '%s'"
90e6ef53 2684msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
2685
2686#: builtin/archive.c:20
2687msgid "could not redirect output"
195febda 2688msgstr "不能重定向输出"
c04f5ac3
JX
2689
2690#: builtin/archive.c:37
2691msgid "git archive: Remote with no URL"
90e6ef53 2692msgstr "git archive:未提供远程URL"
c04f5ac3
JX
2693
2694#: builtin/archive.c:58
2695msgid "git archive: expected ACK/NAK, got EOF"
9aafc933 2696msgstr "git archive:应为ACK/NACK,却得到EOF"
c04f5ac3 2697
1003b3a5 2698#: builtin/archive.c:61
c04f5ac3
JX
2699#, c-format
2700msgid "git archive: NACK %s"
90e6ef53 2701msgstr "git archive:NACK %s"
c04f5ac3 2702
1003b3a5 2703#: builtin/archive.c:63
c04f5ac3
JX
2704#, c-format
2705msgid "remote error: %s"
2706msgstr "远程错误:%s"
2707
1003b3a5 2708#: builtin/archive.c:64
c04f5ac3 2709msgid "git archive: protocol error"
90e6ef53 2710msgstr "git archive:协议错误"
c04f5ac3 2711
1003b3a5 2712#: builtin/archive.c:68
c04f5ac3 2713msgid "git archive: expected a flush"
195febda 2714msgstr "git archive:应为刷新"
c04f5ac3 2715
ef317cd5
JX
2716#: builtin/bisect--helper.c:7
2717msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 2718msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5
JX
2719
2720#: builtin/bisect--helper.c:17
2721msgid "perform 'git bisect next'"
07432cef 2722msgstr "执行 'git bisect next'"
ef317cd5
JX
2723
2724#: builtin/bisect--helper.c:19
2725msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 2726msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5 2727
7aea43ff
JX
2728#: builtin/blame.c:31
2729msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
2730msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
ef317cd5 2731
7aea43ff 2732#: builtin/blame.c:36
814ff314
JX
2733msgid "<rev-opts> are documented in git-rev-list(1)"
2734msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
ef317cd5 2735
814ff314 2736#: builtin/blame.c:2500
ef317cd5 2737msgid "Show blame entries as we find them, incrementally"
07432cef 2738msgstr "增量式地显示发现的 blame 条目"
ef317cd5 2739
814ff314 2740#: builtin/blame.c:2501
ef317cd5 2741msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 2742msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 2743
814ff314 2744#: builtin/blame.c:2502
ef317cd5 2745msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 2746msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 2747
814ff314 2748#: builtin/blame.c:2503
ef317cd5 2749msgid "Show work cost statistics"
07432cef 2750msgstr "显示命令消耗统计"
ef317cd5 2751
814ff314 2752#: builtin/blame.c:2504
ef317cd5 2753msgid "Show output score for blame entries"
07432cef 2754msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 2755
814ff314 2756#: builtin/blame.c:2505
ef317cd5 2757msgid "Show original filename (Default: auto)"
07432cef 2758msgstr "显示原始文件名(默认:自动)"
ef317cd5 2759
814ff314 2760#: builtin/blame.c:2506
ef317cd5 2761msgid "Show original linenumber (Default: off)"
07432cef 2762msgstr "显示原始的行号(默认:关闭)"
ef317cd5 2763
814ff314 2764#: builtin/blame.c:2507
ef317cd5 2765msgid "Show in a format designed for machine consumption"
07432cef 2766msgstr "显示为一个适合机器读取的格式"
ef317cd5 2767
814ff314 2768#: builtin/blame.c:2508
ef317cd5 2769msgid "Show porcelain format with per-line commit information"
07432cef 2770msgstr "为每一行显示机器适用的提交信息"
ef317cd5 2771
814ff314 2772#: builtin/blame.c:2509
ef317cd5 2773msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 2774msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 2775
814ff314 2776#: builtin/blame.c:2510
ef317cd5 2777msgid "Show raw timestamp (Default: off)"
07432cef 2778msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 2779
814ff314 2780#: builtin/blame.c:2511
ef317cd5 2781msgid "Show long commit SHA1 (Default: off)"
07432cef 2782msgstr "显示长的SHA1提交号(默认:关闭)"
ef317cd5 2783
814ff314 2784#: builtin/blame.c:2512
ef317cd5 2785msgid "Suppress author name and timestamp (Default: off)"
07432cef 2786msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 2787
814ff314 2788#: builtin/blame.c:2513
ef317cd5 2789msgid "Show author email instead of name (Default: off)"
07432cef 2790msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 2791
814ff314 2792#: builtin/blame.c:2514
ef317cd5 2793msgid "Ignore whitespace differences"
07432cef 2794msgstr "忽略空白差异"
ef317cd5 2795
814ff314 2796#: builtin/blame.c:2515
ef317cd5 2797msgid "Spend extra cycles to find better match"
07432cef 2798msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 2799
814ff314 2800#: builtin/blame.c:2516
ef317cd5 2801msgid "Use revisions from <file> instead of calling git-rev-list"
d9d56b23 2802msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
ef317cd5 2803
814ff314 2804#: builtin/blame.c:2517
ef317cd5 2805msgid "Use <file>'s contents as the final image"
d9d56b23 2806msgstr "使用 <文件> 的内容作为最终的图片"
ef317cd5 2807
814ff314 2808#: builtin/blame.c:2518 builtin/blame.c:2519
ef317cd5 2809msgid "score"
07432cef 2810msgstr "得分"
ef317cd5 2811
814ff314 2812#: builtin/blame.c:2518
ef317cd5 2813msgid "Find line copies within and across files"
07432cef 2814msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 2815
814ff314 2816#: builtin/blame.c:2519
ef317cd5 2817msgid "Find line movements within and across files"
07432cef 2818msgstr "找到文件内及跨文件的行移动"
ef317cd5 2819
814ff314 2820#: builtin/blame.c:2520
ef317cd5 2821msgid "n,m"
07432cef 2822msgstr "n,m"
ef317cd5 2823
814ff314 2824#: builtin/blame.c:2520
ef317cd5 2825msgid "Process only line range n,m, counting from 1"
07432cef 2826msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 2827
6c94aba5
JX
2828#. TRANSLATORS: This string is used to tell us the maximum
2829#. display width for a relative timestamp in "git blame"
2830#. output. For C locale, "4 years, 11 months ago", which
2831#. takes 22 places, is the longest among various forms of
2832#. relative timestamps, but your language may need more or
2833#. fewer display columns.
814ff314 2834#: builtin/blame.c:2601
6c94aba5
JX
2835msgid "4 years, 11 months ago"
2836msgstr "4 年 11 个月前"
2837
1003b3a5 2838#: builtin/branch.c:24
814ff314
JX
2839msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
2840msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
ef317cd5 2841
1003b3a5 2842#: builtin/branch.c:25
814ff314
JX
2843msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
2844msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 2845
1003b3a5 2846#: builtin/branch.c:26
814ff314
JX
2847msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
2848msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
ef317cd5 2849
1003b3a5 2850#: builtin/branch.c:27
814ff314
JX
2851msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
2852msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 2853
90e6ef53 2854# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
7aea43ff 2855#: builtin/branch.c:150
c04f5ac3
JX
2856#, c-format
2857msgid ""
2858"deleting branch '%s' that has been merged to\n"
2859" '%s', but not yet merged to HEAD."
2860msgstr ""
70fc47bf 2861"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
2862" '%s',但未合并到 HEAD。"
2863
90e6ef53 2864# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
7aea43ff 2865#: builtin/branch.c:154
c04f5ac3
JX
2866#, c-format
2867msgid ""
2868"not deleting branch '%s' that is not yet merged to\n"
2869" '%s', even though it is merged to HEAD."
2870msgstr ""
70fc47bf
T
2871"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2872" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 2873
7aea43ff 2874#: builtin/branch.c:168
07432cef
WS
2875#, c-format
2876msgid "Couldn't look up commit object for '%s'"
2877msgstr "无法查询 '%s' 指向的提交对象"
2878
7aea43ff 2879#: builtin/branch.c:172
07432cef
WS
2880#, c-format
2881msgid ""
2882"The branch '%s' is not fully merged.\n"
2883"If you are sure you want to delete it, run 'git branch -D %s'."
2884msgstr ""
2885"分支 '%s' 没有完全合并。\n"
2886"如果您确认要删除它,执行 'git branch -D %s'。"
2887
7aea43ff 2888#: builtin/branch.c:185
07432cef
WS
2889msgid "Update of config-file failed"
2890msgstr "无法更新 config 文件"
2891
7aea43ff 2892#: builtin/branch.c:213
c04f5ac3 2893msgid "cannot use -a with -d"
649900bc 2894msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 2895
7aea43ff 2896#: builtin/branch.c:219
c04f5ac3
JX
2897msgid "Couldn't look up commit object for HEAD"
2898msgstr "无法查询 HEAD 指向的提交对象"
2899
7aea43ff 2900#: builtin/branch.c:227
c04f5ac3
JX
2901#, c-format
2902msgid "Cannot delete the branch '%s' which you are currently on."
2903msgstr "无法删除您当前所在的分支 '%s'。"
2904
7aea43ff 2905#: builtin/branch.c:243
5ae481e0 2906#, c-format
7aea43ff
JX
2907msgid "remote-tracking branch '%s' not found."
2908msgstr "未能找到远程跟踪分支 '%s'。"
c04f5ac3 2909
7aea43ff 2910#: builtin/branch.c:244
81809b99 2911#, c-format
8ada9598 2912msgid "branch '%s' not found."
81809b99 2913msgstr "分支 '%s' 未发现。"
8ada9598 2914
7aea43ff 2915#: builtin/branch.c:258
81809b99 2916#, c-format
7aea43ff
JX
2917msgid "Error deleting remote-tracking branch '%s'"
2918msgstr "无法删除远程跟踪分支 '%s'"
c04f5ac3 2919
7aea43ff 2920#: builtin/branch.c:259
81809b99 2921#, c-format
8ada9598 2922msgid "Error deleting branch '%s'"
7aea43ff 2923msgstr "无法删除分支 '%s'"
8ada9598 2924
7aea43ff 2925#: builtin/branch.c:266
81809b99 2926#, c-format
7aea43ff
JX
2927msgid "Deleted remote-tracking branch %s (was %s).\n"
2928msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
c04f5ac3 2929
7aea43ff 2930#: builtin/branch.c:267
81809b99 2931#, c-format
8ada9598 2932msgid "Deleted branch %s (was %s).\n"
81809b99 2933msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 2934
7aea43ff 2935#: builtin/branch.c:368
c04f5ac3
JX
2936#, c-format
2937msgid "branch '%s' does not point at a commit"
2938msgstr "分支 '%s' 未指向一个提交"
2939
7aea43ff 2940#: builtin/branch.c:451
81809b99 2941#, c-format
90314792
JX
2942msgid "[%s: gone]"
2943msgstr "[%s: 丢失]"
2944
7aea43ff 2945#: builtin/branch.c:456
90314792
JX
2946#, c-format
2947msgid "[%s]"
2948msgstr "[%s]"
2949
7aea43ff 2950#: builtin/branch.c:461
90314792 2951#, c-format
8ada9598 2952msgid "[%s: behind %d]"
81809b99 2953msgstr "[%s:落后 %d]"
c04f5ac3 2954
7aea43ff 2955#: builtin/branch.c:463
81809b99 2956#, c-format
8ada9598 2957msgid "[behind %d]"
81809b99 2958msgstr "[落后 %d]"
8ada9598 2959
7aea43ff 2960#: builtin/branch.c:467
81809b99 2961#, c-format
8ada9598 2962msgid "[%s: ahead %d]"
81809b99 2963msgstr "[%s:领先 %d]"
c04f5ac3 2964
7aea43ff 2965#: builtin/branch.c:469
81809b99 2966#, c-format
8ada9598 2967msgid "[ahead %d]"
81809b99 2968msgstr "[领先 %d]"
8ada9598 2969
7aea43ff 2970#: builtin/branch.c:472
81809b99 2971#, c-format
8ada9598 2972msgid "[%s: ahead %d, behind %d]"
81809b99 2973msgstr "[%s:领先 %d,落后 %d]"
8ada9598 2974
7aea43ff 2975#: builtin/branch.c:475
81809b99 2976#, c-format
8ada9598 2977msgid "[ahead %d, behind %d]"
81809b99 2978msgstr "[领先 %d,落后 %d]"
c04f5ac3 2979
7aea43ff 2980#: builtin/branch.c:488
a77c07d9
JX
2981msgid " **** invalid ref ****"
2982msgstr " **** 无效引用 ****"
2983
7aea43ff 2984#: builtin/branch.c:579
1003b3a5
JX
2985#, c-format
2986msgid "(no branch, rebasing %s)"
2987msgstr "(非分支,正变基 %s)"
2988
7aea43ff 2989#: builtin/branch.c:582
1003b3a5
JX
2990#, c-format
2991msgid "(no branch, bisect started on %s)"
2992msgstr "(非分支,二分查找开始于 %s)"
2993
7aea43ff 2994#: builtin/branch.c:588
1003b3a5 2995#, c-format
814ff314
JX
2996msgid "(HEAD detached at %s)"
2997msgstr "(头指针分离于 %s)"
1003b3a5 2998
7aea43ff 2999#: builtin/branch.c:591
814ff314
JX
3000#, c-format
3001msgid "(HEAD detached from %s)"
3002msgstr "(头指针分离自 %s)"
3003
7aea43ff 3004#: builtin/branch.c:595
c04f5ac3
JX
3005msgid "(no branch)"
3006msgstr "(非分支)"
3007
7aea43ff 3008#: builtin/branch.c:642
a77c07d9
JX
3009#, c-format
3010msgid "object '%s' does not point to a commit"
3011msgstr "对象 '%s' 没有指向一个提交"
3012
7aea43ff 3013#: builtin/branch.c:690
c04f5ac3 3014msgid "some refs could not be read"
90e6ef53 3015msgstr "一些引用不能读取"
c04f5ac3 3016
7aea43ff 3017#: builtin/branch.c:703
c04f5ac3 3018msgid "cannot rename the current branch while not on any."
90e6ef53 3019msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 3020
7aea43ff 3021#: builtin/branch.c:713
c04f5ac3
JX
3022#, c-format
3023msgid "Invalid branch name: '%s'"
3024msgstr "无效的分支名:'%s'"
3025
7aea43ff 3026#: builtin/branch.c:728
c04f5ac3
JX
3027msgid "Branch rename failed"
3028msgstr "分支重命名失败"
3029
7aea43ff 3030#: builtin/branch.c:732
c04f5ac3
JX
3031#, c-format
3032msgid "Renamed a misnamed branch '%s' away"
3033msgstr "重命名掉一个错误命名的旧分支 '%s'"
3034
7aea43ff 3035#: builtin/branch.c:736
c04f5ac3
JX
3036#, c-format
3037msgid "Branch renamed to %s, but HEAD is not updated!"
3038msgstr "分支重命名为 %s,但 HEAD 没有更新!"
3039
7aea43ff 3040#: builtin/branch.c:743
c04f5ac3
JX
3041msgid "Branch is renamed, but update of config-file failed"
3042msgstr "分支被重命名,但更新 config 文件失败"
3043
7aea43ff 3044#: builtin/branch.c:758
c04f5ac3
JX
3045#, c-format
3046msgid "malformed object name %s"
3047msgstr "非法的对象名 %s"
3048
7aea43ff 3049#: builtin/branch.c:780
81809b99 3050#, c-format
8ada9598 3051msgid "could not write branch description template: %s"
81809b99 3052msgstr "不能写分支描述模版:%s"
c04f5ac3 3053
7aea43ff 3054#: builtin/branch.c:810
ef317cd5 3055msgid "Generic options"
07432cef 3056msgstr "通用选项"
c04f5ac3 3057
7aea43ff 3058#: builtin/branch.c:812
ef317cd5 3059msgid "show hash and subject, give twice for upstream branch"
07432cef 3060msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 3061
7aea43ff 3062#: builtin/branch.c:813
ef317cd5 3063msgid "suppress informational messages"
07432cef 3064msgstr "不显示信息"
8ada9598 3065
7aea43ff 3066#: builtin/branch.c:814
ef317cd5 3067msgid "set up tracking mode (see git-pull(1))"
07432cef 3068msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 3069
7aea43ff 3070#: builtin/branch.c:816
ef317cd5 3071msgid "change upstream info"
07432cef 3072msgstr "改变上游信息"
c04f5ac3 3073
7aea43ff 3074#: builtin/branch.c:820
ef317cd5 3075msgid "use colored output"
07432cef 3076msgstr "使用彩色输出"
c04f5ac3 3077
7aea43ff 3078#: builtin/branch.c:821
ef317cd5 3079msgid "act on remote-tracking branches"
07432cef 3080msgstr "作用于远程跟踪分支"
c04f5ac3 3081
7aea43ff
JX
3082#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851
3083#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582
3084#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616
220c313c 3085#: builtin/tag.c:622
ef317cd5 3086msgid "commit"
07432cef 3087msgstr "提交"
c04f5ac3 3088
7aea43ff 3089#: builtin/branch.c:825 builtin/branch.c:831
ef317cd5 3090msgid "print only branches that contain the commit"
07432cef 3091msgstr "只打印包含该提交的分支"
c04f5ac3 3092
7aea43ff 3093#: builtin/branch.c:837
ef317cd5 3094msgid "Specific git-branch actions:"
07432cef 3095msgstr "具体的 git-branch 动作:"
c04f5ac3 3096
7aea43ff 3097#: builtin/branch.c:838
ef317cd5 3098msgid "list both remote-tracking and local branches"
07432cef 3099msgstr "列出远程跟踪及本地分支"
c04f5ac3 3100
7aea43ff 3101#: builtin/branch.c:840
ef317cd5 3102msgid "delete fully merged branch"
07432cef 3103msgstr "删除完全合并的分支"
c04f5ac3 3104
7aea43ff 3105#: builtin/branch.c:841
ef317cd5 3106msgid "delete branch (even if not merged)"
07432cef 3107msgstr "删除分支(即使没有合并)"
c04f5ac3 3108
7aea43ff 3109#: builtin/branch.c:842
ef317cd5 3110msgid "move/rename a branch and its reflog"
07432cef 3111msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 3112
7aea43ff 3113#: builtin/branch.c:843
ef317cd5 3114msgid "move/rename a branch, even if target exists"
07432cef 3115msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 3116
7aea43ff 3117#: builtin/branch.c:844
ef317cd5 3118msgid "list branch names"
07432cef 3119msgstr "列出分支名"
c04f5ac3 3120
7aea43ff 3121#: builtin/branch.c:845
ef317cd5 3122msgid "create the branch's reflog"
07432cef 3123msgstr "创建分支的引用日志"
ef317cd5 3124
7aea43ff 3125#: builtin/branch.c:847
ef317cd5 3126msgid "edit the description for the branch"
07432cef 3127msgstr "标记分支的描述"
ef317cd5 3128
7aea43ff 3129#: builtin/branch.c:848
04cb2f28
JX
3130msgid "force creation, move/rename, deletion"
3131msgstr "强制创建、移动/重命名、删除"
ef317cd5 3132
7aea43ff 3133#: builtin/branch.c:851
ef317cd5 3134msgid "print only not merged branches"
07432cef 3135msgstr "只打印没有合并的分支"
ef317cd5 3136
7aea43ff 3137#: builtin/branch.c:857
ef317cd5 3138msgid "print only merged branches"
07432cef 3139msgstr "只打印合并的分支"
ef317cd5 3140
7aea43ff 3141#: builtin/branch.c:861
ef317cd5 3142msgid "list branches in columns"
07432cef 3143msgstr "以列的方式显示分支"
ef317cd5 3144
7aea43ff 3145#: builtin/branch.c:874
c04f5ac3
JX
3146msgid "Failed to resolve HEAD as a valid ref."
3147msgstr "无法将 HEAD 解析为有效引用。"
3148
5bb01d4f 3149#: builtin/branch.c:878 builtin/clone.c:622
c04f5ac3 3150msgid "HEAD not found below refs/heads!"
90e6ef53 3151msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 3152
7aea43ff 3153#: builtin/branch.c:900
8ada9598 3154msgid "--column and --verbose are incompatible"
81809b99 3155msgstr "--column 和 --verbose 不兼容"
8ada9598 3156
7aea43ff 3157#: builtin/branch.c:911 builtin/branch.c:950
a77c07d9
JX
3158msgid "branch name required"
3159msgstr "必须提供分支名"
3160
7aea43ff 3161#: builtin/branch.c:926
a77c07d9
JX
3162msgid "Cannot give description to detached HEAD"
3163msgstr "不能向分离头指针提供描述"
3164
7aea43ff 3165#: builtin/branch.c:931
a77c07d9
JX
3166msgid "cannot edit description of more than one branch"
3167msgstr "不能为一个以上的分支编辑描述"
3168
7aea43ff 3169#: builtin/branch.c:938
a77c07d9
JX
3170#, c-format
3171msgid "No commit on branch '%s' yet."
3172msgstr "分支 '%s' 尚无提交。"
3173
7aea43ff 3174#: builtin/branch.c:941
a77c07d9
JX
3175#, c-format
3176msgid "No branch named '%s'."
3177msgstr "没有分支 '%s'。"
3178
7aea43ff 3179#: builtin/branch.c:956
a77c07d9
JX
3180msgid "too many branches for a rename operation"
3181msgstr "为重命名操作提供了太多的分支名"
3182
7aea43ff 3183#: builtin/branch.c:961
1003b3a5
JX
3184msgid "too many branches to set new upstream"
3185msgstr "为设置新上游提供了太多的分支名"
3186
7aea43ff 3187#: builtin/branch.c:965
1003b3a5
JX
3188#, c-format
3189msgid ""
3190"could not set upstream of HEAD to %s when it does not point to any branch."
3191msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3192
7aea43ff 3193#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011
1003b3a5
JX
3194#, c-format
3195msgid "no such branch '%s'"
3196msgstr "没有此分支 '%s'"
3197
7aea43ff 3198#: builtin/branch.c:972
07432cef 3199#, c-format
ef317cd5 3200msgid "branch '%s' does not exist"
07432cef 3201msgstr "分支 '%s' 不存在"
ef317cd5 3202
7aea43ff 3203#: builtin/branch.c:984
1003b3a5
JX
3204msgid "too many branches to unset upstream"
3205msgstr "为取消上游设置操作提供了太多的分支名"
3206
7aea43ff 3207#: builtin/branch.c:988
1003b3a5
JX
3208msgid "could not unset upstream of HEAD when it does not point to any branch."
3209msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3210
7aea43ff 3211#: builtin/branch.c:994
ef317cd5
JX
3212#, c-format
3213msgid "Branch '%s' has no upstream information"
07432cef 3214msgstr "分支 '%s' 没有上游信息"
ef317cd5 3215
7aea43ff 3216#: builtin/branch.c:1008
1003b3a5
JX
3217msgid "it does not make sense to create 'HEAD' manually"
3218msgstr "手工创建 'HEAD' 没有意义"
3219
7aea43ff 3220#: builtin/branch.c:1014
c04f5ac3
JX
3221msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3222msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3223
7aea43ff 3224#: builtin/branch.c:1017
ef317cd5
JX
3225#, c-format
3226msgid ""
3227"The --set-upstream flag is deprecated and will be removed. Consider using --"
3228"track or --set-upstream-to\n"
3229msgstr ""
07432cef 3230"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
ef317cd5 3231
7aea43ff 3232#: builtin/branch.c:1034
ef317cd5
JX
3233#, c-format
3234msgid ""
3235"\n"
3236"If you wanted to make '%s' track '%s', do this:\n"
3237"\n"
3238msgstr ""
07432cef
WS
3239"\n"
3240"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3241"\n"
ef317cd5 3242
7aea43ff 3243#: builtin/branch.c:1035
07432cef 3244#, c-format
ef317cd5 3245msgid " git branch -d %s\n"
07432cef 3246msgstr " git branch -d %s\n"
ef317cd5 3247
7aea43ff 3248#: builtin/branch.c:1036
ef317cd5
JX
3249#, c-format
3250msgid " git branch --set-upstream-to %s\n"
07432cef 3251msgstr " git branch --set-upstream-to %s\n"
ef317cd5 3252
7aea43ff 3253#: builtin/bundle.c:51
c04f5ac3
JX
3254#, c-format
3255msgid "%s is okay\n"
3256msgstr "%s 可以\n"
3257
7aea43ff 3258#: builtin/bundle.c:64
c04f5ac3 3259msgid "Need a repository to create a bundle."
90e6ef53 3260msgstr "需要一个版本库来创建包。"
c04f5ac3 3261
7aea43ff 3262#: builtin/bundle.c:68
c04f5ac3 3263msgid "Need a repository to unbundle."
90e6ef53 3264msgstr "需要一个版本库来解包。"
c04f5ac3 3265
7aea43ff
JX
3266#: builtin/cat-file.c:369
3267msgid ""
3268"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
3269"<type>|--textconv) <object>"
3270msgstr ""
3271"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
3272">|--textconv) <对象>"
ef317cd5 3273
7aea43ff
JX
3274#: builtin/cat-file.c:370
3275msgid ""
3276"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
3277"objects>"
3278msgstr ""
3279"git cat-file (--batch | --batch-check) [--follow-symlinks] < <对象列表>"
ef317cd5 3280
7aea43ff 3281#: builtin/cat-file.c:407
ef317cd5 3282msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 3283msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 3284
7aea43ff 3285#: builtin/cat-file.c:408
ef317cd5 3286msgid "show object type"
07432cef 3287msgstr "显示对象类型"
ef317cd5 3288
7aea43ff 3289#: builtin/cat-file.c:409
ef317cd5 3290msgid "show object size"
07432cef 3291msgstr "显示对象大小"
ef317cd5 3292
7aea43ff 3293#: builtin/cat-file.c:411
ef317cd5 3294msgid "exit with zero when there's no error"
07432cef 3295msgstr "当没有错误时退出并返回零"
ef317cd5 3296
7aea43ff 3297#: builtin/cat-file.c:412
ef317cd5 3298msgid "pretty-print object's content"
07432cef 3299msgstr "美观地打印对象的内容"
ef317cd5 3300
7aea43ff 3301#: builtin/cat-file.c:414
ef317cd5 3302msgid "for blob objects, run textconv on object's content"
07432cef 3303msgstr "对于数据(blob)对象,对其内容执行 textconv"
ef317cd5 3304
7aea43ff
JX
3305#: builtin/cat-file.c:416
3306msgid "allow -s and -t to work with broken/corrupt objects"
3307msgstr "允许 -s 和 -t 对损坏的对象生效"
3308
3309#: builtin/cat-file.c:418
ef317cd5 3310msgid "show info and content of objects fed from the standard input"
07432cef 3311msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 3312
7aea43ff 3313#: builtin/cat-file.c:421
ef317cd5 3314msgid "show info about objects fed from the standard input"
07432cef 3315msgstr "显示从标准输入提供的对象的信息"
ef317cd5 3316
7aea43ff
JX
3317#: builtin/cat-file.c:424
3318msgid "follow in-tree symlinks (used with --batch or --batch-check)"
3319msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
3320
ef317cd5 3321#: builtin/check-attr.c:11
814ff314
JX
3322msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3323msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
ef317cd5
JX
3324
3325#: builtin/check-attr.c:12
814ff314
JX
3326msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
3327msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>"
ef317cd5
JX
3328
3329#: builtin/check-attr.c:19
3330msgid "report all attributes set on file"
07432cef 3331msgstr "报告设置在文件上的所有属性"
ef317cd5
JX
3332
3333#: builtin/check-attr.c:20
3334msgid "use .gitattributes only from the index"
07432cef 3335msgstr "只使用索引中的 .gitattributes"
ef317cd5 3336
7aea43ff 3337#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
ef317cd5 3338msgid "read file names from stdin"
07432cef 3339msgstr "从标准输入读出文件名"
ef317cd5 3340
a77c07d9 3341#: builtin/check-attr.c:23 builtin/check-ignore.c:24
90314792
JX
3342msgid "terminate input and output records by a NUL character"
3343msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 3344
5bb01d4f 3345#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279
a77c07d9
JX
3346msgid "suppress progress reporting"
3347msgstr "不显示进度报告"
3348
2e8451e8
JX
3349#: builtin/check-ignore.c:26
3350msgid "show non-matching input paths"
3351msgstr "显示未匹配的输入路径"
3352
90314792
JX
3353#: builtin/check-ignore.c:28
3354msgid "ignore index when checking"
3355msgstr "检查时忽略索引"
3356
3357#: builtin/check-ignore.c:154
a77c07d9
JX
3358msgid "cannot specify pathnames with --stdin"
3359msgstr "不能同时提供路径及 --stdin 参数"
3360
90314792 3361#: builtin/check-ignore.c:157
a77c07d9
JX
3362msgid "-z only makes sense with --stdin"
3363msgstr "-z 需要和 --stdin 参数共用才有意义"
3364
90314792 3365#: builtin/check-ignore.c:159
a77c07d9
JX
3366msgid "no path specified"
3367msgstr "未指定路径"
3368
90314792 3369#: builtin/check-ignore.c:163
a77c07d9
JX
3370msgid "--quiet is only valid with a single pathname"
3371msgstr "参数 --quiet 只在提供一个路径名时有效"
3372
90314792 3373#: builtin/check-ignore.c:165
a77c07d9
JX
3374msgid "cannot have both --quiet and --verbose"
3375msgstr "不能同时提供 --quiet 和 --verbose 参数"
3376
90314792 3377#: builtin/check-ignore.c:168
2e8451e8
JX
3378msgid "--non-matching is only valid with --verbose"
3379msgstr "--non-matching 选项只在使用 --verbose 时有效"
3380
3381#: builtin/check-mailmap.c:8
814ff314
JX
3382msgid "git check-mailmap [<options>] <contact>..."
3383msgstr "git check-mailmap [<选项>] <联系地址>..."
2e8451e8
JX
3384
3385#: builtin/check-mailmap.c:13
3386msgid "also read contacts from stdin"
3387msgstr "还从标准输入读取联系地址"
3388
3389#: builtin/check-mailmap.c:24
3390#, c-format
3391msgid "unable to parse contact: %s"
3392msgstr "不能解析联系地址:%s"
3393
3394#: builtin/check-mailmap.c:47
3395msgid "no contacts specified"
3396msgstr "未指定联系地址"
3397
ef317cd5 3398#: builtin/checkout-index.c:126
814ff314
JX
3399msgid "git checkout-index [<options>] [--] [<file>...]"
3400msgstr "git checkout-index [<选项>] [--] [<文件>...]"
ef317cd5 3401
6acbf033 3402#: builtin/checkout-index.c:188
ef317cd5 3403msgid "check out all files in the index"
07432cef 3404msgstr "检出索引区的所有文件"
ef317cd5 3405
6acbf033 3406#: builtin/checkout-index.c:189
ef317cd5 3407msgid "force overwrite of existing files"
07432cef 3408msgstr "强制覆盖现有的文件"
ef317cd5 3409
6acbf033 3410#: builtin/checkout-index.c:191
ef317cd5 3411msgid "no warning for existing files and files not in index"
07432cef 3412msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 3413
6acbf033 3414#: builtin/checkout-index.c:193
ef317cd5 3415msgid "don't checkout new files"
07432cef 3416msgstr "不检出新文件"
ef317cd5 3417
6acbf033 3418#: builtin/checkout-index.c:195
ef317cd5 3419msgid "update stat information in the index file"
07432cef 3420msgstr "更新索引中文件的状态信息"
ef317cd5 3421
6acbf033 3422#: builtin/checkout-index.c:201
ef317cd5 3423msgid "read list of paths from the standard input"
07432cef 3424msgstr "从标准输入读取路径列表"
ef317cd5 3425
6acbf033 3426#: builtin/checkout-index.c:203
ef317cd5 3427msgid "write the content to temporary files"
07432cef 3428msgstr "将内容写入临时文件"
ef317cd5 3429
6acbf033 3430#: builtin/checkout-index.c:204 builtin/column.c:30
ef317cd5 3431msgid "string"
07432cef 3432msgstr "字符串"
ef317cd5 3433
6acbf033 3434#: builtin/checkout-index.c:205
ef317cd5 3435msgid "when creating files, prepend <string>"
07432cef 3436msgstr "在创建文件时,在前面加上<字符串>"
ef317cd5 3437
6acbf033 3438#: builtin/checkout-index.c:208
ef317cd5 3439msgid "copy out the files from named stage"
07432cef 3440msgstr "从指定暂存区中拷出文件"
ef317cd5 3441
5bb01d4f 3442#: builtin/checkout.c:24
814ff314
JX
3443msgid "git checkout [<options>] <branch>"
3444msgstr "git checkout [<选项>] <分支>"
ef317cd5 3445
5bb01d4f 3446#: builtin/checkout.c:25
814ff314
JX
3447msgid "git checkout [<options>] [<branch>] -- <file>..."
3448msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
ef317cd5 3449
5bb01d4f 3450#: builtin/checkout.c:134 builtin/checkout.c:167
c04f5ac3
JX
3451#, c-format
3452msgid "path '%s' does not have our version"
3453msgstr "路径 '%s' 没有我们的版本"
3454
5bb01d4f 3455#: builtin/checkout.c:136 builtin/checkout.c:169
c04f5ac3
JX
3456#, c-format
3457msgid "path '%s' does not have their version"
3458msgstr "路径 '%s' 没有他们的版本"
3459
5bb01d4f 3460#: builtin/checkout.c:152
c04f5ac3
JX
3461#, c-format
3462msgid "path '%s' does not have all necessary versions"
3463msgstr "路径 '%s' 没有全部必须的版本"
3464
5bb01d4f 3465#: builtin/checkout.c:196
c04f5ac3
JX
3466#, c-format
3467msgid "path '%s' does not have necessary versions"
3468msgstr "路径 '%s' 没有必须的版本"
3469
5bb01d4f 3470#: builtin/checkout.c:213
c04f5ac3
JX
3471#, c-format
3472msgid "path '%s': cannot merge"
90e6ef53 3473msgstr "path '%s':无法合并"
c04f5ac3 3474
5bb01d4f 3475#: builtin/checkout.c:230
c04f5ac3
JX
3476#, c-format
3477msgid "Unable to add merge result for '%s'"
3478msgstr "无法为 '%s' 添加合并结果"
3479
5bb01d4f
JX
3480#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
3481#: builtin/checkout.c:260
07432cef 3482#, c-format
ef317cd5 3483msgid "'%s' cannot be used with updating paths"
07432cef 3484msgstr "'%s' 不能在更新路径时使用"
ef317cd5 3485
5bb01d4f 3486#: builtin/checkout.c:263 builtin/checkout.c:266
07432cef 3487#, c-format
ef317cd5 3488msgid "'%s' cannot be used with %s"
07432cef 3489msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 3490
5bb01d4f 3491#: builtin/checkout.c:269
ef317cd5
JX
3492#, c-format
3493msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 3494msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 3495
5bb01d4f 3496#: builtin/checkout.c:280 builtin/checkout.c:474
c04f5ac3 3497msgid "corrupt index file"
90e6ef53 3498msgstr "损坏的索引文件"
c04f5ac3 3499
5bb01d4f 3500#: builtin/checkout.c:340 builtin/checkout.c:347
c04f5ac3
JX
3501#, c-format
3502msgid "path '%s' is unmerged"
3503msgstr "路径 '%s' 未合并"
3504
5bb01d4f 3505#: builtin/checkout.c:496
c04f5ac3 3506msgid "you need to resolve your current index first"
90e6ef53 3507msgstr "您需要先解决当前索引的冲突"
c04f5ac3 3508
5bb01d4f 3509#: builtin/checkout.c:627
c04f5ac3
JX
3510#, c-format
3511msgid "Can not do reflog for '%s'\n"
90e6ef53 3512msgstr "不能对 '%s' 执行 reflog 操作\n"
c04f5ac3 3513
5bb01d4f 3514#: builtin/checkout.c:663
c04f5ac3
JX
3515msgid "HEAD is now at"
3516msgstr "HEAD 目前位于"
3517
5bb01d4f 3518#: builtin/checkout.c:670
c04f5ac3
JX
3519#, c-format
3520msgid "Reset branch '%s'\n"
3521msgstr "重置分支 '%s'\n"
3522
5bb01d4f 3523#: builtin/checkout.c:673
c04f5ac3
JX
3524#, c-format
3525msgid "Already on '%s'\n"
3526msgstr "已经位于 '%s'\n"
3527
5bb01d4f 3528#: builtin/checkout.c:677
c04f5ac3
JX
3529#, c-format
3530msgid "Switched to and reset branch '%s'\n"
3531msgstr "切换并重置分支 '%s'\n"
3532
5bb01d4f 3533#: builtin/checkout.c:679 builtin/checkout.c:1134
c04f5ac3
JX
3534#, c-format
3535msgid "Switched to a new branch '%s'\n"
3536msgstr "切换到一个新分支 '%s'\n"
3537
5bb01d4f 3538#: builtin/checkout.c:681
c04f5ac3
JX
3539#, c-format
3540msgid "Switched to branch '%s'\n"
3541msgstr "切换到分支 '%s'\n"
3542
90e6ef53 3543# 译者:注意保持前导空格
5bb01d4f 3544#: builtin/checkout.c:733
c04f5ac3
JX
3545#, c-format
3546msgid " ... and %d more.\n"
90e6ef53 3547msgstr " ... 及其它 %d 个。\n"
c04f5ac3 3548
5bb01d4f 3549#: builtin/checkout.c:739
c04f5ac3
JX
3550#, c-format
3551msgid ""
3552"Warning: you are leaving %d commit behind, not connected to\n"
3553"any of your branches:\n"
3554"\n"
3555"%s\n"
3556msgid_plural ""
3557"Warning: you are leaving %d commits behind, not connected to\n"
3558"any of your branches:\n"
3559"\n"
3560"%s\n"
3561msgstr[0] ""
3562"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3563"\n"
3564"%s\n"
5ae481e0
JX
3565msgstr[1] ""
3566"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3567"\n"
3568"%s\n"
c04f5ac3 3569
5bb01d4f 3570#: builtin/checkout.c:758
c04f5ac3
JX
3571#, c-format
3572msgid ""
7aea43ff
JX
3573"If you want to keep it by creating a new branch, this may be a good time\n"
3574"to do so with:\n"
3575"\n"
3576" git branch <new-branch-name> %s\n"
3577"\n"
3578msgid_plural ""
c04f5ac3
JX
3579"If you want to keep them by creating a new branch, this may be a good time\n"
3580"to do so with:\n"
3581"\n"
814ff314 3582" git branch <new-branch-name> %s\n"
c04f5ac3 3583"\n"
7aea43ff
JX
3584msgstr[0] ""
3585"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
3586"如下操作:\n"
3587"\n"
3588" git branch <新分支名> %s\n"
3589"\n"
3590msgstr[1] ""
3591"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
c04f5ac3
JX
3592"如下操作:\n"
3593"\n"
814ff314 3594" git branch <新分支名> %s\n"
c04f5ac3
JX
3595"\n"
3596
5bb01d4f 3597#: builtin/checkout.c:794
c04f5ac3
JX
3598msgid "internal error in revision walk"
3599msgstr "在版本遍历时遇到内部错误"
3600
5bb01d4f 3601#: builtin/checkout.c:798
c04f5ac3
JX
3602msgid "Previous HEAD position was"
3603msgstr "之前的 HEAD 位置是"
3604
5bb01d4f 3605#: builtin/checkout.c:825 builtin/checkout.c:1129
c04f5ac3 3606msgid "You are on a branch yet to be born"
90e6ef53 3607msgstr "您位于一个尚未初始化的分支"
c04f5ac3 3608
5bb01d4f 3609#: builtin/checkout.c:931
7aea43ff
JX
3610#, c-format
3611msgid "'%s' is already checked out at '%s'"
3612msgstr "'%s' 已经检出到 '%s'"
3613
5bb01d4f 3614#: builtin/checkout.c:1036
90314792
JX
3615#, c-format
3616msgid "only one reference expected, %d given."
3617msgstr "只要一个引用,却给出了 %d 个"
3618
5bb01d4f 3619#: builtin/checkout.c:1075
c04f5ac3
JX
3620#, c-format
3621msgid "invalid reference: %s"
3622msgstr "无效引用:%s"
3623
5bb01d4f 3624#: builtin/checkout.c:1104
c04f5ac3
JX
3625#, c-format
3626msgid "reference is not a tree: %s"
3627msgstr "引用不是一个树:%s"
3628
5bb01d4f 3629#: builtin/checkout.c:1143
ef317cd5 3630msgid "paths cannot be used with switching branches"
07432cef 3631msgstr "路径不能和切换分支同时使用"
c04f5ac3 3632
5bb01d4f 3633#: builtin/checkout.c:1146 builtin/checkout.c:1150
07432cef 3634#, c-format
ef317cd5 3635msgid "'%s' cannot be used with switching branches"
07432cef 3636msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 3637
5bb01d4f
JX
3638#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162
3639#: builtin/checkout.c:1165
07432cef 3640#, c-format
ef317cd5 3641msgid "'%s' cannot be used with '%s'"
07432cef 3642msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 3643
5bb01d4f 3644#: builtin/checkout.c:1170
07432cef 3645#, c-format
ef317cd5 3646msgid "Cannot switch branch to a non-commit '%s'"
07432cef 3647msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 3648
5bb01d4f
JX
3649#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83
3650#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282
3651#: builtin/worktree.c:284
ef317cd5 3652msgid "branch"
07432cef 3653msgstr "分支"
c04f5ac3 3654
5bb01d4f 3655#: builtin/checkout.c:1204
ef317cd5 3656msgid "create and checkout a new branch"
07432cef 3657msgstr "创建并检出一个新的分支"
c04f5ac3 3658
5bb01d4f 3659#: builtin/checkout.c:1206
ef317cd5 3660msgid "create/reset and checkout a branch"
07432cef 3661msgstr "创建/重置并检出一个分支"
c04f5ac3 3662
5bb01d4f 3663#: builtin/checkout.c:1207
ef317cd5 3664msgid "create reflog for new branch"
07432cef 3665msgstr "为新的分支创建引用日志"
ef317cd5 3666
5bb01d4f 3667#: builtin/checkout.c:1208
ef317cd5 3668msgid "detach the HEAD at named commit"
07432cef 3669msgstr "成为指向该提交的分离头指针"
ef317cd5 3670
5bb01d4f 3671#: builtin/checkout.c:1209
ef317cd5 3672msgid "set upstream info for new branch"
07432cef 3673msgstr "为新的分支设置上游信息"
ef317cd5 3674
5bb01d4f 3675#: builtin/checkout.c:1211
6c94aba5 3676msgid "new-branch"
07432cef 3677msgstr "新分支"
ef317cd5 3678
5bb01d4f 3679#: builtin/checkout.c:1211
ef317cd5 3680msgid "new unparented branch"
07432cef 3681msgstr "新的没有父提交的分支"
ef317cd5 3682
5bb01d4f 3683#: builtin/checkout.c:1212
ef317cd5 3684msgid "checkout our version for unmerged files"
07432cef 3685msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 3686
5bb01d4f 3687#: builtin/checkout.c:1214
ef317cd5 3688msgid "checkout their version for unmerged files"
07432cef 3689msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 3690
5bb01d4f 3691#: builtin/checkout.c:1216
ef317cd5 3692msgid "force checkout (throw away local modifications)"
07432cef 3693msgstr "强制检出(丢弃本地修改)"
c04f5ac3 3694
5bb01d4f 3695#: builtin/checkout.c:1217
ef317cd5 3696msgid "perform a 3-way merge with the new branch"
07432cef 3697msgstr "和新的分支执行三路合并"
ef317cd5 3698
5bb01d4f 3699#: builtin/checkout.c:1218 builtin/merge.c:227
ef317cd5 3700msgid "update ignored files (default)"
07432cef 3701msgstr "更新忽略的文件(默认)"
c04f5ac3 3702
5bb01d4f 3703#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244
ef317cd5 3704msgid "style"
07432cef 3705msgstr "风格"
ef317cd5 3706
5bb01d4f 3707#: builtin/checkout.c:1220
ef317cd5 3708msgid "conflict style (merge or diff3)"
07432cef 3709msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 3710
5bb01d4f 3711#: builtin/checkout.c:1223
4dcdc3d8
JX
3712msgid "do not limit pathspecs to sparse entries only"
3713msgstr "对路径不做稀疏检出的限制"
3714
5bb01d4f 3715#: builtin/checkout.c:1225
814ff314
JX
3716msgid "second guess 'git checkout <no-such-branch>'"
3717msgstr "二次猜测'git checkout <无此分支>'"
ef317cd5 3718
5bb01d4f 3719#: builtin/checkout.c:1227
7aea43ff
JX
3720msgid "do not check if another worktree is holding the given ref"
3721msgstr "不检查指定的引用是否被其他工作区所占用"
3722
5bb01d4f 3723#: builtin/checkout.c:1252
ef317cd5 3724msgid "-b, -B and --orphan are mutually exclusive"
07432cef 3725msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 3726
5bb01d4f 3727#: builtin/checkout.c:1269
ef317cd5
JX
3728msgid "--track needs a branch name"
3729msgstr "--track 需要一个分支名"
3730
5bb01d4f 3731#: builtin/checkout.c:1274
ef317cd5
JX
3732msgid "Missing branch name; try -b"
3733msgstr "缺少分支名;尝试 -b"
3734
5bb01d4f 3735#: builtin/checkout.c:1310
c04f5ac3 3736msgid "invalid path specification"
90e6ef53 3737msgstr "无效的路径规格"
c04f5ac3 3738
5bb01d4f 3739#: builtin/checkout.c:1317
07432cef 3740#, c-format
c04f5ac3 3741msgid ""
ef317cd5 3742"Cannot update paths and switch to branch '%s' at the same time.\n"
c04f5ac3
JX
3743"Did you intend to checkout '%s' which can not be resolved as commit?"
3744msgstr ""
07432cef
WS
3745"不能同时更新路径并切换到分支'%s'。\n"
3746"您是想要检出 '%s' 但其未能解析为提交么?"
c04f5ac3 3747
5bb01d4f 3748#: builtin/checkout.c:1322
07432cef 3749#, c-format
ef317cd5 3750msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 3751msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 3752
5bb01d4f 3753#: builtin/checkout.c:1326
c04f5ac3
JX
3754msgid ""
3755"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3756"checking out of the index."
3757msgstr ""
90e6ef53 3758"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 3759
90314792 3760#: builtin/clean.c:26
2e8451e8
JX
3761msgid ""
3762"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3763msgstr ""
3764"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 3765
90314792 3766#: builtin/clean.c:30
07432cef
WS
3767#, c-format
3768msgid "Removing %s\n"
3769msgstr "正删除 %s\n"
3770
90314792 3771#: builtin/clean.c:31
07432cef
WS
3772#, c-format
3773msgid "Would remove %s\n"
3774msgstr "将删除 %s\n"
3775
90314792 3776#: builtin/clean.c:32
07432cef
WS
3777#, c-format
3778msgid "Skipping repository %s\n"
3779msgstr "忽略版本库 %s\n"
3780
90314792 3781#: builtin/clean.c:33
07432cef
WS
3782#, c-format
3783msgid "Would skip repository %s\n"
3784msgstr "将忽略版本库 %s\n"
3785
90314792 3786#: builtin/clean.c:34
07432cef
WS
3787#, c-format
3788msgid "failed to remove %s"
3789msgstr "无法删除 %s"
3790
6c94aba5 3791#: builtin/clean.c:295
2e8451e8
JX
3792msgid ""
3793"Prompt help:\n"
3794"1 - select a numbered item\n"
3795"foo - select item based on unique prefix\n"
3796" - (empty) select nothing"
3797msgstr ""
3798"帮助:\n"
3799"1 - 通过编号选择一个选项\n"
3800"foo - 通过标题选择一个选项\n"
3801" - (空)什么也不选择"
3802
6c94aba5 3803#: builtin/clean.c:299
2e8451e8
JX
3804msgid ""
3805"Prompt help:\n"
3806"1 - select a single item\n"
3807"3-5 - select a range of items\n"
3808"2-3,6-9 - select multiple ranges\n"
3809"foo - select item based on unique prefix\n"
3810"-... - unselect specified items\n"
3811"* - choose all items\n"
3812" - (empty) finish selecting"
3813msgstr ""
3814"帮助:\n"
3815"1 - 选择一个选项\n"
3816"3-5 - 选择一个范围内的所有选项\n"
3817"2-3,6-9 - 选择多个范围内的所有选项\n"
3818"foo - 通过标题选择一个选项\n"
3819"-... - 反选特定的选项\n"
3820"* - 选择所有选项\n"
3821" - (空)结束选择"
3822
7aea43ff 3823#: builtin/clean.c:515
2e8451e8
JX
3824#, c-format
3825msgid "Huh (%s)?"
3826msgstr "嗯(%s)?"
3827
7aea43ff 3828#: builtin/clean.c:657
2e8451e8
JX
3829#, c-format
3830msgid "Input ignore patterns>> "
3831msgstr "输入模版以排除条目>> "
3832
7aea43ff 3833#: builtin/clean.c:694
2e8451e8
JX
3834#, c-format
3835msgid "WARNING: Cannot find items matched by: %s"
3836msgstr "警告:无法找到和 %s 匹配的条目"
3837
7aea43ff 3838#: builtin/clean.c:715
2e8451e8
JX
3839msgid "Select items to delete"
3840msgstr "选择要删除的条目"
3841
814ff314 3842#. TRANSLATORS: Make sure to keep [y/N] as is
7aea43ff 3843#: builtin/clean.c:756
2e8451e8 3844#, c-format
814ff314
JX
3845msgid "Remove %s [y/N]? "
3846msgstr "删除 %s [y/N]?"
2e8451e8 3847
7aea43ff 3848#: builtin/clean.c:781
2e8451e8
JX
3849msgid "Bye."
3850msgstr "再见。"
3851
7aea43ff 3852#: builtin/clean.c:789
2e8451e8
JX
3853msgid ""
3854"clean - start cleaning\n"
3855"filter by pattern - exclude items from deletion\n"
3856"select by numbers - select items to be deleted by numbers\n"
3857"ask each - confirm each deletion (like \"rm -i\")\n"
3858"quit - stop cleaning\n"
3859"help - this screen\n"
3860"? - help for prompt selection"
3861msgstr ""
3862"clean - 开始清理\n"
3863"filter by pattern - 通过模版排除要删除的条目\n"
3864"select by numbers - 通过数字选择要删除的条目\n"
3865"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
3866"quit - 停止删除并退出\n"
3867"help - 显示本帮助\n"
3868"? - 显示如何在提示符下选择的帮助"
3869
7aea43ff 3870#: builtin/clean.c:816
2e8451e8
JX
3871msgid "*** Commands ***"
3872msgstr "*** 命令 ***"
3873
7aea43ff 3874#: builtin/clean.c:817
2e8451e8
JX
3875msgid "What now"
3876msgstr "请选择"
3877
7aea43ff 3878#: builtin/clean.c:825
2e8451e8
JX
3879msgid "Would remove the following item:"
3880msgid_plural "Would remove the following items:"
3881msgstr[0] "将删除如下条目:"
3882msgstr[1] "将删除如下条目:"
3883
7aea43ff 3884#: builtin/clean.c:842
2e8451e8
JX
3885msgid "No more files to clean, exiting."
3886msgstr "没有要清理的文件,退出。"
3887
7aea43ff 3888#: builtin/clean.c:873
ef317cd5 3889msgid "do not print names of files removed"
07432cef 3890msgstr "不打印删除文件的名称"
ef317cd5 3891
7aea43ff 3892#: builtin/clean.c:875
ef317cd5 3893msgid "force"
07432cef 3894msgstr "强制"
ef317cd5 3895
7aea43ff 3896#: builtin/clean.c:876
2e8451e8
JX
3897msgid "interactive cleaning"
3898msgstr "交互式清除"
3899
7aea43ff 3900#: builtin/clean.c:878
ef317cd5 3901msgid "remove whole directories"
07432cef 3902msgstr "删除整个目录"
ef317cd5 3903
7aea43ff
JX
3904#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714
3905#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
ef317cd5 3906msgid "pattern"
07432cef 3907msgstr "模式"
ef317cd5 3908
7aea43ff 3909#: builtin/clean.c:880
ef317cd5 3910msgid "add <pattern> to ignore rules"
07432cef 3911msgstr "添加<模式>到忽略规则"
ef317cd5 3912
7aea43ff 3913#: builtin/clean.c:881
ef317cd5 3914msgid "remove ignored files, too"
07432cef 3915msgstr "也删除忽略的文件"
ef317cd5 3916
7aea43ff 3917#: builtin/clean.c:883
ef317cd5 3918msgid "remove only ignored files"
07432cef 3919msgstr "只删除忽略的文件"
c04f5ac3 3920
7aea43ff 3921#: builtin/clean.c:901
c04f5ac3 3922msgid "-x and -X cannot be used together"
649900bc 3923msgstr "-x 和 -X 不能同时使用"
c04f5ac3 3924
7aea43ff 3925#: builtin/clean.c:905
c04f5ac3 3926msgid ""
6c94aba5 3927"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 3928"clean"
c04f5ac3 3929msgstr ""
2e8451e8 3930"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 3931
7aea43ff 3932#: builtin/clean.c:908
c04f5ac3 3933msgid ""
6c94aba5 3934"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 3935"refusing to clean"
c04f5ac3 3936msgstr ""
2e8451e8 3937"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 3938
220c313c 3939#: builtin/clone.c:37
814ff314
JX
3940msgid "git clone [<options>] [--] <repo> [<dir>]"
3941msgstr "git clone [<选项>] [--] <版本库> [<路径>]"
ef317cd5 3942
7aea43ff 3943#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224
814ff314 3944#: builtin/push.c:523
ef317cd5 3945msgid "force progress reporting"
07432cef 3946msgstr "强制显示进度报告"
ef317cd5 3947
7aea43ff 3948#: builtin/clone.c:59
ef317cd5 3949msgid "don't create a checkout"
07432cef 3950msgstr "不创建一个检出"
ef317cd5 3951
7aea43ff 3952#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503
ef317cd5 3953msgid "create a bare repository"
220c313c 3954msgstr "创建一个纯版本库"
ef317cd5 3955
7aea43ff 3956#: builtin/clone.c:64
ef317cd5 3957msgid "create a mirror repository (implies bare)"
220c313c 3958msgstr "创建一个镜像版本库(也是纯版本库)"
ef317cd5 3959
7aea43ff 3960#: builtin/clone.c:66
ef317cd5 3961msgid "to clone from a local repository"
07432cef 3962msgstr "从本地版本库克隆"
ef317cd5 3963
7aea43ff 3964#: builtin/clone.c:68
ef317cd5 3965msgid "don't use local hardlinks, always copy"
07432cef 3966msgstr "不使用本地硬链接,始终复制"
ef317cd5 3967
7aea43ff 3968#: builtin/clone.c:70
ef317cd5 3969msgid "setup as shared repository"
07432cef 3970msgstr "设置为共享版本库"
ef317cd5 3971
7aea43ff 3972#: builtin/clone.c:72 builtin/clone.c:74
ef317cd5 3973msgid "initialize submodules in the clone"
07432cef 3974msgstr "在克隆时初始化子模组"
ef317cd5 3975
7aea43ff 3976#: builtin/clone.c:75 builtin/init-db.c:500
ef317cd5 3977msgid "template-directory"
07432cef 3978msgstr "模板目录"
ef317cd5 3979
7aea43ff 3980#: builtin/clone.c:76 builtin/init-db.c:501
ef317cd5 3981msgid "directory from which templates will be used"
07432cef 3982msgstr "模板目录将被使用"
ef317cd5 3983
7aea43ff 3984#: builtin/clone.c:78
ef317cd5 3985msgid "reference repository"
cfff71a9 3986msgstr "参考版本库"
ef317cd5 3987
7aea43ff
JX
3988#: builtin/clone.c:80
3989msgid "use --reference only while cloning"
3990msgstr "仅在克隆时参考 --reference 指向的本地版本库"
3991
3992#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
ef317cd5 3993msgid "name"
07432cef 3994msgstr "名称"
ef317cd5 3995
7aea43ff 3996#: builtin/clone.c:82
ef317cd5 3997msgid "use <name> instead of 'origin' to track upstream"
07432cef 3998msgstr "使用<名称>而不是 'origin' 去跟踪上游"
ef317cd5 3999
7aea43ff 4000#: builtin/clone.c:84
ef317cd5 4001msgid "checkout <branch> instead of the remote's HEAD"
07432cef 4002msgstr "检出<分支>而不是远程HEAD"
ef317cd5 4003
7aea43ff 4004#: builtin/clone.c:86
ef317cd5 4005msgid "path to git-upload-pack on the remote"
07432cef 4006msgstr "远程 git-upload-pack 路径"
ef317cd5 4007
7aea43ff 4008#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659
ef317cd5 4009msgid "depth"
07432cef 4010msgstr "深度"
ef317cd5 4011
7aea43ff 4012#: builtin/clone.c:88
ef317cd5 4013msgid "create a shallow clone of that depth"
07432cef 4014msgstr "创建一个指定深度的浅克隆"
ef317cd5 4015
7aea43ff 4016#: builtin/clone.c:90
ef317cd5 4017msgid "clone only one branch, HEAD or --branch"
07432cef 4018msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 4019
7aea43ff 4020#: builtin/clone.c:91 builtin/init-db.c:509
ef317cd5 4021msgid "gitdir"
07432cef 4022msgstr "git目录"
ef317cd5 4023
7aea43ff 4024#: builtin/clone.c:92 builtin/init-db.c:510
ef317cd5 4025msgid "separate git dir from working tree"
07432cef 4026msgstr "git目录和工作区分离"
ef317cd5 4027
7aea43ff 4028#: builtin/clone.c:93
ef317cd5 4029msgid "key=value"
07432cef 4030msgstr "key=value"
ef317cd5 4031
7aea43ff 4032#: builtin/clone.c:94
ef317cd5 4033msgid "set config inside the new repository"
07432cef 4034msgstr "在新版本库中设置配置信息"
ef317cd5 4035
5bb01d4f 4036#: builtin/clone.c:240
c04f5ac3 4037#, c-format
4dcdc3d8 4038msgid "reference repository '%s' is not a local repository."
cfff71a9 4039msgstr "参考版本库 '%s' 不是一个本地版本库。"
c04f5ac3 4040
5bb01d4f 4041#: builtin/clone.c:244
cfff71a9
JX
4042#, c-format
4043msgid "reference repository '%s' is shallow"
4044msgstr "参考版本库 '%s' 是一个浅克隆"
4045
5bb01d4f 4046#: builtin/clone.c:247
cfff71a9
JX
4047#, c-format
4048msgid "reference repository '%s' is grafted"
4049msgstr "参考版本库 '%s' 已被嫁接"
4050
5bb01d4f 4051#: builtin/clone.c:310
c04f5ac3
JX
4052#, c-format
4053msgid "failed to create directory '%s'"
90e6ef53 4054msgstr "无法创建目录 '%s'"
c04f5ac3 4055
5bb01d4f 4056#: builtin/clone.c:312 builtin/diff.c:84
c04f5ac3
JX
4057#, c-format
4058msgid "failed to stat '%s'"
90e6ef53 4059msgstr "无法枚举 '%s' 状态"
c04f5ac3 4060
5bb01d4f 4061#: builtin/clone.c:314
c04f5ac3
JX
4062#, c-format
4063msgid "%s exists and is not a directory"
4064msgstr "%s 存在且不是一个目录"
4065
5bb01d4f 4066#: builtin/clone.c:328
c04f5ac3
JX
4067#, c-format
4068msgid "failed to stat %s\n"
90e6ef53 4069msgstr "无法枚举 %s 状态\n"
c04f5ac3 4070
5bb01d4f 4071#: builtin/clone.c:350
c04f5ac3
JX
4072#, c-format
4073msgid "failed to create link '%s'"
90e6ef53 4074msgstr "无法创建链接 '%s'"
c04f5ac3 4075
5bb01d4f 4076#: builtin/clone.c:354
c04f5ac3
JX
4077#, c-format
4078msgid "failed to copy file to '%s'"
90e6ef53 4079msgstr "无法拷贝文件至 '%s'"
c04f5ac3 4080
5bb01d4f 4081#: builtin/clone.c:377 builtin/clone.c:551
c04f5ac3
JX
4082#, c-format
4083msgid "done.\n"
4084msgstr "完成。\n"
4085
5bb01d4f 4086#: builtin/clone.c:389
1003b3a5
JX
4087msgid ""
4088"Clone succeeded, but checkout failed.\n"
4089"You can inspect what was checked out with 'git status'\n"
4090"and retry the checkout with 'git checkout -f HEAD'\n"
4091msgstr ""
4092"克隆成功,但是检出失败。\n"
4093"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4094"'git checkout -f HEAD' 重试\n"
4095
5bb01d4f 4096#: builtin/clone.c:466
c04f5ac3
JX
4097#, c-format
4098msgid "Could not find remote branch %s to clone."
90e6ef53 4099msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 4100
5bb01d4f 4101#: builtin/clone.c:546
2e8451e8
JX
4102#, c-format
4103msgid "Checking connectivity... "
4104msgstr "检查连接... "
4105
5bb01d4f 4106#: builtin/clone.c:549
1003b3a5
JX
4107msgid "remote did not send all necessary objects"
4108msgstr "远程没有发送所有必须的对象"
4109
5bb01d4f 4110#: builtin/clone.c:613
c04f5ac3
JX
4111msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4112msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4113
5bb01d4f 4114#: builtin/clone.c:644
1003b3a5
JX
4115msgid "unable to checkout working tree"
4116msgstr "不能检出工作区"
4117
5bb01d4f 4118#: builtin/clone.c:731
04cb2f28
JX
4119msgid "cannot repack to clean up"
4120msgstr "无法执行 repack 来清理"
4121
5bb01d4f 4122#: builtin/clone.c:733
04cb2f28
JX
4123msgid "cannot unlink temporary alternates file"
4124msgstr "无法删除临时的 alternates 文件"
4125
5bb01d4f 4126#: builtin/clone.c:763
c04f5ac3
JX
4127msgid "Too many arguments."
4128msgstr "太多参数。"
4129
5bb01d4f 4130#: builtin/clone.c:767
c04f5ac3 4131msgid "You must specify a repository to clone."
90e6ef53 4132msgstr "您必须指定一个版本库来克隆。"
c04f5ac3 4133
5bb01d4f 4134#: builtin/clone.c:778
c04f5ac3
JX
4135#, c-format
4136msgid "--bare and --origin %s options are incompatible."
4137msgstr "--bare 和 --origin %s 选项不兼容。"
4138
5bb01d4f 4139#: builtin/clone.c:781
07432cef
WS
4140msgid "--bare and --separate-git-dir are incompatible."
4141msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4142
5bb01d4f 4143#: builtin/clone.c:794
c04f5ac3
JX
4144#, c-format
4145msgid "repository '%s' does not exist"
4146msgstr "版本库 '%s' 不存在"
4147
5bb01d4f 4148#: builtin/clone.c:800 builtin/fetch.c:1160
cfff71a9
JX
4149#, c-format
4150msgid "depth %s is not a positive number"
4151msgstr "深度 %s 不是一个正数"
4152
5bb01d4f 4153#: builtin/clone.c:810
c04f5ac3
JX
4154#, c-format
4155msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 4156msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 4157
5bb01d4f 4158#: builtin/clone.c:820
c04f5ac3
JX
4159#, c-format
4160msgid "working tree '%s' already exists."
4161msgstr "工作区 '%s' 已经存在。"
4162
5bb01d4f
JX
4163#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193
4164#: builtin/worktree.c:220
4165#, c-format
4166msgid "could not create leading directories of '%s'"
4167msgstr "不能为 '%s' 创建先导目录"
4168
4169#: builtin/clone.c:838
c04f5ac3 4170#, c-format
814ff314
JX
4171msgid "could not create work tree dir '%s'"
4172msgstr "不能创建工作区目录 '%s'"
c04f5ac3 4173
5bb01d4f 4174#: builtin/clone.c:856
c04f5ac3
JX
4175#, c-format
4176msgid "Cloning into bare repository '%s'...\n"
220c313c 4177msgstr "克隆到纯版本库 '%s'...\n"
c04f5ac3 4178
5bb01d4f 4179#: builtin/clone.c:858
c04f5ac3
JX
4180#, c-format
4181msgid "Cloning into '%s'...\n"
4182msgstr "正克隆到 '%s'...\n"
4183
5bb01d4f 4184#: builtin/clone.c:883
04cb2f28
JX
4185msgid "--dissociate given, but there is no --reference"
4186msgstr "提供了参数 --dissociate,但未提供 --reference"
4187
5bb01d4f 4188#: builtin/clone.c:900
6acbf033
JX
4189msgid "--depth is ignored in local clones; use file:// instead."
4190msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4191
5bb01d4f 4192#: builtin/clone.c:903
6acbf033
JX
4193msgid "source repository is shallow, ignoring --local"
4194msgstr "源版本库是浅克隆,忽略 --local"
4195
5bb01d4f 4196#: builtin/clone.c:908
6acbf033
JX
4197msgid "--local is ignored"
4198msgstr "--local 被忽略"
4199
5bb01d4f 4200#: builtin/clone.c:912
c04f5ac3
JX
4201#, c-format
4202msgid "Don't know how to clone %s"
4203msgstr "不知道如何克隆 %s"
4204
5bb01d4f 4205#: builtin/clone.c:961 builtin/clone.c:969
c04f5ac3
JX
4206#, c-format
4207msgid "Remote branch %s not found in upstream %s"
4208msgstr "远程分支 %s 在上游 %s 未发现"
4209
5bb01d4f 4210#: builtin/clone.c:972
c04f5ac3
JX
4211msgid "You appear to have cloned an empty repository."
4212msgstr "您似乎克隆了一个空版本库。"
4213
ef317cd5 4214#: builtin/column.c:9
814ff314
JX
4215msgid "git column [<options>]"
4216msgstr "git column [<选项>]"
ef317cd5
JX
4217
4218#: builtin/column.c:26
4219msgid "lookup config vars"
07432cef 4220msgstr "查找配置变量"
ef317cd5
JX
4221
4222#: builtin/column.c:27 builtin/column.c:28
ef317cd5 4223msgid "layout to use"
07432cef 4224msgstr "要使用的布局"
ef317cd5
JX
4225
4226#: builtin/column.c:29
4227msgid "Maximum width"
07432cef 4228msgstr "最大宽度"
ef317cd5
JX
4229
4230#: builtin/column.c:30
4231msgid "Padding space on left border"
07432cef 4232msgstr "左边框的填充空间"
ef317cd5
JX
4233
4234#: builtin/column.c:31
4235msgid "Padding space on right border"
07432cef 4236msgstr "右边框的填充空间"
ef317cd5
JX
4237
4238#: builtin/column.c:32
4239msgid "Padding space between columns"
07432cef 4240msgstr "两列之间的填充空间"
ef317cd5 4241
8ada9598
JX
4242#: builtin/column.c:51
4243msgid "--command must be the first argument"
81809b99 4244msgstr "--command 必须是第一个参数"
8ada9598 4245
220c313c 4246#: builtin/commit.c:37
814ff314
JX
4247msgid "git commit [<options>] [--] <pathspec>..."
4248msgstr "git commit [<选项>] [--] <路径规则>..."
ef317cd5 4249
220c313c 4250#: builtin/commit.c:42
814ff314
JX
4251msgid "git status [<options>] [--] <pathspec>..."
4252msgstr "git status [<选项>] [--] <路径规则>..."
ef317cd5 4253
220c313c
JX
4254#: builtin/commit.c:47
4255msgid ""
4256"Your name and email address were configured automatically based\n"
4257"on your username and hostname. Please check that they are accurate.\n"
4258"You can suppress this message by setting them explicitly. Run the\n"
4259"following command and follow the instructions in your editor to edit\n"
4260"your configuration file:\n"
4261"\n"
4262" git config --global --edit\n"
4263"\n"
4264"After doing this, you may fix the identity used for this commit with:\n"
4265"\n"
4266" git commit --amend --reset-author\n"
4267msgstr ""
4268"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4269"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4270"中编辑您的配置文件:\n"
4271"\n"
4272" git config --global --edit\n"
4273"\n"
4274"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4275"\n"
4276" git commit --amend --reset-author\n"
4277
4278#: builtin/commit.c:60
c04f5ac3
JX
4279msgid ""
4280"Your name and email address were configured automatically based\n"
4281"on your username and hostname. Please check that they are accurate.\n"
4282"You can suppress this message by setting them explicitly:\n"
4283"\n"
4284" git config --global user.name \"Your Name\"\n"
4285" git config --global user.email you@example.com\n"
4286"\n"
4287"After doing this, you may fix the identity used for this commit with:\n"
4288"\n"
4289" git commit --amend --reset-author\n"
4290msgstr ""
90e6ef53 4291"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
220c313c 4292"与否。您可以对其进行设置以免再出现本提示信息:\n"
c04f5ac3
JX
4293"\n"
4294" git config --global user.name \"Your Name\"\n"
4295" git config --global user.email you@example.com\n"
4296"\n"
90e6ef53 4297"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
c04f5ac3
JX
4298"\n"
4299" git commit --amend --reset-author\n"
4300
220c313c 4301#: builtin/commit.c:72
c04f5ac3
JX
4302msgid ""
4303"You asked to amend the most recent commit, but doing so would make\n"
4304"it empty. You can repeat your command with --allow-empty, or you can\n"
4305"remove the commit entirely with \"git reset HEAD^\".\n"
4306msgstr ""
1b150dc9
T
4307"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4308"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 4309
220c313c 4310#: builtin/commit.c:77
c04f5ac3
JX
4311msgid ""
4312"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4313"If you wish to commit it anyway, use:\n"
4314"\n"
4315" git commit --allow-empty\n"
4316"\n"
c04f5ac3 4317msgstr ""
a9ce4543
T
4318"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4319"也要提交,使用命令:\n"
c04f5ac3
JX
4320"\n"
4321" git commit --allow-empty\n"
4322"\n"
c04f5ac3 4323
220c313c 4324#: builtin/commit.c:84
b1894384
JX
4325msgid "Otherwise, please use 'git reset'\n"
4326msgstr "否则,请使用命令 'git reset'\n"
4327
220c313c 4328#: builtin/commit.c:87
b1894384
JX
4329msgid ""
4330"If you wish to skip this commit, use:\n"
4331"\n"
4332" git reset\n"
4333"\n"
4334"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4335"the remaining commits.\n"
4336msgstr ""
4337"如果您想跳过这个提交,使用命令:\n"
4338"\n"
4339" git reset\n"
4340"\n"
4341"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4342"操作。\n"
4343
44f518e6 4344#: builtin/commit.c:304
c04f5ac3 4345msgid "failed to unpack HEAD tree object"
90e6ef53 4346msgstr "无法解包 HEAD 树对象"
c04f5ac3 4347
44f518e6 4348#: builtin/commit.c:344
c04f5ac3 4349msgid "unable to create temporary index"
90e6ef53 4350msgstr "不能创建临时索引"
c04f5ac3 4351
44f518e6 4352#: builtin/commit.c:350
c04f5ac3
JX
4353msgid "interactive add failed"
4354msgstr "交互式添加失败"
4355
44f518e6 4356#: builtin/commit.c:361
220c313c
JX
4357msgid "unable to write index file"
4358msgstr "无法写入索引文件"
4359
44f518e6 4360#: builtin/commit.c:363
220c313c
JX
4361msgid "unable to update temporary index"
4362msgstr "无法更新临时索引"
4363
44f518e6 4364#: builtin/commit.c:365
220c313c
JX
4365msgid "Failed to update main cache tree"
4366msgstr "不能更新树的主缓存"
4367
44f518e6 4368#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463
c04f5ac3 4369msgid "unable to write new_index file"
90e6ef53 4370msgstr "无法写 new_index 文件"
c04f5ac3 4371
44f518e6 4372#: builtin/commit.c:445
8ada9598 4373msgid "cannot do a partial commit during a merge."
81809b99 4374msgstr "在合并过程中不能做部分提交。"
c04f5ac3 4375
44f518e6 4376#: builtin/commit.c:447
8ada9598 4377msgid "cannot do a partial commit during a cherry-pick."
81809b99 4378msgstr "在拣选过程中不能做部分提交。"
8ada9598 4379
44f518e6 4380#: builtin/commit.c:456
c04f5ac3 4381msgid "cannot read the index"
90e6ef53 4382msgstr "无法读取索引"
c04f5ac3 4383
44f518e6 4384#: builtin/commit.c:475
c04f5ac3 4385msgid "unable to write temporary index file"
90e6ef53 4386msgstr "无法写临时索引文件"
c04f5ac3 4387
44f518e6 4388#: builtin/commit.c:580
220c313c
JX
4389#, c-format
4390msgid "commit '%s' lacks author header"
4391msgstr "提交 '%s' 缺少作者信息"
4392
44f518e6 4393#: builtin/commit.c:582
c04f5ac3 4394#, c-format
220c313c
JX
4395msgid "commit '%s' has malformed author line"
4396msgstr "提交 '%s' 有非法的作者信息"
c04f5ac3 4397
44f518e6 4398#: builtin/commit.c:601
c04f5ac3
JX
4399msgid "malformed --author parameter"
4400msgstr "非法的 --author 参数"
4401
44f518e6 4402#: builtin/commit.c:609
c04f5ac3 4403#, c-format
6acbf033
JX
4404msgid "invalid date format: %s"
4405msgstr "无效的日期格式:%s"
4406
44f518e6 4407#: builtin/commit.c:653
6acbf033
JX
4408msgid ""
4409"unable to select a comment character that is not used\n"
4410"in the current commit message"
4411msgstr "无法选择一个未被当前提交说明使用的注释字符"
4412
44f518e6 4413#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
c04f5ac3
JX
4414#, c-format
4415msgid "could not lookup commit %s"
4416msgstr "不能查询提交 %s"
4417
44f518e6 4418#: builtin/commit.c:702 builtin/shortlog.c:273
c04f5ac3
JX
4419#, c-format
4420msgid "(reading log message from standard input)\n"
90e6ef53 4421msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 4422
44f518e6 4423#: builtin/commit.c:704
c04f5ac3 4424msgid "could not read log from standard input"
90e6ef53 4425msgstr "不能从标准输入中读取日志信息"
c04f5ac3 4426
44f518e6 4427#: builtin/commit.c:708
c04f5ac3
JX
4428#, c-format
4429msgid "could not read log file '%s'"
90e6ef53 4430msgstr "不能读取日志文件 '%s'"
c04f5ac3 4431
44f518e6 4432#: builtin/commit.c:730
c04f5ac3 4433msgid "could not read MERGE_MSG"
90e6ef53 4434msgstr "不能读取 MERGE_MSG"
c04f5ac3 4435
44f518e6 4436#: builtin/commit.c:734
c04f5ac3 4437msgid "could not read SQUASH_MSG"
90e6ef53 4438msgstr "不能读取 SQUASH_MSG"
c04f5ac3 4439
7aea43ff 4440#: builtin/commit.c:738 builtin/merge.c:1079
c04f5ac3
JX
4441#, c-format
4442msgid "could not read '%s'"
90e6ef53 4443msgstr "不能读取 '%s'"
c04f5ac3 4444
44f518e6 4445#: builtin/commit.c:785
c04f5ac3 4446msgid "could not write commit template"
90e6ef53 4447msgstr "不能写提交模版"
c04f5ac3 4448
44f518e6 4449#: builtin/commit.c:803
81809b99 4450#, c-format
c04f5ac3
JX
4451msgid ""
4452"\n"
8ada9598 4453"It looks like you may be committing a merge.\n"
c04f5ac3
JX
4454"If this is not correct, please remove the file\n"
4455"\t%s\n"
4456"and try again.\n"
4457msgstr ""
4458"\n"
649900bc 4459"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
4460"\t%s\n"
4461"然后重试。\n"
4462
44f518e6 4463#: builtin/commit.c:808
81809b99 4464#, c-format
8ada9598
JX
4465msgid ""
4466"\n"
4467"It looks like you may be committing a cherry-pick.\n"
4468"If this is not correct, please remove the file\n"
4469"\t%s\n"
4470"and try again.\n"
4471msgstr ""
4472"\n"
649900bc 4473"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
4474"\t%s\n"
4475"然后重试。\n"
c04f5ac3 4476
44f518e6 4477#: builtin/commit.c:821
a77c07d9 4478#, c-format
c04f5ac3 4479msgid ""
8ada9598 4480"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 4481"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 4482msgstr ""
a77c07d9 4483"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 4484"说明将会终止提交。\n"
c04f5ac3 4485
44f518e6 4486#: builtin/commit.c:828
a77c07d9 4487#, c-format
c04f5ac3 4488msgid ""
8ada9598 4489"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 4490"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
4491"An empty message aborts the commit.\n"
4492msgstr ""
a77c07d9
JX
4493"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4494"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 4495
90e6ef53 4496# 译者:为保证在输出中对齐,注意调整句中空格!
44f518e6 4497#: builtin/commit.c:848
6acbf033
JX
4498#, c-format
4499msgid "%sAuthor: %.*s <%.*s>"
4500msgstr "%s作者: %.*s <%.*s>"
4501
4502# 译者:为保证在输出中对齐,注意调整句中空格!
44f518e6 4503#: builtin/commit.c:856
c04f5ac3 4504#, c-format
6acbf033
JX
4505msgid "%sDate: %s"
4506msgstr "%s日期: %s"
c04f5ac3 4507
90e6ef53 4508# 译者:为保证在输出中对齐,注意调整句中空格!
44f518e6 4509#: builtin/commit.c:863
c04f5ac3 4510#, c-format
6acbf033
JX
4511msgid "%sCommitter: %.*s <%.*s>"
4512msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 4513
44f518e6 4514#: builtin/commit.c:881
c04f5ac3 4515msgid "Cannot read index"
90e6ef53 4516msgstr "无法读取索引"
c04f5ac3 4517
44f518e6 4518#: builtin/commit.c:938
c04f5ac3
JX
4519msgid "Error building trees"
4520msgstr "无法创建树对象"
4521
44f518e6 4522#: builtin/commit.c:953 builtin/tag.c:495
c04f5ac3
JX
4523#, c-format
4524msgid "Please supply the message using either -m or -F option.\n"
07432cef 4525msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 4526
44f518e6 4527#: builtin/commit.c:1055
c04f5ac3 4528#, c-format
814ff314
JX
4529msgid "--author '%s' is not 'Name <email>' and matches no existing author"
4530msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
c04f5ac3 4531
44f518e6 4532#: builtin/commit.c:1070 builtin/commit.c:1310
c04f5ac3
JX
4533#, c-format
4534msgid "Invalid untracked files mode '%s'"
90e6ef53 4535msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 4536
44f518e6 4537#: builtin/commit.c:1107
2e8451e8
JX
4538msgid "--long and -z are incompatible"
4539msgstr "--long 和 -z 选项不兼容"
4540
44f518e6 4541#: builtin/commit.c:1137
c04f5ac3
JX
4542msgid "Using both --reset-author and --author does not make sense"
4543msgstr "同时使用 --reset-author 和 --author 没有意义"
4544
44f518e6 4545#: builtin/commit.c:1146
c04f5ac3 4546msgid "You have nothing to amend."
90e6ef53 4547msgstr "您没有可修补的提交。"
c04f5ac3 4548
44f518e6 4549#: builtin/commit.c:1149
8ada9598 4550msgid "You are in the middle of a merge -- cannot amend."
81809b99 4551msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 4552
44f518e6 4553#: builtin/commit.c:1151
8ada9598 4554msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 4555msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 4556
44f518e6 4557#: builtin/commit.c:1154
c04f5ac3 4558msgid "Options --squash and --fixup cannot be used together"
649900bc 4559msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 4560
44f518e6 4561#: builtin/commit.c:1164
c04f5ac3
JX
4562msgid "Only one of -c/-C/-F/--fixup can be used."
4563msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4564
44f518e6 4565#: builtin/commit.c:1166
c04f5ac3 4566msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
649900bc 4567msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
c04f5ac3 4568
44f518e6 4569#: builtin/commit.c:1174
c04f5ac3 4570msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 4571msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 4572
44f518e6 4573#: builtin/commit.c:1191
c04f5ac3
JX
4574msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4575msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4576
44f518e6 4577#: builtin/commit.c:1193
c04f5ac3
JX
4578msgid "No paths with --include/--only does not make sense."
4579msgstr "参数 --include/--only 不跟路径没有意义。"
4580
44f518e6 4581#: builtin/commit.c:1195
c04f5ac3 4582msgid "Clever... amending the last one with dirty index."
90e6ef53 4583msgstr "聪明... 在索引不干净下修补最后的提交。"
c04f5ac3 4584
44f518e6 4585#: builtin/commit.c:1197
6c94aba5
JX
4586msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4587msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
c04f5ac3 4588
44f518e6 4589#: builtin/commit.c:1209 builtin/tag.c:728
c04f5ac3
JX
4590#, c-format
4591msgid "Invalid cleanup mode %s"
4592msgstr "无效的清理模式 %s"
4593
44f518e6 4594#: builtin/commit.c:1214
c04f5ac3 4595msgid "Paths with -a does not make sense."
649900bc 4596msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 4597
7aea43ff 4598#: builtin/commit.c:1324 builtin/commit.c:1603
ef317cd5 4599msgid "show status concisely"
07432cef 4600msgstr "以简洁的格式显示状态"
ef317cd5 4601
7aea43ff 4602#: builtin/commit.c:1326 builtin/commit.c:1605
ef317cd5 4603msgid "show branch information"
07432cef 4604msgstr "显示分支信息"
ef317cd5 4605
7aea43ff 4606#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509
ef317cd5 4607msgid "machine-readable output"
07432cef
WS
4608msgstr "机器可读的输出"
4609
7aea43ff 4610#: builtin/commit.c:1331 builtin/commit.c:1609
07432cef
WS
4611msgid "show status in long format (default)"
4612msgstr "以长格式显示状态(默认)"
ef317cd5 4613
7aea43ff 4614#: builtin/commit.c:1334 builtin/commit.c:1612
ef317cd5 4615msgid "terminate entries with NUL"
07432cef 4616msgstr "条目以NUL字符结尾"
ef317cd5 4617
7aea43ff 4618#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980
220c313c 4619#: builtin/fast-export.c:983 builtin/tag.c:603
ef317cd5 4620msgid "mode"
07432cef 4621msgstr "模式"
ef317cd5 4622
7aea43ff 4623#: builtin/commit.c:1337 builtin/commit.c:1615
ef317cd5 4624msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 4625msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 4626
44f518e6 4627#: builtin/commit.c:1340
ef317cd5 4628msgid "show ignored files"
07432cef 4629msgstr "显示忽略的文件"
ef317cd5 4630
7aea43ff 4631#: builtin/commit.c:1341 parse-options.h:152
ef317cd5
JX
4632msgid "when"
4633msgstr "何时"
4634
44f518e6 4635#: builtin/commit.c:1342
ef317cd5
JX
4636msgid ""
4637"ignore changes to submodules, optional when: all, dirty, untracked. "
4638"(Default: all)"
4639msgstr ""
07432cef 4640"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 4641
44f518e6 4642#: builtin/commit.c:1344
ef317cd5 4643msgid "list untracked files in columns"
07432cef 4644msgstr "以列的方式显示未跟踪的文件"
ef317cd5 4645
7aea43ff 4646#: builtin/commit.c:1430
c04f5ac3
JX
4647msgid "couldn't look up newly created commit"
4648msgstr "无法找到新创建的提交"
4649
7aea43ff 4650#: builtin/commit.c:1432
c04f5ac3 4651msgid "could not parse newly created commit"
90e6ef53 4652msgstr "不能解析新创建的提交"
c04f5ac3 4653
7aea43ff 4654#: builtin/commit.c:1477
c04f5ac3
JX
4655msgid "detached HEAD"
4656msgstr "分离头指针"
4657
7e238ab7 4658# 译者:中文字符串拼接,可删除前导空格
7aea43ff 4659#: builtin/commit.c:1480
c04f5ac3 4660msgid " (root-commit)"
7e238ab7 4661msgstr "(根提交)"
c04f5ac3 4662
7aea43ff 4663#: builtin/commit.c:1573
ef317cd5 4664msgid "suppress summary after successful commit"
07432cef 4665msgstr "提交成功后不显示概述信息"
c04f5ac3 4666
7aea43ff 4667#: builtin/commit.c:1574
ef317cd5 4668msgid "show diff in commit message template"
07432cef 4669msgstr "在提交说明模板里显示差异"
c04f5ac3 4670
7aea43ff 4671#: builtin/commit.c:1576
ef317cd5 4672msgid "Commit message options"
07432cef 4673msgstr "提交说明选项"
c04f5ac3 4674
7aea43ff 4675#: builtin/commit.c:1577 builtin/tag.c:601
ef317cd5 4676msgid "read message from file"
07432cef 4677msgstr "从文件中读取提交说明"
c04f5ac3 4678
7aea43ff 4679#: builtin/commit.c:1578
ef317cd5 4680msgid "author"
07432cef 4681msgstr "作者"
c04f5ac3 4682
7aea43ff 4683#: builtin/commit.c:1578
ef317cd5 4684msgid "override author for commit"
07432cef 4685msgstr "提交时覆盖作者"
73a60cd2 4686
7aea43ff 4687#: builtin/commit.c:1579 builtin/gc.c:280
ef317cd5 4688msgid "date"
07432cef 4689msgstr "日期"
c04f5ac3 4690
7aea43ff 4691#: builtin/commit.c:1579
ef317cd5 4692msgid "override date for commit"
07432cef 4693msgstr "提交时覆盖日期"
c04f5ac3 4694
7aea43ff 4695#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391
04cb2f28 4696#: builtin/notes.c:554 builtin/tag.c:599
ef317cd5 4697msgid "message"
07432cef 4698msgstr "说明"
c04f5ac3 4699
7aea43ff 4700#: builtin/commit.c:1580
ef317cd5 4701msgid "commit message"
07432cef 4702msgstr "提交说明"
ef317cd5 4703
7aea43ff 4704#: builtin/commit.c:1581
ef317cd5 4705msgid "reuse and edit message from specified commit"
07432cef 4706msgstr "重用并编辑指定提交的提交说明"
ef317cd5 4707
7aea43ff 4708#: builtin/commit.c:1582
ef317cd5 4709msgid "reuse message from specified commit"
07432cef 4710msgstr "重用指定提交的提交说明"
ef317cd5 4711
7aea43ff 4712#: builtin/commit.c:1583
ef317cd5 4713msgid "use autosquash formatted message to fixup specified commit"
07432cef 4714msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 4715
7aea43ff 4716#: builtin/commit.c:1584
ef317cd5 4717msgid "use autosquash formatted message to squash specified commit"
07432cef 4718msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 4719
7aea43ff 4720#: builtin/commit.c:1585
ef317cd5 4721msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 4722msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 4723
7aea43ff 4724#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86
ef317cd5 4725msgid "add Signed-off-by:"
07432cef 4726msgstr "添加 Signed-off-by: 签名"
ef317cd5 4727
7aea43ff 4728#: builtin/commit.c:1587
ef317cd5 4729msgid "use specified template file"
07432cef 4730msgstr "使用指定的模板文件"
ef317cd5 4731
7aea43ff 4732#: builtin/commit.c:1588
ef317cd5 4733msgid "force edit of commit"
07432cef 4734msgstr "强制编辑提交"
ef317cd5 4735
07432cef 4736# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
7aea43ff 4737#: builtin/commit.c:1589
ef317cd5 4738msgid "default"
07432cef 4739msgstr "default"
ef317cd5 4740
7aea43ff 4741#: builtin/commit.c:1589 builtin/tag.c:604
ef317cd5 4742msgid "how to strip spaces and #comments from message"
07432cef 4743msgstr "设置如何删除提交说明里的空格和#注释"
ef317cd5 4744
7aea43ff 4745#: builtin/commit.c:1590
ef317cd5 4746msgid "include status in commit message template"
07432cef 4747msgstr "在提交说明模板里包含状态信息"
ef317cd5 4748
7aea43ff 4749#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92
220c313c 4750#: builtin/tag.c:605
6c94aba5
JX
4751msgid "key-id"
4752msgstr "key-id"
ef317cd5 4753
7aea43ff 4754#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93
ef317cd5 4755msgid "GPG sign commit"
07432cef 4756msgstr "GPG 提交签名"
ef317cd5 4757
7aea43ff 4758#: builtin/commit.c:1595
ef317cd5 4759msgid "Commit contents options"
07432cef 4760msgstr "提交内容选项"
ef317cd5 4761
7aea43ff 4762#: builtin/commit.c:1596
ef317cd5 4763msgid "commit all changed files"
07432cef 4764msgstr "提交所有改动的文件"
ef317cd5 4765
7aea43ff 4766#: builtin/commit.c:1597
ef317cd5 4767msgid "add specified files to index for commit"
07432cef 4768msgstr "添加指定的文件到索引区等待提交"
ef317cd5 4769
7aea43ff 4770#: builtin/commit.c:1598
ef317cd5 4771msgid "interactively add files"
07432cef 4772msgstr "交互式添加文件"
ef317cd5 4773
7aea43ff 4774#: builtin/commit.c:1599
ef317cd5 4775msgid "interactively add changes"
07432cef 4776msgstr "交互式添加变更"
ef317cd5 4777
7aea43ff 4778#: builtin/commit.c:1600
ef317cd5 4779msgid "commit only specified files"
07432cef 4780msgstr "只提交指定的文件"
ef317cd5 4781
7aea43ff 4782#: builtin/commit.c:1601
ef317cd5 4783msgid "bypass pre-commit hook"
07432cef 4784msgstr "绕过 pre-commit 钩子"
ef317cd5 4785
7aea43ff 4786#: builtin/commit.c:1602
ef317cd5 4787msgid "show what would be committed"
07432cef 4788msgstr "显示将要提交的内容"
ef317cd5 4789
7aea43ff 4790#: builtin/commit.c:1613
ef317cd5 4791msgid "amend previous commit"
07432cef 4792msgstr "修改先前的提交"
ef317cd5 4793
7aea43ff 4794#: builtin/commit.c:1614
ef317cd5 4795msgid "bypass post-rewrite hook"
07432cef 4796msgstr "绕过 post-rewrite 钩子"
ef317cd5 4797
7aea43ff 4798#: builtin/commit.c:1619
ef317cd5 4799msgid "ok to record an empty change"
07432cef 4800msgstr "允许一个空提交"
ef317cd5 4801
7aea43ff 4802#: builtin/commit.c:1621
ef317cd5 4803msgid "ok to record a change with an empty message"
07432cef 4804msgstr "允许空的提交说明"
ef317cd5 4805
7aea43ff 4806#: builtin/commit.c:1650
c04f5ac3 4807msgid "could not parse HEAD commit"
90e6ef53 4808msgstr "不能解析 HEAD 提交"
c04f5ac3 4809
7aea43ff 4810#: builtin/commit.c:1689 builtin/merge.c:1076
c04f5ac3
JX
4811#, c-format
4812msgid "could not open '%s' for reading"
90e6ef53 4813msgstr "不能为读入打开 '%s'"
c04f5ac3 4814
7aea43ff 4815#: builtin/commit.c:1696
c04f5ac3
JX
4816#, c-format
4817msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 4818msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 4819
7aea43ff 4820#: builtin/commit.c:1703
c04f5ac3 4821msgid "could not read MERGE_MODE"
90e6ef53 4822msgstr "不能读取 MERGE_MODE"
c04f5ac3 4823
7aea43ff 4824#: builtin/commit.c:1722
c04f5ac3
JX
4825#, c-format
4826msgid "could not read commit message: %s"
90e6ef53 4827msgstr "不能读取提交说明:%s"
c04f5ac3 4828
7aea43ff 4829#: builtin/commit.c:1733
73a60cd2
JX
4830#, c-format
4831msgid "Aborting commit; you did not edit the message.\n"
4832msgstr "终止提交;您未更改来自模版的提交说明。\n"
4833
7aea43ff 4834#: builtin/commit.c:1738
c04f5ac3
JX
4835#, c-format
4836msgid "Aborting commit due to empty commit message.\n"
4837msgstr "终止提交因为提交说明为空。\n"
4838
7aea43ff 4839#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854
c04f5ac3 4840msgid "failed to write commit object"
90e6ef53 4841msgstr "无法写提交对象"
c04f5ac3 4842
7aea43ff 4843#: builtin/commit.c:1786
c04f5ac3
JX
4844msgid ""
4845"Repository has been updated, but unable to write\n"
220c313c 4846"new_index file. Check that disk is not full and quota is\n"
c04f5ac3
JX
4847"not exceeded, and then \"git reset HEAD\" to recover."
4848msgstr ""
90e6ef53
JX
4849"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4850"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 4851
90314792 4852#: builtin/config.c:8
814ff314
JX
4853msgid "git config [<options>]"
4854msgstr "git config [<选项>]"
ef317cd5 4855
6c94aba5 4856#: builtin/config.c:53
ef317cd5 4857msgid "Config file location"
07432cef 4858msgstr "配置文件位置"
ef317cd5 4859
6c94aba5 4860#: builtin/config.c:54
ef317cd5 4861msgid "use global config file"
07432cef 4862msgstr "使用全局配置文件"
ef317cd5 4863
6c94aba5 4864#: builtin/config.c:55
ef317cd5 4865msgid "use system config file"
07432cef 4866msgstr "使用系统级配置文件"
ef317cd5 4867
6c94aba5 4868#: builtin/config.c:56
ef317cd5 4869msgid "use repository config file"
07432cef 4870msgstr "使用版本库级配置文件"
ef317cd5 4871
6c94aba5 4872#: builtin/config.c:57
ef317cd5 4873msgid "use given config file"
07432cef 4874msgstr "使用指定的配置文件"
ef317cd5 4875
6c94aba5 4876#: builtin/config.c:58
2e8451e8
JX
4877msgid "blob-id"
4878msgstr "数据对象ID"
4879
6c94aba5 4880#: builtin/config.c:58
2e8451e8
JX
4881msgid "read config from given blob object"
4882msgstr "从给定的数据对象读取配置"
4883
6c94aba5 4884#: builtin/config.c:59
ef317cd5 4885msgid "Action"
07432cef 4886msgstr "操作"
ef317cd5 4887
6c94aba5 4888#: builtin/config.c:60
ef317cd5 4889msgid "get value: name [value-regex]"
07432cef 4890msgstr "获取值:name [value-regex]"
ef317cd5 4891
6c94aba5 4892#: builtin/config.c:61
ef317cd5 4893msgid "get all values: key [value-regex]"
07432cef 4894msgstr "获得所有的值:key [value-regex]"
ef317cd5 4895
6c94aba5 4896#: builtin/config.c:62
ef317cd5 4897msgid "get values for regexp: name-regex [value-regex]"
07432cef 4898msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 4899
6c94aba5 4900#: builtin/config.c:63
90314792
JX
4901msgid "get value specific for the URL: section[.var] URL"
4902msgstr "获得 URL 取值:section[.var] URL"
4903
6c94aba5 4904#: builtin/config.c:64
ef317cd5 4905msgid "replace all matching variables: name value [value_regex]"
07432cef 4906msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 4907
6c94aba5 4908#: builtin/config.c:65
ef317cd5 4909msgid "add a new variable: name value"
07432cef 4910msgstr "添加一个新的变量:name value"
ef317cd5 4911
6c94aba5 4912#: builtin/config.c:66
ef317cd5 4913msgid "remove a variable: name [value-regex]"
07432cef 4914msgstr "删除一个变量:name [value-regex]"
ef317cd5 4915
6c94aba5 4916#: builtin/config.c:67
ef317cd5 4917msgid "remove all matches: name [value-regex]"
07432cef 4918msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 4919
6c94aba5 4920#: builtin/config.c:68
ef317cd5 4921msgid "rename section: old-name new-name"
07432cef 4922msgstr "重命名小节:old-name new-name"
ef317cd5 4923
6c94aba5 4924#: builtin/config.c:69
ef317cd5 4925msgid "remove a section: name"
07432cef 4926msgstr "删除一个小节:name"
ef317cd5 4927
6c94aba5 4928#: builtin/config.c:70
ef317cd5 4929msgid "list all"
07432cef 4930msgstr "列出所有"
ef317cd5 4931
6c94aba5 4932#: builtin/config.c:71
ef317cd5 4933msgid "open an editor"
07432cef 4934msgstr "打开一个编辑器"
ef317cd5 4935
6c94aba5 4936#: builtin/config.c:72
04cb2f28
JX
4937msgid "find the color configured: slot [default]"
4938msgstr "获得配置的颜色:配置 [默认]"
ef317cd5 4939
6c94aba5 4940#: builtin/config.c:73
04cb2f28
JX
4941msgid "find the color setting: slot [stdout-is-tty]"
4942msgstr "获得颜色设置:配置 [stdout-is-tty]"
ef317cd5 4943
6c94aba5 4944#: builtin/config.c:74
ef317cd5 4945msgid "Type"
07432cef 4946msgstr "类型"
ef317cd5 4947
6c94aba5 4948#: builtin/config.c:75
ef317cd5 4949msgid "value is \"true\" or \"false\""
07432cef 4950msgstr "值是 \"true\" 或 \"false\""
ef317cd5 4951
6c94aba5 4952#: builtin/config.c:76
ef317cd5 4953msgid "value is decimal number"
07432cef 4954msgstr "值是十进制数"
ef317cd5 4955
6c94aba5 4956#: builtin/config.c:77
ef317cd5 4957msgid "value is --bool or --int"
07432cef 4958msgstr "值是 --bool or --int"
ef317cd5 4959
6c94aba5 4960#: builtin/config.c:78
ef317cd5 4961msgid "value is a path (file or directory name)"
07432cef 4962msgstr "值是一个路径(文件或目录名)"
ef317cd5 4963
6c94aba5 4964#: builtin/config.c:79
ef317cd5 4965msgid "Other"
07432cef 4966msgstr "其它"
ef317cd5 4967
6c94aba5 4968#: builtin/config.c:80
ef317cd5 4969msgid "terminate values with NUL byte"
07432cef 4970msgstr "终止值是NUL字节"
ef317cd5 4971
6c94aba5 4972#: builtin/config.c:81
ef317cd5 4973msgid "respect include directives on lookup"
07432cef 4974msgstr "查询时参照 include 指令递归查找"
ef317cd5 4975
04cb2f28 4976#: builtin/config.c:316
220c313c
JX
4977msgid "unable to parse default color value"
4978msgstr "不能解析缺省的颜色值"
4979
04cb2f28 4980#: builtin/config.c:457
220c313c
JX
4981#, c-format
4982msgid ""
4983"# This is Git's per-user configuration file.\n"
7aea43ff 4984"[user]\n"
220c313c 4985"# Please adapt and uncomment the following lines:\n"
7aea43ff 4986"#\tname = %s\n"
220c313c
JX
4987"#\temail = %s\n"
4988msgstr ""
4989"# This is Git's per-user configuration file.\n"
7aea43ff 4990"[user]\n"
220c313c 4991"# Please adapt and uncomment the following lines:\n"
7aea43ff 4992"#\tname = %s\n"
220c313c
JX
4993"#\temail = %s\n"
4994
7aea43ff 4995#: builtin/config.c:587
220c313c
JX
4996#, c-format
4997msgid "cannot create configuration file %s"
4998msgstr "不能创建配置文件 %s"
4999
5000#: builtin/count-objects.c:55
4dcdc3d8
JX
5001msgid "git count-objects [-v] [-H | --human-readable]"
5002msgstr "git count-objects [-v] [-H | --human-readable]"
5003
220c313c 5004#: builtin/count-objects.c:65
4dcdc3d8
JX
5005msgid "print sizes in human readable format"
5006msgstr "以用户可读的格式显示大小"
ef317cd5 5007
220c313c 5008#: builtin/describe.c:17
814ff314
JX
5009msgid "git describe [<options>] [<commit-ish>...]"
5010msgstr "git describe [<选项>] [<提交号>...]"
ef317cd5 5011
220c313c 5012#: builtin/describe.c:18
814ff314
JX
5013msgid "git describe [<options>] --dirty"
5014msgstr "git describe [<选项>] --dirty"
ef317cd5 5015
220c313c 5016#: builtin/describe.c:217
c04f5ac3
JX
5017#, c-format
5018msgid "annotated tag %s not available"
55a16ee4 5019msgstr "附注标签 %s 无效"
c04f5ac3 5020
220c313c 5021#: builtin/describe.c:221
c04f5ac3
JX
5022#, c-format
5023msgid "annotated tag %s has no embedded name"
55a16ee4 5024msgstr "附注标签 %s 没有嵌入名称"
c04f5ac3 5025
220c313c 5026#: builtin/describe.c:223
c04f5ac3
JX
5027#, c-format
5028msgid "tag '%s' is really '%s' here"
55a16ee4 5029msgstr "标签 '%s' 的确是在 '%s'"
c04f5ac3 5030
220c313c 5031#: builtin/describe.c:250 builtin/log.c:452
c04f5ac3
JX
5032#, c-format
5033msgid "Not a valid object name %s"
5034msgstr "不是一个有效的对象名 %s"
5035
220c313c 5036#: builtin/describe.c:253
c04f5ac3
JX
5037#, c-format
5038msgid "%s is not a valid '%s' object"
5039msgstr "%s 不是一个有效的 '%s' 对象"
5040
220c313c 5041#: builtin/describe.c:270
c04f5ac3
JX
5042#, c-format
5043msgid "no tag exactly matches '%s'"
55a16ee4 5044msgstr "没有标签准确匹配 '%s'"
c04f5ac3 5045
220c313c 5046#: builtin/describe.c:272
c04f5ac3
JX
5047#, c-format
5048msgid "searching to describe %s\n"
5049msgstr "搜索描述 %s\n"
5050
220c313c 5051#: builtin/describe.c:319
c04f5ac3
JX
5052#, c-format
5053msgid "finished search at %s\n"
5054msgstr "完成搜索 %s\n"
5055
220c313c 5056#: builtin/describe.c:346
c04f5ac3
JX
5057#, c-format
5058msgid ""
5059"No annotated tags can describe '%s'.\n"
5060"However, there were unannotated tags: try --tags."
5061msgstr ""
55a16ee4
RC
5062"没有附注标签能描述 '%s'。\n"
5063"然而,存在未附注标签:尝试 --tags。"
c04f5ac3 5064
220c313c 5065#: builtin/describe.c:350
c04f5ac3
JX
5066#, c-format
5067msgid ""
5068"No tags can describe '%s'.\n"
5069"Try --always, or create some tags."
5070msgstr ""
55a16ee4
RC
5071"没有标签能描述 '%s'。\n"
5072"尝试 --always,或者创建一些标签。"
c04f5ac3 5073
220c313c 5074#: builtin/describe.c:371
c04f5ac3
JX
5075#, c-format
5076msgid "traversed %lu commits\n"
5077msgstr "已遍历 %lu 个提交\n"
5078
220c313c 5079#: builtin/describe.c:374
c04f5ac3
JX
5080#, c-format
5081msgid ""
5082"more than %i tags found; listed %i most recent\n"
5083"gave up search at %s\n"
5084msgstr ""
55a16ee4 5085"发现多于 %i 个标签,列出最近的 %i 个\n"
90e6ef53 5086"在 %s 放弃搜索\n"
c04f5ac3 5087
220c313c 5088#: builtin/describe.c:396
ef317cd5 5089msgid "find the tag that comes after the commit"
55a16ee4 5090msgstr "寻找该提交之后的标签"
ef317cd5 5091
220c313c 5092#: builtin/describe.c:397
ef317cd5 5093msgid "debug search strategy on stderr"
07432cef 5094msgstr "在标准错误上调试搜索策略"
ef317cd5 5095
220c313c 5096#: builtin/describe.c:398
1003b3a5
JX
5097msgid "use any ref"
5098msgstr "使用任意引用"
5099
220c313c 5100#: builtin/describe.c:399
1003b3a5 5101msgid "use any tag, even unannotated"
55a16ee4 5102msgstr "使用任意标签,即使未附带注释"
ef317cd5 5103
220c313c 5104#: builtin/describe.c:400
ef317cd5 5105msgid "always use long format"
07432cef 5106msgstr "始终使用长提交号格式"
ef317cd5 5107
220c313c 5108#: builtin/describe.c:401
2e8451e8
JX
5109msgid "only follow first parent"
5110msgstr "只跟随第一个父提交"
5111
220c313c 5112#: builtin/describe.c:404
ef317cd5 5113msgid "only output exact matches"
07432cef 5114msgstr "只输出精确匹配"
ef317cd5 5115
220c313c 5116#: builtin/describe.c:406
ef317cd5 5117msgid "consider <n> most recent tags (default: 10)"
55a16ee4 5118msgstr "考虑最近 <n> 个标签(默认:10)"
ef317cd5 5119
220c313c 5120#: builtin/describe.c:408
ef317cd5 5121msgid "only consider tags matching <pattern>"
55a16ee4 5122msgstr "只考虑匹配 <模式> 的标签"
ef317cd5 5123
220c313c 5124#: builtin/describe.c:410 builtin/name-rev.c:318
ef317cd5 5125msgid "show abbreviated commit object as fallback"
07432cef 5126msgstr "显示简写的提交号作为后备"
ef317cd5 5127
220c313c 5128#: builtin/describe.c:411
ef317cd5 5129msgid "mark"
07432cef 5130msgstr "标记"
ef317cd5 5131
220c313c 5132#: builtin/describe.c:412
ef317cd5 5133msgid "append <mark> on dirty working tree (default: \"-dirty\")"
07432cef 5134msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
ef317cd5 5135
220c313c 5136#: builtin/describe.c:430
c04f5ac3
JX
5137msgid "--long is incompatible with --abbrev=0"
5138msgstr "--long 与 --abbrev=0 不兼容"
5139
220c313c 5140#: builtin/describe.c:456
c04f5ac3 5141msgid "No names found, cannot describe anything."
90e6ef53 5142msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 5143
220c313c 5144#: builtin/describe.c:476
a8a5406a 5145msgid "--dirty is incompatible with commit-ishes"
649900bc 5146msgstr "--dirty 不能与提交同时使用"
c04f5ac3 5147
220c313c 5148#: builtin/diff.c:86
c04f5ac3
JX
5149#, c-format
5150msgid "'%s': not a regular file or symlink"
5151msgstr "'%s':不是一个正规文件或符号链接"
5152
220c313c 5153#: builtin/diff.c:237
c04f5ac3
JX
5154#, c-format
5155msgid "invalid option: %s"
5156msgstr "无效选项:%s"
5157
220c313c 5158#: builtin/diff.c:358
c04f5ac3
JX
5159msgid "Not a git repository"
5160msgstr "不是一个 git 版本库"
5161
220c313c 5162#: builtin/diff.c:401
c04f5ac3
JX
5163#, c-format
5164msgid "invalid object '%s' given."
5165msgstr "提供了无效对象 '%s'。"
5166
220c313c 5167#: builtin/diff.c:410
c04f5ac3
JX
5168#, c-format
5169msgid "more than two blobs given: '%s'"
07432cef 5170msgstr "提供了超过两个数据(blob)对象:'%s'"
c04f5ac3 5171
220c313c 5172#: builtin/diff.c:417
c04f5ac3
JX
5173#, c-format
5174msgid "unhandled object '%s' given."
6c94aba5 5175msgstr "无法处理的对象 '%s'。"
c04f5ac3 5176
220c313c 5177#: builtin/fast-export.c:24
ef317cd5 5178msgid "git fast-export [rev-list-opts]"
07432cef 5179msgstr "git fast-export [rev-list-opts]"
ef317cd5 5180
220c313c 5181#: builtin/fast-export.c:979
ef317cd5 5182msgid "show progress after <n> objects"
07432cef 5183msgstr "在 <n> 个对象之后显示进度"
ef317cd5 5184
220c313c 5185#: builtin/fast-export.c:981
ef317cd5 5186msgid "select handling of signed tags"
55a16ee4 5187msgstr "选择如何处理签名标签"
ef317cd5 5188
220c313c 5189#: builtin/fast-export.c:984
ef317cd5 5190msgid "select handling of tags that tag filtered objects"
55a16ee4 5191msgstr "选择当标签指向被过滤对象时该标签的处理方式"
ef317cd5 5192
220c313c 5193#: builtin/fast-export.c:987
ef317cd5 5194msgid "Dump marks to this file"
07432cef 5195msgstr "把标记存储到这个文件"
ef317cd5 5196
220c313c 5197#: builtin/fast-export.c:989
ef317cd5 5198msgid "Import marks from this file"
07432cef 5199msgstr "从这个文件导入标记"
ef317cd5 5200
220c313c 5201#: builtin/fast-export.c:991
ef317cd5 5202msgid "Fake a tagger when tags lack one"
55a16ee4 5203msgstr "当标签缺少标记者字段时,假装提供一个"
ef317cd5 5204
220c313c 5205#: builtin/fast-export.c:993
ef317cd5 5206msgid "Output full tree for each commit"
07432cef 5207msgstr "每次提交都输出整个树"
ef317cd5 5208
220c313c 5209#: builtin/fast-export.c:995
ef317cd5 5210msgid "Use the done feature to terminate the stream"
07432cef 5211msgstr "使用 done 功能来终止流"
ef317cd5 5212
220c313c 5213#: builtin/fast-export.c:996
ef317cd5 5214msgid "Skip output of blob data"
07432cef 5215msgstr "跳过数据对象的输出"
ef317cd5 5216
220c313c 5217#: builtin/fast-export.c:997
6acbf033
JX
5218msgid "refspec"
5219msgstr "引用表达式"
5220
220c313c 5221#: builtin/fast-export.c:998
6acbf033
JX
5222msgid "Apply refspec to exported refs"
5223msgstr "对导出的引用应用引用表达式"
5224
220c313c
JX
5225#: builtin/fast-export.c:999
5226msgid "anonymize output"
5227msgstr "匿名输出"
5228
814ff314 5229#: builtin/fetch.c:19
ef317cd5 5230msgid "git fetch [<options>] [<repository> [<refspec>...]]"
90314792 5231msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
ef317cd5 5232
814ff314 5233#: builtin/fetch.c:20
ef317cd5 5234msgid "git fetch [<options>] <group>"
07432cef 5235msgstr "git fetch [<选项>] <组>"
ef317cd5 5236
814ff314 5237#: builtin/fetch.c:21
ef317cd5 5238msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
07432cef 5239msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
ef317cd5 5240
814ff314 5241#: builtin/fetch.c:22
ef317cd5 5242msgid "git fetch --all [<options>]"
07432cef 5243msgstr "git fetch --all [<选项>]"
ef317cd5 5244
814ff314 5245#: builtin/fetch.c:89
ef317cd5 5246msgid "fetch from all remotes"
07432cef 5247msgstr "从所有的远程抓取"
ef317cd5 5248
814ff314 5249#: builtin/fetch.c:91
ef317cd5 5250msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 5251msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 5252
814ff314 5253#: builtin/fetch.c:93
ef317cd5 5254msgid "path to upload pack on remote end"
07432cef 5255msgstr "上传包到远程的路径"
ef317cd5 5256
814ff314 5257#: builtin/fetch.c:94
ef317cd5 5258msgid "force overwrite of local branch"
07432cef 5259msgstr "强制覆盖本地分支"
ef317cd5 5260
814ff314 5261#: builtin/fetch.c:96
ef317cd5 5262msgid "fetch from multiple remotes"
07432cef 5263msgstr "从多个远程抓取"
ef317cd5 5264
814ff314 5265#: builtin/fetch.c:98
ef317cd5 5266msgid "fetch all tags and associated objects"
55a16ee4 5267msgstr "抓取所有的标签和关联对象"
ef317cd5 5268
814ff314 5269#: builtin/fetch.c:100
ef317cd5 5270msgid "do not fetch all tags (--no-tags)"
55a16ee4 5271msgstr "不抓取任何标签(--no-tags)"
ef317cd5 5272
814ff314 5273#: builtin/fetch.c:102
ef317cd5 5274msgid "prune remote-tracking branches no longer on remote"
07432cef 5275msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 5276
07432cef 5277# 译者:可选值,不能翻译
814ff314 5278#: builtin/fetch.c:103
ef317cd5 5279msgid "on-demand"
07432cef 5280msgstr "on-demand"
ef317cd5 5281
814ff314 5282#: builtin/fetch.c:104
ef317cd5 5283msgid "control recursive fetching of submodules"
07432cef 5284msgstr "控制子模组的递归抓取"
ef317cd5 5285
814ff314 5286#: builtin/fetch.c:108
ef317cd5 5287msgid "keep downloaded pack"
07432cef 5288msgstr "保持下载包"
ef317cd5 5289
814ff314 5290#: builtin/fetch.c:110
ef317cd5 5291msgid "allow updating of HEAD ref"
07432cef 5292msgstr "允许更新 HEAD 引用"
ef317cd5 5293
814ff314 5294#: builtin/fetch.c:113
ef317cd5 5295msgid "deepen history of shallow clone"
07432cef 5296msgstr "深化浅克隆的历史"
ef317cd5 5297
814ff314 5298#: builtin/fetch.c:115
a77c07d9
JX
5299msgid "convert to a complete repository"
5300msgstr "转换为一个完整的版本库"
5301
814ff314 5302#: builtin/fetch.c:117 builtin/log.c:1208
ef317cd5 5303msgid "dir"
07432cef 5304msgstr "目录"
ef317cd5 5305
814ff314 5306#: builtin/fetch.c:118
ef317cd5 5307msgid "prepend this to submodule path output"
07432cef 5308msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 5309
814ff314 5310#: builtin/fetch.c:121
ef317cd5 5311msgid "default mode for recursion"
07432cef 5312msgstr "递归的默认模式"
ef317cd5 5313
814ff314 5314#: builtin/fetch.c:123
cfff71a9
JX
5315msgid "accept refs that update .git/shallow"
5316msgstr "接受更新 .git/shallow 的引用"
5317
814ff314 5318#: builtin/fetch.c:124
6acbf033
JX
5319msgid "refmap"
5320msgstr "引用映射"
5321
814ff314 5322#: builtin/fetch.c:125
6acbf033
JX
5323msgid "specify fetch refmap"
5324msgstr "指定获取操作的引用映射"
5325
7aea43ff 5326#: builtin/fetch.c:377
c04f5ac3
JX
5327msgid "Couldn't find remote ref HEAD"
5328msgstr "无法发现远程 HEAD 引用"
5329
7aea43ff 5330#: builtin/fetch.c:457
c04f5ac3
JX
5331#, c-format
5332msgid "object %s not found"
5333msgstr "对象 %s 未发现"
5334
7aea43ff 5335#: builtin/fetch.c:462
c04f5ac3
JX
5336msgid "[up to date]"
5337msgstr "[最新]"
5338
7aea43ff 5339#: builtin/fetch.c:476
c04f5ac3
JX
5340#, c-format
5341msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5342msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5343
7aea43ff 5344#: builtin/fetch.c:477 builtin/fetch.c:563
c04f5ac3
JX
5345msgid "[rejected]"
5346msgstr "[已拒绝]"
5347
7aea43ff 5348#: builtin/fetch.c:488
c04f5ac3 5349msgid "[tag update]"
55a16ee4 5350msgstr "[标签更新]"
c04f5ac3 5351
90e6ef53 5352# 译者:注意保持前导空格
7aea43ff 5353#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543
c04f5ac3
JX
5354msgid " (unable to update local ref)"
5355msgstr " (不能更新本地引用)"
5356
7aea43ff 5357#: builtin/fetch.c:508
c04f5ac3 5358msgid "[new tag]"
55a16ee4 5359msgstr "[新标签]"
c04f5ac3 5360
7aea43ff 5361#: builtin/fetch.c:511
c04f5ac3
JX
5362msgid "[new branch]"
5363msgstr "[新分支]"
5364
7aea43ff 5365#: builtin/fetch.c:514
170e9899
JX
5366msgid "[new ref]"
5367msgstr "[新引用]"
5368
7aea43ff 5369#: builtin/fetch.c:559
c04f5ac3
JX
5370msgid "unable to update local ref"
5371msgstr "不能更新本地引用"
5372
7aea43ff 5373#: builtin/fetch.c:559
c04f5ac3
JX
5374msgid "forced update"
5375msgstr "强制更新"
5376
7aea43ff 5377#: builtin/fetch.c:565
c04f5ac3 5378msgid "(non-fast-forward)"
90e6ef53 5379msgstr "(非快进式)"
c04f5ac3 5380
7aea43ff 5381#: builtin/fetch.c:599 builtin/fetch.c:832
c04f5ac3
JX
5382#, c-format
5383msgid "cannot open %s: %s\n"
5384msgstr "无法打开 %s:%s\n"
5385
7aea43ff 5386#: builtin/fetch.c:608
c04f5ac3
JX
5387#, c-format
5388msgid "%s did not send all necessary objects\n"
5389msgstr "%s 未发送所有必须的对象\n"
5390
7aea43ff 5391#: builtin/fetch.c:626
cfff71a9
JX
5392#, c-format
5393msgid "reject %s because shallow roots are not allowed to be updated"
5394msgstr "拒绝 %s 因为浅克隆不允许被更新"
5395
7aea43ff 5396#: builtin/fetch.c:714 builtin/fetch.c:797
c04f5ac3
JX
5397#, c-format
5398msgid "From %.*s\n"
5399msgstr "来自 %.*s\n"
5400
7aea43ff 5401#: builtin/fetch.c:725
c04f5ac3
JX
5402#, c-format
5403msgid ""
5404"some local refs could not be updated; try running\n"
5405" 'git remote prune %s' to remove any old, conflicting branches"
5406msgstr ""
5407"一些本地引用不能被更新;尝试运行\n"
5408" 'git remote prune %s' 来删除旧的、有冲突的分支"
5409
90e6ef53 5410# 译者:注意保持前导空格
7aea43ff 5411#: builtin/fetch.c:777
81809b99 5412#, c-format
8ada9598 5413msgid " (%s will become dangling)"
07432cef 5414msgstr " (%s 将成为摇摆状态)"
c04f5ac3 5415
90e6ef53 5416# 译者:注意保持前导空格
7aea43ff 5417#: builtin/fetch.c:778
81809b99 5418#, c-format
8ada9598 5419msgid " (%s has become dangling)"
07432cef 5420msgstr " (%s 已成为摇摆状态)"
c04f5ac3 5421
7aea43ff 5422#: builtin/fetch.c:802
c04f5ac3
JX
5423msgid "[deleted]"
5424msgstr "[已删除]"
5425
7aea43ff 5426#: builtin/fetch.c:803 builtin/remote.c:1057
c04f5ac3
JX
5427msgid "(none)"
5428msgstr "(无)"
5429
7aea43ff 5430#: builtin/fetch.c:822
c04f5ac3
JX
5431#, c-format
5432msgid "Refusing to fetch into current branch %s of non-bare repository"
220c313c 5433msgstr "拒绝获取到非纯版本库的当前分支 %s"
c04f5ac3 5434
7aea43ff 5435#: builtin/fetch.c:841
c04f5ac3
JX
5436#, c-format
5437msgid "Option \"%s\" value \"%s\" is not valid for %s"
5438msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5439
7aea43ff 5440#: builtin/fetch.c:844
c04f5ac3
JX
5441#, c-format
5442msgid "Option \"%s\" is ignored for %s\n"
81809b99 5443msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 5444
7aea43ff 5445#: builtin/fetch.c:900
90314792
JX
5446#, c-format
5447msgid "Don't know how to fetch from %s"
5448msgstr "不知道如何从 %s 获取"
5449
7aea43ff 5450#: builtin/fetch.c:1063
c04f5ac3
JX
5451#, c-format
5452msgid "Fetching %s\n"
d4a8e00b 5453msgstr "正在获取 %s\n"
c04f5ac3 5454
7aea43ff 5455#: builtin/fetch.c:1065 builtin/remote.c:90
c04f5ac3
JX
5456#, c-format
5457msgid "Could not fetch %s"
5458msgstr "不能获取 %s"
5459
7aea43ff 5460#: builtin/fetch.c:1083
c04f5ac3
JX
5461msgid ""
5462"No remote repository specified. Please, specify either a URL or a\n"
5463"remote name from which new revisions should be fetched."
90e6ef53 5464msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
c04f5ac3 5465
7aea43ff 5466#: builtin/fetch.c:1106
c04f5ac3 5467msgid "You need to specify a tag name."
55a16ee4 5468msgstr "您需要指定一个标签名称。"
c04f5ac3 5469
7aea43ff 5470#: builtin/fetch.c:1148
a77c07d9
JX
5471msgid "--depth and --unshallow cannot be used together"
5472msgstr "--depth 和 --unshallow 不能同时使用"
5473
7aea43ff 5474#: builtin/fetch.c:1150
a77c07d9
JX
5475msgid "--unshallow on a complete repository does not make sense"
5476msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
5477
7aea43ff 5478#: builtin/fetch.c:1173
c04f5ac3
JX
5479msgid "fetch --all does not take a repository argument"
5480msgstr "fetch --all 不能带一个版本库参数"
5481
7aea43ff 5482#: builtin/fetch.c:1175
c04f5ac3 5483msgid "fetch --all does not make sense with refspecs"
90314792 5484msgstr "fetch --all 带引用规则没有任何意义"
c04f5ac3 5485
7aea43ff 5486#: builtin/fetch.c:1186
c04f5ac3
JX
5487#, c-format
5488msgid "No such remote or remote group: %s"
5489msgstr "没有这样的远程或远程组:%s"
5490
7aea43ff 5491#: builtin/fetch.c:1194
c04f5ac3 5492msgid "Fetching a group and specifying refspecs does not make sense"
90314792 5493msgstr "获取组并指定引用规则没有意义"
c04f5ac3 5494
ef317cd5 5495#: builtin/fmt-merge-msg.c:13
814ff314
JX
5496msgid ""
5497"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
5498msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
c04f5ac3 5499
7aea43ff 5500#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698
04cb2f28 5501#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
7aea43ff
JX
5502#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590
5503#: parse-options.h:131 parse-options.h:238
ef317cd5 5504msgid "n"
07432cef 5505msgstr "n"
c04f5ac3 5506
7aea43ff 5507#: builtin/fmt-merge-msg.c:669
ef317cd5 5508msgid "populate log with at most <n> entries from shortlog"
07432cef 5509msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 5510
7aea43ff 5511#: builtin/fmt-merge-msg.c:672
ef317cd5 5512msgid "alias for --log (deprecated)"
07432cef 5513msgstr "参数 --log 的别名(已弃用)"
ef317cd5 5514
7aea43ff 5515#: builtin/fmt-merge-msg.c:675
ef317cd5 5516msgid "text"
07432cef 5517msgstr "文本"
ef317cd5 5518
7aea43ff 5519#: builtin/fmt-merge-msg.c:676
ef317cd5 5520msgid "use <text> as start of message"
07432cef 5521msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 5522
7aea43ff 5523#: builtin/fmt-merge-msg.c:677
ef317cd5 5524msgid "file to read from"
07432cef 5525msgstr "从文件中读取"
ef317cd5 5526
7aea43ff 5527#: builtin/for-each-ref.c:687
220c313c
JX
5528msgid "unable to parse format"
5529msgstr "不能解析格式"
5530
7aea43ff 5531#: builtin/for-each-ref.c:1083
814ff314
JX
5532msgid "git for-each-ref [<options>] [<pattern>]"
5533msgstr "git for-each-ref [<选项>] [<模式>]"
ef317cd5 5534
7aea43ff 5535#: builtin/for-each-ref.c:1098
ef317cd5 5536msgid "quote placeholders suitably for shells"
07432cef 5537msgstr "引用占位符适用于 shells"
ef317cd5 5538
7aea43ff 5539#: builtin/for-each-ref.c:1100
ef317cd5 5540msgid "quote placeholders suitably for perl"
07432cef 5541msgstr "引用占位符适用于 perl"
ef317cd5 5542
7aea43ff 5543#: builtin/for-each-ref.c:1102
ef317cd5 5544msgid "quote placeholders suitably for python"
07432cef 5545msgstr "引用占位符适用于 python"
ef317cd5 5546
7aea43ff 5547#: builtin/for-each-ref.c:1104
04cb2f28
JX
5548msgid "quote placeholders suitably for Tcl"
5549msgstr "引用占位符适用于 Tcl"
ef317cd5 5550
7aea43ff 5551#: builtin/for-each-ref.c:1107
ef317cd5 5552msgid "show only <n> matched refs"
07432cef 5553msgstr "只显示 <n> 个匹配的引用"
ef317cd5 5554
7aea43ff 5555#: builtin/for-each-ref.c:1108 builtin/replace.c:438
ef317cd5 5556msgid "format"
07432cef 5557msgstr "格式"
ef317cd5 5558
7aea43ff 5559#: builtin/for-each-ref.c:1108
ef317cd5 5560msgid "format to use for the output"
07432cef 5561msgstr "输出格式"
ef317cd5 5562
7aea43ff 5563#: builtin/for-each-ref.c:1109
ef317cd5 5564msgid "key"
07432cef 5565msgstr "key"
ef317cd5 5566
7aea43ff 5567#: builtin/for-each-ref.c:1110
ef317cd5 5568msgid "field name to sort on"
07432cef 5569msgstr "排序的字段名"
ef317cd5 5570
5bb01d4f 5571#: builtin/fsck.c:147 builtin/prune.c:137
6c94aba5
JX
5572msgid "Checking connectivity"
5573msgstr "检查连接中"
5574
7aea43ff 5575#: builtin/fsck.c:548
6c94aba5
JX
5576msgid "Checking object directories"
5577msgstr "检查对象目录中"
5578
7aea43ff 5579#: builtin/fsck.c:611
814ff314
JX
5580msgid "git fsck [<options>] [<object>...]"
5581msgstr "git fsck [<选项>] [<对象>...]"
ef317cd5 5582
7aea43ff 5583#: builtin/fsck.c:617
ef317cd5 5584msgid "show unreachable objects"
07432cef 5585msgstr "显示不可达的对象"
ef317cd5 5586
7aea43ff 5587#: builtin/fsck.c:618
ef317cd5 5588msgid "show dangling objects"
07432cef 5589msgstr "显示摇摆的对象"
ef317cd5 5590
7aea43ff 5591#: builtin/fsck.c:619
ef317cd5 5592msgid "report tags"
55a16ee4 5593msgstr "报告标签"
ef317cd5 5594
7aea43ff 5595#: builtin/fsck.c:620
ef317cd5 5596msgid "report root nodes"
07432cef 5597msgstr "报告根节点"
ef317cd5 5598
7aea43ff 5599#: builtin/fsck.c:621
ef317cd5 5600msgid "make index objects head nodes"
07432cef 5601msgstr "将索引亦作为检查的头节点"
ef317cd5 5602
7aea43ff 5603#: builtin/fsck.c:622
ef317cd5 5604msgid "make reflogs head nodes (default)"
07432cef 5605msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 5606
7aea43ff 5607#: builtin/fsck.c:623
ef317cd5 5608msgid "also consider packs and alternate objects"
07432cef 5609msgstr "也考虑包和备用对象"
ef317cd5 5610
7aea43ff 5611#: builtin/fsck.c:624
ef317cd5 5612msgid "enable more strict checking"
07432cef 5613msgstr "启用更严格的检查"
ef317cd5 5614
7aea43ff 5615#: builtin/fsck.c:626
ef317cd5 5616msgid "write dangling objects in .git/lost-found"
07432cef 5617msgstr "将摇摆对象写入 .git/lost-found 中"
ef317cd5 5618
5bb01d4f 5619#: builtin/fsck.c:627 builtin/prune.c:107
ef317cd5 5620msgid "show progress"
07432cef 5621msgstr "显示进度"
ef317cd5 5622
7aea43ff 5623#: builtin/fsck.c:677
6c94aba5
JX
5624msgid "Checking objects"
5625msgstr "检查对象中"
5626
cfff71a9 5627#: builtin/gc.c:24
814ff314
JX
5628msgid "git gc [<options>]"
5629msgstr "git gc [<选项>]"
ef317cd5 5630
7aea43ff 5631#: builtin/gc.c:67
c04f5ac3 5632#, c-format
7aea43ff
JX
5633msgid "Invalid %s: '%s'"
5634msgstr "无效 %s:'%s'"
c04f5ac3 5635
7aea43ff 5636#: builtin/gc.c:112
c04f5ac3
JX
5637#, c-format
5638msgid "insanely long object directory %.*s"
5639msgstr "不正常的长对象目录 %.*s"
5640
7aea43ff 5641#: builtin/gc.c:281
ef317cd5 5642msgid "prune unreferenced objects"
07432cef 5643msgstr "清除未引用的对象"
ef317cd5 5644
7aea43ff 5645#: builtin/gc.c:283
ef317cd5 5646msgid "be more thorough (increased runtime)"
07432cef 5647msgstr "更彻底(增加运行时间)"
ef317cd5 5648
7aea43ff 5649#: builtin/gc.c:284
ef317cd5 5650msgid "enable auto-gc mode"
07432cef 5651msgstr "启用自动垃圾回收模式"
ef317cd5 5652
7aea43ff 5653#: builtin/gc.c:285
90314792
JX
5654msgid "force running gc even if there may be another gc running"
5655msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5656
7aea43ff 5657#: builtin/gc.c:327
c04f5ac3 5658#, c-format
6c94aba5
JX
5659msgid "Auto packing the repository in background for optimum performance.\n"
5660msgstr "自动在后台执行版本库打包以求最佳性能。\n"
5661
7aea43ff 5662#: builtin/gc.c:329
6c94aba5
JX
5663#, c-format
5664msgid "Auto packing the repository for optimum performance.\n"
5665msgstr "自动打包版本库以求最佳性能。\n"
5666
7aea43ff 5667#: builtin/gc.c:330
6c94aba5
JX
5668#, c-format
5669msgid "See \"git help gc\" for manual housekeeping.\n"
5670msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 5671
7aea43ff 5672#: builtin/gc.c:348
90314792
JX
5673#, c-format
5674msgid ""
5675"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5676msgstr ""
5677"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5678
7aea43ff 5679#: builtin/gc.c:376
c04f5ac3
JX
5680msgid ""
5681"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 5682msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 5683
90314792 5684#: builtin/grep.c:23
814ff314
JX
5685msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
5686msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
ef317cd5 5687
90314792 5688#: builtin/grep.c:218
c04f5ac3
JX
5689#, c-format
5690msgid "grep: failed to create thread: %s"
90e6ef53 5691msgstr "grep:无法创建线程:%s"
c04f5ac3 5692
6acbf033 5693#: builtin/grep.c:441 builtin/grep.c:476
c04f5ac3
JX
5694#, c-format
5695msgid "unable to read tree (%s)"
90e6ef53 5696msgstr "无法读取树(%s)"
c04f5ac3 5697
6acbf033 5698#: builtin/grep.c:491
c04f5ac3
JX
5699#, c-format
5700msgid "unable to grep from object of type %s"
5701msgstr "无法抓取来自于 %s 类型的对象"
5702
6acbf033 5703#: builtin/grep.c:547
c04f5ac3
JX
5704#, c-format
5705msgid "switch `%c' expects a numerical value"
5706msgstr "开关 `%c' 期望一个数字值"
5707
6acbf033 5708#: builtin/grep.c:564
c04f5ac3
JX
5709#, c-format
5710msgid "cannot open '%s'"
5711msgstr "不能打开 '%s'"
5712
6acbf033 5713#: builtin/grep.c:638
ef317cd5 5714msgid "search in index instead of in the work tree"
07432cef 5715msgstr "在索引区搜索而不是在工作区"
ef317cd5 5716
6acbf033 5717#: builtin/grep.c:640
ef317cd5 5718msgid "find in contents not managed by git"
07432cef 5719msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
5720
5721# 译者:中文字符串拼接,可删除前导空格
6acbf033 5722#: builtin/grep.c:642
ef317cd5 5723msgid "search in both tracked and untracked files"
07432cef 5724msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 5725
6acbf033 5726#: builtin/grep.c:644
814ff314
JX
5727msgid "ignore files specified via '.gitignore'"
5728msgstr "忽略 '.gitignore' 包含的文件"
ef317cd5 5729
6acbf033 5730#: builtin/grep.c:647
ef317cd5 5731msgid "show non-matching lines"
07432cef 5732msgstr "显示未匹配的行"
ef317cd5 5733
6acbf033 5734#: builtin/grep.c:649
ef317cd5 5735msgid "case insensitive matching"
07432cef 5736msgstr "不区分大小写匹配"
ef317cd5 5737
6acbf033 5738#: builtin/grep.c:651
ef317cd5 5739msgid "match patterns only at word boundaries"
07432cef 5740msgstr "只在单词边界匹配模式"
ef317cd5 5741
6acbf033 5742#: builtin/grep.c:653
ef317cd5 5743msgid "process binary files as text"
07432cef 5744msgstr "把二进制文件当做文本处理"
ef317cd5 5745
6acbf033 5746#: builtin/grep.c:655
ef317cd5 5747msgid "don't match patterns in binary files"
07432cef 5748msgstr "不在二进制文件中匹配模式"
ef317cd5 5749
6acbf033 5750#: builtin/grep.c:658
90314792
JX
5751msgid "process binary files with textconv filters"
5752msgstr "用 textconv 过滤器处理二进制文件"
5753
6acbf033 5754#: builtin/grep.c:660
ef317cd5 5755msgid "descend at most <depth> levels"
07432cef 5756msgstr "最多以指定的深度向下寻找"
ef317cd5 5757
6acbf033 5758#: builtin/grep.c:664
ef317cd5 5759msgid "use extended POSIX regular expressions"
07432cef 5760msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 5761
6acbf033 5762#: builtin/grep.c:667
ef317cd5 5763msgid "use basic POSIX regular expressions (default)"
07432cef 5764msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 5765
6acbf033 5766#: builtin/grep.c:670
ef317cd5 5767msgid "interpret patterns as fixed strings"
07432cef 5768msgstr "把模式解析为固定的字符串"
ef317cd5 5769
6acbf033 5770#: builtin/grep.c:673
ef317cd5 5771msgid "use Perl-compatible regular expressions"
07432cef 5772msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 5773
6acbf033 5774#: builtin/grep.c:676
ef317cd5 5775msgid "show line numbers"
07432cef 5776msgstr "显示行号"
ef317cd5 5777
6acbf033 5778#: builtin/grep.c:677
ef317cd5 5779msgid "don't show filenames"
07432cef 5780msgstr "不显示文件名"
ef317cd5 5781
6acbf033 5782#: builtin/grep.c:678
ef317cd5 5783msgid "show filenames"
07432cef 5784msgstr "显示文件名"
ef317cd5 5785
6acbf033 5786#: builtin/grep.c:680
ef317cd5 5787msgid "show filenames relative to top directory"
07432cef 5788msgstr "显示相对于顶级目录的文件名"
ef317cd5 5789
6acbf033 5790#: builtin/grep.c:682
ef317cd5 5791msgid "show only filenames instead of matching lines"
07432cef 5792msgstr "只显示文件名而不显示匹配的行"
ef317cd5 5793
6acbf033 5794#: builtin/grep.c:684
ef317cd5 5795msgid "synonym for --files-with-matches"
07432cef 5796msgstr "和 --files-with-matches 同义"
ef317cd5 5797
6acbf033 5798#: builtin/grep.c:687
ef317cd5 5799msgid "show only the names of files without match"
07432cef 5800msgstr "只显示未匹配的文件名"
ef317cd5 5801
6acbf033 5802#: builtin/grep.c:689
ef317cd5 5803msgid "print NUL after filenames"
07432cef 5804msgstr "在文件名后输出 NUL 字符"
ef317cd5 5805
6acbf033 5806#: builtin/grep.c:691
ef317cd5 5807msgid "show the number of matches instead of matching lines"
07432cef 5808msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 5809
6acbf033 5810#: builtin/grep.c:692
ef317cd5 5811msgid "highlight matches"
07432cef 5812msgstr "高亮显示匹配项"
ef317cd5 5813
6acbf033 5814#: builtin/grep.c:694
ef317cd5 5815msgid "print empty line between matches from different files"
07432cef 5816msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 5817
6acbf033 5818#: builtin/grep.c:696
ef317cd5 5819msgid "show filename only once above matches from same file"
07432cef 5820msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 5821
6acbf033 5822#: builtin/grep.c:699
ef317cd5 5823msgid "show <n> context lines before and after matches"
07432cef 5824msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 5825
6acbf033 5826#: builtin/grep.c:702
ef317cd5 5827msgid "show <n> context lines before matches"
07432cef 5828msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 5829
6acbf033 5830#: builtin/grep.c:704
ef317cd5 5831msgid "show <n> context lines after matches"
07432cef 5832msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 5833
6acbf033 5834#: builtin/grep.c:705
ef317cd5 5835msgid "shortcut for -C NUM"
07432cef 5836msgstr "快捷键 -C 数字"
ef317cd5 5837
6acbf033 5838#: builtin/grep.c:708
ef317cd5 5839msgid "show a line with the function name before matches"
07432cef 5840msgstr "在匹配的前面显示一行函数名"
ef317cd5 5841
6acbf033 5842#: builtin/grep.c:710
ef317cd5 5843msgid "show the surrounding function"
07432cef 5844msgstr "显示所在函数的前后内容"
ef317cd5 5845
6acbf033 5846#: builtin/grep.c:713
ef317cd5 5847msgid "read patterns from file"
07432cef 5848msgstr "从文件读取模式"
ef317cd5 5849
6acbf033 5850#: builtin/grep.c:715
ef317cd5 5851msgid "match <pattern>"
07432cef 5852msgstr "匹配 <模式>"
ef317cd5 5853
6acbf033 5854#: builtin/grep.c:717
ef317cd5 5855msgid "combine patterns specified with -e"
07432cef 5856msgstr "组合用 -e 参数设定的模式"
ef317cd5 5857
6acbf033 5858#: builtin/grep.c:729
ef317cd5 5859msgid "indicate hit with exit status without output"
07432cef 5860msgstr "不输出,而用退出码标识命中状态"
ef317cd5 5861
6acbf033 5862#: builtin/grep.c:731
ef317cd5 5863msgid "show only matches from files that match all patterns"
07432cef 5864msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 5865
6acbf033 5866#: builtin/grep.c:733
07432cef
WS
5867msgid "show parse tree for grep expression"
5868msgstr "显示 grep 表达式的解析树"
5869
6acbf033 5870#: builtin/grep.c:737
ef317cd5 5871msgid "pager"
07432cef 5872msgstr "分页"
ef317cd5 5873
6acbf033 5874#: builtin/grep.c:737
ef317cd5 5875msgid "show matching files in the pager"
07432cef 5876msgstr "分页显示匹配的文件"
ef317cd5 5877
6acbf033 5878#: builtin/grep.c:740
ef317cd5 5879msgid "allow calling of grep(1) (ignored by this build)"
07432cef 5880msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 5881
7aea43ff 5882#: builtin/grep.c:741 builtin/show-ref.c:189
ef317cd5 5883msgid "show usage"
07432cef 5884msgstr "显示用法"
ef317cd5 5885
6acbf033 5886#: builtin/grep.c:808
c04f5ac3
JX
5887msgid "no pattern given."
5888msgstr "未提供模式匹配。"
5889
6acbf033 5890#: builtin/grep.c:866
c04f5ac3
JX
5891msgid "--open-files-in-pager only works on the worktree"
5892msgstr "--open-files-in-pager 仅用于工作区"
5893
6acbf033 5894#: builtin/grep.c:892
c04f5ac3 5895msgid "--cached or --untracked cannot be used with --no-index."
649900bc 5896msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
c04f5ac3 5897
6acbf033 5898#: builtin/grep.c:897
c04f5ac3 5899msgid "--no-index or --untracked cannot be used with revs."
649900bc 5900msgstr "--no-index 或 --untracked 不能和版本同时使用。"
c04f5ac3 5901
6acbf033 5902#: builtin/grep.c:900
c04f5ac3 5903msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 5904msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 5905
6acbf033 5906#: builtin/grep.c:908
c04f5ac3
JX
5907msgid "both --cached and trees are given."
5908msgstr "同时给出了 --cached 和树对象。"
5909
7aea43ff 5910#: builtin/hash-object.c:80
ef317cd5 5911msgid ""
814ff314
JX
5912"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
5913"[--] <file>..."
ef317cd5 5914msgstr ""
814ff314
JX
5915"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
5916"[--] <文件>..."
ef317cd5 5917
7aea43ff 5918#: builtin/hash-object.c:81
ef317cd5 5919msgid "git hash-object --stdin-paths < <list-of-paths>"
07432cef 5920msgstr "git hash-object --stdin-paths < <路径列表>"
ef317cd5 5921
7aea43ff 5922#: builtin/hash-object.c:92 builtin/tag.c:612
ef317cd5 5923msgid "type"
07432cef 5924msgstr "类型"
ef317cd5 5925
7aea43ff 5926#: builtin/hash-object.c:92
ef317cd5 5927msgid "object type"
07432cef 5928msgstr "对象类型"
ef317cd5 5929
7aea43ff 5930#: builtin/hash-object.c:93
ef317cd5 5931msgid "write the object into the object database"
07432cef 5932msgstr "将对象写入对象数据库"
ef317cd5 5933
7aea43ff 5934#: builtin/hash-object.c:95
ef317cd5 5935msgid "read the object from stdin"
07432cef 5936msgstr "从标准输入读取对象"
ef317cd5 5937
7aea43ff 5938#: builtin/hash-object.c:97
ef317cd5 5939msgid "store file as is without filters"
07432cef 5940msgstr "原样存储文件不使用过滤器"
ef317cd5 5941
7aea43ff 5942#: builtin/hash-object.c:98
220c313c
JX
5943msgid ""
5944"just hash any random garbage to create corrupt objects for debugging Git"
5945msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
5946
7aea43ff 5947#: builtin/hash-object.c:99
ef317cd5 5948msgid "process file as it were from this path"
07432cef 5949msgstr "处理文件并假设其来自于此路径"
ef317cd5 5950
2e8451e8 5951#: builtin/help.c:41
ef317cd5 5952msgid "print all available commands"
07432cef 5953msgstr "打印所有可用的命令"
ef317cd5 5954
2e8451e8 5955#: builtin/help.c:42
4dcdc3d8
JX
5956msgid "print list of useful guides"
5957msgstr "显示有用的指南列表"
5958
2e8451e8 5959#: builtin/help.c:43
ef317cd5 5960msgid "show man page"
07432cef 5961msgstr "显示 man 手册"
ef317cd5 5962
2e8451e8 5963#: builtin/help.c:44
ef317cd5 5964msgid "show manual in web browser"
07432cef 5965msgstr "在 web 浏览器中显示手册"
ef317cd5 5966
2e8451e8 5967#: builtin/help.c:46
ef317cd5 5968msgid "show info page"
07432cef 5969msgstr "显示 info 手册"
ef317cd5 5970
2e8451e8 5971#: builtin/help.c:52
814ff314
JX
5972msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
5973msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
ef317cd5 5974
2e8451e8 5975#: builtin/help.c:64
81809b99 5976#, c-format
8ada9598 5977msgid "unrecognized help format '%s'"
81809b99 5978msgstr "未能识别的帮助格式 '%s'"
8ada9598 5979
220c313c 5980#: builtin/help.c:91
8ada9598 5981msgid "Failed to start emacsclient."
81809b99 5982msgstr "无法启动 emacsclient。"
8ada9598 5983
220c313c 5984#: builtin/help.c:104
8ada9598 5985msgid "Failed to parse emacsclient version."
81809b99 5986msgstr "无法解析 emacsclient 版本。"
8ada9598 5987
220c313c 5988#: builtin/help.c:112
8ada9598
JX
5989#, c-format
5990msgid "emacsclient version '%d' too old (< 22)."
07432cef 5991msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 5992
220c313c 5993#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
81809b99 5994#, c-format
8ada9598 5995msgid "failed to exec '%s': %s"
81809b99 5996msgstr "无法执行 '%s':%s"
8ada9598 5997
220c313c 5998#: builtin/help.c:215
8ada9598
JX
5999#, c-format
6000msgid ""
6001"'%s': path for unsupported man viewer.\n"
6002"Please consider using 'man.<tool>.cmd' instead."
6003msgstr ""
81809b99 6004"'%s':不支持的 man 手册查看器的路径。\n"
d9d56b23 6005"请使用 'man.<工具>.cmd'。"
8ada9598 6006
220c313c 6007#: builtin/help.c:227
8ada9598
JX
6008#, c-format
6009msgid ""
6010"'%s': cmd for supported man viewer.\n"
6011"Please consider using 'man.<tool>.path' instead."
6012msgstr ""
81809b99 6013"'%s': 支持的 man 手册查看器命令。\n"
d9d56b23 6014"请使用 'man.<工具>.path'。"
8ada9598 6015
04cb2f28 6016#: builtin/help.c:354
8ada9598
JX
6017#, c-format
6018msgid "'%s': unknown man viewer."
81809b99 6019msgstr "'%s':未知的 man 查看器。"
8ada9598 6020
04cb2f28 6021#: builtin/help.c:371
8ada9598 6022msgid "no man viewer handled the request"
81809b99 6023msgstr "没有 man 查看器处理此请求"
8ada9598 6024
04cb2f28 6025#: builtin/help.c:379
8ada9598 6026msgid "no info viewer handled the request"
81809b99 6027msgstr "没有 info 查看器处理此请求"
8ada9598 6028
04cb2f28 6029#: builtin/help.c:428
4dcdc3d8
JX
6030msgid "Defining attributes per path"
6031msgstr "定义路径的属性"
6032
04cb2f28 6033#: builtin/help.c:429
220c313c
JX
6034msgid "Everyday Git With 20 Commands Or So"
6035msgstr "每一天 Git 常用的约 20 条命令"
6036
04cb2f28 6037#: builtin/help.c:430
4dcdc3d8
JX
6038msgid "A Git glossary"
6039msgstr "Git 词汇表"
6040
04cb2f28 6041#: builtin/help.c:431
4dcdc3d8
JX
6042msgid "Specifies intentionally untracked files to ignore"
6043msgstr "忽略指定的未跟踪文件"
6044
04cb2f28 6045#: builtin/help.c:432
4dcdc3d8
JX
6046msgid "Defining submodule properties"
6047msgstr "定义子模组属性"
6048
04cb2f28 6049#: builtin/help.c:433
4dcdc3d8
JX
6050msgid "Specifying revisions and ranges for Git"
6051msgstr "指定 Git 的版本和版本范围"
6052
04cb2f28 6053#: builtin/help.c:434
4dcdc3d8
JX
6054msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6055msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
6056
04cb2f28 6057#: builtin/help.c:435
4dcdc3d8
JX
6058msgid "An overview of recommended workflows with Git"
6059msgstr "Git 推荐的工作流概览"
6060
04cb2f28 6061#: builtin/help.c:447
4dcdc3d8
JX
6062msgid "The common Git guides are:\n"
6063msgstr "最常用的 Git 向导有:\n"
6064
04cb2f28 6065#: builtin/help.c:468 builtin/help.c:485
8ada9598
JX
6066#, c-format
6067msgid "usage: %s%s"
81809b99 6068msgstr "用法:%s%s"
8ada9598 6069
04cb2f28 6070#: builtin/help.c:501
8ada9598
JX
6071#, c-format
6072msgid "`git %s' is aliased to `%s'"
81809b99 6073msgstr "`git %s' 是 `%s' 的别名"
8ada9598 6074
7aea43ff 6075#: builtin/index-pack.c:151
6acbf033
JX
6076#, c-format
6077msgid "unable to open %s"
6078msgstr "不能打开 %s"
6079
7aea43ff 6080#: builtin/index-pack.c:201
8ada9598
JX
6081#, c-format
6082msgid "object type mismatch at %s"
81809b99 6083msgstr "%s 的对象类型不匹配"
8ada9598 6084
7aea43ff 6085#: builtin/index-pack.c:221
6acbf033
JX
6086#, c-format
6087msgid "did not receive expected object %s"
6088msgstr "未能获取期望的对象 %s"
8ada9598 6089
7aea43ff 6090#: builtin/index-pack.c:224
6acbf033
JX
6091#, c-format
6092msgid "object %s: expected type %s, found %s"
6093msgstr "对象 %s:期待类型 %s,却是 %s"
6094
7aea43ff 6095#: builtin/index-pack.c:266
81809b99 6096#, c-format
8ada9598
JX
6097msgid "cannot fill %d byte"
6098msgid_plural "cannot fill %d bytes"
81809b99 6099msgstr[0] "无法填充 %d 字节"
5ae481e0 6100msgstr[1] "无法填充 %d 字节"
8ada9598 6101
7aea43ff 6102#: builtin/index-pack.c:276
8ada9598 6103msgid "early EOF"
81809b99 6104msgstr "过早的文件结束符(EOF)"
8ada9598 6105
7aea43ff 6106#: builtin/index-pack.c:277
8ada9598 6107msgid "read error on input"
81809b99 6108msgstr "输入上的读错误"
8ada9598 6109
7aea43ff 6110#: builtin/index-pack.c:289
8ada9598 6111msgid "used more bytes than were available"
81809b99 6112msgstr "用掉了超过可用的字节"
8ada9598 6113
7aea43ff 6114#: builtin/index-pack.c:296
8ada9598 6115msgid "pack too large for current definition of off_t"
81809b99 6116msgstr "包太大超过了当前 off_t 的定义"
8ada9598 6117
7aea43ff 6118#: builtin/index-pack.c:312
81809b99 6119#, c-format
8ada9598 6120msgid "unable to create '%s'"
81809b99 6121msgstr "不能创建 '%s'"
8ada9598 6122
7aea43ff 6123#: builtin/index-pack.c:317
81809b99 6124#, c-format
8ada9598 6125msgid "cannot open packfile '%s'"
81809b99 6126msgstr "无法打开包文件 '%s'"
8ada9598 6127
7aea43ff 6128#: builtin/index-pack.c:331
8ada9598 6129msgid "pack signature mismatch"
81809b99 6130msgstr "包签名不匹配"
8ada9598 6131
7aea43ff 6132#: builtin/index-pack.c:333
ef317cd5
JX
6133#, c-format
6134msgid "pack version %<PRIu32> unsupported"
07432cef 6135msgstr "不支持包版本 %<PRIu32>"
ef317cd5 6136
7aea43ff 6137#: builtin/index-pack.c:351
8ada9598
JX
6138#, c-format
6139msgid "pack has bad object at offset %lu: %s"
81809b99 6140msgstr "包中有错误的对象位于 %lu:%s"
8ada9598 6141
7aea43ff 6142#: builtin/index-pack.c:472
8ada9598
JX
6143#, c-format
6144msgid "inflate returned %d"
81809b99 6145msgstr "解压缩返回 %d"
8ada9598 6146
7aea43ff 6147#: builtin/index-pack.c:521
8ada9598 6148msgid "offset value overflow for delta base object"
81809b99 6149msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 6150
7aea43ff 6151#: builtin/index-pack.c:529
8ada9598 6152msgid "delta base offset is out of bound"
81809b99 6153msgstr "delta 基准偏移越界"
8ada9598 6154
7aea43ff 6155#: builtin/index-pack.c:537
81809b99 6156#, c-format
8ada9598 6157msgid "unknown object type %d"
81809b99 6158msgstr "未知对象类型 %d"
8ada9598 6159
7aea43ff 6160#: builtin/index-pack.c:568
8ada9598 6161msgid "cannot pread pack file"
81809b99 6162msgstr "无法读取包文件"
8ada9598 6163
7aea43ff 6164#: builtin/index-pack.c:570
8ada9598
JX
6165#, c-format
6166msgid "premature end of pack file, %lu byte missing"
6167msgid_plural "premature end of pack file, %lu bytes missing"
81809b99 6168msgstr[0] "包文件过早结束,缺少 %lu 字节"
5ae481e0 6169msgstr[1] "包文件过早结束,缺少 %lu 字节"
8ada9598 6170
7aea43ff 6171#: builtin/index-pack.c:596
8ada9598 6172msgid "serious inflate inconsistency"
81809b99 6173msgstr "解压缩严重的不一致"
8ada9598 6174
7aea43ff
JX
6175#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771
6176#: builtin/index-pack.c:805 builtin/index-pack.c:814
8ada9598
JX
6177#, c-format
6178msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 6179msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 6180
7aea43ff 6181#: builtin/index-pack.c:745 builtin/pack-objects.c:162
814ff314 6182#: builtin/pack-objects.c:254
6792b93b
JX
6183#, c-format
6184msgid "unable to read %s"
6185msgstr "不能读 %s"
6186
7aea43ff 6187#: builtin/index-pack.c:811
6792b93b
JX
6188#, c-format
6189msgid "cannot read existing object %s"
6190msgstr "不能读取现存对象 %s"
6191
7aea43ff 6192#: builtin/index-pack.c:825
81809b99 6193#, c-format
8ada9598 6194msgid "invalid blob object %s"
07432cef 6195msgstr "无效的数据(blob)对象 %s"
8ada9598 6196
7aea43ff 6197#: builtin/index-pack.c:839
81809b99 6198#, c-format
8ada9598 6199msgid "invalid %s"
81809b99 6200msgstr "无效的 %s"
8ada9598 6201
7aea43ff 6202#: builtin/index-pack.c:843
8ada9598 6203msgid "Error in object"
81809b99 6204msgstr "对象中出错"
8ada9598 6205
7aea43ff 6206#: builtin/index-pack.c:845
8ada9598
JX
6207#, c-format
6208msgid "Not all child objects of %s are reachable"
81809b99 6209msgstr "%s 的所有子对象并非都可达"
8ada9598 6210
7aea43ff 6211#: builtin/index-pack.c:917 builtin/index-pack.c:948
8ada9598 6212msgid "failed to apply delta"
81809b99 6213msgstr "无法应用 delta"
8ada9598 6214
7aea43ff 6215#: builtin/index-pack.c:1118
8ada9598 6216msgid "Receiving objects"
81809b99 6217msgstr "接收对象中"
8ada9598 6218
7aea43ff 6219#: builtin/index-pack.c:1118
8ada9598 6220msgid "Indexing objects"
81809b99 6221msgstr "索引对象中"
8ada9598 6222
7aea43ff 6223#: builtin/index-pack.c:1150
8ada9598 6224msgid "pack is corrupted (SHA1 mismatch)"
81809b99 6225msgstr "包冲突(SHA1 不匹配)"
8ada9598 6226
7aea43ff 6227#: builtin/index-pack.c:1155
8ada9598 6228msgid "cannot fstat packfile"
81809b99 6229msgstr "不能枚举包文件状态"
8ada9598 6230
7aea43ff 6231#: builtin/index-pack.c:1158
8ada9598 6232msgid "pack has junk at the end"
81809b99 6233msgstr "包的结尾有垃圾数据"
8ada9598 6234
7aea43ff 6235#: builtin/index-pack.c:1169
6792b93b
JX
6236msgid "confusion beyond insanity in parse_pack_objects()"
6237msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6238
7aea43ff 6239#: builtin/index-pack.c:1194
8ada9598 6240msgid "Resolving deltas"
81809b99 6241msgstr "处理 delta 中"
8ada9598 6242
7aea43ff 6243#: builtin/index-pack.c:1205
07432cef 6244#, c-format
ef317cd5 6245msgid "unable to create thread: %s"
07432cef 6246msgstr "不能创建线程:%s"
ef317cd5 6247
7aea43ff 6248#: builtin/index-pack.c:1247
8ada9598 6249msgid "confusion beyond insanity"
81809b99 6250msgstr "不可理喻"
8ada9598 6251
7aea43ff 6252#: builtin/index-pack.c:1253
ef317cd5
JX
6253#, c-format
6254msgid "completed with %d local objects"
07432cef 6255msgstr "完成 %d 个本地对象"
ef317cd5 6256
7aea43ff 6257#: builtin/index-pack.c:1263
ef317cd5
JX
6258#, c-format
6259msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 6260msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 6261
7aea43ff 6262#: builtin/index-pack.c:1267
8ada9598
JX
6263#, c-format
6264msgid "pack has %d unresolved delta"
6265msgid_plural "pack has %d unresolved deltas"
81809b99 6266msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 6267msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 6268
7aea43ff 6269#: builtin/index-pack.c:1291
81809b99 6270#, c-format
8ada9598 6271msgid "unable to deflate appended object (%d)"
07432cef 6272msgstr "不能压缩附加对象(%d)"
8ada9598 6273
7aea43ff 6274#: builtin/index-pack.c:1367
8ada9598
JX
6275#, c-format
6276msgid "local object %s is corrupt"
81809b99 6277msgstr "本地对象 %s 已损坏"
8ada9598 6278
7aea43ff 6279#: builtin/index-pack.c:1391
8ada9598 6280msgid "error while closing pack file"
81809b99 6281msgstr "关闭包文件时出错"
8ada9598 6282
7aea43ff 6283#: builtin/index-pack.c:1404
81809b99 6284#, c-format
8ada9598 6285msgid "cannot write keep file '%s'"
81809b99 6286msgstr "无法写保留文件 '%s'"
8ada9598 6287
7aea43ff 6288#: builtin/index-pack.c:1412
81809b99 6289#, c-format
8ada9598 6290msgid "cannot close written keep file '%s'"
81809b99 6291msgstr "无法关闭保留文件 '%s'"
8ada9598 6292
7aea43ff 6293#: builtin/index-pack.c:1425
8ada9598 6294msgid "cannot store pack file"
81809b99 6295msgstr "无法存储包文件"
8ada9598 6296
7aea43ff 6297#: builtin/index-pack.c:1436
8ada9598 6298msgid "cannot store index file"
81809b99 6299msgstr "无法存储索引文件"
8ada9598 6300
7aea43ff 6301#: builtin/index-pack.c:1469
07432cef 6302#, c-format
ef317cd5 6303msgid "bad pack.indexversion=%<PRIu32>"
07432cef 6304msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 6305
7aea43ff 6306#: builtin/index-pack.c:1475
ef317cd5
JX
6307#, c-format
6308msgid "invalid number of threads specified (%d)"
07432cef 6309msgstr "指定的线程数无效(%d)"
ef317cd5 6310
7aea43ff 6311#: builtin/index-pack.c:1479 builtin/index-pack.c:1658
ef317cd5
JX
6312#, c-format
6313msgid "no threads support, ignoring %s"
07432cef 6314msgstr "没有线程支持,忽略 %s"
ef317cd5 6315
7aea43ff 6316#: builtin/index-pack.c:1537
81809b99 6317#, c-format
8ada9598 6318msgid "Cannot open existing pack file '%s'"
81809b99 6319msgstr "无法打开现存包文件 '%s'"
8ada9598 6320
7aea43ff 6321#: builtin/index-pack.c:1539
81809b99 6322#, c-format
8ada9598 6323msgid "Cannot open existing pack idx file for '%s'"
81809b99 6324msgstr "无法为 %s 打开包索引文件"
8ada9598 6325
7aea43ff 6326#: builtin/index-pack.c:1586
81809b99 6327#, c-format
8ada9598
JX
6328msgid "non delta: %d object"
6329msgid_plural "non delta: %d objects"
81809b99 6330msgstr[0] "非 delta:%d 个对象"
5ae481e0 6331msgstr[1] "非 delta:%d 个对象"
8ada9598 6332
7aea43ff 6333#: builtin/index-pack.c:1593
8ada9598
JX
6334#, c-format
6335msgid "chain length = %d: %lu object"
6336msgid_plural "chain length = %d: %lu objects"
81809b99 6337msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 6338msgstr[1] "链长 = %d: %lu 对象"
8ada9598 6339
7aea43ff 6340#: builtin/index-pack.c:1622
8ada9598 6341msgid "Cannot come back to cwd"
81809b99 6342msgstr "无法返回当前工作目录"
8ada9598 6343
7aea43ff
JX
6344#: builtin/index-pack.c:1670 builtin/index-pack.c:1673
6345#: builtin/index-pack.c:1685 builtin/index-pack.c:1689
81809b99 6346#, c-format
8ada9598 6347msgid "bad %s"
81809b99 6348msgstr "错误选项 %s"
8ada9598 6349
7aea43ff 6350#: builtin/index-pack.c:1703
8ada9598 6351msgid "--fix-thin cannot be used without --stdin"
649900bc 6352msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 6353
7aea43ff 6354#: builtin/index-pack.c:1707 builtin/index-pack.c:1716
8ada9598
JX
6355#, c-format
6356msgid "packfile name '%s' does not end with '.pack'"
dbd6cced 6357msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
8ada9598 6358
7aea43ff 6359#: builtin/index-pack.c:1724
8ada9598 6360msgid "--verify with no packfile name given"
dbd6cced 6361msgstr "--verify 没有提供包文件名参数"
8ada9598 6362
c04f5ac3
JX
6363#: builtin/init-db.c:35
6364#, c-format
6365msgid "Could not make %s writable by group"
6366msgstr "不能设置 %s 为组可写"
6367
6368#: builtin/init-db.c:62
6369#, c-format
6370msgid "insanely long template name %s"
6371msgstr "太长的模版名 %s"
6372
6373#: builtin/init-db.c:67
6374#, c-format
6375msgid "cannot stat '%s'"
6376msgstr "不能枚举 '%s' 状态"
6377
6378#: builtin/init-db.c:73
6379#, c-format
6380msgid "cannot stat template '%s'"
6381msgstr "不能枚举模版 '%s' 状态"
6382
6383#: builtin/init-db.c:80
6384#, c-format
6385msgid "cannot opendir '%s'"
6386msgstr "不能打开目录 '%s'"
6387
6388#: builtin/init-db.c:97
6389#, c-format
6390msgid "cannot readlink '%s'"
6391msgstr "不能读取链接 '%s'"
6392
6393#: builtin/init-db.c:99
6394#, c-format
6395msgid "insanely long symlink %s"
6396msgstr "太长的符号链接 %s"
6397
6398#: builtin/init-db.c:102
6399#, c-format
6400msgid "cannot symlink '%s' '%s'"
90e6ef53 6401msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3
JX
6402
6403#: builtin/init-db.c:106
6404#, c-format
6405msgid "cannot copy '%s' to '%s'"
6406msgstr "不能拷贝 '%s' 至 '%s'"
6407
6408#: builtin/init-db.c:110
6409#, c-format
6410msgid "ignoring template %s"
6411msgstr "忽略模版 %s"
6412
04cb2f28 6413#: builtin/init-db.c:136
c04f5ac3
JX
6414#, c-format
6415msgid "insanely long template path %s"
6416msgstr "太长的模版路径 %s"
6417
04cb2f28 6418#: builtin/init-db.c:144
c04f5ac3
JX
6419#, c-format
6420msgid "templates not found %s"
6421msgstr "模版未找到 %s"
6422
04cb2f28 6423#: builtin/init-db.c:157
c04f5ac3
JX
6424#, c-format
6425msgid "not copying templates of a wrong format version %d from '%s'"
81809b99 6426msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
c04f5ac3 6427
7aea43ff 6428#: builtin/init-db.c:211
c04f5ac3
JX
6429#, c-format
6430msgid "insane git directory %s"
6431msgstr "不正常的 git 目录 %s"
6432
7aea43ff 6433#: builtin/init-db.c:343 builtin/init-db.c:346
c04f5ac3
JX
6434#, c-format
6435msgid "%s already exists"
6436msgstr "%s 已经存在"
6437
7aea43ff 6438#: builtin/init-db.c:374
c04f5ac3
JX
6439#, c-format
6440msgid "unable to handle file type %d"
6441msgstr "不能处理 %d 类型的文件"
6442
7aea43ff 6443#: builtin/init-db.c:377
c04f5ac3
JX
6444#, c-format
6445msgid "unable to move %s to %s"
6446msgstr "不能移动 %s 至 %s"
6447
6c94aba5
JX
6448#. TRANSLATORS: The first '%s' is either "Reinitialized
6449#. existing" or "Initialized empty", the second " shared" or
6450#. "", and the last '%s%s' is the verbatim directory name.
7aea43ff 6451#: builtin/init-db.c:433
c04f5ac3
JX
6452#, c-format
6453msgid "%s%s Git repository in %s%s\n"
6454msgstr "%s%s Git 版本库于 %s%s\n"
6455
7aea43ff 6456#: builtin/init-db.c:434
c04f5ac3
JX
6457msgid "Reinitialized existing"
6458msgstr "重新初始化现存的"
6459
7aea43ff 6460#: builtin/init-db.c:434
c04f5ac3
JX
6461msgid "Initialized empty"
6462msgstr "初始化空的"
6463
7e238ab7 6464# 译者:中文字符串拼接,可删除前导空格
7aea43ff 6465#: builtin/init-db.c:435
c04f5ac3 6466msgid " shared"
90e6ef53 6467msgstr "共享"
c04f5ac3 6468
7aea43ff 6469#: builtin/init-db.c:482
ef317cd5 6470msgid ""
a77c07d9 6471"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
814ff314 6472"shared[=<permissions>]] [<directory>]"
ef317cd5 6473msgstr ""
07432cef 6474"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
814ff314 6475"[<目录>]"
ef317cd5 6476
7aea43ff 6477#: builtin/init-db.c:505
ef317cd5 6478msgid "permissions"
07432cef 6479msgstr "权限"
ef317cd5 6480
7aea43ff 6481#: builtin/init-db.c:506
ef317cd5 6482msgid "specify that the git repository is to be shared amongst several users"
07432cef 6483msgstr "指定 git 版本库是多个用户之间共享的"
ef317cd5 6484
7aea43ff 6485#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171
ef317cd5 6486msgid "be quiet"
07432cef 6487msgstr "保持安静"
ef317cd5 6488
7aea43ff 6489#: builtin/init-db.c:540 builtin/init-db.c:545
c04f5ac3
JX
6490#, c-format
6491msgid "cannot mkdir %s"
6492msgstr "不能创建目录 %s"
6493
7aea43ff 6494#: builtin/init-db.c:549
c04f5ac3
JX
6495#, c-format
6496msgid "cannot chdir to %s"
6497msgstr "不能切换目录到 %s"
6498
7aea43ff 6499#: builtin/init-db.c:570
c04f5ac3
JX
6500#, c-format
6501msgid ""
6502"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6503"dir=<directory>)"
1e607449 6504msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
c04f5ac3 6505
7aea43ff 6506#: builtin/init-db.c:598
c04f5ac3
JX
6507#, c-format
6508msgid "Cannot access work tree '%s'"
6509msgstr "不能访问工作区 '%s'"
6510
220c313c
JX
6511#: builtin/interpret-trailers.c:15
6512msgid ""
6513"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
6514"[<file>...]"
6515msgstr ""
6516"git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
6517">...]"
6518
6519#: builtin/interpret-trailers.c:25
6520msgid "trim empty trailers"
6521msgstr "删除空签名"
6522
6523#: builtin/interpret-trailers.c:26
6524msgid "trailer"
6525msgstr "签名"
6526
6527#: builtin/interpret-trailers.c:27
6528msgid "trailer(s) to add"
6529msgstr "要添加的签名"
6530
2e8451e8 6531#: builtin/log.c:41
7aea43ff 6532msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
d9d56b23 6533msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
ef317cd5 6534
2e8451e8 6535#: builtin/log.c:42
814ff314
JX
6536msgid "git show [<options>] <object>..."
6537msgstr "git show [<选项>] <对象>..."
ef317cd5 6538
220c313c
JX
6539#: builtin/log.c:81
6540#, c-format
6541msgid "invalid --decorate option: %s"
6542msgstr "无效的 --decorate 选项:%s"
6543
6acbf033 6544#: builtin/log.c:127
ef317cd5 6545msgid "suppress diff output"
07432cef 6546msgstr "不显示差异输出"
ef317cd5 6547
6acbf033 6548#: builtin/log.c:128
ef317cd5 6549msgid "show source"
07432cef 6550msgstr "显示源"
ef317cd5 6551
6acbf033 6552#: builtin/log.c:129
07432cef
WS
6553msgid "Use mail map file"
6554msgstr "使用邮件映射文件"
6555
6acbf033 6556#: builtin/log.c:130
ef317cd5 6557msgid "decorate options"
07432cef 6558msgstr "修饰选项"
ef317cd5 6559
220c313c
JX
6560#: builtin/log.c:133
6561msgid "Process line range n,m in file, counting from 1"
6562msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
6563
6acbf033 6564#: builtin/log.c:229
c04f5ac3
JX
6565#, c-format
6566msgid "Final output: %d %s\n"
6567msgstr "最终输出:%d %s\n"
6568
220c313c
JX
6569#: builtin/log.c:458
6570#, c-format
6571msgid "git show %s: bad file"
6572msgstr "git show %s: 损坏的文件"
6573
6574#: builtin/log.c:472 builtin/log.c:564
c04f5ac3
JX
6575#, c-format
6576msgid "Could not read object %s"
90e6ef53 6577msgstr "不能读取对象 %s"
c04f5ac3 6578
220c313c 6579#: builtin/log.c:588
c04f5ac3
JX
6580#, c-format
6581msgid "Unknown type: %d"
6582msgstr "未知类型:%d"
6583
220c313c 6584#: builtin/log.c:689
c04f5ac3
JX
6585msgid "format.headers without value"
6586msgstr "format.headers 没有值"
6587
220c313c 6588#: builtin/log.c:773
c04f5ac3
JX
6589msgid "name of output directory is too long"
6590msgstr "输出目录名太长"
6591
220c313c 6592#: builtin/log.c:789
c04f5ac3
JX
6593#, c-format
6594msgid "Cannot open patch file %s"
6595msgstr "无法打开补丁文件 %s"
6596
220c313c 6597#: builtin/log.c:803
c04f5ac3
JX
6598msgid "Need exactly one range."
6599msgstr "只需要一个范围。"
6600
7aea43ff 6601#: builtin/log.c:813
c04f5ac3
JX
6602msgid "Not a range."
6603msgstr "不是一个范围。"
6604
220c313c 6605#: builtin/log.c:919
c04f5ac3
JX
6606msgid "Cover letter needs email format"
6607msgstr "信封需要邮件地址格式"
6608
220c313c 6609#: builtin/log.c:998
c04f5ac3
JX
6610#, c-format
6611msgid "insane in-reply-to: %s"
6612msgstr "不正常的 in-reply-to:%s"
6613
220c313c 6614#: builtin/log.c:1026
814ff314
JX
6615msgid "git format-patch [<options>] [<since> | <revision-range>]"
6616msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
ef317cd5 6617
220c313c 6618#: builtin/log.c:1071
c04f5ac3
JX
6619msgid "Two output directories?"
6620msgstr "两个输出目录?"
6621
220c313c 6622#: builtin/log.c:1186
ef317cd5 6623msgid "use [PATCH n/m] even with a single patch"
07432cef 6624msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 6625
220c313c 6626#: builtin/log.c:1189
ef317cd5 6627msgid "use [PATCH] even with multiple patches"
07432cef 6628msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 6629
220c313c 6630#: builtin/log.c:1193
ef317cd5 6631msgid "print patches to standard out"
07432cef 6632msgstr "打印补丁到标准输出"
c04f5ac3 6633
220c313c 6634#: builtin/log.c:1195
ef317cd5 6635msgid "generate a cover letter"
07432cef 6636msgstr "生成一封附信"
c04f5ac3 6637
220c313c 6638#: builtin/log.c:1197
ef317cd5 6639msgid "use simple number sequence for output file names"
07432cef 6640msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 6641
220c313c 6642#: builtin/log.c:1198
ef317cd5 6643msgid "sfx"
07432cef 6644msgstr "后缀"
ef317cd5 6645
220c313c 6646#: builtin/log.c:1199
ef317cd5 6647msgid "use <sfx> instead of '.patch'"
07432cef 6648msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 6649
220c313c 6650#: builtin/log.c:1201
ef317cd5 6651msgid "start numbering patches at <n> instead of 1"
07432cef
WS
6652msgstr "补丁以 <n> 开始编号,而不是1"
6653
220c313c 6654#: builtin/log.c:1203
07432cef
WS
6655msgid "mark the series as Nth re-roll"
6656msgstr "标记补丁系列是第几次重制"
ef317cd5 6657
220c313c 6658#: builtin/log.c:1205
ef317cd5 6659msgid "Use [<prefix>] instead of [PATCH]"
07432cef 6660msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 6661
220c313c 6662#: builtin/log.c:1208
ef317cd5 6663msgid "store resulting files in <dir>"
d9d56b23 6664msgstr "把结果文件存储在 <目录>"
ef317cd5 6665
220c313c 6666#: builtin/log.c:1211
ef317cd5 6667msgid "don't strip/add [PATCH]"
07432cef 6668msgstr "不删除/添加 [PATCH]"
ef317cd5 6669
220c313c 6670#: builtin/log.c:1214
ef317cd5 6671msgid "don't output binary diffs"
07432cef 6672msgstr "不输出二进制差异"
ef317cd5 6673
220c313c 6674#: builtin/log.c:1216
ef317cd5 6675msgid "don't include a patch matching a commit upstream"
07432cef 6676msgstr "不包含已在上游提交中的补丁"
ef317cd5 6677
220c313c 6678#: builtin/log.c:1218
ef317cd5 6679msgid "show patch format instead of default (patch + stat)"
07432cef 6680msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 6681
220c313c 6682#: builtin/log.c:1220
ef317cd5 6683msgid "Messaging"
07432cef 6684msgstr "邮件发送"
ef317cd5 6685
220c313c 6686#: builtin/log.c:1221
ef317cd5 6687msgid "header"
07432cef 6688msgstr "header"
ef317cd5 6689
220c313c 6690#: builtin/log.c:1222
ef317cd5 6691msgid "add email header"
07432cef 6692msgstr "添加邮件头"
ef317cd5 6693
220c313c 6694#: builtin/log.c:1223 builtin/log.c:1225
ef317cd5 6695msgid "email"
07432cef 6696msgstr "邮件地址"
ef317cd5 6697
220c313c 6698#: builtin/log.c:1223
ef317cd5 6699msgid "add To: header"
07432cef 6700msgstr "添加收件人"
ef317cd5 6701
220c313c 6702#: builtin/log.c:1225
ef317cd5 6703msgid "add Cc: header"
07432cef 6704msgstr "添加抄送"
ef317cd5 6705
220c313c 6706#: builtin/log.c:1227
2e8451e8 6707msgid "ident"
d9d56b23 6708msgstr "标识"
2e8451e8 6709
220c313c 6710#: builtin/log.c:1228
2e8451e8 6711msgid "set From address to <ident> (or committer ident if absent)"
d9d56b23 6712msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者ID做为地址)"
2e8451e8 6713
220c313c 6714#: builtin/log.c:1230
ef317cd5 6715msgid "message-id"
d9d56b23 6716msgstr "邮件标识"
ef317cd5 6717
220c313c 6718#: builtin/log.c:1231
ef317cd5 6719msgid "make first mail a reply to <message-id>"
d9d56b23 6720msgstr "使第一封邮件作为对 <邮件标识> 的回复"
ef317cd5 6721
220c313c 6722#: builtin/log.c:1232 builtin/log.c:1235
ef317cd5 6723msgid "boundary"
07432cef 6724msgstr "边界"
ef317cd5 6725
220c313c 6726#: builtin/log.c:1233
ef317cd5 6727msgid "attach the patch"
07432cef 6728msgstr "附件方式添加补丁"
ef317cd5 6729
220c313c 6730#: builtin/log.c:1236
ef317cd5 6731msgid "inline the patch"
07432cef 6732msgstr "内联显示补丁"
ef317cd5 6733
220c313c 6734#: builtin/log.c:1240
ef317cd5 6735msgid "enable message threading, styles: shallow, deep"
07432cef 6736msgstr "启用邮件线索,风格:浅,深"
ef317cd5 6737
220c313c 6738#: builtin/log.c:1242
ef317cd5 6739msgid "signature"
07432cef 6740msgstr "签名"
ef317cd5 6741
220c313c 6742#: builtin/log.c:1243
ef317cd5 6743msgid "add a signature"
07432cef 6744msgstr "添加一个签名"
ef317cd5 6745
220c313c 6746#: builtin/log.c:1245
6acbf033
JX
6747msgid "add a signature from a file"
6748msgstr "从文件添加一个签名"
6749
220c313c 6750#: builtin/log.c:1246
ef317cd5 6751msgid "don't print the patch filenames"
07432cef 6752msgstr "不要打印补丁文件名"
ef317cd5 6753
220c313c 6754#: builtin/log.c:1320
2e8451e8
JX
6755#, c-format
6756msgid "invalid ident line: %s"
6757msgstr "包含无效的身份标识:%s"
6758
220c313c 6759#: builtin/log.c:1335
c04f5ac3
JX
6760msgid "-n and -k are mutually exclusive."
6761msgstr "-n 和 -k 互斥。"
6762
220c313c 6763#: builtin/log.c:1337
c04f5ac3
JX
6764msgid "--subject-prefix and -k are mutually exclusive."
6765msgstr "--subject-prefix 和 -k 互斥。"
6766
220c313c 6767#: builtin/log.c:1345
c04f5ac3
JX
6768msgid "--name-only does not make sense"
6769msgstr "--name-only 无意义"
6770
220c313c 6771#: builtin/log.c:1347
c04f5ac3
JX
6772msgid "--name-status does not make sense"
6773msgstr "--name-status 无意义"
6774
220c313c 6775#: builtin/log.c:1349
c04f5ac3
JX
6776msgid "--check does not make sense"
6777msgstr "--check 无意义"
6778
220c313c 6779#: builtin/log.c:1372
c04f5ac3
JX
6780msgid "standard output, or directory, which one?"
6781msgstr "标准输出或目录,哪一个?"
6782
220c313c 6783#: builtin/log.c:1374
c04f5ac3
JX
6784#, c-format
6785msgid "Could not create directory '%s'"
90e6ef53 6786msgstr "不能创建目录 '%s'"
c04f5ac3 6787
220c313c 6788#: builtin/log.c:1472
6acbf033
JX
6789#, c-format
6790msgid "unable to read signature file '%s'"
6791msgstr "无法读取签名文件 '%s'"
6792
220c313c 6793#: builtin/log.c:1535
c04f5ac3
JX
6794msgid "Failed to create output files"
6795msgstr "无法创建输出文件"
6796
220c313c 6797#: builtin/log.c:1583
ef317cd5 6798msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 6799msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 6800
7aea43ff 6801#: builtin/log.c:1637
c04f5ac3
JX
6802#, c-format
6803msgid ""
6804"Could not find a tracked remote branch, please specify <upstream> manually.\n"
d9d56b23 6805msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
c04f5ac3 6806
7aea43ff 6807#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662
c04f5ac3
JX
6808#, c-format
6809msgid "Unknown commit %s"
6810msgstr "未知提交 %s"
6811
814ff314
JX
6812#: builtin/ls-files.c:358
6813msgid "git ls-files [<options>] [<file>...]"
6814msgstr "git ls-files [<选项>] [<文件>...]"
ef317cd5 6815
814ff314 6816#: builtin/ls-files.c:415
ef317cd5 6817msgid "identify the file status with tags"
07432cef 6818msgstr "用标签标识文件的状态"
ef317cd5 6819
814ff314 6820#: builtin/ls-files.c:417
ef317cd5 6821msgid "use lowercase letters for 'assume unchanged' files"
07432cef 6822msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 6823
814ff314 6824#: builtin/ls-files.c:419
ef317cd5 6825msgid "show cached files in the output (default)"
07432cef 6826msgstr "显示缓存的文件(默认)"
ef317cd5 6827
814ff314 6828#: builtin/ls-files.c:421
ef317cd5 6829msgid "show deleted files in the output"
07432cef 6830msgstr "显示已删除的文件"
ef317cd5 6831
814ff314 6832#: builtin/ls-files.c:423
ef317cd5 6833msgid "show modified files in the output"
07432cef 6834msgstr "显示已修改的文件"
ef317cd5 6835
814ff314 6836#: builtin/ls-files.c:425
ef317cd5 6837msgid "show other files in the output"
07432cef 6838msgstr "显示其它文件"
ef317cd5 6839
814ff314 6840#: builtin/ls-files.c:427
ef317cd5 6841msgid "show ignored files in the output"
07432cef 6842msgstr "显示忽略的文件"
ef317cd5 6843
814ff314 6844#: builtin/ls-files.c:430
ef317cd5 6845msgid "show staged contents' object name in the output"
07432cef 6846msgstr "显示暂存区内容的对象名称"
ef317cd5 6847
814ff314 6848#: builtin/ls-files.c:432
ef317cd5 6849msgid "show files on the filesystem that need to be removed"
07432cef 6850msgstr "显示文件系统需要删除的文件"
ef317cd5 6851
814ff314 6852#: builtin/ls-files.c:434
220c313c 6853msgid "show 'other' directories' names only"
07432cef 6854msgstr "只显示“其他”目录的名称"
ef317cd5 6855
814ff314 6856#: builtin/ls-files.c:437
ef317cd5 6857msgid "don't show empty directories"
07432cef 6858msgstr "不显示空目录"
ef317cd5 6859
814ff314 6860#: builtin/ls-files.c:440
ef317cd5 6861msgid "show unmerged files in the output"
07432cef 6862msgstr "显示未合并的文件"
ef317cd5 6863
814ff314 6864#: builtin/ls-files.c:442
ef317cd5 6865msgid "show resolve-undo information"
07432cef 6866msgstr "显示 resolve-undo 信息"
ef317cd5 6867
814ff314 6868#: builtin/ls-files.c:444
ef317cd5 6869msgid "skip files matching pattern"
07432cef 6870msgstr "匹配排除文件的模式"
ef317cd5 6871
814ff314 6872#: builtin/ls-files.c:447
ef317cd5 6873msgid "exclude patterns are read from <file>"
07432cef 6874msgstr "从 <文件> 中读取排除模式"
ef317cd5 6875
814ff314 6876#: builtin/ls-files.c:450
ef317cd5 6877msgid "read additional per-directory exclude patterns in <file>"
07432cef 6878msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 6879
814ff314 6880#: builtin/ls-files.c:452
ef317cd5 6881msgid "add the standard git exclusions"
07432cef 6882msgstr "添加标准的 git 排除"
ef317cd5 6883
814ff314 6884#: builtin/ls-files.c:455
ef317cd5 6885msgid "make the output relative to the project top directory"
07432cef 6886msgstr "显示相对于顶级目录的文件名"
ef317cd5 6887
814ff314 6888#: builtin/ls-files.c:458
ef317cd5 6889msgid "if any <file> is not in the index, treat this as an error"
07432cef 6890msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 6891
814ff314 6892#: builtin/ls-files.c:459
ef317cd5 6893msgid "tree-ish"
07432cef 6894msgstr "树或提交"
ef317cd5 6895
814ff314 6896#: builtin/ls-files.c:460
ef317cd5 6897msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 6898msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5 6899
814ff314 6900#: builtin/ls-files.c:462
ef317cd5 6901msgid "show debugging data"
07432cef 6902msgstr "显示调试数据"
ef317cd5 6903
90314792 6904#: builtin/ls-tree.c:28
ef317cd5 6905msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 6906msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5 6907
04cb2f28 6908#: builtin/ls-tree.c:127
ef317cd5 6909msgid "only show trees"
07432cef 6910msgstr "只显示树"
ef317cd5 6911
04cb2f28 6912#: builtin/ls-tree.c:129
ef317cd5 6913msgid "recurse into subtrees"
07432cef 6914msgstr "递归到子树"
ef317cd5 6915
04cb2f28 6916#: builtin/ls-tree.c:131
ef317cd5 6917msgid "show trees when recursing"
07432cef 6918msgstr "当递归时显示树"
ef317cd5 6919
04cb2f28 6920#: builtin/ls-tree.c:134
ef317cd5 6921msgid "terminate entries with NUL byte"
07432cef 6922msgstr "条目以NUL字符终止"
ef317cd5 6923
04cb2f28 6924#: builtin/ls-tree.c:135
ef317cd5 6925msgid "include object size"
07432cef 6926msgstr "包括对象大小"
ef317cd5 6927
04cb2f28 6928#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
ef317cd5 6929msgid "list only filenames"
07432cef 6930msgstr "只列出文件名"
ef317cd5 6931
04cb2f28 6932#: builtin/ls-tree.c:142
ef317cd5 6933msgid "use full path names"
07432cef 6934msgstr "使用文件的全路径"
ef317cd5 6935
04cb2f28 6936#: builtin/ls-tree.c:144
ef317cd5 6937msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 6938msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5 6939
04cb2f28 6940#: builtin/merge.c:45
814ff314
JX
6941msgid "git merge [<options>] [<commit>...]"
6942msgstr "git merge [<选项>] [<提交>...]"
ef317cd5 6943
04cb2f28 6944#: builtin/merge.c:46
814ff314
JX
6945msgid "git merge [<options>] <msg> HEAD <commit>"
6946msgstr "git merge [<选项>] <说明> HEAD <提交>"
ef317cd5 6947
04cb2f28 6948#: builtin/merge.c:47
ef317cd5 6949msgid "git merge --abort"
07432cef 6950msgstr "git merge --abort"
ef317cd5 6951
04cb2f28 6952#: builtin/merge.c:100
c04f5ac3
JX
6953msgid "switch `m' requires a value"
6954msgstr "开关 `m' 需要一个值"
6955
04cb2f28 6956#: builtin/merge.c:137
c04f5ac3
JX
6957#, c-format
6958msgid "Could not find merge strategy '%s'.\n"
90e6ef53 6959msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 6960
04cb2f28 6961#: builtin/merge.c:138
c04f5ac3
JX
6962#, c-format
6963msgid "Available strategies are:"
6964msgstr "可用的策略有:"
6965
04cb2f28 6966#: builtin/merge.c:143
c04f5ac3
JX
6967#, c-format
6968msgid "Available custom strategies are:"
6969msgstr "可用的自定义策略有:"
6970
04cb2f28 6971#: builtin/merge.c:193
ef317cd5 6972msgid "do not show a diffstat at the end of the merge"
07432cef 6973msgstr "在合并的最后不显示差异统计"
ef317cd5 6974
04cb2f28 6975#: builtin/merge.c:196
ef317cd5 6976msgid "show a diffstat at the end of the merge"
07432cef 6977msgstr "在合并的最后显示差异统计"
ef317cd5 6978
04cb2f28 6979#: builtin/merge.c:197
ef317cd5 6980msgid "(synonym to --stat)"
07432cef 6981msgstr "(和 --stat 同义)"
ef317cd5 6982
04cb2f28 6983#: builtin/merge.c:199
ef317cd5 6984msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 6985msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 6986
04cb2f28 6987#: builtin/merge.c:202
ef317cd5 6988msgid "create a single commit instead of doing a merge"
07432cef 6989msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 6990
04cb2f28 6991#: builtin/merge.c:204
ef317cd5 6992msgid "perform a commit if the merge succeeds (default)"
07432cef 6993msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 6994
04cb2f28 6995#: builtin/merge.c:206
ef317cd5 6996msgid "edit message before committing"
07432cef 6997msgstr "在提交前编辑提交说明"
ef317cd5 6998
04cb2f28 6999#: builtin/merge.c:207
ef317cd5 7000msgid "allow fast-forward (default)"
07432cef 7001msgstr "允许快进(默认)"
ef317cd5 7002
04cb2f28 7003#: builtin/merge.c:209
ef317cd5 7004msgid "abort if fast-forward is not possible"
07432cef 7005msgstr "如果不能快进就放弃合并"
ef317cd5 7006
04cb2f28 7007#: builtin/merge.c:213
1003b3a5
JX
7008msgid "Verify that the named commit has a valid GPG signature"
7009msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7010
04cb2f28 7011#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89
ef317cd5 7012msgid "strategy"
07432cef 7013msgstr "策略"
ef317cd5 7014
04cb2f28 7015#: builtin/merge.c:215
ef317cd5 7016msgid "merge strategy to use"
07432cef 7017msgstr "要使用的合并策略"
ef317cd5 7018
04cb2f28 7019#: builtin/merge.c:216
ef317cd5 7020msgid "option=value"
07432cef 7021msgstr "option=value"
ef317cd5 7022
04cb2f28 7023#: builtin/merge.c:217
ef317cd5 7024msgid "option for selected merge strategy"
07432cef 7025msgstr "所选的合并策略的选项"
ef317cd5 7026
04cb2f28 7027#: builtin/merge.c:219
ef317cd5 7028msgid "merge commit message (for a non-fast-forward merge)"
07432cef 7029msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 7030
04cb2f28 7031#: builtin/merge.c:223
ef317cd5 7032msgid "abort the current in-progress merge"
07432cef 7033msgstr "放弃当前正在进行的合并"
ef317cd5 7034
04cb2f28 7035#: builtin/merge.c:251
c04f5ac3
JX
7036msgid "could not run stash."
7037msgstr "不能进行进度保存。"
7038
04cb2f28 7039#: builtin/merge.c:256
c04f5ac3
JX
7040msgid "stash failed"
7041msgstr "进度保存失败"
7042
04cb2f28 7043#: builtin/merge.c:261
c04f5ac3
JX
7044#, c-format
7045msgid "not a valid object: %s"
7046msgstr "不是一个有效对象:%s"
7047
04cb2f28 7048#: builtin/merge.c:280 builtin/merge.c:297
c04f5ac3
JX
7049msgid "read-tree failed"
7050msgstr "读取树失败"
7051
90e6ef53 7052# 译者:注意保持前导空格
04cb2f28 7053#: builtin/merge.c:327
c04f5ac3
JX
7054msgid " (nothing to squash)"
7055msgstr " (无可压缩)"
7056
04cb2f28 7057#: builtin/merge.c:340
c04f5ac3
JX
7058#, c-format
7059msgid "Squash commit -- not updating HEAD\n"
7060msgstr "压缩提交 -- 未更新 HEAD\n"
7061
04cb2f28 7062#: builtin/merge.c:372
c04f5ac3
JX
7063msgid "Writing SQUASH_MSG"
7064msgstr "写入 SQUASH_MSG"
7065
04cb2f28 7066#: builtin/merge.c:374
c04f5ac3
JX
7067msgid "Finishing SQUASH_MSG"
7068msgstr "完成 SQUASH_MSG"
7069
04cb2f28 7070#: builtin/merge.c:397
c04f5ac3
JX
7071#, c-format
7072msgid "No merge message -- not updating HEAD\n"
7073msgstr "无合并信息 -- 未更新 HEAD\n"
7074
04cb2f28 7075#: builtin/merge.c:447
c04f5ac3
JX
7076#, c-format
7077msgid "'%s' does not point to a commit"
7078msgstr "'%s' 没有指向一个提交"
7079
7aea43ff 7080#: builtin/merge.c:537
c04f5ac3
JX
7081#, c-format
7082msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 7083msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 7084
7aea43ff 7085#: builtin/merge.c:632
c04f5ac3
JX
7086msgid "git write-tree failed to write a tree"
7087msgstr "git write-tree 无法写入一树对象"
7088
7aea43ff 7089#: builtin/merge.c:656
c04f5ac3
JX
7090msgid "Not handling anything other than two heads merge."
7091msgstr "不能处理两个头合并之外的任何操作。"
7092
7aea43ff 7093#: builtin/merge.c:670
c04f5ac3
JX
7094#, c-format
7095msgid "Unknown option for merge-recursive: -X%s"
7096msgstr "merge-recursive 的未知选项:-X%s"
7097
7aea43ff 7098#: builtin/merge.c:683
c04f5ac3
JX
7099#, c-format
7100msgid "unable to write %s"
7101msgstr "不能写 %s"
7102
7aea43ff 7103#: builtin/merge.c:772
c04f5ac3
JX
7104#, c-format
7105msgid "Could not read from '%s'"
7106msgstr "不能从 '%s' 读取"
7107
7aea43ff 7108#: builtin/merge.c:781
c04f5ac3
JX
7109#, c-format
7110msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7111msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7112
7aea43ff 7113#: builtin/merge.c:787
a77c07d9 7114#, c-format
c04f5ac3
JX
7115msgid ""
7116"Please enter a commit message to explain why this merge is necessary,\n"
7117"especially if it merges an updated upstream into a topic branch.\n"
7118"\n"
a77c07d9 7119"Lines starting with '%c' will be ignored, and an empty message aborts\n"
c04f5ac3
JX
7120"the commit.\n"
7121msgstr ""
7122"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
7123"合并到主题分支。\n"
7124"\n"
a77c07d9 7125"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
c04f5ac3 7126
7aea43ff 7127#: builtin/merge.c:811
c04f5ac3
JX
7128msgid "Empty commit message."
7129msgstr "空提交信息。"
7130
7aea43ff 7131#: builtin/merge.c:823
c04f5ac3
JX
7132#, c-format
7133msgid "Wonderful.\n"
7134msgstr "太棒了。\n"
7135
7aea43ff 7136#: builtin/merge.c:878
c04f5ac3
JX
7137#, c-format
7138msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7139msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7140
7aea43ff 7141#: builtin/merge.c:894
c04f5ac3
JX
7142#, c-format
7143msgid "'%s' is not a commit"
7144msgstr "'%s' 不是一个提交"
7145
7aea43ff 7146#: builtin/merge.c:935
c04f5ac3 7147msgid "No current branch."
90e6ef53 7148msgstr "没有当前分支。"
c04f5ac3 7149
7aea43ff 7150#: builtin/merge.c:937
c04f5ac3 7151msgid "No remote for the current branch."
90e6ef53 7152msgstr "当前分支没有对应的远程版本库。"
c04f5ac3 7153
7aea43ff 7154#: builtin/merge.c:939
c04f5ac3 7155msgid "No default upstream defined for the current branch."
90e6ef53 7156msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 7157
7aea43ff 7158#: builtin/merge.c:944
170e9899 7159#, c-format
2e8451e8
JX
7160msgid "No remote-tracking branch for %s from %s"
7161msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 7162
7aea43ff
JX
7163#: builtin/merge.c:1081
7164#, c-format
7165msgid "could not close '%s'"
7166msgstr "不能关闭 '%s'"
7167
7168#: builtin/merge.c:1208
c04f5ac3 7169msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 7170msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 7171
7aea43ff 7172#: builtin/merge.c:1224
c04f5ac3
JX
7173msgid ""
7174"You have not concluded your merge (MERGE_HEAD exists).\n"
220c313c 7175"Please, commit your changes before you merge."
c04f5ac3
JX
7176msgstr ""
7177"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 7178"请在合并前先提交您的修改。"
c04f5ac3 7179
7aea43ff 7180#: builtin/merge.c:1227 git-pull.sh:74
c04f5ac3
JX
7181msgid "You have not concluded your merge (MERGE_HEAD exists)."
7182msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
7183
7aea43ff 7184#: builtin/merge.c:1231
c04f5ac3
JX
7185msgid ""
7186"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
220c313c 7187"Please, commit your changes before you merge."
c04f5ac3
JX
7188msgstr ""
7189"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 7190"请在合并前先提交您的修改。"
c04f5ac3 7191
7aea43ff 7192#: builtin/merge.c:1234
c04f5ac3
JX
7193msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7194msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7195
7aea43ff 7196#: builtin/merge.c:1243
c04f5ac3 7197msgid "You cannot combine --squash with --no-ff."
649900bc 7198msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 7199
7aea43ff 7200#: builtin/merge.c:1251
c04f5ac3 7201msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 7202msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 7203
7aea43ff 7204#: builtin/merge.c:1268
c04f5ac3
JX
7205msgid "Squash commit into empty head not supported yet"
7206msgstr "尚不支持到空分支的压缩提交"
7207
7aea43ff 7208#: builtin/merge.c:1270
c04f5ac3
JX
7209msgid "Non-fast-forward commit does not make sense into an empty head"
7210msgstr "到空分支的非快进式提交没有意义"
7211
7aea43ff 7212#: builtin/merge.c:1276
2e8451e8
JX
7213#, c-format
7214msgid "%s - not something we can merge"
7215msgstr "%s - 不能被合并"
7216
7aea43ff
JX
7217#: builtin/merge.c:1278
7218msgid "Can merge only exactly one commit into empty head"
7219msgstr "只能将一个提交合并到空分支上"
7220
7221#: builtin/merge.c:1333
1003b3a5
JX
7222#, c-format
7223msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7224msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7225
7aea43ff 7226#: builtin/merge.c:1336
1003b3a5
JX
7227#, c-format
7228msgid "Commit %s has a bad GPG signature allegedly by %s."
7229msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7230
7aea43ff 7231#: builtin/merge.c:1339
1003b3a5
JX
7232#, c-format
7233msgid "Commit %s does not have a GPG signature."
7234msgstr "提交 %s 没有一个 GPG 签名。"
7235
7aea43ff 7236#: builtin/merge.c:1342
1003b3a5
JX
7237#, c-format
7238msgid "Commit %s has a good GPG signature by %s\n"
7239msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7240
7aea43ff 7241#: builtin/merge.c:1423
c04f5ac3
JX
7242#, c-format
7243msgid "Updating %s..%s\n"
7244msgstr "更新 %s..%s\n"
7245
7aea43ff 7246#: builtin/merge.c:1462
c04f5ac3
JX
7247#, c-format
7248msgid "Trying really trivial in-index merge...\n"
90e6ef53 7249msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 7250
7aea43ff 7251#: builtin/merge.c:1469
c04f5ac3
JX
7252#, c-format
7253msgid "Nope.\n"
7254msgstr "无。\n"
7255
7aea43ff 7256#: builtin/merge.c:1501
c04f5ac3 7257msgid "Not possible to fast-forward, aborting."
1aabac65 7258msgstr "无法快进,终止。"
c04f5ac3 7259
7aea43ff 7260#: builtin/merge.c:1524 builtin/merge.c:1603
c04f5ac3
JX
7261#, c-format
7262msgid "Rewinding the tree to pristine...\n"
7263msgstr "将树回滚至原始状态...\n"
7264
7aea43ff 7265#: builtin/merge.c:1528
c04f5ac3
JX
7266#, c-format
7267msgid "Trying merge strategy %s...\n"
7268msgstr "尝试合并策略 %s...\n"
7269
7aea43ff 7270#: builtin/merge.c:1594
c04f5ac3
JX
7271#, c-format
7272msgid "No merge strategy handled the merge.\n"
7273msgstr "没有合并策略处理此合并。\n"
7274
7aea43ff 7275#: builtin/merge.c:1596
c04f5ac3
JX
7276#, c-format
7277msgid "Merge with strategy %s failed.\n"
7278msgstr "使用策略 %s 合并失败。\n"
7279
7aea43ff 7280#: builtin/merge.c:1605
c04f5ac3
JX
7281#, c-format
7282msgid "Using the %s to prepare resolving by hand.\n"
7283msgstr "使用 %s 以准备手工解决。\n"
7284
7aea43ff 7285#: builtin/merge.c:1617
c04f5ac3
JX
7286#, c-format
7287msgid "Automatic merge went well; stopped before committing as requested\n"
7288msgstr "自动合并进展顺利,按要求在提交前停止\n"
7289
cfff71a9 7290#: builtin/merge-base.c:29
814ff314
JX
7291msgid "git merge-base [-a | --all] <commit> <commit>..."
7292msgstr "git merge-base [-a | --all] <提交> <提交>..."
ef317cd5 7293
cfff71a9 7294#: builtin/merge-base.c:30
814ff314
JX
7295msgid "git merge-base [-a | --all] --octopus <commit>..."
7296msgstr "git merge-base [-a | --all] --octopus <提交>..."
ef317cd5 7297
cfff71a9 7298#: builtin/merge-base.c:31
ef317cd5 7299msgid "git merge-base --independent <commit>..."
07432cef 7300msgstr "git merge-base --independent <提交>..."
ef317cd5 7301
cfff71a9 7302#: builtin/merge-base.c:32
ef317cd5 7303msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 7304msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5 7305
cfff71a9
JX
7306#: builtin/merge-base.c:33
7307msgid "git merge-base --fork-point <ref> [<commit>]"
d9d56b23 7308msgstr "git merge-base --fork-point <引用> [<提交>]"
cfff71a9
JX
7309
7310#: builtin/merge-base.c:214
ef317cd5 7311msgid "output all common ancestors"
07432cef 7312msgstr "输出所有共同的祖先"
ef317cd5 7313
cfff71a9 7314#: builtin/merge-base.c:216
ef317cd5 7315msgid "find ancestors for a single n-way merge"
07432cef 7316msgstr "查找一个多路合并的祖先提交"
ef317cd5 7317
cfff71a9 7318#: builtin/merge-base.c:218
ef317cd5 7319msgid "list revs not reachable from others"
07432cef 7320msgstr "显示不能被其他访问到的版本"
ef317cd5 7321
cfff71a9 7322#: builtin/merge-base.c:220
ef317cd5 7323msgid "is the first one ancestor of the other?"
07432cef 7324msgstr "第一个是其他的祖先提交么?"
ef317cd5 7325
cfff71a9
JX
7326#: builtin/merge-base.c:222
7327msgid "find where <commit> forked from reflog of <ref>"
d9d56b23 7328msgstr "查找 <提交> 从<引用>日志的何处分支的"
cfff71a9 7329
ef317cd5
JX
7330#: builtin/merge-file.c:8
7331msgid ""
814ff314
JX
7332"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7333"<orig-file> <file2>"
ef317cd5 7334msgstr ""
814ff314
JX
7335"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
7336"件> <文件2>"
ef317cd5
JX
7337
7338#: builtin/merge-file.c:33
7339msgid "send results to standard output"
07432cef 7340msgstr "将结果发送到标准输出"
ef317cd5
JX
7341
7342#: builtin/merge-file.c:34
7343msgid "use a diff3 based merge"
07432cef 7344msgstr "使用基于 diff3 的合并"
ef317cd5
JX
7345
7346#: builtin/merge-file.c:35
7347msgid "for conflicts, use our version"
07432cef 7348msgstr "如果冲突,使用我们的版本"
ef317cd5
JX
7349
7350#: builtin/merge-file.c:37
7351msgid "for conflicts, use their version"
07432cef 7352msgstr "如果冲突,使用他们的版本"
ef317cd5
JX
7353
7354#: builtin/merge-file.c:39
7355msgid "for conflicts, use a union version"
07432cef 7356msgstr "如果冲突,使用联合版本"
ef317cd5
JX
7357
7358#: builtin/merge-file.c:42
7359msgid "for conflicts, use this marker size"
07432cef 7360msgstr "如果冲突,使用指定长度的标记"
ef317cd5
JX
7361
7362#: builtin/merge-file.c:43
7363msgid "do not warn about conflicts"
07432cef 7364msgstr "不要警告冲突"
ef317cd5
JX
7365
7366#: builtin/merge-file.c:45
814ff314
JX
7367msgid "set labels for file1/orig-file/file2"
7368msgstr "为 文件1/初始文件/文件2 设置标签"
c04f5ac3 7369
6c94aba5 7370#: builtin/mktree.c:64
ef317cd5 7371msgid "git mktree [-z] [--missing] [--batch]"
07432cef 7372msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 7373
6c94aba5 7374#: builtin/mktree.c:150
ef317cd5 7375msgid "input is NUL terminated"
07432cef 7376msgstr "输入以 NUL 字符终止"
c04f5ac3 7377
6c94aba5 7378#: builtin/mktree.c:151 builtin/write-tree.c:24
ef317cd5 7379msgid "allow missing objects"
07432cef 7380msgstr "允许丢失的对象"
c04f5ac3 7381
6c94aba5 7382#: builtin/mktree.c:152
ef317cd5 7383msgid "allow creation of more than one tree"
07432cef 7384msgstr "允许创建一个以上的树"
c04f5ac3 7385
90314792 7386#: builtin/mv.c:15
814ff314
JX
7387msgid "git mv [<options>] <source>... <destination>"
7388msgstr "git mv [<选项>] <源>... <目标>"
c04f5ac3 7389
220c313c
JX
7390#: builtin/mv.c:69
7391#, c-format
7392msgid "Directory %s is in index and no submodule?"
7393msgstr "目录 %s 在索引中并且不是子模组?"
7394
cfff71a9 7395#: builtin/mv.c:71
220c313c
JX
7396msgid "Please stage your changes to .gitmodules or stash them to proceed"
7397msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
7398
7399#: builtin/mv.c:89
7400#, c-format
7401msgid "%.*s is in index"
7402msgstr "%.*s 在索引中"
7403
7404#: builtin/mv.c:111
ef317cd5 7405msgid "force move/rename even if target exists"
07432cef 7406msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 7407
220c313c 7408#: builtin/mv.c:112
ef317cd5 7409msgid "skip move/rename errors"
07432cef 7410msgstr "跳过移动/重命名错误"
c04f5ac3 7411
220c313c
JX
7412#: builtin/mv.c:151
7413#, c-format
7414msgid "destination '%s' is not a directory"
7415msgstr "目标 '%s' 不是一个目录"
7416
7417#: builtin/mv.c:162
c04f5ac3
JX
7418#, c-format
7419msgid "Checking rename of '%s' to '%s'\n"
7420msgstr "检查 '%s' 到 '%s' 的重命名\n"
7421
220c313c 7422#: builtin/mv.c:166
c04f5ac3
JX
7423msgid "bad source"
7424msgstr "坏的源"
7425
220c313c 7426#: builtin/mv.c:169
c04f5ac3
JX
7427msgid "can not move directory into itself"
7428msgstr "不能将目录移动到自身"
7429
220c313c 7430#: builtin/mv.c:172
c04f5ac3
JX
7431msgid "cannot move directory over file"
7432msgstr "不能将目录移动到文件"
7433
220c313c 7434#: builtin/mv.c:181
c04f5ac3
JX
7435msgid "source directory is empty"
7436msgstr "源目录为空"
7437
220c313c 7438#: builtin/mv.c:206
c04f5ac3
JX
7439msgid "not under version control"
7440msgstr "不在版本控制之下"
7441
220c313c 7442#: builtin/mv.c:209
c04f5ac3
JX
7443msgid "destination exists"
7444msgstr "目标已存在"
7445
220c313c 7446#: builtin/mv.c:217
c04f5ac3
JX
7447#, c-format
7448msgid "overwriting '%s'"
7449msgstr "覆盖 '%s'"
7450
220c313c 7451#: builtin/mv.c:220
c04f5ac3
JX
7452msgid "Cannot overwrite"
7453msgstr "不能覆盖"
7454
220c313c 7455#: builtin/mv.c:223
c04f5ac3
JX
7456msgid "multiple sources for the same target"
7457msgstr "同一目标具有多个源"
7458
220c313c 7459#: builtin/mv.c:225
cfff71a9
JX
7460msgid "destination directory does not exist"
7461msgstr "目标目录不存在"
7462
220c313c 7463#: builtin/mv.c:232
c04f5ac3
JX
7464#, c-format
7465msgid "%s, source=%s, destination=%s"
7466msgstr "%s,源=%s,目标=%s"
7467
220c313c 7468#: builtin/mv.c:253
c04f5ac3
JX
7469#, c-format
7470msgid "Renaming %s to %s\n"
7471msgstr "重命名 %s 至 %s\n"
7472
7aea43ff 7473#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361
c04f5ac3
JX
7474#, c-format
7475msgid "renaming '%s' failed"
7476msgstr "重命名 '%s' 失败"
7477
6acbf033 7478#: builtin/name-rev.c:255
814ff314
JX
7479msgid "git name-rev [<options>] <commit>..."
7480msgstr "git name-rev [<选项>] <提交>..."
ef317cd5 7481
6acbf033 7482#: builtin/name-rev.c:256
814ff314
JX
7483msgid "git name-rev [<options>] --all"
7484msgstr "git name-rev [<选项>] --all"
ef317cd5 7485
6acbf033 7486#: builtin/name-rev.c:257
814ff314
JX
7487msgid "git name-rev [<options>] --stdin"
7488msgstr "git name-rev [<选项>] --stdin"
ef317cd5 7489
6acbf033 7490#: builtin/name-rev.c:309
ef317cd5 7491msgid "print only names (no SHA-1)"
07432cef 7492msgstr "只打印名称(无 SHA-1)"
ef317cd5 7493
6acbf033 7494#: builtin/name-rev.c:310
ef317cd5 7495msgid "only use tags to name the commits"
55a16ee4 7496msgstr "只使用标签来命名提交"
ef317cd5 7497
6acbf033 7498#: builtin/name-rev.c:312
ef317cd5 7499msgid "only use refs matching <pattern>"
07432cef 7500msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 7501
6acbf033 7502#: builtin/name-rev.c:314
ef317cd5 7503msgid "list all commits reachable from all refs"
07432cef 7504msgstr "列出可以从所有引用访问的提交"
ef317cd5 7505
6acbf033 7506#: builtin/name-rev.c:315
ef317cd5 7507msgid "read from stdin"
07432cef 7508msgstr "从标准输入读取"
ef317cd5 7509
6acbf033 7510#: builtin/name-rev.c:316
90314792
JX
7511msgid "allow to print `undefined` names (default)"
7512msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 7513
6acbf033 7514#: builtin/name-rev.c:322
2e8451e8 7515msgid "dereference tags in the input (internal use)"
55a16ee4 7516msgstr "反向解析输入中的标签(内部使用)"
2e8451e8
JX
7517
7518#: builtin/notes.c:24
814ff314 7519msgid "git notes [--ref <notes-ref>] [list [<object>]]"
07432cef 7520msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 7521
2e8451e8 7522#: builtin/notes.c:25
ef317cd5 7523msgid ""
814ff314 7524"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
04cb2f28 7525"| (-c | -C) <object>] [<object>]"
ef317cd5 7526msgstr ""
04cb2f28
JX
7527"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
7528"| (-c | -C) <对象>] [<对象>]"
ef317cd5 7529
2e8451e8 7530#: builtin/notes.c:26
814ff314 7531msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
07432cef 7532msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 7533
2e8451e8 7534#: builtin/notes.c:27
ef317cd5 7535msgid ""
814ff314 7536"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
04cb2f28 7537"(-c | -C) <object>] [<object>]"
ef317cd5 7538msgstr ""
04cb2f28
JX
7539"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
7540"(-c | -C) <对象>] [<对象>]"
ef317cd5 7541
2e8451e8 7542#: builtin/notes.c:28
814ff314 7543msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
04cb2f28 7544msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
ef317cd5 7545
2e8451e8 7546#: builtin/notes.c:29
814ff314 7547msgid "git notes [--ref <notes-ref>] show [<object>]"
07432cef 7548msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 7549
2e8451e8 7550#: builtin/notes.c:30
ef317cd5 7551msgid ""
814ff314 7552"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
07432cef 7553msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 7554
2e8451e8 7555#: builtin/notes.c:31
ef317cd5 7556msgid "git notes merge --commit [-v | -q]"
07432cef 7557msgstr "git notes merge --commit [-v | -q]"
ef317cd5 7558
2e8451e8 7559#: builtin/notes.c:32
ef317cd5 7560msgid "git notes merge --abort [-v | -q]"
07432cef 7561msgstr "git notes merge --abort [-v | -q]"
ef317cd5 7562
2e8451e8 7563#: builtin/notes.c:33
814ff314 7564msgid "git notes [--ref <notes-ref>] remove [<object>...]"
07432cef 7565msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 7566
2e8451e8 7567#: builtin/notes.c:34
814ff314 7568msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
07432cef 7569msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
ef317cd5 7570
2e8451e8 7571#: builtin/notes.c:35
814ff314 7572msgid "git notes [--ref <notes-ref>] get-ref"
07432cef 7573msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 7574
2e8451e8 7575#: builtin/notes.c:40
ef317cd5 7576msgid "git notes [list [<object>]]"
07432cef 7577msgstr "git notes [list [<对象>]]"
ef317cd5 7578
2e8451e8 7579#: builtin/notes.c:45
ef317cd5 7580msgid "git notes add [<options>] [<object>]"
07432cef 7581msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 7582
2e8451e8 7583#: builtin/notes.c:50
ef317cd5 7584msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 7585msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 7586
2e8451e8 7587#: builtin/notes.c:51
ef317cd5 7588msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 7589msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 7590
2e8451e8 7591#: builtin/notes.c:56
ef317cd5 7592msgid "git notes append [<options>] [<object>]"
07432cef 7593msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 7594
2e8451e8 7595#: builtin/notes.c:61
ef317cd5 7596msgid "git notes edit [<object>]"
07432cef 7597msgstr "git notes edit [<对象>]"
ef317cd5 7598
2e8451e8 7599#: builtin/notes.c:66
ef317cd5 7600msgid "git notes show [<object>]"
07432cef 7601msgstr "git notes show [<对象>]"
ef317cd5 7602
2e8451e8 7603#: builtin/notes.c:71
814ff314 7604msgid "git notes merge [<options>] <notes-ref>"
07432cef 7605msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 7606
2e8451e8 7607#: builtin/notes.c:72
ef317cd5 7608msgid "git notes merge --commit [<options>]"
07432cef 7609msgstr "git notes merge --commit [<选项>]"
ef317cd5 7610
2e8451e8 7611#: builtin/notes.c:73
ef317cd5 7612msgid "git notes merge --abort [<options>]"
07432cef 7613msgstr "git notes merge --abort [<选项>]"
ef317cd5 7614
2e8451e8 7615#: builtin/notes.c:78
ef317cd5 7616msgid "git notes remove [<object>]"
07432cef 7617msgstr "git notes remove [<对象>]"
ef317cd5 7618
2e8451e8 7619#: builtin/notes.c:83
ef317cd5 7620msgid "git notes prune [<options>]"
07432cef 7621msgstr "git notes prune [<选项>]"
ef317cd5 7622
2e8451e8 7623#: builtin/notes.c:88
ef317cd5 7624msgid "git notes get-ref"
07432cef 7625msgstr "git notes get-ref"
ef317cd5 7626
04cb2f28 7627#: builtin/notes.c:146
c04f5ac3
JX
7628#, c-format
7629msgid "unable to start 'show' for object '%s'"
7630msgstr "不能为对象 '%s' 开始 'show'"
7631
04cb2f28 7632#: builtin/notes.c:150
a77c07d9
JX
7633msgid "could not read 'show' output"
7634msgstr "不能读取 'show' 的输出"
c04f5ac3 7635
04cb2f28 7636#: builtin/notes.c:158
c04f5ac3
JX
7637#, c-format
7638msgid "failed to finish 'show' for object '%s'"
7639msgstr "无法为对象 '%s' 完成 'show'"
7640
04cb2f28 7641#: builtin/notes.c:173 builtin/tag.c:477
c04f5ac3
JX
7642#, c-format
7643msgid "could not create file '%s'"
7644msgstr "不能创建文件 '%s'"
7645
04cb2f28 7646#: builtin/notes.c:192
c04f5ac3
JX
7647msgid "Please supply the note contents using either -m or -F option"
7648msgstr "请通过 -m 或 -F 选项为注解提供内容"
7649
04cb2f28 7650#: builtin/notes.c:201
c04f5ac3
JX
7651msgid "unable to write note object"
7652msgstr "不能写注解对象"
7653
04cb2f28 7654#: builtin/notes.c:203
c04f5ac3 7655#, c-format
220c313c
JX
7656msgid "The note contents have been left in %s"
7657msgstr "注解内容被留在 %s 中"
c04f5ac3 7658
04cb2f28 7659#: builtin/notes.c:231 builtin/tag.c:693
c04f5ac3
JX
7660#, c-format
7661msgid "cannot read '%s'"
7662msgstr "不能读取 '%s'"
7663
04cb2f28 7664#: builtin/notes.c:233 builtin/tag.c:696
c04f5ac3
JX
7665#, c-format
7666msgid "could not open or read '%s'"
7667msgstr "不能打开或读取 '%s'"
7668
04cb2f28
JX
7669#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
7670#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
7671#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
7672#: builtin/notes.c:854 builtin/tag.c:709
c04f5ac3
JX
7673#, c-format
7674msgid "Failed to resolve '%s' as a valid ref."
90e6ef53 7675msgstr "无法解析 '%s' 为一个有效引用。"
c04f5ac3 7676
04cb2f28 7677#: builtin/notes.c:255
c04f5ac3
JX
7678#, c-format
7679msgid "Failed to read object '%s'."
7680msgstr "无法读取对象 '%s'。"
7681
04cb2f28 7682#: builtin/notes.c:259
6c94aba5
JX
7683#, c-format
7684msgid "Cannot read note data from non-blob object '%s'."
7685msgstr "不能从非数据对象 '%s' 中读取注解数据"
7686
04cb2f28 7687#: builtin/notes.c:299
c04f5ac3
JX
7688#, c-format
7689msgid "Malformed input line: '%s'."
7690msgstr "非法的输入行:'%s'。"
7691
04cb2f28 7692#: builtin/notes.c:314
c04f5ac3
JX
7693#, c-format
7694msgid "Failed to copy notes from '%s' to '%s'"
90e6ef53 7695msgstr "无法从 '%s' 到 '%s' 拷贝注解"
c04f5ac3 7696
04cb2f28
JX
7697#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
7698#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
7699#: builtin/notes.c:919
c04f5ac3
JX
7700msgid "too many parameters"
7701msgstr "参数太多"
7702
04cb2f28 7703#: builtin/notes.c:371 builtin/notes.c:658
c04f5ac3
JX
7704#, c-format
7705msgid "No note found for object %s."
7706msgstr "未发现对象 %s 的注解。"
7707
04cb2f28 7708#: builtin/notes.c:392 builtin/notes.c:555
ef317cd5 7709msgid "note contents as a string"
07432cef 7710msgstr "注解内容作为一个字符串"
ef317cd5 7711
04cb2f28 7712#: builtin/notes.c:395 builtin/notes.c:558
ef317cd5 7713msgid "note contents in a file"
07432cef 7714msgstr "注解内容到一个文件中"
ef317cd5 7715
04cb2f28
JX
7716#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
7717#: builtin/notes.c:563 builtin/tag.c:628
ef317cd5 7718msgid "object"
07432cef 7719msgstr "对象"
ef317cd5 7720
04cb2f28 7721#: builtin/notes.c:398 builtin/notes.c:561
ef317cd5 7722msgid "reuse and edit specified note object"
07432cef 7723msgstr "重用和编辑指定的注解对象"
ef317cd5 7724
04cb2f28 7725#: builtin/notes.c:401 builtin/notes.c:564
ef317cd5 7726msgid "reuse specified note object"
07432cef 7727msgstr "重用指定的注解对象"
ef317cd5 7728
04cb2f28
JX
7729#: builtin/notes.c:404 builtin/notes.c:567
7730msgid "allow storing empty note"
7731msgstr "允许保存空白注释"
7732
7733#: builtin/notes.c:405 builtin/notes.c:476
ef317cd5 7734msgid "replace existing notes"
07432cef 7735msgstr "替换已存在的注解"
ef317cd5 7736
04cb2f28 7737#: builtin/notes.c:430
c04f5ac3
JX
7738#, c-format
7739msgid ""
7740"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7741"existing notes"
7742msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7743
04cb2f28 7744#: builtin/notes.c:445 builtin/notes.c:524
c04f5ac3
JX
7745#, c-format
7746msgid "Overwriting existing notes for object %s\n"
7747msgstr "覆盖对象 %s 现存注解\n"
7748
04cb2f28
JX
7749#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859
7750#, c-format
7751msgid "Removing note for object %s\n"
7752msgstr "删除对象 %s 的注解\n"
7753
7754#: builtin/notes.c:477
ef317cd5 7755msgid "read objects from stdin"
07432cef 7756msgstr "从标准输入读取对象"
ef317cd5 7757
04cb2f28 7758#: builtin/notes.c:479
ef317cd5 7759msgid "load rewriting config for <command> (implies --stdin)"
07432cef 7760msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 7761
04cb2f28 7762#: builtin/notes.c:497
c04f5ac3
JX
7763msgid "too few parameters"
7764msgstr "参数太少"
7765
04cb2f28 7766#: builtin/notes.c:518
c04f5ac3
JX
7767#, c-format
7768msgid ""
7769"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7770"existing notes"
7771msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7772
04cb2f28 7773#: builtin/notes.c:530
c04f5ac3
JX
7774#, c-format
7775msgid "Missing notes on source object %s. Cannot copy."
7776msgstr "源对象 %s 缺少注解。不能拷贝。"
7777
04cb2f28 7778#: builtin/notes.c:582
ef317cd5
JX
7779#, c-format
7780msgid ""
7781"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7782"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7783msgstr ""
7784"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7785"请换用 'git notes add -f -m/-F/-c/-C'。\n"
7786
04cb2f28 7787#: builtin/notes.c:750
ef317cd5 7788msgid "General options"
07432cef 7789msgstr "通用选项"
ef317cd5 7790
04cb2f28 7791#: builtin/notes.c:752
ef317cd5 7792msgid "Merge options"
07432cef 7793msgstr "合并选项"
ef317cd5 7794
04cb2f28 7795#: builtin/notes.c:754
ef317cd5
JX
7796msgid ""
7797"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7798"cat_sort_uniq)"
07432cef 7799msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 7800
04cb2f28 7801#: builtin/notes.c:756
ef317cd5 7802msgid "Committing unmerged notes"
07432cef 7803msgstr "提交未合并的注解"
ef317cd5 7804
04cb2f28 7805#: builtin/notes.c:758
ef317cd5 7806msgid "finalize notes merge by committing unmerged notes"
07432cef 7807msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 7808
04cb2f28 7809#: builtin/notes.c:760
ef317cd5 7810msgid "Aborting notes merge resolution"
07432cef 7811msgstr "中止注解合并的方案"
ef317cd5 7812
04cb2f28 7813#: builtin/notes.c:762
ef317cd5 7814msgid "abort notes merge"
07432cef 7815msgstr "中止注解合并"
ef317cd5 7816
04cb2f28 7817#: builtin/notes.c:857
ef317cd5
JX
7818#, c-format
7819msgid "Object %s has no note\n"
7820msgstr "对象 %s 没有注解\n"
7821
04cb2f28 7822#: builtin/notes.c:869
ef317cd5 7823msgid "attempt to remove non-existent note is not an error"
07432cef 7824msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 7825
04cb2f28 7826#: builtin/notes.c:872
ef317cd5 7827msgid "read object names from the standard input"
07432cef 7828msgstr "从标准输入读取对象名称"
ef317cd5 7829
04cb2f28 7830#: builtin/notes.c:953
6c94aba5 7831msgid "notes-ref"
07432cef 7832msgstr "注解引用"
ef317cd5 7833
04cb2f28 7834#: builtin/notes.c:954
814ff314 7835msgid "use notes from <notes-ref>"
07432cef 7836msgstr "从 <注解引用> 使用注解"
ef317cd5 7837
7aea43ff 7838#: builtin/notes.c:989 builtin/remote.c:1618
ef317cd5
JX
7839#, c-format
7840msgid "Unknown subcommand: %s"
7841msgstr "未知子命令:%s"
7842
220c313c 7843#: builtin/pack-objects.c:28
ef317cd5 7844msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
07432cef 7845msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
ef317cd5 7846
220c313c 7847#: builtin/pack-objects.c:29
ef317cd5 7848msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
07432cef 7849msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
ef317cd5 7850
814ff314 7851#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
ef317cd5
JX
7852#, c-format
7853msgid "deflate error (%d)"
7854msgstr "压缩错误 (%d)"
7855
814ff314 7856#: builtin/pack-objects.c:771
6c94aba5
JX
7857msgid "Writing objects"
7858msgstr "写入对象中"
7859
7aea43ff 7860#: builtin/pack-objects.c:1011
6c94aba5
JX
7861msgid "disabling bitmap writing, as some objects are not being packed"
7862msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
7863
7aea43ff 7864#: builtin/pack-objects.c:2171
6c94aba5
JX
7865msgid "Compressing objects"
7866msgstr "压缩对象中"
7867
7aea43ff 7868#: builtin/pack-objects.c:2568
ef317cd5
JX
7869#, c-format
7870msgid "unsupported index version %s"
7871msgstr "不支持的索引版本 %s"
7872
7aea43ff 7873#: builtin/pack-objects.c:2572
ef317cd5
JX
7874#, c-format
7875msgid "bad index version '%s'"
7876msgstr "坏的索引版本 '%s'"
7877
7aea43ff 7878#: builtin/pack-objects.c:2595
ef317cd5
JX
7879#, c-format
7880msgid "option %s does not accept negative form"
7881msgstr "选项 %s 不接受否定格式"
7882
7aea43ff 7883#: builtin/pack-objects.c:2599
ef317cd5
JX
7884#, c-format
7885msgid "unable to parse value '%s' for option %s"
7886msgstr "不能解析选项 %1$s 的值 '%2$s'"
7887
7aea43ff 7888#: builtin/pack-objects.c:2619
ef317cd5 7889msgid "do not show progress meter"
07432cef 7890msgstr "不显示进度表"
ef317cd5 7891
7aea43ff 7892#: builtin/pack-objects.c:2621
ef317cd5 7893msgid "show progress meter"
07432cef 7894msgstr "显示进度表"
ef317cd5 7895
7aea43ff 7896#: builtin/pack-objects.c:2623
ef317cd5 7897msgid "show progress meter during object writing phase"
07432cef 7898msgstr "在对象写入阶段显示进度表"
ef317cd5 7899
7aea43ff 7900#: builtin/pack-objects.c:2626
ef317cd5 7901msgid "similar to --all-progress when progress meter is shown"
07432cef 7902msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 7903
7aea43ff 7904#: builtin/pack-objects.c:2627
ef317cd5 7905msgid "version[,offset]"
07432cef 7906msgstr "版本[,偏移]"
ef317cd5 7907
7aea43ff 7908#: builtin/pack-objects.c:2628
ef317cd5 7909msgid "write the pack index file in the specified idx format version"
07432cef 7910msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 7911
7aea43ff 7912#: builtin/pack-objects.c:2631
ef317cd5 7913msgid "maximum size of each output pack file"
07432cef 7914msgstr "每个输出包的最大尺寸"
ef317cd5 7915
7aea43ff 7916#: builtin/pack-objects.c:2633
ef317cd5 7917msgid "ignore borrowed objects from alternate object store"
07432cef 7918msgstr "忽略从替代对象存储里借用对象"
ef317cd5 7919
7aea43ff 7920#: builtin/pack-objects.c:2635
ef317cd5 7921msgid "ignore packed objects"
07432cef 7922msgstr "忽略包对象"
ef317cd5 7923
7aea43ff 7924#: builtin/pack-objects.c:2637
ef317cd5 7925msgid "limit pack window by objects"
07432cef 7926msgstr "限制打包窗口的对象数"
ef317cd5 7927
7aea43ff 7928#: builtin/pack-objects.c:2639
ef317cd5 7929msgid "limit pack window by memory in addition to object limit"
07432cef 7930msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 7931
7aea43ff 7932#: builtin/pack-objects.c:2641
ef317cd5 7933msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 7934msgstr "打包允许的 delta 链的最大长度"
ef317cd5 7935
7aea43ff 7936#: builtin/pack-objects.c:2643
ef317cd5 7937msgid "reuse existing deltas"
07432cef 7938msgstr "重用已存在的 deltas"
ef317cd5 7939
7aea43ff 7940#: builtin/pack-objects.c:2645
ef317cd5 7941msgid "reuse existing objects"
07432cef 7942msgstr "重用已存在的对象"
ef317cd5 7943
7aea43ff 7944#: builtin/pack-objects.c:2647
ef317cd5 7945msgid "use OFS_DELTA objects"
07432cef 7946msgstr "使用 OFS_DELTA 对象"
ef317cd5 7947
7aea43ff 7948#: builtin/pack-objects.c:2649
ef317cd5 7949msgid "use threads when searching for best delta matches"
07432cef 7950msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 7951
7aea43ff 7952#: builtin/pack-objects.c:2651
ef317cd5 7953msgid "do not create an empty pack output"
07432cef 7954msgstr "不创建空的包输出"
ef317cd5 7955
7aea43ff 7956#: builtin/pack-objects.c:2653
ef317cd5 7957msgid "read revision arguments from standard input"
d9d56b23 7958msgstr "从标准输入读取版本号参数"
ef317cd5 7959
7aea43ff 7960#: builtin/pack-objects.c:2655
ef317cd5 7961msgid "limit the objects to those that are not yet packed"
07432cef 7962msgstr "限制那些尚未打包的对象"
ef317cd5 7963
7aea43ff 7964#: builtin/pack-objects.c:2658
ef317cd5 7965msgid "include objects reachable from any reference"
07432cef 7966msgstr "包括可以从任何引用访问到的对象"
ef317cd5 7967
7aea43ff 7968#: builtin/pack-objects.c:2661
ef317cd5 7969msgid "include objects referred by reflog entries"
07432cef 7970msgstr "包括被引用日志引用到的对象"
ef317cd5 7971
7aea43ff 7972#: builtin/pack-objects.c:2664
220c313c
JX
7973msgid "include objects referred to by the index"
7974msgstr "包括被索引引用到的对象"
7975
7aea43ff 7976#: builtin/pack-objects.c:2667
ef317cd5 7977msgid "output pack to stdout"
07432cef 7978msgstr "输出包到标准输出"
ef317cd5 7979
7aea43ff 7980#: builtin/pack-objects.c:2669
ef317cd5 7981msgid "include tag objects that refer to objects to be packed"
53438e8f 7982msgstr "包括那些引用了待打包对象的标签对象"
ef317cd5 7983
7aea43ff 7984#: builtin/pack-objects.c:2671
ef317cd5 7985msgid "keep unreachable objects"
07432cef 7986msgstr "维持不可达的对象"
ef317cd5 7987
7aea43ff 7988#: builtin/pack-objects.c:2672 parse-options.h:139
ef317cd5
JX
7989msgid "time"
7990msgstr "时间"
7991
7aea43ff 7992#: builtin/pack-objects.c:2673
ef317cd5 7993msgid "unpack unreachable objects newer than <time>"
07432cef 7994msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 7995
7aea43ff 7996#: builtin/pack-objects.c:2676
ef317cd5 7997msgid "create thin packs"
07432cef 7998msgstr "创建精简包"
ef317cd5 7999
7aea43ff 8000#: builtin/pack-objects.c:2678
04cb2f28
JX
8001msgid "create packs suitable for shallow fetches"
8002msgstr "创建适合浅克隆版本库获取的包"
8003
7aea43ff 8004#: builtin/pack-objects.c:2680
ef317cd5 8005msgid "ignore packs that have companion .keep file"
07432cef 8006msgstr "忽略配有 .keep 文件的包"
ef317cd5 8007
7aea43ff 8008#: builtin/pack-objects.c:2682
ef317cd5 8009msgid "pack compression level"
07432cef 8010msgstr "打包压缩级别"
ef317cd5 8011
7aea43ff 8012#: builtin/pack-objects.c:2684
ef317cd5 8013msgid "do not hide commits by grafts"
cfff71a9 8014msgstr "显示被嫁接隐藏的提交"
ef317cd5 8015
7aea43ff 8016#: builtin/pack-objects.c:2686
6c94aba5
JX
8017msgid "use a bitmap index if available to speed up counting objects"
8018msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
8019
7aea43ff 8020#: builtin/pack-objects.c:2688
6c94aba5
JX
8021msgid "write a bitmap index together with the pack index"
8022msgstr "在建立包索引的同时创建 bitmap 索引"
8023
7aea43ff 8024#: builtin/pack-objects.c:2779
6c94aba5
JX
8025msgid "Counting objects"
8026msgstr "对象计数中"
8027
ef317cd5 8028#: builtin/pack-refs.c:6
814ff314
JX
8029msgid "git pack-refs [<options>]"
8030msgstr "git pack-refs [<选项>]"
c04f5ac3 8031
ef317cd5
JX
8032#: builtin/pack-refs.c:14
8033msgid "pack everything"
07432cef 8034msgstr "打包一切"
c04f5ac3 8035
ef317cd5
JX
8036#: builtin/pack-refs.c:15
8037msgid "prune loose refs (default)"
07432cef 8038msgstr "清除松散的引用(默认)"
c04f5ac3 8039
ef317cd5 8040#: builtin/prune-packed.c:7
814ff314
JX
8041msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8042msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
6792b93b 8043
220c313c 8044#: builtin/prune-packed.c:40
6c94aba5
JX
8045msgid "Removing duplicate objects"
8046msgstr "正在删除重复对象"
8047
5bb01d4f 8048#: builtin/prune.c:11
ef317cd5 8049msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
07432cef 8050msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7ac1c0ad 8051
5bb01d4f 8052#: builtin/prune.c:105 builtin/worktree.c:112
ef317cd5 8053msgid "do not remove, show only"
07432cef 8054msgstr "不删除,只显示"
7ac1c0ad 8055
5bb01d4f 8056#: builtin/prune.c:106 builtin/worktree.c:113
ef317cd5 8057msgid "report pruned objects"
07432cef 8058msgstr "报告清除的对象"
7ac1c0ad 8059
5bb01d4f 8060#: builtin/prune.c:109 builtin/worktree.c:115
ef317cd5 8061msgid "expire objects older than <time>"
07432cef 8062msgstr "使早于给定时间的对象过期"
ef317cd5
JX
8063
8064#: builtin/push.c:14
ef317cd5 8065msgid "git push [<options>] [<repository> [<refspec>...]]"
90314792 8066msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
7ac1c0ad 8067
6c94aba5 8068#: builtin/push.c:85
c04f5ac3 8069msgid "tag shorthand without <tag>"
55a16ee4 8070msgstr "标签后面未提供 <标签> 参数"
c04f5ac3 8071
6c94aba5 8072#: builtin/push.c:95
c04f5ac3 8073msgid "--delete only accepts plain target ref names"
90e6ef53 8074msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 8075
6acbf033 8076#: builtin/push.c:139
8ada9598
JX
8077msgid ""
8078"\n"
8079"To choose either option permanently, see push.default in 'git help config'."
8080msgstr ""
81809b99
JX
8081"\n"
8082"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 8083
6acbf033 8084#: builtin/push.c:142
8ada9598
JX
8085#, c-format
8086msgid ""
8087"The upstream branch of your current branch does not match\n"
8088"the name of your current branch. To push to the upstream branch\n"
8089"on the remote, use\n"
8090"\n"
8091" git push %s HEAD:%s\n"
8092"\n"
8093"To push to the branch of the same name on the remote, use\n"
8094"\n"
8095" git push %s %s\n"
8096"%s"
8097msgstr ""
81809b99
JX
8098"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
8099"上游分支,使用\n"
8100"\n"
8101" git push %s HEAD:%s\n"
8102"\n"
8103"为推送至远程同名分支,使用\n"
8104"\n"
8105" git push %s %s\n"
8106"%s"
8ada9598 8107
6acbf033 8108#: builtin/push.c:157
c04f5ac3
JX
8109#, c-format
8110msgid ""
8111"You are not currently on a branch.\n"
8112"To push the history leading to the current (detached HEAD)\n"
8113"state now, use\n"
8114"\n"
8115" git push %s HEAD:<name-of-remote-branch>\n"
8116msgstr ""
8117"您当前不在一个分支上。\n"
90e6ef53 8118"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3 8119"\n"
d9d56b23 8120" git push %s HEAD:<远程分支名字>\n"
c04f5ac3 8121
6acbf033 8122#: builtin/push.c:171
c04f5ac3
JX
8123#, c-format
8124msgid ""
8125"The current branch %s has no upstream branch.\n"
8126"To push the current branch and set the remote as upstream, use\n"
8127"\n"
8128" git push --set-upstream %s %s\n"
8129msgstr ""
8130"当前分支 %s 没有对应的上游分支。\n"
8131"为推送当前分支并建立与远程上游的跟踪,使用\n"
8132"\n"
8133" git push --set-upstream %s %s\n"
8134
6acbf033 8135#: builtin/push.c:179
c04f5ac3
JX
8136#, c-format
8137msgid "The current branch %s has multiple upstream branches, refusing to push."
8138msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
8139
6acbf033 8140#: builtin/push.c:182
73a60cd2
JX
8141#, c-format
8142msgid ""
8143"You are pushing to remote '%s', which is not the upstream of\n"
8144"your current branch '%s', without telling me what to push\n"
8145"to update which remote branch."
8146msgstr ""
8147"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
8148"而没有告诉我要推送什么、更新哪个远程分支。"
8149
c160d03f 8150# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
6acbf033 8151#: builtin/push.c:205
c160d03f 8152msgid ""
6c94aba5 8153"push.default is unset; its implicit value has changed in\n"
c160d03f 8154"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6c94aba5 8155"and maintain the traditional behavior, use:\n"
c160d03f
JX
8156"\n"
8157" git config --global push.default matching\n"
8158"\n"
8159"To squelch this message and adopt the new behavior now, use:\n"
8160"\n"
8161" git config --global push.default simple\n"
8162"\n"
cfff71a9
JX
8163"When push.default is set to 'matching', git will push local branches\n"
8164"to the remote branches that already exist with the same name.\n"
8165"\n"
6c94aba5 8166"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
cfff71a9
JX
8167"behavior, which only pushes the current branch to the corresponding\n"
8168"remote branch that 'git pull' uses to update the current branch.\n"
8169"\n"
c160d03f
JX
8170"See 'git help config' and search for 'push.default' for further "
8171"information.\n"
8172"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8173"'current' instead of 'simple' if you sometimes use older versions of Git)"
8174msgstr ""
6c94aba5 8175"push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
cfff71a9 8176"变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
c160d03f
JX
8177"\n"
8178" git config --global push.default matching\n"
8179"\n"
8180"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
8181"\n"
8182" git config --global push.default simple\n"
8183"\n"
cfff71a9
JX
8184"当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
8185"本地分支。\n"
8186"\n"
8187"从 Git 2.0 开始,Git 缺省采用更为保守的 'simple' 模式,只推送当前\n"
8188"分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
8189"\n"
c160d03f
JX
8190"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8191"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
90314792 8192"为保持兼容,请用 'current' 代替 'simple')"
c160d03f 8193
6acbf033 8194#: builtin/push.c:272
c04f5ac3
JX
8195msgid ""
8196"You didn't specify any refspecs to push, and push.default is \"nothing\"."
90314792 8197msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。"
c04f5ac3 8198
6acbf033 8199#: builtin/push.c:279
170e9899
JX
8200msgid ""
8201"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
8202"its remote counterpart. Integrate the remote changes (e.g.\n"
8203"'git pull ...') before pushing again.\n"
170e9899
JX
8204"See the 'Note about fast-forwards' in 'git push --help' for details."
8205msgstr ""
eff6d3a9 8206"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 8207"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 8208"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 8209
6acbf033 8210#: builtin/push.c:285
170e9899
JX
8211msgid ""
8212"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
8213"counterpart. Check out this branch and integrate the remote changes\n"
8214"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
8215"See the 'Note about fast-forwards' in 'git push --help' for details."
8216msgstr ""
eff6d3a9 8217"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 8218"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 8219"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 8220
6acbf033 8221#: builtin/push.c:291
07432cef 8222msgid ""
a77c07d9
JX
8223"Updates were rejected because the remote contains work that you do\n"
8224"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
8225"to the same ref. You may want to first integrate the remote changes\n"
8226"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
8227"See the 'Note about fast-forwards' in 'git push --help' for details."
8228msgstr ""
8229"更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
2e8451e8
JX
8230"一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
8231"(如 'git pull ...')。\n"
a77c07d9
JX
8232"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8233
6acbf033 8234#: builtin/push.c:298
a77c07d9 8235msgid "Updates were rejected because the tag already exists in the remote."
55a16ee4 8236msgstr "更新被拒绝,因为该标签在远程已经存在。"
a77c07d9 8237
6acbf033 8238#: builtin/push.c:301
a77c07d9
JX
8239msgid ""
8240"You cannot update a remote ref that points at a non-commit object,\n"
8241"or update a remote ref to make it point at a non-commit object,\n"
8242"without using the '--force' option.\n"
8243msgstr ""
8244"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
8245"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 8246
6acbf033 8247#: builtin/push.c:360
c04f5ac3
JX
8248#, c-format
8249msgid "Pushing to %s\n"
8250msgstr "推送到 %s\n"
8251
6acbf033 8252#: builtin/push.c:364
c04f5ac3
JX
8253#, c-format
8254msgid "failed to push some refs to '%s'"
8255msgstr "无法推送一些引用到 '%s'"
8256
6acbf033 8257#: builtin/push.c:394
c04f5ac3
JX
8258#, c-format
8259msgid "bad repository '%s'"
90e6ef53 8260msgstr "坏的版本库 '%s'"
c04f5ac3 8261
6acbf033 8262#: builtin/push.c:395
c04f5ac3
JX
8263msgid ""
8264"No configured push destination.\n"
8265"Either specify the URL from the command-line or configure a remote "
8266"repository using\n"
8267"\n"
8268" git remote add <name> <url>\n"
8269"\n"
8270"and then push using the remote name\n"
8271"\n"
8272" git push <name>\n"
8273msgstr ""
90e6ef53 8274"没有配置推送目标。\n"
07432cef 8275"或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
c04f5ac3 8276"\n"
d9d56b23 8277" git remote add <名称> <地址>\n"
c04f5ac3
JX
8278"\n"
8279"然后使用该远程版本库名执行推送\n"
8280"\n"
d9d56b23 8281" git push <名称>\n"
c04f5ac3 8282
6acbf033 8283#: builtin/push.c:410
c04f5ac3
JX
8284msgid "--all and --tags are incompatible"
8285msgstr "--all 和 --tags 不兼容"
8286
6acbf033 8287#: builtin/push.c:411
c04f5ac3 8288msgid "--all can't be combined with refspecs"
90314792 8289msgstr "--all 不能和引用规则同时使用"
c04f5ac3 8290
6acbf033 8291#: builtin/push.c:416
c04f5ac3
JX
8292msgid "--mirror and --tags are incompatible"
8293msgstr "--mirror 和 --tags 不兼容"
8294
6acbf033 8295#: builtin/push.c:417
c04f5ac3 8296msgid "--mirror can't be combined with refspecs"
90314792 8297msgstr "--mirror 不能和引用规则同时使用"
c04f5ac3 8298
6acbf033 8299#: builtin/push.c:422
c04f5ac3
JX
8300msgid "--all and --mirror are incompatible"
8301msgstr "--all 和 --mirror 不兼容"
8302
814ff314 8303#: builtin/push.c:502
ef317cd5 8304msgid "repository"
07432cef 8305msgstr "版本库"
ef317cd5 8306
814ff314 8307#: builtin/push.c:503
ef317cd5 8308msgid "push all refs"
07432cef 8309msgstr "推送所有引用"
ef317cd5 8310
814ff314 8311#: builtin/push.c:504
ef317cd5 8312msgid "mirror all refs"
07432cef 8313msgstr "镜像所有引用"
ef317cd5 8314
814ff314 8315#: builtin/push.c:506
ef317cd5 8316msgid "delete refs"
07432cef 8317msgstr "删除引用"
ef317cd5 8318
814ff314 8319#: builtin/push.c:507
ef317cd5 8320msgid "push tags (can't be used with --all or --mirror)"
55a16ee4 8321msgstr "推送标签(不能使用 --all or --mirror)"
ef317cd5 8322
814ff314 8323#: builtin/push.c:510
ef317cd5
JX
8324msgid "force updates"
8325msgstr "强制更新"
8326
814ff314 8327#: builtin/push.c:512
90314792
JX
8328msgid "refname>:<expect"
8329msgstr "引用名>:<期望值"
8330
814ff314 8331#: builtin/push.c:513
90314792
JX
8332msgid "require old value of ref to be at this value"
8333msgstr "要求引用旧的取值为设定值"
8334
814ff314 8335#: builtin/push.c:516
ef317cd5 8336msgid "control recursive pushing of submodules"
07432cef 8337msgstr "控制子模组的递归推送"
ef317cd5 8338
814ff314 8339#: builtin/push.c:518
ef317cd5 8340msgid "use thin pack"
07432cef 8341msgstr "使用精简打包"
ef317cd5 8342
814ff314 8343#: builtin/push.c:519 builtin/push.c:520
ef317cd5 8344msgid "receive pack program"
07432cef 8345msgstr "接收包程序"
ef317cd5 8346
814ff314 8347#: builtin/push.c:521
ef317cd5 8348msgid "set upstream for git pull/status"
07432cef 8349msgstr "设置 git pull/status 的上游"
ef317cd5 8350
814ff314 8351#: builtin/push.c:524
ef317cd5 8352msgid "prune locally removed refs"
07432cef 8353msgstr "清除本地删除的引用"
ef317cd5 8354
814ff314 8355#: builtin/push.c:526
a77c07d9
JX
8356msgid "bypass pre-push hook"
8357msgstr "绕过 pre-push 钩子"
8358
814ff314 8359#: builtin/push.c:527
1003b3a5 8360msgid "push missing but relevant tags"
55a16ee4 8361msgstr "推送缺失但有关的标签"
1003b3a5 8362
814ff314 8363#: builtin/push.c:529
220c313c
JX
8364msgid "GPG sign the push"
8365msgstr "用 GPG 为推送签名"
8366
814ff314
JX
8367#: builtin/push.c:530
8368msgid "request atomic transaction on remote side"
8369msgstr "需要远端支持原子事务"
8370
8371#: builtin/push.c:539
c04f5ac3
JX
8372msgid "--delete is incompatible with --all, --mirror and --tags"
8373msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8374
814ff314 8375#: builtin/push.c:541
c04f5ac3
JX
8376msgid "--delete doesn't make sense without any refs"
8377msgstr "--delete 未接任何引用没有意义"
8378
220c313c 8379#: builtin/read-tree.c:37
ef317cd5
JX
8380msgid ""
8381"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
8382"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8383"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8384msgstr ""
07432cef
WS
8385"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
8386"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8387"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
ef317cd5 8388
220c313c 8389#: builtin/read-tree.c:110
ef317cd5 8390msgid "write resulting index to <file>"
d9d56b23 8391msgstr "将索引结果写入 <文件>"
ef317cd5 8392
220c313c 8393#: builtin/read-tree.c:113
ef317cd5 8394msgid "only empty the index"
07432cef 8395msgstr "只是清空索引"
ef317cd5 8396
220c313c 8397#: builtin/read-tree.c:115
ef317cd5 8398msgid "Merging"
07432cef 8399msgstr "合并"
ef317cd5 8400
220c313c 8401#: builtin/read-tree.c:117
ef317cd5 8402msgid "perform a merge in addition to a read"
07432cef 8403msgstr "读取之余再执行一个合并"
ef317cd5 8404
220c313c 8405#: builtin/read-tree.c:119
ef317cd5 8406msgid "3-way merge if no file level merging required"
07432cef 8407msgstr "如果没有文件级合并需要,执行三路合并"
ef317cd5 8408
220c313c 8409#: builtin/read-tree.c:121
ef317cd5 8410msgid "3-way merge in presence of adds and removes"
07432cef 8411msgstr "存在添加和删除时,也执行三路合并"
ef317cd5 8412
220c313c 8413#: builtin/read-tree.c:123
ef317cd5 8414msgid "same as -m, but discard unmerged entries"
07432cef 8415msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 8416
220c313c 8417#: builtin/read-tree.c:124
ef317cd5 8418msgid "<subdirectory>/"
07432cef 8419msgstr "<子目录>/"
ef317cd5 8420
220c313c 8421#: builtin/read-tree.c:125
ef317cd5 8422msgid "read the tree into the index under <subdirectory>/"
07432cef 8423msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 8424
220c313c 8425#: builtin/read-tree.c:128
ef317cd5 8426msgid "update working tree with merge result"
07432cef 8427msgstr "用合并的结果更新工作区"
ef317cd5 8428
220c313c 8429#: builtin/read-tree.c:130
ef317cd5 8430msgid "gitignore"
07432cef 8431msgstr "gitignore"
ef317cd5 8432
220c313c 8433#: builtin/read-tree.c:131
ef317cd5 8434msgid "allow explicitly ignored files to be overwritten"
07432cef 8435msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 8436
220c313c 8437#: builtin/read-tree.c:134
ef317cd5 8438msgid "don't check the working tree after merging"
07432cef 8439msgstr "合并后不检查工作区"
ef317cd5 8440
220c313c 8441#: builtin/read-tree.c:135
ef317cd5 8442msgid "don't update the index or the work tree"
07432cef 8443msgstr "不更新索引区和工作区"
ef317cd5 8444
220c313c 8445#: builtin/read-tree.c:137
ef317cd5 8446msgid "skip applying sparse checkout filter"
07432cef 8447msgstr "跳过应用稀疏检出过滤器"
ef317cd5 8448
220c313c 8449#: builtin/read-tree.c:139
ef317cd5 8450msgid "debug unpack-trees"
07432cef 8451msgstr "调试 unpack-trees"
ef317cd5 8452
7aea43ff 8453#: builtin/reflog.c:430
2e8451e8
JX
8454#, c-format
8455msgid "%s' for '%s' is not a valid timestamp"
8456msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8457
7aea43ff 8458#: builtin/reflog.c:547 builtin/reflog.c:552
2e8451e8
JX
8459#, c-format
8460msgid "'%s' is not a valid timestamp"
8461msgstr "'%s' 不是一个有效的时间戳"
8462
cfff71a9 8463#: builtin/remote.c:12
ef317cd5 8464msgid "git remote [-v | --verbose]"
07432cef 8465msgstr "git remote [-v | --verbose]"
ef317cd5 8466
cfff71a9 8467#: builtin/remote.c:13
ef317cd5 8468msgid ""
814ff314 8469"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
ef317cd5
JX
8470"mirror=<fetch|push>] <name> <url>"
8471msgstr ""
814ff314 8472"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
d9d56b23 8473"mirror=<fetch|push>] <名称> <地址>"
ef317cd5 8474
cfff71a9 8475#: builtin/remote.c:14 builtin/remote.c:33
ef317cd5 8476msgid "git remote rename <old> <new>"
07432cef 8477msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 8478
cfff71a9 8479#: builtin/remote.c:15 builtin/remote.c:38
ef317cd5 8480msgid "git remote remove <name>"
07432cef 8481msgstr "git remote remove <名称>"
ef317cd5 8482
814ff314
JX
8483#: builtin/remote.c:16 builtin/remote.c:43
8484msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8485msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
ef317cd5 8486
cfff71a9 8487#: builtin/remote.c:17
ef317cd5 8488msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 8489msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 8490
cfff71a9 8491#: builtin/remote.c:18
ef317cd5 8492msgid "git remote prune [-n | --dry-run] <name>"
07432cef 8493msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 8494
cfff71a9 8495#: builtin/remote.c:19
ef317cd5
JX
8496msgid ""
8497"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 8498msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 8499
cfff71a9 8500#: builtin/remote.c:20
ef317cd5 8501msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 8502msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 8503
cfff71a9 8504#: builtin/remote.c:21 builtin/remote.c:69
ef317cd5 8505msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 8506msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 8507
cfff71a9 8508#: builtin/remote.c:22 builtin/remote.c:70
ef317cd5 8509msgid "git remote set-url --add <name> <newurl>"
07432cef 8510msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 8511
cfff71a9 8512#: builtin/remote.c:23 builtin/remote.c:71
ef317cd5 8513msgid "git remote set-url --delete <name> <url>"
07432cef 8514msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 8515
cfff71a9 8516#: builtin/remote.c:28
ef317cd5 8517msgid "git remote add [<options>] <name> <url>"
07432cef 8518msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 8519
cfff71a9 8520#: builtin/remote.c:48
ef317cd5 8521msgid "git remote set-branches <name> <branch>..."
07432cef 8522msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 8523
cfff71a9 8524#: builtin/remote.c:49
ef317cd5 8525msgid "git remote set-branches --add <name> <branch>..."
07432cef 8526msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 8527
cfff71a9 8528#: builtin/remote.c:54
ef317cd5 8529msgid "git remote show [<options>] <name>"
07432cef 8530msgstr "git remote show [<选项>] <名称>"
ef317cd5 8531
cfff71a9 8532#: builtin/remote.c:59
ef317cd5 8533msgid "git remote prune [<options>] <name>"
07432cef 8534msgstr "git remote prune [<选项>] <名称>"
ef317cd5 8535
cfff71a9 8536#: builtin/remote.c:64
ef317cd5 8537msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 8538msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 8539
cfff71a9 8540#: builtin/remote.c:88
81809b99 8541#, c-format
8ada9598 8542msgid "Updating %s"
81809b99 8543msgstr "更新 %s 中"
8ada9598 8544
cfff71a9 8545#: builtin/remote.c:120
8ada9598
JX
8546msgid ""
8547"--mirror is dangerous and deprecated; please\n"
8548"\t use --mirror=fetch or --mirror=push instead"
8549msgstr ""
81809b99
JX
8550"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8551"\t 或 --mirror=push"
8ada9598 8552
cfff71a9 8553#: builtin/remote.c:137
81809b99 8554#, c-format
8ada9598 8555msgid "unknown mirror argument: %s"
81809b99 8556msgstr "未知的镜像参数:%s"
8ada9598 8557
cfff71a9 8558#: builtin/remote.c:153
ef317cd5 8559msgid "fetch the remote branches"
07432cef 8560msgstr "抓取远程的分支"
ef317cd5 8561
cfff71a9 8562#: builtin/remote.c:155
ef317cd5 8563msgid "import all tags and associated objects when fetching"
55a16ee4 8564msgstr "抓取时导入所有的标签和关联对象"
ef317cd5 8565
cfff71a9 8566#: builtin/remote.c:158
ef317cd5 8567msgid "or do not fetch any tag at all (--no-tags)"
55a16ee4 8568msgstr "或不抓取任何标签(--no-tags)"
ef317cd5 8569
cfff71a9 8570#: builtin/remote.c:160
ef317cd5 8571msgid "branch(es) to track"
07432cef 8572msgstr "跟踪的分支"
ef317cd5 8573
cfff71a9 8574#: builtin/remote.c:161
ef317cd5 8575msgid "master branch"
07432cef 8576msgstr "主线分支"
ef317cd5 8577
cfff71a9 8578#: builtin/remote.c:162
ef317cd5 8579msgid "push|fetch"
07432cef 8580msgstr "push|fetch"
ef317cd5 8581
cfff71a9 8582#: builtin/remote.c:163
ef317cd5 8583msgid "set up remote as a mirror to push to or fetch from"
07432cef 8584msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 8585
cfff71a9 8586#: builtin/remote.c:175
8ada9598 8587msgid "specifying a master branch makes no sense with --mirror"
81809b99 8588msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 8589
cfff71a9 8590#: builtin/remote.c:177
8ada9598 8591msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 8592msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 8593
7aea43ff 8594#: builtin/remote.c:187 builtin/remote.c:640
81809b99 8595#, c-format
8ada9598 8596msgid "remote %s already exists."
81809b99 8597msgstr "远程 %s 已经存在。"
8ada9598 8598
7aea43ff 8599#: builtin/remote.c:191 builtin/remote.c:644
81809b99 8600#, c-format
8ada9598 8601msgid "'%s' is not a valid remote name"
81809b99 8602msgstr "'%s' 不是一个有效的远程名称"
8ada9598 8603
d9d56b23 8604#: builtin/remote.c:235
81809b99 8605#, c-format
8ada9598 8606msgid "Could not setup master '%s'"
81809b99 8607msgstr "无法设置 master '%s'"
8ada9598 8608
d9d56b23 8609#: builtin/remote.c:335
81809b99 8610#, c-format
8ada9598 8611msgid "Could not get fetch map for refspec %s"
90314792 8612msgstr "无法得到引用规则 %s 的获取列表"
8ada9598 8613
d9d56b23 8614#: builtin/remote.c:436 builtin/remote.c:444
8ada9598 8615msgid "(matching)"
81809b99 8616msgstr "(匹配)"
8ada9598 8617
d9d56b23 8618#: builtin/remote.c:448
8ada9598 8619msgid "(delete)"
81809b99 8620msgstr "(删除)"
8ada9598 8621
7aea43ff 8622#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601
81809b99 8623#, c-format
8ada9598 8624msgid "Could not append '%s' to '%s'"
81809b99 8625msgstr "不能添加 '%s' 至 '%s'"
8ada9598 8626
7aea43ff 8627#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892
81809b99 8628#, c-format
8ada9598 8629msgid "No such remote: %s"
81809b99 8630msgstr "没有这样的远程:%s"
8ada9598 8631
7aea43ff 8632#: builtin/remote.c:650
81809b99 8633#, c-format
8ada9598 8634msgid "Could not rename config section '%s' to '%s'"
81809b99 8635msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 8636
7aea43ff 8637#: builtin/remote.c:656 builtin/remote.c:844
81809b99 8638#, c-format
8ada9598 8639msgid "Could not remove config section '%s'"
81809b99 8640msgstr "不能移除配置小节 '%s'"
8ada9598 8641
7aea43ff 8642#: builtin/remote.c:671
8ada9598
JX
8643#, c-format
8644msgid ""
d691f479 8645"Not updating non-default fetch refspec\n"
8ada9598
JX
8646"\t%s\n"
8647"\tPlease update the configuration manually if necessary."
8648msgstr ""
90314792 8649"没有更新非默认的获取引用规则\n"
81809b99
JX
8650"\t%s\n"
8651"\t如果必要请手动更新配置。"
8ada9598 8652
7aea43ff 8653#: builtin/remote.c:677
81809b99 8654#, c-format
8ada9598 8655msgid "Could not append '%s'"
81809b99 8656msgstr "不能追加 '%s'"
8ada9598 8657
7aea43ff 8658#: builtin/remote.c:688
81809b99 8659#, c-format
8ada9598 8660msgid "Could not set '%s'"
81809b99 8661msgstr "不能设置 '%s'"
8ada9598 8662
7aea43ff 8663#: builtin/remote.c:710
81809b99 8664#, c-format
8ada9598 8665msgid "deleting '%s' failed"
81809b99 8666msgstr "删除 '%s' 失败"
8ada9598 8667
7aea43ff 8668#: builtin/remote.c:744
81809b99 8669#, c-format
8ada9598 8670msgid "creating '%s' failed"
81809b99 8671msgstr "创建 '%s' 失败"
8ada9598 8672
7aea43ff 8673#: builtin/remote.c:763
81809b99 8674#, c-format
8ada9598 8675msgid "Could not remove branch %s"
81809b99 8676msgstr "无法移除分支 %s"
8ada9598 8677
7aea43ff 8678#: builtin/remote.c:830
8ada9598
JX
8679msgid ""
8680"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8681"to delete it, use:"
8682msgid_plural ""
8683"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8684"to delete them, use:"
5ae481e0
JX
8685msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8686msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 8687
7aea43ff 8688#: builtin/remote.c:945
8ada9598
JX
8689#, c-format
8690msgid " new (next fetch will store in remotes/%s)"
81809b99 8691msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 8692
7aea43ff 8693#: builtin/remote.c:948
8ada9598 8694msgid " tracked"
81809b99 8695msgstr " 已跟踪"
8ada9598 8696
7aea43ff 8697#: builtin/remote.c:950
8ada9598 8698msgid " stale (use 'git remote prune' to remove)"
81809b99 8699msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 8700
7aea43ff 8701#: builtin/remote.c:952
8ada9598 8702msgid " ???"
81809b99 8703msgstr " ???"
8ada9598 8704
7aea43ff 8705#: builtin/remote.c:993
8ada9598
JX
8706#, c-format
8707msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 8708msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 8709
7aea43ff 8710#: builtin/remote.c:1000
81809b99 8711#, c-format
8ada9598 8712msgid "rebases onto remote %s"
81809b99 8713msgstr "变基到远程 %s"
8ada9598 8714
7aea43ff 8715#: builtin/remote.c:1003
81809b99 8716#, c-format
8ada9598 8717msgid " merges with remote %s"
81809b99 8718msgstr " 与远程 %s 合并"
8ada9598 8719
7aea43ff 8720#: builtin/remote.c:1004
8ada9598 8721msgid " and with remote"
81809b99 8722msgstr " 且有远程"
8ada9598 8723
7aea43ff 8724#: builtin/remote.c:1006
81809b99 8725#, c-format
8ada9598 8726msgid "merges with remote %s"
81809b99 8727msgstr "与远程 %s 合并"
8ada9598 8728
7aea43ff 8729#: builtin/remote.c:1007
8ada9598 8730msgid " and with remote"
81809b99 8731msgstr " 且有远程"
8ada9598 8732
7aea43ff 8733#: builtin/remote.c:1053
8ada9598 8734msgid "create"
81809b99 8735msgstr "创建"
8ada9598 8736
7aea43ff 8737#: builtin/remote.c:1056
8ada9598 8738msgid "delete"
81809b99 8739msgstr "删除"
8ada9598 8740
7aea43ff 8741#: builtin/remote.c:1060
8ada9598 8742msgid "up to date"
81809b99 8743msgstr "最新"
8ada9598 8744
7aea43ff 8745#: builtin/remote.c:1063
8ada9598 8746msgid "fast-forwardable"
81809b99 8747msgstr "可快进"
8ada9598 8748
7aea43ff 8749#: builtin/remote.c:1066
8ada9598 8750msgid "local out of date"
81809b99 8751msgstr "本地已过时"
8ada9598 8752
7aea43ff 8753#: builtin/remote.c:1073
8ada9598
JX
8754#, c-format
8755msgid " %-*s forces to %-*s (%s)"
81809b99 8756msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 8757
7aea43ff 8758#: builtin/remote.c:1076
8ada9598
JX
8759#, c-format
8760msgid " %-*s pushes to %-*s (%s)"
81809b99 8761msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 8762
7aea43ff 8763#: builtin/remote.c:1080
8ada9598
JX
8764#, c-format
8765msgid " %-*s forces to %s"
81809b99 8766msgstr " %-*s 强制推送至 %s"
8ada9598 8767
7aea43ff 8768#: builtin/remote.c:1083
8ada9598
JX
8769#, c-format
8770msgid " %-*s pushes to %s"
81809b99 8771msgstr " %-*s 推送至 %s"
8ada9598 8772
7aea43ff 8773#: builtin/remote.c:1151
ef317cd5 8774msgid "do not query remotes"
07432cef 8775msgstr "不查询远程"
ef317cd5 8776
7aea43ff 8777#: builtin/remote.c:1178
81809b99 8778#, c-format
8ada9598 8779msgid "* remote %s"
81809b99 8780msgstr "* 远程 %s"
8ada9598 8781
7aea43ff 8782#: builtin/remote.c:1179
8ada9598
JX
8783#, c-format
8784msgid " Fetch URL: %s"
81809b99 8785msgstr " 获取地址:%s"
8ada9598 8786
7aea43ff 8787#: builtin/remote.c:1180 builtin/remote.c:1331
8ada9598 8788msgid "(no URL)"
81809b99 8789msgstr "(无 URL)"
8ada9598 8790
7aea43ff 8791#: builtin/remote.c:1189 builtin/remote.c:1191
8ada9598
JX
8792#, c-format
8793msgid " Push URL: %s"
81809b99 8794msgstr " 推送地址:%s"
8ada9598 8795
7aea43ff 8796#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197
81809b99 8797#, c-format
8ada9598 8798msgid " HEAD branch: %s"
81809b99 8799msgstr " HEAD分支:%s"
8ada9598 8800
7aea43ff 8801#: builtin/remote.c:1199
8ada9598
JX
8802#, c-format
8803msgid ""
8804" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 8805msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 8806
7aea43ff 8807#: builtin/remote.c:1211
81809b99 8808#, c-format
8ada9598
JX
8809msgid " Remote branch:%s"
8810msgid_plural " Remote branches:%s"
81809b99 8811msgstr[0] " 远程分支:%s"
5ae481e0 8812msgstr[1] " 远程分支:%s"
8ada9598 8813
81809b99 8814# 译者:中文字符串拼接,可删除前导空格
7aea43ff 8815#: builtin/remote.c:1214 builtin/remote.c:1241
8ada9598 8816msgid " (status not queried)"
81809b99 8817msgstr "(状态未查询)"
8ada9598 8818
7aea43ff 8819#: builtin/remote.c:1223
8ada9598
JX
8820msgid " Local branch configured for 'git pull':"
8821msgid_plural " Local branches configured for 'git pull':"
81809b99 8822msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 8823msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 8824
7aea43ff 8825#: builtin/remote.c:1231
8ada9598 8826msgid " Local refs will be mirrored by 'git push'"
81809b99 8827msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 8828
7aea43ff 8829#: builtin/remote.c:1238
81809b99 8830#, c-format
8ada9598
JX
8831msgid " Local ref configured for 'git push'%s:"
8832msgid_plural " Local refs configured for 'git push'%s:"
81809b99 8833msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 8834msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 8835
7aea43ff 8836#: builtin/remote.c:1259
ef317cd5 8837msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 8838msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 8839
7aea43ff 8840#: builtin/remote.c:1261
ef317cd5 8841msgid "delete refs/remotes/<name>/HEAD"
07432cef 8842msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 8843
7aea43ff 8844#: builtin/remote.c:1276
8ada9598 8845msgid "Cannot determine remote HEAD"
81809b99 8846msgstr "无法确定远程 HEAD"
8ada9598 8847
7aea43ff 8848#: builtin/remote.c:1278
8ada9598 8849msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 8850msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 8851
7aea43ff 8852#: builtin/remote.c:1288
81809b99 8853#, c-format
8ada9598 8854msgid "Could not delete %s"
81809b99 8855msgstr "无法删除 %s"
8ada9598 8856
7aea43ff 8857#: builtin/remote.c:1296
81809b99 8858#, c-format
8ada9598 8859msgid "Not a valid ref: %s"
81809b99 8860msgstr "不是一个有效引用:%s"
8ada9598 8861
7aea43ff 8862#: builtin/remote.c:1298
81809b99 8863#, c-format
8ada9598 8864msgid "Could not setup %s"
81809b99 8865msgstr "不能设置 %s"
8ada9598
JX
8866
8867# 译者:注意保持前导空格
7aea43ff 8868#: builtin/remote.c:1316
81809b99 8869#, c-format
8ada9598 8870msgid " %s will become dangling!"
07432cef 8871msgstr " %s 将成为摇摆状态!"
8ada9598
JX
8872
8873# 译者:注意保持前导空格
7aea43ff 8874#: builtin/remote.c:1317
81809b99 8875#, c-format
8ada9598 8876msgid " %s has become dangling!"
07432cef 8877msgstr " %s 已成为摇摆状态!"
8ada9598 8878
7aea43ff 8879#: builtin/remote.c:1327
81809b99 8880#, c-format
8ada9598 8881msgid "Pruning %s"
81809b99 8882msgstr "修剪 %s"
8ada9598 8883
7aea43ff 8884#: builtin/remote.c:1328
8ada9598
JX
8885#, c-format
8886msgid "URL: %s"
81809b99 8887msgstr "URL:%s"
8ada9598 8888
7aea43ff 8889#: builtin/remote.c:1351
8ada9598
JX
8890#, c-format
8891msgid " * [would prune] %s"
81809b99 8892msgstr " * [将删除] %s"
8ada9598 8893
7aea43ff 8894#: builtin/remote.c:1354
8ada9598
JX
8895#, c-format
8896msgid " * [pruned] %s"
81809b99 8897msgstr " * [已删除] %s"
8ada9598 8898
7aea43ff 8899#: builtin/remote.c:1399
ef317cd5 8900msgid "prune remotes after fetching"
07432cef 8901msgstr "抓取后清除远程"
ef317cd5 8902
7aea43ff 8903#: builtin/remote.c:1465 builtin/remote.c:1539
81809b99 8904#, c-format
8ada9598 8905msgid "No such remote '%s'"
81809b99 8906msgstr "没有此远程 '%s'"
8ada9598 8907
7aea43ff 8908#: builtin/remote.c:1485
ef317cd5 8909msgid "add branch"
07432cef 8910msgstr "添加分支"
ef317cd5 8911
7aea43ff 8912#: builtin/remote.c:1492
8ada9598 8913msgid "no remote specified"
81809b99 8914msgstr "未指定远程"
8ada9598 8915
7aea43ff 8916#: builtin/remote.c:1514
ef317cd5 8917msgid "manipulate push URLs"
07432cef 8918msgstr "操作推送 URLS"
ef317cd5 8919
7aea43ff 8920#: builtin/remote.c:1516
ef317cd5 8921msgid "add URL"
07432cef 8922msgstr "添加 URL"
ef317cd5 8923
7aea43ff 8924#: builtin/remote.c:1518
ef317cd5 8925msgid "delete URLs"
07432cef 8926msgstr "删除 URLS"
ef317cd5 8927
7aea43ff 8928#: builtin/remote.c:1525
8ada9598 8929msgid "--add --delete doesn't make sense"
81809b99 8930msgstr "--add --delete 无意义"
8ada9598 8931
7aea43ff 8932#: builtin/remote.c:1565
81809b99 8933#, c-format
8ada9598 8934msgid "Invalid old URL pattern: %s"
81809b99 8935msgstr "无效的旧URL匹配模版:%s"
8ada9598 8936
7aea43ff 8937#: builtin/remote.c:1573
81809b99 8938#, c-format
8ada9598 8939msgid "No such URL found: %s"
81809b99 8940msgstr "未找到此URL:%s"
8ada9598 8941
7aea43ff 8942#: builtin/remote.c:1575
8ada9598 8943msgid "Will not delete all non-push URLs"
81809b99 8944msgstr "将不会删除所有非推送URL地址"
8ada9598 8945
7aea43ff 8946#: builtin/remote.c:1589
ef317cd5 8947msgid "be verbose; must be placed before a subcommand"
07432cef 8948msgstr "冗长输出;必须置于子命令之前"
ef317cd5 8949
6acbf033 8950#: builtin/repack.c:17
814ff314
JX
8951msgid "git repack [<options>]"
8952msgstr "git repack [<选项>]"
90314792 8953
04cb2f28 8954#: builtin/repack.c:159
90314792
JX
8955msgid "pack everything in a single pack"
8956msgstr "所有内容打包到一个包文件中"
8957
04cb2f28 8958#: builtin/repack.c:161
90314792
JX
8959msgid "same as -a, and turn unreachable objects loose"
8960msgstr "和 -a 相同,并将不可达的对象设为松散对象"
8961
04cb2f28 8962#: builtin/repack.c:164
90314792
JX
8963msgid "remove redundant packs, and run git-prune-packed"
8964msgstr "删除多余的包,运行 git-prune-packed"
8965
04cb2f28 8966#: builtin/repack.c:166
90314792
JX
8967msgid "pass --no-reuse-delta to git-pack-objects"
8968msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
8969
04cb2f28 8970#: builtin/repack.c:168
90314792
JX
8971msgid "pass --no-reuse-object to git-pack-objects"
8972msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
8973
04cb2f28 8974#: builtin/repack.c:170
90314792
JX
8975msgid "do not run git-update-server-info"
8976msgstr "不运行 git-update-server-info"
8977
04cb2f28 8978#: builtin/repack.c:173
90314792
JX
8979msgid "pass --local to git-pack-objects"
8980msgstr "向 git-pack-objects 传递参数 --local"
8981
04cb2f28 8982#: builtin/repack.c:175
6c94aba5
JX
8983msgid "write bitmap index"
8984msgstr "写 bitmap 索引"
8985
04cb2f28 8986#: builtin/repack.c:176
90314792
JX
8987msgid "approxidate"
8988msgstr "近似日期"
8989
04cb2f28 8990#: builtin/repack.c:177
90314792
JX
8991msgid "with -A, do not loosen objects older than this"
8992msgstr "使用 -A,不要将早于给定时间的对象过期"
8993
04cb2f28 8994#: builtin/repack.c:179
90314792
JX
8995msgid "size of the window used for delta compression"
8996msgstr "用于增量压缩的窗口值"
8997
04cb2f28 8998#: builtin/repack.c:180 builtin/repack.c:184
8376b58d
JX
8999msgid "bytes"
9000msgstr "字节"
9001
04cb2f28 9002#: builtin/repack.c:181
90314792
JX
9003msgid "same as the above, but limit memory size instead of entries count"
9004msgstr "和上面的相似,但限制内存大小而非条目数"
9005
04cb2f28 9006#: builtin/repack.c:183
90314792
JX
9007msgid "limits the maximum delta depth"
9008msgstr "限制最大增量深度"
9009
04cb2f28 9010#: builtin/repack.c:185
90314792 9011msgid "maximum size of each packfile"
dbd6cced 9012msgstr "每个包文件的最大尺寸"
90314792 9013
04cb2f28 9014#: builtin/repack.c:187
6c94aba5
JX
9015msgid "repack objects in packs marked with .keep"
9016msgstr "对标记为 .keep 的包中的对象重新打包"
9017
7aea43ff 9018#: builtin/repack.c:377
90314792
JX
9019#, c-format
9020msgid "removing '%s' failed"
9021msgstr "删除 '%s' 失败"
9022
6acbf033 9023#: builtin/replace.c:19
ef317cd5 9024msgid "git replace [-f] <object> <replacement>"
07432cef 9025msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 9026
6acbf033
JX
9027#: builtin/replace.c:20
9028msgid "git replace [-f] --edit <object>"
9029msgstr "git replace [-f] --edit <对象>"
9030
9031#: builtin/replace.c:21
9032msgid "git replace [-f] --graft <commit> [<parent>...]"
9033msgstr "git replace [-f] --graft <提交> [<父提交>...]"
9034
9035#: builtin/replace.c:22
ef317cd5 9036msgid "git replace -d <object>..."
07432cef 9037msgstr "git replace -d <对象>..."
ef317cd5 9038
6acbf033 9039#: builtin/replace.c:23
cfff71a9
JX
9040msgid "git replace [--format=<format>] [-l [<pattern>]]"
9041msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 9042
220c313c 9043#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
6acbf033
JX
9044#, c-format
9045msgid "Not a valid object name: '%s'"
9046msgstr "不是一个有效的对象名:'%s'"
9047
220c313c 9048#: builtin/replace.c:355
6acbf033
JX
9049#, c-format
9050msgid "bad mergetag in commit '%s'"
55a16ee4 9051msgstr "提交 '%s' 中含有损坏的合并标签"
6acbf033 9052
220c313c 9053#: builtin/replace.c:357
6acbf033
JX
9054#, c-format
9055msgid "malformed mergetag in commit '%s'"
55a16ee4 9056msgstr "提交 '%s' 中含有非法的合并标签"
6acbf033 9057
220c313c 9058#: builtin/replace.c:368
6acbf033
JX
9059#, c-format
9060msgid ""
9061"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9062"instead of --graft"
55a16ee4 9063msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
6acbf033 9064
220c313c 9065#: builtin/replace.c:401
6acbf033
JX
9066#, c-format
9067msgid "the original commit '%s' has a gpg signature."
9068msgstr "原始提交 '%s' 中包含一个 GPG 签名"
9069
220c313c 9070#: builtin/replace.c:402
6acbf033
JX
9071msgid "the signature will be removed in the replacement commit!"
9072msgstr "在替换的提交中签名将被移除!"
9073
220c313c 9074#: builtin/replace.c:408
6acbf033
JX
9075#, c-format
9076msgid "could not write replacement commit for: '%s'"
9077msgstr "不能为 '%s' 写替换提交"
9078
220c313c 9079#: builtin/replace.c:432
ef317cd5 9080msgid "list replace refs"
07432cef 9081msgstr "列出替换的引用"
ef317cd5 9082
220c313c 9083#: builtin/replace.c:433
ef317cd5 9084msgid "delete replace refs"
07432cef 9085msgstr "删除替换的引用"
ef317cd5 9086
220c313c 9087#: builtin/replace.c:434
6acbf033
JX
9088msgid "edit existing object"
9089msgstr "编辑现存的对象"
9090
220c313c 9091#: builtin/replace.c:435
6acbf033
JX
9092msgid "change a commit's parents"
9093msgstr "修改一个提交的父提交"
9094
220c313c 9095#: builtin/replace.c:436
ef317cd5 9096msgid "replace the ref if it exists"
07432cef 9097msgstr "如果存在则替换引用"
ef317cd5 9098
220c313c 9099#: builtin/replace.c:437
6acbf033
JX
9100msgid "do not pretty-print contents for --edit"
9101msgstr "不要为 --edit 操作美观显示内容"
9102
220c313c 9103#: builtin/replace.c:438
cfff71a9
JX
9104msgid "use this format"
9105msgstr "使用此格式"
9106
90314792 9107#: builtin/rerere.c:12
814ff314
JX
9108msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9109msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
ef317cd5 9110
90314792 9111#: builtin/rerere.c:57
ef317cd5 9112msgid "register clean resolutions in index"
07432cef 9113msgstr "在索引中注册干净的解决方案"
ef317cd5 9114
220c313c 9115#: builtin/reset.c:26
ef317cd5
JX
9116msgid ""
9117"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 9118msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5 9119
220c313c 9120#: builtin/reset.c:27
07432cef
WS
9121msgid "git reset [-q] <tree-ish> [--] <paths>..."
9122msgstr "git reset [-q] <树或提交> [--] <路径>..."
ef317cd5 9123
220c313c 9124#: builtin/reset.c:28
07432cef
WS
9125msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9126msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 9127
220c313c 9128#: builtin/reset.c:34
c04f5ac3
JX
9129msgid "mixed"
9130msgstr "混杂"
9131
220c313c 9132#: builtin/reset.c:34
c04f5ac3
JX
9133msgid "soft"
9134msgstr "软性"
9135
220c313c 9136#: builtin/reset.c:34
c04f5ac3
JX
9137msgid "hard"
9138msgstr "硬性"
9139
220c313c 9140#: builtin/reset.c:34
8ada9598
JX
9141msgid "merge"
9142msgstr "合并"
9143
220c313c 9144#: builtin/reset.c:34
c04f5ac3
JX
9145msgid "keep"
9146msgstr "保持"
9147
220c313c 9148#: builtin/reset.c:74
c04f5ac3
JX
9149msgid "You do not have a valid HEAD."
9150msgstr "您没有一个有效的 HEAD。"
9151
220c313c 9152#: builtin/reset.c:76
c04f5ac3
JX
9153msgid "Failed to find tree of HEAD."
9154msgstr "无法找到 HEAD 指向的树。"
9155
220c313c 9156#: builtin/reset.c:82
c04f5ac3
JX
9157#, c-format
9158msgid "Failed to find tree of %s."
9159msgstr "无法找到 %s 指向的树。"
9160
220c313c 9161#: builtin/reset.c:100
c04f5ac3
JX
9162#, c-format
9163msgid "HEAD is now at %s"
9164msgstr "HEAD 现在位于 %s"
9165
90e6ef53 9166# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9167#: builtin/reset.c:183
c04f5ac3
JX
9168#, c-format
9169msgid "Cannot do a %s reset in the middle of a merge."
9170msgstr "在合并过程中不能做%s重置操作。"
9171
220c313c 9172#: builtin/reset.c:276
ef317cd5 9173msgid "be quiet, only report errors"
07432cef 9174msgstr "安静模式,只报告错误"
ef317cd5 9175
220c313c 9176#: builtin/reset.c:278
ef317cd5 9177msgid "reset HEAD and index"
07432cef 9178msgstr "重置 HEAD 和索引"
ef317cd5 9179
220c313c 9180#: builtin/reset.c:279
ef317cd5 9181msgid "reset only HEAD"
07432cef 9182msgstr "只重置 HEAD"
ef317cd5 9183
220c313c 9184#: builtin/reset.c:281 builtin/reset.c:283
ef317cd5 9185msgid "reset HEAD, index and working tree"
07432cef 9186msgstr "重置 HEAD、索引和工作区"
ef317cd5 9187
220c313c 9188#: builtin/reset.c:285
ef317cd5 9189msgid "reset HEAD but keep local changes"
07432cef 9190msgstr "重置 HEAD 但保存本地变更"
ef317cd5 9191
220c313c 9192#: builtin/reset.c:288
6c94aba5
JX
9193msgid "record only the fact that removed paths will be added later"
9194msgstr "将删除的路径标记为稍后添加"
9195
220c313c 9196#: builtin/reset.c:305
07432cef
WS
9197#, c-format
9198msgid "Failed to resolve '%s' as a valid revision."
9199msgstr "无法将 '%s' 解析为一个有效的版本。"
9200
220c313c 9201#: builtin/reset.c:308 builtin/reset.c:316
c04f5ac3
JX
9202#, c-format
9203msgid "Could not parse object '%s'."
9204msgstr "不能解析对象 '%s'。"
9205
220c313c 9206#: builtin/reset.c:313
07432cef
WS
9207#, c-format
9208msgid "Failed to resolve '%s' as a valid tree."
9209msgstr "无法将 '%s' 解析为一个有效的树对象。"
9210
220c313c 9211#: builtin/reset.c:322
c04f5ac3 9212msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 9213msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 9214
220c313c 9215#: builtin/reset.c:331
c04f5ac3 9216msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
d9d56b23 9217msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
c04f5ac3 9218
90e6ef53 9219# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9220#: builtin/reset.c:333
c04f5ac3
JX
9221#, c-format
9222msgid "Cannot do %s reset with paths."
9223msgstr "不能带路径进行%s重置。"
9224
90e6ef53 9225# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9226#: builtin/reset.c:343
c04f5ac3
JX
9227#, c-format
9228msgid "%s reset is not allowed in a bare repository"
220c313c 9229msgstr "不能对纯版本库进行%s重置"
c04f5ac3 9230
220c313c 9231#: builtin/reset.c:347
6c94aba5
JX
9232msgid "-N can only be used with --mixed"
9233msgstr "-N 只能和 --mixed 同时使用"
9234
220c313c 9235#: builtin/reset.c:364
90314792
JX
9236msgid "Unstaged changes after reset:"
9237msgstr "重置后撤出暂存区的变更:"
9238
220c313c 9239#: builtin/reset.c:370
ef317cd5
JX
9240#, c-format
9241msgid "Could not reset index file to revision '%s'."
9242msgstr "不能重置索引文件至版本 '%s'。"
9243
220c313c 9244#: builtin/reset.c:374
07432cef
WS
9245msgid "Could not write new index file."
9246msgstr "不能写入新的索引文件。"
9247
220c313c 9248#: builtin/rev-parse.c:361
814ff314
JX
9249msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
9250msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
ef317cd5 9251
220c313c 9252#: builtin/rev-parse.c:366
ef317cd5 9253msgid "keep the `--` passed as an arg"
07432cef 9254msgstr "保持 `--` 作为一个参数传递"
ef317cd5 9255
220c313c 9256#: builtin/rev-parse.c:368
ef317cd5 9257msgid "stop parsing after the first non-option argument"
07432cef 9258msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 9259
220c313c 9260#: builtin/rev-parse.c:371
cfff71a9
JX
9261msgid "output in stuck long form"
9262msgstr "以固定长格式输出"
9263
220c313c 9264#: builtin/rev-parse.c:499
ef317cd5 9265msgid ""
814ff314 9266"git rev-parse --parseopt [<options>] -- [<args>...]\n"
ef317cd5 9267" or: git rev-parse --sq-quote [<arg>...]\n"
814ff314 9268" or: git rev-parse [<options>] [<arg>...]\n"
ef317cd5
JX
9269"\n"
9270"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9271msgstr ""
814ff314 9272"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
90314792 9273" 或者:git rev-parse --sq-quote [<参数>...]\n"
814ff314 9274" 或者:git rev-parse [<选项>] [<参数>...]\n"
07432cef
WS
9275"\n"
9276"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5
JX
9277
9278#: builtin/revert.c:22
814ff314
JX
9279msgid "git revert [<options>] <commit-ish>..."
9280msgstr "git revert [<选项>] <提交号>..."
ef317cd5
JX
9281
9282#: builtin/revert.c:23
9283msgid "git revert <subcommand>"
07432cef 9284msgstr "git revert <子命令>"
ef317cd5
JX
9285
9286#: builtin/revert.c:28
814ff314
JX
9287msgid "git cherry-pick [<options>] <commit-ish>..."
9288msgstr "git cherry-pick [<选项>] <提交号>..."
ef317cd5
JX
9289
9290#: builtin/revert.c:29
ef317cd5 9291msgid "git cherry-pick <subcommand>"
07432cef 9292msgstr "git cherry-pick <子命令>"
ef317cd5 9293
90314792 9294#: builtin/revert.c:71
ef317cd5
JX
9295#, c-format
9296msgid "%s: %s cannot be used with %s"
9297msgstr "%s:%s 不能和 %s 同时使用"
9298
90314792 9299#: builtin/revert.c:80
ef317cd5 9300msgid "end revert or cherry-pick sequence"
07432cef 9301msgstr "终止反转或拣选操作"
ef317cd5 9302
90314792 9303#: builtin/revert.c:81
ef317cd5 9304msgid "resume revert or cherry-pick sequence"
07432cef 9305msgstr "继续反转或拣选操作"
ef317cd5 9306
90314792 9307#: builtin/revert.c:82
ef317cd5 9308msgid "cancel revert or cherry-pick sequence"
07432cef 9309msgstr "取消反转或拣选操作"
ef317cd5 9310
90314792 9311#: builtin/revert.c:83
ef317cd5 9312msgid "don't automatically commit"
07432cef 9313msgstr "不要自动提交"
ef317cd5 9314
90314792 9315#: builtin/revert.c:84
ef317cd5 9316msgid "edit the commit message"
07432cef 9317msgstr "编辑提交说明"
ef317cd5 9318
90314792 9319#: builtin/revert.c:87
ef317cd5 9320msgid "parent number"
07432cef 9321msgstr "父编号"
ef317cd5 9322
90314792 9323#: builtin/revert.c:89
ef317cd5 9324msgid "merge strategy"
07432cef 9325msgstr "合并策略"
ef317cd5 9326
90314792 9327#: builtin/revert.c:90
ef317cd5 9328msgid "option"
07432cef 9329msgstr "选项"
ef317cd5 9330
90314792 9331#: builtin/revert.c:91
ef317cd5 9332msgid "option for merge strategy"
07432cef 9333msgstr "合并策略的选项"
ef317cd5 9334
6c94aba5 9335#: builtin/revert.c:104
ef317cd5 9336msgid "append commit name"
07432cef 9337msgstr "追加提交名称"
ef317cd5 9338
6c94aba5 9339#: builtin/revert.c:105
ef317cd5 9340msgid "allow fast-forward"
07432cef 9341msgstr "允许快进式"
c04f5ac3 9342
6c94aba5 9343#: builtin/revert.c:106
ef317cd5 9344msgid "preserve initially empty commits"
07432cef 9345msgstr "保留初始化的空提交"
ef317cd5 9346
6c94aba5 9347#: builtin/revert.c:107
ef317cd5 9348msgid "allow commits with empty messages"
07432cef 9349msgstr "允许提交说明为空"
c04f5ac3 9350
6c94aba5 9351#: builtin/revert.c:108
ef317cd5 9352msgid "keep redundant, empty commits"
07432cef 9353msgstr "保持多余的、空的提交"
ef317cd5 9354
6c94aba5 9355#: builtin/revert.c:112
c04f5ac3
JX
9356msgid "program error"
9357msgstr "程序错误"
9358
6c94aba5 9359#: builtin/revert.c:197
c04f5ac3
JX
9360msgid "revert failed"
9361msgstr "还原失败"
9362
6c94aba5 9363#: builtin/revert.c:212
c04f5ac3
JX
9364msgid "cherry-pick failed"
9365msgstr "拣选失败"
9366
90314792 9367#: builtin/rm.c:17
814ff314
JX
9368msgid "git rm [<options>] [--] <file>..."
9369msgstr "git rm [<选项>] [--] <文件>..."
07432cef 9370
90314792 9371#: builtin/rm.c:65
2e8451e8
JX
9372msgid ""
9373"the following submodule (or one of its nested submodules)\n"
9374"uses a .git directory:"
9375msgid_plural ""
220c313c 9376"the following submodules (or one of their nested submodules)\n"
2e8451e8 9377"use a .git directory:"
220c313c
JX
9378msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9379msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
2e8451e8 9380
90314792 9381#: builtin/rm.c:71
07432cef 9382msgid ""
2e8451e8 9383"\n"
07432cef
WS
9384"(use 'rm -rf' if you really want to remove it including all of its history)"
9385msgstr ""
2e8451e8 9386"\n"
07432cef 9387"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
ef317cd5 9388
7aea43ff 9389#: builtin/rm.c:230
c04f5ac3 9390msgid ""
2e8451e8
JX
9391"the following file has staged content different from both the\n"
9392"file and the HEAD:"
9393msgid_plural ""
9394"the following files have staged content different from both the\n"
9395"file and the HEAD:"
9396msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9397msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9398
7aea43ff 9399#: builtin/rm.c:235
2e8451e8
JX
9400msgid ""
9401"\n"
c04f5ac3
JX
9402"(use -f to force removal)"
9403msgstr ""
2e8451e8 9404"\n"
c04f5ac3
JX
9405"(使用 -f 强制删除)"
9406
7aea43ff 9407#: builtin/rm.c:239
2e8451e8
JX
9408msgid "the following file has changes staged in the index:"
9409msgid_plural "the following files have changes staged in the index:"
9410msgstr[0] "如下文件相对索引区的内容有修改"
9411msgstr[1] "如下文件相对索引区的内容有修改"
c04f5ac3 9412
7aea43ff 9413#: builtin/rm.c:243 builtin/rm.c:254
c04f5ac3 9414msgid ""
2e8451e8 9415"\n"
c04f5ac3
JX
9416"(use --cached to keep the file, or -f to force removal)"
9417msgstr ""
2e8451e8
JX
9418"\n"
9419"(使用 --cached 保留本地文件,或用 -f 强制删除)"
9420
7aea43ff 9421#: builtin/rm.c:251
2e8451e8
JX
9422msgid "the following file has local modifications:"
9423msgid_plural "the following files have local modifications:"
9424msgstr[0] "如下文件有本地修改:"
9425msgstr[1] "如下文件有本地修改:"
c04f5ac3 9426
7aea43ff 9427#: builtin/rm.c:269
ef317cd5 9428msgid "do not list removed files"
07432cef 9429msgstr "不列出删除的文件"
ef317cd5 9430
7aea43ff 9431#: builtin/rm.c:270
ef317cd5 9432msgid "only remove from the index"
07432cef 9433msgstr "只从索引区删除"
ef317cd5 9434
7aea43ff 9435#: builtin/rm.c:271
ef317cd5 9436msgid "override the up-to-date check"
07432cef 9437msgstr "忽略文件更新状态检查"
ef317cd5 9438
7aea43ff 9439#: builtin/rm.c:272
ef317cd5 9440msgid "allow recursive removal"
07432cef 9441msgstr "允许递归删除"
ef317cd5 9442
7aea43ff 9443#: builtin/rm.c:274
ef317cd5 9444msgid "exit with a zero status even if nothing matched"
07432cef 9445msgstr "即使没有匹配,也以零状态退出"
ef317cd5 9446
7aea43ff 9447#: builtin/rm.c:317
220c313c
JX
9448msgid "Please, stage your changes to .gitmodules or stash them to proceed"
9449msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
9450
7aea43ff 9451#: builtin/rm.c:335
c04f5ac3
JX
9452#, c-format
9453msgid "not removing '%s' recursively without -r"
9454msgstr "未提供 -r 选项不会递归删除 '%s'"
9455
7aea43ff 9456#: builtin/rm.c:374
c04f5ac3
JX
9457#, c-format
9458msgid "git rm: unable to remove %s"
9459msgstr "git rm:不能删除 %s"
9460
ef317cd5 9461#: builtin/shortlog.c:13
814ff314 9462msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
4dcdc3d8 9463msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
ef317cd5 9464
4dcdc3d8 9465#: builtin/shortlog.c:131
c04f5ac3
JX
9466#, c-format
9467msgid "Missing author: %s"
9468msgstr "缺少作者:%s"
9469
90314792 9470#: builtin/shortlog.c:230
ef317cd5 9471msgid "sort output according to the number of commits per author"
07432cef 9472msgstr "根据每个作者的提交数量排序"
ef317cd5 9473
90314792 9474#: builtin/shortlog.c:232
ef317cd5 9475msgid "Suppress commit descriptions, only provides commit count"
07432cef 9476msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 9477
90314792 9478#: builtin/shortlog.c:234
ef317cd5 9479msgid "Show the email address of each author"
07432cef 9480msgstr "显示每个作者的电子邮件地址"
ef317cd5 9481
90314792 9482#: builtin/shortlog.c:235
ef317cd5 9483msgid "w[,i1[,i2]]"
07432cef 9484msgstr "w[,i1[,i2]]"
ef317cd5 9485
90314792 9486#: builtin/shortlog.c:236
ef317cd5 9487msgid "Linewrap output"
07432cef 9488msgstr "折行输出"
ef317cd5
JX
9489
9490#: builtin/show-branch.c:9
9491msgid ""
814ff314 9492"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
9493"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9494"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9495"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
ef317cd5 9496msgstr ""
814ff314 9497"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
9498"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
9499"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9500"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
ef317cd5 9501
d9d56b23 9502#: builtin/show-branch.c:13
814ff314
JX
9503msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
9504msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
ef317cd5 9505
7aea43ff 9506#: builtin/show-branch.c:659
ef317cd5 9507msgid "show remote-tracking and local branches"
07432cef 9508msgstr "显示远程跟踪的和本地的分支"
ef317cd5 9509
7aea43ff 9510#: builtin/show-branch.c:661
ef317cd5 9511msgid "show remote-tracking branches"
07432cef 9512msgstr "显示远程跟踪的分支"
ef317cd5 9513
7aea43ff 9514#: builtin/show-branch.c:663
ef317cd5 9515msgid "color '*!+-' corresponding to the branch"
07432cef 9516msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 9517
7aea43ff 9518#: builtin/show-branch.c:665
ef317cd5 9519msgid "show <n> more commits after the common ancestor"
07432cef 9520msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 9521
7aea43ff 9522#: builtin/show-branch.c:667
ef317cd5 9523msgid "synonym to more=-1"
07432cef 9524msgstr "和 more=-1 同义"
ef317cd5 9525
7aea43ff 9526#: builtin/show-branch.c:668
ef317cd5 9527msgid "suppress naming strings"
07432cef 9528msgstr "不显示字符串命名"
ef317cd5 9529
7aea43ff 9530#: builtin/show-branch.c:670
ef317cd5 9531msgid "include the current branch"
07432cef 9532msgstr "包括当前分支"
ef317cd5 9533
7aea43ff 9534#: builtin/show-branch.c:672
ef317cd5 9535msgid "name commits with their object names"
07432cef 9536msgstr "以对象名字命名提交"
ef317cd5 9537
7aea43ff 9538#: builtin/show-branch.c:674
ef317cd5 9539msgid "show possible merge bases"
07432cef 9540msgstr "显示可能合并的基线"
ef317cd5 9541
7aea43ff 9542#: builtin/show-branch.c:676
ef317cd5 9543msgid "show refs unreachable from any other ref"
07432cef 9544msgstr "显示没有任何引用的的引用"
ef317cd5 9545
7aea43ff 9546#: builtin/show-branch.c:678
ef317cd5 9547msgid "show commits in topological order"
07432cef 9548msgstr "以拓扑顺序显示提交"
ef317cd5 9549
7aea43ff 9550#: builtin/show-branch.c:681
ef317cd5 9551msgid "show only commits not on the first branch"
07432cef 9552msgstr "只显示不在第一个分支上的提交"
ef317cd5 9553
7aea43ff 9554#: builtin/show-branch.c:683
ef317cd5 9555msgid "show merges reachable from only one tip"
07432cef 9556msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 9557
7aea43ff 9558#: builtin/show-branch.c:685
2e8451e8
JX
9559msgid "topologically sort, maintaining date order where possible"
9560msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 9561
7aea43ff 9562#: builtin/show-branch.c:688
ef317cd5 9563msgid "<n>[,<base>]"
07432cef 9564msgstr "<n>[,<base>]"
ef317cd5 9565
7aea43ff 9566#: builtin/show-branch.c:689
ef317cd5 9567msgid "show <n> most recent ref-log entries starting at base"
07432cef 9568msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
ef317cd5
JX
9569
9570#: builtin/show-ref.c:10
9571msgid ""
814ff314
JX
9572"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9573"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
ef317cd5 9574msgstr ""
814ff314
JX
9575"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9576"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
ef317cd5
JX
9577
9578#: builtin/show-ref.c:11
9579msgid "git show-ref --exclude-existing[=pattern] < ref-list"
07432cef 9580msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
ef317cd5 9581
7aea43ff 9582#: builtin/show-ref.c:170
ef317cd5 9583msgid "only show tags (can be combined with heads)"
55a16ee4 9584msgstr "只显示标签(可以和头共用)"
ef317cd5 9585
7aea43ff 9586#: builtin/show-ref.c:171
ef317cd5 9587msgid "only show heads (can be combined with tags)"
55a16ee4 9588msgstr "只显示头(可以和标签共用)"
ef317cd5 9589
7aea43ff 9590#: builtin/show-ref.c:172
ef317cd5 9591msgid "stricter reference checking, requires exact ref path"
07432cef 9592msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 9593
7aea43ff 9594#: builtin/show-ref.c:175 builtin/show-ref.c:177
2e8451e8
JX
9595msgid "show the HEAD reference, even if it would be filtered out"
9596msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 9597
7aea43ff 9598#: builtin/show-ref.c:179
ef317cd5 9599msgid "dereference tags into object IDs"
55a16ee4 9600msgstr "转换标签到对象ID"
ef317cd5 9601
7aea43ff 9602#: builtin/show-ref.c:181
ef317cd5 9603msgid "only show SHA1 hash using <n> digits"
07432cef 9604msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
ef317cd5 9605
7aea43ff 9606#: builtin/show-ref.c:185
ef317cd5 9607msgid "do not print results to stdout (useful with --verify)"
07432cef 9608msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
ef317cd5 9609
7aea43ff 9610#: builtin/show-ref.c:187
ef317cd5 9611msgid "show refs from stdin that aren't in local repository"
07432cef 9612msgstr "显示从标准输入中读入的不在本地版本库中的引用"
ef317cd5
JX
9613
9614#: builtin/symbolic-ref.c:7
814ff314
JX
9615msgid "git symbolic-ref [<options>] <name> [<ref>]"
9616msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
07432cef
WS
9617
9618#: builtin/symbolic-ref.c:8
814ff314
JX
9619msgid "git symbolic-ref -d [-q] <name>"
9620msgstr "git symbolic-ref -d [-q] <名称>"
ef317cd5 9621
07432cef 9622#: builtin/symbolic-ref.c:40
ef317cd5 9623msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
9624msgstr "不显示非符号(分离的)引用的错误信息"
9625
9626#: builtin/symbolic-ref.c:41
9627msgid "delete symbolic ref"
9628msgstr "删除符号引用"
ef317cd5 9629
07432cef 9630#: builtin/symbolic-ref.c:42
ef317cd5 9631msgid "shorten ref output"
07432cef 9632msgstr "简短的引用输出"
ef317cd5 9633
04cb2f28 9634#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
ef317cd5 9635msgid "reason"
07432cef 9636msgstr "原因"
ef317cd5 9637
04cb2f28 9638#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
ef317cd5 9639msgid "reason of the update"
07432cef 9640msgstr "更新的原因"
ef317cd5
JX
9641
9642#: builtin/tag.c:22
9643msgid ""
814ff314
JX
9644"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
9645"[<head>]"
9646msgstr ""
9647"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
ef317cd5
JX
9648
9649#: builtin/tag.c:23
9650msgid "git tag -d <tagname>..."
07432cef 9651msgstr "git tag -d <标签名>..."
ef317cd5
JX
9652
9653#: builtin/tag.c:24
9654msgid ""
814ff314 9655"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
ef317cd5
JX
9656"\t\t[<pattern>...]"
9657msgstr ""
814ff314 9658"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] [<模式>...]"
ef317cd5
JX
9659
9660#: builtin/tag.c:26
9661msgid "git tag -v <tagname>..."
07432cef 9662msgstr "git tag -v <标签名>..."
ef317cd5 9663
6acbf033 9664#: builtin/tag.c:69
7ac1c0ad
JX
9665#, c-format
9666msgid "malformed object at '%s'"
9667msgstr "非法的对象于 '%s'"
9668
6acbf033 9669#: builtin/tag.c:301
c04f5ac3
JX
9670#, c-format
9671msgid "tag name too long: %.*s..."
55a16ee4 9672msgstr "标签名称太长:%.*s..."
c04f5ac3 9673
6acbf033 9674#: builtin/tag.c:306
c04f5ac3
JX
9675#, c-format
9676msgid "tag '%s' not found."
55a16ee4 9677msgstr "未发现标签 '%s'。"
c04f5ac3 9678
6acbf033 9679#: builtin/tag.c:321
c04f5ac3
JX
9680#, c-format
9681msgid "Deleted tag '%s' (was %s)\n"
55a16ee4 9682msgstr "已删除标签 '%s'(曾为 %s)\n"
c04f5ac3 9683
6acbf033 9684#: builtin/tag.c:333
c04f5ac3
JX
9685#, c-format
9686msgid "could not verify the tag '%s'"
55a16ee4 9687msgstr "不能校验该标签 '%s'"
c04f5ac3 9688
6acbf033 9689#: builtin/tag.c:343
a77c07d9 9690#, c-format
c04f5ac3
JX
9691msgid ""
9692"\n"
6acbf033
JX
9693"Write a message for tag:\n"
9694" %s\n"
a77c07d9 9695"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
9696msgstr ""
9697"\n"
55a16ee4 9698"输入一个标签说明:\n"
6acbf033 9699" %s\n"
a77c07d9 9700"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 9701
6acbf033 9702#: builtin/tag.c:347
a77c07d9 9703#, c-format
c04f5ac3
JX
9704msgid ""
9705"\n"
6acbf033
JX
9706"Write a message for tag:\n"
9707" %s\n"
a77c07d9 9708"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 9709"want to.\n"
c04f5ac3
JX
9710msgstr ""
9711"\n"
55a16ee4 9712"输入一个标签说明:\n"
6acbf033 9713" %s\n"
a77c07d9 9714"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 9715
6acbf033
JX
9716#: builtin/tag.c:371
9717#, c-format
9718msgid "unsupported sort specification '%s'"
9719msgstr "不支持的排序规格 '%s'"
9720
9721#: builtin/tag.c:373
9722#, c-format
9723msgid "unsupported sort specification '%s' in variable '%s'"
9724msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
9725
9726#: builtin/tag.c:428
c04f5ac3 9727msgid "unable to sign the tag"
55a16ee4 9728msgstr "无法签署标签"
c04f5ac3 9729
6acbf033 9730#: builtin/tag.c:430
c04f5ac3 9731msgid "unable to write tag file"
55a16ee4 9732msgstr "无法写标签文件"
c04f5ac3 9733
6acbf033 9734#: builtin/tag.c:455
c04f5ac3 9735msgid "bad object type."
90e6ef53 9736msgstr "坏的对象类型。"
c04f5ac3 9737
6acbf033 9738#: builtin/tag.c:468
c04f5ac3 9739msgid "tag header too big."
55a16ee4 9740msgstr "标签头信息太大。"
c04f5ac3 9741
6acbf033 9742#: builtin/tag.c:504
c04f5ac3 9743msgid "no tag message?"
55a16ee4 9744msgstr "无标签说明?"
c04f5ac3 9745
6acbf033 9746#: builtin/tag.c:510
c04f5ac3
JX
9747#, c-format
9748msgid "The tag message has been left in %s\n"
55a16ee4 9749msgstr "标签说明被保留在 %s\n"
c04f5ac3 9750
6acbf033 9751#: builtin/tag.c:559
7ac1c0ad
JX
9752msgid "switch 'points-at' requires an object"
9753msgstr "开关 'points-at' 需要一个对象"
9754
6acbf033 9755#: builtin/tag.c:561
7ac1c0ad
JX
9756#, c-format
9757msgid "malformed object name '%s'"
9758msgstr "非法的对象名 '%s'"
9759
220c313c 9760#: builtin/tag.c:589
ef317cd5 9761msgid "list tag names"
55a16ee4 9762msgstr "列出标签名称"
ef317cd5 9763
220c313c 9764#: builtin/tag.c:591
ef317cd5 9765msgid "print <n> lines of each tag message"
55a16ee4 9766msgstr "每个标签信息打印 <n> 行"
ef317cd5 9767
220c313c 9768#: builtin/tag.c:593
ef317cd5 9769msgid "delete tags"
55a16ee4 9770msgstr "删除标签"
ef317cd5 9771
220c313c 9772#: builtin/tag.c:594
ef317cd5 9773msgid "verify tags"
55a16ee4 9774msgstr "验证标签"
ef317cd5 9775
220c313c 9776#: builtin/tag.c:596
ef317cd5 9777msgid "Tag creation options"
55a16ee4 9778msgstr "标签创建选项"
ef317cd5 9779
220c313c 9780#: builtin/tag.c:598
ef317cd5 9781msgid "annotated tag, needs a message"
55a16ee4 9782msgstr "附注标签,需要一个说明"
ef317cd5 9783
220c313c 9784#: builtin/tag.c:600
ef317cd5 9785msgid "tag message"
55a16ee4 9786msgstr "标签说明"
ef317cd5 9787
220c313c 9788#: builtin/tag.c:602
ef317cd5 9789msgid "annotated and GPG-signed tag"
55a16ee4 9790msgstr "附注并附加 GPG 签名的标签"
ef317cd5 9791
220c313c 9792#: builtin/tag.c:606
ef317cd5 9793msgid "use another key to sign the tag"
55a16ee4 9794msgstr "使用另外的私钥签名该标签"
ef317cd5 9795
220c313c 9796#: builtin/tag.c:607
ef317cd5 9797msgid "replace the tag if exists"
55a16ee4 9798msgstr "如果存在,替换现有的标签"
ef317cd5 9799
814ff314
JX
9800#: builtin/tag.c:609
9801msgid "Tag listing options"
55a16ee4 9802msgstr "标签列表选项"
814ff314
JX
9803
9804#: builtin/tag.c:610
ef317cd5 9805msgid "show tag list in columns"
55a16ee4 9806msgstr "以列的方式显示标签列表"
ef317cd5 9807
814ff314 9808#: builtin/tag.c:612
6c94aba5 9809msgid "sort tags"
55a16ee4 9810msgstr "排序标签"
6c94aba5 9811
220c313c 9812#: builtin/tag.c:617 builtin/tag.c:623
ef317cd5 9813msgid "print only tags that contain the commit"
55a16ee4 9814msgstr "只打印包含提交的标签"
ef317cd5 9815
220c313c 9816#: builtin/tag.c:629
ef317cd5 9817msgid "print only tags of the object"
55a16ee4 9818msgstr "只打印对象的标签"
ef317cd5 9819
220c313c 9820#: builtin/tag.c:655
8ada9598 9821msgid "--column and -n are incompatible"
81809b99 9822msgstr "--column 和 -n 不兼容"
8ada9598 9823
220c313c 9824#: builtin/tag.c:667
6c94aba5
JX
9825msgid "--sort and -n are incompatible"
9826msgstr "--sort 和 -n 不兼容"
9827
220c313c 9828#: builtin/tag.c:674
c04f5ac3 9829msgid "-n option is only allowed with -l."
649900bc 9830msgstr "-n 选项只允许和 -l 同时使用。"
c04f5ac3 9831
220c313c 9832#: builtin/tag.c:676
c04f5ac3 9833msgid "--contains option is only allowed with -l."
649900bc 9834msgstr "--contains 选项只允许和 -l 同时使用。"
c04f5ac3 9835
220c313c 9836#: builtin/tag.c:678
7ac1c0ad 9837msgid "--points-at option is only allowed with -l."
649900bc 9838msgstr "--points-at 选项只允许和 -l 同时使用。"
7ac1c0ad 9839
220c313c 9840#: builtin/tag.c:686
c04f5ac3
JX
9841msgid "only one -F or -m option is allowed."
9842msgstr "只允许一个 -F 或 -m 选项。"
9843
220c313c 9844#: builtin/tag.c:706
c04f5ac3
JX
9845msgid "too many params"
9846msgstr "太多参数"
9847
220c313c 9848#: builtin/tag.c:712
c04f5ac3
JX
9849#, c-format
9850msgid "'%s' is not a valid tag name."
55a16ee4 9851msgstr "'%s' 不是一个有效的标签名称。"
c04f5ac3 9852
220c313c 9853#: builtin/tag.c:717
c04f5ac3
JX
9854#, c-format
9855msgid "tag '%s' already exists"
55a16ee4 9856msgstr "标签 '%s' 已存在"
c04f5ac3 9857
220c313c 9858#: builtin/tag.c:741
c04f5ac3
JX
9859#, c-format
9860msgid "Updated tag '%s' (was %s)\n"
55a16ee4 9861msgstr "已更新标签 '%s'(曾为 %s)\n"
c04f5ac3 9862
220c313c 9863#: builtin/unpack-objects.c:489
6c94aba5
JX
9864msgid "Unpacking objects"
9865msgstr "展开对象中"
9866
7aea43ff
JX
9867#: builtin/update-index.c:70
9868#, c-format
9869msgid "failed to create directory %s"
9870msgstr "无法创建目录 %s"
9871
9872#: builtin/update-index.c:76
9873#, c-format
9874msgid "failed to stat %s"
9875msgstr "无法枚举 %s 状态"
9876
9877#: builtin/update-index.c:86
9878#, c-format
9879msgid "failed to create file %s"
9880msgstr "无法创建文件 %s"
9881
9882#: builtin/update-index.c:94
9883#, c-format
9884msgid "failed to delete file %s"
9885msgstr "无法删除文件 %s"
9886
9887#: builtin/update-index.c:101 builtin/update-index.c:203
9888#, c-format
9889msgid "failed to delete directory %s"
9890msgstr "无法删除目录 %s"
9891
9892#: builtin/update-index.c:124
9893#, c-format
9894msgid "Testing "
9895msgstr "正在测试 "
9896
9897#: builtin/update-index.c:136
9898msgid "directory stat info does not change after adding a new file"
9899msgstr "添加一个新文件后,目录的状态信息未改变"
9900
9901#: builtin/update-index.c:149
9902msgid "directory stat info does not change after adding a new directory"
9903msgstr "添加一个新目录后,目录的状态信息未改变"
9904
9905#: builtin/update-index.c:162
9906msgid "directory stat info changes after updating a file"
9907msgstr "更新一个文件后,目录的状态信息被修改"
9908
9909#: builtin/update-index.c:173
9910msgid "directory stat info changes after adding a file inside subdirectory"
9911msgstr "在子目录中添加文件后,目录的状态信息被修改"
9912
9913#: builtin/update-index.c:184
9914msgid "directory stat info does not change after deleting a file"
9915msgstr "删除一个文件后,目录的状态信息未改变"
9916
9917#: builtin/update-index.c:197
9918msgid "directory stat info does not change after deleting a directory"
9919msgstr "删除一个目录后,目录的状态信息未改变"
9920
9921#: builtin/update-index.c:204
9922msgid " OK"
9923msgstr " OK"
9924
9925#: builtin/update-index.c:564
814ff314
JX
9926msgid "git update-index [<options>] [--] [<file>...]"
9927msgstr "git update-index [<选项>] [--] [<文件>...]"
8ada9598 9928
7aea43ff 9929#: builtin/update-index.c:918
ef317cd5 9930msgid "continue refresh even when index needs update"
07432cef 9931msgstr "当索引需要更新时继续刷新"
8ada9598 9932
7aea43ff 9933#: builtin/update-index.c:921
ef317cd5 9934msgid "refresh: ignore submodules"
07432cef 9935msgstr "刷新:忽略子模组"
8ada9598 9936
7aea43ff 9937#: builtin/update-index.c:924
ef317cd5 9938msgid "do not ignore new files"
07432cef 9939msgstr "不忽略新的文件"
8ada9598 9940
7aea43ff 9941#: builtin/update-index.c:926
ef317cd5 9942msgid "let files replace directories and vice-versa"
07432cef 9943msgstr "让文件替换目录(反之亦然)"
ef317cd5 9944
7aea43ff 9945#: builtin/update-index.c:928
ef317cd5 9946msgid "notice files missing from worktree"
07432cef 9947msgstr "通知文件从工作区丢失"
ef317cd5 9948
7aea43ff 9949#: builtin/update-index.c:930
ef317cd5 9950msgid "refresh even if index contains unmerged entries"
07432cef 9951msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 9952
7aea43ff 9953#: builtin/update-index.c:933
ef317cd5 9954msgid "refresh stat information"
07432cef 9955msgstr "刷新统计信息"
ef317cd5 9956
7aea43ff 9957#: builtin/update-index.c:937
ef317cd5 9958msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 9959msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 9960
7aea43ff 9961#: builtin/update-index.c:941
6c94aba5 9962msgid "<mode>,<object>,<path>"
d9d56b23 9963msgstr "<存取模式>,<对象>,<路径>"
ef317cd5 9964
7aea43ff 9965#: builtin/update-index.c:942
ef317cd5 9966msgid "add the specified entry to the index"
07432cef 9967msgstr "添加指定的条目到索引区"
ef317cd5 9968
7aea43ff 9969#: builtin/update-index.c:946
ef317cd5 9970msgid "(+/-)x"
07432cef 9971msgstr "(+/-)x"
ef317cd5 9972
7aea43ff 9973#: builtin/update-index.c:947
ef317cd5 9974msgid "override the executable bit of the listed files"
07432cef 9975msgstr "覆盖列表里文件的可执行位"
ef317cd5 9976
7aea43ff 9977#: builtin/update-index.c:951
ef317cd5 9978msgid "mark files as \"not changing\""
07432cef 9979msgstr "把文件标记为 \"没有变更\""
ef317cd5 9980
7aea43ff 9981#: builtin/update-index.c:954
ef317cd5 9982msgid "clear assumed-unchanged bit"
07432cef 9983msgstr "清除 assumed-unchanged 位"
ef317cd5 9984
7aea43ff 9985#: builtin/update-index.c:957
ef317cd5 9986msgid "mark files as \"index-only\""
07432cef 9987msgstr "把文件标记为 \"仅索引\""
ef317cd5 9988
7aea43ff 9989#: builtin/update-index.c:960
ef317cd5 9990msgid "clear skip-worktree bit"
07432cef 9991msgstr "清除 skip-worktree 位"
ef317cd5 9992
7aea43ff 9993#: builtin/update-index.c:963
ef317cd5 9994msgid "add to index only; do not add content to object database"
07432cef 9995msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 9996
7aea43ff 9997#: builtin/update-index.c:965
ef317cd5 9998msgid "remove named paths even if present in worktree"
07432cef 9999msgstr "即使存在工作区里,也删除路径"
ef317cd5 10000
7aea43ff 10001#: builtin/update-index.c:967
ef317cd5 10002msgid "with --stdin: input lines are terminated by null bytes"
07432cef 10003msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 10004
7aea43ff 10005#: builtin/update-index.c:969
ef317cd5 10006msgid "read list of paths to be updated from standard input"
07432cef 10007msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 10008
7aea43ff 10009#: builtin/update-index.c:973
ef317cd5 10010msgid "add entries from standard input to the index"
07432cef 10011msgstr "从标准输入添加条目到索引区"
ef317cd5 10012
7aea43ff 10013#: builtin/update-index.c:977
ef317cd5 10014msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 10015msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 10016
7aea43ff 10017#: builtin/update-index.c:981
ef317cd5 10018msgid "only update entries that differ from HEAD"
07432cef 10019msgstr "只更新与 HEAD 不同的条目"
ef317cd5 10020
7aea43ff 10021#: builtin/update-index.c:985
ef317cd5 10022msgid "ignore files missing from worktree"
07432cef 10023msgstr "忽略工作区丢失的文件"
ef317cd5 10024
7aea43ff 10025#: builtin/update-index.c:988
ef317cd5 10026msgid "report actions to standard output"
07432cef 10027msgstr "在标准输出显示操作"
ef317cd5 10028
7aea43ff 10029#: builtin/update-index.c:990
ef317cd5 10030msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 10031msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 10032
7aea43ff 10033#: builtin/update-index.c:994
ef317cd5 10034msgid "write index in this format"
07432cef 10035msgstr "以这种格式写入索引区"
ef317cd5 10036
7aea43ff 10037#: builtin/update-index.c:996
6acbf033
JX
10038msgid "enable or disable split index"
10039msgstr "启用或禁用索引拆分"
10040
7aea43ff
JX
10041#: builtin/update-index.c:998
10042msgid "enable/disable untracked cache"
10043msgstr "启用/禁用对未跟踪文件的缓存"
10044
10045#: builtin/update-index.c:1000
10046msgid "enable untracked cache without testing the filesystem"
10047msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
10048
90314792 10049#: builtin/update-ref.c:9
814ff314
JX
10050msgid "git update-ref [<options>] -d <refname> [<old-val>]"
10051msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
ef317cd5 10052
90314792 10053#: builtin/update-ref.c:10
814ff314
JX
10054msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
10055msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
90314792
JX
10056
10057#: builtin/update-ref.c:11
814ff314
JX
10058msgid "git update-ref [<options>] --stdin [-z]"
10059msgstr "git update-ref [<选项>] --stdin [-z]"
ef317cd5 10060
04cb2f28 10061#: builtin/update-ref.c:359
ef317cd5 10062msgid "delete the reference"
07432cef 10063msgstr "删除引用"
ef317cd5 10064
04cb2f28 10065#: builtin/update-ref.c:361
ef317cd5 10066msgid "update <refname> not the one it points to"
07432cef 10067msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 10068
04cb2f28 10069#: builtin/update-ref.c:362
90314792
JX
10070msgid "stdin has NUL-terminated arguments"
10071msgstr "标准输入有以 NUL 字符终止的参数"
10072
04cb2f28 10073#: builtin/update-ref.c:363
90314792
JX
10074msgid "read updates from stdin"
10075msgstr "从标准输入读取更新"
10076
ef317cd5
JX
10077#: builtin/update-server-info.c:6
10078msgid "git update-server-info [--force]"
07432cef 10079msgstr "git update-server-info [--force]"
ef317cd5
JX
10080
10081#: builtin/update-server-info.c:14
10082msgid "update the info files from scratch"
07432cef 10083msgstr "从头开始更新文件信息"
ef317cd5 10084
6acbf033 10085#: builtin/verify-commit.c:17
814ff314
JX
10086msgid "git verify-commit [-v | --verbose] <commit>..."
10087msgstr "git verify-commit [-v | --verbose] <提交>..."
6acbf033
JX
10088
10089#: builtin/verify-commit.c:75
10090msgid "print commit contents"
10091msgstr "打印提交内容"
10092
220c313c 10093#: builtin/verify-pack.c:54
814ff314
JX
10094msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
10095msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
ef317cd5 10096
220c313c 10097#: builtin/verify-pack.c:64
ef317cd5
JX
10098msgid "verbose"
10099msgstr "冗长输出"
10100
220c313c 10101#: builtin/verify-pack.c:66
ef317cd5 10102msgid "show statistics only"
07432cef 10103msgstr "只显示统计"
ef317cd5
JX
10104
10105#: builtin/verify-tag.c:17
814ff314
JX
10106msgid "git verify-tag [-v | --verbose] <tag>..."
10107msgstr "git verify-tag [-v | --verbose] <标签>..."
ef317cd5
JX
10108
10109#: builtin/verify-tag.c:73
10110msgid "print tag contents"
55a16ee4 10111msgstr "打印标签内容"
ef317cd5 10112
5bb01d4f
JX
10113#: builtin/worktree.c:11
10114msgid "git worktree add [<options>] <path> <branch>"
10115msgstr "git worktree add [<选项>] <路径> <分支>"
10116
10117#: builtin/worktree.c:12
10118msgid "git worktree prune [<options>]"
10119msgstr "git worktree prune [<选项>]"
10120
10121#: builtin/worktree.c:27
10122#, c-format
10123msgid "Removing worktrees/%s: not a valid directory"
10124msgstr "删除工作区/%s:不是一个有效的目录"
10125
10126#: builtin/worktree.c:33
10127#, c-format
10128msgid "Removing worktrees/%s: gitdir file does not exist"
10129msgstr "删除 worktrees/%s:gitdir 文件不存在"
10130
10131#: builtin/worktree.c:38
10132#, c-format
10133msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
10134msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
10135
10136#: builtin/worktree.c:49
10137#, c-format
10138msgid "Removing worktrees/%s: invalid gitdir file"
10139msgstr "删除 worktrees/%s:无效的 gitdir 文件"
10140
10141#: builtin/worktree.c:65
10142#, c-format
10143msgid "Removing worktrees/%s: gitdir file points to non-existent location"
10144msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
10145
10146#: builtin/worktree.c:100
10147#, c-format
10148msgid "failed to remove: %s"
10149msgstr "无法删除:%s"
10150
10151#: builtin/worktree.c:186
10152#, c-format
10153msgid "'%s' already exists"
10154msgstr "'%s' 已经存在"
10155
10156#: builtin/worktree.c:207
10157#, c-format
10158msgid "could not create directory of '%s'"
10159msgstr "不能创建目录 '%s'"
10160
10161#: builtin/worktree.c:241
10162msgid "unable to resolve HEAD"
10163msgstr "不能解析 HEAD"
10164
10165#: builtin/worktree.c:249
10166#, c-format
10167msgid "Enter %s (identifier %s)"
10168msgstr "输入 %s (标识符 %s)"
10169
10170#: builtin/worktree.c:281
10171msgid "checkout <branch> even if already checked out in other worktree"
10172msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
10173
10174#: builtin/worktree.c:283
10175msgid "create a new branch"
10176msgstr "创建一个新分支"
10177
10178#: builtin/worktree.c:285
10179msgid "create or reset a branch"
10180msgstr "创建或重置一个分支"
10181
10182#: builtin/worktree.c:286
10183msgid "detach HEAD at named commit"
10184msgstr "HEAD 从指定的提交分离"
10185
10186#: builtin/worktree.c:292
10187msgid "-b and -B are mutually exclusive"
10188msgstr "-b 和 -B 互斥"
10189
ef317cd5
JX
10190#: builtin/write-tree.c:13
10191msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 10192msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5
JX
10193
10194#: builtin/write-tree.c:26
10195msgid "<prefix>/"
07432cef 10196msgstr "<前缀>/"
ef317cd5
JX
10197
10198#: builtin/write-tree.c:27
10199msgid "write tree object for a subdirectory <prefix>"
07432cef 10200msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5
JX
10201
10202#: builtin/write-tree.c:30
10203msgid "only useful for debugging"
07432cef 10204msgstr "只对调试有用"
ef317cd5 10205
220c313c
JX
10206#: credential-cache--daemon.c:267
10207msgid "print debugging messages to stderr"
10208msgstr "调试信息输出到标准错误"
10209
d9d56b23 10210#: git.c:14
4dcdc3d8 10211msgid ""
220c313c 10212"'git help -a' and 'git help -g' list available subcommands and some\n"
4dcdc3d8
JX
10213"concept guides. See 'git help <command>' or 'git help <concept>'\n"
10214"to read about a specific subcommand or concept."
10215msgstr ""
220c313c
JX
10216"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
10217"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
10218"帮助。"
8ada9598 10219
7aea43ff
JX
10220#: common-cmds.h:10
10221msgid "start a working area (see also: git help tutorial)"
10222msgstr "开始一个工作区(参见:git help tutorial)"
10223
10224#: common-cmds.h:11
10225msgid "work on the current change (see also: git help everyday)"
10226msgstr "在当前变更上工作(参见:git help everyday)"
10227
10228#: common-cmds.h:12
10229msgid "examine the history and state (see also: git help revisions)"
10230msgstr "检查历史和状态(参见:git help revisions)"
10231
10232#: common-cmds.h:13
10233msgid "grow, mark and tweak your common history"
10234msgstr "扩展、标记和调校您的历史记录"
10235
10236#: common-cmds.h:14
10237msgid "collaborate (see also: git help workflows)"
10238msgstr "协同(参见:git help workflows)"
10239
10240#: common-cmds.h:18
8ada9598 10241msgid "Add file contents to the index"
81809b99 10242msgstr "添加文件内容至索引"
8ada9598 10243
7aea43ff 10244#: common-cmds.h:19
8ada9598 10245msgid "Find by binary search the change that introduced a bug"
81809b99 10246msgstr "通过二分查找定位引入 bug 的变更"
8ada9598 10247
7aea43ff 10248#: common-cmds.h:20
8ada9598 10249msgid "List, create, or delete branches"
81809b99 10250msgstr "列出、创建或删除分支"
8ada9598 10251
7aea43ff 10252#: common-cmds.h:21
5bb01d4f
JX
10253msgid "Switch branches or restore working tree files"
10254msgstr "切换分支或恢复工作区文件"
8ada9598 10255
7aea43ff 10256#: common-cmds.h:22
8ada9598 10257msgid "Clone a repository into a new directory"
81809b99 10258msgstr "克隆一个版本库到一个新目录"
8ada9598 10259
7aea43ff 10260#: common-cmds.h:23
8ada9598 10261msgid "Record changes to the repository"
81809b99 10262msgstr "记录变更到版本库"
8ada9598 10263
7aea43ff 10264#: common-cmds.h:24
8ada9598 10265msgid "Show changes between commits, commit and working tree, etc"
81809b99 10266msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598 10267
7aea43ff 10268#: common-cmds.h:25
8ada9598 10269msgid "Download objects and refs from another repository"
81809b99 10270msgstr "从另外一个版本库下载对象和引用"
8ada9598 10271
7aea43ff 10272#: common-cmds.h:26
8ada9598 10273msgid "Print lines matching a pattern"
81809b99 10274msgstr "输出和模式匹配的行"
8ada9598 10275
7aea43ff 10276#: common-cmds.h:27
a77c07d9
JX
10277msgid "Create an empty Git repository or reinitialize an existing one"
10278msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
8ada9598 10279
7aea43ff 10280#: common-cmds.h:28
8ada9598 10281msgid "Show commit logs"
81809b99 10282msgstr "显示提交日志"
8ada9598 10283
7aea43ff 10284#: common-cmds.h:29
8ada9598 10285msgid "Join two or more development histories together"
81809b99 10286msgstr "合并两个或更多开发历史"
8ada9598 10287
7aea43ff 10288#: common-cmds.h:30
8ada9598 10289msgid "Move or rename a file, a directory, or a symlink"
81809b99 10290msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598 10291
7aea43ff 10292#: common-cmds.h:31
2e8451e8
JX
10293msgid "Fetch from and integrate with another repository or a local branch"
10294msgstr "获取并整合另外的版本库或一个本地分支"
8ada9598 10295
7aea43ff 10296#: common-cmds.h:32
8ada9598 10297msgid "Update remote refs along with associated objects"
81809b99 10298msgstr "更新远程引用和相关的对象"
8ada9598 10299
7aea43ff 10300#: common-cmds.h:33
8ada9598 10301msgid "Forward-port local commits to the updated upstream head"
81809b99 10302msgstr "本地提交转移至更新后的上游分支中"
8ada9598 10303
7aea43ff 10304#: common-cmds.h:34
8ada9598 10305msgid "Reset current HEAD to the specified state"
81809b99 10306msgstr "重置当前HEAD到指定状态"
8ada9598 10307
7aea43ff 10308#: common-cmds.h:35
8ada9598 10309msgid "Remove files from the working tree and from the index"
81809b99 10310msgstr "从工作区和索引中删除文件"
8ada9598 10311
7aea43ff 10312#: common-cmds.h:36
8ada9598 10313msgid "Show various types of objects"
81809b99 10314msgstr "显示各种类型的对象"
8ada9598 10315
7aea43ff 10316#: common-cmds.h:37
8ada9598 10317msgid "Show the working tree status"
81809b99 10318msgstr "显示工作区状态"
8ada9598 10319
7aea43ff 10320#: common-cmds.h:38
8ada9598 10321msgid "Create, list, delete or verify a tag object signed with GPG"
53438e8f 10322msgstr "创建、列出、删除或校验一个GPG签名的标签对象"
8ada9598 10323
7aea43ff 10324#: parse-options.h:142
220c313c
JX
10325msgid "expiry-date"
10326msgstr "到期时间"
10327
7aea43ff 10328#: parse-options.h:157
220c313c
JX
10329msgid "no-op (backward compatibility)"
10330msgstr "空操作(向后兼容)"
10331
7aea43ff 10332#: parse-options.h:231
220c313c
JX
10333msgid "be more verbose"
10334msgstr "更加详细"
10335
7aea43ff 10336#: parse-options.h:233
220c313c
JX
10337msgid "be more quiet"
10338msgstr "更加安静"
10339
7aea43ff 10340#: parse-options.h:239
220c313c
JX
10341msgid "use <n> digits to display SHA-1s"
10342msgstr "用 <n> 位数字显示 SHA-1 哈希值"
10343
10344#: rerere.h:27
10345msgid "update the index with reused conflict resolution if possible"
10346msgstr "如果可能,重用冲突解决更新索引"
10347
04cb2f28 10348#: git-am.sh:53
c04f5ac3
JX
10349msgid "You need to set your committer info first"
10350msgstr "您需要先设置你的提交者信息"
10351
7aea43ff 10352#: git-am.sh:100
b694fbb1
JX
10353msgid ""
10354"You seem to have moved HEAD since the last 'am' failure.\n"
10355"Not rewinding to ORIG_HEAD"
6792b93b 10356msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
b694fbb1 10357
7aea43ff 10358#: git-am.sh:110
b694fbb1
JX
10359#, sh-format
10360msgid ""
2e8451e8 10361"When you have resolved this problem, run \"$cmdline --continue\".\n"
649900bc
JX
10362"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
10363"To restore the original branch and stop patching, run \"$cmdline --abort\"."
b694fbb1 10364msgstr ""
2e8451e8 10365"当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
b694fbb1
JX
10366"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
10367"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10368
7aea43ff 10369#: git-am.sh:126
b694fbb1
JX
10370msgid "Cannot fall back to three-way merge."
10371msgstr "无法求助于三路合并。"
10372
7aea43ff 10373#: git-am.sh:142
c04f5ac3 10374msgid "Repository lacks necessary blobs to fall back on 3-way merge."
07432cef 10375msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
649900bc 10376
7aea43ff 10377#: git-am.sh:144
649900bc 10378msgid "Using index info to reconstruct a base tree..."
63af42fe 10379msgstr "使用索引来重建一个(三路合并的)基础目录树..."
c04f5ac3 10380
7aea43ff 10381#: git-am.sh:159
c04f5ac3
JX
10382msgid ""
10383"Did you hand edit your patch?\n"
10384"It does not apply to blobs recorded in its index."
10385msgstr ""
10386"您是否曾手动编辑过您的补丁?\n"
07432cef 10387"无法应用补丁到索引中的数据(blob)对象上。"
c04f5ac3 10388
7aea43ff 10389#: git-am.sh:168
c04f5ac3 10390msgid "Falling back to patching base and 3-way merge..."
b694fbb1 10391msgstr "转而在基础版本上打补丁及进行三路合并..."
c04f5ac3 10392
7aea43ff 10393#: git-am.sh:185
649900bc
JX
10394msgid "Failed to merge in the changes."
10395msgstr "无法合并变更。"
10396
7aea43ff 10397#: git-am.sh:280
c04f5ac3
JX
10398msgid "Only one StGIT patch series can be applied at once"
10399msgstr "一次只能有一个 StGIT 补丁队列被应用"
10400
7aea43ff 10401#: git-am.sh:367
c04f5ac3
JX
10402#, sh-format
10403msgid "Patch format $patch_format is not supported."
10404msgstr "不支持 $patch_format 补丁格式。"
10405
7aea43ff 10406#: git-am.sh:369
c04f5ac3
JX
10407msgid "Patch format detection failed."
10408msgstr "补丁格式检测失败。"
10409
7aea43ff 10410#: git-am.sh:407
649900bc
JX
10411msgid ""
10412"The -b/--binary option has been a no-op for long time, and\n"
10413"it will be removed. Please do not use it anymore."
10414msgstr ""
10415"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
10416"请不要再使用它了。"
c04f5ac3 10417
7aea43ff 10418#: git-am.sh:507
c04f5ac3
JX
10419#, sh-format
10420msgid "previous rebase directory $dotest still exists but mbox given."
2e8451e8 10421msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
c04f5ac3 10422
7aea43ff 10423#: git-am.sh:512
c04f5ac3
JX
10424msgid "Please make up your mind. --skip or --abort?"
10425msgstr "请下决心。--skip 或是 --abort ?"
10426
7aea43ff 10427#: git-am.sh:560
2e8451e8
JX
10428#, sh-format
10429msgid ""
10430"Stray $dotest directory found.\n"
10431"Use \"git am --abort\" to remove it."
10432msgstr ""
10433"发现了错误的 $dotest 目录。\n"
10434"使用 \"git am --abort\" 删除它。"
10435
7aea43ff 10436#: git-am.sh:568
c04f5ac3
JX
10437msgid "Resolve operation not in progress, we are not resuming."
10438msgstr "解决操作未进行,我们不会继续。"
10439
7aea43ff 10440#: git-am.sh:635
c04f5ac3
JX
10441#, sh-format
10442msgid "Dirty index: cannot apply patches (dirty: $files)"
90e6ef53 10443msgstr "脏的索引:不能应用补丁(脏文件:$files)"
c04f5ac3 10444
7aea43ff 10445#: git-am.sh:747
b694fbb1
JX
10446#, sh-format
10447msgid ""
10448"Patch is empty. Was it split wrong?\n"
10449"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
10450"To restore the original branch and stop patching run \"$cmdline --abort\"."
10451msgstr ""
10452"补丁为空。是不是切分错误?\n"
10453"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
10454"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10455
7aea43ff 10456#: git-am.sh:774
b694fbb1
JX
10457msgid "Patch does not have a valid e-mail address."
10458msgstr "补丁中没有一个有效的邮件地址。"
10459
7aea43ff 10460#: git-am.sh:821
c04f5ac3 10461msgid "cannot be interactive without stdin connected to a terminal."
90e6ef53 10462msgstr "标准输入没有和终端关联,不能进行交互式操作。"
c04f5ac3 10463
7aea43ff 10464#: git-am.sh:825
b694fbb1
JX
10465msgid "Commit Body is:"
10466msgstr "提交内容为:"
10467
90e6ef53 10468# 译者:注意保持句尾空格
c04f5ac3
JX
10469#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
10470#. in your translation. The program will only accept English
10471#. input at this point.
7aea43ff 10472#: git-am.sh:832
c04f5ac3
JX
10473msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10474msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10475
7aea43ff 10476#: git-am.sh:868
c04f5ac3
JX
10477#, sh-format
10478msgid "Applying: $FIRSTLINE"
10479msgstr "正应用:$FIRSTLINE"
10480
7aea43ff 10481#: git-am.sh:889
b694fbb1
JX
10482msgid ""
10483"No changes - did you forget to use 'git add'?\n"
10484"If there is nothing left to stage, chances are that something else\n"
10485"already introduced the same changes; you might want to skip this patch."
10486msgstr ""
10487"没有变更 —— 您是不是忘了执行 'git add'?\n"
10488"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
10489"您也许想要跳过这个补丁。"
10490
7aea43ff 10491#: git-am.sh:897
b694fbb1
JX
10492msgid ""
10493"You still have unmerged paths in your index\n"
10494"did you forget to use 'git add'?"
6792b93b 10495msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
b694fbb1 10496
7aea43ff 10497#: git-am.sh:913
c04f5ac3 10498msgid "No changes -- Patch already applied."
63af42fe 10499msgstr "没有变更 —— 补丁已经应用过。"
c04f5ac3 10500
7aea43ff 10501#: git-am.sh:923
b694fbb1
JX
10502#, sh-format
10503msgid "Patch failed at $msgnum $FIRSTLINE"
10504msgstr "补丁失败于 $msgnum $FIRSTLINE"
10505
7aea43ff 10506#: git-am.sh:926
ef317cd5
JX
10507#, sh-format
10508msgid ""
10509"The copy of the patch that failed is found in:\n"
10510" $dotest/patch"
10511msgstr ""
07432cef
WS
10512"失败的补丁文件副本位于:\n"
10513" $dotest/patch"
ef317cd5 10514
7aea43ff 10515#: git-am.sh:945
c04f5ac3
JX
10516msgid "applying to an empty history"
10517msgstr "正应用到一个空历史上"
10518
b694fbb1
JX
10519#: git-bisect.sh:48
10520msgid "You need to start by \"git bisect start\""
10521msgstr "您需要执行 \"git bisect start\" 来开始"
10522
90e6ef53 10523# 译者:注意保持句尾空格
c04f5ac3
JX
10524#. TRANSLATORS: Make sure to include [Y] and [n] in your
10525#. translation. The program will only accept English input
10526#. at this point.
10527#: git-bisect.sh:54
10528msgid "Do you want me to do it for you [Y/n]? "
10529msgstr "您想让我为您这样做么[Y/n]? "
10530
10531#: git-bisect.sh:95
10532#, sh-format
10533msgid "unrecognised option: '$arg'"
81809b99 10534msgstr "未能识别的选项:'$arg'"
c04f5ac3
JX
10535
10536#: git-bisect.sh:99
10537#, sh-format
10538msgid "'$arg' does not appear to be a valid revision"
10539msgstr "'$arg' 看起来不像是一个有效的版本"
10540
10541#: git-bisect.sh:117
10542msgid "Bad HEAD - I need a HEAD"
10543msgstr "坏的 HEAD - 我需要一个 HEAD"
10544
10545#: git-bisect.sh:130
10546#, sh-format
10547msgid ""
814ff314 10548"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
d9d56b23 10549msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
c04f5ac3
JX
10550
10551#: git-bisect.sh:140
cfff71a9
JX
10552msgid "won't bisect on cg-seek'ed tree"
10553msgstr "不会在做了 cg-seek 的树上做二分查找"
c04f5ac3
JX
10554
10555#: git-bisect.sh:144
10556msgid "Bad HEAD - strange symbolic ref"
90e6ef53 10557msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3
JX
10558
10559#: git-bisect.sh:189
10560#, sh-format
10561msgid "Bad bisect_write argument: $state"
90e6ef53 10562msgstr "坏的 bisect_write 参数:$state"
c04f5ac3
JX
10563
10564#: git-bisect.sh:218
10565#, sh-format
10566msgid "Bad rev input: $arg"
90e6ef53 10567msgstr "输入坏的版本:$arg"
c04f5ac3
JX
10568
10569#: git-bisect.sh:232
10570msgid "Please call 'bisect_state' with at least one argument."
10571msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
10572
10573#: git-bisect.sh:244
10574#, sh-format
10575msgid "Bad rev input: $rev"
10576msgstr "输入坏的版本:$rev"
10577
04cb2f28 10578#: git-bisect.sh:253
c04f5ac3
JX
10579msgid "'git bisect bad' can take only one argument."
10580msgstr "'git bisect bad' 只能带一个参数。"
10581
04cb2f28 10582#: git-bisect.sh:276
b694fbb1
JX
10583msgid "Warning: bisecting only with a bad commit."
10584msgstr "警告:在仅有一个坏提交下进行二分查找。"
10585
90e6ef53 10586# 译者:注意保持句尾空格
c04f5ac3
JX
10587#. TRANSLATORS: Make sure to include [Y] and [n] in your
10588#. translation. The program will only accept English input
10589#. at this point.
04cb2f28 10590#: git-bisect.sh:282
c04f5ac3
JX
10591msgid "Are you sure [Y/n]? "
10592msgstr "您确认么[Y/n]? "
10593
04cb2f28 10594#: git-bisect.sh:292
b694fbb1 10595msgid ""
220c313c 10596"You need to give me at least one good and one bad revision.\n"
b694fbb1
JX
10597"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10598msgstr ""
10599"您需要给我至少一个好版本和一个坏版本。\n"
220c313c 10600"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
b694fbb1 10601
04cb2f28 10602#: git-bisect.sh:295
b694fbb1
JX
10603msgid ""
10604"You need to start by \"git bisect start\".\n"
220c313c 10605"You then need to give me at least one good and one bad revision.\n"
b694fbb1
JX
10606"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10607msgstr ""
10608"您需要执行 \"git bisect start\" 来开始。\n"
10609"然后需要提供我至少一个好版本和一个坏版本。\n"
220c313c 10610"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
b694fbb1 10611
04cb2f28 10612#: git-bisect.sh:366 git-bisect.sh:493
b694fbb1
JX
10613msgid "We are not bisecting."
10614msgstr "我们没有在二分查找。"
10615
04cb2f28 10616#: git-bisect.sh:373
c04f5ac3
JX
10617#, sh-format
10618msgid "'$invalid' is not a valid commit"
10619msgstr "'$invalid' 不是一个有效的提交"
10620
04cb2f28 10621#: git-bisect.sh:382
c04f5ac3
JX
10622#, sh-format
10623msgid ""
10624"Could not check out original HEAD '$branch'.\n"
10625"Try 'git bisect reset <commit>'."
10626msgstr ""
10627"不能检出原始 HEAD '$branch'。\n"
07432cef 10628"尝试 'git bisect reset <提交>'。"
c04f5ac3 10629
04cb2f28 10630#: git-bisect.sh:409
c04f5ac3
JX
10631msgid "No logfile given"
10632msgstr "未提供日志文件"
10633
04cb2f28 10634#: git-bisect.sh:410
c04f5ac3
JX
10635#, sh-format
10636msgid "cannot read $file for replaying"
10637msgstr "不能读取 $file 来重放"
10638
04cb2f28 10639#: git-bisect.sh:427
c04f5ac3
JX
10640msgid "?? what are you talking about?"
10641msgstr "?? 您在说什么?"
10642
04cb2f28 10643#: git-bisect.sh:439
b694fbb1
JX
10644#, sh-format
10645msgid "running $command"
10646msgstr "运行 $command"
10647
04cb2f28 10648#: git-bisect.sh:446
b694fbb1
JX
10649#, sh-format
10650msgid ""
10651"bisect run failed:\n"
10652"exit code $res from '$command' is < 0 or >= 128"
10653msgstr ""
10654"二分查找运行失败:\n"
07432cef 10655"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 10656
04cb2f28 10657#: git-bisect.sh:472
b694fbb1
JX
10658msgid "bisect run cannot continue any more"
10659msgstr "二分查找不能继续运行"
10660
04cb2f28 10661#: git-bisect.sh:478
b694fbb1
JX
10662#, sh-format
10663msgid ""
10664"bisect run failed:\n"
10665"'bisect_state $state' exited with error code $res"
10666msgstr ""
10667"二分查找运行失败:\n"
10668"'bisect_state $state' 退出码为 $res"
10669
04cb2f28 10670#: git-bisect.sh:485
b694fbb1
JX
10671msgid "bisect run success"
10672msgstr "二分查找运行成功"
c04f5ac3 10673
7aea43ff 10674#: git-pull.sh:61
c04f5ac3
JX
10675msgid ""
10676"Pull is not possible because you have unmerged files.\n"
10677"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 10678"as appropriate to mark resolution and make a commit."
c04f5ac3 10679msgstr ""
90e6ef53 10680"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
d9d56b23 10681"然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
c04f5ac3 10682
7aea43ff 10683#: git-pull.sh:65
c04f5ac3 10684msgid "Pull is not possible because you have unmerged files."
90e6ef53 10685msgstr "Pull 不可用,因为您尚有未合并的文件。"
c04f5ac3 10686
7aea43ff 10687#: git-pull.sh:71
220c313c
JX
10688msgid ""
10689"You have not concluded your merge (MERGE_HEAD exists).\n"
10690"Please, commit your changes before you can merge."
10691msgstr ""
10692"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
10693"请在合并前先提交您的修改。"
10694
7aea43ff 10695#: git-pull.sh:285
c04f5ac3 10696msgid "updating an unborn branch with changes added to the index"
90e6ef53 10697msgstr "更新尚未诞生的分支,变更添加至索引"
c04f5ac3 10698
7aea43ff 10699#: git-pull.sh:311
b694fbb1
JX
10700#, sh-format
10701msgid ""
10702"Warning: fetch updated the current branch head.\n"
10703"Warning: fast-forwarding your working tree from\n"
10704"Warning: commit $orig_head."
10705msgstr ""
10706"警告:fetch 更新了当前的分支。您的工作区\n"
10707"警告:从原提交 $orig_head 快进。"
10708
7aea43ff 10709#: git-pull.sh:336
c04f5ac3
JX
10710msgid "Cannot merge multiple branches into empty head"
10711msgstr "无法将多个分支合并到空分支"
10712
7aea43ff 10713#: git-pull.sh:340
c04f5ac3
JX
10714msgid "Cannot rebase onto multiple branches"
10715msgstr "无法变基到多个分支"
10716
6c94aba5 10717#: git-rebase.sh:57
649900bc
JX
10718msgid ""
10719"When you have resolved this problem, run \"git rebase --continue\".\n"
10720"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10721"To check out the original branch and stop rebasing, run \"git rebase --abort"
10722"\"."
10723msgstr ""
10724"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10725"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10726"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10727
6acbf033 10728#: git-rebase.sh:165
2e8451e8
JX
10729msgid "Applied autostash."
10730msgstr "成功应用 autostash。"
10731
6acbf033 10732#: git-rebase.sh:168
2e8451e8
JX
10733#, sh-format
10734msgid "Cannot store $stash_sha1"
10735msgstr "无法保存 $stash_sha1"
10736
6acbf033 10737#: git-rebase.sh:169
2e8451e8
JX
10738msgid ""
10739"Applying autostash resulted in conflicts.\n"
10740"Your changes are safe in the stash.\n"
b1894384 10741"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
2e8451e8
JX
10742msgstr ""
10743"应用 autostash 导致冲突。\n"
10744"您的修改安全地保存在 stash 中。\n"
10745"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10746
6acbf033 10747#: git-rebase.sh:208
649900bc 10748msgid "The pre-rebase hook refused to rebase."
98b2761d 10749msgstr "钩子 pre-rebase 拒绝变基操作。"
649900bc 10750
6acbf033 10751#: git-rebase.sh:213
649900bc
JX
10752msgid "It looks like git-am is in progress. Cannot rebase."
10753msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10754
6acbf033 10755#: git-rebase.sh:351
649900bc
JX
10756msgid "The --exec option must be used with the --interactive option"
10757msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10758
6acbf033 10759#: git-rebase.sh:356
649900bc
JX
10760msgid "No rebase in progress?"
10761msgstr "没有正在进行的变基?"
10762
6acbf033 10763#: git-rebase.sh:367
07432cef
WS
10764msgid "The --edit-todo action can only be used during interactive rebase."
10765msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10766
6acbf033 10767#: git-rebase.sh:374
649900bc
JX
10768msgid "Cannot read HEAD"
10769msgstr "不能读取 HEAD"
10770
6acbf033 10771#: git-rebase.sh:377
649900bc
JX
10772msgid ""
10773"You must edit all merge conflicts and then\n"
10774"mark them as resolved using git add"
10775msgstr ""
10776"您必须编辑所有的合并冲突,然后通过 git add\n"
10777"命令将它们标记为已解决"
10778
6acbf033 10779#: git-rebase.sh:395
649900bc
JX
10780#, sh-format
10781msgid "Could not move back to $head_name"
10782msgstr "无法移回 $head_name"
10783
6acbf033 10784#: git-rebase.sh:414
649900bc
JX
10785#, sh-format
10786msgid ""
10787"It seems that there is already a $state_dir_base directory, and\n"
10788"I wonder if you are in the middle of another rebase. If that is the\n"
10789"case, please try\n"
10790"\t$cmd_live_rebase\n"
10791"If that is not the case, please\n"
10792"\t$cmd_clear_stale_rebase\n"
10793"and run me again. I am stopping in case you still have something\n"
10794"valuable there."
10795msgstr ""
98b2761d
JX
10796"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
10797"过程中。 如果是这样,请执行\n"
649900bc
JX
10798"\t$cmd_live_rebase\n"
10799"如果不是这样,请执行\n"
10800"\t$cmd_clear_stale_rebase\n"
98b2761d 10801"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
649900bc 10802
6acbf033 10803#: git-rebase.sh:465
649900bc
JX
10804#, sh-format
10805msgid "invalid upstream $upstream_name"
10806msgstr "无效的上游 $upstream_name"
10807
6acbf033 10808#: git-rebase.sh:489
649900bc
JX
10809#, sh-format
10810msgid "$onto_name: there are more than one merge bases"
10811msgstr "$onto_name: 有一个以上的合并基准"
10812
6acbf033 10813#: git-rebase.sh:492 git-rebase.sh:496
649900bc
JX
10814#, sh-format
10815msgid "$onto_name: there is no merge base"
10816msgstr "$onto_name: 没有合并基准"
10817
6acbf033 10818#: git-rebase.sh:501
649900bc
JX
10819#, sh-format
10820msgid "Does not point to a valid commit: $onto_name"
10821msgstr "没有指向一个有效的提交:$onto_name"
10822
6acbf033 10823#: git-rebase.sh:524
649900bc
JX
10824#, sh-format
10825msgid "fatal: no such branch: $branch_name"
10826msgstr "严重错误:无此分支:$branch_name"
10827
6acbf033 10828#: git-rebase.sh:557
2e8451e8
JX
10829msgid "Cannot autostash"
10830msgstr "无法 autostash"
10831
6acbf033 10832#: git-rebase.sh:562
2e8451e8
JX
10833#, sh-format
10834msgid "Created autostash: $stash_abbrev"
10835msgstr "创建了 autostash: $stash_abbrev"
10836
6acbf033 10837#: git-rebase.sh:566
649900bc
JX
10838msgid "Please commit or stash them."
10839msgstr "请提交或为它们保存进度。"
10840
6acbf033 10841#: git-rebase.sh:586
649900bc
JX
10842#, sh-format
10843msgid "Current branch $branch_name is up to date."
10844msgstr "当前分支 $branch_name 是最新的。"
10845
6acbf033 10846#: git-rebase.sh:590
649900bc
JX
10847#, sh-format
10848msgid "Current branch $branch_name is up to date, rebase forced."
10849msgstr "当前分支 $branch_name 是最新的,强制变基。"
10850
6acbf033 10851#: git-rebase.sh:601
649900bc
JX
10852#, sh-format
10853msgid "Changes from $mb to $onto:"
10854msgstr "变更从 $mb 到 $onto:"
10855
6acbf033 10856#: git-rebase.sh:610
649900bc
JX
10857msgid "First, rewinding head to replay your work on top of it..."
10858msgstr "首先,重置头指针以便在上面重放您的工作..."
10859
6acbf033 10860#: git-rebase.sh:620
649900bc
JX
10861#, sh-format
10862msgid "Fast-forwarded $branch_name to $onto_name."
10863msgstr "快进 $branch_name 至 $onto_name。"
10864
c04f5ac3
JX
10865#: git-stash.sh:51
10866msgid "git stash clear with parameters is unimplemented"
10867msgstr "git stash clear 不支持参数"
10868
10869#: git-stash.sh:74
10870msgid "You do not have the initial commit yet"
10871msgstr "您尚未建立初始提交"
10872
10873#: git-stash.sh:89
10874msgid "Cannot save the current index state"
90e6ef53 10875msgstr "无法保存当前索引状态"
c04f5ac3 10876
6acbf033 10877#: git-stash.sh:124 git-stash.sh:137
c04f5ac3
JX
10878msgid "Cannot save the current worktree state"
10879msgstr "无法保存当前工作区状态"
10880
6acbf033 10881#: git-stash.sh:141
c04f5ac3 10882msgid "No changes selected"
90e6ef53 10883msgstr "没有选择变更"
c04f5ac3 10884
6acbf033 10885#: git-stash.sh:144
c04f5ac3 10886msgid "Cannot remove temporary index (can't happen)"
90e6ef53 10887msgstr "无法删除临时索引(不应发生)"
c04f5ac3 10888
6acbf033 10889#: git-stash.sh:157
c04f5ac3
JX
10890msgid "Cannot record working tree state"
10891msgstr "不能记录工作区状态"
10892
6acbf033 10893#: git-stash.sh:191
2e8451e8
JX
10894#, sh-format
10895msgid "Cannot update $ref_stash with $w_commit"
10896msgstr "无法用 $w_commit 更新 $ref_stash"
10897
b694fbb1
JX
10898#. TRANSLATORS: $option is an invalid option, like
10899#. `--blah-blah'. The 7 spaces at the beginning of the
10900#. second line correspond to "error: ". So you should line
10901#. up the second line with however many characters the
10902#. translation of "error: " takes in your language. E.g. in
10903#. English this is:
10904#.
10905#. $ git stash save --blah-blah 2>&1 | head -n 2
10906#. error: unknown option for 'stash save': --blah-blah
10907#. To provide a message, use git stash save -- '--blah-blah'
7aea43ff 10908#: git-stash.sh:241
b694fbb1
JX
10909#, sh-format
10910msgid ""
10911"error: unknown option for 'stash save': $option\n"
10912" To provide a message, use git stash save -- '$option'"
10913msgstr ""
10914"错误:'stash save' 的未知选项:$option\n"
10915" 要提供一个描述信息,使用 git stash save -- '$option'"
10916
7aea43ff 10917#: git-stash.sh:262
c04f5ac3
JX
10918msgid "No local changes to save"
10919msgstr "没有要保存的本地修改"
10920
7aea43ff 10921#: git-stash.sh:266
c04f5ac3 10922msgid "Cannot initialize stash"
90e6ef53 10923msgstr "无法初始化 stash"
c04f5ac3 10924
7aea43ff 10925#: git-stash.sh:270
c04f5ac3
JX
10926msgid "Cannot save the current status"
10927msgstr "无法保存当前状态"
10928
7aea43ff 10929#: git-stash.sh:288
c04f5ac3
JX
10930msgid "Cannot remove worktree changes"
10931msgstr "无法删除工作区变更"
10932
7aea43ff
JX
10933#: git-stash.sh:389
10934#, sh-format
10935msgid "unknown option: $opt"
10936msgstr "未知选项: $opt"
10937
10938#: git-stash.sh:399
c04f5ac3 10939msgid "No stash found."
90e6ef53 10940msgstr "未发现 stash。"
c04f5ac3 10941
7aea43ff 10942#: git-stash.sh:406
c04f5ac3
JX
10943#, sh-format
10944msgid "Too many revisions specified: $REV"
90e6ef53 10945msgstr "指定了太多的版本:$REV"
c04f5ac3 10946
7aea43ff 10947#: git-stash.sh:412
c04f5ac3 10948#, sh-format
220c313c
JX
10949msgid "$reference is not a valid reference"
10950msgstr "$reference 不是一个有效的引用"
c04f5ac3 10951
7aea43ff 10952#: git-stash.sh:440
c04f5ac3
JX
10953#, sh-format
10954msgid "'$args' is not a stash-like commit"
90e6ef53 10955msgstr "'$args' 不是 stash 样提交"
c04f5ac3 10956
7aea43ff 10957#: git-stash.sh:451
c04f5ac3
JX
10958#, sh-format
10959msgid "'$args' is not a stash reference"
90e6ef53 10960msgstr "'$args' 不是一个 stash 引用"
c04f5ac3 10961
7aea43ff 10962#: git-stash.sh:459
c04f5ac3 10963msgid "unable to refresh index"
90e6ef53 10964msgstr "无法刷新索引"
c04f5ac3 10965
7aea43ff 10966#: git-stash.sh:463
c04f5ac3
JX
10967msgid "Cannot apply a stash in the middle of a merge"
10968msgstr "无法在合并过程中恢复进度"
10969
7aea43ff 10970#: git-stash.sh:471
c04f5ac3 10971msgid "Conflicts in index. Try without --index."
90e6ef53 10972msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3 10973
7aea43ff 10974#: git-stash.sh:473
c04f5ac3 10975msgid "Could not save index tree"
90e6ef53 10976msgstr "不能保存索引树"
c04f5ac3 10977
7aea43ff 10978#: git-stash.sh:507
c04f5ac3
JX
10979msgid "Cannot unstage modified files"
10980msgstr "无法还原修改的文件"
10981
7aea43ff 10982#: git-stash.sh:522
b694fbb1
JX
10983msgid "Index was not unstashed."
10984msgstr "索引的进度没有被恢复。"
10985
7aea43ff 10986#: git-stash.sh:545
c04f5ac3
JX
10987#, sh-format
10988msgid "Dropped ${REV} ($s)"
10989msgstr "丢弃了 ${REV} ($s)"
10990
7aea43ff 10991#: git-stash.sh:546
c04f5ac3
JX
10992#, sh-format
10993msgid "${REV}: Could not drop stash entry"
90e6ef53 10994msgstr "${REV}:不能丢弃进度条目"
c04f5ac3 10995
7aea43ff 10996#: git-stash.sh:554
c04f5ac3
JX
10997msgid "No branch name specified"
10998msgstr "未指定分支名"
10999
7aea43ff 11000#: git-stash.sh:626
c04f5ac3
JX
11001msgid "(To restore them type \"git stash apply\")"
11002msgstr "(为恢复数据输入 \"git stash apply\")"
11003
2e8451e8 11004#: git-submodule.sh:95
c04f5ac3
JX
11005#, sh-format
11006msgid "cannot strip one component off url '$remoteurl'"
11007msgstr "无法从 url '$remoteurl' 剥离一个组件"
11008
2e8451e8 11009#: git-submodule.sh:237
c04f5ac3 11010#, sh-format
170e9899
JX
11011msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
11012msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
c04f5ac3 11013
6c94aba5 11014#: git-submodule.sh:287
c04f5ac3 11015#, sh-format
170e9899
JX
11016msgid "Clone of '$url' into submodule path '$sm_path' failed"
11017msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
c04f5ac3 11018
6acbf033 11019#: git-submodule.sh:296
dac1de7d
JX
11020#, sh-format
11021msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
07432cef 11022msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
dac1de7d 11023
6acbf033 11024#: git-submodule.sh:406
2e8451e8
JX
11025msgid "Relative path can only be used from the toplevel of the working tree"
11026msgstr "只能在工作区的顶级目录中使用相对路径"
11027
6acbf033 11028#: git-submodule.sh:416
c04f5ac3
JX
11029#, sh-format
11030msgid "repo URL: '$repo' must be absolute or begin with ./|../"
11031msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
11032
6acbf033 11033#: git-submodule.sh:433
c04f5ac3 11034#, sh-format
170e9899
JX
11035msgid "'$sm_path' already exists in the index"
11036msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 11037
6acbf033 11038#: git-submodule.sh:437
b694fbb1
JX
11039#, sh-format
11040msgid ""
11041"The following path is ignored by one of your .gitignore files:\n"
11042"$sm_path\n"
11043"Use -f if you really want to add it."
11044msgstr ""
11045"以下路径被您的一个 .gitignore 文件所忽略:\n"
11046"$sm_path\n"
11047"如果您确实想添加它,使用 -f 参数。"
11048
6acbf033 11049#: git-submodule.sh:455
b694fbb1
JX
11050#, sh-format
11051msgid "Adding existing repo at '$sm_path' to the index"
11052msgstr "添加位于 '$sm_path' 的现存版本库到索引"
11053
6acbf033 11054#: git-submodule.sh:457
c04f5ac3 11055#, sh-format
170e9899
JX
11056msgid "'$sm_path' already exists and is not a valid git repo"
11057msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
c04f5ac3 11058
6acbf033 11059#: git-submodule.sh:465
07432cef
WS
11060#, sh-format
11061msgid "A git directory for '$sm_name' is found locally with remote(s):"
11062msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
11063
6acbf033 11064#: git-submodule.sh:467
07432cef
WS
11065#, sh-format
11066msgid ""
11067"If you want to reuse this local git directory instead of cloning again from"
11068msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11069
6acbf033 11070#: git-submodule.sh:469
07432cef
WS
11071#, sh-format
11072msgid ""
11073"use the '--force' option. If the local git directory is not the correct repo"
11074msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
11075
6acbf033 11076#: git-submodule.sh:470
07432cef
WS
11077#, sh-format
11078msgid ""
11079"or you are unsure what this means choose another name with the '--name' "
11080"option."
11081msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11082
6acbf033 11083#: git-submodule.sh:472
07432cef
WS
11084#, sh-format
11085msgid "Reactivating local git directory for submodule '$sm_name'."
11086msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11087
6acbf033 11088#: git-submodule.sh:484
c04f5ac3 11089#, sh-format
170e9899
JX
11090msgid "Unable to checkout submodule '$sm_path'"
11091msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 11092
6acbf033 11093#: git-submodule.sh:489
c04f5ac3 11094#, sh-format
170e9899
JX
11095msgid "Failed to add submodule '$sm_path'"
11096msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 11097
6acbf033 11098#: git-submodule.sh:498
c04f5ac3 11099#, sh-format
170e9899
JX
11100msgid "Failed to register submodule '$sm_path'"
11101msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 11102
6acbf033 11103#: git-submodule.sh:542
c04f5ac3 11104#, sh-format
2e8451e8
JX
11105msgid "Entering '$prefix$displaypath'"
11106msgstr "正在进入 '$prefix$displaypath'"
c04f5ac3 11107
6acbf033 11108#: git-submodule.sh:562
c04f5ac3 11109#, sh-format
2e8451e8
JX
11110msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
11111msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
c04f5ac3 11112
6acbf033 11113#: git-submodule.sh:608
c04f5ac3 11114#, sh-format
2e8451e8
JX
11115msgid "No url found for submodule path '$displaypath' in .gitmodules"
11116msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
c04f5ac3 11117
6acbf033 11118#: git-submodule.sh:617
c04f5ac3 11119#, sh-format
2e8451e8
JX
11120msgid "Failed to register url for submodule path '$displaypath'"
11121msgstr "无法为子模组路径 '$displaypath' 注册 url"
c04f5ac3 11122
6acbf033 11123#: git-submodule.sh:619
c04f5ac3 11124#, sh-format
2e8451e8
JX
11125msgid "Submodule '$name' ($url) registered for path '$displaypath'"
11126msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
c04f5ac3 11127
6acbf033 11128#: git-submodule.sh:636
d691f479 11129#, sh-format
2e8451e8
JX
11130msgid "Failed to register update mode for submodule path '$displaypath'"
11131msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
d691f479 11132
6acbf033 11133#: git-submodule.sh:674
1003b3a5
JX
11134#, sh-format
11135msgid "Use '.' if you really want to deinitialize all submodules"
11136msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
11137
6acbf033 11138#: git-submodule.sh:691
1003b3a5 11139#, sh-format
2e8451e8
JX
11140msgid "Submodule work tree '$displaypath' contains a .git directory"
11141msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
1003b3a5 11142
6acbf033 11143#: git-submodule.sh:692
1003b3a5
JX
11144#, sh-format
11145msgid ""
11146"(use 'rm -rf' if you really want to remove it including all of its history)"
11147msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11148
6acbf033 11149#: git-submodule.sh:698
c04f5ac3
JX
11150#, sh-format
11151msgid ""
2e8451e8 11152"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
1003b3a5 11153"discard them"
2e8451e8 11154msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
1003b3a5 11155
6acbf033 11156#: git-submodule.sh:701
1003b3a5 11157#, sh-format
2e8451e8
JX
11158msgid "Cleared directory '$displaypath'"
11159msgstr "已清除目录 '$displaypath'"
1003b3a5 11160
6acbf033 11161#: git-submodule.sh:702
1003b3a5 11162#, sh-format
2e8451e8
JX
11163msgid "Could not remove submodule work tree '$displaypath'"
11164msgstr "无法移除子模组工作区 '$displaypath'"
1003b3a5 11165
6acbf033 11166#: git-submodule.sh:705
1003b3a5 11167#, sh-format
2e8451e8
JX
11168msgid "Could not create empty submodule directory '$displaypath'"
11169msgstr "不能创建空的子模组目录 '$displaypath'"
1003b3a5 11170
6acbf033 11171#: git-submodule.sh:714
1003b3a5 11172#, sh-format
2e8451e8
JX
11173msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
11174msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
1003b3a5 11175
6acbf033 11176#: git-submodule.sh:830
1003b3a5
JX
11177#, sh-format
11178msgid ""
2e8451e8 11179"Submodule path '$displaypath' not initialized\n"
c04f5ac3
JX
11180"Maybe you want to use 'update --init'?"
11181msgstr ""
2e8451e8 11182"子模组路径 '$displaypath' 没有初始化\n"
90e6ef53 11183"也许您想用 'update --init'?"
c04f5ac3 11184
6acbf033 11185#: git-submodule.sh:843
c04f5ac3 11186#, sh-format
2e8451e8
JX
11187msgid "Unable to find current revision in submodule path '$displaypath'"
11188msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 11189
6acbf033 11190#: git-submodule.sh:852
c04f5ac3 11191#, sh-format
170e9899
JX
11192msgid "Unable to fetch in submodule path '$sm_path'"
11193msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 11194
6acbf033 11195#: git-submodule.sh:876
2e8451e8
JX
11196#, sh-format
11197msgid "Unable to fetch in submodule path '$displaypath'"
11198msgstr "无法在子模组路径 '$displaypath' 中获取"
11199
6acbf033 11200#: git-submodule.sh:890
6c94aba5
JX
11201#, sh-format
11202msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
11203msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
11204
6acbf033 11205#: git-submodule.sh:891
c04f5ac3 11206#, sh-format
6c94aba5
JX
11207msgid "Submodule path '$displaypath': checked out '$sha1'"
11208msgstr "子模组路径 '$displaypath':检出 '$sha1'"
11209
6acbf033 11210#: git-submodule.sh:895
6c94aba5 11211#, sh-format
2e8451e8
JX
11212msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
11213msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 11214
6acbf033 11215#: git-submodule.sh:896
c04f5ac3 11216#, sh-format
2e8451e8
JX
11217msgid "Submodule path '$displaypath': rebased into '$sha1'"
11218msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 11219
6acbf033 11220#: git-submodule.sh:901
c04f5ac3 11221#, sh-format
2e8451e8
JX
11222msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
11223msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 11224
6acbf033 11225#: git-submodule.sh:902
c04f5ac3 11226#, sh-format
2e8451e8
JX
11227msgid "Submodule path '$displaypath': merged in '$sha1'"
11228msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 11229
6acbf033 11230#: git-submodule.sh:907
c04f5ac3 11231#, sh-format
2e8451e8
JX
11232msgid ""
11233"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
11234msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
c04f5ac3 11235
6acbf033 11236#: git-submodule.sh:908
c04f5ac3 11237#, sh-format
2e8451e8
JX
11238msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
11239msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
c04f5ac3 11240
6acbf033 11241#: git-submodule.sh:938
2e8451e8
JX
11242#, sh-format
11243msgid "Failed to recurse into submodule path '$displaypath'"
11244msgstr "无法递归进子模组路径 '$displaypath'"
11245
6acbf033 11246#: git-submodule.sh:1046
649900bc
JX
11247msgid "The --cached option cannot be used with the --files option"
11248msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1 11249
6acbf033 11250#: git-submodule.sh:1098
b694fbb1
JX
11251#, sh-format
11252msgid "unexpected mode $mod_dst"
11253msgstr "意外的模式 $mod_dst"
c04f5ac3 11254
90e6ef53 11255# 译者:注意保持前导空格
6acbf033 11256#: git-submodule.sh:1118
c04f5ac3 11257#, sh-format
2e8451e8
JX
11258msgid " Warn: $display_name doesn't contain commit $sha1_src"
11259msgstr " 警告:$display_name 未包含提交 $sha1_src"
c04f5ac3 11260
90e6ef53 11261# 译者:注意保持前导空格
6acbf033 11262#: git-submodule.sh:1121
c04f5ac3 11263#, sh-format
2e8451e8
JX
11264msgid " Warn: $display_name doesn't contain commit $sha1_dst"
11265msgstr " 警告:$display_name 未包含提交 $sha1_dst"
c04f5ac3 11266
90e6ef53 11267# 译者:注意保持前导空格
6acbf033 11268#: git-submodule.sh:1124
c04f5ac3 11269#, sh-format
2e8451e8
JX
11270msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11271msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
c04f5ac3 11272
6acbf033 11273#: git-submodule.sh:1149
c04f5ac3 11274msgid "blob"
07432cef 11275msgstr "数据对象"
c04f5ac3 11276
6acbf033 11277#: git-submodule.sh:1267
1003b3a5
JX
11278#, sh-format
11279msgid "Failed to recurse into submodule path '$sm_path'"
11280msgstr "无法递归进子模组路径 '$sm_path'"
11281
6acbf033 11282#: git-submodule.sh:1331
c04f5ac3 11283#, sh-format
2e8451e8
JX
11284msgid "Synchronizing submodule url for '$displaypath'"
11285msgstr "为 '$displaypath' 同步子模组 url"