]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
l10n: sv.po: Update Swedish translation (2359t0f0u)
[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
JX
6# - Jiang Xin <worldhello.net AT gmail.com>
7# - Riku <lu.riku AT gmail.com>
8# - Zhuang Ya <zhuangya AT me.com>
9# - Lian Cheng <rhythm.mail AT gmail.com>
10#
11msgid ""
12msgstr ""
13"Project-Id-Version: Git\n"
14"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
7aea43ff
JX
15"POT-Creation-Date: 2015-06-27 19:17+0800\n"
16"PO-Revision-Date: 2015-07-05 23:12+0800\n"
c04f5ac3 17"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
7aea43ff 18"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
c04f5ac3
JX
19"Language: zh_CN\n"
20"MIME-Version: 1.0\n"
21"Content-Type: text/plain; charset=UTF-8\n"
22"Content-Transfer-Encoding: 8bit\n"
5ae481e0 23"Plural-Forms: nplurals=2; plural=(n != 1);\n"
c04f5ac3 24
6c94aba5 25#: advice.c:55
c04f5ac3
JX
26#, c-format
27msgid "hint: %.*s\n"
28msgstr "提示:%.*s\n"
29
6acbf033 30#: advice.c:88
c04f5ac3 31msgid ""
6acbf033 32"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 33"as appropriate to mark resolution and make a commit."
c04f5ac3 34msgstr ""
d9d56b23 35"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
220c313c 36"解决方案并提交。"
c04f5ac3 37
220c313c 38#: archive.c:11
814ff314
JX
39msgid "git archive [<options>] <tree-ish> [<path>...]"
40msgstr "git archive [<选项>] <树或提交> [<路径>...]"
ef317cd5 41
220c313c 42#: archive.c:12
ef317cd5 43msgid "git archive --list"
07432cef 44msgstr "git archive --list"
ef317cd5 45
220c313c 46#: archive.c:13
ef317cd5 47msgid ""
814ff314 48"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
ef317cd5 49msgstr ""
814ff314 50"git archive --remote <版本库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
ef317cd5 51
220c313c 52#: archive.c:14
ef317cd5 53msgid "git archive --remote <repo> [--exec <cmd>] --list"
07432cef 54msgstr "git archive --remote <版本库> [--exec <命令>] --list"
ef317cd5 55
7aea43ff 56#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327
90314792
JX
57#, c-format
58msgid "pathspec '%s' did not match any files"
59msgstr "路径规则 '%s' 未匹配任何文件"
60
04cb2f28 61#: archive.c:427
ef317cd5 62msgid "fmt"
07432cef 63msgstr "格式"
ef317cd5 64
04cb2f28 65#: archive.c:427
ef317cd5 66msgid "archive format"
07432cef 67msgstr "归档格式"
ef317cd5 68
04cb2f28 69#: archive.c:428 builtin/log.c:1204
ef317cd5 70msgid "prefix"
07432cef 71msgstr "前缀"
ef317cd5 72
04cb2f28 73#: archive.c:429
ef317cd5 74msgid "prepend prefix to each pathname in the archive"
07432cef 75msgstr "为归档中每个路径名加上前缀"
ef317cd5 76
814ff314
JX
77#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516
78#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986
7aea43ff 79#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99
814ff314 80#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394
7aea43ff 81#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150
ef317cd5
JX
82msgid "file"
83msgstr "文件"
84
04cb2f28 85#: archive.c:431 builtin/archive.c:89
ef317cd5 86msgid "write the archive to this file"
07432cef 87msgstr "归档写入此文件"
ef317cd5 88
04cb2f28 89#: archive.c:433
ef317cd5 90msgid "read .gitattributes in working directory"
07432cef 91msgstr "读取工作区中的 .gitattributes"
ef317cd5 92
04cb2f28 93#: archive.c:434
ef317cd5 94msgid "report archived files on stderr"
07432cef 95msgstr "在标准错误上报告归档文件"
ef317cd5 96
04cb2f28 97#: archive.c:435
ef317cd5 98msgid "store only"
07432cef 99msgstr "只存储"
ef317cd5 100
04cb2f28 101#: archive.c:436
ef317cd5 102msgid "compress faster"
07432cef 103msgstr "压缩速度更快"
ef317cd5 104
04cb2f28 105#: archive.c:444
ef317cd5 106msgid "compress better"
07432cef 107msgstr "压缩效果更好"
ef317cd5 108
04cb2f28 109#: archive.c:447
ef317cd5 110msgid "list supported archive formats"
07432cef 111msgstr "列出支持的归档格式"
ef317cd5 112
7aea43ff 113#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77
ef317cd5 114msgid "repo"
07432cef 115msgstr "版本库"
ef317cd5 116
04cb2f28 117#: archive.c:450 builtin/archive.c:91
ef317cd5 118msgid "retrieve the archive from remote repository <repo>"
07432cef 119msgstr "从远程版本库(<版本库>)提取归档文件"
ef317cd5 120
04cb2f28 121#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478
ef317cd5 122msgid "command"
07432cef 123msgstr "命令"
ef317cd5 124
04cb2f28 125#: archive.c:452 builtin/archive.c:93
ef317cd5 126msgid "path to the remote git-upload-archive command"
07432cef
WS
127msgstr "远程 git-upload-archive 命令的路径"
128
7aea43ff 129#: attr.c:265
07432cef 130msgid ""
a7409dfb 131"Negative patterns are ignored in git attributes\n"
07432cef 132"Use '\\!' for literal leading exclamation."
ef317cd5 133msgstr ""
a7409dfb 134"负值模版在 git attributes 中被忽略\n"
07432cef 135"当字符串确实要以感叹号开始时,使用 '\\!'。"
ef317cd5 136
4dcdc3d8
JX
137#: branch.c:60
138#, c-format
139msgid "Not setting branch %s as its own upstream."
140msgstr "未设置分支 %s 作为它自己的上游。"
141
6c94aba5 142#: branch.c:83
4dcdc3d8
JX
143#, c-format
144msgid "Branch %s set up to track remote branch %s from %s by rebasing."
145msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
146
6c94aba5 147#: branch.c:84
4dcdc3d8
JX
148#, c-format
149msgid "Branch %s set up to track remote branch %s from %s."
150msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
151
6c94aba5 152#: branch.c:88
4dcdc3d8
JX
153#, c-format
154msgid "Branch %s set up to track local branch %s by rebasing."
155msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
156
6c94aba5 157#: branch.c:89
4dcdc3d8
JX
158#, c-format
159msgid "Branch %s set up to track local branch %s."
160msgstr "分支 %s 设置为跟踪本地分支 %s。"
161
6c94aba5 162#: branch.c:94
4dcdc3d8
JX
163#, c-format
164msgid "Branch %s set up to track remote ref %s by rebasing."
165msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
166
6c94aba5 167#: branch.c:95
4dcdc3d8
JX
168#, c-format
169msgid "Branch %s set up to track remote ref %s."
170msgstr "分支 %s 设置为跟踪远程引用 %s。"
171
6c94aba5 172#: branch.c:99
4dcdc3d8
JX
173#, c-format
174msgid "Branch %s set up to track local ref %s by rebasing."
175msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
176
6c94aba5 177#: branch.c:100
4dcdc3d8
JX
178#, c-format
179msgid "Branch %s set up to track local ref %s."
180msgstr "分支 %s 设置为跟踪本地引用 %s。"
181
6c94aba5 182#: branch.c:133
4dcdc3d8
JX
183#, c-format
184msgid "Not tracking: ambiguous information for ref %s"
185msgstr "未跟踪:引用 %s 有歧义"
186
220c313c 187#: branch.c:162
4dcdc3d8
JX
188#, c-format
189msgid "'%s' is not a valid branch name."
190msgstr "'%s' 不是一个有效的分支名称。"
191
220c313c 192#: branch.c:167
4dcdc3d8
JX
193#, c-format
194msgid "A branch named '%s' already exists."
195msgstr "一个分支名 '%s' 已经存在。"
196
220c313c 197#: branch.c:175
4dcdc3d8
JX
198msgid "Cannot force update the current branch."
199msgstr "无法强制更新当前分支。"
200
220c313c 201#: branch.c:195
1003b3a5
JX
202#, c-format
203msgid "Cannot setup tracking information; starting point '%s' is not a branch."
204msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
205
220c313c 206#: branch.c:197
1003b3a5
JX
207#, c-format
208msgid "the requested upstream branch '%s' does not exist"
209msgstr "请求的上游分支 '%s' 不存在"
210
220c313c 211#: branch.c:199
1003b3a5
JX
212msgid ""
213"\n"
214"If you are planning on basing your work on an upstream\n"
215"branch that already exists at the remote, you may need to\n"
216"run \"git fetch\" to retrieve it.\n"
217"\n"
218"If you are planning to push out a new local branch that\n"
219"will track its remote counterpart, you may want to use\n"
220"\"git push -u\" to set the upstream config as you push."
221msgstr ""
222"\n"
223"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
224"您可能需要执行 \"git fetch\" 来获取分支。\n"
225"\n"
226"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
227"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
228
220c313c 229#: branch.c:243
4dcdc3d8
JX
230#, c-format
231msgid "Not a valid object name: '%s'."
232msgstr "不是一个有效的对象名:'%s'。"
233
220c313c 234#: branch.c:263
4dcdc3d8
JX
235#, c-format
236msgid "Ambiguous object name: '%s'."
237msgstr "歧义的对象名:'%s'。"
238
220c313c 239#: branch.c:268
4dcdc3d8
JX
240#, c-format
241msgid "Not a valid branch point: '%s'."
242msgstr "无效的分支点:'%s'。"
243
220c313c 244#: bundle.c:34
8ada9598
JX
245#, c-format
246msgid "'%s' does not look like a v2 bundle file"
81809b99 247msgstr "'%s' 不像是一个 v2 版本的包文件"
8ada9598 248
220c313c 249#: bundle.c:61
81809b99 250#, c-format
8ada9598 251msgid "unrecognized header: %s%s (%d)"
81809b99 252msgstr "未能识别的包头:%s%s (%d)"
8ada9598 253
44f518e6 254#: bundle.c:87 builtin/commit.c:766
8ada9598
JX
255#, c-format
256msgid "could not open '%s'"
257msgstr "不能打开 '%s'"
258
220c313c 259#: bundle.c:139
8ada9598 260msgid "Repository lacks these prerequisite commits:"
81809b99 261msgstr "版本库缺少这些必备的提交:"
8ada9598 262
814ff314 263#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
7aea43ff
JX
264#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330
265#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358
90314792 266#: builtin/shortlog.c:158
8ada9598
JX
267msgid "revision walk setup failed"
268msgstr "版本遍历设置失败"
269
220c313c 270#: bundle.c:185
8ada9598 271#, c-format
1003b3a5
JX
272msgid "The bundle contains this ref:"
273msgid_plural "The bundle contains these %d refs:"
274msgstr[0] "这个包中含有这个引用:"
275msgstr[1] "这个包中含有 %d 个引用:"
8ada9598 276
220c313c 277#: bundle.c:192
6792b93b
JX
278msgid "The bundle records a complete history."
279msgstr "这个包记录一个完整历史。"
280
220c313c 281#: bundle.c:194
8ada9598 282#, c-format
1003b3a5
JX
283msgid "The bundle requires this ref:"
284msgid_plural "The bundle requires these %d refs:"
285msgstr[0] "这个包需要这个引用:"
286msgstr[1] "这个包需要 %d 个引用:"
8ada9598 287
9aeb4c2b
JX
288#: bundle.c:251
289msgid "Could not spawn pack-objects"
290msgstr "不能生成 pack-objects 进程"
291
292#: bundle.c:269
293msgid "pack-objects died"
294msgstr "pack-objects 终止"
295
296#: bundle.c:309
8ada9598 297msgid "rev-list died"
81809b99 298msgstr "rev-list 终止"
8ada9598 299
9aeb4c2b 300#: bundle.c:358
8ada9598
JX
301#, c-format
302msgid "ref '%s' is excluded by the rev-list options"
81809b99 303msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 304
814ff314 305#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
9aeb4c2b
JX
306#, c-format
307msgid "unrecognized argument: %s"
308msgstr "未能识别的参数:%s"
309
814ff314 310#: bundle.c:443
8ada9598 311msgid "Refusing to create empty bundle."
81809b99 312msgstr "不能创建空包。"
8ada9598 313
814ff314 314#: bundle.c:453
81809b99 315#, c-format
8ada9598 316msgid "cannot create '%s'"
81809b99 317msgstr "不能创建 '%s'"
8ada9598 318
814ff314 319#: bundle.c:474
8ada9598 320msgid "index-pack died"
81809b99 321msgstr "index-pack 终止"
8ada9598 322
1e607449 323#: color.c:260
220c313c
JX
324#, c-format
325msgid "invalid color value: %.*s"
326msgstr "无效的颜色值:%.*s"
327
6acbf033 328#: commit.c:40
c04f5ac3
JX
329#, c-format
330msgid "could not parse %s"
331msgstr "不能解析 %s"
332
6acbf033 333#: commit.c:42
c04f5ac3
JX
334#, c-format
335msgid "%s %s is not a commit!"
336msgstr "%s %s 不是一个提交!"
337
338#: compat/obstack.c:406 compat/obstack.c:408
339msgid "memory exhausted"
340msgstr "内存耗尽"
341
814ff314 342#: config.c:474 config.c:476
220c313c
JX
343#, c-format
344msgid "bad config file line %d in %s"
345msgstr "配置文件 %2$s 出错于第 %1$d 行"
346
814ff314 347#: config.c:592
220c313c
JX
348#, c-format
349msgid "bad numeric config value '%s' for '%s' in %s: %s"
350msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
351
814ff314 352#: config.c:594
220c313c
JX
353#, c-format
354msgid "bad numeric config value '%s' for '%s': %s"
355msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
356
814ff314 357#: config.c:679
220c313c
JX
358#, c-format
359msgid "failed to expand user dir in: '%s'"
360msgstr "无法扩展 '%s' 中的用户目录"
361
814ff314 362#: config.c:757 config.c:768
220c313c
JX
363#, c-format
364msgid "bad zlib compression level %d"
365msgstr "错误的 zlib 压缩级别 %d"
366
814ff314 367#: config.c:890
220c313c
JX
368#, c-format
369msgid "invalid mode for object creation: %s"
370msgstr "无效的对象创建模式:%s"
371
814ff314 372#: config.c:1216
220c313c
JX
373msgid "unable to parse command-line config"
374msgstr "无法解析命令行中的配置"
375
814ff314 376#: config.c:1277
220c313c
JX
377msgid "unknown error occured while reading the configuration files"
378msgstr "在读取配置文件时遇到未知错误"
379
814ff314 380#: config.c:1601
220c313c
JX
381#, c-format
382msgid "unable to parse '%s' from command-line config"
383msgstr "无法解析命令行配置中的 '%s'"
384
814ff314 385#: config.c:1603
220c313c
JX
386#, c-format
387msgid "bad config variable '%s' in file '%s' at line %d"
388msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
389
814ff314 390#: config.c:1662
220c313c
JX
391#, c-format
392msgid "%s has multiple values"
393msgstr "%s 有多个取值"
394
395#: connected.c:69
c04f5ac3
JX
396msgid "Could not run 'git rev-list'"
397msgstr "不能执行 'git rev-list'"
398
220c313c 399#: connected.c:89
c04f5ac3
JX
400#, c-format
401msgid "failed write to rev-list: %s"
402msgstr "无法写入 rev-list:%s"
403
220c313c 404#: connected.c:97
c04f5ac3
JX
405#, c-format
406msgid "failed to close rev-list's stdin: %s"
407msgstr "无法关闭 rev-list 的标准输入:%s"
408
8ada9598
JX
409#: date.c:95
410msgid "in the future"
81809b99 411msgstr "在将来"
8ada9598
JX
412
413#: date.c:101
414#, c-format
415msgid "%lu second ago"
416msgid_plural "%lu seconds ago"
6c94aba5
JX
417msgstr[0] "%lu 秒钟前"
418msgstr[1] "%lu 秒钟前"
8ada9598
JX
419
420#: date.c:108
421#, c-format
422msgid "%lu minute ago"
423msgid_plural "%lu minutes ago"
6c94aba5
JX
424msgstr[0] "%lu 分钟前"
425msgstr[1] "%lu 分钟前"
8ada9598
JX
426
427#: date.c:115
428#, c-format
429msgid "%lu hour ago"
430msgid_plural "%lu hours ago"
6c94aba5
JX
431msgstr[0] "%lu 小时前"
432msgstr[1] "%lu 小时前"
8ada9598
JX
433
434#: date.c:122
435#, c-format
436msgid "%lu day ago"
437msgid_plural "%lu days ago"
6c94aba5
JX
438msgstr[0] "%lu 天前"
439msgstr[1] "%lu 天前"
8ada9598
JX
440
441#: date.c:128
442#, c-format
443msgid "%lu week ago"
444msgid_plural "%lu weeks ago"
6c94aba5
JX
445msgstr[0] "%lu 周前"
446msgstr[1] "%lu 周前"
8ada9598
JX
447
448#: date.c:135
449#, c-format
450msgid "%lu month ago"
451msgid_plural "%lu months ago"
6c94aba5
JX
452msgstr[0] "%lu 个月前"
453msgstr[1] "%lu 个月前"
8ada9598
JX
454
455#: date.c:146
456#, c-format
457msgid "%lu year"
458msgid_plural "%lu years"
81809b99 459msgstr[0] "%lu 年"
5ae481e0 460msgstr[1] "%lu 年"
8ada9598 461
6c94aba5 462#. TRANSLATORS: "%s" is "<n> years"
8ada9598
JX
463#: date.c:149
464#, c-format
465msgid "%s, %lu month ago"
466msgid_plural "%s, %lu months ago"
6c94aba5
JX
467msgstr[0] "%s %lu 个月前"
468msgstr[1] "%s %lu 个月前"
8ada9598
JX
469
470#: date.c:154 date.c:159
471#, c-format
472msgid "%lu year ago"
473msgid_plural "%lu years ago"
81809b99 474msgstr[0] "%lu 年前"
5ae481e0 475msgstr[1] "%lu 年前"
8ada9598 476
cfff71a9
JX
477#: diffcore-order.c:24
478#, c-format
479msgid "failed to read orderfile '%s'"
480msgstr "无法读取排序文件 '%s'"
481
814ff314 482#: diffcore-rename.c:536
6c94aba5
JX
483msgid "Performing inexact rename detection"
484msgstr "正在进行非精确的重命名检测"
485
90e6ef53 486# 译者:注意保持前导空格
6acbf033 487#: diff.c:114
c04f5ac3 488#, c-format
07432cef
WS
489msgid " Failed to parse dirstat cut-off percentage '%s'\n"
490msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
c04f5ac3 491
90e6ef53 492# 译者:注意保持前导空格
6acbf033 493#: diff.c:119
c04f5ac3 494#, c-format
07432cef
WS
495msgid " Unknown dirstat parameter '%s'\n"
496msgstr " 未知的 dirstat 参数 '%s'\n"
c04f5ac3 497
6acbf033 498#: diff.c:214
07432cef
WS
499#, c-format
500msgid "Unknown value for 'diff.submodule' config variable: '%s'"
501msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
502
220c313c 503#: diff.c:266
c04f5ac3
JX
504#, c-format
505msgid ""
506"Found errors in 'diff.dirstat' config variable:\n"
507"%s"
508msgstr ""
90e6ef53 509"发现配置变量 'diff.dirstat' 中的错误:\n"
c04f5ac3
JX
510"%s"
511
7aea43ff 512#: diff.c:2997
6acbf033
JX
513#, c-format
514msgid "external diff died, stopping at %s"
515msgstr "外部 diff 退出,停止在 %s"
516
7aea43ff 517#: diff.c:3393
6acbf033
JX
518msgid "--follow requires exactly one pathspec"
519msgstr "--follow 参数后只跟一个 pathspec"
520
7aea43ff 521#: diff.c:3556
c04f5ac3
JX
522#, c-format
523msgid ""
524"Failed to parse --dirstat/-X option parameter:\n"
525"%s"
526msgstr ""
527"无法解析 --dirstat/-X 选项的参数:\n"
528"%s"
529
7aea43ff 530#: diff.c:3570
07432cef
WS
531#, c-format
532msgid "Failed to parse --submodule option parameter: '%s'"
533msgstr "无法解析 --submodule 选项的参数:'%s'"
534
7aea43ff
JX
535#: dir.c:1852
536msgid "failed to get kernel name and information"
537msgstr "无法获得内核名称和信息"
538
539#: dir.c:1945
540msgid "Untracked cache is disabled on this system."
541msgstr "缓存未跟踪文件在本系统被禁用"
542
220c313c 543#: gpg-interface.c:129 gpg-interface.c:200
c04f5ac3
JX
544msgid "could not run gpg."
545msgstr "不能执行 gpg。"
546
220c313c 547#: gpg-interface.c:141
c04f5ac3
JX
548msgid "gpg did not accept the data"
549msgstr "gpg 没有接受数据"
550
220c313c 551#: gpg-interface.c:152
c04f5ac3
JX
552msgid "gpg failed to sign the data"
553msgstr "gpg 无法为数据签名"
554
220c313c 555#: gpg-interface.c:185
a77c07d9
JX
556#, c-format
557msgid "could not create temporary file '%s': %s"
558msgstr "不能创建临时文件 '%s':%s"
559
220c313c 560#: gpg-interface.c:188
a77c07d9
JX
561#, c-format
562msgid "failed writing detached signature to '%s': %s"
563msgstr "无法将分离式签名写入 '%s':%s"
564
220c313c 565#: grep.c:1718
7ac1c0ad
JX
566#, c-format
567msgid "'%s': unable to read %s"
568msgstr "'%s':无法读取 %s"
569
220c313c 570#: grep.c:1735
7ac1c0ad
JX
571#, c-format
572msgid "'%s': %s"
573msgstr "'%s':%s"
574
220c313c 575#: grep.c:1746
7ac1c0ad
JX
576#, c-format
577msgid "'%s': short read %s"
578msgstr "'%s':读取不完整 %s"
579
6acbf033 580#: help.c:207
81809b99 581#, c-format
8ada9598 582msgid "available git commands in '%s'"
81809b99 583msgstr "在 '%s' 下可用的 git 命令"
8ada9598 584
6acbf033 585#: help.c:214
8ada9598 586msgid "git commands available from elsewhere on your $PATH"
81809b99 587msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
8ada9598 588
7aea43ff
JX
589#: help.c:246
590msgid "These are common Git commands used in various situations:"
591msgstr "这些是各种场合常见的 Git 命令:"
a77c07d9 592
7aea43ff 593#: help.c:311
c04f5ac3
JX
594#, c-format
595msgid ""
596"'%s' appears to be a git command, but we were not\n"
597"able to execute it. Maybe git-%s is broken?"
598msgstr ""
599"'%s' 像是一个 git 命令,但却无法运行。\n"
600"可能是 git-%s 受损?"
601
7aea43ff 602#: help.c:368
8ada9598 603msgid "Uh oh. Your system reports no Git commands at all."
81809b99 604msgstr "唉呀,您的系统中未发现 Git 命令。"
8ada9598 605
7aea43ff 606#: help.c:390
8ada9598
JX
607#, c-format
608msgid ""
609"WARNING: You called a Git command named '%s', which does not exist.\n"
610"Continuing under the assumption that you meant '%s'"
611msgstr ""
81809b99
JX
612"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
613"是 '%s'"
8ada9598 614
7aea43ff 615#: help.c:395
8ada9598
JX
616#, c-format
617msgid "in %0.1f seconds automatically..."
81809b99 618msgstr "在 %0.1f 秒钟后自动运行..."
8ada9598 619
7aea43ff 620#: help.c:402
8ada9598
JX
621#, c-format
622msgid "git: '%s' is not a git command. See 'git --help'."
81809b99 623msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
8ada9598 624
7aea43ff 625#: help.c:406 help.c:466
8ada9598
JX
626msgid ""
627"\n"
628"Did you mean this?"
629msgid_plural ""
630"\n"
631"Did you mean one of these?"
632msgstr[0] ""
81809b99
JX
633"\n"
634"您指的是这个么?"
635msgstr[1] ""
636"\n"
195febda 637"您指的是这其中的某一个么?"
8ada9598 638
7aea43ff 639#: help.c:462
2e8451e8
JX
640#, c-format
641msgid "%s: %s - %s"
642msgstr "%s:%s - %s"
643
7aea43ff 644#: lockfile.c:345
220c313c
JX
645msgid "BUG: reopen a lockfile that is still open"
646msgstr "BUG: 重新打开一个仍打开着的锁文件"
647
7aea43ff 648#: lockfile.c:347
220c313c
JX
649msgid "BUG: reopen a lockfile that has been committed"
650msgstr "BUG: 重新打开一个已提交的锁文件"
651
652#: merge.c:41
07432cef
WS
653msgid "failed to read the cache"
654msgstr "无法读取缓存"
655
7aea43ff
JX
656#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594
657#: builtin/clone.c:654
07432cef
WS
658msgid "unable to write new index file"
659msgstr "无法写新的索引文件"
660
220c313c 661#: merge-recursive.c:189
649900bc
JX
662#, c-format
663msgid "(bad commit)\n"
664msgstr "(坏提交)\n"
665
220c313c 666#: merge-recursive.c:209
649900bc
JX
667#, c-format
668msgid "addinfo_cache failed for path '%s'"
669msgstr "为路径 '%s' addinfo_cache 失败"
670
220c313c 671#: merge-recursive.c:270
649900bc
JX
672msgid "error building trees"
673msgstr "无法创建树"
674
7aea43ff 675#: merge-recursive.c:687
649900bc
JX
676#, c-format
677msgid "failed to create path '%s'%s"
678msgstr "无法创建路径 '%s'%s"
679
7aea43ff 680#: merge-recursive.c:698
649900bc
JX
681#, c-format
682msgid "Removing %s to make room for subdirectory\n"
683msgstr "删除 %s 以便为子目录留出空间\n"
684
7aea43ff 685#: merge-recursive.c:712 merge-recursive.c:733
649900bc
JX
686msgid ": perhaps a D/F conflict?"
687msgstr ":可能是一个目录/文件冲突?"
688
7aea43ff 689#: merge-recursive.c:723
649900bc
JX
690#, c-format
691msgid "refusing to lose untracked file at '%s'"
692msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
693
7aea43ff 694#: merge-recursive.c:763
649900bc
JX
695#, c-format
696msgid "cannot read object %s '%s'"
697msgstr "不能读取对象 %s '%s'"
698
7aea43ff 699#: merge-recursive.c:765
649900bc
JX
700#, c-format
701msgid "blob expected for %s '%s'"
07432cef 702msgstr "%s '%s' 应为数据(blob)对象"
649900bc 703
7aea43ff 704#: merge-recursive.c:788 builtin/clone.c:313
649900bc
JX
705#, c-format
706msgid "failed to open '%s'"
707msgstr "无法打开 '%s'"
708
7aea43ff 709#: merge-recursive.c:796
649900bc
JX
710#, c-format
711msgid "failed to symlink '%s'"
712msgstr "无法创建符号链接 '%s'"
713
7aea43ff 714#: merge-recursive.c:799
649900bc
JX
715#, c-format
716msgid "do not know what to do with %06o %s '%s'"
717msgstr "不知道如何处理 %06o %s '%s'"
718
7aea43ff 719#: merge-recursive.c:937
649900bc
JX
720msgid "Failed to execute internal merge"
721msgstr "无法执行内部合并"
722
7aea43ff 723#: merge-recursive.c:941
649900bc
JX
724#, c-format
725msgid "Unable to add %s to database"
726msgstr "不能添加 %s 至对象库"
727
7aea43ff 728#: merge-recursive.c:957
649900bc
JX
729msgid "unsupported object type in the tree"
730msgstr "在树中有不支持的对象类型"
731
7aea43ff 732#: merge-recursive.c:1032 merge-recursive.c:1046
649900bc
JX
733#, c-format
734msgid ""
735"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
736"in tree."
737msgstr ""
738"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
739"的版本被保留。"
740
7aea43ff 741#: merge-recursive.c:1038 merge-recursive.c:1051
649900bc
JX
742#, c-format
743msgid ""
744"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
745"in tree at %s."
746msgstr ""
747"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
748"的版本保留于 %8$s 中。"
749
7aea43ff 750#: merge-recursive.c:1092
649900bc
JX
751msgid "rename"
752msgstr "重命名"
753
7aea43ff 754#: merge-recursive.c:1092
649900bc
JX
755msgid "renamed"
756msgstr "重命名"
757
7aea43ff 758#: merge-recursive.c:1148
649900bc
JX
759#, c-format
760msgid "%s is a directory in %s adding as %s instead"
761msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
762
7aea43ff 763#: merge-recursive.c:1170
649900bc
JX
764#, c-format
765msgid ""
766"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
767"\"->\"%s\" in \"%s\"%s"
768msgstr ""
769"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
770"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
771
7aea43ff 772#: merge-recursive.c:1175
649900bc
JX
773msgid " (left unresolved)"
774msgstr "(留下未解决)"
775
7aea43ff 776#: merge-recursive.c:1229
649900bc
JX
777#, c-format
778msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
779msgstr ""
780"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
781"%5$s"
782
7aea43ff 783#: merge-recursive.c:1259
649900bc
JX
784#, c-format
785msgid "Renaming %s to %s and %s to %s instead"
07432cef 786msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
649900bc 787
7aea43ff 788#: merge-recursive.c:1458
649900bc
JX
789#, c-format
790msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
791msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
792
7aea43ff 793#: merge-recursive.c:1468
649900bc
JX
794#, c-format
795msgid "Adding merged %s"
796msgstr "添加合并后的 %s"
797
7aea43ff 798#: merge-recursive.c:1473 merge-recursive.c:1671
649900bc
JX
799#, c-format
800msgid "Adding as %s instead"
801msgstr "而是以 %s 为名添加"
802
7aea43ff 803#: merge-recursive.c:1524
649900bc
JX
804#, c-format
805msgid "cannot read object %s"
806msgstr "不能读取对象 %s"
807
7aea43ff 808#: merge-recursive.c:1527
649900bc
JX
809#, c-format
810msgid "object %s is not a blob"
07432cef 811msgstr "对象 %s 不是一个数据(blob)对象"
649900bc 812
7aea43ff 813#: merge-recursive.c:1575
649900bc
JX
814msgid "modify"
815msgstr "修改"
816
7aea43ff 817#: merge-recursive.c:1575
649900bc
JX
818msgid "modified"
819msgstr "修改"
820
7aea43ff 821#: merge-recursive.c:1585
649900bc
JX
822msgid "content"
823msgstr "内容"
824
7aea43ff 825#: merge-recursive.c:1592
649900bc
JX
826msgid "add/add"
827msgstr "添加/添加"
828
7aea43ff 829#: merge-recursive.c:1626
649900bc
JX
830#, c-format
831msgid "Skipped %s (merged same as existing)"
832msgstr "略过 %s(已经做过相同合并)"
833
7aea43ff 834#: merge-recursive.c:1640
649900bc
JX
835#, c-format
836msgid "Auto-merging %s"
837msgstr "自动合并 %s"
838
7aea43ff 839#: merge-recursive.c:1644 git-submodule.sh:1150
649900bc
JX
840msgid "submodule"
841msgstr "子模组"
842
7aea43ff 843#: merge-recursive.c:1645
649900bc
JX
844#, c-format
845msgid "CONFLICT (%s): Merge conflict in %s"
846msgstr "冲突(%s):合并冲突于 %s"
847
7aea43ff 848#: merge-recursive.c:1731
649900bc
JX
849#, c-format
850msgid "Removing %s"
851msgstr "删除 %s"
852
7aea43ff 853#: merge-recursive.c:1756
649900bc
JX
854msgid "file/directory"
855msgstr "文件/目录"
856
7aea43ff 857#: merge-recursive.c:1762
649900bc
JX
858msgid "directory/file"
859msgstr "目录/文件"
860
7aea43ff 861#: merge-recursive.c:1767
649900bc
JX
862#, c-format
863msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
864msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
865
7aea43ff 866#: merge-recursive.c:1777
649900bc
JX
867#, c-format
868msgid "Adding %s"
869msgstr "添加 %s"
870
7aea43ff 871#: merge-recursive.c:1794
649900bc
JX
872msgid "Fatal merge failure, shouldn't happen."
873msgstr "严重的合并错误,不应发生。"
874
7aea43ff 875#: merge-recursive.c:1813
649900bc
JX
876msgid "Already up-to-date!"
877msgstr "已经是最新的!"
878
7aea43ff 879#: merge-recursive.c:1822
649900bc
JX
880#, c-format
881msgid "merging of trees %s and %s failed"
882msgstr "无法合并树 %s 和 %s"
883
7aea43ff 884#: merge-recursive.c:1852
649900bc
JX
885#, c-format
886msgid "Unprocessed path??? %s"
887msgstr "未处理的路径??? %s"
888
7aea43ff 889#: merge-recursive.c:1900
649900bc
JX
890msgid "Merging:"
891msgstr "合并:"
892
7aea43ff 893#: merge-recursive.c:1913
649900bc 894#, c-format
e5e38ce4
JX
895msgid "found %u common ancestor:"
896msgid_plural "found %u common ancestors:"
897msgstr[0] "发现 %u 个共同祖先:"
898msgstr[1] "发现 %u 个共同祖先:"
649900bc 899
7aea43ff 900#: merge-recursive.c:1950
649900bc
JX
901msgid "merge returned no commit"
902msgstr "合并未返回提交"
903
7aea43ff 904#: merge-recursive.c:2007
649900bc
JX
905#, c-format
906msgid "Could not parse object '%s'"
907msgstr "不能解析对象 '%s'"
908
7aea43ff 909#: merge-recursive.c:2018 builtin/merge.c:645
649900bc
JX
910msgid "Unable to write index."
911msgstr "不能写入索引。"
912
6acbf033 913#: notes-utils.c:41
2e8451e8
JX
914msgid "Cannot commit uninitialized/unreferenced notes tree"
915msgstr "不能提交未初始化/未引用的注解树"
916
04cb2f28 917#: notes-utils.c:82
2e8451e8
JX
918#, c-format
919msgid "Bad notes.rewriteMode value: '%s'"
920msgstr "坏的 notes.rewriteMode 值:'%s'"
921
04cb2f28 922#: notes-utils.c:92
2e8451e8
JX
923#, c-format
924msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
925msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
926
927#. TRANSLATORS: The first %s is the name of the
928#. environment variable, the second %s is its value
04cb2f28 929#: notes-utils.c:119
2e8451e8
JX
930#, c-format
931msgid "Bad %s value: '%s'"
932msgstr "坏的 %s 值:'%s'"
933
7aea43ff 934#: object.c:242
1003b3a5
JX
935#, c-format
936msgid "unable to parse object: %s"
937msgstr "不能解析对象:%s"
938
220c313c 939#: parse-options.c:546
8ada9598 940msgid "..."
81809b99 941msgstr "..."
8ada9598 942
220c313c 943#: parse-options.c:564
81809b99 944#, c-format
8ada9598 945msgid "usage: %s"
81809b99 946msgstr "用法:%s"
8ada9598
JX
947
948#. TRANSLATORS: the colon here should align with the
949#. one in "usage: %s" translation
220c313c 950#: parse-options.c:568
81809b99 951#, c-format
8ada9598 952msgid " or: %s"
81809b99 953msgstr " 或:%s"
8ada9598
JX
954
955# 译者:为保证在输出中对齐,注意调整句中空格!
220c313c 956#: parse-options.c:571
81809b99 957#, c-format
8ada9598 958msgid " %s"
81809b99 959msgstr " %s"
8ada9598 960
220c313c 961#: parse-options.c:605
63af42fe
JX
962msgid "-NUM"
963msgstr "-数字"
964
cfff71a9 965#: pathspec.c:133
90314792
JX
966msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
967msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
968
cfff71a9 969#: pathspec.c:143
90314792
JX
970msgid ""
971"global 'literal' pathspec setting is incompatible with all other global "
972"pathspec settings"
973msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
974
cfff71a9 975#: pathspec.c:177
90314792
JX
976msgid "invalid parameter for pathspec magic 'prefix'"
977msgstr "路径规则包含无效的神奇前缀"
978
cfff71a9 979#: pathspec.c:183
90314792
JX
980#, c-format
981msgid "Invalid pathspec magic '%.*s' in '%s'"
982msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
983
cfff71a9 984#: pathspec.c:187
90314792
JX
985#, c-format
986msgid "Missing ')' at the end of pathspec magic in '%s'"
987msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
988
cfff71a9 989#: pathspec.c:205
90314792
JX
990#, c-format
991msgid "Unimplemented pathspec magic '%c' in '%s'"
992msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
993
cfff71a9 994#: pathspec.c:230
a77c07d9 995#, c-format
90314792
JX
996msgid "%s: 'literal' and 'glob' are incompatible"
997msgstr "%s:'literal' 和 'glob' 不兼容"
a77c07d9 998
cfff71a9 999#: pathspec.c:241
a77c07d9 1000#, c-format
90314792
JX
1001msgid "%s: '%s' is outside repository"
1002msgstr "%s:'%s' 在版本库之外"
a77c07d9 1003
cfff71a9 1004#: pathspec.c:291
90314792
JX
1005#, c-format
1006msgid "Pathspec '%s' is in submodule '%.*s'"
1007msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
1008
cfff71a9 1009#: pathspec.c:353
90314792
JX
1010#, c-format
1011msgid "%s: pathspec magic not supported by this command: %s"
1012msgstr "%s:路径规则神奇前缀不被此命令支持:%s"
1013
6acbf033 1014#: pathspec.c:432
90314792
JX
1015#, c-format
1016msgid "pathspec '%s' is beyond a symbolic link"
1017msgstr "路径规则 '%s' 位于符号链接中"
1018
6acbf033 1019#: pathspec.c:441
cfff71a9
JX
1020msgid ""
1021"There is nothing to exclude from by :(exclude) patterns.\n"
1022"Perhaps you forgot to add either ':/' or '.' ?"
1023msgstr ""
1024"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1025"添加 ':/' 或 '.' ?"
1026
220c313c
JX
1027#: pretty.c:968
1028msgid "unable to parse --pretty format"
1029msgstr "不能解析 --pretty 格式"
1030
7aea43ff 1031#: progress.c:236
6c94aba5
JX
1032msgid "done"
1033msgstr "完成"
1034
7aea43ff 1035#: read-cache.c:1295
6c94aba5
JX
1036#, c-format
1037msgid ""
1038"index.version set, but the value is invalid.\n"
1039"Using version %i"
1040msgstr ""
1041"设置了 index.version,但是取值无效。\n"
1042"使用版本 %i"
1043
7aea43ff 1044#: read-cache.c:1305
6c94aba5
JX
1045#, c-format
1046msgid ""
1047"GIT_INDEX_VERSION set, but the value is invalid.\n"
1048"Using version %i"
1049msgstr ""
1050"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1051"使用版本 %i"
1052
7aea43ff 1053#: remote.c:792
cfff71a9
JX
1054#, c-format
1055msgid "Cannot fetch both %s and %s to %s"
1056msgstr "不能同时获取 %s 和 %s 至 %s"
1057
7aea43ff 1058#: remote.c:796
cfff71a9
JX
1059#, c-format
1060msgid "%s usually tracks %s, not %s"
1061msgstr "%s 通常跟踪 %s,而非 %s"
1062
7aea43ff 1063#: remote.c:800
cfff71a9
JX
1064#, c-format
1065msgid "%s tracks both %s and %s"
1066msgstr "%s 同时跟踪 %s 和 %s"
1067
7aea43ff 1068#: remote.c:808
cfff71a9
JX
1069msgid "Internal error"
1070msgstr "内部错误"
1071
7aea43ff
JX
1072#: remote.c:1723 remote.c:1766
1073msgid "HEAD does not point to a branch"
1074msgstr "HEAD 没有指向一个分支"
1075
1076#: remote.c:1732
1077#, c-format
1078msgid "no such branch: '%s'"
1079msgstr "没有此分支:'%s'"
1080
1081#: remote.c:1735
1082#, c-format
1083msgid "no upstream configured for branch '%s'"
1084msgstr "尚未给分支 '%s' 设置上游"
1085
1086#: remote.c:1741
1087#, c-format
1088msgid "upstream branch '%s' not stored as a remote-tracking branch"
1089msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1090
1091#: remote.c:1756
1092#, c-format
1093msgid "push destination '%s' on remote '%s' has no local tracking branch"
1094msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
1095
1096#: remote.c:1771
1097#, c-format
1098msgid "branch '%s' has no remote for pushing"
1099msgstr "分支 '%s' 没有设置要推送的远程服务器"
1100
1101#: remote.c:1782
1102#, c-format
1103msgid "push refspecs for '%s' do not include '%s'"
1104msgstr "向 '%s' 推送引用表达式未包含 '%s'"
1105
1106#: remote.c:1795
1107msgid "push has no destination (push.default is 'nothing')"
1108msgstr "推送无目标(push.default 是 'nothing')"
1109
1110#: remote.c:1817
1111msgid "cannot resolve 'simple' push to a single destination"
1112msgstr "无法解析 'simple' 推送至一个单独的目标"
1113
1114#: remote.c:2124
90314792
JX
1115#, c-format
1116msgid "Your branch is based on '%s', but the upstream is gone.\n"
1117msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1118
7aea43ff 1119#: remote.c:2128
90314792
JX
1120msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1121msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1122
7aea43ff 1123#: remote.c:2131
90314792
JX
1124#, c-format
1125msgid "Your branch is up-to-date with '%s'.\n"
1126msgstr "您的分支与上游分支 '%s' 一致。\n"
1127
7aea43ff 1128#: remote.c:2135
c04f5ac3
JX
1129#, c-format
1130msgid "Your branch is ahead of '%s' by %d commit.\n"
1131msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1132msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
5ae481e0 1133msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
c04f5ac3 1134
7aea43ff 1135#: remote.c:2141
07432cef
WS
1136msgid " (use \"git push\" to publish your local commits)\n"
1137msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1138
7aea43ff 1139#: remote.c:2144
c04f5ac3
JX
1140#, c-format
1141msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1142msgid_plural ""
1143"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
90e6ef53 1144msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
5ae481e0 1145msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 1146
07432cef 1147# 译者:注意保持前导空格
7aea43ff 1148#: remote.c:2152
07432cef
WS
1149msgid " (use \"git pull\" to update your local branch)\n"
1150msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1151
7aea43ff 1152#: remote.c:2155
c04f5ac3
JX
1153#, c-format
1154msgid ""
1155"Your branch and '%s' have diverged,\n"
1156"and have %d and %d different commit each, respectively.\n"
1157msgid_plural ""
1158"Your branch and '%s' have diverged,\n"
1159"and have %d and %d different commits each, respectively.\n"
1160msgstr[0] ""
1161"您的分支和 '%s' 出现了偏离,\n"
195febda 1162"并且分别有 %d 和 %d 处不同的提交。\n"
5ae481e0
JX
1163msgstr[1] ""
1164"您的分支和 '%s' 出现了偏离,\n"
195febda 1165"并且分别有 %d 和 %d 处不同的提交。\n"
c04f5ac3 1166
07432cef 1167# 译者:注意保持前导空格
7aea43ff 1168#: remote.c:2165
07432cef
WS
1169msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1170msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1171
7aea43ff 1172#: revision.c:2366
814ff314
JX
1173msgid "--first-parent is incompatible with --bisect"
1174msgstr "--first-parent 与 --bisect 不兼容"
1175
1176#: run-command.c:83
2e8451e8
JX
1177msgid "open /dev/null failed"
1178msgstr "不能打开 /dev/null"
1179
814ff314 1180#: run-command.c:85
2e8451e8
JX
1181#, c-format
1182msgid "dup2(%d,%d) failed"
1183msgstr "不能调用 dup2(%d,%d)"
1184
814ff314 1185#: send-pack.c:272
220c313c
JX
1186msgid "failed to sign the push certificate"
1187msgstr "无法为推送证书签名"
1188
7aea43ff 1189#: send-pack.c:378
220c313c
JX
1190msgid "the receiving end does not support --signed push"
1191msgstr "接收端不支持签名推送"
1192
7aea43ff 1193#: send-pack.c:389
44f518e6
JX
1194msgid "the receiving end does not support --atomic push"
1195msgstr "接收端不支持原子推送"
814ff314 1196
7aea43ff
JX
1197#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
1198#: builtin/merge.c:983
c04f5ac3
JX
1199#, c-format
1200msgid "Could not open '%s' for writing"
90e6ef53 1201msgstr "不能为写入打开 '%s'"
c04f5ac3 1202
7aea43ff
JX
1203#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975
1204#: builtin/merge.c:988
c04f5ac3
JX
1205#, c-format
1206msgid "Could not write to '%s'"
90e6ef53 1207msgstr "不能写入 '%s'"
c04f5ac3 1208
220c313c 1209#: sequencer.c:195
14c8bced
JX
1210msgid ""
1211"after resolving the conflicts, mark the corrected paths\n"
1212"with 'git add <paths>' or 'git rm <paths>'"
1213msgstr ""
d9d56b23 1214"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
14c8bced
JX
1215"命令标记修正后的文件"
1216
220c313c 1217#: sequencer.c:198
c04f5ac3
JX
1218msgid ""
1219"after resolving the conflicts, mark the corrected paths\n"
1220"with 'git add <paths>' or 'git rm <paths>'\n"
1221"and commit the result with 'git commit'"
1222msgstr ""
d9d56b23 1223"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
c04f5ac3
JX
1224"对修正后的文件做标记,然后用 'git commit' 提交"
1225
814ff314 1226#: sequencer.c:211 sequencer.c:861 sequencer.c:944
c04f5ac3
JX
1227#, c-format
1228msgid "Could not write to %s"
1229msgstr "不能写入 %s"
1230
220c313c 1231#: sequencer.c:214
c04f5ac3
JX
1232#, c-format
1233msgid "Error wrapping up %s"
1234msgstr "错误收尾 %s"
1235
220c313c 1236#: sequencer.c:229
c04f5ac3
JX
1237msgid "Your local changes would be overwritten by cherry-pick."
1238msgstr "您的本地修改将被拣选操作覆盖。"
1239
220c313c 1240#: sequencer.c:231
c04f5ac3
JX
1241msgid "Your local changes would be overwritten by revert."
1242msgstr "您的本地修改将被还原操作覆盖。"
1243
220c313c 1244#: sequencer.c:234
c04f5ac3
JX
1245msgid "Commit your changes or stash them to proceed."
1246msgstr "提交您的修改或保存进度后再继续。"
1247
1248#. TRANSLATORS: %s will be "revert" or "cherry-pick"
04cb2f28 1249#: sequencer.c:321
c04f5ac3
JX
1250#, c-format
1251msgid "%s: Unable to write new index file"
90e6ef53 1252msgstr "%s:无法写入新索引文件"
c04f5ac3 1253
04cb2f28 1254#: sequencer.c:339
8ada9598 1255msgid "Could not resolve HEAD commit\n"
81809b99 1256msgstr "不能解析 HEAD 提交\n"
8ada9598 1257
04cb2f28 1258#: sequencer.c:359
8ada9598 1259msgid "Unable to update cache tree\n"
81809b99 1260msgstr "不能更新缓存\n"
8ada9598 1261
814ff314 1262#: sequencer.c:411
81809b99 1263#, c-format
8ada9598 1264msgid "Could not parse commit %s\n"
81809b99 1265msgstr "不能解析提交 %s\n"
8ada9598 1266
814ff314 1267#: sequencer.c:416
81809b99 1268#, c-format
8ada9598 1269msgid "Could not parse parent commit %s\n"
81809b99 1270msgstr "不能解析父提交 %s\n"
8ada9598 1271
814ff314 1272#: sequencer.c:482
c04f5ac3 1273msgid "Your index file is unmerged."
90e6ef53 1274msgstr "您的索引文件未完成合并。"
c04f5ac3 1275
814ff314 1276#: sequencer.c:501
c04f5ac3
JX
1277#, c-format
1278msgid "Commit %s is a merge but no -m option was given."
1279msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1280
814ff314 1281#: sequencer.c:509
c04f5ac3
JX
1282#, c-format
1283msgid "Commit %s does not have parent %d"
1284msgstr "提交 %s 没有父提交 %d"
1285
814ff314 1286#: sequencer.c:513
c04f5ac3
JX
1287#, c-format
1288msgid "Mainline was specified but commit %s is not a merge."
90e6ef53 1289msgstr "指定了主线但提交 %s 不是一个合并。"
c04f5ac3
JX
1290
1291#. TRANSLATORS: The first %s will be "revert" or
1292#. "cherry-pick", the second %s a SHA1
814ff314 1293#: sequencer.c:526
c04f5ac3
JX
1294#, c-format
1295msgid "%s: cannot parse parent commit %s"
1296msgstr "%s:不能解析父提交 %s"
1297
814ff314 1298#: sequencer.c:530
c04f5ac3
JX
1299#, c-format
1300msgid "Cannot get commit message for %s"
1301msgstr "不能得到 %s 的提交说明"
1302
814ff314 1303#: sequencer.c:616
c04f5ac3
JX
1304#, c-format
1305msgid "could not revert %s... %s"
1306msgstr "不能还原 %s... %s"
1307
814ff314 1308#: sequencer.c:617
c04f5ac3
JX
1309#, c-format
1310msgid "could not apply %s... %s"
1311msgstr "不能应用 %s... %s"
1312
814ff314 1313#: sequencer.c:653
c04f5ac3
JX
1314msgid "empty commit set passed"
1315msgstr "提供了空的提交集"
1316
814ff314 1317#: sequencer.c:661
c04f5ac3
JX
1318#, c-format
1319msgid "git %s: failed to read the index"
90e6ef53 1320msgstr "git %s:无法读取索引"
c04f5ac3 1321
814ff314 1322#: sequencer.c:665
c04f5ac3
JX
1323#, c-format
1324msgid "git %s: failed to refresh the index"
90e6ef53 1325msgstr "git %s:无法刷新索引"
c04f5ac3 1326
814ff314 1327#: sequencer.c:725
c04f5ac3
JX
1328#, c-format
1329msgid "Cannot %s during a %s"
90e6ef53 1330msgstr "无法 %s 在一个 %s 过程中"
c04f5ac3 1331
814ff314 1332#: sequencer.c:747
c04f5ac3
JX
1333#, c-format
1334msgid "Could not parse line %d."
90e6ef53 1335msgstr "不能解析第 %d 行。"
c04f5ac3 1336
814ff314 1337#: sequencer.c:752
c04f5ac3 1338msgid "No commits parsed."
7e238ab7 1339msgstr "没有提交被解析。"
c04f5ac3 1340
814ff314 1341#: sequencer.c:765
c04f5ac3
JX
1342#, c-format
1343msgid "Could not open %s"
1344msgstr "不能打开 %s"
1345
814ff314 1346#: sequencer.c:769
c04f5ac3
JX
1347#, c-format
1348msgid "Could not read %s."
1349msgstr "不能读取 %s。"
1350
814ff314 1351#: sequencer.c:776
c04f5ac3
JX
1352#, c-format
1353msgid "Unusable instruction sheet: %s"
1354msgstr "无用的指令表单:%s"
1355
814ff314 1356#: sequencer.c:806
c04f5ac3
JX
1357#, c-format
1358msgid "Invalid key: %s"
1359msgstr "无效键名:%s"
1360
814ff314 1361#: sequencer.c:809
c04f5ac3
JX
1362#, c-format
1363msgid "Invalid value for %s: %s"
81809b99 1364msgstr "%s 的值无效:%s"
c04f5ac3 1365
814ff314 1366#: sequencer.c:821
c04f5ac3
JX
1367#, c-format
1368msgid "Malformed options sheet: %s"
1369msgstr "非法的选项表单:%s"
1370
814ff314 1371#: sequencer.c:842
c04f5ac3
JX
1372msgid "a cherry-pick or revert is already in progress"
1373msgstr "一个拣选或还原操作已在进行"
1374
814ff314 1375#: sequencer.c:843
c04f5ac3
JX
1376msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1377msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1378
814ff314 1379#: sequencer.c:847
c04f5ac3
JX
1380#, c-format
1381msgid "Could not create sequencer directory %s"
90e6ef53 1382msgstr "不能创建序列目录 %s"
c04f5ac3 1383
814ff314 1384#: sequencer.c:863 sequencer.c:948
c04f5ac3
JX
1385#, c-format
1386msgid "Error wrapping up %s."
1387msgstr "错误收尾 %s。"
1388
814ff314 1389#: sequencer.c:882 sequencer.c:1018
c04f5ac3 1390msgid "no cherry-pick or revert in progress"
195febda 1391msgstr "拣选或还原操作并未进行"
c04f5ac3 1392
814ff314 1393#: sequencer.c:884
c04f5ac3
JX
1394msgid "cannot resolve HEAD"
1395msgstr "不能解析 HEAD"
1396
814ff314 1397#: sequencer.c:886
c04f5ac3 1398msgid "cannot abort from a branch yet to be born"
90e6ef53 1399msgstr "不能从尚未建立的分支终止"
c04f5ac3 1400
7aea43ff 1401#: sequencer.c:908 builtin/apply.c:4291
c04f5ac3
JX
1402#, c-format
1403msgid "cannot open %s: %s"
1404msgstr "不能打开 %s:%s"
1405
814ff314 1406#: sequencer.c:911
c04f5ac3
JX
1407#, c-format
1408msgid "cannot read %s: %s"
1409msgstr "不能读取 %s:%s"
1410
814ff314 1411#: sequencer.c:912
c04f5ac3 1412msgid "unexpected end of file"
9aafc933 1413msgstr "意外的文件结束"
c04f5ac3 1414
814ff314 1415#: sequencer.c:918
c04f5ac3
JX
1416#, c-format
1417msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
90e6ef53 1418msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
c04f5ac3 1419
814ff314 1420#: sequencer.c:941
c04f5ac3
JX
1421#, c-format
1422msgid "Could not format %s."
1423msgstr "不能格式化 %s。"
1424
814ff314 1425#: sequencer.c:1086
4dcdc3d8
JX
1426#, c-format
1427msgid "%s: can't cherry-pick a %s"
1428msgstr "%s:不能拣选一个%s"
1429
814ff314 1430#: sequencer.c:1089
4dcdc3d8
JX
1431#, c-format
1432msgid "%s: bad revision"
1433msgstr "%s:错误的版本"
1434
814ff314 1435#: sequencer.c:1123
c04f5ac3
JX
1436msgid "Can't revert as initial commit"
1437msgstr "不能作为初始提交还原"
1438
814ff314 1439#: sequencer.c:1124
c04f5ac3
JX
1440msgid "Can't cherry-pick into empty head"
1441msgstr "不能拣选到空分支"
1442
7aea43ff
JX
1443#: setup.c:243
1444#, c-format
1445msgid "failed to read %s"
1446msgstr "无法读取 %s"
1447
1448#: sha1_name.c:453
2e8451e8
JX
1449msgid ""
1450"Git normally never creates a ref that ends with 40 hex characters\n"
1451"because it will be ignored when you just specify 40-hex. These refs\n"
1452"may be created by mistake. For example,\n"
1453"\n"
1454" git checkout -b $br $(git rev-parse ...)\n"
1455"\n"
1456"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1457"examine these refs and maybe delete them. Turn this message off by\n"
b1894384 1458"running \"git config advice.objectNameWarning false\""
2e8451e8
JX
1459msgstr ""
1460"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1461"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1462"\n"
1463" git checkout -b $br $(git rev-parse ...)\n"
1464"\n"
1465"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
b1894384 1466"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
2e8451e8
JX
1467"命令关闭本消息通知。"
1468
90314792
JX
1469#: submodule.c:64 submodule.c:98
1470msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1471msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1472
1473#: submodule.c:68 submodule.c:102
1474#, c-format
1475msgid "Could not find section in .gitmodules where path=%s"
1476msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1477
90314792
JX
1478#: submodule.c:76
1479#, c-format
1480msgid "Could not update .gitmodules entry %s"
1481msgstr "不能更新 .gitmodules 条目 %s"
1482
90314792
JX
1483#: submodule.c:109
1484#, c-format
1485msgid "Could not remove .gitmodules entry for %s"
1486msgstr "无法移除 %s 的 .gitmodules 条目"
1487
6c94aba5 1488#: submodule.c:120
90314792
JX
1489msgid "staging updated .gitmodules failed"
1490msgstr "将更新后 .gitmodules 添加暂存区失败"
1491
7aea43ff 1492#: submodule.c:1115
90314792
JX
1493#, c-format
1494msgid "Could not set core.worktree in %s"
1495msgstr "不能在 %s 中设置 core.worktree"
1496
814ff314
JX
1497#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1498#: trailer.c:561
220c313c
JX
1499#, c-format
1500msgid "unknown value '%s' for key '%s'"
1501msgstr "键 '%2$s' 的未知取值 '%1$s'"
1502
814ff314 1503#: trailer.c:543 trailer.c:548 builtin/remote.c:290
220c313c
JX
1504#, c-format
1505msgid "more than one %s"
1506msgstr "多于一个 %s"
1507
814ff314 1508#: trailer.c:581
220c313c 1509#, c-format
9aeb4c2b
JX
1510msgid "empty trailer token in trailer '%.*s'"
1511msgstr "签名 '%.*s' 的键为空"
220c313c 1512
814ff314 1513#: trailer.c:701
220c313c
JX
1514#, c-format
1515msgid "could not read input file '%s'"
1516msgstr "不能读取输入文件 '%s'"
1517
814ff314 1518#: trailer.c:704
220c313c
JX
1519msgid "could not read from stdin"
1520msgstr "不能自标准输入读取"
1521
7aea43ff 1522#: unpack-trees.c:203
6c94aba5
JX
1523msgid "Checking out files"
1524msgstr "正在检出文件"
1525
90314792
JX
1526#: urlmatch.c:120
1527msgid "invalid URL scheme name or missing '://' suffix"
1528msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1529
1530#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1531#, c-format
1532msgid "invalid %XX escape sequence"
1533msgstr "无效的 %XX 转义序列"
1534
1535#: urlmatch.c:172
1536msgid "missing host and scheme is not 'file:'"
1537msgstr "缺失主机名且URL方案不是 'file:'"
1538
1539#: urlmatch.c:189
1540msgid "a 'file:' URL may not have a port number"
1541msgstr "一个 'file:' URL 不应该包含端口号"
1542
1543#: urlmatch.c:199
1544msgid "invalid characters in host name"
1545msgstr "主机名中包含无效的字符"
1546
1547#: urlmatch.c:244 urlmatch.c:255
1548msgid "invalid port number"
1549msgstr "无效的端口号"
1550
1551#: urlmatch.c:322
1552msgid "invalid '..' path segment"
1553msgstr "无效的 '..' 路径片段"
1554
814ff314 1555#: wrapper.c:523
07432cef 1556#, c-format
ef317cd5 1557msgid "unable to access '%s': %s"
07432cef
WS
1558msgstr "不能访问 '%s':%s"
1559
814ff314 1560#: wrapper.c:544
07432cef
WS
1561#, c-format
1562msgid "unable to access '%s'"
1563msgstr "不能访问 '%s'"
ef317cd5 1564
814ff314 1565#: wrapper.c:555
d691f479
JX
1566#, c-format
1567msgid "unable to look up current user in the passwd file: %s"
07432cef 1568msgstr "无法在口令文件中查询到当前用户:%s"
d691f479 1569
814ff314 1570#: wrapper.c:556
d691f479
JX
1571msgid "no such user"
1572msgstr "无此用户"
1573
814ff314 1574#: wrapper.c:564
220c313c
JX
1575msgid "unable to get current working directory"
1576msgstr "不能获取当前工作目录"
1577
7aea43ff
JX
1578#: wrapper.c:575
1579#, c-format
1580msgid "could not open %s for writing"
1581msgstr "不能写入 %s"
1582
1583#: wrapper.c:587
1584#, c-format
1585msgid "could not write to %s"
1586msgstr "不能写入 %s"
1587
1588#: wrapper.c:593
1589#, c-format
1590msgid "could not close %s"
1591msgstr "不能关闭 %s"
1592
cfff71a9 1593#: wt-status.c:150
c04f5ac3
JX
1594msgid "Unmerged paths:"
1595msgstr "未合并的路径:"
1596
90e6ef53 1597# 译者:注意保持前导空格
cfff71a9 1598#: wt-status.c:177 wt-status.c:204
c04f5ac3
JX
1599#, c-format
1600msgid " (use \"git reset %s <file>...\" to unstage)"
d9d56b23 1601msgstr " (使用 \"git reset %s <文件>...\" 撤出暂存区)"
c04f5ac3 1602
90e6ef53 1603# 译者:注意保持前导空格
cfff71a9 1604#: wt-status.c:179 wt-status.c:206
c04f5ac3 1605msgid " (use \"git rm --cached <file>...\" to unstage)"
d9d56b23 1606msgstr " (使用 \"git rm --cached <文件>...\" 撤出暂存区)"
c04f5ac3 1607
90e6ef53 1608# 译者:注意保持前导空格
cfff71a9 1609#: wt-status.c:183
6792b93b 1610msgid " (use \"git add <file>...\" to mark resolution)"
d9d56b23 1611msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
6792b93b
JX
1612
1613# 译者:注意保持前导空格
cfff71a9 1614#: wt-status.c:185 wt-status.c:189
c04f5ac3 1615msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
d9d56b23 1616msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
c04f5ac3 1617
6792b93b 1618# 译者:注意保持前导空格
cfff71a9 1619#: wt-status.c:187
6792b93b 1620msgid " (use \"git rm <file>...\" to mark resolution)"
d9d56b23 1621msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
6792b93b 1622
7aea43ff 1623#: wt-status.c:198 wt-status.c:881
c04f5ac3
JX
1624msgid "Changes to be committed:"
1625msgstr "要提交的变更:"
1626
7aea43ff 1627#: wt-status.c:216 wt-status.c:890
c04f5ac3 1628msgid "Changes not staged for commit:"
7e238ab7 1629msgstr "尚未暂存以备提交的变更:"
c04f5ac3 1630
90e6ef53 1631# 译者:注意保持前导空格
cfff71a9 1632#: wt-status.c:220
c04f5ac3 1633msgid " (use \"git add <file>...\" to update what will be committed)"
d9d56b23 1634msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
c04f5ac3 1635
90e6ef53 1636# 译者:注意保持前导空格
cfff71a9 1637#: wt-status.c:222
c04f5ac3 1638msgid " (use \"git add/rm <file>...\" to update what will be committed)"
d9d56b23 1639msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
c04f5ac3 1640
90e6ef53 1641# 译者:注意保持前导空格
cfff71a9 1642#: wt-status.c:223
c04f5ac3
JX
1643msgid ""
1644" (use \"git checkout -- <file>...\" to discard changes in working directory)"
d9d56b23 1645msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
c04f5ac3 1646
90e6ef53 1647# 译者:注意保持前导空格
cfff71a9 1648#: wt-status.c:225
c04f5ac3
JX
1649msgid " (commit or discard the untracked or modified content in submodules)"
1650msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1651
90e6ef53 1652# 译者:注意保持前导空格
cfff71a9 1653#: wt-status.c:237
c04f5ac3
JX
1654#, c-format
1655msgid " (use \"git %s <file>...\" to include in what will be committed)"
d9d56b23 1656msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
c04f5ac3 1657
6c94aba5 1658#: wt-status.c:252
c04f5ac3
JX
1659msgid "both deleted:"
1660msgstr "双方删除:"
1661
6c94aba5 1662#: wt-status.c:254
c04f5ac3
JX
1663msgid "added by us:"
1664msgstr "由我们添加:"
1665
6c94aba5 1666#: wt-status.c:256
c04f5ac3
JX
1667msgid "deleted by them:"
1668msgstr "由他们删除:"
1669
6c94aba5 1670#: wt-status.c:258
c04f5ac3
JX
1671msgid "added by them:"
1672msgstr "由他们添加:"
1673
6c94aba5 1674#: wt-status.c:260
c04f5ac3
JX
1675msgid "deleted by us:"
1676msgstr "由我们删除:"
1677
6c94aba5 1678#: wt-status.c:262
c04f5ac3
JX
1679msgid "both added:"
1680msgstr "双方添加:"
1681
6c94aba5 1682#: wt-status.c:264
c04f5ac3
JX
1683msgid "both modified:"
1684msgstr "双方修改:"
1685
6c94aba5
JX
1686#: wt-status.c:266
1687#, c-format
1688msgid "bug: unhandled unmerged status %x"
1689msgstr "bug:无法处理的未合并状态 %x"
cfff71a9 1690
6c94aba5
JX
1691#: wt-status.c:274
1692msgid "new file:"
1693msgstr "新文件:"
cfff71a9 1694
6c94aba5
JX
1695#: wt-status.c:276
1696msgid "copied:"
1697msgstr "拷贝:"
cfff71a9 1698
6c94aba5
JX
1699#: wt-status.c:278
1700msgid "deleted:"
1701msgstr "删除:"
cfff71a9 1702
6c94aba5
JX
1703#: wt-status.c:280
1704msgid "modified:"
1705msgstr "修改:"
1706
1707#: wt-status.c:282
1708msgid "renamed:"
1709msgstr "重命名:"
1710
1711#: wt-status.c:284
1712msgid "typechange:"
1713msgstr "类型变更:"
1714
1715#: wt-status.c:286
1716msgid "unknown:"
1717msgstr "未知:"
cfff71a9 1718
6c94aba5
JX
1719#: wt-status.c:288
1720msgid "unmerged:"
1721msgstr "未合并:"
cfff71a9 1722
90e6ef53 1723# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6c94aba5 1724#: wt-status.c:370
c04f5ac3 1725msgid "new commits, "
aa9565f7 1726msgstr "新提交, "
c04f5ac3 1727
90e6ef53 1728# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6c94aba5 1729#: wt-status.c:372
c04f5ac3 1730msgid "modified content, "
aa9565f7 1731msgstr "修改的内容, "
c04f5ac3 1732
90e6ef53 1733# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6c94aba5 1734#: wt-status.c:374
c04f5ac3 1735msgid "untracked content, "
aa9565f7 1736msgstr "未跟踪的内容, "
c04f5ac3 1737
6c94aba5 1738#: wt-status.c:391
c04f5ac3
JX
1739#, c-format
1740msgid "bug: unhandled diff status %c"
6c94aba5 1741msgstr "bug:无法处理的差异状态 %c"
c04f5ac3 1742
7aea43ff 1743#: wt-status.c:755
90314792
JX
1744msgid "Submodules changed but not updated:"
1745msgstr "子模组已修改但尚未更新:"
1746
7aea43ff 1747#: wt-status.c:757
90314792
JX
1748msgid "Submodule changes to be committed:"
1749msgstr "要提交的子模组变更:"
1750
7aea43ff 1751#: wt-status.c:838
cfff71a9
JX
1752msgid ""
1753"Do not touch the line above.\n"
1754"Everything below will be removed."
1755msgstr ""
1756"不要改动上面的一行。\n"
1757"下面的所有内容均将被删除。"
1758
7aea43ff 1759#: wt-status.c:949
6792b93b 1760msgid "You have unmerged paths."
195febda 1761msgstr "您有尚未合并的路径。"
6792b93b
JX
1762
1763# 译者:注意保持前导空格
7aea43ff 1764#: wt-status.c:952
6792b93b
JX
1765msgid " (fix conflicts and run \"git commit\")"
1766msgstr " (解决冲突并运行 \"git commit\")"
1767
7aea43ff 1768#: wt-status.c:955
6792b93b
JX
1769msgid "All conflicts fixed but you are still merging."
1770msgstr "所有冲突已解决但您仍处于合并中。"
1771
1772# 译者:注意保持前导空格
7aea43ff 1773#: wt-status.c:958
6792b93b
JX
1774msgid " (use \"git commit\" to conclude merge)"
1775msgstr " (使用 \"git commit\" 结束合并)"
1776
7aea43ff 1777#: wt-status.c:968
6792b93b 1778msgid "You are in the middle of an am session."
98b2761d 1779msgstr "您正处于 am 操作过程中。"
6792b93b 1780
7aea43ff 1781#: wt-status.c:971
6792b93b
JX
1782msgid "The current patch is empty."
1783msgstr "当前的补丁为空。"
1784
1785# 译者:注意保持前导空格
7aea43ff 1786#: wt-status.c:975
2e8451e8
JX
1787msgid " (fix conflicts and then run \"git am --continue\")"
1788msgstr " (解决冲突,然后运行 \"git am --continue\")"
6792b93b
JX
1789
1790# 译者:注意保持前导空格
7aea43ff 1791#: wt-status.c:977
6792b93b
JX
1792msgid " (use \"git am --skip\" to skip this patch)"
1793msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1794
1795# 译者:注意保持前导空格
7aea43ff 1796#: wt-status.c:979
6792b93b
JX
1797msgid " (use \"git am --abort\" to restore the original branch)"
1798msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1799
7aea43ff 1800#: wt-status.c:1039 wt-status.c:1056
63af42fe
JX
1801#, c-format
1802msgid "You are currently rebasing branch '%s' on '%s'."
98b2761d 1803msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
63af42fe 1804
7aea43ff 1805#: wt-status.c:1044 wt-status.c:1061
6792b93b 1806msgid "You are currently rebasing."
98b2761d 1807msgstr "您在执行变基操作。"
6792b93b
JX
1808
1809# 译者:注意保持前导空格
7aea43ff 1810#: wt-status.c:1047
6792b93b
JX
1811msgid " (fix conflicts and then run \"git rebase --continue\")"
1812msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1813
1814# 译者:注意保持前导空格
7aea43ff 1815#: wt-status.c:1049
6792b93b
JX
1816msgid " (use \"git rebase --skip\" to skip this patch)"
1817msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1818
1819# 译者:注意保持前导空格
7aea43ff 1820#: wt-status.c:1051
6792b93b
JX
1821msgid " (use \"git rebase --abort\" to check out the original branch)"
1822msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1823
1824# 译者:注意保持前导空格
7aea43ff 1825#: wt-status.c:1064
6792b93b
JX
1826msgid " (all conflicts fixed: run \"git rebase --continue\")"
1827msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1828
7aea43ff 1829#: wt-status.c:1068
63af42fe
JX
1830#, c-format
1831msgid ""
1832"You are currently splitting a commit while rebasing branch '%s' on '%s'."
98b2761d 1833msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
63af42fe 1834
7aea43ff 1835#: wt-status.c:1073
6792b93b 1836msgid "You are currently splitting a commit during a rebase."
98b2761d 1837msgstr "您在执行变基操作时拆分提交。"
6792b93b
JX
1838
1839# 译者:注意保持前导空格
7aea43ff 1840#: wt-status.c:1076
6792b93b
JX
1841msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1842msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1843
7aea43ff 1844#: wt-status.c:1080
63af42fe
JX
1845#, c-format
1846msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
98b2761d 1847msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
63af42fe 1848
7aea43ff 1849#: wt-status.c:1085
6792b93b 1850msgid "You are currently editing a commit during a rebase."
98b2761d 1851msgstr "您在执行变基操作时编辑提交。"
6792b93b
JX
1852
1853# 译者:注意保持前导空格
7aea43ff 1854#: wt-status.c:1088
6792b93b
JX
1855msgid " (use \"git commit --amend\" to amend the current commit)"
1856msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1857
1858# 译者:注意保持前导空格
7aea43ff 1859#: wt-status.c:1090
6792b93b
JX
1860msgid ""
1861" (use \"git rebase --continue\" once you are satisfied with your changes)"
195febda 1862msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
6792b93b 1863
7aea43ff 1864#: wt-status.c:1100
90314792
JX
1865#, c-format
1866msgid "You are currently cherry-picking commit %s."
98b2761d 1867msgstr "您在执行拣选提交 %s 的操作。"
6792b93b 1868
2e8451e8 1869# 译者:注意保持前导空格
7aea43ff 1870#: wt-status.c:1105
2e8451e8
JX
1871msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1872msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1873
6792b93b 1874# 译者:注意保持前导空格
7aea43ff 1875#: wt-status.c:1108
2e8451e8
JX
1876msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1877msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
6792b93b 1878
2e8451e8 1879# 译者:注意保持前导空格
7aea43ff 1880#: wt-status.c:1110
2e8451e8
JX
1881msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1882msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1883
7aea43ff 1884#: wt-status.c:1119
1003b3a5
JX
1885#, c-format
1886msgid "You are currently reverting commit %s."
98b2761d 1887msgstr "您在执行反转提交 %s 的操作。"
1003b3a5
JX
1888
1889# 译者:注意保持前导空格
7aea43ff 1890#: wt-status.c:1124
1003b3a5
JX
1891msgid " (fix conflicts and run \"git revert --continue\")"
1892msgstr " (解决冲突并运行 \"git revert --continue\")"
1893
1894# 译者:注意保持前导空格
7aea43ff 1895#: wt-status.c:1127
1003b3a5
JX
1896msgid " (all conflicts fixed: run \"git revert --continue\")"
1897msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1898
1899# 译者:注意保持前导空格
7aea43ff 1900#: wt-status.c:1129
1003b3a5
JX
1901msgid " (use \"git revert --abort\" to cancel the revert operation)"
1902msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1903
7aea43ff 1904#: wt-status.c:1140
63af42fe 1905#, c-format
1003b3a5 1906msgid "You are currently bisecting, started from branch '%s'."
98b2761d 1907msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
63af42fe 1908
7aea43ff 1909#: wt-status.c:1144
6792b93b 1910msgid "You are currently bisecting."
98b2761d 1911msgstr "您在执行二分查找操作。"
6792b93b
JX
1912
1913# 译者:注意保持前导空格
7aea43ff 1914#: wt-status.c:1147
6792b93b
JX
1915msgid " (use \"git bisect reset\" to get back to the original branch)"
1916msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1917
7aea43ff 1918#: wt-status.c:1324
c04f5ac3
JX
1919msgid "On branch "
1920msgstr "位于分支 "
1921
7aea43ff 1922#: wt-status.c:1331
2e8451e8 1923msgid "rebase in progress; onto "
98b2761d 1924msgstr "变基操作正在进行中;至 "
2e8451e8 1925
7aea43ff 1926#: wt-status.c:1336
1003b3a5
JX
1927msgid "HEAD detached at "
1928msgstr "头指针分离于 "
1929
7aea43ff 1930#: wt-status.c:1338
1003b3a5
JX
1931msgid "HEAD detached from "
1932msgstr "头指针分离自 "
1933
7aea43ff 1934#: wt-status.c:1341
c04f5ac3
JX
1935msgid "Not currently on any branch."
1936msgstr "当前不在任何分支上。"
1937
7aea43ff 1938#: wt-status.c:1358
c04f5ac3
JX
1939msgid "Initial commit"
1940msgstr "初始提交"
1941
7aea43ff 1942#: wt-status.c:1372
ef317cd5 1943msgid "Untracked files"
07432cef 1944msgstr "未跟踪的文件"
c04f5ac3 1945
7aea43ff 1946#: wt-status.c:1374
ef317cd5 1947msgid "Ignored files"
07432cef 1948msgstr "忽略的文件"
c04f5ac3 1949
7aea43ff 1950#: wt-status.c:1378
1003b3a5 1951#, c-format
4dcdc3d8
JX
1952msgid ""
1953"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1954"may speed it up, but you have to be careful not to forget to add\n"
1955"new files yourself (see 'git help status')."
1956msgstr ""
1957"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
1958"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1003b3a5 1959
7aea43ff 1960#: wt-status.c:1384
c04f5ac3
JX
1961#, c-format
1962msgid "Untracked files not listed%s"
1963msgstr "未跟踪的文件没有列出%s"
1964
7e238ab7 1965# 译者:中文字符串拼接,可删除前导空格
7aea43ff 1966#: wt-status.c:1386
c04f5ac3 1967msgid " (use -u option to show untracked files)"
7e238ab7 1968msgstr "(使用 -u 参数显示未跟踪的文件)"
c04f5ac3 1969
7aea43ff 1970#: wt-status.c:1392
c04f5ac3
JX
1971msgid "No changes"
1972msgstr "没有修改"
1973
7aea43ff 1974#: wt-status.c:1397
07432cef 1975#, c-format
ef317cd5 1976msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
07432cef 1977msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
c04f5ac3 1978
7aea43ff 1979#: wt-status.c:1400
07432cef 1980#, c-format
ef317cd5 1981msgid "no changes added to commit\n"
07432cef 1982msgstr "修改尚未加入提交\n"
c04f5ac3 1983
7aea43ff 1984#: wt-status.c:1403
07432cef 1985#, c-format
ef317cd5
JX
1986msgid ""
1987"nothing added to commit but untracked files present (use \"git add\" to "
1988"track)\n"
07432cef 1989msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
c04f5ac3 1990
7aea43ff 1991#: wt-status.c:1406
07432cef 1992#, c-format
ef317cd5 1993msgid "nothing added to commit but untracked files present\n"
07432cef 1994msgstr "提交为空,但是存在尚未跟踪的文件\n"
c04f5ac3 1995
7e238ab7 1996# 译者:中文字符串拼接,可删除前导空格
7aea43ff 1997#: wt-status.c:1409
07432cef 1998#, c-format
ef317cd5 1999msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
07432cef 2000msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
c04f5ac3 2001
7aea43ff 2002#: wt-status.c:1412 wt-status.c:1417
07432cef 2003#, c-format
ef317cd5 2004msgid "nothing to commit\n"
07432cef 2005msgstr "无文件要提交\n"
ef317cd5 2006
7e238ab7 2007# 译者:中文字符串拼接,可删除前导空格
7aea43ff 2008#: wt-status.c:1415
07432cef 2009#, c-format
ef317cd5 2010msgid "nothing to commit (use -u to show untracked files)\n"
07432cef 2011msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
c04f5ac3 2012
7e238ab7 2013# 译者:中文字符串拼接,可删除前导空格
7aea43ff 2014#: wt-status.c:1419
07432cef 2015#, c-format
ef317cd5 2016msgid "nothing to commit, working directory clean\n"
07432cef 2017msgstr "无文件要提交,干净的工作区\n"
c04f5ac3 2018
7aea43ff 2019#: wt-status.c:1528
c04f5ac3 2020msgid "HEAD (no branch)"
61bc0753 2021msgstr "HEAD(非分支)"
c04f5ac3 2022
90e6ef53 2023# 译者:注意保持句尾空格
7aea43ff 2024#: wt-status.c:1534
c04f5ac3
JX
2025msgid "Initial commit on "
2026msgstr "初始提交于 "
2027
7aea43ff 2028#: wt-status.c:1561
90314792
JX
2029msgid "gone"
2030msgstr "丢失"
2031
90e6ef53 2032# 译者:注意保持句尾空格
7aea43ff 2033#: wt-status.c:1563 wt-status.c:1571
c04f5ac3
JX
2034msgid "behind "
2035msgstr "落后 "
2036
7aea43ff 2037#: compat/precompose_utf8.c:55 builtin/clone.c:352
a77c07d9
JX
2038#, c-format
2039msgid "failed to unlink '%s'"
2040msgstr "无法删除 '%s'"
2041
220c313c 2042#: builtin/add.c:22
814ff314
JX
2043msgid "git add [<options>] [--] <pathspec>..."
2044msgstr "git add [<选项>] [--] <路径规则>..."
ef317cd5 2045
220c313c 2046#: builtin/add.c:65
c04f5ac3
JX
2047#, c-format
2048msgid "unexpected diff status %c"
2049msgstr "意外的差异状态 %c"
2050
44f518e6 2051#: builtin/add.c:70 builtin/commit.c:277
c04f5ac3
JX
2052msgid "updating files failed"
2053msgstr "更新文件失败"
2054
220c313c 2055#: builtin/add.c:80
c04f5ac3
JX
2056#, c-format
2057msgid "remove '%s'\n"
2058msgstr "删除 '%s'\n"
2059
220c313c 2060#: builtin/add.c:134
c04f5ac3 2061msgid "Unstaged changes after refreshing the index:"
90e6ef53 2062msgstr "刷新索引之后尚未被暂存的变更:"
c04f5ac3 2063
7aea43ff 2064#: builtin/add.c:194 builtin/rev-parse.c:796
c04f5ac3 2065msgid "Could not read the index"
90e6ef53 2066msgstr "不能读取索引"
c04f5ac3 2067
220c313c 2068#: builtin/add.c:205
c04f5ac3
JX
2069#, c-format
2070msgid "Could not open '%s' for writing."
195febda 2071msgstr "不能打开 '%s' 以写入。"
c04f5ac3 2072
220c313c 2073#: builtin/add.c:209
c04f5ac3 2074msgid "Could not write patch"
195febda 2075msgstr "不能生成补丁"
c04f5ac3 2076
7aea43ff
JX
2077#: builtin/add.c:212
2078msgid "editing patch failed"
2079msgstr "编辑补丁失败"
2080
2081#: builtin/add.c:215
c04f5ac3
JX
2082#, c-format
2083msgid "Could not stat '%s'"
90e6ef53 2084msgstr "不能查看文件状态 '%s'"
c04f5ac3 2085
7aea43ff 2086#: builtin/add.c:217
c04f5ac3
JX
2087msgid "Empty patch. Aborted."
2088msgstr "空补丁。异常终止。"
2089
7aea43ff 2090#: builtin/add.c:222
8ada9598
JX
2091#, c-format
2092msgid "Could not apply '%s'"
2093msgstr "不能应用 '%s'"
2094
7aea43ff 2095#: builtin/add.c:232
8ada9598 2096msgid "The following paths are ignored by one of your .gitignore files:\n"
195febda 2097msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 2098
7aea43ff
JX
2099#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110
2100#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369
2101#: builtin/rm.c:268
ef317cd5 2102msgid "dry run"
07432cef 2103msgstr "演习"
ef317cd5 2104
7aea43ff
JX
2105#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19
2106#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616
220c313c 2107#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
ef317cd5
JX
2108msgid "be verbose"
2109msgstr "冗长输出"
2110
7aea43ff 2111#: builtin/add.c:252
ef317cd5 2112msgid "interactive picking"
07432cef 2113msgstr "交互式拣选"
ef317cd5 2114
7aea43ff 2115#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286
ef317cd5 2116msgid "select hunks interactively"
07432cef 2117msgstr "交互式挑选数据块"
ef317cd5 2118
7aea43ff 2119#: builtin/add.c:254
ef317cd5 2120msgid "edit current diff and apply"
07432cef 2121msgstr "编辑当前差异并应用"
ef317cd5 2122
7aea43ff 2123#: builtin/add.c:255
ef317cd5 2124msgid "allow adding otherwise ignored files"
07432cef 2125msgstr "允许添加忽略的文件"
ef317cd5 2126
7aea43ff 2127#: builtin/add.c:256
ef317cd5 2128msgid "update tracked files"
07432cef 2129msgstr "更新已跟踪的文件"
ef317cd5 2130
7aea43ff 2131#: builtin/add.c:257
ef317cd5 2132msgid "record only the fact that the path will be added later"
07432cef 2133msgstr "只记录,该路径稍后再添加"
ef317cd5 2134
7aea43ff 2135#: builtin/add.c:258
ef317cd5 2136msgid "add changes from all tracked and untracked files"
07432cef 2137msgstr "添加所有改变的已跟踪文件和未跟踪文件"
ef317cd5 2138
7aea43ff 2139#: builtin/add.c:261
4dcdc3d8
JX
2140msgid "ignore paths removed in the working tree (same as --no-all)"
2141msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2142
7aea43ff 2143#: builtin/add.c:263
ef317cd5 2144msgid "don't add, only refresh the index"
07432cef 2145msgstr "不添加,只刷新索引"
ef317cd5 2146
7aea43ff 2147#: builtin/add.c:264
ef317cd5 2148msgid "just skip files which cannot be added because of errors"
07432cef 2149msgstr "跳过因出错不能添加的文件"
ef317cd5 2150
7aea43ff 2151#: builtin/add.c:265
ef317cd5 2152msgid "check if - even missing - files are ignored in dry run"
07432cef 2153msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
ef317cd5 2154
7aea43ff 2155#: builtin/add.c:287
8ada9598
JX
2156#, c-format
2157msgid "Use -f if you really want to add them.\n"
2158msgstr "使用 -f 参数如果您确实要添加它们。\n"
2159
7aea43ff 2160#: builtin/add.c:294
8ada9598
JX
2161msgid "adding files failed"
2162msgstr "添加文件失败"
2163
7aea43ff 2164#: builtin/add.c:330
8ada9598
JX
2165msgid "-A and -u are mutually incompatible"
2166msgstr "-A 和 -u 选项互斥"
2167
7aea43ff 2168#: builtin/add.c:337
8ada9598 2169msgid "Option --ignore-missing can only be used together with --dry-run"
649900bc 2170msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 2171
7aea43ff 2172#: builtin/add.c:358
8ada9598
JX
2173#, c-format
2174msgid "Nothing specified, nothing added.\n"
2175msgstr "没有指定文件,也没有文件被添加。\n"
2176
7aea43ff 2177#: builtin/add.c:359
8ada9598
JX
2178#, c-format
2179msgid "Maybe you wanted to say 'git add .'?\n"
2180msgstr "也许您想要执行 'git add .'?\n"
2181
7aea43ff
JX
2182#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918
2183#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298
8ada9598
JX
2184msgid "index file corrupt"
2185msgstr "索引文件损坏"
2186
7aea43ff 2187#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430
8ada9598
JX
2188msgid "Unable to write new index file"
2189msgstr "无法写入新索引文件"
2190
814ff314
JX
2191#: builtin/apply.c:59
2192msgid "git apply [<options>] [<patch>...]"
2193msgstr "git apply [<选项>] [<补丁>...]"
8ada9598 2194
814ff314 2195#: builtin/apply.c:112
81809b99 2196#, c-format
8ada9598 2197msgid "unrecognized whitespace option '%s'"
81809b99 2198msgstr "未能识别的空白字符选项 '%s'"
8ada9598 2199
814ff314 2200#: builtin/apply.c:127
81809b99 2201#, c-format
8ada9598 2202msgid "unrecognized whitespace ignore option '%s'"
81809b99 2203msgstr "未能识别的空白字符忽略选项 '%s'"
8ada9598 2204
814ff314 2205#: builtin/apply.c:822
8ada9598
JX
2206#, c-format
2207msgid "Cannot prepare timestamp regexp %s"
81809b99 2208msgstr "无法准备时间戳正则表达式 %s"
8ada9598 2209
814ff314 2210#: builtin/apply.c:831
8ada9598
JX
2211#, c-format
2212msgid "regexec returned %d for input: %s"
81809b99 2213msgstr "regexec 返回 %d,输入为:%s"
8ada9598 2214
814ff314 2215#: builtin/apply.c:912
81809b99 2216#, c-format
8ada9598 2217msgid "unable to find filename in patch at line %d"
81809b99 2218msgstr "不能在补丁的第 %d 行找到文件名"
8ada9598 2219
814ff314 2220#: builtin/apply.c:944
8ada9598
JX
2221#, c-format
2222msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
9aafc933 2223msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
8ada9598 2224
814ff314 2225#: builtin/apply.c:948
8ada9598
JX
2226#, c-format
2227msgid "git apply: bad git-diff - inconsistent new filename on line %d"
81809b99 2228msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
8ada9598 2229
814ff314 2230#: builtin/apply.c:949
8ada9598
JX
2231#, c-format
2232msgid "git apply: bad git-diff - inconsistent old filename on line %d"
81809b99 2233msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
8ada9598 2234
814ff314 2235#: builtin/apply.c:956
8ada9598
JX
2236#, c-format
2237msgid "git apply: bad git-diff - expected /dev/null on line %d"
9aafc933 2238msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
8ada9598 2239
814ff314 2240#: builtin/apply.c:1419
8ada9598
JX
2241#, c-format
2242msgid "recount: unexpected line: %.*s"
81809b99 2243msgstr "recount:意外的行:%.*s"
8ada9598 2244
814ff314 2245#: builtin/apply.c:1476
8ada9598
JX
2246#, c-format
2247msgid "patch fragment without header at line %d: %.*s"
81809b99 2248msgstr "第 %d 行的补丁片段没有头信息:%.*s"
8ada9598 2249
814ff314 2250#: builtin/apply.c:1493
8ada9598
JX
2251#, c-format
2252msgid ""
2253"git diff header lacks filename information when removing %d leading pathname "
2254"component (line %d)"
2255msgid_plural ""
2256"git diff header lacks filename information when removing %d leading pathname "
2257"components (line %d)"
5ae481e0
JX
2258msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2259msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
8ada9598 2260
7aea43ff 2261#: builtin/apply.c:1659
8ada9598 2262msgid "new file depends on old contents"
81809b99 2263msgstr "新文件依赖旧内容"
8ada9598 2264
7aea43ff 2265#: builtin/apply.c:1661
8ada9598 2266msgid "deleted file still has contents"
81809b99 2267msgstr "删除的文件仍有内容"
8ada9598 2268
7aea43ff 2269#: builtin/apply.c:1687
8ada9598
JX
2270#, c-format
2271msgid "corrupt patch at line %d"
195febda 2272msgstr "补丁在第 %d 行损坏"
8ada9598 2273
7aea43ff 2274#: builtin/apply.c:1723
8ada9598
JX
2275#, c-format
2276msgid "new file %s depends on old contents"
81809b99 2277msgstr "新文件 %s 依赖旧内容"
8ada9598 2278
7aea43ff 2279#: builtin/apply.c:1725
8ada9598
JX
2280#, c-format
2281msgid "deleted file %s still has contents"
81809b99 2282msgstr "删除的文件 %s 仍有内容"
8ada9598 2283
7aea43ff 2284#: builtin/apply.c:1728
8ada9598
JX
2285#, c-format
2286msgid "** warning: file %s becomes empty but is not deleted"
81809b99 2287msgstr "** 警告:文件 %s 成为空文件但并未删除"
8ada9598 2288
7aea43ff 2289#: builtin/apply.c:1874
8ada9598
JX
2290#, c-format
2291msgid "corrupt binary patch at line %d: %.*s"
81809b99 2292msgstr "二进制补丁在第 %d 行损坏:%.*s"
8ada9598 2293
7aea43ff 2294#: builtin/apply.c:1903
8ada9598
JX
2295#, c-format
2296msgid "unrecognized binary patch at line %d"
81809b99 2297msgstr "未能识别的二进制补丁位于第 %d 行"
8ada9598 2298
7aea43ff 2299#: builtin/apply.c:2054
8ada9598
JX
2300#, c-format
2301msgid "patch with only garbage at line %d"
81809b99 2302msgstr "补丁文件的第 %d 行只有垃圾数据"
8ada9598 2303
7aea43ff 2304#: builtin/apply.c:2144
81809b99 2305#, c-format
8ada9598 2306msgid "unable to read symlink %s"
81809b99 2307msgstr "无法读取符号链接 %s"
8ada9598 2308
7aea43ff 2309#: builtin/apply.c:2148
81809b99 2310#, c-format
8ada9598 2311msgid "unable to open or read %s"
81809b99 2312msgstr "不能打开或读取 %s"
8ada9598 2313
7aea43ff 2314#: builtin/apply.c:2781
81809b99 2315#, c-format
8ada9598 2316msgid "invalid start of line: '%c'"
81809b99 2317msgstr "无效的行首字符:'%c'"
8ada9598 2318
7aea43ff 2319#: builtin/apply.c:2900
8ada9598
JX
2320#, c-format
2321msgid "Hunk #%d succeeded at %d (offset %d line)."
2322msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
07432cef
WS
2323msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2324msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
8ada9598 2325
7aea43ff 2326#: builtin/apply.c:2912
8ada9598
JX
2327#, c-format
2328msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
81809b99 2329msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
8ada9598 2330
7aea43ff 2331#: builtin/apply.c:2918
8ada9598
JX
2332#, c-format
2333msgid ""
2334"while searching for:\n"
2335"%.*s"
2336msgstr ""
81809b99
JX
2337"当查询:\n"
2338"%.*s"
8ada9598 2339
7aea43ff 2340#: builtin/apply.c:2938
8ada9598
JX
2341#, c-format
2342msgid "missing binary patch data for '%s'"
81809b99 2343msgstr "缺失 '%s' 的二进制补丁数据"
8ada9598 2344
7aea43ff 2345#: builtin/apply.c:3039
8ada9598
JX
2346#, c-format
2347msgid "binary patch does not apply to '%s'"
81809b99 2348msgstr "二进制补丁未应用到 '%s'"
8ada9598 2349
7aea43ff 2350#: builtin/apply.c:3045
8ada9598
JX
2351#, c-format
2352msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
9aafc933 2353msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
8ada9598 2354
7aea43ff 2355#: builtin/apply.c:3066
8ada9598
JX
2356#, c-format
2357msgid "patch failed: %s:%ld"
81809b99 2358msgstr "打补丁失败:%s:%ld"
8ada9598 2359
7aea43ff 2360#: builtin/apply.c:3190
8ada9598 2361#, c-format
23ff3338
JX
2362msgid "cannot checkout %s"
2363msgstr "不能检出 %s"
8ada9598 2364
7aea43ff 2365#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291
81809b99 2366#, c-format
8ada9598 2367msgid "read of %s failed"
81809b99 2368msgstr "读取 %s 失败"
8ada9598 2369
7aea43ff 2370#: builtin/apply.c:3243
814ff314
JX
2371#, c-format
2372msgid "reading from '%s' beyond a symbolic link"
2373msgstr "读取位于符号链接中的 '%s'"
2374
7aea43ff 2375#: builtin/apply.c:3271 builtin/apply.c:3493
81809b99 2376#, c-format
23ff3338
JX
2377msgid "path %s has been renamed/deleted"
2378msgstr "路径 %s 已经被重命名/删除"
8ada9598 2379
7aea43ff 2380#: builtin/apply.c:3352 builtin/apply.c:3507
8ada9598 2381#, c-format
23ff3338
JX
2382msgid "%s: does not exist in index"
2383msgstr "%s:不存在于索引中"
8ada9598 2384
7aea43ff 2385#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521
81809b99 2386#, c-format
8ada9598 2387msgid "%s: %s"
81809b99 2388msgstr "%s:%s"
8ada9598 2389
7aea43ff 2390#: builtin/apply.c:3361 builtin/apply.c:3515
81809b99 2391#, c-format
8ada9598 2392msgid "%s: does not match index"
81809b99 2393msgstr "%s:和索引不匹配"
8ada9598 2394
7aea43ff 2395#: builtin/apply.c:3463
23ff3338
JX
2396msgid "removal patch leaves file contents"
2397msgstr "移除补丁仍留下了文件内容"
2398
7aea43ff 2399#: builtin/apply.c:3532
8ada9598
JX
2400#, c-format
2401msgid "%s: wrong type"
81809b99 2402msgstr "%s:错误类型"
8ada9598 2403
7aea43ff 2404#: builtin/apply.c:3534
8ada9598
JX
2405#, c-format
2406msgid "%s has type %o, expected %o"
9aafc933 2407msgstr "%s 的类型是 %o,应为 %o"
8ada9598 2408
7aea43ff 2409#: builtin/apply.c:3693 builtin/apply.c:3695
814ff314
JX
2410#, c-format
2411msgid "invalid path '%s'"
2412msgstr "无效路径 '%s'"
2413
7aea43ff 2414#: builtin/apply.c:3750
81809b99 2415#, c-format
8ada9598 2416msgid "%s: already exists in index"
81809b99 2417msgstr "%s:已经存在于索引中"
8ada9598 2418
7aea43ff 2419#: builtin/apply.c:3753
23ff3338
JX
2420#, c-format
2421msgid "%s: already exists in working directory"
2422msgstr "%s:已经存在于工作区中"
2423
7aea43ff 2424#: builtin/apply.c:3773
d691f479
JX
2425#, c-format
2426msgid "new mode (%o) of %s does not match old mode (%o)"
2427msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
8ada9598 2428
7aea43ff 2429#: builtin/apply.c:3778
8ada9598 2430#, c-format
d691f479
JX
2431msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2432msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2433
7aea43ff 2434#: builtin/apply.c:3798
814ff314
JX
2435#, c-format
2436msgid "affected file '%s' is beyond a symbolic link"
2437msgstr "受影响的文件 '%s' 位于符号链接中"
2438
7aea43ff 2439#: builtin/apply.c:3802
d691f479 2440#, c-format
8ada9598 2441msgid "%s: patch does not apply"
81809b99 2442msgstr "%s:补丁未应用"
8ada9598 2443
7aea43ff 2444#: builtin/apply.c:3816
8ada9598
JX
2445#, c-format
2446msgid "Checking patch %s..."
81809b99 2447msgstr "检查补丁 %s..."
8ada9598 2448
7aea43ff 2449#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135
8ada9598
JX
2450#, c-format
2451msgid "make_cache_entry failed for path '%s'"
2452msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2453
7aea43ff 2454#: builtin/apply.c:4052
81809b99 2455#, c-format
8ada9598 2456msgid "unable to remove %s from index"
81809b99 2457msgstr "不能从索引中移除 %s"
8ada9598 2458
7aea43ff 2459#: builtin/apply.c:4081
8ada9598 2460#, c-format
2e8451e8
JX
2461msgid "corrupt patch for submodule %s"
2462msgstr "子模组 %s 损坏的补丁"
8ada9598 2463
7aea43ff 2464#: builtin/apply.c:4085
81809b99 2465#, c-format
8ada9598 2466msgid "unable to stat newly created file '%s'"
81809b99 2467msgstr "不能枚举新建文件 '%s' 的状态"
8ada9598 2468
7aea43ff 2469#: builtin/apply.c:4090
8ada9598
JX
2470#, c-format
2471msgid "unable to create backing store for newly created file %s"
81809b99 2472msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 2473
7aea43ff 2474#: builtin/apply.c:4093 builtin/apply.c:4201
81809b99 2475#, c-format
8ada9598 2476msgid "unable to add cache entry for %s"
81809b99 2477msgstr "无法为 %s 添加缓存条目"
8ada9598 2478
7aea43ff 2479#: builtin/apply.c:4126
81809b99 2480#, c-format
8ada9598 2481msgid "closing file '%s'"
81809b99 2482msgstr "关闭文件 '%s'"
8ada9598 2483
7aea43ff 2484#: builtin/apply.c:4175
81809b99 2485#, c-format
8ada9598 2486msgid "unable to write file '%s' mode %o"
81809b99 2487msgstr "不能写文件 '%s' 权限 %o"
8ada9598 2488
7aea43ff 2489#: builtin/apply.c:4262
8ada9598
JX
2490#, c-format
2491msgid "Applied patch %s cleanly."
81809b99 2492msgstr "成功应用补丁 %s。"
8ada9598 2493
7aea43ff 2494#: builtin/apply.c:4270
8ada9598 2495msgid "internal error"
81809b99 2496msgstr "内部错误"
8ada9598 2497
7aea43ff 2498#: builtin/apply.c:4273
8ada9598
JX
2499#, c-format
2500msgid "Applying patch %%s with %d reject..."
2501msgid_plural "Applying patch %%s with %d rejects..."
195febda
T
2502msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2503msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
8ada9598 2504
7aea43ff 2505#: builtin/apply.c:4283
8ada9598
JX
2506#, c-format
2507msgid "truncating .rej filename to %.*s.rej"
81809b99 2508msgstr "截短 .rej 文件名为 %.*s.rej"
8ada9598 2509
7aea43ff 2510#: builtin/apply.c:4304
8ada9598
JX
2511#, c-format
2512msgid "Hunk #%d applied cleanly."
81809b99 2513msgstr "第 #%d 个片段成功应用。"
8ada9598 2514
7aea43ff 2515#: builtin/apply.c:4307
8ada9598
JX
2516#, c-format
2517msgid "Rejected hunk #%d."
81809b99 2518msgstr "拒绝第 #%d 个片段。"
8ada9598 2519
7aea43ff 2520#: builtin/apply.c:4397
8ada9598 2521msgid "unrecognized input"
81809b99 2522msgstr "未能识别的输入"
8ada9598 2523
7aea43ff 2524#: builtin/apply.c:4408
8ada9598 2525msgid "unable to read index file"
81809b99 2526msgstr "无法读取索引文件"
8ada9598 2527
7aea43ff 2528#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85
814ff314 2529#: builtin/fetch.c:92
8ada9598 2530msgid "path"
81809b99 2531msgstr "路径"
8ada9598 2532
7aea43ff 2533#: builtin/apply.c:4526
8ada9598 2534msgid "don't apply changes matching the given path"
81809b99 2535msgstr "不要应用与给出路径向匹配的变更"
8ada9598 2536
7aea43ff 2537#: builtin/apply.c:4529
8ada9598 2538msgid "apply changes matching the given path"
81809b99 2539msgstr "应用与给出路径向匹配的变更"
8ada9598 2540
7aea43ff 2541#: builtin/apply.c:4531
8ada9598 2542msgid "num"
81809b99 2543msgstr "数字"
8ada9598 2544
7aea43ff 2545#: builtin/apply.c:4532
8ada9598 2546msgid "remove <num> leading slashes from traditional diff paths"
07432cef 2547msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
8ada9598 2548
7aea43ff 2549#: builtin/apply.c:4535
8ada9598 2550msgid "ignore additions made by the patch"
81809b99 2551msgstr "忽略补丁中的添加的文件"
8ada9598 2552
7aea43ff 2553#: builtin/apply.c:4537
8ada9598 2554msgid "instead of applying the patch, output diffstat for the input"
81809b99 2555msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
8ada9598 2556
7aea43ff 2557#: builtin/apply.c:4541
ef317cd5 2558msgid "show number of added and deleted lines in decimal notation"
07432cef 2559msgstr "以十进制数显示添加和删除的行数"
8ada9598 2560
7aea43ff 2561#: builtin/apply.c:4543
8ada9598 2562msgid "instead of applying the patch, output a summary for the input"
81809b99 2563msgstr "不应用补丁,而是显示输入的概要"
8ada9598 2564
7aea43ff 2565#: builtin/apply.c:4545
8ada9598 2566msgid "instead of applying the patch, see if the patch is applicable"
81809b99 2567msgstr "不应用补丁,而是查看补丁是否可应用"
8ada9598 2568
7aea43ff 2569#: builtin/apply.c:4547
8ada9598 2570msgid "make sure the patch is applicable to the current index"
81809b99 2571msgstr "确认补丁可以应用到当前索引"
8ada9598 2572
7aea43ff 2573#: builtin/apply.c:4549
8ada9598 2574msgid "apply a patch without touching the working tree"
81809b99 2575msgstr "应用补丁而不修改工作区"
8ada9598 2576
7aea43ff 2577#: builtin/apply.c:4551
814ff314
JX
2578msgid "accept a patch that touches outside the working area"
2579msgstr "接受修改工作区之外文件的补丁"
2580
7aea43ff 2581#: builtin/apply.c:4553
8ada9598 2582msgid "also apply the patch (use with --stat/--summary/--check)"
195febda 2583msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
8ada9598 2584
7aea43ff 2585#: builtin/apply.c:4555
23ff3338
JX
2586msgid "attempt three-way merge if a patch does not apply"
2587msgstr "如果一个补丁不能应用则尝试三路合并"
2588
7aea43ff 2589#: builtin/apply.c:4557
8ada9598 2590msgid "build a temporary index based on embedded index information"
81809b99 2591msgstr "创建一个临时索引基于嵌入的索引信息"
8ada9598 2592
7aea43ff 2593#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412
8ada9598 2594msgid "paths are separated with NUL character"
81809b99 2595msgstr "路径以 NUL 字符分隔"
8ada9598 2596
7aea43ff 2597#: builtin/apply.c:4562
8ada9598 2598msgid "ensure at least <n> lines of context match"
81809b99 2599msgstr "确保至少匹配 <n> 行上下文"
8ada9598 2600
7aea43ff 2601#: builtin/apply.c:4563
8ada9598 2602msgid "action"
81809b99 2603msgstr "动作"
8ada9598 2604
7aea43ff 2605#: builtin/apply.c:4564
8ada9598 2606msgid "detect new or modified lines that have whitespace errors"
81809b99 2607msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 2608
7aea43ff 2609#: builtin/apply.c:4567 builtin/apply.c:4570
8ada9598 2610msgid "ignore changes in whitespace when finding context"
81809b99 2611msgstr "查找上下文时忽略空白字符的变更"
8ada9598 2612
7aea43ff 2613#: builtin/apply.c:4573
8ada9598 2614msgid "apply the patch in reverse"
81809b99 2615msgstr "反向应用补丁"
8ada9598 2616
7aea43ff 2617#: builtin/apply.c:4575
8ada9598 2618msgid "don't expect at least one line of context"
81809b99 2619msgstr "无需至少一行上下文"
8ada9598 2620
7aea43ff 2621#: builtin/apply.c:4577
8ada9598 2622msgid "leave the rejected hunks in corresponding *.rej files"
81809b99 2623msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 2624
7aea43ff 2625#: builtin/apply.c:4579
8ada9598 2626msgid "allow overlapping hunks"
81809b99 2627msgstr "允许重叠的补丁片段"
8ada9598 2628
7aea43ff 2629#: builtin/apply.c:4582
8ada9598 2630msgid "tolerate incorrectly detected missing new-line at the end of file"
195febda 2631msgstr "允许不正确的文件末尾换行符"
c04f5ac3 2632
7aea43ff 2633#: builtin/apply.c:4585
8ada9598 2634msgid "do not trust the line counts in the hunk headers"
81809b99 2635msgstr "不信任补丁片段的头信息中的行号"
c04f5ac3 2636
7aea43ff 2637#: builtin/apply.c:4587
8ada9598 2638msgid "root"
81809b99 2639msgstr "根目录"
c04f5ac3 2640
7aea43ff 2641#: builtin/apply.c:4588
8ada9598 2642msgid "prepend <root> to all filenames"
81809b99 2643msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 2644
7aea43ff 2645#: builtin/apply.c:4610
23ff3338
JX
2646msgid "--3way outside a repository"
2647msgstr "--3way 在一个版本库之外"
2648
7aea43ff 2649#: builtin/apply.c:4618
8ada9598 2650msgid "--index outside a repository"
81809b99 2651msgstr "--index 在一个版本库之外"
c04f5ac3 2652
7aea43ff 2653#: builtin/apply.c:4621
8ada9598 2654msgid "--cached outside a repository"
81809b99 2655msgstr "--cached 在一个版本库之外"
c04f5ac3 2656
7aea43ff 2657#: builtin/apply.c:4640
81809b99 2658#, c-format
8ada9598 2659msgid "can't open patch '%s'"
81809b99 2660msgstr "不能打开补丁 '%s'"
c04f5ac3 2661
7aea43ff 2662#: builtin/apply.c:4654
c04f5ac3 2663#, c-format
8ada9598
JX
2664msgid "squelched %d whitespace error"
2665msgid_plural "squelched %d whitespace errors"
81809b99 2666msgstr[0] "抑制下仍有 %d 个空白字符误用"
5ae481e0 2667msgstr[1] "抑制下仍有 %d 个空白字符误用"
c04f5ac3 2668
7aea43ff 2669#: builtin/apply.c:4660 builtin/apply.c:4670
8ada9598
JX
2670#, c-format
2671msgid "%d line adds whitespace errors."
2672msgid_plural "%d lines add whitespace errors."
81809b99 2673msgstr[0] "%d 行有空白字符误用。"
5ae481e0 2674msgstr[1] "%d 行有空白字符误用。"
c04f5ac3
JX
2675
2676#: builtin/archive.c:17
2677#, c-format
2678msgid "could not create archive file '%s'"
90e6ef53 2679msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
2680
2681#: builtin/archive.c:20
2682msgid "could not redirect output"
195febda 2683msgstr "不能重定向输出"
c04f5ac3
JX
2684
2685#: builtin/archive.c:37
2686msgid "git archive: Remote with no URL"
90e6ef53 2687msgstr "git archive:未提供远程URL"
c04f5ac3
JX
2688
2689#: builtin/archive.c:58
2690msgid "git archive: expected ACK/NAK, got EOF"
9aafc933 2691msgstr "git archive:应为ACK/NACK,却得到EOF"
c04f5ac3 2692
1003b3a5 2693#: builtin/archive.c:61
c04f5ac3
JX
2694#, c-format
2695msgid "git archive: NACK %s"
90e6ef53 2696msgstr "git archive:NACK %s"
c04f5ac3 2697
1003b3a5 2698#: builtin/archive.c:63
c04f5ac3
JX
2699#, c-format
2700msgid "remote error: %s"
2701msgstr "远程错误:%s"
2702
1003b3a5 2703#: builtin/archive.c:64
c04f5ac3 2704msgid "git archive: protocol error"
90e6ef53 2705msgstr "git archive:协议错误"
c04f5ac3 2706
1003b3a5 2707#: builtin/archive.c:68
c04f5ac3 2708msgid "git archive: expected a flush"
195febda 2709msgstr "git archive:应为刷新"
c04f5ac3 2710
ef317cd5
JX
2711#: builtin/bisect--helper.c:7
2712msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 2713msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5
JX
2714
2715#: builtin/bisect--helper.c:17
2716msgid "perform 'git bisect next'"
07432cef 2717msgstr "执行 'git bisect next'"
ef317cd5
JX
2718
2719#: builtin/bisect--helper.c:19
2720msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 2721msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5 2722
7aea43ff
JX
2723#: builtin/blame.c:31
2724msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
2725msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
ef317cd5 2726
7aea43ff 2727#: builtin/blame.c:36
814ff314
JX
2728msgid "<rev-opts> are documented in git-rev-list(1)"
2729msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
ef317cd5 2730
814ff314 2731#: builtin/blame.c:2500
ef317cd5 2732msgid "Show blame entries as we find them, incrementally"
07432cef 2733msgstr "增量式地显示发现的 blame 条目"
ef317cd5 2734
814ff314 2735#: builtin/blame.c:2501
ef317cd5 2736msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 2737msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 2738
814ff314 2739#: builtin/blame.c:2502
ef317cd5 2740msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 2741msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 2742
814ff314 2743#: builtin/blame.c:2503
ef317cd5 2744msgid "Show work cost statistics"
07432cef 2745msgstr "显示命令消耗统计"
ef317cd5 2746
814ff314 2747#: builtin/blame.c:2504
ef317cd5 2748msgid "Show output score for blame entries"
07432cef 2749msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 2750
814ff314 2751#: builtin/blame.c:2505
ef317cd5 2752msgid "Show original filename (Default: auto)"
07432cef 2753msgstr "显示原始文件名(默认:自动)"
ef317cd5 2754
814ff314 2755#: builtin/blame.c:2506
ef317cd5 2756msgid "Show original linenumber (Default: off)"
07432cef 2757msgstr "显示原始的行号(默认:关闭)"
ef317cd5 2758
814ff314 2759#: builtin/blame.c:2507
ef317cd5 2760msgid "Show in a format designed for machine consumption"
07432cef 2761msgstr "显示为一个适合机器读取的格式"
ef317cd5 2762
814ff314 2763#: builtin/blame.c:2508
ef317cd5 2764msgid "Show porcelain format with per-line commit information"
07432cef 2765msgstr "为每一行显示机器适用的提交信息"
ef317cd5 2766
814ff314 2767#: builtin/blame.c:2509
ef317cd5 2768msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 2769msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 2770
814ff314 2771#: builtin/blame.c:2510
ef317cd5 2772msgid "Show raw timestamp (Default: off)"
07432cef 2773msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 2774
814ff314 2775#: builtin/blame.c:2511
ef317cd5 2776msgid "Show long commit SHA1 (Default: off)"
07432cef 2777msgstr "显示长的SHA1提交号(默认:关闭)"
ef317cd5 2778
814ff314 2779#: builtin/blame.c:2512
ef317cd5 2780msgid "Suppress author name and timestamp (Default: off)"
07432cef 2781msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 2782
814ff314 2783#: builtin/blame.c:2513
ef317cd5 2784msgid "Show author email instead of name (Default: off)"
07432cef 2785msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 2786
814ff314 2787#: builtin/blame.c:2514
ef317cd5 2788msgid "Ignore whitespace differences"
07432cef 2789msgstr "忽略空白差异"
ef317cd5 2790
814ff314 2791#: builtin/blame.c:2515
ef317cd5 2792msgid "Spend extra cycles to find better match"
07432cef 2793msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 2794
814ff314 2795#: builtin/blame.c:2516
ef317cd5 2796msgid "Use revisions from <file> instead of calling git-rev-list"
d9d56b23 2797msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
ef317cd5 2798
814ff314 2799#: builtin/blame.c:2517
ef317cd5 2800msgid "Use <file>'s contents as the final image"
d9d56b23 2801msgstr "使用 <文件> 的内容作为最终的图片"
ef317cd5 2802
814ff314 2803#: builtin/blame.c:2518 builtin/blame.c:2519
ef317cd5 2804msgid "score"
07432cef 2805msgstr "得分"
ef317cd5 2806
814ff314 2807#: builtin/blame.c:2518
ef317cd5 2808msgid "Find line copies within and across files"
07432cef 2809msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 2810
814ff314 2811#: builtin/blame.c:2519
ef317cd5 2812msgid "Find line movements within and across files"
07432cef 2813msgstr "找到文件内及跨文件的行移动"
ef317cd5 2814
814ff314 2815#: builtin/blame.c:2520
ef317cd5 2816msgid "n,m"
07432cef 2817msgstr "n,m"
ef317cd5 2818
814ff314 2819#: builtin/blame.c:2520
ef317cd5 2820msgid "Process only line range n,m, counting from 1"
07432cef 2821msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 2822
6c94aba5
JX
2823#. TRANSLATORS: This string is used to tell us the maximum
2824#. display width for a relative timestamp in "git blame"
2825#. output. For C locale, "4 years, 11 months ago", which
2826#. takes 22 places, is the longest among various forms of
2827#. relative timestamps, but your language may need more or
2828#. fewer display columns.
814ff314 2829#: builtin/blame.c:2601
6c94aba5
JX
2830msgid "4 years, 11 months ago"
2831msgstr "4 年 11 个月前"
2832
1003b3a5 2833#: builtin/branch.c:24
814ff314
JX
2834msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
2835msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
ef317cd5 2836
1003b3a5 2837#: builtin/branch.c:25
814ff314
JX
2838msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
2839msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 2840
1003b3a5 2841#: builtin/branch.c:26
814ff314
JX
2842msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
2843msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
ef317cd5 2844
1003b3a5 2845#: builtin/branch.c:27
814ff314
JX
2846msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
2847msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 2848
90e6ef53 2849# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
7aea43ff 2850#: builtin/branch.c:150
c04f5ac3
JX
2851#, c-format
2852msgid ""
2853"deleting branch '%s' that has been merged to\n"
2854" '%s', but not yet merged to HEAD."
2855msgstr ""
70fc47bf 2856"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
2857" '%s',但未合并到 HEAD。"
2858
90e6ef53 2859# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
7aea43ff 2860#: builtin/branch.c:154
c04f5ac3
JX
2861#, c-format
2862msgid ""
2863"not deleting branch '%s' that is not yet merged to\n"
2864" '%s', even though it is merged to HEAD."
2865msgstr ""
70fc47bf
T
2866"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2867" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 2868
7aea43ff 2869#: builtin/branch.c:168
07432cef
WS
2870#, c-format
2871msgid "Couldn't look up commit object for '%s'"
2872msgstr "无法查询 '%s' 指向的提交对象"
2873
7aea43ff 2874#: builtin/branch.c:172
07432cef
WS
2875#, c-format
2876msgid ""
2877"The branch '%s' is not fully merged.\n"
2878"If you are sure you want to delete it, run 'git branch -D %s'."
2879msgstr ""
2880"分支 '%s' 没有完全合并。\n"
2881"如果您确认要删除它,执行 'git branch -D %s'。"
2882
7aea43ff 2883#: builtin/branch.c:185
07432cef
WS
2884msgid "Update of config-file failed"
2885msgstr "无法更新 config 文件"
2886
7aea43ff 2887#: builtin/branch.c:213
c04f5ac3 2888msgid "cannot use -a with -d"
649900bc 2889msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 2890
7aea43ff 2891#: builtin/branch.c:219
c04f5ac3
JX
2892msgid "Couldn't look up commit object for HEAD"
2893msgstr "无法查询 HEAD 指向的提交对象"
2894
7aea43ff 2895#: builtin/branch.c:227
c04f5ac3
JX
2896#, c-format
2897msgid "Cannot delete the branch '%s' which you are currently on."
2898msgstr "无法删除您当前所在的分支 '%s'。"
2899
7aea43ff 2900#: builtin/branch.c:243
5ae481e0 2901#, c-format
7aea43ff
JX
2902msgid "remote-tracking branch '%s' not found."
2903msgstr "未能找到远程跟踪分支 '%s'。"
c04f5ac3 2904
7aea43ff 2905#: builtin/branch.c:244
81809b99 2906#, c-format
8ada9598 2907msgid "branch '%s' not found."
81809b99 2908msgstr "分支 '%s' 未发现。"
8ada9598 2909
7aea43ff 2910#: builtin/branch.c:258
81809b99 2911#, c-format
7aea43ff
JX
2912msgid "Error deleting remote-tracking branch '%s'"
2913msgstr "无法删除远程跟踪分支 '%s'"
c04f5ac3 2914
7aea43ff 2915#: builtin/branch.c:259
81809b99 2916#, c-format
8ada9598 2917msgid "Error deleting branch '%s'"
7aea43ff 2918msgstr "无法删除分支 '%s'"
8ada9598 2919
7aea43ff 2920#: builtin/branch.c:266
81809b99 2921#, c-format
7aea43ff
JX
2922msgid "Deleted remote-tracking branch %s (was %s).\n"
2923msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
c04f5ac3 2924
7aea43ff 2925#: builtin/branch.c:267
81809b99 2926#, c-format
8ada9598 2927msgid "Deleted branch %s (was %s).\n"
81809b99 2928msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 2929
7aea43ff 2930#: builtin/branch.c:368
c04f5ac3
JX
2931#, c-format
2932msgid "branch '%s' does not point at a commit"
2933msgstr "分支 '%s' 未指向一个提交"
2934
7aea43ff 2935#: builtin/branch.c:451
81809b99 2936#, c-format
90314792
JX
2937msgid "[%s: gone]"
2938msgstr "[%s: 丢失]"
2939
7aea43ff 2940#: builtin/branch.c:456
90314792
JX
2941#, c-format
2942msgid "[%s]"
2943msgstr "[%s]"
2944
7aea43ff 2945#: builtin/branch.c:461
90314792 2946#, c-format
8ada9598 2947msgid "[%s: behind %d]"
81809b99 2948msgstr "[%s:落后 %d]"
c04f5ac3 2949
7aea43ff 2950#: builtin/branch.c:463
81809b99 2951#, c-format
8ada9598 2952msgid "[behind %d]"
81809b99 2953msgstr "[落后 %d]"
8ada9598 2954
7aea43ff 2955#: builtin/branch.c:467
81809b99 2956#, c-format
8ada9598 2957msgid "[%s: ahead %d]"
81809b99 2958msgstr "[%s:领先 %d]"
c04f5ac3 2959
7aea43ff 2960#: builtin/branch.c:469
81809b99 2961#, c-format
8ada9598 2962msgid "[ahead %d]"
81809b99 2963msgstr "[领先 %d]"
8ada9598 2964
7aea43ff 2965#: builtin/branch.c:472
81809b99 2966#, c-format
8ada9598 2967msgid "[%s: ahead %d, behind %d]"
81809b99 2968msgstr "[%s:领先 %d,落后 %d]"
8ada9598 2969
7aea43ff 2970#: builtin/branch.c:475
81809b99 2971#, c-format
8ada9598 2972msgid "[ahead %d, behind %d]"
81809b99 2973msgstr "[领先 %d,落后 %d]"
c04f5ac3 2974
7aea43ff 2975#: builtin/branch.c:488
a77c07d9
JX
2976msgid " **** invalid ref ****"
2977msgstr " **** 无效引用 ****"
2978
7aea43ff 2979#: builtin/branch.c:579
1003b3a5
JX
2980#, c-format
2981msgid "(no branch, rebasing %s)"
2982msgstr "(非分支,正变基 %s)"
2983
7aea43ff 2984#: builtin/branch.c:582
1003b3a5
JX
2985#, c-format
2986msgid "(no branch, bisect started on %s)"
2987msgstr "(非分支,二分查找开始于 %s)"
2988
7aea43ff 2989#: builtin/branch.c:588
1003b3a5 2990#, c-format
814ff314
JX
2991msgid "(HEAD detached at %s)"
2992msgstr "(头指针分离于 %s)"
1003b3a5 2993
7aea43ff 2994#: builtin/branch.c:591
814ff314
JX
2995#, c-format
2996msgid "(HEAD detached from %s)"
2997msgstr "(头指针分离自 %s)"
2998
7aea43ff 2999#: builtin/branch.c:595
c04f5ac3
JX
3000msgid "(no branch)"
3001msgstr "(非分支)"
3002
7aea43ff 3003#: builtin/branch.c:642
a77c07d9
JX
3004#, c-format
3005msgid "object '%s' does not point to a commit"
3006msgstr "对象 '%s' 没有指向一个提交"
3007
7aea43ff 3008#: builtin/branch.c:690
c04f5ac3 3009msgid "some refs could not be read"
90e6ef53 3010msgstr "一些引用不能读取"
c04f5ac3 3011
7aea43ff 3012#: builtin/branch.c:703
c04f5ac3 3013msgid "cannot rename the current branch while not on any."
90e6ef53 3014msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 3015
7aea43ff 3016#: builtin/branch.c:713
c04f5ac3
JX
3017#, c-format
3018msgid "Invalid branch name: '%s'"
3019msgstr "无效的分支名:'%s'"
3020
7aea43ff 3021#: builtin/branch.c:728
c04f5ac3
JX
3022msgid "Branch rename failed"
3023msgstr "分支重命名失败"
3024
7aea43ff 3025#: builtin/branch.c:732
c04f5ac3
JX
3026#, c-format
3027msgid "Renamed a misnamed branch '%s' away"
3028msgstr "重命名掉一个错误命名的旧分支 '%s'"
3029
7aea43ff 3030#: builtin/branch.c:736
c04f5ac3
JX
3031#, c-format
3032msgid "Branch renamed to %s, but HEAD is not updated!"
3033msgstr "分支重命名为 %s,但 HEAD 没有更新!"
3034
7aea43ff 3035#: builtin/branch.c:743
c04f5ac3
JX
3036msgid "Branch is renamed, but update of config-file failed"
3037msgstr "分支被重命名,但更新 config 文件失败"
3038
7aea43ff 3039#: builtin/branch.c:758
c04f5ac3
JX
3040#, c-format
3041msgid "malformed object name %s"
3042msgstr "非法的对象名 %s"
3043
7aea43ff 3044#: builtin/branch.c:780
81809b99 3045#, c-format
8ada9598 3046msgid "could not write branch description template: %s"
81809b99 3047msgstr "不能写分支描述模版:%s"
c04f5ac3 3048
7aea43ff 3049#: builtin/branch.c:810
ef317cd5 3050msgid "Generic options"
07432cef 3051msgstr "通用选项"
c04f5ac3 3052
7aea43ff 3053#: builtin/branch.c:812
ef317cd5 3054msgid "show hash and subject, give twice for upstream branch"
07432cef 3055msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 3056
7aea43ff 3057#: builtin/branch.c:813
ef317cd5 3058msgid "suppress informational messages"
07432cef 3059msgstr "不显示信息"
8ada9598 3060
7aea43ff 3061#: builtin/branch.c:814
ef317cd5 3062msgid "set up tracking mode (see git-pull(1))"
07432cef 3063msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 3064
7aea43ff 3065#: builtin/branch.c:816
ef317cd5 3066msgid "change upstream info"
07432cef 3067msgstr "改变上游信息"
c04f5ac3 3068
7aea43ff 3069#: builtin/branch.c:820
ef317cd5 3070msgid "use colored output"
07432cef 3071msgstr "使用彩色输出"
c04f5ac3 3072
7aea43ff 3073#: builtin/branch.c:821
ef317cd5 3074msgid "act on remote-tracking branches"
07432cef 3075msgstr "作用于远程跟踪分支"
c04f5ac3 3076
7aea43ff
JX
3077#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851
3078#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582
3079#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616
220c313c 3080#: builtin/tag.c:622
ef317cd5 3081msgid "commit"
07432cef 3082msgstr "提交"
c04f5ac3 3083
7aea43ff 3084#: builtin/branch.c:825 builtin/branch.c:831
ef317cd5 3085msgid "print only branches that contain the commit"
07432cef 3086msgstr "只打印包含该提交的分支"
c04f5ac3 3087
7aea43ff 3088#: builtin/branch.c:837
ef317cd5 3089msgid "Specific git-branch actions:"
07432cef 3090msgstr "具体的 git-branch 动作:"
c04f5ac3 3091
7aea43ff 3092#: builtin/branch.c:838
ef317cd5 3093msgid "list both remote-tracking and local branches"
07432cef 3094msgstr "列出远程跟踪及本地分支"
c04f5ac3 3095
7aea43ff 3096#: builtin/branch.c:840
ef317cd5 3097msgid "delete fully merged branch"
07432cef 3098msgstr "删除完全合并的分支"
c04f5ac3 3099
7aea43ff 3100#: builtin/branch.c:841
ef317cd5 3101msgid "delete branch (even if not merged)"
07432cef 3102msgstr "删除分支(即使没有合并)"
c04f5ac3 3103
7aea43ff 3104#: builtin/branch.c:842
ef317cd5 3105msgid "move/rename a branch and its reflog"
07432cef 3106msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 3107
7aea43ff 3108#: builtin/branch.c:843
ef317cd5 3109msgid "move/rename a branch, even if target exists"
07432cef 3110msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 3111
7aea43ff 3112#: builtin/branch.c:844
ef317cd5 3113msgid "list branch names"
07432cef 3114msgstr "列出分支名"
c04f5ac3 3115
7aea43ff 3116#: builtin/branch.c:845
ef317cd5 3117msgid "create the branch's reflog"
07432cef 3118msgstr "创建分支的引用日志"
ef317cd5 3119
7aea43ff 3120#: builtin/branch.c:847
ef317cd5 3121msgid "edit the description for the branch"
07432cef 3122msgstr "标记分支的描述"
ef317cd5 3123
7aea43ff 3124#: builtin/branch.c:848
04cb2f28
JX
3125msgid "force creation, move/rename, deletion"
3126msgstr "强制创建、移动/重命名、删除"
ef317cd5 3127
7aea43ff 3128#: builtin/branch.c:851
ef317cd5 3129msgid "print only not merged branches"
07432cef 3130msgstr "只打印没有合并的分支"
ef317cd5 3131
7aea43ff 3132#: builtin/branch.c:857
ef317cd5 3133msgid "print only merged branches"
07432cef 3134msgstr "只打印合并的分支"
ef317cd5 3135
7aea43ff 3136#: builtin/branch.c:861
ef317cd5 3137msgid "list branches in columns"
07432cef 3138msgstr "以列的方式显示分支"
ef317cd5 3139
7aea43ff 3140#: builtin/branch.c:874
c04f5ac3
JX
3141msgid "Failed to resolve HEAD as a valid ref."
3142msgstr "无法将 HEAD 解析为有效引用。"
3143
7aea43ff 3144#: builtin/branch.c:878 builtin/clone.c:629
c04f5ac3 3145msgid "HEAD not found below refs/heads!"
90e6ef53 3146msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 3147
7aea43ff 3148#: builtin/branch.c:900
8ada9598 3149msgid "--column and --verbose are incompatible"
81809b99 3150msgstr "--column 和 --verbose 不兼容"
8ada9598 3151
7aea43ff 3152#: builtin/branch.c:911 builtin/branch.c:950
a77c07d9
JX
3153msgid "branch name required"
3154msgstr "必须提供分支名"
3155
7aea43ff 3156#: builtin/branch.c:926
a77c07d9
JX
3157msgid "Cannot give description to detached HEAD"
3158msgstr "不能向分离头指针提供描述"
3159
7aea43ff 3160#: builtin/branch.c:931
a77c07d9
JX
3161msgid "cannot edit description of more than one branch"
3162msgstr "不能为一个以上的分支编辑描述"
3163
7aea43ff 3164#: builtin/branch.c:938
a77c07d9
JX
3165#, c-format
3166msgid "No commit on branch '%s' yet."
3167msgstr "分支 '%s' 尚无提交。"
3168
7aea43ff 3169#: builtin/branch.c:941
a77c07d9
JX
3170#, c-format
3171msgid "No branch named '%s'."
3172msgstr "没有分支 '%s'。"
3173
7aea43ff 3174#: builtin/branch.c:956
a77c07d9
JX
3175msgid "too many branches for a rename operation"
3176msgstr "为重命名操作提供了太多的分支名"
3177
7aea43ff 3178#: builtin/branch.c:961
1003b3a5
JX
3179msgid "too many branches to set new upstream"
3180msgstr "为设置新上游提供了太多的分支名"
3181
7aea43ff 3182#: builtin/branch.c:965
1003b3a5
JX
3183#, c-format
3184msgid ""
3185"could not set upstream of HEAD to %s when it does not point to any branch."
3186msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3187
7aea43ff 3188#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011
1003b3a5
JX
3189#, c-format
3190msgid "no such branch '%s'"
3191msgstr "没有此分支 '%s'"
3192
7aea43ff 3193#: builtin/branch.c:972
07432cef 3194#, c-format
ef317cd5 3195msgid "branch '%s' does not exist"
07432cef 3196msgstr "分支 '%s' 不存在"
ef317cd5 3197
7aea43ff 3198#: builtin/branch.c:984
1003b3a5
JX
3199msgid "too many branches to unset upstream"
3200msgstr "为取消上游设置操作提供了太多的分支名"
3201
7aea43ff 3202#: builtin/branch.c:988
1003b3a5
JX
3203msgid "could not unset upstream of HEAD when it does not point to any branch."
3204msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3205
7aea43ff 3206#: builtin/branch.c:994
ef317cd5
JX
3207#, c-format
3208msgid "Branch '%s' has no upstream information"
07432cef 3209msgstr "分支 '%s' 没有上游信息"
ef317cd5 3210
7aea43ff 3211#: builtin/branch.c:1008
1003b3a5
JX
3212msgid "it does not make sense to create 'HEAD' manually"
3213msgstr "手工创建 'HEAD' 没有意义"
3214
7aea43ff 3215#: builtin/branch.c:1014
c04f5ac3
JX
3216msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3217msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3218
7aea43ff 3219#: builtin/branch.c:1017
ef317cd5
JX
3220#, c-format
3221msgid ""
3222"The --set-upstream flag is deprecated and will be removed. Consider using --"
3223"track or --set-upstream-to\n"
3224msgstr ""
07432cef 3225"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
ef317cd5 3226
7aea43ff 3227#: builtin/branch.c:1034
ef317cd5
JX
3228#, c-format
3229msgid ""
3230"\n"
3231"If you wanted to make '%s' track '%s', do this:\n"
3232"\n"
3233msgstr ""
07432cef
WS
3234"\n"
3235"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3236"\n"
ef317cd5 3237
7aea43ff 3238#: builtin/branch.c:1035
07432cef 3239#, c-format
ef317cd5 3240msgid " git branch -d %s\n"
07432cef 3241msgstr " git branch -d %s\n"
ef317cd5 3242
7aea43ff 3243#: builtin/branch.c:1036
ef317cd5
JX
3244#, c-format
3245msgid " git branch --set-upstream-to %s\n"
07432cef 3246msgstr " git branch --set-upstream-to %s\n"
ef317cd5 3247
7aea43ff 3248#: builtin/bundle.c:51
c04f5ac3
JX
3249#, c-format
3250msgid "%s is okay\n"
3251msgstr "%s 可以\n"
3252
7aea43ff 3253#: builtin/bundle.c:64
c04f5ac3 3254msgid "Need a repository to create a bundle."
90e6ef53 3255msgstr "需要一个版本库来创建包。"
c04f5ac3 3256
7aea43ff 3257#: builtin/bundle.c:68
c04f5ac3 3258msgid "Need a repository to unbundle."
90e6ef53 3259msgstr "需要一个版本库来解包。"
c04f5ac3 3260
7aea43ff
JX
3261#: builtin/cat-file.c:369
3262msgid ""
3263"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"
3264"<type>|--textconv) <object>"
3265msgstr ""
3266"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型"
3267">|--textconv) <对象>"
ef317cd5 3268
7aea43ff
JX
3269#: builtin/cat-file.c:370
3270msgid ""
3271"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"
3272"objects>"
3273msgstr ""
3274"git cat-file (--batch | --batch-check) [--follow-symlinks] < <对象列表>"
ef317cd5 3275
7aea43ff 3276#: builtin/cat-file.c:407
ef317cd5 3277msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 3278msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 3279
7aea43ff 3280#: builtin/cat-file.c:408
ef317cd5 3281msgid "show object type"
07432cef 3282msgstr "显示对象类型"
ef317cd5 3283
7aea43ff 3284#: builtin/cat-file.c:409
ef317cd5 3285msgid "show object size"
07432cef 3286msgstr "显示对象大小"
ef317cd5 3287
7aea43ff 3288#: builtin/cat-file.c:411
ef317cd5 3289msgid "exit with zero when there's no error"
07432cef 3290msgstr "当没有错误时退出并返回零"
ef317cd5 3291
7aea43ff 3292#: builtin/cat-file.c:412
ef317cd5 3293msgid "pretty-print object's content"
07432cef 3294msgstr "美观地打印对象的内容"
ef317cd5 3295
7aea43ff 3296#: builtin/cat-file.c:414
ef317cd5 3297msgid "for blob objects, run textconv on object's content"
07432cef 3298msgstr "对于数据(blob)对象,对其内容执行 textconv"
ef317cd5 3299
7aea43ff
JX
3300#: builtin/cat-file.c:416
3301msgid "allow -s and -t to work with broken/corrupt objects"
3302msgstr "允许 -s 和 -t 对损坏的对象生效"
3303
3304#: builtin/cat-file.c:418
ef317cd5 3305msgid "show info and content of objects fed from the standard input"
07432cef 3306msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 3307
7aea43ff 3308#: builtin/cat-file.c:421
ef317cd5 3309msgid "show info about objects fed from the standard input"
07432cef 3310msgstr "显示从标准输入提供的对象的信息"
ef317cd5 3311
7aea43ff
JX
3312#: builtin/cat-file.c:424
3313msgid "follow in-tree symlinks (used with --batch or --batch-check)"
3314msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
3315
ef317cd5 3316#: builtin/check-attr.c:11
814ff314
JX
3317msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3318msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
ef317cd5
JX
3319
3320#: builtin/check-attr.c:12
814ff314
JX
3321msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
3322msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>"
ef317cd5
JX
3323
3324#: builtin/check-attr.c:19
3325msgid "report all attributes set on file"
07432cef 3326msgstr "报告设置在文件上的所有属性"
ef317cd5
JX
3327
3328#: builtin/check-attr.c:20
3329msgid "use .gitattributes only from the index"
07432cef 3330msgstr "只使用索引中的 .gitattributes"
ef317cd5 3331
7aea43ff 3332#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96
ef317cd5 3333msgid "read file names from stdin"
07432cef 3334msgstr "从标准输入读出文件名"
ef317cd5 3335
a77c07d9 3336#: builtin/check-attr.c:23 builtin/check-ignore.c:24
90314792
JX
3337msgid "terminate input and output records by a NUL character"
3338msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 3339
7aea43ff 3340#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279
a77c07d9
JX
3341msgid "suppress progress reporting"
3342msgstr "不显示进度报告"
3343
2e8451e8
JX
3344#: builtin/check-ignore.c:26
3345msgid "show non-matching input paths"
3346msgstr "显示未匹配的输入路径"
3347
90314792
JX
3348#: builtin/check-ignore.c:28
3349msgid "ignore index when checking"
3350msgstr "检查时忽略索引"
3351
3352#: builtin/check-ignore.c:154
a77c07d9
JX
3353msgid "cannot specify pathnames with --stdin"
3354msgstr "不能同时提供路径及 --stdin 参数"
3355
90314792 3356#: builtin/check-ignore.c:157
a77c07d9
JX
3357msgid "-z only makes sense with --stdin"
3358msgstr "-z 需要和 --stdin 参数共用才有意义"
3359
90314792 3360#: builtin/check-ignore.c:159
a77c07d9
JX
3361msgid "no path specified"
3362msgstr "未指定路径"
3363
90314792 3364#: builtin/check-ignore.c:163
a77c07d9
JX
3365msgid "--quiet is only valid with a single pathname"
3366msgstr "参数 --quiet 只在提供一个路径名时有效"
3367
90314792 3368#: builtin/check-ignore.c:165
a77c07d9
JX
3369msgid "cannot have both --quiet and --verbose"
3370msgstr "不能同时提供 --quiet 和 --verbose 参数"
3371
90314792 3372#: builtin/check-ignore.c:168
2e8451e8
JX
3373msgid "--non-matching is only valid with --verbose"
3374msgstr "--non-matching 选项只在使用 --verbose 时有效"
3375
3376#: builtin/check-mailmap.c:8
814ff314
JX
3377msgid "git check-mailmap [<options>] <contact>..."
3378msgstr "git check-mailmap [<选项>] <联系地址>..."
2e8451e8
JX
3379
3380#: builtin/check-mailmap.c:13
3381msgid "also read contacts from stdin"
3382msgstr "还从标准输入读取联系地址"
3383
3384#: builtin/check-mailmap.c:24
3385#, c-format
3386msgid "unable to parse contact: %s"
3387msgstr "不能解析联系地址:%s"
3388
3389#: builtin/check-mailmap.c:47
3390msgid "no contacts specified"
3391msgstr "未指定联系地址"
3392
ef317cd5 3393#: builtin/checkout-index.c:126
814ff314
JX
3394msgid "git checkout-index [<options>] [--] [<file>...]"
3395msgstr "git checkout-index [<选项>] [--] [<文件>...]"
ef317cd5 3396
6acbf033 3397#: builtin/checkout-index.c:188
ef317cd5 3398msgid "check out all files in the index"
07432cef 3399msgstr "检出索引区的所有文件"
ef317cd5 3400
6acbf033 3401#: builtin/checkout-index.c:189
ef317cd5 3402msgid "force overwrite of existing files"
07432cef 3403msgstr "强制覆盖现有的文件"
ef317cd5 3404
6acbf033 3405#: builtin/checkout-index.c:191
ef317cd5 3406msgid "no warning for existing files and files not in index"
07432cef 3407msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 3408
6acbf033 3409#: builtin/checkout-index.c:193
ef317cd5 3410msgid "don't checkout new files"
07432cef 3411msgstr "不检出新文件"
ef317cd5 3412
6acbf033 3413#: builtin/checkout-index.c:195
ef317cd5 3414msgid "update stat information in the index file"
07432cef 3415msgstr "更新索引中文件的状态信息"
ef317cd5 3416
6acbf033 3417#: builtin/checkout-index.c:201
ef317cd5 3418msgid "read list of paths from the standard input"
07432cef 3419msgstr "从标准输入读取路径列表"
ef317cd5 3420
6acbf033 3421#: builtin/checkout-index.c:203
ef317cd5 3422msgid "write the content to temporary files"
07432cef 3423msgstr "将内容写入临时文件"
ef317cd5 3424
6acbf033 3425#: builtin/checkout-index.c:204 builtin/column.c:30
ef317cd5 3426msgid "string"
07432cef 3427msgstr "字符串"
ef317cd5 3428
6acbf033 3429#: builtin/checkout-index.c:205
ef317cd5 3430msgid "when creating files, prepend <string>"
07432cef 3431msgstr "在创建文件时,在前面加上<字符串>"
ef317cd5 3432
6acbf033 3433#: builtin/checkout-index.c:208
ef317cd5 3434msgid "copy out the files from named stage"
07432cef 3435msgstr "从指定暂存区中拷出文件"
ef317cd5 3436
7aea43ff 3437#: builtin/checkout.c:26
814ff314
JX
3438msgid "git checkout [<options>] <branch>"
3439msgstr "git checkout [<选项>] <分支>"
ef317cd5 3440
7aea43ff 3441#: builtin/checkout.c:27
814ff314
JX
3442msgid "git checkout [<options>] [<branch>] -- <file>..."
3443msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
ef317cd5 3444
7aea43ff 3445#: builtin/checkout.c:138 builtin/checkout.c:171
c04f5ac3
JX
3446#, c-format
3447msgid "path '%s' does not have our version"
3448msgstr "路径 '%s' 没有我们的版本"
3449
7aea43ff 3450#: builtin/checkout.c:140 builtin/checkout.c:173
c04f5ac3
JX
3451#, c-format
3452msgid "path '%s' does not have their version"
3453msgstr "路径 '%s' 没有他们的版本"
3454
7aea43ff 3455#: builtin/checkout.c:156
c04f5ac3
JX
3456#, c-format
3457msgid "path '%s' does not have all necessary versions"
3458msgstr "路径 '%s' 没有全部必须的版本"
3459
7aea43ff 3460#: builtin/checkout.c:200
c04f5ac3
JX
3461#, c-format
3462msgid "path '%s' does not have necessary versions"
3463msgstr "路径 '%s' 没有必须的版本"
3464
7aea43ff 3465#: builtin/checkout.c:217
c04f5ac3
JX
3466#, c-format
3467msgid "path '%s': cannot merge"
90e6ef53 3468msgstr "path '%s':无法合并"
c04f5ac3 3469
7aea43ff 3470#: builtin/checkout.c:234
c04f5ac3
JX
3471#, c-format
3472msgid "Unable to add merge result for '%s'"
3473msgstr "无法为 '%s' 添加合并结果"
3474
7aea43ff
JX
3475#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261
3476#: builtin/checkout.c:264 builtin/checkout.c:277
07432cef 3477#, c-format
ef317cd5 3478msgid "'%s' cannot be used with updating paths"
07432cef 3479msgstr "'%s' 不能在更新路径时使用"
ef317cd5 3480
7aea43ff 3481#: builtin/checkout.c:267 builtin/checkout.c:270
07432cef 3482#, c-format
ef317cd5 3483msgid "'%s' cannot be used with %s"
07432cef 3484msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 3485
7aea43ff 3486#: builtin/checkout.c:273
ef317cd5
JX
3487#, c-format
3488msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 3489msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 3490
7aea43ff 3491#: builtin/checkout.c:287 builtin/checkout.c:481
c04f5ac3 3492msgid "corrupt index file"
90e6ef53 3493msgstr "损坏的索引文件"
c04f5ac3 3494
7aea43ff 3495#: builtin/checkout.c:347 builtin/checkout.c:354
c04f5ac3
JX
3496#, c-format
3497msgid "path '%s' is unmerged"
3498msgstr "路径 '%s' 未合并"
3499
7aea43ff 3500#: builtin/checkout.c:503
c04f5ac3 3501msgid "you need to resolve your current index first"
90e6ef53 3502msgstr "您需要先解决当前索引的冲突"
c04f5ac3 3503
7aea43ff 3504#: builtin/checkout.c:634
c04f5ac3
JX
3505#, c-format
3506msgid "Can not do reflog for '%s'\n"
90e6ef53 3507msgstr "不能对 '%s' 执行 reflog 操作\n"
c04f5ac3 3508
7aea43ff 3509#: builtin/checkout.c:670
c04f5ac3
JX
3510msgid "HEAD is now at"
3511msgstr "HEAD 目前位于"
3512
7aea43ff 3513#: builtin/checkout.c:677
c04f5ac3
JX
3514#, c-format
3515msgid "Reset branch '%s'\n"
3516msgstr "重置分支 '%s'\n"
3517
7aea43ff 3518#: builtin/checkout.c:680
c04f5ac3
JX
3519#, c-format
3520msgid "Already on '%s'\n"
3521msgstr "已经位于 '%s'\n"
3522
7aea43ff 3523#: builtin/checkout.c:684
c04f5ac3
JX
3524#, c-format
3525msgid "Switched to and reset branch '%s'\n"
3526msgstr "切换并重置分支 '%s'\n"
3527
7aea43ff 3528#: builtin/checkout.c:686 builtin/checkout.c:1285
c04f5ac3
JX
3529#, c-format
3530msgid "Switched to a new branch '%s'\n"
3531msgstr "切换到一个新分支 '%s'\n"
3532
7aea43ff 3533#: builtin/checkout.c:688
c04f5ac3
JX
3534#, c-format
3535msgid "Switched to branch '%s'\n"
3536msgstr "切换到分支 '%s'\n"
3537
90e6ef53 3538# 译者:注意保持前导空格
7aea43ff 3539#: builtin/checkout.c:740
c04f5ac3
JX
3540#, c-format
3541msgid " ... and %d more.\n"
90e6ef53 3542msgstr " ... 及其它 %d 个。\n"
c04f5ac3 3543
7aea43ff 3544#: builtin/checkout.c:746
c04f5ac3
JX
3545#, c-format
3546msgid ""
3547"Warning: you are leaving %d commit behind, not connected to\n"
3548"any of your branches:\n"
3549"\n"
3550"%s\n"
3551msgid_plural ""
3552"Warning: you are leaving %d commits behind, not connected to\n"
3553"any of your branches:\n"
3554"\n"
3555"%s\n"
3556msgstr[0] ""
3557"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3558"\n"
3559"%s\n"
5ae481e0
JX
3560msgstr[1] ""
3561"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3562"\n"
3563"%s\n"
c04f5ac3 3564
7aea43ff 3565#: builtin/checkout.c:765
c04f5ac3
JX
3566#, c-format
3567msgid ""
7aea43ff
JX
3568"If you want to keep it by creating a new branch, this may be a good time\n"
3569"to do so with:\n"
3570"\n"
3571" git branch <new-branch-name> %s\n"
3572"\n"
3573msgid_plural ""
c04f5ac3
JX
3574"If you want to keep them by creating a new branch, this may be a good time\n"
3575"to do so with:\n"
3576"\n"
814ff314 3577" git branch <new-branch-name> %s\n"
c04f5ac3 3578"\n"
7aea43ff
JX
3579msgstr[0] ""
3580"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
3581"如下操作:\n"
3582"\n"
3583" git branch <新分支名> %s\n"
3584"\n"
3585msgstr[1] ""
3586"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
c04f5ac3
JX
3587"如下操作:\n"
3588"\n"
814ff314 3589" git branch <新分支名> %s\n"
c04f5ac3
JX
3590"\n"
3591
7aea43ff 3592#: builtin/checkout.c:801
c04f5ac3
JX
3593msgid "internal error in revision walk"
3594msgstr "在版本遍历时遇到内部错误"
3595
7aea43ff 3596#: builtin/checkout.c:805
c04f5ac3
JX
3597msgid "Previous HEAD position was"
3598msgstr "之前的 HEAD 位置是"
3599
7aea43ff 3600#: builtin/checkout.c:832 builtin/checkout.c:1280
c04f5ac3 3601msgid "You are on a branch yet to be born"
90e6ef53 3602msgstr "您位于一个尚未初始化的分支"
c04f5ac3 3603
7aea43ff
JX
3604#: builtin/checkout.c:893
3605msgid "no branch specified"
3606msgstr "未指定分支名"
3607
3608#: builtin/checkout.c:895
3609#, c-format
3610msgid "'%s' already exists"
3611msgstr "'%s' 已经存在"
3612
3613#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842
3614#: builtin/clone.c:853
3615#, c-format
3616msgid "could not create leading directories of '%s'"
3617msgstr "不能为 '%s' 创建先导目录"
3618
3619#: builtin/checkout.c:924
3620#, c-format
3621msgid "could not create directory of '%s'"
3622msgstr "不能创建目录 '%s'"
3623
3624#: builtin/checkout.c:960
3625#, c-format
3626msgid "Enter %s (identifier %s)"
3627msgstr "输入 %s (标识符 %s)"
3628
3629#: builtin/checkout.c:1070
3630#, c-format
3631msgid "'%s' is already checked out at '%s'"
3632msgstr "'%s' 已经检出到 '%s'"
3633
3634#: builtin/checkout.c:1176
90314792
JX
3635#, c-format
3636msgid "only one reference expected, %d given."
3637msgstr "只要一个引用,却给出了 %d 个"
3638
7aea43ff 3639#: builtin/checkout.c:1215
c04f5ac3
JX
3640#, c-format
3641msgid "invalid reference: %s"
3642msgstr "无效引用:%s"
3643
7aea43ff 3644#: builtin/checkout.c:1255
c04f5ac3
JX
3645#, c-format
3646msgid "reference is not a tree: %s"
3647msgstr "引用不是一个树:%s"
3648
7aea43ff 3649#: builtin/checkout.c:1294
ef317cd5 3650msgid "paths cannot be used with switching branches"
07432cef 3651msgstr "路径不能和切换分支同时使用"
c04f5ac3 3652
7aea43ff 3653#: builtin/checkout.c:1297 builtin/checkout.c:1301
07432cef 3654#, c-format
ef317cd5 3655msgid "'%s' cannot be used with switching branches"
07432cef 3656msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 3657
7aea43ff
JX
3658#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313
3659#: builtin/checkout.c:1316
07432cef 3660#, c-format
ef317cd5 3661msgid "'%s' cannot be used with '%s'"
07432cef 3662msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 3663
7aea43ff 3664#: builtin/checkout.c:1321
07432cef 3665#, c-format
ef317cd5 3666msgid "Cannot switch branch to a non-commit '%s'"
07432cef 3667msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 3668
7aea43ff 3669#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83
cfff71a9 3670#: builtin/remote.c:159 builtin/remote.c:161
ef317cd5 3671msgid "branch"
07432cef 3672msgstr "分支"
c04f5ac3 3673
7aea43ff 3674#: builtin/checkout.c:1347
ef317cd5 3675msgid "create and checkout a new branch"
07432cef 3676msgstr "创建并检出一个新的分支"
c04f5ac3 3677
7aea43ff 3678#: builtin/checkout.c:1349
ef317cd5 3679msgid "create/reset and checkout a branch"
07432cef 3680msgstr "创建/重置并检出一个分支"
c04f5ac3 3681
7aea43ff 3682#: builtin/checkout.c:1350
ef317cd5 3683msgid "create reflog for new branch"
07432cef 3684msgstr "为新的分支创建引用日志"
ef317cd5 3685
7aea43ff 3686#: builtin/checkout.c:1351
ef317cd5 3687msgid "detach the HEAD at named commit"
07432cef 3688msgstr "成为指向该提交的分离头指针"
ef317cd5 3689
7aea43ff 3690#: builtin/checkout.c:1352
ef317cd5 3691msgid "set upstream info for new branch"
07432cef 3692msgstr "为新的分支设置上游信息"
ef317cd5 3693
7aea43ff 3694#: builtin/checkout.c:1354
6c94aba5 3695msgid "new-branch"
07432cef 3696msgstr "新分支"
ef317cd5 3697
7aea43ff 3698#: builtin/checkout.c:1354
ef317cd5 3699msgid "new unparented branch"
07432cef 3700msgstr "新的没有父提交的分支"
ef317cd5 3701
7aea43ff 3702#: builtin/checkout.c:1355
ef317cd5 3703msgid "checkout our version for unmerged files"
07432cef 3704msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 3705
7aea43ff 3706#: builtin/checkout.c:1357
ef317cd5 3707msgid "checkout their version for unmerged files"
07432cef 3708msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 3709
7aea43ff 3710#: builtin/checkout.c:1359
ef317cd5 3711msgid "force checkout (throw away local modifications)"
07432cef 3712msgstr "强制检出(丢弃本地修改)"
c04f5ac3 3713
7aea43ff 3714#: builtin/checkout.c:1360
ef317cd5 3715msgid "perform a 3-way merge with the new branch"
07432cef 3716msgstr "和新的分支执行三路合并"
ef317cd5 3717
7aea43ff 3718#: builtin/checkout.c:1361 builtin/merge.c:227
ef317cd5 3719msgid "update ignored files (default)"
07432cef 3720msgstr "更新忽略的文件(默认)"
c04f5ac3 3721
7aea43ff 3722#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244
ef317cd5 3723msgid "style"
07432cef 3724msgstr "风格"
ef317cd5 3725
7aea43ff 3726#: builtin/checkout.c:1363
ef317cd5 3727msgid "conflict style (merge or diff3)"
07432cef 3728msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 3729
7aea43ff 3730#: builtin/checkout.c:1366
4dcdc3d8
JX
3731msgid "do not limit pathspecs to sparse entries only"
3732msgstr "对路径不做稀疏检出的限制"
3733
7aea43ff 3734#: builtin/checkout.c:1368
814ff314
JX
3735msgid "second guess 'git checkout <no-such-branch>'"
3736msgstr "二次猜测'git checkout <无此分支>'"
ef317cd5 3737
7aea43ff
JX
3738#: builtin/checkout.c:1370
3739msgid "check a branch out in a separate working directory"
3740msgstr "检出一个分支到单独的工作目录"
3741
3742#: builtin/checkout.c:1372
3743msgid "do not check if another worktree is holding the given ref"
3744msgstr "不检查指定的引用是否被其他工作区所占用"
3745
3746#: builtin/checkout.c:1406
ef317cd5 3747msgid "-b, -B and --orphan are mutually exclusive"
07432cef 3748msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 3749
7aea43ff 3750#: builtin/checkout.c:1423
ef317cd5
JX
3751msgid "--track needs a branch name"
3752msgstr "--track 需要一个分支名"
3753
7aea43ff 3754#: builtin/checkout.c:1428
ef317cd5
JX
3755msgid "Missing branch name; try -b"
3756msgstr "缺少分支名;尝试 -b"
3757
7aea43ff 3758#: builtin/checkout.c:1464
c04f5ac3 3759msgid "invalid path specification"
90e6ef53 3760msgstr "无效的路径规格"
c04f5ac3 3761
7aea43ff 3762#: builtin/checkout.c:1471
07432cef 3763#, c-format
c04f5ac3 3764msgid ""
ef317cd5 3765"Cannot update paths and switch to branch '%s' at the same time.\n"
c04f5ac3
JX
3766"Did you intend to checkout '%s' which can not be resolved as commit?"
3767msgstr ""
07432cef
WS
3768"不能同时更新路径并切换到分支'%s'。\n"
3769"您是想要检出 '%s' 但其未能解析为提交么?"
c04f5ac3 3770
7aea43ff 3771#: builtin/checkout.c:1476
07432cef 3772#, c-format
ef317cd5 3773msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 3774msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 3775
7aea43ff 3776#: builtin/checkout.c:1480
c04f5ac3
JX
3777msgid ""
3778"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3779"checking out of the index."
3780msgstr ""
90e6ef53 3781"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 3782
90314792 3783#: builtin/clean.c:26
2e8451e8
JX
3784msgid ""
3785"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3786msgstr ""
3787"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 3788
90314792 3789#: builtin/clean.c:30
07432cef
WS
3790#, c-format
3791msgid "Removing %s\n"
3792msgstr "正删除 %s\n"
3793
90314792 3794#: builtin/clean.c:31
07432cef
WS
3795#, c-format
3796msgid "Would remove %s\n"
3797msgstr "将删除 %s\n"
3798
90314792 3799#: builtin/clean.c:32
07432cef
WS
3800#, c-format
3801msgid "Skipping repository %s\n"
3802msgstr "忽略版本库 %s\n"
3803
90314792 3804#: builtin/clean.c:33
07432cef
WS
3805#, c-format
3806msgid "Would skip repository %s\n"
3807msgstr "将忽略版本库 %s\n"
3808
90314792 3809#: builtin/clean.c:34
07432cef
WS
3810#, c-format
3811msgid "failed to remove %s"
3812msgstr "无法删除 %s"
3813
6c94aba5 3814#: builtin/clean.c:295
2e8451e8
JX
3815msgid ""
3816"Prompt help:\n"
3817"1 - select a numbered item\n"
3818"foo - select item based on unique prefix\n"
3819" - (empty) select nothing"
3820msgstr ""
3821"帮助:\n"
3822"1 - 通过编号选择一个选项\n"
3823"foo - 通过标题选择一个选项\n"
3824" - (空)什么也不选择"
3825
6c94aba5 3826#: builtin/clean.c:299
2e8451e8
JX
3827msgid ""
3828"Prompt help:\n"
3829"1 - select a single item\n"
3830"3-5 - select a range of items\n"
3831"2-3,6-9 - select multiple ranges\n"
3832"foo - select item based on unique prefix\n"
3833"-... - unselect specified items\n"
3834"* - choose all items\n"
3835" - (empty) finish selecting"
3836msgstr ""
3837"帮助:\n"
3838"1 - 选择一个选项\n"
3839"3-5 - 选择一个范围内的所有选项\n"
3840"2-3,6-9 - 选择多个范围内的所有选项\n"
3841"foo - 通过标题选择一个选项\n"
3842"-... - 反选特定的选项\n"
3843"* - 选择所有选项\n"
3844" - (空)结束选择"
3845
7aea43ff 3846#: builtin/clean.c:515
2e8451e8
JX
3847#, c-format
3848msgid "Huh (%s)?"
3849msgstr "嗯(%s)?"
3850
7aea43ff 3851#: builtin/clean.c:657
2e8451e8
JX
3852#, c-format
3853msgid "Input ignore patterns>> "
3854msgstr "输入模版以排除条目>> "
3855
7aea43ff 3856#: builtin/clean.c:694
2e8451e8
JX
3857#, c-format
3858msgid "WARNING: Cannot find items matched by: %s"
3859msgstr "警告:无法找到和 %s 匹配的条目"
3860
7aea43ff 3861#: builtin/clean.c:715
2e8451e8
JX
3862msgid "Select items to delete"
3863msgstr "选择要删除的条目"
3864
814ff314 3865#. TRANSLATORS: Make sure to keep [y/N] as is
7aea43ff 3866#: builtin/clean.c:756
2e8451e8 3867#, c-format
814ff314
JX
3868msgid "Remove %s [y/N]? "
3869msgstr "删除 %s [y/N]?"
2e8451e8 3870
7aea43ff 3871#: builtin/clean.c:781
2e8451e8
JX
3872msgid "Bye."
3873msgstr "再见。"
3874
7aea43ff 3875#: builtin/clean.c:789
2e8451e8
JX
3876msgid ""
3877"clean - start cleaning\n"
3878"filter by pattern - exclude items from deletion\n"
3879"select by numbers - select items to be deleted by numbers\n"
3880"ask each - confirm each deletion (like \"rm -i\")\n"
3881"quit - stop cleaning\n"
3882"help - this screen\n"
3883"? - help for prompt selection"
3884msgstr ""
3885"clean - 开始清理\n"
3886"filter by pattern - 通过模版排除要删除的条目\n"
3887"select by numbers - 通过数字选择要删除的条目\n"
3888"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
3889"quit - 停止删除并退出\n"
3890"help - 显示本帮助\n"
3891"? - 显示如何在提示符下选择的帮助"
3892
7aea43ff 3893#: builtin/clean.c:816
2e8451e8
JX
3894msgid "*** Commands ***"
3895msgstr "*** 命令 ***"
3896
7aea43ff 3897#: builtin/clean.c:817
2e8451e8
JX
3898msgid "What now"
3899msgstr "请选择"
3900
7aea43ff 3901#: builtin/clean.c:825
2e8451e8
JX
3902msgid "Would remove the following item:"
3903msgid_plural "Would remove the following items:"
3904msgstr[0] "将删除如下条目:"
3905msgstr[1] "将删除如下条目:"
3906
7aea43ff 3907#: builtin/clean.c:842
2e8451e8
JX
3908msgid "No more files to clean, exiting."
3909msgstr "没有要清理的文件,退出。"
3910
7aea43ff 3911#: builtin/clean.c:873
ef317cd5 3912msgid "do not print names of files removed"
07432cef 3913msgstr "不打印删除文件的名称"
ef317cd5 3914
7aea43ff 3915#: builtin/clean.c:875
ef317cd5 3916msgid "force"
07432cef 3917msgstr "强制"
ef317cd5 3918
7aea43ff 3919#: builtin/clean.c:876
2e8451e8
JX
3920msgid "interactive cleaning"
3921msgstr "交互式清除"
3922
7aea43ff 3923#: builtin/clean.c:878
ef317cd5 3924msgid "remove whole directories"
07432cef 3925msgstr "删除整个目录"
ef317cd5 3926
7aea43ff
JX
3927#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714
3928#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187
ef317cd5 3929msgid "pattern"
07432cef 3930msgstr "模式"
ef317cd5 3931
7aea43ff 3932#: builtin/clean.c:880
ef317cd5 3933msgid "add <pattern> to ignore rules"
07432cef 3934msgstr "添加<模式>到忽略规则"
ef317cd5 3935
7aea43ff 3936#: builtin/clean.c:881
ef317cd5 3937msgid "remove ignored files, too"
07432cef 3938msgstr "也删除忽略的文件"
ef317cd5 3939
7aea43ff 3940#: builtin/clean.c:883
ef317cd5 3941msgid "remove only ignored files"
07432cef 3942msgstr "只删除忽略的文件"
c04f5ac3 3943
7aea43ff 3944#: builtin/clean.c:901
c04f5ac3 3945msgid "-x and -X cannot be used together"
649900bc 3946msgstr "-x 和 -X 不能同时使用"
c04f5ac3 3947
7aea43ff 3948#: builtin/clean.c:905
c04f5ac3 3949msgid ""
6c94aba5 3950"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 3951"clean"
c04f5ac3 3952msgstr ""
2e8451e8 3953"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 3954
7aea43ff 3955#: builtin/clean.c:908
c04f5ac3 3956msgid ""
6c94aba5 3957"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 3958"refusing to clean"
c04f5ac3 3959msgstr ""
2e8451e8 3960"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 3961
220c313c 3962#: builtin/clone.c:37
814ff314
JX
3963msgid "git clone [<options>] [--] <repo> [<dir>]"
3964msgstr "git clone [<选项>] [--] <版本库> [<路径>]"
ef317cd5 3965
7aea43ff 3966#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224
814ff314 3967#: builtin/push.c:523
ef317cd5 3968msgid "force progress reporting"
07432cef 3969msgstr "强制显示进度报告"
ef317cd5 3970
7aea43ff 3971#: builtin/clone.c:59
ef317cd5 3972msgid "don't create a checkout"
07432cef 3973msgstr "不创建一个检出"
ef317cd5 3974
7aea43ff 3975#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503
ef317cd5 3976msgid "create a bare repository"
220c313c 3977msgstr "创建一个纯版本库"
ef317cd5 3978
7aea43ff 3979#: builtin/clone.c:64
ef317cd5 3980msgid "create a mirror repository (implies bare)"
220c313c 3981msgstr "创建一个镜像版本库(也是纯版本库)"
ef317cd5 3982
7aea43ff 3983#: builtin/clone.c:66
ef317cd5 3984msgid "to clone from a local repository"
07432cef 3985msgstr "从本地版本库克隆"
ef317cd5 3986
7aea43ff 3987#: builtin/clone.c:68
ef317cd5 3988msgid "don't use local hardlinks, always copy"
07432cef 3989msgstr "不使用本地硬链接,始终复制"
ef317cd5 3990
7aea43ff 3991#: builtin/clone.c:70
ef317cd5 3992msgid "setup as shared repository"
07432cef 3993msgstr "设置为共享版本库"
ef317cd5 3994
7aea43ff 3995#: builtin/clone.c:72 builtin/clone.c:74
ef317cd5 3996msgid "initialize submodules in the clone"
07432cef 3997msgstr "在克隆时初始化子模组"
ef317cd5 3998
7aea43ff 3999#: builtin/clone.c:75 builtin/init-db.c:500
ef317cd5 4000msgid "template-directory"
07432cef 4001msgstr "模板目录"
ef317cd5 4002
7aea43ff 4003#: builtin/clone.c:76 builtin/init-db.c:501
ef317cd5 4004msgid "directory from which templates will be used"
07432cef 4005msgstr "模板目录将被使用"
ef317cd5 4006
7aea43ff 4007#: builtin/clone.c:78
ef317cd5 4008msgid "reference repository"
cfff71a9 4009msgstr "参考版本库"
ef317cd5 4010
7aea43ff
JX
4011#: builtin/clone.c:80
4012msgid "use --reference only while cloning"
4013msgstr "仅在克隆时参考 --reference 指向的本地版本库"
4014
4015#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
ef317cd5 4016msgid "name"
07432cef 4017msgstr "名称"
ef317cd5 4018
7aea43ff 4019#: builtin/clone.c:82
ef317cd5 4020msgid "use <name> instead of 'origin' to track upstream"
07432cef 4021msgstr "使用<名称>而不是 'origin' 去跟踪上游"
ef317cd5 4022
7aea43ff 4023#: builtin/clone.c:84
ef317cd5 4024msgid "checkout <branch> instead of the remote's HEAD"
07432cef 4025msgstr "检出<分支>而不是远程HEAD"
ef317cd5 4026
7aea43ff 4027#: builtin/clone.c:86
ef317cd5 4028msgid "path to git-upload-pack on the remote"
07432cef 4029msgstr "远程 git-upload-pack 路径"
ef317cd5 4030
7aea43ff 4031#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659
ef317cd5 4032msgid "depth"
07432cef 4033msgstr "深度"
ef317cd5 4034
7aea43ff 4035#: builtin/clone.c:88
ef317cd5 4036msgid "create a shallow clone of that depth"
07432cef 4037msgstr "创建一个指定深度的浅克隆"
ef317cd5 4038
7aea43ff 4039#: builtin/clone.c:90
ef317cd5 4040msgid "clone only one branch, HEAD or --branch"
07432cef 4041msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 4042
7aea43ff 4043#: builtin/clone.c:91 builtin/init-db.c:509
ef317cd5 4044msgid "gitdir"
07432cef 4045msgstr "git目录"
ef317cd5 4046
7aea43ff 4047#: builtin/clone.c:92 builtin/init-db.c:510
ef317cd5 4048msgid "separate git dir from working tree"
07432cef 4049msgstr "git目录和工作区分离"
ef317cd5 4050
7aea43ff 4051#: builtin/clone.c:93
ef317cd5 4052msgid "key=value"
07432cef 4053msgstr "key=value"
ef317cd5 4054
7aea43ff 4055#: builtin/clone.c:94
ef317cd5 4056msgid "set config inside the new repository"
07432cef 4057msgstr "在新版本库中设置配置信息"
ef317cd5 4058
7aea43ff 4059#: builtin/clone.c:247
c04f5ac3 4060#, c-format
4dcdc3d8 4061msgid "reference repository '%s' is not a local repository."
cfff71a9 4062msgstr "参考版本库 '%s' 不是一个本地版本库。"
c04f5ac3 4063
7aea43ff 4064#: builtin/clone.c:251
cfff71a9
JX
4065#, c-format
4066msgid "reference repository '%s' is shallow"
4067msgstr "参考版本库 '%s' 是一个浅克隆"
4068
7aea43ff 4069#: builtin/clone.c:254
cfff71a9
JX
4070#, c-format
4071msgid "reference repository '%s' is grafted"
4072msgstr "参考版本库 '%s' 已被嫁接"
4073
7aea43ff 4074#: builtin/clone.c:317
c04f5ac3
JX
4075#, c-format
4076msgid "failed to create directory '%s'"
90e6ef53 4077msgstr "无法创建目录 '%s'"
c04f5ac3 4078
7aea43ff 4079#: builtin/clone.c:319 builtin/diff.c:84
c04f5ac3
JX
4080#, c-format
4081msgid "failed to stat '%s'"
90e6ef53 4082msgstr "无法枚举 '%s' 状态"
c04f5ac3 4083
7aea43ff 4084#: builtin/clone.c:321
c04f5ac3
JX
4085#, c-format
4086msgid "%s exists and is not a directory"
4087msgstr "%s 存在且不是一个目录"
4088
7aea43ff 4089#: builtin/clone.c:335
c04f5ac3
JX
4090#, c-format
4091msgid "failed to stat %s\n"
90e6ef53 4092msgstr "无法枚举 %s 状态\n"
c04f5ac3 4093
7aea43ff 4094#: builtin/clone.c:357
c04f5ac3
JX
4095#, c-format
4096msgid "failed to create link '%s'"
90e6ef53 4097msgstr "无法创建链接 '%s'"
c04f5ac3 4098
7aea43ff 4099#: builtin/clone.c:361
c04f5ac3
JX
4100#, c-format
4101msgid "failed to copy file to '%s'"
90e6ef53 4102msgstr "无法拷贝文件至 '%s'"
c04f5ac3 4103
7aea43ff 4104#: builtin/clone.c:384 builtin/clone.c:558
c04f5ac3
JX
4105#, c-format
4106msgid "done.\n"
4107msgstr "完成。\n"
4108
7aea43ff 4109#: builtin/clone.c:396
1003b3a5
JX
4110msgid ""
4111"Clone succeeded, but checkout failed.\n"
4112"You can inspect what was checked out with 'git status'\n"
4113"and retry the checkout with 'git checkout -f HEAD'\n"
4114msgstr ""
4115"克隆成功,但是检出失败。\n"
4116"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
4117"'git checkout -f HEAD' 重试\n"
4118
7aea43ff 4119#: builtin/clone.c:473
c04f5ac3
JX
4120#, c-format
4121msgid "Could not find remote branch %s to clone."
90e6ef53 4122msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 4123
7aea43ff 4124#: builtin/clone.c:553
2e8451e8
JX
4125#, c-format
4126msgid "Checking connectivity... "
4127msgstr "检查连接... "
4128
7aea43ff 4129#: builtin/clone.c:556
1003b3a5
JX
4130msgid "remote did not send all necessary objects"
4131msgstr "远程没有发送所有必须的对象"
4132
7aea43ff 4133#: builtin/clone.c:620
c04f5ac3
JX
4134msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
4135msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
4136
7aea43ff 4137#: builtin/clone.c:651
1003b3a5
JX
4138msgid "unable to checkout working tree"
4139msgstr "不能检出工作区"
4140
7aea43ff 4141#: builtin/clone.c:738
04cb2f28
JX
4142msgid "cannot repack to clean up"
4143msgstr "无法执行 repack 来清理"
4144
7aea43ff 4145#: builtin/clone.c:740
04cb2f28
JX
4146msgid "cannot unlink temporary alternates file"
4147msgstr "无法删除临时的 alternates 文件"
4148
7aea43ff 4149#: builtin/clone.c:770
c04f5ac3
JX
4150msgid "Too many arguments."
4151msgstr "太多参数。"
4152
7aea43ff 4153#: builtin/clone.c:774
c04f5ac3 4154msgid "You must specify a repository to clone."
90e6ef53 4155msgstr "您必须指定一个版本库来克隆。"
c04f5ac3 4156
7aea43ff 4157#: builtin/clone.c:785
c04f5ac3
JX
4158#, c-format
4159msgid "--bare and --origin %s options are incompatible."
4160msgstr "--bare 和 --origin %s 选项不兼容。"
4161
7aea43ff 4162#: builtin/clone.c:788
07432cef
WS
4163msgid "--bare and --separate-git-dir are incompatible."
4164msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4165
7aea43ff 4166#: builtin/clone.c:801
c04f5ac3
JX
4167#, c-format
4168msgid "repository '%s' does not exist"
4169msgstr "版本库 '%s' 不存在"
4170
7aea43ff 4171#: builtin/clone.c:807 builtin/fetch.c:1160
cfff71a9
JX
4172#, c-format
4173msgid "depth %s is not a positive number"
4174msgstr "深度 %s 不是一个正数"
4175
7aea43ff 4176#: builtin/clone.c:817
c04f5ac3
JX
4177#, c-format
4178msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 4179msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 4180
7aea43ff 4181#: builtin/clone.c:827
c04f5ac3
JX
4182#, c-format
4183msgid "working tree '%s' already exists."
4184msgstr "工作区 '%s' 已经存在。"
4185
7aea43ff 4186#: builtin/clone.c:845
c04f5ac3 4187#, c-format
814ff314
JX
4188msgid "could not create work tree dir '%s'"
4189msgstr "不能创建工作区目录 '%s'"
c04f5ac3 4190
7aea43ff 4191#: builtin/clone.c:863
c04f5ac3
JX
4192#, c-format
4193msgid "Cloning into bare repository '%s'...\n"
220c313c 4194msgstr "克隆到纯版本库 '%s'...\n"
c04f5ac3 4195
7aea43ff 4196#: builtin/clone.c:865
c04f5ac3
JX
4197#, c-format
4198msgid "Cloning into '%s'...\n"
4199msgstr "正克隆到 '%s'...\n"
4200
7aea43ff 4201#: builtin/clone.c:890
04cb2f28
JX
4202msgid "--dissociate given, but there is no --reference"
4203msgstr "提供了参数 --dissociate,但未提供 --reference"
4204
7aea43ff 4205#: builtin/clone.c:907
6acbf033
JX
4206msgid "--depth is ignored in local clones; use file:// instead."
4207msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4208
7aea43ff 4209#: builtin/clone.c:910
6acbf033
JX
4210msgid "source repository is shallow, ignoring --local"
4211msgstr "源版本库是浅克隆,忽略 --local"
4212
7aea43ff 4213#: builtin/clone.c:915
6acbf033
JX
4214msgid "--local is ignored"
4215msgstr "--local 被忽略"
4216
7aea43ff 4217#: builtin/clone.c:919
c04f5ac3
JX
4218#, c-format
4219msgid "Don't know how to clone %s"
4220msgstr "不知道如何克隆 %s"
4221
7aea43ff 4222#: builtin/clone.c:968 builtin/clone.c:976
c04f5ac3
JX
4223#, c-format
4224msgid "Remote branch %s not found in upstream %s"
4225msgstr "远程分支 %s 在上游 %s 未发现"
4226
7aea43ff 4227#: builtin/clone.c:979
c04f5ac3
JX
4228msgid "You appear to have cloned an empty repository."
4229msgstr "您似乎克隆了一个空版本库。"
4230
ef317cd5 4231#: builtin/column.c:9
814ff314
JX
4232msgid "git column [<options>]"
4233msgstr "git column [<选项>]"
ef317cd5
JX
4234
4235#: builtin/column.c:26
4236msgid "lookup config vars"
07432cef 4237msgstr "查找配置变量"
ef317cd5
JX
4238
4239#: builtin/column.c:27 builtin/column.c:28
ef317cd5 4240msgid "layout to use"
07432cef 4241msgstr "要使用的布局"
ef317cd5
JX
4242
4243#: builtin/column.c:29
4244msgid "Maximum width"
07432cef 4245msgstr "最大宽度"
ef317cd5
JX
4246
4247#: builtin/column.c:30
4248msgid "Padding space on left border"
07432cef 4249msgstr "左边框的填充空间"
ef317cd5
JX
4250
4251#: builtin/column.c:31
4252msgid "Padding space on right border"
07432cef 4253msgstr "右边框的填充空间"
ef317cd5
JX
4254
4255#: builtin/column.c:32
4256msgid "Padding space between columns"
07432cef 4257msgstr "两列之间的填充空间"
ef317cd5 4258
8ada9598
JX
4259#: builtin/column.c:51
4260msgid "--command must be the first argument"
81809b99 4261msgstr "--command 必须是第一个参数"
8ada9598 4262
220c313c 4263#: builtin/commit.c:37
814ff314
JX
4264msgid "git commit [<options>] [--] <pathspec>..."
4265msgstr "git commit [<选项>] [--] <路径规则>..."
ef317cd5 4266
220c313c 4267#: builtin/commit.c:42
814ff314
JX
4268msgid "git status [<options>] [--] <pathspec>..."
4269msgstr "git status [<选项>] [--] <路径规则>..."
ef317cd5 4270
220c313c
JX
4271#: builtin/commit.c:47
4272msgid ""
4273"Your name and email address were configured automatically based\n"
4274"on your username and hostname. Please check that they are accurate.\n"
4275"You can suppress this message by setting them explicitly. Run the\n"
4276"following command and follow the instructions in your editor to edit\n"
4277"your configuration file:\n"
4278"\n"
4279" git config --global --edit\n"
4280"\n"
4281"After doing this, you may fix the identity used for this commit with:\n"
4282"\n"
4283" git commit --amend --reset-author\n"
4284msgstr ""
4285"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4286"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4287"中编辑您的配置文件:\n"
4288"\n"
4289" git config --global --edit\n"
4290"\n"
4291"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4292"\n"
4293" git commit --amend --reset-author\n"
4294
4295#: builtin/commit.c:60
c04f5ac3
JX
4296msgid ""
4297"Your name and email address were configured automatically based\n"
4298"on your username and hostname. Please check that they are accurate.\n"
4299"You can suppress this message by setting them explicitly:\n"
4300"\n"
4301" git config --global user.name \"Your Name\"\n"
4302" git config --global user.email you@example.com\n"
4303"\n"
4304"After doing this, you may fix the identity used for this commit with:\n"
4305"\n"
4306" git commit --amend --reset-author\n"
4307msgstr ""
90e6ef53 4308"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
220c313c 4309"与否。您可以对其进行设置以免再出现本提示信息:\n"
c04f5ac3
JX
4310"\n"
4311" git config --global user.name \"Your Name\"\n"
4312" git config --global user.email you@example.com\n"
4313"\n"
90e6ef53 4314"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
c04f5ac3
JX
4315"\n"
4316" git commit --amend --reset-author\n"
4317
220c313c 4318#: builtin/commit.c:72
c04f5ac3
JX
4319msgid ""
4320"You asked to amend the most recent commit, but doing so would make\n"
4321"it empty. You can repeat your command with --allow-empty, or you can\n"
4322"remove the commit entirely with \"git reset HEAD^\".\n"
4323msgstr ""
1b150dc9
T
4324"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4325"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 4326
220c313c 4327#: builtin/commit.c:77
c04f5ac3
JX
4328msgid ""
4329"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4330"If you wish to commit it anyway, use:\n"
4331"\n"
4332" git commit --allow-empty\n"
4333"\n"
c04f5ac3 4334msgstr ""
a9ce4543
T
4335"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4336"也要提交,使用命令:\n"
c04f5ac3
JX
4337"\n"
4338" git commit --allow-empty\n"
4339"\n"
c04f5ac3 4340
220c313c 4341#: builtin/commit.c:84
b1894384
JX
4342msgid "Otherwise, please use 'git reset'\n"
4343msgstr "否则,请使用命令 'git reset'\n"
4344
220c313c 4345#: builtin/commit.c:87
b1894384
JX
4346msgid ""
4347"If you wish to skip this commit, use:\n"
4348"\n"
4349" git reset\n"
4350"\n"
4351"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4352"the remaining commits.\n"
4353msgstr ""
4354"如果您想跳过这个提交,使用命令:\n"
4355"\n"
4356" git reset\n"
4357"\n"
4358"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4359"操作。\n"
4360
44f518e6 4361#: builtin/commit.c:304
c04f5ac3 4362msgid "failed to unpack HEAD tree object"
90e6ef53 4363msgstr "无法解包 HEAD 树对象"
c04f5ac3 4364
44f518e6 4365#: builtin/commit.c:344
c04f5ac3 4366msgid "unable to create temporary index"
90e6ef53 4367msgstr "不能创建临时索引"
c04f5ac3 4368
44f518e6 4369#: builtin/commit.c:350
c04f5ac3
JX
4370msgid "interactive add failed"
4371msgstr "交互式添加失败"
4372
44f518e6 4373#: builtin/commit.c:361
220c313c
JX
4374msgid "unable to write index file"
4375msgstr "无法写入索引文件"
4376
44f518e6 4377#: builtin/commit.c:363
220c313c
JX
4378msgid "unable to update temporary index"
4379msgstr "无法更新临时索引"
4380
44f518e6 4381#: builtin/commit.c:365
220c313c
JX
4382msgid "Failed to update main cache tree"
4383msgstr "不能更新树的主缓存"
4384
44f518e6 4385#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463
c04f5ac3 4386msgid "unable to write new_index file"
90e6ef53 4387msgstr "无法写 new_index 文件"
c04f5ac3 4388
44f518e6 4389#: builtin/commit.c:445
8ada9598 4390msgid "cannot do a partial commit during a merge."
81809b99 4391msgstr "在合并过程中不能做部分提交。"
c04f5ac3 4392
44f518e6 4393#: builtin/commit.c:447
8ada9598 4394msgid "cannot do a partial commit during a cherry-pick."
81809b99 4395msgstr "在拣选过程中不能做部分提交。"
8ada9598 4396
44f518e6 4397#: builtin/commit.c:456
c04f5ac3 4398msgid "cannot read the index"
90e6ef53 4399msgstr "无法读取索引"
c04f5ac3 4400
44f518e6 4401#: builtin/commit.c:475
c04f5ac3 4402msgid "unable to write temporary index file"
90e6ef53 4403msgstr "无法写临时索引文件"
c04f5ac3 4404
44f518e6 4405#: builtin/commit.c:580
220c313c
JX
4406#, c-format
4407msgid "commit '%s' lacks author header"
4408msgstr "提交 '%s' 缺少作者信息"
4409
44f518e6 4410#: builtin/commit.c:582
c04f5ac3 4411#, c-format
220c313c
JX
4412msgid "commit '%s' has malformed author line"
4413msgstr "提交 '%s' 有非法的作者信息"
c04f5ac3 4414
44f518e6 4415#: builtin/commit.c:601
c04f5ac3
JX
4416msgid "malformed --author parameter"
4417msgstr "非法的 --author 参数"
4418
44f518e6 4419#: builtin/commit.c:609
c04f5ac3 4420#, c-format
6acbf033
JX
4421msgid "invalid date format: %s"
4422msgstr "无效的日期格式:%s"
4423
44f518e6 4424#: builtin/commit.c:653
6acbf033
JX
4425msgid ""
4426"unable to select a comment character that is not used\n"
4427"in the current commit message"
4428msgstr "无法选择一个未被当前提交说明使用的注释字符"
4429
44f518e6 4430#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
c04f5ac3
JX
4431#, c-format
4432msgid "could not lookup commit %s"
4433msgstr "不能查询提交 %s"
4434
44f518e6 4435#: builtin/commit.c:702 builtin/shortlog.c:273
c04f5ac3
JX
4436#, c-format
4437msgid "(reading log message from standard input)\n"
90e6ef53 4438msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 4439
44f518e6 4440#: builtin/commit.c:704
c04f5ac3 4441msgid "could not read log from standard input"
90e6ef53 4442msgstr "不能从标准输入中读取日志信息"
c04f5ac3 4443
44f518e6 4444#: builtin/commit.c:708
c04f5ac3
JX
4445#, c-format
4446msgid "could not read log file '%s'"
90e6ef53 4447msgstr "不能读取日志文件 '%s'"
c04f5ac3 4448
44f518e6 4449#: builtin/commit.c:730
c04f5ac3 4450msgid "could not read MERGE_MSG"
90e6ef53 4451msgstr "不能读取 MERGE_MSG"
c04f5ac3 4452
44f518e6 4453#: builtin/commit.c:734
c04f5ac3 4454msgid "could not read SQUASH_MSG"
90e6ef53 4455msgstr "不能读取 SQUASH_MSG"
c04f5ac3 4456
7aea43ff 4457#: builtin/commit.c:738 builtin/merge.c:1079
c04f5ac3
JX
4458#, c-format
4459msgid "could not read '%s'"
90e6ef53 4460msgstr "不能读取 '%s'"
c04f5ac3 4461
44f518e6 4462#: builtin/commit.c:785
c04f5ac3 4463msgid "could not write commit template"
90e6ef53 4464msgstr "不能写提交模版"
c04f5ac3 4465
44f518e6 4466#: builtin/commit.c:803
81809b99 4467#, c-format
c04f5ac3
JX
4468msgid ""
4469"\n"
8ada9598 4470"It looks like you may be committing a merge.\n"
c04f5ac3
JX
4471"If this is not correct, please remove the file\n"
4472"\t%s\n"
4473"and try again.\n"
4474msgstr ""
4475"\n"
649900bc 4476"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
4477"\t%s\n"
4478"然后重试。\n"
4479
44f518e6 4480#: builtin/commit.c:808
81809b99 4481#, c-format
8ada9598
JX
4482msgid ""
4483"\n"
4484"It looks like you may be committing a cherry-pick.\n"
4485"If this is not correct, please remove the file\n"
4486"\t%s\n"
4487"and try again.\n"
4488msgstr ""
4489"\n"
649900bc 4490"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
4491"\t%s\n"
4492"然后重试。\n"
c04f5ac3 4493
44f518e6 4494#: builtin/commit.c:821
a77c07d9 4495#, c-format
c04f5ac3 4496msgid ""
8ada9598 4497"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 4498"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 4499msgstr ""
a77c07d9 4500"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 4501"说明将会终止提交。\n"
c04f5ac3 4502
44f518e6 4503#: builtin/commit.c:828
a77c07d9 4504#, c-format
c04f5ac3 4505msgid ""
8ada9598 4506"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 4507"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
4508"An empty message aborts the commit.\n"
4509msgstr ""
a77c07d9
JX
4510"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4511"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 4512
90e6ef53 4513# 译者:为保证在输出中对齐,注意调整句中空格!
44f518e6 4514#: builtin/commit.c:848
6acbf033
JX
4515#, c-format
4516msgid "%sAuthor: %.*s <%.*s>"
4517msgstr "%s作者: %.*s <%.*s>"
4518
4519# 译者:为保证在输出中对齐,注意调整句中空格!
44f518e6 4520#: builtin/commit.c:856
c04f5ac3 4521#, c-format
6acbf033
JX
4522msgid "%sDate: %s"
4523msgstr "%s日期: %s"
c04f5ac3 4524
90e6ef53 4525# 译者:为保证在输出中对齐,注意调整句中空格!
44f518e6 4526#: builtin/commit.c:863
c04f5ac3 4527#, c-format
6acbf033
JX
4528msgid "%sCommitter: %.*s <%.*s>"
4529msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 4530
44f518e6 4531#: builtin/commit.c:881
c04f5ac3 4532msgid "Cannot read index"
90e6ef53 4533msgstr "无法读取索引"
c04f5ac3 4534
44f518e6 4535#: builtin/commit.c:938
c04f5ac3
JX
4536msgid "Error building trees"
4537msgstr "无法创建树对象"
4538
44f518e6 4539#: builtin/commit.c:953 builtin/tag.c:495
c04f5ac3
JX
4540#, c-format
4541msgid "Please supply the message using either -m or -F option.\n"
07432cef 4542msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 4543
44f518e6 4544#: builtin/commit.c:1055
c04f5ac3 4545#, c-format
814ff314
JX
4546msgid "--author '%s' is not 'Name <email>' and matches no existing author"
4547msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
c04f5ac3 4548
44f518e6 4549#: builtin/commit.c:1070 builtin/commit.c:1310
c04f5ac3
JX
4550#, c-format
4551msgid "Invalid untracked files mode '%s'"
90e6ef53 4552msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 4553
44f518e6 4554#: builtin/commit.c:1107
2e8451e8
JX
4555msgid "--long and -z are incompatible"
4556msgstr "--long 和 -z 选项不兼容"
4557
44f518e6 4558#: builtin/commit.c:1137
c04f5ac3
JX
4559msgid "Using both --reset-author and --author does not make sense"
4560msgstr "同时使用 --reset-author 和 --author 没有意义"
4561
44f518e6 4562#: builtin/commit.c:1146
c04f5ac3 4563msgid "You have nothing to amend."
90e6ef53 4564msgstr "您没有可修补的提交。"
c04f5ac3 4565
44f518e6 4566#: builtin/commit.c:1149
8ada9598 4567msgid "You are in the middle of a merge -- cannot amend."
81809b99 4568msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 4569
44f518e6 4570#: builtin/commit.c:1151
8ada9598 4571msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 4572msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 4573
44f518e6 4574#: builtin/commit.c:1154
c04f5ac3 4575msgid "Options --squash and --fixup cannot be used together"
649900bc 4576msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 4577
44f518e6 4578#: builtin/commit.c:1164
c04f5ac3
JX
4579msgid "Only one of -c/-C/-F/--fixup can be used."
4580msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4581
44f518e6 4582#: builtin/commit.c:1166
c04f5ac3 4583msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
649900bc 4584msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
c04f5ac3 4585
44f518e6 4586#: builtin/commit.c:1174
c04f5ac3 4587msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 4588msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 4589
44f518e6 4590#: builtin/commit.c:1191
c04f5ac3
JX
4591msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4592msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4593
44f518e6 4594#: builtin/commit.c:1193
c04f5ac3
JX
4595msgid "No paths with --include/--only does not make sense."
4596msgstr "参数 --include/--only 不跟路径没有意义。"
4597
44f518e6 4598#: builtin/commit.c:1195
c04f5ac3 4599msgid "Clever... amending the last one with dirty index."
90e6ef53 4600msgstr "聪明... 在索引不干净下修补最后的提交。"
c04f5ac3 4601
44f518e6 4602#: builtin/commit.c:1197
6c94aba5
JX
4603msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4604msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
c04f5ac3 4605
44f518e6 4606#: builtin/commit.c:1209 builtin/tag.c:728
c04f5ac3
JX
4607#, c-format
4608msgid "Invalid cleanup mode %s"
4609msgstr "无效的清理模式 %s"
4610
44f518e6 4611#: builtin/commit.c:1214
c04f5ac3 4612msgid "Paths with -a does not make sense."
649900bc 4613msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 4614
7aea43ff 4615#: builtin/commit.c:1324 builtin/commit.c:1603
ef317cd5 4616msgid "show status concisely"
07432cef 4617msgstr "以简洁的格式显示状态"
ef317cd5 4618
7aea43ff 4619#: builtin/commit.c:1326 builtin/commit.c:1605
ef317cd5 4620msgid "show branch information"
07432cef 4621msgstr "显示分支信息"
ef317cd5 4622
7aea43ff 4623#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509
ef317cd5 4624msgid "machine-readable output"
07432cef
WS
4625msgstr "机器可读的输出"
4626
7aea43ff 4627#: builtin/commit.c:1331 builtin/commit.c:1609
07432cef
WS
4628msgid "show status in long format (default)"
4629msgstr "以长格式显示状态(默认)"
ef317cd5 4630
7aea43ff 4631#: builtin/commit.c:1334 builtin/commit.c:1612
ef317cd5 4632msgid "terminate entries with NUL"
07432cef 4633msgstr "条目以NUL字符结尾"
ef317cd5 4634
7aea43ff 4635#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980
220c313c 4636#: builtin/fast-export.c:983 builtin/tag.c:603
ef317cd5 4637msgid "mode"
07432cef 4638msgstr "模式"
ef317cd5 4639
7aea43ff 4640#: builtin/commit.c:1337 builtin/commit.c:1615
ef317cd5 4641msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 4642msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 4643
44f518e6 4644#: builtin/commit.c:1340
ef317cd5 4645msgid "show ignored files"
07432cef 4646msgstr "显示忽略的文件"
ef317cd5 4647
7aea43ff 4648#: builtin/commit.c:1341 parse-options.h:152
ef317cd5
JX
4649msgid "when"
4650msgstr "何时"
4651
44f518e6 4652#: builtin/commit.c:1342
ef317cd5
JX
4653msgid ""
4654"ignore changes to submodules, optional when: all, dirty, untracked. "
4655"(Default: all)"
4656msgstr ""
07432cef 4657"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 4658
44f518e6 4659#: builtin/commit.c:1344
ef317cd5 4660msgid "list untracked files in columns"
07432cef 4661msgstr "以列的方式显示未跟踪的文件"
ef317cd5 4662
7aea43ff 4663#: builtin/commit.c:1430
c04f5ac3
JX
4664msgid "couldn't look up newly created commit"
4665msgstr "无法找到新创建的提交"
4666
7aea43ff 4667#: builtin/commit.c:1432
c04f5ac3 4668msgid "could not parse newly created commit"
90e6ef53 4669msgstr "不能解析新创建的提交"
c04f5ac3 4670
7aea43ff 4671#: builtin/commit.c:1477
c04f5ac3
JX
4672msgid "detached HEAD"
4673msgstr "分离头指针"
4674
7e238ab7 4675# 译者:中文字符串拼接,可删除前导空格
7aea43ff 4676#: builtin/commit.c:1480
c04f5ac3 4677msgid " (root-commit)"
7e238ab7 4678msgstr "(根提交)"
c04f5ac3 4679
7aea43ff 4680#: builtin/commit.c:1573
ef317cd5 4681msgid "suppress summary after successful commit"
07432cef 4682msgstr "提交成功后不显示概述信息"
c04f5ac3 4683
7aea43ff 4684#: builtin/commit.c:1574
ef317cd5 4685msgid "show diff in commit message template"
07432cef 4686msgstr "在提交说明模板里显示差异"
c04f5ac3 4687
7aea43ff 4688#: builtin/commit.c:1576
ef317cd5 4689msgid "Commit message options"
07432cef 4690msgstr "提交说明选项"
c04f5ac3 4691
7aea43ff 4692#: builtin/commit.c:1577 builtin/tag.c:601
ef317cd5 4693msgid "read message from file"
07432cef 4694msgstr "从文件中读取提交说明"
c04f5ac3 4695
7aea43ff 4696#: builtin/commit.c:1578
ef317cd5 4697msgid "author"
07432cef 4698msgstr "作者"
c04f5ac3 4699
7aea43ff 4700#: builtin/commit.c:1578
ef317cd5 4701msgid "override author for commit"
07432cef 4702msgstr "提交时覆盖作者"
73a60cd2 4703
7aea43ff 4704#: builtin/commit.c:1579 builtin/gc.c:280
ef317cd5 4705msgid "date"
07432cef 4706msgstr "日期"
c04f5ac3 4707
7aea43ff 4708#: builtin/commit.c:1579
ef317cd5 4709msgid "override date for commit"
07432cef 4710msgstr "提交时覆盖日期"
c04f5ac3 4711
7aea43ff 4712#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391
04cb2f28 4713#: builtin/notes.c:554 builtin/tag.c:599
ef317cd5 4714msgid "message"
07432cef 4715msgstr "说明"
c04f5ac3 4716
7aea43ff 4717#: builtin/commit.c:1580
ef317cd5 4718msgid "commit message"
07432cef 4719msgstr "提交说明"
ef317cd5 4720
7aea43ff 4721#: builtin/commit.c:1581
ef317cd5 4722msgid "reuse and edit message from specified commit"
07432cef 4723msgstr "重用并编辑指定提交的提交说明"
ef317cd5 4724
7aea43ff 4725#: builtin/commit.c:1582
ef317cd5 4726msgid "reuse message from specified commit"
07432cef 4727msgstr "重用指定提交的提交说明"
ef317cd5 4728
7aea43ff 4729#: builtin/commit.c:1583
ef317cd5 4730msgid "use autosquash formatted message to fixup specified commit"
07432cef 4731msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 4732
7aea43ff 4733#: builtin/commit.c:1584
ef317cd5 4734msgid "use autosquash formatted message to squash specified commit"
07432cef 4735msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 4736
7aea43ff 4737#: builtin/commit.c:1585
ef317cd5 4738msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 4739msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 4740
7aea43ff 4741#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86
ef317cd5 4742msgid "add Signed-off-by:"
07432cef 4743msgstr "添加 Signed-off-by: 签名"
ef317cd5 4744
7aea43ff 4745#: builtin/commit.c:1587
ef317cd5 4746msgid "use specified template file"
07432cef 4747msgstr "使用指定的模板文件"
ef317cd5 4748
7aea43ff 4749#: builtin/commit.c:1588
ef317cd5 4750msgid "force edit of commit"
07432cef 4751msgstr "强制编辑提交"
ef317cd5 4752
07432cef 4753# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
7aea43ff 4754#: builtin/commit.c:1589
ef317cd5 4755msgid "default"
07432cef 4756msgstr "default"
ef317cd5 4757
7aea43ff 4758#: builtin/commit.c:1589 builtin/tag.c:604
ef317cd5 4759msgid "how to strip spaces and #comments from message"
07432cef 4760msgstr "设置如何删除提交说明里的空格和#注释"
ef317cd5 4761
7aea43ff 4762#: builtin/commit.c:1590
ef317cd5 4763msgid "include status in commit message template"
07432cef 4764msgstr "在提交说明模板里包含状态信息"
ef317cd5 4765
7aea43ff 4766#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92
220c313c 4767#: builtin/tag.c:605
6c94aba5
JX
4768msgid "key-id"
4769msgstr "key-id"
ef317cd5 4770
7aea43ff 4771#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93
ef317cd5 4772msgid "GPG sign commit"
07432cef 4773msgstr "GPG 提交签名"
ef317cd5 4774
7aea43ff 4775#: builtin/commit.c:1595
ef317cd5 4776msgid "Commit contents options"
07432cef 4777msgstr "提交内容选项"
ef317cd5 4778
7aea43ff 4779#: builtin/commit.c:1596
ef317cd5 4780msgid "commit all changed files"
07432cef 4781msgstr "提交所有改动的文件"
ef317cd5 4782
7aea43ff 4783#: builtin/commit.c:1597
ef317cd5 4784msgid "add specified files to index for commit"
07432cef 4785msgstr "添加指定的文件到索引区等待提交"
ef317cd5 4786
7aea43ff 4787#: builtin/commit.c:1598
ef317cd5 4788msgid "interactively add files"
07432cef 4789msgstr "交互式添加文件"
ef317cd5 4790
7aea43ff 4791#: builtin/commit.c:1599
ef317cd5 4792msgid "interactively add changes"
07432cef 4793msgstr "交互式添加变更"
ef317cd5 4794
7aea43ff 4795#: builtin/commit.c:1600
ef317cd5 4796msgid "commit only specified files"
07432cef 4797msgstr "只提交指定的文件"
ef317cd5 4798
7aea43ff 4799#: builtin/commit.c:1601
ef317cd5 4800msgid "bypass pre-commit hook"
07432cef 4801msgstr "绕过 pre-commit 钩子"
ef317cd5 4802
7aea43ff 4803#: builtin/commit.c:1602
ef317cd5 4804msgid "show what would be committed"
07432cef 4805msgstr "显示将要提交的内容"
ef317cd5 4806
7aea43ff 4807#: builtin/commit.c:1613
ef317cd5 4808msgid "amend previous commit"
07432cef 4809msgstr "修改先前的提交"
ef317cd5 4810
7aea43ff 4811#: builtin/commit.c:1614
ef317cd5 4812msgid "bypass post-rewrite hook"
07432cef 4813msgstr "绕过 post-rewrite 钩子"
ef317cd5 4814
7aea43ff 4815#: builtin/commit.c:1619
ef317cd5 4816msgid "ok to record an empty change"
07432cef 4817msgstr "允许一个空提交"
ef317cd5 4818
7aea43ff 4819#: builtin/commit.c:1621
ef317cd5 4820msgid "ok to record a change with an empty message"
07432cef 4821msgstr "允许空的提交说明"
ef317cd5 4822
7aea43ff 4823#: builtin/commit.c:1650
c04f5ac3 4824msgid "could not parse HEAD commit"
90e6ef53 4825msgstr "不能解析 HEAD 提交"
c04f5ac3 4826
7aea43ff 4827#: builtin/commit.c:1689 builtin/merge.c:1076
c04f5ac3
JX
4828#, c-format
4829msgid "could not open '%s' for reading"
90e6ef53 4830msgstr "不能为读入打开 '%s'"
c04f5ac3 4831
7aea43ff 4832#: builtin/commit.c:1696
c04f5ac3
JX
4833#, c-format
4834msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 4835msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 4836
7aea43ff 4837#: builtin/commit.c:1703
c04f5ac3 4838msgid "could not read MERGE_MODE"
90e6ef53 4839msgstr "不能读取 MERGE_MODE"
c04f5ac3 4840
7aea43ff 4841#: builtin/commit.c:1722
c04f5ac3
JX
4842#, c-format
4843msgid "could not read commit message: %s"
90e6ef53 4844msgstr "不能读取提交说明:%s"
c04f5ac3 4845
7aea43ff 4846#: builtin/commit.c:1733
73a60cd2
JX
4847#, c-format
4848msgid "Aborting commit; you did not edit the message.\n"
4849msgstr "终止提交;您未更改来自模版的提交说明。\n"
4850
7aea43ff 4851#: builtin/commit.c:1738
c04f5ac3
JX
4852#, c-format
4853msgid "Aborting commit due to empty commit message.\n"
4854msgstr "终止提交因为提交说明为空。\n"
4855
7aea43ff 4856#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854
c04f5ac3 4857msgid "failed to write commit object"
90e6ef53 4858msgstr "无法写提交对象"
c04f5ac3 4859
7aea43ff 4860#: builtin/commit.c:1786
c04f5ac3
JX
4861msgid ""
4862"Repository has been updated, but unable to write\n"
220c313c 4863"new_index file. Check that disk is not full and quota is\n"
c04f5ac3
JX
4864"not exceeded, and then \"git reset HEAD\" to recover."
4865msgstr ""
90e6ef53
JX
4866"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4867"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 4868
90314792 4869#: builtin/config.c:8
814ff314
JX
4870msgid "git config [<options>]"
4871msgstr "git config [<选项>]"
ef317cd5 4872
6c94aba5 4873#: builtin/config.c:53
ef317cd5 4874msgid "Config file location"
07432cef 4875msgstr "配置文件位置"
ef317cd5 4876
6c94aba5 4877#: builtin/config.c:54
ef317cd5 4878msgid "use global config file"
07432cef 4879msgstr "使用全局配置文件"
ef317cd5 4880
6c94aba5 4881#: builtin/config.c:55
ef317cd5 4882msgid "use system config file"
07432cef 4883msgstr "使用系统级配置文件"
ef317cd5 4884
6c94aba5 4885#: builtin/config.c:56
ef317cd5 4886msgid "use repository config file"
07432cef 4887msgstr "使用版本库级配置文件"
ef317cd5 4888
6c94aba5 4889#: builtin/config.c:57
ef317cd5 4890msgid "use given config file"
07432cef 4891msgstr "使用指定的配置文件"
ef317cd5 4892
6c94aba5 4893#: builtin/config.c:58
2e8451e8
JX
4894msgid "blob-id"
4895msgstr "数据对象ID"
4896
6c94aba5 4897#: builtin/config.c:58
2e8451e8
JX
4898msgid "read config from given blob object"
4899msgstr "从给定的数据对象读取配置"
4900
6c94aba5 4901#: builtin/config.c:59
ef317cd5 4902msgid "Action"
07432cef 4903msgstr "操作"
ef317cd5 4904
6c94aba5 4905#: builtin/config.c:60
ef317cd5 4906msgid "get value: name [value-regex]"
07432cef 4907msgstr "获取值:name [value-regex]"
ef317cd5 4908
6c94aba5 4909#: builtin/config.c:61
ef317cd5 4910msgid "get all values: key [value-regex]"
07432cef 4911msgstr "获得所有的值:key [value-regex]"
ef317cd5 4912
6c94aba5 4913#: builtin/config.c:62
ef317cd5 4914msgid "get values for regexp: name-regex [value-regex]"
07432cef 4915msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 4916
6c94aba5 4917#: builtin/config.c:63
90314792
JX
4918msgid "get value specific for the URL: section[.var] URL"
4919msgstr "获得 URL 取值:section[.var] URL"
4920
6c94aba5 4921#: builtin/config.c:64
ef317cd5 4922msgid "replace all matching variables: name value [value_regex]"
07432cef 4923msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 4924
6c94aba5 4925#: builtin/config.c:65
ef317cd5 4926msgid "add a new variable: name value"
07432cef 4927msgstr "添加一个新的变量:name value"
ef317cd5 4928
6c94aba5 4929#: builtin/config.c:66
ef317cd5 4930msgid "remove a variable: name [value-regex]"
07432cef 4931msgstr "删除一个变量:name [value-regex]"
ef317cd5 4932
6c94aba5 4933#: builtin/config.c:67
ef317cd5 4934msgid "remove all matches: name [value-regex]"
07432cef 4935msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 4936
6c94aba5 4937#: builtin/config.c:68
ef317cd5 4938msgid "rename section: old-name new-name"
07432cef 4939msgstr "重命名小节:old-name new-name"
ef317cd5 4940
6c94aba5 4941#: builtin/config.c:69
ef317cd5 4942msgid "remove a section: name"
07432cef 4943msgstr "删除一个小节:name"
ef317cd5 4944
6c94aba5 4945#: builtin/config.c:70
ef317cd5 4946msgid "list all"
07432cef 4947msgstr "列出所有"
ef317cd5 4948
6c94aba5 4949#: builtin/config.c:71
ef317cd5 4950msgid "open an editor"
07432cef 4951msgstr "打开一个编辑器"
ef317cd5 4952
6c94aba5 4953#: builtin/config.c:72
04cb2f28
JX
4954msgid "find the color configured: slot [default]"
4955msgstr "获得配置的颜色:配置 [默认]"
ef317cd5 4956
6c94aba5 4957#: builtin/config.c:73
04cb2f28
JX
4958msgid "find the color setting: slot [stdout-is-tty]"
4959msgstr "获得颜色设置:配置 [stdout-is-tty]"
ef317cd5 4960
6c94aba5 4961#: builtin/config.c:74
ef317cd5 4962msgid "Type"
07432cef 4963msgstr "类型"
ef317cd5 4964
6c94aba5 4965#: builtin/config.c:75
ef317cd5 4966msgid "value is \"true\" or \"false\""
07432cef 4967msgstr "值是 \"true\" 或 \"false\""
ef317cd5 4968
6c94aba5 4969#: builtin/config.c:76
ef317cd5 4970msgid "value is decimal number"
07432cef 4971msgstr "值是十进制数"
ef317cd5 4972
6c94aba5 4973#: builtin/config.c:77
ef317cd5 4974msgid "value is --bool or --int"
07432cef 4975msgstr "值是 --bool or --int"
ef317cd5 4976
6c94aba5 4977#: builtin/config.c:78
ef317cd5 4978msgid "value is a path (file or directory name)"
07432cef 4979msgstr "值是一个路径(文件或目录名)"
ef317cd5 4980
6c94aba5 4981#: builtin/config.c:79
ef317cd5 4982msgid "Other"
07432cef 4983msgstr "其它"
ef317cd5 4984
6c94aba5 4985#: builtin/config.c:80
ef317cd5 4986msgid "terminate values with NUL byte"
07432cef 4987msgstr "终止值是NUL字节"
ef317cd5 4988
6c94aba5 4989#: builtin/config.c:81
ef317cd5 4990msgid "respect include directives on lookup"
07432cef 4991msgstr "查询时参照 include 指令递归查找"
ef317cd5 4992
04cb2f28 4993#: builtin/config.c:316
220c313c
JX
4994msgid "unable to parse default color value"
4995msgstr "不能解析缺省的颜色值"
4996
04cb2f28 4997#: builtin/config.c:457
220c313c
JX
4998#, c-format
4999msgid ""
5000"# This is Git's per-user configuration file.\n"
7aea43ff 5001"[user]\n"
220c313c 5002"# Please adapt and uncomment the following lines:\n"
7aea43ff 5003"#\tname = %s\n"
220c313c
JX
5004"#\temail = %s\n"
5005msgstr ""
5006"# This is Git's per-user configuration file.\n"
7aea43ff 5007"[user]\n"
220c313c 5008"# Please adapt and uncomment the following lines:\n"
7aea43ff 5009"#\tname = %s\n"
220c313c
JX
5010"#\temail = %s\n"
5011
7aea43ff 5012#: builtin/config.c:587
220c313c
JX
5013#, c-format
5014msgid "cannot create configuration file %s"
5015msgstr "不能创建配置文件 %s"
5016
5017#: builtin/count-objects.c:55
4dcdc3d8
JX
5018msgid "git count-objects [-v] [-H | --human-readable]"
5019msgstr "git count-objects [-v] [-H | --human-readable]"
5020
220c313c 5021#: builtin/count-objects.c:65
4dcdc3d8
JX
5022msgid "print sizes in human readable format"
5023msgstr "以用户可读的格式显示大小"
ef317cd5 5024
220c313c 5025#: builtin/describe.c:17
814ff314
JX
5026msgid "git describe [<options>] [<commit-ish>...]"
5027msgstr "git describe [<选项>] [<提交号>...]"
ef317cd5 5028
220c313c 5029#: builtin/describe.c:18
814ff314
JX
5030msgid "git describe [<options>] --dirty"
5031msgstr "git describe [<选项>] --dirty"
ef317cd5 5032
220c313c 5033#: builtin/describe.c:217
c04f5ac3
JX
5034#, c-format
5035msgid "annotated tag %s not available"
5036msgstr "注释 tag %s 无效"
5037
220c313c 5038#: builtin/describe.c:221
c04f5ac3
JX
5039#, c-format
5040msgid "annotated tag %s has no embedded name"
5041msgstr "注释 tag %s 没有嵌入名称"
5042
220c313c 5043#: builtin/describe.c:223
c04f5ac3
JX
5044#, c-format
5045msgid "tag '%s' is really '%s' here"
90e6ef53 5046msgstr "tag '%s' 的确是在 '%s'"
c04f5ac3 5047
220c313c 5048#: builtin/describe.c:250 builtin/log.c:452
c04f5ac3
JX
5049#, c-format
5050msgid "Not a valid object name %s"
5051msgstr "不是一个有效的对象名 %s"
5052
220c313c 5053#: builtin/describe.c:253
c04f5ac3
JX
5054#, c-format
5055msgid "%s is not a valid '%s' object"
5056msgstr "%s 不是一个有效的 '%s' 对象"
5057
220c313c 5058#: builtin/describe.c:270
c04f5ac3
JX
5059#, c-format
5060msgid "no tag exactly matches '%s'"
5061msgstr "没有 tag 准确匹配 '%s'"
5062
220c313c 5063#: builtin/describe.c:272
c04f5ac3
JX
5064#, c-format
5065msgid "searching to describe %s\n"
5066msgstr "搜索描述 %s\n"
5067
220c313c 5068#: builtin/describe.c:319
c04f5ac3
JX
5069#, c-format
5070msgid "finished search at %s\n"
5071msgstr "完成搜索 %s\n"
5072
220c313c 5073#: builtin/describe.c:346
c04f5ac3
JX
5074#, c-format
5075msgid ""
5076"No annotated tags can describe '%s'.\n"
5077"However, there were unannotated tags: try --tags."
5078msgstr ""
5079"没有注释 tag 能描述 '%s'。\n"
5080"然而,有非注释 tag:尝试 --tags。"
5081
220c313c 5082#: builtin/describe.c:350
c04f5ac3
JX
5083#, c-format
5084msgid ""
5085"No tags can describe '%s'.\n"
5086"Try --always, or create some tags."
5087msgstr ""
5088"没有注释 tag 能描述 '%s'。\n"
90e6ef53 5089"尝试 --always,或者创建一些 tag。"
c04f5ac3 5090
220c313c 5091#: builtin/describe.c:371
c04f5ac3
JX
5092#, c-format
5093msgid "traversed %lu commits\n"
5094msgstr "已遍历 %lu 个提交\n"
5095
220c313c 5096#: builtin/describe.c:374
c04f5ac3
JX
5097#, c-format
5098msgid ""
5099"more than %i tags found; listed %i most recent\n"
5100"gave up search at %s\n"
5101msgstr ""
90e6ef53
JX
5102"发现多于 %i 个 tag,列出最近的 %i 个\n"
5103"在 %s 放弃搜索\n"
c04f5ac3 5104
220c313c 5105#: builtin/describe.c:396
ef317cd5 5106msgid "find the tag that comes after the commit"
07432cef 5107msgstr "寻找提交之后的 tag(用于描述提交)"
ef317cd5 5108
220c313c 5109#: builtin/describe.c:397
ef317cd5 5110msgid "debug search strategy on stderr"
07432cef 5111msgstr "在标准错误上调试搜索策略"
ef317cd5 5112
220c313c 5113#: builtin/describe.c:398
1003b3a5
JX
5114msgid "use any ref"
5115msgstr "使用任意引用"
5116
220c313c 5117#: builtin/describe.c:399
1003b3a5
JX
5118msgid "use any tag, even unannotated"
5119msgstr "使用任意 tag,即使未带注解"
ef317cd5 5120
220c313c 5121#: builtin/describe.c:400
ef317cd5 5122msgid "always use long format"
07432cef 5123msgstr "始终使用长提交号格式"
ef317cd5 5124
220c313c 5125#: builtin/describe.c:401
2e8451e8
JX
5126msgid "only follow first parent"
5127msgstr "只跟随第一个父提交"
5128
220c313c 5129#: builtin/describe.c:404
ef317cd5 5130msgid "only output exact matches"
07432cef 5131msgstr "只输出精确匹配"
ef317cd5 5132
220c313c 5133#: builtin/describe.c:406
ef317cd5 5134msgid "consider <n> most recent tags (default: 10)"
07432cef 5135msgstr "考虑最近 <n> 个 tags(默认:10)"
ef317cd5 5136
220c313c 5137#: builtin/describe.c:408
ef317cd5 5138msgid "only consider tags matching <pattern>"
07432cef 5139msgstr "只考虑匹配 <模式> 的 tags"
ef317cd5 5140
220c313c 5141#: builtin/describe.c:410 builtin/name-rev.c:318
ef317cd5 5142msgid "show abbreviated commit object as fallback"
07432cef 5143msgstr "显示简写的提交号作为后备"
ef317cd5 5144
220c313c 5145#: builtin/describe.c:411
ef317cd5 5146msgid "mark"
07432cef 5147msgstr "标记"
ef317cd5 5148
220c313c 5149#: builtin/describe.c:412
ef317cd5 5150msgid "append <mark> on dirty working tree (default: \"-dirty\")"
07432cef 5151msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
ef317cd5 5152
220c313c 5153#: builtin/describe.c:430
c04f5ac3
JX
5154msgid "--long is incompatible with --abbrev=0"
5155msgstr "--long 与 --abbrev=0 不兼容"
5156
220c313c 5157#: builtin/describe.c:456
c04f5ac3 5158msgid "No names found, cannot describe anything."
90e6ef53 5159msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 5160
220c313c 5161#: builtin/describe.c:476
a8a5406a 5162msgid "--dirty is incompatible with commit-ishes"
649900bc 5163msgstr "--dirty 不能与提交同时使用"
c04f5ac3 5164
220c313c 5165#: builtin/diff.c:86
c04f5ac3
JX
5166#, c-format
5167msgid "'%s': not a regular file or symlink"
5168msgstr "'%s':不是一个正规文件或符号链接"
5169
220c313c 5170#: builtin/diff.c:237
c04f5ac3
JX
5171#, c-format
5172msgid "invalid option: %s"
5173msgstr "无效选项:%s"
5174
220c313c 5175#: builtin/diff.c:358
c04f5ac3
JX
5176msgid "Not a git repository"
5177msgstr "不是一个 git 版本库"
5178
220c313c 5179#: builtin/diff.c:401
c04f5ac3
JX
5180#, c-format
5181msgid "invalid object '%s' given."
5182msgstr "提供了无效对象 '%s'。"
5183
220c313c 5184#: builtin/diff.c:410
c04f5ac3
JX
5185#, c-format
5186msgid "more than two blobs given: '%s'"
07432cef 5187msgstr "提供了超过两个数据(blob)对象:'%s'"
c04f5ac3 5188
220c313c 5189#: builtin/diff.c:417
c04f5ac3
JX
5190#, c-format
5191msgid "unhandled object '%s' given."
6c94aba5 5192msgstr "无法处理的对象 '%s'。"
c04f5ac3 5193
220c313c 5194#: builtin/fast-export.c:24
ef317cd5 5195msgid "git fast-export [rev-list-opts]"
07432cef 5196msgstr "git fast-export [rev-list-opts]"
ef317cd5 5197
220c313c 5198#: builtin/fast-export.c:979
ef317cd5 5199msgid "show progress after <n> objects"
07432cef 5200msgstr "在 <n> 个对象之后显示进度"
ef317cd5 5201
220c313c 5202#: builtin/fast-export.c:981
ef317cd5 5203msgid "select handling of signed tags"
07432cef 5204msgstr "选择如何处理签名 tags"
ef317cd5 5205
220c313c 5206#: builtin/fast-export.c:984
ef317cd5 5207msgid "select handling of tags that tag filtered objects"
07432cef 5208msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
ef317cd5 5209
220c313c 5210#: builtin/fast-export.c:987
ef317cd5 5211msgid "Dump marks to this file"
07432cef 5212msgstr "把标记存储到这个文件"
ef317cd5 5213
220c313c 5214#: builtin/fast-export.c:989
ef317cd5 5215msgid "Import marks from this file"
07432cef 5216msgstr "从这个文件导入标记"
ef317cd5 5217
220c313c 5218#: builtin/fast-export.c:991
ef317cd5 5219msgid "Fake a tagger when tags lack one"
07432cef 5220msgstr "当 tags 缺少标记者字段时,假装提供一个"
ef317cd5 5221
220c313c 5222#: builtin/fast-export.c:993
ef317cd5 5223msgid "Output full tree for each commit"
07432cef 5224msgstr "每次提交都输出整个树"
ef317cd5 5225
220c313c 5226#: builtin/fast-export.c:995
ef317cd5 5227msgid "Use the done feature to terminate the stream"
07432cef 5228msgstr "使用 done 功能来终止流"
ef317cd5 5229
220c313c 5230#: builtin/fast-export.c:996
ef317cd5 5231msgid "Skip output of blob data"
07432cef 5232msgstr "跳过数据对象的输出"
ef317cd5 5233
220c313c 5234#: builtin/fast-export.c:997
6acbf033
JX
5235msgid "refspec"
5236msgstr "引用表达式"
5237
220c313c 5238#: builtin/fast-export.c:998
6acbf033
JX
5239msgid "Apply refspec to exported refs"
5240msgstr "对导出的引用应用引用表达式"
5241
220c313c
JX
5242#: builtin/fast-export.c:999
5243msgid "anonymize output"
5244msgstr "匿名输出"
5245
814ff314 5246#: builtin/fetch.c:19
ef317cd5 5247msgid "git fetch [<options>] [<repository> [<refspec>...]]"
90314792 5248msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
ef317cd5 5249
814ff314 5250#: builtin/fetch.c:20
ef317cd5 5251msgid "git fetch [<options>] <group>"
07432cef 5252msgstr "git fetch [<选项>] <组>"
ef317cd5 5253
814ff314 5254#: builtin/fetch.c:21
ef317cd5 5255msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
07432cef 5256msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
ef317cd5 5257
814ff314 5258#: builtin/fetch.c:22
ef317cd5 5259msgid "git fetch --all [<options>]"
07432cef 5260msgstr "git fetch --all [<选项>]"
ef317cd5 5261
814ff314 5262#: builtin/fetch.c:89
ef317cd5 5263msgid "fetch from all remotes"
07432cef 5264msgstr "从所有的远程抓取"
ef317cd5 5265
814ff314 5266#: builtin/fetch.c:91
ef317cd5 5267msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 5268msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 5269
814ff314 5270#: builtin/fetch.c:93
ef317cd5 5271msgid "path to upload pack on remote end"
07432cef 5272msgstr "上传包到远程的路径"
ef317cd5 5273
814ff314 5274#: builtin/fetch.c:94
ef317cd5 5275msgid "force overwrite of local branch"
07432cef 5276msgstr "强制覆盖本地分支"
ef317cd5 5277
814ff314 5278#: builtin/fetch.c:96
ef317cd5 5279msgid "fetch from multiple remotes"
07432cef 5280msgstr "从多个远程抓取"
ef317cd5 5281
814ff314 5282#: builtin/fetch.c:98
ef317cd5 5283msgid "fetch all tags and associated objects"
07432cef 5284msgstr "抓取所有的 tags 和关联对象"
ef317cd5 5285
814ff314 5286#: builtin/fetch.c:100
ef317cd5 5287msgid "do not fetch all tags (--no-tags)"
07432cef 5288msgstr "不抓取任何 tags (--no-tags)"
ef317cd5 5289
814ff314 5290#: builtin/fetch.c:102
ef317cd5 5291msgid "prune remote-tracking branches no longer on remote"
07432cef 5292msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 5293
07432cef 5294# 译者:可选值,不能翻译
814ff314 5295#: builtin/fetch.c:103
ef317cd5 5296msgid "on-demand"
07432cef 5297msgstr "on-demand"
ef317cd5 5298
814ff314 5299#: builtin/fetch.c:104
ef317cd5 5300msgid "control recursive fetching of submodules"
07432cef 5301msgstr "控制子模组的递归抓取"
ef317cd5 5302
814ff314 5303#: builtin/fetch.c:108
ef317cd5 5304msgid "keep downloaded pack"
07432cef 5305msgstr "保持下载包"
ef317cd5 5306
814ff314 5307#: builtin/fetch.c:110
ef317cd5 5308msgid "allow updating of HEAD ref"
07432cef 5309msgstr "允许更新 HEAD 引用"
ef317cd5 5310
814ff314 5311#: builtin/fetch.c:113
ef317cd5 5312msgid "deepen history of shallow clone"
07432cef 5313msgstr "深化浅克隆的历史"
ef317cd5 5314
814ff314 5315#: builtin/fetch.c:115
a77c07d9
JX
5316msgid "convert to a complete repository"
5317msgstr "转换为一个完整的版本库"
5318
814ff314 5319#: builtin/fetch.c:117 builtin/log.c:1208
ef317cd5 5320msgid "dir"
07432cef 5321msgstr "目录"
ef317cd5 5322
814ff314 5323#: builtin/fetch.c:118
ef317cd5 5324msgid "prepend this to submodule path output"
07432cef 5325msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 5326
814ff314 5327#: builtin/fetch.c:121
ef317cd5 5328msgid "default mode for recursion"
07432cef 5329msgstr "递归的默认模式"
ef317cd5 5330
814ff314 5331#: builtin/fetch.c:123
cfff71a9
JX
5332msgid "accept refs that update .git/shallow"
5333msgstr "接受更新 .git/shallow 的引用"
5334
814ff314 5335#: builtin/fetch.c:124
6acbf033
JX
5336msgid "refmap"
5337msgstr "引用映射"
5338
814ff314 5339#: builtin/fetch.c:125
6acbf033
JX
5340msgid "specify fetch refmap"
5341msgstr "指定获取操作的引用映射"
5342
7aea43ff 5343#: builtin/fetch.c:377
c04f5ac3
JX
5344msgid "Couldn't find remote ref HEAD"
5345msgstr "无法发现远程 HEAD 引用"
5346
7aea43ff 5347#: builtin/fetch.c:457
c04f5ac3
JX
5348#, c-format
5349msgid "object %s not found"
5350msgstr "对象 %s 未发现"
5351
7aea43ff 5352#: builtin/fetch.c:462
c04f5ac3
JX
5353msgid "[up to date]"
5354msgstr "[最新]"
5355
7aea43ff 5356#: builtin/fetch.c:476
c04f5ac3
JX
5357#, c-format
5358msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5359msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5360
7aea43ff 5361#: builtin/fetch.c:477 builtin/fetch.c:563
c04f5ac3
JX
5362msgid "[rejected]"
5363msgstr "[已拒绝]"
5364
7aea43ff 5365#: builtin/fetch.c:488
c04f5ac3
JX
5366msgid "[tag update]"
5367msgstr "[tag更新]"
5368
90e6ef53 5369# 译者:注意保持前导空格
7aea43ff 5370#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543
c04f5ac3
JX
5371msgid " (unable to update local ref)"
5372msgstr " (不能更新本地引用)"
5373
7aea43ff 5374#: builtin/fetch.c:508
c04f5ac3
JX
5375msgid "[new tag]"
5376msgstr "[新tag]"
5377
7aea43ff 5378#: builtin/fetch.c:511
c04f5ac3
JX
5379msgid "[new branch]"
5380msgstr "[新分支]"
5381
7aea43ff 5382#: builtin/fetch.c:514
170e9899
JX
5383msgid "[new ref]"
5384msgstr "[新引用]"
5385
7aea43ff 5386#: builtin/fetch.c:559
c04f5ac3
JX
5387msgid "unable to update local ref"
5388msgstr "不能更新本地引用"
5389
7aea43ff 5390#: builtin/fetch.c:559
c04f5ac3
JX
5391msgid "forced update"
5392msgstr "强制更新"
5393
7aea43ff 5394#: builtin/fetch.c:565
c04f5ac3 5395msgid "(non-fast-forward)"
90e6ef53 5396msgstr "(非快进式)"
c04f5ac3 5397
7aea43ff 5398#: builtin/fetch.c:599 builtin/fetch.c:832
c04f5ac3
JX
5399#, c-format
5400msgid "cannot open %s: %s\n"
5401msgstr "无法打开 %s:%s\n"
5402
7aea43ff 5403#: builtin/fetch.c:608
c04f5ac3
JX
5404#, c-format
5405msgid "%s did not send all necessary objects\n"
5406msgstr "%s 未发送所有必须的对象\n"
5407
7aea43ff 5408#: builtin/fetch.c:626
cfff71a9
JX
5409#, c-format
5410msgid "reject %s because shallow roots are not allowed to be updated"
5411msgstr "拒绝 %s 因为浅克隆不允许被更新"
5412
7aea43ff 5413#: builtin/fetch.c:714 builtin/fetch.c:797
c04f5ac3
JX
5414#, c-format
5415msgid "From %.*s\n"
5416msgstr "来自 %.*s\n"
5417
7aea43ff 5418#: builtin/fetch.c:725
c04f5ac3
JX
5419#, c-format
5420msgid ""
5421"some local refs could not be updated; try running\n"
5422" 'git remote prune %s' to remove any old, conflicting branches"
5423msgstr ""
5424"一些本地引用不能被更新;尝试运行\n"
5425" 'git remote prune %s' 来删除旧的、有冲突的分支"
5426
90e6ef53 5427# 译者:注意保持前导空格
7aea43ff 5428#: builtin/fetch.c:777
81809b99 5429#, c-format
8ada9598 5430msgid " (%s will become dangling)"
07432cef 5431msgstr " (%s 将成为摇摆状态)"
c04f5ac3 5432
90e6ef53 5433# 译者:注意保持前导空格
7aea43ff 5434#: builtin/fetch.c:778
81809b99 5435#, c-format
8ada9598 5436msgid " (%s has become dangling)"
07432cef 5437msgstr " (%s 已成为摇摆状态)"
c04f5ac3 5438
7aea43ff 5439#: builtin/fetch.c:802
c04f5ac3
JX
5440msgid "[deleted]"
5441msgstr "[已删除]"
5442
7aea43ff 5443#: builtin/fetch.c:803 builtin/remote.c:1057
c04f5ac3
JX
5444msgid "(none)"
5445msgstr "(无)"
5446
7aea43ff 5447#: builtin/fetch.c:822
c04f5ac3
JX
5448#, c-format
5449msgid "Refusing to fetch into current branch %s of non-bare repository"
220c313c 5450msgstr "拒绝获取到非纯版本库的当前分支 %s"
c04f5ac3 5451
7aea43ff 5452#: builtin/fetch.c:841
c04f5ac3
JX
5453#, c-format
5454msgid "Option \"%s\" value \"%s\" is not valid for %s"
5455msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5456
7aea43ff 5457#: builtin/fetch.c:844
c04f5ac3
JX
5458#, c-format
5459msgid "Option \"%s\" is ignored for %s\n"
81809b99 5460msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 5461
7aea43ff 5462#: builtin/fetch.c:900
90314792
JX
5463#, c-format
5464msgid "Don't know how to fetch from %s"
5465msgstr "不知道如何从 %s 获取"
5466
7aea43ff 5467#: builtin/fetch.c:1063
c04f5ac3
JX
5468#, c-format
5469msgid "Fetching %s\n"
d4a8e00b 5470msgstr "正在获取 %s\n"
c04f5ac3 5471
7aea43ff 5472#: builtin/fetch.c:1065 builtin/remote.c:90
c04f5ac3
JX
5473#, c-format
5474msgid "Could not fetch %s"
5475msgstr "不能获取 %s"
5476
7aea43ff 5477#: builtin/fetch.c:1083
c04f5ac3
JX
5478msgid ""
5479"No remote repository specified. Please, specify either a URL or a\n"
5480"remote name from which new revisions should be fetched."
90e6ef53 5481msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
c04f5ac3 5482
7aea43ff 5483#: builtin/fetch.c:1106
c04f5ac3 5484msgid "You need to specify a tag name."
90e6ef53 5485msgstr "您需要指定一个 tag 名称。"
c04f5ac3 5486
7aea43ff 5487#: builtin/fetch.c:1148
a77c07d9
JX
5488msgid "--depth and --unshallow cannot be used together"
5489msgstr "--depth 和 --unshallow 不能同时使用"
5490
7aea43ff 5491#: builtin/fetch.c:1150
a77c07d9
JX
5492msgid "--unshallow on a complete repository does not make sense"
5493msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
5494
7aea43ff 5495#: builtin/fetch.c:1173
c04f5ac3
JX
5496msgid "fetch --all does not take a repository argument"
5497msgstr "fetch --all 不能带一个版本库参数"
5498
7aea43ff 5499#: builtin/fetch.c:1175
c04f5ac3 5500msgid "fetch --all does not make sense with refspecs"
90314792 5501msgstr "fetch --all 带引用规则没有任何意义"
c04f5ac3 5502
7aea43ff 5503#: builtin/fetch.c:1186
c04f5ac3
JX
5504#, c-format
5505msgid "No such remote or remote group: %s"
5506msgstr "没有这样的远程或远程组:%s"
5507
7aea43ff 5508#: builtin/fetch.c:1194
c04f5ac3 5509msgid "Fetching a group and specifying refspecs does not make sense"
90314792 5510msgstr "获取组并指定引用规则没有意义"
c04f5ac3 5511
ef317cd5 5512#: builtin/fmt-merge-msg.c:13
814ff314
JX
5513msgid ""
5514"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
5515msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
c04f5ac3 5516
7aea43ff 5517#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698
04cb2f28 5518#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
7aea43ff
JX
5519#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590
5520#: parse-options.h:131 parse-options.h:238
ef317cd5 5521msgid "n"
07432cef 5522msgstr "n"
c04f5ac3 5523
7aea43ff 5524#: builtin/fmt-merge-msg.c:669
ef317cd5 5525msgid "populate log with at most <n> entries from shortlog"
07432cef 5526msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 5527
7aea43ff 5528#: builtin/fmt-merge-msg.c:672
ef317cd5 5529msgid "alias for --log (deprecated)"
07432cef 5530msgstr "参数 --log 的别名(已弃用)"
ef317cd5 5531
7aea43ff 5532#: builtin/fmt-merge-msg.c:675
ef317cd5 5533msgid "text"
07432cef 5534msgstr "文本"
ef317cd5 5535
7aea43ff 5536#: builtin/fmt-merge-msg.c:676
ef317cd5 5537msgid "use <text> as start of message"
07432cef 5538msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 5539
7aea43ff 5540#: builtin/fmt-merge-msg.c:677
ef317cd5 5541msgid "file to read from"
07432cef 5542msgstr "从文件中读取"
ef317cd5 5543
7aea43ff 5544#: builtin/for-each-ref.c:687
220c313c
JX
5545msgid "unable to parse format"
5546msgstr "不能解析格式"
5547
7aea43ff 5548#: builtin/for-each-ref.c:1083
814ff314
JX
5549msgid "git for-each-ref [<options>] [<pattern>]"
5550msgstr "git for-each-ref [<选项>] [<模式>]"
ef317cd5 5551
7aea43ff 5552#: builtin/for-each-ref.c:1098
ef317cd5 5553msgid "quote placeholders suitably for shells"
07432cef 5554msgstr "引用占位符适用于 shells"
ef317cd5 5555
7aea43ff 5556#: builtin/for-each-ref.c:1100
ef317cd5 5557msgid "quote placeholders suitably for perl"
07432cef 5558msgstr "引用占位符适用于 perl"
ef317cd5 5559
7aea43ff 5560#: builtin/for-each-ref.c:1102
ef317cd5 5561msgid "quote placeholders suitably for python"
07432cef 5562msgstr "引用占位符适用于 python"
ef317cd5 5563
7aea43ff 5564#: builtin/for-each-ref.c:1104
04cb2f28
JX
5565msgid "quote placeholders suitably for Tcl"
5566msgstr "引用占位符适用于 Tcl"
ef317cd5 5567
7aea43ff 5568#: builtin/for-each-ref.c:1107
ef317cd5 5569msgid "show only <n> matched refs"
07432cef 5570msgstr "只显示 <n> 个匹配的引用"
ef317cd5 5571
7aea43ff 5572#: builtin/for-each-ref.c:1108 builtin/replace.c:438
ef317cd5 5573msgid "format"
07432cef 5574msgstr "格式"
ef317cd5 5575
7aea43ff 5576#: builtin/for-each-ref.c:1108
ef317cd5 5577msgid "format to use for the output"
07432cef 5578msgstr "输出格式"
ef317cd5 5579
7aea43ff 5580#: builtin/for-each-ref.c:1109
ef317cd5 5581msgid "key"
07432cef 5582msgstr "key"
ef317cd5 5583
7aea43ff 5584#: builtin/for-each-ref.c:1110
ef317cd5 5585msgid "field name to sort on"
07432cef 5586msgstr "排序的字段名"
ef317cd5 5587
7aea43ff 5588#: builtin/fsck.c:147 builtin/prune.c:236
6c94aba5
JX
5589msgid "Checking connectivity"
5590msgstr "检查连接中"
5591
7aea43ff 5592#: builtin/fsck.c:548
6c94aba5
JX
5593msgid "Checking object directories"
5594msgstr "检查对象目录中"
5595
7aea43ff 5596#: builtin/fsck.c:611
814ff314
JX
5597msgid "git fsck [<options>] [<object>...]"
5598msgstr "git fsck [<选项>] [<对象>...]"
ef317cd5 5599
7aea43ff 5600#: builtin/fsck.c:617
ef317cd5 5601msgid "show unreachable objects"
07432cef 5602msgstr "显示不可达的对象"
ef317cd5 5603
7aea43ff 5604#: builtin/fsck.c:618
ef317cd5 5605msgid "show dangling objects"
07432cef 5606msgstr "显示摇摆的对象"
ef317cd5 5607
7aea43ff 5608#: builtin/fsck.c:619
ef317cd5 5609msgid "report tags"
07432cef 5610msgstr "报告 tags"
ef317cd5 5611
7aea43ff 5612#: builtin/fsck.c:620
ef317cd5 5613msgid "report root nodes"
07432cef 5614msgstr "报告根节点"
ef317cd5 5615
7aea43ff 5616#: builtin/fsck.c:621
ef317cd5 5617msgid "make index objects head nodes"
07432cef 5618msgstr "将索引亦作为检查的头节点"
ef317cd5 5619
7aea43ff 5620#: builtin/fsck.c:622
ef317cd5 5621msgid "make reflogs head nodes (default)"
07432cef 5622msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 5623
7aea43ff 5624#: builtin/fsck.c:623
ef317cd5 5625msgid "also consider packs and alternate objects"
07432cef 5626msgstr "也考虑包和备用对象"
ef317cd5 5627
7aea43ff 5628#: builtin/fsck.c:624
ef317cd5 5629msgid "enable more strict checking"
07432cef 5630msgstr "启用更严格的检查"
ef317cd5 5631
7aea43ff 5632#: builtin/fsck.c:626
ef317cd5 5633msgid "write dangling objects in .git/lost-found"
07432cef 5634msgstr "将摇摆对象写入 .git/lost-found 中"
ef317cd5 5635
7aea43ff 5636#: builtin/fsck.c:627 builtin/prune.c:198
ef317cd5 5637msgid "show progress"
07432cef 5638msgstr "显示进度"
ef317cd5 5639
7aea43ff 5640#: builtin/fsck.c:677
6c94aba5
JX
5641msgid "Checking objects"
5642msgstr "检查对象中"
5643
cfff71a9 5644#: builtin/gc.c:24
814ff314
JX
5645msgid "git gc [<options>]"
5646msgstr "git gc [<选项>]"
ef317cd5 5647
7aea43ff 5648#: builtin/gc.c:67
c04f5ac3 5649#, c-format
7aea43ff
JX
5650msgid "Invalid %s: '%s'"
5651msgstr "无效 %s:'%s'"
c04f5ac3 5652
7aea43ff 5653#: builtin/gc.c:112
c04f5ac3
JX
5654#, c-format
5655msgid "insanely long object directory %.*s"
5656msgstr "不正常的长对象目录 %.*s"
5657
7aea43ff 5658#: builtin/gc.c:281
ef317cd5 5659msgid "prune unreferenced objects"
07432cef 5660msgstr "清除未引用的对象"
ef317cd5 5661
7aea43ff 5662#: builtin/gc.c:283
ef317cd5 5663msgid "be more thorough (increased runtime)"
07432cef 5664msgstr "更彻底(增加运行时间)"
ef317cd5 5665
7aea43ff 5666#: builtin/gc.c:284
ef317cd5 5667msgid "enable auto-gc mode"
07432cef 5668msgstr "启用自动垃圾回收模式"
ef317cd5 5669
7aea43ff 5670#: builtin/gc.c:285
90314792
JX
5671msgid "force running gc even if there may be another gc running"
5672msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5673
7aea43ff 5674#: builtin/gc.c:327
c04f5ac3 5675#, c-format
6c94aba5
JX
5676msgid "Auto packing the repository in background for optimum performance.\n"
5677msgstr "自动在后台执行版本库打包以求最佳性能。\n"
5678
7aea43ff 5679#: builtin/gc.c:329
6c94aba5
JX
5680#, c-format
5681msgid "Auto packing the repository for optimum performance.\n"
5682msgstr "自动打包版本库以求最佳性能。\n"
5683
7aea43ff 5684#: builtin/gc.c:330
6c94aba5
JX
5685#, c-format
5686msgid "See \"git help gc\" for manual housekeeping.\n"
5687msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 5688
7aea43ff 5689#: builtin/gc.c:348
90314792
JX
5690#, c-format
5691msgid ""
5692"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5693msgstr ""
5694"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5695
7aea43ff 5696#: builtin/gc.c:376
c04f5ac3
JX
5697msgid ""
5698"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 5699msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 5700
90314792 5701#: builtin/grep.c:23
814ff314
JX
5702msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
5703msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
ef317cd5 5704
90314792 5705#: builtin/grep.c:218
c04f5ac3
JX
5706#, c-format
5707msgid "grep: failed to create thread: %s"
90e6ef53 5708msgstr "grep:无法创建线程:%s"
c04f5ac3 5709
6acbf033 5710#: builtin/grep.c:441 builtin/grep.c:476
c04f5ac3
JX
5711#, c-format
5712msgid "unable to read tree (%s)"
90e6ef53 5713msgstr "无法读取树(%s)"
c04f5ac3 5714
6acbf033 5715#: builtin/grep.c:491
c04f5ac3
JX
5716#, c-format
5717msgid "unable to grep from object of type %s"
5718msgstr "无法抓取来自于 %s 类型的对象"
5719
6acbf033 5720#: builtin/grep.c:547
c04f5ac3
JX
5721#, c-format
5722msgid "switch `%c' expects a numerical value"
5723msgstr "开关 `%c' 期望一个数字值"
5724
6acbf033 5725#: builtin/grep.c:564
c04f5ac3
JX
5726#, c-format
5727msgid "cannot open '%s'"
5728msgstr "不能打开 '%s'"
5729
6acbf033 5730#: builtin/grep.c:638
ef317cd5 5731msgid "search in index instead of in the work tree"
07432cef 5732msgstr "在索引区搜索而不是在工作区"
ef317cd5 5733
6acbf033 5734#: builtin/grep.c:640
ef317cd5 5735msgid "find in contents not managed by git"
07432cef 5736msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
5737
5738# 译者:中文字符串拼接,可删除前导空格
6acbf033 5739#: builtin/grep.c:642
ef317cd5 5740msgid "search in both tracked and untracked files"
07432cef 5741msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 5742
6acbf033 5743#: builtin/grep.c:644
814ff314
JX
5744msgid "ignore files specified via '.gitignore'"
5745msgstr "忽略 '.gitignore' 包含的文件"
ef317cd5 5746
6acbf033 5747#: builtin/grep.c:647
ef317cd5 5748msgid "show non-matching lines"
07432cef 5749msgstr "显示未匹配的行"
ef317cd5 5750
6acbf033 5751#: builtin/grep.c:649
ef317cd5 5752msgid "case insensitive matching"
07432cef 5753msgstr "不区分大小写匹配"
ef317cd5 5754
6acbf033 5755#: builtin/grep.c:651
ef317cd5 5756msgid "match patterns only at word boundaries"
07432cef 5757msgstr "只在单词边界匹配模式"
ef317cd5 5758
6acbf033 5759#: builtin/grep.c:653
ef317cd5 5760msgid "process binary files as text"
07432cef 5761msgstr "把二进制文件当做文本处理"
ef317cd5 5762
6acbf033 5763#: builtin/grep.c:655
ef317cd5 5764msgid "don't match patterns in binary files"
07432cef 5765msgstr "不在二进制文件中匹配模式"
ef317cd5 5766
6acbf033 5767#: builtin/grep.c:658
90314792
JX
5768msgid "process binary files with textconv filters"
5769msgstr "用 textconv 过滤器处理二进制文件"
5770
6acbf033 5771#: builtin/grep.c:660
ef317cd5 5772msgid "descend at most <depth> levels"
07432cef 5773msgstr "最多以指定的深度向下寻找"
ef317cd5 5774
6acbf033 5775#: builtin/grep.c:664
ef317cd5 5776msgid "use extended POSIX regular expressions"
07432cef 5777msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 5778
6acbf033 5779#: builtin/grep.c:667
ef317cd5 5780msgid "use basic POSIX regular expressions (default)"
07432cef 5781msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 5782
6acbf033 5783#: builtin/grep.c:670
ef317cd5 5784msgid "interpret patterns as fixed strings"
07432cef 5785msgstr "把模式解析为固定的字符串"
ef317cd5 5786
6acbf033 5787#: builtin/grep.c:673
ef317cd5 5788msgid "use Perl-compatible regular expressions"
07432cef 5789msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 5790
6acbf033 5791#: builtin/grep.c:676
ef317cd5 5792msgid "show line numbers"
07432cef 5793msgstr "显示行号"
ef317cd5 5794
6acbf033 5795#: builtin/grep.c:677
ef317cd5 5796msgid "don't show filenames"
07432cef 5797msgstr "不显示文件名"
ef317cd5 5798
6acbf033 5799#: builtin/grep.c:678
ef317cd5 5800msgid "show filenames"
07432cef 5801msgstr "显示文件名"
ef317cd5 5802
6acbf033 5803#: builtin/grep.c:680
ef317cd5 5804msgid "show filenames relative to top directory"
07432cef 5805msgstr "显示相对于顶级目录的文件名"
ef317cd5 5806
6acbf033 5807#: builtin/grep.c:682
ef317cd5 5808msgid "show only filenames instead of matching lines"
07432cef 5809msgstr "只显示文件名而不显示匹配的行"
ef317cd5 5810
6acbf033 5811#: builtin/grep.c:684
ef317cd5 5812msgid "synonym for --files-with-matches"
07432cef 5813msgstr "和 --files-with-matches 同义"
ef317cd5 5814
6acbf033 5815#: builtin/grep.c:687
ef317cd5 5816msgid "show only the names of files without match"
07432cef 5817msgstr "只显示未匹配的文件名"
ef317cd5 5818
6acbf033 5819#: builtin/grep.c:689
ef317cd5 5820msgid "print NUL after filenames"
07432cef 5821msgstr "在文件名后输出 NUL 字符"
ef317cd5 5822
6acbf033 5823#: builtin/grep.c:691
ef317cd5 5824msgid "show the number of matches instead of matching lines"
07432cef 5825msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 5826
6acbf033 5827#: builtin/grep.c:692
ef317cd5 5828msgid "highlight matches"
07432cef 5829msgstr "高亮显示匹配项"
ef317cd5 5830
6acbf033 5831#: builtin/grep.c:694
ef317cd5 5832msgid "print empty line between matches from different files"
07432cef 5833msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 5834
6acbf033 5835#: builtin/grep.c:696
ef317cd5 5836msgid "show filename only once above matches from same file"
07432cef 5837msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 5838
6acbf033 5839#: builtin/grep.c:699
ef317cd5 5840msgid "show <n> context lines before and after matches"
07432cef 5841msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 5842
6acbf033 5843#: builtin/grep.c:702
ef317cd5 5844msgid "show <n> context lines before matches"
07432cef 5845msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 5846
6acbf033 5847#: builtin/grep.c:704
ef317cd5 5848msgid "show <n> context lines after matches"
07432cef 5849msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 5850
6acbf033 5851#: builtin/grep.c:705
ef317cd5 5852msgid "shortcut for -C NUM"
07432cef 5853msgstr "快捷键 -C 数字"
ef317cd5 5854
6acbf033 5855#: builtin/grep.c:708
ef317cd5 5856msgid "show a line with the function name before matches"
07432cef 5857msgstr "在匹配的前面显示一行函数名"
ef317cd5 5858
6acbf033 5859#: builtin/grep.c:710
ef317cd5 5860msgid "show the surrounding function"
07432cef 5861msgstr "显示所在函数的前后内容"
ef317cd5 5862
6acbf033 5863#: builtin/grep.c:713
ef317cd5 5864msgid "read patterns from file"
07432cef 5865msgstr "从文件读取模式"
ef317cd5 5866
6acbf033 5867#: builtin/grep.c:715
ef317cd5 5868msgid "match <pattern>"
07432cef 5869msgstr "匹配 <模式>"
ef317cd5 5870
6acbf033 5871#: builtin/grep.c:717
ef317cd5 5872msgid "combine patterns specified with -e"
07432cef 5873msgstr "组合用 -e 参数设定的模式"
ef317cd5 5874
6acbf033 5875#: builtin/grep.c:729
ef317cd5 5876msgid "indicate hit with exit status without output"
07432cef 5877msgstr "不输出,而用退出码标识命中状态"
ef317cd5 5878
6acbf033 5879#: builtin/grep.c:731
ef317cd5 5880msgid "show only matches from files that match all patterns"
07432cef 5881msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 5882
6acbf033 5883#: builtin/grep.c:733
07432cef
WS
5884msgid "show parse tree for grep expression"
5885msgstr "显示 grep 表达式的解析树"
5886
6acbf033 5887#: builtin/grep.c:737
ef317cd5 5888msgid "pager"
07432cef 5889msgstr "分页"
ef317cd5 5890
6acbf033 5891#: builtin/grep.c:737
ef317cd5 5892msgid "show matching files in the pager"
07432cef 5893msgstr "分页显示匹配的文件"
ef317cd5 5894
6acbf033 5895#: builtin/grep.c:740
ef317cd5 5896msgid "allow calling of grep(1) (ignored by this build)"
07432cef 5897msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 5898
7aea43ff 5899#: builtin/grep.c:741 builtin/show-ref.c:189
ef317cd5 5900msgid "show usage"
07432cef 5901msgstr "显示用法"
ef317cd5 5902
6acbf033 5903#: builtin/grep.c:808
c04f5ac3
JX
5904msgid "no pattern given."
5905msgstr "未提供模式匹配。"
5906
6acbf033 5907#: builtin/grep.c:866
c04f5ac3
JX
5908msgid "--open-files-in-pager only works on the worktree"
5909msgstr "--open-files-in-pager 仅用于工作区"
5910
6acbf033 5911#: builtin/grep.c:892
c04f5ac3 5912msgid "--cached or --untracked cannot be used with --no-index."
649900bc 5913msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
c04f5ac3 5914
6acbf033 5915#: builtin/grep.c:897
c04f5ac3 5916msgid "--no-index or --untracked cannot be used with revs."
649900bc 5917msgstr "--no-index 或 --untracked 不能和版本同时使用。"
c04f5ac3 5918
6acbf033 5919#: builtin/grep.c:900
c04f5ac3 5920msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 5921msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 5922
6acbf033 5923#: builtin/grep.c:908
c04f5ac3
JX
5924msgid "both --cached and trees are given."
5925msgstr "同时给出了 --cached 和树对象。"
5926
7aea43ff 5927#: builtin/hash-object.c:80
ef317cd5 5928msgid ""
814ff314
JX
5929"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
5930"[--] <file>..."
ef317cd5 5931msgstr ""
814ff314
JX
5932"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
5933"[--] <文件>..."
ef317cd5 5934
7aea43ff 5935#: builtin/hash-object.c:81
ef317cd5 5936msgid "git hash-object --stdin-paths < <list-of-paths>"
07432cef 5937msgstr "git hash-object --stdin-paths < <路径列表>"
ef317cd5 5938
7aea43ff 5939#: builtin/hash-object.c:92 builtin/tag.c:612
ef317cd5 5940msgid "type"
07432cef 5941msgstr "类型"
ef317cd5 5942
7aea43ff 5943#: builtin/hash-object.c:92
ef317cd5 5944msgid "object type"
07432cef 5945msgstr "对象类型"
ef317cd5 5946
7aea43ff 5947#: builtin/hash-object.c:93
ef317cd5 5948msgid "write the object into the object database"
07432cef 5949msgstr "将对象写入对象数据库"
ef317cd5 5950
7aea43ff 5951#: builtin/hash-object.c:95
ef317cd5 5952msgid "read the object from stdin"
07432cef 5953msgstr "从标准输入读取对象"
ef317cd5 5954
7aea43ff 5955#: builtin/hash-object.c:97
ef317cd5 5956msgid "store file as is without filters"
07432cef 5957msgstr "原样存储文件不使用过滤器"
ef317cd5 5958
7aea43ff 5959#: builtin/hash-object.c:98
220c313c
JX
5960msgid ""
5961"just hash any random garbage to create corrupt objects for debugging Git"
5962msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
5963
7aea43ff 5964#: builtin/hash-object.c:99
ef317cd5 5965msgid "process file as it were from this path"
07432cef 5966msgstr "处理文件并假设其来自于此路径"
ef317cd5 5967
2e8451e8 5968#: builtin/help.c:41
ef317cd5 5969msgid "print all available commands"
07432cef 5970msgstr "打印所有可用的命令"
ef317cd5 5971
2e8451e8 5972#: builtin/help.c:42
4dcdc3d8
JX
5973msgid "print list of useful guides"
5974msgstr "显示有用的指南列表"
5975
2e8451e8 5976#: builtin/help.c:43
ef317cd5 5977msgid "show man page"
07432cef 5978msgstr "显示 man 手册"
ef317cd5 5979
2e8451e8 5980#: builtin/help.c:44
ef317cd5 5981msgid "show manual in web browser"
07432cef 5982msgstr "在 web 浏览器中显示手册"
ef317cd5 5983
2e8451e8 5984#: builtin/help.c:46
ef317cd5 5985msgid "show info page"
07432cef 5986msgstr "显示 info 手册"
ef317cd5 5987
2e8451e8 5988#: builtin/help.c:52
814ff314
JX
5989msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
5990msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
ef317cd5 5991
2e8451e8 5992#: builtin/help.c:64
81809b99 5993#, c-format
8ada9598 5994msgid "unrecognized help format '%s'"
81809b99 5995msgstr "未能识别的帮助格式 '%s'"
8ada9598 5996
220c313c 5997#: builtin/help.c:91
8ada9598 5998msgid "Failed to start emacsclient."
81809b99 5999msgstr "无法启动 emacsclient。"
8ada9598 6000
220c313c 6001#: builtin/help.c:104
8ada9598 6002msgid "Failed to parse emacsclient version."
81809b99 6003msgstr "无法解析 emacsclient 版本。"
8ada9598 6004
220c313c 6005#: builtin/help.c:112
8ada9598
JX
6006#, c-format
6007msgid "emacsclient version '%d' too old (< 22)."
07432cef 6008msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 6009
220c313c 6010#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
81809b99 6011#, c-format
8ada9598 6012msgid "failed to exec '%s': %s"
81809b99 6013msgstr "无法执行 '%s':%s"
8ada9598 6014
220c313c 6015#: builtin/help.c:215
8ada9598
JX
6016#, c-format
6017msgid ""
6018"'%s': path for unsupported man viewer.\n"
6019"Please consider using 'man.<tool>.cmd' instead."
6020msgstr ""
81809b99 6021"'%s':不支持的 man 手册查看器的路径。\n"
d9d56b23 6022"请使用 'man.<工具>.cmd'。"
8ada9598 6023
220c313c 6024#: builtin/help.c:227
8ada9598
JX
6025#, c-format
6026msgid ""
6027"'%s': cmd for supported man viewer.\n"
6028"Please consider using 'man.<tool>.path' instead."
6029msgstr ""
81809b99 6030"'%s': 支持的 man 手册查看器命令。\n"
d9d56b23 6031"请使用 'man.<工具>.path'。"
8ada9598 6032
04cb2f28 6033#: builtin/help.c:354
8ada9598
JX
6034#, c-format
6035msgid "'%s': unknown man viewer."
81809b99 6036msgstr "'%s':未知的 man 查看器。"
8ada9598 6037
04cb2f28 6038#: builtin/help.c:371
8ada9598 6039msgid "no man viewer handled the request"
81809b99 6040msgstr "没有 man 查看器处理此请求"
8ada9598 6041
04cb2f28 6042#: builtin/help.c:379
8ada9598 6043msgid "no info viewer handled the request"
81809b99 6044msgstr "没有 info 查看器处理此请求"
8ada9598 6045
04cb2f28 6046#: builtin/help.c:428
4dcdc3d8
JX
6047msgid "Defining attributes per path"
6048msgstr "定义路径的属性"
6049
04cb2f28 6050#: builtin/help.c:429
220c313c
JX
6051msgid "Everyday Git With 20 Commands Or So"
6052msgstr "每一天 Git 常用的约 20 条命令"
6053
04cb2f28 6054#: builtin/help.c:430
4dcdc3d8
JX
6055msgid "A Git glossary"
6056msgstr "Git 词汇表"
6057
04cb2f28 6058#: builtin/help.c:431
4dcdc3d8
JX
6059msgid "Specifies intentionally untracked files to ignore"
6060msgstr "忽略指定的未跟踪文件"
6061
04cb2f28 6062#: builtin/help.c:432
4dcdc3d8
JX
6063msgid "Defining submodule properties"
6064msgstr "定义子模组属性"
6065
04cb2f28 6066#: builtin/help.c:433
4dcdc3d8
JX
6067msgid "Specifying revisions and ranges for Git"
6068msgstr "指定 Git 的版本和版本范围"
6069
04cb2f28 6070#: builtin/help.c:434
4dcdc3d8
JX
6071msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
6072msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
6073
04cb2f28 6074#: builtin/help.c:435
4dcdc3d8
JX
6075msgid "An overview of recommended workflows with Git"
6076msgstr "Git 推荐的工作流概览"
6077
04cb2f28 6078#: builtin/help.c:447
4dcdc3d8
JX
6079msgid "The common Git guides are:\n"
6080msgstr "最常用的 Git 向导有:\n"
6081
04cb2f28 6082#: builtin/help.c:468 builtin/help.c:485
8ada9598
JX
6083#, c-format
6084msgid "usage: %s%s"
81809b99 6085msgstr "用法:%s%s"
8ada9598 6086
04cb2f28 6087#: builtin/help.c:501
8ada9598
JX
6088#, c-format
6089msgid "`git %s' is aliased to `%s'"
81809b99 6090msgstr "`git %s' 是 `%s' 的别名"
8ada9598 6091
7aea43ff 6092#: builtin/index-pack.c:151
6acbf033
JX
6093#, c-format
6094msgid "unable to open %s"
6095msgstr "不能打开 %s"
6096
7aea43ff 6097#: builtin/index-pack.c:201
8ada9598
JX
6098#, c-format
6099msgid "object type mismatch at %s"
81809b99 6100msgstr "%s 的对象类型不匹配"
8ada9598 6101
7aea43ff 6102#: builtin/index-pack.c:221
6acbf033
JX
6103#, c-format
6104msgid "did not receive expected object %s"
6105msgstr "未能获取期望的对象 %s"
8ada9598 6106
7aea43ff 6107#: builtin/index-pack.c:224
6acbf033
JX
6108#, c-format
6109msgid "object %s: expected type %s, found %s"
6110msgstr "对象 %s:期待类型 %s,却是 %s"
6111
7aea43ff 6112#: builtin/index-pack.c:266
81809b99 6113#, c-format
8ada9598
JX
6114msgid "cannot fill %d byte"
6115msgid_plural "cannot fill %d bytes"
81809b99 6116msgstr[0] "无法填充 %d 字节"
5ae481e0 6117msgstr[1] "无法填充 %d 字节"
8ada9598 6118
7aea43ff 6119#: builtin/index-pack.c:276
8ada9598 6120msgid "early EOF"
81809b99 6121msgstr "过早的文件结束符(EOF)"
8ada9598 6122
7aea43ff 6123#: builtin/index-pack.c:277
8ada9598 6124msgid "read error on input"
81809b99 6125msgstr "输入上的读错误"
8ada9598 6126
7aea43ff 6127#: builtin/index-pack.c:289
8ada9598 6128msgid "used more bytes than were available"
81809b99 6129msgstr "用掉了超过可用的字节"
8ada9598 6130
7aea43ff 6131#: builtin/index-pack.c:296
8ada9598 6132msgid "pack too large for current definition of off_t"
81809b99 6133msgstr "包太大超过了当前 off_t 的定义"
8ada9598 6134
7aea43ff 6135#: builtin/index-pack.c:312
81809b99 6136#, c-format
8ada9598 6137msgid "unable to create '%s'"
81809b99 6138msgstr "不能创建 '%s'"
8ada9598 6139
7aea43ff 6140#: builtin/index-pack.c:317
81809b99 6141#, c-format
8ada9598 6142msgid "cannot open packfile '%s'"
81809b99 6143msgstr "无法打开包文件 '%s'"
8ada9598 6144
7aea43ff 6145#: builtin/index-pack.c:331
8ada9598 6146msgid "pack signature mismatch"
81809b99 6147msgstr "包签名不匹配"
8ada9598 6148
7aea43ff 6149#: builtin/index-pack.c:333
ef317cd5
JX
6150#, c-format
6151msgid "pack version %<PRIu32> unsupported"
07432cef 6152msgstr "不支持包版本 %<PRIu32>"
ef317cd5 6153
7aea43ff 6154#: builtin/index-pack.c:351
8ada9598
JX
6155#, c-format
6156msgid "pack has bad object at offset %lu: %s"
81809b99 6157msgstr "包中有错误的对象位于 %lu:%s"
8ada9598 6158
7aea43ff 6159#: builtin/index-pack.c:472
8ada9598
JX
6160#, c-format
6161msgid "inflate returned %d"
81809b99 6162msgstr "解压缩返回 %d"
8ada9598 6163
7aea43ff 6164#: builtin/index-pack.c:521
8ada9598 6165msgid "offset value overflow for delta base object"
81809b99 6166msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 6167
7aea43ff 6168#: builtin/index-pack.c:529
8ada9598 6169msgid "delta base offset is out of bound"
81809b99 6170msgstr "delta 基准偏移越界"
8ada9598 6171
7aea43ff 6172#: builtin/index-pack.c:537
81809b99 6173#, c-format
8ada9598 6174msgid "unknown object type %d"
81809b99 6175msgstr "未知对象类型 %d"
8ada9598 6176
7aea43ff 6177#: builtin/index-pack.c:568
8ada9598 6178msgid "cannot pread pack file"
81809b99 6179msgstr "无法读取包文件"
8ada9598 6180
7aea43ff 6181#: builtin/index-pack.c:570
8ada9598
JX
6182#, c-format
6183msgid "premature end of pack file, %lu byte missing"
6184msgid_plural "premature end of pack file, %lu bytes missing"
81809b99 6185msgstr[0] "包文件过早结束,缺少 %lu 字节"
5ae481e0 6186msgstr[1] "包文件过早结束,缺少 %lu 字节"
8ada9598 6187
7aea43ff 6188#: builtin/index-pack.c:596
8ada9598 6189msgid "serious inflate inconsistency"
81809b99 6190msgstr "解压缩严重的不一致"
8ada9598 6191
7aea43ff
JX
6192#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771
6193#: builtin/index-pack.c:805 builtin/index-pack.c:814
8ada9598
JX
6194#, c-format
6195msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 6196msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 6197
7aea43ff 6198#: builtin/index-pack.c:745 builtin/pack-objects.c:162
814ff314 6199#: builtin/pack-objects.c:254
6792b93b
JX
6200#, c-format
6201msgid "unable to read %s"
6202msgstr "不能读 %s"
6203
7aea43ff 6204#: builtin/index-pack.c:811
6792b93b
JX
6205#, c-format
6206msgid "cannot read existing object %s"
6207msgstr "不能读取现存对象 %s"
6208
7aea43ff 6209#: builtin/index-pack.c:825
81809b99 6210#, c-format
8ada9598 6211msgid "invalid blob object %s"
07432cef 6212msgstr "无效的数据(blob)对象 %s"
8ada9598 6213
7aea43ff 6214#: builtin/index-pack.c:839
81809b99 6215#, c-format
8ada9598 6216msgid "invalid %s"
81809b99 6217msgstr "无效的 %s"
8ada9598 6218
7aea43ff 6219#: builtin/index-pack.c:843
8ada9598 6220msgid "Error in object"
81809b99 6221msgstr "对象中出错"
8ada9598 6222
7aea43ff 6223#: builtin/index-pack.c:845
8ada9598
JX
6224#, c-format
6225msgid "Not all child objects of %s are reachable"
81809b99 6226msgstr "%s 的所有子对象并非都可达"
8ada9598 6227
7aea43ff 6228#: builtin/index-pack.c:917 builtin/index-pack.c:948
8ada9598 6229msgid "failed to apply delta"
81809b99 6230msgstr "无法应用 delta"
8ada9598 6231
7aea43ff 6232#: builtin/index-pack.c:1118
8ada9598 6233msgid "Receiving objects"
81809b99 6234msgstr "接收对象中"
8ada9598 6235
7aea43ff 6236#: builtin/index-pack.c:1118
8ada9598 6237msgid "Indexing objects"
81809b99 6238msgstr "索引对象中"
8ada9598 6239
7aea43ff 6240#: builtin/index-pack.c:1150
8ada9598 6241msgid "pack is corrupted (SHA1 mismatch)"
81809b99 6242msgstr "包冲突(SHA1 不匹配)"
8ada9598 6243
7aea43ff 6244#: builtin/index-pack.c:1155
8ada9598 6245msgid "cannot fstat packfile"
81809b99 6246msgstr "不能枚举包文件状态"
8ada9598 6247
7aea43ff 6248#: builtin/index-pack.c:1158
8ada9598 6249msgid "pack has junk at the end"
81809b99 6250msgstr "包的结尾有垃圾数据"
8ada9598 6251
7aea43ff 6252#: builtin/index-pack.c:1169
6792b93b
JX
6253msgid "confusion beyond insanity in parse_pack_objects()"
6254msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6255
7aea43ff 6256#: builtin/index-pack.c:1194
8ada9598 6257msgid "Resolving deltas"
81809b99 6258msgstr "处理 delta 中"
8ada9598 6259
7aea43ff 6260#: builtin/index-pack.c:1205
07432cef 6261#, c-format
ef317cd5 6262msgid "unable to create thread: %s"
07432cef 6263msgstr "不能创建线程:%s"
ef317cd5 6264
7aea43ff 6265#: builtin/index-pack.c:1247
8ada9598 6266msgid "confusion beyond insanity"
81809b99 6267msgstr "不可理喻"
8ada9598 6268
7aea43ff 6269#: builtin/index-pack.c:1253
ef317cd5
JX
6270#, c-format
6271msgid "completed with %d local objects"
07432cef 6272msgstr "完成 %d 个本地对象"
ef317cd5 6273
7aea43ff 6274#: builtin/index-pack.c:1263
ef317cd5
JX
6275#, c-format
6276msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 6277msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 6278
7aea43ff 6279#: builtin/index-pack.c:1267
8ada9598
JX
6280#, c-format
6281msgid "pack has %d unresolved delta"
6282msgid_plural "pack has %d unresolved deltas"
81809b99 6283msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 6284msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 6285
7aea43ff 6286#: builtin/index-pack.c:1291
81809b99 6287#, c-format
8ada9598 6288msgid "unable to deflate appended object (%d)"
07432cef 6289msgstr "不能压缩附加对象(%d)"
8ada9598 6290
7aea43ff 6291#: builtin/index-pack.c:1367
8ada9598
JX
6292#, c-format
6293msgid "local object %s is corrupt"
81809b99 6294msgstr "本地对象 %s 已损坏"
8ada9598 6295
7aea43ff 6296#: builtin/index-pack.c:1391
8ada9598 6297msgid "error while closing pack file"
81809b99 6298msgstr "关闭包文件时出错"
8ada9598 6299
7aea43ff 6300#: builtin/index-pack.c:1404
81809b99 6301#, c-format
8ada9598 6302msgid "cannot write keep file '%s'"
81809b99 6303msgstr "无法写保留文件 '%s'"
8ada9598 6304
7aea43ff 6305#: builtin/index-pack.c:1412
81809b99 6306#, c-format
8ada9598 6307msgid "cannot close written keep file '%s'"
81809b99 6308msgstr "无法关闭保留文件 '%s'"
8ada9598 6309
7aea43ff 6310#: builtin/index-pack.c:1425
8ada9598 6311msgid "cannot store pack file"
81809b99 6312msgstr "无法存储包文件"
8ada9598 6313
7aea43ff 6314#: builtin/index-pack.c:1436
8ada9598 6315msgid "cannot store index file"
81809b99 6316msgstr "无法存储索引文件"
8ada9598 6317
7aea43ff 6318#: builtin/index-pack.c:1469
07432cef 6319#, c-format
ef317cd5 6320msgid "bad pack.indexversion=%<PRIu32>"
07432cef 6321msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 6322
7aea43ff 6323#: builtin/index-pack.c:1475
ef317cd5
JX
6324#, c-format
6325msgid "invalid number of threads specified (%d)"
07432cef 6326msgstr "指定的线程数无效(%d)"
ef317cd5 6327
7aea43ff 6328#: builtin/index-pack.c:1479 builtin/index-pack.c:1658
ef317cd5
JX
6329#, c-format
6330msgid "no threads support, ignoring %s"
07432cef 6331msgstr "没有线程支持,忽略 %s"
ef317cd5 6332
7aea43ff 6333#: builtin/index-pack.c:1537
81809b99 6334#, c-format
8ada9598 6335msgid "Cannot open existing pack file '%s'"
81809b99 6336msgstr "无法打开现存包文件 '%s'"
8ada9598 6337
7aea43ff 6338#: builtin/index-pack.c:1539
81809b99 6339#, c-format
8ada9598 6340msgid "Cannot open existing pack idx file for '%s'"
81809b99 6341msgstr "无法为 %s 打开包索引文件"
8ada9598 6342
7aea43ff 6343#: builtin/index-pack.c:1586
81809b99 6344#, c-format
8ada9598
JX
6345msgid "non delta: %d object"
6346msgid_plural "non delta: %d objects"
81809b99 6347msgstr[0] "非 delta:%d 个对象"
5ae481e0 6348msgstr[1] "非 delta:%d 个对象"
8ada9598 6349
7aea43ff 6350#: builtin/index-pack.c:1593
8ada9598
JX
6351#, c-format
6352msgid "chain length = %d: %lu object"
6353msgid_plural "chain length = %d: %lu objects"
81809b99 6354msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 6355msgstr[1] "链长 = %d: %lu 对象"
8ada9598 6356
7aea43ff 6357#: builtin/index-pack.c:1622
8ada9598 6358msgid "Cannot come back to cwd"
81809b99 6359msgstr "无法返回当前工作目录"
8ada9598 6360
7aea43ff
JX
6361#: builtin/index-pack.c:1670 builtin/index-pack.c:1673
6362#: builtin/index-pack.c:1685 builtin/index-pack.c:1689
81809b99 6363#, c-format
8ada9598 6364msgid "bad %s"
81809b99 6365msgstr "错误选项 %s"
8ada9598 6366
7aea43ff 6367#: builtin/index-pack.c:1703
8ada9598 6368msgid "--fix-thin cannot be used without --stdin"
649900bc 6369msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 6370
7aea43ff 6371#: builtin/index-pack.c:1707 builtin/index-pack.c:1716
8ada9598
JX
6372#, c-format
6373msgid "packfile name '%s' does not end with '.pack'"
81809b99 6374msgstr "包名 '%s' 没有以 '.pack' 结尾"
8ada9598 6375
7aea43ff 6376#: builtin/index-pack.c:1724
8ada9598 6377msgid "--verify with no packfile name given"
81809b99 6378msgstr "--verify 没有提供包名参数"
8ada9598 6379
c04f5ac3
JX
6380#: builtin/init-db.c:35
6381#, c-format
6382msgid "Could not make %s writable by group"
6383msgstr "不能设置 %s 为组可写"
6384
6385#: builtin/init-db.c:62
6386#, c-format
6387msgid "insanely long template name %s"
6388msgstr "太长的模版名 %s"
6389
6390#: builtin/init-db.c:67
6391#, c-format
6392msgid "cannot stat '%s'"
6393msgstr "不能枚举 '%s' 状态"
6394
6395#: builtin/init-db.c:73
6396#, c-format
6397msgid "cannot stat template '%s'"
6398msgstr "不能枚举模版 '%s' 状态"
6399
6400#: builtin/init-db.c:80
6401#, c-format
6402msgid "cannot opendir '%s'"
6403msgstr "不能打开目录 '%s'"
6404
6405#: builtin/init-db.c:97
6406#, c-format
6407msgid "cannot readlink '%s'"
6408msgstr "不能读取链接 '%s'"
6409
6410#: builtin/init-db.c:99
6411#, c-format
6412msgid "insanely long symlink %s"
6413msgstr "太长的符号链接 %s"
6414
6415#: builtin/init-db.c:102
6416#, c-format
6417msgid "cannot symlink '%s' '%s'"
90e6ef53 6418msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3
JX
6419
6420#: builtin/init-db.c:106
6421#, c-format
6422msgid "cannot copy '%s' to '%s'"
6423msgstr "不能拷贝 '%s' 至 '%s'"
6424
6425#: builtin/init-db.c:110
6426#, c-format
6427msgid "ignoring template %s"
6428msgstr "忽略模版 %s"
6429
04cb2f28 6430#: builtin/init-db.c:136
c04f5ac3
JX
6431#, c-format
6432msgid "insanely long template path %s"
6433msgstr "太长的模版路径 %s"
6434
04cb2f28 6435#: builtin/init-db.c:144
c04f5ac3
JX
6436#, c-format
6437msgid "templates not found %s"
6438msgstr "模版未找到 %s"
6439
04cb2f28 6440#: builtin/init-db.c:157
c04f5ac3
JX
6441#, c-format
6442msgid "not copying templates of a wrong format version %d from '%s'"
81809b99 6443msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
c04f5ac3 6444
7aea43ff 6445#: builtin/init-db.c:211
c04f5ac3
JX
6446#, c-format
6447msgid "insane git directory %s"
6448msgstr "不正常的 git 目录 %s"
6449
7aea43ff 6450#: builtin/init-db.c:343 builtin/init-db.c:346
c04f5ac3
JX
6451#, c-format
6452msgid "%s already exists"
6453msgstr "%s 已经存在"
6454
7aea43ff 6455#: builtin/init-db.c:374
c04f5ac3
JX
6456#, c-format
6457msgid "unable to handle file type %d"
6458msgstr "不能处理 %d 类型的文件"
6459
7aea43ff 6460#: builtin/init-db.c:377
c04f5ac3
JX
6461#, c-format
6462msgid "unable to move %s to %s"
6463msgstr "不能移动 %s 至 %s"
6464
6c94aba5
JX
6465#. TRANSLATORS: The first '%s' is either "Reinitialized
6466#. existing" or "Initialized empty", the second " shared" or
6467#. "", and the last '%s%s' is the verbatim directory name.
7aea43ff 6468#: builtin/init-db.c:433
c04f5ac3
JX
6469#, c-format
6470msgid "%s%s Git repository in %s%s\n"
6471msgstr "%s%s Git 版本库于 %s%s\n"
6472
7aea43ff 6473#: builtin/init-db.c:434
c04f5ac3
JX
6474msgid "Reinitialized existing"
6475msgstr "重新初始化现存的"
6476
7aea43ff 6477#: builtin/init-db.c:434
c04f5ac3
JX
6478msgid "Initialized empty"
6479msgstr "初始化空的"
6480
7e238ab7 6481# 译者:中文字符串拼接,可删除前导空格
7aea43ff 6482#: builtin/init-db.c:435
c04f5ac3 6483msgid " shared"
90e6ef53 6484msgstr "共享"
c04f5ac3 6485
7aea43ff 6486#: builtin/init-db.c:482
ef317cd5 6487msgid ""
a77c07d9 6488"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
814ff314 6489"shared[=<permissions>]] [<directory>]"
ef317cd5 6490msgstr ""
07432cef 6491"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
814ff314 6492"[<目录>]"
ef317cd5 6493
7aea43ff 6494#: builtin/init-db.c:505
ef317cd5 6495msgid "permissions"
07432cef 6496msgstr "权限"
ef317cd5 6497
7aea43ff 6498#: builtin/init-db.c:506
ef317cd5 6499msgid "specify that the git repository is to be shared amongst several users"
07432cef 6500msgstr "指定 git 版本库是多个用户之间共享的"
ef317cd5 6501
7aea43ff 6502#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171
ef317cd5 6503msgid "be quiet"
07432cef 6504msgstr "保持安静"
ef317cd5 6505
7aea43ff 6506#: builtin/init-db.c:540 builtin/init-db.c:545
c04f5ac3
JX
6507#, c-format
6508msgid "cannot mkdir %s"
6509msgstr "不能创建目录 %s"
6510
7aea43ff 6511#: builtin/init-db.c:549
c04f5ac3
JX
6512#, c-format
6513msgid "cannot chdir to %s"
6514msgstr "不能切换目录到 %s"
6515
7aea43ff 6516#: builtin/init-db.c:570
c04f5ac3
JX
6517#, c-format
6518msgid ""
6519"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6520"dir=<directory>)"
1e607449 6521msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
c04f5ac3 6522
7aea43ff 6523#: builtin/init-db.c:598
c04f5ac3
JX
6524#, c-format
6525msgid "Cannot access work tree '%s'"
6526msgstr "不能访问工作区 '%s'"
6527
220c313c
JX
6528#: builtin/interpret-trailers.c:15
6529msgid ""
6530"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
6531"[<file>...]"
6532msgstr ""
6533"git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
6534">...]"
6535
6536#: builtin/interpret-trailers.c:25
6537msgid "trim empty trailers"
6538msgstr "删除空签名"
6539
6540#: builtin/interpret-trailers.c:26
6541msgid "trailer"
6542msgstr "签名"
6543
6544#: builtin/interpret-trailers.c:27
6545msgid "trailer(s) to add"
6546msgstr "要添加的签名"
6547
2e8451e8 6548#: builtin/log.c:41
7aea43ff 6549msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
d9d56b23 6550msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
ef317cd5 6551
2e8451e8 6552#: builtin/log.c:42
814ff314
JX
6553msgid "git show [<options>] <object>..."
6554msgstr "git show [<选项>] <对象>..."
ef317cd5 6555
220c313c
JX
6556#: builtin/log.c:81
6557#, c-format
6558msgid "invalid --decorate option: %s"
6559msgstr "无效的 --decorate 选项:%s"
6560
6acbf033 6561#: builtin/log.c:127
ef317cd5 6562msgid "suppress diff output"
07432cef 6563msgstr "不显示差异输出"
ef317cd5 6564
6acbf033 6565#: builtin/log.c:128
ef317cd5 6566msgid "show source"
07432cef 6567msgstr "显示源"
ef317cd5 6568
6acbf033 6569#: builtin/log.c:129
07432cef
WS
6570msgid "Use mail map file"
6571msgstr "使用邮件映射文件"
6572
6acbf033 6573#: builtin/log.c:130
ef317cd5 6574msgid "decorate options"
07432cef 6575msgstr "修饰选项"
ef317cd5 6576
220c313c
JX
6577#: builtin/log.c:133
6578msgid "Process line range n,m in file, counting from 1"
6579msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
6580
6acbf033 6581#: builtin/log.c:229
c04f5ac3
JX
6582#, c-format
6583msgid "Final output: %d %s\n"
6584msgstr "最终输出:%d %s\n"
6585
220c313c
JX
6586#: builtin/log.c:458
6587#, c-format
6588msgid "git show %s: bad file"
6589msgstr "git show %s: 损坏的文件"
6590
6591#: builtin/log.c:472 builtin/log.c:564
c04f5ac3
JX
6592#, c-format
6593msgid "Could not read object %s"
90e6ef53 6594msgstr "不能读取对象 %s"
c04f5ac3 6595
220c313c 6596#: builtin/log.c:588
c04f5ac3
JX
6597#, c-format
6598msgid "Unknown type: %d"
6599msgstr "未知类型:%d"
6600
220c313c 6601#: builtin/log.c:689
c04f5ac3
JX
6602msgid "format.headers without value"
6603msgstr "format.headers 没有值"
6604
220c313c 6605#: builtin/log.c:773
c04f5ac3
JX
6606msgid "name of output directory is too long"
6607msgstr "输出目录名太长"
6608
220c313c 6609#: builtin/log.c:789
c04f5ac3
JX
6610#, c-format
6611msgid "Cannot open patch file %s"
6612msgstr "无法打开补丁文件 %s"
6613
220c313c 6614#: builtin/log.c:803
c04f5ac3
JX
6615msgid "Need exactly one range."
6616msgstr "只需要一个范围。"
6617
7aea43ff 6618#: builtin/log.c:813
c04f5ac3
JX
6619msgid "Not a range."
6620msgstr "不是一个范围。"
6621
220c313c 6622#: builtin/log.c:919
c04f5ac3
JX
6623msgid "Cover letter needs email format"
6624msgstr "信封需要邮件地址格式"
6625
220c313c 6626#: builtin/log.c:998
c04f5ac3
JX
6627#, c-format
6628msgid "insane in-reply-to: %s"
6629msgstr "不正常的 in-reply-to:%s"
6630
220c313c 6631#: builtin/log.c:1026
814ff314
JX
6632msgid "git format-patch [<options>] [<since> | <revision-range>]"
6633msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
ef317cd5 6634
220c313c 6635#: builtin/log.c:1071
c04f5ac3
JX
6636msgid "Two output directories?"
6637msgstr "两个输出目录?"
6638
220c313c 6639#: builtin/log.c:1186
ef317cd5 6640msgid "use [PATCH n/m] even with a single patch"
07432cef 6641msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 6642
220c313c 6643#: builtin/log.c:1189
ef317cd5 6644msgid "use [PATCH] even with multiple patches"
07432cef 6645msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 6646
220c313c 6647#: builtin/log.c:1193
ef317cd5 6648msgid "print patches to standard out"
07432cef 6649msgstr "打印补丁到标准输出"
c04f5ac3 6650
220c313c 6651#: builtin/log.c:1195
ef317cd5 6652msgid "generate a cover letter"
07432cef 6653msgstr "生成一封附信"
c04f5ac3 6654
220c313c 6655#: builtin/log.c:1197
ef317cd5 6656msgid "use simple number sequence for output file names"
07432cef 6657msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 6658
220c313c 6659#: builtin/log.c:1198
ef317cd5 6660msgid "sfx"
07432cef 6661msgstr "后缀"
ef317cd5 6662
220c313c 6663#: builtin/log.c:1199
ef317cd5 6664msgid "use <sfx> instead of '.patch'"
07432cef 6665msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 6666
220c313c 6667#: builtin/log.c:1201
ef317cd5 6668msgid "start numbering patches at <n> instead of 1"
07432cef
WS
6669msgstr "补丁以 <n> 开始编号,而不是1"
6670
220c313c 6671#: builtin/log.c:1203
07432cef
WS
6672msgid "mark the series as Nth re-roll"
6673msgstr "标记补丁系列是第几次重制"
ef317cd5 6674
220c313c 6675#: builtin/log.c:1205
ef317cd5 6676msgid "Use [<prefix>] instead of [PATCH]"
07432cef 6677msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 6678
220c313c 6679#: builtin/log.c:1208
ef317cd5 6680msgid "store resulting files in <dir>"
d9d56b23 6681msgstr "把结果文件存储在 <目录>"
ef317cd5 6682
220c313c 6683#: builtin/log.c:1211
ef317cd5 6684msgid "don't strip/add [PATCH]"
07432cef 6685msgstr "不删除/添加 [PATCH]"
ef317cd5 6686
220c313c 6687#: builtin/log.c:1214
ef317cd5 6688msgid "don't output binary diffs"
07432cef 6689msgstr "不输出二进制差异"
ef317cd5 6690
220c313c 6691#: builtin/log.c:1216
ef317cd5 6692msgid "don't include a patch matching a commit upstream"
07432cef 6693msgstr "不包含已在上游提交中的补丁"
ef317cd5 6694
220c313c 6695#: builtin/log.c:1218
ef317cd5 6696msgid "show patch format instead of default (patch + stat)"
07432cef 6697msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 6698
220c313c 6699#: builtin/log.c:1220
ef317cd5 6700msgid "Messaging"
07432cef 6701msgstr "邮件发送"
ef317cd5 6702
220c313c 6703#: builtin/log.c:1221
ef317cd5 6704msgid "header"
07432cef 6705msgstr "header"
ef317cd5 6706
220c313c 6707#: builtin/log.c:1222
ef317cd5 6708msgid "add email header"
07432cef 6709msgstr "添加邮件头"
ef317cd5 6710
220c313c 6711#: builtin/log.c:1223 builtin/log.c:1225
ef317cd5 6712msgid "email"
07432cef 6713msgstr "邮件地址"
ef317cd5 6714
220c313c 6715#: builtin/log.c:1223
ef317cd5 6716msgid "add To: header"
07432cef 6717msgstr "添加收件人"
ef317cd5 6718
220c313c 6719#: builtin/log.c:1225
ef317cd5 6720msgid "add Cc: header"
07432cef 6721msgstr "添加抄送"
ef317cd5 6722
220c313c 6723#: builtin/log.c:1227
2e8451e8 6724msgid "ident"
d9d56b23 6725msgstr "标识"
2e8451e8 6726
220c313c 6727#: builtin/log.c:1228
2e8451e8 6728msgid "set From address to <ident> (or committer ident if absent)"
d9d56b23 6729msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者ID做为地址)"
2e8451e8 6730
220c313c 6731#: builtin/log.c:1230
ef317cd5 6732msgid "message-id"
d9d56b23 6733msgstr "邮件标识"
ef317cd5 6734
220c313c 6735#: builtin/log.c:1231
ef317cd5 6736msgid "make first mail a reply to <message-id>"
d9d56b23 6737msgstr "使第一封邮件作为对 <邮件标识> 的回复"
ef317cd5 6738
220c313c 6739#: builtin/log.c:1232 builtin/log.c:1235
ef317cd5 6740msgid "boundary"
07432cef 6741msgstr "边界"
ef317cd5 6742
220c313c 6743#: builtin/log.c:1233
ef317cd5 6744msgid "attach the patch"
07432cef 6745msgstr "附件方式添加补丁"
ef317cd5 6746
220c313c 6747#: builtin/log.c:1236
ef317cd5 6748msgid "inline the patch"
07432cef 6749msgstr "内联显示补丁"
ef317cd5 6750
220c313c 6751#: builtin/log.c:1240
ef317cd5 6752msgid "enable message threading, styles: shallow, deep"
07432cef 6753msgstr "启用邮件线索,风格:浅,深"
ef317cd5 6754
220c313c 6755#: builtin/log.c:1242
ef317cd5 6756msgid "signature"
07432cef 6757msgstr "签名"
ef317cd5 6758
220c313c 6759#: builtin/log.c:1243
ef317cd5 6760msgid "add a signature"
07432cef 6761msgstr "添加一个签名"
ef317cd5 6762
220c313c 6763#: builtin/log.c:1245
6acbf033
JX
6764msgid "add a signature from a file"
6765msgstr "从文件添加一个签名"
6766
220c313c 6767#: builtin/log.c:1246
ef317cd5 6768msgid "don't print the patch filenames"
07432cef 6769msgstr "不要打印补丁文件名"
ef317cd5 6770
220c313c 6771#: builtin/log.c:1320
2e8451e8
JX
6772#, c-format
6773msgid "invalid ident line: %s"
6774msgstr "包含无效的身份标识:%s"
6775
220c313c 6776#: builtin/log.c:1335
c04f5ac3
JX
6777msgid "-n and -k are mutually exclusive."
6778msgstr "-n 和 -k 互斥。"
6779
220c313c 6780#: builtin/log.c:1337
c04f5ac3
JX
6781msgid "--subject-prefix and -k are mutually exclusive."
6782msgstr "--subject-prefix 和 -k 互斥。"
6783
220c313c 6784#: builtin/log.c:1345
c04f5ac3
JX
6785msgid "--name-only does not make sense"
6786msgstr "--name-only 无意义"
6787
220c313c 6788#: builtin/log.c:1347
c04f5ac3
JX
6789msgid "--name-status does not make sense"
6790msgstr "--name-status 无意义"
6791
220c313c 6792#: builtin/log.c:1349
c04f5ac3
JX
6793msgid "--check does not make sense"
6794msgstr "--check 无意义"
6795
220c313c 6796#: builtin/log.c:1372
c04f5ac3
JX
6797msgid "standard output, or directory, which one?"
6798msgstr "标准输出或目录,哪一个?"
6799
220c313c 6800#: builtin/log.c:1374
c04f5ac3
JX
6801#, c-format
6802msgid "Could not create directory '%s'"
90e6ef53 6803msgstr "不能创建目录 '%s'"
c04f5ac3 6804
220c313c 6805#: builtin/log.c:1472
6acbf033
JX
6806#, c-format
6807msgid "unable to read signature file '%s'"
6808msgstr "无法读取签名文件 '%s'"
6809
220c313c 6810#: builtin/log.c:1535
c04f5ac3
JX
6811msgid "Failed to create output files"
6812msgstr "无法创建输出文件"
6813
220c313c 6814#: builtin/log.c:1583
ef317cd5 6815msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 6816msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 6817
7aea43ff 6818#: builtin/log.c:1637
c04f5ac3
JX
6819#, c-format
6820msgid ""
6821"Could not find a tracked remote branch, please specify <upstream> manually.\n"
d9d56b23 6822msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
c04f5ac3 6823
7aea43ff 6824#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662
c04f5ac3
JX
6825#, c-format
6826msgid "Unknown commit %s"
6827msgstr "未知提交 %s"
6828
814ff314
JX
6829#: builtin/ls-files.c:358
6830msgid "git ls-files [<options>] [<file>...]"
6831msgstr "git ls-files [<选项>] [<文件>...]"
ef317cd5 6832
814ff314 6833#: builtin/ls-files.c:415
ef317cd5 6834msgid "identify the file status with tags"
07432cef 6835msgstr "用标签标识文件的状态"
ef317cd5 6836
814ff314 6837#: builtin/ls-files.c:417
ef317cd5 6838msgid "use lowercase letters for 'assume unchanged' files"
07432cef 6839msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 6840
814ff314 6841#: builtin/ls-files.c:419
ef317cd5 6842msgid "show cached files in the output (default)"
07432cef 6843msgstr "显示缓存的文件(默认)"
ef317cd5 6844
814ff314 6845#: builtin/ls-files.c:421
ef317cd5 6846msgid "show deleted files in the output"
07432cef 6847msgstr "显示已删除的文件"
ef317cd5 6848
814ff314 6849#: builtin/ls-files.c:423
ef317cd5 6850msgid "show modified files in the output"
07432cef 6851msgstr "显示已修改的文件"
ef317cd5 6852
814ff314 6853#: builtin/ls-files.c:425
ef317cd5 6854msgid "show other files in the output"
07432cef 6855msgstr "显示其它文件"
ef317cd5 6856
814ff314 6857#: builtin/ls-files.c:427
ef317cd5 6858msgid "show ignored files in the output"
07432cef 6859msgstr "显示忽略的文件"
ef317cd5 6860
814ff314 6861#: builtin/ls-files.c:430
ef317cd5 6862msgid "show staged contents' object name in the output"
07432cef 6863msgstr "显示暂存区内容的对象名称"
ef317cd5 6864
814ff314 6865#: builtin/ls-files.c:432
ef317cd5 6866msgid "show files on the filesystem that need to be removed"
07432cef 6867msgstr "显示文件系统需要删除的文件"
ef317cd5 6868
814ff314 6869#: builtin/ls-files.c:434
220c313c 6870msgid "show 'other' directories' names only"
07432cef 6871msgstr "只显示“其他”目录的名称"
ef317cd5 6872
814ff314 6873#: builtin/ls-files.c:437
ef317cd5 6874msgid "don't show empty directories"
07432cef 6875msgstr "不显示空目录"
ef317cd5 6876
814ff314 6877#: builtin/ls-files.c:440
ef317cd5 6878msgid "show unmerged files in the output"
07432cef 6879msgstr "显示未合并的文件"
ef317cd5 6880
814ff314 6881#: builtin/ls-files.c:442
ef317cd5 6882msgid "show resolve-undo information"
07432cef 6883msgstr "显示 resolve-undo 信息"
ef317cd5 6884
814ff314 6885#: builtin/ls-files.c:444
ef317cd5 6886msgid "skip files matching pattern"
07432cef 6887msgstr "匹配排除文件的模式"
ef317cd5 6888
814ff314 6889#: builtin/ls-files.c:447
ef317cd5 6890msgid "exclude patterns are read from <file>"
07432cef 6891msgstr "从 <文件> 中读取排除模式"
ef317cd5 6892
814ff314 6893#: builtin/ls-files.c:450
ef317cd5 6894msgid "read additional per-directory exclude patterns in <file>"
07432cef 6895msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 6896
814ff314 6897#: builtin/ls-files.c:452
ef317cd5 6898msgid "add the standard git exclusions"
07432cef 6899msgstr "添加标准的 git 排除"
ef317cd5 6900
814ff314 6901#: builtin/ls-files.c:455
ef317cd5 6902msgid "make the output relative to the project top directory"
07432cef 6903msgstr "显示相对于顶级目录的文件名"
ef317cd5 6904
814ff314 6905#: builtin/ls-files.c:458
ef317cd5 6906msgid "if any <file> is not in the index, treat this as an error"
07432cef 6907msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 6908
814ff314 6909#: builtin/ls-files.c:459
ef317cd5 6910msgid "tree-ish"
07432cef 6911msgstr "树或提交"
ef317cd5 6912
814ff314 6913#: builtin/ls-files.c:460
ef317cd5 6914msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 6915msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5 6916
814ff314 6917#: builtin/ls-files.c:462
ef317cd5 6918msgid "show debugging data"
07432cef 6919msgstr "显示调试数据"
ef317cd5 6920
90314792 6921#: builtin/ls-tree.c:28
ef317cd5 6922msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 6923msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5 6924
04cb2f28 6925#: builtin/ls-tree.c:127
ef317cd5 6926msgid "only show trees"
07432cef 6927msgstr "只显示树"
ef317cd5 6928
04cb2f28 6929#: builtin/ls-tree.c:129
ef317cd5 6930msgid "recurse into subtrees"
07432cef 6931msgstr "递归到子树"
ef317cd5 6932
04cb2f28 6933#: builtin/ls-tree.c:131
ef317cd5 6934msgid "show trees when recursing"
07432cef 6935msgstr "当递归时显示树"
ef317cd5 6936
04cb2f28 6937#: builtin/ls-tree.c:134
ef317cd5 6938msgid "terminate entries with NUL byte"
07432cef 6939msgstr "条目以NUL字符终止"
ef317cd5 6940
04cb2f28 6941#: builtin/ls-tree.c:135
ef317cd5 6942msgid "include object size"
07432cef 6943msgstr "包括对象大小"
ef317cd5 6944
04cb2f28 6945#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
ef317cd5 6946msgid "list only filenames"
07432cef 6947msgstr "只列出文件名"
ef317cd5 6948
04cb2f28 6949#: builtin/ls-tree.c:142
ef317cd5 6950msgid "use full path names"
07432cef 6951msgstr "使用文件的全路径"
ef317cd5 6952
04cb2f28 6953#: builtin/ls-tree.c:144
ef317cd5 6954msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 6955msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5 6956
04cb2f28 6957#: builtin/merge.c:45
814ff314
JX
6958msgid "git merge [<options>] [<commit>...]"
6959msgstr "git merge [<选项>] [<提交>...]"
ef317cd5 6960
04cb2f28 6961#: builtin/merge.c:46
814ff314
JX
6962msgid "git merge [<options>] <msg> HEAD <commit>"
6963msgstr "git merge [<选项>] <说明> HEAD <提交>"
ef317cd5 6964
04cb2f28 6965#: builtin/merge.c:47
ef317cd5 6966msgid "git merge --abort"
07432cef 6967msgstr "git merge --abort"
ef317cd5 6968
04cb2f28 6969#: builtin/merge.c:100
c04f5ac3
JX
6970msgid "switch `m' requires a value"
6971msgstr "开关 `m' 需要一个值"
6972
04cb2f28 6973#: builtin/merge.c:137
c04f5ac3
JX
6974#, c-format
6975msgid "Could not find merge strategy '%s'.\n"
90e6ef53 6976msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 6977
04cb2f28 6978#: builtin/merge.c:138
c04f5ac3
JX
6979#, c-format
6980msgid "Available strategies are:"
6981msgstr "可用的策略有:"
6982
04cb2f28 6983#: builtin/merge.c:143
c04f5ac3
JX
6984#, c-format
6985msgid "Available custom strategies are:"
6986msgstr "可用的自定义策略有:"
6987
04cb2f28 6988#: builtin/merge.c:193
ef317cd5 6989msgid "do not show a diffstat at the end of the merge"
07432cef 6990msgstr "在合并的最后不显示差异统计"
ef317cd5 6991
04cb2f28 6992#: builtin/merge.c:196
ef317cd5 6993msgid "show a diffstat at the end of the merge"
07432cef 6994msgstr "在合并的最后显示差异统计"
ef317cd5 6995
04cb2f28 6996#: builtin/merge.c:197
ef317cd5 6997msgid "(synonym to --stat)"
07432cef 6998msgstr "(和 --stat 同义)"
ef317cd5 6999
04cb2f28 7000#: builtin/merge.c:199
ef317cd5 7001msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 7002msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 7003
04cb2f28 7004#: builtin/merge.c:202
ef317cd5 7005msgid "create a single commit instead of doing a merge"
07432cef 7006msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 7007
04cb2f28 7008#: builtin/merge.c:204
ef317cd5 7009msgid "perform a commit if the merge succeeds (default)"
07432cef 7010msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 7011
04cb2f28 7012#: builtin/merge.c:206
ef317cd5 7013msgid "edit message before committing"
07432cef 7014msgstr "在提交前编辑提交说明"
ef317cd5 7015
04cb2f28 7016#: builtin/merge.c:207
ef317cd5 7017msgid "allow fast-forward (default)"
07432cef 7018msgstr "允许快进(默认)"
ef317cd5 7019
04cb2f28 7020#: builtin/merge.c:209
ef317cd5 7021msgid "abort if fast-forward is not possible"
07432cef 7022msgstr "如果不能快进就放弃合并"
ef317cd5 7023
04cb2f28 7024#: builtin/merge.c:213
1003b3a5
JX
7025msgid "Verify that the named commit has a valid GPG signature"
7026msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
7027
04cb2f28 7028#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89
ef317cd5 7029msgid "strategy"
07432cef 7030msgstr "策略"
ef317cd5 7031
04cb2f28 7032#: builtin/merge.c:215
ef317cd5 7033msgid "merge strategy to use"
07432cef 7034msgstr "要使用的合并策略"
ef317cd5 7035
04cb2f28 7036#: builtin/merge.c:216
ef317cd5 7037msgid "option=value"
07432cef 7038msgstr "option=value"
ef317cd5 7039
04cb2f28 7040#: builtin/merge.c:217
ef317cd5 7041msgid "option for selected merge strategy"
07432cef 7042msgstr "所选的合并策略的选项"
ef317cd5 7043
04cb2f28 7044#: builtin/merge.c:219
ef317cd5 7045msgid "merge commit message (for a non-fast-forward merge)"
07432cef 7046msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 7047
04cb2f28 7048#: builtin/merge.c:223
ef317cd5 7049msgid "abort the current in-progress merge"
07432cef 7050msgstr "放弃当前正在进行的合并"
ef317cd5 7051
04cb2f28 7052#: builtin/merge.c:251
c04f5ac3
JX
7053msgid "could not run stash."
7054msgstr "不能进行进度保存。"
7055
04cb2f28 7056#: builtin/merge.c:256
c04f5ac3
JX
7057msgid "stash failed"
7058msgstr "进度保存失败"
7059
04cb2f28 7060#: builtin/merge.c:261
c04f5ac3
JX
7061#, c-format
7062msgid "not a valid object: %s"
7063msgstr "不是一个有效对象:%s"
7064
04cb2f28 7065#: builtin/merge.c:280 builtin/merge.c:297
c04f5ac3
JX
7066msgid "read-tree failed"
7067msgstr "读取树失败"
7068
90e6ef53 7069# 译者:注意保持前导空格
04cb2f28 7070#: builtin/merge.c:327
c04f5ac3
JX
7071msgid " (nothing to squash)"
7072msgstr " (无可压缩)"
7073
04cb2f28 7074#: builtin/merge.c:340
c04f5ac3
JX
7075#, c-format
7076msgid "Squash commit -- not updating HEAD\n"
7077msgstr "压缩提交 -- 未更新 HEAD\n"
7078
04cb2f28 7079#: builtin/merge.c:372
c04f5ac3
JX
7080msgid "Writing SQUASH_MSG"
7081msgstr "写入 SQUASH_MSG"
7082
04cb2f28 7083#: builtin/merge.c:374
c04f5ac3
JX
7084msgid "Finishing SQUASH_MSG"
7085msgstr "完成 SQUASH_MSG"
7086
04cb2f28 7087#: builtin/merge.c:397
c04f5ac3
JX
7088#, c-format
7089msgid "No merge message -- not updating HEAD\n"
7090msgstr "无合并信息 -- 未更新 HEAD\n"
7091
04cb2f28 7092#: builtin/merge.c:447
c04f5ac3
JX
7093#, c-format
7094msgid "'%s' does not point to a commit"
7095msgstr "'%s' 没有指向一个提交"
7096
7aea43ff 7097#: builtin/merge.c:537
c04f5ac3
JX
7098#, c-format
7099msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 7100msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 7101
7aea43ff 7102#: builtin/merge.c:632
c04f5ac3
JX
7103msgid "git write-tree failed to write a tree"
7104msgstr "git write-tree 无法写入一树对象"
7105
7aea43ff 7106#: builtin/merge.c:656
c04f5ac3
JX
7107msgid "Not handling anything other than two heads merge."
7108msgstr "不能处理两个头合并之外的任何操作。"
7109
7aea43ff 7110#: builtin/merge.c:670
c04f5ac3
JX
7111#, c-format
7112msgid "Unknown option for merge-recursive: -X%s"
7113msgstr "merge-recursive 的未知选项:-X%s"
7114
7aea43ff 7115#: builtin/merge.c:683
c04f5ac3
JX
7116#, c-format
7117msgid "unable to write %s"
7118msgstr "不能写 %s"
7119
7aea43ff 7120#: builtin/merge.c:772
c04f5ac3
JX
7121#, c-format
7122msgid "Could not read from '%s'"
7123msgstr "不能从 '%s' 读取"
7124
7aea43ff 7125#: builtin/merge.c:781
c04f5ac3
JX
7126#, c-format
7127msgid "Not committing merge; use 'git commit' to complete the merge.\n"
7128msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
7129
7aea43ff 7130#: builtin/merge.c:787
a77c07d9 7131#, c-format
c04f5ac3
JX
7132msgid ""
7133"Please enter a commit message to explain why this merge is necessary,\n"
7134"especially if it merges an updated upstream into a topic branch.\n"
7135"\n"
a77c07d9 7136"Lines starting with '%c' will be ignored, and an empty message aborts\n"
c04f5ac3
JX
7137"the commit.\n"
7138msgstr ""
7139"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
7140"合并到主题分支。\n"
7141"\n"
a77c07d9 7142"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
c04f5ac3 7143
7aea43ff 7144#: builtin/merge.c:811
c04f5ac3
JX
7145msgid "Empty commit message."
7146msgstr "空提交信息。"
7147
7aea43ff 7148#: builtin/merge.c:823
c04f5ac3
JX
7149#, c-format
7150msgid "Wonderful.\n"
7151msgstr "太棒了。\n"
7152
7aea43ff 7153#: builtin/merge.c:878
c04f5ac3
JX
7154#, c-format
7155msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7156msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7157
7aea43ff 7158#: builtin/merge.c:894
c04f5ac3
JX
7159#, c-format
7160msgid "'%s' is not a commit"
7161msgstr "'%s' 不是一个提交"
7162
7aea43ff 7163#: builtin/merge.c:935
c04f5ac3 7164msgid "No current branch."
90e6ef53 7165msgstr "没有当前分支。"
c04f5ac3 7166
7aea43ff 7167#: builtin/merge.c:937
c04f5ac3 7168msgid "No remote for the current branch."
90e6ef53 7169msgstr "当前分支没有对应的远程版本库。"
c04f5ac3 7170
7aea43ff 7171#: builtin/merge.c:939
c04f5ac3 7172msgid "No default upstream defined for the current branch."
90e6ef53 7173msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 7174
7aea43ff 7175#: builtin/merge.c:944
170e9899 7176#, c-format
2e8451e8
JX
7177msgid "No remote-tracking branch for %s from %s"
7178msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 7179
7aea43ff
JX
7180#: builtin/merge.c:1081
7181#, c-format
7182msgid "could not close '%s'"
7183msgstr "不能关闭 '%s'"
7184
7185#: builtin/merge.c:1208
c04f5ac3 7186msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 7187msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 7188
7aea43ff 7189#: builtin/merge.c:1224
c04f5ac3
JX
7190msgid ""
7191"You have not concluded your merge (MERGE_HEAD exists).\n"
220c313c 7192"Please, commit your changes before you merge."
c04f5ac3
JX
7193msgstr ""
7194"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 7195"请在合并前先提交您的修改。"
c04f5ac3 7196
7aea43ff 7197#: builtin/merge.c:1227 git-pull.sh:74
c04f5ac3
JX
7198msgid "You have not concluded your merge (MERGE_HEAD exists)."
7199msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
7200
7aea43ff 7201#: builtin/merge.c:1231
c04f5ac3
JX
7202msgid ""
7203"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
220c313c 7204"Please, commit your changes before you merge."
c04f5ac3
JX
7205msgstr ""
7206"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 7207"请在合并前先提交您的修改。"
c04f5ac3 7208
7aea43ff 7209#: builtin/merge.c:1234
c04f5ac3
JX
7210msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7211msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7212
7aea43ff 7213#: builtin/merge.c:1243
c04f5ac3 7214msgid "You cannot combine --squash with --no-ff."
649900bc 7215msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 7216
7aea43ff 7217#: builtin/merge.c:1251
c04f5ac3 7218msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 7219msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 7220
7aea43ff 7221#: builtin/merge.c:1268
c04f5ac3
JX
7222msgid "Squash commit into empty head not supported yet"
7223msgstr "尚不支持到空分支的压缩提交"
7224
7aea43ff 7225#: builtin/merge.c:1270
c04f5ac3
JX
7226msgid "Non-fast-forward commit does not make sense into an empty head"
7227msgstr "到空分支的非快进式提交没有意义"
7228
7aea43ff 7229#: builtin/merge.c:1276
2e8451e8
JX
7230#, c-format
7231msgid "%s - not something we can merge"
7232msgstr "%s - 不能被合并"
7233
7aea43ff
JX
7234#: builtin/merge.c:1278
7235msgid "Can merge only exactly one commit into empty head"
7236msgstr "只能将一个提交合并到空分支上"
7237
7238#: builtin/merge.c:1333
1003b3a5
JX
7239#, c-format
7240msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7241msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7242
7aea43ff 7243#: builtin/merge.c:1336
1003b3a5
JX
7244#, c-format
7245msgid "Commit %s has a bad GPG signature allegedly by %s."
7246msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7247
7aea43ff 7248#: builtin/merge.c:1339
1003b3a5
JX
7249#, c-format
7250msgid "Commit %s does not have a GPG signature."
7251msgstr "提交 %s 没有一个 GPG 签名。"
7252
7aea43ff 7253#: builtin/merge.c:1342
1003b3a5
JX
7254#, c-format
7255msgid "Commit %s has a good GPG signature by %s\n"
7256msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7257
7aea43ff 7258#: builtin/merge.c:1423
c04f5ac3
JX
7259#, c-format
7260msgid "Updating %s..%s\n"
7261msgstr "更新 %s..%s\n"
7262
7aea43ff 7263#: builtin/merge.c:1462
c04f5ac3
JX
7264#, c-format
7265msgid "Trying really trivial in-index merge...\n"
90e6ef53 7266msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 7267
7aea43ff 7268#: builtin/merge.c:1469
c04f5ac3
JX
7269#, c-format
7270msgid "Nope.\n"
7271msgstr "无。\n"
7272
7aea43ff 7273#: builtin/merge.c:1501
c04f5ac3 7274msgid "Not possible to fast-forward, aborting."
1aabac65 7275msgstr "无法快进,终止。"
c04f5ac3 7276
7aea43ff 7277#: builtin/merge.c:1524 builtin/merge.c:1603
c04f5ac3
JX
7278#, c-format
7279msgid "Rewinding the tree to pristine...\n"
7280msgstr "将树回滚至原始状态...\n"
7281
7aea43ff 7282#: builtin/merge.c:1528
c04f5ac3
JX
7283#, c-format
7284msgid "Trying merge strategy %s...\n"
7285msgstr "尝试合并策略 %s...\n"
7286
7aea43ff 7287#: builtin/merge.c:1594
c04f5ac3
JX
7288#, c-format
7289msgid "No merge strategy handled the merge.\n"
7290msgstr "没有合并策略处理此合并。\n"
7291
7aea43ff 7292#: builtin/merge.c:1596
c04f5ac3
JX
7293#, c-format
7294msgid "Merge with strategy %s failed.\n"
7295msgstr "使用策略 %s 合并失败。\n"
7296
7aea43ff 7297#: builtin/merge.c:1605
c04f5ac3
JX
7298#, c-format
7299msgid "Using the %s to prepare resolving by hand.\n"
7300msgstr "使用 %s 以准备手工解决。\n"
7301
7aea43ff 7302#: builtin/merge.c:1617
c04f5ac3
JX
7303#, c-format
7304msgid "Automatic merge went well; stopped before committing as requested\n"
7305msgstr "自动合并进展顺利,按要求在提交前停止\n"
7306
cfff71a9 7307#: builtin/merge-base.c:29
814ff314
JX
7308msgid "git merge-base [-a | --all] <commit> <commit>..."
7309msgstr "git merge-base [-a | --all] <提交> <提交>..."
ef317cd5 7310
cfff71a9 7311#: builtin/merge-base.c:30
814ff314
JX
7312msgid "git merge-base [-a | --all] --octopus <commit>..."
7313msgstr "git merge-base [-a | --all] --octopus <提交>..."
ef317cd5 7314
cfff71a9 7315#: builtin/merge-base.c:31
ef317cd5 7316msgid "git merge-base --independent <commit>..."
07432cef 7317msgstr "git merge-base --independent <提交>..."
ef317cd5 7318
cfff71a9 7319#: builtin/merge-base.c:32
ef317cd5 7320msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 7321msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5 7322
cfff71a9
JX
7323#: builtin/merge-base.c:33
7324msgid "git merge-base --fork-point <ref> [<commit>]"
d9d56b23 7325msgstr "git merge-base --fork-point <引用> [<提交>]"
cfff71a9
JX
7326
7327#: builtin/merge-base.c:214
ef317cd5 7328msgid "output all common ancestors"
07432cef 7329msgstr "输出所有共同的祖先"
ef317cd5 7330
cfff71a9 7331#: builtin/merge-base.c:216
ef317cd5 7332msgid "find ancestors for a single n-way merge"
07432cef 7333msgstr "查找一个多路合并的祖先提交"
ef317cd5 7334
cfff71a9 7335#: builtin/merge-base.c:218
ef317cd5 7336msgid "list revs not reachable from others"
07432cef 7337msgstr "显示不能被其他访问到的版本"
ef317cd5 7338
cfff71a9 7339#: builtin/merge-base.c:220
ef317cd5 7340msgid "is the first one ancestor of the other?"
07432cef 7341msgstr "第一个是其他的祖先提交么?"
ef317cd5 7342
cfff71a9
JX
7343#: builtin/merge-base.c:222
7344msgid "find where <commit> forked from reflog of <ref>"
d9d56b23 7345msgstr "查找 <提交> 从<引用>日志的何处分支的"
cfff71a9 7346
ef317cd5
JX
7347#: builtin/merge-file.c:8
7348msgid ""
814ff314
JX
7349"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7350"<orig-file> <file2>"
ef317cd5 7351msgstr ""
814ff314
JX
7352"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
7353"件> <文件2>"
ef317cd5
JX
7354
7355#: builtin/merge-file.c:33
7356msgid "send results to standard output"
07432cef 7357msgstr "将结果发送到标准输出"
ef317cd5
JX
7358
7359#: builtin/merge-file.c:34
7360msgid "use a diff3 based merge"
07432cef 7361msgstr "使用基于 diff3 的合并"
ef317cd5
JX
7362
7363#: builtin/merge-file.c:35
7364msgid "for conflicts, use our version"
07432cef 7365msgstr "如果冲突,使用我们的版本"
ef317cd5
JX
7366
7367#: builtin/merge-file.c:37
7368msgid "for conflicts, use their version"
07432cef 7369msgstr "如果冲突,使用他们的版本"
ef317cd5
JX
7370
7371#: builtin/merge-file.c:39
7372msgid "for conflicts, use a union version"
07432cef 7373msgstr "如果冲突,使用联合版本"
ef317cd5
JX
7374
7375#: builtin/merge-file.c:42
7376msgid "for conflicts, use this marker size"
07432cef 7377msgstr "如果冲突,使用指定长度的标记"
ef317cd5
JX
7378
7379#: builtin/merge-file.c:43
7380msgid "do not warn about conflicts"
07432cef 7381msgstr "不要警告冲突"
ef317cd5
JX
7382
7383#: builtin/merge-file.c:45
814ff314
JX
7384msgid "set labels for file1/orig-file/file2"
7385msgstr "为 文件1/初始文件/文件2 设置标签"
c04f5ac3 7386
6c94aba5 7387#: builtin/mktree.c:64
ef317cd5 7388msgid "git mktree [-z] [--missing] [--batch]"
07432cef 7389msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 7390
6c94aba5 7391#: builtin/mktree.c:150
ef317cd5 7392msgid "input is NUL terminated"
07432cef 7393msgstr "输入以 NUL 字符终止"
c04f5ac3 7394
6c94aba5 7395#: builtin/mktree.c:151 builtin/write-tree.c:24
ef317cd5 7396msgid "allow missing objects"
07432cef 7397msgstr "允许丢失的对象"
c04f5ac3 7398
6c94aba5 7399#: builtin/mktree.c:152
ef317cd5 7400msgid "allow creation of more than one tree"
07432cef 7401msgstr "允许创建一个以上的树"
c04f5ac3 7402
90314792 7403#: builtin/mv.c:15
814ff314
JX
7404msgid "git mv [<options>] <source>... <destination>"
7405msgstr "git mv [<选项>] <源>... <目标>"
c04f5ac3 7406
220c313c
JX
7407#: builtin/mv.c:69
7408#, c-format
7409msgid "Directory %s is in index and no submodule?"
7410msgstr "目录 %s 在索引中并且不是子模组?"
7411
cfff71a9 7412#: builtin/mv.c:71
220c313c
JX
7413msgid "Please stage your changes to .gitmodules or stash them to proceed"
7414msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
7415
7416#: builtin/mv.c:89
7417#, c-format
7418msgid "%.*s is in index"
7419msgstr "%.*s 在索引中"
7420
7421#: builtin/mv.c:111
ef317cd5 7422msgid "force move/rename even if target exists"
07432cef 7423msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 7424
220c313c 7425#: builtin/mv.c:112
ef317cd5 7426msgid "skip move/rename errors"
07432cef 7427msgstr "跳过移动/重命名错误"
c04f5ac3 7428
220c313c
JX
7429#: builtin/mv.c:151
7430#, c-format
7431msgid "destination '%s' is not a directory"
7432msgstr "目标 '%s' 不是一个目录"
7433
7434#: builtin/mv.c:162
c04f5ac3
JX
7435#, c-format
7436msgid "Checking rename of '%s' to '%s'\n"
7437msgstr "检查 '%s' 到 '%s' 的重命名\n"
7438
220c313c 7439#: builtin/mv.c:166
c04f5ac3
JX
7440msgid "bad source"
7441msgstr "坏的源"
7442
220c313c 7443#: builtin/mv.c:169
c04f5ac3
JX
7444msgid "can not move directory into itself"
7445msgstr "不能将目录移动到自身"
7446
220c313c 7447#: builtin/mv.c:172
c04f5ac3
JX
7448msgid "cannot move directory over file"
7449msgstr "不能将目录移动到文件"
7450
220c313c 7451#: builtin/mv.c:181
c04f5ac3
JX
7452msgid "source directory is empty"
7453msgstr "源目录为空"
7454
220c313c 7455#: builtin/mv.c:206
c04f5ac3
JX
7456msgid "not under version control"
7457msgstr "不在版本控制之下"
7458
220c313c 7459#: builtin/mv.c:209
c04f5ac3
JX
7460msgid "destination exists"
7461msgstr "目标已存在"
7462
220c313c 7463#: builtin/mv.c:217
c04f5ac3
JX
7464#, c-format
7465msgid "overwriting '%s'"
7466msgstr "覆盖 '%s'"
7467
220c313c 7468#: builtin/mv.c:220
c04f5ac3
JX
7469msgid "Cannot overwrite"
7470msgstr "不能覆盖"
7471
220c313c 7472#: builtin/mv.c:223
c04f5ac3
JX
7473msgid "multiple sources for the same target"
7474msgstr "同一目标具有多个源"
7475
220c313c 7476#: builtin/mv.c:225
cfff71a9
JX
7477msgid "destination directory does not exist"
7478msgstr "目标目录不存在"
7479
220c313c 7480#: builtin/mv.c:232
c04f5ac3
JX
7481#, c-format
7482msgid "%s, source=%s, destination=%s"
7483msgstr "%s,源=%s,目标=%s"
7484
220c313c 7485#: builtin/mv.c:253
c04f5ac3
JX
7486#, c-format
7487msgid "Renaming %s to %s\n"
7488msgstr "重命名 %s 至 %s\n"
7489
7aea43ff 7490#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361
c04f5ac3
JX
7491#, c-format
7492msgid "renaming '%s' failed"
7493msgstr "重命名 '%s' 失败"
7494
6acbf033 7495#: builtin/name-rev.c:255
814ff314
JX
7496msgid "git name-rev [<options>] <commit>..."
7497msgstr "git name-rev [<选项>] <提交>..."
ef317cd5 7498
6acbf033 7499#: builtin/name-rev.c:256
814ff314
JX
7500msgid "git name-rev [<options>] --all"
7501msgstr "git name-rev [<选项>] --all"
ef317cd5 7502
6acbf033 7503#: builtin/name-rev.c:257
814ff314
JX
7504msgid "git name-rev [<options>] --stdin"
7505msgstr "git name-rev [<选项>] --stdin"
ef317cd5 7506
6acbf033 7507#: builtin/name-rev.c:309
ef317cd5 7508msgid "print only names (no SHA-1)"
07432cef 7509msgstr "只打印名称(无 SHA-1)"
ef317cd5 7510
6acbf033 7511#: builtin/name-rev.c:310
ef317cd5 7512msgid "only use tags to name the commits"
07432cef 7513msgstr "只使用 tags 来命名提交"
ef317cd5 7514
6acbf033 7515#: builtin/name-rev.c:312
ef317cd5 7516msgid "only use refs matching <pattern>"
07432cef 7517msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 7518
6acbf033 7519#: builtin/name-rev.c:314
ef317cd5 7520msgid "list all commits reachable from all refs"
07432cef 7521msgstr "列出可以从所有引用访问的提交"
ef317cd5 7522
6acbf033 7523#: builtin/name-rev.c:315
ef317cd5 7524msgid "read from stdin"
07432cef 7525msgstr "从标准输入读取"
ef317cd5 7526
6acbf033 7527#: builtin/name-rev.c:316
90314792
JX
7528msgid "allow to print `undefined` names (default)"
7529msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 7530
6acbf033 7531#: builtin/name-rev.c:322
2e8451e8
JX
7532msgid "dereference tags in the input (internal use)"
7533msgstr "反向解析输入中的 tags(内部使用)"
7534
7535#: builtin/notes.c:24
814ff314 7536msgid "git notes [--ref <notes-ref>] [list [<object>]]"
07432cef 7537msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 7538
2e8451e8 7539#: builtin/notes.c:25
ef317cd5 7540msgid ""
814ff314 7541"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
04cb2f28 7542"| (-c | -C) <object>] [<object>]"
ef317cd5 7543msgstr ""
04cb2f28
JX
7544"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
7545"| (-c | -C) <对象>] [<对象>]"
ef317cd5 7546
2e8451e8 7547#: builtin/notes.c:26
814ff314 7548msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
07432cef 7549msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 7550
2e8451e8 7551#: builtin/notes.c:27
ef317cd5 7552msgid ""
814ff314 7553"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
04cb2f28 7554"(-c | -C) <object>] [<object>]"
ef317cd5 7555msgstr ""
04cb2f28
JX
7556"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
7557"(-c | -C) <对象>] [<对象>]"
ef317cd5 7558
2e8451e8 7559#: builtin/notes.c:28
814ff314 7560msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
04cb2f28 7561msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
ef317cd5 7562
2e8451e8 7563#: builtin/notes.c:29
814ff314 7564msgid "git notes [--ref <notes-ref>] show [<object>]"
07432cef 7565msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 7566
2e8451e8 7567#: builtin/notes.c:30
ef317cd5 7568msgid ""
814ff314 7569"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
07432cef 7570msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 7571
2e8451e8 7572#: builtin/notes.c:31
ef317cd5 7573msgid "git notes merge --commit [-v | -q]"
07432cef 7574msgstr "git notes merge --commit [-v | -q]"
ef317cd5 7575
2e8451e8 7576#: builtin/notes.c:32
ef317cd5 7577msgid "git notes merge --abort [-v | -q]"
07432cef 7578msgstr "git notes merge --abort [-v | -q]"
ef317cd5 7579
2e8451e8 7580#: builtin/notes.c:33
814ff314 7581msgid "git notes [--ref <notes-ref>] remove [<object>...]"
07432cef 7582msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 7583
2e8451e8 7584#: builtin/notes.c:34
814ff314 7585msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
07432cef 7586msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
ef317cd5 7587
2e8451e8 7588#: builtin/notes.c:35
814ff314 7589msgid "git notes [--ref <notes-ref>] get-ref"
07432cef 7590msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 7591
2e8451e8 7592#: builtin/notes.c:40
ef317cd5 7593msgid "git notes [list [<object>]]"
07432cef 7594msgstr "git notes [list [<对象>]]"
ef317cd5 7595
2e8451e8 7596#: builtin/notes.c:45
ef317cd5 7597msgid "git notes add [<options>] [<object>]"
07432cef 7598msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 7599
2e8451e8 7600#: builtin/notes.c:50
ef317cd5 7601msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 7602msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 7603
2e8451e8 7604#: builtin/notes.c:51
ef317cd5 7605msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 7606msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 7607
2e8451e8 7608#: builtin/notes.c:56
ef317cd5 7609msgid "git notes append [<options>] [<object>]"
07432cef 7610msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 7611
2e8451e8 7612#: builtin/notes.c:61
ef317cd5 7613msgid "git notes edit [<object>]"
07432cef 7614msgstr "git notes edit [<对象>]"
ef317cd5 7615
2e8451e8 7616#: builtin/notes.c:66
ef317cd5 7617msgid "git notes show [<object>]"
07432cef 7618msgstr "git notes show [<对象>]"
ef317cd5 7619
2e8451e8 7620#: builtin/notes.c:71
814ff314 7621msgid "git notes merge [<options>] <notes-ref>"
07432cef 7622msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 7623
2e8451e8 7624#: builtin/notes.c:72
ef317cd5 7625msgid "git notes merge --commit [<options>]"
07432cef 7626msgstr "git notes merge --commit [<选项>]"
ef317cd5 7627
2e8451e8 7628#: builtin/notes.c:73
ef317cd5 7629msgid "git notes merge --abort [<options>]"
07432cef 7630msgstr "git notes merge --abort [<选项>]"
ef317cd5 7631
2e8451e8 7632#: builtin/notes.c:78
ef317cd5 7633msgid "git notes remove [<object>]"
07432cef 7634msgstr "git notes remove [<对象>]"
ef317cd5 7635
2e8451e8 7636#: builtin/notes.c:83
ef317cd5 7637msgid "git notes prune [<options>]"
07432cef 7638msgstr "git notes prune [<选项>]"
ef317cd5 7639
2e8451e8 7640#: builtin/notes.c:88
ef317cd5 7641msgid "git notes get-ref"
07432cef 7642msgstr "git notes get-ref"
ef317cd5 7643
04cb2f28 7644#: builtin/notes.c:146
c04f5ac3
JX
7645#, c-format
7646msgid "unable to start 'show' for object '%s'"
7647msgstr "不能为对象 '%s' 开始 'show'"
7648
04cb2f28 7649#: builtin/notes.c:150
a77c07d9
JX
7650msgid "could not read 'show' output"
7651msgstr "不能读取 'show' 的输出"
c04f5ac3 7652
04cb2f28 7653#: builtin/notes.c:158
c04f5ac3
JX
7654#, c-format
7655msgid "failed to finish 'show' for object '%s'"
7656msgstr "无法为对象 '%s' 完成 'show'"
7657
04cb2f28 7658#: builtin/notes.c:173 builtin/tag.c:477
c04f5ac3
JX
7659#, c-format
7660msgid "could not create file '%s'"
7661msgstr "不能创建文件 '%s'"
7662
04cb2f28 7663#: builtin/notes.c:192
c04f5ac3
JX
7664msgid "Please supply the note contents using either -m or -F option"
7665msgstr "请通过 -m 或 -F 选项为注解提供内容"
7666
04cb2f28 7667#: builtin/notes.c:201
c04f5ac3
JX
7668msgid "unable to write note object"
7669msgstr "不能写注解对象"
7670
04cb2f28 7671#: builtin/notes.c:203
c04f5ac3 7672#, c-format
220c313c
JX
7673msgid "The note contents have been left in %s"
7674msgstr "注解内容被留在 %s 中"
c04f5ac3 7675
04cb2f28 7676#: builtin/notes.c:231 builtin/tag.c:693
c04f5ac3
JX
7677#, c-format
7678msgid "cannot read '%s'"
7679msgstr "不能读取 '%s'"
7680
04cb2f28 7681#: builtin/notes.c:233 builtin/tag.c:696
c04f5ac3
JX
7682#, c-format
7683msgid "could not open or read '%s'"
7684msgstr "不能打开或读取 '%s'"
7685
04cb2f28
JX
7686#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
7687#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
7688#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
7689#: builtin/notes.c:854 builtin/tag.c:709
c04f5ac3
JX
7690#, c-format
7691msgid "Failed to resolve '%s' as a valid ref."
90e6ef53 7692msgstr "无法解析 '%s' 为一个有效引用。"
c04f5ac3 7693
04cb2f28 7694#: builtin/notes.c:255
c04f5ac3
JX
7695#, c-format
7696msgid "Failed to read object '%s'."
7697msgstr "无法读取对象 '%s'。"
7698
04cb2f28 7699#: builtin/notes.c:259
6c94aba5
JX
7700#, c-format
7701msgid "Cannot read note data from non-blob object '%s'."
7702msgstr "不能从非数据对象 '%s' 中读取注解数据"
7703
04cb2f28 7704#: builtin/notes.c:299
c04f5ac3
JX
7705#, c-format
7706msgid "Malformed input line: '%s'."
7707msgstr "非法的输入行:'%s'。"
7708
04cb2f28 7709#: builtin/notes.c:314
c04f5ac3
JX
7710#, c-format
7711msgid "Failed to copy notes from '%s' to '%s'"
90e6ef53 7712msgstr "无法从 '%s' 到 '%s' 拷贝注解"
c04f5ac3 7713
04cb2f28
JX
7714#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
7715#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
7716#: builtin/notes.c:919
c04f5ac3
JX
7717msgid "too many parameters"
7718msgstr "参数太多"
7719
04cb2f28 7720#: builtin/notes.c:371 builtin/notes.c:658
c04f5ac3
JX
7721#, c-format
7722msgid "No note found for object %s."
7723msgstr "未发现对象 %s 的注解。"
7724
04cb2f28 7725#: builtin/notes.c:392 builtin/notes.c:555
ef317cd5 7726msgid "note contents as a string"
07432cef 7727msgstr "注解内容作为一个字符串"
ef317cd5 7728
04cb2f28 7729#: builtin/notes.c:395 builtin/notes.c:558
ef317cd5 7730msgid "note contents in a file"
07432cef 7731msgstr "注解内容到一个文件中"
ef317cd5 7732
04cb2f28
JX
7733#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
7734#: builtin/notes.c:563 builtin/tag.c:628
ef317cd5 7735msgid "object"
07432cef 7736msgstr "对象"
ef317cd5 7737
04cb2f28 7738#: builtin/notes.c:398 builtin/notes.c:561
ef317cd5 7739msgid "reuse and edit specified note object"
07432cef 7740msgstr "重用和编辑指定的注解对象"
ef317cd5 7741
04cb2f28 7742#: builtin/notes.c:401 builtin/notes.c:564
ef317cd5 7743msgid "reuse specified note object"
07432cef 7744msgstr "重用指定的注解对象"
ef317cd5 7745
04cb2f28
JX
7746#: builtin/notes.c:404 builtin/notes.c:567
7747msgid "allow storing empty note"
7748msgstr "允许保存空白注释"
7749
7750#: builtin/notes.c:405 builtin/notes.c:476
ef317cd5 7751msgid "replace existing notes"
07432cef 7752msgstr "替换已存在的注解"
ef317cd5 7753
04cb2f28 7754#: builtin/notes.c:430
c04f5ac3
JX
7755#, c-format
7756msgid ""
7757"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7758"existing notes"
7759msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7760
04cb2f28 7761#: builtin/notes.c:445 builtin/notes.c:524
c04f5ac3
JX
7762#, c-format
7763msgid "Overwriting existing notes for object %s\n"
7764msgstr "覆盖对象 %s 现存注解\n"
7765
04cb2f28
JX
7766#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859
7767#, c-format
7768msgid "Removing note for object %s\n"
7769msgstr "删除对象 %s 的注解\n"
7770
7771#: builtin/notes.c:477
ef317cd5 7772msgid "read objects from stdin"
07432cef 7773msgstr "从标准输入读取对象"
ef317cd5 7774
04cb2f28 7775#: builtin/notes.c:479
ef317cd5 7776msgid "load rewriting config for <command> (implies --stdin)"
07432cef 7777msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 7778
04cb2f28 7779#: builtin/notes.c:497
c04f5ac3
JX
7780msgid "too few parameters"
7781msgstr "参数太少"
7782
04cb2f28 7783#: builtin/notes.c:518
c04f5ac3
JX
7784#, c-format
7785msgid ""
7786"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7787"existing notes"
7788msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7789
04cb2f28 7790#: builtin/notes.c:530
c04f5ac3
JX
7791#, c-format
7792msgid "Missing notes on source object %s. Cannot copy."
7793msgstr "源对象 %s 缺少注解。不能拷贝。"
7794
04cb2f28 7795#: builtin/notes.c:582
ef317cd5
JX
7796#, c-format
7797msgid ""
7798"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7799"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7800msgstr ""
7801"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7802"请换用 'git notes add -f -m/-F/-c/-C'。\n"
7803
04cb2f28 7804#: builtin/notes.c:750
ef317cd5 7805msgid "General options"
07432cef 7806msgstr "通用选项"
ef317cd5 7807
04cb2f28 7808#: builtin/notes.c:752
ef317cd5 7809msgid "Merge options"
07432cef 7810msgstr "合并选项"
ef317cd5 7811
04cb2f28 7812#: builtin/notes.c:754
ef317cd5
JX
7813msgid ""
7814"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7815"cat_sort_uniq)"
07432cef 7816msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 7817
04cb2f28 7818#: builtin/notes.c:756
ef317cd5 7819msgid "Committing unmerged notes"
07432cef 7820msgstr "提交未合并的注解"
ef317cd5 7821
04cb2f28 7822#: builtin/notes.c:758
ef317cd5 7823msgid "finalize notes merge by committing unmerged notes"
07432cef 7824msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 7825
04cb2f28 7826#: builtin/notes.c:760
ef317cd5 7827msgid "Aborting notes merge resolution"
07432cef 7828msgstr "中止注解合并的方案"
ef317cd5 7829
04cb2f28 7830#: builtin/notes.c:762
ef317cd5 7831msgid "abort notes merge"
07432cef 7832msgstr "中止注解合并"
ef317cd5 7833
04cb2f28 7834#: builtin/notes.c:857
ef317cd5
JX
7835#, c-format
7836msgid "Object %s has no note\n"
7837msgstr "对象 %s 没有注解\n"
7838
04cb2f28 7839#: builtin/notes.c:869
ef317cd5 7840msgid "attempt to remove non-existent note is not an error"
07432cef 7841msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 7842
04cb2f28 7843#: builtin/notes.c:872
ef317cd5 7844msgid "read object names from the standard input"
07432cef 7845msgstr "从标准输入读取对象名称"
ef317cd5 7846
04cb2f28 7847#: builtin/notes.c:953
6c94aba5 7848msgid "notes-ref"
07432cef 7849msgstr "注解引用"
ef317cd5 7850
04cb2f28 7851#: builtin/notes.c:954
814ff314 7852msgid "use notes from <notes-ref>"
07432cef 7853msgstr "从 <注解引用> 使用注解"
ef317cd5 7854
7aea43ff 7855#: builtin/notes.c:989 builtin/remote.c:1618
ef317cd5
JX
7856#, c-format
7857msgid "Unknown subcommand: %s"
7858msgstr "未知子命令:%s"
7859
220c313c 7860#: builtin/pack-objects.c:28
ef317cd5 7861msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
07432cef 7862msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
ef317cd5 7863
220c313c 7864#: builtin/pack-objects.c:29
ef317cd5 7865msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
07432cef 7866msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
ef317cd5 7867
814ff314 7868#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
ef317cd5
JX
7869#, c-format
7870msgid "deflate error (%d)"
7871msgstr "压缩错误 (%d)"
7872
814ff314 7873#: builtin/pack-objects.c:771
6c94aba5
JX
7874msgid "Writing objects"
7875msgstr "写入对象中"
7876
7aea43ff 7877#: builtin/pack-objects.c:1011
6c94aba5
JX
7878msgid "disabling bitmap writing, as some objects are not being packed"
7879msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
7880
7aea43ff 7881#: builtin/pack-objects.c:2171
6c94aba5
JX
7882msgid "Compressing objects"
7883msgstr "压缩对象中"
7884
7aea43ff 7885#: builtin/pack-objects.c:2568
ef317cd5
JX
7886#, c-format
7887msgid "unsupported index version %s"
7888msgstr "不支持的索引版本 %s"
7889
7aea43ff 7890#: builtin/pack-objects.c:2572
ef317cd5
JX
7891#, c-format
7892msgid "bad index version '%s'"
7893msgstr "坏的索引版本 '%s'"
7894
7aea43ff 7895#: builtin/pack-objects.c:2595
ef317cd5
JX
7896#, c-format
7897msgid "option %s does not accept negative form"
7898msgstr "选项 %s 不接受否定格式"
7899
7aea43ff 7900#: builtin/pack-objects.c:2599
ef317cd5
JX
7901#, c-format
7902msgid "unable to parse value '%s' for option %s"
7903msgstr "不能解析选项 %1$s 的值 '%2$s'"
7904
7aea43ff 7905#: builtin/pack-objects.c:2619
ef317cd5 7906msgid "do not show progress meter"
07432cef 7907msgstr "不显示进度表"
ef317cd5 7908
7aea43ff 7909#: builtin/pack-objects.c:2621
ef317cd5 7910msgid "show progress meter"
07432cef 7911msgstr "显示进度表"
ef317cd5 7912
7aea43ff 7913#: builtin/pack-objects.c:2623
ef317cd5 7914msgid "show progress meter during object writing phase"
07432cef 7915msgstr "在对象写入阶段显示进度表"
ef317cd5 7916
7aea43ff 7917#: builtin/pack-objects.c:2626
ef317cd5 7918msgid "similar to --all-progress when progress meter is shown"
07432cef 7919msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 7920
7aea43ff 7921#: builtin/pack-objects.c:2627
ef317cd5 7922msgid "version[,offset]"
07432cef 7923msgstr "版本[,偏移]"
ef317cd5 7924
7aea43ff 7925#: builtin/pack-objects.c:2628
ef317cd5 7926msgid "write the pack index file in the specified idx format version"
07432cef 7927msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 7928
7aea43ff 7929#: builtin/pack-objects.c:2631
ef317cd5 7930msgid "maximum size of each output pack file"
07432cef 7931msgstr "每个输出包的最大尺寸"
ef317cd5 7932
7aea43ff 7933#: builtin/pack-objects.c:2633
ef317cd5 7934msgid "ignore borrowed objects from alternate object store"
07432cef 7935msgstr "忽略从替代对象存储里借用对象"
ef317cd5 7936
7aea43ff 7937#: builtin/pack-objects.c:2635
ef317cd5 7938msgid "ignore packed objects"
07432cef 7939msgstr "忽略包对象"
ef317cd5 7940
7aea43ff 7941#: builtin/pack-objects.c:2637
ef317cd5 7942msgid "limit pack window by objects"
07432cef 7943msgstr "限制打包窗口的对象数"
ef317cd5 7944
7aea43ff 7945#: builtin/pack-objects.c:2639
ef317cd5 7946msgid "limit pack window by memory in addition to object limit"
07432cef 7947msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 7948
7aea43ff 7949#: builtin/pack-objects.c:2641
ef317cd5 7950msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 7951msgstr "打包允许的 delta 链的最大长度"
ef317cd5 7952
7aea43ff 7953#: builtin/pack-objects.c:2643
ef317cd5 7954msgid "reuse existing deltas"
07432cef 7955msgstr "重用已存在的 deltas"
ef317cd5 7956
7aea43ff 7957#: builtin/pack-objects.c:2645
ef317cd5 7958msgid "reuse existing objects"
07432cef 7959msgstr "重用已存在的对象"
ef317cd5 7960
7aea43ff 7961#: builtin/pack-objects.c:2647
ef317cd5 7962msgid "use OFS_DELTA objects"
07432cef 7963msgstr "使用 OFS_DELTA 对象"
ef317cd5 7964
7aea43ff 7965#: builtin/pack-objects.c:2649
ef317cd5 7966msgid "use threads when searching for best delta matches"
07432cef 7967msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 7968
7aea43ff 7969#: builtin/pack-objects.c:2651
ef317cd5 7970msgid "do not create an empty pack output"
07432cef 7971msgstr "不创建空的包输出"
ef317cd5 7972
7aea43ff 7973#: builtin/pack-objects.c:2653
ef317cd5 7974msgid "read revision arguments from standard input"
d9d56b23 7975msgstr "从标准输入读取版本号参数"
ef317cd5 7976
7aea43ff 7977#: builtin/pack-objects.c:2655
ef317cd5 7978msgid "limit the objects to those that are not yet packed"
07432cef 7979msgstr "限制那些尚未打包的对象"
ef317cd5 7980
7aea43ff 7981#: builtin/pack-objects.c:2658
ef317cd5 7982msgid "include objects reachable from any reference"
07432cef 7983msgstr "包括可以从任何引用访问到的对象"
ef317cd5 7984
7aea43ff 7985#: builtin/pack-objects.c:2661
ef317cd5 7986msgid "include objects referred by reflog entries"
07432cef 7987msgstr "包括被引用日志引用到的对象"
ef317cd5 7988
7aea43ff 7989#: builtin/pack-objects.c:2664
220c313c
JX
7990msgid "include objects referred to by the index"
7991msgstr "包括被索引引用到的对象"
7992
7aea43ff 7993#: builtin/pack-objects.c:2667
ef317cd5 7994msgid "output pack to stdout"
07432cef 7995msgstr "输出包到标准输出"
ef317cd5 7996
7aea43ff 7997#: builtin/pack-objects.c:2669
ef317cd5 7998msgid "include tag objects that refer to objects to be packed"
07432cef 7999msgstr "包括引用了打包对象的 tag"
ef317cd5 8000
7aea43ff 8001#: builtin/pack-objects.c:2671
ef317cd5 8002msgid "keep unreachable objects"
07432cef 8003msgstr "维持不可达的对象"
ef317cd5 8004
7aea43ff 8005#: builtin/pack-objects.c:2672 parse-options.h:139
ef317cd5
JX
8006msgid "time"
8007msgstr "时间"
8008
7aea43ff 8009#: builtin/pack-objects.c:2673
ef317cd5 8010msgid "unpack unreachable objects newer than <time>"
07432cef 8011msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 8012
7aea43ff 8013#: builtin/pack-objects.c:2676
ef317cd5 8014msgid "create thin packs"
07432cef 8015msgstr "创建精简包"
ef317cd5 8016
7aea43ff 8017#: builtin/pack-objects.c:2678
04cb2f28
JX
8018msgid "create packs suitable for shallow fetches"
8019msgstr "创建适合浅克隆版本库获取的包"
8020
7aea43ff 8021#: builtin/pack-objects.c:2680
ef317cd5 8022msgid "ignore packs that have companion .keep file"
07432cef 8023msgstr "忽略配有 .keep 文件的包"
ef317cd5 8024
7aea43ff 8025#: builtin/pack-objects.c:2682
ef317cd5 8026msgid "pack compression level"
07432cef 8027msgstr "打包压缩级别"
ef317cd5 8028
7aea43ff 8029#: builtin/pack-objects.c:2684
ef317cd5 8030msgid "do not hide commits by grafts"
cfff71a9 8031msgstr "显示被嫁接隐藏的提交"
ef317cd5 8032
7aea43ff 8033#: builtin/pack-objects.c:2686
6c94aba5
JX
8034msgid "use a bitmap index if available to speed up counting objects"
8035msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
8036
7aea43ff 8037#: builtin/pack-objects.c:2688
6c94aba5
JX
8038msgid "write a bitmap index together with the pack index"
8039msgstr "在建立包索引的同时创建 bitmap 索引"
8040
7aea43ff 8041#: builtin/pack-objects.c:2779
6c94aba5
JX
8042msgid "Counting objects"
8043msgstr "对象计数中"
8044
ef317cd5 8045#: builtin/pack-refs.c:6
814ff314
JX
8046msgid "git pack-refs [<options>]"
8047msgstr "git pack-refs [<选项>]"
c04f5ac3 8048
ef317cd5
JX
8049#: builtin/pack-refs.c:14
8050msgid "pack everything"
07432cef 8051msgstr "打包一切"
c04f5ac3 8052
ef317cd5
JX
8053#: builtin/pack-refs.c:15
8054msgid "prune loose refs (default)"
07432cef 8055msgstr "清除松散的引用(默认)"
c04f5ac3 8056
ef317cd5 8057#: builtin/prune-packed.c:7
814ff314
JX
8058msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
8059msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
6792b93b 8060
220c313c 8061#: builtin/prune-packed.c:40
6c94aba5
JX
8062msgid "Removing duplicate objects"
8063msgstr "正在删除重复对象"
8064
ef317cd5
JX
8065#: builtin/prune.c:12
8066msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
07432cef 8067msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7ac1c0ad 8068
7aea43ff
JX
8069#: builtin/prune.c:86
8070#, c-format
8071msgid "Removing worktrees/%s: not a valid directory"
8072msgstr "删除工作区/%s:不是一个有效的目录"
8073
8074#: builtin/prune.c:92
8075#, c-format
8076msgid "Removing worktrees/%s: gitdir file does not exist"
8077msgstr "删除 worktrees/%s:gitdir 文件不存在"
8078
8079#: builtin/prune.c:97
8080#, c-format
8081msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
8082msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
8083
8084#: builtin/prune.c:108
8085#, c-format
8086msgid "Removing worktrees/%s: invalid gitdir file"
8087msgstr "删除 worktrees/%s:无效的 gitdir 文件"
8088
8089#: builtin/prune.c:124
8090#, c-format
8091msgid "Removing worktrees/%s: gitdir file points to non-existent location"
8092msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
8093
8094#: builtin/prune.c:159
8095#, c-format
8096msgid "failed to remove: %s"
8097msgstr "无法删除:%s"
8098
8099#: builtin/prune.c:196
ef317cd5 8100msgid "do not remove, show only"
07432cef 8101msgstr "不删除,只显示"
7ac1c0ad 8102
7aea43ff 8103#: builtin/prune.c:197
ef317cd5 8104msgid "report pruned objects"
07432cef 8105msgstr "报告清除的对象"
7ac1c0ad 8106
7aea43ff
JX
8107#: builtin/prune.c:199
8108msgid "prune .git/worktrees"
8109msgstr "清理 .git/worktrees"
8110
8111#: builtin/prune.c:201
ef317cd5 8112msgid "expire objects older than <time>"
07432cef 8113msgstr "使早于给定时间的对象过期"
ef317cd5 8114
7aea43ff
JX
8115#: builtin/prune.c:216
8116msgid "--worktrees does not take extra arguments"
8117msgstr "--worktrees 没有附加参数"
8118
ef317cd5 8119#: builtin/push.c:14
ef317cd5 8120msgid "git push [<options>] [<repository> [<refspec>...]]"
90314792 8121msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
7ac1c0ad 8122
6c94aba5 8123#: builtin/push.c:85
c04f5ac3 8124msgid "tag shorthand without <tag>"
d9d56b23 8125msgstr "tag 后面未提供 <标签> 参数"
c04f5ac3 8126
6c94aba5 8127#: builtin/push.c:95
c04f5ac3 8128msgid "--delete only accepts plain target ref names"
90e6ef53 8129msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 8130
6acbf033 8131#: builtin/push.c:139
8ada9598
JX
8132msgid ""
8133"\n"
8134"To choose either option permanently, see push.default in 'git help config'."
8135msgstr ""
81809b99
JX
8136"\n"
8137"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 8138
6acbf033 8139#: builtin/push.c:142
8ada9598
JX
8140#, c-format
8141msgid ""
8142"The upstream branch of your current branch does not match\n"
8143"the name of your current branch. To push to the upstream branch\n"
8144"on the remote, use\n"
8145"\n"
8146" git push %s HEAD:%s\n"
8147"\n"
8148"To push to the branch of the same name on the remote, use\n"
8149"\n"
8150" git push %s %s\n"
8151"%s"
8152msgstr ""
81809b99
JX
8153"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
8154"上游分支,使用\n"
8155"\n"
8156" git push %s HEAD:%s\n"
8157"\n"
8158"为推送至远程同名分支,使用\n"
8159"\n"
8160" git push %s %s\n"
8161"%s"
8ada9598 8162
6acbf033 8163#: builtin/push.c:157
c04f5ac3
JX
8164#, c-format
8165msgid ""
8166"You are not currently on a branch.\n"
8167"To push the history leading to the current (detached HEAD)\n"
8168"state now, use\n"
8169"\n"
8170" git push %s HEAD:<name-of-remote-branch>\n"
8171msgstr ""
8172"您当前不在一个分支上。\n"
90e6ef53 8173"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3 8174"\n"
d9d56b23 8175" git push %s HEAD:<远程分支名字>\n"
c04f5ac3 8176
6acbf033 8177#: builtin/push.c:171
c04f5ac3
JX
8178#, c-format
8179msgid ""
8180"The current branch %s has no upstream branch.\n"
8181"To push the current branch and set the remote as upstream, use\n"
8182"\n"
8183" git push --set-upstream %s %s\n"
8184msgstr ""
8185"当前分支 %s 没有对应的上游分支。\n"
8186"为推送当前分支并建立与远程上游的跟踪,使用\n"
8187"\n"
8188" git push --set-upstream %s %s\n"
8189
6acbf033 8190#: builtin/push.c:179
c04f5ac3
JX
8191#, c-format
8192msgid "The current branch %s has multiple upstream branches, refusing to push."
8193msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
8194
6acbf033 8195#: builtin/push.c:182
73a60cd2
JX
8196#, c-format
8197msgid ""
8198"You are pushing to remote '%s', which is not the upstream of\n"
8199"your current branch '%s', without telling me what to push\n"
8200"to update which remote branch."
8201msgstr ""
8202"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
8203"而没有告诉我要推送什么、更新哪个远程分支。"
8204
c160d03f 8205# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
6acbf033 8206#: builtin/push.c:205
c160d03f 8207msgid ""
6c94aba5 8208"push.default is unset; its implicit value has changed in\n"
c160d03f 8209"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6c94aba5 8210"and maintain the traditional behavior, use:\n"
c160d03f
JX
8211"\n"
8212" git config --global push.default matching\n"
8213"\n"
8214"To squelch this message and adopt the new behavior now, use:\n"
8215"\n"
8216" git config --global push.default simple\n"
8217"\n"
cfff71a9
JX
8218"When push.default is set to 'matching', git will push local branches\n"
8219"to the remote branches that already exist with the same name.\n"
8220"\n"
6c94aba5 8221"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
cfff71a9
JX
8222"behavior, which only pushes the current branch to the corresponding\n"
8223"remote branch that 'git pull' uses to update the current branch.\n"
8224"\n"
c160d03f
JX
8225"See 'git help config' and search for 'push.default' for further "
8226"information.\n"
8227"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8228"'current' instead of 'simple' if you sometimes use older versions of Git)"
8229msgstr ""
6c94aba5 8230"push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
cfff71a9 8231"变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
c160d03f
JX
8232"\n"
8233" git config --global push.default matching\n"
8234"\n"
8235"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
8236"\n"
8237" git config --global push.default simple\n"
8238"\n"
cfff71a9
JX
8239"当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
8240"本地分支。\n"
8241"\n"
8242"从 Git 2.0 开始,Git 缺省采用更为保守的 'simple' 模式,只推送当前\n"
8243"分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
8244"\n"
c160d03f
JX
8245"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8246"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
90314792 8247"为保持兼容,请用 'current' 代替 'simple')"
c160d03f 8248
6acbf033 8249#: builtin/push.c:272
c04f5ac3
JX
8250msgid ""
8251"You didn't specify any refspecs to push, and push.default is \"nothing\"."
90314792 8252msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。"
c04f5ac3 8253
6acbf033 8254#: builtin/push.c:279
170e9899
JX
8255msgid ""
8256"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
8257"its remote counterpart. Integrate the remote changes (e.g.\n"
8258"'git pull ...') before pushing again.\n"
170e9899
JX
8259"See the 'Note about fast-forwards' in 'git push --help' for details."
8260msgstr ""
eff6d3a9 8261"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 8262"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 8263"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 8264
6acbf033 8265#: builtin/push.c:285
170e9899
JX
8266msgid ""
8267"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
8268"counterpart. Check out this branch and integrate the remote changes\n"
8269"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
8270"See the 'Note about fast-forwards' in 'git push --help' for details."
8271msgstr ""
eff6d3a9 8272"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 8273"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 8274"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 8275
6acbf033 8276#: builtin/push.c:291
07432cef 8277msgid ""
a77c07d9
JX
8278"Updates were rejected because the remote contains work that you do\n"
8279"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
8280"to the same ref. You may want to first integrate the remote changes\n"
8281"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
8282"See the 'Note about fast-forwards' in 'git push --help' for details."
8283msgstr ""
8284"更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
2e8451e8
JX
8285"一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
8286"(如 'git pull ...')。\n"
a77c07d9
JX
8287"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8288
6acbf033 8289#: builtin/push.c:298
a77c07d9
JX
8290msgid "Updates were rejected because the tag already exists in the remote."
8291msgstr "更新被拒绝因为 tag 在远程已经存在。"
8292
6acbf033 8293#: builtin/push.c:301
a77c07d9
JX
8294msgid ""
8295"You cannot update a remote ref that points at a non-commit object,\n"
8296"or update a remote ref to make it point at a non-commit object,\n"
8297"without using the '--force' option.\n"
8298msgstr ""
8299"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
8300"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 8301
6acbf033 8302#: builtin/push.c:360
c04f5ac3
JX
8303#, c-format
8304msgid "Pushing to %s\n"
8305msgstr "推送到 %s\n"
8306
6acbf033 8307#: builtin/push.c:364
c04f5ac3
JX
8308#, c-format
8309msgid "failed to push some refs to '%s'"
8310msgstr "无法推送一些引用到 '%s'"
8311
6acbf033 8312#: builtin/push.c:394
c04f5ac3
JX
8313#, c-format
8314msgid "bad repository '%s'"
90e6ef53 8315msgstr "坏的版本库 '%s'"
c04f5ac3 8316
6acbf033 8317#: builtin/push.c:395
c04f5ac3
JX
8318msgid ""
8319"No configured push destination.\n"
8320"Either specify the URL from the command-line or configure a remote "
8321"repository using\n"
8322"\n"
8323" git remote add <name> <url>\n"
8324"\n"
8325"and then push using the remote name\n"
8326"\n"
8327" git push <name>\n"
8328msgstr ""
90e6ef53 8329"没有配置推送目标。\n"
07432cef 8330"或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
c04f5ac3 8331"\n"
d9d56b23 8332" git remote add <名称> <地址>\n"
c04f5ac3
JX
8333"\n"
8334"然后使用该远程版本库名执行推送\n"
8335"\n"
d9d56b23 8336" git push <名称>\n"
c04f5ac3 8337
6acbf033 8338#: builtin/push.c:410
c04f5ac3
JX
8339msgid "--all and --tags are incompatible"
8340msgstr "--all 和 --tags 不兼容"
8341
6acbf033 8342#: builtin/push.c:411
c04f5ac3 8343msgid "--all can't be combined with refspecs"
90314792 8344msgstr "--all 不能和引用规则同时使用"
c04f5ac3 8345
6acbf033 8346#: builtin/push.c:416
c04f5ac3
JX
8347msgid "--mirror and --tags are incompatible"
8348msgstr "--mirror 和 --tags 不兼容"
8349
6acbf033 8350#: builtin/push.c:417
c04f5ac3 8351msgid "--mirror can't be combined with refspecs"
90314792 8352msgstr "--mirror 不能和引用规则同时使用"
c04f5ac3 8353
6acbf033 8354#: builtin/push.c:422
c04f5ac3
JX
8355msgid "--all and --mirror are incompatible"
8356msgstr "--all 和 --mirror 不兼容"
8357
814ff314 8358#: builtin/push.c:502
ef317cd5 8359msgid "repository"
07432cef 8360msgstr "版本库"
ef317cd5 8361
814ff314 8362#: builtin/push.c:503
ef317cd5 8363msgid "push all refs"
07432cef 8364msgstr "推送所有引用"
ef317cd5 8365
814ff314 8366#: builtin/push.c:504
ef317cd5 8367msgid "mirror all refs"
07432cef 8368msgstr "镜像所有引用"
ef317cd5 8369
814ff314 8370#: builtin/push.c:506
ef317cd5 8371msgid "delete refs"
07432cef 8372msgstr "删除引用"
ef317cd5 8373
814ff314 8374#: builtin/push.c:507
ef317cd5 8375msgid "push tags (can't be used with --all or --mirror)"
07432cef 8376msgstr "推送 tags(不能使用 --all or --mirror)"
ef317cd5 8377
814ff314 8378#: builtin/push.c:510
ef317cd5
JX
8379msgid "force updates"
8380msgstr "强制更新"
8381
814ff314 8382#: builtin/push.c:512
90314792
JX
8383msgid "refname>:<expect"
8384msgstr "引用名>:<期望值"
8385
814ff314 8386#: builtin/push.c:513
90314792
JX
8387msgid "require old value of ref to be at this value"
8388msgstr "要求引用旧的取值为设定值"
8389
814ff314 8390#: builtin/push.c:516
ef317cd5 8391msgid "control recursive pushing of submodules"
07432cef 8392msgstr "控制子模组的递归推送"
ef317cd5 8393
814ff314 8394#: builtin/push.c:518
ef317cd5 8395msgid "use thin pack"
07432cef 8396msgstr "使用精简打包"
ef317cd5 8397
814ff314 8398#: builtin/push.c:519 builtin/push.c:520
ef317cd5 8399msgid "receive pack program"
07432cef 8400msgstr "接收包程序"
ef317cd5 8401
814ff314 8402#: builtin/push.c:521
ef317cd5 8403msgid "set upstream for git pull/status"
07432cef 8404msgstr "设置 git pull/status 的上游"
ef317cd5 8405
814ff314 8406#: builtin/push.c:524
ef317cd5 8407msgid "prune locally removed refs"
07432cef 8408msgstr "清除本地删除的引用"
ef317cd5 8409
814ff314 8410#: builtin/push.c:526
a77c07d9
JX
8411msgid "bypass pre-push hook"
8412msgstr "绕过 pre-push 钩子"
8413
814ff314 8414#: builtin/push.c:527
1003b3a5
JX
8415msgid "push missing but relevant tags"
8416msgstr "推送缺失的有关的 tags"
8417
814ff314 8418#: builtin/push.c:529
220c313c
JX
8419msgid "GPG sign the push"
8420msgstr "用 GPG 为推送签名"
8421
814ff314
JX
8422#: builtin/push.c:530
8423msgid "request atomic transaction on remote side"
8424msgstr "需要远端支持原子事务"
8425
8426#: builtin/push.c:539
c04f5ac3
JX
8427msgid "--delete is incompatible with --all, --mirror and --tags"
8428msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8429
814ff314 8430#: builtin/push.c:541
c04f5ac3
JX
8431msgid "--delete doesn't make sense without any refs"
8432msgstr "--delete 未接任何引用没有意义"
8433
220c313c 8434#: builtin/read-tree.c:37
ef317cd5
JX
8435msgid ""
8436"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
8437"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8438"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8439msgstr ""
07432cef
WS
8440"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
8441"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8442"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
ef317cd5 8443
220c313c 8444#: builtin/read-tree.c:110
ef317cd5 8445msgid "write resulting index to <file>"
d9d56b23 8446msgstr "将索引结果写入 <文件>"
ef317cd5 8447
220c313c 8448#: builtin/read-tree.c:113
ef317cd5 8449msgid "only empty the index"
07432cef 8450msgstr "只是清空索引"
ef317cd5 8451
220c313c 8452#: builtin/read-tree.c:115
ef317cd5 8453msgid "Merging"
07432cef 8454msgstr "合并"
ef317cd5 8455
220c313c 8456#: builtin/read-tree.c:117
ef317cd5 8457msgid "perform a merge in addition to a read"
07432cef 8458msgstr "读取之余再执行一个合并"
ef317cd5 8459
220c313c 8460#: builtin/read-tree.c:119
ef317cd5 8461msgid "3-way merge if no file level merging required"
07432cef 8462msgstr "如果没有文件级合并需要,执行三路合并"
ef317cd5 8463
220c313c 8464#: builtin/read-tree.c:121
ef317cd5 8465msgid "3-way merge in presence of adds and removes"
07432cef 8466msgstr "存在添加和删除时,也执行三路合并"
ef317cd5 8467
220c313c 8468#: builtin/read-tree.c:123
ef317cd5 8469msgid "same as -m, but discard unmerged entries"
07432cef 8470msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 8471
220c313c 8472#: builtin/read-tree.c:124
ef317cd5 8473msgid "<subdirectory>/"
07432cef 8474msgstr "<子目录>/"
ef317cd5 8475
220c313c 8476#: builtin/read-tree.c:125
ef317cd5 8477msgid "read the tree into the index under <subdirectory>/"
07432cef 8478msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 8479
220c313c 8480#: builtin/read-tree.c:128
ef317cd5 8481msgid "update working tree with merge result"
07432cef 8482msgstr "用合并的结果更新工作区"
ef317cd5 8483
220c313c 8484#: builtin/read-tree.c:130
ef317cd5 8485msgid "gitignore"
07432cef 8486msgstr "gitignore"
ef317cd5 8487
220c313c 8488#: builtin/read-tree.c:131
ef317cd5 8489msgid "allow explicitly ignored files to be overwritten"
07432cef 8490msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 8491
220c313c 8492#: builtin/read-tree.c:134
ef317cd5 8493msgid "don't check the working tree after merging"
07432cef 8494msgstr "合并后不检查工作区"
ef317cd5 8495
220c313c 8496#: builtin/read-tree.c:135
ef317cd5 8497msgid "don't update the index or the work tree"
07432cef 8498msgstr "不更新索引区和工作区"
ef317cd5 8499
220c313c 8500#: builtin/read-tree.c:137
ef317cd5 8501msgid "skip applying sparse checkout filter"
07432cef 8502msgstr "跳过应用稀疏检出过滤器"
ef317cd5 8503
220c313c 8504#: builtin/read-tree.c:139
ef317cd5 8505msgid "debug unpack-trees"
07432cef 8506msgstr "调试 unpack-trees"
ef317cd5 8507
7aea43ff 8508#: builtin/reflog.c:430
2e8451e8
JX
8509#, c-format
8510msgid "%s' for '%s' is not a valid timestamp"
8511msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8512
7aea43ff 8513#: builtin/reflog.c:547 builtin/reflog.c:552
2e8451e8
JX
8514#, c-format
8515msgid "'%s' is not a valid timestamp"
8516msgstr "'%s' 不是一个有效的时间戳"
8517
cfff71a9 8518#: builtin/remote.c:12
ef317cd5 8519msgid "git remote [-v | --verbose]"
07432cef 8520msgstr "git remote [-v | --verbose]"
ef317cd5 8521
cfff71a9 8522#: builtin/remote.c:13
ef317cd5 8523msgid ""
814ff314 8524"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
ef317cd5
JX
8525"mirror=<fetch|push>] <name> <url>"
8526msgstr ""
814ff314 8527"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
d9d56b23 8528"mirror=<fetch|push>] <名称> <地址>"
ef317cd5 8529
cfff71a9 8530#: builtin/remote.c:14 builtin/remote.c:33
ef317cd5 8531msgid "git remote rename <old> <new>"
07432cef 8532msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 8533
cfff71a9 8534#: builtin/remote.c:15 builtin/remote.c:38
ef317cd5 8535msgid "git remote remove <name>"
07432cef 8536msgstr "git remote remove <名称>"
ef317cd5 8537
814ff314
JX
8538#: builtin/remote.c:16 builtin/remote.c:43
8539msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8540msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
ef317cd5 8541
cfff71a9 8542#: builtin/remote.c:17
ef317cd5 8543msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 8544msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 8545
cfff71a9 8546#: builtin/remote.c:18
ef317cd5 8547msgid "git remote prune [-n | --dry-run] <name>"
07432cef 8548msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 8549
cfff71a9 8550#: builtin/remote.c:19
ef317cd5
JX
8551msgid ""
8552"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 8553msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 8554
cfff71a9 8555#: builtin/remote.c:20
ef317cd5 8556msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 8557msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 8558
cfff71a9 8559#: builtin/remote.c:21 builtin/remote.c:69
ef317cd5 8560msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 8561msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 8562
cfff71a9 8563#: builtin/remote.c:22 builtin/remote.c:70
ef317cd5 8564msgid "git remote set-url --add <name> <newurl>"
07432cef 8565msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 8566
cfff71a9 8567#: builtin/remote.c:23 builtin/remote.c:71
ef317cd5 8568msgid "git remote set-url --delete <name> <url>"
07432cef 8569msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 8570
cfff71a9 8571#: builtin/remote.c:28
ef317cd5 8572msgid "git remote add [<options>] <name> <url>"
07432cef 8573msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 8574
cfff71a9 8575#: builtin/remote.c:48
ef317cd5 8576msgid "git remote set-branches <name> <branch>..."
07432cef 8577msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 8578
cfff71a9 8579#: builtin/remote.c:49
ef317cd5 8580msgid "git remote set-branches --add <name> <branch>..."
07432cef 8581msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 8582
cfff71a9 8583#: builtin/remote.c:54
ef317cd5 8584msgid "git remote show [<options>] <name>"
07432cef 8585msgstr "git remote show [<选项>] <名称>"
ef317cd5 8586
cfff71a9 8587#: builtin/remote.c:59
ef317cd5 8588msgid "git remote prune [<options>] <name>"
07432cef 8589msgstr "git remote prune [<选项>] <名称>"
ef317cd5 8590
cfff71a9 8591#: builtin/remote.c:64
ef317cd5 8592msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 8593msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 8594
cfff71a9 8595#: builtin/remote.c:88
81809b99 8596#, c-format
8ada9598 8597msgid "Updating %s"
81809b99 8598msgstr "更新 %s 中"
8ada9598 8599
cfff71a9 8600#: builtin/remote.c:120
8ada9598
JX
8601msgid ""
8602"--mirror is dangerous and deprecated; please\n"
8603"\t use --mirror=fetch or --mirror=push instead"
8604msgstr ""
81809b99
JX
8605"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8606"\t 或 --mirror=push"
8ada9598 8607
cfff71a9 8608#: builtin/remote.c:137
81809b99 8609#, c-format
8ada9598 8610msgid "unknown mirror argument: %s"
81809b99 8611msgstr "未知的镜像参数:%s"
8ada9598 8612
cfff71a9 8613#: builtin/remote.c:153
ef317cd5 8614msgid "fetch the remote branches"
07432cef 8615msgstr "抓取远程的分支"
ef317cd5 8616
cfff71a9 8617#: builtin/remote.c:155
ef317cd5 8618msgid "import all tags and associated objects when fetching"
07432cef 8619msgstr "抓取时导入所有的 tags 和关联对象"
ef317cd5 8620
cfff71a9 8621#: builtin/remote.c:158
ef317cd5 8622msgid "or do not fetch any tag at all (--no-tags)"
07432cef 8623msgstr "或不抓取任何 tag(--no-tags)"
ef317cd5 8624
cfff71a9 8625#: builtin/remote.c:160
ef317cd5 8626msgid "branch(es) to track"
07432cef 8627msgstr "跟踪的分支"
ef317cd5 8628
cfff71a9 8629#: builtin/remote.c:161
ef317cd5 8630msgid "master branch"
07432cef 8631msgstr "主线分支"
ef317cd5 8632
cfff71a9 8633#: builtin/remote.c:162
ef317cd5 8634msgid "push|fetch"
07432cef 8635msgstr "push|fetch"
ef317cd5 8636
cfff71a9 8637#: builtin/remote.c:163
ef317cd5 8638msgid "set up remote as a mirror to push to or fetch from"
07432cef 8639msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 8640
cfff71a9 8641#: builtin/remote.c:175
8ada9598 8642msgid "specifying a master branch makes no sense with --mirror"
81809b99 8643msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 8644
cfff71a9 8645#: builtin/remote.c:177
8ada9598 8646msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 8647msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 8648
7aea43ff 8649#: builtin/remote.c:187 builtin/remote.c:640
81809b99 8650#, c-format
8ada9598 8651msgid "remote %s already exists."
81809b99 8652msgstr "远程 %s 已经存在。"
8ada9598 8653
7aea43ff 8654#: builtin/remote.c:191 builtin/remote.c:644
81809b99 8655#, c-format
8ada9598 8656msgid "'%s' is not a valid remote name"
81809b99 8657msgstr "'%s' 不是一个有效的远程名称"
8ada9598 8658
d9d56b23 8659#: builtin/remote.c:235
81809b99 8660#, c-format
8ada9598 8661msgid "Could not setup master '%s'"
81809b99 8662msgstr "无法设置 master '%s'"
8ada9598 8663
d9d56b23 8664#: builtin/remote.c:335
81809b99 8665#, c-format
8ada9598 8666msgid "Could not get fetch map for refspec %s"
90314792 8667msgstr "无法得到引用规则 %s 的获取列表"
8ada9598 8668
d9d56b23 8669#: builtin/remote.c:436 builtin/remote.c:444
8ada9598 8670msgid "(matching)"
81809b99 8671msgstr "(匹配)"
8ada9598 8672
d9d56b23 8673#: builtin/remote.c:448
8ada9598 8674msgid "(delete)"
81809b99 8675msgstr "(删除)"
8ada9598 8676
7aea43ff 8677#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601
81809b99 8678#, c-format
8ada9598 8679msgid "Could not append '%s' to '%s'"
81809b99 8680msgstr "不能添加 '%s' 至 '%s'"
8ada9598 8681
7aea43ff 8682#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892
81809b99 8683#, c-format
8ada9598 8684msgid "No such remote: %s"
81809b99 8685msgstr "没有这样的远程:%s"
8ada9598 8686
7aea43ff 8687#: builtin/remote.c:650
81809b99 8688#, c-format
8ada9598 8689msgid "Could not rename config section '%s' to '%s'"
81809b99 8690msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 8691
7aea43ff 8692#: builtin/remote.c:656 builtin/remote.c:844
81809b99 8693#, c-format
8ada9598 8694msgid "Could not remove config section '%s'"
81809b99 8695msgstr "不能移除配置小节 '%s'"
8ada9598 8696
7aea43ff 8697#: builtin/remote.c:671
8ada9598
JX
8698#, c-format
8699msgid ""
d691f479 8700"Not updating non-default fetch refspec\n"
8ada9598
JX
8701"\t%s\n"
8702"\tPlease update the configuration manually if necessary."
8703msgstr ""
90314792 8704"没有更新非默认的获取引用规则\n"
81809b99
JX
8705"\t%s\n"
8706"\t如果必要请手动更新配置。"
8ada9598 8707
7aea43ff 8708#: builtin/remote.c:677
81809b99 8709#, c-format
8ada9598 8710msgid "Could not append '%s'"
81809b99 8711msgstr "不能追加 '%s'"
8ada9598 8712
7aea43ff 8713#: builtin/remote.c:688
81809b99 8714#, c-format
8ada9598 8715msgid "Could not set '%s'"
81809b99 8716msgstr "不能设置 '%s'"
8ada9598 8717
7aea43ff 8718#: builtin/remote.c:710
81809b99 8719#, c-format
8ada9598 8720msgid "deleting '%s' failed"
81809b99 8721msgstr "删除 '%s' 失败"
8ada9598 8722
7aea43ff 8723#: builtin/remote.c:744
81809b99 8724#, c-format
8ada9598 8725msgid "creating '%s' failed"
81809b99 8726msgstr "创建 '%s' 失败"
8ada9598 8727
7aea43ff 8728#: builtin/remote.c:763
81809b99 8729#, c-format
8ada9598 8730msgid "Could not remove branch %s"
81809b99 8731msgstr "无法移除分支 %s"
8ada9598 8732
7aea43ff 8733#: builtin/remote.c:830
8ada9598
JX
8734msgid ""
8735"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8736"to delete it, use:"
8737msgid_plural ""
8738"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8739"to delete them, use:"
5ae481e0
JX
8740msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8741msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 8742
7aea43ff 8743#: builtin/remote.c:945
8ada9598
JX
8744#, c-format
8745msgid " new (next fetch will store in remotes/%s)"
81809b99 8746msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 8747
7aea43ff 8748#: builtin/remote.c:948
8ada9598 8749msgid " tracked"
81809b99 8750msgstr " 已跟踪"
8ada9598 8751
7aea43ff 8752#: builtin/remote.c:950
8ada9598 8753msgid " stale (use 'git remote prune' to remove)"
81809b99 8754msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 8755
7aea43ff 8756#: builtin/remote.c:952
8ada9598 8757msgid " ???"
81809b99 8758msgstr " ???"
8ada9598 8759
7aea43ff 8760#: builtin/remote.c:993
8ada9598
JX
8761#, c-format
8762msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 8763msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 8764
7aea43ff 8765#: builtin/remote.c:1000
81809b99 8766#, c-format
8ada9598 8767msgid "rebases onto remote %s"
81809b99 8768msgstr "变基到远程 %s"
8ada9598 8769
7aea43ff 8770#: builtin/remote.c:1003
81809b99 8771#, c-format
8ada9598 8772msgid " merges with remote %s"
81809b99 8773msgstr " 与远程 %s 合并"
8ada9598 8774
7aea43ff 8775#: builtin/remote.c:1004
8ada9598 8776msgid " and with remote"
81809b99 8777msgstr " 且有远程"
8ada9598 8778
7aea43ff 8779#: builtin/remote.c:1006
81809b99 8780#, c-format
8ada9598 8781msgid "merges with remote %s"
81809b99 8782msgstr "与远程 %s 合并"
8ada9598 8783
7aea43ff 8784#: builtin/remote.c:1007
8ada9598 8785msgid " and with remote"
81809b99 8786msgstr " 且有远程"
8ada9598 8787
7aea43ff 8788#: builtin/remote.c:1053
8ada9598 8789msgid "create"
81809b99 8790msgstr "创建"
8ada9598 8791
7aea43ff 8792#: builtin/remote.c:1056
8ada9598 8793msgid "delete"
81809b99 8794msgstr "删除"
8ada9598 8795
7aea43ff 8796#: builtin/remote.c:1060
8ada9598 8797msgid "up to date"
81809b99 8798msgstr "最新"
8ada9598 8799
7aea43ff 8800#: builtin/remote.c:1063
8ada9598 8801msgid "fast-forwardable"
81809b99 8802msgstr "可快进"
8ada9598 8803
7aea43ff 8804#: builtin/remote.c:1066
8ada9598 8805msgid "local out of date"
81809b99 8806msgstr "本地已过时"
8ada9598 8807
7aea43ff 8808#: builtin/remote.c:1073
8ada9598
JX
8809#, c-format
8810msgid " %-*s forces to %-*s (%s)"
81809b99 8811msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 8812
7aea43ff 8813#: builtin/remote.c:1076
8ada9598
JX
8814#, c-format
8815msgid " %-*s pushes to %-*s (%s)"
81809b99 8816msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 8817
7aea43ff 8818#: builtin/remote.c:1080
8ada9598
JX
8819#, c-format
8820msgid " %-*s forces to %s"
81809b99 8821msgstr " %-*s 强制推送至 %s"
8ada9598 8822
7aea43ff 8823#: builtin/remote.c:1083
8ada9598
JX
8824#, c-format
8825msgid " %-*s pushes to %s"
81809b99 8826msgstr " %-*s 推送至 %s"
8ada9598 8827
7aea43ff 8828#: builtin/remote.c:1151
ef317cd5 8829msgid "do not query remotes"
07432cef 8830msgstr "不查询远程"
ef317cd5 8831
7aea43ff 8832#: builtin/remote.c:1178
81809b99 8833#, c-format
8ada9598 8834msgid "* remote %s"
81809b99 8835msgstr "* 远程 %s"
8ada9598 8836
7aea43ff 8837#: builtin/remote.c:1179
8ada9598
JX
8838#, c-format
8839msgid " Fetch URL: %s"
81809b99 8840msgstr " 获取地址:%s"
8ada9598 8841
7aea43ff 8842#: builtin/remote.c:1180 builtin/remote.c:1331
8ada9598 8843msgid "(no URL)"
81809b99 8844msgstr "(无 URL)"
8ada9598 8845
7aea43ff 8846#: builtin/remote.c:1189 builtin/remote.c:1191
8ada9598
JX
8847#, c-format
8848msgid " Push URL: %s"
81809b99 8849msgstr " 推送地址:%s"
8ada9598 8850
7aea43ff 8851#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197
81809b99 8852#, c-format
8ada9598 8853msgid " HEAD branch: %s"
81809b99 8854msgstr " HEAD分支:%s"
8ada9598 8855
7aea43ff 8856#: builtin/remote.c:1199
8ada9598
JX
8857#, c-format
8858msgid ""
8859" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 8860msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 8861
7aea43ff 8862#: builtin/remote.c:1211
81809b99 8863#, c-format
8ada9598
JX
8864msgid " Remote branch:%s"
8865msgid_plural " Remote branches:%s"
81809b99 8866msgstr[0] " 远程分支:%s"
5ae481e0 8867msgstr[1] " 远程分支:%s"
8ada9598 8868
81809b99 8869# 译者:中文字符串拼接,可删除前导空格
7aea43ff 8870#: builtin/remote.c:1214 builtin/remote.c:1241
8ada9598 8871msgid " (status not queried)"
81809b99 8872msgstr "(状态未查询)"
8ada9598 8873
7aea43ff 8874#: builtin/remote.c:1223
8ada9598
JX
8875msgid " Local branch configured for 'git pull':"
8876msgid_plural " Local branches configured for 'git pull':"
81809b99 8877msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 8878msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 8879
7aea43ff 8880#: builtin/remote.c:1231
8ada9598 8881msgid " Local refs will be mirrored by 'git push'"
81809b99 8882msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 8883
7aea43ff 8884#: builtin/remote.c:1238
81809b99 8885#, c-format
8ada9598
JX
8886msgid " Local ref configured for 'git push'%s:"
8887msgid_plural " Local refs configured for 'git push'%s:"
81809b99 8888msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 8889msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 8890
7aea43ff 8891#: builtin/remote.c:1259
ef317cd5 8892msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 8893msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 8894
7aea43ff 8895#: builtin/remote.c:1261
ef317cd5 8896msgid "delete refs/remotes/<name>/HEAD"
07432cef 8897msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 8898
7aea43ff 8899#: builtin/remote.c:1276
8ada9598 8900msgid "Cannot determine remote HEAD"
81809b99 8901msgstr "无法确定远程 HEAD"
8ada9598 8902
7aea43ff 8903#: builtin/remote.c:1278
8ada9598 8904msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 8905msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 8906
7aea43ff 8907#: builtin/remote.c:1288
81809b99 8908#, c-format
8ada9598 8909msgid "Could not delete %s"
81809b99 8910msgstr "无法删除 %s"
8ada9598 8911
7aea43ff 8912#: builtin/remote.c:1296
81809b99 8913#, c-format
8ada9598 8914msgid "Not a valid ref: %s"
81809b99 8915msgstr "不是一个有效引用:%s"
8ada9598 8916
7aea43ff 8917#: builtin/remote.c:1298
81809b99 8918#, c-format
8ada9598 8919msgid "Could not setup %s"
81809b99 8920msgstr "不能设置 %s"
8ada9598
JX
8921
8922# 译者:注意保持前导空格
7aea43ff 8923#: builtin/remote.c:1316
81809b99 8924#, c-format
8ada9598 8925msgid " %s will become dangling!"
07432cef 8926msgstr " %s 将成为摇摆状态!"
8ada9598
JX
8927
8928# 译者:注意保持前导空格
7aea43ff 8929#: builtin/remote.c:1317
81809b99 8930#, c-format
8ada9598 8931msgid " %s has become dangling!"
07432cef 8932msgstr " %s 已成为摇摆状态!"
8ada9598 8933
7aea43ff 8934#: builtin/remote.c:1327
81809b99 8935#, c-format
8ada9598 8936msgid "Pruning %s"
81809b99 8937msgstr "修剪 %s"
8ada9598 8938
7aea43ff 8939#: builtin/remote.c:1328
8ada9598
JX
8940#, c-format
8941msgid "URL: %s"
81809b99 8942msgstr "URL:%s"
8ada9598 8943
7aea43ff 8944#: builtin/remote.c:1351
8ada9598
JX
8945#, c-format
8946msgid " * [would prune] %s"
81809b99 8947msgstr " * [将删除] %s"
8ada9598 8948
7aea43ff 8949#: builtin/remote.c:1354
8ada9598
JX
8950#, c-format
8951msgid " * [pruned] %s"
81809b99 8952msgstr " * [已删除] %s"
8ada9598 8953
7aea43ff 8954#: builtin/remote.c:1399
ef317cd5 8955msgid "prune remotes after fetching"
07432cef 8956msgstr "抓取后清除远程"
ef317cd5 8957
7aea43ff 8958#: builtin/remote.c:1465 builtin/remote.c:1539
81809b99 8959#, c-format
8ada9598 8960msgid "No such remote '%s'"
81809b99 8961msgstr "没有此远程 '%s'"
8ada9598 8962
7aea43ff 8963#: builtin/remote.c:1485
ef317cd5 8964msgid "add branch"
07432cef 8965msgstr "添加分支"
ef317cd5 8966
7aea43ff 8967#: builtin/remote.c:1492
8ada9598 8968msgid "no remote specified"
81809b99 8969msgstr "未指定远程"
8ada9598 8970
7aea43ff 8971#: builtin/remote.c:1514
ef317cd5 8972msgid "manipulate push URLs"
07432cef 8973msgstr "操作推送 URLS"
ef317cd5 8974
7aea43ff 8975#: builtin/remote.c:1516
ef317cd5 8976msgid "add URL"
07432cef 8977msgstr "添加 URL"
ef317cd5 8978
7aea43ff 8979#: builtin/remote.c:1518
ef317cd5 8980msgid "delete URLs"
07432cef 8981msgstr "删除 URLS"
ef317cd5 8982
7aea43ff 8983#: builtin/remote.c:1525
8ada9598 8984msgid "--add --delete doesn't make sense"
81809b99 8985msgstr "--add --delete 无意义"
8ada9598 8986
7aea43ff 8987#: builtin/remote.c:1565
81809b99 8988#, c-format
8ada9598 8989msgid "Invalid old URL pattern: %s"
81809b99 8990msgstr "无效的旧URL匹配模版:%s"
8ada9598 8991
7aea43ff 8992#: builtin/remote.c:1573
81809b99 8993#, c-format
8ada9598 8994msgid "No such URL found: %s"
81809b99 8995msgstr "未找到此URL:%s"
8ada9598 8996
7aea43ff 8997#: builtin/remote.c:1575
8ada9598 8998msgid "Will not delete all non-push URLs"
81809b99 8999msgstr "将不会删除所有非推送URL地址"
8ada9598 9000
7aea43ff 9001#: builtin/remote.c:1589
ef317cd5 9002msgid "be verbose; must be placed before a subcommand"
07432cef 9003msgstr "冗长输出;必须置于子命令之前"
ef317cd5 9004
6acbf033 9005#: builtin/repack.c:17
814ff314
JX
9006msgid "git repack [<options>]"
9007msgstr "git repack [<选项>]"
90314792 9008
04cb2f28 9009#: builtin/repack.c:159
90314792
JX
9010msgid "pack everything in a single pack"
9011msgstr "所有内容打包到一个包文件中"
9012
04cb2f28 9013#: builtin/repack.c:161
90314792
JX
9014msgid "same as -a, and turn unreachable objects loose"
9015msgstr "和 -a 相同,并将不可达的对象设为松散对象"
9016
04cb2f28 9017#: builtin/repack.c:164
90314792
JX
9018msgid "remove redundant packs, and run git-prune-packed"
9019msgstr "删除多余的包,运行 git-prune-packed"
9020
04cb2f28 9021#: builtin/repack.c:166
90314792
JX
9022msgid "pass --no-reuse-delta to git-pack-objects"
9023msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
9024
04cb2f28 9025#: builtin/repack.c:168
90314792
JX
9026msgid "pass --no-reuse-object to git-pack-objects"
9027msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
9028
04cb2f28 9029#: builtin/repack.c:170
90314792
JX
9030msgid "do not run git-update-server-info"
9031msgstr "不运行 git-update-server-info"
9032
04cb2f28 9033#: builtin/repack.c:173
90314792
JX
9034msgid "pass --local to git-pack-objects"
9035msgstr "向 git-pack-objects 传递参数 --local"
9036
04cb2f28 9037#: builtin/repack.c:175
6c94aba5
JX
9038msgid "write bitmap index"
9039msgstr "写 bitmap 索引"
9040
04cb2f28 9041#: builtin/repack.c:176
90314792
JX
9042msgid "approxidate"
9043msgstr "近似日期"
9044
04cb2f28 9045#: builtin/repack.c:177
90314792
JX
9046msgid "with -A, do not loosen objects older than this"
9047msgstr "使用 -A,不要将早于给定时间的对象过期"
9048
04cb2f28 9049#: builtin/repack.c:179
90314792
JX
9050msgid "size of the window used for delta compression"
9051msgstr "用于增量压缩的窗口值"
9052
04cb2f28 9053#: builtin/repack.c:180 builtin/repack.c:184
8376b58d
JX
9054msgid "bytes"
9055msgstr "字节"
9056
04cb2f28 9057#: builtin/repack.c:181
90314792
JX
9058msgid "same as the above, but limit memory size instead of entries count"
9059msgstr "和上面的相似,但限制内存大小而非条目数"
9060
04cb2f28 9061#: builtin/repack.c:183
90314792
JX
9062msgid "limits the maximum delta depth"
9063msgstr "限制最大增量深度"
9064
04cb2f28 9065#: builtin/repack.c:185
90314792
JX
9066msgid "maximum size of each packfile"
9067msgstr "每个包的最大尺寸"
9068
04cb2f28 9069#: builtin/repack.c:187
6c94aba5
JX
9070msgid "repack objects in packs marked with .keep"
9071msgstr "对标记为 .keep 的包中的对象重新打包"
9072
7aea43ff 9073#: builtin/repack.c:377
90314792
JX
9074#, c-format
9075msgid "removing '%s' failed"
9076msgstr "删除 '%s' 失败"
9077
6acbf033 9078#: builtin/replace.c:19
ef317cd5 9079msgid "git replace [-f] <object> <replacement>"
07432cef 9080msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 9081
6acbf033
JX
9082#: builtin/replace.c:20
9083msgid "git replace [-f] --edit <object>"
9084msgstr "git replace [-f] --edit <对象>"
9085
9086#: builtin/replace.c:21
9087msgid "git replace [-f] --graft <commit> [<parent>...]"
9088msgstr "git replace [-f] --graft <提交> [<父提交>...]"
9089
9090#: builtin/replace.c:22
ef317cd5 9091msgid "git replace -d <object>..."
07432cef 9092msgstr "git replace -d <对象>..."
ef317cd5 9093
6acbf033 9094#: builtin/replace.c:23
cfff71a9
JX
9095msgid "git replace [--format=<format>] [-l [<pattern>]]"
9096msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 9097
220c313c 9098#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
6acbf033
JX
9099#, c-format
9100msgid "Not a valid object name: '%s'"
9101msgstr "不是一个有效的对象名:'%s'"
9102
220c313c 9103#: builtin/replace.c:355
6acbf033
JX
9104#, c-format
9105msgid "bad mergetag in commit '%s'"
9106msgstr "提交 '%s' 中损坏的 mergetag"
9107
220c313c 9108#: builtin/replace.c:357
6acbf033
JX
9109#, c-format
9110msgid "malformed mergetag in commit '%s'"
9111msgstr "提交 '%s' 中非法的 mergetag"
9112
220c313c 9113#: builtin/replace.c:368
6acbf033
JX
9114#, c-format
9115msgid ""
9116"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
9117"instead of --graft"
9118msgstr "原始提交 '%s' 包含已经丢弃的 mergetag '%s',使用 --edit 代替 --graft"
9119
220c313c 9120#: builtin/replace.c:401
6acbf033
JX
9121#, c-format
9122msgid "the original commit '%s' has a gpg signature."
9123msgstr "原始提交 '%s' 中包含一个 GPG 签名"
9124
220c313c 9125#: builtin/replace.c:402
6acbf033
JX
9126msgid "the signature will be removed in the replacement commit!"
9127msgstr "在替换的提交中签名将被移除!"
9128
220c313c 9129#: builtin/replace.c:408
6acbf033
JX
9130#, c-format
9131msgid "could not write replacement commit for: '%s'"
9132msgstr "不能为 '%s' 写替换提交"
9133
220c313c 9134#: builtin/replace.c:432
ef317cd5 9135msgid "list replace refs"
07432cef 9136msgstr "列出替换的引用"
ef317cd5 9137
220c313c 9138#: builtin/replace.c:433
ef317cd5 9139msgid "delete replace refs"
07432cef 9140msgstr "删除替换的引用"
ef317cd5 9141
220c313c 9142#: builtin/replace.c:434
6acbf033
JX
9143msgid "edit existing object"
9144msgstr "编辑现存的对象"
9145
220c313c 9146#: builtin/replace.c:435
6acbf033
JX
9147msgid "change a commit's parents"
9148msgstr "修改一个提交的父提交"
9149
220c313c 9150#: builtin/replace.c:436
ef317cd5 9151msgid "replace the ref if it exists"
07432cef 9152msgstr "如果存在则替换引用"
ef317cd5 9153
220c313c 9154#: builtin/replace.c:437
6acbf033
JX
9155msgid "do not pretty-print contents for --edit"
9156msgstr "不要为 --edit 操作美观显示内容"
9157
220c313c 9158#: builtin/replace.c:438
cfff71a9
JX
9159msgid "use this format"
9160msgstr "使用此格式"
9161
90314792 9162#: builtin/rerere.c:12
814ff314
JX
9163msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9164msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
ef317cd5 9165
90314792 9166#: builtin/rerere.c:57
ef317cd5 9167msgid "register clean resolutions in index"
07432cef 9168msgstr "在索引中注册干净的解决方案"
ef317cd5 9169
220c313c 9170#: builtin/reset.c:26
ef317cd5
JX
9171msgid ""
9172"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 9173msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5 9174
220c313c 9175#: builtin/reset.c:27
07432cef
WS
9176msgid "git reset [-q] <tree-ish> [--] <paths>..."
9177msgstr "git reset [-q] <树或提交> [--] <路径>..."
ef317cd5 9178
220c313c 9179#: builtin/reset.c:28
07432cef
WS
9180msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
9181msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 9182
220c313c 9183#: builtin/reset.c:34
c04f5ac3
JX
9184msgid "mixed"
9185msgstr "混杂"
9186
220c313c 9187#: builtin/reset.c:34
c04f5ac3
JX
9188msgid "soft"
9189msgstr "软性"
9190
220c313c 9191#: builtin/reset.c:34
c04f5ac3
JX
9192msgid "hard"
9193msgstr "硬性"
9194
220c313c 9195#: builtin/reset.c:34
8ada9598
JX
9196msgid "merge"
9197msgstr "合并"
9198
220c313c 9199#: builtin/reset.c:34
c04f5ac3
JX
9200msgid "keep"
9201msgstr "保持"
9202
220c313c 9203#: builtin/reset.c:74
c04f5ac3
JX
9204msgid "You do not have a valid HEAD."
9205msgstr "您没有一个有效的 HEAD。"
9206
220c313c 9207#: builtin/reset.c:76
c04f5ac3
JX
9208msgid "Failed to find tree of HEAD."
9209msgstr "无法找到 HEAD 指向的树。"
9210
220c313c 9211#: builtin/reset.c:82
c04f5ac3
JX
9212#, c-format
9213msgid "Failed to find tree of %s."
9214msgstr "无法找到 %s 指向的树。"
9215
220c313c 9216#: builtin/reset.c:100
c04f5ac3
JX
9217#, c-format
9218msgid "HEAD is now at %s"
9219msgstr "HEAD 现在位于 %s"
9220
90e6ef53 9221# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9222#: builtin/reset.c:183
c04f5ac3
JX
9223#, c-format
9224msgid "Cannot do a %s reset in the middle of a merge."
9225msgstr "在合并过程中不能做%s重置操作。"
9226
220c313c 9227#: builtin/reset.c:276
ef317cd5 9228msgid "be quiet, only report errors"
07432cef 9229msgstr "安静模式,只报告错误"
ef317cd5 9230
220c313c 9231#: builtin/reset.c:278
ef317cd5 9232msgid "reset HEAD and index"
07432cef 9233msgstr "重置 HEAD 和索引"
ef317cd5 9234
220c313c 9235#: builtin/reset.c:279
ef317cd5 9236msgid "reset only HEAD"
07432cef 9237msgstr "只重置 HEAD"
ef317cd5 9238
220c313c 9239#: builtin/reset.c:281 builtin/reset.c:283
ef317cd5 9240msgid "reset HEAD, index and working tree"
07432cef 9241msgstr "重置 HEAD、索引和工作区"
ef317cd5 9242
220c313c 9243#: builtin/reset.c:285
ef317cd5 9244msgid "reset HEAD but keep local changes"
07432cef 9245msgstr "重置 HEAD 但保存本地变更"
ef317cd5 9246
220c313c 9247#: builtin/reset.c:288
6c94aba5
JX
9248msgid "record only the fact that removed paths will be added later"
9249msgstr "将删除的路径标记为稍后添加"
9250
220c313c 9251#: builtin/reset.c:305
07432cef
WS
9252#, c-format
9253msgid "Failed to resolve '%s' as a valid revision."
9254msgstr "无法将 '%s' 解析为一个有效的版本。"
9255
220c313c 9256#: builtin/reset.c:308 builtin/reset.c:316
c04f5ac3
JX
9257#, c-format
9258msgid "Could not parse object '%s'."
9259msgstr "不能解析对象 '%s'。"
9260
220c313c 9261#: builtin/reset.c:313
07432cef
WS
9262#, c-format
9263msgid "Failed to resolve '%s' as a valid tree."
9264msgstr "无法将 '%s' 解析为一个有效的树对象。"
9265
220c313c 9266#: builtin/reset.c:322
c04f5ac3 9267msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 9268msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 9269
220c313c 9270#: builtin/reset.c:331
c04f5ac3 9271msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
d9d56b23 9272msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
c04f5ac3 9273
90e6ef53 9274# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9275#: builtin/reset.c:333
c04f5ac3
JX
9276#, c-format
9277msgid "Cannot do %s reset with paths."
9278msgstr "不能带路径进行%s重置。"
9279
90e6ef53 9280# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9281#: builtin/reset.c:343
c04f5ac3
JX
9282#, c-format
9283msgid "%s reset is not allowed in a bare repository"
220c313c 9284msgstr "不能对纯版本库进行%s重置"
c04f5ac3 9285
220c313c 9286#: builtin/reset.c:347
6c94aba5
JX
9287msgid "-N can only be used with --mixed"
9288msgstr "-N 只能和 --mixed 同时使用"
9289
220c313c 9290#: builtin/reset.c:364
90314792
JX
9291msgid "Unstaged changes after reset:"
9292msgstr "重置后撤出暂存区的变更:"
9293
220c313c 9294#: builtin/reset.c:370
ef317cd5
JX
9295#, c-format
9296msgid "Could not reset index file to revision '%s'."
9297msgstr "不能重置索引文件至版本 '%s'。"
9298
220c313c 9299#: builtin/reset.c:374
07432cef
WS
9300msgid "Could not write new index file."
9301msgstr "不能写入新的索引文件。"
9302
220c313c 9303#: builtin/rev-parse.c:361
814ff314
JX
9304msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
9305msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
ef317cd5 9306
220c313c 9307#: builtin/rev-parse.c:366
ef317cd5 9308msgid "keep the `--` passed as an arg"
07432cef 9309msgstr "保持 `--` 作为一个参数传递"
ef317cd5 9310
220c313c 9311#: builtin/rev-parse.c:368
ef317cd5 9312msgid "stop parsing after the first non-option argument"
07432cef 9313msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 9314
220c313c 9315#: builtin/rev-parse.c:371
cfff71a9
JX
9316msgid "output in stuck long form"
9317msgstr "以固定长格式输出"
9318
220c313c 9319#: builtin/rev-parse.c:499
ef317cd5 9320msgid ""
814ff314 9321"git rev-parse --parseopt [<options>] -- [<args>...]\n"
ef317cd5 9322" or: git rev-parse --sq-quote [<arg>...]\n"
814ff314 9323" or: git rev-parse [<options>] [<arg>...]\n"
ef317cd5
JX
9324"\n"
9325"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9326msgstr ""
814ff314 9327"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
90314792 9328" 或者:git rev-parse --sq-quote [<参数>...]\n"
814ff314 9329" 或者:git rev-parse [<选项>] [<参数>...]\n"
07432cef
WS
9330"\n"
9331"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5
JX
9332
9333#: builtin/revert.c:22
814ff314
JX
9334msgid "git revert [<options>] <commit-ish>..."
9335msgstr "git revert [<选项>] <提交号>..."
ef317cd5
JX
9336
9337#: builtin/revert.c:23
9338msgid "git revert <subcommand>"
07432cef 9339msgstr "git revert <子命令>"
ef317cd5
JX
9340
9341#: builtin/revert.c:28
814ff314
JX
9342msgid "git cherry-pick [<options>] <commit-ish>..."
9343msgstr "git cherry-pick [<选项>] <提交号>..."
ef317cd5
JX
9344
9345#: builtin/revert.c:29
ef317cd5 9346msgid "git cherry-pick <subcommand>"
07432cef 9347msgstr "git cherry-pick <子命令>"
ef317cd5 9348
90314792 9349#: builtin/revert.c:71
ef317cd5
JX
9350#, c-format
9351msgid "%s: %s cannot be used with %s"
9352msgstr "%s:%s 不能和 %s 同时使用"
9353
90314792 9354#: builtin/revert.c:80
ef317cd5 9355msgid "end revert or cherry-pick sequence"
07432cef 9356msgstr "终止反转或拣选操作"
ef317cd5 9357
90314792 9358#: builtin/revert.c:81
ef317cd5 9359msgid "resume revert or cherry-pick sequence"
07432cef 9360msgstr "继续反转或拣选操作"
ef317cd5 9361
90314792 9362#: builtin/revert.c:82
ef317cd5 9363msgid "cancel revert or cherry-pick sequence"
07432cef 9364msgstr "取消反转或拣选操作"
ef317cd5 9365
90314792 9366#: builtin/revert.c:83
ef317cd5 9367msgid "don't automatically commit"
07432cef 9368msgstr "不要自动提交"
ef317cd5 9369
90314792 9370#: builtin/revert.c:84
ef317cd5 9371msgid "edit the commit message"
07432cef 9372msgstr "编辑提交说明"
ef317cd5 9373
90314792 9374#: builtin/revert.c:87
ef317cd5 9375msgid "parent number"
07432cef 9376msgstr "父编号"
ef317cd5 9377
90314792 9378#: builtin/revert.c:89
ef317cd5 9379msgid "merge strategy"
07432cef 9380msgstr "合并策略"
ef317cd5 9381
90314792 9382#: builtin/revert.c:90
ef317cd5 9383msgid "option"
07432cef 9384msgstr "选项"
ef317cd5 9385
90314792 9386#: builtin/revert.c:91
ef317cd5 9387msgid "option for merge strategy"
07432cef 9388msgstr "合并策略的选项"
ef317cd5 9389
6c94aba5 9390#: builtin/revert.c:104
ef317cd5 9391msgid "append commit name"
07432cef 9392msgstr "追加提交名称"
ef317cd5 9393
6c94aba5 9394#: builtin/revert.c:105
ef317cd5 9395msgid "allow fast-forward"
07432cef 9396msgstr "允许快进式"
c04f5ac3 9397
6c94aba5 9398#: builtin/revert.c:106
ef317cd5 9399msgid "preserve initially empty commits"
07432cef 9400msgstr "保留初始化的空提交"
ef317cd5 9401
6c94aba5 9402#: builtin/revert.c:107
ef317cd5 9403msgid "allow commits with empty messages"
07432cef 9404msgstr "允许提交说明为空"
c04f5ac3 9405
6c94aba5 9406#: builtin/revert.c:108
ef317cd5 9407msgid "keep redundant, empty commits"
07432cef 9408msgstr "保持多余的、空的提交"
ef317cd5 9409
6c94aba5 9410#: builtin/revert.c:112
c04f5ac3
JX
9411msgid "program error"
9412msgstr "程序错误"
9413
6c94aba5 9414#: builtin/revert.c:197
c04f5ac3
JX
9415msgid "revert failed"
9416msgstr "还原失败"
9417
6c94aba5 9418#: builtin/revert.c:212
c04f5ac3
JX
9419msgid "cherry-pick failed"
9420msgstr "拣选失败"
9421
90314792 9422#: builtin/rm.c:17
814ff314
JX
9423msgid "git rm [<options>] [--] <file>..."
9424msgstr "git rm [<选项>] [--] <文件>..."
07432cef 9425
90314792 9426#: builtin/rm.c:65
2e8451e8
JX
9427msgid ""
9428"the following submodule (or one of its nested submodules)\n"
9429"uses a .git directory:"
9430msgid_plural ""
220c313c 9431"the following submodules (or one of their nested submodules)\n"
2e8451e8 9432"use a .git directory:"
220c313c
JX
9433msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9434msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
2e8451e8 9435
90314792 9436#: builtin/rm.c:71
07432cef 9437msgid ""
2e8451e8 9438"\n"
07432cef
WS
9439"(use 'rm -rf' if you really want to remove it including all of its history)"
9440msgstr ""
2e8451e8 9441"\n"
07432cef 9442"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
ef317cd5 9443
7aea43ff 9444#: builtin/rm.c:230
c04f5ac3 9445msgid ""
2e8451e8
JX
9446"the following file has staged content different from both the\n"
9447"file and the HEAD:"
9448msgid_plural ""
9449"the following files have staged content different from both the\n"
9450"file and the HEAD:"
9451msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9452msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9453
7aea43ff 9454#: builtin/rm.c:235
2e8451e8
JX
9455msgid ""
9456"\n"
c04f5ac3
JX
9457"(use -f to force removal)"
9458msgstr ""
2e8451e8 9459"\n"
c04f5ac3
JX
9460"(使用 -f 强制删除)"
9461
7aea43ff 9462#: builtin/rm.c:239
2e8451e8
JX
9463msgid "the following file has changes staged in the index:"
9464msgid_plural "the following files have changes staged in the index:"
9465msgstr[0] "如下文件相对索引区的内容有修改"
9466msgstr[1] "如下文件相对索引区的内容有修改"
c04f5ac3 9467
7aea43ff 9468#: builtin/rm.c:243 builtin/rm.c:254
c04f5ac3 9469msgid ""
2e8451e8 9470"\n"
c04f5ac3
JX
9471"(use --cached to keep the file, or -f to force removal)"
9472msgstr ""
2e8451e8
JX
9473"\n"
9474"(使用 --cached 保留本地文件,或用 -f 强制删除)"
9475
7aea43ff 9476#: builtin/rm.c:251
2e8451e8
JX
9477msgid "the following file has local modifications:"
9478msgid_plural "the following files have local modifications:"
9479msgstr[0] "如下文件有本地修改:"
9480msgstr[1] "如下文件有本地修改:"
c04f5ac3 9481
7aea43ff 9482#: builtin/rm.c:269
ef317cd5 9483msgid "do not list removed files"
07432cef 9484msgstr "不列出删除的文件"
ef317cd5 9485
7aea43ff 9486#: builtin/rm.c:270
ef317cd5 9487msgid "only remove from the index"
07432cef 9488msgstr "只从索引区删除"
ef317cd5 9489
7aea43ff 9490#: builtin/rm.c:271
ef317cd5 9491msgid "override the up-to-date check"
07432cef 9492msgstr "忽略文件更新状态检查"
ef317cd5 9493
7aea43ff 9494#: builtin/rm.c:272
ef317cd5 9495msgid "allow recursive removal"
07432cef 9496msgstr "允许递归删除"
ef317cd5 9497
7aea43ff 9498#: builtin/rm.c:274
ef317cd5 9499msgid "exit with a zero status even if nothing matched"
07432cef 9500msgstr "即使没有匹配,也以零状态退出"
ef317cd5 9501
7aea43ff 9502#: builtin/rm.c:317
220c313c
JX
9503msgid "Please, stage your changes to .gitmodules or stash them to proceed"
9504msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
9505
7aea43ff 9506#: builtin/rm.c:335
c04f5ac3
JX
9507#, c-format
9508msgid "not removing '%s' recursively without -r"
9509msgstr "未提供 -r 选项不会递归删除 '%s'"
9510
7aea43ff 9511#: builtin/rm.c:374
c04f5ac3
JX
9512#, c-format
9513msgid "git rm: unable to remove %s"
9514msgstr "git rm:不能删除 %s"
9515
ef317cd5 9516#: builtin/shortlog.c:13
814ff314 9517msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
4dcdc3d8 9518msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
ef317cd5 9519
4dcdc3d8 9520#: builtin/shortlog.c:131
c04f5ac3
JX
9521#, c-format
9522msgid "Missing author: %s"
9523msgstr "缺少作者:%s"
9524
90314792 9525#: builtin/shortlog.c:230
ef317cd5 9526msgid "sort output according to the number of commits per author"
07432cef 9527msgstr "根据每个作者的提交数量排序"
ef317cd5 9528
90314792 9529#: builtin/shortlog.c:232
ef317cd5 9530msgid "Suppress commit descriptions, only provides commit count"
07432cef 9531msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 9532
90314792 9533#: builtin/shortlog.c:234
ef317cd5 9534msgid "Show the email address of each author"
07432cef 9535msgstr "显示每个作者的电子邮件地址"
ef317cd5 9536
90314792 9537#: builtin/shortlog.c:235
ef317cd5 9538msgid "w[,i1[,i2]]"
07432cef 9539msgstr "w[,i1[,i2]]"
ef317cd5 9540
90314792 9541#: builtin/shortlog.c:236
ef317cd5 9542msgid "Linewrap output"
07432cef 9543msgstr "折行输出"
ef317cd5
JX
9544
9545#: builtin/show-branch.c:9
9546msgid ""
814ff314 9547"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
9548"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9549"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9550"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
ef317cd5 9551msgstr ""
814ff314 9552"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
1e607449
JX
9553"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
9554"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9555"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
ef317cd5 9556
d9d56b23 9557#: builtin/show-branch.c:13
814ff314
JX
9558msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
9559msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
ef317cd5 9560
7aea43ff 9561#: builtin/show-branch.c:659
ef317cd5 9562msgid "show remote-tracking and local branches"
07432cef 9563msgstr "显示远程跟踪的和本地的分支"
ef317cd5 9564
7aea43ff 9565#: builtin/show-branch.c:661
ef317cd5 9566msgid "show remote-tracking branches"
07432cef 9567msgstr "显示远程跟踪的分支"
ef317cd5 9568
7aea43ff 9569#: builtin/show-branch.c:663
ef317cd5 9570msgid "color '*!+-' corresponding to the branch"
07432cef 9571msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 9572
7aea43ff 9573#: builtin/show-branch.c:665
ef317cd5 9574msgid "show <n> more commits after the common ancestor"
07432cef 9575msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 9576
7aea43ff 9577#: builtin/show-branch.c:667
ef317cd5 9578msgid "synonym to more=-1"
07432cef 9579msgstr "和 more=-1 同义"
ef317cd5 9580
7aea43ff 9581#: builtin/show-branch.c:668
ef317cd5 9582msgid "suppress naming strings"
07432cef 9583msgstr "不显示字符串命名"
ef317cd5 9584
7aea43ff 9585#: builtin/show-branch.c:670
ef317cd5 9586msgid "include the current branch"
07432cef 9587msgstr "包括当前分支"
ef317cd5 9588
7aea43ff 9589#: builtin/show-branch.c:672
ef317cd5 9590msgid "name commits with their object names"
07432cef 9591msgstr "以对象名字命名提交"
ef317cd5 9592
7aea43ff 9593#: builtin/show-branch.c:674
ef317cd5 9594msgid "show possible merge bases"
07432cef 9595msgstr "显示可能合并的基线"
ef317cd5 9596
7aea43ff 9597#: builtin/show-branch.c:676
ef317cd5 9598msgid "show refs unreachable from any other ref"
07432cef 9599msgstr "显示没有任何引用的的引用"
ef317cd5 9600
7aea43ff 9601#: builtin/show-branch.c:678
ef317cd5 9602msgid "show commits in topological order"
07432cef 9603msgstr "以拓扑顺序显示提交"
ef317cd5 9604
7aea43ff 9605#: builtin/show-branch.c:681
ef317cd5 9606msgid "show only commits not on the first branch"
07432cef 9607msgstr "只显示不在第一个分支上的提交"
ef317cd5 9608
7aea43ff 9609#: builtin/show-branch.c:683
ef317cd5 9610msgid "show merges reachable from only one tip"
07432cef 9611msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 9612
7aea43ff 9613#: builtin/show-branch.c:685
2e8451e8
JX
9614msgid "topologically sort, maintaining date order where possible"
9615msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 9616
7aea43ff 9617#: builtin/show-branch.c:688
ef317cd5 9618msgid "<n>[,<base>]"
07432cef 9619msgstr "<n>[,<base>]"
ef317cd5 9620
7aea43ff 9621#: builtin/show-branch.c:689
ef317cd5 9622msgid "show <n> most recent ref-log entries starting at base"
07432cef 9623msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
ef317cd5
JX
9624
9625#: builtin/show-ref.c:10
9626msgid ""
814ff314
JX
9627"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9628"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
ef317cd5 9629msgstr ""
814ff314
JX
9630"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9631"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
ef317cd5
JX
9632
9633#: builtin/show-ref.c:11
9634msgid "git show-ref --exclude-existing[=pattern] < ref-list"
07432cef 9635msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
ef317cd5 9636
7aea43ff 9637#: builtin/show-ref.c:170
ef317cd5 9638msgid "only show tags (can be combined with heads)"
07432cef 9639msgstr "只显示 tags(可以和头共用)"
ef317cd5 9640
7aea43ff 9641#: builtin/show-ref.c:171
ef317cd5 9642msgid "only show heads (can be combined with tags)"
07432cef 9643msgstr "只显示头(可以和 tags 共用)"
ef317cd5 9644
7aea43ff 9645#: builtin/show-ref.c:172
ef317cd5 9646msgid "stricter reference checking, requires exact ref path"
07432cef 9647msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 9648
7aea43ff 9649#: builtin/show-ref.c:175 builtin/show-ref.c:177
2e8451e8
JX
9650msgid "show the HEAD reference, even if it would be filtered out"
9651msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 9652
7aea43ff 9653#: builtin/show-ref.c:179
ef317cd5 9654msgid "dereference tags into object IDs"
07432cef 9655msgstr "转换 tags 到对象ID"
ef317cd5 9656
7aea43ff 9657#: builtin/show-ref.c:181
ef317cd5 9658msgid "only show SHA1 hash using <n> digits"
07432cef 9659msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
ef317cd5 9660
7aea43ff 9661#: builtin/show-ref.c:185
ef317cd5 9662msgid "do not print results to stdout (useful with --verify)"
07432cef 9663msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
ef317cd5 9664
7aea43ff 9665#: builtin/show-ref.c:187
ef317cd5 9666msgid "show refs from stdin that aren't in local repository"
07432cef 9667msgstr "显示从标准输入中读入的不在本地版本库中的引用"
ef317cd5
JX
9668
9669#: builtin/symbolic-ref.c:7
814ff314
JX
9670msgid "git symbolic-ref [<options>] <name> [<ref>]"
9671msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
07432cef
WS
9672
9673#: builtin/symbolic-ref.c:8
814ff314
JX
9674msgid "git symbolic-ref -d [-q] <name>"
9675msgstr "git symbolic-ref -d [-q] <名称>"
ef317cd5 9676
07432cef 9677#: builtin/symbolic-ref.c:40
ef317cd5 9678msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
9679msgstr "不显示非符号(分离的)引用的错误信息"
9680
9681#: builtin/symbolic-ref.c:41
9682msgid "delete symbolic ref"
9683msgstr "删除符号引用"
ef317cd5 9684
07432cef 9685#: builtin/symbolic-ref.c:42
ef317cd5 9686msgid "shorten ref output"
07432cef 9687msgstr "简短的引用输出"
ef317cd5 9688
04cb2f28 9689#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
ef317cd5 9690msgid "reason"
07432cef 9691msgstr "原因"
ef317cd5 9692
04cb2f28 9693#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
ef317cd5 9694msgid "reason of the update"
07432cef 9695msgstr "更新的原因"
ef317cd5
JX
9696
9697#: builtin/tag.c:22
9698msgid ""
814ff314
JX
9699"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
9700"[<head>]"
9701msgstr ""
9702"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
ef317cd5
JX
9703
9704#: builtin/tag.c:23
9705msgid "git tag -d <tagname>..."
07432cef 9706msgstr "git tag -d <标签名>..."
ef317cd5
JX
9707
9708#: builtin/tag.c:24
9709msgid ""
814ff314 9710"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
ef317cd5
JX
9711"\t\t[<pattern>...]"
9712msgstr ""
814ff314 9713"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] [<模式>...]"
ef317cd5
JX
9714
9715#: builtin/tag.c:26
9716msgid "git tag -v <tagname>..."
07432cef 9717msgstr "git tag -v <标签名>..."
ef317cd5 9718
6acbf033 9719#: builtin/tag.c:69
7ac1c0ad
JX
9720#, c-format
9721msgid "malformed object at '%s'"
9722msgstr "非法的对象于 '%s'"
9723
6acbf033 9724#: builtin/tag.c:301
c04f5ac3
JX
9725#, c-format
9726msgid "tag name too long: %.*s..."
9727msgstr "tag 名字太长:%.*s..."
9728
6acbf033 9729#: builtin/tag.c:306
c04f5ac3
JX
9730#, c-format
9731msgid "tag '%s' not found."
9732msgstr "tag '%s' 未发现。"
9733
6acbf033 9734#: builtin/tag.c:321
c04f5ac3
JX
9735#, c-format
9736msgid "Deleted tag '%s' (was %s)\n"
9737msgstr "已删除 tag '%s'(曾为 %s)\n"
9738
6acbf033 9739#: builtin/tag.c:333
c04f5ac3
JX
9740#, c-format
9741msgid "could not verify the tag '%s'"
9742msgstr "不能校验 tag '%s'"
9743
6acbf033 9744#: builtin/tag.c:343
a77c07d9 9745#, c-format
c04f5ac3
JX
9746msgid ""
9747"\n"
6acbf033
JX
9748"Write a message for tag:\n"
9749" %s\n"
a77c07d9 9750"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
9751msgstr ""
9752"\n"
6acbf033
JX
9753"输入一个 tag 说明:\n"
9754" %s\n"
a77c07d9 9755"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 9756
6acbf033 9757#: builtin/tag.c:347
a77c07d9 9758#, c-format
c04f5ac3
JX
9759msgid ""
9760"\n"
6acbf033
JX
9761"Write a message for tag:\n"
9762" %s\n"
a77c07d9 9763"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 9764"want to.\n"
c04f5ac3
JX
9765msgstr ""
9766"\n"
6acbf033
JX
9767"输入一个 tag 说明:\n"
9768" %s\n"
a77c07d9 9769"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 9770
6acbf033
JX
9771#: builtin/tag.c:371
9772#, c-format
9773msgid "unsupported sort specification '%s'"
9774msgstr "不支持的排序规格 '%s'"
9775
9776#: builtin/tag.c:373
9777#, c-format
9778msgid "unsupported sort specification '%s' in variable '%s'"
9779msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
9780
9781#: builtin/tag.c:428
c04f5ac3
JX
9782msgid "unable to sign the tag"
9783msgstr "无法签署 tag"
9784
6acbf033 9785#: builtin/tag.c:430
c04f5ac3
JX
9786msgid "unable to write tag file"
9787msgstr "无法写 tag 文件"
9788
6acbf033 9789#: builtin/tag.c:455
c04f5ac3 9790msgid "bad object type."
90e6ef53 9791msgstr "坏的对象类型。"
c04f5ac3 9792
6acbf033 9793#: builtin/tag.c:468
c04f5ac3 9794msgid "tag header too big."
90e6ef53 9795msgstr "tag 头信息太大。"
c04f5ac3 9796
6acbf033 9797#: builtin/tag.c:504
c04f5ac3
JX
9798msgid "no tag message?"
9799msgstr "无 tag 说明?"
9800
6acbf033 9801#: builtin/tag.c:510
c04f5ac3
JX
9802#, c-format
9803msgid "The tag message has been left in %s\n"
9804msgstr "tag 说明被保留在 %s\n"
9805
6acbf033 9806#: builtin/tag.c:559
7ac1c0ad
JX
9807msgid "switch 'points-at' requires an object"
9808msgstr "开关 'points-at' 需要一个对象"
9809
6acbf033 9810#: builtin/tag.c:561
7ac1c0ad
JX
9811#, c-format
9812msgid "malformed object name '%s'"
9813msgstr "非法的对象名 '%s'"
9814
220c313c 9815#: builtin/tag.c:589
ef317cd5 9816msgid "list tag names"
07432cef 9817msgstr "列出tag名称"
ef317cd5 9818
220c313c 9819#: builtin/tag.c:591
ef317cd5 9820msgid "print <n> lines of each tag message"
07432cef 9821msgstr "每个 tag 信息打印 <n> 行"
ef317cd5 9822
220c313c 9823#: builtin/tag.c:593
ef317cd5 9824msgid "delete tags"
07432cef 9825msgstr "删除 tags"
ef317cd5 9826
220c313c 9827#: builtin/tag.c:594
ef317cd5 9828msgid "verify tags"
07432cef 9829msgstr "验证 tags"
ef317cd5 9830
220c313c 9831#: builtin/tag.c:596
ef317cd5 9832msgid "Tag creation options"
07432cef 9833msgstr "Tag 创建选项"
ef317cd5 9834
220c313c 9835#: builtin/tag.c:598
ef317cd5 9836msgid "annotated tag, needs a message"
07432cef 9837msgstr "注解 tag,需要一个说明"
ef317cd5 9838
220c313c 9839#: builtin/tag.c:600
ef317cd5 9840msgid "tag message"
07432cef 9841msgstr "tag 说明"
ef317cd5 9842
220c313c 9843#: builtin/tag.c:602
ef317cd5 9844msgid "annotated and GPG-signed tag"
07432cef 9845msgstr "注解并 GPG 签名的 tag"
ef317cd5 9846
220c313c 9847#: builtin/tag.c:606
ef317cd5 9848msgid "use another key to sign the tag"
07432cef 9849msgstr "使用另外的私钥签名 tag"
ef317cd5 9850
220c313c 9851#: builtin/tag.c:607
ef317cd5 9852msgid "replace the tag if exists"
07432cef 9853msgstr "如果存在,替换现有的 tag"
ef317cd5 9854
814ff314
JX
9855#: builtin/tag.c:609
9856msgid "Tag listing options"
9857msgstr "Tag 列表选项"
9858
9859#: builtin/tag.c:610
ef317cd5 9860msgid "show tag list in columns"
07432cef 9861msgstr "以列的方式显示 tag"
ef317cd5 9862
814ff314 9863#: builtin/tag.c:612
6c94aba5
JX
9864msgid "sort tags"
9865msgstr "排序 tags"
9866
220c313c 9867#: builtin/tag.c:617 builtin/tag.c:623
ef317cd5 9868msgid "print only tags that contain the commit"
07432cef 9869msgstr "只打印包含提交的tags"
ef317cd5 9870
220c313c 9871#: builtin/tag.c:629
ef317cd5 9872msgid "print only tags of the object"
07432cef 9873msgstr "只打印tags对象"
ef317cd5 9874
220c313c 9875#: builtin/tag.c:655
8ada9598 9876msgid "--column and -n are incompatible"
81809b99 9877msgstr "--column 和 -n 不兼容"
8ada9598 9878
220c313c 9879#: builtin/tag.c:667
6c94aba5
JX
9880msgid "--sort and -n are incompatible"
9881msgstr "--sort 和 -n 不兼容"
9882
220c313c 9883#: builtin/tag.c:674
c04f5ac3 9884msgid "-n option is only allowed with -l."
649900bc 9885msgstr "-n 选项只允许和 -l 同时使用。"
c04f5ac3 9886
220c313c 9887#: builtin/tag.c:676
c04f5ac3 9888msgid "--contains option is only allowed with -l."
649900bc 9889msgstr "--contains 选项只允许和 -l 同时使用。"
c04f5ac3 9890
220c313c 9891#: builtin/tag.c:678
7ac1c0ad 9892msgid "--points-at option is only allowed with -l."
649900bc 9893msgstr "--points-at 选项只允许和 -l 同时使用。"
7ac1c0ad 9894
220c313c 9895#: builtin/tag.c:686
c04f5ac3
JX
9896msgid "only one -F or -m option is allowed."
9897msgstr "只允许一个 -F 或 -m 选项。"
9898
220c313c 9899#: builtin/tag.c:706
c04f5ac3
JX
9900msgid "too many params"
9901msgstr "太多参数"
9902
220c313c 9903#: builtin/tag.c:712
c04f5ac3
JX
9904#, c-format
9905msgid "'%s' is not a valid tag name."
90e6ef53 9906msgstr "'%s' 不是一个有效的tag名称。"
c04f5ac3 9907
220c313c 9908#: builtin/tag.c:717
c04f5ac3
JX
9909#, c-format
9910msgid "tag '%s' already exists"
9911msgstr "tag '%s' 已存在"
9912
220c313c 9913#: builtin/tag.c:741
c04f5ac3
JX
9914#, c-format
9915msgid "Updated tag '%s' (was %s)\n"
9916msgstr "已更新tag '%s'(曾为 %s)\n"
9917
220c313c 9918#: builtin/unpack-objects.c:489
6c94aba5
JX
9919msgid "Unpacking objects"
9920msgstr "展开对象中"
9921
7aea43ff
JX
9922#: builtin/update-index.c:70
9923#, c-format
9924msgid "failed to create directory %s"
9925msgstr "无法创建目录 %s"
9926
9927#: builtin/update-index.c:76
9928#, c-format
9929msgid "failed to stat %s"
9930msgstr "无法枚举 %s 状态"
9931
9932#: builtin/update-index.c:86
9933#, c-format
9934msgid "failed to create file %s"
9935msgstr "无法创建文件 %s"
9936
9937#: builtin/update-index.c:94
9938#, c-format
9939msgid "failed to delete file %s"
9940msgstr "无法删除文件 %s"
9941
9942#: builtin/update-index.c:101 builtin/update-index.c:203
9943#, c-format
9944msgid "failed to delete directory %s"
9945msgstr "无法删除目录 %s"
9946
9947#: builtin/update-index.c:124
9948#, c-format
9949msgid "Testing "
9950msgstr "正在测试 "
9951
9952#: builtin/update-index.c:136
9953msgid "directory stat info does not change after adding a new file"
9954msgstr "添加一个新文件后,目录的状态信息未改变"
9955
9956#: builtin/update-index.c:149
9957msgid "directory stat info does not change after adding a new directory"
9958msgstr "添加一个新目录后,目录的状态信息未改变"
9959
9960#: builtin/update-index.c:162
9961msgid "directory stat info changes after updating a file"
9962msgstr "更新一个文件后,目录的状态信息被修改"
9963
9964#: builtin/update-index.c:173
9965msgid "directory stat info changes after adding a file inside subdirectory"
9966msgstr "在子目录中添加文件后,目录的状态信息被修改"
9967
9968#: builtin/update-index.c:184
9969msgid "directory stat info does not change after deleting a file"
9970msgstr "删除一个文件后,目录的状态信息未改变"
9971
9972#: builtin/update-index.c:197
9973msgid "directory stat info does not change after deleting a directory"
9974msgstr "删除一个目录后,目录的状态信息未改变"
9975
9976#: builtin/update-index.c:204
9977msgid " OK"
9978msgstr " OK"
9979
9980#: builtin/update-index.c:564
814ff314
JX
9981msgid "git update-index [<options>] [--] [<file>...]"
9982msgstr "git update-index [<选项>] [--] [<文件>...]"
8ada9598 9983
7aea43ff 9984#: builtin/update-index.c:918
ef317cd5 9985msgid "continue refresh even when index needs update"
07432cef 9986msgstr "当索引需要更新时继续刷新"
8ada9598 9987
7aea43ff 9988#: builtin/update-index.c:921
ef317cd5 9989msgid "refresh: ignore submodules"
07432cef 9990msgstr "刷新:忽略子模组"
8ada9598 9991
7aea43ff 9992#: builtin/update-index.c:924
ef317cd5 9993msgid "do not ignore new files"
07432cef 9994msgstr "不忽略新的文件"
8ada9598 9995
7aea43ff 9996#: builtin/update-index.c:926
ef317cd5 9997msgid "let files replace directories and vice-versa"
07432cef 9998msgstr "让文件替换目录(反之亦然)"
ef317cd5 9999
7aea43ff 10000#: builtin/update-index.c:928
ef317cd5 10001msgid "notice files missing from worktree"
07432cef 10002msgstr "通知文件从工作区丢失"
ef317cd5 10003
7aea43ff 10004#: builtin/update-index.c:930
ef317cd5 10005msgid "refresh even if index contains unmerged entries"
07432cef 10006msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 10007
7aea43ff 10008#: builtin/update-index.c:933
ef317cd5 10009msgid "refresh stat information"
07432cef 10010msgstr "刷新统计信息"
ef317cd5 10011
7aea43ff 10012#: builtin/update-index.c:937
ef317cd5 10013msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 10014msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 10015
7aea43ff 10016#: builtin/update-index.c:941
6c94aba5 10017msgid "<mode>,<object>,<path>"
d9d56b23 10018msgstr "<存取模式>,<对象>,<路径>"
ef317cd5 10019
7aea43ff 10020#: builtin/update-index.c:942
ef317cd5 10021msgid "add the specified entry to the index"
07432cef 10022msgstr "添加指定的条目到索引区"
ef317cd5 10023
7aea43ff 10024#: builtin/update-index.c:946
ef317cd5 10025msgid "(+/-)x"
07432cef 10026msgstr "(+/-)x"
ef317cd5 10027
7aea43ff 10028#: builtin/update-index.c:947
ef317cd5 10029msgid "override the executable bit of the listed files"
07432cef 10030msgstr "覆盖列表里文件的可执行位"
ef317cd5 10031
7aea43ff 10032#: builtin/update-index.c:951
ef317cd5 10033msgid "mark files as \"not changing\""
07432cef 10034msgstr "把文件标记为 \"没有变更\""
ef317cd5 10035
7aea43ff 10036#: builtin/update-index.c:954
ef317cd5 10037msgid "clear assumed-unchanged bit"
07432cef 10038msgstr "清除 assumed-unchanged 位"
ef317cd5 10039
7aea43ff 10040#: builtin/update-index.c:957
ef317cd5 10041msgid "mark files as \"index-only\""
07432cef 10042msgstr "把文件标记为 \"仅索引\""
ef317cd5 10043
7aea43ff 10044#: builtin/update-index.c:960
ef317cd5 10045msgid "clear skip-worktree bit"
07432cef 10046msgstr "清除 skip-worktree 位"
ef317cd5 10047
7aea43ff 10048#: builtin/update-index.c:963
ef317cd5 10049msgid "add to index only; do not add content to object database"
07432cef 10050msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 10051
7aea43ff 10052#: builtin/update-index.c:965
ef317cd5 10053msgid "remove named paths even if present in worktree"
07432cef 10054msgstr "即使存在工作区里,也删除路径"
ef317cd5 10055
7aea43ff 10056#: builtin/update-index.c:967
ef317cd5 10057msgid "with --stdin: input lines are terminated by null bytes"
07432cef 10058msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 10059
7aea43ff 10060#: builtin/update-index.c:969
ef317cd5 10061msgid "read list of paths to be updated from standard input"
07432cef 10062msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 10063
7aea43ff 10064#: builtin/update-index.c:973
ef317cd5 10065msgid "add entries from standard input to the index"
07432cef 10066msgstr "从标准输入添加条目到索引区"
ef317cd5 10067
7aea43ff 10068#: builtin/update-index.c:977
ef317cd5 10069msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 10070msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 10071
7aea43ff 10072#: builtin/update-index.c:981
ef317cd5 10073msgid "only update entries that differ from HEAD"
07432cef 10074msgstr "只更新与 HEAD 不同的条目"
ef317cd5 10075
7aea43ff 10076#: builtin/update-index.c:985
ef317cd5 10077msgid "ignore files missing from worktree"
07432cef 10078msgstr "忽略工作区丢失的文件"
ef317cd5 10079
7aea43ff 10080#: builtin/update-index.c:988
ef317cd5 10081msgid "report actions to standard output"
07432cef 10082msgstr "在标准输出显示操作"
ef317cd5 10083
7aea43ff 10084#: builtin/update-index.c:990
ef317cd5 10085msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 10086msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 10087
7aea43ff 10088#: builtin/update-index.c:994
ef317cd5 10089msgid "write index in this format"
07432cef 10090msgstr "以这种格式写入索引区"
ef317cd5 10091
7aea43ff 10092#: builtin/update-index.c:996
6acbf033
JX
10093msgid "enable or disable split index"
10094msgstr "启用或禁用索引拆分"
10095
7aea43ff
JX
10096#: builtin/update-index.c:998
10097msgid "enable/disable untracked cache"
10098msgstr "启用/禁用对未跟踪文件的缓存"
10099
10100#: builtin/update-index.c:1000
10101msgid "enable untracked cache without testing the filesystem"
10102msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
10103
90314792 10104#: builtin/update-ref.c:9
814ff314
JX
10105msgid "git update-ref [<options>] -d <refname> [<old-val>]"
10106msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
ef317cd5 10107
90314792 10108#: builtin/update-ref.c:10
814ff314
JX
10109msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
10110msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
90314792
JX
10111
10112#: builtin/update-ref.c:11
814ff314
JX
10113msgid "git update-ref [<options>] --stdin [-z]"
10114msgstr "git update-ref [<选项>] --stdin [-z]"
ef317cd5 10115
04cb2f28 10116#: builtin/update-ref.c:359
ef317cd5 10117msgid "delete the reference"
07432cef 10118msgstr "删除引用"
ef317cd5 10119
04cb2f28 10120#: builtin/update-ref.c:361
ef317cd5 10121msgid "update <refname> not the one it points to"
07432cef 10122msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 10123
04cb2f28 10124#: builtin/update-ref.c:362
90314792
JX
10125msgid "stdin has NUL-terminated arguments"
10126msgstr "标准输入有以 NUL 字符终止的参数"
10127
04cb2f28 10128#: builtin/update-ref.c:363
90314792
JX
10129msgid "read updates from stdin"
10130msgstr "从标准输入读取更新"
10131
ef317cd5
JX
10132#: builtin/update-server-info.c:6
10133msgid "git update-server-info [--force]"
07432cef 10134msgstr "git update-server-info [--force]"
ef317cd5
JX
10135
10136#: builtin/update-server-info.c:14
10137msgid "update the info files from scratch"
07432cef 10138msgstr "从头开始更新文件信息"
ef317cd5 10139
6acbf033 10140#: builtin/verify-commit.c:17
814ff314
JX
10141msgid "git verify-commit [-v | --verbose] <commit>..."
10142msgstr "git verify-commit [-v | --verbose] <提交>..."
6acbf033
JX
10143
10144#: builtin/verify-commit.c:75
10145msgid "print commit contents"
10146msgstr "打印提交内容"
10147
220c313c 10148#: builtin/verify-pack.c:54
814ff314
JX
10149msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
10150msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
ef317cd5 10151
220c313c 10152#: builtin/verify-pack.c:64
ef317cd5
JX
10153msgid "verbose"
10154msgstr "冗长输出"
10155
220c313c 10156#: builtin/verify-pack.c:66
ef317cd5 10157msgid "show statistics only"
07432cef 10158msgstr "只显示统计"
ef317cd5
JX
10159
10160#: builtin/verify-tag.c:17
814ff314
JX
10161msgid "git verify-tag [-v | --verbose] <tag>..."
10162msgstr "git verify-tag [-v | --verbose] <标签>..."
ef317cd5
JX
10163
10164#: builtin/verify-tag.c:73
10165msgid "print tag contents"
07432cef 10166msgstr "打印 tag 内容"
ef317cd5
JX
10167
10168#: builtin/write-tree.c:13
10169msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 10170msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5
JX
10171
10172#: builtin/write-tree.c:26
10173msgid "<prefix>/"
07432cef 10174msgstr "<前缀>/"
ef317cd5
JX
10175
10176#: builtin/write-tree.c:27
10177msgid "write tree object for a subdirectory <prefix>"
07432cef 10178msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5
JX
10179
10180#: builtin/write-tree.c:30
10181msgid "only useful for debugging"
07432cef 10182msgstr "只对调试有用"
ef317cd5 10183
220c313c
JX
10184#: credential-cache--daemon.c:267
10185msgid "print debugging messages to stderr"
10186msgstr "调试信息输出到标准错误"
10187
d9d56b23 10188#: git.c:14
4dcdc3d8 10189msgid ""
220c313c 10190"'git help -a' and 'git help -g' list available subcommands and some\n"
4dcdc3d8
JX
10191"concept guides. See 'git help <command>' or 'git help <concept>'\n"
10192"to read about a specific subcommand or concept."
10193msgstr ""
220c313c
JX
10194"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
10195"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
10196"帮助。"
8ada9598 10197
7aea43ff
JX
10198#: common-cmds.h:10
10199msgid "start a working area (see also: git help tutorial)"
10200msgstr "开始一个工作区(参见:git help tutorial)"
10201
10202#: common-cmds.h:11
10203msgid "work on the current change (see also: git help everyday)"
10204msgstr "在当前变更上工作(参见:git help everyday)"
10205
10206#: common-cmds.h:12
10207msgid "examine the history and state (see also: git help revisions)"
10208msgstr "检查历史和状态(参见:git help revisions)"
10209
10210#: common-cmds.h:13
10211msgid "grow, mark and tweak your common history"
10212msgstr "扩展、标记和调校您的历史记录"
10213
10214#: common-cmds.h:14
10215msgid "collaborate (see also: git help workflows)"
10216msgstr "协同(参见:git help workflows)"
10217
10218#: common-cmds.h:18
8ada9598 10219msgid "Add file contents to the index"
81809b99 10220msgstr "添加文件内容至索引"
8ada9598 10221
7aea43ff 10222#: common-cmds.h:19
8ada9598 10223msgid "Find by binary search the change that introduced a bug"
81809b99 10224msgstr "通过二分查找定位引入 bug 的变更"
8ada9598 10225
7aea43ff 10226#: common-cmds.h:20
8ada9598 10227msgid "List, create, or delete branches"
81809b99 10228msgstr "列出、创建或删除分支"
8ada9598 10229
7aea43ff 10230#: common-cmds.h:21
8ada9598 10231msgid "Checkout a branch or paths to the working tree"
81809b99 10232msgstr "检出一个分支或路径到工作区"
8ada9598 10233
7aea43ff 10234#: common-cmds.h:22
8ada9598 10235msgid "Clone a repository into a new directory"
81809b99 10236msgstr "克隆一个版本库到一个新目录"
8ada9598 10237
7aea43ff 10238#: common-cmds.h:23
8ada9598 10239msgid "Record changes to the repository"
81809b99 10240msgstr "记录变更到版本库"
8ada9598 10241
7aea43ff 10242#: common-cmds.h:24
8ada9598 10243msgid "Show changes between commits, commit and working tree, etc"
81809b99 10244msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598 10245
7aea43ff 10246#: common-cmds.h:25
8ada9598 10247msgid "Download objects and refs from another repository"
81809b99 10248msgstr "从另外一个版本库下载对象和引用"
8ada9598 10249
7aea43ff 10250#: common-cmds.h:26
8ada9598 10251msgid "Print lines matching a pattern"
81809b99 10252msgstr "输出和模式匹配的行"
8ada9598 10253
7aea43ff 10254#: common-cmds.h:27
a77c07d9
JX
10255msgid "Create an empty Git repository or reinitialize an existing one"
10256msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
8ada9598 10257
7aea43ff 10258#: common-cmds.h:28
8ada9598 10259msgid "Show commit logs"
81809b99 10260msgstr "显示提交日志"
8ada9598 10261
7aea43ff 10262#: common-cmds.h:29
8ada9598 10263msgid "Join two or more development histories together"
81809b99 10264msgstr "合并两个或更多开发历史"
8ada9598 10265
7aea43ff 10266#: common-cmds.h:30
8ada9598 10267msgid "Move or rename a file, a directory, or a symlink"
81809b99 10268msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598 10269
7aea43ff 10270#: common-cmds.h:31
2e8451e8
JX
10271msgid "Fetch from and integrate with another repository or a local branch"
10272msgstr "获取并整合另外的版本库或一个本地分支"
8ada9598 10273
7aea43ff 10274#: common-cmds.h:32
8ada9598 10275msgid "Update remote refs along with associated objects"
81809b99 10276msgstr "更新远程引用和相关的对象"
8ada9598 10277
7aea43ff 10278#: common-cmds.h:33
8ada9598 10279msgid "Forward-port local commits to the updated upstream head"
81809b99 10280msgstr "本地提交转移至更新后的上游分支中"
8ada9598 10281
7aea43ff 10282#: common-cmds.h:34
8ada9598 10283msgid "Reset current HEAD to the specified state"
81809b99 10284msgstr "重置当前HEAD到指定状态"
8ada9598 10285
7aea43ff 10286#: common-cmds.h:35
8ada9598 10287msgid "Remove files from the working tree and from the index"
81809b99 10288msgstr "从工作区和索引中删除文件"
8ada9598 10289
7aea43ff 10290#: common-cmds.h:36
8ada9598 10291msgid "Show various types of objects"
81809b99 10292msgstr "显示各种类型的对象"
8ada9598 10293
7aea43ff 10294#: common-cmds.h:37
8ada9598 10295msgid "Show the working tree status"
81809b99 10296msgstr "显示工作区状态"
8ada9598 10297
7aea43ff 10298#: common-cmds.h:38
8ada9598 10299msgid "Create, list, delete or verify a tag object signed with GPG"
81809b99 10300msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
8ada9598 10301
7aea43ff 10302#: parse-options.h:142
220c313c
JX
10303msgid "expiry-date"
10304msgstr "到期时间"
10305
7aea43ff 10306#: parse-options.h:157
220c313c
JX
10307msgid "no-op (backward compatibility)"
10308msgstr "空操作(向后兼容)"
10309
7aea43ff 10310#: parse-options.h:231
220c313c
JX
10311msgid "be more verbose"
10312msgstr "更加详细"
10313
7aea43ff 10314#: parse-options.h:233
220c313c
JX
10315msgid "be more quiet"
10316msgstr "更加安静"
10317
7aea43ff 10318#: parse-options.h:239
220c313c
JX
10319msgid "use <n> digits to display SHA-1s"
10320msgstr "用 <n> 位数字显示 SHA-1 哈希值"
10321
10322#: rerere.h:27
10323msgid "update the index with reused conflict resolution if possible"
10324msgstr "如果可能,重用冲突解决更新索引"
10325
04cb2f28 10326#: git-am.sh:53
c04f5ac3
JX
10327msgid "You need to set your committer info first"
10328msgstr "您需要先设置你的提交者信息"
10329
7aea43ff 10330#: git-am.sh:100
b694fbb1
JX
10331msgid ""
10332"You seem to have moved HEAD since the last 'am' failure.\n"
10333"Not rewinding to ORIG_HEAD"
6792b93b 10334msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
b694fbb1 10335
7aea43ff 10336#: git-am.sh:110
b694fbb1
JX
10337#, sh-format
10338msgid ""
2e8451e8 10339"When you have resolved this problem, run \"$cmdline --continue\".\n"
649900bc
JX
10340"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
10341"To restore the original branch and stop patching, run \"$cmdline --abort\"."
b694fbb1 10342msgstr ""
2e8451e8 10343"当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
b694fbb1
JX
10344"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
10345"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10346
7aea43ff 10347#: git-am.sh:126
b694fbb1
JX
10348msgid "Cannot fall back to three-way merge."
10349msgstr "无法求助于三路合并。"
10350
7aea43ff 10351#: git-am.sh:142
c04f5ac3 10352msgid "Repository lacks necessary blobs to fall back on 3-way merge."
07432cef 10353msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
649900bc 10354
7aea43ff 10355#: git-am.sh:144
649900bc 10356msgid "Using index info to reconstruct a base tree..."
63af42fe 10357msgstr "使用索引来重建一个(三路合并的)基础目录树..."
c04f5ac3 10358
7aea43ff 10359#: git-am.sh:159
c04f5ac3
JX
10360msgid ""
10361"Did you hand edit your patch?\n"
10362"It does not apply to blobs recorded in its index."
10363msgstr ""
10364"您是否曾手动编辑过您的补丁?\n"
07432cef 10365"无法应用补丁到索引中的数据(blob)对象上。"
c04f5ac3 10366
7aea43ff 10367#: git-am.sh:168
c04f5ac3 10368msgid "Falling back to patching base and 3-way merge..."
b694fbb1 10369msgstr "转而在基础版本上打补丁及进行三路合并..."
c04f5ac3 10370
7aea43ff 10371#: git-am.sh:185
649900bc
JX
10372msgid "Failed to merge in the changes."
10373msgstr "无法合并变更。"
10374
7aea43ff 10375#: git-am.sh:280
c04f5ac3
JX
10376msgid "Only one StGIT patch series can be applied at once"
10377msgstr "一次只能有一个 StGIT 补丁队列被应用"
10378
7aea43ff 10379#: git-am.sh:367
c04f5ac3
JX
10380#, sh-format
10381msgid "Patch format $patch_format is not supported."
10382msgstr "不支持 $patch_format 补丁格式。"
10383
7aea43ff 10384#: git-am.sh:369
c04f5ac3
JX
10385msgid "Patch format detection failed."
10386msgstr "补丁格式检测失败。"
10387
7aea43ff 10388#: git-am.sh:407
649900bc
JX
10389msgid ""
10390"The -b/--binary option has been a no-op for long time, and\n"
10391"it will be removed. Please do not use it anymore."
10392msgstr ""
10393"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
10394"请不要再使用它了。"
c04f5ac3 10395
7aea43ff 10396#: git-am.sh:507
c04f5ac3
JX
10397#, sh-format
10398msgid "previous rebase directory $dotest still exists but mbox given."
2e8451e8 10399msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
c04f5ac3 10400
7aea43ff 10401#: git-am.sh:512
c04f5ac3
JX
10402msgid "Please make up your mind. --skip or --abort?"
10403msgstr "请下决心。--skip 或是 --abort ?"
10404
7aea43ff 10405#: git-am.sh:560
2e8451e8
JX
10406#, sh-format
10407msgid ""
10408"Stray $dotest directory found.\n"
10409"Use \"git am --abort\" to remove it."
10410msgstr ""
10411"发现了错误的 $dotest 目录。\n"
10412"使用 \"git am --abort\" 删除它。"
10413
7aea43ff 10414#: git-am.sh:568
c04f5ac3
JX
10415msgid "Resolve operation not in progress, we are not resuming."
10416msgstr "解决操作未进行,我们不会继续。"
10417
7aea43ff 10418#: git-am.sh:635
c04f5ac3
JX
10419#, sh-format
10420msgid "Dirty index: cannot apply patches (dirty: $files)"
90e6ef53 10421msgstr "脏的索引:不能应用补丁(脏文件:$files)"
c04f5ac3 10422
7aea43ff 10423#: git-am.sh:747
b694fbb1
JX
10424#, sh-format
10425msgid ""
10426"Patch is empty. Was it split wrong?\n"
10427"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
10428"To restore the original branch and stop patching run \"$cmdline --abort\"."
10429msgstr ""
10430"补丁为空。是不是切分错误?\n"
10431"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
10432"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10433
7aea43ff 10434#: git-am.sh:774
b694fbb1
JX
10435msgid "Patch does not have a valid e-mail address."
10436msgstr "补丁中没有一个有效的邮件地址。"
10437
7aea43ff 10438#: git-am.sh:821
c04f5ac3 10439msgid "cannot be interactive without stdin connected to a terminal."
90e6ef53 10440msgstr "标准输入没有和终端关联,不能进行交互式操作。"
c04f5ac3 10441
7aea43ff 10442#: git-am.sh:825
b694fbb1
JX
10443msgid "Commit Body is:"
10444msgstr "提交内容为:"
10445
90e6ef53 10446# 译者:注意保持句尾空格
c04f5ac3
JX
10447#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
10448#. in your translation. The program will only accept English
10449#. input at this point.
7aea43ff 10450#: git-am.sh:832
c04f5ac3
JX
10451msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10452msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10453
7aea43ff 10454#: git-am.sh:868
c04f5ac3
JX
10455#, sh-format
10456msgid "Applying: $FIRSTLINE"
10457msgstr "正应用:$FIRSTLINE"
10458
7aea43ff 10459#: git-am.sh:889
b694fbb1
JX
10460msgid ""
10461"No changes - did you forget to use 'git add'?\n"
10462"If there is nothing left to stage, chances are that something else\n"
10463"already introduced the same changes; you might want to skip this patch."
10464msgstr ""
10465"没有变更 —— 您是不是忘了执行 'git add'?\n"
10466"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
10467"您也许想要跳过这个补丁。"
10468
7aea43ff 10469#: git-am.sh:897
b694fbb1
JX
10470msgid ""
10471"You still have unmerged paths in your index\n"
10472"did you forget to use 'git add'?"
6792b93b 10473msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
b694fbb1 10474
7aea43ff 10475#: git-am.sh:913
c04f5ac3 10476msgid "No changes -- Patch already applied."
63af42fe 10477msgstr "没有变更 —— 补丁已经应用过。"
c04f5ac3 10478
7aea43ff 10479#: git-am.sh:923
b694fbb1
JX
10480#, sh-format
10481msgid "Patch failed at $msgnum $FIRSTLINE"
10482msgstr "补丁失败于 $msgnum $FIRSTLINE"
10483
7aea43ff 10484#: git-am.sh:926
ef317cd5
JX
10485#, sh-format
10486msgid ""
10487"The copy of the patch that failed is found in:\n"
10488" $dotest/patch"
10489msgstr ""
07432cef
WS
10490"失败的补丁文件副本位于:\n"
10491" $dotest/patch"
ef317cd5 10492
7aea43ff 10493#: git-am.sh:945
c04f5ac3
JX
10494msgid "applying to an empty history"
10495msgstr "正应用到一个空历史上"
10496
b694fbb1
JX
10497#: git-bisect.sh:48
10498msgid "You need to start by \"git bisect start\""
10499msgstr "您需要执行 \"git bisect start\" 来开始"
10500
90e6ef53 10501# 译者:注意保持句尾空格
c04f5ac3
JX
10502#. TRANSLATORS: Make sure to include [Y] and [n] in your
10503#. translation. The program will only accept English input
10504#. at this point.
10505#: git-bisect.sh:54
10506msgid "Do you want me to do it for you [Y/n]? "
10507msgstr "您想让我为您这样做么[Y/n]? "
10508
10509#: git-bisect.sh:95
10510#, sh-format
10511msgid "unrecognised option: '$arg'"
81809b99 10512msgstr "未能识别的选项:'$arg'"
c04f5ac3
JX
10513
10514#: git-bisect.sh:99
10515#, sh-format
10516msgid "'$arg' does not appear to be a valid revision"
10517msgstr "'$arg' 看起来不像是一个有效的版本"
10518
10519#: git-bisect.sh:117
10520msgid "Bad HEAD - I need a HEAD"
10521msgstr "坏的 HEAD - 我需要一个 HEAD"
10522
10523#: git-bisect.sh:130
10524#, sh-format
10525msgid ""
814ff314 10526"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
d9d56b23 10527msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
c04f5ac3
JX
10528
10529#: git-bisect.sh:140
cfff71a9
JX
10530msgid "won't bisect on cg-seek'ed tree"
10531msgstr "不会在做了 cg-seek 的树上做二分查找"
c04f5ac3
JX
10532
10533#: git-bisect.sh:144
10534msgid "Bad HEAD - strange symbolic ref"
90e6ef53 10535msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3
JX
10536
10537#: git-bisect.sh:189
10538#, sh-format
10539msgid "Bad bisect_write argument: $state"
90e6ef53 10540msgstr "坏的 bisect_write 参数:$state"
c04f5ac3
JX
10541
10542#: git-bisect.sh:218
10543#, sh-format
10544msgid "Bad rev input: $arg"
90e6ef53 10545msgstr "输入坏的版本:$arg"
c04f5ac3
JX
10546
10547#: git-bisect.sh:232
10548msgid "Please call 'bisect_state' with at least one argument."
10549msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
10550
10551#: git-bisect.sh:244
10552#, sh-format
10553msgid "Bad rev input: $rev"
10554msgstr "输入坏的版本:$rev"
10555
04cb2f28 10556#: git-bisect.sh:253
c04f5ac3
JX
10557msgid "'git bisect bad' can take only one argument."
10558msgstr "'git bisect bad' 只能带一个参数。"
10559
04cb2f28 10560#: git-bisect.sh:276
b694fbb1
JX
10561msgid "Warning: bisecting only with a bad commit."
10562msgstr "警告:在仅有一个坏提交下进行二分查找。"
10563
90e6ef53 10564# 译者:注意保持句尾空格
c04f5ac3
JX
10565#. TRANSLATORS: Make sure to include [Y] and [n] in your
10566#. translation. The program will only accept English input
10567#. at this point.
04cb2f28 10568#: git-bisect.sh:282
c04f5ac3
JX
10569msgid "Are you sure [Y/n]? "
10570msgstr "您确认么[Y/n]? "
10571
04cb2f28 10572#: git-bisect.sh:292
b694fbb1 10573msgid ""
220c313c 10574"You need to give me at least one good and one bad revision.\n"
b694fbb1
JX
10575"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10576msgstr ""
10577"您需要给我至少一个好版本和一个坏版本。\n"
220c313c 10578"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
b694fbb1 10579
04cb2f28 10580#: git-bisect.sh:295
b694fbb1
JX
10581msgid ""
10582"You need to start by \"git bisect start\".\n"
220c313c 10583"You then need to give me at least one good and one bad revision.\n"
b694fbb1
JX
10584"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10585msgstr ""
10586"您需要执行 \"git bisect start\" 来开始。\n"
10587"然后需要提供我至少一个好版本和一个坏版本。\n"
220c313c 10588"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
b694fbb1 10589
04cb2f28 10590#: git-bisect.sh:366 git-bisect.sh:493
b694fbb1
JX
10591msgid "We are not bisecting."
10592msgstr "我们没有在二分查找。"
10593
04cb2f28 10594#: git-bisect.sh:373
c04f5ac3
JX
10595#, sh-format
10596msgid "'$invalid' is not a valid commit"
10597msgstr "'$invalid' 不是一个有效的提交"
10598
04cb2f28 10599#: git-bisect.sh:382
c04f5ac3
JX
10600#, sh-format
10601msgid ""
10602"Could not check out original HEAD '$branch'.\n"
10603"Try 'git bisect reset <commit>'."
10604msgstr ""
10605"不能检出原始 HEAD '$branch'。\n"
07432cef 10606"尝试 'git bisect reset <提交>'。"
c04f5ac3 10607
04cb2f28 10608#: git-bisect.sh:409
c04f5ac3
JX
10609msgid "No logfile given"
10610msgstr "未提供日志文件"
10611
04cb2f28 10612#: git-bisect.sh:410
c04f5ac3
JX
10613#, sh-format
10614msgid "cannot read $file for replaying"
10615msgstr "不能读取 $file 来重放"
10616
04cb2f28 10617#: git-bisect.sh:427
c04f5ac3
JX
10618msgid "?? what are you talking about?"
10619msgstr "?? 您在说什么?"
10620
04cb2f28 10621#: git-bisect.sh:439
b694fbb1
JX
10622#, sh-format
10623msgid "running $command"
10624msgstr "运行 $command"
10625
04cb2f28 10626#: git-bisect.sh:446
b694fbb1
JX
10627#, sh-format
10628msgid ""
10629"bisect run failed:\n"
10630"exit code $res from '$command' is < 0 or >= 128"
10631msgstr ""
10632"二分查找运行失败:\n"
07432cef 10633"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 10634
04cb2f28 10635#: git-bisect.sh:472
b694fbb1
JX
10636msgid "bisect run cannot continue any more"
10637msgstr "二分查找不能继续运行"
10638
04cb2f28 10639#: git-bisect.sh:478
b694fbb1
JX
10640#, sh-format
10641msgid ""
10642"bisect run failed:\n"
10643"'bisect_state $state' exited with error code $res"
10644msgstr ""
10645"二分查找运行失败:\n"
10646"'bisect_state $state' 退出码为 $res"
10647
04cb2f28 10648#: git-bisect.sh:485
b694fbb1
JX
10649msgid "bisect run success"
10650msgstr "二分查找运行成功"
c04f5ac3 10651
7aea43ff 10652#: git-pull.sh:61
c04f5ac3
JX
10653msgid ""
10654"Pull is not possible because you have unmerged files.\n"
10655"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 10656"as appropriate to mark resolution and make a commit."
c04f5ac3 10657msgstr ""
90e6ef53 10658"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
d9d56b23 10659"然后酌情使用 'git add/rm <文件>' 标记解决方案,再做提交。"
c04f5ac3 10660
7aea43ff 10661#: git-pull.sh:65
c04f5ac3 10662msgid "Pull is not possible because you have unmerged files."
90e6ef53 10663msgstr "Pull 不可用,因为您尚有未合并的文件。"
c04f5ac3 10664
7aea43ff 10665#: git-pull.sh:71
220c313c
JX
10666msgid ""
10667"You have not concluded your merge (MERGE_HEAD exists).\n"
10668"Please, commit your changes before you can merge."
10669msgstr ""
10670"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
10671"请在合并前先提交您的修改。"
10672
7aea43ff 10673#: git-pull.sh:285
c04f5ac3 10674msgid "updating an unborn branch with changes added to the index"
90e6ef53 10675msgstr "更新尚未诞生的分支,变更添加至索引"
c04f5ac3 10676
7aea43ff 10677#: git-pull.sh:311
b694fbb1
JX
10678#, sh-format
10679msgid ""
10680"Warning: fetch updated the current branch head.\n"
10681"Warning: fast-forwarding your working tree from\n"
10682"Warning: commit $orig_head."
10683msgstr ""
10684"警告:fetch 更新了当前的分支。您的工作区\n"
10685"警告:从原提交 $orig_head 快进。"
10686
7aea43ff 10687#: git-pull.sh:336
c04f5ac3
JX
10688msgid "Cannot merge multiple branches into empty head"
10689msgstr "无法将多个分支合并到空分支"
10690
7aea43ff 10691#: git-pull.sh:340
c04f5ac3
JX
10692msgid "Cannot rebase onto multiple branches"
10693msgstr "无法变基到多个分支"
10694
6c94aba5 10695#: git-rebase.sh:57
649900bc
JX
10696msgid ""
10697"When you have resolved this problem, run \"git rebase --continue\".\n"
10698"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10699"To check out the original branch and stop rebasing, run \"git rebase --abort"
10700"\"."
10701msgstr ""
10702"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10703"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10704"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10705
6acbf033 10706#: git-rebase.sh:165
2e8451e8
JX
10707msgid "Applied autostash."
10708msgstr "成功应用 autostash。"
10709
6acbf033 10710#: git-rebase.sh:168
2e8451e8
JX
10711#, sh-format
10712msgid "Cannot store $stash_sha1"
10713msgstr "无法保存 $stash_sha1"
10714
6acbf033 10715#: git-rebase.sh:169
2e8451e8
JX
10716msgid ""
10717"Applying autostash resulted in conflicts.\n"
10718"Your changes are safe in the stash.\n"
b1894384 10719"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
2e8451e8
JX
10720msgstr ""
10721"应用 autostash 导致冲突。\n"
10722"您的修改安全地保存在 stash 中。\n"
10723"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10724
6acbf033 10725#: git-rebase.sh:208
649900bc 10726msgid "The pre-rebase hook refused to rebase."
98b2761d 10727msgstr "钩子 pre-rebase 拒绝变基操作。"
649900bc 10728
6acbf033 10729#: git-rebase.sh:213
649900bc
JX
10730msgid "It looks like git-am is in progress. Cannot rebase."
10731msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10732
6acbf033 10733#: git-rebase.sh:351
649900bc
JX
10734msgid "The --exec option must be used with the --interactive option"
10735msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10736
6acbf033 10737#: git-rebase.sh:356
649900bc
JX
10738msgid "No rebase in progress?"
10739msgstr "没有正在进行的变基?"
10740
6acbf033 10741#: git-rebase.sh:367
07432cef
WS
10742msgid "The --edit-todo action can only be used during interactive rebase."
10743msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10744
6acbf033 10745#: git-rebase.sh:374
649900bc
JX
10746msgid "Cannot read HEAD"
10747msgstr "不能读取 HEAD"
10748
6acbf033 10749#: git-rebase.sh:377
649900bc
JX
10750msgid ""
10751"You must edit all merge conflicts and then\n"
10752"mark them as resolved using git add"
10753msgstr ""
10754"您必须编辑所有的合并冲突,然后通过 git add\n"
10755"命令将它们标记为已解决"
10756
6acbf033 10757#: git-rebase.sh:395
649900bc
JX
10758#, sh-format
10759msgid "Could not move back to $head_name"
10760msgstr "无法移回 $head_name"
10761
6acbf033 10762#: git-rebase.sh:414
649900bc
JX
10763#, sh-format
10764msgid ""
10765"It seems that there is already a $state_dir_base directory, and\n"
10766"I wonder if you are in the middle of another rebase. If that is the\n"
10767"case, please try\n"
10768"\t$cmd_live_rebase\n"
10769"If that is not the case, please\n"
10770"\t$cmd_clear_stale_rebase\n"
10771"and run me again. I am stopping in case you still have something\n"
10772"valuable there."
10773msgstr ""
98b2761d
JX
10774"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
10775"过程中。 如果是这样,请执行\n"
649900bc
JX
10776"\t$cmd_live_rebase\n"
10777"如果不是这样,请执行\n"
10778"\t$cmd_clear_stale_rebase\n"
98b2761d 10779"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
649900bc 10780
6acbf033 10781#: git-rebase.sh:465
649900bc
JX
10782#, sh-format
10783msgid "invalid upstream $upstream_name"
10784msgstr "无效的上游 $upstream_name"
10785
6acbf033 10786#: git-rebase.sh:489
649900bc
JX
10787#, sh-format
10788msgid "$onto_name: there are more than one merge bases"
10789msgstr "$onto_name: 有一个以上的合并基准"
10790
6acbf033 10791#: git-rebase.sh:492 git-rebase.sh:496
649900bc
JX
10792#, sh-format
10793msgid "$onto_name: there is no merge base"
10794msgstr "$onto_name: 没有合并基准"
10795
6acbf033 10796#: git-rebase.sh:501
649900bc
JX
10797#, sh-format
10798msgid "Does not point to a valid commit: $onto_name"
10799msgstr "没有指向一个有效的提交:$onto_name"
10800
6acbf033 10801#: git-rebase.sh:524
649900bc
JX
10802#, sh-format
10803msgid "fatal: no such branch: $branch_name"
10804msgstr "严重错误:无此分支:$branch_name"
10805
6acbf033 10806#: git-rebase.sh:557
2e8451e8
JX
10807msgid "Cannot autostash"
10808msgstr "无法 autostash"
10809
6acbf033 10810#: git-rebase.sh:562
2e8451e8
JX
10811#, sh-format
10812msgid "Created autostash: $stash_abbrev"
10813msgstr "创建了 autostash: $stash_abbrev"
10814
6acbf033 10815#: git-rebase.sh:566
649900bc
JX
10816msgid "Please commit or stash them."
10817msgstr "请提交或为它们保存进度。"
10818
6acbf033 10819#: git-rebase.sh:586
649900bc
JX
10820#, sh-format
10821msgid "Current branch $branch_name is up to date."
10822msgstr "当前分支 $branch_name 是最新的。"
10823
6acbf033 10824#: git-rebase.sh:590
649900bc
JX
10825#, sh-format
10826msgid "Current branch $branch_name is up to date, rebase forced."
10827msgstr "当前分支 $branch_name 是最新的,强制变基。"
10828
6acbf033 10829#: git-rebase.sh:601
649900bc
JX
10830#, sh-format
10831msgid "Changes from $mb to $onto:"
10832msgstr "变更从 $mb 到 $onto:"
10833
6acbf033 10834#: git-rebase.sh:610
649900bc
JX
10835msgid "First, rewinding head to replay your work on top of it..."
10836msgstr "首先,重置头指针以便在上面重放您的工作..."
10837
6acbf033 10838#: git-rebase.sh:620
649900bc
JX
10839#, sh-format
10840msgid "Fast-forwarded $branch_name to $onto_name."
10841msgstr "快进 $branch_name 至 $onto_name。"
10842
c04f5ac3
JX
10843#: git-stash.sh:51
10844msgid "git stash clear with parameters is unimplemented"
10845msgstr "git stash clear 不支持参数"
10846
10847#: git-stash.sh:74
10848msgid "You do not have the initial commit yet"
10849msgstr "您尚未建立初始提交"
10850
10851#: git-stash.sh:89
10852msgid "Cannot save the current index state"
90e6ef53 10853msgstr "无法保存当前索引状态"
c04f5ac3 10854
6acbf033 10855#: git-stash.sh:124 git-stash.sh:137
c04f5ac3
JX
10856msgid "Cannot save the current worktree state"
10857msgstr "无法保存当前工作区状态"
10858
6acbf033 10859#: git-stash.sh:141
c04f5ac3 10860msgid "No changes selected"
90e6ef53 10861msgstr "没有选择变更"
c04f5ac3 10862
6acbf033 10863#: git-stash.sh:144
c04f5ac3 10864msgid "Cannot remove temporary index (can't happen)"
90e6ef53 10865msgstr "无法删除临时索引(不应发生)"
c04f5ac3 10866
6acbf033 10867#: git-stash.sh:157
c04f5ac3
JX
10868msgid "Cannot record working tree state"
10869msgstr "不能记录工作区状态"
10870
6acbf033 10871#: git-stash.sh:191
2e8451e8
JX
10872#, sh-format
10873msgid "Cannot update $ref_stash with $w_commit"
10874msgstr "无法用 $w_commit 更新 $ref_stash"
10875
b694fbb1
JX
10876#. TRANSLATORS: $option is an invalid option, like
10877#. `--blah-blah'. The 7 spaces at the beginning of the
10878#. second line correspond to "error: ". So you should line
10879#. up the second line with however many characters the
10880#. translation of "error: " takes in your language. E.g. in
10881#. English this is:
10882#.
10883#. $ git stash save --blah-blah 2>&1 | head -n 2
10884#. error: unknown option for 'stash save': --blah-blah
10885#. To provide a message, use git stash save -- '--blah-blah'
7aea43ff 10886#: git-stash.sh:241
b694fbb1
JX
10887#, sh-format
10888msgid ""
10889"error: unknown option for 'stash save': $option\n"
10890" To provide a message, use git stash save -- '$option'"
10891msgstr ""
10892"错误:'stash save' 的未知选项:$option\n"
10893" 要提供一个描述信息,使用 git stash save -- '$option'"
10894
7aea43ff 10895#: git-stash.sh:262
c04f5ac3
JX
10896msgid "No local changes to save"
10897msgstr "没有要保存的本地修改"
10898
7aea43ff 10899#: git-stash.sh:266
c04f5ac3 10900msgid "Cannot initialize stash"
90e6ef53 10901msgstr "无法初始化 stash"
c04f5ac3 10902
7aea43ff 10903#: git-stash.sh:270
c04f5ac3
JX
10904msgid "Cannot save the current status"
10905msgstr "无法保存当前状态"
10906
7aea43ff 10907#: git-stash.sh:288
c04f5ac3
JX
10908msgid "Cannot remove worktree changes"
10909msgstr "无法删除工作区变更"
10910
7aea43ff
JX
10911#: git-stash.sh:389
10912#, sh-format
10913msgid "unknown option: $opt"
10914msgstr "未知选项: $opt"
10915
10916#: git-stash.sh:399
c04f5ac3 10917msgid "No stash found."
90e6ef53 10918msgstr "未发现 stash。"
c04f5ac3 10919
7aea43ff 10920#: git-stash.sh:406
c04f5ac3
JX
10921#, sh-format
10922msgid "Too many revisions specified: $REV"
90e6ef53 10923msgstr "指定了太多的版本:$REV"
c04f5ac3 10924
7aea43ff 10925#: git-stash.sh:412
c04f5ac3 10926#, sh-format
220c313c
JX
10927msgid "$reference is not a valid reference"
10928msgstr "$reference 不是一个有效的引用"
c04f5ac3 10929
7aea43ff 10930#: git-stash.sh:440
c04f5ac3
JX
10931#, sh-format
10932msgid "'$args' is not a stash-like commit"
90e6ef53 10933msgstr "'$args' 不是 stash 样提交"
c04f5ac3 10934
7aea43ff 10935#: git-stash.sh:451
c04f5ac3
JX
10936#, sh-format
10937msgid "'$args' is not a stash reference"
90e6ef53 10938msgstr "'$args' 不是一个 stash 引用"
c04f5ac3 10939
7aea43ff 10940#: git-stash.sh:459
c04f5ac3 10941msgid "unable to refresh index"
90e6ef53 10942msgstr "无法刷新索引"
c04f5ac3 10943
7aea43ff 10944#: git-stash.sh:463
c04f5ac3
JX
10945msgid "Cannot apply a stash in the middle of a merge"
10946msgstr "无法在合并过程中恢复进度"
10947
7aea43ff 10948#: git-stash.sh:471
c04f5ac3 10949msgid "Conflicts in index. Try without --index."
90e6ef53 10950msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3 10951
7aea43ff 10952#: git-stash.sh:473
c04f5ac3 10953msgid "Could not save index tree"
90e6ef53 10954msgstr "不能保存索引树"
c04f5ac3 10955
7aea43ff 10956#: git-stash.sh:507
c04f5ac3
JX
10957msgid "Cannot unstage modified files"
10958msgstr "无法还原修改的文件"
10959
7aea43ff 10960#: git-stash.sh:522
b694fbb1
JX
10961msgid "Index was not unstashed."
10962msgstr "索引的进度没有被恢复。"
10963
7aea43ff 10964#: git-stash.sh:545
c04f5ac3
JX
10965#, sh-format
10966msgid "Dropped ${REV} ($s)"
10967msgstr "丢弃了 ${REV} ($s)"
10968
7aea43ff 10969#: git-stash.sh:546
c04f5ac3
JX
10970#, sh-format
10971msgid "${REV}: Could not drop stash entry"
90e6ef53 10972msgstr "${REV}:不能丢弃进度条目"
c04f5ac3 10973
7aea43ff 10974#: git-stash.sh:554
c04f5ac3
JX
10975msgid "No branch name specified"
10976msgstr "未指定分支名"
10977
7aea43ff 10978#: git-stash.sh:626
c04f5ac3
JX
10979msgid "(To restore them type \"git stash apply\")"
10980msgstr "(为恢复数据输入 \"git stash apply\")"
10981
2e8451e8 10982#: git-submodule.sh:95
c04f5ac3
JX
10983#, sh-format
10984msgid "cannot strip one component off url '$remoteurl'"
10985msgstr "无法从 url '$remoteurl' 剥离一个组件"
10986
2e8451e8 10987#: git-submodule.sh:237
c04f5ac3 10988#, sh-format
170e9899
JX
10989msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
10990msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
c04f5ac3 10991
6c94aba5 10992#: git-submodule.sh:287
c04f5ac3 10993#, sh-format
170e9899
JX
10994msgid "Clone of '$url' into submodule path '$sm_path' failed"
10995msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
c04f5ac3 10996
6acbf033 10997#: git-submodule.sh:296
dac1de7d
JX
10998#, sh-format
10999msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
07432cef 11000msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
dac1de7d 11001
6acbf033 11002#: git-submodule.sh:406
2e8451e8
JX
11003msgid "Relative path can only be used from the toplevel of the working tree"
11004msgstr "只能在工作区的顶级目录中使用相对路径"
11005
6acbf033 11006#: git-submodule.sh:416
c04f5ac3
JX
11007#, sh-format
11008msgid "repo URL: '$repo' must be absolute or begin with ./|../"
11009msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
11010
6acbf033 11011#: git-submodule.sh:433
c04f5ac3 11012#, sh-format
170e9899
JX
11013msgid "'$sm_path' already exists in the index"
11014msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 11015
6acbf033 11016#: git-submodule.sh:437
b694fbb1
JX
11017#, sh-format
11018msgid ""
11019"The following path is ignored by one of your .gitignore files:\n"
11020"$sm_path\n"
11021"Use -f if you really want to add it."
11022msgstr ""
11023"以下路径被您的一个 .gitignore 文件所忽略:\n"
11024"$sm_path\n"
11025"如果您确实想添加它,使用 -f 参数。"
11026
6acbf033 11027#: git-submodule.sh:455
b694fbb1
JX
11028#, sh-format
11029msgid "Adding existing repo at '$sm_path' to the index"
11030msgstr "添加位于 '$sm_path' 的现存版本库到索引"
11031
6acbf033 11032#: git-submodule.sh:457
c04f5ac3 11033#, sh-format
170e9899
JX
11034msgid "'$sm_path' already exists and is not a valid git repo"
11035msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
c04f5ac3 11036
6acbf033 11037#: git-submodule.sh:465
07432cef
WS
11038#, sh-format
11039msgid "A git directory for '$sm_name' is found locally with remote(s):"
11040msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
11041
6acbf033 11042#: git-submodule.sh:467
07432cef
WS
11043#, sh-format
11044msgid ""
11045"If you want to reuse this local git directory instead of cloning again from"
11046msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
11047
6acbf033 11048#: git-submodule.sh:469
07432cef
WS
11049#, sh-format
11050msgid ""
11051"use the '--force' option. If the local git directory is not the correct repo"
11052msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
11053
6acbf033 11054#: git-submodule.sh:470
07432cef
WS
11055#, sh-format
11056msgid ""
11057"or you are unsure what this means choose another name with the '--name' "
11058"option."
11059msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
11060
6acbf033 11061#: git-submodule.sh:472
07432cef
WS
11062#, sh-format
11063msgid "Reactivating local git directory for submodule '$sm_name'."
11064msgstr "激活本地 git 目录到子模组 '$sm_name'。"
11065
6acbf033 11066#: git-submodule.sh:484
c04f5ac3 11067#, sh-format
170e9899
JX
11068msgid "Unable to checkout submodule '$sm_path'"
11069msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 11070
6acbf033 11071#: git-submodule.sh:489
c04f5ac3 11072#, sh-format
170e9899
JX
11073msgid "Failed to add submodule '$sm_path'"
11074msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 11075
6acbf033 11076#: git-submodule.sh:498
c04f5ac3 11077#, sh-format
170e9899
JX
11078msgid "Failed to register submodule '$sm_path'"
11079msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 11080
6acbf033 11081#: git-submodule.sh:542
c04f5ac3 11082#, sh-format
2e8451e8
JX
11083msgid "Entering '$prefix$displaypath'"
11084msgstr "正在进入 '$prefix$displaypath'"
c04f5ac3 11085
6acbf033 11086#: git-submodule.sh:562
c04f5ac3 11087#, sh-format
2e8451e8
JX
11088msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
11089msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
c04f5ac3 11090
6acbf033 11091#: git-submodule.sh:608
c04f5ac3 11092#, sh-format
2e8451e8
JX
11093msgid "No url found for submodule path '$displaypath' in .gitmodules"
11094msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
c04f5ac3 11095
6acbf033 11096#: git-submodule.sh:617
c04f5ac3 11097#, sh-format
2e8451e8
JX
11098msgid "Failed to register url for submodule path '$displaypath'"
11099msgstr "无法为子模组路径 '$displaypath' 注册 url"
c04f5ac3 11100
6acbf033 11101#: git-submodule.sh:619
c04f5ac3 11102#, sh-format
2e8451e8
JX
11103msgid "Submodule '$name' ($url) registered for path '$displaypath'"
11104msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
c04f5ac3 11105
6acbf033 11106#: git-submodule.sh:636
d691f479 11107#, sh-format
2e8451e8
JX
11108msgid "Failed to register update mode for submodule path '$displaypath'"
11109msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
d691f479 11110
6acbf033 11111#: git-submodule.sh:674
1003b3a5
JX
11112#, sh-format
11113msgid "Use '.' if you really want to deinitialize all submodules"
11114msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
11115
6acbf033 11116#: git-submodule.sh:691
1003b3a5 11117#, sh-format
2e8451e8
JX
11118msgid "Submodule work tree '$displaypath' contains a .git directory"
11119msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
1003b3a5 11120
6acbf033 11121#: git-submodule.sh:692
1003b3a5
JX
11122#, sh-format
11123msgid ""
11124"(use 'rm -rf' if you really want to remove it including all of its history)"
11125msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11126
6acbf033 11127#: git-submodule.sh:698
c04f5ac3
JX
11128#, sh-format
11129msgid ""
2e8451e8 11130"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
1003b3a5 11131"discard them"
2e8451e8 11132msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
1003b3a5 11133
6acbf033 11134#: git-submodule.sh:701
1003b3a5 11135#, sh-format
2e8451e8
JX
11136msgid "Cleared directory '$displaypath'"
11137msgstr "已清除目录 '$displaypath'"
1003b3a5 11138
6acbf033 11139#: git-submodule.sh:702
1003b3a5 11140#, sh-format
2e8451e8
JX
11141msgid "Could not remove submodule work tree '$displaypath'"
11142msgstr "无法移除子模组工作区 '$displaypath'"
1003b3a5 11143
6acbf033 11144#: git-submodule.sh:705
1003b3a5 11145#, sh-format
2e8451e8
JX
11146msgid "Could not create empty submodule directory '$displaypath'"
11147msgstr "不能创建空的子模组目录 '$displaypath'"
1003b3a5 11148
6acbf033 11149#: git-submodule.sh:714
1003b3a5 11150#, sh-format
2e8451e8
JX
11151msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
11152msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
1003b3a5 11153
6acbf033 11154#: git-submodule.sh:830
1003b3a5
JX
11155#, sh-format
11156msgid ""
2e8451e8 11157"Submodule path '$displaypath' not initialized\n"
c04f5ac3
JX
11158"Maybe you want to use 'update --init'?"
11159msgstr ""
2e8451e8 11160"子模组路径 '$displaypath' 没有初始化\n"
90e6ef53 11161"也许您想用 'update --init'?"
c04f5ac3 11162
6acbf033 11163#: git-submodule.sh:843
c04f5ac3 11164#, sh-format
2e8451e8
JX
11165msgid "Unable to find current revision in submodule path '$displaypath'"
11166msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 11167
6acbf033 11168#: git-submodule.sh:852
c04f5ac3 11169#, sh-format
170e9899
JX
11170msgid "Unable to fetch in submodule path '$sm_path'"
11171msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 11172
6acbf033 11173#: git-submodule.sh:876
2e8451e8
JX
11174#, sh-format
11175msgid "Unable to fetch in submodule path '$displaypath'"
11176msgstr "无法在子模组路径 '$displaypath' 中获取"
11177
6acbf033 11178#: git-submodule.sh:890
6c94aba5
JX
11179#, sh-format
11180msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
11181msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
11182
6acbf033 11183#: git-submodule.sh:891
c04f5ac3 11184#, sh-format
6c94aba5
JX
11185msgid "Submodule path '$displaypath': checked out '$sha1'"
11186msgstr "子模组路径 '$displaypath':检出 '$sha1'"
11187
6acbf033 11188#: git-submodule.sh:895
6c94aba5 11189#, sh-format
2e8451e8
JX
11190msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
11191msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 11192
6acbf033 11193#: git-submodule.sh:896
c04f5ac3 11194#, sh-format
2e8451e8
JX
11195msgid "Submodule path '$displaypath': rebased into '$sha1'"
11196msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 11197
6acbf033 11198#: git-submodule.sh:901
c04f5ac3 11199#, sh-format
2e8451e8
JX
11200msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
11201msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 11202
6acbf033 11203#: git-submodule.sh:902
c04f5ac3 11204#, sh-format
2e8451e8
JX
11205msgid "Submodule path '$displaypath': merged in '$sha1'"
11206msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 11207
6acbf033 11208#: git-submodule.sh:907
c04f5ac3 11209#, sh-format
2e8451e8
JX
11210msgid ""
11211"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
11212msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
c04f5ac3 11213
6acbf033 11214#: git-submodule.sh:908
c04f5ac3 11215#, sh-format
2e8451e8
JX
11216msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
11217msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
c04f5ac3 11218
6acbf033 11219#: git-submodule.sh:938
2e8451e8
JX
11220#, sh-format
11221msgid "Failed to recurse into submodule path '$displaypath'"
11222msgstr "无法递归进子模组路径 '$displaypath'"
11223
6acbf033 11224#: git-submodule.sh:1046
649900bc
JX
11225msgid "The --cached option cannot be used with the --files option"
11226msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1 11227
6acbf033 11228#: git-submodule.sh:1098
b694fbb1
JX
11229#, sh-format
11230msgid "unexpected mode $mod_dst"
11231msgstr "意外的模式 $mod_dst"
c04f5ac3 11232
90e6ef53 11233# 译者:注意保持前导空格
6acbf033 11234#: git-submodule.sh:1118
c04f5ac3 11235#, sh-format
2e8451e8
JX
11236msgid " Warn: $display_name doesn't contain commit $sha1_src"
11237msgstr " 警告:$display_name 未包含提交 $sha1_src"
c04f5ac3 11238
90e6ef53 11239# 译者:注意保持前导空格
6acbf033 11240#: git-submodule.sh:1121
c04f5ac3 11241#, sh-format
2e8451e8
JX
11242msgid " Warn: $display_name doesn't contain commit $sha1_dst"
11243msgstr " 警告:$display_name 未包含提交 $sha1_dst"
c04f5ac3 11244
90e6ef53 11245# 译者:注意保持前导空格
6acbf033 11246#: git-submodule.sh:1124
c04f5ac3 11247#, sh-format
2e8451e8
JX
11248msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
11249msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
c04f5ac3 11250
6acbf033 11251#: git-submodule.sh:1149
c04f5ac3 11252msgid "blob"
07432cef 11253msgstr "数据对象"
c04f5ac3 11254
6acbf033 11255#: git-submodule.sh:1267
1003b3a5
JX
11256#, sh-format
11257msgid "Failed to recurse into submodule path '$sm_path'"
11258msgstr "无法递归进子模组路径 '$sm_path'"
11259
6acbf033 11260#: git-submodule.sh:1331
c04f5ac3 11261#, sh-format
2e8451e8
JX
11262msgid "Synchronizing submodule url for '$displaypath'"
11263msgstr "为 '$displaypath' 同步子模组 url"
7aea43ff
JX
11264
11265#~ msgid "Cannot apply stash: Your index contains uncommitted changes."
11266#~ msgstr "无法应用 stash:您的索引中包含未提交的变更。"
11267
11268#~ msgid "The most commonly used git commands are:"
11269#~ msgstr "最常用的 git 命令有:"
11270
11271#~ msgid "No such branch: '%s'"
11272#~ msgstr "没有此分支:'%s'"
11273
11274#~ msgid "Could not create git link %s"
11275#~ msgstr "不能创建 git link %s"
11276
11277#~ msgid "Invalid gc.pruneexpire: '%s'"
11278#~ msgstr "无效的 gc.pruneexpire:'%s'"