]> git.ipfire.org Git - thirdparty/git.git/blame - po/zh_CN.po
l10n: vi.po (2194t): Update and minor fix
[thirdparty/git.git] / po / zh_CN.po
CommitLineData
c04f5ac3
JX
1# Chinese translations for Git package
2# Git 软件包的简体中文翻译.
07432cef 3# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
c04f5ac3
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"
b1894384
JX
15"POT-Creation-Date: 2013-08-06 14:10+0800\n"
16"PO-Revision-Date: 2013-08-06 14:45+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
2e8451e8 25#: advice.c:57
c04f5ac3
JX
26#, c-format
27msgid "hint: %.*s\n"
28msgstr "提示:%.*s\n"
29
30#.
31#. * Message used both when 'git commit' fails and when
32#. * other commands doing a merge do.
33#.
2e8451e8 34#: advice.c:87
c04f5ac3
JX
35msgid ""
36"Fix them up in the work tree,\n"
37"and then use 'git add/rm <file>' as\n"
38"appropriate to mark resolution and make a commit,\n"
39"or use 'git commit -a'."
40msgstr ""
41"请先在工作区改正文件,然后酌情使用\n"
42"'git add/rm <file>' 标记解决方案,\n"
43"或使用 'git commit -a'。"
44
ef317cd5 45#: archive.c:10
ef317cd5 46msgid "git archive [options] <tree-ish> [<path>...]"
07432cef 47msgstr "git archive [选项] <树或提交> [<路径>...]"
ef317cd5
JX
48
49#: archive.c:11
ef317cd5 50msgid "git archive --list"
07432cef 51msgstr "git archive --list"
ef317cd5
JX
52
53#: archive.c:12
54msgid ""
55"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
56msgstr ""
07432cef 57"git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]"
ef317cd5
JX
58
59#: archive.c:13
60msgid "git archive --remote <repo> [--exec <cmd>] --list"
07432cef 61msgstr "git archive --remote <版本库> [--exec <命令>] --list"
ef317cd5 62
07432cef 63#: archive.c:323
ef317cd5 64msgid "fmt"
07432cef 65msgstr "格式"
ef317cd5 66
07432cef 67#: archive.c:323
ef317cd5 68msgid "archive format"
07432cef 69msgstr "归档格式"
ef317cd5 70
2e8451e8 71#: archive.c:324 builtin/log.c:1173
ef317cd5 72msgid "prefix"
07432cef 73msgstr "前缀"
ef317cd5 74
07432cef 75#: archive.c:325
ef317cd5 76msgid "prepend prefix to each pathname in the archive"
07432cef 77msgstr "为归档中每个路径名加上前缀"
ef317cd5 78
2e8451e8
JX
79#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292
80#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673
81#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77
82#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408
83#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152
ef317cd5
JX
84msgid "file"
85msgstr "文件"
86
1003b3a5 87#: archive.c:327 builtin/archive.c:89
ef317cd5 88msgid "write the archive to this file"
07432cef 89msgstr "归档写入此文件"
ef317cd5 90
07432cef 91#: archive.c:329
ef317cd5 92msgid "read .gitattributes in working directory"
07432cef 93msgstr "读取工作区中的 .gitattributes"
ef317cd5 94
07432cef 95#: archive.c:330
ef317cd5 96msgid "report archived files on stderr"
07432cef 97msgstr "在标准错误上报告归档文件"
ef317cd5 98
07432cef 99#: archive.c:331
ef317cd5 100msgid "store only"
07432cef 101msgstr "只存储"
ef317cd5 102
07432cef 103#: archive.c:332
ef317cd5 104msgid "compress faster"
07432cef 105msgstr "压缩速度更快"
ef317cd5 106
07432cef 107#: archive.c:340
ef317cd5 108msgid "compress better"
07432cef 109msgstr "压缩效果更好"
ef317cd5 110
07432cef 111#: archive.c:343
ef317cd5 112msgid "list supported archive formats"
07432cef 113msgstr "列出支持的归档格式"
ef317cd5 114
2e8451e8 115#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85
ef317cd5 116msgid "repo"
07432cef 117msgstr "版本库"
ef317cd5 118
1003b3a5 119#: archive.c:346 builtin/archive.c:91
ef317cd5 120msgid "retrieve the archive from remote repository <repo>"
07432cef 121msgstr "从远程版本库(<版本库>)提取归档文件"
ef317cd5 122
2e8451e8 123#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487
ef317cd5 124msgid "command"
07432cef 125msgstr "命令"
ef317cd5 126
1003b3a5 127#: archive.c:348 builtin/archive.c:93
ef317cd5 128msgid "path to the remote git-upload-archive command"
07432cef
WS
129msgstr "远程 git-upload-archive 命令的路径"
130
131#: attr.c:259
132msgid ""
a7409dfb 133"Negative patterns are ignored in git attributes\n"
07432cef 134"Use '\\!' for literal leading exclamation."
ef317cd5 135msgstr ""
a7409dfb 136"负值模版在 git attributes 中被忽略\n"
07432cef 137"当字符串确实要以感叹号开始时,使用 '\\!'。"
ef317cd5 138
4dcdc3d8
JX
139#: branch.c:60
140#, c-format
141msgid "Not setting branch %s as its own upstream."
142msgstr "未设置分支 %s 作为它自己的上游。"
143
144#: branch.c:82
145#, c-format
146msgid "Branch %s set up to track remote branch %s from %s by rebasing."
147msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
148
149#: branch.c:83
150#, c-format
151msgid "Branch %s set up to track remote branch %s from %s."
152msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
153
154#: branch.c:87
155#, c-format
156msgid "Branch %s set up to track local branch %s by rebasing."
157msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
158
159#: branch.c:88
160#, c-format
161msgid "Branch %s set up to track local branch %s."
162msgstr "分支 %s 设置为跟踪本地分支 %s。"
163
164#: branch.c:92
165#, c-format
166msgid "Branch %s set up to track remote ref %s by rebasing."
167msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
168
169#: branch.c:93
170#, c-format
171msgid "Branch %s set up to track remote ref %s."
172msgstr "分支 %s 设置为跟踪远程引用 %s。"
173
174#: branch.c:97
175#, c-format
176msgid "Branch %s set up to track local ref %s by rebasing."
177msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
178
179#: branch.c:98
180#, c-format
181msgid "Branch %s set up to track local ref %s."
182msgstr "分支 %s 设置为跟踪本地引用 %s。"
183
184#: branch.c:118
185#, c-format
186msgid "Tracking not set up: name too long: %s"
187msgstr "跟踪未设置:名字太长:%s"
188
189#: branch.c:137
190#, c-format
191msgid "Not tracking: ambiguous information for ref %s"
192msgstr "未跟踪:引用 %s 有歧义"
193
194#: branch.c:182
195#, c-format
196msgid "'%s' is not a valid branch name."
197msgstr "'%s' 不是一个有效的分支名称。"
198
199#: branch.c:187
200#, c-format
201msgid "A branch named '%s' already exists."
202msgstr "一个分支名 '%s' 已经存在。"
203
204#: branch.c:195
205msgid "Cannot force update the current branch."
206msgstr "无法强制更新当前分支。"
207
2e8451e8 208#: branch.c:216
1003b3a5
JX
209#, c-format
210msgid "Cannot setup tracking information; starting point '%s' is not a branch."
211msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
212
2e8451e8 213#: branch.c:218
1003b3a5
JX
214#, c-format
215msgid "the requested upstream branch '%s' does not exist"
216msgstr "请求的上游分支 '%s' 不存在"
217
2e8451e8 218#: branch.c:220
1003b3a5
JX
219msgid ""
220"\n"
221"If you are planning on basing your work on an upstream\n"
222"branch that already exists at the remote, you may need to\n"
223"run \"git fetch\" to retrieve it.\n"
224"\n"
225"If you are planning to push out a new local branch that\n"
226"will track its remote counterpart, you may want to use\n"
227"\"git push -u\" to set the upstream config as you push."
228msgstr ""
229"\n"
230"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
231"您可能需要执行 \"git fetch\" 来获取分支。\n"
232"\n"
233"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
234"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
235
2e8451e8 236#: branch.c:265
4dcdc3d8
JX
237#, c-format
238msgid "Not a valid object name: '%s'."
239msgstr "不是一个有效的对象名:'%s'。"
240
2e8451e8 241#: branch.c:285
4dcdc3d8
JX
242#, c-format
243msgid "Ambiguous object name: '%s'."
244msgstr "歧义的对象名:'%s'。"
245
2e8451e8 246#: branch.c:290
4dcdc3d8
JX
247#, c-format
248msgid "Not a valid branch point: '%s'."
249msgstr "无效的分支点:'%s'。"
250
2e8451e8 251#: branch.c:296
4dcdc3d8
JX
252msgid "Failed to lock ref for update"
253msgstr "无法为更新锁定引用"
254
2e8451e8 255#: branch.c:314
4dcdc3d8
JX
256msgid "Failed to write ref"
257msgstr "不能写引用"
258
8ada9598
JX
259#: bundle.c:36
260#, c-format
261msgid "'%s' does not look like a v2 bundle file"
81809b99 262msgstr "'%s' 不像是一个 v2 版本的包文件"
8ada9598
JX
263
264#: bundle.c:63
81809b99 265#, c-format
8ada9598 266msgid "unrecognized header: %s%s (%d)"
81809b99 267msgstr "未能识别的包头:%s%s (%d)"
8ada9598 268
b1894384 269#: bundle.c:89 builtin/commit.c:697
8ada9598
JX
270#, c-format
271msgid "could not open '%s'"
272msgstr "不能打开 '%s'"
273
274#: bundle.c:140
275msgid "Repository lacks these prerequisite commits:"
81809b99 276msgstr "版本库缺少这些必备的提交:"
8ada9598 277
2e8451e8
JX
278#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331
279#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364
280#: builtin/shortlog.c:156
8ada9598
JX
281msgid "revision walk setup failed"
282msgstr "版本遍历设置失败"
283
284#: bundle.c:186
285#, c-format
1003b3a5
JX
286msgid "The bundle contains this ref:"
287msgid_plural "The bundle contains these %d refs:"
288msgstr[0] "这个包中含有这个引用:"
289msgstr[1] "这个包中含有 %d 个引用:"
8ada9598 290
1003b3a5 291#: bundle.c:193
6792b93b
JX
292msgid "The bundle records a complete history."
293msgstr "这个包记录一个完整历史。"
294
295#: bundle.c:195
8ada9598 296#, c-format
1003b3a5
JX
297msgid "The bundle requires this ref:"
298msgid_plural "The bundle requires these %d refs:"
299msgstr[0] "这个包需要这个引用:"
300msgstr[1] "这个包需要 %d 个引用:"
8ada9598 301
6792b93b 302#: bundle.c:294
8ada9598 303msgid "rev-list died"
81809b99 304msgstr "rev-list 终止"
8ada9598 305
2e8451e8 306#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259
8ada9598
JX
307#, c-format
308msgid "unrecognized argument: %s"
81809b99 309msgstr "未能识别的参数:%s"
8ada9598 310
6792b93b 311#: bundle.c:335
8ada9598
JX
312#, c-format
313msgid "ref '%s' is excluded by the rev-list options"
81809b99 314msgstr "引用 '%s' 被 rev-list 选项排除"
8ada9598 315
6792b93b 316#: bundle.c:380
8ada9598 317msgid "Refusing to create empty bundle."
81809b99 318msgstr "不能创建空包。"
8ada9598 319
6792b93b 320#: bundle.c:398
8ada9598 321msgid "Could not spawn pack-objects"
81809b99 322msgstr "不能生成 pack-objects 进程"
8ada9598 323
6792b93b 324#: bundle.c:416
8ada9598 325msgid "pack-objects died"
81809b99 326msgstr "pack-objects 终止"
8ada9598 327
6792b93b 328#: bundle.c:419
81809b99 329#, c-format
8ada9598 330msgid "cannot create '%s'"
81809b99 331msgstr "不能创建 '%s'"
8ada9598 332
6792b93b 333#: bundle.c:441
8ada9598 334msgid "index-pack died"
81809b99 335msgstr "index-pack 终止"
8ada9598 336
2e8451e8 337#: commit.c:53
c04f5ac3
JX
338#, c-format
339msgid "could not parse %s"
340msgstr "不能解析 %s"
341
2e8451e8 342#: commit.c:55
c04f5ac3
JX
343#, c-format
344msgid "%s %s is not a commit!"
345msgstr "%s %s 不是一个提交!"
346
347#: compat/obstack.c:406 compat/obstack.c:408
348msgid "memory exhausted"
349msgstr "内存耗尽"
350
2e8451e8 351#: connected.c:60
c04f5ac3
JX
352msgid "Could not run 'git rev-list'"
353msgstr "不能执行 'git rev-list'"
354
2e8451e8 355#: connected.c:80
c04f5ac3
JX
356#, c-format
357msgid "failed write to rev-list: %s"
358msgstr "无法写入 rev-list:%s"
359
2e8451e8 360#: connected.c:88
c04f5ac3
JX
361#, c-format
362msgid "failed to close rev-list's stdin: %s"
363msgstr "无法关闭 rev-list 的标准输入:%s"
364
8ada9598
JX
365#: date.c:95
366msgid "in the future"
81809b99 367msgstr "在将来"
8ada9598
JX
368
369#: date.c:101
370#, c-format
371msgid "%lu second ago"
372msgid_plural "%lu seconds ago"
81809b99 373msgstr[0] "%lu 秒钟之前"
5ae481e0 374msgstr[1] "%lu 秒钟之前"
8ada9598
JX
375
376#: date.c:108
377#, c-format
378msgid "%lu minute ago"
379msgid_plural "%lu minutes ago"
81809b99 380msgstr[0] "%lu 分钟之前"
5ae481e0 381msgstr[1] "%lu 分钟之前"
8ada9598
JX
382
383#: date.c:115
384#, c-format
385msgid "%lu hour ago"
386msgid_plural "%lu hours ago"
81809b99 387msgstr[0] "%lu 小时之前"
5ae481e0 388msgstr[1] "%lu 小时之前"
8ada9598
JX
389
390#: date.c:122
391#, c-format
392msgid "%lu day ago"
393msgid_plural "%lu days ago"
81809b99 394msgstr[0] "%lu 天之前"
5ae481e0 395msgstr[1] "%lu 天之前"
8ada9598
JX
396
397#: date.c:128
398#, c-format
399msgid "%lu week ago"
400msgid_plural "%lu weeks ago"
81809b99 401msgstr[0] "%lu 周之前"
5ae481e0 402msgstr[1] "%lu 周之前"
8ada9598
JX
403
404#: date.c:135
405#, c-format
406msgid "%lu month ago"
407msgid_plural "%lu months ago"
81809b99 408msgstr[0] "%lu 个月之前"
5ae481e0 409msgstr[1] "%lu 个月之前"
8ada9598
JX
410
411#: date.c:146
412#, c-format
413msgid "%lu year"
414msgid_plural "%lu years"
81809b99 415msgstr[0] "%lu 年"
5ae481e0 416msgstr[1] "%lu 年"
8ada9598
JX
417
418#: date.c:149
419#, c-format
420msgid "%s, %lu month ago"
421msgid_plural "%s, %lu months ago"
81809b99 422msgstr[0] "%s,%lu 个月之前"
5ae481e0 423msgstr[1] "%s,%lu 个月之前"
8ada9598
JX
424
425#: date.c:154 date.c:159
426#, c-format
427msgid "%lu year ago"
428msgid_plural "%lu years ago"
81809b99 429msgstr[0] "%lu 年前"
5ae481e0 430msgstr[1] "%lu 年前"
8ada9598 431
90e6ef53 432# 译者:注意保持前导空格
63af42fe 433#: diff.c:112
c04f5ac3 434#, c-format
07432cef
WS
435msgid " Failed to parse dirstat cut-off percentage '%s'\n"
436msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
c04f5ac3 437
90e6ef53 438# 译者:注意保持前导空格
63af42fe 439#: diff.c:117
c04f5ac3 440#, c-format
07432cef
WS
441msgid " Unknown dirstat parameter '%s'\n"
442msgstr " 未知的 dirstat 参数 '%s'\n"
c04f5ac3 443
63af42fe 444#: diff.c:210
07432cef
WS
445#, c-format
446msgid "Unknown value for 'diff.submodule' config variable: '%s'"
447msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
448
63af42fe 449#: diff.c:260
c04f5ac3
JX
450#, c-format
451msgid ""
452"Found errors in 'diff.dirstat' config variable:\n"
453"%s"
454msgstr ""
90e6ef53 455"发现配置变量 'diff.dirstat' 中的错误:\n"
c04f5ac3
JX
456"%s"
457
2e8451e8 458#: diff.c:3487
c04f5ac3
JX
459#, c-format
460msgid ""
461"Failed to parse --dirstat/-X option parameter:\n"
462"%s"
463msgstr ""
464"无法解析 --dirstat/-X 选项的参数:\n"
465"%s"
466
2e8451e8 467#: diff.c:3501
07432cef
WS
468#, c-format
469msgid "Failed to parse --submodule option parameter: '%s'"
470msgstr "无法解析 --submodule 选项的参数:'%s'"
471
1003b3a5 472#: gpg-interface.c:59 gpg-interface.c:131
c04f5ac3
JX
473msgid "could not run gpg."
474msgstr "不能执行 gpg。"
475
476#: gpg-interface.c:71
477msgid "gpg did not accept the data"
478msgstr "gpg 没有接受数据"
479
480#: gpg-interface.c:82
481msgid "gpg failed to sign the data"
482msgstr "gpg 无法为数据签名"
483
1003b3a5 484#: gpg-interface.c:115
a77c07d9
JX
485#, c-format
486msgid "could not create temporary file '%s': %s"
487msgstr "不能创建临时文件 '%s':%s"
488
1003b3a5 489#: gpg-interface.c:118
a77c07d9
JX
490#, c-format
491msgid "failed writing detached signature to '%s': %s"
492msgstr "无法将分离式签名写入 '%s':%s"
493
1003b3a5 494#: grep.c:1623
7ac1c0ad
JX
495#, c-format
496msgid "'%s': unable to read %s"
497msgstr "'%s':无法读取 %s"
498
1003b3a5 499#: grep.c:1640
7ac1c0ad
JX
500#, c-format
501msgid "'%s': %s"
502msgstr "'%s':%s"
503
1003b3a5 504#: grep.c:1651
7ac1c0ad
JX
505#, c-format
506msgid "'%s': short read %s"
507msgstr "'%s':读取不完整 %s"
508
b1894384 509#: help.c:210
81809b99 510#, c-format
8ada9598 511msgid "available git commands in '%s'"
81809b99 512msgstr "在 '%s' 下可用的 git 命令"
8ada9598 513
b1894384 514#: help.c:217
8ada9598 515msgid "git commands available from elsewhere on your $PATH"
81809b99 516msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
8ada9598 517
b1894384 518#: help.c:233
a77c07d9
JX
519msgid "The most commonly used git commands are:"
520msgstr "最常用的 git 命令有:"
521
b1894384 522#: help.c:290
c04f5ac3
JX
523#, c-format
524msgid ""
525"'%s' appears to be a git command, but we were not\n"
526"able to execute it. Maybe git-%s is broken?"
527msgstr ""
528"'%s' 像是一个 git 命令,但却无法运行。\n"
529"可能是 git-%s 受损?"
530
b1894384 531#: help.c:347
8ada9598 532msgid "Uh oh. Your system reports no Git commands at all."
81809b99 533msgstr "唉呀,您的系统中未发现 Git 命令。"
8ada9598 534
b1894384 535#: help.c:369
8ada9598
JX
536#, c-format
537msgid ""
538"WARNING: You called a Git command named '%s', which does not exist.\n"
539"Continuing under the assumption that you meant '%s'"
540msgstr ""
81809b99
JX
541"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
542"是 '%s'"
8ada9598 543
b1894384 544#: help.c:374
8ada9598
JX
545#, c-format
546msgid "in %0.1f seconds automatically..."
81809b99 547msgstr "在 %0.1f 秒钟后自动运行..."
8ada9598 548
b1894384 549#: help.c:381
8ada9598
JX
550#, c-format
551msgid "git: '%s' is not a git command. See 'git --help'."
81809b99 552msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
8ada9598 553
b1894384 554#: help.c:385 help.c:444
8ada9598
JX
555msgid ""
556"\n"
557"Did you mean this?"
558msgid_plural ""
559"\n"
560"Did you mean one of these?"
561msgstr[0] ""
81809b99
JX
562"\n"
563"您指的是这个么?"
564msgstr[1] ""
565"\n"
195febda 566"您指的是这其中的某一个么?"
8ada9598 567
b1894384 568#: help.c:440
2e8451e8
JX
569#, c-format
570msgid "%s: %s - %s"
571msgstr "%s:%s - %s"
572
07432cef
WS
573#: merge.c:56
574msgid "failed to read the cache"
575msgstr "无法读取缓存"
576
4dcdc3d8 577#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566
2e8451e8 578#: builtin/clone.c:656
07432cef
WS
579msgid "unable to write new index file"
580msgstr "无法写新的索引文件"
581
649900bc
JX
582#: merge-recursive.c:190
583#, c-format
584msgid "(bad commit)\n"
585msgstr "(坏提交)\n"
586
587#: merge-recursive.c:206
588#, c-format
589msgid "addinfo_cache failed for path '%s'"
590msgstr "为路径 '%s' addinfo_cache 失败"
591
2e8451e8 592#: merge-recursive.c:269
649900bc
JX
593msgid "error building trees"
594msgstr "无法创建树"
595
2e8451e8 596#: merge-recursive.c:673
649900bc
JX
597#, c-format
598msgid "failed to create path '%s'%s"
599msgstr "无法创建路径 '%s'%s"
600
2e8451e8 601#: merge-recursive.c:684
649900bc
JX
602#, c-format
603msgid "Removing %s to make room for subdirectory\n"
604msgstr "删除 %s 以便为子目录留出空间\n"
605
606#. something else exists
607#. .. but not some other error (who really cares what?)
2e8451e8 608#: merge-recursive.c:698 merge-recursive.c:719
649900bc
JX
609msgid ": perhaps a D/F conflict?"
610msgstr ":可能是一个目录/文件冲突?"
611
2e8451e8 612#: merge-recursive.c:709
649900bc
JX
613#, c-format
614msgid "refusing to lose untracked file at '%s'"
615msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
616
2e8451e8 617#: merge-recursive.c:749
649900bc
JX
618#, c-format
619msgid "cannot read object %s '%s'"
620msgstr "不能读取对象 %s '%s'"
621
2e8451e8 622#: merge-recursive.c:751
649900bc
JX
623#, c-format
624msgid "blob expected for %s '%s'"
07432cef 625msgstr "%s '%s' 应为数据(blob)对象"
649900bc 626
2e8451e8 627#: merge-recursive.c:774 builtin/clone.c:312
649900bc
JX
628#, c-format
629msgid "failed to open '%s'"
630msgstr "无法打开 '%s'"
631
2e8451e8 632#: merge-recursive.c:782
649900bc
JX
633#, c-format
634msgid "failed to symlink '%s'"
635msgstr "无法创建符号链接 '%s'"
636
2e8451e8 637#: merge-recursive.c:785
649900bc
JX
638#, c-format
639msgid "do not know what to do with %06o %s '%s'"
640msgstr "不知道如何处理 %06o %s '%s'"
641
2e8451e8 642#: merge-recursive.c:923
649900bc
JX
643msgid "Failed to execute internal merge"
644msgstr "无法执行内部合并"
645
2e8451e8 646#: merge-recursive.c:927
649900bc
JX
647#, c-format
648msgid "Unable to add %s to database"
649msgstr "不能添加 %s 至对象库"
650
2e8451e8 651#: merge-recursive.c:943
649900bc
JX
652msgid "unsupported object type in the tree"
653msgstr "在树中有不支持的对象类型"
654
2e8451e8 655#: merge-recursive.c:1022 merge-recursive.c:1036
649900bc
JX
656#, c-format
657msgid ""
658"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
659"in tree."
660msgstr ""
661"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
662"的版本被保留。"
663
2e8451e8 664#: merge-recursive.c:1028 merge-recursive.c:1041
649900bc
JX
665#, c-format
666msgid ""
667"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
668"in tree at %s."
669msgstr ""
670"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
671"的版本保留于 %8$s 中。"
672
2e8451e8 673#: merge-recursive.c:1082
649900bc
JX
674msgid "rename"
675msgstr "重命名"
676
2e8451e8 677#: merge-recursive.c:1082
649900bc
JX
678msgid "renamed"
679msgstr "重命名"
680
2e8451e8 681#: merge-recursive.c:1138
649900bc
JX
682#, c-format
683msgid "%s is a directory in %s adding as %s instead"
684msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
685
2e8451e8 686#: merge-recursive.c:1160
649900bc
JX
687#, c-format
688msgid ""
689"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
690"\"->\"%s\" in \"%s\"%s"
691msgstr ""
692"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
693"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
694
2e8451e8 695#: merge-recursive.c:1165
649900bc
JX
696msgid " (left unresolved)"
697msgstr "(留下未解决)"
698
2e8451e8 699#: merge-recursive.c:1219
649900bc
JX
700#, c-format
701msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
702msgstr ""
703"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
704"%5$s"
705
2e8451e8 706#: merge-recursive.c:1249
649900bc
JX
707#, c-format
708msgid "Renaming %s to %s and %s to %s instead"
07432cef 709msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
649900bc 710
2e8451e8 711#: merge-recursive.c:1448
649900bc
JX
712#, c-format
713msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
714msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
715
2e8451e8 716#: merge-recursive.c:1458
649900bc
JX
717#, c-format
718msgid "Adding merged %s"
719msgstr "添加合并后的 %s"
720
2e8451e8 721#: merge-recursive.c:1463 merge-recursive.c:1661
649900bc
JX
722#, c-format
723msgid "Adding as %s instead"
724msgstr "而是以 %s 为名添加"
725
2e8451e8 726#: merge-recursive.c:1514
649900bc
JX
727#, c-format
728msgid "cannot read object %s"
729msgstr "不能读取对象 %s"
730
2e8451e8 731#: merge-recursive.c:1517
649900bc
JX
732#, c-format
733msgid "object %s is not a blob"
07432cef 734msgstr "对象 %s 不是一个数据(blob)对象"
649900bc 735
2e8451e8 736#: merge-recursive.c:1565
649900bc
JX
737msgid "modify"
738msgstr "修改"
739
2e8451e8 740#: merge-recursive.c:1565
649900bc
JX
741msgid "modified"
742msgstr "修改"
743
2e8451e8 744#: merge-recursive.c:1575
649900bc
JX
745msgid "content"
746msgstr "内容"
747
2e8451e8 748#: merge-recursive.c:1582
649900bc
JX
749msgid "add/add"
750msgstr "添加/添加"
751
2e8451e8 752#: merge-recursive.c:1616
649900bc
JX
753#, c-format
754msgid "Skipped %s (merged same as existing)"
755msgstr "略过 %s(已经做过相同合并)"
756
2e8451e8 757#: merge-recursive.c:1630
649900bc
JX
758#, c-format
759msgid "Auto-merging %s"
760msgstr "自动合并 %s"
761
2e8451e8 762#: merge-recursive.c:1634 git-submodule.sh:1118
649900bc
JX
763msgid "submodule"
764msgstr "子模组"
765
2e8451e8 766#: merge-recursive.c:1635
649900bc
JX
767#, c-format
768msgid "CONFLICT (%s): Merge conflict in %s"
769msgstr "冲突(%s):合并冲突于 %s"
770
2e8451e8 771#: merge-recursive.c:1725
649900bc
JX
772#, c-format
773msgid "Removing %s"
774msgstr "删除 %s"
775
2e8451e8 776#: merge-recursive.c:1750
649900bc
JX
777msgid "file/directory"
778msgstr "文件/目录"
779
2e8451e8 780#: merge-recursive.c:1756
649900bc
JX
781msgid "directory/file"
782msgstr "目录/文件"
783
2e8451e8 784#: merge-recursive.c:1761
649900bc
JX
785#, c-format
786msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
787msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
788
2e8451e8 789#: merge-recursive.c:1771
649900bc
JX
790#, c-format
791msgid "Adding %s"
792msgstr "添加 %s"
793
2e8451e8 794#: merge-recursive.c:1788
649900bc
JX
795msgid "Fatal merge failure, shouldn't happen."
796msgstr "严重的合并错误,不应发生。"
797
2e8451e8 798#: merge-recursive.c:1807
649900bc
JX
799msgid "Already up-to-date!"
800msgstr "已经是最新的!"
801
2e8451e8 802#: merge-recursive.c:1816
649900bc
JX
803#, c-format
804msgid "merging of trees %s and %s failed"
805msgstr "无法合并树 %s 和 %s"
806
2e8451e8 807#: merge-recursive.c:1846
649900bc
JX
808#, c-format
809msgid "Unprocessed path??? %s"
810msgstr "未处理的路径??? %s"
811
2e8451e8 812#: merge-recursive.c:1891
649900bc
JX
813msgid "Merging:"
814msgstr "合并:"
815
2e8451e8 816#: merge-recursive.c:1904
649900bc 817#, c-format
e5e38ce4
JX
818msgid "found %u common ancestor:"
819msgid_plural "found %u common ancestors:"
820msgstr[0] "发现 %u 个共同祖先:"
821msgstr[1] "发现 %u 个共同祖先:"
649900bc 822
2e8451e8 823#: merge-recursive.c:1941
649900bc
JX
824msgid "merge returned no commit"
825msgstr "合并未返回提交"
826
2e8451e8 827#: merge-recursive.c:1998
649900bc
JX
828#, c-format
829msgid "Could not parse object '%s'"
830msgstr "不能解析对象 '%s'"
831
2e8451e8 832#: merge-recursive.c:2010 builtin/merge.c:672
649900bc
JX
833msgid "Unable to write index."
834msgstr "不能写入索引。"
835
2e8451e8
JX
836#: notes-utils.c:40
837msgid "Cannot commit uninitialized/unreferenced notes tree"
838msgstr "不能提交未初始化/未引用的注解树"
839
840#: notes-utils.c:81
841#, c-format
842msgid "Bad notes.rewriteMode value: '%s'"
843msgstr "坏的 notes.rewriteMode 值:'%s'"
844
845#: notes-utils.c:91
846#, c-format
847msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
848msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
849
850#. TRANSLATORS: The first %s is the name of the
851#. environment variable, the second %s is its value
852#: notes-utils.c:118
853#, c-format
854msgid "Bad %s value: '%s'"
855msgstr "坏的 %s 值:'%s'"
856
857#: object.c:204
1003b3a5
JX
858#, c-format
859msgid "unable to parse object: %s"
860msgstr "不能解析对象:%s"
861
63af42fe 862#: parse-options.c:489
8ada9598 863msgid "..."
81809b99 864msgstr "..."
8ada9598 865
63af42fe 866#: parse-options.c:507
81809b99 867#, c-format
8ada9598 868msgid "usage: %s"
81809b99 869msgstr "用法:%s"
8ada9598
JX
870
871#. TRANSLATORS: the colon here should align with the
872#. one in "usage: %s" translation
63af42fe 873#: parse-options.c:511
81809b99 874#, c-format
8ada9598 875msgid " or: %s"
81809b99 876msgstr " 或:%s"
8ada9598
JX
877
878# 译者:为保证在输出中对齐,注意调整句中空格!
63af42fe 879#: parse-options.c:514
81809b99 880#, c-format
8ada9598 881msgid " %s"
81809b99 882msgstr " %s"
8ada9598 883
63af42fe
JX
884#: parse-options.c:548
885msgid "-NUM"
886msgstr "-数字"
887
a77c07d9
JX
888#: pathspec.c:83
889#, c-format
890msgid "Path '%s' is in submodule '%.*s'"
891msgstr "路径 '%s' 属于模组 '%.*s'"
892
893#: pathspec.c:99
894#, c-format
895msgid "'%s' is beyond a symbolic link"
896msgstr "'%s' 位于符号链接中"
897
2e8451e8 898#: remote.c:1788
c04f5ac3
JX
899#, c-format
900msgid "Your branch is ahead of '%s' by %d commit.\n"
901msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
902msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
5ae481e0 903msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
c04f5ac3 904
2e8451e8 905#: remote.c:1794
07432cef
WS
906msgid " (use \"git push\" to publish your local commits)\n"
907msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
908
2e8451e8 909#: remote.c:1797
c04f5ac3
JX
910#, c-format
911msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
912msgid_plural ""
913"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
90e6ef53 914msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
5ae481e0 915msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
c04f5ac3 916
07432cef 917# 译者:注意保持前导空格
2e8451e8 918#: remote.c:1805
07432cef
WS
919msgid " (use \"git pull\" to update your local branch)\n"
920msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
921
2e8451e8 922#: remote.c:1808
c04f5ac3
JX
923#, c-format
924msgid ""
925"Your branch and '%s' have diverged,\n"
926"and have %d and %d different commit each, respectively.\n"
927msgid_plural ""
928"Your branch and '%s' have diverged,\n"
929"and have %d and %d different commits each, respectively.\n"
930msgstr[0] ""
931"您的分支和 '%s' 出现了偏离,\n"
195febda 932"并且分别有 %d 和 %d 处不同的提交。\n"
5ae481e0
JX
933msgstr[1] ""
934"您的分支和 '%s' 出现了偏离,\n"
195febda 935"并且分别有 %d 和 %d 处不同的提交。\n"
c04f5ac3 936
07432cef 937# 译者:注意保持前导空格
2e8451e8 938#: remote.c:1818
07432cef
WS
939msgid " (use \"git pull\" to merge the remote branch into yours)\n"
940msgstr " (使用 \"git pull\" 来合并远程分支)\n"
941
2e8451e8
JX
942#: run-command.c:80
943msgid "open /dev/null failed"
944msgstr "不能打开 /dev/null"
945
946#: run-command.c:82
947#, c-format
948msgid "dup2(%d,%d) failed"
949msgstr "不能调用 dup2(%d,%d)"
950
951#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903
952#: builtin/merge.c:1013 builtin/merge.c:1023
c04f5ac3
JX
953#, c-format
954msgid "Could not open '%s' for writing"
90e6ef53 955msgstr "不能为写入打开 '%s'"
c04f5ac3 956
2e8451e8
JX
957#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793
958#: builtin/merge.c:1015 builtin/merge.c:1028
c04f5ac3
JX
959#, c-format
960msgid "Could not write to '%s'"
90e6ef53 961msgstr "不能写入 '%s'"
c04f5ac3 962
1003b3a5 963#: sequencer.c:229
14c8bced
JX
964msgid ""
965"after resolving the conflicts, mark the corrected paths\n"
966"with 'git add <paths>' or 'git rm <paths>'"
967msgstr ""
968"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
969"命令标记修正后的文件"
970
1003b3a5 971#: sequencer.c:232
c04f5ac3
JX
972msgid ""
973"after resolving the conflicts, mark the corrected paths\n"
974"with 'git add <paths>' or 'git rm <paths>'\n"
975"and commit the result with 'git commit'"
976msgstr ""
977"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
978"对修正后的文件做标记,然后用 'git commit' 提交"
979
2e8451e8 980#: sequencer.c:245 sequencer.c:869 sequencer.c:952
c04f5ac3
JX
981#, c-format
982msgid "Could not write to %s"
983msgstr "不能写入 %s"
984
1003b3a5 985#: sequencer.c:248
c04f5ac3
JX
986#, c-format
987msgid "Error wrapping up %s"
988msgstr "错误收尾 %s"
989
1003b3a5 990#: sequencer.c:263
c04f5ac3
JX
991msgid "Your local changes would be overwritten by cherry-pick."
992msgstr "您的本地修改将被拣选操作覆盖。"
993
1003b3a5 994#: sequencer.c:265
c04f5ac3
JX
995msgid "Your local changes would be overwritten by revert."
996msgstr "您的本地修改将被还原操作覆盖。"
997
1003b3a5 998#: sequencer.c:268
c04f5ac3
JX
999msgid "Commit your changes or stash them to proceed."
1000msgstr "提交您的修改或保存进度后再继续。"
1001
1002#. TRANSLATORS: %s will be "revert" or "cherry-pick"
2e8451e8 1003#: sequencer.c:324
c04f5ac3
JX
1004#, c-format
1005msgid "%s: Unable to write new index file"
90e6ef53 1006msgstr "%s:无法写入新索引文件"
c04f5ac3 1007
2e8451e8 1008#: sequencer.c:355
8ada9598 1009msgid "Could not resolve HEAD commit\n"
81809b99 1010msgstr "不能解析 HEAD 提交\n"
8ada9598 1011
2e8451e8 1012#: sequencer.c:377
8ada9598 1013msgid "Unable to update cache tree\n"
81809b99 1014msgstr "不能更新缓存\n"
8ada9598 1015
2e8451e8 1016#: sequencer.c:422
81809b99 1017#, c-format
8ada9598 1018msgid "Could not parse commit %s\n"
81809b99 1019msgstr "不能解析提交 %s\n"
8ada9598 1020
2e8451e8 1021#: sequencer.c:427
81809b99 1022#, c-format
8ada9598 1023msgid "Could not parse parent commit %s\n"
81809b99 1024msgstr "不能解析父提交 %s\n"
8ada9598 1025
2e8451e8 1026#: sequencer.c:493
c04f5ac3 1027msgid "Your index file is unmerged."
90e6ef53 1028msgstr "您的索引文件未完成合并。"
c04f5ac3 1029
2e8451e8 1030#: sequencer.c:512
c04f5ac3
JX
1031#, c-format
1032msgid "Commit %s is a merge but no -m option was given."
1033msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1034
2e8451e8 1035#: sequencer.c:520
c04f5ac3
JX
1036#, c-format
1037msgid "Commit %s does not have parent %d"
1038msgstr "提交 %s 没有父提交 %d"
1039
2e8451e8 1040#: sequencer.c:524
c04f5ac3
JX
1041#, c-format
1042msgid "Mainline was specified but commit %s is not a merge."
90e6ef53 1043msgstr "指定了主线但提交 %s 不是一个合并。"
c04f5ac3
JX
1044
1045#. TRANSLATORS: The first %s will be "revert" or
1046#. "cherry-pick", the second %s a SHA1
2e8451e8 1047#: sequencer.c:537
c04f5ac3
JX
1048#, c-format
1049msgid "%s: cannot parse parent commit %s"
1050msgstr "%s:不能解析父提交 %s"
1051
2e8451e8 1052#: sequencer.c:541
c04f5ac3
JX
1053#, c-format
1054msgid "Cannot get commit message for %s"
1055msgstr "不能得到 %s 的提交说明"
1056
2e8451e8 1057#: sequencer.c:627
c04f5ac3
JX
1058#, c-format
1059msgid "could not revert %s... %s"
1060msgstr "不能还原 %s... %s"
1061
2e8451e8 1062#: sequencer.c:628
c04f5ac3
JX
1063#, c-format
1064msgid "could not apply %s... %s"
1065msgstr "不能应用 %s... %s"
1066
2e8451e8 1067#: sequencer.c:664
c04f5ac3
JX
1068msgid "empty commit set passed"
1069msgstr "提供了空的提交集"
1070
2e8451e8 1071#: sequencer.c:672
c04f5ac3
JX
1072#, c-format
1073msgid "git %s: failed to read the index"
90e6ef53 1074msgstr "git %s:无法读取索引"
c04f5ac3 1075
2e8451e8 1076#: sequencer.c:677
c04f5ac3
JX
1077#, c-format
1078msgid "git %s: failed to refresh the index"
90e6ef53 1079msgstr "git %s:无法刷新索引"
c04f5ac3 1080
2e8451e8 1081#: sequencer.c:735
c04f5ac3
JX
1082#, c-format
1083msgid "Cannot %s during a %s"
90e6ef53 1084msgstr "无法 %s 在一个 %s 过程中"
c04f5ac3 1085
2e8451e8 1086#: sequencer.c:757
c04f5ac3
JX
1087#, c-format
1088msgid "Could not parse line %d."
90e6ef53 1089msgstr "不能解析第 %d 行。"
c04f5ac3 1090
2e8451e8 1091#: sequencer.c:762
c04f5ac3 1092msgid "No commits parsed."
7e238ab7 1093msgstr "没有提交被解析。"
c04f5ac3 1094
2e8451e8 1095#: sequencer.c:775
c04f5ac3
JX
1096#, c-format
1097msgid "Could not open %s"
1098msgstr "不能打开 %s"
1099
2e8451e8 1100#: sequencer.c:779
c04f5ac3
JX
1101#, c-format
1102msgid "Could not read %s."
1103msgstr "不能读取 %s。"
1104
2e8451e8 1105#: sequencer.c:786
c04f5ac3
JX
1106#, c-format
1107msgid "Unusable instruction sheet: %s"
1108msgstr "无用的指令表单:%s"
1109
2e8451e8 1110#: sequencer.c:814
c04f5ac3
JX
1111#, c-format
1112msgid "Invalid key: %s"
1113msgstr "无效键名:%s"
1114
2e8451e8 1115#: sequencer.c:817
c04f5ac3
JX
1116#, c-format
1117msgid "Invalid value for %s: %s"
81809b99 1118msgstr "%s 的值无效:%s"
c04f5ac3 1119
2e8451e8 1120#: sequencer.c:829
c04f5ac3
JX
1121#, c-format
1122msgid "Malformed options sheet: %s"
1123msgstr "非法的选项表单:%s"
1124
2e8451e8 1125#: sequencer.c:850
c04f5ac3
JX
1126msgid "a cherry-pick or revert is already in progress"
1127msgstr "一个拣选或还原操作已在进行"
1128
2e8451e8 1129#: sequencer.c:851
c04f5ac3
JX
1130msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1131msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1132
2e8451e8 1133#: sequencer.c:855
c04f5ac3
JX
1134#, c-format
1135msgid "Could not create sequencer directory %s"
90e6ef53 1136msgstr "不能创建序列目录 %s"
c04f5ac3 1137
2e8451e8 1138#: sequencer.c:871 sequencer.c:956
c04f5ac3
JX
1139#, c-format
1140msgid "Error wrapping up %s."
1141msgstr "错误收尾 %s。"
1142
2e8451e8 1143#: sequencer.c:890 sequencer.c:1024
c04f5ac3 1144msgid "no cherry-pick or revert in progress"
195febda 1145msgstr "拣选或还原操作并未进行"
c04f5ac3 1146
2e8451e8 1147#: sequencer.c:892
c04f5ac3
JX
1148msgid "cannot resolve HEAD"
1149msgstr "不能解析 HEAD"
1150
2e8451e8 1151#: sequencer.c:894
c04f5ac3 1152msgid "cannot abort from a branch yet to be born"
90e6ef53 1153msgstr "不能从尚未建立的分支终止"
c04f5ac3 1154
2e8451e8 1155#: sequencer.c:916 builtin/apply.c:4061
c04f5ac3
JX
1156#, c-format
1157msgid "cannot open %s: %s"
1158msgstr "不能打开 %s:%s"
1159
2e8451e8 1160#: sequencer.c:919
c04f5ac3
JX
1161#, c-format
1162msgid "cannot read %s: %s"
1163msgstr "不能读取 %s:%s"
1164
2e8451e8 1165#: sequencer.c:920
c04f5ac3 1166msgid "unexpected end of file"
9aafc933 1167msgstr "意外的文件结束"
c04f5ac3 1168
2e8451e8 1169#: sequencer.c:926
c04f5ac3
JX
1170#, c-format
1171msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
90e6ef53 1172msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
c04f5ac3 1173
2e8451e8 1174#: sequencer.c:949
c04f5ac3
JX
1175#, c-format
1176msgid "Could not format %s."
1177msgstr "不能格式化 %s。"
1178
2e8451e8 1179#: sequencer.c:1092
4dcdc3d8
JX
1180#, c-format
1181msgid "%s: can't cherry-pick a %s"
1182msgstr "%s:不能拣选一个%s"
1183
2e8451e8 1184#: sequencer.c:1095
4dcdc3d8
JX
1185#, c-format
1186msgid "%s: bad revision"
1187msgstr "%s:错误的版本"
1188
2e8451e8 1189#: sequencer.c:1129
c04f5ac3
JX
1190msgid "Can't revert as initial commit"
1191msgstr "不能作为初始提交还原"
1192
2e8451e8 1193#: sequencer.c:1130
c04f5ac3
JX
1194msgid "Can't cherry-pick into empty head"
1195msgstr "不能拣选到空分支"
1196
2e8451e8
JX
1197#: sha1_name.c:440
1198msgid ""
1199"Git normally never creates a ref that ends with 40 hex characters\n"
1200"because it will be ignored when you just specify 40-hex. These refs\n"
1201"may be created by mistake. For example,\n"
1202"\n"
1203" git checkout -b $br $(git rev-parse ...)\n"
1204"\n"
1205"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1206"examine these refs and maybe delete them. Turn this message off by\n"
b1894384 1207"running \"git config advice.objectNameWarning false\""
2e8451e8
JX
1208msgstr ""
1209"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
1210"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
1211"\n"
1212" git checkout -b $br $(git rev-parse ...)\n"
1213"\n"
1214"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
b1894384 1215"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
2e8451e8
JX
1216"命令关闭本消息通知。"
1217
1218#: sha1_name.c:1097
170e9899
JX
1219msgid "HEAD does not point to a branch"
1220msgstr "HEAD 没有指向一个分支"
1221
2e8451e8 1222#: sha1_name.c:1100
170e9899
JX
1223#, c-format
1224msgid "No such branch: '%s'"
1225msgstr "没有此分支:'%s'"
1226
2e8451e8 1227#: sha1_name.c:1102
170e9899
JX
1228#, c-format
1229msgid "No upstream configured for branch '%s'"
1230msgstr "尚未给分支 '%s' 设置上游"
1231
2e8451e8 1232#: sha1_name.c:1106
170e9899
JX
1233#, c-format
1234msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1235msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
1236
ef317cd5 1237#: wrapper.c:408
07432cef 1238#, c-format
ef317cd5 1239msgid "unable to access '%s': %s"
07432cef
WS
1240msgstr "不能访问 '%s':%s"
1241
2e8451e8 1242#: wrapper.c:429
07432cef
WS
1243#, c-format
1244msgid "unable to access '%s'"
1245msgstr "不能访问 '%s'"
ef317cd5 1246
2e8451e8 1247#: wrapper.c:440
d691f479
JX
1248#, c-format
1249msgid "unable to look up current user in the passwd file: %s"
07432cef 1250msgstr "无法在口令文件中查询到当前用户:%s"
d691f479 1251
2e8451e8 1252#: wrapper.c:441
d691f479
JX
1253msgid "no such user"
1254msgstr "无此用户"
1255
2e8451e8 1256#: wt-status.c:141
c04f5ac3
JX
1257msgid "Unmerged paths:"
1258msgstr "未合并的路径:"
1259
90e6ef53 1260# 译者:注意保持前导空格
2e8451e8 1261#: wt-status.c:168 wt-status.c:195
c04f5ac3
JX
1262#, c-format
1263msgid " (use \"git reset %s <file>...\" to unstage)"
1264msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
1265
90e6ef53 1266# 译者:注意保持前导空格
2e8451e8 1267#: wt-status.c:170 wt-status.c:197
c04f5ac3
JX
1268msgid " (use \"git rm --cached <file>...\" to unstage)"
1269msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
1270
90e6ef53 1271# 译者:注意保持前导空格
2e8451e8 1272#: wt-status.c:174
6792b93b
JX
1273msgid " (use \"git add <file>...\" to mark resolution)"
1274msgstr " (使用 \"git add <file>...\" 标记解决方案)"
1275
1276# 译者:注意保持前导空格
2e8451e8 1277#: wt-status.c:176 wt-status.c:180
c04f5ac3
JX
1278msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1279msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
1280
6792b93b 1281# 译者:注意保持前导空格
2e8451e8 1282#: wt-status.c:178
6792b93b
JX
1283msgid " (use \"git rm <file>...\" to mark resolution)"
1284msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
1285
2e8451e8 1286#: wt-status.c:189
c04f5ac3
JX
1287msgid "Changes to be committed:"
1288msgstr "要提交的变更:"
1289
2e8451e8 1290#: wt-status.c:207
c04f5ac3 1291msgid "Changes not staged for commit:"
7e238ab7 1292msgstr "尚未暂存以备提交的变更:"
c04f5ac3 1293
90e6ef53 1294# 译者:注意保持前导空格
2e8451e8 1295#: wt-status.c:211
c04f5ac3
JX
1296msgid " (use \"git add <file>...\" to update what will be committed)"
1297msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
1298
90e6ef53 1299# 译者:注意保持前导空格
2e8451e8 1300#: wt-status.c:213
c04f5ac3
JX
1301msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1302msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
1303
90e6ef53 1304# 译者:注意保持前导空格
2e8451e8 1305#: wt-status.c:214
c04f5ac3
JX
1306msgid ""
1307" (use \"git checkout -- <file>...\" to discard changes in working directory)"
1308msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
1309
90e6ef53 1310# 译者:注意保持前导空格
2e8451e8 1311#: wt-status.c:216
c04f5ac3
JX
1312msgid " (commit or discard the untracked or modified content in submodules)"
1313msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
1314
90e6ef53 1315# 译者:注意保持前导空格
2e8451e8 1316#: wt-status.c:228
c04f5ac3
JX
1317#, c-format
1318msgid " (use \"git %s <file>...\" to include in what will be committed)"
90e6ef53 1319msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
c04f5ac3 1320
2e8451e8 1321#: wt-status.c:245
c04f5ac3
JX
1322msgid "bug"
1323msgstr "bug"
1324
2e8451e8 1325#: wt-status.c:250
c04f5ac3
JX
1326msgid "both deleted:"
1327msgstr "双方删除:"
1328
2e8451e8 1329#: wt-status.c:251
c04f5ac3
JX
1330msgid "added by us:"
1331msgstr "由我们添加:"
1332
2e8451e8 1333#: wt-status.c:252
c04f5ac3
JX
1334msgid "deleted by them:"
1335msgstr "由他们删除:"
1336
2e8451e8 1337#: wt-status.c:253
c04f5ac3
JX
1338msgid "added by them:"
1339msgstr "由他们添加:"
1340
2e8451e8 1341#: wt-status.c:254
c04f5ac3
JX
1342msgid "deleted by us:"
1343msgstr "由我们删除:"
1344
2e8451e8 1345#: wt-status.c:255
c04f5ac3
JX
1346msgid "both added:"
1347msgstr "双方添加:"
1348
2e8451e8 1349#: wt-status.c:256
c04f5ac3
JX
1350msgid "both modified:"
1351msgstr "双方修改:"
1352
90e6ef53 1353# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2e8451e8 1354#: wt-status.c:286
c04f5ac3 1355msgid "new commits, "
aa9565f7 1356msgstr "新提交, "
c04f5ac3 1357
90e6ef53 1358# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2e8451e8 1359#: wt-status.c:288
c04f5ac3 1360msgid "modified content, "
aa9565f7 1361msgstr "修改的内容, "
c04f5ac3 1362
90e6ef53 1363# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
2e8451e8 1364#: wt-status.c:290
c04f5ac3 1365msgid "untracked content, "
aa9565f7 1366msgstr "未跟踪的内容, "
c04f5ac3 1367
90e6ef53 1368# 译者:为保证在输出中对齐,注意调整句中空格!
2e8451e8 1369#: wt-status.c:307
c04f5ac3
JX
1370#, c-format
1371msgid "new file: %s"
1372msgstr "新文件: %s"
1373
90e6ef53 1374# 译者:为保证在输出中对齐,注意调整句中空格!
2e8451e8 1375#: wt-status.c:310
c04f5ac3
JX
1376#, c-format
1377msgid "copied: %s -> %s"
1378msgstr "拷贝: %s -> %s"
1379
90e6ef53 1380# 译者:为保证在输出中对齐,注意调整句中空格!
2e8451e8 1381#: wt-status.c:313
c04f5ac3
JX
1382#, c-format
1383msgid "deleted: %s"
1384msgstr "删除: %s"
1385
90e6ef53 1386# 译者:为保证在输出中对齐,注意调整句中空格!
2e8451e8 1387#: wt-status.c:316
c04f5ac3
JX
1388#, c-format
1389msgid "modified: %s"
1390msgstr "修改: %s"
1391
90e6ef53 1392# 译者:为保证在输出中对齐,注意调整句中空格!
2e8451e8 1393#: wt-status.c:319
c04f5ac3
JX
1394#, c-format
1395msgid "renamed: %s -> %s"
1396msgstr "重命名: %s -> %s"
1397
90e6ef53 1398# 译者:为保证在输出中对齐,注意调整句中空格!
2e8451e8 1399#: wt-status.c:322
c04f5ac3
JX
1400#, c-format
1401msgid "typechange: %s"
1402msgstr "类型变更: %s"
1403
90e6ef53 1404# 译者:为保证在输出中对齐,注意调整句中空格!
2e8451e8 1405#: wt-status.c:325
c04f5ac3
JX
1406#, c-format
1407msgid "unknown: %s"
1408msgstr "未知: %s"
1409
90e6ef53 1410# 译者:为保证在输出中对齐,注意调整句中空格!
2e8451e8 1411#: wt-status.c:328
c04f5ac3
JX
1412#, c-format
1413msgid "unmerged: %s"
1414msgstr "未合并: %s"
1415
2e8451e8 1416#: wt-status.c:331
c04f5ac3
JX
1417#, c-format
1418msgid "bug: unhandled diff status %c"
90e6ef53 1419msgstr "bug:未处理的差异状态 %c"
c04f5ac3 1420
4dcdc3d8 1421#: wt-status.c:803
6792b93b 1422msgid "You have unmerged paths."
195febda 1423msgstr "您有尚未合并的路径。"
6792b93b
JX
1424
1425# 译者:注意保持前导空格
2e8451e8 1426#: wt-status.c:806
6792b93b
JX
1427msgid " (fix conflicts and run \"git commit\")"
1428msgstr " (解决冲突并运行 \"git commit\")"
1429
4dcdc3d8 1430#: wt-status.c:809
6792b93b
JX
1431msgid "All conflicts fixed but you are still merging."
1432msgstr "所有冲突已解决但您仍处于合并中。"
1433
1434# 译者:注意保持前导空格
4dcdc3d8 1435#: wt-status.c:812
6792b93b
JX
1436msgid " (use \"git commit\" to conclude merge)"
1437msgstr " (使用 \"git commit\" 结束合并)"
1438
4dcdc3d8 1439#: wt-status.c:822
6792b93b
JX
1440msgid "You are in the middle of an am session."
1441msgstr "您正处于一个 am 过程中。"
1442
4dcdc3d8 1443#: wt-status.c:825
6792b93b
JX
1444msgid "The current patch is empty."
1445msgstr "当前的补丁为空。"
1446
1447# 译者:注意保持前导空格
4dcdc3d8 1448#: wt-status.c:829
2e8451e8
JX
1449msgid " (fix conflicts and then run \"git am --continue\")"
1450msgstr " (解决冲突,然后运行 \"git am --continue\")"
6792b93b
JX
1451
1452# 译者:注意保持前导空格
4dcdc3d8 1453#: wt-status.c:831
6792b93b
JX
1454msgid " (use \"git am --skip\" to skip this patch)"
1455msgstr " (使用 \"git am --skip\" 跳过此补丁)"
1456
1457# 译者:注意保持前导空格
4dcdc3d8 1458#: wt-status.c:833
6792b93b
JX
1459msgid " (use \"git am --abort\" to restore the original branch)"
1460msgstr " (使用 \"git am --abort\" 恢复原有分支)"
1461
4dcdc3d8 1462#: wt-status.c:893 wt-status.c:910
63af42fe
JX
1463#, c-format
1464msgid "You are currently rebasing branch '%s' on '%s'."
1465msgstr "您正在将分支 '%s' 变基到 '%s'。"
1466
4dcdc3d8 1467#: wt-status.c:898 wt-status.c:915
6792b93b
JX
1468msgid "You are currently rebasing."
1469msgstr "您正在变基。"
1470
1471# 译者:注意保持前导空格
4dcdc3d8 1472#: wt-status.c:901
6792b93b
JX
1473msgid " (fix conflicts and then run \"git rebase --continue\")"
1474msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
1475
1476# 译者:注意保持前导空格
4dcdc3d8 1477#: wt-status.c:903
6792b93b
JX
1478msgid " (use \"git rebase --skip\" to skip this patch)"
1479msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
1480
1481# 译者:注意保持前导空格
4dcdc3d8 1482#: wt-status.c:905
6792b93b
JX
1483msgid " (use \"git rebase --abort\" to check out the original branch)"
1484msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
1485
1486# 译者:注意保持前导空格
4dcdc3d8 1487#: wt-status.c:918
6792b93b
JX
1488msgid " (all conflicts fixed: run \"git rebase --continue\")"
1489msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
1490
4dcdc3d8 1491#: wt-status.c:922
63af42fe
JX
1492#, c-format
1493msgid ""
1494"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1495msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。"
1496
4dcdc3d8 1497#: wt-status.c:927
6792b93b
JX
1498msgid "You are currently splitting a commit during a rebase."
1499msgstr "您正在变基过程中拆分一个提交。"
1500
1501# 译者:注意保持前导空格
4dcdc3d8 1502#: wt-status.c:930
6792b93b
JX
1503msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1504msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
1505
4dcdc3d8 1506#: wt-status.c:934
63af42fe
JX
1507#, c-format
1508msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1509msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。"
1510
4dcdc3d8 1511#: wt-status.c:939
6792b93b
JX
1512msgid "You are currently editing a commit during a rebase."
1513msgstr "您正在变基过程中编辑一个提交。"
1514
1515# 译者:注意保持前导空格
4dcdc3d8 1516#: wt-status.c:942
6792b93b
JX
1517msgid " (use \"git commit --amend\" to amend the current commit)"
1518msgstr " (使用 \"git commit --amend\" 修补当前提交)"
1519
1520# 译者:注意保持前导空格
4dcdc3d8 1521#: wt-status.c:944
6792b93b
JX
1522msgid ""
1523" (use \"git rebase --continue\" once you are satisfied with your changes)"
195febda 1524msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
6792b93b 1525
4dcdc3d8 1526#: wt-status.c:954
6792b93b
JX
1527msgid "You are currently cherry-picking."
1528msgstr "您正在做拣选操作。"
1529
2e8451e8
JX
1530# 译者:注意保持前导空格
1531#: wt-status.c:958
1532msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1533msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
1534
6792b93b 1535# 译者:注意保持前导空格
4dcdc3d8 1536#: wt-status.c:961
2e8451e8
JX
1537msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1538msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
6792b93b 1539
2e8451e8
JX
1540# 译者:注意保持前导空格
1541#: wt-status.c:963
1542msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1543msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
1544
1545#: wt-status.c:972
1003b3a5
JX
1546#, c-format
1547msgid "You are currently reverting commit %s."
1548msgstr "您正在反转提交 %s 。"
1549
1550# 译者:注意保持前导空格
2e8451e8 1551#: wt-status.c:977
1003b3a5
JX
1552msgid " (fix conflicts and run \"git revert --continue\")"
1553msgstr " (解决冲突并运行 \"git revert --continue\")"
1554
1555# 译者:注意保持前导空格
2e8451e8 1556#: wt-status.c:980
1003b3a5
JX
1557msgid " (all conflicts fixed: run \"git revert --continue\")"
1558msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
1559
1560# 译者:注意保持前导空格
2e8451e8 1561#: wt-status.c:982
1003b3a5
JX
1562msgid " (use \"git revert --abort\" to cancel the revert operation)"
1563msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
1564
2e8451e8 1565#: wt-status.c:993
63af42fe 1566#, c-format
1003b3a5
JX
1567msgid "You are currently bisecting, started from branch '%s'."
1568msgstr "您正在从分支 '%s' 开始做二分查找。"
63af42fe 1569
2e8451e8 1570#: wt-status.c:997
6792b93b
JX
1571msgid "You are currently bisecting."
1572msgstr "您正在做二分查找。"
1573
1574# 译者:注意保持前导空格
2e8451e8 1575#: wt-status.c:1000
6792b93b
JX
1576msgid " (use \"git bisect reset\" to get back to the original branch)"
1577msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
1578
4dcdc3d8 1579#: wt-status.c:1173
c04f5ac3
JX
1580msgid "On branch "
1581msgstr "位于分支 "
1582
2e8451e8
JX
1583#: wt-status.c:1180
1584msgid "rebase in progress; onto "
1585msgstr "变基正在进行中;至 "
1586
1587#: wt-status.c:1187
1003b3a5
JX
1588msgid "HEAD detached at "
1589msgstr "头指针分离于 "
1590
2e8451e8 1591#: wt-status.c:1189
1003b3a5
JX
1592msgid "HEAD detached from "
1593msgstr "头指针分离自 "
1594
2e8451e8 1595#: wt-status.c:1192
c04f5ac3
JX
1596msgid "Not currently on any branch."
1597msgstr "当前不在任何分支上。"
1598
2e8451e8 1599#: wt-status.c:1209
c04f5ac3
JX
1600msgid "Initial commit"
1601msgstr "初始提交"
1602
2e8451e8 1603#: wt-status.c:1223
ef317cd5 1604msgid "Untracked files"
07432cef 1605msgstr "未跟踪的文件"
c04f5ac3 1606
2e8451e8 1607#: wt-status.c:1225
ef317cd5 1608msgid "Ignored files"
07432cef 1609msgstr "忽略的文件"
c04f5ac3 1610
2e8451e8 1611#: wt-status.c:1229
1003b3a5 1612#, c-format
4dcdc3d8
JX
1613msgid ""
1614"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1615"may speed it up, but you have to be careful not to forget to add\n"
1616"new files yourself (see 'git help status')."
1617msgstr ""
1618"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
1619"但您需要小心不要忘了添加新文件(参见 'git help status')。"
1003b3a5 1620
2e8451e8 1621#: wt-status.c:1235
c04f5ac3
JX
1622#, c-format
1623msgid "Untracked files not listed%s"
1624msgstr "未跟踪的文件没有列出%s"
1625
7e238ab7 1626# 译者:中文字符串拼接,可删除前导空格
2e8451e8 1627#: wt-status.c:1237
c04f5ac3 1628msgid " (use -u option to show untracked files)"
7e238ab7 1629msgstr "(使用 -u 参数显示未跟踪的文件)"
c04f5ac3 1630
2e8451e8 1631#: wt-status.c:1243
c04f5ac3
JX
1632msgid "No changes"
1633msgstr "没有修改"
1634
2e8451e8 1635#: wt-status.c:1248
07432cef 1636#, c-format
ef317cd5 1637msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
07432cef 1638msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
c04f5ac3 1639
2e8451e8 1640#: wt-status.c:1251
07432cef 1641#, c-format
ef317cd5 1642msgid "no changes added to commit\n"
07432cef 1643msgstr "修改尚未加入提交\n"
c04f5ac3 1644
2e8451e8 1645#: wt-status.c:1254
07432cef 1646#, c-format
ef317cd5
JX
1647msgid ""
1648"nothing added to commit but untracked files present (use \"git add\" to "
1649"track)\n"
07432cef 1650msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
c04f5ac3 1651
2e8451e8 1652#: wt-status.c:1257
07432cef 1653#, c-format
ef317cd5 1654msgid "nothing added to commit but untracked files present\n"
07432cef 1655msgstr "提交为空,但是存在尚未跟踪的文件\n"
c04f5ac3 1656
7e238ab7 1657# 译者:中文字符串拼接,可删除前导空格
2e8451e8 1658#: wt-status.c:1260
07432cef 1659#, c-format
ef317cd5 1660msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
07432cef 1661msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
c04f5ac3 1662
2e8451e8 1663#: wt-status.c:1263 wt-status.c:1268
07432cef 1664#, c-format
ef317cd5 1665msgid "nothing to commit\n"
07432cef 1666msgstr "无文件要提交\n"
ef317cd5 1667
7e238ab7 1668# 译者:中文字符串拼接,可删除前导空格
2e8451e8 1669#: wt-status.c:1266
07432cef 1670#, c-format
ef317cd5 1671msgid "nothing to commit (use -u to show untracked files)\n"
07432cef 1672msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
c04f5ac3 1673
7e238ab7 1674# 译者:中文字符串拼接,可删除前导空格
2e8451e8 1675#: wt-status.c:1270
07432cef 1676#, c-format
ef317cd5 1677msgid "nothing to commit, working directory clean\n"
07432cef 1678msgstr "无文件要提交,干净的工作区\n"
c04f5ac3 1679
2e8451e8 1680#: wt-status.c:1378
c04f5ac3 1681msgid "HEAD (no branch)"
61bc0753 1682msgstr "HEAD(非分支)"
c04f5ac3 1683
90e6ef53 1684# 译者:注意保持句尾空格
2e8451e8 1685#: wt-status.c:1384
c04f5ac3
JX
1686msgid "Initial commit on "
1687msgstr "初始提交于 "
1688
90e6ef53 1689# 译者:注意保持句尾空格
2e8451e8 1690#: wt-status.c:1399
c04f5ac3
JX
1691msgid "behind "
1692msgstr "落后 "
1693
90e6ef53 1694# 译者:注意保持句尾空格
2e8451e8 1695#: wt-status.c:1402 wt-status.c:1405
c04f5ac3
JX
1696msgid "ahead "
1697msgstr "领先 "
1698
90e6ef53 1699# 译者:注意保持句尾空格
2e8451e8 1700#: wt-status.c:1407
c04f5ac3
JX
1701msgid ", behind "
1702msgstr ",落后 "
1703
2e8451e8 1704#: compat/precompose_utf8.c:58 builtin/clone.c:351
a77c07d9
JX
1705#, c-format
1706msgid "failed to unlink '%s'"
1707msgstr "无法删除 '%s'"
1708
1709#: builtin/add.c:20
1710msgid "git add [options] [--] <pathspec>..."
1711msgstr "git add [选项] [--] <路径匹配>..."
ef317cd5 1712
4dcdc3d8
JX
1713# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
1714#.
1715#. * To be consistent with "git add -p" and most Git
1716#. * commands, we should default to being tree-wide, but
1717#. * this is not the original behavior and can't be
1718#. * changed until users trained themselves not to type
1719#. * "git add -u" or "git add -A". For now, we warn and
1720#. * keep the old behavior. Later, the behavior can be changed
1721#. * to tree-wide, keeping the warning for a while, and
1722#. * eventually we can drop the warning.
1723#.
1724#: builtin/add.c:58
1725#, c-format
1726msgid ""
1727"The behavior of 'git add %s (or %s)' with no path argument from a\n"
1728"subdirectory of the tree will change in Git 2.0 and should not be used "
1729"anymore.\n"
1730"To add content for the whole tree, run:\n"
1731"\n"
1732" git add %s :/\n"
1733" (or git add %s :/)\n"
1734"\n"
1735"To restrict the command to the current directory, run:\n"
1736"\n"
1737" git add %s .\n"
1738" (or git add %s .)\n"
1739"\n"
1740"With the current Git version, the command is restricted to the current "
1741"directory.\n"
1742msgstr ""
1743"在 Git 2.0 版本,位于一个子目录下不带任何路径参数地执行命令\n"
1744"'git add %s (或 %s)' 的行为将被改变,不要再继续使用了。\n"
1745"如果要添加整个目录树的内容,执行:\n"
1746"\n"
1747" git add %s :/\n"
1748" (或 git add %s :/)\n"
1749"\n"
1750"如果要限制该命令只作用于当前目录,执行:\n"
1751"\n"
1752" git add %s .\n"
1753" (或 git add %s .)\n"
1754"\n"
1755"对于当前版本的 Git,这条命令只作用于当前目录。\n"
1756
1757#: builtin/add.c:100
1758#, c-format
1759msgid ""
1760"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
1761"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"
1762"Paths like '%s' that are\n"
1763"removed from your working tree are ignored with this version of Git.\n"
1764"\n"
1765"* 'git add --ignore-removal <pathspec>', which is the current default,\n"
1766" ignores paths you removed from your working tree.\n"
1767"\n"
1768"* 'git add --all <pathspec>' will let you also record the removals.\n"
1769"\n"
1770"Run 'git status' to check the paths you removed from your working tree.\n"
1771msgstr ""
1772"您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal',\n"
1773"针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n"
1774"像本地工作区移除的路径 '%s'\n"
1775"在此版本的 Git 中被忽略。\n"
1776"\n"
1777"* 'git add --ignore-removal <pathspec>',是当前版本的默认操作,\n"
1778" 忽略您本地工作区中移除的文件。\n"
1779"\n"
1780"* 'git add --all <pathspec>' 将让您同时对删除操作进行记录。\n"
1781"\n"
1782"运行 'git status' 来检查您本地工作区中移除的路径。\n"
1783
1784#: builtin/add.c:144
c04f5ac3
JX
1785#, c-format
1786msgid "unexpected diff status %c"
1787msgstr "意外的差异状态 %c"
1788
b1894384 1789#: builtin/add.c:149 builtin/commit.c:252
c04f5ac3
JX
1790msgid "updating files failed"
1791msgstr "更新文件失败"
1792
4dcdc3d8 1793#: builtin/add.c:163
c04f5ac3
JX
1794#, c-format
1795msgid "remove '%s'\n"
1796msgstr "删除 '%s'\n"
1797
4dcdc3d8 1798#: builtin/add.c:253
c04f5ac3 1799msgid "Unstaged changes after refreshing the index:"
90e6ef53 1800msgstr "刷新索引之后尚未被暂存的变更:"
c04f5ac3 1801
2e8451e8 1802#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337
c04f5ac3
JX
1803#, c-format
1804msgid "pathspec '%s' did not match any files"
1805msgstr "路径 '%s' 未匹配任何文件"
1806
4dcdc3d8 1807#: builtin/add.c:339
c04f5ac3 1808msgid "Could not read the index"
90e6ef53 1809msgstr "不能读取索引"
c04f5ac3 1810
2e8451e8 1811#: builtin/add.c:350
c04f5ac3
JX
1812#, c-format
1813msgid "Could not open '%s' for writing."
195febda 1814msgstr "不能打开 '%s' 以写入。"
c04f5ac3 1815
2e8451e8 1816#: builtin/add.c:354
c04f5ac3 1817msgid "Could not write patch"
195febda 1818msgstr "不能生成补丁"
c04f5ac3 1819
2e8451e8 1820#: builtin/add.c:359
c04f5ac3
JX
1821#, c-format
1822msgid "Could not stat '%s'"
90e6ef53 1823msgstr "不能查看文件状态 '%s'"
c04f5ac3 1824
2e8451e8 1825#: builtin/add.c:361
c04f5ac3
JX
1826msgid "Empty patch. Aborted."
1827msgstr "空补丁。异常终止。"
1828
2e8451e8 1829#: builtin/add.c:367
8ada9598
JX
1830#, c-format
1831msgid "Could not apply '%s'"
1832msgstr "不能应用 '%s'"
1833
2e8451e8 1834#: builtin/add.c:377
8ada9598 1835msgid "The following paths are ignored by one of your .gitignore files:\n"
195febda 1836msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
8ada9598 1837
b1894384 1838#: builtin/add.c:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63
2e8451e8
JX
1839#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253
1840#: builtin/rm.c:268
ef317cd5 1841msgid "dry run"
07432cef 1842msgstr "演习"
ef317cd5 1843
2e8451e8 1844#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19
b1894384 1845#: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613
2e8451e8 1846#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113
ef317cd5
JX
1847msgid "be verbose"
1848msgstr "冗长输出"
1849
2e8451e8 1850#: builtin/add.c:397
ef317cd5 1851msgid "interactive picking"
07432cef 1852msgstr "交互式拣选"
ef317cd5 1853
2e8451e8 1854#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261
ef317cd5 1855msgid "select hunks interactively"
07432cef 1856msgstr "交互式挑选数据块"
ef317cd5 1857
2e8451e8 1858#: builtin/add.c:399
ef317cd5 1859msgid "edit current diff and apply"
07432cef 1860msgstr "编辑当前差异并应用"
ef317cd5 1861
2e8451e8 1862#: builtin/add.c:400
ef317cd5 1863msgid "allow adding otherwise ignored files"
07432cef 1864msgstr "允许添加忽略的文件"
ef317cd5 1865
2e8451e8 1866#: builtin/add.c:401
ef317cd5 1867msgid "update tracked files"
07432cef 1868msgstr "更新已跟踪的文件"
ef317cd5 1869
2e8451e8 1870#: builtin/add.c:402
ef317cd5 1871msgid "record only the fact that the path will be added later"
07432cef 1872msgstr "只记录,该路径稍后再添加"
ef317cd5 1873
2e8451e8 1874#: builtin/add.c:403
ef317cd5 1875msgid "add changes from all tracked and untracked files"
07432cef 1876msgstr "添加所有改变的已跟踪文件和未跟踪文件"
ef317cd5 1877
4dcdc3d8 1878#. takes no arguments
2e8451e8 1879#: builtin/add.c:406
4dcdc3d8
JX
1880msgid "ignore paths removed in the working tree (same as --no-all)"
1881msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
1882
2e8451e8 1883#: builtin/add.c:408
ef317cd5 1884msgid "don't add, only refresh the index"
07432cef 1885msgstr "不添加,只刷新索引"
ef317cd5 1886
2e8451e8 1887#: builtin/add.c:409
ef317cd5 1888msgid "just skip files which cannot be added because of errors"
07432cef 1889msgstr "跳过因出错不能添加的文件"
ef317cd5 1890
2e8451e8 1891#: builtin/add.c:410
ef317cd5 1892msgid "check if - even missing - files are ignored in dry run"
07432cef 1893msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
ef317cd5 1894
2e8451e8 1895#: builtin/add.c:432
8ada9598
JX
1896#, c-format
1897msgid "Use -f if you really want to add them.\n"
1898msgstr "使用 -f 参数如果您确实要添加它们。\n"
1899
2e8451e8 1900#: builtin/add.c:433
8ada9598
JX
1901msgid "no files added"
1902msgstr "没有文件被添加"
1903
2e8451e8 1904#: builtin/add.c:439
8ada9598
JX
1905msgid "adding files failed"
1906msgstr "添加文件失败"
1907
2e8451e8 1908#: builtin/add.c:478
8ada9598
JX
1909msgid "-A and -u are mutually incompatible"
1910msgstr "-A 和 -u 选项互斥"
1911
2e8451e8 1912#: builtin/add.c:496
8ada9598 1913msgid "Option --ignore-missing can only be used together with --dry-run"
649900bc 1914msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
8ada9598 1915
2e8451e8 1916#: builtin/add.c:526
8ada9598
JX
1917#, c-format
1918msgid "Nothing specified, nothing added.\n"
1919msgstr "没有指定文件,也没有文件被添加。\n"
1920
2e8451e8 1921#: builtin/add.c:527
8ada9598
JX
1922#, c-format
1923msgid "Maybe you wanted to say 'git add .'?\n"
1924msgstr "也许您想要执行 'git add .'?\n"
1925
b1894384
JX
1926#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919
1927#: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297
8ada9598
JX
1928msgid "index file corrupt"
1929msgstr "索引文件损坏"
1930
2e8451e8 1931#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432
8ada9598
JX
1932msgid "Unable to write new index file"
1933msgstr "无法写入新索引文件"
1934
23ff3338 1935#: builtin/apply.c:57
8ada9598 1936msgid "git apply [options] [<patch>...]"
81809b99 1937msgstr "git apply [选项] [<补丁>...]"
8ada9598 1938
23ff3338 1939#: builtin/apply.c:110
81809b99 1940#, c-format
8ada9598 1941msgid "unrecognized whitespace option '%s'"
81809b99 1942msgstr "未能识别的空白字符选项 '%s'"
8ada9598 1943
23ff3338 1944#: builtin/apply.c:125
81809b99 1945#, c-format
8ada9598 1946msgid "unrecognized whitespace ignore option '%s'"
81809b99 1947msgstr "未能识别的空白字符忽略选项 '%s'"
8ada9598 1948
c160d03f 1949#: builtin/apply.c:823
8ada9598
JX
1950#, c-format
1951msgid "Cannot prepare timestamp regexp %s"
81809b99 1952msgstr "无法准备时间戳正则表达式 %s"
8ada9598 1953
c160d03f 1954#: builtin/apply.c:832
8ada9598
JX
1955#, c-format
1956msgid "regexec returned %d for input: %s"
81809b99 1957msgstr "regexec 返回 %d,输入为:%s"
8ada9598 1958
c160d03f 1959#: builtin/apply.c:913
81809b99 1960#, c-format
8ada9598 1961msgid "unable to find filename in patch at line %d"
81809b99 1962msgstr "不能在补丁的第 %d 行找到文件名"
8ada9598 1963
c160d03f 1964#: builtin/apply.c:945
8ada9598
JX
1965#, c-format
1966msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
9aafc933 1967msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
8ada9598 1968
c160d03f 1969#: builtin/apply.c:949
8ada9598
JX
1970#, c-format
1971msgid "git apply: bad git-diff - inconsistent new filename on line %d"
81809b99 1972msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
8ada9598 1973
c160d03f 1974#: builtin/apply.c:950
8ada9598
JX
1975#, c-format
1976msgid "git apply: bad git-diff - inconsistent old filename on line %d"
81809b99 1977msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
8ada9598 1978
c160d03f 1979#: builtin/apply.c:957
8ada9598
JX
1980#, c-format
1981msgid "git apply: bad git-diff - expected /dev/null on line %d"
9aafc933 1982msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
8ada9598 1983
a77c07d9 1984#: builtin/apply.c:1422
8ada9598
JX
1985#, c-format
1986msgid "recount: unexpected line: %.*s"
81809b99 1987msgstr "recount:意外的行:%.*s"
8ada9598 1988
a77c07d9 1989#: builtin/apply.c:1479
8ada9598
JX
1990#, c-format
1991msgid "patch fragment without header at line %d: %.*s"
81809b99 1992msgstr "第 %d 行的补丁片段没有头信息:%.*s"
8ada9598 1993
a77c07d9 1994#: builtin/apply.c:1496
8ada9598
JX
1995#, c-format
1996msgid ""
1997"git diff header lacks filename information when removing %d leading pathname "
1998"component (line %d)"
1999msgid_plural ""
2000"git diff header lacks filename information when removing %d leading pathname "
2001"components (line %d)"
5ae481e0
JX
2002msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
2003msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
8ada9598 2004
a77c07d9 2005#: builtin/apply.c:1656
8ada9598 2006msgid "new file depends on old contents"
81809b99 2007msgstr "新文件依赖旧内容"
8ada9598 2008
a77c07d9 2009#: builtin/apply.c:1658
8ada9598 2010msgid "deleted file still has contents"
81809b99 2011msgstr "删除的文件仍有内容"
8ada9598 2012
a77c07d9 2013#: builtin/apply.c:1684
8ada9598
JX
2014#, c-format
2015msgid "corrupt patch at line %d"
195febda 2016msgstr "补丁在第 %d 行损坏"
8ada9598 2017
a77c07d9 2018#: builtin/apply.c:1720
8ada9598
JX
2019#, c-format
2020msgid "new file %s depends on old contents"
81809b99 2021msgstr "新文件 %s 依赖旧内容"
8ada9598 2022
a77c07d9 2023#: builtin/apply.c:1722
8ada9598
JX
2024#, c-format
2025msgid "deleted file %s still has contents"
81809b99 2026msgstr "删除的文件 %s 仍有内容"
8ada9598 2027
a77c07d9 2028#: builtin/apply.c:1725
8ada9598
JX
2029#, c-format
2030msgid "** warning: file %s becomes empty but is not deleted"
81809b99 2031msgstr "** 警告:文件 %s 成为空文件但并未删除"
8ada9598 2032
a77c07d9 2033#: builtin/apply.c:1871
8ada9598
JX
2034#, c-format
2035msgid "corrupt binary patch at line %d: %.*s"
81809b99 2036msgstr "二进制补丁在第 %d 行损坏:%.*s"
8ada9598
JX
2037
2038#. there has to be one hunk (forward hunk)
a77c07d9 2039#: builtin/apply.c:1900
8ada9598
JX
2040#, c-format
2041msgid "unrecognized binary patch at line %d"
81809b99 2042msgstr "未能识别的二进制补丁位于第 %d 行"
8ada9598 2043
a77c07d9 2044#: builtin/apply.c:1986
8ada9598
JX
2045#, c-format
2046msgid "patch with only garbage at line %d"
81809b99 2047msgstr "补丁文件的第 %d 行只有垃圾数据"
8ada9598 2048
a77c07d9 2049#: builtin/apply.c:2076
81809b99 2050#, c-format
8ada9598 2051msgid "unable to read symlink %s"
81809b99 2052msgstr "无法读取符号链接 %s"
8ada9598 2053
a77c07d9 2054#: builtin/apply.c:2080
81809b99 2055#, c-format
8ada9598 2056msgid "unable to open or read %s"
81809b99 2057msgstr "不能打开或读取 %s"
8ada9598 2058
1003b3a5 2059#: builtin/apply.c:2688
81809b99 2060#, c-format
8ada9598 2061msgid "invalid start of line: '%c'"
81809b99 2062msgstr "无效的行首字符:'%c'"
8ada9598 2063
1003b3a5 2064#: builtin/apply.c:2806
8ada9598
JX
2065#, c-format
2066msgid "Hunk #%d succeeded at %d (offset %d line)."
2067msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
07432cef
WS
2068msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)"
2069msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)"
8ada9598 2070
1003b3a5 2071#: builtin/apply.c:2818
8ada9598
JX
2072#, c-format
2073msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
81809b99 2074msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
8ada9598 2075
1003b3a5 2076#: builtin/apply.c:2824
8ada9598
JX
2077#, c-format
2078msgid ""
2079"while searching for:\n"
2080"%.*s"
2081msgstr ""
81809b99
JX
2082"当查询:\n"
2083"%.*s"
8ada9598 2084
1003b3a5 2085#: builtin/apply.c:2843
8ada9598
JX
2086#, c-format
2087msgid "missing binary patch data for '%s'"
81809b99 2088msgstr "缺失 '%s' 的二进制补丁数据"
8ada9598 2089
1003b3a5 2090#: builtin/apply.c:2946
8ada9598
JX
2091#, c-format
2092msgid "binary patch does not apply to '%s'"
81809b99 2093msgstr "二进制补丁未应用到 '%s'"
8ada9598 2094
1003b3a5 2095#: builtin/apply.c:2952
8ada9598
JX
2096#, c-format
2097msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
9aafc933 2098msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
8ada9598 2099
1003b3a5 2100#: builtin/apply.c:2973
8ada9598
JX
2101#, c-format
2102msgid "patch failed: %s:%ld"
81809b99 2103msgstr "打补丁失败:%s:%ld"
8ada9598 2104
1003b3a5 2105#: builtin/apply.c:3095
8ada9598 2106#, c-format
23ff3338
JX
2107msgid "cannot checkout %s"
2108msgstr "不能检出 %s"
8ada9598 2109
2e8451e8 2110#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194
81809b99 2111#, c-format
8ada9598 2112msgid "read of %s failed"
81809b99 2113msgstr "读取 %s 失败"
8ada9598 2114
2e8451e8 2115#: builtin/apply.c:3174 builtin/apply.c:3396
81809b99 2116#, c-format
23ff3338
JX
2117msgid "path %s has been renamed/deleted"
2118msgstr "路径 %s 已经被重命名/删除"
8ada9598 2119
2e8451e8 2120#: builtin/apply.c:3255 builtin/apply.c:3410
8ada9598 2121#, c-format
23ff3338
JX
2122msgid "%s: does not exist in index"
2123msgstr "%s:不存在于索引中"
8ada9598 2124
2e8451e8 2125#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424
81809b99 2126#, c-format
8ada9598 2127msgid "%s: %s"
81809b99 2128msgstr "%s:%s"
8ada9598 2129
2e8451e8 2130#: builtin/apply.c:3264 builtin/apply.c:3418
81809b99 2131#, c-format
8ada9598 2132msgid "%s: does not match index"
81809b99 2133msgstr "%s:和索引不匹配"
8ada9598 2134
2e8451e8 2135#: builtin/apply.c:3366
23ff3338
JX
2136msgid "removal patch leaves file contents"
2137msgstr "移除补丁仍留下了文件内容"
2138
2e8451e8 2139#: builtin/apply.c:3435
8ada9598
JX
2140#, c-format
2141msgid "%s: wrong type"
81809b99 2142msgstr "%s:错误类型"
8ada9598 2143
2e8451e8 2144#: builtin/apply.c:3437
8ada9598
JX
2145#, c-format
2146msgid "%s has type %o, expected %o"
9aafc933 2147msgstr "%s 的类型是 %o,应为 %o"
8ada9598 2148
2e8451e8 2149#: builtin/apply.c:3538
81809b99 2150#, c-format
8ada9598 2151msgid "%s: already exists in index"
81809b99 2152msgstr "%s:已经存在于索引中"
8ada9598 2153
2e8451e8 2154#: builtin/apply.c:3541
23ff3338
JX
2155#, c-format
2156msgid "%s: already exists in working directory"
2157msgstr "%s:已经存在于工作区中"
2158
2e8451e8 2159#: builtin/apply.c:3561
d691f479
JX
2160#, c-format
2161msgid "new mode (%o) of %s does not match old mode (%o)"
2162msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
8ada9598 2163
2e8451e8 2164#: builtin/apply.c:3566
8ada9598 2165#, c-format
d691f479
JX
2166msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2167msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
2168
2e8451e8 2169#: builtin/apply.c:3574
d691f479 2170#, c-format
8ada9598 2171msgid "%s: patch does not apply"
81809b99 2172msgstr "%s:补丁未应用"
8ada9598 2173
2e8451e8 2174#: builtin/apply.c:3587
8ada9598
JX
2175#, c-format
2176msgid "Checking patch %s..."
81809b99 2177msgstr "检查补丁 %s..."
8ada9598 2178
2e8451e8 2179#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127
8ada9598
JX
2180#, c-format
2181msgid "make_cache_entry failed for path '%s'"
2182msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2183
2e8451e8 2184#: builtin/apply.c:3823
81809b99 2185#, c-format
8ada9598 2186msgid "unable to remove %s from index"
81809b99 2187msgstr "不能从索引中移除 %s"
8ada9598 2188
2e8451e8 2189#: builtin/apply.c:3851
8ada9598 2190#, c-format
2e8451e8
JX
2191msgid "corrupt patch for submodule %s"
2192msgstr "子模组 %s 损坏的补丁"
8ada9598 2193
2e8451e8 2194#: builtin/apply.c:3855
81809b99 2195#, c-format
8ada9598 2196msgid "unable to stat newly created file '%s'"
81809b99 2197msgstr "不能枚举新建文件 '%s' 的状态"
8ada9598 2198
2e8451e8 2199#: builtin/apply.c:3860
8ada9598
JX
2200#, c-format
2201msgid "unable to create backing store for newly created file %s"
81809b99 2202msgstr "不能为新建文件 %s 创建后端存储"
8ada9598 2203
2e8451e8 2204#: builtin/apply.c:3863 builtin/apply.c:3971
81809b99 2205#, c-format
8ada9598 2206msgid "unable to add cache entry for %s"
81809b99 2207msgstr "无法为 %s 添加缓存条目"
8ada9598 2208
2e8451e8 2209#: builtin/apply.c:3896
81809b99 2210#, c-format
8ada9598 2211msgid "closing file '%s'"
81809b99 2212msgstr "关闭文件 '%s'"
8ada9598 2213
2e8451e8 2214#: builtin/apply.c:3945
81809b99 2215#, c-format
8ada9598 2216msgid "unable to write file '%s' mode %o"
81809b99 2217msgstr "不能写文件 '%s' 权限 %o"
8ada9598 2218
2e8451e8 2219#: builtin/apply.c:4032
8ada9598
JX
2220#, c-format
2221msgid "Applied patch %s cleanly."
81809b99 2222msgstr "成功应用补丁 %s。"
8ada9598 2223
2e8451e8 2224#: builtin/apply.c:4040
8ada9598 2225msgid "internal error"
81809b99 2226msgstr "内部错误"
8ada9598
JX
2227
2228#. Say this even without --verbose
2e8451e8 2229#: builtin/apply.c:4043
8ada9598
JX
2230#, c-format
2231msgid "Applying patch %%s with %d reject..."
2232msgid_plural "Applying patch %%s with %d rejects..."
195febda
T
2233msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
2234msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
8ada9598 2235
2e8451e8 2236#: builtin/apply.c:4053
8ada9598
JX
2237#, c-format
2238msgid "truncating .rej filename to %.*s.rej"
81809b99 2239msgstr "截短 .rej 文件名为 %.*s.rej"
8ada9598 2240
2e8451e8 2241#: builtin/apply.c:4074
8ada9598
JX
2242#, c-format
2243msgid "Hunk #%d applied cleanly."
81809b99 2244msgstr "第 #%d 个片段成功应用。"
8ada9598 2245
2e8451e8 2246#: builtin/apply.c:4077
8ada9598
JX
2247#, c-format
2248msgid "Rejected hunk #%d."
81809b99 2249msgstr "拒绝第 #%d 个片段。"
8ada9598 2250
2e8451e8 2251#: builtin/apply.c:4227
8ada9598 2252msgid "unrecognized input"
81809b99 2253msgstr "未能识别的输入"
8ada9598 2254
2e8451e8 2255#: builtin/apply.c:4238
8ada9598 2256msgid "unable to read index file"
81809b99 2257msgstr "无法读取索引文件"
8ada9598 2258
2e8451e8 2259#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91
ef317cd5 2260#: builtin/fetch.c:63
8ada9598 2261msgid "path"
81809b99 2262msgstr "路径"
8ada9598 2263
2e8451e8 2264#: builtin/apply.c:4358
8ada9598 2265msgid "don't apply changes matching the given path"
81809b99 2266msgstr "不要应用与给出路径向匹配的变更"
8ada9598 2267
2e8451e8 2268#: builtin/apply.c:4361
8ada9598 2269msgid "apply changes matching the given path"
81809b99 2270msgstr "应用与给出路径向匹配的变更"
8ada9598 2271
2e8451e8 2272#: builtin/apply.c:4363
8ada9598 2273msgid "num"
81809b99 2274msgstr "数字"
8ada9598 2275
2e8451e8 2276#: builtin/apply.c:4364
8ada9598 2277msgid "remove <num> leading slashes from traditional diff paths"
07432cef 2278msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
8ada9598 2279
2e8451e8 2280#: builtin/apply.c:4367
8ada9598 2281msgid "ignore additions made by the patch"
81809b99 2282msgstr "忽略补丁中的添加的文件"
8ada9598 2283
2e8451e8 2284#: builtin/apply.c:4369
8ada9598 2285msgid "instead of applying the patch, output diffstat for the input"
81809b99 2286msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
8ada9598 2287
2e8451e8 2288#: builtin/apply.c:4373
ef317cd5 2289msgid "show number of added and deleted lines in decimal notation"
07432cef 2290msgstr "以十进制数显示添加和删除的行数"
8ada9598 2291
2e8451e8 2292#: builtin/apply.c:4375
8ada9598 2293msgid "instead of applying the patch, output a summary for the input"
81809b99 2294msgstr "不应用补丁,而是显示输入的概要"
8ada9598 2295
2e8451e8 2296#: builtin/apply.c:4377
8ada9598 2297msgid "instead of applying the patch, see if the patch is applicable"
81809b99 2298msgstr "不应用补丁,而是查看补丁是否可应用"
8ada9598 2299
2e8451e8 2300#: builtin/apply.c:4379
8ada9598 2301msgid "make sure the patch is applicable to the current index"
81809b99 2302msgstr "确认补丁可以应用到当前索引"
8ada9598 2303
2e8451e8 2304#: builtin/apply.c:4381
8ada9598 2305msgid "apply a patch without touching the working tree"
81809b99 2306msgstr "应用补丁而不修改工作区"
8ada9598 2307
2e8451e8 2308#: builtin/apply.c:4383
8ada9598 2309msgid "also apply the patch (use with --stat/--summary/--check)"
195febda 2310msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
8ada9598 2311
2e8451e8 2312#: builtin/apply.c:4385
23ff3338
JX
2313msgid "attempt three-way merge if a patch does not apply"
2314msgstr "如果一个补丁不能应用则尝试三路合并"
2315
2e8451e8 2316#: builtin/apply.c:4387
8ada9598 2317msgid "build a temporary index based on embedded index information"
81809b99 2318msgstr "创建一个临时索引基于嵌入的索引信息"
8ada9598 2319
2e8451e8 2320#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462
8ada9598 2321msgid "paths are separated with NUL character"
81809b99 2322msgstr "路径以 NUL 字符分隔"
8ada9598 2323
2e8451e8 2324#: builtin/apply.c:4392
8ada9598 2325msgid "ensure at least <n> lines of context match"
81809b99 2326msgstr "确保至少匹配 <n> 行上下文"
8ada9598 2327
2e8451e8 2328#: builtin/apply.c:4393
8ada9598 2329msgid "action"
81809b99 2330msgstr "动作"
8ada9598 2331
2e8451e8 2332#: builtin/apply.c:4394
8ada9598 2333msgid "detect new or modified lines that have whitespace errors"
81809b99 2334msgstr "检查新增和修改的行中间的空白字符滥用"
8ada9598 2335
2e8451e8 2336#: builtin/apply.c:4397 builtin/apply.c:4400
8ada9598 2337msgid "ignore changes in whitespace when finding context"
81809b99 2338msgstr "查找上下文时忽略空白字符的变更"
8ada9598 2339
2e8451e8 2340#: builtin/apply.c:4403
8ada9598 2341msgid "apply the patch in reverse"
81809b99 2342msgstr "反向应用补丁"
8ada9598 2343
2e8451e8 2344#: builtin/apply.c:4405
8ada9598 2345msgid "don't expect at least one line of context"
81809b99 2346msgstr "无需至少一行上下文"
8ada9598 2347
2e8451e8 2348#: builtin/apply.c:4407
8ada9598 2349msgid "leave the rejected hunks in corresponding *.rej files"
81809b99 2350msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
8ada9598 2351
2e8451e8 2352#: builtin/apply.c:4409
8ada9598 2353msgid "allow overlapping hunks"
81809b99 2354msgstr "允许重叠的补丁片段"
8ada9598 2355
2e8451e8 2356#: builtin/apply.c:4412
8ada9598 2357msgid "tolerate incorrectly detected missing new-line at the end of file"
195febda 2358msgstr "允许不正确的文件末尾换行符"
c04f5ac3 2359
2e8451e8 2360#: builtin/apply.c:4415
8ada9598 2361msgid "do not trust the line counts in the hunk headers"
81809b99 2362msgstr "不信任补丁片段的头信息中的行号"
c04f5ac3 2363
2e8451e8 2364#: builtin/apply.c:4417
8ada9598 2365msgid "root"
81809b99 2366msgstr "根目录"
c04f5ac3 2367
2e8451e8 2368#: builtin/apply.c:4418
8ada9598 2369msgid "prepend <root> to all filenames"
81809b99 2370msgstr "为所有文件名前添加 <根目录>"
c04f5ac3 2371
2e8451e8 2372#: builtin/apply.c:4440
23ff3338
JX
2373msgid "--3way outside a repository"
2374msgstr "--3way 在一个版本库之外"
2375
2e8451e8 2376#: builtin/apply.c:4448
8ada9598 2377msgid "--index outside a repository"
81809b99 2378msgstr "--index 在一个版本库之外"
c04f5ac3 2379
2e8451e8 2380#: builtin/apply.c:4451
8ada9598 2381msgid "--cached outside a repository"
81809b99 2382msgstr "--cached 在一个版本库之外"
c04f5ac3 2383
2e8451e8 2384#: builtin/apply.c:4467
81809b99 2385#, c-format
8ada9598 2386msgid "can't open patch '%s'"
81809b99 2387msgstr "不能打开补丁 '%s'"
c04f5ac3 2388
2e8451e8 2389#: builtin/apply.c:4481
c04f5ac3 2390#, c-format
8ada9598
JX
2391msgid "squelched %d whitespace error"
2392msgid_plural "squelched %d whitespace errors"
81809b99 2393msgstr[0] "抑制下仍有 %d 个空白字符误用"
5ae481e0 2394msgstr[1] "抑制下仍有 %d 个空白字符误用"
c04f5ac3 2395
2e8451e8 2396#: builtin/apply.c:4487 builtin/apply.c:4497
8ada9598
JX
2397#, c-format
2398msgid "%d line adds whitespace errors."
2399msgid_plural "%d lines add whitespace errors."
81809b99 2400msgstr[0] "%d 行有空白字符误用。"
5ae481e0 2401msgstr[1] "%d 行有空白字符误用。"
c04f5ac3
JX
2402
2403#: builtin/archive.c:17
2404#, c-format
2405msgid "could not create archive file '%s'"
90e6ef53 2406msgstr "不能创建归档文件 '%s'"
c04f5ac3
JX
2407
2408#: builtin/archive.c:20
2409msgid "could not redirect output"
195febda 2410msgstr "不能重定向输出"
c04f5ac3
JX
2411
2412#: builtin/archive.c:37
2413msgid "git archive: Remote with no URL"
90e6ef53 2414msgstr "git archive:未提供远程URL"
c04f5ac3
JX
2415
2416#: builtin/archive.c:58
2417msgid "git archive: expected ACK/NAK, got EOF"
9aafc933 2418msgstr "git archive:应为ACK/NACK,却得到EOF"
c04f5ac3 2419
1003b3a5 2420#: builtin/archive.c:61
c04f5ac3
JX
2421#, c-format
2422msgid "git archive: NACK %s"
90e6ef53 2423msgstr "git archive:NACK %s"
c04f5ac3 2424
1003b3a5 2425#: builtin/archive.c:63
c04f5ac3
JX
2426#, c-format
2427msgid "remote error: %s"
2428msgstr "远程错误:%s"
2429
1003b3a5 2430#: builtin/archive.c:64
c04f5ac3 2431msgid "git archive: protocol error"
90e6ef53 2432msgstr "git archive:协议错误"
c04f5ac3 2433
1003b3a5 2434#: builtin/archive.c:68
c04f5ac3 2435msgid "git archive: expected a flush"
195febda 2436msgstr "git archive:应为刷新"
c04f5ac3 2437
ef317cd5
JX
2438#: builtin/bisect--helper.c:7
2439msgid "git bisect--helper --next-all [--no-checkout]"
07432cef 2440msgstr "git bisect--helper --next-all [--no-checkout]"
ef317cd5
JX
2441
2442#: builtin/bisect--helper.c:17
2443msgid "perform 'git bisect next'"
07432cef 2444msgstr "执行 'git bisect next'"
ef317cd5
JX
2445
2446#: builtin/bisect--helper.c:19
2447msgid "update BISECT_HEAD instead of checking out the current commit"
07432cef 2448msgstr "更新 BISECT_HEAD 而非检出当前提交"
ef317cd5 2449
2e8451e8 2450#: builtin/blame.c:26
ef317cd5 2451msgid "git blame [options] [rev-opts] [rev] [--] file"
07432cef 2452msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
ef317cd5 2453
2e8451e8 2454#: builtin/blame.c:31
ef317cd5 2455msgid "[rev-opts] are documented in git-rev-list(1)"
07432cef 2456msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
ef317cd5 2457
2e8451e8 2458#: builtin/blame.c:2276
ef317cd5 2459msgid "Show blame entries as we find them, incrementally"
07432cef 2460msgstr "增量式地显示发现的 blame 条目"
ef317cd5 2461
2e8451e8 2462#: builtin/blame.c:2277
ef317cd5 2463msgid "Show blank SHA-1 for boundary commits (Default: off)"
07432cef 2464msgstr "边界提交显示空的 SHA-1(默认:关闭)"
ef317cd5 2465
2e8451e8 2466#: builtin/blame.c:2278
ef317cd5 2467msgid "Do not treat root commits as boundaries (Default: off)"
07432cef 2468msgstr "不把根提交作为边界(默认:关闭)"
ef317cd5 2469
2e8451e8 2470#: builtin/blame.c:2279
ef317cd5 2471msgid "Show work cost statistics"
07432cef 2472msgstr "显示命令消耗统计"
ef317cd5 2473
2e8451e8 2474#: builtin/blame.c:2280
ef317cd5 2475msgid "Show output score for blame entries"
07432cef 2476msgstr "显示判断 blame 条目位移的得分诊断信息"
ef317cd5 2477
2e8451e8 2478#: builtin/blame.c:2281
ef317cd5 2479msgid "Show original filename (Default: auto)"
07432cef 2480msgstr "显示原始文件名(默认:自动)"
ef317cd5 2481
2e8451e8 2482#: builtin/blame.c:2282
ef317cd5 2483msgid "Show original linenumber (Default: off)"
07432cef 2484msgstr "显示原始的行号(默认:关闭)"
ef317cd5 2485
2e8451e8 2486#: builtin/blame.c:2283
ef317cd5 2487msgid "Show in a format designed for machine consumption"
07432cef 2488msgstr "显示为一个适合机器读取的格式"
ef317cd5 2489
2e8451e8 2490#: builtin/blame.c:2284
ef317cd5 2491msgid "Show porcelain format with per-line commit information"
07432cef 2492msgstr "为每一行显示机器适用的提交信息"
ef317cd5 2493
2e8451e8 2494#: builtin/blame.c:2285
ef317cd5 2495msgid "Use the same output mode as git-annotate (Default: off)"
07432cef 2496msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
ef317cd5 2497
2e8451e8 2498#: builtin/blame.c:2286
ef317cd5 2499msgid "Show raw timestamp (Default: off)"
07432cef 2500msgstr "显示原始时间戳(默认:关闭)"
ef317cd5 2501
2e8451e8 2502#: builtin/blame.c:2287
ef317cd5 2503msgid "Show long commit SHA1 (Default: off)"
07432cef 2504msgstr "显示长的SHA1提交号(默认:关闭)"
ef317cd5 2505
2e8451e8 2506#: builtin/blame.c:2288
ef317cd5 2507msgid "Suppress author name and timestamp (Default: off)"
07432cef 2508msgstr "隐藏作者名字和时间戳(默认:关闭)"
ef317cd5 2509
2e8451e8 2510#: builtin/blame.c:2289
ef317cd5 2511msgid "Show author email instead of name (Default: off)"
07432cef 2512msgstr "显示作者的邮箱而不是名字(默认:关闭)"
ef317cd5 2513
2e8451e8 2514#: builtin/blame.c:2290
ef317cd5 2515msgid "Ignore whitespace differences"
07432cef 2516msgstr "忽略空白差异"
ef317cd5 2517
2e8451e8 2518#: builtin/blame.c:2291
ef317cd5 2519msgid "Spend extra cycles to find better match"
07432cef 2520msgstr "花费额外的循环来找到更好的匹配"
ef317cd5 2521
2e8451e8 2522#: builtin/blame.c:2292
ef317cd5 2523msgid "Use revisions from <file> instead of calling git-rev-list"
07432cef 2524msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"
ef317cd5 2525
2e8451e8 2526#: builtin/blame.c:2293
ef317cd5 2527msgid "Use <file>'s contents as the final image"
07432cef 2528msgstr "使用 <file> 的内容作为最终的图片"
ef317cd5 2529
2e8451e8 2530#: builtin/blame.c:2294 builtin/blame.c:2295
ef317cd5 2531msgid "score"
07432cef 2532msgstr "得分"
ef317cd5 2533
2e8451e8 2534#: builtin/blame.c:2294
ef317cd5 2535msgid "Find line copies within and across files"
07432cef 2536msgstr "找到文件内及跨文件的行拷贝"
ef317cd5 2537
2e8451e8 2538#: builtin/blame.c:2295
ef317cd5 2539msgid "Find line movements within and across files"
07432cef 2540msgstr "找到文件内及跨文件的行移动"
ef317cd5 2541
2e8451e8 2542#: builtin/blame.c:2296
ef317cd5 2543msgid "n,m"
07432cef 2544msgstr "n,m"
ef317cd5 2545
2e8451e8 2546#: builtin/blame.c:2296
ef317cd5 2547msgid "Process only line range n,m, counting from 1"
07432cef 2548msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
ef317cd5 2549
1003b3a5 2550#: builtin/branch.c:24
ef317cd5 2551msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
07432cef 2552msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
ef317cd5 2553
1003b3a5 2554#: builtin/branch.c:25
ef317cd5 2555msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
07432cef 2556msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
ef317cd5 2557
1003b3a5 2558#: builtin/branch.c:26
ef317cd5 2559msgid "git branch [options] [-r] (-d | -D) <branchname>..."
07432cef 2560msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
ef317cd5 2561
1003b3a5 2562#: builtin/branch.c:27
ef317cd5 2563msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
07432cef 2564msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
ef317cd5 2565
90e6ef53 2566# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
4dcdc3d8 2567#: builtin/branch.c:150
c04f5ac3
JX
2568#, c-format
2569msgid ""
2570"deleting branch '%s' that has been merged to\n"
2571" '%s', but not yet merged to HEAD."
2572msgstr ""
70fc47bf 2573"将要删除的分支 '%s' 已经被合并到\n"
c04f5ac3
JX
2574" '%s',但未合并到 HEAD。"
2575
90e6ef53 2576# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
4dcdc3d8 2577#: builtin/branch.c:154
c04f5ac3
JX
2578#, c-format
2579msgid ""
2580"not deleting branch '%s' that is not yet merged to\n"
2581" '%s', even though it is merged to HEAD."
2582msgstr ""
70fc47bf
T
2583"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
2584" 然而却尚未被合并到分支 '%s' 。"
c04f5ac3 2585
4dcdc3d8 2586#: builtin/branch.c:168
07432cef
WS
2587#, c-format
2588msgid "Couldn't look up commit object for '%s'"
2589msgstr "无法查询 '%s' 指向的提交对象"
2590
4dcdc3d8 2591#: builtin/branch.c:172
07432cef
WS
2592#, c-format
2593msgid ""
2594"The branch '%s' is not fully merged.\n"
2595"If you are sure you want to delete it, run 'git branch -D %s'."
2596msgstr ""
2597"分支 '%s' 没有完全合并。\n"
2598"如果您确认要删除它,执行 'git branch -D %s'。"
2599
4dcdc3d8 2600#: builtin/branch.c:185
07432cef
WS
2601msgid "Update of config-file failed"
2602msgstr "无法更新 config 文件"
2603
4dcdc3d8 2604#: builtin/branch.c:213
c04f5ac3 2605msgid "cannot use -a with -d"
649900bc 2606msgstr "不能将 -a 和 -d 同时使用"
c04f5ac3 2607
4dcdc3d8 2608#: builtin/branch.c:219
c04f5ac3
JX
2609msgid "Couldn't look up commit object for HEAD"
2610msgstr "无法查询 HEAD 指向的提交对象"
2611
4dcdc3d8 2612#: builtin/branch.c:227
c04f5ac3
JX
2613#, c-format
2614msgid "Cannot delete the branch '%s' which you are currently on."
2615msgstr "无法删除您当前所在的分支 '%s'。"
2616
4dcdc3d8 2617#: builtin/branch.c:240
5ae481e0 2618#, c-format
8ada9598 2619msgid "remote branch '%s' not found."
81809b99 2620msgstr "远程分支 '%s' 未发现。"
c04f5ac3 2621
4dcdc3d8 2622#: builtin/branch.c:241
81809b99 2623#, c-format
8ada9598 2624msgid "branch '%s' not found."
81809b99 2625msgstr "分支 '%s' 未发现。"
8ada9598 2626
4dcdc3d8 2627#: builtin/branch.c:255
81809b99 2628#, c-format
8ada9598 2629msgid "Error deleting remote branch '%s'"
81809b99 2630msgstr "删除远程分支 '%s' 时出错"
c04f5ac3 2631
4dcdc3d8 2632#: builtin/branch.c:256
81809b99 2633#, c-format
8ada9598 2634msgid "Error deleting branch '%s'"
81809b99 2635msgstr "删除分支 '%s' 时出错"
8ada9598 2636
4dcdc3d8 2637#: builtin/branch.c:263
81809b99 2638#, c-format
8ada9598 2639msgid "Deleted remote branch %s (was %s).\n"
81809b99 2640msgstr "已删除远程分支 %s(曾为 %s)。\n"
c04f5ac3 2641
4dcdc3d8 2642#: builtin/branch.c:264
81809b99 2643#, c-format
8ada9598 2644msgid "Deleted branch %s (was %s).\n"
81809b99 2645msgstr "已删除分支 %s(曾为 %s)。\n"
8ada9598 2646
4dcdc3d8 2647#: builtin/branch.c:366
c04f5ac3
JX
2648#, c-format
2649msgid "branch '%s' does not point at a commit"
2650msgstr "分支 '%s' 未指向一个提交"
2651
4dcdc3d8 2652#: builtin/branch.c:453
81809b99 2653#, c-format
8ada9598 2654msgid "[%s: behind %d]"
81809b99 2655msgstr "[%s:落后 %d]"
c04f5ac3 2656
4dcdc3d8 2657#: builtin/branch.c:455
81809b99 2658#, c-format
8ada9598 2659msgid "[behind %d]"
81809b99 2660msgstr "[落后 %d]"
8ada9598 2661
4dcdc3d8 2662#: builtin/branch.c:459
81809b99 2663#, c-format
8ada9598 2664msgid "[%s: ahead %d]"
81809b99 2665msgstr "[%s:领先 %d]"
c04f5ac3 2666
4dcdc3d8 2667#: builtin/branch.c:461
81809b99 2668#, c-format
8ada9598 2669msgid "[ahead %d]"
81809b99 2670msgstr "[领先 %d]"
8ada9598 2671
4dcdc3d8 2672#: builtin/branch.c:464
81809b99 2673#, c-format
8ada9598 2674msgid "[%s: ahead %d, behind %d]"
81809b99 2675msgstr "[%s:领先 %d,落后 %d]"
8ada9598 2676
4dcdc3d8 2677#: builtin/branch.c:467
81809b99 2678#, c-format
8ada9598 2679msgid "[ahead %d, behind %d]"
81809b99 2680msgstr "[领先 %d,落后 %d]"
c04f5ac3 2681
4dcdc3d8 2682#: builtin/branch.c:490
a77c07d9
JX
2683msgid " **** invalid ref ****"
2684msgstr " **** 无效引用 ****"
2685
4dcdc3d8 2686#: builtin/branch.c:582
1003b3a5
JX
2687#, c-format
2688msgid "(no branch, rebasing %s)"
2689msgstr "(非分支,正变基 %s)"
2690
4dcdc3d8 2691#: builtin/branch.c:585
1003b3a5
JX
2692#, c-format
2693msgid "(no branch, bisect started on %s)"
2694msgstr "(非分支,二分查找开始于 %s)"
2695
4dcdc3d8 2696#: builtin/branch.c:588
1003b3a5
JX
2697#, c-format
2698msgid "(detached from %s)"
2699msgstr "(分离自 %s)"
2700
4dcdc3d8 2701#: builtin/branch.c:591
c04f5ac3
JX
2702msgid "(no branch)"
2703msgstr "(非分支)"
2704
4dcdc3d8 2705#: builtin/branch.c:637
a77c07d9
JX
2706#, c-format
2707msgid "object '%s' does not point to a commit"
2708msgstr "对象 '%s' 没有指向一个提交"
2709
4dcdc3d8 2710#: builtin/branch.c:669
c04f5ac3 2711msgid "some refs could not be read"
90e6ef53 2712msgstr "一些引用不能读取"
c04f5ac3 2713
4dcdc3d8 2714#: builtin/branch.c:682
c04f5ac3 2715msgid "cannot rename the current branch while not on any."
90e6ef53 2716msgstr "无法重命名当前分支因为不处于任何分支上。"
c04f5ac3 2717
4dcdc3d8 2718#: builtin/branch.c:692
c04f5ac3
JX
2719#, c-format
2720msgid "Invalid branch name: '%s'"
2721msgstr "无效的分支名:'%s'"
2722
4dcdc3d8 2723#: builtin/branch.c:707
c04f5ac3
JX
2724msgid "Branch rename failed"
2725msgstr "分支重命名失败"
2726
4dcdc3d8 2727#: builtin/branch.c:711
c04f5ac3
JX
2728#, c-format
2729msgid "Renamed a misnamed branch '%s' away"
2730msgstr "重命名掉一个错误命名的旧分支 '%s'"
2731
4dcdc3d8 2732#: builtin/branch.c:715
c04f5ac3
JX
2733#, c-format
2734msgid "Branch renamed to %s, but HEAD is not updated!"
2735msgstr "分支重命名为 %s,但 HEAD 没有更新!"
2736
4dcdc3d8 2737#: builtin/branch.c:722
c04f5ac3
JX
2738msgid "Branch is renamed, but update of config-file failed"
2739msgstr "分支被重命名,但更新 config 文件失败"
2740
4dcdc3d8 2741#: builtin/branch.c:737
c04f5ac3
JX
2742#, c-format
2743msgid "malformed object name %s"
2744msgstr "非法的对象名 %s"
2745
4dcdc3d8 2746#: builtin/branch.c:761
81809b99 2747#, c-format
8ada9598 2748msgid "could not write branch description template: %s"
81809b99 2749msgstr "不能写分支描述模版:%s"
c04f5ac3 2750
4dcdc3d8 2751#: builtin/branch.c:791
ef317cd5 2752msgid "Generic options"
07432cef 2753msgstr "通用选项"
c04f5ac3 2754
4dcdc3d8 2755#: builtin/branch.c:793
ef317cd5 2756msgid "show hash and subject, give twice for upstream branch"
07432cef 2757msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
c04f5ac3 2758
4dcdc3d8 2759#: builtin/branch.c:794
ef317cd5 2760msgid "suppress informational messages"
07432cef 2761msgstr "不显示信息"
8ada9598 2762
4dcdc3d8 2763#: builtin/branch.c:795
ef317cd5 2764msgid "set up tracking mode (see git-pull(1))"
07432cef 2765msgstr "设置跟踪模式(参见 git-pull(1))"
c04f5ac3 2766
4dcdc3d8 2767#: builtin/branch.c:797
ef317cd5 2768msgid "change upstream info"
07432cef 2769msgstr "改变上游信息"
c04f5ac3 2770
4dcdc3d8 2771#: builtin/branch.c:801
ef317cd5 2772msgid "use colored output"
07432cef 2773msgstr "使用彩色输出"
c04f5ac3 2774
4dcdc3d8 2775#: builtin/branch.c:802
ef317cd5 2776msgid "act on remote-tracking branches"
07432cef 2777msgstr "作用于远程跟踪分支"
c04f5ac3 2778
4dcdc3d8 2779#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
b1894384
JX
2780#: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434
2781#: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468
ef317cd5 2782msgid "commit"
07432cef 2783msgstr "提交"
c04f5ac3 2784
4dcdc3d8 2785#: builtin/branch.c:806 builtin/branch.c:812
ef317cd5 2786msgid "print only branches that contain the commit"
07432cef 2787msgstr "只打印包含该提交的分支"
c04f5ac3 2788
4dcdc3d8 2789#: builtin/branch.c:818
ef317cd5 2790msgid "Specific git-branch actions:"
07432cef 2791msgstr "具体的 git-branch 动作:"
c04f5ac3 2792
4dcdc3d8 2793#: builtin/branch.c:819
ef317cd5 2794msgid "list both remote-tracking and local branches"
07432cef 2795msgstr "列出远程跟踪及本地分支"
c04f5ac3 2796
4dcdc3d8 2797#: builtin/branch.c:821
ef317cd5 2798msgid "delete fully merged branch"
07432cef 2799msgstr "删除完全合并的分支"
c04f5ac3 2800
4dcdc3d8 2801#: builtin/branch.c:822
ef317cd5 2802msgid "delete branch (even if not merged)"
07432cef 2803msgstr "删除分支(即使没有合并)"
c04f5ac3 2804
4dcdc3d8 2805#: builtin/branch.c:823
ef317cd5 2806msgid "move/rename a branch and its reflog"
07432cef 2807msgstr "移动/重命名一个分支,以及它的引用日志"
c04f5ac3 2808
4dcdc3d8 2809#: builtin/branch.c:824
ef317cd5 2810msgid "move/rename a branch, even if target exists"
07432cef 2811msgstr "移动/重命名一个分支,即使目标已存在"
c04f5ac3 2812
4dcdc3d8 2813#: builtin/branch.c:825
ef317cd5 2814msgid "list branch names"
07432cef 2815msgstr "列出分支名"
c04f5ac3 2816
4dcdc3d8 2817#: builtin/branch.c:826
ef317cd5 2818msgid "create the branch's reflog"
07432cef 2819msgstr "创建分支的引用日志"
ef317cd5 2820
4dcdc3d8 2821#: builtin/branch.c:828
ef317cd5 2822msgid "edit the description for the branch"
07432cef 2823msgstr "标记分支的描述"
ef317cd5 2824
4dcdc3d8 2825#: builtin/branch.c:829
ef317cd5 2826msgid "force creation (when already exists)"
07432cef 2827msgstr "强制创建(当已经存在)"
ef317cd5 2828
4dcdc3d8 2829#: builtin/branch.c:832
ef317cd5 2830msgid "print only not merged branches"
07432cef 2831msgstr "只打印没有合并的分支"
ef317cd5 2832
4dcdc3d8 2833#: builtin/branch.c:838
ef317cd5 2834msgid "print only merged branches"
07432cef 2835msgstr "只打印合并的分支"
ef317cd5 2836
4dcdc3d8 2837#: builtin/branch.c:842
ef317cd5 2838msgid "list branches in columns"
07432cef 2839msgstr "以列的方式显示分支"
ef317cd5 2840
4dcdc3d8 2841#: builtin/branch.c:855
c04f5ac3
JX
2842msgid "Failed to resolve HEAD as a valid ref."
2843msgstr "无法将 HEAD 解析为有效引用。"
2844
2e8451e8 2845#: builtin/branch.c:860 builtin/clone.c:630
c04f5ac3 2846msgid "HEAD not found below refs/heads!"
90e6ef53 2847msgstr "HEAD 没有位于 /refs/heads 之下!"
c04f5ac3 2848
4dcdc3d8 2849#: builtin/branch.c:883
8ada9598 2850msgid "--column and --verbose are incompatible"
81809b99 2851msgstr "--column 和 --verbose 不兼容"
8ada9598 2852
4dcdc3d8 2853#: builtin/branch.c:889 builtin/branch.c:928
a77c07d9
JX
2854msgid "branch name required"
2855msgstr "必须提供分支名"
2856
4dcdc3d8 2857#: builtin/branch.c:904
a77c07d9
JX
2858msgid "Cannot give description to detached HEAD"
2859msgstr "不能向分离头指针提供描述"
2860
4dcdc3d8 2861#: builtin/branch.c:909
a77c07d9
JX
2862msgid "cannot edit description of more than one branch"
2863msgstr "不能为一个以上的分支编辑描述"
2864
4dcdc3d8 2865#: builtin/branch.c:916
a77c07d9
JX
2866#, c-format
2867msgid "No commit on branch '%s' yet."
2868msgstr "分支 '%s' 尚无提交。"
2869
4dcdc3d8 2870#: builtin/branch.c:919
a77c07d9
JX
2871#, c-format
2872msgid "No branch named '%s'."
2873msgstr "没有分支 '%s'。"
2874
4dcdc3d8 2875#: builtin/branch.c:934
a77c07d9
JX
2876msgid "too many branches for a rename operation"
2877msgstr "为重命名操作提供了太多的分支名"
2878
4dcdc3d8 2879#: builtin/branch.c:939
1003b3a5
JX
2880msgid "too many branches to set new upstream"
2881msgstr "为设置新上游提供了太多的分支名"
2882
4dcdc3d8 2883#: builtin/branch.c:943
1003b3a5
JX
2884#, c-format
2885msgid ""
2886"could not set upstream of HEAD to %s when it does not point to any branch."
2887msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
2888
4dcdc3d8 2889#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990
1003b3a5
JX
2890#, c-format
2891msgid "no such branch '%s'"
2892msgstr "没有此分支 '%s'"
2893
4dcdc3d8 2894#: builtin/branch.c:950
07432cef 2895#, c-format
ef317cd5 2896msgid "branch '%s' does not exist"
07432cef 2897msgstr "分支 '%s' 不存在"
ef317cd5 2898
4dcdc3d8 2899#: builtin/branch.c:962
1003b3a5
JX
2900msgid "too many branches to unset upstream"
2901msgstr "为取消上游设置操作提供了太多的分支名"
2902
4dcdc3d8 2903#: builtin/branch.c:966
1003b3a5
JX
2904msgid "could not unset upstream of HEAD when it does not point to any branch."
2905msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
2906
4dcdc3d8 2907#: builtin/branch.c:972
ef317cd5
JX
2908#, c-format
2909msgid "Branch '%s' has no upstream information"
07432cef 2910msgstr "分支 '%s' 没有上游信息"
ef317cd5 2911
4dcdc3d8 2912#: builtin/branch.c:987
1003b3a5
JX
2913msgid "it does not make sense to create 'HEAD' manually"
2914msgstr "手工创建 'HEAD' 没有意义"
2915
4dcdc3d8 2916#: builtin/branch.c:993
c04f5ac3
JX
2917msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2918msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
2919
4dcdc3d8 2920#: builtin/branch.c:996
ef317cd5
JX
2921#, c-format
2922msgid ""
2923"The --set-upstream flag is deprecated and will be removed. Consider using --"
2924"track or --set-upstream-to\n"
2925msgstr ""
07432cef 2926"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
ef317cd5 2927
4dcdc3d8 2928#: builtin/branch.c:1013
ef317cd5
JX
2929#, c-format
2930msgid ""
2931"\n"
2932"If you wanted to make '%s' track '%s', do this:\n"
2933"\n"
2934msgstr ""
07432cef
WS
2935"\n"
2936"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
2937"\n"
ef317cd5 2938
4dcdc3d8 2939#: builtin/branch.c:1014
07432cef 2940#, c-format
ef317cd5 2941msgid " git branch -d %s\n"
07432cef 2942msgstr " git branch -d %s\n"
ef317cd5 2943
4dcdc3d8 2944#: builtin/branch.c:1015
ef317cd5
JX
2945#, c-format
2946msgid " git branch --set-upstream-to %s\n"
07432cef 2947msgstr " git branch --set-upstream-to %s\n"
ef317cd5 2948
c04f5ac3
JX
2949#: builtin/bundle.c:47
2950#, c-format
2951msgid "%s is okay\n"
2952msgstr "%s 可以\n"
2953
2954#: builtin/bundle.c:56
2955msgid "Need a repository to create a bundle."
90e6ef53 2956msgstr "需要一个版本库来创建包。"
c04f5ac3
JX
2957
2958#: builtin/bundle.c:60
2959msgid "Need a repository to unbundle."
90e6ef53 2960msgstr "需要一个版本库来解包。"
c04f5ac3 2961
b1894384 2962#: builtin/cat-file.c:285
ef317cd5 2963msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
07432cef 2964msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
ef317cd5 2965
b1894384 2966#: builtin/cat-file.c:286
ef317cd5 2967msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
07432cef 2968msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
ef317cd5 2969
b1894384 2970#: builtin/cat-file.c:323
ef317cd5 2971msgid "<type> can be one of: blob, tree, commit, tag"
07432cef 2972msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
ef317cd5 2973
b1894384 2974#: builtin/cat-file.c:324
ef317cd5 2975msgid "show object type"
07432cef 2976msgstr "显示对象类型"
ef317cd5 2977
b1894384 2978#: builtin/cat-file.c:325
ef317cd5 2979msgid "show object size"
07432cef 2980msgstr "显示对象大小"
ef317cd5 2981
b1894384 2982#: builtin/cat-file.c:327
ef317cd5 2983msgid "exit with zero when there's no error"
07432cef 2984msgstr "当没有错误时退出并返回零"
ef317cd5 2985
b1894384 2986#: builtin/cat-file.c:328
ef317cd5 2987msgid "pretty-print object's content"
07432cef 2988msgstr "美观地打印对象的内容"
ef317cd5 2989
b1894384 2990#: builtin/cat-file.c:330
ef317cd5 2991msgid "for blob objects, run textconv on object's content"
07432cef 2992msgstr "对于数据(blob)对象,对其内容执行 textconv"
ef317cd5 2993
b1894384 2994#: builtin/cat-file.c:332
ef317cd5 2995msgid "show info and content of objects fed from the standard input"
07432cef 2996msgstr "显示从标准输入提供的对象的信息和内容"
ef317cd5 2997
b1894384 2998#: builtin/cat-file.c:335
ef317cd5 2999msgid "show info about objects fed from the standard input"
07432cef 3000msgstr "显示从标准输入提供的对象的信息"
ef317cd5
JX
3001
3002#: builtin/check-attr.c:11
3003msgid "git check-attr [-a | --all | attr...] [--] pathname..."
07432cef 3004msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
ef317cd5
JX
3005
3006#: builtin/check-attr.c:12
07432cef
WS
3007msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
3008msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
ef317cd5
JX
3009
3010#: builtin/check-attr.c:19
3011msgid "report all attributes set on file"
07432cef 3012msgstr "报告设置在文件上的所有属性"
ef317cd5
JX
3013
3014#: builtin/check-attr.c:20
3015msgid "use .gitattributes only from the index"
07432cef 3016msgstr "只使用索引中的 .gitattributes"
ef317cd5 3017
a77c07d9 3018#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
ef317cd5 3019msgid "read file names from stdin"
07432cef 3020msgstr "从标准输入读出文件名"
ef317cd5 3021
a77c07d9 3022#: builtin/check-attr.c:23 builtin/check-ignore.c:24
ef317cd5 3023msgid "input paths are terminated by a null character"
07432cef 3024msgstr "输入路径以null字符终止"
ef317cd5 3025
2e8451e8 3026#: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177
a77c07d9
JX
3027msgid "suppress progress reporting"
3028msgstr "不显示进度报告"
3029
2e8451e8
JX
3030#: builtin/check-ignore.c:26
3031msgid "show non-matching input paths"
3032msgstr "显示未匹配的输入路径"
3033
3034#: builtin/check-ignore.c:143
a77c07d9
JX
3035msgid "cannot specify pathnames with --stdin"
3036msgstr "不能同时提供路径及 --stdin 参数"
3037
2e8451e8 3038#: builtin/check-ignore.c:146
a77c07d9
JX
3039msgid "-z only makes sense with --stdin"
3040msgstr "-z 需要和 --stdin 参数共用才有意义"
3041
2e8451e8 3042#: builtin/check-ignore.c:148
a77c07d9
JX
3043msgid "no path specified"
3044msgstr "未指定路径"
3045
2e8451e8 3046#: builtin/check-ignore.c:152
a77c07d9
JX
3047msgid "--quiet is only valid with a single pathname"
3048msgstr "参数 --quiet 只在提供一个路径名时有效"
3049
2e8451e8 3050#: builtin/check-ignore.c:154
a77c07d9
JX
3051msgid "cannot have both --quiet and --verbose"
3052msgstr "不能同时提供 --quiet 和 --verbose 参数"
3053
2e8451e8
JX
3054#: builtin/check-ignore.c:157
3055msgid "--non-matching is only valid with --verbose"
3056msgstr "--non-matching 选项只在使用 --verbose 时有效"
3057
3058#: builtin/check-mailmap.c:8
3059msgid "git check-mailmap [options] <contact>..."
3060msgstr "git check-mailmap [选项] <联系地址>..."
3061
3062#: builtin/check-mailmap.c:13
3063msgid "also read contacts from stdin"
3064msgstr "还从标准输入读取联系地址"
3065
3066#: builtin/check-mailmap.c:24
3067#, c-format
3068msgid "unable to parse contact: %s"
3069msgstr "不能解析联系地址:%s"
3070
3071#: builtin/check-mailmap.c:47
3072msgid "no contacts specified"
3073msgstr "未指定联系地址"
3074
ef317cd5
JX
3075#: builtin/checkout-index.c:126
3076msgid "git checkout-index [options] [--] [<file>...]"
07432cef 3077msgstr "git checkout-index [选项] [--] [<文件>...]"
ef317cd5
JX
3078
3079#: builtin/checkout-index.c:187
3080msgid "check out all files in the index"
07432cef 3081msgstr "检出索引区的所有文件"
ef317cd5
JX
3082
3083#: builtin/checkout-index.c:188
3084msgid "force overwrite of existing files"
07432cef 3085msgstr "强制覆盖现有的文件"
ef317cd5
JX
3086
3087#: builtin/checkout-index.c:190
3088msgid "no warning for existing files and files not in index"
07432cef 3089msgstr "存在或不在索引中的文件都没有警告"
ef317cd5
JX
3090
3091#: builtin/checkout-index.c:192
ef317cd5 3092msgid "don't checkout new files"
07432cef 3093msgstr "不检出新文件"
ef317cd5
JX
3094
3095#: builtin/checkout-index.c:194
ef317cd5 3096msgid "update stat information in the index file"
07432cef 3097msgstr "更新索引中文件的状态信息"
ef317cd5
JX
3098
3099#: builtin/checkout-index.c:200
ef317cd5 3100msgid "read list of paths from the standard input"
07432cef 3101msgstr "从标准输入读取路径列表"
ef317cd5
JX
3102
3103#: builtin/checkout-index.c:202
3104msgid "write the content to temporary files"
07432cef 3105msgstr "将内容写入临时文件"
ef317cd5
JX
3106
3107#: builtin/checkout-index.c:203 builtin/column.c:30
3108msgid "string"
07432cef 3109msgstr "字符串"
ef317cd5
JX
3110
3111#: builtin/checkout-index.c:204
3112msgid "when creating files, prepend <string>"
07432cef 3113msgstr "在创建文件时,在前面加上<字符串>"
ef317cd5
JX
3114
3115#: builtin/checkout-index.c:207
3116msgid "copy out the files from named stage"
07432cef 3117msgstr "从指定暂存区中拷出文件"
ef317cd5
JX
3118
3119#: builtin/checkout.c:25
ef317cd5 3120msgid "git checkout [options] <branch>"
07432cef 3121msgstr "git checkout [选项] <分支>"
ef317cd5
JX
3122
3123#: builtin/checkout.c:26
ef317cd5 3124msgid "git checkout [options] [<branch>] -- <file>..."
07432cef 3125msgstr "git checkout [选项] [<分支>] -- <文件>..."
ef317cd5 3126
4dcdc3d8 3127#: builtin/checkout.c:117 builtin/checkout.c:150
c04f5ac3
JX
3128#, c-format
3129msgid "path '%s' does not have our version"
3130msgstr "路径 '%s' 没有我们的版本"
3131
4dcdc3d8 3132#: builtin/checkout.c:119 builtin/checkout.c:152
c04f5ac3
JX
3133#, c-format
3134msgid "path '%s' does not have their version"
3135msgstr "路径 '%s' 没有他们的版本"
3136
4dcdc3d8 3137#: builtin/checkout.c:135
c04f5ac3
JX
3138#, c-format
3139msgid "path '%s' does not have all necessary versions"
3140msgstr "路径 '%s' 没有全部必须的版本"
3141
4dcdc3d8 3142#: builtin/checkout.c:179
c04f5ac3
JX
3143#, c-format
3144msgid "path '%s' does not have necessary versions"
3145msgstr "路径 '%s' 没有必须的版本"
3146
4dcdc3d8 3147#: builtin/checkout.c:196
c04f5ac3
JX
3148#, c-format
3149msgid "path '%s': cannot merge"
90e6ef53 3150msgstr "path '%s':无法合并"
c04f5ac3 3151
4dcdc3d8 3152#: builtin/checkout.c:213
c04f5ac3
JX
3153#, c-format
3154msgid "Unable to add merge result for '%s'"
3155msgstr "无法为 '%s' 添加合并结果"
3156
4dcdc3d8
JX
3157#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243
3158#: builtin/checkout.c:246
07432cef 3159#, c-format
ef317cd5 3160msgid "'%s' cannot be used with updating paths"
07432cef 3161msgstr "'%s' 不能在更新路径时使用"
ef317cd5 3162
4dcdc3d8 3163#: builtin/checkout.c:249 builtin/checkout.c:252
07432cef 3164#, c-format
ef317cd5 3165msgid "'%s' cannot be used with %s"
07432cef 3166msgstr "'%s' 不能和 %s 同时使用"
ef317cd5 3167
4dcdc3d8 3168#: builtin/checkout.c:255
ef317cd5
JX
3169#, c-format
3170msgid "Cannot update paths and switch to branch '%s' at the same time."
07432cef 3171msgstr "不能同时更新路径并切换到分支'%s'。"
ef317cd5 3172
4dcdc3d8 3173#: builtin/checkout.c:266 builtin/checkout.c:458
c04f5ac3 3174msgid "corrupt index file"
90e6ef53 3175msgstr "损坏的索引文件"
c04f5ac3 3176
4dcdc3d8 3177#: builtin/checkout.c:329 builtin/checkout.c:336
c04f5ac3
JX
3178#, c-format
3179msgid "path '%s' is unmerged"
3180msgstr "路径 '%s' 未合并"
3181
4dcdc3d8 3182#: builtin/checkout.c:480
c04f5ac3 3183msgid "you need to resolve your current index first"
90e6ef53 3184msgstr "您需要先解决当前索引的冲突"
c04f5ac3 3185
4dcdc3d8 3186#: builtin/checkout.c:601
c04f5ac3
JX
3187#, c-format
3188msgid "Can not do reflog for '%s'\n"
90e6ef53 3189msgstr "不能对 '%s' 执行 reflog 操作\n"
c04f5ac3 3190
2e8451e8 3191#: builtin/checkout.c:639
c04f5ac3
JX
3192msgid "HEAD is now at"
3193msgstr "HEAD 目前位于"
3194
2e8451e8 3195#: builtin/checkout.c:646
c04f5ac3
JX
3196#, c-format
3197msgid "Reset branch '%s'\n"
3198msgstr "重置分支 '%s'\n"
3199
2e8451e8 3200#: builtin/checkout.c:649
c04f5ac3
JX
3201#, c-format
3202msgid "Already on '%s'\n"
3203msgstr "已经位于 '%s'\n"
3204
2e8451e8 3205#: builtin/checkout.c:653
c04f5ac3
JX
3206#, c-format
3207msgid "Switched to and reset branch '%s'\n"
3208msgstr "切换并重置分支 '%s'\n"
3209
2e8451e8 3210#: builtin/checkout.c:655 builtin/checkout.c:997
c04f5ac3
JX
3211#, c-format
3212msgid "Switched to a new branch '%s'\n"
3213msgstr "切换到一个新分支 '%s'\n"
3214
2e8451e8 3215#: builtin/checkout.c:657
c04f5ac3
JX
3216#, c-format
3217msgid "Switched to branch '%s'\n"
3218msgstr "切换到分支 '%s'\n"
3219
90e6ef53 3220# 译者:注意保持前导空格
2e8451e8 3221#: builtin/checkout.c:713
c04f5ac3
JX
3222#, c-format
3223msgid " ... and %d more.\n"
90e6ef53 3224msgstr " ... 及其它 %d 个。\n"
c04f5ac3
JX
3225
3226#. The singular version
2e8451e8 3227#: builtin/checkout.c:719
c04f5ac3
JX
3228#, c-format
3229msgid ""
3230"Warning: you are leaving %d commit behind, not connected to\n"
3231"any of your branches:\n"
3232"\n"
3233"%s\n"
3234msgid_plural ""
3235"Warning: you are leaving %d commits behind, not connected to\n"
3236"any of your branches:\n"
3237"\n"
3238"%s\n"
3239msgstr[0] ""
3240"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3241"\n"
3242"%s\n"
5ae481e0
JX
3243msgstr[1] ""
3244"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
3245"\n"
3246"%s\n"
c04f5ac3 3247
2e8451e8 3248#: builtin/checkout.c:737
c04f5ac3
JX
3249#, c-format
3250msgid ""
3251"If you want to keep them by creating a new branch, this may be a good time\n"
3252"to do so with:\n"
3253"\n"
3254" git branch new_branch_name %s\n"
3255"\n"
3256msgstr ""
3257"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
3258"如下操作:\n"
3259"\n"
3260" git branch new_branch_name %s\n"
3261"\n"
3262
2e8451e8 3263#: builtin/checkout.c:767
c04f5ac3
JX
3264msgid "internal error in revision walk"
3265msgstr "在版本遍历时遇到内部错误"
3266
2e8451e8 3267#: builtin/checkout.c:771
c04f5ac3
JX
3268msgid "Previous HEAD position was"
3269msgstr "之前的 HEAD 位置是"
3270
2e8451e8 3271#: builtin/checkout.c:798 builtin/checkout.c:992
c04f5ac3 3272msgid "You are on a branch yet to be born"
90e6ef53 3273msgstr "您位于一个尚未初始化的分支"
c04f5ac3
JX
3274
3275#. case (1)
2e8451e8 3276#: builtin/checkout.c:928
c04f5ac3
JX
3277#, c-format
3278msgid "invalid reference: %s"
3279msgstr "无效引用:%s"
3280
3281#. case (1): want a tree
2e8451e8 3282#: builtin/checkout.c:967
c04f5ac3
JX
3283#, c-format
3284msgid "reference is not a tree: %s"
3285msgstr "引用不是一个树:%s"
3286
2e8451e8 3287#: builtin/checkout.c:1006
ef317cd5 3288msgid "paths cannot be used with switching branches"
07432cef 3289msgstr "路径不能和切换分支同时使用"
c04f5ac3 3290
2e8451e8 3291#: builtin/checkout.c:1009 builtin/checkout.c:1013
07432cef 3292#, c-format
ef317cd5 3293msgid "'%s' cannot be used with switching branches"
07432cef 3294msgstr "'%s' 不能和切换分支同时使用"
c04f5ac3 3295
2e8451e8
JX
3296#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025
3297#: builtin/checkout.c:1028
07432cef 3298#, c-format
ef317cd5 3299msgid "'%s' cannot be used with '%s'"
07432cef 3300msgstr "'%s' 不能和 '%s' 同时使用"
c04f5ac3 3301
2e8451e8 3302#: builtin/checkout.c:1033
07432cef 3303#, c-format
ef317cd5 3304msgid "Cannot switch branch to a non-commit '%s'"
07432cef 3305msgstr "不能切换分支到一个非提交 '%s'"
c04f5ac3 3306
2e8451e8 3307#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89
ef317cd5 3308#: builtin/remote.c:169 builtin/remote.c:171
ef317cd5 3309msgid "branch"
07432cef 3310msgstr "分支"
c04f5ac3 3311
2e8451e8 3312#: builtin/checkout.c:1056
ef317cd5 3313msgid "create and checkout a new branch"
07432cef 3314msgstr "创建并检出一个新的分支"
c04f5ac3 3315
2e8451e8 3316#: builtin/checkout.c:1058
ef317cd5 3317msgid "create/reset and checkout a branch"
07432cef 3318msgstr "创建/重置并检出一个分支"
c04f5ac3 3319
2e8451e8 3320#: builtin/checkout.c:1059
ef317cd5 3321msgid "create reflog for new branch"
07432cef 3322msgstr "为新的分支创建引用日志"
ef317cd5 3323
2e8451e8 3324#: builtin/checkout.c:1060
ef317cd5 3325msgid "detach the HEAD at named commit"
07432cef 3326msgstr "成为指向该提交的分离头指针"
ef317cd5 3327
2e8451e8 3328#: builtin/checkout.c:1061
ef317cd5 3329msgid "set upstream info for new branch"
07432cef 3330msgstr "为新的分支设置上游信息"
ef317cd5 3331
2e8451e8 3332#: builtin/checkout.c:1063
ef317cd5 3333msgid "new branch"
07432cef 3334msgstr "新分支"
ef317cd5 3335
2e8451e8 3336#: builtin/checkout.c:1063
ef317cd5 3337msgid "new unparented branch"
07432cef 3338msgstr "新的没有父提交的分支"
ef317cd5 3339
2e8451e8 3340#: builtin/checkout.c:1064
ef317cd5 3341msgid "checkout our version for unmerged files"
07432cef 3342msgstr "对尚未合并的文件检出我们的版本"
c04f5ac3 3343
2e8451e8 3344#: builtin/checkout.c:1066
ef317cd5 3345msgid "checkout their version for unmerged files"
07432cef 3346msgstr "对尚未合并的文件检出他们的版本"
ef317cd5 3347
2e8451e8 3348#: builtin/checkout.c:1068
ef317cd5 3349msgid "force checkout (throw away local modifications)"
07432cef 3350msgstr "强制检出(丢弃本地修改)"
c04f5ac3 3351
2e8451e8 3352#: builtin/checkout.c:1069
ef317cd5 3353msgid "perform a 3-way merge with the new branch"
07432cef 3354msgstr "和新的分支执行三路合并"
ef317cd5 3355
2e8451e8 3356#: builtin/checkout.c:1070 builtin/merge.c:232
ef317cd5 3357msgid "update ignored files (default)"
07432cef 3358msgstr "更新忽略的文件(默认)"
c04f5ac3 3359
2e8451e8 3360#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249
ef317cd5 3361msgid "style"
07432cef 3362msgstr "风格"
ef317cd5 3363
2e8451e8 3364#: builtin/checkout.c:1072
ef317cd5 3365msgid "conflict style (merge or diff3)"
07432cef 3366msgstr "冲突输出风格(merge 或 diff3)"
ef317cd5 3367
2e8451e8 3368#: builtin/checkout.c:1075
4dcdc3d8
JX
3369msgid "do not limit pathspecs to sparse entries only"
3370msgstr "对路径不做稀疏检出的限制"
3371
2e8451e8 3372#: builtin/checkout.c:1077
ef317cd5 3373msgid "second guess 'git checkout no-such-branch'"
07432cef 3374msgstr "再者猜测'git checkout no-such-branch'"
ef317cd5 3375
2e8451e8 3376#: builtin/checkout.c:1101
ef317cd5 3377msgid "-b, -B and --orphan are mutually exclusive"
07432cef 3378msgstr "-b、-B 和 --orphan 是互斥的"
ef317cd5 3379
2e8451e8 3380#: builtin/checkout.c:1118
ef317cd5
JX
3381msgid "--track needs a branch name"
3382msgstr "--track 需要一个分支名"
3383
2e8451e8 3384#: builtin/checkout.c:1125
ef317cd5
JX
3385msgid "Missing branch name; try -b"
3386msgstr "缺少分支名;尝试 -b"
3387
2e8451e8 3388#: builtin/checkout.c:1160
c04f5ac3 3389msgid "invalid path specification"
90e6ef53 3390msgstr "无效的路径规格"
c04f5ac3 3391
2e8451e8 3392#: builtin/checkout.c:1167
07432cef 3393#, c-format
c04f5ac3 3394msgid ""
ef317cd5 3395"Cannot update paths and switch to branch '%s' at the same time.\n"
c04f5ac3
JX
3396"Did you intend to checkout '%s' which can not be resolved as commit?"
3397msgstr ""
07432cef
WS
3398"不能同时更新路径并切换到分支'%s'。\n"
3399"您是想要检出 '%s' 但其未能解析为提交么?"
c04f5ac3 3400
2e8451e8 3401#: builtin/checkout.c:1172
07432cef 3402#, c-format
ef317cd5 3403msgid "git checkout: --detach does not take a path argument '%s'"
07432cef 3404msgstr "git checkout:--detach 不能接收路径参数 '%s'"
c04f5ac3 3405
2e8451e8 3406#: builtin/checkout.c:1176
c04f5ac3
JX
3407msgid ""
3408"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3409"checking out of the index."
3410msgstr ""
90e6ef53 3411"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
c04f5ac3 3412
2e8451e8
JX
3413#: builtin/clean.c:25
3414msgid ""
3415"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3416msgstr ""
3417"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
c04f5ac3 3418
2e8451e8 3419#: builtin/clean.c:29
07432cef
WS
3420#, c-format
3421msgid "Removing %s\n"
3422msgstr "正删除 %s\n"
3423
2e8451e8 3424#: builtin/clean.c:30
07432cef
WS
3425#, c-format
3426msgid "Would remove %s\n"
3427msgstr "将删除 %s\n"
3428
2e8451e8 3429#: builtin/clean.c:31
07432cef
WS
3430#, c-format
3431msgid "Skipping repository %s\n"
3432msgstr "忽略版本库 %s\n"
3433
2e8451e8 3434#: builtin/clean.c:32
07432cef
WS
3435#, c-format
3436msgid "Would skip repository %s\n"
3437msgstr "将忽略版本库 %s\n"
3438
2e8451e8 3439#: builtin/clean.c:33
07432cef
WS
3440#, c-format
3441msgid "failed to remove %s"
3442msgstr "无法删除 %s"
3443
2e8451e8
JX
3444#: builtin/clean.c:293
3445msgid ""
3446"Prompt help:\n"
3447"1 - select a numbered item\n"
3448"foo - select item based on unique prefix\n"
3449" - (empty) select nothing"
3450msgstr ""
3451"帮助:\n"
3452"1 - 通过编号选择一个选项\n"
3453"foo - 通过标题选择一个选项\n"
3454" - (空)什么也不选择"
3455
3456#: builtin/clean.c:297
3457msgid ""
3458"Prompt help:\n"
3459"1 - select a single item\n"
3460"3-5 - select a range of items\n"
3461"2-3,6-9 - select multiple ranges\n"
3462"foo - select item based on unique prefix\n"
3463"-... - unselect specified items\n"
3464"* - choose all items\n"
3465" - (empty) finish selecting"
3466msgstr ""
3467"帮助:\n"
3468"1 - 选择一个选项\n"
3469"3-5 - 选择一个范围内的所有选项\n"
3470"2-3,6-9 - 选择多个范围内的所有选项\n"
3471"foo - 通过标题选择一个选项\n"
3472"-... - 反选特定的选项\n"
3473"* - 选择所有选项\n"
3474" - (空)结束选择"
3475
b1894384 3476#: builtin/clean.c:515
2e8451e8
JX
3477#, c-format
3478msgid "Huh (%s)?"
3479msgstr "嗯(%s)?"
3480
b1894384 3481#: builtin/clean.c:658
2e8451e8
JX
3482#, c-format
3483msgid "Input ignore patterns>> "
3484msgstr "输入模版以排除条目>> "
3485
b1894384 3486#: builtin/clean.c:695
2e8451e8
JX
3487#, c-format
3488msgid "WARNING: Cannot find items matched by: %s"
3489msgstr "警告:无法找到和 %s 匹配的条目"
3490
b1894384 3491#: builtin/clean.c:716
2e8451e8
JX
3492msgid "Select items to delete"
3493msgstr "选择要删除的条目"
3494
b1894384 3495#: builtin/clean.c:756
2e8451e8
JX
3496#, c-format
3497msgid "remove %s? "
3498msgstr "删除 %s?"
3499
b1894384 3500#: builtin/clean.c:781
2e8451e8
JX
3501msgid "Bye."
3502msgstr "再见。"
3503
b1894384 3504#: builtin/clean.c:789
2e8451e8
JX
3505msgid ""
3506"clean - start cleaning\n"
3507"filter by pattern - exclude items from deletion\n"
3508"select by numbers - select items to be deleted by numbers\n"
3509"ask each - confirm each deletion (like \"rm -i\")\n"
3510"quit - stop cleaning\n"
3511"help - this screen\n"
3512"? - help for prompt selection"
3513msgstr ""
3514"clean - 开始清理\n"
3515"filter by pattern - 通过模版排除要删除的条目\n"
3516"select by numbers - 通过数字选择要删除的条目\n"
3517"ask each - 针对删除逐一询问(就像 \"rm -i\")\n"
3518"quit - 停止删除并退出\n"
3519"help - 显示本帮助\n"
3520"? - 显示如何在提示符下选择的帮助"
3521
b1894384 3522#: builtin/clean.c:816
2e8451e8
JX
3523msgid "*** Commands ***"
3524msgstr "*** 命令 ***"
3525
b1894384 3526#: builtin/clean.c:817
2e8451e8
JX
3527msgid "What now"
3528msgstr "请选择"
3529
b1894384 3530#: builtin/clean.c:825
2e8451e8
JX
3531msgid "Would remove the following item:"
3532msgid_plural "Would remove the following items:"
3533msgstr[0] "将删除如下条目:"
3534msgstr[1] "将删除如下条目:"
3535
b1894384 3536#: builtin/clean.c:842
2e8451e8
JX
3537msgid "No more files to clean, exiting."
3538msgstr "没有要清理的文件,退出。"
3539
b1894384 3540#: builtin/clean.c:874
ef317cd5 3541msgid "do not print names of files removed"
07432cef 3542msgstr "不打印删除文件的名称"
ef317cd5 3543
b1894384 3544#: builtin/clean.c:876
ef317cd5 3545msgid "force"
07432cef 3546msgstr "强制"
ef317cd5 3547
b1894384 3548#: builtin/clean.c:877
2e8451e8
JX
3549msgid "interactive cleaning"
3550msgstr "交互式清除"
3551
b1894384 3552#: builtin/clean.c:879
ef317cd5 3553msgid "remove whole directories"
07432cef 3554msgstr "删除整个目录"
ef317cd5 3555
b1894384 3556#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716
2e8451e8 3557#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186
ef317cd5 3558msgid "pattern"
07432cef 3559msgstr "模式"
ef317cd5 3560
b1894384 3561#: builtin/clean.c:881
ef317cd5 3562msgid "add <pattern> to ignore rules"
07432cef 3563msgstr "添加<模式>到忽略规则"
ef317cd5 3564
b1894384 3565#: builtin/clean.c:882
ef317cd5 3566msgid "remove ignored files, too"
07432cef 3567msgstr "也删除忽略的文件"
ef317cd5 3568
b1894384 3569#: builtin/clean.c:884
ef317cd5 3570msgid "remove only ignored files"
07432cef 3571msgstr "只删除忽略的文件"
c04f5ac3 3572
b1894384 3573#: builtin/clean.c:902
c04f5ac3 3574msgid "-x and -X cannot be used together"
649900bc 3575msgstr "-x 和 -X 不能同时使用"
c04f5ac3 3576
b1894384 3577#: builtin/clean.c:906
c04f5ac3 3578msgid ""
2e8451e8
JX
3579"clean.requireForce set to true and neither -i, -n nor -f given; refusing to "
3580"clean"
c04f5ac3 3581msgstr ""
2e8451e8 3582"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 3583
b1894384 3584#: builtin/clean.c:909
c04f5ac3 3585msgid ""
2e8451e8
JX
3586"clean.requireForce defaults to true and neither -i, -n nor -f given; "
3587"refusing to clean"
c04f5ac3 3588msgstr ""
2e8451e8 3589"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
c04f5ac3 3590
2e8451e8 3591#: builtin/clone.c:36
ef317cd5 3592msgid "git clone [options] [--] <repo> [<dir>]"
07432cef 3593msgstr "git clone [选项] [--] <版本库> [<路径>]"
ef317cd5 3594
2e8451e8
JX
3595#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229
3596#: builtin/push.c:462
ef317cd5 3597msgid "force progress reporting"
07432cef 3598msgstr "强制显示进度报告"
ef317cd5 3599
2e8451e8 3600#: builtin/clone.c:66
ef317cd5 3601msgid "don't create a checkout"
07432cef 3602msgstr "不创建一个检出"
ef317cd5 3603
2e8451e8 3604#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
ef317cd5 3605msgid "create a bare repository"
07432cef 3606msgstr "创建一个裸版本库"
ef317cd5 3607
2e8451e8 3608#: builtin/clone.c:72
ef317cd5 3609msgid "create a mirror repository (implies bare)"
07432cef 3610msgstr "创建一个镜像版本库(也是裸版本库)"
ef317cd5 3611
2e8451e8 3612#: builtin/clone.c:74
ef317cd5 3613msgid "to clone from a local repository"
07432cef 3614msgstr "从本地版本库克隆"
ef317cd5 3615
2e8451e8 3616#: builtin/clone.c:76
ef317cd5 3617msgid "don't use local hardlinks, always copy"
07432cef 3618msgstr "不使用本地硬链接,始终复制"
ef317cd5 3619
2e8451e8 3620#: builtin/clone.c:78
ef317cd5 3621msgid "setup as shared repository"
07432cef 3622msgstr "设置为共享版本库"
ef317cd5 3623
2e8451e8 3624#: builtin/clone.c:80 builtin/clone.c:82
ef317cd5 3625msgid "initialize submodules in the clone"
07432cef 3626msgstr "在克隆时初始化子模组"
ef317cd5 3627
2e8451e8 3628#: builtin/clone.c:83 builtin/init-db.c:485
ef317cd5 3629msgid "template-directory"
07432cef 3630msgstr "模板目录"
ef317cd5 3631
2e8451e8 3632#: builtin/clone.c:84 builtin/init-db.c:486
ef317cd5 3633msgid "directory from which templates will be used"
07432cef 3634msgstr "模板目录将被使用"
ef317cd5 3635
2e8451e8 3636#: builtin/clone.c:86
ef317cd5 3637msgid "reference repository"
07432cef 3638msgstr "引用版本库"
ef317cd5 3639
2e8451e8 3640#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
ef317cd5 3641msgid "name"
07432cef 3642msgstr "名称"
ef317cd5 3643
2e8451e8 3644#: builtin/clone.c:88
ef317cd5 3645msgid "use <name> instead of 'origin' to track upstream"
07432cef 3646msgstr "使用<名称>而不是 'origin' 去跟踪上游"
ef317cd5 3647
2e8451e8 3648#: builtin/clone.c:90
ef317cd5 3649msgid "checkout <branch> instead of the remote's HEAD"
07432cef 3650msgstr "检出<分支>而不是远程HEAD"
ef317cd5 3651
2e8451e8 3652#: builtin/clone.c:92
ef317cd5 3653msgid "path to git-upload-pack on the remote"
07432cef 3654msgstr "远程 git-upload-pack 路径"
ef317cd5 3655
2e8451e8 3656#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661
ef317cd5 3657msgid "depth"
07432cef 3658msgstr "深度"
ef317cd5 3659
2e8451e8 3660#: builtin/clone.c:94
ef317cd5 3661msgid "create a shallow clone of that depth"
07432cef 3662msgstr "创建一个指定深度的浅克隆"
ef317cd5 3663
2e8451e8 3664#: builtin/clone.c:96
ef317cd5 3665msgid "clone only one branch, HEAD or --branch"
07432cef 3666msgstr "只克隆一个分支、HEAD 或 --branch"
ef317cd5 3667
2e8451e8 3668#: builtin/clone.c:97 builtin/init-db.c:494
ef317cd5 3669msgid "gitdir"
07432cef 3670msgstr "git目录"
ef317cd5 3671
2e8451e8 3672#: builtin/clone.c:98 builtin/init-db.c:495
ef317cd5 3673msgid "separate git dir from working tree"
07432cef 3674msgstr "git目录和工作区分离"
ef317cd5 3675
2e8451e8 3676#: builtin/clone.c:99
ef317cd5 3677msgid "key=value"
07432cef 3678msgstr "key=value"
ef317cd5 3679
2e8451e8 3680#: builtin/clone.c:100
ef317cd5 3681msgid "set config inside the new repository"
07432cef 3682msgstr "在新版本库中设置配置信息"
ef317cd5 3683
2e8451e8 3684#: builtin/clone.c:253
c04f5ac3 3685#, c-format
4dcdc3d8
JX
3686msgid "reference repository '%s' is not a local repository."
3687msgstr "引用版本库 '%s' 不是一个本地版本库。"
c04f5ac3 3688
2e8451e8 3689#: builtin/clone.c:316
c04f5ac3
JX
3690#, c-format
3691msgid "failed to create directory '%s'"
90e6ef53 3692msgstr "无法创建目录 '%s'"
c04f5ac3 3693
2e8451e8 3694#: builtin/clone.c:318 builtin/diff.c:77
c04f5ac3
JX
3695#, c-format
3696msgid "failed to stat '%s'"
90e6ef53 3697msgstr "无法枚举 '%s' 状态"
c04f5ac3 3698
2e8451e8 3699#: builtin/clone.c:320
c04f5ac3
JX
3700#, c-format
3701msgid "%s exists and is not a directory"
3702msgstr "%s 存在且不是一个目录"
3703
2e8451e8 3704#: builtin/clone.c:334
c04f5ac3
JX
3705#, c-format
3706msgid "failed to stat %s\n"
90e6ef53 3707msgstr "无法枚举 %s 状态\n"
c04f5ac3 3708
2e8451e8 3709#: builtin/clone.c:356
c04f5ac3
JX
3710#, c-format
3711msgid "failed to create link '%s'"
90e6ef53 3712msgstr "无法创建链接 '%s'"
c04f5ac3 3713
2e8451e8 3714#: builtin/clone.c:360
c04f5ac3
JX
3715#, c-format
3716msgid "failed to copy file to '%s'"
90e6ef53 3717msgstr "无法拷贝文件至 '%s'"
c04f5ac3 3718
2e8451e8 3719#: builtin/clone.c:383
c04f5ac3
JX
3720#, c-format
3721msgid "done.\n"
3722msgstr "完成。\n"
3723
2e8451e8 3724#: builtin/clone.c:396
1003b3a5
JX
3725msgid ""
3726"Clone succeeded, but checkout failed.\n"
3727"You can inspect what was checked out with 'git status'\n"
3728"and retry the checkout with 'git checkout -f HEAD'\n"
3729msgstr ""
3730"克隆成功,但是检出失败。\n"
3731"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
3732"'git checkout -f HEAD' 重试\n"
3733
2e8451e8 3734#: builtin/clone.c:475
c04f5ac3
JX
3735#, c-format
3736msgid "Could not find remote branch %s to clone."
90e6ef53 3737msgstr "不能发现要克隆的远程分支 %s。"
c04f5ac3 3738
2e8451e8
JX
3739#: builtin/clone.c:555
3740#, c-format
3741msgid "Checking connectivity... "
3742msgstr "检查连接... "
3743
3744#: builtin/clone.c:558
1003b3a5
JX
3745msgid "remote did not send all necessary objects"
3746msgstr "远程没有发送所有必须的对象"
3747
2e8451e8
JX
3748#: builtin/clone.c:560
3749#, c-format
3750msgid "done\n"
3751msgstr "完成\n"
3752
3753#: builtin/clone.c:621
c04f5ac3
JX
3754msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3755msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
3756
2e8451e8 3757#: builtin/clone.c:652
1003b3a5
JX
3758msgid "unable to checkout working tree"
3759msgstr "不能检出工作区"
3760
2e8451e8 3761#: builtin/clone.c:760
c04f5ac3
JX
3762msgid "Too many arguments."
3763msgstr "太多参数。"
3764
2e8451e8 3765#: builtin/clone.c:764
c04f5ac3 3766msgid "You must specify a repository to clone."
90e6ef53 3767msgstr "您必须指定一个版本库来克隆。"
c04f5ac3 3768
2e8451e8 3769#: builtin/clone.c:775
c04f5ac3
JX
3770#, c-format
3771msgid "--bare and --origin %s options are incompatible."
3772msgstr "--bare 和 --origin %s 选项不兼容。"
3773
2e8451e8 3774#: builtin/clone.c:778
07432cef
WS
3775msgid "--bare and --separate-git-dir are incompatible."
3776msgstr "--bare 和 --separate-git-dir 选项不兼容。"
3777
2e8451e8 3778#: builtin/clone.c:791
c04f5ac3
JX
3779#, c-format
3780msgid "repository '%s' does not exist"
3781msgstr "版本库 '%s' 不存在"
3782
2e8451e8 3783#: builtin/clone.c:796
c04f5ac3
JX
3784msgid "--depth is ignored in local clones; use file:// instead."
3785msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
3786
2e8451e8
JX
3787#: builtin/clone.c:798
3788msgid "--local is ignored"
3789msgstr "--local 被忽略"
3790
3791#: builtin/clone.c:808
c04f5ac3
JX
3792#, c-format
3793msgid "destination path '%s' already exists and is not an empty directory."
90e6ef53 3794msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
c04f5ac3 3795
2e8451e8 3796#: builtin/clone.c:818
c04f5ac3
JX
3797#, c-format
3798msgid "working tree '%s' already exists."
3799msgstr "工作区 '%s' 已经存在。"
3800
2e8451e8 3801#: builtin/clone.c:831 builtin/clone.c:843
c04f5ac3
JX
3802#, c-format
3803msgid "could not create leading directories of '%s'"
90e6ef53 3804msgstr "不能为 '%s' 创建先导目录"
c04f5ac3 3805
2e8451e8 3806#: builtin/clone.c:834
c04f5ac3
JX
3807#, c-format
3808msgid "could not create work tree dir '%s'."
90e6ef53 3809msgstr "不能为 '%s' 创建工作区目录。"
c04f5ac3 3810
2e8451e8 3811#: builtin/clone.c:853
c04f5ac3
JX
3812#, c-format
3813msgid "Cloning into bare repository '%s'...\n"
3814msgstr "克隆到裸版本库 '%s'...\n"
3815
2e8451e8 3816#: builtin/clone.c:855
c04f5ac3
JX
3817#, c-format
3818msgid "Cloning into '%s'...\n"
3819msgstr "正克隆到 '%s'...\n"
3820
2e8451e8 3821#: builtin/clone.c:890
c04f5ac3
JX
3822#, c-format
3823msgid "Don't know how to clone %s"
3824msgstr "不知道如何克隆 %s"
3825
2e8451e8 3826#: builtin/clone.c:942
c04f5ac3
JX
3827#, c-format
3828msgid "Remote branch %s not found in upstream %s"
3829msgstr "远程分支 %s 在上游 %s 未发现"
3830
2e8451e8 3831#: builtin/clone.c:949
c04f5ac3
JX
3832msgid "You appear to have cloned an empty repository."
3833msgstr "您似乎克隆了一个空版本库。"
3834
ef317cd5
JX
3835#: builtin/column.c:9
3836msgid "git column [options]"
07432cef 3837msgstr "git column [选项]"
ef317cd5
JX
3838
3839#: builtin/column.c:26
3840msgid "lookup config vars"
07432cef 3841msgstr "查找配置变量"
ef317cd5
JX
3842
3843#: builtin/column.c:27 builtin/column.c:28
ef317cd5 3844msgid "layout to use"
07432cef 3845msgstr "要使用的布局"
ef317cd5
JX
3846
3847#: builtin/column.c:29
3848msgid "Maximum width"
07432cef 3849msgstr "最大宽度"
ef317cd5
JX
3850
3851#: builtin/column.c:30
3852msgid "Padding space on left border"
07432cef 3853msgstr "左边框的填充空间"
ef317cd5
JX
3854
3855#: builtin/column.c:31
3856msgid "Padding space on right border"
07432cef 3857msgstr "右边框的填充空间"
ef317cd5
JX
3858
3859#: builtin/column.c:32
3860msgid "Padding space between columns"
07432cef 3861msgstr "两列之间的填充空间"
ef317cd5 3862
8ada9598
JX
3863#: builtin/column.c:51
3864msgid "--command must be the first argument"
81809b99 3865msgstr "--command 必须是第一个参数"
8ada9598 3866
2e8451e8 3867#: builtin/commit.c:35
a77c07d9
JX
3868msgid "git commit [options] [--] <pathspec>..."
3869msgstr "git commit [选项] [--] <路径匹配>..."
ef317cd5 3870
2e8451e8 3871#: builtin/commit.c:40
a77c07d9
JX
3872msgid "git status [options] [--] <pathspec>..."
3873msgstr "git status [选项] [--] <路径匹配>..."
ef317cd5 3874
2e8451e8 3875#: builtin/commit.c:45
c04f5ac3
JX
3876msgid ""
3877"Your name and email address were configured automatically based\n"
3878"on your username and hostname. Please check that they are accurate.\n"
3879"You can suppress this message by setting them explicitly:\n"
3880"\n"
3881" git config --global user.name \"Your Name\"\n"
3882" git config --global user.email you@example.com\n"
3883"\n"
3884"After doing this, you may fix the identity used for this commit with:\n"
3885"\n"
3886" git commit --amend --reset-author\n"
3887msgstr ""
90e6ef53
JX
3888"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
3889"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
c04f5ac3
JX
3890"\n"
3891" git config --global user.name \"Your Name\"\n"
3892" git config --global user.email you@example.com\n"
3893"\n"
90e6ef53 3894"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
c04f5ac3
JX
3895"\n"
3896" git commit --amend --reset-author\n"
3897
2e8451e8 3898#: builtin/commit.c:57
c04f5ac3
JX
3899msgid ""
3900"You asked to amend the most recent commit, but doing so would make\n"
3901"it empty. You can repeat your command with --allow-empty, or you can\n"
3902"remove the commit entirely with \"git reset HEAD^\".\n"
3903msgstr ""
1b150dc9
T
3904"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
3905"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
c04f5ac3 3906
2e8451e8 3907#: builtin/commit.c:62
c04f5ac3
JX
3908msgid ""
3909"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3910"If you wish to commit it anyway, use:\n"
3911"\n"
3912" git commit --allow-empty\n"
3913"\n"
c04f5ac3 3914msgstr ""
a9ce4543
T
3915"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
3916"也要提交,使用命令:\n"
c04f5ac3
JX
3917"\n"
3918" git commit --allow-empty\n"
3919"\n"
c04f5ac3 3920
b1894384
JX
3921#: builtin/commit.c:69
3922msgid "Otherwise, please use 'git reset'\n"
3923msgstr "否则,请使用命令 'git reset'\n"
3924
3925#: builtin/commit.c:72
3926msgid ""
3927"If you wish to skip this commit, use:\n"
3928"\n"
3929" git reset\n"
3930"\n"
3931"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
3932"the remaining commits.\n"
3933msgstr ""
3934"如果您想跳过这个提交,使用命令:\n"
3935"\n"
3936" git reset\n"
3937"\n"
3938"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
3939"操作。\n"
3940
3941#: builtin/commit.c:279
c04f5ac3 3942msgid "failed to unpack HEAD tree object"
90e6ef53 3943msgstr "无法解包 HEAD 树对象"
c04f5ac3 3944
b1894384 3945#: builtin/commit.c:321
c04f5ac3 3946msgid "unable to create temporary index"
90e6ef53 3947msgstr "不能创建临时索引"
c04f5ac3 3948
b1894384 3949#: builtin/commit.c:327
c04f5ac3
JX
3950msgid "interactive add failed"
3951msgstr "交互式添加失败"
3952
b1894384 3953#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431
c04f5ac3 3954msgid "unable to write new_index file"
90e6ef53 3955msgstr "无法写 new_index 文件"
c04f5ac3 3956
b1894384 3957#: builtin/commit.c:412
8ada9598 3958msgid "cannot do a partial commit during a merge."
81809b99 3959msgstr "在合并过程中不能做部分提交。"
c04f5ac3 3960
b1894384 3961#: builtin/commit.c:414
8ada9598 3962msgid "cannot do a partial commit during a cherry-pick."
81809b99 3963msgstr "在拣选过程中不能做部分提交。"
8ada9598 3964
b1894384 3965#: builtin/commit.c:424
c04f5ac3 3966msgid "cannot read the index"
90e6ef53 3967msgstr "无法读取索引"
c04f5ac3 3968
b1894384 3969#: builtin/commit.c:444
c04f5ac3 3970msgid "unable to write temporary index file"
90e6ef53 3971msgstr "无法写临时索引文件"
c04f5ac3 3972
b1894384 3973#: builtin/commit.c:535 builtin/commit.c:541
c04f5ac3
JX
3974#, c-format
3975msgid "invalid commit: %s"
3976msgstr "无效的提交:%s"
3977
b1894384 3978#: builtin/commit.c:563
c04f5ac3
JX
3979msgid "malformed --author parameter"
3980msgstr "非法的 --author 参数"
3981
b1894384 3982#: builtin/commit.c:583
c04f5ac3
JX
3983#, c-format
3984msgid "Malformed ident string: '%s'"
90e6ef53 3985msgstr "非法的身份字符串:'%s'"
c04f5ac3 3986
b1894384 3987#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982
c04f5ac3
JX
3988#, c-format
3989msgid "could not lookup commit %s"
3990msgstr "不能查询提交 %s"
3991
b1894384 3992#: builtin/commit.c:633 builtin/shortlog.c:271
c04f5ac3
JX
3993#, c-format
3994msgid "(reading log message from standard input)\n"
90e6ef53 3995msgstr "(正从标准输入中读取日志信息)\n"
c04f5ac3 3996
b1894384 3997#: builtin/commit.c:635
c04f5ac3 3998msgid "could not read log from standard input"
90e6ef53 3999msgstr "不能从标准输入中读取日志信息"
c04f5ac3 4000
b1894384 4001#: builtin/commit.c:639
c04f5ac3
JX
4002#, c-format
4003msgid "could not read log file '%s'"
90e6ef53 4004msgstr "不能读取日志文件 '%s'"
c04f5ac3 4005
b1894384 4006#: builtin/commit.c:645
c04f5ac3
JX
4007msgid "commit has empty message"
4008msgstr "提交说明为空"
4009
b1894384 4010#: builtin/commit.c:661
c04f5ac3 4011msgid "could not read MERGE_MSG"
90e6ef53 4012msgstr "不能读取 MERGE_MSG"
c04f5ac3 4013
b1894384 4014#: builtin/commit.c:665
c04f5ac3 4015msgid "could not read SQUASH_MSG"
90e6ef53 4016msgstr "不能读取 SQUASH_MSG"
c04f5ac3 4017
b1894384 4018#: builtin/commit.c:669
c04f5ac3
JX
4019#, c-format
4020msgid "could not read '%s'"
90e6ef53 4021msgstr "不能读取 '%s'"
c04f5ac3 4022
b1894384 4023#: builtin/commit.c:730
c04f5ac3 4024msgid "could not write commit template"
90e6ef53 4025msgstr "不能写提交模版"
c04f5ac3 4026
b1894384 4027#: builtin/commit.c:741
81809b99 4028#, c-format
c04f5ac3
JX
4029msgid ""
4030"\n"
8ada9598 4031"It looks like you may be committing a merge.\n"
c04f5ac3
JX
4032"If this is not correct, please remove the file\n"
4033"\t%s\n"
4034"and try again.\n"
4035msgstr ""
4036"\n"
649900bc 4037"似乎您正在做一个合并提交。如果不对,请删除文件\n"
c04f5ac3
JX
4038"\t%s\n"
4039"然后重试。\n"
4040
b1894384 4041#: builtin/commit.c:746
81809b99 4042#, c-format
8ada9598
JX
4043msgid ""
4044"\n"
4045"It looks like you may be committing a cherry-pick.\n"
4046"If this is not correct, please remove the file\n"
4047"\t%s\n"
4048"and try again.\n"
4049msgstr ""
4050"\n"
649900bc 4051"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
8ada9598
JX
4052"\t%s\n"
4053"然后重试。\n"
c04f5ac3 4054
b1894384 4055#: builtin/commit.c:758
a77c07d9 4056#, c-format
c04f5ac3 4057msgid ""
8ada9598 4058"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 4059"with '%c' will be ignored, and an empty message aborts the commit.\n"
c04f5ac3 4060msgstr ""
a77c07d9 4061"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
81809b99 4062"说明将会终止提交。\n"
c04f5ac3 4063
b1894384 4064#: builtin/commit.c:763
a77c07d9 4065#, c-format
c04f5ac3 4066msgid ""
8ada9598 4067"Please enter the commit message for your changes. Lines starting\n"
a77c07d9 4068"with '%c' will be kept; you may remove them yourself if you want to.\n"
c04f5ac3
JX
4069"An empty message aborts the commit.\n"
4070msgstr ""
a77c07d9
JX
4071"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
4072"也可以删除它们。一个空的提交说明将会终止提交。\n"
c04f5ac3 4073
90e6ef53 4074# 译者:为保证在输出中对齐,注意调整句中空格!
b1894384 4075#: builtin/commit.c:776
c04f5ac3
JX
4076#, c-format
4077msgid "%sAuthor: %s"
4078msgstr "%s作者: %s"
4079
90e6ef53 4080# 译者:为保证在输出中对齐,注意调整句中空格!
b1894384 4081#: builtin/commit.c:783
c04f5ac3
JX
4082#, c-format
4083msgid "%sCommitter: %s"
4084msgstr "%s提交者: %s"
4085
b1894384 4086#: builtin/commit.c:803
c04f5ac3 4087msgid "Cannot read index"
90e6ef53 4088msgstr "无法读取索引"
c04f5ac3 4089
b1894384 4090#: builtin/commit.c:845
c04f5ac3
JX
4091msgid "Error building trees"
4092msgstr "无法创建树对象"
4093
b1894384 4094#: builtin/commit.c:860 builtin/tag.c:359
c04f5ac3
JX
4095#, c-format
4096msgid "Please supply the message using either -m or -F option.\n"
07432cef 4097msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
c04f5ac3 4098
b1894384 4099#: builtin/commit.c:957
c04f5ac3
JX
4100#, c-format
4101msgid "No existing author found with '%s'"
4102msgstr "没有找到匹配 '%s' 的作者"
4103
b1894384 4104#: builtin/commit.c:972 builtin/commit.c:1208
c04f5ac3
JX
4105#, c-format
4106msgid "Invalid untracked files mode '%s'"
90e6ef53 4107msgstr "无效的未追踪文件参数 '%s'"
c04f5ac3 4108
b1894384 4109#: builtin/commit.c:1009
2e8451e8
JX
4110msgid "--long and -z are incompatible"
4111msgstr "--long 和 -z 选项不兼容"
4112
b1894384 4113#: builtin/commit.c:1039
c04f5ac3
JX
4114msgid "Using both --reset-author and --author does not make sense"
4115msgstr "同时使用 --reset-author 和 --author 没有意义"
4116
b1894384 4117#: builtin/commit.c:1050
c04f5ac3 4118msgid "You have nothing to amend."
90e6ef53 4119msgstr "您没有可修补的提交。"
c04f5ac3 4120
b1894384 4121#: builtin/commit.c:1053
8ada9598 4122msgid "You are in the middle of a merge -- cannot amend."
81809b99 4123msgstr "您正处于一个合并过程中 -- 无法修补提交。"
8ada9598 4124
b1894384 4125#: builtin/commit.c:1055
8ada9598 4126msgid "You are in the middle of a cherry-pick -- cannot amend."
81809b99 4127msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
c04f5ac3 4128
b1894384 4129#: builtin/commit.c:1058
c04f5ac3 4130msgid "Options --squash and --fixup cannot be used together"
649900bc 4131msgstr "选项 --squash 和 --fixup 不能同时使用"
c04f5ac3 4132
b1894384 4133#: builtin/commit.c:1068
c04f5ac3
JX
4134msgid "Only one of -c/-C/-F/--fixup can be used."
4135msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4136
b1894384 4137#: builtin/commit.c:1070
c04f5ac3 4138msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
649900bc 4139msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
c04f5ac3 4140
b1894384 4141#: builtin/commit.c:1078
c04f5ac3 4142msgid "--reset-author can be used only with -C, -c or --amend."
649900bc 4143msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
c04f5ac3 4144
b1894384 4145#: builtin/commit.c:1095
c04f5ac3
JX
4146msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4147msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4148
b1894384 4149#: builtin/commit.c:1097
c04f5ac3
JX
4150msgid "No paths with --include/--only does not make sense."
4151msgstr "参数 --include/--only 不跟路径没有意义。"
4152
b1894384 4153#: builtin/commit.c:1099
c04f5ac3 4154msgid "Clever... amending the last one with dirty index."
90e6ef53 4155msgstr "聪明... 在索引不干净下修补最后的提交。"
c04f5ac3 4156
b1894384 4157#: builtin/commit.c:1101
c04f5ac3 4158msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
90e6ef53 4159msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
c04f5ac3 4160
b1894384 4161#: builtin/commit.c:1111 builtin/tag.c:575
c04f5ac3
JX
4162#, c-format
4163msgid "Invalid cleanup mode %s"
4164msgstr "无效的清理模式 %s"
4165
b1894384 4166#: builtin/commit.c:1116
c04f5ac3 4167msgid "Paths with -a does not make sense."
649900bc 4168msgstr "路径和 -a 选项同时使用没有意义。"
c04f5ac3 4169
b1894384 4170#: builtin/commit.c:1222 builtin/commit.c:1455
ef317cd5 4171msgid "show status concisely"
07432cef 4172msgstr "以简洁的格式显示状态"
ef317cd5 4173
b1894384 4174#: builtin/commit.c:1224 builtin/commit.c:1457
ef317cd5 4175msgid "show branch information"
07432cef 4176msgstr "显示分支信息"
ef317cd5 4177
b1894384 4178#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452
ef317cd5 4179msgid "machine-readable output"
07432cef
WS
4180msgstr "机器可读的输出"
4181
b1894384 4182#: builtin/commit.c:1229 builtin/commit.c:1461
07432cef
WS
4183msgid "show status in long format (default)"
4184msgstr "以长格式显示状态(默认)"
ef317cd5 4185
b1894384 4186#: builtin/commit.c:1232 builtin/commit.c:1464
ef317cd5 4187msgid "terminate entries with NUL"
07432cef 4188msgstr "条目以NUL字符结尾"
ef317cd5 4189
b1894384 4190#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667
2e8451e8 4191#: builtin/fast-export.c:670 builtin/tag.c:459
ef317cd5 4192msgid "mode"
07432cef 4193msgstr "模式"
ef317cd5 4194
b1894384 4195#: builtin/commit.c:1235 builtin/commit.c:1467
ef317cd5 4196msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
07432cef 4197msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
ef317cd5 4198
b1894384 4199#: builtin/commit.c:1238
ef317cd5 4200msgid "show ignored files"
07432cef 4201msgstr "显示忽略的文件"
ef317cd5 4202
b1894384 4203#: builtin/commit.c:1239 parse-options.h:154
ef317cd5
JX
4204msgid "when"
4205msgstr "何时"
4206
b1894384 4207#: builtin/commit.c:1240
ef317cd5
JX
4208msgid ""
4209"ignore changes to submodules, optional when: all, dirty, untracked. "
4210"(Default: all)"
4211msgstr ""
07432cef 4212"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
ef317cd5 4213
b1894384 4214#: builtin/commit.c:1242
ef317cd5 4215msgid "list untracked files in columns"
07432cef 4216msgstr "以列的方式显示未跟踪的文件"
ef317cd5 4217
b1894384 4218#: builtin/commit.c:1313
c04f5ac3
JX
4219msgid "couldn't look up newly created commit"
4220msgstr "无法找到新创建的提交"
4221
b1894384 4222#: builtin/commit.c:1315
c04f5ac3 4223msgid "could not parse newly created commit"
90e6ef53 4224msgstr "不能解析新创建的提交"
c04f5ac3 4225
b1894384 4226#: builtin/commit.c:1356
c04f5ac3
JX
4227msgid "detached HEAD"
4228msgstr "分离头指针"
4229
7e238ab7 4230# 译者:中文字符串拼接,可删除前导空格
b1894384 4231#: builtin/commit.c:1358
c04f5ac3 4232msgid " (root-commit)"
7e238ab7 4233msgstr "(根提交)"
c04f5ac3 4234
b1894384 4235#: builtin/commit.c:1425
ef317cd5 4236msgid "suppress summary after successful commit"
07432cef 4237msgstr "提交成功后不显示概述信息"
c04f5ac3 4238
b1894384 4239#: builtin/commit.c:1426
ef317cd5 4240msgid "show diff in commit message template"
07432cef 4241msgstr "在提交说明模板里显示差异"
c04f5ac3 4242
b1894384 4243#: builtin/commit.c:1428
ef317cd5 4244msgid "Commit message options"
07432cef 4245msgstr "提交说明选项"
c04f5ac3 4246
b1894384 4247#: builtin/commit.c:1429 builtin/tag.c:457
ef317cd5 4248msgid "read message from file"
07432cef 4249msgstr "从文件中读取提交说明"
c04f5ac3 4250
b1894384 4251#: builtin/commit.c:1430
ef317cd5 4252msgid "author"
07432cef 4253msgstr "作者"
c04f5ac3 4254
b1894384 4255#: builtin/commit.c:1430
ef317cd5 4256msgid "override author for commit"
07432cef 4257msgstr "提交时覆盖作者"
73a60cd2 4258
b1894384 4259#: builtin/commit.c:1431 builtin/gc.c:178
ef317cd5 4260msgid "date"
07432cef 4261msgstr "日期"
c04f5ac3 4262
b1894384 4263#: builtin/commit.c:1431
ef317cd5 4264msgid "override date for commit"
07432cef 4265msgstr "提交时覆盖日期"
c04f5ac3 4266
b1894384 4267#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405
2e8451e8 4268#: builtin/notes.c:562 builtin/tag.c:455
ef317cd5 4269msgid "message"
07432cef 4270msgstr "说明"
c04f5ac3 4271
b1894384 4272#: builtin/commit.c:1432
ef317cd5 4273msgid "commit message"
07432cef 4274msgstr "提交说明"
ef317cd5 4275
b1894384 4276#: builtin/commit.c:1433
ef317cd5 4277msgid "reuse and edit message from specified commit"
07432cef 4278msgstr "重用并编辑指定提交的提交说明"
ef317cd5 4279
b1894384 4280#: builtin/commit.c:1434
ef317cd5 4281msgid "reuse message from specified commit"
07432cef 4282msgstr "重用指定提交的提交说明"
ef317cd5 4283
b1894384 4284#: builtin/commit.c:1435
ef317cd5 4285msgid "use autosquash formatted message to fixup specified commit"
07432cef 4286msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
ef317cd5 4287
b1894384 4288#: builtin/commit.c:1436
ef317cd5 4289msgid "use autosquash formatted message to squash specified commit"
07432cef 4290msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
ef317cd5 4291
b1894384 4292#: builtin/commit.c:1437
ef317cd5 4293msgid "the commit is authored by me now (used with -C/-c/--amend)"
07432cef 4294msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
ef317cd5 4295
b1894384 4296#: builtin/commit.c:1438 builtin/log.c:1160 builtin/revert.c:111
ef317cd5 4297msgid "add Signed-off-by:"
07432cef 4298msgstr "添加 Signed-off-by: 签名"
ef317cd5 4299
b1894384 4300#: builtin/commit.c:1439
ef317cd5 4301msgid "use specified template file"
07432cef 4302msgstr "使用指定的模板文件"
ef317cd5 4303
b1894384 4304#: builtin/commit.c:1440
ef317cd5 4305msgid "force edit of commit"
07432cef 4306msgstr "强制编辑提交"
ef317cd5 4307
07432cef 4308# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
b1894384 4309#: builtin/commit.c:1441
ef317cd5 4310msgid "default"
07432cef 4311msgstr "default"
ef317cd5 4312
b1894384 4313#: builtin/commit.c:1441 builtin/tag.c:460
ef317cd5 4314msgid "how to strip spaces and #comments from message"
07432cef 4315msgstr "设置如何删除提交说明里的空格和#注释"
ef317cd5 4316
b1894384 4317#: builtin/commit.c:1442
ef317cd5 4318msgid "include status in commit message template"
07432cef 4319msgstr "在提交说明模板里包含状态信息"
ef317cd5 4320
b1894384 4321#: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461
ef317cd5 4322msgid "key id"
07432cef 4323msgstr "key id"
ef317cd5 4324
b1894384 4325#: builtin/commit.c:1444 builtin/merge.c:231
ef317cd5 4326msgid "GPG sign commit"
07432cef 4327msgstr "GPG 提交签名"
ef317cd5
JX
4328
4329#. end commit message options
b1894384 4330#: builtin/commit.c:1447
ef317cd5 4331msgid "Commit contents options"
07432cef 4332msgstr "提交内容选项"
ef317cd5 4333
b1894384 4334#: builtin/commit.c:1448
ef317cd5 4335msgid "commit all changed files"
07432cef 4336msgstr "提交所有改动的文件"
ef317cd5 4337
b1894384 4338#: builtin/commit.c:1449
ef317cd5 4339msgid "add specified files to index for commit"
07432cef 4340msgstr "添加指定的文件到索引区等待提交"
ef317cd5 4341
b1894384 4342#: builtin/commit.c:1450
ef317cd5 4343msgid "interactively add files"
07432cef 4344msgstr "交互式添加文件"
ef317cd5 4345
b1894384 4346#: builtin/commit.c:1451
ef317cd5 4347msgid "interactively add changes"
07432cef 4348msgstr "交互式添加变更"
ef317cd5 4349
b1894384 4350#: builtin/commit.c:1452
ef317cd5 4351msgid "commit only specified files"
07432cef 4352msgstr "只提交指定的文件"
ef317cd5 4353
b1894384 4354#: builtin/commit.c:1453
ef317cd5 4355msgid "bypass pre-commit hook"
07432cef 4356msgstr "绕过 pre-commit 钩子"
ef317cd5 4357
b1894384 4358#: builtin/commit.c:1454
ef317cd5 4359msgid "show what would be committed"
07432cef 4360msgstr "显示将要提交的内容"
ef317cd5 4361
b1894384 4362#: builtin/commit.c:1465
ef317cd5 4363msgid "amend previous commit"
07432cef 4364msgstr "修改先前的提交"
ef317cd5 4365
b1894384 4366#: builtin/commit.c:1466
ef317cd5 4367msgid "bypass post-rewrite hook"
07432cef 4368msgstr "绕过 post-rewrite 钩子"
ef317cd5 4369
b1894384 4370#: builtin/commit.c:1471
ef317cd5 4371msgid "ok to record an empty change"
07432cef 4372msgstr "允许一个空提交"
ef317cd5 4373
b1894384 4374#: builtin/commit.c:1474
ef317cd5 4375msgid "ok to record a change with an empty message"
07432cef 4376msgstr "允许空的提交说明"
ef317cd5 4377
b1894384 4378#: builtin/commit.c:1507
c04f5ac3 4379msgid "could not parse HEAD commit"
90e6ef53 4380msgstr "不能解析 HEAD 提交"
c04f5ac3 4381
b1894384 4382#: builtin/commit.c:1545 builtin/merge.c:525
c04f5ac3
JX
4383#, c-format
4384msgid "could not open '%s' for reading"
90e6ef53 4385msgstr "不能为读入打开 '%s'"
c04f5ac3 4386
b1894384 4387#: builtin/commit.c:1552
c04f5ac3
JX
4388#, c-format
4389msgid "Corrupt MERGE_HEAD file (%s)"
90e6ef53 4390msgstr "损坏的 MERGE_HEAD 文件(%s)"
c04f5ac3 4391
b1894384 4392#: builtin/commit.c:1559
c04f5ac3 4393msgid "could not read MERGE_MODE"
90e6ef53 4394msgstr "不能读取 MERGE_MODE"
c04f5ac3 4395
b1894384 4396#: builtin/commit.c:1578
c04f5ac3
JX
4397#, c-format
4398msgid "could not read commit message: %s"
90e6ef53 4399msgstr "不能读取提交说明:%s"
c04f5ac3 4400
b1894384 4401#: builtin/commit.c:1592
73a60cd2
JX
4402#, c-format
4403msgid "Aborting commit; you did not edit the message.\n"
4404msgstr "终止提交;您未更改来自模版的提交说明。\n"
4405
b1894384 4406#: builtin/commit.c:1597
c04f5ac3
JX
4407#, c-format
4408msgid "Aborting commit due to empty commit message.\n"
4409msgstr "终止提交因为提交说明为空。\n"
4410
b1894384 4411#: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886
c04f5ac3 4412msgid "failed to write commit object"
90e6ef53 4413msgstr "无法写提交对象"
c04f5ac3 4414
b1894384 4415#: builtin/commit.c:1633
c04f5ac3
JX
4416msgid "cannot lock HEAD ref"
4417msgstr "无法锁定 HEAD 引用"
4418
b1894384 4419#: builtin/commit.c:1637
c04f5ac3
JX
4420msgid "cannot update HEAD ref"
4421msgstr "无法更新 HEAD 引用"
4422
b1894384 4423#: builtin/commit.c:1648
c04f5ac3
JX
4424msgid ""
4425"Repository has been updated, but unable to write\n"
4426"new_index file. Check that disk is not full or quota is\n"
4427"not exceeded, and then \"git reset HEAD\" to recover."
4428msgstr ""
90e6ef53
JX
4429"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
4430"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
c04f5ac3 4431
ef317cd5
JX
4432#: builtin/config.c:7
4433msgid "git config [options]"
07432cef 4434msgstr "git config [选项]"
ef317cd5 4435
2e8451e8 4436#: builtin/config.c:52
ef317cd5 4437msgid "Config file location"
07432cef 4438msgstr "配置文件位置"
ef317cd5 4439
2e8451e8 4440#: builtin/config.c:53
ef317cd5 4441msgid "use global config file"
07432cef 4442msgstr "使用全局配置文件"
ef317cd5 4443
2e8451e8 4444#: builtin/config.c:54
ef317cd5 4445msgid "use system config file"
07432cef 4446msgstr "使用系统级配置文件"
ef317cd5 4447
2e8451e8 4448#: builtin/config.c:55
ef317cd5 4449msgid "use repository config file"
07432cef 4450msgstr "使用版本库级配置文件"
ef317cd5 4451
2e8451e8 4452#: builtin/config.c:56
ef317cd5 4453msgid "use given config file"
07432cef 4454msgstr "使用指定的配置文件"
ef317cd5 4455
2e8451e8
JX
4456#: builtin/config.c:57
4457msgid "blob-id"
4458msgstr "数据对象ID"
4459
4460#: builtin/config.c:57
4461msgid "read config from given blob object"
4462msgstr "从给定的数据对象读取配置"
4463
4464#: builtin/config.c:58
ef317cd5 4465msgid "Action"
07432cef 4466msgstr "操作"
ef317cd5 4467
2e8451e8 4468#: builtin/config.c:59
ef317cd5 4469msgid "get value: name [value-regex]"
07432cef 4470msgstr "获取值:name [value-regex]"
ef317cd5 4471
2e8451e8 4472#: builtin/config.c:60
ef317cd5 4473msgid "get all values: key [value-regex]"
07432cef 4474msgstr "获得所有的值:key [value-regex]"
ef317cd5 4475
2e8451e8 4476#: builtin/config.c:61
ef317cd5 4477msgid "get values for regexp: name-regex [value-regex]"
07432cef 4478msgstr "根据正则表达式获得值:name-regex [value-regex]"
ef317cd5 4479
2e8451e8 4480#: builtin/config.c:62
ef317cd5 4481msgid "replace all matching variables: name value [value_regex]"
07432cef 4482msgstr "替换所有匹配的变量:name value [value_regex]"
ef317cd5 4483
2e8451e8 4484#: builtin/config.c:63
ef317cd5 4485msgid "add a new variable: name value"
07432cef 4486msgstr "添加一个新的变量:name value"
ef317cd5 4487
2e8451e8 4488#: builtin/config.c:64
ef317cd5 4489msgid "remove a variable: name [value-regex]"
07432cef 4490msgstr "删除一个变量:name [value-regex]"
ef317cd5 4491
2e8451e8 4492#: builtin/config.c:65
ef317cd5 4493msgid "remove all matches: name [value-regex]"
07432cef 4494msgstr "删除所有匹配项:name [value-regex]"
ef317cd5 4495
2e8451e8 4496#: builtin/config.c:66
ef317cd5 4497msgid "rename section: old-name new-name"
07432cef 4498msgstr "重命名小节:old-name new-name"
ef317cd5 4499
2e8451e8 4500#: builtin/config.c:67
ef317cd5 4501msgid "remove a section: name"
07432cef 4502msgstr "删除一个小节:name"
ef317cd5 4503
2e8451e8 4504#: builtin/config.c:68
ef317cd5 4505msgid "list all"
07432cef 4506msgstr "列出所有"
ef317cd5 4507
2e8451e8 4508#: builtin/config.c:69
ef317cd5 4509msgid "open an editor"
07432cef 4510msgstr "打开一个编辑器"
ef317cd5 4511
2e8451e8 4512#: builtin/config.c:70 builtin/config.c:71
ef317cd5 4513msgid "slot"
07432cef 4514msgstr "slot"
ef317cd5 4515
2e8451e8 4516#: builtin/config.c:70
ef317cd5 4517msgid "find the color configured: [default]"
07432cef 4518msgstr "找到配置的颜色:[默认]"
ef317cd5 4519
2e8451e8 4520#: builtin/config.c:71
ef317cd5 4521msgid "find the color setting: [stdout-is-tty]"
07432cef 4522msgstr "找到颜色设置:[stdout-is-tty]"
ef317cd5 4523
2e8451e8 4524#: builtin/config.c:72
ef317cd5 4525msgid "Type"
07432cef 4526msgstr "类型"
ef317cd5 4527
2e8451e8 4528#: builtin/config.c:73
ef317cd5 4529msgid "value is \"true\" or \"false\""
07432cef 4530msgstr "值是 \"true\" 或 \"false\""
ef317cd5 4531
2e8451e8 4532#: builtin/config.c:74
ef317cd5 4533msgid "value is decimal number"
07432cef 4534msgstr "值是十进制数"
ef317cd5 4535
2e8451e8 4536#: builtin/config.c:75
ef317cd5 4537msgid "value is --bool or --int"
07432cef 4538msgstr "值是 --bool or --int"
ef317cd5 4539
2e8451e8 4540#: builtin/config.c:76
ef317cd5 4541msgid "value is a path (file or directory name)"
07432cef 4542msgstr "值是一个路径(文件或目录名)"
ef317cd5 4543
2e8451e8 4544#: builtin/config.c:77
ef317cd5 4545msgid "Other"
07432cef 4546msgstr "其它"
ef317cd5 4547
2e8451e8 4548#: builtin/config.c:78
ef317cd5 4549msgid "terminate values with NUL byte"
07432cef 4550msgstr "终止值是NUL字节"
ef317cd5 4551
2e8451e8 4552#: builtin/config.c:79
ef317cd5 4553msgid "respect include directives on lookup"
07432cef 4554msgstr "查询时参照 include 指令递归查找"
ef317cd5 4555
1003b3a5 4556#: builtin/count-objects.c:82
4dcdc3d8
JX
4557msgid "git count-objects [-v] [-H | --human-readable]"
4558msgstr "git count-objects [-v] [-H | --human-readable]"
4559
4560#: builtin/count-objects.c:97
4561msgid "print sizes in human readable format"
4562msgstr "以用户可读的格式显示大小"
ef317cd5 4563
2e8451e8 4564#: builtin/describe.c:16
a8a5406a 4565msgid "git describe [options] <commit-ish>*"
07432cef 4566msgstr "git describe [选项] <提交号>*"
ef317cd5 4567
2e8451e8 4568#: builtin/describe.c:17
ef317cd5 4569msgid "git describe [options] --dirty"
07432cef 4570msgstr "git describe [选项] --dirty"
ef317cd5 4571
2e8451e8 4572#: builtin/describe.c:237
c04f5ac3
JX
4573#, c-format
4574msgid "annotated tag %s not available"
4575msgstr "注释 tag %s 无效"
4576
2e8451e8 4577#: builtin/describe.c:241
c04f5ac3
JX
4578#, c-format
4579msgid "annotated tag %s has no embedded name"
4580msgstr "注释 tag %s 没有嵌入名称"
4581
2e8451e8 4582#: builtin/describe.c:243
c04f5ac3
JX
4583#, c-format
4584msgid "tag '%s' is really '%s' here"
90e6ef53 4585msgstr "tag '%s' 的确是在 '%s'"
c04f5ac3 4586
2e8451e8 4587#: builtin/describe.c:270
c04f5ac3
JX
4588#, c-format
4589msgid "Not a valid object name %s"
4590msgstr "不是一个有效的对象名 %s"
4591
2e8451e8 4592#: builtin/describe.c:273
c04f5ac3
JX
4593#, c-format
4594msgid "%s is not a valid '%s' object"
4595msgstr "%s 不是一个有效的 '%s' 对象"
4596
2e8451e8 4597#: builtin/describe.c:290
c04f5ac3
JX
4598#, c-format
4599msgid "no tag exactly matches '%s'"
4600msgstr "没有 tag 准确匹配 '%s'"
4601
2e8451e8 4602#: builtin/describe.c:292
c04f5ac3
JX
4603#, c-format
4604msgid "searching to describe %s\n"
4605msgstr "搜索描述 %s\n"
4606
2e8451e8 4607#: builtin/describe.c:332
c04f5ac3
JX
4608#, c-format
4609msgid "finished search at %s\n"
4610msgstr "完成搜索 %s\n"
4611
2e8451e8 4612#: builtin/describe.c:359
c04f5ac3
JX
4613#, c-format
4614msgid ""
4615"No annotated tags can describe '%s'.\n"
4616"However, there were unannotated tags: try --tags."
4617msgstr ""
4618"没有注释 tag 能描述 '%s'。\n"
4619"然而,有非注释 tag:尝试 --tags。"
4620
2e8451e8 4621#: builtin/describe.c:363
c04f5ac3
JX
4622#, c-format
4623msgid ""
4624"No tags can describe '%s'.\n"
4625"Try --always, or create some tags."
4626msgstr ""
4627"没有注释 tag 能描述 '%s'。\n"
90e6ef53 4628"尝试 --always,或者创建一些 tag。"
c04f5ac3 4629
2e8451e8 4630#: builtin/describe.c:384
c04f5ac3
JX
4631#, c-format
4632msgid "traversed %lu commits\n"
4633msgstr "已遍历 %lu 个提交\n"
4634
2e8451e8 4635#: builtin/describe.c:387
c04f5ac3
JX
4636#, c-format
4637msgid ""
4638"more than %i tags found; listed %i most recent\n"
4639"gave up search at %s\n"
4640msgstr ""
90e6ef53
JX
4641"发现多于 %i 个 tag,列出最近的 %i 个\n"
4642"在 %s 放弃搜索\n"
c04f5ac3 4643
2e8451e8 4644#: builtin/describe.c:409
ef317cd5 4645msgid "find the tag that comes after the commit"
07432cef 4646msgstr "寻找提交之后的 tag(用于描述提交)"
ef317cd5 4647
2e8451e8 4648#: builtin/describe.c:410
ef317cd5 4649msgid "debug search strategy on stderr"
07432cef 4650msgstr "在标准错误上调试搜索策略"
ef317cd5 4651
2e8451e8 4652#: builtin/describe.c:411
1003b3a5
JX
4653msgid "use any ref"
4654msgstr "使用任意引用"
4655
2e8451e8 4656#: builtin/describe.c:412
1003b3a5
JX
4657msgid "use any tag, even unannotated"
4658msgstr "使用任意 tag,即使未带注解"
ef317cd5 4659
2e8451e8 4660#: builtin/describe.c:413
ef317cd5 4661msgid "always use long format"
07432cef 4662msgstr "始终使用长提交号格式"
ef317cd5 4663
2e8451e8
JX
4664#: builtin/describe.c:414
4665msgid "only follow first parent"
4666msgstr "只跟随第一个父提交"
4667
4668#: builtin/describe.c:417
ef317cd5 4669msgid "only output exact matches"
07432cef 4670msgstr "只输出精确匹配"
ef317cd5 4671
2e8451e8 4672#: builtin/describe.c:419
ef317cd5 4673msgid "consider <n> most recent tags (default: 10)"
07432cef 4674msgstr "考虑最近 <n> 个 tags(默认:10)"
ef317cd5 4675
2e8451e8 4676#: builtin/describe.c:421
ef317cd5 4677msgid "only consider tags matching <pattern>"
07432cef 4678msgstr "只考虑匹配 <模式> 的 tags"
ef317cd5 4679
2e8451e8 4680#: builtin/describe.c:423 builtin/name-rev.c:322
ef317cd5 4681msgid "show abbreviated commit object as fallback"
07432cef 4682msgstr "显示简写的提交号作为后备"
ef317cd5 4683
2e8451e8 4684#: builtin/describe.c:424
ef317cd5 4685msgid "mark"
07432cef 4686msgstr "标记"
ef317cd5 4687
2e8451e8 4688#: builtin/describe.c:425
ef317cd5 4689msgid "append <mark> on dirty working tree (default: \"-dirty\")"
07432cef 4690msgstr "若工作区脏(有变更)在结尾添加 <标记>(默认:\"-dirty\")"
ef317cd5 4691
2e8451e8 4692#: builtin/describe.c:443
c04f5ac3
JX
4693msgid "--long is incompatible with --abbrev=0"
4694msgstr "--long 与 --abbrev=0 不兼容"
4695
2e8451e8 4696#: builtin/describe.c:469
c04f5ac3 4697msgid "No names found, cannot describe anything."
90e6ef53 4698msgstr "没有发现名称,无法描述任何东西。"
c04f5ac3 4699
2e8451e8 4700#: builtin/describe.c:489
a8a5406a 4701msgid "--dirty is incompatible with commit-ishes"
649900bc 4702msgstr "--dirty 不能与提交同时使用"
c04f5ac3 4703
c160d03f 4704#: builtin/diff.c:79
c04f5ac3
JX
4705#, c-format
4706msgid "'%s': not a regular file or symlink"
4707msgstr "'%s':不是一个正规文件或符号链接"
4708
2e8451e8 4709#: builtin/diff.c:230
c04f5ac3
JX
4710#, c-format
4711msgid "invalid option: %s"
4712msgstr "无效选项:%s"
4713
2e8451e8 4714#: builtin/diff.c:307
c04f5ac3
JX
4715msgid "Not a git repository"
4716msgstr "不是一个 git 版本库"
4717
2e8451e8 4718#: builtin/diff.c:350
c04f5ac3
JX
4719#, c-format
4720msgid "invalid object '%s' given."
4721msgstr "提供了无效对象 '%s'。"
4722
2e8451e8 4723#: builtin/diff.c:359
c04f5ac3
JX
4724#, c-format
4725msgid "more than two blobs given: '%s'"
07432cef 4726msgstr "提供了超过两个数据(blob)对象:'%s'"
c04f5ac3 4727
2e8451e8 4728#: builtin/diff.c:366
c04f5ac3
JX
4729#, c-format
4730msgid "unhandled object '%s' given."
4731msgstr "提供了无法处理的对象 '%s'。"
4732
ef317cd5
JX
4733#: builtin/fast-export.c:22
4734msgid "git fast-export [rev-list-opts]"
07432cef 4735msgstr "git fast-export [rev-list-opts]"
ef317cd5 4736
2e8451e8 4737#: builtin/fast-export.c:666
ef317cd5 4738msgid "show progress after <n> objects"
07432cef 4739msgstr "在 <n> 个对象之后显示进度"
ef317cd5 4740
2e8451e8 4741#: builtin/fast-export.c:668
ef317cd5 4742msgid "select handling of signed tags"
07432cef 4743msgstr "选择如何处理签名 tags"
ef317cd5 4744
2e8451e8 4745#: builtin/fast-export.c:671
ef317cd5 4746msgid "select handling of tags that tag filtered objects"
07432cef 4747msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
ef317cd5 4748
2e8451e8 4749#: builtin/fast-export.c:674
ef317cd5 4750msgid "Dump marks to this file"
07432cef 4751msgstr "把标记存储到这个文件"
ef317cd5 4752
2e8451e8 4753#: builtin/fast-export.c:676
ef317cd5 4754msgid "Import marks from this file"
07432cef 4755msgstr "从这个文件导入标记"
ef317cd5 4756
2e8451e8 4757#: builtin/fast-export.c:678
ef317cd5 4758msgid "Fake a tagger when tags lack one"
07432cef 4759msgstr "当 tags 缺少标记者字段时,假装提供一个"
ef317cd5 4760
2e8451e8 4761#: builtin/fast-export.c:680
ef317cd5 4762msgid "Output full tree for each commit"
07432cef 4763msgstr "每次提交都输出整个树"
ef317cd5 4764
2e8451e8 4765#: builtin/fast-export.c:682
ef317cd5 4766msgid "Use the done feature to terminate the stream"
07432cef 4767msgstr "使用 done 功能来终止流"
ef317cd5 4768
2e8451e8 4769#: builtin/fast-export.c:683
ef317cd5 4770msgid "Skip output of blob data"
07432cef 4771msgstr "跳过数据对象的输出"
ef317cd5
JX
4772
4773#: builtin/fetch.c:20
ef317cd5 4774msgid "git fetch [<options>] [<repository> [<refspec>...]]"
07432cef 4775msgstr "git fetch [<选项>] [<版本库> [<引用表达式>...]]"
ef317cd5
JX
4776
4777#: builtin/fetch.c:21
4778msgid "git fetch [<options>] <group>"
07432cef 4779msgstr "git fetch [<选项>] <组>"
ef317cd5
JX
4780
4781#: builtin/fetch.c:22
4782msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
07432cef 4783msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
ef317cd5
JX
4784
4785#: builtin/fetch.c:23
4786msgid "git fetch --all [<options>]"
07432cef 4787msgstr "git fetch --all [<选项>]"
ef317cd5
JX
4788
4789#: builtin/fetch.c:60
4790msgid "fetch from all remotes"
07432cef 4791msgstr "从所有的远程抓取"
ef317cd5
JX
4792
4793#: builtin/fetch.c:62
4794msgid "append to .git/FETCH_HEAD instead of overwriting"
07432cef 4795msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
ef317cd5
JX
4796
4797#: builtin/fetch.c:64
4798msgid "path to upload pack on remote end"
07432cef 4799msgstr "上传包到远程的路径"
ef317cd5
JX
4800
4801#: builtin/fetch.c:65
4802msgid "force overwrite of local branch"
07432cef 4803msgstr "强制覆盖本地分支"
ef317cd5
JX
4804
4805#: builtin/fetch.c:67
4806msgid "fetch from multiple remotes"
07432cef 4807msgstr "从多个远程抓取"
ef317cd5
JX
4808
4809#: builtin/fetch.c:69
ef317cd5 4810msgid "fetch all tags and associated objects"
07432cef 4811msgstr "抓取所有的 tags 和关联对象"
ef317cd5
JX
4812
4813#: builtin/fetch.c:71
4814msgid "do not fetch all tags (--no-tags)"
07432cef 4815msgstr "不抓取任何 tags (--no-tags)"
ef317cd5
JX
4816
4817#: builtin/fetch.c:73
ef317cd5 4818msgid "prune remote-tracking branches no longer on remote"
07432cef 4819msgstr "清除远程已经不存在的分支的跟踪分支"
ef317cd5 4820
07432cef 4821# 译者:可选值,不能翻译
ef317cd5
JX
4822#: builtin/fetch.c:74
4823msgid "on-demand"
07432cef 4824msgstr "on-demand"
ef317cd5
JX
4825
4826#: builtin/fetch.c:75
4827msgid "control recursive fetching of submodules"
07432cef 4828msgstr "控制子模组的递归抓取"
ef317cd5
JX
4829
4830#: builtin/fetch.c:79
4831msgid "keep downloaded pack"
07432cef 4832msgstr "保持下载包"
ef317cd5
JX
4833
4834#: builtin/fetch.c:81
ef317cd5 4835msgid "allow updating of HEAD ref"
07432cef 4836msgstr "允许更新 HEAD 引用"
ef317cd5
JX
4837
4838#: builtin/fetch.c:84
4839msgid "deepen history of shallow clone"
07432cef 4840msgstr "深化浅克隆的历史"
ef317cd5 4841
a77c07d9
JX
4842#: builtin/fetch.c:86
4843msgid "convert to a complete repository"
4844msgstr "转换为一个完整的版本库"
4845
2e8451e8 4846#: builtin/fetch.c:88 builtin/log.c:1177
ef317cd5 4847msgid "dir"
07432cef 4848msgstr "目录"
ef317cd5 4849
a77c07d9 4850#: builtin/fetch.c:89
ef317cd5 4851msgid "prepend this to submodule path output"
07432cef 4852msgstr "在子模组路径输出的前面加上此目录"
ef317cd5 4853
a77c07d9 4854#: builtin/fetch.c:92
ef317cd5 4855msgid "default mode for recursion"
07432cef 4856msgstr "递归的默认模式"
ef317cd5 4857
2e8451e8 4858#: builtin/fetch.c:220
c04f5ac3
JX
4859msgid "Couldn't find remote ref HEAD"
4860msgstr "无法发现远程 HEAD 引用"
4861
2e8451e8 4862#: builtin/fetch.c:273
c04f5ac3
JX
4863#, c-format
4864msgid "object %s not found"
4865msgstr "对象 %s 未发现"
4866
2e8451e8 4867#: builtin/fetch.c:278
c04f5ac3
JX
4868msgid "[up to date]"
4869msgstr "[最新]"
4870
2e8451e8 4871#: builtin/fetch.c:292
c04f5ac3
JX
4872#, c-format
4873msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4874msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
4875
2e8451e8 4876#: builtin/fetch.c:293 builtin/fetch.c:379
c04f5ac3
JX
4877msgid "[rejected]"
4878msgstr "[已拒绝]"
4879
2e8451e8 4880#: builtin/fetch.c:304
c04f5ac3
JX
4881msgid "[tag update]"
4882msgstr "[tag更新]"
4883
90e6ef53 4884# 译者:注意保持前导空格
2e8451e8 4885#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359
c04f5ac3
JX
4886msgid " (unable to update local ref)"
4887msgstr " (不能更新本地引用)"
4888
2e8451e8 4889#: builtin/fetch.c:324
c04f5ac3
JX
4890msgid "[new tag]"
4891msgstr "[新tag]"
4892
2e8451e8 4893#: builtin/fetch.c:327
c04f5ac3
JX
4894msgid "[new branch]"
4895msgstr "[新分支]"
4896
2e8451e8 4897#: builtin/fetch.c:330
170e9899
JX
4898msgid "[new ref]"
4899msgstr "[新引用]"
4900
2e8451e8 4901#: builtin/fetch.c:375
c04f5ac3
JX
4902msgid "unable to update local ref"
4903msgstr "不能更新本地引用"
4904
2e8451e8 4905#: builtin/fetch.c:375
c04f5ac3
JX
4906msgid "forced update"
4907msgstr "强制更新"
4908
2e8451e8 4909#: builtin/fetch.c:381
c04f5ac3 4910msgid "(non-fast-forward)"
90e6ef53 4911msgstr "(非快进式)"
c04f5ac3 4912
2e8451e8 4913#: builtin/fetch.c:412 builtin/fetch.c:718
c04f5ac3
JX
4914#, c-format
4915msgid "cannot open %s: %s\n"
4916msgstr "无法打开 %s:%s\n"
4917
2e8451e8 4918#: builtin/fetch.c:421
c04f5ac3
JX
4919#, c-format
4920msgid "%s did not send all necessary objects\n"
4921msgstr "%s 未发送所有必须的对象\n"
4922
2e8451e8 4923#: builtin/fetch.c:520
c04f5ac3
JX
4924#, c-format
4925msgid "From %.*s\n"
4926msgstr "来自 %.*s\n"
4927
2e8451e8 4928#: builtin/fetch.c:531
c04f5ac3
JX
4929#, c-format
4930msgid ""
4931"some local refs could not be updated; try running\n"
4932" 'git remote prune %s' to remove any old, conflicting branches"
4933msgstr ""
4934"一些本地引用不能被更新;尝试运行\n"
4935" 'git remote prune %s' 来删除旧的、有冲突的分支"
4936
90e6ef53 4937# 译者:注意保持前导空格
2e8451e8 4938#: builtin/fetch.c:581
81809b99 4939#, c-format
8ada9598 4940msgid " (%s will become dangling)"
07432cef 4941msgstr " (%s 将成为摇摆状态)"
c04f5ac3 4942
90e6ef53 4943# 译者:注意保持前导空格
2e8451e8 4944#: builtin/fetch.c:582
81809b99 4945#, c-format
8ada9598 4946msgid " (%s has become dangling)"
07432cef 4947msgstr " (%s 已成为摇摆状态)"
c04f5ac3 4948
2e8451e8 4949#: builtin/fetch.c:589
c04f5ac3
JX
4950msgid "[deleted]"
4951msgstr "[已删除]"
4952
2e8451e8 4953#: builtin/fetch.c:590 builtin/remote.c:1055
c04f5ac3
JX
4954msgid "(none)"
4955msgstr "(无)"
4956
2e8451e8 4957#: builtin/fetch.c:708
c04f5ac3
JX
4958#, c-format
4959msgid "Refusing to fetch into current branch %s of non-bare repository"
4960msgstr "拒绝获取到非裸版本库的当前分支 %s"
4961
2e8451e8 4962#: builtin/fetch.c:742
c04f5ac3
JX
4963#, c-format
4964msgid "Don't know how to fetch from %s"
4965msgstr "不知道如何从 %s 获取"
4966
2e8451e8 4967#: builtin/fetch.c:823
c04f5ac3
JX
4968#, c-format
4969msgid "Option \"%s\" value \"%s\" is not valid for %s"
4970msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
4971
2e8451e8 4972#: builtin/fetch.c:826
c04f5ac3
JX
4973#, c-format
4974msgid "Option \"%s\" is ignored for %s\n"
81809b99 4975msgstr "选项 \"%s\" 为 %s 所忽略\n"
c04f5ac3 4976
2e8451e8 4977#: builtin/fetch.c:928
c04f5ac3
JX
4978#, c-format
4979msgid "Fetching %s\n"
d4a8e00b 4980msgstr "正在获取 %s\n"
c04f5ac3 4981
2e8451e8 4982#: builtin/fetch.c:930 builtin/remote.c:100
c04f5ac3
JX
4983#, c-format
4984msgid "Could not fetch %s"
4985msgstr "不能获取 %s"
4986
2e8451e8 4987#: builtin/fetch.c:949
c04f5ac3
JX
4988msgid ""
4989"No remote repository specified. Please, specify either a URL or a\n"
4990"remote name from which new revisions should be fetched."
90e6ef53 4991msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
c04f5ac3 4992
2e8451e8 4993#: builtin/fetch.c:969
c04f5ac3 4994msgid "You need to specify a tag name."
90e6ef53 4995msgstr "您需要指定一个 tag 名称。"
c04f5ac3 4996
2e8451e8 4997#: builtin/fetch.c:1015
a77c07d9
JX
4998msgid "--depth and --unshallow cannot be used together"
4999msgstr "--depth 和 --unshallow 不能同时使用"
5000
2e8451e8 5001#: builtin/fetch.c:1017
a77c07d9
JX
5002msgid "--unshallow on a complete repository does not make sense"
5003msgstr "对于一个完整的版本库,参数 --unshallow 没有意义"
5004
2e8451e8 5005#: builtin/fetch.c:1036
c04f5ac3
JX
5006msgid "fetch --all does not take a repository argument"
5007msgstr "fetch --all 不能带一个版本库参数"
5008
2e8451e8 5009#: builtin/fetch.c:1038
c04f5ac3
JX
5010msgid "fetch --all does not make sense with refspecs"
5011msgstr "fetch --all 带引用表达式没有任何意义"
5012
2e8451e8 5013#: builtin/fetch.c:1049
c04f5ac3
JX
5014#, c-format
5015msgid "No such remote or remote group: %s"
5016msgstr "没有这样的远程或远程组:%s"
5017
2e8451e8 5018#: builtin/fetch.c:1057
c04f5ac3 5019msgid "Fetching a group and specifying refspecs does not make sense"
90e6ef53 5020msgstr "获取组并指定引用表达式没有意义"
c04f5ac3 5021
ef317cd5
JX
5022#: builtin/fmt-merge-msg.c:13
5023msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5024msgstr ""
07432cef 5025"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
c04f5ac3 5026
2e8451e8
JX
5027#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700
5028#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179
5029#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243
ef317cd5 5030msgid "n"
07432cef 5031msgstr "n"
c04f5ac3 5032
4dcdc3d8 5033#: builtin/fmt-merge-msg.c:664
ef317cd5 5034msgid "populate log with at most <n> entries from shortlog"
07432cef 5035msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
c04f5ac3 5036
4dcdc3d8 5037#: builtin/fmt-merge-msg.c:667
ef317cd5 5038msgid "alias for --log (deprecated)"
07432cef 5039msgstr "参数 --log 的别名(已弃用)"
ef317cd5 5040
4dcdc3d8 5041#: builtin/fmt-merge-msg.c:670
ef317cd5 5042msgid "text"
07432cef 5043msgstr "文本"
ef317cd5 5044
4dcdc3d8 5045#: builtin/fmt-merge-msg.c:671
ef317cd5 5046msgid "use <text> as start of message"
07432cef 5047msgstr "使用 <文本> 作为提交说明的开始"
ef317cd5 5048
4dcdc3d8 5049#: builtin/fmt-merge-msg.c:672
ef317cd5 5050msgid "file to read from"
07432cef 5051msgstr "从文件中读取"
ef317cd5
JX
5052
5053#: builtin/for-each-ref.c:979
ef317cd5 5054msgid "git for-each-ref [options] [<pattern>]"
07432cef 5055msgstr "git for-each-ref [选项] [<模式>]"
ef317cd5
JX
5056
5057#: builtin/for-each-ref.c:994
5058msgid "quote placeholders suitably for shells"
07432cef 5059msgstr "引用占位符适用于 shells"
ef317cd5
JX
5060
5061#: builtin/for-each-ref.c:996
5062msgid "quote placeholders suitably for perl"
07432cef 5063msgstr "引用占位符适用于 perl"
ef317cd5
JX
5064
5065#: builtin/for-each-ref.c:998
5066msgid "quote placeholders suitably for python"
07432cef 5067msgstr "引用占位符适用于 python"
ef317cd5
JX
5068
5069#: builtin/for-each-ref.c:1000
5070msgid "quote placeholders suitably for tcl"
07432cef 5071msgstr "引用占位符适用于 tcl"
ef317cd5
JX
5072
5073#: builtin/for-each-ref.c:1003
5074msgid "show only <n> matched refs"
07432cef 5075msgstr "只显示 <n> 个匹配的引用"
ef317cd5
JX
5076
5077#: builtin/for-each-ref.c:1004
5078msgid "format"
07432cef 5079msgstr "格式"
ef317cd5
JX
5080
5081#: builtin/for-each-ref.c:1004
5082msgid "format to use for the output"
07432cef 5083msgstr "输出格式"
ef317cd5
JX
5084
5085#: builtin/for-each-ref.c:1005
5086msgid "key"
07432cef 5087msgstr "key"
ef317cd5
JX
5088
5089#: builtin/for-each-ref.c:1006
5090msgid "field name to sort on"
07432cef 5091msgstr "排序的字段名"
ef317cd5
JX
5092
5093#: builtin/fsck.c:608
ef317cd5 5094msgid "git fsck [options] [<object>...]"
07432cef 5095msgstr "git fsck [选项] [<对象>...]"
ef317cd5
JX
5096
5097#: builtin/fsck.c:614
5098msgid "show unreachable objects"
07432cef 5099msgstr "显示不可达的对象"
ef317cd5
JX
5100
5101#: builtin/fsck.c:615
ef317cd5 5102msgid "show dangling objects"
07432cef 5103msgstr "显示摇摆的对象"
ef317cd5
JX
5104
5105#: builtin/fsck.c:616
5106msgid "report tags"
07432cef 5107msgstr "报告 tags"
ef317cd5
JX
5108
5109#: builtin/fsck.c:617
5110msgid "report root nodes"
07432cef 5111msgstr "报告根节点"
ef317cd5
JX
5112
5113#: builtin/fsck.c:618
5114msgid "make index objects head nodes"
07432cef 5115msgstr "将索引亦作为检查的头节点"
ef317cd5
JX
5116
5117#: builtin/fsck.c:619
5118msgid "make reflogs head nodes (default)"
07432cef 5119msgstr "将引用日志作为检查的头节点(默认)"
ef317cd5
JX
5120
5121#: builtin/fsck.c:620
5122msgid "also consider packs and alternate objects"
07432cef 5123msgstr "也考虑包和备用对象"
ef317cd5
JX
5124
5125#: builtin/fsck.c:621
5126msgid "enable more strict checking"
07432cef 5127msgstr "启用更严格的检查"
ef317cd5
JX
5128
5129#: builtin/fsck.c:623
5130msgid "write dangling objects in .git/lost-found"
07432cef 5131msgstr "将摇摆对象写入 .git/lost-found 中"
ef317cd5
JX
5132
5133#: builtin/fsck.c:624 builtin/prune.c:134
5134msgid "show progress"
07432cef 5135msgstr "显示进度"
ef317cd5
JX
5136
5137#: builtin/gc.c:22
5138msgid "git gc [options]"
07432cef 5139msgstr "git gc [选项]"
ef317cd5 5140
c04f5ac3
JX
5141#: builtin/gc.c:63
5142#, c-format
5143msgid "Invalid %s: '%s'"
5144msgstr "无效的 %s:'%s'"
5145
eff6d3a9 5146#: builtin/gc.c:90
c04f5ac3
JX
5147#, c-format
5148msgid "insanely long object directory %.*s"
5149msgstr "不正常的长对象目录 %.*s"
5150
ef317cd5
JX
5151#: builtin/gc.c:179
5152msgid "prune unreferenced objects"
07432cef 5153msgstr "清除未引用的对象"
ef317cd5
JX
5154
5155#: builtin/gc.c:181
5156msgid "be more thorough (increased runtime)"
07432cef 5157msgstr "更彻底(增加运行时间)"
ef317cd5
JX
5158
5159#: builtin/gc.c:182
5160msgid "enable auto-gc mode"
07432cef 5161msgstr "启用自动垃圾回收模式"
ef317cd5 5162
07432cef 5163#: builtin/gc.c:222
c04f5ac3
JX
5164#, c-format
5165msgid ""
5166"Auto packing the repository for optimum performance. You may also\n"
5167"run \"git gc\" manually. See \"git help gc\" for more information.\n"
5168msgstr ""
90e6ef53
JX
5169"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
5170"参见 \"git help gc\" 以获取更多信息。\n"
c04f5ac3 5171
07432cef 5172#: builtin/gc.c:249
c04f5ac3
JX
5173msgid ""
5174"There are too many unreachable loose objects; run 'git prune' to remove them."
90e6ef53 5175msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
c04f5ac3 5176
ef317cd5
JX
5177#: builtin/grep.c:22
5178msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
07432cef 5179msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]"
ef317cd5 5180
07432cef 5181#: builtin/grep.c:217
c04f5ac3
JX
5182#, c-format
5183msgid "grep: failed to create thread: %s"
90e6ef53 5184msgstr "grep:无法创建线程:%s"
c04f5ac3 5185
2e8451e8 5186#: builtin/grep.c:364
c04f5ac3
JX
5187#, c-format
5188msgid "Failed to chdir: %s"
5189msgstr "无法切换目录:%s"
5190
2e8451e8 5191#: builtin/grep.c:442 builtin/grep.c:477
c04f5ac3
JX
5192#, c-format
5193msgid "unable to read tree (%s)"
90e6ef53 5194msgstr "无法读取树(%s)"
c04f5ac3 5195
2e8451e8 5196#: builtin/grep.c:492
c04f5ac3
JX
5197#, c-format
5198msgid "unable to grep from object of type %s"
5199msgstr "无法抓取来自于 %s 类型的对象"
5200
2e8451e8 5201#: builtin/grep.c:550
c04f5ac3
JX
5202#, c-format
5203msgid "switch `%c' expects a numerical value"
5204msgstr "开关 `%c' 期望一个数字值"
5205
2e8451e8 5206#: builtin/grep.c:567
c04f5ac3
JX
5207#, c-format
5208msgid "cannot open '%s'"
5209msgstr "不能打开 '%s'"
5210
2e8451e8 5211#: builtin/grep.c:642
ef317cd5 5212msgid "search in index instead of in the work tree"
07432cef 5213msgstr "在索引区搜索而不是在工作区"
ef317cd5 5214
2e8451e8 5215#: builtin/grep.c:644
ef317cd5 5216msgid "find in contents not managed by git"
07432cef 5217msgstr "在未被 git 管理的内容中查找"
ef317cd5
JX
5218
5219# 译者:中文字符串拼接,可删除前导空格
2e8451e8 5220#: builtin/grep.c:646
ef317cd5 5221msgid "search in both tracked and untracked files"
07432cef 5222msgstr "在跟踪和未跟踪的文件中搜索"
ef317cd5 5223
2e8451e8 5224#: builtin/grep.c:648
ef317cd5 5225msgid "search also in ignored files"
07432cef 5226msgstr "也在忽略的文件中搜索"
ef317cd5 5227
2e8451e8 5228#: builtin/grep.c:651
ef317cd5 5229msgid "show non-matching lines"
07432cef 5230msgstr "显示未匹配的行"
ef317cd5 5231
2e8451e8 5232#: builtin/grep.c:653
ef317cd5 5233msgid "case insensitive matching"
07432cef 5234msgstr "不区分大小写匹配"
ef317cd5 5235
2e8451e8 5236#: builtin/grep.c:655
ef317cd5 5237msgid "match patterns only at word boundaries"
07432cef 5238msgstr "只在单词边界匹配模式"
ef317cd5 5239
2e8451e8 5240#: builtin/grep.c:657
ef317cd5 5241msgid "process binary files as text"
07432cef 5242msgstr "把二进制文件当做文本处理"
ef317cd5 5243
2e8451e8 5244#: builtin/grep.c:659
ef317cd5 5245msgid "don't match patterns in binary files"
07432cef 5246msgstr "不在二进制文件中匹配模式"
ef317cd5 5247
2e8451e8 5248#: builtin/grep.c:662
ef317cd5 5249msgid "descend at most <depth> levels"
07432cef 5250msgstr "最多以指定的深度向下寻找"
ef317cd5 5251
2e8451e8 5252#: builtin/grep.c:666
ef317cd5 5253msgid "use extended POSIX regular expressions"
07432cef 5254msgstr "使用扩展的 POSIX 正则表达式"
ef317cd5 5255
2e8451e8 5256#: builtin/grep.c:669
ef317cd5 5257msgid "use basic POSIX regular expressions (default)"
07432cef 5258msgstr "使用基本的 POSIX 正则表达式(默认)"
ef317cd5 5259
2e8451e8 5260#: builtin/grep.c:672
ef317cd5 5261msgid "interpret patterns as fixed strings"
07432cef 5262msgstr "把模式解析为固定的字符串"
ef317cd5 5263
2e8451e8 5264#: builtin/grep.c:675
ef317cd5 5265msgid "use Perl-compatible regular expressions"
07432cef 5266msgstr "使用 Perl 兼容的正则表达式"
ef317cd5 5267
2e8451e8 5268#: builtin/grep.c:678
ef317cd5 5269msgid "show line numbers"
07432cef 5270msgstr "显示行号"
ef317cd5 5271
2e8451e8 5272#: builtin/grep.c:679
ef317cd5 5273msgid "don't show filenames"
07432cef 5274msgstr "不显示文件名"
ef317cd5 5275
2e8451e8 5276#: builtin/grep.c:680
ef317cd5 5277msgid "show filenames"
07432cef 5278msgstr "显示文件名"
ef317cd5 5279
2e8451e8 5280#: builtin/grep.c:682
ef317cd5 5281msgid "show filenames relative to top directory"
07432cef 5282msgstr "显示相对于顶级目录的文件名"
ef317cd5 5283
2e8451e8 5284#: builtin/grep.c:684
ef317cd5 5285msgid "show only filenames instead of matching lines"
07432cef 5286msgstr "只显示文件名而不显示匹配的行"
ef317cd5 5287
2e8451e8 5288#: builtin/grep.c:686
ef317cd5 5289msgid "synonym for --files-with-matches"
07432cef 5290msgstr "和 --files-with-matches 同义"
ef317cd5 5291
2e8451e8 5292#: builtin/grep.c:689
ef317cd5 5293msgid "show only the names of files without match"
07432cef 5294msgstr "只显示未匹配的文件名"
ef317cd5 5295
2e8451e8 5296#: builtin/grep.c:691
ef317cd5 5297msgid "print NUL after filenames"
07432cef 5298msgstr "在文件名后输出 NUL 字符"
ef317cd5 5299
2e8451e8 5300#: builtin/grep.c:693
ef317cd5 5301msgid "show the number of matches instead of matching lines"
07432cef 5302msgstr "显示总匹配行数,而不显示匹配的行"
ef317cd5 5303
2e8451e8 5304#: builtin/grep.c:694
ef317cd5 5305msgid "highlight matches"
07432cef 5306msgstr "高亮显示匹配项"
ef317cd5 5307
2e8451e8 5308#: builtin/grep.c:696
ef317cd5 5309msgid "print empty line between matches from different files"
07432cef 5310msgstr "在不同文件的匹配项之间打印空行"
ef317cd5 5311
2e8451e8 5312#: builtin/grep.c:698
ef317cd5 5313msgid "show filename only once above matches from same file"
07432cef 5314msgstr "只在同一文件的匹配项的上面显示一次文件名"
ef317cd5 5315
2e8451e8 5316#: builtin/grep.c:701
ef317cd5 5317msgid "show <n> context lines before and after matches"
07432cef 5318msgstr "显示匹配项前后的 <n> 行上下文"
ef317cd5 5319
2e8451e8 5320#: builtin/grep.c:704
ef317cd5 5321msgid "show <n> context lines before matches"
07432cef 5322msgstr "显示匹配项前 <n> 行上下文"
ef317cd5 5323
2e8451e8 5324#: builtin/grep.c:706
ef317cd5 5325msgid "show <n> context lines after matches"
07432cef 5326msgstr "显示匹配项后 <n> 行上下文"
ef317cd5 5327
2e8451e8 5328#: builtin/grep.c:707
ef317cd5 5329msgid "shortcut for -C NUM"
07432cef 5330msgstr "快捷键 -C 数字"
ef317cd5 5331
2e8451e8 5332#: builtin/grep.c:710
ef317cd5 5333msgid "show a line with the function name before matches"
07432cef 5334msgstr "在匹配的前面显示一行函数名"
ef317cd5 5335
2e8451e8 5336#: builtin/grep.c:712
ef317cd5 5337msgid "show the surrounding function"
07432cef 5338msgstr "显示所在函数的前后内容"
ef317cd5 5339
2e8451e8 5340#: builtin/grep.c:715
ef317cd5 5341msgid "read patterns from file"
07432cef 5342msgstr "从文件读取模式"
ef317cd5 5343
2e8451e8 5344#: builtin/grep.c:717
ef317cd5 5345msgid "match <pattern>"
07432cef 5346msgstr "匹配 <模式>"
ef317cd5 5347
2e8451e8 5348#: builtin/grep.c:719
ef317cd5 5349msgid "combine patterns specified with -e"
07432cef 5350msgstr "组合用 -e 参数设定的模式"
ef317cd5 5351
2e8451e8 5352#: builtin/grep.c:731
ef317cd5 5353msgid "indicate hit with exit status without output"
07432cef 5354msgstr "不输出,而用退出码标识命中状态"
ef317cd5 5355
2e8451e8 5356#: builtin/grep.c:733
ef317cd5 5357msgid "show only matches from files that match all patterns"
07432cef 5358msgstr "只显示匹配所有模式的文件中的匹配"
ef317cd5 5359
2e8451e8 5360#: builtin/grep.c:735
07432cef
WS
5361msgid "show parse tree for grep expression"
5362msgstr "显示 grep 表达式的解析树"
5363
2e8451e8 5364#: builtin/grep.c:739
ef317cd5 5365msgid "pager"
07432cef 5366msgstr "分页"
ef317cd5 5367
2e8451e8 5368#: builtin/grep.c:739
ef317cd5 5369msgid "show matching files in the pager"
07432cef 5370msgstr "分页显示匹配的文件"
ef317cd5 5371
2e8451e8 5372#: builtin/grep.c:742
ef317cd5 5373msgid "allow calling of grep(1) (ignored by this build)"
07432cef 5374msgstr "允许调用 grep(1)(本次构建忽略)"
ef317cd5 5375
2e8451e8 5376#: builtin/grep.c:743 builtin/show-ref.c:188
ef317cd5 5377msgid "show usage"
07432cef 5378msgstr "显示用法"
ef317cd5 5379
2e8451e8 5380#: builtin/grep.c:810
c04f5ac3
JX
5381msgid "no pattern given."
5382msgstr "未提供模式匹配。"
5383
2e8451e8 5384#: builtin/grep.c:865
c04f5ac3
JX
5385msgid "--open-files-in-pager only works on the worktree"
5386msgstr "--open-files-in-pager 仅用于工作区"
5387
2e8451e8 5388#: builtin/grep.c:888
c04f5ac3 5389msgid "--cached or --untracked cannot be used with --no-index."
649900bc 5390msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
c04f5ac3 5391
2e8451e8 5392#: builtin/grep.c:893
c04f5ac3 5393msgid "--no-index or --untracked cannot be used with revs."
649900bc 5394msgstr "--no-index 或 --untracked 不能和版本同时使用。"
c04f5ac3 5395
2e8451e8 5396#: builtin/grep.c:896
c04f5ac3 5397msgid "--[no-]exclude-standard cannot be used for tracked contents."
90e6ef53 5398msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
c04f5ac3 5399
2e8451e8 5400#: builtin/grep.c:904
c04f5ac3
JX
5401msgid "both --cached and trees are given."
5402msgstr "同时给出了 --cached 和树对象。"
5403
ef317cd5
JX
5404#: builtin/hash-object.c:60
5405msgid ""
5406"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5407"<file>..."
5408msgstr ""
07432cef
WS
5409"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
5410"<文件>..."
ef317cd5
JX
5411
5412#: builtin/hash-object.c:61
5413msgid "git hash-object --stdin-paths < <list-of-paths>"
07432cef 5414msgstr "git hash-object --stdin-paths < <路径列表>"
ef317cd5
JX
5415
5416#: builtin/hash-object.c:72
5417msgid "type"
07432cef 5418msgstr "类型"
ef317cd5
JX
5419
5420#: builtin/hash-object.c:72
ef317cd5 5421msgid "object type"
07432cef 5422msgstr "对象类型"
ef317cd5
JX
5423
5424#: builtin/hash-object.c:73
5425msgid "write the object into the object database"
07432cef 5426msgstr "将对象写入对象数据库"
ef317cd5
JX
5427
5428#: builtin/hash-object.c:74
5429msgid "read the object from stdin"
07432cef 5430msgstr "从标准输入读取对象"
ef317cd5
JX
5431
5432#: builtin/hash-object.c:76
5433msgid "store file as is without filters"
07432cef 5434msgstr "原样存储文件不使用过滤器"
ef317cd5
JX
5435
5436#: builtin/hash-object.c:77
5437msgid "process file as it were from this path"
07432cef 5438msgstr "处理文件并假设其来自于此路径"
ef317cd5 5439
2e8451e8 5440#: builtin/help.c:41
ef317cd5 5441msgid "print all available commands"
07432cef 5442msgstr "打印所有可用的命令"
ef317cd5 5443
2e8451e8 5444#: builtin/help.c:42
4dcdc3d8
JX
5445msgid "print list of useful guides"
5446msgstr "显示有用的指南列表"
5447
2e8451e8 5448#: builtin/help.c:43
ef317cd5 5449msgid "show man page"
07432cef 5450msgstr "显示 man 手册"
ef317cd5 5451
2e8451e8 5452#: builtin/help.c:44
ef317cd5 5453msgid "show manual in web browser"
07432cef 5454msgstr "在 web 浏览器中显示手册"
ef317cd5 5455
2e8451e8 5456#: builtin/help.c:46
ef317cd5 5457msgid "show info page"
07432cef 5458msgstr "显示 info 手册"
ef317cd5 5459
2e8451e8 5460#: builtin/help.c:52
4dcdc3d8
JX
5461msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
5462msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]"
ef317cd5 5463
2e8451e8 5464#: builtin/help.c:64
81809b99 5465#, c-format
8ada9598 5466msgid "unrecognized help format '%s'"
81809b99 5467msgstr "未能识别的帮助格式 '%s'"
8ada9598 5468
2e8451e8 5469#: builtin/help.c:92
8ada9598 5470msgid "Failed to start emacsclient."
81809b99 5471msgstr "无法启动 emacsclient。"
8ada9598 5472
2e8451e8 5473#: builtin/help.c:105
8ada9598 5474msgid "Failed to parse emacsclient version."
81809b99 5475msgstr "无法解析 emacsclient 版本。"
8ada9598 5476
2e8451e8 5477#: builtin/help.c:113
8ada9598
JX
5478#, c-format
5479msgid "emacsclient version '%d' too old (< 22)."
07432cef 5480msgstr "emacsclient 版本 '%d' 太老(< 22)。"
8ada9598 5481
2e8451e8 5482#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
81809b99 5483#, c-format
8ada9598 5484msgid "failed to exec '%s': %s"
81809b99 5485msgstr "无法执行 '%s':%s"
8ada9598 5486
2e8451e8 5487#: builtin/help.c:216
8ada9598
JX
5488#, c-format
5489msgid ""
5490"'%s': path for unsupported man viewer.\n"
5491"Please consider using 'man.<tool>.cmd' instead."
5492msgstr ""
81809b99
JX
5493"'%s':不支持的 man 手册查看器的路径。\n"
5494"请使用 'man.<tool>.cmd'。"
8ada9598 5495
2e8451e8 5496#: builtin/help.c:228
8ada9598
JX
5497#, c-format
5498msgid ""
5499"'%s': cmd for supported man viewer.\n"
5500"Please consider using 'man.<tool>.path' instead."
5501msgstr ""
81809b99
JX
5502"'%s': 支持的 man 手册查看器命令。\n"
5503"请使用 'man.<tool>.path'。"
8ada9598 5504
2e8451e8 5505#: builtin/help.c:349
8ada9598
JX
5506#, c-format
5507msgid "'%s': unknown man viewer."
81809b99 5508msgstr "'%s':未知的 man 查看器。"
8ada9598 5509
2e8451e8 5510#: builtin/help.c:366
8ada9598 5511msgid "no man viewer handled the request"
81809b99 5512msgstr "没有 man 查看器处理此请求"
8ada9598 5513
2e8451e8 5514#: builtin/help.c:374
8ada9598 5515msgid "no info viewer handled the request"
81809b99 5516msgstr "没有 info 查看器处理此请求"
8ada9598 5517
2e8451e8 5518#: builtin/help.c:420
4dcdc3d8
JX
5519msgid "Defining attributes per path"
5520msgstr "定义路径的属性"
5521
2e8451e8 5522#: builtin/help.c:421
4dcdc3d8
JX
5523msgid "A Git glossary"
5524msgstr "Git 词汇表"
5525
2e8451e8 5526#: builtin/help.c:422
4dcdc3d8
JX
5527msgid "Specifies intentionally untracked files to ignore"
5528msgstr "忽略指定的未跟踪文件"
5529
2e8451e8 5530#: builtin/help.c:423
4dcdc3d8
JX
5531msgid "Defining submodule properties"
5532msgstr "定义子模组属性"
5533
2e8451e8 5534#: builtin/help.c:424
4dcdc3d8
JX
5535msgid "Specifying revisions and ranges for Git"
5536msgstr "指定 Git 的版本和版本范围"
5537
2e8451e8 5538#: builtin/help.c:425
4dcdc3d8
JX
5539msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5540msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
5541
2e8451e8 5542#: builtin/help.c:426
4dcdc3d8
JX
5543msgid "An overview of recommended workflows with Git"
5544msgstr "Git 推荐的工作流概览"
5545
2e8451e8 5546#: builtin/help.c:438
4dcdc3d8
JX
5547msgid "The common Git guides are:\n"
5548msgstr "最常用的 Git 向导有:\n"
5549
2e8451e8 5550#: builtin/help.c:460 builtin/help.c:476
8ada9598
JX
5551#, c-format
5552msgid "usage: %s%s"
81809b99 5553msgstr "用法:%s%s"
8ada9598 5554
2e8451e8 5555#: builtin/help.c:492
8ada9598
JX
5556#, c-format
5557msgid "`git %s' is aliased to `%s'"
81809b99 5558msgstr "`git %s' 是 `%s' 的别名"
8ada9598 5559
2e8451e8 5560#: builtin/index-pack.c:184
8ada9598
JX
5561#, c-format
5562msgid "object type mismatch at %s"
81809b99 5563msgstr "%s 的对象类型不匹配"
8ada9598 5564
2e8451e8 5565#: builtin/index-pack.c:204
8ada9598 5566msgid "object of unexpected type"
81809b99 5567msgstr "意外的类型的对象"
8ada9598 5568
2e8451e8 5569#: builtin/index-pack.c:244
81809b99 5570#, c-format
8ada9598
JX
5571msgid "cannot fill %d byte"
5572msgid_plural "cannot fill %d bytes"
81809b99 5573msgstr[0] "无法填充 %d 字节"
5ae481e0 5574msgstr[1] "无法填充 %d 字节"
8ada9598 5575
2e8451e8 5576#: builtin/index-pack.c:254
8ada9598 5577msgid "early EOF"
81809b99 5578msgstr "过早的文件结束符(EOF)"
8ada9598 5579
2e8451e8 5580#: builtin/index-pack.c:255
8ada9598 5581msgid "read error on input"
81809b99 5582msgstr "输入上的读错误"
8ada9598 5583
2e8451e8 5584#: builtin/index-pack.c:267
8ada9598 5585msgid "used more bytes than were available"
81809b99 5586msgstr "用掉了超过可用的字节"
8ada9598 5587
2e8451e8 5588#: builtin/index-pack.c:274
8ada9598 5589msgid "pack too large for current definition of off_t"
81809b99 5590msgstr "包太大超过了当前 off_t 的定义"
8ada9598 5591
2e8451e8 5592#: builtin/index-pack.c:290
81809b99 5593#, c-format
8ada9598 5594msgid "unable to create '%s'"
81809b99 5595msgstr "不能创建 '%s'"
8ada9598 5596
2e8451e8 5597#: builtin/index-pack.c:295
81809b99 5598#, c-format
8ada9598 5599msgid "cannot open packfile '%s'"
81809b99 5600msgstr "无法打开包文件 '%s'"
8ada9598 5601
2e8451e8 5602#: builtin/index-pack.c:309
8ada9598 5603msgid "pack signature mismatch"
81809b99 5604msgstr "包签名不匹配"
8ada9598 5605
2e8451e8 5606#: builtin/index-pack.c:311
ef317cd5
JX
5607#, c-format
5608msgid "pack version %<PRIu32> unsupported"
07432cef 5609msgstr "不支持包版本 %<PRIu32>"
ef317cd5 5610
2e8451e8 5611#: builtin/index-pack.c:329
8ada9598
JX
5612#, c-format
5613msgid "pack has bad object at offset %lu: %s"
81809b99 5614msgstr "包中有错误的对象位于 %lu:%s"
8ada9598 5615
2e8451e8 5616#: builtin/index-pack.c:451
8ada9598
JX
5617#, c-format
5618msgid "inflate returned %d"
81809b99 5619msgstr "解压缩返回 %d"
8ada9598 5620
2e8451e8 5621#: builtin/index-pack.c:500
8ada9598 5622msgid "offset value overflow for delta base object"
81809b99 5623msgstr "偏移值覆盖了 delta 基准对象"
8ada9598 5624
2e8451e8 5625#: builtin/index-pack.c:508
8ada9598 5626msgid "delta base offset is out of bound"
81809b99 5627msgstr "delta 基准偏移越界"
8ada9598 5628
2e8451e8 5629#: builtin/index-pack.c:516
81809b99 5630#, c-format
8ada9598 5631msgid "unknown object type %d"
81809b99 5632msgstr "未知对象类型 %d"
8ada9598 5633
2e8451e8 5634#: builtin/index-pack.c:547
8ada9598 5635msgid "cannot pread pack file"
81809b99 5636msgstr "无法读取包文件"
8ada9598 5637
2e8451e8 5638#: builtin/index-pack.c:549
8ada9598
JX
5639#, c-format
5640msgid "premature end of pack file, %lu byte missing"
5641msgid_plural "premature end of pack file, %lu bytes missing"
81809b99 5642msgstr[0] "包文件过早结束,缺少 %lu 字节"
5ae481e0 5643msgstr[1] "包文件过早结束,缺少 %lu 字节"
8ada9598 5644
2e8451e8 5645#: builtin/index-pack.c:575
8ada9598 5646msgid "serious inflate inconsistency"
81809b99 5647msgstr "解压缩严重的不一致"
8ada9598 5648
2e8451e8
JX
5649#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695
5650#: builtin/index-pack.c:729 builtin/index-pack.c:738
8ada9598
JX
5651#, c-format
5652msgid "SHA1 COLLISION FOUND WITH %s !"
81809b99 5653msgstr "发现 %s 出现 SHA1 冲突!"
8ada9598 5654
2e8451e8 5655#: builtin/index-pack.c:669 builtin/pack-objects.c:170
6792b93b
JX
5656#: builtin/pack-objects.c:262
5657#, c-format
5658msgid "unable to read %s"
5659msgstr "不能读 %s"
5660
2e8451e8 5661#: builtin/index-pack.c:735
6792b93b
JX
5662#, c-format
5663msgid "cannot read existing object %s"
5664msgstr "不能读取现存对象 %s"
5665
2e8451e8 5666#: builtin/index-pack.c:749
81809b99 5667#, c-format
8ada9598 5668msgid "invalid blob object %s"
07432cef 5669msgstr "无效的数据(blob)对象 %s"
8ada9598 5670
2e8451e8 5671#: builtin/index-pack.c:763
81809b99 5672#, c-format
8ada9598 5673msgid "invalid %s"
81809b99 5674msgstr "无效的 %s"
8ada9598 5675
2e8451e8 5676#: builtin/index-pack.c:766
8ada9598 5677msgid "Error in object"
81809b99 5678msgstr "对象中出错"
8ada9598 5679
2e8451e8 5680#: builtin/index-pack.c:768
8ada9598
JX
5681#, c-format
5682msgid "Not all child objects of %s are reachable"
81809b99 5683msgstr "%s 的所有子对象并非都可达"
8ada9598 5684
2e8451e8 5685#: builtin/index-pack.c:838 builtin/index-pack.c:868
8ada9598 5686msgid "failed to apply delta"
81809b99 5687msgstr "无法应用 delta"
8ada9598 5688
2e8451e8 5689#: builtin/index-pack.c:1009
8ada9598 5690msgid "Receiving objects"
81809b99 5691msgstr "接收对象中"
8ada9598 5692
2e8451e8 5693#: builtin/index-pack.c:1009
8ada9598 5694msgid "Indexing objects"
81809b99 5695msgstr "索引对象中"
8ada9598 5696
2e8451e8 5697#: builtin/index-pack.c:1035
8ada9598 5698msgid "pack is corrupted (SHA1 mismatch)"
81809b99 5699msgstr "包冲突(SHA1 不匹配)"
8ada9598 5700
2e8451e8 5701#: builtin/index-pack.c:1040
8ada9598 5702msgid "cannot fstat packfile"
81809b99 5703msgstr "不能枚举包文件状态"
8ada9598 5704
2e8451e8 5705#: builtin/index-pack.c:1043
8ada9598 5706msgid "pack has junk at the end"
81809b99 5707msgstr "包的结尾有垃圾数据"
8ada9598 5708
2e8451e8 5709#: builtin/index-pack.c:1054
6792b93b
JX
5710msgid "confusion beyond insanity in parse_pack_objects()"
5711msgstr "parse_pack_objects() 中遇到不可理喻的问题"
5712
2e8451e8 5713#: builtin/index-pack.c:1077
8ada9598 5714msgid "Resolving deltas"
81809b99 5715msgstr "处理 delta 中"
8ada9598 5716
2e8451e8 5717#: builtin/index-pack.c:1087
07432cef 5718#, c-format
ef317cd5 5719msgid "unable to create thread: %s"
07432cef 5720msgstr "不能创建线程:%s"
ef317cd5 5721
2e8451e8 5722#: builtin/index-pack.c:1129
8ada9598 5723msgid "confusion beyond insanity"
81809b99 5724msgstr "不可理喻"
8ada9598 5725
2e8451e8 5726#: builtin/index-pack.c:1137
ef317cd5
JX
5727#, c-format
5728msgid "completed with %d local objects"
07432cef 5729msgstr "完成 %d 个本地对象"
ef317cd5 5730
2e8451e8 5731#: builtin/index-pack.c:1147
ef317cd5
JX
5732#, c-format
5733msgid "Unexpected tail checksum for %s (disk corruption?)"
07432cef 5734msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
ef317cd5 5735
2e8451e8 5736#: builtin/index-pack.c:1151
8ada9598
JX
5737#, c-format
5738msgid "pack has %d unresolved delta"
5739msgid_plural "pack has %d unresolved deltas"
81809b99 5740msgstr[0] "包有 %d 个未解决的 delta"
5ae481e0 5741msgstr[1] "包有 %d 个未解决的 delta"
8ada9598 5742
2e8451e8 5743#: builtin/index-pack.c:1176
81809b99 5744#, c-format
8ada9598 5745msgid "unable to deflate appended object (%d)"
07432cef 5746msgstr "不能压缩附加对象(%d)"
8ada9598 5747
2e8451e8 5748#: builtin/index-pack.c:1255
8ada9598
JX
5749#, c-format
5750msgid "local object %s is corrupt"
81809b99 5751msgstr "本地对象 %s 已损坏"
8ada9598 5752
2e8451e8 5753#: builtin/index-pack.c:1279
8ada9598 5754msgid "error while closing pack file"
81809b99 5755msgstr "关闭包文件时出错"
8ada9598 5756
2e8451e8 5757#: builtin/index-pack.c:1292
81809b99 5758#, c-format
8ada9598 5759msgid "cannot write keep file '%s'"
81809b99 5760msgstr "无法写保留文件 '%s'"
8ada9598 5761
2e8451e8 5762#: builtin/index-pack.c:1300
81809b99 5763#, c-format
8ada9598 5764msgid "cannot close written keep file '%s'"
81809b99 5765msgstr "无法关闭保留文件 '%s'"
8ada9598 5766
2e8451e8 5767#: builtin/index-pack.c:1313
8ada9598 5768msgid "cannot store pack file"
81809b99 5769msgstr "无法存储包文件"
8ada9598 5770
2e8451e8 5771#: builtin/index-pack.c:1324
8ada9598 5772msgid "cannot store index file"
81809b99 5773msgstr "无法存储索引文件"
8ada9598 5774
2e8451e8 5775#: builtin/index-pack.c:1357
07432cef 5776#, c-format
ef317cd5 5777msgid "bad pack.indexversion=%<PRIu32>"
07432cef 5778msgstr "坏的 pack.indexversion=%<PRIu32>"
ef317cd5 5779
2e8451e8 5780#: builtin/index-pack.c:1363
ef317cd5
JX
5781#, c-format
5782msgid "invalid number of threads specified (%d)"
07432cef 5783msgstr "指定的线程数无效(%d)"
ef317cd5 5784
2e8451e8 5785#: builtin/index-pack.c:1367 builtin/index-pack.c:1545
ef317cd5
JX
5786#, c-format
5787msgid "no threads support, ignoring %s"
07432cef 5788msgstr "没有线程支持,忽略 %s"
ef317cd5 5789
2e8451e8 5790#: builtin/index-pack.c:1425
81809b99 5791#, c-format
8ada9598 5792msgid "Cannot open existing pack file '%s'"
81809b99 5793msgstr "无法打开现存包文件 '%s'"
8ada9598 5794
2e8451e8 5795#: builtin/index-pack.c:1427
81809b99 5796#, c-format
8ada9598 5797msgid "Cannot open existing pack idx file for '%s'"
81809b99 5798msgstr "无法为 %s 打开包索引文件"
8ada9598 5799
2e8451e8 5800#: builtin/index-pack.c:1474
81809b99 5801#, c-format
8ada9598
JX
5802msgid "non delta: %d object"
5803msgid_plural "non delta: %d objects"
81809b99 5804msgstr[0] "非 delta:%d 个对象"
5ae481e0 5805msgstr[1] "非 delta:%d 个对象"
8ada9598 5806
2e8451e8 5807#: builtin/index-pack.c:1481
8ada9598
JX
5808#, c-format
5809msgid "chain length = %d: %lu object"
5810msgid_plural "chain length = %d: %lu objects"
81809b99 5811msgstr[0] "链长 = %d: %lu 对象"
5ae481e0 5812msgstr[1] "链长 = %d: %lu 对象"
8ada9598 5813
2e8451e8 5814#: builtin/index-pack.c:1509
8ada9598 5815msgid "Cannot come back to cwd"
81809b99 5816msgstr "无法返回当前工作目录"
8ada9598 5817
2e8451e8
JX
5818#: builtin/index-pack.c:1557 builtin/index-pack.c:1560
5819#: builtin/index-pack.c:1572 builtin/index-pack.c:1576
81809b99 5820#, c-format
8ada9598 5821msgid "bad %s"
81809b99 5822msgstr "错误选项 %s"
8ada9598 5823
2e8451e8 5824#: builtin/index-pack.c:1590
8ada9598 5825msgid "--fix-thin cannot be used without --stdin"
649900bc 5826msgstr "--fix-thin 不能和 --stdin 同时使用"
8ada9598 5827
2e8451e8 5828#: builtin/index-pack.c:1594 builtin/index-pack.c:1604
8ada9598
JX
5829#, c-format
5830msgid "packfile name '%s' does not end with '.pack'"
81809b99 5831msgstr "包名 '%s' 没有以 '.pack' 结尾"
8ada9598 5832
2e8451e8 5833#: builtin/index-pack.c:1613
8ada9598 5834msgid "--verify with no packfile name given"
81809b99 5835msgstr "--verify 没有提供包名参数"
8ada9598 5836
c04f5ac3
JX
5837#: builtin/init-db.c:35
5838#, c-format
5839msgid "Could not make %s writable by group"
5840msgstr "不能设置 %s 为组可写"
5841
5842#: builtin/init-db.c:62
5843#, c-format
5844msgid "insanely long template name %s"
5845msgstr "太长的模版名 %s"
5846
5847#: builtin/init-db.c:67
5848#, c-format
5849msgid "cannot stat '%s'"
5850msgstr "不能枚举 '%s' 状态"
5851
5852#: builtin/init-db.c:73
5853#, c-format
5854msgid "cannot stat template '%s'"
5855msgstr "不能枚举模版 '%s' 状态"
5856
5857#: builtin/init-db.c:80
5858#, c-format
5859msgid "cannot opendir '%s'"
5860msgstr "不能打开目录 '%s'"
5861
5862#: builtin/init-db.c:97
5863#, c-format
5864msgid "cannot readlink '%s'"
5865msgstr "不能读取链接 '%s'"
5866
5867#: builtin/init-db.c:99
5868#, c-format
5869msgid "insanely long symlink %s"
5870msgstr "太长的符号链接 %s"
5871
5872#: builtin/init-db.c:102
5873#, c-format
5874msgid "cannot symlink '%s' '%s'"
90e6ef53 5875msgstr "不能自 '%s' 到 '%s' 创建符号链接"
c04f5ac3
JX
5876
5877#: builtin/init-db.c:106
5878#, c-format
5879msgid "cannot copy '%s' to '%s'"
5880msgstr "不能拷贝 '%s' 至 '%s'"
5881
5882#: builtin/init-db.c:110
5883#, c-format
5884msgid "ignoring template %s"
5885msgstr "忽略模版 %s"
5886
5887#: builtin/init-db.c:133
5888#, c-format
5889msgid "insanely long template path %s"
5890msgstr "太长的模版路径 %s"
5891
5892#: builtin/init-db.c:141
5893#, c-format
5894msgid "templates not found %s"
5895msgstr "模版未找到 %s"
5896
5897#: builtin/init-db.c:154
5898#, c-format
5899msgid "not copying templates of a wrong format version %d from '%s'"
81809b99 5900msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
c04f5ac3
JX
5901
5902#: builtin/init-db.c:192
5903#, c-format
5904msgid "insane git directory %s"
5905msgstr "不正常的 git 目录 %s"
5906
23ff3338 5907#: builtin/init-db.c:323 builtin/init-db.c:326
c04f5ac3
JX
5908#, c-format
5909msgid "%s already exists"
5910msgstr "%s 已经存在"
5911
23ff3338 5912#: builtin/init-db.c:355
c04f5ac3
JX
5913#, c-format
5914msgid "unable to handle file type %d"
5915msgstr "不能处理 %d 类型的文件"
5916
23ff3338 5917#: builtin/init-db.c:358
c04f5ac3
JX
5918#, c-format
5919msgid "unable to move %s to %s"
5920msgstr "不能移动 %s 至 %s"
5921
23ff3338 5922#: builtin/init-db.c:363
c04f5ac3
JX
5923#, c-format
5924msgid "Could not create git link %s"
5925msgstr "不能创建 git link %s"
5926
5927#.
5928#. * TRANSLATORS: The first '%s' is either "Reinitialized
5929#. * existing" or "Initialized empty", the second " shared" or
5930#. * "", and the last '%s%s' is the verbatim directory name.
5931#.
23ff3338 5932#: builtin/init-db.c:420
c04f5ac3
JX
5933#, c-format
5934msgid "%s%s Git repository in %s%s\n"
5935msgstr "%s%s Git 版本库于 %s%s\n"
5936
23ff3338 5937#: builtin/init-db.c:421
c04f5ac3
JX
5938msgid "Reinitialized existing"
5939msgstr "重新初始化现存的"
5940
23ff3338 5941#: builtin/init-db.c:421
c04f5ac3
JX
5942msgid "Initialized empty"
5943msgstr "初始化空的"
5944
7e238ab7 5945# 译者:中文字符串拼接,可删除前导空格
23ff3338 5946#: builtin/init-db.c:422
c04f5ac3 5947msgid " shared"
90e6ef53 5948msgstr "共享"
c04f5ac3 5949
23ff3338 5950#: builtin/init-db.c:441
c04f5ac3
JX
5951msgid "cannot tell cwd"
5952msgstr "无法获知当前路径"
5953
ef317cd5
JX
5954#: builtin/init-db.c:467
5955msgid ""
a77c07d9
JX
5956"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
5957"shared[=<permissions>]] [directory]"
ef317cd5 5958msgstr ""
07432cef
WS
5959"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
5960"[目录]"
ef317cd5
JX
5961
5962#: builtin/init-db.c:490
5963msgid "permissions"
07432cef 5964msgstr "权限"
ef317cd5
JX
5965
5966#: builtin/init-db.c:491
5967msgid "specify that the git repository is to be shared amongst several users"
07432cef 5968msgstr "指定 git 版本库是多个用户之间共享的"
ef317cd5 5969
2e8451e8 5970#: builtin/init-db.c:493 builtin/prune-packed.c:75
ef317cd5 5971msgid "be quiet"
07432cef 5972msgstr "保持安静"
ef317cd5 5973
23ff3338 5974#: builtin/init-db.c:522 builtin/init-db.c:529
c04f5ac3
JX
5975#, c-format
5976msgid "cannot mkdir %s"
5977msgstr "不能创建目录 %s"
5978
23ff3338 5979#: builtin/init-db.c:533
c04f5ac3
JX
5980#, c-format
5981msgid "cannot chdir to %s"
5982msgstr "不能切换目录到 %s"
5983
23ff3338 5984#: builtin/init-db.c:555
c04f5ac3
JX
5985#, c-format
5986msgid ""
5987"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5988"dir=<directory>)"
5989msgstr ""
73a60cd2
JX
5990"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
5991"dir=<directory>)"
c04f5ac3 5992
23ff3338 5993#: builtin/init-db.c:579
c04f5ac3
JX
5994msgid "Cannot access current working directory"
5995msgstr "不能访问当前工作目录"
5996
23ff3338 5997#: builtin/init-db.c:586
c04f5ac3
JX
5998#, c-format
5999msgid "Cannot access work tree '%s'"
6000msgstr "不能访问工作区 '%s'"
6001
2e8451e8 6002#: builtin/log.c:41
4dcdc3d8
JX
6003msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
6004msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n"
ef317cd5 6005
2e8451e8 6006#: builtin/log.c:42
ef317cd5 6007msgid " or: git show [options] <object>..."
07432cef 6008msgstr " 或者:git show [选项] <对象>..."
ef317cd5 6009
2e8451e8 6010#: builtin/log.c:124
ef317cd5 6011msgid "suppress diff output"
07432cef 6012msgstr "不显示差异输出"
ef317cd5 6013
2e8451e8 6014#: builtin/log.c:125
ef317cd5 6015msgid "show source"
07432cef 6016msgstr "显示源"
ef317cd5 6017
2e8451e8 6018#: builtin/log.c:126
07432cef
WS
6019msgid "Use mail map file"
6020msgstr "使用邮件映射文件"
6021
2e8451e8 6022#: builtin/log.c:127
ef317cd5 6023msgid "decorate options"
07432cef 6024msgstr "修饰选项"
ef317cd5 6025
2e8451e8 6026#: builtin/log.c:230
c04f5ac3
JX
6027#, c-format
6028msgid "Final output: %d %s\n"
6029msgstr "最终输出:%d %s\n"
6030
2e8451e8 6031#: builtin/log.c:453 builtin/log.c:545
c04f5ac3
JX
6032#, c-format
6033msgid "Could not read object %s"
90e6ef53 6034msgstr "不能读取对象 %s"
c04f5ac3 6035
2e8451e8 6036#: builtin/log.c:569
c04f5ac3
JX
6037#, c-format
6038msgid "Unknown type: %d"
6039msgstr "未知类型:%d"
6040
2e8451e8 6041#: builtin/log.c:669
c04f5ac3
JX
6042msgid "format.headers without value"
6043msgstr "format.headers 没有值"
6044
2e8451e8 6045#: builtin/log.c:751
c04f5ac3
JX
6046msgid "name of output directory is too long"
6047msgstr "输出目录名太长"
6048
2e8451e8 6049#: builtin/log.c:767
c04f5ac3
JX
6050#, c-format
6051msgid "Cannot open patch file %s"
6052msgstr "无法打开补丁文件 %s"
6053
2e8451e8 6054#: builtin/log.c:781
c04f5ac3
JX
6055msgid "Need exactly one range."
6056msgstr "只需要一个范围。"
6057
2e8451e8 6058#: builtin/log.c:789
c04f5ac3
JX
6059msgid "Not a range."
6060msgstr "不是一个范围。"
6061
2e8451e8 6062#: builtin/log.c:891
c04f5ac3
JX
6063msgid "Cover letter needs email format"
6064msgstr "信封需要邮件地址格式"
6065
2e8451e8 6066#: builtin/log.c:967
c04f5ac3
JX
6067#, c-format
6068msgid "insane in-reply-to: %s"
6069msgstr "不正常的 in-reply-to:%s"
6070
2e8451e8 6071#: builtin/log.c:995
ef317cd5 6072msgid "git format-patch [options] [<since> | <revision range>]"
07432cef 6073msgstr "git format-patch [选项] [<从> | <修订集范围>]"
ef317cd5 6074
2e8451e8 6075#: builtin/log.c:1040
c04f5ac3
JX
6076msgid "Two output directories?"
6077msgstr "两个输出目录?"
6078
2e8451e8 6079#: builtin/log.c:1155
ef317cd5 6080msgid "use [PATCH n/m] even with a single patch"
07432cef 6081msgstr "使用 [PATCH n/m],即使只有一个补丁"
c04f5ac3 6082
2e8451e8 6083#: builtin/log.c:1158
ef317cd5 6084msgid "use [PATCH] even with multiple patches"
07432cef 6085msgstr "使用 [PATCH],即使有多个补丁"
c04f5ac3 6086
2e8451e8 6087#: builtin/log.c:1162
ef317cd5 6088msgid "print patches to standard out"
07432cef 6089msgstr "打印补丁到标准输出"
c04f5ac3 6090
2e8451e8 6091#: builtin/log.c:1164
ef317cd5 6092msgid "generate a cover letter"
07432cef 6093msgstr "生成一封附信"
c04f5ac3 6094
2e8451e8 6095#: builtin/log.c:1166
ef317cd5 6096msgid "use simple number sequence for output file names"
07432cef 6097msgstr "使用简单的数字序列作为输出文件名"
c04f5ac3 6098
2e8451e8 6099#: builtin/log.c:1167
ef317cd5 6100msgid "sfx"
07432cef 6101msgstr "后缀"
ef317cd5 6102
2e8451e8 6103#: builtin/log.c:1168
ef317cd5 6104msgid "use <sfx> instead of '.patch'"
07432cef 6105msgstr "使用 <后缀> 代替 '.patch'"
ef317cd5 6106
2e8451e8 6107#: builtin/log.c:1170
ef317cd5 6108msgid "start numbering patches at <n> instead of 1"
07432cef
WS
6109msgstr "补丁以 <n> 开始编号,而不是1"
6110
2e8451e8 6111#: builtin/log.c:1172
07432cef
WS
6112msgid "mark the series as Nth re-roll"
6113msgstr "标记补丁系列是第几次重制"
ef317cd5 6114
2e8451e8 6115#: builtin/log.c:1174
ef317cd5 6116msgid "Use [<prefix>] instead of [PATCH]"
07432cef 6117msgstr "使用 [<前缀>] 代替 [PATCH]"
ef317cd5 6118
2e8451e8 6119#: builtin/log.c:1177
ef317cd5 6120msgid "store resulting files in <dir>"
07432cef 6121msgstr "把结果文件存储在 <dir>"
ef317cd5 6122
2e8451e8 6123#: builtin/log.c:1180
ef317cd5 6124msgid "don't strip/add [PATCH]"
07432cef 6125msgstr "不删除/添加 [PATCH]"
ef317cd5 6126
2e8451e8 6127#: builtin/log.c:1183
ef317cd5 6128msgid "don't output binary diffs"
07432cef 6129msgstr "不输出二进制差异"
ef317cd5 6130
2e8451e8 6131#: builtin/log.c:1185
ef317cd5 6132msgid "don't include a patch matching a commit upstream"
07432cef 6133msgstr "不包含已在上游提交中的补丁"
ef317cd5 6134
2e8451e8 6135#: builtin/log.c:1187
ef317cd5 6136msgid "show patch format instead of default (patch + stat)"
07432cef 6137msgstr "显示纯补丁格式而非默认的(补丁+状态)"
ef317cd5 6138
2e8451e8 6139#: builtin/log.c:1189
ef317cd5 6140msgid "Messaging"
07432cef 6141msgstr "邮件发送"
ef317cd5 6142
2e8451e8 6143#: builtin/log.c:1190
ef317cd5 6144msgid "header"
07432cef 6145msgstr "header"
ef317cd5 6146
2e8451e8 6147#: builtin/log.c:1191
ef317cd5 6148msgid "add email header"
07432cef 6149msgstr "添加邮件头"
ef317cd5 6150
2e8451e8 6151#: builtin/log.c:1192 builtin/log.c:1194
ef317cd5 6152msgid "email"
07432cef 6153msgstr "邮件地址"
ef317cd5 6154
2e8451e8 6155#: builtin/log.c:1192
ef317cd5 6156msgid "add To: header"
07432cef 6157msgstr "添加收件人"
ef317cd5 6158
2e8451e8 6159#: builtin/log.c:1194
ef317cd5 6160msgid "add Cc: header"
07432cef 6161msgstr "添加抄送"
ef317cd5 6162
2e8451e8
JX
6163#: builtin/log.c:1196
6164msgid "ident"
6165msgstr "ident"
6166
6167#: builtin/log.c:1197
6168msgid "set From address to <ident> (or committer ident if absent)"
6169msgstr "设置 From 地址为 <ident>(如若不提供,用提交者ID做为地址)"
6170
6171#: builtin/log.c:1199
ef317cd5 6172msgid "message-id"
07432cef 6173msgstr "message-id"
ef317cd5 6174
2e8451e8 6175#: builtin/log.c:1200
ef317cd5 6176msgid "make first mail a reply to <message-id>"
07432cef 6177msgstr "使第一封邮件作为对 <message-id> 的回复"
ef317cd5 6178
2e8451e8 6179#: builtin/log.c:1201 builtin/log.c:1204
ef317cd5 6180msgid "boundary"
07432cef 6181msgstr "边界"
ef317cd5 6182
2e8451e8 6183#: builtin/log.c:1202
ef317cd5 6184msgid "attach the patch"
07432cef 6185msgstr "附件方式添加补丁"
ef317cd5 6186
2e8451e8 6187#: builtin/log.c:1205
ef317cd5 6188msgid "inline the patch"
07432cef 6189msgstr "内联显示补丁"
ef317cd5 6190
2e8451e8 6191#: builtin/log.c:1209
ef317cd5 6192msgid "enable message threading, styles: shallow, deep"
07432cef 6193msgstr "启用邮件线索,风格:浅,深"
ef317cd5 6194
2e8451e8 6195#: builtin/log.c:1211
ef317cd5 6196msgid "signature"
07432cef 6197msgstr "签名"
ef317cd5 6198
2e8451e8 6199#: builtin/log.c:1212
ef317cd5 6200msgid "add a signature"
07432cef 6201msgstr "添加一个签名"
ef317cd5 6202
2e8451e8 6203#: builtin/log.c:1214
ef317cd5 6204msgid "don't print the patch filenames"
07432cef 6205msgstr "不要打印补丁文件名"
ef317cd5 6206
2e8451e8
JX
6207#: builtin/log.c:1288
6208#, c-format
6209msgid "invalid ident line: %s"
6210msgstr "包含无效的身份标识:%s"
6211
6212#: builtin/log.c:1303
c04f5ac3
JX
6213msgid "-n and -k are mutually exclusive."
6214msgstr "-n 和 -k 互斥。"
6215
2e8451e8 6216#: builtin/log.c:1305
c04f5ac3
JX
6217msgid "--subject-prefix and -k are mutually exclusive."
6218msgstr "--subject-prefix 和 -k 互斥。"
6219
2e8451e8 6220#: builtin/log.c:1313
c04f5ac3
JX
6221msgid "--name-only does not make sense"
6222msgstr "--name-only 无意义"
6223
2e8451e8 6224#: builtin/log.c:1315
c04f5ac3
JX
6225msgid "--name-status does not make sense"
6226msgstr "--name-status 无意义"
6227
2e8451e8 6228#: builtin/log.c:1317
c04f5ac3
JX
6229msgid "--check does not make sense"
6230msgstr "--check 无意义"
6231
2e8451e8 6232#: builtin/log.c:1340
c04f5ac3
JX
6233msgid "standard output, or directory, which one?"
6234msgstr "标准输出或目录,哪一个?"
6235
2e8451e8 6236#: builtin/log.c:1342
c04f5ac3
JX
6237#, c-format
6238msgid "Could not create directory '%s'"
90e6ef53 6239msgstr "不能创建目录 '%s'"
c04f5ac3 6240
2e8451e8 6241#: builtin/log.c:1490
c04f5ac3
JX
6242msgid "Failed to create output files"
6243msgstr "无法创建输出文件"
6244
2e8451e8 6245#: builtin/log.c:1539
ef317cd5 6246msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
07432cef 6247msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
ef317cd5 6248
2e8451e8 6249#: builtin/log.c:1594
c04f5ac3
JX
6250#, c-format
6251msgid ""
6252"Could not find a tracked remote branch, please specify <upstream> manually.\n"
90e6ef53 6253msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
c04f5ac3 6254
2e8451e8 6255#: builtin/log.c:1607 builtin/log.c:1609 builtin/log.c:1621
c04f5ac3
JX
6256#, c-format
6257msgid "Unknown commit %s"
6258msgstr "未知提交 %s"
6259
2e8451e8 6260#: builtin/ls-files.c:408
ef317cd5 6261msgid "git ls-files [options] [<file>...]"
07432cef 6262msgstr "git ls-files [选项] [<文件>...]"
ef317cd5 6263
2e8451e8 6264#: builtin/ls-files.c:465
ef317cd5 6265msgid "identify the file status with tags"
07432cef 6266msgstr "用标签标识文件的状态"
ef317cd5 6267
2e8451e8 6268#: builtin/ls-files.c:467
ef317cd5 6269msgid "use lowercase letters for 'assume unchanged' files"
07432cef 6270msgstr "使用小写字母表示 '假设未改变的' 文件"
ef317cd5 6271
2e8451e8 6272#: builtin/ls-files.c:469
ef317cd5 6273msgid "show cached files in the output (default)"
07432cef 6274msgstr "显示缓存的文件(默认)"
ef317cd5 6275
2e8451e8 6276#: builtin/ls-files.c:471
ef317cd5 6277msgid "show deleted files in the output"
07432cef 6278msgstr "显示已删除的文件"
ef317cd5 6279
2e8451e8 6280#: builtin/ls-files.c:473
ef317cd5 6281msgid "show modified files in the output"
07432cef 6282msgstr "显示已修改的文件"
ef317cd5 6283
2e8451e8 6284#: builtin/ls-files.c:475
ef317cd5 6285msgid "show other files in the output"
07432cef 6286msgstr "显示其它文件"
ef317cd5 6287
2e8451e8 6288#: builtin/ls-files.c:477
ef317cd5 6289msgid "show ignored files in the output"
07432cef 6290msgstr "显示忽略的文件"
ef317cd5 6291
2e8451e8 6292#: builtin/ls-files.c:480
ef317cd5 6293msgid "show staged contents' object name in the output"
07432cef 6294msgstr "显示暂存区内容的对象名称"
ef317cd5 6295
2e8451e8 6296#: builtin/ls-files.c:482
ef317cd5 6297msgid "show files on the filesystem that need to be removed"
07432cef 6298msgstr "显示文件系统需要删除的文件"
ef317cd5 6299
2e8451e8 6300#: builtin/ls-files.c:484
ef317cd5 6301msgid "show 'other' directories' name only"
07432cef 6302msgstr "只显示“其他”目录的名称"
ef317cd5 6303
2e8451e8 6304#: builtin/ls-files.c:487
ef317cd5 6305msgid "don't show empty directories"
07432cef 6306msgstr "不显示空目录"
ef317cd5 6307
2e8451e8 6308#: builtin/ls-files.c:490
ef317cd5 6309msgid "show unmerged files in the output"
07432cef 6310msgstr "显示未合并的文件"
ef317cd5 6311
2e8451e8 6312#: builtin/ls-files.c:492
ef317cd5 6313msgid "show resolve-undo information"
07432cef 6314msgstr "显示 resolve-undo 信息"
ef317cd5 6315
2e8451e8 6316#: builtin/ls-files.c:494
ef317cd5 6317msgid "skip files matching pattern"
07432cef 6318msgstr "匹配排除文件的模式"
ef317cd5 6319
2e8451e8 6320#: builtin/ls-files.c:497
ef317cd5 6321msgid "exclude patterns are read from <file>"
07432cef 6322msgstr "从 <文件> 中读取排除模式"
ef317cd5 6323
2e8451e8 6324#: builtin/ls-files.c:500
ef317cd5 6325msgid "read additional per-directory exclude patterns in <file>"
07432cef 6326msgstr "从 <文件> 读取额外的每个目录的排除模式"
ef317cd5 6327
2e8451e8 6328#: builtin/ls-files.c:502
ef317cd5 6329msgid "add the standard git exclusions"
07432cef 6330msgstr "添加标准的 git 排除"
ef317cd5 6331
2e8451e8 6332#: builtin/ls-files.c:505
ef317cd5 6333msgid "make the output relative to the project top directory"
07432cef 6334msgstr "显示相对于顶级目录的文件名"
ef317cd5 6335
2e8451e8 6336#: builtin/ls-files.c:508
ef317cd5 6337msgid "if any <file> is not in the index, treat this as an error"
07432cef 6338msgstr "如果任何 <文件> 都不在索引区,视为错误"
ef317cd5 6339
2e8451e8 6340#: builtin/ls-files.c:509
ef317cd5 6341msgid "tree-ish"
07432cef 6342msgstr "树或提交"
ef317cd5 6343
2e8451e8 6344#: builtin/ls-files.c:510
ef317cd5 6345msgid "pretend that paths removed since <tree-ish> are still present"
07432cef 6346msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
ef317cd5 6347
2e8451e8 6348#: builtin/ls-files.c:512
ef317cd5 6349msgid "show debugging data"
07432cef 6350msgstr "显示调试数据"
ef317cd5
JX
6351
6352#: builtin/ls-tree.c:27
ef317cd5 6353msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
07432cef 6354msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
ef317cd5
JX
6355
6356#: builtin/ls-tree.c:125
6357msgid "only show trees"
07432cef 6358msgstr "只显示树"
ef317cd5
JX
6359
6360#: builtin/ls-tree.c:127
ef317cd5 6361msgid "recurse into subtrees"
07432cef 6362msgstr "递归到子树"
ef317cd5
JX
6363
6364#: builtin/ls-tree.c:129
6365msgid "show trees when recursing"
07432cef 6366msgstr "当递归时显示树"
ef317cd5
JX
6367
6368#: builtin/ls-tree.c:132
6369msgid "terminate entries with NUL byte"
07432cef 6370msgstr "条目以NUL字符终止"
ef317cd5
JX
6371
6372#: builtin/ls-tree.c:133
ef317cd5 6373msgid "include object size"
07432cef 6374msgstr "包括对象大小"
ef317cd5
JX
6375
6376#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
6377msgid "list only filenames"
07432cef 6378msgstr "只列出文件名"
ef317cd5
JX
6379
6380#: builtin/ls-tree.c:140
6381msgid "use full path names"
07432cef 6382msgstr "使用文件的全路径"
ef317cd5
JX
6383
6384#: builtin/ls-tree.c:142
6385msgid "list entire tree; not just current directory (implies --full-name)"
07432cef 6386msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
ef317cd5
JX
6387
6388#: builtin/merge.c:43
ef317cd5 6389msgid "git merge [options] [<commit>...]"
07432cef 6390msgstr "git merge [选项] [<提交>...]"
ef317cd5
JX
6391
6392#: builtin/merge.c:44
6393msgid "git merge [options] <msg> HEAD <commit>"
07432cef 6394msgstr "git merge [选项] <说明> HEAD <提交>"
ef317cd5
JX
6395
6396#: builtin/merge.c:45
6397msgid "git merge --abort"
07432cef 6398msgstr "git merge --abort"
ef317cd5 6399
2e8451e8 6400#: builtin/merge.c:98
c04f5ac3
JX
6401msgid "switch `m' requires a value"
6402msgstr "开关 `m' 需要一个值"
6403
2e8451e8 6404#: builtin/merge.c:135
c04f5ac3
JX
6405#, c-format
6406msgid "Could not find merge strategy '%s'.\n"
90e6ef53 6407msgstr "不能找到合并策略 '%s'。\n"
c04f5ac3 6408
2e8451e8 6409#: builtin/merge.c:136
c04f5ac3
JX
6410#, c-format
6411msgid "Available strategies are:"
6412msgstr "可用的策略有:"
6413
2e8451e8 6414#: builtin/merge.c:141
c04f5ac3
JX
6415#, c-format
6416msgid "Available custom strategies are:"
6417msgstr "可用的自定义策略有:"
6418
2e8451e8 6419#: builtin/merge.c:198
ef317cd5 6420msgid "do not show a diffstat at the end of the merge"
07432cef 6421msgstr "在合并的最后不显示差异统计"
ef317cd5 6422
2e8451e8 6423#: builtin/merge.c:201
ef317cd5 6424msgid "show a diffstat at the end of the merge"
07432cef 6425msgstr "在合并的最后显示差异统计"
ef317cd5 6426
2e8451e8 6427#: builtin/merge.c:202
ef317cd5 6428msgid "(synonym to --stat)"
07432cef 6429msgstr "(和 --stat 同义)"
ef317cd5 6430
2e8451e8 6431#: builtin/merge.c:204
ef317cd5 6432msgid "add (at most <n>) entries from shortlog to merge commit message"
07432cef 6433msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
ef317cd5 6434
2e8451e8 6435#: builtin/merge.c:207
ef317cd5 6436msgid "create a single commit instead of doing a merge"
07432cef 6437msgstr "创建一个单独的提交而不是做一次合并"
ef317cd5 6438
2e8451e8 6439#: builtin/merge.c:209
ef317cd5 6440msgid "perform a commit if the merge succeeds (default)"
07432cef 6441msgstr "如果合并成功,执行一次提交(默认)"
ef317cd5 6442
2e8451e8 6443#: builtin/merge.c:211
ef317cd5 6444msgid "edit message before committing"
07432cef 6445msgstr "在提交前编辑提交说明"
ef317cd5 6446
2e8451e8 6447#: builtin/merge.c:212
ef317cd5 6448msgid "allow fast-forward (default)"
07432cef 6449msgstr "允许快进(默认)"
ef317cd5 6450
2e8451e8 6451#: builtin/merge.c:214
ef317cd5 6452msgid "abort if fast-forward is not possible"
07432cef 6453msgstr "如果不能快进就放弃合并"
ef317cd5 6454
2e8451e8 6455#: builtin/merge.c:218
1003b3a5
JX
6456msgid "Verify that the named commit has a valid GPG signature"
6457msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
6458
2e8451e8 6459#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:114
ef317cd5 6460msgid "strategy"
07432cef 6461msgstr "策略"
ef317cd5 6462
2e8451e8 6463#: builtin/merge.c:220
ef317cd5 6464msgid "merge strategy to use"
07432cef 6465msgstr "要使用的合并策略"
ef317cd5 6466
2e8451e8 6467#: builtin/merge.c:221
ef317cd5 6468msgid "option=value"
07432cef 6469msgstr "option=value"
ef317cd5 6470
2e8451e8 6471#: builtin/merge.c:222
ef317cd5 6472msgid "option for selected merge strategy"
07432cef 6473msgstr "所选的合并策略的选项"
ef317cd5 6474
2e8451e8 6475#: builtin/merge.c:224
ef317cd5 6476msgid "merge commit message (for a non-fast-forward merge)"
07432cef 6477msgstr "合并的提交说明(针对非快进式合并)"
ef317cd5 6478
2e8451e8 6479#: builtin/merge.c:228
ef317cd5 6480msgid "abort the current in-progress merge"
07432cef 6481msgstr "放弃当前正在进行的合并"
ef317cd5 6482
2e8451e8 6483#: builtin/merge.c:257
c04f5ac3
JX
6484msgid "could not run stash."
6485msgstr "不能进行进度保存。"
6486
2e8451e8 6487#: builtin/merge.c:262
c04f5ac3
JX
6488msgid "stash failed"
6489msgstr "进度保存失败"
6490
2e8451e8 6491#: builtin/merge.c:267
c04f5ac3
JX
6492#, c-format
6493msgid "not a valid object: %s"
6494msgstr "不是一个有效对象:%s"
6495
2e8451e8 6496#: builtin/merge.c:286 builtin/merge.c:303
c04f5ac3
JX
6497msgid "read-tree failed"
6498msgstr "读取树失败"
6499
90e6ef53 6500# 译者:注意保持前导空格
2e8451e8 6501#: builtin/merge.c:333
c04f5ac3
JX
6502msgid " (nothing to squash)"
6503msgstr " (无可压缩)"
6504
2e8451e8 6505#: builtin/merge.c:346
c04f5ac3
JX
6506#, c-format
6507msgid "Squash commit -- not updating HEAD\n"
6508msgstr "压缩提交 -- 未更新 HEAD\n"
6509
2e8451e8 6510#: builtin/merge.c:378
c04f5ac3
JX
6511msgid "Writing SQUASH_MSG"
6512msgstr "写入 SQUASH_MSG"
6513
2e8451e8 6514#: builtin/merge.c:380
c04f5ac3
JX
6515msgid "Finishing SQUASH_MSG"
6516msgstr "完成 SQUASH_MSG"
6517
2e8451e8 6518#: builtin/merge.c:403
c04f5ac3
JX
6519#, c-format
6520msgid "No merge message -- not updating HEAD\n"
6521msgstr "无合并信息 -- 未更新 HEAD\n"
6522
2e8451e8 6523#: builtin/merge.c:453
c04f5ac3
JX
6524#, c-format
6525msgid "'%s' does not point to a commit"
6526msgstr "'%s' 没有指向一个提交"
6527
2e8451e8 6528#: builtin/merge.c:565
c04f5ac3
JX
6529#, c-format
6530msgid "Bad branch.%s.mergeoptions string: %s"
90e6ef53 6531msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
c04f5ac3 6532
2e8451e8 6533#: builtin/merge.c:657
c04f5ac3
JX
6534msgid "git write-tree failed to write a tree"
6535msgstr "git write-tree 无法写入一树对象"
6536
2e8451e8 6537#: builtin/merge.c:685
c04f5ac3
JX
6538msgid "Not handling anything other than two heads merge."
6539msgstr "不能处理两个头合并之外的任何操作。"
6540
2e8451e8 6541#: builtin/merge.c:699
c04f5ac3
JX
6542#, c-format
6543msgid "Unknown option for merge-recursive: -X%s"
6544msgstr "merge-recursive 的未知选项:-X%s"
6545
2e8451e8 6546#: builtin/merge.c:713
c04f5ac3
JX
6547#, c-format
6548msgid "unable to write %s"
6549msgstr "不能写 %s"
6550
2e8451e8 6551#: builtin/merge.c:802
c04f5ac3
JX
6552#, c-format
6553msgid "Could not read from '%s'"
6554msgstr "不能从 '%s' 读取"
6555
2e8451e8 6556#: builtin/merge.c:811
c04f5ac3
JX
6557#, c-format
6558msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6559msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
6560
2e8451e8 6561#: builtin/merge.c:817
a77c07d9 6562#, c-format
c04f5ac3
JX
6563msgid ""
6564"Please enter a commit message to explain why this merge is necessary,\n"
6565"especially if it merges an updated upstream into a topic branch.\n"
6566"\n"
a77c07d9 6567"Lines starting with '%c' will be ignored, and an empty message aborts\n"
c04f5ac3
JX
6568"the commit.\n"
6569msgstr ""
6570"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
6571"合并到主题分支。\n"
6572"\n"
a77c07d9 6573"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
c04f5ac3 6574
2e8451e8 6575#: builtin/merge.c:841
c04f5ac3
JX
6576msgid "Empty commit message."
6577msgstr "空提交信息。"
6578
2e8451e8 6579#: builtin/merge.c:853
c04f5ac3
JX
6580#, c-format
6581msgid "Wonderful.\n"
6582msgstr "太棒了。\n"
6583
2e8451e8 6584#: builtin/merge.c:918
c04f5ac3
JX
6585#, c-format
6586msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6587msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
6588
2e8451e8 6589#: builtin/merge.c:934
c04f5ac3
JX
6590#, c-format
6591msgid "'%s' is not a commit"
6592msgstr "'%s' 不是一个提交"
6593
2e8451e8 6594#: builtin/merge.c:975
c04f5ac3 6595msgid "No current branch."
90e6ef53 6596msgstr "没有当前分支。"
c04f5ac3 6597
2e8451e8 6598#: builtin/merge.c:977
c04f5ac3 6599msgid "No remote for the current branch."
90e6ef53 6600msgstr "当前分支没有对应的远程版本库。"
c04f5ac3 6601
2e8451e8 6602#: builtin/merge.c:979
c04f5ac3 6603msgid "No default upstream defined for the current branch."
90e6ef53 6604msgstr "当前分支没有定义默认的上游分支。"
c04f5ac3 6605
2e8451e8 6606#: builtin/merge.c:984
170e9899 6607#, c-format
2e8451e8
JX
6608msgid "No remote-tracking branch for %s from %s"
6609msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
170e9899 6610
2e8451e8 6611#: builtin/merge.c:1140
c04f5ac3 6612msgid "There is no merge to abort (MERGE_HEAD missing)."
90e6ef53 6613msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
c04f5ac3 6614
2e8451e8 6615#: builtin/merge.c:1156 git-pull.sh:31
c04f5ac3
JX
6616msgid ""
6617"You have not concluded your merge (MERGE_HEAD exists).\n"
6618"Please, commit your changes before you can merge."
6619msgstr ""
6620"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
90e6ef53 6621"请在合并前先提交您的修改。"
c04f5ac3 6622
2e8451e8 6623#: builtin/merge.c:1159 git-pull.sh:34
c04f5ac3
JX
6624msgid "You have not concluded your merge (MERGE_HEAD exists)."
6625msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
6626
2e8451e8 6627#: builtin/merge.c:1163
c04f5ac3
JX
6628msgid ""
6629"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6630"Please, commit your changes before you can merge."
6631msgstr ""
6632"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
90e6ef53 6633"请在合并前先提交您的修改。"
c04f5ac3 6634
2e8451e8 6635#: builtin/merge.c:1166
c04f5ac3
JX
6636msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6637msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
6638
2e8451e8 6639#: builtin/merge.c:1175
c04f5ac3 6640msgid "You cannot combine --squash with --no-ff."
649900bc 6641msgstr "您不能将 --squash 与 --no-ff 同时使用。"
c04f5ac3 6642
2e8451e8 6643#: builtin/merge.c:1184
c04f5ac3 6644msgid "No commit specified and merge.defaultToUpstream not set."
90e6ef53 6645msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
c04f5ac3 6646
2e8451e8 6647#: builtin/merge.c:1216
c04f5ac3 6648msgid "Can merge only exactly one commit into empty head"
90e6ef53 6649msgstr "只能将一个提交合并到空分支上"
c04f5ac3 6650
2e8451e8 6651#: builtin/merge.c:1219
c04f5ac3
JX
6652msgid "Squash commit into empty head not supported yet"
6653msgstr "尚不支持到空分支的压缩提交"
6654
2e8451e8 6655#: builtin/merge.c:1221
c04f5ac3
JX
6656msgid "Non-fast-forward commit does not make sense into an empty head"
6657msgstr "到空分支的非快进式提交没有意义"
6658
2e8451e8
JX
6659#: builtin/merge.c:1226
6660#, c-format
6661msgid "%s - not something we can merge"
6662msgstr "%s - 不能被合并"
6663
6664#: builtin/merge.c:1277
1003b3a5
JX
6665#, c-format
6666msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6667msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
6668
2e8451e8 6669#: builtin/merge.c:1280
1003b3a5
JX
6670#, c-format
6671msgid "Commit %s has a bad GPG signature allegedly by %s."
6672msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
6673
6674#. 'N'
2e8451e8 6675#: builtin/merge.c:1283
1003b3a5
JX
6676#, c-format
6677msgid "Commit %s does not have a GPG signature."
6678msgstr "提交 %s 没有一个 GPG 签名。"
6679
2e8451e8 6680#: builtin/merge.c:1286
1003b3a5
JX
6681#, c-format
6682msgid "Commit %s has a good GPG signature by %s\n"
6683msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
6684
2e8451e8 6685#: builtin/merge.c:1370
c04f5ac3
JX
6686#, c-format
6687msgid "Updating %s..%s\n"
6688msgstr "更新 %s..%s\n"
6689
2e8451e8 6690#: builtin/merge.c:1409
c04f5ac3
JX
6691#, c-format
6692msgid "Trying really trivial in-index merge...\n"
90e6ef53 6693msgstr "尝试非常小的索引内合并...\n"
c04f5ac3 6694
2e8451e8 6695#: builtin/merge.c:1416
c04f5ac3
JX
6696#, c-format
6697msgid "Nope.\n"
6698msgstr "无。\n"
6699
2e8451e8 6700#: builtin/merge.c:1448
c04f5ac3 6701msgid "Not possible to fast-forward, aborting."
1aabac65 6702msgstr "无法快进,终止。"
c04f5ac3 6703
2e8451e8 6704#: builtin/merge.c:1471 builtin/merge.c:1550
c04f5ac3
JX
6705#, c-format
6706msgid "Rewinding the tree to pristine...\n"
6707msgstr "将树回滚至原始状态...\n"
6708
2e8451e8 6709#: builtin/merge.c:1475
c04f5ac3
JX
6710#, c-format
6711msgid "Trying merge strategy %s...\n"
6712msgstr "尝试合并策略 %s...\n"
6713
2e8451e8 6714#: builtin/merge.c:1541
c04f5ac3
JX
6715#, c-format
6716msgid "No merge strategy handled the merge.\n"
6717msgstr "没有合并策略处理此合并。\n"
6718
2e8451e8 6719#: builtin/merge.c:1543
c04f5ac3
JX
6720#, c-format
6721msgid "Merge with strategy %s failed.\n"
6722msgstr "使用策略 %s 合并失败。\n"
6723
2e8451e8 6724#: builtin/merge.c:1552
c04f5ac3
JX
6725#, c-format
6726msgid "Using the %s to prepare resolving by hand.\n"
6727msgstr "使用 %s 以准备手工解决。\n"
6728
2e8451e8 6729#: builtin/merge.c:1564
c04f5ac3
JX
6730#, c-format
6731msgid "Automatic merge went well; stopped before committing as requested\n"
6732msgstr "自动合并进展顺利,按要求在提交前停止\n"
6733
ef317cd5
JX
6734#: builtin/merge-base.c:26
6735msgid "git merge-base [-a|--all] <commit> <commit>..."
07432cef 6736msgstr "git merge-base [-a|--all] <提交> <提交>..."
ef317cd5
JX
6737
6738#: builtin/merge-base.c:27
6739msgid "git merge-base [-a|--all] --octopus <commit>..."
07432cef 6740msgstr "git merge-base [-a|--all] --octopus <提交>..."
ef317cd5
JX
6741
6742#: builtin/merge-base.c:28
6743msgid "git merge-base --independent <commit>..."
07432cef 6744msgstr "git merge-base --independent <提交>..."
ef317cd5
JX
6745
6746#: builtin/merge-base.c:29
6747msgid "git merge-base --is-ancestor <commit> <commit>"
07432cef 6748msgstr "git merge-base --is-ancestor <提交> <提交>"
ef317cd5
JX
6749
6750#: builtin/merge-base.c:98
ef317cd5 6751msgid "output all common ancestors"
07432cef 6752msgstr "输出所有共同的祖先"
ef317cd5
JX
6753
6754#: builtin/merge-base.c:99
6755msgid "find ancestors for a single n-way merge"
07432cef 6756msgstr "查找一个多路合并的祖先提交"
ef317cd5
JX
6757
6758#: builtin/merge-base.c:100
6759msgid "list revs not reachable from others"
07432cef 6760msgstr "显示不能被其他访问到的版本"
ef317cd5
JX
6761
6762#: builtin/merge-base.c:102
6763msgid "is the first one ancestor of the other?"
07432cef 6764msgstr "第一个是其他的祖先提交么?"
ef317cd5
JX
6765
6766#: builtin/merge-file.c:8
6767msgid ""
6768"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6769"file2"
6770msgstr ""
07432cef 6771"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
ef317cd5
JX
6772
6773#: builtin/merge-file.c:33
6774msgid "send results to standard output"
07432cef 6775msgstr "将结果发送到标准输出"
ef317cd5
JX
6776
6777#: builtin/merge-file.c:34
6778msgid "use a diff3 based merge"
07432cef 6779msgstr "使用基于 diff3 的合并"
ef317cd5
JX
6780
6781#: builtin/merge-file.c:35
6782msgid "for conflicts, use our version"
07432cef 6783msgstr "如果冲突,使用我们的版本"
ef317cd5
JX
6784
6785#: builtin/merge-file.c:37
6786msgid "for conflicts, use their version"
07432cef 6787msgstr "如果冲突,使用他们的版本"
ef317cd5
JX
6788
6789#: builtin/merge-file.c:39
6790msgid "for conflicts, use a union version"
07432cef 6791msgstr "如果冲突,使用联合版本"
ef317cd5
JX
6792
6793#: builtin/merge-file.c:42
6794msgid "for conflicts, use this marker size"
07432cef 6795msgstr "如果冲突,使用指定长度的标记"
ef317cd5
JX
6796
6797#: builtin/merge-file.c:43
6798msgid "do not warn about conflicts"
07432cef 6799msgstr "不要警告冲突"
ef317cd5
JX
6800
6801#: builtin/merge-file.c:45
6802msgid "set labels for file1/orig_file/file2"
07432cef 6803msgstr "为 file1/orig_file/file2 设置标签"
c04f5ac3 6804
ef317cd5
JX
6805#: builtin/mktree.c:67
6806msgid "git mktree [-z] [--missing] [--batch]"
07432cef 6807msgstr "git mktree [-z] [--missing] [--batch]"
c04f5ac3 6808
ef317cd5
JX
6809#: builtin/mktree.c:153
6810msgid "input is NUL terminated"
07432cef 6811msgstr "输入以 NUL 字符终止"
c04f5ac3 6812
ef317cd5 6813#: builtin/mktree.c:154 builtin/write-tree.c:24
ef317cd5 6814msgid "allow missing objects"
07432cef 6815msgstr "允许丢失的对象"
c04f5ac3 6816
ef317cd5
JX
6817#: builtin/mktree.c:155
6818msgid "allow creation of more than one tree"
07432cef 6819msgstr "允许创建一个以上的树"
c04f5ac3 6820
ef317cd5
JX
6821#: builtin/mv.c:14
6822msgid "git mv [options] <source>... <destination>"
07432cef 6823msgstr "git mv [选项] <源>... <目标>"
c04f5ac3 6824
ef317cd5
JX
6825#: builtin/mv.c:64
6826msgid "force move/rename even if target exists"
07432cef 6827msgstr "强制移动/重命令,即使目标存在"
c04f5ac3 6828
ef317cd5 6829#: builtin/mv.c:65
ef317cd5 6830msgid "skip move/rename errors"
07432cef 6831msgstr "跳过移动/重命名错误"
c04f5ac3
JX
6832
6833#: builtin/mv.c:108
6834#, c-format
6835msgid "Checking rename of '%s' to '%s'\n"
6836msgstr "检查 '%s' 到 '%s' 的重命名\n"
6837
6838#: builtin/mv.c:112
6839msgid "bad source"
6840msgstr "坏的源"
6841
6842#: builtin/mv.c:115
6843msgid "can not move directory into itself"
6844msgstr "不能将目录移动到自身"
6845
6846#: builtin/mv.c:118
6847msgid "cannot move directory over file"
6848msgstr "不能将目录移动到文件"
6849
6850#: builtin/mv.c:128
6851#, c-format
6852msgid "Huh? %.*s is in index?"
90e6ef53 6853msgstr "嗯?%.*s 在索引中?"
c04f5ac3
JX
6854
6855#: builtin/mv.c:140
6856msgid "source directory is empty"
6857msgstr "源目录为空"
6858
6859#: builtin/mv.c:171
6860msgid "not under version control"
6861msgstr "不在版本控制之下"
6862
6863#: builtin/mv.c:173
6864msgid "destination exists"
6865msgstr "目标已存在"
6866
6867#: builtin/mv.c:181
6868#, c-format
6869msgid "overwriting '%s'"
6870msgstr "覆盖 '%s'"
6871
6872#: builtin/mv.c:184
6873msgid "Cannot overwrite"
6874msgstr "不能覆盖"
6875
6876#: builtin/mv.c:187
6877msgid "multiple sources for the same target"
6878msgstr "同一目标具有多个源"
6879
6880#: builtin/mv.c:202
6881#, c-format
6882msgid "%s, source=%s, destination=%s"
6883msgstr "%s,源=%s,目标=%s"
6884
6885#: builtin/mv.c:212
6886#, c-format
6887msgid "Renaming %s to %s\n"
6888msgstr "重命名 %s 至 %s\n"
6889
8ada9598 6890#: builtin/mv.c:215 builtin/remote.c:731
c04f5ac3
JX
6891#, c-format
6892msgid "renaming '%s' failed"
6893msgstr "重命名 '%s' 失败"
6894
2e8451e8 6895#: builtin/name-rev.c:259
ef317cd5 6896msgid "git name-rev [options] <commit>..."
07432cef 6897msgstr "git name-rev [选项] <提交>..."
ef317cd5 6898
2e8451e8 6899#: builtin/name-rev.c:260
ef317cd5 6900msgid "git name-rev [options] --all"
07432cef 6901msgstr "git name-rev [选项] --all"
ef317cd5 6902
2e8451e8 6903#: builtin/name-rev.c:261
ef317cd5 6904msgid "git name-rev [options] --stdin"
07432cef 6905msgstr "git name-rev [选项] --stdin"
ef317cd5 6906
2e8451e8 6907#: builtin/name-rev.c:313
ef317cd5 6908msgid "print only names (no SHA-1)"
07432cef 6909msgstr "只打印名称(无 SHA-1)"
ef317cd5 6910
2e8451e8 6911#: builtin/name-rev.c:314
ef317cd5 6912msgid "only use tags to name the commits"
07432cef 6913msgstr "只使用 tags 来命名提交"
ef317cd5 6914
2e8451e8 6915#: builtin/name-rev.c:316
ef317cd5 6916msgid "only use refs matching <pattern>"
07432cef 6917msgstr "只使用和 <模式> 相匹配的引用"
ef317cd5 6918
2e8451e8 6919#: builtin/name-rev.c:318
ef317cd5 6920msgid "list all commits reachable from all refs"
07432cef 6921msgstr "列出可以从所有引用访问的提交"
ef317cd5 6922
2e8451e8 6923#: builtin/name-rev.c:319
ef317cd5 6924msgid "read from stdin"
07432cef 6925msgstr "从标准输入读取"
ef317cd5 6926
2e8451e8 6927#: builtin/name-rev.c:320
ef317cd5 6928msgid "allow to print `undefined` names"
07432cef 6929msgstr "允许打印 `未定义` 的名称"
ef317cd5 6930
2e8451e8
JX
6931#: builtin/name-rev.c:326
6932msgid "dereference tags in the input (internal use)"
6933msgstr "反向解析输入中的 tags(内部使用)"
6934
6935#: builtin/notes.c:24
ef317cd5 6936msgid "git notes [--ref <notes_ref>] [list [<object>]]"
07432cef 6937msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
ef317cd5 6938
2e8451e8 6939#: builtin/notes.c:25
ef317cd5
JX
6940msgid ""
6941"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6942"<object>] [<object>]"
6943msgstr ""
07432cef
WS
6944"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
6945"象>] [<对象>]"
ef317cd5 6946
2e8451e8 6947#: builtin/notes.c:26
ef317cd5 6948msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
07432cef 6949msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
ef317cd5 6950
2e8451e8 6951#: builtin/notes.c:27
ef317cd5
JX
6952msgid ""
6953"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6954"<object>] [<object>]"
6955msgstr ""
07432cef
WS
6956"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
6957">] [<对象>]"
ef317cd5 6958
2e8451e8 6959#: builtin/notes.c:28
ef317cd5 6960msgid "git notes [--ref <notes_ref>] edit [<object>]"
07432cef 6961msgstr "git notes [--ref <注解引用>] edit [<对象>]"
ef317cd5 6962
2e8451e8 6963#: builtin/notes.c:29
ef317cd5 6964msgid "git notes [--ref <notes_ref>] show [<object>]"
07432cef 6965msgstr "git notes [--ref <注解引用>] show [<对象>]"
ef317cd5 6966
2e8451e8 6967#: builtin/notes.c:30
ef317cd5
JX
6968msgid ""
6969"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
07432cef 6970msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
ef317cd5 6971
2e8451e8 6972#: builtin/notes.c:31
ef317cd5 6973msgid "git notes merge --commit [-v | -q]"
07432cef 6974msgstr "git notes merge --commit [-v | -q]"
ef317cd5 6975
2e8451e8 6976#: builtin/notes.c:32
ef317cd5 6977msgid "git notes merge --abort [-v | -q]"
07432cef 6978msgstr "git notes merge --abort [-v | -q]"
ef317cd5 6979
2e8451e8 6980#: builtin/notes.c:33
ef317cd5 6981msgid "git notes [--ref <notes_ref>] remove [<object>...]"
07432cef 6982msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
ef317cd5 6983
2e8451e8 6984#: builtin/notes.c:34
ef317cd5 6985msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
07432cef 6986msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
ef317cd5 6987
2e8451e8 6988#: builtin/notes.c:35
ef317cd5 6989msgid "git notes [--ref <notes_ref>] get-ref"
07432cef 6990msgstr "git notes [--ref <注解引用>] get-ref"
ef317cd5 6991
2e8451e8 6992#: builtin/notes.c:40
ef317cd5 6993msgid "git notes [list [<object>]]"
07432cef 6994msgstr "git notes [list [<对象>]]"
ef317cd5 6995
2e8451e8 6996#: builtin/notes.c:45
ef317cd5 6997msgid "git notes add [<options>] [<object>]"
07432cef 6998msgstr "git notes add [<选项>] [<对象>]"
ef317cd5 6999
2e8451e8 7000#: builtin/notes.c:50
ef317cd5 7001msgid "git notes copy [<options>] <from-object> <to-object>"
07432cef 7002msgstr "git notes copy [<选项>] <源对象> <目标对象>"
ef317cd5 7003
2e8451e8 7004#: builtin/notes.c:51
ef317cd5 7005msgid "git notes copy --stdin [<from-object> <to-object>]..."
07432cef 7006msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
ef317cd5 7007
2e8451e8 7008#: builtin/notes.c:56
ef317cd5 7009msgid "git notes append [<options>] [<object>]"
07432cef 7010msgstr "git notes append [<选项>] [<对象>]"
ef317cd5 7011
2e8451e8 7012#: builtin/notes.c:61
ef317cd5 7013msgid "git notes edit [<object>]"
07432cef 7014msgstr "git notes edit [<对象>]"
ef317cd5 7015
2e8451e8 7016#: builtin/notes.c:66
ef317cd5 7017msgid "git notes show [<object>]"
07432cef 7018msgstr "git notes show [<对象>]"
ef317cd5 7019
2e8451e8 7020#: builtin/notes.c:71
ef317cd5 7021msgid "git notes merge [<options>] <notes_ref>"
07432cef 7022msgstr "git notes merge [<选项>] <注解引用>"
ef317cd5 7023
2e8451e8 7024#: builtin/notes.c:72
ef317cd5 7025msgid "git notes merge --commit [<options>]"
07432cef 7026msgstr "git notes merge --commit [<选项>]"
ef317cd5 7027
2e8451e8 7028#: builtin/notes.c:73
ef317cd5 7029msgid "git notes merge --abort [<options>]"
07432cef 7030msgstr "git notes merge --abort [<选项>]"
ef317cd5 7031
2e8451e8 7032#: builtin/notes.c:78
ef317cd5 7033msgid "git notes remove [<object>]"
07432cef 7034msgstr "git notes remove [<对象>]"
ef317cd5 7035
2e8451e8 7036#: builtin/notes.c:83
ef317cd5 7037msgid "git notes prune [<options>]"
07432cef 7038msgstr "git notes prune [<选项>]"
ef317cd5 7039
2e8451e8 7040#: builtin/notes.c:88
ef317cd5 7041msgid "git notes get-ref"
07432cef 7042msgstr "git notes get-ref"
ef317cd5 7043
2e8451e8 7044#: builtin/notes.c:137
c04f5ac3
JX
7045#, c-format
7046msgid "unable to start 'show' for object '%s'"
7047msgstr "不能为对象 '%s' 开始 'show'"
7048
2e8451e8 7049#: builtin/notes.c:141
a77c07d9
JX
7050msgid "could not read 'show' output"
7051msgstr "不能读取 'show' 的输出"
c04f5ac3 7052
2e8451e8 7053#: builtin/notes.c:149
c04f5ac3
JX
7054#, c-format
7055msgid "failed to finish 'show' for object '%s'"
7056msgstr "无法为对象 '%s' 完成 'show'"
7057
2e8451e8 7058#: builtin/notes.c:167 builtin/tag.c:341
c04f5ac3
JX
7059#, c-format
7060msgid "could not create file '%s'"
7061msgstr "不能创建文件 '%s'"
7062
2e8451e8 7063#: builtin/notes.c:186
c04f5ac3
JX
7064msgid "Please supply the note contents using either -m or -F option"
7065msgstr "请通过 -m 或 -F 选项为注解提供内容"
7066
2e8451e8 7067#: builtin/notes.c:207 builtin/notes.c:844
c04f5ac3
JX
7068#, c-format
7069msgid "Removing note for object %s\n"
7070msgstr "删除对象 %s 的注解\n"
7071
2e8451e8 7072#: builtin/notes.c:212
c04f5ac3
JX
7073msgid "unable to write note object"
7074msgstr "不能写注解对象"
7075
2e8451e8 7076#: builtin/notes.c:214
c04f5ac3
JX
7077#, c-format
7078msgid "The note contents has been left in %s"
7079msgstr "注解内容被留在文件 %s 中"
7080
2e8451e8 7081#: builtin/notes.c:248 builtin/tag.c:540
c04f5ac3
JX
7082#, c-format
7083msgid "cannot read '%s'"
7084msgstr "不能读取 '%s'"
7085
2e8451e8 7086#: builtin/notes.c:250 builtin/tag.c:543
c04f5ac3
JX
7087#, c-format
7088msgid "could not open or read '%s'"
7089msgstr "不能打开或读取 '%s'"
7090
2e8451e8
JX
7091#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318
7092#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515
7093#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637
7094#: builtin/notes.c:839 builtin/tag.c:556
c04f5ac3
JX
7095#, c-format
7096msgid "Failed to resolve '%s' as a valid ref."
90e6ef53 7097msgstr "无法解析 '%s' 为一个有效引用。"
c04f5ac3 7098
2e8451e8 7099#: builtin/notes.c:272
c04f5ac3
JX
7100#, c-format
7101msgid "Failed to read object '%s'."
7102msgstr "无法读取对象 '%s'。"
7103
2e8451e8 7104#: builtin/notes.c:312
c04f5ac3
JX
7105#, c-format
7106msgid "Malformed input line: '%s'."
7107msgstr "非法的输入行:'%s'。"
7108
2e8451e8 7109#: builtin/notes.c:327
c04f5ac3
JX
7110#, c-format
7111msgid "Failed to copy notes from '%s' to '%s'"
90e6ef53 7112msgstr "无法从 '%s' 到 '%s' 拷贝注解"
c04f5ac3 7113
2e8451e8
JX
7114#: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498
7115#: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630
7116#: builtin/notes.c:904
c04f5ac3
JX
7117msgid "too many parameters"
7118msgstr "参数太多"
7119
2e8451e8 7120#: builtin/notes.c:384 builtin/notes.c:643
c04f5ac3
JX
7121#, c-format
7122msgid "No note found for object %s."
7123msgstr "未发现对象 %s 的注解。"
7124
2e8451e8 7125#: builtin/notes.c:406 builtin/notes.c:563
ef317cd5 7126msgid "note contents as a string"
07432cef 7127msgstr "注解内容作为一个字符串"
ef317cd5 7128
2e8451e8 7129#: builtin/notes.c:409 builtin/notes.c:566
ef317cd5 7130msgid "note contents in a file"
07432cef 7131msgstr "注解内容到一个文件中"
ef317cd5 7132
2e8451e8
JX
7133#: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568
7134#: builtin/notes.c:571 builtin/tag.c:474
ef317cd5 7135msgid "object"
07432cef 7136msgstr "对象"
ef317cd5 7137
2e8451e8 7138#: builtin/notes.c:412 builtin/notes.c:569
ef317cd5 7139msgid "reuse and edit specified note object"
07432cef 7140msgstr "重用和编辑指定的注解对象"
ef317cd5 7141
2e8451e8 7142#: builtin/notes.c:415 builtin/notes.c:572
ef317cd5 7143msgid "reuse specified note object"
07432cef 7144msgstr "重用指定的注解对象"
ef317cd5 7145
2e8451e8 7146#: builtin/notes.c:417 builtin/notes.c:485
ef317cd5 7147msgid "replace existing notes"
07432cef 7148msgstr "替换已存在的注解"
ef317cd5 7149
2e8451e8 7150#: builtin/notes.c:451
c04f5ac3
JX
7151#, c-format
7152msgid ""
7153"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7154"existing notes"
7155msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7156
2e8451e8 7157#: builtin/notes.c:456 builtin/notes.c:533
c04f5ac3
JX
7158#, c-format
7159msgid "Overwriting existing notes for object %s\n"
7160msgstr "覆盖对象 %s 现存注解\n"
7161
2e8451e8 7162#: builtin/notes.c:486
ef317cd5 7163msgid "read objects from stdin"
07432cef 7164msgstr "从标准输入读取对象"
ef317cd5 7165
2e8451e8 7166#: builtin/notes.c:488
ef317cd5 7167msgid "load rewriting config for <command> (implies --stdin)"
07432cef 7168msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
ef317cd5 7169
2e8451e8 7170#: builtin/notes.c:506
c04f5ac3
JX
7171msgid "too few parameters"
7172msgstr "参数太少"
7173
2e8451e8 7174#: builtin/notes.c:527
c04f5ac3
JX
7175#, c-format
7176msgid ""
7177"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7178"existing notes"
7179msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
7180
2e8451e8 7181#: builtin/notes.c:539
c04f5ac3
JX
7182#, c-format
7183msgid "Missing notes on source object %s. Cannot copy."
7184msgstr "源对象 %s 缺少注解。不能拷贝。"
7185
2e8451e8 7186#: builtin/notes.c:588
ef317cd5
JX
7187#, c-format
7188msgid ""
7189"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7190"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7191msgstr ""
7192"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
7193"请换用 'git notes add -f -m/-F/-c/-C'。\n"
7194
2e8451e8 7195#: builtin/notes.c:735
ef317cd5 7196msgid "General options"
07432cef 7197msgstr "通用选项"
ef317cd5 7198
2e8451e8 7199#: builtin/notes.c:737
ef317cd5 7200msgid "Merge options"
07432cef 7201msgstr "合并选项"
ef317cd5 7202
2e8451e8 7203#: builtin/notes.c:739
ef317cd5
JX
7204msgid ""
7205"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
7206"cat_sort_uniq)"
07432cef 7207msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
ef317cd5 7208
2e8451e8 7209#: builtin/notes.c:741
ef317cd5 7210msgid "Committing unmerged notes"
07432cef 7211msgstr "提交未合并的注解"
ef317cd5 7212
2e8451e8 7213#: builtin/notes.c:743
ef317cd5 7214msgid "finalize notes merge by committing unmerged notes"
07432cef 7215msgstr "通过提交未合并的注解来完成注解合并"
ef317cd5 7216
2e8451e8 7217#: builtin/notes.c:745
ef317cd5 7218msgid "Aborting notes merge resolution"
07432cef 7219msgstr "中止注解合并的方案"
ef317cd5 7220
2e8451e8 7221#: builtin/notes.c:747
ef317cd5 7222msgid "abort notes merge"
07432cef 7223msgstr "中止注解合并"
ef317cd5 7224
2e8451e8 7225#: builtin/notes.c:842
ef317cd5
JX
7226#, c-format
7227msgid "Object %s has no note\n"
7228msgstr "对象 %s 没有注解\n"
7229
2e8451e8 7230#: builtin/notes.c:854
ef317cd5 7231msgid "attempt to remove non-existent note is not an error"
07432cef 7232msgstr "尝试删除不存在的注解不是一个错误"
ef317cd5 7233
2e8451e8 7234#: builtin/notes.c:857
ef317cd5 7235msgid "read object names from the standard input"
07432cef 7236msgstr "从标准输入读取对象名称"
ef317cd5 7237
2e8451e8 7238#: builtin/notes.c:938
ef317cd5 7239msgid "notes_ref"
07432cef 7240msgstr "注解引用"
ef317cd5 7241
2e8451e8 7242#: builtin/notes.c:939
ef317cd5 7243msgid "use notes from <notes_ref>"
07432cef 7244msgstr "从 <注解引用> 使用注解"
ef317cd5 7245
2e8451e8 7246#: builtin/notes.c:974 builtin/remote.c:1598
ef317cd5
JX
7247#, c-format
7248msgid "Unknown subcommand: %s"
7249msgstr "未知子命令:%s"
7250
7251#: builtin/pack-objects.c:23
7252msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
07432cef 7253msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
ef317cd5
JX
7254
7255#: builtin/pack-objects.c:24
7256msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
07432cef 7257msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
ef317cd5
JX
7258
7259#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
7260#, c-format
7261msgid "deflate error (%d)"
7262msgstr "压缩错误 (%d)"
7263
07432cef 7264#: builtin/pack-objects.c:2397
ef317cd5
JX
7265#, c-format
7266msgid "unsupported index version %s"
7267msgstr "不支持的索引版本 %s"
7268
07432cef 7269#: builtin/pack-objects.c:2401
ef317cd5
JX
7270#, c-format
7271msgid "bad index version '%s'"
7272msgstr "坏的索引版本 '%s'"
7273
07432cef 7274#: builtin/pack-objects.c:2424
ef317cd5
JX
7275#, c-format
7276msgid "option %s does not accept negative form"
7277msgstr "选项 %s 不接受否定格式"
7278
07432cef 7279#: builtin/pack-objects.c:2428
ef317cd5
JX
7280#, c-format
7281msgid "unable to parse value '%s' for option %s"
7282msgstr "不能解析选项 %1$s 的值 '%2$s'"
7283
07432cef 7284#: builtin/pack-objects.c:2447
ef317cd5 7285msgid "do not show progress meter"
07432cef 7286msgstr "不显示进度表"
ef317cd5 7287
07432cef 7288#: builtin/pack-objects.c:2449
ef317cd5 7289msgid "show progress meter"
07432cef 7290msgstr "显示进度表"
ef317cd5 7291
07432cef 7292#: builtin/pack-objects.c:2451
ef317cd5 7293msgid "show progress meter during object writing phase"
07432cef 7294msgstr "在对象写入阶段显示进度表"
ef317cd5 7295
07432cef 7296#: builtin/pack-objects.c:2454
ef317cd5 7297msgid "similar to --all-progress when progress meter is shown"
07432cef 7298msgstr "当进度表显示时类似于 --all-progress"
ef317cd5 7299
07432cef 7300#: builtin/pack-objects.c:2455
ef317cd5 7301msgid "version[,offset]"
07432cef 7302msgstr "版本[,偏移]"
ef317cd5 7303
07432cef 7304#: builtin/pack-objects.c:2456
ef317cd5 7305msgid "write the pack index file in the specified idx format version"
07432cef 7306msgstr "用指定的 idx 格式版本来写包索引文件"
ef317cd5 7307
07432cef 7308#: builtin/pack-objects.c:2459
ef317cd5 7309msgid "maximum size of each output pack file"
07432cef 7310msgstr "每个输出包的最大尺寸"
ef317cd5 7311
07432cef 7312#: builtin/pack-objects.c:2461
ef317cd5 7313msgid "ignore borrowed objects from alternate object store"
07432cef 7314msgstr "忽略从替代对象存储里借用对象"
ef317cd5 7315
07432cef 7316#: builtin/pack-objects.c:2463
ef317cd5 7317msgid "ignore packed objects"
07432cef 7318msgstr "忽略包对象"
ef317cd5 7319
07432cef 7320#: builtin/pack-objects.c:2465
ef317cd5 7321msgid "limit pack window by objects"
07432cef 7322msgstr "限制打包窗口的对象数"
ef317cd5 7323
07432cef 7324#: builtin/pack-objects.c:2467
ef317cd5 7325msgid "limit pack window by memory in addition to object limit"
07432cef 7326msgstr "除对象数量限制外设置打包窗口的内存限制"
ef317cd5 7327
07432cef 7328#: builtin/pack-objects.c:2469
ef317cd5 7329msgid "maximum length of delta chain allowed in the resulting pack"
07432cef 7330msgstr "打包允许的 delta 链的最大长度"
ef317cd5 7331
07432cef 7332#: builtin/pack-objects.c:2471
ef317cd5 7333msgid "reuse existing deltas"
07432cef 7334msgstr "重用已存在的 deltas"
ef317cd5 7335
07432cef 7336#: builtin/pack-objects.c:2473
ef317cd5 7337msgid "reuse existing objects"
07432cef 7338msgstr "重用已存在的对象"
ef317cd5 7339
07432cef 7340#: builtin/pack-objects.c:2475
ef317cd5 7341msgid "use OFS_DELTA objects"
07432cef 7342msgstr "使用 OFS_DELTA 对象"
ef317cd5 7343
07432cef 7344#: builtin/pack-objects.c:2477
ef317cd5 7345msgid "use threads when searching for best delta matches"
07432cef 7346msgstr "使用线程查询最佳 delta 匹配"
ef317cd5 7347
07432cef 7348#: builtin/pack-objects.c:2479
ef317cd5 7349msgid "do not create an empty pack output"
07432cef 7350msgstr "不创建空的包输出"
ef317cd5 7351
07432cef 7352#: builtin/pack-objects.c:2481
ef317cd5 7353msgid "read revision arguments from standard input"
07432cef 7354msgstr "从标准输入读取修订号参数"
ef317cd5 7355
07432cef 7356#: builtin/pack-objects.c:2483
ef317cd5 7357msgid "limit the objects to those that are not yet packed"
07432cef 7358msgstr "限制那些尚未打包的对象"
ef317cd5 7359
07432cef 7360#: builtin/pack-objects.c:2486
ef317cd5 7361msgid "include objects reachable from any reference"
07432cef 7362msgstr "包括可以从任何引用访问到的对象"
ef317cd5 7363
07432cef 7364#: builtin/pack-objects.c:2489
ef317cd5 7365msgid "include objects referred by reflog entries"
07432cef 7366msgstr "包括被引用日志引用到的对象"
ef317cd5 7367
07432cef 7368#: builtin/pack-objects.c:2492
ef317cd5 7369msgid "output pack to stdout"
07432cef 7370msgstr "输出包到标准输出"
ef317cd5 7371
07432cef 7372#: builtin/pack-objects.c:2494
ef317cd5 7373msgid "include tag objects that refer to objects to be packed"
07432cef 7374msgstr "包括引用了打包对象的 tag"
ef317cd5 7375
07432cef 7376#: builtin/pack-objects.c:2496
ef317cd5 7377msgid "keep unreachable objects"
07432cef 7378msgstr "维持不可达的对象"
ef317cd5 7379
07432cef 7380#: builtin/pack-objects.c:2497 parse-options.h:141
ef317cd5
JX
7381msgid "time"
7382msgstr "时间"
7383
07432cef 7384#: builtin/pack-objects.c:2498
ef317cd5 7385msgid "unpack unreachable objects newer than <time>"
07432cef 7386msgstr "将比给定 <时间> 新的无法访问的对象解包"
ef317cd5 7387
07432cef 7388#: builtin/pack-objects.c:2501
ef317cd5 7389msgid "create thin packs"
07432cef 7390msgstr "创建精简包"
ef317cd5 7391
07432cef 7392#: builtin/pack-objects.c:2503
ef317cd5 7393msgid "ignore packs that have companion .keep file"
07432cef 7394msgstr "忽略配有 .keep 文件的包"
ef317cd5 7395
07432cef 7396#: builtin/pack-objects.c:2505
ef317cd5 7397msgid "pack compression level"
07432cef 7398msgstr "打包压缩级别"
ef317cd5 7399
07432cef 7400#: builtin/pack-objects.c:2507
ef317cd5 7401msgid "do not hide commits by grafts"
07432cef 7402msgstr "不隐藏移植覆盖的提交"
ef317cd5
JX
7403
7404#: builtin/pack-refs.c:6
7405msgid "git pack-refs [options]"
07432cef 7406msgstr "git pack-refs [选项]"
c04f5ac3 7407
ef317cd5
JX
7408#: builtin/pack-refs.c:14
7409msgid "pack everything"
07432cef 7410msgstr "打包一切"
c04f5ac3 7411
ef317cd5
JX
7412#: builtin/pack-refs.c:15
7413msgid "prune loose refs (default)"
07432cef 7414msgstr "清除松散的引用(默认)"
c04f5ac3 7415
ef317cd5
JX
7416#: builtin/prune-packed.c:7
7417msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
07432cef 7418msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
6792b93b 7419
ef317cd5
JX
7420#: builtin/prune.c:12
7421msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
07432cef 7422msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
7ac1c0ad 7423
ef317cd5 7424#: builtin/prune.c:132
ef317cd5 7425msgid "do not remove, show only"
07432cef 7426msgstr "不删除,只显示"
7ac1c0ad 7427
ef317cd5 7428#: builtin/prune.c:133
ef317cd5 7429msgid "report pruned objects"
07432cef 7430msgstr "报告清除的对象"
7ac1c0ad 7431
ef317cd5
JX
7432#: builtin/prune.c:136
7433msgid "expire objects older than <time>"
07432cef 7434msgstr "使早于给定时间的对象过期"
ef317cd5
JX
7435
7436#: builtin/push.c:14
ef317cd5 7437msgid "git push [<options>] [<repository> [<refspec>...]]"
07432cef 7438msgstr "git push [<选项>] [<版本库> [<引用表达式>...]]"
7ac1c0ad 7439
170e9899 7440#: builtin/push.c:45
c04f5ac3
JX
7441msgid "tag shorthand without <tag>"
7442msgstr "tag 简写没有跟 <tag> 参数"
7443
170e9899 7444#: builtin/push.c:64
c04f5ac3 7445msgid "--delete only accepts plain target ref names"
90e6ef53 7446msgstr "--delete 只接受简单的目标引用名"
c04f5ac3 7447
8ada9598
JX
7448#: builtin/push.c:99
7449msgid ""
7450"\n"
7451"To choose either option permanently, see push.default in 'git help config'."
7452msgstr ""
81809b99
JX
7453"\n"
7454"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
8ada9598
JX
7455
7456#: builtin/push.c:102
7457#, c-format
7458msgid ""
7459"The upstream branch of your current branch does not match\n"
7460"the name of your current branch. To push to the upstream branch\n"
7461"on the remote, use\n"
7462"\n"
7463" git push %s HEAD:%s\n"
7464"\n"
7465"To push to the branch of the same name on the remote, use\n"
7466"\n"
7467" git push %s %s\n"
7468"%s"
7469msgstr ""
81809b99
JX
7470"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
7471"上游分支,使用\n"
7472"\n"
7473" git push %s HEAD:%s\n"
7474"\n"
7475"为推送至远程同名分支,使用\n"
7476"\n"
7477" git push %s %s\n"
7478"%s"
8ada9598 7479
2e8451e8 7480#: builtin/push.c:117
c04f5ac3
JX
7481#, c-format
7482msgid ""
7483"You are not currently on a branch.\n"
7484"To push the history leading to the current (detached HEAD)\n"
7485"state now, use\n"
7486"\n"
7487" git push %s HEAD:<name-of-remote-branch>\n"
7488msgstr ""
7489"您当前不在一个分支上。\n"
90e6ef53 7490"现在为推送当前(分离头指针)的历史,使用\n"
c04f5ac3
JX
7491"\n"
7492" git push %s HEAD:<name-of-remote-branch>\n"
7493
2e8451e8 7494#: builtin/push.c:131
c04f5ac3
JX
7495#, c-format
7496msgid ""
7497"The current branch %s has no upstream branch.\n"
7498"To push the current branch and set the remote as upstream, use\n"
7499"\n"
7500" git push --set-upstream %s %s\n"
7501msgstr ""
7502"当前分支 %s 没有对应的上游分支。\n"
7503"为推送当前分支并建立与远程上游的跟踪,使用\n"
7504"\n"
7505" git push --set-upstream %s %s\n"
7506
2e8451e8 7507#: builtin/push.c:139
c04f5ac3
JX
7508#, c-format
7509msgid "The current branch %s has multiple upstream branches, refusing to push."
7510msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
7511
2e8451e8 7512#: builtin/push.c:142
73a60cd2
JX
7513#, c-format
7514msgid ""
7515"You are pushing to remote '%s', which is not the upstream of\n"
7516"your current branch '%s', without telling me what to push\n"
7517"to update which remote branch."
7518msgstr ""
7519"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
7520"而没有告诉我要推送什么、更新哪个远程分支。"
7521
c160d03f 7522# 译者:字符串首行行首要添加“warning: ”字串,故此首行要较其余行短
2e8451e8 7523#: builtin/push.c:165
c160d03f
JX
7524msgid ""
7525"push.default is unset; its implicit value is changing in\n"
7526"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7527"and maintain the current behavior after the default changes, use:\n"
7528"\n"
7529" git config --global push.default matching\n"
7530"\n"
7531"To squelch this message and adopt the new behavior now, use:\n"
7532"\n"
7533" git config --global push.default simple\n"
7534"\n"
7535"See 'git help config' and search for 'push.default' for further "
7536"information.\n"
7537"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7538"'current' instead of 'simple' if you sometimes use older versions of Git)"
7539msgstr ""
7540"push.default 未设置,它的默认值将会在 Git 2.0 由 'matching'\n"
7541"修改为 'simple'。若要不再显示本信息并在其默认值改变后维持当前使用习惯,\n"
7542"进行如下设置:\n"
7543"\n"
7544" git config --global push.default matching\n"
7545"\n"
7546"若要不再显示本信息并从现在开始采用新的使用习惯,设置:\n"
7547"\n"
7548" git config --global push.default simple\n"
7549"\n"
7550"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
7551"('simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git,\n"
7552"为保持兼容,请用 'current' 代替 'simple' 模式)"
7553
2e8451e8 7554#: builtin/push.c:225
c04f5ac3
JX
7555msgid ""
7556"You didn't specify any refspecs to push, and push.default is \"nothing\"."
90e6ef53 7557msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
c04f5ac3 7558
2e8451e8 7559#: builtin/push.c:232
170e9899
JX
7560msgid ""
7561"Updates were rejected because the tip of your current branch is behind\n"
2e8451e8
JX
7562"its remote counterpart. Integrate the remote changes (e.g.\n"
7563"'git pull ...') before pushing again.\n"
170e9899
JX
7564"See the 'Note about fast-forwards' in 'git push --help' for details."
7565msgstr ""
eff6d3a9 7566"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 7567"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
eff6d3a9 7568"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 7569
2e8451e8 7570#: builtin/push.c:238
170e9899
JX
7571msgid ""
7572"Updates were rejected because a pushed branch tip is behind its remote\n"
7573"counterpart. If you did not intend to push that branch, you may want to\n"
c160d03f
JX
7574"specify branches to push or set the 'push.default' configuration variable\n"
7575"to 'simple', 'current' or 'upstream' to push only the current branch."
170e9899 7576msgstr ""
eff6d3a9
JX
7577"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
7578"如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
c160d03f
JX
7579"配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
7580"以便只推送当前分支。"
170e9899 7581
2e8451e8 7582#: builtin/push.c:244
170e9899
JX
7583msgid ""
7584"Updates were rejected because a pushed branch tip is behind its remote\n"
2e8451e8
JX
7585"counterpart. Check out this branch and integrate the remote changes\n"
7586"(e.g. 'git pull ...') before pushing again.\n"
170e9899
JX
7587"See the 'Note about fast-forwards' in 'git push --help' for details."
7588msgstr ""
eff6d3a9 7589"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
2e8451e8 7590"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
eff6d3a9 7591"'git push --help' 中的 'Note about fast-forwards' 小节。"
170e9899 7592
2e8451e8 7593#: builtin/push.c:250
07432cef 7594msgid ""
a77c07d9
JX
7595"Updates were rejected because the remote contains work that you do\n"
7596"not have locally. This is usually caused by another repository pushing\n"
2e8451e8
JX
7597"to the same ref. You may want to first integrate the remote changes\n"
7598"(e.g., 'git pull ...') before pushing again.\n"
a77c07d9
JX
7599"See the 'Note about fast-forwards' in 'git push --help' for details."
7600msgstr ""
7601"更新被拒绝,因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
2e8451e8
JX
7602"一个版本库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
7603"(如 'git pull ...')。\n"
a77c07d9
JX
7604"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
7605
2e8451e8 7606#: builtin/push.c:257
a77c07d9
JX
7607msgid "Updates were rejected because the tag already exists in the remote."
7608msgstr "更新被拒绝因为 tag 在远程已经存在。"
7609
2e8451e8 7610#: builtin/push.c:260
a77c07d9
JX
7611msgid ""
7612"You cannot update a remote ref that points at a non-commit object,\n"
7613"or update a remote ref to make it point at a non-commit object,\n"
7614"without using the '--force' option.\n"
7615msgstr ""
7616"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
7617"也不能更新远程引用让其指向一个非提交对象。\n"
07432cef 7618
2e8451e8 7619#: builtin/push.c:320
c04f5ac3
JX
7620#, c-format
7621msgid "Pushing to %s\n"
7622msgstr "推送到 %s\n"
7623
2e8451e8 7624#: builtin/push.c:324
c04f5ac3
JX
7625#, c-format
7626msgid "failed to push some refs to '%s'"
7627msgstr "无法推送一些引用到 '%s'"
7628
2e8451e8 7629#: builtin/push.c:357
c04f5ac3
JX
7630#, c-format
7631msgid "bad repository '%s'"
90e6ef53 7632msgstr "坏的版本库 '%s'"
c04f5ac3 7633
2e8451e8 7634#: builtin/push.c:358
c04f5ac3
JX
7635msgid ""
7636"No configured push destination.\n"
7637"Either specify the URL from the command-line or configure a remote "
7638"repository using\n"
7639"\n"
7640" git remote add <name> <url>\n"
7641"\n"
7642"and then push using the remote name\n"
7643"\n"
7644" git push <name>\n"
7645msgstr ""
90e6ef53 7646"没有配置推送目标。\n"
07432cef 7647"或通过命令行指定URL,或用下面命令配置一个远程版本库\n"
c04f5ac3
JX
7648"\n"
7649" git remote add <name> <url>\n"
7650"\n"
7651"然后使用该远程版本库名执行推送\n"
7652"\n"
7653" git push <name>\n"
7654
2e8451e8 7655#: builtin/push.c:373
c04f5ac3
JX
7656msgid "--all and --tags are incompatible"
7657msgstr "--all 和 --tags 不兼容"
7658
2e8451e8 7659#: builtin/push.c:374
c04f5ac3 7660msgid "--all can't be combined with refspecs"
649900bc 7661msgstr "--all 不能和引用表达式同时使用"
c04f5ac3 7662
2e8451e8 7663#: builtin/push.c:379
c04f5ac3
JX
7664msgid "--mirror and --tags are incompatible"
7665msgstr "--mirror 和 --tags 不兼容"
7666
2e8451e8 7667#: builtin/push.c:380
c04f5ac3 7668msgid "--mirror can't be combined with refspecs"
649900bc 7669msgstr "--mirror 不能和引用表达式同时使用"
c04f5ac3 7670
2e8451e8 7671#: builtin/push.c:385
c04f5ac3
JX
7672msgid "--all and --mirror are incompatible"
7673msgstr "--all 和 --mirror 不兼容"
7674
2e8451e8 7675#: builtin/push.c:445
ef317cd5 7676msgid "repository"
07432cef 7677msgstr "版本库"
ef317cd5 7678
2e8451e8 7679#: builtin/push.c:446
ef317cd5 7680msgid "push all refs"
07432cef 7681msgstr "推送所有引用"
ef317cd5 7682
2e8451e8 7683#: builtin/push.c:447
ef317cd5 7684msgid "mirror all refs"
07432cef 7685msgstr "镜像所有引用"
ef317cd5 7686
2e8451e8 7687#: builtin/push.c:449
ef317cd5 7688msgid "delete refs"
07432cef 7689msgstr "删除引用"
ef317cd5 7690
2e8451e8 7691#: builtin/push.c:450
ef317cd5 7692msgid "push tags (can't be used with --all or --mirror)"
07432cef 7693msgstr "推送 tags(不能使用 --all or --mirror)"
ef317cd5 7694
2e8451e8 7695#: builtin/push.c:453
ef317cd5
JX
7696msgid "force updates"
7697msgstr "强制更新"
7698
2e8451e8 7699#: builtin/push.c:454
ef317cd5 7700msgid "check"
07432cef 7701msgstr "检查"
ef317cd5 7702
2e8451e8 7703#: builtin/push.c:455
ef317cd5 7704msgid "control recursive pushing of submodules"
07432cef 7705msgstr "控制子模组的递归推送"
ef317cd5 7706
2e8451e8 7707#: builtin/push.c:457
ef317cd5 7708msgid "use thin pack"
07432cef 7709msgstr "使用精简打包"
ef317cd5 7710
2e8451e8 7711#: builtin/push.c:458 builtin/push.c:459
ef317cd5 7712msgid "receive pack program"
07432cef 7713msgstr "接收包程序"
ef317cd5 7714
2e8451e8 7715#: builtin/push.c:460
ef317cd5 7716msgid "set upstream for git pull/status"
07432cef 7717msgstr "设置 git pull/status 的上游"
ef317cd5 7718
2e8451e8 7719#: builtin/push.c:463
ef317cd5 7720msgid "prune locally removed refs"
07432cef 7721msgstr "清除本地删除的引用"
ef317cd5 7722
2e8451e8 7723#: builtin/push.c:465
a77c07d9
JX
7724msgid "bypass pre-push hook"
7725msgstr "绕过 pre-push 钩子"
7726
2e8451e8 7727#: builtin/push.c:466
1003b3a5
JX
7728msgid "push missing but relevant tags"
7729msgstr "推送缺失的有关的 tags"
7730
2e8451e8 7731#: builtin/push.c:476
c04f5ac3
JX
7732msgid "--delete is incompatible with --all, --mirror and --tags"
7733msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
7734
2e8451e8 7735#: builtin/push.c:478
c04f5ac3
JX
7736msgid "--delete doesn't make sense without any refs"
7737msgstr "--delete 未接任何引用没有意义"
7738
ef317cd5
JX
7739#: builtin/read-tree.c:36
7740msgid ""
7741"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7742"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7743"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7744msgstr ""
07432cef
WS
7745"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-"
7746"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7747"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])"
ef317cd5 7748
2e8451e8 7749#: builtin/read-tree.c:109
ef317cd5 7750msgid "write resulting index to <file>"
07432cef 7751msgstr "将索引结果写入 <file>"
ef317cd5 7752
2e8451e8 7753#: builtin/read-tree.c:112
ef317cd5 7754msgid "only empty the index"
07432cef 7755msgstr "只是清空索引"
ef317cd5 7756
2e8451e8 7757#: builtin/read-tree.c:114
ef317cd5 7758msgid "Merging"
07432cef 7759msgstr "合并"
ef317cd5 7760
2e8451e8 7761#: builtin/read-tree.c:116
ef317cd5 7762msgid "perform a merge in addition to a read"
07432cef 7763msgstr "读取之余再执行一个合并"
ef317cd5 7764
2e8451e8 7765#: builtin/read-tree.c:118
ef317cd5 7766msgid "3-way merge if no file level merging required"
07432cef 7767msgstr "如果没有文件级合并需要,执行三路合并"
ef317cd5 7768
2e8451e8 7769#: builtin/read-tree.c:120
ef317cd5 7770msgid "3-way merge in presence of adds and removes"
07432cef 7771msgstr "存在添加和删除时,也执行三路合并"
ef317cd5 7772
2e8451e8 7773#: builtin/read-tree.c:122
ef317cd5 7774msgid "same as -m, but discard unmerged entries"
07432cef 7775msgstr "类似于 -m,但丢弃未合并的条目"
ef317cd5 7776
2e8451e8 7777#: builtin/read-tree.c:123
ef317cd5 7778msgid "<subdirectory>/"
07432cef 7779msgstr "<子目录>/"
ef317cd5 7780
2e8451e8 7781#: builtin/read-tree.c:124
ef317cd5 7782msgid "read the tree into the index under <subdirectory>/"
07432cef 7783msgstr "读取树对象到索引的 <子目录>/ 下"
ef317cd5 7784
2e8451e8 7785#: builtin/read-tree.c:127
ef317cd5 7786msgid "update working tree with merge result"
07432cef 7787msgstr "用合并的结果更新工作区"
ef317cd5 7788
2e8451e8 7789#: builtin/read-tree.c:129
ef317cd5 7790msgid "gitignore"
07432cef 7791msgstr "gitignore"
ef317cd5 7792
2e8451e8 7793#: builtin/read-tree.c:130
ef317cd5 7794msgid "allow explicitly ignored files to be overwritten"
07432cef 7795msgstr "允许忽略文件中设定的文件可以被覆盖"
ef317cd5 7796
2e8451e8 7797#: builtin/read-tree.c:133
ef317cd5 7798msgid "don't check the working tree after merging"
07432cef 7799msgstr "合并后不检查工作区"
ef317cd5 7800
2e8451e8 7801#: builtin/read-tree.c:134
ef317cd5 7802msgid "don't update the index or the work tree"
07432cef 7803msgstr "不更新索引区和工作区"
ef317cd5 7804
2e8451e8 7805#: builtin/read-tree.c:136
ef317cd5 7806msgid "skip applying sparse checkout filter"
07432cef 7807msgstr "跳过应用稀疏检出过滤器"
ef317cd5 7808
2e8451e8 7809#: builtin/read-tree.c:138
ef317cd5 7810msgid "debug unpack-trees"
07432cef 7811msgstr "调试 unpack-trees"
ef317cd5 7812
2e8451e8
JX
7813#: builtin/reflog.c:500
7814#, c-format
7815msgid "%s' for '%s' is not a valid timestamp"
7816msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
7817
7818#: builtin/reflog.c:616 builtin/reflog.c:621
7819#, c-format
7820msgid "'%s' is not a valid timestamp"
7821msgstr "'%s' 不是一个有效的时间戳"
7822
ef317cd5
JX
7823#: builtin/remote.c:11
7824msgid "git remote [-v | --verbose]"
07432cef 7825msgstr "git remote [-v | --verbose]"
ef317cd5
JX
7826
7827#: builtin/remote.c:12
7828msgid ""
7829"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
7830"mirror=<fetch|push>] <name> <url>"
7831msgstr ""
07432cef
WS
7832"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
7833"mirror=<fetch|push>] <名称> <url>"
ef317cd5
JX
7834
7835#: builtin/remote.c:13 builtin/remote.c:32
7836msgid "git remote rename <old> <new>"
07432cef 7837msgstr "git remote rename <旧名称> <新名称>"
ef317cd5
JX
7838
7839#: builtin/remote.c:14 builtin/remote.c:37
7840msgid "git remote remove <name>"
07432cef 7841msgstr "git remote remove <名称>"
ef317cd5 7842
07432cef 7843#: builtin/remote.c:15 builtin/remote.c:42
ef317cd5 7844msgid "git remote set-head <name> (-a | -d | <branch>)"
07432cef 7845msgstr "git remote set-head <名称> (-a | -d | <分支>)"
ef317cd5
JX
7846
7847#: builtin/remote.c:16
7848msgid "git remote [-v | --verbose] show [-n] <name>"
07432cef 7849msgstr "git remote [-v | --verbose] show [-n] <名称>"
ef317cd5
JX
7850
7851#: builtin/remote.c:17
7852msgid "git remote prune [-n | --dry-run] <name>"
07432cef 7853msgstr "git remote prune [-n | --dry-run] <名称>"
ef317cd5
JX
7854
7855#: builtin/remote.c:18
7856msgid ""
7857"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
07432cef 7858msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
ef317cd5
JX
7859
7860#: builtin/remote.c:19
7861msgid "git remote set-branches [--add] <name> <branch>..."
07432cef 7862msgstr "git remote set-branches [--add] <名称> <分支>..."
ef317cd5
JX
7863
7864#: builtin/remote.c:20 builtin/remote.c:68
7865msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
07432cef 7866msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
ef317cd5
JX
7867
7868#: builtin/remote.c:21 builtin/remote.c:69
7869msgid "git remote set-url --add <name> <newurl>"
07432cef 7870msgstr "git remote set-url --add <名称> <新的地址>"
ef317cd5
JX
7871
7872#: builtin/remote.c:22 builtin/remote.c:70
7873msgid "git remote set-url --delete <name> <url>"
07432cef 7874msgstr "git remote set-url --delete <名称> <地址>"
ef317cd5
JX
7875
7876#: builtin/remote.c:27
7877msgid "git remote add [<options>] <name> <url>"
07432cef 7878msgstr "git remote add [<选项>] <名称> <地址>"
ef317cd5
JX
7879
7880#: builtin/remote.c:47
7881msgid "git remote set-branches <name> <branch>..."
07432cef 7882msgstr "git remote set-branches <名称> <分支>..."
ef317cd5
JX
7883
7884#: builtin/remote.c:48
7885msgid "git remote set-branches --add <name> <branch>..."
07432cef 7886msgstr "git remote set-branches --add <名称> <分支>..."
ef317cd5
JX
7887
7888#: builtin/remote.c:53
7889msgid "git remote show [<options>] <name>"
07432cef 7890msgstr "git remote show [<选项>] <名称>"
ef317cd5
JX
7891
7892#: builtin/remote.c:58
7893msgid "git remote prune [<options>] <name>"
07432cef 7894msgstr "git remote prune [<选项>] <名称>"
ef317cd5
JX
7895
7896#: builtin/remote.c:63
7897msgid "git remote update [<options>] [<group> | <remote>]..."
07432cef 7898msgstr "git remote update [<选项>] [<组> | <远程>]..."
ef317cd5 7899
8ada9598 7900#: builtin/remote.c:98
81809b99 7901#, c-format
8ada9598 7902msgid "Updating %s"
81809b99 7903msgstr "更新 %s 中"
8ada9598
JX
7904
7905#: builtin/remote.c:130
7906msgid ""
7907"--mirror is dangerous and deprecated; please\n"
7908"\t use --mirror=fetch or --mirror=push instead"
7909msgstr ""
81809b99
JX
7910"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
7911"\t 或 --mirror=push"
8ada9598
JX
7912
7913#: builtin/remote.c:147
81809b99 7914#, c-format
8ada9598 7915msgid "unknown mirror argument: %s"
81809b99 7916msgstr "未知的镜像参数:%s"
8ada9598 7917
ef317cd5 7918#: builtin/remote.c:163
ef317cd5 7919msgid "fetch the remote branches"
07432cef 7920msgstr "抓取远程的分支"
ef317cd5
JX
7921
7922#: builtin/remote.c:165
7923msgid "import all tags and associated objects when fetching"
07432cef 7924msgstr "抓取时导入所有的 tags 和关联对象"
ef317cd5
JX
7925
7926#: builtin/remote.c:168
7927msgid "or do not fetch any tag at all (--no-tags)"
07432cef 7928msgstr "或不抓取任何 tag(--no-tags)"
ef317cd5
JX
7929
7930#: builtin/remote.c:170
7931msgid "branch(es) to track"
07432cef 7932msgstr "跟踪的分支"
ef317cd5
JX
7933
7934#: builtin/remote.c:171
ef317cd5 7935msgid "master branch"
07432cef 7936msgstr "主线分支"
ef317cd5
JX
7937
7938#: builtin/remote.c:172
7939msgid "push|fetch"
07432cef 7940msgstr "push|fetch"
ef317cd5
JX
7941
7942#: builtin/remote.c:173
7943msgid "set up remote as a mirror to push to or fetch from"
07432cef 7944msgstr "把远程设置为用以推送或抓取的镜像"
ef317cd5 7945
8ada9598
JX
7946#: builtin/remote.c:185
7947msgid "specifying a master branch makes no sense with --mirror"
81809b99 7948msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
8ada9598
JX
7949
7950#: builtin/remote.c:187
7951msgid "specifying branches to track makes sense only with fetch mirrors"
649900bc 7952msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
8ada9598
JX
7953
7954#: builtin/remote.c:195 builtin/remote.c:646
81809b99 7955#, c-format
8ada9598 7956msgid "remote %s already exists."
81809b99 7957msgstr "远程 %s 已经存在。"
8ada9598
JX
7958
7959#: builtin/remote.c:199 builtin/remote.c:650
81809b99 7960#, c-format
8ada9598 7961msgid "'%s' is not a valid remote name"
81809b99 7962msgstr "'%s' 不是一个有效的远程名称"
8ada9598
JX
7963
7964#: builtin/remote.c:243
81809b99 7965#, c-format
8ada9598 7966msgid "Could not setup master '%s'"
81809b99 7967msgstr "无法设置 master '%s'"
8ada9598
JX
7968
7969#: builtin/remote.c:299
81809b99 7970#, c-format
8ada9598 7971msgid "more than one %s"
81809b99 7972msgstr "多于一个 %s"
8ada9598
JX
7973
7974#: builtin/remote.c:339
81809b99 7975#, c-format
8ada9598 7976msgid "Could not get fetch map for refspec %s"
81809b99 7977msgstr "无法得到引用表达式 %s 的获取列表"
8ada9598
JX
7978
7979#: builtin/remote.c:440 builtin/remote.c:448
7980msgid "(matching)"
81809b99 7981msgstr "(匹配)"
8ada9598
JX
7982
7983#: builtin/remote.c:452
8ada9598 7984msgid "(delete)"
81809b99 7985msgstr "(删除)"
8ada9598
JX
7986
7987#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
81809b99 7988#, c-format
8ada9598 7989msgid "Could not append '%s' to '%s'"
81809b99 7990msgstr "不能添加 '%s' 至 '%s'"
8ada9598
JX
7991
7992#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
81809b99 7993#, c-format
8ada9598 7994msgid "No such remote: %s"
81809b99 7995msgstr "没有这样的远程:%s"
8ada9598
JX
7996
7997#: builtin/remote.c:656
81809b99 7998#, c-format
8ada9598 7999msgid "Could not rename config section '%s' to '%s'"
81809b99 8000msgstr "不能重命名配置小节 '%s' 到 '%s'"
8ada9598
JX
8001
8002#: builtin/remote.c:662 builtin/remote.c:799
81809b99 8003#, c-format
8ada9598 8004msgid "Could not remove config section '%s'"
81809b99 8005msgstr "不能移除配置小节 '%s'"
8ada9598
JX
8006
8007#: builtin/remote.c:677
8008#, c-format
8009msgid ""
d691f479 8010"Not updating non-default fetch refspec\n"
8ada9598
JX
8011"\t%s\n"
8012"\tPlease update the configuration manually if necessary."
8013msgstr ""
81809b99
JX
8014"没有更新非默认的获取引用表达式\n"
8015"\t%s\n"
8016"\t如果必要请手动更新配置。"
8ada9598
JX
8017
8018#: builtin/remote.c:683
81809b99 8019#, c-format
8ada9598 8020msgid "Could not append '%s'"
81809b99 8021msgstr "不能追加 '%s'"
8ada9598
JX
8022
8023#: builtin/remote.c:694
81809b99 8024#, c-format
8ada9598 8025msgid "Could not set '%s'"
81809b99 8026msgstr "不能设置 '%s'"
8ada9598
JX
8027
8028#: builtin/remote.c:716
81809b99 8029#, c-format
8ada9598 8030msgid "deleting '%s' failed"
81809b99 8031msgstr "删除 '%s' 失败"
8ada9598
JX
8032
8033#: builtin/remote.c:750
81809b99 8034#, c-format
8ada9598 8035msgid "creating '%s' failed"
81809b99 8036msgstr "创建 '%s' 失败"
8ada9598
JX
8037
8038#: builtin/remote.c:764
81809b99 8039#, c-format
8ada9598 8040msgid "Could not remove branch %s"
81809b99 8041msgstr "无法移除分支 %s"
8ada9598
JX
8042
8043#: builtin/remote.c:834
8044msgid ""
8045"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8046"to delete it, use:"
8047msgid_plural ""
8048"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
8049"to delete them, use:"
5ae481e0
JX
8050msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
8051msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
8ada9598
JX
8052
8053#: builtin/remote.c:943
8054#, c-format
8055msgid " new (next fetch will store in remotes/%s)"
81809b99 8056msgstr " 新的(下一次获取将存储于 remotes/%s)"
8ada9598
JX
8057
8058#: builtin/remote.c:946
8ada9598 8059msgid " tracked"
81809b99 8060msgstr " 已跟踪"
8ada9598
JX
8061
8062#: builtin/remote.c:948
8063msgid " stale (use 'git remote prune' to remove)"
81809b99 8064msgstr " 过时(使用 'git remote prune' 来移除)"
8ada9598
JX
8065
8066#: builtin/remote.c:950
8067msgid " ???"
81809b99 8068msgstr " ???"
8ada9598
JX
8069
8070#: builtin/remote.c:991
8071#, c-format
8072msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
81809b99 8073msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
8ada9598
JX
8074
8075#: builtin/remote.c:998
81809b99 8076#, c-format
8ada9598 8077msgid "rebases onto remote %s"
81809b99 8078msgstr "变基到远程 %s"
8ada9598
JX
8079
8080#: builtin/remote.c:1001
81809b99 8081#, c-format
8ada9598 8082msgid " merges with remote %s"
81809b99 8083msgstr " 与远程 %s 合并"
8ada9598
JX
8084
8085#: builtin/remote.c:1002
8086msgid " and with remote"
81809b99 8087msgstr " 且有远程"
8ada9598
JX
8088
8089#: builtin/remote.c:1004
81809b99 8090#, c-format
8ada9598 8091msgid "merges with remote %s"
81809b99 8092msgstr "与远程 %s 合并"
8ada9598
JX
8093
8094#: builtin/remote.c:1005
8095msgid " and with remote"
81809b99 8096msgstr " 且有远程"
8ada9598
JX
8097
8098#: builtin/remote.c:1051
8099msgid "create"
81809b99 8100msgstr "创建"
8ada9598
JX
8101
8102#: builtin/remote.c:1054
8ada9598 8103msgid "delete"
81809b99 8104msgstr "删除"
8ada9598
JX
8105
8106#: builtin/remote.c:1058
8ada9598 8107msgid "up to date"
81809b99 8108msgstr "最新"
8ada9598
JX
8109
8110#: builtin/remote.c:1061
8ada9598 8111msgid "fast-forwardable"
81809b99 8112msgstr "可快进"
8ada9598
JX
8113
8114#: builtin/remote.c:1064
8115msgid "local out of date"
81809b99 8116msgstr "本地已过时"
8ada9598
JX
8117
8118#: builtin/remote.c:1071
8119#, c-format
8120msgid " %-*s forces to %-*s (%s)"
81809b99 8121msgstr " %-*s 强制推送至 %-*s (%s)"
8ada9598
JX
8122
8123#: builtin/remote.c:1074
8124#, c-format
8125msgid " %-*s pushes to %-*s (%s)"
81809b99 8126msgstr " %-*s 推送至 %-*s (%s)"
8ada9598
JX
8127
8128#: builtin/remote.c:1078
8129#, c-format
8130msgid " %-*s forces to %s"
81809b99 8131msgstr " %-*s 强制推送至 %s"
8ada9598
JX
8132
8133#: builtin/remote.c:1081
8134#, c-format
8135msgid " %-*s pushes to %s"
81809b99 8136msgstr " %-*s 推送至 %s"
8ada9598 8137
ef317cd5 8138#: builtin/remote.c:1091
ef317cd5 8139msgid "do not query remotes"
07432cef 8140msgstr "不查询远程"
ef317cd5 8141
8ada9598 8142#: builtin/remote.c:1118
81809b99 8143#, c-format
8ada9598 8144msgid "* remote %s"
81809b99 8145msgstr "* 远程 %s"
8ada9598
JX
8146
8147#: builtin/remote.c:1119
8148#, c-format
8149msgid " Fetch URL: %s"
81809b99 8150msgstr " 获取地址:%s"
8ada9598
JX
8151
8152#: builtin/remote.c:1120 builtin/remote.c:1285
8153msgid "(no URL)"
81809b99 8154msgstr "(无 URL)"
8ada9598
JX
8155
8156#: builtin/remote.c:1129 builtin/remote.c:1131
8157#, c-format
8158msgid " Push URL: %s"
81809b99 8159msgstr " 推送地址:%s"
8ada9598
JX
8160
8161#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
81809b99 8162#, c-format
8ada9598 8163msgid " HEAD branch: %s"
81809b99 8164msgstr " HEAD分支:%s"
8ada9598
JX
8165
8166#: builtin/remote.c:1139
8167#, c-format
8168msgid ""
8169" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
5ae481e0 8170msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
8ada9598
JX
8171
8172#: builtin/remote.c:1151
81809b99 8173#, c-format
8ada9598
JX
8174msgid " Remote branch:%s"
8175msgid_plural " Remote branches:%s"
81809b99 8176msgstr[0] " 远程分支:%s"
5ae481e0 8177msgstr[1] " 远程分支:%s"
8ada9598 8178
81809b99 8179# 译者:中文字符串拼接,可删除前导空格
8ada9598
JX
8180#: builtin/remote.c:1154 builtin/remote.c:1181
8181msgid " (status not queried)"
81809b99 8182msgstr "(状态未查询)"
8ada9598
JX
8183
8184#: builtin/remote.c:1163
8185msgid " Local branch configured for 'git pull':"
8186msgid_plural " Local branches configured for 'git pull':"
81809b99 8187msgstr[0] " 为 'git pull' 配置的本地分支:"
5ae481e0 8188msgstr[1] " 为 'git pull' 配置的本地分支:"
8ada9598
JX
8189
8190#: builtin/remote.c:1171
8191msgid " Local refs will be mirrored by 'git push'"
81809b99 8192msgstr " 本地引用将在 'git push' 时被镜像"
8ada9598
JX
8193
8194#: builtin/remote.c:1178
81809b99 8195#, c-format
8ada9598
JX
8196msgid " Local ref configured for 'git push'%s:"
8197msgid_plural " Local refs configured for 'git push'%s:"
81809b99 8198msgstr[0] " 为 'git push' 配置的本地引用%s:"
5ae481e0 8199msgstr[1] " 为 'git push' 配置的本地引用%s:"
8ada9598 8200
ef317cd5
JX
8201#: builtin/remote.c:1199
8202msgid "set refs/remotes/<name>/HEAD according to remote"
07432cef 8203msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
ef317cd5
JX
8204
8205#: builtin/remote.c:1201
8206msgid "delete refs/remotes/<name>/HEAD"
07432cef 8207msgstr "删除 refs/remotes/<名称>/HEAD"
ef317cd5 8208
8ada9598 8209#: builtin/remote.c:1216
8ada9598 8210msgid "Cannot determine remote HEAD"
81809b99 8211msgstr "无法确定远程 HEAD"
8ada9598
JX
8212
8213#: builtin/remote.c:1218
8214msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
81809b99 8215msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
8ada9598
JX
8216
8217#: builtin/remote.c:1228
81809b99 8218#, c-format
8ada9598 8219msgid "Could not delete %s"
81809b99 8220msgstr "无法删除 %s"
8ada9598
JX
8221
8222#: builtin/remote.c:1236
81809b99 8223#, c-format
8ada9598 8224msgid "Not a valid ref: %s"
81809b99 8225msgstr "不是一个有效引用:%s"
8ada9598
JX
8226
8227#: builtin/remote.c:1238
81809b99 8228#, c-format
8ada9598 8229msgid "Could not setup %s"
81809b99 8230msgstr "不能设置 %s"
8ada9598
JX
8231
8232# 译者:注意保持前导空格
8233#: builtin/remote.c:1274
81809b99 8234#, c-format
8ada9598 8235msgid " %s will become dangling!"
07432cef 8236msgstr " %s 将成为摇摆状态!"
8ada9598
JX
8237
8238# 译者:注意保持前导空格
8239#: builtin/remote.c:1275
81809b99 8240#, c-format
8ada9598 8241msgid " %s has become dangling!"
07432cef 8242msgstr " %s 已成为摇摆状态!"
8ada9598
JX
8243
8244#: builtin/remote.c:1281
81809b99 8245#, c-format
8ada9598 8246msgid "Pruning %s"
81809b99 8247msgstr "修剪 %s"
8ada9598
JX
8248
8249#: builtin/remote.c:1282
8250#, c-format
8251msgid "URL: %s"
81809b99 8252msgstr "URL:%s"
8ada9598
JX
8253
8254#: builtin/remote.c:1295
8255#, c-format
8256msgid " * [would prune] %s"
81809b99 8257msgstr " * [将删除] %s"
8ada9598
JX
8258
8259#: builtin/remote.c:1298
8260#, c-format
8261msgid " * [pruned] %s"
81809b99 8262msgstr " * [已删除] %s"
8ada9598 8263
ef317cd5
JX
8264#: builtin/remote.c:1321
8265msgid "prune remotes after fetching"
07432cef 8266msgstr "抓取后清除远程"
ef317cd5 8267
8ada9598 8268#: builtin/remote.c:1387 builtin/remote.c:1461
81809b99 8269#, c-format
8ada9598 8270msgid "No such remote '%s'"
81809b99 8271msgstr "没有此远程 '%s'"
8ada9598 8272
ef317cd5 8273#: builtin/remote.c:1407
ef317cd5 8274msgid "add branch"
07432cef 8275msgstr "添加分支"
ef317cd5 8276
8ada9598 8277#: builtin/remote.c:1414
8ada9598 8278msgid "no remote specified"
81809b99 8279msgstr "未指定远程"
8ada9598 8280
ef317cd5
JX
8281#: builtin/remote.c:1436
8282msgid "manipulate push URLs"
07432cef 8283msgstr "操作推送 URLS"
ef317cd5
JX
8284
8285#: builtin/remote.c:1438
8286msgid "add URL"
07432cef 8287msgstr "添加 URL"
ef317cd5
JX
8288
8289#: builtin/remote.c:1440
ef317cd5 8290msgid "delete URLs"
07432cef 8291msgstr "删除 URLS"
ef317cd5 8292
8ada9598 8293#: builtin/remote.c:1447
8ada9598 8294msgid "--add --delete doesn't make sense"
81809b99 8295msgstr "--add --delete 无意义"
8ada9598
JX
8296
8297#: builtin/remote.c:1487
81809b99 8298#, c-format
8ada9598 8299msgid "Invalid old URL pattern: %s"
81809b99 8300msgstr "无效的旧URL匹配模版:%s"
8ada9598
JX
8301
8302#: builtin/remote.c:1495
81809b99 8303#, c-format
8ada9598 8304msgid "No such URL found: %s"
81809b99 8305msgstr "未找到此URL:%s"
8ada9598
JX
8306
8307#: builtin/remote.c:1497
8308msgid "Will not delete all non-push URLs"
81809b99 8309msgstr "将不会删除所有非推送URL地址"
8ada9598 8310
ef317cd5
JX
8311#: builtin/remote.c:1569
8312msgid "be verbose; must be placed before a subcommand"
07432cef 8313msgstr "冗长输出;必须置于子命令之前"
ef317cd5
JX
8314
8315#: builtin/replace.c:17
8316msgid "git replace [-f] <object> <replacement>"
07432cef 8317msgstr "git replace [-f] <对象> <替换物>"
ef317cd5
JX
8318
8319#: builtin/replace.c:18
8320msgid "git replace -d <object>..."
07432cef 8321msgstr "git replace -d <对象>..."
ef317cd5
JX
8322
8323#: builtin/replace.c:19
8324msgid "git replace -l [<pattern>]"
07432cef 8325msgstr "git replace -l [<模式>]"
ef317cd5 8326
07432cef 8327#: builtin/replace.c:121
ef317cd5 8328msgid "list replace refs"
07432cef 8329msgstr "列出替换的引用"
ef317cd5 8330
07432cef 8331#: builtin/replace.c:122
ef317cd5 8332msgid "delete replace refs"
07432cef 8333msgstr "删除替换的引用"
ef317cd5 8334
07432cef 8335#: builtin/replace.c:123
ef317cd5 8336msgid "replace the ref if it exists"
07432cef 8337msgstr "如果存在则替换引用"
ef317cd5
JX
8338
8339#: builtin/rerere.c:11
8340msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
07432cef 8341msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
ef317cd5
JX
8342
8343#: builtin/rerere.c:56
ef317cd5 8344msgid "register clean resolutions in index"
07432cef 8345msgstr "在索引中注册干净的解决方案"
ef317cd5
JX
8346
8347#: builtin/reset.c:25
8348msgid ""
8349"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
07432cef 8350msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
ef317cd5
JX
8351
8352#: builtin/reset.c:26
07432cef
WS
8353msgid "git reset [-q] <tree-ish> [--] <paths>..."
8354msgstr "git reset [-q] <树或提交> [--] <路径>..."
ef317cd5
JX
8355
8356#: builtin/reset.c:27
07432cef
WS
8357msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
8358msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
ef317cd5 8359
c04f5ac3
JX
8360#: builtin/reset.c:33
8361msgid "mixed"
8362msgstr "混杂"
8363
8364#: builtin/reset.c:33
8365msgid "soft"
8366msgstr "软性"
8367
8368#: builtin/reset.c:33
8369msgid "hard"
8370msgstr "硬性"
8371
8ada9598
JX
8372#: builtin/reset.c:33
8373msgid "merge"
8374msgstr "合并"
8375
c04f5ac3
JX
8376#: builtin/reset.c:33
8377msgid "keep"
8378msgstr "保持"
8379
07432cef 8380#: builtin/reset.c:73
c04f5ac3
JX
8381msgid "You do not have a valid HEAD."
8382msgstr "您没有一个有效的 HEAD。"
8383
07432cef 8384#: builtin/reset.c:75
c04f5ac3
JX
8385msgid "Failed to find tree of HEAD."
8386msgstr "无法找到 HEAD 指向的树。"
8387
07432cef 8388#: builtin/reset.c:81
c04f5ac3
JX
8389#, c-format
8390msgid "Failed to find tree of %s."
8391msgstr "无法找到 %s 指向的树。"
8392
2e8451e8 8393#: builtin/reset.c:99
c04f5ac3
JX
8394#, c-format
8395msgid "HEAD is now at %s"
8396msgstr "HEAD 现在位于 %s"
8397
90e6ef53 8398# 译者:汉字之间无空格,故删除%s前后空格
2e8451e8 8399#: builtin/reset.c:172
c04f5ac3
JX
8400#, c-format
8401msgid "Cannot do a %s reset in the middle of a merge."
8402msgstr "在合并过程中不能做%s重置操作。"
8403
2e8451e8 8404#: builtin/reset.c:251
ef317cd5 8405msgid "be quiet, only report errors"
07432cef 8406msgstr "安静模式,只报告错误"
ef317cd5 8407
2e8451e8 8408#: builtin/reset.c:253
ef317cd5 8409msgid "reset HEAD and index"
07432cef 8410msgstr "重置 HEAD 和索引"
ef317cd5 8411
2e8451e8 8412#: builtin/reset.c:254
ef317cd5 8413msgid "reset only HEAD"
07432cef 8414msgstr "只重置 HEAD"
ef317cd5 8415
2e8451e8 8416#: builtin/reset.c:256 builtin/reset.c:258
ef317cd5 8417msgid "reset HEAD, index and working tree"
07432cef 8418msgstr "重置 HEAD、索引和工作区"
ef317cd5 8419
2e8451e8 8420#: builtin/reset.c:260
ef317cd5 8421msgid "reset HEAD but keep local changes"
07432cef 8422msgstr "重置 HEAD 但保存本地变更"
ef317cd5 8423
2e8451e8 8424#: builtin/reset.c:278
07432cef
WS
8425#, c-format
8426msgid "Failed to resolve '%s' as a valid revision."
8427msgstr "无法将 '%s' 解析为一个有效的版本。"
8428
2e8451e8 8429#: builtin/reset.c:281 builtin/reset.c:289
c04f5ac3
JX
8430#, c-format
8431msgid "Could not parse object '%s'."
8432msgstr "不能解析对象 '%s'。"
8433
2e8451e8 8434#: builtin/reset.c:286
07432cef
WS
8435#, c-format
8436msgid "Failed to resolve '%s' as a valid tree."
8437msgstr "无法将 '%s' 解析为一个有效的树对象。"
8438
2e8451e8 8439#: builtin/reset.c:295
c04f5ac3 8440msgid "--patch is incompatible with --{hard,mixed,soft}"
07432cef 8441msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
c04f5ac3 8442
2e8451e8 8443#: builtin/reset.c:304
c04f5ac3 8444msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
23ff3338 8445msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
c04f5ac3 8446
90e6ef53 8447# 译者:汉字之间无空格,故删除%s前后空格
2e8451e8 8448#: builtin/reset.c:306
c04f5ac3
JX
8449#, c-format
8450msgid "Cannot do %s reset with paths."
8451msgstr "不能带路径进行%s重置。"
8452
90e6ef53 8453# 译者:汉字之间无空格,故删除%s前后空格
2e8451e8 8454#: builtin/reset.c:316
c04f5ac3
JX
8455#, c-format
8456msgid "%s reset is not allowed in a bare repository"
8457msgstr "不能对裸版本库进行%s重置"
8458
2e8451e8 8459#: builtin/reset.c:336
ef317cd5
JX
8460#, c-format
8461msgid "Could not reset index file to revision '%s'."
8462msgstr "不能重置索引文件至版本 '%s'。"
8463
2e8451e8 8464#: builtin/reset.c:342
07432cef
WS
8465msgid "Unstaged changes after reset:"
8466msgstr "重置后撤出暂存区的变更:"
8467
2e8451e8 8468#: builtin/reset.c:347
07432cef
WS
8469msgid "Could not write new index file."
8470msgstr "不能写入新的索引文件。"
8471
2e8451e8 8472#: builtin/rev-parse.c:345
ef317cd5 8473msgid "git rev-parse --parseopt [options] -- [<args>...]"
07432cef 8474msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
ef317cd5 8475
2e8451e8 8476#: builtin/rev-parse.c:350
ef317cd5 8477msgid "keep the `--` passed as an arg"
07432cef 8478msgstr "保持 `--` 作为一个参数传递"
ef317cd5 8479
2e8451e8 8480#: builtin/rev-parse.c:352
ef317cd5 8481msgid "stop parsing after the first non-option argument"
07432cef 8482msgstr "遇到第一个非选项参数后停止解析"
ef317cd5 8483
2e8451e8 8484#: builtin/rev-parse.c:470
ef317cd5
JX
8485msgid ""
8486"git rev-parse --parseopt [options] -- [<args>...]\n"
8487" or: git rev-parse --sq-quote [<arg>...]\n"
8488" or: git rev-parse [options] [<arg>...]\n"
8489"\n"
8490"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
8491msgstr ""
07432cef
WS
8492"git rev-parse --parseopt [选项] -- [<参数>...]\n"
8493" 或者:git rev-parse --sq-quote [<选项>...]\n"
8494" 或者:git rev-parse [options] [<选项>...]\n"
8495"\n"
8496"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
ef317cd5
JX
8497
8498#: builtin/revert.c:22
4dcdc3d8
JX
8499msgid "git revert [options] <commit-ish>..."
8500msgstr "git revert [选项] <提交号>..."
ef317cd5
JX
8501
8502#: builtin/revert.c:23
8503msgid "git revert <subcommand>"
07432cef 8504msgstr "git revert <子命令>"
ef317cd5
JX
8505
8506#: builtin/revert.c:28
4dcdc3d8
JX
8507msgid "git cherry-pick [options] <commit-ish>..."
8508msgstr "git cherry-pick [选项] <提交号>..."
ef317cd5
JX
8509
8510#: builtin/revert.c:29
ef317cd5 8511msgid "git cherry-pick <subcommand>"
07432cef 8512msgstr "git cherry-pick <子命令>"
ef317cd5 8513
2e8451e8 8514#: builtin/revert.c:71 builtin/revert.c:94
ef317cd5
JX
8515#, c-format
8516msgid "%s: %s cannot be used with %s"
8517msgstr "%s:%s 不能和 %s 同时使用"
8518
2e8451e8 8519#: builtin/revert.c:105
ef317cd5 8520msgid "end revert or cherry-pick sequence"
07432cef 8521msgstr "终止反转或拣选操作"
ef317cd5 8522
2e8451e8 8523#: builtin/revert.c:106
ef317cd5 8524msgid "resume revert or cherry-pick sequence"
07432cef 8525msgstr "继续反转或拣选操作"
ef317cd5 8526
2e8451e8 8527#: builtin/revert.c:107
ef317cd5 8528msgid "cancel revert or cherry-pick sequence"
07432cef 8529msgstr "取消反转或拣选操作"
ef317cd5 8530
2e8451e8 8531#: builtin/revert.c:108
ef317cd5 8532msgid "don't automatically commit"
07432cef 8533msgstr "不要自动提交"
ef317cd5 8534
2e8451e8 8535#: builtin/revert.c:109
ef317cd5 8536msgid "edit the commit message"
07432cef 8537msgstr "编辑提交说明"
ef317cd5 8538
2e8451e8 8539#: builtin/revert.c:112
ef317cd5 8540msgid "parent number"
07432cef 8541msgstr "父编号"
ef317cd5 8542
2e8451e8 8543#: builtin/revert.c:114
ef317cd5 8544msgid "merge strategy"
07432cef 8545msgstr "合并策略"
ef317cd5 8546
2e8451e8 8547#: builtin/revert.c:115
ef317cd5 8548msgid "option"
07432cef 8549msgstr "选项"
ef317cd5 8550
2e8451e8 8551#: builtin/revert.c:116
ef317cd5 8552msgid "option for merge strategy"
07432cef 8553msgstr "合并策略的选项"
ef317cd5 8554
2e8451e8 8555#: builtin/revert.c:127
ef317cd5 8556msgid "append commit name"
07432cef 8557msgstr "追加提交名称"
ef317cd5 8558
2e8451e8 8559#: builtin/revert.c:128
ef317cd5 8560msgid "allow fast-forward"
07432cef 8561msgstr "允许快进式"
c04f5ac3 8562
2e8451e8 8563#: builtin/revert.c:129
ef317cd5 8564msgid "preserve initially empty commits"
07432cef 8565msgstr "保留初始化的空提交"
ef317cd5 8566
2e8451e8 8567#: builtin/revert.c:130
ef317cd5 8568msgid "allow commits with empty messages"
07432cef 8569msgstr "允许提交说明为空"
c04f5ac3 8570
2e8451e8 8571#: builtin/revert.c:131
ef317cd5 8572msgid "keep redundant, empty commits"
07432cef 8573msgstr "保持多余的、空的提交"
ef317cd5 8574
2e8451e8 8575#: builtin/revert.c:135
c04f5ac3
JX
8576msgid "program error"
8577msgstr "程序错误"
8578
2e8451e8 8579#: builtin/revert.c:225
c04f5ac3
JX
8580msgid "revert failed"
8581msgstr "还原失败"
8582
2e8451e8 8583#: builtin/revert.c:240
c04f5ac3
JX
8584msgid "cherry-pick failed"
8585msgstr "拣选失败"
8586
2e8451e8 8587#: builtin/rm.c:16
ef317cd5 8588msgid "git rm [options] [--] <file>..."
07432cef
WS
8589msgstr "git rm [选项] [--] <文件>..."
8590
2e8451e8
JX
8591#: builtin/rm.c:64
8592msgid ""
8593"the following submodule (or one of its nested submodules)\n"
8594"uses a .git directory:"
8595msgid_plural ""
8596"the following submodules (or one of its nested submodules)\n"
8597"use a .git directory:"
8598msgstr[0] "如下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
8599msgstr[1] "如下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
8600
8601#: builtin/rm.c:70
07432cef 8602msgid ""
2e8451e8 8603"\n"
07432cef
WS
8604"(use 'rm -rf' if you really want to remove it including all of its history)"
8605msgstr ""
2e8451e8 8606"\n"
07432cef 8607"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
ef317cd5 8608
2e8451e8 8609#: builtin/rm.c:230
c04f5ac3 8610msgid ""
2e8451e8
JX
8611"the following file has staged content different from both the\n"
8612"file and the HEAD:"
8613msgid_plural ""
8614"the following files have staged content different from both the\n"
8615"file and the HEAD:"
8616msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
8617msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
8618
8619#: builtin/rm.c:235
8620msgid ""
8621"\n"
c04f5ac3
JX
8622"(use -f to force removal)"
8623msgstr ""
2e8451e8 8624"\n"
c04f5ac3
JX
8625"(使用 -f 强制删除)"
8626
2e8451e8
JX
8627#: builtin/rm.c:239
8628msgid "the following file has changes staged in the index:"
8629msgid_plural "the following files have changes staged in the index:"
8630msgstr[0] "如下文件相对索引区的内容有修改"
8631msgstr[1] "如下文件相对索引区的内容有修改"
c04f5ac3 8632
2e8451e8 8633#: builtin/rm.c:243 builtin/rm.c:254
c04f5ac3 8634msgid ""
2e8451e8 8635"\n"
c04f5ac3
JX
8636"(use --cached to keep the file, or -f to force removal)"
8637msgstr ""
2e8451e8
JX
8638"\n"
8639"(使用 --cached 保留本地文件,或用 -f 强制删除)"
8640
8641#: builtin/rm.c:251
8642msgid "the following file has local modifications:"
8643msgid_plural "the following files have local modifications:"
8644msgstr[0] "如下文件有本地修改:"
8645msgstr[1] "如下文件有本地修改:"
c04f5ac3 8646
2e8451e8 8647#: builtin/rm.c:269
ef317cd5 8648msgid "do not list removed files"
07432cef 8649msgstr "不列出删除的文件"
ef317cd5 8650
2e8451e8 8651#: builtin/rm.c:270
ef317cd5 8652msgid "only remove from the index"
07432cef 8653msgstr "只从索引区删除"
ef317cd5 8654
2e8451e8 8655#: builtin/rm.c:271
ef317cd5 8656msgid "override the up-to-date check"
07432cef 8657msgstr "忽略文件更新状态检查"
ef317cd5 8658
2e8451e8 8659#: builtin/rm.c:272
ef317cd5 8660msgid "allow recursive removal"
07432cef 8661msgstr "允许递归删除"
ef317cd5 8662
2e8451e8 8663#: builtin/rm.c:274
ef317cd5 8664msgid "exit with a zero status even if nothing matched"
07432cef 8665msgstr "即使没有匹配,也以零状态退出"
ef317cd5 8666
2e8451e8 8667#: builtin/rm.c:345
c04f5ac3
JX
8668#, c-format
8669msgid "not removing '%s' recursively without -r"
8670msgstr "未提供 -r 选项不会递归删除 '%s'"
8671
2e8451e8 8672#: builtin/rm.c:384
c04f5ac3
JX
8673#, c-format
8674msgid "git rm: unable to remove %s"
8675msgstr "git rm:不能删除 %s"
8676
ef317cd5 8677#: builtin/shortlog.c:13
4dcdc3d8
JX
8678msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
8679msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
ef317cd5 8680
4dcdc3d8 8681#: builtin/shortlog.c:131
c04f5ac3
JX
8682#, c-format
8683msgid "Missing author: %s"
8684msgstr "缺少作者:%s"
8685
2e8451e8 8686#: builtin/shortlog.c:228
ef317cd5 8687msgid "sort output according to the number of commits per author"
07432cef 8688msgstr "根据每个作者的提交数量排序"
ef317cd5 8689
2e8451e8 8690#: builtin/shortlog.c:230
ef317cd5 8691msgid "Suppress commit descriptions, only provides commit count"
07432cef 8692msgstr "隐藏提交说明,只提供提交数量"
ef317cd5 8693
2e8451e8 8694#: builtin/shortlog.c:232
ef317cd5 8695msgid "Show the email address of each author"
07432cef 8696msgstr "显示每个作者的电子邮件地址"
ef317cd5 8697
2e8451e8 8698#: builtin/shortlog.c:233
ef317cd5 8699msgid "w[,i1[,i2]]"
07432cef 8700msgstr "w[,i1[,i2]]"
ef317cd5 8701
2e8451e8 8702#: builtin/shortlog.c:234
ef317cd5 8703msgid "Linewrap output"
07432cef 8704msgstr "折行输出"
ef317cd5
JX
8705
8706#: builtin/show-branch.c:9
8707msgid ""
8708"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8709"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8710"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8711"<glob>)...]"
8712msgstr ""
07432cef
WS
8713"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8714"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8715"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8716"<glob>)...]"
ef317cd5
JX
8717
8718#: builtin/show-branch.c:10
8719msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
07432cef 8720msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
ef317cd5 8721
4dcdc3d8 8722#: builtin/show-branch.c:650
ef317cd5 8723msgid "show remote-tracking and local branches"
07432cef 8724msgstr "显示远程跟踪的和本地的分支"
ef317cd5 8725
4dcdc3d8 8726#: builtin/show-branch.c:652
ef317cd5 8727msgid "show remote-tracking branches"
07432cef 8728msgstr "显示远程跟踪的分支"
ef317cd5 8729
4dcdc3d8 8730#: builtin/show-branch.c:654
ef317cd5 8731msgid "color '*!+-' corresponding to the branch"
07432cef 8732msgstr "着色 '*!+-' 到相应的分支"
ef317cd5 8733
4dcdc3d8 8734#: builtin/show-branch.c:656
ef317cd5 8735msgid "show <n> more commits after the common ancestor"
07432cef 8736msgstr "显示共同祖先后的 <n> 个提交"
ef317cd5 8737
4dcdc3d8 8738#: builtin/show-branch.c:658
ef317cd5 8739msgid "synonym to more=-1"
07432cef 8740msgstr "和 more=-1 同义"
ef317cd5 8741
4dcdc3d8 8742#: builtin/show-branch.c:659
ef317cd5 8743msgid "suppress naming strings"
07432cef 8744msgstr "不显示字符串命名"
ef317cd5 8745
4dcdc3d8 8746#: builtin/show-branch.c:661
ef317cd5 8747msgid "include the current branch"
07432cef 8748msgstr "包括当前分支"
ef317cd5 8749
4dcdc3d8 8750#: builtin/show-branch.c:663
ef317cd5 8751msgid "name commits with their object names"
07432cef 8752msgstr "以对象名字命名提交"
ef317cd5 8753
4dcdc3d8 8754#: builtin/show-branch.c:665
ef317cd5 8755msgid "show possible merge bases"
07432cef 8756msgstr "显示可能合并的基线"
ef317cd5 8757
4dcdc3d8 8758#: builtin/show-branch.c:667
ef317cd5 8759msgid "show refs unreachable from any other ref"
07432cef 8760msgstr "显示没有任何引用的的引用"
ef317cd5 8761
4dcdc3d8 8762#: builtin/show-branch.c:669
ef317cd5 8763msgid "show commits in topological order"
07432cef 8764msgstr "以拓扑顺序显示提交"
ef317cd5 8765
2e8451e8 8766#: builtin/show-branch.c:672
ef317cd5 8767msgid "show only commits not on the first branch"
07432cef 8768msgstr "只显示不在第一个分支上的提交"
ef317cd5 8769
2e8451e8 8770#: builtin/show-branch.c:674
ef317cd5 8771msgid "show merges reachable from only one tip"
07432cef 8772msgstr "显示仅一个分支可访问的合并提交"
ef317cd5 8773
2e8451e8
JX
8774#: builtin/show-branch.c:676
8775msgid "topologically sort, maintaining date order where possible"
8776msgstr "拓扑方式排序,并尽可能地保持日期顺序"
ef317cd5 8777
2e8451e8 8778#: builtin/show-branch.c:679
ef317cd5 8779msgid "<n>[,<base>]"
07432cef 8780msgstr "<n>[,<base>]"
ef317cd5 8781
2e8451e8 8782#: builtin/show-branch.c:680
ef317cd5 8783msgid "show <n> most recent ref-log entries starting at base"
07432cef 8784msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
ef317cd5
JX
8785
8786#: builtin/show-ref.c:10
8787msgid ""
a77c07d9
JX
8788"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8789"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
ef317cd5 8790msgstr ""
a77c07d9
JX
8791"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8792"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
ef317cd5
JX
8793
8794#: builtin/show-ref.c:11
8795msgid "git show-ref --exclude-existing[=pattern] < ref-list"
07432cef 8796msgstr "git show-ref --exclude-existing[=模式] < 引用列表"
ef317cd5 8797
2e8451e8 8798#: builtin/show-ref.c:168
ef317cd5 8799msgid "only show tags (can be combined with heads)"
07432cef 8800msgstr "只显示 tags(可以和头共用)"
ef317cd5 8801
2e8451e8 8802#: builtin/show-ref.c:169
ef317cd5 8803msgid "only show heads (can be combined with tags)"
07432cef 8804msgstr "只显示头(可以和 tags 共用)"
ef317cd5 8805
2e8451e8 8806#: builtin/show-ref.c:170
ef317cd5 8807msgid "stricter reference checking, requires exact ref path"
07432cef 8808msgstr "更严格的引用检测,需要精确的引用路径"
ef317cd5 8809
2e8451e8
JX
8810#: builtin/show-ref.c:173 builtin/show-ref.c:176
8811msgid "show the HEAD reference, even if it would be filtered out"
8812msgstr "显示 HEAD 引用,即使被过滤掉"
ef317cd5 8813
2e8451e8 8814#: builtin/show-ref.c:178
ef317cd5 8815msgid "dereference tags into object IDs"
07432cef 8816msgstr "转换 tags 到对象ID"
ef317cd5 8817
2e8451e8 8818#: builtin/show-ref.c:180
ef317cd5 8819msgid "only show SHA1 hash using <n> digits"
07432cef 8820msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
ef317cd5 8821
2e8451e8 8822#: builtin/show-ref.c:184
ef317cd5 8823msgid "do not print results to stdout (useful with --verify)"
07432cef 8824msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
ef317cd5 8825
2e8451e8 8826#: builtin/show-ref.c:186
ef317cd5 8827msgid "show refs from stdin that aren't in local repository"
07432cef 8828msgstr "显示从标准输入中读入的不在本地版本库中的引用"
ef317cd5
JX
8829
8830#: builtin/symbolic-ref.c:7
8831msgid "git symbolic-ref [options] name [ref]"
07432cef
WS
8832msgstr "git symbolic-ref [选项] 名称 [引用]"
8833
8834#: builtin/symbolic-ref.c:8
8835msgid "git symbolic-ref -d [-q] name"
8836msgstr "git symbolic-ref -d [-q] 名称"
ef317cd5 8837
07432cef 8838#: builtin/symbolic-ref.c:40
ef317cd5 8839msgid "suppress error message for non-symbolic (detached) refs"
07432cef
WS
8840msgstr "不显示非符号(分离的)引用的错误信息"
8841
8842#: builtin/symbolic-ref.c:41
8843msgid "delete symbolic ref"
8844msgstr "删除符号引用"
ef317cd5 8845
07432cef 8846#: builtin/symbolic-ref.c:42
ef317cd5 8847msgid "shorten ref output"
07432cef 8848msgstr "简短的引用输出"
ef317cd5 8849
07432cef 8850#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
ef317cd5 8851msgid "reason"
07432cef 8852msgstr "原因"
ef317cd5 8853
07432cef 8854#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
ef317cd5 8855msgid "reason of the update"
07432cef 8856msgstr "更新的原因"
ef317cd5
JX
8857
8858#: builtin/tag.c:22
8859msgid ""
8860"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
a77c07d9 8861msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
ef317cd5
JX
8862
8863#: builtin/tag.c:23
8864msgid "git tag -d <tagname>..."
07432cef 8865msgstr "git tag -d <标签名>..."
ef317cd5
JX
8866
8867#: builtin/tag.c:24
8868msgid ""
8869"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
8870"\t\t[<pattern>...]"
8871msgstr ""
07432cef
WS
8872"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n"
8873"\t\t[<模式>...]"
ef317cd5
JX
8874
8875#: builtin/tag.c:26
8876msgid "git tag -v <tagname>..."
07432cef 8877msgstr "git tag -v <标签名>..."
ef317cd5 8878
8ada9598 8879#: builtin/tag.c:60
7ac1c0ad
JX
8880#, c-format
8881msgid "malformed object at '%s'"
8882msgstr "非法的对象于 '%s'"
8883
8ada9598 8884#: builtin/tag.c:207
c04f5ac3
JX
8885#, c-format
8886msgid "tag name too long: %.*s..."
8887msgstr "tag 名字太长:%.*s..."
8888
8ada9598 8889#: builtin/tag.c:212
c04f5ac3
JX
8890#, c-format
8891msgid "tag '%s' not found."
8892msgstr "tag '%s' 未发现。"
8893
8ada9598 8894#: builtin/tag.c:227
c04f5ac3
JX
8895#, c-format
8896msgid "Deleted tag '%s' (was %s)\n"
8897msgstr "已删除 tag '%s'(曾为 %s)\n"
8898
8ada9598 8899#: builtin/tag.c:239
c04f5ac3
JX
8900#, c-format
8901msgid "could not verify the tag '%s'"
8902msgstr "不能校验 tag '%s'"
8903
8ada9598 8904#: builtin/tag.c:249
a77c07d9 8905#, c-format
c04f5ac3
JX
8906msgid ""
8907"\n"
a77c07d9
JX
8908"Write a tag message\n"
8909"Lines starting with '%c' will be ignored.\n"
c04f5ac3
JX
8910msgstr ""
8911"\n"
a77c07d9
JX
8912"输入一个 tag 说明\n"
8913"以 '%c' 开头的行将被忽略。\n"
c04f5ac3 8914
a77c07d9
JX
8915#: builtin/tag.c:253
8916#, c-format
c04f5ac3
JX
8917msgid ""
8918"\n"
a77c07d9
JX
8919"Write a tag message\n"
8920"Lines starting with '%c' will be kept; you may remove them yourself if you "
c04f5ac3 8921"want to.\n"
c04f5ac3
JX
8922msgstr ""
8923"\n"
a77c07d9
JX
8924"输入一个 tag 说明\n"
8925"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
c04f5ac3 8926
a77c07d9 8927#: builtin/tag.c:292
c04f5ac3
JX
8928msgid "unable to sign the tag"
8929msgstr "无法签署 tag"
8930
a77c07d9 8931#: builtin/tag.c:294
c04f5ac3
JX
8932msgid "unable to write tag file"
8933msgstr "无法写 tag 文件"
8934
a77c07d9 8935#: builtin/tag.c:319
c04f5ac3 8936msgid "bad object type."
90e6ef53 8937msgstr "坏的对象类型。"
c04f5ac3 8938
a77c07d9 8939#: builtin/tag.c:332
c04f5ac3 8940msgid "tag header too big."
90e6ef53 8941msgstr "tag 头信息太大。"
c04f5ac3 8942
a77c07d9 8943#: builtin/tag.c:368
c04f5ac3
JX
8944msgid "no tag message?"
8945msgstr "无 tag 说明?"
8946
a77c07d9 8947#: builtin/tag.c:374
c04f5ac3
JX
8948#, c-format
8949msgid "The tag message has been left in %s\n"
8950msgstr "tag 说明被保留在 %s\n"
8951
a77c07d9 8952#: builtin/tag.c:423
7ac1c0ad
JX
8953msgid "switch 'points-at' requires an object"
8954msgstr "开关 'points-at' 需要一个对象"
8955
a77c07d9 8956#: builtin/tag.c:425
7ac1c0ad
JX
8957#, c-format
8958msgid "malformed object name '%s'"
8959msgstr "非法的对象名 '%s'"
8960
a77c07d9 8961#: builtin/tag.c:445
ef317cd5 8962msgid "list tag names"
07432cef 8963msgstr "列出tag名称"
ef317cd5 8964
a77c07d9 8965#: builtin/tag.c:447
ef317cd5 8966msgid "print <n> lines of each tag message"
07432cef 8967msgstr "每个 tag 信息打印 <n> 行"
ef317cd5 8968
a77c07d9 8969#: builtin/tag.c:449
ef317cd5 8970msgid "delete tags"
07432cef 8971msgstr "删除 tags"
ef317cd5 8972
a77c07d9 8973#: builtin/tag.c:450
ef317cd5 8974msgid "verify tags"
07432cef 8975msgstr "验证 tags"
ef317cd5 8976
a77c07d9 8977#: builtin/tag.c:452
ef317cd5 8978msgid "Tag creation options"
07432cef 8979msgstr "Tag 创建选项"
ef317cd5 8980
a77c07d9 8981#: builtin/tag.c:454
ef317cd5 8982msgid "annotated tag, needs a message"
07432cef 8983msgstr "注解 tag,需要一个说明"
ef317cd5 8984
a77c07d9 8985#: builtin/tag.c:456
ef317cd5 8986msgid "tag message"
07432cef 8987msgstr "tag 说明"
ef317cd5 8988
a77c07d9 8989#: builtin/tag.c:458
ef317cd5 8990msgid "annotated and GPG-signed tag"
07432cef 8991msgstr "注解并 GPG 签名的 tag"
ef317cd5 8992
a77c07d9 8993#: builtin/tag.c:462
ef317cd5 8994msgid "use another key to sign the tag"
07432cef 8995msgstr "使用另外的私钥签名 tag"
ef317cd5 8996
a77c07d9 8997#: builtin/tag.c:463
ef317cd5 8998msgid "replace the tag if exists"
07432cef 8999msgstr "如果存在,替换现有的 tag"
ef317cd5 9000
a77c07d9 9001#: builtin/tag.c:464
ef317cd5 9002msgid "show tag list in columns"
07432cef 9003msgstr "以列的方式显示 tag"
ef317cd5 9004
a77c07d9 9005#: builtin/tag.c:466
ef317cd5 9006msgid "Tag listing options"
07432cef 9007msgstr "Tag 列表选项"
ef317cd5 9008
a77c07d9 9009#: builtin/tag.c:469
ef317cd5 9010msgid "print only tags that contain the commit"
07432cef 9011msgstr "只打印包含提交的tags"
ef317cd5 9012
a77c07d9 9013#: builtin/tag.c:475
ef317cd5 9014msgid "print only tags of the object"
07432cef 9015msgstr "只打印tags对象"
ef317cd5 9016
a77c07d9 9017#: builtin/tag.c:504
8ada9598 9018msgid "--column and -n are incompatible"
81809b99 9019msgstr "--column 和 -n 不兼容"
8ada9598 9020
a77c07d9 9021#: builtin/tag.c:521
c04f5ac3 9022msgid "-n option is only allowed with -l."
649900bc 9023msgstr "-n 选项只允许和 -l 同时使用。"
c04f5ac3 9024
a77c07d9 9025#: builtin/tag.c:523
c04f5ac3 9026msgid "--contains option is only allowed with -l."
649900bc 9027msgstr "--contains 选项只允许和 -l 同时使用。"
c04f5ac3 9028
a77c07d9 9029#: builtin/tag.c:525
7ac1c0ad 9030msgid "--points-at option is only allowed with -l."
649900bc 9031msgstr "--points-at 选项只允许和 -l 同时使用。"
7ac1c0ad 9032
a77c07d9 9033#: builtin/tag.c:533
c04f5ac3
JX
9034msgid "only one -F or -m option is allowed."
9035msgstr "只允许一个 -F 或 -m 选项。"
9036
a77c07d9 9037#: builtin/tag.c:553
c04f5ac3
JX
9038msgid "too many params"
9039msgstr "太多参数"
9040
a77c07d9 9041#: builtin/tag.c:559
c04f5ac3
JX
9042#, c-format
9043msgid "'%s' is not a valid tag name."
90e6ef53 9044msgstr "'%s' 不是一个有效的tag名称。"
c04f5ac3 9045
a77c07d9 9046#: builtin/tag.c:564
c04f5ac3
JX
9047#, c-format
9048msgid "tag '%s' already exists"
9049msgstr "tag '%s' 已存在"
9050
a77c07d9 9051#: builtin/tag.c:582
c04f5ac3
JX
9052#, c-format
9053msgid "%s: cannot lock the ref"
9054msgstr "%s:不能锁定引用"
9055
a77c07d9 9056#: builtin/tag.c:584
c04f5ac3
JX
9057#, c-format
9058msgid "%s: cannot update the ref"
9059msgstr "%s:不能更新引用"
9060
a77c07d9 9061#: builtin/tag.c:586
c04f5ac3
JX
9062#, c-format
9063msgid "Updated tag '%s' (was %s)\n"
9064msgstr "已更新tag '%s'(曾为 %s)\n"
9065
ef317cd5 9066#: builtin/update-index.c:401
ef317cd5 9067msgid "git update-index [options] [--] [<file>...]"
07432cef 9068msgstr "git update-index [选项] [--] [<文件>...]"
8ada9598 9069
07432cef 9070#: builtin/update-index.c:718
ef317cd5 9071msgid "continue refresh even when index needs update"
07432cef 9072msgstr "当索引需要更新时继续刷新"
8ada9598 9073
07432cef 9074#: builtin/update-index.c:721
ef317cd5 9075msgid "refresh: ignore submodules"
07432cef 9076msgstr "刷新:忽略子模组"
8ada9598 9077
07432cef 9078#: builtin/update-index.c:724
ef317cd5 9079msgid "do not ignore new files"
07432cef 9080msgstr "不忽略新的文件"
8ada9598 9081
07432cef 9082#: builtin/update-index.c:726
ef317cd5 9083msgid "let files replace directories and vice-versa"
07432cef 9084msgstr "让文件替换目录(反之亦然)"
ef317cd5 9085
07432cef 9086#: builtin/update-index.c:728
ef317cd5 9087msgid "notice files missing from worktree"
07432cef 9088msgstr "通知文件从工作区丢失"
ef317cd5 9089
07432cef 9090#: builtin/update-index.c:730
ef317cd5 9091msgid "refresh even if index contains unmerged entries"
07432cef 9092msgstr "即使索引区包含未合并的条目也执行刷新"
ef317cd5 9093
07432cef 9094#: builtin/update-index.c:733
ef317cd5 9095msgid "refresh stat information"
07432cef 9096msgstr "刷新统计信息"
ef317cd5 9097
07432cef 9098#: builtin/update-index.c:737
ef317cd5 9099msgid "like --refresh, but ignore assume-unchanged setting"
07432cef 9100msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
ef317cd5 9101
07432cef 9102#: builtin/update-index.c:741
ef317cd5 9103msgid "<mode> <object> <path>"
07432cef 9104msgstr "<mode> <object> <path>"
ef317cd5 9105
07432cef 9106#: builtin/update-index.c:742
ef317cd5 9107msgid "add the specified entry to the index"
07432cef 9108msgstr "添加指定的条目到索引区"
ef317cd5 9109
07432cef 9110#: builtin/update-index.c:746
ef317cd5 9111msgid "(+/-)x"
07432cef 9112msgstr "(+/-)x"
ef317cd5 9113
07432cef 9114#: builtin/update-index.c:747
ef317cd5 9115msgid "override the executable bit of the listed files"
07432cef 9116msgstr "覆盖列表里文件的可执行位"
ef317cd5 9117
07432cef 9118#: builtin/update-index.c:751
ef317cd5 9119msgid "mark files as \"not changing\""
07432cef 9120msgstr "把文件标记为 \"没有变更\""
ef317cd5 9121
07432cef 9122#: builtin/update-index.c:754
ef317cd5 9123msgid "clear assumed-unchanged bit"
07432cef 9124msgstr "清除 assumed-unchanged 位"
ef317cd5 9125
07432cef 9126#: builtin/update-index.c:757
ef317cd5 9127msgid "mark files as \"index-only\""
07432cef 9128msgstr "把文件标记为 \"仅索引\""
ef317cd5 9129
07432cef 9130#: builtin/update-index.c:760
ef317cd5 9131msgid "clear skip-worktree bit"
07432cef 9132msgstr "清除 skip-worktree 位"
ef317cd5 9133
07432cef 9134#: builtin/update-index.c:763
ef317cd5 9135msgid "add to index only; do not add content to object database"
07432cef 9136msgstr "只添加到索引区;不添加对象到对象库"
ef317cd5 9137
07432cef 9138#: builtin/update-index.c:765
ef317cd5 9139msgid "remove named paths even if present in worktree"
07432cef 9140msgstr "即使存在工作区里,也删除路径"
ef317cd5 9141
07432cef 9142#: builtin/update-index.c:767
ef317cd5 9143msgid "with --stdin: input lines are terminated by null bytes"
07432cef 9144msgstr "携带 --stdin:输入的行以 null 字符终止"
ef317cd5 9145
07432cef 9146#: builtin/update-index.c:769
ef317cd5 9147msgid "read list of paths to be updated from standard input"
07432cef 9148msgstr "从标准输入中读取需要更新的路径列表"
ef317cd5 9149
07432cef 9150#: builtin/update-index.c:773
ef317cd5 9151msgid "add entries from standard input to the index"
07432cef 9152msgstr "从标准输入添加条目到索引区"
ef317cd5 9153
07432cef 9154#: builtin/update-index.c:777
ef317cd5 9155msgid "repopulate stages #2 and #3 for the listed paths"
07432cef 9156msgstr "为指定文件重新生成第2和第3暂存区"
ef317cd5 9157
07432cef 9158#: builtin/update-index.c:781
ef317cd5 9159msgid "only update entries that differ from HEAD"
07432cef 9160msgstr "只更新与 HEAD 不同的条目"
ef317cd5 9161
07432cef 9162#: builtin/update-index.c:785
ef317cd5 9163msgid "ignore files missing from worktree"
07432cef 9164msgstr "忽略工作区丢失的文件"
ef317cd5 9165
07432cef 9166#: builtin/update-index.c:788
ef317cd5 9167msgid "report actions to standard output"
07432cef 9168msgstr "在标准输出显示操作"
ef317cd5 9169
07432cef 9170#: builtin/update-index.c:790
ef317cd5 9171msgid "(for porcelains) forget saved unresolved conflicts"
07432cef 9172msgstr "(for porcelains) 忘记保存的未解决的冲突"
ef317cd5 9173
07432cef 9174#: builtin/update-index.c:794
ef317cd5 9175msgid "write index in this format"
07432cef 9176msgstr "以这种格式写入索引区"
ef317cd5
JX
9177
9178#: builtin/update-ref.c:7
9179msgid "git update-ref [options] -d <refname> [<oldval>]"
07432cef 9180msgstr "git update-ref [options] -d <引用名> [<旧值>]"
ef317cd5
JX
9181
9182#: builtin/update-ref.c:8
9183msgid "git update-ref [options] <refname> <newval> [<oldval>]"
07432cef 9184msgstr "git update-ref [options] <引用名> <新值> [<旧值>]"
ef317cd5
JX
9185
9186#: builtin/update-ref.c:19
9187msgid "delete the reference"
07432cef 9188msgstr "删除引用"
ef317cd5
JX
9189
9190#: builtin/update-ref.c:21
9191msgid "update <refname> not the one it points to"
07432cef 9192msgstr "更新 <引用名> 本身而不是它指向的引用"
ef317cd5
JX
9193
9194#: builtin/update-server-info.c:6
9195msgid "git update-server-info [--force]"
07432cef 9196msgstr "git update-server-info [--force]"
ef317cd5
JX
9197
9198#: builtin/update-server-info.c:14
9199msgid "update the info files from scratch"
07432cef 9200msgstr "从头开始更新文件信息"
ef317cd5
JX
9201
9202#: builtin/verify-pack.c:56
9203msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
07432cef 9204msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
ef317cd5
JX
9205
9206#: builtin/verify-pack.c:66
ef317cd5
JX
9207msgid "verbose"
9208msgstr "冗长输出"
9209
9210#: builtin/verify-pack.c:68
9211msgid "show statistics only"
07432cef 9212msgstr "只显示统计"
ef317cd5
JX
9213
9214#: builtin/verify-tag.c:17
9215msgid "git verify-tag [-v|--verbose] <tag>..."
07432cef 9216msgstr "git verify-tag [-v|--verbose] <tag>..."
ef317cd5
JX
9217
9218#: builtin/verify-tag.c:73
9219msgid "print tag contents"
07432cef 9220msgstr "打印 tag 内容"
ef317cd5
JX
9221
9222#: builtin/write-tree.c:13
9223msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
07432cef 9224msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
ef317cd5
JX
9225
9226#: builtin/write-tree.c:26
9227msgid "<prefix>/"
07432cef 9228msgstr "<前缀>/"
ef317cd5
JX
9229
9230#: builtin/write-tree.c:27
9231msgid "write tree object for a subdirectory <prefix>"
07432cef 9232msgstr "将 <前缀> 子目录内容写到一个树对象"
ef317cd5
JX
9233
9234#: builtin/write-tree.c:30
9235msgid "only useful for debugging"
07432cef 9236msgstr "只对调试有用"
ef317cd5 9237
2e8451e8 9238#: git.c:17
4dcdc3d8
JX
9239msgid ""
9240"'git help -a' and 'git help -g' lists available subcommands and some\n"
9241"concept guides. See 'git help <command>' or 'git help <concept>'\n"
9242"to read about a specific subcommand or concept."
9243msgstr ""
9244"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n"
9245"'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。"
8ada9598 9246
2e8451e8
JX
9247#: parse-options.h:144
9248msgid "expiry date"
9249msgstr "逾期日期"
9250
9251#: parse-options.h:159
8ada9598 9252msgid "no-op (backward compatibility)"
81809b99 9253msgstr "空操作(向后兼容)"
8ada9598 9254
2e8451e8 9255#: parse-options.h:236
8ada9598 9256msgid "be more verbose"
81809b99 9257msgstr "更加详细"
8ada9598 9258
2e8451e8 9259#: parse-options.h:238
8ada9598 9260msgid "be more quiet"
81809b99 9261msgstr "更加安静"
8ada9598 9262
2e8451e8 9263#: parse-options.h:244
8ada9598 9264msgid "use <n> digits to display SHA-1s"
81809b99 9265msgstr "用 <n> 位数字显示 SHA-1 哈希值"
8ada9598
JX
9266
9267#: common-cmds.h:8
9268msgid "Add file contents to the index"
81809b99 9269msgstr "添加文件内容至索引"
8ada9598
JX
9270
9271#: common-cmds.h:9
9272msgid "Find by binary search the change that introduced a bug"
81809b99 9273msgstr "通过二分查找定位引入 bug 的变更"
8ada9598
JX
9274
9275#: common-cmds.h:10
8ada9598 9276msgid "List, create, or delete branches"
81809b99 9277msgstr "列出、创建或删除分支"
8ada9598
JX
9278
9279#: common-cmds.h:11
9280msgid "Checkout a branch or paths to the working tree"
81809b99 9281msgstr "检出一个分支或路径到工作区"
8ada9598
JX
9282
9283#: common-cmds.h:12
8ada9598 9284msgid "Clone a repository into a new directory"
81809b99 9285msgstr "克隆一个版本库到一个新目录"
8ada9598
JX
9286
9287#: common-cmds.h:13
8ada9598 9288msgid "Record changes to the repository"
81809b99 9289msgstr "记录变更到版本库"
8ada9598
JX
9290
9291#: common-cmds.h:14
9292msgid "Show changes between commits, commit and working tree, etc"
81809b99 9293msgstr "显示提交之间、提交和工作区之间等的差异"
8ada9598
JX
9294
9295#: common-cmds.h:15
9296msgid "Download objects and refs from another repository"
81809b99 9297msgstr "从另外一个版本库下载对象和引用"
8ada9598
JX
9298
9299#: common-cmds.h:16
9300msgid "Print lines matching a pattern"
81809b99 9301msgstr "输出和模式匹配的行"
8ada9598
JX
9302
9303#: common-cmds.h:17
a77c07d9
JX
9304msgid "Create an empty Git repository or reinitialize an existing one"
9305msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
8ada9598
JX
9306
9307#: common-cmds.h:18
8ada9598 9308msgid "Show commit logs"
81809b99 9309msgstr "显示提交日志"
8ada9598
JX
9310
9311#: common-cmds.h:19
9312msgid "Join two or more development histories together"
81809b99 9313msgstr "合并两个或更多开发历史"
8ada9598
JX
9314
9315#: common-cmds.h:20
9316msgid "Move or rename a file, a directory, or a symlink"
81809b99 9317msgstr "移动或重命名一个文件、目录或符号链接"
8ada9598
JX
9318
9319#: common-cmds.h:21
2e8451e8
JX
9320msgid "Fetch from and integrate with another repository or a local branch"
9321msgstr "获取并整合另外的版本库或一个本地分支"
8ada9598
JX
9322
9323#: common-cmds.h:22
9324msgid "Update remote refs along with associated objects"
81809b99 9325msgstr "更新远程引用和相关的对象"
8ada9598
JX
9326
9327#: common-cmds.h:23
9328msgid "Forward-port local commits to the updated upstream head"
81809b99 9329msgstr "本地提交转移至更新后的上游分支中"
8ada9598
JX
9330
9331#: common-cmds.h:24
9332msgid "Reset current HEAD to the specified state"
81809b99 9333msgstr "重置当前HEAD到指定状态"
8ada9598
JX
9334
9335#: common-cmds.h:25
9336msgid "Remove files from the working tree and from the index"
81809b99 9337msgstr "从工作区和索引中删除文件"
8ada9598
JX
9338
9339#: common-cmds.h:26
9340msgid "Show various types of objects"
81809b99 9341msgstr "显示各种类型的对象"
8ada9598
JX
9342
9343#: common-cmds.h:27
8ada9598 9344msgid "Show the working tree status"
81809b99 9345msgstr "显示工作区状态"
8ada9598
JX
9346
9347#: common-cmds.h:28
9348msgid "Create, list, delete or verify a tag object signed with GPG"
81809b99 9349msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
8ada9598 9350
170e9899 9351#: git-am.sh:50
c04f5ac3
JX
9352msgid "You need to set your committer info first"
9353msgstr "您需要先设置你的提交者信息"
9354
b694fbb1
JX
9355#: git-am.sh:95
9356msgid ""
9357"You seem to have moved HEAD since the last 'am' failure.\n"
9358"Not rewinding to ORIG_HEAD"
6792b93b 9359msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
b694fbb1
JX
9360
9361#: git-am.sh:105
9362#, sh-format
9363msgid ""
2e8451e8 9364"When you have resolved this problem, run \"$cmdline --continue\".\n"
649900bc
JX
9365"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
9366"To restore the original branch and stop patching, run \"$cmdline --abort\"."
b694fbb1 9367msgstr ""
2e8451e8 9368"当您解决了此问题后,执行 \"$cmdline --continue\"。\n"
b694fbb1
JX
9369"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
9370"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9371
9372#: git-am.sh:121
9373msgid "Cannot fall back to three-way merge."
9374msgstr "无法求助于三路合并。"
9375
170e9899 9376#: git-am.sh:137
c04f5ac3 9377msgid "Repository lacks necessary blobs to fall back on 3-way merge."
07432cef 9378msgstr "版本库缺乏必要的数据(blob)对象以进行三路合并。"
649900bc
JX
9379
9380#: git-am.sh:139
9381msgid "Using index info to reconstruct a base tree..."
63af42fe 9382msgstr "使用索引来重建一个(三路合并的)基础目录树..."
c04f5ac3 9383
170e9899 9384#: git-am.sh:154
c04f5ac3
JX
9385msgid ""
9386"Did you hand edit your patch?\n"
9387"It does not apply to blobs recorded in its index."
9388msgstr ""
9389"您是否曾手动编辑过您的补丁?\n"
07432cef 9390"无法应用补丁到索引中的数据(blob)对象上。"
c04f5ac3 9391
170e9899 9392#: git-am.sh:163
c04f5ac3 9393msgid "Falling back to patching base and 3-way merge..."
b694fbb1 9394msgstr "转而在基础版本上打补丁及进行三路合并..."
c04f5ac3 9395
649900bc
JX
9396#: git-am.sh:179
9397msgid "Failed to merge in the changes."
9398msgstr "无法合并变更。"
9399
9400#: git-am.sh:274
c04f5ac3
JX
9401msgid "Only one StGIT patch series can be applied at once"
9402msgstr "一次只能有一个 StGIT 补丁队列被应用"
9403
649900bc 9404#: git-am.sh:361
c04f5ac3
JX
9405#, sh-format
9406msgid "Patch format $patch_format is not supported."
9407msgstr "不支持 $patch_format 补丁格式。"
9408
649900bc 9409#: git-am.sh:363
c04f5ac3
JX
9410msgid "Patch format detection failed."
9411msgstr "补丁格式检测失败。"
9412
649900bc
JX
9413#: git-am.sh:389
9414msgid ""
9415"The -b/--binary option has been a no-op for long time, and\n"
9416"it will be removed. Please do not use it anymore."
9417msgstr ""
9418"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被删除。\n"
9419"请不要再使用它了。"
c04f5ac3 9420
2e8451e8 9421#: git-am.sh:479
c04f5ac3
JX
9422#, sh-format
9423msgid "previous rebase directory $dotest still exists but mbox given."
2e8451e8 9424msgstr "之前的变基目录 $dotest 仍然存在,但却提供了 mbox。"
c04f5ac3 9425
2e8451e8 9426#: git-am.sh:484
c04f5ac3
JX
9427msgid "Please make up your mind. --skip or --abort?"
9428msgstr "请下决心。--skip 或是 --abort ?"
9429
2e8451e8
JX
9430#: git-am.sh:520
9431#, sh-format
9432msgid ""
9433"Stray $dotest directory found.\n"
9434"Use \"git am --abort\" to remove it."
9435msgstr ""
9436"发现了错误的 $dotest 目录。\n"
9437"使用 \"git am --abort\" 删除它。"
9438
9439#: git-am.sh:528
c04f5ac3
JX
9440msgid "Resolve operation not in progress, we are not resuming."
9441msgstr "解决操作未进行,我们不会继续。"
9442
2e8451e8 9443#: git-am.sh:594
c04f5ac3
JX
9444#, sh-format
9445msgid "Dirty index: cannot apply patches (dirty: $files)"
90e6ef53 9446msgstr "脏的索引:不能应用补丁(脏文件:$files)"
c04f5ac3 9447
2e8451e8 9448#: git-am.sh:698
b694fbb1
JX
9449#, sh-format
9450msgid ""
9451"Patch is empty. Was it split wrong?\n"
9452"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
9453"To restore the original branch and stop patching run \"$cmdline --abort\"."
9454msgstr ""
9455"补丁为空。是不是切分错误?\n"
9456"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
9457"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
9458
2e8451e8 9459#: git-am.sh:725
b694fbb1
JX
9460msgid "Patch does not have a valid e-mail address."
9461msgstr "补丁中没有一个有效的邮件地址。"
9462
2e8451e8 9463#: git-am.sh:772
c04f5ac3 9464msgid "cannot be interactive without stdin connected to a terminal."
90e6ef53 9465msgstr "标准输入没有和终端关联,不能进行交互式操作。"
c04f5ac3 9466
2e8451e8 9467#: git-am.sh:776
b694fbb1
JX
9468msgid "Commit Body is:"
9469msgstr "提交内容为:"
9470
90e6ef53 9471# 译者:注意保持句尾空格
c04f5ac3
JX
9472#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9473#. in your translation. The program will only accept English
9474#. input at this point.
2e8451e8 9475#: git-am.sh:783
c04f5ac3
JX
9476msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9477msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9478
2e8451e8 9479#: git-am.sh:819
c04f5ac3
JX
9480#, sh-format
9481msgid "Applying: $FIRSTLINE"
9482msgstr "正应用:$FIRSTLINE"
9483
2e8451e8 9484#: git-am.sh:840
b694fbb1
JX
9485msgid ""
9486"No changes - did you forget to use 'git add'?\n"
9487"If there is nothing left to stage, chances are that something else\n"
9488"already introduced the same changes; you might want to skip this patch."
9489msgstr ""
9490"没有变更 —— 您是不是忘了执行 'git add'?\n"
9491"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
9492"您也许想要跳过这个补丁。"
9493
2e8451e8 9494#: git-am.sh:848
b694fbb1
JX
9495msgid ""
9496"You still have unmerged paths in your index\n"
9497"did you forget to use 'git add'?"
6792b93b 9498msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
b694fbb1 9499
2e8451e8 9500#: git-am.sh:864
c04f5ac3 9501msgid "No changes -- Patch already applied."
63af42fe 9502msgstr "没有变更 —— 补丁已经应用过。"
c04f5ac3 9503
2e8451e8 9504#: git-am.sh:874
b694fbb1
JX
9505#, sh-format
9506msgid "Patch failed at $msgnum $FIRSTLINE"
9507msgstr "补丁失败于 $msgnum $FIRSTLINE"
9508
2e8451e8 9509#: git-am.sh:877
ef317cd5
JX
9510#, sh-format
9511msgid ""
9512"The copy of the patch that failed is found in:\n"
9513" $dotest/patch"
9514msgstr ""
07432cef
WS
9515"失败的补丁文件副本位于:\n"
9516" $dotest/patch"
ef317cd5 9517
2e8451e8 9518#: git-am.sh:895
c04f5ac3
JX
9519msgid "applying to an empty history"
9520msgstr "正应用到一个空历史上"
9521
b694fbb1
JX
9522#: git-bisect.sh:48
9523msgid "You need to start by \"git bisect start\""
9524msgstr "您需要执行 \"git bisect start\" 来开始"
9525
90e6ef53 9526# 译者:注意保持句尾空格
c04f5ac3
JX
9527#. TRANSLATORS: Make sure to include [Y] and [n] in your
9528#. translation. The program will only accept English input
9529#. at this point.
9530#: git-bisect.sh:54
9531msgid "Do you want me to do it for you [Y/n]? "
9532msgstr "您想让我为您这样做么[Y/n]? "
9533
9534#: git-bisect.sh:95
9535#, sh-format
9536msgid "unrecognised option: '$arg'"
81809b99 9537msgstr "未能识别的选项:'$arg'"
c04f5ac3
JX
9538
9539#: git-bisect.sh:99
9540#, sh-format
9541msgid "'$arg' does not appear to be a valid revision"
9542msgstr "'$arg' 看起来不像是一个有效的版本"
9543
9544#: git-bisect.sh:117
9545msgid "Bad HEAD - I need a HEAD"
9546msgstr "坏的 HEAD - 我需要一个 HEAD"
9547
9548#: git-bisect.sh:130
9549#, sh-format
9550msgid ""
9551"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
9552msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
9553
9554#: git-bisect.sh:140
9555msgid "won't bisect on seeked tree"
9556msgstr "不会在已查找过的树上二分查找"
9557
9558#: git-bisect.sh:144
9559msgid "Bad HEAD - strange symbolic ref"
90e6ef53 9560msgstr "坏的 HEAD - 奇怪的符号引用"
c04f5ac3
JX
9561
9562#: git-bisect.sh:189
9563#, sh-format
9564msgid "Bad bisect_write argument: $state"
90e6ef53 9565msgstr "坏的 bisect_write 参数:$state"
c04f5ac3
JX
9566
9567#: git-bisect.sh:218
9568#, sh-format
9569msgid "Bad rev input: $arg"
90e6ef53 9570msgstr "输入坏的版本:$arg"
c04f5ac3
JX
9571
9572#: git-bisect.sh:232
9573msgid "Please call 'bisect_state' with at least one argument."
9574msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
9575
9576#: git-bisect.sh:244
9577#, sh-format
9578msgid "Bad rev input: $rev"
9579msgstr "输入坏的版本:$rev"
9580
9581#: git-bisect.sh:250
9582msgid "'git bisect bad' can take only one argument."
9583msgstr "'git bisect bad' 只能带一个参数。"
9584
b694fbb1
JX
9585#. have bad but not good. we could bisect although
9586#. this is less optimum.
9587#: git-bisect.sh:273
9588msgid "Warning: bisecting only with a bad commit."
9589msgstr "警告:在仅有一个坏提交下进行二分查找。"
9590
90e6ef53 9591# 译者:注意保持句尾空格
c04f5ac3
JX
9592#. TRANSLATORS: Make sure to include [Y] and [n] in your
9593#. translation. The program will only accept English input
9594#. at this point.
9595#: git-bisect.sh:279
9596msgid "Are you sure [Y/n]? "
9597msgstr "您确认么[Y/n]? "
9598
b694fbb1
JX
9599#: git-bisect.sh:289
9600msgid ""
9601"You need to give me at least one good and one bad revisions.\n"
9602"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9603msgstr ""
9604"您需要给我至少一个好版本和一个坏版本。\n"
9605"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9606
9607#: git-bisect.sh:292
9608msgid ""
9609"You need to start by \"git bisect start\".\n"
9610"You then need to give me at least one good and one bad revisions.\n"
9611"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9612msgstr ""
9613"您需要执行 \"git bisect start\" 来开始。\n"
9614"然后需要提供我至少一个好版本和一个坏版本。\n"
9615"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
9616
4dcdc3d8 9617#: git-bisect.sh:363 git-bisect.sh:490
b694fbb1
JX
9618msgid "We are not bisecting."
9619msgstr "我们没有在二分查找。"
9620
4dcdc3d8 9621#: git-bisect.sh:370
c04f5ac3
JX
9622#, sh-format
9623msgid "'$invalid' is not a valid commit"
9624msgstr "'$invalid' 不是一个有效的提交"
9625
4dcdc3d8 9626#: git-bisect.sh:379
c04f5ac3
JX
9627#, sh-format
9628msgid ""
9629"Could not check out original HEAD '$branch'.\n"
9630"Try 'git bisect reset <commit>'."
9631msgstr ""
9632"不能检出原始 HEAD '$branch'。\n"
07432cef 9633"尝试 'git bisect reset <提交>'。"
c04f5ac3 9634
4dcdc3d8 9635#: git-bisect.sh:406
c04f5ac3
JX
9636msgid "No logfile given"
9637msgstr "未提供日志文件"
9638
4dcdc3d8 9639#: git-bisect.sh:407
c04f5ac3
JX
9640#, sh-format
9641msgid "cannot read $file for replaying"
9642msgstr "不能读取 $file 来重放"
9643
4dcdc3d8 9644#: git-bisect.sh:424
c04f5ac3
JX
9645msgid "?? what are you talking about?"
9646msgstr "?? 您在说什么?"
9647
4dcdc3d8 9648#: git-bisect.sh:436
b694fbb1
JX
9649#, sh-format
9650msgid "running $command"
9651msgstr "运行 $command"
9652
4dcdc3d8 9653#: git-bisect.sh:443
b694fbb1
JX
9654#, sh-format
9655msgid ""
9656"bisect run failed:\n"
9657"exit code $res from '$command' is < 0 or >= 128"
9658msgstr ""
9659"二分查找运行失败:\n"
07432cef 9660"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
b694fbb1 9661
4dcdc3d8 9662#: git-bisect.sh:469
b694fbb1
JX
9663msgid "bisect run cannot continue any more"
9664msgstr "二分查找不能继续运行"
9665
4dcdc3d8 9666#: git-bisect.sh:475
b694fbb1
JX
9667#, sh-format
9668msgid ""
9669"bisect run failed:\n"
9670"'bisect_state $state' exited with error code $res"
9671msgstr ""
9672"二分查找运行失败:\n"
9673"'bisect_state $state' 退出码为 $res"
9674
4dcdc3d8 9675#: git-bisect.sh:482
b694fbb1
JX
9676msgid "bisect run success"
9677msgstr "二分查找运行成功"
c04f5ac3
JX
9678
9679#: git-pull.sh:21
9680msgid ""
9681"Pull is not possible because you have unmerged files.\n"
9682"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
9683"as appropriate to mark resolution, or use 'git commit -a'."
9684msgstr ""
90e6ef53 9685"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
c04f5ac3 9686"然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
90e6ef53 9687"或者使用 'git commit -a'。"
c04f5ac3
JX
9688
9689#: git-pull.sh:25
9690msgid "Pull is not possible because you have unmerged files."
90e6ef53 9691msgstr "Pull 不可用,因为您尚有未合并的文件。"
c04f5ac3 9692
1003b3a5 9693#: git-pull.sh:203
c04f5ac3 9694msgid "updating an unborn branch with changes added to the index"
90e6ef53 9695msgstr "更新尚未诞生的分支,变更添加至索引"
c04f5ac3 9696
b694fbb1
JX
9697#. The fetch involved updating the current branch.
9698#. The working tree and the index file is still based on the
9699#. $orig_head commit, but we are merging into $curr_head.
9700#. First update the working tree to match $curr_head.
1003b3a5 9701#: git-pull.sh:235
b694fbb1
JX
9702#, sh-format
9703msgid ""
9704"Warning: fetch updated the current branch head.\n"
9705"Warning: fast-forwarding your working tree from\n"
9706"Warning: commit $orig_head."
9707msgstr ""
9708"警告:fetch 更新了当前的分支。您的工作区\n"
9709"警告:从原提交 $orig_head 快进。"
9710
1003b3a5 9711#: git-pull.sh:260
c04f5ac3
JX
9712msgid "Cannot merge multiple branches into empty head"
9713msgstr "无法将多个分支合并到空分支"
9714
1003b3a5 9715#: git-pull.sh:264
c04f5ac3
JX
9716msgid "Cannot rebase onto multiple branches"
9717msgstr "无法变基到多个分支"
9718
2e8451e8 9719#: git-rebase.sh:54
649900bc
JX
9720msgid ""
9721"When you have resolved this problem, run \"git rebase --continue\".\n"
9722"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
9723"To check out the original branch and stop rebasing, run \"git rebase --abort"
9724"\"."
9725msgstr ""
9726"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
9727"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
9728"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
9729
2e8451e8
JX
9730#: git-rebase.sh:156
9731msgid "Applied autostash."
9732msgstr "成功应用 autostash。"
9733
9734#: git-rebase.sh:159
9735#, sh-format
9736msgid "Cannot store $stash_sha1"
9737msgstr "无法保存 $stash_sha1"
9738
07432cef 9739#: git-rebase.sh:160
2e8451e8
JX
9740msgid ""
9741"Applying autostash resulted in conflicts.\n"
9742"Your changes are safe in the stash.\n"
b1894384 9743"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
2e8451e8
JX
9744msgstr ""
9745"应用 autostash 导致冲突。\n"
9746"您的修改安全地保存在 stash 中。\n"
9747"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
9748
9749#: git-rebase.sh:190
649900bc
JX
9750msgid "The pre-rebase hook refused to rebase."
9751msgstr "钩子 pre-rebase 拒绝变基。"
9752
2e8451e8 9753#: git-rebase.sh:195
649900bc
JX
9754msgid "It looks like git-am is in progress. Cannot rebase."
9755msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
9756
2e8451e8 9757#: git-rebase.sh:329
649900bc
JX
9758msgid "The --exec option must be used with the --interactive option"
9759msgstr "选项 --exec 必须和选项 --interactive 同时使用"
9760
2e8451e8 9761#: git-rebase.sh:334
649900bc
JX
9762msgid "No rebase in progress?"
9763msgstr "没有正在进行的变基?"
9764
2e8451e8 9765#: git-rebase.sh:345
07432cef
WS
9766msgid "The --edit-todo action can only be used during interactive rebase."
9767msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
9768
2e8451e8 9769#: git-rebase.sh:352
649900bc
JX
9770msgid "Cannot read HEAD"
9771msgstr "不能读取 HEAD"
9772
2e8451e8 9773#: git-rebase.sh:355
649900bc
JX
9774msgid ""
9775"You must edit all merge conflicts and then\n"
9776"mark them as resolved using git add"
9777msgstr ""
9778"您必须编辑所有的合并冲突,然后通过 git add\n"
9779"命令将它们标记为已解决"
9780
2e8451e8 9781#: git-rebase.sh:373
649900bc
JX
9782#, sh-format
9783msgid "Could not move back to $head_name"
9784msgstr "无法移回 $head_name"
9785
2e8451e8 9786#: git-rebase.sh:392
649900bc
JX
9787#, sh-format
9788msgid ""
9789"It seems that there is already a $state_dir_base directory, and\n"
9790"I wonder if you are in the middle of another rebase. If that is the\n"
9791"case, please try\n"
9792"\t$cmd_live_rebase\n"
9793"If that is not the case, please\n"
9794"\t$cmd_clear_stale_rebase\n"
9795"and run me again. I am stopping in case you still have something\n"
9796"valuable there."
9797msgstr ""
9798"好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n"
9799"如果是这样,请尝试执行\n"
9800"\t$cmd_live_rebase\n"
9801"如果不是这样,请执行\n"
9802"\t$cmd_clear_stale_rebase\n"
9803"然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。"
9804
2e8451e8 9805#: git-rebase.sh:437
649900bc
JX
9806#, sh-format
9807msgid "invalid upstream $upstream_name"
9808msgstr "无效的上游 $upstream_name"
9809
2e8451e8 9810#: git-rebase.sh:461
649900bc
JX
9811#, sh-format
9812msgid "$onto_name: there are more than one merge bases"
9813msgstr "$onto_name: 有一个以上的合并基准"
9814
2e8451e8 9815#: git-rebase.sh:464 git-rebase.sh:468
649900bc
JX
9816#, sh-format
9817msgid "$onto_name: there is no merge base"
9818msgstr "$onto_name: 没有合并基准"
9819
2e8451e8 9820#: git-rebase.sh:473
649900bc
JX
9821#, sh-format
9822msgid "Does not point to a valid commit: $onto_name"
9823msgstr "没有指向一个有效的提交:$onto_name"
9824
2e8451e8 9825#: git-rebase.sh:496
649900bc
JX
9826#, sh-format
9827msgid "fatal: no such branch: $branch_name"
9828msgstr "严重错误:无此分支:$branch_name"
9829
2e8451e8
JX
9830#: git-rebase.sh:519
9831msgid "Cannot autostash"
9832msgstr "无法 autostash"
9833
9834#: git-rebase.sh:524
9835#, sh-format
9836msgid "Created autostash: $stash_abbrev"
9837msgstr "创建了 autostash: $stash_abbrev"
9838
9839#: git-rebase.sh:528
649900bc
JX
9840msgid "Please commit or stash them."
9841msgstr "请提交或为它们保存进度。"
9842
2e8451e8 9843#: git-rebase.sh:548
649900bc
JX
9844#, sh-format
9845msgid "Current branch $branch_name is up to date."
9846msgstr "当前分支 $branch_name 是最新的。"
9847
2e8451e8 9848#: git-rebase.sh:552
649900bc
JX
9849#, sh-format
9850msgid "Current branch $branch_name is up to date, rebase forced."
9851msgstr "当前分支 $branch_name 是最新的,强制变基。"
9852
2e8451e8 9853#: git-rebase.sh:563
649900bc
JX
9854#, sh-format
9855msgid "Changes from $mb to $onto:"
9856msgstr "变更从 $mb 到 $onto:"
9857
9858#. Detach HEAD and reset the tree
2e8451e8 9859#: git-rebase.sh:572
649900bc
JX
9860msgid "First, rewinding head to replay your work on top of it..."
9861msgstr "首先,重置头指针以便在上面重放您的工作..."
9862
2e8451e8 9863#: git-rebase.sh:582
649900bc
JX
9864#, sh-format
9865msgid "Fast-forwarded $branch_name to $onto_name."
9866msgstr "快进 $branch_name 至 $onto_name。"
9867
c04f5ac3
JX
9868#: git-stash.sh:51
9869msgid "git stash clear with parameters is unimplemented"
9870msgstr "git stash clear 不支持参数"
9871
9872#: git-stash.sh:74
9873msgid "You do not have the initial commit yet"
9874msgstr "您尚未建立初始提交"
9875
9876#: git-stash.sh:89
9877msgid "Cannot save the current index state"
90e6ef53 9878msgstr "无法保存当前索引状态"
c04f5ac3
JX
9879
9880#: git-stash.sh:123 git-stash.sh:136
9881msgid "Cannot save the current worktree state"
9882msgstr "无法保存当前工作区状态"
9883
9884#: git-stash.sh:140
9885msgid "No changes selected"
90e6ef53 9886msgstr "没有选择变更"
c04f5ac3
JX
9887
9888#: git-stash.sh:143
9889msgid "Cannot remove temporary index (can't happen)"
90e6ef53 9890msgstr "无法删除临时索引(不应发生)"
c04f5ac3
JX
9891
9892#: git-stash.sh:156
9893msgid "Cannot record working tree state"
9894msgstr "不能记录工作区状态"
9895
2e8451e8
JX
9896#: git-stash.sh:190
9897#, sh-format
9898msgid "Cannot update $ref_stash with $w_commit"
9899msgstr "无法用 $w_commit 更新 $ref_stash"
9900
b694fbb1
JX
9901#. TRANSLATORS: $option is an invalid option, like
9902#. `--blah-blah'. The 7 spaces at the beginning of the
9903#. second line correspond to "error: ". So you should line
9904#. up the second line with however many characters the
9905#. translation of "error: " takes in your language. E.g. in
9906#. English this is:
9907#.
9908#. $ git stash save --blah-blah 2>&1 | head -n 2
9909#. error: unknown option for 'stash save': --blah-blah
9910#. To provide a message, use git stash save -- '--blah-blah'
2e8451e8 9911#: git-stash.sh:241
b694fbb1
JX
9912#, sh-format
9913msgid ""
9914"error: unknown option for 'stash save': $option\n"
9915" To provide a message, use git stash save -- '$option'"
9916msgstr ""
9917"错误:'stash save' 的未知选项:$option\n"
9918" 要提供一个描述信息,使用 git stash save -- '$option'"
9919
2e8451e8 9920#: git-stash.sh:262
c04f5ac3
JX
9921msgid "No local changes to save"
9922msgstr "没有要保存的本地修改"
9923
2e8451e8
JX
9924#: git-stash.sh:268
9925msgid ""
9926"The following untracked files would NOT be saved but need to be removed by "
9927"stash save:"
9928msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除:"
9929
9930#: git-stash.sh:270
9931msgid ""
9932"Aborting. Consider using either the --force or --include-untracked option."
9933msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。"
9934
9935#: git-stash.sh:274
c04f5ac3 9936msgid "Cannot initialize stash"
90e6ef53 9937msgstr "无法初始化 stash"
c04f5ac3 9938
2e8451e8 9939#: git-stash.sh:278
c04f5ac3
JX
9940msgid "Cannot save the current status"
9941msgstr "无法保存当前状态"
9942
2e8451e8 9943#: git-stash.sh:296
c04f5ac3
JX
9944msgid "Cannot remove worktree changes"
9945msgstr "无法删除工作区变更"
9946
2e8451e8 9947#: git-stash.sh:395
c04f5ac3 9948msgid "No stash found."
90e6ef53 9949msgstr "未发现 stash。"
c04f5ac3 9950
2e8451e8 9951#: git-stash.sh:402
c04f5ac3
JX
9952#, sh-format
9953msgid "Too many revisions specified: $REV"
90e6ef53 9954msgstr "指定了太多的版本:$REV"
c04f5ac3 9955
2e8451e8 9956#: git-stash.sh:408
c04f5ac3
JX
9957#, sh-format
9958msgid "$reference is not valid reference"
9959msgstr "$reference 不是有效的引用"
9960
2e8451e8 9961#: git-stash.sh:436
c04f5ac3
JX
9962#, sh-format
9963msgid "'$args' is not a stash-like commit"
90e6ef53 9964msgstr "'$args' 不是 stash 样提交"
c04f5ac3 9965
2e8451e8 9966#: git-stash.sh:447
c04f5ac3
JX
9967#, sh-format
9968msgid "'$args' is not a stash reference"
90e6ef53 9969msgstr "'$args' 不是一个 stash 引用"
c04f5ac3 9970
2e8451e8 9971#: git-stash.sh:455
c04f5ac3 9972msgid "unable to refresh index"
90e6ef53 9973msgstr "无法刷新索引"
c04f5ac3 9974
2e8451e8 9975#: git-stash.sh:459
c04f5ac3
JX
9976msgid "Cannot apply a stash in the middle of a merge"
9977msgstr "无法在合并过程中恢复进度"
9978
2e8451e8 9979#: git-stash.sh:467
c04f5ac3 9980msgid "Conflicts in index. Try without --index."
90e6ef53 9981msgstr "索引中有冲突。尝试不使用 --index。"
c04f5ac3 9982
2e8451e8 9983#: git-stash.sh:469
c04f5ac3 9984msgid "Could not save index tree"
90e6ef53 9985msgstr "不能保存索引树"
c04f5ac3 9986
2e8451e8 9987#: git-stash.sh:503
c04f5ac3
JX
9988msgid "Cannot unstage modified files"
9989msgstr "无法还原修改的文件"
9990
2e8451e8 9991#: git-stash.sh:518
b694fbb1
JX
9992msgid "Index was not unstashed."
9993msgstr "索引的进度没有被恢复。"
9994
2e8451e8 9995#: git-stash.sh:535
c04f5ac3
JX
9996#, sh-format
9997msgid "Dropped ${REV} ($s)"
9998msgstr "丢弃了 ${REV} ($s)"
9999
2e8451e8 10000#: git-stash.sh:536
c04f5ac3
JX
10001#, sh-format
10002msgid "${REV}: Could not drop stash entry"
90e6ef53 10003msgstr "${REV}:不能丢弃进度条目"
c04f5ac3 10004
2e8451e8 10005#: git-stash.sh:543
c04f5ac3
JX
10006msgid "No branch name specified"
10007msgstr "未指定分支名"
10008
2e8451e8 10009#: git-stash.sh:615
c04f5ac3
JX
10010msgid "(To restore them type \"git stash apply\")"
10011msgstr "(为恢复数据输入 \"git stash apply\")"
10012
2e8451e8 10013#: git-submodule.sh:95
c04f5ac3
JX
10014#, sh-format
10015msgid "cannot strip one component off url '$remoteurl'"
10016msgstr "无法从 url '$remoteurl' 剥离一个组件"
10017
2e8451e8 10018#: git-submodule.sh:237
c04f5ac3 10019#, sh-format
170e9899
JX
10020msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
10021msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
c04f5ac3 10022
2e8451e8 10023#: git-submodule.sh:281
c04f5ac3 10024#, sh-format
170e9899
JX
10025msgid "Clone of '$url' into submodule path '$sm_path' failed"
10026msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
c04f5ac3 10027
2e8451e8 10028#: git-submodule.sh:293
dac1de7d
JX
10029#, sh-format
10030msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
07432cef 10031msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
dac1de7d 10032
2e8451e8
JX
10033#: git-submodule.sh:403
10034msgid "Relative path can only be used from the toplevel of the working tree"
10035msgstr "只能在工作区的顶级目录中使用相对路径"
10036
10037#: git-submodule.sh:413
c04f5ac3
JX
10038#, sh-format
10039msgid "repo URL: '$repo' must be absolute or begin with ./|../"
10040msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
10041
2e8451e8 10042#: git-submodule.sh:430
c04f5ac3 10043#, sh-format
170e9899
JX
10044msgid "'$sm_path' already exists in the index"
10045msgstr "'$sm_path' 已经存在于索引中"
c04f5ac3 10046
2e8451e8 10047#: git-submodule.sh:434
b694fbb1
JX
10048#, sh-format
10049msgid ""
10050"The following path is ignored by one of your .gitignore files:\n"
10051"$sm_path\n"
10052"Use -f if you really want to add it."
10053msgstr ""
10054"以下路径被您的一个 .gitignore 文件所忽略:\n"
10055"$sm_path\n"
10056"如果您确实想添加它,使用 -f 参数。"
10057
2e8451e8 10058#: git-submodule.sh:452
b694fbb1
JX
10059#, sh-format
10060msgid "Adding existing repo at '$sm_path' to the index"
10061msgstr "添加位于 '$sm_path' 的现存版本库到索引"
10062
2e8451e8 10063#: git-submodule.sh:454
c04f5ac3 10064#, sh-format
170e9899
JX
10065msgid "'$sm_path' already exists and is not a valid git repo"
10066msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
c04f5ac3 10067
2e8451e8 10068#: git-submodule.sh:462
07432cef
WS
10069#, sh-format
10070msgid "A git directory for '$sm_name' is found locally with remote(s):"
10071msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:"
10072
2e8451e8 10073#: git-submodule.sh:464
07432cef
WS
10074#, sh-format
10075msgid ""
10076"If you want to reuse this local git directory instead of cloning again from"
10077msgstr "如果您想重用此本地 git 目录而不是重新克隆自"
10078
2e8451e8 10079#: git-submodule.sh:466
07432cef
WS
10080#, sh-format
10081msgid ""
10082"use the '--force' option. If the local git directory is not the correct repo"
10083msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
10084
2e8451e8 10085#: git-submodule.sh:467
07432cef
WS
10086#, sh-format
10087msgid ""
10088"or you are unsure what this means choose another name with the '--name' "
10089"option."
10090msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。"
10091
2e8451e8 10092#: git-submodule.sh:469
07432cef
WS
10093#, sh-format
10094msgid "Reactivating local git directory for submodule '$sm_name'."
10095msgstr "激活本地 git 目录到子模组 '$sm_name'。"
10096
2e8451e8 10097#: git-submodule.sh:481
c04f5ac3 10098#, sh-format
170e9899
JX
10099msgid "Unable to checkout submodule '$sm_path'"
10100msgstr "不能检出子模组 '$sm_path'"
c04f5ac3 10101
2e8451e8 10102#: git-submodule.sh:486
c04f5ac3 10103#, sh-format
170e9899
JX
10104msgid "Failed to add submodule '$sm_path'"
10105msgstr "无法添加子模组 '$sm_path'"
c04f5ac3 10106
2e8451e8 10107#: git-submodule.sh:495
c04f5ac3 10108#, sh-format
170e9899
JX
10109msgid "Failed to register submodule '$sm_path'"
10110msgstr "无法注册子模组 '$sm_path'"
c04f5ac3 10111
2e8451e8 10112#: git-submodule.sh:539
c04f5ac3 10113#, sh-format
2e8451e8
JX
10114msgid "Entering '$prefix$displaypath'"
10115msgstr "正在进入 '$prefix$displaypath'"
c04f5ac3 10116
2e8451e8 10117#: git-submodule.sh:554
c04f5ac3 10118#, sh-format
2e8451e8
JX
10119msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
10120msgstr "停止于 '$prefix$displaypath',脚本返回非零值。"
c04f5ac3 10121
2e8451e8 10122#: git-submodule.sh:600
c04f5ac3 10123#, sh-format
2e8451e8
JX
10124msgid "No url found for submodule path '$displaypath' in .gitmodules"
10125msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
c04f5ac3 10126
2e8451e8 10127#: git-submodule.sh:609
c04f5ac3 10128#, sh-format
2e8451e8
JX
10129msgid "Failed to register url for submodule path '$displaypath'"
10130msgstr "无法为子模组路径 '$displaypath' 注册 url"
c04f5ac3 10131
2e8451e8 10132#: git-submodule.sh:611
c04f5ac3 10133#, sh-format
2e8451e8
JX
10134msgid "Submodule '$name' ($url) registered for path '$displaypath'"
10135msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
c04f5ac3 10136
2e8451e8 10137#: git-submodule.sh:619
d691f479 10138#, sh-format
2e8451e8
JX
10139msgid "Failed to register update mode for submodule path '$displaypath'"
10140msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
d691f479 10141
2e8451e8 10142#: git-submodule.sh:656
1003b3a5
JX
10143#, sh-format
10144msgid "Use '.' if you really want to deinitialize all submodules"
10145msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
10146
2e8451e8 10147#: git-submodule.sh:673
1003b3a5 10148#, sh-format
2e8451e8
JX
10149msgid "Submodule work tree '$displaypath' contains a .git directory"
10150msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
1003b3a5 10151
2e8451e8 10152#: git-submodule.sh:674
1003b3a5
JX
10153#, sh-format
10154msgid ""
10155"(use 'rm -rf' if you really want to remove it including all of its history)"
10156msgstr "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10157
2e8451e8 10158#: git-submodule.sh:680
c04f5ac3
JX
10159#, sh-format
10160msgid ""
2e8451e8 10161"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
1003b3a5 10162"discard them"
2e8451e8 10163msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
1003b3a5 10164
2e8451e8 10165#: git-submodule.sh:683
1003b3a5 10166#, sh-format
2e8451e8
JX
10167msgid "Cleared directory '$displaypath'"
10168msgstr "已清除目录 '$displaypath'"
1003b3a5 10169
2e8451e8 10170#: git-submodule.sh:684
1003b3a5 10171#, sh-format
2e8451e8
JX
10172msgid "Could not remove submodule work tree '$displaypath'"
10173msgstr "无法移除子模组工作区 '$displaypath'"
1003b3a5 10174
2e8451e8 10175#: git-submodule.sh:687
1003b3a5 10176#, sh-format
2e8451e8
JX
10177msgid "Could not create empty submodule directory '$displaypath'"
10178msgstr "不能创建空的子模组目录 '$displaypath'"
1003b3a5 10179
2e8451e8 10180#: git-submodule.sh:696
1003b3a5 10181#, sh-format
2e8451e8
JX
10182msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
10183msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
1003b3a5 10184
2e8451e8 10185#: git-submodule.sh:811
1003b3a5
JX
10186#, sh-format
10187msgid ""
2e8451e8 10188"Submodule path '$displaypath' not initialized\n"
c04f5ac3
JX
10189"Maybe you want to use 'update --init'?"
10190msgstr ""
2e8451e8 10191"子模组路径 '$displaypath' 没有初始化\n"
90e6ef53 10192"也许您想用 'update --init'?"
c04f5ac3 10193
2e8451e8 10194#: git-submodule.sh:824
c04f5ac3 10195#, sh-format
2e8451e8
JX
10196msgid "Unable to find current revision in submodule path '$displaypath'"
10197msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
c04f5ac3 10198
2e8451e8 10199#: git-submodule.sh:833
c04f5ac3 10200#, sh-format
170e9899
JX
10201msgid "Unable to fetch in submodule path '$sm_path'"
10202msgstr "无法在子模组路径 '$sm_path' 中获取"
c04f5ac3 10203
2e8451e8
JX
10204#: git-submodule.sh:857
10205#, sh-format
10206msgid "Unable to fetch in submodule path '$displaypath'"
10207msgstr "无法在子模组路径 '$displaypath' 中获取"
10208
10209#: git-submodule.sh:871
c04f5ac3 10210#, sh-format
2e8451e8
JX
10211msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
10212msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
c04f5ac3 10213
2e8451e8 10214#: git-submodule.sh:872
c04f5ac3 10215#, sh-format
2e8451e8
JX
10216msgid "Submodule path '$displaypath': rebased into '$sha1'"
10217msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
c04f5ac3 10218
2e8451e8 10219#: git-submodule.sh:877
c04f5ac3 10220#, sh-format
2e8451e8
JX
10221msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
10222msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
c04f5ac3 10223
2e8451e8 10224#: git-submodule.sh:878
c04f5ac3 10225#, sh-format
2e8451e8
JX
10226msgid "Submodule path '$displaypath': merged in '$sha1'"
10227msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
c04f5ac3 10228
2e8451e8 10229#: git-submodule.sh:883
c04f5ac3 10230#, sh-format
2e8451e8
JX
10231msgid ""
10232"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
10233msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
c04f5ac3 10234
2e8451e8 10235#: git-submodule.sh:884
c04f5ac3 10236#, sh-format
2e8451e8
JX
10237msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
10238msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
c04f5ac3 10239
2e8451e8 10240#: git-submodule.sh:889
c04f5ac3 10241#, sh-format
2e8451e8
JX
10242msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
10243msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
1003b3a5 10244
2e8451e8 10245#: git-submodule.sh:890
1003b3a5 10246#, sh-format
2e8451e8
JX
10247msgid "Submodule path '$displaypath': checked out '$sha1'"
10248msgstr "子模组路径 '$displaypath':检出 '$sha1'"
c04f5ac3 10249
2e8451e8
JX
10250#: git-submodule.sh:917
10251#, sh-format
10252msgid "Failed to recurse into submodule path '$displaypath'"
10253msgstr "无法递归进子模组路径 '$displaypath'"
10254
10255#: git-submodule.sh:1025
649900bc
JX
10256msgid "The --cached option cannot be used with the --files option"
10257msgstr "选项 --cached 不能和选项 --files 同时使用"
b694fbb1
JX
10258
10259#. unexpected type
2e8451e8 10260#: git-submodule.sh:1066
b694fbb1
JX
10261#, sh-format
10262msgid "unexpected mode $mod_dst"
10263msgstr "意外的模式 $mod_dst"
c04f5ac3 10264
90e6ef53 10265# 译者:注意保持前导空格
2e8451e8 10266#: git-submodule.sh:1086
c04f5ac3 10267#, sh-format
2e8451e8
JX
10268msgid " Warn: $display_name doesn't contain commit $sha1_src"
10269msgstr " 警告:$display_name 未包含提交 $sha1_src"
c04f5ac3 10270
90e6ef53 10271# 译者:注意保持前导空格
2e8451e8 10272#: git-submodule.sh:1089
c04f5ac3 10273#, sh-format
2e8451e8
JX
10274msgid " Warn: $display_name doesn't contain commit $sha1_dst"
10275msgstr " 警告:$display_name 未包含提交 $sha1_dst"
c04f5ac3 10276
90e6ef53 10277# 译者:注意保持前导空格
2e8451e8 10278#: git-submodule.sh:1092
c04f5ac3 10279#, sh-format
2e8451e8
JX
10280msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
10281msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
c04f5ac3 10282
2e8451e8 10283#: git-submodule.sh:1117
c04f5ac3 10284msgid "blob"
07432cef 10285msgstr "数据对象"
c04f5ac3 10286
2e8451e8 10287#: git-submodule.sh:1155
a77c07d9
JX
10288msgid "Submodules changed but not updated:"
10289msgstr "子模组已修改但尚未更新:"
b694fbb1 10290
2e8451e8 10291#: git-submodule.sh:1157
a77c07d9 10292msgid "Submodule changes to be committed:"
b694fbb1
JX
10293msgstr "要提交的子模组变更:"
10294
2e8451e8 10295#: git-submodule.sh:1242
1003b3a5
JX
10296#, sh-format
10297msgid "Failed to recurse into submodule path '$sm_path'"
10298msgstr "无法递归进子模组路径 '$sm_path'"
10299
2e8451e8 10300#: git-submodule.sh:1306
c04f5ac3 10301#, sh-format
2e8451e8
JX
10302msgid "Synchronizing submodule url for '$displaypath'"
10303msgstr "为 '$displaypath' 同步子模组 url"
10304
10305#~ msgid ""
10306#~ "the following submodule (or one of its nested submodule)\n"
10307#~ "uses a .git directory:"
10308#~ msgid_plural ""
10309#~ "the following submodules (or one of its nested submodule)\n"
10310#~ "use a .git directory:"
10311#~ msgstr[0] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
10312#~ msgstr[1] "如下子模组(或一个其嵌套的子模组)使用了一个 .git 目录:"
10313
10314#~ msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
10315#~ msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
10316
10317#~ msgid "Could not find section in .gitmodules where path=%s"
10318#~ msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
10319
10320#~ msgid "Could not update .gitmodules entry %s"
10321#~ msgstr "不能更新 .gitmodules 条目 %s"
10322
10323#~ msgid "Could not remove .gitmodules entry for %s"
10324#~ msgstr "无法移除 %s 的 .gitmodules 条目"
10325
10326#~ msgid "could not find .gitmodules in index"
10327#~ msgstr "无法在索引中找到 .gitmodules"
10328
10329#~ msgid "reading updated .gitmodules failed"
10330#~ msgstr "读取更新后的 .gitmodules 失败"
10331
10332#~ msgid "unable to stat updated .gitmodules"
10333#~ msgstr "不能枚举更新后的 .gitmodules"
10334
10335#~ msgid "unable to remove .gitmodules from index"
10336#~ msgstr "不能从索引中移除 .gitmodules"
10337
10338#~ msgid "adding updated .gitmodules failed"
10339#~ msgstr "添加更新后的 .gitmodules 失败"
10340
10341#~ msgid "staging updated .gitmodules failed"
10342#~ msgstr "将更新后 .gitmodules 添加暂存区失败"
10343
10344#~ msgid "Could not set core.worktree in %s"
10345#~ msgstr "不能在 %s 中设置 core.worktree"
10346
10347# 译者:注意保持前导空格
10348#~ msgid " (fix conflicts and then run \"git am --resolved\")"
10349#~ msgstr " (解决冲突,然后运行 \"git am --resolved\")"
10350
10351# 译者:注意保持前导空格
10352#~ msgid " (all conflicts fixed: run \"git commit\")"
10353#~ msgstr " (解决所有冲突后,执行 \"git commit\")"
10354
10355#~ msgid "more than %d trees given: '%s'"
10356#~ msgstr "提供了超过 %d 个树对象:'%s'"
10357
10358#~ msgid "You cannot combine --no-ff with --ff-only."
10359#~ msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
10360
10361#~ msgid "Huh? Directory %s is in index and no submodule?"
10362#~ msgstr "嗯?目录 %s 在索引中并且不是子模组?"
10363
10364#~ msgid ""
10365#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
10366#~ "(use 'rm -rf' if you really want to remove it including all of its "
10367#~ "history)"
10368#~ msgstr ""
10369#~ "子模组 '%s'(或者它的一个嵌套子模组)使用一个 .git 目录\n"
10370#~ "(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
10371
10372#~ msgid ""
10373#~ "'%s' has changes staged in the index\n"
10374#~ "(use --cached to keep the file, or -f to force removal)"
10375#~ msgstr ""
10376#~ "'%s' 有变更已暂存至索引中\n"
10377#~ "(使用 --cached 保存文件,或用 -f 强制删除)"
10378
10379#~ msgid "show commits where no parent comes before its children"
10380#~ msgstr "显示提交时以时间为序且父提交不能领先子提交"
10381
10382#~ msgid "show the HEAD reference"
10383#~ msgstr "显示 HEAD 引用"
10384
10385#~ msgid "Submodule '$name' ($url) registered for path '$sm_path'"
10386#~ msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
10387
10388#~ msgid "Change flags"
10389#~ msgstr "修改参数"
10390
10391#~ msgid ""
10392#~ "NOTE: no more files to clean; press \"t\" to toggle flags of git-clean."
10393#~ msgstr "注意:没有要清理的文件;尝试按 \"t\" 切换 git-clean 的选项。"
10394
10395#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'"
10396#~ msgstr "无法递归进子模组路径 '$prefix$sm_path'"
07432cef 10397
4dcdc3d8
JX
10398#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
10399#~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
10400
10401#~ msgid "See 'git help <command>' for more information on a specific command."
10402#~ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
10403
10404#~ msgid "BUG: impossible combination of %d and %p"
10405#~ msgstr "BUG: 无法组合 %d 和 %p"
10406
10407# 译者:以下三条实际为一个段落
10408#~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
10409#~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
10410
10411# 译者:为对齐,下面两句内容有调整
10412#~ msgid "may speed it up, but you have to be careful not to forget to add"
10413#~ msgstr "也许能提高速度,但您需要小心不要忘了添加新文件"
10414
10415#~ msgid "new files yourself (see 'git help status')."
10416#~ msgstr "(参见 'git help status')。"
10417
1003b3a5
JX
10418#~ msgid "use any ref in .git/refs"
10419#~ msgstr "使用 .git/refs 里的任意引用"
10420
10421#~ msgid "use any tag in .git/refs/tags"
10422#~ msgstr "使用 .git/refs/tags 里的任意 tag"
10423
10424#~ msgid "bad object %s"
10425#~ msgstr "坏对象 %s"
10426
10427#~ msgid "bogus committer info %s"
10428#~ msgstr "虚假的提交者信息 %s"
10429
a77c07d9
JX
10430#~ msgid "can't fdopen 'show' output fd"
10431#~ msgstr "不能打开 'show' 输出文件句柄"
10432
10433#~ msgid "failed to close pipe to 'show' for object '%s'"
10434#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
10435
07432cef
WS
10436#~ msgid " 0 files changed"
10437#~ msgstr " 0 个文件被修改"
10438
10439#~ msgid " %d file changed"
10440#~ msgid_plural " %d files changed"
10441#~ msgstr[0] " %d 个文件被修改"
10442#~ msgstr[1] " %d 个文件被修改"
10443
10444#~ msgid ", %d insertion(+)"
10445#~ msgid_plural ", %d insertions(+)"
10446#~ msgstr[0] ",插入 %d 行(+)"
10447#~ msgstr[1] ",插入 %d 行(+)"
10448
10449#~ msgid ", %d deletion(-)"
10450#~ msgid_plural ", %d deletions(-)"
10451#~ msgstr[0] ",删除 %d 行(-)"
10452#~ msgstr[1] ",删除 %d 行(-)"
10453
10454#~ msgid "You do not have a valid HEAD"
10455#~ msgstr "您没有一个有效的 HEAD"
10456
10457#~ msgid "oops"
10458#~ msgstr "哎哟"
10459
10460#~ msgid "Would not remove %s\n"
10461#~ msgstr "不会删除 %s\n"
10462
10463#~ msgid "Not removing %s\n"
10464#~ msgstr "未删除 %s\n"
10465
10466#~ msgid "Auto packing the repository for optimum performance.\n"
10467#~ msgstr "自动打包版本库以求最佳性能。\n"
10468
10469#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
10470#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
10471
10472#~ msgid "Could not read index"
10473#~ msgstr "不能读取索引"
c160d03f 10474
ef317cd5
JX
10475# 译者:中文字符串拼接,可删除前导空格
10476#~ msgid " (use \"git add\" to track)"
10477#~ msgstr "(使用 \"git add\" 建立跟踪)"
10478
10479#~ msgid "-B cannot be used with -b"
10480#~ msgstr "-B 不能和 -b 同时使用"
10481
10482#~ msgid "--patch is incompatible with all other options"
10483#~ msgstr "--patch 选项和其他选项不兼容"
10484
10485#~ msgid "--detach cannot be used with -b/-B/--orphan"
10486#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
10487
10488#~ msgid "--detach cannot be used with -t"
10489#~ msgstr "--detach 不能和 -t 同时使用"
10490
10491#~ msgid "--orphan and -b|-B are mutually exclusive"
10492#~ msgstr "--orphan 和 -b|-B 互斥"
10493
10494#~ msgid "--orphan cannot be used with -t"
10495#~ msgstr "--orphan 不能和 -t 同时使用"
10496
10497#~ msgid "git checkout: -f and -m are incompatible"
10498#~ msgstr "git checkout:-f 和 -m 不兼容"
10499
10500#~ msgid ""
10501#~ "git checkout: updating paths is incompatible with switching branches."
10502#~ msgstr "git checkout:更新路径和切换分支不兼容。"
10503
c160d03f
JX
10504#~ msgid "diff setup failed"
10505#~ msgstr "diff 设置失败"
10506
10507#~ msgid "merge-recursive: disk full?"
10508#~ msgstr "merge-recursive:磁盘已满?"
10509
10510#~ msgid "diff_setup_done failed"
10511#~ msgstr "diff_setup_done 失败"