]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
Merge branch 'v2.3.0' of git://github.com/jnavila/git
[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
JX
4# This file is distributed under the same license as the Git package.
5# Contributers:
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"
04cb2f28
JX
15"POT-Creation-Date: 2015-01-13 14:05+0800\n"
16"PO-Revision-Date: 2015-01-13 14:21+0800\n"
c04f5ac3
JX
17"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
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 ""
6acbf033 35"请在工作区改正文件,然后酌情使用 'git add/rm <file>' 命令标记\n"
220c313c 36"解决方案并提交。"
c04f5ac3 37
220c313c 38#: archive.c:11
ef317cd5 39msgid "git archive [options] <tree-ish> [<path>...]"
07432cef 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
JX
47msgid ""
48"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
49msgstr ""
07432cef 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
04cb2f28 56#: archive.c:342 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328
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
04cb2f28 77#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517
220c313c
JX
78#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986
79#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101
04cb2f28
JX
80#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394
81#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151
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
04cb2f28 113#: archive.c:449 builtin/archive.c:90 builtin/clone.c:86
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
220c313c 129#: attr.c:258
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
04cb2f28 254#: bundle.c:87 builtin/commit.c:770
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
04cb2f28
JX
263#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706
264#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330
265#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 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
9aeb4c2b
JX
305#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
306#, c-format
307msgid "unrecognized argument: %s"
308msgstr "未能识别的参数:%s"
309
310#: bundle.c:444
8ada9598 311msgid "Refusing to create empty bundle."
81809b99 312msgstr "不能创建空包。"
8ada9598 313
9aeb4c2b 314#: bundle.c:454
81809b99 315#, c-format
8ada9598 316msgid "cannot create '%s'"
81809b99 317msgstr "不能创建 '%s'"
8ada9598 318
9aeb4c2b 319#: bundle.c:475
8ada9598 320msgid "index-pack died"
81809b99 321msgstr "index-pack 终止"
8ada9598 322
04cb2f28 323#: color.c:259
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
220c313c
JX
342#: config.c:469 config.c:471
343#, c-format
344msgid "bad config file line %d in %s"
345msgstr "配置文件 %2$s 出错于第 %1$d 行"
346
347#: config.c:587
348#, c-format
349msgid "bad numeric config value '%s' for '%s' in %s: %s"
350msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
351
352#: config.c:589
353#, c-format
354msgid "bad numeric config value '%s' for '%s': %s"
355msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
356
357#: config.c:674
358#, c-format
359msgid "failed to expand user dir in: '%s'"
360msgstr "无法扩展 '%s' 中的用户目录"
361
362#: config.c:752 config.c:763
363#, c-format
364msgid "bad zlib compression level %d"
365msgstr "错误的 zlib 压缩级别 %d"
366
367#: config.c:885
368#, c-format
369msgid "invalid mode for object creation: %s"
370msgstr "无效的对象创建模式:%s"
371
04cb2f28 372#: config.c:1211
220c313c
JX
373msgid "unable to parse command-line config"
374msgstr "无法解析命令行中的配置"
375
04cb2f28 376#: config.c:1272
220c313c
JX
377msgid "unknown error occured while reading the configuration files"
378msgstr "在读取配置文件时遇到未知错误"
379
04cb2f28 380#: config.c:1596
220c313c
JX
381#, c-format
382msgid "unable to parse '%s' from command-line config"
383msgstr "无法解析命令行配置中的 '%s'"
384
04cb2f28 385#: config.c:1598
220c313c
JX
386#, c-format
387msgid "bad config variable '%s' in file '%s' at line %d"
388msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
389
04cb2f28 390#: config.c:1657
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
220c313c 482#: diffcore-rename.c:516
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
220c313c 512#: diff.c:2957
6acbf033
JX
513#, c-format
514msgid "external diff died, stopping at %s"
515msgstr "外部 diff 退出,停止在 %s"
516
220c313c 517#: diff.c:3352
6acbf033
JX
518msgid "--follow requires exactly one pathspec"
519msgstr "--follow 参数后只跟一个 pathspec"
520
220c313c 521#: diff.c:3515
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
220c313c 530#: diff.c:3529
07432cef
WS
531#, c-format
532msgid "Failed to parse --submodule option parameter: '%s'"
533msgstr "无法解析 --submodule 选项的参数:'%s'"
534
220c313c 535#: gpg-interface.c:129 gpg-interface.c:200
c04f5ac3
JX
536msgid "could not run gpg."
537msgstr "不能执行 gpg。"
538
220c313c 539#: gpg-interface.c:141
c04f5ac3
JX
540msgid "gpg did not accept the data"
541msgstr "gpg 没有接受数据"
542
220c313c 543#: gpg-interface.c:152
c04f5ac3
JX
544msgid "gpg failed to sign the data"
545msgstr "gpg 无法为数据签名"
546
220c313c 547#: gpg-interface.c:185
a77c07d9
JX
548#, c-format
549msgid "could not create temporary file '%s': %s"
550msgstr "不能创建临时文件 '%s':%s"
551
220c313c 552#: gpg-interface.c:188
a77c07d9
JX
553#, c-format
554msgid "failed writing detached signature to '%s': %s"
555msgstr "无法将分离式签名写入 '%s':%s"
556
220c313c 557#: grep.c:1718
7ac1c0ad
JX
558#, c-format
559msgid "'%s': unable to read %s"
560msgstr "'%s':无法读取 %s"
561
220c313c 562#: grep.c:1735
7ac1c0ad
JX
563#, c-format
564msgid "'%s': %s"
565msgstr "'%s':%s"
566
220c313c 567#: grep.c:1746
7ac1c0ad
JX
568#, c-format
569msgid "'%s': short read %s"
570msgstr "'%s':读取不完整 %s"
571
6acbf033 572#: help.c:207
81809b99 573#, c-format
8ada9598 574msgid "available git commands in '%s'"
81809b99 575msgstr "在 '%s' 下可用的 git 命令"
8ada9598 576
6acbf033 577#: help.c:214
8ada9598 578msgid "git commands available from elsewhere on your $PATH"
81809b99 579msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
8ada9598 580
6acbf033 581#: help.c:230
a77c07d9
JX
582msgid "The most commonly used git commands are:"
583msgstr "最常用的 git 命令有:"
584
6c94aba5 585#: help.c:289
c04f5ac3
JX
586#, c-format
587msgid ""
588"'%s' appears to be a git command, but we were not\n"
589"able to execute it. Maybe git-%s is broken?"
590msgstr ""
591"'%s' 像是一个 git 命令,但却无法运行。\n"
592"可能是 git-%s 受损?"
593
6c94aba5 594#: help.c:346
8ada9598 595msgid "Uh oh. Your system reports no Git commands at all."
81809b99 596msgstr "唉呀,您的系统中未发现 Git 命令。"
8ada9598 597
6c94aba5 598#: help.c:368
8ada9598
JX
599#, c-format
600msgid ""
601"WARNING: You called a Git command named '%s', which does not exist.\n"
602"Continuing under the assumption that you meant '%s'"
603msgstr ""
81809b99
JX
604"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
605"是 '%s'"
8ada9598 606
6c94aba5 607#: help.c:373
8ada9598
JX
608#, c-format
609msgid "in %0.1f seconds automatically..."
81809b99 610msgstr "在 %0.1f 秒钟后自动运行..."
8ada9598 611
6c94aba5 612#: help.c:380
8ada9598
JX
613#, c-format
614msgid "git: '%s' is not a git command. See 'git --help'."
81809b99 615msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
8ada9598 616
6acbf033 617#: help.c:384 help.c:444
8ada9598
JX
618msgid ""
619"\n"
620"Did you mean this?"
621msgid_plural ""
622"\n"
623"Did you mean one of these?"
624msgstr[0] ""
81809b99
JX
625"\n"
626"您指的是这个么?"
627msgstr[1] ""
628"\n"
195febda 629"您指的是这其中的某一个么?"
8ada9598 630
6acbf033 631#: help.c:440
2e8451e8
JX
632#, c-format
633msgid "%s: %s - %s"
634msgstr "%s:%s - %s"
635
04cb2f28 636#: lockfile.c:283
220c313c
JX
637msgid "BUG: reopen a lockfile that is still open"
638msgstr "BUG: 重新打开一个仍打开着的锁文件"
639
04cb2f28 640#: lockfile.c:285
220c313c
JX
641msgid "BUG: reopen a lockfile that has been committed"
642msgstr "BUG: 重新打开一个已提交的锁文件"
643
644#: merge.c:41
07432cef
WS
645msgid "failed to read the cache"
646msgstr "无法读取缓存"
647
04cb2f28
JX
648#: merge.c:94 builtin/checkout.c:374 builtin/checkout.c:580
649#: builtin/clone.c:662
07432cef
WS
650msgid "unable to write new index file"
651msgstr "无法写新的索引文件"
652
220c313c 653#: merge-recursive.c:189
649900bc
JX
654#, c-format
655msgid "(bad commit)\n"
656msgstr "(坏提交)\n"
657
220c313c 658#: merge-recursive.c:209
649900bc
JX
659#, c-format
660msgid "addinfo_cache failed for path '%s'"
661msgstr "为路径 '%s' addinfo_cache 失败"
662
220c313c 663#: merge-recursive.c:270
649900bc
JX
664msgid "error building trees"
665msgstr "无法创建树"
666
04cb2f28 667#: merge-recursive.c:688
649900bc
JX
668#, c-format
669msgid "failed to create path '%s'%s"
670msgstr "无法创建路径 '%s'%s"
671
04cb2f28 672#: merge-recursive.c:699
649900bc
JX
673#, c-format
674msgid "Removing %s to make room for subdirectory\n"
675msgstr "删除 %s 以便为子目录留出空间\n"
676
04cb2f28 677#: merge-recursive.c:713 merge-recursive.c:734
649900bc
JX
678msgid ": perhaps a D/F conflict?"
679msgstr ":可能是一个目录/文件冲突?"
680
04cb2f28 681#: merge-recursive.c:724
649900bc
JX
682#, c-format
683msgid "refusing to lose untracked file at '%s'"
684msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
685
04cb2f28 686#: merge-recursive.c:764
649900bc
JX
687#, c-format
688msgid "cannot read object %s '%s'"
689msgstr "不能读取对象 %s '%s'"
690
04cb2f28 691#: merge-recursive.c:766
649900bc
JX
692#, c-format
693msgid "blob expected for %s '%s'"
07432cef 694msgstr "%s '%s' 应为数据(blob)对象"
649900bc 695
04cb2f28 696#: merge-recursive.c:789 builtin/clone.c:321
649900bc
JX
697#, c-format
698msgid "failed to open '%s'"
699msgstr "无法打开 '%s'"
700
04cb2f28 701#: merge-recursive.c:797
649900bc
JX
702#, c-format
703msgid "failed to symlink '%s'"
704msgstr "无法创建符号链接 '%s'"
705
04cb2f28 706#: merge-recursive.c:800
649900bc
JX
707#, c-format
708msgid "do not know what to do with %06o %s '%s'"
709msgstr "不知道如何处理 %06o %s '%s'"
710
04cb2f28 711#: merge-recursive.c:938
649900bc
JX
712msgid "Failed to execute internal merge"
713msgstr "无法执行内部合并"
714
04cb2f28 715#: merge-recursive.c:942
649900bc
JX
716#, c-format
717msgid "Unable to add %s to database"
718msgstr "不能添加 %s 至对象库"
719
04cb2f28 720#: merge-recursive.c:958
649900bc
JX
721msgid "unsupported object type in the tree"
722msgstr "在树中有不支持的对象类型"
723
04cb2f28 724#: merge-recursive.c:1033 merge-recursive.c:1047
649900bc
JX
725#, c-format
726msgid ""
727"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
728"in tree."
729msgstr ""
730"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
731"的版本被保留。"
732
04cb2f28 733#: merge-recursive.c:1039 merge-recursive.c:1052
649900bc
JX
734#, c-format
735msgid ""
736"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
737"in tree at %s."
738msgstr ""
739"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
740"的版本保留于 %8$s 中。"
741
04cb2f28 742#: merge-recursive.c:1093
649900bc
JX
743msgid "rename"
744msgstr "重命名"
745
04cb2f28 746#: merge-recursive.c:1093
649900bc
JX
747msgid "renamed"
748msgstr "重命名"
749
04cb2f28 750#: merge-recursive.c:1149
649900bc
JX
751#, c-format
752msgid "%s is a directory in %s adding as %s instead"
753msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
754
04cb2f28 755#: merge-recursive.c:1171
649900bc
JX
756#, c-format
757msgid ""
758"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
759"\"->\"%s\" in \"%s\"%s"
760msgstr ""
761"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
762"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
763
04cb2f28 764#: merge-recursive.c:1176
649900bc
JX
765msgid " (left unresolved)"
766msgstr "(留下未解决)"
767
04cb2f28 768#: merge-recursive.c:1230
649900bc
JX
769#, c-format
770msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
771msgstr ""
772"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
773"%5$s"
774
04cb2f28 775#: merge-recursive.c:1260
649900bc
JX
776#, c-format
777msgid "Renaming %s to %s and %s to %s instead"
07432cef 778msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
649900bc 779
04cb2f28 780#: merge-recursive.c:1459
649900bc
JX
781#, c-format
782msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
783msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
784
04cb2f28 785#: merge-recursive.c:1469
649900bc
JX
786#, c-format
787msgid "Adding merged %s"
788msgstr "添加合并后的 %s"
789
04cb2f28 790#: merge-recursive.c:1474 merge-recursive.c:1672
649900bc
JX
791#, c-format
792msgid "Adding as %s instead"
793msgstr "而是以 %s 为名添加"
794
04cb2f28 795#: merge-recursive.c:1525
649900bc
JX
796#, c-format
797msgid "cannot read object %s"
798msgstr "不能读取对象 %s"
799
04cb2f28 800#: merge-recursive.c:1528
649900bc
JX
801#, c-format
802msgid "object %s is not a blob"
07432cef 803msgstr "对象 %s 不是一个数据(blob)对象"
649900bc 804
04cb2f28 805#: merge-recursive.c:1576
649900bc
JX
806msgid "modify"
807msgstr "修改"
808
04cb2f28 809#: merge-recursive.c:1576
649900bc
JX
810msgid "modified"
811msgstr "修改"
812
04cb2f28 813#: merge-recursive.c:1586
649900bc
JX
814msgid "content"
815msgstr "内容"
816
04cb2f28 817#: merge-recursive.c:1593
649900bc
JX
818msgid "add/add"
819msgstr "添加/添加"
820
04cb2f28 821#: merge-recursive.c:1627
649900bc
JX
822#, c-format
823msgid "Skipped %s (merged same as existing)"
824msgstr "略过 %s(已经做过相同合并)"
825
04cb2f28 826#: merge-recursive.c:1641
649900bc
JX
827#, c-format
828msgid "Auto-merging %s"
829msgstr "自动合并 %s"
830
04cb2f28 831#: merge-recursive.c:1645 git-submodule.sh:1150
649900bc
JX
832msgid "submodule"
833msgstr "子模组"
834
04cb2f28 835#: merge-recursive.c:1646
649900bc
JX
836#, c-format
837msgid "CONFLICT (%s): Merge conflict in %s"
838msgstr "冲突(%s):合并冲突于 %s"
839
04cb2f28 840#: merge-recursive.c:1732
649900bc
JX
841#, c-format
842msgid "Removing %s"
843msgstr "删除 %s"
844
04cb2f28 845#: merge-recursive.c:1757
649900bc
JX
846msgid "file/directory"
847msgstr "文件/目录"
848
04cb2f28 849#: merge-recursive.c:1763
649900bc
JX
850msgid "directory/file"
851msgstr "目录/文件"
852
04cb2f28 853#: merge-recursive.c:1768
649900bc
JX
854#, c-format
855msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
856msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
857
04cb2f28 858#: merge-recursive.c:1778
649900bc
JX
859#, c-format
860msgid "Adding %s"
861msgstr "添加 %s"
862
04cb2f28 863#: merge-recursive.c:1795
649900bc
JX
864msgid "Fatal merge failure, shouldn't happen."
865msgstr "严重的合并错误,不应发生。"
866
04cb2f28 867#: merge-recursive.c:1814
649900bc
JX
868msgid "Already up-to-date!"
869msgstr "已经是最新的!"
870
04cb2f28 871#: merge-recursive.c:1823
649900bc
JX
872#, c-format
873msgid "merging of trees %s and %s failed"
874msgstr "无法合并树 %s 和 %s"
875
04cb2f28 876#: merge-recursive.c:1853
649900bc
JX
877#, c-format
878msgid "Unprocessed path??? %s"
879msgstr "未处理的路径??? %s"
880
04cb2f28 881#: merge-recursive.c:1898
649900bc
JX
882msgid "Merging:"
883msgstr "合并:"
884
04cb2f28 885#: merge-recursive.c:1911
649900bc 886#, c-format
e5e38ce4
JX
887msgid "found %u common ancestor:"
888msgid_plural "found %u common ancestors:"
889msgstr[0] "发现 %u 个共同祖先:"
890msgstr[1] "发现 %u 个共同祖先:"
649900bc 891
04cb2f28 892#: merge-recursive.c:1948
649900bc
JX
893msgid "merge returned no commit"
894msgstr "合并未返回提交"
895
04cb2f28 896#: merge-recursive.c:2005
649900bc
JX
897#, c-format
898msgid "Could not parse object '%s'"
899msgstr "不能解析对象 '%s'"
900
04cb2f28 901#: merge-recursive.c:2016 builtin/merge.c:667
649900bc
JX
902msgid "Unable to write index."
903msgstr "不能写入索引。"
904
6acbf033 905#: notes-utils.c:41
2e8451e8
JX
906msgid "Cannot commit uninitialized/unreferenced notes tree"
907msgstr "不能提交未初始化/未引用的注解树"
908
04cb2f28 909#: notes-utils.c:82
2e8451e8
JX
910#, c-format
911msgid "Bad notes.rewriteMode value: '%s'"
912msgstr "坏的 notes.rewriteMode 值:'%s'"
913
04cb2f28 914#: notes-utils.c:92
2e8451e8
JX
915#, c-format
916msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
917msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
918
919#. TRANSLATORS: The first %s is the name of the
920#. environment variable, the second %s is its value
04cb2f28 921#: notes-utils.c:119
2e8451e8
JX
922#, c-format
923msgid "Bad %s value: '%s'"
924msgstr "坏的 %s 值:'%s'"
925
220c313c 926#: object.c:241
1003b3a5
JX
927#, c-format
928msgid "unable to parse object: %s"
929msgstr "不能解析对象:%s"
930
220c313c 931#: parse-options.c:546
8ada9598 932msgid "..."
81809b99 933msgstr "..."
8ada9598 934
220c313c 935#: parse-options.c:564
81809b99 936#, c-format
8ada9598 937msgid "usage: %s"
81809b99 938msgstr "用法:%s"
8ada9598
JX
939
940#. TRANSLATORS: the colon here should align with the
941#. one in "usage: %s" translation
220c313c 942#: parse-options.c:568
81809b99 943#, c-format
8ada9598 944msgid " or: %s"
81809b99 945msgstr " 或:%s"
8ada9598
JX
946
947# 译者:为保证在输出中对齐,注意调整句中空格!
220c313c 948#: parse-options.c:571
81809b99 949#, c-format
8ada9598 950msgid " %s"
81809b99 951msgstr " %s"
8ada9598 952
220c313c 953#: parse-options.c:605
63af42fe
JX
954msgid "-NUM"
955msgstr "-数字"
956
cfff71a9 957#: pathspec.c:133
90314792
JX
958msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
959msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
960
cfff71a9 961#: pathspec.c:143
90314792
JX
962msgid ""
963"global 'literal' pathspec setting is incompatible with all other global "
964"pathspec settings"
965msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
966
cfff71a9 967#: pathspec.c:177
90314792
JX
968msgid "invalid parameter for pathspec magic 'prefix'"
969msgstr "路径规则包含无效的神奇前缀"
970
cfff71a9 971#: pathspec.c:183
90314792
JX
972#, c-format
973msgid "Invalid pathspec magic '%.*s' in '%s'"
974msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
975
cfff71a9 976#: pathspec.c:187
90314792
JX
977#, c-format
978msgid "Missing ')' at the end of pathspec magic in '%s'"
979msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
980
cfff71a9 981#: pathspec.c:205
90314792
JX
982#, c-format
983msgid "Unimplemented pathspec magic '%c' in '%s'"
984msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
985
cfff71a9 986#: pathspec.c:230
a77c07d9 987#, c-format
90314792
JX
988msgid "%s: 'literal' and 'glob' are incompatible"
989msgstr "%s:'literal' 和 'glob' 不兼容"
a77c07d9 990
cfff71a9 991#: pathspec.c:241
a77c07d9 992#, c-format
90314792
JX
993msgid "%s: '%s' is outside repository"
994msgstr "%s:'%s' 在版本库之外"
a77c07d9 995
cfff71a9 996#: pathspec.c:291
90314792
JX
997#, c-format
998msgid "Pathspec '%s' is in submodule '%.*s'"
999msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
1000
cfff71a9 1001#: pathspec.c:353
90314792
JX
1002#, c-format
1003msgid "%s: pathspec magic not supported by this command: %s"
1004msgstr "%s:路径规则神奇前缀不被此命令支持:%s"
1005
6acbf033 1006#: pathspec.c:432
90314792
JX
1007#, c-format
1008msgid "pathspec '%s' is beyond a symbolic link"
1009msgstr "路径规则 '%s' 位于符号链接中"
1010
6acbf033 1011#: pathspec.c:441
cfff71a9
JX
1012msgid ""
1013"There is nothing to exclude from by :(exclude) patterns.\n"
1014"Perhaps you forgot to add either ':/' or '.' ?"
1015msgstr ""
1016"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
1017"添加 ':/' 或 '.' ?"
1018
220c313c
JX
1019#: pretty.c:968
1020msgid "unable to parse --pretty format"
1021msgstr "不能解析 --pretty 格式"
1022
6acbf033 1023#: progress.c:225
6c94aba5
JX
1024msgid "done"
1025msgstr "完成"
1026
04cb2f28 1027#: read-cache.c:1267
6c94aba5
JX
1028#, c-format
1029msgid ""
1030"index.version set, but the value is invalid.\n"
1031"Using version %i"
1032msgstr ""
1033"设置了 index.version,但是取值无效。\n"
1034"使用版本 %i"
1035
04cb2f28 1036#: read-cache.c:1277
6c94aba5
JX
1037#, c-format
1038msgid ""
1039"GIT_INDEX_VERSION set, but the value is invalid.\n"
1040"Using version %i"
1041msgstr ""
1042"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
1043"使用版本 %i"
1044
220c313c 1045#: remote.c:782
cfff71a9
JX
1046#, c-format
1047msgid "Cannot fetch both %s and %s to %s"
1048msgstr "不能同时获取 %s 和 %s 至 %s"
1049
220c313c 1050#: remote.c:786
cfff71a9
JX
1051#, c-format
1052msgid "%s usually tracks %s, not %s"
1053msgstr "%s 通常跟踪 %s,而非 %s"
1054
220c313c 1055#: remote.c:790
cfff71a9
JX
1056#, c-format
1057msgid "%s tracks both %s and %s"
1058msgstr "%s 同时跟踪 %s 和 %s"
1059
220c313c 1060#: remote.c:798
cfff71a9
JX
1061msgid "Internal error"
1062msgstr "内部错误"
1063
04cb2f28 1064#: remote.c:1980
90314792
JX
1065#, c-format
1066msgid "Your branch is based on '%s', but the upstream is gone.\n"
1067msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
1068
04cb2f28 1069#: remote.c:1984
90314792
JX
1070msgid " (use \"git branch --unset-upstream\" to fixup)\n"
1071msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
1072
04cb2f28 1073#: remote.c:1987
90314792
JX
1074#, c-format
1075msgid "Your branch is up-to-date with '%s'.\n"
1076msgstr "您的分支与上游分支 '%s' 一致。\n"
1077
04cb2f28 1078#: remote.c:1991
c04f5ac3
JX
1079#, c-format
1080msgid "Your branch is ahead of '%s' by %d commit.\n"
1081msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
1082msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
5ae481e0 1083msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
c04f5ac3 1084
04cb2f28 1085#: remote.c:1997
07432cef
WS
1086msgid " (use \"git push\" to publish your local commits)\n"
1087msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
1088
04cb2f28 1089#: remote.c:2000
c04f5ac3
JX
1090#, c-format
1091msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
1092msgid_plural ""
1093"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
90e6ef53 1094msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
5ae481e0 1095msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 1096
07432cef 1097# 译者:注意保持前导空格
04cb2f28 1098#: remote.c:2008
07432cef
WS
1099msgid " (use \"git pull\" to update your local branch)\n"
1100msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
1101
04cb2f28 1102#: remote.c:2011
c04f5ac3
JX
1103#, c-format
1104msgid ""
1105"Your branch and '%s' have diverged,\n"
1106"and have %d and %d different commit each, respectively.\n"
1107msgid_plural ""
1108"Your branch and '%s' have diverged,\n"
1109"and have %d and %d different commits each, respectively.\n"
1110msgstr[0] ""
1111"您的分支和 '%s' 出现了偏离,\n"
195febda 1112"并且分别有 %d 和 %d 处不同的提交。\n"
5ae481e0
JX
1113msgstr[1] ""
1114"您的分支和 '%s' 出现了偏离,\n"
195febda 1115"并且分别有 %d 和 %d 处不同的提交。\n"
c04f5ac3 1116
07432cef 1117# 译者:注意保持前导空格
04cb2f28 1118#: remote.c:2021
07432cef
WS
1119msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1120msgstr " (使用 \"git pull\" 来合并远程分支)\n"
1121
220c313c 1122#: run-command.c:87
2e8451e8
JX
1123msgid "open /dev/null failed"
1124msgstr "不能打开 /dev/null"
1125
220c313c 1126#: run-command.c:89
2e8451e8
JX
1127#, c-format
1128msgid "dup2(%d,%d) failed"
1129msgstr "不能调用 dup2(%d,%d)"
1130
04cb2f28 1131#: send-pack.c:268
220c313c
JX
1132msgid "failed to sign the push certificate"
1133msgstr "无法为推送证书签名"
1134
04cb2f28 1135#: send-pack.c:325
220c313c
JX
1136msgid "the receiving end does not support --signed push"
1137msgstr "接收端不支持签名推送"
1138
04cb2f28
JX
1139#: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995
1140#: builtin/merge.c:1005
c04f5ac3
JX
1141#, c-format
1142msgid "Could not open '%s' for writing"
90e6ef53 1143msgstr "不能为写入打开 '%s'"
c04f5ac3 1144
04cb2f28
JX
1145#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:785 builtin/merge.c:997
1146#: builtin/merge.c:1010
c04f5ac3
JX
1147#, c-format
1148msgid "Could not write to '%s'"
90e6ef53 1149msgstr "不能写入 '%s'"
c04f5ac3 1150
220c313c 1151#: sequencer.c:195
14c8bced
JX
1152msgid ""
1153"after resolving the conflicts, mark the corrected paths\n"
1154"with 'git add <paths>' or 'git rm <paths>'"
1155msgstr ""
1156"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
1157"命令标记修正后的文件"
1158
220c313c 1159#: sequencer.c:198
c04f5ac3
JX
1160msgid ""
1161"after resolving the conflicts, mark the corrected paths\n"
1162"with 'git add <paths>' or 'git rm <paths>'\n"
1163"and commit the result with 'git commit'"
1164msgstr ""
1165"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
1166"对修正后的文件做标记,然后用 'git commit' 提交"
1167
04cb2f28 1168#: sequencer.c:211 sequencer.c:856 sequencer.c:939
c04f5ac3
JX
1169#, c-format
1170msgid "Could not write to %s"
1171msgstr "不能写入 %s"
1172
220c313c 1173#: sequencer.c:214
c04f5ac3
JX
1174#, c-format
1175msgid "Error wrapping up %s"
1176msgstr "错误收尾 %s"
1177
220c313c 1178#: sequencer.c:229
c04f5ac3
JX
1179msgid "Your local changes would be overwritten by cherry-pick."
1180msgstr "您的本地修改将被拣选操作覆盖。"
1181
220c313c 1182#: sequencer.c:231
c04f5ac3
JX
1183msgid "Your local changes would be overwritten by revert."
1184msgstr "您的本地修改将被还原操作覆盖。"
1185
220c313c 1186#: sequencer.c:234
c04f5ac3
JX
1187msgid "Commit your changes or stash them to proceed."
1188msgstr "提交您的修改或保存进度后再继续。"
1189
1190#. TRANSLATORS: %s will be "revert" or "cherry-pick"
04cb2f28 1191#: sequencer.c:321
c04f5ac3
JX
1192#, c-format
1193msgid "%s: Unable to write new index file"
90e6ef53 1194msgstr "%s:无法写入新索引文件"
c04f5ac3 1195
04cb2f28 1196#: sequencer.c:339
8ada9598 1197msgid "Could not resolve HEAD commit\n"
81809b99 1198msgstr "不能解析 HEAD 提交\n"
8ada9598 1199
04cb2f28 1200#: sequencer.c:359
8ada9598 1201msgid "Unable to update cache tree\n"
81809b99 1202msgstr "不能更新缓存\n"
8ada9598 1203
04cb2f28 1204#: sequencer.c:406
81809b99 1205#, c-format
8ada9598 1206msgid "Could not parse commit %s\n"
81809b99 1207msgstr "不能解析提交 %s\n"
8ada9598 1208
04cb2f28 1209#: sequencer.c:411
81809b99 1210#, c-format
8ada9598 1211msgid "Could not parse parent commit %s\n"
81809b99 1212msgstr "不能解析父提交 %s\n"
8ada9598 1213
04cb2f28 1214#: sequencer.c:477
c04f5ac3 1215msgid "Your index file is unmerged."
90e6ef53 1216msgstr "您的索引文件未完成合并。"
c04f5ac3 1217
04cb2f28 1218#: sequencer.c:496
c04f5ac3
JX
1219#, c-format
1220msgid "Commit %s is a merge but no -m option was given."
1221msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1222
04cb2f28 1223#: sequencer.c:504
c04f5ac3
JX
1224#, c-format
1225msgid "Commit %s does not have parent %d"
1226msgstr "提交 %s 没有父提交 %d"
1227
04cb2f28 1228#: sequencer.c:508
c04f5ac3
JX
1229#, c-format
1230msgid "Mainline was specified but commit %s is not a merge."
90e6ef53 1231msgstr "指定了主线但提交 %s 不是一个合并。"
c04f5ac3
JX
1232
1233#. TRANSLATORS: The first %s will be "revert" or
1234#. "cherry-pick", the second %s a SHA1
04cb2f28 1235#: sequencer.c:521
c04f5ac3
JX
1236#, c-format
1237msgid "%s: cannot parse parent commit %s"
1238msgstr "%s:不能解析父提交 %s"
1239
04cb2f28 1240#: sequencer.c:525
c04f5ac3
JX
1241#, c-format
1242msgid "Cannot get commit message for %s"
1243msgstr "不能得到 %s 的提交说明"
1244
04cb2f28 1245#: sequencer.c:611
c04f5ac3
JX
1246#, c-format
1247msgid "could not revert %s... %s"
1248msgstr "不能还原 %s... %s"
1249
04cb2f28 1250#: sequencer.c:612
c04f5ac3
JX
1251#, c-format
1252msgid "could not apply %s... %s"
1253msgstr "不能应用 %s... %s"
1254
04cb2f28 1255#: sequencer.c:648
c04f5ac3
JX
1256msgid "empty commit set passed"
1257msgstr "提供了空的提交集"
1258
04cb2f28 1259#: sequencer.c:656
c04f5ac3
JX
1260#, c-format
1261msgid "git %s: failed to read the index"
90e6ef53 1262msgstr "git %s:无法读取索引"
c04f5ac3 1263
04cb2f28 1264#: sequencer.c:660
c04f5ac3
JX
1265#, c-format
1266msgid "git %s: failed to refresh the index"
90e6ef53 1267msgstr "git %s:无法刷新索引"
c04f5ac3 1268
04cb2f28 1269#: sequencer.c:720
c04f5ac3
JX
1270#, c-format
1271msgid "Cannot %s during a %s"
90e6ef53 1272msgstr "无法 %s 在一个 %s 过程中"
c04f5ac3 1273
04cb2f28 1274#: sequencer.c:742
c04f5ac3
JX
1275#, c-format
1276msgid "Could not parse line %d."
90e6ef53 1277msgstr "不能解析第 %d 行。"
c04f5ac3 1278
04cb2f28 1279#: sequencer.c:747
c04f5ac3 1280msgid "No commits parsed."
7e238ab7 1281msgstr "没有提交被解析。"
c04f5ac3 1282
04cb2f28 1283#: sequencer.c:760
c04f5ac3
JX
1284#, c-format
1285msgid "Could not open %s"
1286msgstr "不能打开 %s"
1287
04cb2f28 1288#: sequencer.c:764
c04f5ac3
JX
1289#, c-format
1290msgid "Could not read %s."
1291msgstr "不能读取 %s。"
1292
04cb2f28 1293#: sequencer.c:771
c04f5ac3
JX
1294#, c-format
1295msgid "Unusable instruction sheet: %s"
1296msgstr "无用的指令表单:%s"
1297
04cb2f28 1298#: sequencer.c:801
c04f5ac3
JX
1299#, c-format
1300msgid "Invalid key: %s"
1301msgstr "无效键名:%s"
1302
04cb2f28 1303#: sequencer.c:804
c04f5ac3
JX
1304#, c-format
1305msgid "Invalid value for %s: %s"
81809b99 1306msgstr "%s 的值无效:%s"
c04f5ac3 1307
04cb2f28 1308#: sequencer.c:816
c04f5ac3
JX
1309#, c-format
1310msgid "Malformed options sheet: %s"
1311msgstr "非法的选项表单:%s"
1312
04cb2f28 1313#: sequencer.c:837
c04f5ac3
JX
1314msgid "a cherry-pick or revert is already in progress"
1315msgstr "一个拣选或还原操作已在进行"
1316
04cb2f28 1317#: sequencer.c:838
c04f5ac3
JX
1318msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1319msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1320
04cb2f28 1321#: sequencer.c:842
c04f5ac3
JX
1322#, c-format
1323msgid "Could not create sequencer directory %s"
90e6ef53 1324msgstr "不能创建序列目录 %s"
c04f5ac3 1325
04cb2f28 1326#: sequencer.c:858 sequencer.c:943
c04f5ac3
JX
1327#, c-format
1328msgid "Error wrapping up %s."
1329msgstr "错误收尾 %s。"
1330
04cb2f28 1331#: sequencer.c:877 sequencer.c:1013
c04f5ac3 1332msgid "no cherry-pick or revert in progress"
195febda 1333msgstr "拣选或还原操作并未进行"
c04f5ac3 1334
04cb2f28 1335#: sequencer.c:879
c04f5ac3
JX
1336msgid "cannot resolve HEAD"
1337msgstr "不能解析 HEAD"
1338
04cb2f28 1339#: sequencer.c:881
c04f5ac3 1340msgid "cannot abort from a branch yet to be born"
90e6ef53 1341msgstr "不能从尚未建立的分支终止"
c04f5ac3 1342
04cb2f28 1343#: sequencer.c:903 builtin/apply.c:4128
c04f5ac3
JX
1344#, c-format
1345msgid "cannot open %s: %s"
1346msgstr "不能打开 %s:%s"
1347
04cb2f28 1348#: sequencer.c:906
c04f5ac3
JX
1349#, c-format
1350msgid "cannot read %s: %s"
1351msgstr "不能读取 %s:%s"
1352
04cb2f28 1353#: sequencer.c:907
c04f5ac3 1354msgid "unexpected end of file"
9aafc933 1355msgstr "意外的文件结束"
c04f5ac3 1356
04cb2f28 1357#: sequencer.c:913
c04f5ac3
JX
1358#, c-format
1359msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
90e6ef53 1360msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
c04f5ac3 1361
04cb2f28 1362#: sequencer.c:936
c04f5ac3
JX
1363#, c-format
1364msgid "Could not format %s."
1365msgstr "不能格式化 %s。"
1366
04cb2f28 1367#: sequencer.c:1081
4dcdc3d8
JX
1368#, c-format
1369msgid "%s: can't cherry-pick a %s"
1370msgstr "%s:不能拣选一个%s"
1371
04cb2f28 1372#: sequencer.c:1084
4dcdc3d8
JX
1373#, c-format
1374msgid "%s: bad revision"
1375msgstr "%s:错误的版本"
1376
04cb2f28 1377#: sequencer.c:1118
c04f5ac3
JX
1378msgid "Can't revert as initial commit"
1379msgstr "不能作为初始提交还原"
1380
04cb2f28 1381#: sequencer.c:1119
c04f5ac3
JX
1382msgid "Can't cherry-pick into empty head"
1383msgstr "不能拣选到空分支"
1384
220c313c 1385#: sha1_name.c:440
2e8451e8
JX
1386msgid ""
1387"Git normally never creates a ref that ends with 40 hex characters\n"
1388"because it will be ignored when you just specify 40-hex. These refs\n"
1389"may be created by mistake. For example,\n"
1390"\n"
1391" git checkout -b $br $(git rev-parse ...)\n"
1392"\n"
1393"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1394"examine these refs and maybe delete them. Turn this message off by\n"
b1894384 1395"running \"git config advice.objectNameWarning false\""
2e8451e8
JX
1396msgstr ""
1397"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1398"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1399"\n"
1400" git checkout -b $br $(git rev-parse ...)\n"
1401"\n"
1402"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
b1894384 1403"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
2e8451e8
JX
1404"命令关闭本消息通知。"
1405
220c313c 1406#: sha1_name.c:1068
170e9899
JX
1407msgid "HEAD does not point to a branch"
1408msgstr "HEAD 没有指向一个分支"
1409
220c313c 1410#: sha1_name.c:1071
170e9899
JX
1411#, c-format
1412msgid "No such branch: '%s'"
1413msgstr "没有此分支:'%s'"
1414
220c313c 1415#: sha1_name.c:1073
170e9899
JX
1416#, c-format
1417msgid "No upstream configured for branch '%s'"
1418msgstr "尚未给分支 '%s' 设置上游"
1419
220c313c 1420#: sha1_name.c:1077
170e9899
JX
1421#, c-format
1422msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1423msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1424
90314792
JX
1425#: submodule.c:64 submodule.c:98
1426msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
1427msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
1428
1429#: submodule.c:68 submodule.c:102
1430#, c-format
1431msgid "Could not find section in .gitmodules where path=%s"
1432msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
1433
90314792
JX
1434#: submodule.c:76
1435#, c-format
1436msgid "Could not update .gitmodules entry %s"
1437msgstr "不能更新 .gitmodules 条目 %s"
1438
90314792
JX
1439#: submodule.c:109
1440#, c-format
1441msgid "Could not remove .gitmodules entry for %s"
1442msgstr "无法移除 %s 的 .gitmodules 条目"
1443
6c94aba5 1444#: submodule.c:120
90314792
JX
1445msgid "staging updated .gitmodules failed"
1446msgstr "将更新后 .gitmodules 添加暂存区失败"
1447
04cb2f28 1448#: submodule.c:1111 builtin/init-db.c:371
90314792
JX
1449#, c-format
1450msgid "Could not create git link %s"
1451msgstr "不能创建 git link %s"
1452
220c313c 1453#: submodule.c:1122
90314792
JX
1454#, c-format
1455msgid "Could not set core.worktree in %s"
1456msgstr "不能在 %s 中设置 core.worktree"
1457
04cb2f28
JX
1458#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566
1459#: trailer.c:570
220c313c
JX
1460#, c-format
1461msgid "unknown value '%s' for key '%s'"
1462msgstr "键 '%2$s' 的未知取值 '%1$s'"
1463
04cb2f28 1464#: trailer.c:552 trailer.c:557 builtin/remote.c:288
220c313c
JX
1465#, c-format
1466msgid "more than one %s"
1467msgstr "多于一个 %s"
1468
04cb2f28 1469#: trailer.c:590
220c313c 1470#, c-format
9aeb4c2b
JX
1471msgid "empty trailer token in trailer '%.*s'"
1472msgstr "签名 '%.*s' 的键为空"
220c313c 1473
04cb2f28 1474#: trailer.c:710
220c313c
JX
1475#, c-format
1476msgid "could not read input file '%s'"
1477msgstr "不能读取输入文件 '%s'"
1478
04cb2f28 1479#: trailer.c:713
220c313c
JX
1480msgid "could not read from stdin"
1481msgstr "不能自标准输入读取"
1482
6acbf033 1483#: unpack-trees.c:202
6c94aba5
JX
1484msgid "Checking out files"
1485msgstr "正在检出文件"
1486
90314792
JX
1487#: urlmatch.c:120
1488msgid "invalid URL scheme name or missing '://' suffix"
1489msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
1490
1491#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
1492#, c-format
1493msgid "invalid %XX escape sequence"
1494msgstr "无效的 %XX 转义序列"
1495
1496#: urlmatch.c:172
1497msgid "missing host and scheme is not 'file:'"
1498msgstr "缺失主机名且URL方案不是 'file:'"
1499
1500#: urlmatch.c:189
1501msgid "a 'file:' URL may not have a port number"
1502msgstr "一个 'file:' URL 不应该包含端口号"
1503
1504#: urlmatch.c:199
1505msgid "invalid characters in host name"
1506msgstr "主机名中包含无效的字符"
1507
1508#: urlmatch.c:244 urlmatch.c:255
1509msgid "invalid port number"
1510msgstr "无效的端口号"
1511
1512#: urlmatch.c:322
1513msgid "invalid '..' path segment"
1514msgstr "无效的 '..' 路径片段"
1515
220c313c 1516#: wrapper.c:509
07432cef 1517#, c-format
ef317cd5 1518msgid "unable to access '%s': %s"
07432cef
WS
1519msgstr "不能访问 '%s':%s"
1520
220c313c 1521#: wrapper.c:530
07432cef
WS
1522#, c-format
1523msgid "unable to access '%s'"
1524msgstr "不能访问 '%s'"
ef317cd5 1525
220c313c 1526#: wrapper.c:541
d691f479
JX
1527#, c-format
1528msgid "unable to look up current user in the passwd file: %s"
07432cef 1529msgstr "无法在口令文件中查询到当前用户:%s"
d691f479 1530
220c313c 1531#: wrapper.c:542
d691f479
JX
1532msgid "no such user"
1533msgstr "无此用户"
1534
220c313c
JX
1535#: wrapper.c:550
1536msgid "unable to get current working directory"
1537msgstr "不能获取当前工作目录"
1538
cfff71a9 1539#: wt-status.c:150
c04f5ac3
JX
1540msgid "Unmerged paths:"
1541msgstr "未合并的路径:"
1542
90e6ef53 1543# 译者:注意保持前导空格
cfff71a9 1544#: wt-status.c:177 wt-status.c:204
c04f5ac3
JX
1545#, c-format
1546msgid " (use \"git reset %s <file>...\" to unstage)"
1547msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
1548
90e6ef53 1549# 译者:注意保持前导空格
cfff71a9 1550#: wt-status.c:179 wt-status.c:206
c04f5ac3
JX
1551msgid " (use \"git rm --cached <file>...\" to unstage)"
1552msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1553
90e6ef53 1554# 译者:注意保持前导空格
cfff71a9 1555#: wt-status.c:183
6792b93b
JX
1556msgid " (use \"git add <file>...\" to mark resolution)"
1557msgstr " (使用 \"git add <file>...\" 标记解决方案)"
1558
1559# 译者:注意保持前导空格
cfff71a9 1560#: wt-status.c:185 wt-status.c:189
c04f5ac3
JX
1561msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1562msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1563
6792b93b 1564# 译者:注意保持前导空格
cfff71a9 1565#: wt-status.c:187
6792b93b
JX
1566msgid " (use \"git rm <file>...\" to mark resolution)"
1567msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
1568
cfff71a9 1569#: wt-status.c:198
c04f5ac3
JX
1570msgid "Changes to be committed:"
1571msgstr "要提交的变更:"
1572
cfff71a9 1573#: wt-status.c:216
c04f5ac3 1574msgid "Changes not staged for commit:"
7e238ab7 1575msgstr "尚未暂存以备提交的变更:"
c04f5ac3 1576
90e6ef53 1577# 译者:注意保持前导空格
cfff71a9 1578#: wt-status.c:220
c04f5ac3
JX
1579msgid " (use \"git add <file>...\" to update what will be committed)"
1580msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
1581
90e6ef53 1582# 译者:注意保持前导空格
cfff71a9 1583#: wt-status.c:222
c04f5ac3
JX
1584msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1585msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1586
90e6ef53 1587# 译者:注意保持前导空格
cfff71a9 1588#: wt-status.c:223
c04f5ac3
JX
1589msgid ""
1590" (use \"git checkout -- <file>...\" to discard changes in working directory)"
1591msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1592
90e6ef53 1593# 译者:注意保持前导空格
cfff71a9 1594#: wt-status.c:225
c04f5ac3
JX
1595msgid " (commit or discard the untracked or modified content in submodules)"
1596msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1597
90e6ef53 1598# 译者:注意保持前导空格
cfff71a9 1599#: wt-status.c:237
c04f5ac3
JX
1600#, c-format
1601msgid " (use \"git %s <file>...\" to include in what will be committed)"
90e6ef53 1602msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
c04f5ac3 1603
6c94aba5 1604#: wt-status.c:252
c04f5ac3
JX
1605msgid "both deleted:"
1606msgstr "双方删除:"
1607
6c94aba5 1608#: wt-status.c:254
c04f5ac3
JX
1609msgid "added by us:"
1610msgstr "由我们添加:"
1611
6c94aba5 1612#: wt-status.c:256
c04f5ac3
JX
1613msgid "deleted by them:"
1614msgstr "由他们删除:"
1615
6c94aba5 1616#: wt-status.c:258
c04f5ac3
JX
1617msgid "added by them:"
1618msgstr "由他们添加:"
1619
6c94aba5 1620#: wt-status.c:260
c04f5ac3
JX
1621msgid "deleted by us:"
1622msgstr "由我们删除:"
1623
6c94aba5 1624#: wt-status.c:262
c04f5ac3
JX
1625msgid "both added:"
1626msgstr "双方添加:"
1627
6c94aba5 1628#: wt-status.c:264
c04f5ac3
JX
1629msgid "both modified:"
1630msgstr "双方修改:"
1631
6c94aba5
JX
1632#: wt-status.c:266
1633#, c-format
1634msgid "bug: unhandled unmerged status %x"
1635msgstr "bug:无法处理的未合并状态 %x"
cfff71a9 1636
6c94aba5
JX
1637#: wt-status.c:274
1638msgid "new file:"
1639msgstr "新文件:"
cfff71a9 1640
6c94aba5
JX
1641#: wt-status.c:276
1642msgid "copied:"
1643msgstr "拷贝:"
cfff71a9 1644
6c94aba5
JX
1645#: wt-status.c:278
1646msgid "deleted:"
1647msgstr "删除:"
cfff71a9 1648
6c94aba5
JX
1649#: wt-status.c:280
1650msgid "modified:"
1651msgstr "修改:"
1652
1653#: wt-status.c:282
1654msgid "renamed:"
1655msgstr "重命名:"
1656
1657#: wt-status.c:284
1658msgid "typechange:"
1659msgstr "类型变更:"
1660
1661#: wt-status.c:286
1662msgid "unknown:"
1663msgstr "未知:"
cfff71a9 1664
6c94aba5
JX
1665#: wt-status.c:288
1666msgid "unmerged:"
1667msgstr "未合并:"
cfff71a9 1668
90e6ef53 1669# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6c94aba5 1670#: wt-status.c:370
c04f5ac3 1671msgid "new commits, "
aa9565f7 1672msgstr "新提交, "
c04f5ac3 1673
90e6ef53 1674# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6c94aba5 1675#: wt-status.c:372
c04f5ac3 1676msgid "modified content, "
aa9565f7 1677msgstr "修改的内容, "
c04f5ac3 1678
90e6ef53 1679# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
6c94aba5 1680#: wt-status.c:374
c04f5ac3 1681msgid "untracked content, "
aa9565f7 1682msgstr "未跟踪的内容, "
c04f5ac3 1683
6c94aba5 1684#: wt-status.c:391
c04f5ac3
JX
1685#, c-format
1686msgid "bug: unhandled diff status %c"
6c94aba5 1687msgstr "bug:无法处理的差异状态 %c"
c04f5ac3 1688
04cb2f28 1689#: wt-status.c:758
90314792
JX
1690msgid "Submodules changed but not updated:"
1691msgstr "子模组已修改但尚未更新:"
1692
04cb2f28 1693#: wt-status.c:760
90314792
JX
1694msgid "Submodule changes to be committed:"
1695msgstr "要提交的子模组变更:"
1696
04cb2f28 1697#: wt-status.c:839
cfff71a9
JX
1698msgid ""
1699"Do not touch the line above.\n"
1700"Everything below will be removed."
1701msgstr ""
1702"不要改动上面的一行。\n"
1703"下面的所有内容均将被删除。"
1704
04cb2f28 1705#: wt-status.c:930
6792b93b 1706msgid "You have unmerged paths."
195febda 1707msgstr "您有尚未合并的路径。"
6792b93b
JX
1708
1709# 译者:注意保持前导空格
04cb2f28 1710#: wt-status.c:933
6792b93b
JX
1711msgid " (fix conflicts and run \"git commit\")"
1712msgstr " (解决冲突并运行 \"git commit\")"
1713
04cb2f28 1714#: wt-status.c:936
6792b93b
JX
1715msgid "All conflicts fixed but you are still merging."
1716msgstr "所有冲突已解决但您仍处于合并中。"
1717
1718# 译者:注意保持前导空格
04cb2f28 1719#: wt-status.c:939
6792b93b
JX
1720msgid " (use \"git commit\" to conclude merge)"
1721msgstr " (使用 \"git commit\" 结束合并)"
1722
04cb2f28 1723#: wt-status.c:949
6792b93b 1724msgid "You are in the middle of an am session."
98b2761d 1725msgstr "您正处于 am 操作过程中。"
6792b93b 1726
04cb2f28 1727#: wt-status.c:952
6792b93b
JX
1728msgid "The current patch is empty."
1729msgstr "当前的补丁为空。"
1730
1731# 译者:注意保持前导空格
04cb2f28 1732#: wt-status.c:956
2e8451e8
JX
1733msgid " (fix conflicts and then run \"git am --continue\")"
1734msgstr " (解决冲突,然后运行 \"git am --continue\")"
6792b93b
JX
1735
1736# 译者:注意保持前导空格
04cb2f28 1737#: wt-status.c:958
6792b93b
JX
1738msgid " (use \"git am --skip\" to skip this patch)"
1739msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1740
1741# 译者:注意保持前导空格
04cb2f28 1742#: wt-status.c:960
6792b93b
JX
1743msgid " (use \"git am --abort\" to restore the original branch)"
1744msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1745
04cb2f28 1746#: wt-status.c:1020 wt-status.c:1037
63af42fe
JX
1747#, c-format
1748msgid "You are currently rebasing branch '%s' on '%s'."
98b2761d 1749msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
63af42fe 1750
04cb2f28 1751#: wt-status.c:1025 wt-status.c:1042
6792b93b 1752msgid "You are currently rebasing."
98b2761d 1753msgstr "您在执行变基操作。"
6792b93b
JX
1754
1755# 译者:注意保持前导空格
04cb2f28 1756#: wt-status.c:1028
6792b93b
JX
1757msgid " (fix conflicts and then run \"git rebase --continue\")"
1758msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1759
1760# 译者:注意保持前导空格
04cb2f28 1761#: wt-status.c:1030
6792b93b
JX
1762msgid " (use \"git rebase --skip\" to skip this patch)"
1763msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1764
1765# 译者:注意保持前导空格
04cb2f28 1766#: wt-status.c:1032
6792b93b
JX
1767msgid " (use \"git rebase --abort\" to check out the original branch)"
1768msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1769
1770# 译者:注意保持前导空格
04cb2f28 1771#: wt-status.c:1045
6792b93b
JX
1772msgid " (all conflicts fixed: run \"git rebase --continue\")"
1773msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1774
04cb2f28 1775#: wt-status.c:1049
63af42fe
JX
1776#, c-format
1777msgid ""
1778"You are currently splitting a commit while rebasing branch '%s' on '%s'."
98b2761d 1779msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
63af42fe 1780
04cb2f28 1781#: wt-status.c:1054
6792b93b 1782msgid "You are currently splitting a commit during a rebase."
98b2761d 1783msgstr "您在执行变基操作时拆分提交。"
6792b93b
JX
1784
1785# 译者:注意保持前导空格
04cb2f28 1786#: wt-status.c:1057
6792b93b
JX
1787msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1788msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1789
04cb2f28 1790#: wt-status.c:1061
63af42fe
JX
1791#, c-format
1792msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
98b2761d 1793msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
63af42fe 1794
04cb2f28 1795#: wt-status.c:1066
6792b93b 1796msgid "You are currently editing a commit during a rebase."
98b2761d 1797msgstr "您在执行变基操作时编辑提交。"
6792b93b
JX
1798
1799# 译者:注意保持前导空格
04cb2f28 1800#: wt-status.c:1069
6792b93b
JX
1801msgid " (use \"git commit --amend\" to amend the current commit)"
1802msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1803
1804# 译者:注意保持前导空格
04cb2f28 1805#: wt-status.c:1071
6792b93b
JX
1806msgid ""
1807" (use \"git rebase --continue\" once you are satisfied with your changes)"
195febda 1808msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
6792b93b 1809
04cb2f28 1810#: wt-status.c:1081
90314792
JX
1811#, c-format
1812msgid "You are currently cherry-picking commit %s."
98b2761d 1813msgstr "您在执行拣选提交 %s 的操作。"
6792b93b 1814
2e8451e8 1815# 译者:注意保持前导空格
04cb2f28 1816#: wt-status.c:1086
2e8451e8
JX
1817msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1818msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1819
6792b93b 1820# 译者:注意保持前导空格
04cb2f28 1821#: wt-status.c:1089
2e8451e8
JX
1822msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1823msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
6792b93b 1824
2e8451e8 1825# 译者:注意保持前导空格
04cb2f28 1826#: wt-status.c:1091
2e8451e8
JX
1827msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1828msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1829
04cb2f28 1830#: wt-status.c:1100
1003b3a5
JX
1831#, c-format
1832msgid "You are currently reverting commit %s."
98b2761d 1833msgstr "您在执行反转提交 %s 的操作。"
1003b3a5
JX
1834
1835# 译者:注意保持前导空格
04cb2f28 1836#: wt-status.c:1105
1003b3a5
JX
1837msgid " (fix conflicts and run \"git revert --continue\")"
1838msgstr " (解决冲突并运行 \"git revert --continue\")"
1839
1840# 译者:注意保持前导空格
04cb2f28 1841#: wt-status.c:1108
1003b3a5
JX
1842msgid " (all conflicts fixed: run \"git revert --continue\")"
1843msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1844
1845# 译者:注意保持前导空格
04cb2f28 1846#: wt-status.c:1110
1003b3a5
JX
1847msgid " (use \"git revert --abort\" to cancel the revert operation)"
1848msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1849
04cb2f28 1850#: wt-status.c:1121
63af42fe 1851#, c-format
1003b3a5 1852msgid "You are currently bisecting, started from branch '%s'."
98b2761d 1853msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
63af42fe 1854
04cb2f28 1855#: wt-status.c:1125
6792b93b 1856msgid "You are currently bisecting."
98b2761d 1857msgstr "您在执行二分查找操作。"
6792b93b
JX
1858
1859# 译者:注意保持前导空格
04cb2f28 1860#: wt-status.c:1128
6792b93b
JX
1861msgid " (use \"git bisect reset\" to get back to the original branch)"
1862msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1863
04cb2f28 1864#: wt-status.c:1303
c04f5ac3
JX
1865msgid "On branch "
1866msgstr "位于分支 "
1867
04cb2f28 1868#: wt-status.c:1310
2e8451e8 1869msgid "rebase in progress; onto "
98b2761d 1870msgstr "变基操作正在进行中;至 "
2e8451e8 1871
04cb2f28 1872#: wt-status.c:1317
1003b3a5
JX
1873msgid "HEAD detached at "
1874msgstr "头指针分离于 "
1875
04cb2f28 1876#: wt-status.c:1319
1003b3a5
JX
1877msgid "HEAD detached from "
1878msgstr "头指针分离自 "
1879
04cb2f28 1880#: wt-status.c:1322
c04f5ac3
JX
1881msgid "Not currently on any branch."
1882msgstr "当前不在任何分支上。"
1883
04cb2f28 1884#: wt-status.c:1339
c04f5ac3
JX
1885msgid "Initial commit"
1886msgstr "初始提交"
1887
04cb2f28 1888#: wt-status.c:1353
ef317cd5 1889msgid "Untracked files"
07432cef 1890msgstr "未跟踪的文件"
c04f5ac3 1891
04cb2f28 1892#: wt-status.c:1355
ef317cd5 1893msgid "Ignored files"
07432cef 1894msgstr "忽略的文件"
c04f5ac3 1895
04cb2f28 1896#: wt-status.c:1359
1003b3a5 1897#, c-format
4dcdc3d8
JX
1898msgid ""
1899"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1900"may speed it up, but you have to be careful not to forget to add\n"
1901"new files yourself (see 'git help status')."
1902msgstr ""
1903"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
1904"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1003b3a5 1905
04cb2f28 1906#: wt-status.c:1365
c04f5ac3
JX
1907#, c-format
1908msgid "Untracked files not listed%s"
1909msgstr "未跟踪的文件没有列出%s"
1910
7e238ab7 1911# 译者:中文字符串拼接,可删除前导空格
04cb2f28 1912#: wt-status.c:1367
c04f5ac3 1913msgid " (use -u option to show untracked files)"
7e238ab7 1914msgstr "(使用 -u 参数显示未跟踪的文件)"
c04f5ac3 1915
04cb2f28 1916#: wt-status.c:1373
c04f5ac3
JX
1917msgid "No changes"
1918msgstr "没有修改"
1919
04cb2f28 1920#: wt-status.c:1378
07432cef 1921#, c-format
ef317cd5 1922msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
07432cef 1923msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
c04f5ac3 1924
04cb2f28 1925#: wt-status.c:1381
07432cef 1926#, c-format
ef317cd5 1927msgid "no changes added to commit\n"
07432cef 1928msgstr "修改尚未加入提交\n"
c04f5ac3 1929
04cb2f28 1930#: wt-status.c:1384
07432cef 1931#, c-format
ef317cd5
JX
1932msgid ""
1933"nothing added to commit but untracked files present (use \"git add\" to "
1934"track)\n"
07432cef 1935msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
c04f5ac3 1936
04cb2f28 1937#: wt-status.c:1387
07432cef 1938#, c-format
ef317cd5 1939msgid "nothing added to commit but untracked files present\n"
07432cef 1940msgstr "提交为空,但是存在尚未跟踪的文件\n"
c04f5ac3 1941
7e238ab7 1942# 译者:中文字符串拼接,可删除前导空格
04cb2f28 1943#: wt-status.c:1390
07432cef 1944#, c-format
ef317cd5 1945msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
07432cef 1946msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
c04f5ac3 1947
04cb2f28 1948#: wt-status.c:1393 wt-status.c:1398
07432cef 1949#, c-format
ef317cd5 1950msgid "nothing to commit\n"
07432cef 1951msgstr "无文件要提交\n"
ef317cd5 1952
7e238ab7 1953# 译者:中文字符串拼接,可删除前导空格
04cb2f28 1954#: wt-status.c:1396
07432cef 1955#, c-format
ef317cd5 1956msgid "nothing to commit (use -u to show untracked files)\n"
07432cef 1957msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
c04f5ac3 1958
7e238ab7 1959# 译者:中文字符串拼接,可删除前导空格
04cb2f28 1960#: wt-status.c:1400
07432cef 1961#, c-format
ef317cd5 1962msgid "nothing to commit, working directory clean\n"
07432cef 1963msgstr "无文件要提交,干净的工作区\n"
c04f5ac3 1964
04cb2f28 1965#: wt-status.c:1509
c04f5ac3 1966msgid "HEAD (no branch)"
61bc0753 1967msgstr "HEAD(非分支)"
c04f5ac3 1968
90e6ef53 1969# 译者:注意保持句尾空格
04cb2f28 1970#: wt-status.c:1515
c04f5ac3
JX
1971msgid "Initial commit on "
1972msgstr "初始提交于 "
1973
04cb2f28 1974#: wt-status.c:1547
90314792
JX
1975msgid "gone"
1976msgstr "丢失"
1977
90e6ef53 1978# 译者:注意保持句尾空格
04cb2f28 1979#: wt-status.c:1549 wt-status.c:1557
c04f5ac3
JX
1980msgid "behind "
1981msgstr "落后 "
1982
04cb2f28 1983#: compat/precompose_utf8.c:55 builtin/clone.c:360
a77c07d9
JX
1984#, c-format
1985msgid "failed to unlink '%s'"
1986msgstr "无法删除 '%s'"
1987
220c313c 1988#: builtin/add.c:22
a77c07d9 1989msgid "git add [options] [--] <pathspec>..."
90314792 1990msgstr "git add [选项] [--] <路径规则>..."
ef317cd5 1991
220c313c 1992#: builtin/add.c:65
c04f5ac3
JX
1993#, c-format
1994msgid "unexpected diff status %c"
1995msgstr "意外的差异状态 %c"
1996
220c313c 1997#: builtin/add.c:70 builtin/commit.c:275
c04f5ac3
JX
1998msgid "updating files failed"
1999msgstr "更新文件失败"
2000
220c313c 2001#: builtin/add.c:80
c04f5ac3
JX
2002#, c-format
2003msgid "remove '%s'\n"
2004msgstr "删除 '%s'\n"
2005
220c313c 2006#: builtin/add.c:134
c04f5ac3 2007msgid "Unstaged changes after refreshing the index:"
90e6ef53 2008msgstr "刷新索引之后尚未被暂存的变更:"
c04f5ac3 2009
220c313c 2010#: builtin/add.c:194 builtin/rev-parse.c:785
c04f5ac3 2011msgid "Could not read the index"
90e6ef53 2012msgstr "不能读取索引"
c04f5ac3 2013
220c313c 2014#: builtin/add.c:205
c04f5ac3
JX
2015#, c-format
2016msgid "Could not open '%s' for writing."
195febda 2017msgstr "不能打开 '%s' 以写入。"
c04f5ac3 2018
220c313c 2019#: builtin/add.c:209
c04f5ac3 2020msgid "Could not write patch"
195febda 2021msgstr "不能生成补丁"
c04f5ac3 2022
220c313c 2023#: builtin/add.c:214
c04f5ac3
JX
2024#, c-format
2025msgid "Could not stat '%s'"
90e6ef53 2026msgstr "不能查看文件状态 '%s'"
c04f5ac3 2027
220c313c 2028#: builtin/add.c:216
c04f5ac3
JX
2029msgid "Empty patch. Aborted."
2030msgstr "空补丁。异常终止。"
2031
6c94aba5 2032#: builtin/add.c:221
8ada9598
JX
2033#, c-format
2034msgid "Could not apply '%s'"
2035msgstr "不能应用 '%s'"
2036
6c94aba5 2037#: builtin/add.c:231
8ada9598 2038msgid "The following paths are ignored by one of your .gitignore files:\n"
195febda 2039msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 2040
220c313c 2041#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110
04cb2f28 2042#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1370
90314792 2043#: builtin/rm.c:269
ef317cd5 2044msgid "dry run"
07432cef 2045msgstr "演习"
ef317cd5 2046
220c313c 2047#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19
04cb2f28 2048#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608
220c313c 2049#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
ef317cd5
JX
2050msgid "be verbose"
2051msgstr "冗长输出"
2052
6c94aba5 2053#: builtin/add.c:251
ef317cd5 2054msgid "interactive picking"
07432cef 2055msgstr "交互式拣选"
ef317cd5 2056
04cb2f28 2057#: builtin/add.c:252 builtin/checkout.c:1126 builtin/reset.c:286
ef317cd5 2058msgid "select hunks interactively"
07432cef 2059msgstr "交互式挑选数据块"
ef317cd5 2060
6c94aba5 2061#: builtin/add.c:253
ef317cd5 2062msgid "edit current diff and apply"
07432cef 2063msgstr "编辑当前差异并应用"
ef317cd5 2064
6c94aba5 2065#: builtin/add.c:254
ef317cd5 2066msgid "allow adding otherwise ignored files"
07432cef 2067msgstr "允许添加忽略的文件"
ef317cd5 2068
6c94aba5 2069#: builtin/add.c:255
ef317cd5 2070msgid "update tracked files"
07432cef 2071msgstr "更新已跟踪的文件"
ef317cd5 2072
6c94aba5 2073#: builtin/add.c:256
ef317cd5 2074msgid "record only the fact that the path will be added later"
07432cef 2075msgstr "只记录,该路径稍后再添加"
ef317cd5 2076
6c94aba5 2077#: builtin/add.c:257
ef317cd5 2078msgid "add changes from all tracked and untracked files"
07432cef 2079msgstr "添加所有改变的已跟踪文件和未跟踪文件"
ef317cd5 2080
6c94aba5 2081#: builtin/add.c:260
4dcdc3d8
JX
2082msgid "ignore paths removed in the working tree (same as --no-all)"
2083msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
2084
6c94aba5 2085#: builtin/add.c:262
ef317cd5 2086msgid "don't add, only refresh the index"
07432cef 2087msgstr "不添加,只刷新索引"
ef317cd5 2088
6c94aba5 2089#: builtin/add.c:263
ef317cd5 2090msgid "just skip files which cannot be added because of errors"
07432cef 2091msgstr "跳过因出错不能添加的文件"
ef317cd5 2092
6c94aba5 2093#: builtin/add.c:264
ef317cd5 2094msgid "check if - even missing - files are ignored in dry run"
07432cef 2095msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
ef317cd5 2096
6c94aba5 2097#: builtin/add.c:286
8ada9598
JX
2098#, c-format
2099msgid "Use -f if you really want to add them.\n"
2100msgstr "使用 -f 参数如果您确实要添加它们。\n"
2101
6c94aba5 2102#: builtin/add.c:293
8ada9598
JX
2103msgid "adding files failed"
2104msgstr "添加文件失败"
2105
6acbf033 2106#: builtin/add.c:329
8ada9598
JX
2107msgid "-A and -u are mutually incompatible"
2108msgstr "-A 和 -u 选项互斥"
2109
6acbf033 2110#: builtin/add.c:336
8ada9598 2111msgid "Option --ignore-missing can only be used together with --dry-run"
649900bc 2112msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 2113
6acbf033 2114#: builtin/add.c:357
8ada9598
JX
2115#, c-format
2116msgid "Nothing specified, nothing added.\n"
2117msgstr "没有指定文件,也没有文件被添加。\n"
2118
6acbf033 2119#: builtin/add.c:358
8ada9598
JX
2120#, c-format
2121msgid "Maybe you wanted to say 'git add .'?\n"
2122msgstr "也许您想要执行 'git add .'?\n"
2123
6acbf033 2124#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919
220c313c 2125#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
8ada9598
JX
2126msgid "index file corrupt"
2127msgstr "索引文件损坏"
2128
220c313c 2129#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431
8ada9598
JX
2130msgid "Unable to write new index file"
2131msgstr "无法写入新索引文件"
2132
220c313c 2133#: builtin/apply.c:58
8ada9598 2134msgid "git apply [options] [<patch>...]"
81809b99 2135msgstr "git apply [选项] [<补丁>...]"
8ada9598 2136
220c313c 2137#: builtin/apply.c:111
81809b99 2138#, c-format
8ada9598 2139msgid "unrecognized whitespace option '%s'"
81809b99 2140msgstr "未能识别的空白字符选项 '%s'"
8ada9598 2141
220c313c 2142#: builtin/apply.c:126
81809b99 2143#, c-format
8ada9598 2144msgid "unrecognized whitespace ignore option '%s'"
81809b99 2145msgstr "未能识别的空白字符忽略选项 '%s'"
8ada9598 2146
220c313c 2147#: builtin/apply.c:826
8ada9598
JX
2148#, c-format
2149msgid "Cannot prepare timestamp regexp %s"
81809b99 2150msgstr "无法准备时间戳正则表达式 %s"
8ada9598 2151
220c313c 2152#: builtin/apply.c:835
8ada9598
JX
2153#, c-format
2154msgid "regexec returned %d for input: %s"
81809b99 2155msgstr "regexec 返回 %d,输入为:%s"
8ada9598 2156
220c313c 2157#: builtin/apply.c:916
81809b99 2158#, c-format
8ada9598 2159msgid "unable to find filename in patch at line %d"
81809b99 2160msgstr "不能在补丁的第 %d 行找到文件名"
8ada9598 2161
220c313c 2162#: builtin/apply.c:948
8ada9598
JX
2163#, c-format
2164msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
9aafc933 2165msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
8ada9598 2166
220c313c 2167#: builtin/apply.c:952
8ada9598
JX
2168#, c-format
2169msgid "git apply: bad git-diff - inconsistent new filename on line %d"
81809b99 2170msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
8ada9598 2171
220c313c 2172#: builtin/apply.c:953
8ada9598
JX
2173#, c-format
2174msgid "git apply: bad git-diff - inconsistent old filename on line %d"
81809b99 2175msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
8ada9598 2176
220c313c 2177#: builtin/apply.c:960
8ada9598
JX
2178#, c-format
2179msgid "git apply: bad git-diff - expected /dev/null on line %d"
9aafc933 2180msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
8ada9598 2181
220c313c 2182#: builtin/apply.c:1423
8ada9598
JX
2183#, c-format
2184msgid "recount: unexpected line: %.*s"
81809b99 2185msgstr "recount:意外的行:%.*s"
8ada9598 2186
220c313c 2187#: builtin/apply.c:1480
8ada9598
JX
2188#, c-format
2189msgid "patch fragment without header at line %d: %.*s"
81809b99 2190msgstr "第 %d 行的补丁片段没有头信息:%.*s"
8ada9598 2191
220c313c 2192#: builtin/apply.c:1497
8ada9598
JX
2193#, c-format
2194msgid ""
2195"git diff header lacks filename information when removing %d leading pathname "
2196"component (line %d)"
2197msgid_plural ""
2198"git diff header lacks filename information when removing %d leading pathname "
2199"components (line %d)"
5ae481e0
JX
2200msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2201msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
8ada9598 2202
220c313c 2203#: builtin/apply.c:1657
8ada9598 2204msgid "new file depends on old contents"
81809b99 2205msgstr "新文件依赖旧内容"
8ada9598 2206
220c313c 2207#: builtin/apply.c:1659
8ada9598 2208msgid "deleted file still has contents"
81809b99 2209msgstr "删除的文件仍有内容"
8ada9598 2210
220c313c 2211#: builtin/apply.c:1685
8ada9598
JX
2212#, c-format
2213msgid "corrupt patch at line %d"
195febda 2214msgstr "补丁在第 %d 行损坏"
8ada9598 2215
220c313c 2216#: builtin/apply.c:1721
8ada9598
JX
2217#, c-format
2218msgid "new file %s depends on old contents"
81809b99 2219msgstr "新文件 %s 依赖旧内容"
8ada9598 2220
220c313c 2221#: builtin/apply.c:1723
8ada9598
JX
2222#, c-format
2223msgid "deleted file %s still has contents"
81809b99 2224msgstr "删除的文件 %s 仍有内容"
8ada9598 2225
220c313c 2226#: builtin/apply.c:1726
8ada9598
JX
2227#, c-format
2228msgid "** warning: file %s becomes empty but is not deleted"
81809b99 2229msgstr "** 警告:文件 %s 成为空文件但并未删除"
8ada9598 2230
220c313c 2231#: builtin/apply.c:1872
8ada9598
JX
2232#, c-format
2233msgid "corrupt binary patch at line %d: %.*s"
81809b99 2234msgstr "二进制补丁在第 %d 行损坏:%.*s"
8ada9598 2235
220c313c 2236#: builtin/apply.c:1901
8ada9598
JX
2237#, c-format
2238msgid "unrecognized binary patch at line %d"
81809b99 2239msgstr "未能识别的二进制补丁位于第 %d 行"
8ada9598 2240
220c313c 2241#: builtin/apply.c:2052
8ada9598
JX
2242#, c-format
2243msgid "patch with only garbage at line %d"
81809b99 2244msgstr "补丁文件的第 %d 行只有垃圾数据"
8ada9598 2245
220c313c 2246#: builtin/apply.c:2142
81809b99 2247#, c-format
8ada9598 2248msgid "unable to read symlink %s"
81809b99 2249msgstr "无法读取符号链接 %s"
8ada9598 2250
220c313c 2251#: builtin/apply.c:2146
81809b99 2252#, c-format
8ada9598 2253msgid "unable to open or read %s"
81809b99 2254msgstr "不能打开或读取 %s"
8ada9598 2255
220c313c 2256#: builtin/apply.c:2754
81809b99 2257#, c-format
8ada9598 2258msgid "invalid start of line: '%c'"
81809b99 2259msgstr "无效的行首字符:'%c'"
8ada9598 2260
220c313c 2261#: builtin/apply.c:2872
8ada9598
JX
2262#, c-format
2263msgid "Hunk #%d succeeded at %d (offset %d line)."
2264msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
07432cef
WS
2265msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2266msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
8ada9598 2267
220c313c 2268#: builtin/apply.c:2884
8ada9598
JX
2269#, c-format
2270msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
81809b99 2271msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
8ada9598 2272
220c313c 2273#: builtin/apply.c:2890
8ada9598
JX
2274#, c-format
2275msgid ""
2276"while searching for:\n"
2277"%.*s"
2278msgstr ""
81809b99
JX
2279"当查询:\n"
2280"%.*s"
8ada9598 2281
220c313c 2282#: builtin/apply.c:2909
8ada9598
JX
2283#, c-format
2284msgid "missing binary patch data for '%s'"
81809b99 2285msgstr "缺失 '%s' 的二进制补丁数据"
8ada9598 2286
220c313c 2287#: builtin/apply.c:3010
8ada9598
JX
2288#, c-format
2289msgid "binary patch does not apply to '%s'"
81809b99 2290msgstr "二进制补丁未应用到 '%s'"
8ada9598 2291
220c313c 2292#: builtin/apply.c:3016
8ada9598
JX
2293#, c-format
2294msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
9aafc933 2295msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
8ada9598 2296
220c313c 2297#: builtin/apply.c:3037
8ada9598
JX
2298#, c-format
2299msgid "patch failed: %s:%ld"
81809b99 2300msgstr "打补丁失败:%s:%ld"
8ada9598 2301
220c313c 2302#: builtin/apply.c:3161
8ada9598 2303#, c-format
23ff3338
JX
2304msgid "cannot checkout %s"
2305msgstr "不能检出 %s"
8ada9598 2306
220c313c 2307#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260
81809b99 2308#, c-format
8ada9598 2309msgid "read of %s failed"
81809b99 2310msgstr "读取 %s 失败"
8ada9598 2311
220c313c 2312#: builtin/apply.c:3240 builtin/apply.c:3462
81809b99 2313#, c-format
23ff3338
JX
2314msgid "path %s has been renamed/deleted"
2315msgstr "路径 %s 已经被重命名/删除"
8ada9598 2316
220c313c 2317#: builtin/apply.c:3321 builtin/apply.c:3476
8ada9598 2318#, c-format
23ff3338
JX
2319msgid "%s: does not exist in index"
2320msgstr "%s:不存在于索引中"
8ada9598 2321
220c313c 2322#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490
81809b99 2323#, c-format
8ada9598 2324msgid "%s: %s"
81809b99 2325msgstr "%s:%s"
8ada9598 2326
220c313c 2327#: builtin/apply.c:3330 builtin/apply.c:3484
81809b99 2328#, c-format
8ada9598 2329msgid "%s: does not match index"
81809b99 2330msgstr "%s:和索引不匹配"
8ada9598 2331
220c313c 2332#: builtin/apply.c:3432
23ff3338
JX
2333msgid "removal patch leaves file contents"
2334msgstr "移除补丁仍留下了文件内容"
2335
220c313c 2336#: builtin/apply.c:3501
8ada9598
JX
2337#, c-format
2338msgid "%s: wrong type"
81809b99 2339msgstr "%s:错误类型"
8ada9598 2340
220c313c 2341#: builtin/apply.c:3503
8ada9598
JX
2342#, c-format
2343msgid "%s has type %o, expected %o"
9aafc933 2344msgstr "%s 的类型是 %o,应为 %o"
8ada9598 2345
220c313c 2346#: builtin/apply.c:3604
81809b99 2347#, c-format
8ada9598 2348msgid "%s: already exists in index"
81809b99 2349msgstr "%s:已经存在于索引中"
8ada9598 2350
220c313c 2351#: builtin/apply.c:3607
23ff3338
JX
2352#, c-format
2353msgid "%s: already exists in working directory"
2354msgstr "%s:已经存在于工作区中"
2355
220c313c 2356#: builtin/apply.c:3627
d691f479
JX
2357#, c-format
2358msgid "new mode (%o) of %s does not match old mode (%o)"
2359msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
8ada9598 2360
220c313c 2361#: builtin/apply.c:3632
8ada9598 2362#, c-format
d691f479
JX
2363msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2364msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2365
220c313c 2366#: builtin/apply.c:3640
d691f479 2367#, c-format
8ada9598 2368msgid "%s: patch does not apply"
81809b99 2369msgstr "%s:补丁未应用"
8ada9598 2370
220c313c 2371#: builtin/apply.c:3653
8ada9598
JX
2372#, c-format
2373msgid "Checking patch %s..."
81809b99 2374msgstr "检查补丁 %s..."
8ada9598 2375
04cb2f28 2376#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135
8ada9598
JX
2377#, c-format
2378msgid "make_cache_entry failed for path '%s'"
2379msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2380
220c313c 2381#: builtin/apply.c:3889
81809b99 2382#, c-format
8ada9598 2383msgid "unable to remove %s from index"
81809b99 2384msgstr "不能从索引中移除 %s"
8ada9598 2385
220c313c 2386#: builtin/apply.c:3918
8ada9598 2387#, c-format
2e8451e8
JX
2388msgid "corrupt patch for submodule %s"
2389msgstr "子模组 %s 损坏的补丁"
8ada9598 2390
220c313c 2391#: builtin/apply.c:3922
81809b99 2392#, c-format
8ada9598 2393msgid "unable to stat newly created file '%s'"
81809b99 2394msgstr "不能枚举新建文件 '%s' 的状态"
8ada9598 2395
220c313c 2396#: builtin/apply.c:3927
8ada9598
JX
2397#, c-format
2398msgid "unable to create backing store for newly created file %s"
81809b99 2399msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 2400
220c313c 2401#: builtin/apply.c:3930 builtin/apply.c:4038
81809b99 2402#, c-format
8ada9598 2403msgid "unable to add cache entry for %s"
81809b99 2404msgstr "无法为 %s 添加缓存条目"
8ada9598 2405
220c313c 2406#: builtin/apply.c:3963
81809b99 2407#, c-format
8ada9598 2408msgid "closing file '%s'"
81809b99 2409msgstr "关闭文件 '%s'"
8ada9598 2410
220c313c 2411#: builtin/apply.c:4012
81809b99 2412#, c-format
8ada9598 2413msgid "unable to write file '%s' mode %o"
81809b99 2414msgstr "不能写文件 '%s' 权限 %o"
8ada9598 2415
220c313c 2416#: builtin/apply.c:4099
8ada9598
JX
2417#, c-format
2418msgid "Applied patch %s cleanly."
81809b99 2419msgstr "成功应用补丁 %s。"
8ada9598 2420
220c313c 2421#: builtin/apply.c:4107
8ada9598 2422msgid "internal error"
81809b99 2423msgstr "内部错误"
8ada9598 2424
220c313c 2425#: builtin/apply.c:4110
8ada9598
JX
2426#, c-format
2427msgid "Applying patch %%s with %d reject..."
2428msgid_plural "Applying patch %%s with %d rejects..."
195febda
T
2429msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2430msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
8ada9598 2431
220c313c 2432#: builtin/apply.c:4120
8ada9598
JX
2433#, c-format
2434msgid "truncating .rej filename to %.*s.rej"
81809b99 2435msgstr "截短 .rej 文件名为 %.*s.rej"
8ada9598 2436
220c313c 2437#: builtin/apply.c:4141
8ada9598
JX
2438#, c-format
2439msgid "Hunk #%d applied cleanly."
81809b99 2440msgstr "第 #%d 个片段成功应用。"
8ada9598 2441
220c313c 2442#: builtin/apply.c:4144
8ada9598
JX
2443#, c-format
2444msgid "Rejected hunk #%d."
81809b99 2445msgstr "拒绝第 #%d 个片段。"
8ada9598 2446
220c313c 2447#: builtin/apply.c:4234
8ada9598 2448msgid "unrecognized input"
81809b99 2449msgstr "未能识别的输入"
8ada9598 2450
220c313c 2451#: builtin/apply.c:4245
8ada9598 2452msgid "unable to read index file"
81809b99 2453msgstr "无法读取索引文件"
8ada9598 2454
04cb2f28 2455#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92
6acbf033 2456#: builtin/fetch.c:93
8ada9598 2457msgid "path"
81809b99 2458msgstr "路径"
8ada9598 2459
220c313c 2460#: builtin/apply.c:4363
8ada9598 2461msgid "don't apply changes matching the given path"
81809b99 2462msgstr "不要应用与给出路径向匹配的变更"
8ada9598 2463
220c313c 2464#: builtin/apply.c:4366
8ada9598 2465msgid "apply changes matching the given path"
81809b99 2466msgstr "应用与给出路径向匹配的变更"
8ada9598 2467
220c313c 2468#: builtin/apply.c:4368
8ada9598 2469msgid "num"
81809b99 2470msgstr "数字"
8ada9598 2471
220c313c 2472#: builtin/apply.c:4369
8ada9598 2473msgid "remove <num> leading slashes from traditional diff paths"
07432cef 2474msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
8ada9598 2475
220c313c 2476#: builtin/apply.c:4372
8ada9598 2477msgid "ignore additions made by the patch"
81809b99 2478msgstr "忽略补丁中的添加的文件"
8ada9598 2479
220c313c 2480#: builtin/apply.c:4374
8ada9598 2481msgid "instead of applying the patch, output diffstat for the input"
81809b99 2482msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
8ada9598 2483
220c313c 2484#: builtin/apply.c:4378
ef317cd5 2485msgid "show number of added and deleted lines in decimal notation"
07432cef 2486msgstr "以十进制数显示添加和删除的行数"
8ada9598 2487
220c313c 2488#: builtin/apply.c:4380
8ada9598 2489msgid "instead of applying the patch, output a summary for the input"
81809b99 2490msgstr "不应用补丁,而是显示输入的概要"
8ada9598 2491
220c313c 2492#: builtin/apply.c:4382
8ada9598 2493msgid "instead of applying the patch, see if the patch is applicable"
81809b99 2494msgstr "不应用补丁,而是查看补丁是否可应用"
8ada9598 2495
220c313c 2496#: builtin/apply.c:4384
8ada9598 2497msgid "make sure the patch is applicable to the current index"
81809b99 2498msgstr "确认补丁可以应用到当前索引"
8ada9598 2499
220c313c 2500#: builtin/apply.c:4386
8ada9598 2501msgid "apply a patch without touching the working tree"
81809b99 2502msgstr "应用补丁而不修改工作区"
8ada9598 2503
220c313c 2504#: builtin/apply.c:4388
8ada9598 2505msgid "also apply the patch (use with --stat/--summary/--check)"
195febda 2506msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
8ada9598 2507
220c313c 2508#: builtin/apply.c:4390
23ff3338
JX
2509msgid "attempt three-way merge if a patch does not apply"
2510msgstr "如果一个补丁不能应用则尝试三路合并"
2511
220c313c 2512#: builtin/apply.c:4392
8ada9598 2513msgid "build a temporary index based on embedded index information"
81809b99 2514msgstr "创建一个临时索引基于嵌入的索引信息"
8ada9598 2515
220c313c 2516#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455
8ada9598 2517msgid "paths are separated with NUL character"
81809b99 2518msgstr "路径以 NUL 字符分隔"
8ada9598 2519
220c313c 2520#: builtin/apply.c:4397
8ada9598 2521msgid "ensure at least <n> lines of context match"
81809b99 2522msgstr "确保至少匹配 <n> 行上下文"
8ada9598 2523
220c313c 2524#: builtin/apply.c:4398
8ada9598 2525msgid "action"
81809b99 2526msgstr "动作"
8ada9598 2527
220c313c 2528#: builtin/apply.c:4399
8ada9598 2529msgid "detect new or modified lines that have whitespace errors"
81809b99 2530msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 2531
220c313c 2532#: builtin/apply.c:4402 builtin/apply.c:4405
8ada9598 2533msgid "ignore changes in whitespace when finding context"
81809b99 2534msgstr "查找上下文时忽略空白字符的变更"
8ada9598 2535
220c313c 2536#: builtin/apply.c:4408
8ada9598 2537msgid "apply the patch in reverse"
81809b99 2538msgstr "反向应用补丁"
8ada9598 2539
220c313c 2540#: builtin/apply.c:4410
8ada9598 2541msgid "don't expect at least one line of context"
81809b99 2542msgstr "无需至少一行上下文"
8ada9598 2543
220c313c 2544#: builtin/apply.c:4412
8ada9598 2545msgid "leave the rejected hunks in corresponding *.rej files"
81809b99 2546msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 2547
220c313c 2548#: builtin/apply.c:4414
8ada9598 2549msgid "allow overlapping hunks"
81809b99 2550msgstr "允许重叠的补丁片段"
8ada9598 2551
220c313c 2552#: builtin/apply.c:4417
8ada9598 2553msgid "tolerate incorrectly detected missing new-line at the end of file"
195febda 2554msgstr "允许不正确的文件末尾换行符"
c04f5ac3 2555
220c313c 2556#: builtin/apply.c:4420
8ada9598 2557msgid "do not trust the line counts in the hunk headers"
81809b99 2558msgstr "不信任补丁片段的头信息中的行号"
c04f5ac3 2559
220c313c 2560#: builtin/apply.c:4422
8ada9598 2561msgid "root"
81809b99 2562msgstr "根目录"
c04f5ac3 2563
220c313c 2564#: builtin/apply.c:4423
8ada9598 2565msgid "prepend <root> to all filenames"
81809b99 2566msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 2567
220c313c 2568#: builtin/apply.c:4445
23ff3338
JX
2569msgid "--3way outside a repository"
2570msgstr "--3way 在一个版本库之外"
2571
220c313c 2572#: builtin/apply.c:4453
8ada9598 2573msgid "--index outside a repository"
81809b99 2574msgstr "--index 在一个版本库之外"
c04f5ac3 2575
220c313c 2576#: builtin/apply.c:4456
8ada9598 2577msgid "--cached outside a repository"
81809b99 2578msgstr "--cached 在一个版本库之外"
c04f5ac3 2579
220c313c 2580#: builtin/apply.c:4472
81809b99 2581#, c-format
8ada9598 2582msgid "can't open patch '%s'"
81809b99 2583msgstr "不能打开补丁 '%s'"
c04f5ac3 2584
220c313c 2585#: builtin/apply.c:4486
c04f5ac3 2586#, c-format
8ada9598
JX
2587msgid "squelched %d whitespace error"
2588msgid_plural "squelched %d whitespace errors"
81809b99 2589msgstr[0] "抑制下仍有 %d 个空白字符误用"
5ae481e0 2590msgstr[1] "抑制下仍有 %d 个空白字符误用"
c04f5ac3 2591
220c313c 2592#: builtin/apply.c:4492 builtin/apply.c:4502
8ada9598
JX
2593#, c-format
2594msgid "%d line adds whitespace errors."
2595msgid_plural "%d lines add whitespace errors."
81809b99 2596msgstr[0] "%d 行有空白字符误用。"
5ae481e0 2597msgstr[1] "%d 行有空白字符误用。"
c04f5ac3
JX
2598
2599#: builtin/archive.c:17
2600#, c-format
2601msgid "could not create archive file '%s'"
90e6ef53 2602msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
2603
2604#: builtin/archive.c:20
2605msgid "could not redirect output"
195febda 2606msgstr "不能重定向输出"
c04f5ac3
JX
2607
2608#: builtin/archive.c:37
2609msgid "git archive: Remote with no URL"
90e6ef53 2610msgstr "git archive:未提供远程URL"
c04f5ac3
JX
2611
2612#: builtin/archive.c:58
2613msgid "git archive: expected ACK/NAK, got EOF"
9aafc933 2614msgstr "git archive:应为ACK/NACK,却得到EOF"
c04f5ac3 2615
1003b3a5 2616#: builtin/archive.c:61
c04f5ac3
JX
2617#, c-format
2618msgid "git archive: NACK %s"
90e6ef53 2619msgstr "git archive:NACK %s"
c04f5ac3 2620
1003b3a5 2621#: builtin/archive.c:63
c04f5ac3
JX
2622#, c-format
2623msgid "remote error: %s"
2624msgstr "远程错误:%s"
2625
1003b3a5 2626#: builtin/archive.c:64
c04f5ac3 2627msgid "git archive: protocol error"
90e6ef53 2628msgstr "git archive:协议错误"
c04f5ac3 2629
1003b3a5 2630#: builtin/archive.c:68
c04f5ac3 2631msgid "git archive: expected a flush"
195febda 2632msgstr "git archive:应为刷新"
c04f5ac3 2633
ef317cd5
JX
2634#: builtin/bisect--helper.c:7
2635msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 2636msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5
JX
2637
2638#: builtin/bisect--helper.c:17
2639msgid "perform 'git bisect next'"
07432cef 2640msgstr "执行 'git bisect next'"
ef317cd5
JX
2641
2642#: builtin/bisect--helper.c:19
2643msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 2644msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5 2645
6acbf033 2646#: builtin/blame.c:30
ef317cd5 2647msgid "git blame [options] [rev-opts] [rev] [--] file"
07432cef 2648msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
ef317cd5 2649
6acbf033 2650#: builtin/blame.c:35
ef317cd5 2651msgid "[rev-opts] are documented in git-rev-list(1)"
07432cef 2652msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
ef317cd5 2653
6acbf033 2654#: builtin/blame.c:2501
ef317cd5 2655msgid "Show blame entries as we find them, incrementally"
07432cef 2656msgstr "增量式地显示发现的 blame 条目"
ef317cd5 2657
6acbf033 2658#: builtin/blame.c:2502
ef317cd5 2659msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 2660msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 2661
6acbf033 2662#: builtin/blame.c:2503
ef317cd5 2663msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 2664msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 2665
6acbf033 2666#: builtin/blame.c:2504
ef317cd5 2667msgid "Show work cost statistics"
07432cef 2668msgstr "显示命令消耗统计"
ef317cd5 2669
6acbf033 2670#: builtin/blame.c:2505
ef317cd5 2671msgid "Show output score for blame entries"
07432cef 2672msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 2673
6acbf033 2674#: builtin/blame.c:2506
ef317cd5 2675msgid "Show original filename (Default: auto)"
07432cef 2676msgstr "显示原始文件名(默认:自动)"
ef317cd5 2677
6acbf033 2678#: builtin/blame.c:2507
ef317cd5 2679msgid "Show original linenumber (Default: off)"
07432cef 2680msgstr "显示原始的行号(默认:关闭)"
ef317cd5 2681
6acbf033 2682#: builtin/blame.c:2508
ef317cd5 2683msgid "Show in a format designed for machine consumption"
07432cef 2684msgstr "显示为一个适合机器读取的格式"
ef317cd5 2685
6acbf033 2686#: builtin/blame.c:2509
ef317cd5 2687msgid "Show porcelain format with per-line commit information"
07432cef 2688msgstr "为每一行显示机器适用的提交信息"
ef317cd5 2689
6acbf033 2690#: builtin/blame.c:2510
ef317cd5 2691msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 2692msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 2693
6acbf033 2694#: builtin/blame.c:2511
ef317cd5 2695msgid "Show raw timestamp (Default: off)"
07432cef 2696msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 2697
6acbf033 2698#: builtin/blame.c:2512
ef317cd5 2699msgid "Show long commit SHA1 (Default: off)"
07432cef 2700msgstr "显示长的SHA1提交号(默认:关闭)"
ef317cd5 2701
6acbf033 2702#: builtin/blame.c:2513
ef317cd5 2703msgid "Suppress author name and timestamp (Default: off)"
07432cef 2704msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 2705
6acbf033 2706#: builtin/blame.c:2514
ef317cd5 2707msgid "Show author email instead of name (Default: off)"
07432cef 2708msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 2709
6acbf033 2710#: builtin/blame.c:2515
ef317cd5 2711msgid "Ignore whitespace differences"
07432cef 2712msgstr "忽略空白差异"
ef317cd5 2713
6acbf033 2714#: builtin/blame.c:2516
ef317cd5 2715msgid "Spend extra cycles to find better match"
07432cef 2716msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 2717
6acbf033 2718#: builtin/blame.c:2517
ef317cd5 2719msgid "Use revisions from <file> instead of calling git-rev-list"
07432cef 2720msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
ef317cd5 2721
6acbf033 2722#: builtin/blame.c:2518
ef317cd5 2723msgid "Use <file>'s contents as the final image"
07432cef 2724msgstr "使用 <file> 的内容作为最终的图片"
ef317cd5 2725
6acbf033 2726#: builtin/blame.c:2519 builtin/blame.c:2520
ef317cd5 2727msgid "score"
07432cef 2728msgstr "得分"
ef317cd5 2729
6acbf033 2730#: builtin/blame.c:2519
ef317cd5 2731msgid "Find line copies within and across files"
07432cef 2732msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 2733
6acbf033 2734#: builtin/blame.c:2520
ef317cd5 2735msgid "Find line movements within and across files"
07432cef 2736msgstr "找到文件内及跨文件的行移动"
ef317cd5 2737
6acbf033 2738#: builtin/blame.c:2521
ef317cd5 2739msgid "n,m"
07432cef 2740msgstr "n,m"
ef317cd5 2741
6acbf033 2742#: builtin/blame.c:2521
ef317cd5 2743msgid "Process only line range n,m, counting from 1"
07432cef 2744msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 2745
6c94aba5
JX
2746#. TRANSLATORS: This string is used to tell us the maximum
2747#. display width for a relative timestamp in "git blame"
2748#. output. For C locale, "4 years, 11 months ago", which
2749#. takes 22 places, is the longest among various forms of
2750#. relative timestamps, but your language may need more or
2751#. fewer display columns.
220c313c 2752#: builtin/blame.c:2602
6c94aba5
JX
2753msgid "4 years, 11 months ago"
2754msgstr "4 年 11 个月前"
2755
1003b3a5 2756#: builtin/branch.c:24
ef317cd5 2757msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
07432cef 2758msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
ef317cd5 2759
1003b3a5 2760#: builtin/branch.c:25
ef317cd5 2761msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
07432cef 2762msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 2763
1003b3a5 2764#: builtin/branch.c:26
ef317cd5 2765msgid "git branch [options] [-r] (-d | -D) <branchname>..."
07432cef 2766msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
ef317cd5 2767
1003b3a5 2768#: builtin/branch.c:27
ef317cd5 2769msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
07432cef 2770msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 2771
90e6ef53 2772# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
220c313c 2773#: builtin/branch.c:152
c04f5ac3
JX
2774#, c-format
2775msgid ""
2776"deleting branch '%s' that has been merged to\n"
2777" '%s', but not yet merged to HEAD."
2778msgstr ""
70fc47bf 2779"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
2780" '%s',但未合并到 HEAD。"
2781
90e6ef53 2782# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
220c313c 2783#: builtin/branch.c:156
c04f5ac3
JX
2784#, c-format
2785msgid ""
2786"not deleting branch '%s' that is not yet merged to\n"
2787" '%s', even though it is merged to HEAD."
2788msgstr ""
70fc47bf
T
2789"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2790" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 2791
220c313c 2792#: builtin/branch.c:170
07432cef
WS
2793#, c-format
2794msgid "Couldn't look up commit object for '%s'"
2795msgstr "无法查询 '%s' 指向的提交对象"
2796
220c313c 2797#: builtin/branch.c:174
07432cef
WS
2798#, c-format
2799msgid ""
2800"The branch '%s' is not fully merged.\n"
2801"If you are sure you want to delete it, run 'git branch -D %s'."
2802msgstr ""
2803"分支 '%s' 没有完全合并。\n"
2804"如果您确认要删除它,执行 'git branch -D %s'。"
2805
220c313c 2806#: builtin/branch.c:187
07432cef
WS
2807msgid "Update of config-file failed"
2808msgstr "无法更新 config 文件"
2809
220c313c 2810#: builtin/branch.c:215
c04f5ac3 2811msgid "cannot use -a with -d"
649900bc 2812msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 2813
220c313c 2814#: builtin/branch.c:221
c04f5ac3
JX
2815msgid "Couldn't look up commit object for HEAD"
2816msgstr "无法查询 HEAD 指向的提交对象"
2817
220c313c 2818#: builtin/branch.c:229
c04f5ac3
JX
2819#, c-format
2820msgid "Cannot delete the branch '%s' which you are currently on."
2821msgstr "无法删除您当前所在的分支 '%s'。"
2822
220c313c 2823#: builtin/branch.c:245
5ae481e0 2824#, c-format
8ada9598 2825msgid "remote branch '%s' not found."
81809b99 2826msgstr "远程分支 '%s' 未发现。"
c04f5ac3 2827
220c313c 2828#: builtin/branch.c:246
81809b99 2829#, c-format
8ada9598 2830msgid "branch '%s' not found."
81809b99 2831msgstr "分支 '%s' 未发现。"
8ada9598 2832
220c313c 2833#: builtin/branch.c:260
81809b99 2834#, c-format
8ada9598 2835msgid "Error deleting remote branch '%s'"
81809b99 2836msgstr "删除远程分支 '%s' 时出错"
c04f5ac3 2837
220c313c 2838#: builtin/branch.c:261
81809b99 2839#, c-format
8ada9598 2840msgid "Error deleting branch '%s'"
81809b99 2841msgstr "删除分支 '%s' 时出错"
8ada9598 2842
220c313c 2843#: builtin/branch.c:268
81809b99 2844#, c-format
8ada9598 2845msgid "Deleted remote branch %s (was %s).\n"
81809b99 2846msgstr "已删除远程分支 %s(曾为 %s)。\n"
c04f5ac3 2847
220c313c 2848#: builtin/branch.c:269
81809b99 2849#, c-format
8ada9598 2850msgid "Deleted branch %s (was %s).\n"
81809b99 2851msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 2852
220c313c 2853#: builtin/branch.c:370
c04f5ac3
JX
2854#, c-format
2855msgid "branch '%s' does not point at a commit"
2856msgstr "分支 '%s' 未指向一个提交"
2857
220c313c 2858#: builtin/branch.c:459
81809b99 2859#, c-format
90314792
JX
2860msgid "[%s: gone]"
2861msgstr "[%s: 丢失]"
2862
220c313c 2863#: builtin/branch.c:464
90314792
JX
2864#, c-format
2865msgid "[%s]"
2866msgstr "[%s]"
2867
220c313c 2868#: builtin/branch.c:469
90314792 2869#, c-format
8ada9598 2870msgid "[%s: behind %d]"
81809b99 2871msgstr "[%s:落后 %d]"
c04f5ac3 2872
220c313c 2873#: builtin/branch.c:471
81809b99 2874#, c-format
8ada9598 2875msgid "[behind %d]"
81809b99 2876msgstr "[落后 %d]"
8ada9598 2877
220c313c 2878#: builtin/branch.c:475
81809b99 2879#, c-format
8ada9598 2880msgid "[%s: ahead %d]"
81809b99 2881msgstr "[%s:领先 %d]"
c04f5ac3 2882
220c313c 2883#: builtin/branch.c:477
81809b99 2884#, c-format
8ada9598 2885msgid "[ahead %d]"
81809b99 2886msgstr "[领先 %d]"
8ada9598 2887
220c313c 2888#: builtin/branch.c:480
81809b99 2889#, c-format
8ada9598 2890msgid "[%s: ahead %d, behind %d]"
81809b99 2891msgstr "[%s:领先 %d,落后 %d]"
8ada9598 2892
220c313c 2893#: builtin/branch.c:483
81809b99 2894#, c-format
8ada9598 2895msgid "[ahead %d, behind %d]"
81809b99 2896msgstr "[领先 %d,落后 %d]"
c04f5ac3 2897
220c313c 2898#: builtin/branch.c:496
a77c07d9
JX
2899msgid " **** invalid ref ****"
2900msgstr " **** 无效引用 ****"
2901
220c313c 2902#: builtin/branch.c:587
1003b3a5
JX
2903#, c-format
2904msgid "(no branch, rebasing %s)"
2905msgstr "(非分支,正变基 %s)"
2906
220c313c 2907#: builtin/branch.c:590
1003b3a5
JX
2908#, c-format
2909msgid "(no branch, bisect started on %s)"
2910msgstr "(非分支,二分查找开始于 %s)"
2911
220c313c 2912#: builtin/branch.c:593
1003b3a5
JX
2913#, c-format
2914msgid "(detached from %s)"
2915msgstr "(分离自 %s)"
2916
220c313c 2917#: builtin/branch.c:596
c04f5ac3
JX
2918msgid "(no branch)"
2919msgstr "(非分支)"
2920
220c313c 2921#: builtin/branch.c:643
a77c07d9
JX
2922#, c-format
2923msgid "object '%s' does not point to a commit"
2924msgstr "对象 '%s' 没有指向一个提交"
2925
220c313c 2926#: builtin/branch.c:691
c04f5ac3 2927msgid "some refs could not be read"
90e6ef53 2928msgstr "一些引用不能读取"
c04f5ac3 2929
220c313c 2930#: builtin/branch.c:704
c04f5ac3 2931msgid "cannot rename the current branch while not on any."
90e6ef53 2932msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 2933
220c313c 2934#: builtin/branch.c:714
c04f5ac3
JX
2935#, c-format
2936msgid "Invalid branch name: '%s'"
2937msgstr "无效的分支名:'%s'"
2938
220c313c 2939#: builtin/branch.c:729
c04f5ac3
JX
2940msgid "Branch rename failed"
2941msgstr "分支重命名失败"
2942
220c313c 2943#: builtin/branch.c:733
c04f5ac3
JX
2944#, c-format
2945msgid "Renamed a misnamed branch '%s' away"
2946msgstr "重命名掉一个错误命名的旧分支 '%s'"
2947
220c313c 2948#: builtin/branch.c:737
c04f5ac3
JX
2949#, c-format
2950msgid "Branch renamed to %s, but HEAD is not updated!"
2951msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2952
220c313c 2953#: builtin/branch.c:744
c04f5ac3
JX
2954msgid "Branch is renamed, but update of config-file failed"
2955msgstr "分支被重命名,但更新 config 文件失败"
2956
220c313c 2957#: builtin/branch.c:759
c04f5ac3
JX
2958#, c-format
2959msgid "malformed object name %s"
2960msgstr "非法的对象名 %s"
2961
220c313c 2962#: builtin/branch.c:783
81809b99 2963#, c-format
8ada9598 2964msgid "could not write branch description template: %s"
81809b99 2965msgstr "不能写分支描述模版:%s"
c04f5ac3 2966
220c313c 2967#: builtin/branch.c:813
ef317cd5 2968msgid "Generic options"
07432cef 2969msgstr "通用选项"
c04f5ac3 2970
220c313c 2971#: builtin/branch.c:815
ef317cd5 2972msgid "show hash and subject, give twice for upstream branch"
07432cef 2973msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 2974
220c313c 2975#: builtin/branch.c:816
ef317cd5 2976msgid "suppress informational messages"
07432cef 2977msgstr "不显示信息"
8ada9598 2978
220c313c 2979#: builtin/branch.c:817
ef317cd5 2980msgid "set up tracking mode (see git-pull(1))"
07432cef 2981msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 2982
220c313c 2983#: builtin/branch.c:819
ef317cd5 2984msgid "change upstream info"
07432cef 2985msgstr "改变上游信息"
c04f5ac3 2986
220c313c 2987#: builtin/branch.c:823
ef317cd5 2988msgid "use colored output"
07432cef 2989msgstr "使用彩色输出"
c04f5ac3 2990
220c313c 2991#: builtin/branch.c:824
ef317cd5 2992msgid "act on remote-tracking branches"
07432cef 2993msgstr "作用于远程跟踪分支"
c04f5ac3 2994
220c313c 2995#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854
04cb2f28
JX
2996#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587
2997#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616
220c313c 2998#: builtin/tag.c:622
ef317cd5 2999msgid "commit"
07432cef 3000msgstr "提交"
c04f5ac3 3001
220c313c 3002#: builtin/branch.c:828 builtin/branch.c:834
ef317cd5 3003msgid "print only branches that contain the commit"
07432cef 3004msgstr "只打印包含该提交的分支"
c04f5ac3 3005
220c313c 3006#: builtin/branch.c:840
ef317cd5 3007msgid "Specific git-branch actions:"
07432cef 3008msgstr "具体的 git-branch 动作:"
c04f5ac3 3009
220c313c 3010#: builtin/branch.c:841
ef317cd5 3011msgid "list both remote-tracking and local branches"
07432cef 3012msgstr "列出远程跟踪及本地分支"
c04f5ac3 3013
220c313c 3014#: builtin/branch.c:843
ef317cd5 3015msgid "delete fully merged branch"
07432cef 3016msgstr "删除完全合并的分支"
c04f5ac3 3017
220c313c 3018#: builtin/branch.c:844
ef317cd5 3019msgid "delete branch (even if not merged)"
07432cef 3020msgstr "删除分支(即使没有合并)"
c04f5ac3 3021
220c313c 3022#: builtin/branch.c:845
ef317cd5 3023msgid "move/rename a branch and its reflog"
07432cef 3024msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 3025
220c313c 3026#: builtin/branch.c:846
ef317cd5 3027msgid "move/rename a branch, even if target exists"
07432cef 3028msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 3029
220c313c 3030#: builtin/branch.c:847
ef317cd5 3031msgid "list branch names"
07432cef 3032msgstr "列出分支名"
c04f5ac3 3033
220c313c 3034#: builtin/branch.c:848
ef317cd5 3035msgid "create the branch's reflog"
07432cef 3036msgstr "创建分支的引用日志"
ef317cd5 3037
220c313c 3038#: builtin/branch.c:850
ef317cd5 3039msgid "edit the description for the branch"
07432cef 3040msgstr "标记分支的描述"
ef317cd5 3041
220c313c 3042#: builtin/branch.c:851
04cb2f28
JX
3043msgid "force creation, move/rename, deletion"
3044msgstr "强制创建、移动/重命名、删除"
ef317cd5 3045
220c313c 3046#: builtin/branch.c:854
ef317cd5 3047msgid "print only not merged branches"
07432cef 3048msgstr "只打印没有合并的分支"
ef317cd5 3049
220c313c 3050#: builtin/branch.c:860
ef317cd5 3051msgid "print only merged branches"
07432cef 3052msgstr "只打印合并的分支"
ef317cd5 3053
220c313c 3054#: builtin/branch.c:864
ef317cd5 3055msgid "list branches in columns"
07432cef 3056msgstr "以列的方式显示分支"
ef317cd5 3057
220c313c 3058#: builtin/branch.c:877
c04f5ac3
JX
3059msgid "Failed to resolve HEAD as a valid ref."
3060msgstr "无法将 HEAD 解析为有效引用。"
3061
04cb2f28 3062#: builtin/branch.c:881 builtin/clone.c:637
c04f5ac3 3063msgid "HEAD not found below refs/heads!"
90e6ef53 3064msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 3065
220c313c 3066#: builtin/branch.c:903
8ada9598 3067msgid "--column and --verbose are incompatible"
81809b99 3068msgstr "--column 和 --verbose 不兼容"
8ada9598 3069
04cb2f28 3070#: builtin/branch.c:914 builtin/branch.c:953
a77c07d9
JX
3071msgid "branch name required"
3072msgstr "必须提供分支名"
3073
04cb2f28 3074#: builtin/branch.c:929
a77c07d9
JX
3075msgid "Cannot give description to detached HEAD"
3076msgstr "不能向分离头指针提供描述"
3077
04cb2f28 3078#: builtin/branch.c:934
a77c07d9
JX
3079msgid "cannot edit description of more than one branch"
3080msgstr "不能为一个以上的分支编辑描述"
3081
04cb2f28 3082#: builtin/branch.c:941
a77c07d9
JX
3083#, c-format
3084msgid "No commit on branch '%s' yet."
3085msgstr "分支 '%s' 尚无提交。"
3086
04cb2f28 3087#: builtin/branch.c:944
a77c07d9
JX
3088#, c-format
3089msgid "No branch named '%s'."
3090msgstr "没有分支 '%s'。"
3091
04cb2f28 3092#: builtin/branch.c:959
a77c07d9
JX
3093msgid "too many branches for a rename operation"
3094msgstr "为重命名操作提供了太多的分支名"
3095
04cb2f28 3096#: builtin/branch.c:964
1003b3a5
JX
3097msgid "too many branches to set new upstream"
3098msgstr "为设置新上游提供了太多的分支名"
3099
04cb2f28 3100#: builtin/branch.c:968
1003b3a5
JX
3101#, c-format
3102msgid ""
3103"could not set upstream of HEAD to %s when it does not point to any branch."
3104msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
3105
04cb2f28 3106#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014
1003b3a5
JX
3107#, c-format
3108msgid "no such branch '%s'"
3109msgstr "没有此分支 '%s'"
3110
04cb2f28 3111#: builtin/branch.c:975
07432cef 3112#, c-format
ef317cd5 3113msgid "branch '%s' does not exist"
07432cef 3114msgstr "分支 '%s' 不存在"
ef317cd5 3115
04cb2f28 3116#: builtin/branch.c:987
1003b3a5
JX
3117msgid "too many branches to unset upstream"
3118msgstr "为取消上游设置操作提供了太多的分支名"
3119
04cb2f28 3120#: builtin/branch.c:991
1003b3a5
JX
3121msgid "could not unset upstream of HEAD when it does not point to any branch."
3122msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3123
04cb2f28 3124#: builtin/branch.c:997
ef317cd5
JX
3125#, c-format
3126msgid "Branch '%s' has no upstream information"
07432cef 3127msgstr "分支 '%s' 没有上游信息"
ef317cd5 3128
04cb2f28 3129#: builtin/branch.c:1011
1003b3a5
JX
3130msgid "it does not make sense to create 'HEAD' manually"
3131msgstr "手工创建 'HEAD' 没有意义"
3132
04cb2f28 3133#: builtin/branch.c:1017
c04f5ac3
JX
3134msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3135msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3136
04cb2f28 3137#: builtin/branch.c:1020
ef317cd5
JX
3138#, c-format
3139msgid ""
3140"The --set-upstream flag is deprecated and will be removed. Consider using --"
3141"track or --set-upstream-to\n"
3142msgstr ""
07432cef 3143"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
ef317cd5 3144
04cb2f28 3145#: builtin/branch.c:1037
ef317cd5
JX
3146#, c-format
3147msgid ""
3148"\n"
3149"If you wanted to make '%s' track '%s', do this:\n"
3150"\n"
3151msgstr ""
07432cef
WS
3152"\n"
3153"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
3154"\n"
ef317cd5 3155
04cb2f28 3156#: builtin/branch.c:1038
07432cef 3157#, c-format
ef317cd5 3158msgid " git branch -d %s\n"
07432cef 3159msgstr " git branch -d %s\n"
ef317cd5 3160
04cb2f28 3161#: builtin/branch.c:1039
ef317cd5
JX
3162#, c-format
3163msgid " git branch --set-upstream-to %s\n"
07432cef 3164msgstr " git branch --set-upstream-to %s\n"
ef317cd5 3165
c04f5ac3
JX
3166#: builtin/bundle.c:47
3167#, c-format
3168msgid "%s is okay\n"
3169msgstr "%s 可以\n"
3170
3171#: builtin/bundle.c:56
3172msgid "Need a repository to create a bundle."
90e6ef53 3173msgstr "需要一个版本库来创建包。"
c04f5ac3
JX
3174
3175#: builtin/bundle.c:60
3176msgid "Need a repository to unbundle."
90e6ef53 3177msgstr "需要一个版本库来解包。"
c04f5ac3 3178
220c313c 3179#: builtin/cat-file.c:332
ef317cd5 3180msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
07432cef 3181msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
ef317cd5 3182
220c313c 3183#: builtin/cat-file.c:333
ef317cd5 3184msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
07432cef 3185msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
ef317cd5 3186
220c313c 3187#: builtin/cat-file.c:370
ef317cd5 3188msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 3189msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 3190
220c313c 3191#: builtin/cat-file.c:371
ef317cd5 3192msgid "show object type"
07432cef 3193msgstr "显示对象类型"
ef317cd5 3194
220c313c 3195#: builtin/cat-file.c:372
ef317cd5 3196msgid "show object size"
07432cef 3197msgstr "显示对象大小"
ef317cd5 3198
220c313c 3199#: builtin/cat-file.c:374
ef317cd5 3200msgid "exit with zero when there's no error"
07432cef 3201msgstr "当没有错误时退出并返回零"
ef317cd5 3202
220c313c 3203#: builtin/cat-file.c:375
ef317cd5 3204msgid "pretty-print object's content"
07432cef 3205msgstr "美观地打印对象的内容"
ef317cd5 3206
220c313c 3207#: builtin/cat-file.c:377
ef317cd5 3208msgid "for blob objects, run textconv on object's content"
07432cef 3209msgstr "对于数据(blob)对象,对其内容执行 textconv"
ef317cd5 3210
220c313c 3211#: builtin/cat-file.c:379
ef317cd5 3212msgid "show info and content of objects fed from the standard input"
07432cef 3213msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 3214
220c313c 3215#: builtin/cat-file.c:382
ef317cd5 3216msgid "show info about objects fed from the standard input"
07432cef 3217msgstr "显示从标准输入提供的对象的信息"
ef317cd5
JX
3218
3219#: builtin/check-attr.c:11
3220msgid "git check-attr [-a | --all | attr...] [--] pathname..."
07432cef 3221msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
ef317cd5
JX
3222
3223#: builtin/check-attr.c:12
07432cef
WS
3224msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
3225msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
ef317cd5
JX
3226
3227#: builtin/check-attr.c:19
3228msgid "report all attributes set on file"
07432cef 3229msgstr "报告设置在文件上的所有属性"
ef317cd5
JX
3230
3231#: builtin/check-attr.c:20
3232msgid "use .gitattributes only from the index"
07432cef 3233msgstr "只使用索引中的 .gitattributes"
ef317cd5 3234
220c313c 3235#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
ef317cd5 3236msgid "read file names from stdin"
07432cef 3237msgstr "从标准输入读出文件名"
ef317cd5 3238
a77c07d9 3239#: builtin/check-attr.c:23 builtin/check-ignore.c:24
90314792
JX
3240msgid "terminate input and output records by a NUL character"
3241msgstr "输入和输出的记录使用 NUL 字符终结"
ef317cd5 3242
04cb2f28 3243#: builtin/check-ignore.c:18 builtin/checkout.c:1107 builtin/gc.c:274
a77c07d9
JX
3244msgid "suppress progress reporting"
3245msgstr "不显示进度报告"
3246
2e8451e8
JX
3247#: builtin/check-ignore.c:26
3248msgid "show non-matching input paths"
3249msgstr "显示未匹配的输入路径"
3250
90314792
JX
3251#: builtin/check-ignore.c:28
3252msgid "ignore index when checking"
3253msgstr "检查时忽略索引"
3254
3255#: builtin/check-ignore.c:154
a77c07d9
JX
3256msgid "cannot specify pathnames with --stdin"
3257msgstr "不能同时提供路径及 --stdin 参数"
3258
90314792 3259#: builtin/check-ignore.c:157
a77c07d9
JX
3260msgid "-z only makes sense with --stdin"
3261msgstr "-z 需要和 --stdin 参数共用才有意义"
3262
90314792 3263#: builtin/check-ignore.c:159
a77c07d9
JX
3264msgid "no path specified"
3265msgstr "未指定路径"
3266
90314792 3267#: builtin/check-ignore.c:163
a77c07d9
JX
3268msgid "--quiet is only valid with a single pathname"
3269msgstr "参数 --quiet 只在提供一个路径名时有效"
3270
90314792 3271#: builtin/check-ignore.c:165
a77c07d9
JX
3272msgid "cannot have both --quiet and --verbose"
3273msgstr "不能同时提供 --quiet 和 --verbose 参数"
3274
90314792 3275#: builtin/check-ignore.c:168
2e8451e8
JX
3276msgid "--non-matching is only valid with --verbose"
3277msgstr "--non-matching 选项只在使用 --verbose 时有效"
3278
3279#: builtin/check-mailmap.c:8
3280msgid "git check-mailmap [options] <contact>..."
3281msgstr "git check-mailmap [选项] <联系地址>..."
3282
3283#: builtin/check-mailmap.c:13
3284msgid "also read contacts from stdin"
3285msgstr "还从标准输入读取联系地址"
3286
3287#: builtin/check-mailmap.c:24
3288#, c-format
3289msgid "unable to parse contact: %s"
3290msgstr "不能解析联系地址:%s"
3291
3292#: builtin/check-mailmap.c:47
3293msgid "no contacts specified"
3294msgstr "未指定联系地址"
3295
ef317cd5
JX
3296#: builtin/checkout-index.c:126
3297msgid "git checkout-index [options] [--] [<file>...]"
07432cef 3298msgstr "git checkout-index [选项] [--] [<文件>...]"
ef317cd5 3299
6acbf033 3300#: builtin/checkout-index.c:188
ef317cd5 3301msgid "check out all files in the index"
07432cef 3302msgstr "检出索引区的所有文件"
ef317cd5 3303
6acbf033 3304#: builtin/checkout-index.c:189
ef317cd5 3305msgid "force overwrite of existing files"
07432cef 3306msgstr "强制覆盖现有的文件"
ef317cd5 3307
6acbf033 3308#: builtin/checkout-index.c:191
ef317cd5 3309msgid "no warning for existing files and files not in index"
07432cef 3310msgstr "存在或不在索引中的文件都没有警告"
ef317cd5 3311
6acbf033 3312#: builtin/checkout-index.c:193
ef317cd5 3313msgid "don't checkout new files"
07432cef 3314msgstr "不检出新文件"
ef317cd5 3315
6acbf033 3316#: builtin/checkout-index.c:195
ef317cd5 3317msgid "update stat information in the index file"
07432cef 3318msgstr "更新索引中文件的状态信息"
ef317cd5 3319
6acbf033 3320#: builtin/checkout-index.c:201
ef317cd5 3321msgid "read list of paths from the standard input"
07432cef 3322msgstr "从标准输入读取路径列表"
ef317cd5 3323
6acbf033 3324#: builtin/checkout-index.c:203
ef317cd5 3325msgid "write the content to temporary files"
07432cef 3326msgstr "将内容写入临时文件"
ef317cd5 3327
6acbf033 3328#: builtin/checkout-index.c:204 builtin/column.c:30
ef317cd5 3329msgid "string"
07432cef 3330msgstr "字符串"
ef317cd5 3331
6acbf033 3332#: builtin/checkout-index.c:205
ef317cd5 3333msgid "when creating files, prepend <string>"
07432cef 3334msgstr "在创建文件时,在前面加上<字符串>"
ef317cd5 3335
6acbf033 3336#: builtin/checkout-index.c:208
ef317cd5 3337msgid "copy out the files from named stage"
07432cef 3338msgstr "从指定暂存区中拷出文件"
ef317cd5
JX
3339
3340#: builtin/checkout.c:25
ef317cd5 3341msgid "git checkout [options] <branch>"
07432cef 3342msgstr "git checkout [选项] <分支>"
ef317cd5
JX
3343
3344#: builtin/checkout.c:26
ef317cd5 3345msgid "git checkout [options] [<branch>] -- <file>..."
07432cef 3346msgstr "git checkout [选项] [<分支>] -- <文件>..."
ef317cd5 3347
04cb2f28 3348#: builtin/checkout.c:132 builtin/checkout.c:165
c04f5ac3
JX
3349#, c-format
3350msgid "path '%s' does not have our version"
3351msgstr "路径 '%s' 没有我们的版本"
3352
04cb2f28 3353#: builtin/checkout.c:134 builtin/checkout.c:167
c04f5ac3
JX
3354#, c-format
3355msgid "path '%s' does not have their version"
3356msgstr "路径 '%s' 没有他们的版本"
3357
04cb2f28 3358#: builtin/checkout.c:150
c04f5ac3
JX
3359#, c-format
3360msgid "path '%s' does not have all necessary versions"
3361msgstr "路径 '%s' 没有全部必须的版本"
3362
04cb2f28 3363#: builtin/checkout.c:194
c04f5ac3
JX
3364#, c-format
3365msgid "path '%s' does not have necessary versions"
3366msgstr "路径 '%s' 没有必须的版本"
3367
04cb2f28 3368#: builtin/checkout.c:211
c04f5ac3
JX
3369#, c-format
3370msgid "path '%s': cannot merge"
90e6ef53 3371msgstr "path '%s':无法合并"
c04f5ac3 3372
04cb2f28 3373#: builtin/checkout.c:228
c04f5ac3
JX
3374#, c-format
3375msgid "Unable to add merge result for '%s'"
3376msgstr "无法为 '%s' 添加合并结果"
3377
04cb2f28
JX
3378#: builtin/checkout.c:249 builtin/checkout.c:252 builtin/checkout.c:255
3379#: builtin/checkout.c:258
07432cef 3380#, c-format
ef317cd5 3381msgid "'%s' cannot be used with updating paths"
07432cef 3382msgstr "'%s' 不能在更新路径时使用"
ef317cd5 3383
04cb2f28 3384#: builtin/checkout.c:261 builtin/checkout.c:264
07432cef 3385#, c-format
ef317cd5 3386msgid "'%s' cannot be used with %s"
07432cef 3387msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 3388
04cb2f28 3389#: builtin/checkout.c:267
ef317cd5
JX
3390#, c-format
3391msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 3392msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 3393
04cb2f28 3394#: builtin/checkout.c:278 builtin/checkout.c:467
c04f5ac3 3395msgid "corrupt index file"
90e6ef53 3396msgstr "损坏的索引文件"
c04f5ac3 3397
04cb2f28 3398#: builtin/checkout.c:338 builtin/checkout.c:345
c04f5ac3
JX
3399#, c-format
3400msgid "path '%s' is unmerged"
3401msgstr "路径 '%s' 未合并"
3402
04cb2f28 3403#: builtin/checkout.c:489
c04f5ac3 3404msgid "you need to resolve your current index first"
90e6ef53 3405msgstr "您需要先解决当前索引的冲突"
c04f5ac3 3406
04cb2f28 3407#: builtin/checkout.c:615
c04f5ac3
JX
3408#, c-format
3409msgid "Can not do reflog for '%s'\n"
90e6ef53 3410msgstr "不能对 '%s' 执行 reflog 操作\n"
c04f5ac3 3411
04cb2f28 3412#: builtin/checkout.c:653
c04f5ac3
JX
3413msgid "HEAD is now at"
3414msgstr "HEAD 目前位于"
3415
04cb2f28 3416#: builtin/checkout.c:660
c04f5ac3
JX
3417#, c-format
3418msgid "Reset branch '%s'\n"
3419msgstr "重置分支 '%s'\n"
3420
04cb2f28 3421#: builtin/checkout.c:663
c04f5ac3
JX
3422#, c-format
3423msgid "Already on '%s'\n"
3424msgstr "已经位于 '%s'\n"
3425
04cb2f28 3426#: builtin/checkout.c:667
c04f5ac3
JX
3427#, c-format
3428msgid "Switched to and reset branch '%s'\n"
3429msgstr "切换并重置分支 '%s'\n"
3430
04cb2f28 3431#: builtin/checkout.c:669 builtin/checkout.c:1050
c04f5ac3
JX
3432#, c-format
3433msgid "Switched to a new branch '%s'\n"
3434msgstr "切换到一个新分支 '%s'\n"
3435
04cb2f28 3436#: builtin/checkout.c:671
c04f5ac3
JX
3437#, c-format
3438msgid "Switched to branch '%s'\n"
3439msgstr "切换到分支 '%s'\n"
3440
90e6ef53 3441# 译者:注意保持前导空格
04cb2f28 3442#: builtin/checkout.c:723
c04f5ac3
JX
3443#, c-format
3444msgid " ... and %d more.\n"
90e6ef53 3445msgstr " ... 及其它 %d 个。\n"
c04f5ac3 3446
04cb2f28 3447#: builtin/checkout.c:729
c04f5ac3
JX
3448#, c-format
3449msgid ""
3450"Warning: you are leaving %d commit behind, not connected to\n"
3451"any of your branches:\n"
3452"\n"
3453"%s\n"
3454msgid_plural ""
3455"Warning: you are leaving %d commits behind, not connected to\n"
3456"any of your branches:\n"
3457"\n"
3458"%s\n"
3459msgstr[0] ""
3460"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3461"\n"
3462"%s\n"
5ae481e0
JX
3463msgstr[1] ""
3464"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3465"\n"
3466"%s\n"
c04f5ac3 3467
04cb2f28 3468#: builtin/checkout.c:747
c04f5ac3
JX
3469#, c-format
3470msgid ""
3471"If you want to keep them by creating a new branch, this may be a good time\n"
3472"to do so with:\n"
3473"\n"
3474" git branch new_branch_name %s\n"
3475"\n"
3476msgstr ""
3477"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
3478"如下操作:\n"
3479"\n"
3480" git branch new_branch_name %s\n"
3481"\n"
3482
04cb2f28 3483#: builtin/checkout.c:777
c04f5ac3
JX
3484msgid "internal error in revision walk"
3485msgstr "在版本遍历时遇到内部错误"
3486
04cb2f28 3487#: builtin/checkout.c:781
c04f5ac3
JX
3488msgid "Previous HEAD position was"
3489msgstr "之前的 HEAD 位置是"
3490
04cb2f28 3491#: builtin/checkout.c:808 builtin/checkout.c:1045
c04f5ac3 3492msgid "You are on a branch yet to be born"
90e6ef53 3493msgstr "您位于一个尚未初始化的分支"
c04f5ac3 3494
04cb2f28 3495#: builtin/checkout.c:952
90314792
JX
3496#, c-format
3497msgid "only one reference expected, %d given."
3498msgstr "只要一个引用,却给出了 %d 个"
3499
04cb2f28 3500#: builtin/checkout.c:991
c04f5ac3
JX
3501#, c-format
3502msgid "invalid reference: %s"
3503msgstr "无效引用:%s"
3504
04cb2f28 3505#: builtin/checkout.c:1020
c04f5ac3
JX
3506#, c-format
3507msgid "reference is not a tree: %s"
3508msgstr "引用不是一个树:%s"
3509
04cb2f28 3510#: builtin/checkout.c:1059
ef317cd5 3511msgid "paths cannot be used with switching branches"
07432cef 3512msgstr "路径不能和切换分支同时使用"
c04f5ac3 3513
04cb2f28 3514#: builtin/checkout.c:1062 builtin/checkout.c:1066
07432cef 3515#, c-format
ef317cd5 3516msgid "'%s' cannot be used with switching branches"
07432cef 3517msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 3518
04cb2f28
JX
3519#: builtin/checkout.c:1070 builtin/checkout.c:1073 builtin/checkout.c:1078
3520#: builtin/checkout.c:1081
07432cef 3521#, c-format
ef317cd5 3522msgid "'%s' cannot be used with '%s'"
07432cef 3523msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 3524
04cb2f28 3525#: builtin/checkout.c:1086
07432cef 3526#, c-format
ef317cd5 3527msgid "Cannot switch branch to a non-commit '%s'"
07432cef 3528msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 3529
04cb2f28 3530#: builtin/checkout.c:1108 builtin/checkout.c:1110 builtin/clone.c:90
cfff71a9 3531#: builtin/remote.c:159 builtin/remote.c:161
ef317cd5 3532msgid "branch"
07432cef 3533msgstr "分支"
c04f5ac3 3534
04cb2f28 3535#: builtin/checkout.c:1109
ef317cd5 3536msgid "create and checkout a new branch"
07432cef 3537msgstr "创建并检出一个新的分支"
c04f5ac3 3538
04cb2f28 3539#: builtin/checkout.c:1111
ef317cd5 3540msgid "create/reset and checkout a branch"
07432cef 3541msgstr "创建/重置并检出一个分支"
c04f5ac3 3542
04cb2f28 3543#: builtin/checkout.c:1112
ef317cd5 3544msgid "create reflog for new branch"
07432cef 3545msgstr "为新的分支创建引用日志"
ef317cd5 3546
04cb2f28 3547#: builtin/checkout.c:1113
ef317cd5 3548msgid "detach the HEAD at named commit"
07432cef 3549msgstr "成为指向该提交的分离头指针"
ef317cd5 3550
04cb2f28 3551#: builtin/checkout.c:1114
ef317cd5 3552msgid "set upstream info for new branch"
07432cef 3553msgstr "为新的分支设置上游信息"
ef317cd5 3554
04cb2f28 3555#: builtin/checkout.c:1116
6c94aba5 3556msgid "new-branch"
07432cef 3557msgstr "新分支"
ef317cd5 3558
04cb2f28 3559#: builtin/checkout.c:1116
ef317cd5 3560msgid "new unparented branch"
07432cef 3561msgstr "新的没有父提交的分支"
ef317cd5 3562
04cb2f28 3563#: builtin/checkout.c:1117
ef317cd5 3564msgid "checkout our version for unmerged files"
07432cef 3565msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 3566
04cb2f28 3567#: builtin/checkout.c:1119
ef317cd5 3568msgid "checkout their version for unmerged files"
07432cef 3569msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 3570
04cb2f28 3571#: builtin/checkout.c:1121
ef317cd5 3572msgid "force checkout (throw away local modifications)"
07432cef 3573msgstr "强制检出(丢弃本地修改)"
c04f5ac3 3574
04cb2f28 3575#: builtin/checkout.c:1122
ef317cd5 3576msgid "perform a 3-way merge with the new branch"
07432cef 3577msgstr "和新的分支执行三路合并"
ef317cd5 3578
04cb2f28 3579#: builtin/checkout.c:1123 builtin/merge.c:227
ef317cd5 3580msgid "update ignored files (default)"
07432cef 3581msgstr "更新忽略的文件(默认)"
c04f5ac3 3582
04cb2f28 3583#: builtin/checkout.c:1124 builtin/log.c:1239 parse-options.h:245
ef317cd5 3584msgid "style"
07432cef 3585msgstr "风格"
ef317cd5 3586
04cb2f28 3587#: builtin/checkout.c:1125
ef317cd5 3588msgid "conflict style (merge or diff3)"
07432cef 3589msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 3590
04cb2f28 3591#: builtin/checkout.c:1128
4dcdc3d8
JX
3592msgid "do not limit pathspecs to sparse entries only"
3593msgstr "对路径不做稀疏检出的限制"
3594
04cb2f28 3595#: builtin/checkout.c:1130
ef317cd5 3596msgid "second guess 'git checkout no-such-branch'"
07432cef 3597msgstr "再者猜测'git checkout no-such-branch'"
ef317cd5 3598
04cb2f28 3599#: builtin/checkout.c:1153
ef317cd5 3600msgid "-b, -B and --orphan are mutually exclusive"
07432cef 3601msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 3602
04cb2f28 3603#: builtin/checkout.c:1170
ef317cd5
JX
3604msgid "--track needs a branch name"
3605msgstr "--track 需要一个分支名"
3606
04cb2f28 3607#: builtin/checkout.c:1175
ef317cd5
JX
3608msgid "Missing branch name; try -b"
3609msgstr "缺少分支名;尝试 -b"
3610
04cb2f28 3611#: builtin/checkout.c:1212
c04f5ac3 3612msgid "invalid path specification"
90e6ef53 3613msgstr "无效的路径规格"
c04f5ac3 3614
04cb2f28 3615#: builtin/checkout.c:1219
07432cef 3616#, c-format
c04f5ac3 3617msgid ""
ef317cd5 3618"Cannot update paths and switch to branch '%s' at the same time.\n"
c04f5ac3
JX
3619"Did you intend to checkout '%s' which can not be resolved as commit?"
3620msgstr ""
07432cef
WS
3621"不能同时更新路径并切换到分支'%s'。\n"
3622"您是想要检出 '%s' 但其未能解析为提交么?"
c04f5ac3 3623
04cb2f28 3624#: builtin/checkout.c:1224
07432cef 3625#, c-format
ef317cd5 3626msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 3627msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 3628
04cb2f28 3629#: builtin/checkout.c:1228
c04f5ac3
JX
3630msgid ""
3631"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3632"checking out of the index."
3633msgstr ""
90e6ef53 3634"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 3635
90314792 3636#: builtin/clean.c:26
2e8451e8
JX
3637msgid ""
3638"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3639msgstr ""
3640"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 3641
90314792 3642#: builtin/clean.c:30
07432cef
WS
3643#, c-format
3644msgid "Removing %s\n"
3645msgstr "正删除 %s\n"
3646
90314792 3647#: builtin/clean.c:31
07432cef
WS
3648#, c-format
3649msgid "Would remove %s\n"
3650msgstr "将删除 %s\n"
3651
90314792 3652#: builtin/clean.c:32
07432cef
WS
3653#, c-format
3654msgid "Skipping repository %s\n"
3655msgstr "忽略版本库 %s\n"
3656
90314792 3657#: builtin/clean.c:33
07432cef
WS
3658#, c-format
3659msgid "Would skip repository %s\n"
3660msgstr "将忽略版本库 %s\n"
3661
90314792 3662#: builtin/clean.c:34
07432cef
WS
3663#, c-format
3664msgid "failed to remove %s"
3665msgstr "无法删除 %s"
3666
6c94aba5 3667#: builtin/clean.c:295
2e8451e8
JX
3668msgid ""
3669"Prompt help:\n"
3670"1 - select a numbered item\n"
3671"foo - select item based on unique prefix\n"
3672" - (empty) select nothing"
3673msgstr ""
3674"帮助:\n"
3675"1 - 通过编号选择一个选项\n"
3676"foo - 通过标题选择一个选项\n"
3677" - (空)什么也不选择"
3678
6c94aba5 3679#: builtin/clean.c:299
2e8451e8
JX
3680msgid ""
3681"Prompt help:\n"
3682"1 - select a single item\n"
3683"3-5 - select a range of items\n"
3684"2-3,6-9 - select multiple ranges\n"
3685"foo - select item based on unique prefix\n"
3686"-... - unselect specified items\n"
3687"* - choose all items\n"
3688" - (empty) finish selecting"
3689msgstr ""
3690"帮助:\n"
3691"1 - 选择一个选项\n"
3692"3-5 - 选择一个范围内的所有选项\n"
3693"2-3,6-9 - 选择多个范围内的所有选项\n"
3694"foo - 通过标题选择一个选项\n"
3695"-... - 反选特定的选项\n"
3696"* - 选择所有选项\n"
3697" - (空)结束选择"
3698
6c94aba5 3699#: builtin/clean.c:517
2e8451e8
JX
3700#, c-format
3701msgid "Huh (%s)?"
3702msgstr "嗯(%s)?"
3703
6acbf033 3704#: builtin/clean.c:659
2e8451e8
JX
3705#, c-format
3706msgid "Input ignore patterns>> "
3707msgstr "输入模版以排除条目>> "
3708
6acbf033 3709#: builtin/clean.c:696
2e8451e8
JX
3710#, c-format
3711msgid "WARNING: Cannot find items matched by: %s"
3712msgstr "警告:无法找到和 %s 匹配的条目"
3713
6acbf033 3714#: builtin/clean.c:717
2e8451e8
JX
3715msgid "Select items to delete"
3716msgstr "选择要删除的条目"
3717
6acbf033 3718#: builtin/clean.c:757
2e8451e8
JX
3719#, c-format
3720msgid "remove %s? "
3721msgstr "删除 %s?"
3722
6acbf033 3723#: builtin/clean.c:782
2e8451e8
JX
3724msgid "Bye."
3725msgstr "再见。"
3726
6acbf033 3727#: builtin/clean.c:790
2e8451e8
JX
3728msgid ""
3729"clean - start cleaning\n"
3730"filter by pattern - exclude items from deletion\n"
3731"select by numbers - select items to be deleted by numbers\n"
3732"ask each - confirm each deletion (like \"rm -i\")\n"
3733"quit - stop cleaning\n"
3734"help - this screen\n"
3735"? - help for prompt selection"
3736msgstr ""
3737"clean - 开始清理\n"
3738"filter by pattern - 通过模版排除要删除的条目\n"
3739"select by numbers - 通过数字选择要删除的条目\n"
3740"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
3741"quit - 停止删除并退出\n"
3742"help - 显示本帮助\n"
3743"? - 显示如何在提示符下选择的帮助"
3744
6acbf033 3745#: builtin/clean.c:817
2e8451e8
JX
3746msgid "*** Commands ***"
3747msgstr "*** 命令 ***"
3748
6acbf033 3749#: builtin/clean.c:818
2e8451e8
JX
3750msgid "What now"
3751msgstr "请选择"
3752
6acbf033 3753#: builtin/clean.c:826
2e8451e8
JX
3754msgid "Would remove the following item:"
3755msgid_plural "Would remove the following items:"
3756msgstr[0] "将删除如下条目:"
3757msgstr[1] "将删除如下条目:"
3758
6acbf033 3759#: builtin/clean.c:843
2e8451e8
JX
3760msgid "No more files to clean, exiting."
3761msgstr "没有要清理的文件,退出。"
3762
6acbf033 3763#: builtin/clean.c:874
ef317cd5 3764msgid "do not print names of files removed"
07432cef 3765msgstr "不打印删除文件的名称"
ef317cd5 3766
6acbf033 3767#: builtin/clean.c:876
ef317cd5 3768msgid "force"
07432cef 3769msgstr "强制"
ef317cd5 3770
6acbf033 3771#: builtin/clean.c:877
2e8451e8
JX
3772msgid "interactive cleaning"
3773msgstr "交互式清除"
3774
6acbf033 3775#: builtin/clean.c:879
ef317cd5 3776msgid "remove whole directories"
07432cef 3777msgstr "删除整个目录"
ef317cd5 3778
220c313c 3779#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714
6acbf033 3780#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185
ef317cd5 3781msgid "pattern"
07432cef 3782msgstr "模式"
ef317cd5 3783
6acbf033 3784#: builtin/clean.c:881
ef317cd5 3785msgid "add <pattern> to ignore rules"
07432cef 3786msgstr "添加<模式>到忽略规则"
ef317cd5 3787
6acbf033 3788#: builtin/clean.c:882
ef317cd5 3789msgid "remove ignored files, too"
07432cef 3790msgstr "也删除忽略的文件"
ef317cd5 3791
6acbf033 3792#: builtin/clean.c:884
ef317cd5 3793msgid "remove only ignored files"
07432cef 3794msgstr "只删除忽略的文件"
c04f5ac3 3795
6acbf033 3796#: builtin/clean.c:902
c04f5ac3 3797msgid "-x and -X cannot be used together"
649900bc 3798msgstr "-x 和 -X 不能同时使用"
c04f5ac3 3799
6acbf033 3800#: builtin/clean.c:906
c04f5ac3 3801msgid ""
6c94aba5 3802"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
2e8451e8 3803"clean"
c04f5ac3 3804msgstr ""
2e8451e8 3805"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 3806
6acbf033 3807#: builtin/clean.c:909
c04f5ac3 3808msgid ""
6c94aba5 3809"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
2e8451e8 3810"refusing to clean"
c04f5ac3 3811msgstr ""
2e8451e8 3812"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 3813
220c313c 3814#: builtin/clone.c:37
ef317cd5 3815msgid "git clone [options] [--] <repo> [<dir>]"
07432cef 3816msgstr "git clone [选项] [--] <版本库> [<路径>]"
ef317cd5 3817
04cb2f28 3818#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224
220c313c 3819#: builtin/push.c:514
ef317cd5 3820msgid "force progress reporting"
07432cef 3821msgstr "强制显示进度报告"
ef317cd5 3822
04cb2f28 3823#: builtin/clone.c:68
ef317cd5 3824msgid "don't create a checkout"
07432cef 3825msgstr "不创建一个检出"
ef317cd5 3826
04cb2f28 3827#: builtin/clone.c:69 builtin/clone.c:71 builtin/init-db.c:496
ef317cd5 3828msgid "create a bare repository"
220c313c 3829msgstr "创建一个纯版本库"
ef317cd5 3830
04cb2f28 3831#: builtin/clone.c:73
ef317cd5 3832msgid "create a mirror repository (implies bare)"
220c313c 3833msgstr "创建一个镜像版本库(也是纯版本库)"
ef317cd5 3834
04cb2f28 3835#: builtin/clone.c:75
ef317cd5 3836msgid "to clone from a local repository"
07432cef 3837msgstr "从本地版本库克隆"
ef317cd5 3838
04cb2f28 3839#: builtin/clone.c:77
ef317cd5 3840msgid "don't use local hardlinks, always copy"
07432cef 3841msgstr "不使用本地硬链接,始终复制"
ef317cd5 3842
04cb2f28 3843#: builtin/clone.c:79
ef317cd5 3844msgid "setup as shared repository"
07432cef 3845msgstr "设置为共享版本库"
ef317cd5 3846
04cb2f28 3847#: builtin/clone.c:81 builtin/clone.c:83
ef317cd5 3848msgid "initialize submodules in the clone"
07432cef 3849msgstr "在克隆时初始化子模组"
ef317cd5 3850
04cb2f28 3851#: builtin/clone.c:84 builtin/init-db.c:493
ef317cd5 3852msgid "template-directory"
07432cef 3853msgstr "模板目录"
ef317cd5 3854
04cb2f28 3855#: builtin/clone.c:85 builtin/init-db.c:494
ef317cd5 3856msgid "directory from which templates will be used"
07432cef 3857msgstr "模板目录将被使用"
ef317cd5 3858
04cb2f28 3859#: builtin/clone.c:87
ef317cd5 3860msgid "reference repository"
cfff71a9 3861msgstr "参考版本库"
ef317cd5 3862
04cb2f28 3863#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44
ef317cd5 3864msgid "name"
07432cef 3865msgstr "名称"
ef317cd5 3866
04cb2f28 3867#: builtin/clone.c:89
ef317cd5 3868msgid "use <name> instead of 'origin' to track upstream"
07432cef 3869msgstr "使用<名称>而不是 'origin' 去跟踪上游"
ef317cd5 3870
04cb2f28 3871#: builtin/clone.c:91
ef317cd5 3872msgid "checkout <branch> instead of the remote's HEAD"
07432cef 3873msgstr "检出<分支>而不是远程HEAD"
ef317cd5 3874
04cb2f28 3875#: builtin/clone.c:93
ef317cd5 3876msgid "path to git-upload-pack on the remote"
07432cef 3877msgstr "远程 git-upload-pack 路径"
ef317cd5 3878
04cb2f28 3879#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659
ef317cd5 3880msgid "depth"
07432cef 3881msgstr "深度"
ef317cd5 3882
04cb2f28 3883#: builtin/clone.c:95
ef317cd5 3884msgid "create a shallow clone of that depth"
07432cef 3885msgstr "创建一个指定深度的浅克隆"
ef317cd5 3886
04cb2f28 3887#: builtin/clone.c:97
ef317cd5 3888msgid "clone only one branch, HEAD or --branch"
07432cef 3889msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 3890
04cb2f28
JX
3891#: builtin/clone.c:99
3892msgid "use --reference only while cloning"
3893msgstr "仅在克隆时参考 --reference 指向的本地版本库"
3894
3895#: builtin/clone.c:100 builtin/init-db.c:502
ef317cd5 3896msgid "gitdir"
07432cef 3897msgstr "git目录"
ef317cd5 3898
04cb2f28 3899#: builtin/clone.c:101 builtin/init-db.c:503
ef317cd5 3900msgid "separate git dir from working tree"
07432cef 3901msgstr "git目录和工作区分离"
ef317cd5 3902
04cb2f28 3903#: builtin/clone.c:102
ef317cd5 3904msgid "key=value"
07432cef 3905msgstr "key=value"
ef317cd5 3906
04cb2f28 3907#: builtin/clone.c:103
ef317cd5 3908msgid "set config inside the new repository"
07432cef 3909msgstr "在新版本库中设置配置信息"
ef317cd5 3910
04cb2f28 3911#: builtin/clone.c:256
c04f5ac3 3912#, c-format
4dcdc3d8 3913msgid "reference repository '%s' is not a local repository."
cfff71a9 3914msgstr "参考版本库 '%s' 不是一个本地版本库。"
c04f5ac3 3915
04cb2f28 3916#: builtin/clone.c:260
cfff71a9
JX
3917#, c-format
3918msgid "reference repository '%s' is shallow"
3919msgstr "参考版本库 '%s' 是一个浅克隆"
3920
04cb2f28 3921#: builtin/clone.c:263
cfff71a9
JX
3922#, c-format
3923msgid "reference repository '%s' is grafted"
3924msgstr "参考版本库 '%s' 已被嫁接"
3925
04cb2f28 3926#: builtin/clone.c:325
c04f5ac3
JX
3927#, c-format
3928msgid "failed to create directory '%s'"
90e6ef53 3929msgstr "无法创建目录 '%s'"
c04f5ac3 3930
04cb2f28 3931#: builtin/clone.c:327 builtin/diff.c:84
c04f5ac3
JX
3932#, c-format
3933msgid "failed to stat '%s'"
90e6ef53 3934msgstr "无法枚举 '%s' 状态"
c04f5ac3 3935
04cb2f28 3936#: builtin/clone.c:329
c04f5ac3
JX
3937#, c-format
3938msgid "%s exists and is not a directory"
3939msgstr "%s 存在且不是一个目录"
3940
04cb2f28 3941#: builtin/clone.c:343
c04f5ac3
JX
3942#, c-format
3943msgid "failed to stat %s\n"
90e6ef53 3944msgstr "无法枚举 %s 状态\n"
c04f5ac3 3945
04cb2f28 3946#: builtin/clone.c:365
c04f5ac3
JX
3947#, c-format
3948msgid "failed to create link '%s'"
90e6ef53 3949msgstr "无法创建链接 '%s'"
c04f5ac3 3950
04cb2f28 3951#: builtin/clone.c:369
c04f5ac3
JX
3952#, c-format
3953msgid "failed to copy file to '%s'"
90e6ef53 3954msgstr "无法拷贝文件至 '%s'"
c04f5ac3 3955
04cb2f28 3956#: builtin/clone.c:392 builtin/clone.c:566
c04f5ac3
JX
3957#, c-format
3958msgid "done.\n"
3959msgstr "完成。\n"
3960
04cb2f28 3961#: builtin/clone.c:404
1003b3a5
JX
3962msgid ""
3963"Clone succeeded, but checkout failed.\n"
3964"You can inspect what was checked out with 'git status'\n"
3965"and retry the checkout with 'git checkout -f HEAD'\n"
3966msgstr ""
3967"克隆成功,但是检出失败。\n"
3968"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
3969"'git checkout -f HEAD' 重试\n"
3970
04cb2f28 3971#: builtin/clone.c:481
c04f5ac3
JX
3972#, c-format
3973msgid "Could not find remote branch %s to clone."
90e6ef53 3974msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 3975
04cb2f28 3976#: builtin/clone.c:561
2e8451e8
JX
3977#, c-format
3978msgid "Checking connectivity... "
3979msgstr "检查连接... "
3980
04cb2f28 3981#: builtin/clone.c:564
1003b3a5
JX
3982msgid "remote did not send all necessary objects"
3983msgstr "远程没有发送所有必须的对象"
3984
04cb2f28 3985#: builtin/clone.c:628
c04f5ac3
JX
3986msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3987msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3988
04cb2f28 3989#: builtin/clone.c:659
1003b3a5
JX
3990msgid "unable to checkout working tree"
3991msgstr "不能检出工作区"
3992
04cb2f28
JX
3993#: builtin/clone.c:746
3994msgid "cannot repack to clean up"
3995msgstr "无法执行 repack 来清理"
3996
3997#: builtin/clone.c:748
3998msgid "cannot unlink temporary alternates file"
3999msgstr "无法删除临时的 alternates 文件"
4000
4001#: builtin/clone.c:778
c04f5ac3
JX
4002msgid "Too many arguments."
4003msgstr "太多参数。"
4004
04cb2f28 4005#: builtin/clone.c:782
c04f5ac3 4006msgid "You must specify a repository to clone."
90e6ef53 4007msgstr "您必须指定一个版本库来克隆。"
c04f5ac3 4008
04cb2f28 4009#: builtin/clone.c:793
c04f5ac3
JX
4010#, c-format
4011msgid "--bare and --origin %s options are incompatible."
4012msgstr "--bare 和 --origin %s 选项不兼容。"
4013
04cb2f28 4014#: builtin/clone.c:796
07432cef
WS
4015msgid "--bare and --separate-git-dir are incompatible."
4016msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4017
04cb2f28 4018#: builtin/clone.c:809
c04f5ac3
JX
4019#, c-format
4020msgid "repository '%s' does not exist"
4021msgstr "版本库 '%s' 不存在"
4022
04cb2f28 4023#: builtin/clone.c:815 builtin/fetch.c:1155
cfff71a9
JX
4024#, c-format
4025msgid "depth %s is not a positive number"
4026msgstr "深度 %s 不是一个正数"
4027
04cb2f28 4028#: builtin/clone.c:825
c04f5ac3
JX
4029#, c-format
4030msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 4031msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 4032
04cb2f28 4033#: builtin/clone.c:835
c04f5ac3
JX
4034#, c-format
4035msgid "working tree '%s' already exists."
4036msgstr "工作区 '%s' 已经存在。"
4037
04cb2f28 4038#: builtin/clone.c:848 builtin/clone.c:860
c04f5ac3
JX
4039#, c-format
4040msgid "could not create leading directories of '%s'"
90e6ef53 4041msgstr "不能为 '%s' 创建先导目录"
c04f5ac3 4042
04cb2f28 4043#: builtin/clone.c:851
c04f5ac3
JX
4044#, c-format
4045msgid "could not create work tree dir '%s'."
90e6ef53 4046msgstr "不能为 '%s' 创建工作区目录。"
c04f5ac3 4047
04cb2f28 4048#: builtin/clone.c:870
c04f5ac3
JX
4049#, c-format
4050msgid "Cloning into bare repository '%s'...\n"
220c313c 4051msgstr "克隆到纯版本库 '%s'...\n"
c04f5ac3 4052
04cb2f28 4053#: builtin/clone.c:872
c04f5ac3
JX
4054#, c-format
4055msgid "Cloning into '%s'...\n"
4056msgstr "正克隆到 '%s'...\n"
4057
04cb2f28
JX
4058#: builtin/clone.c:897
4059msgid "--dissociate given, but there is no --reference"
4060msgstr "提供了参数 --dissociate,但未提供 --reference"
4061
4062#: builtin/clone.c:912
6acbf033
JX
4063msgid "--depth is ignored in local clones; use file:// instead."
4064msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
4065
04cb2f28 4066#: builtin/clone.c:915
6acbf033
JX
4067msgid "source repository is shallow, ignoring --local"
4068msgstr "源版本库是浅克隆,忽略 --local"
4069
04cb2f28 4070#: builtin/clone.c:920
6acbf033
JX
4071msgid "--local is ignored"
4072msgstr "--local 被忽略"
4073
04cb2f28 4074#: builtin/clone.c:924
c04f5ac3
JX
4075#, c-format
4076msgid "Don't know how to clone %s"
4077msgstr "不知道如何克隆 %s"
4078
04cb2f28 4079#: builtin/clone.c:975 builtin/clone.c:983
c04f5ac3
JX
4080#, c-format
4081msgid "Remote branch %s not found in upstream %s"
4082msgstr "远程分支 %s 在上游 %s 未发现"
4083
04cb2f28 4084#: builtin/clone.c:986
c04f5ac3
JX
4085msgid "You appear to have cloned an empty repository."
4086msgstr "您似乎克隆了一个空版本库。"
4087
ef317cd5
JX
4088#: builtin/column.c:9
4089msgid "git column [options]"
07432cef 4090msgstr "git column [选项]"
ef317cd5
JX
4091
4092#: builtin/column.c:26
4093msgid "lookup config vars"
07432cef 4094msgstr "查找配置变量"
ef317cd5
JX
4095
4096#: builtin/column.c:27 builtin/column.c:28
ef317cd5 4097msgid "layout to use"
07432cef 4098msgstr "要使用的布局"
ef317cd5
JX
4099
4100#: builtin/column.c:29
4101msgid "Maximum width"
07432cef 4102msgstr "最大宽度"
ef317cd5
JX
4103
4104#: builtin/column.c:30
4105msgid "Padding space on left border"
07432cef 4106msgstr "左边框的填充空间"
ef317cd5
JX
4107
4108#: builtin/column.c:31
4109msgid "Padding space on right border"
07432cef 4110msgstr "右边框的填充空间"
ef317cd5
JX
4111
4112#: builtin/column.c:32
4113msgid "Padding space between columns"
07432cef 4114msgstr "两列之间的填充空间"
ef317cd5 4115
8ada9598
JX
4116#: builtin/column.c:51
4117msgid "--command must be the first argument"
81809b99 4118msgstr "--command 必须是第一个参数"
8ada9598 4119
220c313c 4120#: builtin/commit.c:37
a77c07d9 4121msgid "git commit [options] [--] <pathspec>..."
90314792 4122msgstr "git commit [选项] [--] <路径规则>..."
ef317cd5 4123
220c313c 4124#: builtin/commit.c:42
a77c07d9 4125msgid "git status [options] [--] <pathspec>..."
90314792 4126msgstr "git status [选项] [--] <路径规则>..."
ef317cd5 4127
220c313c
JX
4128#: builtin/commit.c:47
4129msgid ""
4130"Your name and email address were configured automatically based\n"
4131"on your username and hostname. Please check that they are accurate.\n"
4132"You can suppress this message by setting them explicitly. Run the\n"
4133"following command and follow the instructions in your editor to edit\n"
4134"your configuration file:\n"
4135"\n"
4136" git config --global --edit\n"
4137"\n"
4138"After doing this, you may fix the identity used for this commit with:\n"
4139"\n"
4140" git commit --amend --reset-author\n"
4141msgstr ""
4142"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
4143"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
4144"中编辑您的配置文件:\n"
4145"\n"
4146" git config --global --edit\n"
4147"\n"
4148"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
4149"\n"
4150" git commit --amend --reset-author\n"
4151
4152#: builtin/commit.c:60
c04f5ac3
JX
4153msgid ""
4154"Your name and email address were configured automatically based\n"
4155"on your username and hostname. Please check that they are accurate.\n"
4156"You can suppress this message by setting them explicitly:\n"
4157"\n"
4158" git config --global user.name \"Your Name\"\n"
4159" git config --global user.email you@example.com\n"
4160"\n"
4161"After doing this, you may fix the identity used for this commit with:\n"
4162"\n"
4163" git commit --amend --reset-author\n"
4164msgstr ""
90e6ef53 4165"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
220c313c 4166"与否。您可以对其进行设置以免再出现本提示信息:\n"
c04f5ac3
JX
4167"\n"
4168" git config --global user.name \"Your Name\"\n"
4169" git config --global user.email you@example.com\n"
4170"\n"
90e6ef53 4171"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
c04f5ac3
JX
4172"\n"
4173" git commit --amend --reset-author\n"
4174
220c313c 4175#: builtin/commit.c:72
c04f5ac3
JX
4176msgid ""
4177"You asked to amend the most recent commit, but doing so would make\n"
4178"it empty. You can repeat your command with --allow-empty, or you can\n"
4179"remove the commit entirely with \"git reset HEAD^\".\n"
4180msgstr ""
1b150dc9
T
4181"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
4182"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 4183
220c313c 4184#: builtin/commit.c:77
c04f5ac3
JX
4185msgid ""
4186"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
4187"If you wish to commit it anyway, use:\n"
4188"\n"
4189" git commit --allow-empty\n"
4190"\n"
c04f5ac3 4191msgstr ""
a9ce4543
T
4192"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
4193"也要提交,使用命令:\n"
c04f5ac3
JX
4194"\n"
4195" git commit --allow-empty\n"
4196"\n"
c04f5ac3 4197
220c313c 4198#: builtin/commit.c:84
b1894384
JX
4199msgid "Otherwise, please use 'git reset'\n"
4200msgstr "否则,请使用命令 'git reset'\n"
4201
220c313c 4202#: builtin/commit.c:87
b1894384
JX
4203msgid ""
4204"If you wish to skip this commit, use:\n"
4205"\n"
4206" git reset\n"
4207"\n"
4208"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
4209"the remaining commits.\n"
4210msgstr ""
4211"如果您想跳过这个提交,使用命令:\n"
4212"\n"
4213" git reset\n"
4214"\n"
4215"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
4216"操作。\n"
4217
220c313c 4218#: builtin/commit.c:302
c04f5ac3 4219msgid "failed to unpack HEAD tree object"
90e6ef53 4220msgstr "无法解包 HEAD 树对象"
c04f5ac3 4221
220c313c 4222#: builtin/commit.c:342
c04f5ac3 4223msgid "unable to create temporary index"
90e6ef53 4224msgstr "不能创建临时索引"
c04f5ac3 4225
220c313c 4226#: builtin/commit.c:348
c04f5ac3
JX
4227msgid "interactive add failed"
4228msgstr "交互式添加失败"
4229
220c313c
JX
4230#: builtin/commit.c:359
4231msgid "unable to write index file"
4232msgstr "无法写入索引文件"
4233
4234#: builtin/commit.c:361
4235msgid "unable to update temporary index"
4236msgstr "无法更新临时索引"
4237
4238#: builtin/commit.c:363
4239msgid "Failed to update main cache tree"
4240msgstr "不能更新树的主缓存"
4241
4242#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461
c04f5ac3 4243msgid "unable to write new_index file"
90e6ef53 4244msgstr "无法写 new_index 文件"
c04f5ac3 4245
220c313c 4246#: builtin/commit.c:443
8ada9598 4247msgid "cannot do a partial commit during a merge."
81809b99 4248msgstr "在合并过程中不能做部分提交。"
c04f5ac3 4249
220c313c 4250#: builtin/commit.c:445
8ada9598 4251msgid "cannot do a partial commit during a cherry-pick."
81809b99 4252msgstr "在拣选过程中不能做部分提交。"
8ada9598 4253
220c313c 4254#: builtin/commit.c:454
c04f5ac3 4255msgid "cannot read the index"
90e6ef53 4256msgstr "无法读取索引"
c04f5ac3 4257
220c313c 4258#: builtin/commit.c:473
c04f5ac3 4259msgid "unable to write temporary index file"
90e6ef53 4260msgstr "无法写临时索引文件"
c04f5ac3 4261
04cb2f28 4262#: builtin/commit.c:584
220c313c
JX
4263#, c-format
4264msgid "commit '%s' lacks author header"
4265msgstr "提交 '%s' 缺少作者信息"
4266
04cb2f28 4267#: builtin/commit.c:586
c04f5ac3 4268#, c-format
220c313c
JX
4269msgid "commit '%s' has malformed author line"
4270msgstr "提交 '%s' 有非法的作者信息"
c04f5ac3 4271
04cb2f28 4272#: builtin/commit.c:605
c04f5ac3
JX
4273msgid "malformed --author parameter"
4274msgstr "非法的 --author 参数"
4275
04cb2f28 4276#: builtin/commit.c:613
c04f5ac3 4277#, c-format
6acbf033
JX
4278msgid "invalid date format: %s"
4279msgstr "无效的日期格式:%s"
4280
04cb2f28 4281#: builtin/commit.c:657
6acbf033
JX
4282msgid ""
4283"unable to select a comment character that is not used\n"
4284"in the current commit message"
4285msgstr "无法选择一个未被当前提交说明使用的注释字符"
4286
04cb2f28 4287#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084
c04f5ac3
JX
4288#, c-format
4289msgid "could not lookup commit %s"
4290msgstr "不能查询提交 %s"
4291
04cb2f28 4292#: builtin/commit.c:706 builtin/shortlog.c:273
c04f5ac3
JX
4293#, c-format
4294msgid "(reading log message from standard input)\n"
90e6ef53 4295msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 4296
04cb2f28 4297#: builtin/commit.c:708
c04f5ac3 4298msgid "could not read log from standard input"
90e6ef53 4299msgstr "不能从标准输入中读取日志信息"
c04f5ac3 4300
04cb2f28 4301#: builtin/commit.c:712
c04f5ac3
JX
4302#, c-format
4303msgid "could not read log file '%s'"
90e6ef53 4304msgstr "不能读取日志文件 '%s'"
c04f5ac3 4305
04cb2f28 4306#: builtin/commit.c:734
c04f5ac3 4307msgid "could not read MERGE_MSG"
90e6ef53 4308msgstr "不能读取 MERGE_MSG"
c04f5ac3 4309
04cb2f28 4310#: builtin/commit.c:738
c04f5ac3 4311msgid "could not read SQUASH_MSG"
90e6ef53 4312msgstr "不能读取 SQUASH_MSG"
c04f5ac3 4313
04cb2f28 4314#: builtin/commit.c:742
c04f5ac3
JX
4315#, c-format
4316msgid "could not read '%s'"
90e6ef53 4317msgstr "不能读取 '%s'"
c04f5ac3 4318
04cb2f28 4319#: builtin/commit.c:789
c04f5ac3 4320msgid "could not write commit template"
90e6ef53 4321msgstr "不能写提交模版"
c04f5ac3 4322
04cb2f28 4323#: builtin/commit.c:807
81809b99 4324#, c-format
c04f5ac3
JX
4325msgid ""
4326"\n"
8ada9598 4327"It looks like you may be committing a merge.\n"
c04f5ac3
JX
4328"If this is not correct, please remove the file\n"
4329"\t%s\n"
4330"and try again.\n"
4331msgstr ""
4332"\n"
649900bc 4333"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
4334"\t%s\n"
4335"然后重试。\n"
4336
04cb2f28 4337#: builtin/commit.c:812
81809b99 4338#, c-format
8ada9598
JX
4339msgid ""
4340"\n"
4341"It looks like you may be committing a cherry-pick.\n"
4342"If this is not correct, please remove the file\n"
4343"\t%s\n"
4344"and try again.\n"
4345msgstr ""
4346"\n"
649900bc 4347"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
4348"\t%s\n"
4349"然后重试。\n"
c04f5ac3 4350
04cb2f28 4351#: builtin/commit.c:825
a77c07d9 4352#, c-format
c04f5ac3 4353msgid ""
8ada9598 4354"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 4355"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 4356msgstr ""
a77c07d9 4357"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 4358"说明将会终止提交。\n"
c04f5ac3 4359
04cb2f28 4360#: builtin/commit.c:832
a77c07d9 4361#, c-format
c04f5ac3 4362msgid ""
8ada9598 4363"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 4364"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
4365"An empty message aborts the commit.\n"
4366msgstr ""
a77c07d9
JX
4367"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4368"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 4369
90e6ef53 4370# 译者:为保证在输出中对齐,注意调整句中空格!
04cb2f28 4371#: builtin/commit.c:852
6acbf033
JX
4372#, c-format
4373msgid "%sAuthor: %.*s <%.*s>"
4374msgstr "%s作者: %.*s <%.*s>"
4375
4376# 译者:为保证在输出中对齐,注意调整句中空格!
04cb2f28 4377#: builtin/commit.c:860
c04f5ac3 4378#, c-format
6acbf033
JX
4379msgid "%sDate: %s"
4380msgstr "%s日期: %s"
c04f5ac3 4381
90e6ef53 4382# 译者:为保证在输出中对齐,注意调整句中空格!
04cb2f28 4383#: builtin/commit.c:867
c04f5ac3 4384#, c-format
6acbf033
JX
4385msgid "%sCommitter: %.*s <%.*s>"
4386msgstr "%s提交者:%.*s <%.*s>"
c04f5ac3 4387
04cb2f28 4388#: builtin/commit.c:885
c04f5ac3 4389msgid "Cannot read index"
90e6ef53 4390msgstr "无法读取索引"
c04f5ac3 4391
04cb2f28 4392#: builtin/commit.c:942
c04f5ac3
JX
4393msgid "Error building trees"
4394msgstr "无法创建树对象"
4395
04cb2f28 4396#: builtin/commit.c:957 builtin/tag.c:495
c04f5ac3
JX
4397#, c-format
4398msgid "Please supply the message using either -m or -F option.\n"
07432cef 4399msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 4400
04cb2f28 4401#: builtin/commit.c:1059
c04f5ac3
JX
4402#, c-format
4403msgid "No existing author found with '%s'"
4404msgstr "没有找到匹配 '%s' 的作者"
4405
04cb2f28 4406#: builtin/commit.c:1074 builtin/commit.c:1314
c04f5ac3
JX
4407#, c-format
4408msgid "Invalid untracked files mode '%s'"
90e6ef53 4409msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 4410
04cb2f28 4411#: builtin/commit.c:1111
2e8451e8
JX
4412msgid "--long and -z are incompatible"
4413msgstr "--long 和 -z 选项不兼容"
4414
04cb2f28 4415#: builtin/commit.c:1141
c04f5ac3
JX
4416msgid "Using both --reset-author and --author does not make sense"
4417msgstr "同时使用 --reset-author 和 --author 没有意义"
4418
04cb2f28 4419#: builtin/commit.c:1150
c04f5ac3 4420msgid "You have nothing to amend."
90e6ef53 4421msgstr "您没有可修补的提交。"
c04f5ac3 4422
04cb2f28 4423#: builtin/commit.c:1153
8ada9598 4424msgid "You are in the middle of a merge -- cannot amend."
81809b99 4425msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 4426
04cb2f28 4427#: builtin/commit.c:1155
8ada9598 4428msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 4429msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 4430
04cb2f28 4431#: builtin/commit.c:1158
c04f5ac3 4432msgid "Options --squash and --fixup cannot be used together"
649900bc 4433msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 4434
04cb2f28 4435#: builtin/commit.c:1168
c04f5ac3
JX
4436msgid "Only one of -c/-C/-F/--fixup can be used."
4437msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4438
04cb2f28 4439#: builtin/commit.c:1170
c04f5ac3 4440msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
649900bc 4441msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
c04f5ac3 4442
04cb2f28 4443#: builtin/commit.c:1178
c04f5ac3 4444msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 4445msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 4446
04cb2f28 4447#: builtin/commit.c:1195
c04f5ac3
JX
4448msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4449msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4450
04cb2f28 4451#: builtin/commit.c:1197
c04f5ac3
JX
4452msgid "No paths with --include/--only does not make sense."
4453msgstr "参数 --include/--only 不跟路径没有意义。"
4454
04cb2f28 4455#: builtin/commit.c:1199
c04f5ac3 4456msgid "Clever... amending the last one with dirty index."
90e6ef53 4457msgstr "聪明... 在索引不干净下修补最后的提交。"
c04f5ac3 4458
04cb2f28 4459#: builtin/commit.c:1201
6c94aba5
JX
4460msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4461msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
c04f5ac3 4462
04cb2f28 4463#: builtin/commit.c:1213 builtin/tag.c:728
c04f5ac3
JX
4464#, c-format
4465msgid "Invalid cleanup mode %s"
4466msgstr "无效的清理模式 %s"
4467
04cb2f28 4468#: builtin/commit.c:1218
c04f5ac3 4469msgid "Paths with -a does not make sense."
649900bc 4470msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 4471
04cb2f28 4472#: builtin/commit.c:1328 builtin/commit.c:1608
ef317cd5 4473msgid "show status concisely"
07432cef 4474msgstr "以简洁的格式显示状态"
ef317cd5 4475
04cb2f28 4476#: builtin/commit.c:1330 builtin/commit.c:1610
ef317cd5 4477msgid "show branch information"
07432cef 4478msgstr "显示分支信息"
ef317cd5 4479
04cb2f28 4480#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500
ef317cd5 4481msgid "machine-readable output"
07432cef
WS
4482msgstr "机器可读的输出"
4483
04cb2f28 4484#: builtin/commit.c:1335 builtin/commit.c:1614
07432cef
WS
4485msgid "show status in long format (default)"
4486msgstr "以长格式显示状态(默认)"
ef317cd5 4487
04cb2f28 4488#: builtin/commit.c:1338 builtin/commit.c:1617
ef317cd5 4489msgid "terminate entries with NUL"
07432cef 4490msgstr "条目以NUL字符结尾"
ef317cd5 4491
04cb2f28 4492#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980
220c313c 4493#: builtin/fast-export.c:983 builtin/tag.c:603
ef317cd5 4494msgid "mode"
07432cef 4495msgstr "模式"
ef317cd5 4496
04cb2f28 4497#: builtin/commit.c:1341 builtin/commit.c:1620
ef317cd5 4498msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 4499msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 4500
04cb2f28 4501#: builtin/commit.c:1344
ef317cd5 4502msgid "show ignored files"
07432cef 4503msgstr "显示忽略的文件"
ef317cd5 4504
04cb2f28 4505#: builtin/commit.c:1345 parse-options.h:153
ef317cd5
JX
4506msgid "when"
4507msgstr "何时"
4508
04cb2f28 4509#: builtin/commit.c:1346
ef317cd5
JX
4510msgid ""
4511"ignore changes to submodules, optional when: all, dirty, untracked. "
4512"(Default: all)"
4513msgstr ""
07432cef 4514"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 4515
04cb2f28 4516#: builtin/commit.c:1348
ef317cd5 4517msgid "list untracked files in columns"
07432cef 4518msgstr "以列的方式显示未跟踪的文件"
ef317cd5 4519
04cb2f28 4520#: builtin/commit.c:1435
c04f5ac3
JX
4521msgid "couldn't look up newly created commit"
4522msgstr "无法找到新创建的提交"
4523
04cb2f28 4524#: builtin/commit.c:1437
c04f5ac3 4525msgid "could not parse newly created commit"
90e6ef53 4526msgstr "不能解析新创建的提交"
c04f5ac3 4527
04cb2f28 4528#: builtin/commit.c:1482
c04f5ac3
JX
4529msgid "detached HEAD"
4530msgstr "分离头指针"
4531
7e238ab7 4532# 译者:中文字符串拼接,可删除前导空格
04cb2f28 4533#: builtin/commit.c:1485
c04f5ac3 4534msgid " (root-commit)"
7e238ab7 4535msgstr "(根提交)"
c04f5ac3 4536
04cb2f28 4537#: builtin/commit.c:1578
ef317cd5 4538msgid "suppress summary after successful commit"
07432cef 4539msgstr "提交成功后不显示概述信息"
c04f5ac3 4540
04cb2f28 4541#: builtin/commit.c:1579
ef317cd5 4542msgid "show diff in commit message template"
07432cef 4543msgstr "在提交说明模板里显示差异"
c04f5ac3 4544
04cb2f28 4545#: builtin/commit.c:1581
ef317cd5 4546msgid "Commit message options"
07432cef 4547msgstr "提交说明选项"
c04f5ac3 4548
04cb2f28 4549#: builtin/commit.c:1582 builtin/tag.c:601
ef317cd5 4550msgid "read message from file"
07432cef 4551msgstr "从文件中读取提交说明"
c04f5ac3 4552
04cb2f28 4553#: builtin/commit.c:1583
ef317cd5 4554msgid "author"
07432cef 4555msgstr "作者"
c04f5ac3 4556
04cb2f28 4557#: builtin/commit.c:1583
ef317cd5 4558msgid "override author for commit"
07432cef 4559msgstr "提交时覆盖作者"
73a60cd2 4560
04cb2f28 4561#: builtin/commit.c:1584 builtin/gc.c:275
ef317cd5 4562msgid "date"
07432cef 4563msgstr "日期"
c04f5ac3 4564
04cb2f28 4565#: builtin/commit.c:1584
ef317cd5 4566msgid "override date for commit"
07432cef 4567msgstr "提交时覆盖日期"
c04f5ac3 4568
04cb2f28
JX
4569#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391
4570#: builtin/notes.c:554 builtin/tag.c:599
ef317cd5 4571msgid "message"
07432cef 4572msgstr "说明"
c04f5ac3 4573
04cb2f28 4574#: builtin/commit.c:1585
ef317cd5 4575msgid "commit message"
07432cef 4576msgstr "提交说明"
ef317cd5 4577
04cb2f28 4578#: builtin/commit.c:1586
ef317cd5 4579msgid "reuse and edit message from specified commit"
07432cef 4580msgstr "重用并编辑指定提交的提交说明"
ef317cd5 4581
04cb2f28 4582#: builtin/commit.c:1587
ef317cd5 4583msgid "reuse message from specified commit"
07432cef 4584msgstr "重用指定提交的提交说明"
ef317cd5 4585
04cb2f28 4586#: builtin/commit.c:1588
ef317cd5 4587msgid "use autosquash formatted message to fixup specified commit"
07432cef 4588msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 4589
04cb2f28 4590#: builtin/commit.c:1589
ef317cd5 4591msgid "use autosquash formatted message to squash specified commit"
07432cef 4592msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 4593
04cb2f28 4594#: builtin/commit.c:1590
ef317cd5 4595msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 4596msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 4597
04cb2f28 4598#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86
ef317cd5 4599msgid "add Signed-off-by:"
07432cef 4600msgstr "添加 Signed-off-by: 签名"
ef317cd5 4601
04cb2f28 4602#: builtin/commit.c:1592
ef317cd5 4603msgid "use specified template file"
07432cef 4604msgstr "使用指定的模板文件"
ef317cd5 4605
04cb2f28 4606#: builtin/commit.c:1593
ef317cd5 4607msgid "force edit of commit"
07432cef 4608msgstr "强制编辑提交"
ef317cd5 4609
07432cef 4610# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
04cb2f28 4611#: builtin/commit.c:1594
ef317cd5 4612msgid "default"
07432cef 4613msgstr "default"
ef317cd5 4614
04cb2f28 4615#: builtin/commit.c:1594 builtin/tag.c:604
ef317cd5 4616msgid "how to strip spaces and #comments from message"
07432cef 4617msgstr "设置如何删除提交说明里的空格和#注释"
ef317cd5 4618
04cb2f28 4619#: builtin/commit.c:1595
ef317cd5 4620msgid "include status in commit message template"
07432cef 4621msgstr "在提交说明模板里包含状态信息"
ef317cd5 4622
04cb2f28 4623#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92
220c313c 4624#: builtin/tag.c:605
6c94aba5
JX
4625msgid "key-id"
4626msgstr "key-id"
ef317cd5 4627
04cb2f28 4628#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93
ef317cd5 4629msgid "GPG sign commit"
07432cef 4630msgstr "GPG 提交签名"
ef317cd5 4631
04cb2f28 4632#: builtin/commit.c:1600
ef317cd5 4633msgid "Commit contents options"
07432cef 4634msgstr "提交内容选项"
ef317cd5 4635
04cb2f28 4636#: builtin/commit.c:1601
ef317cd5 4637msgid "commit all changed files"
07432cef 4638msgstr "提交所有改动的文件"
ef317cd5 4639
04cb2f28 4640#: builtin/commit.c:1602
ef317cd5 4641msgid "add specified files to index for commit"
07432cef 4642msgstr "添加指定的文件到索引区等待提交"
ef317cd5 4643
04cb2f28 4644#: builtin/commit.c:1603
ef317cd5 4645msgid "interactively add files"
07432cef 4646msgstr "交互式添加文件"
ef317cd5 4647
04cb2f28 4648#: builtin/commit.c:1604
ef317cd5 4649msgid "interactively add changes"
07432cef 4650msgstr "交互式添加变更"
ef317cd5 4651
04cb2f28 4652#: builtin/commit.c:1605
ef317cd5 4653msgid "commit only specified files"
07432cef 4654msgstr "只提交指定的文件"
ef317cd5 4655
04cb2f28 4656#: builtin/commit.c:1606
ef317cd5 4657msgid "bypass pre-commit hook"
07432cef 4658msgstr "绕过 pre-commit 钩子"
ef317cd5 4659
04cb2f28 4660#: builtin/commit.c:1607
ef317cd5 4661msgid "show what would be committed"
07432cef 4662msgstr "显示将要提交的内容"
ef317cd5 4663
04cb2f28 4664#: builtin/commit.c:1618
ef317cd5 4665msgid "amend previous commit"
07432cef 4666msgstr "修改先前的提交"
ef317cd5 4667
04cb2f28 4668#: builtin/commit.c:1619
ef317cd5 4669msgid "bypass post-rewrite hook"
07432cef 4670msgstr "绕过 post-rewrite 钩子"
ef317cd5 4671
04cb2f28 4672#: builtin/commit.c:1624
ef317cd5 4673msgid "ok to record an empty change"
07432cef 4674msgstr "允许一个空提交"
ef317cd5 4675
04cb2f28 4676#: builtin/commit.c:1626
ef317cd5 4677msgid "ok to record a change with an empty message"
07432cef 4678msgstr "允许空的提交说明"
ef317cd5 4679
04cb2f28 4680#: builtin/commit.c:1655
c04f5ac3 4681msgid "could not parse HEAD commit"
90e6ef53 4682msgstr "不能解析 HEAD 提交"
c04f5ac3 4683
04cb2f28 4684#: builtin/commit.c:1694 builtin/merge.c:519
c04f5ac3
JX
4685#, c-format
4686msgid "could not open '%s' for reading"
90e6ef53 4687msgstr "不能为读入打开 '%s'"
c04f5ac3 4688
04cb2f28 4689#: builtin/commit.c:1701
c04f5ac3
JX
4690#, c-format
4691msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 4692msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 4693
04cb2f28 4694#: builtin/commit.c:1708
c04f5ac3 4695msgid "could not read MERGE_MODE"
90e6ef53 4696msgstr "不能读取 MERGE_MODE"
c04f5ac3 4697
04cb2f28 4698#: builtin/commit.c:1727
c04f5ac3
JX
4699#, c-format
4700msgid "could not read commit message: %s"
90e6ef53 4701msgstr "不能读取提交说明:%s"
c04f5ac3 4702
04cb2f28 4703#: builtin/commit.c:1738
73a60cd2
JX
4704#, c-format
4705msgid "Aborting commit; you did not edit the message.\n"
4706msgstr "终止提交;您未更改来自模版的提交说明。\n"
4707
04cb2f28 4708#: builtin/commit.c:1743
c04f5ac3
JX
4709#, c-format
4710msgid "Aborting commit due to empty commit message.\n"
4711msgstr "终止提交因为提交说明为空。\n"
4712
04cb2f28 4713#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876
c04f5ac3 4714msgid "failed to write commit object"
90e6ef53 4715msgstr "无法写提交对象"
c04f5ac3 4716
04cb2f28 4717#: builtin/commit.c:1791
c04f5ac3
JX
4718msgid ""
4719"Repository has been updated, but unable to write\n"
220c313c 4720"new_index file. Check that disk is not full and quota is\n"
c04f5ac3
JX
4721"not exceeded, and then \"git reset HEAD\" to recover."
4722msgstr ""
90e6ef53
JX
4723"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4724"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 4725
90314792 4726#: builtin/config.c:8
ef317cd5 4727msgid "git config [options]"
07432cef 4728msgstr "git config [选项]"
ef317cd5 4729
6c94aba5 4730#: builtin/config.c:53
ef317cd5 4731msgid "Config file location"
07432cef 4732msgstr "配置文件位置"
ef317cd5 4733
6c94aba5 4734#: builtin/config.c:54
ef317cd5 4735msgid "use global config file"
07432cef 4736msgstr "使用全局配置文件"
ef317cd5 4737
6c94aba5 4738#: builtin/config.c:55
ef317cd5 4739msgid "use system config file"
07432cef 4740msgstr "使用系统级配置文件"
ef317cd5 4741
6c94aba5 4742#: builtin/config.c:56
ef317cd5 4743msgid "use repository config file"
07432cef 4744msgstr "使用版本库级配置文件"
ef317cd5 4745
6c94aba5 4746#: builtin/config.c:57
ef317cd5 4747msgid "use given config file"
07432cef 4748msgstr "使用指定的配置文件"
ef317cd5 4749
6c94aba5 4750#: builtin/config.c:58
2e8451e8
JX
4751msgid "blob-id"
4752msgstr "数据对象ID"
4753
6c94aba5 4754#: builtin/config.c:58
2e8451e8
JX
4755msgid "read config from given blob object"
4756msgstr "从给定的数据对象读取配置"
4757
6c94aba5 4758#: builtin/config.c:59
ef317cd5 4759msgid "Action"
07432cef 4760msgstr "操作"
ef317cd5 4761
6c94aba5 4762#: builtin/config.c:60
ef317cd5 4763msgid "get value: name [value-regex]"
07432cef 4764msgstr "获取值:name [value-regex]"
ef317cd5 4765
6c94aba5 4766#: builtin/config.c:61
ef317cd5 4767msgid "get all values: key [value-regex]"
07432cef 4768msgstr "获得所有的值:key [value-regex]"
ef317cd5 4769
6c94aba5 4770#: builtin/config.c:62
ef317cd5 4771msgid "get values for regexp: name-regex [value-regex]"
07432cef 4772msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 4773
6c94aba5 4774#: builtin/config.c:63
90314792
JX
4775msgid "get value specific for the URL: section[.var] URL"
4776msgstr "获得 URL 取值:section[.var] URL"
4777
6c94aba5 4778#: builtin/config.c:64
ef317cd5 4779msgid "replace all matching variables: name value [value_regex]"
07432cef 4780msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 4781
6c94aba5 4782#: builtin/config.c:65
ef317cd5 4783msgid "add a new variable: name value"
07432cef 4784msgstr "添加一个新的变量:name value"
ef317cd5 4785
6c94aba5 4786#: builtin/config.c:66
ef317cd5 4787msgid "remove a variable: name [value-regex]"
07432cef 4788msgstr "删除一个变量:name [value-regex]"
ef317cd5 4789
6c94aba5 4790#: builtin/config.c:67
ef317cd5 4791msgid "remove all matches: name [value-regex]"
07432cef 4792msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 4793
6c94aba5 4794#: builtin/config.c:68
ef317cd5 4795msgid "rename section: old-name new-name"
07432cef 4796msgstr "重命名小节:old-name new-name"
ef317cd5 4797
6c94aba5 4798#: builtin/config.c:69
ef317cd5 4799msgid "remove a section: name"
07432cef 4800msgstr "删除一个小节:name"
ef317cd5 4801
6c94aba5 4802#: builtin/config.c:70
ef317cd5 4803msgid "list all"
07432cef 4804msgstr "列出所有"
ef317cd5 4805
6c94aba5 4806#: builtin/config.c:71
ef317cd5 4807msgid "open an editor"
07432cef 4808msgstr "打开一个编辑器"
ef317cd5 4809
6c94aba5 4810#: builtin/config.c:72
04cb2f28
JX
4811msgid "find the color configured: slot [default]"
4812msgstr "获得配置的颜色:配置 [默认]"
ef317cd5 4813
6c94aba5 4814#: builtin/config.c:73
04cb2f28
JX
4815msgid "find the color setting: slot [stdout-is-tty]"
4816msgstr "获得颜色设置:配置 [stdout-is-tty]"
ef317cd5 4817
6c94aba5 4818#: builtin/config.c:74
ef317cd5 4819msgid "Type"
07432cef 4820msgstr "类型"
ef317cd5 4821
6c94aba5 4822#: builtin/config.c:75
ef317cd5 4823msgid "value is \"true\" or \"false\""
07432cef 4824msgstr "值是 \"true\" 或 \"false\""
ef317cd5 4825
6c94aba5 4826#: builtin/config.c:76
ef317cd5 4827msgid "value is decimal number"
07432cef 4828msgstr "值是十进制数"
ef317cd5 4829
6c94aba5 4830#: builtin/config.c:77
ef317cd5 4831msgid "value is --bool or --int"
07432cef 4832msgstr "值是 --bool or --int"
ef317cd5 4833
6c94aba5 4834#: builtin/config.c:78
ef317cd5 4835msgid "value is a path (file or directory name)"
07432cef 4836msgstr "值是一个路径(文件或目录名)"
ef317cd5 4837
6c94aba5 4838#: builtin/config.c:79
ef317cd5 4839msgid "Other"
07432cef 4840msgstr "其它"
ef317cd5 4841
6c94aba5 4842#: builtin/config.c:80
ef317cd5 4843msgid "terminate values with NUL byte"
07432cef 4844msgstr "终止值是NUL字节"
ef317cd5 4845
6c94aba5 4846#: builtin/config.c:81
ef317cd5 4847msgid "respect include directives on lookup"
07432cef 4848msgstr "查询时参照 include 指令递归查找"
ef317cd5 4849
04cb2f28 4850#: builtin/config.c:316
220c313c
JX
4851msgid "unable to parse default color value"
4852msgstr "不能解析缺省的颜色值"
4853
04cb2f28 4854#: builtin/config.c:457
220c313c
JX
4855#, c-format
4856msgid ""
4857"# This is Git's per-user configuration file.\n"
4858"[core]\n"
4859"# Please adapt and uncomment the following lines:\n"
4860"#\tuser = %s\n"
4861"#\temail = %s\n"
4862msgstr ""
4863"# This is Git's per-user configuration file.\n"
4864"[core]\n"
4865"# Please adapt and uncomment the following lines:\n"
4866"#\tuser = %s\n"
4867"#\temail = %s\n"
4868
04cb2f28 4869#: builtin/config.c:589
220c313c
JX
4870#, c-format
4871msgid "cannot create configuration file %s"
4872msgstr "不能创建配置文件 %s"
4873
4874#: builtin/count-objects.c:55
4dcdc3d8
JX
4875msgid "git count-objects [-v] [-H | --human-readable]"
4876msgstr "git count-objects [-v] [-H | --human-readable]"
4877
220c313c 4878#: builtin/count-objects.c:65
4dcdc3d8
JX
4879msgid "print sizes in human readable format"
4880msgstr "以用户可读的格式显示大小"
ef317cd5 4881
220c313c 4882#: builtin/describe.c:17
a8a5406a 4883msgid "git describe [options] <commit-ish>*"
07432cef 4884msgstr "git describe [选项] <提交号>*"
ef317cd5 4885
220c313c 4886#: builtin/describe.c:18
ef317cd5 4887msgid "git describe [options] --dirty"
07432cef 4888msgstr "git describe [选项] --dirty"
ef317cd5 4889
220c313c 4890#: builtin/describe.c:217
c04f5ac3
JX
4891#, c-format
4892msgid "annotated tag %s not available"
4893msgstr "注释 tag %s 无效"
4894
220c313c 4895#: builtin/describe.c:221
c04f5ac3
JX
4896#, c-format
4897msgid "annotated tag %s has no embedded name"
4898msgstr "注释 tag %s 没有嵌入名称"
4899
220c313c 4900#: builtin/describe.c:223
c04f5ac3
JX
4901#, c-format
4902msgid "tag '%s' is really '%s' here"
90e6ef53 4903msgstr "tag '%s' 的确是在 '%s'"
c04f5ac3 4904
220c313c 4905#: builtin/describe.c:250 builtin/log.c:452
c04f5ac3
JX
4906#, c-format
4907msgid "Not a valid object name %s"
4908msgstr "不是一个有效的对象名 %s"
4909
220c313c 4910#: builtin/describe.c:253
c04f5ac3
JX
4911#, c-format
4912msgid "%s is not a valid '%s' object"
4913msgstr "%s 不是一个有效的 '%s' 对象"
4914
220c313c 4915#: builtin/describe.c:270
c04f5ac3
JX
4916#, c-format
4917msgid "no tag exactly matches '%s'"
4918msgstr "没有 tag 准确匹配 '%s'"
4919
220c313c 4920#: builtin/describe.c:272
c04f5ac3
JX
4921#, c-format
4922msgid "searching to describe %s\n"
4923msgstr "搜索描述 %s\n"
4924
220c313c 4925#: builtin/describe.c:319
c04f5ac3
JX
4926#, c-format
4927msgid "finished search at %s\n"
4928msgstr "完成搜索 %s\n"
4929
220c313c 4930#: builtin/describe.c:346
c04f5ac3
JX
4931#, c-format
4932msgid ""
4933"No annotated tags can describe '%s'.\n"
4934"However, there were unannotated tags: try --tags."
4935msgstr ""
4936"没有注释 tag 能描述 '%s'。\n"
4937"然而,有非注释 tag:尝试 --tags。"
4938
220c313c 4939#: builtin/describe.c:350
c04f5ac3
JX
4940#, c-format
4941msgid ""
4942"No tags can describe '%s'.\n"
4943"Try --always, or create some tags."
4944msgstr ""
4945"没有注释 tag 能描述 '%s'。\n"
90e6ef53 4946"尝试 --always,或者创建一些 tag。"
c04f5ac3 4947
220c313c 4948#: builtin/describe.c:371
c04f5ac3
JX
4949#, c-format
4950msgid "traversed %lu commits\n"
4951msgstr "已遍历 %lu 个提交\n"
4952
220c313c 4953#: builtin/describe.c:374
c04f5ac3
JX
4954#, c-format
4955msgid ""
4956"more than %i tags found; listed %i most recent\n"
4957"gave up search at %s\n"
4958msgstr ""
90e6ef53
JX
4959"发现多于 %i 个 tag,列出最近的 %i 个\n"
4960"在 %s 放弃搜索\n"
c04f5ac3 4961
220c313c 4962#: builtin/describe.c:396
ef317cd5 4963msgid "find the tag that comes after the commit"
07432cef 4964msgstr "寻找提交之后的 tag(用于描述提交)"
ef317cd5 4965
220c313c 4966#: builtin/describe.c:397
ef317cd5 4967msgid "debug search strategy on stderr"
07432cef 4968msgstr "在标准错误上调试搜索策略"
ef317cd5 4969
220c313c 4970#: builtin/describe.c:398
1003b3a5
JX
4971msgid "use any ref"
4972msgstr "使用任意引用"
4973
220c313c 4974#: builtin/describe.c:399
1003b3a5
JX
4975msgid "use any tag, even unannotated"
4976msgstr "使用任意 tag,即使未带注解"
ef317cd5 4977
220c313c 4978#: builtin/describe.c:400
ef317cd5 4979msgid "always use long format"
07432cef 4980msgstr "始终使用长提交号格式"
ef317cd5 4981
220c313c 4982#: builtin/describe.c:401
2e8451e8
JX
4983msgid "only follow first parent"
4984msgstr "只跟随第一个父提交"
4985
220c313c 4986#: builtin/describe.c:404
ef317cd5 4987msgid "only output exact matches"
07432cef 4988msgstr "只输出精确匹配"
ef317cd5 4989
220c313c 4990#: builtin/describe.c:406
ef317cd5 4991msgid "consider <n> most recent tags (default: 10)"
07432cef 4992msgstr "考虑最近 <n> 个 tags(默认:10)"
ef317cd5 4993
220c313c 4994#: builtin/describe.c:408
ef317cd5 4995msgid "only consider tags matching <pattern>"
07432cef 4996msgstr "只考虑匹配 <模式> 的 tags"
ef317cd5 4997
220c313c 4998#: builtin/describe.c:410 builtin/name-rev.c:318
ef317cd5 4999msgid "show abbreviated commit object as fallback"
07432cef 5000msgstr "显示简写的提交号作为后备"
ef317cd5 5001
220c313c 5002#: builtin/describe.c:411
ef317cd5 5003msgid "mark"
07432cef 5004msgstr "标记"
ef317cd5 5005
220c313c 5006#: builtin/describe.c:412
ef317cd5 5007msgid "append <mark> on dirty working tree (default: \"-dirty\")"
07432cef 5008msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
ef317cd5 5009
220c313c 5010#: builtin/describe.c:430
c04f5ac3
JX
5011msgid "--long is incompatible with --abbrev=0"
5012msgstr "--long 与 --abbrev=0 不兼容"
5013
220c313c 5014#: builtin/describe.c:456
c04f5ac3 5015msgid "No names found, cannot describe anything."
90e6ef53 5016msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 5017
220c313c 5018#: builtin/describe.c:476
a8a5406a 5019msgid "--dirty is incompatible with commit-ishes"
649900bc 5020msgstr "--dirty 不能与提交同时使用"
c04f5ac3 5021
220c313c 5022#: builtin/diff.c:86
c04f5ac3
JX
5023#, c-format
5024msgid "'%s': not a regular file or symlink"
5025msgstr "'%s':不是一个正规文件或符号链接"
5026
220c313c 5027#: builtin/diff.c:237
c04f5ac3
JX
5028#, c-format
5029msgid "invalid option: %s"
5030msgstr "无效选项:%s"
5031
220c313c 5032#: builtin/diff.c:358
c04f5ac3
JX
5033msgid "Not a git repository"
5034msgstr "不是一个 git 版本库"
5035
220c313c 5036#: builtin/diff.c:401
c04f5ac3
JX
5037#, c-format
5038msgid "invalid object '%s' given."
5039msgstr "提供了无效对象 '%s'。"
5040
220c313c 5041#: builtin/diff.c:410
c04f5ac3
JX
5042#, c-format
5043msgid "more than two blobs given: '%s'"
07432cef 5044msgstr "提供了超过两个数据(blob)对象:'%s'"
c04f5ac3 5045
220c313c 5046#: builtin/diff.c:417
c04f5ac3
JX
5047#, c-format
5048msgid "unhandled object '%s' given."
6c94aba5 5049msgstr "无法处理的对象 '%s'。"
c04f5ac3 5050
220c313c 5051#: builtin/fast-export.c:24
ef317cd5 5052msgid "git fast-export [rev-list-opts]"
07432cef 5053msgstr "git fast-export [rev-list-opts]"
ef317cd5 5054
220c313c 5055#: builtin/fast-export.c:979
ef317cd5 5056msgid "show progress after <n> objects"
07432cef 5057msgstr "在 <n> 个对象之后显示进度"
ef317cd5 5058
220c313c 5059#: builtin/fast-export.c:981
ef317cd5 5060msgid "select handling of signed tags"
07432cef 5061msgstr "选择如何处理签名 tags"
ef317cd5 5062
220c313c 5063#: builtin/fast-export.c:984
ef317cd5 5064msgid "select handling of tags that tag filtered objects"
07432cef 5065msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
ef317cd5 5066
220c313c 5067#: builtin/fast-export.c:987
ef317cd5 5068msgid "Dump marks to this file"
07432cef 5069msgstr "把标记存储到这个文件"
ef317cd5 5070
220c313c 5071#: builtin/fast-export.c:989
ef317cd5 5072msgid "Import marks from this file"
07432cef 5073msgstr "从这个文件导入标记"
ef317cd5 5074
220c313c 5075#: builtin/fast-export.c:991
ef317cd5 5076msgid "Fake a tagger when tags lack one"
07432cef 5077msgstr "当 tags 缺少标记者字段时,假装提供一个"
ef317cd5 5078
220c313c 5079#: builtin/fast-export.c:993
ef317cd5 5080msgid "Output full tree for each commit"
07432cef 5081msgstr "每次提交都输出整个树"
ef317cd5 5082
220c313c 5083#: builtin/fast-export.c:995
ef317cd5 5084msgid "Use the done feature to terminate the stream"
07432cef 5085msgstr "使用 done 功能来终止流"
ef317cd5 5086
220c313c 5087#: builtin/fast-export.c:996
ef317cd5 5088msgid "Skip output of blob data"
07432cef 5089msgstr "跳过数据对象的输出"
ef317cd5 5090
220c313c 5091#: builtin/fast-export.c:997
6acbf033
JX
5092msgid "refspec"
5093msgstr "引用表达式"
5094
220c313c 5095#: builtin/fast-export.c:998
6acbf033
JX
5096msgid "Apply refspec to exported refs"
5097msgstr "对导出的引用应用引用表达式"
5098
220c313c
JX
5099#: builtin/fast-export.c:999
5100msgid "anonymize output"
5101msgstr "匿名输出"
5102
ef317cd5 5103#: builtin/fetch.c:20
ef317cd5 5104msgid "git fetch [<options>] [<repository> [<refspec>...]]"
90314792 5105msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
ef317cd5
JX
5106
5107#: builtin/fetch.c:21
5108msgid "git fetch [<options>] <group>"
07432cef 5109msgstr "git fetch [<选项>] <组>"
ef317cd5
JX
5110
5111#: builtin/fetch.c:22
5112msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
07432cef 5113msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
ef317cd5
JX
5114
5115#: builtin/fetch.c:23
5116msgid "git fetch --all [<options>]"
07432cef 5117msgstr "git fetch --all [<选项>]"
ef317cd5 5118
6acbf033 5119#: builtin/fetch.c:90
ef317cd5 5120msgid "fetch from all remotes"
07432cef 5121msgstr "从所有的远程抓取"
ef317cd5 5122
6acbf033 5123#: builtin/fetch.c:92
ef317cd5 5124msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 5125msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5 5126
6acbf033 5127#: builtin/fetch.c:94
ef317cd5 5128msgid "path to upload pack on remote end"
07432cef 5129msgstr "上传包到远程的路径"
ef317cd5 5130
6acbf033 5131#: builtin/fetch.c:95
ef317cd5 5132msgid "force overwrite of local branch"
07432cef 5133msgstr "强制覆盖本地分支"
ef317cd5 5134
6acbf033 5135#: builtin/fetch.c:97
ef317cd5 5136msgid "fetch from multiple remotes"
07432cef 5137msgstr "从多个远程抓取"
ef317cd5 5138
6acbf033 5139#: builtin/fetch.c:99
ef317cd5 5140msgid "fetch all tags and associated objects"
07432cef 5141msgstr "抓取所有的 tags 和关联对象"
ef317cd5 5142
6acbf033 5143#: builtin/fetch.c:101
ef317cd5 5144msgid "do not fetch all tags (--no-tags)"
07432cef 5145msgstr "不抓取任何 tags (--no-tags)"
ef317cd5 5146
6acbf033 5147#: builtin/fetch.c:103
ef317cd5 5148msgid "prune remote-tracking branches no longer on remote"
07432cef 5149msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 5150
07432cef 5151# 译者:可选值,不能翻译
6acbf033 5152#: builtin/fetch.c:104
ef317cd5 5153msgid "on-demand"
07432cef 5154msgstr "on-demand"
ef317cd5 5155
6acbf033 5156#: builtin/fetch.c:105
ef317cd5 5157msgid "control recursive fetching of submodules"
07432cef 5158msgstr "控制子模组的递归抓取"
ef317cd5 5159
6acbf033 5160#: builtin/fetch.c:109
ef317cd5 5161msgid "keep downloaded pack"
07432cef 5162msgstr "保持下载包"
ef317cd5 5163
6acbf033 5164#: builtin/fetch.c:111
ef317cd5 5165msgid "allow updating of HEAD ref"
07432cef 5166msgstr "允许更新 HEAD 引用"
ef317cd5 5167
6acbf033 5168#: builtin/fetch.c:114
ef317cd5 5169msgid "deepen history of shallow clone"
07432cef 5170msgstr "深化浅克隆的历史"
ef317cd5 5171
6acbf033 5172#: builtin/fetch.c:116
a77c07d9
JX
5173msgid "convert to a complete repository"
5174msgstr "转换为一个完整的版本库"
5175
220c313c 5176#: builtin/fetch.c:118 builtin/log.c:1208
ef317cd5 5177msgid "dir"
07432cef 5178msgstr "目录"
ef317cd5 5179
6acbf033 5180#: builtin/fetch.c:119
ef317cd5 5181msgid "prepend this to submodule path output"
07432cef 5182msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 5183
6acbf033 5184#: builtin/fetch.c:122
ef317cd5 5185msgid "default mode for recursion"
07432cef 5186msgstr "递归的默认模式"
ef317cd5 5187
6acbf033 5188#: builtin/fetch.c:124
cfff71a9
JX
5189msgid "accept refs that update .git/shallow"
5190msgstr "接受更新 .git/shallow 的引用"
5191
6acbf033
JX
5192#: builtin/fetch.c:125
5193msgid "refmap"
5194msgstr "引用映射"
5195
5196#: builtin/fetch.c:126
5197msgid "specify fetch refmap"
5198msgstr "指定获取操作的引用映射"
5199
5200#: builtin/fetch.c:376
c04f5ac3
JX
5201msgid "Couldn't find remote ref HEAD"
5202msgstr "无法发现远程 HEAD 引用"
5203
220c313c 5204#: builtin/fetch.c:454
c04f5ac3
JX
5205#, c-format
5206msgid "object %s not found"
5207msgstr "对象 %s 未发现"
5208
220c313c 5209#: builtin/fetch.c:459
c04f5ac3
JX
5210msgid "[up to date]"
5211msgstr "[最新]"
5212
220c313c 5213#: builtin/fetch.c:473
c04f5ac3
JX
5214#, c-format
5215msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5216msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
5217
220c313c 5218#: builtin/fetch.c:474 builtin/fetch.c:560
c04f5ac3
JX
5219msgid "[rejected]"
5220msgstr "[已拒绝]"
5221
220c313c 5222#: builtin/fetch.c:485
c04f5ac3
JX
5223msgid "[tag update]"
5224msgstr "[tag更新]"
5225
90e6ef53 5226# 译者:注意保持前导空格
220c313c 5227#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540
c04f5ac3
JX
5228msgid " (unable to update local ref)"
5229msgstr " (不能更新本地引用)"
5230
220c313c 5231#: builtin/fetch.c:505
c04f5ac3
JX
5232msgid "[new tag]"
5233msgstr "[新tag]"
5234
220c313c 5235#: builtin/fetch.c:508
c04f5ac3
JX
5236msgid "[new branch]"
5237msgstr "[新分支]"
5238
220c313c 5239#: builtin/fetch.c:511
170e9899
JX
5240msgid "[new ref]"
5241msgstr "[新引用]"
5242
220c313c 5243#: builtin/fetch.c:556
c04f5ac3
JX
5244msgid "unable to update local ref"
5245msgstr "不能更新本地引用"
5246
220c313c 5247#: builtin/fetch.c:556
c04f5ac3
JX
5248msgid "forced update"
5249msgstr "强制更新"
5250
220c313c 5251#: builtin/fetch.c:562
c04f5ac3 5252msgid "(non-fast-forward)"
90e6ef53 5253msgstr "(非快进式)"
c04f5ac3 5254
220c313c 5255#: builtin/fetch.c:595 builtin/fetch.c:828
c04f5ac3
JX
5256#, c-format
5257msgid "cannot open %s: %s\n"
5258msgstr "无法打开 %s:%s\n"
5259
220c313c 5260#: builtin/fetch.c:604
c04f5ac3
JX
5261#, c-format
5262msgid "%s did not send all necessary objects\n"
5263msgstr "%s 未发送所有必须的对象\n"
5264
220c313c 5265#: builtin/fetch.c:622
cfff71a9
JX
5266#, c-format
5267msgid "reject %s because shallow roots are not allowed to be updated"
5268msgstr "拒绝 %s 因为浅克隆不允许被更新"
5269
220c313c 5270#: builtin/fetch.c:710 builtin/fetch.c:793
c04f5ac3
JX
5271#, c-format
5272msgid "From %.*s\n"
5273msgstr "来自 %.*s\n"
5274
220c313c 5275#: builtin/fetch.c:721
c04f5ac3
JX
5276#, c-format
5277msgid ""
5278"some local refs could not be updated; try running\n"
5279" 'git remote prune %s' to remove any old, conflicting branches"
5280msgstr ""
5281"一些本地引用不能被更新;尝试运行\n"
5282" 'git remote prune %s' 来删除旧的、有冲突的分支"
5283
90e6ef53 5284# 译者:注意保持前导空格
220c313c 5285#: builtin/fetch.c:773
81809b99 5286#, c-format
8ada9598 5287msgid " (%s will become dangling)"
07432cef 5288msgstr " (%s 将成为摇摆状态)"
c04f5ac3 5289
90e6ef53 5290# 译者:注意保持前导空格
220c313c 5291#: builtin/fetch.c:774
81809b99 5292#, c-format
8ada9598 5293msgid " (%s has become dangling)"
07432cef 5294msgstr " (%s 已成为摇摆状态)"
c04f5ac3 5295
220c313c 5296#: builtin/fetch.c:798
c04f5ac3
JX
5297msgid "[deleted]"
5298msgstr "[已删除]"
5299
04cb2f28 5300#: builtin/fetch.c:799 builtin/remote.c:1058
c04f5ac3
JX
5301msgid "(none)"
5302msgstr "(无)"
5303
220c313c 5304#: builtin/fetch.c:818
c04f5ac3
JX
5305#, c-format
5306msgid "Refusing to fetch into current branch %s of non-bare repository"
220c313c 5307msgstr "拒绝获取到非纯版本库的当前分支 %s"
c04f5ac3 5308
220c313c 5309#: builtin/fetch.c:837
c04f5ac3
JX
5310#, c-format
5311msgid "Option \"%s\" value \"%s\" is not valid for %s"
5312msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5313
220c313c 5314#: builtin/fetch.c:840
c04f5ac3
JX
5315#, c-format
5316msgid "Option \"%s\" is ignored for %s\n"
81809b99 5317msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 5318
220c313c 5319#: builtin/fetch.c:896
90314792
JX
5320#, c-format
5321msgid "Don't know how to fetch from %s"
5322msgstr "不知道如何从 %s 获取"
5323
220c313c 5324#: builtin/fetch.c:1058
c04f5ac3
JX
5325#, c-format
5326msgid "Fetching %s\n"
d4a8e00b 5327msgstr "正在获取 %s\n"
c04f5ac3 5328
220c313c 5329#: builtin/fetch.c:1060 builtin/remote.c:90
c04f5ac3
JX
5330#, c-format
5331msgid "Could not fetch %s"
5332msgstr "不能获取 %s"
5333
220c313c 5334#: builtin/fetch.c:1078
c04f5ac3
JX
5335msgid ""
5336"No remote repository specified. Please, specify either a URL or a\n"
5337"remote name from which new revisions should be fetched."
90e6ef53 5338msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
c04f5ac3 5339
220c313c 5340#: builtin/fetch.c:1101
c04f5ac3 5341msgid "You need to specify a tag name."
90e6ef53 5342msgstr "您需要指定一个 tag 名称。"
c04f5ac3 5343
220c313c 5344#: builtin/fetch.c:1143
a77c07d9
JX
5345msgid "--depth and --unshallow cannot be used together"
5346msgstr "--depth 和 --unshallow 不能同时使用"
5347
220c313c 5348#: builtin/fetch.c:1145
a77c07d9
JX
5349msgid "--unshallow on a complete repository does not make sense"
5350msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
5351
220c313c 5352#: builtin/fetch.c:1168
c04f5ac3
JX
5353msgid "fetch --all does not take a repository argument"
5354msgstr "fetch --all 不能带一个版本库参数"
5355
220c313c 5356#: builtin/fetch.c:1170
c04f5ac3 5357msgid "fetch --all does not make sense with refspecs"
90314792 5358msgstr "fetch --all 带引用规则没有任何意义"
c04f5ac3 5359
220c313c 5360#: builtin/fetch.c:1181
c04f5ac3
JX
5361#, c-format
5362msgid "No such remote or remote group: %s"
5363msgstr "没有这样的远程或远程组:%s"
5364
220c313c 5365#: builtin/fetch.c:1189
c04f5ac3 5366msgid "Fetching a group and specifying refspecs does not make sense"
90314792 5367msgstr "获取组并指定引用规则没有意义"
c04f5ac3 5368
ef317cd5
JX
5369#: builtin/fmt-merge-msg.c:13
5370msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5371msgstr ""
07432cef 5372"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
c04f5ac3 5373
04cb2f28
JX
5374#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698
5375#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
220c313c 5376#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590
6c94aba5 5377#: parse-options.h:132 parse-options.h:239
ef317cd5 5378msgid "n"
07432cef 5379msgstr "n"
c04f5ac3 5380
04cb2f28 5381#: builtin/fmt-merge-msg.c:663
ef317cd5 5382msgid "populate log with at most <n> entries from shortlog"
07432cef 5383msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 5384
04cb2f28 5385#: builtin/fmt-merge-msg.c:666
ef317cd5 5386msgid "alias for --log (deprecated)"
07432cef 5387msgstr "参数 --log 的别名(已弃用)"
ef317cd5 5388
04cb2f28 5389#: builtin/fmt-merge-msg.c:669
ef317cd5 5390msgid "text"
07432cef 5391msgstr "文本"
ef317cd5 5392
04cb2f28 5393#: builtin/fmt-merge-msg.c:670
ef317cd5 5394msgid "use <text> as start of message"
07432cef 5395msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 5396
04cb2f28 5397#: builtin/fmt-merge-msg.c:671
ef317cd5 5398msgid "file to read from"
07432cef 5399msgstr "从文件中读取"
ef317cd5 5400
220c313c
JX
5401#: builtin/for-each-ref.c:676
5402msgid "unable to parse format"
5403msgstr "不能解析格式"
5404
5405#: builtin/for-each-ref.c:1057
ef317cd5 5406msgid "git for-each-ref [options] [<pattern>]"
07432cef 5407msgstr "git for-each-ref [选项] [<模式>]"
ef317cd5 5408
220c313c 5409#: builtin/for-each-ref.c:1072
ef317cd5 5410msgid "quote placeholders suitably for shells"
07432cef 5411msgstr "引用占位符适用于 shells"
ef317cd5 5412
220c313c 5413#: builtin/for-each-ref.c:1074
ef317cd5 5414msgid "quote placeholders suitably for perl"
07432cef 5415msgstr "引用占位符适用于 perl"
ef317cd5 5416
220c313c 5417#: builtin/for-each-ref.c:1076
ef317cd5 5418msgid "quote placeholders suitably for python"
07432cef 5419msgstr "引用占位符适用于 python"
ef317cd5 5420
220c313c 5421#: builtin/for-each-ref.c:1078
04cb2f28
JX
5422msgid "quote placeholders suitably for Tcl"
5423msgstr "引用占位符适用于 Tcl"
ef317cd5 5424
220c313c 5425#: builtin/for-each-ref.c:1081
ef317cd5 5426msgid "show only <n> matched refs"
07432cef 5427msgstr "只显示 <n> 个匹配的引用"
ef317cd5 5428
220c313c 5429#: builtin/for-each-ref.c:1082 builtin/replace.c:438
ef317cd5 5430msgid "format"
07432cef 5431msgstr "格式"
ef317cd5 5432
220c313c 5433#: builtin/for-each-ref.c:1082
ef317cd5 5434msgid "format to use for the output"
07432cef 5435msgstr "输出格式"
ef317cd5 5436
220c313c 5437#: builtin/for-each-ref.c:1083
ef317cd5 5438msgid "key"
07432cef 5439msgstr "key"
ef317cd5 5440
220c313c 5441#: builtin/for-each-ref.c:1084
ef317cd5 5442msgid "field name to sort on"
07432cef 5443msgstr "排序的字段名"
ef317cd5 5444
220c313c 5445#: builtin/fsck.c:147 builtin/prune.c:136
6c94aba5
JX
5446msgid "Checking connectivity"
5447msgstr "检查连接中"
5448
220c313c 5449#: builtin/fsck.c:540
6c94aba5
JX
5450msgid "Checking object directories"
5451msgstr "检查对象目录中"
5452
220c313c 5453#: builtin/fsck.c:603
ef317cd5 5454msgid "git fsck [options] [<object>...]"
07432cef 5455msgstr "git fsck [选项] [<对象>...]"
ef317cd5 5456
220c313c 5457#: builtin/fsck.c:609
ef317cd5 5458msgid "show unreachable objects"
07432cef 5459msgstr "显示不可达的对象"
ef317cd5 5460
220c313c 5461#: builtin/fsck.c:610
ef317cd5 5462msgid "show dangling objects"
07432cef 5463msgstr "显示摇摆的对象"
ef317cd5 5464
220c313c 5465#: builtin/fsck.c:611
ef317cd5 5466msgid "report tags"
07432cef 5467msgstr "报告 tags"
ef317cd5 5468
220c313c 5469#: builtin/fsck.c:612
ef317cd5 5470msgid "report root nodes"
07432cef 5471msgstr "报告根节点"
ef317cd5 5472
220c313c 5473#: builtin/fsck.c:613
ef317cd5 5474msgid "make index objects head nodes"
07432cef 5475msgstr "将索引亦作为检查的头节点"
ef317cd5 5476
220c313c 5477#: builtin/fsck.c:614
ef317cd5 5478msgid "make reflogs head nodes (default)"
07432cef 5479msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5 5480
220c313c 5481#: builtin/fsck.c:615
ef317cd5 5482msgid "also consider packs and alternate objects"
07432cef 5483msgstr "也考虑包和备用对象"
ef317cd5 5484
220c313c 5485#: builtin/fsck.c:616
ef317cd5 5486msgid "enable more strict checking"
07432cef 5487msgstr "启用更严格的检查"
ef317cd5 5488
220c313c 5489#: builtin/fsck.c:618
ef317cd5 5490msgid "write dangling objects in .git/lost-found"
07432cef 5491msgstr "将摇摆对象写入 .git/lost-found 中"
ef317cd5 5492
220c313c 5493#: builtin/fsck.c:619 builtin/prune.c:108
ef317cd5 5494msgid "show progress"
07432cef 5495msgstr "显示进度"
ef317cd5 5496
220c313c 5497#: builtin/fsck.c:669
6c94aba5
JX
5498msgid "Checking objects"
5499msgstr "检查对象中"
5500
cfff71a9 5501#: builtin/gc.c:24
ef317cd5 5502msgid "git gc [options]"
07432cef 5503msgstr "git gc [选项]"
ef317cd5 5504
220c313c 5505#: builtin/gc.c:79
c04f5ac3 5506#, c-format
220c313c
JX
5507msgid "Invalid gc.pruneexpire: '%s'"
5508msgstr "无效的 gc.pruneexpire:'%s'"
c04f5ac3 5509
220c313c 5510#: builtin/gc.c:107
c04f5ac3
JX
5511#, c-format
5512msgid "insanely long object directory %.*s"
5513msgstr "不正常的长对象目录 %.*s"
5514
220c313c 5515#: builtin/gc.c:276
ef317cd5 5516msgid "prune unreferenced objects"
07432cef 5517msgstr "清除未引用的对象"
ef317cd5 5518
220c313c 5519#: builtin/gc.c:278
ef317cd5 5520msgid "be more thorough (increased runtime)"
07432cef 5521msgstr "更彻底(增加运行时间)"
ef317cd5 5522
220c313c 5523#: builtin/gc.c:279
ef317cd5 5524msgid "enable auto-gc mode"
07432cef 5525msgstr "启用自动垃圾回收模式"
ef317cd5 5526
220c313c 5527#: builtin/gc.c:280
90314792
JX
5528msgid "force running gc even if there may be another gc running"
5529msgstr "强制执行 gc 即使另外一个 gc 正在执行"
5530
220c313c 5531#: builtin/gc.c:321
c04f5ac3 5532#, c-format
6c94aba5
JX
5533msgid "Auto packing the repository in background for optimum performance.\n"
5534msgstr "自动在后台执行版本库打包以求最佳性能。\n"
5535
220c313c 5536#: builtin/gc.c:323
6c94aba5
JX
5537#, c-format
5538msgid "Auto packing the repository for optimum performance.\n"
5539msgstr "自动打包版本库以求最佳性能。\n"
5540
220c313c 5541#: builtin/gc.c:324
6c94aba5
JX
5542#, c-format
5543msgid "See \"git help gc\" for manual housekeeping.\n"
5544msgstr "手工维护参见 \"git help gc\"。\n"
c04f5ac3 5545
220c313c 5546#: builtin/gc.c:342
90314792
JX
5547#, c-format
5548msgid ""
5549"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5550msgstr ""
5551"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
5552
220c313c 5553#: builtin/gc.c:364
c04f5ac3
JX
5554msgid ""
5555"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 5556msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 5557
90314792 5558#: builtin/grep.c:23
ef317cd5 5559msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
07432cef 5560msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
ef317cd5 5561
90314792 5562#: builtin/grep.c:218
c04f5ac3
JX
5563#, c-format
5564msgid "grep: failed to create thread: %s"
90e6ef53 5565msgstr "grep:无法创建线程:%s"
c04f5ac3 5566
6acbf033 5567#: builtin/grep.c:441 builtin/grep.c:476
c04f5ac3
JX
5568#, c-format
5569msgid "unable to read tree (%s)"
90e6ef53 5570msgstr "无法读取树(%s)"
c04f5ac3 5571
6acbf033 5572#: builtin/grep.c:491
c04f5ac3
JX
5573#, c-format
5574msgid "unable to grep from object of type %s"
5575msgstr "无法抓取来自于 %s 类型的对象"
5576
6acbf033 5577#: builtin/grep.c:547
c04f5ac3
JX
5578#, c-format
5579msgid "switch `%c' expects a numerical value"
5580msgstr "开关 `%c' 期望一个数字值"
5581
6acbf033 5582#: builtin/grep.c:564
c04f5ac3
JX
5583#, c-format
5584msgid "cannot open '%s'"
5585msgstr "不能打开 '%s'"
5586
6acbf033 5587#: builtin/grep.c:638
ef317cd5 5588msgid "search in index instead of in the work tree"
07432cef 5589msgstr "在索引区搜索而不是在工作区"
ef317cd5 5590
6acbf033 5591#: builtin/grep.c:640
ef317cd5 5592msgid "find in contents not managed by git"
07432cef 5593msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
5594
5595# 译者:中文字符串拼接,可删除前导空格
6acbf033 5596#: builtin/grep.c:642
ef317cd5 5597msgid "search in both tracked and untracked files"
07432cef 5598msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 5599
6acbf033 5600#: builtin/grep.c:644
ef317cd5 5601msgid "search also in ignored files"
07432cef 5602msgstr "也在忽略的文件中搜索"
ef317cd5 5603
6acbf033 5604#: builtin/grep.c:647
ef317cd5 5605msgid "show non-matching lines"
07432cef 5606msgstr "显示未匹配的行"
ef317cd5 5607
6acbf033 5608#: builtin/grep.c:649
ef317cd5 5609msgid "case insensitive matching"
07432cef 5610msgstr "不区分大小写匹配"
ef317cd5 5611
6acbf033 5612#: builtin/grep.c:651
ef317cd5 5613msgid "match patterns only at word boundaries"
07432cef 5614msgstr "只在单词边界匹配模式"
ef317cd5 5615
6acbf033 5616#: builtin/grep.c:653
ef317cd5 5617msgid "process binary files as text"
07432cef 5618msgstr "把二进制文件当做文本处理"
ef317cd5 5619
6acbf033 5620#: builtin/grep.c:655
ef317cd5 5621msgid "don't match patterns in binary files"
07432cef 5622msgstr "不在二进制文件中匹配模式"
ef317cd5 5623
6acbf033 5624#: builtin/grep.c:658
90314792
JX
5625msgid "process binary files with textconv filters"
5626msgstr "用 textconv 过滤器处理二进制文件"
5627
6acbf033 5628#: builtin/grep.c:660
ef317cd5 5629msgid "descend at most <depth> levels"
07432cef 5630msgstr "最多以指定的深度向下寻找"
ef317cd5 5631
6acbf033 5632#: builtin/grep.c:664
ef317cd5 5633msgid "use extended POSIX regular expressions"
07432cef 5634msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 5635
6acbf033 5636#: builtin/grep.c:667
ef317cd5 5637msgid "use basic POSIX regular expressions (default)"
07432cef 5638msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 5639
6acbf033 5640#: builtin/grep.c:670
ef317cd5 5641msgid "interpret patterns as fixed strings"
07432cef 5642msgstr "把模式解析为固定的字符串"
ef317cd5 5643
6acbf033 5644#: builtin/grep.c:673
ef317cd5 5645msgid "use Perl-compatible regular expressions"
07432cef 5646msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 5647
6acbf033 5648#: builtin/grep.c:676
ef317cd5 5649msgid "show line numbers"
07432cef 5650msgstr "显示行号"
ef317cd5 5651
6acbf033 5652#: builtin/grep.c:677
ef317cd5 5653msgid "don't show filenames"
07432cef 5654msgstr "不显示文件名"
ef317cd5 5655
6acbf033 5656#: builtin/grep.c:678
ef317cd5 5657msgid "show filenames"
07432cef 5658msgstr "显示文件名"
ef317cd5 5659
6acbf033 5660#: builtin/grep.c:680
ef317cd5 5661msgid "show filenames relative to top directory"
07432cef 5662msgstr "显示相对于顶级目录的文件名"
ef317cd5 5663
6acbf033 5664#: builtin/grep.c:682
ef317cd5 5665msgid "show only filenames instead of matching lines"
07432cef 5666msgstr "只显示文件名而不显示匹配的行"
ef317cd5 5667
6acbf033 5668#: builtin/grep.c:684
ef317cd5 5669msgid "synonym for --files-with-matches"
07432cef 5670msgstr "和 --files-with-matches 同义"
ef317cd5 5671
6acbf033 5672#: builtin/grep.c:687
ef317cd5 5673msgid "show only the names of files without match"
07432cef 5674msgstr "只显示未匹配的文件名"
ef317cd5 5675
6acbf033 5676#: builtin/grep.c:689
ef317cd5 5677msgid "print NUL after filenames"
07432cef 5678msgstr "在文件名后输出 NUL 字符"
ef317cd5 5679
6acbf033 5680#: builtin/grep.c:691
ef317cd5 5681msgid "show the number of matches instead of matching lines"
07432cef 5682msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 5683
6acbf033 5684#: builtin/grep.c:692
ef317cd5 5685msgid "highlight matches"
07432cef 5686msgstr "高亮显示匹配项"
ef317cd5 5687
6acbf033 5688#: builtin/grep.c:694
ef317cd5 5689msgid "print empty line between matches from different files"
07432cef 5690msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 5691
6acbf033 5692#: builtin/grep.c:696
ef317cd5 5693msgid "show filename only once above matches from same file"
07432cef 5694msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 5695
6acbf033 5696#: builtin/grep.c:699
ef317cd5 5697msgid "show <n> context lines before and after matches"
07432cef 5698msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 5699
6acbf033 5700#: builtin/grep.c:702
ef317cd5 5701msgid "show <n> context lines before matches"
07432cef 5702msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 5703
6acbf033 5704#: builtin/grep.c:704
ef317cd5 5705msgid "show <n> context lines after matches"
07432cef 5706msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 5707
6acbf033 5708#: builtin/grep.c:705
ef317cd5 5709msgid "shortcut for -C NUM"
07432cef 5710msgstr "快捷键 -C 数字"
ef317cd5 5711
6acbf033 5712#: builtin/grep.c:708
ef317cd5 5713msgid "show a line with the function name before matches"
07432cef 5714msgstr "在匹配的前面显示一行函数名"
ef317cd5 5715
6acbf033 5716#: builtin/grep.c:710
ef317cd5 5717msgid "show the surrounding function"
07432cef 5718msgstr "显示所在函数的前后内容"
ef317cd5 5719
6acbf033 5720#: builtin/grep.c:713
ef317cd5 5721msgid "read patterns from file"
07432cef 5722msgstr "从文件读取模式"
ef317cd5 5723
6acbf033 5724#: builtin/grep.c:715
ef317cd5 5725msgid "match <pattern>"
07432cef 5726msgstr "匹配 <模式>"
ef317cd5 5727
6acbf033 5728#: builtin/grep.c:717
ef317cd5 5729msgid "combine patterns specified with -e"
07432cef 5730msgstr "组合用 -e 参数设定的模式"
ef317cd5 5731
6acbf033 5732#: builtin/grep.c:729
ef317cd5 5733msgid "indicate hit with exit status without output"
07432cef 5734msgstr "不输出,而用退出码标识命中状态"
ef317cd5 5735
6acbf033 5736#: builtin/grep.c:731
ef317cd5 5737msgid "show only matches from files that match all patterns"
07432cef 5738msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 5739
6acbf033 5740#: builtin/grep.c:733
07432cef
WS
5741msgid "show parse tree for grep expression"
5742msgstr "显示 grep 表达式的解析树"
5743
6acbf033 5744#: builtin/grep.c:737
ef317cd5 5745msgid "pager"
07432cef 5746msgstr "分页"
ef317cd5 5747
6acbf033 5748#: builtin/grep.c:737
ef317cd5 5749msgid "show matching files in the pager"
07432cef 5750msgstr "分页显示匹配的文件"
ef317cd5 5751
6acbf033 5752#: builtin/grep.c:740
ef317cd5 5753msgid "allow calling of grep(1) (ignored by this build)"
07432cef 5754msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 5755
6acbf033 5756#: builtin/grep.c:741 builtin/show-ref.c:187
ef317cd5 5757msgid "show usage"
07432cef 5758msgstr "显示用法"
ef317cd5 5759
6acbf033 5760#: builtin/grep.c:808
c04f5ac3
JX
5761msgid "no pattern given."
5762msgstr "未提供模式匹配。"
5763
6acbf033 5764#: builtin/grep.c:866
c04f5ac3
JX
5765msgid "--open-files-in-pager only works on the worktree"
5766msgstr "--open-files-in-pager 仅用于工作区"
5767
6acbf033 5768#: builtin/grep.c:892
c04f5ac3 5769msgid "--cached or --untracked cannot be used with --no-index."
649900bc 5770msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
c04f5ac3 5771
6acbf033 5772#: builtin/grep.c:897
c04f5ac3 5773msgid "--no-index or --untracked cannot be used with revs."
649900bc 5774msgstr "--no-index 或 --untracked 不能和版本同时使用。"
c04f5ac3 5775
6acbf033 5776#: builtin/grep.c:900
c04f5ac3 5777msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 5778msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 5779
6acbf033 5780#: builtin/grep.c:908
c04f5ac3
JX
5781msgid "both --cached and trees are given."
5782msgstr "同时给出了 --cached 和树对象。"
5783
220c313c 5784#: builtin/hash-object.c:82
ef317cd5
JX
5785msgid ""
5786"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5787"<file>..."
5788msgstr ""
07432cef
WS
5789"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
5790"<文件>..."
ef317cd5 5791
220c313c 5792#: builtin/hash-object.c:83
ef317cd5 5793msgid "git hash-object --stdin-paths < <list-of-paths>"
07432cef 5794msgstr "git hash-object --stdin-paths < <路径列表>"
ef317cd5 5795
220c313c 5796#: builtin/hash-object.c:94 builtin/tag.c:610
ef317cd5 5797msgid "type"
07432cef 5798msgstr "类型"
ef317cd5 5799
220c313c 5800#: builtin/hash-object.c:94
ef317cd5 5801msgid "object type"
07432cef 5802msgstr "对象类型"
ef317cd5 5803
220c313c 5804#: builtin/hash-object.c:95
ef317cd5 5805msgid "write the object into the object database"
07432cef 5806msgstr "将对象写入对象数据库"
ef317cd5 5807
220c313c 5808#: builtin/hash-object.c:97
ef317cd5 5809msgid "read the object from stdin"
07432cef 5810msgstr "从标准输入读取对象"
ef317cd5 5811
220c313c 5812#: builtin/hash-object.c:99
ef317cd5 5813msgid "store file as is without filters"
07432cef 5814msgstr "原样存储文件不使用过滤器"
ef317cd5 5815
220c313c
JX
5816#: builtin/hash-object.c:100
5817msgid ""
5818"just hash any random garbage to create corrupt objects for debugging Git"
5819msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
5820
5821#: builtin/hash-object.c:101
ef317cd5 5822msgid "process file as it were from this path"
07432cef 5823msgstr "处理文件并假设其来自于此路径"
ef317cd5 5824
2e8451e8 5825#: builtin/help.c:41
ef317cd5 5826msgid "print all available commands"
07432cef 5827msgstr "打印所有可用的命令"
ef317cd5 5828
2e8451e8 5829#: builtin/help.c:42
4dcdc3d8
JX
5830msgid "print list of useful guides"
5831msgstr "显示有用的指南列表"
5832
2e8451e8 5833#: builtin/help.c:43
ef317cd5 5834msgid "show man page"
07432cef 5835msgstr "显示 man 手册"
ef317cd5 5836
2e8451e8 5837#: builtin/help.c:44
ef317cd5 5838msgid "show manual in web browser"
07432cef 5839msgstr "在 web 浏览器中显示手册"
ef317cd5 5840
2e8451e8 5841#: builtin/help.c:46
ef317cd5 5842msgid "show info page"
07432cef 5843msgstr "显示 info 手册"
ef317cd5 5844
2e8451e8 5845#: builtin/help.c:52
4dcdc3d8
JX
5846msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
5847msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]"
ef317cd5 5848
2e8451e8 5849#: builtin/help.c:64
81809b99 5850#, c-format
8ada9598 5851msgid "unrecognized help format '%s'"
81809b99 5852msgstr "未能识别的帮助格式 '%s'"
8ada9598 5853
220c313c 5854#: builtin/help.c:91
8ada9598 5855msgid "Failed to start emacsclient."
81809b99 5856msgstr "无法启动 emacsclient。"
8ada9598 5857
220c313c 5858#: builtin/help.c:104
8ada9598 5859msgid "Failed to parse emacsclient version."
81809b99 5860msgstr "无法解析 emacsclient 版本。"
8ada9598 5861
220c313c 5862#: builtin/help.c:112
8ada9598
JX
5863#, c-format
5864msgid "emacsclient version '%d' too old (< 22)."
07432cef 5865msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 5866
220c313c 5867#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
81809b99 5868#, c-format
8ada9598 5869msgid "failed to exec '%s': %s"
81809b99 5870msgstr "无法执行 '%s':%s"
8ada9598 5871
220c313c 5872#: builtin/help.c:215
8ada9598
JX
5873#, c-format
5874msgid ""
5875"'%s': path for unsupported man viewer.\n"
5876"Please consider using 'man.<tool>.cmd' instead."
5877msgstr ""
81809b99
JX
5878"'%s':不支持的 man 手册查看器的路径。\n"
5879"请使用 'man.<tool>.cmd'。"
8ada9598 5880
220c313c 5881#: builtin/help.c:227
8ada9598
JX
5882#, c-format
5883msgid ""
5884"'%s': cmd for supported man viewer.\n"
5885"Please consider using 'man.<tool>.path' instead."
5886msgstr ""
81809b99
JX
5887"'%s': 支持的 man 手册查看器命令。\n"
5888"请使用 'man.<tool>.path'。"
8ada9598 5889
04cb2f28 5890#: builtin/help.c:354
8ada9598
JX
5891#, c-format
5892msgid "'%s': unknown man viewer."
81809b99 5893msgstr "'%s':未知的 man 查看器。"
8ada9598 5894
04cb2f28 5895#: builtin/help.c:371
8ada9598 5896msgid "no man viewer handled the request"
81809b99 5897msgstr "没有 man 查看器处理此请求"
8ada9598 5898
04cb2f28 5899#: builtin/help.c:379
8ada9598 5900msgid "no info viewer handled the request"
81809b99 5901msgstr "没有 info 查看器处理此请求"
8ada9598 5902
04cb2f28 5903#: builtin/help.c:428
4dcdc3d8
JX
5904msgid "Defining attributes per path"
5905msgstr "定义路径的属性"
5906
04cb2f28 5907#: builtin/help.c:429
220c313c
JX
5908msgid "Everyday Git With 20 Commands Or So"
5909msgstr "每一天 Git 常用的约 20 条命令"
5910
04cb2f28 5911#: builtin/help.c:430
4dcdc3d8
JX
5912msgid "A Git glossary"
5913msgstr "Git 词汇表"
5914
04cb2f28 5915#: builtin/help.c:431
4dcdc3d8
JX
5916msgid "Specifies intentionally untracked files to ignore"
5917msgstr "忽略指定的未跟踪文件"
5918
04cb2f28 5919#: builtin/help.c:432
4dcdc3d8
JX
5920msgid "Defining submodule properties"
5921msgstr "定义子模组属性"
5922
04cb2f28 5923#: builtin/help.c:433
4dcdc3d8
JX
5924msgid "Specifying revisions and ranges for Git"
5925msgstr "指定 Git 的版本和版本范围"
5926
04cb2f28 5927#: builtin/help.c:434
4dcdc3d8
JX
5928msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5929msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
5930
04cb2f28 5931#: builtin/help.c:435
4dcdc3d8
JX
5932msgid "An overview of recommended workflows with Git"
5933msgstr "Git 推荐的工作流概览"
5934
04cb2f28 5935#: builtin/help.c:447
4dcdc3d8
JX
5936msgid "The common Git guides are:\n"
5937msgstr "最常用的 Git 向导有:\n"
5938
04cb2f28 5939#: builtin/help.c:468 builtin/help.c:485
8ada9598
JX
5940#, c-format
5941msgid "usage: %s%s"
81809b99 5942msgstr "用法:%s%s"
8ada9598 5943
04cb2f28 5944#: builtin/help.c:501
8ada9598
JX
5945#, c-format
5946msgid "`git %s' is aliased to `%s'"
81809b99 5947msgstr "`git %s' 是 `%s' 的别名"
8ada9598 5948
220c313c 5949#: builtin/index-pack.c:150
6acbf033
JX
5950#, c-format
5951msgid "unable to open %s"
5952msgstr "不能打开 %s"
5953
220c313c 5954#: builtin/index-pack.c:200
8ada9598
JX
5955#, c-format
5956msgid "object type mismatch at %s"
81809b99 5957msgstr "%s 的对象类型不匹配"
8ada9598 5958
220c313c 5959#: builtin/index-pack.c:220
6acbf033
JX
5960#, c-format
5961msgid "did not receive expected object %s"
5962msgstr "未能获取期望的对象 %s"
8ada9598 5963
220c313c 5964#: builtin/index-pack.c:223
6acbf033
JX
5965#, c-format
5966msgid "object %s: expected type %s, found %s"
5967msgstr "对象 %s:期待类型 %s,却是 %s"
5968
220c313c 5969#: builtin/index-pack.c:265
81809b99 5970#, c-format
8ada9598
JX
5971msgid "cannot fill %d byte"
5972msgid_plural "cannot fill %d bytes"
81809b99 5973msgstr[0] "无法填充 %d 字节"
5ae481e0 5974msgstr[1] "无法填充 %d 字节"
8ada9598 5975
220c313c 5976#: builtin/index-pack.c:275
8ada9598 5977msgid "early EOF"
81809b99 5978msgstr "过早的文件结束符(EOF)"
8ada9598 5979
220c313c 5980#: builtin/index-pack.c:276
8ada9598 5981msgid "read error on input"
81809b99 5982msgstr "输入上的读错误"
8ada9598 5983
220c313c 5984#: builtin/index-pack.c:288
8ada9598 5985msgid "used more bytes than were available"
81809b99 5986msgstr "用掉了超过可用的字节"
8ada9598 5987
220c313c 5988#: builtin/index-pack.c:295
8ada9598 5989msgid "pack too large for current definition of off_t"
81809b99 5990msgstr "包太大超过了当前 off_t 的定义"
8ada9598 5991
220c313c 5992#: builtin/index-pack.c:311
81809b99 5993#, c-format
8ada9598 5994msgid "unable to create '%s'"
81809b99 5995msgstr "不能创建 '%s'"
8ada9598 5996
220c313c 5997#: builtin/index-pack.c:316
81809b99 5998#, c-format
8ada9598 5999msgid "cannot open packfile '%s'"
81809b99 6000msgstr "无法打开包文件 '%s'"
8ada9598 6001
220c313c 6002#: builtin/index-pack.c:330
8ada9598 6003msgid "pack signature mismatch"
81809b99 6004msgstr "包签名不匹配"
8ada9598 6005
220c313c 6006#: builtin/index-pack.c:332
ef317cd5
JX
6007#, c-format
6008msgid "pack version %<PRIu32> unsupported"
07432cef 6009msgstr "不支持包版本 %<PRIu32>"
ef317cd5 6010
220c313c 6011#: builtin/index-pack.c:350
8ada9598
JX
6012#, c-format
6013msgid "pack has bad object at offset %lu: %s"
81809b99 6014msgstr "包中有错误的对象位于 %lu:%s"
8ada9598 6015
220c313c 6016#: builtin/index-pack.c:471
8ada9598
JX
6017#, c-format
6018msgid "inflate returned %d"
81809b99 6019msgstr "解压缩返回 %d"
8ada9598 6020
220c313c 6021#: builtin/index-pack.c:520
8ada9598 6022msgid "offset value overflow for delta base object"
81809b99 6023msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 6024
220c313c 6025#: builtin/index-pack.c:528
8ada9598 6026msgid "delta base offset is out of bound"
81809b99 6027msgstr "delta 基准偏移越界"
8ada9598 6028
220c313c 6029#: builtin/index-pack.c:536
81809b99 6030#, c-format
8ada9598 6031msgid "unknown object type %d"
81809b99 6032msgstr "未知对象类型 %d"
8ada9598 6033
220c313c 6034#: builtin/index-pack.c:567
8ada9598 6035msgid "cannot pread pack file"
81809b99 6036msgstr "无法读取包文件"
8ada9598 6037
220c313c 6038#: builtin/index-pack.c:569
8ada9598
JX
6039#, c-format
6040msgid "premature end of pack file, %lu byte missing"
6041msgid_plural "premature end of pack file, %lu bytes missing"
81809b99 6042msgstr[0] "包文件过早结束,缺少 %lu 字节"
5ae481e0 6043msgstr[1] "包文件过早结束,缺少 %lu 字节"
8ada9598 6044
220c313c 6045#: builtin/index-pack.c:595
8ada9598 6046msgid "serious inflate inconsistency"
81809b99 6047msgstr "解压缩严重的不一致"
8ada9598 6048
220c313c
JX
6049#: builtin/index-pack.c:686 builtin/index-pack.c:692 builtin/index-pack.c:715
6050#: builtin/index-pack.c:749 builtin/index-pack.c:758
8ada9598
JX
6051#, c-format
6052msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 6053msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 6054
220c313c
JX
6055#: builtin/index-pack.c:689 builtin/pack-objects.c:164
6056#: builtin/pack-objects.c:256
6792b93b
JX
6057#, c-format
6058msgid "unable to read %s"
6059msgstr "不能读 %s"
6060
220c313c 6061#: builtin/index-pack.c:755
6792b93b
JX
6062#, c-format
6063msgid "cannot read existing object %s"
6064msgstr "不能读取现存对象 %s"
6065
220c313c 6066#: builtin/index-pack.c:769
81809b99 6067#, c-format
8ada9598 6068msgid "invalid blob object %s"
07432cef 6069msgstr "无效的数据(blob)对象 %s"
8ada9598 6070
220c313c 6071#: builtin/index-pack.c:783
81809b99 6072#, c-format
8ada9598 6073msgid "invalid %s"
81809b99 6074msgstr "无效的 %s"
8ada9598 6075
220c313c 6076#: builtin/index-pack.c:787
8ada9598 6077msgid "Error in object"
81809b99 6078msgstr "对象中出错"
8ada9598 6079
220c313c 6080#: builtin/index-pack.c:789
8ada9598
JX
6081#, c-format
6082msgid "Not all child objects of %s are reachable"
81809b99 6083msgstr "%s 的所有子对象并非都可达"
8ada9598 6084
220c313c 6085#: builtin/index-pack.c:861 builtin/index-pack.c:890
8ada9598 6086msgid "failed to apply delta"
81809b99 6087msgstr "无法应用 delta"
8ada9598 6088
220c313c 6089#: builtin/index-pack.c:1055
8ada9598 6090msgid "Receiving objects"
81809b99 6091msgstr "接收对象中"
8ada9598 6092
220c313c 6093#: builtin/index-pack.c:1055
8ada9598 6094msgid "Indexing objects"
81809b99 6095msgstr "索引对象中"
8ada9598 6096
220c313c 6097#: builtin/index-pack.c:1081
8ada9598 6098msgid "pack is corrupted (SHA1 mismatch)"
81809b99 6099msgstr "包冲突(SHA1 不匹配)"
8ada9598 6100
220c313c 6101#: builtin/index-pack.c:1086
8ada9598 6102msgid "cannot fstat packfile"
81809b99 6103msgstr "不能枚举包文件状态"
8ada9598 6104
220c313c 6105#: builtin/index-pack.c:1089
8ada9598 6106msgid "pack has junk at the end"
81809b99 6107msgstr "包的结尾有垃圾数据"
8ada9598 6108
220c313c 6109#: builtin/index-pack.c:1100
6792b93b
JX
6110msgid "confusion beyond insanity in parse_pack_objects()"
6111msgstr "parse_pack_objects() 中遇到不可理喻的问题"
6112
220c313c 6113#: builtin/index-pack.c:1123
8ada9598 6114msgid "Resolving deltas"
81809b99 6115msgstr "处理 delta 中"
8ada9598 6116
220c313c 6117#: builtin/index-pack.c:1133
07432cef 6118#, c-format
ef317cd5 6119msgid "unable to create thread: %s"
07432cef 6120msgstr "不能创建线程:%s"
ef317cd5 6121
220c313c 6122#: builtin/index-pack.c:1175
8ada9598 6123msgid "confusion beyond insanity"
81809b99 6124msgstr "不可理喻"
8ada9598 6125
220c313c 6126#: builtin/index-pack.c:1181
ef317cd5
JX
6127#, c-format
6128msgid "completed with %d local objects"
07432cef 6129msgstr "完成 %d 个本地对象"
ef317cd5 6130
220c313c 6131#: builtin/index-pack.c:1191
ef317cd5
JX
6132#, c-format
6133msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 6134msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 6135
220c313c 6136#: builtin/index-pack.c:1195
8ada9598
JX
6137#, c-format
6138msgid "pack has %d unresolved delta"
6139msgid_plural "pack has %d unresolved deltas"
81809b99 6140msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 6141msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 6142
220c313c 6143#: builtin/index-pack.c:1220
81809b99 6144#, c-format
8ada9598 6145msgid "unable to deflate appended object (%d)"
07432cef 6146msgstr "不能压缩附加对象(%d)"
8ada9598 6147
220c313c 6148#: builtin/index-pack.c:1299
8ada9598
JX
6149#, c-format
6150msgid "local object %s is corrupt"
81809b99 6151msgstr "本地对象 %s 已损坏"
8ada9598 6152
220c313c 6153#: builtin/index-pack.c:1323
8ada9598 6154msgid "error while closing pack file"
81809b99 6155msgstr "关闭包文件时出错"
8ada9598 6156
220c313c 6157#: builtin/index-pack.c:1336
81809b99 6158#, c-format
8ada9598 6159msgid "cannot write keep file '%s'"
81809b99 6160msgstr "无法写保留文件 '%s'"
8ada9598 6161
220c313c 6162#: builtin/index-pack.c:1344
81809b99 6163#, c-format
8ada9598 6164msgid "cannot close written keep file '%s'"
81809b99 6165msgstr "无法关闭保留文件 '%s'"
8ada9598 6166
220c313c 6167#: builtin/index-pack.c:1357
8ada9598 6168msgid "cannot store pack file"
81809b99 6169msgstr "无法存储包文件"
8ada9598 6170
220c313c 6171#: builtin/index-pack.c:1368
8ada9598 6172msgid "cannot store index file"
81809b99 6173msgstr "无法存储索引文件"
8ada9598 6174
220c313c 6175#: builtin/index-pack.c:1401
07432cef 6176#, c-format
ef317cd5 6177msgid "bad pack.indexversion=%<PRIu32>"
07432cef 6178msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 6179
220c313c 6180#: builtin/index-pack.c:1407
ef317cd5
JX
6181#, c-format
6182msgid "invalid number of threads specified (%d)"
07432cef 6183msgstr "指定的线程数无效(%d)"
ef317cd5 6184
220c313c 6185#: builtin/index-pack.c:1411 builtin/index-pack.c:1590
ef317cd5
JX
6186#, c-format
6187msgid "no threads support, ignoring %s"
07432cef 6188msgstr "没有线程支持,忽略 %s"
ef317cd5 6189
220c313c 6190#: builtin/index-pack.c:1469
81809b99 6191#, c-format
8ada9598 6192msgid "Cannot open existing pack file '%s'"
81809b99 6193msgstr "无法打开现存包文件 '%s'"
8ada9598 6194
220c313c 6195#: builtin/index-pack.c:1471
81809b99 6196#, c-format
8ada9598 6197msgid "Cannot open existing pack idx file for '%s'"
81809b99 6198msgstr "无法为 %s 打开包索引文件"
8ada9598 6199
220c313c 6200#: builtin/index-pack.c:1518
81809b99 6201#, c-format
8ada9598
JX
6202msgid "non delta: %d object"
6203msgid_plural "non delta: %d objects"
81809b99 6204msgstr[0] "非 delta:%d 个对象"
5ae481e0 6205msgstr[1] "非 delta:%d 个对象"
8ada9598 6206
220c313c 6207#: builtin/index-pack.c:1525
8ada9598
JX
6208#, c-format
6209msgid "chain length = %d: %lu object"
6210msgid_plural "chain length = %d: %lu objects"
81809b99 6211msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 6212msgstr[1] "链长 = %d: %lu 对象"
8ada9598 6213
220c313c 6214#: builtin/index-pack.c:1554
8ada9598 6215msgid "Cannot come back to cwd"
81809b99 6216msgstr "无法返回当前工作目录"
8ada9598 6217
220c313c
JX
6218#: builtin/index-pack.c:1602 builtin/index-pack.c:1605
6219#: builtin/index-pack.c:1617 builtin/index-pack.c:1621
81809b99 6220#, c-format
8ada9598 6221msgid "bad %s"
81809b99 6222msgstr "错误选项 %s"
8ada9598 6223
220c313c 6224#: builtin/index-pack.c:1635
8ada9598 6225msgid "--fix-thin cannot be used without --stdin"
649900bc 6226msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 6227
220c313c 6228#: builtin/index-pack.c:1639 builtin/index-pack.c:1648
8ada9598
JX
6229#, c-format
6230msgid "packfile name '%s' does not end with '.pack'"
81809b99 6231msgstr "包名 '%s' 没有以 '.pack' 结尾"
8ada9598 6232
220c313c 6233#: builtin/index-pack.c:1656
8ada9598 6234msgid "--verify with no packfile name given"
81809b99 6235msgstr "--verify 没有提供包名参数"
8ada9598 6236
c04f5ac3
JX
6237#: builtin/init-db.c:35
6238#, c-format
6239msgid "Could not make %s writable by group"
6240msgstr "不能设置 %s 为组可写"
6241
6242#: builtin/init-db.c:62
6243#, c-format
6244msgid "insanely long template name %s"
6245msgstr "太长的模版名 %s"
6246
6247#: builtin/init-db.c:67
6248#, c-format
6249msgid "cannot stat '%s'"
6250msgstr "不能枚举 '%s' 状态"
6251
6252#: builtin/init-db.c:73
6253#, c-format
6254msgid "cannot stat template '%s'"
6255msgstr "不能枚举模版 '%s' 状态"
6256
6257#: builtin/init-db.c:80
6258#, c-format
6259msgid "cannot opendir '%s'"
6260msgstr "不能打开目录 '%s'"
6261
6262#: builtin/init-db.c:97
6263#, c-format
6264msgid "cannot readlink '%s'"
6265msgstr "不能读取链接 '%s'"
6266
6267#: builtin/init-db.c:99
6268#, c-format
6269msgid "insanely long symlink %s"
6270msgstr "太长的符号链接 %s"
6271
6272#: builtin/init-db.c:102
6273#, c-format
6274msgid "cannot symlink '%s' '%s'"
90e6ef53 6275msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3
JX
6276
6277#: builtin/init-db.c:106
6278#, c-format
6279msgid "cannot copy '%s' to '%s'"
6280msgstr "不能拷贝 '%s' 至 '%s'"
6281
6282#: builtin/init-db.c:110
6283#, c-format
6284msgid "ignoring template %s"
6285msgstr "忽略模版 %s"
6286
04cb2f28 6287#: builtin/init-db.c:136
c04f5ac3
JX
6288#, c-format
6289msgid "insanely long template path %s"
6290msgstr "太长的模版路径 %s"
6291
04cb2f28 6292#: builtin/init-db.c:144
c04f5ac3
JX
6293#, c-format
6294msgid "templates not found %s"
6295msgstr "模版未找到 %s"
6296
04cb2f28 6297#: builtin/init-db.c:157
c04f5ac3
JX
6298#, c-format
6299msgid "not copying templates of a wrong format version %d from '%s'"
81809b99 6300msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
c04f5ac3 6301
04cb2f28 6302#: builtin/init-db.c:197
c04f5ac3
JX
6303#, c-format
6304msgid "insane git directory %s"
6305msgstr "不正常的 git 目录 %s"
6306
04cb2f28 6307#: builtin/init-db.c:331 builtin/init-db.c:334
c04f5ac3
JX
6308#, c-format
6309msgid "%s already exists"
6310msgstr "%s 已经存在"
6311
04cb2f28 6312#: builtin/init-db.c:363
c04f5ac3
JX
6313#, c-format
6314msgid "unable to handle file type %d"
6315msgstr "不能处理 %d 类型的文件"
6316
04cb2f28 6317#: builtin/init-db.c:366
c04f5ac3
JX
6318#, c-format
6319msgid "unable to move %s to %s"
6320msgstr "不能移动 %s 至 %s"
6321
6c94aba5
JX
6322#. TRANSLATORS: The first '%s' is either "Reinitialized
6323#. existing" or "Initialized empty", the second " shared" or
6324#. "", and the last '%s%s' is the verbatim directory name.
04cb2f28 6325#: builtin/init-db.c:426
c04f5ac3
JX
6326#, c-format
6327msgid "%s%s Git repository in %s%s\n"
6328msgstr "%s%s Git 版本库于 %s%s\n"
6329
04cb2f28 6330#: builtin/init-db.c:427
c04f5ac3
JX
6331msgid "Reinitialized existing"
6332msgstr "重新初始化现存的"
6333
04cb2f28 6334#: builtin/init-db.c:427
c04f5ac3
JX
6335msgid "Initialized empty"
6336msgstr "初始化空的"
6337
7e238ab7 6338# 译者:中文字符串拼接,可删除前导空格
04cb2f28 6339#: builtin/init-db.c:428
c04f5ac3 6340msgid " shared"
90e6ef53 6341msgstr "共享"
c04f5ac3 6342
04cb2f28 6343#: builtin/init-db.c:475
ef317cd5 6344msgid ""
a77c07d9
JX
6345"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6346"shared[=<permissions>]] [directory]"
ef317cd5 6347msgstr ""
07432cef
WS
6348"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
6349"[目录]"
ef317cd5 6350
04cb2f28 6351#: builtin/init-db.c:498
ef317cd5 6352msgid "permissions"
07432cef 6353msgstr "权限"
ef317cd5 6354
04cb2f28 6355#: builtin/init-db.c:499
ef317cd5 6356msgid "specify that the git repository is to be shared amongst several users"
07432cef 6357msgstr "指定 git 版本库是多个用户之间共享的"
ef317cd5 6358
04cb2f28 6359#: builtin/init-db.c:501 builtin/prune-packed.c:57 builtin/repack.c:171
ef317cd5 6360msgid "be quiet"
07432cef 6361msgstr "保持安静"
ef317cd5 6362
04cb2f28 6363#: builtin/init-db.c:533 builtin/init-db.c:538
c04f5ac3
JX
6364#, c-format
6365msgid "cannot mkdir %s"
6366msgstr "不能创建目录 %s"
6367
04cb2f28 6368#: builtin/init-db.c:542
c04f5ac3
JX
6369#, c-format
6370msgid "cannot chdir to %s"
6371msgstr "不能切换目录到 %s"
6372
04cb2f28 6373#: builtin/init-db.c:563
c04f5ac3
JX
6374#, c-format
6375msgid ""
6376"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6377"dir=<directory>)"
6378msgstr ""
73a60cd2
JX
6379"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
6380"dir=<directory>)"
c04f5ac3 6381
04cb2f28 6382#: builtin/init-db.c:591
c04f5ac3
JX
6383#, c-format
6384msgid "Cannot access work tree '%s'"
6385msgstr "不能访问工作区 '%s'"
6386
220c313c
JX
6387#: builtin/interpret-trailers.c:15
6388msgid ""
6389"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
6390"[<file>...]"
6391msgstr ""
6392"git interpret-trailers [--trim-empty] [(--trailer <键>[(=|:)<值>])...] [<文件"
6393">...]"
6394
6395#: builtin/interpret-trailers.c:25
6396msgid "trim empty trailers"
6397msgstr "删除空签名"
6398
6399#: builtin/interpret-trailers.c:26
6400msgid "trailer"
6401msgstr "签名"
6402
6403#: builtin/interpret-trailers.c:27
6404msgid "trailer(s) to add"
6405msgstr "要添加的签名"
6406
2e8451e8 6407#: builtin/log.c:41
4dcdc3d8
JX
6408msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
6409msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n"
ef317cd5 6410
2e8451e8 6411#: builtin/log.c:42
ef317cd5 6412msgid " or: git show [options] <object>..."
07432cef 6413msgstr " 或者:git show [选项] <对象>..."
ef317cd5 6414
220c313c
JX
6415#: builtin/log.c:81
6416#, c-format
6417msgid "invalid --decorate option: %s"
6418msgstr "无效的 --decorate 选项:%s"
6419
6acbf033 6420#: builtin/log.c:127
ef317cd5 6421msgid "suppress diff output"
07432cef 6422msgstr "不显示差异输出"
ef317cd5 6423
6acbf033 6424#: builtin/log.c:128
ef317cd5 6425msgid "show source"
07432cef 6426msgstr "显示源"
ef317cd5 6427
6acbf033 6428#: builtin/log.c:129
07432cef
WS
6429msgid "Use mail map file"
6430msgstr "使用邮件映射文件"
6431
6acbf033 6432#: builtin/log.c:130
ef317cd5 6433msgid "decorate options"
07432cef 6434msgstr "修饰选项"
ef317cd5 6435
220c313c
JX
6436#: builtin/log.c:133
6437msgid "Process line range n,m in file, counting from 1"
6438msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
6439
6acbf033 6440#: builtin/log.c:229
c04f5ac3
JX
6441#, c-format
6442msgid "Final output: %d %s\n"
6443msgstr "最终输出:%d %s\n"
6444
220c313c
JX
6445#: builtin/log.c:458
6446#, c-format
6447msgid "git show %s: bad file"
6448msgstr "git show %s: 损坏的文件"
6449
6450#: builtin/log.c:472 builtin/log.c:564
c04f5ac3
JX
6451#, c-format
6452msgid "Could not read object %s"
90e6ef53 6453msgstr "不能读取对象 %s"
c04f5ac3 6454
220c313c 6455#: builtin/log.c:588
c04f5ac3
JX
6456#, c-format
6457msgid "Unknown type: %d"
6458msgstr "未知类型:%d"
6459
220c313c 6460#: builtin/log.c:689
c04f5ac3
JX
6461msgid "format.headers without value"
6462msgstr "format.headers 没有值"
6463
220c313c 6464#: builtin/log.c:773
c04f5ac3
JX
6465msgid "name of output directory is too long"
6466msgstr "输出目录名太长"
6467
220c313c 6468#: builtin/log.c:789
c04f5ac3
JX
6469#, c-format
6470msgid "Cannot open patch file %s"
6471msgstr "无法打开补丁文件 %s"
6472
220c313c 6473#: builtin/log.c:803
c04f5ac3
JX
6474msgid "Need exactly one range."
6475msgstr "只需要一个范围。"
6476
220c313c 6477#: builtin/log.c:811
c04f5ac3
JX
6478msgid "Not a range."
6479msgstr "不是一个范围。"
6480
220c313c 6481#: builtin/log.c:919
c04f5ac3
JX
6482msgid "Cover letter needs email format"
6483msgstr "信封需要邮件地址格式"
6484
220c313c 6485#: builtin/log.c:998
c04f5ac3
JX
6486#, c-format
6487msgid "insane in-reply-to: %s"
6488msgstr "不正常的 in-reply-to:%s"
6489
220c313c 6490#: builtin/log.c:1026
ef317cd5 6491msgid "git format-patch [options] [<since> | <revision range>]"
07432cef 6492msgstr "git format-patch [选项] [<从> | <修订集范围>]"
ef317cd5 6493
220c313c 6494#: builtin/log.c:1071
c04f5ac3
JX
6495msgid "Two output directories?"
6496msgstr "两个输出目录?"
6497
220c313c 6498#: builtin/log.c:1186
ef317cd5 6499msgid "use [PATCH n/m] even with a single patch"
07432cef 6500msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 6501
220c313c 6502#: builtin/log.c:1189
ef317cd5 6503msgid "use [PATCH] even with multiple patches"
07432cef 6504msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 6505
220c313c 6506#: builtin/log.c:1193
ef317cd5 6507msgid "print patches to standard out"
07432cef 6508msgstr "打印补丁到标准输出"
c04f5ac3 6509
220c313c 6510#: builtin/log.c:1195
ef317cd5 6511msgid "generate a cover letter"
07432cef 6512msgstr "生成一封附信"
c04f5ac3 6513
220c313c 6514#: builtin/log.c:1197
ef317cd5 6515msgid "use simple number sequence for output file names"
07432cef 6516msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 6517
220c313c 6518#: builtin/log.c:1198
ef317cd5 6519msgid "sfx"
07432cef 6520msgstr "后缀"
ef317cd5 6521
220c313c 6522#: builtin/log.c:1199
ef317cd5 6523msgid "use <sfx> instead of '.patch'"
07432cef 6524msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 6525
220c313c 6526#: builtin/log.c:1201
ef317cd5 6527msgid "start numbering patches at <n> instead of 1"
07432cef
WS
6528msgstr "补丁以 <n> 开始编号,而不是1"
6529
220c313c 6530#: builtin/log.c:1203
07432cef
WS
6531msgid "mark the series as Nth re-roll"
6532msgstr "标记补丁系列是第几次重制"
ef317cd5 6533
220c313c 6534#: builtin/log.c:1205
ef317cd5 6535msgid "Use [<prefix>] instead of [PATCH]"
07432cef 6536msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 6537
220c313c 6538#: builtin/log.c:1208
ef317cd5 6539msgid "store resulting files in <dir>"
07432cef 6540msgstr "把结果文件存储在 <dir>"
ef317cd5 6541
220c313c 6542#: builtin/log.c:1211
ef317cd5 6543msgid "don't strip/add [PATCH]"
07432cef 6544msgstr "不删除/添加 [PATCH]"
ef317cd5 6545
220c313c 6546#: builtin/log.c:1214
ef317cd5 6547msgid "don't output binary diffs"
07432cef 6548msgstr "不输出二进制差异"
ef317cd5 6549
220c313c 6550#: builtin/log.c:1216
ef317cd5 6551msgid "don't include a patch matching a commit upstream"
07432cef 6552msgstr "不包含已在上游提交中的补丁"
ef317cd5 6553
220c313c 6554#: builtin/log.c:1218
ef317cd5 6555msgid "show patch format instead of default (patch + stat)"
07432cef 6556msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 6557
220c313c 6558#: builtin/log.c:1220
ef317cd5 6559msgid "Messaging"
07432cef 6560msgstr "邮件发送"
ef317cd5 6561
220c313c 6562#: builtin/log.c:1221
ef317cd5 6563msgid "header"
07432cef 6564msgstr "header"
ef317cd5 6565
220c313c 6566#: builtin/log.c:1222
ef317cd5 6567msgid "add email header"
07432cef 6568msgstr "添加邮件头"
ef317cd5 6569
220c313c 6570#: builtin/log.c:1223 builtin/log.c:1225
ef317cd5 6571msgid "email"
07432cef 6572msgstr "邮件地址"
ef317cd5 6573
220c313c 6574#: builtin/log.c:1223
ef317cd5 6575msgid "add To: header"
07432cef 6576msgstr "添加收件人"
ef317cd5 6577
220c313c 6578#: builtin/log.c:1225
ef317cd5 6579msgid "add Cc: header"
07432cef 6580msgstr "添加抄送"
ef317cd5 6581
220c313c 6582#: builtin/log.c:1227
2e8451e8
JX
6583msgid "ident"
6584msgstr "ident"
6585
220c313c 6586#: builtin/log.c:1228
2e8451e8
JX
6587msgid "set From address to <ident> (or committer ident if absent)"
6588msgstr "设置 From 地址为 <ident>(如若不提供,用提交者ID做为地址)"
6589
220c313c 6590#: builtin/log.c:1230
ef317cd5 6591msgid "message-id"
07432cef 6592msgstr "message-id"
ef317cd5 6593
220c313c 6594#: builtin/log.c:1231
ef317cd5 6595msgid "make first mail a reply to <message-id>"
07432cef 6596msgstr "使第一封邮件作为对 <message-id> 的回复"
ef317cd5 6597
220c313c 6598#: builtin/log.c:1232 builtin/log.c:1235
ef317cd5 6599msgid "boundary"
07432cef 6600msgstr "边界"
ef317cd5 6601
220c313c 6602#: builtin/log.c:1233
ef317cd5 6603msgid "attach the patch"
07432cef 6604msgstr "附件方式添加补丁"
ef317cd5 6605
220c313c 6606#: builtin/log.c:1236
ef317cd5 6607msgid "inline the patch"
07432cef 6608msgstr "内联显示补丁"
ef317cd5 6609
220c313c 6610#: builtin/log.c:1240
ef317cd5 6611msgid "enable message threading, styles: shallow, deep"
07432cef 6612msgstr "启用邮件线索,风格:浅,深"
ef317cd5 6613
220c313c 6614#: builtin/log.c:1242
ef317cd5 6615msgid "signature"
07432cef 6616msgstr "签名"
ef317cd5 6617
220c313c 6618#: builtin/log.c:1243
ef317cd5 6619msgid "add a signature"
07432cef 6620msgstr "添加一个签名"
ef317cd5 6621
220c313c 6622#: builtin/log.c:1245
6acbf033
JX
6623msgid "add a signature from a file"
6624msgstr "从文件添加一个签名"
6625
220c313c 6626#: builtin/log.c:1246
ef317cd5 6627msgid "don't print the patch filenames"
07432cef 6628msgstr "不要打印补丁文件名"
ef317cd5 6629
220c313c 6630#: builtin/log.c:1320
2e8451e8
JX
6631#, c-format
6632msgid "invalid ident line: %s"
6633msgstr "包含无效的身份标识:%s"
6634
220c313c 6635#: builtin/log.c:1335
c04f5ac3
JX
6636msgid "-n and -k are mutually exclusive."
6637msgstr "-n 和 -k 互斥。"
6638
220c313c 6639#: builtin/log.c:1337
c04f5ac3
JX
6640msgid "--subject-prefix and -k are mutually exclusive."
6641msgstr "--subject-prefix 和 -k 互斥。"
6642
220c313c 6643#: builtin/log.c:1345
c04f5ac3
JX
6644msgid "--name-only does not make sense"
6645msgstr "--name-only 无意义"
6646
220c313c 6647#: builtin/log.c:1347
c04f5ac3
JX
6648msgid "--name-status does not make sense"
6649msgstr "--name-status 无意义"
6650
220c313c 6651#: builtin/log.c:1349
c04f5ac3
JX
6652msgid "--check does not make sense"
6653msgstr "--check 无意义"
6654
220c313c 6655#: builtin/log.c:1372
c04f5ac3
JX
6656msgid "standard output, or directory, which one?"
6657msgstr "标准输出或目录,哪一个?"
6658
220c313c 6659#: builtin/log.c:1374
c04f5ac3
JX
6660#, c-format
6661msgid "Could not create directory '%s'"
90e6ef53 6662msgstr "不能创建目录 '%s'"
c04f5ac3 6663
220c313c 6664#: builtin/log.c:1472
6acbf033
JX
6665#, c-format
6666msgid "unable to read signature file '%s'"
6667msgstr "无法读取签名文件 '%s'"
6668
220c313c 6669#: builtin/log.c:1535
c04f5ac3
JX
6670msgid "Failed to create output files"
6671msgstr "无法创建输出文件"
6672
220c313c 6673#: builtin/log.c:1583
ef317cd5 6674msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 6675msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 6676
220c313c 6677#: builtin/log.c:1638
c04f5ac3
JX
6678#, c-format
6679msgid ""
6680"Could not find a tracked remote branch, please specify <upstream> manually.\n"
90e6ef53 6681msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
c04f5ac3 6682
220c313c 6683#: builtin/log.c:1651 builtin/log.c:1653 builtin/log.c:1665
c04f5ac3
JX
6684#, c-format
6685msgid "Unknown commit %s"
6686msgstr "未知提交 %s"
6687
6c94aba5 6688#: builtin/ls-files.c:401
ef317cd5 6689msgid "git ls-files [options] [<file>...]"
07432cef 6690msgstr "git ls-files [选项] [<文件>...]"
ef317cd5 6691
6c94aba5 6692#: builtin/ls-files.c:458
ef317cd5 6693msgid "identify the file status with tags"
07432cef 6694msgstr "用标签标识文件的状态"
ef317cd5 6695
6c94aba5 6696#: builtin/ls-files.c:460
ef317cd5 6697msgid "use lowercase letters for 'assume unchanged' files"
07432cef 6698msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 6699
6c94aba5 6700#: builtin/ls-files.c:462
ef317cd5 6701msgid "show cached files in the output (default)"
07432cef 6702msgstr "显示缓存的文件(默认)"
ef317cd5 6703
6c94aba5 6704#: builtin/ls-files.c:464
ef317cd5 6705msgid "show deleted files in the output"
07432cef 6706msgstr "显示已删除的文件"
ef317cd5 6707
6c94aba5 6708#: builtin/ls-files.c:466
ef317cd5 6709msgid "show modified files in the output"
07432cef 6710msgstr "显示已修改的文件"
ef317cd5 6711
6c94aba5 6712#: builtin/ls-files.c:468
ef317cd5 6713msgid "show other files in the output"
07432cef 6714msgstr "显示其它文件"
ef317cd5 6715
6c94aba5 6716#: builtin/ls-files.c:470
ef317cd5 6717msgid "show ignored files in the output"
07432cef 6718msgstr "显示忽略的文件"
ef317cd5 6719
6c94aba5 6720#: builtin/ls-files.c:473
ef317cd5 6721msgid "show staged contents' object name in the output"
07432cef 6722msgstr "显示暂存区内容的对象名称"
ef317cd5 6723
6c94aba5 6724#: builtin/ls-files.c:475
ef317cd5 6725msgid "show files on the filesystem that need to be removed"
07432cef 6726msgstr "显示文件系统需要删除的文件"
ef317cd5 6727
6c94aba5 6728#: builtin/ls-files.c:477
220c313c 6729msgid "show 'other' directories' names only"
07432cef 6730msgstr "只显示“其他”目录的名称"
ef317cd5 6731
6c94aba5 6732#: builtin/ls-files.c:480
ef317cd5 6733msgid "don't show empty directories"
07432cef 6734msgstr "不显示空目录"
ef317cd5 6735
6c94aba5 6736#: builtin/ls-files.c:483
ef317cd5 6737msgid "show unmerged files in the output"
07432cef 6738msgstr "显示未合并的文件"
ef317cd5 6739
6c94aba5 6740#: builtin/ls-files.c:485
ef317cd5 6741msgid "show resolve-undo information"
07432cef 6742msgstr "显示 resolve-undo 信息"
ef317cd5 6743
6c94aba5 6744#: builtin/ls-files.c:487
ef317cd5 6745msgid "skip files matching pattern"
07432cef 6746msgstr "匹配排除文件的模式"
ef317cd5 6747
6c94aba5 6748#: builtin/ls-files.c:490
ef317cd5 6749msgid "exclude patterns are read from <file>"
07432cef 6750msgstr "从 <文件> 中读取排除模式"
ef317cd5 6751
6c94aba5 6752#: builtin/ls-files.c:493
ef317cd5 6753msgid "read additional per-directory exclude patterns in <file>"
07432cef 6754msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 6755
6c94aba5 6756#: builtin/ls-files.c:495
ef317cd5 6757msgid "add the standard git exclusions"
07432cef 6758msgstr "添加标准的 git 排除"
ef317cd5 6759
6c94aba5 6760#: builtin/ls-files.c:498
ef317cd5 6761msgid "make the output relative to the project top directory"
07432cef 6762msgstr "显示相对于顶级目录的文件名"
ef317cd5 6763
6c94aba5 6764#: builtin/ls-files.c:501
ef317cd5 6765msgid "if any <file> is not in the index, treat this as an error"
07432cef 6766msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 6767
6c94aba5 6768#: builtin/ls-files.c:502
ef317cd5 6769msgid "tree-ish"
07432cef 6770msgstr "树或提交"
ef317cd5 6771
6c94aba5 6772#: builtin/ls-files.c:503
ef317cd5 6773msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 6774msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5 6775
6c94aba5 6776#: builtin/ls-files.c:505
ef317cd5 6777msgid "show debugging data"
07432cef 6778msgstr "显示调试数据"
ef317cd5 6779
90314792 6780#: builtin/ls-tree.c:28
ef317cd5 6781msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 6782msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5 6783
04cb2f28 6784#: builtin/ls-tree.c:127
ef317cd5 6785msgid "only show trees"
07432cef 6786msgstr "只显示树"
ef317cd5 6787
04cb2f28 6788#: builtin/ls-tree.c:129
ef317cd5 6789msgid "recurse into subtrees"
07432cef 6790msgstr "递归到子树"
ef317cd5 6791
04cb2f28 6792#: builtin/ls-tree.c:131
ef317cd5 6793msgid "show trees when recursing"
07432cef 6794msgstr "当递归时显示树"
ef317cd5 6795
04cb2f28 6796#: builtin/ls-tree.c:134
ef317cd5 6797msgid "terminate entries with NUL byte"
07432cef 6798msgstr "条目以NUL字符终止"
ef317cd5 6799
04cb2f28 6800#: builtin/ls-tree.c:135
ef317cd5 6801msgid "include object size"
07432cef 6802msgstr "包括对象大小"
ef317cd5 6803
04cb2f28 6804#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
ef317cd5 6805msgid "list only filenames"
07432cef 6806msgstr "只列出文件名"
ef317cd5 6807
04cb2f28 6808#: builtin/ls-tree.c:142
ef317cd5 6809msgid "use full path names"
07432cef 6810msgstr "使用文件的全路径"
ef317cd5 6811
04cb2f28 6812#: builtin/ls-tree.c:144
ef317cd5 6813msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 6814msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5 6815
04cb2f28 6816#: builtin/merge.c:45
ef317cd5 6817msgid "git merge [options] [<commit>...]"
07432cef 6818msgstr "git merge [选项] [<提交>...]"
ef317cd5 6819
04cb2f28 6820#: builtin/merge.c:46
ef317cd5 6821msgid "git merge [options] <msg> HEAD <commit>"
07432cef 6822msgstr "git merge [选项] <说明> HEAD <提交>"
ef317cd5 6823
04cb2f28 6824#: builtin/merge.c:47
ef317cd5 6825msgid "git merge --abort"
07432cef 6826msgstr "git merge --abort"
ef317cd5 6827
04cb2f28 6828#: builtin/merge.c:100
c04f5ac3
JX
6829msgid "switch `m' requires a value"
6830msgstr "开关 `m' 需要一个值"
6831
04cb2f28 6832#: builtin/merge.c:137
c04f5ac3
JX
6833#, c-format
6834msgid "Could not find merge strategy '%s'.\n"
90e6ef53 6835msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 6836
04cb2f28 6837#: builtin/merge.c:138
c04f5ac3
JX
6838#, c-format
6839msgid "Available strategies are:"
6840msgstr "可用的策略有:"
6841
04cb2f28 6842#: builtin/merge.c:143
c04f5ac3
JX
6843#, c-format
6844msgid "Available custom strategies are:"
6845msgstr "可用的自定义策略有:"
6846
04cb2f28 6847#: builtin/merge.c:193
ef317cd5 6848msgid "do not show a diffstat at the end of the merge"
07432cef 6849msgstr "在合并的最后不显示差异统计"
ef317cd5 6850
04cb2f28 6851#: builtin/merge.c:196
ef317cd5 6852msgid "show a diffstat at the end of the merge"
07432cef 6853msgstr "在合并的最后显示差异统计"
ef317cd5 6854
04cb2f28 6855#: builtin/merge.c:197
ef317cd5 6856msgid "(synonym to --stat)"
07432cef 6857msgstr "(和 --stat 同义)"
ef317cd5 6858
04cb2f28 6859#: builtin/merge.c:199
ef317cd5 6860msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 6861msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 6862
04cb2f28 6863#: builtin/merge.c:202
ef317cd5 6864msgid "create a single commit instead of doing a merge"
07432cef 6865msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 6866
04cb2f28 6867#: builtin/merge.c:204
ef317cd5 6868msgid "perform a commit if the merge succeeds (default)"
07432cef 6869msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 6870
04cb2f28 6871#: builtin/merge.c:206
ef317cd5 6872msgid "edit message before committing"
07432cef 6873msgstr "在提交前编辑提交说明"
ef317cd5 6874
04cb2f28 6875#: builtin/merge.c:207
ef317cd5 6876msgid "allow fast-forward (default)"
07432cef 6877msgstr "允许快进(默认)"
ef317cd5 6878
04cb2f28 6879#: builtin/merge.c:209
ef317cd5 6880msgid "abort if fast-forward is not possible"
07432cef 6881msgstr "如果不能快进就放弃合并"
ef317cd5 6882
04cb2f28 6883#: builtin/merge.c:213
1003b3a5
JX
6884msgid "Verify that the named commit has a valid GPG signature"
6885msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
6886
04cb2f28 6887#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89
ef317cd5 6888msgid "strategy"
07432cef 6889msgstr "策略"
ef317cd5 6890
04cb2f28 6891#: builtin/merge.c:215
ef317cd5 6892msgid "merge strategy to use"
07432cef 6893msgstr "要使用的合并策略"
ef317cd5 6894
04cb2f28 6895#: builtin/merge.c:216
ef317cd5 6896msgid "option=value"
07432cef 6897msgstr "option=value"
ef317cd5 6898
04cb2f28 6899#: builtin/merge.c:217
ef317cd5 6900msgid "option for selected merge strategy"
07432cef 6901msgstr "所选的合并策略的选项"
ef317cd5 6902
04cb2f28 6903#: builtin/merge.c:219
ef317cd5 6904msgid "merge commit message (for a non-fast-forward merge)"
07432cef 6905msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 6906
04cb2f28 6907#: builtin/merge.c:223
ef317cd5 6908msgid "abort the current in-progress merge"
07432cef 6909msgstr "放弃当前正在进行的合并"
ef317cd5 6910
04cb2f28 6911#: builtin/merge.c:251
c04f5ac3
JX
6912msgid "could not run stash."
6913msgstr "不能进行进度保存。"
6914
04cb2f28 6915#: builtin/merge.c:256
c04f5ac3
JX
6916msgid "stash failed"
6917msgstr "进度保存失败"
6918
04cb2f28 6919#: builtin/merge.c:261
c04f5ac3
JX
6920#, c-format
6921msgid "not a valid object: %s"
6922msgstr "不是一个有效对象:%s"
6923
04cb2f28 6924#: builtin/merge.c:280 builtin/merge.c:297
c04f5ac3
JX
6925msgid "read-tree failed"
6926msgstr "读取树失败"
6927
90e6ef53 6928# 译者:注意保持前导空格
04cb2f28 6929#: builtin/merge.c:327
c04f5ac3
JX
6930msgid " (nothing to squash)"
6931msgstr " (无可压缩)"
6932
04cb2f28 6933#: builtin/merge.c:340
c04f5ac3
JX
6934#, c-format
6935msgid "Squash commit -- not updating HEAD\n"
6936msgstr "压缩提交 -- 未更新 HEAD\n"
6937
04cb2f28 6938#: builtin/merge.c:372
c04f5ac3
JX
6939msgid "Writing SQUASH_MSG"
6940msgstr "写入 SQUASH_MSG"
6941
04cb2f28 6942#: builtin/merge.c:374
c04f5ac3
JX
6943msgid "Finishing SQUASH_MSG"
6944msgstr "完成 SQUASH_MSG"
6945
04cb2f28 6946#: builtin/merge.c:397
c04f5ac3
JX
6947#, c-format
6948msgid "No merge message -- not updating HEAD\n"
6949msgstr "无合并信息 -- 未更新 HEAD\n"
6950
04cb2f28 6951#: builtin/merge.c:447
c04f5ac3
JX
6952#, c-format
6953msgid "'%s' does not point to a commit"
6954msgstr "'%s' 没有指向一个提交"
6955
04cb2f28 6956#: builtin/merge.c:559
c04f5ac3
JX
6957#, c-format
6958msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 6959msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 6960
04cb2f28 6961#: builtin/merge.c:654
c04f5ac3
JX
6962msgid "git write-tree failed to write a tree"
6963msgstr "git write-tree 无法写入一树对象"
6964
04cb2f28 6965#: builtin/merge.c:678
c04f5ac3
JX
6966msgid "Not handling anything other than two heads merge."
6967msgstr "不能处理两个头合并之外的任何操作。"
6968
04cb2f28 6969#: builtin/merge.c:692
c04f5ac3
JX
6970#, c-format
6971msgid "Unknown option for merge-recursive: -X%s"
6972msgstr "merge-recursive 的未知选项:-X%s"
6973
04cb2f28 6974#: builtin/merge.c:705
c04f5ac3
JX
6975#, c-format
6976msgid "unable to write %s"
6977msgstr "不能写 %s"
6978
04cb2f28 6979#: builtin/merge.c:794
c04f5ac3
JX
6980#, c-format
6981msgid "Could not read from '%s'"
6982msgstr "不能从 '%s' 读取"
6983
04cb2f28 6984#: builtin/merge.c:803
c04f5ac3
JX
6985#, c-format
6986msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6987msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
6988
04cb2f28 6989#: builtin/merge.c:809
a77c07d9 6990#, c-format
c04f5ac3
JX
6991msgid ""
6992"Please enter a commit message to explain why this merge is necessary,\n"
6993"especially if it merges an updated upstream into a topic branch.\n"
6994"\n"
a77c07d9 6995"Lines starting with '%c' will be ignored, and an empty message aborts\n"
c04f5ac3
JX
6996"the commit.\n"
6997msgstr ""
6998"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
6999"合并到主题分支。\n"
7000"\n"
a77c07d9 7001"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
c04f5ac3 7002
04cb2f28 7003#: builtin/merge.c:833
c04f5ac3
JX
7004msgid "Empty commit message."
7005msgstr "空提交信息。"
7006
04cb2f28 7007#: builtin/merge.c:845
c04f5ac3
JX
7008#, c-format
7009msgid "Wonderful.\n"
7010msgstr "太棒了。\n"
7011
04cb2f28 7012#: builtin/merge.c:900
c04f5ac3
JX
7013#, c-format
7014msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
7015msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
7016
04cb2f28 7017#: builtin/merge.c:916
c04f5ac3
JX
7018#, c-format
7019msgid "'%s' is not a commit"
7020msgstr "'%s' 不是一个提交"
7021
04cb2f28 7022#: builtin/merge.c:957
c04f5ac3 7023msgid "No current branch."
90e6ef53 7024msgstr "没有当前分支。"
c04f5ac3 7025
04cb2f28 7026#: builtin/merge.c:959
c04f5ac3 7027msgid "No remote for the current branch."
90e6ef53 7028msgstr "当前分支没有对应的远程版本库。"
c04f5ac3 7029
04cb2f28 7030#: builtin/merge.c:961
c04f5ac3 7031msgid "No default upstream defined for the current branch."
90e6ef53 7032msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 7033
04cb2f28 7034#: builtin/merge.c:966
170e9899 7035#, c-format
2e8451e8
JX
7036msgid "No remote-tracking branch for %s from %s"
7037msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 7038
04cb2f28 7039#: builtin/merge.c:1122
c04f5ac3 7040msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 7041msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 7042
04cb2f28 7043#: builtin/merge.c:1138
c04f5ac3
JX
7044msgid ""
7045"You have not concluded your merge (MERGE_HEAD exists).\n"
220c313c 7046"Please, commit your changes before you merge."
c04f5ac3
JX
7047msgstr ""
7048"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 7049"请在合并前先提交您的修改。"
c04f5ac3 7050
04cb2f28 7051#: builtin/merge.c:1141 git-pull.sh:34
c04f5ac3
JX
7052msgid "You have not concluded your merge (MERGE_HEAD exists)."
7053msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
7054
04cb2f28 7055#: builtin/merge.c:1145
c04f5ac3
JX
7056msgid ""
7057"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
220c313c 7058"Please, commit your changes before you merge."
c04f5ac3
JX
7059msgstr ""
7060"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 7061"请在合并前先提交您的修改。"
c04f5ac3 7062
04cb2f28 7063#: builtin/merge.c:1148
c04f5ac3
JX
7064msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
7065msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
7066
04cb2f28 7067#: builtin/merge.c:1157
c04f5ac3 7068msgid "You cannot combine --squash with --no-ff."
649900bc 7069msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 7070
04cb2f28 7071#: builtin/merge.c:1166
c04f5ac3 7072msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 7073msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 7074
04cb2f28 7075#: builtin/merge.c:1198
c04f5ac3 7076msgid "Can merge only exactly one commit into empty head"
90e6ef53 7077msgstr "只能将一个提交合并到空分支上"
c04f5ac3 7078
04cb2f28 7079#: builtin/merge.c:1201
c04f5ac3
JX
7080msgid "Squash commit into empty head not supported yet"
7081msgstr "尚不支持到空分支的压缩提交"
7082
04cb2f28 7083#: builtin/merge.c:1203
c04f5ac3
JX
7084msgid "Non-fast-forward commit does not make sense into an empty head"
7085msgstr "到空分支的非快进式提交没有意义"
7086
04cb2f28 7087#: builtin/merge.c:1208
2e8451e8
JX
7088#, c-format
7089msgid "%s - not something we can merge"
7090msgstr "%s - 不能被合并"
7091
04cb2f28 7092#: builtin/merge.c:1259
1003b3a5
JX
7093#, c-format
7094msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
7095msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
7096
04cb2f28 7097#: builtin/merge.c:1262
1003b3a5
JX
7098#, c-format
7099msgid "Commit %s has a bad GPG signature allegedly by %s."
7100msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
7101
04cb2f28 7102#: builtin/merge.c:1265
1003b3a5
JX
7103#, c-format
7104msgid "Commit %s does not have a GPG signature."
7105msgstr "提交 %s 没有一个 GPG 签名。"
7106
04cb2f28 7107#: builtin/merge.c:1268
1003b3a5
JX
7108#, c-format
7109msgid "Commit %s has a good GPG signature by %s\n"
7110msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
7111
04cb2f28 7112#: builtin/merge.c:1349
c04f5ac3
JX
7113#, c-format
7114msgid "Updating %s..%s\n"
7115msgstr "更新 %s..%s\n"
7116
04cb2f28 7117#: builtin/merge.c:1388
c04f5ac3
JX
7118#, c-format
7119msgid "Trying really trivial in-index merge...\n"
90e6ef53 7120msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 7121
04cb2f28 7122#: builtin/merge.c:1395
c04f5ac3
JX
7123#, c-format
7124msgid "Nope.\n"
7125msgstr "无。\n"
7126
04cb2f28 7127#: builtin/merge.c:1427
c04f5ac3 7128msgid "Not possible to fast-forward, aborting."
1aabac65 7129msgstr "无法快进,终止。"
c04f5ac3 7130
04cb2f28 7131#: builtin/merge.c:1450 builtin/merge.c:1529
c04f5ac3
JX
7132#, c-format
7133msgid "Rewinding the tree to pristine...\n"
7134msgstr "将树回滚至原始状态...\n"
7135
04cb2f28 7136#: builtin/merge.c:1454
c04f5ac3
JX
7137#, c-format
7138msgid "Trying merge strategy %s...\n"
7139msgstr "尝试合并策略 %s...\n"
7140
04cb2f28 7141#: builtin/merge.c:1520
c04f5ac3
JX
7142#, c-format
7143msgid "No merge strategy handled the merge.\n"
7144msgstr "没有合并策略处理此合并。\n"
7145
04cb2f28 7146#: builtin/merge.c:1522
c04f5ac3
JX
7147#, c-format
7148msgid "Merge with strategy %s failed.\n"
7149msgstr "使用策略 %s 合并失败。\n"
7150
04cb2f28 7151#: builtin/merge.c:1531
c04f5ac3
JX
7152#, c-format
7153msgid "Using the %s to prepare resolving by hand.\n"
7154msgstr "使用 %s 以准备手工解决。\n"
7155
04cb2f28 7156#: builtin/merge.c:1543
c04f5ac3
JX
7157#, c-format
7158msgid "Automatic merge went well; stopped before committing as requested\n"
7159msgstr "自动合并进展顺利,按要求在提交前停止\n"
7160
cfff71a9 7161#: builtin/merge-base.c:29
ef317cd5 7162msgid "git merge-base [-a|--all] <commit> <commit>..."
07432cef 7163msgstr "git merge-base [-a|--all] <提交> <提交>..."
ef317cd5 7164
cfff71a9 7165#: builtin/merge-base.c:30
ef317cd5 7166msgid "git merge-base [-a|--all] --octopus <commit>..."
07432cef 7167msgstr "git merge-base [-a|--all] --octopus <提交>..."
ef317cd5 7168
cfff71a9 7169#: builtin/merge-base.c:31
ef317cd5 7170msgid "git merge-base --independent <commit>..."
07432cef 7171msgstr "git merge-base --independent <提交>..."
ef317cd5 7172
cfff71a9 7173#: builtin/merge-base.c:32
ef317cd5 7174msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 7175msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5 7176
cfff71a9
JX
7177#: builtin/merge-base.c:33
7178msgid "git merge-base --fork-point <ref> [<commit>]"
7179msgstr "git merge-base --fork-point <提交> [<提交>]"
7180
7181#: builtin/merge-base.c:214
ef317cd5 7182msgid "output all common ancestors"
07432cef 7183msgstr "输出所有共同的祖先"
ef317cd5 7184
cfff71a9 7185#: builtin/merge-base.c:216
ef317cd5 7186msgid "find ancestors for a single n-way merge"
07432cef 7187msgstr "查找一个多路合并的祖先提交"
ef317cd5 7188
cfff71a9 7189#: builtin/merge-base.c:218
ef317cd5 7190msgid "list revs not reachable from others"
07432cef 7191msgstr "显示不能被其他访问到的版本"
ef317cd5 7192
cfff71a9 7193#: builtin/merge-base.c:220
ef317cd5 7194msgid "is the first one ancestor of the other?"
07432cef 7195msgstr "第一个是其他的祖先提交么?"
ef317cd5 7196
cfff71a9
JX
7197#: builtin/merge-base.c:222
7198msgid "find where <commit> forked from reflog of <ref>"
7199msgstr "查找 <commit> 从<引用>日志的何处分支的"
7200
ef317cd5
JX
7201#: builtin/merge-file.c:8
7202msgid ""
7203"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
7204"file2"
7205msgstr ""
07432cef 7206"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
ef317cd5
JX
7207
7208#: builtin/merge-file.c:33
7209msgid "send results to standard output"
07432cef 7210msgstr "将结果发送到标准输出"
ef317cd5
JX
7211
7212#: builtin/merge-file.c:34
7213msgid "use a diff3 based merge"
07432cef 7214msgstr "使用基于 diff3 的合并"
ef317cd5
JX
7215
7216#: builtin/merge-file.c:35
7217msgid "for conflicts, use our version"
07432cef 7218msgstr "如果冲突,使用我们的版本"
ef317cd5
JX
7219
7220#: builtin/merge-file.c:37
7221msgid "for conflicts, use their version"
07432cef 7222msgstr "如果冲突,使用他们的版本"
ef317cd5
JX
7223
7224#: builtin/merge-file.c:39
7225msgid "for conflicts, use a union version"
07432cef 7226msgstr "如果冲突,使用联合版本"
ef317cd5
JX
7227
7228#: builtin/merge-file.c:42
7229msgid "for conflicts, use this marker size"
07432cef 7230msgstr "如果冲突,使用指定长度的标记"
ef317cd5
JX
7231
7232#: builtin/merge-file.c:43
7233msgid "do not warn about conflicts"
07432cef 7234msgstr "不要警告冲突"
ef317cd5
JX
7235
7236#: builtin/merge-file.c:45
7237msgid "set labels for file1/orig_file/file2"
07432cef 7238msgstr "为 file1/orig_file/file2 设置标签"
c04f5ac3 7239
6c94aba5 7240#: builtin/mktree.c:64
ef317cd5 7241msgid "git mktree [-z] [--missing] [--batch]"
07432cef 7242msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 7243
6c94aba5 7244#: builtin/mktree.c:150
ef317cd5 7245msgid "input is NUL terminated"
07432cef 7246msgstr "输入以 NUL 字符终止"
c04f5ac3 7247
6c94aba5 7248#: builtin/mktree.c:151 builtin/write-tree.c:24
ef317cd5 7249msgid "allow missing objects"
07432cef 7250msgstr "允许丢失的对象"
c04f5ac3 7251
6c94aba5 7252#: builtin/mktree.c:152
ef317cd5 7253msgid "allow creation of more than one tree"
07432cef 7254msgstr "允许创建一个以上的树"
c04f5ac3 7255
90314792 7256#: builtin/mv.c:15
ef317cd5 7257msgid "git mv [options] <source>... <destination>"
07432cef 7258msgstr "git mv [选项] <源>... <目标>"
c04f5ac3 7259
220c313c
JX
7260#: builtin/mv.c:69
7261#, c-format
7262msgid "Directory %s is in index and no submodule?"
7263msgstr "目录 %s 在索引中并且不是子模组?"
7264
cfff71a9 7265#: builtin/mv.c:71
220c313c
JX
7266msgid "Please stage your changes to .gitmodules or stash them to proceed"
7267msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
7268
7269#: builtin/mv.c:89
7270#, c-format
7271msgid "%.*s is in index"
7272msgstr "%.*s 在索引中"
7273
7274#: builtin/mv.c:111
ef317cd5 7275msgid "force move/rename even if target exists"
07432cef 7276msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 7277
220c313c 7278#: builtin/mv.c:112
ef317cd5 7279msgid "skip move/rename errors"
07432cef 7280msgstr "跳过移动/重命名错误"
c04f5ac3 7281
220c313c
JX
7282#: builtin/mv.c:151
7283#, c-format
7284msgid "destination '%s' is not a directory"
7285msgstr "目标 '%s' 不是一个目录"
7286
7287#: builtin/mv.c:162
c04f5ac3
JX
7288#, c-format
7289msgid "Checking rename of '%s' to '%s'\n"
7290msgstr "检查 '%s' 到 '%s' 的重命名\n"
7291
220c313c 7292#: builtin/mv.c:166
c04f5ac3
JX
7293msgid "bad source"
7294msgstr "坏的源"
7295
220c313c 7296#: builtin/mv.c:169
c04f5ac3
JX
7297msgid "can not move directory into itself"
7298msgstr "不能将目录移动到自身"
7299
220c313c 7300#: builtin/mv.c:172
c04f5ac3
JX
7301msgid "cannot move directory over file"
7302msgstr "不能将目录移动到文件"
7303
220c313c 7304#: builtin/mv.c:181
c04f5ac3
JX
7305msgid "source directory is empty"
7306msgstr "源目录为空"
7307
220c313c 7308#: builtin/mv.c:206
c04f5ac3
JX
7309msgid "not under version control"
7310msgstr "不在版本控制之下"
7311
220c313c 7312#: builtin/mv.c:209
c04f5ac3
JX
7313msgid "destination exists"
7314msgstr "目标已存在"
7315
220c313c 7316#: builtin/mv.c:217
c04f5ac3
JX
7317#, c-format
7318msgid "overwriting '%s'"
7319msgstr "覆盖 '%s'"
7320
220c313c 7321#: builtin/mv.c:220
c04f5ac3
JX
7322msgid "Cannot overwrite"
7323msgstr "不能覆盖"
7324
220c313c 7325#: builtin/mv.c:223
c04f5ac3
JX
7326msgid "multiple sources for the same target"
7327msgstr "同一目标具有多个源"
7328
220c313c 7329#: builtin/mv.c:225
cfff71a9
JX
7330msgid "destination directory does not exist"
7331msgstr "目标目录不存在"
7332
220c313c 7333#: builtin/mv.c:232
c04f5ac3
JX
7334#, c-format
7335msgid "%s, source=%s, destination=%s"
7336msgstr "%s,源=%s,目标=%s"
7337
220c313c 7338#: builtin/mv.c:253
c04f5ac3
JX
7339#, c-format
7340msgid "Renaming %s to %s\n"
7341msgstr "重命名 %s 至 %s\n"
7342
04cb2f28 7343#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:355
c04f5ac3
JX
7344#, c-format
7345msgid "renaming '%s' failed"
7346msgstr "重命名 '%s' 失败"
7347
6acbf033 7348#: builtin/name-rev.c:255
ef317cd5 7349msgid "git name-rev [options] <commit>..."
07432cef 7350msgstr "git name-rev [选项] <提交>..."
ef317cd5 7351
6acbf033 7352#: builtin/name-rev.c:256
ef317cd5 7353msgid "git name-rev [options] --all"
07432cef 7354msgstr "git name-rev [选项] --all"
ef317cd5 7355
6acbf033 7356#: builtin/name-rev.c:257
ef317cd5 7357msgid "git name-rev [options] --stdin"
07432cef 7358msgstr "git name-rev [选项] --stdin"
ef317cd5 7359
6acbf033 7360#: builtin/name-rev.c:309
ef317cd5 7361msgid "print only names (no SHA-1)"
07432cef 7362msgstr "只打印名称(无 SHA-1)"
ef317cd5 7363
6acbf033 7364#: builtin/name-rev.c:310
ef317cd5 7365msgid "only use tags to name the commits"
07432cef 7366msgstr "只使用 tags 来命名提交"
ef317cd5 7367
6acbf033 7368#: builtin/name-rev.c:312
ef317cd5 7369msgid "only use refs matching <pattern>"
07432cef 7370msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 7371
6acbf033 7372#: builtin/name-rev.c:314
ef317cd5 7373msgid "list all commits reachable from all refs"
07432cef 7374msgstr "列出可以从所有引用访问的提交"
ef317cd5 7375
6acbf033 7376#: builtin/name-rev.c:315
ef317cd5 7377msgid "read from stdin"
07432cef 7378msgstr "从标准输入读取"
ef317cd5 7379
6acbf033 7380#: builtin/name-rev.c:316
90314792
JX
7381msgid "allow to print `undefined` names (default)"
7382msgstr "允许打印 `未定义` 的名称(默认)"
ef317cd5 7383
6acbf033 7384#: builtin/name-rev.c:322
2e8451e8
JX
7385msgid "dereference tags in the input (internal use)"
7386msgstr "反向解析输入中的 tags(内部使用)"
7387
7388#: builtin/notes.c:24
ef317cd5 7389msgid "git notes [--ref <notes_ref>] [list [<object>]]"
07432cef 7390msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 7391
2e8451e8 7392#: builtin/notes.c:25
ef317cd5 7393msgid ""
04cb2f28
JX
7394"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
7395"| (-c | -C) <object>] [<object>]"
ef317cd5 7396msgstr ""
04cb2f28
JX
7397"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
7398"| (-c | -C) <对象>] [<对象>]"
ef317cd5 7399
2e8451e8 7400#: builtin/notes.c:26
ef317cd5 7401msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
07432cef 7402msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 7403
2e8451e8 7404#: builtin/notes.c:27
ef317cd5 7405msgid ""
04cb2f28
JX
7406"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | "
7407"(-c | -C) <object>] [<object>]"
ef317cd5 7408msgstr ""
04cb2f28
JX
7409"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
7410"(-c | -C) <对象>] [<对象>]"
ef317cd5 7411
2e8451e8 7412#: builtin/notes.c:28
04cb2f28
JX
7413msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]"
7414msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
ef317cd5 7415
2e8451e8 7416#: builtin/notes.c:29
ef317cd5 7417msgid "git notes [--ref <notes_ref>] show [<object>]"
07432cef 7418msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 7419
2e8451e8 7420#: builtin/notes.c:30
ef317cd5
JX
7421msgid ""
7422"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
07432cef 7423msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 7424
2e8451e8 7425#: builtin/notes.c:31
ef317cd5 7426msgid "git notes merge --commit [-v | -q]"
07432cef 7427msgstr "git notes merge --commit [-v | -q]"
ef317cd5 7428
2e8451e8 7429#: builtin/notes.c:32
ef317cd5 7430msgid "git notes merge --abort [-v | -q]"
07432cef 7431msgstr "git notes merge --abort [-v | -q]"
ef317cd5 7432
2e8451e8 7433#: builtin/notes.c:33
ef317cd5 7434msgid "git notes [--ref <notes_ref>] remove [<object>...]"
07432cef 7435msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 7436
2e8451e8 7437#: builtin/notes.c:34
ef317cd5 7438msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
07432cef 7439msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
ef317cd5 7440
2e8451e8 7441#: builtin/notes.c:35
ef317cd5 7442msgid "git notes [--ref <notes_ref>] get-ref"
07432cef 7443msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 7444
2e8451e8 7445#: builtin/notes.c:40
ef317cd5 7446msgid "git notes [list [<object>]]"
07432cef 7447msgstr "git notes [list [<对象>]]"
ef317cd5 7448
2e8451e8 7449#: builtin/notes.c:45
ef317cd5 7450msgid "git notes add [<options>] [<object>]"
07432cef 7451msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 7452
2e8451e8 7453#: builtin/notes.c:50
ef317cd5 7454msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 7455msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 7456
2e8451e8 7457#: builtin/notes.c:51
ef317cd5 7458msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 7459msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 7460
2e8451e8 7461#: builtin/notes.c:56
ef317cd5 7462msgid "git notes append [<options>] [<object>]"
07432cef 7463msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 7464
2e8451e8 7465#: builtin/notes.c:61
ef317cd5 7466msgid "git notes edit [<object>]"
07432cef 7467msgstr "git notes edit [<对象>]"
ef317cd5 7468
2e8451e8 7469#: builtin/notes.c:66
ef317cd5 7470msgid "git notes show [<object>]"
07432cef 7471msgstr "git notes show [<对象>]"
ef317cd5 7472
2e8451e8 7473#: builtin/notes.c:71
ef317cd5 7474msgid "git notes merge [<options>] <notes_ref>"
07432cef 7475msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 7476
2e8451e8 7477#: builtin/notes.c:72
ef317cd5 7478msgid "git notes merge --commit [<options>]"
07432cef 7479msgstr "git notes merge --commit [<选项>]"
ef317cd5 7480
2e8451e8 7481#: builtin/notes.c:73
ef317cd5 7482msgid "git notes merge --abort [<options>]"
07432cef 7483msgstr "git notes merge --abort [<选项>]"
ef317cd5 7484
2e8451e8 7485#: builtin/notes.c:78
ef317cd5 7486msgid "git notes remove [<object>]"
07432cef 7487msgstr "git notes remove [<对象>]"
ef317cd5 7488
2e8451e8 7489#: builtin/notes.c:83
ef317cd5 7490msgid "git notes prune [<options>]"
07432cef 7491msgstr "git notes prune [<选项>]"
ef317cd5 7492
2e8451e8 7493#: builtin/notes.c:88
ef317cd5 7494msgid "git notes get-ref"
07432cef 7495msgstr "git notes get-ref"
ef317cd5 7496
04cb2f28 7497#: builtin/notes.c:146
c04f5ac3
JX
7498#, c-format
7499msgid "unable to start 'show' for object '%s'"
7500msgstr "不能为对象 '%s' 开始 'show'"
7501
04cb2f28 7502#: builtin/notes.c:150
a77c07d9
JX
7503msgid "could not read 'show' output"
7504msgstr "不能读取 'show' 的输出"
c04f5ac3 7505
04cb2f28 7506#: builtin/notes.c:158
c04f5ac3
JX
7507#, c-format
7508msgid "failed to finish 'show' for object '%s'"
7509msgstr "无法为对象 '%s' 完成 'show'"
7510
04cb2f28 7511#: builtin/notes.c:173 builtin/tag.c:477
c04f5ac3
JX
7512#, c-format
7513msgid "could not create file '%s'"
7514msgstr "不能创建文件 '%s'"
7515
04cb2f28 7516#: builtin/notes.c:192
c04f5ac3
JX
7517msgid "Please supply the note contents using either -m or -F option"
7518msgstr "请通过 -m 或 -F 选项为注解提供内容"
7519
04cb2f28 7520#: builtin/notes.c:201
c04f5ac3
JX
7521msgid "unable to write note object"
7522msgstr "不能写注解对象"
7523
04cb2f28 7524#: builtin/notes.c:203
c04f5ac3 7525#, c-format
220c313c
JX
7526msgid "The note contents have been left in %s"
7527msgstr "注解内容被留在 %s 中"
c04f5ac3 7528
04cb2f28 7529#: builtin/notes.c:231 builtin/tag.c:693
c04f5ac3
JX
7530#, c-format
7531msgid "cannot read '%s'"
7532msgstr "不能读取 '%s'"
7533
04cb2f28 7534#: builtin/notes.c:233 builtin/tag.c:696
c04f5ac3
JX
7535#, c-format
7536msgid "could not open or read '%s'"
7537msgstr "不能打开或读取 '%s'"
7538
04cb2f28
JX
7539#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305
7540#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506
7541#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652
7542#: builtin/notes.c:854 builtin/tag.c:709
c04f5ac3
JX
7543#, c-format
7544msgid "Failed to resolve '%s' as a valid ref."
90e6ef53 7545msgstr "无法解析 '%s' 为一个有效引用。"
c04f5ac3 7546
04cb2f28 7547#: builtin/notes.c:255
c04f5ac3
JX
7548#, c-format
7549msgid "Failed to read object '%s'."
7550msgstr "无法读取对象 '%s'。"
7551
04cb2f28 7552#: builtin/notes.c:259
6c94aba5
JX
7553#, c-format
7554msgid "Cannot read note data from non-blob object '%s'."
7555msgstr "不能从非数据对象 '%s' 中读取注解数据"
7556
04cb2f28 7557#: builtin/notes.c:299
c04f5ac3
JX
7558#, c-format
7559msgid "Malformed input line: '%s'."
7560msgstr "非法的输入行:'%s'。"
7561
04cb2f28 7562#: builtin/notes.c:314
c04f5ac3
JX
7563#, c-format
7564msgid "Failed to copy notes from '%s' to '%s'"
90e6ef53 7565msgstr "无法从 '%s' 到 '%s' 拷贝注解"
c04f5ac3 7566
04cb2f28
JX
7567#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489
7568#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645
7569#: builtin/notes.c:919
c04f5ac3
JX
7570msgid "too many parameters"
7571msgstr "参数太多"
7572
04cb2f28 7573#: builtin/notes.c:371 builtin/notes.c:658
c04f5ac3
JX
7574#, c-format
7575msgid "No note found for object %s."
7576msgstr "未发现对象 %s 的注解。"
7577
04cb2f28 7578#: builtin/notes.c:392 builtin/notes.c:555
ef317cd5 7579msgid "note contents as a string"
07432cef 7580msgstr "注解内容作为一个字符串"
ef317cd5 7581
04cb2f28 7582#: builtin/notes.c:395 builtin/notes.c:558
ef317cd5 7583msgid "note contents in a file"
07432cef 7584msgstr "注解内容到一个文件中"
ef317cd5 7585
04cb2f28
JX
7586#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560
7587#: builtin/notes.c:563 builtin/tag.c:628
ef317cd5 7588msgid "object"
07432cef 7589msgstr "对象"
ef317cd5 7590
04cb2f28 7591#: builtin/notes.c:398 builtin/notes.c:561
ef317cd5 7592msgid "reuse and edit specified note object"
07432cef 7593msgstr "重用和编辑指定的注解对象"
ef317cd5 7594
04cb2f28 7595#: builtin/notes.c:401 builtin/notes.c:564
ef317cd5 7596msgid "reuse specified note object"
07432cef 7597msgstr "重用指定的注解对象"
ef317cd5 7598
04cb2f28
JX
7599#: builtin/notes.c:404 builtin/notes.c:567
7600msgid "allow storing empty note"
7601msgstr "允许保存空白注释"
7602
7603#: builtin/notes.c:405 builtin/notes.c:476
ef317cd5 7604msgid "replace existing notes"
07432cef 7605msgstr "替换已存在的注解"
ef317cd5 7606
04cb2f28 7607#: builtin/notes.c:430
c04f5ac3
JX
7608#, c-format
7609msgid ""
7610"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7611"existing notes"
7612msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7613
04cb2f28 7614#: builtin/notes.c:445 builtin/notes.c:524
c04f5ac3
JX
7615#, c-format
7616msgid "Overwriting existing notes for object %s\n"
7617msgstr "覆盖对象 %s 现存注解\n"
7618
04cb2f28
JX
7619#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859
7620#, c-format
7621msgid "Removing note for object %s\n"
7622msgstr "删除对象 %s 的注解\n"
7623
7624#: builtin/notes.c:477
ef317cd5 7625msgid "read objects from stdin"
07432cef 7626msgstr "从标准输入读取对象"
ef317cd5 7627
04cb2f28 7628#: builtin/notes.c:479
ef317cd5 7629msgid "load rewriting config for <command> (implies --stdin)"
07432cef 7630msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 7631
04cb2f28 7632#: builtin/notes.c:497
c04f5ac3
JX
7633msgid "too few parameters"
7634msgstr "参数太少"
7635
04cb2f28 7636#: builtin/notes.c:518
c04f5ac3
JX
7637#, c-format
7638msgid ""
7639"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7640"existing notes"
7641msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7642
04cb2f28 7643#: builtin/notes.c:530
c04f5ac3
JX
7644#, c-format
7645msgid "Missing notes on source object %s. Cannot copy."
7646msgstr "源对象 %s 缺少注解。不能拷贝。"
7647
04cb2f28 7648#: builtin/notes.c:582
ef317cd5
JX
7649#, c-format
7650msgid ""
7651"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7652"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7653msgstr ""
7654"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7655"请换用 'git notes add -f -m/-F/-c/-C'。\n"
7656
04cb2f28 7657#: builtin/notes.c:750
ef317cd5 7658msgid "General options"
07432cef 7659msgstr "通用选项"
ef317cd5 7660
04cb2f28 7661#: builtin/notes.c:752
ef317cd5 7662msgid "Merge options"
07432cef 7663msgstr "合并选项"
ef317cd5 7664
04cb2f28 7665#: builtin/notes.c:754
ef317cd5
JX
7666msgid ""
7667"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7668"cat_sort_uniq)"
07432cef 7669msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 7670
04cb2f28 7671#: builtin/notes.c:756
ef317cd5 7672msgid "Committing unmerged notes"
07432cef 7673msgstr "提交未合并的注解"
ef317cd5 7674
04cb2f28 7675#: builtin/notes.c:758
ef317cd5 7676msgid "finalize notes merge by committing unmerged notes"
07432cef 7677msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 7678
04cb2f28 7679#: builtin/notes.c:760
ef317cd5 7680msgid "Aborting notes merge resolution"
07432cef 7681msgstr "中止注解合并的方案"
ef317cd5 7682
04cb2f28 7683#: builtin/notes.c:762
ef317cd5 7684msgid "abort notes merge"
07432cef 7685msgstr "中止注解合并"
ef317cd5 7686
04cb2f28 7687#: builtin/notes.c:857
ef317cd5
JX
7688#, c-format
7689msgid "Object %s has no note\n"
7690msgstr "对象 %s 没有注解\n"
7691
04cb2f28 7692#: builtin/notes.c:869
ef317cd5 7693msgid "attempt to remove non-existent note is not an error"
07432cef 7694msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 7695
04cb2f28 7696#: builtin/notes.c:872
ef317cd5 7697msgid "read object names from the standard input"
07432cef 7698msgstr "从标准输入读取对象名称"
ef317cd5 7699
04cb2f28 7700#: builtin/notes.c:953
6c94aba5 7701msgid "notes-ref"
07432cef 7702msgstr "注解引用"
ef317cd5 7703
04cb2f28 7704#: builtin/notes.c:954
ef317cd5 7705msgid "use notes from <notes_ref>"
07432cef 7706msgstr "从 <注解引用> 使用注解"
ef317cd5 7707
04cb2f28 7708#: builtin/notes.c:989 builtin/remote.c:1619
ef317cd5
JX
7709#, c-format
7710msgid "Unknown subcommand: %s"
7711msgstr "未知子命令:%s"
7712
220c313c 7713#: builtin/pack-objects.c:28
ef317cd5 7714msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
07432cef 7715msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
ef317cd5 7716
220c313c 7717#: builtin/pack-objects.c:29
ef317cd5 7718msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
07432cef 7719msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
ef317cd5 7720
220c313c 7721#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
ef317cd5
JX
7722#, c-format
7723msgid "deflate error (%d)"
7724msgstr "压缩错误 (%d)"
7725
220c313c 7726#: builtin/pack-objects.c:773
6c94aba5
JX
7727msgid "Writing objects"
7728msgstr "写入对象中"
7729
220c313c 7730#: builtin/pack-objects.c:1015
6c94aba5
JX
7731msgid "disabling bitmap writing, as some objects are not being packed"
7732msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
7733
220c313c 7734#: builtin/pack-objects.c:2175
6c94aba5
JX
7735msgid "Compressing objects"
7736msgstr "压缩对象中"
7737
220c313c 7738#: builtin/pack-objects.c:2572
ef317cd5
JX
7739#, c-format
7740msgid "unsupported index version %s"
7741msgstr "不支持的索引版本 %s"
7742
220c313c 7743#: builtin/pack-objects.c:2576
ef317cd5
JX
7744#, c-format
7745msgid "bad index version '%s'"
7746msgstr "坏的索引版本 '%s'"
7747
220c313c 7748#: builtin/pack-objects.c:2599
ef317cd5
JX
7749#, c-format
7750msgid "option %s does not accept negative form"
7751msgstr "选项 %s 不接受否定格式"
7752
220c313c 7753#: builtin/pack-objects.c:2603
ef317cd5
JX
7754#, c-format
7755msgid "unable to parse value '%s' for option %s"
7756msgstr "不能解析选项 %1$s 的值 '%2$s'"
7757
04cb2f28 7758#: builtin/pack-objects.c:2623
ef317cd5 7759msgid "do not show progress meter"
07432cef 7760msgstr "不显示进度表"
ef317cd5 7761
04cb2f28 7762#: builtin/pack-objects.c:2625
ef317cd5 7763msgid "show progress meter"
07432cef 7764msgstr "显示进度表"
ef317cd5 7765
04cb2f28 7766#: builtin/pack-objects.c:2627
ef317cd5 7767msgid "show progress meter during object writing phase"
07432cef 7768msgstr "在对象写入阶段显示进度表"
ef317cd5 7769
04cb2f28 7770#: builtin/pack-objects.c:2630
ef317cd5 7771msgid "similar to --all-progress when progress meter is shown"
07432cef 7772msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 7773
04cb2f28 7774#: builtin/pack-objects.c:2631
ef317cd5 7775msgid "version[,offset]"
07432cef 7776msgstr "版本[,偏移]"
ef317cd5 7777
04cb2f28 7778#: builtin/pack-objects.c:2632
ef317cd5 7779msgid "write the pack index file in the specified idx format version"
07432cef 7780msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 7781
04cb2f28 7782#: builtin/pack-objects.c:2635
ef317cd5 7783msgid "maximum size of each output pack file"
07432cef 7784msgstr "每个输出包的最大尺寸"
ef317cd5 7785
04cb2f28 7786#: builtin/pack-objects.c:2637
ef317cd5 7787msgid "ignore borrowed objects from alternate object store"
07432cef 7788msgstr "忽略从替代对象存储里借用对象"
ef317cd5 7789
04cb2f28 7790#: builtin/pack-objects.c:2639
ef317cd5 7791msgid "ignore packed objects"
07432cef 7792msgstr "忽略包对象"
ef317cd5 7793
04cb2f28 7794#: builtin/pack-objects.c:2641
ef317cd5 7795msgid "limit pack window by objects"
07432cef 7796msgstr "限制打包窗口的对象数"
ef317cd5 7797
04cb2f28 7798#: builtin/pack-objects.c:2643
ef317cd5 7799msgid "limit pack window by memory in addition to object limit"
07432cef 7800msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 7801
04cb2f28 7802#: builtin/pack-objects.c:2645
ef317cd5 7803msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 7804msgstr "打包允许的 delta 链的最大长度"
ef317cd5 7805
04cb2f28 7806#: builtin/pack-objects.c:2647
ef317cd5 7807msgid "reuse existing deltas"
07432cef 7808msgstr "重用已存在的 deltas"
ef317cd5 7809
04cb2f28 7810#: builtin/pack-objects.c:2649
ef317cd5 7811msgid "reuse existing objects"
07432cef 7812msgstr "重用已存在的对象"
ef317cd5 7813
04cb2f28 7814#: builtin/pack-objects.c:2651
ef317cd5 7815msgid "use OFS_DELTA objects"
07432cef 7816msgstr "使用 OFS_DELTA 对象"
ef317cd5 7817
04cb2f28 7818#: builtin/pack-objects.c:2653
ef317cd5 7819msgid "use threads when searching for best delta matches"
07432cef 7820msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 7821
04cb2f28 7822#: builtin/pack-objects.c:2655
ef317cd5 7823msgid "do not create an empty pack output"
07432cef 7824msgstr "不创建空的包输出"
ef317cd5 7825
04cb2f28 7826#: builtin/pack-objects.c:2657
ef317cd5 7827msgid "read revision arguments from standard input"
07432cef 7828msgstr "从标准输入读取修订号参数"
ef317cd5 7829
04cb2f28 7830#: builtin/pack-objects.c:2659
ef317cd5 7831msgid "limit the objects to those that are not yet packed"
07432cef 7832msgstr "限制那些尚未打包的对象"
ef317cd5 7833
04cb2f28 7834#: builtin/pack-objects.c:2662
ef317cd5 7835msgid "include objects reachable from any reference"
07432cef 7836msgstr "包括可以从任何引用访问到的对象"
ef317cd5 7837
04cb2f28 7838#: builtin/pack-objects.c:2665
ef317cd5 7839msgid "include objects referred by reflog entries"
07432cef 7840msgstr "包括被引用日志引用到的对象"
ef317cd5 7841
04cb2f28 7842#: builtin/pack-objects.c:2668
220c313c
JX
7843msgid "include objects referred to by the index"
7844msgstr "包括被索引引用到的对象"
7845
04cb2f28 7846#: builtin/pack-objects.c:2671
ef317cd5 7847msgid "output pack to stdout"
07432cef 7848msgstr "输出包到标准输出"
ef317cd5 7849
04cb2f28 7850#: builtin/pack-objects.c:2673
ef317cd5 7851msgid "include tag objects that refer to objects to be packed"
07432cef 7852msgstr "包括引用了打包对象的 tag"
ef317cd5 7853
04cb2f28 7854#: builtin/pack-objects.c:2675
ef317cd5 7855msgid "keep unreachable objects"
07432cef 7856msgstr "维持不可达的对象"
ef317cd5 7857
04cb2f28 7858#: builtin/pack-objects.c:2676 parse-options.h:140
ef317cd5
JX
7859msgid "time"
7860msgstr "时间"
7861
04cb2f28 7862#: builtin/pack-objects.c:2677
ef317cd5 7863msgid "unpack unreachable objects newer than <time>"
07432cef 7864msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 7865
04cb2f28 7866#: builtin/pack-objects.c:2680
ef317cd5 7867msgid "create thin packs"
07432cef 7868msgstr "创建精简包"
ef317cd5 7869
04cb2f28
JX
7870#: builtin/pack-objects.c:2682
7871msgid "create packs suitable for shallow fetches"
7872msgstr "创建适合浅克隆版本库获取的包"
7873
7874#: builtin/pack-objects.c:2684
ef317cd5 7875msgid "ignore packs that have companion .keep file"
07432cef 7876msgstr "忽略配有 .keep 文件的包"
ef317cd5 7877
04cb2f28 7878#: builtin/pack-objects.c:2686
ef317cd5 7879msgid "pack compression level"
07432cef 7880msgstr "打包压缩级别"
ef317cd5 7881
04cb2f28 7882#: builtin/pack-objects.c:2688
ef317cd5 7883msgid "do not hide commits by grafts"
cfff71a9 7884msgstr "显示被嫁接隐藏的提交"
ef317cd5 7885
04cb2f28 7886#: builtin/pack-objects.c:2690
6c94aba5
JX
7887msgid "use a bitmap index if available to speed up counting objects"
7888msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
7889
04cb2f28 7890#: builtin/pack-objects.c:2692
6c94aba5
JX
7891msgid "write a bitmap index together with the pack index"
7892msgstr "在建立包索引的同时创建 bitmap 索引"
7893
04cb2f28 7894#: builtin/pack-objects.c:2783
6c94aba5
JX
7895msgid "Counting objects"
7896msgstr "对象计数中"
7897
ef317cd5
JX
7898#: builtin/pack-refs.c:6
7899msgid "git pack-refs [options]"
07432cef 7900msgstr "git pack-refs [选项]"
c04f5ac3 7901
ef317cd5
JX
7902#: builtin/pack-refs.c:14
7903msgid "pack everything"
07432cef 7904msgstr "打包一切"
c04f5ac3 7905
ef317cd5
JX
7906#: builtin/pack-refs.c:15
7907msgid "prune loose refs (default)"
07432cef 7908msgstr "清除松散的引用(默认)"
c04f5ac3 7909
ef317cd5
JX
7910#: builtin/prune-packed.c:7
7911msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
07432cef 7912msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
6792b93b 7913
220c313c 7914#: builtin/prune-packed.c:40
6c94aba5
JX
7915msgid "Removing duplicate objects"
7916msgstr "正在删除重复对象"
7917
ef317cd5
JX
7918#: builtin/prune.c:12
7919msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
07432cef 7920msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7ac1c0ad 7921
220c313c 7922#: builtin/prune.c:106
ef317cd5 7923msgid "do not remove, show only"
07432cef 7924msgstr "不删除,只显示"
7ac1c0ad 7925
220c313c 7926#: builtin/prune.c:107
ef317cd5 7927msgid "report pruned objects"
07432cef 7928msgstr "报告清除的对象"
7ac1c0ad 7929
220c313c 7930#: builtin/prune.c:110
ef317cd5 7931msgid "expire objects older than <time>"
07432cef 7932msgstr "使早于给定时间的对象过期"
ef317cd5
JX
7933
7934#: builtin/push.c:14
ef317cd5 7935msgid "git push [<options>] [<repository> [<refspec>...]]"
90314792 7936msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
7ac1c0ad 7937
6c94aba5 7938#: builtin/push.c:85
c04f5ac3
JX
7939msgid "tag shorthand without <tag>"
7940msgstr "tag 简写没有跟 <tag> 参数"
7941
6c94aba5 7942#: builtin/push.c:95
c04f5ac3 7943msgid "--delete only accepts plain target ref names"
90e6ef53 7944msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 7945
6acbf033 7946#: builtin/push.c:139
8ada9598
JX
7947msgid ""
7948"\n"
7949"To choose either option permanently, see push.default in 'git help config'."
7950msgstr ""
81809b99
JX
7951"\n"
7952"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598 7953
6acbf033 7954#: builtin/push.c:142
8ada9598
JX
7955#, c-format
7956msgid ""
7957"The upstream branch of your current branch does not match\n"
7958"the name of your current branch. To push to the upstream branch\n"
7959"on the remote, use\n"
7960"\n"
7961" git push %s HEAD:%s\n"
7962"\n"
7963"To push to the branch of the same name on the remote, use\n"
7964"\n"
7965" git push %s %s\n"
7966"%s"
7967msgstr ""
81809b99
JX
7968"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
7969"上游分支,使用\n"
7970"\n"
7971" git push %s HEAD:%s\n"
7972"\n"
7973"为推送至远程同名分支,使用\n"
7974"\n"
7975" git push %s %s\n"
7976"%s"
8ada9598 7977
6acbf033 7978#: builtin/push.c:157
c04f5ac3
JX
7979#, c-format
7980msgid ""
7981"You are not currently on a branch.\n"
7982"To push the history leading to the current (detached HEAD)\n"
7983"state now, use\n"
7984"\n"
7985" git push %s HEAD:<name-of-remote-branch>\n"
7986msgstr ""
7987"您当前不在一个分支上。\n"
90e6ef53 7988"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3
JX
7989"\n"
7990" git push %s HEAD:<name-of-remote-branch>\n"
7991
6acbf033 7992#: builtin/push.c:171
c04f5ac3
JX
7993#, c-format
7994msgid ""
7995"The current branch %s has no upstream branch.\n"
7996"To push the current branch and set the remote as upstream, use\n"
7997"\n"
7998" git push --set-upstream %s %s\n"
7999msgstr ""
8000"当前分支 %s 没有对应的上游分支。\n"
8001"为推送当前分支并建立与远程上游的跟踪,使用\n"
8002"\n"
8003" git push --set-upstream %s %s\n"
8004
6acbf033 8005#: builtin/push.c:179
c04f5ac3
JX
8006#, c-format
8007msgid "The current branch %s has multiple upstream branches, refusing to push."
8008msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
8009
6acbf033 8010#: builtin/push.c:182
73a60cd2
JX
8011#, c-format
8012msgid ""
8013"You are pushing to remote '%s', which is not the upstream of\n"
8014"your current branch '%s', without telling me what to push\n"
8015"to update which remote branch."
8016msgstr ""
8017"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
8018"而没有告诉我要推送什么、更新哪个远程分支。"
8019
c160d03f 8020# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
6acbf033 8021#: builtin/push.c:205
c160d03f 8022msgid ""
6c94aba5 8023"push.default is unset; its implicit value has changed in\n"
c160d03f 8024"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
6c94aba5 8025"and maintain the traditional behavior, use:\n"
c160d03f
JX
8026"\n"
8027" git config --global push.default matching\n"
8028"\n"
8029"To squelch this message and adopt the new behavior now, use:\n"
8030"\n"
8031" git config --global push.default simple\n"
8032"\n"
cfff71a9
JX
8033"When push.default is set to 'matching', git will push local branches\n"
8034"to the remote branches that already exist with the same name.\n"
8035"\n"
6c94aba5 8036"Since Git 2.0, Git defaults to the more conservative 'simple'\n"
cfff71a9
JX
8037"behavior, which only pushes the current branch to the corresponding\n"
8038"remote branch that 'git pull' uses to update the current branch.\n"
8039"\n"
c160d03f
JX
8040"See 'git help config' and search for 'push.default' for further "
8041"information.\n"
8042"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
8043"'current' instead of 'simple' if you sometimes use older versions of Git)"
8044msgstr ""
6c94aba5 8045"push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n"
cfff71a9 8046"变更为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
c160d03f
JX
8047"\n"
8048" git config --global push.default matching\n"
8049"\n"
8050"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
8051"\n"
8052" git config --global push.default simple\n"
8053"\n"
cfff71a9
JX
8054"当 push.default 设置为 'matching' 后,git 将推送和远程同名的所有\n"
8055"本地分支。\n"
8056"\n"
8057"从 Git 2.0 开始,Git 缺省采用更为保守的 'simple' 模式,只推送当前\n"
8058"分支到远程关联的同名分支,即 'git push' 推送当前分支。\n"
8059"\n"
c160d03f
JX
8060"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
8061"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
90314792 8062"为保持兼容,请用 'current' 代替 'simple')"
c160d03f 8063
6acbf033 8064#: builtin/push.c:272
c04f5ac3
JX
8065msgid ""
8066"You didn't specify any refspecs to push, and push.default is \"nothing\"."
90314792 8067msgstr "您没有为推送指定任何引用规则,并且 push.default 为 \"nothing\"。"
c04f5ac3 8068
6acbf033 8069#: builtin/push.c:279
170e9899
JX
8070msgid ""
8071"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
8072"its remote counterpart. Integrate the remote changes (e.g.\n"
8073"'git pull ...') before pushing again.\n"
170e9899
JX
8074"See the 'Note about fast-forwards' in 'git push --help' for details."
8075msgstr ""
eff6d3a9 8076"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 8077"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 8078"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 8079
6acbf033 8080#: builtin/push.c:285
170e9899
JX
8081msgid ""
8082"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
8083"counterpart. Check out this branch and integrate the remote changes\n"
8084"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
8085"See the 'Note about fast-forwards' in 'git push --help' for details."
8086msgstr ""
eff6d3a9 8087"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 8088"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 8089"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 8090
6acbf033 8091#: builtin/push.c:291
07432cef 8092msgid ""
a77c07d9
JX
8093"Updates were rejected because the remote contains work that you do\n"
8094"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
8095"to the same ref. You may want to first integrate the remote changes\n"
8096"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
8097"See the 'Note about fast-forwards' in 'git push --help' for details."
8098msgstr ""
8099"更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
2e8451e8
JX
8100"一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
8101"(如 'git pull ...')。\n"
a77c07d9
JX
8102"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
8103
6acbf033 8104#: builtin/push.c:298
a77c07d9
JX
8105msgid "Updates were rejected because the tag already exists in the remote."
8106msgstr "更新被拒绝因为 tag 在远程已经存在。"
8107
6acbf033 8108#: builtin/push.c:301
a77c07d9
JX
8109msgid ""
8110"You cannot update a remote ref that points at a non-commit object,\n"
8111"or update a remote ref to make it point at a non-commit object,\n"
8112"without using the '--force' option.\n"
8113msgstr ""
8114"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
8115"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 8116
6acbf033 8117#: builtin/push.c:360
c04f5ac3
JX
8118#, c-format
8119msgid "Pushing to %s\n"
8120msgstr "推送到 %s\n"
8121
6acbf033 8122#: builtin/push.c:364
c04f5ac3
JX
8123#, c-format
8124msgid "failed to push some refs to '%s'"
8125msgstr "无法推送一些引用到 '%s'"
8126
6acbf033 8127#: builtin/push.c:394
c04f5ac3
JX
8128#, c-format
8129msgid "bad repository '%s'"
90e6ef53 8130msgstr "坏的版本库 '%s'"
c04f5ac3 8131
6acbf033 8132#: builtin/push.c:395
c04f5ac3
JX
8133msgid ""
8134"No configured push destination.\n"
8135"Either specify the URL from the command-line or configure a remote "
8136"repository using\n"
8137"\n"
8138" git remote add <name> <url>\n"
8139"\n"
8140"and then push using the remote name\n"
8141"\n"
8142" git push <name>\n"
8143msgstr ""
90e6ef53 8144"没有配置推送目标。\n"
07432cef 8145"或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
c04f5ac3
JX
8146"\n"
8147" git remote add <name> <url>\n"
8148"\n"
8149"然后使用该远程版本库名执行推送\n"
8150"\n"
8151" git push <name>\n"
8152
6acbf033 8153#: builtin/push.c:410
c04f5ac3
JX
8154msgid "--all and --tags are incompatible"
8155msgstr "--all 和 --tags 不兼容"
8156
6acbf033 8157#: builtin/push.c:411
c04f5ac3 8158msgid "--all can't be combined with refspecs"
90314792 8159msgstr "--all 不能和引用规则同时使用"
c04f5ac3 8160
6acbf033 8161#: builtin/push.c:416
c04f5ac3
JX
8162msgid "--mirror and --tags are incompatible"
8163msgstr "--mirror 和 --tags 不兼容"
8164
6acbf033 8165#: builtin/push.c:417
c04f5ac3 8166msgid "--mirror can't be combined with refspecs"
90314792 8167msgstr "--mirror 不能和引用规则同时使用"
c04f5ac3 8168
6acbf033 8169#: builtin/push.c:422
c04f5ac3
JX
8170msgid "--all and --mirror are incompatible"
8171msgstr "--all 和 --mirror 不兼容"
8172
220c313c 8173#: builtin/push.c:493
ef317cd5 8174msgid "repository"
07432cef 8175msgstr "版本库"
ef317cd5 8176
220c313c 8177#: builtin/push.c:494
ef317cd5 8178msgid "push all refs"
07432cef 8179msgstr "推送所有引用"
ef317cd5 8180
220c313c 8181#: builtin/push.c:495
ef317cd5 8182msgid "mirror all refs"
07432cef 8183msgstr "镜像所有引用"
ef317cd5 8184
220c313c 8185#: builtin/push.c:497
ef317cd5 8186msgid "delete refs"
07432cef 8187msgstr "删除引用"
ef317cd5 8188
220c313c 8189#: builtin/push.c:498
ef317cd5 8190msgid "push tags (can't be used with --all or --mirror)"
07432cef 8191msgstr "推送 tags(不能使用 --all or --mirror)"
ef317cd5 8192
220c313c 8193#: builtin/push.c:501
ef317cd5
JX
8194msgid "force updates"
8195msgstr "强制更新"
8196
220c313c 8197#: builtin/push.c:503
90314792
JX
8198msgid "refname>:<expect"
8199msgstr "引用名>:<期望值"
8200
220c313c 8201#: builtin/push.c:504
90314792
JX
8202msgid "require old value of ref to be at this value"
8203msgstr "要求引用旧的取值为设定值"
8204
220c313c 8205#: builtin/push.c:507
ef317cd5 8206msgid "control recursive pushing of submodules"
07432cef 8207msgstr "控制子模组的递归推送"
ef317cd5 8208
220c313c 8209#: builtin/push.c:509
ef317cd5 8210msgid "use thin pack"
07432cef 8211msgstr "使用精简打包"
ef317cd5 8212
220c313c 8213#: builtin/push.c:510 builtin/push.c:511
ef317cd5 8214msgid "receive pack program"
07432cef 8215msgstr "接收包程序"
ef317cd5 8216
220c313c 8217#: builtin/push.c:512
ef317cd5 8218msgid "set upstream for git pull/status"
07432cef 8219msgstr "设置 git pull/status 的上游"
ef317cd5 8220
220c313c 8221#: builtin/push.c:515
ef317cd5 8222msgid "prune locally removed refs"
07432cef 8223msgstr "清除本地删除的引用"
ef317cd5 8224
220c313c 8225#: builtin/push.c:517
a77c07d9
JX
8226msgid "bypass pre-push hook"
8227msgstr "绕过 pre-push 钩子"
8228
220c313c 8229#: builtin/push.c:518
1003b3a5
JX
8230msgid "push missing but relevant tags"
8231msgstr "推送缺失的有关的 tags"
8232
220c313c
JX
8233#: builtin/push.c:520
8234msgid "GPG sign the push"
8235msgstr "用 GPG 为推送签名"
8236
8237#: builtin/push.c:529
c04f5ac3
JX
8238msgid "--delete is incompatible with --all, --mirror and --tags"
8239msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8240
220c313c 8241#: builtin/push.c:531
c04f5ac3
JX
8242msgid "--delete doesn't make sense without any refs"
8243msgstr "--delete 未接任何引用没有意义"
8244
220c313c 8245#: builtin/read-tree.c:37
ef317cd5
JX
8246msgid ""
8247"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
8248"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8249"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
8250msgstr ""
07432cef
WS
8251"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
8252"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
8253"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
ef317cd5 8254
220c313c 8255#: builtin/read-tree.c:110
ef317cd5 8256msgid "write resulting index to <file>"
07432cef 8257msgstr "将索引结果写入 <file>"
ef317cd5 8258
220c313c 8259#: builtin/read-tree.c:113
ef317cd5 8260msgid "only empty the index"
07432cef 8261msgstr "只是清空索引"
ef317cd5 8262
220c313c 8263#: builtin/read-tree.c:115
ef317cd5 8264msgid "Merging"
07432cef 8265msgstr "合并"
ef317cd5 8266
220c313c 8267#: builtin/read-tree.c:117
ef317cd5 8268msgid "perform a merge in addition to a read"
07432cef 8269msgstr "读取之余再执行一个合并"
ef317cd5 8270
220c313c 8271#: builtin/read-tree.c:119
ef317cd5 8272msgid "3-way merge if no file level merging required"
07432cef 8273msgstr "如果没有文件级合并需要,执行三路合并"
ef317cd5 8274
220c313c 8275#: builtin/read-tree.c:121
ef317cd5 8276msgid "3-way merge in presence of adds and removes"
07432cef 8277msgstr "存在添加和删除时,也执行三路合并"
ef317cd5 8278
220c313c 8279#: builtin/read-tree.c:123
ef317cd5 8280msgid "same as -m, but discard unmerged entries"
07432cef 8281msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 8282
220c313c 8283#: builtin/read-tree.c:124
ef317cd5 8284msgid "<subdirectory>/"
07432cef 8285msgstr "<子目录>/"
ef317cd5 8286
220c313c 8287#: builtin/read-tree.c:125
ef317cd5 8288msgid "read the tree into the index under <subdirectory>/"
07432cef 8289msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 8290
220c313c 8291#: builtin/read-tree.c:128
ef317cd5 8292msgid "update working tree with merge result"
07432cef 8293msgstr "用合并的结果更新工作区"
ef317cd5 8294
220c313c 8295#: builtin/read-tree.c:130
ef317cd5 8296msgid "gitignore"
07432cef 8297msgstr "gitignore"
ef317cd5 8298
220c313c 8299#: builtin/read-tree.c:131
ef317cd5 8300msgid "allow explicitly ignored files to be overwritten"
07432cef 8301msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 8302
220c313c 8303#: builtin/read-tree.c:134
ef317cd5 8304msgid "don't check the working tree after merging"
07432cef 8305msgstr "合并后不检查工作区"
ef317cd5 8306
220c313c 8307#: builtin/read-tree.c:135
ef317cd5 8308msgid "don't update the index or the work tree"
07432cef 8309msgstr "不更新索引区和工作区"
ef317cd5 8310
220c313c 8311#: builtin/read-tree.c:137
ef317cd5 8312msgid "skip applying sparse checkout filter"
07432cef 8313msgstr "跳过应用稀疏检出过滤器"
ef317cd5 8314
220c313c 8315#: builtin/read-tree.c:139
ef317cd5 8316msgid "debug unpack-trees"
07432cef 8317msgstr "调试 unpack-trees"
ef317cd5 8318
90314792 8319#: builtin/reflog.c:499
2e8451e8
JX
8320#, c-format
8321msgid "%s' for '%s' is not a valid timestamp"
8322msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8323
90314792 8324#: builtin/reflog.c:615 builtin/reflog.c:620
2e8451e8
JX
8325#, c-format
8326msgid "'%s' is not a valid timestamp"
8327msgstr "'%s' 不是一个有效的时间戳"
8328
cfff71a9 8329#: builtin/remote.c:12
ef317cd5 8330msgid "git remote [-v | --verbose]"
07432cef 8331msgstr "git remote [-v | --verbose]"
ef317cd5 8332
cfff71a9 8333#: builtin/remote.c:13
ef317cd5
JX
8334msgid ""
8335"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
8336"mirror=<fetch|push>] <name> <url>"
8337msgstr ""
07432cef
WS
8338"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
8339"mirror=<fetch|push>] <名称> <url>"
ef317cd5 8340
cfff71a9 8341#: builtin/remote.c:14 builtin/remote.c:33
ef317cd5 8342msgid "git remote rename <old> <new>"
07432cef 8343msgstr "git remote rename <旧名称> <新名称>"
ef317cd5 8344
cfff71a9 8345#: builtin/remote.c:15 builtin/remote.c:38
ef317cd5 8346msgid "git remote remove <name>"
07432cef 8347msgstr "git remote remove <名称>"
ef317cd5 8348
cfff71a9 8349#: builtin/remote.c:16
90314792
JX
8350msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
8351msgstr "git remote set-head <名称> (-a | --auto | -d | --delete |<分支>)"
ef317cd5 8352
cfff71a9 8353#: builtin/remote.c:17
ef317cd5 8354msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 8355msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5 8356
cfff71a9 8357#: builtin/remote.c:18
ef317cd5 8358msgid "git remote prune [-n | --dry-run] <name>"
07432cef 8359msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5 8360
cfff71a9 8361#: builtin/remote.c:19
ef317cd5
JX
8362msgid ""
8363"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 8364msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5 8365
cfff71a9 8366#: builtin/remote.c:20
ef317cd5 8367msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 8368msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5 8369
cfff71a9 8370#: builtin/remote.c:21 builtin/remote.c:69
ef317cd5 8371msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 8372msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5 8373
cfff71a9 8374#: builtin/remote.c:22 builtin/remote.c:70
ef317cd5 8375msgid "git remote set-url --add <name> <newurl>"
07432cef 8376msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5 8377
cfff71a9 8378#: builtin/remote.c:23 builtin/remote.c:71
ef317cd5 8379msgid "git remote set-url --delete <name> <url>"
07432cef 8380msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5 8381
cfff71a9 8382#: builtin/remote.c:28
ef317cd5 8383msgid "git remote add [<options>] <name> <url>"
07432cef 8384msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5 8385
cfff71a9 8386#: builtin/remote.c:43
90314792
JX
8387msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8388msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
8389
cfff71a9 8390#: builtin/remote.c:48
ef317cd5 8391msgid "git remote set-branches <name> <branch>..."
07432cef 8392msgstr "git remote set-branches <名称> <分支>..."
ef317cd5 8393
cfff71a9 8394#: builtin/remote.c:49
ef317cd5 8395msgid "git remote set-branches --add <name> <branch>..."
07432cef 8396msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5 8397
cfff71a9 8398#: builtin/remote.c:54
ef317cd5 8399msgid "git remote show [<options>] <name>"
07432cef 8400msgstr "git remote show [<选项>] <名称>"
ef317cd5 8401
cfff71a9 8402#: builtin/remote.c:59
ef317cd5 8403msgid "git remote prune [<options>] <name>"
07432cef 8404msgstr "git remote prune [<选项>] <名称>"
ef317cd5 8405
cfff71a9 8406#: builtin/remote.c:64
ef317cd5 8407msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 8408msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 8409
cfff71a9 8410#: builtin/remote.c:88
81809b99 8411#, c-format
8ada9598 8412msgid "Updating %s"
81809b99 8413msgstr "更新 %s 中"
8ada9598 8414
cfff71a9 8415#: builtin/remote.c:120
8ada9598
JX
8416msgid ""
8417"--mirror is dangerous and deprecated; please\n"
8418"\t use --mirror=fetch or --mirror=push instead"
8419msgstr ""
81809b99
JX
8420"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
8421"\t 或 --mirror=push"
8ada9598 8422
cfff71a9 8423#: builtin/remote.c:137
81809b99 8424#, c-format
8ada9598 8425msgid "unknown mirror argument: %s"
81809b99 8426msgstr "未知的镜像参数:%s"
8ada9598 8427
cfff71a9 8428#: builtin/remote.c:153
ef317cd5 8429msgid "fetch the remote branches"
07432cef 8430msgstr "抓取远程的分支"
ef317cd5 8431
cfff71a9 8432#: builtin/remote.c:155
ef317cd5 8433msgid "import all tags and associated objects when fetching"
07432cef 8434msgstr "抓取时导入所有的 tags 和关联对象"
ef317cd5 8435
cfff71a9 8436#: builtin/remote.c:158
ef317cd5 8437msgid "or do not fetch any tag at all (--no-tags)"
07432cef 8438msgstr "或不抓取任何 tag(--no-tags)"
ef317cd5 8439
cfff71a9 8440#: builtin/remote.c:160
ef317cd5 8441msgid "branch(es) to track"
07432cef 8442msgstr "跟踪的分支"
ef317cd5 8443
cfff71a9 8444#: builtin/remote.c:161
ef317cd5 8445msgid "master branch"
07432cef 8446msgstr "主线分支"
ef317cd5 8447
cfff71a9 8448#: builtin/remote.c:162
ef317cd5 8449msgid "push|fetch"
07432cef 8450msgstr "push|fetch"
ef317cd5 8451
cfff71a9 8452#: builtin/remote.c:163
ef317cd5 8453msgid "set up remote as a mirror to push to or fetch from"
07432cef 8454msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 8455
cfff71a9 8456#: builtin/remote.c:175
8ada9598 8457msgid "specifying a master branch makes no sense with --mirror"
81809b99 8458msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598 8459
cfff71a9 8460#: builtin/remote.c:177
8ada9598 8461msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 8462msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598 8463
220c313c 8464#: builtin/remote.c:185 builtin/remote.c:641
81809b99 8465#, c-format
8ada9598 8466msgid "remote %s already exists."
81809b99 8467msgstr "远程 %s 已经存在。"
8ada9598 8468
220c313c 8469#: builtin/remote.c:189 builtin/remote.c:645
81809b99 8470#, c-format
8ada9598 8471msgid "'%s' is not a valid remote name"
81809b99 8472msgstr "'%s' 不是一个有效的远程名称"
8ada9598 8473
cfff71a9 8474#: builtin/remote.c:233
81809b99 8475#, c-format
8ada9598 8476msgid "Could not setup master '%s'"
81809b99 8477msgstr "无法设置 master '%s'"
8ada9598 8478
6acbf033 8479#: builtin/remote.c:333
81809b99 8480#, c-format
8ada9598 8481msgid "Could not get fetch map for refspec %s"
90314792 8482msgstr "无法得到引用规则 %s 的获取列表"
8ada9598 8483
6acbf033 8484#: builtin/remote.c:434 builtin/remote.c:442
8ada9598 8485msgid "(matching)"
81809b99 8486msgstr "(匹配)"
8ada9598 8487
6acbf033 8488#: builtin/remote.c:446
8ada9598 8489msgid "(delete)"
81809b99 8490msgstr "(删除)"
8ada9598 8491
220c313c 8492#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602
81809b99 8493#, c-format
8ada9598 8494msgid "Could not append '%s' to '%s'"
81809b99 8495msgstr "不能添加 '%s' 至 '%s'"
8ada9598 8496
04cb2f28 8497#: builtin/remote.c:634 builtin/remote.c:793 builtin/remote.c:893
81809b99 8498#, c-format
8ada9598 8499msgid "No such remote: %s"
81809b99 8500msgstr "没有这样的远程:%s"
8ada9598 8501
220c313c 8502#: builtin/remote.c:651
81809b99 8503#, c-format
8ada9598 8504msgid "Could not rename config section '%s' to '%s'"
81809b99 8505msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598 8506
04cb2f28 8507#: builtin/remote.c:657 builtin/remote.c:845
81809b99 8508#, c-format
8ada9598 8509msgid "Could not remove config section '%s'"
81809b99 8510msgstr "不能移除配置小节 '%s'"
8ada9598 8511
220c313c 8512#: builtin/remote.c:672
8ada9598
JX
8513#, c-format
8514msgid ""
d691f479 8515"Not updating non-default fetch refspec\n"
8ada9598
JX
8516"\t%s\n"
8517"\tPlease update the configuration manually if necessary."
8518msgstr ""
90314792 8519"没有更新非默认的获取引用规则\n"
81809b99
JX
8520"\t%s\n"
8521"\t如果必要请手动更新配置。"
8ada9598 8522
220c313c 8523#: builtin/remote.c:678
81809b99 8524#, c-format
8ada9598 8525msgid "Could not append '%s'"
81809b99 8526msgstr "不能追加 '%s'"
8ada9598 8527
220c313c 8528#: builtin/remote.c:689
81809b99 8529#, c-format
8ada9598 8530msgid "Could not set '%s'"
81809b99 8531msgstr "不能设置 '%s'"
8ada9598 8532
220c313c 8533#: builtin/remote.c:711
81809b99 8534#, c-format
8ada9598 8535msgid "deleting '%s' failed"
81809b99 8536msgstr "删除 '%s' 失败"
8ada9598 8537
220c313c 8538#: builtin/remote.c:745
81809b99 8539#, c-format
8ada9598 8540msgid "creating '%s' failed"
81809b99 8541msgstr "创建 '%s' 失败"
8ada9598 8542
04cb2f28 8543#: builtin/remote.c:764
81809b99 8544#, c-format
8ada9598 8545msgid "Could not remove branch %s"
81809b99 8546msgstr "无法移除分支 %s"
8ada9598 8547
04cb2f28 8548#: builtin/remote.c:831
8ada9598
JX
8549msgid ""
8550"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8551"to delete it, use:"
8552msgid_plural ""
8553"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8554"to delete them, use:"
5ae481e0
JX
8555msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8556msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598 8557
04cb2f28 8558#: builtin/remote.c:946
8ada9598
JX
8559#, c-format
8560msgid " new (next fetch will store in remotes/%s)"
81809b99 8561msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598 8562
04cb2f28 8563#: builtin/remote.c:949
8ada9598 8564msgid " tracked"
81809b99 8565msgstr " 已跟踪"
8ada9598 8566
04cb2f28 8567#: builtin/remote.c:951
8ada9598 8568msgid " stale (use 'git remote prune' to remove)"
81809b99 8569msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598 8570
04cb2f28 8571#: builtin/remote.c:953
8ada9598 8572msgid " ???"
81809b99 8573msgstr " ???"
8ada9598 8574
04cb2f28 8575#: builtin/remote.c:994
8ada9598
JX
8576#, c-format
8577msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 8578msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598 8579
04cb2f28 8580#: builtin/remote.c:1001
81809b99 8581#, c-format
8ada9598 8582msgid "rebases onto remote %s"
81809b99 8583msgstr "变基到远程 %s"
8ada9598 8584
04cb2f28 8585#: builtin/remote.c:1004
81809b99 8586#, c-format
8ada9598 8587msgid " merges with remote %s"
81809b99 8588msgstr " 与远程 %s 合并"
8ada9598 8589
04cb2f28 8590#: builtin/remote.c:1005
8ada9598 8591msgid " and with remote"
81809b99 8592msgstr " 且有远程"
8ada9598 8593
04cb2f28 8594#: builtin/remote.c:1007
81809b99 8595#, c-format
8ada9598 8596msgid "merges with remote %s"
81809b99 8597msgstr "与远程 %s 合并"
8ada9598 8598
04cb2f28 8599#: builtin/remote.c:1008
8ada9598 8600msgid " and with remote"
81809b99 8601msgstr " 且有远程"
8ada9598 8602
04cb2f28 8603#: builtin/remote.c:1054
8ada9598 8604msgid "create"
81809b99 8605msgstr "创建"
8ada9598 8606
04cb2f28 8607#: builtin/remote.c:1057
8ada9598 8608msgid "delete"
81809b99 8609msgstr "删除"
8ada9598 8610
04cb2f28 8611#: builtin/remote.c:1061
8ada9598 8612msgid "up to date"
81809b99 8613msgstr "最新"
8ada9598 8614
04cb2f28 8615#: builtin/remote.c:1064
8ada9598 8616msgid "fast-forwardable"
81809b99 8617msgstr "可快进"
8ada9598 8618
04cb2f28 8619#: builtin/remote.c:1067
8ada9598 8620msgid "local out of date"
81809b99 8621msgstr "本地已过时"
8ada9598 8622
04cb2f28 8623#: builtin/remote.c:1074
8ada9598
JX
8624#, c-format
8625msgid " %-*s forces to %-*s (%s)"
81809b99 8626msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598 8627
04cb2f28 8628#: builtin/remote.c:1077
8ada9598
JX
8629#, c-format
8630msgid " %-*s pushes to %-*s (%s)"
81809b99 8631msgstr " %-*s 推送至 %-*s (%s)"
8ada9598 8632
04cb2f28 8633#: builtin/remote.c:1081
8ada9598
JX
8634#, c-format
8635msgid " %-*s forces to %s"
81809b99 8636msgstr " %-*s 强制推送至 %s"
8ada9598 8637
04cb2f28 8638#: builtin/remote.c:1084
8ada9598
JX
8639#, c-format
8640msgid " %-*s pushes to %s"
81809b99 8641msgstr " %-*s 推送至 %s"
8ada9598 8642
04cb2f28 8643#: builtin/remote.c:1152
ef317cd5 8644msgid "do not query remotes"
07432cef 8645msgstr "不查询远程"
ef317cd5 8646
04cb2f28 8647#: builtin/remote.c:1179
81809b99 8648#, c-format
8ada9598 8649msgid "* remote %s"
81809b99 8650msgstr "* 远程 %s"
8ada9598 8651
04cb2f28 8652#: builtin/remote.c:1180
8ada9598
JX
8653#, c-format
8654msgid " Fetch URL: %s"
81809b99 8655msgstr " 获取地址:%s"
8ada9598 8656
04cb2f28 8657#: builtin/remote.c:1181 builtin/remote.c:1332
8ada9598 8658msgid "(no URL)"
81809b99 8659msgstr "(无 URL)"
8ada9598 8660
04cb2f28 8661#: builtin/remote.c:1190 builtin/remote.c:1192
8ada9598
JX
8662#, c-format
8663msgid " Push URL: %s"
81809b99 8664msgstr " 推送地址:%s"
8ada9598 8665
04cb2f28 8666#: builtin/remote.c:1194 builtin/remote.c:1196 builtin/remote.c:1198
81809b99 8667#, c-format
8ada9598 8668msgid " HEAD branch: %s"
81809b99 8669msgstr " HEAD分支:%s"
8ada9598 8670
04cb2f28 8671#: builtin/remote.c:1200
8ada9598
JX
8672#, c-format
8673msgid ""
8674" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 8675msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598 8676
04cb2f28 8677#: builtin/remote.c:1212
81809b99 8678#, c-format
8ada9598
JX
8679msgid " Remote branch:%s"
8680msgid_plural " Remote branches:%s"
81809b99 8681msgstr[0] " 远程分支:%s"
5ae481e0 8682msgstr[1] " 远程分支:%s"
8ada9598 8683
81809b99 8684# 译者:中文字符串拼接,可删除前导空格
04cb2f28 8685#: builtin/remote.c:1215 builtin/remote.c:1242
8ada9598 8686msgid " (status not queried)"
81809b99 8687msgstr "(状态未查询)"
8ada9598 8688
04cb2f28 8689#: builtin/remote.c:1224
8ada9598
JX
8690msgid " Local branch configured for 'git pull':"
8691msgid_plural " Local branches configured for 'git pull':"
81809b99 8692msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 8693msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598 8694
04cb2f28 8695#: builtin/remote.c:1232
8ada9598 8696msgid " Local refs will be mirrored by 'git push'"
81809b99 8697msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598 8698
04cb2f28 8699#: builtin/remote.c:1239
81809b99 8700#, c-format
8ada9598
JX
8701msgid " Local ref configured for 'git push'%s:"
8702msgid_plural " Local refs configured for 'git push'%s:"
81809b99 8703msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 8704msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 8705
04cb2f28 8706#: builtin/remote.c:1260
ef317cd5 8707msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 8708msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5 8709
04cb2f28 8710#: builtin/remote.c:1262
ef317cd5 8711msgid "delete refs/remotes/<name>/HEAD"
07432cef 8712msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 8713
04cb2f28 8714#: builtin/remote.c:1277
8ada9598 8715msgid "Cannot determine remote HEAD"
81809b99 8716msgstr "无法确定远程 HEAD"
8ada9598 8717
04cb2f28 8718#: builtin/remote.c:1279
8ada9598 8719msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 8720msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598 8721
04cb2f28 8722#: builtin/remote.c:1289
81809b99 8723#, c-format
8ada9598 8724msgid "Could not delete %s"
81809b99 8725msgstr "无法删除 %s"
8ada9598 8726
04cb2f28 8727#: builtin/remote.c:1297
81809b99 8728#, c-format
8ada9598 8729msgid "Not a valid ref: %s"
81809b99 8730msgstr "不是一个有效引用:%s"
8ada9598 8731
04cb2f28 8732#: builtin/remote.c:1299
81809b99 8733#, c-format
8ada9598 8734msgid "Could not setup %s"
81809b99 8735msgstr "不能设置 %s"
8ada9598
JX
8736
8737# 译者:注意保持前导空格
04cb2f28 8738#: builtin/remote.c:1317
81809b99 8739#, c-format
8ada9598 8740msgid " %s will become dangling!"
07432cef 8741msgstr " %s 将成为摇摆状态!"
8ada9598
JX
8742
8743# 译者:注意保持前导空格
04cb2f28 8744#: builtin/remote.c:1318
81809b99 8745#, c-format
8ada9598 8746msgid " %s has become dangling!"
07432cef 8747msgstr " %s 已成为摇摆状态!"
8ada9598 8748
04cb2f28 8749#: builtin/remote.c:1328
81809b99 8750#, c-format
8ada9598 8751msgid "Pruning %s"
81809b99 8752msgstr "修剪 %s"
8ada9598 8753
04cb2f28 8754#: builtin/remote.c:1329
8ada9598
JX
8755#, c-format
8756msgid "URL: %s"
81809b99 8757msgstr "URL:%s"
8ada9598 8758
04cb2f28 8759#: builtin/remote.c:1352
8ada9598
JX
8760#, c-format
8761msgid " * [would prune] %s"
81809b99 8762msgstr " * [将删除] %s"
8ada9598 8763
04cb2f28 8764#: builtin/remote.c:1355
8ada9598
JX
8765#, c-format
8766msgid " * [pruned] %s"
81809b99 8767msgstr " * [已删除] %s"
8ada9598 8768
04cb2f28 8769#: builtin/remote.c:1400
ef317cd5 8770msgid "prune remotes after fetching"
07432cef 8771msgstr "抓取后清除远程"
ef317cd5 8772
04cb2f28 8773#: builtin/remote.c:1466 builtin/remote.c:1540
81809b99 8774#, c-format
8ada9598 8775msgid "No such remote '%s'"
81809b99 8776msgstr "没有此远程 '%s'"
8ada9598 8777
04cb2f28 8778#: builtin/remote.c:1486
ef317cd5 8779msgid "add branch"
07432cef 8780msgstr "添加分支"
ef317cd5 8781
04cb2f28 8782#: builtin/remote.c:1493
8ada9598 8783msgid "no remote specified"
81809b99 8784msgstr "未指定远程"
8ada9598 8785
04cb2f28 8786#: builtin/remote.c:1515
ef317cd5 8787msgid "manipulate push URLs"
07432cef 8788msgstr "操作推送 URLS"
ef317cd5 8789
04cb2f28 8790#: builtin/remote.c:1517
ef317cd5 8791msgid "add URL"
07432cef 8792msgstr "添加 URL"
ef317cd5 8793
04cb2f28 8794#: builtin/remote.c:1519
ef317cd5 8795msgid "delete URLs"
07432cef 8796msgstr "删除 URLS"
ef317cd5 8797
04cb2f28 8798#: builtin/remote.c:1526
8ada9598 8799msgid "--add --delete doesn't make sense"
81809b99 8800msgstr "--add --delete 无意义"
8ada9598 8801
04cb2f28 8802#: builtin/remote.c:1566
81809b99 8803#, c-format
8ada9598 8804msgid "Invalid old URL pattern: %s"
81809b99 8805msgstr "无效的旧URL匹配模版:%s"
8ada9598 8806
04cb2f28 8807#: builtin/remote.c:1574
81809b99 8808#, c-format
8ada9598 8809msgid "No such URL found: %s"
81809b99 8810msgstr "未找到此URL:%s"
8ada9598 8811
04cb2f28 8812#: builtin/remote.c:1576
8ada9598 8813msgid "Will not delete all non-push URLs"
81809b99 8814msgstr "将不会删除所有非推送URL地址"
8ada9598 8815
04cb2f28 8816#: builtin/remote.c:1590
ef317cd5 8817msgid "be verbose; must be placed before a subcommand"
07432cef 8818msgstr "冗长输出;必须置于子命令之前"
ef317cd5 8819
6acbf033 8820#: builtin/repack.c:17
90314792
JX
8821msgid "git repack [options]"
8822msgstr "git repack [选项]"
8823
04cb2f28 8824#: builtin/repack.c:159
90314792
JX
8825msgid "pack everything in a single pack"
8826msgstr "所有内容打包到一个包文件中"
8827
04cb2f28 8828#: builtin/repack.c:161
90314792
JX
8829msgid "same as -a, and turn unreachable objects loose"
8830msgstr "和 -a 相同,并将不可达的对象设为松散对象"
8831
04cb2f28 8832#: builtin/repack.c:164
90314792
JX
8833msgid "remove redundant packs, and run git-prune-packed"
8834msgstr "删除多余的包,运行 git-prune-packed"
8835
04cb2f28 8836#: builtin/repack.c:166
90314792
JX
8837msgid "pass --no-reuse-delta to git-pack-objects"
8838msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
8839
04cb2f28 8840#: builtin/repack.c:168
90314792
JX
8841msgid "pass --no-reuse-object to git-pack-objects"
8842msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
8843
04cb2f28 8844#: builtin/repack.c:170
90314792
JX
8845msgid "do not run git-update-server-info"
8846msgstr "不运行 git-update-server-info"
8847
04cb2f28 8848#: builtin/repack.c:173
90314792
JX
8849msgid "pass --local to git-pack-objects"
8850msgstr "向 git-pack-objects 传递参数 --local"
8851
04cb2f28 8852#: builtin/repack.c:175
6c94aba5
JX
8853msgid "write bitmap index"
8854msgstr "写 bitmap 索引"
8855
04cb2f28 8856#: builtin/repack.c:176
90314792
JX
8857msgid "approxidate"
8858msgstr "近似日期"
8859
04cb2f28 8860#: builtin/repack.c:177
90314792
JX
8861msgid "with -A, do not loosen objects older than this"
8862msgstr "使用 -A,不要将早于给定时间的对象过期"
8863
04cb2f28 8864#: builtin/repack.c:179
90314792
JX
8865msgid "size of the window used for delta compression"
8866msgstr "用于增量压缩的窗口值"
8867
04cb2f28 8868#: builtin/repack.c:180 builtin/repack.c:184
8376b58d
JX
8869msgid "bytes"
8870msgstr "字节"
8871
04cb2f28 8872#: builtin/repack.c:181
90314792
JX
8873msgid "same as the above, but limit memory size instead of entries count"
8874msgstr "和上面的相似,但限制内存大小而非条目数"
8875
04cb2f28 8876#: builtin/repack.c:183
90314792
JX
8877msgid "limits the maximum delta depth"
8878msgstr "限制最大增量深度"
8879
04cb2f28 8880#: builtin/repack.c:185
90314792
JX
8881msgid "maximum size of each packfile"
8882msgstr "每个包的最大尺寸"
8883
04cb2f28 8884#: builtin/repack.c:187
6c94aba5
JX
8885msgid "repack objects in packs marked with .keep"
8886msgstr "对标记为 .keep 的包中的对象重新打包"
8887
04cb2f28 8888#: builtin/repack.c:371
90314792
JX
8889#, c-format
8890msgid "removing '%s' failed"
8891msgstr "删除 '%s' 失败"
8892
6acbf033 8893#: builtin/replace.c:19
ef317cd5 8894msgid "git replace [-f] <object> <replacement>"
07432cef 8895msgstr "git replace [-f] <对象> <替换物>"
ef317cd5 8896
6acbf033
JX
8897#: builtin/replace.c:20
8898msgid "git replace [-f] --edit <object>"
8899msgstr "git replace [-f] --edit <对象>"
8900
8901#: builtin/replace.c:21
8902msgid "git replace [-f] --graft <commit> [<parent>...]"
8903msgstr "git replace [-f] --graft <提交> [<父提交>...]"
8904
8905#: builtin/replace.c:22
ef317cd5 8906msgid "git replace -d <object>..."
07432cef 8907msgstr "git replace -d <对象>..."
ef317cd5 8908
6acbf033 8909#: builtin/replace.c:23
cfff71a9
JX
8910msgid "git replace [--format=<format>] [-l [<pattern>]]"
8911msgstr "git replace [--format=<格式>] [-l [<模式>]]"
ef317cd5 8912
220c313c 8913#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
6acbf033
JX
8914#, c-format
8915msgid "Not a valid object name: '%s'"
8916msgstr "不是一个有效的对象名:'%s'"
8917
220c313c 8918#: builtin/replace.c:355
6acbf033
JX
8919#, c-format
8920msgid "bad mergetag in commit '%s'"
8921msgstr "提交 '%s' 中损坏的 mergetag"
8922
220c313c 8923#: builtin/replace.c:357
6acbf033
JX
8924#, c-format
8925msgid "malformed mergetag in commit '%s'"
8926msgstr "提交 '%s' 中非法的 mergetag"
8927
220c313c 8928#: builtin/replace.c:368
6acbf033
JX
8929#, c-format
8930msgid ""
8931"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
8932"instead of --graft"
8933msgstr "原始提交 '%s' 包含已经丢弃的 mergetag '%s',使用 --edit 代替 --graft"
8934
220c313c 8935#: builtin/replace.c:401
6acbf033
JX
8936#, c-format
8937msgid "the original commit '%s' has a gpg signature."
8938msgstr "原始提交 '%s' 中包含一个 GPG 签名"
8939
220c313c 8940#: builtin/replace.c:402
6acbf033
JX
8941msgid "the signature will be removed in the replacement commit!"
8942msgstr "在替换的提交中签名将被移除!"
8943
220c313c 8944#: builtin/replace.c:408
6acbf033
JX
8945#, c-format
8946msgid "could not write replacement commit for: '%s'"
8947msgstr "不能为 '%s' 写替换提交"
8948
220c313c 8949#: builtin/replace.c:432
ef317cd5 8950msgid "list replace refs"
07432cef 8951msgstr "列出替换的引用"
ef317cd5 8952
220c313c 8953#: builtin/replace.c:433
ef317cd5 8954msgid "delete replace refs"
07432cef 8955msgstr "删除替换的引用"
ef317cd5 8956
220c313c 8957#: builtin/replace.c:434
6acbf033
JX
8958msgid "edit existing object"
8959msgstr "编辑现存的对象"
8960
220c313c 8961#: builtin/replace.c:435
6acbf033
JX
8962msgid "change a commit's parents"
8963msgstr "修改一个提交的父提交"
8964
220c313c 8965#: builtin/replace.c:436
ef317cd5 8966msgid "replace the ref if it exists"
07432cef 8967msgstr "如果存在则替换引用"
ef317cd5 8968
220c313c 8969#: builtin/replace.c:437
6acbf033
JX
8970msgid "do not pretty-print contents for --edit"
8971msgstr "不要为 --edit 操作美观显示内容"
8972
220c313c 8973#: builtin/replace.c:438
cfff71a9
JX
8974msgid "use this format"
8975msgstr "使用此格式"
8976
90314792 8977#: builtin/rerere.c:12
ef317cd5 8978msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
07432cef 8979msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
ef317cd5 8980
90314792 8981#: builtin/rerere.c:57
ef317cd5 8982msgid "register clean resolutions in index"
07432cef 8983msgstr "在索引中注册干净的解决方案"
ef317cd5 8984
220c313c 8985#: builtin/reset.c:26
ef317cd5
JX
8986msgid ""
8987"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 8988msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5 8989
220c313c 8990#: builtin/reset.c:27
07432cef
WS
8991msgid "git reset [-q] <tree-ish> [--] <paths>..."
8992msgstr "git reset [-q] <树或提交> [--] <路径>..."
ef317cd5 8993
220c313c 8994#: builtin/reset.c:28
07432cef
WS
8995msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
8996msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 8997
220c313c 8998#: builtin/reset.c:34
c04f5ac3
JX
8999msgid "mixed"
9000msgstr "混杂"
9001
220c313c 9002#: builtin/reset.c:34
c04f5ac3
JX
9003msgid "soft"
9004msgstr "软性"
9005
220c313c 9006#: builtin/reset.c:34
c04f5ac3
JX
9007msgid "hard"
9008msgstr "硬性"
9009
220c313c 9010#: builtin/reset.c:34
8ada9598
JX
9011msgid "merge"
9012msgstr "合并"
9013
220c313c 9014#: builtin/reset.c:34
c04f5ac3
JX
9015msgid "keep"
9016msgstr "保持"
9017
220c313c 9018#: builtin/reset.c:74
c04f5ac3
JX
9019msgid "You do not have a valid HEAD."
9020msgstr "您没有一个有效的 HEAD。"
9021
220c313c 9022#: builtin/reset.c:76
c04f5ac3
JX
9023msgid "Failed to find tree of HEAD."
9024msgstr "无法找到 HEAD 指向的树。"
9025
220c313c 9026#: builtin/reset.c:82
c04f5ac3
JX
9027#, c-format
9028msgid "Failed to find tree of %s."
9029msgstr "无法找到 %s 指向的树。"
9030
220c313c 9031#: builtin/reset.c:100
c04f5ac3
JX
9032#, c-format
9033msgid "HEAD is now at %s"
9034msgstr "HEAD 现在位于 %s"
9035
90e6ef53 9036# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9037#: builtin/reset.c:183
c04f5ac3
JX
9038#, c-format
9039msgid "Cannot do a %s reset in the middle of a merge."
9040msgstr "在合并过程中不能做%s重置操作。"
9041
220c313c 9042#: builtin/reset.c:276
ef317cd5 9043msgid "be quiet, only report errors"
07432cef 9044msgstr "安静模式,只报告错误"
ef317cd5 9045
220c313c 9046#: builtin/reset.c:278
ef317cd5 9047msgid "reset HEAD and index"
07432cef 9048msgstr "重置 HEAD 和索引"
ef317cd5 9049
220c313c 9050#: builtin/reset.c:279
ef317cd5 9051msgid "reset only HEAD"
07432cef 9052msgstr "只重置 HEAD"
ef317cd5 9053
220c313c 9054#: builtin/reset.c:281 builtin/reset.c:283
ef317cd5 9055msgid "reset HEAD, index and working tree"
07432cef 9056msgstr "重置 HEAD、索引和工作区"
ef317cd5 9057
220c313c 9058#: builtin/reset.c:285
ef317cd5 9059msgid "reset HEAD but keep local changes"
07432cef 9060msgstr "重置 HEAD 但保存本地变更"
ef317cd5 9061
220c313c 9062#: builtin/reset.c:288
6c94aba5
JX
9063msgid "record only the fact that removed paths will be added later"
9064msgstr "将删除的路径标记为稍后添加"
9065
220c313c 9066#: builtin/reset.c:305
07432cef
WS
9067#, c-format
9068msgid "Failed to resolve '%s' as a valid revision."
9069msgstr "无法将 '%s' 解析为一个有效的版本。"
9070
220c313c 9071#: builtin/reset.c:308 builtin/reset.c:316
c04f5ac3
JX
9072#, c-format
9073msgid "Could not parse object '%s'."
9074msgstr "不能解析对象 '%s'。"
9075
220c313c 9076#: builtin/reset.c:313
07432cef
WS
9077#, c-format
9078msgid "Failed to resolve '%s' as a valid tree."
9079msgstr "无法将 '%s' 解析为一个有效的树对象。"
9080
220c313c 9081#: builtin/reset.c:322
c04f5ac3 9082msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 9083msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 9084
220c313c 9085#: builtin/reset.c:331
c04f5ac3 9086msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
23ff3338 9087msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
c04f5ac3 9088
90e6ef53 9089# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9090#: builtin/reset.c:333
c04f5ac3
JX
9091#, c-format
9092msgid "Cannot do %s reset with paths."
9093msgstr "不能带路径进行%s重置。"
9094
90e6ef53 9095# 译者:汉字之间无空格,故删除%s前后空格
220c313c 9096#: builtin/reset.c:343
c04f5ac3
JX
9097#, c-format
9098msgid "%s reset is not allowed in a bare repository"
220c313c 9099msgstr "不能对纯版本库进行%s重置"
c04f5ac3 9100
220c313c 9101#: builtin/reset.c:347
6c94aba5
JX
9102msgid "-N can only be used with --mixed"
9103msgstr "-N 只能和 --mixed 同时使用"
9104
220c313c 9105#: builtin/reset.c:364
90314792
JX
9106msgid "Unstaged changes after reset:"
9107msgstr "重置后撤出暂存区的变更:"
9108
220c313c 9109#: builtin/reset.c:370
ef317cd5
JX
9110#, c-format
9111msgid "Could not reset index file to revision '%s'."
9112msgstr "不能重置索引文件至版本 '%s'。"
9113
220c313c 9114#: builtin/reset.c:374
07432cef
WS
9115msgid "Could not write new index file."
9116msgstr "不能写入新的索引文件。"
9117
220c313c 9118#: builtin/rev-parse.c:361
ef317cd5 9119msgid "git rev-parse --parseopt [options] -- [<args>...]"
07432cef 9120msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
ef317cd5 9121
220c313c 9122#: builtin/rev-parse.c:366
ef317cd5 9123msgid "keep the `--` passed as an arg"
07432cef 9124msgstr "保持 `--` 作为一个参数传递"
ef317cd5 9125
220c313c 9126#: builtin/rev-parse.c:368
ef317cd5 9127msgid "stop parsing after the first non-option argument"
07432cef 9128msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 9129
220c313c 9130#: builtin/rev-parse.c:371
cfff71a9
JX
9131msgid "output in stuck long form"
9132msgstr "以固定长格式输出"
9133
220c313c 9134#: builtin/rev-parse.c:499
ef317cd5
JX
9135msgid ""
9136"git rev-parse --parseopt [options] -- [<args>...]\n"
9137" or: git rev-parse --sq-quote [<arg>...]\n"
9138" or: git rev-parse [options] [<arg>...]\n"
9139"\n"
9140"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9141msgstr ""
07432cef 9142"git rev-parse --parseopt [选项] -- [<参数>...]\n"
90314792
JX
9143" 或者:git rev-parse --sq-quote [<参数>...]\n"
9144" 或者:git rev-parse [选项] [<参数>...]\n"
07432cef
WS
9145"\n"
9146"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5
JX
9147
9148#: builtin/revert.c:22
4dcdc3d8
JX
9149msgid "git revert [options] <commit-ish>..."
9150msgstr "git revert [选项] <提交号>..."
ef317cd5
JX
9151
9152#: builtin/revert.c:23
9153msgid "git revert <subcommand>"
07432cef 9154msgstr "git revert <子命令>"
ef317cd5
JX
9155
9156#: builtin/revert.c:28
4dcdc3d8
JX
9157msgid "git cherry-pick [options] <commit-ish>..."
9158msgstr "git cherry-pick [选项] <提交号>..."
ef317cd5
JX
9159
9160#: builtin/revert.c:29
ef317cd5 9161msgid "git cherry-pick <subcommand>"
07432cef 9162msgstr "git cherry-pick <子命令>"
ef317cd5 9163
90314792 9164#: builtin/revert.c:71
ef317cd5
JX
9165#, c-format
9166msgid "%s: %s cannot be used with %s"
9167msgstr "%s:%s 不能和 %s 同时使用"
9168
90314792 9169#: builtin/revert.c:80
ef317cd5 9170msgid "end revert or cherry-pick sequence"
07432cef 9171msgstr "终止反转或拣选操作"
ef317cd5 9172
90314792 9173#: builtin/revert.c:81
ef317cd5 9174msgid "resume revert or cherry-pick sequence"
07432cef 9175msgstr "继续反转或拣选操作"
ef317cd5 9176
90314792 9177#: builtin/revert.c:82
ef317cd5 9178msgid "cancel revert or cherry-pick sequence"
07432cef 9179msgstr "取消反转或拣选操作"
ef317cd5 9180
90314792 9181#: builtin/revert.c:83
ef317cd5 9182msgid "don't automatically commit"
07432cef 9183msgstr "不要自动提交"
ef317cd5 9184
90314792 9185#: builtin/revert.c:84
ef317cd5 9186msgid "edit the commit message"
07432cef 9187msgstr "编辑提交说明"
ef317cd5 9188
90314792 9189#: builtin/revert.c:87
ef317cd5 9190msgid "parent number"
07432cef 9191msgstr "父编号"
ef317cd5 9192
90314792 9193#: builtin/revert.c:89
ef317cd5 9194msgid "merge strategy"
07432cef 9195msgstr "合并策略"
ef317cd5 9196
90314792 9197#: builtin/revert.c:90
ef317cd5 9198msgid "option"
07432cef 9199msgstr "选项"
ef317cd5 9200
90314792 9201#: builtin/revert.c:91
ef317cd5 9202msgid "option for merge strategy"
07432cef 9203msgstr "合并策略的选项"
ef317cd5 9204
6c94aba5 9205#: builtin/revert.c:104
ef317cd5 9206msgid "append commit name"
07432cef 9207msgstr "追加提交名称"
ef317cd5 9208
6c94aba5 9209#: builtin/revert.c:105
ef317cd5 9210msgid "allow fast-forward"
07432cef 9211msgstr "允许快进式"
c04f5ac3 9212
6c94aba5 9213#: builtin/revert.c:106
ef317cd5 9214msgid "preserve initially empty commits"
07432cef 9215msgstr "保留初始化的空提交"
ef317cd5 9216
6c94aba5 9217#: builtin/revert.c:107
ef317cd5 9218msgid "allow commits with empty messages"
07432cef 9219msgstr "允许提交说明为空"
c04f5ac3 9220
6c94aba5 9221#: builtin/revert.c:108
ef317cd5 9222msgid "keep redundant, empty commits"
07432cef 9223msgstr "保持多余的、空的提交"
ef317cd5 9224
6c94aba5 9225#: builtin/revert.c:112
c04f5ac3
JX
9226msgid "program error"
9227msgstr "程序错误"
9228
6c94aba5 9229#: builtin/revert.c:197
c04f5ac3
JX
9230msgid "revert failed"
9231msgstr "还原失败"
9232
6c94aba5 9233#: builtin/revert.c:212
c04f5ac3
JX
9234msgid "cherry-pick failed"
9235msgstr "拣选失败"
9236
90314792 9237#: builtin/rm.c:17
ef317cd5 9238msgid "git rm [options] [--] <file>..."
07432cef
WS
9239msgstr "git rm [选项] [--] <文件>..."
9240
90314792 9241#: builtin/rm.c:65
2e8451e8
JX
9242msgid ""
9243"the following submodule (or one of its nested submodules)\n"
9244"uses a .git directory:"
9245msgid_plural ""
220c313c 9246"the following submodules (or one of their nested submodules)\n"
2e8451e8 9247"use a .git directory:"
220c313c
JX
9248msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
9249msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
2e8451e8 9250
90314792 9251#: builtin/rm.c:71
07432cef 9252msgid ""
2e8451e8 9253"\n"
07432cef
WS
9254"(use 'rm -rf' if you really want to remove it including all of its history)"
9255msgstr ""
2e8451e8 9256"\n"
07432cef 9257"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
ef317cd5 9258
90314792 9259#: builtin/rm.c:231
c04f5ac3 9260msgid ""
2e8451e8
JX
9261"the following file has staged content different from both the\n"
9262"file and the HEAD:"
9263msgid_plural ""
9264"the following files have staged content different from both the\n"
9265"file and the HEAD:"
9266msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9267msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
9268
90314792 9269#: builtin/rm.c:236
2e8451e8
JX
9270msgid ""
9271"\n"
c04f5ac3
JX
9272"(use -f to force removal)"
9273msgstr ""
2e8451e8 9274"\n"
c04f5ac3
JX
9275"(使用 -f 强制删除)"
9276
90314792 9277#: builtin/rm.c:240
2e8451e8
JX
9278msgid "the following file has changes staged in the index:"
9279msgid_plural "the following files have changes staged in the index:"
9280msgstr[0] "如下文件相对索引区的内容有修改"
9281msgstr[1] "如下文件相对索引区的内容有修改"
c04f5ac3 9282
90314792 9283#: builtin/rm.c:244 builtin/rm.c:255
c04f5ac3 9284msgid ""
2e8451e8 9285"\n"
c04f5ac3
JX
9286"(use --cached to keep the file, or -f to force removal)"
9287msgstr ""
2e8451e8
JX
9288"\n"
9289"(使用 --cached 保留本地文件,或用 -f 强制删除)"
9290
90314792 9291#: builtin/rm.c:252
2e8451e8
JX
9292msgid "the following file has local modifications:"
9293msgid_plural "the following files have local modifications:"
9294msgstr[0] "如下文件有本地修改:"
9295msgstr[1] "如下文件有本地修改:"
c04f5ac3 9296
90314792 9297#: builtin/rm.c:270
ef317cd5 9298msgid "do not list removed files"
07432cef 9299msgstr "不列出删除的文件"
ef317cd5 9300
90314792 9301#: builtin/rm.c:271
ef317cd5 9302msgid "only remove from the index"
07432cef 9303msgstr "只从索引区删除"
ef317cd5 9304
90314792 9305#: builtin/rm.c:272
ef317cd5 9306msgid "override the up-to-date check"
07432cef 9307msgstr "忽略文件更新状态检查"
ef317cd5 9308
90314792 9309#: builtin/rm.c:273
ef317cd5 9310msgid "allow recursive removal"
07432cef 9311msgstr "允许递归删除"
ef317cd5 9312
90314792 9313#: builtin/rm.c:275
ef317cd5 9314msgid "exit with a zero status even if nothing matched"
07432cef 9315msgstr "即使没有匹配,也以零状态退出"
ef317cd5 9316
220c313c
JX
9317#: builtin/rm.c:318
9318msgid "Please, stage your changes to .gitmodules or stash them to proceed"
9319msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
9320
90314792 9321#: builtin/rm.c:336
c04f5ac3
JX
9322#, c-format
9323msgid "not removing '%s' recursively without -r"
9324msgstr "未提供 -r 选项不会递归删除 '%s'"
9325
90314792 9326#: builtin/rm.c:375
c04f5ac3
JX
9327#, c-format
9328msgid "git rm: unable to remove %s"
9329msgstr "git rm:不能删除 %s"
9330
ef317cd5 9331#: builtin/shortlog.c:13
4dcdc3d8
JX
9332msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
9333msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
ef317cd5 9334
4dcdc3d8 9335#: builtin/shortlog.c:131
c04f5ac3
JX
9336#, c-format
9337msgid "Missing author: %s"
9338msgstr "缺少作者:%s"
9339
90314792 9340#: builtin/shortlog.c:230
ef317cd5 9341msgid "sort output according to the number of commits per author"
07432cef 9342msgstr "根据每个作者的提交数量排序"
ef317cd5 9343
90314792 9344#: builtin/shortlog.c:232
ef317cd5 9345msgid "Suppress commit descriptions, only provides commit count"
07432cef 9346msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 9347
90314792 9348#: builtin/shortlog.c:234
ef317cd5 9349msgid "Show the email address of each author"
07432cef 9350msgstr "显示每个作者的电子邮件地址"
ef317cd5 9351
90314792 9352#: builtin/shortlog.c:235
ef317cd5 9353msgid "w[,i1[,i2]]"
07432cef 9354msgstr "w[,i1[,i2]]"
ef317cd5 9355
90314792 9356#: builtin/shortlog.c:236
ef317cd5 9357msgid "Linewrap output"
07432cef 9358msgstr "折行输出"
ef317cd5
JX
9359
9360#: builtin/show-branch.c:9
9361msgid ""
9362"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
9363"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
9364"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
9365"<glob>)...]"
9366msgstr ""
07432cef
WS
9367"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
9368"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
9369"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
9370"<glob>)...]"
ef317cd5
JX
9371
9372#: builtin/show-branch.c:10
9373msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
07432cef 9374msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
ef317cd5 9375
cfff71a9 9376#: builtin/show-branch.c:649
ef317cd5 9377msgid "show remote-tracking and local branches"
07432cef 9378msgstr "显示远程跟踪的和本地的分支"
ef317cd5 9379
cfff71a9 9380#: builtin/show-branch.c:651
ef317cd5 9381msgid "show remote-tracking branches"
07432cef 9382msgstr "显示远程跟踪的分支"
ef317cd5 9383
cfff71a9 9384#: builtin/show-branch.c:653
ef317cd5 9385msgid "color '*!+-' corresponding to the branch"
07432cef 9386msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 9387
cfff71a9 9388#: builtin/show-branch.c:655
ef317cd5 9389msgid "show <n> more commits after the common ancestor"
07432cef 9390msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 9391
cfff71a9 9392#: builtin/show-branch.c:657
ef317cd5 9393msgid "synonym to more=-1"
07432cef 9394msgstr "和 more=-1 同义"
ef317cd5 9395
cfff71a9 9396#: builtin/show-branch.c:658
ef317cd5 9397msgid "suppress naming strings"
07432cef 9398msgstr "不显示字符串命名"
ef317cd5 9399
cfff71a9 9400#: builtin/show-branch.c:660
ef317cd5 9401msgid "include the current branch"
07432cef 9402msgstr "包括当前分支"
ef317cd5 9403
cfff71a9 9404#: builtin/show-branch.c:662
ef317cd5 9405msgid "name commits with their object names"
07432cef 9406msgstr "以对象名字命名提交"
ef317cd5 9407
cfff71a9 9408#: builtin/show-branch.c:664
ef317cd5 9409msgid "show possible merge bases"
07432cef 9410msgstr "显示可能合并的基线"
ef317cd5 9411
cfff71a9 9412#: builtin/show-branch.c:666
ef317cd5 9413msgid "show refs unreachable from any other ref"
07432cef 9414msgstr "显示没有任何引用的的引用"
ef317cd5 9415
cfff71a9 9416#: builtin/show-branch.c:668
ef317cd5 9417msgid "show commits in topological order"
07432cef 9418msgstr "以拓扑顺序显示提交"
ef317cd5 9419
cfff71a9 9420#: builtin/show-branch.c:671
ef317cd5 9421msgid "show only commits not on the first branch"
07432cef 9422msgstr "只显示不在第一个分支上的提交"
ef317cd5 9423
cfff71a9 9424#: builtin/show-branch.c:673
ef317cd5 9425msgid "show merges reachable from only one tip"
07432cef 9426msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 9427
cfff71a9 9428#: builtin/show-branch.c:675
2e8451e8
JX
9429msgid "topologically sort, maintaining date order where possible"
9430msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 9431
cfff71a9 9432#: builtin/show-branch.c:678
ef317cd5 9433msgid "<n>[,<base>]"
07432cef 9434msgstr "<n>[,<base>]"
ef317cd5 9435
cfff71a9 9436#: builtin/show-branch.c:679
ef317cd5 9437msgid "show <n> most recent ref-log entries starting at base"
07432cef 9438msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
ef317cd5
JX
9439
9440#: builtin/show-ref.c:10
9441msgid ""
a77c07d9
JX
9442"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9443"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
ef317cd5 9444msgstr ""
a77c07d9
JX
9445"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9446"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
ef317cd5
JX
9447
9448#: builtin/show-ref.c:11
9449msgid "git show-ref --exclude-existing[=pattern] < ref-list"
07432cef 9450msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
ef317cd5 9451
2e8451e8 9452#: builtin/show-ref.c:168
ef317cd5 9453msgid "only show tags (can be combined with heads)"
07432cef 9454msgstr "只显示 tags(可以和头共用)"
ef317cd5 9455
2e8451e8 9456#: builtin/show-ref.c:169
ef317cd5 9457msgid "only show heads (can be combined with tags)"
07432cef 9458msgstr "只显示头(可以和 tags 共用)"
ef317cd5 9459
2e8451e8 9460#: builtin/show-ref.c:170
ef317cd5 9461msgid "stricter reference checking, requires exact ref path"
07432cef 9462msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 9463
90314792 9464#: builtin/show-ref.c:173 builtin/show-ref.c:175
2e8451e8
JX
9465msgid "show the HEAD reference, even if it would be filtered out"
9466msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 9467
90314792 9468#: builtin/show-ref.c:177
ef317cd5 9469msgid "dereference tags into object IDs"
07432cef 9470msgstr "转换 tags 到对象ID"
ef317cd5 9471
90314792 9472#: builtin/show-ref.c:179
ef317cd5 9473msgid "only show SHA1 hash using <n> digits"
07432cef 9474msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
ef317cd5 9475
90314792 9476#: builtin/show-ref.c:183
ef317cd5 9477msgid "do not print results to stdout (useful with --verify)"
07432cef 9478msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
ef317cd5 9479
90314792 9480#: builtin/show-ref.c:185
ef317cd5 9481msgid "show refs from stdin that aren't in local repository"
07432cef 9482msgstr "显示从标准输入中读入的不在本地版本库中的引用"
ef317cd5
JX
9483
9484#: builtin/symbolic-ref.c:7
9485msgid "git symbolic-ref [options] name [ref]"
07432cef
WS
9486msgstr "git symbolic-ref [选项] 名称 [引用]"
9487
9488#: builtin/symbolic-ref.c:8
9489msgid "git symbolic-ref -d [-q] name"
9490msgstr "git symbolic-ref -d [-q] 名称"
ef317cd5 9491
07432cef 9492#: builtin/symbolic-ref.c:40
ef317cd5 9493msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
9494msgstr "不显示非符号(分离的)引用的错误信息"
9495
9496#: builtin/symbolic-ref.c:41
9497msgid "delete symbolic ref"
9498msgstr "删除符号引用"
ef317cd5 9499
07432cef 9500#: builtin/symbolic-ref.c:42
ef317cd5 9501msgid "shorten ref output"
07432cef 9502msgstr "简短的引用输出"
ef317cd5 9503
04cb2f28 9504#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
ef317cd5 9505msgid "reason"
07432cef 9506msgstr "原因"
ef317cd5 9507
04cb2f28 9508#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358
ef317cd5 9509msgid "reason of the update"
07432cef 9510msgstr "更新的原因"
ef317cd5
JX
9511
9512#: builtin/tag.c:22
9513msgid ""
9514"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
a77c07d9 9515msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
ef317cd5
JX
9516
9517#: builtin/tag.c:23
9518msgid "git tag -d <tagname>..."
07432cef 9519msgstr "git tag -d <标签名>..."
ef317cd5
JX
9520
9521#: builtin/tag.c:24
9522msgid ""
9523"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
9524"\t\t[<pattern>...]"
9525msgstr ""
07432cef
WS
9526"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
9527"\t\t[<模式>...]"
ef317cd5
JX
9528
9529#: builtin/tag.c:26
9530msgid "git tag -v <tagname>..."
07432cef 9531msgstr "git tag -v <标签名>..."
ef317cd5 9532
6acbf033 9533#: builtin/tag.c:69
7ac1c0ad
JX
9534#, c-format
9535msgid "malformed object at '%s'"
9536msgstr "非法的对象于 '%s'"
9537
6acbf033 9538#: builtin/tag.c:301
c04f5ac3
JX
9539#, c-format
9540msgid "tag name too long: %.*s..."
9541msgstr "tag 名字太长:%.*s..."
9542
6acbf033 9543#: builtin/tag.c:306
c04f5ac3
JX
9544#, c-format
9545msgid "tag '%s' not found."
9546msgstr "tag '%s' 未发现。"
9547
6acbf033 9548#: builtin/tag.c:321
c04f5ac3
JX
9549#, c-format
9550msgid "Deleted tag '%s' (was %s)\n"
9551msgstr "已删除 tag '%s'(曾为 %s)\n"
9552
6acbf033 9553#: builtin/tag.c:333
c04f5ac3
JX
9554#, c-format
9555msgid "could not verify the tag '%s'"
9556msgstr "不能校验 tag '%s'"
9557
6acbf033 9558#: builtin/tag.c:343
a77c07d9 9559#, c-format
c04f5ac3
JX
9560msgid ""
9561"\n"
6acbf033
JX
9562"Write a message for tag:\n"
9563" %s\n"
a77c07d9 9564"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
9565msgstr ""
9566"\n"
6acbf033
JX
9567"输入一个 tag 说明:\n"
9568" %s\n"
a77c07d9 9569"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 9570
6acbf033 9571#: builtin/tag.c:347
a77c07d9 9572#, c-format
c04f5ac3
JX
9573msgid ""
9574"\n"
6acbf033
JX
9575"Write a message for tag:\n"
9576" %s\n"
a77c07d9 9577"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 9578"want to.\n"
c04f5ac3
JX
9579msgstr ""
9580"\n"
6acbf033
JX
9581"输入一个 tag 说明:\n"
9582" %s\n"
a77c07d9 9583"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 9584
6acbf033
JX
9585#: builtin/tag.c:371
9586#, c-format
9587msgid "unsupported sort specification '%s'"
9588msgstr "不支持的排序规格 '%s'"
9589
9590#: builtin/tag.c:373
9591#, c-format
9592msgid "unsupported sort specification '%s' in variable '%s'"
9593msgstr "不支持变量 '%2$s' 的排序规格 '%1$s'"
9594
9595#: builtin/tag.c:428
c04f5ac3
JX
9596msgid "unable to sign the tag"
9597msgstr "无法签署 tag"
9598
6acbf033 9599#: builtin/tag.c:430
c04f5ac3
JX
9600msgid "unable to write tag file"
9601msgstr "无法写 tag 文件"
9602
6acbf033 9603#: builtin/tag.c:455
c04f5ac3 9604msgid "bad object type."
90e6ef53 9605msgstr "坏的对象类型。"
c04f5ac3 9606
6acbf033 9607#: builtin/tag.c:468
c04f5ac3 9608msgid "tag header too big."
90e6ef53 9609msgstr "tag 头信息太大。"
c04f5ac3 9610
6acbf033 9611#: builtin/tag.c:504
c04f5ac3
JX
9612msgid "no tag message?"
9613msgstr "无 tag 说明?"
9614
6acbf033 9615#: builtin/tag.c:510
c04f5ac3
JX
9616#, c-format
9617msgid "The tag message has been left in %s\n"
9618msgstr "tag 说明被保留在 %s\n"
9619
6acbf033 9620#: builtin/tag.c:559
7ac1c0ad
JX
9621msgid "switch 'points-at' requires an object"
9622msgstr "开关 'points-at' 需要一个对象"
9623
6acbf033 9624#: builtin/tag.c:561
7ac1c0ad
JX
9625#, c-format
9626msgid "malformed object name '%s'"
9627msgstr "非法的对象名 '%s'"
9628
220c313c 9629#: builtin/tag.c:589
ef317cd5 9630msgid "list tag names"
07432cef 9631msgstr "列出tag名称"
ef317cd5 9632
220c313c 9633#: builtin/tag.c:591
ef317cd5 9634msgid "print <n> lines of each tag message"
07432cef 9635msgstr "每个 tag 信息打印 <n> 行"
ef317cd5 9636
220c313c 9637#: builtin/tag.c:593
ef317cd5 9638msgid "delete tags"
07432cef 9639msgstr "删除 tags"
ef317cd5 9640
220c313c 9641#: builtin/tag.c:594
ef317cd5 9642msgid "verify tags"
07432cef 9643msgstr "验证 tags"
ef317cd5 9644
220c313c 9645#: builtin/tag.c:596
ef317cd5 9646msgid "Tag creation options"
07432cef 9647msgstr "Tag 创建选项"
ef317cd5 9648
220c313c 9649#: builtin/tag.c:598
ef317cd5 9650msgid "annotated tag, needs a message"
07432cef 9651msgstr "注解 tag,需要一个说明"
ef317cd5 9652
220c313c 9653#: builtin/tag.c:600
ef317cd5 9654msgid "tag message"
07432cef 9655msgstr "tag 说明"
ef317cd5 9656
220c313c 9657#: builtin/tag.c:602
ef317cd5 9658msgid "annotated and GPG-signed tag"
07432cef 9659msgstr "注解并 GPG 签名的 tag"
ef317cd5 9660
220c313c 9661#: builtin/tag.c:606
ef317cd5 9662msgid "use another key to sign the tag"
07432cef 9663msgstr "使用另外的私钥签名 tag"
ef317cd5 9664
220c313c 9665#: builtin/tag.c:607
ef317cd5 9666msgid "replace the tag if exists"
07432cef 9667msgstr "如果存在,替换现有的 tag"
ef317cd5 9668
220c313c 9669#: builtin/tag.c:608
ef317cd5 9670msgid "show tag list in columns"
07432cef 9671msgstr "以列的方式显示 tag"
ef317cd5 9672
220c313c 9673#: builtin/tag.c:610
6c94aba5
JX
9674msgid "sort tags"
9675msgstr "排序 tags"
9676
220c313c 9677#: builtin/tag.c:614
ef317cd5 9678msgid "Tag listing options"
07432cef 9679msgstr "Tag 列表选项"
ef317cd5 9680
220c313c 9681#: builtin/tag.c:617 builtin/tag.c:623
ef317cd5 9682msgid "print only tags that contain the commit"
07432cef 9683msgstr "只打印包含提交的tags"
ef317cd5 9684
220c313c 9685#: builtin/tag.c:629
ef317cd5 9686msgid "print only tags of the object"
07432cef 9687msgstr "只打印tags对象"
ef317cd5 9688
220c313c 9689#: builtin/tag.c:655
8ada9598 9690msgid "--column and -n are incompatible"
81809b99 9691msgstr "--column 和 -n 不兼容"
8ada9598 9692
220c313c 9693#: builtin/tag.c:667
6c94aba5
JX
9694msgid "--sort and -n are incompatible"
9695msgstr "--sort 和 -n 不兼容"
9696
220c313c 9697#: builtin/tag.c:674
c04f5ac3 9698msgid "-n option is only allowed with -l."
649900bc 9699msgstr "-n 选项只允许和 -l 同时使用。"
c04f5ac3 9700
220c313c 9701#: builtin/tag.c:676
c04f5ac3 9702msgid "--contains option is only allowed with -l."
649900bc 9703msgstr "--contains 选项只允许和 -l 同时使用。"
c04f5ac3 9704
220c313c 9705#: builtin/tag.c:678
7ac1c0ad 9706msgid "--points-at option is only allowed with -l."
649900bc 9707msgstr "--points-at 选项只允许和 -l 同时使用。"
7ac1c0ad 9708
220c313c 9709#: builtin/tag.c:686
c04f5ac3
JX
9710msgid "only one -F or -m option is allowed."
9711msgstr "只允许一个 -F 或 -m 选项。"
9712
220c313c 9713#: builtin/tag.c:706
c04f5ac3
JX
9714msgid "too many params"
9715msgstr "太多参数"
9716
220c313c 9717#: builtin/tag.c:712
c04f5ac3
JX
9718#, c-format
9719msgid "'%s' is not a valid tag name."
90e6ef53 9720msgstr "'%s' 不是一个有效的tag名称。"
c04f5ac3 9721
220c313c 9722#: builtin/tag.c:717
c04f5ac3
JX
9723#, c-format
9724msgid "tag '%s' already exists"
9725msgstr "tag '%s' 已存在"
9726
220c313c 9727#: builtin/tag.c:741
c04f5ac3
JX
9728#, c-format
9729msgid "Updated tag '%s' (was %s)\n"
9730msgstr "已更新tag '%s'(曾为 %s)\n"
9731
220c313c 9732#: builtin/unpack-objects.c:489
6c94aba5
JX
9733msgid "Unpacking objects"
9734msgstr "展开对象中"
9735
220c313c 9736#: builtin/update-index.c:403
ef317cd5 9737msgid "git update-index [options] [--] [<file>...]"
07432cef 9738msgstr "git update-index [选项] [--] [<文件>...]"
8ada9598 9739
220c313c 9740#: builtin/update-index.c:756
ef317cd5 9741msgid "continue refresh even when index needs update"
07432cef 9742msgstr "当索引需要更新时继续刷新"
8ada9598 9743
220c313c 9744#: builtin/update-index.c:759
ef317cd5 9745msgid "refresh: ignore submodules"
07432cef 9746msgstr "刷新:忽略子模组"
8ada9598 9747
220c313c 9748#: builtin/update-index.c:762
ef317cd5 9749msgid "do not ignore new files"
07432cef 9750msgstr "不忽略新的文件"
8ada9598 9751
220c313c 9752#: builtin/update-index.c:764
ef317cd5 9753msgid "let files replace directories and vice-versa"
07432cef 9754msgstr "让文件替换目录(反之亦然)"
ef317cd5 9755
220c313c 9756#: builtin/update-index.c:766
ef317cd5 9757msgid "notice files missing from worktree"
07432cef 9758msgstr "通知文件从工作区丢失"
ef317cd5 9759
220c313c 9760#: builtin/update-index.c:768
ef317cd5 9761msgid "refresh even if index contains unmerged entries"
07432cef 9762msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 9763
220c313c 9764#: builtin/update-index.c:771
ef317cd5 9765msgid "refresh stat information"
07432cef 9766msgstr "刷新统计信息"
ef317cd5 9767
220c313c 9768#: builtin/update-index.c:775
ef317cd5 9769msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 9770msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 9771
220c313c 9772#: builtin/update-index.c:779
6c94aba5
JX
9773msgid "<mode>,<object>,<path>"
9774msgstr "<mode>,<object>,<path>"
ef317cd5 9775
220c313c 9776#: builtin/update-index.c:780
ef317cd5 9777msgid "add the specified entry to the index"
07432cef 9778msgstr "添加指定的条目到索引区"
ef317cd5 9779
220c313c 9780#: builtin/update-index.c:784
ef317cd5 9781msgid "(+/-)x"
07432cef 9782msgstr "(+/-)x"
ef317cd5 9783
220c313c 9784#: builtin/update-index.c:785
ef317cd5 9785msgid "override the executable bit of the listed files"
07432cef 9786msgstr "覆盖列表里文件的可执行位"
ef317cd5 9787
220c313c 9788#: builtin/update-index.c:789
ef317cd5 9789msgid "mark files as \"not changing\""
07432cef 9790msgstr "把文件标记为 \"没有变更\""
ef317cd5 9791
220c313c 9792#: builtin/update-index.c:792
ef317cd5 9793msgid "clear assumed-unchanged bit"
07432cef 9794msgstr "清除 assumed-unchanged 位"
ef317cd5 9795
220c313c 9796#: builtin/update-index.c:795
ef317cd5 9797msgid "mark files as \"index-only\""
07432cef 9798msgstr "把文件标记为 \"仅索引\""
ef317cd5 9799
220c313c 9800#: builtin/update-index.c:798
ef317cd5 9801msgid "clear skip-worktree bit"
07432cef 9802msgstr "清除 skip-worktree 位"
ef317cd5 9803
220c313c 9804#: builtin/update-index.c:801
ef317cd5 9805msgid "add to index only; do not add content to object database"
07432cef 9806msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 9807
220c313c 9808#: builtin/update-index.c:803
ef317cd5 9809msgid "remove named paths even if present in worktree"
07432cef 9810msgstr "即使存在工作区里,也删除路径"
ef317cd5 9811
220c313c 9812#: builtin/update-index.c:805
ef317cd5 9813msgid "with --stdin: input lines are terminated by null bytes"
07432cef 9814msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 9815
220c313c 9816#: builtin/update-index.c:807
ef317cd5 9817msgid "read list of paths to be updated from standard input"
07432cef 9818msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 9819
220c313c 9820#: builtin/update-index.c:811
ef317cd5 9821msgid "add entries from standard input to the index"
07432cef 9822msgstr "从标准输入添加条目到索引区"
ef317cd5 9823
220c313c 9824#: builtin/update-index.c:815
ef317cd5 9825msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 9826msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 9827
220c313c 9828#: builtin/update-index.c:819
ef317cd5 9829msgid "only update entries that differ from HEAD"
07432cef 9830msgstr "只更新与 HEAD 不同的条目"
ef317cd5 9831
220c313c 9832#: builtin/update-index.c:823
ef317cd5 9833msgid "ignore files missing from worktree"
07432cef 9834msgstr "忽略工作区丢失的文件"
ef317cd5 9835
220c313c 9836#: builtin/update-index.c:826
ef317cd5 9837msgid "report actions to standard output"
07432cef 9838msgstr "在标准输出显示操作"
ef317cd5 9839
220c313c 9840#: builtin/update-index.c:828
ef317cd5 9841msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 9842msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 9843
220c313c 9844#: builtin/update-index.c:832
ef317cd5 9845msgid "write index in this format"
07432cef 9846msgstr "以这种格式写入索引区"
ef317cd5 9847
220c313c 9848#: builtin/update-index.c:834
6acbf033
JX
9849msgid "enable or disable split index"
9850msgstr "启用或禁用索引拆分"
9851
90314792 9852#: builtin/update-ref.c:9
ef317cd5 9853msgid "git update-ref [options] -d <refname> [<oldval>]"
90314792 9854msgstr "git update-ref [选项] -d <引用名> [<旧值>]"
ef317cd5 9855
90314792 9856#: builtin/update-ref.c:10
ef317cd5 9857msgid "git update-ref [options] <refname> <newval> [<oldval>]"
90314792
JX
9858msgstr "git update-ref [选项] <引用名> <新值> [<旧值>]"
9859
9860#: builtin/update-ref.c:11
9861msgid "git update-ref [options] --stdin [-z]"
9862msgstr "git update-ref [选项] --stdin [-z]"
ef317cd5 9863
04cb2f28 9864#: builtin/update-ref.c:359
ef317cd5 9865msgid "delete the reference"
07432cef 9866msgstr "删除引用"
ef317cd5 9867
04cb2f28 9868#: builtin/update-ref.c:361
ef317cd5 9869msgid "update <refname> not the one it points to"
07432cef 9870msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5 9871
04cb2f28 9872#: builtin/update-ref.c:362
90314792
JX
9873msgid "stdin has NUL-terminated arguments"
9874msgstr "标准输入有以 NUL 字符终止的参数"
9875
04cb2f28 9876#: builtin/update-ref.c:363
90314792
JX
9877msgid "read updates from stdin"
9878msgstr "从标准输入读取更新"
9879
ef317cd5
JX
9880#: builtin/update-server-info.c:6
9881msgid "git update-server-info [--force]"
07432cef 9882msgstr "git update-server-info [--force]"
ef317cd5
JX
9883
9884#: builtin/update-server-info.c:14
9885msgid "update the info files from scratch"
07432cef 9886msgstr "从头开始更新文件信息"
ef317cd5 9887
6acbf033
JX
9888#: builtin/verify-commit.c:17
9889msgid "git verify-commit [-v|--verbose] <commit>..."
9890msgstr "git verify-commit [-v|--verbose] <提交>..."
9891
9892#: builtin/verify-commit.c:75
9893msgid "print commit contents"
9894msgstr "打印提交内容"
9895
220c313c 9896#: builtin/verify-pack.c:54
ef317cd5 9897msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
07432cef 9898msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
ef317cd5 9899
220c313c 9900#: builtin/verify-pack.c:64
ef317cd5
JX
9901msgid "verbose"
9902msgstr "冗长输出"
9903
220c313c 9904#: builtin/verify-pack.c:66
ef317cd5 9905msgid "show statistics only"
07432cef 9906msgstr "只显示统计"
ef317cd5
JX
9907
9908#: builtin/verify-tag.c:17
9909msgid "git verify-tag [-v|--verbose] <tag>..."
07432cef 9910msgstr "git verify-tag [-v|--verbose] <tag>..."
ef317cd5
JX
9911
9912#: builtin/verify-tag.c:73
9913msgid "print tag contents"
07432cef 9914msgstr "打印 tag 内容"
ef317cd5
JX
9915
9916#: builtin/write-tree.c:13
9917msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 9918msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5
JX
9919
9920#: builtin/write-tree.c:26
9921msgid "<prefix>/"
07432cef 9922msgstr "<前缀>/"
ef317cd5
JX
9923
9924#: builtin/write-tree.c:27
9925msgid "write tree object for a subdirectory <prefix>"
07432cef 9926msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5
JX
9927
9928#: builtin/write-tree.c:30
9929msgid "only useful for debugging"
07432cef 9930msgstr "只对调试有用"
ef317cd5 9931
220c313c
JX
9932#: credential-cache--daemon.c:267
9933msgid "print debugging messages to stderr"
9934msgstr "调试信息输出到标准错误"
9935
2e8451e8 9936#: git.c:17
4dcdc3d8 9937msgid ""
220c313c 9938"'git help -a' and 'git help -g' list available subcommands and some\n"
4dcdc3d8
JX
9939"concept guides. See 'git help <command>' or 'git help <concept>'\n"
9940"to read about a specific subcommand or concept."
9941msgstr ""
220c313c
JX
9942"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
9943"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
9944"帮助。"
8ada9598
JX
9945
9946#: common-cmds.h:8
9947msgid "Add file contents to the index"
81809b99 9948msgstr "添加文件内容至索引"
8ada9598
JX
9949
9950#: common-cmds.h:9
9951msgid "Find by binary search the change that introduced a bug"
81809b99 9952msgstr "通过二分查找定位引入 bug 的变更"
8ada9598
JX
9953
9954#: common-cmds.h:10
8ada9598 9955msgid "List, create, or delete branches"
81809b99 9956msgstr "列出、创建或删除分支"
8ada9598
JX
9957
9958#: common-cmds.h:11
9959msgid "Checkout a branch or paths to the working tree"
81809b99 9960msgstr "检出一个分支或路径到工作区"
8ada9598
JX
9961
9962#: common-cmds.h:12
8ada9598 9963msgid "Clone a repository into a new directory"
81809b99 9964msgstr "克隆一个版本库到一个新目录"
8ada9598
JX
9965
9966#: common-cmds.h:13
8ada9598 9967msgid "Record changes to the repository"
81809b99 9968msgstr "记录变更到版本库"
8ada9598
JX
9969
9970#: common-cmds.h:14
9971msgid "Show changes between commits, commit and working tree, etc"
81809b99 9972msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598
JX
9973
9974#: common-cmds.h:15
9975msgid "Download objects and refs from another repository"
81809b99 9976msgstr "从另外一个版本库下载对象和引用"
8ada9598
JX
9977
9978#: common-cmds.h:16
9979msgid "Print lines matching a pattern"
81809b99 9980msgstr "输出和模式匹配的行"
8ada9598
JX
9981
9982#: common-cmds.h:17
a77c07d9
JX
9983msgid "Create an empty Git repository or reinitialize an existing one"
9984msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
8ada9598
JX
9985
9986#: common-cmds.h:18
8ada9598 9987msgid "Show commit logs"
81809b99 9988msgstr "显示提交日志"
8ada9598
JX
9989
9990#: common-cmds.h:19
9991msgid "Join two or more development histories together"
81809b99 9992msgstr "合并两个或更多开发历史"
8ada9598
JX
9993
9994#: common-cmds.h:20
9995msgid "Move or rename a file, a directory, or a symlink"
81809b99 9996msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598
JX
9997
9998#: common-cmds.h:21
2e8451e8
JX
9999msgid "Fetch from and integrate with another repository or a local branch"
10000msgstr "获取并整合另外的版本库或一个本地分支"
8ada9598
JX
10001
10002#: common-cmds.h:22
10003msgid "Update remote refs along with associated objects"
81809b99 10004msgstr "更新远程引用和相关的对象"
8ada9598
JX
10005
10006#: common-cmds.h:23
10007msgid "Forward-port local commits to the updated upstream head"
81809b99 10008msgstr "本地提交转移至更新后的上游分支中"
8ada9598
JX
10009
10010#: common-cmds.h:24
10011msgid "Reset current HEAD to the specified state"
81809b99 10012msgstr "重置当前HEAD到指定状态"
8ada9598
JX
10013
10014#: common-cmds.h:25
10015msgid "Remove files from the working tree and from the index"
81809b99 10016msgstr "从工作区和索引中删除文件"
8ada9598
JX
10017
10018#: common-cmds.h:26
10019msgid "Show various types of objects"
81809b99 10020msgstr "显示各种类型的对象"
8ada9598
JX
10021
10022#: common-cmds.h:27
8ada9598 10023msgid "Show the working tree status"
81809b99 10024msgstr "显示工作区状态"
8ada9598
JX
10025
10026#: common-cmds.h:28
10027msgid "Create, list, delete or verify a tag object signed with GPG"
81809b99 10028msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
8ada9598 10029
220c313c
JX
10030#: parse-options.h:143
10031msgid "expiry-date"
10032msgstr "到期时间"
10033
10034#: parse-options.h:158
10035msgid "no-op (backward compatibility)"
10036msgstr "空操作(向后兼容)"
10037
10038#: parse-options.h:232
10039msgid "be more verbose"
10040msgstr "更加详细"
10041
10042#: parse-options.h:234
10043msgid "be more quiet"
10044msgstr "更加安静"
10045
10046#: parse-options.h:240
10047msgid "use <n> digits to display SHA-1s"
10048msgstr "用 <n> 位数字显示 SHA-1 哈希值"
10049
10050#: rerere.h:27
10051msgid "update the index with reused conflict resolution if possible"
10052msgstr "如果可能,重用冲突解决更新索引"
10053
04cb2f28 10054#: git-am.sh:53
c04f5ac3
JX
10055msgid "You need to set your committer info first"
10056msgstr "您需要先设置你的提交者信息"
10057
04cb2f28 10058#: git-am.sh:98
b694fbb1
JX
10059msgid ""
10060"You seem to have moved HEAD since the last 'am' failure.\n"
10061"Not rewinding to ORIG_HEAD"
6792b93b 10062msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
b694fbb1 10063
04cb2f28 10064#: git-am.sh:108
b694fbb1
JX
10065#, sh-format
10066msgid ""
2e8451e8 10067"When you have resolved this problem, run \"$cmdline --continue\".\n"
649900bc
JX
10068"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
10069"To restore the original branch and stop patching, run \"$cmdline --abort\"."
b694fbb1 10070msgstr ""
2e8451e8 10071"当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
b694fbb1
JX
10072"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
10073"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10074
04cb2f28 10075#: git-am.sh:124
b694fbb1
JX
10076msgid "Cannot fall back to three-way merge."
10077msgstr "无法求助于三路合并。"
10078
04cb2f28 10079#: git-am.sh:140
c04f5ac3 10080msgid "Repository lacks necessary blobs to fall back on 3-way merge."
07432cef 10081msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
649900bc 10082
04cb2f28 10083#: git-am.sh:142
649900bc 10084msgid "Using index info to reconstruct a base tree..."
63af42fe 10085msgstr "使用索引来重建一个(三路合并的)基础目录树..."
c04f5ac3 10086
04cb2f28 10087#: git-am.sh:157
c04f5ac3
JX
10088msgid ""
10089"Did you hand edit your patch?\n"
10090"It does not apply to blobs recorded in its index."
10091msgstr ""
10092"您是否曾手动编辑过您的补丁?\n"
07432cef 10093"无法应用补丁到索引中的数据(blob)对象上。"
c04f5ac3 10094
04cb2f28 10095#: git-am.sh:166
c04f5ac3 10096msgid "Falling back to patching base and 3-way merge..."
b694fbb1 10097msgstr "转而在基础版本上打补丁及进行三路合并..."
c04f5ac3 10098
04cb2f28 10099#: git-am.sh:182
649900bc
JX
10100msgid "Failed to merge in the changes."
10101msgstr "无法合并变更。"
10102
04cb2f28 10103#: git-am.sh:277
c04f5ac3
JX
10104msgid "Only one StGIT patch series can be applied at once"
10105msgstr "一次只能有一个 StGIT 补丁队列被应用"
10106
04cb2f28 10107#: git-am.sh:364
c04f5ac3
JX
10108#, sh-format
10109msgid "Patch format $patch_format is not supported."
10110msgstr "不支持 $patch_format 补丁格式。"
10111
04cb2f28 10112#: git-am.sh:366
c04f5ac3
JX
10113msgid "Patch format detection failed."
10114msgstr "补丁格式检测失败。"
10115
04cb2f28 10116#: git-am.sh:398
649900bc
JX
10117msgid ""
10118"The -b/--binary option has been a no-op for long time, and\n"
10119"it will be removed. Please do not use it anymore."
10120msgstr ""
10121"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
10122"请不要再使用它了。"
c04f5ac3 10123
04cb2f28 10124#: git-am.sh:496
c04f5ac3
JX
10125#, sh-format
10126msgid "previous rebase directory $dotest still exists but mbox given."
2e8451e8 10127msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
c04f5ac3 10128
04cb2f28 10129#: git-am.sh:501
c04f5ac3
JX
10130msgid "Please make up your mind. --skip or --abort?"
10131msgstr "请下决心。--skip 或是 --abort ?"
10132
04cb2f28 10133#: git-am.sh:537
2e8451e8
JX
10134#, sh-format
10135msgid ""
10136"Stray $dotest directory found.\n"
10137"Use \"git am --abort\" to remove it."
10138msgstr ""
10139"发现了错误的 $dotest 目录。\n"
10140"使用 \"git am --abort\" 删除它。"
10141
04cb2f28 10142#: git-am.sh:545
c04f5ac3
JX
10143msgid "Resolve operation not in progress, we are not resuming."
10144msgstr "解决操作未进行,我们不会继续。"
10145
04cb2f28 10146#: git-am.sh:612
c04f5ac3
JX
10147#, sh-format
10148msgid "Dirty index: cannot apply patches (dirty: $files)"
90e6ef53 10149msgstr "脏的索引:不能应用补丁(脏文件:$files)"
c04f5ac3 10150
04cb2f28 10151#: git-am.sh:722
b694fbb1
JX
10152#, sh-format
10153msgid ""
10154"Patch is empty. Was it split wrong?\n"
10155"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
10156"To restore the original branch and stop patching run \"$cmdline --abort\"."
10157msgstr ""
10158"补丁为空。是不是切分错误?\n"
10159"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
10160"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
10161
04cb2f28 10162#: git-am.sh:749
b694fbb1
JX
10163msgid "Patch does not have a valid e-mail address."
10164msgstr "补丁中没有一个有效的邮件地址。"
10165
04cb2f28 10166#: git-am.sh:796
c04f5ac3 10167msgid "cannot be interactive without stdin connected to a terminal."
90e6ef53 10168msgstr "标准输入没有和终端关联,不能进行交互式操作。"
c04f5ac3 10169
04cb2f28 10170#: git-am.sh:800
b694fbb1
JX
10171msgid "Commit Body is:"
10172msgstr "提交内容为:"
10173
90e6ef53 10174# 译者:注意保持句尾空格
c04f5ac3
JX
10175#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
10176#. in your translation. The program will only accept English
10177#. input at this point.
04cb2f28 10178#: git-am.sh:807
c04f5ac3
JX
10179msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10180msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
10181
04cb2f28 10182#: git-am.sh:843
c04f5ac3
JX
10183#, sh-format
10184msgid "Applying: $FIRSTLINE"
10185msgstr "正应用:$FIRSTLINE"
10186
04cb2f28 10187#: git-am.sh:864
b694fbb1
JX
10188msgid ""
10189"No changes - did you forget to use 'git add'?\n"
10190"If there is nothing left to stage, chances are that something else\n"
10191"already introduced the same changes; you might want to skip this patch."
10192msgstr ""
10193"没有变更 —— 您是不是忘了执行 'git add'?\n"
10194"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
10195"您也许想要跳过这个补丁。"
10196
04cb2f28 10197#: git-am.sh:872
b694fbb1
JX
10198msgid ""
10199"You still have unmerged paths in your index\n"
10200"did you forget to use 'git add'?"
6792b93b 10201msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
b694fbb1 10202
04cb2f28 10203#: git-am.sh:888
c04f5ac3 10204msgid "No changes -- Patch already applied."
63af42fe 10205msgstr "没有变更 —— 补丁已经应用过。"
c04f5ac3 10206
04cb2f28 10207#: git-am.sh:898
b694fbb1
JX
10208#, sh-format
10209msgid "Patch failed at $msgnum $FIRSTLINE"
10210msgstr "补丁失败于 $msgnum $FIRSTLINE"
10211
04cb2f28 10212#: git-am.sh:901
ef317cd5
JX
10213#, sh-format
10214msgid ""
10215"The copy of the patch that failed is found in:\n"
10216" $dotest/patch"
10217msgstr ""
07432cef
WS
10218"失败的补丁文件副本位于:\n"
10219" $dotest/patch"
ef317cd5 10220
04cb2f28 10221#: git-am.sh:919
c04f5ac3
JX
10222msgid "applying to an empty history"
10223msgstr "正应用到一个空历史上"
10224
b694fbb1
JX
10225#: git-bisect.sh:48
10226msgid "You need to start by \"git bisect start\""
10227msgstr "您需要执行 \"git bisect start\" 来开始"
10228
90e6ef53 10229# 译者:注意保持句尾空格
c04f5ac3
JX
10230#. TRANSLATORS: Make sure to include [Y] and [n] in your
10231#. translation. The program will only accept English input
10232#. at this point.
10233#: git-bisect.sh:54
10234msgid "Do you want me to do it for you [Y/n]? "
10235msgstr "您想让我为您这样做么[Y/n]? "
10236
10237#: git-bisect.sh:95
10238#, sh-format
10239msgid "unrecognised option: '$arg'"
81809b99 10240msgstr "未能识别的选项:'$arg'"
c04f5ac3
JX
10241
10242#: git-bisect.sh:99
10243#, sh-format
10244msgid "'$arg' does not appear to be a valid revision"
10245msgstr "'$arg' 看起来不像是一个有效的版本"
10246
10247#: git-bisect.sh:117
10248msgid "Bad HEAD - I need a HEAD"
10249msgstr "坏的 HEAD - 我需要一个 HEAD"
10250
10251#: git-bisect.sh:130
10252#, sh-format
10253msgid ""
10254"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
10255msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
10256
10257#: git-bisect.sh:140
cfff71a9
JX
10258msgid "won't bisect on cg-seek'ed tree"
10259msgstr "不会在做了 cg-seek 的树上做二分查找"
c04f5ac3
JX
10260
10261#: git-bisect.sh:144
10262msgid "Bad HEAD - strange symbolic ref"
90e6ef53 10263msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3
JX
10264
10265#: git-bisect.sh:189
10266#, sh-format
10267msgid "Bad bisect_write argument: $state"
90e6ef53 10268msgstr "坏的 bisect_write 参数:$state"
c04f5ac3
JX
10269
10270#: git-bisect.sh:218
10271#, sh-format
10272msgid "Bad rev input: $arg"
90e6ef53 10273msgstr "输入坏的版本:$arg"
c04f5ac3
JX
10274
10275#: git-bisect.sh:232
10276msgid "Please call 'bisect_state' with at least one argument."
10277msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
10278
10279#: git-bisect.sh:244
10280#, sh-format
10281msgid "Bad rev input: $rev"
10282msgstr "输入坏的版本:$rev"
10283
04cb2f28 10284#: git-bisect.sh:253
c04f5ac3
JX
10285msgid "'git bisect bad' can take only one argument."
10286msgstr "'git bisect bad' 只能带一个参数。"
10287
04cb2f28 10288#: git-bisect.sh:276
b694fbb1
JX
10289msgid "Warning: bisecting only with a bad commit."
10290msgstr "警告:在仅有一个坏提交下进行二分查找。"
10291
90e6ef53 10292# 译者:注意保持句尾空格
c04f5ac3
JX
10293#. TRANSLATORS: Make sure to include [Y] and [n] in your
10294#. translation. The program will only accept English input
10295#. at this point.
04cb2f28 10296#: git-bisect.sh:282
c04f5ac3
JX
10297msgid "Are you sure [Y/n]? "
10298msgstr "您确认么[Y/n]? "
10299
04cb2f28 10300#: git-bisect.sh:292
b694fbb1 10301msgid ""
220c313c 10302"You need to give me at least one good and one bad revision.\n"
b694fbb1
JX
10303"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10304msgstr ""
10305"您需要给我至少一个好版本和一个坏版本。\n"
220c313c 10306"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
b694fbb1 10307
04cb2f28 10308#: git-bisect.sh:295
b694fbb1
JX
10309msgid ""
10310"You need to start by \"git bisect start\".\n"
220c313c 10311"You then need to give me at least one good and one bad revision.\n"
b694fbb1
JX
10312"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
10313msgstr ""
10314"您需要执行 \"git bisect start\" 来开始。\n"
10315"然后需要提供我至少一个好版本和一个坏版本。\n"
220c313c 10316"(为此您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令。)"
b694fbb1 10317
04cb2f28 10318#: git-bisect.sh:366 git-bisect.sh:493
b694fbb1
JX
10319msgid "We are not bisecting."
10320msgstr "我们没有在二分查找。"
10321
04cb2f28 10322#: git-bisect.sh:373
c04f5ac3
JX
10323#, sh-format
10324msgid "'$invalid' is not a valid commit"
10325msgstr "'$invalid' 不是一个有效的提交"
10326
04cb2f28 10327#: git-bisect.sh:382
c04f5ac3
JX
10328#, sh-format
10329msgid ""
10330"Could not check out original HEAD '$branch'.\n"
10331"Try 'git bisect reset <commit>'."
10332msgstr ""
10333"不能检出原始 HEAD '$branch'。\n"
07432cef 10334"尝试 'git bisect reset <提交>'。"
c04f5ac3 10335
04cb2f28 10336#: git-bisect.sh:409
c04f5ac3
JX
10337msgid "No logfile given"
10338msgstr "未提供日志文件"
10339
04cb2f28 10340#: git-bisect.sh:410
c04f5ac3
JX
10341#, sh-format
10342msgid "cannot read $file for replaying"
10343msgstr "不能读取 $file 来重放"
10344
04cb2f28 10345#: git-bisect.sh:427
c04f5ac3
JX
10346msgid "?? what are you talking about?"
10347msgstr "?? 您在说什么?"
10348
04cb2f28 10349#: git-bisect.sh:439
b694fbb1
JX
10350#, sh-format
10351msgid "running $command"
10352msgstr "运行 $command"
10353
04cb2f28 10354#: git-bisect.sh:446
b694fbb1
JX
10355#, sh-format
10356msgid ""
10357"bisect run failed:\n"
10358"exit code $res from '$command' is < 0 or >= 128"
10359msgstr ""
10360"二分查找运行失败:\n"
07432cef 10361"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 10362
04cb2f28 10363#: git-bisect.sh:472
b694fbb1
JX
10364msgid "bisect run cannot continue any more"
10365msgstr "二分查找不能继续运行"
10366
04cb2f28 10367#: git-bisect.sh:478
b694fbb1
JX
10368#, sh-format
10369msgid ""
10370"bisect run failed:\n"
10371"'bisect_state $state' exited with error code $res"
10372msgstr ""
10373"二分查找运行失败:\n"
10374"'bisect_state $state' 退出码为 $res"
10375
04cb2f28 10376#: git-bisect.sh:485
b694fbb1
JX
10377msgid "bisect run success"
10378msgstr "二分查找运行成功"
c04f5ac3
JX
10379
10380#: git-pull.sh:21
10381msgid ""
10382"Pull is not possible because you have unmerged files.\n"
10383"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
220c313c 10384"as appropriate to mark resolution and make a commit."
c04f5ac3 10385msgstr ""
90e6ef53 10386"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
220c313c 10387"然后酌情使用 'git add/rm <file>' 标记解决方案,再做提交。"
c04f5ac3
JX
10388
10389#: git-pull.sh:25
10390msgid "Pull is not possible because you have unmerged files."
90e6ef53 10391msgstr "Pull 不可用,因为您尚有未合并的文件。"
c04f5ac3 10392
220c313c
JX
10393#: git-pull.sh:31
10394msgid ""
10395"You have not concluded your merge (MERGE_HEAD exists).\n"
10396"Please, commit your changes before you can merge."
10397msgstr ""
10398"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
10399"请在合并前先提交您的修改。"
10400
6acbf033 10401#: git-pull.sh:245
c04f5ac3 10402msgid "updating an unborn branch with changes added to the index"
90e6ef53 10403msgstr "更新尚未诞生的分支,变更添加至索引"
c04f5ac3 10404
6acbf033 10405#: git-pull.sh:269
b694fbb1
JX
10406#, sh-format
10407msgid ""
10408"Warning: fetch updated the current branch head.\n"
10409"Warning: fast-forwarding your working tree from\n"
10410"Warning: commit $orig_head."
10411msgstr ""
10412"警告:fetch 更新了当前的分支。您的工作区\n"
10413"警告:从原提交 $orig_head 快进。"
10414
6acbf033 10415#: git-pull.sh:294
c04f5ac3
JX
10416msgid "Cannot merge multiple branches into empty head"
10417msgstr "无法将多个分支合并到空分支"
10418
6acbf033 10419#: git-pull.sh:298
c04f5ac3
JX
10420msgid "Cannot rebase onto multiple branches"
10421msgstr "无法变基到多个分支"
10422
6c94aba5 10423#: git-rebase.sh:57
649900bc
JX
10424msgid ""
10425"When you have resolved this problem, run \"git rebase --continue\".\n"
10426"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
10427"To check out the original branch and stop rebasing, run \"git rebase --abort"
10428"\"."
10429msgstr ""
10430"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
10431"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
10432"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
10433
6acbf033 10434#: git-rebase.sh:165
2e8451e8
JX
10435msgid "Applied autostash."
10436msgstr "成功应用 autostash。"
10437
6acbf033 10438#: git-rebase.sh:168
2e8451e8
JX
10439#, sh-format
10440msgid "Cannot store $stash_sha1"
10441msgstr "无法保存 $stash_sha1"
10442
6acbf033 10443#: git-rebase.sh:169
2e8451e8
JX
10444msgid ""
10445"Applying autostash resulted in conflicts.\n"
10446"Your changes are safe in the stash.\n"
b1894384 10447"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
2e8451e8
JX
10448msgstr ""
10449"应用 autostash 导致冲突。\n"
10450"您的修改安全地保存在 stash 中。\n"
10451"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
10452
6acbf033 10453#: git-rebase.sh:208
649900bc 10454msgid "The pre-rebase hook refused to rebase."
98b2761d 10455msgstr "钩子 pre-rebase 拒绝变基操作。"
649900bc 10456
6acbf033 10457#: git-rebase.sh:213
649900bc
JX
10458msgid "It looks like git-am is in progress. Cannot rebase."
10459msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
10460
6acbf033 10461#: git-rebase.sh:351
649900bc
JX
10462msgid "The --exec option must be used with the --interactive option"
10463msgstr "选项 --exec 必须和选项 --interactive 同时使用"
10464
6acbf033 10465#: git-rebase.sh:356
649900bc
JX
10466msgid "No rebase in progress?"
10467msgstr "没有正在进行的变基?"
10468
6acbf033 10469#: git-rebase.sh:367
07432cef
WS
10470msgid "The --edit-todo action can only be used during interactive rebase."
10471msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
10472
6acbf033 10473#: git-rebase.sh:374
649900bc
JX
10474msgid "Cannot read HEAD"
10475msgstr "不能读取 HEAD"
10476
6acbf033 10477#: git-rebase.sh:377
649900bc
JX
10478msgid ""
10479"You must edit all merge conflicts and then\n"
10480"mark them as resolved using git add"
10481msgstr ""
10482"您必须编辑所有的合并冲突,然后通过 git add\n"
10483"命令将它们标记为已解决"
10484
6acbf033 10485#: git-rebase.sh:395
649900bc
JX
10486#, sh-format
10487msgid "Could not move back to $head_name"
10488msgstr "无法移回 $head_name"
10489
6acbf033 10490#: git-rebase.sh:414
649900bc
JX
10491#, sh-format
10492msgid ""
10493"It seems that there is already a $state_dir_base directory, and\n"
10494"I wonder if you are in the middle of another rebase. If that is the\n"
10495"case, please try\n"
10496"\t$cmd_live_rebase\n"
10497"If that is not the case, please\n"
10498"\t$cmd_clear_stale_rebase\n"
10499"and run me again. I am stopping in case you still have something\n"
10500"valuable there."
10501msgstr ""
98b2761d
JX
10502"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
10503"过程中。 如果是这样,请执行\n"
649900bc
JX
10504"\t$cmd_live_rebase\n"
10505"如果不是这样,请执行\n"
10506"\t$cmd_clear_stale_rebase\n"
98b2761d 10507"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
649900bc 10508
6acbf033 10509#: git-rebase.sh:465
649900bc
JX
10510#, sh-format
10511msgid "invalid upstream $upstream_name"
10512msgstr "无效的上游 $upstream_name"
10513
6acbf033 10514#: git-rebase.sh:489
649900bc
JX
10515#, sh-format
10516msgid "$onto_name: there are more than one merge bases"
10517msgstr "$onto_name: 有一个以上的合并基准"
10518
6acbf033 10519#: git-rebase.sh:492 git-rebase.sh:496
649900bc
JX
10520#, sh-format
10521msgid "$onto_name: there is no merge base"
10522msgstr "$onto_name: 没有合并基准"
10523
6acbf033 10524#: git-rebase.sh:501
649900bc
JX
10525#, sh-format
10526msgid "Does not point to a valid commit: $onto_name"
10527msgstr "没有指向一个有效的提交:$onto_name"
10528
6acbf033 10529#: git-rebase.sh:524
649900bc
JX
10530#, sh-format
10531msgid "fatal: no such branch: $branch_name"
10532msgstr "严重错误:无此分支:$branch_name"
10533
6acbf033 10534#: git-rebase.sh:557
2e8451e8
JX
10535msgid "Cannot autostash"
10536msgstr "无法 autostash"
10537
6acbf033 10538#: git-rebase.sh:562
2e8451e8
JX
10539#, sh-format
10540msgid "Created autostash: $stash_abbrev"
10541msgstr "创建了 autostash: $stash_abbrev"
10542
6acbf033 10543#: git-rebase.sh:566
649900bc
JX
10544msgid "Please commit or stash them."
10545msgstr "请提交或为它们保存进度。"
10546
6acbf033 10547#: git-rebase.sh:586
649900bc
JX
10548#, sh-format
10549msgid "Current branch $branch_name is up to date."
10550msgstr "当前分支 $branch_name 是最新的。"
10551
6acbf033 10552#: git-rebase.sh:590
649900bc
JX
10553#, sh-format
10554msgid "Current branch $branch_name is up to date, rebase forced."
10555msgstr "当前分支 $branch_name 是最新的,强制变基。"
10556
6acbf033 10557#: git-rebase.sh:601
649900bc
JX
10558#, sh-format
10559msgid "Changes from $mb to $onto:"
10560msgstr "变更从 $mb 到 $onto:"
10561
6acbf033 10562#: git-rebase.sh:610
649900bc
JX
10563msgid "First, rewinding head to replay your work on top of it..."
10564msgstr "首先,重置头指针以便在上面重放您的工作..."
10565
6acbf033 10566#: git-rebase.sh:620
649900bc
JX
10567#, sh-format
10568msgid "Fast-forwarded $branch_name to $onto_name."
10569msgstr "快进 $branch_name 至 $onto_name。"
10570
c04f5ac3
JX
10571#: git-stash.sh:51
10572msgid "git stash clear with parameters is unimplemented"
10573msgstr "git stash clear 不支持参数"
10574
10575#: git-stash.sh:74
10576msgid "You do not have the initial commit yet"
10577msgstr "您尚未建立初始提交"
10578
10579#: git-stash.sh:89
10580msgid "Cannot save the current index state"
90e6ef53 10581msgstr "无法保存当前索引状态"
c04f5ac3 10582
6acbf033 10583#: git-stash.sh:124 git-stash.sh:137
c04f5ac3
JX
10584msgid "Cannot save the current worktree state"
10585msgstr "无法保存当前工作区状态"
10586
6acbf033 10587#: git-stash.sh:141
c04f5ac3 10588msgid "No changes selected"
90e6ef53 10589msgstr "没有选择变更"
c04f5ac3 10590
6acbf033 10591#: git-stash.sh:144
c04f5ac3 10592msgid "Cannot remove temporary index (can't happen)"
90e6ef53 10593msgstr "无法删除临时索引(不应发生)"
c04f5ac3 10594
6acbf033 10595#: git-stash.sh:157
c04f5ac3
JX
10596msgid "Cannot record working tree state"
10597msgstr "不能记录工作区状态"
10598
6acbf033 10599#: git-stash.sh:191
2e8451e8
JX
10600#, sh-format
10601msgid "Cannot update $ref_stash with $w_commit"
10602msgstr "无法用 $w_commit 更新 $ref_stash"
10603
b694fbb1
JX
10604#. TRANSLATORS: $option is an invalid option, like
10605#. `--blah-blah'. The 7 spaces at the beginning of the
10606#. second line correspond to "error: ". So you should line
10607#. up the second line with however many characters the
10608#. translation of "error: " takes in your language. E.g. in
10609#. English this is:
10610#.
10611#. $ git stash save --blah-blah 2>&1 | head -n 2
10612#. error: unknown option for 'stash save': --blah-blah
10613#. To provide a message, use git stash save -- '--blah-blah'
6acbf033 10614#: git-stash.sh:238
b694fbb1
JX
10615#, sh-format
10616msgid ""
10617"error: unknown option for 'stash save': $option\n"
10618" To provide a message, use git stash save -- '$option'"
10619msgstr ""
10620"错误:'stash save' 的未知选项:$option\n"
10621" 要提供一个描述信息,使用 git stash save -- '$option'"
10622
6acbf033 10623#: git-stash.sh:259
c04f5ac3
JX
10624msgid "No local changes to save"
10625msgstr "没有要保存的本地修改"
10626
6acbf033 10627#: git-stash.sh:263
c04f5ac3 10628msgid "Cannot initialize stash"
90e6ef53 10629msgstr "无法初始化 stash"
c04f5ac3 10630
6acbf033 10631#: git-stash.sh:267
c04f5ac3
JX
10632msgid "Cannot save the current status"
10633msgstr "无法保存当前状态"
10634
6acbf033 10635#: git-stash.sh:285
c04f5ac3
JX
10636msgid "Cannot remove worktree changes"
10637msgstr "无法删除工作区变更"
10638
6acbf033 10639#: git-stash.sh:384
c04f5ac3 10640msgid "No stash found."
90e6ef53 10641msgstr "未发现 stash。"
c04f5ac3 10642
6acbf033 10643#: git-stash.sh:391
c04f5ac3
JX
10644#, sh-format
10645msgid "Too many revisions specified: $REV"
90e6ef53 10646msgstr "指定了太多的版本:$REV"
c04f5ac3 10647
6acbf033 10648#: git-stash.sh:397
c04f5ac3 10649#, sh-format
220c313c
JX
10650msgid "$reference is not a valid reference"
10651msgstr "$reference 不是一个有效的引用"
c04f5ac3 10652
6acbf033 10653#: git-stash.sh:425
c04f5ac3
JX
10654#, sh-format
10655msgid "'$args' is not a stash-like commit"
90e6ef53 10656msgstr "'$args' 不是 stash 样提交"
c04f5ac3 10657
6acbf033 10658#: git-stash.sh:436
c04f5ac3
JX
10659#, sh-format
10660msgid "'$args' is not a stash reference"
90e6ef53 10661msgstr "'$args' 不是一个 stash 引用"
c04f5ac3 10662
6acbf033 10663#: git-stash.sh:444
c04f5ac3 10664msgid "unable to refresh index"
90e6ef53 10665msgstr "无法刷新索引"
c04f5ac3 10666
6acbf033 10667#: git-stash.sh:448
c04f5ac3
JX
10668msgid "Cannot apply a stash in the middle of a merge"
10669msgstr "无法在合并过程中恢复进度"
10670
6acbf033 10671#: git-stash.sh:456
c04f5ac3 10672msgid "Conflicts in index. Try without --index."
90e6ef53 10673msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3 10674
6acbf033 10675#: git-stash.sh:458
c04f5ac3 10676msgid "Could not save index tree"
90e6ef53 10677msgstr "不能保存索引树"
c04f5ac3 10678
6acbf033 10679#: git-stash.sh:492
c04f5ac3
JX
10680msgid "Cannot unstage modified files"
10681msgstr "无法还原修改的文件"
10682
6acbf033 10683#: git-stash.sh:507
b694fbb1
JX
10684msgid "Index was not unstashed."
10685msgstr "索引的进度没有被恢复。"
10686
6acbf033 10687#: git-stash.sh:530
c04f5ac3
JX
10688#, sh-format
10689msgid "Dropped ${REV} ($s)"
10690msgstr "丢弃了 ${REV} ($s)"
10691
6acbf033 10692#: git-stash.sh:531
c04f5ac3
JX
10693#, sh-format
10694msgid "${REV}: Could not drop stash entry"
90e6ef53 10695msgstr "${REV}:不能丢弃进度条目"
c04f5ac3 10696
220c313c 10697#: git-stash.sh:539
c04f5ac3
JX
10698msgid "No branch name specified"
10699msgstr "未指定分支名"
10700
220c313c 10701#: git-stash.sh:611
c04f5ac3
JX
10702msgid "(To restore them type \"git stash apply\")"
10703msgstr "(为恢复数据输入 \"git stash apply\")"
10704
2e8451e8 10705#: git-submodule.sh:95
c04f5ac3
JX
10706#, sh-format
10707msgid "cannot strip one component off url '$remoteurl'"
10708msgstr "无法从 url '$remoteurl' 剥离一个组件"
10709
2e8451e8 10710#: git-submodule.sh:237
c04f5ac3 10711#, sh-format
170e9899
JX
10712msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
10713msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
c04f5ac3 10714
6c94aba5 10715#: git-submodule.sh:287
c04f5ac3 10716#, sh-format
170e9899
JX
10717msgid "Clone of '$url' into submodule path '$sm_path' failed"
10718msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
c04f5ac3 10719
6acbf033 10720#: git-submodule.sh:296
dac1de7d
JX
10721#, sh-format
10722msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
07432cef 10723msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
dac1de7d 10724
6acbf033 10725#: git-submodule.sh:406
2e8451e8
JX
10726msgid "Relative path can only be used from the toplevel of the working tree"
10727msgstr "只能在工作区的顶级目录中使用相对路径"
10728
6acbf033 10729#: git-submodule.sh:416
c04f5ac3
JX
10730#, sh-format
10731msgid "repo URL: '$repo' must be absolute or begin with ./|../"
10732msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
10733
6acbf033 10734#: git-submodule.sh:433
c04f5ac3 10735#, sh-format
170e9899
JX
10736msgid "'$sm_path' already exists in the index"
10737msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 10738
6acbf033 10739#: git-submodule.sh:437
b694fbb1
JX
10740#, sh-format
10741msgid ""
10742"The following path is ignored by one of your .gitignore files:\n"
10743"$sm_path\n"
10744"Use -f if you really want to add it."
10745msgstr ""
10746"以下路径被您的一个 .gitignore 文件所忽略:\n"
10747"$sm_path\n"
10748"如果您确实想添加它,使用 -f 参数。"
10749
6acbf033 10750#: git-submodule.sh:455
b694fbb1
JX
10751#, sh-format
10752msgid "Adding existing repo at '$sm_path' to the index"
10753msgstr "添加位于 '$sm_path' 的现存版本库到索引"
10754
6acbf033 10755#: git-submodule.sh:457
c04f5ac3 10756#, sh-format
170e9899
JX
10757msgid "'$sm_path' already exists and is not a valid git repo"
10758msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
c04f5ac3 10759
6acbf033 10760#: git-submodule.sh:465
07432cef
WS
10761#, sh-format
10762msgid "A git directory for '$sm_name' is found locally with remote(s):"
10763msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
10764
6acbf033 10765#: git-submodule.sh:467
07432cef
WS
10766#, sh-format
10767msgid ""
10768"If you want to reuse this local git directory instead of cloning again from"
10769msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
10770
6acbf033 10771#: git-submodule.sh:469
07432cef
WS
10772#, sh-format
10773msgid ""
10774"use the '--force' option. If the local git directory is not the correct repo"
10775msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
10776
6acbf033 10777#: git-submodule.sh:470
07432cef
WS
10778#, sh-format
10779msgid ""
10780"or you are unsure what this means choose another name with the '--name' "
10781"option."
10782msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
10783
6acbf033 10784#: git-submodule.sh:472
07432cef
WS
10785#, sh-format
10786msgid "Reactivating local git directory for submodule '$sm_name'."
10787msgstr "激活本地 git 目录到子模组 '$sm_name'。"
10788
6acbf033 10789#: git-submodule.sh:484
c04f5ac3 10790#, sh-format
170e9899
JX
10791msgid "Unable to checkout submodule '$sm_path'"
10792msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 10793
6acbf033 10794#: git-submodule.sh:489
c04f5ac3 10795#, sh-format
170e9899
JX
10796msgid "Failed to add submodule '$sm_path'"
10797msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 10798
6acbf033 10799#: git-submodule.sh:498
c04f5ac3 10800#, sh-format
170e9899
JX
10801msgid "Failed to register submodule '$sm_path'"
10802msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 10803
6acbf033 10804#: git-submodule.sh:542
c04f5ac3 10805#, sh-format
2e8451e8
JX
10806msgid "Entering '$prefix$displaypath'"
10807msgstr "正在进入 '$prefix$displaypath'"
c04f5ac3 10808
6acbf033 10809#: git-submodule.sh:562
c04f5ac3 10810#, sh-format
2e8451e8
JX
10811msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
10812msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
c04f5ac3 10813
6acbf033 10814#: git-submodule.sh:608
c04f5ac3 10815#, sh-format
2e8451e8
JX
10816msgid "No url found for submodule path '$displaypath' in .gitmodules"
10817msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
c04f5ac3 10818
6acbf033 10819#: git-submodule.sh:617
c04f5ac3 10820#, sh-format
2e8451e8
JX
10821msgid "Failed to register url for submodule path '$displaypath'"
10822msgstr "无法为子模组路径 '$displaypath' 注册 url"
c04f5ac3 10823
6acbf033 10824#: git-submodule.sh:619
c04f5ac3 10825#, sh-format
2e8451e8
JX
10826msgid "Submodule '$name' ($url) registered for path '$displaypath'"
10827msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
c04f5ac3 10828
6acbf033 10829#: git-submodule.sh:636
d691f479 10830#, sh-format
2e8451e8
JX
10831msgid "Failed to register update mode for submodule path '$displaypath'"
10832msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
d691f479 10833
6acbf033 10834#: git-submodule.sh:674
1003b3a5
JX
10835#, sh-format
10836msgid "Use '.' if you really want to deinitialize all submodules"
10837msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
10838
6acbf033 10839#: git-submodule.sh:691
1003b3a5 10840#, sh-format
2e8451e8
JX
10841msgid "Submodule work tree '$displaypath' contains a .git directory"
10842msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
1003b3a5 10843
6acbf033 10844#: git-submodule.sh:692
1003b3a5
JX
10845#, sh-format
10846msgid ""
10847"(use 'rm -rf' if you really want to remove it including all of its history)"
10848msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10849
6acbf033 10850#: git-submodule.sh:698
c04f5ac3
JX
10851#, sh-format
10852msgid ""
2e8451e8 10853"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
1003b3a5 10854"discard them"
2e8451e8 10855msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
1003b3a5 10856
6acbf033 10857#: git-submodule.sh:701
1003b3a5 10858#, sh-format
2e8451e8
JX
10859msgid "Cleared directory '$displaypath'"
10860msgstr "已清除目录 '$displaypath'"
1003b3a5 10861
6acbf033 10862#: git-submodule.sh:702
1003b3a5 10863#, sh-format
2e8451e8
JX
10864msgid "Could not remove submodule work tree '$displaypath'"
10865msgstr "无法移除子模组工作区 '$displaypath'"
1003b3a5 10866
6acbf033 10867#: git-submodule.sh:705
1003b3a5 10868#, sh-format
2e8451e8
JX
10869msgid "Could not create empty submodule directory '$displaypath'"
10870msgstr "不能创建空的子模组目录 '$displaypath'"
1003b3a5 10871
6acbf033 10872#: git-submodule.sh:714
1003b3a5 10873#, sh-format
2e8451e8
JX
10874msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
10875msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
1003b3a5 10876
6acbf033 10877#: git-submodule.sh:830
1003b3a5
JX
10878#, sh-format
10879msgid ""
2e8451e8 10880"Submodule path '$displaypath' not initialized\n"
c04f5ac3
JX
10881"Maybe you want to use 'update --init'?"
10882msgstr ""
2e8451e8 10883"子模组路径 '$displaypath' 没有初始化\n"
90e6ef53 10884"也许您想用 'update --init'?"
c04f5ac3 10885
6acbf033 10886#: git-submodule.sh:843
c04f5ac3 10887#, sh-format
2e8451e8
JX
10888msgid "Unable to find current revision in submodule path '$displaypath'"
10889msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 10890
6acbf033 10891#: git-submodule.sh:852
c04f5ac3 10892#, sh-format
170e9899
JX
10893msgid "Unable to fetch in submodule path '$sm_path'"
10894msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 10895
6acbf033 10896#: git-submodule.sh:876
2e8451e8
JX
10897#, sh-format
10898msgid "Unable to fetch in submodule path '$displaypath'"
10899msgstr "无法在子模组路径 '$displaypath' 中获取"
10900
6acbf033 10901#: git-submodule.sh:890
6c94aba5
JX
10902#, sh-format
10903msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
10904msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
10905
6acbf033 10906#: git-submodule.sh:891
c04f5ac3 10907#, sh-format
6c94aba5
JX
10908msgid "Submodule path '$displaypath': checked out '$sha1'"
10909msgstr "子模组路径 '$displaypath':检出 '$sha1'"
10910
6acbf033 10911#: git-submodule.sh:895
6c94aba5 10912#, sh-format
2e8451e8
JX
10913msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
10914msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 10915
6acbf033 10916#: git-submodule.sh:896
c04f5ac3 10917#, sh-format
2e8451e8
JX
10918msgid "Submodule path '$displaypath': rebased into '$sha1'"
10919msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 10920
6acbf033 10921#: git-submodule.sh:901
c04f5ac3 10922#, sh-format
2e8451e8
JX
10923msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
10924msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 10925
6acbf033 10926#: git-submodule.sh:902
c04f5ac3 10927#, sh-format
2e8451e8
JX
10928msgid "Submodule path '$displaypath': merged in '$sha1'"
10929msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 10930
6acbf033 10931#: git-submodule.sh:907
c04f5ac3 10932#, sh-format
2e8451e8
JX
10933msgid ""
10934"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
10935msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
c04f5ac3 10936
6acbf033 10937#: git-submodule.sh:908
c04f5ac3 10938#, sh-format
2e8451e8
JX
10939msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
10940msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
c04f5ac3 10941
6acbf033 10942#: git-submodule.sh:938
2e8451e8
JX
10943#, sh-format
10944msgid "Failed to recurse into submodule path '$displaypath'"
10945msgstr "无法递归进子模组路径 '$displaypath'"
10946
6acbf033 10947#: git-submodule.sh:1046
649900bc
JX
10948msgid "The --cached option cannot be used with the --files option"
10949msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1 10950
6acbf033 10951#: git-submodule.sh:1098
b694fbb1
JX
10952#, sh-format
10953msgid "unexpected mode $mod_dst"
10954msgstr "意外的模式 $mod_dst"
c04f5ac3 10955
90e6ef53 10956# 译者:注意保持前导空格
6acbf033 10957#: git-submodule.sh:1118
c04f5ac3 10958#, sh-format
2e8451e8
JX
10959msgid " Warn: $display_name doesn't contain commit $sha1_src"
10960msgstr " 警告:$display_name 未包含提交 $sha1_src"
c04f5ac3 10961
90e6ef53 10962# 译者:注意保持前导空格
6acbf033 10963#: git-submodule.sh:1121
c04f5ac3 10964#, sh-format
2e8451e8
JX
10965msgid " Warn: $display_name doesn't contain commit $sha1_dst"
10966msgstr " 警告:$display_name 未包含提交 $sha1_dst"
c04f5ac3 10967
90e6ef53 10968# 译者:注意保持前导空格
6acbf033 10969#: git-submodule.sh:1124
c04f5ac3 10970#, sh-format
2e8451e8
JX
10971msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
10972msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
c04f5ac3 10973
6acbf033 10974#: git-submodule.sh:1149
c04f5ac3 10975msgid "blob"
07432cef 10976msgstr "数据对象"
c04f5ac3 10977
6acbf033 10978#: git-submodule.sh:1267
1003b3a5
JX
10979#, sh-format
10980msgid "Failed to recurse into submodule path '$sm_path'"
10981msgstr "无法递归进子模组路径 '$sm_path'"
10982
6acbf033 10983#: git-submodule.sh:1331
c04f5ac3 10984#, sh-format
2e8451e8
JX
10985msgid "Synchronizing submodule url for '$displaypath'"
10986msgstr "为 '$displaypath' 同步子模组 url"
10987
04cb2f28
JX
10988#~ msgid "no files added"
10989#~ msgstr "没有文件被添加"
10990
10991#~ msgid "force creation (when already exists)"
10992#~ msgstr "强制创建(当已经存在)"
10993
10994#~ msgid "Malformed ident string: '%s'"
10995#~ msgstr "非法的身份字符串:'%s'"
10996
10997#~ msgid "slot"
10998#~ msgstr "slot"
10999
220c313c
JX
11000#~ msgid "Failed to lock ref for update"
11001#~ msgstr "无法为更新锁定引用"
11002
11003#~ msgid "Failed to write ref"
11004#~ msgstr "不能写引用"
11005
11006#~ msgid "Failed to lock HEAD during fast_forward_to"
11007#~ msgstr "在快进时无法为 HEAD 加锁"
11008
11009#~ msgid "invalid commit: %s"
11010#~ msgstr "无效的提交:%s"
11011
11012#~ msgid "cannot lock HEAD ref"
11013#~ msgstr "无法锁定 HEAD 引用"
11014
11015#~ msgid "cannot update HEAD ref"
11016#~ msgstr "无法更新 HEAD 引用"
11017
11018#~ msgid "Invalid %s: '%s'"
11019#~ msgstr "无效的 %s:'%s'"
11020
11021#~ msgid "cannot tell cwd"
11022#~ msgstr "无法获知当前路径"
11023
11024#~ msgid "%s: cannot lock the ref"
11025#~ msgstr "%s:不能锁定引用"
11026
11027#~ msgid "%s: cannot update the ref"
11028#~ msgstr "%s:不能更新引用"
11029
6acbf033
JX
11030#~ msgid "commit has empty message"
11031#~ msgstr "提交说明为空"
11032
11033#~ msgid "Failed to chdir: %s"
11034#~ msgstr "无法切换目录:%s"
11035
6c94aba5
JX
11036#~ msgid "key id"
11037#~ msgstr "key id"
11038
11039#~ msgid "Tracking not set up: name too long: %s"
11040#~ msgstr "跟踪未设置:名字太长:%s"
11041
11042#~ msgid "bug"
11043#~ msgstr "bug"
11044
11045# 译者:注意保持句尾空格
11046#~ msgid "ahead "
11047#~ msgstr "领先 "
11048
11049# 译者:注意保持句尾空格
11050#~ msgid ", behind "
11051#~ msgstr ",落后 "
11052
11053#~ msgid "could not find .gitmodules in index"
11054#~ msgstr "无法在索引中找到 .gitmodules"
11055
11056#~ msgid "reading updated .gitmodules failed"
11057#~ msgstr "读取更新后的 .gitmodules 失败"
11058
11059#~ msgid "unable to stat updated .gitmodules"
11060#~ msgstr "不能枚举更新后的 .gitmodules"
11061
11062#~ msgid "unable to remove .gitmodules from index"
11063#~ msgstr "不能从索引中移除 .gitmodules"
11064
11065#~ msgid "adding updated .gitmodules failed"
11066#~ msgstr "添加更新后的 .gitmodules 失败"
11067
11068# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
11069#~ msgid ""
11070#~ "The behavior of 'git add %s (or %s)' with no path argument from a\n"
11071#~ "subdirectory of the tree will change in Git 2.0 and should not be used "
11072#~ "anymore.\n"
11073#~ "To add content for the whole tree, run:\n"
11074#~ "\n"
11075#~ " git add %s :/\n"
11076#~ " (or git add %s :/)\n"
11077#~ "\n"
11078#~ "To restrict the command to the current directory, run:\n"
11079#~ "\n"
11080#~ " git add %s .\n"
11081#~ " (or git add %s .)\n"
11082#~ "\n"
11083#~ "With the current Git version, the command is restricted to the current "
11084#~ "directory.\n"
11085#~ msgstr ""
11086#~ "在 Git 2.0 版本,位于一个子目录下不带任何路径参数地执行命令\n"
11087#~ "'git add %s (或 %s)' 的行为将被改变,不要再继续使用了。\n"
11088#~ "如果要添加整个目录树的内容,执行:\n"
11089#~ "\n"
11090#~ " git add %s :/\n"
11091#~ " (或 git add %s :/)\n"
11092#~ "\n"
11093#~ "如果要限制该命令只作用于当前目录,执行:\n"
11094#~ "\n"
11095#~ " git add %s .\n"
11096#~ " (或 git add %s .)\n"
11097#~ "\n"
11098#~ "对于当前版本的 Git,这条命令只作用于当前目录。\n"
11099
11100#~ msgid ""
11101#~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
11102#~ "whose behaviour will change in Git 2.0 with respect to paths you "
11103#~ "removed.\n"
11104#~ "Paths like '%s' that are\n"
11105#~ "removed from your working tree are ignored with this version of Git.\n"
11106#~ "\n"
11107#~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
11108#~ " ignores paths you removed from your working tree.\n"
11109#~ "\n"
11110#~ "* 'git add --all <pathspec>' will let you also record the removals.\n"
11111#~ "\n"
11112#~ "Run 'git status' to check the paths you removed from your working tree.\n"
11113#~ msgstr ""
11114#~ "您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal',\n"
11115#~ "针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n"
11116#~ "像本地工作区移除的路径 '%s'\n"
11117#~ "在此版本的 Git 中被忽略。\n"
11118#~ "\n"
11119#~ "* 'git add --ignore-removal <路径规则>',是当前版本的默认操作,\n"
11120#~ " 忽略您本地工作区中移除的文件。\n"
11121#~ "\n"
11122#~ "* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n"
11123#~ "\n"
11124#~ "运行 'git status' 来检查您本地工作区中移除的路径。\n"
11125
11126#~ msgid ""
11127#~ "Auto packing the repository for optimum performance. You may also\n"
11128#~ "run \"git gc\" manually. See \"git help gc\" for more information.\n"
11129#~ msgstr ""
11130#~ "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
11131#~ "参见 \"git help gc\" 以获取更多信息。\n"
11132
11133#~ msgid ""
11134#~ "Updates were rejected because a pushed branch tip is behind its remote\n"
11135#~ "counterpart. If you did not intend to push that branch, you may want to\n"
11136#~ "specify branches to push or set the 'push.default' configuration "
11137#~ "variable\n"
11138#~ "to 'simple', 'current' or 'upstream' to push only the current branch."
11139#~ msgstr ""
11140#~ "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
11141#~ "如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
11142#~ "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
11143#~ "以便只推送当前分支。"
11144
cfff71a9
JX
11145# 译者:为保证在输出中对齐,注意调整句中空格!
11146#~ msgid "copied: %s -> %s"
11147#~ msgstr "拷贝: %s -> %s"
11148
11149# 译者:为保证在输出中对齐,注意调整句中空格!
11150#~ msgid "deleted: %s"
11151#~ msgstr "删除: %s"
11152
11153# 译者:为保证在输出中对齐,注意调整句中空格!
11154#~ msgid "modified: %s"
11155#~ msgstr "修改: %s"
11156
11157# 译者:为保证在输出中对齐,注意调整句中空格!
11158#~ msgid "renamed: %s -> %s"
11159#~ msgstr "重命名: %s -> %s"
11160
11161# 译者:为保证在输出中对齐,注意调整句中空格!
11162#~ msgid "unmerged: %s"
11163#~ msgstr "未合并: %s"
11164
11165# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
11166#~ msgid ""
11167#~ "push.default is unset; its implicit value is changing in\n"
11168#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
11169#~ "and maintain the current behavior after the default changes, use:\n"
11170#~ "\n"
11171#~ " git config --global push.default matching\n"
11172#~ "\n"
11173#~ "To squelch this message and adopt the new behavior now, use:\n"
11174#~ "\n"
11175#~ " git config --global push.default simple\n"
11176#~ "\n"
11177#~ "See 'git help config' and search for 'push.default' for further "
11178#~ "information.\n"
11179#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
11180#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
11181#~ msgstr ""
11182#~ "push.default 未设置,它的默认值将在 Git 2.0 由 'matching'\n"
11183#~ "改变为 'simple'。若要不再显示本信息并保持传统习惯,进行如下设置:\n"
11184#~ "\n"
11185#~ " git config --global push.default matching\n"
11186#~ "\n"
11187#~ "若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
11188#~ "\n"
11189#~ " git config --global push.default simple\n"
11190#~ "\n"
11191#~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
11192#~ "('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
11193#~ "为保持兼容,请用 'current' 代替 'simple')"
11194
90314792
JX
11195#~ msgid "input paths are terminated by a null character"
11196#~ msgstr "输入路径以null字符终止"
11197
11198#~ msgid ""
11199#~ "The following untracked files would NOT be saved but need to be removed "
11200#~ "by stash save:"
11201#~ msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除:"
11202
11203#~ msgid ""
11204#~ "Aborting. Consider using either the --force or --include-untracked option."
11205#~ msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。"
11206
2e8451e8
JX
11207#~ msgid ""
11208#~ "the following submodule (or one of its nested submodule)\n"
11209#~ "uses a .git directory:"
11210#~ msgid_plural ""
11211#~ "the following submodules (or one of its nested submodule)\n"
11212#~ "use a .git directory:"
11213#~ msgstr[0] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
11214#~ msgstr[1] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
11215
2e8451e8
JX
11216# 译者:注意保持前导空格
11217#~ msgid " (fix conflicts and then run \"git am --resolved\")"
11218#~ msgstr " (解决冲突,然后运行 \"git am --resolved\")"
11219
11220# 译者:注意保持前导空格
11221#~ msgid " (all conflicts fixed: run \"git commit\")"
11222#~ msgstr " (解决所有冲突后,执行 \"git commit\")"
11223
11224#~ msgid "more than %d trees given: '%s'"
11225#~ msgstr "提供了超过 %d 个树对象:'%s'"
11226
11227#~ msgid "You cannot combine --no-ff with --ff-only."
11228#~ msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
11229
2e8451e8
JX
11230#~ msgid ""
11231#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
11232#~ "(use 'rm -rf' if you really want to remove it including all of its "
11233#~ "history)"
11234#~ msgstr ""
11235#~ "子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
11236#~ "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
11237
11238#~ msgid ""
11239#~ "'%s' has changes staged in the index\n"
11240#~ "(use --cached to keep the file, or -f to force removal)"
11241#~ msgstr ""
11242#~ "'%s' 有变更已暂存至索引中\n"
11243#~ "(使用 --cached 保存文件,或用 -f 强制删除)"
11244
11245#~ msgid "show commits where no parent comes before its children"
11246#~ msgstr "显示提交时以时间为序且父提交不能领先子提交"
11247
11248#~ msgid "show the HEAD reference"
11249#~ msgstr "显示 HEAD 引用"
11250
11251#~ msgid "Submodule '$name' ($url) registered for path '$sm_path'"
11252#~ msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
11253
11254#~ msgid "Change flags"
11255#~ msgstr "修改参数"
11256
11257#~ msgid ""
11258#~ "NOTE: no more files to clean; press \"t\" to toggle flags of git-clean."
11259#~ msgstr "注意:没有要清理的文件;尝试按 \"t\" 切换 git-clean 的选项。"
11260
11261#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'"
11262#~ msgstr "无法递归进子模组路径 '$prefix$sm_path'"
07432cef 11263
4dcdc3d8
JX
11264#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
11265#~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
11266
11267#~ msgid "See 'git help <command>' for more information on a specific command."
11268#~ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
11269
11270#~ msgid "BUG: impossible combination of %d and %p"
11271#~ msgstr "BUG: 无法组合 %d 和 %p"
11272
11273# 译者:以下三条实际为一个段落
11274#~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
11275#~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
11276
11277# 译者:为对齐,下面两句内容有调整
11278#~ msgid "may speed it up, but you have to be careful not to forget to add"
11279#~ msgstr "也许能提高速度,但您需要小心不要忘了添加新文件"
11280
11281#~ msgid "new files yourself (see 'git help status')."
11282#~ msgstr "(参见 'git help status')。"
11283
1003b3a5
JX
11284#~ msgid "use any ref in .git/refs"
11285#~ msgstr "使用 .git/refs 里的任意引用"
11286
11287#~ msgid "use any tag in .git/refs/tags"
11288#~ msgstr "使用 .git/refs/tags 里的任意 tag"
11289
11290#~ msgid "bad object %s"
11291#~ msgstr "坏对象 %s"
11292
11293#~ msgid "bogus committer info %s"
11294#~ msgstr "虚假的提交者信息 %s"
11295
a77c07d9
JX
11296#~ msgid "can't fdopen 'show' output fd"
11297#~ msgstr "不能打开 'show' 输出文件句柄"
11298
11299#~ msgid "failed to close pipe to 'show' for object '%s'"
11300#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
11301
07432cef
WS
11302#~ msgid " 0 files changed"
11303#~ msgstr " 0 个文件被修改"
11304
11305#~ msgid " %d file changed"
11306#~ msgid_plural " %d files changed"
11307#~ msgstr[0] " %d 个文件被修改"
11308#~ msgstr[1] " %d 个文件被修改"
11309
11310#~ msgid ", %d insertion(+)"
11311#~ msgid_plural ", %d insertions(+)"
11312#~ msgstr[0] ",插入 %d 行(+)"
11313#~ msgstr[1] ",插入 %d 行(+)"
11314
11315#~ msgid ", %d deletion(-)"
11316#~ msgid_plural ", %d deletions(-)"
11317#~ msgstr[0] ",删除 %d 行(-)"
11318#~ msgstr[1] ",删除 %d 行(-)"
11319
11320#~ msgid "You do not have a valid HEAD"
11321#~ msgstr "您没有一个有效的 HEAD"
11322
11323#~ msgid "oops"
11324#~ msgstr "哎哟"
11325
11326#~ msgid "Would not remove %s\n"
11327#~ msgstr "不会删除 %s\n"
11328
11329#~ msgid "Not removing %s\n"
11330#~ msgstr "未删除 %s\n"
11331
07432cef
WS
11332#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
11333#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
11334
11335#~ msgid "Could not read index"
11336#~ msgstr "不能读取索引"
c160d03f 11337
ef317cd5
JX
11338# 译者:中文字符串拼接,可删除前导空格
11339#~ msgid " (use \"git add\" to track)"
11340#~ msgstr "(使用 \"git add\" 建立跟踪)"
11341
ef317cd5
JX
11342#~ msgid "--detach cannot be used with -b/-B/--orphan"
11343#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
11344
11345#~ msgid "--detach cannot be used with -t"
11346#~ msgstr "--detach 不能和 -t 同时使用"
11347
11348#~ msgid "--orphan and -b|-B are mutually exclusive"
11349#~ msgstr "--orphan 和 -b|-B 互斥"
11350
11351#~ msgid "--orphan cannot be used with -t"
11352#~ msgstr "--orphan 不能和 -t 同时使用"
11353
11354#~ msgid "git checkout: -f and -m are incompatible"
11355#~ msgstr "git checkout:-f 和 -m 不兼容"
11356
11357#~ msgid ""
11358#~ "git checkout: updating paths is incompatible with switching branches."
11359#~ msgstr "git checkout:更新路径和切换分支不兼容。"
11360
c160d03f
JX
11361#~ msgid "diff setup failed"
11362#~ msgstr "diff 设置失败"
11363
11364#~ msgid "merge-recursive: disk full?"
11365#~ msgstr "merge-recursive:磁盘已满?"
11366
11367#~ msgid "diff_setup_done failed"
11368#~ msgstr "diff_setup_done 失败"